1094 files changed, 74133 insertions, 25698 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 12cf5d491f0d..da49b006bcc5 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -259,7 +259,7 @@ config ACPI_ASUS
 
 config ACPI_TOSHIBA
         tristate "Toshiba Laptop Extras"
-        depends on X86
+        depends on X86 && INPUT
         select INPUT_POLLDEV
         select NET
         select RFKILL
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 3c578ef78c48..24649ada08df 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -260,115 +260,3 @@ static int __init init_acpi_device_notify(void)
 }
 
 arch_initcall(init_acpi_device_notify);
-
-
-#if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE)
-
-#ifdef CONFIG_PM
-static u32 rtc_handler(void *context)
-{
-        acpi_clear_event(ACPI_EVENT_RTC);
-        acpi_disable_event(ACPI_EVENT_RTC, 0);
-        return ACPI_INTERRUPT_HANDLED;
-}
-
-static inline void rtc_wake_setup(void)
-{
-        acpi_install_fixed_event_handler(ACPI_EVENT_RTC, rtc_handler, NULL);
-        /*
-         * After the RTC handler is installed, the Fixed_RTC event should
-         * be disabled. Only when the RTC alarm is set will it be enabled.
-         */
-        acpi_clear_event(ACPI_EVENT_RTC);
-        acpi_disable_event(ACPI_EVENT_RTC, 0);
-}
-
-static void rtc_wake_on(struct device *dev)
-{
-        acpi_clear_event(ACPI_EVENT_RTC);
-        acpi_enable_event(ACPI_EVENT_RTC, 0);
-}
-
-static void rtc_wake_off(struct device *dev)
-{
-        acpi_disable_event(ACPI_EVENT_RTC, 0);
-}
-#else
-#define rtc_wake_setup()        do{}while(0)
-#define rtc_wake_on             NULL
-#define rtc_wake_off            NULL
-#endif
-
-/* Every ACPI platform has a mc146818 compatible "cmos rtc".  Here we find
- * its device node and pass extra config data.  This helps its driver use
- * capabilities that the now-obsolete mc146818 didn't have, and informs it
- * that this board's RTC is wakeup-capable (per ACPI spec).
- */
-#include <linux/mc146818rtc.h>
-
-static struct cmos_rtc_board_info rtc_info;
-
-
-/* PNP devices are registered in a subsys_initcall();
- * ACPI specifies the PNP IDs to use.
- */
-#include <linux/pnp.h>
-
-static int __init pnp_match(struct device *dev, void *data)
-{
-        static const char *ids[] = { "PNP0b00", "PNP0b01", "PNP0b02", };
-        struct pnp_dev *pnp = to_pnp_dev(dev);
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(ids); i++) {
-                if (compare_pnp_id(pnp->id, ids[i]) != 0)
-                        return 1;
-        }
-        return 0;
-}
-
-static struct device *__init get_rtc_dev(void)
-{
-        return bus_find_device(&pnp_bus_type, NULL, NULL, pnp_match);
-}
-
-static int __init acpi_rtc_init(void)
-{
-        struct device *dev = get_rtc_dev();
-
-        if (acpi_disabled)
-                return 0;
-
-        if (dev) {
-                rtc_wake_setup();
-                rtc_info.wake_on = rtc_wake_on;
-                rtc_info.wake_off = rtc_wake_off;
-
-                /* workaround bug in some ACPI tables */
-                if (acpi_gbl_FADT.month_alarm && !acpi_gbl_FADT.day_alarm) {
-                        DBG("bogus FADT month_alarm\n");
-                        acpi_gbl_FADT.month_alarm = 0;
-                }
-
-                rtc_info.rtc_day_alarm = acpi_gbl_FADT.day_alarm;
-                rtc_info.rtc_mon_alarm = acpi_gbl_FADT.month_alarm;
-                rtc_info.rtc_century = acpi_gbl_FADT.century;
-
-                /* NOTE:  S4_RTC_WAKE is NOT currently useful to Linux */
-                if (acpi_gbl_FADT.flags & ACPI_FADT_S4_RTC_WAKE)
-                        printk(PREFIX "RTC can wake from S4\n");
-
-
-                dev->platform_data = &rtc_info;
-
-                /* RTC always wakes from S1/S2/S3, and often S4/STD */
-                device_init_wakeup(dev, 1);
-
-                put_device(dev);
-        } else
-                DBG("RTC unavailable?\n");
-        return 0;
-}
-module_init(acpi_rtc_init);
-
-#endif
diff --git a/drivers/ata/pata_of_platform.c b/drivers/ata/pata_of_platform.c
index 408da30594c4..1f18ad9e4fe1 100644
--- a/drivers/ata/pata_of_platform.c
+++ b/drivers/ata/pata_of_platform.c
@@ -52,7 +52,7 @@ static int __devinit pata_of_platform_probe(struct of_device *ofdev,
 
         ret = of_irq_to_resource(dn, 0, &irq_res);
         if (ret == NO_IRQ)
-                irq_res.start = irq_res.end = -1;
+                irq_res.start = irq_res.end = 0;
         else
                 irq_res.flags = 0;
 
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index 41b4361bbf6e..02b596b9cf6a 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -148,6 +148,64 @@ static struct ata_port_operations pcmcia_8bit_port_ops = {
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
+
+struct pcmcia_config_check {
+        unsigned long ctl_base;
+        int skip_vcc;
+        int is_kme;
+};
+
+static int pcmcia_check_one_config(struct pcmcia_device *pdev,
+                                   cistpl_cftable_entry_t *cfg,
+                                   cistpl_cftable_entry_t *dflt,
+                                   unsigned int vcc,
+                                   void *priv_data)
+{
+        struct pcmcia_config_check *stk = priv_data;
+
+        /* Check for matching Vcc, unless we're desperate */
+        if (!stk->skip_vcc) {
+                if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                        if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000)
+                                return -ENODEV;
+                } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                        if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] / 10000)
+                                return -ENODEV;
+                }
+        }
+
+        if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                pdev->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+        else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                pdev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+
+        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
+                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+                pdev->io.BasePort1 = io->win[0].base;
+                pdev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
+                if (!(io->flags & CISTPL_IO_16BIT))
+                        pdev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                if (io->nwin == 2) {
+                        pdev->io.NumPorts1 = 8;
+                        pdev->io.BasePort2 = io->win[1].base;
+                        pdev->io.NumPorts2 = (stk->is_kme) ? 2 : 1;
+                        if (pcmcia_request_io(pdev, &pdev->io) != 0)
+                                return -ENODEV;
+                        stk->ctl_base = pdev->io.BasePort2;
+                } else if ((io->nwin == 1) && (io->win[0].len >= 16)) {
+                        pdev->io.NumPorts1 = io->win[0].len;
+                        pdev->io.NumPorts2 = 0;
+                        if (pcmcia_request_io(pdev, &pdev->io) != 0)
+                                return -ENODEV;
+                        stk->ctl_base = pdev->io.BasePort1 + 0x0e;
+                } else
+                        return -ENODEV;
+                /* If we've got this far, we're done */
+                return 0;
+        }
+        return -ENODEV;
+}
+
 /**
  *      pcmcia_init_one         -       attach a PCMCIA interface
  *      @pdev: pcmcia device
@@ -161,19 +219,11 @@ static int pcmcia_init_one(struct pcmcia_device *pdev)
         struct ata_host *host;
         struct ata_port *ap;
         struct ata_pcmcia_info *info;
-        tuple_t tuple;
-        struct {
-                unsigned short buf[128];
-                cisparse_t parse;
-                config_info_t conf;
-                cistpl_cftable_entry_t dflt;
-        } *stk = NULL;
-        cistpl_cftable_entry_t *cfg;
-        int pass, last_ret = 0, last_fn = 0, is_kme = 0, ret = -ENOMEM, p;
+        struct pcmcia_config_check *stk = NULL;
+        int last_ret = 0, last_fn = 0, is_kme = 0, ret = -ENOMEM, p;
         unsigned long io_base, ctl_base;
         void __iomem *io_addr, *ctl_addr;
         int n_ports = 1;
-
         struct ata_port_operations *ops = &pcmcia_port_ops;
 
         info = kzalloc(sizeof(*info), GFP_KERNEL);
@@ -193,96 +243,27 @@ static int pcmcia_init_one(struct pcmcia_device *pdev)
         pdev->conf.Attributes = CONF_ENABLE_IRQ;
         pdev->conf.IntType = INT_MEMORY_AND_IO;
 
-        /* Allocate resoure probing structures */
-
-        stk = kzalloc(sizeof(*stk), GFP_KERNEL);
-        if (!stk)
-                goto out1;
-
-        cfg = &stk->parse.cftable_entry;
-
-        /* Tuples we are walking */
-        tuple.TupleData = (cisdata_t *)&stk->buf;
-        tuple.TupleOffset = 0;
-        tuple.TupleDataMax = 255;
-        tuple.Attributes = 0;
-
         /* See if we have a manufacturer identifier. Use it to set is_kme for
            vendor quirks */
         is_kme = ((pdev->manf_id == MANFID_KME) &&
                   ((pdev->card_id == PRODID_KME_KXLC005_A) ||
                    (pdev->card_id == PRODID_KME_KXLC005_B)));
 
-        /* Not sure if this is right... look up the current Vcc */
-        CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(pdev, &stk->conf));
-/*      link->conf.Vcc = stk->conf.Vcc; */
-
-        pass = io_base = ctl_base = 0;
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        tuple.Attributes = 0;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(pdev, &tuple));
-
-        /* Now munch the resources looking for a suitable set */
-        while (1) {
-                if (pcmcia_get_tuple_data(pdev, &tuple) != 0)
-                        goto next_entry;
-                if (pcmcia_parse_tuple(pdev, &tuple, &stk->parse) != 0)
-                        goto next_entry;
-                /* Check for matching Vcc, unless we're desperate */
-                if (!pass) {
-                        if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                                if (stk->conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000)
-                                        goto next_entry;
-                        } else if (stk->dflt.vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                                if (stk->conf.Vcc != stk->dflt.vcc.param[CISTPL_POWER_VNOM] / 10000)
-                                        goto next_entry;
-                        }
-                }
+        /* Allocate resoure probing structures */
 
-                if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        pdev->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
-                else if (stk->dflt.vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        pdev->conf.Vpp = stk->dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;
-
-                if ((cfg->io.nwin > 0) || (stk->dflt.io.nwin > 0)) {
-                        cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &stk->dflt.io;
-                        pdev->conf.ConfigIndex = cfg->index;
-                        pdev->io.BasePort1 = io->win[0].base;
-                        pdev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
-                        if (!(io->flags & CISTPL_IO_16BIT))
-                                pdev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-                        if (io->nwin == 2) {
-                                pdev->io.NumPorts1 = 8;
-                                pdev->io.BasePort2 = io->win[1].base;
-                                pdev->io.NumPorts2 = (is_kme) ? 2 : 1;
-                                if (pcmcia_request_io(pdev, &pdev->io) != 0)
-                                        goto next_entry;
-                                io_base = pdev->io.BasePort1;
-                                ctl_base = pdev->io.BasePort2;
-                        } else if ((io->nwin == 1) && (io->win[0].len >= 16)) {
-                                pdev->io.NumPorts1 = io->win[0].len;
-                                pdev->io.NumPorts2 = 0;
-                                if (pcmcia_request_io(pdev, &pdev->io) != 0)
-                                        goto next_entry;
-                                io_base = pdev->io.BasePort1;
-                                ctl_base = pdev->io.BasePort1 + 0x0e;
-                        } else
-                                goto next_entry;
-                        /* If we've got this far, we're done */
-                        break;
-                }
-next_entry:
-                if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
-                        memcpy(&stk->dflt, cfg, sizeof(stk->dflt));
-                if (pass) {
-                        CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(pdev, &tuple));
-                } else if (pcmcia_get_next_tuple(pdev, &tuple) != 0) {
-                        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(pdev, &tuple));
-                        memset(&stk->dflt, 0, sizeof(stk->dflt));
-                        pass++;
-                }
-        }
+        stk = kzalloc(sizeof(*stk), GFP_KERNEL);
+        if (!stk)
+                goto out1;
+        stk->is_kme = is_kme;
+        stk->skip_vcc = io_base = ctl_base = 0;
 
+        if (pcmcia_loop_config(pdev, pcmcia_check_one_config, stk)) {
+                stk->skip_vcc = 1;
+                if (pcmcia_loop_config(pdev, pcmcia_check_one_config, stk))
+                        goto failed; /* No suitable config found */
+        }
+        io_base = pdev->io.BasePort1;
+        ctl_base = stk->ctl_base;
         CS_CHECK(RequestIRQ, pcmcia_request_irq(pdev, &pdev->irq));
         CS_CHECK(RequestConfiguration, pcmcia_request_configuration(pdev, &pdev->conf));
 
@@ -384,6 +365,7 @@ static struct pcmcia_device_id pcmcia_devices[] = {
         PCMCIA_DEVICE_MANF_CARD(0x0032, 0x0704),
         PCMCIA_DEVICE_MANF_CARD(0x0032, 0x2904),
         PCMCIA_DEVICE_MANF_CARD(0x0045, 0x0401),        /* SanDisk CFA */
+        PCMCIA_DEVICE_MANF_CARD(0x004f, 0x0000),        /* Kingston */
         PCMCIA_DEVICE_MANF_CARD(0x0097, 0x1620),        /* TI emulated */
         PCMCIA_DEVICE_MANF_CARD(0x0098, 0x0000),        /* Toshiba */
         PCMCIA_DEVICE_MANF_CARD(0x00a4, 0x002d),
@@ -404,9 +386,9 @@ static struct pcmcia_device_id pcmcia_devices[] = {
         PCMCIA_DEVICE_PROD_ID12("EXP   ", "CD-ROM", 0x0a5c52fd, 0x66536591),
         PCMCIA_DEVICE_PROD_ID12("EXP   ", "PnPIDE", 0x0a5c52fd, 0x0c694728),
         PCMCIA_DEVICE_PROD_ID12("FREECOM", "PCCARD-IDE", 0x5714cbf7, 0x48e0ab8e),
-        PCMCIA_DEVICE_PROD_ID12("Hyperstone", "Model1", 0x3d5b9ef5, 0xca6ab420),
         PCMCIA_DEVICE_PROD_ID12("HITACHI", "FLASH", 0xf4f43949, 0x9eb86aae),
         PCMCIA_DEVICE_PROD_ID12("HITACHI", "microdrive", 0xf4f43949, 0xa6d76178),
+        PCMCIA_DEVICE_PROD_ID12("Hyperstone", "Model1", 0x3d5b9ef5, 0xca6ab420),
         PCMCIA_DEVICE_PROD_ID12("IBM", "microdrive", 0xb569a6e5, 0xa6d76178),
         PCMCIA_DEVICE_PROD_ID12("IBM", "IBM17JSSFP20", 0xb569a6e5, 0xf2508753),
         PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF8GB", 0x2e6d1829, 0xacbe682e),
diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index 6318f6b57360..d8e8c49c0cbd 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -54,7 +54,7 @@ config FIRMWARE_IN_KERNEL
           such firmware, and do not wish to use an initrd.
 
           This single option controls the inclusion of firmware for
-          every driver which usees request_firmare() and ships its
+          every driver which uses request_firmare() and ships its
           firmware in the kernel source tree, to avoid a proliferation
           of 'Include firmware for xxx device' options.
 
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index ef522ae55480..5aee1c0169ea 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -333,9 +333,7 @@ static int match_name(struct device *dev, void *data)
 {
         const char *name = data;
 
-        if (strcmp(name, dev->bus_id) == 0)
-                return 1;
-        return 0;
+        return sysfs_streq(name, dev->bus_id);
 }
 
 /**
@@ -982,6 +980,56 @@ struct klist *bus_get_device_klist(struct bus_type *bus)
 }
 EXPORT_SYMBOL_GPL(bus_get_device_klist);
 
+/*
+ * Yes, this forcably breaks the klist abstraction temporarily.  It
+ * just wants to sort the klist, not change reference counts and
+ * take/drop locks rapidly in the process.  It does all this while
+ * holding the lock for the list, so objects can't otherwise be
+ * added/removed while we're swizzling.
+ */
+static void device_insertion_sort_klist(struct device *a, struct list_head *list,
+                                        int (*compare)(const struct device *a,
+                                                        const struct device *b))
+{
+        struct list_head *pos;
+        struct klist_node *n;
+        struct device *b;
+
+        list_for_each(pos, list) {
+                n = container_of(pos, struct klist_node, n_node);
+                b = container_of(n, struct device, knode_bus);
+                if (compare(a, b) <= 0) {
+                        list_move_tail(&a->knode_bus.n_node,
+                                       &b->knode_bus.n_node);
+                        return;
+                }
+        }
+        list_move_tail(&a->knode_bus.n_node, list);
+}
+
+void bus_sort_breadthfirst(struct bus_type *bus,
+                           int (*compare)(const struct device *a,
+                                          const struct device *b))
+{
+        LIST_HEAD(sorted_devices);
+        struct list_head *pos, *tmp;
+        struct klist_node *n;
+        struct device *dev;
+        struct klist *device_klist;
+
+        device_klist = bus_get_device_klist(bus);
+
+        spin_lock(&device_klist->k_lock);
+        list_for_each_safe(pos, tmp, &device_klist->k_list) {
+                n = container_of(pos, struct klist_node, n_node);
+                dev = container_of(n, struct device, knode_bus);
+                device_insertion_sort_klist(dev, &sorted_devices, compare);
+        }
+        list_splice(&sorted_devices, &device_klist->k_list);
+        spin_unlock(&device_klist->k_lock);
+}
+EXPORT_SYMBOL_GPL(bus_sort_breadthfirst);
+
 int __init buses_init(void)
 {
         bus_kset = kset_create_and_add("bus", &bus_uevent_ops, NULL);
diff --git a/drivers/base/core.c b/drivers/base/core.c
index b98cb1416a2d..8c2cc2648f5a 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -523,11 +523,16 @@ static void klist_children_put(struct klist_node *n)
  * device_initialize - init device structure.
  * @dev: device.
  *
- * This prepares the device for use by other layers,
- * including adding it to the device hierarchy.
+ * This prepares the device for use by other layers by initializing
+ * its fields.
  * It is the first half of device_register(), if called by
- * that, though it can also be called separately, so one
- * may use @dev's fields (e.g. the refcount).
+ * that function, though it can also be called separately, so one
+ * may use @dev's fields. In particular, get_device()/put_device()
+ * may be used for reference counting of @dev after calling this
+ * function.
+ *
+ * NOTE: Use put_device() to give up your reference instead of freeing
+ * @dev directly once you have called this function.
  */
 void device_initialize(struct device *dev)
 {
@@ -835,9 +840,13 @@ static void device_remove_sys_dev_entry(struct device *dev)
  * This is part 2 of device_register(), though may be called
  * separately _iff_ device_initialize() has been called separately.
  *
- * This adds it to the kobject hierarchy via kobject_add(), adds it
+ * This adds @dev to the kobject hierarchy via kobject_add(), adds it
  * to the global and sibling lists for the device, then
  * adds it to the other relevant subsystems of the driver model.
+ *
+ * NOTE: _Never_ directly free @dev after calling this function, even
+ * if it returned an error! Always use put_device() to give up your
+ * reference instead.
  */
 int device_add(struct device *dev)
 {
@@ -965,6 +974,10 @@ done:
  * I.e. you should only call the two helpers separately if
  * have a clearly defined need to use and refcount the device
  * before it is added to the hierarchy.
+ *
+ * NOTE: _Never_ directly free @dev after calling this function, even
+ * if it returned an error! Always use put_device() to give up the
+ * reference initialized in this function instead.
  */
 int device_register(struct device *dev)
 {
@@ -1243,7 +1256,7 @@ struct device *device_create_vargs(struct class *class, struct device *parent,
         return dev;
 
 error:
-        kfree(dev);
+        put_device(dev);
         return ERR_PTR(retval);
 }
 EXPORT_SYMBOL_GPL(device_create_vargs);
@@ -1314,6 +1327,11 @@ EXPORT_SYMBOL_GPL(device_destroy);
  * device_rename - renames a device
  * @dev: the pointer to the struct device to be renamed
  * @new_name: the new name of the device
+ *
+ * It is the responsibility of the caller to provide mutual
+ * exclusion between two different calls of device_rename
+ * on the same device to ensure that new_name is valid and
+ * won't conflict with other devices.
  */
 int device_rename(struct device *dev, char *new_name)
 {
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 3ac443b2ac08..20febc00a525 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -257,6 +257,9 @@ static int __driver_attach(struct device *dev, void *data)
          * is an error.
          */
 
+        if (drv->bus->match && !drv->bus->match(dev, drv))
+                return 0;
+
         if (dev->parent)        /* Needed for USB */
                 down(&dev->parent->sem);
         down(&dev->sem);
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index c9c92b00fd55..b7e571031ecd 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -164,8 +164,7 @@ static ssize_t firmware_loading_store(struct device *dev,
                 }
                 /* fallthrough */
         default:
-                printk(KERN_ERR "%s: unexpected value (%d)\n", __func__,
-                       loading);
+                dev_err(dev, "%s: unexpected value (%d)\n", __func__, loading);
                 /* fallthrough */
         case -1:
                 fw_load_abort(fw_priv);
@@ -309,7 +308,7 @@ static int fw_register_device(struct device **dev_p, const char *fw_name,
         *dev_p = NULL;
 
         if (!fw_priv || !f_dev) {
-                printk(KERN_ERR "%s: kmalloc failed\n", __func__);
+                dev_err(device, "%s: kmalloc failed\n", __func__);
                 retval = -ENOMEM;
                 goto error_kfree;
         }
@@ -329,8 +328,7 @@ static int fw_register_device(struct device **dev_p, const char *fw_name,
         f_dev->uevent_suppress = 1;
         retval = device_register(f_dev);
         if (retval) {
-                printk(KERN_ERR "%s: device_register failed\n",
-                       __func__);
+                dev_err(device, "%s: device_register failed\n", __func__);
                 goto error_kfree;
         }
         *dev_p = f_dev;
@@ -363,15 +361,13 @@ static int fw_setup_device(struct firmware *fw, struct device **dev_p,
         fw_priv->fw = fw;
         retval = sysfs_create_bin_file(&f_dev->kobj, &fw_priv->attr_data);
         if (retval) {
-                printk(KERN_ERR "%s: sysfs_create_bin_file failed\n",
-                       __func__);
+                dev_err(device, "%s: sysfs_create_bin_file failed\n", __func__);
                 goto error_unreg;
         }
 
         retval = device_create_file(f_dev, &dev_attr_loading);
         if (retval) {
-                printk(KERN_ERR "%s: device_create_file failed\n",
-                       __func__);
+                dev_err(device, "%s: device_create_file failed\n", __func__);
                 goto error_unreg;
         }
 
@@ -401,8 +397,8 @@ _request_firmware(const struct firmware **firmware_p, const char *name,
 
         *firmware_p = firmware = kzalloc(sizeof(*firmware), GFP_KERNEL);
         if (!firmware) {
-                printk(KERN_ERR "%s: kmalloc(struct firmware) failed\n",
-                       __func__);
+                dev_err(device, "%s: kmalloc(struct firmware) failed\n",
+                        __func__);
                 retval = -ENOMEM;
                 goto out;
         }
@@ -411,15 +407,15 @@ _request_firmware(const struct firmware **firmware_p, const char *name,
              builtin++) {
                 if (strcmp(name, builtin->name))
                         continue;
-                printk(KERN_INFO "firmware: using built-in firmware %s\n",
-                       name);
+                dev_info(device, "firmware: using built-in firmware %s\n",
+                         name);
                 firmware->size = builtin->size;
                 firmware->data = builtin->data;
                 return 0;
         }
 
         if (uevent)
-                printk(KERN_INFO "firmware: requesting %s\n", name);
+                dev_info(device, "firmware: requesting %s\n", name);
 
         retval = fw_setup_device(firmware, &f_dev, name, device, uevent);
         if (retval)
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 3f940393d6c7..dfcbfe504867 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -42,10 +42,8 @@ struct resource *platform_get_resource(struct platform_device *dev,
         for (i = 0; i < dev->num_resources; i++) {
                 struct resource *r = &dev->resource[i];
 
-                if ((r->flags & (IORESOURCE_IO|IORESOURCE_MEM|
-                                 IORESOURCE_IRQ|IORESOURCE_DMA)) == type)
-                        if (num-- == 0)
-                                return r;
+                if (type == resource_type(r) && num-- == 0)
+                        return r;
         }
         return NULL;
 }
@@ -78,10 +76,8 @@ struct resource *platform_get_resource_byname(struct platform_device *dev,
         for (i = 0; i < dev->num_resources; i++) {
                 struct resource *r = &dev->resource[i];
 
-                if ((r->flags & (IORESOURCE_IO|IORESOURCE_MEM|
-                                 IORESOURCE_IRQ|IORESOURCE_DMA)) == type)
-                        if (!strcmp(r->name, name))
-                                return r;
+                if (type == resource_type(r) && !strcmp(r->name, name))
+                        return r;
         }
         return NULL;
 }
@@ -259,9 +255,9 @@ int platform_device_add(struct platform_device *pdev)
 
                 p = r->parent;
                 if (!p) {
-                        if (r->flags & IORESOURCE_MEM)
+                        if (resource_type(r) == IORESOURCE_MEM)
                                 p = &iomem_resource;
-                        else if (r->flags & IORESOURCE_IO)
+                        else if (resource_type(r) == IORESOURCE_IO)
                                 p = &ioport_resource;
                 }
 
@@ -282,9 +278,14 @@ int platform_device_add(struct platform_device *pdev)
                 return ret;
 
  failed:
-        while (--i >= 0)
-                if (pdev->resource[i].flags & (IORESOURCE_MEM|IORESOURCE_IO))
-                        release_resource(&pdev->resource[i]);
+        while (--i >= 0) {
+                struct resource *r = &pdev->resource[i];
+                unsigned long type = resource_type(r);
+
+                if (type == IORESOURCE_MEM || type == IORESOURCE_IO)
+                        release_resource(r);
+        }
+
         return ret;
 }
 EXPORT_SYMBOL_GPL(platform_device_add);
@@ -306,7 +307,9 @@ void platform_device_del(struct platform_device *pdev)
 
                 for (i = 0; i < pdev->num_resources; i++) {
                         struct resource *r = &pdev->resource[i];
-                        if (r->flags & (IORESOURCE_MEM|IORESOURCE_IO))
+                        unsigned long type = resource_type(r);
+
+                        if (type == IORESOURCE_MEM || type == IORESOURCE_IO)
                                 release_resource(r);
                 }
         }
@@ -391,6 +394,53 @@ error:
 }
 EXPORT_SYMBOL_GPL(platform_device_register_simple);
 
+/**
+ * platform_device_register_data
+ * @parent: parent device for the device we're adding
+ * @name: base name of the device we're adding
+ * @id: instance id
+ * @data: platform specific data for this platform device
+ * @size: size of platform specific data
+ *
+ * This function creates a simple platform device that requires minimal
+ * resource and memory management. Canned release function freeing memory
+ * allocated for the device allows drivers using such devices to be
+ * unloaded without waiting for the last reference to the device to be
+ * dropped.
+ */
+struct platform_device *platform_device_register_data(
+                struct device *parent,
+                const char *name, int id,
+                const void *data, size_t size)
+{
+        struct platform_device *pdev;
+        int retval;
+
+        pdev = platform_device_alloc(name, id);
+        if (!pdev) {
+                retval = -ENOMEM;
+                goto error;
+        }
+
+        pdev->dev.parent = parent;
+
+        if (size) {
+                retval = platform_device_add_data(pdev, data, size);
+                if (retval)
+                        goto error;
+        }
+
+        retval = platform_device_add(pdev);
+        if (retval)
+                goto error;
+
+        return pdev;
+
+error:
+        platform_device_put(pdev);
+        return ERR_PTR(retval);
+}
+
 static int platform_drv_probe(struct device *_dev)
 {
         struct platform_driver *drv = to_platform_driver(_dev->driver);
@@ -862,7 +912,7 @@ static int platform_pm_restore_noirq(struct device *dev)
 
 #endif /* !CONFIG_HIBERNATION */
 
-struct pm_ext_ops platform_pm_ops = {
+static struct pm_ext_ops platform_pm_ops = {
         .base = {
                 .prepare = platform_pm_prepare,
                 .complete = platform_pm_complete,
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 273a944d4040..692c20ba5144 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -83,7 +83,7 @@ void device_pm_add(struct device *dev)
                  * transition is in progress in order to avoid leaving them
                  * unhandled down the road
                  */
-                WARN_ON(true);
+                dev_WARN(dev, "Parentless device registered during a PM transaction\n");
         }
 
         list_add_tail(&dev->power.entry, &dpm_list);
@@ -778,10 +778,7 @@ EXPORT_SYMBOL_GPL(device_suspend);
 
 void __suspend_report_result(const char *function, void *fn, int ret)
 {
-        if (ret) {
-                printk(KERN_ERR "%s(): ", function);
-                print_fn_descriptor_symbol("%s returns ", fn);
-                printk("%d\n", ret);
-        }
+        if (ret)
+                printk(KERN_ERR "%s(): %pF returns %d\n", function, fn, ret);
 }
 EXPORT_SYMBOL_GPL(__suspend_report_result);
diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c
index 1f56d2c5b7fc..200efc4d2c1e 100644
--- a/drivers/block/aoe/aoechr.c
+++ b/drivers/block/aoe/aoechr.c
@@ -284,9 +284,9 @@ aoechr_init(void)
                 return PTR_ERR(aoe_class);
         }
         for (i = 0; i < ARRAY_SIZE(chardevs); ++i)
-                device_create_drvdata(aoe_class, NULL,
-                                      MKDEV(AOE_MAJOR, chardevs[i].minor),
-                                      NULL, chardevs[i].name);
+                device_create(aoe_class, NULL,
+                              MKDEV(AOE_MAJOR, chardevs[i].minor), NULL,
+                              chardevs[i].name);
 
         return 0;
 }
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 49f274197b16..432cf4018291 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -1882,10 +1882,6 @@ static int __init atari_floppy_init (void)
                 /* Amiga, Mac, ... don't have Atari-compatible floppy :-) */
                 return -ENODEV;
 
-        if (MACH_IS_HADES)
-                /* Hades doesn't have Atari-compatible floppy */
-                return -ENODEV;
-
         if (register_blkdev(FLOPPY_MAJOR,"fd"))
                 return -EBUSY;
 
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index cf64ddf5d839..2cea27aba9a0 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4172,7 +4172,7 @@ static int __init floppy_init(void)
         int i, unit, drive;
         int err, dr;
 
-#if defined(CONFIG_PPC_MERGE)
+#if defined(CONFIG_PPC)
         if (check_legacy_ioport(FDC1))
                 return -ENODEV;
 #endif
diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index d731ca42f802..9dfa27163001 100644
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -686,9 +686,8 @@ static int __init pg_init(void)
         for (unit = 0; unit < PG_UNITS; unit++) {
                 struct pg *dev = &devices[unit];
                 if (dev->present)
-                        device_create_drvdata(pg_class, NULL,
-                                              MKDEV(major, unit), NULL,
-                                              "pg%u", unit);
+                        device_create(pg_class, NULL, MKDEV(major, unit), NULL,
+                                      "pg%u", unit);
         }
         err = 0;
         goto out;
diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index 673b8b2fd337..5ae229656eaa 100644
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -979,12 +979,10 @@ static int __init pt_init(void)
 
         for (unit = 0; unit < PT_UNITS; unit++)
                 if (pt[unit].present) {
-                        device_create_drvdata(pt_class, NULL,
-                                              MKDEV(major, unit), NULL,
-                                              "pt%d", unit);
-                        device_create_drvdata(pt_class, NULL,
-                                              MKDEV(major, unit + 128), NULL,
-                                              "pt%dn", unit);
+                        device_create(pt_class, NULL, MKDEV(major, unit), NULL,
+                                      "pt%d", unit);
+                        device_create(pt_class, NULL, MKDEV(major, unit + 128),
+                                      NULL, "pt%dn", unit);
                 }
         goto out;
 
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 0e077150568b..195ca7c720f5 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -302,9 +302,8 @@ static struct kobj_type kobj_pkt_type_wqueue = {
 static void pkt_sysfs_dev_new(struct pktcdvd_device *pd)
 {
         if (class_pktcdvd) {
-                pd->dev = device_create_drvdata(class_pktcdvd, NULL,
-                                                pd->pkt_dev, NULL,
-                                                "%s", pd->name);
+                pd->dev = device_create(class_pktcdvd, NULL, pd->pkt_dev, NULL,
+                                        "%s", pd->name);
                 if (IS_ERR(pd->dev))
                         pd->dev = NULL;
         }
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index f1c8feb5510b..1730d29e6044 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -249,7 +249,6 @@ static int send_request(struct request *req)
         struct HvLpEvent *hev;
         struct scatterlist sg[VIOMAXBLOCKDMA];
         int sgindex;
-        int statindex;
         struct viodasd_device *d;
         unsigned long flags;
 
@@ -258,11 +257,9 @@ static int send_request(struct request *req)
         if (rq_data_dir(req) == READ) {
                 direction = DMA_FROM_DEVICE;
                 viocmd = viomajorsubtype_blockio | vioblockread;
-                statindex = 0;
         } else {
                 direction = DMA_TO_DEVICE;
                 viocmd = viomajorsubtype_blockio | vioblockwrite;
-                statindex = 1;
         }
 
         d = req->rq_disk->private_data;
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index bcf57927b7a8..e6ee21d99d92 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -901,23 +901,23 @@ static int bluecard_config(struct pcmcia_device *link)
         for (n = 0; n < 0x400; n += 0x40) {
                 link->io.BasePort1 = n ^ 0x300;
                 i = pcmcia_request_io(link, &link->io);
-                if (i == CS_SUCCESS)
+                if (i == 0)
                         break;
         }
 
-        if (i != CS_SUCCESS) {
+        if (i != 0) {
                 cs_error(link, RequestIO, i);
                 goto failed;
         }
 
         i = pcmcia_request_irq(link, &link->irq);
-        if (i != CS_SUCCESS) {
+        if (i != 0) {
                 cs_error(link, RequestIRQ, i);
                 link->irq.AssignedIRQ = 0;
         }
 
         i = pcmcia_request_configuration(link, &link->conf);
-        if (i != CS_SUCCESS) {
+        if (i != 0) {
                 cs_error(link, RequestConfiguration, i);
                 goto failed;
         }
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index 27058477cc8b..2cbe70b66470 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -678,101 +678,78 @@ static void bt3c_detach(struct pcmcia_device *link)
         kfree(info);
 }
 
-static int get_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)
+static int bt3c_check_config(struct pcmcia_device *p_dev,
+                             cistpl_cftable_entry_t *cf,
+                             cistpl_cftable_entry_t *dflt,
+                             unsigned int vcc,
+                             void *priv_data)
 {
-        int i;
-
-        i = pcmcia_get_tuple_data(handle, tuple);
-        if (i != CS_SUCCESS)
-                return i;
-
-        return pcmcia_parse_tuple(handle, tuple, parse);
-}
-
-static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)
-{
-        if (pcmcia_get_first_tuple(handle, tuple) != CS_SUCCESS)
-                return CS_NO_MORE_ITEMS;
-        return get_tuple(handle, tuple, parse);
+        unsigned long try = (unsigned long) priv_data;
+
+        if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+        if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) &&
+            (cf->io.win[0].base != 0)) {
+                p_dev->io.BasePort1 = cf->io.win[0].base;
+                p_dev->io.IOAddrLines = (try == 0) ? 16 :
+                        cf->io.flags & CISTPL_IO_LINES_MASK;
+                if (!pcmcia_request_io(p_dev, &p_dev->io))
+                        return 0;
+        }
+        return -ENODEV;
 }
 
-static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)
+static int bt3c_check_config_notpicky(struct pcmcia_device *p_dev,
+                                      cistpl_cftable_entry_t *cf,
+                                      cistpl_cftable_entry_t *dflt,
+                                      unsigned int vcc,
+                                      void *priv_data)
 {
-        if (pcmcia_get_next_tuple(handle, tuple) != CS_SUCCESS)
-                return CS_NO_MORE_ITEMS;
-        return get_tuple(handle, tuple, parse);
+        static unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
+        int j;
+
+        if ((cf->io.nwin > 0) && ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) {
+                for (j = 0; j < 5; j++) {
+                        p_dev->io.BasePort1 = base[j];
+                        p_dev->io.IOAddrLines = base[j] ? 16 : 3;
+                        if (!pcmcia_request_io(p_dev, &p_dev->io))
+                                return 0;
+                }
+        }
+        return -ENODEV;
 }
 
 static int bt3c_config(struct pcmcia_device *link)
 {
-        static unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
         bt3c_info_t *info = link->priv;
-        tuple_t tuple;
-        u_short buf[256];
-        cisparse_t parse;
-        cistpl_cftable_entry_t *cf = &parse.cftable_entry;
-        int i, j, try;
-
-        /* First pass: look for a config entry that looks normal. */
-        tuple.TupleData = (cisdata_t *)buf;
-        tuple.TupleOffset = 0;
-        tuple.TupleDataMax = 255;
-        tuple.Attributes = 0;
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        /* Two tries: without IO aliases, then with aliases */
-        for (try = 0; try < 2; try++) {
-                i = first_tuple(link, &tuple, &parse);
-                while (i != CS_NO_MORE_ITEMS) {
-                        if (i != CS_SUCCESS)
-                                goto next_entry;
-                        if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM))
-                                link->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;
-                        if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) && (cf->io.win[0].base != 0)) {
-                                link->conf.ConfigIndex = cf->index;
-                                link->io.BasePort1 = cf->io.win[0].base;
-                                link->io.IOAddrLines = (try == 0) ? 16 : cf->io.flags & CISTPL_IO_LINES_MASK;
-                                i = pcmcia_request_io(link, &link->io);
-                                if (i == CS_SUCCESS)
-                                        goto found_port;
-                        }
-next_entry:
-                        i = next_tuple(link, &tuple, &parse);
-                }
-        }
+        int i;
+        unsigned long try;
+
+        /* First pass: look for a config entry that looks normal.
+           Two tries: without IO aliases, then with aliases */
+        for (try = 0; try < 2; try++)
+                if (!pcmcia_loop_config(link, bt3c_check_config, (void *) try))
+                        goto found_port;
 
         /* Second pass: try to find an entry that isn't picky about
            its base address, then try to grab any standard serial port
            address, and finally try to get any free port. */
-        i = first_tuple(link, &tuple, &parse);
-        while (i != CS_NO_MORE_ITEMS) {
-                if ((i == CS_SUCCESS) && (cf->io.nwin > 0) && ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) {
-                        link->conf.ConfigIndex = cf->index;
-                        for (j = 0; j < 5; j++) {
-                                link->io.BasePort1 = base[j];
-                                link->io.IOAddrLines = base[j] ? 16 : 3;
-                                i = pcmcia_request_io(link, &link->io);
-                                if (i == CS_SUCCESS)
-                                        goto found_port;
-                        }
-                }
-                i = next_tuple(link, &tuple, &parse);
-        }
+        if (!pcmcia_loop_config(link, bt3c_check_config_notpicky, NULL))
+                goto found_port;
 
-found_port:
-        if (i != CS_SUCCESS) {
-                BT_ERR("No usable port range found");
-                cs_error(link, RequestIO, i);
-                goto failed;
-        }
+        BT_ERR("No usable port range found");
+        cs_error(link, RequestIO, -ENODEV);
+        goto failed;
 
+found_port:
         i = pcmcia_request_irq(link, &link->irq);
-        if (i != CS_SUCCESS) {
+        if (i != 0) {
                 cs_error(link, RequestIRQ, i);
                 link->irq.AssignedIRQ = 0;
         }
 
         i = pcmcia_request_configuration(link, &link->conf);
-        if (i != CS_SUCCESS) {
+        if (i != 0) {
                 cs_error(link, RequestConfiguration, i);
                 goto failed;
         }
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index 68d1d258e6a4..8e556b7ff9f6 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -607,102 +607,78 @@ static void btuart_detach(struct pcmcia_device *link)
         kfree(info);
 }
 
-static int get_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)
+static int btuart_check_config(struct pcmcia_device *p_dev,
+                               cistpl_cftable_entry_t *cf,
+                               cistpl_cftable_entry_t *dflt,
+                               unsigned int vcc,
+                               void *priv_data)
 {
-        int i;
-
-        i = pcmcia_get_tuple_data(handle, tuple);
-        if (i != CS_SUCCESS)
-                return i;
-
-        return pcmcia_parse_tuple(handle, tuple, parse);
-}
-
-static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)
-{
-        if (pcmcia_get_first_tuple(handle, tuple) != CS_SUCCESS)
-                return CS_NO_MORE_ITEMS;
-        return get_tuple(handle, tuple, parse);
+        int *try = priv_data;
+
+        if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+        if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) &&
+            (cf->io.win[0].base != 0)) {
+                p_dev->io.BasePort1 = cf->io.win[0].base;
+                p_dev->io.IOAddrLines = (*try == 0) ? 16 :
+                        cf->io.flags & CISTPL_IO_LINES_MASK;
+                if (!pcmcia_request_io(p_dev, &p_dev->io))
+                        return 0;
+        }
+        return -ENODEV;
 }
 
-static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)
+static int btuart_check_config_notpicky(struct pcmcia_device *p_dev,
+                                        cistpl_cftable_entry_t *cf,
+                                        cistpl_cftable_entry_t *dflt,
+                                        unsigned int vcc,
+                                        void *priv_data)
 {
-        if (pcmcia_get_next_tuple(handle, tuple) != CS_SUCCESS)
-                return CS_NO_MORE_ITEMS;
-        return get_tuple(handle, tuple, parse);
+        static unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
+        int j;
+
+        if ((cf->io.nwin > 0) && ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) {
+                for (j = 0; j < 5; j++) {
+                        p_dev->io.BasePort1 = base[j];
+                        p_dev->io.IOAddrLines = base[j] ? 16 : 3;
+                        if (!pcmcia_request_io(p_dev, &p_dev->io))
+                                return 0;
+                }
+        }
+        return -ENODEV;
 }
 
 static int btuart_config(struct pcmcia_device *link)
 {
-        static unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
         btuart_info_t *info = link->priv;
-        tuple_t tuple;
-        u_short buf[256];
-        cisparse_t parse;
-        cistpl_cftable_entry_t *cf = &parse.cftable_entry;
-        int i, j, try;
-
-        /* First pass: look for a config entry that looks normal. */
-        tuple.TupleData = (cisdata_t *) buf;
-        tuple.TupleOffset = 0;
-        tuple.TupleDataMax = 255;
-        tuple.Attributes = 0;
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        /* Two tries: without IO aliases, then with aliases */
-        for (try = 0; try < 2; try++) {
-                i = first_tuple(link, &tuple, &parse);
-                while (i != CS_NO_MORE_ITEMS) {
-                        if (i != CS_SUCCESS)
-                                goto next_entry;
-                        if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM))
-                                link->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;
-                        if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) && (cf->io.win[0].base != 0)) {
-                                link->conf.ConfigIndex = cf->index;
-                                link->io.BasePort1 = cf->io.win[0].base;
-                                link->io.IOAddrLines = (try == 0) ? 16 : cf->io.flags & CISTPL_IO_LINES_MASK;
-                                i = pcmcia_request_io(link, &link->io);
-                                if (i == CS_SUCCESS)
-                                        goto found_port;
-                        }
-next_entry:
-                        i = next_tuple(link, &tuple, &parse);
-                }
-        }
+        int i;
+        int try;
+
+        /* First pass: look for a config entry that looks normal.
+           Two tries: without IO aliases, then with aliases */
+        for (try = 0; try < 2; try++)
+                if (!pcmcia_loop_config(link, btuart_check_config, &try))
+                        goto found_port;
 
         /* Second pass: try to find an entry that isn't picky about
            its base address, then try to grab any standard serial port
            address, and finally try to get any free port. */
-        i = first_tuple(link, &tuple, &parse);
-        while (i != CS_NO_MORE_ITEMS) {
-                if ((i == CS_SUCCESS) && (cf->io.nwin > 0)
-                    && ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) {
-                        link->conf.ConfigIndex = cf->index;
-                        for (j = 0; j < 5; j++) {
-                                link->io.BasePort1 = base[j];
-                                link->io.IOAddrLines = base[j] ? 16 : 3;
-                                i = pcmcia_request_io(link, &link->io);
-                                if (i == CS_SUCCESS)
-                                        goto found_port;
-                        }
-                }
-                i = next_tuple(link, &tuple, &parse);
-        }
+        if (!pcmcia_loop_config(link, btuart_check_config_notpicky, NULL))
+                goto found_port;
 
-found_port:
-        if (i != CS_SUCCESS) {
-                BT_ERR("No usable port range found");
-                cs_error(link, RequestIO, i);
-                goto failed;
-        }
+        BT_ERR("No usable port range found");
+        cs_error(link, RequestIO, -ENODEV);
+        goto failed;
 
+found_port:
         i = pcmcia_request_irq(link, &link->irq);
-        if (i != CS_SUCCESS) {
+        if (i != 0) {
                 cs_error(link, RequestIRQ, i);
                 link->irq.AssignedIRQ = 0;
         }
 
         i = pcmcia_request_configuration(link, &link->conf);
-        if (i != CS_SUCCESS) {
+        if (i != 0) {
                 cs_error(link, RequestConfiguration, i);
                 goto failed;
         }
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index dae45cdf02b2..e6e6b037695a 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -590,75 +590,40 @@ static void dtl1_detach(struct pcmcia_device *link)
         kfree(info);
 }
 
-static int get_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)
+static int dtl1_confcheck(struct pcmcia_device *p_dev,
+                          cistpl_cftable_entry_t *cf,
+                          cistpl_cftable_entry_t *dflt,
+                          unsigned int vcc,
+                          void *priv_data)
 {
-        int i;
-
-        i = pcmcia_get_tuple_data(handle, tuple);
-        if (i != CS_SUCCESS)
-                return i;
-
-        return pcmcia_parse_tuple(handle, tuple, parse);
-}
-
-static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)
-{
-        if (pcmcia_get_first_tuple(handle, tuple) != CS_SUCCESS)
-                return CS_NO_MORE_ITEMS;
-        return get_tuple(handle, tuple, parse);
-}
-
-static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)
-{
-        if (pcmcia_get_next_tuple(handle, tuple) != CS_SUCCESS)
-                return CS_NO_MORE_ITEMS;
-        return get_tuple(handle, tuple, parse);
+        if ((cf->io.nwin == 1) && (cf->io.win[0].len > 8)) {
+                p_dev->io.BasePort1 = cf->io.win[0].base;
+                p_dev->io.NumPorts1 = cf->io.win[0].len;        /*yo */
+                p_dev->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK;
+                if (!pcmcia_request_io(p_dev, &p_dev->io))
+                        return 0;
+        }
+        return -ENODEV;
 }
 
 static int dtl1_config(struct pcmcia_device *link)
 {
         dtl1_info_t *info = link->priv;
-        tuple_t tuple;
-        u_short buf[256];
-        cisparse_t parse;
-        cistpl_cftable_entry_t *cf = &parse.cftable_entry;
         int i;
 
-        tuple.TupleData = (cisdata_t *)buf;
-        tuple.TupleOffset = 0;
-        tuple.TupleDataMax = 255;
-        tuple.Attributes = 0;
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-
         /* Look for a generic full-sized window */
         link->io.NumPorts1 = 8;
-        i = first_tuple(link, &tuple, &parse);
-        while (i != CS_NO_MORE_ITEMS) {
-                if ((i == CS_SUCCESS) && (cf->io.nwin == 1) && (cf->io.win[0].len > 8)) {
-                        link->conf.ConfigIndex = cf->index;
-                        link->io.BasePort1 = cf->io.win[0].base;
-                        link->io.NumPorts1 = cf->io.win[0].len; /*yo */
-                        link->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK;
-                        i = pcmcia_request_io(link, &link->io);
-                        if (i == CS_SUCCESS)
-                                break;
-                }
-                i = next_tuple(link, &tuple, &parse);
-        }
-
-        if (i != CS_SUCCESS) {
-                cs_error(link, RequestIO, i);
+        if (!pcmcia_loop_config(link, dtl1_confcheck, NULL))
                 goto failed;
-        }
 
         i = pcmcia_request_irq(link, &link->irq);
-        if (i != CS_SUCCESS) {
+        if (i != 0) {
                 cs_error(link, RequestIRQ, i);
                 link->irq.AssignedIRQ = 0;
         }
 
         i = pcmcia_request_configuration(link, &link->conf);
-        if (i != CS_SUCCESS) {
+        if (i != 0) {
                 cs_error(link, RequestConfiguration, i);
                 goto failed;
         }
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 8dfcf77cb717..4426bb552bd9 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -484,7 +484,7 @@ static int hci_uart_tty_ioctl(struct tty_struct *tty, struct file * file,
                 return -EUNATCH;
 
         default:
-                err = n_tty_ioctl(tty, file, cmd, arg);
+                err = n_tty_ioctl_helper(tty, file, cmd, arg);
                 break;
         };
 
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index caff85149b9d..122254155ae1 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -350,7 +350,7 @@ config STALDRV
 
 config STALLION
         tristate "Stallion EasyIO or EC8/32 support"
-        depends on STALDRV && BROKEN_ON_SMP && (ISA || EISA || PCI)
+        depends on STALDRV && (ISA || EISA || PCI)
         help
           If you have an EasyIO or EasyConnection 8/32 multiport Stallion
           card, then this is for you; say Y.  Make sure to read
@@ -361,7 +361,7 @@ config STALLION
 
 config ISTALLION
         tristate "Stallion EC8/64, ONboard, Brumby support"
-        depends on STALDRV && BROKEN_ON_SMP && (ISA || EISA || PCI)
+        depends on STALDRV && (ISA || EISA || PCI)
         help
           If you have an EasyConnection 8/64, ONboard, Brumby or Stallion
           serial multiport card, say Y here. Make sure to read
@@ -1043,15 +1043,6 @@ config HPET
           open selects one of the timers supported by the HPET.  The timers are
           non-periodic and/or periodic.
 
-config HPET_RTC_IRQ
-        bool
-        default HPET_EMULATE_RTC
-        depends on RTC && HPET
-        help
-          If you say Y here, you will disable RTC_IRQ in drivers/char/rtc.c. It
-          is assumed the platform called hpet_alloc with the RTC IRQ values for
-          the HPET timers.
-
 config HPET_MMAP
         bool "Allow mmap of HPET"
         default y
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 6850f6da7576..1a4247dccac4 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -7,7 +7,7 @@
 #
 FONTMAPFILE = cp437.uni
 
-obj-y    += mem.o random.o tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o 
+obj-y    += mem.o random.o tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o tty_buffer.o tty_port.o
 
 obj-$(CONFIG_LEGACY_PTYS)       += pty.o
 obj-$(CONFIG_UNIX98_PTYS)       += pty.o
diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c
index 603a986e96af..3f98254b911f 100644
--- a/drivers/char/agp/amd-k7-agp.c
+++ b/drivers/char/agp/amd-k7-agp.c
@@ -223,12 +223,14 @@ static int amd_irongate_configure(void)
 
         current_size = A_SIZE_LVL2(agp_bridge->current_size);
 
-        /* Get the memory mapped registers */
-        pci_read_config_dword(agp_bridge->dev, AMD_MMBASE, &temp);
-        temp = (temp & PCI_BASE_ADDRESS_MEM_MASK);
-        amd_irongate_private.registers = (volatile u8 __iomem *) ioremap(temp, 4096);
-        if (!amd_irongate_private.registers)
-                return -ENOMEM;
+        if (!amd_irongate_private.registers) {
+                /* Get the memory mapped registers */
+                pci_read_config_dword(agp_bridge->dev, AMD_MMBASE, &temp);
+                temp = (temp & PCI_BASE_ADDRESS_MEM_MASK);
+                amd_irongate_private.registers = (volatile u8 __iomem *) ioremap(temp, 4096);
+                if (!amd_irongate_private.registers)
+                        return -ENOMEM;
+        }
 
         /* Write out the address of the gatt table */
         writel(agp_bridge->gatt_bus_addr, amd_irongate_private.registers+AMD_ATTBASE);
@@ -492,6 +494,26 @@ static void __devexit agp_amdk7_remove(struct pci_dev *pdev)
         agp_put_bridge(bridge);
 }
 
+#ifdef CONFIG_PM
+
+static int agp_amdk7_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+        pci_save_state(pdev);
+        pci_set_power_state(pdev, pci_choose_state(pdev, state));
+
+        return 0;
+}
+
+static int agp_amdk7_resume(struct pci_dev *pdev)
+{
+        pci_set_power_state(pdev, PCI_D0);
+        pci_restore_state(pdev);
+
+        return amd_irongate_driver.configure();
+}
+
+#endif /* CONFIG_PM */
+
 /* must be the same order as name table above */
 static struct pci_device_id agp_amdk7_pci_table[] = {
         {
@@ -528,6 +550,10 @@ static struct pci_driver agp_amdk7_pci_driver = {
         .id_table       = agp_amdk7_pci_table,
         .probe          = agp_amdk7_probe,
         .remove         = agp_amdk7_remove,
+#ifdef CONFIG_PM
+        .suspend        = agp_amdk7_suspend,
+        .resume         = agp_amdk7_resume,
+#endif
 };
 
 static int __init agp_amdk7_init(void)
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 043e36628d6d..1108665913e2 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -54,8 +54,7 @@
                  agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965Q_HB || \
                  agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965G_HB || \
                  agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965GM_HB || \
-                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965GME_HB || \
-                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_GM45_HB)
+                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965GME_HB)
 
 #define IS_G33 (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G33_HB || \
                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_Q35_HB || \
@@ -63,7 +62,8 @@
 
 #define IS_G4X (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGD_E_HB || \
                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_Q45_HB || \
-                agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G45_HB)
+                agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G45_HB || \
+                agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_GM45_HB)
 
 extern int agp_memory_reserved;
 
@@ -214,8 +214,8 @@ static int intel_i810_configure(void)
         if (agp_bridge->driver->needs_scratch_page) {
                 for (i = 0; i < current_size->num_entries; i++) {
                         writel(agp_bridge->scratch_page, intel_private.registers+I810_PTE_BASE+(i*4));
-                        readl(intel_private.registers+I810_PTE_BASE+(i*4));     /* PCI posting. */
                 }
+                readl(intel_private.registers+I810_PTE_BASE+((i-1)*4)); /* PCI posting. */
         }
         global_cache_flush();
         return 0;
@@ -525,8 +525,10 @@ static void intel_i830_init_gtt_entries(void)
                 size += 4;
         } else if (IS_G4X) {
                 /* On 4 series hardware, GTT stolen is separate from graphics
-                 * stolen, ignore it in stolen gtt entries counting */
-                size = 0;
+                 * stolen, ignore it in stolen gtt entries counting.  However,
+                 * 4KB of the stolen memory doesn't get mapped to the GTT.
+                 */
+                size = 4;
         } else {
                 /* On previous hardware, the GTT size was just what was
                  * required to map the aperture.
@@ -773,8 +775,8 @@ static int intel_i830_configure(void)
         if (agp_bridge->driver->needs_scratch_page) {
                 for (i = intel_private.gtt_entries; i < current_size->num_entries; i++) {
                         writel(agp_bridge->scratch_page, intel_private.registers+I810_PTE_BASE+(i*4));
-                        readl(intel_private.registers+I810_PTE_BASE+(i*4));     /* PCI Posting. */
                 }
+                readl(intel_private.registers+I810_PTE_BASE+((i-1)*4)); /* PCI Posting. */
         }
 
         global_cache_flush();
@@ -989,8 +991,8 @@ static int intel_i915_configure(void)
         if (agp_bridge->driver->needs_scratch_page) {
                 for (i = intel_private.gtt_entries; i < current_size->num_entries; i++) {
                         writel(agp_bridge->scratch_page, intel_private.gtt+i);
-                        readl(intel_private.gtt+i);     /* PCI Posting. */
                 }
+                readl(intel_private.gtt+i-1);   /* PCI Posting. */
         }
 
         global_cache_flush();
diff --git a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c
index dc70d3771811..5bbed3d79db9 100644
--- a/drivers/char/agp/nvidia-agp.c
+++ b/drivers/char/agp/nvidia-agp.c
@@ -201,10 +201,15 @@ extern int agp_memory_reserved;
 static int nvidia_insert_memory(struct agp_memory *mem, off_t pg_start, int type)
 {
         int i, j;
+        int mask_type;
 
-        if ((type != 0) || (mem->type != 0))
+        mask_type = agp_generic_type_to_mask_type(mem->bridge, type);
+        if (mask_type != 0 || type != mem->type)
                 return -EINVAL;
 
+        if (mem->page_count == 0)
+                return 0;
+
         if ((pg_start + mem->page_count) >
                 (nvidia_private.num_active_entries - agp_memory_reserved/PAGE_SIZE))
                 return -EINVAL;
@@ -220,10 +225,13 @@ static int nvidia_insert_memory(struct agp_memory *mem, off_t pg_start, int type
         }
         for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
                 writel(agp_bridge->driver->mask_memory(agp_bridge,
-                        mem->memory[i], mem->type),
+                        mem->memory[i], mask_type),
                         agp_bridge->gatt_table+nvidia_private.pg_offset+j);
-                readl(agp_bridge->gatt_table+nvidia_private.pg_offset+j);       /* PCI Posting. */
         }
+
+        /* PCI Posting. */
+        readl(agp_bridge->gatt_table+nvidia_private.pg_offset+j - 1);
+
         agp_bridge->driver->tlb_flush(mem);
         return 0;
 }
@@ -233,9 +241,15 @@ static int nvidia_remove_memory(struct agp_memory *mem, off_t pg_start, int type
 {
         int i;
 
-        if ((type != 0) || (mem->type != 0))
+        int mask_type;
+
+        mask_type = agp_generic_type_to_mask_type(mem->bridge, type);
+        if (mask_type != 0 || type != mem->type)
                 return -EINVAL;
 
+        if (mem->page_count == 0)
+                return 0;
+
         for (i = pg_start; i < (mem->page_count + pg_start); i++)
                 writel(agp_bridge->scratch_page, agp_bridge->gatt_table+nvidia_private.pg_offset+i);
 
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index 6e763e3f5a81..98821f97583c 100644
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -837,9 +837,6 @@ static int rs_put_char(struct tty_struct *tty, unsigned char ch)
         struct async_struct *info;
         unsigned long flags;
 
-        if (!tty)
-                return 0;
-
         info = tty->driver_data;
 
         if (serial_paranoia_check(info, tty->name, "rs_put_char"))
@@ -892,9 +889,6 @@ static int rs_write(struct tty_struct * tty, const unsigned char *buf, int count
         struct async_struct *info;
         unsigned long flags;
 
-        if (!tty)
-                return 0;
-
         info = tty->driver_data;
 
         if (serial_paranoia_check(info, tty->name, "rs_write"))
diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c
index 31d08b641f5b..05674febb0c6 100644
--- a/drivers/char/applicom.c
+++ b/drivers/char/applicom.c
@@ -478,7 +478,7 @@ static int do_ac_read(int IndexCard, char __user *buf,
                 struct st_ram_io *st_loc, struct mailbox *mailbox)
 {
         void __iomem *from = apbs[IndexCard].RamIO + RAM_TO_PC;
-        unsigned char *to = (unsigned char *)&mailbox;
+        unsigned char *to = (unsigned char *)mailbox;
 #ifdef DEBUG
         int c;
 #endif
@@ -712,8 +712,7 @@ static int ac_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un
         
         IndexCard = adgl->num_card-1;
          
-        if(cmd != 0 && cmd != 6 &&
-           ((IndexCard >= MAX_BOARD) || !apbs[IndexCard].RamIO)) {
+        if(cmd != 6 && ((IndexCard >= MAX_BOARD) || !apbs[IndexCard].RamIO)) {
                 static int warncount = 10;
                 if (warncount) {
                         printk( KERN_WARNING "APPLICOM driver IOCTL, bad board number %d\n",(int)IndexCard+1);
@@ -832,8 +831,7 @@ static int ac_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un
                 }
                 break;
         default:
-                printk(KERN_INFO "APPLICOM driver ioctl, unknown function code %d\n",cmd) ;
-                ret = -EINVAL;
+                ret = -ENOTTY;
                 break;
         }
         Dummy = readb(apbs[IndexCard].RamIO + VERS);
diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c
index b650b4e48e50..456f54db73e2 100644
--- a/drivers/char/bsr.c
+++ b/drivers/char/bsr.c
@@ -229,9 +229,8 @@ static int bsr_create_devs(struct device_node *bn)
                 if (result)
                         goto out_err;
 
-                cur->bsr_device = device_create_drvdata(bsr_class, NULL,
-                                                        cur->bsr_dev,
-                                                        cur, cur->bsr_name);
+                cur->bsr_device = device_create(bsr_class, NULL, cur->bsr_dev,
+                                                cur, cur->bsr_name);
                 if (!cur->bsr_device) {
                         printk(KERN_ERR "device_create failed for %s\n",
                                cur->bsr_name);
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index fe6d774fe2e4..5e5b1dc1a0a7 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -4993,12 +4993,14 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
                         device_id == PCI_DEVICE_ID_CYCLOM_Y_Hi) {
                 card_name = "Cyclom-Y";
 
-                addr0 = pci_iomap(pdev, 0, CyPCI_Yctl);
+                addr0 = ioremap_nocache(pci_resource_start(pdev, 0),
+                                CyPCI_Yctl);
                 if (addr0 == NULL) {
                         dev_err(&pdev->dev, "can't remap ctl region\n");
                         goto err_reg;
                 }
-                addr2 = pci_iomap(pdev, 2, CyPCI_Ywin);
+                addr2 = ioremap_nocache(pci_resource_start(pdev, 2),
+                                CyPCI_Ywin);
                 if (addr2 == NULL) {
                         dev_err(&pdev->dev, "can't remap base region\n");
                         goto err_unmap;
@@ -5013,7 +5015,8 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
         } else if (device_id == PCI_DEVICE_ID_CYCLOM_Z_Hi) {
                 struct RUNTIME_9060 __iomem *ctl_addr;
 
-                ctl_addr = addr0 = pci_iomap(pdev, 0, CyPCI_Zctl);
+                ctl_addr = addr0 = ioremap_nocache(pci_resource_start(pdev, 0),
+                                CyPCI_Zctl);
                 if (addr0 == NULL) {
                         dev_err(&pdev->dev, "can't remap ctl region\n");
                         goto err_reg;
@@ -5026,8 +5029,8 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
 
                 mailbox = (u32)readl(&ctl_addr->mail_box_0);
 
-                addr2 = pci_iomap(pdev, 2, mailbox == ZE_V1 ?
-                                CyPCI_Ze_win : CyPCI_Zwin);
+                addr2 = ioremap_nocache(pci_resource_start(pdev, 2),
+                                mailbox == ZE_V1 ? CyPCI_Ze_win : CyPCI_Zwin);
                 if (addr2 == NULL) {
                         dev_err(&pdev->dev, "can't remap base region\n");
                         goto err_unmap;
@@ -5159,9 +5162,9 @@ err_null:
         cy_card[card_no].base_addr = NULL;
         free_irq(irq, &cy_card[card_no]);
 err_unmap:
-        pci_iounmap(pdev, addr0);
+        iounmap(addr0);
         if (addr2)
-                pci_iounmap(pdev, addr2);
+                iounmap(addr2);
 err_reg:
         pci_release_regions(pdev);
 err_dis:
@@ -5186,9 +5189,9 @@ static void __devexit cy_pci_remove(struct pci_dev *pdev)
                 cy_writew(cinfo->ctl_addr + 0x68,
                                 readw(cinfo->ctl_addr + 0x68) & ~0x0900);
 
-        pci_iounmap(pdev, cinfo->base_addr);
+        iounmap(cinfo->base_addr);
         if (cinfo->ctl_addr)
-                pci_iounmap(pdev, cinfo->ctl_addr);
+                iounmap(cinfo->ctl_addr);
         if (cinfo->irq
 #ifndef CONFIG_CYZ_INTR
                 && !IS_CYC_Z(*cinfo)
diff --git a/drivers/char/ds1286.c b/drivers/char/ds1286.c
index fb584938c9c3..5329d482b582 100644
--- a/drivers/char/ds1286.c
+++ b/drivers/char/ds1286.c
@@ -443,7 +443,6 @@ static void ds1286_get_time(struct rtc_time *rtc_tm)
 {
         unsigned char save_control;
         unsigned long flags;
-        unsigned long uip_watchdog = jiffies;
 
         /*
          * read RTC once any update in progress is done. The update
@@ -456,8 +455,7 @@ static void ds1286_get_time(struct rtc_time *rtc_tm)
          */
 
         if (ds1286_is_updating() != 0)
-                while (time_before(jiffies, uip_watchdog + 2*HZ/100))
-                        barrier();
+                msleep(20);
 
         /*
          * Only the values that we read from the RTC are set. We leave
diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c
index ca7c72a486b2..85832ab924e6 100644
--- a/drivers/char/dsp56k.c
+++ b/drivers/char/dsp56k.c
@@ -508,8 +508,8 @@ static int __init dsp56k_init_driver(void)
                 err = PTR_ERR(dsp56k_class);
                 goto out_chrdev;
         }
-        device_create_drvdata(dsp56k_class, NULL, MKDEV(DSP56K_MAJOR, 0),
-                              NULL, "dsp56k");
+        device_create(dsp56k_class, NULL, MKDEV(DSP56K_MAJOR, 0), NULL,
+                      "dsp56k");
 
         printk(banner);
         goto out;
diff --git a/drivers/char/epca.c b/drivers/char/epca.c
index 456e4ede049f..4998b2761e8f 100644
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
@@ -1376,6 +1376,7 @@ static void post_fep_init(unsigned int crd)
                 unsigned long flags;
                 u16 tseg, rseg;
 
+                tty_port_init(&ch->port);
                 ch->brdchan = bc;
                 ch->mailbox = gd;
                 INIT_WORK(&ch->tqueue, do_softint);
@@ -1510,10 +1511,6 @@ static void post_fep_init(unsigned int crd)
                 ch->fepstopca = 0;
 
                 ch->close_delay = 50;
-                ch->port.count = 0;
-                ch->port.blocked_open = 0;
-                init_waitqueue_head(&ch->port.open_wait);
-                init_waitqueue_head(&ch->port.close_wait);
 
                 spin_unlock_irqrestore(&epca_lock, flags);
         }
diff --git a/drivers/char/generic_serial.c b/drivers/char/generic_serial.c
index 19d3afb0e50c..c6090f84a2e4 100644
--- a/drivers/char/generic_serial.c
+++ b/drivers/char/generic_serial.c
@@ -54,8 +54,6 @@ int gs_put_char(struct tty_struct * tty, unsigned char ch)
 
         func_enter (); 
 
-        if (!tty) return 0;
-
         port = tty->driver_data;
 
         if (!port) return 0;
@@ -97,8 +95,6 @@ int gs_write(struct tty_struct * tty,
 
         func_enter ();
 
-        if (!tty) return 0;
-
         port = tty->driver_data;
 
         if (!port) return 0;
@@ -185,7 +181,6 @@ static int gs_real_chars_in_buffer(struct tty_struct *tty)
         struct gs_port *port;
         func_enter ();
 
-        if (!tty) return 0;
         port = tty->driver_data;
 
         if (!port->rd) return 0;
@@ -274,8 +269,6 @@ void gs_flush_buffer(struct tty_struct *tty)
 
         func_enter ();
 
-        if (!tty) return;
-
         port = tty->driver_data;
 
         if (!port) return;
@@ -296,8 +289,6 @@ void gs_flush_chars(struct tty_struct * tty)
 
         func_enter ();
 
-        if (!tty) return;
-
         port = tty->driver_data;
 
         if (!port) return;
@@ -321,8 +312,6 @@ void gs_stop(struct tty_struct * tty)
 
         func_enter ();
 
-        if (!tty) return;
-
         port = tty->driver_data;
 
         if (!port) return;
@@ -341,8 +330,6 @@ void gs_start(struct tty_struct * tty)
 {
         struct gs_port *port;
 
-        if (!tty) return;
-
         port = tty->driver_data;
 
         if (!port) return;
@@ -393,8 +380,6 @@ void gs_hangup(struct tty_struct *tty)
 
         func_enter ();
 
-        if (!tty) return;
-
         port = tty->driver_data;
         tty = port->port.tty;
         if (!tty) 
@@ -426,8 +411,6 @@ int gs_block_til_ready(void *port_, struct file * filp)
 
         tty = port->port.tty;
 
-        if (!tty) return 0;
-
         gs_dprintk (GS_DEBUG_BTR, "Entering gs_block_till_ready.\n"); 
         /*
          * If the device is in the middle of being closed, then block
@@ -523,8 +506,6 @@ void gs_close(struct tty_struct * tty, struct file * filp)
         
         func_enter ();
 
-        if (!tty) return;
-
         port = (struct gs_port *) tty->driver_data;
 
         if (!port) return;
@@ -621,8 +602,6 @@ void gs_set_termios (struct tty_struct * tty,
 
         func_enter();
 
-        if (!tty) return;
-
         port = tty->driver_data;
 
         if (!port) return;
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index b3f5dbc6d880..f3cfb4c76125 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -53,6 +53,11 @@
 
 #define HPET_RANGE_SIZE         1024    /* from HPET spec */
 
+
+/* WARNING -- don't get confused.  These macros are never used
+ * to write the (single) counter, and rarely to read it.
+ * They're badly named; to fix, someday.
+ */
 #if BITS_PER_LONG == 64
 #define write_counter(V, MC)    writeq(V, MC)
 #define read_counter(MC)        readq(MC)
@@ -77,7 +82,7 @@ static struct clocksource clocksource_hpet = {
         .rating         = 250,
         .read           = read_hpet,
         .mask           = CLOCKSOURCE_MASK(64),
-        .mult           = 0, /*to be caluclated*/
+        .mult           = 0, /* to be calculated */
         .shift          = 10,
         .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
@@ -86,8 +91,6 @@ static struct clocksource *hpet_clocksource;
 
 /* A lock for concurrent access by app and isr hpet activity. */
 static DEFINE_SPINLOCK(hpet_lock);
-/* A lock for concurrent intermodule access to hpet and isr hpet activity. */
-static DEFINE_SPINLOCK(hpet_task_lock);
 
 #define HPET_DEV_NAME   (7)
 
@@ -99,7 +102,6 @@ struct hpet_dev {
         unsigned long hd_irqdata;
         wait_queue_head_t hd_waitqueue;
         struct fasync_struct *hd_async_queue;
-        struct hpet_task *hd_task;
         unsigned int hd_flags;
         unsigned int hd_irq;
         unsigned int hd_hdwirq;
@@ -173,11 +175,6 @@ static irqreturn_t hpet_interrupt(int irq, void *data)
                 writel(isr, &devp->hd_hpet->hpet_isr);
         spin_unlock(&hpet_lock);
 
-        spin_lock(&hpet_task_lock);
-        if (devp->hd_task)
-                devp->hd_task->ht_func(devp->hd_task->ht_data);
-        spin_unlock(&hpet_task_lock);
-
         wake_up_interruptible(&devp->hd_waitqueue);
 
         kill_fasync(&devp->hd_async_queue, SIGIO, POLL_IN);
@@ -185,6 +182,67 @@ static irqreturn_t hpet_interrupt(int irq, void *data)
         return IRQ_HANDLED;
 }
 
+static void hpet_timer_set_irq(struct hpet_dev *devp)
+{
+        unsigned long v;
+        int irq, gsi;
+        struct hpet_timer __iomem *timer;
+
+        spin_lock_irq(&hpet_lock);
+        if (devp->hd_hdwirq) {
+                spin_unlock_irq(&hpet_lock);
+                return;
+        }
+
+        timer = devp->hd_timer;
+
+        /* we prefer level triggered mode */
+        v = readl(&timer->hpet_config);
+        if (!(v & Tn_INT_TYPE_CNF_MASK)) {
+                v |= Tn_INT_TYPE_CNF_MASK;
+                writel(v, &timer->hpet_config);
+        }
+        spin_unlock_irq(&hpet_lock);
+
+        v = (readq(&timer->hpet_config) & Tn_INT_ROUTE_CAP_MASK) >>
+                                 Tn_INT_ROUTE_CAP_SHIFT;
+
+        /*
+         * In PIC mode, skip IRQ0-4, IRQ6-9, IRQ12-15 which is always used by
+         * legacy device. In IO APIC mode, we skip all the legacy IRQS.
+         */
+        if (acpi_irq_model == ACPI_IRQ_MODEL_PIC)
+                v &= ~0xf3df;
+        else
+                v &= ~0xffff;
+
+        for (irq = find_first_bit(&v, HPET_MAX_IRQ); irq < HPET_MAX_IRQ;
+                irq = find_next_bit(&v, HPET_MAX_IRQ, 1 + irq)) {
+
+                if (irq >= NR_IRQS) {
+                        irq = HPET_MAX_IRQ;
+                        break;
+                }
+
+                gsi = acpi_register_gsi(irq, ACPI_LEVEL_SENSITIVE,
+                                        ACPI_ACTIVE_LOW);
+                if (gsi > 0)
+                        break;
+
+                /* FIXME: Setup interrupt source table */
+        }
+
+        if (irq < HPET_MAX_IRQ) {
+                spin_lock_irq(&hpet_lock);
+                v = readl(&timer->hpet_config);
+                v |= irq << Tn_INT_ROUTE_CNF_SHIFT;
+                writel(v, &timer->hpet_config);
+                devp->hd_hdwirq = gsi;
+                spin_unlock_irq(&hpet_lock);
+        }
+        return;
+}
+
 static int hpet_open(struct inode *inode, struct file *file)
 {
         struct hpet_dev *devp;
@@ -199,8 +257,7 @@ static int hpet_open(struct inode *inode, struct file *file)
 
         for (devp = NULL, hpetp = hpets; hpetp && !devp; hpetp = hpetp->hp_next)
                 for (i = 0; i < hpetp->hp_ntimer; i++)
-                        if (hpetp->hp_dev[i].hd_flags & HPET_OPEN
-                            || hpetp->hp_dev[i].hd_task)
+                        if (hpetp->hp_dev[i].hd_flags & HPET_OPEN)
                                 continue;
                         else {
                                 devp = &hpetp->hp_dev[i];
@@ -219,6 +276,8 @@ static int hpet_open(struct inode *inode, struct file *file)
         spin_unlock_irq(&hpet_lock);
         unlock_kernel();
 
+        hpet_timer_set_irq(devp);
+
         return 0;
 }
 
@@ -441,7 +500,11 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp)
         devp->hd_irq = irq;
         t = devp->hd_ireqfreq;
         v = readq(&timer->hpet_config);
-        g = v | Tn_INT_ENB_CNF_MASK;
+
+        /* 64-bit comparators are not yet supported through the ioctls,
+         * so force this into 32-bit mode if it supports both modes
+         */
+        g = v | Tn_32MODE_CNF_MASK | Tn_INT_ENB_CNF_MASK;
 
         if (devp->hd_flags & HPET_PERIODIC) {
                 write_counter(t, &timer->hpet_compare);
@@ -451,6 +514,12 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp)
                 v |= Tn_VAL_SET_CNF_MASK;
                 writeq(v, &timer->hpet_config);
                 local_irq_save(flags);
+
+                /* NOTE:  what we modify here is a hidden accumulator
+                 * register supported by periodic-capable comparators.
+                 * We never want to modify the (single) counter; that
+                 * would affect all the comparators.
+                 */
                 m = read_counter(&hpet->hpet_mc);
                 write_counter(t + m + hpetp->hp_delta, &timer->hpet_compare);
         } else {
@@ -604,57 +673,6 @@ static int hpet_is_known(struct hpet_data *hdp)
         return 0;
 }
 
-static inline int hpet_tpcheck(struct hpet_task *tp)
-{
-        struct hpet_dev *devp;
-        struct hpets *hpetp;
-
-        devp = tp->ht_opaque;
-
-        if (!devp)
-                return -ENXIO;
-
-        for (hpetp = hpets; hpetp; hpetp = hpetp->hp_next)
-                if (devp >= hpetp->hp_dev
-                    && devp < (hpetp->hp_dev + hpetp->hp_ntimer)
-                    && devp->hd_hpet == hpetp->hp_hpet)
-                        return 0;
-
-        return -ENXIO;
-}
-
-#if 0
-int hpet_unregister(struct hpet_task *tp)
-{
-        struct hpet_dev *devp;
-        struct hpet_timer __iomem *timer;
-        int err;
-
-        if ((err = hpet_tpcheck(tp)))
-                return err;
-
-        spin_lock_irq(&hpet_task_lock);
-        spin_lock(&hpet_lock);
-
-        devp = tp->ht_opaque;
-        if (devp->hd_task != tp) {
-                spin_unlock(&hpet_lock);
-                spin_unlock_irq(&hpet_task_lock);
-                return -ENXIO;
-        }
-
-        timer = devp->hd_timer;
-        writeq((readq(&timer->hpet_config) & ~Tn_INT_ENB_CNF_MASK),
-               &timer->hpet_config);
-        devp->hd_flags &= ~(HPET_IE | HPET_PERIODIC);
-        devp->hd_task = NULL;
-        spin_unlock(&hpet_lock);
-        spin_unlock_irq(&hpet_task_lock);
-
-        return 0;
-}
-#endif  /*  0  */
-
 static ctl_table hpet_table[] = {
         {
          .ctl_name = CTL_UNNUMBERED,
@@ -746,6 +764,7 @@ int hpet_alloc(struct hpet_data *hdp)
         static struct hpets *last = NULL;
         unsigned long period;
         unsigned long long temp;
+        u32 remainder;
 
         /*
          * hpet_alloc can be called by platform dependent code.
@@ -809,9 +828,13 @@ int hpet_alloc(struct hpet_data *hdp)
                 printk("%s %d", i > 0 ? "," : "", hdp->hd_irq[i]);
         printk("\n");
 
-        printk(KERN_INFO "hpet%u: %u %d-bit timers, %Lu Hz\n",
-               hpetp->hp_which, hpetp->hp_ntimer,
-               cap & HPET_COUNTER_SIZE_MASK ? 64 : 32, hpetp->hp_tick_freq);
+        temp = hpetp->hp_tick_freq;
+        remainder = do_div(temp, 1000000);
+        printk(KERN_INFO
+                "hpet%u: %u comparators, %d-bit %u.%06u MHz counter\n",
+                hpetp->hp_which, hpetp->hp_ntimer,
+                cap & HPET_COUNTER_SIZE_MASK ? 64 : 32,
+                (unsigned) temp, remainder);
 
         mcfg = readq(&hpet->hpet_config);
         if ((mcfg & HPET_ENABLE_CNF_MASK) == 0) {
@@ -874,8 +897,6 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)
                 hdp->hd_address = ioremap(addr.minimum, addr.address_length);
 
                 if (hpet_is_known(hdp)) {
-                        printk(KERN_DEBUG "%s: 0x%lx is busy\n",
-                                __func__, hdp->hd_phys_address);
                         iounmap(hdp->hd_address);
                         return AE_ALREADY_EXISTS;
                 }
@@ -891,8 +912,6 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)
                                                 HPET_RANGE_SIZE);
 
                 if (hpet_is_known(hdp)) {
-                        printk(KERN_DEBUG "%s: 0x%lx is busy\n",
-                                __func__, hdp->hd_phys_address);
                         iounmap(hdp->hd_address);
                         return AE_ALREADY_EXISTS;
                 }
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index fd64137b1ab9..bf70450a49cc 100644
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -367,13 +367,13 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
         spin_lock_irqsave(&hp->lock, flags);
 
         if (--hp->count == 0) {
-                if (hp->ops->notifier_del)
-                        hp->ops->notifier_del(hp, hp->data);
-
                 /* We are done with the tty pointer now. */
                 hp->tty = NULL;
                 spin_unlock_irqrestore(&hp->lock, flags);
 
+                if (hp->ops->notifier_del)
+                        hp->ops->notifier_del(hp, hp->data);
+
                 /*
                  * Chain calls chars_in_buffer() and returns immediately if
                  * there is no buffered data otherwise sleeps on a wait queue
@@ -416,11 +416,11 @@ static void hvc_hangup(struct tty_struct *tty)
         hp->n_outbuf = 0;
         hp->tty = NULL;
 
+        spin_unlock_irqrestore(&hp->lock, flags);
+
         if (hp->ops->notifier_del)
                         hp->ops->notifier_del(hp, hp->data);
 
-        spin_unlock_irqrestore(&hp->lock, flags);
-
         while(temp_open_count) {
                 --temp_open_count;
                 kref_put(&hp->kref, destroy_hvc_struct);
@@ -819,11 +819,11 @@ static int hvc_init(void)
         hvc_driver = drv;
         return 0;
 
-put_tty:
-        put_tty_driver(hvc_driver);
 stop_thread:
         kthread_stop(hvc_task);
         hvc_task = NULL;
+put_tty:
+        put_tty_driver(drv);
 out:
         return err;
 }
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index 51738bdd834e..d4e7dca06e4f 100644
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@ -118,18 +118,21 @@ static int __init omap_rng_probe(struct platform_device *pdev)
 
         mem = request_mem_region(res->start, res->end - res->start + 1,
                                  pdev->name);
-        if (mem == NULL)
-                return -EBUSY;
+        if (mem == NULL) {
+                ret = -EBUSY;
+                goto err_region;
+        }
 
         dev_set_drvdata(&pdev->dev, mem);
-        rng_base = (u32 __force __iomem *)io_p2v(res->start);
+        rng_base = ioremap(res->start, res->end - res->start + 1);
+        if (!rng_base) {
+                ret = -ENOMEM;
+                goto err_ioremap;
+        }
 
         ret = hwrng_register(&omap_rng_ops);
-        if (ret) {
-                release_resource(mem);
-                rng_base = NULL;
-                return ret;
-        }
+        if (ret)
+                goto err_register;
 
         dev_info(&pdev->dev, "OMAP Random Number Generator ver. %02x\n",
                 omap_rng_read_reg(RNG_REV_REG));
@@ -138,6 +141,18 @@ static int __init omap_rng_probe(struct platform_device *pdev)
         rng_dev = pdev;
 
         return 0;
+
+err_register:
+        iounmap(rng_base);
+        rng_base = NULL;
+err_ioremap:
+        release_resource(mem);
+err_region:
+        if (cpu_is_omap24xx()) {
+                clk_disable(rng_ick);
+                clk_put(rng_ick);
+        }
+        return ret;
 }
 
 static int __exit omap_rng_remove(struct platform_device *pdev)
@@ -148,6 +163,8 @@ static int __exit omap_rng_remove(struct platform_device *pdev)
 
         omap_rng_write_reg(RNG_MASK_REG, 0x0);
 
+        iounmap(rng_base);
+
         if (cpu_is_omap24xx()) {
                 clk_disable(rng_ick);
                 clk_put(rng_ick);
diff --git a/drivers/char/ip2/Makefile b/drivers/char/ip2/Makefile
index 939618f62fe1..bc397d92b499 100644
--- a/drivers/char/ip2/Makefile
+++ b/drivers/char/ip2/Makefile
@@ -4,5 +4,5 @@
 
 obj-$(CONFIG_COMPUTONE)         += ip2.o
 
-ip2-objs                        := ip2base.o ip2main.o
+ip2-objs                        := ip2main.o
 
diff --git a/drivers/char/ip2/i2ellis.c b/drivers/char/ip2/i2ellis.c
index 3601017f58cf..29db44de399f 100644
--- a/drivers/char/ip2/i2ellis.c
+++ b/drivers/char/ip2/i2ellis.c
@@ -69,38 +69,6 @@ static DEFINE_RWLOCK(Dl_spinlock);
 //=======================================================
 
 //******************************************************************************
-// Function:   iiEllisInit()
-// Parameters: None
-//
-// Returns:    Nothing
-//
-// Description:
-//
-// This routine performs any required initialization of the iiEllis subsystem.
-//
-//******************************************************************************
-static void
-iiEllisInit(void)
-{
-}
-
-//******************************************************************************
-// Function:   iiEllisCleanup()
-// Parameters: None
-//
-// Returns:    Nothing
-//
-// Description:
-//
-// This routine performs any required cleanup of the iiEllis subsystem.
-//
-//******************************************************************************
-static void
-iiEllisCleanup(void)
-{
-}
-
-//******************************************************************************
 // Function:   iiSetAddress(pB, address, delay)
 // Parameters: pB      - pointer to the board structure
 //             address - the purported I/O address of the board
diff --git a/drivers/char/ip2/i2ellis.h b/drivers/char/ip2/i2ellis.h
index c88a64e527aa..fb6df2456018 100644
--- a/drivers/char/ip2/i2ellis.h
+++ b/drivers/char/ip2/i2ellis.h
@@ -511,7 +511,6 @@ typedef void (*delayFunc_t)(unsigned int);
 //
 // Initialization of a board & structure is in four (five!) parts:
 //
-// 0) iiEllisInit()  - Initialize iiEllis subsystem.
 // 1) iiSetAddress() - Define the board address & delay function for a board.
 // 2) iiReset()      - Reset the board   (provided it exists)
 //       -- Note you may do this to several boards --
@@ -523,7 +522,6 @@ typedef void (*delayFunc_t)(unsigned int);
 // loadware.  To change loadware, you must begin again with step 2, resetting
 // the board again (step 1 not needed).
 
-static void iiEllisInit(void);
 static int iiSetAddress(i2eBordStrPtr, int, delayFunc_t );
 static int iiReset(i2eBordStrPtr);
 static int iiResetDelay(i2eBordStrPtr);
diff --git a/drivers/char/ip2/ip2base.c b/drivers/char/ip2/ip2base.c
deleted file mode 100644
index 8155e247c04b..000000000000
--- a/drivers/char/ip2/ip2base.c
+++ /dev/null
@@ -1,108 +0,0 @@
-// ip2.c
-// This is a dummy module to make the firmware available when needed
-// and allows it to be unloaded when not. Rumor is the __initdata 
-// macro doesn't always works on all platforms so we use this kludge.
-// If not compiled as a module it just makes fip_firm avaliable then
-//  __initdata should work as advertized
-//
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/wait.h>
-
-#ifndef __init
-#define __init
-#endif
-#ifndef __initfunc
-#define __initfunc(a) a
-#endif
-#ifndef __initdata
-#define __initdata
-#endif
-
-#include "ip2types.h"           
-
-int
-ip2_loadmain(int *, int *); // ref into ip2main.c
-
-/* Note: Add compiled in defaults to these arrays, not to the structure
-        in ip2.h any longer.  That structure WILL get overridden
-        by these values, or command line values, or insmod values!!!  =mhw=
-*/
-static int io[IP2_MAX_BOARDS]= { 0, 0, 0, 0 };
-static int irq[IP2_MAX_BOARDS] = { -1, -1, -1, -1 }; 
-
-static int poll_only = 0;
-
-MODULE_AUTHOR("Doug McNash");
-MODULE_DESCRIPTION("Computone IntelliPort Plus Driver");
-module_param_array(irq, int, NULL, 0);
-MODULE_PARM_DESC(irq,"Interrupts for IntelliPort Cards");
-module_param_array(io, int, NULL, 0);
-MODULE_PARM_DESC(io,"I/O ports for IntelliPort Cards");
-module_param(poll_only, bool, 0);
-MODULE_PARM_DESC(poll_only,"Do not use card interrupts");
-
-
-static int __init ip2_init(void)
-{
-        if( poll_only ) {
-                /* Hard lock the interrupts to zero */
-                irq[0] = irq[1] = irq[2] = irq[3] = 0;
-        }
-
-        return ip2_loadmain(io, irq);
-}
-module_init(ip2_init);
-
-MODULE_LICENSE("GPL");
-
-#ifndef MODULE
-/******************************************************************************
- *      ip2_setup:
- *              str: kernel command line string
- *
- *      Can't autoprobe the boards so user must specify configuration on
- *      kernel command line.  Sane people build it modular but the others
- *      come here.
- *
- *      Alternating pairs of io,irq for up to 4 boards.
- *              ip2=io0,irq0,io1,irq1,io2,irq2,io3,irq3
- *
- *              io=0 => No board
- *              io=1 => PCI
- *              io=2 => EISA
- *              else => ISA I/O address
- *
- *              irq=0 or invalid for ISA will revert to polling mode
- *
- *              Any value = -1, do not overwrite compiled in value.
- *
- ******************************************************************************/
-static int __init ip2_setup(char *str)
-{
-        int     ints[10];       /* 4 boards, 2 parameters + 2 */
-        int     i, j;
-
-        str = get_options (str, ARRAY_SIZE(ints), ints);
-
-        for( i = 0, j = 1; i < 4; i++ ) {
-                if( j > ints[0] ) {
-                        break;
-                }
-                if( ints[j] >= 0 ) {
-                        io[i] = ints[j];
-                }
-                j++;
-                if( j > ints[0] ) {
-                        break;
-                }
-                if( ints[j] >= 0 ) {
-                        irq[i] = ints[j];
-                }
-                j++;
-        }
-        return 1;
-}
-__setup("ip2=", ip2_setup);
-#endif /* !MODULE */
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c
index 689f9dcd3b86..70e0ebc30bd0 100644
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/char/ip2/ip2main.c
@@ -150,15 +150,12 @@ static int ip2_read_proc(char *, char **, off_t, int, int *, void * );
 /*************/
 
 /* String constants to identify ourselves */
-static char *pcName    = "Computone IntelliPort Plus multiport driver";
-static char *pcVersion = "1.2.14";
+static const char pcName[] = "Computone IntelliPort Plus multiport driver";
+static const char pcVersion[] = "1.2.14";
 
 /* String constants for port names */
-static char *pcDriver_name   = "ip2";
-static char *pcIpl               = "ip2ipl";
-
-// cheezy kludge or genius - you decide?
-int ip2_loadmain(int *, int *);
+static const char pcDriver_name[] = "ip2";
+static const char pcIpl[] = "ip2ipl";
 
 /***********************/
 /* Function Prototypes */
@@ -240,8 +237,8 @@ static const struct file_operations ip2_ipl = {
         .open           = ip2_ipl_open,
 }; 
 
-static unsigned long irq_counter = 0;
-static unsigned long bh_counter = 0;
+static unsigned long irq_counter;
+static unsigned long bh_counter;
 
 // Use immediate queue to service interrupts
 #define USE_IQI
@@ -252,7 +249,6 @@ static unsigned long bh_counter = 0;
  */
 #define  POLL_TIMEOUT   (jiffies + 1)
 static DEFINE_TIMER(PollTimer, ip2_poll, 0, 0);
-static char  TimerOn;
 
 #ifdef IP2DEBUG_TRACE
 /* Trace (debug) buffer data */
@@ -268,8 +264,8 @@ static int tracewrap;
 /**********/
 
 #if defined(MODULE) && defined(IP2DEBUG_OPEN)
-#define DBG_CNT(s) printk(KERN_DEBUG "(%s): [%x] refc=%d, ttyc=%d, modc=%x -> %s\n", \
-                    tty->name,(pCh->flags),ip2_tty_driver->refcount, \
+#define DBG_CNT(s) printk(KERN_DEBUG "(%s): [%x] ttyc=%d, modc=%x -> %s\n", \
+                    tty->name,(pCh->flags), \
                     tty->count,/*GET_USE_COUNT(module)*/0,s)
 #else
 #define DBG_CNT(s)
@@ -287,8 +283,9 @@ static int tracewrap;
 
 MODULE_AUTHOR("Doug McNash");
 MODULE_DESCRIPTION("Computone IntelliPort Plus Driver");
+MODULE_LICENSE("GPL");
 
-static int poll_only = 0;
+static int poll_only;
 
 static int Eisa_irq;
 static int Eisa_slot;
@@ -297,34 +294,46 @@ static int iindx;
 static char rirqs[IP2_MAX_BOARDS];
 static int Valid_Irqs[] = { 3, 4, 5, 7, 10, 11, 12, 15, 0};
 
+/* Note: Add compiled in defaults to these arrays, not to the structure
+        in ip2.h any longer.  That structure WILL get overridden
+        by these values, or command line values, or insmod values!!!  =mhw=
+*/
+static int io[IP2_MAX_BOARDS];
+static int irq[IP2_MAX_BOARDS] = { -1, -1, -1, -1 };
+
+MODULE_AUTHOR("Doug McNash");
+MODULE_DESCRIPTION("Computone IntelliPort Plus Driver");
+module_param_array(irq, int, NULL, 0);
+MODULE_PARM_DESC(irq, "Interrupts for IntelliPort Cards");
+module_param_array(io, int, NULL, 0);
+MODULE_PARM_DESC(io, "I/O ports for IntelliPort Cards");
+module_param(poll_only, bool, 0);
+MODULE_PARM_DESC(poll_only, "Do not use card interrupts");
+
 /* for sysfs class support */
 static struct class *ip2_class;
 
-// Some functions to keep track of what irq's we have
+/* Some functions to keep track of what irqs we have */
 
-static int
-is_valid_irq(int irq)
+static int __init is_valid_irq(int irq)
 {
         int *i = Valid_Irqs;
         
-        while ((*i != 0) && (*i != irq)) {
+        while (*i != 0 && *i != irq)
                 i++;
-        }
-        return (*i);
+
+        return *i;
 }
 
-static void
-mark_requested_irq( char irq )
+static void __init mark_requested_irq(char irq)
 {
         rirqs[iindx++] = irq;
 }
 
-#ifdef MODULE
-static int
-clear_requested_irq( char irq )
+static int __exit clear_requested_irq(char irq)
 {
         int i;
-        for ( i = 0; i < IP2_MAX_BOARDS; ++i ) {
+        for (i = 0; i < IP2_MAX_BOARDS; ++i) {
                 if (rirqs[i] == irq) {
                         rirqs[i] = 0;
                         return 1;
@@ -332,17 +341,15 @@ clear_requested_irq( char irq )
         }
         return 0;
 }
-#endif
 
-static int
-have_requested_irq( char irq )
+static int have_requested_irq(char irq)
 {
-        // array init to zeros so 0 irq will not be requested as a side effect
+        /* array init to zeros so 0 irq will not be requested as a side
+         * effect */
         int i;
-        for ( i = 0; i < IP2_MAX_BOARDS; ++i ) {
+        for (i = 0; i < IP2_MAX_BOARDS; ++i)
                 if (rirqs[i] == irq)
                         return 1;
-        }
         return 0;
 }
 
@@ -361,53 +368,45 @@ have_requested_irq( char irq )
 /* handle subsequent installations of the driver. All memory allocated by the */
 /* driver should be returned since it may be unloaded from memory.            */
 /******************************************************************************/
-#ifdef MODULE
-void __exit
-ip2_cleanup_module(void)
+static void __exit ip2_cleanup_module(void)
 {
         int err;
         int i;
 
-#ifdef IP2DEBUG_INIT
-        printk (KERN_DEBUG "Unloading %s: version %s\n", pcName, pcVersion );
-#endif
-        /* Stop poll timer if we had one. */
-        if ( TimerOn ) {
-                del_timer ( &PollTimer );
-                TimerOn = 0;
-        }
+        del_timer_sync(&PollTimer);
 
         /* Reset the boards we have. */
-        for( i = 0; i < IP2_MAX_BOARDS; ++i ) {
-                if ( i2BoardPtrTable[i] ) {
-                        iiReset( i2BoardPtrTable[i] );
-                }
-        }
+        for (i = 0; i < IP2_MAX_BOARDS; i++)
+                if (i2BoardPtrTable[i])
+                        iiReset(i2BoardPtrTable[i]);
 
         /* The following is done at most once, if any boards were installed. */
-        for ( i = 0; i < IP2_MAX_BOARDS; ++i ) {
-                if ( i2BoardPtrTable[i] ) {
-                        iiResetDelay( i2BoardPtrTable[i] );
+        for (i = 0; i < IP2_MAX_BOARDS; i++) {
+                if (i2BoardPtrTable[i]) {
+                        iiResetDelay(i2BoardPtrTable[i]);
                         /* free io addresses and Tibet */
-                        release_region( ip2config.addr[i], 8 );
+                        release_region(ip2config.addr[i], 8);
                         device_destroy(ip2_class, MKDEV(IP2_IPL_MAJOR, 4 * i));
-                        device_destroy(ip2_class, MKDEV(IP2_IPL_MAJOR, 4 * i + 1));
+                        device_destroy(ip2_class, MKDEV(IP2_IPL_MAJOR,
+                                                4 * i + 1));
                 }
                 /* Disable and remove interrupt handler. */
-                if ( (ip2config.irq[i] > 0) && have_requested_irq(ip2config.irq[i]) ) { 
-                        free_irq ( ip2config.irq[i], (void *)&pcName);
-                        clear_requested_irq( ip2config.irq[i]);
+                if (ip2config.irq[i] > 0 &&
+                                have_requested_irq(ip2config.irq[i])) {
+                        free_irq(ip2config.irq[i], (void *)&pcName);
+                        clear_requested_irq(ip2config.irq[i]);
                 }
         }
         class_destroy(ip2_class);
-        if ( ( err = tty_unregister_driver ( ip2_tty_driver ) ) ) {
-                printk(KERN_ERR "IP2: failed to unregister tty driver (%d)\n", err);
-        }
+        err = tty_unregister_driver(ip2_tty_driver);
+        if (err)
+                printk(KERN_ERR "IP2: failed to unregister tty driver (%d)\n",
+                                err);
         put_tty_driver(ip2_tty_driver);
         unregister_chrdev(IP2_IPL_MAJOR, pcIpl);
         remove_proc_entry("ip2mem", NULL);
 
-        // free memory
+        /* free memory */
         for (i = 0; i < IP2_MAX_BOARDS; i++) {
                 void *pB;
 #ifdef CONFIG_PCI
@@ -417,24 +416,18 @@ ip2_cleanup_module(void)
                         ip2config.pci_dev[i] = NULL;
                 }
 #endif
-                if ((pB = i2BoardPtrTable[i]) != 0 ) {
-                        kfree ( pB );
+                pB = i2BoardPtrTable[i];
+                if (pB != NULL) {
+                        kfree(pB);
                         i2BoardPtrTable[i] = NULL;
                 }
-                if ((DevTableMem[i]) != NULL ) {
-                        kfree ( DevTableMem[i]  );
+                if (DevTableMem[i] != NULL) {
+                        kfree(DevTableMem[i]);
                         DevTableMem[i] = NULL;
                 }
         }
-
-        /* Cleanup the iiEllis subsystem. */
-        iiEllisCleanup();
-#ifdef IP2DEBUG_INIT
-        printk (KERN_DEBUG "IP2 Unloaded\n" );
-#endif
 }
 module_exit(ip2_cleanup_module);
-#endif /* MODULE */
 
 static const struct tty_operations ip2_ops = {
         .open            = ip2_open,
@@ -494,139 +487,168 @@ static const struct firmware *ip2_request_firmware(void)
         return fw;
 }
 
-int
-ip2_loadmain(int *iop, int *irqp)
+#ifndef MODULE
+/******************************************************************************
+ *      ip2_setup:
+ *              str: kernel command line string
+ *
+ *      Can't autoprobe the boards so user must specify configuration on
+ *      kernel command line.  Sane people build it modular but the others
+ *      come here.
+ *
+ *      Alternating pairs of io,irq for up to 4 boards.
+ *              ip2=io0,irq0,io1,irq1,io2,irq2,io3,irq3
+ *
+ *              io=0 => No board
+ *              io=1 => PCI
+ *              io=2 => EISA
+ *              else => ISA I/O address
+ *
+ *              irq=0 or invalid for ISA will revert to polling mode
+ *
+ *              Any value = -1, do not overwrite compiled in value.
+ *
+ ******************************************************************************/
+static int __init ip2_setup(char *str)
+{
+        int j, ints[10];        /* 4 boards, 2 parameters + 2 */
+        unsigned int i;
+
+        str = get_options(str, ARRAY_SIZE(ints), ints);
+
+        for (i = 0, j = 1; i < 4; i++) {
+                if (j > ints[0])
+                        break;
+                if (ints[j] >= 0)
+                        io[i] = ints[j];
+                j++;
+                if (j > ints[0])
+                        break;
+                if (ints[j] >= 0)
+                        irq[i] = ints[j];
+                j++;
+        }
+        return 1;
+}
+__setup("ip2=", ip2_setup);
+#endif /* !MODULE */
+
+static int __init ip2_loadmain(void)
 {
         int i, j, box;
         int err = 0;
-        static int loaded;
         i2eBordStrPtr pB = NULL;
         int rc = -1;
-        static struct pci_dev *pci_dev_i = NULL;
+        struct pci_dev *pdev = NULL;
         const struct firmware *fw = NULL;
 
-        ip2trace (ITRC_NO_PORT, ITRC_INIT, ITRC_ENTER, 0 );
+        if (poll_only) {
+                /* Hard lock the interrupts to zero */
+                irq[0] = irq[1] = irq[2] = irq[3] = poll_only = 0;
+        }
+
+        ip2trace(ITRC_NO_PORT, ITRC_INIT, ITRC_ENTER, 0);
 
         /* process command line arguments to modprobe or
                 insmod i.e. iop & irqp */
         /* irqp and iop should ALWAYS be specified now...  But we check
                 them individually just to be sure, anyways... */
-        for ( i = 0; i < IP2_MAX_BOARDS; ++i ) {
-                if (iop) {
-                        ip2config.addr[i] = iop[i];
-                        if (irqp) {
-                                if( irqp[i] >= 0 ) {
-                                        ip2config.irq[i] = irqp[i];
-                                } else {
-                                        ip2config.irq[i] = 0;
-                                }
-        // This is a little bit of a hack.  If poll_only=1 on command
-        // line back in ip2.c OR all IRQs on all specified boards are
-        // explicitly set to 0, then drop to poll only mode and override
-        // PCI or EISA interrupts.  This superceeds the old hack of
-        // triggering if all interrupts were zero (like da default).
-        // Still a hack but less prone to random acts of terrorism.
-        //
-        // What we really should do, now that the IRQ default is set
-        // to -1, is to use 0 as a hard coded, do not probe.
-        //
-        //      /\/\|=mhw=|\/\/
-                                poll_only |= irqp[i];
-                        }
-                }
+        for (i = 0; i < IP2_MAX_BOARDS; ++i) {
+                ip2config.addr[i] = io[i];
+                if (irq[i] >= 0)
+                        ip2config.irq[i] = irq[i];
+                else
+                        ip2config.irq[i] = 0;
+        /* This is a little bit of a hack.  If poll_only=1 on command
+           line back in ip2.c OR all IRQs on all specified boards are
+           explicitly set to 0, then drop to poll only mode and override
+           PCI or EISA interrupts.  This superceeds the old hack of
+           triggering if all interrupts were zero (like da default).
+           Still a hack but less prone to random acts of terrorism.
+
+           What we really should do, now that the IRQ default is set
+           to -1, is to use 0 as a hard coded, do not probe.
+
+                /\/\|=mhw=|\/\/
+        */
+                poll_only |= irq[i];
         }
         poll_only = !poll_only;
 
         /* Announce our presence */
-        printk( KERN_INFO "%s version %s\n", pcName, pcVersion );
-
-        // ip2 can be unloaded and reloaded for no good reason
-        // we can't let that happen here or bad things happen
-        // second load hoses board but not system - fixme later
-        if (loaded) {
-                printk( KERN_INFO "Still loaded\n" );
-                return 0;
-        }
-        loaded++;
+        printk(KERN_INFO "%s version %s\n", pcName, pcVersion);
 
         ip2_tty_driver = alloc_tty_driver(IP2_MAX_PORTS);
         if (!ip2_tty_driver)
                 return -ENOMEM;
 
-        /* Initialise the iiEllis subsystem. */
-        iiEllisInit();
-
-        /* Initialize arrays. */
-        memset( i2BoardPtrTable, 0, sizeof i2BoardPtrTable );
-        memset( DevTable, 0, sizeof DevTable );
-
         /* Initialise all the boards we can find (up to the maximum). */
-        for ( i = 0; i < IP2_MAX_BOARDS; ++i ) {
-                switch ( ip2config.addr[i] ) { 
+        for (i = 0; i < IP2_MAX_BOARDS; ++i) {
+                switch (ip2config.addr[i]) {
                 case 0: /* skip this slot even if card is present */
                         break;
                 default: /* ISA */
                    /* ISA address must be specified */
-                        if ( (ip2config.addr[i] < 0x100) || (ip2config.addr[i] > 0x3f8) ) {
-                                printk ( KERN_ERR "IP2: Bad ISA board %d address %x\n",
-                                                         i, ip2config.addr[i] );
+                        if (ip2config.addr[i] < 0x100 ||
+                                        ip2config.addr[i] > 0x3f8) {
+                                printk(KERN_ERR "IP2: Bad ISA board %d "
+                                                "address %x\n", i,
+                                                ip2config.addr[i]);
                                 ip2config.addr[i] = 0;
-                        } else {
-                                ip2config.type[i] = ISA;
-
-                                /* Check for valid irq argument, set for polling if invalid */
-                                if (ip2config.irq[i] && !is_valid_irq(ip2config.irq[i])) {
-                                        printk(KERN_ERR "IP2: Bad IRQ(%d) specified\n",ip2config.irq[i]);
-                                        ip2config.irq[i] = 0;// 0 is polling and is valid in that sense
-                                }
+                                break;
+                        }
+                        ip2config.type[i] = ISA;
+
+                        /* Check for valid irq argument, set for polling if
+                         * invalid */
+                        if (ip2config.irq[i] &&
+                                        !is_valid_irq(ip2config.irq[i])) {
+                                printk(KERN_ERR "IP2: Bad IRQ(%d) specified\n",
+                                                ip2config.irq[i]);
+                                /* 0 is polling and is valid in that sense */
+                                ip2config.irq[i] = 0;
                         }
                         break;
                 case PCI:
 #ifdef CONFIG_PCI
-                        {
-                                int status;
+                {
+                        u32 addr;
+                        int status;
 
-                                pci_dev_i = pci_get_device(PCI_VENDOR_ID_COMPUTONE,
-                                                          PCI_DEVICE_ID_COMPUTONE_IP2EX, pci_dev_i);
-                                if (pci_dev_i != NULL) {
-                                        unsigned int addr;
-
-                                        if (pci_enable_device(pci_dev_i)) {
-                                                printk( KERN_ERR "IP2: can't enable PCI device at %s\n",
-                                                        pci_name(pci_dev_i));
-                                                break;
-                                        }
-                                        ip2config.type[i] = PCI;
-                                        ip2config.pci_dev[i] = pci_dev_get(pci_dev_i);
-                                        status =
-                                        pci_read_config_dword(pci_dev_i, PCI_BASE_ADDRESS_1, &addr);
-                                        if ( addr & 1 ) {
-                                                ip2config.addr[i]=(USHORT)(addr&0xfffe);
-                                        } else {
-                                                printk( KERN_ERR "IP2: PCI I/O address error\n");
-                                        }
+                        pdev = pci_get_device(PCI_VENDOR_ID_COMPUTONE,
+                                        PCI_DEVICE_ID_COMPUTONE_IP2EX, pdev);
+                        if (pdev == NULL) {
+                                ip2config.addr[i] = 0;
+                                printk(KERN_ERR "IP2: PCI board %d not "
+                                                "found\n", i);
+                                break;
+                        }
 
-//              If the PCI BIOS assigned it, lets try and use it.  If we
-//              can't acquire it or it screws up, deal with it then.
-
-//                                      if (!is_valid_irq(pci_irq)) {
-//                                              printk( KERN_ERR "IP2: Bad PCI BIOS IRQ(%d)\n",pci_irq);
-//                                              pci_irq = 0;
-//                                      }
-                                        ip2config.irq[i] = pci_dev_i->irq;
-                                } else {        // ann error
-                                        ip2config.addr[i] = 0;
-                                        printk(KERN_ERR "IP2: PCI board %d not found\n", i);
-                                } 
+                        if (pci_enable_device(pdev)) {
+                                dev_err(&pdev->dev, "can't enable device\n");
+                                break;
                         }
+                        ip2config.type[i] = PCI;
+                        ip2config.pci_dev[i] = pci_dev_get(pdev);
+                        status = pci_read_config_dword(pdev, PCI_BASE_ADDRESS_1,
+                                        &addr);
+                        if (addr & 1)
+                                ip2config.addr[i] = (USHORT)(addr & 0xfffe);
+                        else
+                                dev_err(&pdev->dev, "I/O address error\n");
+
+                        ip2config.irq[i] = pdev->irq;
+                }
 #else
-                        printk( KERN_ERR "IP2: PCI card specified but PCI support not\n");
-                        printk( KERN_ERR "IP2: configured in this kernel.\n");
-                        printk( KERN_ERR "IP2: Recompile kernel with CONFIG_PCI defined!\n");
+                        printk(KERN_ERR "IP2: PCI card specified but PCI "
+                                        "support not enabled.\n");
+                        printk(KERN_ERR "IP2: Recompile kernel with CONFIG_PCI "
+                                        "defined!\n");
 #endif /* CONFIG_PCI */
                         break;
                 case EISA:
-                        if ( (ip2config.addr[i] = find_eisa_board( Eisa_slot + 1 )) != 0) {
+                        ip2config.addr[i] = find_eisa_board(Eisa_slot + 1);
+                        if (ip2config.addr[i] != 0) {
                                 /* Eisa_irq set as side effect, boo */
                                 ip2config.type[i] = EISA;
                         } 
@@ -634,31 +656,32 @@ ip2_loadmain(int *iop, int *irqp)
                         break;
                 }       /* switch */
         }       /* for */
-        if (pci_dev_i)
-                pci_dev_put(pci_dev_i);
+        pci_dev_put(pdev);
 
-        for ( i = 0; i < IP2_MAX_BOARDS; ++i ) {
-                if ( ip2config.addr[i] ) {
+        for (i = 0; i < IP2_MAX_BOARDS; ++i) {
+                if (ip2config.addr[i]) {
                         pB = kzalloc(sizeof(i2eBordStr), GFP_KERNEL);
                         if (pB) {
                                 i2BoardPtrTable[i] = pB;
-                                iiSetAddress( pB, ip2config.addr[i], ii2DelayTimer );
-                                iiReset( pB );
-                        } else {
-                                printk(KERN_ERR "IP2: board memory allocation error\n");
-                        }
+                                iiSetAddress(pB, ip2config.addr[i],
+                                                ii2DelayTimer);
+                                iiReset(pB);
+                        } else
+                                printk(KERN_ERR "IP2: board memory allocation "
+                                                "error\n");
                 }
         }
-        for ( i = 0; i < IP2_MAX_BOARDS; ++i ) {
-                if ( ( pB = i2BoardPtrTable[i] ) != NULL ) {
-                        iiResetDelay( pB );
+        for (i = 0; i < IP2_MAX_BOARDS; ++i) {
+                pB = i2BoardPtrTable[i];
+                if (pB != NULL) {
+                        iiResetDelay(pB);
                         break;
                 }
         }
-        for ( i = 0; i < IP2_MAX_BOARDS; ++i ) {
+        for (i = 0; i < IP2_MAX_BOARDS; ++i) {
                 /* We don't want to request the firmware unless we have at
                    least one board */
-                if ( i2BoardPtrTable[i] != NULL ) {
+                if (i2BoardPtrTable[i] != NULL) {
                         if (!fw)
                                 fw = ip2_request_firmware();
                         if (!fw)
@@ -669,7 +692,7 @@ ip2_loadmain(int *iop, int *irqp)
         if (fw)
                 release_firmware(fw);
 
-        ip2trace (ITRC_NO_PORT, ITRC_INIT, 2, 0 );
+        ip2trace(ITRC_NO_PORT, ITRC_INIT, 2, 0);
 
         ip2_tty_driver->owner               = THIS_MODULE;
         ip2_tty_driver->name                 = "ttyF";
@@ -680,20 +703,23 @@ ip2_loadmain(int *iop, int *irqp)
         ip2_tty_driver->subtype              = SERIAL_TYPE_NORMAL;
         ip2_tty_driver->init_termios         = tty_std_termios;
         ip2_tty_driver->init_termios.c_cflag = B9600|CS8|CREAD|HUPCL|CLOCAL;
-        ip2_tty_driver->flags                = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
+        ip2_tty_driver->flags                = TTY_DRIVER_REAL_RAW |
+                TTY_DRIVER_DYNAMIC_DEV;
         tty_set_operations(ip2_tty_driver, &ip2_ops);
 
-        ip2trace (ITRC_NO_PORT, ITRC_INIT, 3, 0 );
+        ip2trace(ITRC_NO_PORT, ITRC_INIT, 3, 0);
 
-        /* Register the tty devices. */
-        if ( ( err = tty_register_driver ( ip2_tty_driver ) ) ) {
-                printk(KERN_ERR "IP2: failed to register tty driver (%d)\n", err);
+        err = tty_register_driver(ip2_tty_driver);
+        if (err) {
+                printk(KERN_ERR "IP2: failed to register tty driver\n");
                 put_tty_driver(ip2_tty_driver);
-                return -EINVAL;
-        } else
-        /* Register the IPL driver. */
-        if ( ( err = register_chrdev ( IP2_IPL_MAJOR, pcIpl, &ip2_ipl ) ) ) {
-                printk(KERN_ERR "IP2: failed to register IPL device (%d)\n", err );
+                return err; /* leaking resources */
+        }
+
+        err = register_chrdev(IP2_IPL_MAJOR, pcIpl, &ip2_ipl);
+        if (err) {
+                printk(KERN_ERR "IP2: failed to register IPL device (%d)\n",
+                                err);
         } else {
                 /* create the sysfs class */
                 ip2_class = class_create(THIS_MODULE, "ip2");
@@ -705,84 +731,86 @@ ip2_loadmain(int *iop, int *irqp)
         /* Register the read_procmem thing */
         if (!proc_create("ip2mem",0,NULL,&ip2mem_proc_fops)) {
                 printk(KERN_ERR "IP2: failed to register read_procmem\n");
-        } else {
+                return -EIO; /* leaking resources */
+        }
 
-        ip2trace (ITRC_NO_PORT, ITRC_INIT, 4, 0 );
-                /* Register the interrupt handler or poll handler, depending upon the
-                 * specified interrupt.
-                 */
+        ip2trace(ITRC_NO_PORT, ITRC_INIT, 4, 0);
+        /* Register the interrupt handler or poll handler, depending upon the
+         * specified interrupt.
+         */
 
-                for( i = 0; i < IP2_MAX_BOARDS; ++i ) {
-                        if ( 0 == ip2config.addr[i] ) {
-                                continue;
-                        }
+        for (i = 0; i < IP2_MAX_BOARDS; ++i) {
+                if (ip2config.addr[i] == 0)
+                        continue;
 
-                        if ( NULL != ( pB = i2BoardPtrTable[i] ) ) {
-                                device_create_drvdata(ip2_class, NULL,
-                                                      MKDEV(IP2_IPL_MAJOR, 4 * i),
-                                                      NULL, "ipl%d", i);
-                                device_create_drvdata(ip2_class, NULL,
-                                                      MKDEV(IP2_IPL_MAJOR, 4 * i + 1),
-                                                      NULL, "stat%d", i);
-
-                            for ( box = 0; box < ABS_MAX_BOXES; ++box )
-                            {
-                                for ( j = 0; j < ABS_BIGGEST_BOX; ++j )
-                                {
-                                    if ( pB->i2eChannelMap[box] & (1 << j) )
-                                    {
-                                        tty_register_device(ip2_tty_driver,
-                                            j + ABS_BIGGEST_BOX *
-                                                    (box+i*ABS_MAX_BOXES), NULL);
-                                    }
-                                }
-                            }
-                        }
+                pB = i2BoardPtrTable[i];
+                if (pB != NULL) {
+                        device_create(ip2_class, NULL,
+                                      MKDEV(IP2_IPL_MAJOR, 4 * i),
+                                      NULL, "ipl%d", i);
+                        device_create(ip2_class, NULL,
+                                      MKDEV(IP2_IPL_MAJOR, 4 * i + 1),
+                                      NULL, "stat%d", i);
+
+                        for (box = 0; box < ABS_MAX_BOXES; box++)
+                                for (j = 0; j < ABS_BIGGEST_BOX; j++)
+                                        if (pB->i2eChannelMap[box] & (1 << j))
+                                                tty_register_device(
+                                                        ip2_tty_driver,
+                                                        j + ABS_BIGGEST_BOX *
+                                                        (box+i*ABS_MAX_BOXES),
+                                                        NULL);
+                }
 
-                        if (poll_only) {
-//              Poll only forces driver to only use polling and
-//              to ignore the probed PCI or EISA interrupts.
-                                ip2config.irq[i] = CIR_POLL;
-                        }
-                        if ( ip2config.irq[i] == CIR_POLL ) {
+                if (poll_only) {
+                        /* Poll only forces driver to only use polling and
+                           to ignore the probed PCI or EISA interrupts. */
+                        ip2config.irq[i] = CIR_POLL;
+                }
+                if (ip2config.irq[i] == CIR_POLL) {
 retry:
-                                if (!TimerOn) {
-                                        PollTimer.expires = POLL_TIMEOUT;
-                                        add_timer ( &PollTimer );
-                                        TimerOn = 1;
-                                        printk( KERN_INFO "IP2: polling\n");
-                                }
-                        } else {
-                                if (have_requested_irq(ip2config.irq[i]))
-                                        continue;
-                                rc = request_irq( ip2config.irq[i], ip2_interrupt,
-                                        IP2_SA_FLAGS | (ip2config.type[i] == PCI ? IRQF_SHARED : 0),
-                                        pcName, i2BoardPtrTable[i]);
-                                if (rc) {
-                                        printk(KERN_ERR "IP2: an request_irq failed: error %d\n",rc);
-                                        ip2config.irq[i] = CIR_POLL;
-                                        printk( KERN_INFO "IP2: Polling %ld/sec.\n",
-                                                        (POLL_TIMEOUT - jiffies));
-                                        goto retry;
-                                } 
-                                mark_requested_irq(ip2config.irq[i]);
-                                /* Initialise the interrupt handler bottom half (aka slih). */
+                        if (!timer_pending(&PollTimer)) {
+                                mod_timer(&PollTimer, POLL_TIMEOUT);
+                                printk(KERN_INFO "IP2: polling\n");
                         }
-                }
-                for( i = 0; i < IP2_MAX_BOARDS; ++i ) {
-                        if ( i2BoardPtrTable[i] ) {
-                                set_irq( i, ip2config.irq[i] ); /* set and enable board interrupt */
+                } else {
+                        if (have_requested_irq(ip2config.irq[i]))
+                                continue;
+                        rc = request_irq(ip2config.irq[i], ip2_interrupt,
+                                IP2_SA_FLAGS |
+                                (ip2config.type[i] == PCI ? IRQF_SHARED : 0),
+                                pcName, i2BoardPtrTable[i]);
+                        if (rc) {
+                                printk(KERN_ERR "IP2: request_irq failed: "
+                                                "error %d\n", rc);
+                                ip2config.irq[i] = CIR_POLL;
+                                printk(KERN_INFO "IP2: Polling %ld/sec.\n",
+                                                (POLL_TIMEOUT - jiffies));
+                                goto retry;
                         }
+                        mark_requested_irq(ip2config.irq[i]);
+                        /* Initialise the interrupt handler bottom half
+                         * (aka slih). */
                 }
         }
-        ip2trace (ITRC_NO_PORT, ITRC_INIT, ITRC_RETURN, 0 );
-        goto out;
+
+        for (i = 0; i < IP2_MAX_BOARDS; ++i) {
+                if (i2BoardPtrTable[i]) {
+                        /* set and enable board interrupt */
+                        set_irq(i, ip2config.irq[i]);
+                }
+        }
+
+        ip2trace(ITRC_NO_PORT, ITRC_INIT, ITRC_RETURN, 0);
+
+        return 0;
 
 out_chrdev:
         unregister_chrdev(IP2_IPL_MAJOR, "ip2");
-out:
+        /* unregister and put tty here */
         return err;
 }
+module_init(ip2_loadmain);
 
 /******************************************************************************/
 /* Function:   ip2_init_board()                                               */
@@ -1199,9 +1227,8 @@ ip2_polled_interrupt(void)
 {
         int i;
         i2eBordStrPtr  pB;
-        const int irq = 0;
 
-        ip2trace (ITRC_NO_PORT, ITRC_INTR, 99, 1, irq );
+        ip2trace(ITRC_NO_PORT, ITRC_INTR, 99, 1, 0);
 
         /* Service just the boards on the list using this irq */
         for( i = 0; i < i2nBoards; ++i ) {
@@ -1210,9 +1237,8 @@ ip2_polled_interrupt(void)
 //              Only process those boards which match our IRQ.
 //                      IRQ = 0 for polled boards, we won't poll "IRQ" boards
 
-                if ( pB && (pB->i2eUsingIrq == irq) ) {
+                if (pB && pB->i2eUsingIrq == 0)
                         ip2_irq_work(pB);
-                }
         }
 
         ++irq_counter;
@@ -1250,16 +1276,12 @@ ip2_poll(unsigned long arg)
 {
         ip2trace (ITRC_NO_PORT, ITRC_INTR, 100, 0 );
 
-        TimerOn = 0; // it's the truth but not checked in service
-
         // Just polled boards, IRQ = 0 will hit all non-interrupt boards.
         // It will NOT poll boards handled by hard interrupts.
         // The issue of queued BH interrupts is handled in ip2_interrupt().
         ip2_polled_interrupt();
 
-        PollTimer.expires = POLL_TIMEOUT;
-        add_timer( &PollTimer );
-        TimerOn = 1;
+        mod_timer(&PollTimer, POLL_TIMEOUT);
 
         ip2trace (ITRC_NO_PORT, ITRC_INTR, ITRC_RETURN, 0 );
 }
@@ -2871,7 +2893,7 @@ ip2_ipl_ioctl (struct file *pFile, UINT cmd, ULONG arg )
         case 13:
                 switch ( cmd ) {
                 case 64:        /* Driver - ip2stat */
-                        rc = put_user(ip2_tty_driver->refcount, pIndex++ );
+                        rc = put_user(-1, pIndex++ );
                         rc = put_user(irq_counter, pIndex++  );
                         rc = put_user(bh_counter, pIndex++  );
                         break;
diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c
index 64e1c169e826..835a33c8d5f5 100644
--- a/drivers/char/ipmi/ipmi_devintf.c
+++ b/drivers/char/ipmi/ipmi_devintf.c
@@ -871,7 +871,7 @@ static void ipmi_new_smi(int if_num, struct device *device)
         entry->dev = dev;
 
         mutex_lock(&reg_list_mutex);
-        device_create_drvdata(ipmi_class, device, dev, NULL, "ipmi%d", if_num);
+        device_create(ipmi_class, device, dev, NULL, "ipmi%d", if_num);
         list_add(&entry->link, &reg_list);
         mutex_unlock(&reg_list_mutex);
 }
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 8e8afb6141f9..3123bf57ad91 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2695,7 +2695,7 @@ static __devinit void default_find_bmc(void)
         for (i = 0; ; i++) {
                 if (!ipmi_defaults[i].port)
                         break;
-#ifdef CONFIG_PPC_MERGE
+#ifdef CONFIG_PPC
                 if (check_legacy_ioport(ipmi_defaults[i].port))
                         continue;
 #endif
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c
index 8f7cc190b62d..7d30ee1d3fca 100644
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
@@ -421,17 +421,16 @@ static void isicom_tx(unsigned long _data)
         if (retries >= 100)
                 goto unlock;
 
+        tty = tty_port_tty_get(&port->port);
+        if (tty == NULL)
+                goto put_unlock;
+
         for (; count > 0; count--, port++) {
                 /* port not active or tx disabled to force flow control */
                 if (!(port->port.flags & ASYNC_INITIALIZED) ||
                                 !(port->status & ISI_TXOK))
                         continue;
 
-                tty = port->port.tty;
-
-                if (tty == NULL)
-                        continue;
-
                 txcount = min_t(short, TX_SIZE, port->xmit_cnt);
                 if (txcount <= 0 || tty->stopped || tty->hw_stopped)
                         continue;
@@ -489,6 +488,8 @@ static void isicom_tx(unsigned long _data)
                         tty_wakeup(tty);
         }
 
+put_unlock:
+        tty_kref_put(tty);
 unlock:
         spin_unlock_irqrestore(&isi_card[card].card_lock, flags);
         /*      schedule another tx for hopefully in about 10ms */
@@ -547,7 +548,7 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id)
                 return IRQ_HANDLED;
         }
 
-        tty = port->port.tty;
+        tty = tty_port_tty_get(&port->port);
         if (tty == NULL) {
                 word_count = byte_count >> 1;
                 while (byte_count > 1) {
@@ -588,7 +589,7 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id)
                         }
 
                         if (port->port.flags & ASYNC_CTS_FLOW) {
-                                if (port->port.tty->hw_stopped) {
+                                if (tty->hw_stopped) {
                                         if (header & ISI_CTS) {
                                                 port->port.tty->hw_stopped = 0;
                                                 /* start tx ing */
@@ -597,7 +598,7 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id)
                                                 tty_wakeup(tty);
                                         }
                                 } else if (!(header & ISI_CTS)) {
-                                        port->port.tty->hw_stopped = 1;
+                                        tty->hw_stopped = 1;
                                         /* stop tx ing */
                                         port->status &= ~(ISI_TXOK | ISI_CTS);
                                 }
@@ -660,24 +661,21 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id)
         }
         outw(0x0000, base+0x04); /* enable interrupts */
         spin_unlock(&card->card_lock);
+        tty_kref_put(tty);
 
         return IRQ_HANDLED;
 }
 
-static void isicom_config_port(struct isi_port *port)
+static void isicom_config_port(struct tty_struct *tty)
 {
+        struct isi_port *port = tty->driver_data;
         struct isi_board *card = port->card;
-        struct tty_struct *tty;
         unsigned long baud;
         unsigned long base = card->base;
         u16 channel_setup, channel = port->channel,
                 shift_count = card->shift_count;
         unsigned char flow_ctrl;
 
-        tty = port->port.tty;
-
-        if (tty == NULL)
-                return;
         /* FIXME: Switch to new tty baud API */
         baud = C_BAUD(tty);
         if (baud & CBAUDEX) {
@@ -690,7 +688,7 @@ static void isicom_config_port(struct isi_port *port)
 
                 /* 1,2,3,4 => 57.6, 115.2, 230, 460 kbps resp. */
                 if (baud < 1 || baud > 4)
-                        port->port.tty->termios->c_cflag &= ~CBAUDEX;
+                        tty->termios->c_cflag &= ~CBAUDEX;
                 else
                         baud += 15;
         }
@@ -797,8 +795,9 @@ static inline void isicom_setup_board(struct isi_board *bp)
         spin_unlock_irqrestore(&bp->card_lock, flags);
 }
 
-static int isicom_setup_port(struct isi_port *port)
+static int isicom_setup_port(struct tty_struct *tty)
 {
+        struct isi_port *port = tty->driver_data;
         struct isi_board *card = port->card;
         unsigned long flags;
 
@@ -808,8 +807,7 @@ static int isicom_setup_port(struct isi_port *port)
                 return -ENOMEM;
 
         spin_lock_irqsave(&card->card_lock, flags);
-        if (port->port.tty)
-                clear_bit(TTY_IO_ERROR, &port->port.tty->flags);
+        clear_bit(TTY_IO_ERROR, &tty->flags);
         if (port->port.count == 1)
                 card->count++;
 
@@ -823,7 +821,7 @@ static int isicom_setup_port(struct isi_port *port)
                 InterruptTheCard(card->base);
         }
 
-        isicom_config_port(port);
+        isicom_config_port(tty);
         port->port.flags |= ASYNC_INITIALIZED;
         spin_unlock_irqrestore(&card->card_lock, flags);
 
@@ -934,8 +932,8 @@ static int isicom_open(struct tty_struct *tty, struct file *filp)
 
         port->port.count++;
         tty->driver_data = port;
-        port->port.tty = tty;
-        error = isicom_setup_port(port);
+        tty_port_tty_set(&port->port, tty);
+        error = isicom_setup_port(tty);
         if (error == 0)
                 error = block_til_ready(tty, filp, port);
         return error;
@@ -955,15 +953,17 @@ static void isicom_shutdown_port(struct isi_port *port)
         struct isi_board *card = port->card;
         struct tty_struct *tty;
 
-        tty = port->port.tty;
+        tty = tty_port_tty_get(&port->port);
 
-        if (!(port->port.flags & ASYNC_INITIALIZED))
+        if (!(port->port.flags & ASYNC_INITIALIZED)) {
+                tty_kref_put(tty);
                 return;
+        }
 
         tty_port_free_xmit_buf(&port->port);
         port->port.flags &= ~ASYNC_INITIALIZED;
         /* 3rd October 2000 : Vinayak P Risbud */
-        port->port.tty = NULL;
+        tty_port_tty_set(&port->port, NULL);
 
         /*Fix done by Anil .S on 30-04-2001
         remote login through isi port has dtr toggle problem
@@ -1243,9 +1243,10 @@ static int isicom_tiocmset(struct tty_struct *tty, struct file *file,
         return 0;
 }
 
-static int isicom_set_serial_info(struct isi_port *port,
-        struct serial_struct __user *info)
+static int isicom_set_serial_info(struct tty_struct *tty,
+                                        struct serial_struct __user *info)
 {
+        struct isi_port *port = tty->driver_data;
         struct serial_struct newinfo;
         int reconfig_port;
 
@@ -1276,7 +1277,7 @@ static int isicom_set_serial_info(struct isi_port *port,
         if (reconfig_port) {
                 unsigned long flags;
                 spin_lock_irqsave(&port->card->card_lock, flags);
-                isicom_config_port(port);
+                isicom_config_port(tty);
                 spin_unlock_irqrestore(&port->card->card_lock, flags);
         }
         unlock_kernel();
@@ -1318,7 +1319,7 @@ static int isicom_ioctl(struct tty_struct *tty, struct file *filp,
                 return isicom_get_serial_info(port, argp);
 
         case TIOCSSERIAL:
-                return isicom_set_serial_info(port, argp);
+                return isicom_set_serial_info(tty, argp);
 
         default:
                 return -ENOIOCTLCMD;
@@ -1341,7 +1342,7 @@ static void isicom_set_termios(struct tty_struct *tty,
                 return;
 
         spin_lock_irqsave(&port->card->card_lock, flags);
-        isicom_config_port(port);
+        isicom_config_port(tty);
         spin_unlock_irqrestore(&port->card->card_lock, flags);
 
         if ((old_termios->c_cflag & CRTSCTS) &&
@@ -1419,7 +1420,7 @@ static void isicom_hangup(struct tty_struct *tty)
 
         port->port.count = 0;
         port->port.flags &= ~ASYNC_NORMAL_ACTIVE;
-        port->port.tty = NULL;
+        tty_port_tty_set(&port->port, NULL);
         wake_up_interruptible(&port->port.open_wait);
 }
 
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index 843a2afaf204..44e5d60f517e 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -623,24 +623,25 @@ static int	stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, un
 static void     stli_brdpoll(struct stlibrd *brdp, cdkhdr_t __iomem *hdrp);
 static void     stli_poll(unsigned long arg);
 static int      stli_hostcmd(struct stlibrd *brdp, struct stliport *portp);
-static int      stli_initopen(struct stlibrd *brdp, struct stliport *portp);
+static int      stli_initopen(struct tty_struct *tty, struct stlibrd *brdp, struct stliport *portp);
 static int      stli_rawopen(struct stlibrd *brdp, struct stliport *portp, unsigned long arg, int wait);
 static int      stli_rawclose(struct stlibrd *brdp, struct stliport *portp, unsigned long arg, int wait);
-static int      stli_waitcarrier(struct stlibrd *brdp, struct stliport *portp, struct file *filp);
-static int      stli_setport(struct stliport *portp);
+static int      stli_waitcarrier(struct tty_struct *tty, struct stlibrd *brdp,
+                                struct stliport *portp, struct file *filp);
+static int      stli_setport(struct tty_struct *tty);
 static int      stli_cmdwait(struct stlibrd *brdp, struct stliport *portp, unsigned long cmd, void *arg, int size, int copyback);
 static void     stli_sendcmd(struct stlibrd *brdp, struct stliport *portp, unsigned long cmd, void *arg, int size, int copyback);
 static void     __stli_sendcmd(struct stlibrd *brdp, struct stliport *portp, unsigned long cmd, void *arg, int size, int copyback);
 static void     stli_dodelaycmd(struct stliport *portp, cdkctrl_t __iomem *cp);
-static void     stli_mkasyport(struct stliport *portp, asyport_t *pp, struct ktermios *tiosp);
+static void     stli_mkasyport(struct tty_struct *tty, struct stliport *portp, asyport_t *pp, struct ktermios *tiosp);
 static void     stli_mkasysigs(asysigs_t *sp, int dtr, int rts);
 static long     stli_mktiocm(unsigned long sigvalue);
 static void     stli_read(struct stlibrd *brdp, struct stliport *portp);
 static int      stli_getserial(struct stliport *portp, struct serial_struct __user *sp);
-static int      stli_setserial(struct stliport *portp, struct serial_struct __user *sp);
+static int      stli_setserial(struct tty_struct *tty, struct serial_struct __user *sp);
 static int      stli_getbrdstats(combrd_t __user *bp);
-static int      stli_getportstats(struct stliport *portp, comstats_t __user *cp);
-static int      stli_portcmdstats(struct stliport *portp);
+static int      stli_getportstats(struct tty_struct *tty, struct stliport *portp, comstats_t __user *cp);
+static int      stli_portcmdstats(struct tty_struct *tty, struct stliport *portp);
 static int      stli_clrportstats(struct stliport *portp, comstats_t __user *cp);
 static int      stli_getportstruct(struct stliport __user *arg);
 static int      stli_getbrdstruct(struct stlibrd __user *arg);
@@ -731,12 +732,16 @@ static void stli_cleanup_ports(struct stlibrd *brdp)
 {
         struct stliport *portp;
         unsigned int j;
+        struct tty_struct *tty;
 
         for (j = 0; j < STL_MAXPORTS; j++) {
                 portp = brdp->ports[j];
                 if (portp != NULL) {
-                        if (portp->port.tty != NULL)
-                                tty_hangup(portp->port.tty);
+                        tty = tty_port_tty_get(&portp->port);
+                        if (tty != NULL) {
+                                tty_hangup(tty);
+                                tty_kref_put(tty);
+                        }
                         kfree(portp);
                 }
         }
@@ -824,7 +829,7 @@ static int stli_open(struct tty_struct *tty, struct file *filp)
  *      requires several commands to the board we will need to wait for any
  *      other open that is already initializing the port.
  */
-        portp->port.tty = tty;
+        tty_port_tty_set(&portp->port, tty);
         tty->driver_data = portp;
         portp->port.count++;
 
@@ -835,7 +840,7 @@ static int stli_open(struct tty_struct *tty, struct file *filp)
 
         if ((portp->port.flags & ASYNC_INITIALIZED) == 0) {
                 set_bit(ST_INITIALIZING, &portp->state);
-                if ((rc = stli_initopen(brdp, portp)) >= 0) {
+                if ((rc = stli_initopen(tty, brdp, portp)) >= 0) {
                         portp->port.flags |= ASYNC_INITIALIZED;
                         clear_bit(TTY_IO_ERROR, &tty->flags);
                 }
@@ -864,7 +869,7 @@ static int stli_open(struct tty_struct *tty, struct file *filp)
  *      then also we might have to wait for carrier.
  */
         if (!(filp->f_flags & O_NONBLOCK)) {
-                if ((rc = stli_waitcarrier(brdp, portp, filp)) != 0)
+                if ((rc = stli_waitcarrier(tty, brdp, portp, filp)) != 0)
                         return rc;
         }
         portp->port.flags |= ASYNC_NORMAL_ACTIVE;
@@ -930,7 +935,7 @@ static void stli_close(struct tty_struct *tty, struct file *filp)
         stli_flushbuffer(tty);
 
         tty->closing = 0;
-        portp->port.tty = NULL;
+        tty_port_tty_set(&portp->port, NULL);
 
         if (portp->openwaitcnt) {
                 if (portp->close_delay)
@@ -952,9 +957,9 @@ static void stli_close(struct tty_struct *tty, struct file *filp)
  *      this still all happens pretty quickly.
  */
 
-static int stli_initopen(struct stlibrd *brdp, struct stliport *portp)
+static int stli_initopen(struct tty_struct *tty,
+                                struct stlibrd *brdp, struct stliport *portp)
 {
-        struct tty_struct *tty;
         asynotify_t nt;
         asyport_t aport;
         int rc;
@@ -969,10 +974,7 @@ static int stli_initopen(struct stlibrd *brdp, struct stliport *portp)
             sizeof(asynotify_t), 0)) < 0)
                 return rc;
 
-        tty = portp->port.tty;
-        if (tty == NULL)
-                return -ENODEV;
-        stli_mkasyport(portp, &aport, tty->termios);
+        stli_mkasyport(tty, portp, &aport, tty->termios);
         if ((rc = stli_cmdwait(brdp, portp, A_SETPORT, &aport,
             sizeof(asyport_t), 0)) < 0)
                 return rc;
@@ -1161,22 +1163,21 @@ static int stli_cmdwait(struct stlibrd *brdp, struct stliport *portp, unsigned l
  *      waiting for the command to complete - so must have user context.
  */
 
-static int stli_setport(struct stliport *portp)
+static int stli_setport(struct tty_struct *tty)
 {
+        struct stliport *portp = tty->driver_data;
         struct stlibrd *brdp;
         asyport_t aport;
 
         if (portp == NULL)
                 return -ENODEV;
-        if (portp->port.tty == NULL)
-                return -ENODEV;
         if (portp->brdnr >= stli_nrbrds)
                 return -ENODEV;
         brdp = stli_brds[portp->brdnr];
         if (brdp == NULL)
                 return -ENODEV;
 
-        stli_mkasyport(portp, &aport, portp->port.tty->termios);
+        stli_mkasyport(tty, portp, &aport, tty->termios);
         return(stli_cmdwait(brdp, portp, A_SETPORT, &aport, sizeof(asyport_t), 0));
 }
 
@@ -1187,7 +1188,8 @@ static int stli_setport(struct stliport *portp)
  *      maybe because if we are clocal then we don't need to wait...
  */
 
-static int stli_waitcarrier(struct stlibrd *brdp, struct stliport *portp, struct file *filp)
+static int stli_waitcarrier(struct tty_struct *tty, struct stlibrd *brdp,
+                                struct stliport *portp, struct file *filp)
 {
         unsigned long flags;
         int rc, doclocal;
@@ -1195,7 +1197,7 @@ static int stli_waitcarrier(struct stlibrd *brdp, struct stliport *portp, struct
         rc = 0;
         doclocal = 0;
 
-        if (portp->port.tty->termios->c_cflag & CLOCAL)
+        if (tty->termios->c_cflag & CLOCAL)
                 doclocal++;
 
         spin_lock_irqsave(&stli_lock, flags);
@@ -1373,8 +1375,6 @@ static void stli_flushchars(struct tty_struct *tty)
         stli_txcookrealsize = 0;
         stli_txcooktty = NULL;
 
-        if (tty == NULL)
-                return;
         if (cooktty == NULL)
                 return;
         if (tty != cooktty)
@@ -1572,10 +1572,11 @@ static int stli_getserial(struct stliport *portp, struct serial_struct __user *s
  *      just quietly ignore any requests to change irq, etc.
  */
 
-static int stli_setserial(struct stliport *portp, struct serial_struct __user *sp)
+static int stli_setserial(struct tty_struct *tty, struct serial_struct __user *sp)
 {
         struct serial_struct sio;
         int rc;
+        struct stliport *portp = tty->driver_data;
 
         if (copy_from_user(&sio, sp, sizeof(struct serial_struct)))
                 return -EFAULT;
@@ -1594,7 +1595,7 @@ static int stli_setserial(struct stliport *portp, struct serial_struct __user *s
         portp->closing_wait = sio.closing_wait;
         portp->custom_divisor = sio.custom_divisor;
 
-        if ((rc = stli_setport(portp)) < 0)
+        if ((rc = stli_setport(tty)) < 0)
                 return rc;
         return 0;
 }
@@ -1685,17 +1686,17 @@ static int stli_ioctl(struct tty_struct *tty, struct file *file, unsigned int cm
                 rc = stli_getserial(portp, argp);
                 break;
         case TIOCSSERIAL:
-                rc = stli_setserial(portp, argp);
+                rc = stli_setserial(tty, argp);
                 break;
         case STL_GETPFLAG:
                 rc = put_user(portp->pflag, (unsigned __user *)argp);
                 break;
         case STL_SETPFLAG:
                 if ((rc = get_user(portp->pflag, (unsigned __user *)argp)) == 0)
-                        stli_setport(portp);
+                        stli_setport(tty);
                 break;
         case COM_GETPORTSTATS:
-                rc = stli_getportstats(portp, argp);
+                rc = stli_getportstats(tty, portp, argp);
                 break;
         case COM_CLRPORTSTATS:
                 rc = stli_clrportstats(portp, argp);
@@ -1729,8 +1730,6 @@ static void stli_settermios(struct tty_struct *tty, struct ktermios *old)
         struct ktermios *tiosp;
         asyport_t aport;
 
-        if (tty == NULL)
-                return;
         portp = tty->driver_data;
         if (portp == NULL)
                 return;
@@ -1742,7 +1741,7 @@ static void stli_settermios(struct tty_struct *tty, struct ktermios *old)
 
         tiosp = tty->termios;
 
-        stli_mkasyport(portp, &aport, tiosp);
+        stli_mkasyport(tty, portp, &aport, tiosp);
         stli_cmdwait(brdp, portp, A_SETPORT, &aport, sizeof(asyport_t), 0);
         stli_mkasysigs(&portp->asig, ((tiosp->c_cflag & CBAUD) ? 1 : 0), -1);
         stli_cmdwait(brdp, portp, A_SETSIGNALS, &portp->asig,
@@ -1854,7 +1853,7 @@ static void stli_hangup(struct tty_struct *tty)
         clear_bit(ST_TXBUSY, &portp->state);
         clear_bit(ST_RXSTOP, &portp->state);
         set_bit(TTY_IO_ERROR, &tty->flags);
-        portp->port.tty = NULL;
+        tty_port_tty_set(&portp->port, NULL);
         portp->port.flags &= ~ASYNC_NORMAL_ACTIVE;
         portp->port.count = 0;
         spin_unlock_irqrestore(&stli_lock, flags);
@@ -1935,8 +1934,6 @@ static void stli_waituntilsent(struct tty_struct *tty, int timeout)
         struct stliport *portp;
         unsigned long tend;
 
-        if (tty == NULL)
-                return;
         portp = tty->driver_data;
         if (portp == NULL)
                 return;
@@ -1998,7 +1995,7 @@ static int stli_portinfo(struct stlibrd *brdp, struct stliport *portp, int portn
         char *sp, *uart;
         int rc, cnt;
 
-        rc = stli_portcmdstats(portp);
+        rc = stli_portcmdstats(NULL, portp);
 
         uart = "UNKNOWN";
         if (brdp->state & BST_STARTED) {
@@ -2188,7 +2185,7 @@ static void stli_read(struct stlibrd *brdp, struct stliport *portp)
 
         if (test_bit(ST_RXSTOP, &portp->state))
                 return;
-        tty = portp->port.tty;
+        tty = tty_port_tty_get(&portp->port);
         if (tty == NULL)
                 return;
 
@@ -2230,6 +2227,7 @@ static void stli_read(struct stlibrd *brdp, struct stliport *portp)
                 set_bit(ST_RXING, &portp->state);
 
         tty_schedule_flip(tty);
+        tty_kref_put(tty);
 }
 
 /*****************************************************************************/
@@ -2362,7 +2360,7 @@ static int stli_hostcmd(struct stlibrd *brdp, struct stliport *portp)
         if (ap->notify) {
                 nt = ap->changed;
                 ap->notify = 0;
-                tty = portp->port.tty;
+                tty = tty_port_tty_get(&portp->port);
 
                 if (nt.signal & SG_DCD) {
                         oldsigs = portp->sigs;
@@ -2399,6 +2397,7 @@ static int stli_hostcmd(struct stlibrd *brdp, struct stliport *portp)
                                 tty_schedule_flip(tty);
                         }
                 }
+                tty_kref_put(tty);
 
                 if (nt.data & DT_RXBUSY) {
                         donerx++;
@@ -2535,14 +2534,15 @@ static void stli_poll(unsigned long arg)
  *      the slave.
  */
 
-static void stli_mkasyport(struct stliport *portp, asyport_t *pp, struct ktermios *tiosp)
+static void stli_mkasyport(struct tty_struct *tty, struct stliport *portp,
+                                asyport_t *pp, struct ktermios *tiosp)
 {
         memset(pp, 0, sizeof(asyport_t));
 
 /*
  *      Start of by setting the baud, char size, parity and stop bit info.
  */
-        pp->baudout = tty_get_baud_rate(portp->port.tty);
+        pp->baudout = tty_get_baud_rate(tty);
         if ((tiosp->c_cflag & CBAUD) == B38400) {
                 if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
                         pp->baudout = 57600;
@@ -2695,7 +2695,7 @@ static int stli_initports(struct stlibrd *brdp)
                         printk("STALLION: failed to allocate port structure\n");
                         continue;
                 }
-
+                tty_port_init(&portp->port);
                 portp->magic = STLI_PORTMAGIC;
                 portp->portnr = i;
                 portp->brdnr = brdp->brdnr;
@@ -4220,7 +4220,7 @@ static struct stliport *stli_getport(unsigned int brdnr, unsigned int panelnr,
  *      what port to get stats for (used through board control device).
  */
 
-static int stli_portcmdstats(struct stliport *portp)
+static int stli_portcmdstats(struct tty_struct *tty, struct stliport *portp)
 {
         unsigned long   flags;
         struct stlibrd  *brdp;
@@ -4249,15 +4249,15 @@ static int stli_portcmdstats(struct stliport *portp)
         stli_comstats.flags = portp->port.flags;
 
         spin_lock_irqsave(&brd_lock, flags);
-        if (portp->port.tty != NULL) {
-                if (portp->port.tty->driver_data == portp) {
-                        stli_comstats.ttystate = portp->port.tty->flags;
+        if (tty != NULL) {
+                if (portp->port.tty == tty) {
+                        stli_comstats.ttystate = tty->flags;
                         stli_comstats.rxbuffered = -1;
-                        if (portp->port.tty->termios != NULL) {
-                                stli_comstats.cflags = portp->port.tty->termios->c_cflag;
-                                stli_comstats.iflags = portp->port.tty->termios->c_iflag;
-                                stli_comstats.oflags = portp->port.tty->termios->c_oflag;
-                                stli_comstats.lflags = portp->port.tty->termios->c_lflag;
+                        if (tty->termios != NULL) {
+                                stli_comstats.cflags = tty->termios->c_cflag;
+                                stli_comstats.iflags = tty->termios->c_iflag;
+                                stli_comstats.oflags = tty->termios->c_oflag;
+                                stli_comstats.lflags = tty->termios->c_lflag;
                         }
                 }
         }
@@ -4294,7 +4294,8 @@ static int stli_portcmdstats(struct stliport *portp)
  *      what port to get stats for (used through board control device).
  */
 
-static int stli_getportstats(struct stliport *portp, comstats_t __user *cp)
+static int stli_getportstats(struct tty_struct *tty, struct stliport *portp,
+                                                        comstats_t __user *cp)
 {
         struct stlibrd *brdp;
         int rc;
@@ -4312,7 +4313,7 @@ static int stli_getportstats(struct stliport *portp, comstats_t __user *cp)
         if (!brdp)
                 return -ENODEV;
 
-        if ((rc = stli_portcmdstats(portp)) < 0)
+        if ((rc = stli_portcmdstats(tty, portp)) < 0)
                 return rc;
 
         return copy_to_user(cp, &stli_comstats, sizeof(comstats_t)) ?
@@ -4427,7 +4428,7 @@ static int stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, un
 
         switch (cmd) {
         case COM_GETPORTSTATS:
-                rc = stli_getportstats(NULL, argp);
+                rc = stli_getportstats(NULL, NULL, argp);
                 done++;
                 break;
         case COM_CLRPORTSTATS:
@@ -4599,9 +4600,8 @@ static int __init istallion_module_init(void)
 
         istallion_class = class_create(THIS_MODULE, "staliomem");
         for (i = 0; i < 4; i++)
-                device_create_drvdata(istallion_class, NULL,
-                                      MKDEV(STL_SIOMEMMAJOR, i),
-                                      NULL, "staliomem%d", i);
+                device_create(istallion_class, NULL, MKDEV(STL_SIOMEMMAJOR, i),
+                              NULL, "staliomem%d", i);
 
         return 0;
 err_deinit:
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
index 7b3a212c86b1..de26a978fbdd 100644
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -1249,7 +1249,7 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
                 return;
         }
 
-        if (keycode > NR_KEYS)
+        if (keycode >= NR_KEYS)
                 if (keycode >= KEY_BRL_DOT1 && keycode <= KEY_BRL_DOT8)
                         keysym = K(KT_BRL, keycode - KEY_BRL_DOT1 + 1);
                 else
diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index 3f2719b9f77b..e444c2dba160 100644
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -813,8 +813,8 @@ static int lp_register(int nr, struct parport *port)
         if (reset)
                 lp_reset(nr);
 
-        device_create_drvdata(lp_class, port->dev, MKDEV(LP_MAJOR, nr), NULL,
-                              "lp%d", nr);
+        device_create(lp_class, port->dev, MKDEV(LP_MAJOR, nr), NULL,
+                      "lp%d", nr);
 
         printk(KERN_INFO "lp%d: using %s (%s).\n", nr, port->name, 
                (port->irq == PARPORT_IRQ_NONE)?"polling":"interrupt-driven");
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 672b08e694d0..6431f6921a67 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -992,9 +992,9 @@ static int __init chr_dev_init(void)
 
         mem_class = class_create(THIS_MODULE, "mem");
         for (i = 0; i < ARRAY_SIZE(devlist); i++)
-                device_create_drvdata(mem_class, NULL,
-                                      MKDEV(MEM_MAJOR, devlist[i].minor),
-                                      NULL, devlist[i].name);
+                device_create(mem_class, NULL,
+                              MKDEV(MEM_MAJOR, devlist[i].minor), NULL,
+                              devlist[i].name);
 
         return 0;
 }
diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 999aa779c08a..a5e0db9d7662 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -217,8 +217,8 @@ int misc_register(struct miscdevice * misc)
                 misc_minors[misc->minor >> 3] |= 1 << (misc->minor & 7);
         dev = MKDEV(MISC_MAJOR, misc->minor);
 
-        misc->this_device = device_create_drvdata(misc_class, misc->parent,
-                                                  dev, NULL, "%s", misc->name);
+        misc->this_device = device_create(misc_class, misc->parent, dev, NULL,
+                                          "%s", misc->name);
         if (IS_ERR(misc->this_device)) {
                 err = PTR_ERR(misc->this_device);
                 goto out;
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index d3d7864e0c1e..12d327a2c9ba 100644
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -205,7 +205,7 @@ static int moxa_tiocmset(struct tty_struct *tty, struct file *file,
 static void moxa_poll(unsigned long);
 static void moxa_set_tty_param(struct tty_struct *, struct ktermios *);
 static void moxa_setup_empty_event(struct tty_struct *);
-static void moxa_shut_down(struct moxa_port *);
+static void moxa_shut_down(struct tty_struct *);
 /*
  * moxa board interface functions:
  */
@@ -217,7 +217,7 @@ static void MoxaPortLineCtrl(struct moxa_port *, int, int);
 static void MoxaPortFlowCtrl(struct moxa_port *, int, int, int, int, int);
 static int MoxaPortLineStatus(struct moxa_port *);
 static void MoxaPortFlushData(struct moxa_port *, int);
-static int MoxaPortWriteData(struct moxa_port *, const unsigned char *, int);
+static int MoxaPortWriteData(struct tty_struct *, const unsigned char *, int);
 static int MoxaPortReadData(struct moxa_port *);
 static int MoxaPortTxQueue(struct moxa_port *);
 static int MoxaPortRxQueue(struct moxa_port *);
@@ -332,6 +332,7 @@ static int moxa_ioctl(struct tty_struct *tty, struct file *file,
                 for (i = 0; i < MAX_BOARDS; i++) {
                         p = moxa_boards[i].ports;
                         for (j = 0; j < MAX_PORTS_PER_BOARD; j++, p++, argm++) {
+                                struct tty_struct *ttyp;
                                 memset(&tmp, 0, sizeof(tmp));
                                 if (!moxa_boards[i].ready)
                                         goto copy;
@@ -344,10 +345,12 @@ static int moxa_ioctl(struct tty_struct *tty, struct file *file,
                                 if (status & 4)
                                         tmp.dcd = 1;
 
-                                if (!p->port.tty || !p->port.tty->termios)
+                                ttyp = tty_port_tty_get(&p->port);
+                                if (!ttyp || !ttyp->termios)
                                         tmp.cflag = p->cflag;
                                 else
-                                        tmp.cflag = p->port.tty->termios->c_cflag;
+                                        tmp.cflag = ttyp->termios->c_cflag;
+                                tty_kref_put(tty);
 copy:
                                 if (copy_to_user(argm, &tmp, sizeof(tmp))) {
                                         mutex_unlock(&moxa_openlock);
@@ -510,7 +513,7 @@ static int moxa_real_load_code(struct moxa_board_conf *brd, const void *ptr,
                 size_t len)
 {
         void __iomem *baseAddr = brd->basemem;
-        const u16 *uptr = ptr;
+        const __le16 *uptr = ptr;
         size_t wlen, len2, j;
         unsigned long key, loadbuf, loadlen, checksum, checksum_ok;
         unsigned int i, retry;
@@ -880,8 +883,14 @@ static void moxa_board_deinit(struct moxa_board_conf *brd)
 
         /* pci hot-un-plug support */
         for (a = 0; a < brd->numPorts; a++)
-                if (brd->ports[a].port.flags & ASYNC_INITIALIZED)
-                        tty_hangup(brd->ports[a].port.tty);
+                if (brd->ports[a].port.flags & ASYNC_INITIALIZED) {
+                        struct tty_struct *tty = tty_port_tty_get(
+                                                &brd->ports[a].port);
+                        if (tty) {
+                                tty_hangup(tty);
+                                tty_kref_put(tty);
+                        }
+                }
         while (1) {
                 opened = 0;
                 for (a = 0; a < brd->numPorts; a++)
@@ -1096,13 +1105,14 @@ static void __exit moxa_exit(void)
 module_init(moxa_init);
 module_exit(moxa_exit);
 
-static void moxa_close_port(struct moxa_port *ch)
+static void moxa_close_port(struct tty_struct *tty)
 {
-        moxa_shut_down(ch);
+        struct moxa_port *ch = tty->driver_data;
+        moxa_shut_down(tty);
         MoxaPortFlushData(ch, 2);
         ch->port.flags &= ~ASYNC_NORMAL_ACTIVE;
-        ch->port.tty->driver_data = NULL;
-        ch->port.tty = NULL;
+        tty->driver_data = NULL;
+        tty_port_tty_set(&ch->port, NULL);
 }
 
 static int moxa_block_till_ready(struct tty_struct *tty, struct file *filp,
@@ -1161,7 +1171,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
         ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
         ch->port.count++;
         tty->driver_data = ch;
-        ch->port.tty = tty;
+        tty_port_tty_set(&ch->port, tty);
         if (!(ch->port.flags & ASYNC_INITIALIZED)) {
                 ch->statusflags = 0;
                 moxa_set_tty_param(tty, tty->termios);
@@ -1179,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
         if (retval) {
                 if (ch->port.count) /* 0 means already hung up... */
                         if (--ch->port.count == 0)
-                                moxa_close_port(ch);
+                                moxa_close_port(tty);
         } else
                 ch->port.flags |= ASYNC_NORMAL_ACTIVE;
         mutex_unlock(&moxa_openlock);
@@ -1219,7 +1229,7 @@ static void moxa_close(struct tty_struct *tty, struct file *filp)
                 tty_wait_until_sent(tty, 30 * HZ);      /* 30 seconds timeout */
         }
 
-        moxa_close_port(ch);
+        moxa_close_port(tty);
 unlock:
         mutex_unlock(&moxa_openlock);
 }
@@ -1234,7 +1244,7 @@ static int moxa_write(struct tty_struct *tty,
                 return 0;
 
         spin_lock_bh(&moxa_lock);
-        len = MoxaPortWriteData(ch, buf, count);
+        len = MoxaPortWriteData(tty, buf, count);
         spin_unlock_bh(&moxa_lock);
 
         ch->statusflags |= LOWWAIT;
@@ -1409,7 +1419,7 @@ static void moxa_hangup(struct tty_struct *tty)
                 return;
         }
         ch->port.count = 0;
-        moxa_close_port(ch);
+        moxa_close_port(tty);
         mutex_unlock(&moxa_openlock);
 
         wake_up_interruptible(&ch->port.open_wait);
@@ -1417,11 +1427,14 @@ static void moxa_hangup(struct tty_struct *tty)
 
 static void moxa_new_dcdstate(struct moxa_port *p, u8 dcd)
 {
+        struct tty_struct *tty;
         dcd = !!dcd;
 
-        if (dcd != p->DCDState && p->port.tty && C_CLOCAL(p->port.tty)) {
-                if (!dcd)
-                        tty_hangup(p->port.tty);
+        if (dcd != p->DCDState) {
+                tty = tty_port_tty_get(&p->port);
+                if (tty && C_CLOCAL(tty) && !dcd)
+                        tty_hangup(tty);
+                tty_kref_put(tty);
         }
         p->DCDState = dcd;
 }
@@ -1429,7 +1442,7 @@ static void moxa_new_dcdstate(struct moxa_port *p, u8 dcd)
 static int moxa_poll_port(struct moxa_port *p, unsigned int handle,
                 u16 __iomem *ip)
 {
-        struct tty_struct *tty = p->port.tty;
+        struct tty_struct *tty = tty_port_tty_get(&p->port);
         void __iomem *ofsAddr;
         unsigned int inited = p->port.flags & ASYNC_INITIALIZED;
         u16 intr;
@@ -1476,6 +1489,7 @@ static int moxa_poll_port(struct moxa_port *p, unsigned int handle,
                 tty_insert_flip_char(tty, 0, TTY_BREAK);
                 tty_schedule_flip(tty);
         }
+        tty_kref_put(tty);
 
         if (intr & IntrLine)
                 moxa_new_dcdstate(p, readb(ofsAddr + FlagStat) & DCD_state);
@@ -1560,9 +1574,9 @@ static void moxa_setup_empty_event(struct tty_struct *tty)
         spin_unlock_bh(&moxa_lock);
 }
 
-static void moxa_shut_down(struct moxa_port *ch)
+static void moxa_shut_down(struct tty_struct *tty)
 {
-        struct tty_struct *tp = ch->port.tty;
+        struct moxa_port *ch = tty->driver_data;
 
         if (!(ch->port.flags & ASYNC_INITIALIZED))
                 return;
@@ -1572,7 +1586,7 @@ static void moxa_shut_down(struct moxa_port *ch)
         /*
          * If we're a modem control device and HUPCL is on, drop RTS & DTR.
          */
-        if (C_HUPCL(tp))
+        if (C_HUPCL(tty))
                 MoxaPortLineCtrl(ch, 0, 0);
 
         spin_lock_bh(&moxa_lock);
@@ -1953,9 +1967,10 @@ static int MoxaPortLineStatus(struct moxa_port *port)
         return val;
 }
 
-static int MoxaPortWriteData(struct moxa_port *port,
+static int MoxaPortWriteData(struct tty_struct *tty,
                 const unsigned char *buffer, int len)
 {
+        struct moxa_port *port = tty->driver_data;
         void __iomem *baseAddr, *ofsAddr, *ofs;
         unsigned int c, total;
         u16 head, tail, tx_mask, spage, epage;
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index b638403e8e9c..8beef50f95a0 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -610,15 +610,13 @@ static int mxser_block_til_ready(struct tty_struct *tty, struct file *filp,
         return 0;
 }
 
-static int mxser_set_baud(struct mxser_port *info, long newspd)
+static int mxser_set_baud(struct tty_struct *tty, long newspd)
 {
+        struct mxser_port *info = tty->driver_data;
         int quot = 0, baud;
         unsigned char cval;
 
-        if (!info->port.tty || !info->port.tty->termios)
-                return -1;
-
-        if (!(info->ioaddr))
+        if (!info->ioaddr)
                 return -1;
 
         if (newspd > info->max_baud)
@@ -626,13 +624,13 @@ static int mxser_set_baud(struct mxser_port *info, long newspd)
 
         if (newspd == 134) {
                 quot = 2 * info->baud_base / 269;
-                tty_encode_baud_rate(info->port.tty, 134, 134);
+                tty_encode_baud_rate(tty, 134, 134);
         } else if (newspd) {
                 quot = info->baud_base / newspd;
                 if (quot == 0)
                         quot = 1;
                 baud = info->baud_base/quot;
-                tty_encode_baud_rate(info->port.tty, baud, baud);
+                tty_encode_baud_rate(tty, baud, baud);
         } else {
                 quot = 0;
         }
@@ -658,7 +656,7 @@ static int mxser_set_baud(struct mxser_port *info, long newspd)
         outb(cval, info->ioaddr + UART_LCR);    /* reset DLAB */
 
 #ifdef BOTHER
-        if (C_BAUD(info->port.tty) == BOTHER) {
+        if (C_BAUD(tty) == BOTHER) {
                 quot = info->baud_base % newspd;
                 quot *= 8;
                 if (quot % newspd > newspd / 2) {
@@ -679,21 +677,20 @@ static int mxser_set_baud(struct mxser_port *info, long newspd)
  * This routine is called to set the UART divisor registers to match
  * the specified baud rate for a serial port.
  */
-static int mxser_change_speed(struct mxser_port *info,
-                struct ktermios *old_termios)
+static int mxser_change_speed(struct tty_struct *tty,
+                                        struct ktermios *old_termios)
 {
+        struct mxser_port *info = tty->driver_data;
         unsigned cflag, cval, fcr;
         int ret = 0;
         unsigned char status;
 
-        if (!info->port.tty || !info->port.tty->termios)
-                return ret;
-        cflag = info->port.tty->termios->c_cflag;
-        if (!(info->ioaddr))
+        cflag = tty->termios->c_cflag;
+        if (!info->ioaddr)
                 return ret;
 
-        if (mxser_set_baud_method[info->port.tty->index] == 0)
-                mxser_set_baud(info, tty_get_baud_rate(info->port.tty));
+        if (mxser_set_baud_method[tty->index] == 0)
+                mxser_set_baud(tty, tty_get_baud_rate(tty));
 
         /* byte size and parity */
         switch (cflag & CSIZE) {
@@ -762,9 +759,9 @@ static int mxser_change_speed(struct mxser_port *info,
                         info->MCR |= UART_MCR_AFE;
                 } else {
                         status = inb(info->ioaddr + UART_MSR);
-                        if (info->port.tty->hw_stopped) {
+                        if (tty->hw_stopped) {
                                 if (status & UART_MSR_CTS) {
-                                        info->port.tty->hw_stopped = 0;
+                                        tty->hw_stopped = 0;
                                         if (info->type != PORT_16550A &&
                                                         !info->board->chip_flag) {
                                                 outb(info->IER & ~UART_IER_THRI,
@@ -774,11 +771,11 @@ static int mxser_change_speed(struct mxser_port *info,
                                                 outb(info->IER, info->ioaddr +
                                                                 UART_IER);
                                         }
-                                        tty_wakeup(info->port.tty);
+                                        tty_wakeup(tty);
                                 }
                         } else {
                                 if (!(status & UART_MSR_CTS)) {
-                                        info->port.tty->hw_stopped = 1;
+                                        tty->hw_stopped = 1;
                                         if ((info->type != PORT_16550A) &&
                                                         (!info->board->chip_flag)) {
                                                 info->IER &= ~UART_IER_THRI;
@@ -804,21 +801,21 @@ static int mxser_change_speed(struct mxser_port *info,
          * Set up parity check flag
          */
         info->read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
-        if (I_INPCK(info->port.tty))
+        if (I_INPCK(tty))
                 info->read_status_mask |= UART_LSR_FE | UART_LSR_PE;
-        if (I_BRKINT(info->port.tty) || I_PARMRK(info->port.tty))
+        if (I_BRKINT(tty) || I_PARMRK(tty))
                 info->read_status_mask |= UART_LSR_BI;
 
         info->ignore_status_mask = 0;
 
-        if (I_IGNBRK(info->port.tty)) {
+        if (I_IGNBRK(tty)) {
                 info->ignore_status_mask |= UART_LSR_BI;
                 info->read_status_mask |= UART_LSR_BI;
                 /*
                  * If we're ignore parity and break indicators, ignore
                  * overruns too.  (For real raw support).
                  */
-                if (I_IGNPAR(info->port.tty)) {
+                if (I_IGNPAR(tty)) {
                         info->ignore_status_mask |=
                                                 UART_LSR_OE |
                                                 UART_LSR_PE |
@@ -830,16 +827,16 @@ static int mxser_change_speed(struct mxser_port *info,
                 }
         }
         if (info->board->chip_flag) {
-                mxser_set_must_xon1_value(info->ioaddr, START_CHAR(info->port.tty));
-                mxser_set_must_xoff1_value(info->ioaddr, STOP_CHAR(info->port.tty));
-                if (I_IXON(info->port.tty)) {
+                mxser_set_must_xon1_value(info->ioaddr, START_CHAR(tty));
+                mxser_set_must_xoff1_value(info->ioaddr, STOP_CHAR(tty));
+                if (I_IXON(tty)) {
                         mxser_enable_must_rx_software_flow_control(
                                         info->ioaddr);
                 } else {
                         mxser_disable_must_rx_software_flow_control(
                                         info->ioaddr);
                 }
-                if (I_IXOFF(info->port.tty)) {
+                if (I_IXOFF(tty)) {
                         mxser_enable_must_tx_software_flow_control(
                                         info->ioaddr);
                 } else {
@@ -855,7 +852,8 @@ static int mxser_change_speed(struct mxser_port *info,
         return ret;
 }
 
-static void mxser_check_modem_status(struct mxser_port *port, int status)
+static void mxser_check_modem_status(struct tty_struct *tty,
+                                struct mxser_port *port, int status)
 {
         /* update input line counters */
         if (status & UART_MSR_TERI)
@@ -874,10 +872,11 @@ static void mxser_check_modem_status(struct mxser_port *port, int status)
                         wake_up_interruptible(&port->port.open_wait);
         }
 
+        tty = tty_port_tty_get(&port->port);
         if (port->port.flags & ASYNC_CTS_FLOW) {
-                if (port->port.tty->hw_stopped) {
+                if (tty->hw_stopped) {
                         if (status & UART_MSR_CTS) {
-                                port->port.tty->hw_stopped = 0;
+                                tty->hw_stopped = 0;
 
                                 if ((port->type != PORT_16550A) &&
                                                 (!port->board->chip_flag)) {
@@ -887,11 +886,11 @@ static void mxser_check_modem_status(struct mxser_port *port, int status)
                                         outb(port->IER, port->ioaddr +
                                                         UART_IER);
                                 }
-                                tty_wakeup(port->port.tty);
+                                tty_wakeup(tty);
                         }
                 } else {
                         if (!(status & UART_MSR_CTS)) {
-                                port->port.tty->hw_stopped = 1;
+                                tty->hw_stopped = 1;
                                 if (port->type != PORT_16550A &&
                                                 !port->board->chip_flag) {
                                         port->IER &= ~UART_IER_THRI;
@@ -903,8 +902,9 @@ static void mxser_check_modem_status(struct mxser_port *port, int status)
         }
 }
 
-static int mxser_startup(struct mxser_port *info)
+static int mxser_startup(struct tty_struct *tty)
 {
+        struct mxser_port *info = tty->driver_data;
         unsigned long page;
         unsigned long flags;
 
@@ -921,8 +921,7 @@ static int mxser_startup(struct mxser_port *info)
         }
 
         if (!info->ioaddr || !info->type) {
-                if (info->port.tty)
-                        set_bit(TTY_IO_ERROR, &info->port.tty->flags);
+                set_bit(TTY_IO_ERROR, &tty->flags);
                 free_page(page);
                 spin_unlock_irqrestore(&info->slock, flags);
                 return 0;
@@ -952,8 +951,8 @@ static int mxser_startup(struct mxser_port *info)
         if (inb(info->ioaddr + UART_LSR) == 0xff) {
                 spin_unlock_irqrestore(&info->slock, flags);
                 if (capable(CAP_SYS_ADMIN)) {
-                        if (info->port.tty)
-                                set_bit(TTY_IO_ERROR, &info->port.tty->flags);
+                        if (tty)
+                                set_bit(TTY_IO_ERROR, &tty->flags);
                         return 0;
                 } else
                         return -ENODEV;
@@ -991,14 +990,13 @@ static int mxser_startup(struct mxser_port *info)
         (void) inb(info->ioaddr + UART_IIR);
         (void) inb(info->ioaddr + UART_MSR);
 
-        if (info->port.tty)
-                clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
+        clear_bit(TTY_IO_ERROR, &tty->flags);
         info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
 
         /*
          * and set the speed of the serial port
          */
-        mxser_change_speed(info, NULL);
+        mxser_change_speed(tty, NULL);
         info->port.flags |= ASYNC_INITIALIZED;
         spin_unlock_irqrestore(&info->slock, flags);
 
@@ -1009,8 +1007,9 @@ static int mxser_startup(struct mxser_port *info)
  * This routine will shutdown a serial port; interrupts maybe disabled, and
  * DTR is dropped if the hangup on close termio flag is on.
  */
-static void mxser_shutdown(struct mxser_port *info)
+static void mxser_shutdown(struct tty_struct *tty)
 {
+        struct mxser_port *info = tty->driver_data;
         unsigned long flags;
 
         if (!(info->port.flags & ASYNC_INITIALIZED))
@@ -1035,7 +1034,7 @@ static void mxser_shutdown(struct mxser_port *info)
         info->IER = 0;
         outb(0x00, info->ioaddr + UART_IER);
 
-        if (!info->port.tty || (info->port.tty->termios->c_cflag & HUPCL))
+        if (tty->termios->c_cflag & HUPCL)
                 info->MCR &= ~(UART_MCR_DTR | UART_MCR_RTS);
         outb(info->MCR, info->ioaddr + UART_MCR);
 
@@ -1051,8 +1050,7 @@ static void mxser_shutdown(struct mxser_port *info)
         /* read data port to reset things */
         (void) inb(info->ioaddr + UART_RX);
 
-        if (info->port.tty)
-                set_bit(TTY_IO_ERROR, &info->port.tty->flags);
+        set_bit(TTY_IO_ERROR, &tty->flags);
 
         info->port.flags &= ~ASYNC_INITIALIZED;
 
@@ -1084,14 +1082,14 @@ static int mxser_open(struct tty_struct *tty, struct file *filp)
                 return -ENODEV;
 
         tty->driver_data = info;
-        info->port.tty = tty;
+        tty_port_tty_set(&info->port, tty);
         /*
          * Start up serial port
          */
         spin_lock_irqsave(&info->slock, flags);
         info->port.count++;
         spin_unlock_irqrestore(&info->slock, flags);
-        retval = mxser_startup(info);
+        retval = mxser_startup(tty);
         if (retval)
                 return retval;
 
@@ -1209,13 +1207,13 @@ static void mxser_close(struct tty_struct *tty, struct file *filp)
                                 break;
                 }
         }
-        mxser_shutdown(info);
+        mxser_shutdown(tty);
 
         mxser_flush_buffer(tty);
         tty_ldisc_flush(tty);
 
         tty->closing = 0;
-        info->port.tty = NULL;
+        tty_port_tty_set(&info->port, NULL);
         if (info->port.blocked_open) {
                 if (info->port.close_delay)
                         schedule_timeout_interruptible(info->port.close_delay);
@@ -1337,12 +1335,13 @@ static int mxser_chars_in_buffer(struct tty_struct *tty)
  * friends of mxser_ioctl()
  * ------------------------------------------------------------
  */
-static int mxser_get_serial_info(struct mxser_port *info,
+static int mxser_get_serial_info(struct tty_struct *tty,
                 struct serial_struct __user *retinfo)
 {
+        struct mxser_port *info = tty->driver_data;
         struct serial_struct tmp = {
                 .type = info->type,
-                .line = info->port.tty->index,
+                .line = tty->index,
                 .port = info->ioaddr,
                 .irq = info->board->irq,
                 .flags = info->port.flags,
@@ -1357,9 +1356,10 @@ static int mxser_get_serial_info(struct mxser_port *info,
         return 0;
 }
 
-static int mxser_set_serial_info(struct mxser_port *info,
+static int mxser_set_serial_info(struct tty_struct *tty,
                 struct serial_struct __user *new_info)
 {
+        struct mxser_port *info = tty->driver_data;
         struct serial_struct new_serial;
         speed_t baud;
         unsigned long sl_flags;
@@ -1393,14 +1393,14 @@ static int mxser_set_serial_info(struct mxser_port *info,
                                 (new_serial.flags & ASYNC_FLAGS));
                 info->port.close_delay = new_serial.close_delay * HZ / 100;
                 info->port.closing_wait = new_serial.closing_wait * HZ / 100;
-                info->port.tty->low_latency =
-                                (info->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
+                tty->low_latency = (info->port.flags & ASYNC_LOW_LATENCY)
+                                                                ? 1 : 0;
                 if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST &&
                                 (new_serial.baud_base != info->baud_base ||
                                 new_serial.custom_divisor !=
                                 info->custom_divisor)) {
                         baud = new_serial.baud_base / new_serial.custom_divisor;
-                        tty_encode_baud_rate(info->port.tty, baud, baud);
+                        tty_encode_baud_rate(tty, baud, baud);
                 }
         }
 
@@ -1411,11 +1411,11 @@ static int mxser_set_serial_info(struct mxser_port *info,
         if (info->port.flags & ASYNC_INITIALIZED) {
                 if (flags != (info->port.flags & ASYNC_SPD_MASK)) {
                         spin_lock_irqsave(&info->slock, sl_flags);
-                        mxser_change_speed(info, NULL);
+                        mxser_change_speed(tty, NULL);
                         spin_unlock_irqrestore(&info->slock, sl_flags);
                 }
         } else
-                retval = mxser_startup(info);
+                retval = mxser_startup(tty);
 
         return retval;
 }
@@ -1461,7 +1461,7 @@ static int mxser_tiocmget(struct tty_struct *tty, struct file *file)
         spin_lock_irqsave(&info->slock, flags);
         status = inb(info->ioaddr + UART_MSR);
         if (status & UART_MSR_ANY_DELTA)
-                mxser_check_modem_status(info, status);
+                mxser_check_modem_status(tty, info, status);
         spin_unlock_irqrestore(&info->slock, flags);
         return ((control & UART_MCR_RTS) ? TIOCM_RTS : 0) |
                     ((control & UART_MCR_DTR) ? TIOCM_DTR : 0) |
@@ -1606,6 +1606,7 @@ static int __init mxser_read_register(int port, unsigned short *regs)
 static int mxser_ioctl_special(unsigned int cmd, void __user *argp)
 {
         struct mxser_port *port;
+        struct tty_struct *tty;
         int result, status;
         unsigned int i, j;
         int ret = 0;
@@ -1643,12 +1644,14 @@ static int mxser_ioctl_special(unsigned int cmd, void __user *argp)
 
                                 if (!port->ioaddr)
                                         goto copy;
+                                
+                                tty = tty_port_tty_get(&port->port);
 
-                                if (!port->port.tty || !port->port.tty->termios)
+                                if (!tty || !tty->termios)
                                         ms.cflag = port->normal_termios.c_cflag;
                                 else
-                                        ms.cflag = port->port.tty->termios->c_cflag;
-
+                                        ms.cflag = tty->termios->c_cflag;
+                                tty_kref_put(tty);
                                 status = inb(port->ioaddr + UART_MSR);
                                 if (status & UART_MSR_DCD)
                                         ms.dcd = 1;
@@ -1704,15 +1707,18 @@ static int mxser_ioctl_special(unsigned int cmd, void __user *argp)
                                 me->up_txcnt[p] = port->mon_data.up_txcnt;
                                 me->modem_status[p] =
                                         port->mon_data.modem_status;
-                                me->baudrate[p] = tty_get_baud_rate(port->port.tty);
+                                tty = tty_port_tty_get(&port->port);
 
-                                if (!port->port.tty || !port->port.tty->termios) {
+                                if (!tty || !tty->termios) {
                                         cflag = port->normal_termios.c_cflag;
                                         iflag = port->normal_termios.c_iflag;
+                                        me->baudrate[p] = tty_termios_baud_rate(&port->normal_termios);
                                 } else {
-                                        cflag = port->port.tty->termios->c_cflag;
-                                        iflag = port->port.tty->termios->c_iflag;
+                                        cflag = tty->termios->c_cflag;
+                                        iflag = tty->termios->c_iflag;
+                                        me->baudrate[p] = tty_get_baud_rate(tty);
                                 }
+                                tty_kref_put(tty);
 
                                 me->databits[p] = cflag & CSIZE;
                                 me->stopbits[p] = cflag & CSTOPB;
@@ -1822,12 +1828,12 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file,
         switch (cmd) {
         case TIOCGSERIAL:
                 lock_kernel();
-                retval = mxser_get_serial_info(info, argp);
+                retval = mxser_get_serial_info(tty, argp);
                 unlock_kernel();
                 return retval;
         case TIOCSSERIAL:
                 lock_kernel();
-                retval = mxser_set_serial_info(info, argp);
+                retval = mxser_set_serial_info(tty, argp);
                 unlock_kernel();
                 return retval;
         case TIOCSERGETLSR:     /* Get line status register */
@@ -1896,7 +1902,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file,
 
                 lock_kernel();
                 status = mxser_get_msr(info->ioaddr, 1, tty->index);
-                mxser_check_modem_status(info, status);
+                mxser_check_modem_status(tty, info, status);
 
                 mcr = inb(info->ioaddr + UART_MCR);
                 if (mcr & MOXA_MUST_MCR_XON_FLAG)
@@ -1909,7 +1915,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file,
                 else
                         info->mon_data.hold_reason |= NPPI_NOTIFY_XOFFXENT;
 
-                if (info->port.tty->hw_stopped)
+                if (tty->hw_stopped)
                         info->mon_data.hold_reason |= NPPI_NOTIFY_CTSHOLD;
                 else
                         info->mon_data.hold_reason &= ~NPPI_NOTIFY_CTSHOLD;
@@ -1958,7 +1964,7 @@ static void mxser_stoprx(struct tty_struct *tty)
                 }
         }
 
-        if (info->port.tty->termios->c_cflag & CRTSCTS) {
+        if (tty->termios->c_cflag & CRTSCTS) {
                 info->MCR &= ~UART_MCR_RTS;
                 outb(info->MCR, info->ioaddr + UART_MCR);
         }
@@ -1995,7 +2001,7 @@ static void mxser_unthrottle(struct tty_struct *tty)
                 }
         }
 
-        if (info->port.tty->termios->c_cflag & CRTSCTS) {
+        if (tty->termios->c_cflag & CRTSCTS) {
                 info->MCR |= UART_MCR_RTS;
                 outb(info->MCR, info->ioaddr + UART_MCR);
         }
@@ -2040,7 +2046,7 @@ static void mxser_set_termios(struct tty_struct *tty, struct ktermios *old_termi
         unsigned long flags;
 
         spin_lock_irqsave(&info->slock, flags);
-        mxser_change_speed(info, old_termios);
+        mxser_change_speed(tty, old_termios);
         spin_unlock_irqrestore(&info->slock, flags);
 
         if ((old_termios->c_cflag & CRTSCTS) &&
@@ -2138,10 +2144,10 @@ static void mxser_hangup(struct tty_struct *tty)
         struct mxser_port *info = tty->driver_data;
 
         mxser_flush_buffer(tty);
-        mxser_shutdown(info);
+        mxser_shutdown(tty);
         info->port.count = 0;
         info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
-        info->port.tty = NULL;
+        tty_port_tty_set(&info->port, NULL);
         wake_up_interruptible(&info->port.open_wait);
 }
 
@@ -2164,9 +2170,9 @@ static int mxser_rs_break(struct tty_struct *tty, int break_state)
         return 0;
 }
 
-static void mxser_receive_chars(struct mxser_port *port, int *status)
+static void mxser_receive_chars(struct tty_struct *tty,
+                                struct mxser_port *port, int *status)
 {
-        struct tty_struct *tty = port->port.tty;
         unsigned char ch, gdl;
         int ignored = 0;
         int cnt = 0;
@@ -2174,9 +2180,8 @@ static void mxser_receive_chars(struct mxser_port *port, int *status)
         int max = 256;
 
         recv_room = tty->receive_room;
-        if ((recv_room == 0) && (!port->ldisc_stop_rx))
+        if (recv_room == 0 && !port->ldisc_stop_rx)
                 mxser_stoprx(tty);
-
         if (port->board->chip_flag != MOXA_OTHER_UART) {
 
                 if (*status & UART_LSR_SPECIAL)
@@ -2253,7 +2258,7 @@ intr_old:
         } while (*status & UART_LSR_DR);
 
 end_intr:
-        mxvar_log.rxcnt[port->port.tty->index] += cnt;
+        mxvar_log.rxcnt[tty->index] += cnt;
         port->mon_data.rxcnt += cnt;
         port->mon_data.up_rxcnt += cnt;
 
@@ -2267,14 +2272,14 @@ end_intr:
         spin_lock(&port->slock);
 }
 
-static void mxser_transmit_chars(struct mxser_port *port)
+static void mxser_transmit_chars(struct tty_struct *tty, struct mxser_port *port)
 {
         int count, cnt;
 
         if (port->x_char) {
                 outb(port->x_char, port->ioaddr + UART_TX);
                 port->x_char = 0;
-                mxvar_log.txcnt[port->port.tty->index]++;
+                mxvar_log.txcnt[tty->index]++;
                 port->mon_data.txcnt++;
                 port->mon_data.up_txcnt++;
                 port->icount.tx++;
@@ -2284,8 +2289,8 @@ static void mxser_transmit_chars(struct mxser_port *port)
         if (port->port.xmit_buf == NULL)
                 return;
 
-        if ((port->xmit_cnt <= 0) || port->port.tty->stopped ||
-                        (port->port.tty->hw_stopped &&
+        if (port->xmit_cnt <= 0 || tty->stopped ||
+                        (tty->hw_stopped &&
                         (port->type != PORT_16550A) &&
                         (!port->board->chip_flag))) {
                 port->IER &= ~UART_IER_THRI;
@@ -2302,14 +2307,14 @@ static void mxser_transmit_chars(struct mxser_port *port)
                 if (--port->xmit_cnt <= 0)
                         break;
         } while (--count > 0);
-        mxvar_log.txcnt[port->port.tty->index] += (cnt - port->xmit_cnt);
+        mxvar_log.txcnt[tty->index] += (cnt - port->xmit_cnt);
 
         port->mon_data.txcnt += (cnt - port->xmit_cnt);
         port->mon_data.up_txcnt += (cnt - port->xmit_cnt);
         port->icount.tx += (cnt - port->xmit_cnt);
 
-        if (port->xmit_cnt < WAKEUP_CHARS)
-                tty_wakeup(port->port.tty);
+        if (port->xmit_cnt < WAKEUP_CHARS && tty)
+                tty_wakeup(tty);
 
         if (port->xmit_cnt <= 0) {
                 port->IER &= ~UART_IER_THRI;
@@ -2328,6 +2333,7 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id)
         int max, irqbits, bits, msr;
         unsigned int int_cnt, pass_counter = 0;
         int handled = IRQ_NONE;
+        struct tty_struct *tty;
 
         for (i = 0; i < MXSER_BOARDS; i++)
                 if (dev_id == &mxser_boards[i]) {
@@ -2360,13 +2366,15 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id)
                                 if (iir & UART_IIR_NO_INT)
                                         break;
                                 iir &= MOXA_MUST_IIR_MASK;
-                                if (!port->port.tty ||
+                                tty = tty_port_tty_get(&port->port);
+                                if (!tty ||
                                                 (port->port.flags & ASYNC_CLOSING) ||
                                                 !(port->port.flags &
                                                         ASYNC_INITIALIZED)) {
                                         status = inb(port->ioaddr + UART_LSR);
                                         outb(0x27, port->ioaddr + UART_FCR);
                                         inb(port->ioaddr + UART_MSR);
+                                        tty_kref_put(tty);
                                         break;
                                 }
 
@@ -2387,27 +2395,28 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id)
                                             iir == MOXA_MUST_IIR_RDA ||
                                             iir == MOXA_MUST_IIR_RTO ||
                                             iir == MOXA_MUST_IIR_LSR)
-                                                mxser_receive_chars(port,
+                                                mxser_receive_chars(tty, port,
                                                                 &status);
 
                                 } else {
                                         status &= port->read_status_mask;
                                         if (status & UART_LSR_DR)
-                                                mxser_receive_chars(port,
+                                                mxser_receive_chars(tty, port,
                                                                 &status);
                                 }
                                 msr = inb(port->ioaddr + UART_MSR);
                                 if (msr & UART_MSR_ANY_DELTA)
-                                        mxser_check_modem_status(port, msr);
+                                        mxser_check_modem_status(tty, port, msr);
 
                                 if (port->board->chip_flag) {
                                         if (iir == 0x02 && (status &
                                                                 UART_LSR_THRE))
-                                                mxser_transmit_chars(port);
+                                                mxser_transmit_chars(tty, port);
                                 } else {
                                         if (status & UART_LSR_THRE)
-                                                mxser_transmit_chars(port);
+                                                mxser_transmit_chars(tty, port);
                                 }
+                                tty_kref_put(tty);
                         } while (int_cnt++ < MXSER_ISR_PASS_LIMIT);
                         spin_unlock(&port->slock);
                 }
diff --git a/drivers/char/n_hdlc.c b/drivers/char/n_hdlc.c
index 69ec6399c714..bacb3e2872ae 100644
--- a/drivers/char/n_hdlc.c
+++ b/drivers/char/n_hdlc.c
@@ -764,7 +764,7 @@ static int n_hdlc_tty_ioctl(struct tty_struct *tty, struct file *file,
                 break;
 
         default:
-                error = n_tty_ioctl (tty, file, cmd, arg);
+                error = n_tty_ioctl_helper(tty, file, cmd, arg);
                 break;
         }
         return error;
diff --git a/drivers/char/n_r3964.c b/drivers/char/n_r3964.c
index ae377aa473ba..4a8215a89ad3 100644
--- a/drivers/char/n_r3964.c
+++ b/drivers/char/n_r3964.c
@@ -372,14 +372,8 @@ static void remove_from_rx_queue(struct r3964_info *pInfo,
 static void put_char(struct r3964_info *pInfo, unsigned char ch)
 {
         struct tty_struct *tty = pInfo->tty;
-
-        if (tty == NULL)
-                return;
-
         /* FIXME: put_char should not be called from an IRQ */
-        if (tty->ops->put_char) {
-                tty->ops->put_char(tty, ch);
-        }
+        tty_put_char(tty, ch);
         pInfo->bcc ^= ch;
 }
 
diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c
index 708c2b1dbe51..efbfe9612658 100644
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
@@ -26,7 +26,7 @@
  *
  * 2002/03/18   Implemented n_tty_wakeup to send SIGIO POLL_OUTs to
  *              waiting writing processes-Sapan Bhatia <sapan@corewars.org>.
- *              Also fixed a bug in BLOCKING mode where write_chan returns
+ *              Also fixed a bug in BLOCKING mode where n_tty_write returns
  *              EAGAIN
  */
 
@@ -99,6 +99,7 @@ static inline int tty_put_user(struct tty_struct *tty, unsigned char x,
 
 static void n_tty_set_room(struct tty_struct *tty)
 {
+        /* tty->read_cnt is not read locked ? */
         int     left = N_TTY_BUF_SIZE - tty->read_cnt - 1;
 
         /*
@@ -121,6 +122,16 @@ static void put_tty_queue_nolock(unsigned char c, struct tty_struct *tty)
         }
 }
 
+/**
+ *      put_tty_queue           -       add character to tty
+ *      @c: character
+ *      @tty: tty device
+ *
+ *      Add a character to the tty read_buf queue. This is done under the
+ *      read_lock to serialize character addition and also to protect us
+ *      against parallel reads or flushes
+ */
+
 static void put_tty_queue(unsigned char c, struct tty_struct *tty)
 {
         unsigned long flags;
@@ -137,14 +148,11 @@ static void put_tty_queue(unsigned char c, struct tty_struct *tty)
  *      check_unthrottle        -       allow new receive data
  *      @tty; tty device
  *
- *      Check whether to call the driver.unthrottle function.
- *      We test the TTY_THROTTLED bit first so that it always
- *      indicates the current state. The decision about whether
- *      it is worth allowing more input has been taken by the caller.
+ *      Check whether to call the driver unthrottle functions
+ *
  *      Can sleep, may be called under the atomic_read_lock mutex but
  *      this is not guaranteed.
  */
-
 static void check_unthrottle(struct tty_struct *tty)
 {
         if (tty->count)
@@ -158,6 +166,8 @@ static void check_unthrottle(struct tty_struct *tty)
  *      Reset the read buffer counters, clear the flags,
  *      and make sure the driver is unthrottled. Called
  *      from n_tty_open() and n_tty_flush_buffer().
+ *
+ *      Locking: tty_read_lock for read fields.
  */
 static void reset_buffer_flags(struct tty_struct *tty)
 {
@@ -181,7 +191,7 @@ static void reset_buffer_flags(struct tty_struct *tty)
  *      at hangup) or when the N_TTY line discipline internally has to
  *      clean the pending queue (for example some signals).
  *
- *      Locking: ctrl_lock
+ *      Locking: ctrl_lock, read_lock.
  */
 
 static void n_tty_flush_buffer(struct tty_struct *tty)
@@ -207,6 +217,8 @@ static void n_tty_flush_buffer(struct tty_struct *tty)
  *
  *      Report the number of characters buffered to be delivered to user
  *      at this instant in time.
+ *
+ *      Locking: read_lock
  */
 
 static ssize_t n_tty_chars_in_buffer(struct tty_struct *tty)
@@ -346,7 +358,7 @@ static int opost(unsigned char c, struct tty_struct *tty)
  *      the simple cases normally found and helps to generate blocks of
  *      symbols for the console driver and thus improve performance.
  *
- *      Called from write_chan under the tty layer write lock. Relies
+ *      Called from n_tty_write under the tty layer write lock. Relies
  *      on lock_kernel for the tty->column state.
  */
 
@@ -410,6 +422,8 @@ break_out:
  *
  *      Echo user input back onto the screen. This must be called only when
  *      L_ECHO(tty) is true. Called from the driver receive_buf path.
+ *
+ *      Relies on BKL for tty column locking
  */
 
 static void echo_char(unsigned char c, struct tty_struct *tty)
@@ -422,6 +436,12 @@ static void echo_char(unsigned char c, struct tty_struct *tty)
                 opost(c, tty);
 }
 
+/**
+ *      finsh_erasing           -       complete erase
+ *      @tty: tty doing the erase
+ *
+ *      Relies on BKL for tty column locking
+ */
 static inline void finish_erasing(struct tty_struct *tty)
 {
         if (tty->erasing) {
@@ -439,6 +459,8 @@ static inline void finish_erasing(struct tty_struct *tty)
  *      Perform erase and necessary output when an erase character is
  *      present in the stream from the driver layer. Handles the complexities
  *      of UTF-8 multibyte symbols.
+ *
+ *      Locking: read_lock for tty buffers, BKL for column/erasing state
  */
 
 static void eraser(unsigned char c, struct tty_struct *tty)
@@ -447,6 +469,7 @@ static void eraser(unsigned char c, struct tty_struct *tty)
         int head, seen_alnums, cnt;
         unsigned long flags;
 
+        /* FIXME: locking needed ? */
         if (tty->read_head == tty->canon_head) {
                 /* opost('\a', tty); */         /* what do you think? */
                 return;
@@ -481,6 +504,7 @@ static void eraser(unsigned char c, struct tty_struct *tty)
         }
 
         seen_alnums = 0;
+        /* FIXME: Locking ?? */
         while (tty->read_head != tty->canon_head) {
                 head = tty->read_head;
 
@@ -583,6 +607,8 @@ static void eraser(unsigned char c, struct tty_struct *tty)
  *      may caus terminal flushing to take place according to the termios
  *      settings and character used. Called from the driver receive_buf
  *      path so serialized.
+ *
+ *      Locking: ctrl_lock, read_lock (both via flush buffer)
  */
 
 static inline void isig(int sig, struct tty_struct *tty, int flush)
@@ -1007,12 +1033,26 @@ int is_ignored(int sig)
  *      and is protected from re-entry by the tty layer. The user is
  *      guaranteed that this function will not be re-entered or in progress
  *      when the ldisc is closed.
+ *
+ *      Locking: Caller holds tty->termios_mutex
  */
 
 static void n_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
 {
-        if (!tty)
-                return;
+        int canon_change = 1;
+        BUG_ON(!tty);
+
+        if (old)
+                canon_change = (old->c_lflag ^ tty->termios->c_lflag) & ICANON;
+        if (canon_change) {
+                memset(&tty->read_flags, 0, sizeof tty->read_flags);
+                tty->canon_head = tty->read_tail;
+                tty->canon_data = 0;
+                tty->erasing = 0;
+        }
+
+        if (canon_change && !L_ICANON(tty) && tty->read_cnt)
+                wake_up_interruptible(&tty->read_wait);
 
         tty->icanon = (L_ICANON(tty) != 0);
         if (test_bit(TTY_HW_COOK_IN, &tty->flags)) {
@@ -1143,7 +1183,7 @@ static inline int input_available_p(struct tty_struct *tty, int amt)
  *      @b: user data
  *      @nr: size of data
  *
- *      Helper function to speed up read_chan.  It is only called when
+ *      Helper function to speed up n_tty_read.  It is only called when
  *      ICANON is off; it copies characters straight from the tty queue to
  *      user space directly.  It can be profitably called twice; once to
  *      drain the space from the tail pointer to the (physical) end of the
@@ -1210,7 +1250,7 @@ static int job_control(struct tty_struct *tty, struct file *file)
         if (file->f_op->write != redirected_tty_write &&
             current->signal->tty == tty) {
                 if (!tty->pgrp)
-                        printk(KERN_ERR "read_chan: no tty->pgrp!\n");
+                        printk(KERN_ERR "n_tty_read: no tty->pgrp!\n");
                 else if (task_pgrp(current) != tty->pgrp) {
                         if (is_ignored(SIGTTIN) ||
                             is_current_pgrp_orphaned())
@@ -1225,7 +1265,7 @@ static int job_control(struct tty_struct *tty, struct file *file)
 
 
 /**
- *      read_chan               -       read function for tty
+ *      n_tty_read              -       read function for tty
  *      @tty: tty device
  *      @file: file object
  *      @buf: userspace buffer pointer
@@ -1239,7 +1279,7 @@ static int job_control(struct tty_struct *tty, struct file *file)
  *      This code must be sure never to sleep through a hangup.
  */
 
-static ssize_t read_chan(struct tty_struct *tty, struct file *file,
+static ssize_t n_tty_read(struct tty_struct *tty, struct file *file,
                          unsigned char __user *buf, size_t nr)
 {
         unsigned char __user *b = buf;
@@ -1254,10 +1294,7 @@ static ssize_t read_chan(struct tty_struct *tty, struct file *file,
 
 do_it_again:
 
-        if (!tty->read_buf) {
-                printk(KERN_ERR "n_tty_read_chan: read_buf == NULL?!?\n");
-                return -EIO;
-        }
+        BUG_ON(!tty->read_buf);
 
         c = job_control(tty, file);
         if (c < 0)
@@ -1444,7 +1481,7 @@ do_it_again:
 }
 
 /**
- *      write_chan              -       write function for tty
+ *      n_tty_write             -       write function for tty
  *      @tty: tty device
  *      @file: file object
  *      @buf: userspace buffer pointer
@@ -1458,7 +1495,7 @@ do_it_again:
  *      This code must be sure never to sleep through a hangup.
  */
 
-static ssize_t write_chan(struct tty_struct *tty, struct file *file,
+static ssize_t n_tty_write(struct tty_struct *tty, struct file *file,
                           const unsigned char *buf, size_t nr)
 {
         const unsigned char *b = buf;
@@ -1532,7 +1569,7 @@ break_out:
 }
 
 /**
- *      normal_poll             -       poll method for N_TTY
+ *      n_tty_poll              -       poll method for N_TTY
  *      @tty: terminal device
  *      @file: file accessing it
  *      @wait: poll table
@@ -1545,7 +1582,7 @@ break_out:
  *      Called without the kernel lock held - fine
  */
 
-static unsigned int normal_poll(struct tty_struct *tty, struct file *file,
+static unsigned int n_tty_poll(struct tty_struct *tty, struct file *file,
                                                         poll_table *wait)
 {
         unsigned int mask = 0;
@@ -1573,6 +1610,44 @@ static unsigned int normal_poll(struct tty_struct *tty, struct file *file,
         return mask;
 }
 
+static unsigned long inq_canon(struct tty_struct *tty)
+{
+        int nr, head, tail;
+
+        if (!tty->canon_data)
+                return 0;
+        head = tty->canon_head;
+        tail = tty->read_tail;
+        nr = (head - tail) & (N_TTY_BUF_SIZE-1);
+        /* Skip EOF-chars.. */
+        while (head != tail) {
+                if (test_bit(tail, tty->read_flags) &&
+                    tty->read_buf[tail] == __DISABLED_CHAR)
+                        nr--;
+                tail = (tail+1) & (N_TTY_BUF_SIZE-1);
+        }
+        return nr;
+}
+
+static int n_tty_ioctl(struct tty_struct *tty, struct file *file,
+                       unsigned int cmd, unsigned long arg)
+{
+        int retval;
+
+        switch (cmd) {
+        case TIOCOUTQ:
+                return put_user(tty_chars_in_buffer(tty), (int __user *) arg);
+        case TIOCINQ:
+                /* FIXME: Locking */
+                retval = tty->read_cnt;
+                if (L_ICANON(tty))
+                        retval = inq_canon(tty);
+                return put_user(retval, (unsigned int __user *) arg);
+        default:
+                return n_tty_ioctl_helper(tty, file, cmd, arg);
+        }
+}
+
 struct tty_ldisc_ops tty_ldisc_N_TTY = {
         .magic           = TTY_LDISC_MAGIC,
         .name            = "n_tty",
@@ -1580,11 +1655,11 @@ struct tty_ldisc_ops tty_ldisc_N_TTY = {
         .close           = n_tty_close,
         .flush_buffer    = n_tty_flush_buffer,
         .chars_in_buffer = n_tty_chars_in_buffer,
-        .read            = read_chan,
-        .write           = write_chan,
+        .read            = n_tty_read,
+        .write           = n_tty_write,
         .ioctl           = n_tty_ioctl,
         .set_termios     = n_tty_set_termios,
-        .poll            = normal_poll,
+        .poll            = n_tty_poll,
         .receive_buf     = n_tty_receive_buf,
         .write_wakeup    = n_tty_write_wakeup
 };
diff --git a/drivers/char/nozomi.c b/drivers/char/nozomi.c
index 66a0f931c66c..9a34a1935283 100644
--- a/drivers/char/nozomi.c
+++ b/drivers/char/nozomi.c
@@ -1599,7 +1599,10 @@ static int ntty_open(struct tty_struct *tty, struct file *file)
         return 0;
 }
 
-/* Called when the userspace process close the tty, /dev/noz*. */
+/* Called when the userspace process close the tty, /dev/noz*. Also
+   called immediately if ntty_open fails in which case tty->driver_data
+   will be NULL an we exit by the first return */
+
 static void ntty_close(struct tty_struct *tty, struct file *file)
 {
         struct nozomi *dc = get_dc_by_tty(tty);
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index f070ae7bd91a..dbb912574569 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -1759,65 +1759,40 @@ static void cmm_cm4000_release(struct pcmcia_device * link)
 
 /*==== Interface to PCMCIA Layer =======================================*/
 
+static int cm4000_config_check(struct pcmcia_device *p_dev,
+                               cistpl_cftable_entry_t *cfg,
+                               cistpl_cftable_entry_t *dflt,
+                               unsigned int vcc,
+                               void *priv_data)
+{
+        if (!cfg->io.nwin)
+                return -ENODEV;
+
+        /* Get the IOaddr */
+        p_dev->io.BasePort1 = cfg->io.win[0].base;
+        p_dev->io.NumPorts1 = cfg->io.win[0].len;
+        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+        if (!(cfg->io.flags & CISTPL_IO_8BIT))
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+        if (!(cfg->io.flags & CISTPL_IO_16BIT))
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+        p_dev->io.IOAddrLines = cfg->io.flags & CISTPL_IO_LINES_MASK;
+
+        return pcmcia_request_io(p_dev, &p_dev->io);
+}
+
 static int cm4000_config(struct pcmcia_device * link, int devno)
 {
         struct cm4000_dev *dev;
-        tuple_t tuple;
-        cisparse_t parse;
-        u_char buf[64];
-        int fail_fn, fail_rc;
-        int rc;
 
         /* read the config-tuples */
-        tuple.Attributes = 0;
-        tuple.TupleData = buf;
-        tuple.TupleDataMax = sizeof(buf);
-        tuple.TupleOffset = 0;
-
-        link->io.BasePort2 = 0;
-        link->io.NumPorts2 = 0;
-        link->io.Attributes2 = 0;
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        for (rc = pcmcia_get_first_tuple(link, &tuple);
-             rc == CS_SUCCESS; rc = pcmcia_get_next_tuple(link, &tuple)) {
-
-                rc = pcmcia_get_tuple_data(link, &tuple);
-                if (rc != CS_SUCCESS)
-                        continue;
-                rc = pcmcia_parse_tuple(link, &tuple, &parse);
-                if (rc != CS_SUCCESS)
-                        continue;
-
-                link->conf.ConfigIndex = parse.cftable_entry.index;
-
-                if (!parse.cftable_entry.io.nwin)
-                        continue;
-
-                /* Get the IOaddr */
-                link->io.BasePort1 = parse.cftable_entry.io.win[0].base;
-                link->io.NumPorts1 = parse.cftable_entry.io.win[0].len;
-                link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-                if (!(parse.cftable_entry.io.flags & CISTPL_IO_8BIT))
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
-                if (!(parse.cftable_entry.io.flags & CISTPL_IO_16BIT))
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-                link->io.IOAddrLines = parse.cftable_entry.io.flags
-                    & CISTPL_IO_LINES_MASK;
-
-                rc = pcmcia_request_io(link, &link->io);
-                if (rc == CS_SUCCESS)
-                        break;  /* we are done */
-        }
-        if (rc != CS_SUCCESS)
+        if (pcmcia_loop_config(link, cm4000_config_check, NULL))
                 goto cs_release;
 
         link->conf.IntType = 00000002;
 
-        if ((fail_rc =
-             pcmcia_request_configuration(link, &link->conf)) != CS_SUCCESS) {
-                fail_fn = RequestConfiguration;
+        if (pcmcia_request_configuration(link, &link->conf))
                 goto cs_release;
-        }
 
         dev = link->priv;
         sprintf(dev->node.dev_name, DEVICE_NAME "%d", devno);
@@ -1896,7 +1871,7 @@ static int cm4000_probe(struct pcmcia_device *link)
                 return ret;
         }
 
-        device_create_drvdata(cmm_class, NULL, MKDEV(major, i), NULL, "cmm%d", i);
+        device_create(cmm_class, NULL, MKDEV(major, i), NULL, "cmm%d", i);
 
         return 0;
 }
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index 0b5934bef7a4..4f0723b07974 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -526,65 +526,49 @@ static void cm4040_reader_release(struct pcmcia_device *link)
         return;
 }
 
-static int reader_config(struct pcmcia_device *link, int devno)
+static int cm4040_config_check(struct pcmcia_device *p_dev,
+                               cistpl_cftable_entry_t *cfg,
+                               cistpl_cftable_entry_t *dflt,
+                               unsigned int vcc,
+                               void *priv_data)
 {
-        struct reader_dev *dev;
-        tuple_t tuple;
-        cisparse_t parse;
-        u_char buf[64];
-        int fail_fn, fail_rc;
         int rc;
+        if (!cfg->io.nwin)
+                return -ENODEV;
+
+        /* Get the IOaddr */
+        p_dev->io.BasePort1 = cfg->io.win[0].base;
+        p_dev->io.NumPorts1 = cfg->io.win[0].len;
+        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+        if (!(cfg->io.flags & CISTPL_IO_8BIT))
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+        if (!(cfg->io.flags & CISTPL_IO_16BIT))
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+        p_dev->io.IOAddrLines = cfg->io.flags & CISTPL_IO_LINES_MASK;
+
+        rc = pcmcia_request_io(p_dev, &p_dev->io);
+        dev_printk(KERN_INFO, &handle_to_dev(p_dev),
+                   "pcmcia_request_io returned 0x%x\n", rc);
+        return rc;
+}
+
 
-        tuple.Attributes = 0;
-        tuple.TupleData = buf;
-        tuple.TupleDataMax = sizeof(buf);
-        tuple.TupleOffset = 0;
+static int reader_config(struct pcmcia_device *link, int devno)
+{
+        struct reader_dev *dev;
+        int fail_rc;
 
         link->io.BasePort2 = 0;
         link->io.NumPorts2 = 0;
         link->io.Attributes2 = 0;
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        for (rc = pcmcia_get_first_tuple(link, &tuple);
-             rc == CS_SUCCESS;
-             rc = pcmcia_get_next_tuple(link, &tuple)) {
-                rc = pcmcia_get_tuple_data(link, &tuple);
-                if (rc != CS_SUCCESS)
-                        continue;
-                rc = pcmcia_parse_tuple(link, &tuple, &parse);
-                if (rc != CS_SUCCESS)
-                        continue;
-
-                link->conf.ConfigIndex = parse.cftable_entry.index;
-
-                if (!parse.cftable_entry.io.nwin)
-                        continue;
-
-                link->io.BasePort1 = parse.cftable_entry.io.win[0].base;
-                link->io.NumPorts1 = parse.cftable_entry.io.win[0].len;
-                link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-                if (!(parse.cftable_entry.io.flags & CISTPL_IO_8BIT))
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
-                if (!(parse.cftable_entry.io.flags & CISTPL_IO_16BIT))
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-                link->io.IOAddrLines = parse.cftable_entry.io.flags
-                                                & CISTPL_IO_LINES_MASK;
-                rc = pcmcia_request_io(link, &link->io);
-
-                dev_printk(KERN_INFO, &handle_to_dev(link), "foo");
-                if (rc == CS_SUCCESS)
-                        break;
-                else
-                        dev_printk(KERN_INFO, &handle_to_dev(link),
-                                   "pcmcia_request_io failed 0x%x\n", rc);
-        }
-        if (rc != CS_SUCCESS)
+
+        if (pcmcia_loop_config(link, cm4040_config_check, NULL))
                 goto cs_release;
 
         link->conf.IntType = 00000002;
 
-        if ((fail_rc = pcmcia_request_configuration(link,&link->conf))
-                                                                !=CS_SUCCESS) {
-                fail_fn = RequestConfiguration;
+        fail_rc = pcmcia_request_configuration(link, &link->conf);
+        if (fail_rc != 0) {
                 dev_printk(KERN_INFO, &handle_to_dev(link),
                            "pcmcia_request_configuration failed 0x%x\n",
                            fail_rc);
@@ -653,8 +637,7 @@ static int reader_probe(struct pcmcia_device *link)
                 return ret;
         }
 
-        device_create_drvdata(cmx_class, NULL, MKDEV(major, i), NULL,
-                              "cmx%d", i);
+        device_create(cmx_class, NULL, MKDEV(major, i), NULL, "cmx%d", i);
 
         return 0;
 }
diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c
index 5eca7a99afe6..5216fce0c62d 100644
--- a/drivers/char/pcmcia/ipwireless/main.c
+++ b/drivers/char/pcmcia/ipwireless/main.c
@@ -65,9 +65,9 @@ static void signalled_reboot_work(struct work_struct *work_reboot)
         struct ipw_dev *ipw = container_of(work_reboot, struct ipw_dev,
                         work_reboot);
         struct pcmcia_device *link = ipw->link;
-        int ret = pccard_reset_card(link->socket);
+        int ret = pcmcia_reset_card(link->socket);
 
-        if (ret != CS_SUCCESS)
+        if (ret != 0)
                 cs_error(link, ResetCard, ret);
 }
 
@@ -83,7 +83,6 @@ static int config_ipwireless(struct ipw_dev *ipw)
 {
         struct pcmcia_device *link = ipw->link;
         int ret;
-        config_info_t conf;
         tuple_t tuple;
         unsigned short buf[64];
         cisparse_t parse;
@@ -105,7 +104,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
         while (ret == 0) {
                 ret = pcmcia_get_tuple_data(link, &tuple);
 
-                if (ret != CS_SUCCESS) {
+                if (ret != 0) {
                         cs_error(link, GetTupleData, ret);
                         goto exit0;
                 }
@@ -116,21 +115,21 @@ static int config_ipwireless(struct ipw_dev *ipw)
 
         ret = pcmcia_get_first_tuple(link, &tuple);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, GetFirstTuple, ret);
                 goto exit0;
         }
 
         ret = pcmcia_get_tuple_data(link, &tuple);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, GetTupleData, ret);
                 goto exit0;
         }
 
-        ret = pcmcia_parse_tuple(link, &tuple, &parse);
+        ret = pcmcia_parse_tuple(&tuple, &parse);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, ParseTuple, ret);
                 goto exit0;
         }
@@ -152,21 +151,21 @@ static int config_ipwireless(struct ipw_dev *ipw)
 
         ret = pcmcia_get_first_tuple(link, &tuple);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, GetFirstTuple, ret);
                 goto exit0;
         }
 
         ret = pcmcia_get_tuple_data(link, &tuple);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, GetTupleData, ret);
                 goto exit0;
         }
 
-        ret = pcmcia_parse_tuple(link, &tuple, &parse);
+        ret = pcmcia_parse_tuple(&tuple, &parse);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, GetTupleData, ret);
                 goto exit0;
         }
@@ -181,7 +180,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
 
         ret = pcmcia_request_io(link, &link->io);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, RequestIO, ret);
                 goto exit0;
         }
@@ -195,21 +194,21 @@ static int config_ipwireless(struct ipw_dev *ipw)
 
         ret = pcmcia_get_first_tuple(link, &tuple);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, GetFirstTuple, ret);
                 goto exit1;
         }
 
         ret = pcmcia_get_tuple_data(link, &tuple);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, GetTupleData, ret);
                 goto exit1;
         }
 
-        ret = pcmcia_parse_tuple(link, &tuple, &parse);
+        ret = pcmcia_parse_tuple(&tuple, &parse);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, ParseTuple, ret);
                 goto exit1;
         }
@@ -227,7 +226,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
                 ret = pcmcia_request_window(&link, &ipw->request_common_memory,
                                 &ipw->handle_common_memory);
 
-                if (ret != CS_SUCCESS) {
+                if (ret != 0) {
                         cs_error(link, RequestWindow, ret);
                         goto exit1;
                 }
@@ -239,7 +238,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
                 ret = pcmcia_map_mem_page(ipw->handle_common_memory,
                                 &memreq_common_memory);
 
-                if (ret != CS_SUCCESS) {
+                if (ret != 0) {
                         cs_error(link, MapMemPage, ret);
                         goto exit1;
                 }
@@ -261,7 +260,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
                 ret = pcmcia_request_window(&link, &ipw->request_attr_memory,
                                 &ipw->handle_attr_memory);
 
-                if (ret != CS_SUCCESS) {
+                if (ret != 0) {
                         cs_error(link, RequestWindow, ret);
                         goto exit2;
                 }
@@ -272,7 +271,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
                 ret = pcmcia_map_mem_page(ipw->handle_attr_memory,
                                 &memreq_attr_memory);
 
-                if (ret != CS_SUCCESS) {
+                if (ret != 0) {
                         cs_error(link, MapMemPage, ret);
                         goto exit2;
                 }
@@ -292,20 +291,11 @@ static int config_ipwireless(struct ipw_dev *ipw)
 
         ret = pcmcia_request_irq(link, &link->irq);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, RequestIRQ, ret);
                 goto exit3;
         }
 
-        /* Look up current Vcc */
-
-        ret = pcmcia_get_configuration_info(link, &conf);
-
-        if (ret != CS_SUCCESS) {
-                cs_error(link, GetConfigurationInfo, ret);
-                goto exit4;
-        }
-
         printk(KERN_INFO IPWIRELESS_PCCARD_NAME ": Card type %s\n",
                         ipw->is_v2_card ? "V2/V3" : "V1");
         printk(KERN_INFO IPWIRELESS_PCCARD_NAME
@@ -341,7 +331,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
          */
         ret = pcmcia_request_configuration(link, &link->conf);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, RequestConfiguration, ret);
                 goto exit4;
         }
diff --git a/drivers/char/pcmcia/ipwireless/tty.c b/drivers/char/pcmcia/ipwireless/tty.c
index 3a23e7694d55..569f2f7743a7 100644
--- a/drivers/char/pcmcia/ipwireless/tty.c
+++ b/drivers/char/pcmcia/ipwireless/tty.c
@@ -276,6 +276,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
         struct ipw_tty *tty = linux_tty->driver_data;
         int room;
 
+        /* FIXME: Exactly how is the tty object locked here .. */
         if (!tty)
                 return -ENODEV;
 
@@ -397,6 +398,7 @@ static int set_control_lines(struct ipw_tty *tty, unsigned int set,
 static int ipw_tiocmget(struct tty_struct *linux_tty, struct file *file)
 {
         struct ipw_tty *tty = linux_tty->driver_data;
+        /* FIXME: Exactly how is the tty object locked here .. */
 
         if (!tty)
                 return -ENODEV;
@@ -412,6 +414,7 @@ ipw_tiocmset(struct tty_struct *linux_tty, struct file *file,
              unsigned int set, unsigned int clear)
 {
         struct ipw_tty *tty = linux_tty->driver_data;
+        /* FIXME: Exactly how is the tty object locked here .. */
 
         if (!tty)
                 return -ENODEV;
@@ -433,6 +436,8 @@ static int ipw_ioctl(struct tty_struct *linux_tty, struct file *file,
         if (!tty->open_count)
                 return -EINVAL;
 
+        /* FIXME: Exactly how is the tty object locked here .. */
+
         switch (cmd) {
         case TIOCGSERIAL:
                 return ipwireless_get_serial_info(tty, (void __user *) arg);
@@ -467,13 +472,6 @@ static int ipw_ioctl(struct tty_struct *linux_tty, struct file *file,
                         }
                         return 0;
 
-                case TCGETS:
-                case TCGETA:
-                        return n_tty_ioctl(linux_tty, file, cmd, arg);
-
-                case TCFLSH:
-                        return n_tty_ioctl(linux_tty, file, cmd, arg);
-
                 case FIONREAD:
                         {
                                 int val = 0;
@@ -482,10 +480,11 @@ static int ipw_ioctl(struct tty_struct *linux_tty, struct file *file,
                                         return -EFAULT;
                         }
                         return 0;
+                case TCFLSH:
+                        return tty_perform_flush(linux_tty, arg);
                 }
         }
-
-        return -ENOIOCTLCMD;
+        return tty_mode_ioctl(linux_tty, file, cmd , arg);
 }
 
 static int add_tty(dev_node_t *nodesp, int j,
@@ -588,6 +587,8 @@ void ipwireless_tty_free(struct ipw_tty *tty)
                                 tty_hangup(ttyj->linux_tty);
                                 /* Wait till the tty_hangup has completed */
                                 flush_scheduled_work();
+                                /* FIXME: Exactly how is the tty object locked here
+                                   against a parallel ioctl etc */
                                 mutex_lock(&ttyj->ipw_tty_mutex);
                         }
                         while (ttyj->open_count)
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index c240562c218b..9a626e50b793 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -601,7 +601,7 @@ static int mgslpc_config(struct pcmcia_device *link)
 
     cfg = &(parse.cftable_entry);
     CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
-    CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
+    CS_CHECK(ParseTuple, pcmcia_parse_tuple(&tuple, &parse));
 
     if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg;
     if (cfg->index == 0)
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index bee39fdfba73..c84c34fb1231 100644
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -760,9 +760,8 @@ static const struct file_operations pp_fops = {
 
 static void pp_attach(struct parport *port)
 {
-        device_create_drvdata(ppdev_class, port->dev,
-                              MKDEV(PP_MAJOR, port->number),
-                              NULL, "parport%d", port->number);
+        device_create(ppdev_class, port->dev, MKDEV(PP_MAJOR, port->number),
+                      NULL, "parport%d", port->number);
 }
 
 static void pp_detach(struct parport *port)
diff --git a/drivers/char/pty.c b/drivers/char/pty.c
index 76b27932d229..6d4582712b1f 100644
--- a/drivers/char/pty.c
+++ b/drivers/char/pty.c
@@ -8,10 +8,12 @@
  *  Added TTY_DO_WRITE_WAKEUP to enable n_tty to send POLL_OUT to
  *      waiting writers -- Sapan Bhatia <sapan@corewars.org>
  *
- *
+ *  When reading this code see also fs/devpts. In particular note that the
+ *  driver_data field is used by the devpts side as a binding to the devpts
+ *  inode.
  */
 
-#include <linux/module.h>       /* For EXPORT_SYMBOL */
+#include <linux/module.h>
 
 #include <linux/errno.h>
 #include <linux/interrupt.h>
@@ -23,26 +25,25 @@
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/sysctl.h>
-
-#include <asm/uaccess.h>
-#include <asm/system.h>
+#include <linux/device.h>
+#include <linux/uaccess.h>
 #include <linux/bitops.h>
 #include <linux/devpts_fs.h>
 
+#include <asm/system.h>
+
 /* These are global because they are accessed in tty_io.c */
 #ifdef CONFIG_UNIX98_PTYS
 struct tty_driver *ptm_driver;
 static struct tty_driver *pts_driver;
 #endif
 
-static void pty_close(struct tty_struct * tty, struct file * filp)
+static void pty_close(struct tty_struct *tty, struct file *filp)
 {
-        if (!tty)
-                return;
-        if (tty->driver->subtype == PTY_TYPE_MASTER) {
-                if (tty->count > 1)
-                        printk("master pty_close: count = %d!!\n", tty->count);
-        } else {
+        BUG_ON(!tty);
+        if (tty->driver->subtype == PTY_TYPE_MASTER)
+                WARN_ON(tty->count > 1);
+        else {
                 if (tty->count > 2)
                         return;
         }
@@ -59,7 +60,7 @@ static void pty_close(struct tty_struct * tty, struct file * filp)
                 set_bit(TTY_OTHER_CLOSED, &tty->flags);
 #ifdef CONFIG_UNIX98_PTYS
                 if (tty->driver == ptm_driver)
-                        devpts_pty_kill(tty->index);
+                        devpts_pty_kill(tty->link);
 #endif
                 tty_vhangup(tty->link);
         }
@@ -69,13 +70,13 @@ static void pty_close(struct tty_struct * tty, struct file * filp)
  * The unthrottle routine is called by the line discipline to signal
  * that it can receive more characters.  For PTY's, the TTY_THROTTLED
  * flag is always set, to force the line discipline to always call the
- * unthrottle routine when there are fewer than TTY_THRESHOLD_UNTHROTTLE 
+ * unthrottle routine when there are fewer than TTY_THRESHOLD_UNTHROTTLE
  * characters in the queue.  This is necessary since each time this
  * happens, we need to wake up any sleeping processes that could be
  * (1) trying to send data to the pty, or (2) waiting in wait_until_sent()
  * for the pty buffer to be drained.
  */
-static void pty_unthrottle(struct tty_struct * tty)
+static void pty_unthrottle(struct tty_struct *tty)
 {
         struct tty_struct *o_tty = tty->link;
 
@@ -87,7 +88,7 @@ static void pty_unthrottle(struct tty_struct * tty)
 }
 
 /*
- * WSH 05/24/97: modified to 
+ * WSH 05/24/97: modified to
  *   (1) use space in tty->flip instead of a shared temp buffer
  *       The flip buffers aren't being used for a pty, so there's lots
  *       of space available.  The buffer is protected by a per-pty
@@ -100,7 +101,8 @@ static void pty_unthrottle(struct tty_struct * tty)
  * not our partners. We can't just take the other one blindly without
  * risking deadlocks.
  */
-static int pty_write(struct tty_struct * tty, const unsigned char *buf, int count)
+static int pty_write(struct tty_struct *tty, const unsigned char *buf,
+                                                                int count)
 {
         struct tty_struct *to = tty->link;
         int     c;
@@ -112,7 +114,7 @@ static int pty_write(struct tty_struct * tty, const unsigned char *buf, int coun
         if (c > count)
                 c = count;
         to->ldisc.ops->receive_buf(to, buf, NULL, c);
-        
+
         return c;
 }
 
@@ -128,17 +130,17 @@ static int pty_write_room(struct tty_struct *tty)
 
 /*
  *      WSH 05/24/97:  Modified for asymmetric MASTER/SLAVE behavior
- *      The chars_in_buffer() value is used by the ldisc select() function 
+ *      The chars_in_buffer() value is used by the ldisc select() function
  *      to hold off writing when chars_in_buffer > WAKEUP_CHARS (== 256).
  *      The pty driver chars_in_buffer() Master/Slave must behave differently:
  *
  *      The Master side needs to allow typed-ahead commands to accumulate
  *      while being canonicalized, so we report "our buffer" as empty until
  *      some threshold is reached, and then report the count. (Any count >
- *      WAKEUP_CHARS is regarded by select() as "full".)  To avoid deadlock 
- *      the count returned must be 0 if no canonical data is available to be 
+ *      WAKEUP_CHARS is regarded by select() as "full".)  To avoid deadlock
+ *      the count returned must be 0 if no canonical data is available to be
  *      read. (The N_TTY ldisc.chars_in_buffer now knows this.)
- *  
+ *
  *      The Slave side passes all characters in raw mode to the Master side's
  *      buffer where they can be read immediately, so in this case we can
  *      return the true count in the buffer.
@@ -155,21 +157,22 @@ static int pty_chars_in_buffer(struct tty_struct *tty)
         /* The ldisc must report 0 if no characters available to be read */
         count = to->ldisc.ops->chars_in_buffer(to);
 
-        if (tty->driver->subtype == PTY_TYPE_SLAVE) return count;
+        if (tty->driver->subtype == PTY_TYPE_SLAVE)
+                return count;
 
-        /* Master side driver ... if the other side's read buffer is less than 
+        /* Master side driver ... if the other side's read buffer is less than
          * half full, return 0 to allow writers to proceed; otherwise return
-         * the count.  This leaves a comfortable margin to avoid overflow, 
+         * the count.  This leaves a comfortable margin to avoid overflow,
          * and still allows half a buffer's worth of typed-ahead commands.
          */
-        return ((count < N_TTY_BUF_SIZE/2) ? 0 : count);
+        return (count < N_TTY_BUF_SIZE/2) ? 0 : count;
 }
 
 /* Set the lock flag on a pty */
-static int pty_set_lock(struct tty_struct *tty, int __user * arg)
+static int pty_set_lock(struct tty_struct *tty, int __user *arg)
 {
         int val;
-        if (get_user(val,arg))
+        if (get_user(val, arg))
                 return -EFAULT;
         if (val)
                 set_bit(TTY_PTY_LOCK, &tty->flags);
@@ -182,13 +185,13 @@ static void pty_flush_buffer(struct tty_struct *tty)
 {
         struct tty_struct *to = tty->link;
         unsigned long flags;
-        
+
         if (!to)
                 return;
-        
+
         if (to->ldisc.ops->flush_buffer)
                 to->ldisc.ops->flush_buffer(to);
-        
+
         if (to->packet) {
                 spin_lock_irqsave(&tty->ctrl_lock, flags);
                 tty->ctrl_status |= TIOCPKT_FLUSHWRITE;
@@ -197,7 +200,7 @@ static void pty_flush_buffer(struct tty_struct *tty)
         }
 }
 
-static int pty_open(struct tty_struct *tty, struct file * filp)
+static int pty_open(struct tty_struct *tty, struct file *filp)
 {
         int     retval = -ENODEV;
 
@@ -220,13 +223,65 @@ out:
         return retval;
 }
 
-static void pty_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
+static void pty_set_termios(struct tty_struct *tty,
+                                        struct ktermios *old_termios)
+{
+        tty->termios->c_cflag &= ~(CSIZE | PARENB);
+        tty->termios->c_cflag |= (CS8 | CREAD);
+}
+
+static int pty_install(struct tty_driver *driver, struct tty_struct *tty)
 {
-        tty->termios->c_cflag &= ~(CSIZE | PARENB);
-        tty->termios->c_cflag |= (CS8 | CREAD);
+        struct tty_struct *o_tty;
+        int idx = tty->index;
+        int retval;
+
+        o_tty = alloc_tty_struct();
+        if (!o_tty)
+                return -ENOMEM;
+        if (!try_module_get(driver->other->owner)) {
+                /* This cannot in fact currently happen */
+                free_tty_struct(o_tty);
+                return -ENOMEM;
+        }
+        initialize_tty_struct(o_tty, driver->other, idx);
+
+        /* We always use new tty termios data so we can do this
+           the easy way .. */
+        retval = tty_init_termios(tty);
+        if (retval)
+                goto free_mem_out;
+
+        retval = tty_init_termios(o_tty);
+        if (retval) {
+                tty_free_termios(tty);
+                goto free_mem_out;
+        }
+
+        /*
+         * Everything allocated ... set up the o_tty structure.
+         */
+        driver->other->ttys[idx] = o_tty;
+        tty_driver_kref_get(driver->other);
+        if (driver->subtype == PTY_TYPE_MASTER)
+                o_tty->count++;
+        /* Establish the links in both directions */
+        tty->link   = o_tty;
+        o_tty->link = tty;
+
+        tty_driver_kref_get(driver);
+        tty->count++;
+        driver->ttys[idx] = tty;
+        return 0;
+free_mem_out:
+        module_put(o_tty->driver->owner);
+        free_tty_struct(o_tty);
+        return -ENOMEM;
 }
 
+
 static const struct tty_operations pty_ops = {
+        .install = pty_install,
         .open = pty_open,
         .close = pty_close,
         .write = pty_write,
@@ -329,8 +384,11 @@ static inline void legacy_pty_init(void) { }
  * Otherwise one can eat up all kernel memory by opening /dev/ptmx repeatedly.
  */
 int pty_limit = NR_UNIX98_PTY_DEFAULT;
-static int pty_limit_min = 0;
+static int pty_limit_min;
 static int pty_limit_max = NR_UNIX98_PTY_MAX;
+static int pty_count;
+
+static struct cdev ptmx_cdev;
 
 static struct ctl_table pty_table[] = {
         {
@@ -348,6 +406,7 @@ static struct ctl_table pty_table[] = {
                 .procname       = "nr",
                 .maxlen         = sizeof(int),
                 .mode           = 0444,
+                .data           = &pty_count,
                 .proc_handler   = &proc_dointvec,
         }, {
                 .ctl_name       = 0
@@ -388,7 +447,127 @@ static int pty_unix98_ioctl(struct tty_struct *tty, struct file *file,
         return -ENOIOCTLCMD;
 }
 
+/**
+ *      ptm_unix98_lookup       -       find a pty master
+ *      @driver: ptm driver
+ *      @idx: tty index
+ *
+ *      Look up a pty master device. Called under the tty_mutex for now.
+ *      This provides our locking.
+ */
+
+static struct tty_struct *ptm_unix98_lookup(struct tty_driver *driver,
+                struct inode *ptm_inode, int idx)
+{
+        struct tty_struct *tty = devpts_get_tty(ptm_inode, idx);
+        if (tty)
+                tty = tty->link;
+        return tty;
+}
+
+/**
+ *      pts_unix98_lookup       -       find a pty slave
+ *      @driver: pts driver
+ *      @idx: tty index
+ *
+ *      Look up a pty master device. Called under the tty_mutex for now.
+ *      This provides our locking.
+ */
+
+static struct tty_struct *pts_unix98_lookup(struct tty_driver *driver,
+                struct inode *pts_inode, int idx)
+{
+        struct tty_struct *tty = devpts_get_tty(pts_inode, idx);
+        /* Master must be open before slave */
+        if (!tty)
+                return ERR_PTR(-EIO);
+        return tty;
+}
+
+static void pty_unix98_shutdown(struct tty_struct *tty)
+{
+        /* We have our own method as we don't use the tty index */
+        kfree(tty->termios);
+}
+
+/* We have no need to install and remove our tty objects as devpts does all
+   the work for us */
+
+static int pty_unix98_install(struct tty_driver *driver, struct tty_struct *tty)
+{
+        struct tty_struct *o_tty;
+        int idx = tty->index;
+
+        o_tty = alloc_tty_struct();
+        if (!o_tty)
+                return -ENOMEM;
+        if (!try_module_get(driver->other->owner)) {
+                /* This cannot in fact currently happen */
+                free_tty_struct(o_tty);
+                return -ENOMEM;
+        }
+        initialize_tty_struct(o_tty, driver->other, idx);
+
+        tty->termios = kzalloc(sizeof(struct ktermios[2]), GFP_KERNEL);
+        if (tty->termios == NULL)
+                goto free_mem_out;
+        *tty->termios = driver->init_termios;
+        tty->termios_locked = tty->termios + 1;
+
+        o_tty->termios = kzalloc(sizeof(struct ktermios[2]), GFP_KERNEL);
+        if (o_tty->termios == NULL)
+                goto free_mem_out;
+        *o_tty->termios = driver->other->init_termios;
+        o_tty->termios_locked = o_tty->termios + 1;
+
+        tty_driver_kref_get(driver->other);
+        if (driver->subtype == PTY_TYPE_MASTER)
+                o_tty->count++;
+        /* Establish the links in both directions */
+        tty->link   = o_tty;
+        o_tty->link = tty;
+        /*
+         * All structures have been allocated, so now we install them.
+         * Failures after this point use release_tty to clean up, so
+         * there's no need to null out the local pointers.
+         */
+        tty_driver_kref_get(driver);
+        tty->count++;
+        pty_count++;
+        return 0;
+free_mem_out:
+        kfree(o_tty->termios);
+        module_put(o_tty->driver->owner);
+        free_tty_struct(o_tty);
+        kfree(tty->termios);
+        return -ENOMEM;
+}
+
+static void pty_unix98_remove(struct tty_driver *driver, struct tty_struct *tty)
+{
+        pty_count--;
+}
+
+static const struct tty_operations ptm_unix98_ops = {
+        .lookup = ptm_unix98_lookup,
+        .install = pty_unix98_install,
+        .remove = pty_unix98_remove,
+        .open = pty_open,
+        .close = pty_close,
+        .write = pty_write,
+        .write_room = pty_write_room,
+        .flush_buffer = pty_flush_buffer,
+        .chars_in_buffer = pty_chars_in_buffer,
+        .unthrottle = pty_unthrottle,
+        .set_termios = pty_set_termios,
+        .ioctl = pty_unix98_ioctl,
+        .shutdown = pty_unix98_shutdown
+};
+
 static const struct tty_operations pty_unix98_ops = {
+        .lookup = pts_unix98_lookup,
+        .install = pty_unix98_install,
+        .remove = pty_unix98_remove,
         .open = pty_open,
         .close = pty_close,
         .write = pty_write,
@@ -397,9 +576,73 @@ static const struct tty_operations pty_unix98_ops = {
         .chars_in_buffer = pty_chars_in_buffer,
         .unthrottle = pty_unthrottle,
         .set_termios = pty_set_termios,
-        .ioctl = pty_unix98_ioctl
+        .shutdown = pty_unix98_shutdown
 };
 
+/**
+ *      ptmx_open               -       open a unix 98 pty master
+ *      @inode: inode of device file
+ *      @filp: file pointer to tty
+ *
+ *      Allocate a unix98 pty master device from the ptmx driver.
+ *
+ *      Locking: tty_mutex protects the init_dev work. tty->count should
+ *              protect the rest.
+ *              allocated_ptys_lock handles the list of free pty numbers
+ */
+
+static int __ptmx_open(struct inode *inode, struct file *filp)
+{
+        struct tty_struct *tty;
+        int retval;
+        int index;
+
+        nonseekable_open(inode, filp);
+
+        /* find a device that is not in use. */
+        index = devpts_new_index(inode);
+        if (index < 0)
+                return index;
+
+        mutex_lock(&tty_mutex);
+        tty = tty_init_dev(ptm_driver, index, 1);
+        mutex_unlock(&tty_mutex);
+
+        if (IS_ERR(tty)) {
+                retval = PTR_ERR(tty);
+                goto out;
+        }
+
+        set_bit(TTY_PTY_LOCK, &tty->flags); /* LOCK THE SLAVE */
+        filp->private_data = tty;
+        file_move(filp, &tty->tty_files);
+
+        retval = devpts_pty_new(inode, tty->link);
+        if (retval)
+                goto out1;
+
+        retval = ptm_driver->ops->open(tty, filp);
+        if (!retval)
+                return 0;
+out1:
+        tty_release_dev(filp);
+        return retval;
+out:
+        devpts_kill_index(inode, index);
+        return retval;
+}
+
+static int ptmx_open(struct inode *inode, struct file *filp)
+{
+        int ret;
+
+        lock_kernel();
+        ret = __ptmx_open(inode, filp);
+        unlock_kernel();
+        return ret;
+}
+
+static struct file_operations ptmx_fops;
 
 static void __init unix98_pty_init(void)
 {
@@ -427,7 +670,7 @@ static void __init unix98_pty_init(void)
         ptm_driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW |
                 TTY_DRIVER_DYNAMIC_DEV | TTY_DRIVER_DEVPTS_MEM;
         ptm_driver->other = pts_driver;
-        tty_set_operations(ptm_driver, &pty_unix98_ops);
+        tty_set_operations(ptm_driver, &ptm_unix98_ops);
 
         pts_driver->owner = THIS_MODULE;
         pts_driver->driver_name = "pty_slave";
@@ -443,16 +686,26 @@ static void __init unix98_pty_init(void)
         pts_driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW |
                 TTY_DRIVER_DYNAMIC_DEV | TTY_DRIVER_DEVPTS_MEM;
         pts_driver->other = ptm_driver;
-        tty_set_operations(pts_driver, &pty_ops);
-        
+        tty_set_operations(pts_driver, &pty_unix98_ops);
+
         if (tty_register_driver(ptm_driver))
                 panic("Couldn't register Unix98 ptm driver");
         if (tty_register_driver(pts_driver))
                 panic("Couldn't register Unix98 pts driver");
 
-        pty_table[1].data = &ptm_driver->refcount;
         register_sysctl_table(pty_root_table);
+
+        /* Now create the /dev/ptmx special device */
+        tty_default_fops(&ptmx_fops);
+        ptmx_fops.open = ptmx_open;
+
+        cdev_init(&ptmx_cdev, &ptmx_fops);
+        if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
+            register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
+                panic("Couldn't register /dev/ptmx driver\n");
+        device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 2), NULL, "ptmx");
 }
+
 #else
 static inline void unix98_pty_init(void) { }
 #endif
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 6af435b89867..c8752eaad483 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1205,7 +1205,7 @@ static int proc_do_uuid(ctl_table *table, int write, struct file *filp,
         return proc_dostring(&fake_table, write, filp, buffer, lenp, ppos);
 }
 
-static int uuid_strategy(ctl_table *table, int __user *name, int nlen,
+static int uuid_strategy(ctl_table *table,
                          void __user *oldval, size_t __user *oldlenp,
                          void __user *newval, size_t newlen)
 {
diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index 47b8cf281d4a..e139372d0e69 100644
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -131,8 +131,8 @@ raw_ioctl(struct inode *inode, struct file *filp,
 static void bind_device(struct raw_config_request *rq)
 {
         device_destroy(raw_class, MKDEV(RAW_MAJOR, rq->raw_minor));
-        device_create_drvdata(raw_class, NULL, MKDEV(RAW_MAJOR, rq->raw_minor),
-                              NULL, "raw%d", rq->raw_minor);
+        device_create(raw_class, NULL, MKDEV(RAW_MAJOR, rq->raw_minor), NULL,
+                      "raw%d", rq->raw_minor);
 }
 
 /*
@@ -283,8 +283,7 @@ static int __init raw_init(void)
                 ret = PTR_ERR(raw_class);
                 goto error_region;
         }
-        device_create_drvdata(raw_class, NULL, MKDEV(RAW_MAJOR, 0), NULL,
-                              "rawctl");
+        device_create(raw_class, NULL, MKDEV(RAW_MAJOR, 0), NULL, "rawctl");
 
         return 0;
 
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index b47710c17885..17683de95717 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -96,7 +96,7 @@ static unsigned long rtc_port;
 static int rtc_irq;
 #endif
 
-#ifdef  CONFIG_HPET_RTC_IRQ
+#ifdef  CONFIG_HPET_EMULATE_RTC
 #undef  RTC_IRQ
 #endif
 
diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c
index 3ce60df14c0a..32b74de18f5f 100644
--- a/drivers/char/snsc.c
+++ b/drivers/char/snsc.c
@@ -444,8 +444,8 @@ scdrv_init(void)
                                 continue;
                         }
 
-                        device_create_drvdata(snsc_class, NULL, dev, NULL,
-                                              "%s", devname);
+                        device_create(snsc_class, NULL, dev, NULL,
+                                      "%s", devname);
 
                         ia64_sn_irtr_intr_enable(scd->scd_nasid,
                                                  0 /*ignored */ ,
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index 19db1eb87c26..963b03fb29e5 100644
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -405,9 +405,9 @@ static unsigned int	stl_baudrates[] = {
 
 static int      stl_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, unsigned long arg);
 static int      stl_brdinit(struct stlbrd *brdp);
-static int      stl_getportstats(struct stlport *portp, comstats_t __user *cp);
+static int      stl_getportstats(struct tty_struct *tty, struct stlport *portp, comstats_t __user *cp);
 static int      stl_clrportstats(struct stlport *portp, comstats_t __user *cp);
-static int      stl_waitcarrier(struct stlport *portp, struct file *filp);
+static int      stl_waitcarrier(struct tty_struct *tty, struct stlport *portp, struct file *filp);
 
 /*
  *      CD1400 uart specific handling functions.
@@ -612,8 +612,9 @@ static struct class *stallion_class;
 static void stl_cd_change(struct stlport *portp)
 {
         unsigned int oldsigs = portp->sigs;
+        struct tty_struct *tty = tty_port_tty_get(&portp->port);
 
-        if (!portp->port.tty)
+        if (!tty)
                 return;
 
         portp->sigs = stl_getsignals(portp);
@@ -623,7 +624,8 @@ static void stl_cd_change(struct stlport *portp)
 
         if ((oldsigs & TIOCM_CD) && ((portp->sigs & TIOCM_CD) == 0))
                 if (portp->port.flags & ASYNC_CHECK_CD)
-                        tty_hangup(portp->port.tty);
+                        tty_hangup(tty);
+        tty_kref_put(tty);
 }
 
 /*
@@ -734,7 +736,7 @@ static int stl_open(struct tty_struct *tty, struct file *filp)
  *      On the first open of the device setup the port hardware, and
  *      initialize the per port data structure.
  */
-        portp->port.tty = tty;
+        tty_port_tty_set(&portp->port, tty);
         tty->driver_data = portp;
         portp->port.count++;
 
@@ -774,7 +776,7 @@ static int stl_open(struct tty_struct *tty, struct file *filp)
  *      then also we might have to wait for carrier.
  */
         if (!(filp->f_flags & O_NONBLOCK))
-                if ((rc = stl_waitcarrier(portp, filp)) != 0)
+                if ((rc = stl_waitcarrier(tty, portp, filp)) != 0)
                         return rc;
 
         portp->port.flags |= ASYNC_NORMAL_ACTIVE;
@@ -789,7 +791,8 @@ static int stl_open(struct tty_struct *tty, struct file *filp)
  *      maybe because if we are clocal then we don't need to wait...
  */
 
-static int stl_waitcarrier(struct stlport *portp, struct file *filp)
+static int stl_waitcarrier(struct tty_struct *tty, struct stlport *portp,
+                                                        struct file *filp)
 {
         unsigned long   flags;
         int             rc, doclocal;
@@ -801,7 +804,7 @@ static int stl_waitcarrier(struct stlport *portp, struct file *filp)
 
         spin_lock_irqsave(&stallion_lock, flags);
 
-        if (portp->port.tty->termios->c_cflag & CLOCAL)
+        if (tty->termios->c_cflag & CLOCAL)
                 doclocal++;
 
         portp->openwaitcnt++;
@@ -846,8 +849,6 @@ static void stl_flushbuffer(struct tty_struct *tty)
 
         pr_debug("stl_flushbuffer(tty=%p)\n", tty);
 
-        if (tty == NULL)
-                return;
         portp = tty->driver_data;
         if (portp == NULL)
                 return;
@@ -865,8 +866,6 @@ static void stl_waituntilsent(struct tty_struct *tty, int timeout)
 
         pr_debug("stl_waituntilsent(tty=%p,timeout=%d)\n", tty, timeout);
 
-        if (tty == NULL)
-                return;
         portp = tty->driver_data;
         if (portp == NULL)
                 return;
@@ -949,7 +948,7 @@ static void stl_close(struct tty_struct *tty, struct file *filp)
         tty_ldisc_flush(tty);
 
         tty->closing = 0;
-        portp->port.tty = NULL;
+        tty_port_tty_set(&portp->port, NULL);
 
         if (portp->openwaitcnt) {
                 if (portp->close_delay)
@@ -1033,8 +1032,6 @@ static int stl_putchar(struct tty_struct *tty, unsigned char ch)
 
         pr_debug("stl_putchar(tty=%p,ch=%x)\n", tty, ch);
 
-        if (tty == NULL)
-                return -EINVAL;
         portp = tty->driver_data;
         if (portp == NULL)
                 return -EINVAL;
@@ -1070,8 +1067,6 @@ static void stl_flushchars(struct tty_struct *tty)
 
         pr_debug("stl_flushchars(tty=%p)\n", tty);
 
-        if (tty == NULL)
-                return;
         portp = tty->driver_data;
         if (portp == NULL)
                 return;
@@ -1090,8 +1085,6 @@ static int stl_writeroom(struct tty_struct *tty)
 
         pr_debug("stl_writeroom(tty=%p)\n", tty);
 
-        if (tty == NULL)
-                return 0;
         portp = tty->driver_data;
         if (portp == NULL)
                 return 0;
@@ -1122,8 +1115,6 @@ static int stl_charsinbuffer(struct tty_struct *tty)
 
         pr_debug("stl_charsinbuffer(tty=%p)\n", tty);
 
-        if (tty == NULL)
-                return 0;
         portp = tty->driver_data;
         if (portp == NULL)
                 return 0;
@@ -1183,8 +1174,9 @@ static int stl_getserial(struct stlport *portp, struct serial_struct __user *sp)
  *      just quietly ignore any requests to change irq, etc.
  */
 
-static int stl_setserial(struct stlport *portp, struct serial_struct __user *sp)
+static int stl_setserial(struct tty_struct *tty, struct serial_struct __user *sp)
 {
+        struct stlport *        portp = tty->driver_data;
         struct serial_struct    sio;
 
         pr_debug("stl_setserial(portp=%p,sp=%p)\n", portp, sp);
@@ -1205,7 +1197,7 @@ static int stl_setserial(struct stlport *portp, struct serial_struct __user *sp)
         portp->close_delay = sio.close_delay;
         portp->closing_wait = sio.closing_wait;
         portp->custom_divisor = sio.custom_divisor;
-        stl_setport(portp, portp->port.tty->termios);
+        stl_setport(portp, tty->termios);
         return 0;
 }
 
@@ -1215,8 +1207,6 @@ static int stl_tiocmget(struct tty_struct *tty, struct file *file)
 {
         struct stlport  *portp;
 
-        if (tty == NULL)
-                return -ENODEV;
         portp = tty->driver_data;
         if (portp == NULL)
                 return -ENODEV;
@@ -1232,8 +1222,6 @@ static int stl_tiocmset(struct tty_struct *tty, struct file *file,
         struct stlport  *portp;
         int rts = -1, dtr = -1;
 
-        if (tty == NULL)
-                return -ENODEV;
         portp = tty->driver_data;
         if (portp == NULL)
                 return -ENODEV;
@@ -1262,8 +1250,6 @@ static int stl_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd
         pr_debug("stl_ioctl(tty=%p,file=%p,cmd=%x,arg=%lx)\n", tty, file, cmd,
                         arg);
 
-        if (tty == NULL)
-                return -ENODEV;
         portp = tty->driver_data;
         if (portp == NULL)
                 return -ENODEV;
@@ -1282,10 +1268,10 @@ static int stl_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd
                 rc = stl_getserial(portp, argp);
                 break;
         case TIOCSSERIAL:
-                rc = stl_setserial(portp, argp);
+                rc = stl_setserial(tty, argp);
                 break;
         case COM_GETPORTSTATS:
-                rc = stl_getportstats(portp, argp);
+                rc = stl_getportstats(tty, portp, argp);
                 break;
         case COM_CLRPORTSTATS:
                 rc = stl_clrportstats(portp, argp);
@@ -1317,8 +1303,6 @@ static void stl_start(struct tty_struct *tty)
 
         pr_debug("stl_start(tty=%p)\n", tty);
 
-        if (tty == NULL)
-                return;
         portp = tty->driver_data;
         if (portp == NULL)
                 return;
@@ -1334,8 +1318,6 @@ static void stl_settermios(struct tty_struct *tty, struct ktermios *old)
 
         pr_debug("stl_settermios(tty=%p,old=%p)\n", tty, old);
 
-        if (tty == NULL)
-                return;
         portp = tty->driver_data;
         if (portp == NULL)
                 return;
@@ -1369,8 +1351,6 @@ static void stl_throttle(struct tty_struct *tty)
 
         pr_debug("stl_throttle(tty=%p)\n", tty);
 
-        if (tty == NULL)
-                return;
         portp = tty->driver_data;
         if (portp == NULL)
                 return;
@@ -1389,8 +1369,6 @@ static void stl_unthrottle(struct tty_struct *tty)
 
         pr_debug("stl_unthrottle(tty=%p)\n", tty);
 
-        if (tty == NULL)
-                return;
         portp = tty->driver_data;
         if (portp == NULL)
                 return;
@@ -1410,8 +1388,6 @@ static void stl_stop(struct tty_struct *tty)
 
         pr_debug("stl_stop(tty=%p)\n", tty);
 
-        if (tty == NULL)
-                return;
         portp = tty->driver_data;
         if (portp == NULL)
                 return;
@@ -1432,8 +1408,6 @@ static void stl_hangup(struct tty_struct *tty)
 
         pr_debug("stl_hangup(tty=%p)\n", tty);
 
-        if (tty == NULL)
-                return;
         portp = tty->driver_data;
         if (portp == NULL)
                 return;
@@ -1452,7 +1426,7 @@ static void stl_hangup(struct tty_struct *tty)
                 portp->tx.head = NULL;
                 portp->tx.tail = NULL;
         }
-        portp->port.tty = NULL;
+        tty_port_tty_set(&portp->port, NULL);
         portp->port.flags &= ~ASYNC_NORMAL_ACTIVE;
         portp->port.count = 0;
         wake_up_interruptible(&portp->port.open_wait);
@@ -1466,8 +1440,6 @@ static int stl_breakctl(struct tty_struct *tty, int state)
 
         pr_debug("stl_breakctl(tty=%p,state=%d)\n", tty, state);
 
-        if (tty == NULL)
-                return -EINVAL;
         portp = tty->driver_data;
         if (portp == NULL)
                 return -EINVAL;
@@ -1484,8 +1456,6 @@ static void stl_sendxchar(struct tty_struct *tty, char ch)
 
         pr_debug("stl_sendxchar(tty=%p,ch=%x)\n", tty, ch);
 
-        if (tty == NULL)
-                return;
         portp = tty->driver_data;
         if (portp == NULL)
                 return;
@@ -1805,7 +1775,7 @@ static int __devinit stl_initports(struct stlbrd *brdp, struct stlpanel *panelp)
                                 "(size=%Zd)\n", sizeof(struct stlport));
                         break;
                 }
-
+                tty_port_init(&portp->port);
                 portp->magic = STL_PORTMAGIC;
                 portp->portnr = i;
                 portp->brdnr = panelp->brdnr;
@@ -1832,6 +1802,7 @@ static void stl_cleanup_panels(struct stlbrd *brdp)
         struct stlpanel *panelp;
         struct stlport *portp;
         unsigned int j, k;
+        struct tty_struct *tty;
 
         for (j = 0; j < STL_MAXPANELS; j++) {
                 panelp = brdp->panels[j];
@@ -1841,8 +1812,11 @@ static void stl_cleanup_panels(struct stlbrd *brdp)
                         portp = panelp->ports[k];
                         if (portp == NULL)
                                 continue;
-                        if (portp->port.tty != NULL)
-                                stl_hangup(portp->port.tty);
+                        tty = tty_port_tty_get(&portp->port);
+                        if (tty != NULL) {
+                                stl_hangup(tty);
+                                tty_kref_put(tty);
+                        }
                         kfree(portp->tx.buf);
                         kfree(portp);
                 }
@@ -2498,7 +2472,7 @@ static struct stlport *stl_getport(int brdnr, int panelnr, int portnr)
  *      what port to get stats for (used through board control device).
  */
 
-static int stl_getportstats(struct stlport *portp, comstats_t __user *cp)
+static int stl_getportstats(struct tty_struct *tty, struct stlport *portp, comstats_t __user *cp)
 {
         comstats_t      stl_comstats;
         unsigned char   *head, *tail;
@@ -2525,18 +2499,17 @@ static int stl_getportstats(struct stlport *portp, comstats_t __user *cp)
         portp->stats.rxbuffered = 0;
 
         spin_lock_irqsave(&stallion_lock, flags);
-        if (portp->port.tty != NULL)
-                if (portp->port.tty->driver_data == portp) {
-                        portp->stats.ttystate = portp->port.tty->flags;
-                        /* No longer available as a statistic */
-                        portp->stats.rxbuffered = 1; /*portp->port.tty->flip.count; */
-                        if (portp->port.tty->termios != NULL) {
-                                portp->stats.cflags = portp->port.tty->termios->c_cflag;
-                                portp->stats.iflags = portp->port.tty->termios->c_iflag;
-                                portp->stats.oflags = portp->port.tty->termios->c_oflag;
-                                portp->stats.lflags = portp->port.tty->termios->c_lflag;
-                        }
+        if (tty != NULL && portp->port.tty == tty) {
+                portp->stats.ttystate = tty->flags;
+                /* No longer available as a statistic */
+                portp->stats.rxbuffered = 1; /*tty->flip.count; */
+                if (tty->termios != NULL) {
+                        portp->stats.cflags = tty->termios->c_cflag;
+                        portp->stats.iflags = tty->termios->c_iflag;
+                        portp->stats.oflags = tty->termios->c_oflag;
+                        portp->stats.lflags = tty->termios->c_lflag;
                 }
+        }
         spin_unlock_irqrestore(&stallion_lock, flags);
 
         head = portp->tx.head;
@@ -2640,7 +2613,7 @@ static int stl_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, uns
 
         switch (cmd) {
         case COM_GETPORTSTATS:
-                rc = stl_getportstats(NULL, argp);
+                rc = stl_getportstats(NULL, NULL, argp);
                 break;
         case COM_CLRPORTSTATS:
                 rc = stl_clrportstats(NULL, argp);
@@ -3243,7 +3216,7 @@ static void stl_cd1400flowctrl(struct stlport *portp, int state)
 
         if (portp == NULL)
                 return;
-        tty = portp->port.tty;
+        tty = tty_port_tty_get(&portp->port);
         if (tty == NULL)
                 return;
 
@@ -3288,6 +3261,7 @@ static void stl_cd1400flowctrl(struct stlport *portp, int state)
 
         BRDDISABLE(portp->brdnr);
         spin_unlock_irqrestore(&brd_lock, flags);
+        tty_kref_put(tty);
 }
 
 /*****************************************************************************/
@@ -3305,7 +3279,7 @@ static void stl_cd1400sendflow(struct stlport *portp, int state)
 
         if (portp == NULL)
                 return;
-        tty = portp->port.tty;
+        tty = tty_port_tty_get(&portp->port);
         if (tty == NULL)
                 return;
 
@@ -3325,6 +3299,7 @@ static void stl_cd1400sendflow(struct stlport *portp, int state)
         }
         BRDDISABLE(portp->brdnr);
         spin_unlock_irqrestore(&brd_lock, flags);
+        tty_kref_put(tty);
 }
 
 /*****************************************************************************/
@@ -3478,6 +3453,7 @@ static void stl_cd1400txisr(struct stlpanel *panelp, int ioaddr)
         int             len, stlen;
         char            *head, *tail;
         unsigned char   ioack, srer;
+        struct tty_struct *tty;
 
         pr_debug("stl_cd1400txisr(panelp=%p,ioaddr=%x)\n", panelp, ioaddr);
 
@@ -3504,8 +3480,11 @@ static void stl_cd1400txisr(struct stlpanel *panelp, int ioaddr)
         if ((len == 0) || ((len < STL_TXBUFLOW) &&
             (test_bit(ASYI_TXLOW, &portp->istate) == 0))) {
                 set_bit(ASYI_TXLOW, &portp->istate);
-                if (portp->port.tty)
-                        tty_wakeup(portp->port.tty);
+                tty = tty_port_tty_get(&portp->port);
+                if (tty) {
+                        tty_wakeup(tty);
+                        tty_kref_put(tty);
+                }
         }
 
         if (len == 0) {
@@ -3569,7 +3548,7 @@ static void stl_cd1400rxisr(struct stlpanel *panelp, int ioaddr)
                 return;
         }
         portp = panelp->ports[(ioack >> 3)];
-        tty = portp->port.tty;
+        tty = tty_port_tty_get(&portp->port);
 
         if ((ioack & ACK_TYPMASK) == ACK_TYPRXGOOD) {
                 outb((RDCR + portp->uartaddr), ioaddr);
@@ -3633,10 +3612,12 @@ static void stl_cd1400rxisr(struct stlpanel *panelp, int ioaddr)
                 }
         } else {
                 printk("STALLION: bad RX interrupt ack value=%x\n", ioack);
+                tty_kref_put(tty);
                 return;
         }
 
 stl_rxalldone:
+        tty_kref_put(tty);
         outb((EOSRR + portp->uartaddr), ioaddr);
         outb(0, (ioaddr + EREG_DATA));
 }
@@ -4175,7 +4156,7 @@ static void stl_sc26198flowctrl(struct stlport *portp, int state)
 
         if (portp == NULL)
                 return;
-        tty = portp->port.tty;
+        tty = tty_port_tty_get(&portp->port);
         if (tty == NULL)
                 return;
 
@@ -4226,6 +4207,7 @@ static void stl_sc26198flowctrl(struct stlport *portp, int state)
 
         BRDDISABLE(portp->brdnr);
         spin_unlock_irqrestore(&brd_lock, flags);
+        tty_kref_put(tty);
 }
 
 /*****************************************************************************/
@@ -4244,7 +4226,7 @@ static void stl_sc26198sendflow(struct stlport *portp, int state)
 
         if (portp == NULL)
                 return;
-        tty = portp->port.tty;
+        tty = tty_port_tty_get(&portp->port);
         if (tty == NULL)
                 return;
 
@@ -4269,6 +4251,7 @@ static void stl_sc26198sendflow(struct stlport *portp, int state)
         }
         BRDDISABLE(portp->brdnr);
         spin_unlock_irqrestore(&brd_lock, flags);
+        tty_kref_put(tty);
 }
 
 /*****************************************************************************/
@@ -4408,6 +4391,7 @@ static void stl_sc26198intr(struct stlpanel *panelp, unsigned int iobase)
 
 static void stl_sc26198txisr(struct stlport *portp)
 {
+        struct tty_struct *tty;
         unsigned int    ioaddr;
         unsigned char   mr0;
         int             len, stlen;
@@ -4422,8 +4406,11 @@ static void stl_sc26198txisr(struct stlport *portp)
         if ((len == 0) || ((len < STL_TXBUFLOW) &&
             (test_bit(ASYI_TXLOW, &portp->istate) == 0))) {
                 set_bit(ASYI_TXLOW, &portp->istate);
-                if (portp->port.tty)
-                        tty_wakeup(portp->port.tty);
+                tty = tty_port_tty_get(&portp->port);
+                if (tty) {
+                        tty_wakeup(tty);
+                        tty_kref_put(tty);
+                }
         }
 
         if (len == 0) {
@@ -4476,7 +4463,7 @@ static void stl_sc26198rxisr(struct stlport *portp, unsigned int iack)
 
         pr_debug("stl_sc26198rxisr(portp=%p,iack=%x)\n", portp, iack);
 
-        tty = portp->port.tty;
+        tty = tty_port_tty_get(&portp->port);
         ioaddr = portp->ioaddr;
         outb(GIBCR, (ioaddr + XP_ADDR));
         len = inb(ioaddr + XP_DATA) + 1;
@@ -4515,6 +4502,7 @@ static void stl_sc26198rxisr(struct stlport *portp, unsigned int iack)
                         stl_sc26198txunflow(portp, tty);
                 }
         }
+        tty_kref_put(tty);
 }
 
 /*****************************************************************************/
@@ -4528,7 +4516,7 @@ static void stl_sc26198rxbadch(struct stlport *portp, unsigned char status, char
         struct tty_struct       *tty;
         unsigned int            ioaddr;
 
-        tty = portp->port.tty;
+        tty = tty_port_tty_get(&portp->port);
         ioaddr = portp->ioaddr;
 
         if (status & SR_RXPARITY)
@@ -4566,6 +4554,7 @@ static void stl_sc26198rxbadch(struct stlport *portp, unsigned char status, char
                 if (status == 0)
                         portp->stats.rxtotal++;
         }
+        tty_kref_put(tty);
 }
 
 /*****************************************************************************/
@@ -4754,8 +4743,8 @@ static int __init stallion_module_init(void)
         if (IS_ERR(stallion_class))
                 printk("STALLION: failed to create class\n");
         for (i = 0; i < 4; i++)
-                device_create_drvdata(stallion_class, NULL, MKDEV(STL_SIOMEMMAJOR, i),
-                                      NULL, "staliomem%d", i);
+                device_create(stallion_class, NULL, MKDEV(STL_SIOMEMMAJOR, i),
+                              NULL, "staliomem%d", i);
 
         return 0;
 err_unrtty:
diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index c385206f9db5..5b8d7a1aa3e6 100644
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -2504,7 +2504,7 @@ static void __devexit sx_remove_card(struct sx_board *board,
                 del_timer(&board->timer);
                 if (pdev) {
 #ifdef CONFIG_PCI
-                        pci_iounmap(pdev, board->base);
+                        pci_iounmap(pdev, board->base2);
                         pci_release_region(pdev, IS_CF_BOARD(board) ? 3 : 2);
 #endif
                 } else {
@@ -2703,7 +2703,7 @@ static int __devinit sx_pci_probe(struct pci_dev *pdev,
 
         return 0;
 err_unmap:
-        pci_iounmap(pdev, board->base);
+        pci_iounmap(pdev, board->base2);
 err_reg:
         pci_release_region(pdev, reg);
 err_flag:
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index 8fdfe9c871e3..dce4cc0e6953 100644
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -23,6 +23,7 @@
 #include <linux/reboot.h>
 #include <linux/sysrq.h>
 #include <linux/kbd_kern.h>
+#include <linux/proc_fs.h>
 #include <linux/quotaops.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -326,6 +327,7 @@ static struct sysrq_key_op sysrq_moom_op = {
         .handler        = sysrq_handle_moom,
         .help_msg       = "Full",
         .action_msg     = "Manual OOM execution",
+        .enable_mask    = SYSRQ_ENABLE_SIGNAL,
 };
 
 static void sysrq_handle_kill(int key, struct tty_struct *tty)
@@ -533,3 +535,32 @@ int unregister_sysrq_key(int key, struct sysrq_key_op *op_p)
         return __sysrq_swap_key_ops(key, NULL, op_p);
 }
 EXPORT_SYMBOL(unregister_sysrq_key);
+
+#ifdef CONFIG_PROC_FS
+/*
+ * writing 'C' to /proc/sysrq-trigger is like sysrq-C
+ */
+static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
+                                   size_t count, loff_t *ppos)
+{
+        if (count) {
+                char c;
+
+                if (get_user(c, buf))
+                        return -EFAULT;
+                __handle_sysrq(c, NULL, 0);
+        }
+        return count;
+}
+
+static const struct file_operations proc_sysrq_trigger_operations = {
+        .write          = write_sysrq_trigger,
+};
+
+static int __init sysrq_init(void)
+{
+        proc_create("sysrq-trigger", S_IWUSR, NULL, &proc_sysrq_trigger_operations);
+        return 0;
+}
+module_init(sysrq_init);
+#endif
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index ae766d868454..e70d13defde4 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -525,19 +525,19 @@ void tpm_get_timeouts(struct tpm_chip *chip)
         timeout =
             be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_UINT32_1_IDX)));
         if (timeout)
-                chip->vendor.timeout_a = msecs_to_jiffies(timeout);
+                chip->vendor.timeout_a = usecs_to_jiffies(timeout);
         timeout =
             be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_UINT32_2_IDX)));
         if (timeout)
-                chip->vendor.timeout_b = msecs_to_jiffies(timeout);
+                chip->vendor.timeout_b = usecs_to_jiffies(timeout);
         timeout =
             be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_UINT32_3_IDX)));
         if (timeout)
-                chip->vendor.timeout_c = msecs_to_jiffies(timeout);
+                chip->vendor.timeout_c = usecs_to_jiffies(timeout);
         timeout =
             be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_UINT32_4_IDX)));
         if (timeout)
-                chip->vendor.timeout_d = msecs_to_jiffies(timeout);
+                chip->vendor.timeout_d = usecs_to_jiffies(timeout);
 
 duration:
         memcpy(data, tpm_cap, sizeof(tpm_cap));
@@ -554,15 +554,22 @@ duration:
                 return;
 
         chip->vendor.duration[TPM_SHORT] =
-            msecs_to_jiffies(be32_to_cpu
+            usecs_to_jiffies(be32_to_cpu
                              (*((__be32 *) (data +
                                             TPM_GET_CAP_RET_UINT32_1_IDX))));
+        /* The Broadcom BCM0102 chipset in a Dell Latitude D820 gets the above
+         * value wrong and apparently reports msecs rather than usecs. So we
+         * fix up the resulting too-small TPM_SHORT value to make things work.
+         */
+        if (chip->vendor.duration[TPM_SHORT] < (HZ/100))
+                chip->vendor.duration[TPM_SHORT] = HZ;
+
         chip->vendor.duration[TPM_MEDIUM] =
-            msecs_to_jiffies(be32_to_cpu
+            usecs_to_jiffies(be32_to_cpu
                              (*((__be32 *) (data +
                                             TPM_GET_CAP_RET_UINT32_2_IDX))));
         chip->vendor.duration[TPM_LONG] =
-            msecs_to_jiffies(be32_to_cpu
+            usecs_to_jiffies(be32_to_cpu
                              (*((__be32 *) (data +
                                             TPM_GET_CAP_RET_UINT32_3_IDX))));
 }
@@ -954,72 +961,63 @@ EXPORT_SYMBOL_GPL(tpm_store_cancel);
 
 /*
  * Device file system interface to the TPM
+ *
+ * It's assured that the chip will be opened just once,
+ * by the check of is_open variable, which is protected
+ * by driver_lock.
  */
 int tpm_open(struct inode *inode, struct file *file)
 {
-        int rc = 0, minor = iminor(inode);
+        int minor = iminor(inode);
         struct tpm_chip *chip = NULL, *pos;
 
-        lock_kernel();
-        spin_lock(&driver_lock);
-
-        list_for_each_entry(pos, &tpm_chip_list, list) {
+        rcu_read_lock();
+        list_for_each_entry_rcu(pos, &tpm_chip_list, list) {
                 if (pos->vendor.miscdev.minor == minor) {
                         chip = pos;
+                        get_device(chip->dev);
                         break;
                 }
         }
+        rcu_read_unlock();
 
-        if (chip == NULL) {
-                rc = -ENODEV;
-                goto err_out;
-        }
+        if (!chip)
+                return -ENODEV;
 
-        if (chip->num_opens) {
+        if (test_and_set_bit(0, &chip->is_open)) {
                 dev_dbg(chip->dev, "Another process owns this TPM\n");
-                rc = -EBUSY;
-                goto err_out;
+                put_device(chip->dev);
+                return -EBUSY;
         }
 
-        chip->num_opens++;
-        get_device(chip->dev);
-
-        spin_unlock(&driver_lock);
-
         chip->data_buffer = kmalloc(TPM_BUFSIZE * sizeof(u8), GFP_KERNEL);
         if (chip->data_buffer == NULL) {
-                chip->num_opens--;
+                clear_bit(0, &chip->is_open);
                 put_device(chip->dev);
-                unlock_kernel();
                 return -ENOMEM;
         }
 
         atomic_set(&chip->data_pending, 0);
 
         file->private_data = chip;
-        unlock_kernel();
         return 0;
-
-err_out:
-        spin_unlock(&driver_lock);
-        unlock_kernel();
-        return rc;
 }
 EXPORT_SYMBOL_GPL(tpm_open);
 
+/*
+ * Called on file close
+ */
 int tpm_release(struct inode *inode, struct file *file)
 {
         struct tpm_chip *chip = file->private_data;
 
+        del_singleshot_timer_sync(&chip->user_read_timer);
         flush_scheduled_work();
-        spin_lock(&driver_lock);
         file->private_data = NULL;
-        del_singleshot_timer_sync(&chip->user_read_timer);
         atomic_set(&chip->data_pending, 0);
-        chip->num_opens--;
-        put_device(chip->dev);
         kfree(chip->data_buffer);
-        spin_unlock(&driver_lock);
+        clear_bit(0, &chip->is_open);
+        put_device(chip->dev);
         return 0;
 }
 EXPORT_SYMBOL_GPL(tpm_release);
@@ -1093,13 +1091,11 @@ void tpm_remove_hardware(struct device *dev)
         }
 
         spin_lock(&driver_lock);
-
-        list_del(&chip->list);
-
+        list_del_rcu(&chip->list);
         spin_unlock(&driver_lock);
+        synchronize_rcu();
 
         misc_deregister(&chip->vendor.miscdev);
-
         sysfs_remove_group(&dev->kobj, chip->vendor.attr_group);
         tpm_bios_log_teardown(chip->bios_dir);
 
@@ -1144,25 +1140,33 @@ int tpm_pm_resume(struct device *dev)
 }
 EXPORT_SYMBOL_GPL(tpm_pm_resume);
 
+/* In case vendor provided release function, call it too.*/
+
+void tpm_dev_vendor_release(struct tpm_chip *chip)
+{
+        if (chip->vendor.release)
+                chip->vendor.release(chip->dev);
+
+        clear_bit(chip->dev_num, dev_mask);
+        kfree(chip->vendor.miscdev.name);
+}
+EXPORT_SYMBOL_GPL(tpm_dev_vendor_release);
+
+
 /*
  * Once all references to platform device are down to 0,
  * release all allocated structures.
- * In case vendor provided release function,
- * call it too.
  */
 static void tpm_dev_release(struct device *dev)
 {
         struct tpm_chip *chip = dev_get_drvdata(dev);
 
-        if (chip->vendor.release)
-                chip->vendor.release(dev);
+        tpm_dev_vendor_release(chip);
 
         chip->release(dev);
-
-        clear_bit(chip->dev_num, dev_mask);
-        kfree(chip->vendor.miscdev.name);
         kfree(chip);
 }
+EXPORT_SYMBOL_GPL(tpm_dev_release);
 
 /*
  * Called from tpm_<specific>.c probe function only for devices 
@@ -1171,8 +1175,8 @@ static void tpm_dev_release(struct device *dev)
  * upon errant exit from this function specific probe function should call
  * pci_disable_device
  */
-struct tpm_chip *tpm_register_hardware(struct device *dev, const struct tpm_vendor_specific
-                                       *entry)
+struct tpm_chip *tpm_register_hardware(struct device *dev,
+                                        const struct tpm_vendor_specific *entry)
 {
 #define DEVNAME_SIZE 7
 
@@ -1183,11 +1187,8 @@ struct tpm_chip *tpm_register_hardware(struct device *dev, const struct tpm_vend
         chip = kzalloc(sizeof(*chip), GFP_KERNEL);
         devname = kmalloc(DEVNAME_SIZE, GFP_KERNEL);
 
-        if (chip == NULL || devname == NULL) {
-                kfree(chip);
-                kfree(devname);
-                return NULL;
-        }
+        if (chip == NULL || devname == NULL)
+                goto out_free;
 
         mutex_init(&chip->buffer_mutex);
         mutex_init(&chip->tpm_mutex);
@@ -1204,8 +1205,7 @@ struct tpm_chip *tpm_register_hardware(struct device *dev, const struct tpm_vend
 
         if (chip->dev_num >= TPM_NUM_DEVICES) {
                 dev_err(dev, "No available tpm device numbers\n");
-                kfree(chip);
-                return NULL;
+                goto out_free;
         } else if (chip->dev_num == 0)
                 chip->vendor.miscdev.minor = TPM_MINOR;
         else
@@ -1231,22 +1231,26 @@ struct tpm_chip *tpm_register_hardware(struct device *dev, const struct tpm_vend
                 return NULL;
         }
 
-        spin_lock(&driver_lock);
-
-        list_add(&chip->list, &tpm_chip_list);
-
-        spin_unlock(&driver_lock);
-
         if (sysfs_create_group(&dev->kobj, chip->vendor.attr_group)) {
-                list_del(&chip->list);
                 misc_deregister(&chip->vendor.miscdev);
                 put_device(chip->dev);
+
                 return NULL;
         }
 
         chip->bios_dir = tpm_bios_log_setup(devname);
 
+        /* Make chip available */
+        spin_lock(&driver_lock);
+        list_add_rcu(&chip->list, &tpm_chip_list);
+        spin_unlock(&driver_lock);
+
         return chip;
+
+out_free:
+        kfree(chip);
+        kfree(devname);
+        return NULL;
 }
 EXPORT_SYMBOL_GPL(tpm_register_hardware);
 
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index e885148b4cfb..8e30df4a4388 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -90,7 +90,7 @@ struct tpm_chip {
         struct device *dev;     /* Device stuff */
 
         int dev_num;            /* /dev/tpm# */
-        int num_opens;          /* only one allowed */
+        unsigned long is_open;  /* only one allowed */
         int time_expired;
 
         /* Data passed to and from the tpm via the read/write calls */
@@ -132,6 +132,7 @@ extern struct tpm_chip* tpm_register_hardware(struct device *,
                                  const struct tpm_vendor_specific *);
 extern int tpm_open(struct inode *, struct file *);
 extern int tpm_release(struct inode *, struct file *);
+extern void tpm_dev_vendor_release(struct tpm_chip *);
 extern ssize_t tpm_write(struct file *, const char __user *, size_t,
                          loff_t *);
 extern ssize_t tpm_read(struct file *, char __user *, size_t, loff_t *);
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index ed1879c0dd8d..717af7ad1bdf 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -630,12 +630,23 @@ static struct pnp_device_id tpm_pnp_tbl[] __devinitdata = {
         {"", 0}                 /* Terminator */
 };
 
+static __devexit void tpm_tis_pnp_remove(struct pnp_dev *dev)
+{
+        struct tpm_chip *chip = pnp_get_drvdata(dev);
+
+        tpm_dev_vendor_release(chip);
+
+        kfree(chip);
+}
+
+
 static struct pnp_driver tis_pnp_driver = {
         .name = "tpm_tis",
         .id_table = tpm_pnp_tbl,
         .probe = tpm_tis_pnp_init,
         .suspend = tpm_tis_pnp_suspend,
         .resume = tpm_tis_pnp_resume,
+        .remove = tpm_tis_pnp_remove,
 };
 
 #define TIS_HID_USR_IDX sizeof(tpm_pnp_tbl)/sizeof(struct pnp_device_id) -2
@@ -683,6 +694,7 @@ static void __exit cleanup_tis(void)
         spin_lock(&tis_lock);
         list_for_each_entry_safe(i, j, &tis_chips, list) {
                 chip = to_tpm_chip(i);
+                tpm_remove_hardware(chip->dev);
                 iowrite32(~TPM_GLOBAL_INT_ENABLE &
                           ioread32(chip->vendor.iobase +
                                    TPM_INT_ENABLE(chip->vendor.
@@ -694,9 +706,9 @@ static void __exit cleanup_tis(void)
                         free_irq(chip->vendor.irq, chip);
                 iounmap(i->iobase);
                 list_del(&i->list);
-                tpm_remove_hardware(chip->dev);
         }
         spin_unlock(&tis_lock);
+
         if (force) {
                 platform_device_unregister(pdev);
                 driver_unregister(&tis_drv);
diff --git a/drivers/char/tty_audit.c b/drivers/char/tty_audit.c
index 3582f43345a8..5787249934c8 100644
--- a/drivers/char/tty_audit.c
+++ b/drivers/char/tty_audit.c
@@ -93,7 +93,7 @@ static void tty_audit_buf_push(struct task_struct *tsk, uid_t loginuid,
                 get_task_comm(name, tsk);
                 audit_log_untrustedstring(ab, name);
                 audit_log_format(ab, " data=");
-                audit_log_n_untrustedstring(ab, buf->data, buf->valid);
+                audit_log_n_hex(ab, buf->data, buf->valid);
                 audit_log_end(ab);
         }
         buf->valid = 0;
diff --git a/drivers/char/tty_buffer.c b/drivers/char/tty_buffer.c
new file mode 100644
index 000000000000..810ee25d66a4
--- /dev/null
+++ b/drivers/char/tty_buffer.c
@@ -0,0 +1,511 @@
+/*
+ * Tty buffer allocation management
+ */
+
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/tty.h>
+#include <linux/tty_driver.h>
+#include <linux/tty_flip.h>
+#include <linux/timer.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/sched.h>
+#include <linux/init.h>
+#include <linux/wait.h>
+#include <linux/bitops.h>
+#include <linux/delay.h>
+#include <linux/module.h>
+
+/**
+ *      tty_buffer_free_all             -       free buffers used by a tty
+ *      @tty: tty to free from
+ *
+ *      Remove all the buffers pending on a tty whether queued with data
+ *      or in the free ring. Must be called when the tty is no longer in use
+ *
+ *      Locking: none
+ */
+
+void tty_buffer_free_all(struct tty_struct *tty)
+{
+        struct tty_buffer *thead;
+        while ((thead = tty->buf.head) != NULL) {
+                tty->buf.head = thead->next;
+                kfree(thead);
+        }
+        while ((thead = tty->buf.free) != NULL) {
+                tty->buf.free = thead->next;
+                kfree(thead);
+        }
+        tty->buf.tail = NULL;
+        tty->buf.memory_used = 0;
+}
+
+/**
+ *      tty_buffer_alloc        -       allocate a tty buffer
+ *      @tty: tty device
+ *      @size: desired size (characters)
+ *
+ *      Allocate a new tty buffer to hold the desired number of characters.
+ *      Return NULL if out of memory or the allocation would exceed the
+ *      per device queue
+ *
+ *      Locking: Caller must hold tty->buf.lock
+ */
+
+static struct tty_buffer *tty_buffer_alloc(struct tty_struct *tty, size_t size)
+{
+        struct tty_buffer *p;
+
+        if (tty->buf.memory_used + size > 65536)
+                return NULL;
+        p = kmalloc(sizeof(struct tty_buffer) + 2 * size, GFP_ATOMIC);
+        if (p == NULL)
+                return NULL;
+        p->used = 0;
+        p->size = size;
+        p->next = NULL;
+        p->commit = 0;
+        p->read = 0;
+        p->char_buf_ptr = (char *)(p->data);
+        p->flag_buf_ptr = (unsigned char *)p->char_buf_ptr + size;
+        tty->buf.memory_used += size;
+        return p;
+}
+
+/**
+ *      tty_buffer_free         -       free a tty buffer
+ *      @tty: tty owning the buffer
+ *      @b: the buffer to free
+ *
+ *      Free a tty buffer, or add it to the free list according to our
+ *      internal strategy
+ *
+ *      Locking: Caller must hold tty->buf.lock
+ */
+
+static void tty_buffer_free(struct tty_struct *tty, struct tty_buffer *b)
+{
+        /* Dumb strategy for now - should keep some stats */
+        tty->buf.memory_used -= b->size;
+        WARN_ON(tty->buf.memory_used < 0);
+
+        if (b->size >= 512)
+                kfree(b);
+        else {
+                b->next = tty->buf.free;
+                tty->buf.free = b;
+        }
+}
+
+/**
+ *      __tty_buffer_flush              -       flush full tty buffers
+ *      @tty: tty to flush
+ *
+ *      flush all the buffers containing receive data. Caller must
+ *      hold the buffer lock and must have ensured no parallel flush to
+ *      ldisc is running.
+ *
+ *      Locking: Caller must hold tty->buf.lock
+ */
+
+static void __tty_buffer_flush(struct tty_struct *tty)
+{
+        struct tty_buffer *thead;
+
+        while ((thead = tty->buf.head) != NULL) {
+                tty->buf.head = thead->next;
+                tty_buffer_free(tty, thead);
+        }
+        tty->buf.tail = NULL;
+}
+
+/**
+ *      tty_buffer_flush                -       flush full tty buffers
+ *      @tty: tty to flush
+ *
+ *      flush all the buffers containing receive data. If the buffer is
+ *      being processed by flush_to_ldisc then we defer the processing
+ *      to that function
+ *
+ *      Locking: none
+ */
+
+void tty_buffer_flush(struct tty_struct *tty)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&tty->buf.lock, flags);
+
+        /* If the data is being pushed to the tty layer then we can't
+           process it here. Instead set a flag and the flush_to_ldisc
+           path will process the flush request before it exits */
+        if (test_bit(TTY_FLUSHING, &tty->flags)) {
+                set_bit(TTY_FLUSHPENDING, &tty->flags);
+                spin_unlock_irqrestore(&tty->buf.lock, flags);
+                wait_event(tty->read_wait,
+                                test_bit(TTY_FLUSHPENDING, &tty->flags) == 0);
+                return;
+        } else
+                __tty_buffer_flush(tty);
+        spin_unlock_irqrestore(&tty->buf.lock, flags);
+}
+
+/**
+ *      tty_buffer_find         -       find a free tty buffer
+ *      @tty: tty owning the buffer
+ *      @size: characters wanted
+ *
+ *      Locate an existing suitable tty buffer or if we are lacking one then
+ *      allocate a new one. We round our buffers off in 256 character chunks
+ *      to get better allocation behaviour.
+ *
+ *      Locking: Caller must hold tty->buf.lock
+ */
+
+static struct tty_buffer *tty_buffer_find(struct tty_struct *tty, size_t size)
+{
+        struct tty_buffer **tbh = &tty->buf.free;
+        while ((*tbh) != NULL) {
+                struct tty_buffer *t = *tbh;
+                if (t->size >= size) {
+                        *tbh = t->next;
+                        t->next = NULL;
+                        t->used = 0;
+                        t->commit = 0;
+                        t->read = 0;
+                        tty->buf.memory_used += t->size;
+                        return t;
+                }
+                tbh = &((*tbh)->next);
+        }
+        /* Round the buffer size out */
+        size = (size + 0xFF) & ~0xFF;
+        return tty_buffer_alloc(tty, size);
+        /* Should possibly check if this fails for the largest buffer we
+           have queued and recycle that ? */
+}
+
+/**
+ *      tty_buffer_request_room         -       grow tty buffer if needed
+ *      @tty: tty structure
+ *      @size: size desired
+ *
+ *      Make at least size bytes of linear space available for the tty
+ *      buffer. If we fail return the size we managed to find.
+ *
+ *      Locking: Takes tty->buf.lock
+ */
+int tty_buffer_request_room(struct tty_struct *tty, size_t size)
+{
+        struct tty_buffer *b, *n;
+        int left;
+        unsigned long flags;
+
+        spin_lock_irqsave(&tty->buf.lock, flags);
+
+        /* OPTIMISATION: We could keep a per tty "zero" sized buffer to
+           remove this conditional if its worth it. This would be invisible
+           to the callers */
+        if ((b = tty->buf.tail) != NULL)
+                left = b->size - b->used;
+        else
+                left = 0;
+
+        if (left < size) {
+                /* This is the slow path - looking for new buffers to use */
+                if ((n = tty_buffer_find(tty, size)) != NULL) {
+                        if (b != NULL) {
+                                b->next = n;
+                                b->commit = b->used;
+                        } else
+                                tty->buf.head = n;
+                        tty->buf.tail = n;
+                } else
+                        size = left;
+        }
+
+        spin_unlock_irqrestore(&tty->buf.lock, flags);
+        return size;
+}
+EXPORT_SYMBOL_GPL(tty_buffer_request_room);
+
+/**
+ *      tty_insert_flip_string  -       Add characters to the tty buffer
+ *      @tty: tty structure
+ *      @chars: characters
+ *      @size: size
+ *
+ *      Queue a series of bytes to the tty buffering. All the characters
+ *      passed are marked as without error. Returns the number added.
+ *
+ *      Locking: Called functions may take tty->buf.lock
+ */
+
+int tty_insert_flip_string(struct tty_struct *tty, const unsigned char *chars,
+                                size_t size)
+{
+        int copied = 0;
+        do {
+                int space = tty_buffer_request_room(tty, size - copied);
+                struct tty_buffer *tb = tty->buf.tail;
+                /* If there is no space then tb may be NULL */
+                if (unlikely(space == 0))
+                        break;
+                memcpy(tb->char_buf_ptr + tb->used, chars, space);
+                memset(tb->flag_buf_ptr + tb->used, TTY_NORMAL, space);
+                tb->used += space;
+                copied += space;
+                chars += space;
+                /* There is a small chance that we need to split the data over
+                   several buffers. If this is the case we must loop */
+        } while (unlikely(size > copied));
+        return copied;
+}
+EXPORT_SYMBOL(tty_insert_flip_string);
+
+/**
+ *      tty_insert_flip_string_flags    -       Add characters to the tty buffer
+ *      @tty: tty structure
+ *      @chars: characters
+ *      @flags: flag bytes
+ *      @size: size
+ *
+ *      Queue a series of bytes to the tty buffering. For each character
+ *      the flags array indicates the status of the character. Returns the
+ *      number added.
+ *
+ *      Locking: Called functions may take tty->buf.lock
+ */
+
+int tty_insert_flip_string_flags(struct tty_struct *tty,
+                const unsigned char *chars, const char *flags, size_t size)
+{
+        int copied = 0;
+        do {
+                int space = tty_buffer_request_room(tty, size - copied);
+                struct tty_buffer *tb = tty->buf.tail;
+                /* If there is no space then tb may be NULL */
+                if (unlikely(space == 0))
+                        break;
+                memcpy(tb->char_buf_ptr + tb->used, chars, space);
+                memcpy(tb->flag_buf_ptr + tb->used, flags, space);
+                tb->used += space;
+                copied += space;
+                chars += space;
+                flags += space;
+                /* There is a small chance that we need to split the data over
+                   several buffers. If this is the case we must loop */
+        } while (unlikely(size > copied));
+        return copied;
+}
+EXPORT_SYMBOL(tty_insert_flip_string_flags);
+
+/**
+ *      tty_schedule_flip       -       push characters to ldisc
+ *      @tty: tty to push from
+ *
+ *      Takes any pending buffers and transfers their ownership to the
+ *      ldisc side of the queue. It then schedules those characters for
+ *      processing by the line discipline.
+ *
+ *      Locking: Takes tty->buf.lock
+ */
+
+void tty_schedule_flip(struct tty_struct *tty)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&tty->buf.lock, flags);
+        if (tty->buf.tail != NULL)
+                tty->buf.tail->commit = tty->buf.tail->used;
+        spin_unlock_irqrestore(&tty->buf.lock, flags);
+        schedule_delayed_work(&tty->buf.work, 1);
+}
+EXPORT_SYMBOL(tty_schedule_flip);
+
+/**
+ *      tty_prepare_flip_string         -       make room for characters
+ *      @tty: tty
+ *      @chars: return pointer for character write area
+ *      @size: desired size
+ *
+ *      Prepare a block of space in the buffer for data. Returns the length
+ *      available and buffer pointer to the space which is now allocated and
+ *      accounted for as ready for normal characters. This is used for drivers
+ *      that need their own block copy routines into the buffer. There is no
+ *      guarantee the buffer is a DMA target!
+ *
+ *      Locking: May call functions taking tty->buf.lock
+ */
+
+int tty_prepare_flip_string(struct tty_struct *tty, unsigned char **chars,
+                                                                size_t size)
+{
+        int space = tty_buffer_request_room(tty, size);
+        if (likely(space)) {
+                struct tty_buffer *tb = tty->buf.tail;
+                *chars = tb->char_buf_ptr + tb->used;
+                memset(tb->flag_buf_ptr + tb->used, TTY_NORMAL, space);
+                tb->used += space;
+        }
+        return space;
+}
+EXPORT_SYMBOL_GPL(tty_prepare_flip_string);
+
+/**
+ *      tty_prepare_flip_string_flags   -       make room for characters
+ *      @tty: tty
+ *      @chars: return pointer for character write area
+ *      @flags: return pointer for status flag write area
+ *      @size: desired size
+ *
+ *      Prepare a block of space in the buffer for data. Returns the length
+ *      available and buffer pointer to the space which is now allocated and
+ *      accounted for as ready for characters. This is used for drivers
+ *      that need their own block copy routines into the buffer. There is no
+ *      guarantee the buffer is a DMA target!
+ *
+ *      Locking: May call functions taking tty->buf.lock
+ */
+
+int tty_prepare_flip_string_flags(struct tty_struct *tty,
+                        unsigned char **chars, char **flags, size_t size)
+{
+        int space = tty_buffer_request_room(tty, size);
+        if (likely(space)) {
+                struct tty_buffer *tb = tty->buf.tail;
+                *chars = tb->char_buf_ptr + tb->used;
+                *flags = tb->flag_buf_ptr + tb->used;
+                tb->used += space;
+        }
+        return space;
+}
+EXPORT_SYMBOL_GPL(tty_prepare_flip_string_flags);
+
+
+
+/**
+ *      flush_to_ldisc
+ *      @work: tty structure passed from work queue.
+ *
+ *      This routine is called out of the software interrupt to flush data
+ *      from the buffer chain to the line discipline.
+ *
+ *      Locking: holds tty->buf.lock to guard buffer list. Drops the lock
+ *      while invoking the line discipline receive_buf method. The
+ *      receive_buf method is single threaded for each tty instance.
+ */
+
+static void flush_to_ldisc(struct work_struct *work)
+{
+        struct tty_struct *tty =
+                container_of(work, struct tty_struct, buf.work.work);
+        unsigned long   flags;
+        struct tty_ldisc *disc;
+        struct tty_buffer *tbuf, *head;
+        char *char_buf;
+        unsigned char *flag_buf;
+
+        disc = tty_ldisc_ref(tty);
+        if (disc == NULL)       /*  !TTY_LDISC */
+                return;
+
+        spin_lock_irqsave(&tty->buf.lock, flags);
+        /* So we know a flush is running */
+        set_bit(TTY_FLUSHING, &tty->flags);
+        head = tty->buf.head;
+        if (head != NULL) {
+                tty->buf.head = NULL;
+                for (;;) {
+                        int count = head->commit - head->read;
+                        if (!count) {
+                                if (head->next == NULL)
+                                        break;
+                                tbuf = head;
+                                head = head->next;
+                                tty_buffer_free(tty, tbuf);
+                                continue;
+                        }
+                        /* Ldisc or user is trying to flush the buffers
+                           we are feeding to the ldisc, stop feeding the
+                           line discipline as we want to empty the queue */
+                        if (test_bit(TTY_FLUSHPENDING, &tty->flags))
+                                break;
+                        if (!tty->receive_room) {
+                                schedule_delayed_work(&tty->buf.work, 1);
+                                break;
+                        }
+                        if (count > tty->receive_room)
+                                count = tty->receive_room;
+                        char_buf = head->char_buf_ptr + head->read;
+                        flag_buf = head->flag_buf_ptr + head->read;
+                        head->read += count;
+                        spin_unlock_irqrestore(&tty->buf.lock, flags);
+                        disc->ops->receive_buf(tty, char_buf,
+                                                        flag_buf, count);
+                        spin_lock_irqsave(&tty->buf.lock, flags);
+                }
+                /* Restore the queue head */
+                tty->buf.head = head;
+        }
+        /* We may have a deferred request to flush the input buffer,
+           if so pull the chain under the lock and empty the queue */
+        if (test_bit(TTY_FLUSHPENDING, &tty->flags)) {
+                __tty_buffer_flush(tty);
+                clear_bit(TTY_FLUSHPENDING, &tty->flags);
+                wake_up(&tty->read_wait);
+        }
+        clear_bit(TTY_FLUSHING, &tty->flags);
+        spin_unlock_irqrestore(&tty->buf.lock, flags);
+
+        tty_ldisc_deref(disc);
+}
+
+/**
+ *      tty_flip_buffer_push    -       terminal
+ *      @tty: tty to push
+ *
+ *      Queue a push of the terminal flip buffers to the line discipline. This
+ *      function must not be called from IRQ context if tty->low_latency is set.
+ *
+ *      In the event of the queue being busy for flipping the work will be
+ *      held off and retried later.
+ *
+ *      Locking: tty buffer lock. Driver locks in low latency mode.
+ */
+
+void tty_flip_buffer_push(struct tty_struct *tty)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&tty->buf.lock, flags);
+        if (tty->buf.tail != NULL)
+                tty->buf.tail->commit = tty->buf.tail->used;
+        spin_unlock_irqrestore(&tty->buf.lock, flags);
+
+        if (tty->low_latency)
+                flush_to_ldisc(&tty->buf.work.work);
+        else
+                schedule_delayed_work(&tty->buf.work, 1);
+}
+EXPORT_SYMBOL(tty_flip_buffer_push);
+
+/**
+ *      tty_buffer_init         -       prepare a tty buffer structure
+ *      @tty: tty to initialise
+ *
+ *      Set up the initial state of the buffer management for a tty device.
+ *      Must be called before the other tty buffer functions are used.
+ *
+ *      Locking: none
+ */
+
+void tty_buffer_init(struct tty_struct *tty)
+{
+        spin_lock_init(&tty->buf.lock);
+        tty->buf.head = NULL;
+        tty->buf.tail = NULL;
+        tty->buf.free = NULL;
+        tty->buf.memory_used = 0;
+        INIT_DELAYED_WORK(&tty->buf.work, flush_to_ldisc);
+}
+
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index e4dce8709541..59f472143f08 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -49,7 +49,7 @@
  * implement CONFIG_VT and generalize console device interface.
  *      -- Marko Kohtala <Marko.Kohtala@hut.fi>, March 97
  *
- * Rewrote init_dev and release_dev to eliminate races.
+ * Rewrote tty_init_dev and tty_release_dev to eliminate races.
  *      -- Bill Hawes <whawes@star.net>, June 97
  *
  * Added devfs support.
@@ -136,13 +136,6 @@ LIST_HEAD(tty_drivers);			/* linked list of tty drivers */
 DEFINE_MUTEX(tty_mutex);
 EXPORT_SYMBOL(tty_mutex);
 
-#ifdef CONFIG_UNIX98_PTYS
-extern struct tty_driver *ptm_driver;   /* Unix98 pty masters; for /dev/ptmx */
-static int ptmx_open(struct inode *, struct file *);
-#endif
-
-static void initialize_tty_struct(struct tty_struct *tty);
-
 static ssize_t tty_read(struct file *, char __user *, size_t, loff_t *);
 static ssize_t tty_write(struct file *, const char __user *, size_t, loff_t *);
 ssize_t redirected_tty_write(struct file *, const char __user *,
@@ -171,13 +164,11 @@ static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
  *      Locking: none
  */
 
-static struct tty_struct *alloc_tty_struct(void)
+struct tty_struct *alloc_tty_struct(void)
 {
         return kzalloc(sizeof(struct tty_struct), GFP_KERNEL);
 }
 
-static void tty_buffer_free_all(struct tty_struct *);
-
 /**
  *      free_tty_struct         -       free a disused tty
  *      @tty: tty struct to free
@@ -187,7 +178,7 @@ static void tty_buffer_free_all(struct tty_struct *);
  *      Locking: none. Must be called after tty is definitely unused
  */
 
-static inline void free_tty_struct(struct tty_struct *tty)
+void free_tty_struct(struct tty_struct *tty)
 {
         kfree(tty->write_buf);
         tty_buffer_free_all(tty);
@@ -263,398 +254,6 @@ static int check_tty_count(struct tty_struct *tty, const char *routine)
         return 0;
 }
 
-/*
- * Tty buffer allocation management
- */
-
-/**
- *      tty_buffer_free_all             -       free buffers used by a tty
- *      @tty: tty to free from
- *
- *      Remove all the buffers pending on a tty whether queued with data
- *      or in the free ring. Must be called when the tty is no longer in use
- *
- *      Locking: none
- */
-
-static void tty_buffer_free_all(struct tty_struct *tty)
-{
-        struct tty_buffer *thead;
-        while ((thead = tty->buf.head) != NULL) {
-                tty->buf.head = thead->next;
-                kfree(thead);
-        }
-        while ((thead = tty->buf.free) != NULL) {
-                tty->buf.free = thead->next;
-                kfree(thead);
-        }
-        tty->buf.tail = NULL;
-        tty->buf.memory_used = 0;
-}
-
-/**
- *      tty_buffer_init         -       prepare a tty buffer structure
- *      @tty: tty to initialise
- *
- *      Set up the initial state of the buffer management for a tty device.
- *      Must be called before the other tty buffer functions are used.
- *
- *      Locking: none
- */
-
-static void tty_buffer_init(struct tty_struct *tty)
-{
-        spin_lock_init(&tty->buf.lock);
-        tty->buf.head = NULL;
-        tty->buf.tail = NULL;
-        tty->buf.free = NULL;
-        tty->buf.memory_used = 0;
-}
-
-/**
- *      tty_buffer_alloc        -       allocate a tty buffer
- *      @tty: tty device
- *      @size: desired size (characters)
- *
- *      Allocate a new tty buffer to hold the desired number of characters.
- *      Return NULL if out of memory or the allocation would exceed the
- *      per device queue
- *
- *      Locking: Caller must hold tty->buf.lock
- */
-
-static struct tty_buffer *tty_buffer_alloc(struct tty_struct *tty, size_t size)
-{
-        struct tty_buffer *p;
-
-        if (tty->buf.memory_used + size > 65536)
-                return NULL;
-        p = kmalloc(sizeof(struct tty_buffer) + 2 * size, GFP_ATOMIC);
-        if (p == NULL)
-                return NULL;
-        p->used = 0;
-        p->size = size;
-        p->next = NULL;
-        p->commit = 0;
-        p->read = 0;
-        p->char_buf_ptr = (char *)(p->data);
-        p->flag_buf_ptr = (unsigned char *)p->char_buf_ptr + size;
-        tty->buf.memory_used += size;
-        return p;
-}
-
-/**
- *      tty_buffer_free         -       free a tty buffer
- *      @tty: tty owning the buffer
- *      @b: the buffer to free
- *
- *      Free a tty buffer, or add it to the free list according to our
- *      internal strategy
- *
- *      Locking: Caller must hold tty->buf.lock
- */
-
-static void tty_buffer_free(struct tty_struct *tty, struct tty_buffer *b)
-{
-        /* Dumb strategy for now - should keep some stats */
-        tty->buf.memory_used -= b->size;
-        WARN_ON(tty->buf.memory_used < 0);
-
-        if (b->size >= 512)
-                kfree(b);
-        else {
-                b->next = tty->buf.free;
-                tty->buf.free = b;
-        }
-}
-
-/**
- *      __tty_buffer_flush              -       flush full tty buffers
- *      @tty: tty to flush
- *
- *      flush all the buffers containing receive data. Caller must
- *      hold the buffer lock and must have ensured no parallel flush to
- *      ldisc is running.
- *
- *      Locking: Caller must hold tty->buf.lock
- */
-
-static void __tty_buffer_flush(struct tty_struct *tty)
-{
-        struct tty_buffer *thead;
-
-        while ((thead = tty->buf.head) != NULL) {
-                tty->buf.head = thead->next;
-                tty_buffer_free(tty, thead);
-        }
-        tty->buf.tail = NULL;
-}
-
-/**
- *      tty_buffer_flush                -       flush full tty buffers
- *      @tty: tty to flush
- *
- *      flush all the buffers containing receive data. If the buffer is
- *      being processed by flush_to_ldisc then we defer the processing
- *      to that function
- *
- *      Locking: none
- */
-
-static void tty_buffer_flush(struct tty_struct *tty)
-{
-        unsigned long flags;
-        spin_lock_irqsave(&tty->buf.lock, flags);
-
-        /* If the data is being pushed to the tty layer then we can't
-           process it here. Instead set a flag and the flush_to_ldisc
-           path will process the flush request before it exits */
-        if (test_bit(TTY_FLUSHING, &tty->flags)) {
-                set_bit(TTY_FLUSHPENDING, &tty->flags);
-                spin_unlock_irqrestore(&tty->buf.lock, flags);
-                wait_event(tty->read_wait,
-                                test_bit(TTY_FLUSHPENDING, &tty->flags) == 0);
-                return;
-        } else
-                __tty_buffer_flush(tty);
-        spin_unlock_irqrestore(&tty->buf.lock, flags);
-}
-
-/**
- *      tty_buffer_find         -       find a free tty buffer
- *      @tty: tty owning the buffer
- *      @size: characters wanted
- *
- *      Locate an existing suitable tty buffer or if we are lacking one then
- *      allocate a new one. We round our buffers off in 256 character chunks
- *      to get better allocation behaviour.
- *
- *      Locking: Caller must hold tty->buf.lock
- */
-
-static struct tty_buffer *tty_buffer_find(struct tty_struct *tty, size_t size)
-{
-        struct tty_buffer **tbh = &tty->buf.free;
-        while ((*tbh) != NULL) {
-                struct tty_buffer *t = *tbh;
-                if (t->size >= size) {
-                        *tbh = t->next;
-                        t->next = NULL;
-                        t->used = 0;
-                        t->commit = 0;
-                        t->read = 0;
-                        tty->buf.memory_used += t->size;
-                        return t;
-                }
-                tbh = &((*tbh)->next);
-        }
-        /* Round the buffer size out */
-        size = (size + 0xFF) & ~0xFF;
-        return tty_buffer_alloc(tty, size);
-        /* Should possibly check if this fails for the largest buffer we
-           have queued and recycle that ? */
-}
-
-/**
- *      tty_buffer_request_room         -       grow tty buffer if needed
- *      @tty: tty structure
- *      @size: size desired
- *
- *      Make at least size bytes of linear space available for the tty
- *      buffer. If we fail return the size we managed to find.
- *
- *      Locking: Takes tty->buf.lock
- */
-int tty_buffer_request_room(struct tty_struct *tty, size_t size)
-{
-        struct tty_buffer *b, *n;
-        int left;
-        unsigned long flags;
-
-        spin_lock_irqsave(&tty->buf.lock, flags);
-
-        /* OPTIMISATION: We could keep a per tty "zero" sized buffer to
-           remove this conditional if its worth it. This would be invisible
-           to the callers */
-        if ((b = tty->buf.tail) != NULL)
-                left = b->size - b->used;
-        else
-                left = 0;
-
-        if (left < size) {
-                /* This is the slow path - looking for new buffers to use */
-                if ((n = tty_buffer_find(tty, size)) != NULL) {
-                        if (b != NULL) {
-                                b->next = n;
-                                b->commit = b->used;
-                        } else
-                                tty->buf.head = n;
-                        tty->buf.tail = n;
-                } else
-                        size = left;
-        }
-
-        spin_unlock_irqrestore(&tty->buf.lock, flags);
-        return size;
-}
-EXPORT_SYMBOL_GPL(tty_buffer_request_room);
-
-/**
- *      tty_insert_flip_string  -       Add characters to the tty buffer
- *      @tty: tty structure
- *      @chars: characters
- *      @size: size
- *
- *      Queue a series of bytes to the tty buffering. All the characters
- *      passed are marked as without error. Returns the number added.
- *
- *      Locking: Called functions may take tty->buf.lock
- */
-
-int tty_insert_flip_string(struct tty_struct *tty, const unsigned char *chars,
-                                size_t size)
-{
-        int copied = 0;
-        do {
-                int space = tty_buffer_request_room(tty, size - copied);
-                struct tty_buffer *tb = tty->buf.tail;
-                /* If there is no space then tb may be NULL */
-                if (unlikely(space == 0))
-                        break;
-                memcpy(tb->char_buf_ptr + tb->used, chars, space);
-                memset(tb->flag_buf_ptr + tb->used, TTY_NORMAL, space);
-                tb->used += space;
-                copied += space;
-                chars += space;
-                /* There is a small chance that we need to split the data over
-                   several buffers. If this is the case we must loop */
-        } while (unlikely(size > copied));
-        return copied;
-}
-EXPORT_SYMBOL(tty_insert_flip_string);
-
-/**
- *      tty_insert_flip_string_flags    -       Add characters to the tty buffer
- *      @tty: tty structure
- *      @chars: characters
- *      @flags: flag bytes
- *      @size: size
- *
- *      Queue a series of bytes to the tty buffering. For each character
- *      the flags array indicates the status of the character. Returns the
- *      number added.
- *
- *      Locking: Called functions may take tty->buf.lock
- */
-
-int tty_insert_flip_string_flags(struct tty_struct *tty,
-                const unsigned char *chars, const char *flags, size_t size)
-{
-        int copied = 0;
-        do {
-                int space = tty_buffer_request_room(tty, size - copied);
-                struct tty_buffer *tb = tty->buf.tail;
-                /* If there is no space then tb may be NULL */
-                if (unlikely(space == 0))
-                        break;
-                memcpy(tb->char_buf_ptr + tb->used, chars, space);
-                memcpy(tb->flag_buf_ptr + tb->used, flags, space);
-                tb->used += space;
-                copied += space;
-                chars += space;
-                flags += space;
-                /* There is a small chance that we need to split the data over
-                   several buffers. If this is the case we must loop */
-        } while (unlikely(size > copied));
-        return copied;
-}
-EXPORT_SYMBOL(tty_insert_flip_string_flags);
-
-/**
- *      tty_schedule_flip       -       push characters to ldisc
- *      @tty: tty to push from
- *
- *      Takes any pending buffers and transfers their ownership to the
- *      ldisc side of the queue. It then schedules those characters for
- *      processing by the line discipline.
- *
- *      Locking: Takes tty->buf.lock
- */
-
-void tty_schedule_flip(struct tty_struct *tty)
-{
-        unsigned long flags;
-        spin_lock_irqsave(&tty->buf.lock, flags);
-        if (tty->buf.tail != NULL)
-                tty->buf.tail->commit = tty->buf.tail->used;
-        spin_unlock_irqrestore(&tty->buf.lock, flags);
-        schedule_delayed_work(&tty->buf.work, 1);
-}
-EXPORT_SYMBOL(tty_schedule_flip);
-
-/**
- *      tty_prepare_flip_string         -       make room for characters
- *      @tty: tty
- *      @chars: return pointer for character write area
- *      @size: desired size
- *
- *      Prepare a block of space in the buffer for data. Returns the length
- *      available and buffer pointer to the space which is now allocated and
- *      accounted for as ready for normal characters. This is used for drivers
- *      that need their own block copy routines into the buffer. There is no
- *      guarantee the buffer is a DMA target!
- *
- *      Locking: May call functions taking tty->buf.lock
- */
-
-int tty_prepare_flip_string(struct tty_struct *tty, unsigned char **chars,
-                                                                size_t size)
-{
-        int space = tty_buffer_request_room(tty, size);
-        if (likely(space)) {
-                struct tty_buffer *tb = tty->buf.tail;
-                *chars = tb->char_buf_ptr + tb->used;
-                memset(tb->flag_buf_ptr + tb->used, TTY_NORMAL, space);
-                tb->used += space;
-        }
-        return space;
-}
-
-EXPORT_SYMBOL_GPL(tty_prepare_flip_string);
-
-/**
- *      tty_prepare_flip_string_flags   -       make room for characters
- *      @tty: tty
- *      @chars: return pointer for character write area
- *      @flags: return pointer for status flag write area
- *      @size: desired size
- *
- *      Prepare a block of space in the buffer for data. Returns the length
- *      available and buffer pointer to the space which is now allocated and
- *      accounted for as ready for characters. This is used for drivers
- *      that need their own block copy routines into the buffer. There is no
- *      guarantee the buffer is a DMA target!
- *
- *      Locking: May call functions taking tty->buf.lock
- */
-
-int tty_prepare_flip_string_flags(struct tty_struct *tty,
-                        unsigned char **chars, char **flags, size_t size)
-{
-        int space = tty_buffer_request_room(tty, size);
-        if (likely(space)) {
-                struct tty_buffer *tb = tty->buf.tail;
-                *chars = tb->char_buf_ptr + tb->used;
-                *flags = tb->flag_buf_ptr + tb->used;
-                tb->used += space;
-        }
-        return space;
-}
-
-EXPORT_SYMBOL_GPL(tty_prepare_flip_string_flags);
-
-
-
 /**
  *      get_tty_driver          -       find device of a tty
  *      @dev_t: device identifier
@@ -675,7 +274,7 @@ static struct tty_driver *get_tty_driver(dev_t device, int *index)
                 if (device < base || device >= base + p->num)
                         continue;
                 *index = device - base;
-                return p;
+                return tty_driver_kref_get(p);
         }
         return NULL;
 }
@@ -719,7 +318,7 @@ struct tty_driver *tty_find_polling_driver(char *name, int *line)
 
                 if (tty_line >= 0 && tty_line <= p->num && p->ops &&
                     p->ops->poll_init && !p->ops->poll_init(p, tty_line, str)) {
-                        res = p;
+                        res = tty_driver_kref_get(p);
                         *line = tty_line;
                         break;
                 }
@@ -819,20 +418,6 @@ static const struct file_operations tty_fops = {
         .fasync         = tty_fasync,
 };
 
-#ifdef CONFIG_UNIX98_PTYS
-static const struct file_operations ptmx_fops = {
-        .llseek         = no_llseek,
-        .read           = tty_read,
-        .write          = tty_write,
-        .poll           = tty_poll,
-        .unlocked_ioctl = tty_ioctl,
-        .compat_ioctl   = tty_compat_ioctl,
-        .open           = ptmx_open,
-        .release        = tty_release,
-        .fasync         = tty_fasync,
-};
-#endif
-
 static const struct file_operations console_fops = {
         .llseek         = no_llseek,
         .read           = tty_read,
@@ -953,6 +538,7 @@ static void do_tty_hangup(struct work_struct *work)
         struct tty_ldisc *ld;
         int    closecount = 0, n;
         unsigned long flags;
+        int refs = 0;
 
         if (!tty)
                 return;
@@ -1019,8 +605,12 @@ static void do_tty_hangup(struct work_struct *work)
         if (tty->session) {
                 do_each_pid_task(tty->session, PIDTYPE_SID, p) {
                         spin_lock_irq(&p->sighand->siglock);
-                        if (p->signal->tty == tty)
+                        if (p->signal->tty == tty) {
                                 p->signal->tty = NULL;
+                                /* We defer the dereferences outside fo
+                                   the tasklist lock */
+                                refs++;
+                        }
                         if (!p->signal->leader) {
                                 spin_unlock_irq(&p->sighand->siglock);
                                 continue;
@@ -1046,6 +636,10 @@ static void do_tty_hangup(struct work_struct *work)
         tty->ctrl_status = 0;
         spin_unlock_irqrestore(&tty->ctrl_lock, flags);
 
+        /* Account for the p->signal references we killed */
+        while (refs--)
+                tty_kref_put(tty);
+
         /*
          * If one of the devices matches a console pointer, we
          * cannot just call hangup() because that will cause
@@ -1115,6 +709,23 @@ void tty_vhangup(struct tty_struct *tty)
 EXPORT_SYMBOL(tty_vhangup);
 
 /**
+ *      tty_vhangup_self        -       process vhangup for own ctty
+ *
+ *      Perform a vhangup on the current controlling tty
+ */
+
+void tty_vhangup_self(void)
+{
+        struct tty_struct *tty;
+
+        tty = get_current_tty();
+        if (tty) {
+                tty_vhangup(tty);
+                tty_kref_put(tty);
+        }
+}
+
+/**
  *      tty_hung_up_p           -       was tty hung up
  *      @filp: file pointer of tty
  *
@@ -1167,16 +778,14 @@ void disassociate_ctty(int on_exit)
         struct pid *tty_pgrp = NULL;
 
 
-        mutex_lock(&tty_mutex);
         tty = get_current_tty();
         if (tty) {
                 tty_pgrp = get_pid(tty->pgrp);
                 lock_kernel();
-                mutex_unlock(&tty_mutex);
-                /* XXX: here we race, there is nothing protecting tty */
                 if (on_exit && tty->driver->type != TTY_DRIVER_TYPE_PTY)
                         tty_vhangup(tty);
                 unlock_kernel();
+                tty_kref_put(tty);
         } else if (on_exit) {
                 struct pid *old_pgrp;
                 spin_lock_irq(&current->sighand->siglock);
@@ -1188,7 +797,6 @@ void disassociate_ctty(int on_exit)
                         kill_pgrp(old_pgrp, SIGCONT, on_exit);
                         put_pid(old_pgrp);
                 }
-                mutex_unlock(&tty_mutex);
                 return;
         }
         if (tty_pgrp) {
@@ -1203,8 +811,6 @@ void disassociate_ctty(int on_exit)
         current->signal->tty_old_pgrp = NULL;
         spin_unlock_irq(&current->sighand->siglock);
 
-        mutex_lock(&tty_mutex);
-        /* It is possible that do_tty_hangup has free'd this tty */
         tty = get_current_tty();
         if (tty) {
                 unsigned long flags;
@@ -1214,13 +820,13 @@ void disassociate_ctty(int on_exit)
                 tty->session = NULL;
                 tty->pgrp = NULL;
                 spin_unlock_irqrestore(&tty->ctrl_lock, flags);
+                tty_kref_put(tty);
         } else {
 #ifdef TTY_DEBUG_HANGUP
                 printk(KERN_DEBUG "error attempted to write to tty [0x%p]"
                        " = NULL", tty);
 #endif
         }
-        mutex_unlock(&tty_mutex);
 
         /* Now clear signal->tty under the lock */
         read_lock(&tasklist_lock);
@@ -1420,19 +1026,19 @@ static inline ssize_t do_tty_write(
 
         /* write_buf/write_cnt is protected by the atomic_write_lock mutex */
         if (tty->write_cnt < chunk) {
-                unsigned char *buf;
+                unsigned char *buf_chunk;
 
                 if (chunk < 1024)
                         chunk = 1024;
 
-                buf = kmalloc(chunk, GFP_KERNEL);
-                if (!buf) {
+                buf_chunk = kmalloc(chunk, GFP_KERNEL);
+                if (!buf_chunk) {
                         ret = -ENOMEM;
                         goto out;
                 }
                 kfree(tty->write_buf);
                 tty->write_cnt = chunk;
-                tty->write_buf = buf;
+                tty->write_buf = buf_chunk;
         }
 
         /* Do the write .. */
@@ -1466,6 +1072,31 @@ out:
         return ret;
 }
 
+/**
+ * tty_write_message - write a message to a certain tty, not just the console.
+ * @tty: the destination tty_struct
+ * @msg: the message to write
+ *
+ * This is used for messages that need to be redirected to a specific tty.
+ * We don't put it into the syslog queue right now maybe in the future if
+ * really needed.
+ *
+ * We must still hold the BKL and test the CLOSING flag for the moment.
+ */
+
+void tty_write_message(struct tty_struct *tty, char *msg)
+{
+        lock_kernel();
+        if (tty) {
+                mutex_lock(&tty->atomic_write_lock);
+                if (tty->ops->write && !test_bit(TTY_CLOSING, &tty->flags))
+                        tty->ops->write(tty, msg, strlen(msg));
+                tty_write_unlock(tty);
+        }
+        unlock_kernel();
+        return;
+}
+
 
 /**
  *      tty_write               -       write method for tty device file
@@ -1533,42 +1164,6 @@ ssize_t redirected_tty_write(struct file *file, const char __user *buf,
         return tty_write(file, buf, count, ppos);
 }
 
-void tty_port_init(struct tty_port *port)
-{
-        memset(port, 0, sizeof(*port));
-        init_waitqueue_head(&port->open_wait);
-        init_waitqueue_head(&port->close_wait);
-        mutex_init(&port->mutex);
-        port->close_delay = (50 * HZ) / 100;
-        port->closing_wait = (3000 * HZ) / 100;
-}
-EXPORT_SYMBOL(tty_port_init);
-
-int tty_port_alloc_xmit_buf(struct tty_port *port)
-{
-        /* We may sleep in get_zeroed_page() */
-        mutex_lock(&port->mutex);
-        if (port->xmit_buf == NULL)
-                port->xmit_buf = (unsigned char *)get_zeroed_page(GFP_KERNEL);
-        mutex_unlock(&port->mutex);
-        if (port->xmit_buf == NULL)
-                return -ENOMEM;
-        return 0;
-}
-EXPORT_SYMBOL(tty_port_alloc_xmit_buf);
-
-void tty_port_free_xmit_buf(struct tty_port *port)
-{
-        mutex_lock(&port->mutex);
-        if (port->xmit_buf != NULL) {
-                free_page((unsigned long)port->xmit_buf);
-                port->xmit_buf = NULL;
-        }
-        mutex_unlock(&port->mutex);
-}
-EXPORT_SYMBOL(tty_port_free_xmit_buf);
-
-
 static char ptychar[] = "pqrstuvwxyzabcde";
 
 /**
@@ -1592,7 +1187,7 @@ static void pty_line_name(struct tty_driver *driver, int index, char *p)
 }
 
 /**
- *      pty_line_name   -       generate name for a tty
+ *      tty_line_name   -       generate name for a tty
  *      @driver: the tty driver in use
  *      @index: the minor number
  *      @p: output buffer of at least 7 bytes
@@ -1608,10 +1203,148 @@ static void tty_line_name(struct tty_driver *driver, int index, char *p)
 }
 
 /**
- *      init_dev                -       initialise a tty device
+ *      tty_driver_lookup_tty() - find an existing tty, if any
+ *      @driver: the driver for the tty
+ *      @idx:    the minor number
+ *
+ *      Return the tty, if found or ERR_PTR() otherwise.
+ *
+ *      Locking: tty_mutex must be held. If tty is found, the mutex must
+ *      be held until the 'fast-open' is also done. Will change once we
+ *      have refcounting in the driver and per driver locking
+ */
+struct tty_struct *tty_driver_lookup_tty(struct tty_driver *driver,
+                struct inode *inode, int idx)
+{
+        struct tty_struct *tty;
+
+        if (driver->ops->lookup)
+                return driver->ops->lookup(driver, inode, idx);
+
+        tty = driver->ttys[idx];
+        return tty;
+}
+
+/**
+ *      tty_init_termios        -  helper for termios setup
+ *      @tty: the tty to set up
+ *
+ *      Initialise the termios structures for this tty. Thus runs under
+ *      the tty_mutex currently so we can be relaxed about ordering.
+ */
+
+int tty_init_termios(struct tty_struct *tty)
+{
+        struct ktermios *tp;
+        int idx = tty->index;
+
+        tp = tty->driver->termios[idx];
+        if (tp == NULL) {
+                tp = kzalloc(sizeof(struct ktermios[2]), GFP_KERNEL);
+                if (tp == NULL)
+                        return -ENOMEM;
+                memcpy(tp, &tty->driver->init_termios,
+                                                sizeof(struct ktermios));
+                tty->driver->termios[idx] = tp;
+        }
+        tty->termios = tp;
+        tty->termios_locked = tp + 1;
+
+        /* Compatibility until drivers always set this */
+        tty->termios->c_ispeed = tty_termios_input_baud_rate(tty->termios);
+        tty->termios->c_ospeed = tty_termios_baud_rate(tty->termios);
+        return 0;
+}
+
+/**
+ *      tty_driver_install_tty() - install a tty entry in the driver
+ *      @driver: the driver for the tty
+ *      @tty: the tty
+ *
+ *      Install a tty object into the driver tables. The tty->index field
+ *      will be set by the time this is called. This method is responsible
+ *      for ensuring any need additional structures are allocated and
+ *      configured.
+ *
+ *      Locking: tty_mutex for now
+ */
+static int tty_driver_install_tty(struct tty_driver *driver,
+                                                struct tty_struct *tty)
+{
+        int idx = tty->index;
+
+        if (driver->ops->install)
+                return driver->ops->install(driver, tty);
+
+        if (tty_init_termios(tty) == 0) {
+                tty_driver_kref_get(driver);
+                tty->count++;
+                driver->ttys[idx] = tty;
+                return 0;
+        }
+        return -ENOMEM;
+}
+
+/**
+ *      tty_driver_remove_tty() - remove a tty from the driver tables
+ *      @driver: the driver for the tty
+ *      @idx:    the minor number
+ *
+ *      Remvoe a tty object from the driver tables. The tty->index field
+ *      will be set by the time this is called.
+ *
+ *      Locking: tty_mutex for now
+ */
+static void tty_driver_remove_tty(struct tty_driver *driver,
+                                                struct tty_struct *tty)
+{
+        if (driver->ops->remove)
+                driver->ops->remove(driver, tty);
+        else
+                driver->ttys[tty->index] = NULL;
+}
+
+/*
+ *      tty_reopen()    - fast re-open of an open tty
+ *      @tty    - the tty to open
+ *
+ *      Return 0 on success, -errno on error.
+ *
+ *      Locking: tty_mutex must be held from the time the tty was found
+ *               till this open completes.
+ */
+static int tty_reopen(struct tty_struct *tty)
+{
+        struct tty_driver *driver = tty->driver;
+
+        if (test_bit(TTY_CLOSING, &tty->flags))
+                return -EIO;
+
+        if (driver->type == TTY_DRIVER_TYPE_PTY &&
+            driver->subtype == PTY_TYPE_MASTER) {
+                /*
+                 * special case for PTY masters: only one open permitted,
+                 * and the slave side open count is incremented as well.
+                 */
+                if (tty->count)
+                        return -EIO;
+
+                tty->link->count++;
+        }
+        tty->count++;
+        tty->driver = driver; /* N.B. why do this every time?? */
+
+        WARN_ON(!test_bit(TTY_LDISC, &tty->flags));
+
+        return 0;
+}
+
+/**
+ *      tty_init_dev            -       initialise a tty device
  *      @driver: tty driver we are opening a device on
  *      @idx: device index
- *      @tty: returned tty structure
+ *      @ret_tty: returned tty structure
+ *      @first_ok: ok to open a new device (used by ptmx)
  *
  *      Prepare a tty device. This may not be a "new" clean device but
  *      could also be an active device. The pty drivers require special
@@ -1631,37 +1364,16 @@ static void tty_line_name(struct tty_driver *driver, int index, char *p)
  * relaxed for the (most common) case of reopening a tty.
  */
 
-static int init_dev(struct tty_driver *driver, int idx,
-        struct tty_struct **ret_tty)
+struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx,
+                                                                int first_ok)
 {
-        struct tty_struct *tty, *o_tty;
-        struct ktermios *tp, **tp_loc, *o_tp, **o_tp_loc;
-        struct ktermios *ltp, **ltp_loc, *o_ltp, **o_ltp_loc;
-        int retval = 0;
+        struct tty_struct *tty;
+        int retval;
 
-        /* check whether we're reopening an existing tty */
-        if (driver->flags & TTY_DRIVER_DEVPTS_MEM) {
-                tty = devpts_get_tty(idx);
-                /*
-                 * If we don't have a tty here on a slave open, it's because
-                 * the master already started the close process and there's
-                 * no relation between devpts file and tty anymore.
-                 */
-                if (!tty && driver->subtype == PTY_TYPE_SLAVE) {
-                        retval = -EIO;
-                        goto end_init;
-                }
-                /*
-                 * It's safe from now on because init_dev() is called with
-                 * tty_mutex held and release_dev() won't change tty->count
-                 * or tty->flags without having to grab tty_mutex
-                 */
-                if (tty && driver->subtype == PTY_TYPE_MASTER)
-                        tty = tty->link;
-        } else {
-                tty = driver->ttys[idx];
-        }
-        if (tty) goto fast_track;
+        /* Check if pty master is being opened multiple times */
+        if (driver->subtype == PTY_TYPE_MASTER &&
+                (driver->flags & TTY_DRIVER_DEVPTS_MEM) && !first_ok)
+                return ERR_PTR(-EIO);
 
         /*
          * First time open is complex, especially for PTY devices.
@@ -1671,189 +1383,69 @@ static int init_dev(struct tty_driver *driver, int idx,
          * and locked termios may be retained.)
          */
 
-        if (!try_module_get(driver->owner)) {
-                retval = -ENODEV;
-                goto end_init;
-        }
-
-        o_tty = NULL;
-        tp = o_tp = NULL;
-        ltp = o_ltp = NULL;
+        if (!try_module_get(driver->owner))
+                return ERR_PTR(-ENODEV);
 
         tty = alloc_tty_struct();
         if (!tty)
                 goto fail_no_mem;
-        initialize_tty_struct(tty);
-        tty->driver = driver;
-        tty->ops = driver->ops;
-        tty->index = idx;
-        tty_line_name(driver, idx, tty->name);
-
-        if (driver->flags & TTY_DRIVER_DEVPTS_MEM) {
-                tp_loc = &tty->termios;
-                ltp_loc = &tty->termios_locked;
-        } else {
-                tp_loc = &driver->termios[idx];
-                ltp_loc = &driver->termios_locked[idx];
-        }
-
-        if (!*tp_loc) {
-                tp = kmalloc(sizeof(struct ktermios), GFP_KERNEL);
-                if (!tp)
-                        goto free_mem_out;
-                *tp = driver->init_termios;
-        }
-
-        if (!*ltp_loc) {
-                ltp = kzalloc(sizeof(struct ktermios), GFP_KERNEL);
-                if (!ltp)
-                        goto free_mem_out;
-        }
-
-        if (driver->type == TTY_DRIVER_TYPE_PTY) {
-                o_tty = alloc_tty_struct();
-                if (!o_tty)
-                        goto free_mem_out;
-                initialize_tty_struct(o_tty);
-                o_tty->driver = driver->other;
-                o_tty->ops = driver->ops;
-                o_tty->index = idx;
-                tty_line_name(driver->other, idx, o_tty->name);
-
-                if (driver->flags & TTY_DRIVER_DEVPTS_MEM) {
-                        o_tp_loc = &o_tty->termios;
-                        o_ltp_loc = &o_tty->termios_locked;
-                } else {
-                        o_tp_loc = &driver->other->termios[idx];
-                        o_ltp_loc = &driver->other->termios_locked[idx];
-                }
+        initialize_tty_struct(tty, driver, idx);
 
-                if (!*o_tp_loc) {
-                        o_tp = kmalloc(sizeof(struct ktermios), GFP_KERNEL);
-                        if (!o_tp)
-                                goto free_mem_out;
-                        *o_tp = driver->other->init_termios;
-                }
-
-                if (!*o_ltp_loc) {
-                        o_ltp = kzalloc(sizeof(struct ktermios), GFP_KERNEL);
-                        if (!o_ltp)
-                                goto free_mem_out;
-                }
-
-                /*
-                 * Everything allocated ... set up the o_tty structure.
-                 */
-                if (!(driver->other->flags & TTY_DRIVER_DEVPTS_MEM))
-                        driver->other->ttys[idx] = o_tty;
-                if (!*o_tp_loc)
-                        *o_tp_loc = o_tp;
-                if (!*o_ltp_loc)
-                        *o_ltp_loc = o_ltp;
-                o_tty->termios = *o_tp_loc;
-                o_tty->termios_locked = *o_ltp_loc;
-                driver->other->refcount++;
-                if (driver->subtype == PTY_TYPE_MASTER)
-                        o_tty->count++;
-
-                /* Establish the links in both directions */
-                tty->link   = o_tty;
-                o_tty->link = tty;
+        retval = tty_driver_install_tty(driver, tty);
+        if (retval < 0) {
+                free_tty_struct(tty);
+                module_put(driver->owner);
+                return ERR_PTR(retval);
         }
 
         /*
-         * All structures have been allocated, so now we install them.
-         * Failures after this point use release_tty to clean up, so
-         * there's no need to null out the local pointers.
-         */
-        if (!(driver->flags & TTY_DRIVER_DEVPTS_MEM))
-                driver->ttys[idx] = tty;
-
-        if (!*tp_loc)
-                *tp_loc = tp;
-        if (!*ltp_loc)
-                *ltp_loc = ltp;
-        tty->termios = *tp_loc;
-        tty->termios_locked = *ltp_loc;
-        /* Compatibility until drivers always set this */
-        tty->termios->c_ispeed = tty_termios_input_baud_rate(tty->termios);
-        tty->termios->c_ospeed = tty_termios_baud_rate(tty->termios);
-        driver->refcount++;
-        tty->count++;
-
-        /*
          * Structures all installed ... call the ldisc open routines.
          * If we fail here just call release_tty to clean up.  No need
          * to decrement the use counts, as release_tty doesn't care.
          */
 
-        retval = tty_ldisc_setup(tty, o_tty);
-
+        retval = tty_ldisc_setup(tty, tty->link);
         if (retval)
                 goto release_mem_out;
-         goto success;
-
-        /*
-         * This fast open can be used if the tty is already open.
-         * No memory is allocated, and the only failures are from
-         * attempting to open a closing tty or attempting multiple
-         * opens on a pty master.
-         */
-fast_track:
-        if (test_bit(TTY_CLOSING, &tty->flags)) {
-                retval = -EIO;
-                goto end_init;
-        }
-        if (driver->type == TTY_DRIVER_TYPE_PTY &&
-            driver->subtype == PTY_TYPE_MASTER) {
-                /*
-                 * special case for PTY masters: only one open permitted,
-                 * and the slave side open count is incremented as well.
-                 */
-                if (tty->count) {
-                        retval = -EIO;
-                        goto end_init;
-                }
-                tty->link->count++;
-        }
-        tty->count++;
-        tty->driver = driver; /* N.B. why do this every time?? */
-
-        /* FIXME */
-        if (!test_bit(TTY_LDISC, &tty->flags))
-                printk(KERN_ERR "init_dev but no ldisc\n");
-success:
-        *ret_tty = tty;
-
-        /* All paths come through here to release the mutex */
-end_init:
-        return retval;
-
-        /* Release locally allocated memory ... nothing placed in slots */
-free_mem_out:
-        kfree(o_tp);
-        if (o_tty)
-                free_tty_struct(o_tty);
-        kfree(ltp);
-        kfree(tp);
-        free_tty_struct(tty);
+        return tty;
 
 fail_no_mem:
         module_put(driver->owner);
-        retval = -ENOMEM;
-        goto end_init;
+        return ERR_PTR(-ENOMEM);
 
         /* call the tty release_tty routine to clean out this slot */
 release_mem_out:
         if (printk_ratelimit())
-                printk(KERN_INFO "init_dev: ldisc open failed, "
+                printk(KERN_INFO "tty_init_dev: ldisc open failed, "
                                  "clearing slot %d\n", idx);
         release_tty(tty, idx);
-        goto end_init;
+        return ERR_PTR(retval);
 }
 
+void tty_free_termios(struct tty_struct *tty)
+{
+        struct ktermios *tp;
+        int idx = tty->index;
+        /* Kill this flag and push into drivers for locking etc */
+        if (tty->driver->flags & TTY_DRIVER_RESET_TERMIOS) {
+                /* FIXME: Locking on ->termios array */
+                tp = tty->termios;
+                tty->driver->termios[idx] = NULL;
+                kfree(tp);
+        }
+}
+EXPORT_SYMBOL(tty_free_termios);
+
+void tty_shutdown(struct tty_struct *tty)
+{
+        tty_driver_remove_tty(tty->driver, tty);
+        tty_free_termios(tty);
+}
+EXPORT_SYMBOL(tty_shutdown);
+
 /**
  *      release_one_tty         -       release tty structure memory
+ *      @kref: kref of tty we are obliterating
  *
  *      Releases memory associated with a tty structure, and clears out the
  *      driver table slots. This function is called when a device is no longer
@@ -1863,31 +1455,19 @@ release_mem_out:
  *              tty_mutex - sometimes only
  *              takes the file list lock internally when working on the list
  *      of ttys that the driver keeps.
- *              FIXME: should we require tty_mutex is held here ??
  */
-static void release_one_tty(struct tty_struct *tty, int idx)
+static void release_one_tty(struct kref *kref)
 {
-        int devpts = tty->driver->flags & TTY_DRIVER_DEVPTS_MEM;
-        struct ktermios *tp;
-
-        if (!devpts)
-                tty->driver->ttys[idx] = NULL;
-
-        if (tty->driver->flags & TTY_DRIVER_RESET_TERMIOS) {
-                tp = tty->termios;
-                if (!devpts)
-                        tty->driver->termios[idx] = NULL;
-                kfree(tp);
-
-                tp = tty->termios_locked;
-                if (!devpts)
-                        tty->driver->termios_locked[idx] = NULL;
-                kfree(tp);
-        }
-
+        struct tty_struct *tty = container_of(kref, struct tty_struct, kref);
+        struct tty_driver *driver = tty->driver;
 
+        if (tty->ops->shutdown)
+                tty->ops->shutdown(tty);
+        else
+                tty_shutdown(tty);
         tty->magic = 0;
-        tty->driver->refcount--;
+        tty_driver_kref_put(driver);
+        module_put(driver->owner);
 
         file_list_lock();
         list_del_init(&tty->tty_files);
@@ -1897,6 +1477,21 @@ static void release_one_tty(struct tty_struct *tty, int idx)
 }
 
 /**
+ *      tty_kref_put            -       release a tty kref
+ *      @tty: tty device
+ *
+ *      Release a reference to a tty device and if need be let the kref
+ *      layer destruct the object for us
+ */
+
+void tty_kref_put(struct tty_struct *tty)
+{
+        if (tty)
+                kref_put(&tty->kref, release_one_tty);
+}
+EXPORT_SYMBOL(tty_kref_put);
+
+/**
  *      release_tty             -       release tty structure memory
  *
  *      Release both @tty and a possible linked partner (think pty pair),
@@ -1907,15 +1502,16 @@ static void release_one_tty(struct tty_struct *tty, int idx)
  *              takes the file list lock internally when working on the list
  *      of ttys that the driver keeps.
  *              FIXME: should we require tty_mutex is held here ??
+ *
  */
 static void release_tty(struct tty_struct *tty, int idx)
 {
-        struct tty_driver *driver = tty->driver;
+        /* This should always be true but check for the moment */
+        WARN_ON(tty->index != idx);
 
         if (tty->link)
-                release_one_tty(tty->link, idx);
-        release_one_tty(tty, idx);
-        module_put(driver->owner);
+                tty_kref_put(tty->link);
+        tty_kref_put(tty);
 }
 
 /*
@@ -1926,20 +1522,21 @@ static void release_tty(struct tty_struct *tty, int idx)
  * WSH 09/09/97: rewritten to avoid some nasty race conditions that could
  * lead to double frees or releasing memory still in use.
  */
-static void release_dev(struct file *filp)
+void tty_release_dev(struct file *filp)
 {
         struct tty_struct *tty, *o_tty;
         int     pty_master, tty_closing, o_tty_closing, do_sleep;
         int     devpts;
         int     idx;
         char    buf[64];
+        struct  inode *inode;
 
+        inode = filp->f_path.dentry->d_inode;
         tty = (struct tty_struct *)filp->private_data;
-        if (tty_paranoia_check(tty, filp->f_path.dentry->d_inode,
-                                                        "release_dev"))
+        if (tty_paranoia_check(tty, inode, "tty_release_dev"))
                 return;
 
-        check_tty_count(tty, "release_dev");
+        check_tty_count(tty, "tty_release_dev");
 
         tty_fasync(-1, filp, 0);
 
@@ -1951,33 +1548,27 @@ static void release_dev(struct file *filp)
 
 #ifdef TTY_PARANOIA_CHECK
         if (idx < 0 || idx >= tty->driver->num) {
-                printk(KERN_DEBUG "release_dev: bad idx when trying to "
+                printk(KERN_DEBUG "tty_release_dev: bad idx when trying to "
                                   "free (%s)\n", tty->name);
                 return;
         }
-        if (!(tty->driver->flags & TTY_DRIVER_DEVPTS_MEM)) {
+        if (!devpts) {
                 if (tty != tty->driver->ttys[idx]) {
-                        printk(KERN_DEBUG "release_dev: driver.table[%d] not tty "
+                        printk(KERN_DEBUG "tty_release_dev: driver.table[%d] not tty "
                                "for (%s)\n", idx, tty->name);
                         return;
                 }
                 if (tty->termios != tty->driver->termios[idx]) {
-                        printk(KERN_DEBUG "release_dev: driver.termios[%d] not termios "
+                        printk(KERN_DEBUG "tty_release_dev: driver.termios[%d] not termios "
                                "for (%s)\n",
                                idx, tty->name);
                         return;
                 }
-                if (tty->termios_locked != tty->driver->termios_locked[idx]) {
-                        printk(KERN_DEBUG "release_dev: driver.termios_locked[%d] not "
-                               "termios_locked for (%s)\n",
-                               idx, tty->name);
-                        return;
-                }
         }
 #endif
 
 #ifdef TTY_DEBUG_HANGUP
-        printk(KERN_DEBUG "release_dev of %s (tty count=%d)...",
+        printk(KERN_DEBUG "tty_release_dev of %s (tty count=%d)...",
                tty_name(tty, buf), tty->count);
 #endif
 
@@ -1985,26 +1576,19 @@ static void release_dev(struct file *filp)
         if (tty->driver->other &&
              !(tty->driver->flags & TTY_DRIVER_DEVPTS_MEM)) {
                 if (o_tty != tty->driver->other->ttys[idx]) {
-                        printk(KERN_DEBUG "release_dev: other->table[%d] "
+                        printk(KERN_DEBUG "tty_release_dev: other->table[%d] "
                                           "not o_tty for (%s)\n",
                                idx, tty->name);
                         return;
                 }
                 if (o_tty->termios != tty->driver->other->termios[idx]) {
-                        printk(KERN_DEBUG "release_dev: other->termios[%d] "
+                        printk(KERN_DEBUG "tty_release_dev: other->termios[%d] "
                                           "not o_termios for (%s)\n",
                                idx, tty->name);
                         return;
                 }
-                if (o_tty->termios_locked !=
-                      tty->driver->other->termios_locked[idx]) {
-                        printk(KERN_DEBUG "release_dev: other->termios_locked["
-                                          "%d] not o_termios_locked for (%s)\n",
-                               idx, tty->name);
-                        return;
-                }
                 if (o_tty->link != tty) {
-                        printk(KERN_DEBUG "release_dev: bad pty pointers\n");
+                        printk(KERN_DEBUG "tty_release_dev: bad pty pointers\n");
                         return;
                 }
         }
@@ -2062,7 +1646,7 @@ static void release_dev(struct file *filp)
                 if (!do_sleep)
                         break;
 
-                printk(KERN_WARNING "release_dev: %s: read/write wait queue "
+                printk(KERN_WARNING "tty_release_dev: %s: read/write wait queue "
                                     "active!\n", tty_name(tty, buf));
                 mutex_unlock(&tty_mutex);
                 schedule();
@@ -2075,14 +1659,14 @@ static void release_dev(struct file *filp)
          */
         if (pty_master) {
                 if (--o_tty->count < 0) {
-                        printk(KERN_WARNING "release_dev: bad pty slave count "
+                        printk(KERN_WARNING "tty_release_dev: bad pty slave count "
                                             "(%d) for %s\n",
                                o_tty->count, tty_name(o_tty, buf));
                         o_tty->count = 0;
                 }
         }
         if (--tty->count < 0) {
-                printk(KERN_WARNING "release_dev: bad tty->count (%d) for %s\n",
+                printk(KERN_WARNING "tty_release_dev: bad tty->count (%d) for %s\n",
                        tty->count, tty_name(tty, buf));
                 tty->count = 0;
         }
@@ -2145,11 +1729,11 @@ static void release_dev(struct file *filp)
 
         /* Make this pty number available for reallocation */
         if (devpts)
-                devpts_kill_index(idx);
+                devpts_kill_index(inode, idx);
 }
 
 /**
- *      tty_open                -       open a tty device
+ *      __tty_open              -       open a tty device
  *      @inode: inode of device file
  *      @filp: file pointer to tty
  *
@@ -2164,14 +1748,14 @@ static void release_dev(struct file *filp)
  *      The termios state of a pty is reset on first open so that
  *      settings don't persist across reuse.
  *
- *      Locking: tty_mutex protects tty, get_tty_driver and init_dev work.
+ *      Locking: tty_mutex protects tty, get_tty_driver and tty_init_dev work.
  *               tty->count should protect the rest.
  *               ->siglock protects ->signal/->sighand
  */
 
 static int __tty_open(struct inode *inode, struct file *filp)
 {
-        struct tty_struct *tty;
+        struct tty_struct *tty = NULL;
         int noctty, retval;
         struct tty_driver *driver;
         int index;
@@ -2193,23 +1777,25 @@ retry_open:
                         mutex_unlock(&tty_mutex);
                         return -ENXIO;
                 }
-                driver = tty->driver;
+                driver = tty_driver_kref_get(tty->driver);
                 index = tty->index;
                 filp->f_flags |= O_NONBLOCK; /* Don't let /dev/tty block */
                 /* noctty = 1; */
+                /* FIXME: Should we take a driver reference ? */
+                tty_kref_put(tty);
                 goto got_driver;
         }
 #ifdef CONFIG_VT
         if (device == MKDEV(TTY_MAJOR, 0)) {
                 extern struct tty_driver *console_driver;
-                driver = console_driver;
+                driver = tty_driver_kref_get(console_driver);
                 index = fg_console;
                 noctty = 1;
                 goto got_driver;
         }
 #endif
         if (device == MKDEV(TTYAUX_MAJOR, 1)) {
-                driver = console_device(&index);
+                driver = tty_driver_kref_get(console_device(&index));
                 if (driver) {
                         /* Don't let /dev/console block */
                         filp->f_flags |= O_NONBLOCK;
@@ -2226,10 +1812,25 @@ retry_open:
                 return -ENODEV;
         }
 got_driver:
-        retval = init_dev(driver, index, &tty);
+        if (!tty) {
+                /* check whether we're reopening an existing tty */
+                tty = tty_driver_lookup_tty(driver, inode, index);
+
+                if (IS_ERR(tty))
+                        return PTR_ERR(tty);
+        }
+
+        if (tty) {
+                retval = tty_reopen(tty);
+                if (retval)
+                        tty = ERR_PTR(retval);
+        } else
+                tty = tty_init_dev(driver, index, 0);
+
         mutex_unlock(&tty_mutex);
-        if (retval)
-                return retval;
+        tty_driver_kref_put(driver);
+        if (IS_ERR(tty))
+                return PTR_ERR(tty);
 
         filp->private_data = tty;
         file_move(filp, &tty->tty_files);
@@ -2257,7 +1858,7 @@ got_driver:
                 printk(KERN_DEBUG "error %d in opening %s...", retval,
                        tty->name);
 #endif
-                release_dev(filp);
+                tty_release_dev(filp);
                 if (retval != -ERESTARTSYS)
                         return retval;
                 if (signal_pending(current))
@@ -2296,69 +1897,6 @@ static int tty_open(struct inode *inode, struct file *filp)
 
 
 
-#ifdef CONFIG_UNIX98_PTYS
-/**
- *      ptmx_open               -       open a unix 98 pty master
- *      @inode: inode of device file
- *      @filp: file pointer to tty
- *
- *      Allocate a unix98 pty master device from the ptmx driver.
- *
- *      Locking: tty_mutex protects theinit_dev work. tty->count should
- *              protect the rest.
- *              allocated_ptys_lock handles the list of free pty numbers
- */
-
-static int __ptmx_open(struct inode *inode, struct file *filp)
-{
-        struct tty_struct *tty;
-        int retval;
-        int index;
-
-        nonseekable_open(inode, filp);
-
-        /* find a device that is not in use. */
-        index = devpts_new_index();
-        if (index < 0)
-                return index;
-
-        mutex_lock(&tty_mutex);
-        retval = init_dev(ptm_driver, index, &tty);
-        mutex_unlock(&tty_mutex);
-
-        if (retval)
-                goto out;
-
-        set_bit(TTY_PTY_LOCK, &tty->flags); /* LOCK THE SLAVE */
-        filp->private_data = tty;
-        file_move(filp, &tty->tty_files);
-
-        retval = devpts_pty_new(tty->link);
-        if (retval)
-                goto out1;
-
-        check_tty_count(tty, "ptmx_open");
-        retval = ptm_driver->ops->open(tty, filp);
-        if (!retval)
-                return 0;
-out1:
-        release_dev(filp);
-        return retval;
-out:
-        devpts_kill_index(index);
-        return retval;
-}
-
-static int ptmx_open(struct inode *inode, struct file *filp)
-{
-        int ret;
-
-        lock_kernel();
-        ret = __ptmx_open(inode, filp);
-        unlock_kernel();
-        return ret;
-}
-#endif
 
 /**
  *      tty_release             -       vfs callback for close
@@ -2369,13 +1907,13 @@ static int ptmx_open(struct inode *inode, struct file *filp)
  *      this tty. There may however be several such references.
  *
  *      Locking:
- *              Takes bkl. See release_dev
+ *              Takes bkl. See tty_release_dev
  */
 
 static int tty_release(struct inode *inode, struct file *filp)
 {
         lock_kernel();
-        release_dev(filp);
+        tty_release_dev(filp);
         unlock_kernel();
         return 0;
 }
@@ -2524,7 +2062,7 @@ int tty_do_resize(struct tty_struct *tty, struct tty_struct *real_tty,
 
         /* For a PTY we need to lock the tty side */
         mutex_lock(&real_tty->termios_mutex);
-        if (!memcmp(ws, &tty->winsize, sizeof(*ws)))
+        if (!memcmp(ws, &real_tty->winsize, sizeof(*ws)))
                 goto done;
         /* Get the PID values and reference them so we can
            avoid holding the tty ctrl lock while sending signals */
@@ -2996,7 +2534,7 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         case TIOCSTI:
                 return tiocsti(tty, p);
         case TIOCGWINSZ:
-                return tiocgwinsz(tty, p);
+                return tiocgwinsz(real_tty, p);
         case TIOCSWINSZ:
                 return tiocswinsz(tty, real_tty, p);
         case TIOCCONS:
@@ -3026,10 +2564,6 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 return put_user(tty->ldisc.ops->num, (int __user *)p);
         case TIOCSETD:
                 return tiocsetd(tty, p);
-#ifdef CONFIG_VT
-        case TIOCLINUX:
-                return tioclinux(tty, arg);
-#endif
         /*
          * Break handling
          */
@@ -3220,113 +2754,6 @@ void do_SAK(struct tty_struct *tty)
 EXPORT_SYMBOL(do_SAK);
 
 /**
- *      flush_to_ldisc
- *      @work: tty structure passed from work queue.
- *
- *      This routine is called out of the software interrupt to flush data
- *      from the buffer chain to the line discipline.
- *
- *      Locking: holds tty->buf.lock to guard buffer list. Drops the lock
- *      while invoking the line discipline receive_buf method. The
- *      receive_buf method is single threaded for each tty instance.
- */
-
-static void flush_to_ldisc(struct work_struct *work)
-{
-        struct tty_struct *tty =
-                container_of(work, struct tty_struct, buf.work.work);
-        unsigned long   flags;
-        struct tty_ldisc *disc;
-        struct tty_buffer *tbuf, *head;
-        char *char_buf;
-        unsigned char *flag_buf;
-
-        disc = tty_ldisc_ref(tty);
-        if (disc == NULL)       /*  !TTY_LDISC */
-                return;
-
-        spin_lock_irqsave(&tty->buf.lock, flags);
-        /* So we know a flush is running */
-        set_bit(TTY_FLUSHING, &tty->flags);
-        head = tty->buf.head;
-        if (head != NULL) {
-                tty->buf.head = NULL;
-                for (;;) {
-                        int count = head->commit - head->read;
-                        if (!count) {
-                                if (head->next == NULL)
-                                        break;
-                                tbuf = head;
-                                head = head->next;
-                                tty_buffer_free(tty, tbuf);
-                                continue;
-                        }
-                        /* Ldisc or user is trying to flush the buffers
-                           we are feeding to the ldisc, stop feeding the
-                           line discipline as we want to empty the queue */
-                        if (test_bit(TTY_FLUSHPENDING, &tty->flags))
-                                break;
-                        if (!tty->receive_room) {
-                                schedule_delayed_work(&tty->buf.work, 1);
-                                break;
-                        }
-                        if (count > tty->receive_room)
-                                count = tty->receive_room;
-                        char_buf = head->char_buf_ptr + head->read;
-                        flag_buf = head->flag_buf_ptr + head->read;
-                        head->read += count;
-                        spin_unlock_irqrestore(&tty->buf.lock, flags);
-                        disc->ops->receive_buf(tty, char_buf,
-                                                        flag_buf, count);
-                        spin_lock_irqsave(&tty->buf.lock, flags);
-                }
-                /* Restore the queue head */
-                tty->buf.head = head;
-        }
-        /* We may have a deferred request to flush the input buffer,
-           if so pull the chain under the lock and empty the queue */
-        if (test_bit(TTY_FLUSHPENDING, &tty->flags)) {
-                __tty_buffer_flush(tty);
-                clear_bit(TTY_FLUSHPENDING, &tty->flags);
-                wake_up(&tty->read_wait);
-        }
-        clear_bit(TTY_FLUSHING, &tty->flags);
-        spin_unlock_irqrestore(&tty->buf.lock, flags);
-
-        tty_ldisc_deref(disc);
-}
-
-/**
- *      tty_flip_buffer_push    -       terminal
- *      @tty: tty to push
- *
- *      Queue a push of the terminal flip buffers to the line discipline. This
- *      function must not be called from IRQ context if tty->low_latency is set.
- *
- *      In the event of the queue being busy for flipping the work will be
- *      held off and retried later.
- *
- *      Locking: tty buffer lock. Driver locks in low latency mode.
- */
-
-void tty_flip_buffer_push(struct tty_struct *tty)
-{
-        unsigned long flags;
-        spin_lock_irqsave(&tty->buf.lock, flags);
-        if (tty->buf.tail != NULL)
-                tty->buf.tail->commit = tty->buf.tail->used;
-        spin_unlock_irqrestore(&tty->buf.lock, flags);
-
-        if (tty->low_latency)
-                flush_to_ldisc(&tty->buf.work.work);
-        else
-                schedule_delayed_work(&tty->buf.work, 1);
-}
-
-EXPORT_SYMBOL(tty_flip_buffer_push);
-
-
-/**
  *      initialize_tty_struct
  *      @tty: tty to initialize
  *
@@ -3336,9 +2763,11 @@ EXPORT_SYMBOL(tty_flip_buffer_push);
  *      Locking: none - tty in question must not be exposed at this point
  */
 
-static void initialize_tty_struct(struct tty_struct *tty)
+void initialize_tty_struct(struct tty_struct *tty,
+                struct tty_driver *driver, int idx)
 {
         memset(tty, 0, sizeof(struct tty_struct));
+        kref_init(&tty->kref);
         tty->magic = TTY_MAGIC;
         tty_ldisc_init(tty);
         tty->session = NULL;
@@ -3346,7 +2775,6 @@ static void initialize_tty_struct(struct tty_struct *tty)
         tty->overrun_time = jiffies;
         tty->buf.head = tty->buf.tail = NULL;
         tty_buffer_init(tty);
-        INIT_DELAYED_WORK(&tty->buf.work, flush_to_ldisc);
         mutex_init(&tty->termios_mutex);
         init_waitqueue_head(&tty->write_wait);
         init_waitqueue_head(&tty->read_wait);
@@ -3357,6 +2785,11 @@ static void initialize_tty_struct(struct tty_struct *tty)
         spin_lock_init(&tty->ctrl_lock);
         INIT_LIST_HEAD(&tty->tty_files);
         INIT_WORK(&tty->SAK_work, do_SAK_work);
+
+        tty->driver = driver;
+        tty->ops = driver->ops;
+        tty->index = idx;
+        tty_line_name(driver, idx, tty->name);
 }
 
 /**
@@ -3377,10 +2810,9 @@ int tty_put_char(struct tty_struct *tty, unsigned char ch)
                 return tty->ops->put_char(tty, ch);
         return tty->ops->write(tty, &ch, 1);
 }
-
 EXPORT_SYMBOL_GPL(tty_put_char);
 
-static struct class *tty_class;
+struct class *tty_class;
 
 /**
  *      tty_register_device - register a tty device
@@ -3418,8 +2850,9 @@ struct device *tty_register_device(struct tty_driver *driver, unsigned index,
         else
                 tty_line_name(driver, index, name);
 
-        return device_create_drvdata(tty_class, device, dev, NULL, name);
+        return device_create(tty_class, device, dev, NULL, name);
 }
+EXPORT_SYMBOL(tty_register_device);
 
 /**
  *      tty_unregister_device - unregister a tty device
@@ -3437,8 +2870,6 @@ void tty_unregister_device(struct tty_driver *driver, unsigned index)
         device_destroy(tty_class,
                 MKDEV(driver->major, driver->minor_start) + index);
 }
-
-EXPORT_SYMBOL(tty_register_device);
 EXPORT_SYMBOL(tty_unregister_device);
 
 struct tty_driver *alloc_tty_driver(int lines)
@@ -3447,27 +2878,65 @@ struct tty_driver *alloc_tty_driver(int lines)
 
         driver = kzalloc(sizeof(struct tty_driver), GFP_KERNEL);
         if (driver) {
+                kref_init(&driver->kref);
                 driver->magic = TTY_DRIVER_MAGIC;
                 driver->num = lines;
                 /* later we'll move allocation of tables here */
         }
         return driver;
 }
+EXPORT_SYMBOL(alloc_tty_driver);
 
-void put_tty_driver(struct tty_driver *driver)
+static void destruct_tty_driver(struct kref *kref)
 {
+        struct tty_driver *driver = container_of(kref, struct tty_driver, kref);
+        int i;
+        struct ktermios *tp;
+        void *p;
+
+        if (driver->flags & TTY_DRIVER_INSTALLED) {
+                /*
+                 * Free the termios and termios_locked structures because
+                 * we don't want to get memory leaks when modular tty
+                 * drivers are removed from the kernel.
+                 */
+                for (i = 0; i < driver->num; i++) {
+                        tp = driver->termios[i];
+                        if (tp) {
+                                driver->termios[i] = NULL;
+                                kfree(tp);
+                        }
+                        if (!(driver->flags & TTY_DRIVER_DYNAMIC_DEV))
+                                tty_unregister_device(driver, i);
+                }
+                p = driver->ttys;
+                proc_tty_unregister_driver(driver);
+                driver->ttys = NULL;
+                driver->termios = NULL;
+                kfree(p);
+                cdev_del(&driver->cdev);
+        }
         kfree(driver);
 }
 
+void tty_driver_kref_put(struct tty_driver *driver)
+{
+        kref_put(&driver->kref, destruct_tty_driver);
+}
+EXPORT_SYMBOL(tty_driver_kref_put);
+
 void tty_set_operations(struct tty_driver *driver,
                         const struct tty_operations *op)
 {
         driver->ops = op;
 };
+EXPORT_SYMBOL(tty_set_operations);
 
-EXPORT_SYMBOL(alloc_tty_driver);
+void put_tty_driver(struct tty_driver *d)
+{
+        tty_driver_kref_put(d);
+}
 EXPORT_SYMBOL(put_tty_driver);
-EXPORT_SYMBOL(tty_set_operations);
 
 /*
  * Called by a tty driver to register itself.
@@ -3479,11 +2948,8 @@ int tty_register_driver(struct tty_driver *driver)
         dev_t dev;
         void **p = NULL;
 
-        if (driver->flags & TTY_DRIVER_INSTALLED)
-                return 0;
-
         if (!(driver->flags & TTY_DRIVER_DEVPTS_MEM) && driver->num) {
-                p = kzalloc(driver->num * 3 * sizeof(void *), GFP_KERNEL);
+                p = kzalloc(driver->num * 2 * sizeof(void *), GFP_KERNEL);
                 if (!p)
                         return -ENOMEM;
         }
@@ -3507,12 +2973,9 @@ int tty_register_driver(struct tty_driver *driver)
         if (p) {
                 driver->ttys = (struct tty_struct **)p;
                 driver->termios = (struct ktermios **)(p + driver->num);
-                driver->termios_locked = (struct ktermios **)
-                                                        (p + driver->num * 2);
         } else {
                 driver->ttys = NULL;
                 driver->termios = NULL;
-                driver->termios_locked = NULL;
         }
 
         cdev_init(&driver->cdev, &tty_fops);
@@ -3521,7 +2984,7 @@ int tty_register_driver(struct tty_driver *driver)
         if (error) {
                 unregister_chrdev_region(dev, driver->num);
                 driver->ttys = NULL;
-                driver->termios = driver->termios_locked = NULL;
+                driver->termios = NULL;
                 kfree(p);
                 return error;
         }
@@ -3535,6 +2998,7 @@ int tty_register_driver(struct tty_driver *driver)
                     tty_register_device(driver, i, NULL);
         }
         proc_tty_register_driver(driver);
+        driver->flags |= TTY_DRIVER_INSTALLED;
         return 0;
 }
 
@@ -3545,46 +3009,19 @@ EXPORT_SYMBOL(tty_register_driver);
  */
 int tty_unregister_driver(struct tty_driver *driver)
 {
-        int i;
-        struct ktermios *tp;
-        void *p;
-
+#if 0
+        /* FIXME */
         if (driver->refcount)
                 return -EBUSY;
-
+#endif
         unregister_chrdev_region(MKDEV(driver->major, driver->minor_start),
                                 driver->num);
         mutex_lock(&tty_mutex);
         list_del(&driver->tty_drivers);
         mutex_unlock(&tty_mutex);
-
-        /*
-         * Free the termios and termios_locked structures because
-         * we don't want to get memory leaks when modular tty
-         * drivers are removed from the kernel.
-         */
-        for (i = 0; i < driver->num; i++) {
-                tp = driver->termios[i];
-                if (tp) {
-                        driver->termios[i] = NULL;
-                        kfree(tp);
-                }
-                tp = driver->termios_locked[i];
-                if (tp) {
-                        driver->termios_locked[i] = NULL;
-                        kfree(tp);
-                }
-                if (!(driver->flags & TTY_DRIVER_DYNAMIC_DEV))
-                        tty_unregister_device(driver, i);
-        }
-        p = driver->ttys;
-        proc_tty_unregister_driver(driver);
-        driver->ttys = NULL;
-        driver->termios = driver->termios_locked = NULL;
-        kfree(p);
-        cdev_del(&driver->cdev);
         return 0;
 }
+
 EXPORT_SYMBOL(tty_unregister_driver);
 
 dev_t tty_devnum(struct tty_struct *tty)
@@ -3595,9 +3032,13 @@ EXPORT_SYMBOL(tty_devnum);
 
 void proc_clear_tty(struct task_struct *p)
 {
-        spin_lock_irq(&p->sighand->siglock);
+        unsigned long flags;
+        struct tty_struct *tty;
+        spin_lock_irqsave(&p->sighand->siglock, flags);
+        tty = p->signal->tty;
         p->signal->tty = NULL;
-        spin_unlock_irq(&p->sighand->siglock);
+        spin_unlock_irqrestore(&p->sighand->siglock, flags);
+        tty_kref_put(tty);
 }
 
 /* Called under the sighand lock */
@@ -3613,9 +3054,13 @@ static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty)
                 tty->pgrp = get_pid(task_pgrp(tsk));
                 spin_unlock_irqrestore(&tty->ctrl_lock, flags);
                 tty->session = get_pid(task_session(tsk));
+                if (tsk->signal->tty) {
+                        printk(KERN_DEBUG "tty not NULL!!\n");
+                        tty_kref_put(tsk->signal->tty);
+                }
         }
         put_pid(tsk->signal->tty_old_pgrp);
-        tsk->signal->tty = tty;
+        tsk->signal->tty = tty_kref_get(tty);
         tsk->signal->tty_old_pgrp = NULL;
 }
 
@@ -3629,18 +3074,20 @@ static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty)
 struct tty_struct *get_current_tty(void)
 {
         struct tty_struct *tty;
-        WARN_ON_ONCE(!mutex_is_locked(&tty_mutex));
-        tty = current->signal->tty;
-        /*
-         * session->tty can be changed/cleared from under us, make sure we
-         * issue the load. The obtained pointer, when not NULL, is valid as
-         * long as we hold tty_mutex.
-         */
-        barrier();
+        unsigned long flags;
+
+        spin_lock_irqsave(&current->sighand->siglock, flags);
+        tty = tty_kref_get(current->signal->tty);
+        spin_unlock_irqrestore(&current->sighand->siglock, flags);
         return tty;
 }
 EXPORT_SYMBOL_GPL(get_current_tty);
 
+void tty_default_fops(struct file_operations *fops)
+{
+        *fops = tty_fops;
+}
+
 /*
  * Initialize the console device. This is called *early*, so
  * we can't necessarily depend on lots of kernel help here.
@@ -3678,12 +3125,6 @@ postcore_initcall(tty_class_init);
 /* 3/2004 jmc: why do these devices exist? */
 
 static struct cdev tty_cdev, console_cdev;
-#ifdef CONFIG_UNIX98_PTYS
-static struct cdev ptmx_cdev;
-#endif
-#ifdef CONFIG_VT
-static struct cdev vc0_cdev;
-#endif
 
 /*
  * Ok, now we can initialize the rest of the tty devices and can count
@@ -3695,32 +3136,18 @@ static int __init tty_init(void)
         if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) ||
             register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0)
                 panic("Couldn't register /dev/tty driver\n");
-        device_create_drvdata(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 0), NULL,
+        device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 0), NULL,
                               "tty");
 
         cdev_init(&console_cdev, &console_fops);
         if (cdev_add(&console_cdev, MKDEV(TTYAUX_MAJOR, 1), 1) ||
             register_chrdev_region(MKDEV(TTYAUX_MAJOR, 1), 1, "/dev/console") < 0)
                 panic("Couldn't register /dev/console driver\n");
-        device_create_drvdata(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 1), NULL,
+        device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 1), NULL,
                               "console");
 
-#ifdef CONFIG_UNIX98_PTYS
-        cdev_init(&ptmx_cdev, &ptmx_fops);
-        if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
-            register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
-                panic("Couldn't register /dev/ptmx driver\n");
-        device_create_drvdata(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 2), NULL, "ptmx");
-#endif
-
 #ifdef CONFIG_VT
-        cdev_init(&vc0_cdev, &console_fops);
-        if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) ||
-            register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0)
-                panic("Couldn't register /dev/tty0 driver\n");
-        device_create_drvdata(tty_class, NULL, MKDEV(TTY_MAJOR, 0), NULL, "tty0");
-
-        vty_init();
+        vty_init(&console_fops);
 #endif
         return 0;
 }
diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c
index bf34e4597421..a408c8e487ec 100644
--- a/drivers/char/tty_ioctl.c
+++ b/drivers/char/tty_ioctl.c
@@ -40,6 +40,15 @@
 #define TERMIOS_OLD     8
 
 
+/**
+ *      tty_chars_in_buffer     -       characters pending
+ *      @tty: terminal
+ *
+ *      Return the number of bytes of data in the device private
+ *      output queue. If no private method is supplied there is assumed
+ *      to be no queue on the device.
+ */
+
 int tty_chars_in_buffer(struct tty_struct *tty)
 {
         if (tty->ops->chars_in_buffer)
@@ -47,26 +56,49 @@ int tty_chars_in_buffer(struct tty_struct *tty)
         else
                 return 0;
 }
-
 EXPORT_SYMBOL(tty_chars_in_buffer);
 
+/**
+ *      tty_write_room          -       write queue space
+ *      @tty: terminal
+ *
+ *      Return the number of bytes that can be queued to this device
+ *      at the present time. The result should be treated as a guarantee
+ *      and the driver cannot offer a value it later shrinks by more than
+ *      the number of bytes written. If no method is provided 2K is always
+ *      returned and data may be lost as there will be no flow control.
+ */
+ 
 int tty_write_room(struct tty_struct *tty)
 {
         if (tty->ops->write_room)
                 return tty->ops->write_room(tty);
         return 2048;
 }
-
 EXPORT_SYMBOL(tty_write_room);
 
+/**
+ *      tty_driver_flush_buffer -       discard internal buffer
+ *      @tty: terminal
+ *
+ *      Discard the internal output buffer for this device. If no method
+ *      is provided then either the buffer cannot be hardware flushed or
+ *      there is no buffer driver side.
+ */
 void tty_driver_flush_buffer(struct tty_struct *tty)
 {
         if (tty->ops->flush_buffer)
                 tty->ops->flush_buffer(tty);
 }
-
 EXPORT_SYMBOL(tty_driver_flush_buffer);
 
+/**
+ *      tty_throttle            -       flow control
+ *      @tty: terminal
+ *
+ *      Indicate that a tty should stop transmitting data down the stack.
+ */
+
 void tty_throttle(struct tty_struct *tty)
 {
         /* check TTY_THROTTLED first so it indicates our state */
@@ -76,6 +108,13 @@ void tty_throttle(struct tty_struct *tty)
 }
 EXPORT_SYMBOL(tty_throttle);
 
+/**
+ *      tty_unthrottle          -       flow control
+ *      @tty: terminal
+ *
+ *      Indicate that a tty may continue transmitting data down the stack.
+ */
+
 void tty_unthrottle(struct tty_struct *tty)
 {
         if (test_and_clear_bit(TTY_THROTTLED, &tty->flags) &&
@@ -112,6 +151,11 @@ void tty_wait_until_sent(struct tty_struct *tty, long timeout)
 }
 EXPORT_SYMBOL(tty_wait_until_sent);
 
+
+/*
+ *              Termios Helper Methods
+ */
+
 static void unset_locked_termios(struct ktermios *termios,
                                  struct ktermios *old,
                                  struct ktermios *locked)
@@ -346,6 +390,16 @@ void tty_termios_encode_baud_rate(struct ktermios *termios,
 }
 EXPORT_SYMBOL_GPL(tty_termios_encode_baud_rate);
 
+/**
+ *      tty_encode_baud_rate            -       set baud rate of the tty
+ *      @ibaud: input baud rate
+ *      @obad: output baud rate
+ *
+ *      Update the current termios data for the tty with the new speed
+ *      settings. The caller must hold the termios_mutex for the tty in
+ *      question.
+ */
+
 void tty_encode_baud_rate(struct tty_struct *tty, speed_t ibaud, speed_t obaud)
 {
         tty_termios_encode_baud_rate(tty->termios, ibaud, obaud);
@@ -430,12 +484,11 @@ EXPORT_SYMBOL(tty_termios_hw_change);
  *      is a bit of layering violation here with n_tty in terms of the
  *      internal knowledge of this function.
  *
- *      Locking: termios_sem
+ *      Locking: termios_mutex
  */
 
 static void change_termios(struct tty_struct *tty, struct ktermios *new_termios)
 {
-        int canon_change;
         struct ktermios old_termios;
         struct tty_ldisc *ld;
         unsigned long flags;
@@ -451,18 +504,6 @@ static void change_termios(struct tty_struct *tty, struct ktermios *new_termios)
         old_termios = *tty->termios;
         *tty->termios = *new_termios;
         unset_locked_termios(tty->termios, &old_termios, tty->termios_locked);
-        canon_change = (old_termios.c_lflag ^ tty->termios->c_lflag) & ICANON;
-        if (canon_change) {
-                memset(&tty->read_flags, 0, sizeof tty->read_flags);
-                tty->canon_head = tty->read_tail;
-                tty->canon_data = 0;
-                tty->erasing = 0;
-        }
-
-        /* This bit should be in the ldisc code */
-        if (canon_change && !L_ICANON(tty) && tty->read_cnt)
-                /* Get characters left over from canonical mode. */
-                wake_up_interruptible(&tty->read_wait);
 
         /* See if packet mode change of state. */
         if (tty->link && tty->link->packet) {
@@ -508,7 +549,7 @@ static void change_termios(struct tty_struct *tty, struct ktermios *new_termios)
  *      functions before using change_termios to do the actual changes.
  *
  *      Locking:
- *              Called functions take ldisc and termios_sem locks
+ *              Called functions take ldisc and termios_mutex locks
  */
 
 static int set_termios(struct tty_struct *tty, void __user *arg, int opt)
@@ -579,25 +620,51 @@ static int get_termio(struct tty_struct *tty, struct termio __user *termio)
         return 0;
 }
 
-static unsigned long inq_canon(struct tty_struct *tty)
+
+#ifdef TCGETX
+
+/**
+ *      set_termiox     -       set termiox fields if possible
+ *      @tty: terminal
+ *      @arg: termiox structure from user
+ *      @opt: option flags for ioctl type
+ *
+ *      Implement the device calling points for the SYS5 termiox ioctl
+ *      interface in Linux
+ */
+
+static int set_termiox(struct tty_struct *tty, void __user *arg, int opt)
 {
-        int nr, head, tail;
+        struct termiox tnew;
+        struct tty_ldisc *ld;
 
-        if (!tty->canon_data || !tty->read_buf)
-                return 0;
-        head = tty->canon_head;
-        tail = tty->read_tail;
-        nr = (head - tail) & (N_TTY_BUF_SIZE-1);
-        /* Skip EOF-chars.. */
-        while (head != tail) {
-                if (test_bit(tail, tty->read_flags) &&
-                    tty->read_buf[tail] == __DISABLED_CHAR)
-                        nr--;
-                tail = (tail+1) & (N_TTY_BUF_SIZE-1);
+        if (tty->termiox == NULL)
+                return -EINVAL;
+        if (copy_from_user(&tnew, arg, sizeof(struct termiox)))
+                return -EFAULT;
+
+        ld = tty_ldisc_ref(tty);
+        if (ld != NULL) {
+                if ((opt & TERMIOS_FLUSH) && ld->ops->flush_buffer)
+                        ld->ops->flush_buffer(tty);
+                tty_ldisc_deref(ld);
         }
-        return nr;
+        if (opt & TERMIOS_WAIT) {
+                tty_wait_until_sent(tty, 0);
+                if (signal_pending(current))
+                        return -EINTR;
+        }
+
+        mutex_lock(&tty->termios_mutex);
+        if (tty->ops->set_termiox)
+                tty->ops->set_termiox(tty, &tnew);
+        mutex_unlock(&tty->termios_mutex);
+        return 0;
 }
 
+#endif
+
+
 #ifdef TIOCGETP
 /*
  * These are deprecated, but there is limited support..
@@ -671,7 +738,7 @@ static void set_sgflags(struct ktermios *termios, int flags)
  *      Updates a terminal from the legacy BSD style terminal information
  *      structure.
  *
- *      Locking: termios_sem
+ *      Locking: termios_mutex
  */
 
 static int set_sgttyb(struct tty_struct *tty, struct sgttyb __user *sgttyb)
@@ -849,6 +916,7 @@ int tty_mode_ioctl(struct tty_struct *tty, struct file *file,
 {
         struct tty_struct *real_tty;
         void __user *p = (void __user *)arg;
+        int ret = 0;
 
         if (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
             tty->driver->subtype == PTY_TYPE_MASTER)
@@ -884,18 +952,24 @@ int tty_mode_ioctl(struct tty_struct *tty, struct file *file,
                 return set_termios(real_tty, p, TERMIOS_OLD);
 #ifndef TCGETS2
         case TCGETS:
+                mutex_lock(&real_tty->termios_mutex);
                 if (kernel_termios_to_user_termios((struct termios __user *)arg, real_tty->termios))
-                        return -EFAULT;
-                return 0;
+                        ret = -EFAULT;
+                mutex_unlock(&real_tty->termios_mutex);
+                return ret;
 #else
         case TCGETS:
+                mutex_lock(&real_tty->termios_mutex);
                 if (kernel_termios_to_user_termios_1((struct termios __user *)arg, real_tty->termios))
-                        return -EFAULT;
-                return 0;
+                        ret = -EFAULT;
+                mutex_unlock(&real_tty->termios_mutex);
+                return ret;
         case TCGETS2:
+                mutex_lock(&real_tty->termios_mutex);
                 if (kernel_termios_to_user_termios((struct termios2 __user *)arg, real_tty->termios))
-                        return -EFAULT;
-                return 0;
+                        ret = -EFAULT;
+                mutex_unlock(&real_tty->termios_mutex);
+                return ret;
         case TCSETSF2:
                 return set_termios(real_tty, p,  TERMIOS_FLUSH | TERMIOS_WAIT);
         case TCSETSW2:
@@ -913,34 +987,59 @@ int tty_mode_ioctl(struct tty_struct *tty, struct file *file,
                 return set_termios(real_tty, p, TERMIOS_TERMIO);
 #ifndef TCGETS2
         case TIOCGLCKTRMIOS:
+                mutex_lock(&real_tty->termios_mutex);
                 if (kernel_termios_to_user_termios((struct termios __user *)arg, real_tty->termios_locked))
-                        return -EFAULT;
-                return 0;
+                        ret = -EFAULT;
+                mutex_unlock(&real_tty->termios_mutex);
+                return ret;
         case TIOCSLCKTRMIOS:
                 if (!capable(CAP_SYS_ADMIN))
                         return -EPERM;
+                mutex_lock(&real_tty->termios_mutex);
                 if (user_termios_to_kernel_termios(real_tty->termios_locked,
                                                (struct termios __user *) arg))
-                        return -EFAULT;
-                return 0;
+                        ret = -EFAULT;
+                mutex_unlock(&real_tty->termios_mutex);
+                return ret;
 #else
         case TIOCGLCKTRMIOS:
+                mutex_lock(&real_tty->termios_mutex);
                 if (kernel_termios_to_user_termios_1((struct termios __user *)arg, real_tty->termios_locked))
-                        return -EFAULT;
-                return 0;
+                        ret = -EFAULT;
+                mutex_unlock(&real_tty->termios_mutex);
+                return ret;
         case TIOCSLCKTRMIOS:
                 if (!capable(CAP_SYS_ADMIN))
-                        return -EPERM;
+                        ret = -EPERM;
+                mutex_lock(&real_tty->termios_mutex);
                 if (user_termios_to_kernel_termios_1(real_tty->termios_locked,
                                                (struct termios __user *) arg))
-                        return -EFAULT;
-                        return 0;
+                        ret = -EFAULT;
+                mutex_unlock(&real_tty->termios_mutex);
+                return ret;
 #endif
+#ifdef TCGETX
+        case TCGETX:
+                if (real_tty->termiox == NULL)
+                        return -EINVAL;
+                mutex_lock(&real_tty->termios_mutex);
+                if (copy_to_user(p, real_tty->termiox, sizeof(struct termiox)))
+                        ret = -EFAULT;
+                mutex_unlock(&real_tty->termios_mutex);
+                return ret;
+        case TCSETX:
+                return set_termiox(real_tty, p, 0);
+        case TCSETXW:
+                return set_termiox(real_tty, p, TERMIOS_WAIT);
+        case TCSETXF:
+                return set_termiox(real_tty, p, TERMIOS_FLUSH);
+#endif          
         case TIOCGSOFTCAR:
-                /* FIXME: for correctness we may need to take the termios
-                   lock here - review */
-                return put_user(C_CLOCAL(real_tty) ? 1 : 0,
+                mutex_lock(&real_tty->termios_mutex);
+                ret = put_user(C_CLOCAL(real_tty) ? 1 : 0,
                                                 (int __user *)arg);
+                mutex_unlock(&real_tty->termios_mutex);
+                return ret;
         case TIOCSSOFTCAR:
                 if (get_user(arg, (unsigned int __user *) arg))
                         return -EFAULT;
@@ -980,7 +1079,7 @@ int tty_perform_flush(struct tty_struct *tty, unsigned long arg)
 }
 EXPORT_SYMBOL_GPL(tty_perform_flush);
 
-int n_tty_ioctl(struct tty_struct *tty, struct file *file,
+int n_tty_ioctl_helper(struct tty_struct *tty, struct file *file,
                        unsigned int cmd, unsigned long arg)
 {
         unsigned long flags;
@@ -1018,13 +1117,6 @@ int n_tty_ioctl(struct tty_struct *tty, struct file *file,
                 return 0;
         case TCFLSH:
                 return tty_perform_flush(tty, arg);
-        case TIOCOUTQ:
-                return put_user(tty_chars_in_buffer(tty), (int __user *) arg);
-        case TIOCINQ:
-                retval = tty->read_cnt;
-                if (L_ICANON(tty))
-                        retval = inq_canon(tty);
-                return put_user(retval, (unsigned int __user *) arg);
         case TIOCPKT:
         {
                 int pktmode;
@@ -1050,4 +1142,4 @@ int n_tty_ioctl(struct tty_struct *tty, struct file *file,
                 return tty_mode_ioctl(tty, file, cmd, arg);
         }
 }
-EXPORT_SYMBOL(n_tty_ioctl);
+EXPORT_SYMBOL(n_tty_ioctl_helper);
diff --git a/drivers/char/tty_port.c b/drivers/char/tty_port.c
new file mode 100644
index 000000000000..553b0e9d8d17
--- /dev/null
+++ b/drivers/char/tty_port.c
@@ -0,0 +1,96 @@
+/*
+ * Tty port functions
+ */
+
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/tty.h>
+#include <linux/tty_driver.h>
+#include <linux/tty_flip.h>
+#include <linux/timer.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/sched.h>
+#include <linux/init.h>
+#include <linux/wait.h>
+#include <linux/bitops.h>
+#include <linux/delay.h>
+#include <linux/module.h>
+
+void tty_port_init(struct tty_port *port)
+{
+        memset(port, 0, sizeof(*port));
+        init_waitqueue_head(&port->open_wait);
+        init_waitqueue_head(&port->close_wait);
+        mutex_init(&port->mutex);
+        spin_lock_init(&port->lock);
+        port->close_delay = (50 * HZ) / 100;
+        port->closing_wait = (3000 * HZ) / 100;
+}
+EXPORT_SYMBOL(tty_port_init);
+
+int tty_port_alloc_xmit_buf(struct tty_port *port)
+{
+        /* We may sleep in get_zeroed_page() */
+        mutex_lock(&port->mutex);
+        if (port->xmit_buf == NULL)
+                port->xmit_buf = (unsigned char *)get_zeroed_page(GFP_KERNEL);
+        mutex_unlock(&port->mutex);
+        if (port->xmit_buf == NULL)
+                return -ENOMEM;
+        return 0;
+}
+EXPORT_SYMBOL(tty_port_alloc_xmit_buf);
+
+void tty_port_free_xmit_buf(struct tty_port *port)
+{
+        mutex_lock(&port->mutex);
+        if (port->xmit_buf != NULL) {
+                free_page((unsigned long)port->xmit_buf);
+                port->xmit_buf = NULL;
+        }
+        mutex_unlock(&port->mutex);
+}
+EXPORT_SYMBOL(tty_port_free_xmit_buf);
+
+
+/**
+ *      tty_port_tty_get        -       get a tty reference
+ *      @port: tty port
+ *
+ *      Return a refcount protected tty instance or NULL if the port is not
+ *      associated with a tty (eg due to close or hangup)
+ */
+
+struct tty_struct *tty_port_tty_get(struct tty_port *port)
+{
+        unsigned long flags;
+        struct tty_struct *tty;
+
+        spin_lock_irqsave(&port->lock, flags);
+        tty = tty_kref_get(port->tty);
+        spin_unlock_irqrestore(&port->lock, flags);
+        return tty;
+}
+EXPORT_SYMBOL(tty_port_tty_get);
+
+/**
+ *      tty_port_tty_set        -       set the tty of a port
+ *      @port: tty port
+ *      @tty: the tty
+ *
+ *      Associate the port and tty pair. Manages any internal refcounts.
+ *      Pass NULL to deassociate a port
+ */
+
+void tty_port_tty_set(struct tty_port *port, struct tty_struct *tty)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&port->lock, flags);
+        if (port->tty)
+                tty_kref_put(port->tty);
+        port->tty = tty;
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+EXPORT_SYMBOL(tty_port_tty_set);
diff --git a/drivers/char/vc_screen.c b/drivers/char/vc_screen.c
index c2ae52dd53d1..4f3b3f95fc42 100644
--- a/drivers/char/vc_screen.c
+++ b/drivers/char/vc_screen.c
@@ -481,10 +481,10 @@ static struct class *vc_class;
 
 void vcs_make_sysfs(struct tty_struct *tty)
 {
-        device_create_drvdata(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 1),
-                              NULL, "vcs%u", tty->index + 1);
-        device_create_drvdata(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 129),
-                              NULL, "vcsa%u", tty->index + 1);
+        device_create(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 1), NULL,
+                      "vcs%u", tty->index + 1);
+        device_create(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 129), NULL,
+                      "vcsa%u", tty->index + 1);
 }
 
 void vcs_remove_sysfs(struct tty_struct *tty)
@@ -499,7 +499,7 @@ int __init vcs_init(void)
                 panic("unable to get major %d for vcs device", VCS_MAJOR);
         vc_class = class_create(THIS_MODULE, "vc");
 
-        device_create_drvdata(vc_class, NULL, MKDEV(VCS_MAJOR, 0), NULL, "vcs");
-        device_create_drvdata(vc_class, NULL, MKDEV(VCS_MAJOR, 128), NULL, "vcsa");
+        device_create(vc_class, NULL, MKDEV(VCS_MAJOR, 0), NULL, "vcs");
+        device_create(vc_class, NULL, MKDEV(VCS_MAJOR, 128), NULL, "vcsa");
         return 0;
 }
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 7a70a40ad639..ffc9254f7e02 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -886,10 +886,10 @@ static int viotape_probe(struct vio_dev *vdev, const struct vio_device_id *id)
         state[i].cur_part = 0;
         for (j = 0; j < MAX_PARTITIONS; ++j)
                 state[i].part_stat_rwi[j] = VIOT_IDLE;
-        device_create_drvdata(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i),
-                              NULL, "iseries!vt%d", i);
-        device_create_drvdata(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i | 0x80),
-                              NULL, "iseries!nvt%d", i);
+        device_create(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i), NULL,
+                      "iseries!vt%d", i);
+        device_create(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i | 0x80), NULL,
+                      "iseries!nvt%d", i);
         printk(VIOTAPE_KERN_INFO "tape iseries/vt%d is iSeries "
                         "resource %10.10s type %4.4s, model %3.3s\n",
                         i, viotape_unitinfo[i].rsrcname,
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 60359c360912..d8f83e26e4a4 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -59,7 +59,7 @@
  * by Martin Mares <mj@atrey.karlin.mff.cuni.cz>, July 1998
  *
  * Removed old-style timers, introduced console_timer, made timer
- * deletion SMP-safe.  17Jun00, Andrew Morton <andrewm@uow.edu.au>
+ * deletion SMP-safe.  17Jun00, Andrew Morton
  *
  * Removed console_lock, enabled interrupts across all console operations
  * 13 March 2001, Andrew Morton
@@ -100,10 +100,10 @@
 #include <linux/font.h>
 #include <linux/bitops.h>
 #include <linux/notifier.h>
-
-#include <asm/io.h>
+#include <linux/device.h>
+#include <linux/io.h>
 #include <asm/system.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 #define MAX_NR_CON_DRIVER 16
 
@@ -301,7 +301,7 @@ static void scrup(struct vc_data *vc, unsigned int t, unsigned int b, int nr)
         d = (unsigned short *)(vc->vc_origin + vc->vc_size_row * t);
         s = (unsigned short *)(vc->vc_origin + vc->vc_size_row * (t + nr));
         scr_memmovew(d, s, (b - t - nr) * vc->vc_size_row);
-        scr_memsetw(d + (b - t - nr) * vc->vc_cols, vc->vc_scrl_erase_char,
+        scr_memsetw(d + (b - t - nr) * vc->vc_cols, vc->vc_video_erase_char,
                     vc->vc_size_row * nr);
 }
 
@@ -319,7 +319,7 @@ static void scrdown(struct vc_data *vc, unsigned int t, unsigned int b, int nr)
         s = (unsigned short *)(vc->vc_origin + vc->vc_size_row * t);
         step = vc->vc_cols * nr;
         scr_memmovew(s + step, s, (b - t - nr) * vc->vc_size_row);
-        scr_memsetw(s, vc->vc_scrl_erase_char, 2 * step);
+        scr_memsetw(s, vc->vc_video_erase_char, 2 * step);
 }
 
 static void do_update_region(struct vc_data *vc, unsigned long start, int count)
@@ -434,7 +434,6 @@ static void update_attr(struct vc_data *vc)
                       vc->vc_blink, vc->vc_underline,
                       vc->vc_reverse ^ vc->vc_decscnm, vc->vc_italic);
         vc->vc_video_erase_char = (build_attr(vc, vc->vc_color, 1, vc->vc_blink, 0, vc->vc_decscnm, 0) << 8) | ' ';
-        vc->vc_scrl_erase_char = (build_attr(vc, vc->vc_def_color, 1, false, false, vc->vc_decscnm, false) << 8) | ' ';
 }
 
 /* Note: inverting the screen twice should revert to the original state */
@@ -2136,27 +2135,9 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co
             release_console_sem();
             return 0;
         }
-        release_console_sem();
-
         orig_buf = buf;
         orig_count = count;
 
-        /* At this point 'buf' is guaranteed to be a kernel buffer
-         * and therefore no access to userspace (and therefore sleeping)
-         * will be needed.  The con_buf_mtx serializes all tty based
-         * console rendering and vcs write/read operations.  We hold
-         * the console spinlock during the entire write.
-         */
-
-        acquire_console_sem();
-
-        vc = tty->driver_data;
-        if (vc == NULL) {
-                printk(KERN_ERR "vt: argh, driver_data _became_ NULL !\n");
-                release_console_sem();
-                goto out;
-        }
-
         himask = vc->vc_hi_font_mask;
         charmask = himask ? 0x1ff : 0xff;
 
@@ -2370,8 +2351,6 @@ rescan_last_byte:
         FLUSH
         console_conditional_schedule();
         release_console_sem();
-
-out:
         notify_update(vc);
         return n;
 #undef FLUSH
@@ -2583,8 +2562,6 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
         int lines;
         int ret;
 
-        if (tty->driver->type != TTY_DRIVER_TYPE_CONSOLE)
-                return -EINVAL;
         if (current->signal->tty != tty && !capable(CAP_SYS_ADMIN))
                 return -EPERM;
         if (get_user(type, p))
@@ -2778,6 +2755,12 @@ static int con_open(struct tty_struct *tty, struct file *filp)
                 ret = vc_allocate(currcons);
                 if (ret == 0) {
                         struct vc_data *vc = vc_cons[currcons].d;
+
+                        /* Still being freed */
+                        if (vc->vc_tty) {
+                                release_console_sem();
+                                return -ERESTARTSYS;
+                        }
                         tty->driver_data = vc;
                         vc->vc_tty = tty;
 
@@ -2798,34 +2781,20 @@ static int con_open(struct tty_struct *tty, struct file *filp)
         return ret;
 }
 
-/*
- * We take tty_mutex in here to prevent another thread from coming in via init_dev
- * and taking a ref against the tty while we're in the process of forgetting
- * about it and cleaning things up.
- *
- * This is because vcs_remove_sysfs() can sleep and will drop the BKL.
- */
 static void con_close(struct tty_struct *tty, struct file *filp)
 {
-        mutex_lock(&tty_mutex);
-        acquire_console_sem();
-        if (tty && tty->count == 1) {
-                struct vc_data *vc = tty->driver_data;
+        /* Nothing to do - we defer to shutdown */
+}
 
-                if (vc)
-                        vc->vc_tty = NULL;
-                tty->driver_data = NULL;
-                vcs_remove_sysfs(tty);
-                release_console_sem();
-                mutex_unlock(&tty_mutex);
-                /*
-                 * tty_mutex is released, but we still hold BKL, so there is
-                 * still exclusion against init_dev()
-                 */
-                return;
-        }
+static void con_shutdown(struct tty_struct *tty)
+{
+        struct vc_data *vc = tty->driver_data;
+        BUG_ON(vc == NULL);
+        acquire_console_sem();
+        vc->vc_tty = NULL;
+        vcs_remove_sysfs(tty);
         release_console_sem();
-        mutex_unlock(&tty_mutex);
+        tty_shutdown(tty);
 }
 
 static int default_italic_color    = 2; // green (ASCII)
@@ -2950,10 +2919,19 @@ static const struct tty_operations con_ops = {
         .throttle = con_throttle,
         .unthrottle = con_unthrottle,
         .resize = vt_resize,
+        .shutdown = con_shutdown
 };
 
-int __init vty_init(void)
+static struct cdev vc0_cdev;
+
+int __init vty_init(const struct file_operations *console_fops)
 {
+        cdev_init(&vc0_cdev, console_fops);
+        if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) ||
+            register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0)
+                panic("Couldn't register /dev/tty0 driver\n");
+        device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), NULL, "tty0");
+
         vcs_init();
 
         console_driver = alloc_tty_driver(MAX_NR_CONSOLES);
@@ -2972,7 +2950,6 @@ int __init vty_init(void)
         tty_set_operations(console_driver, &con_ops);
         if (tty_register_driver(console_driver))
                 panic("Couldn't register console driver\n");
-
         kbd_init();
         console_map_init();
 #ifdef CONFIG_PROM_CONSOLE
@@ -3466,7 +3443,7 @@ int register_con_driver(const struct consw *csw, int first, int last)
         if (retval)
                 goto err;
 
-        con_driver->dev = device_create_drvdata(vtconsole_class, NULL,
+        con_driver->dev = device_create(vtconsole_class, NULL,
                                                 MKDEV(0, con_driver->node),
                                                 NULL, "vtcon%i",
                                                 con_driver->node);
@@ -3577,7 +3554,7 @@ static int __init vtconsole_class_init(void)
                 struct con_driver *con = &registered_con_driver[i];
 
                 if (con->con && !con->dev) {
-                        con->dev = device_create_drvdata(vtconsole_class, NULL,
+                        con->dev = device_create(vtconsole_class, NULL,
                                                          MKDEV(0, con->node),
                                                          NULL, "vtcon%i",
                                                          con->node);
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c
index c904e9ad4a71..8944ce508e2f 100644
--- a/drivers/char/vt_ioctl.c
+++ b/drivers/char/vt_ioctl.c
@@ -395,6 +395,8 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
  
         kbd = kbd_table + console;
         switch (cmd) {
+        case TIOCLINUX:
+                return tioclinux(tty, arg);
         case KIOCSOUND:
                 if (!perm)
                         goto eperm;
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
index 278c9857bcf5..ed132fe55d3d 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -657,8 +657,7 @@ static int __devinit hwicap_setup(struct device *dev, int id,
                 goto failed3;
         }
 
-        device_create_drvdata(icap_class, dev, devt, NULL,
-                              "%s%d", DRIVER_NAME, id);
+        device_create(icap_class, dev, devt, NULL, "%s%d", DRIVER_NAME, id);
         return 0;               /* success */
 
  failed3:
diff --git a/drivers/dca/dca-sysfs.c b/drivers/dca/dca-sysfs.c
index 7af4b403bd2d..bb538b9690e0 100644
--- a/drivers/dca/dca-sysfs.c
+++ b/drivers/dca/dca-sysfs.c
@@ -15,9 +15,8 @@ int dca_sysfs_add_req(struct dca_provider *dca, struct device *dev, int slot)
         struct device *cd;
         static int req_count;
 
-        cd = device_create_drvdata(dca_class, dca->cd,
-                                   MKDEV(0, slot + 1), NULL,
-                                   "requester%d", req_count++);
+        cd = device_create(dca_class, dca->cd, MKDEV(0, slot + 1), NULL,
+                           "requester%d", req_count++);
         if (IS_ERR(cd))
                 return PTR_ERR(cd);
         return 0;
@@ -48,8 +47,7 @@ idr_try_again:
                 return err;
         }
 
-        cd = device_create_drvdata(dca_class, dev, MKDEV(0, 0), NULL,
-                                   "dca%d", dca->id);
+        cd = device_create(dca_class, dev, MKDEV(0, 0), NULL, "dca%d", dca->id);
         if (IS_ERR(cd)) {
                 spin_lock(&dca_idr_lock);
                 idr_remove(&dca_idr, dca->id);
diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c
index 4a16b5b61cfb..f0d9b415db50 100644
--- a/drivers/edac/i5000_edac.c
+++ b/drivers/edac/i5000_edac.c
@@ -119,6 +119,7 @@
 #define                 FERR_NF_UNCORRECTABLE   (FERR_NF_M12ERR | \
                                                         FERR_NF_M11ERR | \
                                                         FERR_NF_M10ERR | \
+                                                        FERR_NF_M9ERR | \
                                                         FERR_NF_M8ERR | \
                                                         FERR_NF_M7ERR | \
                                                         FERR_NF_M6ERR | \
@@ -301,6 +302,9 @@ static char *numcol_toString[] = {
 };
 #endif
 
+/* enables the report of miscellaneous messages as CE errors - default off */
+static int misc_messages;
+
 /* Enumeration of supported devices */
 enum i5000_chips {
         I5000P = 0,
@@ -466,7 +470,8 @@ static void i5000_process_fatal_error_info(struct mem_ctl_info *mci,
                                         struct i5000_error_info *info,
                                         int handle_errors)
 {
-        char msg[EDAC_MC_LABEL_LEN + 1 + 90];
+        char msg[EDAC_MC_LABEL_LEN + 1 + 160];
+        char *specific = NULL;
         u32 allErrors;
         int branch;
         int channel;
@@ -480,11 +485,6 @@ static void i5000_process_fatal_error_info(struct mem_ctl_info *mci,
         if (!allErrors)
                 return;         /* if no error, return now */
 
-        /* ONLY ONE of the possible error bits will be set, as per the docs */
-        i5000_mc_printk(mci, KERN_ERR,
-                        "FATAL ERRORS Found!!! 1st FATAL Err Reg= 0x%x\n",
-                        allErrors);
-
         branch = EXTRACT_FBDCHAN_INDX(info->ferr_fat_fbd);
         channel = branch;
 
@@ -501,28 +501,42 @@ static void i5000_process_fatal_error_info(struct mem_ctl_info *mci,
                 rdwr ? "Write" : "Read", ras, cas);
 
         /* Only 1 bit will be on */
-        if (allErrors & FERR_FAT_M1ERR) {
-                i5000_mc_printk(mci, KERN_ERR,
-                                "Alert on non-redundant retry or fast "
-                                "reset timeout\n");
-
-        } else if (allErrors & FERR_FAT_M2ERR) {
-                i5000_mc_printk(mci, KERN_ERR,
-                                "Northbound CRC error on non-redundant "
-                                "retry\n");
-
-        } else if (allErrors & FERR_FAT_M3ERR) {
-                i5000_mc_printk(mci, KERN_ERR,
-                                ">Tmid Thermal event with intelligent "
-                                "throttling disabled\n");
+        switch (allErrors) {
+        case FERR_FAT_M1ERR:
+                specific = "Alert on non-redundant retry or fast "
+                                "reset timeout";
+                break;
+        case FERR_FAT_M2ERR:
+                specific = "Northbound CRC error on non-redundant "
+                                "retry";
+                break;
+        case FERR_FAT_M3ERR:
+                {
+                static int done;
+
+                /*
+                 * This error is generated to inform that the intelligent
+                 * throttling is disabled and the temperature passed the
+                 * specified middle point. Since this is something the BIOS
+                 * should take care of, we'll warn only once to avoid
+                 * worthlessly flooding the log.
+                 */
+                if (done)
+                        return;
+                done++;
+
+                specific = ">Tmid Thermal event with intelligent "
+                           "throttling disabled";
+                }
+                break;
         }
 
         /* Form out message */
         snprintf(msg, sizeof(msg),
                  "(Branch=%d DRAM-Bank=%d RDWR=%s RAS=%d CAS=%d "
-                 "FATAL Err=0x%x)",
+                 "FATAL Err=0x%x (%s))",
                  branch >> 1, bank, rdwr ? "Write" : "Read", ras, cas,
-                 allErrors);
+                 allErrors, specific);
 
         /* Call the helper to output message */
         edac_mc_handle_fbd_ue(mci, rank, channel, channel + 1, msg);
@@ -539,7 +553,8 @@ static void i5000_process_nonfatal_error_info(struct mem_ctl_info *mci,
                                         struct i5000_error_info *info,
                                         int handle_errors)
 {
-        char msg[EDAC_MC_LABEL_LEN + 1 + 90];
+        char msg[EDAC_MC_LABEL_LEN + 1 + 170];
+        char *specific = NULL;
         u32 allErrors;
         u32 ue_errors;
         u32 ce_errors;
@@ -557,10 +572,6 @@ static void i5000_process_nonfatal_error_info(struct mem_ctl_info *mci,
                 return;         /* if no error, return now */
 
         /* ONLY ONE of the possible error bits will be set, as per the docs */
-        i5000_mc_printk(mci, KERN_WARNING,
-                        "NON-FATAL ERRORS Found!!! 1st NON-FATAL Err "
-                        "Reg= 0x%x\n", allErrors);
-
         ue_errors = allErrors & FERR_NF_UNCORRECTABLE;
         if (ue_errors) {
                 debugf0("\tUncorrected bits= 0x%x\n", ue_errors);
@@ -579,12 +590,47 @@ static void i5000_process_nonfatal_error_info(struct mem_ctl_info *mci,
                         rank, channel, channel + 1, branch >> 1, bank,
                         rdwr ? "Write" : "Read", ras, cas);
 
+                switch (ue_errors) {
+                case FERR_NF_M12ERR:
+                        specific = "Non-Aliased Uncorrectable Patrol Data ECC";
+                        break;
+                case FERR_NF_M11ERR:
+                        specific = "Non-Aliased Uncorrectable Spare-Copy "
+                                        "Data ECC";
+                        break;
+                case FERR_NF_M10ERR:
+                        specific = "Non-Aliased Uncorrectable Mirrored Demand "
+                                        "Data ECC";
+                        break;
+                case FERR_NF_M9ERR:
+                        specific = "Non-Aliased Uncorrectable Non-Mirrored "
+                                        "Demand Data ECC";
+                        break;
+                case FERR_NF_M8ERR:
+                        specific = "Aliased Uncorrectable Patrol Data ECC";
+                        break;
+                case FERR_NF_M7ERR:
+                        specific = "Aliased Uncorrectable Spare-Copy Data ECC";
+                        break;
+                case FERR_NF_M6ERR:
+                        specific = "Aliased Uncorrectable Mirrored Demand "
+                                        "Data ECC";
+                        break;
+                case FERR_NF_M5ERR:
+                        specific = "Aliased Uncorrectable Non-Mirrored Demand "
+                                        "Data ECC";
+                        break;
+                case FERR_NF_M4ERR:
+                        specific = "Uncorrectable Data ECC on Replay";
+                        break;
+                }
+
                 /* Form out message */
                 snprintf(msg, sizeof(msg),
                          "(Branch=%d DRAM-Bank=%d RDWR=%s RAS=%d "
-                         "CAS=%d, UE Err=0x%x)",
+                         "CAS=%d, UE Err=0x%x (%s))",
                          branch >> 1, bank, rdwr ? "Write" : "Read", ras, cas,
-                         ue_errors);
+                         ue_errors, specific);
 
                 /* Call the helper to output message */
                 edac_mc_handle_fbd_ue(mci, rank, channel, channel + 1, msg);
@@ -616,51 +662,74 @@ static void i5000_process_nonfatal_error_info(struct mem_ctl_info *mci,
                         rank, channel, branch >> 1, bank,
                         rdwr ? "Write" : "Read", ras, cas);
 
+                switch (ce_errors) {
+                case FERR_NF_M17ERR:
+                        specific = "Correctable Non-Mirrored Demand Data ECC";
+                        break;
+                case FERR_NF_M18ERR:
+                        specific = "Correctable Mirrored Demand Data ECC";
+                        break;
+                case FERR_NF_M19ERR:
+                        specific = "Correctable Spare-Copy Data ECC";
+                        break;
+                case FERR_NF_M20ERR:
+                        specific = "Correctable Patrol Data ECC";
+                        break;
+                }
+
                 /* Form out message */
                 snprintf(msg, sizeof(msg),
                          "(Branch=%d DRAM-Bank=%d RDWR=%s RAS=%d "
-                         "CAS=%d, CE Err=0x%x)", branch >> 1, bank,
-                         rdwr ? "Write" : "Read", ras, cas, ce_errors);
+                         "CAS=%d, CE Err=0x%x (%s))", branch >> 1, bank,
+                         rdwr ? "Write" : "Read", ras, cas, ce_errors,
+                         specific);
 
                 /* Call the helper to output message */
                 edac_mc_handle_fbd_ce(mci, rank, channel, msg);
         }
 
-        /* See if any of the thermal errors have fired */
-        misc_errors = allErrors & FERR_NF_THERMAL;
-        if (misc_errors) {
-                i5000_printk(KERN_WARNING, "\tTHERMAL Error, bits= 0x%x\n",
-                        misc_errors);
-        }
-
-        /* See if any of the thermal errors have fired */
-        misc_errors = allErrors & FERR_NF_NON_RETRY;
-        if (misc_errors) {
-                i5000_printk(KERN_WARNING, "\tNON-Retry  Errors, bits= 0x%x\n",
-                        misc_errors);
-        }
+        if (!misc_messages)
+                return;
 
-        /* See if any of the thermal errors have fired */
-        misc_errors = allErrors & FERR_NF_NORTH_CRC;
+        misc_errors = allErrors & (FERR_NF_NON_RETRY | FERR_NF_NORTH_CRC |
+                                   FERR_NF_SPD_PROTOCOL | FERR_NF_DIMM_SPARE);
         if (misc_errors) {
-                i5000_printk(KERN_WARNING,
-                        "\tNORTHBOUND CRC  Error, bits= 0x%x\n",
-                        misc_errors);
-        }
+                switch (misc_errors) {
+                case FERR_NF_M13ERR:
+                        specific = "Non-Retry or Redundant Retry FBD Memory "
+                                        "Alert or Redundant Fast Reset Timeout";
+                        break;
+                case FERR_NF_M14ERR:
+                        specific = "Non-Retry or Redundant Retry FBD "
+                                        "Configuration Alert";
+                        break;
+                case FERR_NF_M15ERR:
+                        specific = "Non-Retry or Redundant Retry FBD "
+                                        "Northbound CRC error on read data";
+                        break;
+                case FERR_NF_M21ERR:
+                        specific = "FBD Northbound CRC error on "
+                                        "FBD Sync Status";
+                        break;
+                case FERR_NF_M22ERR:
+                        specific = "SPD protocol error";
+                        break;
+                case FERR_NF_M27ERR:
+                        specific = "DIMM-spare copy started";
+                        break;
+                case FERR_NF_M28ERR:
+                        specific = "DIMM-spare copy completed";
+                        break;
+                }
+                branch = EXTRACT_FBDCHAN_INDX(info->ferr_nf_fbd);
 
-        /* See if any of the thermal errors have fired */
-        misc_errors = allErrors & FERR_NF_SPD_PROTOCOL;
-        if (misc_errors) {
-                i5000_printk(KERN_WARNING,
-                        "\tSPD Protocol  Error, bits= 0x%x\n",
-                        misc_errors);
-        }
+                /* Form out message */
+                snprintf(msg, sizeof(msg),
+                         "(Branch=%d Err=%#x (%s))", branch >> 1,
+                         misc_errors, specific);
 
-        /* See if any of the thermal errors have fired */
-        misc_errors = allErrors & FERR_NF_DIMM_SPARE;
-        if (misc_errors) {
-                i5000_printk(KERN_WARNING, "\tDIMM-Spare  Error, bits= 0x%x\n",
-                        misc_errors);
+                /* Call the helper to output message */
+                edac_mc_handle_fbd_ce(mci, 0, 0, msg);
         }
 }
 
@@ -1497,3 +1566,6 @@ MODULE_DESCRIPTION("MC Driver for Intel I5000 memory controllers - "
 
 module_param(edac_op_state, int, 0444);
 MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");
+module_param(misc_messages, int, 0444);
+MODULE_PARM_DESC(misc_messages, "Log miscellaneous non fatal messages");
+
diff --git a/drivers/edac/i82443bxgx_edac.c b/drivers/edac/i82443bxgx_edac.c
index c5305e3ee434..577760a82a0f 100644
--- a/drivers/edac/i82443bxgx_edac.c
+++ b/drivers/edac/i82443bxgx_edac.c
@@ -114,6 +114,12 @@ struct i82443bxgx_edacmc_error_info {
 
 static struct edac_pci_ctl_info *i82443bxgx_pci;
 
+static struct pci_dev *mci_pdev;        /* init dev: in case that AGP code has
+                                         * already registered driver
+                                         */
+
+static int i82443bxgx_registered = 1;
+
 static void i82443bxgx_edacmc_get_error_info(struct mem_ctl_info *mci,
                                 struct i82443bxgx_edacmc_error_info
                                 *info)
@@ -345,10 +351,17 @@ EXPORT_SYMBOL_GPL(i82443bxgx_edacmc_probe1);
 static int __devinit i82443bxgx_edacmc_init_one(struct pci_dev *pdev,
                                                 const struct pci_device_id *ent)
 {
+        int rc;
+
         debugf0("MC: " __FILE__ ": %s()\n", __func__);
 
         /* don't need to call pci_device_enable() */
-        return i82443bxgx_edacmc_probe1(pdev, ent->driver_data);
+        rc = i82443bxgx_edacmc_probe1(pdev, ent->driver_data);
+
+        if (mci_pdev == NULL)
+                mci_pdev = pci_dev_get(pdev);
+
+        return rc;
 }
 
 static void __devexit i82443bxgx_edacmc_remove_one(struct pci_dev *pdev)
@@ -387,15 +400,61 @@ static struct pci_driver i82443bxgx_edacmc_driver = {
 
 static int __init i82443bxgx_edacmc_init(void)
 {
+        int pci_rc;
        /* Ensure that the OPSTATE is set correctly for POLL or NMI */
        opstate_init();
 
-        return pci_register_driver(&i82443bxgx_edacmc_driver);
+        pci_rc = pci_register_driver(&i82443bxgx_edacmc_driver);
+        if (pci_rc < 0)
+                goto fail0;
+
+        if (mci_pdev == NULL) {
+                const struct pci_device_id *id = &i82443bxgx_pci_tbl[0];
+                int i = 0;
+                i82443bxgx_registered = 0;
+
+                while (mci_pdev == NULL && id->vendor != 0) {
+                        mci_pdev = pci_get_device(id->vendor,
+                                        id->device, NULL);
+                        i++;
+                        id = &i82443bxgx_pci_tbl[i];
+                }
+                if (!mci_pdev) {
+                        debugf0("i82443bxgx pci_get_device fail\n");
+                        pci_rc = -ENODEV;
+                        goto fail1;
+                }
+
+                pci_rc = i82443bxgx_edacmc_init_one(mci_pdev, i82443bxgx_pci_tbl);
+
+                if (pci_rc < 0) {
+                        debugf0("i82443bxgx init fail\n");
+                        pci_rc = -ENODEV;
+                        goto fail1;
+                }
+        }
+
+        return 0;
+
+fail1:
+        pci_unregister_driver(&i82443bxgx_edacmc_driver);
+
+fail0:
+        if (mci_pdev != NULL)
+                pci_dev_put(mci_pdev);
+
+        return pci_rc;
 }
 
 static void __exit i82443bxgx_edacmc_exit(void)
 {
         pci_unregister_driver(&i82443bxgx_edacmc_driver);
+
+        if (!i82443bxgx_registered)
+                i82443bxgx_edacmc_remove_one(mci_pdev);
+
+        if (mci_pdev)
+                pci_dev_put(mci_pdev);
 }
 
 module_init(i82443bxgx_edacmc_init);
diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
index 2265d9ca1535..0cfcb2d075a0 100644
--- a/drivers/edac/mpc85xx_edac.c
+++ b/drivers/edac/mpc85xx_edac.c
@@ -17,6 +17,7 @@
 #include <linux/io.h>
 #include <linux/mod_devicetable.h>
 #include <linux/edac.h>
+#include <linux/smp.h>
 
 #include <linux/of_platform.h>
 #include <linux/of_device.h>
@@ -40,7 +41,7 @@ static u32 orig_pci_err_en;
 #endif
 
 static u32 orig_l2_err_disable;
-static u32 orig_hid1;
+static u32 orig_hid1[2];
 
 /************************ MC SYSFS parts ***********************************/
 
@@ -647,6 +648,9 @@ static struct of_device_id mpc85xx_l2_err_of_match[] = {
         {
          .compatible = "fsl,8568-l2-cache-controller",
          },
+        {
+         .compatible = "fsl,mpc8572-l2-cache-controller",
+         },
         {},
 };
 
@@ -912,7 +916,8 @@ static int __devinit mpc85xx_mc_err_probe(struct of_device *op,
                 /* register interrupts */
                 pdata->irq = irq_of_parse_and_map(op->node, 0);
                 res = devm_request_irq(&op->dev, pdata->irq,
-                                       mpc85xx_mc_isr, IRQF_DISABLED,
+                                       mpc85xx_mc_isr,
+                                        IRQF_DISABLED | IRQF_SHARED,
                                        "[EDAC] MC err", mci);
                 if (res < 0) {
                         printk(KERN_ERR "%s: Unable to request irq %d for "
@@ -980,6 +985,9 @@ static struct of_device_id mpc85xx_mc_err_of_match[] = {
         {
          .compatible = "fsl,8568-memory-controller",
          },
+        {
+         .compatible = "fsl,mpc8572-memory-controller",
+         },
         {},
 };
 
@@ -995,6 +1003,14 @@ static struct of_platform_driver mpc85xx_mc_err_driver = {
                    },
 };
 
+
+static void __init mpc85xx_mc_clear_rfxe(void *data)
+{
+        orig_hid1[smp_processor_id()] = mfspr(SPRN_HID1);
+        mtspr(SPRN_HID1, (orig_hid1[smp_processor_id()] & ~0x20000));
+}
+
+
 static int __init mpc85xx_mc_init(void)
 {
         int res = 0;
@@ -1030,19 +1046,22 @@ static int __init mpc85xx_mc_init(void)
          * need to clear HID1[RFXE] to disable machine check int
          * so we can catch it
          */
-        if (edac_op_state == EDAC_OPSTATE_INT) {
-                orig_hid1 = mfspr(SPRN_HID1);
-                mtspr(SPRN_HID1, (orig_hid1 & ~0x20000));
-        }
+        if (edac_op_state == EDAC_OPSTATE_INT)
+                on_each_cpu(mpc85xx_mc_clear_rfxe, NULL, 0);
 
         return 0;
 }
 
 module_init(mpc85xx_mc_init);
 
+static void __exit mpc85xx_mc_restore_hid1(void *data)
+{
+        mtspr(SPRN_HID1, orig_hid1[smp_processor_id()]);
+}
+
 static void __exit mpc85xx_mc_exit(void)
 {
-        mtspr(SPRN_HID1, orig_hid1);
+        on_each_cpu(mpc85xx_mc_restore_hid1, NULL, 0);
 #ifdef CONFIG_PCI
         of_unregister_platform_driver(&mpc85xx_pci_err_driver);
 #endif
diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
index bbd73a406e53..418c18f07e9d 100644
--- a/drivers/firewire/fw-card.c
+++ b/drivers/firewire/fw-card.c
@@ -189,39 +189,16 @@ static const char gap_count_table[] = {
         63, 5, 7, 8, 10, 13, 16, 18, 21, 24, 26, 29, 32, 35, 37, 40
 };
 
-struct bm_data {
-        struct fw_transaction t;
-        struct {
-                __be32 arg;
-                __be32 data;
-        } lock;
-        u32 old;
-        int rcode;
-        struct completion done;
-};
-
-static void
-complete_bm_lock(struct fw_card *card, int rcode,
-                 void *payload, size_t length, void *data)
-{
-        struct bm_data *bmd = data;
-
-        if (rcode == RCODE_COMPLETE)
-                bmd->old = be32_to_cpu(*(__be32 *) payload);
-        bmd->rcode = rcode;
-        complete(&bmd->done);
-}
-
 static void
 fw_card_bm_work(struct work_struct *work)
 {
         struct fw_card *card = container_of(work, struct fw_card, work.work);
         struct fw_device *root_device;
         struct fw_node *root_node, *local_node;
-        struct bm_data bmd;
         unsigned long flags;
-        int root_id, new_root_id, irm_id, gap_count, generation, grace;
+        int root_id, new_root_id, irm_id, gap_count, generation, grace, rcode;
         bool do_reset = false;
+        __be32 lock_data[2];
 
         spin_lock_irqsave(&card->lock, flags);
         local_node = card->local_node;
@@ -263,33 +240,28 @@ fw_card_bm_work(struct work_struct *work)
                         goto pick_me;
                 }
 
-                bmd.lock.arg = cpu_to_be32(0x3f);
-                bmd.lock.data = cpu_to_be32(local_node->node_id);
+                lock_data[0] = cpu_to_be32(0x3f);
+                lock_data[1] = cpu_to_be32(local_node->node_id);
 
                 spin_unlock_irqrestore(&card->lock, flags);
 
-                init_completion(&bmd.done);
-                fw_send_request(card, &bmd.t, TCODE_LOCK_COMPARE_SWAP,
-                                irm_id, generation,
-                                SCODE_100, CSR_REGISTER_BASE + CSR_BUS_MANAGER_ID,
-                                &bmd.lock, sizeof(bmd.lock),
-                                complete_bm_lock, &bmd);
-                wait_for_completion(&bmd.done);
+                rcode = fw_run_transaction(card, TCODE_LOCK_COMPARE_SWAP,
+                                irm_id, generation, SCODE_100,
+                                CSR_REGISTER_BASE + CSR_BUS_MANAGER_ID,
+                                lock_data, sizeof(lock_data));
 
-                if (bmd.rcode == RCODE_GENERATION) {
-                        /*
-                         * Another bus reset happened. Just return,
-                         * the BM work has been rescheduled.
-                         */
+                if (rcode == RCODE_GENERATION)
+                        /* Another bus reset, BM work has been rescheduled. */
                         goto out;
-                }
 
-                if (bmd.rcode == RCODE_COMPLETE && bmd.old != 0x3f)
+                if (rcode == RCODE_COMPLETE &&
+                    lock_data[0] != cpu_to_be32(0x3f))
                         /* Somebody else is BM, let them do the work. */
                         goto out;
 
                 spin_lock_irqsave(&card->lock, flags);
-                if (bmd.rcode != RCODE_COMPLETE) {
+
+                if (rcode != RCODE_COMPLETE) {
                         /*
                          * The lock request failed, maybe the IRM
                          * isn't really IRM capable after all. Let's
diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c
index 2e6d5848d217..ed03234cbea8 100644
--- a/drivers/firewire/fw-cdev.c
+++ b/drivers/firewire/fw-cdev.c
@@ -720,8 +720,8 @@ static int ioctl_create_iso_context(struct client *client, void *buffer)
 #define GET_PAYLOAD_LENGTH(v)   ((v) & 0xffff)
 #define GET_INTERRUPT(v)        (((v) >> 16) & 0x01)
 #define GET_SKIP(v)             (((v) >> 17) & 0x01)
-#define GET_TAG(v)              (((v) >> 18) & 0x02)
-#define GET_SY(v)               (((v) >> 20) & 0x04)
+#define GET_TAG(v)              (((v) >> 18) & 0x03)
+#define GET_SY(v)               (((v) >> 20) & 0x0f)
 #define GET_HEADER_LENGTH(v)    (((v) >> 24) & 0xff)
 
 static int ioctl_queue_iso(struct client *client, void *buffer)
@@ -913,7 +913,7 @@ dispatch_ioctl(struct client *client, unsigned int cmd, void __user *arg)
                         return -EFAULT;
         }
 
-        return 0;
+        return retval;
 }
 
 static long
diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c
index 0855fb5568e8..3fccdd484100 100644
--- a/drivers/firewire/fw-device.c
+++ b/drivers/firewire/fw-device.c
@@ -381,46 +381,21 @@ static struct device_attribute fw_device_attributes[] = {
         __ATTR_NULL,
 };
 
-struct read_quadlet_callback_data {
-        struct completion done;
-        int rcode;
-        u32 data;
-};
-
-static void
-complete_transaction(struct fw_card *card, int rcode,
-                     void *payload, size_t length, void *data)
-{
-        struct read_quadlet_callback_data *callback_data = data;
-
-        if (rcode == RCODE_COMPLETE)
-                callback_data->data = be32_to_cpu(*(__be32 *)payload);
-        callback_data->rcode = rcode;
-        complete(&callback_data->done);
-}
-
 static int
 read_rom(struct fw_device *device, int generation, int index, u32 *data)
 {
-        struct read_quadlet_callback_data callback_data;
-        struct fw_transaction t;
-        u64 offset;
+        int rcode;
 
         /* device->node_id, accessed below, must not be older than generation */
         smp_rmb();
 
-        init_completion(&callback_data.done);
-
-        offset = (CSR_REGISTER_BASE | CSR_CONFIG_ROM) + index * 4;
-        fw_send_request(device->card, &t, TCODE_READ_QUADLET_REQUEST,
+        rcode = fw_run_transaction(device->card, TCODE_READ_QUADLET_REQUEST,
                         device->node_id, generation, device->max_speed,
-                        offset, NULL, 4, complete_transaction, &callback_data);
-
-        wait_for_completion(&callback_data.done);
-
-        *data = callback_data.data;
+                        (CSR_REGISTER_BASE | CSR_CONFIG_ROM) + index * 4,
+                        data, 4);
+        be32_to_cpus(data);
 
-        return callback_data.rcode;
+        return rcode;
 }
 
 #define READ_BIB_ROM_SIZE       256
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index aaff50ebba1d..ef0b9b419c27 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -29,6 +29,7 @@
  */
 
 #include <linux/blkdev.h>
+#include <linux/bug.h>
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
@@ -181,10 +182,16 @@ struct sbp2_target {
 #define SBP2_MAX_LOGIN_ORB_TIMEOUT      40000U  /* Timeout in ms */
 #define SBP2_ORB_TIMEOUT                2000U   /* Timeout in ms */
 #define SBP2_ORB_NULL                   0x80000000
-#define SBP2_MAX_SG_ELEMENT_LENGTH      0xf000
 #define SBP2_RETRY_LIMIT                0xf             /* 15 retries */
 #define SBP2_CYCLE_LIMIT                (0xc8 << 12)    /* 200 125us cycles */
 
+/*
+ * The default maximum s/g segment size of a FireWire controller is
+ * usually 0x10000, but SBP-2 only allows 0xffff. Since buffers have to
+ * be quadlet-aligned, we set the length limit to 0xffff & ~3.
+ */
+#define SBP2_MAX_SEG_SIZE               0xfffc
+
 /* Unit directory keys */
 #define SBP2_CSR_UNIT_CHARACTERISTICS   0x3a
 #define SBP2_CSR_FIRMWARE_REVISION      0x3c
@@ -621,25 +628,15 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id,
         return retval;
 }
 
-static void
-complete_agent_reset_write(struct fw_card *card, int rcode,
-                           void *payload, size_t length, void *done)
-{
-        complete(done);
-}
-
 static void sbp2_agent_reset(struct sbp2_logical_unit *lu)
 {
         struct fw_device *device = fw_device(lu->tgt->unit->device.parent);
-        DECLARE_COMPLETION_ONSTACK(done);
-        struct fw_transaction t;
-        static u32 z;
+        __be32 d = 0;
 
-        fw_send_request(device->card, &t, TCODE_WRITE_QUADLET_REQUEST,
-                        lu->tgt->node_id, lu->generation, device->max_speed,
-                        lu->command_block_agent_address + SBP2_AGENT_RESET,
-                        &z, sizeof(z), complete_agent_reset_write, &done);
-        wait_for_completion(&done);
+        fw_run_transaction(device->card, TCODE_WRITE_QUADLET_REQUEST,
+                           lu->tgt->node_id, lu->generation, device->max_speed,
+                           lu->command_block_agent_address + SBP2_AGENT_RESET,
+                           &d, sizeof(d));
 }
 
 static void
@@ -653,7 +650,7 @@ static void sbp2_agent_reset_no_wait(struct sbp2_logical_unit *lu)
 {
         struct fw_device *device = fw_device(lu->tgt->unit->device.parent);
         struct fw_transaction *t;
-        static u32 z;
+        static __be32 d;
 
         t = kmalloc(sizeof(*t), GFP_ATOMIC);
         if (t == NULL)
@@ -662,7 +659,7 @@ static void sbp2_agent_reset_no_wait(struct sbp2_logical_unit *lu)
         fw_send_request(device->card, t, TCODE_WRITE_QUADLET_REQUEST,
                         lu->tgt->node_id, lu->generation, device->max_speed,
                         lu->command_block_agent_address + SBP2_AGENT_RESET,
-                        &z, sizeof(z), complete_agent_reset_write_no_wait, t);
+                        &d, sizeof(d), complete_agent_reset_write_no_wait, t);
 }
 
 static void sbp2_set_generation(struct sbp2_logical_unit *lu, int generation)
@@ -823,13 +820,6 @@ static void sbp2_target_put(struct sbp2_target *tgt)
         kref_put(&tgt->kref, sbp2_release_target);
 }
 
-static void
-complete_set_busy_timeout(struct fw_card *card, int rcode,
-                          void *payload, size_t length, void *done)
-{
-        complete(done);
-}
-
 /*
  * Write retransmit retry values into the BUSY_TIMEOUT register.
  * - The single-phase retry protocol is supported by all SBP-2 devices, but the
@@ -849,17 +839,12 @@ complete_set_busy_timeout(struct fw_card *card, int rcode,
 static void sbp2_set_busy_timeout(struct sbp2_logical_unit *lu)
 {
         struct fw_device *device = fw_device(lu->tgt->unit->device.parent);
-        DECLARE_COMPLETION_ONSTACK(done);
-        struct fw_transaction t;
-        static __be32 busy_timeout;
-
-        busy_timeout = cpu_to_be32(SBP2_CYCLE_LIMIT | SBP2_RETRY_LIMIT);
+        __be32 d = cpu_to_be32(SBP2_CYCLE_LIMIT | SBP2_RETRY_LIMIT);
 
-        fw_send_request(device->card, &t, TCODE_WRITE_QUADLET_REQUEST,
-                        lu->tgt->node_id, lu->generation, device->max_speed,
-                        CSR_REGISTER_BASE + CSR_BUSY_TIMEOUT, &busy_timeout,
-                        sizeof(busy_timeout), complete_set_busy_timeout, &done);
-        wait_for_completion(&done);
+        fw_run_transaction(device->card, TCODE_WRITE_QUADLET_REQUEST,
+                           lu->tgt->node_id, lu->generation, device->max_speed,
+                           CSR_REGISTER_BASE + CSR_BUSY_TIMEOUT,
+                           &d, sizeof(d));
 }
 
 static void sbp2_reconnect(struct work_struct *work);
@@ -1121,6 +1106,10 @@ static int sbp2_probe(struct device *dev)
         struct Scsi_Host *shost;
         u32 model, firmware_revision;
 
+        if (dma_get_max_seg_size(device->card->device) > SBP2_MAX_SEG_SIZE)
+                BUG_ON(dma_set_max_seg_size(device->card->device,
+                                            SBP2_MAX_SEG_SIZE));
+
         shost = scsi_host_alloc(&scsi_driver_template, sizeof(*tgt));
         if (shost == NULL)
                 return -ENOMEM;
@@ -1369,14 +1358,12 @@ static int
 sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device,
                      struct sbp2_logical_unit *lu)
 {
-        struct scatterlist *sg;
-        int sg_len, l, i, j, count;
-        dma_addr_t sg_addr;
-
-        sg = scsi_sglist(orb->cmd);
-        count = dma_map_sg(device->card->device, sg, scsi_sg_count(orb->cmd),
-                           orb->cmd->sc_data_direction);
-        if (count == 0)
+        struct scatterlist *sg = scsi_sglist(orb->cmd);
+        int i, n;
+
+        n = dma_map_sg(device->card->device, sg, scsi_sg_count(orb->cmd),
+                       orb->cmd->sc_data_direction);
+        if (n == 0)
                 goto fail;
 
         /*
@@ -1386,7 +1373,7 @@ sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device,
          * as the second generation iPod which doesn't support page
          * tables.
          */
-        if (count == 1 && sg_dma_len(sg) < SBP2_MAX_SG_ELEMENT_LENGTH) {
+        if (n == 1) {
                 orb->request.data_descriptor.high =
                         cpu_to_be32(lu->tgt->address_high);
                 orb->request.data_descriptor.low  =
@@ -1396,29 +1383,9 @@ sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device,
                 return 0;
         }
 
-        /*
-         * Convert the scatterlist to an sbp2 page table.  If any
-         * scatterlist entries are too big for sbp2, we split them as we
-         * go.  Even if we ask the block I/O layer to not give us sg
-         * elements larger than 65535 bytes, some IOMMUs may merge sg elements
-         * during DMA mapping, and Linux currently doesn't prevent this.
-         */
-        for (i = 0, j = 0; i < count; i++, sg = sg_next(sg)) {
-                sg_len = sg_dma_len(sg);
-                sg_addr = sg_dma_address(sg);
-                while (sg_len) {
-                        /* FIXME: This won't get us out of the pinch. */
-                        if (unlikely(j >= ARRAY_SIZE(orb->page_table))) {
-                                fw_error("page table overflow\n");
-                                goto fail_page_table;
-                        }
-                        l = min(sg_len, SBP2_MAX_SG_ELEMENT_LENGTH);
-                        orb->page_table[j].low = cpu_to_be32(sg_addr);
-                        orb->page_table[j].high = cpu_to_be32(l << 16);
-                        sg_addr += l;
-                        sg_len -= l;
-                        j++;
-                }
+        for_each_sg(sg, sg, n, i) {
+                orb->page_table[i].high = cpu_to_be32(sg_dma_len(sg) << 16);
+                orb->page_table[i].low = cpu_to_be32(sg_dma_address(sg));
         }
 
         orb->page_table_bus =
@@ -1437,13 +1404,13 @@ sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device,
         orb->request.data_descriptor.high = cpu_to_be32(lu->tgt->address_high);
         orb->request.data_descriptor.low  = cpu_to_be32(orb->page_table_bus);
         orb->request.misc |= cpu_to_be32(COMMAND_ORB_PAGE_TABLE_PRESENT |
-                                         COMMAND_ORB_DATA_SIZE(j));
+                                         COMMAND_ORB_DATA_SIZE(n));
 
         return 0;
 
  fail_page_table:
-        dma_unmap_sg(device->card->device, sg, scsi_sg_count(orb->cmd),
-                     orb->cmd->sc_data_direction);
+        dma_unmap_sg(device->card->device, scsi_sglist(orb->cmd),
+                     scsi_sg_count(orb->cmd), orb->cmd->sc_data_direction);
  fail:
         return -ENOMEM;
 }
@@ -1456,7 +1423,7 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)
         struct fw_device *device = fw_device(lu->tgt->unit->device.parent);
         struct sbp2_command_orb *orb;
         unsigned int max_payload;
-        int retval = SCSI_MLQUEUE_HOST_BUSY;
+        int generation, retval = SCSI_MLQUEUE_HOST_BUSY;
 
         /*
          * Bidirectional commands are not yet implemented, and unknown
@@ -1500,6 +1467,9 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)
         if (cmd->sc_data_direction == DMA_FROM_DEVICE)
                 orb->request.misc |= cpu_to_be32(COMMAND_ORB_DIRECTION);
 
+        generation = device->generation;
+        smp_rmb();    /* sbp2_map_scatterlist looks at tgt->address_high */
+
         if (scsi_sg_count(cmd) && sbp2_map_scatterlist(orb, device, lu) < 0)
                 goto out;
 
@@ -1512,7 +1482,7 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)
         if (dma_mapping_error(device->card->device, orb->base.request_bus))
                 goto out;
 
-        sbp2_send_orb(&orb->base, lu, lu->tgt->node_id, lu->generation,
+        sbp2_send_orb(&orb->base, lu, lu->tgt->node_id, generation,
                       lu->command_block_agent_address + SBP2_ORB_POINTER);
         retval = 0;
  out:
@@ -1564,6 +1534,8 @@ static int sbp2_scsi_slave_configure(struct scsi_device *sdev)
         if (lu->tgt->workarounds & SBP2_WORKAROUND_128K_MAX_TRANS)
                 blk_queue_max_sectors(sdev->request_queue, 128 * 1024 / 512);
 
+        blk_queue_max_segment_size(sdev->request_queue, SBP2_MAX_SEG_SIZE);
+
         return 0;
 }
 
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c
index e5d1a0b64fcf..022ac4fabb67 100644
--- a/drivers/firewire/fw-transaction.c
+++ b/drivers/firewire/fw-transaction.c
@@ -247,7 +247,7 @@ fw_fill_request(struct fw_packet *packet, int tcode, int tlabel,
  */
 void
 fw_send_request(struct fw_card *card, struct fw_transaction *t,
-                int tcode, int node_id, int generation, int speed,
+                int tcode, int destination_id, int generation, int speed,
                 unsigned long long offset,
                 void *payload, size_t length,
                 fw_transaction_callback_t callback, void *callback_data)
@@ -279,13 +279,14 @@ fw_send_request(struct fw_card *card, struct fw_transaction *t,
         card->current_tlabel = (card->current_tlabel + 1) & 0x1f;
         card->tlabel_mask |= (1 << tlabel);
 
-        t->node_id = node_id;
+        t->node_id = destination_id;
         t->tlabel = tlabel;
         t->callback = callback;
         t->callback_data = callback_data;
 
-        fw_fill_request(&t->packet, tcode, t->tlabel, node_id, card->node_id,
-                        generation, speed, offset, payload, length);
+        fw_fill_request(&t->packet, tcode, t->tlabel,
+                        destination_id, card->node_id, generation,
+                        speed, offset, payload, length);
         t->packet.callback = transmit_complete_callback;
 
         list_add_tail(&t->link, &card->transaction_list);
@@ -296,6 +297,45 @@ fw_send_request(struct fw_card *card, struct fw_transaction *t,
 }
 EXPORT_SYMBOL(fw_send_request);
 
+struct transaction_callback_data {
+        struct completion done;
+        void *payload;
+        int rcode;
+};
+
+static void transaction_callback(struct fw_card *card, int rcode,
+                                 void *payload, size_t length, void *data)
+{
+        struct transaction_callback_data *d = data;
+
+        if (rcode == RCODE_COMPLETE)
+                memcpy(d->payload, payload, length);
+        d->rcode = rcode;
+        complete(&d->done);
+}
+
+/**
+ * fw_run_transaction - send request and sleep until transaction is completed
+ *
+ * Returns the RCODE.
+ */
+int fw_run_transaction(struct fw_card *card, int tcode, int destination_id,
+                int generation, int speed, unsigned long long offset,
+                void *data, size_t length)
+{
+        struct transaction_callback_data d;
+        struct fw_transaction t;
+
+        init_completion(&d.done);
+        d.payload = data;
+        fw_send_request(card, &t, tcode, destination_id, generation, speed,
+                        offset, data, length, transaction_callback, &d);
+        wait_for_completion(&d.done);
+
+        return d.rcode;
+}
+EXPORT_SYMBOL(fw_run_transaction);
+
 static DEFINE_MUTEX(phy_config_mutex);
 static DECLARE_COMPLETION(phy_config_done);
 
diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h
index 2ae1b0d6cb7b..027f58ce81ad 100644
--- a/drivers/firewire/fw-transaction.h
+++ b/drivers/firewire/fw-transaction.h
@@ -426,11 +426,14 @@ fw_core_initiate_bus_reset(struct fw_card *card, int short_reset);
 
 void
 fw_send_request(struct fw_card *card, struct fw_transaction *t,
-                int tcode, int node_id, int generation, int speed,
-                unsigned long long offset,
-                void *data, size_t length,
+                int tcode, int destination_id, int generation, int speed,
+                unsigned long long offset, void *data, size_t length,
                 fw_transaction_callback_t callback, void *callback_data);
 
+int fw_run_transaction(struct fw_card *card, int tcode, int destination_id,
+                       int generation, int speed, unsigned long long offset,
+                       void *data, size_t length);
+
 int fw_cancel_transaction(struct fw_card *card,
                           struct fw_transaction *transaction);
 
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index 455575be3560..3e526b6d00cb 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -15,6 +15,11 @@
  */
 static char dmi_empty_string[] = "        ";
 
+/*
+ * Catch too early calls to dmi_check_system():
+ */
+static int dmi_initialized;
+
 static const char * __init dmi_string_nosave(const struct dmi_header *dm, u8 s)
 {
         const u8 *bp = ((u8 *) dm) + dm->length;
@@ -366,7 +371,7 @@ void __init dmi_scan_machine(void)
 
         if (efi_enabled) {
                 if (efi.smbios == EFI_INVALID_TABLE_ADDR)
-                        goto out;
+                        goto error;
 
                 /* This is called as a core_initcall() because it isn't
                  * needed during early boot.  This also means we can
@@ -374,13 +379,13 @@ void __init dmi_scan_machine(void)
                  */
                 p = dmi_ioremap(efi.smbios, 32);
                 if (p == NULL)
-                        goto out;
+                        goto error;
 
                 rc = dmi_present(p + 0x10); /* offset of _DMI_ string */
                 dmi_iounmap(p, 32);
                 if (!rc) {
                         dmi_available = 1;
-                        return;
+                        goto out;
                 }
         }
         else {
@@ -391,19 +396,22 @@ void __init dmi_scan_machine(void)
                  */
                 p = dmi_ioremap(0xF0000, 0x10000);
                 if (p == NULL)
-                        goto out;
+                        goto error;
 
                 for (q = p; q < p + 0x10000; q += 16) {
                         rc = dmi_present(q);
                         if (!rc) {
                                 dmi_available = 1;
                                 dmi_iounmap(p, 0x10000);
-                                return;
+                                goto out;
                         }
                 }
                 dmi_iounmap(p, 0x10000);
         }
- out:   printk(KERN_INFO "DMI not present or invalid.\n");
+ error:
+        printk(KERN_INFO "DMI not present or invalid.\n");
+ out:
+        dmi_initialized = 1;
 }
 
 /**
@@ -424,6 +432,8 @@ int dmi_check_system(const struct dmi_system_id *list)
         int i, count = 0;
         const struct dmi_system_id *d = list;
 
+        WARN(!dmi_initialized, KERN_ERR "dmi check: not initialized yet.\n");
+
         while (d->ident) {
                 for (i = 0; i < ARRAY_SIZE(d->matches); i++) {
                         int s = d->matches[i].slot;
diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
index b91ef63126ed..deb154aa47c4 100644
--- a/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
@@ -334,9 +334,9 @@ static void ibft_release(struct kobject *kobj)
 /*
  *  Routines for parsing the iBFT data to be human readable.
  */
-ssize_t ibft_attr_show_initiator(struct ibft_kobject *entry,
-                                  struct ibft_attribute *attr,
-                                  char *buf)
+static ssize_t ibft_attr_show_initiator(struct ibft_kobject *entry,
+                                        struct ibft_attribute *attr,
+                                        char *buf)
 {
         struct ibft_initiator *initiator = entry->initiator;
         void *ibft_loc = entry->header;
@@ -376,9 +376,9 @@ ssize_t ibft_attr_show_initiator(struct ibft_kobject *entry,
         return str - buf;
 }
 
-ssize_t ibft_attr_show_nic(struct ibft_kobject *entry,
-                            struct ibft_attribute *attr,
-                            char *buf)
+static ssize_t ibft_attr_show_nic(struct ibft_kobject *entry,
+                                  struct ibft_attribute *attr,
+                                  char *buf)
 {
         struct ibft_nic *nic = entry->nic;
         void *ibft_loc = entry->header;
@@ -440,9 +440,9 @@ ssize_t ibft_attr_show_nic(struct ibft_kobject *entry,
         return str - buf;
 };
 
-ssize_t ibft_attr_show_target(struct ibft_kobject *entry,
-                               struct ibft_attribute *attr,
-                               char *buf)
+static ssize_t ibft_attr_show_target(struct ibft_kobject *entry,
+                                     struct ibft_attribute *attr,
+                                     char *buf)
 {
         struct ibft_tgt *tgt = entry->tgt;
         void *ibft_loc = entry->header;
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 8d2940517c99..9112830107a5 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -67,17 +67,28 @@ static inline void desc_set_label(struct gpio_desc *d, const char *label)
  * when setting direction, and otherwise illegal.  Until board setup code
  * and drivers use explicit requests everywhere (which won't happen when
  * those calls have no teeth) we can't avoid autorequesting.  This nag
- * message should motivate switching to explicit requests...
+ * message should motivate switching to explicit requests... so should
+ * the weaker cleanup after faults, compared to gpio_request().
  */
-static void gpio_ensure_requested(struct gpio_desc *desc)
+static int gpio_ensure_requested(struct gpio_desc *desc, unsigned offset)
 {
         if (test_and_set_bit(FLAG_REQUESTED, &desc->flags) == 0) {
-                pr_warning("GPIO-%d autorequested\n", (int)(desc - gpio_desc));
+                struct gpio_chip *chip = desc->chip;
+                int gpio = chip->base + offset;
+
+                if (!try_module_get(chip->owner)) {
+                        pr_err("GPIO-%d: module can't be gotten \n", gpio);
+                        clear_bit(FLAG_REQUESTED, &desc->flags);
+                        /* lose */
+                        return -EIO;
+                }
+                pr_warning("GPIO-%d autorequested\n", gpio);
                 desc_set_label(desc, "[auto]");
-                if (!try_module_get(desc->chip->owner))
-                        pr_err("GPIO-%d: module can't be gotten \n",
-                                        (int)(desc - gpio_desc));
+                /* caller must chip->request() w/o spinlock */
+                if (chip->request)
+                        return 1;
         }
+        return 0;
 }
 
 /* caller holds gpio_lock *OR* gpio is marked as requested */
@@ -752,6 +763,7 @@ EXPORT_SYMBOL_GPL(gpiochip_remove);
 int gpio_request(unsigned gpio, const char *label)
 {
         struct gpio_desc        *desc;
+        struct gpio_chip        *chip;
         int                     status = -EINVAL;
         unsigned long           flags;
 
@@ -760,14 +772,15 @@ int gpio_request(unsigned gpio, const char *label)
         if (!gpio_is_valid(gpio))
                 goto done;
         desc = &gpio_desc[gpio];
-        if (desc->chip == NULL)
+        chip = desc->chip;
+        if (chip == NULL)
                 goto done;
 
-        if (!try_module_get(desc->chip->owner))
+        if (!try_module_get(chip->owner))
                 goto done;
 
         /* NOTE:  gpio_request() can be called in early boot,
-         * before IRQs are enabled.
+         * before IRQs are enabled, for non-sleeping (SOC) GPIOs.
          */
 
         if (test_and_set_bit(FLAG_REQUESTED, &desc->flags) == 0) {
@@ -775,7 +788,20 @@ int gpio_request(unsigned gpio, const char *label)
                 status = 0;
         } else {
                 status = -EBUSY;
-                module_put(desc->chip->owner);
+                module_put(chip->owner);
+        }
+
+        if (chip->request) {
+                /* chip->request may sleep */
+                spin_unlock_irqrestore(&gpio_lock, flags);
+                status = chip->request(chip, gpio - chip->base);
+                spin_lock_irqsave(&gpio_lock, flags);
+
+                if (status < 0) {
+                        desc_set_label(desc, NULL);
+                        module_put(chip->owner);
+                        clear_bit(FLAG_REQUESTED, &desc->flags);
+                }
         }
 
 done:
@@ -791,6 +817,9 @@ void gpio_free(unsigned gpio)
 {
         unsigned long           flags;
         struct gpio_desc        *desc;
+        struct gpio_chip        *chip;
+
+        might_sleep();
 
         if (!gpio_is_valid(gpio)) {
                 WARN_ON(extra_checks);
@@ -802,9 +831,17 @@ void gpio_free(unsigned gpio)
         spin_lock_irqsave(&gpio_lock, flags);
 
         desc = &gpio_desc[gpio];
-        if (desc->chip && test_and_clear_bit(FLAG_REQUESTED, &desc->flags)) {
+        chip = desc->chip;
+        if (chip && test_bit(FLAG_REQUESTED, &desc->flags)) {
+                if (chip->free) {
+                        spin_unlock_irqrestore(&gpio_lock, flags);
+                        might_sleep_if(extra_checks && chip->can_sleep);
+                        chip->free(chip, gpio - chip->base);
+                        spin_lock_irqsave(&gpio_lock, flags);
+                }
                 desc_set_label(desc, NULL);
                 module_put(desc->chip->owner);
+                clear_bit(FLAG_REQUESTED, &desc->flags);
         } else
                 WARN_ON(extra_checks);
 
@@ -869,7 +906,9 @@ int gpio_direction_input(unsigned gpio)
         gpio -= chip->base;
         if (gpio >= chip->ngpio)
                 goto fail;
-        gpio_ensure_requested(desc);
+        status = gpio_ensure_requested(desc, gpio);
+        if (status < 0)
+                goto fail;
 
         /* now we know the gpio is valid and chip won't vanish */
 
@@ -877,9 +916,22 @@ int gpio_direction_input(unsigned gpio)
 
         might_sleep_if(extra_checks && chip->can_sleep);
 
+        if (status) {
+                status = chip->request(chip, gpio);
+                if (status < 0) {
+                        pr_debug("GPIO-%d: chip request fail, %d\n",
+                                chip->base + gpio, status);
+                        /* and it's not available to anyone else ...
+                         * gpio_request() is the fully clean solution.
+                         */
+                        goto lose;
+                }
+        }
+
         status = chip->direction_input(chip, gpio);
         if (status == 0)
                 clear_bit(FLAG_IS_OUT, &desc->flags);
+lose:
         return status;
 fail:
         spin_unlock_irqrestore(&gpio_lock, flags);
@@ -907,7 +959,9 @@ int gpio_direction_output(unsigned gpio, int value)
         gpio -= chip->base;
         if (gpio >= chip->ngpio)
                 goto fail;
-        gpio_ensure_requested(desc);
+        status = gpio_ensure_requested(desc, gpio);
+        if (status < 0)
+                goto fail;
 
         /* now we know the gpio is valid and chip won't vanish */
 
@@ -915,9 +969,22 @@ int gpio_direction_output(unsigned gpio, int value)
 
         might_sleep_if(extra_checks && chip->can_sleep);
 
+        if (status) {
+                status = chip->request(chip, gpio);
+                if (status < 0) {
+                        pr_debug("GPIO-%d: chip request fail, %d\n",
+                                chip->base + gpio, status);
+                        /* and it's not available to anyone else ...
+                         * gpio_request() is the fully clean solution.
+                         */
+                        goto lose;
+                }
+        }
+
         status = chip->direction_output(chip, gpio, value);
         if (status == 0)
                 set_bit(FLAG_IS_OUT, &desc->flags);
+lose:
         return status;
 fail:
         spin_unlock_irqrestore(&gpio_lock, flags);
@@ -1008,6 +1075,24 @@ int __gpio_cansleep(unsigned gpio)
 }
 EXPORT_SYMBOL_GPL(__gpio_cansleep);
 
+/**
+ * __gpio_to_irq() - return the IRQ corresponding to a GPIO
+ * @gpio: gpio whose IRQ will be returned (already requested)
+ * Context: any
+ *
+ * This is used directly or indirectly to implement gpio_to_irq().
+ * It returns the number of the IRQ signaled by this (input) GPIO,
+ * or a negative errno.
+ */
+int __gpio_to_irq(unsigned gpio)
+{
+        struct gpio_chip        *chip;
+
+        chip = gpio_to_chip(gpio);
+        return chip->to_irq ? chip->to_irq(chip, gpio - chip->base) : -ENXIO;
+}
+EXPORT_SYMBOL_GPL(__gpio_to_irq);
+
 
 
 /* There's no value in making it easy to inline GPIO calls that may sleep.
diff --git a/drivers/gpio/max7301.c b/drivers/gpio/max7301.c
index 39c795ad8312..8b24d784db93 100644
--- a/drivers/gpio/max7301.c
+++ b/drivers/gpio/max7301.c
@@ -255,10 +255,6 @@ static int __devinit max7301_probe(struct spi_device *spi)
         ts->chip.dev = &spi->dev;
         ts->chip.owner = THIS_MODULE;
 
-        ret = gpiochip_add(&ts->chip);
-        if (ret)
-                goto exit_destroy;
-
         /*
          * tristate all pins in hardware and cache the
          * register values for later use.
@@ -269,17 +265,19 @@ static int __devinit max7301_probe(struct spi_device *spi)
                 max7301_write(spi, 0x08 + i, 0xAA);
                 ts->port_config[i] = 0xAA;
                 for (j = 0; j < 4; j++) {
-                        int idx = ts->chip.base + (i - 1) * 4 + j;
-                        ret = gpio_direction_input(idx);
+                        int offset = (i - 1) * 4 + j;
+                        ret = max7301_direction_input(&ts->chip, offset);
                         if (ret)
-                                goto exit_remove;
-                        gpio_free(idx);
+                                goto exit_destroy;
                 }
         }
+
+        ret = gpiochip_add(&ts->chip);
+        if (ret)
+                goto exit_destroy;
+
         return ret;
 
-exit_remove:
-        gpiochip_remove(&ts->chip);
 exit_destroy:
         dev_set_drvdata(&spi->dev, NULL);
         mutex_destroy(&ts->lock);
@@ -325,13 +323,15 @@ static int __init max7301_init(void)
 {
         return spi_register_driver(&max7301_driver);
 }
+/* register after spi postcore initcall and before
+ * subsys initcalls that may rely on these GPIOs
+ */
+subsys_initcall(max7301_init);
 
 static void __exit max7301_exit(void)
 {
         spi_unregister_driver(&max7301_driver);
 }
-
-module_init(max7301_init);
 module_exit(max7301_exit);
 
 MODULE_AUTHOR("Juergen Beisert");
diff --git a/drivers/gpio/max732x.c b/drivers/gpio/max732x.c
index b51c8135ca28..55ae9a41897a 100644
--- a/drivers/gpio/max732x.c
+++ b/drivers/gpio/max732x.c
@@ -372,7 +372,10 @@ static int __init max732x_init(void)
 {
         return i2c_add_driver(&max732x_driver);
 }
-module_init(max732x_init);
+/* register after i2c postcore initcall and before
+ * subsys initcalls that may rely on these GPIOs
+ */
+subsys_initcall(max732x_init);
 
 static void __exit max732x_exit(void)
 {
diff --git a/drivers/gpio/mcp23s08.c b/drivers/gpio/mcp23s08.c
index 8a1b405fefda..89c1d222e9d1 100644
--- a/drivers/gpio/mcp23s08.c
+++ b/drivers/gpio/mcp23s08.c
@@ -419,7 +419,10 @@ static int __init mcp23s08_init(void)
 {
         return spi_register_driver(&mcp23s08_driver);
 }
-module_init(mcp23s08_init);
+/* register after spi postcore initcall and before
+ * subsys initcalls that may rely on these GPIOs
+ */
+subsys_initcall(mcp23s08_init);
 
 static void __exit mcp23s08_exit(void)
 {
diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c
index cc8468692ae0..9ceeb89f1325 100644
--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
@@ -289,7 +289,10 @@ static int __init pca953x_init(void)
 {
         return i2c_add_driver(&pca953x_driver);
 }
-module_init(pca953x_init);
+/* register after i2c postcore initcall and before
+ * subsys initcalls that may rely on these GPIOs
+ */
+subsys_initcall(pca953x_init);
 
 static void __exit pca953x_exit(void)
 {
diff --git a/drivers/gpio/pcf857x.c b/drivers/gpio/pcf857x.c
index fc9c6ae739ee..4bc2070dd4a1 100644
--- a/drivers/gpio/pcf857x.c
+++ b/drivers/gpio/pcf857x.c
@@ -351,7 +351,10 @@ static int __init pcf857x_init(void)
 {
         return i2c_add_driver(&pcf857x_driver);
 }
-module_init(pcf857x_init);
+/* register after i2c postcore initcall and before
+ * subsys initcalls that may rely on these GPIOs
+ */
+subsys_initcall(pcf857x_init);
 
 static void __exit pcf857x_exit(void)
 {
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 88974342933c..9ac4720e647b 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -517,7 +517,7 @@ static int i915_dispatch_flip(struct drm_device * dev)
         RING_LOCALS;
 
         DRM_DEBUG("%s: page=%d pfCurrentPage=%d\n",
-                  __FUNCTION__,
+                  __func__,
                   dev_priv->current_page,
                   dev_priv->sarea_priv->pf_current_page);
 
@@ -642,7 +642,7 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
 static int i915_flip_bufs(struct drm_device *dev, void *data,
                           struct drm_file *file_priv)
 {
-        DRM_DEBUG("%s\n", __FUNCTION__);
+        DRM_DEBUG("%s\n", __func__);
 
         LOCK_TEST_WITH_RETURN(dev, file_priv);
 
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index cacf89e65af4..f5999a91614e 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -67,4 +67,201 @@ config HIDRAW
 
 source "drivers/hid/usbhid/Kconfig"
 
+menu "Special HID drivers"
+        depends on HID
+
+config HID_COMPAT
+        bool "Load all HID drivers on hid core load"
+        default y
+        ---help---
+        Compatible option for older userspace. If you have system without udev
+        support of module loading through aliases and also old
+        module-init-tools which can't handle hid bus, choose Y here. Otherwise
+        say N. If you say N and your userspace is old enough, the only
+        functionality you lose is modules autoloading.
+
+        If unsure, say Y.
+
+config HID_A4TECH
+        tristate "A4 tech" if EMBEDDED
+        depends on USB_HID
+        default y
+        ---help---
+        Support for A4 tech X5 and WOP-35 / Trust 450L mice.
+
+config HID_APPLE
+        tristate "Apple" if EMBEDDED
+        depends on (USB_HID || BT_HIDP)
+        default y
+        ---help---
+        Support for some Apple devices which less or more break
+        HID specification.
+
+        Say Y here if you want support for keyboards of Apple iBooks, PowerBooks,
+        MacBooks, MacBook Pros and Apple Aluminum.
+
+config HID_BELKIN
+        tristate "Belkin" if EMBEDDED
+        depends on USB_HID
+        default y
+        ---help---
+        Support for Belkin Flip KVM and Wireless keyboard.
+
+config HID_BRIGHT
+        tristate "Bright" if EMBEDDED
+        depends on USB_HID
+        default y
+        ---help---
+        Support for Bright ABNT-2 keyboard.
+
+config HID_CHERRY
+        tristate "Cherry" if EMBEDDED
+        depends on USB_HID
+        default y
+        ---help---
+        Support for Cherry Cymotion keyboard.
+
+config HID_CHICONY
+        tristate "Chicony" if EMBEDDED
+        depends on USB_HID
+        default y
+        ---help---
+        Support for Chicony Tactical pad.
+
+config HID_CYPRESS
+        tristate "Cypress" if EMBEDDED
+        depends on USB_HID
+        default y
+        ---help---
+        Support for cypress mouse and barcode readers.
+
+config HID_DELL
+        tristate "Dell" if EMBEDDED
+        depends on USB_HID
+        default y
+        ---help---
+        Support for quirky Dell HID hardware that require
+        special LED handling (W7658 and SK8115 models)
+
+config HID_EZKEY
+        tristate "Ezkey" if EMBEDDED
+        depends on USB_HID
+        default y
+        ---help---
+        Support for Ezkey BTC 8193 keyboard.
+
+config HID_GYRATION
+        tristate "Gyration" if EMBEDDED
+        depends on USB_HID
+        default y
+        ---help---
+        Support for Gyration remote control.
+
+config HID_LOGITECH
+        tristate "Logitech" if EMBEDDED
+        depends on USB_HID
+        default y
+        ---help---
+        Support for Logitech devices that are not fully compliant with HID standard.
+
+config LOGITECH_FF
+        bool "Logitech force feedback"
+        depends on HID_LOGITECH
+        select INPUT_FF_MEMLESS
+        help
+          Say Y here if you have one of these devices:
+          - Logitech WingMan Cordless RumblePad
+          - Logitech WingMan Cordless RumblePad 2
+          - Logitech WingMan Force 3D
+          - Logitech Formula Force EX
+          - Logitech MOMO Force wheel
+
+          and if you want to enable force feedback for them.
+          Note: if you say N here, this device will still be supported, but without
+          force feedback.
+
+config LOGIRUMBLEPAD2_FF
+        bool "Logitech Rumblepad 2 force feedback"
+        depends on HID_LOGITECH
+        select INPUT_FF_MEMLESS
+        help
+          Say Y here if you want to enable force feedback support for Logitech
+          Rumblepad 2 devices.
+
+config HID_MICROSOFT
+        tristate "Microsoft" if EMBEDDED
+        depends on USB_HID
+        default y
+        ---help---
+        Support for Microsoft devices that are not fully compliant with HID standard.
+
+config HID_MONTEREY
+        tristate "Monterey" if EMBEDDED
+        depends on USB_HID
+        default y
+        ---help---
+        Support for Monterey Genius KB29E.
+
+config HID_PANTHERLORD
+        tristate "Pantherlord devices support" if EMBEDDED
+        depends on USB_HID
+        default y
+        ---help---
+        Support for PantherLord/GreenAsia based device support.
+
+config PANTHERLORD_FF
+        bool "Pantherlord force feedback support"
+        depends on HID_PANTHERLORD
+        select INPUT_FF_MEMLESS
+        help
+          Say Y here if you have a PantherLord/GreenAsia based game controller
+          or adapter and want to enable force feedback support for it.
+
+config HID_PETALYNX
+        tristate "Petalynx" if EMBEDDED
+        depends on USB_HID
+        default y
+        ---help---
+        Support for Petalynx Maxter remote control.
+
+config HID_SAMSUNG
+        tristate "Samsung" if EMBEDDED
+        depends on USB_HID
+        default y
+        ---help---
+        Support for Samsung InfraRed remote control.
+
+config HID_SONY
+        tristate "Sony" if EMBEDDED
+        depends on USB_HID
+        default y
+        ---help---
+        Support for Sony PS3 controller.
+
+config HID_SUNPLUS
+        tristate "Sunplus" if EMBEDDED
+        depends on USB_HID
+        default y
+        ---help---
+        Support for Sunplus wireless desktop.
+
+config THRUSTMASTER_FF
+        tristate "ThrustMaster devices support"
+        default m
+        depends on USB_HID
+        select INPUT_FF_MEMLESS
+        help
+          Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or
+          a THRUSTMASTER Ferrari GT Rumble Force or Force Feedback Wheel.
+
+config ZEROPLUS_FF
+        tristate "Zeroplus based game controller support"
+        default m
+        depends on USB_HID
+        select INPUT_FF_MEMLESS
+        help
+          Say Y here if you have a Zeroplus based game controller.
+
+endmenu
+
 endif # HID_SUPPORT
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 275dc522c738..b09e43e7413e 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -1,13 +1,46 @@
 #
 # Makefile for the HID driver
 #
-hid-objs                        := hid-core.o hid-input.o hid-input-quirks.o
+hid-objs                        := hid-core.o hid-input.o
 
 obj-$(CONFIG_HID)               += hid.o
 
 hid-$(CONFIG_HID_DEBUG)         += hid-debug.o
 hid-$(CONFIG_HIDRAW)            += hidraw.o
 
+ifdef CONFIG_HID_COMPAT
+obj-m                           += hid-dummy.o
+endif
+
+hid-logitech-objs               := hid-lg.o
+ifdef CONFIG_LOGITECH_FF
+        hid-logitech-objs       += hid-lgff.o
+endif
+ifdef CONFIG_LOGIRUMBLEPAD2_FF
+        hid-logitech-objs       += hid-lg2ff.o
+endif
+
+obj-$(CONFIG_HID_A4TECH)        += hid-a4tech.o
+obj-$(CONFIG_HID_APPLE)         += hid-apple.o
+obj-$(CONFIG_HID_BELKIN)        += hid-belkin.o
+obj-$(CONFIG_HID_BRIGHT)        += hid-bright.o
+obj-$(CONFIG_HID_CHERRY)        += hid-cherry.o
+obj-$(CONFIG_HID_CHICONY)       += hid-chicony.o
+obj-$(CONFIG_HID_CYPRESS)       += hid-cypress.o
+obj-$(CONFIG_HID_DELL)          += hid-dell.o
+obj-$(CONFIG_HID_EZKEY)         += hid-ezkey.o
+obj-$(CONFIG_HID_GYRATION)      += hid-gyration.o
+obj-$(CONFIG_HID_LOGITECH)      += hid-logitech.o
+obj-$(CONFIG_HID_MICROSOFT)     += hid-microsoft.o
+obj-$(CONFIG_HID_MONTEREY)      += hid-monterey.o
+obj-$(CONFIG_HID_PANTHERLORD)   += hid-pl.o
+obj-$(CONFIG_HID_PETALYNX)      += hid-petalynx.o
+obj-$(CONFIG_HID_SAMSUNG)       += hid-samsung.o
+obj-$(CONFIG_HID_SONY)          += hid-sony.o
+obj-$(CONFIG_HID_SUNPLUS)       += hid-sunplus.o
+obj-$(CONFIG_THRUSTMASTER_FF)   += hid-tmff.o
+obj-$(CONFIG_ZEROPLUS_FF)       += hid-zpff.o
+
 obj-$(CONFIG_USB_HID)           += usbhid/
 obj-$(CONFIG_USB_MOUSE)         += usbhid/
 obj-$(CONFIG_USB_KBD)           += usbhid/
diff --git a/drivers/hid/hid-a4tech.c b/drivers/hid/hid-a4tech.c
new file mode 100644
index 000000000000..ebca00e6c103
--- /dev/null
+++ b/drivers/hid/hid-a4tech.c
@@ -0,0 +1,162 @@
+/*
+ *  HID driver for some a4tech "special" devices
+ *
+ *  Copyright (c) 1999 Andreas Gal
+ *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
+ *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
+ *  Copyright (c) 2006-2007 Jiri Kosina
+ *  Copyright (c) 2007 Paul Walmsley
+ *  Copyright (c) 2008 Jiri Slaby
+ */
+
+/*
+ * 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.
+ */
+
+#include <linux/device.h>
+#include <linux/input.h>
+#include <linux/hid.h>
+#include <linux/module.h>
+
+#include "hid-ids.h"
+
+#define A4_2WHEEL_MOUSE_HACK_7  0x01
+#define A4_2WHEEL_MOUSE_HACK_B8 0x02
+
+struct a4tech_sc {
+        unsigned long quirks;
+        unsigned int hw_wheel;
+        __s32 delayed_value;
+};
+
+static int a4_input_mapped(struct hid_device *hdev, struct hid_input *hi,
+                struct hid_field *field, struct hid_usage *usage,
+                unsigned long **bit, int *max)
+{
+        struct a4tech_sc *a4 = hid_get_drvdata(hdev);
+
+        if (usage->type == EV_REL && usage->code == REL_WHEEL)
+                set_bit(REL_HWHEEL, *bit);
+
+        if ((a4->quirks & A4_2WHEEL_MOUSE_HACK_7) && usage->hid == 0x00090007)
+                return -1;
+
+        return 0;
+}
+
+static int a4_event(struct hid_device *hdev, struct hid_field *field,
+                struct hid_usage *usage, __s32 value)
+{
+        struct a4tech_sc *a4 = hid_get_drvdata(hdev);
+        struct input_dev *input;
+
+        if (!(hdev->claimed & HID_CLAIMED_INPUT) || !field->hidinput ||
+                        !usage->type)
+                return 0;
+
+        input = field->hidinput->input;
+
+        if (a4->quirks & A4_2WHEEL_MOUSE_HACK_B8) {
+                if (usage->type == EV_REL && usage->code == REL_WHEEL) {
+                        a4->delayed_value = value;
+                        return 1;
+                }
+
+                if (usage->hid == 0x000100b8) {
+                        input_event(input, EV_REL, value ? REL_HWHEEL :
+                                        REL_WHEEL, a4->delayed_value);
+                        return 1;
+                }
+        }
+
+        if ((a4->quirks & A4_2WHEEL_MOUSE_HACK_7) && usage->hid == 0x00090007) {
+                a4->hw_wheel = !!value;
+                return 1;
+        }
+
+        if (usage->code == REL_WHEEL && a4->hw_wheel) {
+                input_event(input, usage->type, REL_HWHEEL, value);
+                return 1;
+        }
+
+        return 0;
+}
+
+static int a4_probe(struct hid_device *hdev, const struct hid_device_id *id)
+{
+        struct a4tech_sc *a4;
+        int ret;
+
+        a4 = kzalloc(sizeof(*a4), GFP_KERNEL);
+        if (a4 == NULL) {
+                dev_err(&hdev->dev, "can't alloc device descriptor\n");
+                ret = -ENOMEM;
+                goto err_free;
+        }
+
+        a4->quirks = id->driver_data;
+
+        hid_set_drvdata(hdev, a4);
+
+        ret = hid_parse(hdev);
+        if (ret) {
+                dev_err(&hdev->dev, "parse failed\n");
+                goto err_free;
+        }
+
+        ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
+        if (ret) {
+                dev_err(&hdev->dev, "hw start failed\n");
+                goto err_free;
+        }
+
+        return 0;
+err_free:
+        kfree(a4);
+        return ret;
+}
+
+static void a4_remove(struct hid_device *hdev)
+{
+        struct a4tech_sc *a4 = hid_get_drvdata(hdev);
+
+        hid_hw_stop(hdev);
+        kfree(a4);
+}
+
+static const struct hid_device_id a4_devices[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU),
+                .driver_data = A4_2WHEEL_MOUSE_HACK_7 },
+        { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D),
+                .driver_data = A4_2WHEEL_MOUSE_HACK_B8 },
+        { }
+};
+MODULE_DEVICE_TABLE(hid, a4_devices);
+
+static struct hid_driver a4_driver = {
+        .name = "a4tech",
+        .id_table = a4_devices,
+        .input_mapped = a4_input_mapped,
+        .event = a4_event,
+        .probe = a4_probe,
+        .remove = a4_remove,
+};
+
+static int a4_init(void)
+{
+        return hid_register_driver(&a4_driver);
+}
+
+static void a4_exit(void)
+{
+        hid_unregister_driver(&a4_driver);
+}
+
+module_init(a4_init);
+module_exit(a4_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(a4tech);
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
new file mode 100644
index 000000000000..fd7f896b34f7
--- /dev/null
+++ b/drivers/hid/hid-apple.c
@@ -0,0 +1,484 @@
+/*
+ *  USB HID quirks support for Linux
+ *
+ *  Copyright (c) 1999 Andreas Gal
+ *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
+ *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
+ *  Copyright (c) 2006-2007 Jiri Kosina
+ *  Copyright (c) 2007 Paul Walmsley
+ *  Copyright (c) 2008 Jiri Slaby <jirislaby@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 the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ */
+
+#include <linux/device.h>
+#include <linux/hid.h>
+#include <linux/module.h>
+#include <linux/usb.h>
+
+#include "hid-ids.h"
+
+#define APPLE_RDESC_JIS         0x0001
+#define APPLE_IGNORE_MOUSE      0x0002
+#define APPLE_HAS_FN            0x0004
+#define APPLE_HIDDEV            0x0008
+#define APPLE_ISO_KEYBOARD      0x0010
+#define APPLE_MIGHTYMOUSE       0x0020
+#define APPLE_INVERT_HWHEEL     0x0040
+#define APPLE_IGNORE_HIDINPUT   0x0080
+#define APPLE_NUMLOCK_EMULATION 0x0100
+
+#define APPLE_FLAG_FKEY         0x01
+
+static unsigned int fnmode = 1;
+module_param(fnmode, uint, 0644);
+MODULE_PARM_DESC(fnmode, "Mode of fn key on Apple keyboards (0 = disabled, "
+                "[1] = fkeyslast, 2 = fkeysfirst)");
+
+struct apple_sc {
+        unsigned long quirks;
+        unsigned int fn_on;
+        DECLARE_BITMAP(pressed_fn, KEY_CNT);
+        DECLARE_BITMAP(pressed_numlock, KEY_CNT);
+};
+
+struct apple_key_translation {
+        u16 from;
+        u16 to;
+        u8 flags;
+};
+
+static struct apple_key_translation apple_fn_keys[] = {
+        { KEY_BACKSPACE, KEY_DELETE },
+        { KEY_F1,       KEY_BRIGHTNESSDOWN, APPLE_FLAG_FKEY },
+        { KEY_F2,       KEY_BRIGHTNESSUP,   APPLE_FLAG_FKEY },
+        { KEY_F3,       KEY_FN_F5,          APPLE_FLAG_FKEY }, /* Exposé */
+        { KEY_F4,       KEY_FN_F4,          APPLE_FLAG_FKEY }, /* Dashboard */
+        { KEY_F5,       KEY_KBDILLUMDOWN,   APPLE_FLAG_FKEY },
+        { KEY_F6,       KEY_KBDILLUMUP,     APPLE_FLAG_FKEY },
+        { KEY_F7,       KEY_PREVIOUSSONG,   APPLE_FLAG_FKEY },
+        { KEY_F8,       KEY_PLAYPAUSE,      APPLE_FLAG_FKEY },
+        { KEY_F9,       KEY_NEXTSONG,       APPLE_FLAG_FKEY },
+        { KEY_F10,      KEY_MUTE,           APPLE_FLAG_FKEY },
+        { KEY_F11,      KEY_VOLUMEDOWN,     APPLE_FLAG_FKEY },
+        { KEY_F12,      KEY_VOLUMEUP,       APPLE_FLAG_FKEY },
+        { KEY_UP,       KEY_PAGEUP },
+        { KEY_DOWN,     KEY_PAGEDOWN },
+        { KEY_LEFT,     KEY_HOME },
+        { KEY_RIGHT,    KEY_END },
+        { }
+};
+
+static struct apple_key_translation powerbook_fn_keys[] = {
+        { KEY_BACKSPACE, KEY_DELETE },
+        { KEY_F1,       KEY_BRIGHTNESSDOWN,     APPLE_FLAG_FKEY },
+        { KEY_F2,       KEY_BRIGHTNESSUP,       APPLE_FLAG_FKEY },
+        { KEY_F3,       KEY_MUTE,               APPLE_FLAG_FKEY },
+        { KEY_F4,       KEY_VOLUMEDOWN,         APPLE_FLAG_FKEY },
+        { KEY_F5,       KEY_VOLUMEUP,           APPLE_FLAG_FKEY },
+        { KEY_F6,       KEY_NUMLOCK,            APPLE_FLAG_FKEY },
+        { KEY_F7,       KEY_SWITCHVIDEOMODE,    APPLE_FLAG_FKEY },
+        { KEY_F8,       KEY_KBDILLUMTOGGLE,     APPLE_FLAG_FKEY },
+        { KEY_F9,       KEY_KBDILLUMDOWN,       APPLE_FLAG_FKEY },
+        { KEY_F10,      KEY_KBDILLUMUP,         APPLE_FLAG_FKEY },
+        { KEY_UP,       KEY_PAGEUP },
+        { KEY_DOWN,     KEY_PAGEDOWN },
+        { KEY_LEFT,     KEY_HOME },
+        { KEY_RIGHT,    KEY_END },
+        { }
+};
+
+static struct apple_key_translation powerbook_numlock_keys[] = {
+        { KEY_J,        KEY_KP1 },
+        { KEY_K,        KEY_KP2 },
+        { KEY_L,        KEY_KP3 },
+        { KEY_U,        KEY_KP4 },
+        { KEY_I,        KEY_KP5 },
+        { KEY_O,        KEY_KP6 },
+        { KEY_7,        KEY_KP7 },
+        { KEY_8,        KEY_KP8 },
+        { KEY_9,        KEY_KP9 },
+        { KEY_M,        KEY_KP0 },
+        { KEY_DOT,      KEY_KPDOT },
+        { KEY_SLASH,    KEY_KPPLUS },
+        { KEY_SEMICOLON, KEY_KPMINUS },
+        { KEY_P,        KEY_KPASTERISK },
+        { KEY_MINUS,    KEY_KPEQUAL },
+        { KEY_0,        KEY_KPSLASH },
+        { KEY_F6,       KEY_NUMLOCK },
+        { KEY_KPENTER,  KEY_KPENTER },
+        { KEY_BACKSPACE, KEY_BACKSPACE },
+        { }
+};
+
+static struct apple_key_translation apple_iso_keyboard[] = {
+        { KEY_GRAVE,    KEY_102ND },
+        { KEY_102ND,    KEY_GRAVE },
+        { }
+};
+
+static struct apple_key_translation *apple_find_translation(
+                struct apple_key_translation *table, u16 from)
+{
+        struct apple_key_translation *trans;
+
+        /* Look for the translation */
+        for (trans = table; trans->from; trans++)
+                if (trans->from == from)
+                        return trans;
+
+        return NULL;
+}
+
+static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
+                struct hid_usage *usage, __s32 value)
+{
+        struct apple_sc *asc = hid_get_drvdata(hid);
+        struct apple_key_translation *trans;
+
+        if (usage->code == KEY_FN) {
+                asc->fn_on = !!value;
+                input_event(input, usage->type, usage->code, value);
+                return 1;
+        }
+
+        if (fnmode) {
+                int do_translate;
+
+                trans = apple_find_translation((hid->product < 0x220 ||
+                                        hid->product >= 0x300) ?
+                                        powerbook_fn_keys : apple_fn_keys,
+                                        usage->code);
+                if (trans) {
+                        if (test_bit(usage->code, asc->pressed_fn))
+                                do_translate = 1;
+                        else if (trans->flags & APPLE_FLAG_FKEY)
+                                do_translate = (fnmode == 2 && asc->fn_on) ||
+                                        (fnmode == 1 && !asc->fn_on);
+                        else
+                                do_translate = asc->fn_on;
+
+                        if (do_translate) {
+                                if (value)
+                                        set_bit(usage->code, asc->pressed_fn);
+                                else
+                                        clear_bit(usage->code, asc->pressed_fn);
+
+                                input_event(input, usage->type, trans->to,
+                                                value);
+
+                                return 1;
+                        }
+                }
+
+                if (asc->quirks & APPLE_NUMLOCK_EMULATION &&
+                                (test_bit(usage->code, asc->pressed_numlock) ||
+                                test_bit(LED_NUML, input->led))) {
+                        trans = apple_find_translation(powerbook_numlock_keys,
+                                        usage->code);
+
+                        if (trans) {
+                                if (value)
+                                        set_bit(usage->code,
+                                                        asc->pressed_numlock);
+                                else
+                                        clear_bit(usage->code,
+                                                        asc->pressed_numlock);
+
+                                input_event(input, usage->type, trans->to,
+                                                value);
+                        }
+
+                        return 1;
+                }
+        }
+
+        if (asc->quirks & APPLE_ISO_KEYBOARD) {
+                trans = apple_find_translation(apple_iso_keyboard, usage->code);
+                if (trans) {
+                        input_event(input, usage->type, trans->to, value);
+                        return 1;
+                }
+        }
+
+        return 0;
+}
+
+static int apple_event(struct hid_device *hdev, struct hid_field *field,
+                struct hid_usage *usage, __s32 value)
+{
+        struct apple_sc *asc = hid_get_drvdata(hdev);
+
+        if (!(hdev->claimed & HID_CLAIMED_INPUT) || !field->hidinput ||
+                        !usage->type)
+                return 0;
+
+        if ((asc->quirks & APPLE_INVERT_HWHEEL) &&
+                        usage->code == REL_HWHEEL) {
+                input_event(field->hidinput->input, usage->type, usage->code,
+                                -value);
+                return 1;
+        }
+
+        if ((asc->quirks & APPLE_HAS_FN) &&
+                        hidinput_apple_event(hdev, field->hidinput->input,
+                                usage, value))
+                return 1;
+
+
+        return 0;
+}
+
+/*
+ * MacBook JIS keyboard has wrong logical maximum
+ */
+static void apple_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+                unsigned int rsize)
+{
+        struct apple_sc *asc = hid_get_drvdata(hdev);
+
+        if ((asc->quirks & APPLE_RDESC_JIS) && rsize >= 60 &&
+                        rdesc[53] == 0x65 && rdesc[59] == 0x65) {
+                dev_info(&hdev->dev, "fixing up MacBook JIS keyboard report "
+                                "descriptor\n");
+                rdesc[53] = rdesc[59] = 0xe7;
+        }
+}
+
+static void apple_setup_input(struct input_dev *input)
+{
+        struct apple_key_translation *trans;
+
+        set_bit(KEY_NUMLOCK, input->keybit);
+
+        /* Enable all needed keys */
+        for (trans = apple_fn_keys; trans->from; trans++)
+                set_bit(trans->to, input->keybit);
+
+        for (trans = powerbook_fn_keys; trans->from; trans++)
+                set_bit(trans->to, input->keybit);
+
+        for (trans = powerbook_numlock_keys; trans->from; trans++)
+                set_bit(trans->to, input->keybit);
+
+        for (trans = apple_iso_keyboard; trans->from; trans++)
+                set_bit(trans->to, input->keybit);
+}
+
+static int apple_input_mapping(struct hid_device *hdev, struct hid_input *hi,
+                struct hid_field *field, struct hid_usage *usage,
+                unsigned long **bit, int *max)
+{
+        if (usage->hid == (HID_UP_CUSTOM | 0x0003)) {
+                /* The fn key on Apple USB keyboards */
+                set_bit(EV_REP, hi->input->evbit);
+                hid_map_usage_clear(hi, usage, bit, max, EV_KEY, KEY_FN);
+                apple_setup_input(hi->input);
+                return 1;
+        }
+
+        /* we want the hid layer to go through standard path (set and ignore) */
+        return 0;
+}
+
+static int apple_input_mapped(struct hid_device *hdev, struct hid_input *hi,
+                struct hid_field *field, struct hid_usage *usage,
+                unsigned long **bit, int *max)
+{
+        struct apple_sc *asc = hid_get_drvdata(hdev);
+
+        if (asc->quirks & APPLE_MIGHTYMOUSE) {
+                if (usage->hid == HID_GD_Z)
+                        hid_map_usage(hi, usage, bit, max, EV_REL, REL_HWHEEL);
+                else if (usage->code == BTN_1)
+                        hid_map_usage(hi, usage, bit, max, EV_KEY, BTN_2);
+                else if (usage->code == BTN_2)
+                        hid_map_usage(hi, usage, bit, max, EV_KEY, BTN_1);
+        }
+
+        return 0;
+}
+
+static int apple_probe(struct hid_device *hdev,
+                const struct hid_device_id *id)
+{
+        unsigned long quirks = id->driver_data;
+        struct apple_sc *asc;
+        unsigned int connect_mask = HID_CONNECT_DEFAULT;
+        int ret;
+
+        /* return something else or move to hid layer? device will reside
+           allocated */
+        if (id->bus == BUS_USB && (quirks & APPLE_IGNORE_MOUSE) &&
+                        to_usb_interface(hdev->dev.parent)->cur_altsetting->
+                        desc.bInterfaceProtocol == USB_INTERFACE_PROTOCOL_MOUSE)
+                return -ENODEV;
+
+        asc = kzalloc(sizeof(*asc), GFP_KERNEL);
+        if (asc == NULL) {
+                dev_err(&hdev->dev, "can't alloc apple descriptor\n");
+                return -ENOMEM;
+        }
+
+        asc->quirks = quirks;
+
+        hid_set_drvdata(hdev, asc);
+
+        ret = hid_parse(hdev);
+        if (ret) {
+                dev_err(&hdev->dev, "parse failed\n");
+                goto err_free;
+        }
+
+        if (quirks & APPLE_HIDDEV)
+                connect_mask |= HID_CONNECT_HIDDEV_FORCE;
+        if (quirks & APPLE_IGNORE_HIDINPUT)
+                connect_mask &= ~HID_CONNECT_HIDINPUT;
+
+        ret = hid_hw_start(hdev, connect_mask);
+        if (ret) {
+                dev_err(&hdev->dev, "hw start failed\n");
+                goto err_free;
+        }
+
+        return 0;
+err_free:
+        kfree(asc);
+        return ret;
+}
+
+static void apple_remove(struct hid_device *hdev)
+{
+        hid_hw_stop(hdev);
+        kfree(hid_get_drvdata(hdev));
+}
+
+static const struct hid_device_id apple_devices[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL),
+                .driver_data = APPLE_HIDDEV | APPLE_IGNORE_HIDINPUT },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4),
+                .driver_data = APPLE_HIDDEV | APPLE_IGNORE_HIDINPUT },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE),
+                .driver_data = APPLE_MIGHTYMOUSE | APPLE_INVERT_HWHEEL },
+
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI),
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+                        APPLE_IGNORE_MOUSE },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ISO),
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+                        APPLE_IGNORE_MOUSE },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI),
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+                        APPLE_IGNORE_MOUSE },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO),
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+                        APPLE_IGNORE_MOUSE | APPLE_ISO_KEYBOARD },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS),
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+                        APPLE_IGNORE_MOUSE },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI),
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+                        APPLE_IGNORE_MOUSE },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO),
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+                        APPLE_IGNORE_MOUSE | APPLE_ISO_KEYBOARD },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS),
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+                        APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI),
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+                        APPLE_IGNORE_MOUSE },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO),
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+                        APPLE_IGNORE_MOUSE | APPLE_ISO_KEYBOARD },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS),
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+                        APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS},
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI),
+                .driver_data = APPLE_HAS_FN },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO),
+                .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS),
+                .driver_data = APPLE_HAS_FN },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI),
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+                        APPLE_IGNORE_MOUSE },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO),
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+                        APPLE_IGNORE_MOUSE },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS),
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+                        APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI),
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO),
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+                        APPLE_ISO_KEYBOARD },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS),
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),
+                .driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO),
+                .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD |
+                        APPLE_IGNORE_MOUSE },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS),
+                .driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI),
+                .driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO),
+                .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD |
+                        APPLE_IGNORE_MOUSE },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS),
+                .driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY),
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+                        APPLE_IGNORE_MOUSE },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY),
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+                        APPLE_IGNORE_MOUSE },
+
+        /* Apple wireless Mighty Mouse */
+        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, 0x030c),
+                .driver_data = APPLE_MIGHTYMOUSE | APPLE_INVERT_HWHEEL },
+
+        { }
+};
+MODULE_DEVICE_TABLE(hid, apple_devices);
+
+static struct hid_driver apple_driver = {
+        .name = "apple",
+        .id_table = apple_devices,
+        .report_fixup = apple_report_fixup,
+        .probe = apple_probe,
+        .remove = apple_remove,
+        .event = apple_event,
+        .input_mapping = apple_input_mapping,
+        .input_mapped = apple_input_mapped,
+};
+
+static int apple_init(void)
+{
+        int ret;
+
+        ret = hid_register_driver(&apple_driver);
+        if (ret)
+                printk(KERN_ERR "can't register apple driver\n");
+
+        return ret;
+}
+
+static void apple_exit(void)
+{
+        hid_unregister_driver(&apple_driver);
+}
+
+module_init(apple_init);
+module_exit(apple_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(apple);
diff --git a/drivers/hid/hid-belkin.c b/drivers/hid/hid-belkin.c
new file mode 100644
index 000000000000..12c8a9ba6ed6
--- /dev/null
+++ b/drivers/hid/hid-belkin.c
@@ -0,0 +1,105 @@
+/*
+ *  HID driver for some belkin "special" devices
+ *
+ *  Copyright (c) 1999 Andreas Gal
+ *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
+ *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
+ *  Copyright (c) 2006-2007 Jiri Kosina
+ *  Copyright (c) 2007 Paul Walmsley
+ *  Copyright (c) 2008 Jiri Slaby
+ */
+
+/*
+ * 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.
+ */
+
+#include <linux/device.h>
+#include <linux/hid.h>
+#include <linux/module.h>
+
+#include "hid-ids.h"
+
+#define BELKIN_HIDDEV   0x01
+#define BELKIN_WKBD     0x02
+
+#define belkin_map_key_clear(c) hid_map_usage_clear(hi, usage, bit, max, \
+                                        EV_KEY, (c))
+static int belkin_input_mapping(struct hid_device *hdev, struct hid_input *hi,
+                struct hid_field *field, struct hid_usage *usage,
+                unsigned long **bit, int *max)
+{
+        unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);
+
+        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER ||
+                        !(quirks & BELKIN_WKBD))
+                return 0;
+
+        switch (usage->hid & HID_USAGE) {
+        case 0x03a: belkin_map_key_clear(KEY_SOUND);            break;
+        case 0x03b: belkin_map_key_clear(KEY_CAMERA);           break;
+        case 0x03c: belkin_map_key_clear(KEY_DOCUMENTS);        break;
+        default:
+                return 0;
+        }
+        return 1;
+}
+
+static int belkin_probe(struct hid_device *hdev, const struct hid_device_id *id)
+{
+        unsigned long quirks = id->driver_data;
+        int ret;
+
+        hid_set_drvdata(hdev, (void *)quirks);
+
+        ret = hid_parse(hdev);
+        if (ret) {
+                dev_err(&hdev->dev, "parse failed\n");
+                goto err_free;
+        }
+
+        ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT |
+                ((quirks & BELKIN_HIDDEV) ? HID_CONNECT_HIDDEV_FORCE : 0));
+        if (ret) {
+                dev_err(&hdev->dev, "hw start failed\n");
+                goto err_free;
+        }
+
+        return 0;
+err_free:
+        return ret;
+}
+
+static const struct hid_device_id belkin_devices[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM),
+                .driver_data = BELKIN_HIDDEV },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD),
+                .driver_data = BELKIN_WKBD },
+        { }
+};
+MODULE_DEVICE_TABLE(hid, belkin_devices);
+
+static struct hid_driver belkin_driver = {
+        .name = "belkin",
+        .id_table = belkin_devices,
+        .input_mapping = belkin_input_mapping,
+        .probe = belkin_probe,
+};
+
+static int belkin_init(void)
+{
+        return hid_register_driver(&belkin_driver);
+}
+
+static void belkin_exit(void)
+{
+        hid_unregister_driver(&belkin_driver);
+}
+
+module_init(belkin_init);
+module_exit(belkin_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(belkin);
diff --git a/drivers/hid/hid-bright.c b/drivers/hid/hid-bright.c
new file mode 100644
index 000000000000..38517a117dfd
--- /dev/null
+++ b/drivers/hid/hid-bright.c
@@ -0,0 +1,71 @@
+/*
+ *  HID driver for some bright "special" devices
+ *
+ *  Copyright (c) 2008 Mauro Carvalho Chehab <mchehab@redhat.com>
+ *
+ * Based on hid-dell 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.
+ */
+
+#include <linux/device.h>
+#include <linux/hid.h>
+#include <linux/module.h>
+
+#include "hid-ids.h"
+
+static int bright_probe(struct hid_device *hdev, const struct hid_device_id *id)
+{
+        int ret;
+
+        ret = hid_parse(hdev);
+        if (ret) {
+                dev_err(&hdev->dev, "parse failed\n");
+                goto err_free;
+        }
+
+        ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
+        if (ret) {
+                dev_err(&hdev->dev, "hw start failed\n");
+                goto err_free;
+        }
+
+        usbhid_set_leds(hdev);
+
+        return 0;
+err_free:
+        return ret;
+}
+
+static const struct hid_device_id bright_devices[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_BRIGHT, USB_DEVICE_ID_BRIGHT_ABNT2) },
+        { }
+};
+MODULE_DEVICE_TABLE(hid, bright_devices);
+
+static struct hid_driver bright_driver = {
+        .name = "bright",
+        .id_table = bright_devices,
+        .probe = bright_probe,
+};
+
+static int bright_init(void)
+{
+        return hid_register_driver(&bright_driver);
+}
+
+static void bright_exit(void)
+{
+        hid_unregister_driver(&bright_driver);
+}
+
+module_init(bright_init);
+module_exit(bright_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(bright);
diff --git a/drivers/hid/hid-cherry.c b/drivers/hid/hid-cherry.c
new file mode 100644
index 000000000000..b833b9769aba
--- /dev/null
+++ b/drivers/hid/hid-cherry.c
@@ -0,0 +1,87 @@
+/*
+ *  HID driver for some cherry "special" devices
+ *
+ *  Copyright (c) 1999 Andreas Gal
+ *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
+ *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
+ *  Copyright (c) 2006-2007 Jiri Kosina
+ *  Copyright (c) 2007 Paul Walmsley
+ *  Copyright (c) 2008 Jiri Slaby
+ */
+
+/*
+ * 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.
+ */
+
+#include <linux/device.h>
+#include <linux/hid.h>
+#include <linux/module.h>
+
+#include "hid-ids.h"
+
+/*
+ * Cherry Cymotion keyboard have an invalid HID report descriptor,
+ * that needs fixing before we can parse it.
+ */
+static void ch_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+                unsigned int rsize)
+{
+        if (rsize >= 17 && rdesc[11] == 0x3c && rdesc[12] == 0x02) {
+                dev_info(&hdev->dev, "fixing up Cherry Cymotion report "
+                                "descriptor\n");
+                rdesc[11] = rdesc[16] = 0xff;
+                rdesc[12] = rdesc[17] = 0x03;
+        }
+}
+
+#define ch_map_key_clear(c)     hid_map_usage_clear(hi, usage, bit, max, \
+                                        EV_KEY, (c))
+static int ch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
+                struct hid_field *field, struct hid_usage *usage,
+                unsigned long **bit, int *max)
+{
+        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
+                return 0;
+
+        switch (usage->hid & HID_USAGE) {
+        case 0x301: ch_map_key_clear(KEY_PROG1);        break;
+        case 0x302: ch_map_key_clear(KEY_PROG2);        break;
+        case 0x303: ch_map_key_clear(KEY_PROG3);        break;
+        default:
+                return 0;
+        }
+
+        return 1;
+}
+
+static const struct hid_device_id ch_devices[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },
+        { }
+};
+MODULE_DEVICE_TABLE(hid, ch_devices);
+
+static struct hid_driver ch_driver = {
+        .name = "cherry",
+        .id_table = ch_devices,
+        .report_fixup = ch_report_fixup,
+        .input_mapping = ch_input_mapping,
+};
+
+static int ch_init(void)
+{
+        return hid_register_driver(&ch_driver);
+}
+
+static void ch_exit(void)
+{
+        hid_unregister_driver(&ch_driver);
+}
+
+module_init(ch_init);
+module_exit(ch_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(cherry);
diff --git a/drivers/hid/hid-chicony.c b/drivers/hid/hid-chicony.c
new file mode 100644
index 000000000000..a54d4096e0f7
--- /dev/null
+++ b/drivers/hid/hid-chicony.c
@@ -0,0 +1,80 @@
+/*
+ *  HID driver for some chicony "special" devices
+ *
+ *  Copyright (c) 1999 Andreas Gal
+ *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
+ *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
+ *  Copyright (c) 2006-2007 Jiri Kosina
+ *  Copyright (c) 2007 Paul Walmsley
+ *  Copyright (c) 2008 Jiri Slaby
+ */
+
+/*
+ * 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.
+ */
+
+#include <linux/device.h>
+#include <linux/input.h>
+#include <linux/hid.h>
+#include <linux/module.h>
+
+#include "hid-ids.h"
+
+#define ch_map_key_clear(c)     hid_map_usage_clear(hi, usage, bit, max, \
+                                        EV_KEY, (c))
+static int ch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
+                struct hid_field *field, struct hid_usage *usage,
+                unsigned long **bit, int *max)
+{
+        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_MSVENDOR)
+                return 0;
+
+        set_bit(EV_REP, hi->input->evbit);
+        switch (usage->hid & HID_USAGE) {
+        case 0xff01: ch_map_key_clear(BTN_1);   break;
+        case 0xff02: ch_map_key_clear(BTN_2);   break;
+        case 0xff03: ch_map_key_clear(BTN_3);   break;
+        case 0xff04: ch_map_key_clear(BTN_4);   break;
+        case 0xff05: ch_map_key_clear(BTN_5);   break;
+        case 0xff06: ch_map_key_clear(BTN_6);   break;
+        case 0xff07: ch_map_key_clear(BTN_7);   break;
+        case 0xff08: ch_map_key_clear(BTN_8);   break;
+        case 0xff09: ch_map_key_clear(BTN_9);   break;
+        case 0xff0a: ch_map_key_clear(BTN_A);   break;
+        case 0xff0b: ch_map_key_clear(BTN_B);   break;
+        default:
+                return 0;
+        }
+        return 1;
+}
+
+static const struct hid_device_id ch_devices[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
+        { }
+};
+MODULE_DEVICE_TABLE(hid, ch_devices);
+
+static struct hid_driver ch_driver = {
+        .name = "chicony",
+        .id_table = ch_devices,
+        .input_mapping = ch_input_mapping,
+};
+
+static int ch_init(void)
+{
+        return hid_register_driver(&ch_driver);
+}
+
+static void ch_exit(void)
+{
+        hid_unregister_driver(&ch_driver);
+}
+
+module_init(ch_init);
+module_exit(ch_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(chicony);
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 426ac5add585..721a36d97582 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -33,6 +33,8 @@
 #include <linux/hid-debug.h>
 #include <linux/hidraw.h>
 
+#include "hid-ids.h"
+
 /*
  * Version Information
  */
@@ -268,9 +270,9 @@ static int hid_add_field(struct hid_parser *parser, unsigned report_type, unsign
 static u32 item_udata(struct hid_item *item)
 {
         switch (item->size) {
-                case 1: return item->data.u8;
-                case 2: return item->data.u16;
-                case 4: return item->data.u32;
+        case 1: return item->data.u8;
+        case 2: return item->data.u16;
+        case 4: return item->data.u32;
         }
         return 0;
 }
@@ -278,9 +280,9 @@ static u32 item_udata(struct hid_item *item)
 static s32 item_sdata(struct hid_item *item)
 {
         switch (item->size) {
-                case 1: return item->data.s8;
-                case 2: return item->data.s16;
-                case 4: return item->data.s32;
+        case 1: return item->data.s8;
+        case 2: return item->data.s16;
+        case 4: return item->data.s32;
         }
         return 0;
 }
@@ -292,87 +294,91 @@ static s32 item_sdata(struct hid_item *item)
 static int hid_parser_global(struct hid_parser *parser, struct hid_item *item)
 {
         switch (item->tag) {
+        case HID_GLOBAL_ITEM_TAG_PUSH:
 
-                case HID_GLOBAL_ITEM_TAG_PUSH:
-
-                        if (parser->global_stack_ptr == HID_GLOBAL_STACK_SIZE) {
-                                dbg_hid("global enviroment stack overflow\n");
-                                return -1;
-                        }
+                if (parser->global_stack_ptr == HID_GLOBAL_STACK_SIZE) {
+                        dbg_hid("global enviroment stack overflow\n");
+                        return -1;
+                }
 
-                        memcpy(parser->global_stack + parser->global_stack_ptr++,
-                                &parser->global, sizeof(struct hid_global));
-                        return 0;
+                memcpy(parser->global_stack + parser->global_stack_ptr++,
+                        &parser->global, sizeof(struct hid_global));
+                return 0;
 
-                case HID_GLOBAL_ITEM_TAG_POP:
+        case HID_GLOBAL_ITEM_TAG_POP:
 
-                        if (!parser->global_stack_ptr) {
-                                dbg_hid("global enviroment stack underflow\n");
-                                return -1;
-                        }
-
-                        memcpy(&parser->global, parser->global_stack + --parser->global_stack_ptr,
-                                sizeof(struct hid_global));
-                        return 0;
+                if (!parser->global_stack_ptr) {
+                        dbg_hid("global enviroment stack underflow\n");
+                        return -1;
+                }
 
-                case HID_GLOBAL_ITEM_TAG_USAGE_PAGE:
-                        parser->global.usage_page = item_udata(item);
-                        return 0;
+                memcpy(&parser->global, parser->global_stack +
+                        --parser->global_stack_ptr, sizeof(struct hid_global));
+                return 0;
 
-                case HID_GLOBAL_ITEM_TAG_LOGICAL_MINIMUM:
-                        parser->global.logical_minimum = item_sdata(item);
-                        return 0;
+        case HID_GLOBAL_ITEM_TAG_USAGE_PAGE:
+                parser->global.usage_page = item_udata(item);
+                return 0;
 
-                case HID_GLOBAL_ITEM_TAG_LOGICAL_MAXIMUM:
-                        if (parser->global.logical_minimum < 0)
-                                parser->global.logical_maximum = item_sdata(item);
-                        else
-                                parser->global.logical_maximum = item_udata(item);
-                        return 0;
+        case HID_GLOBAL_ITEM_TAG_LOGICAL_MINIMUM:
+                parser->global.logical_minimum = item_sdata(item);
+                return 0;
 
-                case HID_GLOBAL_ITEM_TAG_PHYSICAL_MINIMUM:
-                        parser->global.physical_minimum = item_sdata(item);
-                        return 0;
+        case HID_GLOBAL_ITEM_TAG_LOGICAL_MAXIMUM:
+                if (parser->global.logical_minimum < 0)
+                        parser->global.logical_maximum = item_sdata(item);
+                else
+                        parser->global.logical_maximum = item_udata(item);
+                return 0;
 
-                case HID_GLOBAL_ITEM_TAG_PHYSICAL_MAXIMUM:
-                        if (parser->global.physical_minimum < 0)
-                                parser->global.physical_maximum = item_sdata(item);
-                        else
-                                parser->global.physical_maximum = item_udata(item);
-                        return 0;
+        case HID_GLOBAL_ITEM_TAG_PHYSICAL_MINIMUM:
+                parser->global.physical_minimum = item_sdata(item);
+                return 0;
 
-                case HID_GLOBAL_ITEM_TAG_UNIT_EXPONENT:
-                        parser->global.unit_exponent = item_sdata(item);
-                        return 0;
+        case HID_GLOBAL_ITEM_TAG_PHYSICAL_MAXIMUM:
+                if (parser->global.physical_minimum < 0)
+                        parser->global.physical_maximum = item_sdata(item);
+                else
+                        parser->global.physical_maximum = item_udata(item);
+                return 0;
 
-                case HID_GLOBAL_ITEM_TAG_UNIT:
-                        parser->global.unit = item_udata(item);
-                        return 0;
+        case HID_GLOBAL_ITEM_TAG_UNIT_EXPONENT:
+                parser->global.unit_exponent = item_sdata(item);
+                return 0;
 
-                case HID_GLOBAL_ITEM_TAG_REPORT_SIZE:
-                        if ((parser->global.report_size = item_udata(item)) > 32) {
-                                dbg_hid("invalid report_size %d\n", parser->global.report_size);
-                                return -1;
-                        }
-                        return 0;
+        case HID_GLOBAL_ITEM_TAG_UNIT:
+                parser->global.unit = item_udata(item);
+                return 0;
 
-                case HID_GLOBAL_ITEM_TAG_REPORT_COUNT:
-                        if ((parser->global.report_count = item_udata(item)) > HID_MAX_USAGES) {
-                                dbg_hid("invalid report_count %d\n", parser->global.report_count);
-                                return -1;
-                        }
-                        return 0;
+        case HID_GLOBAL_ITEM_TAG_REPORT_SIZE:
+                parser->global.report_size = item_udata(item);
+                if (parser->global.report_size > 32) {
+                        dbg_hid("invalid report_size %d\n",
+                                        parser->global.report_size);
+                        return -1;
+                }
+                return 0;
 
-                case HID_GLOBAL_ITEM_TAG_REPORT_ID:
-                        if ((parser->global.report_id = item_udata(item)) == 0) {
-                                dbg_hid("report_id 0 is invalid\n");
-                                return -1;
-                        }
-                        return 0;
+        case HID_GLOBAL_ITEM_TAG_REPORT_COUNT:
+                parser->global.report_count = item_udata(item);
+                if (parser->global.report_count > HID_MAX_USAGES) {
+                        dbg_hid("invalid report_count %d\n",
+                                        parser->global.report_count);
+                        return -1;
+                }
+                return 0;
 
-                default:
-                        dbg_hid("unknown global tag 0x%x\n", item->tag);
+        case HID_GLOBAL_ITEM_TAG_REPORT_ID:
+                parser->global.report_id = item_udata(item);
+                if (parser->global.report_id == 0) {
+                        dbg_hid("report_id 0 is invalid\n");
                         return -1;
+                }
+                return 0;
+
+        default:
+                dbg_hid("unknown global tag 0x%x\n", item->tag);
+                return -1;
         }
 }
 
@@ -393,77 +399,76 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)
         data = item_udata(item);
 
         switch (item->tag) {
-
-                case HID_LOCAL_ITEM_TAG_DELIMITER:
-
-                        if (data) {
-                                /*
-                                 * We treat items before the first delimiter
-                                 * as global to all usage sets (branch 0).
-                                 * In the moment we process only these global
-                                 * items and the first delimiter set.
-                                 */
-                                if (parser->local.delimiter_depth != 0) {
-                                        dbg_hid("nested delimiters\n");
-                                        return -1;
-                                }
-                                parser->local.delimiter_depth++;
-                                parser->local.delimiter_branch++;
-                        } else {
-                                if (parser->local.delimiter_depth < 1) {
-                                        dbg_hid("bogus close delimiter\n");
-                                        return -1;
-                                }
-                                parser->local.delimiter_depth--;
+        case HID_LOCAL_ITEM_TAG_DELIMITER:
+
+                if (data) {
+                        /*
+                         * We treat items before the first delimiter
+                         * as global to all usage sets (branch 0).
+                         * In the moment we process only these global
+                         * items and the first delimiter set.
+                         */
+                        if (parser->local.delimiter_depth != 0) {
+                                dbg_hid("nested delimiters\n");
+                                return -1;
                         }
-                        return 1;
-
-                case HID_LOCAL_ITEM_TAG_USAGE:
-
-                        if (parser->local.delimiter_branch > 1) {
-                                dbg_hid("alternative usage ignored\n");
-                                return 0;
+                        parser->local.delimiter_depth++;
+                        parser->local.delimiter_branch++;
+                } else {
+                        if (parser->local.delimiter_depth < 1) {
+                                dbg_hid("bogus close delimiter\n");
+                                return -1;
                         }
+                        parser->local.delimiter_depth--;
+                }
+                return 1;
 
-                        if (item->size <= 2)
-                                data = (parser->global.usage_page << 16) + data;
+        case HID_LOCAL_ITEM_TAG_USAGE:
 
-                        return hid_add_usage(parser, data);
+                if (parser->local.delimiter_branch > 1) {
+                        dbg_hid("alternative usage ignored\n");
+                        return 0;
+                }
 
-                case HID_LOCAL_ITEM_TAG_USAGE_MINIMUM:
+                if (item->size <= 2)
+                        data = (parser->global.usage_page << 16) + data;
 
-                        if (parser->local.delimiter_branch > 1) {
-                                dbg_hid("alternative usage ignored\n");
-                                return 0;
-                        }
+                return hid_add_usage(parser, data);
 
-                        if (item->size <= 2)
-                                data = (parser->global.usage_page << 16) + data;
+        case HID_LOCAL_ITEM_TAG_USAGE_MINIMUM:
 
-                        parser->local.usage_minimum = data;
+                if (parser->local.delimiter_branch > 1) {
+                        dbg_hid("alternative usage ignored\n");
                         return 0;
+                }
 
-                case HID_LOCAL_ITEM_TAG_USAGE_MAXIMUM:
+                if (item->size <= 2)
+                        data = (parser->global.usage_page << 16) + data;
 
-                        if (parser->local.delimiter_branch > 1) {
-                                dbg_hid("alternative usage ignored\n");
-                                return 0;
-                        }
+                parser->local.usage_minimum = data;
+                return 0;
 
-                        if (item->size <= 2)
-                                data = (parser->global.usage_page << 16) + data;
+        case HID_LOCAL_ITEM_TAG_USAGE_MAXIMUM:
 
-                        for (n = parser->local.usage_minimum; n <= data; n++)
-                                if (hid_add_usage(parser, n)) {
-                                        dbg_hid("hid_add_usage failed\n");
-                                        return -1;
-                                }
+                if (parser->local.delimiter_branch > 1) {
+                        dbg_hid("alternative usage ignored\n");
                         return 0;
+                }
 
-                default:
+                if (item->size <= 2)
+                        data = (parser->global.usage_page << 16) + data;
 
-                        dbg_hid("unknown local item tag 0x%x\n", item->tag);
-                        return 0;
+                for (n = parser->local.usage_minimum; n <= data; n++)
+                        if (hid_add_usage(parser, n)) {
+                                dbg_hid("hid_add_usage failed\n");
+                                return -1;
+                        }
+                return 0;
+
+        default:
+
+                dbg_hid("unknown local item tag 0x%x\n", item->tag);
+                return 0;
         }
         return 0;
 }
@@ -480,24 +485,24 @@ static int hid_parser_main(struct hid_parser *parser, struct hid_item *item)
         data = item_udata(item);
 
         switch (item->tag) {
-                case HID_MAIN_ITEM_TAG_BEGIN_COLLECTION:
-                        ret = open_collection(parser, data & 0xff);
-                        break;
-                case HID_MAIN_ITEM_TAG_END_COLLECTION:
-                        ret = close_collection(parser);
-                        break;
-                case HID_MAIN_ITEM_TAG_INPUT:
-                        ret = hid_add_field(parser, HID_INPUT_REPORT, data);
-                        break;
-                case HID_MAIN_ITEM_TAG_OUTPUT:
-                        ret = hid_add_field(parser, HID_OUTPUT_REPORT, data);
-                        break;
-                case HID_MAIN_ITEM_TAG_FEATURE:
-                        ret = hid_add_field(parser, HID_FEATURE_REPORT, data);
-                        break;
-                default:
-                        dbg_hid("unknown main item tag 0x%x\n", item->tag);
-                        ret = 0;
+        case HID_MAIN_ITEM_TAG_BEGIN_COLLECTION:
+                ret = open_collection(parser, data & 0xff);
+                break;
+        case HID_MAIN_ITEM_TAG_END_COLLECTION:
+                ret = close_collection(parser);
+                break;
+        case HID_MAIN_ITEM_TAG_INPUT:
+                ret = hid_add_field(parser, HID_INPUT_REPORT, data);
+                break;
+        case HID_MAIN_ITEM_TAG_OUTPUT:
+                ret = hid_add_field(parser, HID_OUTPUT_REPORT, data);
+                break;
+        case HID_MAIN_ITEM_TAG_FEATURE:
+                ret = hid_add_field(parser, HID_FEATURE_REPORT, data);
+                break;
+        default:
+                dbg_hid("unknown main item tag 0x%x\n", item->tag);
+                ret = 0;
         }
 
         memset(&parser->local, 0, sizeof(parser->local));       /* Reset the local parser environment */
@@ -534,9 +539,10 @@ static void hid_free_report(struct hid_report *report)
  * Free a device structure, all reports, and all fields.
  */
 
-void hid_free_device(struct hid_device *device)
+static void hid_device_release(struct device *dev)
 {
-        unsigned i,j;
+        struct hid_device *device = container_of(dev, struct hid_device, dev);
+        unsigned i, j;
 
         for (i = 0; i < HID_REPORT_TYPES; i++) {
                 struct hid_report_enum *report_enum = device->report_enum + i;
@@ -552,7 +558,6 @@ void hid_free_device(struct hid_device *device)
         kfree(device->collection);
         kfree(device);
 }
-EXPORT_SYMBOL_GPL(hid_free_device);
 
 /*
  * Fetch a report description item from the data stream. We support long
@@ -593,47 +598,52 @@ static u8 *fetch_item(__u8 *start, __u8 *end, struct hid_item *item)
         item->size = b & 3;
 
         switch (item->size) {
+        case 0:
+                return start;
 
-                case 0:
-                        return start;
-
-                case 1:
-                        if ((end - start) < 1)
-                                return NULL;
-                        item->data.u8 = *start++;
-                        return start;
+        case 1:
+                if ((end - start) < 1)
+                        return NULL;
+                item->data.u8 = *start++;
+                return start;
 
-                case 2:
-                        if ((end - start) < 2)
-                                return NULL;
-                        item->data.u16 = get_unaligned_le16(start);
-                        start = (__u8 *)((__le16 *)start + 1);
-                        return start;
+        case 2:
+                if ((end - start) < 2)
+                        return NULL;
+                item->data.u16 = get_unaligned_le16(start);
+                start = (__u8 *)((__le16 *)start + 1);
+                return start;
 
-                case 3:
-                        item->size++;
-                        if ((end - start) < 4)
-                                return NULL;
-                        item->data.u32 = get_unaligned_le32(start);
-                        start = (__u8 *)((__le32 *)start + 1);
-                        return start;
+        case 3:
+                item->size++;
+                if ((end - start) < 4)
+                        return NULL;
+                item->data.u32 = get_unaligned_le32(start);
+                start = (__u8 *)((__le32 *)start + 1);
+                return start;
         }
 
         return NULL;
 }
 
-/*
+/**
+ * hid_parse_report - parse device report
+ *
+ * @device: hid device
+ * @start: report start
+ * @size: report size
+ *
  * Parse a report description into a hid_device structure. Reports are
  * enumerated, fields are attached to these reports.
+ * 0 returned on success, otherwise nonzero error value.
  */
-
-struct hid_device *hid_parse_report(__u8 *start, unsigned size)
+int hid_parse_report(struct hid_device *device, __u8 *start,
+                unsigned size)
 {
-        struct hid_device *device;
         struct hid_parser *parser;
         struct hid_item item;
         __u8 *end;
-        unsigned i;
+        int ret;
         static int (*dispatch_type[])(struct hid_parser *parser,
                                       struct hid_item *item) = {
                 hid_parser_main,
@@ -642,76 +652,57 @@ struct hid_device *hid_parse_report(__u8 *start, unsigned size)
                 hid_parser_reserved
         };
 
-        if (!(device = kzalloc(sizeof(struct hid_device), GFP_KERNEL)))
-                return NULL;
+        if (device->driver->report_fixup)
+                device->driver->report_fixup(device, start, size);
 
-        if (!(device->collection = kzalloc(sizeof(struct hid_collection) *
-                                   HID_DEFAULT_NUM_COLLECTIONS, GFP_KERNEL))) {
-                kfree(device);
-                return NULL;
-        }
-        device->collection_size = HID_DEFAULT_NUM_COLLECTIONS;
-
-        for (i = 0; i < HID_REPORT_TYPES; i++)
-                INIT_LIST_HEAD(&device->report_enum[i].report_list);
-
-        if (!(device->rdesc = kmalloc(size, GFP_KERNEL))) {
-                kfree(device->collection);
-                kfree(device);
-                return NULL;
-        }
+        device->rdesc = kmalloc(size, GFP_KERNEL);
+        if (device->rdesc == NULL)
+                return -ENOMEM;
         memcpy(device->rdesc, start, size);
         device->rsize = size;
 
-        if (!(parser = vmalloc(sizeof(struct hid_parser)))) {
-                kfree(device->rdesc);
-                kfree(device->collection);
-                kfree(device);
-                return NULL;
+        parser = vmalloc(sizeof(struct hid_parser));
+        if (!parser) {
+                ret = -ENOMEM;
+                goto err;
         }
+
         memset(parser, 0, sizeof(struct hid_parser));
         parser->device = device;
 
         end = start + size;
+        ret = -EINVAL;
         while ((start = fetch_item(start, end, &item)) != NULL) {
 
                 if (item.format != HID_ITEM_FORMAT_SHORT) {
                         dbg_hid("unexpected long global item\n");
-                        hid_free_device(device);
-                        vfree(parser);
-                        return NULL;
+                        goto err;
                 }
 
                 if (dispatch_type[item.type](parser, &item)) {
                         dbg_hid("item %u %u %u %u parsing failed\n",
                                 item.format, (unsigned)item.size, (unsigned)item.type, (unsigned)item.tag);
-                        hid_free_device(device);
-                        vfree(parser);
-                        return NULL;
+                        goto err;
                 }
 
                 if (start == end) {
                         if (parser->collection_stack_ptr) {
                                 dbg_hid("unbalanced collection at end of report description\n");
-                                hid_free_device(device);
-                                vfree(parser);
-                                return NULL;
+                                goto err;
                         }
                         if (parser->local.delimiter_depth) {
                                 dbg_hid("unbalanced delimiter at end of report description\n");
-                                hid_free_device(device);
-                                vfree(parser);
-                                return NULL;
+                                goto err;
                         }
                         vfree(parser);
-                        return device;
+                        return 0;
                 }
         }
 
         dbg_hid("item fetching failed at offset %d\n", (int)(end - start));
-        hid_free_device(device);
+err:
         vfree(parser);
-        return NULL;
+        return ret;
 }
 EXPORT_SYMBOL_GPL(hid_parse_report);
 
@@ -724,9 +715,9 @@ EXPORT_SYMBOL_GPL(hid_parse_report);
 static s32 snto32(__u32 value, unsigned n)
 {
         switch (n) {
-                case 8:  return ((__s8)value);
-                case 16: return ((__s16)value);
-                case 32: return ((__s32)value);
+        case 8:  return ((__s8)value);
+        case 16: return ((__s16)value);
+        case 32: return ((__s32)value);
         }
         return value & (1 << (n - 1)) ? value | (-1 << n) : value;
 }
@@ -815,9 +806,73 @@ static __inline__ int search(__s32 *array, __s32 value, unsigned n)
         return -1;
 }
 
-static void hid_process_event(struct hid_device *hid, struct hid_field *field, struct hid_usage *usage, __s32 value, int interrupt)
+/**
+ * hid_match_report - check if driver's raw_event should be called
+ *
+ * @hid: hid device
+ * @report_type: type to match against
+ *
+ * compare hid->driver->report_table->report_type to report->type
+ */
+static int hid_match_report(struct hid_device *hid, struct hid_report *report)
+{
+        const struct hid_report_id *id = hid->driver->report_table;
+
+        if (!id) /* NULL means all */
+                return 1;
+
+        for (; id->report_type != HID_TERMINATOR; id++)
+                if (id->report_type == HID_ANY_ID ||
+                                id->report_type == report->type)
+                        return 1;
+        return 0;
+}
+
+/**
+ * hid_match_usage - check if driver's event should be called
+ *
+ * @hid: hid device
+ * @usage: usage to match against
+ *
+ * compare hid->driver->usage_table->usage_{type,code} to
+ * usage->usage_{type,code}
+ */
+static int hid_match_usage(struct hid_device *hid, struct hid_usage *usage)
 {
+        const struct hid_usage_id *id = hid->driver->usage_table;
+
+        if (!id) /* NULL means all */
+                return 1;
+
+        for (; id->usage_type != HID_ANY_ID - 1; id++)
+                if ((id->usage_hid == HID_ANY_ID ||
+                                id->usage_hid == usage->hid) &&
+                                (id->usage_type == HID_ANY_ID ||
+                                id->usage_type == usage->type) &&
+                                (id->usage_code == HID_ANY_ID ||
+                                 id->usage_code == usage->code))
+                        return 1;
+        return 0;
+}
+
+static void hid_process_event(struct hid_device *hid, struct hid_field *field,
+                struct hid_usage *usage, __s32 value, int interrupt)
+{
+        struct hid_driver *hdrv = hid->driver;
+        int ret;
+
         hid_dump_input(usage, value);
+
+        if (hdrv && hdrv->event && hid_match_usage(hid, usage)) {
+                ret = hdrv->event(hid, field, usage, value);
+                if (ret != 0) {
+                        if (ret < 0)
+                                dbg_hid("%s's event failed with %d\n",
+                                                hdrv->name, ret);
+                        return;
+                }
+        }
+
         if (hid->claimed & HID_CLAIMED_INPUT)
                 hidinput_hid_event(hid, field, usage, value);
         if (hid->claimed & HID_CLAIMED_HIDDEV && interrupt && hid->hiddev_hid_event)
@@ -946,44 +1001,47 @@ int hid_set_field(struct hid_field *field, unsigned offset, __s32 value)
 }
 EXPORT_SYMBOL_GPL(hid_set_field);
 
-int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int interrupt)
+static struct hid_report *hid_get_report(struct hid_report_enum *report_enum,
+                const u8 *data)
 {
-        struct hid_report_enum *report_enum = hid->report_enum + type;
         struct hid_report *report;
-        int n, rsize, i;
+        unsigned int n = 0;     /* Normally report number is 0 */
 
-        if (!hid)
-                return -ENODEV;
+        /* Device uses numbered reports, data[0] is report number */
+        if (report_enum->numbered)
+                n = *data;
 
-        if (!size) {
-                dbg_hid("empty report\n");
-                return -1;
-        }
+        report = report_enum->report_id_hash[n];
+        if (report == NULL)
+                dbg_hid("undefined report_id %u received\n", n);
 
-        dbg_hid("report (size %u) (%snumbered)\n", size, report_enum->numbered ? "" : "un");
+        return report;
+}
 
-        n = 0;                          /* Normally report number is 0 */
-        if (report_enum->numbered) {    /* Device uses numbered reports, data[0] is report number */
-                n = *data++;
-                size--;
-        }
+void hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size,
+                int interrupt)
+{
+        struct hid_report_enum *report_enum = hid->report_enum + type;
+        struct hid_report *report;
+        unsigned int a;
+        int rsize, csize = size;
+        u8 *cdata = data;
 
-        /* dump the report */
-        dbg_hid("report %d (size %u) = ", n, size);
-        for (i = 0; i < size; i++)
-                dbg_hid_line(" %02x", data[i]);
-        dbg_hid_line("\n");
+        report = hid_get_report(report_enum, data);
+        if (!report)
+                return;
 
-        if (!(report = report_enum->report_id_hash[n])) {
-                dbg_hid("undefined report_id %d received\n", n);
-                return -1;
+        if (report_enum->numbered) {
+                cdata++;
+                csize--;
         }
 
         rsize = ((report->size - 1) >> 3) + 1;
 
-        if (size < rsize) {
-                dbg_hid("report %d is too short, (%d < %d)\n", report->id, size, rsize);
-                memset(data + size, 0, rsize - size);
+        if (csize < rsize) {
+                dbg_hid("report %d is too short, (%d < %d)\n", report->id,
+                                csize, rsize);
+                memset(cdata + csize, 0, rsize - csize);
         }
 
         if ((hid->claimed & HID_CLAIMED_HIDDEV) && hid->hiddev_report_event)
@@ -996,24 +1054,663 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i
                         hidraw_report_event(hid, data, size);
         }
 
-        for (n = 0; n < report->maxfield; n++)
-                hid_input_field(hid, report->field[n], data, interrupt);
+        for (a = 0; a < report->maxfield; a++)
+                hid_input_field(hid, report->field[a], cdata, interrupt);
 
         if (hid->claimed & HID_CLAIMED_INPUT)
                 hidinput_report_event(hid, report);
+}
+EXPORT_SYMBOL_GPL(hid_report_raw_event);
+
+/**
+ * hid_input_report - report data from lower layer (usb, bt...)
+ *
+ * @hid: hid device
+ * @type: HID report type (HID_*_REPORT)
+ * @data: report contents
+ * @size: size of data parameter
+ * @interrupt: called from atomic?
+ *
+ * This is data entry for lower layers.
+ */
+int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int interrupt)
+{
+        struct hid_report_enum *report_enum = hid->report_enum + type;
+        struct hid_driver *hdrv = hid->driver;
+        struct hid_report *report;
+        unsigned int i;
+        int ret;
+
+        if (!hid || !hid->driver)
+                return -ENODEV;
+
+        if (!size) {
+                dbg_hid("empty report\n");
+                return -1;
+        }
+
+        dbg_hid("report (size %u) (%snumbered)\n", size, report_enum->numbered ? "" : "un");
+
+        report = hid_get_report(report_enum, data);
+        if (!report)
+                return -1;
+
+        /* dump the report */
+        dbg_hid("report %d (size %u) = ", report->id, size);
+        for (i = 0; i < size; i++)
+                dbg_hid_line(" %02x", data[i]);
+        dbg_hid_line("\n");
+
+        if (hdrv && hdrv->raw_event && hid_match_report(hid, report)) {
+                ret = hdrv->raw_event(hid, report, data, size);
+                if (ret != 0)
+                        return ret < 0 ? ret : 0;
+        }
+
+        hid_report_raw_event(hid, type, data, size, interrupt);
 
         return 0;
 }
 EXPORT_SYMBOL_GPL(hid_input_report);
 
+static bool hid_match_one_id(struct hid_device *hdev,
+                const struct hid_device_id *id)
+{
+        return id->bus == hdev->bus &&
+                (id->vendor == HID_ANY_ID || id->vendor == hdev->vendor) &&
+                (id->product == HID_ANY_ID || id->product == hdev->product);
+}
+
+static const struct hid_device_id *hid_match_id(struct hid_device *hdev,
+                const struct hid_device_id *id)
+{
+        for (; id->bus; id++)
+                if (hid_match_one_id(hdev, id))
+                        return id;
+
+        return NULL;
+}
+
+static const struct hid_device_id hid_hiddev_list[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS1) },
+        { }
+};
+
+static bool hid_hiddev(struct hid_device *hdev)
+{
+        return !!hid_match_id(hdev, hid_hiddev_list);
+}
+
+int hid_connect(struct hid_device *hdev, unsigned int connect_mask)
+{
+        static const char *types[] = { "Device", "Pointer", "Mouse", "Device",
+                "Joystick", "Gamepad", "Keyboard", "Keypad",
+                "Multi-Axis Controller"
+        };
+        const char *type, *bus;
+        char buf[64];
+        unsigned int i;
+        int len;
+
+        if (hdev->bus != BUS_USB)
+                connect_mask &= ~HID_CONNECT_HIDDEV;
+        if (hid_hiddev(hdev))
+                connect_mask |= HID_CONNECT_HIDDEV_FORCE;
+
+        if ((connect_mask & HID_CONNECT_HIDINPUT) && !hidinput_connect(hdev,
+                                connect_mask & HID_CONNECT_HIDINPUT_FORCE))
+                hdev->claimed |= HID_CLAIMED_INPUT;
+        if ((connect_mask & HID_CONNECT_HIDDEV) && hdev->hiddev_connect &&
+                        !hdev->hiddev_connect(hdev,
+                                connect_mask & HID_CONNECT_HIDDEV_FORCE))
+                hdev->claimed |= HID_CLAIMED_HIDDEV;
+        if ((connect_mask & HID_CONNECT_HIDRAW) && !hidraw_connect(hdev))
+                hdev->claimed |= HID_CLAIMED_HIDRAW;
+
+        if (!hdev->claimed) {
+                dev_err(&hdev->dev, "claimed by neither input, hiddev nor "
+                                "hidraw\n");
+                return -ENODEV;
+        }
+
+        if ((hdev->claimed & HID_CLAIMED_INPUT) &&
+                        (connect_mask & HID_CONNECT_FF) && hdev->ff_init)
+                hdev->ff_init(hdev);
+
+        len = 0;
+        if (hdev->claimed & HID_CLAIMED_INPUT)
+                len += sprintf(buf + len, "input");
+        if (hdev->claimed & HID_CLAIMED_HIDDEV)
+                len += sprintf(buf + len, "%shiddev%d", len ? "," : "",
+                                hdev->minor);
+        if (hdev->claimed & HID_CLAIMED_HIDRAW)
+                len += sprintf(buf + len, "%shidraw%d", len ? "," : "",
+                                ((struct hidraw *)hdev->hidraw)->minor);
+
+        type = "Device";
+        for (i = 0; i < hdev->maxcollection; i++) {
+                struct hid_collection *col = &hdev->collection[i];
+                if (col->type == HID_COLLECTION_APPLICATION &&
+                   (col->usage & HID_USAGE_PAGE) == HID_UP_GENDESK &&
+                   (col->usage & 0xffff) < ARRAY_SIZE(types)) {
+                        type = types[col->usage & 0xffff];
+                        break;
+                }
+        }
+
+        switch (hdev->bus) {
+        case BUS_USB:
+                bus = "USB";
+                break;
+        case BUS_BLUETOOTH:
+                bus = "BLUETOOTH";
+                break;
+        default:
+                bus = "<UNKNOWN>";
+        }
+
+        dev_info(&hdev->dev, "%s: %s HID v%x.%02x %s [%s] on %s\n",
+                        buf, bus, hdev->version >> 8, hdev->version & 0xff,
+                        type, hdev->name, hdev->phys);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(hid_connect);
+
+static const struct hid_device_id hid_blacklist[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_AVERMEDIA, USB_DEVICE_ID_AVER_FM_MR800) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_BRIGHT, USB_DEVICE_ID_BRIGHT_ABNT2) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RECEIVER) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_DESKTOP) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_EDGE) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_MINI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_KBD) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_ELITE_KBD) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_LX3) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_V150) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_EXTREME_3D) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WHEEL) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2_2) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WINGMAN_F3D) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_FORCE3D_PRO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },
+
+        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, 0x030c) },
+        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) },
+        { }
+};
+
+static int hid_bus_match(struct device *dev, struct device_driver *drv)
+{
+        struct hid_driver *hdrv = container_of(drv, struct hid_driver, driver);
+        struct hid_device *hdev = container_of(dev, struct hid_device, dev);
+
+        if (!hid_match_id(hdev, hdrv->id_table))
+                return 0;
+
+        /* generic wants all non-blacklisted */
+        if (!strncmp(hdrv->name, "generic-", 8))
+                return !hid_match_id(hdev, hid_blacklist);
+
+        return 1;
+}
+
+static int hid_device_probe(struct device *dev)
+{
+        struct hid_driver *hdrv = container_of(dev->driver,
+                        struct hid_driver, driver);
+        struct hid_device *hdev = container_of(dev, struct hid_device, dev);
+        const struct hid_device_id *id;
+        int ret = 0;
+
+        if (!hdev->driver) {
+                id = hid_match_id(hdev, hdrv->id_table);
+                if (id == NULL)
+                        return -ENODEV;
+
+                hdev->driver = hdrv;
+                if (hdrv->probe) {
+                        ret = hdrv->probe(hdev, id);
+                } else { /* default probe */
+                        ret = hid_parse(hdev);
+                        if (!ret)
+                                ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
+                }
+                if (ret)
+                        hdev->driver = NULL;
+        }
+        return ret;
+}
+
+static int hid_device_remove(struct device *dev)
+{
+        struct hid_device *hdev = container_of(dev, struct hid_device, dev);
+        struct hid_driver *hdrv = hdev->driver;
+
+        if (hdrv) {
+                if (hdrv->remove)
+                        hdrv->remove(hdev);
+                else /* default remove */
+                        hid_hw_stop(hdev);
+                hdev->driver = NULL;
+        }
+
+        return 0;
+}
+
+static int hid_uevent(struct device *dev, struct kobj_uevent_env *env)
+{
+        struct hid_device *hdev = container_of(dev, struct hid_device, dev);
+
+        if (add_uevent_var(env, "HID_ID=%04X:%08X:%08X",
+                        hdev->bus, hdev->vendor, hdev->product))
+                return -ENOMEM;
+
+        if (add_uevent_var(env, "HID_NAME=%s", hdev->name))
+                return -ENOMEM;
+
+        if (add_uevent_var(env, "HID_PHYS=%s", hdev->phys))
+                return -ENOMEM;
+
+        if (add_uevent_var(env, "HID_UNIQ=%s", hdev->uniq))
+                return -ENOMEM;
+
+        if (add_uevent_var(env, "MODALIAS=hid:b%04Xv%08Xp%08X",
+                        hdev->bus, hdev->vendor, hdev->product))
+                return -ENOMEM;
+
+        return 0;
+}
+
+static struct bus_type hid_bus_type = {
+        .name           = "hid",
+        .match          = hid_bus_match,
+        .probe          = hid_device_probe,
+        .remove         = hid_device_remove,
+        .uevent         = hid_uevent,
+};
+
+static const struct hid_device_id hid_ignore_list[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_FLAIR) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_302) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_ADS_TECH, USB_DEVICE_ID_ADS_TECH_RADIO_SI470X) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_01) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_10) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_20) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_21) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_22) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_23) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_24) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_AIRCABLE, USB_DEVICE_ID_AIRCABLE1) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_ALCOR, USB_DEVICE_ID_ALCOR_USBRS232) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_LCM)},
+        { HID_USB_DEVICE(USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_CIDC, 0x0103) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_CYGNAL, USB_DEVICE_ID_CYGNAL_RADIO_SI470X) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_CMEDIA, USB_DEVICE_ID_CM109) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_HIDCOM) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_ULTRAMOUSE) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0001) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0002) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0003) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0004) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_4_PHIDGETSERVO_30) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_1_PHIDGETSERVO_30) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_0_4_IF_KIT) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_16_16_IF_KIT) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_8_8_8_IF_KIT) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_8_7_IF_KIT) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_8_8_IF_KIT) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_PHIDGET_MOTORCONTROL) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_SUPER_Q2) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_GOGOPEN) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_PENPOWER) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GRETAGMACBETH, USB_DEVICE_ID_GRETAGMACBETH_HUEY) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_POWERMATE) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_SOUNDKNOB) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_90) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_100) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_101) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_103) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_104) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_105) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_106) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_107) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_108) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_200) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_201) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_202) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_203) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_204) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_205) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_206) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_207) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_300) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_301) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_302) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_303) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_304) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_305) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_306) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_307) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_308) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_309) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_400) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_401) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_402) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_403) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_404) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_405) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_500) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_501) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_502) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_503) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_504) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1000) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1001) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1002) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1003) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1004) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1005) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1006) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1007) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_IMATION, USB_DEVICE_ID_DISC_STAKKA) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_GPEN_560) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOBILECASSY) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_JWM) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_DMMP) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_UMIP) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY1) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY2) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_VIDEOCOM) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_COM3LAB) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_TELEPORT) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_NETWORKANALYSER) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POWERCONTROL) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MACHINETEST) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT2) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR, USB_DEVICE_ID_N_S_HARMONY) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 20) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 30) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 100) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 108) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 118) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 200) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 300) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 400) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 500) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0001) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0002) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0003) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0004) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY1) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY2) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb651) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_CYCLOPS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LCSPEC) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_WACOM, HID_ANY_ID) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_4_PHIDGETSERVO_20) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_8_8_4_IF_KIT) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },
+        { }
+};
+
+static bool hid_ignore(struct hid_device *hdev)
+{
+        switch (hdev->vendor) {
+        case USB_VENDOR_ID_CODEMERCS:
+                /* ignore all Code Mercenaries IOWarrior devices */
+                if (hdev->product >= USB_DEVICE_ID_CODEMERCS_IOW_FIRST &&
+                                hdev->product <= USB_DEVICE_ID_CODEMERCS_IOW_LAST)
+                        return true;
+                break;
+        case USB_VENDOR_ID_LOGITECH:
+                if (hdev->product >= USB_DEVICE_ID_LOGITECH_HARMONY_FIRST &&
+                                hdev->product <= USB_DEVICE_ID_LOGITECH_HARMONY_LAST)
+                        return true;
+                break;
+        }
+
+        return !!hid_match_id(hdev, hid_ignore_list);
+}
+
+int hid_add_device(struct hid_device *hdev)
+{
+        static atomic_t id = ATOMIC_INIT(0);
+        int ret;
+
+        if (WARN_ON(hdev->status & HID_STAT_ADDED))
+                return -EBUSY;
+
+        /* we need to kill them here, otherwise they will stay allocated to
+         * wait for coming driver */
+        if (hid_ignore(hdev))
+                return -ENODEV;
+
+        /* XXX hack, any other cleaner solution < 20 bus_id bytes? */
+        sprintf(hdev->dev.bus_id, "%04X:%04X:%04X.%04X", hdev->bus,
+                        hdev->vendor, hdev->product, atomic_inc_return(&id));
+
+        ret = device_add(&hdev->dev);
+        if (!ret)
+                hdev->status |= HID_STAT_ADDED;
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(hid_add_device);
+
+/**
+ * hid_allocate_device - allocate new hid device descriptor
+ *
+ * Allocate and initialize hid device, so that hid_destroy_device might be
+ * used to free it.
+ *
+ * New hid_device pointer is returned on success, otherwise ERR_PTR encoded
+ * error value.
+ */
+struct hid_device *hid_allocate_device(void)
+{
+        struct hid_device *hdev;
+        unsigned int i;
+        int ret = -ENOMEM;
+
+        hdev = kzalloc(sizeof(*hdev), GFP_KERNEL);
+        if (hdev == NULL)
+                return ERR_PTR(ret);
+
+        device_initialize(&hdev->dev);
+        hdev->dev.release = hid_device_release;
+        hdev->dev.bus = &hid_bus_type;
+
+        hdev->collection = kcalloc(HID_DEFAULT_NUM_COLLECTIONS,
+                        sizeof(struct hid_collection), GFP_KERNEL);
+        if (hdev->collection == NULL)
+                goto err;
+        hdev->collection_size = HID_DEFAULT_NUM_COLLECTIONS;
+
+        for (i = 0; i < HID_REPORT_TYPES; i++)
+                INIT_LIST_HEAD(&hdev->report_enum[i].report_list);
+
+        return hdev;
+err:
+        put_device(&hdev->dev);
+        return ERR_PTR(ret);
+}
+EXPORT_SYMBOL_GPL(hid_allocate_device);
+
+static void hid_remove_device(struct hid_device *hdev)
+{
+        if (hdev->status & HID_STAT_ADDED) {
+                device_del(&hdev->dev);
+                hdev->status &= ~HID_STAT_ADDED;
+        }
+}
+
+/**
+ * hid_destroy_device - free previously allocated device
+ *
+ * @hdev: hid device
+ *
+ * If you allocate hid_device through hid_allocate_device, you should ever
+ * free by this function.
+ */
+void hid_destroy_device(struct hid_device *hdev)
+{
+        hid_remove_device(hdev);
+        put_device(&hdev->dev);
+}
+EXPORT_SYMBOL_GPL(hid_destroy_device);
+
+int __hid_register_driver(struct hid_driver *hdrv, struct module *owner,
+                const char *mod_name)
+{
+        hdrv->driver.name = hdrv->name;
+        hdrv->driver.bus = &hid_bus_type;
+        hdrv->driver.owner = owner;
+        hdrv->driver.mod_name = mod_name;
+
+        return driver_register(&hdrv->driver);
+}
+EXPORT_SYMBOL_GPL(__hid_register_driver);
+
+void hid_unregister_driver(struct hid_driver *hdrv)
+{
+        driver_unregister(&hdrv->driver);
+}
+EXPORT_SYMBOL_GPL(hid_unregister_driver);
+
+#ifdef CONFIG_HID_COMPAT
+static void hid_compat_load(struct work_struct *ws)
+{
+        request_module("hid-dummy");
+}
+static DECLARE_WORK(hid_compat_work, hid_compat_load);
+static struct workqueue_struct *hid_compat_wq;
+#endif
+
 static int __init hid_init(void)
 {
-        return hidraw_init();
+        int ret;
+
+        ret = bus_register(&hid_bus_type);
+        if (ret) {
+                printk(KERN_ERR "HID: can't register hid bus\n");
+                goto err;
+        }
+
+        ret = hidraw_init();
+        if (ret)
+                goto err_bus;
+
+#ifdef CONFIG_HID_COMPAT
+        hid_compat_wq = create_workqueue("hid_compat");
+        if (!hid_compat_wq) {
+                hidraw_exit();
+                goto err;
+        }
+        queue_work(hid_compat_wq, &hid_compat_work);
+#endif
+
+        return 0;
+err_bus:
+        bus_unregister(&hid_bus_type);
+err:
+        return ret;
 }
 
 static void __exit hid_exit(void)
 {
+#ifdef CONFIG_HID_COMPAT
+        destroy_workqueue(hid_compat_wq);
+#endif
         hidraw_exit();
+        bus_unregister(&hid_bus_type);
 }
 
 module_init(hid_init);
diff --git a/drivers/hid/hid-cypress.c b/drivers/hid/hid-cypress.c
new file mode 100644
index 000000000000..5d69d27b935d
--- /dev/null
+++ b/drivers/hid/hid-cypress.c
@@ -0,0 +1,158 @@
+/*
+ *  HID driver for some cypress "special" devices
+ *
+ *  Copyright (c) 1999 Andreas Gal
+ *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
+ *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
+ *  Copyright (c) 2006-2007 Jiri Kosina
+ *  Copyright (c) 2007 Paul Walmsley
+ *  Copyright (c) 2008 Jiri Slaby
+ */
+
+/*
+ * 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.
+ */
+
+#include <linux/device.h>
+#include <linux/hid.h>
+#include <linux/input.h>
+#include <linux/module.h>
+
+#include "hid-ids.h"
+
+#define CP_RDESC_SWAPPED_MIN_MAX        0x01
+#define CP_2WHEEL_MOUSE_HACK            0x02
+#define CP_2WHEEL_MOUSE_HACK_ON         0x04
+
+/*
+ * Some USB barcode readers from cypress have usage min and usage max in
+ * the wrong order
+ */
+static void cp_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+                unsigned int rsize)
+{
+        unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);
+        unsigned int i;
+
+        if (!(quirks & CP_RDESC_SWAPPED_MIN_MAX))
+                return;
+
+        for (i = 0; i < rsize - 4; i++)
+                if (rdesc[i] == 0x29 && rdesc[i + 2] == 0x19) {
+                        __u8 tmp;
+
+                        rdesc[i] = 0x19;
+                        rdesc[i + 2] = 0x29;
+                        tmp = rdesc[i + 3];
+                        rdesc[i + 3] = rdesc[i + 1];
+                        rdesc[i + 1] = tmp;
+                }
+}
+
+static int cp_input_mapped(struct hid_device *hdev, struct hid_input *hi,
+                struct hid_field *field, struct hid_usage *usage,
+                unsigned long **bit, int *max)
+{
+        unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);
+
+        if (!(quirks & CP_2WHEEL_MOUSE_HACK))
+                return 0;
+
+        if (usage->type == EV_REL && usage->code == REL_WHEEL)
+                set_bit(REL_HWHEEL, *bit);
+        if (usage->hid == 0x00090005)
+                return -1;
+
+        return 0;
+}
+
+static int cp_event(struct hid_device *hdev, struct hid_field *field,
+                struct hid_usage *usage, __s32 value)
+{
+        unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);
+
+        if (!(hdev->claimed & HID_CLAIMED_INPUT) || !field->hidinput ||
+                        !usage->type || !(quirks & CP_2WHEEL_MOUSE_HACK))
+                return 0;
+
+        if (usage->hid == 0x00090005) {
+                if (value)
+                        quirks |=  CP_2WHEEL_MOUSE_HACK_ON;
+                else
+                        quirks &= ~CP_2WHEEL_MOUSE_HACK_ON;
+                hid_set_drvdata(hdev, (void *)quirks);
+                return 1;
+        }
+
+        if (usage->code == REL_WHEEL && (quirks & CP_2WHEEL_MOUSE_HACK_ON)) {
+                struct input_dev *input = field->hidinput->input;
+
+                input_event(input, usage->type, REL_HWHEEL, value);
+                return 1;
+        }
+
+        return 0;
+}
+
+static int cp_probe(struct hid_device *hdev, const struct hid_device_id *id)
+{
+        unsigned long quirks = id->driver_data;
+        int ret;
+
+        hid_set_drvdata(hdev, (void *)quirks);
+
+        ret = hid_parse(hdev);
+        if (ret) {
+                dev_err(&hdev->dev, "parse failed\n");
+                goto err_free;
+        }
+
+        ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
+        if (ret) {
+                dev_err(&hdev->dev, "hw start failed\n");
+                goto err_free;
+        }
+
+        return 0;
+err_free:
+        return ret;
+}
+
+static const struct hid_device_id cp_devices[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1),
+                .driver_data = CP_RDESC_SWAPPED_MIN_MAX },
+        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2),
+                .driver_data = CP_RDESC_SWAPPED_MIN_MAX },
+        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE),
+                .driver_data = CP_2WHEEL_MOUSE_HACK },
+        { }
+};
+MODULE_DEVICE_TABLE(hid, cp_devices);
+
+static struct hid_driver cp_driver = {
+        .name = "cypress",
+        .id_table = cp_devices,
+        .report_fixup = cp_report_fixup,
+        .input_mapped = cp_input_mapped,
+        .event = cp_event,
+        .probe = cp_probe,
+};
+
+static int cp_init(void)
+{
+        return hid_register_driver(&cp_driver);
+}
+
+static void cp_exit(void)
+{
+        hid_unregister_driver(&cp_driver);
+}
+
+module_init(cp_init);
+module_exit(cp_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(cypress);
diff --git a/drivers/hid/hid-dell.c b/drivers/hid/hid-dell.c
new file mode 100644
index 000000000000..1a0d0dfc62fc
--- /dev/null
+++ b/drivers/hid/hid-dell.c
@@ -0,0 +1,75 @@
+/*
+ *  HID driver for some dell "special" devices
+ *
+ *  Copyright (c) 1999 Andreas Gal
+ *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
+ *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
+ *  Copyright (c) 2006-2007 Jiri Kosina
+ *  Copyright (c) 2007 Paul Walmsley
+ *  Copyright (c) 2008 Jiri Slaby
+ */
+
+/*
+ * 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.
+ */
+
+#include <linux/device.h>
+#include <linux/hid.h>
+#include <linux/module.h>
+
+#include "hid-ids.h"
+
+static int dell_probe(struct hid_device *hdev, const struct hid_device_id *id)
+{
+        int ret;
+
+        ret = hid_parse(hdev);
+        if (ret) {
+                dev_err(&hdev->dev, "parse failed\n");
+                goto err_free;
+        }
+
+        ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
+        if (ret) {
+                dev_err(&hdev->dev, "hw start failed\n");
+                goto err_free;
+        }
+
+        usbhid_set_leds(hdev);
+
+        return 0;
+err_free:
+        return ret;
+}
+
+static const struct hid_device_id dell_devices[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) },
+        { }
+};
+MODULE_DEVICE_TABLE(hid, dell_devices);
+
+static struct hid_driver dell_driver = {
+        .name = "dell",
+        .id_table = dell_devices,
+        .probe = dell_probe,
+};
+
+static int dell_init(void)
+{
+        return hid_register_driver(&dell_driver);
+}
+
+static void dell_exit(void)
+{
+        hid_unregister_driver(&dell_driver);
+}
+
+module_init(dell_init);
+module_exit(dell_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(dell);
diff --git a/drivers/hid/hid-dummy.c b/drivers/hid/hid-dummy.c
new file mode 100644
index 000000000000..e148f86fb58e
--- /dev/null
+++ b/drivers/hid/hid-dummy.c
@@ -0,0 +1,72 @@
+#include <linux/autoconf.h>
+#include <linux/module.h>
+#include <linux/hid.h>
+
+static int __init hid_dummy_init(void)
+{
+#ifdef CONFIG_HID_A4TECH_MODULE
+        HID_COMPAT_CALL_DRIVER(a4tech);
+#endif
+#ifdef CONFIG_HID_APPLE_MODULE
+        HID_COMPAT_CALL_DRIVER(apple);
+#endif
+#ifdef CONFIG_HID_BELKIN_MODULE
+        HID_COMPAT_CALL_DRIVER(belkin);
+#endif
+#ifdef CONFIG_HID_BRIGHT_MODULE
+        HID_COMPAT_CALL_DRIVER(bright);
+#endif
+#ifdef CONFIG_HID_CHERRY_MODULE
+        HID_COMPAT_CALL_DRIVER(cherry);
+#endif
+#ifdef CONFIG_HID_CHICONY_MODULE
+        HID_COMPAT_CALL_DRIVER(chicony);
+#endif
+#ifdef CONFIG_HID_CYPRESS_MODULE
+        HID_COMPAT_CALL_DRIVER(cypress);
+#endif
+#ifdef CONFIG_HID_DELL_MODULE
+        HID_COMPAT_CALL_DRIVER(dell);
+#endif
+#ifdef CONFIG_HID_EZKEY_MODULE
+        HID_COMPAT_CALL_DRIVER(ezkey);
+#endif
+#ifdef CONFIG_HID_GYRATION_MODULE
+        HID_COMPAT_CALL_DRIVER(gyration);
+#endif
+#ifdef CONFIG_HID_LOGITECH_MODULE
+        HID_COMPAT_CALL_DRIVER(logitech);
+#endif
+#ifdef CONFIG_HID_MICROSOFT_MODULE
+        HID_COMPAT_CALL_DRIVER(microsoft);
+#endif
+#ifdef CONFIG_HID_MONTEREY_MODULE
+        HID_COMPAT_CALL_DRIVER(monterey);
+#endif
+#ifdef CONFIG_HID_PANTHERLORD_MODULE
+        HID_COMPAT_CALL_DRIVER(pantherlord);
+#endif
+#ifdef CONFIG_HID_PETALYNX_MODULE
+        HID_COMPAT_CALL_DRIVER(petalynx);
+#endif
+#ifdef CONFIG_HID_SAMSUNG_MODULE
+        HID_COMPAT_CALL_DRIVER(samsung);
+#endif
+#ifdef CONFIG_HID_SONY_MODULE
+        HID_COMPAT_CALL_DRIVER(sony);
+#endif
+#ifdef CONFIG_HID_SUNPLUS_MODULE
+        HID_COMPAT_CALL_DRIVER(sunplus);
+#endif
+#ifdef CONFIG_THRUSTMASTER_FF_MODULE
+        HID_COMPAT_CALL_DRIVER(thrustmaster);
+#endif
+#ifdef CONFIG_ZEROPLUS_FF_MODULE
+        HID_COMPAT_CALL_DRIVER(zeroplus);
+#endif
+
+        return -EIO;
+}
+module_init(hid_dummy_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-ezkey.c b/drivers/hid/hid-ezkey.c
new file mode 100644
index 000000000000..deb42f931b7e
--- /dev/null
+++ b/drivers/hid/hid-ezkey.c
@@ -0,0 +1,95 @@
+/*
+ *  HID driver for some ezkey "special" devices
+ *
+ *  Copyright (c) 1999 Andreas Gal
+ *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
+ *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
+ *  Copyright (c) 2006-2007 Jiri Kosina
+ *  Copyright (c) 2007 Paul Walmsley
+ *  Copyright (c) 2008 Jiri Slaby
+ */
+
+/*
+ * 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.
+ */
+
+#include <linux/device.h>
+#include <linux/input.h>
+#include <linux/hid.h>
+#include <linux/module.h>
+
+#include "hid-ids.h"
+
+#define ez_map_rel(c)   hid_map_usage(hi, usage, bit, max, EV_REL, (c))
+#define ez_map_key(c)   hid_map_usage(hi, usage, bit, max, EV_KEY, (c))
+
+static int ez_input_mapping(struct hid_device *hdev, struct hid_input *hi,
+                struct hid_field *field, struct hid_usage *usage,
+                unsigned long **bit, int *max)
+{
+        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
+                return 0;
+
+        switch (usage->hid & HID_USAGE) {
+        case 0x230: ez_map_key(BTN_MOUSE);      break;
+        case 0x231: ez_map_rel(REL_WHEEL);      break;
+        /*
+         * this keyboard has a scrollwheel implemented in
+         * totally broken way. We map this usage temporarily
+         * to HWHEEL and handle it in the event quirk handler
+         */
+        case 0x232: ez_map_rel(REL_HWHEEL);     break;
+        default:
+                return 0;
+        }
+        return 1;
+}
+
+static int ez_event(struct hid_device *hdev, struct hid_field *field,
+                struct hid_usage *usage, __s32 value)
+{
+        if (!(hdev->claimed & HID_CLAIMED_INPUT) || !field->hidinput ||
+                        !usage->type)
+                return 0;
+
+        /* handle the temporary quirky mapping to HWHEEL */
+        if (usage->type == EV_REL && usage->code == REL_HWHEEL) {
+                struct input_dev *input = field->hidinput->input;
+                input_event(input, usage->type, REL_WHEEL, -value);
+                return 1;
+        }
+
+        return 0;
+}
+
+static const struct hid_device_id ez_devices[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },
+        { }
+};
+MODULE_DEVICE_TABLE(hid, ez_devices);
+
+static struct hid_driver ez_driver = {
+        .name = "ezkey",
+        .id_table = ez_devices,
+        .input_mapping = ez_input_mapping,
+        .event = ez_event,
+};
+
+static int ez_init(void)
+{
+        return hid_register_driver(&ez_driver);
+}
+
+static void ez_exit(void)
+{
+        hid_unregister_driver(&ez_driver);
+}
+
+module_init(ez_init);
+module_exit(ez_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(ezkey);
diff --git a/drivers/hid/hid-gyration.c b/drivers/hid/hid-gyration.c
new file mode 100644
index 000000000000..ac5120f542cc
--- /dev/null
+++ b/drivers/hid/hid-gyration.c
@@ -0,0 +1,96 @@
+/*
+ *  HID driver for some gyration "special" devices
+ *
+ *  Copyright (c) 1999 Andreas Gal
+ *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
+ *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
+ *  Copyright (c) 2006-2007 Jiri Kosina
+ *  Copyright (c) 2007 Paul Walmsley
+ *  Copyright (c) 2008 Jiri Slaby
+ */
+
+/*
+ * 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.
+ */
+
+#include <linux/device.h>
+#include <linux/input.h>
+#include <linux/hid.h>
+#include <linux/module.h>
+
+#include "hid-ids.h"
+
+#define gy_map_key_clear(c)     hid_map_usage_clear(hi, usage, bit, max, \
+                                        EV_KEY, (c))
+static int gyration_input_mapping(struct hid_device *hdev, struct hid_input *hi,
+                struct hid_field *field, struct hid_usage *usage,
+                unsigned long **bit, int *max)
+{
+        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_LOGIVENDOR)
+                return 0;
+
+        set_bit(EV_REP, hi->input->evbit);
+        switch (usage->hid & HID_USAGE) {
+        /* Reported on Gyration MCE Remote */
+        case 0x00d: gy_map_key_clear(KEY_HOME);         break;
+        case 0x024: gy_map_key_clear(KEY_DVD);          break;
+        case 0x025: gy_map_key_clear(KEY_PVR);          break;
+        case 0x046: gy_map_key_clear(KEY_MEDIA);        break;
+        case 0x047: gy_map_key_clear(KEY_MP3);          break;
+        case 0x049: gy_map_key_clear(KEY_CAMERA);       break;
+        case 0x04a: gy_map_key_clear(KEY_VIDEO);        break;
+
+        default:
+                return 0;
+        }
+        return 1;
+}
+
+static int gyration_event(struct hid_device *hdev, struct hid_field *field,
+                struct hid_usage *usage, __s32 value)
+{
+        struct input_dev *input = field->hidinput->input;
+
+        if ((usage->hid & HID_USAGE_PAGE) == HID_UP_GENDESK &&
+                        (usage->hid & 0xff) == 0x82) {
+                input_event(input, usage->type, usage->code, 1);
+                input_sync(input);
+                input_event(input, usage->type, usage->code, 0);
+                input_sync(input);
+                return 1;
+        }
+
+        return 0;
+}
+
+static const struct hid_device_id gyration_devices[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },
+        { }
+};
+MODULE_DEVICE_TABLE(hid, gyration_devices);
+
+static struct hid_driver gyration_driver = {
+        .name = "gyration",
+        .id_table = gyration_devices,
+        .input_mapping = gyration_input_mapping,
+        .event = gyration_event,
+};
+
+static int gyration_init(void)
+{
+        return hid_register_driver(&gyration_driver);
+}
+
+static void gyration_exit(void)
+{
+        hid_unregister_driver(&gyration_driver);
+}
+
+module_init(gyration_init);
+module_exit(gyration_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(gyration);
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
new file mode 100644
index 000000000000..d9a1ba920c23
--- /dev/null
+++ b/drivers/hid/hid-ids.h
@@ -0,0 +1,406 @@
+/*
+ *  USB HID quirks support for Linux
+ *
+ *  Copyright (c) 1999 Andreas Gal
+ *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
+ *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
+ *  Copyright (c) 2006-2007 Jiri Kosina
+ *  Copyright (c) 2007 Paul Walmsley
+ */
+
+/*
+ * 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.
+ */
+
+#ifndef HID_IDS_H_FILE
+#define HID_IDS_H_FILE
+
+#define USB_VENDOR_ID_A4TECH            0x09da
+#define USB_DEVICE_ID_A4TECH_WCP32PU    0x0006
+#define USB_DEVICE_ID_A4TECH_X5_005D    0x000a
+
+#define USB_VENDOR_ID_AASHIMA           0x06d6
+#define USB_DEVICE_ID_AASHIMA_GAMEPAD   0x0025
+#define USB_DEVICE_ID_AASHIMA_PREDATOR  0x0026
+
+#define USB_VENDOR_ID_ACECAD            0x0460
+#define USB_DEVICE_ID_ACECAD_FLAIR      0x0004
+#define USB_DEVICE_ID_ACECAD_302        0x0008
+
+#define USB_VENDOR_ID_ADS_TECH          0x06e1
+#define USB_DEVICE_ID_ADS_TECH_RADIO_SI470X     0xa155
+
+#define USB_VENDOR_ID_AFATECH           0x15a4
+#define USB_DEVICE_ID_AFATECH_AF9016    0x9016
+
+#define USB_VENDOR_ID_AIPTEK            0x08ca
+#define USB_DEVICE_ID_AIPTEK_01         0x0001
+#define USB_DEVICE_ID_AIPTEK_10         0x0010
+#define USB_DEVICE_ID_AIPTEK_20         0x0020
+#define USB_DEVICE_ID_AIPTEK_21         0x0021
+#define USB_DEVICE_ID_AIPTEK_22         0x0022
+#define USB_DEVICE_ID_AIPTEK_23         0x0023
+#define USB_DEVICE_ID_AIPTEK_24         0x0024
+
+#define USB_VENDOR_ID_AIRCABLE          0x16CA
+#define USB_DEVICE_ID_AIRCABLE1         0x1502
+
+#define USB_VENDOR_ID_ALCOR             0x058f
+#define USB_DEVICE_ID_ALCOR_USBRS232    0x9720
+
+#define USB_VENDOR_ID_ALPS              0x0433
+#define USB_DEVICE_ID_IBM_GAMEPAD       0x1101
+
+#define USB_VENDOR_ID_APPLE             0x05ac
+#define USB_DEVICE_ID_APPLE_MIGHTYMOUSE 0x0304
+#define USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI       0x020e
+#define USB_DEVICE_ID_APPLE_FOUNTAIN_ISO        0x020f
+#define USB_DEVICE_ID_APPLE_GEYSER_ANSI 0x0214
+#define USB_DEVICE_ID_APPLE_GEYSER_ISO  0x0215
+#define USB_DEVICE_ID_APPLE_GEYSER_JIS  0x0216
+#define USB_DEVICE_ID_APPLE_GEYSER3_ANSI        0x0217
+#define USB_DEVICE_ID_APPLE_GEYSER3_ISO 0x0218
+#define USB_DEVICE_ID_APPLE_GEYSER3_JIS 0x0219
+#define USB_DEVICE_ID_APPLE_GEYSER4_ANSI        0x021a
+#define USB_DEVICE_ID_APPLE_GEYSER4_ISO 0x021b
+#define USB_DEVICE_ID_APPLE_GEYSER4_JIS 0x021c
+#define USB_DEVICE_ID_APPLE_ALU_ANSI    0x0220
+#define USB_DEVICE_ID_APPLE_ALU_ISO     0x0221
+#define USB_DEVICE_ID_APPLE_ALU_JIS     0x0222
+#define USB_DEVICE_ID_APPLE_WELLSPRING_ANSI     0x0223
+#define USB_DEVICE_ID_APPLE_WELLSPRING_ISO      0x0224
+#define USB_DEVICE_ID_APPLE_WELLSPRING_JIS      0x0225
+#define USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI    0x0229
+#define USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO     0x022a
+#define USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS     0x022b
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI  0x022c
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO   0x022d
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS   0x022e
+#define USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI    0x0230
+#define USB_DEVICE_ID_APPLE_WELLSPRING2_ISO     0x0231
+#define USB_DEVICE_ID_APPLE_WELLSPRING2_JIS     0x0232
+#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY    0x030a
+#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY     0x030b
+#define USB_DEVICE_ID_APPLE_ATV_IRCONTROL       0x8241
+#define USB_DEVICE_ID_APPLE_IRCONTROL4  0x8242
+
+#define USB_VENDOR_ID_ASUS              0x0b05
+#define USB_DEVICE_ID_ASUS_LCM          0x1726
+
+#define USB_VENDOR_ID_ATEN              0x0557
+#define USB_DEVICE_ID_ATEN_UC100KM      0x2004
+#define USB_DEVICE_ID_ATEN_CS124U       0x2202
+#define USB_DEVICE_ID_ATEN_2PORTKVM     0x2204
+#define USB_DEVICE_ID_ATEN_4PORTKVM     0x2205
+#define USB_DEVICE_ID_ATEN_4PORTKVMC    0x2208
+
+#define USB_VENDOR_ID_AVERMEDIA         0x07ca
+#define USB_DEVICE_ID_AVER_FM_MR800     0xb800
+
+#define USB_VENDOR_ID_BELKIN           0x050d
+#define USB_DEVICE_ID_FLIP_KVM         0x3201
+
+#define USB_VENDOR_ID_BRIGHT            0x1241
+#define USB_DEVICE_ID_BRIGHT_ABNT2      0x1503
+
+#define USB_VENDOR_ID_BERKSHIRE         0x0c98
+#define USB_DEVICE_ID_BERKSHIRE_PCWD    0x1140
+
+#define USB_VENDOR_ID_CHERRY            0x046a
+#define USB_DEVICE_ID_CHERRY_CYMOTION   0x0023
+
+#define USB_VENDOR_ID_CHIC              0x05fe
+#define USB_DEVICE_ID_CHIC_GAMEPAD      0x0014
+
+#define USB_VENDOR_ID_CHICONY           0x04f2
+#define USB_DEVICE_ID_CHICONY_TACTICAL_PAD      0x0418
+
+#define USB_VENDOR_ID_CIDC              0x1677
+
+#define USB_VENDOR_ID_CMEDIA            0x0d8c
+#define USB_DEVICE_ID_CM109             0x000e
+
+#define USB_VENDOR_ID_CODEMERCS         0x07c0
+#define USB_DEVICE_ID_CODEMERCS_IOW_FIRST       0x1500
+#define USB_DEVICE_ID_CODEMERCS_IOW_LAST        0x15ff
+
+#define USB_VENDOR_ID_CYGNAL            0x10c4
+#define USB_DEVICE_ID_CYGNAL_RADIO_SI470X       0x818a
+
+#define USB_VENDOR_ID_CYPRESS           0x04b4
+#define USB_DEVICE_ID_CYPRESS_MOUSE     0x0001
+#define USB_DEVICE_ID_CYPRESS_HIDCOM    0x5500
+#define USB_DEVICE_ID_CYPRESS_ULTRAMOUSE        0x7417
+#define USB_DEVICE_ID_CYPRESS_BARCODE_1 0xde61
+#define USB_DEVICE_ID_CYPRESS_BARCODE_2 0xde64
+
+#define USB_VENDOR_ID_DELL              0x413c
+#define USB_DEVICE_ID_DELL_W7658        0x2005
+#define USB_DEVICE_ID_DELL_SK8115       0x2105
+
+#define USB_VENDOR_ID_DELORME           0x1163
+#define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100
+#define USB_DEVICE_ID_DELORME_EM_LT20   0x0200
+
+#define USB_VENDOR_ID_DMI               0x0c0b
+#define USB_DEVICE_ID_DMI_ENC           0x5fab
+
+#define USB_VENDOR_ID_ELO               0x04E7
+#define USB_DEVICE_ID_ELO_TS2700        0x0020
+
+#define USB_VENDOR_ID_ESSENTIAL_REALITY 0x0d7f
+#define USB_DEVICE_ID_ESSENTIAL_REALITY_P5 0x0100
+
+#define USB_VENDOR_ID_EZKEY             0x0518
+#define USB_DEVICE_ID_BTC_8193          0x0002
+
+#define USB_VENDOR_ID_GAMERON           0x0810
+#define USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR  0x0001
+
+#define USB_VENDOR_ID_GENERAL_TOUCH     0x0dfc
+
+#define USB_VENDOR_ID_GLAB              0x06c2
+#define USB_DEVICE_ID_4_PHIDGETSERVO_30 0x0038
+#define USB_DEVICE_ID_1_PHIDGETSERVO_30 0x0039
+#define USB_DEVICE_ID_0_0_4_IF_KIT      0x0040
+#define USB_DEVICE_ID_0_16_16_IF_KIT    0x0044
+#define USB_DEVICE_ID_8_8_8_IF_KIT      0x0045
+#define USB_DEVICE_ID_0_8_7_IF_KIT      0x0051
+#define USB_DEVICE_ID_0_8_8_IF_KIT      0x0053
+#define USB_DEVICE_ID_PHIDGET_MOTORCONTROL      0x0058
+
+#define USB_VENDOR_ID_GOTOP             0x08f2
+#define USB_DEVICE_ID_SUPER_Q2          0x007f
+#define USB_DEVICE_ID_GOGOPEN           0x00ce
+#define USB_DEVICE_ID_PENPOWER          0x00f4
+
+#define USB_VENDOR_ID_GREENASIA         0x0e8f
+
+#define USB_VENDOR_ID_GRETAGMACBETH     0x0971
+#define USB_DEVICE_ID_GRETAGMACBETH_HUEY        0x2005
+
+#define USB_VENDOR_ID_GRIFFIN           0x077d
+#define USB_DEVICE_ID_POWERMATE         0x0410
+#define USB_DEVICE_ID_SOUNDKNOB         0x04AA
+
+#define USB_VENDOR_ID_GTCO              0x078c
+#define USB_DEVICE_ID_GTCO_90           0x0090
+#define USB_DEVICE_ID_GTCO_100          0x0100
+#define USB_DEVICE_ID_GTCO_101          0x0101
+#define USB_DEVICE_ID_GTCO_103          0x0103
+#define USB_DEVICE_ID_GTCO_104          0x0104
+#define USB_DEVICE_ID_GTCO_105          0x0105
+#define USB_DEVICE_ID_GTCO_106          0x0106
+#define USB_DEVICE_ID_GTCO_107          0x0107
+#define USB_DEVICE_ID_GTCO_108          0x0108
+#define USB_DEVICE_ID_GTCO_200          0x0200
+#define USB_DEVICE_ID_GTCO_201          0x0201
+#define USB_DEVICE_ID_GTCO_202          0x0202
+#define USB_DEVICE_ID_GTCO_203          0x0203
+#define USB_DEVICE_ID_GTCO_204          0x0204
+#define USB_DEVICE_ID_GTCO_205          0x0205
+#define USB_DEVICE_ID_GTCO_206          0x0206
+#define USB_DEVICE_ID_GTCO_207          0x0207
+#define USB_DEVICE_ID_GTCO_300          0x0300
+#define USB_DEVICE_ID_GTCO_301          0x0301
+#define USB_DEVICE_ID_GTCO_302          0x0302
+#define USB_DEVICE_ID_GTCO_303          0x0303
+#define USB_DEVICE_ID_GTCO_304          0x0304
+#define USB_DEVICE_ID_GTCO_305          0x0305
+#define USB_DEVICE_ID_GTCO_306          0x0306
+#define USB_DEVICE_ID_GTCO_307          0x0307
+#define USB_DEVICE_ID_GTCO_308          0x0308
+#define USB_DEVICE_ID_GTCO_309          0x0309
+#define USB_DEVICE_ID_GTCO_400          0x0400
+#define USB_DEVICE_ID_GTCO_401          0x0401
+#define USB_DEVICE_ID_GTCO_402          0x0402
+#define USB_DEVICE_ID_GTCO_403          0x0403
+#define USB_DEVICE_ID_GTCO_404          0x0404
+#define USB_DEVICE_ID_GTCO_405          0x0405
+#define USB_DEVICE_ID_GTCO_500          0x0500
+#define USB_DEVICE_ID_GTCO_501          0x0501
+#define USB_DEVICE_ID_GTCO_502          0x0502
+#define USB_DEVICE_ID_GTCO_503          0x0503
+#define USB_DEVICE_ID_GTCO_504          0x0504
+#define USB_DEVICE_ID_GTCO_1000         0x1000
+#define USB_DEVICE_ID_GTCO_1001         0x1001
+#define USB_DEVICE_ID_GTCO_1002         0x1002
+#define USB_DEVICE_ID_GTCO_1003         0x1003
+#define USB_DEVICE_ID_GTCO_1004         0x1004
+#define USB_DEVICE_ID_GTCO_1005         0x1005
+#define USB_DEVICE_ID_GTCO_1006         0x1006
+#define USB_DEVICE_ID_GTCO_1007         0x1007
+
+#define USB_VENDOR_ID_GYRATION          0x0c16
+#define USB_DEVICE_ID_GYRATION_REMOTE   0x0002
+
+#define USB_VENDOR_ID_HAPP              0x078b
+#define USB_DEVICE_ID_UGCI_DRIVING      0x0010
+#define USB_DEVICE_ID_UGCI_FLYING       0x0020
+#define USB_DEVICE_ID_UGCI_FIGHTING     0x0030
+
+#define USB_VENDOR_ID_IMATION           0x0718
+#define USB_DEVICE_ID_DISC_STAKKA       0xd000
+
+#define USB_VENDOR_ID_KBGEAR            0x084e
+#define USB_DEVICE_ID_KBGEAR_JAMSTUDIO  0x1001
+
+#define USB_VENDOR_ID_LABTEC            0x1020
+#define USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD  0x0006
+
+#define USB_VENDOR_ID_LD                0x0f11
+#define USB_DEVICE_ID_LD_CASSY          0x1000
+#define USB_DEVICE_ID_LD_POCKETCASSY    0x1010
+#define USB_DEVICE_ID_LD_MOBILECASSY    0x1020
+#define USB_DEVICE_ID_LD_JWM            0x1080
+#define USB_DEVICE_ID_LD_DMMP           0x1081
+#define USB_DEVICE_ID_LD_UMIP           0x1090
+#define USB_DEVICE_ID_LD_XRAY1          0x1100
+#define USB_DEVICE_ID_LD_XRAY2          0x1101
+#define USB_DEVICE_ID_LD_VIDEOCOM       0x1200
+#define USB_DEVICE_ID_LD_COM3LAB        0x2000
+#define USB_DEVICE_ID_LD_TELEPORT       0x2010
+#define USB_DEVICE_ID_LD_NETWORKANALYSER 0x2020
+#define USB_DEVICE_ID_LD_POWERCONTROL   0x2030
+#define USB_DEVICE_ID_LD_MACHINETEST    0x2040
+
+#define USB_VENDOR_ID_LOGITECH          0x046d
+#define USB_DEVICE_ID_LOGITECH_LX3      0xc044
+#define USB_DEVICE_ID_LOGITECH_V150     0xc047
+#define USB_DEVICE_ID_LOGITECH_RECEIVER 0xc101
+#define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST  0xc110
+#define USB_DEVICE_ID_LOGITECH_HARMONY_LAST 0xc14f
+#define USB_DEVICE_ID_LOGITECH_RUMBLEPAD        0xc211
+#define USB_DEVICE_ID_LOGITECH_EXTREME_3D       0xc215
+#define USB_DEVICE_ID_LOGITECH_RUMBLEPAD2       0xc218
+#define USB_DEVICE_ID_LOGITECH_RUMBLEPAD2_2     0xc219
+#define USB_DEVICE_ID_LOGITECH_WINGMAN_F3D      0xc283
+#define USB_DEVICE_ID_LOGITECH_FORCE3D_PRO      0xc286
+#define USB_DEVICE_ID_LOGITECH_WHEEL    0xc294
+#define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL       0xc295
+#define USB_DEVICE_ID_LOGITECH_ELITE_KBD        0xc30a
+#define USB_DEVICE_ID_LOGITECH_KBD      0xc311
+#define USB_DEVICE_ID_S510_RECEIVER     0xc50c
+#define USB_DEVICE_ID_S510_RECEIVER_2   0xc517
+#define USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500   0xc512
+#define USB_DEVICE_ID_MX3000_RECEIVER   0xc513
+#define USB_DEVICE_ID_DINOVO_DESKTOP    0xc704
+#define USB_DEVICE_ID_DINOVO_EDGE       0xc714
+#define USB_DEVICE_ID_DINOVO_MINI       0xc71f
+#define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2      0xca03
+
+#define USB_VENDOR_ID_MCC               0x09db
+#define USB_DEVICE_ID_MCC_PMD1024LS     0x0076
+#define USB_DEVICE_ID_MCC_PMD1208LS     0x007a
+
+#define USB_VENDOR_ID_MGE               0x0463
+#define USB_DEVICE_ID_MGE_UPS           0xffff
+#define USB_DEVICE_ID_MGE_UPS1          0x0001
+
+#define USB_VENDOR_ID_MICROCHIP         0x04d8
+#define USB_DEVICE_ID_PICKIT1           0x0032
+#define USB_DEVICE_ID_PICKIT2           0x0033
+
+#define USB_VENDOR_ID_MICROSOFT         0x045e
+#define USB_DEVICE_ID_SIDEWINDER_GV     0x003b
+#define USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0 0x009d
+#define USB_DEVICE_ID_MS_NE4K           0x00db
+#define USB_DEVICE_ID_MS_LK6K           0x00f9
+#define USB_DEVICE_ID_MS_PRESENTER_8K_BT        0x0701
+#define USB_DEVICE_ID_MS_PRESENTER_8K_USB       0x0713
+
+
+#define USB_VENDOR_ID_MONTEREY          0x0566
+#define USB_DEVICE_ID_GENIUS_KB29E      0x3004
+
+#define USB_VENDOR_ID_NCR               0x0404
+#define USB_DEVICE_ID_NCR_FIRST         0x0300
+#define USB_DEVICE_ID_NCR_LAST          0x03ff
+
+#define USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR 0x0400
+#define USB_DEVICE_ID_N_S_HARMONY       0xc359
+
+#define USB_VENDOR_ID_NATSU             0x08b7
+#define USB_DEVICE_ID_NATSU_GAMEPAD     0x0001
+
+#define USB_VENDOR_ID_NEC               0x073e
+#define USB_DEVICE_ID_NEC_USB_GAME_PAD  0x0301
+
+#define USB_VENDOR_ID_ONTRAK            0x0a07
+#define USB_DEVICE_ID_ONTRAK_ADU100     0x0064
+
+#define USB_VENDOR_ID_PANJIT            0x134c
+
+#define USB_VENDOR_ID_PANTHERLORD       0x0810
+#define USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK     0x0001
+
+#define USB_VENDOR_ID_PETALYNX          0x18b1
+#define USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE    0x0037
+
+#define USB_VENDOR_ID_PLAYDOTCOM        0x0b43
+#define USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII      0x0003
+
+#define USB_VENDOR_ID_SAITEK            0x06a3
+#define USB_DEVICE_ID_SAITEK_RUMBLEPAD  0xff17
+
+#define USB_VENDOR_ID_SAMSUNG           0x0419
+#define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001
+
+#define USB_VENDOR_ID_SONY                      0x054c
+#define USB_DEVICE_ID_SONY_PS3_CONTROLLER       0x0268
+
+#define USB_VENDOR_ID_SOUNDGRAPH        0x15c2
+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD       0x0038
+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2      0x0036
+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3      0x0034
+
+#define USB_VENDOR_ID_SUN               0x0430
+#define USB_DEVICE_ID_RARITAN_KVM_DONGLE        0xcdab
+
+#define USB_VENDOR_ID_SUNPLUS           0x04fc
+#define USB_DEVICE_ID_SUNPLUS_WDESKTOP  0x05d8
+
+#define USB_VENDOR_ID_TENX              0x1130
+#define USB_DEVICE_ID_TENX_IBUDDY1      0x0001
+#define USB_DEVICE_ID_TENX_IBUDDY2      0x0002
+
+#define USB_VENDOR_ID_THRUSTMASTER      0x044f
+
+#define USB_VENDOR_ID_TOPMAX            0x0663
+#define USB_DEVICE_ID_TOPMAX_COBRAPAD   0x0103
+
+#define USB_VENDOR_ID_TURBOX            0x062a
+#define USB_DEVICE_ID_TURBOX_KEYBOARD   0x0201
+
+#define USB_VENDOR_ID_VERNIER           0x08f7
+#define USB_DEVICE_ID_VERNIER_LABPRO    0x0001
+#define USB_DEVICE_ID_VERNIER_GOTEMP    0x0002
+#define USB_DEVICE_ID_VERNIER_SKIP      0x0003
+#define USB_DEVICE_ID_VERNIER_CYCLOPS   0x0004
+#define USB_DEVICE_ID_VERNIER_LCSPEC    0x0006
+
+#define USB_VENDOR_ID_WACOM             0x056a
+
+#define USB_VENDOR_ID_WISEGROUP         0x0925
+#define USB_DEVICE_ID_1_PHIDGETSERVO_20 0x8101
+#define USB_DEVICE_ID_4_PHIDGETSERVO_20 0x8104
+#define USB_DEVICE_ID_8_8_4_IF_KIT      0x8201
+#define USB_DEVICE_ID_QUAD_USB_JOYPAD   0x8800
+#define USB_DEVICE_ID_DUAL_USB_JOYPAD   0x8866
+
+#define USB_VENDOR_ID_WISEGROUP_LTD     0x6666
+#define USB_VENDOR_ID_WISEGROUP_LTD2    0x6677
+#define USB_DEVICE_ID_SMARTJOY_DUAL_PLUS 0x8802
+
+#define USB_VENDOR_ID_YEALINK           0x6993
+#define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K       0xb001
+
+#define USB_VENDOR_ID_ZEROPLUS          0x0c12
+
+#define USB_VENDOR_ID_KYE               0x0458
+#define USB_DEVICE_ID_KYE_GPEN_560      0x5003
+
+#endif
diff --git a/drivers/hid/hid-input-quirks.c b/drivers/hid/hid-input-quirks.c
deleted file mode 100644
index 16feea014494..000000000000
--- a/drivers/hid/hid-input-quirks.c
+++ /dev/null
@@ -1,484 +0,0 @@
-/*
- *  HID-input usage mapping quirks
- *
- *  This is used to handle HID-input mappings for devices violating
- *  HUT 1.12 specification.
- *
- * Copyright (c) 2007-2008 Jiri Kosina
- */
-
-/*
- * 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
- */
-
-#include <linux/input.h>
-#include <linux/hid.h>
-
-#define map_abs(c)      do { usage->code = c; usage->type = EV_ABS; *bit = input->absbit; *max = ABS_MAX; } while (0)
-#define map_rel(c)      do { usage->code = c; usage->type = EV_REL; *bit = input->relbit; *max = REL_MAX; } while (0)
-#define map_key(c)      do { usage->code = c; usage->type = EV_KEY; *bit = input->keybit; *max = KEY_MAX; } while (0)
-#define map_led(c)      do { usage->code = c; usage->type = EV_LED; *bit = input->ledbit; *max = LED_MAX; } while (0)
-
-#define map_abs_clear(c)        do { map_abs(c); clear_bit(c, *bit); } while (0)
-#define map_key_clear(c)        do { map_key(c); clear_bit(c, *bit); } while (0)
-
-static int quirk_belkin_wkbd(struct hid_usage *usage, struct input_dev *input,
-                              unsigned long **bit, int *max)
-{
-        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
-                return 0;
-
-        switch (usage->hid & HID_USAGE) {
-                case 0x03a: map_key_clear(KEY_SOUND);           break;
-                case 0x03b: map_key_clear(KEY_CAMERA);          break;
-                case 0x03c: map_key_clear(KEY_DOCUMENTS);       break;
-                default:
-                        return 0;
-        }
-        return 1;
-}
-
-static int quirk_cherry_cymotion(struct hid_usage *usage, struct input_dev *input,
-                              unsigned long **bit, int *max)
-{
-        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
-                return 0;
-
-        switch (usage->hid & HID_USAGE) {
-                case 0x301: map_key_clear(KEY_PROG1);           break;
-                case 0x302: map_key_clear(KEY_PROG2);           break;
-                case 0x303: map_key_clear(KEY_PROG3);           break;
-                default:
-                        return 0;
-        }
-        return 1;
-}
-
-static int quirk_logitech_ultrax_remote(struct hid_usage *usage, struct input_dev *input,
-                              unsigned long **bit, int *max)
-{
-        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_LOGIVENDOR)
-                return 0;
-
-        set_bit(EV_REP, input->evbit);
-        switch(usage->hid & HID_USAGE) {
-                /* Reported on Logitech Ultra X Media Remote */
-                case 0x004: map_key_clear(KEY_AGAIN);           break;
-                case 0x00d: map_key_clear(KEY_HOME);            break;
-                case 0x024: map_key_clear(KEY_SHUFFLE);         break;
-                case 0x025: map_key_clear(KEY_TV);              break;
-                case 0x026: map_key_clear(KEY_MENU);            break;
-                case 0x031: map_key_clear(KEY_AUDIO);           break;
-                case 0x032: map_key_clear(KEY_TEXT);            break;
-                case 0x033: map_key_clear(KEY_LAST);            break;
-                case 0x047: map_key_clear(KEY_MP3);             break;
-                case 0x048: map_key_clear(KEY_DVD);             break;
-                case 0x049: map_key_clear(KEY_MEDIA);           break;
-                case 0x04a: map_key_clear(KEY_VIDEO);           break;
-                case 0x04b: map_key_clear(KEY_ANGLE);           break;
-                case 0x04c: map_key_clear(KEY_LANGUAGE);        break;
-                case 0x04d: map_key_clear(KEY_SUBTITLE);        break;
-                case 0x051: map_key_clear(KEY_RED);             break;
-                case 0x052: map_key_clear(KEY_CLOSE);           break;
-
-                default:
-                        return 0;
-        }
-        return 1;
-}
-
-static int quirk_gyration_remote(struct hid_usage *usage, struct input_dev *input,
-                              unsigned long **bit, int *max)
-{
-        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_LOGIVENDOR)
-                return 0;
-
-        set_bit(EV_REP, input->evbit);
-        switch(usage->hid & HID_USAGE) {
-                /* Reported on Gyration MCE Remote */
-                case 0x00d: map_key_clear(KEY_HOME);            break;
-                case 0x024: map_key_clear(KEY_DVD);             break;
-                case 0x025: map_key_clear(KEY_PVR);             break;
-                case 0x046: map_key_clear(KEY_MEDIA);           break;
-                case 0x047: map_key_clear(KEY_MP3);             break;
-                case 0x049: map_key_clear(KEY_CAMERA);          break;
-                case 0x04a: map_key_clear(KEY_VIDEO);           break;
-
-                default:
-                        return 0;
-        }
-        return 1;
-}
-
-static int quirk_chicony_tactical_pad(struct hid_usage *usage, struct input_dev *input,
-                              unsigned long **bit, int *max)
-{
-        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_MSVENDOR)
-                return 0;
-
-        set_bit(EV_REP, input->evbit);
-        switch (usage->hid & HID_USAGE) {
-                case 0xff01: map_key_clear(BTN_1);              break;
-                case 0xff02: map_key_clear(BTN_2);              break;
-                case 0xff03: map_key_clear(BTN_3);              break;
-                case 0xff04: map_key_clear(BTN_4);              break;
-                case 0xff05: map_key_clear(BTN_5);              break;
-                case 0xff06: map_key_clear(BTN_6);              break;
-                case 0xff07: map_key_clear(BTN_7);              break;
-                case 0xff08: map_key_clear(BTN_8);              break;
-                case 0xff09: map_key_clear(BTN_9);              break;
-                case 0xff0a: map_key_clear(BTN_A);              break;
-                case 0xff0b: map_key_clear(BTN_B);              break;
-                default:
-                        return 0;
-        }
-        return 1;
-}
-
-static int quirk_microsoft_ergonomy_kb(struct hid_usage *usage, struct input_dev *input,
-                              unsigned long **bit, int *max)
-{
-        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_MSVENDOR)
-                return 0;
-
-        switch(usage->hid & HID_USAGE) {
-                case 0xfd06: map_key_clear(KEY_CHAT);           break;
-                case 0xfd07: map_key_clear(KEY_PHONE);          break;
-                case 0xff05:
-                        set_bit(EV_REP, input->evbit);
-                        map_key_clear(KEY_F13);
-                        set_bit(KEY_F14, input->keybit);
-                        set_bit(KEY_F15, input->keybit);
-                        set_bit(KEY_F16, input->keybit);
-                        set_bit(KEY_F17, input->keybit);
-                        set_bit(KEY_F18, input->keybit);
-                default:
-                        return 0;
-        }
-        return 1;
-}
-
-static int quirk_microsoft_presenter_8k(struct hid_usage *usage, struct input_dev *input,
-                              unsigned long **bit, int *max)
-{
-        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_MSVENDOR)
-                return 0;
-
-        set_bit(EV_REP, input->evbit);
-        switch(usage->hid & HID_USAGE) {
-                case 0xfd08: map_key_clear(KEY_FORWARD);        break;
-                case 0xfd09: map_key_clear(KEY_BACK);           break;
-                case 0xfd0b: map_key_clear(KEY_PLAYPAUSE);      break;
-                case 0xfd0e: map_key_clear(KEY_CLOSE);          break;
-                case 0xfd0f: map_key_clear(KEY_PLAY);           break;
-                default:
-                        return 0;
-        }
-        return 1;
-}
-
-static int quirk_petalynx_remote(struct hid_usage *usage, struct input_dev *input,
-                              unsigned long **bit, int *max)
-{
-        if (((usage->hid & HID_USAGE_PAGE) != HID_UP_LOGIVENDOR) &&
-                        ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER))
-                return 0;
-
-        if ((usage->hid & HID_USAGE_PAGE) == HID_UP_LOGIVENDOR)
-                switch(usage->hid & HID_USAGE) {
-                        case 0x05a: map_key_clear(KEY_TEXT);            break;
-                        case 0x05b: map_key_clear(KEY_RED);             break;
-                        case 0x05c: map_key_clear(KEY_GREEN);           break;
-                        case 0x05d: map_key_clear(KEY_YELLOW);          break;
-                        case 0x05e: map_key_clear(KEY_BLUE);            break;
-                        default:
-                                return 0;
-                }
-
-        if ((usage->hid & HID_USAGE_PAGE) == HID_UP_CONSUMER)
-                switch(usage->hid & HID_USAGE) {
-                        case 0x0f6: map_key_clear(KEY_NEXT);            break;
-                        case 0x0fa: map_key_clear(KEY_BACK);            break;
-                        default:
-                                return 0;
-                }
-        return 1;
-}
-
-static int quirk_logitech_wireless(struct hid_usage *usage, struct input_dev *input,
-                              unsigned long **bit, int *max)
-{
-        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
-                return 0;
-
-        switch (usage->hid & HID_USAGE) {
-                case 0x1001: map_key_clear(KEY_MESSENGER);      break;
-                case 0x1003: map_key_clear(KEY_SOUND);          break;
-                case 0x1004: map_key_clear(KEY_VIDEO);          break;
-                case 0x1005: map_key_clear(KEY_AUDIO);          break;
-                case 0x100a: map_key_clear(KEY_DOCUMENTS);      break;
-                case 0x1011: map_key_clear(KEY_PREVIOUSSONG);   break;
-                case 0x1012: map_key_clear(KEY_NEXTSONG);       break;
-                case 0x1013: map_key_clear(KEY_CAMERA);         break;
-                case 0x1014: map_key_clear(KEY_MESSENGER);      break;
-                case 0x1015: map_key_clear(KEY_RECORD);         break;
-                case 0x1016: map_key_clear(KEY_PLAYER);         break;
-                case 0x1017: map_key_clear(KEY_EJECTCD);        break;
-                case 0x1018: map_key_clear(KEY_MEDIA);          break;
-                case 0x1019: map_key_clear(KEY_PROG1);          break;
-                case 0x101a: map_key_clear(KEY_PROG2);          break;
-                case 0x101b: map_key_clear(KEY_PROG3);          break;
-                case 0x101f: map_key_clear(KEY_ZOOMIN);         break;
-                case 0x1020: map_key_clear(KEY_ZOOMOUT);        break;
-                case 0x1021: map_key_clear(KEY_ZOOMRESET);      break;
-                case 0x1023: map_key_clear(KEY_CLOSE);          break;
-                case 0x1027: map_key_clear(KEY_MENU);           break;
-                /* this one is marked as 'Rotate' */
-                case 0x1028: map_key_clear(KEY_ANGLE);          break;
-                case 0x1029: map_key_clear(KEY_SHUFFLE);        break;
-                case 0x102a: map_key_clear(KEY_BACK);           break;
-                case 0x102b: map_key_clear(KEY_CYCLEWINDOWS);   break;
-                case 0x1041: map_key_clear(KEY_BATTERY);        break;
-                case 0x1042: map_key_clear(KEY_WORDPROCESSOR);  break;
-                case 0x1043: map_key_clear(KEY_SPREADSHEET);    break;
-                case 0x1044: map_key_clear(KEY_PRESENTATION);   break;
-                case 0x1045: map_key_clear(KEY_UNDO);           break;
-                case 0x1046: map_key_clear(KEY_REDO);           break;
-                case 0x1047: map_key_clear(KEY_PRINT);          break;
-                case 0x1048: map_key_clear(KEY_SAVE);           break;
-                case 0x1049: map_key_clear(KEY_PROG1);          break;
-                case 0x104a: map_key_clear(KEY_PROG2);          break;
-                case 0x104b: map_key_clear(KEY_PROG3);          break;
-                case 0x104c: map_key_clear(KEY_PROG4);          break;
-
-                default:
-                        return 0;
-        }
-        return 1;
-}
-
-static int quirk_cherry_genius_29e(struct hid_usage *usage, struct input_dev *input,
-                              unsigned long **bit, int *max)
-{
-        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
-                return 0;
-
-        switch (usage->hid & HID_USAGE) {
-                case 0x156: map_key_clear(KEY_WORDPROCESSOR);   break;
-                case 0x157: map_key_clear(KEY_SPREADSHEET);     break;
-                case 0x158: map_key_clear(KEY_PRESENTATION);    break;
-                case 0x15c: map_key_clear(KEY_STOP);            break;
-
-                default:
-                        return 0;
-        }
-        return 1;
-}
-
-static int quirk_btc_8193(struct hid_usage *usage, struct input_dev *input,
-                              unsigned long **bit, int *max)
-{
-        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
-                return 0;
-
-        switch (usage->hid & HID_USAGE) {
-                case 0x230: map_key(BTN_MOUSE);                 break;
-                case 0x231: map_rel(REL_WHEEL);                 break;
-                /* 
-                 * this keyboard has a scrollwheel implemented in
-                 * totally broken way. We map this usage temporarily
-                 * to HWHEEL and handle it in the event quirk handler
-                 */
-                case 0x232: map_rel(REL_HWHEEL);                break;
-
-                default:
-                        return 0;
-        }
-        return 1;
-}
-
-static int quirk_sunplus_wdesktop(struct hid_usage *usage, struct input_dev *input,
-                              unsigned long **bit, int *max)
-{
-        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
-                return 0;
-
-        switch (usage->hid & HID_USAGE) {
-                case 0x2003: map_key_clear(KEY_ZOOMIN);         break;
-                case 0x2103: map_key_clear(KEY_ZOOMOUT);        break;
-                default:
-                        return 0;
-        }
-        return 1;
-}
-
-#define VENDOR_ID_BELKIN                        0x1020
-#define DEVICE_ID_BELKIN_WIRELESS_KEYBOARD      0x0006
-
-#define VENDOR_ID_CHERRY                        0x046a
-#define DEVICE_ID_CHERRY_CYMOTION               0x0023
-
-#define VENDOR_ID_CHICONY                       0x04f2
-#define DEVICE_ID_CHICONY_TACTICAL_PAD          0x0418
-
-#define VENDOR_ID_EZKEY                         0x0518
-#define DEVICE_ID_BTC_8193                      0x0002
-
-#define VENDOR_ID_GYRATION                      0x0c16
-#define DEVICE_ID_GYRATION_REMOTE               0x0002
-
-#define VENDOR_ID_LOGITECH                      0x046d
-#define DEVICE_ID_LOGITECH_RECEIVER             0xc101
-#define DEVICE_ID_S510_RECEIVER                 0xc50c
-#define DEVICE_ID_S510_RECEIVER_2               0xc517
-#define DEVICE_ID_MX3000_RECEIVER               0xc513
-
-#define VENDOR_ID_MICROSOFT                     0x045e
-#define DEVICE_ID_MS4K                          0x00db
-#define DEVICE_ID_MS6K                          0x00f9
-#define DEVICE_IS_MS_PRESENTER_8K_BT            0x0701
-#define DEVICE_ID_MS_PRESENTER_8K_USB           0x0713
-
-#define VENDOR_ID_MONTEREY                      0x0566
-#define DEVICE_ID_GENIUS_KB29E                  0x3004
-
-#define VENDOR_ID_PETALYNX                      0x18b1
-#define DEVICE_ID_PETALYNX_MAXTER_REMOTE        0x0037
-
-#define VENDOR_ID_SUNPLUS                       0x04fc
-#define DEVICE_ID_SUNPLUS_WDESKTOP              0x05d8
-
-static const struct hid_input_blacklist {
-        __u16 idVendor;
-        __u16 idProduct;
-        int (*quirk)(struct hid_usage *, struct input_dev *, unsigned long **, int *);
-} hid_input_blacklist[] = {
-        { VENDOR_ID_BELKIN, DEVICE_ID_BELKIN_WIRELESS_KEYBOARD, quirk_belkin_wkbd },
-
-        { VENDOR_ID_CHERRY, DEVICE_ID_CHERRY_CYMOTION, quirk_cherry_cymotion },
-
-        { VENDOR_ID_CHICONY, DEVICE_ID_CHICONY_TACTICAL_PAD, quirk_chicony_tactical_pad },
-
-        { VENDOR_ID_EZKEY, DEVICE_ID_BTC_8193, quirk_btc_8193 },
-
-        { VENDOR_ID_GYRATION, DEVICE_ID_GYRATION_REMOTE, quirk_gyration_remote },
-
-        { VENDOR_ID_LOGITECH, DEVICE_ID_LOGITECH_RECEIVER, quirk_logitech_ultrax_remote },
-        { VENDOR_ID_LOGITECH, DEVICE_ID_S510_RECEIVER, quirk_logitech_wireless },
-        { VENDOR_ID_LOGITECH, DEVICE_ID_S510_RECEIVER_2, quirk_logitech_wireless },
-        { VENDOR_ID_LOGITECH, DEVICE_ID_MX3000_RECEIVER, quirk_logitech_wireless },
-
-        { VENDOR_ID_MICROSOFT, DEVICE_ID_MS4K, quirk_microsoft_ergonomy_kb },
-        { VENDOR_ID_MICROSOFT, DEVICE_ID_MS6K, quirk_microsoft_ergonomy_kb },
-        { VENDOR_ID_MICROSOFT, DEVICE_IS_MS_PRESENTER_8K_BT, quirk_microsoft_presenter_8k },
-        { VENDOR_ID_MICROSOFT, DEVICE_ID_MS_PRESENTER_8K_USB, quirk_microsoft_presenter_8k },
-
-        { VENDOR_ID_MONTEREY, DEVICE_ID_GENIUS_KB29E, quirk_cherry_genius_29e },
-
-        { VENDOR_ID_PETALYNX, DEVICE_ID_PETALYNX_MAXTER_REMOTE, quirk_petalynx_remote },
-
-        { VENDOR_ID_SUNPLUS, DEVICE_ID_SUNPLUS_WDESKTOP, quirk_sunplus_wdesktop },
-
-        { 0, 0, NULL }
-};
-
-int hidinput_mapping_quirks(struct hid_usage *usage, 
-                                   struct input_dev *input, 
-                                   unsigned long **bit, int *max)
-{
-        struct hid_device *device = input_get_drvdata(input);
-        int i = 0;
-        
-        while (hid_input_blacklist[i].quirk) {
-                if (hid_input_blacklist[i].idVendor == device->vendor &&
-                                hid_input_blacklist[i].idProduct == device->product)
-                        return hid_input_blacklist[i].quirk(usage, input, bit, max);
-                i++;
-        }
-        return 0;
-}
-
-int hidinput_event_quirks(struct hid_device *hid, struct hid_field *field, struct hid_usage *usage, __s32 value)
-{
-        struct input_dev *input;
-
-        input = field->hidinput->input;
-
-        if (((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_5) && (usage->hid == 0x00090005))
-                || ((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_7) && (usage->hid == 0x00090007))) {
-                if (value) hid->quirks |=  HID_QUIRK_2WHEEL_MOUSE_HACK_ON;
-                else       hid->quirks &= ~HID_QUIRK_2WHEEL_MOUSE_HACK_ON;
-                return 1;
-        }
-
-        if ((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_B8) &&
-                        (usage->type == EV_REL) &&
-                        (usage->code == REL_WHEEL)) {
-                hid->delayed_value = value;
-                return 1;
-        }
-
-        if ((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_B8) &&
-                        (usage->hid == 0x000100b8)) {
-                input_event(input, EV_REL, value ? REL_HWHEEL : REL_WHEEL, hid->delayed_value);
-                return 1;
-        }
-
-        if ((hid->quirks & HID_QUIRK_INVERT_HWHEEL) && (usage->code == REL_HWHEEL)) {
-                input_event(input, usage->type, usage->code, -value);
-                return 1;
-        }
-
-        if ((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_ON) && (usage->code == REL_WHEEL)) {
-                input_event(input, usage->type, REL_HWHEEL, value);
-                return 1;
-        }
-
-        if ((hid->quirks & HID_QUIRK_APPLE_HAS_FN) && hidinput_apple_event(hid, input, usage, value))
-                return 1;
-
-        /* Handling MS keyboards special buttons */
-        if (hid->quirks & HID_QUIRK_MICROSOFT_KEYS && 
-                        usage->hid == (HID_UP_MSVENDOR | 0xff05)) {
-                int key = 0;
-                static int last_key = 0;
-                switch (value) {
-                        case 0x01: key = KEY_F14; break;
-                        case 0x02: key = KEY_F15; break;
-                        case 0x04: key = KEY_F16; break;
-                        case 0x08: key = KEY_F17; break;
-                        case 0x10: key = KEY_F18; break;
-                        default: break;
-                }
-                if (key) {
-                        input_event(input, usage->type, key, 1);
-                        last_key = key;
-                } else {
-                        input_event(input, usage->type, last_key, 0);
-                }
-        }
-
-        /* handle the temporary quirky mapping to HWHEEL */
-        if (hid->quirks & HID_QUIRK_HWHEEL_WHEEL_INVERT &&
-                        usage->type == EV_REL && usage->code == REL_HWHEEL) {
-                input_event(input, usage->type, REL_WHEEL, -value);
-                return 1;
-        }
-
-        /* Gyration MCE remote "Sleep" key */
-        if (hid->vendor == VENDOR_ID_GYRATION &&
-            hid->product == DEVICE_ID_GYRATION_REMOTE &&
-            (usage->hid & HID_USAGE_PAGE) == HID_UP_GENDESK &&
-            (usage->hid & 0xff) == 0x82) {
-                input_event(input, usage->type, usage->code, 1);
-                input_sync(input);
-                input_event(input, usage->type, usage->code, 0);
-                input_sync(input);
-                return 1;
-        }
-        return 0;
-}
-
-
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 1b2e8dc3398d..7f183b7147e1 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -32,11 +32,6 @@
 #include <linux/hid.h>
 #include <linux/hid-debug.h>
 
-static int hid_apple_fnmode = 1;
-module_param_named(pb_fnmode, hid_apple_fnmode, int, 0644);
-MODULE_PARM_DESC(pb_fnmode,
-                "Mode of fn key on Apple keyboards (0 = disabled, 1 = fkeyslast, 2 = fkeysfirst)");
-
 #define unk     KEY_UNKNOWN
 
 static const unsigned char hid_keyboard[256] = {
@@ -58,227 +53,20 @@ static const unsigned char hid_keyboard[256] = {
         150,158,159,128,136,177,178,176,142,152,173,140,unk,unk,unk,unk
 };
 
-/* extended mapping for certain Logitech hardware (Logitech cordless desktop LX500) */
-#define LOGITECH_EXPANDED_KEYMAP_SIZE 80
-static int logitech_expanded_keymap[LOGITECH_EXPANDED_KEYMAP_SIZE] = {
-          0,216,  0,213,175,156,  0,  0,  0,  0,
-        144,  0,  0,  0,  0,  0,  0,  0,  0,212,
-        174,167,152,161,112,  0,  0,  0,154,  0,
-          0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-          0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-          0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-          0,  0,  0,  0,  0,183,184,185,186,187,
-        188,189,190,191,192,193,194,  0,  0,  0
-};
-
 static const struct {
         __s32 x;
         __s32 y;
 }  hid_hat_to_axis[] = {{ 0, 0}, { 0,-1}, { 1,-1}, { 1, 0}, { 1, 1}, { 0, 1}, {-1, 1}, {-1, 0}, {-1,-1}};
 
-#define map_abs(c)      do { usage->code = c; usage->type = EV_ABS; bit = input->absbit; max = ABS_MAX; } while (0)
-#define map_rel(c)      do { usage->code = c; usage->type = EV_REL; bit = input->relbit; max = REL_MAX; } while (0)
-#define map_key(c)      do { usage->code = c; usage->type = EV_KEY; bit = input->keybit; max = KEY_MAX; } while (0)
-#define map_led(c)      do { usage->code = c; usage->type = EV_LED; bit = input->ledbit; max = LED_MAX; } while (0)
-
-#define map_abs_clear(c)        do { map_abs(c); clear_bit(c, bit); } while (0)
-#define map_key_clear(c)        do { map_key(c); clear_bit(c, bit); } while (0)
-
-#ifdef CONFIG_USB_HIDINPUT_POWERBOOK
-
-struct hidinput_key_translation {
-        u16 from;
-        u16 to;
-        u8 flags;
-};
-
-#define APPLE_FLAG_FKEY 0x01
-
-static struct hidinput_key_translation apple_fn_keys[] = {
-        { KEY_BACKSPACE, KEY_DELETE },
-        { KEY_F1,       KEY_BRIGHTNESSDOWN, APPLE_FLAG_FKEY },
-        { KEY_F2,       KEY_BRIGHTNESSUP,   APPLE_FLAG_FKEY },
-        { KEY_F3,       KEY_FN_F5,          APPLE_FLAG_FKEY }, /* Exposé */
-        { KEY_F4,       KEY_FN_F4,          APPLE_FLAG_FKEY }, /* Dashboard */
-        { KEY_F5,       KEY_KBDILLUMDOWN,   APPLE_FLAG_FKEY },
-        { KEY_F6,       KEY_KBDILLUMUP,     APPLE_FLAG_FKEY },
-        { KEY_F7,       KEY_PREVIOUSSONG,   APPLE_FLAG_FKEY },
-        { KEY_F8,       KEY_PLAYPAUSE,      APPLE_FLAG_FKEY },
-        { KEY_F9,       KEY_NEXTSONG,       APPLE_FLAG_FKEY },
-        { KEY_F10,      KEY_MUTE,           APPLE_FLAG_FKEY },
-        { KEY_F11,      KEY_VOLUMEDOWN,     APPLE_FLAG_FKEY },
-        { KEY_F12,      KEY_VOLUMEUP,       APPLE_FLAG_FKEY },
-        { KEY_UP,       KEY_PAGEUP },
-        { KEY_DOWN,     KEY_PAGEDOWN },
-        { KEY_LEFT,     KEY_HOME },
-        { KEY_RIGHT,    KEY_END },
-        { }
-};
-
-static struct hidinput_key_translation powerbook_fn_keys[] = {
-        { KEY_BACKSPACE, KEY_DELETE },
-        { KEY_F1,       KEY_BRIGHTNESSDOWN,     APPLE_FLAG_FKEY },
-        { KEY_F2,       KEY_BRIGHTNESSUP,       APPLE_FLAG_FKEY },
-        { KEY_F3,       KEY_MUTE,               APPLE_FLAG_FKEY },
-        { KEY_F4,       KEY_VOLUMEDOWN,         APPLE_FLAG_FKEY },
-        { KEY_F5,       KEY_VOLUMEUP,           APPLE_FLAG_FKEY },
-        { KEY_F6,       KEY_NUMLOCK,            APPLE_FLAG_FKEY },
-        { KEY_F7,       KEY_SWITCHVIDEOMODE,    APPLE_FLAG_FKEY },
-        { KEY_F8,       KEY_KBDILLUMTOGGLE,     APPLE_FLAG_FKEY },
-        { KEY_F9,       KEY_KBDILLUMDOWN,       APPLE_FLAG_FKEY },
-        { KEY_F10,      KEY_KBDILLUMUP,         APPLE_FLAG_FKEY },
-        { KEY_UP,       KEY_PAGEUP },
-        { KEY_DOWN,     KEY_PAGEDOWN },
-        { KEY_LEFT,     KEY_HOME },
-        { KEY_RIGHT,    KEY_END },
-        { }
-};
-
-static struct hidinput_key_translation powerbook_numlock_keys[] = {
-        { KEY_J,        KEY_KP1 },
-        { KEY_K,        KEY_KP2 },
-        { KEY_L,        KEY_KP3 },
-        { KEY_U,        KEY_KP4 },
-        { KEY_I,        KEY_KP5 },
-        { KEY_O,        KEY_KP6 },
-        { KEY_7,        KEY_KP7 },
-        { KEY_8,        KEY_KP8 },
-        { KEY_9,        KEY_KP9 },
-        { KEY_M,        KEY_KP0 },
-        { KEY_DOT,      KEY_KPDOT },
-        { KEY_SLASH,    KEY_KPPLUS },
-        { KEY_SEMICOLON, KEY_KPMINUS },
-        { KEY_P,        KEY_KPASTERISK },
-        { KEY_MINUS,    KEY_KPEQUAL },
-        { KEY_0,        KEY_KPSLASH },
-        { KEY_F6,       KEY_NUMLOCK },
-        { KEY_KPENTER,  KEY_KPENTER },
-        { KEY_BACKSPACE, KEY_BACKSPACE },
-        { }
-};
-
-static struct hidinput_key_translation apple_iso_keyboard[] = {
-        { KEY_GRAVE,    KEY_102ND },
-        { KEY_102ND,    KEY_GRAVE },
-        { }
-};
+#define map_abs(c)      hid_map_usage(hidinput, usage, &bit, &max, EV_ABS, (c))
+#define map_rel(c)      hid_map_usage(hidinput, usage, &bit, &max, EV_REL, (c))
+#define map_key(c)      hid_map_usage(hidinput, usage, &bit, &max, EV_KEY, (c))
+#define map_led(c)      hid_map_usage(hidinput, usage, &bit, &max, EV_LED, (c))
 
-static struct hidinput_key_translation *find_translation(struct hidinput_key_translation *table, u16 from)
-{
-        struct hidinput_key_translation *trans;
-
-        /* Look for the translation */
-        for (trans = table; trans->from; trans++)
-                if (trans->from == from)
-                        return trans;
-
-        return NULL;
-}
-
-int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
-                struct hid_usage *usage, __s32 value)
-{
-        struct hidinput_key_translation *trans;
-
-        if (usage->code == KEY_FN) {
-                if (value) hid->quirks |=  HID_QUIRK_APPLE_FN_ON;
-                else       hid->quirks &= ~HID_QUIRK_APPLE_FN_ON;
-
-                input_event(input, usage->type, usage->code, value);
-
-                return 1;
-        }
-
-        if (hid_apple_fnmode) {
-                int do_translate;
-
-                trans = find_translation((hid->product < 0x220 ||
-                                          hid->product >= 0x300) ?
-                                         powerbook_fn_keys : apple_fn_keys,
-                                         usage->code);
-                if (trans) {
-                        if (test_bit(usage->code, hid->apple_pressed_fn))
-                                do_translate = 1;
-                        else if (trans->flags & APPLE_FLAG_FKEY)
-                                do_translate =
-                                        (hid_apple_fnmode == 2 &&  (hid->quirks & HID_QUIRK_APPLE_FN_ON)) ||
-                                        (hid_apple_fnmode == 1 && !(hid->quirks & HID_QUIRK_APPLE_FN_ON));
-                        else
-                                do_translate = (hid->quirks & HID_QUIRK_APPLE_FN_ON);
-
-                        if (do_translate) {
-                                if (value)
-                                        set_bit(usage->code, hid->apple_pressed_fn);
-                                else
-                                        clear_bit(usage->code, hid->apple_pressed_fn);
-
-                                input_event(input, usage->type, trans->to, value);
-
-                                return 1;
-                        }
-                }
-
-                if (hid->quirks & HID_QUIRK_APPLE_NUMLOCK_EMULATION && (
-                                test_bit(usage->code, hid->pb_pressed_numlock) ||
-                                test_bit(LED_NUML, input->led))) {
-                        trans = find_translation(powerbook_numlock_keys, usage->code);
-
-                        if (trans) {
-                                if (value)
-                                        set_bit(usage->code, hid->pb_pressed_numlock);
-                                else
-                                        clear_bit(usage->code, hid->pb_pressed_numlock);
-
-                                input_event(input, usage->type, trans->to, value);
-                        }
-
-                        return 1;
-                }
-        }
-
-        if (hid->quirks & HID_QUIRK_APPLE_ISO_KEYBOARD) {
-                trans = find_translation(apple_iso_keyboard, usage->code);
-                if (trans) {
-                        input_event(input, usage->type, trans->to, value);
-                        return 1;
-                }
-        }
-
-        return 0;
-}
-
-static void hidinput_apple_setup(struct input_dev *input)
-{
-        struct hidinput_key_translation *trans;
-
-        set_bit(KEY_NUMLOCK, input->keybit);
-
-        /* Enable all needed keys */
-        for (trans = apple_fn_keys; trans->from; trans++)
-                set_bit(trans->to, input->keybit);
-
-        for (trans = powerbook_fn_keys; trans->from; trans++)
-                set_bit(trans->to, input->keybit);
-
-        for (trans = powerbook_numlock_keys; trans->from; trans++)
-                set_bit(trans->to, input->keybit);
-
-        for (trans = apple_iso_keyboard; trans->from; trans++)
-                set_bit(trans->to, input->keybit);
-
-}
-#else
-inline int hidinput_apple_event(struct hid_device *hid,
-                                       struct input_dev *input,
-                                       struct hid_usage *usage, __s32 value)
-{
-        return 0;
-}
-
-static inline void hidinput_apple_setup(struct input_dev *input)
-{
-}
-#endif
+#define map_abs_clear(c)        hid_map_usage_clear(hidinput, usage, &bit, \
+                &max, EV_ABS, (c))
+#define map_key_clear(c)        hid_map_usage_clear(hidinput, usage, &bit, \
+                &max, EV_KEY, (c))
 
 static inline int match_scancode(int code, int scancode)
 {
@@ -366,7 +154,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
 {
         struct input_dev *input = hidinput->input;
         struct hid_device *device = input_get_drvdata(input);
-        int max = 0, code, ret;
+        int max = 0, code;
         unsigned long *bit = NULL;
 
         field->hidinput = hidinput;
@@ -385,406 +173,345 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                 goto ignore;
         }
 
-        /* handle input mappings for quirky devices */
-        ret = hidinput_mapping_quirks(usage, input, &bit, &max);
-        if (ret)
-                goto mapped;
+        if (device->driver->input_mapping) {
+                int ret = device->driver->input_mapping(device, hidinput, field,
+                                usage, &bit, &max);
+                if (ret > 0)
+                        goto mapped;
+                if (ret < 0)
+                        goto ignore;
+        }
 
         switch (usage->hid & HID_USAGE_PAGE) {
+        case HID_UP_UNDEFINED:
+                goto ignore;
 
-                case HID_UP_UNDEFINED:
-                        goto ignore;
-
-                case HID_UP_KEYBOARD:
+        case HID_UP_KEYBOARD:
+                set_bit(EV_REP, input->evbit);
 
-                        set_bit(EV_REP, input->evbit);
+                if ((usage->hid & HID_USAGE) < 256) {
+                        if (!hid_keyboard[usage->hid & HID_USAGE]) goto ignore;
+                        map_key_clear(hid_keyboard[usage->hid & HID_USAGE]);
+                } else
+                        map_key(KEY_UNKNOWN);
 
-                        if ((usage->hid & HID_USAGE) < 256) {
-                                if (!hid_keyboard[usage->hid & HID_USAGE]) goto ignore;
-                                map_key_clear(hid_keyboard[usage->hid & HID_USAGE]);
-                        } else
-                                map_key(KEY_UNKNOWN);
+                break;
 
-                        break;
+        case HID_UP_BUTTON:
+                code = ((usage->hid - 1) & 0xf);
 
-                case HID_UP_BUTTON:
-
-                        code = ((usage->hid - 1) & 0xf);
-
-                        switch (field->application) {
-                                case HID_GD_MOUSE:
-                                case HID_GD_POINTER:  code += 0x110; break;
-                                case HID_GD_JOYSTICK: code += 0x120; break;
-                                case HID_GD_GAMEPAD:  code += 0x130; break;
-                                default:
-                                        switch (field->physical) {
-                                                case HID_GD_MOUSE:
-                                                case HID_GD_POINTER:  code += 0x110; break;
-                                                case HID_GD_JOYSTICK: code += 0x120; break;
-                                                case HID_GD_GAMEPAD:  code += 0x130; break;
-                                                default:              code += 0x100;
-                                        }
-                        }
-
-                        /* Special handling for Logitech Cordless Desktop */
-                        if (field->application != HID_GD_MOUSE) {
-                                if (device->quirks & HID_QUIRK_LOGITECH_EXPANDED_KEYMAP) {
-                                        int hid = usage->hid & HID_USAGE;
-                                        if (hid < LOGITECH_EXPANDED_KEYMAP_SIZE && logitech_expanded_keymap[hid] != 0)
-                                                code = logitech_expanded_keymap[hid];
-                                }
-                        } else {
-                                if (device->quirks & HID_QUIRK_LOGITECH_IGNORE_DOUBLED_WHEEL) {
-                                        int hid = usage->hid & HID_USAGE;
-                                        if (hid == 7 || hid == 8)
-                                                goto ignore;
-                                }
+                switch (field->application) {
+                case HID_GD_MOUSE:
+                case HID_GD_POINTER:  code += 0x110; break;
+                case HID_GD_JOYSTICK: code += 0x120; break;
+                case HID_GD_GAMEPAD:  code += 0x130; break;
+                default:
+                        switch (field->physical) {
+                        case HID_GD_MOUSE:
+                        case HID_GD_POINTER:  code += 0x110; break;
+                        case HID_GD_JOYSTICK: code += 0x120; break;
+                        case HID_GD_GAMEPAD:  code += 0x130; break;
+                        default:              code += 0x100;
                         }
+                }
 
-                        map_key(code);
-                        break;
-
-
-                case HID_UP_SIMULATION:
-
-                        switch (usage->hid & 0xffff) {
-                                case 0xba: map_abs(ABS_RUDDER);   break;
-                                case 0xbb: map_abs(ABS_THROTTLE); break;
-                                case 0xc4: map_abs(ABS_GAS);      break;
-                                case 0xc5: map_abs(ABS_BRAKE);    break;
-                                case 0xc8: map_abs(ABS_WHEEL);    break;
-                                default:   goto ignore;
+                map_key(code);
+                break;
+
+        case HID_UP_SIMULATION:
+                switch (usage->hid & 0xffff) {
+                case 0xba: map_abs(ABS_RUDDER);   break;
+                case 0xbb: map_abs(ABS_THROTTLE); break;
+                case 0xc4: map_abs(ABS_GAS);      break;
+                case 0xc5: map_abs(ABS_BRAKE);    break;
+                case 0xc8: map_abs(ABS_WHEEL);    break;
+                default:   goto ignore;
+                }
+                break;
+
+        case HID_UP_GENDESK:
+                if ((usage->hid & 0xf0) == 0x80) {      /* SystemControl */
+                        switch (usage->hid & 0xf) {
+                        case 0x1: map_key_clear(KEY_POWER);  break;
+                        case 0x2: map_key_clear(KEY_SLEEP);  break;
+                        case 0x3: map_key_clear(KEY_WAKEUP); break;
+                        default: goto unknown;
                         }
                         break;
+                }
 
-                case HID_UP_GENDESK:
-
-                        if ((usage->hid & 0xf0) == 0x80) {      /* SystemControl */
-                                switch (usage->hid & 0xf) {
-                                        case 0x1: map_key_clear(KEY_POWER);  break;
-                                        case 0x2: map_key_clear(KEY_SLEEP);  break;
-                                        case 0x3: map_key_clear(KEY_WAKEUP); break;
-                                        default: goto unknown;
-                                }
-                                break;
-                        }
-
-                        if ((usage->hid & 0xf0) == 0x90) {      /* D-pad */
-                                switch (usage->hid) {
-                                        case HID_GD_UP:    usage->hat_dir = 1; break;
-                                        case HID_GD_DOWN:  usage->hat_dir = 5; break;
-                                        case HID_GD_RIGHT: usage->hat_dir = 3; break;
-                                        case HID_GD_LEFT:  usage->hat_dir = 7; break;
-                                        default: goto unknown;
-                                }
-                                if (field->dpad) {
-                                        map_abs(field->dpad);
-                                        goto ignore;
-                                }
-                                map_abs(ABS_HAT0X);
-                                break;
-                        }
-
+                if ((usage->hid & 0xf0) == 0x90) {      /* D-pad */
                         switch (usage->hid) {
-
-                                /* These usage IDs map directly to the usage codes. */
-                                case HID_GD_X: case HID_GD_Y: case HID_GD_Z:
-                                case HID_GD_RX: case HID_GD_RY: case HID_GD_RZ:
-                                case HID_GD_SLIDER: case HID_GD_DIAL: case HID_GD_WHEEL:
-                                        if (field->flags & HID_MAIN_ITEM_RELATIVE)
-                                                map_rel(usage->hid & 0xf);
-                                        else
-                                                map_abs(usage->hid & 0xf);
-                                        break;
-
-                                case HID_GD_HATSWITCH:
-                                        usage->hat_min = field->logical_minimum;
-                                        usage->hat_max = field->logical_maximum;
-                                        map_abs(ABS_HAT0X);
-                                        break;
-
-                                case HID_GD_START:      map_key_clear(BTN_START);       break;
-                                case HID_GD_SELECT:     map_key_clear(BTN_SELECT);      break;
-
-                                default: goto unknown;
+                        case HID_GD_UP:    usage->hat_dir = 1; break;
+                        case HID_GD_DOWN:  usage->hat_dir = 5; break;
+                        case HID_GD_RIGHT: usage->hat_dir = 3; break;
+                        case HID_GD_LEFT:  usage->hat_dir = 7; break;
+                        default: goto unknown;
                         }
-
-                        break;
-
-                case HID_UP_LED:
-
-                        switch (usage->hid & 0xffff) {                        /* HID-Value:                   */
-                                case 0x01:  map_led (LED_NUML);     break;    /*   "Num Lock"                 */
-                                case 0x02:  map_led (LED_CAPSL);    break;    /*   "Caps Lock"                */
-                                case 0x03:  map_led (LED_SCROLLL);  break;    /*   "Scroll Lock"              */
-                                case 0x04:  map_led (LED_COMPOSE);  break;    /*   "Compose"                  */
-                                case 0x05:  map_led (LED_KANA);     break;    /*   "Kana"                     */
-                                case 0x27:  map_led (LED_SLEEP);    break;    /*   "Stand-By"                 */
-                                case 0x4c:  map_led (LED_SUSPEND);  break;    /*   "System Suspend"           */
-                                case 0x09:  map_led (LED_MUTE);     break;    /*   "Mute"                     */
-                                case 0x4b:  map_led (LED_MISC);     break;    /*   "Generic Indicator"        */
-                                case 0x19:  map_led (LED_MAIL);     break;    /*   "Message Waiting"          */
-                                case 0x4d:  map_led (LED_CHARGING); break;    /*   "External Power Connected" */
-
-                                default: goto ignore;
+                        if (field->dpad) {
+                                map_abs(field->dpad);
+                                goto ignore;
                         }
+                        map_abs(ABS_HAT0X);
                         break;
+                }
 
-                case HID_UP_DIGITIZER:
-
-                        switch (usage->hid & 0xff) {
-
-                                case 0x30: /* TipPressure */
-                                        if (!test_bit(BTN_TOUCH, input->keybit)) {
-                                                device->quirks |= HID_QUIRK_NOTOUCH;
-                                                set_bit(EV_KEY, input->evbit);
-                                                set_bit(BTN_TOUCH, input->keybit);
-                                        }
-
-                                        map_abs_clear(ABS_PRESSURE);
-                                        break;
-
-                                case 0x32: /* InRange */
-                                        switch (field->physical & 0xff) {
-                                                case 0x21: map_key(BTN_TOOL_MOUSE); break;
-                                                case 0x22: map_key(BTN_TOOL_FINGER); break;
-                                                default: map_key(BTN_TOOL_PEN); break;
-                                        }
-                                        break;
+                switch (usage->hid) {
+                /* These usage IDs map directly to the usage codes. */
+                case HID_GD_X: case HID_GD_Y: case HID_GD_Z:
+                case HID_GD_RX: case HID_GD_RY: case HID_GD_RZ:
+                case HID_GD_SLIDER: case HID_GD_DIAL: case HID_GD_WHEEL:
+                        if (field->flags & HID_MAIN_ITEM_RELATIVE)
+                                map_rel(usage->hid & 0xf);
+                        else
+                                map_abs(usage->hid & 0xf);
+                        break;
 
-                                case 0x3c: /* Invert */
-                                        map_key_clear(BTN_TOOL_RUBBER);
-                                        break;
+                case HID_GD_HATSWITCH:
+                        usage->hat_min = field->logical_minimum;
+                        usage->hat_max = field->logical_maximum;
+                        map_abs(ABS_HAT0X);
+                        break;
 
-                                case 0x33: /* Touch */
-                                case 0x42: /* TipSwitch */
-                                case 0x43: /* TipSwitch2 */
-                                        device->quirks &= ~HID_QUIRK_NOTOUCH;
-                                        map_key_clear(BTN_TOUCH);
-                                        break;
+                case HID_GD_START:      map_key_clear(BTN_START);       break;
+                case HID_GD_SELECT:     map_key_clear(BTN_SELECT);      break;
 
-                                case 0x44: /* BarrelSwitch */
-                                        map_key_clear(BTN_STYLUS);
-                                        break;
+                default: goto unknown;
+                }
 
-                                default:  goto unknown;
+                break;
+
+        case HID_UP_LED:
+                switch (usage->hid & 0xffff) {                /* HID-Value:                   */
+                case 0x01:  map_led (LED_NUML);     break;    /*   "Num Lock"                 */
+                case 0x02:  map_led (LED_CAPSL);    break;    /*   "Caps Lock"                */
+                case 0x03:  map_led (LED_SCROLLL);  break;    /*   "Scroll Lock"              */
+                case 0x04:  map_led (LED_COMPOSE);  break;    /*   "Compose"                  */
+                case 0x05:  map_led (LED_KANA);     break;    /*   "Kana"                     */
+                case 0x27:  map_led (LED_SLEEP);    break;    /*   "Stand-By"                 */
+                case 0x4c:  map_led (LED_SUSPEND);  break;    /*   "System Suspend"           */
+                case 0x09:  map_led (LED_MUTE);     break;    /*   "Mute"                     */
+                case 0x4b:  map_led (LED_MISC);     break;    /*   "Generic Indicator"        */
+                case 0x19:  map_led (LED_MAIL);     break;    /*   "Message Waiting"          */
+                case 0x4d:  map_led (LED_CHARGING); break;    /*   "External Power Connected" */
+
+                default: goto ignore;
+                }
+                break;
+
+        case HID_UP_DIGITIZER:
+                switch (usage->hid & 0xff) {
+                case 0x30: /* TipPressure */
+                        if (!test_bit(BTN_TOUCH, input->keybit)) {
+                                device->quirks |= HID_QUIRK_NOTOUCH;
+                                set_bit(EV_KEY, input->evbit);
+                                set_bit(BTN_TOUCH, input->keybit);
                         }
+                        map_abs_clear(ABS_PRESSURE);
                         break;
 
-                case HID_UP_CONSUMER:   /* USB HUT v1.1, pages 56-62 */
-
-                        switch (usage->hid & HID_USAGE) {
-                                case 0x000: goto ignore;
-                                case 0x034: map_key_clear(KEY_SLEEP);           break;
-                                case 0x036: map_key_clear(BTN_MISC);            break;
-
-                                case 0x040: map_key_clear(KEY_MENU);            break;
-                                case 0x045: map_key_clear(KEY_RADIO);           break;
-
-                                case 0x083: map_key_clear(KEY_LAST);            break;
-                                case 0x088: map_key_clear(KEY_PC);              break;
-                                case 0x089: map_key_clear(KEY_TV);              break;
-                                case 0x08a: map_key_clear(KEY_WWW);             break;
-                                case 0x08b: map_key_clear(KEY_DVD);             break;
-                                case 0x08c: map_key_clear(KEY_PHONE);           break;
-                                case 0x08d: map_key_clear(KEY_PROGRAM);         break;
-                                case 0x08e: map_key_clear(KEY_VIDEOPHONE);      break;
-                                case 0x08f: map_key_clear(KEY_GAMES);           break;
-                                case 0x090: map_key_clear(KEY_MEMO);            break;
-                                case 0x091: map_key_clear(KEY_CD);              break;
-                                case 0x092: map_key_clear(KEY_VCR);             break;
-                                case 0x093: map_key_clear(KEY_TUNER);           break;
-                                case 0x094: map_key_clear(KEY_EXIT);            break;
-                                case 0x095: map_key_clear(KEY_HELP);            break;
-                                case 0x096: map_key_clear(KEY_TAPE);            break;
-                                case 0x097: map_key_clear(KEY_TV2);             break;
-                                case 0x098: map_key_clear(KEY_SAT);             break;
-                                case 0x09a: map_key_clear(KEY_PVR);             break;
-
-                                case 0x09c: map_key_clear(KEY_CHANNELUP);       break;
-                                case 0x09d: map_key_clear(KEY_CHANNELDOWN);     break;
-                                case 0x0a0: map_key_clear(KEY_VCR2);            break;
-
-                                case 0x0b0: map_key_clear(KEY_PLAY);            break;
-                                case 0x0b1: map_key_clear(KEY_PAUSE);           break;
-                                case 0x0b2: map_key_clear(KEY_RECORD);          break;
-                                case 0x0b3: map_key_clear(KEY_FASTFORWARD);     break;
-                                case 0x0b4: map_key_clear(KEY_REWIND);          break;
-                                case 0x0b5: map_key_clear(KEY_NEXTSONG);        break;
-                                case 0x0b6: map_key_clear(KEY_PREVIOUSSONG);    break;
-                                case 0x0b7: map_key_clear(KEY_STOPCD);          break;
-                                case 0x0b8: map_key_clear(KEY_EJECTCD);         break;
-                                case 0x0bc: map_key_clear(KEY_MEDIA_REPEAT);    break;
-
-                                case 0x0cd: map_key_clear(KEY_PLAYPAUSE);       break;
-                                case 0x0e0: map_abs_clear(ABS_VOLUME);          break;
-                                case 0x0e2: map_key_clear(KEY_MUTE);            break;
-                                case 0x0e5: map_key_clear(KEY_BASSBOOST);       break;
-                                case 0x0e9: map_key_clear(KEY_VOLUMEUP);        break;
-                                case 0x0ea: map_key_clear(KEY_VOLUMEDOWN);      break;
-
-                                case 0x182: map_key_clear(KEY_BOOKMARKS);       break;
-                                case 0x183: map_key_clear(KEY_CONFIG);          break;
-                                case 0x184: map_key_clear(KEY_WORDPROCESSOR);   break;
-                                case 0x185: map_key_clear(KEY_EDITOR);          break;
-                                case 0x186: map_key_clear(KEY_SPREADSHEET);     break;
-                                case 0x187: map_key_clear(KEY_GRAPHICSEDITOR);  break;
-                                case 0x188: map_key_clear(KEY_PRESENTATION);    break;
-                                case 0x189: map_key_clear(KEY_DATABASE);        break;
-                                case 0x18a: map_key_clear(KEY_MAIL);            break;
-                                case 0x18b: map_key_clear(KEY_NEWS);            break;
-                                case 0x18c: map_key_clear(KEY_VOICEMAIL);       break;
-                                case 0x18d: map_key_clear(KEY_ADDRESSBOOK);     break;
-                                case 0x18e: map_key_clear(KEY_CALENDAR);        break;
-                                case 0x191: map_key_clear(KEY_FINANCE);         break;
-                                case 0x192: map_key_clear(KEY_CALC);            break;
-                                case 0x194: map_key_clear(KEY_FILE);            break;
-                                case 0x196: map_key_clear(KEY_WWW);             break;
-                                case 0x19c: map_key_clear(KEY_LOGOFF);          break;
-                                case 0x19e: map_key_clear(KEY_COFFEE);          break;
-                                case 0x1a6: map_key_clear(KEY_HELP);            break;
-                                case 0x1a7: map_key_clear(KEY_DOCUMENTS);       break;
-                                case 0x1ab: map_key_clear(KEY_SPELLCHECK);      break;
-                                case 0x1b6: map_key_clear(KEY_MEDIA);           break;
-                                case 0x1b7: map_key_clear(KEY_SOUND);           break;
-                                case 0x1bc: map_key_clear(KEY_MESSENGER);       break;
-                                case 0x1bd: map_key_clear(KEY_INFO);            break;
-                                case 0x201: map_key_clear(KEY_NEW);             break;
-                                case 0x202: map_key_clear(KEY_OPEN);            break;
-                                case 0x203: map_key_clear(KEY_CLOSE);           break;
-                                case 0x204: map_key_clear(KEY_EXIT);            break;
-                                case 0x207: map_key_clear(KEY_SAVE);            break;
-                                case 0x208: map_key_clear(KEY_PRINT);           break;
-                                case 0x209: map_key_clear(KEY_PROPS);           break;
-                                case 0x21a: map_key_clear(KEY_UNDO);            break;
-                                case 0x21b: map_key_clear(KEY_COPY);            break;
-                                case 0x21c: map_key_clear(KEY_CUT);             break;
-                                case 0x21d: map_key_clear(KEY_PASTE);           break;
-                                case 0x21f: map_key_clear(KEY_FIND);            break;
-                                case 0x221: map_key_clear(KEY_SEARCH);          break;
-                                case 0x222: map_key_clear(KEY_GOTO);            break;
-                                case 0x223: map_key_clear(KEY_HOMEPAGE);        break;
-                                case 0x224: map_key_clear(KEY_BACK);            break;
-                                case 0x225: map_key_clear(KEY_FORWARD);         break;
-                                case 0x226: map_key_clear(KEY_STOP);            break;
-                                case 0x227: map_key_clear(KEY_REFRESH);         break;
-                                case 0x22a: map_key_clear(KEY_BOOKMARKS);       break;
-                                case 0x22d: map_key_clear(KEY_ZOOMIN);          break;
-                                case 0x22e: map_key_clear(KEY_ZOOMOUT);         break;
-                                case 0x22f: map_key_clear(KEY_ZOOMRESET);       break;
-                                case 0x233: map_key_clear(KEY_SCROLLUP);        break;
-                                case 0x234: map_key_clear(KEY_SCROLLDOWN);      break;
-                                case 0x238: map_rel(REL_HWHEEL);                break;
-                                case 0x25f: map_key_clear(KEY_CANCEL);          break;
-                                case 0x279: map_key_clear(KEY_REDO);            break;
-
-                                case 0x289: map_key_clear(KEY_REPLY);           break;
-                                case 0x28b: map_key_clear(KEY_FORWARDMAIL);     break;
-                                case 0x28c: map_key_clear(KEY_SEND);            break;
-
-                                default:    goto ignore;
+                case 0x32: /* InRange */
+                        switch (field->physical & 0xff) {
+                        case 0x21: map_key(BTN_TOOL_MOUSE); break;
+                        case 0x22: map_key(BTN_TOOL_FINGER); break;
+                        default: map_key(BTN_TOOL_PEN); break;
                         }
                         break;
 
-                case HID_UP_HPVENDOR:   /* Reported on a Dutch layout HP5308 */
-
-                        set_bit(EV_REP, input->evbit);
-                        switch (usage->hid & HID_USAGE) {
-                                case 0x021: map_key_clear(KEY_PRINT);           break;
-                                case 0x070: map_key_clear(KEY_HP);              break;
-                                case 0x071: map_key_clear(KEY_CAMERA);          break;
-                                case 0x072: map_key_clear(KEY_SOUND);           break;
-                                case 0x073: map_key_clear(KEY_QUESTION);        break;
-                                case 0x080: map_key_clear(KEY_EMAIL);           break;
-                                case 0x081: map_key_clear(KEY_CHAT);            break;
-                                case 0x082: map_key_clear(KEY_SEARCH);          break;
-                                case 0x083: map_key_clear(KEY_CONNECT);         break;
-                                case 0x084: map_key_clear(KEY_FINANCE);         break;
-                                case 0x085: map_key_clear(KEY_SPORT);           break;
-                                case 0x086: map_key_clear(KEY_SHOP);            break;
-                                default:    goto ignore;
-                        }
+                case 0x3c: /* Invert */
+                        map_key_clear(BTN_TOOL_RUBBER);
                         break;
 
-                case HID_UP_MSVENDOR:
-
-                        goto ignore;
-
-                case HID_UP_CUSTOM: /* Reported on Logitech and Apple USB keyboards */
-
-                        set_bit(EV_REP, input->evbit);
-                        switch(usage->hid & HID_USAGE) {
-                                case 0x003:
-                                        /* The fn key on Apple USB keyboards */
-                                        map_key_clear(KEY_FN);
-                                        hidinput_apple_setup(input);
-                                        break;
+                case 0x33: /* Touch */
+                case 0x42: /* TipSwitch */
+                case 0x43: /* TipSwitch2 */
+                        device->quirks &= ~HID_QUIRK_NOTOUCH;
+                        map_key_clear(BTN_TOUCH);
+                        break;
 
-                                default:    goto ignore;
-                        }
+                case 0x44: /* BarrelSwitch */
+                        map_key_clear(BTN_STYLUS);
                         break;
 
-                case HID_UP_LOGIVENDOR:
+                default:  goto unknown;
+                }
+                break;
+
+        case HID_UP_CONSUMER:   /* USB HUT v1.1, pages 56-62 */
+                switch (usage->hid & HID_USAGE) {
+                case 0x000: goto ignore;
+                case 0x034: map_key_clear(KEY_SLEEP);           break;
+                case 0x036: map_key_clear(BTN_MISC);            break;
+
+                case 0x040: map_key_clear(KEY_MENU);            break;
+                case 0x045: map_key_clear(KEY_RADIO);           break;
+
+                case 0x083: map_key_clear(KEY_LAST);            break;
+                case 0x088: map_key_clear(KEY_PC);              break;
+                case 0x089: map_key_clear(KEY_TV);              break;
+                case 0x08a: map_key_clear(KEY_WWW);             break;
+                case 0x08b: map_key_clear(KEY_DVD);             break;
+                case 0x08c: map_key_clear(KEY_PHONE);           break;
+                case 0x08d: map_key_clear(KEY_PROGRAM);         break;
+                case 0x08e: map_key_clear(KEY_VIDEOPHONE);      break;
+                case 0x08f: map_key_clear(KEY_GAMES);           break;
+                case 0x090: map_key_clear(KEY_MEMO);            break;
+                case 0x091: map_key_clear(KEY_CD);              break;
+                case 0x092: map_key_clear(KEY_VCR);             break;
+                case 0x093: map_key_clear(KEY_TUNER);           break;
+                case 0x094: map_key_clear(KEY_EXIT);            break;
+                case 0x095: map_key_clear(KEY_HELP);            break;
+                case 0x096: map_key_clear(KEY_TAPE);            break;
+                case 0x097: map_key_clear(KEY_TV2);             break;
+                case 0x098: map_key_clear(KEY_SAT);             break;
+                case 0x09a: map_key_clear(KEY_PVR);             break;
+
+                case 0x09c: map_key_clear(KEY_CHANNELUP);       break;
+                case 0x09d: map_key_clear(KEY_CHANNELDOWN);     break;
+                case 0x0a0: map_key_clear(KEY_VCR2);            break;
+
+                case 0x0b0: map_key_clear(KEY_PLAY);            break;
+                case 0x0b1: map_key_clear(KEY_PAUSE);           break;
+                case 0x0b2: map_key_clear(KEY_RECORD);          break;
+                case 0x0b3: map_key_clear(KEY_FASTFORWARD);     break;
+                case 0x0b4: map_key_clear(KEY_REWIND);          break;
+                case 0x0b5: map_key_clear(KEY_NEXTSONG);        break;
+                case 0x0b6: map_key_clear(KEY_PREVIOUSSONG);    break;
+                case 0x0b7: map_key_clear(KEY_STOPCD);          break;
+                case 0x0b8: map_key_clear(KEY_EJECTCD);         break;
+                case 0x0bc: map_key_clear(KEY_MEDIA_REPEAT);    break;
+
+                case 0x0cd: map_key_clear(KEY_PLAYPAUSE);       break;
+                case 0x0e0: map_abs_clear(ABS_VOLUME);          break;
+                case 0x0e2: map_key_clear(KEY_MUTE);            break;
+                case 0x0e5: map_key_clear(KEY_BASSBOOST);       break;
+                case 0x0e9: map_key_clear(KEY_VOLUMEUP);        break;
+                case 0x0ea: map_key_clear(KEY_VOLUMEDOWN);      break;
+
+                case 0x182: map_key_clear(KEY_BOOKMARKS);       break;
+                case 0x183: map_key_clear(KEY_CONFIG);          break;
+                case 0x184: map_key_clear(KEY_WORDPROCESSOR);   break;
+                case 0x185: map_key_clear(KEY_EDITOR);          break;
+                case 0x186: map_key_clear(KEY_SPREADSHEET);     break;
+                case 0x187: map_key_clear(KEY_GRAPHICSEDITOR);  break;
+                case 0x188: map_key_clear(KEY_PRESENTATION);    break;
+                case 0x189: map_key_clear(KEY_DATABASE);        break;
+                case 0x18a: map_key_clear(KEY_MAIL);            break;
+                case 0x18b: map_key_clear(KEY_NEWS);            break;
+                case 0x18c: map_key_clear(KEY_VOICEMAIL);       break;
+                case 0x18d: map_key_clear(KEY_ADDRESSBOOK);     break;
+                case 0x18e: map_key_clear(KEY_CALENDAR);        break;
+                case 0x191: map_key_clear(KEY_FINANCE);         break;
+                case 0x192: map_key_clear(KEY_CALC);            break;
+                case 0x194: map_key_clear(KEY_FILE);            break;
+                case 0x196: map_key_clear(KEY_WWW);             break;
+                case 0x19c: map_key_clear(KEY_LOGOFF);          break;
+                case 0x19e: map_key_clear(KEY_COFFEE);          break;
+                case 0x1a6: map_key_clear(KEY_HELP);            break;
+                case 0x1a7: map_key_clear(KEY_DOCUMENTS);       break;
+                case 0x1ab: map_key_clear(KEY_SPELLCHECK);      break;
+                case 0x1b6: map_key_clear(KEY_MEDIA);           break;
+                case 0x1b7: map_key_clear(KEY_SOUND);           break;
+                case 0x1bc: map_key_clear(KEY_MESSENGER);       break;
+                case 0x1bd: map_key_clear(KEY_INFO);            break;
+                case 0x201: map_key_clear(KEY_NEW);             break;
+                case 0x202: map_key_clear(KEY_OPEN);            break;
+                case 0x203: map_key_clear(KEY_CLOSE);           break;
+                case 0x204: map_key_clear(KEY_EXIT);            break;
+                case 0x207: map_key_clear(KEY_SAVE);            break;
+                case 0x208: map_key_clear(KEY_PRINT);           break;
+                case 0x209: map_key_clear(KEY_PROPS);           break;
+                case 0x21a: map_key_clear(KEY_UNDO);            break;
+                case 0x21b: map_key_clear(KEY_COPY);            break;
+                case 0x21c: map_key_clear(KEY_CUT);             break;
+                case 0x21d: map_key_clear(KEY_PASTE);           break;
+                case 0x21f: map_key_clear(KEY_FIND);            break;
+                case 0x221: map_key_clear(KEY_SEARCH);          break;
+                case 0x222: map_key_clear(KEY_GOTO);            break;
+                case 0x223: map_key_clear(KEY_HOMEPAGE);        break;
+                case 0x224: map_key_clear(KEY_BACK);            break;
+                case 0x225: map_key_clear(KEY_FORWARD);         break;
+                case 0x226: map_key_clear(KEY_STOP);            break;
+                case 0x227: map_key_clear(KEY_REFRESH);         break;
+                case 0x22a: map_key_clear(KEY_BOOKMARKS);       break;
+                case 0x22d: map_key_clear(KEY_ZOOMIN);          break;
+                case 0x22e: map_key_clear(KEY_ZOOMOUT);         break;
+                case 0x22f: map_key_clear(KEY_ZOOMRESET);       break;
+                case 0x233: map_key_clear(KEY_SCROLLUP);        break;
+                case 0x234: map_key_clear(KEY_SCROLLDOWN);      break;
+                case 0x238: map_rel(REL_HWHEEL);                break;
+                case 0x25f: map_key_clear(KEY_CANCEL);          break;
+                case 0x279: map_key_clear(KEY_REDO);            break;
+
+                case 0x289: map_key_clear(KEY_REPLY);           break;
+                case 0x28b: map_key_clear(KEY_FORWARDMAIL);     break;
+                case 0x28c: map_key_clear(KEY_SEND);            break;
+
+                default:    goto ignore;
+                }
+                break;
+
+        case HID_UP_HPVENDOR:   /* Reported on a Dutch layout HP5308 */
+                set_bit(EV_REP, input->evbit);
+                switch (usage->hid & HID_USAGE) {
+                case 0x021: map_key_clear(KEY_PRINT);           break;
+                case 0x070: map_key_clear(KEY_HP);              break;
+                case 0x071: map_key_clear(KEY_CAMERA);          break;
+                case 0x072: map_key_clear(KEY_SOUND);           break;
+                case 0x073: map_key_clear(KEY_QUESTION);        break;
+                case 0x080: map_key_clear(KEY_EMAIL);           break;
+                case 0x081: map_key_clear(KEY_CHAT);            break;
+                case 0x082: map_key_clear(KEY_SEARCH);          break;
+                case 0x083: map_key_clear(KEY_CONNECT);         break;
+                case 0x084: map_key_clear(KEY_FINANCE);         break;
+                case 0x085: map_key_clear(KEY_SPORT);           break;
+                case 0x086: map_key_clear(KEY_SHOP);            break;
+                default:    goto ignore;
+                }
+                break;
 
-                        goto ignore;
-                
-                case HID_UP_PID:
+        case HID_UP_MSVENDOR:
+                goto ignore;
 
-                        switch(usage->hid & HID_USAGE) {
-                                case 0xa4: map_key_clear(BTN_DEAD);     break;
-                                default: goto ignore;
-                        }
-                        break;
+        case HID_UP_CUSTOM: /* Reported on Logitech and Apple USB keyboards */
+                set_bit(EV_REP, input->evbit);
+                goto ignore;
 
-                default:
-                unknown:
-                        if (field->report_size == 1) {
-                                if (field->report->type == HID_OUTPUT_REPORT) {
-                                        map_led(LED_MISC);
-                                        break;
-                                }
-                                map_key(BTN_MISC);
-                                break;
-                        }
-                        if (field->flags & HID_MAIN_ITEM_RELATIVE) {
-                                map_rel(REL_MISC);
+        case HID_UP_LOGIVENDOR:
+                goto ignore;
+        
+        case HID_UP_PID:
+                switch (usage->hid & HID_USAGE) {
+                case 0xa4: map_key_clear(BTN_DEAD);     break;
+                default: goto ignore;
+                }
+                break;
+
+        default:
+        unknown:
+                if (field->report_size == 1) {
+                        if (field->report->type == HID_OUTPUT_REPORT) {
+                                map_led(LED_MISC);
                                 break;
                         }
-                        map_abs(ABS_MISC);
+                        map_key(BTN_MISC);
+                        break;
+                }
+                if (field->flags & HID_MAIN_ITEM_RELATIVE) {
+                        map_rel(REL_MISC);
                         break;
+                }
+                map_abs(ABS_MISC);
+                break;
         }
 
 mapped:
-        if (device->quirks & HID_QUIRK_MIGHTYMOUSE) {
-                if (usage->hid == HID_GD_Z)
-                        map_rel(REL_HWHEEL);
-                else if (usage->code == BTN_1)
-                        map_key(BTN_2);
-                else if (usage->code == BTN_2)
-                        map_key(BTN_1);
-        }
-
-        if ((device->quirks & (HID_QUIRK_2WHEEL_MOUSE_HACK_7 | HID_QUIRK_2WHEEL_MOUSE_HACK_5 |
-                        HID_QUIRK_2WHEEL_MOUSE_HACK_B8)) && (usage->type == EV_REL) &&
-                        (usage->code == REL_WHEEL))
-                set_bit(REL_HWHEEL, bit);
-
-        if (((device->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_5) && (usage->hid == 0x00090005))
-                || ((device->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_7) && (usage->hid == 0x00090007)))
+        if (device->driver->input_mapped && device->driver->input_mapped(device,
+                                hidinput, field, usage, &bit, &max) < 0)
                 goto ignore;
 
-        if ((device->quirks & HID_QUIRK_BAD_RELATIVE_KEYS) &&
-                usage->type == EV_KEY && (field->flags & HID_MAIN_ITEM_RELATIVE))
-                field->flags &= ~HID_MAIN_ITEM_RELATIVE;
-
         set_bit(usage->type, input->evbit);
 
-        if (device->quirks & HID_QUIRK_DUPLICATE_USAGES &&
-                        (usage->type == EV_KEY ||
-                         usage->type == EV_REL ||
-                         usage->type == EV_ABS))
-                clear_bit(usage->code, bit);
-
         while (usage->code <= max && test_and_set_bit(usage->code, bit))
                 usage->code = find_next_zero_bit(bit, max + 1, usage->code);
 
@@ -858,10 +585,6 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
         if (!usage->type)
                 return;
 
-        /* handle input events for quirky devices */
-        if (hidinput_event_quirks(hid, field, usage, value))
-                return;
-
         if (usage->hat_min < usage->hat_max || usage->hat_dir) {
                 int hat_dir = usage->hat_dir;
                 if (!hat_dir)
@@ -961,14 +684,14 @@ static int hidinput_open(struct input_dev *dev)
 {
         struct hid_device *hid = input_get_drvdata(dev);
 
-        return hid->hid_open(hid);
+        return hid->ll_driver->open(hid);
 }
 
 static void hidinput_close(struct input_dev *dev)
 {
         struct hid_device *hid = input_get_drvdata(dev);
 
-        hid->hid_close(hid);
+        hid->ll_driver->close(hid);
 }
 
 /*
@@ -977,7 +700,7 @@ static void hidinput_close(struct input_dev *dev)
  * Read all reports and initialize the absolute field values.
  */
 
-int hidinput_connect(struct hid_device *hid)
+int hidinput_connect(struct hid_device *hid, unsigned int force)
 {
         struct hid_report *report;
         struct hid_input *hidinput = NULL;
@@ -985,19 +708,20 @@ int hidinput_connect(struct hid_device *hid)
         int i, j, k;
         int max_report_type = HID_OUTPUT_REPORT;
 
-        if (hid->quirks & HID_QUIRK_IGNORE_HIDINPUT)
-                return -1;
-
         INIT_LIST_HEAD(&hid->inputs);
 
-        for (i = 0; i < hid->maxcollection; i++)
-                if (hid->collection[i].type == HID_COLLECTION_APPLICATION ||
-                    hid->collection[i].type == HID_COLLECTION_PHYSICAL)
-                        if (IS_INPUT_APPLICATION(hid->collection[i].usage))
-                                break;
+        if (!force) {
+                for (i = 0; i < hid->maxcollection; i++) {
+                        struct hid_collection *col = &hid->collection[i];
+                        if (col->type == HID_COLLECTION_APPLICATION ||
+                                        col->type == HID_COLLECTION_PHYSICAL)
+                                if (IS_INPUT_APPLICATION(col->usage))
+                                        break;
+                }
 
-        if (i == hid->maxcollection && (hid->quirks & HID_QUIRK_HIDINPUT) == 0)
-                return -1;
+                if (i == hid->maxcollection)
+                        return -1;
+        }
 
         if (hid->quirks & HID_QUIRK_SKIP_OUTPUT_REPORTS)
                 max_report_type = HID_INPUT_REPORT;
@@ -1019,7 +743,8 @@ int hidinput_connect(struct hid_device *hid)
                                 }
 
                                 input_set_drvdata(input_dev, hid);
-                                input_dev->event = hid->hidinput_input_event;
+                                input_dev->event =
+                                        hid->ll_driver->hidinput_input_event;
                                 input_dev->open = hidinput_open;
                                 input_dev->close = hidinput_close;
                                 input_dev->setkeycode = hidinput_setkeycode;
@@ -1032,7 +757,7 @@ int hidinput_connect(struct hid_device *hid)
                                 input_dev->id.vendor  = hid->vendor;
                                 input_dev->id.product = hid->product;
                                 input_dev->id.version = hid->version;
-                                input_dev->dev.parent = hid->dev;
+                                input_dev->dev.parent = hid->dev.parent;
                                 hidinput->input = input_dev;
                                 list_add_tail(&hidinput->list, &hid->inputs);
                         }
diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c
new file mode 100644
index 000000000000..406d8c82abf1
--- /dev/null
+++ b/drivers/hid/hid-lg.c
@@ -0,0 +1,342 @@
+/*
+ *  HID driver for some logitech "special" devices
+ *
+ *  Copyright (c) 1999 Andreas Gal
+ *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
+ *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
+ *  Copyright (c) 2006-2007 Jiri Kosina
+ *  Copyright (c) 2007 Paul Walmsley
+ *  Copyright (c) 2008 Jiri Slaby
+ */
+
+/*
+ * 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.
+ */
+
+#include <linux/device.h>
+#include <linux/hid.h>
+#include <linux/module.h>
+
+#include "hid-ids.h"
+#include "hid-lg.h"
+
+#define LG_RDESC                0x001
+#define LG_BAD_RELATIVE_KEYS    0x002
+#define LG_DUPLICATE_USAGES     0x004
+#define LG_RESET_LEDS           0x008
+#define LG_EXPANDED_KEYMAP      0x010
+#define LG_IGNORE_DOUBLED_WHEEL 0x020
+#define LG_WIRELESS             0x040
+#define LG_INVERT_HWHEEL        0x080
+#define LG_NOGET                0x100
+#define LG_FF                   0x200
+#define LG_FF2                  0x400
+
+/*
+ * Certain Logitech keyboards send in report #3 keys which are far
+ * above the logical maximum described in descriptor. This extends
+ * the original value of 0x28c of logical maximum to 0x104d
+ */
+static void lg_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+                unsigned int rsize)
+{
+        unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);
+
+        if ((quirks & LG_RDESC) && rsize >= 90 && rdesc[83] == 0x26 &&
+                        rdesc[84] == 0x8c && rdesc[85] == 0x02) {
+                dev_info(&hdev->dev, "fixing up Logitech keyboard report "
+                                "descriptor\n");
+                rdesc[84] = rdesc[89] = 0x4d;
+                rdesc[85] = rdesc[90] = 0x10;
+        }
+}
+
+#define lg_map_key_clear(c)     hid_map_usage_clear(hi, usage, bit, max, \
+                EV_KEY, (c))
+
+static int lg_ultrax_remote_mapping(struct hid_input *hi,
+                struct hid_usage *usage, unsigned long **bit, int *max)
+{
+        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_LOGIVENDOR)
+                return 0;
+
+        set_bit(EV_REP, hi->input->evbit);
+        switch (usage->hid & HID_USAGE) {
+        /* Reported on Logitech Ultra X Media Remote */
+        case 0x004: lg_map_key_clear(KEY_AGAIN);        break;
+        case 0x00d: lg_map_key_clear(KEY_HOME);         break;
+        case 0x024: lg_map_key_clear(KEY_SHUFFLE);      break;
+        case 0x025: lg_map_key_clear(KEY_TV);           break;
+        case 0x026: lg_map_key_clear(KEY_MENU);         break;
+        case 0x031: lg_map_key_clear(KEY_AUDIO);        break;
+        case 0x032: lg_map_key_clear(KEY_TEXT);         break;
+        case 0x033: lg_map_key_clear(KEY_LAST);         break;
+        case 0x047: lg_map_key_clear(KEY_MP3);          break;
+        case 0x048: lg_map_key_clear(KEY_DVD);          break;
+        case 0x049: lg_map_key_clear(KEY_MEDIA);        break;
+        case 0x04a: lg_map_key_clear(KEY_VIDEO);        break;
+        case 0x04b: lg_map_key_clear(KEY_ANGLE);        break;
+        case 0x04c: lg_map_key_clear(KEY_LANGUAGE);     break;
+        case 0x04d: lg_map_key_clear(KEY_SUBTITLE);     break;
+        case 0x051: lg_map_key_clear(KEY_RED);          break;
+        case 0x052: lg_map_key_clear(KEY_CLOSE);        break;
+
+        default:
+                return 0;
+        }
+        return 1;
+}
+
+static int lg_wireless_mapping(struct hid_input *hi, struct hid_usage *usage,
+                unsigned long **bit, int *max)
+{
+        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
+                return 0;
+
+        switch (usage->hid & HID_USAGE) {
+        case 0x1001: lg_map_key_clear(KEY_MESSENGER);           break;
+        case 0x1003: lg_map_key_clear(KEY_SOUND);               break;
+        case 0x1004: lg_map_key_clear(KEY_VIDEO);               break;
+        case 0x1005: lg_map_key_clear(KEY_AUDIO);               break;
+        case 0x100a: lg_map_key_clear(KEY_DOCUMENTS);           break;
+        case 0x1011: lg_map_key_clear(KEY_PREVIOUSSONG);        break;
+        case 0x1012: lg_map_key_clear(KEY_NEXTSONG);            break;
+        case 0x1013: lg_map_key_clear(KEY_CAMERA);              break;
+        case 0x1014: lg_map_key_clear(KEY_MESSENGER);           break;
+        case 0x1015: lg_map_key_clear(KEY_RECORD);              break;
+        case 0x1016: lg_map_key_clear(KEY_PLAYER);              break;
+        case 0x1017: lg_map_key_clear(KEY_EJECTCD);             break;
+        case 0x1018: lg_map_key_clear(KEY_MEDIA);               break;
+        case 0x1019: lg_map_key_clear(KEY_PROG1);               break;
+        case 0x101a: lg_map_key_clear(KEY_PROG2);               break;
+        case 0x101b: lg_map_key_clear(KEY_PROG3);               break;
+        case 0x101f: lg_map_key_clear(KEY_ZOOMIN);              break;
+        case 0x1020: lg_map_key_clear(KEY_ZOOMOUT);             break;
+        case 0x1021: lg_map_key_clear(KEY_ZOOMRESET);           break;
+        case 0x1023: lg_map_key_clear(KEY_CLOSE);               break;
+        case 0x1027: lg_map_key_clear(KEY_MENU);                break;
+        /* this one is marked as 'Rotate' */
+        case 0x1028: lg_map_key_clear(KEY_ANGLE);               break;
+        case 0x1029: lg_map_key_clear(KEY_SHUFFLE);             break;
+        case 0x102a: lg_map_key_clear(KEY_BACK);                break;
+        case 0x102b: lg_map_key_clear(KEY_CYCLEWINDOWS);        break;
+        case 0x1041: lg_map_key_clear(KEY_BATTERY);             break;
+        case 0x1042: lg_map_key_clear(KEY_WORDPROCESSOR);       break;
+        case 0x1043: lg_map_key_clear(KEY_SPREADSHEET);         break;
+        case 0x1044: lg_map_key_clear(KEY_PRESENTATION);        break;
+        case 0x1045: lg_map_key_clear(KEY_UNDO);                break;
+        case 0x1046: lg_map_key_clear(KEY_REDO);                break;
+        case 0x1047: lg_map_key_clear(KEY_PRINT);               break;
+        case 0x1048: lg_map_key_clear(KEY_SAVE);                break;
+        case 0x1049: lg_map_key_clear(KEY_PROG1);               break;
+        case 0x104a: lg_map_key_clear(KEY_PROG2);               break;
+        case 0x104b: lg_map_key_clear(KEY_PROG3);               break;
+        case 0x104c: lg_map_key_clear(KEY_PROG4);               break;
+
+        default:
+                return 0;
+        }
+        return 1;
+}
+
+static int lg_input_mapping(struct hid_device *hdev, struct hid_input *hi,
+                struct hid_field *field, struct hid_usage *usage,
+                unsigned long **bit, int *max)
+{
+        /* extended mapping for certain Logitech hardware (Logitech cordless
+           desktop LX500) */
+        static const u8 e_keymap[] = {
+                  0,216,  0,213,175,156,  0,  0,  0,  0,
+                144,  0,  0,  0,  0,  0,  0,  0,  0,212,
+                174,167,152,161,112,  0,  0,  0,154,  0,
+                  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+                  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+                  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+                  0,  0,  0,  0,  0,183,184,185,186,187,
+                188,189,190,191,192,193,194,  0,  0,  0
+        };
+        unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);
+        unsigned int hid = usage->hid;
+
+        if (hdev->product == USB_DEVICE_ID_LOGITECH_RECEIVER &&
+                        lg_ultrax_remote_mapping(hi, usage, bit, max))
+                return 1;
+
+        if ((quirks & LG_WIRELESS) && lg_wireless_mapping(hi, usage, bit, max))
+                return 1;
+
+        if ((hid & HID_USAGE_PAGE) != HID_UP_BUTTON)
+                return 0;
+
+        hid &= HID_USAGE;
+
+        /* Special handling for Logitech Cordless Desktop */
+        if (field->application == HID_GD_MOUSE) {
+                if ((quirks & LG_IGNORE_DOUBLED_WHEEL) &&
+                                (hid == 7 || hid == 8))
+                        return -1;
+        } else {
+                if ((quirks & LG_EXPANDED_KEYMAP) &&
+                                hid < ARRAY_SIZE(e_keymap) &&
+                                e_keymap[hid] != 0) {
+                        hid_map_usage(hi, usage, bit, max, EV_KEY,
+                                        e_keymap[hid]);
+                        return 1;
+                }
+        }
+
+        return 0;
+}
+
+static int lg_input_mapped(struct hid_device *hdev, struct hid_input *hi,
+                struct hid_field *field, struct hid_usage *usage,
+                unsigned long **bit, int *max)
+{
+        unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);
+
+        if ((quirks & LG_BAD_RELATIVE_KEYS) && usage->type == EV_KEY &&
+                        (field->flags & HID_MAIN_ITEM_RELATIVE))
+                field->flags &= ~HID_MAIN_ITEM_RELATIVE;
+
+        if ((quirks & LG_DUPLICATE_USAGES) && (usage->type == EV_KEY ||
+                         usage->type == EV_REL || usage->type == EV_ABS))
+                clear_bit(usage->code, *bit);
+
+        return 0;
+}
+
+static int lg_event(struct hid_device *hdev, struct hid_field *field,
+                struct hid_usage *usage, __s32 value)
+{
+        unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);
+
+        if ((quirks & LG_INVERT_HWHEEL) && usage->code == REL_HWHEEL) {
+                input_event(field->hidinput->input, usage->type, usage->code,
+                                -value);
+                return 1;
+        }
+
+        return 0;
+}
+
+static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id)
+{
+        unsigned long quirks = id->driver_data;
+        unsigned int connect_mask = HID_CONNECT_DEFAULT;
+        int ret;
+
+        hid_set_drvdata(hdev, (void *)quirks);
+
+        if (quirks & LG_NOGET)
+                hdev->quirks |= HID_QUIRK_NOGET;
+
+        ret = hid_parse(hdev);
+        if (ret) {
+                dev_err(&hdev->dev, "parse failed\n");
+                goto err_free;
+        }
+
+        if (quirks & (LG_FF | LG_FF2))
+                connect_mask &= ~HID_CONNECT_FF;
+
+        ret = hid_hw_start(hdev, connect_mask);
+        if (ret) {
+                dev_err(&hdev->dev, "hw start failed\n");
+                goto err_free;
+        }
+
+        if (quirks & LG_RESET_LEDS)
+                usbhid_set_leds(hdev);
+
+        if (quirks & LG_FF)
+                lgff_init(hdev);
+        if (quirks & LG_FF2)
+                lg2ff_init(hdev);
+
+        return 0;
+err_free:
+        return ret;
+}
+
+static const struct hid_device_id lg_devices[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER),
+                .driver_data = LG_RDESC | LG_WIRELESS },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER),
+                .driver_data = LG_RDESC | LG_WIRELESS },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2),
+                .driver_data = LG_RDESC | LG_WIRELESS },
+
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RECEIVER),
+                .driver_data = LG_BAD_RELATIVE_KEYS },
+
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_DESKTOP),
+                .driver_data = LG_DUPLICATE_USAGES },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_EDGE),
+                .driver_data = LG_DUPLICATE_USAGES },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_MINI),
+                .driver_data = LG_DUPLICATE_USAGES },
+
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_KBD),
+                .driver_data = LG_RESET_LEDS },
+
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_ELITE_KBD),
+                .driver_data = LG_IGNORE_DOUBLED_WHEEL | LG_EXPANDED_KEYMAP },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500),
+                .driver_data = LG_IGNORE_DOUBLED_WHEEL | LG_EXPANDED_KEYMAP },
+
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_LX3),
+                .driver_data = LG_INVERT_HWHEEL },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_V150),
+                .driver_data = LG_INVERT_HWHEEL },
+
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_EXTREME_3D),
+                .driver_data = LG_NOGET },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WHEEL),
+                .driver_data = LG_NOGET | LG_FF },
+
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD),
+                .driver_data = LG_FF },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2_2),
+                .driver_data = LG_FF },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WINGMAN_F3D),
+                .driver_data = LG_FF },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_FORCE3D_PRO),
+                .driver_data = LG_FF },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL),
+                .driver_data = LG_FF },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2),
+                .driver_data = LG_FF },
+        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2),
+                .driver_data = LG_FF2 },
+        { }
+};
+MODULE_DEVICE_TABLE(hid, lg_devices);
+
+static struct hid_driver lg_driver = {
+        .name = "logitech",
+        .id_table = lg_devices,
+        .report_fixup = lg_report_fixup,
+        .input_mapping = lg_input_mapping,
+        .input_mapped = lg_input_mapped,
+        .event = lg_event,
+        .probe = lg_probe,
+};
+
+static int lg_init(void)
+{
+        return hid_register_driver(&lg_driver);
+}
+
+static void lg_exit(void)
+{
+        hid_unregister_driver(&lg_driver);
+}
+
+module_init(lg_init);
+module_exit(lg_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(logitech);
diff --git a/drivers/hid/hid-lg.h b/drivers/hid/hid-lg.h
new file mode 100644
index 000000000000..27ae750ca878
--- /dev/null
+++ b/drivers/hid/hid-lg.h
@@ -0,0 +1,18 @@
+#ifndef __HID_LG_H
+#define __HID_LG_H
+
+#include <linux/autoconf.h>
+
+#ifdef CONFIG_LOGITECH_FF
+int lgff_init(struct hid_device *hdev);
+#else
+static inline int lgff_init(struct hid_device *hdev) { return -1; }
+#endif
+
+#ifdef CONFIG_LOGIRUMBLEPAD2_FF
+int lg2ff_init(struct hid_device *hdev);
+#else
+static inline int lg2ff_init(struct hid_device *hdev) { return -1; }
+#endif
+
+#endif
diff --git a/drivers/hid/usbhid/hid-lg2ff.c b/drivers/hid/hid-lg2ff.c
index d469bd0061c9..4e6dc6e26523 100644
--- a/drivers/hid/usbhid/hid-lg2ff.c
+++ b/drivers/hid/hid-lg2ff.c
@@ -24,7 +24,9 @@
 #include <linux/input.h>
 #include <linux/usb.h>
 #include <linux/hid.h>
-#include "usbhid.h"
+
+#include "usbhid/usbhid.h"
+#include "hid-lg.h"
 
 struct lg2ff_device {
         struct hid_report *report;
@@ -57,7 +59,7 @@ static int play_effect(struct input_dev *dev, void *data,
         return 0;
 }
 
-int hid_lg2ff_init(struct hid_device *hid)
+int lg2ff_init(struct hid_device *hid)
 {
         struct lg2ff_device *lg2ff;
         struct hid_report *report;
@@ -69,18 +71,18 @@ int hid_lg2ff_init(struct hid_device *hid)
         int error;
 
         if (list_empty(report_list)) {
-                printk(KERN_ERR "hid-lg2ff: no output report found\n");
+                dev_err(&hid->dev, "no output report found\n");
                 return -ENODEV;
         }
 
         report = list_entry(report_list->next, struct hid_report, list);
 
         if (report->maxfield < 1) {
-                printk(KERN_ERR "hid-lg2ff: output report is empty\n");
+                dev_err(&hid->dev, "output report is empty\n");
                 return -ENODEV;
         }
         if (report->field[0]->report_count < 7) {
-                printk(KERN_ERR "hid-lg2ff: not enough values in the field\n");
+                dev_err(&hid->dev, "not enough values in the field\n");
                 return -ENODEV;
         }
 
@@ -107,7 +109,7 @@ int hid_lg2ff_init(struct hid_device *hid)
 
         usbhid_submit_report(hid, report, USB_DIR_OUT);
 
-        printk(KERN_INFO "Force feedback for Logitech Rumblepad 2 by "
+        dev_info(&hid->dev, "Force feedback for Logitech Rumblepad 2 by "
                "Anssi Hannula <anssi.hannula@gmail.com>\n");
 
         return 0;
diff --git a/drivers/hid/usbhid/hid-lgff.c b/drivers/hid/hid-lgff.c
index 4b7ab6a46d93..51aff08e10ce 100644
--- a/drivers/hid/usbhid/hid-lgff.c
+++ b/drivers/hid/hid-lgff.c
@@ -30,7 +30,9 @@
 #include <linux/input.h>
 #include <linux/usb.h>
 #include <linux/hid.h>
-#include "usbhid.h"
+
+#include "usbhid/usbhid.h"
+#include "hid-lg.h"
 
 struct dev_type {
         u16 idVendor;
@@ -48,6 +50,12 @@ static const signed short ff_joystick[] = {
         -1
 };
 
+static const signed short ff_wheel[] = {
+        FF_CONSTANT,
+        FF_AUTOCENTER,
+        -1
+};
+
 static const struct dev_type devices[] = {
         { 0x046d, 0xc211, ff_rumble },
         { 0x046d, 0xc219, ff_rumble },
@@ -55,7 +63,7 @@ static const struct dev_type devices[] = {
         { 0x046d, 0xc286, ff_joystick },
         { 0x046d, 0xc294, ff_joystick },
         { 0x046d, 0xc295, ff_joystick },
-        { 0x046d, 0xca03, ff_joystick },
+        { 0x046d, 0xca03, ff_wheel },
 };
 
 static int hid_lgff_play(struct input_dev *dev, void *data, struct ff_effect *effect)
@@ -100,7 +108,24 @@ static int hid_lgff_play(struct input_dev *dev, void *data, struct ff_effect *ef
         return 0;
 }
 
-int hid_lgff_init(struct hid_device* hid)
+static void hid_lgff_set_autocenter(struct input_dev *dev, u16 magnitude)
+{
+        struct hid_device *hid = input_get_drvdata(dev);
+        struct list_head *report_list = &hid->report_enum[HID_OUTPUT_REPORT].report_list;
+        struct hid_report *report = list_entry(report_list->next, struct hid_report, list);
+        __s32 *value = report->field[0]->value;
+        magnitude = (magnitude >> 12) & 0xf;
+        *value++ = 0xfe;
+        *value++ = 0x0d;
+        *value++ = magnitude;   /* clockwise strength */
+        *value++ = magnitude;   /* counter-clockwise strength */
+        *value++ = 0x80;
+        *value++ = 0x00;
+        *value = 0x00;
+        usbhid_submit_report(hid, report, USB_DIR_OUT);
+}
+
+int lgff_init(struct hid_device* hid)
 {
         struct hid_input *hidinput = list_entry(hid->inputs.next, struct hid_input, list);
         struct list_head *report_list = &hid->report_enum[HID_OUTPUT_REPORT].report_list;
@@ -145,6 +170,9 @@ int hid_lgff_init(struct hid_device* hid)
         if (error)
                 return error;
 
+        if ( test_bit(FF_AUTOCENTER, dev->ffbit) )
+                dev->ff->set_autocenter = hid_lgff_set_autocenter;
+
         printk(KERN_INFO "Force feedback for Logitech force feedback devices by Johann Deneux <johann.deneux@it.uu.se>\n");
 
         return 0;
diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c
new file mode 100644
index 000000000000..d718b1607d0f
--- /dev/null
+++ b/drivers/hid/hid-microsoft.c
@@ -0,0 +1,219 @@
+/*
+ *  HID driver for some microsoft "special" devices
+ *
+ *  Copyright (c) 1999 Andreas Gal
+ *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
+ *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
+ *  Copyright (c) 2006-2007 Jiri Kosina
+ *  Copyright (c) 2007 Paul Walmsley
+ *  Copyright (c) 2008 Jiri Slaby
+ */
+
+/*
+ * 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.
+ */
+
+#include <linux/device.h>
+#include <linux/input.h>
+#include <linux/hid.h>
+#include <linux/module.h>
+
+#include "hid-ids.h"
+
+#define MS_HIDINPUT     0x01
+#define MS_ERGONOMY     0x02
+#define MS_PRESENTER    0x04
+#define MS_RDESC        0x08
+#define MS_NOGET        0x10
+
+/*
+ * Microsoft Wireless Desktop Receiver (Model 1028) has several
+ * 'Usage Min/Max' where it ought to have 'Physical Min/Max'
+ */
+static void ms_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+                unsigned int rsize)
+{
+        unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);
+
+        if ((quirks & MS_RDESC) && rsize == 571 && rdesc[284] == 0x19 &&
+                        rdesc[286] == 0x2a && rdesc[304] == 0x19 &&
+                        rdesc[306] == 0x29 && rdesc[352] == 0x1a &&
+                        rdesc[355] == 0x2a && rdesc[557] == 0x19 &&
+                        rdesc[559] == 0x29) {
+                dev_info(&hdev->dev, "fixing up Microsoft Wireless Receiver "
+                                "Model 1028 report descriptor\n");
+                rdesc[284] = rdesc[304] = rdesc[557] = 0x35;
+                rdesc[352] = 0x36;
+                rdesc[286] = rdesc[355] = 0x46;
+                rdesc[306] = rdesc[559] = 0x45;
+        }
+}
+
+#define ms_map_key_clear(c)     hid_map_usage_clear(hi, usage, bit, max, \
+                                        EV_KEY, (c))
+static int ms_ergonomy_kb_quirk(struct hid_input *hi, struct hid_usage *usage,
+                unsigned long **bit, int *max)
+{
+        struct input_dev *input = hi->input;
+
+        switch (usage->hid & HID_USAGE) {
+        case 0xfd06: ms_map_key_clear(KEY_CHAT);        break;
+        case 0xfd07: ms_map_key_clear(KEY_PHONE);       break;
+        case 0xff05:
+                set_bit(EV_REP, input->evbit);
+                ms_map_key_clear(KEY_F13);
+                set_bit(KEY_F14, input->keybit);
+                set_bit(KEY_F15, input->keybit);
+                set_bit(KEY_F16, input->keybit);
+                set_bit(KEY_F17, input->keybit);
+                set_bit(KEY_F18, input->keybit);
+        default:
+                return 0;
+        }
+        return 1;
+}
+
+static int ms_presenter_8k_quirk(struct hid_input *hi, struct hid_usage *usage,
+                unsigned long **bit, int *max)
+{
+        set_bit(EV_REP, hi->input->evbit);
+        switch (usage->hid & HID_USAGE) {
+        case 0xfd08: ms_map_key_clear(KEY_FORWARD);     break;
+        case 0xfd09: ms_map_key_clear(KEY_BACK);        break;
+        case 0xfd0b: ms_map_key_clear(KEY_PLAYPAUSE);   break;
+        case 0xfd0e: ms_map_key_clear(KEY_CLOSE);       break;
+        case 0xfd0f: ms_map_key_clear(KEY_PLAY);        break;
+        default:
+                return 0;
+        }
+        return 1;
+}
+
+static int ms_input_mapping(struct hid_device *hdev, struct hid_input *hi,
+                struct hid_field *field, struct hid_usage *usage,
+                unsigned long **bit, int *max)
+{
+        unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);
+
+        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_MSVENDOR)
+                return 0;
+
+        if (quirks & MS_ERGONOMY) {
+                int ret = ms_ergonomy_kb_quirk(hi, usage, bit, max);
+                if (ret)
+                        return ret;
+        }
+
+        if ((quirks & MS_PRESENTER) &&
+                        ms_presenter_8k_quirk(hi, usage, bit, max))
+                return 1;
+
+        return 0;
+}
+
+static int ms_event(struct hid_device *hdev, struct hid_field *field,
+                struct hid_usage *usage, __s32 value)
+{
+        unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);
+
+        if (!(hdev->claimed & HID_CLAIMED_INPUT) || !field->hidinput ||
+                        !usage->type)
+                return 0;
+
+        /* Handling MS keyboards special buttons */
+        if (quirks & MS_ERGONOMY && usage->hid == (HID_UP_MSVENDOR | 0xff05)) {
+                struct input_dev *input = field->hidinput->input;
+                static unsigned int last_key = 0;
+                unsigned int key = 0;
+                switch (value) {
+                case 0x01: key = KEY_F14; break;
+                case 0x02: key = KEY_F15; break;
+                case 0x04: key = KEY_F16; break;
+                case 0x08: key = KEY_F17; break;
+                case 0x10: key = KEY_F18; break;
+                }
+                if (key) {
+                        input_event(input, usage->type, key, 1);
+                        last_key = key;
+                } else
+                        input_event(input, usage->type, last_key, 0);
+
+                return 1;
+        }
+
+        return 0;
+}
+
+static int ms_probe(struct hid_device *hdev, const struct hid_device_id *id)
+{
+        unsigned long quirks = id->driver_data;
+        int ret;
+
+        hid_set_drvdata(hdev, (void *)quirks);
+
+        if (quirks & MS_NOGET)
+                hdev->quirks |= HID_QUIRK_NOGET;
+
+        ret = hid_parse(hdev);
+        if (ret) {
+                dev_err(&hdev->dev, "parse failed\n");
+                goto err_free;
+        }
+
+        ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT | ((quirks & MS_HIDINPUT) ?
+                                HID_CONNECT_HIDINPUT_FORCE : 0));
+        if (ret) {
+                dev_err(&hdev->dev, "hw start failed\n");
+                goto err_free;
+        }
+
+        return 0;
+err_free:
+        return ret;
+}
+
+static const struct hid_device_id ms_devices[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV),
+                .driver_data = MS_HIDINPUT },
+        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K),
+                .driver_data = MS_ERGONOMY },
+        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K),
+                .driver_data = MS_ERGONOMY | MS_RDESC },
+        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB),
+                .driver_data = MS_PRESENTER },
+        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0),
+                .driver_data = MS_NOGET },
+
+        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT),
+                .driver_data = MS_PRESENTER },
+        { }
+};
+MODULE_DEVICE_TABLE(hid, ms_devices);
+
+static struct hid_driver ms_driver = {
+        .name = "microsoft",
+        .id_table = ms_devices,
+        .report_fixup = ms_report_fixup,
+        .input_mapping = ms_input_mapping,
+        .event = ms_event,
+        .probe = ms_probe,
+};
+
+static int ms_init(void)
+{
+        return hid_register_driver(&ms_driver);
+}
+
+static void ms_exit(void)
+{
+        hid_unregister_driver(&ms_driver);
+}
+
+module_init(ms_init);
+module_exit(ms_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(microsoft);
diff --git a/drivers/hid/hid-monterey.c b/drivers/hid/hid-monterey.c
new file mode 100644
index 000000000000..f3a85a065f18
--- /dev/null
+++ b/drivers/hid/hid-monterey.c
@@ -0,0 +1,82 @@
+/*
+ *  HID driver for some monterey "special" devices
+ *
+ *  Copyright (c) 1999 Andreas Gal
+ *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
+ *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
+ *  Copyright (c) 2006-2007 Jiri Kosina
+ *  Copyright (c) 2007 Paul Walmsley
+ *  Copyright (c) 2008 Jiri Slaby
+ */
+
+/*
+ * 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.
+ */
+
+#include <linux/device.h>
+#include <linux/hid.h>
+#include <linux/module.h>
+
+#include "hid-ids.h"
+
+static void mr_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+                unsigned int rsize)
+{
+        if (rsize >= 30 && rdesc[29] == 0x05 && rdesc[30] == 0x09) {
+                dev_info(&hdev->dev, "fixing up button/consumer in HID report "
+                                "descriptor\n");
+                rdesc[30] = 0x0c;
+        }
+}
+
+#define mr_map_key_clear(c)     hid_map_usage_clear(hi, usage, bit, max, \
+                                        EV_KEY, (c))
+static int mr_input_mapping(struct hid_device *hdev, struct hid_input *hi,
+                struct hid_field *field, struct hid_usage *usage,
+                unsigned long **bit, int *max)
+{
+        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
+                return 0;
+
+        switch (usage->hid & HID_USAGE) {
+        case 0x156: mr_map_key_clear(KEY_WORDPROCESSOR);        break;
+        case 0x157: mr_map_key_clear(KEY_SPREADSHEET);          break;
+        case 0x158: mr_map_key_clear(KEY_PRESENTATION);         break;
+        case 0x15c: mr_map_key_clear(KEY_STOP);                 break;
+        default:
+                return 0;
+        }
+        return 1;
+}
+
+static const struct hid_device_id mr_devices[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },
+        { }
+};
+MODULE_DEVICE_TABLE(hid, mr_devices);
+
+static struct hid_driver mr_driver = {
+        .name = "monterey",
+        .id_table = mr_devices,
+        .report_fixup = mr_report_fixup,
+        .input_mapping = mr_input_mapping,
+};
+
+static int mr_init(void)
+{
+        return hid_register_driver(&mr_driver);
+}
+
+static void mr_exit(void)
+{
+        hid_unregister_driver(&mr_driver);
+}
+
+module_init(mr_init);
+module_exit(mr_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(monterey);
diff --git a/drivers/hid/hid-petalynx.c b/drivers/hid/hid-petalynx.c
new file mode 100644
index 000000000000..10945fe12d50
--- /dev/null
+++ b/drivers/hid/hid-petalynx.c
@@ -0,0 +1,122 @@
+/*
+ *  HID driver for some petalynx "special" devices
+ *
+ *  Copyright (c) 1999 Andreas Gal
+ *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
+ *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
+ *  Copyright (c) 2006-2007 Jiri Kosina
+ *  Copyright (c) 2007 Paul Walmsley
+ *  Copyright (c) 2008 Jiri Slaby
+ */
+
+/*
+ * 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.
+ */
+
+#include <linux/device.h>
+#include <linux/hid.h>
+#include <linux/module.h>
+
+#include "hid-ids.h"
+
+/* Petalynx Maxter Remote has maximum for consumer page set too low */
+static void pl_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+                unsigned int rsize)
+{
+        if (rsize >= 60 && rdesc[39] == 0x2a && rdesc[40] == 0xf5 &&
+                        rdesc[41] == 0x00 && rdesc[59] == 0x26 &&
+                        rdesc[60] == 0xf9 && rdesc[61] == 0x00) {
+                dev_info(&hdev->dev, "fixing up Petalynx Maxter Remote report "
+                                "descriptor\n");
+                rdesc[60] = 0xfa;
+                rdesc[40] = 0xfa;
+        }
+}
+
+#define pl_map_key_clear(c)     hid_map_usage_clear(hi, usage, bit, max, \
+                                        EV_KEY, (c))
+static int pl_input_mapping(struct hid_device *hdev, struct hid_input *hi,
+                struct hid_field *field, struct hid_usage *usage,
+                unsigned long **bit, int *max)
+{
+        if ((usage->hid & HID_USAGE_PAGE) == HID_UP_LOGIVENDOR) {
+                switch (usage->hid & HID_USAGE) {
+                case 0x05a: pl_map_key_clear(KEY_TEXT);         break;
+                case 0x05b: pl_map_key_clear(KEY_RED);          break;
+                case 0x05c: pl_map_key_clear(KEY_GREEN);        break;
+                case 0x05d: pl_map_key_clear(KEY_YELLOW);       break;
+                case 0x05e: pl_map_key_clear(KEY_BLUE);         break;
+                default:
+                        return 0;
+                }
+                return 1;
+        }
+
+        if ((usage->hid & HID_USAGE_PAGE) == HID_UP_CONSUMER) {
+                switch (usage->hid & HID_USAGE) {
+                case 0x0f6: pl_map_key_clear(KEY_NEXT);         break;
+                case 0x0fa: pl_map_key_clear(KEY_BACK);         break;
+                default:
+                        return 0;
+                }
+                return 1;
+        }
+
+        return 0;
+}
+
+static int pl_probe(struct hid_device *hdev, const struct hid_device_id *id)
+{
+        int ret;
+
+        hdev->quirks |= HID_QUIRK_NOGET;
+
+        ret = hid_parse(hdev);
+        if (ret) {
+                dev_err(&hdev->dev, "parse failed\n");
+                goto err_free;
+        }
+
+        ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
+        if (ret) {
+                dev_err(&hdev->dev, "hw start failed\n");
+                goto err_free;
+        }
+
+        return 0;
+err_free:
+        return ret;
+}
+
+static const struct hid_device_id pl_devices[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
+        { }
+};
+MODULE_DEVICE_TABLE(hid, pl_devices);
+
+static struct hid_driver pl_driver = {
+        .name = "petalynx",
+        .id_table = pl_devices,
+        .report_fixup = pl_report_fixup,
+        .input_mapping = pl_input_mapping,
+        .probe = pl_probe,
+};
+
+static int pl_init(void)
+{
+        return hid_register_driver(&pl_driver);
+}
+
+static void pl_exit(void)
+{
+        hid_unregister_driver(&pl_driver);
+}
+
+module_init(pl_init);
+module_exit(pl_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(petalynx);
diff --git a/drivers/hid/usbhid/hid-plff.c b/drivers/hid/hid-pl.c
index 9eb83cf9d22b..acd815586182 100644
--- a/drivers/hid/usbhid/hid-plff.c
+++ b/drivers/hid/hid-pl.c
@@ -9,7 +9,7 @@
  *   - contains two reports, one for each port (HID_QUIRK_MULTI_INPUT)
  *
  *  0e8f:0003 "GreenAsia Inc.    USB Joystick     "
- *   - tested with Köng Gaming gamepad
+ *   - tested with K??ng Gaming gamepad
  *
  *  Copyright (c) 2007 Anssi Hannula <anssi.hannula@gmail.com>
  */
@@ -38,7 +38,11 @@
 #include <linux/input.h>
 #include <linux/usb.h>
 #include <linux/hid.h>
-#include "usbhid.h"
+
+#include "hid-ids.h"
+
+#ifdef CONFIG_PANTHERLORD_FF
+#include "usbhid/usbhid.h"
 
 struct plff_device {
         struct hid_report *report;
@@ -66,7 +70,7 @@ static int hid_plff_play(struct input_dev *dev, void *data,
         return 0;
 }
 
-int hid_plff_init(struct hid_device *hid)
+static int plff_init(struct hid_device *hid)
 {
         struct plff_device *plff;
         struct hid_report *report;
@@ -86,7 +90,7 @@ int hid_plff_init(struct hid_device *hid)
            currently unknown. */
 
         if (list_empty(report_list)) {
-                printk(KERN_ERR "hid-plff: no output reports found\n");
+                dev_err(&hid->dev, "no output reports found\n");
                 return -ENODEV;
         }
 
@@ -95,18 +99,19 @@ int hid_plff_init(struct hid_device *hid)
                 report_ptr = report_ptr->next;
 
                 if (report_ptr == report_list) {
-                        printk(KERN_ERR "hid-plff: required output report is missing\n");
+                        dev_err(&hid->dev, "required output report is "
+                                        "missing\n");
                         return -ENODEV;
                 }
 
                 report = list_entry(report_ptr, struct hid_report, list);
                 if (report->maxfield < 1) {
-                        printk(KERN_ERR "hid-plff: no fields in the report\n");
+                        dev_err(&hid->dev, "no fields in the report\n");
                         return -ENODEV;
                 }
 
                 if (report->field[0]->report_count < 4) {
-                        printk(KERN_ERR "hid-plff: not enough values in the field\n");
+                        dev_err(&hid->dev, "not enough values in the field\n");
                         return -ENODEV;
                 }
 
@@ -132,8 +137,70 @@ int hid_plff_init(struct hid_device *hid)
                 usbhid_submit_report(hid, plff->report, USB_DIR_OUT);
         }
 
-        printk(KERN_INFO "hid-plff: Force feedback for PantherLord/GreenAsia "
+        dev_info(&hid->dev, "Force feedback for PantherLord/GreenAsia "
                "devices by Anssi Hannula <anssi.hannula@gmail.com>\n");
 
         return 0;
 }
+#else
+static inline int plff_init(struct hid_device *hid)
+{
+        return 0;
+}
+#endif
+
+static int pl_probe(struct hid_device *hdev, const struct hid_device_id *id)
+{
+        int ret;
+
+        if (id->driver_data)
+                hdev->quirks |= HID_QUIRK_MULTI_INPUT;
+
+        ret = hid_parse(hdev);
+        if (ret) {
+                dev_err(&hdev->dev, "parse failed\n");
+                goto err;
+        }
+
+        ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_FF);
+        if (ret) {
+                dev_err(&hdev->dev, "hw start failed\n");
+                goto err;
+        }
+
+        plff_init(hdev);
+
+        return 0;
+err:
+        return ret;
+}
+
+static const struct hid_device_id pl_devices[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR),
+                .driver_data = 1 }, /* Twin USB Joystick */
+        { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003), }, /* GreenAsia Inc. USB Joystick */
+        { }
+};
+MODULE_DEVICE_TABLE(hid, pl_devices);
+
+static struct hid_driver pl_driver = {
+        .name = "pantherlord",
+        .id_table = pl_devices,
+        .probe = pl_probe,
+};
+
+static int pl_init(void)
+{
+        return hid_register_driver(&pl_driver);
+}
+
+static void pl_exit(void)
+{
+        hid_unregister_driver(&pl_driver);
+}
+
+module_init(pl_init);
+module_exit(pl_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(pantherlord);
diff --git a/drivers/hid/hid-samsung.c b/drivers/hid/hid-samsung.c
new file mode 100644
index 000000000000..15f3c0492450
--- /dev/null
+++ b/drivers/hid/hid-samsung.c
@@ -0,0 +1,100 @@
+/*
+ *  HID driver for some samsung "special" devices
+ *
+ *  Copyright (c) 1999 Andreas Gal
+ *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
+ *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
+ *  Copyright (c) 2006-2007 Jiri Kosina
+ *  Copyright (c) 2007 Paul Walmsley
+ *  Copyright (c) 2008 Jiri Slaby
+ */
+
+/*
+ * 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.
+ */
+
+#include <linux/device.h>
+#include <linux/hid.h>
+#include <linux/module.h>
+
+#include "hid-ids.h"
+
+/*
+ * Samsung IrDA remote controller (reports as Cypress USB Mouse).
+ *
+ * Vendor specific report #4 has a size of 48 bit,
+ * and therefore is not accepted when inspecting the descriptors.
+ * As a workaround we reinterpret the report as:
+ *   Variable type, count 6, size 8 bit, log. maximum 255
+ * The burden to reconstruct the data is moved into user space.
+ */
+static void samsung_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+                unsigned int rsize)
+{
+        if (rsize >= 182 && rdesc[175] == 0x25 && rdesc[176] == 0x40 &&
+                        rdesc[177] == 0x75 && rdesc[178] == 0x30 &&
+                        rdesc[179] == 0x95 && rdesc[180] == 0x01 &&
+                        rdesc[182] == 0x40) {
+                dev_info(&hdev->dev, "fixing up Samsung IrDA report "
+                                "descriptor\n");
+                rdesc[176] = 0xff;
+                rdesc[178] = 0x08;
+                rdesc[180] = 0x06;
+                rdesc[182] = 0x42;
+        }
+}
+
+static int samsung_probe(struct hid_device *hdev,
+                const struct hid_device_id *id)
+{
+        int ret;
+
+        ret = hid_parse(hdev);
+        if (ret) {
+                dev_err(&hdev->dev, "parse failed\n");
+                goto err_free;
+        }
+
+        ret = hid_hw_start(hdev, (HID_CONNECT_DEFAULT & ~HID_CONNECT_HIDINPUT) |
+                        HID_CONNECT_HIDDEV_FORCE);
+        if (ret) {
+                dev_err(&hdev->dev, "hw start failed\n");
+                goto err_free;
+        }
+
+        return 0;
+err_free:
+        return ret;
+}
+
+static const struct hid_device_id samsung_devices[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
+        { }
+};
+MODULE_DEVICE_TABLE(hid, samsung_devices);
+
+static struct hid_driver samsung_driver = {
+        .name = "samsung",
+        .id_table = samsung_devices,
+        .report_fixup = samsung_report_fixup,
+        .probe = samsung_probe,
+};
+
+static int samsung_init(void)
+{
+        return hid_register_driver(&samsung_driver);
+}
+
+static void samsung_exit(void)
+{
+        hid_unregister_driver(&samsung_driver);
+}
+
+module_init(samsung_init);
+module_exit(samsung_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(samsung);
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
new file mode 100644
index 000000000000..3af8095a7de1
--- /dev/null
+++ b/drivers/hid/hid-sony.c
@@ -0,0 +1,110 @@
+/*
+ *  HID driver for some sony "special" devices
+ *
+ *  Copyright (c) 1999 Andreas Gal
+ *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
+ *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
+ *  Copyright (c) 2006-2007 Jiri Kosina
+ *  Copyright (c) 2007 Paul Walmsley
+ *  Copyright (c) 2008 Jiri Slaby
+ */
+
+/*
+ * 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.
+ */
+
+#include <linux/device.h>
+#include <linux/hid.h>
+#include <linux/module.h>
+#include <linux/usb.h>
+
+#include "hid-ids.h"
+
+/*
+ * Sending HID_REQ_GET_REPORT changes the operation mode of the ps3 controller
+ * to "operational".  Without this, the ps3 controller will not report any
+ * events.
+ */
+static int sony_set_operational(struct hid_device *hdev)
+{
+        struct usb_interface *intf = to_usb_interface(hdev->dev.parent);
+        struct usb_device *dev = interface_to_usbdev(intf);
+        __u16 ifnum = intf->cur_altsetting->desc.bInterfaceNumber;
+        int ret;
+        char *buf = kmalloc(18, GFP_KERNEL);
+
+        if (!buf)
+                return -ENOMEM;
+
+        ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
+                                 HID_REQ_GET_REPORT,
+                                 USB_DIR_IN | USB_TYPE_CLASS |
+                                 USB_RECIP_INTERFACE,
+                                 (3 << 8) | 0xf2, ifnum, buf, 17,
+                                 USB_CTRL_GET_TIMEOUT);
+        if (ret < 0)
+                dev_err(&hdev->dev, "can't set operational mode\n");
+
+        kfree(buf);
+
+        return ret;
+}
+
+static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
+{
+        int ret;
+
+        ret = hid_parse(hdev);
+        if (ret) {
+                dev_err(&hdev->dev, "parse failed\n");
+                goto err_free;
+        }
+
+        ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT |
+                        HID_CONNECT_HIDDEV_FORCE);
+        if (ret) {
+                dev_err(&hdev->dev, "hw start failed\n");
+                goto err_free;
+        }
+
+        ret = sony_set_operational(hdev);
+        if (ret)
+                goto err_stop;
+
+        return 0;
+err_stop:
+        hid_hw_stop(hdev);
+err_free:
+        return ret;
+}
+
+static const struct hid_device_id sony_devices[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
+        { }
+};
+MODULE_DEVICE_TABLE(hid, sony_devices);
+
+static struct hid_driver sony_driver = {
+        .name = "sony",
+        .id_table = sony_devices,
+        .probe = sony_probe,
+};
+
+static int sony_init(void)
+{
+        return hid_register_driver(&sony_driver);
+}
+
+static void sony_exit(void)
+{
+        hid_unregister_driver(&sony_driver);
+}
+
+module_init(sony_init);
+module_exit(sony_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(sony);
diff --git a/drivers/hid/hid-sunplus.c b/drivers/hid/hid-sunplus.c
new file mode 100644
index 000000000000..5ba68f7dbb78
--- /dev/null
+++ b/drivers/hid/hid-sunplus.c
@@ -0,0 +1,82 @@
+/*
+ *  HID driver for some sunplus "special" devices
+ *
+ *  Copyright (c) 1999 Andreas Gal
+ *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
+ *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
+ *  Copyright (c) 2006-2007 Jiri Kosina
+ *  Copyright (c) 2007 Paul Walmsley
+ *  Copyright (c) 2008 Jiri Slaby
+ */
+
+/*
+ * 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.
+ */
+
+#include <linux/device.h>
+#include <linux/hid.h>
+#include <linux/module.h>
+
+#include "hid-ids.h"
+
+static void sp_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+                unsigned int rsize)
+{
+        if (rsize >= 107 && rdesc[104] == 0x26 && rdesc[105] == 0x80 &&
+                        rdesc[106] == 0x03) {
+                dev_info(&hdev->dev, "fixing up Sunplus Wireless Desktop "
+                                "report descriptor\n");
+                rdesc[105] = rdesc[110] = 0x03;
+                rdesc[106] = rdesc[111] = 0x21;
+        }
+}
+
+#define sp_map_key_clear(c)     hid_map_usage_clear(hi, usage, bit, max, \
+                EV_KEY, (c))
+static int sp_input_mapping(struct hid_device *hdev, struct hid_input *hi,
+                struct hid_field *field, struct hid_usage *usage,
+                unsigned long **bit, int *max)
+{
+        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
+                return 0;
+
+        switch (usage->hid & HID_USAGE) {
+        case 0x2003: sp_map_key_clear(KEY_ZOOMIN);              break;
+        case 0x2103: sp_map_key_clear(KEY_ZOOMOUT);     break;
+        default:
+                return 0;
+        }
+        return 1;
+}
+
+static const struct hid_device_id sp_devices[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },
+        { }
+};
+MODULE_DEVICE_TABLE(hid, sp_devices);
+
+static struct hid_driver sp_driver = {
+        .name = "sunplus",
+        .id_table = sp_devices,
+        .report_fixup = sp_report_fixup,
+        .input_mapping = sp_input_mapping,
+};
+
+static int sp_init(void)
+{
+        return hid_register_driver(&sp_driver);
+}
+
+static void sp_exit(void)
+{
+        hid_unregister_driver(&sp_driver);
+}
+
+module_init(sp_init);
+module_exit(sp_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(sunplus);
diff --git a/drivers/hid/usbhid/hid-tmff.c b/drivers/hid/hid-tmff.c
index 144578b1a00c..1b7cba0f7e1f 100644
--- a/drivers/hid/usbhid/hid-tmff.c
+++ b/drivers/hid/hid-tmff.c
@@ -27,23 +27,17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+#include <linux/hid.h>
 #include <linux/input.h>
-
-#undef DEBUG
 #include <linux/usb.h>
 
-#include <linux/hid.h>
-#include "usbhid.h"
+#include "hid-ids.h"
+
+#include "usbhid/usbhid.h"
 
 /* Usages for thrustmaster devices I know about */
 #define THRUSTMASTER_USAGE_FF   (HID_UP_GENDESK | 0xbb)
 
-struct dev_type {
-        u16 idVendor;
-        u16 idProduct;
-        const signed short *ff;
-};
-
 static const signed short ff_rumble[] = {
         FF_RUMBLE,
         -1
@@ -54,21 +48,13 @@ static const signed short ff_joystick[] = {
         -1
 };
 
-static const struct dev_type devices[] = {
-        { 0x44f, 0xb300, ff_rumble },
-        { 0x44f, 0xb304, ff_rumble },
-        { 0x44f, 0xb651, ff_rumble },   /* FGT Rumble Force Wheel */
-        { 0x44f, 0xb654, ff_joystick }, /* FGT Force Feedback Wheel */
-};
-
 struct tmff_device {
         struct hid_report *report;
         struct hid_field *ff_field;
 };
 
 /* Changes values from 0 to 0xffff into values from minimum to maximum */
-static inline int hid_tmff_scale_u16(unsigned int in,
-                                int minimum, int maximum)
+static inline int tmff_scale_u16(unsigned int in, int minimum, int maximum)
 {
         int ret;
 
@@ -81,8 +67,7 @@ static inline int hid_tmff_scale_u16(unsigned int in,
 }
 
 /* Changes values from -0x80 to 0x7f into values from minimum to maximum */
-static inline int hid_tmff_scale_s8(int in,
-                                    int minimum, int maximum)
+static inline int tmff_scale_s8(int in, int minimum, int maximum)
 {
         int ret;
 
@@ -94,7 +79,8 @@ static inline int hid_tmff_scale_s8(int in,
         return ret;
 }
 
-static int hid_tmff_play(struct input_dev *dev, void *data, struct ff_effect *effect)
+static int tmff_play(struct input_dev *dev, void *data,
+                struct ff_effect *effect)
 {
         struct hid_device *hid = input_get_drvdata(dev);
         struct tmff_device *tmff = data;
@@ -104,10 +90,10 @@ static int hid_tmff_play(struct input_dev *dev, void *data, struct ff_effect *ef
 
         switch (effect->type) {
         case FF_CONSTANT:
-                x = hid_tmff_scale_s8(effect->u.ramp.start_level,
+                x = tmff_scale_s8(effect->u.ramp.start_level,
                                         ff_field->logical_minimum,
                                         ff_field->logical_maximum);
-                y = hid_tmff_scale_s8(effect->u.ramp.end_level,
+                y = tmff_scale_s8(effect->u.ramp.end_level,
                                         ff_field->logical_minimum,
                                         ff_field->logical_maximum);
 
@@ -118,10 +104,10 @@ static int hid_tmff_play(struct input_dev *dev, void *data, struct ff_effect *ef
                 break;
 
         case FF_RUMBLE:
-                left = hid_tmff_scale_u16(effect->u.rumble.weak_magnitude,
+                left = tmff_scale_u16(effect->u.rumble.weak_magnitude,
                                         ff_field->logical_minimum,
                                         ff_field->logical_maximum);
-                right = hid_tmff_scale_u16(effect->u.rumble.strong_magnitude,
+                right = tmff_scale_u16(effect->u.rumble.strong_magnitude,
                                         ff_field->logical_minimum,
                                         ff_field->logical_maximum);
 
@@ -134,14 +120,14 @@ static int hid_tmff_play(struct input_dev *dev, void *data, struct ff_effect *ef
         return 0;
 }
 
-int hid_tmff_init(struct hid_device *hid)
+static int tmff_init(struct hid_device *hid, const signed short *ff_bits)
 {
         struct tmff_device *tmff;
         struct hid_report *report;
         struct list_head *report_list;
-        struct hid_input *hidinput = list_entry(hid->inputs.next, struct hid_input, list);
+        struct hid_input *hidinput = list_entry(hid->inputs.next,
+                                                        struct hid_input, list);
         struct input_dev *input_dev = hidinput->input;
-        const signed short *ff_bits = ff_joystick;
         int error;
         int i;
 
@@ -163,63 +149,121 @@ int hid_tmff_init(struct hid_device *hid)
                         switch (field->usage[0].hid) {
                         case THRUSTMASTER_USAGE_FF:
                                 if (field->report_count < 2) {
-                                        warn("ignoring FF field with report_count < 2");
+                                        dev_warn(&hid->dev, "ignoring FF field "
+                                                "with report_count < 2\n");
                                         continue;
                                 }
 
-                                if (field->logical_maximum == field->logical_minimum) {
-                                        warn("ignoring FF field with logical_maximum == logical_minimum");
+                                if (field->logical_maximum ==
+                                                field->logical_minimum) {
+                                        dev_warn(&hid->dev, "ignoring FF field "
+                                                        "with logical_maximum "
+                                                        "== logical_minimum\n");
                                         continue;
                                 }
 
                                 if (tmff->report && tmff->report != report) {
-                                        warn("ignoring FF field in other report");
+                                        dev_warn(&hid->dev, "ignoring FF field "
+                                                        "in other report\n");
                                         continue;
                                 }
 
                                 if (tmff->ff_field && tmff->ff_field != field) {
-                                        warn("ignoring duplicate FF field");
+                                        dev_warn(&hid->dev, "ignoring "
+                                                        "duplicate FF field\n");
                                         continue;
                                 }
 
                                 tmff->report = report;
                                 tmff->ff_field = field;
 
-                                for (i = 0; i < ARRAY_SIZE(devices); i++) {
-                                        if (input_dev->id.vendor == devices[i].idVendor &&
-                                            input_dev->id.product == devices[i].idProduct) {
-                                                ff_bits = devices[i].ff;
-                                                break;
-                                        }
-                                }
-
                                 for (i = 0; ff_bits[i] >= 0; i++)
                                         set_bit(ff_bits[i], input_dev->ffbit);
 
                                 break;
 
                         default:
-                                warn("ignoring unknown output usage %08x", field->usage[0].hid);
+                                dev_warn(&hid->dev, "ignoring unknown output "
+                                                "usage %08x\n",
+                                                field->usage[0].hid);
                                 continue;
                         }
                 }
         }
 
         if (!tmff->report) {
-                err("cant find FF field in output reports\n");
+                dev_err(&hid->dev, "can't find FF field in output reports\n");
                 error = -ENODEV;
                 goto fail;
         }
 
-        error = input_ff_create_memless(input_dev, tmff, hid_tmff_play);
+        error = input_ff_create_memless(input_dev, tmff, tmff_play);
         if (error)
                 goto fail;
 
-        info("Force feedback for ThrustMaster devices by Zinx Verituse <zinx@epicsol.org>");
+        dev_info(&hid->dev, "force feedback for ThrustMaster devices by Zinx "
+                        "Verituse <zinx@epicsol.org>");
         return 0;
 
- fail:
+fail:
         kfree(tmff);
         return error;
 }
 
+static int tm_probe(struct hid_device *hdev, const struct hid_device_id *id)
+{
+        int ret;
+
+        ret = hid_parse(hdev);
+        if (ret) {
+                dev_err(&hdev->dev, "parse failed\n");
+                goto err;
+        }
+
+        ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_FF);
+        if (ret) {
+                dev_err(&hdev->dev, "hw start failed\n");
+                goto err;
+        }
+
+        tmff_init(hdev, (void *)id->driver_data);
+
+        return 0;
+err:
+        return ret;
+}
+
+static const struct hid_device_id tm_devices[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300),
+                .driver_data = (unsigned long)ff_rumble },
+        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304),
+                .driver_data = (unsigned long)ff_rumble },
+        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb651),   /* FGT Rumble Force Wheel */
+                .driver_data = (unsigned long)ff_rumble },
+        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654),   /* FGT Force Feedback Wheel */
+                .driver_data = (unsigned long)ff_joystick },
+        { }
+};
+MODULE_DEVICE_TABLE(hid, tm_devices);
+
+static struct hid_driver tm_driver = {
+        .name = "thrustmaster",
+        .id_table = tm_devices,
+        .probe = tm_probe,
+};
+
+static int tm_init(void)
+{
+        return hid_register_driver(&tm_driver);
+}
+
+static void tm_exit(void)
+{
+        hid_unregister_driver(&tm_driver);
+}
+
+module_init(tm_init);
+module_exit(tm_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(thrustmaster);
diff --git a/drivers/hid/usbhid/hid-zpff.c b/drivers/hid/hid-zpff.c
index 5a688274f6a3..ea82f3718b21 100644
--- a/drivers/hid/usbhid/hid-zpff.c
+++ b/drivers/hid/hid-zpff.c
@@ -21,16 +21,19 @@
  */
 
 
+#include <linux/hid.h>
 #include <linux/input.h>
 #include <linux/usb.h>
-#include <linux/hid.h>
-#include "usbhid.h"
+
+#include "hid-ids.h"
+
+#include "usbhid/usbhid.h"
 
 struct zpff_device {
         struct hid_report *report;
 };
 
-static int hid_zpff_play(struct input_dev *dev, void *data,
+static int zpff_play(struct input_dev *dev, void *data,
                          struct ff_effect *effect)
 {
         struct hid_device *hid = input_get_drvdata(dev);
@@ -58,7 +61,7 @@ static int hid_zpff_play(struct input_dev *dev, void *data,
         return 0;
 }
 
-int hid_zpff_init(struct hid_device *hid)
+static int zpff_init(struct hid_device *hid)
 {
         struct zpff_device *zpff;
         struct hid_report *report;
@@ -70,14 +73,14 @@ int hid_zpff_init(struct hid_device *hid)
         int error;
 
         if (list_empty(report_list)) {
-                printk(KERN_ERR "hid-zpff: no output report found\n");
+                dev_err(&hid->dev, "no output report found\n");
                 return -ENODEV;
         }
 
         report = list_entry(report_list->next, struct hid_report, list);
 
         if (report->maxfield < 4) {
-                printk(KERN_ERR "hid-zpff: not enough fields in report\n");
+                dev_err(&hid->dev, "not enough fields in report\n");
                 return -ENODEV;
         }
 
@@ -87,7 +90,7 @@ int hid_zpff_init(struct hid_device *hid)
 
         set_bit(FF_RUMBLE, dev->ffbit);
 
-        error = input_ff_create_memless(dev, zpff, hid_zpff_play);
+        error = input_ff_create_memless(dev, zpff, zpff_play);
         if (error) {
                 kfree(zpff);
                 return error;
@@ -100,8 +103,60 @@ int hid_zpff_init(struct hid_device *hid)
         zpff->report->field[3]->value[0] = 0x00;
         usbhid_submit_report(hid, zpff->report, USB_DIR_OUT);
 
-        printk(KERN_INFO "Force feedback for Zeroplus based devices by "
+        dev_info(&hid->dev, "force feedback for Zeroplus based devices by "
                "Anssi Hannula <anssi.hannula@gmail.com>\n");
 
         return 0;
 }
+
+static int zp_probe(struct hid_device *hdev, const struct hid_device_id *id)
+{
+        int ret;
+
+        ret = hid_parse(hdev);
+        if (ret) {
+                dev_err(&hdev->dev, "parse failed\n");
+                goto err;
+        }
+
+        ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_FF);
+        if (ret) {
+                dev_err(&hdev->dev, "hw start failed\n");
+                goto err;
+        }
+
+        zpff_init(hdev);
+
+        return 0;
+err:
+        return ret;
+}
+
+static const struct hid_device_id zp_devices[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },
+        { }
+};
+MODULE_DEVICE_TABLE(hid, zp_devices);
+
+static struct hid_driver zp_driver = {
+        .name = "zeroplus",
+        .id_table = zp_devices,
+        .probe = zp_probe,
+};
+
+static int zp_init(void)
+{
+        return hid_register_driver(&zp_driver);
+}
+
+static void zp_exit(void)
+{
+        hid_unregister_driver(&zp_driver);
+}
+
+module_init(zp_init);
+module_exit(zp_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(zeroplus);
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index c40f0403edaf..af3edb98df43 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -113,7 +113,7 @@ static ssize_t hidraw_write(struct file *file, const char __user *buffer, size_t
         if (!dev->hid_output_raw_report)
                 return -ENODEV;
 
-        if (count > HID_MIN_BUFFER_SIZE) {
+        if (count > HID_MAX_BUFFER_SIZE) {
                 printk(KERN_WARNING "hidraw: pid %d passed too large report\n",
                                 task_pid_nr(current));
                 return -EINVAL;
@@ -181,7 +181,7 @@ static int hidraw_open(struct inode *inode, struct file *file)
 
         dev = hidraw_table[minor];
         if (!dev->open++)
-                dev->hid->hid_open(dev->hid);
+                dev->hid->ll_driver->open(dev->hid);
 
 out_unlock:
         spin_unlock(&minors_lock);
@@ -207,7 +207,7 @@ static int hidraw_release(struct inode * inode, struct file * file)
         dev = hidraw_table[minor];
         if (!dev->open--) {
                 if (list->hidraw->exist)
-                        dev->hid->hid_close(dev->hid);
+                        dev->hid->ll_driver->close(dev->hid);
                 else
                         kfree(list->hidraw);
         }
@@ -326,9 +326,8 @@ int hidraw_connect(struct hid_device *hid)
                 goto out;
         }
 
-        dev->dev = device_create_drvdata(hidraw_class, NULL,
-                                         MKDEV(hidraw_major, minor), NULL,
-                                         "%s%d", "hidraw", minor);
+        dev->dev = device_create(hidraw_class, NULL, MKDEV(hidraw_major, minor),
+                                 NULL, "%s%d", "hidraw", minor);
 
         if (IS_ERR(dev->dev)) {
                 spin_lock(&minors_lock);
@@ -367,7 +366,7 @@ void hidraw_disconnect(struct hid_device *hid)
         device_destroy(hidraw_class, MKDEV(hidraw_major, hidraw->minor));
 
         if (hidraw->open) {
-                hid->hid_close(hid);
+                hid->ll_driver->close(hid);
                 wake_up_interruptible(&hidraw->wait);
         } else {
                 kfree(hidraw);
diff --git a/drivers/hid/usbhid/Kconfig b/drivers/hid/usbhid/Kconfig
index 18f09104765c..5d9aa95fc3ef 100644
--- a/drivers/hid/usbhid/Kconfig
+++ b/drivers/hid/usbhid/Kconfig
@@ -24,88 +24,13 @@ config USB_HID
 comment "Input core support is needed for USB HID input layer or HIDBP support"
         depends on USB_HID && INPUT=n
 
-config USB_HIDINPUT_POWERBOOK
-        bool "Enable support for Apple laptop/aluminum USB special keys"
-        default n
-        depends on USB_HID
-        help
-          Say Y here if you want support for the special keys (Fn, Numlock) on
-          Apple iBooks, PowerBooks, MacBooks, MacBook Pros and aluminum USB
-          keyboards.
-
-          If unsure, say N.
-
-config HID_FF
-        bool "Force feedback support (EXPERIMENTAL)"
-        depends on USB_HID && EXPERIMENTAL
-        help
-          Say Y here is you want force feedback support for a few HID devices.
-          See below for a list of supported devices.
-
-          See <file:Documentation/input/ff.txt> for a description of the force
-          feedback API.
-
-          If unsure, say N.
-
 config HID_PID
         bool "PID device support"
-        depends on HID_FF
         help
           Say Y here if you have a PID-compliant device and wish to enable force
           feedback for it. Microsoft Sidewinder Force Feedback 2 is one of such
           devices.
 
-config LOGITECH_FF
-        bool "Logitech devices support"
-        depends on HID_FF
-        select INPUT_FF_MEMLESS if USB_HID
-        help
-          Say Y here if you have one of these devices:
-          - Logitech WingMan Cordless RumblePad
-          - Logitech WingMan Cordless RumblePad 2
-          - Logitech WingMan Force 3D
-          - Logitech Formula Force EX
-          - Logitech MOMO Force wheel
-
-          and if you want to enable force feedback for them.
-          Note: if you say N here, this device will still be supported, but without
-          force feedback.
-
-config LOGIRUMBLEPAD2_FF
-        bool "Logitech Rumblepad 2 support"
-        depends on HID_FF
-        select INPUT_FF_MEMLESS if USB_HID
-        help
-          Say Y here if you want to enable force feedback support for Logitech
-          Rumblepad 2 devices.
-
-config PANTHERLORD_FF
-        bool "PantherLord/GreenAsia based device support"
-        depends on HID_FF
-        select INPUT_FF_MEMLESS if USB_HID
-        help
-          Say Y here if you have a PantherLord/GreenAsia based game controller
-          or adapter and want to enable force feedback support for it.
-
-config THRUSTMASTER_FF
-        bool "ThrustMaster devices support"
-        depends on HID_FF
-        select INPUT_FF_MEMLESS if USB_HID
-        help
-          Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or
-          a THRUSTMASTER Ferrari GT Rumble Force or Force Feedback Wheel,
-          and want to enable force feedback support for it.
-          Note: if you say N here, this device will still be supported, but without
-          force feedback.
-
-config ZEROPLUS_FF
-        bool "Zeroplus based game controller support"
-        depends on HID_FF
-        select INPUT_FF_MEMLESS if USB_HID
-        help
-          Say Y here if you have a Zeroplus based game controller and want to
-          enable force feedback for it.
-
 config USB_HIDDEV
         bool "/dev/hiddev raw HID device support"
         depends on USB_HID
diff --git a/drivers/hid/usbhid/Makefile b/drivers/hid/usbhid/Makefile
index 00a7b7090192..1329ecb37a1c 100644
--- a/drivers/hid/usbhid/Makefile
+++ b/drivers/hid/usbhid/Makefile
@@ -13,24 +13,6 @@ endif
 ifeq ($(CONFIG_HID_PID),y)
         usbhid-objs     += hid-pidff.o
 endif
-ifeq ($(CONFIG_LOGITECH_FF),y)
-        usbhid-objs     += hid-lgff.o
-endif
-ifeq ($(CONFIG_LOGIRUMBLEPAD2_FF),y)
-        usbhid-objs     += hid-lg2ff.o
-endif
-ifeq ($(CONFIG_PANTHERLORD_FF),y)
-        usbhid-objs     += hid-plff.o
-endif
-ifeq ($(CONFIG_THRUSTMASTER_FF),y)
-        usbhid-objs     += hid-tmff.o
-endif
-ifeq ($(CONFIG_ZEROPLUS_FF),y)
-        usbhid-objs     += hid-zpff.o
-endif
-ifeq ($(CONFIG_HID_FF),y)
-        usbhid-objs     += hid-ff.o
-endif
 
 obj-$(CONFIG_USB_HID)           += usbhid.o
 obj-$(CONFIG_USB_KBD)           += usbkbd.o
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 27fe4d8912cb..1d3b8a394d46 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -44,8 +44,6 @@
 #define DRIVER_DESC "USB HID core driver"
 #define DRIVER_LICENSE "GPL"
 
-static char *hid_types[] = {"Device", "Pointer", "Mouse", "Device", "Joystick",
-                                "Gamepad", "Keyboard", "Keypad", "Multi-Axis Controller"};
 /*
  * Module parameters.
  */
@@ -61,12 +59,6 @@ MODULE_PARM_DESC(quirks, "Add/modify USB HID quirks by specifying "
                 " quirks=vendorID:productID:quirks"
                 " where vendorID, productID, and quirks are all in"
                 " 0x-prefixed hex");
-static char *rdesc_quirks_param[MAX_USBHID_BOOT_QUIRKS] = { [ 0 ... (MAX_USBHID_BOOT_QUIRKS - 1) ] = NULL };
-module_param_array_named(rdesc_quirks, rdesc_quirks_param, charp, NULL, 0444);
-MODULE_PARM_DESC(rdesc_quirks, "Add/modify report descriptor quirks by specifying "
-                " rdesc_quirks=vendorID:productID:rdesc_quirks"
-                " where vendorID, productID, and rdesc_quirks are all in"
-                " 0x-prefixed hex");
 /*
  * Input submission and I/O error handler.
  */
@@ -197,31 +189,32 @@ static void hid_irq_in(struct urb *urb)
         int                     status;
 
         switch (urb->status) {
-                case 0:                 /* success */
-                        usbhid->retry_delay = 0;
-                        hid_input_report(urb->context, HID_INPUT_REPORT,
-                                         urb->transfer_buffer,
-                                         urb->actual_length, 1);
-                        break;
-                case -EPIPE:            /* stall */
-                        clear_bit(HID_IN_RUNNING, &usbhid->iofl);
-                        set_bit(HID_CLEAR_HALT, &usbhid->iofl);
-                        schedule_work(&usbhid->reset_work);
-                        return;
-                case -ECONNRESET:       /* unlink */
-                case -ENOENT:
-                case -ESHUTDOWN:        /* unplug */
-                        clear_bit(HID_IN_RUNNING, &usbhid->iofl);
-                        return;
-                case -EILSEQ:           /* protocol error or unplug */
-                case -EPROTO:           /* protocol error or unplug */
-                case -ETIME:            /* protocol error or unplug */
-                case -ETIMEDOUT:        /* Should never happen, but... */
-                        clear_bit(HID_IN_RUNNING, &usbhid->iofl);
-                        hid_io_error(hid);
-                        return;
-                default:                /* error */
-                        warn("input irq status %d received", urb->status);
+        case 0:                 /* success */
+                usbhid->retry_delay = 0;
+                hid_input_report(urb->context, HID_INPUT_REPORT,
+                                 urb->transfer_buffer,
+                                 urb->actual_length, 1);
+                break;
+        case -EPIPE:            /* stall */
+                clear_bit(HID_IN_RUNNING, &usbhid->iofl);
+                set_bit(HID_CLEAR_HALT, &usbhid->iofl);
+                schedule_work(&usbhid->reset_work);
+                return;
+        case -ECONNRESET:       /* unlink */
+        case -ENOENT:
+        case -ESHUTDOWN:        /* unplug */
+                clear_bit(HID_IN_RUNNING, &usbhid->iofl);
+                return;
+        case -EILSEQ:           /* protocol error or unplug */
+        case -EPROTO:           /* protocol error or unplug */
+        case -ETIME:            /* protocol error or unplug */
+        case -ETIMEDOUT:        /* Should never happen, but... */
+                clear_bit(HID_IN_RUNNING, &usbhid->iofl);
+                hid_io_error(hid);
+                return;
+        default:                /* error */
+                dev_warn(&urb->dev->dev, "input irq status %d  "
+                                "received\n", urb->status);
         }
 
         status = usb_submit_urb(urb, GFP_ATOMIC);
@@ -240,13 +233,16 @@ static void hid_irq_in(struct urb *urb)
 static int hid_submit_out(struct hid_device *hid)
 {
         struct hid_report *report;
+        char *raw_report;
         struct usbhid_device *usbhid = hid->driver_data;
 
-        report = usbhid->out[usbhid->outtail];
+        report = usbhid->out[usbhid->outtail].report;
+        raw_report = usbhid->out[usbhid->outtail].raw_report;
 
-        hid_output_report(report, usbhid->outbuf);
         usbhid->urbout->transfer_buffer_length = ((report->size - 1) >> 3) + 1 + (report->id > 0);
         usbhid->urbout->dev = hid_to_usb_dev(hid);
+        memcpy(usbhid->outbuf, raw_report, usbhid->urbout->transfer_buffer_length);
+        kfree(raw_report);
 
         dbg_hid("submitting out urb\n");
 
@@ -262,17 +258,20 @@ static int hid_submit_ctrl(struct hid_device *hid)
 {
         struct hid_report *report;
         unsigned char dir;
+        char *raw_report;
         int len;
         struct usbhid_device *usbhid = hid->driver_data;
 
         report = usbhid->ctrl[usbhid->ctrltail].report;
+        raw_report = usbhid->ctrl[usbhid->ctrltail].raw_report;
         dir = usbhid->ctrl[usbhid->ctrltail].dir;
 
         len = ((report->size - 1) >> 3) + 1 + (report->id > 0);
         if (dir == USB_DIR_OUT) {
-                hid_output_report(report, usbhid->ctrlbuf);
                 usbhid->urbctrl->pipe = usb_sndctrlpipe(hid_to_usb_dev(hid), 0);
                 usbhid->urbctrl->transfer_buffer_length = len;
+                memcpy(usbhid->ctrlbuf, raw_report, len);
+                kfree(raw_report);
         } else {
                 int maxpacket, padlen;
 
@@ -319,17 +318,18 @@ static void hid_irq_out(struct urb *urb)
         int unplug = 0;
 
         switch (urb->status) {
-                case 0:                 /* success */
-                        break;
-                case -ESHUTDOWN:        /* unplug */
-                        unplug = 1;
-                case -EILSEQ:           /* protocol error or unplug */
-                case -EPROTO:           /* protocol error or unplug */
-                case -ECONNRESET:       /* unlink */
-                case -ENOENT:
-                        break;
-                default:                /* error */
-                        warn("output irq status %d received", urb->status);
+        case 0:                 /* success */
+                break;
+        case -ESHUTDOWN:        /* unplug */
+                unplug = 1;
+        case -EILSEQ:           /* protocol error or unplug */
+        case -EPROTO:           /* protocol error or unplug */
+        case -ECONNRESET:       /* unlink */
+        case -ENOENT:
+                break;
+        default:                /* error */
+                dev_warn(&urb->dev->dev, "output irq status %d "
+                                "received\n", urb->status);
         }
 
         spin_lock_irqsave(&usbhid->outlock, flags);
@@ -367,21 +367,23 @@ static void hid_ctrl(struct urb *urb)
         spin_lock_irqsave(&usbhid->ctrllock, flags);
 
         switch (urb->status) {
-                case 0:                 /* success */
-                        if (usbhid->ctrl[usbhid->ctrltail].dir == USB_DIR_IN)
-                                hid_input_report(urb->context, usbhid->ctrl[usbhid->ctrltail].report->type,
-                                                urb->transfer_buffer, urb->actual_length, 0);
-                        break;
-                case -ESHUTDOWN:        /* unplug */
-                        unplug = 1;
-                case -EILSEQ:           /* protocol error or unplug */
-                case -EPROTO:           /* protocol error or unplug */
-                case -ECONNRESET:       /* unlink */
-                case -ENOENT:
-                case -EPIPE:            /* report not available */
-                        break;
-                default:                /* error */
-                        warn("ctrl urb status %d received", urb->status);
+        case 0:                 /* success */
+                if (usbhid->ctrl[usbhid->ctrltail].dir == USB_DIR_IN)
+                        hid_input_report(urb->context,
+                                usbhid->ctrl[usbhid->ctrltail].report->type,
+                                urb->transfer_buffer, urb->actual_length, 0);
+                break;
+        case -ESHUTDOWN:        /* unplug */
+                unplug = 1;
+        case -EILSEQ:           /* protocol error or unplug */
+        case -EPROTO:           /* protocol error or unplug */
+        case -ECONNRESET:       /* unlink */
+        case -ENOENT:
+        case -EPIPE:            /* report not available */
+                break;
+        default:                /* error */
+                dev_warn(&urb->dev->dev, "ctrl urb status %d "
+                                "received\n", urb->status);
         }
 
         if (unplug)
@@ -408,6 +410,7 @@ void usbhid_submit_report(struct hid_device *hid, struct hid_report *report, uns
         int head;
         unsigned long flags;
         struct usbhid_device *usbhid = hid->driver_data;
+        int len = ((report->size - 1) >> 3) + 1 + (report->id > 0);
 
         if ((hid->quirks & HID_QUIRK_NOGET) && dir == USB_DIR_IN)
                 return;
@@ -418,11 +421,18 @@ void usbhid_submit_report(struct hid_device *hid, struct hid_report *report, uns
 
                 if ((head = (usbhid->outhead + 1) & (HID_OUTPUT_FIFO_SIZE - 1)) == usbhid->outtail) {
                         spin_unlock_irqrestore(&usbhid->outlock, flags);
-                        warn("output queue full");
+                        dev_warn(&hid->dev, "output queue full\n");
                         return;
                 }
 
-                usbhid->out[usbhid->outhead] = report;
+                usbhid->out[usbhid->outhead].raw_report = kmalloc(len, GFP_ATOMIC);
+                if (!usbhid->out[usbhid->outhead].raw_report) {
+                        spin_unlock_irqrestore(&usbhid->outlock, flags);
+                        warn("output queueing failed");
+                        return;
+                }
+                hid_output_report(report, usbhid->out[usbhid->outhead].raw_report);
+                usbhid->out[usbhid->outhead].report = report;
                 usbhid->outhead = head;
 
                 if (!test_and_set_bit(HID_OUT_RUNNING, &usbhid->iofl))
@@ -437,10 +447,19 @@ void usbhid_submit_report(struct hid_device *hid, struct hid_report *report, uns
 
         if ((head = (usbhid->ctrlhead + 1) & (HID_CONTROL_FIFO_SIZE - 1)) == usbhid->ctrltail) {
                 spin_unlock_irqrestore(&usbhid->ctrllock, flags);
-                warn("control queue full");
+                dev_warn(&hid->dev, "control queue full\n");
                 return;
         }
 
+        if (dir == USB_DIR_OUT) {
+                usbhid->ctrl[usbhid->ctrlhead].raw_report = kmalloc(len, GFP_ATOMIC);
+                if (!usbhid->ctrl[usbhid->ctrlhead].raw_report) {
+                        spin_unlock_irqrestore(&usbhid->ctrllock, flags);
+                        warn("control queueing failed");
+                        return;
+                }
+                hid_output_report(report, usbhid->ctrl[usbhid->ctrlhead].raw_report);
+        }
         usbhid->ctrl[usbhid->ctrlhead].report = report;
         usbhid->ctrl[usbhid->ctrlhead].dir = dir;
         usbhid->ctrlhead = head;
@@ -451,6 +470,7 @@ void usbhid_submit_report(struct hid_device *hid, struct hid_report *report, uns
 
         spin_unlock_irqrestore(&usbhid->ctrllock, flags);
 }
+EXPORT_SYMBOL_GPL(usbhid_submit_report);
 
 static int usb_hidinput_input_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
@@ -465,7 +485,7 @@ static int usb_hidinput_input_event(struct input_dev *dev, unsigned int type, un
                 return -1;
 
         if ((offset = hidinput_find_field(hid, type, code, &field)) == -1) {
-                warn("event field not found");
+                dev_warn(&dev->dev, "event field not found\n");
                 return -1;
         }
 
@@ -568,7 +588,7 @@ void usbhid_init_reports(struct hid_device *hid)
         }
 
         if (err)
-                warn("timeout initializing reports");
+                dev_warn(&hid->dev, "timeout initializing reports\n");
 }
 
 /*
@@ -598,7 +618,7 @@ static int hid_find_field_early(struct hid_device *hid, unsigned int page,
         return -1;
 }
 
-static void usbhid_set_leds(struct hid_device *hid)
+void usbhid_set_leds(struct hid_device *hid)
 {
         struct hid_field *field;
         int offset;
@@ -608,6 +628,7 @@ static void usbhid_set_leds(struct hid_device *hid)
                 usbhid_submit_report(hid, field->report, USB_DIR_OUT);
         }
 }
+EXPORT_SYMBOL_GPL(usbhid_set_leds);
 
 /*
  * Traverse the supplied list of reports and find the longest
@@ -675,43 +696,16 @@ static void hid_free_buffers(struct usb_device *dev, struct hid_device *hid)
         usb_buffer_free(dev, usbhid->bufsize, usbhid->ctrlbuf, usbhid->ctrlbuf_dma);
 }
 
-/*
- * Sending HID_REQ_GET_REPORT changes the operation mode of the ps3 controller
- * to "operational".  Without this, the ps3 controller will not report any
- * events.
- */
-static void hid_fixup_sony_ps3_controller(struct usb_device *dev, int ifnum)
-{
-        int result;
-        char *buf = kmalloc(18, GFP_KERNEL);
-
-        if (!buf)
-                return;
-
-        result = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
-                                 HID_REQ_GET_REPORT,
-                                 USB_DIR_IN | USB_TYPE_CLASS |
-                                 USB_RECIP_INTERFACE,
-                                 (3 << 8) | 0xf2, ifnum, buf, 17,
-                                 USB_CTRL_GET_TIMEOUT);
-
-        if (result < 0)
-                err_hid("%s failed: %d\n", __func__, result);
-
-        kfree(buf);
-}
-
-static struct hid_device *usb_hid_configure(struct usb_interface *intf)
+static int usbhid_parse(struct hid_device *hid)
 {
+        struct usb_interface *intf = to_usb_interface(hid->dev.parent);
         struct usb_host_interface *interface = intf->cur_altsetting;
         struct usb_device *dev = interface_to_usbdev (intf);
         struct hid_descriptor *hdesc;
-        struct hid_device *hid;
         u32 quirks = 0;
-        unsigned int insize = 0, rsize = 0;
+        unsigned int rsize = 0;
         char *rdesc;
-        int n, len;
-        struct usbhid_device *usbhid;
+        int ret, n;
 
         quirks = usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor),
                         le16_to_cpu(dev->descriptor.idProduct));
@@ -724,63 +718,75 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
                                 quirks |= HID_QUIRK_NOGET;
         }
 
-        if (quirks & HID_QUIRK_IGNORE)
-                return NULL;
-
-        if ((quirks & HID_QUIRK_IGNORE_MOUSE) &&
-                (interface->desc.bInterfaceProtocol == USB_INTERFACE_PROTOCOL_MOUSE))
-                        return NULL;
-
-
         if (usb_get_extra_descriptor(interface, HID_DT_HID, &hdesc) &&
             (!interface->desc.bNumEndpoints ||
              usb_get_extra_descriptor(&interface->endpoint[0], HID_DT_HID, &hdesc))) {
                 dbg_hid("class descriptor not present\n");
-                return NULL;
+                return -ENODEV;
         }
 
+        hid->version = le16_to_cpu(hdesc->bcdHID);
+        hid->country = hdesc->bCountryCode;
+
         for (n = 0; n < hdesc->bNumDescriptors; n++)
                 if (hdesc->desc[n].bDescriptorType == HID_DT_REPORT)
                         rsize = le16_to_cpu(hdesc->desc[n].wDescriptorLength);
 
         if (!rsize || rsize > HID_MAX_DESCRIPTOR_SIZE) {
                 dbg_hid("weird size of report descriptor (%u)\n", rsize);
-                return NULL;
+                return -EINVAL;
         }
 
         if (!(rdesc = kmalloc(rsize, GFP_KERNEL))) {
                 dbg_hid("couldn't allocate rdesc memory\n");
-                return NULL;
+                return -ENOMEM;
         }
 
         hid_set_idle(dev, interface->desc.bInterfaceNumber, 0, 0);
 
-        if ((n = hid_get_class_descriptor(dev, interface->desc.bInterfaceNumber, HID_DT_REPORT, rdesc, rsize)) < 0) {
+        ret = hid_get_class_descriptor(dev, interface->desc.bInterfaceNumber,
+                        HID_DT_REPORT, rdesc, rsize);
+        if (ret < 0) {
                 dbg_hid("reading report descriptor failed\n");
                 kfree(rdesc);
-                return NULL;
+                goto err;
         }
 
-        usbhid_fixup_report_descriptor(le16_to_cpu(dev->descriptor.idVendor),
-                        le16_to_cpu(dev->descriptor.idProduct), rdesc,
-                        rsize, rdesc_quirks_param);
-
         dbg_hid("report descriptor (size %u, read %d) = ", rsize, n);
         for (n = 0; n < rsize; n++)
                 dbg_hid_line(" %02x", (unsigned char) rdesc[n]);
         dbg_hid_line("\n");
 
-        if (!(hid = hid_parse_report(rdesc, n))) {
+        ret = hid_parse_report(hid, rdesc, rsize);
+        kfree(rdesc);
+        if (ret) {
                 dbg_hid("parsing report descriptor failed\n");
-                kfree(rdesc);
-                return NULL;
+                goto err;
         }
 
-        kfree(rdesc);
         hid->quirks = quirks;
 
-        if (!(usbhid = kzalloc(sizeof(struct usbhid_device), GFP_KERNEL)))
-                goto fail_no_usbhid;
+        return 0;
+err:
+        return ret;
+}
+
+static int usbhid_start(struct hid_device *hid)
+{
+        struct usb_interface *intf = to_usb_interface(hid->dev.parent);
+        struct usb_host_interface *interface = intf->cur_altsetting;
+        struct usb_device *dev = interface_to_usbdev(intf);
+        struct usbhid_device *usbhid;
+        unsigned int n, insize = 0;
+        int ret;
+
+        WARN_ON(hid->driver_data);
+
+        usbhid = kzalloc(sizeof(struct usbhid_device), GFP_KERNEL);
+        if (usbhid == NULL) {
+                ret = -ENOMEM;
+                goto err;
+        }
 
         hid->driver_data = usbhid;
         usbhid->hid = hid;
@@ -799,28 +805,11 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
                 insize = HID_MAX_BUFFER_SIZE;
 
         if (hid_alloc_buffers(dev, hid)) {
-                hid_free_buffers(dev, hid);
+                ret = -ENOMEM;
                 goto fail;
         }
 
-        hid->name[0] = 0;
-
-        if (dev->manufacturer)
-                strlcpy(hid->name, dev->manufacturer, sizeof(hid->name));
-
-        if (dev->product) {
-                if (dev->manufacturer)
-                        strlcat(hid->name, " ", sizeof(hid->name));
-                strlcat(hid->name, dev->product, sizeof(hid->name));
-        }
-
-        if (!strlen(hid->name))
-                snprintf(hid->name, sizeof(hid->name), "HID %04x:%04x",
-                         le16_to_cpu(dev->descriptor.idVendor),
-                         le16_to_cpu(dev->descriptor.idProduct));
-
         for (n = 0; n < interface->desc.bNumEndpoints; n++) {
-
                 struct usb_endpoint_descriptor *endpoint;
                 int pipe;
                 int interval;
@@ -832,7 +821,7 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
                 interval = endpoint->bInterval;
 
                 /* Some vendors give fullspeed interval on highspeed devides */
-                if (quirks & HID_QUIRK_FULLSPEED_INTERVAL  &&
+                if (hid->quirks & HID_QUIRK_FULLSPEED_INTERVAL &&
                     dev->speed == USB_SPEED_HIGH) {
                         interval = fls(endpoint->bInterval*8);
                         printk(KERN_INFO "%s: Fixing fullspeed to highspeed interval: %d -> %d\n",
@@ -843,6 +832,7 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
                 if (hid->collection->usage == HID_GD_MOUSE && hid_mousepoll_interval > 0)
                         interval = hid_mousepoll_interval;
 
+                ret = -ENOMEM;
                 if (usb_endpoint_dir_in(endpoint)) {
                         if (usbhid->urbin)
                                 continue;
@@ -868,6 +858,7 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
 
         if (!usbhid->urbin) {
                 err_hid("couldn't find an input interrupt endpoint");
+                ret = -ENODEV;
                 goto fail;
         }
 
@@ -879,44 +870,25 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
         spin_lock_init(&usbhid->outlock);
         spin_lock_init(&usbhid->ctrllock);
 
-        hid->version = le16_to_cpu(hdesc->bcdHID);
-        hid->country = hdesc->bCountryCode;
-        hid->dev = &intf->dev;
         usbhid->intf = intf;
         usbhid->ifnum = interface->desc.bInterfaceNumber;
 
-        hid->bus = BUS_USB;
-        hid->vendor = le16_to_cpu(dev->descriptor.idVendor);
-        hid->product = le16_to_cpu(dev->descriptor.idProduct);
-
-        usb_make_path(dev, hid->phys, sizeof(hid->phys));
-        strlcat(hid->phys, "/input", sizeof(hid->phys));
-        len = strlen(hid->phys);
-        if (len < sizeof(hid->phys) - 1)
-                snprintf(hid->phys + len, sizeof(hid->phys) - len,
-                         "%d", intf->altsetting[0].desc.bInterfaceNumber);
-
-        if (usb_string(dev, dev->descriptor.iSerialNumber, hid->uniq, 64) <= 0)
-                hid->uniq[0] = 0;
-
         usbhid->urbctrl = usb_alloc_urb(0, GFP_KERNEL);
-        if (!usbhid->urbctrl)
+        if (!usbhid->urbctrl) {
+                ret = -ENOMEM;
                 goto fail;
+        }
 
         usb_fill_control_urb(usbhid->urbctrl, dev, 0, (void *) usbhid->cr,
                              usbhid->ctrlbuf, 1, hid_ctrl, hid);
         usbhid->urbctrl->setup_dma = usbhid->cr_dma;
         usbhid->urbctrl->transfer_dma = usbhid->ctrlbuf_dma;
         usbhid->urbctrl->transfer_flags |= (URB_NO_TRANSFER_DMA_MAP | URB_NO_SETUP_DMA_MAP);
-        hid->hidinput_input_event = usb_hidinput_input_event;
-        hid->hid_open = usbhid_open;
-        hid->hid_close = usbhid_close;
-#ifdef CONFIG_USB_HIDDEV
-        hid->hiddev_hid_event = hiddev_hid_event;
-        hid->hiddev_report_event = hiddev_report_event;
-#endif
-        hid->hid_output_raw_report = usbhid_output_raw_report;
-        return hid;
+
+        usbhid_init_reports(hid);
+        hid_dump_device(hid);
+
+        return 0;
 
 fail:
         usb_free_urb(usbhid->urbin);
@@ -924,24 +896,18 @@ fail:
         usb_free_urb(usbhid->urbctrl);
         hid_free_buffers(dev, hid);
         kfree(usbhid);
-fail_no_usbhid:
-        hid_free_device(hid);
-
-        return NULL;
+err:
+        return ret;
 }
 
-static void hid_disconnect(struct usb_interface *intf)
+static void usbhid_stop(struct hid_device *hid)
 {
-        struct hid_device *hid = usb_get_intfdata (intf);
-        struct usbhid_device *usbhid;
+        struct usbhid_device *usbhid = hid->driver_data;
 
-        if (!hid)
+        if (WARN_ON(!usbhid))
                 return;
 
-        usbhid = hid->driver_data;
-
         spin_lock_irq(&usbhid->inlock); /* Sync with error handler */
-        usb_set_intfdata(intf, NULL);
         set_bit(HID_DISCONNECTED, &usbhid->iofl);
         spin_unlock_irq(&usbhid->inlock);
         usb_kill_urb(usbhid->urbin);
@@ -958,86 +924,100 @@ static void hid_disconnect(struct usb_interface *intf)
         if (hid->claimed & HID_CLAIMED_HIDRAW)
                 hidraw_disconnect(hid);
 
+        hid->claimed = 0;
+
         usb_free_urb(usbhid->urbin);
         usb_free_urb(usbhid->urbctrl);
         usb_free_urb(usbhid->urbout);
 
         hid_free_buffers(hid_to_usb_dev(hid), hid);
         kfree(usbhid);
-        hid_free_device(hid);
+        hid->driver_data = NULL;
 }
 
+static struct hid_ll_driver usb_hid_driver = {
+        .parse = usbhid_parse,
+        .start = usbhid_start,
+        .stop = usbhid_stop,
+        .open = usbhid_open,
+        .close = usbhid_close,
+        .hidinput_input_event = usb_hidinput_input_event,
+};
+
 static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
+        struct usb_device *dev = interface_to_usbdev(intf);
         struct hid_device *hid;
-        char path[64];
-        int i;
-        char *c;
+        size_t len;
+        int ret;
 
         dbg_hid("HID probe called for ifnum %d\n",
                         intf->altsetting->desc.bInterfaceNumber);
 
-        if (!(hid = usb_hid_configure(intf)))
-                return -ENODEV;
-
-        usbhid_init_reports(hid);
-        hid_dump_device(hid);
-        if (hid->quirks & HID_QUIRK_RESET_LEDS)
-                usbhid_set_leds(hid);
-
-        if (!hidinput_connect(hid))
-                hid->claimed |= HID_CLAIMED_INPUT;
-        if (!hiddev_connect(hid))
-                hid->claimed |= HID_CLAIMED_HIDDEV;
-        if (!hidraw_connect(hid))
-                hid->claimed |= HID_CLAIMED_HIDRAW;
+        hid = hid_allocate_device();
+        if (IS_ERR(hid))
+                return PTR_ERR(hid);
 
         usb_set_intfdata(intf, hid);
+        hid->ll_driver = &usb_hid_driver;
+        hid->hid_output_raw_report = usbhid_output_raw_report;
+        hid->ff_init = hid_pidff_init;
+#ifdef CONFIG_USB_HIDDEV
+        hid->hiddev_connect = hiddev_connect;
+        hid->hiddev_hid_event = hiddev_hid_event;
+        hid->hiddev_report_event = hiddev_report_event;
+#endif
+        hid->dev.parent = &intf->dev;
+        hid->bus = BUS_USB;
+        hid->vendor = le16_to_cpu(dev->descriptor.idVendor);
+        hid->product = le16_to_cpu(dev->descriptor.idProduct);
+        hid->name[0] = 0;
 
-        if (!hid->claimed) {
-                printk ("HID device claimed by neither input, hiddev nor hidraw\n");
-                hid_disconnect(intf);
-                return -ENODEV;
+        if (dev->manufacturer)
+                strlcpy(hid->name, dev->manufacturer, sizeof(hid->name));
+
+        if (dev->product) {
+                if (dev->manufacturer)
+                        strlcat(hid->name, " ", sizeof(hid->name));
+                strlcat(hid->name, dev->product, sizeof(hid->name));
         }
 
-        if ((hid->claimed & HID_CLAIMED_INPUT))
-                hid_ff_init(hid);
+        if (!strlen(hid->name))
+                snprintf(hid->name, sizeof(hid->name), "HID %04x:%04x",
+                         le16_to_cpu(dev->descriptor.idVendor),
+                         le16_to_cpu(dev->descriptor.idProduct));
 
-        if (hid->quirks & HID_QUIRK_SONY_PS3_CONTROLLER)
-                hid_fixup_sony_ps3_controller(interface_to_usbdev(intf),
-                        intf->cur_altsetting->desc.bInterfaceNumber);
+        usb_make_path(dev, hid->phys, sizeof(hid->phys));
+        strlcat(hid->phys, "/input", sizeof(hid->phys));
+        len = strlen(hid->phys);
+        if (len < sizeof(hid->phys) - 1)
+                snprintf(hid->phys + len, sizeof(hid->phys) - len,
+                         "%d", intf->altsetting[0].desc.bInterfaceNumber);
 
-        printk(KERN_INFO);
+        if (usb_string(dev, dev->descriptor.iSerialNumber, hid->uniq, 64) <= 0)
+                hid->uniq[0] = 0;
 
-        if (hid->claimed & HID_CLAIMED_INPUT)
-                printk("input");
-        if ((hid->claimed & HID_CLAIMED_INPUT) && ((hid->claimed & HID_CLAIMED_HIDDEV) ||
-                                hid->claimed & HID_CLAIMED_HIDRAW))
-                printk(",");
-        if (hid->claimed & HID_CLAIMED_HIDDEV)
-                printk("hiddev%d", hid->minor);
-        if ((hid->claimed & HID_CLAIMED_INPUT) && (hid->claimed & HID_CLAIMED_HIDDEV) &&
-                        (hid->claimed & HID_CLAIMED_HIDRAW))
-                printk(",");
-        if (hid->claimed & HID_CLAIMED_HIDRAW)
-                printk("hidraw%d", ((struct hidraw*)hid->hidraw)->minor);
-
-        c = "Device";
-        for (i = 0; i < hid->maxcollection; i++) {
-                if (hid->collection[i].type == HID_COLLECTION_APPLICATION &&
-                    (hid->collection[i].usage & HID_USAGE_PAGE) == HID_UP_GENDESK &&
-                    (hid->collection[i].usage & 0xffff) < ARRAY_SIZE(hid_types)) {
-                        c = hid_types[hid->collection[i].usage & 0xffff];
-                        break;
-                }
+        ret = hid_add_device(hid);
+        if (ret) {
+                if (ret != -ENODEV)
+                        dev_err(&intf->dev, "can't add hid device: %d\n", ret);
+                goto err;
         }
 
-        usb_make_path(interface_to_usbdev(intf), path, 63);
+        return 0;
+err:
+        hid_destroy_device(hid);
+        return ret;
+}
 
-        printk(": USB HID v%x.%02x %s [%s] on %s\n",
-                hid->version >> 8, hid->version & 0xff, c, hid->name, path);
+static void hid_disconnect(struct usb_interface *intf)
+{
+        struct hid_device *hid = usb_get_intfdata(intf);
 
-        return 0;
+        if (WARN_ON(!hid))
+                return;
+
+        hid_destroy_device(hid);
 }
 
 static int hid_suspend(struct usb_interface *intf, pm_message_t message)
@@ -1107,9 +1087,22 @@ static struct usb_driver hid_driver = {
         .supports_autosuspend = 1,
 };
 
+static const struct hid_device_id hid_usb_table[] = {
+        { HID_USB_DEVICE(HID_ANY_ID, HID_ANY_ID) },
+        { }
+};
+
+static struct hid_driver hid_usb_driver = {
+        .name = "generic-usb",
+        .id_table = hid_usb_table,
+};
+
 static int __init hid_init(void)
 {
         int retval;
+        retval = hid_register_driver(&hid_usb_driver);
+        if (retval)
+                goto hid_register_fail;
         retval = usbhid_quirks_init(quirks_param);
         if (retval)
                 goto usbhid_quirks_init_fail;
@@ -1119,7 +1112,8 @@ static int __init hid_init(void)
         retval = usb_register(&hid_driver);
         if (retval)
                 goto usb_register_fail;
-        info(DRIVER_VERSION ":" DRIVER_DESC);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+                        DRIVER_DESC "\n");
 
         return 0;
 usb_register_fail:
@@ -1127,6 +1121,8 @@ usb_register_fail:
 hiddev_init_fail:
         usbhid_quirks_exit();
 usbhid_quirks_init_fail:
+        hid_unregister_driver(&hid_usb_driver);
+hid_register_fail:
         return retval;
 }
 
@@ -1135,6 +1131,7 @@ static void __exit hid_exit(void)
         usb_deregister(&hid_driver);
         hiddev_exit();
         usbhid_quirks_exit();
+        hid_unregister_driver(&hid_usb_driver);
 }
 
 module_init(hid_init);
diff --git a/drivers/hid/usbhid/hid-ff.c b/drivers/hid/usbhid/hid-ff.c
deleted file mode 100644
index 1d0dac52f166..000000000000
--- a/drivers/hid/usbhid/hid-ff.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- *  Force feedback support for hid devices.
- *  Not all hid devices use the same protocol. For example, some use PID,
- *  other use their own proprietary procotol.
- *
- *  Copyright (c) 2002-2004 Johann Deneux
- */
-
-/*
- * 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
- *
- * Should you need to contact me, the author, you can do so by
- * e-mail - mail your message to <johann.deneux@it.uu.se>
- */
-
-#include <linux/input.h>
-
-#undef DEBUG
-#include <linux/usb.h>
-
-#include <linux/hid.h>
-#include "usbhid.h"
-
-/*
- * This table contains pointers to initializers. To add support for new
- * devices, you need to add the USB vendor and product ids here.
- */
-struct hid_ff_initializer {
-        u16 idVendor;
-        u16 idProduct;
-        int (*init)(struct hid_device*);
-};
-
-/*
- * We try pidff when no other driver is found because PID is the
- * standards compliant way of implementing force feedback in HID.
- * pidff_init() will quickly abort if the device doesn't appear to
- * be a PID device
- */
-static struct hid_ff_initializer inits[] = {
-#ifdef CONFIG_LOGITECH_FF
-        { 0x46d, 0xc211, hid_lgff_init }, /* Logitech Cordless rumble pad */
-        { 0x46d, 0xc219, hid_lgff_init }, /* Logitech Cordless rumble pad 2 */
-        { 0x46d, 0xc283, hid_lgff_init }, /* Logitech Wingman Force 3d */
-        { 0x46d, 0xc286, hid_lgff_init }, /* Logitech Force 3D Pro Joystick */
-        { 0x46d, 0xc294, hid_lgff_init }, /* Logitech Formula Force EX */
-        { 0x46d, 0xc295, hid_lgff_init }, /* Logitech MOMO force wheel */
-        { 0x46d, 0xca03, hid_lgff_init }, /* Logitech MOMO force wheel */
-#endif
-#ifdef CONFIG_LOGIRUMBLEPAD2_FF
-        { 0x46d, 0xc218, hid_lg2ff_init }, /* Logitech Rumblepad 2 */
-#endif
-#ifdef CONFIG_PANTHERLORD_FF
-        { 0x810, 0x0001, hid_plff_init }, /* "Twin USB Joystick" */
-        { 0xe8f, 0x0003, hid_plff_init }, /* "GreenAsia Inc.    USB Joystick     " */
-#endif
-#ifdef CONFIG_THRUSTMASTER_FF
-        { 0x44f, 0xb300, hid_tmff_init },
-        { 0x44f, 0xb304, hid_tmff_init },
-        { 0x44f, 0xb651, hid_tmff_init }, /* FGT Rumble Force Wheel */
-        { 0x44f, 0xb654, hid_tmff_init }, /* FGT Force Feedback Wheel */
-#endif
-#ifdef CONFIG_ZEROPLUS_FF
-        { 0xc12, 0x0005, hid_zpff_init },
-        { 0xc12, 0x0030, hid_zpff_init },
-#endif
-        { 0,     0,      hid_pidff_init}  /* Matches anything */
-};
-
-int hid_ff_init(struct hid_device* hid)
-{
-        struct hid_ff_initializer *init;
-        int vendor = le16_to_cpu(hid_to_usb_dev(hid)->descriptor.idVendor);
-        int product = le16_to_cpu(hid_to_usb_dev(hid)->descriptor.idProduct);
-
-        for (init = inits; init->idVendor; init++)
-                if (init->idVendor == vendor && init->idProduct == product)
-                        break;
-
-        return init->init(hid);
-}
-EXPORT_SYMBOL_GPL(hid_ff_init);
-
diff --git a/drivers/hid/usbhid/hid-pidff.c b/drivers/hid/usbhid/hid-pidff.c
index 011326178c06..484e3eec2f88 100644
--- a/drivers/hid/usbhid/hid-pidff.c
+++ b/drivers/hid/usbhid/hid-pidff.c
@@ -397,7 +397,6 @@ static void pidff_set_condition_report(struct pidff_device *pidff,
                           effect->u.condition[i].left_saturation);
                 pidff_set(&pidff->set_condition[PID_DEAD_BAND],
                           effect->u.condition[i].deadband);
-                usbhid_wait_io(pidff->hid);
                 usbhid_submit_report(pidff->hid, pidff->reports[PID_SET_CONDITION],
                                   USB_DIR_OUT);
         }
@@ -512,7 +511,6 @@ static void pidff_playback_pid(struct pidff_device *pidff, int pid_id, int n)
                 pidff->effect_operation[PID_LOOP_COUNT].value[0] = n;
         }
 
-        usbhid_wait_io(pidff->hid);
         usbhid_submit_report(pidff->hid, pidff->reports[PID_EFFECT_OPERATION],
                           USB_DIR_OUT);
 }
@@ -548,6 +546,9 @@ static int pidff_erase_effect(struct input_dev *dev, int effect_id)
         int pid_id = pidff->pid_id[effect_id];
 
         debug("starting to erase %d/%d", effect_id, pidff->pid_id[effect_id]);
+        /* Wait for the queue to clear. We do not want a full fifo to
+           prevent the effect removal. */
+        usbhid_wait_io(pidff->hid);
         pidff_playback_pid(pidff, pid_id, 0);
         pidff_erase_pid(pidff, pid_id);
 
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index b15f88249639..47ebe045f9b5 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -17,412 +17,7 @@
 
 #include <linux/hid.h>
 
-#define USB_VENDOR_ID_A4TECH            0x09da
-#define USB_DEVICE_ID_A4TECH_WCP32PU    0x0006
-#define USB_DEVICE_ID_A4TECH_X5_005D    0x000a
-
-#define USB_VENDOR_ID_AASHIMA           0x06d6
-#define USB_DEVICE_ID_AASHIMA_GAMEPAD   0x0025
-#define USB_DEVICE_ID_AASHIMA_PREDATOR  0x0026
-
-#define USB_VENDOR_ID_ACECAD            0x0460
-#define USB_DEVICE_ID_ACECAD_FLAIR      0x0004
-#define USB_DEVICE_ID_ACECAD_302        0x0008
-
-#define USB_VENDOR_ID_ADS_TECH          0x06e1
-#define USB_DEVICE_ID_ADS_TECH_RADIO_SI470X     0xa155
-
-#define USB_VENDOR_ID_AFATECH           0x15a4
-#define USB_DEVICE_ID_AFATECH_AF9016    0x9016
-
-#define USB_VENDOR_ID_AIPTEK            0x08ca
-#define USB_DEVICE_ID_AIPTEK_01         0x0001
-#define USB_DEVICE_ID_AIPTEK_10         0x0010
-#define USB_DEVICE_ID_AIPTEK_20         0x0020
-#define USB_DEVICE_ID_AIPTEK_21         0x0021
-#define USB_DEVICE_ID_AIPTEK_22         0x0022
-#define USB_DEVICE_ID_AIPTEK_23         0x0023
-#define USB_DEVICE_ID_AIPTEK_24         0x0024
-
-#define USB_VENDOR_ID_AIRCABLE          0x16CA
-#define USB_DEVICE_ID_AIRCABLE1         0x1502
-
-#define USB_VENDOR_ID_ALCOR             0x058f
-#define USB_DEVICE_ID_ALCOR_USBRS232    0x9720
-
-#define USB_VENDOR_ID_ALPS              0x0433
-#define USB_DEVICE_ID_IBM_GAMEPAD       0x1101
-
-#define USB_VENDOR_ID_APPLE             0x05ac
-#define USB_DEVICE_ID_APPLE_MIGHTYMOUSE 0x0304
-#define USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI       0x020e
-#define USB_DEVICE_ID_APPLE_FOUNTAIN_ISO        0x020f
-#define USB_DEVICE_ID_APPLE_GEYSER_ANSI 0x0214
-#define USB_DEVICE_ID_APPLE_GEYSER_ISO  0x0215
-#define USB_DEVICE_ID_APPLE_GEYSER_JIS  0x0216
-#define USB_DEVICE_ID_APPLE_GEYSER3_ANSI        0x0217
-#define USB_DEVICE_ID_APPLE_GEYSER3_ISO 0x0218
-#define USB_DEVICE_ID_APPLE_GEYSER3_JIS 0x0219
-#define USB_DEVICE_ID_APPLE_GEYSER4_ANSI        0x021a
-#define USB_DEVICE_ID_APPLE_GEYSER4_ISO 0x021b
-#define USB_DEVICE_ID_APPLE_GEYSER4_JIS 0x021c
-#define USB_DEVICE_ID_APPLE_ALU_ANSI    0x0220
-#define USB_DEVICE_ID_APPLE_ALU_ISO     0x0221
-#define USB_DEVICE_ID_APPLE_ALU_JIS     0x0222
-#define USB_DEVICE_ID_APPLE_WELLSPRING_ANSI     0x0223
-#define USB_DEVICE_ID_APPLE_WELLSPRING_ISO      0x0224
-#define USB_DEVICE_ID_APPLE_WELLSPRING_JIS      0x0225
-#define USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI    0x0229
-#define USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO     0x022a
-#define USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS     0x022b
-#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI  0x022c
-#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO   0x022d
-#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS   0x022e
-#define USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI    0x0230
-#define USB_DEVICE_ID_APPLE_WELLSPRING2_ISO     0x0231
-#define USB_DEVICE_ID_APPLE_WELLSPRING2_JIS     0x0232
-#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY    0x030a
-#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY     0x030b
-#define USB_DEVICE_ID_APPLE_IRCONTROL4  0x8242
-
-#define USB_VENDOR_ID_ASUS              0x0b05
-#define USB_DEVICE_ID_ASUS_LCM          0x1726
-
-#define USB_VENDOR_ID_ATEN              0x0557
-#define USB_DEVICE_ID_ATEN_UC100KM      0x2004
-#define USB_DEVICE_ID_ATEN_CS124U       0x2202
-#define USB_DEVICE_ID_ATEN_2PORTKVM     0x2204
-#define USB_DEVICE_ID_ATEN_4PORTKVM     0x2205
-#define USB_DEVICE_ID_ATEN_4PORTKVMC    0x2208
-
-#define USB_VENDOR_ID_BELKIN           0x050d
-#define USB_DEVICE_ID_FLIP_KVM         0x3201
-
-#define USB_VENDOR_ID_BERKSHIRE         0x0c98
-#define USB_DEVICE_ID_BERKSHIRE_PCWD    0x1140
-
-#define USB_VENDOR_ID_CHERRY            0x046a
-#define USB_DEVICE_ID_CHERRY_CYMOTION   0x0023
-
-#define USB_VENDOR_ID_CHIC              0x05fe
-#define USB_DEVICE_ID_CHIC_GAMEPAD      0x0014
-
-#define USB_VENDOR_ID_CIDC              0x1677
-
-#define USB_VENDOR_ID_CMEDIA            0x0d8c
-#define USB_DEVICE_ID_CM109             0x000e
-
-#define USB_VENDOR_ID_CODEMERCS         0x07c0
-#define USB_DEVICE_ID_CODEMERCS_IOW_FIRST       0x1500
-#define USB_DEVICE_ID_CODEMERCS_IOW_LAST        0x15ff
-
-#define USB_VENDOR_ID_CYGNAL            0x10c4
-#define USB_DEVICE_ID_CYGNAL_RADIO_SI470X       0x818a
-
-#define USB_VENDOR_ID_CYPRESS           0x04b4
-#define USB_DEVICE_ID_CYPRESS_MOUSE     0x0001
-#define USB_DEVICE_ID_CYPRESS_HIDCOM    0x5500
-#define USB_DEVICE_ID_CYPRESS_ULTRAMOUSE        0x7417
-#define USB_DEVICE_ID_CYPRESS_BARCODE_1 0xde61
-#define USB_DEVICE_ID_CYPRESS_BARCODE_2 0xde64
-
-#define USB_VENDOR_ID_DELL              0x413c
-#define USB_DEVICE_ID_DELL_W7658        0x2005
-
-#define USB_VENDOR_ID_DELORME           0x1163
-#define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100
-#define USB_DEVICE_ID_DELORME_EM_LT20   0x0200
-
-#define USB_VENDOR_ID_DMI               0x0c0b
-#define USB_DEVICE_ID_DMI_ENC           0x5fab
-
-#define USB_VENDOR_ID_ELO               0x04E7
-#define USB_DEVICE_ID_ELO_TS2700        0x0020
-
-#define USB_VENDOR_ID_ESSENTIAL_REALITY 0x0d7f
-#define USB_DEVICE_ID_ESSENTIAL_REALITY_P5 0x0100
-
-#define USB_VENDOR_ID_EZKEY             0x0518
-#define USB_DEVICE_ID_BTC_8193          0x0002
-
-#define USB_VENDOR_ID_GAMERON           0x0810
-#define USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR  0x0001
-
-#define USB_VENDOR_ID_GENERAL_TOUCH     0x0dfc
-
-#define USB_VENDOR_ID_GLAB              0x06c2
-#define USB_DEVICE_ID_4_PHIDGETSERVO_30 0x0038
-#define USB_DEVICE_ID_1_PHIDGETSERVO_30 0x0039
-#define USB_DEVICE_ID_0_0_4_IF_KIT      0x0040
-#define USB_DEVICE_ID_0_16_16_IF_KIT    0x0044
-#define USB_DEVICE_ID_8_8_8_IF_KIT      0x0045
-#define USB_DEVICE_ID_0_8_7_IF_KIT      0x0051
-#define USB_DEVICE_ID_0_8_8_IF_KIT      0x0053
-#define USB_DEVICE_ID_PHIDGET_MOTORCONTROL      0x0058
-
-#define USB_VENDOR_ID_GOTOP             0x08f2
-#define USB_DEVICE_ID_SUPER_Q2          0x007f
-#define USB_DEVICE_ID_GOGOPEN           0x00ce
-#define USB_DEVICE_ID_PENPOWER          0x00f4
-
-#define USB_VENDOR_ID_GRETAGMACBETH     0x0971
-#define USB_DEVICE_ID_GRETAGMACBETH_HUEY        0x2005
-
-#define USB_VENDOR_ID_GRIFFIN           0x077d
-#define USB_DEVICE_ID_POWERMATE         0x0410
-#define USB_DEVICE_ID_SOUNDKNOB         0x04AA
-
-#define USB_VENDOR_ID_GTCO              0x078c
-#define USB_DEVICE_ID_GTCO_90           0x0090
-#define USB_DEVICE_ID_GTCO_100          0x0100
-#define USB_DEVICE_ID_GTCO_101          0x0101
-#define USB_DEVICE_ID_GTCO_103          0x0103
-#define USB_DEVICE_ID_GTCO_104          0x0104
-#define USB_DEVICE_ID_GTCO_105          0x0105
-#define USB_DEVICE_ID_GTCO_106          0x0106
-#define USB_DEVICE_ID_GTCO_107          0x0107
-#define USB_DEVICE_ID_GTCO_108          0x0108
-#define USB_DEVICE_ID_GTCO_200          0x0200
-#define USB_DEVICE_ID_GTCO_201          0x0201
-#define USB_DEVICE_ID_GTCO_202          0x0202
-#define USB_DEVICE_ID_GTCO_203          0x0203
-#define USB_DEVICE_ID_GTCO_204          0x0204
-#define USB_DEVICE_ID_GTCO_205          0x0205
-#define USB_DEVICE_ID_GTCO_206          0x0206
-#define USB_DEVICE_ID_GTCO_207          0x0207
-#define USB_DEVICE_ID_GTCO_300          0x0300
-#define USB_DEVICE_ID_GTCO_301          0x0301
-#define USB_DEVICE_ID_GTCO_302          0x0302
-#define USB_DEVICE_ID_GTCO_303          0x0303
-#define USB_DEVICE_ID_GTCO_304          0x0304
-#define USB_DEVICE_ID_GTCO_305          0x0305
-#define USB_DEVICE_ID_GTCO_306          0x0306
-#define USB_DEVICE_ID_GTCO_307          0x0307
-#define USB_DEVICE_ID_GTCO_308          0x0308
-#define USB_DEVICE_ID_GTCO_309          0x0309
-#define USB_DEVICE_ID_GTCO_400          0x0400
-#define USB_DEVICE_ID_GTCO_401          0x0401
-#define USB_DEVICE_ID_GTCO_402          0x0402
-#define USB_DEVICE_ID_GTCO_403          0x0403
-#define USB_DEVICE_ID_GTCO_404          0x0404
-#define USB_DEVICE_ID_GTCO_405          0x0405
-#define USB_DEVICE_ID_GTCO_500          0x0500
-#define USB_DEVICE_ID_GTCO_501          0x0501
-#define USB_DEVICE_ID_GTCO_502          0x0502
-#define USB_DEVICE_ID_GTCO_503          0x0503
-#define USB_DEVICE_ID_GTCO_504          0x0504
-#define USB_DEVICE_ID_GTCO_1000         0x1000
-#define USB_DEVICE_ID_GTCO_1001         0x1001
-#define USB_DEVICE_ID_GTCO_1002         0x1002
-#define USB_DEVICE_ID_GTCO_1003         0x1003
-#define USB_DEVICE_ID_GTCO_1004         0x1004
-#define USB_DEVICE_ID_GTCO_1005         0x1005
-#define USB_DEVICE_ID_GTCO_1006         0x1006
-#define USB_DEVICE_ID_GTCO_1007         0x1007
-#define USB_VENDOR_ID_HAPP              0x078b
-#define USB_DEVICE_ID_UGCI_DRIVING      0x0010
-#define USB_DEVICE_ID_UGCI_FLYING       0x0020
-#define USB_DEVICE_ID_UGCI_FIGHTING     0x0030
-
-#define USB_VENDOR_ID_IMATION           0x0718
-#define USB_DEVICE_ID_DISC_STAKKA       0xd000
-
-#define USB_VENDOR_ID_KBGEAR            0x084e
-#define USB_DEVICE_ID_KBGEAR_JAMSTUDIO  0x1001
-
-#define USB_VENDOR_ID_LD                0x0f11
-#define USB_DEVICE_ID_LD_CASSY          0x1000
-#define USB_DEVICE_ID_LD_POCKETCASSY    0x1010
-#define USB_DEVICE_ID_LD_MOBILECASSY    0x1020
-#define USB_DEVICE_ID_LD_JWM            0x1080
-#define USB_DEVICE_ID_LD_DMMP           0x1081
-#define USB_DEVICE_ID_LD_UMIP           0x1090
-#define USB_DEVICE_ID_LD_XRAY1          0x1100
-#define USB_DEVICE_ID_LD_XRAY2          0x1101
-#define USB_DEVICE_ID_LD_VIDEOCOM       0x1200
-#define USB_DEVICE_ID_LD_COM3LAB        0x2000
-#define USB_DEVICE_ID_LD_TELEPORT       0x2010
-#define USB_DEVICE_ID_LD_NETWORKANALYSER 0x2020
-#define USB_DEVICE_ID_LD_POWERCONTROL   0x2030
-#define USB_DEVICE_ID_LD_MACHINETEST    0x2040
-
-#define USB_VENDOR_ID_LOGITECH          0x046d
-#define USB_DEVICE_ID_LOGITECH_LX3      0xc044
-#define USB_DEVICE_ID_LOGITECH_V150     0xc047
-#define USB_DEVICE_ID_LOGITECH_RECEIVER 0xc101
-#define USB_DEVICE_ID_LOGITECH_HARMONY  0xc110
-#define USB_DEVICE_ID_LOGITECH_HARMONY_2 0xc111
-#define USB_DEVICE_ID_LOGITECH_HARMONY_3 0xc112
-#define USB_DEVICE_ID_LOGITECH_HARMONY_4 0xc113
-#define USB_DEVICE_ID_LOGITECH_HARMONY_5 0xc114
-#define USB_DEVICE_ID_LOGITECH_HARMONY_6 0xc115
-#define USB_DEVICE_ID_LOGITECH_HARMONY_7 0xc116
-#define USB_DEVICE_ID_LOGITECH_HARMONY_8 0xc117
-#define USB_DEVICE_ID_LOGITECH_HARMONY_9 0xc118
-#define USB_DEVICE_ID_LOGITECH_HARMONY_10 0xc119
-#define USB_DEVICE_ID_LOGITECH_HARMONY_11 0xc11a
-#define USB_DEVICE_ID_LOGITECH_HARMONY_12 0xc11b
-#define USB_DEVICE_ID_LOGITECH_HARMONY_13 0xc11c
-#define USB_DEVICE_ID_LOGITECH_HARMONY_14 0xc11d
-#define USB_DEVICE_ID_LOGITECH_HARMONY_15 0xc11e
-#define USB_DEVICE_ID_LOGITECH_HARMONY_16 0xc11f
-#define USB_DEVICE_ID_LOGITECH_HARMONY_17 0xc120
-#define USB_DEVICE_ID_LOGITECH_HARMONY_18 0xc121
-#define USB_DEVICE_ID_LOGITECH_HARMONY_19 0xc122
-#define USB_DEVICE_ID_LOGITECH_HARMONY_20 0xc123
-#define USB_DEVICE_ID_LOGITECH_HARMONY_21 0xc124
-#define USB_DEVICE_ID_LOGITECH_HARMONY_22 0xc125
-#define USB_DEVICE_ID_LOGITECH_HARMONY_23 0xc126
-#define USB_DEVICE_ID_LOGITECH_HARMONY_24 0xc127
-#define USB_DEVICE_ID_LOGITECH_HARMONY_25 0xc128
-#define USB_DEVICE_ID_LOGITECH_HARMONY_26 0xc129
-#define USB_DEVICE_ID_LOGITECH_HARMONY_27 0xc12a
-#define USB_DEVICE_ID_LOGITECH_HARMONY_28 0xc12b
-#define USB_DEVICE_ID_LOGITECH_HARMONY_29 0xc12c
-#define USB_DEVICE_ID_LOGITECH_HARMONY_30 0xc12d
-#define USB_DEVICE_ID_LOGITECH_HARMONY_31 0xc12e
-#define USB_DEVICE_ID_LOGITECH_HARMONY_32 0xc12f
-#define USB_DEVICE_ID_LOGITECH_HARMONY_33 0xc130
-#define USB_DEVICE_ID_LOGITECH_HARMONY_34 0xc131
-#define USB_DEVICE_ID_LOGITECH_HARMONY_35 0xc132
-#define USB_DEVICE_ID_LOGITECH_HARMONY_36 0xc133
-#define USB_DEVICE_ID_LOGITECH_HARMONY_37 0xc134
-#define USB_DEVICE_ID_LOGITECH_HARMONY_38 0xc135
-#define USB_DEVICE_ID_LOGITECH_HARMONY_39 0xc136
-#define USB_DEVICE_ID_LOGITECH_HARMONY_40 0xc137
-#define USB_DEVICE_ID_LOGITECH_HARMONY_41 0xc138
-#define USB_DEVICE_ID_LOGITECH_HARMONY_42 0xc139
-#define USB_DEVICE_ID_LOGITECH_HARMONY_43 0xc13a
-#define USB_DEVICE_ID_LOGITECH_HARMONY_44 0xc13b
-#define USB_DEVICE_ID_LOGITECH_HARMONY_45 0xc13c
-#define USB_DEVICE_ID_LOGITECH_HARMONY_46 0xc13d
-#define USB_DEVICE_ID_LOGITECH_HARMONY_47 0xc13e
-#define USB_DEVICE_ID_LOGITECH_HARMONY_48 0xc13f
-#define USB_DEVICE_ID_LOGITECH_HARMONY_49 0xc140
-#define USB_DEVICE_ID_LOGITECH_HARMONY_50 0xc141
-#define USB_DEVICE_ID_LOGITECH_HARMONY_51 0xc142
-#define USB_DEVICE_ID_LOGITECH_HARMONY_52 0xc143
-#define USB_DEVICE_ID_LOGITECH_HARMONY_53 0xc144
-#define USB_DEVICE_ID_LOGITECH_HARMONY_54 0xc145
-#define USB_DEVICE_ID_LOGITECH_HARMONY_55 0xc146
-#define USB_DEVICE_ID_LOGITECH_HARMONY_56 0xc147
-#define USB_DEVICE_ID_LOGITECH_HARMONY_57 0xc148
-#define USB_DEVICE_ID_LOGITECH_HARMONY_58 0xc149
-#define USB_DEVICE_ID_LOGITECH_HARMONY_59 0xc14a
-#define USB_DEVICE_ID_LOGITECH_HARMONY_60 0xc14b
-#define USB_DEVICE_ID_LOGITECH_HARMONY_61 0xc14c
-#define USB_DEVICE_ID_LOGITECH_HARMONY_62 0xc14d
-#define USB_DEVICE_ID_LOGITECH_HARMONY_63 0xc14e
-#define USB_DEVICE_ID_LOGITECH_HARMONY_64 0xc14f
-#define USB_DEVICE_ID_LOGITECH_EXTREME_3D       0xc215
-#define USB_DEVICE_ID_LOGITECH_WHEEL    0xc294
-#define USB_DEVICE_ID_LOGITECH_ELITE_KBD        0xc30a
-#define USB_DEVICE_ID_LOGITECH_KBD      0xc311
-#define USB_DEVICE_ID_S510_RECEIVER     0xc50c
-#define USB_DEVICE_ID_S510_RECEIVER_2   0xc517
-#define USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500   0xc512
-#define USB_DEVICE_ID_MX3000_RECEIVER   0xc513
-#define USB_DEVICE_ID_DINOVO_DESKTOP    0xc704
-#define USB_DEVICE_ID_DINOVO_EDGE       0xc714
-#define USB_DEVICE_ID_DINOVO_MINI       0xc71f
-
-#define USB_VENDOR_ID_MCC               0x09db
-#define USB_DEVICE_ID_MCC_PMD1024LS     0x0076
-#define USB_DEVICE_ID_MCC_PMD1208LS     0x007a
-
-#define USB_VENDOR_ID_MGE               0x0463
-#define USB_DEVICE_ID_MGE_UPS           0xffff
-#define USB_DEVICE_ID_MGE_UPS1          0x0001
-
-#define USB_VENDOR_ID_MICROCHIP         0x04d8
-#define USB_DEVICE_ID_PICKIT1           0x0032
-#define USB_DEVICE_ID_PICKIT2           0x0033
-
-#define USB_VENDOR_ID_MICROSOFT         0x045e
-#define USB_DEVICE_ID_SIDEWINDER_GV     0x003b
-#define USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0 0x009d
-#define USB_DEVICE_ID_DESKTOP_RECV_1028 0x00f9
-#define USB_DEVICE_ID_MS_NE4K           0x00db
-#define USB_DEVICE_ID_MS_LK6K           0x00f9
-
-#define USB_VENDOR_ID_MONTEREY          0x0566
-#define USB_DEVICE_ID_GENIUS_KB29E      0x3004
-
-#define USB_VENDOR_ID_NCR               0x0404
-#define USB_DEVICE_ID_NCR_FIRST         0x0300
-#define USB_DEVICE_ID_NCR_LAST          0x03ff
-
-#define USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR 0x0400
-#define USB_DEVICE_ID_N_S_HARMONY       0xc359
-
-#define USB_VENDOR_ID_NATSU             0x08b7
-#define USB_DEVICE_ID_NATSU_GAMEPAD     0x0001
-
-#define USB_VENDOR_ID_NEC               0x073e
-#define USB_DEVICE_ID_NEC_USB_GAME_PAD  0x0301
-
-#define USB_VENDOR_ID_ONTRAK            0x0a07
-#define USB_DEVICE_ID_ONTRAK_ADU100     0x0064
-
-#define USB_VENDOR_ID_PANJIT            0x134c
-
-#define USB_VENDOR_ID_PANTHERLORD       0x0810
-#define USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK     0x0001
-
-#define USB_VENDOR_ID_PETALYNX          0x18b1
-#define USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE    0x0037
-
-#define USB_VENDOR_ID_PLAYDOTCOM        0x0b43
-#define USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII      0x0003
-
-#define USB_VENDOR_ID_SAITEK            0x06a3
-#define USB_DEVICE_ID_SAITEK_RUMBLEPAD  0xff17
-
-#define USB_VENDOR_ID_SAMSUNG           0x0419
-#define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001
-
-#define USB_VENDOR_ID_SONY                      0x054c
-#define USB_DEVICE_ID_SONY_PS3_CONTROLLER       0x0268
-
-#define USB_VENDOR_ID_SOUNDGRAPH        0x15c2
-#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD       0x0038
-
-#define USB_VENDOR_ID_SUN               0x0430
-#define USB_DEVICE_ID_RARITAN_KVM_DONGLE        0xcdab
-
-#define USB_VENDOR_ID_SUNPLUS           0x04fc
-#define USB_DEVICE_ID_SUNPLUS_WDESKTOP  0x05d8
-
-#define USB_VENDOR_ID_TOPMAX            0x0663
-#define USB_DEVICE_ID_TOPMAX_COBRAPAD   0x0103
-
-#define USB_VENDOR_ID_TURBOX            0x062a
-#define USB_DEVICE_ID_TURBOX_KEYBOARD   0x0201
-
-#define USB_VENDOR_ID_VERNIER           0x08f7
-#define USB_DEVICE_ID_VERNIER_LABPRO    0x0001
-#define USB_DEVICE_ID_VERNIER_GOTEMP    0x0002
-#define USB_DEVICE_ID_VERNIER_SKIP      0x0003
-#define USB_DEVICE_ID_VERNIER_CYCLOPS   0x0004
-#define USB_DEVICE_ID_VERNIER_LCSPEC    0x0006
-
-#define USB_VENDOR_ID_WACOM             0x056a
-
-#define USB_VENDOR_ID_WISEGROUP         0x0925
-#define USB_DEVICE_ID_1_PHIDGETSERVO_20 0x8101
-#define USB_DEVICE_ID_4_PHIDGETSERVO_20 0x8104
-#define USB_DEVICE_ID_8_8_4_IF_KIT      0x8201
-#define USB_DEVICE_ID_QUAD_USB_JOYPAD   0x8800
-#define USB_DEVICE_ID_DUAL_USB_JOYPAD   0x8866
-
-#define USB_VENDOR_ID_WISEGROUP_LTD     0x6677
-#define USB_DEVICE_ID_SMARTJOY_DUAL_PLUS 0x8802
-
-#define USB_VENDOR_ID_YEALINK           0x6993
-#define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K       0xb001
-
-#define USB_VENDOR_ID_KYE               0x0458
-#define USB_DEVICE_ID_KYE_GPEN_560      0x5003
+#include "../hid-ids.h"
 
 /*
  * Alphabetically sorted blacklist by quirk type.
@@ -433,18 +28,10 @@ static const struct hid_blacklist {
         __u16 idProduct;
         __u32 quirks;
 } hid_blacklist[] = {
-
-        { USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU, HID_QUIRK_2WHEEL_MOUSE_HACK_7 },
-        { USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D, HID_QUIRK_2WHEEL_MOUSE_HACK_B8 },
-        { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE, HID_QUIRK_2WHEEL_MOUSE_HACK_5 },
-
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RECEIVER, HID_QUIRK_BAD_RELATIVE_KEYS },
-
         { USB_VENDOR_ID_AASHIMA, USB_DEVICE_ID_AASHIMA_GAMEPAD, HID_QUIRK_BADPAD },
         { USB_VENDOR_ID_AASHIMA, USB_DEVICE_ID_AASHIMA_PREDATOR, HID_QUIRK_BADPAD },
         { USB_VENDOR_ID_ALPS, USB_DEVICE_ID_IBM_GAMEPAD, HID_QUIRK_BADPAD },
         { USB_VENDOR_ID_CHIC, USB_DEVICE_ID_CHIC_GAMEPAD, HID_QUIRK_BADPAD },
-        { USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR, HID_QUIRK_MULTI_INPUT },
         { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
         { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
         { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
@@ -453,169 +40,11 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RUMBLEPAD, HID_QUIRK_BADPAD },
         { USB_VENDOR_ID_TOPMAX, USB_DEVICE_ID_TOPMAX_COBRAPAD, HID_QUIRK_BADPAD },
 
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_DESKTOP, HID_QUIRK_DUPLICATE_USAGES },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_EDGE, HID_QUIRK_DUPLICATE_USAGES },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_MINI, HID_QUIRK_DUPLICATE_USAGES },
-
         { USB_VENDOR_ID_AFATECH, USB_DEVICE_ID_AFATECH_AF9016, HID_QUIRK_FULLSPEED_INTERVAL },
 
-        { USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM, HID_QUIRK_HIDDEV },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4, HID_QUIRK_HIDDEV | HID_QUIRK_IGNORE_HIDINPUT },
-        { USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE, HID_QUIRK_HIDDEV | HID_QUIRK_IGNORE_HIDINPUT },
-        { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV, HID_QUIRK_HIDINPUT },
-
-        { USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193, HID_QUIRK_HWHEEL_WHEEL_INVERT },
-
-        { USB_VENDOR_ID_ADS_TECH, USB_DEVICE_ID_ADS_TECH_RADIO_SI470X, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_01, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_10, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_20, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_21, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_22, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_23, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_24, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_AIRCABLE, USB_DEVICE_ID_AIRCABLE1, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_ALCOR, USB_DEVICE_ID_ALCOR_USBRS232, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_LCM, HID_QUIRK_IGNORE},
-        { USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_CIDC, 0x0103, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_CYGNAL, USB_DEVICE_ID_CYGNAL_RADIO_SI470X, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_CMEDIA, USB_DEVICE_ID_CM109, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_HIDCOM, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_ULTRAMOUSE, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GENERAL_TOUCH, 0x0001, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GENERAL_TOUCH, 0x0002, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GENERAL_TOUCH, 0x0003, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GENERAL_TOUCH, 0x0004, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_4_PHIDGETSERVO_30, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_1_PHIDGETSERVO_30, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_0_4_IF_KIT, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_16_16_IF_KIT, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_8_8_8_IF_KIT, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_8_7_IF_KIT, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_8_8_IF_KIT, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_PHIDGET_MOTORCONTROL, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_SUPER_Q2, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_GOGOPEN, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_PENPOWER, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GRETAGMACBETH, USB_DEVICE_ID_GRETAGMACBETH_HUEY, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_POWERMATE, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_SOUNDKNOB, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_90, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_100, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_101, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_103, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_104, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_105, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_106, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_107, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_108, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_200, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_201, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_202, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_203, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_204, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_205, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_206, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_207, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_300, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_301, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_302, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_303, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_304, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_305, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_306, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_307, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_308, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_309, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_400, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_401, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_402, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_403, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_404, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_405, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_500, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_501, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_502, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_503, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_504, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1000, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1001, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1002, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1003, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1004, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1005, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1006, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1007, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_IMATION, USB_DEVICE_ID_DISC_STAKKA, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOBILECASSY, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_JWM, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_DMMP, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_UMIP, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY1, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY2, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_VIDEOCOM, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_COM3LAB, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_TELEPORT, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_NETWORKANALYSER, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POWERCONTROL, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MACHINETEST, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS1, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 20, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 30, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 100, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 108, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 118, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 200, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 300, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 400, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 500, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_PANJIT, 0x0001, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_PANJIT, 0x0002, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_PANJIT, 0x0003, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_PANJIT, 0x0004, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_CYCLOPS, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LCSPEC, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_4_PHIDGETSERVO_20, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_8_8_4_IF_KIT, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K, HID_QUIRK_IGNORE },
-
-        { USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_FLAIR, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_302, HID_QUIRK_IGNORE },
-
-        { USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT2, HID_QUIRK_IGNORE },
-
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_ELITE_KBD, HID_QUIRK_LOGITECH_IGNORE_DOUBLED_WHEEL | HID_QUIRK_LOGITECH_EXPANDED_KEYMAP },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500, HID_QUIRK_LOGITECH_IGNORE_DOUBLED_WHEEL | HID_QUIRK_LOGITECH_EXPANDED_KEYMAP },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_LX3, HID_QUIRK_INVERT_HWHEEL },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_V150, HID_QUIRK_INVERT_HWHEEL },
-
-        { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K, HID_QUIRK_MICROSOFT_KEYS },
-        { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K, HID_QUIRK_MICROSOFT_KEYS },
-
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE, HID_QUIRK_MIGHTYMOUSE | HID_QUIRK_INVERT_HWHEEL },
-
         { USB_VENDOR_ID_PANTHERLORD, USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK, HID_QUIRK_MULTI_INPUT | HID_QUIRK_SKIP_OUTPUT_REPORTS },
         { USB_VENDOR_ID_PLAYDOTCOM, USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII, HID_QUIRK_MULTI_INPUT },
 
-        { USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER, HID_QUIRK_SONY_PS3_CONTROLLER | HID_QUIRK_HIDDEV },
-
         { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_UC100KM, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS124U, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM, HID_QUIRK_NOGET },
@@ -623,144 +52,13 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_EXTREME_3D, HID_QUIRK_NOGET },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WHEEL, HID_QUIRK_NOGET },
-        { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0, HID_QUIRK_NOGET },
-        { USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_KEYBOARD, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT | HID_QUIRK_SKIP_OUTPUT_REPORTS },
         { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
 
         { USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
-
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_APPLE_ISO_KEYBOARD},
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_APPLE_ISO_KEYBOARD},
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_APPLE_ISO_KEYBOARD},
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI, HID_QUIRK_APPLE_HAS_FN },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS, HID_QUIRK_APPLE_HAS_FN },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD | HID_QUIRK_IGNORE_MOUSE},
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE},
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE},
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS, HID_QUIRK_APPLE_HAS_FN  | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-
-        { USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658, HID_QUIRK_RESET_LEDS },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_KBD, HID_QUIRK_RESET_LEDS },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_2, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_3, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_4, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_5, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_6, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_7, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_8, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_9, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_10, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_11, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_12, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_13, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_14, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_15, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_16, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_17, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_18, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_19, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_20, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_21, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_22, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_23, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_24, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_25, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_26, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_27, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_28, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_29, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_30, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_31, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_32, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_33, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_34, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_35, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_36, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_37, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_38, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_39, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_40, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_41, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_42, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_43, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_44, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_45, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_46, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_47, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_48, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_49, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_50, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_51, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_52, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_53, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_54, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_55, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_56, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_57, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_58, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_59, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_60, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_61, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_62, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_63, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_64, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR, USB_DEVICE_ID_N_S_HARMONY, HID_QUIRK_IGNORE },
-        { USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_GPEN_560, HID_QUIRK_IGNORE },
-
-        { 0, 0 }
-};
-
-/* Quirks for devices which require report descriptor fixup go here */
-static const struct hid_rdesc_blacklist {
-        __u16 idVendor;
-        __u16 idProduct;
-        __u32 quirks;
-} hid_rdesc_blacklist[] = {
-
-        { USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION, HID_QUIRK_RDESC_CYMOTION },
-
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER, HID_QUIRK_RDESC_LOGITECH },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER, HID_QUIRK_RDESC_LOGITECH },
-        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2, HID_QUIRK_RDESC_LOGITECH },
-        { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_DESKTOP_RECV_1028, HID_QUIRK_RDESC_MICROSOFT_RECV_1028 },
-
-        { USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E, HID_QUIRK_RDESC_BUTTON_CONSUMER },
-
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS, HID_QUIRK_RDESC_MACBOOK_JIS },
-
-        { USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE, HID_QUIRK_RDESC_PETALYNX },
-
-        { USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE, HID_QUIRK_RDESC_SAMSUNG_REMOTE },
-
-        { USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP, HID_QUIRK_RDESC_SUNPLUS_WDESKTOP },
-
-        { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1, HID_QUIRK_RDESC_SWAPPED_MIN_MAX },
-        { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2, HID_QUIRK_RDESC_SWAPPED_MIN_MAX },
+        { USB_VENDOR_ID_WISEGROUP_LTD2, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
 
         { 0, 0 }
 };
@@ -974,16 +272,6 @@ u32 usbhid_lookup_quirk(const u16 idVendor, const u16 idProduct)
         u32 quirks = 0;
         const struct hid_blacklist *bl_entry = NULL;
 
-        /* Ignore all Wacom devices */
-        if (idVendor == USB_VENDOR_ID_WACOM)
-                return HID_QUIRK_IGNORE;
-
-        /* ignore all Code Mercenaries IOWarrior devices */
-        if (idVendor == USB_VENDOR_ID_CODEMERCS)
-                if (idProduct >= USB_DEVICE_ID_CODEMERCS_IOW_FIRST &&
-                                idProduct <= USB_DEVICE_ID_CODEMERCS_IOW_LAST)
-                        return HID_QUIRK_IGNORE;
-
         /* NCR devices must not be queried for reports */
         if (idVendor == USB_VENDOR_ID_NCR &&
                         idProduct >= USB_DEVICE_ID_NCR_FIRST &&
@@ -1002,221 +290,3 @@ u32 usbhid_lookup_quirk(const u16 idVendor, const u16 idProduct)
 }
 
 EXPORT_SYMBOL_GPL(usbhid_lookup_quirk);
-
-/*
- * Cherry Cymotion keyboard have an invalid HID report descriptor,
- * that needs fixing before we can parse it.
- */
-static void usbhid_fixup_cymotion_descriptor(char *rdesc, int rsize)
-{
-        if (rsize >= 17 && rdesc[11] == 0x3c && rdesc[12] == 0x02) {
-                printk(KERN_INFO "Fixing up Cherry Cymotion report descriptor\n");
-                rdesc[11] = rdesc[16] = 0xff;
-                rdesc[12] = rdesc[17] = 0x03;
-        }
-}
-
-
-/*
- * Certain Logitech keyboards send in report #3 keys which are far
- * above the logical maximum described in descriptor. This extends
- * the original value of 0x28c of logical maximum to 0x104d
- */
-static void usbhid_fixup_logitech_descriptor(unsigned char *rdesc, int rsize)
-{
-        if (rsize >= 90 && rdesc[83] == 0x26
-                        && rdesc[84] == 0x8c
-                        && rdesc[85] == 0x02) {
-                printk(KERN_INFO "Fixing up Logitech keyboard report descriptor\n");
-                rdesc[84] = rdesc[89] = 0x4d;
-                rdesc[85] = rdesc[90] = 0x10;
-        }
-}
-
-static void usbhid_fixup_sunplus_wdesktop(unsigned char *rdesc, int rsize)
-{
-        if (rsize >= 107 && rdesc[104] == 0x26
-                         && rdesc[105] == 0x80
-                         && rdesc[106] == 0x03) {
-                printk(KERN_INFO "Fixing up Sunplus Wireless Desktop report descriptor\n");
-                rdesc[105] = rdesc[110] = 0x03;
-                rdesc[106] = rdesc[111] = 0x21;
-        }
-}
-
-/*
- * Samsung IrDA remote controller (reports as Cypress USB Mouse).
- *
- * Vendor specific report #4 has a size of 48 bit,
- * and therefore is not accepted when inspecting the descriptors.
- * As a workaround we reinterpret the report as:
- *   Variable type, count 6, size 8 bit, log. maximum 255
- * The burden to reconstruct the data is moved into user space.
- */
-static void usbhid_fixup_samsung_irda_descriptor(unsigned char *rdesc,
-                                                  int rsize)
-{
-        if (rsize >= 182 && rdesc[175] == 0x25
-                         && rdesc[176] == 0x40
-                         && rdesc[177] == 0x75
-                         && rdesc[178] == 0x30
-                         && rdesc[179] == 0x95
-                         && rdesc[180] == 0x01
-                         && rdesc[182] == 0x40) {
-                printk(KERN_INFO "Fixing up Samsung IrDA report descriptor\n");
-                rdesc[176] = 0xff;
-                rdesc[178] = 0x08;
-                rdesc[180] = 0x06;
-                rdesc[182] = 0x42;
-        }
-}
-
-/* Petalynx Maxter Remote has maximum for consumer page set too low */
-static void usbhid_fixup_petalynx_descriptor(unsigned char *rdesc, int rsize)
-{
-        if (rsize >= 60 && rdesc[39] == 0x2a
-                        && rdesc[40] == 0xf5
-                        && rdesc[41] == 0x00
-                        && rdesc[59] == 0x26
-                        && rdesc[60] == 0xf9
-                        && rdesc[61] == 0x00) {
-                printk(KERN_INFO "Fixing up Petalynx Maxter Remote report descriptor\n");
-                rdesc[60] = 0xfa;
-                rdesc[40] = 0xfa;
-        }
-}
-
-/*
- * Some USB barcode readers from cypress have usage min and usage max in
- * the wrong order
- */
-static void usbhid_fixup_cypress_descriptor(unsigned char *rdesc, int rsize)
-{
-        short fixed = 0;
-        int i;
-
-        for (i = 0; i < rsize - 4; i++) {
-                if (rdesc[i] == 0x29 && rdesc [i+2] == 0x19) {
-                        unsigned char tmp;
-
-                        rdesc[i] = 0x19; rdesc[i+2] = 0x29;
-                        tmp = rdesc[i+3];
-                        rdesc[i+3] = rdesc[i+1];
-                        rdesc[i+1] = tmp;
-                }
-        }
-
-        if (fixed)
-                printk(KERN_INFO "Fixing up Cypress report descriptor\n");
-}
-
-/*
- * MacBook JIS keyboard has wrong logical maximum
- */
-static void usbhid_fixup_macbook_descriptor(unsigned char *rdesc, int rsize)
-{
-        if (rsize >= 60 && rdesc[53] == 0x65
-                        && rdesc[59] == 0x65) {
-                printk(KERN_INFO "Fixing up MacBook JIS keyboard report descriptor\n");
-                rdesc[53] = rdesc[59] = 0xe7;
-        }
-}
-
-static void usbhid_fixup_button_consumer_descriptor(unsigned char *rdesc, int rsize)
-{
-        if (rsize >= 30 && rdesc[29] == 0x05
-                        && rdesc[30] == 0x09) {
-                printk(KERN_INFO "Fixing up button/consumer in HID report descriptor\n");
-                rdesc[30] = 0x0c;
-        }
-}
-
-/*
- * Microsoft Wireless Desktop Receiver (Model 1028) has several
- * 'Usage Min/Max' where it ought to have 'Physical Min/Max'
- */
-static void usbhid_fixup_microsoft_descriptor(unsigned char *rdesc, int rsize)
-{
-        if (rsize == 571 && rdesc[284] == 0x19
-                         && rdesc[286] == 0x2a
-                         && rdesc[304] == 0x19
-                         && rdesc[306] == 0x29
-                         && rdesc[352] == 0x1a
-                         && rdesc[355] == 0x2a
-                         && rdesc[557] == 0x19
-                         && rdesc[559] == 0x29) {
-                printk(KERN_INFO "Fixing up Microsoft Wireless Receiver Model 1028 report descriptor\n");
-                rdesc[284] = rdesc[304] = rdesc[557] = 0x35;
-                rdesc[352] = 0x36;
-                rdesc[286] = rdesc[355] = 0x46;
-                rdesc[306] = rdesc[559] = 0x45;
-        }
-}
-
-static void __usbhid_fixup_report_descriptor(__u32 quirks, char *rdesc, unsigned rsize)
-{
-        if ((quirks & HID_QUIRK_RDESC_CYMOTION))
-                usbhid_fixup_cymotion_descriptor(rdesc, rsize);
-
-        if (quirks & HID_QUIRK_RDESC_LOGITECH)
-                usbhid_fixup_logitech_descriptor(rdesc, rsize);
-
-        if (quirks & HID_QUIRK_RDESC_SWAPPED_MIN_MAX)
-                usbhid_fixup_cypress_descriptor(rdesc, rsize);
-
-        if (quirks & HID_QUIRK_RDESC_PETALYNX)
-                usbhid_fixup_petalynx_descriptor(rdesc, rsize);
-
-        if (quirks & HID_QUIRK_RDESC_MACBOOK_JIS)
-                usbhid_fixup_macbook_descriptor(rdesc, rsize);
-
-        if (quirks & HID_QUIRK_RDESC_BUTTON_CONSUMER)
-                usbhid_fixup_button_consumer_descriptor(rdesc, rsize);
-
-        if (quirks & HID_QUIRK_RDESC_SAMSUNG_REMOTE)
-                usbhid_fixup_samsung_irda_descriptor(rdesc, rsize);
-
-        if (quirks & HID_QUIRK_RDESC_MICROSOFT_RECV_1028)
-                usbhid_fixup_microsoft_descriptor(rdesc, rsize);
-
-        if (quirks & HID_QUIRK_RDESC_SUNPLUS_WDESKTOP)
-                usbhid_fixup_sunplus_wdesktop(rdesc, rsize);
-}
-
-/**
- * usbhid_fixup_report_descriptor: check if report descriptor needs fixup
- *
- * Description:
- *      Walks the hid_rdesc_blacklist[] array and checks whether the device
- *      is known to have broken report descriptor that needs to be fixed up
- *      prior to entering the HID parser
- *
- * Returns: nothing
- */
-void usbhid_fixup_report_descriptor(const u16 idVendor, const u16 idProduct,
-                                    char *rdesc, unsigned rsize, char **quirks_param)
-{
-        int n, m;
-        u16 paramVendor, paramProduct;
-        u32 quirks;
-
-        /* static rdesc quirk entries */
-        for (n = 0; hid_rdesc_blacklist[n].idVendor; n++)
-                if (hid_rdesc_blacklist[n].idVendor == idVendor &&
-                                hid_rdesc_blacklist[n].idProduct == idProduct)
-                        __usbhid_fixup_report_descriptor(hid_rdesc_blacklist[n].quirks,
-                                        rdesc, rsize);
-
-        /* runtime rdesc quirk entries handling */
-        for (n = 0; quirks_param[n] && n < MAX_USBHID_BOOT_QUIRKS; n++) {
-                m = sscanf(quirks_param[n], "0x%hx:0x%hx:0x%x",
-                                &paramVendor, &paramProduct, &quirks);
-
-                if (m != 3)
-                        printk(KERN_WARNING
-                                "Could not parse HID quirk module param %s\n",
-                                quirks_param[n]);
-                else if (paramVendor == idVendor && paramProduct == idProduct)
-                        __usbhid_fixup_report_descriptor(quirks, rdesc, rsize);
-        }
-}
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index 842e9edb888e..babd65dd46ad 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -790,21 +790,23 @@ static struct usb_class_driver hiddev_class = {
 /*
  * This is where hid.c calls us to connect a hid device to the hiddev driver
  */
-int hiddev_connect(struct hid_device *hid)
+int hiddev_connect(struct hid_device *hid, unsigned int force)
 {
         struct hiddev *hiddev;
         struct usbhid_device *usbhid = hid->driver_data;
-        int i;
         int retval;
 
-        for (i = 0; i < hid->maxcollection; i++)
-                if (hid->collection[i].type ==
-                    HID_COLLECTION_APPLICATION &&
-                    !IS_INPUT_APPLICATION(hid->collection[i].usage))
-                        break;
+        if (!force) {
+                unsigned int i;
+                for (i = 0; i < hid->maxcollection; i++)
+                        if (hid->collection[i].type ==
+                            HID_COLLECTION_APPLICATION &&
+                            !IS_INPUT_APPLICATION(hid->collection[i].usage))
+                                break;
 
-        if (i == hid->maxcollection && (hid->quirks & HID_QUIRK_HIDDEV) == 0)
-                return -1;
+                if (i == hid->maxcollection)
+                        return -1;
+        }
 
         if (!(hiddev = kzalloc(sizeof(struct hiddev), GFP_KERNEL)))
                 return -1;
diff --git a/drivers/hid/usbhid/usbhid.h b/drivers/hid/usbhid/usbhid.h
index 62d2d7c925bd..abedb13c623e 100644
--- a/drivers/hid/usbhid/usbhid.h
+++ b/drivers/hid/usbhid/usbhid.h
@@ -67,7 +67,7 @@ struct usbhid_device {
         spinlock_t ctrllock;                                            /* Control fifo spinlock */
 
         struct urb *urbout;                                             /* Output URB */
-        struct hid_report *out[HID_CONTROL_FIFO_SIZE];                  /* Output pipe fifo */
+        struct hid_output_fifo out[HID_CONTROL_FIFO_SIZE];              /* Output pipe fifo */
         unsigned char outhead, outtail;                                 /* Output pipe fifo head & tail */
         char *outbuf;                                                   /* Output buffer */
         dma_addr_t outbuf_dma;                                          /* Output buffer dma */
@@ -82,7 +82,7 @@ struct usbhid_device {
 };
 
 #define hid_to_usb_dev(hid_dev) \
-        container_of(hid_dev->dev->parent, struct usb_device, dev)
+        container_of(hid_dev->dev.parent->parent, struct usb_device, dev)
 
 #endif
 
diff --git a/drivers/hid/usbhid/usbkbd.c b/drivers/hid/usbhid/usbkbd.c
index 0caaafe01843..b342926dd7fc 100644
--- a/drivers/hid/usbhid/usbkbd.c
+++ b/drivers/hid/usbhid/usbkbd.c
@@ -105,14 +105,16 @@ static void usb_kbd_irq(struct urb *urb)
                         if (usb_kbd_keycode[kbd->old[i]])
                                 input_report_key(kbd->dev, usb_kbd_keycode[kbd->old[i]], 0);
                         else
-                                info("Unknown key (scancode %#x) released.", kbd->old[i]);
+                                dev_info(&urb->dev->dev,
+                                                "Unknown key (scancode %#x) released.\n", kbd->old[i]);
                 }
 
                 if (kbd->new[i] > 3 && memscan(kbd->old + 2, kbd->new[i], 6) == kbd->old + 8) {
                         if (usb_kbd_keycode[kbd->new[i]])
                                 input_report_key(kbd->dev, usb_kbd_keycode[kbd->new[i]], 1);
                         else
-                                info("Unknown key (scancode %#x) pressed.", kbd->new[i]);
+                                dev_info(&urb->dev->dev,
+                                                "Unknown key (scancode %#x) released.\n", kbd->new[i]);
                 }
         }
 
@@ -159,7 +161,8 @@ static void usb_kbd_led(struct urb *urb)
         struct usb_kbd *kbd = urb->context;
 
         if (urb->status)
-                warn("led urb status %d received", urb->status);
+                dev_warn(&urb->dev->dev, "led urb status %d received\n",
+                         urb->status);
 
         if (*(kbd->leds) == kbd->newleds)
                 return;
@@ -352,7 +355,8 @@ static int __init usb_kbd_init(void)
 {
         int result = usb_register(&usb_kbd_driver);
         if (result == 0)
-                info(DRIVER_VERSION ":" DRIVER_DESC);
+                printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+                                DRIVER_DESC "\n");
         return result;
 }
 
diff --git a/drivers/hid/usbhid/usbmouse.c b/drivers/hid/usbhid/usbmouse.c
index 35689ef172cc..72ab4b268096 100644
--- a/drivers/hid/usbhid/usbmouse.c
+++ b/drivers/hid/usbhid/usbmouse.c
@@ -31,6 +31,11 @@
 #include <linux/usb/input.h>
 #include <linux/hid.h>
 
+/* for apple IDs */
+#ifdef CONFIG_USB_HID_MODULE
+#include "../hid-ids.h"
+#endif
+
 /*
  * Version Information
  */
@@ -240,7 +245,8 @@ static int __init usb_mouse_init(void)
 {
         int retval = usb_register(&usb_mouse_driver);
         if (retval == 0)
-                info(DRIVER_VERSION ":" DRIVER_DESC);
+                printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+                                DRIVER_DESC "\n");
         return retval;
 }
 
diff --git a/drivers/hwmon/ams/ams.h b/drivers/hwmon/ams/ams.h
index a6221e5dd984..221ef6915a5f 100644
--- a/drivers/hwmon/ams/ams.h
+++ b/drivers/hwmon/ams/ams.h
@@ -4,7 +4,7 @@
 #include <linux/mutex.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
-#include <asm/of_device.h>
+#include <linux/of_device.h>
 
 enum ams_irq {
         AMS_IRQ_FREEFALL = 0x01,
diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c
index cdb8311e4ef7..27a5d397f9a1 100644
--- a/drivers/hwmon/dme1737.c
+++ b/drivers/hwmon/dme1737.c
@@ -175,11 +175,11 @@ static const u8 DME1737_BIT_ALARM_FAN[] = {10, 11, 12, 13, 22, 23};
  * Data structures and manipulation thereof
  * --------------------------------------------------------------------- */
 
-/* For ISA chips, we abuse the i2c_client addr and name fields. We also use
-   the driver field to differentiate between I2C and ISA chips. */
 struct dme1737_data {
-        struct i2c_client client;
+        struct i2c_client *client;      /* for I2C devices only */
         struct device *hwmon_dev;
+        const char *name;
+        unsigned int addr;              /* for ISA devices only */
 
         struct mutex update_lock;
         int valid;                      /* !=0 if following fields are valid */
@@ -512,11 +512,12 @@ static inline int PWM_OFF_TO_REG(int val, int ix, int reg)
  * before calling dme1737_read or dme1737_write.
  * --------------------------------------------------------------------- */
 
-static u8 dme1737_read(struct i2c_client *client, u8 reg)
+static u8 dme1737_read(const struct dme1737_data *data, u8 reg)
 {
+        struct i2c_client *client = data->client;
         s32 val;
 
-        if (client->driver) { /* I2C device */
+        if (client) { /* I2C device */
                 val = i2c_smbus_read_byte_data(client, reg);
 
                 if (val < 0) {
@@ -525,18 +526,19 @@ static u8 dme1737_read(struct i2c_client *client, u8 reg)
                                  "maintainer.\n", reg);
                 }
         } else { /* ISA device */
-                outb(reg, client->addr);
-                val = inb(client->addr + 1);
+                outb(reg, data->addr);
+                val = inb(data->addr + 1);
         }
 
         return val;
 }
 
-static s32 dme1737_write(struct i2c_client *client, u8 reg, u8 val)
+static s32 dme1737_write(const struct dme1737_data *data, u8 reg, u8 val)
 {
+        struct i2c_client *client = data->client;
         s32 res = 0;
 
-        if (client->driver) { /* I2C device */
+        if (client) { /* I2C device */
                 res = i2c_smbus_write_byte_data(client, reg, val);
 
                 if (res < 0) {
@@ -545,8 +547,8 @@ static s32 dme1737_write(struct i2c_client *client, u8 reg, u8 val)
                                  "maintainer.\n", reg);
                 }
         } else { /* ISA device */
-                outb(reg, client->addr);
-                outb(val, client->addr + 1);
+                outb(reg, data->addr);
+                outb(val, data->addr + 1);
         }
 
         return res;
@@ -555,7 +557,6 @@ static s32 dme1737_write(struct i2c_client *client, u8 reg, u8 val)
 static struct dme1737_data *dme1737_update_device(struct device *dev)
 {
         struct dme1737_data *data = dev_get_drvdata(dev);
-        struct i2c_client *client = &data->client;
         int ix;
         u8 lsb[5];
 
@@ -563,7 +564,7 @@ static struct dme1737_data *dme1737_update_device(struct device *dev)
 
         /* Enable a Vbat monitoring cycle every 10 mins */
         if (time_after(jiffies, data->last_vbat + 600 * HZ) || !data->valid) {
-                dme1737_write(client, DME1737_REG_CONFIG, dme1737_read(client,
+                dme1737_write(data, DME1737_REG_CONFIG, dme1737_read(data,
                                                 DME1737_REG_CONFIG) | 0x10);
                 data->last_vbat = jiffies;
         }
@@ -571,7 +572,7 @@ static struct dme1737_data *dme1737_update_device(struct device *dev)
         /* Sample register contents every 1 sec */
         if (time_after(jiffies, data->last_update + HZ) || !data->valid) {
                 if (data->type != sch5027) {
-                        data->vid = dme1737_read(client, DME1737_REG_VID) &
+                        data->vid = dme1737_read(data, DME1737_REG_VID) &
                                 0x3f;
                 }
 
@@ -580,11 +581,11 @@ static struct dme1737_data *dme1737_update_device(struct device *dev)
                         /* Voltage inputs are stored as 16 bit values even
                          * though they have only 12 bits resolution. This is
                          * to make it consistent with the temp inputs. */
-                        data->in[ix] = dme1737_read(client,
+                        data->in[ix] = dme1737_read(data,
                                         DME1737_REG_IN(ix)) << 8;
-                        data->in_min[ix] = dme1737_read(client,
+                        data->in_min[ix] = dme1737_read(data,
                                         DME1737_REG_IN_MIN(ix));
-                        data->in_max[ix] = dme1737_read(client,
+                        data->in_max[ix] = dme1737_read(data,
                                         DME1737_REG_IN_MAX(ix));
                 }
 
@@ -595,14 +596,14 @@ static struct dme1737_data *dme1737_update_device(struct device *dev)
                          * to take advantage of implicit conversions between
                          * register values (2's complement) and temp values
                          * (signed decimal). */
-                        data->temp[ix] = dme1737_read(client,
+                        data->temp[ix] = dme1737_read(data,
                                         DME1737_REG_TEMP(ix)) << 8;
-                        data->temp_min[ix] = dme1737_read(client,
+                        data->temp_min[ix] = dme1737_read(data,
                                         DME1737_REG_TEMP_MIN(ix));
-                        data->temp_max[ix] = dme1737_read(client,
+                        data->temp_max[ix] = dme1737_read(data,
                                         DME1737_REG_TEMP_MAX(ix));
                         if (data->type != sch5027) {
-                                data->temp_offset[ix] = dme1737_read(client,
+                                data->temp_offset[ix] = dme1737_read(data,
                                                 DME1737_REG_TEMP_OFFSET(ix));
                         }
                 }
@@ -612,7 +613,7 @@ static struct dme1737_data *dme1737_update_device(struct device *dev)
                  * which the registers are read (MSB first, then LSB) is
                  * important! */
                 for (ix = 0; ix < ARRAY_SIZE(lsb); ix++) {
-                        lsb[ix] = dme1737_read(client,
+                        lsb[ix] = dme1737_read(data,
                                         DME1737_REG_IN_TEMP_LSB(ix));
                 }
                 for (ix = 0; ix < ARRAY_SIZE(data->in); ix++) {
@@ -631,19 +632,19 @@ static struct dme1737_data *dme1737_update_device(struct device *dev)
                         if (!(data->has_fan & (1 << ix))) {
                                 continue;
                         }
-                        data->fan[ix] = dme1737_read(client,
+                        data->fan[ix] = dme1737_read(data,
                                         DME1737_REG_FAN(ix));
-                        data->fan[ix] |= dme1737_read(client,
+                        data->fan[ix] |= dme1737_read(data,
                                         DME1737_REG_FAN(ix) + 1) << 8;
-                        data->fan_min[ix] = dme1737_read(client,
+                        data->fan_min[ix] = dme1737_read(data,
                                         DME1737_REG_FAN_MIN(ix));
-                        data->fan_min[ix] |= dme1737_read(client,
+                        data->fan_min[ix] |= dme1737_read(data,
                                         DME1737_REG_FAN_MIN(ix) + 1) << 8;
-                        data->fan_opt[ix] = dme1737_read(client,
+                        data->fan_opt[ix] = dme1737_read(data,
                                         DME1737_REG_FAN_OPT(ix));
                         /* fan_max exists only for fan[5-6] */
                         if (ix > 3) {
-                                data->fan_max[ix - 4] = dme1737_read(client,
+                                data->fan_max[ix - 4] = dme1737_read(data,
                                         DME1737_REG_FAN_MAX(ix));
                         }
                 }
@@ -655,63 +656,63 @@ static struct dme1737_data *dme1737_update_device(struct device *dev)
                         if (!(data->has_pwm & (1 << ix))) {
                                 continue;
                         }
-                        data->pwm[ix] = dme1737_read(client,
+                        data->pwm[ix] = dme1737_read(data,
                                         DME1737_REG_PWM(ix));
-                        data->pwm_freq[ix] = dme1737_read(client,
+                        data->pwm_freq[ix] = dme1737_read(data,
                                         DME1737_REG_PWM_FREQ(ix));
                         /* pwm_config and pwm_min exist only for pwm[1-3] */
                         if (ix < 3) {
-                                data->pwm_config[ix] = dme1737_read(client,
+                                data->pwm_config[ix] = dme1737_read(data,
                                                 DME1737_REG_PWM_CONFIG(ix));
-                                data->pwm_min[ix] = dme1737_read(client,
+                                data->pwm_min[ix] = dme1737_read(data,
                                                 DME1737_REG_PWM_MIN(ix));
                         }
                 }
                 for (ix = 0; ix < ARRAY_SIZE(data->pwm_rr); ix++) {
-                        data->pwm_rr[ix] = dme1737_read(client,
+                        data->pwm_rr[ix] = dme1737_read(data,
                                                 DME1737_REG_PWM_RR(ix));
                 }
 
                 /* Thermal zone registers */
                 for (ix = 0; ix < ARRAY_SIZE(data->zone_low); ix++) {
-                        data->zone_low[ix] = dme1737_read(client,
+                        data->zone_low[ix] = dme1737_read(data,
                                         DME1737_REG_ZONE_LOW(ix));
-                        data->zone_abs[ix] = dme1737_read(client,
+                        data->zone_abs[ix] = dme1737_read(data,
                                         DME1737_REG_ZONE_ABS(ix));
                 }
                 if (data->type != sch5027) {
                         for (ix = 0; ix < ARRAY_SIZE(data->zone_hyst); ix++) {
-                                data->zone_hyst[ix] = dme1737_read(client,
+                                data->zone_hyst[ix] = dme1737_read(data,
                                                 DME1737_REG_ZONE_HYST(ix));
                         }
                 }
 
                 /* Alarm registers */
-                data->alarms = dme1737_read(client,
+                data->alarms = dme1737_read(data,
                                                 DME1737_REG_ALARM1);
                 /* Bit 7 tells us if the other alarm registers are non-zero and
                  * therefore also need to be read */
                 if (data->alarms & 0x80) {
-                        data->alarms |= dme1737_read(client,
+                        data->alarms |= dme1737_read(data,
                                                 DME1737_REG_ALARM2) << 8;
-                        data->alarms |= dme1737_read(client,
+                        data->alarms |= dme1737_read(data,
                                                 DME1737_REG_ALARM3) << 16;
                 }
 
                 /* The ISA chips require explicit clearing of alarm bits.
                  * Don't worry, an alarm will come back if the condition
                  * that causes it still exists */
-                if (!client->driver) {
+                if (!data->client) {
                         if (data->alarms & 0xff0000) {
-                                dme1737_write(client, DME1737_REG_ALARM3,
+                                dme1737_write(data, DME1737_REG_ALARM3,
                                               0xff);
                         }
                         if (data->alarms & 0xff00) {
-                                dme1737_write(client, DME1737_REG_ALARM2,
+                                dme1737_write(data, DME1737_REG_ALARM2,
                                               0xff);
                         }
                         if (data->alarms & 0xff) {
-                                dme1737_write(client, DME1737_REG_ALARM1,
+                                dme1737_write(data, DME1737_REG_ALARM1,
                                               0xff);
                         }
                 }
@@ -770,7 +771,6 @@ static ssize_t set_in(struct device *dev, struct device_attribute *attr,
                       const char *buf, size_t count)
 {
         struct dme1737_data *data = dev_get_drvdata(dev);
-        struct i2c_client *client = &data->client;
         struct sensor_device_attribute_2
                 *sensor_attr_2 = to_sensor_dev_attr_2(attr);
         int ix = sensor_attr_2->index;
@@ -781,12 +781,12 @@ static ssize_t set_in(struct device *dev, struct device_attribute *attr,
         switch (fn) {
         case SYS_IN_MIN:
                 data->in_min[ix] = IN_TO_REG(val, data->in_nominal[ix]);
-                dme1737_write(client, DME1737_REG_IN_MIN(ix),
+                dme1737_write(data, DME1737_REG_IN_MIN(ix),
                               data->in_min[ix]);
                 break;
         case SYS_IN_MAX:
                 data->in_max[ix] = IN_TO_REG(val, data->in_nominal[ix]);
-                dme1737_write(client, DME1737_REG_IN_MAX(ix),
+                dme1737_write(data, DME1737_REG_IN_MAX(ix),
                               data->in_max[ix]);
                 break;
         default:
@@ -850,7 +850,6 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *attr,
                         const char *buf, size_t count)
 {
         struct dme1737_data *data = dev_get_drvdata(dev);
-        struct i2c_client *client = &data->client;
         struct sensor_device_attribute_2
                 *sensor_attr_2 = to_sensor_dev_attr_2(attr);
         int ix = sensor_attr_2->index;
@@ -861,17 +860,17 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *attr,
         switch (fn) {
         case SYS_TEMP_MIN:
                 data->temp_min[ix] = TEMP_TO_REG(val);
-                dme1737_write(client, DME1737_REG_TEMP_MIN(ix),
+                dme1737_write(data, DME1737_REG_TEMP_MIN(ix),
                               data->temp_min[ix]);
                 break;
         case SYS_TEMP_MAX:
                 data->temp_max[ix] = TEMP_TO_REG(val);
-                dme1737_write(client, DME1737_REG_TEMP_MAX(ix),
+                dme1737_write(data, DME1737_REG_TEMP_MAX(ix),
                               data->temp_max[ix]);
                 break;
         case SYS_TEMP_OFFSET:
                 data->temp_offset[ix] = TEMP_TO_REG(val);
-                dme1737_write(client, DME1737_REG_TEMP_OFFSET(ix),
+                dme1737_write(data, DME1737_REG_TEMP_OFFSET(ix),
                               data->temp_offset[ix]);
                 break;
         default:
@@ -939,7 +938,6 @@ static ssize_t set_zone(struct device *dev, struct device_attribute *attr,
                         const char *buf, size_t count)
 {
         struct dme1737_data *data = dev_get_drvdata(dev);
-        struct i2c_client *client = &data->client;
         struct sensor_device_attribute_2
                 *sensor_attr_2 = to_sensor_dev_attr_2(attr);
         int ix = sensor_attr_2->index;
@@ -950,37 +948,37 @@ static ssize_t set_zone(struct device *dev, struct device_attribute *attr,
         switch (fn) {
         case SYS_ZONE_AUTO_POINT1_TEMP_HYST:
                 /* Refresh the cache */
-                data->zone_low[ix] = dme1737_read(client,
+                data->zone_low[ix] = dme1737_read(data,
                                                   DME1737_REG_ZONE_LOW(ix));
                 /* Modify the temp hyst value */
                 data->zone_hyst[ix == 2] = TEMP_HYST_TO_REG(
                                         TEMP_FROM_REG(data->zone_low[ix], 8) -
-                                        val, ix, dme1737_read(client,
+                                        val, ix, dme1737_read(data,
                                         DME1737_REG_ZONE_HYST(ix == 2)));
-                dme1737_write(client, DME1737_REG_ZONE_HYST(ix == 2),
+                dme1737_write(data, DME1737_REG_ZONE_HYST(ix == 2),
                               data->zone_hyst[ix == 2]);
                 break;
         case SYS_ZONE_AUTO_POINT1_TEMP:
                 data->zone_low[ix] = TEMP_TO_REG(val);
-                dme1737_write(client, DME1737_REG_ZONE_LOW(ix),
+                dme1737_write(data, DME1737_REG_ZONE_LOW(ix),
                               data->zone_low[ix]);
                 break;
         case SYS_ZONE_AUTO_POINT2_TEMP:
                 /* Refresh the cache */
-                data->zone_low[ix] = dme1737_read(client,
+                data->zone_low[ix] = dme1737_read(data,
                                                   DME1737_REG_ZONE_LOW(ix));
                 /* Modify the temp range value (which is stored in the upper
                  * nibble of the pwm_freq register) */
                 data->pwm_freq[ix] = TEMP_RANGE_TO_REG(val -
                                         TEMP_FROM_REG(data->zone_low[ix], 8),
-                                        dme1737_read(client,
+                                        dme1737_read(data,
                                         DME1737_REG_PWM_FREQ(ix)));
-                dme1737_write(client, DME1737_REG_PWM_FREQ(ix),
+                dme1737_write(data, DME1737_REG_PWM_FREQ(ix),
                               data->pwm_freq[ix]);
                 break;
         case SYS_ZONE_AUTO_POINT3_TEMP:
                 data->zone_abs[ix] = TEMP_TO_REG(val);
-                dme1737_write(client, DME1737_REG_ZONE_ABS(ix),
+                dme1737_write(data, DME1737_REG_ZONE_ABS(ix),
                               data->zone_abs[ix]);
                 break;
         default:
@@ -1046,7 +1044,6 @@ static ssize_t set_fan(struct device *dev, struct device_attribute *attr,
                        const char *buf, size_t count)
 {
         struct dme1737_data *data = dev_get_drvdata(dev);
-        struct i2c_client *client = &data->client;
         struct sensor_device_attribute_2
                 *sensor_attr_2 = to_sensor_dev_attr_2(attr);
         int ix = sensor_attr_2->index;
@@ -1060,21 +1057,21 @@ static ssize_t set_fan(struct device *dev, struct device_attribute *attr,
                         data->fan_min[ix] = FAN_TO_REG(val, 0);
                 } else {
                         /* Refresh the cache */
-                        data->fan_opt[ix] = dme1737_read(client,
+                        data->fan_opt[ix] = dme1737_read(data,
                                                 DME1737_REG_FAN_OPT(ix));
                         /* Modify the fan min value */
                         data->fan_min[ix] = FAN_TO_REG(val,
                                         FAN_TPC_FROM_REG(data->fan_opt[ix]));
                 }
-                dme1737_write(client, DME1737_REG_FAN_MIN(ix),
+                dme1737_write(data, DME1737_REG_FAN_MIN(ix),
                               data->fan_min[ix] & 0xff);
-                dme1737_write(client, DME1737_REG_FAN_MIN(ix) + 1,
+                dme1737_write(data, DME1737_REG_FAN_MIN(ix) + 1,
                               data->fan_min[ix] >> 8);
                 break;
         case SYS_FAN_MAX:
                 /* Only valid for fan[5-6] */
                 data->fan_max[ix - 4] = FAN_MAX_TO_REG(val);
-                dme1737_write(client, DME1737_REG_FAN_MAX(ix),
+                dme1737_write(data, DME1737_REG_FAN_MAX(ix),
                               data->fan_max[ix - 4]);
                 break;
         case SYS_FAN_TYPE:
@@ -1086,9 +1083,9 @@ static ssize_t set_fan(struct device *dev, struct device_attribute *attr,
                                  val);
                         goto exit;
                 }
-                data->fan_opt[ix] = FAN_TYPE_TO_REG(val, dme1737_read(client,
+                data->fan_opt[ix] = FAN_TYPE_TO_REG(val, dme1737_read(data,
                                         DME1737_REG_FAN_OPT(ix)));
-                dme1737_write(client, DME1737_REG_FAN_OPT(ix),
+                dme1737_write(data, DME1737_REG_FAN_OPT(ix),
                               data->fan_opt[ix]);
                 break;
         default:
@@ -1185,7 +1182,6 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
                        const char *buf, size_t count)
 {
         struct dme1737_data *data = dev_get_drvdata(dev);
-        struct i2c_client *client = &data->client;
         struct sensor_device_attribute_2
                 *sensor_attr_2 = to_sensor_dev_attr_2(attr);
         int ix = sensor_attr_2->index;
@@ -1196,12 +1192,12 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
         switch (fn) {
         case SYS_PWM:
                 data->pwm[ix] = SENSORS_LIMIT(val, 0, 255);
-                dme1737_write(client, DME1737_REG_PWM(ix), data->pwm[ix]);
+                dme1737_write(data, DME1737_REG_PWM(ix), data->pwm[ix]);
                 break;
         case SYS_PWM_FREQ:
-                data->pwm_freq[ix] = PWM_FREQ_TO_REG(val, dme1737_read(client,
+                data->pwm_freq[ix] = PWM_FREQ_TO_REG(val, dme1737_read(data,
                                                 DME1737_REG_PWM_FREQ(ix)));
-                dme1737_write(client, DME1737_REG_PWM_FREQ(ix),
+                dme1737_write(data, DME1737_REG_PWM_FREQ(ix),
                               data->pwm_freq[ix]);
                 break;
         case SYS_PWM_ENABLE:
@@ -1214,7 +1210,7 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
                         goto exit;
                 }
                 /* Refresh the cache */
-                data->pwm_config[ix] = dme1737_read(client,
+                data->pwm_config[ix] = dme1737_read(data,
                                                 DME1737_REG_PWM_CONFIG(ix));
                 if (val == PWM_EN_FROM_REG(data->pwm_config[ix])) {
                         /* Bail out if no change */
@@ -1226,14 +1222,14 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
                         data->pwm_acz[ix] = PWM_ACZ_FROM_REG(
                                                         data->pwm_config[ix]);
                         /* Save the current ramp rate state and disable it */
-                        data->pwm_rr[ix > 0] = dme1737_read(client,
+                        data->pwm_rr[ix > 0] = dme1737_read(data,
                                                 DME1737_REG_PWM_RR(ix > 0));
                         data->pwm_rr_en &= ~(1 << ix);
                         if (PWM_RR_EN_FROM_REG(data->pwm_rr[ix > 0], ix)) {
                                 data->pwm_rr_en |= (1 << ix);
                                 data->pwm_rr[ix > 0] = PWM_RR_EN_TO_REG(0, ix,
                                                         data->pwm_rr[ix > 0]);
-                                dme1737_write(client,
+                                dme1737_write(data,
                                               DME1737_REG_PWM_RR(ix > 0),
                                               data->pwm_rr[ix > 0]);
                         }
@@ -1247,14 +1243,14 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
                         /* Turn fan fully on */
                         data->pwm_config[ix] = PWM_EN_TO_REG(0,
                                                         data->pwm_config[ix]);
-                        dme1737_write(client, DME1737_REG_PWM_CONFIG(ix),
+                        dme1737_write(data, DME1737_REG_PWM_CONFIG(ix),
                                       data->pwm_config[ix]);
                         break;
                 case 1:
                         /* Turn on manual mode */
                         data->pwm_config[ix] = PWM_EN_TO_REG(1,
                                                         data->pwm_config[ix]);
-                        dme1737_write(client, DME1737_REG_PWM_CONFIG(ix),
+                        dme1737_write(data, DME1737_REG_PWM_CONFIG(ix),
                                       data->pwm_config[ix]);
                         /* Change permissions of pwm[ix] to read-writeable */
                         dme1737_chmod_file(dev, dme1737_pwm_chmod_attr[ix],
@@ -1269,14 +1265,14 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
                         data->pwm_config[ix] = PWM_ACZ_TO_REG(
                                                         data->pwm_acz[ix],
                                                         data->pwm_config[ix]);
-                        dme1737_write(client, DME1737_REG_PWM_CONFIG(ix),
+                        dme1737_write(data, DME1737_REG_PWM_CONFIG(ix),
                                       data->pwm_config[ix]);
                         /* Enable PWM ramp rate if previously enabled */
                         if (data->pwm_rr_en & (1 << ix)) {
                                 data->pwm_rr[ix > 0] = PWM_RR_EN_TO_REG(1, ix,
-                                                dme1737_read(client,
+                                                dme1737_read(data,
                                                 DME1737_REG_PWM_RR(ix > 0)));
-                                dme1737_write(client,
+                                dme1737_write(data,
                                               DME1737_REG_PWM_RR(ix > 0),
                                               data->pwm_rr[ix > 0]);
                         }
@@ -1286,9 +1282,9 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
         case SYS_PWM_RAMP_RATE:
                 /* Only valid for pwm[1-3] */
                 /* Refresh the cache */
-                data->pwm_config[ix] = dme1737_read(client,
+                data->pwm_config[ix] = dme1737_read(data,
                                                 DME1737_REG_PWM_CONFIG(ix));
-                data->pwm_rr[ix > 0] = dme1737_read(client,
+                data->pwm_rr[ix > 0] = dme1737_read(data,
                                                 DME1737_REG_PWM_RR(ix > 0));
                 /* Set the ramp rate value */
                 if (val > 0) {
@@ -1301,7 +1297,7 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
                         data->pwm_rr[ix > 0] = PWM_RR_EN_TO_REG(val > 0, ix,
                                                         data->pwm_rr[ix > 0]);
                 }
-                dme1737_write(client, DME1737_REG_PWM_RR(ix > 0),
+                dme1737_write(data, DME1737_REG_PWM_RR(ix > 0),
                               data->pwm_rr[ix > 0]);
                 break;
         case SYS_PWM_AUTO_CHANNELS_ZONE:
@@ -1315,14 +1311,14 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
                         goto exit;
                 }
                 /* Refresh the cache */
-                data->pwm_config[ix] = dme1737_read(client,
+                data->pwm_config[ix] = dme1737_read(data,
                                                 DME1737_REG_PWM_CONFIG(ix));
                 if (PWM_EN_FROM_REG(data->pwm_config[ix]) == 2) {
                         /* PWM is already in auto mode so update the temp
                          * channel assignment */
                         data->pwm_config[ix] = PWM_ACZ_TO_REG(val,
                                                 data->pwm_config[ix]);
-                        dme1737_write(client, DME1737_REG_PWM_CONFIG(ix),
+                        dme1737_write(data, DME1737_REG_PWM_CONFIG(ix),
                                       data->pwm_config[ix]);
                 } else {
                         /* PWM is not in auto mode so we save the temp
@@ -1333,7 +1329,7 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
         case SYS_PWM_AUTO_PWM_MIN:
                 /* Only valid for pwm[1-3] */
                 /* Refresh the cache */
-                data->pwm_min[ix] = dme1737_read(client,
+                data->pwm_min[ix] = dme1737_read(data,
                                                 DME1737_REG_PWM_MIN(ix));
                 /* There are only 2 values supported for the auto_pwm_min
                  * value: 0 or auto_point1_pwm. So if the temperature drops
@@ -1341,20 +1337,20 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
                  * off or runs at auto_point1_pwm duty-cycle. */
                 if (val > ((data->pwm_min[ix] + 1) / 2)) {
                         data->pwm_rr[0] = PWM_OFF_TO_REG(1, ix,
-                                                dme1737_read(client,
+                                                dme1737_read(data,
                                                 DME1737_REG_PWM_RR(0)));
                 } else {
                         data->pwm_rr[0] = PWM_OFF_TO_REG(0, ix,
-                                                dme1737_read(client,
+                                                dme1737_read(data,
                                                 DME1737_REG_PWM_RR(0)));
                 }
-                dme1737_write(client, DME1737_REG_PWM_RR(0),
+                dme1737_write(data, DME1737_REG_PWM_RR(0),
                               data->pwm_rr[0]);
                 break;
         case SYS_PWM_AUTO_POINT1_PWM:
                 /* Only valid for pwm[1-3] */
                 data->pwm_min[ix] = SENSORS_LIMIT(val, 0, 255);
-                dme1737_write(client, DME1737_REG_PWM_MIN(ix),
+                dme1737_write(data, DME1737_REG_PWM_MIN(ix),
                               data->pwm_min[ix]);
                 break;
         default:
@@ -1402,7 +1398,7 @@ static ssize_t show_name(struct device *dev, struct device_attribute *attr,
 {
         struct dme1737_data *data = dev_get_drvdata(dev);
 
-        return sprintf(buf, "%s\n", data->client.name);
+        return sprintf(buf, "%s\n", data->name);
 }
 
 /* ---------------------------------------------------------------------
@@ -1908,7 +1904,7 @@ static void dme1737_remove_files(struct device *dev)
 
         sysfs_remove_group(&dev->kobj, &dme1737_group);
 
-        if (!data->client.driver) {
+        if (!data->client) {
                 sysfs_remove_file(&dev->kobj, &dev_attr_name.attr);
         }
 }
@@ -1919,7 +1915,7 @@ static int dme1737_create_files(struct device *dev)
         int err, ix;
 
         /* Create a name attribute for ISA devices */
-        if (!data->client.driver &&
+        if (!data->client &&
             (err = sysfs_create_file(&dev->kobj, &dev_attr_name.attr))) {
                 goto exit;
         }
@@ -2013,14 +2009,14 @@ exit:
 static int dme1737_init_device(struct device *dev)
 {
         struct dme1737_data *data = dev_get_drvdata(dev);
-        struct i2c_client *client = &data->client;
+        struct i2c_client *client = data->client;
         int ix;
         u8 reg;
 
         /* Point to the right nominal voltages array */
         data->in_nominal = IN_NOMINAL(data->type);
 
-        data->config = dme1737_read(client, DME1737_REG_CONFIG);
+        data->config = dme1737_read(data, DME1737_REG_CONFIG);
         /* Inform if part is not monitoring/started */
         if (!(data->config & 0x01)) {
                 if (!force_start) {
@@ -2032,7 +2028,7 @@ static int dme1737_init_device(struct device *dev)
 
                 /* Force monitoring */
                 data->config |= 0x01;
-                dme1737_write(client, DME1737_REG_CONFIG, data->config);
+                dme1737_write(data, DME1737_REG_CONFIG, data->config);
         }
         /* Inform if part is not ready */
         if (!(data->config & 0x04)) {
@@ -2041,8 +2037,8 @@ static int dme1737_init_device(struct device *dev)
         }
 
         /* Determine which optional fan and pwm features are enabled/present */
-        if (client->driver) {   /* I2C chip */
-                data->config2 = dme1737_read(client, DME1737_REG_CONFIG2);
+        if (client) {   /* I2C chip */
+                data->config2 = dme1737_read(data, DME1737_REG_CONFIG2);
                 /* Check if optional fan3 input is enabled */
                 if (data->config2 & 0x04) {
                         data->has_fan |= (1 << 2);
@@ -2051,7 +2047,7 @@ static int dme1737_init_device(struct device *dev)
                 /* Fan4 and pwm3 are only available if the client's I2C address
                  * is the default 0x2e. Otherwise the I/Os associated with
                  * these functions are used for addr enable/select. */
-                if (data->client.addr == 0x2e) {
+                if (client->addr == 0x2e) {
                         data->has_fan |= (1 << 3);
                         data->has_pwm |= (1 << 2);
                 }
@@ -2086,16 +2082,16 @@ static int dme1737_init_device(struct device *dev)
                  (data->has_fan & (1 << 4)) ? "yes" : "no",
                  (data->has_fan & (1 << 5)) ? "yes" : "no");
 
-        reg = dme1737_read(client, DME1737_REG_TACH_PWM);
+        reg = dme1737_read(data, DME1737_REG_TACH_PWM);
         /* Inform if fan-to-pwm mapping differs from the default */
-        if (client->driver && reg != 0xa4) {   /* I2C chip */
+        if (client && reg != 0xa4) {   /* I2C chip */
                 dev_warn(dev, "Non-standard fan to pwm mapping: "
                          "fan1->pwm%d, fan2->pwm%d, fan3->pwm%d, "
                          "fan4->pwm%d. Please report to the driver "
                          "maintainer.\n",
                          (reg & 0x03) + 1, ((reg >> 2) & 0x03) + 1,
                          ((reg >> 4) & 0x03) + 1, ((reg >> 6) & 0x03) + 1);
-        } else if (!client->driver && reg != 0x24) {   /* ISA chip */
+        } else if (!client && reg != 0x24) {   /* ISA chip */
                 dev_warn(dev, "Non-standard fan to pwm mapping: "
                          "fan1->pwm%d, fan2->pwm%d, fan3->pwm%d. "
                          "Please report to the driver maintainer.\n",
@@ -2108,7 +2104,7 @@ static int dme1737_init_device(struct device *dev)
          * disabled). */
         if (!(data->config & 0x02)) {
                 for (ix = 0; ix < 3; ix++) {
-                        data->pwm_config[ix] = dme1737_read(client,
+                        data->pwm_config[ix] = dme1737_read(data,
                                                 DME1737_REG_PWM_CONFIG(ix));
                         if ((data->has_pwm & (1 << ix)) &&
                             (PWM_EN_FROM_REG(data->pwm_config[ix]) == -1)) {
@@ -2116,8 +2112,8 @@ static int dme1737_init_device(struct device *dev)
                                          "manual mode.\n", ix + 1);
                                 data->pwm_config[ix] = PWM_EN_TO_REG(1,
                                                         data->pwm_config[ix]);
-                                dme1737_write(client, DME1737_REG_PWM(ix), 0);
-                                dme1737_write(client,
+                                dme1737_write(data, DME1737_REG_PWM(ix), 0);
+                                dme1737_write(data,
                                               DME1737_REG_PWM_CONFIG(ix),
                                               data->pwm_config[ix]);
                         }
@@ -2191,37 +2187,24 @@ exit:
         return err;
 }
 
-static int dme1737_i2c_detect(struct i2c_adapter *adapter, int address,
-                              int kind)
+/* Return 0 if detection is successful, -ENODEV otherwise */
+static int dme1737_i2c_detect(struct i2c_client *client, int kind,
+                              struct i2c_board_info *info)
 {
+        struct i2c_adapter *adapter = client->adapter;
+        struct device *dev = &adapter->dev;
         u8 company, verstep = 0;
-        struct i2c_client *client;
-        struct dme1737_data *data;
-        struct device *dev;
-        int err = 0;
         const char *name;
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
-                goto exit;
-        }
-
-        if (!(data = kzalloc(sizeof(struct dme1737_data), GFP_KERNEL))) {
-                err = -ENOMEM;
-                goto exit;
+                return -ENODEV;
         }
 
-        client = &data->client;
-        i2c_set_clientdata(client, data);
-        client->addr = address;
-        client->adapter = adapter;
-        client->driver = &dme1737_i2c_driver;
-        dev = &client->dev;
-
         /* A negative kind means that the driver was loaded with no force
          * parameter (default), so we must identify the chip. */
         if (kind < 0) {
-                company = dme1737_read(client, DME1737_REG_COMPANY);
-                verstep = dme1737_read(client, DME1737_REG_VERSTEP);
+                company = i2c_smbus_read_byte_data(client, DME1737_REG_COMPANY);
+                verstep = i2c_smbus_read_byte_data(client, DME1737_REG_VERSTEP);
 
                 if (company == DME1737_COMPANY_SMSC &&
                     (verstep & DME1737_VERSTEP_MASK) == DME1737_VERSTEP) {
@@ -2230,8 +2213,7 @@ static int dme1737_i2c_detect(struct i2c_adapter *adapter, int address,
                            verstep == SCH5027_VERSTEP) {
                         kind = sch5027;
                 } else {
-                        err = -ENODEV;
-                        goto exit_kfree;
+                        return -ENODEV;
                 }
         }
 
@@ -2241,32 +2223,44 @@ static int dme1737_i2c_detect(struct i2c_adapter *adapter, int address,
                 kind = dme1737;
                 name = "dme1737";
         }
-        data->type = kind;
-
-        /* Fill in the remaining client fields and put it into the global
-         * list */
-        strlcpy(client->name, name, I2C_NAME_SIZE);
-        mutex_init(&data->update_lock);
-
-        /* Tell the I2C layer a new client has arrived */
-        if ((err = i2c_attach_client(client))) {
-                goto exit_kfree;
-        }
 
         dev_info(dev, "Found a %s chip at 0x%02x (rev 0x%02x).\n",
                  kind == sch5027 ? "SCH5027" : "DME1737", client->addr,
                  verstep);
+        strlcpy(info->type, name, I2C_NAME_SIZE);
+
+        return 0;
+}
+
+static int dme1737_i2c_probe(struct i2c_client *client,
+                             const struct i2c_device_id *id)
+{
+        struct dme1737_data *data;
+        struct device *dev = &client->dev;
+        int err;
+
+        data = kzalloc(sizeof(struct dme1737_data), GFP_KERNEL);
+        if (!data) {
+                err = -ENOMEM;
+                goto exit;
+        }
+
+        i2c_set_clientdata(client, data);
+        data->type = id->driver_data;
+        data->client = client;
+        data->name = client->name;
+        mutex_init(&data->update_lock);
 
         /* Initialize the DME1737 chip */
         if ((err = dme1737_init_device(dev))) {
                 dev_err(dev, "Failed to initialize device.\n");
-                goto exit_detach;
+                goto exit_kfree;
         }
 
         /* Create sysfs files */
         if ((err = dme1737_create_files(dev))) {
                 dev_err(dev, "Failed to create sysfs files.\n");
-                goto exit_detach;
+                goto exit_kfree;
         }
 
         /* Register device */
@@ -2281,45 +2275,40 @@ static int dme1737_i2c_detect(struct i2c_adapter *adapter, int address,
 
 exit_remove:
         dme1737_remove_files(dev);
-exit_detach:
-        i2c_detach_client(client);
 exit_kfree:
         kfree(data);
 exit:
         return err;
 }
 
-static int dme1737_i2c_attach_adapter(struct i2c_adapter *adapter)
-{
-        if (!(adapter->class & I2C_CLASS_HWMON)) {
-                return 0;
-        }
-
-        return i2c_probe(adapter, &addr_data, dme1737_i2c_detect);
-}
-
-static int dme1737_i2c_detach_client(struct i2c_client *client)
+static int dme1737_i2c_remove(struct i2c_client *client)
 {
         struct dme1737_data *data = i2c_get_clientdata(client);
-        int err;
 
         hwmon_device_unregister(data->hwmon_dev);
         dme1737_remove_files(&client->dev);
 
-        if ((err = i2c_detach_client(client))) {
-                return err;
-        }
-
         kfree(data);
         return 0;
 }
 
+static const struct i2c_device_id dme1737_id[] = {
+        { "dme1737", dme1737 },
+        { "sch5027", sch5027 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, dme1737_id);
+
 static struct i2c_driver dme1737_i2c_driver = {
+        .class = I2C_CLASS_HWMON,
         .driver = {
                 .name = "dme1737",
         },
-        .attach_adapter = dme1737_i2c_attach_adapter,
-        .detach_client = dme1737_i2c_detach_client,
+        .probe = dme1737_i2c_probe,
+        .remove = dme1737_i2c_remove,
+        .id_table = dme1737_id,
+        .detect = dme1737_i2c_detect,
+        .address_data = &addr_data,
 };
 
 /* ---------------------------------------------------------------------
@@ -2403,7 +2392,6 @@ static int __devinit dme1737_isa_probe(struct platform_device *pdev)
 {
         u8 company, device;
         struct resource *res;
-        struct i2c_client *client;
         struct dme1737_data *data;
         struct device *dev = &pdev->dev;
         int err;
@@ -2422,15 +2410,13 @@ static int __devinit dme1737_isa_probe(struct platform_device *pdev)
                 goto exit_release_region;
         }
 
-        client = &data->client;
-        i2c_set_clientdata(client, data);
-        client->addr = res->start;
+        data->addr = res->start;
         platform_set_drvdata(pdev, data);
 
         /* Skip chip detection if module is loaded with force_id parameter */
         if (!force_id) {
-                company = dme1737_read(client, DME1737_REG_COMPANY);
-                device = dme1737_read(client, DME1737_REG_DEVICE);
+                company = dme1737_read(data, DME1737_REG_COMPANY);
+                device = dme1737_read(data, DME1737_REG_DEVICE);
 
                 if (!((company == DME1737_COMPANY_SMSC) &&
                       (device == SCH311X_DEVICE))) {
@@ -2441,10 +2427,10 @@ static int __devinit dme1737_isa_probe(struct platform_device *pdev)
         data->type = sch311x;
 
         /* Fill in the remaining client fields and initialize the mutex */
-        strlcpy(client->name, "sch311x", I2C_NAME_SIZE);
+        data->name = "sch311x";
         mutex_init(&data->update_lock);
 
-        dev_info(dev, "Found a SCH311x chip at 0x%04x\n", client->addr);
+        dev_info(dev, "Found a SCH311x chip at 0x%04x\n", data->addr);
 
         /* Initialize the chip */
         if ((err = dme1737_init_device(dev))) {
@@ -2485,7 +2471,7 @@ static int __devexit dme1737_isa_remove(struct platform_device *pdev)
 
         hwmon_device_unregister(data->hwmon_dev);
         dme1737_remove_files(&pdev->dev);
-        release_region(data->client.addr, DME1737_EXTENT);
+        release_region(data->addr, DME1737_EXTENT);
         platform_set_drvdata(pdev, NULL);
         kfree(data);
 
diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c
index 7321a88a5112..076a59cdabe9 100644
--- a/drivers/hwmon/hwmon.c
+++ b/drivers/hwmon/hwmon.c
@@ -55,8 +55,8 @@ again:
                 return ERR_PTR(err);
 
         id = id & MAX_ID_MASK;
-        hwdev = device_create_drvdata(hwmon_class, dev, MKDEV(0, 0), NULL,
-                                      HWMON_ID_FORMAT, id);
+        hwdev = device_create(hwmon_class, dev, MKDEV(0, 0), NULL,
+                              HWMON_ID_FORMAT, id);
 
         if (IS_ERR(hwdev)) {
                 spin_lock(&idr_lock);
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 6ee997b2817c..acadbc51fc0f 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -55,7 +55,7 @@ config I2C_AMD756
 
 config I2C_AMD756_S4882
         tristate "SMBus multiplexing on the Tyan S4882"
-        depends on I2C_AMD756 && EXPERIMENTAL
+        depends on I2C_AMD756 && X86 && EXPERIMENTAL
         help
           Enabling this option will add specific SMBus support for the Tyan
           S4882 motherboard.  On this 4-CPU board, the SMBus is multiplexed
@@ -148,7 +148,7 @@ config I2C_NFORCE2
 
 config I2C_NFORCE2_S4985
         tristate "SMBus multiplexing on the Tyan S4985"
-        depends on I2C_NFORCE2 && EXPERIMENTAL
+        depends on I2C_NFORCE2 && X86 && EXPERIMENTAL
         help
           Enabling this option will add specific SMBus support for the Tyan
           S4985 motherboard.  On this 4-CPU board, the SMBus is multiplexed
@@ -209,7 +209,7 @@ config I2C_VIA
           will be called i2c-via.
 
 config I2C_VIAPRO
-        tristate "VIA VT82C596/82C686/82xx and CX700"
+        tristate "VIA VT82C596/82C686/82xx and CX700/VX800/VX820"
         depends on PCI
         help
           If you say yes to this option, support will be included for the VIA
@@ -223,6 +223,8 @@ config I2C_VIAPRO
             VT8237R/A/S
             VT8251
             CX700
+            VX800
+            VX820
 
           This driver can also be built as a module.  If so, the module
           will be called i2c-viapro.
@@ -330,6 +332,18 @@ config I2C_GPIO
           This is a very simple bitbanging I2C driver utilizing the
           arch-neutral GPIO API to control the SCL and SDA lines.
 
+config I2C_HIGHLANDER
+        tristate "Highlander FPGA SMBus interface"
+        depends on SH_HIGHLANDER
+        help
+          If you say yes to this option, support will be included for
+          the SMBus interface located in the FPGA on various Highlander
+          boards, particularly the R0P7780LC0011RL and R0P7785LC0011RL
+          FPGAs. This is wholly unrelated to the SoC I2C.
+
+          This driver can also be built as a module.  If so, the module
+          will be called i2c-highlander.
+
 config I2C_IBM_IIC
         tristate "IBM PPC 4xx on-chip I2C interface"
         depends on 4xx
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
index 97dbfa2107fe..0c2c4b26cdf1 100644
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@ -31,6 +31,7 @@ obj-$(CONFIG_I2C_BLACKFIN_TWI)	+= i2c-bfin-twi.o
 obj-$(CONFIG_I2C_CPM)           += i2c-cpm.o
 obj-$(CONFIG_I2C_DAVINCI)       += i2c-davinci.o
 obj-$(CONFIG_I2C_GPIO)          += i2c-gpio.o
+obj-$(CONFIG_I2C_HIGHLANDER)    += i2c-highlander.o
 obj-$(CONFIG_I2C_IBM_IIC)       += i2c-ibm_iic.o
 obj-$(CONFIG_I2C_IOP3XX)        += i2c-iop3xx.o
 obj-$(CONFIG_I2C_IXP2000)       += i2c-ixp2000.o
diff --git a/drivers/i2c/busses/i2c-highlander.c b/drivers/i2c/busses/i2c-highlander.c
new file mode 100644
index 000000000000..f4d22ae9d294
--- /dev/null
+++ b/drivers/i2c/busses/i2c-highlander.c
@@ -0,0 +1,498 @@
+/*
+ * Renesas Solutions Highlander FPGA I2C/SMBus support.
+ *
+ * Supported devices: R0P7780LC0011RL, R0P7785LC0011RL
+ *
+ * Copyright (C) 2008  Paul Mundt
+ * Copyright (C) 2008  Renesas Solutions Corp.
+ * Copyright (C) 2008  Atom Create Engineering Co., Ltd.
+ *
+ * This file is subject to the terms and conditions of the GNU General
+ * Public License version 2. See the file "COPYING" in the main directory
+ * of this archive for more details.
+ */
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/i2c.h>
+#include <linux/platform_device.h>
+#include <linux/completion.h>
+#include <linux/io.h>
+#include <linux/delay.h>
+
+#define SMCR            0x00
+#define SMCR_START      (1 << 0)
+#define SMCR_IRIC       (1 << 1)
+#define SMCR_BBSY       (1 << 2)
+#define SMCR_ACKE       (1 << 3)
+#define SMCR_RST        (1 << 4)
+#define SMCR_IEIC       (1 << 6)
+
+#define SMSMADR         0x02
+
+#define SMMR            0x04
+#define SMMR_MODE0      (1 << 0)
+#define SMMR_MODE1      (1 << 1)
+#define SMMR_CAP        (1 << 3)
+#define SMMR_TMMD       (1 << 4)
+#define SMMR_SP         (1 << 7)
+
+#define SMSADR          0x06
+#define SMTRDR          0x46
+
+struct highlander_i2c_dev {
+        struct device           *dev;
+        void __iomem            *base;
+        struct i2c_adapter      adapter;
+        struct completion       cmd_complete;
+        unsigned long           last_read_time;
+        int                     irq;
+        u8                      *buf;
+        size_t                  buf_len;
+};
+
+static int iic_force_poll, iic_force_normal;
+static int iic_timeout = 1000, iic_read_delay;
+
+static inline void highlander_i2c_irq_enable(struct highlander_i2c_dev *dev)
+{
+        iowrite16(ioread16(dev->base + SMCR) | SMCR_IEIC, dev->base + SMCR);
+}
+
+static inline void highlander_i2c_irq_disable(struct highlander_i2c_dev *dev)
+{
+        iowrite16(ioread16(dev->base + SMCR) & ~SMCR_IEIC, dev->base + SMCR);
+}
+
+static inline void highlander_i2c_start(struct highlander_i2c_dev *dev)
+{
+        iowrite16(ioread16(dev->base + SMCR) | SMCR_START, dev->base + SMCR);
+}
+
+static inline void highlander_i2c_done(struct highlander_i2c_dev *dev)
+{
+        iowrite16(ioread16(dev->base + SMCR) | SMCR_IRIC, dev->base + SMCR);
+}
+
+static void highlander_i2c_setup(struct highlander_i2c_dev *dev)
+{
+        u16 smmr;
+
+        smmr = ioread16(dev->base + SMMR);
+        smmr |= SMMR_TMMD;
+
+        if (iic_force_normal)
+                smmr &= ~SMMR_SP;
+        else
+                smmr |= SMMR_SP;
+
+        iowrite16(smmr, dev->base + SMMR);
+}
+
+static void smbus_write_data(u8 *src, u16 *dst, int len)
+{
+        for (; len > 1; len -= 2) {
+                *dst++ = be16_to_cpup((u16 *)src);
+                src += 2;
+        }
+
+        if (len)
+                *dst = *src << 8;
+}
+
+static void smbus_read_data(u16 *src, u8 *dst, int len)
+{
+        for (; len > 1; len -= 2) {
+                *(u16 *)dst = cpu_to_be16p(src++);
+                dst += 2;
+        }
+
+        if (len)
+                *dst = *src >> 8;
+}
+
+static void highlander_i2c_command(struct highlander_i2c_dev *dev,
+                                   u8 command, int len)
+{
+        unsigned int i;
+        u16 cmd = (command << 8) | command;
+
+        for (i = 0; i < len; i += 2) {
+                if (len - i == 1)
+                        cmd = command << 8;
+                iowrite16(cmd, dev->base + SMSADR + i);
+                dev_dbg(dev->dev, "command data[%x] 0x%04x\n", i/2, cmd);
+        }
+}
+
+static int highlander_i2c_wait_for_bbsy(struct highlander_i2c_dev *dev)
+{
+        unsigned long timeout;
+
+        timeout = jiffies + msecs_to_jiffies(iic_timeout);
+        while (ioread16(dev->base + SMCR) & SMCR_BBSY) {
+                if (time_after(jiffies, timeout)) {
+                        dev_warn(dev->dev, "timeout waiting for bus ready\n");
+                        return -ETIMEDOUT;
+                }
+
+                msleep(1);
+        }
+
+        return 0;
+}
+
+static int highlander_i2c_reset(struct highlander_i2c_dev *dev)
+{
+        iowrite16(ioread16(dev->base + SMCR) | SMCR_RST, dev->base + SMCR);
+        return highlander_i2c_wait_for_bbsy(dev);
+}
+
+static int highlander_i2c_wait_for_ack(struct highlander_i2c_dev *dev)
+{
+        u16 tmp = ioread16(dev->base + SMCR);
+
+        if ((tmp & (SMCR_IRIC | SMCR_ACKE)) == SMCR_ACKE) {
+                dev_warn(dev->dev, "ack abnormality\n");
+                return highlander_i2c_reset(dev);
+        }
+
+        return 0;
+}
+
+static irqreturn_t highlander_i2c_irq(int irq, void *dev_id)
+{
+        struct highlander_i2c_dev *dev = dev_id;
+
+        highlander_i2c_done(dev);
+        complete(&dev->cmd_complete);
+
+        return IRQ_HANDLED;
+}
+
+static void highlander_i2c_poll(struct highlander_i2c_dev *dev)
+{
+        unsigned long timeout;
+        u16 smcr;
+
+        timeout = jiffies + msecs_to_jiffies(iic_timeout);
+        for (;;) {
+                smcr = ioread16(dev->base + SMCR);
+
+                /*
+                 * Don't bother checking ACKE here, this and the reset
+                 * are handled in highlander_i2c_wait_xfer_done() when
+                 * waiting for the ACK.
+                 */
+
+                if (smcr & SMCR_IRIC)
+                        return;
+                if (time_after(jiffies, timeout))
+                        break;
+
+                cpu_relax();
+                cond_resched();
+        }
+
+        dev_err(dev->dev, "polling timed out\n");
+}
+
+static inline int highlander_i2c_wait_xfer_done(struct highlander_i2c_dev *dev)
+{
+        if (dev->irq)
+                wait_for_completion_timeout(&dev->cmd_complete,
+                                          msecs_to_jiffies(iic_timeout));
+        else
+                /* busy looping, the IRQ of champions */
+                highlander_i2c_poll(dev);
+
+        return highlander_i2c_wait_for_ack(dev);
+}
+
+static int highlander_i2c_read(struct highlander_i2c_dev *dev)
+{
+        int i, cnt;
+        u16 data[16];
+
+        if (highlander_i2c_wait_for_bbsy(dev))
+                return -EAGAIN;
+
+        highlander_i2c_start(dev);
+
+        if (highlander_i2c_wait_xfer_done(dev)) {
+                dev_err(dev->dev, "Arbitration loss\n");
+                return -EAGAIN;
+        }
+
+        /*
+         * The R0P7780LC0011RL FPGA needs a significant delay between
+         * data read cycles, otherwise the transciever gets confused and
+         * garbage is returned when the read is subsequently aborted.
+         *
+         * It is not sufficient to wait for BBSY.
+         *
+         * While this generally only applies to the older SH7780-based
+         * Highlanders, the same issue can be observed on SH7785 ones,
+         * albeit less frequently. SH7780-based Highlanders may need
+         * this to be as high as 1000 ms.
+         */
+        if (iic_read_delay && time_before(jiffies, dev->last_read_time +
+                                 msecs_to_jiffies(iic_read_delay)))
+                msleep(jiffies_to_msecs((dev->last_read_time +
+                                msecs_to_jiffies(iic_read_delay)) - jiffies));
+
+        cnt = (dev->buf_len + 1) >> 1;
+        for (i = 0; i < cnt; i++) {
+                data[i] = ioread16(dev->base + SMTRDR + (i * sizeof(u16)));
+                dev_dbg(dev->dev, "read data[%x] 0x%04x\n", i, data[i]);
+        }
+
+        smbus_read_data(data, dev->buf, dev->buf_len);
+
+        dev->last_read_time = jiffies;
+
+        return 0;
+}
+
+static int highlander_i2c_write(struct highlander_i2c_dev *dev)
+{
+        int i, cnt;
+        u16 data[16];
+
+        smbus_write_data(dev->buf, data, dev->buf_len);
+
+        cnt = (dev->buf_len + 1) >> 1;
+        for (i = 0; i < cnt; i++) {
+                iowrite16(data[i], dev->base + SMTRDR + (i * sizeof(u16)));
+                dev_dbg(dev->dev, "write data[%x] 0x%04x\n", i, data[i]);
+        }
+
+        if (highlander_i2c_wait_for_bbsy(dev))
+                return -EAGAIN;
+
+        highlander_i2c_start(dev);
+
+        return highlander_i2c_wait_xfer_done(dev);
+}
+
+static int highlander_i2c_smbus_xfer(struct i2c_adapter *adap, u16 addr,
+                                  unsigned short flags, char read_write,
+                                  u8 command, int size,
+                                  union i2c_smbus_data *data)
+{
+        struct highlander_i2c_dev *dev = i2c_get_adapdata(adap);
+        int read = read_write & I2C_SMBUS_READ;
+        u16 tmp;
+
+        init_completion(&dev->cmd_complete);
+
+        dev_dbg(dev->dev, "addr %04x, command %02x, read_write %d, size %d\n",
+                addr, command, read_write, size);
+
+        /*
+         * Set up the buffer and transfer size
+         */
+        switch (size) {
+        case I2C_SMBUS_BYTE_DATA:
+                dev->buf = &data->byte;
+                dev->buf_len = 1;
+                break;
+        case I2C_SMBUS_I2C_BLOCK_DATA:
+                dev->buf = &data->block[1];
+                dev->buf_len = data->block[0];
+                break;
+        default:
+                dev_err(dev->dev, "unsupported command %d\n", size);
+                return -EINVAL;
+        }
+
+        /*
+         * Encode the mode setting
+         */
+        tmp = ioread16(dev->base + SMMR);
+        tmp &= ~(SMMR_MODE0 | SMMR_MODE1);
+
+        switch (dev->buf_len) {
+        case 1:
+                /* default */
+                break;
+        case 8:
+                tmp |= SMMR_MODE0;
+                break;
+        case 16:
+                tmp |= SMMR_MODE1;
+                break;
+        case 32:
+                tmp |= (SMMR_MODE0 | SMMR_MODE1);
+                break;
+        default:
+                dev_err(dev->dev, "unsupported xfer size %d\n", dev->buf_len);
+                return -EINVAL;
+        }
+
+        iowrite16(tmp, dev->base + SMMR);
+
+        /* Ensure we're in a sane state */
+        highlander_i2c_done(dev);
+
+        /* Set slave address */
+        iowrite16((addr << 1) | read, dev->base + SMSMADR);
+
+        highlander_i2c_command(dev, command, dev->buf_len);
+
+        if (read)
+                return highlander_i2c_read(dev);
+        else
+                return highlander_i2c_write(dev);
+}
+
+static u32 highlander_i2c_func(struct i2c_adapter *adapter)
+{
+        return I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_I2C_BLOCK;
+}
+
+static const struct i2c_algorithm highlander_i2c_algo = {
+        .smbus_xfer     = highlander_i2c_smbus_xfer,
+        .functionality  = highlander_i2c_func,
+};
+
+static int __devinit highlander_i2c_probe(struct platform_device *pdev)
+{
+        struct highlander_i2c_dev *dev;
+        struct i2c_adapter *adap;
+        struct resource *res;
+        int ret;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (unlikely(!res)) {
+                dev_err(&pdev->dev, "no mem resource\n");
+                return -ENODEV;
+        }
+
+        dev = kzalloc(sizeof(struct highlander_i2c_dev), GFP_KERNEL);
+        if (unlikely(!dev))
+                return -ENOMEM;
+
+        dev->base = ioremap_nocache(res->start, res->end - res->start + 1);
+        if (unlikely(!dev->base)) {
+                ret = -ENXIO;
+                goto err;
+        }
+
+        dev->dev = &pdev->dev;
+        platform_set_drvdata(pdev, dev);
+
+        dev->irq = platform_get_irq(pdev, 0);
+        if (iic_force_poll)
+                dev->irq = 0;
+
+        if (dev->irq) {
+                ret = request_irq(dev->irq, highlander_i2c_irq, IRQF_DISABLED,
+                                  pdev->name, dev);
+                if (unlikely(ret))
+                        goto err_unmap;
+
+                highlander_i2c_irq_enable(dev);
+        } else {
+                dev_notice(&pdev->dev, "no IRQ, using polling mode\n");
+                highlander_i2c_irq_disable(dev);
+        }
+
+        dev->last_read_time = jiffies;  /* initial read jiffies */
+
+        highlander_i2c_setup(dev);
+
+        adap = &dev->adapter;
+        i2c_set_adapdata(adap, dev);
+        adap->owner = THIS_MODULE;
+        adap->class = I2C_CLASS_HWMON;
+        strlcpy(adap->name, "HL FPGA I2C adapter", sizeof(adap->name));
+        adap->algo = &highlander_i2c_algo;
+        adap->dev.parent = &pdev->dev;
+        adap->nr = pdev->id;
+
+        /*
+         * Reset the adapter
+         */
+        ret = highlander_i2c_reset(dev);
+        if (unlikely(ret)) {
+                dev_err(&pdev->dev, "controller didn't come up\n");
+                goto err_free_irq;
+        }
+
+        ret = i2c_add_numbered_adapter(adap);
+        if (unlikely(ret)) {
+                dev_err(&pdev->dev, "failure adding adapter\n");
+                goto err_free_irq;
+        }
+
+        return 0;
+
+err_free_irq:
+        if (dev->irq)
+                free_irq(dev->irq, dev);
+err_unmap:
+        iounmap(dev->base);
+err:
+        kfree(dev);
+
+        platform_set_drvdata(pdev, NULL);
+
+        return ret;
+}
+
+static int __devexit highlander_i2c_remove(struct platform_device *pdev)
+{
+        struct highlander_i2c_dev *dev = platform_get_drvdata(pdev);
+
+        i2c_del_adapter(&dev->adapter);
+
+        if (dev->irq)
+                free_irq(dev->irq, dev);
+
+        iounmap(dev->base);
+        kfree(dev);
+
+        platform_set_drvdata(pdev, NULL);
+
+        return 0;
+}
+
+static struct platform_driver highlander_i2c_driver = {
+        .driver         = {
+                .name   = "i2c-highlander",
+                .owner  = THIS_MODULE,
+        },
+
+        .probe          = highlander_i2c_probe,
+        .remove         = __devexit_p(highlander_i2c_remove),
+};
+
+static int __init highlander_i2c_init(void)
+{
+        return platform_driver_register(&highlander_i2c_driver);
+}
+
+static void __exit highlander_i2c_exit(void)
+{
+        platform_driver_unregister(&highlander_i2c_driver);
+}
+
+module_init(highlander_i2c_init);
+module_exit(highlander_i2c_exit);
+
+MODULE_AUTHOR("Paul Mundt");
+MODULE_DESCRIPTION("Renesas Highlander FPGA I2C/SMBus adapter");
+MODULE_LICENSE("GPL v2");
+
+module_param(iic_force_poll, bool, 0);
+module_param(iic_force_normal, bool, 0);
+module_param(iic_timeout, int, 0);
+module_param(iic_read_delay, int, 0);
+
+MODULE_PARM_DESC(iic_force_poll, "Force polling mode");
+MODULE_PARM_DESC(iic_force_normal,
+                 "Force normal mode (100 kHz), default is fast mode (400 kHz)");
+MODULE_PARM_DESC(iic_timeout, "Set timeout value in msecs (default 1000 ms)");
+MODULE_PARM_DESC(iic_read_delay,
+                 "Delay between data read cycles (default 0 ms)");
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 27443f073bc9..a9a45fcc8544 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -312,7 +312,6 @@ static struct i2c_adapter mpc_ops = {
         .name = "MPC adapter",
         .id = I2C_HW_MPC107,
         .algo = &mpc_algo,
-        .class = I2C_CLASS_HWMON | I2C_CLASS_SPD,
         .timeout = 1,
 };
 
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index e7eb7bf9ddec..608038d64f81 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -589,11 +589,16 @@ omap_i2c_probe(struct platform_device *pdev)
 
         dev->dev = &pdev->dev;
         dev->irq = irq->start;
-        dev->base = (void __iomem *) IO_ADDRESS(mem->start);
+        dev->base = ioremap(mem->start, mem->end - mem->start + 1);
+        if (!dev->base) {
+                r = -ENOMEM;
+                goto err_free_mem;
+        }
+
         platform_set_drvdata(pdev, dev);
 
         if ((r = omap_i2c_get_clocks(dev)) != 0)
-                goto err_free_mem;
+                goto err_iounmap;
 
         omap_i2c_unidle(dev);
 
@@ -640,6 +645,8 @@ err_unuse_clocks:
         omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
         omap_i2c_idle(dev);
         omap_i2c_put_clocks(dev);
+err_iounmap:
+        iounmap(dev->base);
 err_free_mem:
         platform_set_drvdata(pdev, NULL);
         kfree(dev);
@@ -661,6 +668,7 @@ omap_i2c_remove(struct platform_device *pdev)
         i2c_del_adapter(&dev->adapter);
         omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
         omap_i2c_put_clocks(dev);
+        iounmap(dev->base);
         kfree(dev);
         mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         release_mem_region(mem->start, (mem->end - mem->start) + 1);
diff --git a/drivers/i2c/busses/i2c-parport-light.c b/drivers/i2c/busses/i2c-parport-light.c
index c6faf9bdad18..b2b8380f6602 100644
--- a/drivers/i2c/busses/i2c-parport-light.c
+++ b/drivers/i2c/busses/i2c-parport-light.c
@@ -123,11 +123,6 @@ static struct i2c_adapter parport_adapter = {
 static int __devinit i2c_parport_probe(struct platform_device *pdev)
 {
         int err;
-        struct resource *res;
-
-        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
-        if (!request_region(res->start, res->end - res->start + 1, DRVNAME))
-                return -EBUSY;
 
         /* Reset hardware to a sane state (SCL and SDA high) */
         parport_setsda(NULL, 1);
@@ -138,29 +133,19 @@ static int __devinit i2c_parport_probe(struct platform_device *pdev)
 
         parport_adapter.dev.parent = &pdev->dev;
         err = i2c_bit_add_bus(&parport_adapter);
-        if (err) {
+        if (err)
                 dev_err(&pdev->dev, "Unable to register with I2C\n");
-                goto exit_region;
-        }
-        return 0;
-
-exit_region:
-        release_region(res->start, res->end - res->start + 1);
         return err;
 }
 
 static int __devexit i2c_parport_remove(struct platform_device *pdev)
 {
-        struct resource *res;
-
         i2c_del_adapter(&parport_adapter);
 
         /* Un-init if needed (power off...) */
         if (adapter_parm[type].init.val)
                 line_set(0, &adapter_parm[type].init);
 
-        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
-        release_region(res->start, res->end - res->start + 1);
         return 0;
 }
 
@@ -175,12 +160,6 @@ static struct platform_driver i2c_parport_driver = {
 
 static int __init i2c_parport_device_add(u16 address)
 {
-        struct resource res = {
-                .start  = address,
-                .end    = address + 2,
-                .name   = DRVNAME,
-                .flags  = IORESOURCE_IO,
-        };
         int err;
 
         pdev = platform_device_alloc(DRVNAME, -1);
@@ -190,13 +169,6 @@ static int __init i2c_parport_device_add(u16 address)
                 goto exit;
         }
 
-        err = platform_device_add_resources(pdev, &res, 1);
-        if (err) {
-                printk(KERN_ERR DRVNAME ": Device resource addition failed "
-                       "(%d)\n", err);
-                goto exit_device_put;
-        }
-
         err = platform_device_add(pdev);
         if (err) {
                 printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n",
@@ -231,13 +203,16 @@ static int __init i2c_parport_init(void)
                 base = DEFAULT_BASE;
         }
 
+        if (!request_region(base, 3, DRVNAME))
+                return -EBUSY;
+
         if (!adapter_parm[type].getscl.val)
                 parport_algo_data.getscl = NULL;
 
         /* Sets global pdev as a side effect */
         err = i2c_parport_device_add(base);
         if (err)
-                goto exit;
+                goto exit_release;
 
         err = platform_driver_register(&i2c_parport_driver);
         if (err)
@@ -247,7 +222,8 @@ static int __init i2c_parport_init(void)
 
 exit_device:
         platform_device_unregister(pdev);
-exit:
+exit_release:
+        release_region(base, 3);
         return err;
 }
 
@@ -255,6 +231,7 @@ static void __exit i2c_parport_exit(void)
 {
         platform_driver_unregister(&i2c_parport_driver);
         platform_device_unregister(pdev);
+        release_region(base, 3);
 }
 
 MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>");
diff --git a/drivers/i2c/busses/i2c-pca-isa.c b/drivers/i2c/busses/i2c-pca-isa.c
index a119784bae10..9eb76268ec78 100644
--- a/drivers/i2c/busses/i2c-pca-isa.c
+++ b/drivers/i2c/busses/i2c-pca-isa.c
@@ -36,8 +36,8 @@
 #define DRIVER "i2c-pca-isa"
 #define IO_SIZE 4
 
-static unsigned long base   = 0x330;
-static int irq    = 10;
+static unsigned long base;
+static int irq = -1;
 
 /* Data sheet recommends 59kHz for 100kHz operation due to variation
  * in the actual clock rate */
@@ -107,13 +107,26 @@ static struct i2c_adapter pca_isa_ops = {
         .timeout        = 100,
 };
 
+static int __devinit pca_isa_match(struct device *dev, unsigned int id)
+{
+        int match = base != 0;
+
+        if (match) {
+                if (irq <= -1)
+                        dev_warn(dev, "Using polling mode (specify irq)\n");
+        } else
+                dev_err(dev, "Please specify I/O base\n");
+
+        return match;
+}
+
 static int __devinit pca_isa_probe(struct device *dev, unsigned int id)
 {
         init_waitqueue_head(&pca_wait);
 
         dev_info(dev, "i/o base %#08lx. irq %d\n", base, irq);
 
-#ifdef CONFIG_PPC_MERGE
+#ifdef CONFIG_PPC
         if (check_legacy_ioport(base)) {
                 dev_err(dev, "I/O address %#08lx is not available\n", base);
                 goto out;
@@ -153,7 +166,7 @@ static int __devexit pca_isa_remove(struct device *dev, unsigned int id)
 {
         i2c_del_adapter(&pca_isa_ops);
 
-        if (irq > 0) {
+        if (irq > -1) {
                 disable_irq(irq);
                 free_irq(irq, &pca_isa_ops);
         }
@@ -163,6 +176,7 @@ static int __devexit pca_isa_remove(struct device *dev, unsigned int id)
 }
 
 static struct isa_driver pca_isa_driver = {
+        .match          = pca_isa_match,
         .probe          = pca_isa_probe,
         .remove         = __devexit_p(pca_isa_remove),
         .driver = {
diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c
index 862eb352a2d9..73dc52e114eb 100644
--- a/drivers/i2c/busses/i2c-viapro.c
+++ b/drivers/i2c/busses/i2c-viapro.c
@@ -36,6 +36,7 @@
    VT8237S            0x3372             yes
    VT8251             0x3287             yes
    CX700              0x8324             yes
+   VX800/VX820        0x8353             yes
 
    Note: we assume there can only be one device, with one SMBus interface.
 */
@@ -82,6 +83,7 @@ static unsigned short SMBHSTCFG = 0xD2;
 #define VT596_BYTE              0x04
 #define VT596_BYTE_DATA         0x08
 #define VT596_WORD_DATA         0x0C
+#define VT596_PROC_CALL         0x10
 #define VT596_BLOCK_DATA        0x14
 #define VT596_I2C_BLOCK_DATA    0x34
 
@@ -232,6 +234,12 @@ static s32 vt596_access(struct i2c_adapter *adap, u16 addr,
                 }
                 size = VT596_WORD_DATA;
                 break;
+        case I2C_SMBUS_PROC_CALL:
+                outb_p(command, SMBHSTCMD);
+                outb_p(data->word & 0xff, SMBHSTDAT0);
+                outb_p((data->word & 0xff00) >> 8, SMBHSTDAT1);
+                size = VT596_PROC_CALL;
+                break;
         case I2C_SMBUS_I2C_BLOCK_DATA:
                 if (!(vt596_features & FEATURE_I2CBLOCK))
                         goto exit_unsupported;
@@ -262,6 +270,9 @@ static s32 vt596_access(struct i2c_adapter *adap, u16 addr,
         if (status)
                 return status;
 
+        if (size == VT596_PROC_CALL)
+                read_write = I2C_SMBUS_READ;
+
         if ((read_write == I2C_SMBUS_WRITE) || (size == VT596_QUICK))
                 return 0;
 
@@ -271,6 +282,7 @@ static s32 vt596_access(struct i2c_adapter *adap, u16 addr,
                 data->byte = inb_p(SMBHSTDAT0);
                 break;
         case VT596_WORD_DATA:
+        case VT596_PROC_CALL:
                 data->word = inb_p(SMBHSTDAT0) + (inb_p(SMBHSTDAT1) << 8);
                 break;
         case VT596_I2C_BLOCK_DATA:
@@ -295,7 +307,7 @@ static u32 vt596_func(struct i2c_adapter *adapter)
 {
         u32 func = I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |
             I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA |
-            I2C_FUNC_SMBUS_BLOCK_DATA;
+            I2C_SMBUS_PROC_CALL | I2C_FUNC_SMBUS_BLOCK_DATA;
 
         if (vt596_features & FEATURE_I2CBLOCK)
                 func |= I2C_FUNC_SMBUS_I2C_BLOCK;
@@ -396,6 +408,7 @@ found:
 
         switch (pdev->device) {
         case PCI_DEVICE_ID_VIA_CX700:
+        case PCI_DEVICE_ID_VIA_VX800:
         case PCI_DEVICE_ID_VIA_8251:
         case PCI_DEVICE_ID_VIA_8237:
         case PCI_DEVICE_ID_VIA_8237A:
@@ -459,6 +472,8 @@ static struct pci_device_id vt596_ids[] = {
           .driver_data = SMBBA3 },
         { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_CX700),
           .driver_data = SMBBA3 },
+        { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX800),
+          .driver_data = SMBBA3 },
         { 0, }
 };
 
diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index a95cb9465d65..17356827b93d 100644
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -172,4 +172,15 @@ config MENELAUS
           and other features that are often used in portable devices like
           cell phones and PDAs.
 
+config MCU_MPC8349EMITX
+        tristate "MPC8349E-mITX MCU driver"
+        depends on I2C && PPC_83xx
+        select GENERIC_GPIO
+        select ARCH_REQUIRE_GPIOLIB
+        help
+          Say Y here to enable soft power-off functionality on the Freescale
+          boards with the MPC8349E-mITX-compatible MCU chips. This driver will
+          also register MCU GPIOs with the generic GPIO API, so you'll able
+          to use MCU pins as GPIOs.
+
 endmenu
diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index 39e3e69ed125..ca520fa143d6 100644
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_ISP1301_OMAP)	+= isp1301_omap.o
 obj-$(CONFIG_TPS65010)          += tps65010.o
 obj-$(CONFIG_MENELAUS)          += menelaus.o
 obj-$(CONFIG_SENSORS_TSL2550)   += tsl2550.o
+obj-$(CONFIG_MCU_MPC8349EMITX)  += mcu_mpc8349emitx.o
 
 ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)
 EXTRA_CFLAGS += -DDEBUG
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index 4655b794ebe3..28902ebd5539 100644
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -49,10 +49,9 @@ MODULE_LICENSE("GPL");
 
 struct isp1301 {
         struct otg_transceiver  otg;
-        struct i2c_client       client;
+        struct i2c_client       *client;
         void                    (*i2c_release)(struct device *dev);
 
-        int                     irq;
         int                     irq_type;
 
         u32                     last_otg_ctrl;
@@ -138,14 +137,6 @@ static inline void notresponding(struct isp1301 *isp)
 
 /*-------------------------------------------------------------------------*/
 
-/* only two addresses possible */
-#define ISP_BASE                0x2c
-static unsigned short normal_i2c[] = {
-        ISP_BASE, ISP_BASE + 1,
-        I2C_CLIENT_END };
-
-I2C_CLIENT_INSMOD;
-
 static struct i2c_driver isp1301_driver;
 
 /* smbus apis are used for portability */
@@ -153,25 +144,25 @@ static struct i2c_driver isp1301_driver;
 static inline u8
 isp1301_get_u8(struct isp1301 *isp, u8 reg)
 {
-        return i2c_smbus_read_byte_data(&isp->client, reg + 0);
+        return i2c_smbus_read_byte_data(isp->client, reg + 0);
 }
 
 static inline int
 isp1301_get_u16(struct isp1301 *isp, u8 reg)
 {
-        return i2c_smbus_read_word_data(&isp->client, reg);
+        return i2c_smbus_read_word_data(isp->client, reg);
 }
 
 static inline int
 isp1301_set_bits(struct isp1301 *isp, u8 reg, u8 bits)
 {
-        return i2c_smbus_write_byte_data(&isp->client, reg + 0, bits);
+        return i2c_smbus_write_byte_data(isp->client, reg + 0, bits);
 }
 
 static inline int
 isp1301_clear_bits(struct isp1301 *isp, u8 reg, u8 bits)
 {
-        return i2c_smbus_write_byte_data(&isp->client, reg + 1, bits);
+        return i2c_smbus_write_byte_data(isp->client, reg + 1, bits);
 }
 
 /*-------------------------------------------------------------------------*/
@@ -349,10 +340,10 @@ isp1301_defer_work(struct isp1301 *isp, int work)
         int status;
 
         if (isp && !test_and_set_bit(work, &isp->todo)) {
-                (void) get_device(&isp->client.dev);
+                (void) get_device(&isp->client->dev);
                 status = schedule_work(&isp->work);
                 if (!status && !isp->working)
-                        dev_vdbg(&isp->client.dev,
+                        dev_vdbg(&isp->client->dev,
                                 "work item %d may be lost\n", work);
         }
 }
@@ -1135,7 +1126,7 @@ isp1301_work(struct work_struct *work)
                 /* transfer state from otg engine to isp1301 */
                 if (test_and_clear_bit(WORK_UPDATE_ISP, &isp->todo)) {
                         otg_update_isp(isp);
-                        put_device(&isp->client.dev);
+                        put_device(&isp->client->dev);
                 }
 #endif
                 /* transfer state from isp1301 to otg engine */
@@ -1143,7 +1134,7 @@ isp1301_work(struct work_struct *work)
                         u8              stat = isp1301_clear_latch(isp);
 
                         isp_update_otg(isp, stat);
-                        put_device(&isp->client.dev);
+                        put_device(&isp->client->dev);
                 }
 
                 if (test_and_clear_bit(WORK_HOST_RESUME, &isp->todo)) {
@@ -1178,7 +1169,7 @@ isp1301_work(struct work_struct *work)
                         }
                         host_resume(isp);
                         // mdelay(10);
-                        put_device(&isp->client.dev);
+                        put_device(&isp->client->dev);
                 }
 
                 if (test_and_clear_bit(WORK_TIMER, &isp->todo)) {
@@ -1187,15 +1178,15 @@ isp1301_work(struct work_struct *work)
                         if (!stop)
                                 mod_timer(&isp->timer, jiffies + TIMER_JIFFIES);
 #endif
-                        put_device(&isp->client.dev);
+                        put_device(&isp->client->dev);
                 }
 
                 if (isp->todo)
-                        dev_vdbg(&isp->client.dev,
+                        dev_vdbg(&isp->client->dev,
                                 "work done, todo = 0x%lx\n",
                                 isp->todo);
                 if (stop) {
-                        dev_dbg(&isp->client.dev, "stop\n");
+                        dev_dbg(&isp->client->dev, "stop\n");
                         break;
                 }
         } while (isp->todo);
@@ -1219,7 +1210,7 @@ static void isp1301_release(struct device *dev)
 {
         struct isp1301  *isp;
 
-        isp = container_of(dev, struct isp1301, client.dev);
+        isp = dev_get_drvdata(dev);
 
         /* ugly -- i2c hijacks our memory hook to wait_for_completion() */
         if (isp->i2c_release)
@@ -1229,15 +1220,15 @@ static void isp1301_release(struct device *dev)
 
 static struct isp1301 *the_transceiver;
 
-static int isp1301_detach_client(struct i2c_client *i2c)
+static int __exit isp1301_remove(struct i2c_client *i2c)
 {
         struct isp1301  *isp;
 
-        isp = container_of(i2c, struct isp1301, client);
+        isp = i2c_get_clientdata(i2c);
 
         isp1301_clear_bits(isp, ISP1301_INTERRUPT_FALLING, ~0);
         isp1301_clear_bits(isp, ISP1301_INTERRUPT_RISING, ~0);
-        free_irq(isp->irq, isp);
+        free_irq(i2c->irq, isp);
 #ifdef  CONFIG_USB_OTG
         otg_unbind(isp);
 #endif
@@ -1252,7 +1243,7 @@ static int isp1301_detach_client(struct i2c_client *i2c)
         put_device(&i2c->dev);
         the_transceiver = 0;
 
-        return i2c_detach_client(i2c);
+        return 0;
 }
 
 /*-------------------------------------------------------------------------*/
@@ -1285,7 +1276,7 @@ static int isp1301_otg_enable(struct isp1301 *isp)
         isp1301_set_bits(isp, ISP1301_INTERRUPT_FALLING,
                 INTR_VBUS_VLD | INTR_SESS_VLD | INTR_ID_GND);
 
-        dev_info(&isp->client.dev, "ready for dual-role USB ...\n");
+        dev_info(&isp->client->dev, "ready for dual-role USB ...\n");
 
         return 0;
 }
@@ -1310,7 +1301,7 @@ isp1301_set_host(struct otg_transceiver *otg, struct usb_bus *host)
 
 #ifdef  CONFIG_USB_OTG
         isp->otg.host = host;
-        dev_dbg(&isp->client.dev, "registered host\n");
+        dev_dbg(&isp->client->dev, "registered host\n");
         host_suspend(isp);
         if (isp->otg.gadget)
                 return isp1301_otg_enable(isp);
@@ -1325,7 +1316,7 @@ isp1301_set_host(struct otg_transceiver *otg, struct usb_bus *host)
         if (machine_is_omap_h2())
                 isp1301_set_bits(isp, ISP1301_MODE_CONTROL_1, MC1_DAT_SE0);
 
-        dev_info(&isp->client.dev, "A-Host sessions ok\n");
+        dev_info(&isp->client->dev, "A-Host sessions ok\n");
         isp1301_set_bits(isp, ISP1301_INTERRUPT_RISING,
                 INTR_ID_GND);
         isp1301_set_bits(isp, ISP1301_INTERRUPT_FALLING,
@@ -1343,7 +1334,7 @@ isp1301_set_host(struct otg_transceiver *otg, struct usb_bus *host)
         return 0;
 
 #else
-        dev_dbg(&isp->client.dev, "host sessions not allowed\n");
+        dev_dbg(&isp->client->dev, "host sessions not allowed\n");
         return -EINVAL;
 #endif
 
@@ -1370,7 +1361,7 @@ isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)
 
 #ifdef  CONFIG_USB_OTG
         isp->otg.gadget = gadget;
-        dev_dbg(&isp->client.dev, "registered gadget\n");
+        dev_dbg(&isp->client->dev, "registered gadget\n");
         /* gadget driver may be suspended until vbus_connect () */
         if (isp->otg.host)
                 return isp1301_otg_enable(isp);
@@ -1395,7 +1386,7 @@ isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)
                 INTR_SESS_VLD);
         isp1301_set_bits(isp, ISP1301_INTERRUPT_FALLING,
                 INTR_VBUS_VLD);
-        dev_info(&isp->client.dev, "B-Peripheral sessions ok\n");
+        dev_info(&isp->client->dev, "B-Peripheral sessions ok\n");
         dump_regs(isp, __func__);
 
         /* If this has a Mini-AB connector, this mode is highly
@@ -1408,7 +1399,7 @@ isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)
         return 0;
 
 #else
-        dev_dbg(&isp->client.dev, "peripheral sessions not allowed\n");
+        dev_dbg(&isp->client->dev, "peripheral sessions not allowed\n");
         return -EINVAL;
 #endif
 }
@@ -1508,12 +1499,10 @@ isp1301_start_hnp(struct otg_transceiver *dev)
 
 /*-------------------------------------------------------------------------*/
 
-/* no error returns, they'd just make bus scanning stop */
-static int isp1301_probe(struct i2c_adapter *bus, int address, int kind)
+static int __init isp1301_probe(struct i2c_client *i2c)
 {
         int                     status;
         struct isp1301          *isp;
-        struct i2c_client       *i2c;
 
         if (the_transceiver)
                 return 0;
@@ -1527,37 +1516,19 @@ static int isp1301_probe(struct i2c_adapter *bus, int address, int kind)
         isp->timer.function = isp1301_timer;
         isp->timer.data = (unsigned long) isp;
 
-        isp->irq = -1;
-        isp->client.addr = address;
-        i2c_set_clientdata(&isp->client, isp);
-        isp->client.adapter = bus;
-        isp->client.driver = &isp1301_driver;
-        strlcpy(isp->client.name, DRIVER_NAME, I2C_NAME_SIZE);
-        i2c = &isp->client;
-
-        /* if this is a true probe, verify the chip ... */
-        if (kind < 0) {
-                status = isp1301_get_u16(isp, ISP1301_VENDOR_ID);
-                if (status != I2C_VENDOR_ID_PHILIPS) {
-                        dev_dbg(&bus->dev, "addr %d not philips id: %d\n",
-                                address, status);
-                        goto fail1;
-                }
-                status = isp1301_get_u16(isp, ISP1301_PRODUCT_ID);
-                if (status != I2C_PRODUCT_ID_PHILIPS_1301) {
-                        dev_dbg(&bus->dev, "%d not isp1301, %d\n",
-                                address, status);
-                        goto fail1;
-                }
-        }
+        i2c_set_clientdata(i2c, isp);
+        isp->client = i2c;
 
-        status = i2c_attach_client(i2c);
-        if (status < 0) {
-                dev_dbg(&bus->dev, "can't attach %s to device %d, err %d\n",
-                                DRIVER_NAME, address, status);
-fail1:
-                kfree(isp);
-                return 0;
+        /* verify the chip (shouldn't be necesary) */
+        status = isp1301_get_u16(isp, ISP1301_VENDOR_ID);
+        if (status != I2C_VENDOR_ID_PHILIPS) {
+                dev_dbg(&i2c->dev, "not philips id: %d\n", status);
+                goto fail;
+        }
+        status = isp1301_get_u16(isp, ISP1301_PRODUCT_ID);
+        if (status != I2C_PRODUCT_ID_PHILIPS_1301) {
+                dev_dbg(&i2c->dev, "not isp1301, %d\n", status);
+                goto fail;
         }
         isp->i2c_release = i2c->dev.release;
         i2c->dev.release = isp1301_release;
@@ -1586,7 +1557,7 @@ fail1:
         status = otg_bind(isp);
         if (status < 0) {
                 dev_dbg(&i2c->dev, "can't bind OTG\n");
-                goto fail2;
+                goto fail;
         }
 #endif
 
@@ -1599,26 +1570,21 @@ fail1:
 
                 /* IRQ wired at M14 */
                 omap_cfg_reg(M14_1510_GPIO2);
-                isp->irq = OMAP_GPIO_IRQ(2);
                 if (gpio_request(2, "isp1301") == 0)
                         gpio_direction_input(2);
                 isp->irq_type = IRQF_TRIGGER_FALLING;
         }
 
         isp->irq_type |= IRQF_SAMPLE_RANDOM;
-        status = request_irq(isp->irq, isp1301_irq,
+        status = request_irq(i2c->irq, isp1301_irq,
                         isp->irq_type, DRIVER_NAME, isp);
         if (status < 0) {
                 dev_dbg(&i2c->dev, "can't get IRQ %d, err %d\n",
-                                isp->irq, status);
-#ifdef  CONFIG_USB_OTG
-fail2:
-#endif
-                i2c_detach_client(i2c);
-                goto fail1;
+                                i2c->irq, status);
+                goto fail;
         }
 
-        isp->otg.dev = &isp->client.dev;
+        isp->otg.dev = &i2c->dev;
         isp->otg.label = DRIVER_NAME;
 
         isp->otg.set_host = isp1301_set_host,
@@ -1649,22 +1615,25 @@ fail2:
                         status);
 
         return 0;
-}
 
-static int isp1301_scan_bus(struct i2c_adapter *bus)
-{
-        if (!i2c_check_functionality(bus, I2C_FUNC_SMBUS_BYTE_DATA
-                        | I2C_FUNC_SMBUS_READ_WORD_DATA))
-                return -EINVAL;
-        return i2c_probe(bus, &addr_data, isp1301_probe);
+fail:
+        kfree(isp);
+        return -ENODEV;
 }
 
+static const struct i2c_device_id isp1301_id[] = {
+        { "isp1301_omap", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, isp1301_id);
+
 static struct i2c_driver isp1301_driver = {
         .driver = {
                 .name   = "isp1301_omap",
         },
-        .attach_adapter = isp1301_scan_bus,
-        .detach_client  = isp1301_detach_client,
+        .probe          = isp1301_probe,
+        .remove         = __exit_p(isp1301_remove),
+        .id_table       = isp1301_id,
 };
 
 /*-------------------------------------------------------------------------*/
diff --git a/drivers/i2c/chips/mcu_mpc8349emitx.c b/drivers/i2c/chips/mcu_mpc8349emitx.c
new file mode 100644
index 000000000000..82a9bcb858b6
--- /dev/null
+++ b/drivers/i2c/chips/mcu_mpc8349emitx.c
@@ -0,0 +1,209 @@
+/*
+ * Power Management and GPIO expander driver for MPC8349E-mITX-compatible MCU
+ *
+ * Copyright (c) 2008  MontaVista Software, Inc.
+ *
+ * Author: Anton Vorontsov <avorontsov@ru.mvista.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.
+ */
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/mutex.h>
+#include <linux/i2c.h>
+#include <linux/gpio.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+#include <asm/prom.h>
+#include <asm/machdep.h>
+
+/*
+ * I don't have specifications for the MCU firmware, I found this register
+ * and bits positions by the trial&error method.
+ */
+#define MCU_REG_CTRL    0x20
+#define MCU_CTRL_POFF   0x40
+
+#define MCU_NUM_GPIO    2
+
+struct mcu {
+        struct mutex lock;
+        struct device_node *np;
+        struct i2c_client *client;
+        struct of_gpio_chip of_gc;
+        u8 reg_ctrl;
+};
+
+static struct mcu *glob_mcu;
+
+static void mcu_power_off(void)
+{
+        struct mcu *mcu = glob_mcu;
+
+        pr_info("Sending power-off request to the MCU...\n");
+        mutex_lock(&mcu->lock);
+        i2c_smbus_write_byte_data(glob_mcu->client, MCU_REG_CTRL,
+                                  mcu->reg_ctrl | MCU_CTRL_POFF);
+        mutex_unlock(&mcu->lock);
+}
+
+static void mcu_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
+{
+        struct of_gpio_chip *of_gc = to_of_gpio_chip(gc);
+        struct mcu *mcu = container_of(of_gc, struct mcu, of_gc);
+        u8 bit = 1 << (4 + gpio);
+
+        mutex_lock(&mcu->lock);
+        if (val)
+                mcu->reg_ctrl &= ~bit;
+        else
+                mcu->reg_ctrl |= bit;
+
+        i2c_smbus_write_byte_data(mcu->client, MCU_REG_CTRL, mcu->reg_ctrl);
+        mutex_unlock(&mcu->lock);
+}
+
+static int mcu_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
+{
+        mcu_gpio_set(gc, gpio, val);
+        return 0;
+}
+
+static int mcu_gpiochip_add(struct mcu *mcu)
+{
+        struct device_node *np;
+        struct of_gpio_chip *of_gc = &mcu->of_gc;
+        struct gpio_chip *gc = &of_gc->gc;
+        int ret;
+
+        np = of_find_compatible_node(NULL, NULL, "fsl,mcu-mpc8349emitx");
+        if (!np)
+                return -ENODEV;
+
+        gc->owner = THIS_MODULE;
+        gc->label = np->full_name;
+        gc->can_sleep = 1;
+        gc->ngpio = MCU_NUM_GPIO;
+        gc->base = -1;
+        gc->set = mcu_gpio_set;
+        gc->direction_output = mcu_gpio_dir_out;
+        of_gc->gpio_cells = 2;
+        of_gc->xlate = of_gpio_simple_xlate;
+
+        np->data = of_gc;
+        mcu->np = np;
+
+        /*
+         * We don't want to lose the node, its ->data and ->full_name...
+         * So, if succeeded, we don't put the node here.
+         */
+        ret = gpiochip_add(gc);
+        if (ret)
+                of_node_put(np);
+        return ret;
+}
+
+static int mcu_gpiochip_remove(struct mcu *mcu)
+{
+        int ret;
+
+        ret = gpiochip_remove(&mcu->of_gc.gc);
+        if (ret)
+                return ret;
+        of_node_put(mcu->np);
+
+        return 0;
+}
+
+static int __devinit mcu_probe(struct i2c_client *client,
+                               const struct i2c_device_id *id)
+{
+        struct mcu *mcu;
+        int ret;
+
+        mcu = kzalloc(sizeof(*mcu), GFP_KERNEL);
+        if (!mcu)
+                return -ENOMEM;
+
+        mutex_init(&mcu->lock);
+        mcu->client = client;
+        i2c_set_clientdata(client, mcu);
+
+        ret = i2c_smbus_read_byte_data(mcu->client, MCU_REG_CTRL);
+        if (ret < 0)
+                goto err;
+        mcu->reg_ctrl = ret;
+
+        ret = mcu_gpiochip_add(mcu);
+        if (ret)
+                goto err;
+
+        /* XXX: this is potentially racy, but there is no lock for ppc_md */
+        if (!ppc_md.power_off) {
+                glob_mcu = mcu;
+                ppc_md.power_off = mcu_power_off;
+                dev_info(&client->dev, "will provide power-off service\n");
+        }
+
+        return 0;
+err:
+        kfree(mcu);
+        return ret;
+}
+
+static int __devexit mcu_remove(struct i2c_client *client)
+{
+        struct mcu *mcu = i2c_get_clientdata(client);
+        int ret;
+
+        if (glob_mcu == mcu) {
+                ppc_md.power_off = NULL;
+                glob_mcu = NULL;
+        }
+
+        ret = mcu_gpiochip_remove(mcu);
+        if (ret)
+                return ret;
+        i2c_set_clientdata(client, NULL);
+        kfree(mcu);
+        return 0;
+}
+
+static const struct i2c_device_id mcu_ids[] = {
+        { "mcu-mpc8349emitx", },
+        {},
+};
+MODULE_DEVICE_TABLE(i2c, mcu_ids);
+
+static struct i2c_driver mcu_driver = {
+        .driver = {
+                .name = "mcu-mpc8349emitx",
+                .owner = THIS_MODULE,
+        },
+        .probe = mcu_probe,
+        .remove = __devexit_p(mcu_remove),
+        .id_table = mcu_ids,
+};
+
+static int __init mcu_init(void)
+{
+        return i2c_add_driver(&mcu_driver);
+}
+module_init(mcu_init);
+
+static void __exit mcu_exit(void)
+{
+        i2c_del_driver(&mcu_driver);
+}
+module_exit(mcu_exit);
+
+MODULE_DESCRIPTION("Power Management and GPIO expander driver for "
+                   "MPC8349E-mITX-compatible MCU");
+MODULE_AUTHOR("Anton Vorontsov <avorontsov@ru.mvista.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c
index cf02e8fceb42..acf8b9d5f575 100644
--- a/drivers/i2c/chips/tps65010.c
+++ b/drivers/i2c/chips/tps65010.c
@@ -456,14 +456,17 @@ static irqreturn_t tps65010_irq(int irq, void *_tps)
 
 /* offsets 0..3 == GPIO1..GPIO4
  * offsets 4..5 == LED1/nPG, LED2 (we set one of the non-BLINK modes)
+ * offset 6 == vibrator motor driver
  */
 static void
 tps65010_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
 {
         if (offset < 4)
                 tps65010_set_gpio_out_value(offset + 1, value);
-        else
+        else if (offset < 6)
                 tps65010_set_led(offset - 3, value ? ON : OFF);
+        else
+                tps65010_set_vib(value);
 }
 
 static int
@@ -477,8 +480,10 @@ tps65010_output(struct gpio_chip *chip, unsigned offset, int value)
                 if (!(tps->outmask & (1 << offset)))
                         return -EINVAL;
                 tps65010_set_gpio_out_value(offset + 1, value);
-        } else
+        } else if (offset < 6)
                 tps65010_set_led(offset - 3, value ? ON : OFF);
+        else
+                tps65010_set_vib(value);
 
         return 0;
 }
@@ -646,7 +651,7 @@ static int tps65010_probe(struct i2c_client *client,
                 tps->chip.get = tps65010_gpio_get;
 
                 tps->chip.base = board->base;
-                tps->chip.ngpio = 6;
+                tps->chip.ngpio = 7;
                 tps->chip.can_sleep = 1;
 
                 status = gpiochip_add(&tps->chip);
@@ -675,6 +680,7 @@ static const struct i2c_device_id tps65010_id[] = {
         { "tps65011", TPS65011 },
         { "tps65012", TPS65012 },
         { "tps65013", TPS65013 },
+        { "tps65014", TPS65011 },       /* tps65011 charging at 6.5V max */
         { }
 };
 MODULE_DEVICE_TABLE(i2c, tps65010_id);
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index b346a687ab59..42e852d79ffa 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -437,6 +437,10 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
 {
         int res = 0, dummy;
 
+        /* Can't register until after driver model init */
+        if (unlikely(WARN_ON(!i2c_bus_type.p)))
+                return -EAGAIN;
+
         mutex_init(&adap->bus_lock);
         mutex_init(&adap->clist_lock);
         INIT_LIST_HEAD(&adap->clients);
@@ -696,6 +700,10 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver)
 {
         int res;
 
+        /* Can't register until after driver model init */
+        if (unlikely(WARN_ON(!i2c_bus_type.p)))
+                return -EAGAIN;
+
         /* new style driver methods can't mix with legacy ones */
         if (is_newstyle_driver(driver)) {
                 if (driver->attach_adapter || driver->detach_adapter
@@ -978,7 +986,10 @@ static void __exit i2c_exit(void)
         bus_unregister(&i2c_bus_type);
 }
 
-subsys_initcall(i2c_init);
+/* We must initialize early, because some subsystems register i2c drivers
+ * in subsys_initcall() code, but are linked (and initialized) before i2c.
+ */
+postcore_initcall(i2c_init);
 module_exit(i2c_exit);
 
 /* ----------------------------------------------------
@@ -1677,6 +1688,28 @@ s32 i2c_smbus_write_word_data(struct i2c_client *client, u8 command, u16 value)
 EXPORT_SYMBOL(i2c_smbus_write_word_data);
 
 /**
+ * i2c_smbus_process_call - SMBus "process call" protocol
+ * @client: Handle to slave device
+ * @command: Byte interpreted by slave
+ * @value: 16-bit "word" being written
+ *
+ * This executes the SMBus "process call" protocol, returning negative errno
+ * else a 16-bit unsigned "word" received from the device.
+ */
+s32 i2c_smbus_process_call(struct i2c_client *client, u8 command, u16 value)
+{
+        union i2c_smbus_data data;
+        int status;
+        data.word = value;
+
+        status = i2c_smbus_xfer(client->adapter, client->addr, client->flags,
+                                I2C_SMBUS_WRITE, command,
+                                I2C_SMBUS_PROC_CALL, &data);
+        return (status < 0) ? status : data.word;
+}
+EXPORT_SYMBOL(i2c_smbus_process_call);
+
+/**
  * i2c_smbus_read_block_data - SMBus "block read" protocol
  * @client: Handle to slave device
  * @command: Byte interpreted by slave
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index 307d976c9b69..c171988a9f51 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -521,9 +521,9 @@ static int i2cdev_attach_adapter(struct i2c_adapter *adap)
                 return PTR_ERR(i2c_dev);
 
         /* register this i2c device with the driver core */
-        i2c_dev->dev = device_create_drvdata(i2c_dev_class, &adap->dev,
-                                             MKDEV(I2C_MAJOR, adap->nr),
-                                             NULL, "i2c-%d", adap->nr);
+        i2c_dev->dev = device_create(i2c_dev_class, &adap->dev,
+                                     MKDEV(I2C_MAJOR, adap->nr), NULL,
+                                     "i2c-%d", adap->nr);
         if (IS_ERR(i2c_dev->dev)) {
                 res = PTR_ERR(i2c_dev->dev);
                 goto error;
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index b50b5dac95b0..74a369a6116f 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -4,7 +4,7 @@
 
 # Select HAVE_IDE if IDE is supported
 config HAVE_IDE
-        def_bool n
+        bool
 
 menuconfig IDE
         tristate "ATA/ATAPI/MFM/RLL support"
@@ -54,38 +54,6 @@ menuconfig IDE
 
 if IDE
 
-config BLK_DEV_IDE
-        tristate "Enhanced IDE/MFM/RLL disk/cdrom/tape/floppy support"
-        ---help---
-          If you say Y here, you will use the full-featured IDE driver to
-          control up to ten ATA/IDE interfaces, each being able to serve a
-          "master" and a "slave" device, for a total of up to twenty ATA/IDE
-          disk/cdrom/tape/floppy drives.
-
-          Useful information about large (>540 MB) IDE disks, multiple
-          interfaces, what to do if ATA/IDE devices are not automatically
-          detected, sound card ATA/IDE ports, module support, and other
-          topics, is contained in <file:Documentation/ide/ide.txt>. For detailed
-          information about hard drives, consult the Disk-HOWTO and the
-          Multi-Disk-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-
-          To fine-tune ATA/IDE drive/interface parameters for improved
-          performance, look for the hdparm package at
-          <ftp://ibiblio.org/pub/Linux/system/hardware/>.
-
-          To compile this driver as a module, choose M here and read
-          <file:Documentation/ide/ide.txt>. The module will be called ide-mod.
-          Do not compile this driver as a module if your root file system (the
-          one containing the directory /) is located on an IDE device.
-
-          If you have one or more IDE drives, say Y or M here. If your system
-          has no IDE drives, or if memory requirements are really tight, you
-          could say N here, and select the "Old hard disk driver" below
-          instead to save about 13 KB of memory in the kernel.
-
-if BLK_DEV_IDE
-
 comment "Please see Documentation/ide/ide.txt for help/info on IDE drives"
 
 config IDE_TIMINGS
@@ -348,7 +316,7 @@ config BLK_DEV_IDEPCI
 
 config IDEPCI_PCIBUS_ORDER
         bool "Probe IDE PCI devices in the PCI bus order (DEPRECATED)"
-        depends on BLK_DEV_IDE=y && BLK_DEV_IDEPCI
+        depends on IDE=y && BLK_DEV_IDEPCI
         default y
         help
           Probe IDE PCI devices in the order in which they appear on the
@@ -729,7 +697,7 @@ endif
 
 config BLK_DEV_IDE_PMAC
         tristate "PowerMac on-board IDE support"
-        depends on PPC_PMAC && IDE=y && BLK_DEV_IDE=y
+        depends on PPC_PMAC && IDE=y
         select IDE_TIMINGS
         help
           This driver provides support for the on-board IDE controller on
@@ -963,6 +931,4 @@ config BLK_DEV_IDEDMA
         def_bool BLK_DEV_IDEDMA_SFF || BLK_DEV_IDEDMA_PMAC || \
                  BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
 
-endif
-
 endif # IDE
diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index 308b8a12f314..ceaf779054ea 100644
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -5,24 +5,25 @@
 EXTRA_CFLAGS                            += -Idrivers/ide
 
 ide-core-y += ide.o ide-ioctls.o ide-io.o ide-iops.o ide-lib.o ide-probe.o \
-              ide-taskfile.o ide-pio-blacklist.o
+              ide-taskfile.o ide-park.o ide-pio-blacklist.o
 
 # core IDE code
 ide-core-$(CONFIG_IDE_TIMINGS)          += ide-timings.o
 ide-core-$(CONFIG_IDE_ATAPI)            += ide-atapi.o
 ide-core-$(CONFIG_BLK_DEV_IDEPCI)       += setup-pci.o
 ide-core-$(CONFIG_BLK_DEV_IDEDMA)       += ide-dma.o
+ide-core-$(CONFIG_BLK_DEV_IDEDMA_SFF)   += ide-dma-sff.o
 ide-core-$(CONFIG_IDE_PROC_FS)          += ide-proc.o
 ide-core-$(CONFIG_BLK_DEV_IDEACPI)      += ide-acpi.o
 
-obj-$(CONFIG_BLK_DEV_IDE)               += ide-core.o
+obj-$(CONFIG_IDE)                       += ide-core.o
 
 ifeq ($(CONFIG_IDE_ARM), y)
         ide-arm-core-y += arm/ide_arm.o
         obj-y += ide-arm-core.o
 endif
 
-obj-$(CONFIG_BLK_DEV_IDE)               += legacy/ pci/
+obj-$(CONFIG_IDE)                       += legacy/ pci/
 
 obj-$(CONFIG_IDEPCI_PCIBUS_ORDER)       += ide-scan-pci.o
 
@@ -31,15 +32,21 @@ ifeq ($(CONFIG_BLK_DEV_CMD640), y)
         obj-y += cmd640-core.o
 endif
 
-obj-$(CONFIG_BLK_DEV_IDE)               += ppc/
+obj-$(CONFIG_IDE)                       += ppc/
 obj-$(CONFIG_IDE_H8300)                 += h8300/
 obj-$(CONFIG_IDE_GENERIC)               += ide-generic.o
 obj-$(CONFIG_BLK_DEV_IDEPNP)            += ide-pnp.o
 
+ide-disk_mod-y += ide-disk.o ide-disk_ioctl.o
 ide-cd_mod-y += ide-cd.o ide-cd_ioctl.o ide-cd_verbose.o
 ide-floppy_mod-y += ide-floppy.o ide-floppy_ioctl.o
 
-obj-$(CONFIG_BLK_DEV_IDEDISK)           += ide-disk.o
+ifeq ($(CONFIG_IDE_PROC_FS), y)
+        ide-disk_mod-y += ide-disk_proc.o
+        ide-floppy_mod-y += ide-floppy_proc.o
+endif
+
+obj-$(CONFIG_BLK_DEV_IDEDISK)           += ide-disk_mod.o
 obj-$(CONFIG_BLK_DEV_IDECD)             += ide-cd_mod.o
 obj-$(CONFIG_BLK_DEV_IDEFLOPPY)         += ide-floppy_mod.o
 obj-$(CONFIG_BLK_DEV_IDETAPE)           += ide-tape.o
@@ -54,4 +61,4 @@ ifeq ($(CONFIG_BLK_DEV_PLATFORM), y)
         obj-y += ide-platform-core.o
 endif
 
-obj-$(CONFIG_BLK_DEV_IDE)               += arm/ mips/
+obj-$(CONFIG_IDE)                       += arm/ mips/
diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c
index 70f5b164828b..76bdc9a27f6f 100644
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
@@ -372,25 +372,6 @@ static int icside_dma_test_irq(ide_drive_t *drive)
                         ICS_ARCIN_V6_INTRSTAT_1)) & 1;
 }
 
-static void icside_dma_timeout(ide_drive_t *drive)
-{
-        ide_hwif_t *hwif = drive->hwif;
-
-        printk(KERN_ERR "%s: DMA timeout occurred: ", drive->name);
-
-        if (icside_dma_test_irq(drive))
-                return;
-
-        ide_dump_status(drive, "DMA timeout", hwif->tp_ops->read_status(hwif));
-
-        icside_dma_end(drive);
-}
-
-static void icside_dma_lost_irq(ide_drive_t *drive)
-{
-        printk(KERN_ERR "%s: IRQ lost\n", drive->name);
-}
-
 static int icside_dma_init(ide_hwif_t *hwif, const struct ide_port_info *d)
 {
         hwif->dmatable_cpu      = NULL;
@@ -406,8 +387,8 @@ static const struct ide_dma_ops icside_v6_dma_ops = {
         .dma_start              = icside_dma_start,
         .dma_end                = icside_dma_end,
         .dma_test_irq           = icside_dma_test_irq,
-        .dma_timeout            = icside_dma_timeout,
-        .dma_lost_irq           = icside_dma_lost_irq,
+        .dma_timeout            = ide_dma_timeout,
+        .dma_lost_irq           = ide_dma_lost_irq,
 };
 #else
 #define icside_v6_dma_ops NULL
diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c
index bde7a585f198..e2cdd2e9cdec 100644
--- a/drivers/ide/h8300/ide-h8300.c
+++ b/drivers/ide/h8300/ide-h8300.c
@@ -80,7 +80,7 @@ static void h8300_tf_load(ide_drive_t *drive, ide_task_t *task)
                 outb(tf->lbah, io_ports->lbah_addr);
 
         if (task->tf_flags & IDE_TFLAG_OUT_DEVICE)
-                outb((tf->device & HIHI) | drive->select.all,
+                outb((tf->device & HIHI) | drive->select,
                      io_ports->device_addr);
 }
 
diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c
index 2427c380b3dc..244a8a052ce8 100644
--- a/drivers/ide/ide-acpi.c
+++ b/drivers/ide/ide-acpi.c
@@ -290,7 +290,7 @@ static int do_drive_get_GTF(ide_drive_t *drive,
         DEBPRINT("ENTER: %s at %s, port#: %d, hard_port#: %d\n",
                  hwif->name, dev->bus_id, port, hwif->channel);
 
-        if (!drive->present) {
+        if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0) {
                 DEBPRINT("%s drive %d:%d not present\n",
                          hwif->name, hwif->channel, port);
                 goto out;
@@ -420,8 +420,9 @@ static int do_drive_set_taskfiles(ide_drive_t *drive,
 
         DEBPRINT("ENTER: %s, hard_port#: %d\n", drive->name, drive->dn);
 
-        if (!drive->present)
+        if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0)
                 goto out;
+
         if (!gtf_count)         /* shouldn't be here */
                 goto out;
 
@@ -660,7 +661,8 @@ void ide_acpi_set_state(ide_hwif_t *hwif, int on)
                 if (!drive->acpidata->obj_handle)
                         drive->acpidata->obj_handle = ide_acpi_drive_get_handle(drive);
 
-                if (drive->acpidata->obj_handle && drive->present) {
+                if (drive->acpidata->obj_handle &&
+                    (drive->dev_flags & IDE_DFLAG_PRESENT)) {
                         acpi_bus_set_power(drive->acpidata->obj_handle,
                                 on? ACPI_STATE_D0: ACPI_STATE_D3);
                 }
@@ -720,7 +722,7 @@ void ide_acpi_port_init_devices(ide_hwif_t *hwif)
 
                 memset(drive->acpidata, 0, sizeof(*drive->acpidata));
 
-                if (!drive->present)
+                if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0)
                         continue;
 
                 err = taskfile_lib_get_identify(drive, drive->acpidata->idbuff);
@@ -745,7 +747,7 @@ void ide_acpi_port_init_devices(ide_hwif_t *hwif)
         for (i = 0; i < MAX_DRIVES; i++) {
                 drive = &hwif->drives[i];
 
-                if (drive->present)
+                if (drive->dev_flags & IDE_DFLAG_PRESENT)
                         /* Execute ACPI startup code */
                         ide_acpi_exec_tfs(drive);
         }
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index 608c5bade929..2e305714c209 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -124,8 +124,8 @@ EXPORT_SYMBOL_GPL(ide_init_pc);
  * the current request, so that it will be processed immediately, on the next
  * pass through the driver.
  */
-void ide_queue_pc_head(ide_drive_t *drive, struct gendisk *disk,
-                       struct ide_atapi_pc *pc, struct request *rq)
+static void ide_queue_pc_head(ide_drive_t *drive, struct gendisk *disk,
+                              struct ide_atapi_pc *pc, struct request *rq)
 {
         blk_rq_init(NULL, rq);
         rq->cmd_type = REQ_TYPE_SPECIAL;
@@ -137,7 +137,6 @@ void ide_queue_pc_head(ide_drive_t *drive, struct gendisk *disk,
                 rq->cmd[13] = REQ_IDETAPE_PC1;
         ide_do_drive_cmd(drive, rq);
 }
-EXPORT_SYMBOL_GPL(ide_queue_pc_head);
 
 /*
  * Add a special packet command request to the tail of the request queue,
@@ -203,25 +202,80 @@ int ide_set_media_lock(ide_drive_t *drive, struct gendisk *disk, int on)
 }
 EXPORT_SYMBOL_GPL(ide_set_media_lock);
 
-/* TODO: unify the code thus making some arguments go away */
-ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc,
-        ide_handler_t *handler, unsigned int timeout, ide_expiry_t *expiry,
-        void (*update_buffers)(ide_drive_t *, struct ide_atapi_pc *),
-        void (*retry_pc)(ide_drive_t *), void (*dsc_handle)(ide_drive_t *),
-        int (*io_buffers)(ide_drive_t *, struct ide_atapi_pc *, unsigned, int))
+void ide_create_request_sense_cmd(ide_drive_t *drive, struct ide_atapi_pc *pc)
 {
+        ide_init_pc(pc);
+        pc->c[0] = REQUEST_SENSE;
+        if (drive->media == ide_floppy) {
+                pc->c[4] = 255;
+                pc->req_xfer = 18;
+        } else {
+                pc->c[4] = 20;
+                pc->req_xfer = 20;
+        }
+}
+EXPORT_SYMBOL_GPL(ide_create_request_sense_cmd);
+
+/*
+ * Called when an error was detected during the last packet command.
+ * We queue a request sense packet command in the head of the request list.
+ */
+void ide_retry_pc(ide_drive_t *drive, struct gendisk *disk)
+{
+        struct request *rq = &drive->request_sense_rq;
+        struct ide_atapi_pc *pc = &drive->request_sense_pc;
+
+        (void)ide_read_error(drive);
+        ide_create_request_sense_cmd(drive, pc);
+        if (drive->media == ide_tape)
+                set_bit(IDE_AFLAG_IGNORE_DSC, &drive->atapi_flags);
+        ide_queue_pc_head(drive, disk, pc, rq);
+}
+EXPORT_SYMBOL_GPL(ide_retry_pc);
+
+int ide_scsi_expiry(ide_drive_t *drive)
+{
+        struct ide_atapi_pc *pc = drive->pc;
+
+        debug_log("%s called for %lu at %lu\n", __func__,
+                  pc->scsi_cmd->serial_number, jiffies);
+
+        pc->flags |= PC_FLAG_TIMEDOUT;
+
+        return 0; /* we do not want the IDE subsystem to retry */
+}
+EXPORT_SYMBOL_GPL(ide_scsi_expiry);
+
+/*
+ * This is the usual interrupt handler which will be called during a packet
+ * command.  We will transfer some of the data (as requested by the drive)
+ * and will re-point interrupt handler to us.
+ */
+static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
+{
+        struct ide_atapi_pc *pc = drive->pc;
         ide_hwif_t *hwif = drive->hwif;
         struct request *rq = hwif->hwgroup->rq;
         const struct ide_tp_ops *tp_ops = hwif->tp_ops;
         xfer_func_t *xferfunc;
-        unsigned int temp;
+        ide_expiry_t *expiry;
+        unsigned int timeout, temp;
         u16 bcount;
-        u8 stat, ireason, scsi = drive->scsi;
+        u8 stat, ireason, scsi = !!(drive->dev_flags & IDE_DFLAG_SCSI), dsc = 0;
 
         debug_log("Enter %s - interrupt handler\n", __func__);
 
+        if (scsi) {
+                timeout = ide_scsi_get_timeout(pc);
+                expiry = ide_scsi_expiry;
+        } else {
+                timeout = (drive->media == ide_floppy) ? WAIT_FLOPPY_CMD
+                                                       : WAIT_TAPE_CMD;
+                expiry = NULL;
+        }
+
         if (pc->flags & PC_FLAG_TIMEDOUT) {
-                drive->pc_callback(drive);
+                drive->pc_callback(drive, 0);
                 return ide_stopped;
         }
 
@@ -238,8 +292,8 @@ ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc,
                         pc->flags |= PC_FLAG_DMA_ERROR;
                 } else {
                         pc->xferred = pc->req_xfer;
-                        if (update_buffers)
-                                update_buffers(drive, pc);
+                        if (drive->pc_update_buffers)
+                                drive->pc_update_buffers(drive, pc);
                 }
                 debug_log("%s: DMA finished\n", drive->name);
         }
@@ -276,21 +330,19 @@ ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc,
                         debug_log("[cmd %x]: check condition\n", rq->cmd[0]);
 
                         /* Retry operation */
-                        retry_pc(drive);
+                        ide_retry_pc(drive, rq->rq_disk);
 
                         /* queued, but not started */
                         return ide_stopped;
                 }
 cmd_finished:
                 pc->error = 0;
-                if ((pc->flags & PC_FLAG_WAIT_FOR_DSC) &&
-                    (stat & ATA_DSC) == 0) {
-                        dsc_handle(drive);
-                        return ide_stopped;
-                }
+
+                if ((pc->flags & PC_FLAG_WAIT_FOR_DSC) && (stat & ATA_DSC) == 0)
+                        dsc = 1;
 
                 /* Command finished - Call the callback function */
-                drive->pc_callback(drive);
+                drive->pc_callback(drive, dsc);
 
                 return ide_stopped;
         }
@@ -336,7 +388,8 @@ cmd_finished:
                                         temp = 0;
                                 if (temp) {
                                         if (pc->sg)
-                                                io_buffers(drive, pc, temp, 0);
+                                                drive->pc_io_buffers(drive, pc,
+                                                                     temp, 0);
                                         else
                                                 tp_ops->input_data(drive, NULL,
                                                         pc->cur_pos, temp);
@@ -348,9 +401,7 @@ cmd_finished:
                                 pc->xferred += temp;
                                 pc->cur_pos += temp;
                                 ide_pad_transfer(drive, 0, bcount - temp);
-                                ide_set_handler(drive, handler, timeout,
-                                                expiry);
-                                return ide_started;
+                                goto next_irq;
                         }
                         debug_log("The device wants to send us more data than "
                                   "expected - allowing transfer\n");
@@ -362,7 +413,7 @@ cmd_finished:
         if ((drive->media == ide_floppy && !scsi && !pc->buf) ||
             (drive->media == ide_tape && !scsi && pc->bh) ||
             (scsi && pc->sg)) {
-                int done = io_buffers(drive, pc, bcount,
+                int done = drive->pc_io_buffers(drive, pc, bcount,
                                   !!(pc->flags & PC_FLAG_WRITING));
 
                 /* FIXME: don't do partial completions */
@@ -377,12 +428,11 @@ cmd_finished:
 
         debug_log("[cmd %x] transferred %d bytes on that intr.\n",
                   rq->cmd[0], bcount);
-
+next_irq:
         /* And set the interrupt handler again */
-        ide_set_handler(drive, handler, timeout, expiry);
+        ide_set_handler(drive, ide_pc_intr, timeout, expiry);
         return ide_started;
 }
-EXPORT_SYMBOL_GPL(ide_pc_intr);
 
 static u8 ide_read_ireason(ide_drive_t *drive)
 {
@@ -418,12 +468,22 @@ static u8 ide_wait_ireason(ide_drive_t *drive, u8 ireason)
         return ireason;
 }
 
-ide_startstop_t ide_transfer_pc(ide_drive_t *drive, struct ide_atapi_pc *pc,
-                                ide_handler_t *handler, unsigned int timeout,
-                                ide_expiry_t *expiry)
+static int ide_delayed_transfer_pc(ide_drive_t *drive)
 {
+        /* Send the actual packet */
+        drive->hwif->tp_ops->output_data(drive, NULL, drive->pc->c, 12);
+
+        /* Timeout for the packet command */
+        return WAIT_FLOPPY_CMD;
+}
+
+static ide_startstop_t ide_transfer_pc(ide_drive_t *drive)
+{
+        struct ide_atapi_pc *pc = drive->pc;
         ide_hwif_t *hwif = drive->hwif;
         struct request *rq = hwif->hwgroup->rq;
+        ide_expiry_t *expiry;
+        unsigned int timeout;
         ide_startstop_t startstop;
         u8 ireason;
 
@@ -434,7 +494,8 @@ ide_startstop_t ide_transfer_pc(ide_drive_t *drive, struct ide_atapi_pc *pc,
         }
 
         ireason = ide_read_ireason(drive);
-        if (drive->media == ide_tape && !drive->scsi)
+        if (drive->media == ide_tape &&
+            (drive->dev_flags & IDE_DFLAG_SCSI) == 0)
                 ireason = ide_wait_ireason(drive, ireason);
 
         if ((ireason & ATAPI_COD) == 0 || (ireason & ATAPI_IO)) {
@@ -443,8 +504,27 @@ ide_startstop_t ide_transfer_pc(ide_drive_t *drive, struct ide_atapi_pc *pc,
                 return ide_do_reset(drive);
         }
 
+        /*
+         * If necessary schedule the packet transfer to occur 'timeout'
+         * miliseconds later in ide_delayed_transfer_pc() after the device
+         * says it's ready for a packet.
+         */
+        if (drive->atapi_flags & IDE_AFLAG_ZIP_DRIVE) {
+                timeout = drive->pc_delay;
+                expiry = &ide_delayed_transfer_pc;
+        } else {
+                if (drive->dev_flags & IDE_DFLAG_SCSI) {
+                        timeout = ide_scsi_get_timeout(pc);
+                        expiry = ide_scsi_expiry;
+                } else {
+                        timeout = (drive->media == ide_floppy) ? WAIT_FLOPPY_CMD
+                                                               : WAIT_TAPE_CMD;
+                        expiry = NULL;
+                }
+        }
+
         /* Set the interrupt routine */
-        ide_set_handler(drive, handler, timeout, expiry);
+        ide_set_handler(drive, ide_pc_intr, timeout, expiry);
 
         /* Begin DMA, if necessary */
         if (pc->flags & PC_FLAG_DMA_OK) {
@@ -458,22 +538,22 @@ ide_startstop_t ide_transfer_pc(ide_drive_t *drive, struct ide_atapi_pc *pc,
 
         return ide_started;
 }
-EXPORT_SYMBOL_GPL(ide_transfer_pc);
 
-ide_startstop_t ide_issue_pc(ide_drive_t *drive, struct ide_atapi_pc *pc,
-                             ide_handler_t *handler, unsigned int timeout,
+ide_startstop_t ide_issue_pc(ide_drive_t *drive, unsigned int timeout,
                              ide_expiry_t *expiry)
 {
+        struct ide_atapi_pc *pc = drive->pc;
         ide_hwif_t *hwif = drive->hwif;
+        u32 tf_flags;
         u16 bcount;
-        u8 dma = 0;
+        u8 scsi = !!(drive->dev_flags & IDE_DFLAG_SCSI);
 
         /* We haven't transferred any data yet */
         pc->xferred = 0;
         pc->cur_pos = pc->buf;
 
         /* Request to transfer the entire buffer at once */
-        if (drive->media == ide_tape && !drive->scsi)
+        if (drive->media == ide_tape && scsi == 0)
                 bcount = pc->req_xfer;
         else
                 bcount = min(pc->req_xfer, 63 * 1024);
@@ -483,28 +563,35 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, struct ide_atapi_pc *pc,
                 ide_dma_off(drive);
         }
 
-        if ((pc->flags & PC_FLAG_DMA_OK) && drive->using_dma) {
-                if (drive->scsi)
+        if ((pc->flags & PC_FLAG_DMA_OK) &&
+            (drive->dev_flags & IDE_DFLAG_USING_DMA)) {
+                if (scsi)
                         hwif->sg_mapped = 1;
-                dma = !hwif->dma_ops->dma_setup(drive);
-                if (drive->scsi)
+                drive->dma = !hwif->dma_ops->dma_setup(drive);
+                if (scsi)
                         hwif->sg_mapped = 0;
         }
 
-        if (!dma)
+        if (!drive->dma)
                 pc->flags &= ~PC_FLAG_DMA_OK;
 
-        ide_pktcmd_tf_load(drive, drive->scsi ? 0 : IDE_TFLAG_OUT_DEVICE,
-                           bcount, dma);
+        if (scsi)
+                tf_flags = 0;
+        else if (drive->media == ide_cdrom || drive->media == ide_optical)
+                tf_flags = IDE_TFLAG_OUT_NSECT | IDE_TFLAG_OUT_LBAL;
+        else
+                tf_flags = IDE_TFLAG_OUT_DEVICE;
+
+        ide_pktcmd_tf_load(drive, tf_flags, bcount, drive->dma);
 
         /* Issue the packet command */
         if (drive->atapi_flags & IDE_AFLAG_DRQ_INTERRUPT) {
-                ide_execute_command(drive, ATA_CMD_PACKET, handler,
+                ide_execute_command(drive, ATA_CMD_PACKET, ide_transfer_pc,
                                     timeout, NULL);
                 return ide_started;
         } else {
                 ide_execute_pkt_cmd(drive);
-                return (*handler)(drive);
+                return ide_transfer_pc(drive);
         }
 }
 EXPORT_SYMBOL_GPL(ide_issue_pc);
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 465a92ca0179..3308b1cd3a33 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -23,6 +23,9 @@
  *      Documentation/ide/ChangeLog.ide-cd.1994-2004
  */
 
+#define DRV_NAME "ide-cd"
+#define PFX DRV_NAME ": "
+
 #define IDECD_VERSION "5.00"
 
 #include <linux/module.h>
@@ -50,12 +53,15 @@
 
 #include "ide-cd.h"
 
-static DEFINE_MUTEX(idecd_ref_mutex);
+#define IDECD_DEBUG_LOG         1
 
-#define to_ide_cd(obj) container_of(obj, struct cdrom_info, kref)
+#if IDECD_DEBUG_LOG
+#define ide_debug_log(lvl, fmt, args...) __ide_debug_log(lvl, fmt, args)
+#else
+#define ide_debug_log(lvl, fmt, args...) do {} while (0)
+#endif
 
-#define ide_cd_g(disk) \
-        container_of((disk)->private_data, struct cdrom_info, driver)
+static DEFINE_MUTEX(idecd_ref_mutex);
 
 static void ide_cd_release(struct kref *);
 
@@ -64,7 +70,7 @@ static struct cdrom_info *ide_cd_get(struct gendisk *disk)
         struct cdrom_info *cd = NULL;
 
         mutex_lock(&idecd_ref_mutex);
-        cd = ide_cd_g(disk);
+        cd = ide_drv_g(disk, cdrom_info);
         if (cd) {
                 if (ide_device_get(cd->drive))
                         cd = NULL;
@@ -102,6 +108,9 @@ static int cdrom_log_sense(ide_drive_t *drive, struct request *rq,
 {
         int log = 0;
 
+        ide_debug_log(IDE_DBG_SENSE, "Call %s, sense_key: 0x%x\n", __func__,
+                      sense->sense_key);
+
         if (!sense || !rq || (rq->cmd_flags & REQ_QUIET))
                 return 0;
 
@@ -150,6 +159,14 @@ static void cdrom_analyze_sense_data(ide_drive_t *drive,
         unsigned long bio_sectors;
         struct cdrom_info *info = drive->driver_data;
 
+        ide_debug_log(IDE_DBG_SENSE, "Call %s, error_code: 0x%x, "
+                        "sense_key: 0x%x\n", __func__, sense->error_code,
+                        sense->sense_key);
+
+        if (failed_command)
+                ide_debug_log(IDE_DBG_SENSE, "%s: failed cmd: 0x%x\n",
+                                __func__, failed_command->cmd[0]);
+
         if (!cdrom_log_sense(drive, failed_command, sense))
                 return;
 
@@ -200,6 +217,8 @@ static void cdrom_queue_request_sense(ide_drive_t *drive, void *sense,
         struct cdrom_info *info         = drive->driver_data;
         struct request *rq              = &info->request_sense_request;
 
+        ide_debug_log(IDE_DBG_SENSE, "Call %s\n", __func__);
+
         if (sense == NULL)
                 sense = &info->sense_data;
 
@@ -219,6 +238,10 @@ static void cdrom_queue_request_sense(ide_drive_t *drive, void *sense,
         /* NOTE! Save the failed command in "rq->buffer" */
         rq->buffer = (void *) failed_command;
 
+        if (failed_command)
+                ide_debug_log(IDE_DBG_SENSE, "failed_cmd: 0x%x\n",
+                              failed_command->cmd[0]);
+
         ide_do_drive_cmd(drive, rq);
 }
 
@@ -227,6 +250,10 @@ static void cdrom_end_request(ide_drive_t *drive, int uptodate)
         struct request *rq = HWGROUP(drive)->rq;
         int nsectors = rq->hard_cur_sectors;
 
+        ide_debug_log(IDE_DBG_FUNC, "Call %s, cmd: 0x%x, uptodate: 0x%x, "
+                      "nsectors: %d\n", __func__, rq->cmd[0], uptodate,
+                      nsectors);
+
         if (blk_sense_request(rq) && uptodate) {
                 /*
                  * For REQ_TYPE_SENSE, "rq->buffer" points to the original
@@ -269,6 +296,9 @@ static void cdrom_end_request(ide_drive_t *drive, int uptodate)
         if (!nsectors)
                 nsectors = 1;
 
+        ide_debug_log(IDE_DBG_FUNC, "Exit %s, uptodate: 0x%x, nsectors: %d\n",
+                      __func__, uptodate, nsectors);
+
         ide_end_request(drive, uptodate, nsectors);
 }
 
@@ -304,11 +334,15 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)
         sense_key = err >> 4;
 
         if (rq == NULL) {
-                printk(KERN_ERR "%s: missing rq in %s\n",
+                printk(KERN_ERR PFX "%s: missing rq in %s\n",
                                 drive->name, __func__);
                 return 1;
         }
 
+        ide_debug_log(IDE_DBG_RQ, "%s: stat: 0x%x, good_stat: 0x%x, "
+                      "rq->cmd_type: 0x%x, err: 0x%x\n", __func__, stat,
+                      good_stat, rq->cmd_type, err);
+
         if (blk_sense_request(rq)) {
                 /*
                  * We got an error trying to get sense info from the drive
@@ -374,7 +408,8 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)
                                 cdrom_saw_media_change(drive);
 
                                 /* fail the request */
-                                printk(KERN_ERR "%s: tray open\n", drive->name);
+                                printk(KERN_ERR PFX "%s: tray open\n",
+                                                drive->name);
                                 do_end_request = 1;
                         } else {
                                 struct cdrom_info *info = drive->driver_data;
@@ -460,7 +495,7 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)
                 if (stat & ATA_ERR)
                         cdrom_queue_request_sense(drive, NULL, NULL);
         } else {
-                blk_dump_rq_flags(rq, "ide-cd: bad rq");
+                blk_dump_rq_flags(rq, PFX "bad rq");
                 cdrom_end_request(drive, 0);
         }
 
@@ -488,6 +523,9 @@ static int cdrom_timer_expiry(ide_drive_t *drive)
         struct request *rq = HWGROUP(drive)->rq;
         unsigned long wait = 0;
 
+        ide_debug_log(IDE_DBG_RQ, "Call %s: rq->cmd[0]: 0x%x\n", __func__,
+                      rq->cmd[0]);
+
         /*
          * Some commands are *slow* and normally take a long time to complete.
          * Usually we can use the ATAPI "disconnect" to bypass this, but not all
@@ -504,7 +542,7 @@ static int cdrom_timer_expiry(ide_drive_t *drive)
                 break;
         default:
                 if (!(rq->cmd_flags & REQ_QUIET))
-                        printk(KERN_INFO "ide-cd: cmd 0x%x timed out\n",
+                        printk(KERN_INFO PFX "cmd 0x%x timed out\n",
                                          rq->cmd[0]);
                 wait = 0;
                 break;
@@ -524,20 +562,21 @@ static ide_startstop_t cdrom_start_packet_command(ide_drive_t *drive,
                                                   int xferlen,
                                                   ide_handler_t *handler)
 {
-        struct cdrom_info *info = drive->driver_data;
         ide_hwif_t *hwif = drive->hwif;
 
+        ide_debug_log(IDE_DBG_PC, "Call %s, xferlen: %d\n", __func__, xferlen);
+
         /* FIXME: for Virtual DMA we must check harder */
-        if (info->dma)
-                info->dma = !hwif->dma_ops->dma_setup(drive);
+        if (drive->dma)
+                drive->dma = !hwif->dma_ops->dma_setup(drive);
 
         /* set up the controller registers */
         ide_pktcmd_tf_load(drive, IDE_TFLAG_OUT_NSECT | IDE_TFLAG_OUT_LBAL,
-                           xferlen, info->dma);
+                           xferlen, drive->dma);
 
         if (drive->atapi_flags & IDE_AFLAG_DRQ_INTERRUPT) {
                 /* waiting for CDB interrupt, not DMA yet. */
-                if (info->dma)
+                if (drive->dma)
                         drive->waiting_for_dma = 0;
 
                 /* packet command */
@@ -564,9 +603,10 @@ static ide_startstop_t cdrom_transfer_packet_command(ide_drive_t *drive,
 {
         ide_hwif_t *hwif = drive->hwif;
         int cmd_len;
-        struct cdrom_info *info = drive->driver_data;
         ide_startstop_t startstop;
 
+        ide_debug_log(IDE_DBG_PC, "Call %s\n", __func__);
+
         if (drive->atapi_flags & IDE_AFLAG_DRQ_INTERRUPT) {
                 /*
                  * Here we should have been called after receiving an interrupt
@@ -578,7 +618,7 @@ static ide_startstop_t cdrom_transfer_packet_command(ide_drive_t *drive,
                         return ide_stopped;
 
                 /* ok, next interrupt will be DMA interrupt */
-                if (info->dma)
+                if (drive->dma)
                         drive->waiting_for_dma = 1;
         } else {
                 /* otherwise, we must wait for DRQ to get set */
@@ -599,7 +639,7 @@ static ide_startstop_t cdrom_transfer_packet_command(ide_drive_t *drive,
         hwif->tp_ops->output_data(drive, NULL, rq->cmd, cmd_len);
 
         /* start the DMA if need be */
-        if (info->dma)
+        if (drive->dma)
                 hwif->dma_ops->dma_start(drive);
 
         return ide_started;
@@ -615,6 +655,9 @@ static int ide_cd_check_ireason(ide_drive_t *drive, struct request *rq,
 {
         ide_hwif_t *hwif = drive->hwif;
 
+        ide_debug_log(IDE_DBG_FUNC, "Call %s, ireason: 0x%x, rw: 0x%x\n",
+                      __func__, ireason, rw);
+
         /*
          * ireason == 0: the drive wants to receive data from us
          * ireason == 2: the drive is expecting to transfer data to us
@@ -624,7 +667,7 @@ static int ide_cd_check_ireason(ide_drive_t *drive, struct request *rq,
         else if (ireason == (rw << 1)) {
 
                 /* whoops... */
-                printk(KERN_ERR "%s: %s: wrong transfer direction!\n",
+                printk(KERN_ERR PFX "%s: %s: wrong transfer direction!\n",
                                 drive->name, __func__);
 
                 ide_pad_transfer(drive, rw, len);
@@ -637,7 +680,7 @@ static int ide_cd_check_ireason(ide_drive_t *drive, struct request *rq,
                 return 0;
         } else {
                 /* drive wants a command packet, or invalid ireason... */
-                printk(KERN_ERR "%s: %s: bad interrupt reason 0x%02x\n",
+                printk(KERN_ERR PFX "%s: %s: bad interrupt reason 0x%02x\n",
                                 drive->name, __func__, ireason);
         }
 
@@ -654,17 +697,19 @@ static int ide_cd_check_ireason(ide_drive_t *drive, struct request *rq,
  */
 static int ide_cd_check_transfer_size(ide_drive_t *drive, int len)
 {
+        ide_debug_log(IDE_DBG_FUNC, "Call %s, len: %d\n", __func__, len);
+
         if ((len % SECTOR_SIZE) == 0)
                 return 0;
 
-        printk(KERN_ERR "%s: %s: Bad transfer size %d\n",
-                        drive->name, __func__, len);
+        printk(KERN_ERR PFX "%s: %s: Bad transfer size %d\n", drive->name,
+                        __func__, len);
 
         if (drive->atapi_flags & IDE_AFLAG_LIMIT_NFRAMES)
-                printk(KERN_ERR "  This drive is not supported by "
-                                "this version of the driver\n");
+                printk(KERN_ERR PFX "This drive is not supported by this "
+                                "version of the driver\n");
         else {
-                printk(KERN_ERR "  Trying to limit transfer sizes\n");
+                printk(KERN_ERR PFX "Trying to limit transfer sizes\n");
                 drive->atapi_flags |= IDE_AFLAG_LIMIT_NFRAMES;
         }
 
@@ -676,6 +721,9 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *);
 static ide_startstop_t ide_cd_prepare_rw_request(ide_drive_t *drive,
                                                  struct request *rq)
 {
+        ide_debug_log(IDE_DBG_RQ, "Call %s: rq->cmd_flags: 0x%x\n", __func__,
+                      rq->cmd_flags);
+
         if (rq_data_dir(rq) == READ) {
                 unsigned short sectors_per_frame =
                         queue_hardsect_size(drive->queue) >> SECTOR_BITS;
@@ -695,7 +743,7 @@ static ide_startstop_t ide_cd_prepare_rw_request(ide_drive_t *drive,
                         /* sanity check... */
                         if (rq->current_nr_sectors !=
                             bio_cur_sectors(rq->bio)) {
-                                printk(KERN_ERR "%s: %s: buffer botch (%u)\n",
+                                printk(KERN_ERR PFX "%s: %s: buffer botch (%u)\n",
                                                 drive->name, __func__,
                                                 rq->current_nr_sectors);
                                 cdrom_end_request(drive, 0);
@@ -704,11 +752,7 @@ static ide_startstop_t ide_cd_prepare_rw_request(ide_drive_t *drive,
                         rq->current_nr_sectors += nskip;
                 }
         }
-#if 0
-        else
-                /* the immediate bit */
-                rq->cmd[1] = 1 << 3;
-#endif
+
         /* set up the command */
         rq->timeout = ATAPI_WAIT_PC;
 
@@ -739,6 +783,8 @@ static ide_startstop_t cdrom_seek_intr(ide_drive_t *drive)
         int stat;
         static int retry = 10;
 
+        ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);
+
         if (cdrom_decode_status(drive, 0, &stat))
                 return ide_stopped;
 
@@ -746,7 +792,7 @@ static ide_startstop_t cdrom_seek_intr(ide_drive_t *drive)
 
         if (retry && time_after(jiffies, info->start_seek + IDECD_SEEK_TIMER)) {
                 if (--retry == 0)
-                        drive->dsc_overlap = 0;
+                        drive->dev_flags &= ~IDE_DFLAG_DSC_OVERLAP;
         }
         return ide_stopped;
 }
@@ -755,6 +801,8 @@ static void ide_cd_prepare_seek_request(ide_drive_t *drive, struct request *rq)
 {
         sector_t frame = rq->sector;
 
+        ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);
+
         sector_div(frame, queue_hardsect_size(drive->queue) >> SECTOR_BITS);
 
         memset(rq->cmd, 0, BLK_MAX_CDB);
@@ -775,8 +823,11 @@ static ide_startstop_t cdrom_start_seek_continuation(ide_drive_t *drive)
  * Fix up a possibly partially-processed request so that we can start it over
  * entirely, or even put it back on the request queue.
  */
-static void restore_request(struct request *rq)
+static void ide_cd_restore_request(ide_drive_t *drive, struct request *rq)
 {
+
+        ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);
+
         if (rq->buffer != bio_data(rq->bio)) {
                 sector_t n =
                         (rq->buffer - (char *)bio_data(rq->bio)) / SECTOR_SIZE;
@@ -795,8 +846,11 @@ static void restore_request(struct request *rq)
 /*
  * All other packet commands.
  */
-static void ide_cd_request_sense_fixup(struct request *rq)
+static void ide_cd_request_sense_fixup(ide_drive_t *drive, struct request *rq)
 {
+
+        ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);
+
         /*
          * Some of the trailing request sense fields are optional,
          * and some drives don't send them.  Sigh.
@@ -822,6 +876,10 @@ int ide_cd_queue_pc(ide_drive_t *drive, const unsigned char *cmd,
         if (!sense)
                 sense = &local_sense;
 
+        ide_debug_log(IDE_DBG_PC, "Call %s, rq->cmd[0]: 0x%x, write: 0x%x, "
+                      "timeout: %d, cmd_flags: 0x%x\n", __func__, cmd[0], write,
+                      timeout, cmd_flags);
+
         /* start of retry loop */
         do {
                 struct request *rq;
@@ -895,7 +953,6 @@ static int cdrom_newpc_intr_dummy_cb(struct request *rq)
 static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
-        struct cdrom_info *info = drive->driver_data;
         struct request *rq = HWGROUP(drive)->rq;
         xfer_func_t *xferfunc;
         ide_expiry_t *expiry = NULL;
@@ -905,13 +962,16 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
         u16 len;
         u8 ireason;
 
+        ide_debug_log(IDE_DBG_PC, "Call %s, rq->cmd[0]: 0x%x, write: 0x%x\n",
+                      __func__, rq->cmd[0], write);
+
         /* check for errors */
-        dma = info->dma;
+        dma = drive->dma;
         if (dma) {
-                info->dma = 0;
+                drive->dma = 0;
                 dma_error = hwif->dma_ops->dma_end(drive);
                 if (dma_error) {
-                        printk(KERN_ERR "%s: DMA %s error\n", drive->name,
+                        printk(KERN_ERR PFX "%s: DMA %s error\n", drive->name,
                                         write ? "write" : "read");
                         ide_dma_off(drive);
                 }
@@ -937,6 +997,9 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
         if (thislen > len)
                 thislen = len;
 
+        ide_debug_log(IDE_DBG_PC, "%s: DRQ: stat: 0x%x, thislen: %d\n",
+                      __func__, stat, thislen);
+
         /* If DRQ is clear, the command has completed. */
         if ((stat & ATA_DRQ) == 0) {
                 if (blk_fs_request(rq)) {
@@ -946,7 +1009,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
                          */
                         uptodate = 1;
                         if (rq->current_nr_sectors > 0) {
-                                printk(KERN_ERR "%s: %s: data underrun "
+                                printk(KERN_ERR PFX "%s: %s: data underrun "
                                                 "(%d blocks)\n",
                                                 drive->name, __func__,
                                                 rq->current_nr_sectors);
@@ -957,7 +1020,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
                         cdrom_end_request(drive, uptodate);
                         return ide_stopped;
                 } else if (!blk_pc_request(rq)) {
-                        ide_cd_request_sense_fixup(rq);
+                        ide_cd_request_sense_fixup(drive, rq);
                         /* complain if we still have data left to transfer */
                         uptodate = rq->data_len ? 0 : 1;
                 }
@@ -1000,6 +1063,9 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
                 xferfunc = hwif->tp_ops->input_data;
         }
 
+        ide_debug_log(IDE_DBG_PC, "%s: data transfer, rq->cmd_type: 0x%x, "
+                      "ireason: 0x%x\n", __func__, rq->cmd_type, ireason);
+
         /* transfer data */
         while (thislen > 0) {
                 u8 *ptr = blk_fs_request(rq) ? NULL : rq->data;
@@ -1024,7 +1090,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
                                  */
                                 ide_pad_transfer(drive, 0, thislen);
                         else {
-                                printk(KERN_ERR "%s: confused, missing data\n",
+                                printk(KERN_ERR PFX "%s: confused, missing data\n",
                                                 drive->name);
                                 blk_dump_rq_flags(rq, rq_data_dir(rq)
                                                   ? "cdrom_newpc_intr, write"
@@ -1111,6 +1177,9 @@ static ide_startstop_t cdrom_start_rw(ide_drive_t *drive, struct request *rq)
         unsigned short sectors_per_frame =
                 queue_hardsect_size(drive->queue) >> SECTOR_BITS;
 
+        ide_debug_log(IDE_DBG_RQ, "Call %s, write: 0x%x, secs_per_frame: %u\n",
+                      __func__, write, sectors_per_frame);
+
         if (write) {
                 /* disk has become write protected */
                 if (get_disk_ro(cd->disk)) {
@@ -1122,7 +1191,7 @@ static ide_startstop_t cdrom_start_rw(ide_drive_t *drive, struct request *rq)
                  * We may be retrying this request after an error.  Fix up any
                  * weirdness which might be present in the request packet.
                  */
-                restore_request(rq);
+                ide_cd_restore_request(drive, rq);
         }
 
         /* use DMA, if possible / writes *must* be hardware frame aligned */
@@ -1132,9 +1201,9 @@ static ide_startstop_t cdrom_start_rw(ide_drive_t *drive, struct request *rq)
                         cdrom_end_request(drive, 0);
                         return ide_stopped;
                 }
-                cd->dma = 0;
+                drive->dma = 0;
         } else
-                cd->dma = drive->using_dma;
+                drive->dma = !!(drive->dev_flags & IDE_DFLAG_USING_DMA);
 
         if (write)
                 cd->devinfo.media_written = 1;
@@ -1151,14 +1220,16 @@ static ide_startstop_t cdrom_do_newpc_cont(ide_drive_t *drive)
 
 static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
 {
-        struct cdrom_info *info = drive->driver_data;
+
+        ide_debug_log(IDE_DBG_PC, "Call %s, rq->cmd_type: 0x%x\n", __func__,
+                      rq->cmd_type);
 
         if (blk_pc_request(rq))
                 rq->cmd_flags |= REQ_QUIET;
         else
                 rq->cmd_flags &= ~REQ_FAILED;
 
-        info->dma = 0;
+        drive->dma = 0;
 
         /* sg request */
         if (rq->bio || ((rq->cmd_type == REQ_TYPE_ATA_PC) && rq->data_len)) {
@@ -1171,7 +1242,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
                 else
                         buf = rq->data;
 
-                info->dma = drive->using_dma;
+                drive->dma = !!(drive->dev_flags & IDE_DFLAG_USING_DMA);
 
                 /*
                  * check if dma is safe
@@ -1182,7 +1253,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
                 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
                 if ((unsigned long)buf & alignment || rq->data_len & alignment
                     || object_is_on_stack(buf))
-                        info->dma = 0;
+                        drive->dma = 0;
         }
 }
 
@@ -1196,6 +1267,9 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,
         ide_handler_t *fn;
         int xferlen;
 
+        ide_debug_log(IDE_DBG_RQ, "Call %s, rq->cmd_type: 0x%x, block: %llu\n",
+                      __func__, rq->cmd_type, (unsigned long long)block);
+
         if (blk_fs_request(rq)) {
                 if (drive->atapi_flags & IDE_AFLAG_SEEKING) {
                         ide_hwif_t *hwif = drive->hwif;
@@ -1208,7 +1282,7 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,
                                                         IDECD_SEEK_TIMER);
                                         return ide_stopped;
                                 }
-                                printk(KERN_ERR "%s: DSC timeout\n",
+                                printk(KERN_ERR PFX "%s: DSC timeout\n",
                                                 drive->name);
                         }
                         drive->atapi_flags &= ~IDE_AFLAG_SEEKING;
@@ -1216,11 +1290,11 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,
                 if (rq_data_dir(rq) == READ &&
                     IDE_LARGE_SEEK(info->last_block, block,
                             IDECD_SEEK_THRESHOLD) &&
-                    drive->dsc_overlap) {
+                    (drive->dev_flags & IDE_DFLAG_DSC_OVERLAP)) {
                         xferlen = 0;
                         fn = cdrom_start_seek_continuation;
 
-                        info->dma = 0;
+                        drive->dma = 0;
                         info->start_seek = jiffies;
 
                         ide_cd_prepare_seek_request(drive, rq);
@@ -1249,7 +1323,7 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,
                 cdrom_end_request(drive, 1);
                 return ide_stopped;
         } else {
-                blk_dump_rq_flags(rq, "ide-cd bad flags");
+                blk_dump_rq_flags(rq, DRV_NAME " bad flags");
                 cdrom_end_request(drive, 0);
                 return ide_stopped;
         }
@@ -1279,6 +1353,8 @@ int cdrom_check_status(ide_drive_t *drive, struct request_sense *sense)
         struct cdrom_device_info *cdi = &info->devinfo;
         unsigned char cmd[BLK_MAX_CDB];
 
+        ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);
+
         memset(cmd, 0, BLK_MAX_CDB);
         cmd[0] = GPCMD_TEST_UNIT_READY;
 
@@ -1305,6 +1381,8 @@ static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity,
         unsigned len = sizeof(capbuf);
         u32 blocklen;
 
+        ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);
+
         memset(cmd, 0, BLK_MAX_CDB);
         cmd[0] = GPCMD_READ_CDVD_CAPACITY;
 
@@ -1324,10 +1402,10 @@ static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity,
         case 4096:
                 break;
         default:
-                printk(KERN_ERR "%s: weird block size %u\n",
-                        drive->name, blocklen);
-                printk(KERN_ERR "%s: default to 2kb block size\n",
-                        drive->name);
+                printk(KERN_ERR PFX "%s: weird block size %u\n",
+                                drive->name, blocklen);
+                printk(KERN_ERR PFX "%s: default to 2kb block size\n",
+                                drive->name);
                 blocklen = 2048;
                 break;
         }
@@ -1343,6 +1421,8 @@ static int cdrom_read_tocentry(ide_drive_t *drive, int trackno, int msf_flag,
 {
         unsigned char cmd[BLK_MAX_CDB];
 
+        ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);
+
         memset(cmd, 0, BLK_MAX_CDB);
 
         cmd[0] = GPCMD_READ_TOC_PMA_ATIP;
@@ -1371,11 +1451,13 @@ int ide_cd_read_toc(ide_drive_t *drive, struct request_sense *sense)
         long last_written;
         unsigned long sectors_per_frame = SECTORS_PER_FRAME;
 
+        ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);
+
         if (toc == NULL) {
                 /* try to allocate space */
                 toc = kmalloc(sizeof(struct atapi_toc), GFP_KERNEL);
                 if (toc == NULL) {
-                        printk(KERN_ERR "%s: No cdrom TOC buffer!\n",
+                        printk(KERN_ERR PFX "%s: No cdrom TOC buffer!\n",
                                         drive->name);
                         return -ENOMEM;
                 }
@@ -1531,6 +1613,8 @@ int ide_cdrom_get_capabilities(ide_drive_t *drive, u8 *buf)
         struct packet_command cgc;
         int stat, attempts = 3, size = ATAPI_CAPABILITIES_PAGE_SIZE;
 
+        ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);
+
         if ((drive->atapi_flags & IDE_AFLAG_FULL_CAPS_PAGE) == 0)
                 size -= ATAPI_CAPABILITIES_PAGE_PAD_SIZE;
 
@@ -1549,6 +1633,8 @@ void ide_cdrom_update_speed(ide_drive_t *drive, u8 *buf)
         struct cdrom_info *cd = drive->driver_data;
         u16 curspeed, maxspeed;
 
+        ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);
+
         if (drive->atapi_flags & IDE_AFLAG_LE_SPEED_FIELDS) {
                 curspeed = le16_to_cpup((__le16 *)&buf[8 + 14]);
                 maxspeed = le16_to_cpup((__le16 *)&buf[8 + 8]);
@@ -1589,6 +1675,8 @@ static int ide_cdrom_register(ide_drive_t *drive, int nslots)
         struct cdrom_info *info = drive->driver_data;
         struct cdrom_device_info *devinfo = &info->devinfo;
 
+        ide_debug_log(IDE_DBG_PROBE, "Call %s, nslots: %d\n", __func__, nslots);
+
         devinfo->ops = &ide_cdrom_dops;
         devinfo->speed = info->current_speed;
         devinfo->capacity = nslots;
@@ -1610,13 +1698,17 @@ static int ide_cdrom_probe_capabilities(ide_drive_t *drive)
         mechtype_t mechtype;
         int nslots = 1;
 
+        ide_debug_log(IDE_DBG_PROBE, "Call %s, drive->media: 0x%x, "
+                      "drive->atapi_flags: 0x%lx\n", __func__, drive->media,
+                      drive->atapi_flags);
+
         cdi->mask = (CDC_CD_R | CDC_CD_RW | CDC_DVD | CDC_DVD_R |
                      CDC_DVD_RAM | CDC_SELECT_DISC | CDC_PLAY_AUDIO |
                      CDC_MO_DRIVE | CDC_RAM);
 
         if (drive->media == ide_optical) {
                 cdi->mask &= ~(CDC_MO_DRIVE | CDC_RAM);
-                printk(KERN_ERR "%s: ATAPI magneto-optical drive\n",
+                printk(KERN_ERR PFX "%s: ATAPI magneto-optical drive\n",
                                 drive->name);
                 return nslots;
         }
@@ -1674,7 +1766,7 @@ static int ide_cdrom_probe_capabilities(ide_drive_t *drive)
 
         ide_cdrom_update_speed(drive, buf);
 
-        printk(KERN_INFO "%s: ATAPI", drive->name);
+        printk(KERN_INFO PFX "%s: ATAPI", drive->name);
 
         /* don't print speed if the drive reported 0 */
         if (cd->max_speed)
@@ -1697,7 +1789,8 @@ static int ide_cdrom_probe_capabilities(ide_drive_t *drive)
         else
                 printk(KERN_CONT " drive");
 
-        printk(KERN_CONT ", %dkB Cache\n", be16_to_cpup((__be16 *)&buf[8 + 12]));
+        printk(KERN_CONT ", %dkB Cache\n",
+                         be16_to_cpup((__be16 *)&buf[8 + 12]));
 
         return nslots;
 }
@@ -1809,7 +1902,7 @@ static ide_proc_entry_t idecd_proc[] = {
         { NULL, 0, NULL, NULL }
 };
 
-ide_devset_rw_field(dsc_overlap, dsc_overlap);
+ide_devset_rw_flag(dsc_overlap, IDE_DFLAG_DSC_OVERLAP);
 
 static const struct ide_proc_devset idecd_settings[] = {
         IDE_PROC_DEVSET(dsc_overlap, 0, 1),
@@ -1884,6 +1977,8 @@ static int ide_cdrom_setup(ide_drive_t *drive)
         char *fw_rev = (char *)&id[ATA_ID_FW_REV];
         int nslots;
 
+        ide_debug_log(IDE_DBG_PROBE, "Call %s\n", __func__);
+
         blk_queue_prep_rq(drive->queue, ide_cdrom_prep_fn);
         blk_queue_dma_alignment(drive->queue, 31);
         blk_queue_update_dma_pad(drive->queue, 15);
@@ -1891,14 +1986,9 @@ static int ide_cdrom_setup(ide_drive_t *drive)
         if (!drive->queue->unplug_delay)
                 drive->queue->unplug_delay = 1;
 
-        drive->special.all      = 0;
-
         drive->atapi_flags = IDE_AFLAG_MEDIA_CHANGED | IDE_AFLAG_NO_EJECT |
                        ide_cd_flags(id);
 
-        if ((id[ATA_ID_CONFIG] & 0x0060) == 0x20)
-                drive->atapi_flags |= IDE_AFLAG_DRQ_INTERRUPT;
-
         if ((drive->atapi_flags & IDE_AFLAG_VERTOS_300_SSD) &&
             fw_rev[4] == '1' && fw_rev[6] <= '2')
                 drive->atapi_flags |= (IDE_AFLAG_TOCTRACKS_AS_BCD |
@@ -1915,10 +2005,13 @@ static int ide_cdrom_setup(ide_drive_t *drive)
         /* set correct block size */
         blk_queue_hardsect_size(drive->queue, CD_FRAMESIZE);
 
-        drive->dsc_overlap = (drive->next != drive);
+        if (drive->next != drive)
+                drive->dev_flags |= IDE_DFLAG_DSC_OVERLAP;
+        else
+                drive->dev_flags &= ~IDE_DFLAG_DSC_OVERLAP;
 
         if (ide_cdrom_register(drive, nslots)) {
-                printk(KERN_ERR "%s: %s failed to register device with the"
+                printk(KERN_ERR PFX "%s: %s failed to register device with the"
                                 " cdrom driver.\n", drive->name, __func__);
                 cd->devinfo.handle = NULL;
                 return 1;
@@ -1932,6 +2025,8 @@ static void ide_cd_remove(ide_drive_t *drive)
 {
         struct cdrom_info *info = drive->driver_data;
 
+        ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);
+
         ide_proc_unregister_driver(drive, info->driver);
 
         del_gendisk(info->disk);
@@ -1941,15 +2036,17 @@ static void ide_cd_remove(ide_drive_t *drive)
 
 static void ide_cd_release(struct kref *kref)
 {
-        struct cdrom_info *info = to_ide_cd(kref);
+        struct cdrom_info *info = to_ide_drv(kref, cdrom_info);
         struct cdrom_device_info *devinfo = &info->devinfo;
         ide_drive_t *drive = info->drive;
         struct gendisk *g = info->disk;
 
+        ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);
+
         kfree(info->toc);
         if (devinfo->handle == drive)
                 unregister_cdrom(devinfo);
-        drive->dsc_overlap = 0;
+        drive->dev_flags &= ~IDE_DFLAG_DSC_OVERLAP;
         drive->driver_data = NULL;
         blk_queue_prep_rq(drive->queue, NULL);
         g->private_data = NULL;
@@ -1968,7 +2065,6 @@ static ide_driver_t ide_cdrom_driver = {
         .probe                  = ide_cd_probe,
         .remove                 = ide_cd_remove,
         .version                = IDECD_VERSION,
-        .media                  = ide_cdrom,
         .do_request             = ide_cd_do_request,
         .end_request            = ide_end_request,
         .error                  = __ide_error,
@@ -1999,7 +2095,7 @@ static int idecd_open(struct inode *inode, struct file *file)
 static int idecd_release(struct inode *inode, struct file *file)
 {
         struct gendisk *disk = inode->i_bdev->bd_disk;
-        struct cdrom_info *info = ide_cd_g(disk);
+        struct cdrom_info *info = ide_drv_g(disk, cdrom_info);
 
         cdrom_release(&info->devinfo, file);
 
@@ -2051,7 +2147,7 @@ static int idecd_ioctl(struct inode *inode, struct file *file,
                         unsigned int cmd, unsigned long arg)
 {
         struct block_device *bdev = inode->i_bdev;
-        struct cdrom_info *info = ide_cd_g(bdev->bd_disk);
+        struct cdrom_info *info = ide_drv_g(bdev->bd_disk, cdrom_info);
         int err;
 
         switch (cmd) {
@@ -2072,13 +2168,13 @@ static int idecd_ioctl(struct inode *inode, struct file *file,
 
 static int idecd_media_changed(struct gendisk *disk)
 {
-        struct cdrom_info *info = ide_cd_g(disk);
+        struct cdrom_info *info = ide_drv_g(disk, cdrom_info);
         return cdrom_media_changed(&info->devinfo);
 }
 
 static int idecd_revalidate_disk(struct gendisk *disk)
 {
-        struct cdrom_info *info = ide_cd_g(disk);
+        struct cdrom_info *info = ide_drv_g(disk, cdrom_info);
         struct request_sense sense;
 
         ide_cd_read_toc(info->drive, &sense);
@@ -2097,8 +2193,11 @@ static struct block_device_operations idecd_ops = {
 
 /* module options */
 static char *ignore;
-
 module_param(ignore, charp, 0400);
+
+static unsigned long debug_mask;
+module_param(debug_mask, ulong, 0644);
+
 MODULE_DESCRIPTION("ATAPI CD-ROM Driver");
 
 static int ide_cd_probe(ide_drive_t *drive)
@@ -2107,6 +2206,10 @@ static int ide_cd_probe(ide_drive_t *drive)
         struct gendisk *g;
         struct request_sense sense;
 
+        ide_debug_log(IDE_DBG_PROBE, "Call %s, drive->driver_req: %s, "
+                      "drive->media: 0x%x\n", __func__, drive->driver_req,
+                      drive->media);
+
         if (!strstr("ide-cdrom", drive->driver_req))
                 goto failed;
 
@@ -2116,14 +2219,17 @@ static int ide_cd_probe(ide_drive_t *drive)
         /* skip drives that we were told to ignore */
         if (ignore != NULL) {
                 if (strstr(ignore, drive->name)) {
-                        printk(KERN_INFO "ide-cd: ignoring drive %s\n",
+                        printk(KERN_INFO PFX "ignoring drive %s\n",
                                          drive->name);
                         goto failed;
                 }
         }
+
+        drive->debug_mask = debug_mask;
+
         info = kzalloc(sizeof(struct cdrom_info), GFP_KERNEL);
         if (info == NULL) {
-                printk(KERN_ERR "%s: Can't allocate a cdrom structure\n",
+                printk(KERN_ERR PFX "%s: Can't allocate a cdrom structure\n",
                                 drive->name);
                 goto failed;
         }
@@ -2171,6 +2277,7 @@ static void __exit ide_cdrom_exit(void)
 
 static int __init ide_cdrom_init(void)
 {
+        printk(KERN_INFO DRV_NAME " driver " IDECD_VERSION "\n");
         return driver_register(&ide_cdrom_driver.gen_driver);
 }
 
diff --git a/drivers/ide/ide-cd.h b/drivers/ide/ide-cd.h
index 61a4599b77db..5882b9a9ea8b 100644
--- a/drivers/ide/ide-cd.h
+++ b/drivers/ide/ide-cd.h
@@ -88,7 +88,6 @@ struct cdrom_info {
         struct request_sense sense_data;
 
         struct request request_sense_request;
-        int dma;
         unsigned long last_block;
         unsigned long start_seek;
 
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 01846f244b40..3853bde8eedc 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -45,21 +45,12 @@
 #define IDE_DISK_MINORS         0
 #endif
 
-struct ide_disk_obj {
-        ide_drive_t     *drive;
-        ide_driver_t    *driver;
-        struct gendisk  *disk;
-        struct kref     kref;
-        unsigned int    openers;        /* protected by BKL for now */
-};
+#include "ide-disk.h"
 
 static DEFINE_MUTEX(idedisk_ref_mutex);
 
 #define to_ide_disk(obj) container_of(obj, struct ide_disk_obj, kref)
 
-#define ide_disk_g(disk) \
-        container_of((disk)->private_data, struct ide_disk_obj, driver)
-
 static void ide_disk_release(struct kref *);
 
 static struct ide_disk_obj *ide_disk_get(struct gendisk *disk)
@@ -140,9 +131,9 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
                                         sector_t block)
 {
         ide_hwif_t *hwif        = HWIF(drive);
-        unsigned int dma        = drive->using_dma;
         u16 nsectors            = (u16)rq->nr_sectors;
-        u8 lba48                = (drive->addressing == 1) ? 1 : 0;
+        u8 lba48                = !!(drive->dev_flags & IDE_DFLAG_LBA48);
+        u8 dma                  = !!(drive->dev_flags & IDE_DFLAG_USING_DMA);
         ide_task_t              task;
         struct ide_taskfile     *tf = &task.tf;
         ide_startstop_t         rc;
@@ -162,7 +153,7 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
         memset(&task, 0, sizeof(task));
         task.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;
 
-        if (drive->select.b.lba) {
+        if (drive->dev_flags & IDE_DFLAG_LBA) {
                 if (lba48) {
                         pr_debug("%s: LBA=0x%012llx\n", drive->name,
                                         (unsigned long long)block);
@@ -187,6 +178,8 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
                         tf->lbah   = block >>= 8;
                         tf->device = (block >> 8) & 0xf;
                 }
+
+                tf->device |= ATA_LBA;
         } else {
                 unsigned int sect, head, cyl, track;
 
@@ -237,7 +230,7 @@ static ide_startstop_t ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
 {
         ide_hwif_t *hwif = HWIF(drive);
 
-        BUG_ON(drive->blocked);
+        BUG_ON(drive->dev_flags & IDE_DFLAG_BLOCKED);
 
         if (!blk_fs_request(rq)) {
                 blk_dump_rq_flags(rq, "ide_do_rw_disk - bad command");
@@ -384,139 +377,39 @@ static void idedisk_check_hpa(ide_drive_t *drive)
 static void init_idedisk_capacity(ide_drive_t *drive)
 {
         u16 *id = drive->id;
-        /*
-         * If this drive supports the Host Protected Area feature set,
-         * then we may need to change our opinion about the drive's capacity.
-         */
-        int hpa = ata_id_hpa_enabled(id);
+        int lba;
 
         if (ata_id_lba48_enabled(id)) {
                 /* drive speaks 48-bit LBA */
-                drive->select.b.lba = 1;
+                lba = 1;
                 drive->capacity64 = ata_id_u64(id, ATA_ID_LBA_CAPACITY_2);
-                if (hpa)
-                        idedisk_check_hpa(drive);
         } else if (ata_id_has_lba(id) && ata_id_is_lba_capacity_ok(id)) {
                 /* drive speaks 28-bit LBA */
-                drive->select.b.lba = 1;
+                lba = 1;
                 drive->capacity64 = ata_id_u32(id, ATA_ID_LBA_CAPACITY);
-                if (hpa)
-                        idedisk_check_hpa(drive);
         } else {
                 /* drive speaks boring old 28-bit CHS */
+                lba = 0;
                 drive->capacity64 = drive->cyl * drive->head * drive->sect;
         }
-}
 
-static sector_t idedisk_capacity(ide_drive_t *drive)
-{
-        return drive->capacity64;
-}
+        if (lba) {
+                drive->dev_flags |= IDE_DFLAG_LBA;
 
-#ifdef CONFIG_IDE_PROC_FS
-static int smart_enable(ide_drive_t *drive)
-{
-        ide_task_t args;
-        struct ide_taskfile *tf = &args.tf;
-
-        memset(&args, 0, sizeof(ide_task_t));
-        tf->feature = ATA_SMART_ENABLE;
-        tf->lbam    = ATA_SMART_LBAM_PASS;
-        tf->lbah    = ATA_SMART_LBAH_PASS;
-        tf->command = ATA_CMD_SMART;
-        args.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;
-        return ide_no_data_taskfile(drive, &args);
-}
-
-static int get_smart_data(ide_drive_t *drive, u8 *buf, u8 sub_cmd)
-{
-        ide_task_t args;
-        struct ide_taskfile *tf = &args.tf;
-
-        memset(&args, 0, sizeof(ide_task_t));
-        tf->feature = sub_cmd;
-        tf->nsect   = 0x01;
-        tf->lbam    = ATA_SMART_LBAM_PASS;
-        tf->lbah    = ATA_SMART_LBAH_PASS;
-        tf->command = ATA_CMD_SMART;
-        args.tf_flags   = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;
-        args.data_phase = TASKFILE_IN;
-        (void) smart_enable(drive);
-        return ide_raw_taskfile(drive, &args, buf, 1);
-}
-
-static int proc_idedisk_read_cache
-        (char *page, char **start, off_t off, int count, int *eof, void *data)
-{
-        ide_drive_t     *drive = (ide_drive_t *) data;
-        char            *out = page;
-        int             len;
-
-        if (drive->id_read)
-                len = sprintf(out, "%i\n", drive->id[ATA_ID_BUF_SIZE] / 2);
-        else
-                len = sprintf(out, "(none)\n");
-
-        PROC_IDE_READ_RETURN(page, start, off, count, eof, len);
-}
-
-static int proc_idedisk_read_capacity
-        (char *page, char **start, off_t off, int count, int *eof, void *data)
-{
-        ide_drive_t*drive = (ide_drive_t *)data;
-        int len;
-
-        len = sprintf(page, "%llu\n", (long long)idedisk_capacity(drive));
-
-        PROC_IDE_READ_RETURN(page, start, off, count, eof, len);
-}
-
-static int proc_idedisk_read_smart(char *page, char **start, off_t off,
-                                   int count, int *eof, void *data, u8 sub_cmd)
-{
-        ide_drive_t     *drive = (ide_drive_t *)data;
-        int             len = 0, i = 0;
-
-        if (get_smart_data(drive, page, sub_cmd) == 0) {
-                unsigned short *val = (unsigned short *) page;
-                char *out = (char *)val + SECTOR_SIZE;
-
-                page = out;
-                do {
-                        out += sprintf(out, "%04x%c", le16_to_cpu(*val),
-                                       (++i & 7) ? ' ' : '\n');
-                        val += 1;
-                } while (i < SECTOR_SIZE / 2);
-                len = out - page;
+                /*
+                * If this device supports the Host Protected Area feature set,
+                * then we may need to change our opinion about its capacity.
+                */
+                if (ata_id_hpa_enabled(id))
+                        idedisk_check_hpa(drive);
         }
-
-        PROC_IDE_READ_RETURN(page, start, off, count, eof, len);
 }
 
-static int proc_idedisk_read_sv
-        (char *page, char **start, off_t off, int count, int *eof, void *data)
+sector_t ide_disk_capacity(ide_drive_t *drive)
 {
-        return proc_idedisk_read_smart(page, start, off, count, eof, data,
-                                       ATA_SMART_READ_VALUES);
-}
-
-static int proc_idedisk_read_st
-        (char *page, char **start, off_t off, int count, int *eof, void *data)
-{
-        return proc_idedisk_read_smart(page, start, off, count, eof, data,
-                                       ATA_SMART_READ_THRESHOLDS);
+        return drive->capacity64;
 }
 
-static ide_proc_entry_t idedisk_proc[] = {
-        { "cache",        S_IFREG|S_IRUGO, proc_idedisk_read_cache,    NULL },
-        { "capacity",     S_IFREG|S_IRUGO, proc_idedisk_read_capacity, NULL },
-        { "geometry",     S_IFREG|S_IRUGO, proc_ide_read_geometry,     NULL },
-        { "smart_values", S_IFREG|S_IRUSR, proc_idedisk_read_sv,       NULL },
-        { "smart_thresholds", S_IFREG|S_IRUSR, proc_idedisk_read_st,   NULL },
-        { NULL, 0, NULL, NULL }
-};
-#endif  /* CONFIG_IDE_PROC_FS */
-
 static void idedisk_prepare_flush(struct request_queue *q, struct request *rq)
 {
         ide_drive_t *drive = q->queuedata;
@@ -568,25 +461,43 @@ static int set_multcount(ide_drive_t *drive, int arg)
         return (drive->mult_count == arg) ? 0 : -EIO;
 }
 
-ide_devset_get(nowerr, nowerr);
+ide_devset_get_flag(nowerr, IDE_DFLAG_NOWERR);
 
 static int set_nowerr(ide_drive_t *drive, int arg)
 {
         if (arg < 0 || arg > 1)
                 return -EINVAL;
 
-        drive->nowerr = arg;
+        if (arg)
+                drive->dev_flags |= IDE_DFLAG_NOWERR;
+        else
+                drive->dev_flags &= ~IDE_DFLAG_NOWERR;
+
         drive->bad_wstat = arg ? BAD_R_STAT : BAD_W_STAT;
+
         return 0;
 }
 
+static int ide_do_setfeature(ide_drive_t *drive, u8 feature, u8 nsect)
+{
+        ide_task_t task;
+
+        memset(&task, 0, sizeof(task));
+        task.tf.feature = feature;
+        task.tf.nsect   = nsect;
+        task.tf.command = ATA_CMD_SET_FEATURES;
+        task.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;
+
+        return ide_no_data_taskfile(drive, &task);
+}
+
 static void update_ordered(ide_drive_t *drive)
 {
         u16 *id = drive->id;
         unsigned ordered = QUEUE_ORDERED_NONE;
         prepare_flush_fn *prep_fn = NULL;
 
-        if (drive->wcache) {
+        if (drive->dev_flags & IDE_DFLAG_WCACHE) {
                 unsigned long long capacity;
                 int barrier;
                 /*
@@ -597,9 +508,11 @@ static void update_ordered(ide_drive_t *drive)
                  * time we have trimmed the drive capacity if LBA48 is
                  * not available so we don't need to recheck that.
                  */
-                capacity = idedisk_capacity(drive);
-                barrier = ata_id_flush_enabled(id) && !drive->noflush &&
-                        (drive->addressing == 0 || capacity <= (1ULL << 28) ||
+                capacity = ide_disk_capacity(drive);
+                barrier = ata_id_flush_enabled(id) &&
+                        (drive->dev_flags & IDE_DFLAG_NOFLUSH) == 0 &&
+                        ((drive->dev_flags & IDE_DFLAG_LBA48) == 0 ||
+                         capacity <= (1ULL << 28) ||
                          ata_id_flush_ext_enabled(id));
 
                 printk(KERN_INFO "%s: cache flushes %ssupported\n",
@@ -615,25 +528,24 @@ static void update_ordered(ide_drive_t *drive)
         blk_queue_ordered(drive->queue, ordered, prep_fn);
 }
 
-ide_devset_get(wcache, wcache);
+ide_devset_get_flag(wcache, IDE_DFLAG_WCACHE);
 
 static int set_wcache(ide_drive_t *drive, int arg)
 {
-        ide_task_t args;
         int err = 1;
 
         if (arg < 0 || arg > 1)
                 return -EINVAL;
 
         if (ata_id_flush_enabled(drive->id)) {
-                memset(&args, 0, sizeof(ide_task_t));
-                args.tf.feature = arg ?
-                        SETFEATURES_WC_ON : SETFEATURES_WC_OFF;
-                args.tf.command = ATA_CMD_SET_FEATURES;
-                args.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;
-                err = ide_no_data_taskfile(drive, &args);
-                if (err == 0)
-                        drive->wcache = arg;
+                err = ide_do_setfeature(drive,
+                        arg ? SETFEATURES_WC_ON : SETFEATURES_WC_OFF, 0);
+                if (err == 0) {
+                        if (arg)
+                                drive->dev_flags |= IDE_DFLAG_WCACHE;
+                        else
+                                drive->dev_flags &= ~IDE_DFLAG_WCACHE;
+                }
         }
 
         update_ordered(drive);
@@ -658,22 +570,18 @@ ide_devset_get(acoustic, acoustic);
 
 static int set_acoustic(ide_drive_t *drive, int arg)
 {
-        ide_task_t args;
-
         if (arg < 0 || arg > 254)
                 return -EINVAL;
 
-        memset(&args, 0, sizeof(ide_task_t));
-        args.tf.feature = arg ? SETFEATURES_AAM_ON : SETFEATURES_AAM_OFF;
-        args.tf.nsect   = arg;
-        args.tf.command = ATA_CMD_SET_FEATURES;
-        args.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;
-        ide_no_data_taskfile(drive, &args);
+        ide_do_setfeature(drive,
+                arg ? SETFEATURES_AAM_ON : SETFEATURES_AAM_OFF, arg);
+
         drive->acoustic = arg;
+
         return 0;
 }
 
-ide_devset_get(addressing, addressing);
+ide_devset_get_flag(addressing, IDE_DFLAG_LBA48);
 
 /*
  * drive->addressing:
@@ -686,49 +594,27 @@ static int set_addressing(ide_drive_t *drive, int arg)
         if (arg < 0 || arg > 2)
                 return -EINVAL;
 
-        drive->addressing =  0;
-
-        if (drive->hwif->host_flags & IDE_HFLAG_NO_LBA48)
-                return 0;
-
-        if (ata_id_lba48_enabled(drive->id) == 0)
+        if (arg && ((drive->hwif->host_flags & IDE_HFLAG_NO_LBA48) ||
+            ata_id_lba48_enabled(drive->id) == 0))
                 return -EIO;
 
-        drive->addressing = arg;
+        if (arg == 2)
+                arg = 0;
+
+        if (arg)
+                drive->dev_flags |= IDE_DFLAG_LBA48;
+        else
+                drive->dev_flags &= ~IDE_DFLAG_LBA48;
 
         return 0;
 }
 
-ide_devset_rw(acoustic, acoustic);
-ide_devset_rw(address, addressing);
-ide_devset_rw(multcount, multcount);
-ide_devset_rw(wcache, wcache);
-
-ide_devset_rw_sync(nowerr, nowerr);
+ide_ext_devset_rw(acoustic, acoustic);
+ide_ext_devset_rw(address, addressing);
+ide_ext_devset_rw(multcount, multcount);
+ide_ext_devset_rw(wcache, wcache);
 
-#ifdef CONFIG_IDE_PROC_FS
-ide_devset_rw_field(bios_cyl, bios_cyl);
-ide_devset_rw_field(bios_head, bios_head);
-ide_devset_rw_field(bios_sect, bios_sect);
-ide_devset_rw_field(failures, failures);
-ide_devset_rw_field(lun, lun);
-ide_devset_rw_field(max_failures, max_failures);
-
-static const struct ide_proc_devset idedisk_settings[] = {
-        IDE_PROC_DEVSET(acoustic,       0,   254),
-        IDE_PROC_DEVSET(address,        0,     2),
-        IDE_PROC_DEVSET(bios_cyl,       0, 65535),
-        IDE_PROC_DEVSET(bios_head,      0,   255),
-        IDE_PROC_DEVSET(bios_sect,      0,    63),
-        IDE_PROC_DEVSET(failures,       0, 65535),
-        IDE_PROC_DEVSET(lun,            0,     7),
-        IDE_PROC_DEVSET(max_failures,   0, 65535),
-        IDE_PROC_DEVSET(multcount,      0,    16),
-        IDE_PROC_DEVSET(nowerr,         0,     1),
-        IDE_PROC_DEVSET(wcache,         0,     1),
-        { 0 },
-};
-#endif
+ide_ext_devset_rw_sync(nowerr, nowerr);
 
 static void idedisk_setup(ide_drive_t *drive)
 {
@@ -740,20 +626,20 @@ static void idedisk_setup(ide_drive_t *drive)
 
         ide_proc_register_driver(drive, idkp->driver);
 
-        if (drive->id_read == 0)
+        if ((drive->dev_flags & IDE_DFLAG_ID_READ) == 0)
                 return;
 
-        if (drive->removable) {
+        if (drive->dev_flags & IDE_DFLAG_REMOVABLE) {
                 /*
                  * Removable disks (eg. SYQUEST); ignore 'WD' drives
                  */
                 if (m[0] != 'W' || m[1] != 'D')
-                        drive->doorlocking = 1;
+                        drive->dev_flags |= IDE_DFLAG_DOORLOCKING;
         }
 
         (void)set_addressing(drive, 1);
 
-        if (drive->addressing == 1) {
+        if (drive->dev_flags & IDE_DFLAG_LBA48) {
                 int max_s = 2048;
 
                 if (max_s > hwif->rqsize)
@@ -769,7 +655,8 @@ static void idedisk_setup(ide_drive_t *drive)
         init_idedisk_capacity(drive);
 
         /* limit drive capacity to 137GB if LBA48 cannot be used */
-        if (drive->addressing == 0 && drive->capacity64 > 1ULL << 28) {
+        if ((drive->dev_flags & IDE_DFLAG_LBA48) == 0 &&
+            drive->capacity64 > 1ULL << 28) {
                 printk(KERN_WARNING "%s: cannot use LBA48 - full capacity "
                        "%llu sectors (%llu MB)\n",
                        drive->name, (unsigned long long)drive->capacity64,
@@ -777,22 +664,23 @@ static void idedisk_setup(ide_drive_t *drive)
                 drive->capacity64 = 1ULL << 28;
         }
 
-        if ((hwif->host_flags & IDE_HFLAG_NO_LBA48_DMA) && drive->addressing) {
+        if ((hwif->host_flags & IDE_HFLAG_NO_LBA48_DMA) &&
+            (drive->dev_flags & IDE_DFLAG_LBA48)) {
                 if (drive->capacity64 > 1ULL << 28) {
                         printk(KERN_INFO "%s: cannot use LBA48 DMA - PIO mode"
                                          " will be used for accessing sectors "
                                          "> %u\n", drive->name, 1 << 28);
                 } else
-                        drive->addressing = 0;
+                        drive->dev_flags &= ~IDE_DFLAG_LBA48;
         }
 
         /*
          * if possible, give fdisk access to more of the drive,
          * by correcting bios_cyls:
          */
-        capacity = idedisk_capacity(drive);
+        capacity = ide_disk_capacity(drive);
 
-        if (!drive->forced_geom) {
+        if ((drive->dev_flags & IDE_DFLAG_FORCED_GEOM) == 0) {
                 if (ata_id_lba48_enabled(drive->id)) {
                         /* compatibility */
                         drive->bios_sect = 63;
@@ -827,14 +715,15 @@ static void idedisk_setup(ide_drive_t *drive)
 
         /* write cache enabled? */
         if ((id[ATA_ID_CSFO] & 1) || ata_id_wcache_enabled(id))
-                drive->wcache = 1;
+                drive->dev_flags |= IDE_DFLAG_WCACHE;
 
         set_wcache(drive, 1);
 }
 
 static void ide_cacheflush_p(ide_drive_t *drive)
 {
-        if (!drive->wcache || ata_id_flush_enabled(drive->id) == 0)
+        if (ata_id_flush_enabled(drive->id) == 0 ||
+            (drive->dev_flags & IDE_DFLAG_WCACHE) == 0)
                 return;
 
         if (do_idedisk_flushcache(drive))
@@ -918,13 +807,12 @@ static ide_driver_t idedisk_driver = {
         .resume                 = ide_disk_resume,
         .shutdown               = ide_device_shutdown,
         .version                = IDEDISK_VERSION,
-        .media                  = ide_disk,
         .do_request             = ide_do_rw_disk,
         .end_request            = ide_end_request,
         .error                  = __ide_error,
 #ifdef CONFIG_IDE_PROC_FS
-        .proc                   = idedisk_proc,
-        .settings               = idedisk_settings,
+        .proc                   = ide_disk_proc,
+        .settings               = ide_disk_settings,
 #endif
 };
 
@@ -953,15 +841,16 @@ static int idedisk_open(struct inode *inode, struct file *filp)
 
         idkp->openers++;
 
-        if (drive->removable && idkp->openers == 1) {
+        if ((drive->dev_flags & IDE_DFLAG_REMOVABLE) && idkp->openers == 1) {
                 check_disk_change(inode->i_bdev);
                 /*
                  * Ignore the return code from door_lock,
                  * since the open() has already succeeded,
                  * and the door_lock is irrelevant at this point.
                  */
-                if (drive->doorlocking && idedisk_set_doorlock(drive, 1))
-                        drive->doorlocking = 0;
+                if ((drive->dev_flags & IDE_DFLAG_DOORLOCKING) &&
+                    idedisk_set_doorlock(drive, 1))
+                        drive->dev_flags &= ~IDE_DFLAG_DOORLOCKING;
         }
         return 0;
 }
@@ -975,9 +864,10 @@ static int idedisk_release(struct inode *inode, struct file *filp)
         if (idkp->openers == 1)
                 ide_cacheflush_p(drive);
 
-        if (drive->removable && idkp->openers == 1) {
-                if (drive->doorlocking && idedisk_set_doorlock(drive, 0))
-                        drive->doorlocking = 0;
+        if ((drive->dev_flags & IDE_DFLAG_REMOVABLE) && idkp->openers == 1) {
+                if ((drive->dev_flags & IDE_DFLAG_DOORLOCKING) &&
+                    idedisk_set_doorlock(drive, 0))
+                        drive->dev_flags &= ~IDE_DFLAG_DOORLOCKING;
         }
 
         idkp->openers--;
@@ -998,48 +888,25 @@ static int idedisk_getgeo(struct block_device *bdev, struct hd_geometry *geo)
         return 0;
 }
 
-static const struct ide_ioctl_devset ide_disk_ioctl_settings[] = {
-{ HDIO_GET_ADDRESS,     HDIO_SET_ADDRESS,   &ide_devset_address   },
-{ HDIO_GET_MULTCOUNT,   HDIO_SET_MULTCOUNT, &ide_devset_multcount },
-{ HDIO_GET_NOWERR,      HDIO_SET_NOWERR,    &ide_devset_nowerr    },
-{ HDIO_GET_WCACHE,      HDIO_SET_WCACHE,    &ide_devset_wcache    },
-{ HDIO_GET_ACOUSTIC,    HDIO_SET_ACOUSTIC,  &ide_devset_acoustic  },
-{ 0 }
-};
-
-static int idedisk_ioctl(struct inode *inode, struct file *file,
-                        unsigned int cmd, unsigned long arg)
-{
-        struct block_device *bdev = inode->i_bdev;
-        struct ide_disk_obj *idkp = ide_disk_g(bdev->bd_disk);
-        ide_drive_t *drive = idkp->drive;
-        int err;
-
-        err = ide_setting_ioctl(drive, bdev, cmd, arg, ide_disk_ioctl_settings);
-        if (err != -EOPNOTSUPP)
-                return err;
-
-        return generic_ide_ioctl(drive, file, bdev, cmd, arg);
-}
-
 static int idedisk_media_changed(struct gendisk *disk)
 {
         struct ide_disk_obj *idkp = ide_disk_g(disk);
         ide_drive_t *drive = idkp->drive;
 
         /* do not scan partitions twice if this is a removable device */
-        if (drive->attach) {
-                drive->attach = 0;
+        if (drive->dev_flags & IDE_DFLAG_ATTACH) {
+                drive->dev_flags &= ~IDE_DFLAG_ATTACH;
                 return 0;
         }
+
         /* if removable, always assume it was changed */
-        return drive->removable;
+        return !!(drive->dev_flags & IDE_DFLAG_REMOVABLE);
 }
 
 static int idedisk_revalidate_disk(struct gendisk *disk)
 {
         struct ide_disk_obj *idkp = ide_disk_g(disk);
-        set_capacity(disk, idedisk_capacity(idkp->drive));
+        set_capacity(disk, ide_disk_capacity(idkp->drive));
         return 0;
 }
 
@@ -1047,7 +914,7 @@ static struct block_device_operations idedisk_ops = {
         .owner                  = THIS_MODULE,
         .open                   = idedisk_open,
         .release                = idedisk_release,
-        .ioctl                  = idedisk_ioctl,
+        .ioctl                  = ide_disk_ioctl,
         .getgeo                 = idedisk_getgeo,
         .media_changed          = idedisk_media_changed,
         .revalidate_disk        = idedisk_revalidate_disk
@@ -1088,19 +955,20 @@ static int ide_disk_probe(ide_drive_t *drive)
         drive->driver_data = idkp;
 
         idedisk_setup(drive);
-        if ((!drive->head || drive->head > 16) && !drive->select.b.lba) {
+        if ((drive->dev_flags & IDE_DFLAG_LBA) == 0 &&
+            (drive->head == 0 || drive->head > 16)) {
                 printk(KERN_ERR "%s: INVALID GEOMETRY: %d PHYSICAL HEADS?\n",
                         drive->name, drive->head);
-                drive->attach = 0;
+                drive->dev_flags &= ~IDE_DFLAG_ATTACH;
         } else
-                drive->attach = 1;
+                drive->dev_flags |= IDE_DFLAG_ATTACH;
 
         g->minors = IDE_DISK_MINORS;
         g->driverfs_dev = &drive->gendev;
         g->flags |= GENHD_FL_EXT_DEVT;
-        if (drive->removable)
-                g->flags |= GENHD_FL_REMOVABLE;
-        set_capacity(g, idedisk_capacity(drive));
+        if (drive->dev_flags & IDE_DFLAG_REMOVABLE)
+                g->flags = GENHD_FL_REMOVABLE;
+        set_capacity(g, ide_disk_capacity(drive));
         g->fops = &idedisk_ops;
         add_disk(g);
         return 0;
@@ -1122,6 +990,7 @@ static int __init idedisk_init(void)
 }
 
 MODULE_ALIAS("ide:*m-disk*");
+MODULE_ALIAS("ide-disk");
 module_init(idedisk_init);
 module_exit(idedisk_exit);
 MODULE_LICENSE("GPL");
diff --git a/drivers/ide/ide-disk.h b/drivers/ide/ide-disk.h
new file mode 100644
index 000000000000..a82fa4355665
--- /dev/null
+++ b/drivers/ide/ide-disk.h
@@ -0,0 +1,32 @@
+#ifndef __IDE_DISK_H
+#define __IDE_DISK_H
+
+struct ide_disk_obj {
+        ide_drive_t     *drive;
+        ide_driver_t    *driver;
+        struct gendisk  *disk;
+        struct kref     kref;
+        unsigned int    openers;        /* protected by BKL for now */
+};
+
+#define ide_disk_g(disk) \
+        container_of((disk)->private_data, struct ide_disk_obj, driver)
+
+/* ide-disk.c */
+sector_t ide_disk_capacity(ide_drive_t *);
+ide_decl_devset(address);
+ide_decl_devset(multcount);
+ide_decl_devset(nowerr);
+ide_decl_devset(wcache);
+ide_decl_devset(acoustic);
+
+/* ide-disk_ioctl.c */
+int ide_disk_ioctl(struct inode *, struct file *, unsigned int, unsigned long);
+
+#ifdef CONFIG_IDE_PROC_FS
+/* ide-disk_proc.c */
+extern ide_proc_entry_t ide_disk_proc[];
+extern const struct ide_proc_devset ide_disk_settings[];
+#endif
+
+#endif /* __IDE_DISK_H */
diff --git a/drivers/ide/ide-disk_ioctl.c b/drivers/ide/ide-disk_ioctl.c
new file mode 100644
index 000000000000..a6cf1a03a806
--- /dev/null
+++ b/drivers/ide/ide-disk_ioctl.c
@@ -0,0 +1,29 @@
+#include <linux/kernel.h>
+#include <linux/ide.h>
+#include <linux/hdreg.h>
+
+#include "ide-disk.h"
+
+static const struct ide_ioctl_devset ide_disk_ioctl_settings[] = {
+{ HDIO_GET_ADDRESS,     HDIO_SET_ADDRESS,   &ide_devset_address   },
+{ HDIO_GET_MULTCOUNT,   HDIO_SET_MULTCOUNT, &ide_devset_multcount },
+{ HDIO_GET_NOWERR,      HDIO_SET_NOWERR,    &ide_devset_nowerr    },
+{ HDIO_GET_WCACHE,      HDIO_SET_WCACHE,    &ide_devset_wcache    },
+{ HDIO_GET_ACOUSTIC,    HDIO_SET_ACOUSTIC,  &ide_devset_acoustic  },
+{ 0 }
+};
+
+int ide_disk_ioctl(struct inode *inode, struct file *file,
+                   unsigned int cmd, unsigned long arg)
+{
+        struct block_device *bdev = inode->i_bdev;
+        struct ide_disk_obj *idkp = ide_disk_g(bdev->bd_disk);
+        ide_drive_t *drive = idkp->drive;
+        int err;
+
+        err = ide_setting_ioctl(drive, bdev, cmd, arg, ide_disk_ioctl_settings);
+        if (err != -EOPNOTSUPP)
+                return err;
+
+        return generic_ide_ioctl(drive, file, bdev, cmd, arg);
+}
diff --git a/drivers/ide/ide-disk_proc.c b/drivers/ide/ide-disk_proc.c
new file mode 100644
index 000000000000..4724976afe71
--- /dev/null
+++ b/drivers/ide/ide-disk_proc.c
@@ -0,0 +1,129 @@
+#include <linux/kernel.h>
+#include <linux/ide.h>
+#include <linux/hdreg.h>
+
+#include "ide-disk.h"
+
+static int smart_enable(ide_drive_t *drive)
+{
+        ide_task_t args;
+        struct ide_taskfile *tf = &args.tf;
+
+        memset(&args, 0, sizeof(ide_task_t));
+        tf->feature = ATA_SMART_ENABLE;
+        tf->lbam    = ATA_SMART_LBAM_PASS;
+        tf->lbah    = ATA_SMART_LBAH_PASS;
+        tf->command = ATA_CMD_SMART;
+        args.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;
+        return ide_no_data_taskfile(drive, &args);
+}
+
+static int get_smart_data(ide_drive_t *drive, u8 *buf, u8 sub_cmd)
+{
+        ide_task_t args;
+        struct ide_taskfile *tf = &args.tf;
+
+        memset(&args, 0, sizeof(ide_task_t));
+        tf->feature = sub_cmd;
+        tf->nsect   = 0x01;
+        tf->lbam    = ATA_SMART_LBAM_PASS;
+        tf->lbah    = ATA_SMART_LBAH_PASS;
+        tf->command = ATA_CMD_SMART;
+        args.tf_flags   = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;
+        args.data_phase = TASKFILE_IN;
+        (void) smart_enable(drive);
+        return ide_raw_taskfile(drive, &args, buf, 1);
+}
+
+static int proc_idedisk_read_cache
+        (char *page, char **start, off_t off, int count, int *eof, void *data)
+{
+        ide_drive_t     *drive = (ide_drive_t *) data;
+        char            *out = page;
+        int             len;
+
+        if (drive->dev_flags & IDE_DFLAG_ID_READ)
+                len = sprintf(out, "%i\n", drive->id[ATA_ID_BUF_SIZE] / 2);
+        else
+                len = sprintf(out, "(none)\n");
+
+        PROC_IDE_READ_RETURN(page, start, off, count, eof, len);
+}
+
+static int proc_idedisk_read_capacity
+        (char *page, char **start, off_t off, int count, int *eof, void *data)
+{
+        ide_drive_t*drive = (ide_drive_t *)data;
+        int len;
+
+        len = sprintf(page, "%llu\n", (long long)ide_disk_capacity(drive));
+
+        PROC_IDE_READ_RETURN(page, start, off, count, eof, len);
+}
+
+static int proc_idedisk_read_smart(char *page, char **start, off_t off,
+                                   int count, int *eof, void *data, u8 sub_cmd)
+{
+        ide_drive_t     *drive = (ide_drive_t *)data;
+        int             len = 0, i = 0;
+
+        if (get_smart_data(drive, page, sub_cmd) == 0) {
+                unsigned short *val = (unsigned short *) page;
+                char *out = (char *)val + SECTOR_SIZE;
+
+                page = out;
+                do {
+                        out += sprintf(out, "%04x%c", le16_to_cpu(*val),
+                                       (++i & 7) ? ' ' : '\n');
+                        val += 1;
+                } while (i < SECTOR_SIZE / 2);
+                len = out - page;
+        }
+
+        PROC_IDE_READ_RETURN(page, start, off, count, eof, len);
+}
+
+static int proc_idedisk_read_sv
+        (char *page, char **start, off_t off, int count, int *eof, void *data)
+{
+        return proc_idedisk_read_smart(page, start, off, count, eof, data,
+                                       ATA_SMART_READ_VALUES);
+}
+
+static int proc_idedisk_read_st
+        (char *page, char **start, off_t off, int count, int *eof, void *data)
+{
+        return proc_idedisk_read_smart(page, start, off, count, eof, data,
+                                       ATA_SMART_READ_THRESHOLDS);
+}
+
+ide_proc_entry_t ide_disk_proc[] = {
+        { "cache",        S_IFREG|S_IRUGO, proc_idedisk_read_cache,    NULL },
+        { "capacity",     S_IFREG|S_IRUGO, proc_idedisk_read_capacity, NULL },
+        { "geometry",     S_IFREG|S_IRUGO, proc_ide_read_geometry,     NULL },
+        { "smart_values", S_IFREG|S_IRUSR, proc_idedisk_read_sv,       NULL },
+        { "smart_thresholds", S_IFREG|S_IRUSR, proc_idedisk_read_st,   NULL },
+        { NULL, 0, NULL, NULL }
+};
+
+ide_devset_rw_field(bios_cyl, bios_cyl);
+ide_devset_rw_field(bios_head, bios_head);
+ide_devset_rw_field(bios_sect, bios_sect);
+ide_devset_rw_field(failures, failures);
+ide_devset_rw_field(lun, lun);
+ide_devset_rw_field(max_failures, max_failures);
+
+const struct ide_proc_devset ide_disk_settings[] = {
+        IDE_PROC_DEVSET(acoustic,       0,   254),
+        IDE_PROC_DEVSET(address,        0,     2),
+        IDE_PROC_DEVSET(bios_cyl,       0, 65535),
+        IDE_PROC_DEVSET(bios_head,      0,   255),
+        IDE_PROC_DEVSET(bios_sect,      0,    63),
+        IDE_PROC_DEVSET(failures,       0, 65535),
+        IDE_PROC_DEVSET(lun,            0,     7),
+        IDE_PROC_DEVSET(max_failures,   0, 65535),
+        IDE_PROC_DEVSET(multcount,      0,    16),
+        IDE_PROC_DEVSET(nowerr,         0,     1),
+        IDE_PROC_DEVSET(wcache,         0,     1),
+        { 0 },
+};
diff --git a/drivers/ide/ide-dma-sff.c b/drivers/ide/ide-dma-sff.c
new file mode 100644
index 000000000000..0903782689e9
--- /dev/null
+++ b/drivers/ide/ide-dma-sff.c
@@ -0,0 +1,356 @@
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/ide.h>
+#include <linux/scatterlist.h>
+#include <linux/dma-mapping.h>
+#include <linux/io.h>
+
+/**
+ *      config_drive_for_dma    -       attempt to activate IDE DMA
+ *      @drive: the drive to place in DMA mode
+ *
+ *      If the drive supports at least mode 2 DMA or UDMA of any kind
+ *      then attempt to place it into DMA mode. Drives that are known to
+ *      support DMA but predate the DMA properties or that are known
+ *      to have DMA handling bugs are also set up appropriately based
+ *      on the good/bad drive lists.
+ */
+
+int config_drive_for_dma(ide_drive_t *drive)
+{
+        ide_hwif_t *hwif = drive->hwif;
+        u16 *id = drive->id;
+
+        if (drive->media != ide_disk) {
+                if (hwif->host_flags & IDE_HFLAG_NO_ATAPI_DMA)
+                        return 0;
+        }
+
+        /*
+         * Enable DMA on any drive that has
+         * UltraDMA (mode 0/1/2/3/4/5/6) enabled
+         */
+        if ((id[ATA_ID_FIELD_VALID] & 4) &&
+            ((id[ATA_ID_UDMA_MODES] >> 8) & 0x7f))
+                return 1;
+
+        /*
+         * Enable DMA on any drive that has mode2 DMA
+         * (multi or single) enabled
+         */
+        if (id[ATA_ID_FIELD_VALID] & 2) /* regular DMA */
+                if ((id[ATA_ID_MWDMA_MODES] & 0x404) == 0x404 ||
+                    (id[ATA_ID_SWDMA_MODES] & 0x404) == 0x404)
+                        return 1;
+
+        /* Consult the list of known "good" drives */
+        if (ide_dma_good_drive(drive))
+                return 1;
+
+        return 0;
+}
+
+/**
+ *      ide_dma_host_set        -       Enable/disable DMA on a host
+ *      @drive: drive to control
+ *
+ *      Enable/disable DMA on an IDE controller following generic
+ *      bus-mastering IDE controller behaviour.
+ */
+
+void ide_dma_host_set(ide_drive_t *drive, int on)
+{
+        ide_hwif_t *hwif = drive->hwif;
+        u8 unit = drive->dn & 1;
+        u8 dma_stat = hwif->tp_ops->read_sff_dma_status(hwif);
+
+        if (on)
+                dma_stat |= (1 << (5 + unit));
+        else
+                dma_stat &= ~(1 << (5 + unit));
+
+        if (hwif->host_flags & IDE_HFLAG_MMIO)
+                writeb(dma_stat,
+                       (void __iomem *)(hwif->dma_base + ATA_DMA_STATUS));
+        else
+                outb(dma_stat, hwif->dma_base + ATA_DMA_STATUS);
+}
+EXPORT_SYMBOL_GPL(ide_dma_host_set);
+
+/**
+ *      ide_build_dmatable      -       build IDE DMA table
+ *
+ *      ide_build_dmatable() prepares a dma request. We map the command
+ *      to get the pci bus addresses of the buffers and then build up
+ *      the PRD table that the IDE layer wants to be fed.
+ *
+ *      Most chipsets correctly interpret a length of 0x0000 as 64KB,
+ *      but at least one (e.g. CS5530) misinterprets it as zero (!).
+ *      So we break the 64KB entry into two 32KB entries instead.
+ *
+ *      Returns the number of built PRD entries if all went okay,
+ *      returns 0 otherwise.
+ *
+ *      May also be invoked from trm290.c
+ */
+
+int ide_build_dmatable(ide_drive_t *drive, struct request *rq)
+{
+        ide_hwif_t *hwif = drive->hwif;
+        __le32 *table = (__le32 *)hwif->dmatable_cpu;
+        unsigned int is_trm290  = (hwif->chipset == ide_trm290) ? 1 : 0;
+        unsigned int count = 0;
+        int i;
+        struct scatterlist *sg;
+
+        hwif->sg_nents = ide_build_sglist(drive, rq);
+        if (hwif->sg_nents == 0)
+                return 0;
+
+        for_each_sg(hwif->sg_table, sg, hwif->sg_nents, i) {
+                u32 cur_addr, cur_len, xcount, bcount;
+
+                cur_addr = sg_dma_address(sg);
+                cur_len = sg_dma_len(sg);
+
+                /*
+                 * Fill in the dma table, without crossing any 64kB boundaries.
+                 * Most hardware requires 16-bit alignment of all blocks,
+                 * but the trm290 requires 32-bit alignment.
+                 */
+
+                while (cur_len) {
+                        if (count++ >= PRD_ENTRIES)
+                                goto use_pio_instead;
+
+                        bcount = 0x10000 - (cur_addr & 0xffff);
+                        if (bcount > cur_len)
+                                bcount = cur_len;
+                        *table++ = cpu_to_le32(cur_addr);
+                        xcount = bcount & 0xffff;
+                        if (is_trm290)
+                                xcount = ((xcount >> 2) - 1) << 16;
+                        if (xcount == 0x0000) {
+                                if (count++ >= PRD_ENTRIES)
+                                        goto use_pio_instead;
+                                *table++ = cpu_to_le32(0x8000);
+                                *table++ = cpu_to_le32(cur_addr + 0x8000);
+                                xcount = 0x8000;
+                        }
+                        *table++ = cpu_to_le32(xcount);
+                        cur_addr += bcount;
+                        cur_len -= bcount;
+                }
+        }
+
+        if (count) {
+                if (!is_trm290)
+                        *--table |= cpu_to_le32(0x80000000);
+                return count;
+        }
+
+use_pio_instead:
+        printk(KERN_ERR "%s: %s\n", drive->name,
+                count ? "DMA table too small" : "empty DMA table?");
+
+        ide_destroy_dmatable(drive);
+
+        return 0; /* revert to PIO for this request */
+}
+EXPORT_SYMBOL_GPL(ide_build_dmatable);
+
+/**
+ *      ide_dma_setup   -       begin a DMA phase
+ *      @drive: target device
+ *
+ *      Build an IDE DMA PRD (IDE speak for scatter gather table)
+ *      and then set up the DMA transfer registers for a device
+ *      that follows generic IDE PCI DMA behaviour. Controllers can
+ *      override this function if they need to
+ *
+ *      Returns 0 on success. If a PIO fallback is required then 1
+ *      is returned.
+ */
+
+int ide_dma_setup(ide_drive_t *drive)
+{
+        ide_hwif_t *hwif = drive->hwif;
+        struct request *rq = hwif->hwgroup->rq;
+        unsigned int reading;
+        u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
+        u8 dma_stat;
+
+        if (rq_data_dir(rq))
+                reading = 0;
+        else
+                reading = 1 << 3;
+
+        /* fall back to pio! */
+        if (!ide_build_dmatable(drive, rq)) {
+                ide_map_sg(drive, rq);
+                return 1;
+        }
+
+        /* PRD table */
+        if (hwif->host_flags & IDE_HFLAG_MMIO)
+                writel(hwif->dmatable_dma,
+                       (void __iomem *)(hwif->dma_base + ATA_DMA_TABLE_OFS));
+        else
+                outl(hwif->dmatable_dma, hwif->dma_base + ATA_DMA_TABLE_OFS);
+
+        /* specify r/w */
+        if (mmio)
+                writeb(reading, (void __iomem *)(hwif->dma_base + ATA_DMA_CMD));
+        else
+                outb(reading, hwif->dma_base + ATA_DMA_CMD);
+
+        /* read DMA status for INTR & ERROR flags */
+        dma_stat = hwif->tp_ops->read_sff_dma_status(hwif);
+
+        /* clear INTR & ERROR flags */
+        if (mmio)
+                writeb(dma_stat | 6,
+                       (void __iomem *)(hwif->dma_base + ATA_DMA_STATUS));
+        else
+                outb(dma_stat | 6, hwif->dma_base + ATA_DMA_STATUS);
+
+        drive->waiting_for_dma = 1;
+        return 0;
+}
+EXPORT_SYMBOL_GPL(ide_dma_setup);
+
+/**
+ *      dma_timer_expiry        -       handle a DMA timeout
+ *      @drive: Drive that timed out
+ *
+ *      An IDE DMA transfer timed out. In the event of an error we ask
+ *      the driver to resolve the problem, if a DMA transfer is still
+ *      in progress we continue to wait (arguably we need to add a
+ *      secondary 'I don't care what the drive thinks' timeout here)
+ *      Finally if we have an interrupt we let it complete the I/O.
+ *      But only one time - we clear expiry and if it's still not
+ *      completed after WAIT_CMD, we error and retry in PIO.
+ *      This can occur if an interrupt is lost or due to hang or bugs.
+ */
+
+static int dma_timer_expiry(ide_drive_t *drive)
+{
+        ide_hwif_t *hwif = drive->hwif;
+        u8 dma_stat = hwif->tp_ops->read_sff_dma_status(hwif);
+
+        printk(KERN_WARNING "%s: %s: DMA status (0x%02x)\n",
+                drive->name, __func__, dma_stat);
+
+        if ((dma_stat & 0x18) == 0x18)  /* BUSY Stupid Early Timer !! */
+                return WAIT_CMD;
+
+        hwif->hwgroup->expiry = NULL;   /* one free ride for now */
+
+        /* 1 dmaing, 2 error, 4 intr */
+        if (dma_stat & 2)       /* ERROR */
+                return -1;
+
+        if (dma_stat & 1)       /* DMAing */
+                return WAIT_CMD;
+
+        if (dma_stat & 4)       /* Got an Interrupt */
+                return WAIT_CMD;
+
+        return 0;       /* Status is unknown -- reset the bus */
+}
+
+void ide_dma_exec_cmd(ide_drive_t *drive, u8 command)
+{
+        /* issue cmd to drive */
+        ide_execute_command(drive, command, &ide_dma_intr, 2 * WAIT_CMD,
+                            dma_timer_expiry);
+}
+EXPORT_SYMBOL_GPL(ide_dma_exec_cmd);
+
+void ide_dma_start(ide_drive_t *drive)
+{
+        ide_hwif_t *hwif = drive->hwif;
+        u8 dma_cmd;
+
+        /* Note that this is done *after* the cmd has
+         * been issued to the drive, as per the BM-IDE spec.
+         * The Promise Ultra33 doesn't work correctly when
+         * we do this part before issuing the drive cmd.
+         */
+        if (hwif->host_flags & IDE_HFLAG_MMIO) {
+                dma_cmd = readb((void __iomem *)(hwif->dma_base + ATA_DMA_CMD));
+                /* start DMA */
+                writeb(dma_cmd | 1,
+                       (void __iomem *)(hwif->dma_base + ATA_DMA_CMD));
+        } else {
+                dma_cmd = inb(hwif->dma_base + ATA_DMA_CMD);
+                outb(dma_cmd | 1, hwif->dma_base + ATA_DMA_CMD);
+        }
+
+        wmb();
+}
+EXPORT_SYMBOL_GPL(ide_dma_start);
+
+/* returns 1 on error, 0 otherwise */
+int ide_dma_end(ide_drive_t *drive)
+{
+        ide_hwif_t *hwif = drive->hwif;
+        u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
+        u8 dma_stat = 0, dma_cmd = 0;
+
+        drive->waiting_for_dma = 0;
+
+        if (mmio) {
+                /* get DMA command mode */
+                dma_cmd = readb((void __iomem *)(hwif->dma_base + ATA_DMA_CMD));
+                /* stop DMA */
+                writeb(dma_cmd & ~1,
+                       (void __iomem *)(hwif->dma_base + ATA_DMA_CMD));
+        } else {
+                dma_cmd = inb(hwif->dma_base + ATA_DMA_CMD);
+                outb(dma_cmd & ~1, hwif->dma_base + ATA_DMA_CMD);
+        }
+
+        /* get DMA status */
+        dma_stat = hwif->tp_ops->read_sff_dma_status(hwif);
+
+        if (mmio)
+                /* clear the INTR & ERROR bits */
+                writeb(dma_stat | 6,
+                       (void __iomem *)(hwif->dma_base + ATA_DMA_STATUS));
+        else
+                outb(dma_stat | 6, hwif->dma_base + ATA_DMA_STATUS);
+
+        /* purge DMA mappings */
+        ide_destroy_dmatable(drive);
+        /* verify good DMA status */
+        wmb();
+        return (dma_stat & 7) != 4 ? (0x10 | dma_stat) : 0;
+}
+EXPORT_SYMBOL_GPL(ide_dma_end);
+
+/* returns 1 if dma irq issued, 0 otherwise */
+int ide_dma_test_irq(ide_drive_t *drive)
+{
+        ide_hwif_t *hwif = drive->hwif;
+        u8 dma_stat = hwif->tp_ops->read_sff_dma_status(hwif);
+
+        /* return 1 if INTR asserted */
+        if ((dma_stat & 4) == 4)
+                return 1;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(ide_dma_test_irq);
+
+const struct ide_dma_ops sff_dma_ops = {
+        .dma_host_set           = ide_dma_host_set,
+        .dma_setup              = ide_dma_setup,
+        .dma_exec_cmd           = ide_dma_exec_cmd,
+        .dma_start              = ide_dma_start,
+        .dma_end                = ide_dma_end,
+        .dma_test_irq           = ide_dma_test_irq,
+        .dma_timeout            = ide_dma_timeout,
+        .dma_lost_irq           = ide_dma_lost_irq,
+};
+EXPORT_SYMBOL_GPL(sff_dma_ops);
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index ef2f1504c0d5..fffd11717b2d 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -28,24 +28,13 @@
  * for supplying a Promise UDMA board & WD UDMA drive for this work!
  */
 
-#include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
-#include <linux/interrupt.h>
-#include <linux/pci.h>
-#include <linux/init.h>
 #include <linux/ide.h>
-#include <linux/delay.h>
 #include <linux/scatterlist.h>
 #include <linux/dma-mapping.h>
 
-#include <asm/io.h>
-#include <asm/irq.h>
-
-static const struct drive_list_entry drive_whitelist [] = {
-
+static const struct drive_list_entry drive_whitelist[] = {
         { "Micropolis 2112A"    ,       NULL            },
         { "CONNER CTMA 4000"    ,       NULL            },
         { "CONNER CTT8000-A"    ,       NULL            },
@@ -53,8 +42,7 @@ static const struct drive_list_entry drive_whitelist [] = {
         { NULL                  ,       NULL            }
 };
 
-static const struct drive_list_entry drive_blacklist [] = {
-
+static const struct drive_list_entry drive_blacklist[] = {
         { "WDC AC11000H"        ,       NULL            },
         { "WDC AC22100H"        ,       NULL            },
         { "WDC AC32500H"        ,       NULL            },
@@ -94,11 +82,11 @@ static const struct drive_list_entry drive_blacklist [] = {
  *      ide_dma_intr    -       IDE DMA interrupt handler
  *      @drive: the drive the interrupt is for
  *
- *      Handle an interrupt completing a read/write DMA transfer on an 
+ *      Handle an interrupt completing a read/write DMA transfer on an
  *      IDE device
  */
- 
-ide_startstop_t ide_dma_intr (ide_drive_t *drive)
+
+ide_startstop_t ide_dma_intr(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
         u8 stat = 0, dma_stat = 0;
@@ -108,20 +96,19 @@ ide_startstop_t ide_dma_intr (ide_drive_t *drive)
 
         if (OK_STAT(stat, DRIVE_READY, drive->bad_wstat | ATA_DRQ)) {
                 if (!dma_stat) {
-                        struct request *rq = HWGROUP(drive)->rq;
+                        struct request *rq = hwif->hwgroup->rq;
 
                         task_end_request(drive, rq, stat);
                         return ide_stopped;
                 }
-                printk(KERN_ERR "%s: dma_intr: bad DMA status (dma_stat=%x)\n", 
-                       drive->name, dma_stat);
+                printk(KERN_ERR "%s: %s: bad DMA status (0x%02x)\n",
+                        drive->name, __func__, dma_stat);
         }
         return ide_error(drive, "dma_intr", stat);
 }
-
 EXPORT_SYMBOL_GPL(ide_dma_intr);
 
-static int ide_dma_good_drive(ide_drive_t *drive)
+int ide_dma_good_drive(ide_drive_t *drive)
 {
         return ide_in_drive_list(drive->id, drive_whitelist);
 }
@@ -139,7 +126,7 @@ static int ide_dma_good_drive(ide_drive_t *drive)
 
 int ide_build_sglist(ide_drive_t *drive, struct request *rq)
 {
-        ide_hwif_t *hwif = HWIF(drive);
+        ide_hwif_t *hwif = drive->hwif;
         struct scatterlist *sg = hwif->sg_table;
 
         ide_map_sg(drive, rq);
@@ -152,106 +139,8 @@ int ide_build_sglist(ide_drive_t *drive, struct request *rq)
         return dma_map_sg(hwif->dev, sg, hwif->sg_nents,
                           hwif->sg_dma_direction);
 }
-
 EXPORT_SYMBOL_GPL(ide_build_sglist);
 
-#ifdef CONFIG_BLK_DEV_IDEDMA_SFF
-/**
- *      ide_build_dmatable      -       build IDE DMA table
- *
- *      ide_build_dmatable() prepares a dma request. We map the command
- *      to get the pci bus addresses of the buffers and then build up
- *      the PRD table that the IDE layer wants to be fed. The code
- *      knows about the 64K wrap bug in the CS5530.
- *
- *      Returns the number of built PRD entries if all went okay,
- *      returns 0 otherwise.
- *
- *      May also be invoked from trm290.c
- */
- 
-int ide_build_dmatable (ide_drive_t *drive, struct request *rq)
-{
-        ide_hwif_t *hwif        = HWIF(drive);
-        __le32 *table = (__le32 *)hwif->dmatable_cpu;
-        unsigned int is_trm290  = (hwif->chipset == ide_trm290) ? 1 : 0;
-        unsigned int count = 0;
-        int i;
-        struct scatterlist *sg;
-
-        hwif->sg_nents = i = ide_build_sglist(drive, rq);
-
-        if (!i)
-                return 0;
-
-        sg = hwif->sg_table;
-        while (i) {
-                u32 cur_addr;
-                u32 cur_len;
-
-                cur_addr = sg_dma_address(sg);
-                cur_len = sg_dma_len(sg);
-
-                /*
-                 * Fill in the dma table, without crossing any 64kB boundaries.
-                 * Most hardware requires 16-bit alignment of all blocks,
-                 * but the trm290 requires 32-bit alignment.
-                 */
-
-                while (cur_len) {
-                        if (count++ >= PRD_ENTRIES) {
-                                printk(KERN_ERR "%s: DMA table too small\n", drive->name);
-                                goto use_pio_instead;
-                        } else {
-                                u32 xcount, bcount = 0x10000 - (cur_addr & 0xffff);
-
-                                if (bcount > cur_len)
-                                        bcount = cur_len;
-                                *table++ = cpu_to_le32(cur_addr);
-                                xcount = bcount & 0xffff;
-                                if (is_trm290)
-                                        xcount = ((xcount >> 2) - 1) << 16;
-                                else if (xcount == 0x0000) {
-        /* 
-         * Most chipsets correctly interpret a length of 0x0000 as 64KB,
-         * but at least one (e.g. CS5530) misinterprets it as zero (!).
-         * So here we break the 64KB entry into two 32KB entries instead.
-         */
-                                        if (count++ >= PRD_ENTRIES) {
-                                                printk(KERN_ERR "%s: DMA table too small\n", drive->name);
-                                                goto use_pio_instead;
-                                        }
-                                        *table++ = cpu_to_le32(0x8000);
-                                        *table++ = cpu_to_le32(cur_addr + 0x8000);
-                                        xcount = 0x8000;
-                                }
-                                *table++ = cpu_to_le32(xcount);
-                                cur_addr += bcount;
-                                cur_len -= bcount;
-                        }
-                }
-
-                sg = sg_next(sg);
-                i--;
-        }
-
-        if (count) {
-                if (!is_trm290)
-                        *--table |= cpu_to_le32(0x80000000);
-                return count;
-        }
-
-        printk(KERN_ERR "%s: empty DMA table?\n", drive->name);
-
-use_pio_instead:
-        ide_destroy_dmatable(drive);
-
-        return 0; /* revert to PIO for this request */
-}
-
-EXPORT_SYMBOL_GPL(ide_build_dmatable);
-#endif
-
 /**
  *      ide_destroy_dmatable    -       clean up DMA mapping
  *      @drive: The drive to unmap
@@ -262,147 +151,30 @@ EXPORT_SYMBOL_GPL(ide_build_dmatable);
  *      an oops as only one mapping can be live for each target at a given
  *      time.
  */
- 
-void ide_destroy_dmatable (ide_drive_t *drive)
+
+void ide_destroy_dmatable(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
 
         dma_unmap_sg(hwif->dev, hwif->sg_table, hwif->sg_nents,
                      hwif->sg_dma_direction);
 }
-
 EXPORT_SYMBOL_GPL(ide_destroy_dmatable);
 
-#ifdef CONFIG_BLK_DEV_IDEDMA_SFF
-/**
- *      config_drive_for_dma    -       attempt to activate IDE DMA
- *      @drive: the drive to place in DMA mode
- *
- *      If the drive supports at least mode 2 DMA or UDMA of any kind
- *      then attempt to place it into DMA mode. Drives that are known to
- *      support DMA but predate the DMA properties or that are known
- *      to have DMA handling bugs are also set up appropriately based
- *      on the good/bad drive lists.
- */
- 
-static int config_drive_for_dma (ide_drive_t *drive)
-{
-        ide_hwif_t *hwif = drive->hwif;
-        u16 *id = drive->id;
-
-        if (drive->media != ide_disk) {
-                if (hwif->host_flags & IDE_HFLAG_NO_ATAPI_DMA)
-                        return 0;
-        }
-
-        /*
-         * Enable DMA on any drive that has
-         * UltraDMA (mode 0/1/2/3/4/5/6) enabled
-         */
-        if ((id[ATA_ID_FIELD_VALID] & 4) &&
-            ((id[ATA_ID_UDMA_MODES] >> 8) & 0x7f))
-                return 1;
-
-        /*
-         * Enable DMA on any drive that has mode2 DMA
-         * (multi or single) enabled
-         */
-        if (id[ATA_ID_FIELD_VALID] & 2) /* regular DMA */
-                if ((id[ATA_ID_MWDMA_MODES] & 0x404) == 0x404 ||
-                    (id[ATA_ID_SWDMA_MODES] & 0x404) == 0x404)
-                        return 1;
-
-        /* Consult the list of known "good" drives */
-        if (ide_dma_good_drive(drive))
-                return 1;
-
-        return 0;
-}
-
-/**
- *      dma_timer_expiry        -       handle a DMA timeout
- *      @drive: Drive that timed out
- *
- *      An IDE DMA transfer timed out. In the event of an error we ask
- *      the driver to resolve the problem, if a DMA transfer is still
- *      in progress we continue to wait (arguably we need to add a 
- *      secondary 'I don't care what the drive thinks' timeout here)
- *      Finally if we have an interrupt we let it complete the I/O.
- *      But only one time - we clear expiry and if it's still not
- *      completed after WAIT_CMD, we error and retry in PIO.
- *      This can occur if an interrupt is lost or due to hang or bugs.
- */
- 
-static int dma_timer_expiry (ide_drive_t *drive)
-{
-        ide_hwif_t *hwif        = HWIF(drive);
-        u8 dma_stat             = hwif->tp_ops->read_sff_dma_status(hwif);
-
-        printk(KERN_WARNING "%s: dma_timer_expiry: dma status == 0x%02x\n",
-                drive->name, dma_stat);
-
-        if ((dma_stat & 0x18) == 0x18)  /* BUSY Stupid Early Timer !! */
-                return WAIT_CMD;
-
-        HWGROUP(drive)->expiry = NULL;  /* one free ride for now */
-
-        /* 1 dmaing, 2 error, 4 intr */
-        if (dma_stat & 2)       /* ERROR */
-                return -1;
-
-        if (dma_stat & 1)       /* DMAing */
-                return WAIT_CMD;
-
-        if (dma_stat & 4)       /* Got an Interrupt */
-                return WAIT_CMD;
-
-        return 0;       /* Status is unknown -- reset the bus */
-}
-
-/**
- *      ide_dma_host_set        -       Enable/disable DMA on a host
- *      @drive: drive to control
- *
- *      Enable/disable DMA on an IDE controller following generic
- *      bus-mastering IDE controller behaviour.
- */
-
-void ide_dma_host_set(ide_drive_t *drive, int on)
-{
-        ide_hwif_t *hwif        = HWIF(drive);
-        u8 unit                 = (drive->select.b.unit & 0x01);
-        u8 dma_stat             = hwif->tp_ops->read_sff_dma_status(hwif);
-
-        if (on)
-                dma_stat |= (1 << (5 + unit));
-        else
-                dma_stat &= ~(1 << (5 + unit));
-
-        if (hwif->host_flags & IDE_HFLAG_MMIO)
-                writeb(dma_stat,
-                       (void __iomem *)(hwif->dma_base + ATA_DMA_STATUS));
-        else
-                outb(dma_stat, hwif->dma_base + ATA_DMA_STATUS);
-}
-
-EXPORT_SYMBOL_GPL(ide_dma_host_set);
-#endif /* CONFIG_BLK_DEV_IDEDMA_SFF  */
-
 /**
  *      ide_dma_off_quietly     -       Generic DMA kill
  *      @drive: drive to control
  *
- *      Turn off the current DMA on this IDE controller. 
+ *      Turn off the current DMA on this IDE controller.
  */
 
 void ide_dma_off_quietly(ide_drive_t *drive)
 {
-        drive->using_dma = 0;
+        drive->dev_flags &= ~IDE_DFLAG_USING_DMA;
         ide_toggle_bounce(drive, 0);
 
         drive->hwif->dma_ops->dma_host_set(drive, 0);
 }
-
 EXPORT_SYMBOL(ide_dma_off_quietly);
 
 /**
@@ -418,7 +190,6 @@ void ide_dma_off(ide_drive_t *drive)
         printk(KERN_INFO "%s: DMA disabled\n", drive->name);
         ide_dma_off_quietly(drive);
 }
-
 EXPORT_SYMBOL(ide_dma_off);
 
 /**
@@ -430,167 +201,13 @@ EXPORT_SYMBOL(ide_dma_off);
 
 void ide_dma_on(ide_drive_t *drive)
 {
-        drive->using_dma = 1;
+        drive->dev_flags |= IDE_DFLAG_USING_DMA;
         ide_toggle_bounce(drive, 1);
 
         drive->hwif->dma_ops->dma_host_set(drive, 1);
 }
 
-#ifdef CONFIG_BLK_DEV_IDEDMA_SFF
-/**
- *      ide_dma_setup   -       begin a DMA phase
- *      @drive: target device
- *
- *      Build an IDE DMA PRD (IDE speak for scatter gather table)
- *      and then set up the DMA transfer registers for a device
- *      that follows generic IDE PCI DMA behaviour. Controllers can
- *      override this function if they need to
- *
- *      Returns 0 on success. If a PIO fallback is required then 1
- *      is returned. 
- */
-
-int ide_dma_setup(ide_drive_t *drive)
-{
-        ide_hwif_t *hwif = drive->hwif;
-        struct request *rq = HWGROUP(drive)->rq;
-        unsigned int reading;
-        u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
-        u8 dma_stat;
-
-        if (rq_data_dir(rq))
-                reading = 0;
-        else
-                reading = 1 << 3;
-
-        /* fall back to pio! */
-        if (!ide_build_dmatable(drive, rq)) {
-                ide_map_sg(drive, rq);
-                return 1;
-        }
-
-        /* PRD table */
-        if (hwif->host_flags & IDE_HFLAG_MMIO)
-                writel(hwif->dmatable_dma,
-                       (void __iomem *)(hwif->dma_base + ATA_DMA_TABLE_OFS));
-        else
-                outl(hwif->dmatable_dma, hwif->dma_base + ATA_DMA_TABLE_OFS);
-
-        /* specify r/w */
-        if (mmio)
-                writeb(reading, (void __iomem *)(hwif->dma_base + ATA_DMA_CMD));
-        else
-                outb(reading, hwif->dma_base + ATA_DMA_CMD);
-
-        /* read DMA status for INTR & ERROR flags */
-        dma_stat = hwif->tp_ops->read_sff_dma_status(hwif);
-
-        /* clear INTR & ERROR flags */
-        if (mmio)
-                writeb(dma_stat | 6,
-                       (void __iomem *)(hwif->dma_base + ATA_DMA_STATUS));
-        else
-                outb(dma_stat | 6, hwif->dma_base + ATA_DMA_STATUS);
-
-        drive->waiting_for_dma = 1;
-        return 0;
-}
-
-EXPORT_SYMBOL_GPL(ide_dma_setup);
-
-void ide_dma_exec_cmd(ide_drive_t *drive, u8 command)
-{
-        /* issue cmd to drive */
-        ide_execute_command(drive, command, &ide_dma_intr, 2*WAIT_CMD, dma_timer_expiry);
-}
-EXPORT_SYMBOL_GPL(ide_dma_exec_cmd);
-
-void ide_dma_start(ide_drive_t *drive)
-{
-        ide_hwif_t *hwif = drive->hwif;
-        u8 dma_cmd;
-
-        /* Note that this is done *after* the cmd has
-         * been issued to the drive, as per the BM-IDE spec.
-         * The Promise Ultra33 doesn't work correctly when
-         * we do this part before issuing the drive cmd.
-         */
-        if (hwif->host_flags & IDE_HFLAG_MMIO) {
-                dma_cmd = readb((void __iomem *)(hwif->dma_base + ATA_DMA_CMD));
-                /* start DMA */
-                writeb(dma_cmd | 1,
-                       (void __iomem *)(hwif->dma_base + ATA_DMA_CMD));
-        } else {
-                dma_cmd = inb(hwif->dma_base + ATA_DMA_CMD);
-                outb(dma_cmd | 1, hwif->dma_base + ATA_DMA_CMD);
-        }
-
-        hwif->dma = 1;
-        wmb();
-}
-
-EXPORT_SYMBOL_GPL(ide_dma_start);
-
-/* returns 1 on error, 0 otherwise */
-int __ide_dma_end (ide_drive_t *drive)
-{
-        ide_hwif_t *hwif = drive->hwif;
-        u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
-        u8 dma_stat = 0, dma_cmd = 0;
-
-        drive->waiting_for_dma = 0;
-
-        if (mmio) {
-                /* get DMA command mode */
-                dma_cmd = readb((void __iomem *)(hwif->dma_base + ATA_DMA_CMD));
-                /* stop DMA */
-                writeb(dma_cmd & ~1,
-                       (void __iomem *)(hwif->dma_base + ATA_DMA_CMD));
-        } else {
-                dma_cmd = inb(hwif->dma_base + ATA_DMA_CMD);
-                outb(dma_cmd & ~1, hwif->dma_base + ATA_DMA_CMD);
-        }
-
-        /* get DMA status */
-        dma_stat = hwif->tp_ops->read_sff_dma_status(hwif);
-
-        if (mmio)
-                /* clear the INTR & ERROR bits */
-                writeb(dma_stat | 6,
-                       (void __iomem *)(hwif->dma_base + ATA_DMA_STATUS));
-        else
-                outb(dma_stat | 6, hwif->dma_base + ATA_DMA_STATUS);
-
-        /* purge DMA mappings */
-        ide_destroy_dmatable(drive);
-        /* verify good DMA status */
-        hwif->dma = 0;
-        wmb();
-        return (dma_stat & 7) != 4 ? (0x10 | dma_stat) : 0;
-}
-
-EXPORT_SYMBOL(__ide_dma_end);
-
-/* returns 1 if dma irq issued, 0 otherwise */
-int ide_dma_test_irq(ide_drive_t *drive)
-{
-        ide_hwif_t *hwif        = HWIF(drive);
-        u8 dma_stat             = hwif->tp_ops->read_sff_dma_status(hwif);
-
-        /* return 1 if INTR asserted */
-        if ((dma_stat & 4) == 4)
-                return 1;
-        if (!drive->waiting_for_dma)
-                printk(KERN_WARNING "%s: (%s) called while not waiting\n",
-                        drive->name, __func__);
-        return 0;
-}
-EXPORT_SYMBOL_GPL(ide_dma_test_irq);
-#else
-static inline int config_drive_for_dma(ide_drive_t *drive) { return 0; }
-#endif /* CONFIG_BLK_DEV_IDEDMA_SFF */
-
-int __ide_dma_bad_drive (ide_drive_t *drive)
+int __ide_dma_bad_drive(ide_drive_t *drive)
 {
         u16 *id = drive->id;
 
@@ -602,7 +219,6 @@ int __ide_dma_bad_drive (ide_drive_t *drive)
         }
         return 0;
 }
-
 EXPORT_SYMBOL(__ide_dma_bad_drive);
 
 static const u8 xfer_mode_bases[] = {
@@ -618,7 +234,7 @@ static unsigned int ide_get_mode_mask(ide_drive_t *drive, u8 base, u8 req_mode)
         const struct ide_port_ops *port_ops = hwif->port_ops;
         unsigned int mask = 0;
 
-        switch(base) {
+        switch (base) {
         case XFER_UDMA_0:
                 if ((id[ATA_ID_FIELD_VALID] & 4) == 0)
                         break;
@@ -719,7 +335,6 @@ u8 ide_find_dma_mode(ide_drive_t *drive, u8 req_mode)
 
         return mode;
 }
-
 EXPORT_SYMBOL_GPL(ide_find_dma_mode);
 
 static int ide_tune_dma(ide_drive_t *drive)
@@ -727,7 +342,8 @@ static int ide_tune_dma(ide_drive_t *drive)
         ide_hwif_t *hwif = drive->hwif;
         u8 speed;
 
-        if (drive->nodma || ata_id_has_dma(drive->id) == 0)
+        if (ata_id_has_dma(drive->id) == 0 ||
+            (drive->dev_flags & IDE_DFLAG_NODMA))
                 return 0;
 
         /* consult the list of known "bad" drives */
@@ -827,66 +443,59 @@ void ide_check_dma_crc(ide_drive_t *drive)
                 ide_dma_on(drive);
 }
 
-#ifdef CONFIG_BLK_DEV_IDEDMA_SFF
-void ide_dma_lost_irq (ide_drive_t *drive)
+void ide_dma_lost_irq(ide_drive_t *drive)
 {
-        printk("%s: DMA interrupt recovery\n", drive->name);
+        printk(KERN_ERR "%s: DMA interrupt recovery\n", drive->name);
 }
+EXPORT_SYMBOL_GPL(ide_dma_lost_irq);
 
-EXPORT_SYMBOL(ide_dma_lost_irq);
-
-void ide_dma_timeout (ide_drive_t *drive)
+void ide_dma_timeout(ide_drive_t *drive)
 {
-        ide_hwif_t *hwif = HWIF(drive);
+        ide_hwif_t *hwif = drive->hwif;
 
         printk(KERN_ERR "%s: timeout waiting for DMA\n", drive->name);
 
         if (hwif->dma_ops->dma_test_irq(drive))
                 return;
 
+        ide_dump_status(drive, "DMA timeout", hwif->tp_ops->read_status(hwif));
+
         hwif->dma_ops->dma_end(drive);
 }
-
-EXPORT_SYMBOL(ide_dma_timeout);
+EXPORT_SYMBOL_GPL(ide_dma_timeout);
 
 void ide_release_dma_engine(ide_hwif_t *hwif)
 {
         if (hwif->dmatable_cpu) {
-                struct pci_dev *pdev = to_pci_dev(hwif->dev);
+                int prd_size = hwif->prd_max_nents * hwif->prd_ent_size;
 
-                pci_free_consistent(pdev, PRD_ENTRIES * PRD_BYTES,
-                                    hwif->dmatable_cpu, hwif->dmatable_dma);
+                dma_free_coherent(hwif->dev, prd_size,
+                                  hwif->dmatable_cpu, hwif->dmatable_dma);
                 hwif->dmatable_cpu = NULL;
         }
 }
+EXPORT_SYMBOL_GPL(ide_release_dma_engine);
 
 int ide_allocate_dma_engine(ide_hwif_t *hwif)
 {
-        struct pci_dev *pdev = to_pci_dev(hwif->dev);
+        int prd_size;
 
-        hwif->dmatable_cpu = pci_alloc_consistent(pdev,
-                                                  PRD_ENTRIES * PRD_BYTES,
-                                                  &hwif->dmatable_dma);
+        if (hwif->prd_max_nents == 0)
+                hwif->prd_max_nents = PRD_ENTRIES;
+        if (hwif->prd_ent_size == 0)
+                hwif->prd_ent_size = PRD_BYTES;
 
-        if (hwif->dmatable_cpu)
-                return 0;
+        prd_size = hwif->prd_max_nents * hwif->prd_ent_size;
 
-        printk(KERN_ERR "%s: -- Error, unable to allocate DMA table.\n",
+        hwif->dmatable_cpu = dma_alloc_coherent(hwif->dev, prd_size,
+                                                &hwif->dmatable_dma,
+                                                GFP_ATOMIC);
+        if (hwif->dmatable_cpu == NULL) {
+                printk(KERN_ERR "%s: unable to allocate PRD table\n",
                         hwif->name);
+                return -ENOMEM;
+        }
 
-        return 1;
+        return 0;
 }
 EXPORT_SYMBOL_GPL(ide_allocate_dma_engine);
-
-const struct ide_dma_ops sff_dma_ops = {
-        .dma_host_set           = ide_dma_host_set,
-        .dma_setup              = ide_dma_setup,
-        .dma_exec_cmd           = ide_dma_exec_cmd,
-        .dma_start              = ide_dma_start,
-        .dma_end                = __ide_dma_end,
-        .dma_test_irq           = ide_dma_test_irq,
-        .dma_timeout            = ide_dma_timeout,
-        .dma_lost_irq           = ide_dma_lost_irq,
-};
-EXPORT_SYMBOL_GPL(sff_dma_ops);
-#endif /* CONFIG_BLK_DEV_IDEDMA_SFF */
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index d36f155470a4..cf0aa25470ee 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -16,6 +16,7 @@
  */
 
 #define DRV_NAME "ide-floppy"
+#define PFX DRV_NAME ": "
 
 #define IDEFLOPPY_VERSION "1.00"
 
@@ -48,17 +49,17 @@
 
 #include "ide-floppy.h"
 
-/* define to see debug info */
-#define IDEFLOPPY_DEBUG_LOG             0
+/* module parameters */
+static unsigned long debug_mask;
+module_param(debug_mask, ulong, 0644);
 
-/* #define IDEFLOPPY_DEBUG(fmt, args...) printk(KERN_INFO fmt, ## args) */
-#define IDEFLOPPY_DEBUG(fmt, args...)
+/* define to see debug info */
+#define IDEFLOPPY_DEBUG_LOG     0
 
 #if IDEFLOPPY_DEBUG_LOG
-#define debug_log(fmt, args...) \
-        printk(KERN_INFO "ide-floppy: " fmt, ## args)
+#define ide_debug_log(lvl, fmt, args...) __ide_debug_log(lvl, fmt, args)
 #else
-#define debug_log(fmt, args...) do {} while (0)
+#define ide_debug_log(lvl, fmt, args...) do {} while (0)
 #endif
 
 /*
@@ -73,18 +74,17 @@
 #define CAPACITY_CURRENT        0x02
 #define CAPACITY_NO_CARTRIDGE   0x03
 
-#define IDEFLOPPY_TICKS_DELAY   HZ/20   /* default delay for ZIP 100 (50ms) */
+/*
+ * The following delay solves a problem with ATAPI Zip 100 drive where BSY bit
+ * was apparently being deasserted before the unit was ready to receive data.
+ */
+#define IDEFLOPPY_PC_DELAY      (HZ/20) /* default delay for ZIP 100 (50ms) */
 
 /* Error code returned in rq->errors to the higher part of the driver. */
 #define IDEFLOPPY_ERROR_GENERAL         101
 
 static DEFINE_MUTEX(idefloppy_ref_mutex);
 
-#define to_ide_floppy(obj) container_of(obj, struct ide_floppy_obj, kref)
-
-#define ide_floppy_g(disk) \
-        container_of((disk)->private_data, struct ide_floppy_obj, driver)
-
 static void idefloppy_cleanup_obj(struct kref *);
 
 static struct ide_floppy_obj *ide_floppy_get(struct gendisk *disk)
@@ -92,7 +92,7 @@ static struct ide_floppy_obj *ide_floppy_get(struct gendisk *disk)
         struct ide_floppy_obj *floppy = NULL;
 
         mutex_lock(&idefloppy_ref_mutex);
-        floppy = ide_floppy_g(disk);
+        floppy = ide_drv_g(disk, ide_floppy_obj);
         if (floppy) {
                 if (ide_device_get(floppy->drive))
                         floppy = NULL;
@@ -123,13 +123,21 @@ static int idefloppy_end_request(ide_drive_t *drive, int uptodate, int nsecs)
         struct request *rq = HWGROUP(drive)->rq;
         int error;
 
-        debug_log("Reached %s\n", __func__);
+        ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);
 
         switch (uptodate) {
-        case 0: error = IDEFLOPPY_ERROR_GENERAL; break;
-        case 1: error = 0; break;
-        default: error = uptodate;
+        case 0:
+                error = IDEFLOPPY_ERROR_GENERAL;
+                break;
+
+        case 1:
+                error = 0;
+                break;
+
+        default:
+                error = uptodate;
         }
+
         if (error)
                 floppy->failed_pc = NULL;
         /* Why does this happen? */
@@ -156,13 +164,13 @@ static void idefloppy_update_buffers(ide_drive_t *drive,
                 idefloppy_end_request(drive, 1, 0);
 }
 
-static void ide_floppy_callback(ide_drive_t *drive)
+static void ide_floppy_callback(ide_drive_t *drive, int dsc)
 {
         idefloppy_floppy_t *floppy = drive->driver_data;
-        struct ide_atapi_pc *pc = floppy->pc;
+        struct ide_atapi_pc *pc = drive->pc;
         int uptodate = pc->error ? 0 : 1;
 
-        debug_log("Reached %s\n", __func__);
+        ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);
 
         if (floppy->failed_pc == pc)
                 floppy->failed_pc = NULL;
@@ -171,7 +179,7 @@ static void ide_floppy_callback(ide_drive_t *drive)
             (pc->rq && blk_pc_request(pc->rq)))
                 uptodate = 1; /* FIXME */
         else if (pc->c[0] == GPCMD_REQUEST_SENSE) {
-                u8 *buf = floppy->pc->buf;
+                u8 *buf = pc->buf;
 
                 if (!pc->error) {
                         floppy->sense_key = buf[2] & 0x0F;
@@ -181,99 +189,20 @@ static void ide_floppy_callback(ide_drive_t *drive)
                                 (u16)get_unaligned((u16 *)&buf[16]) : 0x10000;
 
                         if (floppy->failed_pc)
-                                debug_log("pc = %x, ", floppy->failed_pc->c[0]);
+                                ide_debug_log(IDE_DBG_PC, "pc = %x, ",
+                                              floppy->failed_pc->c[0]);
 
-                        debug_log("sense key = %x, asc = %x, ascq = %x\n",
-                                  floppy->sense_key, floppy->asc, floppy->ascq);
+                        ide_debug_log(IDE_DBG_SENSE, "sense key = %x, asc = %x,"
+                                      "ascq = %x\n", floppy->sense_key,
+                                      floppy->asc, floppy->ascq);
                 } else
-                        printk(KERN_ERR "Error in REQUEST SENSE itself - "
-                                        "Aborting request!\n");
+                        printk(KERN_ERR PFX "Error in REQUEST SENSE itself - "
+                               "Aborting request!\n");
         }
 
         idefloppy_end_request(drive, uptodate, 0);
 }
 
-void ide_floppy_create_request_sense_cmd(struct ide_atapi_pc *pc)
-{
-        ide_init_pc(pc);
-        pc->c[0] = GPCMD_REQUEST_SENSE;
-        pc->c[4] = 255;
-        pc->req_xfer = 18;
-}
-
-/*
- * Called when an error was detected during the last packet command. We queue a
- * request sense packet command in the head of the request list.
- */
-static void idefloppy_retry_pc(ide_drive_t *drive)
-{
-        struct ide_floppy_obj *floppy = drive->driver_data;
-        struct request *rq = &floppy->request_sense_rq;
-        struct ide_atapi_pc *pc = &floppy->request_sense_pc;
-
-        (void)ide_read_error(drive);
-        ide_floppy_create_request_sense_cmd(pc);
-        ide_queue_pc_head(drive, floppy->disk, pc, rq);
-}
-
-/* The usual interrupt handler called during a packet command. */
-static ide_startstop_t idefloppy_pc_intr(ide_drive_t *drive)
-{
-        idefloppy_floppy_t *floppy = drive->driver_data;
-
-        return ide_pc_intr(drive, floppy->pc, idefloppy_pc_intr,
-                           WAIT_FLOPPY_CMD, NULL, idefloppy_update_buffers,
-                           idefloppy_retry_pc, NULL, ide_io_buffers);
-}
-
-/*
- * What we have here is a classic case of a top half / bottom half interrupt
- * service routine. In interrupt mode, the device sends an interrupt to signal
- * that it is ready to receive a packet. However, we need to delay about 2-3
- * ticks before issuing the packet or we gets in trouble.
- */
-static int idefloppy_transfer_pc(ide_drive_t *drive)
-{
-        idefloppy_floppy_t *floppy = drive->driver_data;
-
-        /* Send the actual packet */
-        drive->hwif->tp_ops->output_data(drive, NULL, floppy->pc->c, 12);
-
-        /* Timeout for the packet command */
-        return WAIT_FLOPPY_CMD;
-}
-
-/*
- * Called as an interrupt (or directly). When the device says it's ready for a
- * packet, we schedule the packet transfer to occur about 2-3 ticks later in
- * transfer_pc.
- */
-static ide_startstop_t idefloppy_start_pc_transfer(ide_drive_t *drive)
-{
-        idefloppy_floppy_t *floppy = drive->driver_data;
-        struct ide_atapi_pc *pc = floppy->pc;
-        ide_expiry_t *expiry;
-        unsigned int timeout;
-
-        /*
-         * The following delay solves a problem with ATAPI Zip 100 drives
-         * where the Busy flag was apparently being deasserted before the
-         * unit was ready to receive data. This was happening on a
-         * 1200 MHz Athlon system. 10/26/01 25msec is too short,
-         * 40 and 50msec work well. idefloppy_pc_intr will not be actually
-         * used until after the packet is moved in about 50 msec.
-         */
-        if (drive->atapi_flags & IDE_AFLAG_ZIP_DRIVE) {
-                timeout = floppy->ticks;
-                expiry = &idefloppy_transfer_pc;
-        } else {
-                timeout = WAIT_FLOPPY_CMD;
-                expiry = NULL;
-        }
-
-        return ide_transfer_pc(drive, pc, idefloppy_pc_intr, timeout, expiry);
-}
-
 static void ide_floppy_report_error(idefloppy_floppy_t *floppy,
                                     struct ide_atapi_pc *pc)
 {
@@ -283,7 +212,7 @@ static void ide_floppy_report_error(idefloppy_floppy_t *floppy,
             floppy->ascq      == 0x00)
                 return;
 
-        printk(KERN_ERR "ide-floppy: %s: I/O error, pc = %2x, key = %2x, "
+        printk(KERN_ERR PFX "%s: I/O error, pc = %2x, key = %2x, "
                         "asc = %2x, ascq = %2x\n",
                         floppy->drive->name, pc->c[0], floppy->sense_key,
                         floppy->asc, floppy->ascq);
@@ -298,8 +227,9 @@ static ide_startstop_t idefloppy_issue_pc(ide_drive_t *drive,
         if (floppy->failed_pc == NULL &&
             pc->c[0] != GPCMD_REQUEST_SENSE)
                 floppy->failed_pc = pc;
+
         /* Set the current packet command */
-        floppy->pc = pc;
+        drive->pc = pc;
 
         if (pc->retries > IDEFLOPPY_MAX_PC_RETRIES) {
                 if (!(pc->flags & PC_FLAG_SUPPRESS_ERROR))
@@ -308,16 +238,15 @@ static ide_startstop_t idefloppy_issue_pc(ide_drive_t *drive,
                 pc->error = IDEFLOPPY_ERROR_GENERAL;
 
                 floppy->failed_pc = NULL;
-                drive->pc_callback(drive);
+                drive->pc_callback(drive, 0);
                 return ide_stopped;
         }
 
-        debug_log("Retry number - %d\n", pc->retries);
+        ide_debug_log(IDE_DBG_FUNC, "%s: Retry #%d\n", __func__, pc->retries);
 
         pc->retries++;
 
-        return ide_issue_pc(drive, pc, idefloppy_start_pc_transfer,
-                            WAIT_FLOPPY_CMD, NULL);
+        return ide_issue_pc(drive, WAIT_FLOPPY_CMD, NULL);
 }
 
 void ide_floppy_create_read_capacity_cmd(struct ide_atapi_pc *pc)
@@ -347,23 +276,23 @@ void ide_floppy_create_mode_sense_cmd(struct ide_atapi_pc *pc, u8 page_code)
                 length += 32;
                 break;
         default:
-                printk(KERN_ERR "ide-floppy: unsupported page code "
-                                "in create_mode_sense_cmd\n");
+                printk(KERN_ERR PFX "unsupported page code in %s\n", __func__);
         }
         put_unaligned(cpu_to_be16(length), (u16 *) &pc->c[7]);
         pc->req_xfer = length;
 }
 
-static void idefloppy_create_rw_cmd(idefloppy_floppy_t *floppy,
+static void idefloppy_create_rw_cmd(ide_drive_t *drive,
                                     struct ide_atapi_pc *pc, struct request *rq,
                                     unsigned long sector)
 {
+        idefloppy_floppy_t *floppy = drive->driver_data;
         int block = sector / floppy->bs_factor;
         int blocks = rq->nr_sectors / floppy->bs_factor;
         int cmd = rq_data_dir(rq);
 
-        debug_log("create_rw10_cmd: block == %d, blocks == %d\n",
-                block, blocks);
+        ide_debug_log(IDE_DBG_FUNC, "%s: block: %d, blocks: %d\n", __func__,
+                      block, blocks);
 
         ide_init_pc(pc);
         pc->c[0] = cmd == READ ? GPCMD_READ_10 : GPCMD_WRITE_10;
@@ -408,41 +337,42 @@ static ide_startstop_t idefloppy_do_request(ide_drive_t *drive,
         struct ide_atapi_pc *pc;
         unsigned long block = (unsigned long)block_s;
 
-        debug_log("%s: dev: %s, cmd: 0x%x, cmd_type: %x, errors: %d\n",
-                  __func__, rq->rq_disk ? rq->rq_disk->disk_name : "?",
-                  rq->cmd[0], rq->cmd_type, rq->errors);
+        ide_debug_log(IDE_DBG_FUNC, "%s: dev: %s, cmd: 0x%x, cmd_type: %x, "
+                      "errors: %d\n",
+                      __func__, rq->rq_disk ? rq->rq_disk->disk_name : "?",
+                      rq->cmd[0], rq->cmd_type, rq->errors);
 
-        debug_log("%s: sector: %ld, nr_sectors: %ld, current_nr_sectors: %d\n",
-                  __func__, (long)rq->sector, rq->nr_sectors,
-                  rq->current_nr_sectors);
+        ide_debug_log(IDE_DBG_FUNC, "%s: sector: %ld, nr_sectors: %ld, "
+                      "current_nr_sectors: %d\n",
+                      __func__, (long)rq->sector, rq->nr_sectors,
+                      rq->current_nr_sectors);
 
         if (rq->errors >= ERROR_MAX) {
                 if (floppy->failed_pc)
                         ide_floppy_report_error(floppy, floppy->failed_pc);
                 else
-                        printk(KERN_ERR "ide-floppy: %s: I/O error\n",
-                                drive->name);
+                        printk(KERN_ERR PFX "%s: I/O error\n", drive->name);
+
                 idefloppy_end_request(drive, 0, 0);
                 return ide_stopped;
         }
         if (blk_fs_request(rq)) {
                 if (((long)rq->sector % floppy->bs_factor) ||
                     (rq->nr_sectors % floppy->bs_factor)) {
-                        printk(KERN_ERR "%s: unsupported r/w request size\n",
-                                        drive->name);
+                        printk(KERN_ERR PFX "%s: unsupported r/w rq size\n",
+                                drive->name);
                         idefloppy_end_request(drive, 0, 0);
                         return ide_stopped;
                 }
                 pc = &floppy->queued_pc;
-                idefloppy_create_rw_cmd(floppy, pc, rq, block);
+                idefloppy_create_rw_cmd(drive, pc, rq, block);
         } else if (blk_special_request(rq)) {
                 pc = (struct ide_atapi_pc *) rq->buffer;
         } else if (blk_pc_request(rq)) {
                 pc = &floppy->queued_pc;
                 idefloppy_blockpc_cmd(floppy, pc, rq);
         } else {
-                blk_dump_rq_flags(rq,
-                        "ide-floppy: unsupported command in queue");
+                blk_dump_rq_flags(rq, PFX "unsupported command in queue");
                 idefloppy_end_request(drive, 0, 0);
                 return ide_stopped;
         }
@@ -475,8 +405,7 @@ static int ide_floppy_get_flexible_disk_page(ide_drive_t *drive)
         ide_floppy_create_mode_sense_cmd(&pc, IDEFLOPPY_FLEXIBLE_DISK_PAGE);
 
         if (ide_queue_pc_tail(drive, disk, &pc)) {
-                printk(KERN_ERR "ide-floppy: Can't get flexible disk page"
-                                " parameters\n");
+                printk(KERN_ERR PFX "Can't get flexible disk page params\n");
                 return 1;
         }
 
@@ -499,7 +428,7 @@ static int ide_floppy_get_flexible_disk_page(ide_drive_t *drive)
         capacity = cyls * heads * sectors * sector_size;
 
         if (memcmp(page, &floppy->flexible_disk_page, 32))
-                printk(KERN_INFO "%s: %dkB, %d/%d/%d CHS, %d kBps, "
+                printk(KERN_INFO PFX "%s: %dkB, %d/%d/%d CHS, %d kBps, "
                                 "%d sector size, %d rpm\n",
                                 drive->name, capacity / 1024, cyls, heads,
                                 sectors, transfer_rate / 8, sector_size, rpm);
@@ -511,7 +440,7 @@ static int ide_floppy_get_flexible_disk_page(ide_drive_t *drive)
         lba_capacity = floppy->blocks * floppy->block_size;
 
         if (capacity < lba_capacity) {
-                printk(KERN_NOTICE "%s: The disk reports a capacity of %d "
+                printk(KERN_NOTICE PFX "%s: The disk reports a capacity of %d "
                         "bytes, but the drive only handles %d\n",
                         drive->name, lba_capacity, capacity);
                 floppy->blocks = floppy->block_size ?
@@ -541,7 +470,7 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)
 
         ide_floppy_create_read_capacity_cmd(&pc);
         if (ide_queue_pc_tail(drive, disk, &pc)) {
-                printk(KERN_ERR "ide-floppy: Can't get floppy parameters\n");
+                printk(KERN_ERR PFX "Can't get floppy parameters\n");
                 return 1;
         }
         header_len = pc.buf[3];
@@ -554,8 +483,9 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)
                 blocks = be32_to_cpup((__be32 *)&pc.buf[desc_start]);
                 length = be16_to_cpup((__be16 *)&pc.buf[desc_start + 6]);
 
-                debug_log("Descriptor %d: %dkB, %d blocks, %d sector size\n",
-                                i, blocks * length / 1024, blocks, length);
+                ide_debug_log(IDE_DBG_PROBE, "Descriptor %d: %dkB, %d blocks, "
+                              "%d sector size\n",
+                              i, blocks * length / 1024, blocks, length);
 
                 if (i)
                         continue;
@@ -575,23 +505,24 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)
                 case CAPACITY_CURRENT:
                         /* Normal Zip/LS-120 disks */
                         if (memcmp(cap_desc, &floppy->cap_desc, 8))
-                                printk(KERN_INFO "%s: %dkB, %d blocks, %d "
-                                        "sector size\n", drive->name,
-                                        blocks * length / 1024, blocks, length);
+                                printk(KERN_INFO PFX "%s: %dkB, %d blocks, %d "
+                                       "sector size\n",
+                                       drive->name, blocks * length / 1024,
+                                       blocks, length);
                         memcpy(&floppy->cap_desc, cap_desc, 8);
 
                         if (!length || length % 512) {
-                                printk(KERN_NOTICE "%s: %d bytes block size "
-                                        "not supported\n", drive->name, length);
+                                printk(KERN_NOTICE PFX "%s: %d bytes block size"
+                                       " not supported\n", drive->name, length);
                         } else {
                                 floppy->blocks = blocks;
                                 floppy->block_size = length;
                                 floppy->bs_factor = length / 512;
                                 if (floppy->bs_factor != 1)
-                                        printk(KERN_NOTICE "%s: warning: non "
-                                                "512 bytes block size not "
-                                                "fully supported\n",
-                                                drive->name);
+                                        printk(KERN_NOTICE PFX "%s: Warning: "
+                                               "non 512 bytes block size not "
+                                               "fully supported\n",
+                                               drive->name);
                                 rc = 0;
                         }
                         break;
@@ -600,15 +531,16 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)
                          * This is a KERN_ERR so it appears on screen
                          * for the user to see
                          */
-                        printk(KERN_ERR "%s: No disk in drive\n", drive->name);
+                        printk(KERN_ERR PFX "%s: No disk in drive\n",
+                               drive->name);
                         break;
                 case CAPACITY_INVALID:
-                        printk(KERN_ERR "%s: Invalid capacity for disk "
+                        printk(KERN_ERR PFX "%s: Invalid capacity for disk "
                                 "in drive\n", drive->name);
                         break;
                 }
-                debug_log("Descriptor 0 Code: %d\n",
-                          pc.buf[desc_start + 4] & 0x03);
+                ide_debug_log(IDE_DBG_PROBE, "Descriptor 0 Code: %d\n",
+                              pc.buf[desc_start + 4] & 0x03);
         }
 
         /* Clik! disk does not support get_flexible_disk_page */
@@ -620,7 +552,7 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)
         return rc;
 }
 
-static sector_t idefloppy_capacity(ide_drive_t *drive)
+sector_t ide_floppy_capacity(ide_drive_t *drive)
 {
         idefloppy_floppy_t *floppy = drive->driver_data;
         unsigned long capacity = floppy->blocks * floppy->bs_factor;
@@ -628,46 +560,14 @@ static sector_t idefloppy_capacity(ide_drive_t *drive)
         return capacity;
 }
 
-#ifdef CONFIG_IDE_PROC_FS
-ide_devset_rw_field(bios_cyl, bios_cyl);
-ide_devset_rw_field(bios_head, bios_head);
-ide_devset_rw_field(bios_sect, bios_sect);
-
-static int get_ticks(ide_drive_t *drive)
-{
-        idefloppy_floppy_t *floppy = drive->driver_data;
-        return floppy->ticks;
-}
-
-static int set_ticks(ide_drive_t *drive, int arg)
-{
-        idefloppy_floppy_t *floppy = drive->driver_data;
-        floppy->ticks = arg;
-        return 0;
-}
-
-IDE_DEVSET(ticks, DS_SYNC, get_ticks, set_ticks);
-
-static const struct ide_proc_devset idefloppy_settings[] = {
-        IDE_PROC_DEVSET(bios_cyl,  0, 1023),
-        IDE_PROC_DEVSET(bios_head, 0,  255),
-        IDE_PROC_DEVSET(bios_sect, 0,   63),
-        IDE_PROC_DEVSET(ticks,     0,  255),
-        { 0 },
-};
-#endif
-
 static void idefloppy_setup(ide_drive_t *drive, idefloppy_floppy_t *floppy)
 {
         u16 *id = drive->id;
-        u8 gcw[2];
-
-        *((u16 *)&gcw) = id[ATA_ID_CONFIG];
 
-        drive->pc_callback = ide_floppy_callback;
+        drive->pc_callback       = ide_floppy_callback;
+        drive->pc_update_buffers = idefloppy_update_buffers;
+        drive->pc_io_buffers     = ide_io_buffers;
 
-        if (((gcw[0] & 0x60) >> 5) == 1)
-                drive->atapi_flags |= IDE_AFLAG_DRQ_INTERRUPT;
         /*
          * We used to check revisions here. At this point however I'm giving up.
          * Just assume they are all broken, its easier.
@@ -680,7 +580,7 @@ static void idefloppy_setup(ide_drive_t *drive, idefloppy_floppy_t *floppy)
         if (!strncmp((char *)&id[ATA_ID_PROD], "IOMEGA ZIP 100 ATAPI", 20)) {
                 drive->atapi_flags |= IDE_AFLAG_ZIP_DRIVE;
                 /* This value will be visible in the /proc/ide/hdx/settings */
-                floppy->ticks = IDEFLOPPY_TICKS_DELAY;
+                drive->pc_delay = IDEFLOPPY_PC_DELAY;
                 blk_queue_max_sectors(drive->queue, 64);
         }
 
@@ -714,7 +614,7 @@ static void ide_floppy_remove(ide_drive_t *drive)
 
 static void idefloppy_cleanup_obj(struct kref *kref)
 {
-        struct ide_floppy_obj *floppy = to_ide_floppy(kref);
+        struct ide_floppy_obj *floppy = to_ide_drv(kref, ide_floppy_obj);
         ide_drive_t *drive = floppy->drive;
         struct gendisk *g = floppy->disk;
 
@@ -724,24 +624,6 @@ static void idefloppy_cleanup_obj(struct kref *kref)
         kfree(floppy);
 }
 
-#ifdef CONFIG_IDE_PROC_FS
-static int proc_idefloppy_read_capacity(char *page, char **start, off_t off,
-                int count, int *eof, void *data)
-{
-        ide_drive_t*drive = (ide_drive_t *)data;
-        int len;
-
-        len = sprintf(page, "%llu\n", (long long)idefloppy_capacity(drive));
-        PROC_IDE_READ_RETURN(page, start, off, count, eof, len);
-}
-
-static ide_proc_entry_t idefloppy_proc[] = {
-        { "capacity",   S_IFREG|S_IRUGO, proc_idefloppy_read_capacity,  NULL },
-        { "geometry",   S_IFREG|S_IRUGO, proc_ide_read_geometry,        NULL },
-        { NULL, 0, NULL, NULL }
-};
-#endif  /* CONFIG_IDE_PROC_FS */
-
 static int ide_floppy_probe(ide_drive_t *);
 
 static ide_driver_t idefloppy_driver = {
@@ -753,13 +635,12 @@ static ide_driver_t idefloppy_driver = {
         .probe                  = ide_floppy_probe,
         .remove                 = ide_floppy_remove,
         .version                = IDEFLOPPY_VERSION,
-        .media                  = ide_floppy,
         .do_request             = idefloppy_do_request,
         .end_request            = idefloppy_end_request,
         .error                  = __ide_error,
 #ifdef CONFIG_IDE_PROC_FS
-        .proc                   = idefloppy_proc,
-        .settings               = idefloppy_settings,
+        .proc                   = ide_floppy_proc,
+        .settings               = ide_floppy_settings,
 #endif
 };
 
@@ -770,14 +651,14 @@ static int idefloppy_open(struct inode *inode, struct file *filp)
         ide_drive_t *drive;
         int ret = 0;
 
-        debug_log("Reached %s\n", __func__);
-
         floppy = ide_floppy_get(disk);
         if (!floppy)
                 return -ENXIO;
 
         drive = floppy->drive;
 
+        ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);
+
         floppy->openers++;
 
         if (floppy->openers == 1) {
@@ -822,10 +703,10 @@ out_put_floppy:
 static int idefloppy_release(struct inode *inode, struct file *filp)
 {
         struct gendisk *disk = inode->i_bdev->bd_disk;
-        struct ide_floppy_obj *floppy = ide_floppy_g(disk);
+        struct ide_floppy_obj *floppy = ide_drv_g(disk, ide_floppy_obj);
         ide_drive_t *drive = floppy->drive;
 
-        debug_log("Reached %s\n", __func__);
+        ide_debug_log(IDE_DBG_FUNC, "Call %s\n", __func__);
 
         if (floppy->openers == 1) {
                 ide_set_media_lock(drive, disk, 0);
@@ -841,7 +722,8 @@ static int idefloppy_release(struct inode *inode, struct file *filp)
 
 static int idefloppy_getgeo(struct block_device *bdev, struct hd_geometry *geo)
 {
-        struct ide_floppy_obj *floppy = ide_floppy_g(bdev->bd_disk);
+        struct ide_floppy_obj *floppy = ide_drv_g(bdev->bd_disk,
+                                                     ide_floppy_obj);
         ide_drive_t *drive = floppy->drive;
 
         geo->heads = drive->bios_head;
@@ -850,64 +732,15 @@ static int idefloppy_getgeo(struct block_device *bdev, struct hd_geometry *geo)
         return 0;
 }
 
-static int ide_floppy_lockdoor(ide_drive_t *drive, struct ide_atapi_pc *pc,
-                               unsigned long arg, unsigned int cmd)
-{
-        idefloppy_floppy_t *floppy = drive->driver_data;
-        struct gendisk *disk = floppy->disk;
-        int prevent = (arg && cmd != CDROMEJECT) ? 1 : 0;
-
-        if (floppy->openers > 1)
-                return -EBUSY;
-
-        ide_set_media_lock(drive, disk, prevent);
-
-        if (cmd == CDROMEJECT)
-                ide_do_start_stop(drive, disk, 2);
-
-        return 0;
-}
-
-static int idefloppy_ioctl(struct inode *inode, struct file *file,
-                        unsigned int cmd, unsigned long arg)
-{
-        struct block_device *bdev = inode->i_bdev;
-        struct ide_floppy_obj *floppy = ide_floppy_g(bdev->bd_disk);
-        ide_drive_t *drive = floppy->drive;
-        struct ide_atapi_pc pc;
-        void __user *argp = (void __user *)arg;
-        int err;
-
-        if (cmd == CDROMEJECT || cmd == CDROM_LOCKDOOR)
-                return ide_floppy_lockdoor(drive, &pc, arg, cmd);
-
-        err = ide_floppy_format_ioctl(drive, file, cmd, argp);
-        if (err != -ENOTTY)
-                return err;
-
-        /*
-         * skip SCSI_IOCTL_SEND_COMMAND (deprecated)
-         * and CDROM_SEND_PACKET (legacy) ioctls
-         */
-        if (cmd != CDROM_SEND_PACKET && cmd != SCSI_IOCTL_SEND_COMMAND)
-                err = scsi_cmd_ioctl(file, bdev->bd_disk->queue,
-                                        bdev->bd_disk, cmd, argp);
-
-        if (err == -ENOTTY)
-                err = generic_ide_ioctl(drive, file, bdev, cmd, arg);
-
-        return err;
-}
-
 static int idefloppy_media_changed(struct gendisk *disk)
 {
-        struct ide_floppy_obj *floppy = ide_floppy_g(disk);
+        struct ide_floppy_obj *floppy = ide_drv_g(disk, ide_floppy_obj);
         ide_drive_t *drive = floppy->drive;
         int ret;
 
         /* do not scan partitions twice if this is a removable device */
-        if (drive->attach) {
-                drive->attach = 0;
+        if (drive->dev_flags & IDE_DFLAG_ATTACH) {
+                drive->dev_flags &= ~IDE_DFLAG_ATTACH;
                 return 0;
         }
         ret = !!(drive->atapi_flags & IDE_AFLAG_MEDIA_CHANGED);
@@ -917,8 +750,8 @@ static int idefloppy_media_changed(struct gendisk *disk)
 
 static int idefloppy_revalidate_disk(struct gendisk *disk)
 {
-        struct ide_floppy_obj *floppy = ide_floppy_g(disk);
-        set_capacity(disk, idefloppy_capacity(floppy->drive));
+        struct ide_floppy_obj *floppy = ide_drv_g(disk, ide_floppy_obj);
+        set_capacity(disk, ide_floppy_capacity(floppy->drive));
         return 0;
 }
 
@@ -926,7 +759,7 @@ static struct block_device_operations idefloppy_ops = {
         .owner                  = THIS_MODULE,
         .open                   = idefloppy_open,
         .release                = idefloppy_release,
-        .ioctl                  = idefloppy_ioctl,
+        .ioctl                  = ide_floppy_ioctl,
         .getgeo                 = idefloppy_getgeo,
         .media_changed          = idefloppy_media_changed,
         .revalidate_disk        = idefloppy_revalidate_disk
@@ -944,14 +777,14 @@ static int ide_floppy_probe(ide_drive_t *drive)
                 goto failed;
 
         if (!ide_check_atapi_device(drive, DRV_NAME)) {
-                printk(KERN_ERR "ide-floppy: %s: not supported by this version"
-                                " of ide-floppy\n", drive->name);
+                printk(KERN_ERR PFX "%s: not supported by this version of "
+                       DRV_NAME "\n", drive->name);
                 goto failed;
         }
         floppy = kzalloc(sizeof(idefloppy_floppy_t), GFP_KERNEL);
         if (!floppy) {
-                printk(KERN_ERR "ide-floppy: %s: Can't allocate a floppy"
-                                " structure\n", drive->name);
+                printk(KERN_ERR PFX "%s: Can't allocate a floppy structure\n",
+                       drive->name);
                 goto failed;
         }
 
@@ -971,13 +804,16 @@ static int ide_floppy_probe(ide_drive_t *drive)
 
         drive->driver_data = floppy;
 
+        drive->debug_mask = debug_mask;
+
         idefloppy_setup(drive, floppy);
+        drive->dev_flags |= IDE_DFLAG_ATTACH;
 
         g->minors = 1 << PARTN_BITS;
         g->driverfs_dev = &drive->gendev;
-        g->flags = drive->removable ? GENHD_FL_REMOVABLE : 0;
+        if (drive->dev_flags & IDE_DFLAG_REMOVABLE)
+                g->flags = GENHD_FL_REMOVABLE;
         g->fops = &idefloppy_ops;
-        drive->attach = 1;
         add_disk(g);
         return 0;
 
@@ -994,7 +830,7 @@ static void __exit idefloppy_exit(void)
 
 static int __init idefloppy_init(void)
 {
-        printk("ide-floppy driver " IDEFLOPPY_VERSION "\n");
+        printk(KERN_INFO DRV_NAME " driver " IDEFLOPPY_VERSION "\n");
         return driver_register(&idefloppy_driver.gen_driver);
 }
 
diff --git a/drivers/ide/ide-floppy.h b/drivers/ide/ide-floppy.h
index ecadc2bc322d..17cf865e583d 100644
--- a/drivers/ide/ide-floppy.h
+++ b/drivers/ide/ide-floppy.h
@@ -13,20 +13,14 @@ typedef struct ide_floppy_obj {
         struct kref     kref;
         unsigned int    openers;        /* protected by BKL for now */
 
-        /* Current packet command */
-        struct ide_atapi_pc *pc;
         /* Last failed packet command */
         struct ide_atapi_pc *failed_pc;
         /* used for blk_{fs,pc}_request() requests */
         struct ide_atapi_pc queued_pc;
 
-        struct ide_atapi_pc request_sense_pc;
-        struct request request_sense_rq;
-
         /* Last error information */
         u8 sense_key, asc, ascq;
-        /* delay this long before sending packet command */
-        u8 ticks;
+
         int progress_indication;
 
         /* Device information */
@@ -54,10 +48,15 @@ typedef struct ide_floppy_obj {
 /* ide-floppy.c */
 void ide_floppy_create_mode_sense_cmd(struct ide_atapi_pc *, u8);
 void ide_floppy_create_read_capacity_cmd(struct ide_atapi_pc *);
-void ide_floppy_create_request_sense_cmd(struct ide_atapi_pc *);
+sector_t ide_floppy_capacity(ide_drive_t *);
 
 /* ide-floppy_ioctl.c */
-int ide_floppy_format_ioctl(ide_drive_t *, struct file *, unsigned int,
-                            void __user *);
+int ide_floppy_ioctl(struct inode *, struct file *, unsigned, unsigned long);
+
+#ifdef CONFIG_IDE_PROC_FS
+/* ide-floppy_proc.c */
+extern ide_proc_entry_t ide_floppy_proc[];
+extern const struct ide_proc_devset ide_floppy_settings[];
+#endif
 
 #endif /*__IDE_FLOPPY_H */
diff --git a/drivers/ide/ide-floppy_ioctl.c b/drivers/ide/ide-floppy_ioctl.c
index 5ffc4512d14b..a3a7a0809e2b 100644
--- a/drivers/ide/ide-floppy_ioctl.c
+++ b/drivers/ide/ide-floppy_ioctl.c
@@ -195,7 +195,7 @@ static int ide_floppy_get_format_progress(ide_drive_t *drive, int __user *arg)
         int progress_indication = 0x10000;
 
         if (drive->atapi_flags & IDE_AFLAG_SRFP) {
-                ide_floppy_create_request_sense_cmd(&pc);
+                ide_create_request_sense_cmd(drive, &pc);
                 if (ide_queue_pc_tail(drive, floppy->disk, &pc))
                         return -EIO;
 
@@ -223,8 +223,26 @@ static int ide_floppy_get_format_progress(ide_drive_t *drive, int __user *arg)
         return 0;
 }
 
-int ide_floppy_format_ioctl(ide_drive_t *drive, struct file *file,
-                            unsigned int cmd, void __user *argp)
+static int ide_floppy_lockdoor(ide_drive_t *drive, struct ide_atapi_pc *pc,
+                               unsigned long arg, unsigned int cmd)
+{
+        idefloppy_floppy_t *floppy = drive->driver_data;
+        struct gendisk *disk = floppy->disk;
+        int prevent = (arg && cmd != CDROMEJECT) ? 1 : 0;
+
+        if (floppy->openers > 1)
+                return -EBUSY;
+
+        ide_set_media_lock(drive, disk, prevent);
+
+        if (cmd == CDROMEJECT)
+                ide_do_start_stop(drive, disk, 2);
+
+        return 0;
+}
+
+static int ide_floppy_format_ioctl(ide_drive_t *drive, struct file *file,
+                                   unsigned int cmd, void __user *argp)
 {
         switch (cmd) {
         case IDEFLOPPY_IOCTL_FORMAT_SUPPORTED:
@@ -241,3 +259,35 @@ int ide_floppy_format_ioctl(ide_drive_t *drive, struct file *file,
                 return -ENOTTY;
         }
 }
+
+int ide_floppy_ioctl(struct inode *inode, struct file *file,
+                    unsigned int cmd, unsigned long arg)
+{
+        struct block_device *bdev = inode->i_bdev;
+        struct ide_floppy_obj *floppy = ide_drv_g(bdev->bd_disk,
+                                                     ide_floppy_obj);
+        ide_drive_t *drive = floppy->drive;
+        struct ide_atapi_pc pc;
+        void __user *argp = (void __user *)arg;
+        int err;
+
+        if (cmd == CDROMEJECT || cmd == CDROM_LOCKDOOR)
+                return ide_floppy_lockdoor(drive, &pc, arg, cmd);
+
+        err = ide_floppy_format_ioctl(drive, file, cmd, argp);
+        if (err != -ENOTTY)
+                return err;
+
+        /*
+         * skip SCSI_IOCTL_SEND_COMMAND (deprecated)
+         * and CDROM_SEND_PACKET (legacy) ioctls
+         */
+        if (cmd != CDROM_SEND_PACKET && cmd != SCSI_IOCTL_SEND_COMMAND)
+                err = scsi_cmd_ioctl(file, bdev->bd_disk->queue,
+                                        bdev->bd_disk, cmd, argp);
+
+        if (err == -ENOTTY)
+                err = generic_ide_ioctl(drive, file, bdev, cmd, arg);
+
+        return err;
+}
diff --git a/drivers/ide/ide-floppy_proc.c b/drivers/ide/ide-floppy_proc.c
new file mode 100644
index 000000000000..76f0c6c4eca3
--- /dev/null
+++ b/drivers/ide/ide-floppy_proc.c
@@ -0,0 +1,33 @@
+#include <linux/kernel.h>
+#include <linux/ide.h>
+
+#include "ide-floppy.h"
+
+static int proc_idefloppy_read_capacity(char *page, char **start, off_t off,
+                int count, int *eof, void *data)
+{
+        ide_drive_t*drive = (ide_drive_t *)data;
+        int len;
+
+        len = sprintf(page, "%llu\n", (long long)ide_floppy_capacity(drive));
+        PROC_IDE_READ_RETURN(page, start, off, count, eof, len);
+}
+
+ide_proc_entry_t ide_floppy_proc[] = {
+        { "capacity",   S_IFREG|S_IRUGO, proc_idefloppy_read_capacity,  NULL },
+        { "geometry",   S_IFREG|S_IRUGO, proc_ide_read_geometry,        NULL },
+        { NULL, 0, NULL, NULL }
+};
+
+ide_devset_rw_field(bios_cyl, bios_cyl);
+ide_devset_rw_field(bios_head, bios_head);
+ide_devset_rw_field(bios_sect, bios_sect);
+ide_devset_rw_field(ticks, pc_delay);
+
+const struct ide_proc_devset ide_floppy_settings[] = {
+        IDE_PROC_DEVSET(bios_cyl,  0, 1023),
+        IDE_PROC_DEVSET(bios_head, 0,  255),
+        IDE_PROC_DEVSET(bios_sect, 0,   63),
+        IDE_PROC_DEVSET(ticks,     0,  255),
+        { 0 },
+};
diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c
index 0a3cb0c33ae5..81a5282ce1eb 100644
--- a/drivers/ide/ide-generic.c
+++ b/drivers/ide/ide-generic.c
@@ -137,15 +137,10 @@ static void ide_generic_check_pci_legacy_iobases(int *primary, int *secondary)
 
 static int __init ide_generic_init(void)
 {
-        hw_regs_t hw[MAX_HWIFS], *hws[MAX_HWIFS];
-        struct ide_host *host;
+        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
         unsigned long io_addr;
-        int i, rc, primary = 0, secondary = 0;
+        int i, rc = 0, primary = 0, secondary = 0;
 
-#ifdef CONFIG_MIPS
-        if (!ide_probe_legacy())
-                return -ENODEV;
-#endif
         ide_generic_check_pci_legacy_iobases(&primary, &secondary);
 
         if (!probe_mask) {
@@ -161,13 +156,9 @@ static int __init ide_generic_init(void)
                 printk(KERN_INFO DRV_NAME ": enforcing probing of I/O ports "
                         "upon user request\n");
 
-        memset(hws, 0, sizeof(hw_regs_t *) * MAX_HWIFS);
-
         for (i = 0; i < ARRAY_SIZE(legacy_bases); i++) {
                 io_addr = legacy_bases[i];
 
-                hws[i] = NULL;
-
                 if ((probe_mask & (1 << i)) && io_addr) {
                         if (!request_region(io_addr, 8, DRV_NAME)) {
                                 printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX "
@@ -184,45 +175,27 @@ static int __init ide_generic_init(void)
                                 continue;
                         }
 
-                        memset(&hw[i], 0, sizeof(hw[i]));
-                        ide_std_init_ports(&hw[i], io_addr, io_addr + 0x206);
+                        memset(&hw, 0, sizeof(hw));
+                        ide_std_init_ports(&hw, io_addr, io_addr + 0x206);
 #ifdef CONFIG_IA64
-                        hw[i].irq = isa_irq_to_vector(legacy_irqs[i]);
+                        hw.irq = isa_irq_to_vector(legacy_irqs[i]);
 #else
-                        hw[i].irq = legacy_irqs[i];
+                        hw.irq = legacy_irqs[i];
 #endif
-                        hw[i].chipset = ide_generic;
+                        hw.chipset = ide_generic;
 
-                        hws[i] = &hw[i];
+                        rc = ide_host_add(NULL, hws, NULL);
+                        if (rc) {
+                                release_region(io_addr + 0x206, 1);
+                                release_region(io_addr, 8);
+                        }
                 }
         }
 
-        host = ide_host_alloc_all(NULL, hws);
-        if (host == NULL) {
-                rc = -ENOMEM;
-                goto err;
-        }
-
-        rc = ide_host_register(host, NULL, hws);
-        if (rc)
-                goto err_free;
-
         if (ide_generic_sysfs_init())
                 printk(KERN_ERR DRV_NAME ": failed to create ide_generic "
                                          "class\n");
 
-        return 0;
-err_free:
-        ide_host_free(host);
-err:
-        for (i = 0; i < MAX_HWIFS; i++) {
-                if (hws[i] == NULL)
-                        continue;
-
-                io_addr = hws[i]->io_ports.data_addr;
-                release_region(io_addr + 0x206, 1);
-                release_region(io_addr, 8);
-        }
         return rc;
 }
 
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 1c51949833be..77c6eaeacefa 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -78,8 +78,9 @@ static int __ide_end_request(ide_drive_t *drive, struct request *rq,
          * decide whether to reenable DMA -- 3 is a random magic for now,
          * if we DMA timeout more than 3 times, just stay in PIO
          */
-        if (drive->state == DMA_PIO_RETRY && drive->retry_pio <= 3) {
-                drive->state = 0;
+        if ((drive->dev_flags & IDE_DFLAG_DMA_PIO_RETRY) &&
+            drive->retry_pio <= 3) {
+                drive->dev_flags &= ~IDE_DFLAG_DMA_PIO_RETRY;
                 ide_dma_on(drive);
         }
 
@@ -131,21 +132,6 @@ int ide_end_request (ide_drive_t *drive, int uptodate, int nr_sectors)
 }
 EXPORT_SYMBOL(ide_end_request);
 
-/*
- * Power Management state machine. This one is rather trivial for now,
- * we should probably add more, like switching back to PIO on suspend
- * to help some BIOSes, re-do the door locking on resume, etc...
- */
-
-enum {
-        ide_pm_flush_cache      = ide_pm_state_start_suspend,
-        idedisk_pm_standby,
-
-        idedisk_pm_restore_pio  = ide_pm_state_start_resume,
-        idedisk_pm_idle,
-        ide_pm_restore_dma,
-};
-
 static void ide_complete_power_step(ide_drive_t *drive, struct request *rq, u8 stat, u8 error)
 {
         struct request_pm_state *pm = rq->data;
@@ -154,20 +140,20 @@ static void ide_complete_power_step(ide_drive_t *drive, struct request *rq, u8 s
                 return;
 
         switch (pm->pm_step) {
-        case ide_pm_flush_cache:        /* Suspend step 1 (flush cache) complete */
+        case IDE_PM_FLUSH_CACHE:        /* Suspend step 1 (flush cache) */
                 if (pm->pm_state == PM_EVENT_FREEZE)
-                        pm->pm_step = ide_pm_state_completed;
+                        pm->pm_step = IDE_PM_COMPLETED;
                 else
-                        pm->pm_step = idedisk_pm_standby;
+                        pm->pm_step = IDE_PM_STANDBY;
                 break;
-        case idedisk_pm_standby:        /* Suspend step 2 (standby) complete */
-                pm->pm_step = ide_pm_state_completed;
+        case IDE_PM_STANDBY:            /* Suspend step 2 (standby) */
+                pm->pm_step = IDE_PM_COMPLETED;
                 break;
-        case idedisk_pm_restore_pio:    /* Resume step 1 complete */
-                pm->pm_step = idedisk_pm_idle;
+        case IDE_PM_RESTORE_PIO:        /* Resume step 1 (restore PIO) */
+                pm->pm_step = IDE_PM_IDLE;
                 break;
-        case idedisk_pm_idle:           /* Resume step 2 (idle) complete */
-                pm->pm_step = ide_pm_restore_dma;
+        case IDE_PM_IDLE:               /* Resume step 2 (idle)*/
+                pm->pm_step = IDE_PM_RESTORE_DMA;
                 break;
         }
 }
@@ -180,11 +166,12 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *
         memset(args, 0, sizeof(*args));
 
         switch (pm->pm_step) {
-        case ide_pm_flush_cache:        /* Suspend step 1 (flush cache) */
+        case IDE_PM_FLUSH_CACHE:        /* Suspend step 1 (flush cache) */
                 if (drive->media != ide_disk)
                         break;
                 /* Not supported? Switch to next step now. */
-                if (!drive->wcache || ata_id_flush_enabled(drive->id) == 0) {
+                if (ata_id_flush_enabled(drive->id) == 0 ||
+                    (drive->dev_flags & IDE_DFLAG_WCACHE) == 0) {
                         ide_complete_power_step(drive, rq, 0, 0);
                         return ide_stopped;
                 }
@@ -193,27 +180,23 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *
                 else
                         args->tf.command = ATA_CMD_FLUSH;
                 goto out_do_tf;
-
-        case idedisk_pm_standby:        /* Suspend step 2 (standby) */
+        case IDE_PM_STANDBY:            /* Suspend step 2 (standby) */
                 args->tf.command = ATA_CMD_STANDBYNOW1;
                 goto out_do_tf;
-
-        case idedisk_pm_restore_pio:    /* Resume step 1 (restore PIO) */
+        case IDE_PM_RESTORE_PIO:        /* Resume step 1 (restore PIO) */
                 ide_set_max_pio(drive);
                 /*
-                 * skip idedisk_pm_idle for ATAPI devices
+                 * skip IDE_PM_IDLE for ATAPI devices
                  */
                 if (drive->media != ide_disk)
-                        pm->pm_step = ide_pm_restore_dma;
+                        pm->pm_step = IDE_PM_RESTORE_DMA;
                 else
                         ide_complete_power_step(drive, rq, 0, 0);
                 return ide_stopped;
-
-        case idedisk_pm_idle:           /* Resume step 2 (idle) */
+        case IDE_PM_IDLE:               /* Resume step 2 (idle) */
                 args->tf.command = ATA_CMD_IDLEIMMEDIATE;
                 goto out_do_tf;
-
-        case ide_pm_restore_dma:        /* Resume step 3 (restore DMA) */
+        case IDE_PM_RESTORE_DMA:        /* Resume step 3 (restore DMA) */
                 /*
                  * Right now, all we do is call ide_set_dma(drive),
                  * we could be smarter and check for current xfer_speed
@@ -222,12 +205,13 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *
                 if (drive->hwif->dma_ops == NULL)
                         break;
                 /*
-                 * TODO: respect ->using_dma setting
+                 * TODO: respect IDE_DFLAG_USING_DMA
                  */
                 ide_set_dma(drive);
                 break;
         }
-        pm->pm_step = ide_pm_state_completed;
+
+        pm->pm_step = IDE_PM_COMPLETED;
         return ide_stopped;
 
 out_do_tf:
@@ -287,7 +271,7 @@ static void ide_complete_pm_request (ide_drive_t *drive, struct request *rq)
         if (blk_pm_suspend_request(rq)) {
                 blk_stop_queue(drive->queue);
         } else {
-                drive->blocked = 0;
+                drive->dev_flags &= ~IDE_DFLAG_BLOCKED;
                 blk_start_queue(drive->queue);
         }
         HWGROUP(drive)->rq = NULL;
@@ -343,7 +327,7 @@ void ide_end_drive_cmd (ide_drive_t *drive, u8 stat, u8 err)
                         drive->name, rq->pm->pm_step, stat, err);
 #endif
                 ide_complete_power_step(drive, rq, stat, err);
-                if (pm->pm_step == ide_pm_state_completed)
+                if (pm->pm_step == IDE_PM_COMPLETED)
                         ide_complete_pm_request(drive, rq);
                 return;
         }
@@ -374,13 +358,14 @@ static ide_startstop_t ide_ata_error(ide_drive_t *drive, struct request *rq, u8
 {
         ide_hwif_t *hwif = drive->hwif;
 
-        if ((stat & ATA_BUSY) || ((stat & ATA_DF) && !drive->nowerr)) {
+        if ((stat & ATA_BUSY) ||
+            ((stat & ATA_DF) && (drive->dev_flags & IDE_DFLAG_NOWERR) == 0)) {
                 /* other bits are useless when BUSY */
                 rq->errors |= ERROR_RESET;
         } else if (stat & ATA_ERR) {
                 /* err has different meaning on cdrom and tape */
                 if (err == ATA_ABORTED) {
-                        if (drive->select.b.lba &&
+                        if ((drive->dev_flags & IDE_DFLAG_LBA) &&
                             /* some newer drives don't support ATA_CMD_INIT_DEV_PARAMS */
                             hwif->tp_ops->read_status(hwif) == ATA_CMD_INIT_DEV_PARAMS)
                                 return ide_stopped;
@@ -428,7 +413,8 @@ static ide_startstop_t ide_atapi_error(ide_drive_t *drive, struct request *rq, u
 {
         ide_hwif_t *hwif = drive->hwif;
 
-        if ((stat & ATA_BUSY) || ((stat & ATA_DF) && !drive->nowerr)) {
+        if ((stat & ATA_BUSY) ||
+            ((stat & ATA_DF) && (drive->dev_flags & IDE_DFLAG_NOWERR) == 0)) {
                 /* other bits are useless when BUSY */
                 rq->errors |= ERROR_RESET;
         } else {
@@ -509,7 +495,7 @@ static void ide_tf_set_specify_cmd(ide_drive_t *drive, struct ide_taskfile *tf)
         tf->lbal    = drive->sect;
         tf->lbam    = drive->cyl;
         tf->lbah    = drive->cyl >> 8;
-        tf->device  = ((drive->head - 1) | drive->select.all) & ~ATA_LBA;
+        tf->device  = (drive->head - 1) | drive->select;
         tf->command = ATA_CMD_INIT_DEV_PARAMS;
 }
 
@@ -557,30 +543,6 @@ static ide_startstop_t ide_disk_special(ide_drive_t *drive)
         return ide_started;
 }
 
-/*
- * handle HDIO_SET_PIO_MODE ioctl abusers here, eventually it will go away
- */
-static int set_pio_mode_abuse(ide_hwif_t *hwif, u8 req_pio)
-{
-        switch (req_pio) {
-        case 202:
-        case 201:
-        case 200:
-        case 102:
-        case 101:
-        case 100:
-                return (hwif->host_flags & IDE_HFLAG_ABUSE_DMA_MODES) ? 1 : 0;
-        case 9:
-        case 8:
-                return (hwif->host_flags & IDE_HFLAG_ABUSE_PREFETCH) ? 1 : 0;
-        case 7:
-        case 6:
-                return (hwif->host_flags & IDE_HFLAG_ABUSE_FAST_DEVSEL) ? 1 : 0;
-        default:
-                return 0;
-        }
-}
-
 /**
  *      do_special              -       issue some special commands
  *      @drive: drive the command is for
@@ -598,45 +560,12 @@ static ide_startstop_t do_special (ide_drive_t *drive)
 #ifdef DEBUG
         printk("%s: do_special: 0x%02x\n", drive->name, s->all);
 #endif
-        if (s->b.set_tune) {
-                ide_hwif_t *hwif = drive->hwif;
-                const struct ide_port_ops *port_ops = hwif->port_ops;
-                u8 req_pio = drive->tune_req;
-
-                s->b.set_tune = 0;
-
-                if (set_pio_mode_abuse(drive->hwif, req_pio)) {
-                        /*
-                         * take ide_lock for drive->[no_]unmask/[no_]io_32bit
-                         */
-                        if (req_pio == 8 || req_pio == 9) {
-                                unsigned long flags;
-
-                                spin_lock_irqsave(&ide_lock, flags);
-                                port_ops->set_pio_mode(drive, req_pio);
-                                spin_unlock_irqrestore(&ide_lock, flags);
-                        } else
-                                port_ops->set_pio_mode(drive, req_pio);
-                } else {
-                        int keep_dma = drive->using_dma;
-
-                        ide_set_pio(drive, req_pio);
-
-                        if (hwif->host_flags & IDE_HFLAG_SET_PIO_MODE_KEEP_DMA) {
-                                if (keep_dma)
-                                        ide_dma_on(drive);
-                        }
-                }
-
-                return ide_stopped;
-        } else {
-                if (drive->media == ide_disk)
-                        return ide_disk_special(drive);
+        if (drive->media == ide_disk)
+                return ide_disk_special(drive);
 
-                s->all = 0;
-                drive->mult_req = 0;
-                return ide_stopped;
-        }
+        s->all = 0;
+        drive->mult_req = 0;
+        return ide_stopped;
 }
 
 void ide_map_sg(ide_drive_t *drive, struct request *rq)
@@ -726,10 +655,7 @@ int ide_devset_execute(ide_drive_t *drive, const struct ide_devset *setting,
         if (!(setting->flags & DS_SYNC))
                 return setting->set(drive, arg);
 
-        rq = blk_get_request(q, READ, GFP_KERNEL);
-        if (!rq)
-                return -ENOMEM;
-
+        rq = blk_get_request(q, READ, __GFP_WAIT);
         rq->cmd_type = REQ_TYPE_SPECIAL;
         rq->cmd_len = 5;
         rq->cmd[0] = REQ_DEVSET_EXEC;
@@ -746,7 +672,32 @@ EXPORT_SYMBOL_GPL(ide_devset_execute);
 
 static ide_startstop_t ide_special_rq(ide_drive_t *drive, struct request *rq)
 {
-        switch (rq->cmd[0]) {
+        u8 cmd = rq->cmd[0];
+
+        if (cmd == REQ_PARK_HEADS || cmd == REQ_UNPARK_HEADS) {
+                ide_task_t task;
+                struct ide_taskfile *tf = &task.tf;
+
+                memset(&task, 0, sizeof(task));
+                if (cmd == REQ_PARK_HEADS) {
+                        drive->sleep = *(unsigned long *)rq->special;
+                        drive->dev_flags |= IDE_DFLAG_SLEEPING;
+                        tf->command = ATA_CMD_IDLEIMMEDIATE;
+                        tf->feature = 0x44;
+                        tf->lbal = 0x4c;
+                        tf->lbam = 0x4e;
+                        tf->lbah = 0x55;
+                        task.tf_flags |= IDE_TFLAG_CUSTOM_HANDLER;
+                } else          /* cmd == REQ_UNPARK_HEADS */
+                        tf->command = ATA_CMD_CHK_POWER;
+
+                task.tf_flags |= IDE_TFLAG_TF | IDE_TFLAG_DEVICE;
+                task.rq = rq;
+                drive->hwif->data_phase = task.data_phase = TASKFILE_NO_DATA;
+                return do_rw_taskfile(drive, &task);
+        }
+
+        switch (cmd) {
         case REQ_DEVSET_EXEC:
         {
                 int err, (*setfunc)(ide_drive_t *, int) = rq->special;
@@ -773,11 +724,11 @@ static void ide_check_pm_state(ide_drive_t *drive, struct request *rq)
         struct request_pm_state *pm = rq->data;
 
         if (blk_pm_suspend_request(rq) &&
-            pm->pm_step == ide_pm_state_start_suspend)
+            pm->pm_step == IDE_PM_START_SUSPEND)
                 /* Mark drive blocked when starting the suspend sequence. */
-                drive->blocked = 1;
+                drive->dev_flags |= IDE_DFLAG_BLOCKED;
         else if (blk_pm_resume_request(rq) &&
-                 pm->pm_step == ide_pm_state_start_resume) {
+                 pm->pm_step == IDE_PM_START_RESUME) {
                 /* 
                  * The first thing we do on wakeup is to wait for BSY bit to
                  * go away (with a looong timeout) as a drive on this hwif may
@@ -857,7 +808,7 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)
 #endif
                         startstop = ide_start_power_step(drive, rq);
                         if (startstop == ide_stopped &&
-                            pm->pm_step == ide_pm_state_completed)
+                            pm->pm_step == IDE_PM_COMPLETED)
                                 ide_complete_pm_request(drive, rq);
                         return startstop;
                 } else if (!rq->rq_disk && blk_special_request(rq))
@@ -895,7 +846,7 @@ void ide_stall_queue (ide_drive_t *drive, unsigned long timeout)
         if (timeout > WAIT_WORSTCASE)
                 timeout = WAIT_WORSTCASE;
         drive->sleep = timeout + jiffies;
-        drive->sleeping = 1;
+        drive->dev_flags |= IDE_DFLAG_SLEEPING;
 }
 
 EXPORT_SYMBOL(ide_stall_queue);
@@ -935,18 +886,23 @@ repeat:
         }
 
         do {
-                if ((!drive->sleeping || time_after_eq(jiffies, drive->sleep))
-                    && !elv_queue_empty(drive->queue)) {
-                        if (!best
-                         || (drive->sleeping && (!best->sleeping || time_before(drive->sleep, best->sleep)))
-                         || (!best->sleeping && time_before(WAKEUP(drive), WAKEUP(best))))
-                        {
+                u8 dev_s = !!(drive->dev_flags & IDE_DFLAG_SLEEPING);
+                u8 best_s = (best && !!(best->dev_flags & IDE_DFLAG_SLEEPING));
+
+                if ((dev_s == 0 || time_after_eq(jiffies, drive->sleep)) &&
+                    !elv_queue_empty(drive->queue)) {
+                        if (best == NULL ||
+                            (dev_s && (best_s == 0 || time_before(drive->sleep, best->sleep))) ||
+                            (best_s == 0 && time_before(WAKEUP(drive), WAKEUP(best)))) {
                                 if (!blk_queue_plugged(drive->queue))
                                         best = drive;
                         }
                 }
         } while ((drive = drive->next) != hwgroup->drive);
-        if (best && best->nice1 && !best->sleeping && best != hwgroup->drive && best->service_time > WAIT_MIN_SLEEP) {
+
+        if (best && (best->dev_flags & IDE_DFLAG_NICE1) &&
+            (best->dev_flags & IDE_DFLAG_SLEEPING) == 0 &&
+            best != hwgroup->drive && best->service_time > WAIT_MIN_SLEEP) {
                 long t = (signed long)(WAKEUP(best) - jiffies);
                 if (t >= WAIT_MIN_SLEEP) {
                 /*
@@ -955,7 +911,7 @@ repeat:
                  */
                         drive = best->next;
                         do {
-                                if (!drive->sleeping
+                                if ((drive->dev_flags & IDE_DFLAG_SLEEPING) == 0
                                  && time_before(jiffies - best->service_time, WAKEUP(drive))
                                  && time_before(WAKEUP(drive), jiffies + t))
                                 {
@@ -1026,7 +982,9 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq)
                         hwgroup->rq = NULL;
                         drive = hwgroup->drive;
                         do {
-                                if (drive->sleeping && (!sleeping || time_before(drive->sleep, sleep))) {
+                                if ((drive->dev_flags & IDE_DFLAG_SLEEPING) &&
+                                    (sleeping == 0 ||
+                                     time_before(drive->sleep, sleep))) {
                                         sleeping = 1;
                                         sleep = drive->sleep;
                                 }
@@ -1075,7 +1033,7 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq)
                 }
                 hwgroup->hwif = hwif;
                 hwgroup->drive = drive;
-                drive->sleeping = 0;
+                drive->dev_flags &= ~(IDE_DFLAG_SLEEPING | IDE_DFLAG_PARKED);
                 drive->service_start = jiffies;
 
                 if (blk_queue_plugged(drive->queue)) {
@@ -1109,7 +1067,9 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq)
                  * We count how many times we loop here to make sure we service
                  * all drives in the hwgroup without looping for ever
                  */
-                if (drive->blocked && !blk_pm_request(rq) && !(rq->cmd_flags & REQ_PREEMPT)) {
+                if ((drive->dev_flags & IDE_DFLAG_BLOCKED) &&
+                    blk_pm_request(rq) == 0 &&
+                    (rq->cmd_flags & REQ_PREEMPT) == 0) {
                         drive = drive->next ? drive->next : hwgroup->drive;
                         if (loops++ < 4 && !blk_queue_plugged(drive->queue))
                                 goto again;
@@ -1182,8 +1142,8 @@ static ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error)
          * a timeout -- we'll reenable after we finish this next request
          * (or rather the first chunk of it) in pio.
          */
+        drive->dev_flags |= IDE_DFLAG_DMA_PIO_RETRY;
         drive->retry_pio++;
-        drive->state = DMA_PIO_RETRY;
         ide_dma_off_quietly(drive);
 
         /*
@@ -1480,23 +1440,16 @@ irqreturn_t ide_intr (int irq, void *dev_id)
         del_timer(&hwgroup->timer);
         spin_unlock(&ide_lock);
 
-        /* Some controllers might set DMA INTR no matter DMA or PIO;
-         * bmdma status might need to be cleared even for
-         * PIO interrupts to prevent spurious/lost irq.
-         */
-        if (hwif->ide_dma_clear_irq && !(drive->waiting_for_dma))
-                /* ide_dma_end() needs bmdma status for error checking.
-                 * So, skip clearing bmdma status here and leave it
-                 * to ide_dma_end() if this is dma interrupt.
-                 */
-                hwif->ide_dma_clear_irq(drive);
+        if (hwif->port_ops && hwif->port_ops->clear_irq)
+                hwif->port_ops->clear_irq(drive);
 
-        if (drive->unmask)
+        if (drive->dev_flags & IDE_DFLAG_UNMASK)
                 local_irq_enable_in_hardirq();
+
         /* service this interrupt, may set handler for next interrupt */
         startstop = handler(drive);
-        spin_lock_irq(&ide_lock);
 
+        spin_lock_irq(&ide_lock);
         /*
          * Note that handler() may have set things up for another
          * interrupt to occur soon, but it cannot happen until
diff --git a/drivers/ide/ide-ioctls.c b/drivers/ide/ide-ioctls.c
index cf01564901af..a90945f49792 100644
--- a/drivers/ide/ide-ioctls.c
+++ b/drivers/ide/ide-ioctls.c
@@ -62,7 +62,7 @@ static int ide_get_identity_ioctl(ide_drive_t *drive, unsigned int cmd,
         int size = (cmd == HDIO_GET_IDENTITY) ? (ATA_ID_WORDS * 2) : 142;
         int rc = 0;
 
-        if (drive->id_read == 0) {
+        if ((drive->dev_flags & IDE_DFLAG_ID_READ) == 0) {
                 rc = -ENOMSG;
                 goto out;
         }
@@ -86,8 +86,10 @@ out:
 
 static int ide_get_nice_ioctl(ide_drive_t *drive, unsigned long arg)
 {
-        return put_user((drive->dsc_overlap << IDE_NICE_DSC_OVERLAP) |
-                        (drive->nice1 << IDE_NICE_1), (long __user *)arg);
+        return put_user((!!(drive->dev_flags & IDE_DFLAG_DSC_OVERLAP)
+                         << IDE_NICE_DSC_OVERLAP) |
+                        (!!(drive->dev_flags & IDE_DFLAG_NICE1)
+                         << IDE_NICE_1), (long __user *)arg);
 }
 
 static int ide_set_nice_ioctl(ide_drive_t *drive, unsigned long arg)
@@ -97,11 +99,18 @@ static int ide_set_nice_ioctl(ide_drive_t *drive, unsigned long arg)
 
         if (((arg >> IDE_NICE_DSC_OVERLAP) & 1) &&
             (drive->media == ide_disk || drive->media == ide_floppy ||
-             drive->scsi))
+             (drive->dev_flags & IDE_DFLAG_SCSI)))
                 return -EPERM;
 
-        drive->dsc_overlap = (arg >> IDE_NICE_DSC_OVERLAP) & 1;
-        drive->nice1 = (arg >> IDE_NICE_1) & 1;
+        if ((arg >> IDE_NICE_DSC_OVERLAP) & 1)
+                drive->dev_flags |= IDE_DFLAG_DSC_OVERLAP;
+        else
+                drive->dev_flags &= ~IDE_DFLAG_DSC_OVERLAP;
+
+        if ((arg >> IDE_NICE_1) & 1)
+                drive->dev_flags |= IDE_DFLAG_NICE1;
+        else
+                drive->dev_flags &= ~IDE_DFLAG_NICE1;
 
         return 0;
 }
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 0a2fd3b37ac4..b762deb2dacb 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -181,7 +181,7 @@ void ide_tf_load(ide_drive_t *drive, ide_task_t *task)
                 tf_outb(tf->lbah, io_ports->lbah_addr);
 
         if (task->tf_flags & IDE_TFLAG_OUT_DEVICE)
-                tf_outb((tf->device & HIHI) | drive->select.all,
+                tf_outb((tf->device & HIHI) | drive->select,
                          io_ports->device_addr);
 }
 EXPORT_SYMBOL_GPL(ide_tf_load);
@@ -647,7 +647,7 @@ u8 eighty_ninty_three (ide_drive_t *drive)
                 return 1;
 
 no_80w:
-        if (drive->udma33_warned == 1)
+        if (drive->dev_flags & IDE_DFLAG_UDMA33_WARNED)
                 return 0;
 
         printk(KERN_WARNING "%s: %s side 80-wire cable detection failed, "
@@ -655,7 +655,7 @@ no_80w:
                             drive->name,
                             hwif->cbl == ATA_CBL_PATA80 ? "drive" : "host");
 
-        drive->udma33_warned = 1;
+        drive->dev_flags |= IDE_DFLAG_UDMA33_WARNED;
 
         return 0;
 }
@@ -711,7 +711,7 @@ int ide_driveid_update(ide_drive_t *drive)
 
         kfree(id);
 
-        if (drive->using_dma && ide_id_dma_bug(drive))
+        if ((drive->dev_flags & IDE_DFLAG_USING_DMA) && ide_id_dma_bug(drive))
                 ide_dma_off(drive);
 
         return 1;
@@ -790,7 +790,7 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
 
  skip:
 #ifdef CONFIG_BLK_DEV_IDEDMA
-        if (speed >= XFER_SW_DMA_0 && drive->using_dma)
+        if (speed >= XFER_SW_DMA_0 && (drive->dev_flags & IDE_DFLAG_USING_DMA))
                 hwif->dma_ops->dma_host_set(drive, 1);
         else if (hwif->dma_ops) /* check if host supports DMA */
                 ide_dma_off_quietly(drive);
@@ -940,6 +940,25 @@ static ide_startstop_t atapi_reset_pollfunc (ide_drive_t *drive)
         return ide_stopped;
 }
 
+static void ide_reset_report_error(ide_hwif_t *hwif, u8 err)
+{
+        static const char *err_master_vals[] =
+                { NULL, "passed", "formatter device error",
+                  "sector buffer error", "ECC circuitry error",
+                  "controlling MPU error" };
+
+        u8 err_master = err & 0x7f;
+
+        printk(KERN_ERR "%s: reset: master: ", hwif->name);
+        if (err_master && err_master < 6)
+                printk(KERN_CONT "%s", err_master_vals[err_master]);
+        else
+                printk(KERN_CONT "error (0x%02x?)", err);
+        if (err & 0x80)
+                printk(KERN_CONT "; slave: failed");
+        printk(KERN_CONT "\n");
+}
+
 /*
  * reset_pollfunc() gets invoked to poll the interface for completion every 50ms
  * during an ide reset operation. If the drives have not yet responded,
@@ -975,31 +994,14 @@ static ide_startstop_t reset_pollfunc (ide_drive_t *drive)
                 drive->failures++;
                 err = -EIO;
         } else  {
-                printk("%s: reset: ", hwif->name);
                 tmp = ide_read_error(drive);
 
                 if (tmp == 1) {
-                        printk("success\n");
+                        printk(KERN_INFO "%s: reset: success\n", hwif->name);
                         drive->failures = 0;
                 } else {
+                        ide_reset_report_error(hwif, tmp);
                         drive->failures++;
-                        printk("master: ");
-                        switch (tmp & 0x7f) {
-                                case 1: printk("passed");
-                                        break;
-                                case 2: printk("formatter device error");
-                                        break;
-                                case 3: printk("sector buffer error");
-                                        break;
-                                case 4: printk("ECC circuitry error");
-                                        break;
-                                case 5: printk("controlling MPU error");
-                                        break;
-                                default:printk("error (0x%02x?)", tmp);
-                        }
-                        if (tmp & 0x80)
-                                printk("; slave: failed");
-                        printk("\n");
                         err = -EIO;
                 }
         }
@@ -1016,9 +1018,14 @@ static void ide_disk_pre_reset(ide_drive_t *drive)
         drive->special.all = 0;
         drive->special.b.set_geometry = legacy;
         drive->special.b.recalibrate  = legacy;
+
         drive->mult_count = 0;
-        if (!drive->keep_settings && !drive->using_dma)
+        drive->dev_flags &= ~IDE_DFLAG_PARKED;
+
+        if ((drive->dev_flags & IDE_DFLAG_KEEP_SETTINGS) == 0 &&
+            (drive->dev_flags & IDE_DFLAG_USING_DMA) == 0)
                 drive->mult_req = 0;
+
         if (drive->mult_req != drive->mult_count)
                 drive->special.b.set_multmode = 1;
 }
@@ -1030,18 +1037,18 @@ static void pre_reset(ide_drive_t *drive)
         if (drive->media == ide_disk)
                 ide_disk_pre_reset(drive);
         else
-                drive->post_reset = 1;
+                drive->dev_flags |= IDE_DFLAG_POST_RESET;
 
-        if (drive->using_dma) {
+        if (drive->dev_flags & IDE_DFLAG_USING_DMA) {
                 if (drive->crc_count)
                         ide_check_dma_crc(drive);
                 else
                         ide_dma_off(drive);
         }
 
-        if (!drive->keep_settings) {
-                if (!drive->using_dma) {
-                        drive->unmask = 0;
+        if ((drive->dev_flags & IDE_DFLAG_KEEP_SETTINGS) == 0) {
+                if ((drive->dev_flags & IDE_DFLAG_USING_DMA) == 0) {
+                        drive->dev_flags &= ~IDE_DFLAG_UNMASK;
                         drive->io_32bit = 0;
                 }
                 return;
@@ -1073,12 +1080,13 @@ static void pre_reset(ide_drive_t *drive)
 static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)
 {
         unsigned int unit;
-        unsigned long flags;
+        unsigned long flags, timeout;
         ide_hwif_t *hwif;
         ide_hwgroup_t *hwgroup;
         struct ide_io_ports *io_ports;
         const struct ide_tp_ops *tp_ops;
         const struct ide_port_ops *port_ops;
+        DEFINE_WAIT(wait);
 
         spin_lock_irqsave(&ide_lock, flags);
         hwif = HWIF(drive);
@@ -1105,6 +1113,31 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)
                 return ide_started;
         }
 
+        /* We must not disturb devices in the IDE_DFLAG_PARKED state. */
+        do {
+                unsigned long now;
+
+                prepare_to_wait(&ide_park_wq, &wait, TASK_UNINTERRUPTIBLE);
+                timeout = jiffies;
+                for (unit = 0; unit < MAX_DRIVES; unit++) {
+                        ide_drive_t *tdrive = &hwif->drives[unit];
+
+                        if (tdrive->dev_flags & IDE_DFLAG_PRESENT &&
+                            tdrive->dev_flags & IDE_DFLAG_PARKED &&
+                            time_after(tdrive->sleep, timeout))
+                                timeout = tdrive->sleep;
+                }
+
+                now = jiffies;
+                if (time_before_eq(timeout, now))
+                        break;
+
+                spin_unlock_irqrestore(&ide_lock, flags);
+                timeout = schedule_timeout_uninterruptible(timeout - now);
+                spin_lock_irqsave(&ide_lock, flags);
+        } while (timeout);
+        finish_wait(&ide_park_wq, &wait);
+
         /*
          * First, reset any device state data we were maintaining
          * for any of the drives on this interface.
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index ed426dd0fdd8..9fc4cfb2a272 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -317,7 +317,7 @@ static void ide_dump_sector(ide_drive_t *drive)
 {
         ide_task_t task;
         struct ide_taskfile *tf = &task.tf;
-        int lba48 = (drive->addressing == 1) ? 1 : 0;
+        u8 lba48 = !!(drive->dev_flags & IDE_DFLAG_LBA48);
 
         memset(&task, 0, sizeof(task));
         if (lba48)
diff --git a/drivers/ide/ide-park.c b/drivers/ide/ide-park.c
new file mode 100644
index 000000000000..03b00e57e93f
--- /dev/null
+++ b/drivers/ide/ide-park.c
@@ -0,0 +1,121 @@
+#include <linux/kernel.h>
+#include <linux/ide.h>
+#include <linux/jiffies.h>
+#include <linux/blkdev.h>
+
+DECLARE_WAIT_QUEUE_HEAD(ide_park_wq);
+
+static void issue_park_cmd(ide_drive_t *drive, unsigned long timeout)
+{
+        struct request_queue *q = drive->queue;
+        struct request *rq;
+        int rc;
+
+        timeout += jiffies;
+        spin_lock_irq(&ide_lock);
+        if (drive->dev_flags & IDE_DFLAG_PARKED) {
+                ide_hwgroup_t *hwgroup = drive->hwif->hwgroup;
+                int reset_timer;
+
+                reset_timer = time_before(timeout, drive->sleep);
+                drive->sleep = timeout;
+                wake_up_all(&ide_park_wq);
+                if (reset_timer && hwgroup->sleeping &&
+                    del_timer(&hwgroup->timer)) {
+                        hwgroup->sleeping = 0;
+                        hwgroup->busy = 0;
+                        blk_start_queueing(q);
+                }
+                spin_unlock_irq(&ide_lock);
+                return;
+        }
+        spin_unlock_irq(&ide_lock);
+
+        rq = blk_get_request(q, READ, __GFP_WAIT);
+        rq->cmd[0] = REQ_PARK_HEADS;
+        rq->cmd_len = 1;
+        rq->cmd_type = REQ_TYPE_SPECIAL;
+        rq->special = &timeout;
+        rc = blk_execute_rq(q, NULL, rq, 1);
+        blk_put_request(rq);
+        if (rc)
+                goto out;
+
+        /*
+         * Make sure that *some* command is sent to the drive after the
+         * timeout has expired, so power management will be reenabled.
+         */
+        rq = blk_get_request(q, READ, GFP_NOWAIT);
+        if (unlikely(!rq))
+                goto out;
+
+        rq->cmd[0] = REQ_UNPARK_HEADS;
+        rq->cmd_len = 1;
+        rq->cmd_type = REQ_TYPE_SPECIAL;
+        elv_add_request(q, rq, ELEVATOR_INSERT_FRONT, 1);
+
+out:
+        return;
+}
+
+ssize_t ide_park_show(struct device *dev, struct device_attribute *attr,
+                      char *buf)
+{
+        ide_drive_t *drive = to_ide_device(dev);
+        unsigned long now;
+        unsigned int msecs;
+
+        if (drive->dev_flags & IDE_DFLAG_NO_UNLOAD)
+                return -EOPNOTSUPP;
+
+        spin_lock_irq(&ide_lock);
+        now = jiffies;
+        if (drive->dev_flags & IDE_DFLAG_PARKED &&
+            time_after(drive->sleep, now))
+                msecs = jiffies_to_msecs(drive->sleep - now);
+        else
+                msecs = 0;
+        spin_unlock_irq(&ide_lock);
+
+        return snprintf(buf, 20, "%u\n", msecs);
+}
+
+ssize_t ide_park_store(struct device *dev, struct device_attribute *attr,
+                       const char *buf, size_t len)
+{
+#define MAX_PARK_TIMEOUT 30000
+        ide_drive_t *drive = to_ide_device(dev);
+        long int input;
+        int rc;
+
+        rc = strict_strtol(buf, 10, &input);
+        if (rc || input < -2)
+                return -EINVAL;
+        if (input > MAX_PARK_TIMEOUT) {
+                input = MAX_PARK_TIMEOUT;
+                rc = -EOVERFLOW;
+        }
+
+        mutex_lock(&ide_setting_mtx);
+        if (input >= 0) {
+                if (drive->dev_flags & IDE_DFLAG_NO_UNLOAD)
+                        rc = -EOPNOTSUPP;
+                else if (input || drive->dev_flags & IDE_DFLAG_PARKED)
+                        issue_park_cmd(drive, msecs_to_jiffies(input));
+        } else {
+                if (drive->media == ide_disk)
+                        switch (input) {
+                        case -1:
+                                drive->dev_flags &= ~IDE_DFLAG_NO_UNLOAD;
+                                break;
+                        case -2:
+                                drive->dev_flags |= IDE_DFLAG_NO_UNLOAD;
+                                break;
+                        }
+                else
+                        rc = -EOPNOTSUPP;
+        }
+        mutex_unlock(&ide_setting_mtx);
+
+        return rc ? rc : len;
+}
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 06575a12b635..19f8c7770a25 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -121,7 +121,8 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd)
         /* read 512 bytes of id info */
         hwif->tp_ops->input_data(drive, NULL, id, SECTOR_SIZE);
 
-        drive->id_read = 1;
+        drive->dev_flags |= IDE_DFLAG_ID_READ;
+
         local_irq_enable();
 #ifdef DEBUG
         printk(KERN_INFO "%s: dumping identify data\n", drive->name);
@@ -153,8 +154,8 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd)
 
         printk(KERN_INFO "%s: %s, ", drive->name, m);
 
-        drive->present = 1;
-        drive->dead = 0;
+        drive->dev_flags |= IDE_DFLAG_PRESENT;
+        drive->dev_flags &= ~IDE_DFLAG_DEAD;
 
         /*
          * Check for an ATAPI device
@@ -172,14 +173,14 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd)
                                                 printk(KERN_CONT "cdrom or floppy?, assuming ");
                                         if (drive->media != ide_cdrom) {
                                                 printk(KERN_CONT "FLOPPY");
-                                                drive->removable = 1;
+                                                drive->dev_flags |= IDE_DFLAG_REMOVABLE;
                                                 break;
                                         }
                                 }
                                 /* Early cdrom models used zero */
                                 type = ide_cdrom;
                         case ide_cdrom:
-                                drive->removable = 1;
+                                drive->dev_flags |= IDE_DFLAG_REMOVABLE;
 #ifdef CONFIG_PPC
                                 /* kludge for Apple PowerBook internal zip */
                                 if (!strstr(m, "CD-ROM") && strstr(m, "ZIP")) {
@@ -195,7 +196,7 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd)
                                 break;
                         case ide_optical:
                                 printk(KERN_CONT "OPTICAL");
-                                drive->removable = 1;
+                                drive->dev_flags |= IDE_DFLAG_REMOVABLE;
                                 break;
                         default:
                                 printk(KERN_CONT "UNKNOWN (type %d)", type);
@@ -205,6 +206,10 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd)
                 drive->media = type;
                 /* an ATAPI device ignores DRDY */
                 drive->ready_stat = 0;
+                if (ata_id_cdb_intr(id))
+                        drive->atapi_flags |= IDE_AFLAG_DRQ_INTERRUPT;
+                /* we don't do head unloading on ATAPI devices */
+                drive->dev_flags |= IDE_DFLAG_NO_UNLOAD;
                 return;
         }
 
@@ -216,17 +221,20 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd)
 
         /* CF devices are *not* removable in Linux definition of the term */
         if (is_cfa == 0 && (id[ATA_ID_CONFIG] & (1 << 7)))
-                drive->removable = 1;
+                drive->dev_flags |= IDE_DFLAG_REMOVABLE;
 
         drive->media = ide_disk;
 
+        if (!ata_id_has_unload(drive->id))
+                drive->dev_flags |= IDE_DFLAG_NO_UNLOAD;
+
         printk(KERN_CONT "%s DISK drive\n", is_cfa ? "CFA" : "ATA");
 
         return;
 
 err_misc:
         kfree(id);
-        drive->present = 0;
+        drive->dev_flags &= ~IDE_DFLAG_PRESENT;
         return;
 }
 
@@ -426,16 +434,15 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
         ide_hwif_t *hwif = HWIF(drive);
         const struct ide_tp_ops *tp_ops = hwif->tp_ops;
         int rc;
-        u8 stat;
+        u8 present = !!(drive->dev_flags & IDE_DFLAG_PRESENT), stat;
+
+        /* avoid waiting for inappropriate probes */
+        if (present && drive->media != ide_disk && cmd == ATA_CMD_ID_ATA)
+                return 4;
 
-        if (drive->present) {
-                /* avoid waiting for inappropriate probes */
-                if (drive->media != ide_disk && cmd == ATA_CMD_ID_ATA)
-                        return 4;
-        }
 #ifdef DEBUG
         printk(KERN_INFO "probing for %s: present=%d, media=%d, probetype=%s\n",
-                drive->name, drive->present, drive->media,
+                drive->name, present, drive->media,
                 (cmd == ATA_CMD_ID_ATA) ? "ATA" : "ATAPI");
 #endif
 
@@ -446,8 +453,8 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
         SELECT_DRIVE(drive);
         msleep(50);
 
-        if (ide_read_device(drive) != drive->select.all && !drive->present) {
-                if (drive->select.b.unit != 0) {
+        if (ide_read_device(drive) != drive->select && present == 0) {
+                if (drive->dn & 1) {
                         /* exit with drive0 selected */
                         SELECT_DRIVE(&hwif->drives[0]);
                         /* allow ATA_BUSY to assert & clear */
@@ -460,7 +467,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
         stat = tp_ops->read_status(hwif);
 
         if (OK_STAT(stat, ATA_DRDY, ATA_BUSY) ||
-            drive->present || cmd == ATA_CMD_ID_ATAPI) {
+            present || cmd == ATA_CMD_ID_ATAPI) {
                 /* send cmd and wait */
                 if ((rc = try_to_identify(drive, cmd))) {
                         /* failed: try again */
@@ -493,7 +500,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
                 /* not present or maybe ATAPI */
                 rc = 3;
         }
-        if (drive->select.b.unit != 0) {
+        if (drive->dn & 1) {
                 /* exit with drive0 selected */
                 SELECT_DRIVE(&hwif->drives[0]);
                 msleep(50);
@@ -542,8 +549,8 @@ static void enable_nest (ide_drive_t *drive)
  *      and presents things to the user as needed.
  *
  *      Returns:        0  no device was found
- *                      1  device was found (note: drive->present might
- *                         still be 0)
+ *                      1  device was found
+ *                         (note: IDE_DFLAG_PRESENT might still be not set)
  */
  
 static inline u8 probe_for_drive (ide_drive_t *drive)
@@ -559,10 +566,10 @@ static inline u8 probe_for_drive (ide_drive_t *drive)
          *      Also note that 0 everywhere means "can't do X"
          */
  
+        drive->dev_flags &= ~IDE_DFLAG_ID_READ;
+
         drive->id = kzalloc(SECTOR_SIZE, GFP_KERNEL);
-        drive->id_read = 0;
-        if(drive->id == NULL)
-        {
+        if (drive->id == NULL) {
                 printk(KERN_ERR "ide: out of memory for id data.\n");
                 return 0;
         }
@@ -571,14 +578,14 @@ static inline u8 probe_for_drive (ide_drive_t *drive)
         strcpy(m, "UNKNOWN");
 
         /* skip probing? */
-        if (!drive->noprobe) {
+        if ((drive->dev_flags & IDE_DFLAG_NOPROBE) == 0) {
 retry:
                 /* if !(success||timed-out) */
                 if (do_probe(drive, ATA_CMD_ID_ATA) >= 2)
                         /* look for ATAPI device */
                         (void)do_probe(drive, ATA_CMD_ID_ATAPI);
 
-                if (!drive->present)
+                if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0)
                         /* drive not found */
                         return 0;
 
@@ -588,7 +595,7 @@ retry:
                 }
 
                 /* identification failed? */
-                if (!drive->id_read) {
+                if ((drive->dev_flags & IDE_DFLAG_ID_READ) == 0) {
                         if (drive->media == ide_disk) {
                                 printk(KERN_INFO "%s: non-IDE drive, CHS=%d/%d/%d\n",
                                         drive->name, drive->cyl,
@@ -598,15 +605,17 @@ retry:
                         } else {
                                 /* nuke it */
                                 printk(KERN_WARNING "%s: Unknown device on bus refused identification. Ignoring.\n", drive->name);
-                                drive->present = 0;
+                                drive->dev_flags &= ~IDE_DFLAG_PRESENT;
                         }
                 }
                 /* drive was found */
         }
-        if(!drive->present)
+
+        if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0)
                 return 0;
+
         /* The drive wasn't being helpful. Add generic info only */
-        if (drive->id_read == 0) {
+        if ((drive->dev_flags & IDE_DFLAG_ID_READ) == 0) {
                 generic_id(drive);
                 return 1;
         }
@@ -616,7 +625,7 @@ retry:
                 ide_disk_init_mult_count(drive);
         }
 
-        return drive->present;
+        return !!(drive->dev_flags & IDE_DFLAG_PRESENT);
 }
 
 static void hwif_release_dev(struct device *dev)
@@ -648,8 +657,8 @@ static int ide_register_port(ide_hwif_t *hwif)
                 goto out;
         }
 
-        hwif->portdev = device_create_drvdata(ide_port_class, &hwif->gendev,
-                                              MKDEV(0, 0), hwif, hwif->name);
+        hwif->portdev = device_create(ide_port_class, &hwif->gendev,
+                                      MKDEV(0, 0), hwif, hwif->name);
         if (IS_ERR(hwif->portdev)) {
                 ret = PTR_ERR(hwif->portdev);
                 device_unregister(&hwif->gendev);
@@ -707,7 +716,8 @@ static int ide_port_wait_ready(ide_hwif_t *hwif)
                 ide_drive_t *drive = &hwif->drives[unit];
 
                 /* Ignore disks that we will not probe for later. */
-                if (!drive->noprobe || drive->present) {
+                if ((drive->dev_flags & IDE_DFLAG_NOPROBE) == 0 ||
+                    (drive->dev_flags & IDE_DFLAG_PRESENT)) {
                         SELECT_DRIVE(drive);
                         hwif->tp_ops->set_irq(hwif, 1);
                         mdelay(2);
@@ -739,7 +749,7 @@ void ide_undecoded_slave(ide_drive_t *dev1)
 {
         ide_drive_t *dev0 = &dev1->hwif->drives[0];
 
-        if ((dev1->dn & 1) == 0 || dev0->present == 0)
+        if ((dev1->dn & 1) == 0 || (dev0->dev_flags & IDE_DFLAG_PRESENT) == 0)
                 return;
 
         /* If the models don't match they are not the same product */
@@ -759,7 +769,7 @@ void ide_undecoded_slave(ide_drive_t *dev1)
         /* Appears to be an IDE flash adapter with decode bugs */
         printk(KERN_WARNING "ide-probe: ignoring undecoded slave\n");
 
-        dev1->present = 0;
+        dev1->dev_flags &= ~IDE_DFLAG_PRESENT;
 }
 
 EXPORT_SYMBOL_GPL(ide_undecoded_slave);
@@ -772,7 +782,8 @@ static int ide_probe_port(ide_hwif_t *hwif)
 
         BUG_ON(hwif->present);
 
-        if (hwif->drives[0].noprobe && hwif->drives[1].noprobe)
+        if ((hwif->drives[0].dev_flags & IDE_DFLAG_NOPROBE) &&
+            (hwif->drives[1].dev_flags & IDE_DFLAG_NOPROBE))
                 return -EACCES;
 
         /*
@@ -794,9 +805,9 @@ static int ide_probe_port(ide_hwif_t *hwif)
          */
         for (unit = 0; unit < MAX_DRIVES; ++unit) {
                 ide_drive_t *drive = &hwif->drives[unit];
-                drive->dn = (hwif->channel ? 2 : 0) + unit;
+
                 (void) probe_for_drive(drive);
-                if (drive->present)
+                if (drive->dev_flags & IDE_DFLAG_PRESENT)
                         rc = 0;
         }
 
@@ -820,17 +831,19 @@ static void ide_port_tune_devices(ide_hwif_t *hwif)
         for (unit = 0; unit < MAX_DRIVES; unit++) {
                 ide_drive_t *drive = &hwif->drives[unit];
 
-                if (drive->present && port_ops && port_ops->quirkproc)
-                        port_ops->quirkproc(drive);
+                if (drive->dev_flags & IDE_DFLAG_PRESENT) {
+                        if (port_ops && port_ops->quirkproc)
+                                port_ops->quirkproc(drive);
+                }
         }
 
         for (unit = 0; unit < MAX_DRIVES; ++unit) {
                 ide_drive_t *drive = &hwif->drives[unit];
 
-                if (drive->present) {
+                if (drive->dev_flags & IDE_DFLAG_PRESENT) {
                         ide_set_max_pio(drive);
 
-                        drive->nice1 = 1;
+                        drive->dev_flags |= IDE_DFLAG_NICE1;
 
                         if (hwif->dma_ops)
                                 ide_set_dma(drive);
@@ -840,14 +853,14 @@ static void ide_port_tune_devices(ide_hwif_t *hwif)
         for (unit = 0; unit < MAX_DRIVES; ++unit) {
                 ide_drive_t *drive = &hwif->drives[unit];
 
-                if (hwif->host_flags & IDE_HFLAG_NO_IO_32BIT)
-                        drive->no_io_32bit = 1;
+                if ((hwif->host_flags & IDE_HFLAG_NO_IO_32BIT) ||
+                    drive->id[ATA_ID_DWORD_IO])
+                        drive->dev_flags |= IDE_DFLAG_NO_IO_32BIT;
                 else
-                        drive->no_io_32bit = drive->id[ATA_ID_DWORD_IO] ? 1 : 0;
+                        drive->dev_flags &= ~IDE_DFLAG_NO_IO_32BIT;
         }
 }
 
-#if MAX_HWIFS > 1
 /*
  * save_match() is used to simplify logic in init_irq() below.
  *
@@ -872,7 +885,6 @@ static void save_match(ide_hwif_t *hwif, ide_hwif_t *new, ide_hwif_t **match)
         if (!m || m->irq != hwif->irq) /* don't undo a prior perfect match */
                 *match = new;
 }
-#endif /* MAX_HWIFS > 1 */
 
 /*
  * init request queue
@@ -951,26 +963,33 @@ static void ide_add_drive_to_hwgroup(ide_drive_t *drive)
  * - allocate the block device queue
  * - link drive into the hwgroup
  */
-static void ide_port_setup_devices(ide_hwif_t *hwif)
+static int ide_port_setup_devices(ide_hwif_t *hwif)
 {
-        int i;
+        int i, j = 0;
 
         mutex_lock(&ide_cfg_mtx);
         for (i = 0; i < MAX_DRIVES; i++) {
                 ide_drive_t *drive = &hwif->drives[i];
 
-                if (!drive->present)
+                if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0)
                         continue;
 
                 if (ide_init_queue(drive)) {
                         printk(KERN_ERR "ide: failed to init %s\n",
                                         drive->name);
+                        kfree(drive->id);
+                        drive->id = NULL;
+                        drive->dev_flags &= ~IDE_DFLAG_PRESENT;
                         continue;
                 }
 
+                j++;
+
                 ide_add_drive_to_hwgroup(drive);
         }
         mutex_unlock(&ide_cfg_mtx);
+
+        return j;
 }
 
 static ide_hwif_t *ide_ports[MAX_HWIFS];
@@ -1029,7 +1048,7 @@ static int init_irq (ide_hwif_t *hwif)
 
         mutex_lock(&ide_cfg_mtx);
         hwif->hwgroup = NULL;
-#if MAX_HWIFS > 1
+
         /*
          * Group up with any other hwifs that share our irq(s).
          */
@@ -1054,7 +1073,7 @@ static int init_irq (ide_hwif_t *hwif)
                         }
                 }
         }
-#endif /* MAX_HWIFS > 1 */
+
         /*
          * If we are still without a hwgroup, then form a new one
          */
@@ -1153,12 +1172,13 @@ static struct kobject *ata_probe(dev_t dev, int *part, void *data)
         ide_hwif_t *hwif = data;
         int unit = *part >> PARTN_BITS;
         ide_drive_t *drive = &hwif->drives[unit];
-        if (!drive->present)
+
+        if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0)
                 return NULL;
 
         if (drive->media == ide_disk)
                 request_module("ide-disk");
-        if (drive->scsi)
+        if (drive->dev_flags & IDE_DFLAG_SCSI)
                 request_module("ide-scsi");
         if (drive->media == ide_cdrom || drive->media == ide_optical)
                 request_module("ide-cd");
@@ -1205,7 +1225,7 @@ EXPORT_SYMBOL_GPL(ide_unregister_region);
 void ide_init_disk(struct gendisk *disk, ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
-        unsigned int unit = (drive->select.all >> 4) & 1;
+        unsigned int unit = drive->dn & 1;
 
         disk->major = hwif->major;
         disk->first_minor = unit << PARTN_BITS;
@@ -1248,7 +1268,7 @@ static void drive_release_dev (struct device *dev)
         ide_remove_drive_from_hwgroup(drive);
         kfree(drive->id);
         drive->id = NULL;
-        drive->present = 0;
+        drive->dev_flags &= ~IDE_DFLAG_PRESENT;
         /* Messed up locking ... */
         spin_unlock_irq(&ide_lock);
         blk_cleanup_queue(drive->queue);
@@ -1327,7 +1347,7 @@ static void hwif_register_devices(ide_hwif_t *hwif)
                 struct device *dev = &drive->gendev;
                 int ret;
 
-                if (!drive->present)
+                if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0)
                         continue;
 
                 snprintf(dev->bus_id, BUS_ID_SIZE, "%u.%u", hwif->index, i);
@@ -1351,12 +1371,14 @@ static void ide_port_init_devices(ide_hwif_t *hwif)
         for (i = 0; i < MAX_DRIVES; i++) {
                 ide_drive_t *drive = &hwif->drives[i];
 
+                drive->dn = i + hwif->channel * 2;
+
                 if (hwif->host_flags & IDE_HFLAG_IO_32BIT)
                         drive->io_32bit = 1;
                 if (hwif->host_flags & IDE_HFLAG_UNMASK_IRQS)
-                        drive->unmask = 1;
+                        drive->dev_flags |= IDE_DFLAG_UNMASK;
                 if (hwif->host_flags & IDE_HFLAG_NO_UNMASK_IRQS)
-                        drive->no_unmask = 1;
+                        drive->dev_flags |= IDE_DFLAG_NO_UNMASK;
 
                 if (port_ops && port_ops->init_dev)
                         port_ops->init_dev(drive);
@@ -1513,19 +1535,14 @@ static int ide_find_port_slot(const struct ide_port_info *d)
          * ports 0x1f0/0x170 (the ide0/ide1 defaults).
          */
         mutex_lock(&ide_cfg_mtx);
-        if (MAX_HWIFS == 1) {
-                if (ide_indexes == 0 && i == 0)
-                        idx = 1;
+        if (bootable) {
+                if ((ide_indexes | i) != (1 << MAX_HWIFS) - 1)
+                        idx = ffz(ide_indexes | i);
         } else {
-                if (bootable) {
-                        if ((ide_indexes | i) != (1 << MAX_HWIFS) - 1)
-                                idx = ffz(ide_indexes | i);
-                } else {
-                        if ((ide_indexes | 3) != (1 << MAX_HWIFS) - 1)
-                                idx = ffz(ide_indexes | 3);
-                        else if ((ide_indexes & 3) != 3)
-                                idx = ffz(ide_indexes);
-                }
+                if ((ide_indexes | 3) != (1 << MAX_HWIFS) - 1)
+                        idx = ffz(ide_indexes | 3);
+                else if ((ide_indexes & 3) != 3)
+                        idx = ffz(ide_indexes);
         }
         if (idx >= 0)
                 ide_indexes |= (1 << idx);
@@ -1541,8 +1558,7 @@ static void ide_free_port_slot(int idx)
         mutex_unlock(&ide_cfg_mtx);
 }
 
-struct ide_host *ide_host_alloc_all(const struct ide_port_info *d,
-                                    hw_regs_t **hws)
+struct ide_host *ide_host_alloc(const struct ide_port_info *d, hw_regs_t **hws)
 {
         struct ide_host *host;
         int i;
@@ -1551,7 +1567,7 @@ struct ide_host *ide_host_alloc_all(const struct ide_port_info *d,
         if (host == NULL)
                 return NULL;
 
-        for (i = 0; i < MAX_HWIFS; i++) {
+        for (i = 0; i < MAX_HOST_PORTS; i++) {
                 ide_hwif_t *hwif;
                 int idx;
 
@@ -1593,18 +1609,6 @@ struct ide_host *ide_host_alloc_all(const struct ide_port_info *d,
 
         return host;
 }
-EXPORT_SYMBOL_GPL(ide_host_alloc_all);
-
-struct ide_host *ide_host_alloc(const struct ide_port_info *d, hw_regs_t **hws)
-{
-        hw_regs_t *hws_all[MAX_HWIFS];
-        int i;
-
-        for (i = 0; i < MAX_HWIFS; i++)
-                hws_all[i] = (i < 4) ? hws[i] : NULL;
-
-        return ide_host_alloc_all(d, hws_all);
-}
 EXPORT_SYMBOL_GPL(ide_host_alloc);
 
 int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
@@ -1613,7 +1617,7 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
         ide_hwif_t *hwif, *mate = NULL;
         int i, j = 0;
 
-        for (i = 0; i < MAX_HWIFS; i++) {
+        for (i = 0; i < MAX_HOST_PORTS; i++) {
                 hwif = host->ports[i];
 
                 if (hwif == NULL) {
@@ -1626,22 +1630,22 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
 
                 if (d == NULL) {
                         mate = NULL;
-                        continue;
-                }
+                } else {
+                        if ((i & 1) && mate) {
+                                hwif->mate = mate;
+                                mate->mate = hwif;
+                        }
 
-                if ((i & 1) && mate) {
-                        hwif->mate = mate;
-                        mate->mate = hwif;
-                }
+                        mate = (i & 1) ? NULL : hwif;
 
-                mate = (i & 1) ? NULL : hwif;
+                        ide_init_port(hwif, i & 1, d);
+                        ide_port_cable_detect(hwif);
+                }
 
-                ide_init_port(hwif, i & 1, d);
-                ide_port_cable_detect(hwif);
                 ide_port_init_devices(hwif);
         }
 
-        for (i = 0; i < MAX_HWIFS; i++) {
+        for (i = 0; i < MAX_HOST_PORTS; i++) {
                 hwif = host->ports[i];
 
                 if (hwif == NULL)
@@ -1658,7 +1662,7 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
                         ide_port_tune_devices(hwif);
         }
 
-        for (i = 0; i < MAX_HWIFS; i++) {
+        for (i = 0; i < MAX_HOST_PORTS; i++) {
                 hwif = host->ports[i];
 
                 if (hwif == NULL)
@@ -1671,10 +1675,13 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
                         continue;
                 }
 
-                j++;
-
                 if (hwif->present)
-                        ide_port_setup_devices(hwif);
+                        if (ide_port_setup_devices(hwif) == 0) {
+                                hwif->present = 0;
+                                continue;
+                        }
+
+                j++;
 
                 ide_acpi_init(hwif);
 
@@ -1682,7 +1689,7 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
                         ide_acpi_port_init_devices(hwif);
         }
 
-        for (i = 0; i < MAX_HWIFS; i++) {
+        for (i = 0; i < MAX_HOST_PORTS; i++) {
                 hwif = host->ports[i];
 
                 if (hwif == NULL)
@@ -1695,7 +1702,7 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
                         hwif_register_devices(hwif);
         }
 
-        for (i = 0; i < MAX_HWIFS; i++) {
+        for (i = 0; i < MAX_HOST_PORTS; i++) {
                 hwif = host->ports[i];
 
                 if (hwif == NULL)
@@ -1740,7 +1747,7 @@ void ide_host_free(struct ide_host *host)
         ide_hwif_t *hwif;
         int i;
 
-        for (i = 0; i < MAX_HWIFS; i++) {
+        for (i = 0; i < MAX_HOST_PORTS; i++) {
                 hwif = host->ports[i];
 
                 if (hwif == NULL)
@@ -1758,7 +1765,7 @@ void ide_host_remove(struct ide_host *host)
 {
         int i;
 
-        for (i = 0; i < MAX_HWIFS; i++) {
+        for (i = 0; i < MAX_HOST_PORTS; i++) {
                 if (host->ports[i])
                         ide_unregister(host->ports[i]);
         }
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c
index e7030a491463..b26926487cc0 100644
--- a/drivers/ide/ide-proc.c
+++ b/drivers/ide/ide-proc.c
@@ -227,7 +227,7 @@ static int set_xfer_rate (ide_drive_t *drive, int arg)
 
 ide_devset_rw(current_speed, xfer_rate);
 ide_devset_rw_field(init_speed, init_speed);
-ide_devset_rw_field(nice1, nice1);
+ide_devset_rw_flag(nice1, IDE_DFLAG_NICE1);
 ide_devset_rw_field(number, dn);
 
 static const struct ide_proc_devset ide_generic_settings[] = {
@@ -622,9 +622,7 @@ void ide_proc_port_register_devices(ide_hwif_t *hwif)
         for (d = 0; d < MAX_DRIVES; d++) {
                 ide_drive_t *drive = &hwif->drives[d];
 
-                if (!drive->present)
-                        continue;
-                if (drive->proc)
+                if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0 || drive->proc)
                         continue;
 
                 drive->proc = proc_mkdir(drive->name, parent);
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index f8c84df4a0bc..d879c7797cde 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -172,23 +172,16 @@ typedef struct ide_tape_obj {
         struct kref     kref;
 
         /*
-         *      pc points to the current processed packet command.
-         *
          *      failed_pc points to the last failed packet command, or contains
          *      NULL if we do not need to retry any packet command. This is
          *      required since an additional packet command is needed before the
          *      retry, to get detailed information on what went wrong.
          */
-        /* Current packet command */
-        struct ide_atapi_pc *pc;
         /* Last failed packet command */
         struct ide_atapi_pc *failed_pc;
         /* used by REQ_IDETAPE_{READ,WRITE} requests */
         struct ide_atapi_pc queued_pc;
 
-        struct ide_atapi_pc request_sense_pc;
-        struct request request_sense_rq;
-
         /*
          * DSC polling variables.
          *
@@ -274,11 +267,6 @@ static DEFINE_MUTEX(idetape_ref_mutex);
 
 static struct class *idetape_sysfs_class;
 
-#define to_ide_tape(obj) container_of(obj, struct ide_tape_obj, kref)
-
-#define ide_tape_g(disk) \
-        container_of((disk)->private_data, struct ide_tape_obj, driver)
-
 static void ide_tape_release(struct kref *);
 
 static struct ide_tape_obj *ide_tape_get(struct gendisk *disk)
@@ -286,7 +274,7 @@ static struct ide_tape_obj *ide_tape_get(struct gendisk *disk)
         struct ide_tape_obj *tape = NULL;
 
         mutex_lock(&idetape_ref_mutex);
-        tape = ide_tape_g(disk);
+        tape = ide_drv_g(disk, ide_tape_obj);
         if (tape) {
                 if (ide_device_get(tape->drive))
                         tape = NULL;
@@ -313,8 +301,6 @@ static void ide_tape_put(struct ide_tape_obj *tape)
  */
 static struct ide_tape_obj *idetape_devs[MAX_HWIFS * MAX_DRIVES];
 
-#define ide_tape_f(file) ((file)->private_data)
-
 static struct ide_tape_obj *ide_tape_chrdev_get(unsigned int i)
 {
         struct ide_tape_obj *tape = NULL;
@@ -522,14 +508,19 @@ static int idetape_end_request(ide_drive_t *drive, int uptodate, int nr_sects)
         return 0;
 }
 
-static void ide_tape_callback(ide_drive_t *drive)
+static void ide_tape_handle_dsc(ide_drive_t *);
+
+static void ide_tape_callback(ide_drive_t *drive, int dsc)
 {
         idetape_tape_t *tape = drive->driver_data;
-        struct ide_atapi_pc *pc = tape->pc;
+        struct ide_atapi_pc *pc = drive->pc;
         int uptodate = pc->error ? 0 : 1;
 
         debug_log(DBG_PROCS, "Enter %s\n", __func__);
 
+        if (dsc)
+                ide_tape_handle_dsc(drive);
+
         if (tape->failed_pc == pc)
                 tape->failed_pc = NULL;
 
@@ -558,7 +549,7 @@ static void ide_tape_callback(ide_drive_t *drive)
                 if (pc->error)
                         uptodate = pc->error;
         } else if (pc->c[0] == READ_POSITION && uptodate) {
-                u8 *readpos = tape->pc->buf;
+                u8 *readpos = pc->buf;
 
                 debug_log(DBG_SENSE, "BOP - %s\n",
                                 (readpos[0] & 0x80) ? "Yes" : "No");
@@ -583,31 +574,6 @@ static void ide_tape_callback(ide_drive_t *drive)
         idetape_end_request(drive, uptodate, 0);
 }
 
-static void idetape_create_request_sense_cmd(struct ide_atapi_pc *pc)
-{
-        ide_init_pc(pc);
-        pc->c[0] = REQUEST_SENSE;
-        pc->c[4] = 20;
-        pc->req_xfer = 20;
-}
-
-/*
- *      idetape_retry_pc is called when an error was detected during the
- *      last packet command. We queue a request sense packet command in
- *      the head of the request list.
- */
-static void idetape_retry_pc(ide_drive_t *drive)
-{
-        struct ide_tape_obj *tape = drive->driver_data;
-        struct request *rq = &tape->request_sense_rq;
-        struct ide_atapi_pc *pc = &tape->request_sense_pc;
-
-        (void)ide_read_error(drive);
-        idetape_create_request_sense_cmd(pc);
-        set_bit(IDE_AFLAG_IGNORE_DSC, &drive->atapi_flags);
-        ide_queue_pc_head(drive, tape->disk, pc, rq);
-}
-
 /*
  * Postpone the current request so that ide.c will be able to service requests
  * from another device on the same hwgroup while we are polling for DSC.
@@ -646,34 +612,18 @@ static int ide_tape_io_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,
 }
 
 /*
- * This is the usual interrupt handler which will be called during a packet
- * command. We will transfer some of the data (as requested by the drive) and
- * will re-point interrupt handler to us. When data transfer is finished, we
- * will act according to the algorithm described before
- * idetape_issue_pc.
- */
-static ide_startstop_t idetape_pc_intr(ide_drive_t *drive)
-{
-        idetape_tape_t *tape = drive->driver_data;
-
-        return ide_pc_intr(drive, tape->pc, idetape_pc_intr, WAIT_TAPE_CMD,
-                           NULL, idetape_update_buffers, idetape_retry_pc,
-                           ide_tape_handle_dsc, ide_tape_io_buffers);
-}
-
-/*
  * Packet Command Interface
  *
- * The current Packet Command is available in tape->pc, and will not change
+ * The current Packet Command is available in drive->pc, and will not change
  * until we finish handling it. Each packet command is associated with a
  * callback function that will be called when the command is finished.
  *
  * The handling will be done in three stages:
  *
  * 1. idetape_issue_pc will send the packet command to the drive, and will set
- * the interrupt handler to idetape_pc_intr.
+ * the interrupt handler to ide_pc_intr.
  *
- * 2. On each interrupt, idetape_pc_intr will be called. This step will be
+ * 2. On each interrupt, ide_pc_intr will be called. This step will be
  * repeated until the device signals us that no more interrupts will be issued.
  *
  * 3. ATAPI Tape media access commands have immediate status with a delayed
@@ -697,20 +647,13 @@ static ide_startstop_t idetape_pc_intr(ide_drive_t *drive)
  * again, the callback function will be called and then we will handle the next
  * request.
  */
-static ide_startstop_t idetape_transfer_pc(ide_drive_t *drive)
-{
-        idetape_tape_t *tape = drive->driver_data;
-
-        return ide_transfer_pc(drive, tape->pc, idetape_pc_intr,
-                               WAIT_TAPE_CMD, NULL);
-}
 
 static ide_startstop_t idetape_issue_pc(ide_drive_t *drive,
                 struct ide_atapi_pc *pc)
 {
         idetape_tape_t *tape = drive->driver_data;
 
-        if (tape->pc->c[0] == REQUEST_SENSE &&
+        if (drive->pc->c[0] == REQUEST_SENSE &&
             pc->c[0] == REQUEST_SENSE) {
                 printk(KERN_ERR "ide-tape: possible ide-tape.c bug - "
                         "Two request sense in serial were issued\n");
@@ -718,8 +661,9 @@ static ide_startstop_t idetape_issue_pc(ide_drive_t *drive,
 
         if (tape->failed_pc == NULL && pc->c[0] != REQUEST_SENSE)
                 tape->failed_pc = pc;
+
         /* Set the current packet command */
-        tape->pc = pc;
+        drive->pc = pc;
 
         if (pc->retries > IDETAPE_MAX_PC_RETRIES ||
                 (pc->flags & PC_FLAG_ABORT)) {
@@ -743,15 +687,14 @@ static ide_startstop_t idetape_issue_pc(ide_drive_t *drive,
                         pc->error = IDETAPE_ERROR_GENERAL;
                 }
                 tape->failed_pc = NULL;
-                drive->pc_callback(drive);
+                drive->pc_callback(drive, 0);
                 return ide_stopped;
         }
         debug_log(DBG_SENSE, "Retry #%d, cmd = %02X\n", pc->retries, pc->c[0]);
 
         pc->retries++;
 
-        return ide_issue_pc(drive, pc, idetape_transfer_pc,
-                            WAIT_TAPE_CMD, NULL);
+        return ide_issue_pc(drive, WAIT_TAPE_CMD, NULL);
 }
 
 /* A mode sense command is used to "sense" tape parameters. */
@@ -785,7 +728,7 @@ static ide_startstop_t idetape_media_access_finished(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
         idetape_tape_t *tape = drive->driver_data;
-        struct ide_atapi_pc *pc = tape->pc;
+        struct ide_atapi_pc *pc = drive->pc;
         u8 stat;
 
         stat = hwif->tp_ops->read_status(hwif);
@@ -797,7 +740,7 @@ static ide_startstop_t idetape_media_access_finished(ide_drive_t *drive)
                                 printk(KERN_ERR "ide-tape: %s: I/O error, ",
                                                 tape->name);
                         /* Retry operation */
-                        idetape_retry_pc(drive);
+                        ide_retry_pc(drive, tape->disk);
                         return ide_stopped;
                 }
                 pc->error = 0;
@@ -805,7 +748,7 @@ static ide_startstop_t idetape_media_access_finished(ide_drive_t *drive)
                 pc->error = IDETAPE_ERROR_GENERAL;
                 tape->failed_pc = NULL;
         }
-        drive->pc_callback(drive);
+        drive->pc_callback(drive, 0);
         return ide_stopped;
 }
 
@@ -862,7 +805,7 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
         }
 
         /* Retry a failed packet command */
-        if (tape->failed_pc && tape->pc->c[0] == REQUEST_SENSE) {
+        if (tape->failed_pc && drive->pc->c[0] == REQUEST_SENSE) {
                 pc = tape->failed_pc;
                 goto out;
         }
@@ -883,12 +826,13 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
          */
         stat = hwif->tp_ops->read_status(hwif);
 
-        if (!drive->dsc_overlap && !(rq->cmd[13] & REQ_IDETAPE_PC2))
+        if ((drive->dev_flags & IDE_DFLAG_DSC_OVERLAP) == 0 &&
+            (rq->cmd[13] & REQ_IDETAPE_PC2) == 0)
                 set_bit(IDE_AFLAG_IGNORE_DSC, &drive->atapi_flags);
 
-        if (drive->post_reset == 1) {
+        if (drive->dev_flags & IDE_DFLAG_POST_RESET) {
                 set_bit(IDE_AFLAG_IGNORE_DSC, &drive->atapi_flags);
-                drive->post_reset = 0;
+                drive->dev_flags &= ~IDE_DFLAG_POST_RESET;
         }
 
         if (!test_and_clear_bit(IDE_AFLAG_IGNORE_DSC, &drive->atapi_flags) &&
@@ -1411,7 +1355,7 @@ static int idetape_init_read(ide_drive_t *drive)
                  * No point in issuing this if DSC overlap isn't supported, some
                  * drives (Seagate STT3401A) will return an error.
                  */
-                if (drive->dsc_overlap) {
+                if (drive->dev_flags & IDE_DFLAG_DSC_OVERLAP) {
                         bytes_read = idetape_queue_rw_tail(drive,
                                                         REQ_IDETAPE_READ, 0,
                                                         tape->merge_bh);
@@ -1592,7 +1536,7 @@ static int idetape_space_over_filemarks(ide_drive_t *drive, short mt_op,
 static ssize_t idetape_chrdev_read(struct file *file, char __user *buf,
                                    size_t count, loff_t *ppos)
 {
-        struct ide_tape_obj *tape = ide_tape_f(file);
+        struct ide_tape_obj *tape = file->private_data;
         ide_drive_t *drive = tape->drive;
         ssize_t bytes_read, temp, actually_read = 0, rc;
         ssize_t ret = 0;
@@ -1654,7 +1598,7 @@ finish:
 static ssize_t idetape_chrdev_write(struct file *file, const char __user *buf,
                                      size_t count, loff_t *ppos)
 {
-        struct ide_tape_obj *tape = ide_tape_f(file);
+        struct ide_tape_obj *tape = file->private_data;
         ide_drive_t *drive = tape->drive;
         ssize_t actually_written = 0;
         ssize_t ret = 0;
@@ -1687,7 +1631,7 @@ static ssize_t idetape_chrdev_write(struct file *file, const char __user *buf,
                  * point in issuing this if DSC overlap isn't supported, some
                  * drives (Seagate STT3401A) will return an error.
                  */
-                if (drive->dsc_overlap) {
+                if (drive->dev_flags & IDE_DFLAG_DSC_OVERLAP) {
                         ssize_t retval = idetape_queue_rw_tail(drive,
                                                         REQ_IDETAPE_WRITE, 0,
                                                         tape->merge_bh);
@@ -1886,7 +1830,7 @@ static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count)
 static int idetape_chrdev_ioctl(struct inode *inode, struct file *file,
                                 unsigned int cmd, unsigned long arg)
 {
-        struct ide_tape_obj *tape = ide_tape_f(file);
+        struct ide_tape_obj *tape = file->private_data;
         ide_drive_t *drive = tape->drive;
         struct mtop mtop;
         struct mtget mtget;
@@ -2063,7 +2007,7 @@ static void idetape_write_release(ide_drive_t *drive, unsigned int minor)
 
 static int idetape_chrdev_release(struct inode *inode, struct file *filp)
 {
-        struct ide_tape_obj *tape = ide_tape_f(filp);
+        struct ide_tape_obj *tape = filp->private_data;
         ide_drive_t *drive = tape->drive;
         unsigned int minor = iminor(inode);
 
@@ -2202,7 +2146,7 @@ static int divf_tdsc(ide_drive_t *drive)	{ return   HZ; }
 static int divf_buffer(ide_drive_t *drive)      { return    2; }
 static int divf_buffer_size(ide_drive_t *drive) { return 1024; }
 
-ide_devset_rw_field(dsc_overlap, dsc_overlap);
+ide_devset_rw_flag(dsc_overlap, IDE_DFLAG_DSC_OVERLAP);
 
 ide_tape_devset_rw_field(debug_mask, debug_mask);
 ide_tape_devset_rw_field(tdsc, best_dsc_rw_freq);
@@ -2241,33 +2185,32 @@ static void idetape_setup(ide_drive_t *drive, idetape_tape_t *tape, int minor)
         unsigned long t;
         int speed;
         int buffer_size;
-        u8 gcw[2];
         u16 *ctl = (u16 *)&tape->caps[12];
 
-        drive->pc_callback = ide_tape_callback;
+        drive->pc_callback       = ide_tape_callback;
+        drive->pc_update_buffers = idetape_update_buffers;
+        drive->pc_io_buffers     = ide_tape_io_buffers;
 
         spin_lock_init(&tape->lock);
-        drive->dsc_overlap = 1;
+
+        drive->dev_flags |= IDE_DFLAG_DSC_OVERLAP;
+
         if (drive->hwif->host_flags & IDE_HFLAG_NO_DSC) {
                 printk(KERN_INFO "ide-tape: %s: disabling DSC overlap\n",
                                  tape->name);
-                drive->dsc_overlap = 0;
+                drive->dev_flags &= ~IDE_DFLAG_DSC_OVERLAP;
         }
+
         /* Seagate Travan drives do not support DSC overlap. */
         if (strstr((char *)&drive->id[ATA_ID_PROD], "Seagate STT3401"))
-                drive->dsc_overlap = 0;
+                drive->dev_flags &= ~IDE_DFLAG_DSC_OVERLAP;
+
         tape->minor = minor;
         tape->name[0] = 'h';
         tape->name[1] = 't';
         tape->name[2] = '0' + minor;
         tape->chrdev_dir = IDETAPE_DIR_NONE;
 
-        *((u16 *)&gcw) = drive->id[ATA_ID_CONFIG];
-
-        /* Command packet DRQ type */
-        if (((gcw[0] & 0x60) >> 5) == 1)
-                set_bit(IDE_AFLAG_DRQ_INTERRUPT, &drive->atapi_flags);
-
         idetape_get_inquiry_results(drive);
         idetape_get_mode_sense_results(drive);
         ide_tape_get_bsize_from_bdesc(drive);
@@ -2302,7 +2245,7 @@ static void idetape_setup(ide_drive_t *drive, idetape_tape_t *tape, int minor)
                 (*(u16 *)&tape->caps[16] * 512) / tape->buffer_size,
                 tape->buffer_size / 1024,
                 tape->best_dsc_rw_freq * 1000 / HZ,
-                drive->using_dma ? ", DMA":"");
+                (drive->dev_flags & IDE_DFLAG_USING_DMA) ? ", DMA" : "");
 
         ide_proc_register_driver(drive, tape->driver);
 }
@@ -2320,13 +2263,13 @@ static void ide_tape_remove(ide_drive_t *drive)
 
 static void ide_tape_release(struct kref *kref)
 {
-        struct ide_tape_obj *tape = to_ide_tape(kref);
+        struct ide_tape_obj *tape = to_ide_drv(kref, ide_tape_obj);
         ide_drive_t *drive = tape->drive;
         struct gendisk *g = tape->disk;
 
         BUG_ON(tape->merge_bh_size);
 
-        drive->dsc_overlap = 0;
+        drive->dev_flags &= ~IDE_DFLAG_DSC_OVERLAP;
         drive->driver_data = NULL;
         device_destroy(idetape_sysfs_class, MKDEV(IDETAPE_MAJOR, tape->minor));
         device_destroy(idetape_sysfs_class,
@@ -2368,7 +2311,6 @@ static ide_driver_t idetape_driver = {
         .probe                  = ide_tape_probe,
         .remove                 = ide_tape_remove,
         .version                = IDETAPE_VERSION,
-        .media                  = ide_tape,
         .do_request             = idetape_do_request,
         .end_request            = idetape_end_request,
         .error                  = __ide_error,
@@ -2403,7 +2345,7 @@ static int idetape_open(struct inode *inode, struct file *filp)
 static int idetape_release(struct inode *inode, struct file *filp)
 {
         struct gendisk *disk = inode->i_bdev->bd_disk;
-        struct ide_tape_obj *tape = ide_tape_g(disk);
+        struct ide_tape_obj *tape = ide_drv_g(disk, ide_tape_obj);
 
         ide_tape_put(tape);
 
@@ -2414,7 +2356,7 @@ static int idetape_ioctl(struct inode *inode, struct file *file,
                         unsigned int cmd, unsigned long arg)
 {
         struct block_device *bdev = inode->i_bdev;
-        struct ide_tape_obj *tape = ide_tape_g(bdev->bd_disk);
+        struct ide_tape_obj *tape = ide_drv_g(bdev->bd_disk, ide_tape_obj);
         ide_drive_t *drive = tape->drive;
         int err = generic_ide_ioctl(drive, file, bdev, cmd, arg);
         if (err == -EINVAL)
@@ -2441,7 +2383,8 @@ static int ide_tape_probe(ide_drive_t *drive)
         if (drive->media != ide_tape)
                 goto failed;
 
-        if (drive->id_read == 1 && !ide_check_atapi_device(drive, DRV_NAME)) {
+        if ((drive->dev_flags & IDE_DFLAG_ID_READ) &&
+            ide_check_atapi_device(drive, DRV_NAME) == 0) {
                 printk(KERN_ERR "ide-tape: %s: not supported by this version of"
                                 " the driver\n", drive->name);
                 goto failed;
@@ -2477,12 +2420,11 @@ static int ide_tape_probe(ide_drive_t *drive)
 
         idetape_setup(drive, tape, minor);
 
-        device_create_drvdata(idetape_sysfs_class, &drive->gendev,
-                              MKDEV(IDETAPE_MAJOR, minor), NULL,
-                              "%s", tape->name);
-        device_create_drvdata(idetape_sysfs_class, &drive->gendev,
-                              MKDEV(IDETAPE_MAJOR, minor + 128), NULL,
-                              "n%s", tape->name);
+        device_create(idetape_sysfs_class, &drive->gendev,
+                      MKDEV(IDETAPE_MAJOR, minor), NULL, "%s", tape->name);
+        device_create(idetape_sysfs_class, &drive->gendev,
+                      MKDEV(IDETAPE_MAJOR, minor + 128), NULL,
+                      "n%s", tape->name);
 
         g->fops = &idetape_block_ops;
         ide_register_region(g);
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 487b18b3ebae..bf4fb9d8d176 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -53,9 +53,6 @@ int taskfile_lib_get_identify (ide_drive_t *drive, u8 *buf)
 }
 
 static ide_startstop_t task_no_data_intr(ide_drive_t *);
-static ide_startstop_t set_geometry_intr(ide_drive_t *);
-static ide_startstop_t recal_intr(ide_drive_t *);
-static ide_startstop_t set_multmode_intr(ide_drive_t *);
 static ide_startstop_t pre_task_out_intr(ide_drive_t *, struct request *);
 static ide_startstop_t task_in_intr(ide_drive_t *);
 
@@ -79,6 +76,8 @@ ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task)
         if (task->tf_flags & IDE_TFLAG_FLAGGED)
                 task->tf_flags |= IDE_TFLAG_FLAGGED_SET_IN_FLAGS;
 
+        memcpy(&hwif->task, task, sizeof(*task));
+
         if ((task->tf_flags & IDE_TFLAG_DMA_PIO_FALLBACK) == 0) {
                 ide_tf_dump(drive->name, tf);
                 tp_ops->set_irq(hwif, 1);
@@ -99,24 +98,12 @@ ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task)
         case TASKFILE_NO_DATA:
                 if (handler == NULL)
                         handler = task_no_data_intr;
-                if (task->tf_flags & IDE_TFLAG_CUSTOM_HANDLER) {
-                        switch (tf->command) {
-                        case ATA_CMD_INIT_DEV_PARAMS:
-                                handler = set_geometry_intr;
-                                break;
-                        case ATA_CMD_RESTORE:
-                                handler = recal_intr;
-                                break;
-                        case ATA_CMD_SET_MULTI:
-                                handler = set_multmode_intr;
-                                break;
-                        }
-                }
                 ide_execute_command(drive, tf->command, handler,
                                     WAIT_WORSTCASE, NULL);
                 return ide_started;
         default:
-                if (drive->using_dma == 0 || dma_ops->dma_setup(drive))
+                if ((drive->dev_flags & IDE_DFLAG_USING_DMA) == 0 ||
+                    dma_ops->dma_setup(drive))
                         return ide_stopped;
                 dma_ops->dma_exec_cmd(drive, tf->command);
                 dma_ops->dma_start(drive);
@@ -126,33 +113,15 @@ ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task)
 EXPORT_SYMBOL_GPL(do_rw_taskfile);
 
 /*
- * set_multmode_intr() is invoked on completion of a ATA_CMD_SET_MULTI cmd.
- */
-static ide_startstop_t set_multmode_intr(ide_drive_t *drive)
-{
-        ide_hwif_t *hwif = drive->hwif;
-        u8 stat;
-
-        local_irq_enable_in_hardirq();
-        stat = hwif->tp_ops->read_status(hwif);
-
-        if (OK_STAT(stat, ATA_DRDY, BAD_STAT))
-                drive->mult_count = drive->mult_req;
-        else {
-                drive->mult_req = drive->mult_count = 0;
-                drive->special.b.recalibrate = 1;
-                (void) ide_dump_status(drive, "set_multmode", stat);
-        }
-        return ide_stopped;
-}
-
-/*
- * set_geometry_intr() is invoked on completion of a ATA_CMD_INIT_DEV_PARAMS cmd.
+ * Handler for commands without a data phase
  */
-static ide_startstop_t set_geometry_intr(ide_drive_t *drive)
+static ide_startstop_t task_no_data_intr(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
-        int retries = 5;
+        ide_task_t *task = &hwif->task;
+        struct ide_taskfile *tf = &task->tf;
+        int custom = (task->tf_flags & IDE_TFLAG_CUSTOM_HANDLER) ? 1 : 0;
+        int retries = (custom && tf->command == ATA_CMD_INIT_DEV_PARAMS) ? 5 : 1;
         u8 stat;
 
         local_irq_enable_in_hardirq();
@@ -164,50 +133,36 @@ static ide_startstop_t set_geometry_intr(ide_drive_t *drive)
                 udelay(10);
         };
 
-        if (OK_STAT(stat, ATA_DRDY, BAD_STAT))
-                return ide_stopped;
-
-        if (stat & (ATA_ERR | ATA_DRQ))
-                return ide_error(drive, "set_geometry_intr", stat);
-
-        ide_set_handler(drive, &set_geometry_intr, WAIT_WORSTCASE, NULL);
-        return ide_started;
-}
-
-/*
- * recal_intr() is invoked on completion of a ATA_CMD_RESTORE (recalibrate) cmd.
- */
-static ide_startstop_t recal_intr(ide_drive_t *drive)
-{
-        ide_hwif_t *hwif = drive->hwif;
-        u8 stat;
-
-        local_irq_enable_in_hardirq();
-        stat = hwif->tp_ops->read_status(hwif);
-
-        if (!OK_STAT(stat, ATA_DRDY, BAD_STAT))
-                return ide_error(drive, "recal_intr", stat);
-        return ide_stopped;
-}
-
-/*
- * Handler for commands without a data phase
- */
-static ide_startstop_t task_no_data_intr(ide_drive_t *drive)
-{
-        ide_hwif_t *hwif = drive->hwif;
-        ide_task_t *args = hwif->hwgroup->rq->special;
-        u8 stat;
-
-        local_irq_enable_in_hardirq();
-        stat = hwif->tp_ops->read_status(hwif);
-
-        if (!OK_STAT(stat, ATA_DRDY, BAD_STAT))
+        if (!OK_STAT(stat, ATA_DRDY, BAD_STAT)) {
+                if (custom && tf->command == ATA_CMD_SET_MULTI) {
+                        drive->mult_req = drive->mult_count = 0;
+                        drive->special.b.recalibrate = 1;
+                        (void)ide_dump_status(drive, __func__, stat);
+                        return ide_stopped;
+                } else if (custom && tf->command == ATA_CMD_INIT_DEV_PARAMS) {
+                        if ((stat & (ATA_ERR | ATA_DRQ)) == 0) {
+                                ide_set_handler(drive, &task_no_data_intr,
+                                                WAIT_WORSTCASE, NULL);
+                                return ide_started;
+                        }
+                }
                 return ide_error(drive, "task_no_data_intr", stat);
                 /* calls ide_end_drive_cmd */
+        }
 
-        if (args)
+        if (!custom)
+                ide_end_drive_cmd(drive, stat, ide_read_error(drive));
+        else if (tf->command == ATA_CMD_IDLEIMMEDIATE) {
+                hwif->tp_ops->tf_read(drive, task);
+                if (tf->lbal != 0xc4) {
+                        printk(KERN_ERR "%s: head unload failed!\n",
+                               drive->name);
+                        ide_tf_dump(drive->name, tf);
+                } else
+                        drive->dev_flags |= IDE_DFLAG_PARKED;
                 ide_end_drive_cmd(drive, stat, ide_read_error(drive));
+        } else if (tf->command == ATA_CMD_SET_MULTI)
+                drive->mult_count = drive->mult_req;
 
         return ide_stopped;
 }
@@ -469,13 +424,12 @@ static ide_startstop_t pre_task_out_intr(ide_drive_t *drive, struct request *rq)
         if (ide_wait_stat(&startstop, drive, ATA_DRQ,
                           drive->bad_wstat, WAIT_DRQ)) {
                 printk(KERN_ERR "%s: no DRQ after issuing %sWRITE%s\n",
-                                drive->name,
-                                drive->hwif->data_phase ? "MULT" : "",
-                                drive->addressing ? "_EXT" : "");
+                        drive->name, drive->hwif->data_phase ? "MULT" : "",
+                        (drive->dev_flags & IDE_DFLAG_LBA48) ? "_EXT" : "");
                 return startstop;
         }
 
-        if (!drive->unmask)
+        if ((drive->dev_flags & IDE_DFLAG_UNMASK) == 0)
                 local_irq_disable();
 
         ide_set_handler(drive, &task_out_intr, WAIT_WORSTCASE, NULL);
@@ -591,7 +545,7 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
 
         args.tf_flags = IDE_TFLAG_IO_16BIT | IDE_TFLAG_DEVICE |
                         IDE_TFLAG_IN_TF;
-        if (drive->addressing == 1)
+        if (drive->dev_flags & IDE_DFLAG_LBA48)
                 args.tf_flags |= (IDE_TFLAG_LBA48 | IDE_TFLAG_IN_HOB);
 
         if (req_task->out_flags.all) {
@@ -694,7 +648,7 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
         if ((args.tf_flags & IDE_TFLAG_FLAGGED_SET_IN_FLAGS) &&
             req_task->in_flags.all == 0) {
                 req_task->in_flags.all = IDE_TASKFILE_STD_IN_FLAGS;
-                if (drive->addressing == 1)
+                if (drive->dev_flags & IDE_DFLAG_LBA48)
                         req_task->in_flags.all |= (IDE_HOB_STD_IN_FLAGS << 8);
         }
 
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 9dcf5aed92cb..04f8f13cb9d7 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -114,7 +114,7 @@ static void ide_port_init_devices_data(ide_hwif_t *hwif)
                 memset(drive, 0, sizeof(*drive));
 
                 drive->media                    = ide_disk;
-                drive->select.all               = (unit<<4)|0xa0;
+                drive->select                   = (unit << 4) | ATA_DEVICE_OBS;
                 drive->hwif                     = hwif;
                 drive->ready_stat               = ATA_DRDY;
                 drive->bad_wstat                = BAD_W_STAT;
@@ -138,7 +138,7 @@ static void __ide_port_unregister_devices(ide_hwif_t *hwif)
         for (i = 0; i < MAX_DRIVES; i++) {
                 ide_drive_t *drive = &hwif->drives[i];
 
-                if (drive->present) {
+                if (drive->dev_flags & IDE_DFLAG_PRESENT) {
                         spin_unlock_irq(&ide_lock);
                         device_unregister(&drive->gendev);
                         wait_for_completion(&drive->gendev_rel_comp);
@@ -227,8 +227,7 @@ void ide_unregister(ide_hwif_t *hwif)
         kfree(hwif->sg_table);
         unregister_blkdev(hwif->major, hwif->name);
 
-        if (hwif->dma_base)
-                ide_release_dma_engine(hwif);
+        ide_release_dma_engine(hwif);
 
         mutex_unlock(&ide_cfg_mtx);
 }
@@ -254,7 +253,7 @@ ide_devset_get(io_32bit, io_32bit);
 
 static int set_io_32bit(ide_drive_t *drive, int arg)
 {
-        if (drive->no_io_32bit)
+        if (drive->dev_flags & IDE_DFLAG_NO_IO_32BIT)
                 return -EPERM;
 
         if (arg < 0 || arg > 1 + (SUPPORT_VLB_SYNC << 1))
@@ -265,19 +264,22 @@ static int set_io_32bit(ide_drive_t *drive, int arg)
         return 0;
 }
 
-ide_devset_get(ksettings, keep_settings);
+ide_devset_get_flag(ksettings, IDE_DFLAG_KEEP_SETTINGS);
 
 static int set_ksettings(ide_drive_t *drive, int arg)
 {
         if (arg < 0 || arg > 1)
                 return -EINVAL;
 
-        drive->keep_settings = arg;
+        if (arg)
+                drive->dev_flags |= IDE_DFLAG_KEEP_SETTINGS;
+        else
+                drive->dev_flags &= ~IDE_DFLAG_KEEP_SETTINGS;
 
         return 0;
 }
 
-ide_devset_get(using_dma, using_dma);
+ide_devset_get_flag(using_dma, IDE_DFLAG_USING_DMA);
 
 static int set_using_dma(ide_drive_t *drive, int arg)
 {
@@ -311,9 +313,32 @@ out:
 #endif
 }
 
+/*
+ * handle HDIO_SET_PIO_MODE ioctl abusers here, eventually it will go away
+ */
+static int set_pio_mode_abuse(ide_hwif_t *hwif, u8 req_pio)
+{
+        switch (req_pio) {
+        case 202:
+        case 201:
+        case 200:
+        case 102:
+        case 101:
+        case 100:
+                return (hwif->host_flags & IDE_HFLAG_ABUSE_DMA_MODES) ? 1 : 0;
+        case 9:
+        case 8:
+                return (hwif->host_flags & IDE_HFLAG_ABUSE_PREFETCH) ? 1 : 0;
+        case 7:
+        case 6:
+                return (hwif->host_flags & IDE_HFLAG_ABUSE_FAST_DEVSEL) ? 1 : 0;
+        default:
+                return 0;
+        }
+}
+
 static int set_pio_mode(ide_drive_t *drive, int arg)
 {
-        struct request *rq;
         ide_hwif_t *hwif = drive->hwif;
         const struct ide_port_ops *port_ops = hwif->port_ops;
 
@@ -324,56 +349,65 @@ static int set_pio_mode(ide_drive_t *drive, int arg)
             (hwif->host_flags & IDE_HFLAG_NO_SET_MODE))
                 return -ENOSYS;
 
-        if (drive->special.b.set_tune)
-                return -EBUSY;
+        if (set_pio_mode_abuse(drive->hwif, arg)) {
+                if (arg == 8 || arg == 9) {
+                        unsigned long flags;
 
-        rq = blk_get_request(drive->queue, READ, __GFP_WAIT);
-        rq->cmd_type = REQ_TYPE_ATA_TASKFILE;
+                        /* take lock for IDE_DFLAG_[NO_]UNMASK/[NO_]IO_32BIT */
+                        spin_lock_irqsave(&ide_lock, flags);
+                        port_ops->set_pio_mode(drive, arg);
+                        spin_unlock_irqrestore(&ide_lock, flags);
+                } else
+                        port_ops->set_pio_mode(drive, arg);
+        } else {
+                int keep_dma = !!(drive->dev_flags & IDE_DFLAG_USING_DMA);
 
-        drive->tune_req = (u8) arg;
-        drive->special.b.set_tune = 1;
+                ide_set_pio(drive, arg);
 
-        blk_execute_rq(drive->queue, NULL, rq, 0);
-        blk_put_request(rq);
+                if (hwif->host_flags & IDE_HFLAG_SET_PIO_MODE_KEEP_DMA) {
+                        if (keep_dma)
+                                ide_dma_on(drive);
+                }
+        }
 
         return 0;
 }
 
-ide_devset_get(unmaskirq, unmask);
+ide_devset_get_flag(unmaskirq, IDE_DFLAG_UNMASK);
 
 static int set_unmaskirq(ide_drive_t *drive, int arg)
 {
-        if (drive->no_unmask)
+        if (drive->dev_flags & IDE_DFLAG_NO_UNMASK)
                 return -EPERM;
 
         if (arg < 0 || arg > 1)
                 return -EINVAL;
 
-        drive->unmask = arg;
+        if (arg)
+                drive->dev_flags |= IDE_DFLAG_UNMASK;
+        else
+                drive->dev_flags &= ~IDE_DFLAG_UNMASK;
 
         return 0;
 }
 
-#define ide_gen_devset_rw(_name, _func) \
-__IDE_DEVSET(_name, DS_SYNC, get_##_func, set_##_func)
-
-ide_gen_devset_rw(io_32bit, io_32bit);
-ide_gen_devset_rw(keepsettings, ksettings);
-ide_gen_devset_rw(unmaskirq, unmaskirq);
-ide_gen_devset_rw(using_dma, using_dma);
-__IDE_DEVSET(pio_mode, 0, NULL, set_pio_mode);
+ide_ext_devset_rw_sync(io_32bit, io_32bit);
+ide_ext_devset_rw_sync(keepsettings, ksettings);
+ide_ext_devset_rw_sync(unmaskirq, unmaskirq);
+ide_ext_devset_rw_sync(using_dma, using_dma);
+__IDE_DEVSET(pio_mode, DS_SYNC, NULL, set_pio_mode);
 
 static int generic_ide_suspend(struct device *dev, pm_message_t mesg)
 {
-        ide_drive_t *drive = dev->driver_data;
+        ide_drive_t *drive = dev->driver_data, *pair = ide_get_pair_dev(drive);
         ide_hwif_t *hwif = HWIF(drive);
         struct request *rq;
         struct request_pm_state rqpm;
         ide_task_t args;
         int ret;
 
-        /* Call ACPI _GTM only once */
-        if (!(drive->dn % 2))
+        /* call ACPI _GTM only once */
+        if ((drive->dn & 1) == 0 || pair == NULL)
                 ide_acpi_get_timing(hwif);
 
         memset(&rqpm, 0, sizeof(rqpm));
@@ -382,33 +416,32 @@ static int generic_ide_suspend(struct device *dev, pm_message_t mesg)
         rq->cmd_type = REQ_TYPE_PM_SUSPEND;
         rq->special = &args;
         rq->data = &rqpm;
-        rqpm.pm_step = ide_pm_state_start_suspend;
+        rqpm.pm_step = IDE_PM_START_SUSPEND;
         if (mesg.event == PM_EVENT_PRETHAW)
                 mesg.event = PM_EVENT_FREEZE;
         rqpm.pm_state = mesg.event;
 
         ret = blk_execute_rq(drive->queue, NULL, rq, 0);
         blk_put_request(rq);
-        /* only call ACPI _PS3 after both drivers are suspended */
-        if (!ret && (((drive->dn % 2) && hwif->drives[0].present
-                 && hwif->drives[1].present)
-                 || !hwif->drives[0].present
-                 || !hwif->drives[1].present))
+
+        /* call ACPI _PS3 only after both devices are suspended */
+        if (ret == 0 && ((drive->dn & 1) || pair == NULL))
                 ide_acpi_set_state(hwif, 0);
+
         return ret;
 }
 
 static int generic_ide_resume(struct device *dev)
 {
-        ide_drive_t *drive = dev->driver_data;
+        ide_drive_t *drive = dev->driver_data, *pair = ide_get_pair_dev(drive);
         ide_hwif_t *hwif = HWIF(drive);
         struct request *rq;
         struct request_pm_state rqpm;
         ide_task_t args;
         int err;
 
-        /* Call ACPI _STM only once */
-        if (!(drive->dn % 2)) {
+        /* call ACPI _PS0 / _STM only once */
+        if ((drive->dn & 1) == 0 || pair == NULL) {
                 ide_acpi_set_state(hwif, 1);
                 ide_acpi_push_timing(hwif);
         }
@@ -422,7 +455,7 @@ static int generic_ide_resume(struct device *dev)
         rq->cmd_flags |= REQ_PREEMPT;
         rq->special = &args;
         rq->data = &rqpm;
-        rqpm.pm_step = ide_pm_state_start_resume;
+        rqpm.pm_step = IDE_PM_START_RESUME;
         rqpm.pm_state = PM_EVENT_ON;
 
         err = blk_execute_rq(drive->queue, NULL, rq, 1);
@@ -554,6 +587,7 @@ static struct device_attribute ide_dev_attrs[] = {
         __ATTR_RO(model),
         __ATTR_RO(firmware),
         __ATTR(serial, 0400, serial_show, NULL),
+        __ATTR(unload_heads, 0644, ide_park_show, ide_park_store),
         __ATTR_NULL
 };
 
@@ -708,22 +742,22 @@ static int ide_set_disk_chs(const char *str, struct kernel_param *kp)
 module_param_call(chs, ide_set_disk_chs, NULL, NULL, 0);
 MODULE_PARM_DESC(chs, "force device as a disk (using CHS)");
 
-static void ide_dev_apply_params(ide_drive_t *drive)
+static void ide_dev_apply_params(ide_drive_t *drive, u8 unit)
 {
-        int i = drive->hwif->index * MAX_DRIVES + drive->select.b.unit;
+        int i = drive->hwif->index * MAX_DRIVES + unit;
 
         if (ide_nodma & (1 << i)) {
                 printk(KERN_INFO "ide: disallowing DMA for %s\n", drive->name);
-                drive->nodma = 1;
+                drive->dev_flags |= IDE_DFLAG_NODMA;
         }
         if (ide_noflush & (1 << i)) {
                 printk(KERN_INFO "ide: disabling flush requests for %s\n",
                                  drive->name);
-                drive->noflush = 1;
+                drive->dev_flags |= IDE_DFLAG_NOFLUSH;
         }
         if (ide_noprobe & (1 << i)) {
                 printk(KERN_INFO "ide: skipping probe for %s\n", drive->name);
-                drive->noprobe = 1;
+                drive->dev_flags |= IDE_DFLAG_NOPROBE;
         }
         if (ide_nowerr & (1 << i)) {
                 printk(KERN_INFO "ide: ignoring the ATA_DF bit for %s\n",
@@ -732,7 +766,7 @@ static void ide_dev_apply_params(ide_drive_t *drive)
         }
         if (ide_cdroms & (1 << i)) {
                 printk(KERN_INFO "ide: forcing %s as a CD-ROM\n", drive->name);
-                drive->present = 1;
+                drive->dev_flags |= IDE_DFLAG_PRESENT;
                 drive->media = ide_cdrom;
                 /* an ATAPI device ignores DRDY */
                 drive->ready_stat = 0;
@@ -741,11 +775,12 @@ static void ide_dev_apply_params(ide_drive_t *drive)
                 drive->cyl  = drive->bios_cyl  = ide_disks_chs[i].cyl;
                 drive->head = drive->bios_head = ide_disks_chs[i].head;
                 drive->sect = drive->bios_sect = ide_disks_chs[i].sect;
-                drive->forced_geom = 1;
+
                 printk(KERN_INFO "ide: forcing %s as a disk (%d/%d/%d)\n",
                                  drive->name,
                                  drive->cyl, drive->head, drive->sect);
-                drive->present = 1;
+
+                drive->dev_flags |= IDE_DFLAG_FORCED_GEOM | IDE_DFLAG_PRESENT;
                 drive->media = ide_disk;
                 drive->ready_stat = ATA_DRDY;
         }
@@ -785,7 +820,7 @@ void ide_port_apply_params(ide_hwif_t *hwif)
         }
 
         for (i = 0; i < MAX_DRIVES; i++)
-                ide_dev_apply_params(&hwif->drives[i]);
+                ide_dev_apply_params(&hwif->drives[i], i);
 }
 
 /*
diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/legacy/ali14xx.c
index 7276c96aaa2a..90da1f953ed0 100644
--- a/drivers/ide/legacy/ali14xx.c
+++ b/drivers/ide/legacy/ali14xx.c
@@ -131,7 +131,7 @@ static void ali14xx_set_pio_mode(ide_drive_t *drive, const u8 pio)
                 drive->name, pio, time1, time2, param1, param2, param3, param4);
 
         /* stuff timing parameters into controller registers */
-        driveNum = (HWIF(drive)->index << 1) + drive->select.b.unit;
+        driveNum = (drive->hwif->index << 1) + (drive->dn & 1);
         spin_lock_irqsave(&ali14xx_lock, flags);
         outb_p(regOn, basePort);
         outReg(param1, regTab[driveNum].reg1);
diff --git a/drivers/ide/legacy/ht6560b.c b/drivers/ide/legacy/ht6560b.c
index 5123ea291d07..c7e5c2246b79 100644
--- a/drivers/ide/legacy/ht6560b.c
+++ b/drivers/ide/legacy/ht6560b.c
@@ -120,7 +120,8 @@ static void ht6560b_selectproc (ide_drive_t *drive)
          * Need to enforce prefetch sometimes because otherwise
          * it'll hang (hard).
          */
-        if (drive->media != ide_disk || !drive->present)
+        if (drive->media != ide_disk ||
+            (drive->dev_flags & IDE_DFLAG_PRESENT) == 0)
                 select |= HT_PREFETCH_MODE;
 
         if (select != current_select || timing != current_timing) {
@@ -249,11 +250,11 @@ static void ht_set_prefetch(ide_drive_t *drive, u8 state)
          */
         if (state) {
                 drive->drive_data |= t;   /* enable prefetch mode */
-                drive->no_unmask = 1;
-                drive->unmask = 0;
+                drive->dev_flags |= IDE_DFLAG_NO_UNMASK;
+                drive->dev_flags &= ~IDE_DFLAG_UNMASK;
         } else {
                 drive->drive_data &= ~t;  /* disable prefetch mode */
-                drive->no_unmask = 0;
+                drive->dev_flags &= ~IDE_DFLAG_NO_UNMASK;
         }
 
         spin_unlock_irqrestore(&ht6560b_lock, flags);
diff --git a/drivers/ide/legacy/ide-4drives.c b/drivers/ide/legacy/ide-4drives.c
index c76d55de6996..9e85b1ec9607 100644
--- a/drivers/ide/legacy/ide-4drives.c
+++ b/drivers/ide/legacy/ide-4drives.c
@@ -14,7 +14,7 @@ MODULE_PARM_DESC(probe, "probe for generic IDE chipset with 4 drives/port");
 static void ide_4drives_init_dev(ide_drive_t *drive)
 {
         if (drive->hwif->channel)
-                drive->select.all ^= 0x20;
+                drive->select ^= 0x20;
 }
 
 static const struct ide_port_ops ide_4drives_port_ops = {
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index ee6fc30d5e2b..cb199c815b53 100644
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -219,103 +219,91 @@ out_release:
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
+struct pcmcia_config_check {
+        unsigned long ctl_base;
+        int skip_vcc;
+        int is_kme;
+};
+
+static int pcmcia_check_one_config(struct pcmcia_device *pdev,
+                                   cistpl_cftable_entry_t *cfg,
+                                   cistpl_cftable_entry_t *dflt,
+                                   unsigned int vcc,
+                                   void *priv_data)
+{
+        struct pcmcia_config_check *stk = priv_data;
+
+        /* Check for matching Vcc, unless we're desperate */
+        if (!stk->skip_vcc) {
+                if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                        if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000)
+                                return -ENODEV;
+                } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                        if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] / 10000)
+                                return -ENODEV;
+                }
+        }
+
+        if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                pdev->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+        else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                pdev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+
+        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
+                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+                pdev->conf.ConfigIndex = cfg->index;
+                pdev->io.BasePort1 = io->win[0].base;
+                pdev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
+                if (!(io->flags & CISTPL_IO_16BIT))
+                        pdev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                if (io->nwin == 2) {
+                        pdev->io.NumPorts1 = 8;
+                        pdev->io.BasePort2 = io->win[1].base;
+                        pdev->io.NumPorts2 = (stk->is_kme) ? 2 : 1;
+                        if (pcmcia_request_io(pdev, &pdev->io) != 0)
+                                return -ENODEV;
+                        stk->ctl_base = pdev->io.BasePort2;
+                } else if ((io->nwin == 1) && (io->win[0].len >= 16)) {
+                        pdev->io.NumPorts1 = io->win[0].len;
+                        pdev->io.NumPorts2 = 0;
+                        if (pcmcia_request_io(pdev, &pdev->io) != 0)
+                                return -ENODEV;
+                        stk->ctl_base = pdev->io.BasePort1 + 0x0e;
+                } else
+                        return -ENODEV;
+                /* If we've got this far, we're done */
+                return 0;
+        }
+        return -ENODEV;
+}
+
 static int ide_config(struct pcmcia_device *link)
 {
     ide_info_t *info = link->priv;
-    tuple_t tuple;
-    struct {
-        u_short         buf[128];
-        cisparse_t      parse;
-        config_info_t   conf;
-        cistpl_cftable_entry_t dflt;
-    } *stk = NULL;
-    cistpl_cftable_entry_t *cfg;
-    int pass, last_ret = 0, last_fn = 0, is_kme = 0;
+    struct pcmcia_config_check *stk = NULL;
+    int last_ret = 0, last_fn = 0, is_kme = 0;
     unsigned long io_base, ctl_base;
     struct ide_host *host;
 
     DEBUG(0, "ide_config(0x%p)\n", link);
 
-    stk = kzalloc(sizeof(*stk), GFP_KERNEL);
-    if (!stk) goto err_mem;
-    cfg = &stk->parse.cftable_entry;
-
-    tuple.TupleData = (cisdata_t *)&stk->buf;
-    tuple.TupleOffset = 0;
-    tuple.TupleDataMax = 255;
-    tuple.Attributes = 0;
-
     is_kme = ((link->manf_id == MANFID_KME) &&
               ((link->card_id == PRODID_KME_KXLC005_A) ||
                (link->card_id == PRODID_KME_KXLC005_B)));
 
-    /* Not sure if this is right... look up the current Vcc */
-    CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(link, &stk->conf));
-
-    pass = io_base = ctl_base = 0;
-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-    tuple.Attributes = 0;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-    while (1) {
-        if (pcmcia_get_tuple_data(link, &tuple) != 0) goto next_entry;
-        if (pcmcia_parse_tuple(link, &tuple, &stk->parse) != 0) goto next_entry;
-
-        /* Check for matching Vcc, unless we're desperate */
-        if (!pass) {
-            if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                if (stk->conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000)
-                    goto next_entry;
-            } else if (stk->dflt.vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                if (stk->conf.Vcc != stk->dflt.vcc.param[CISTPL_POWER_VNOM] / 10000)
-                    goto next_entry;
-            }
-        }
-
-        if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
-            link->conf.Vpp =
-                cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
-        else if (stk->dflt.vpp1.present & (1 << CISTPL_POWER_VNOM))
-            link->conf.Vpp =
-                stk->dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;
-
-        if ((cfg->io.nwin > 0) || (stk->dflt.io.nwin > 0)) {
-            cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &stk->dflt.io;
-            link->conf.ConfigIndex = cfg->index;
-            link->io.BasePort1 = io->win[0].base;
-            link->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
-            if (!(io->flags & CISTPL_IO_16BIT))
-                link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-            if (io->nwin == 2) {
-                link->io.NumPorts1 = 8;
-                link->io.BasePort2 = io->win[1].base;
-                link->io.NumPorts2 = (is_kme) ? 2 : 1;
-                if (pcmcia_request_io(link, &link->io) != 0)
-                        goto next_entry;
-                io_base = link->io.BasePort1;
-                ctl_base = link->io.BasePort2;
-            } else if ((io->nwin == 1) && (io->win[0].len >= 16)) {
-                link->io.NumPorts1 = io->win[0].len;
-                link->io.NumPorts2 = 0;
-                if (pcmcia_request_io(link, &link->io) != 0)
-                        goto next_entry;
-                io_base = link->io.BasePort1;
-                ctl_base = link->io.BasePort1 + 0x0e;
-            } else goto next_entry;
-            /* If we've got this far, we're done */
-            break;
-        }
-
-    next_entry:
-        if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
-            memcpy(&stk->dflt, cfg, sizeof(stk->dflt));
-        if (pass) {
-            CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
-        } else if (pcmcia_get_next_tuple(link, &tuple) != 0) {
-            CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-            memset(&stk->dflt, 0, sizeof(stk->dflt));
-            pass++;
-        }
+    stk = kzalloc(sizeof(*stk), GFP_KERNEL);
+    if (!stk)
+            goto err_mem;
+    stk->is_kme = is_kme;
+    stk->skip_vcc = io_base = ctl_base = 0;
+
+    if (pcmcia_loop_config(link, pcmcia_check_one_config, stk)) {
+            stk->skip_vcc = 1;
+            if (pcmcia_loop_config(link, pcmcia_check_one_config, stk))
+                    goto failed; /* No suitable config found */
     }
+    io_base = link->io.BasePort1;
+    ctl_base = stk->ctl_base;
 
     CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
     CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
@@ -403,8 +391,10 @@ static struct pcmcia_device_id ide_ids[] = {
         PCMCIA_DEVICE_MANF_CARD(0x000a, 0x0000),        /* I-O Data CFA */
         PCMCIA_DEVICE_MANF_CARD(0x001c, 0x0001),        /* Mitsubishi CFA */
         PCMCIA_DEVICE_MANF_CARD(0x0032, 0x0704),
+        PCMCIA_DEVICE_MANF_CARD(0x0032, 0x2904),
         PCMCIA_DEVICE_MANF_CARD(0x0045, 0x0401),        /* SanDisk CFA */
         PCMCIA_DEVICE_MANF_CARD(0x004f, 0x0000),        /* Kingston */
+        PCMCIA_DEVICE_MANF_CARD(0x0097, 0x1620),        /* TI emulated */
         PCMCIA_DEVICE_MANF_CARD(0x0098, 0x0000),        /* Toshiba */
         PCMCIA_DEVICE_MANF_CARD(0x00a4, 0x002d),
         PCMCIA_DEVICE_MANF_CARD(0x00ce, 0x0000),        /* Samsung */
diff --git a/drivers/ide/legacy/qd65xx.c b/drivers/ide/legacy/qd65xx.c
index ec408b3a7100..bc27c7aba936 100644
--- a/drivers/ide/legacy/qd65xx.c
+++ b/drivers/ide/legacy/qd65xx.c
@@ -305,7 +305,7 @@ static void __init qd6580_init_dev(ide_drive_t *drive)
         } else
                 t2 = t1 = hwif->channel ? QD6580_DEF_DATA2 : QD6580_DEF_DATA;
 
-        drive->drive_data = drive->select.b.unit ? t2 : t1;
+        drive->drive_data = (drive->dn & 1) ? t2 : t1;
 }
 
 static const struct ide_port_ops qd6500_port_ops = {
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index 11b7f61aae40..0ec8fd1e4dcb 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -322,11 +322,7 @@ static int auide_dma_setup(ide_drive_t *drive)
 }
 
 static int auide_dma_test_irq(ide_drive_t *drive)
-{       
-        if (drive->waiting_for_dma == 0)
-                printk(KERN_WARNING "%s: ide_dma_test_irq \
-                                     called while not waiting\n", drive->name);
-
+{
         /* If dbdma didn't execute the STOP command yet, the
          * active bit is still set
          */
@@ -344,11 +340,6 @@ static void auide_dma_host_set(ide_drive_t *drive, int on)
 {
 }
 
-static void auide_dma_lost_irq(ide_drive_t *drive)
-{
-        printk(KERN_ERR "%s: IRQ lost\n", drive->name);
-}
-
 static void auide_ddma_tx_callback(int irq, void *param)
 {
         _auide_hwif *ahwif = (_auide_hwif*)param;
@@ -375,18 +366,6 @@ static void auide_init_dbdma_dev(dbdev_tab_t *dev, u32 dev_id, u32 tsize, u32 de
 }
 
 #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
-static void auide_dma_timeout(ide_drive_t *drive)
-{
-        ide_hwif_t *hwif = HWIF(drive);
-
-        printk(KERN_ERR "%s: DMA timeout occurred: ", drive->name);
-
-        if (auide_dma_test_irq(drive))
-                return;
-
-        auide_dma_end(drive);
-}
-
 static const struct ide_dma_ops au1xxx_dma_ops = {
         .dma_host_set           = auide_dma_host_set,
         .dma_setup              = auide_dma_setup,
@@ -394,8 +373,8 @@ static const struct ide_dma_ops au1xxx_dma_ops = {
         .dma_start              = auide_dma_start,
         .dma_end                = auide_dma_end,
         .dma_test_irq           = auide_dma_test_irq,
-        .dma_lost_irq           = auide_dma_lost_irq,
-        .dma_timeout            = auide_dma_timeout,
+        .dma_lost_irq           = ide_dma_lost_irq,
+        .dma_timeout            = ide_dma_timeout,
 };
 
 static int auide_ddma_init(ide_hwif_t *hwif, const struct ide_port_info *d)
@@ -448,10 +427,9 @@ static int auide_ddma_init(ide_hwif_t *hwif, const struct ide_port_info *d)
                                                              NUM_DESCRIPTORS);
         auide->rx_desc_head = (void*)au1xxx_dbdma_ring_alloc(auide->rx_chan,
                                                              NUM_DESCRIPTORS);
- 
-        hwif->dmatable_cpu = dma_alloc_coherent(hwif->dev,
-                                                PRD_ENTRIES * PRD_BYTES,        /* 1 Page */
-                                                &hwif->dmatable_dma, GFP_KERNEL);
+
+        /* FIXME: check return value */
+        (void)ide_allocate_dma_engine(hwif);
         
         au1xxx_dbdma_start( auide->tx_chan );
         au1xxx_dbdma_start( auide->rx_chan );
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index e7475ba559c7..4142c698e0d3 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -115,7 +115,7 @@ static void aec6260_set_mode(ide_drive_t *drive, const u8 speed)
         struct pci_dev *dev     = to_pci_dev(hwif->dev);
         struct ide_host *host   = pci_get_drvdata(dev);
         struct chipset_bus_clock_list_entry *bus_clock = host->host_priv;
-        u8 unit         = (drive->select.b.unit & 0x01);
+        u8 unit                 = drive->dn & 1;
         u8 tmp1 = 0, tmp2 = 0;
         u8 ultra = 0, drive_conf = 0, ultra_conf = 0;
         unsigned long flags;
@@ -302,7 +302,7 @@ static const struct pci_device_id aec62xx_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, aec62xx_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver aec62xx_pci_driver = {
         .name           = "AEC62xx_IDE",
         .id_table       = aec62xx_pci_tbl,
         .probe          = aec62xx_init_one,
@@ -313,12 +313,12 @@ static struct pci_driver driver = {
 
 static int __init aec62xx_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&aec62xx_pci_driver);
 }
 
 static void __exit aec62xx_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&aec62xx_pci_driver);
 }
 
 module_init(aec62xx_ide_init);
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 053c75263918..daf9dce39e52 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -77,8 +77,7 @@ static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio)
         int bus_speed = ide_pci_clk ? ide_pci_clk : 33;
         int port = hwif->channel ? 0x5c : 0x58;
         int portFIFO = hwif->channel ? 0x55 : 0x54;
-        u8 cd_dma_fifo = 0;
-        int unit = drive->select.b.unit & 1;
+        u8 cd_dma_fifo = 0, unit = drive->dn & 1;
 
         if ((s_clc = (s_time * bus_speed + 999) / 1000) >= 8)
                 s_clc = 0;
@@ -112,7 +111,7 @@ static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio)
         }
         
         pci_write_config_byte(dev, port, s_clc);
-        pci_write_config_byte(dev, port+drive->select.b.unit+2, (a_clc << 4) | r_clc);
+        pci_write_config_byte(dev, port + unit + 2, (a_clc << 4) | r_clc);
         local_irq_restore(flags);
 }
 
@@ -154,7 +153,7 @@ static void ali_set_dma_mode(ide_drive_t *drive, const u8 speed)
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev *dev     = to_pci_dev(hwif->dev);
         u8 speed1               = speed;
-        u8 unit                 = (drive->select.b.unit & 0x01);
+        u8 unit                 = drive->dn & 1;
         u8 tmpbyte              = 0x00;
         int m5229_udma          = (hwif->channel) ? 0x57 : 0x56;
 
@@ -508,7 +507,7 @@ static const struct ide_dma_ops ali_dma_ops = {
         .dma_setup              = ali15x3_dma_setup,
         .dma_exec_cmd           = ide_dma_exec_cmd,
         .dma_start              = ide_dma_start,
-        .dma_end                = __ide_dma_end,
+        .dma_end                = ide_dma_end,
         .dma_test_irq           = ide_dma_test_irq,
         .dma_lost_irq           = ide_dma_lost_irq,
         .dma_timeout            = ide_dma_timeout,
@@ -576,7 +575,7 @@ static const struct pci_device_id alim15x3_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, alim15x3_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver alim15x3_pci_driver = {
         .name           = "ALI15x3_IDE",
         .id_table       = alim15x3_pci_tbl,
         .probe          = alim15x3_init_one,
@@ -587,12 +586,12 @@ static struct pci_driver driver = {
 
 static int __init ali15x3_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&alim15x3_pci_driver);
 }
 
 static void __exit ali15x3_ide_exit(void)
 {
-        return pci_unregister_driver(&driver);
+        return pci_unregister_driver(&alim15x3_pci_driver);
 }
 
 module_init(ali15x3_ide_init);
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 824471f91bf5..81ec73134eda 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -92,7 +92,7 @@ static void amd_set_drive(ide_drive_t *drive, const u8 speed)
 
         ide_timing_compute(drive, speed, &t, T, UT);
 
-        if (peer->present) {
+        if (peer->dev_flags & IDE_DFLAG_PRESENT) {
                 ide_timing_compute(peer, peer->current_speed, &p, T, UT);
                 ide_timing_merge(&p, &t, &t, IDE_TIMING_8BIT);
         }
@@ -319,7 +319,7 @@ static const struct pci_device_id amd74xx_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, amd74xx_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver amd74xx_pci_driver = {
         .name           = "AMD_IDE",
         .id_table       = amd74xx_pci_tbl,
         .probe          = amd74xx_probe,
@@ -330,12 +330,12 @@ static struct pci_driver driver = {
 
 static int __init amd74xx_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&amd74xx_pci_driver);
 }
 
 static void __exit amd74xx_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&amd74xx_pci_driver);
 }
 
 module_init(amd74xx_ide_init);
diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index e4437034dd08..b2735d28f5cc 100644
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -182,7 +182,7 @@ static const struct pci_device_id atiixp_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, atiixp_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver atiixp_pci_driver = {
         .name           = "ATIIXP_IDE",
         .id_table       = atiixp_pci_tbl,
         .probe          = atiixp_init_one,
@@ -193,12 +193,12 @@ static struct pci_driver driver = {
 
 static int __init atiixp_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&atiixp_pci_driver);
 }
 
 static void __exit atiixp_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&atiixp_pci_driver);
 }
 
 module_init(atiixp_ide_init);
diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c
index 7f39cdb41410..e4306647d00d 100644
--- a/drivers/ide/pci/cmd640.c
+++ b/drivers/ide/pci/cmd640.c
@@ -378,13 +378,13 @@ static void __set_prefetch_mode(ide_drive_t *drive, int mode)
 {
         if (mode) {     /* want prefetch on? */
 #if CMD640_PREFETCH_MASKS
-                drive->no_unmask = 1;
-                drive->unmask = 0;
+                drive->dev_flags |= IDE_DFLAG_NO_UNMASK;
+                drive->dev_flags &= ~IDE_DFLAG_UNMASK;
 #endif
-                drive->no_io_32bit = 0;
+                drive->dev_flags &= ~IDE_DFLAG_NO_IO_32BIT;
         } else {
-                drive->no_unmask = 0;
-                drive->no_io_32bit = 1;
+                drive->dev_flags &= ~IDE_DFLAG_NO_UNMASK;
+                drive->dev_flags |= IDE_DFLAG_NO_IO_32BIT;
                 drive->io_32bit = 0;
         }
 }
@@ -468,10 +468,10 @@ static void program_drive_counts(ide_drive_t *drive, unsigned int index)
          */
         if (index > 1) {
                 ide_hwif_t *hwif = drive->hwif;
-                ide_drive_t *peer = &hwif->drives[!drive->select.b.unit];
+                ide_drive_t *peer = &hwif->drives[!(drive->dn & 1)];
                 unsigned int mate = index ^ 1;
 
-                if (peer->present) {
+                if (peer->dev_flags & IDE_DFLAG_PRESENT) {
                         if (setup_count < setup_counts[mate])
                                 setup_count = setup_counts[mate];
                         if (active_count < active_counts[mate])
@@ -607,7 +607,7 @@ static void cmd640_set_pio_mode(ide_drive_t *drive, const u8 pio)
 
 static void cmd640_init_dev(ide_drive_t *drive)
 {
-        unsigned int i = drive->hwif->channel * 2 + drive->select.b.unit;
+        unsigned int i = drive->hwif->channel * 2 + (drive->dn & 1);
 
 #ifdef CONFIG_BLK_DEV_CMD640_ENHANCED
         /*
@@ -626,7 +626,7 @@ static void cmd640_init_dev(ide_drive_t *drive)
          */
         check_prefetch(drive, i);
         printk(KERN_INFO DRV_NAME ": drive%d timings/prefetch(%s) preserved\n",
-                                  i, drive->no_io_32bit ? "off" : "on");
+                i, (drive->dev_flags & IDE_DFLAG_NO_IO_32BIT) ? "off" : "on");
 #endif /* CONFIG_BLK_DEV_CMD640_ENHANCED */
 }
 
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index 456dee18b660..935385c77e06 100644
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -228,7 +228,7 @@ static int cmd648_dma_end(ide_drive_t *drive)
 {
         ide_hwif_t *hwif        = HWIF(drive);
         unsigned long base      = hwif->dma_base - (hwif->channel * 8);
-        int err                 = __ide_dma_end(drive);
+        int err                 = ide_dma_end(drive);
         u8  irq_mask            = hwif->channel ? MRDMODE_INTR_CH1 :
                                                   MRDMODE_INTR_CH0;
         u8  mrdmode             = inb(base + 1);
@@ -248,7 +248,7 @@ static int cmd64x_dma_end(ide_drive_t *drive)
         u8  irq_mask            = hwif->channel ? ARTTIM23_INTR_CH1 :
                                                   CFR_INTR_CH0;
         u8  irq_stat            = 0;
-        int err                 = __ide_dma_end(drive);
+        int err                 = ide_dma_end(drive);
 
         (void) pci_read_config_byte(dev, irq_reg, &irq_stat);
         /* clear the interrupt bit */
@@ -505,7 +505,7 @@ static const struct pci_device_id cmd64x_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, cmd64x_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver cmd64x_pci_driver = {
         .name           = "CMD64x_IDE",
         .id_table       = cmd64x_pci_tbl,
         .probe          = cmd64x_init_one,
@@ -516,12 +516,12 @@ static struct pci_driver driver = {
 
 static int __init cmd64x_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&cmd64x_pci_driver);
 }
 
 static void __exit cmd64x_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&cmd64x_pci_driver);
 }
 
 module_init(cmd64x_ide_init);
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c
index d6341f7c4144..5efb467f8fa0 100644
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
@@ -145,7 +145,7 @@ static const struct pci_device_id cs5520_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, cs5520_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver cs5520_pci_driver = {
         .name           = "Cyrix_IDE",
         .id_table       = cs5520_pci_tbl,
         .probe          = cs5520_init_one,
@@ -155,7 +155,7 @@ static struct pci_driver driver = {
 
 static int __init cs5520_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&cs5520_pci_driver);
 }
 
 module_init(cs5520_ide_init);
diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c
index da42fa7e9f97..53f079cc00af 100644
--- a/drivers/ide/pci/cs5530.c
+++ b/drivers/ide/pci/cs5530.c
@@ -267,7 +267,7 @@ static const struct pci_device_id cs5530_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, cs5530_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver cs5530_pci_driver = {
         .name           = "CS5530 IDE",
         .id_table       = cs5530_pci_tbl,
         .probe          = cs5530_init_one,
@@ -278,12 +278,12 @@ static struct pci_driver driver = {
 
 static int __init cs5530_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&cs5530_pci_driver);
 }
 
 static void __exit cs5530_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&cs5530_pci_driver);
 }
 
 module_init(cs5530_ide_init);
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c
index 1e5bc59ea2fb..983d957a0189 100644
--- a/drivers/ide/pci/cs5535.c
+++ b/drivers/ide/pci/cs5535.c
@@ -76,7 +76,7 @@ static unsigned int cs5535_udma_timings[5] =
 static void cs5535_set_speed(ide_drive_t *drive, const u8 speed)
 {
         u32 reg = 0, dummy;
-        int unit = drive->select.b.unit;
+        u8 unit = drive->dn & 1;
 
         /* Set the PIO timings */
         if (speed < XFER_SW_DMA_0) {
@@ -192,7 +192,7 @@ static const struct pci_device_id cs5535_pci_tbl[] = {
 
 MODULE_DEVICE_TABLE(pci, cs5535_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver cs5535_pci_driver = {
         .name           = "CS5535_IDE",
         .id_table       = cs5535_pci_tbl,
         .probe          = cs5535_init_one,
@@ -203,12 +203,12 @@ static struct pci_driver driver = {
 
 static int __init cs5535_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&cs5535_pci_driver);
 }
 
 static void __exit cs5535_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&cs5535_pci_driver);
 }
 
 module_init(cs5535_ide_init);
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c
index 69820e9224d1..5297f07d2933 100644
--- a/drivers/ide/pci/cy82c693.c
+++ b/drivers/ide/pci/cy82c693.c
@@ -50,18 +50,11 @@
 
 #define DRV_NAME "cy82c693"
 
-/* the current version */
-#define CY82_VERSION    "CY82C693U driver v0.34 99-13-12 Andreas S. Krebs (akrebs@altavista.net)"
-
 /*
  *      The following are used to debug the driver.
  */
-#define CY82C693_DEBUG_LOGS     0
 #define CY82C693_DEBUG_INFO     0
 
-/* define CY82C693_SETDMA_CLOCK to set DMA Controller Clock Speed to ATCLK */
-#undef CY82C693_SETDMA_CLOCK
-
 /*
  *      NOTE: the value for busmaster timeout is tricky and I got it by
  *      trial and error!  By using a to low value will cause DMA timeouts
@@ -89,7 +82,6 @@
 #define CY82_INDEX_PORT         0x22
 #define CY82_DATA_PORT          0x23
 
-#define CY82_INDEX_CTRLREG1     0x01
 #define CY82_INDEX_CHANNEL0     0x30
 #define CY82_INDEX_CHANNEL1     0x31
 #define CY82_INDEX_TIMEOUT      0x32
@@ -179,17 +171,6 @@ static void cy82c693_set_dma_mode(ide_drive_t *drive, const u8 mode)
 
         index = hwif->channel ? CY82_INDEX_CHANNEL1 : CY82_INDEX_CHANNEL0;
 
-#if CY82C693_DEBUG_LOGS
-        /* for debug let's show the previous values */
-
-        outb(index, CY82_INDEX_PORT);
-        data = inb(CY82_DATA_PORT);
-
-        printk(KERN_INFO "%s (ch=%d, dev=%d): DMA mode is %d (single=%d)\n",
-                drive->name, HWIF(drive)->channel, drive->select.b.unit,
-                (data&0x3), ((data>>2)&1));
-#endif /* CY82C693_DEBUG_LOGS */
-
         data = (mode & 3) | (single << 2);
 
         outb(index, CY82_INDEX_PORT);
@@ -197,8 +178,7 @@ static void cy82c693_set_dma_mode(ide_drive_t *drive, const u8 mode)
 
 #if CY82C693_DEBUG_INFO
         printk(KERN_INFO "%s (ch=%d, dev=%d): set DMA mode to %d (single=%d)\n",
-                drive->name, HWIF(drive)->channel, drive->select.b.unit,
-                mode & 3, single);
+                drive->name, hwif->channel, drive->dn & 1, mode & 3, single);
 #endif /* CY82C693_DEBUG_INFO */
 
         /*
@@ -239,50 +219,11 @@ static void cy82c693_set_pio_mode(ide_drive_t *drive, const u8 pio)
                 }
         }
 
-#if CY82C693_DEBUG_LOGS
-        /* for debug let's show the register values */
-
-        if (drive->select.b.unit == 0) {
-                /*
-                 * get master drive registers
-                 * address setup control register
-                 * is 32 bit !!!
-                 */
-                pci_read_config_dword(dev, CY82_IDE_ADDRSETUP, &addrCtrl);
-                addrCtrl &= 0x0F;
-
-                /* now let's get the remaining registers */
-                pci_read_config_byte(dev, CY82_IDE_MASTER_IOR, &pclk.time_16r);
-                pci_read_config_byte(dev, CY82_IDE_MASTER_IOW, &pclk.time_16w);
-                pci_read_config_byte(dev, CY82_IDE_MASTER_8BIT, &pclk.time_8);
-        } else {
-                /*
-                 * set slave drive registers
-                 * address setup control register
-                 * is 32 bit !!!
-                 */
-                pci_read_config_dword(dev, CY82_IDE_ADDRSETUP, &addrCtrl);
-
-                addrCtrl &= 0xF0;
-                addrCtrl >>= 4;
-
-                /* now let's get the remaining registers */
-                pci_read_config_byte(dev, CY82_IDE_SLAVE_IOR, &pclk.time_16r);
-                pci_read_config_byte(dev, CY82_IDE_SLAVE_IOW, &pclk.time_16w);
-                pci_read_config_byte(dev, CY82_IDE_SLAVE_8BIT, &pclk.time_8);
-        }
-
-        printk(KERN_INFO "%s (ch=%d, dev=%d): PIO timing is "
-                "(addr=0x%X, ior=0x%X, iow=0x%X, 8bit=0x%X)\n",
-                drive->name, hwif->channel, drive->select.b.unit,
-                addrCtrl, pclk.time_16r, pclk.time_16w, pclk.time_8);
-#endif /* CY82C693_DEBUG_LOGS */
-
         /* let's calc the values for this PIO mode */
         compute_clocks(pio, &pclk);
 
         /* now let's write  the clocks registers */
-        if (drive->select.b.unit == 0) {
+        if ((drive->dn & 1) == 0) {
                 /*
                  * set master drive
                  * address setup control register
@@ -324,63 +265,11 @@ static void cy82c693_set_pio_mode(ide_drive_t *drive, const u8 pio)
 #if CY82C693_DEBUG_INFO
         printk(KERN_INFO "%s (ch=%d, dev=%d): set PIO timing to "
                 "(addr=0x%X, ior=0x%X, iow=0x%X, 8bit=0x%X)\n",
-                drive->name, hwif->channel, drive->select.b.unit,
+                drive->name, hwif->channel, drive->dn & 1,
                 addrCtrl, pclk.time_16r, pclk.time_16w, pclk.time_8);
 #endif /* CY82C693_DEBUG_INFO */
 }
 
-/*
- * this function is called during init and is used to setup the cy82c693 chip
- */
-static unsigned int init_chipset_cy82c693(struct pci_dev *dev)
-{
-        if (PCI_FUNC(dev->devfn) != 1)
-                return 0;
-
-#ifdef CY82C693_SETDMA_CLOCK
-        u8 data = 0;
-#endif /* CY82C693_SETDMA_CLOCK */
-
-        /* write info about this verion of the driver */
-        printk(KERN_INFO CY82_VERSION "\n");
-
-#ifdef CY82C693_SETDMA_CLOCK
-       /* okay let's set the DMA clock speed */
-
-        outb(CY82_INDEX_CTRLREG1, CY82_INDEX_PORT);
-        data = inb(CY82_DATA_PORT);
-
-#if CY82C693_DEBUG_INFO
-        printk(KERN_INFO DRV_NAME ": Peripheral Configuration Register: 0x%X\n",
-                data);
-#endif /* CY82C693_DEBUG_INFO */
-
-        /*
-         * for some reason sometimes the DMA controller
-         * speed is set to ATCLK/2 ???? - we fix this here
-         *
-         * note: i don't know what causes this strange behaviour,
-         *       but even changing the dma speed doesn't solve it :-(
-         *       the ide performance is still only half the normal speed
-         *
-         *       if anybody knows what goes wrong with my machine, please
-         *       let me know - ASK
-         */
-
-        data |= 0x03;
-
-        outb(CY82_INDEX_CTRLREG1, CY82_INDEX_PORT);
-        outb(data, CY82_DATA_PORT);
-
-#if CY82C693_DEBUG_INFO
-        printk(KERN_INFO ": New Peripheral Configuration Register: 0x%X\n",
-                data);
-#endif /* CY82C693_DEBUG_INFO */
-
-#endif /* CY82C693_SETDMA_CLOCK */
-        return 0;
-}
-
 static void __devinit init_iops_cy82c693(ide_hwif_t *hwif)
 {
         static ide_hwif_t *primary;
@@ -401,7 +290,6 @@ static const struct ide_port_ops cy82c693_port_ops = {
 
 static const struct ide_port_info cy82c693_chipset __devinitdata = {
         .name           = DRV_NAME,
-        .init_chipset   = init_chipset_cy82c693,
         .init_iops      = init_iops_cy82c693,
         .port_ops       = &cy82c693_port_ops,
         .chipset        = ide_cy82c693,
@@ -443,7 +331,7 @@ static const struct pci_device_id cy82c693_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, cy82c693_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver cy82c693_pci_driver = {
         .name           = "Cypress_IDE",
         .id_table       = cy82c693_pci_tbl,
         .probe          = cy82c693_init_one,
@@ -454,12 +342,12 @@ static struct pci_driver driver = {
 
 static int __init cy82c693_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&cy82c693_pci_driver);
 }
 
 static void __exit cy82c693_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&cy82c693_pci_driver);
 }
 
 module_init(cy82c693_ide_init);
diff --git a/drivers/ide/pci/delkin_cb.c b/drivers/ide/pci/delkin_cb.c
index 83b63b365e51..8689a706f537 100644
--- a/drivers/ide/pci/delkin_cb.c
+++ b/drivers/ide/pci/delkin_cb.c
@@ -117,7 +117,7 @@ static struct pci_device_id delkin_cb_pci_tbl[] __devinitdata = {
 };
 MODULE_DEVICE_TABLE(pci, delkin_cb_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver delkin_cb_pci_driver = {
         .name           = "Delkin-ASKA-Workbit Cardbus IDE",
         .id_table       = delkin_cb_pci_tbl,
         .probe          = delkin_cb_probe,
@@ -126,12 +126,12 @@ static struct pci_driver driver = {
 
 static int __init delkin_cb_init(void)
 {
-        return pci_register_driver(&driver);
+        return pci_register_driver(&delkin_cb_pci_driver);
 }
 
 static void __exit delkin_cb_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&delkin_cb_pci_driver);
 }
 
 module_init(delkin_cb_init);
diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
index 092b238cb250..474f96a7c076 100644
--- a/drivers/ide/pci/generic.c
+++ b/drivers/ide/pci/generic.c
@@ -166,7 +166,7 @@ static const struct pci_device_id generic_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, generic_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver generic_pci_driver = {
         .name           = "PCI_IDE",
         .id_table       = generic_pci_tbl,
         .probe          = generic_init_one,
@@ -177,12 +177,12 @@ static struct pci_driver driver = {
 
 static int __init generic_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&generic_pci_driver);
 }
 
 static void __exit generic_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&generic_pci_driver);
 }
 
 module_init(generic_ide_init);
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
index 644de29f8fe4..fb1a3aa57f07 100644
--- a/drivers/ide/pci/hpt34x.c
+++ b/drivers/ide/pci/hpt34x.c
@@ -166,7 +166,7 @@ static const struct pci_device_id hpt34x_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, hpt34x_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver hpt34x_pci_driver = {
         .name           = "HPT34x_IDE",
         .id_table       = hpt34x_pci_tbl,
         .probe          = hpt34x_init_one,
@@ -177,12 +177,12 @@ static struct pci_driver driver = {
 
 static int __init hpt34x_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&hpt34x_pci_driver);
 }
 
 static void __exit hpt34x_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&hpt34x_pci_driver);
 }
 
 module_init(hpt34x_ide_init);
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index a194022b6a61..9cf171cb9376 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -835,7 +835,7 @@ static int hpt370_dma_end(ide_drive_t *drive)
                 if (dma_stat & 0x01)
                         hpt370_irq_timeout(drive);
         }
-        return __ide_dma_end(drive);
+        return ide_dma_end(drive);
 }
 
 static void hpt370_dma_timeout(ide_drive_t *drive)
@@ -863,9 +863,6 @@ static int hpt374_dma_test_irq(ide_drive_t *drive)
         if (dma_stat & 4)
                 return 1;
 
-        if (!drive->waiting_for_dma)
-                printk(KERN_WARNING "%s: (%s) called while not waiting\n",
-                                drive->name, __func__);
         return 0;
 }
 
@@ -880,7 +877,7 @@ static int hpt374_dma_end(ide_drive_t *drive)
         pci_read_config_byte(dev, mcr_addr, &mcr);
         if (bwsr & mask)
                 pci_write_config_byte(dev, mcr_addr, mcr | 0x30);
-        return __ide_dma_end(drive);
+        return ide_dma_end(drive);
 }
 
 /**
@@ -1456,7 +1453,7 @@ static const struct ide_dma_ops hpt36x_dma_ops = {
         .dma_setup              = ide_dma_setup,
         .dma_exec_cmd           = ide_dma_exec_cmd,
         .dma_start              = ide_dma_start,
-        .dma_end                = __ide_dma_end,
+        .dma_end                = ide_dma_end,
         .dma_test_irq           = ide_dma_test_irq,
         .dma_lost_irq           = hpt366_dma_lost_irq,
         .dma_timeout            = ide_dma_timeout,
@@ -1622,7 +1619,7 @@ static const struct pci_device_id hpt366_pci_tbl[] __devinitconst = {
 };
 MODULE_DEVICE_TABLE(pci, hpt366_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver hpt366_pci_driver = {
         .name           = "HPT366_IDE",
         .id_table       = hpt366_pci_tbl,
         .probe          = hpt366_init_one,
@@ -1633,12 +1630,12 @@ static struct pci_driver driver = {
 
 static int __init hpt366_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&hpt366_pci_driver);
 }
 
 static void __exit hpt366_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&hpt366_pci_driver);
 }
 
 module_init(hpt366_ide_init);
diff --git a/drivers/ide/pci/it8213.c b/drivers/ide/pci/it8213.c
index 0954ccd08d6f..7c2feeb3c5ec 100644
--- a/drivers/ide/pci/it8213.c
+++ b/drivers/ide/pci/it8213.c
@@ -189,7 +189,7 @@ static const struct pci_device_id it8213_pci_tbl[] = {
 
 MODULE_DEVICE_TABLE(pci, it8213_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver it8213_pci_driver = {
         .name           = "ITE8213_IDE",
         .id_table       = it8213_pci_tbl,
         .probe          = it8213_init_one,
@@ -200,12 +200,12 @@ static struct pci_driver driver = {
 
 static int __init it8213_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&it8213_pci_driver);
 }
 
 static void __exit it8213_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&it8213_pci_driver);
 }
 
 module_init(it8213_ide_init);
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index 46edd083b348..995e18bb3139 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -138,8 +138,7 @@ static void it821x_program_udma(ide_drive_t *drive, u16 timing)
         struct pci_dev *dev = to_pci_dev(hwif->dev);
         struct it821x_dev *itdev = ide_get_hwifdata(hwif);
         int channel = hwif->channel;
-        int unit = drive->select.b.unit;
-        u8 conf;
+        u8 unit = drive->dn & 1, conf;
 
         /* Program UDMA timing bits */
         if(itdev->clock_mode == ATA_66)
@@ -168,13 +167,11 @@ static void it821x_clock_strategy(ide_drive_t *drive)
         ide_hwif_t *hwif = drive->hwif;
         struct pci_dev *dev = to_pci_dev(hwif->dev);
         struct it821x_dev *itdev = ide_get_hwifdata(hwif);
+        ide_drive_t *pair;
+        int clock, altclock, sel = 0;
+        u8 unit = drive->dn & 1, v;
 
-        u8 unit = drive->select.b.unit;
-        ide_drive_t *pair = &hwif->drives[1-unit];
-
-        int clock, altclock;
-        u8 v;
-        int sel = 0;
+        pair = &hwif->drives[1 - unit];
 
         if(itdev->want[0][0] > itdev->want[1][0]) {
                 clock = itdev->want[0][1];
@@ -240,16 +237,17 @@ static void it821x_clock_strategy(ide_drive_t *drive)
 
 static void it821x_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        ide_hwif_t *hwif        = drive->hwif;
+        ide_hwif_t *hwif = drive->hwif;
         struct it821x_dev *itdev = ide_get_hwifdata(hwif);
-        int unit = drive->select.b.unit;
-        ide_drive_t *pair = &hwif->drives[1 - unit];
-        u8 set_pio = pio;
+        ide_drive_t *pair;
+        u8 unit = drive->dn & 1, set_pio = pio;
 
         /* Spec says 89 ref driver uses 88 */
         static u16 pio_timings[]= { 0xAA88, 0xA382, 0xA181, 0x3332, 0x3121 };
         static u8 pio_want[]    = { ATA_66, ATA_66, ATA_66, ATA_66, ATA_ANY };
 
+        pair = &hwif->drives[1 - unit];
+
         /*
          * Compute the best PIO mode we can for a given device. We must
          * pick a speed that does not cause problems with the other device
@@ -286,9 +284,7 @@ static void it821x_tune_mwdma (ide_drive_t *drive, byte mode_wanted)
         ide_hwif_t *hwif = drive->hwif;
         struct pci_dev *dev = to_pci_dev(hwif->dev);
         struct it821x_dev *itdev = (void *)ide_get_hwifdata(hwif);
-        int unit = drive->select.b.unit;
-        int channel = hwif->channel;
-        u8 conf;
+        u8 unit = drive->dn & 1, channel = hwif->channel, conf;
 
         static u16 dma[]        = { 0x8866, 0x3222, 0x3121 };
         static u8 mwdma_want[]  = { ATA_ANY, ATA_66, ATA_ANY };
@@ -325,9 +321,7 @@ static void it821x_tune_udma (ide_drive_t *drive, byte mode_wanted)
         ide_hwif_t *hwif = drive->hwif;
         struct pci_dev *dev = to_pci_dev(hwif->dev);
         struct it821x_dev *itdev = ide_get_hwifdata(hwif);
-        int unit = drive->select.b.unit;
-        int channel = hwif->channel;
-        u8 conf;
+        u8 unit = drive->dn & 1, channel = hwif->channel, conf;
 
         static u16 udma[]       = { 0x4433, 0x4231, 0x3121, 0x2121, 0x1111, 0x2211, 0x1111 };
         static u8 udma_want[]   = { ATA_ANY, ATA_50, ATA_ANY, ATA_66, ATA_66, ATA_50, ATA_66 };
@@ -369,7 +363,8 @@ static void it821x_dma_start(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
         struct it821x_dev *itdev = ide_get_hwifdata(hwif);
-        int unit = drive->select.b.unit;
+        u8 unit = drive->dn & 1;
+
         if(itdev->mwdma[unit] != MWDMA_OFF)
                 it821x_program(drive, itdev->mwdma[unit]);
         else if(itdev->udma[unit] != UDMA_OFF && itdev->timing10)
@@ -389,9 +384,10 @@ static void it821x_dma_start(ide_drive_t *drive)
 static int it821x_dma_end(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
-        int unit = drive->select.b.unit;
         struct it821x_dev *itdev = ide_get_hwifdata(hwif);
-        int ret = __ide_dma_end(drive);
+        int ret = ide_dma_end(drive);
+        u8 unit = drive->dn & 1;
+
         if(itdev->mwdma[unit] != MWDMA_OFF)
                 it821x_program(drive, itdev->pio[unit]);
         return ret;
@@ -454,7 +450,7 @@ static void it821x_quirkproc(ide_drive_t *drive)
                  *      IRQ mask as we may well be in PIO (eg rev 0x10)
                  *      for now and we know unmasking is safe on this chipset.
                  */
-                drive->unmask = 1;
+                drive->dev_flags |= IDE_DFLAG_UNMASK;
         } else {
         /*
          *      Perform fixups on smart mode. We need to "lose" some
@@ -680,7 +676,7 @@ static const struct pci_device_id it821x_pci_tbl[] = {
 
 MODULE_DEVICE_TABLE(pci, it821x_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver it821x_pci_driver = {
         .name           = "ITE821x IDE",
         .id_table       = it821x_pci_tbl,
         .probe          = it821x_init_one,
@@ -691,12 +687,12 @@ static struct pci_driver driver = {
 
 static int __init it821x_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&it821x_pci_driver);
 }
 
 static void __exit it821x_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&it821x_pci_driver);
 }
 
 module_init(it821x_ide_init);
diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c
index acd647110648..9a68433cf46d 100644
--- a/drivers/ide/pci/jmicron.c
+++ b/drivers/ide/pci/jmicron.c
@@ -149,7 +149,7 @@ static struct pci_device_id jmicron_pci_tbl[] = {
 
 MODULE_DEVICE_TABLE(pci, jmicron_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver jmicron_pci_driver = {
         .name           = "JMicron IDE",
         .id_table       = jmicron_pci_tbl,
         .probe          = jmicron_init_one,
@@ -160,12 +160,12 @@ static struct pci_driver driver = {
 
 static int __init jmicron_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&jmicron_pci_driver);
 }
 
 static void __exit jmicron_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&jmicron_pci_driver);
 }
 
 module_init(jmicron_ide_init);
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c
index 53bd645736d9..13789060f407 100644
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/pci/ns87415.c
@@ -137,7 +137,7 @@ static void __devinit superio_init_iops(struct hwif_s *hwif)
 static unsigned int ns87415_count = 0, ns87415_control[MAX_HWIFS] = { 0 };
 
 /*
- * This routine either enables/disables (according to drive->present)
+ * This routine either enables/disables (according to IDE_DFLAG_PRESENT)
  * the IRQ associated with the port (HWIF(drive)),
  * and selects either PIO or DMA handshaking for the next I/O operation.
  */
@@ -153,11 +153,15 @@ static void ns87415_prepare_drive (ide_drive_t *drive, unsigned int use_dma)
 
         /* Adjust IRQ enable bit */
         bit = 1 << (8 + hwif->channel);
-        new = drive->present ? (new & ~bit) : (new | bit);
+
+        if (drive->dev_flags & IDE_DFLAG_PRESENT)
+                new &= ~bit;
+        else
+                new |= bit;
 
         /* Select PIO or DMA, DMA may only be selected for one drive/channel. */
-        bit   = 1 << (20 + drive->select.b.unit       + (hwif->channel << 1));
-        other = 1 << (20 + (1 - drive->select.b.unit) + (hwif->channel << 1));
+        bit   = 1 << (20 + (drive->dn & 1) + (hwif->channel << 1));
+        other = 1 << (20 + (1 - (drive->dn & 1)) + (hwif->channel << 1));
         new = use_dma ? ((new & ~other) | bit) : (new & ~bit);
 
         if (new != *old) {
@@ -187,7 +191,8 @@ static void ns87415_prepare_drive (ide_drive_t *drive, unsigned int use_dma)
 
 static void ns87415_selectproc (ide_drive_t *drive)
 {
-        ns87415_prepare_drive (drive, drive->using_dma);
+        ns87415_prepare_drive(drive,
+                              !!(drive->dev_flags & IDE_DFLAG_USING_DMA));
 }
 
 static int ns87415_dma_end(ide_drive_t *drive)
@@ -334,7 +339,7 @@ static const struct pci_device_id ns87415_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, ns87415_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver ns87415_pci_driver = {
         .name           = "NS87415_IDE",
         .id_table       = ns87415_pci_tbl,
         .probe          = ns87415_init_one,
@@ -345,12 +350,12 @@ static struct pci_driver driver = {
 
 static int __init ns87415_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&ns87415_pci_driver);
 }
 
 static void __exit ns87415_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&ns87415_pci_driver);
 }
 
 module_init(ns87415_ide_init);
diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c
index 3de11ddcf863..6048eda3cd61 100644
--- a/drivers/ide/pci/opti621.c
+++ b/drivers/ide/pci/opti621.c
@@ -179,7 +179,7 @@ static void opti621_set_pio_mode(ide_drive_t *drive, const u8 pio)
         misc = addr_timings[clk][addr_pio];
 
         /* select Index-0/1 for Register-A/B */
-        write_reg(drive->select.b.unit, MISC_REG);
+        write_reg(drive->dn & 1, MISC_REG);
         /* set read cycle timings */
         write_reg(tim, READ_REG);
         /* set write cycle timings */
@@ -220,7 +220,7 @@ static const struct pci_device_id opti621_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, opti621_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver opti621_pci_driver = {
         .name           = "Opti621_IDE",
         .id_table       = opti621_pci_tbl,
         .probe          = opti621_init_one,
@@ -231,12 +231,12 @@ static struct pci_driver driver = {
 
 static int __init opti621_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&opti621_pci_driver);
 }
 
 static void __exit opti621_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&opti621_pci_driver);
 }
 
 module_init(opti621_ide_init);
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index 9fc59962553b..211ae46e3e0c 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -561,7 +561,7 @@ static const struct pci_device_id pdc202new_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, pdc202new_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver pdc202new_pci_driver = {
         .name           = "Promise_IDE",
         .id_table       = pdc202new_pci_tbl,
         .probe          = pdc202new_init_one,
@@ -572,12 +572,12 @@ static struct pci_driver driver = {
 
 static int __init pdc202new_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&pdc202new_pci_driver);
 }
 
 static void __exit pdc202new_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&pdc202new_pci_driver);
 }
 
 module_init(pdc202new_ide_init);
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index cb6d2a00c514..799557c25eef 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -168,7 +168,7 @@ static void pdc202xx_dma_start(ide_drive_t *drive)
 {
         if (drive->current_speed > XFER_UDMA_2)
                 pdc_old_enable_66MHz_clock(drive->hwif);
-        if (drive->media != ide_disk || drive->addressing == 1) {
+        if (drive->media != ide_disk || (drive->dev_flags & IDE_DFLAG_LBA48)) {
                 struct request *rq      = HWGROUP(drive)->rq;
                 ide_hwif_t *hwif        = HWIF(drive);
                 unsigned long high_16   = hwif->extra_base - 16;
@@ -188,7 +188,7 @@ static void pdc202xx_dma_start(ide_drive_t *drive)
 
 static int pdc202xx_dma_end(ide_drive_t *drive)
 {
-        if (drive->media != ide_disk || drive->addressing == 1) {
+        if (drive->media != ide_disk || (drive->dev_flags & IDE_DFLAG_LBA48)) {
                 ide_hwif_t *hwif        = HWIF(drive);
                 unsigned long high_16   = hwif->extra_base - 16;
                 unsigned long atapi_reg = high_16 + (hwif->channel ? 0x24 : 0x20);
@@ -200,7 +200,7 @@ static int pdc202xx_dma_end(ide_drive_t *drive)
         }
         if (drive->current_speed > XFER_UDMA_2)
                 pdc_old_disable_66MHz_clock(drive->hwif);
-        return __ide_dma_end(drive);
+        return ide_dma_end(drive);
 }
 
 static int pdc202xx_dma_test_irq(ide_drive_t *drive)
@@ -333,7 +333,7 @@ static const struct ide_dma_ops pdc20246_dma_ops = {
         .dma_setup              = ide_dma_setup,
         .dma_exec_cmd           = ide_dma_exec_cmd,
         .dma_start              = ide_dma_start,
-        .dma_end                = __ide_dma_end,
+        .dma_end                = ide_dma_end,
         .dma_test_irq           = pdc202xx_dma_test_irq,
         .dma_lost_irq           = pdc202xx_dma_lost_irq,
         .dma_timeout            = pdc202xx_dma_timeout,
@@ -426,7 +426,7 @@ static const struct pci_device_id pdc202xx_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, pdc202xx_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver pdc202xx_pci_driver = {
         .name           = "Promise_Old_IDE",
         .id_table       = pdc202xx_pci_tbl,
         .probe          = pdc202xx_init_one,
@@ -437,12 +437,12 @@ static struct pci_driver driver = {
 
 static int __init pdc202xx_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&pdc202xx_pci_driver);
 }
 
 static void __exit pdc202xx_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&pdc202xx_pci_driver);
 }
 
 module_init(pdc202xx_ide_init);
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index a06c03f8e295..d63f9fdca76b 100644
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -215,17 +215,26 @@ static unsigned int init_chipset_ich(struct pci_dev *dev)
 }
 
 /**
- *      piix_dma_clear_irq      -       clear BMDMA status
- *      @drive: IDE drive to clear
+ *      ich_clear_irq   -       clear BMDMA status
+ *      @drive: IDE drive
  *
- *      Called from ide_intr() for PIO interrupts
- *      to clear BMDMA status as needed by ICHx
+ *      ICHx contollers set DMA INTR no matter DMA or PIO.
+ *      BMDMA status might need to be cleared even for
+ *      PIO interrupts to prevent spurious/lost IRQ.
  */
-static void piix_dma_clear_irq(ide_drive_t *drive)
+static void ich_clear_irq(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = HWIF(drive);
         u8 dma_stat;
 
+        /*
+         * ide_dma_end() needs BMDMA status for error checking.
+         * So, skip clearing BMDMA status here and leave it
+         * to ide_dma_end() if this is DMA interrupt.
+         */
+        if (drive->waiting_for_dma || hwif->dma_base == 0)
+                return;
+
         /* clear the INTR & ERROR bits */
         dma_stat = inb(hwif->dma_base + ATA_DMA_STATUS);
         /* Should we force the bit as well ? */
@@ -249,6 +258,7 @@ static const struct ich_laptop ich_laptop[] = {
         { 0x27DF, 0x1025, 0x0110 },     /* ICH7 on Acer 3682WLMi */
         { 0x27DF, 0x1043, 0x1267 },     /* ICH7 on Asus W5F */
         { 0x27DF, 0x103C, 0x30A1 },     /* ICH7 on HP Compaq nc2400 */
+        { 0x27DF, 0x1071, 0xD221 },     /* ICH7 on Hercules EC-900 */
         { 0x24CA, 0x1025, 0x0061 },     /* ICH4 on Acer Aspire 2023WLMi */
         { 0x2653, 0x1043, 0x82D8 },     /* ICH6M on Asus Eee 701 */
         /* end marker */
@@ -293,21 +303,19 @@ static void __devinit init_hwif_piix(ide_hwif_t *hwif)
                 hwif->ultra_mask = hwif->mwdma_mask = hwif->swdma_mask = 0;
 }
 
-static void __devinit init_hwif_ich(ide_hwif_t *hwif)
-{
-        init_hwif_piix(hwif);
-
-        /* ICHx need to clear the BMDMA status for all interrupts */
-        if (hwif->dma_base)
-                hwif->ide_dma_clear_irq = &piix_dma_clear_irq;
-}
-
 static const struct ide_port_ops piix_port_ops = {
         .set_pio_mode           = piix_set_pio_mode,
         .set_dma_mode           = piix_set_dma_mode,
         .cable_detect           = piix_cable_detect,
 };
 
+static const struct ide_port_ops ich_port_ops = {
+        .set_pio_mode           = piix_set_pio_mode,
+        .set_dma_mode           = piix_set_dma_mode,
+        .clear_irq              = ich_clear_irq,
+        .cable_detect           = piix_cable_detect,
+};
+
 #ifndef CONFIG_IA64
  #define IDE_HFLAGS_PIIX IDE_HFLAG_LEGACY_IRQS
 #else
@@ -331,9 +339,9 @@ static const struct ide_port_ops piix_port_ops = {
         { \
                 .name           = DRV_NAME, \
                 .init_chipset   = init_chipset_ich, \
-                .init_hwif      = init_hwif_ich, \
+                .init_hwif      = init_hwif_piix, \
                 .enablebits     = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, \
-                .port_ops       = &piix_port_ops, \
+                .port_ops       = &ich_port_ops, \
                 .host_flags     = IDE_HFLAGS_PIIX, \
                 .pio_mask       = ATA_PIO4, \
                 .swdma_mask     = ATA_SWDMA2_ONLY, \
@@ -444,7 +452,7 @@ static const struct pci_device_id piix_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, piix_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver piix_pci_driver = {
         .name           = "PIIX_IDE",
         .id_table       = piix_pci_tbl,
         .probe          = piix_init_one,
@@ -456,12 +464,12 @@ static struct pci_driver driver = {
 static int __init piix_ide_init(void)
 {
         piix_check_450nx();
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&piix_pci_driver);
 }
 
 static void __exit piix_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&piix_pci_driver);
 }
 
 module_init(piix_ide_init);
diff --git a/drivers/ide/pci/rz1000.c b/drivers/ide/pci/rz1000.c
index c117a068761b..7daf0135cbac 100644
--- a/drivers/ide/pci/rz1000.c
+++ b/drivers/ide/pci/rz1000.c
@@ -59,7 +59,7 @@ static const struct pci_device_id rz1000_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, rz1000_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver rz1000_pci_driver = {
         .name           = "RZ1000_IDE",
         .id_table       = rz1000_pci_tbl,
         .probe          = rz1000_init_one,
@@ -68,12 +68,12 @@ static struct pci_driver driver = {
 
 static int __init rz1000_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&rz1000_pci_driver);
 }
 
 static void __exit rz1000_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&rz1000_pci_driver);
 }
 
 module_init(rz1000_ide_init);
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
index bdc1fed41260..f1a8758e3a99 100644
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -126,7 +126,6 @@ static void sc1200_set_dma_mode(ide_drive_t *drive, const u8 mode)
 {
         ide_hwif_t              *hwif = HWIF(drive);
         struct pci_dev          *dev = to_pci_dev(hwif->dev);
-        int                     unit = drive->select.b.unit;
         unsigned int            reg, timings;
         unsigned short          pci_clock;
         unsigned int            basereg = hwif->channel ? 0x50 : 0x40;
@@ -155,7 +154,7 @@ static void sc1200_set_dma_mode(ide_drive_t *drive, const u8 mode)
         else
                 timings = mwdma_timing[pci_clock][mode - XFER_MW_DMA_0];
 
-        if (unit == 0) {                        /* are we configuring drive0? */
+        if ((drive->dn & 1) == 0) {
                 pci_read_config_dword(dev, basereg + 4, &reg);
                 timings |= reg & 0x80000000;    /* preserve PIO format bit */
                 pci_write_config_dword(dev, basereg + 4, timings);
@@ -216,7 +215,8 @@ static void sc1200_set_pio_mode(ide_drive_t *drive, const u8 pio)
         if (mode != -1) {
                 printk("SC1200: %s: changing (U)DMA mode\n", drive->name);
                 ide_dma_off_quietly(drive);
-                if (ide_set_dma_mode(drive, mode) == 0 && drive->using_dma)
+                if (ide_set_dma_mode(drive, mode) == 0 &&
+                    (drive->dev_flags & IDE_DFLAG_USING_DMA))
                         hwif->dma_ops->dma_host_set(drive, 1);
                 return;
         }
@@ -328,7 +328,7 @@ static const struct pci_device_id sc1200_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, sc1200_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver sc1200_pci_driver = {
         .name           = "SC1200_IDE",
         .id_table       = sc1200_pci_tbl,
         .probe          = sc1200_init_one,
@@ -341,12 +341,12 @@ static struct pci_driver driver = {
 
 static int __init sc1200_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&sc1200_pci_driver);
 }
 
 static void __exit sc1200_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&sc1200_pci_driver);
 }
 
 module_init(sc1200_ide_init);
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index e92a874b31df..9ce1d8059921 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -291,7 +291,7 @@ static void scc_set_dma_mode(ide_drive_t *drive, const u8 speed)
 static void scc_dma_host_set(ide_drive_t *drive, int on)
 {
         ide_hwif_t *hwif = drive->hwif;
-        u8 unit = (drive->select.b.unit & 0x01);
+        u8 unit = drive->dn & 1;
         u8 dma_stat = scc_ide_inb(hwif->dma_base + 4);
 
         if (on)
@@ -353,7 +353,6 @@ static void scc_dma_start(ide_drive_t *drive)
 
         /* start DMA */
         scc_ide_outb(dma_cmd | 1, hwif->dma_base);
-        hwif->dma = 1;
         wmb();
 }
 
@@ -374,7 +373,6 @@ static int __scc_dma_end(ide_drive_t *drive)
         /* purge DMA mappings */
         ide_destroy_dmatable(drive);
         /* verify good DMA status */
-        hwif->dma = 0;
         wmb();
         return (dma_stat & 7) != 4 ? (0x10 | dma_stat) : 0;
 }
@@ -511,9 +509,6 @@ static int scc_dma_test_irq(ide_drive_t *drive)
         if (int_stat & INTSTS_IOIRQS)
                 return 1;
 
-        if (!drive->waiting_for_dma)
-                printk(KERN_WARNING "%s: (%s) called while not waiting\n",
-                        drive->name, __func__);
         return 0;
 }
 
@@ -710,7 +705,7 @@ static void scc_tf_load(ide_drive_t *drive, ide_task_t *task)
                 scc_ide_outb(tf->lbah, io_ports->lbah_addr);
 
         if (task->tf_flags & IDE_TFLAG_OUT_DEVICE)
-                scc_ide_outb((tf->device & HIHI) | drive->select.all,
+                scc_ide_outb((tf->device & HIHI) | drive->select,
                              io_ports->device_addr);
 }
 
@@ -826,6 +821,12 @@ static void __devinit init_iops_scc(ide_hwif_t *hwif)
         init_mmio_iops_scc(hwif);
 }
 
+static int __devinit scc_init_dma(ide_hwif_t *hwif,
+                                  const struct ide_port_info *d)
+{
+        return ide_allocate_dma_engine(hwif);
+}
+
 static u8 scc_cable_detect(ide_hwif_t *hwif)
 {
         return ATA_CBL_PATA80;
@@ -890,6 +891,7 @@ static const struct ide_dma_ops scc_dma_ops = {
   {                                                     \
       .name             = name_str,                     \
       .init_iops        = init_iops_scc,                \
+      .init_dma         = scc_init_dma,                 \
       .init_hwif        = init_hwif_scc,                \
       .tp_ops           = &scc_tp_ops,          \
       .port_ops         = &scc_port_ops,                \
@@ -927,13 +929,6 @@ static void __devexit scc_remove(struct pci_dev *dev)
 {
         struct scc_ports *ports = pci_get_drvdata(dev);
         struct ide_host *host = ports->host;
-        ide_hwif_t *hwif = host->ports[0];
-
-        if (hwif->dmatable_cpu) {
-                pci_free_consistent(dev, PRD_ENTRIES * PRD_BYTES,
-                                    hwif->dmatable_cpu, hwif->dmatable_dma);
-                hwif->dmatable_cpu = NULL;
-        }
 
         ide_host_remove(host);
 
@@ -949,7 +944,7 @@ static const struct pci_device_id scc_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, scc_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver scc_pci_driver = {
         .name = "SCC IDE",
         .id_table = scc_pci_tbl,
         .probe = scc_init_one,
@@ -958,14 +953,14 @@ static struct pci_driver driver = {
 
 static int scc_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&scc_pci_driver);
 }
 
 module_init(scc_ide_init);
 /* -- No exit code?
 static void scc_ide_exit(void)
 {
-        ide_pci_unregister_driver(&driver);
+        ide_pci_unregister_driver(&scc_pci_driver);
 }
 module_exit(scc_ide_exit);
  */
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index 3dff2aea317e..437bc919dafd 100644
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -153,7 +153,7 @@ static void svwks_set_dma_mode(ide_drive_t *drive, const u8 speed)
 
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev *dev     = to_pci_dev(hwif->dev);
-        u8 unit                 = (drive->select.b.unit & 0x01);
+        u8 unit                 = drive->dn & 1;
 
         u8 ultra_enable  = 0, ultra_timing = 0, dma_timing = 0;
 
@@ -443,7 +443,7 @@ static const struct pci_device_id svwks_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, svwks_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver svwks_pci_driver = {
         .name           = "Serverworks_IDE",
         .id_table       = svwks_pci_tbl,
         .probe          = svwks_init_one,
@@ -454,12 +454,12 @@ static struct pci_driver driver = {
 
 static int __init svwks_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&svwks_pci_driver);
 }
 
 static void __exit svwks_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&svwks_pci_driver);
 }
 
 module_init(svwks_ide_init);
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index 1017fb4f6317..dd634541ce36 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2003-2006 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (C) 2008 MontaVista Software, Inc.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License
@@ -150,7 +151,7 @@ sgiioc4_clearirq(ide_drive_t * drive)
                 int count = 0;
 
                 stat = sgiioc4_read_status(hwif);
-                while ((stat & 0x80) && (count++ < 100)) {
+                while ((stat & ATA_BUSY) && (count++ < 100)) {
                         udelay(1);
                         stat = sgiioc4_read_status(hwif);
                 }
@@ -310,7 +311,7 @@ static u8 sgiioc4_read_status(ide_hwif_t *hwif)
         u8 reg = (u8) readb((void __iomem *) port);
 
         if ((port & 0xFFF) == 0x11C) {  /* Status register of IOC4 */
-                if (reg & 0x51) {       /* Not busy...check for interrupt */
+                if (!(reg & ATA_BUSY)) { /* Not busy... check for interrupt */
                         unsigned long other_ir = port - 0x110;
                         unsigned int intr_reg = (u32) readl((void __iomem *) other_ir);
 
@@ -338,35 +339,31 @@ ide_dma_sgiioc4(ide_hwif_t *hwif, const struct ide_port_info *d)
         if (dma_base == 0)
                 return -1;
 
-        printk(KERN_INFO "%s: BM-DMA at 0x%04lx-0x%04lx\n", hwif->name,
-               dma_base, dma_base + num_ports - 1);
+        printk(KERN_INFO "    %s: MMIO-DMA\n", hwif->name);
 
-        if (!request_mem_region(dma_base, num_ports, hwif->name)) {
-                printk(KERN_ERR
-                       "%s(%s) -- ERROR, Addresses 0x%p to 0x%p "
-                       "ALREADY in use\n",
-                       __func__, hwif->name, (void *) dma_base,
-                       (void *) dma_base + num_ports - 1);
+        if (request_mem_region(dma_base, num_ports, hwif->name) == NULL) {
+                printk(KERN_ERR "%s(%s) -- ERROR: addresses 0x%08lx to 0x%08lx "
+                       "already in use\n", __func__, hwif->name,
+                       dma_base, dma_base + num_ports - 1);
                 return -1;
         }
 
         virt_dma_base = ioremap(dma_base, num_ports);
         if (virt_dma_base == NULL) {
-                printk(KERN_ERR
-                       "%s(%s) -- ERROR, Unable to map addresses 0x%lx to 0x%lx\n",
-                       __func__, hwif->name, dma_base, dma_base + num_ports - 1);
+                printk(KERN_ERR "%s(%s) -- ERROR: unable to map addresses "
+                       "0x%lx to 0x%lx\n", __func__, hwif->name,
+                       dma_base, dma_base + num_ports - 1);
                 goto dma_remap_failure;
         }
         hwif->dma_base = (unsigned long) virt_dma_base;
 
-        hwif->dmatable_cpu = pci_alloc_consistent(dev,
-                                          IOC4_PRD_ENTRIES * IOC4_PRD_BYTES,
-                                          &hwif->dmatable_dma);
+        hwif->sg_max_nents = IOC4_PRD_ENTRIES;
 
-        if (!hwif->dmatable_cpu)
-                goto dma_pci_alloc_failure;
+        hwif->prd_max_nents = IOC4_PRD_ENTRIES;
+        hwif->prd_ent_size = IOC4_PRD_BYTES;
 
-        hwif->sg_max_nents = IOC4_PRD_ENTRIES;
+        if (ide_allocate_dma_engine(hwif))
+                goto dma_pci_alloc_failure;
 
         pad = pci_alloc_consistent(dev, IOC4_IDE_CACHELINE_SIZE,
                                    (dma_addr_t *)&hwif->extra_base);
@@ -375,13 +372,11 @@ ide_dma_sgiioc4(ide_hwif_t *hwif, const struct ide_port_info *d)
                 return 0;
         }
 
-        pci_free_consistent(dev, IOC4_PRD_ENTRIES * IOC4_PRD_BYTES,
-                            hwif->dmatable_cpu, hwif->dmatable_dma);
-        printk(KERN_INFO
-               "%s() -- Error! Unable to allocate DMA Maps for drive %s\n",
+        ide_release_dma_engine(hwif);
+
+        printk(KERN_ERR "%s(%s) -- ERROR: Unable to allocate DMA maps\n",
                __func__, hwif->name);
-        printk(KERN_INFO
-               "Changing from DMA to PIO mode for Drive %s\n", hwif->name);
+        printk(KERN_INFO "%s: changing from DMA to PIO mode", hwif->name);
 
 dma_pci_alloc_failure:
         iounmap(virt_dma_base);
@@ -617,14 +612,12 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
         irqport = (unsigned long) virt_base + IOC4_INTR_OFFSET;
 
         cmd_phys_base = bar0 + IOC4_CMD_OFFSET;
-        if (!request_mem_region(cmd_phys_base, IOC4_CMD_CTL_BLK_SIZE,
-            DRV_NAME)) {
-                printk(KERN_ERR
-                        "%s %s: -- ERROR, Addresses "
-                        "0x%p to 0x%p ALREADY in use\n",
-                       DRV_NAME, pci_name(dev), (void *)cmd_phys_base,
-                       (void *) cmd_phys_base + IOC4_CMD_CTL_BLK_SIZE);
-                return -ENOMEM;
+        if (request_mem_region(cmd_phys_base, IOC4_CMD_CTL_BLK_SIZE,
+                               DRV_NAME) == NULL) {
+                printk(KERN_ERR "%s %s -- ERROR: addresses 0x%08lx to 0x%08lx "
+                       "already in use\n", DRV_NAME, pci_name(dev),
+                       cmd_phys_base, cmd_phys_base + IOC4_CMD_CTL_BLK_SIZE);
+                return -EBUSY;
         }
 
         /* Initialize the IO registers */
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 174a873b4c64..eb4faf92c571 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -116,13 +116,14 @@ static inline unsigned long siimage_seldev(ide_drive_t *drive, int r)
 {
         ide_hwif_t *hwif        = HWIF(drive);
         unsigned long base      = (unsigned long)hwif->hwif_data;
+        u8 unit                 = drive->dn & 1;
 
         base += 0xA0 + r;
         if (hwif->host_flags & IDE_HFLAG_MMIO)
                 base += hwif->channel << 6;
         else
                 base += hwif->channel << 4;
-        base |= drive->select.b.unit << drive->select.b.unit;
+        base |= unit << unit;
         return base;
 }
 
@@ -255,7 +256,7 @@ static void sil_set_pio_mode(ide_drive_t *drive, u8 pio)
         u8 addr_mask            = hwif->channel ? (mmio ? 0xF4 : 0x84)
                                                 : (mmio ? 0xB4 : 0x80);
         u8 mode                 = 0;
-        u8 unit                 = drive->select.b.unit;
+        u8 unit                 = drive->dn & 1;
 
         /* trim *taskfile* PIO to the slowest of the master/slave */
         if (pair) {
@@ -301,9 +302,9 @@ static void sil_set_dma_mode(ide_drive_t *drive, const u8 speed)
 
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev *dev     = to_pci_dev(hwif->dev);
-        u16 ultra = 0, multi    = 0;
-        u8 mode = 0, unit       = drive->select.b.unit;
         unsigned long base      = (unsigned long)hwif->hwif_data;
+        u16 ultra = 0, multi    = 0;
+        u8 mode = 0, unit       = drive->dn & 1;
         u8 mmio                 = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
         u8 scsc = 0, addr_mask  = hwif->channel ? (mmio ? 0xF4 : 0x84)
                                                 : (mmio ? 0xB4 : 0x80);
@@ -712,7 +713,7 @@ static const struct ide_dma_ops sil_dma_ops = {
         .dma_setup              = ide_dma_setup,
         .dma_exec_cmd           = ide_dma_exec_cmd,
         .dma_start              = ide_dma_start,
-        .dma_end                = __ide_dma_end,
+        .dma_end                = ide_dma_end,
         .dma_test_irq           = siimage_dma_test_irq,
         .dma_timeout            = ide_dma_timeout,
         .dma_lost_irq           = ide_dma_lost_irq,
@@ -829,7 +830,7 @@ static const struct pci_device_id siimage_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, siimage_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver siimage_pci_driver = {
         .name           = "SiI_IDE",
         .id_table       = siimage_pci_tbl,
         .probe          = siimage_init_one,
@@ -840,12 +841,12 @@ static struct pci_driver driver = {
 
 static int __init siimage_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&siimage_pci_driver);
 }
 
 static void __exit siimage_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&siimage_pci_driver);
 }
 
 module_init(siimage_ide_init);
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index 734dd41f1f67..ad32e18c5ba3 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -605,7 +605,7 @@ static const struct pci_device_id sis5513_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, sis5513_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver sis5513_pci_driver = {
         .name           = "SIS_IDE",
         .id_table       = sis5513_pci_tbl,
         .probe          = sis5513_init_one,
@@ -616,12 +616,12 @@ static struct pci_driver driver = {
 
 static int __init sis5513_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&sis5513_pci_driver);
 }
 
 static void __exit sis5513_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&sis5513_pci_driver);
 }
 
 module_init(sis5513_ide_init);
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
index 37a6b7bdc040..84dc33602ff8 100644
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/pci/sl82c105.c
@@ -207,7 +207,7 @@ static int sl82c105_dma_end(ide_drive_t *drive)
 
         DBG(("%s(drive:%s)\n", __func__, drive->name));
 
-        ret = __ide_dma_end(drive);
+        ret = ide_dma_end(drive);
 
         pci_write_config_word(dev, reg, drive->drive_data);
 
@@ -345,7 +345,7 @@ static const struct pci_device_id sl82c105_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, sl82c105_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver sl82c105_pci_driver = {
         .name           = "W82C105_IDE",
         .id_table       = sl82c105_pci_tbl,
         .probe          = sl82c105_init_one,
@@ -356,12 +356,12 @@ static struct pci_driver driver = {
 
 static int __init sl82c105_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&sl82c105_pci_driver);
 }
 
 static void __exit sl82c105_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&sl82c105_pci_driver);
 }
 
 module_init(sl82c105_ide_init);
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c
index a9551a13ac57..0f759e4ed779 100644
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/pci/slc90e66.c
@@ -154,7 +154,7 @@ static const struct pci_device_id slc90e66_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, slc90e66_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver slc90e66_pci_driver = {
         .name           = "SLC90e66_IDE",
         .id_table       = slc90e66_pci_tbl,
         .probe          = slc90e66_init_one,
@@ -165,12 +165,12 @@ static struct pci_driver driver = {
 
 static int __init slc90e66_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&slc90e66_pci_driver);
 }
 
 static void __exit slc90e66_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&slc90e66_pci_driver);
 }
 
 module_init(slc90e66_ide_init);
diff --git a/drivers/ide/pci/tc86c001.c b/drivers/ide/pci/tc86c001.c
index 927277c54ec9..93e2cce4b296 100644
--- a/drivers/ide/pci/tc86c001.c
+++ b/drivers/ide/pci/tc86c001.c
@@ -186,7 +186,7 @@ static const struct ide_dma_ops tc86c001_dma_ops = {
         .dma_setup              = ide_dma_setup,
         .dma_exec_cmd           = ide_dma_exec_cmd,
         .dma_start              = tc86c001_dma_start,
-        .dma_end                = __ide_dma_end,
+        .dma_end                = ide_dma_end,
         .dma_test_irq           = ide_dma_test_irq,
         .dma_lost_irq           = ide_dma_lost_irq,
         .dma_timeout            = ide_dma_timeout,
@@ -245,7 +245,7 @@ static const struct pci_device_id tc86c001_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, tc86c001_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver tc86c001_pci_driver = {
         .name           = "TC86C001",
         .id_table       = tc86c001_pci_tbl,
         .probe          = tc86c001_init_one,
@@ -254,12 +254,12 @@ static struct pci_driver driver = {
 
 static int __init tc86c001_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&tc86c001_pci_driver);
 }
 
 static void __exit tc86c001_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&tc86c001_pci_driver);
 }
 
 module_init(tc86c001_ide_init);
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
index be8715dcee05..b6ff40336aa9 100644
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/pci/triflex.c
@@ -38,13 +38,12 @@ static void triflex_set_mode(ide_drive_t *drive, const u8 speed)
 {
         ide_hwif_t *hwif = HWIF(drive);
         struct pci_dev *dev = to_pci_dev(hwif->dev);
-        u8 channel_offset = hwif->channel ? 0x74 : 0x70;
-        u16 timing = 0;
         u32 triflex_timings = 0;
-        u8 unit = (drive->select.b.unit & 0x01);
-        
+        u16 timing = 0;
+        u8 channel_offset = hwif->channel ? 0x74 : 0x70, unit = drive->dn & 1;
+
         pci_read_config_dword(dev, channel_offset, &triflex_timings);
-        
+
         switch(speed) {
                 case XFER_MW_DMA_2:
                         timing = 0x0103; 
@@ -114,7 +113,7 @@ static const struct pci_device_id triflex_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, triflex_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver triflex_pci_driver = {
         .name           = "TRIFLEX_IDE",
         .id_table       = triflex_pci_tbl,
         .probe          = triflex_init_one,
@@ -125,12 +124,12 @@ static struct pci_driver driver = {
 
 static int __init triflex_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&triflex_pci_driver);
 }
 
 static void __exit triflex_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&triflex_pci_driver);
 }
 
 module_init(triflex_ide_init);
diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c
index 4dfbc6a68b5b..75ea61526566 100644
--- a/drivers/ide/pci/trm290.c
+++ b/drivers/ide/pci/trm290.c
@@ -161,7 +161,7 @@ static void trm290_prepare_drive (ide_drive_t *drive, unsigned int use_dma)
         }
 
         /* enable IRQ if not probing */
-        if (drive->present) {
+        if (drive->dev_flags & IDE_DFLAG_PRESENT) {
                 reg = inw(hwif->config_data + 3);
                 reg &= 0x13;
                 reg &= ~(1 << hwif->channel);
@@ -173,7 +173,7 @@ static void trm290_prepare_drive (ide_drive_t *drive, unsigned int use_dma)
 
 static void trm290_selectproc (ide_drive_t *drive)
 {
-        trm290_prepare_drive(drive, drive->using_dma);
+        trm290_prepare_drive(drive, !!(drive->dev_flags & IDE_DFLAG_USING_DMA));
 }
 
 static void trm290_dma_exec_cmd(ide_drive_t *drive, u8 command)
@@ -350,7 +350,7 @@ static const struct pci_device_id trm290_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, trm290_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver trm290_pci_driver = {
         .name           = "TRM290_IDE",
         .id_table       = trm290_pci_tbl,
         .probe          = trm290_init_one,
@@ -359,12 +359,12 @@ static struct pci_driver driver = {
 
 static int __init trm290_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&trm290_pci_driver);
 }
 
 static void __exit trm290_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&trm290_pci_driver);
 }
 
 module_init(trm290_ide_init);
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index acacdaab69c2..2a812d3207e9 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -487,7 +487,7 @@ static const struct pci_device_id via_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, via_pci_tbl);
 
-static struct pci_driver driver = {
+static struct pci_driver via_pci_driver = {
         .name           = "VIA_IDE",
         .id_table       = via_pci_tbl,
         .probe          = via_init_one,
@@ -498,12 +498,12 @@ static struct pci_driver driver = {
 
 static int __init via_ide_init(void)
 {
-        return ide_pci_register_driver(&driver);
+        return ide_pci_register_driver(&via_pci_driver);
 }
 
 static void __exit via_ide_exit(void)
 {
-        pci_unregister_driver(&driver);
+        pci_unregister_driver(&via_pci_driver);
 }
 
 module_init(via_ide_init);
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index c3432da78d52..2e19d6298536 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -430,10 +430,7 @@ pmac_ide_selectproc(ide_drive_t *drive)
         pmac_ide_hwif_t *pmif =
                 (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent);
 
-        if (pmif == NULL)
-                return;
-
-        if (drive->select.b.unit & 0x01)
+        if (drive->dn & 1)
                 writel(pmif->timings[1], PMAC_IDE_REG(IDE_TIMING_CONFIG));
         else
                 writel(pmif->timings[0], PMAC_IDE_REG(IDE_TIMING_CONFIG));
@@ -452,10 +449,7 @@ pmac_ide_kauai_selectproc(ide_drive_t *drive)
         pmac_ide_hwif_t *pmif =
                 (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent);
 
-        if (pmif == NULL)
-                return;
-
-        if (drive->select.b.unit & 0x01) {
+        if (drive->dn & 1) {
                 writel(pmif->timings[1], PMAC_IDE_REG(IDE_KAUAI_PIO_CONFIG));
                 writel(pmif->timings[3], PMAC_IDE_REG(IDE_KAUAI_ULTRA_CONFIG));
         } else {
@@ -475,9 +469,6 @@ pmac_ide_do_update_timings(ide_drive_t *drive)
         pmac_ide_hwif_t *pmif =
                 (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent);
 
-        if (pmif == NULL)
-                return;
-
         if (pmif->kind == controller_sh_ata6 ||
             pmif->kind == controller_un_ata6 ||
             pmif->kind == controller_k2_ata6)
@@ -524,11 +515,8 @@ pmac_ide_set_pio_mode(ide_drive_t *drive, const u8 pio)
         unsigned accessTime, recTime;
         unsigned int cycle_time;
 
-        if (pmif == NULL)
-                return;
-                
         /* which drive is it ? */
-        timings = &pmif->timings[drive->select.b.unit & 0x01];
+        timings = &pmif->timings[drive->dn & 1];
         t = *timings;
 
         cycle_time = ide_pio_cycle_time(drive, pio);
@@ -805,9 +793,9 @@ static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed)
         ide_hwif_t *hwif = drive->hwif;
         pmac_ide_hwif_t *pmif =
                 (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent);
-        int unit = (drive->select.b.unit & 0x01);
         int ret = 0;
         u32 *timings, *timings2, tl[2];
+        u8 unit = drive->dn & 1;
 
         timings = &pmif->timings[unit];
         timings2 = &pmif->timings[unit+2];
@@ -966,11 +954,11 @@ static void pmac_ide_init_dev(ide_drive_t *drive)
         if (pmif->mediabay) {
 #ifdef CONFIG_PMAC_MEDIABAY
                 if (check_media_bay_by_base(pmif->regbase, MB_CD) == 0) {
-                        drive->noprobe = 0;
+                        drive->dev_flags &= ~IDE_DFLAG_NOPROBE;
                         return;
                 }
 #endif
-                drive->noprobe = 1;
+                drive->dev_flags |= IDE_DFLAG_NOPROBE;
         }
 }
 
@@ -1535,18 +1523,6 @@ use_pio_instead:
         return 0; /* revert to PIO for this request */
 }
 
-/* Teardown mappings after DMA has completed.  */
-static void
-pmac_ide_destroy_dmatable (ide_drive_t *drive)
-{
-        ide_hwif_t *hwif = drive->hwif;
-
-        if (hwif->sg_nents) {
-                ide_destroy_dmatable(drive);
-                hwif->sg_nents = 0;
-        }
-}
-
 /*
  * Prepare a DMA transfer. We build the DMA table, adjust the timings for
  * a read on KeyLargo ATA/66 and mark us as waiting for DMA completion
@@ -1558,12 +1534,7 @@ pmac_ide_dma_setup(ide_drive_t *drive)
         pmac_ide_hwif_t *pmif =
                 (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent);
         struct request *rq = HWGROUP(drive)->rq;
-        u8 unit = (drive->select.b.unit & 0x01);
-        u8 ata4;
-
-        if (pmif == NULL)
-                return 1;
-        ata4 = (pmif->kind == controller_kl_ata4);      
+        u8 unit = drive->dn & 1, ata4 = (pmif->kind == controller_kl_ata4);
 
         if (!pmac_ide_build_dmatable(drive, rq)) {
                 ide_map_sg(drive, rq);
@@ -1617,17 +1588,15 @@ pmac_ide_dma_end (ide_drive_t *drive)
         ide_hwif_t *hwif = drive->hwif;
         pmac_ide_hwif_t *pmif =
                 (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent);
-        volatile struct dbdma_regs __iomem *dma;
+        volatile struct dbdma_regs __iomem *dma = pmif->dma_regs;
         u32 dstat;
-        
-        if (pmif == NULL)
-                return 0;
-        dma = pmif->dma_regs;
 
         drive->waiting_for_dma = 0;
         dstat = readl(&dma->status);
         writel(((RUN|WAKE|DEAD) << 16), &dma->control);
-        pmac_ide_destroy_dmatable(drive);
+
+        ide_destroy_dmatable(drive);
+
         /* verify good dma status. we don't check for ACTIVE beeing 0. We should...
          * in theory, but with ATAPI decices doing buffer underruns, that would
          * cause us to disable DMA, which isn't what we want
@@ -1647,13 +1616,9 @@ pmac_ide_dma_test_irq (ide_drive_t *drive)
         ide_hwif_t *hwif = drive->hwif;
         pmac_ide_hwif_t *pmif =
                 (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent);
-        volatile struct dbdma_regs __iomem *dma;
+        volatile struct dbdma_regs __iomem *dma = pmif->dma_regs;
         unsigned long status, timeout;
 
-        if (pmif == NULL)
-                return 0;
-        dma = pmif->dma_regs;
-
         /* We have to things to deal with here:
          * 
          * - The dbdma won't stop if the command was started
@@ -1672,9 +1637,6 @@ pmac_ide_dma_test_irq (ide_drive_t *drive)
         status = readl(&dma->status);
         if (!(status & ACTIVE))
                 return 1;
-        if (!drive->waiting_for_dma)
-                printk(KERN_WARNING "ide%d, ide_dma_test_irq \
-                        called while not waiting\n", HWIF(drive)->index);
 
         /* If dbdma didn't execute the STOP command yet, the
          * active bit is still set. We consider that we aren't
@@ -1709,14 +1671,9 @@ pmac_ide_dma_lost_irq (ide_drive_t *drive)
         ide_hwif_t *hwif = drive->hwif;
         pmac_ide_hwif_t *pmif =
                 (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent);
-        volatile struct dbdma_regs __iomem *dma;
-        unsigned long status;
-
-        if (pmif == NULL)
-                return;
-        dma = pmif->dma_regs;
+        volatile struct dbdma_regs __iomem *dma = pmif->dma_regs;
+        unsigned long status = readl(&dma->status);
 
-        status = readl(&dma->status);
         printk(KERN_ERR "ide-pmac lost interrupt, dma status: %lx\n", status);
 }
 
diff --git a/drivers/ieee1394/csr1212.c b/drivers/ieee1394/csr1212.c
index 9f95337139e3..5e38a68b8af2 100644
--- a/drivers/ieee1394/csr1212.c
+++ b/drivers/ieee1394/csr1212.c
@@ -84,7 +84,7 @@ static const u8 csr1212_key_id_type_map[0x30] = {
 
 
 #define quads_to_bytes(_q) ((_q) * sizeof(u32))
-#define bytes_to_quads(_b) (((_b) + sizeof(u32) - 1) / sizeof(u32))
+#define bytes_to_quads(_b) DIV_ROUND_UP(_b, sizeof(u32))
 
 static void free_keyval(struct csr1212_keyval *kv)
 {
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index b6eb2cf25914..2f83543a9dfc 100644
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -918,7 +918,7 @@ static int do_dv1394_init(struct video_card *video, struct dv1394_init *init)
                 /* default SYT offset is 3 cycles */
                 init->syt_offset = 3;
 
-        if ( (init->channel > 63) || (init->channel < 0) )
+        if (init->channel > 63)
                 init->channel = 63;
 
         chan_mask = (u64)1 << init->channel;
@@ -2296,10 +2296,10 @@ static void dv1394_add_host(struct hpsb_host *host)
 
         ohci = (struct ti_ohci *)host->hostdata;
 
-        device_create_drvdata(hpsb_protocol_class, NULL,
-                              MKDEV(IEEE1394_MAJOR,
-                                    IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2)), NULL,
-                              "dv1394-%d", id);
+        device_create(hpsb_protocol_class, NULL,
+                      MKDEV(IEEE1394_MAJOR,
+                            IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2)),
+                      NULL, "dv1394-%d", id);
 
         dv1394_init(ohci, DV1394_NTSC, MODE_RECEIVE);
         dv1394_init(ohci, DV1394_NTSC, MODE_TRANSMIT);
diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index b166b3575fa6..20128692b339 100644
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
@@ -1361,7 +1361,7 @@ static unsigned int ether1394_encapsulate_prep(unsigned int max_payload,
                 hdr->ff.dgl = dgl;
                 adj_max_payload = max_payload - hdr_type_len[ETH1394_HDR_LF_FF];
         }
-        return (dg_size + adj_max_payload - 1) / adj_max_payload;
+        return DIV_ROUND_UP(dg_size, adj_max_payload);
 }
 
 static unsigned int ether1394_encapsulate(struct sk_buff *skb,
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index 16240a789650..2376b729e876 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -154,9 +154,6 @@ struct host_info {
 
 static int nodemgr_bus_match(struct device * dev, struct device_driver * drv);
 static int nodemgr_uevent(struct device *dev, struct kobj_uevent_env *env);
-static void nodemgr_resume_ne(struct node_entry *ne);
-static void nodemgr_remove_ne(struct node_entry *ne);
-static struct node_entry *find_entry_by_guid(u64 guid);
 
 struct bus_type ieee1394_bus_type = {
         .name           = "ieee1394",
@@ -385,27 +382,6 @@ static ssize_t fw_get_ignore_driver(struct device *dev, struct device_attribute
 static DEVICE_ATTR(ignore_driver, S_IWUSR | S_IRUGO, fw_get_ignore_driver, fw_set_ignore_driver);
 
 
-static ssize_t fw_set_destroy_node(struct bus_type *bus, const char *buf, size_t count)
-{
-        struct node_entry *ne;
-        u64 guid = (u64)simple_strtoull(buf, NULL, 16);
-
-        ne = find_entry_by_guid(guid);
-
-        if (ne == NULL || !ne->in_limbo)
-                return -EINVAL;
-
-        nodemgr_remove_ne(ne);
-
-        return count;
-}
-static ssize_t fw_get_destroy_node(struct bus_type *bus, char *buf)
-{
-        return sprintf(buf, "You can destroy in_limbo nodes by writing their GUID to this file\n");
-}
-static BUS_ATTR(destroy_node, S_IWUSR | S_IRUGO, fw_get_destroy_node, fw_set_destroy_node);
-
-
 static ssize_t fw_set_rescan(struct bus_type *bus, const char *buf,
                              size_t count)
 {
@@ -442,7 +418,6 @@ static BUS_ATTR(ignore_drivers, S_IWUSR | S_IRUGO, fw_get_ignore_drivers, fw_set
 
 
 struct bus_attribute *const fw_bus_attrs[] = {
-        &bus_attr_destroy_node,
         &bus_attr_rescan,
         &bus_attr_ignore_drivers,
         NULL
@@ -734,10 +709,10 @@ static int nodemgr_bus_match(struct device * dev, struct device_driver * drv)
 
 static DEFINE_MUTEX(nodemgr_serialize_remove_uds);
 
-static int __match_ne(struct device *dev, void *data)
+static int match_ne(struct device *dev, void *data)
 {
         struct unit_directory *ud;
-        struct node_entry *ne = (struct node_entry *)data;
+        struct node_entry *ne = data;
 
         ud = container_of(dev, struct unit_directory, unit_dev);
         return ud->ne == ne;
@@ -754,8 +729,7 @@ static void nodemgr_remove_uds(struct node_entry *ne)
          */
         mutex_lock(&nodemgr_serialize_remove_uds);
         for (;;) {
-                dev = class_find_device(&nodemgr_ud_class, NULL, ne,
-                                        __match_ne);
+                dev = class_find_device(&nodemgr_ud_class, NULL, ne, match_ne);
                 if (!dev)
                         break;
                 ud = container_of(dev, struct unit_directory, unit_dev);
@@ -785,7 +759,7 @@ static void nodemgr_remove_ne(struct node_entry *ne)
         put_device(dev);
 }
 
-static int __nodemgr_remove_host_dev(struct device *dev, void *data)
+static int remove_host_dev(struct device *dev, void *data)
 {
         if (dev->bus == &ieee1394_bus_type)
                 nodemgr_remove_ne(container_of(dev, struct node_entry,
@@ -795,7 +769,7 @@ static int __nodemgr_remove_host_dev(struct device *dev, void *data)
 
 static void nodemgr_remove_host_dev(struct device *dev)
 {
-        WARN_ON(device_for_each_child(dev, NULL, __nodemgr_remove_host_dev));
+        device_for_each_child(dev, NULL, remove_host_dev);
         sysfs_remove_link(&dev->kobj, "irm_id");
         sysfs_remove_link(&dev->kobj, "busmgr_id");
         sysfs_remove_link(&dev->kobj, "host_id");
@@ -830,11 +804,10 @@ static void nodemgr_update_bus_options(struct node_entry *ne)
 }
 
 
-static struct node_entry *nodemgr_create_node(octlet_t guid, struct csr1212_csr *csr,
-                                              struct host_info *hi, nodeid_t nodeid,
-                                              unsigned int generation)
+static struct node_entry *nodemgr_create_node(octlet_t guid,
+                                struct csr1212_csr *csr, struct hpsb_host *host,
+                                nodeid_t nodeid, unsigned int generation)
 {
-        struct hpsb_host *host = hi->host;
         struct node_entry *ne;
 
         ne = kzalloc(sizeof(*ne), GFP_KERNEL);
@@ -888,10 +861,10 @@ fail_alloc:
         return NULL;
 }
 
-static int __match_ne_guid(struct device *dev, void *data)
+static int match_ne_guid(struct device *dev, void *data)
 {
         struct node_entry *ne;
-        u64 *guid = (u64 *)data;
+        u64 *guid = data;
 
         ne = container_of(dev, struct node_entry, node_dev);
         return ne->guid == *guid;
@@ -902,8 +875,7 @@ static struct node_entry *find_entry_by_guid(u64 guid)
         struct device *dev;
         struct node_entry *ne;
 
-        dev = class_find_device(&nodemgr_ne_class, NULL, &guid,
-                                __match_ne_guid);
+        dev = class_find_device(&nodemgr_ne_class, NULL, &guid, match_ne_guid);
         if (!dev)
                 return NULL;
         ne = container_of(dev, struct node_entry, node_dev);
@@ -912,21 +884,21 @@ static struct node_entry *find_entry_by_guid(u64 guid)
         return ne;
 }
 
-struct match_nodeid_param {
+struct match_nodeid_parameter {
         struct hpsb_host *host;
         nodeid_t nodeid;
 };
 
-static int __match_ne_nodeid(struct device *dev, void *data)
+static int match_ne_nodeid(struct device *dev, void *data)
 {
         int found = 0;
         struct node_entry *ne;
-        struct match_nodeid_param *param = (struct match_nodeid_param *)data;
+        struct match_nodeid_parameter *p = data;
 
         if (!dev)
                 goto ret;
         ne = container_of(dev, struct node_entry, node_dev);
-        if (ne->host == param->host && ne->nodeid == param->nodeid)
+        if (ne->host == p->host && ne->nodeid == p->nodeid)
                 found = 1;
 ret:
         return found;
@@ -937,13 +909,12 @@ static struct node_entry *find_entry_by_nodeid(struct hpsb_host *host,
 {
         struct device *dev;
         struct node_entry *ne;
-        struct match_nodeid_param param;
+        struct match_nodeid_parameter p;
 
-        param.host = host;
-        param.nodeid = nodeid;
+        p.host = host;
+        p.nodeid = nodeid;
 
-        dev = class_find_device(&nodemgr_ne_class, NULL, &param,
-                                __match_ne_nodeid);
+        dev = class_find_device(&nodemgr_ne_class, NULL, &p, match_ne_nodeid);
         if (!dev)
                 return NULL;
         ne = container_of(dev, struct node_entry, node_dev);
@@ -990,7 +961,7 @@ fail_devreg:
  * immediate unit directories looking for software_id and
  * software_version entries, in order to get driver autoloading working. */
 static struct unit_directory *nodemgr_process_unit_directory
-        (struct host_info *hi, struct node_entry *ne, struct csr1212_keyval *ud_kv,
+        (struct node_entry *ne, struct csr1212_keyval *ud_kv,
          unsigned int *id, struct unit_directory *parent)
 {
         struct unit_directory *ud;
@@ -1083,7 +1054,7 @@ static struct unit_directory *nodemgr_process_unit_directory
                                         nodemgr_register_device(ne, ud, &ne->device);
                                 
                                 /* process the child unit */
-                                ud_child = nodemgr_process_unit_directory(hi, ne, kv, id, ud);
+                                ud_child = nodemgr_process_unit_directory(ne, kv, id, ud);
 
                                 if (ud_child == NULL)
                                         break;
@@ -1137,7 +1108,7 @@ unit_directory_error:
 }
 
 
-static void nodemgr_process_root_directory(struct host_info *hi, struct node_entry *ne)
+static void nodemgr_process_root_directory(struct node_entry *ne)
 {
         unsigned int ud_id = 0;
         struct csr1212_dentry *dentry;
@@ -1157,7 +1128,7 @@ static void nodemgr_process_root_directory(struct host_info *hi, struct node_ent
                         break;
 
                 case CSR1212_KV_ID_UNIT:
-                        nodemgr_process_unit_directory(hi, ne, kv, &ud_id, NULL);
+                        nodemgr_process_unit_directory(ne, kv, &ud_id, NULL);
                         break;
 
                 case CSR1212_KV_ID_DESCRIPTOR:
@@ -1273,8 +1244,7 @@ void hpsb_unregister_protocol(struct hpsb_protocol_driver *driver)
  * the to take whatever actions required.
  */
 static void nodemgr_update_node(struct node_entry *ne, struct csr1212_csr *csr,
-                                struct host_info *hi, nodeid_t nodeid,
-                                unsigned int generation)
+                                nodeid_t nodeid, unsigned int generation)
 {
         if (ne->nodeid != nodeid) {
                 HPSB_DEBUG("Node changed: " NODE_BUS_FMT " -> " NODE_BUS_FMT,
@@ -1305,19 +1275,23 @@ static void nodemgr_update_node(struct node_entry *ne, struct csr1212_csr *csr,
                 csr1212_destroy_csr(csr);
         }
 
-        if (ne->in_limbo)
-                nodemgr_resume_ne(ne);
-
         /* Mark the node current */
         ne->generation = generation;
-}
 
+        if (ne->in_limbo) {
+                device_remove_file(&ne->device, &dev_attr_ne_in_limbo);
+                ne->in_limbo = false;
 
+                HPSB_DEBUG("Node reactivated: "
+                           "ID:BUS[" NODE_BUS_FMT "]  GUID[%016Lx]",
+                           NODE_BUS_ARGS(ne->host, ne->nodeid),
+                           (unsigned long long)ne->guid);
+        }
+}
 
-static void nodemgr_node_scan_one(struct host_info *hi,
+static void nodemgr_node_scan_one(struct hpsb_host *host,
                                   nodeid_t nodeid, int generation)
 {
-        struct hpsb_host *host = hi->host;
         struct node_entry *ne;
         octlet_t guid;
         struct csr1212_csr *csr;
@@ -1373,16 +1347,15 @@ static void nodemgr_node_scan_one(struct host_info *hi,
         }
 
         if (!ne)
-                nodemgr_create_node(guid, csr, hi, nodeid, generation);
+                nodemgr_create_node(guid, csr, host, nodeid, generation);
         else
-                nodemgr_update_node(ne, csr, hi, nodeid, generation);
+                nodemgr_update_node(ne, csr, nodeid, generation);
 }
 
 
-static void nodemgr_node_scan(struct host_info *hi, int generation)
+static void nodemgr_node_scan(struct hpsb_host *host, int generation)
 {
         int count;
-        struct hpsb_host *host = hi->host;
         struct selfid *sid = (struct selfid *)host->topology_map;
         nodeid_t nodeid = LOCAL_BUS;
 
@@ -1395,89 +1368,26 @@ static void nodemgr_node_scan(struct host_info *hi, int generation)
                         nodeid++;
                         continue;
                 }
-                nodemgr_node_scan_one(hi, nodeid++, generation);
-        }
-}
-
-static int __nodemgr_driver_suspend(struct device *dev, void *data)
-{
-        struct unit_directory *ud;
-        struct device_driver *drv;
-        struct node_entry *ne = (struct node_entry *)data;
-        int error;
-
-        ud = container_of(dev, struct unit_directory, unit_dev);
-        if (ud->ne == ne) {
-                drv = get_driver(ud->device.driver);
-                if (drv) {
-                        error = 1; /* release if suspend is not implemented */
-                        if (drv->suspend) {
-                                down(&ud->device.sem);
-                                error = drv->suspend(&ud->device, PMSG_SUSPEND);
-                                up(&ud->device.sem);
-                        }
-                        if (error)
-                                device_release_driver(&ud->device);
-                        put_driver(drv);
-                }
-        }
-
-        return 0;
-}
-
-static int __nodemgr_driver_resume(struct device *dev, void *data)
-{
-        struct unit_directory *ud;
-        struct device_driver *drv;
-        struct node_entry *ne = (struct node_entry *)data;
-
-        ud = container_of(dev, struct unit_directory, unit_dev);
-        if (ud->ne == ne) {
-                drv = get_driver(ud->device.driver);
-                if (drv) {
-                        if (drv->resume) {
-                                down(&ud->device.sem);
-                                drv->resume(&ud->device);
-                                up(&ud->device.sem);
-                        }
-                        put_driver(drv);
-                }
+                nodemgr_node_scan_one(host, nodeid++, generation);
         }
-
-        return 0;
 }
 
-static void nodemgr_suspend_ne(struct node_entry *ne)
+static void nodemgr_pause_ne(struct node_entry *ne)
 {
-        HPSB_DEBUG("Node suspended: ID:BUS[" NODE_BUS_FMT "]  GUID[%016Lx]",
+        HPSB_DEBUG("Node paused: ID:BUS[" NODE_BUS_FMT "]  GUID[%016Lx]",
                    NODE_BUS_ARGS(ne->host, ne->nodeid),
                    (unsigned long long)ne->guid);
 
-        ne->in_limbo = 1;
+        ne->in_limbo = true;
         WARN_ON(device_create_file(&ne->device, &dev_attr_ne_in_limbo));
-
-        class_for_each_device(&nodemgr_ud_class, NULL, ne,
-                              __nodemgr_driver_suspend);
-}
-
-
-static void nodemgr_resume_ne(struct node_entry *ne)
-{
-        ne->in_limbo = 0;
-        device_remove_file(&ne->device, &dev_attr_ne_in_limbo);
-
-        class_for_each_device(&nodemgr_ud_class, NULL, ne,
-                              __nodemgr_driver_resume);
-        HPSB_DEBUG("Node resumed: ID:BUS[" NODE_BUS_FMT "]  GUID[%016Lx]",
-                   NODE_BUS_ARGS(ne->host, ne->nodeid), (unsigned long long)ne->guid);
 }
 
-static int __nodemgr_update_pdrv(struct device *dev, void *data)
+static int update_pdrv(struct device *dev, void *data)
 {
         struct unit_directory *ud;
         struct device_driver *drv;
         struct hpsb_protocol_driver *pdrv;
-        struct node_entry *ne = (struct node_entry *)data;
+        struct node_entry *ne = data;
         int error;
 
         ud = container_of(dev, struct unit_directory, unit_dev);
@@ -1503,11 +1413,9 @@ static int __nodemgr_update_pdrv(struct device *dev, void *data)
 
 static void nodemgr_update_pdrv(struct node_entry *ne)
 {
-        class_for_each_device(&nodemgr_ud_class, NULL, ne,
-                              __nodemgr_update_pdrv);
+        class_for_each_device(&nodemgr_ud_class, NULL, ne, update_pdrv);
 }
 
-
 /* Write the BROADCAST_CHANNEL as per IEEE1394a 8.3.2.3.11 and 8.4.2.3.  This
  * seems like an optional service but in the end it is practically mandatory
  * as a consequence of these clauses.
@@ -1535,11 +1443,12 @@ static void nodemgr_irm_write_bc(struct node_entry *ne, int generation)
 }
 
 
-static void nodemgr_probe_ne(struct host_info *hi, struct node_entry *ne, int generation)
+static void nodemgr_probe_ne(struct hpsb_host *host, struct node_entry *ne,
+                             int generation)
 {
         struct device *dev;
 
-        if (ne->host != hi->host || ne->in_limbo)
+        if (ne->host != host || ne->in_limbo)
                 return;
 
         dev = get_device(&ne->device);
@@ -1554,40 +1463,40 @@ static void nodemgr_probe_ne(struct host_info *hi, struct node_entry *ne, int ge
          * down to the drivers. Otherwise, this is a dead node and we
          * suspend it. */
         if (ne->needs_probe)
-                nodemgr_process_root_directory(hi, ne);
+                nodemgr_process_root_directory(ne);
         else if (ne->generation == generation)
                 nodemgr_update_pdrv(ne);
         else
-                nodemgr_suspend_ne(ne);
+                nodemgr_pause_ne(ne);
 
         put_device(dev);
 }
 
-struct probe_param {
-        struct host_info *hi;
+struct node_probe_parameter {
+        struct hpsb_host *host;
         int generation;
         bool probe_now;
 };
 
 static int node_probe(struct device *dev, void *data)
 {
-        struct probe_param *p = data;
+        struct node_probe_parameter *p = data;
         struct node_entry *ne;
 
-        if (p->generation != get_hpsb_generation(p->hi->host))
+        if (p->generation != get_hpsb_generation(p->host))
                 return -EAGAIN;
 
         ne = container_of(dev, struct node_entry, node_dev);
         if (ne->needs_probe == p->probe_now)
-                nodemgr_probe_ne(p->hi, ne, p->generation);
+                nodemgr_probe_ne(p->host, ne, p->generation);
         return 0;
 }
 
-static void nodemgr_node_probe(struct host_info *hi, int generation)
+static int nodemgr_node_probe(struct hpsb_host *host, int generation)
 {
-        struct probe_param p;
+        struct node_probe_parameter p;
 
-        p.hi = hi;
+        p.host = host;
         p.generation = generation;
         /*
          * Do some processing of the nodes we've probed. This pulls them
@@ -1604,11 +1513,11 @@ static void nodemgr_node_probe(struct host_info *hi, int generation)
          */
         p.probe_now = false;
         if (class_for_each_device(&nodemgr_ne_class, NULL, &p, node_probe) != 0)
-                return;
+                return 0;
 
         p.probe_now = true;
         if (class_for_each_device(&nodemgr_ne_class, NULL, &p, node_probe) != 0)
-                return;
+                return 0;
         /*
          * Now let's tell the bus to rescan our devices. This may seem
          * like overhead, but the driver-model core will only scan a
@@ -1620,6 +1529,27 @@ static void nodemgr_node_probe(struct host_info *hi, int generation)
          */
         if (bus_rescan_devices(&ieee1394_bus_type) != 0)
                 HPSB_DEBUG("bus_rescan_devices had an error");
+
+        return 1;
+}
+
+static int remove_nodes_in_limbo(struct device *dev, void *data)
+{
+        struct node_entry *ne;
+
+        if (dev->bus != &ieee1394_bus_type)
+                return 0;
+
+        ne = container_of(dev, struct node_entry, device);
+        if (ne->in_limbo)
+                nodemgr_remove_ne(ne);
+
+        return 0;
+}
+
+static void nodemgr_remove_nodes_in_limbo(struct hpsb_host *host)
+{
+        device_for_each_child(&host->device, NULL, remove_nodes_in_limbo);
 }
 
 static int nodemgr_send_resume_packet(struct hpsb_host *host)
@@ -1730,10 +1660,9 @@ static int nodemgr_check_irm_capability(struct hpsb_host *host, int cycles)
         return 1;
 }
 
-static int nodemgr_host_thread(void *__hi)
+static int nodemgr_host_thread(void *data)
 {
-        struct host_info *hi = (struct host_info *)__hi;
-        struct hpsb_host *host = hi->host;
+        struct hpsb_host *host = data;
         unsigned int g, generation = 0;
         int i, reset_cycles = 0;
 
@@ -1787,36 +1716,48 @@ static int nodemgr_host_thread(void *__hi)
                  * entries. This does not do the sysfs stuff, since that
                  * would trigger uevents and such, which is a bad idea at
                  * this point. */
-                nodemgr_node_scan(hi, generation);
+                nodemgr_node_scan(host, generation);
 
                 /* This actually does the full probe, with sysfs
                  * registration. */
-                nodemgr_node_probe(hi, generation);
+                if (!nodemgr_node_probe(host, generation))
+                        continue;
 
                 /* Update some of our sysfs symlinks */
                 nodemgr_update_host_dev_links(host);
+
+                /* Sleep 3 seconds */
+                for (i = 3000/200; i; i--) {
+                        msleep_interruptible(200);
+                        if (kthread_should_stop())
+                                goto exit;
+
+                        if (generation != get_hpsb_generation(host))
+                                break;
+                }
+                /* Remove nodes which are gone, unless a bus reset happened */
+                if (!i)
+                        nodemgr_remove_nodes_in_limbo(host);
         }
 exit:
         HPSB_VERBOSE("NodeMgr: Exiting thread");
         return 0;
 }
 
-struct host_iter_param {
+struct per_host_parameter {
         void *data;
         int (*cb)(struct hpsb_host *, void *);
 };
 
-static int __nodemgr_for_each_host(struct device *dev, void *data)
+static int per_host(struct device *dev, void *data)
 {
         struct hpsb_host *host;
-        struct host_iter_param *hip = (struct host_iter_param *)data;
-        int error = 0;
+        struct per_host_parameter *p = data;
 
         host = container_of(dev, struct hpsb_host, host_dev);
-        error = hip->cb(host, hip->data);
-
-        return error;
+        return p->cb(host, p->data);
 }
+
 /**
  * nodemgr_for_each_host - call a function for each IEEE 1394 host
  * @data: an address to supply to the callback
@@ -1831,15 +1772,11 @@ static int __nodemgr_for_each_host(struct device *dev, void *data)
  */
 int nodemgr_for_each_host(void *data, int (*cb)(struct hpsb_host *, void *))
 {
-        struct host_iter_param hip;
-        int error;
-
-        hip.cb = cb;
-        hip.data = data;
-        error = class_for_each_device(&hpsb_host_class, NULL, &hip,
-                                      __nodemgr_for_each_host);
+        struct per_host_parameter p;
 
-        return error;
+        p.cb = cb;
+        p.data = data;
+        return class_for_each_device(&hpsb_host_class, NULL, &p, per_host);
 }
 
 /* The following two convenience functions use a struct node_entry
@@ -1893,7 +1830,7 @@ static void nodemgr_add_host(struct hpsb_host *host)
                 return;
         }
         hi->host = host;
-        hi->thread = kthread_run(nodemgr_host_thread, hi, "knodemgrd_%d",
+        hi->thread = kthread_run(nodemgr_host_thread, host, "knodemgrd_%d",
                                  host->id);
         if (IS_ERR(hi->thread)) {
                 HPSB_ERR("NodeMgr: cannot start thread for host %d", host->id);
diff --git a/drivers/ieee1394/nodemgr.h b/drivers/ieee1394/nodemgr.h
index 6eb26465a84c..4f287a3561ba 100644
--- a/drivers/ieee1394/nodemgr.h
+++ b/drivers/ieee1394/nodemgr.h
@@ -110,7 +110,7 @@ struct node_entry {
         struct device node_dev;
 
         /* Means this node is not attached anymore */
-        int in_limbo;
+        bool in_limbo;
 
         struct csr1212_csr *csr;
 };
diff --git a/drivers/ieee1394/raw1394-private.h b/drivers/ieee1394/raw1394-private.h
index a06aaad5b448..7a225a405987 100644
--- a/drivers/ieee1394/raw1394-private.h
+++ b/drivers/ieee1394/raw1394-private.h
@@ -22,6 +22,7 @@ enum raw1394_iso_state { RAW1394_ISO_INACTIVE = 0,
 struct file_info {
         struct list_head list;
 
+        struct mutex state_mutex;
         enum { opened, initialized, connected } state;
         unsigned int protocol_version;
 
diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c
index 6fa9e4a21840..9f19ac492106 100644
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
@@ -34,6 +34,7 @@
 #include <linux/fs.h>
 #include <linux/poll.h>
 #include <linux/module.h>
+#include <linux/mutex.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/vmalloc.h>
@@ -2267,6 +2268,8 @@ static ssize_t raw1394_write(struct file *file, const char __user * buffer,
                 return -EFAULT;
         }
 
+        mutex_lock(&fi->state_mutex);
+
         switch (fi->state) {
         case opened:
                 retval = state_opened(fi, req);
@@ -2281,6 +2284,8 @@ static ssize_t raw1394_write(struct file *file, const char __user * buffer,
                 break;
         }
 
+        mutex_unlock(&fi->state_mutex);
+
         if (retval < 0) {
                 free_pending_request(req);
         } else {
@@ -2541,109 +2546,120 @@ static int raw1394_read_cycle_timer(struct file_info *fi, void __user * uaddr)
 static int raw1394_mmap(struct file *file, struct vm_area_struct *vma)
 {
         struct file_info *fi = file->private_data;
+        int ret;
+
+        mutex_lock(&fi->state_mutex);
 
         if (fi->iso_state == RAW1394_ISO_INACTIVE)
-                return -EINVAL;
+                ret = -EINVAL;
+        else
+                ret = dma_region_mmap(&fi->iso_handle->data_buf, file, vma);
+
+        mutex_unlock(&fi->state_mutex);
 
-        return dma_region_mmap(&fi->iso_handle->data_buf, file, vma);
+        return ret;
 }
 
-/* ioctl is only used for rawiso operations */
-static long do_raw1394_ioctl(struct file *file, unsigned int cmd,
-                                                        unsigned long arg)
+static long raw1394_ioctl_inactive(struct file_info *fi, unsigned int cmd,
+                                   void __user *argp)
+{
+        switch (cmd) {
+        case RAW1394_IOC_ISO_XMIT_INIT:
+                return raw1394_iso_xmit_init(fi, argp);
+        case RAW1394_IOC_ISO_RECV_INIT:
+                return raw1394_iso_recv_init(fi, argp);
+        default:
+                return -EINVAL;
+        }
+}
+
+static long raw1394_ioctl_recv(struct file_info *fi, unsigned int cmd,
+                               unsigned long arg)
 {
-        struct file_info *fi = file->private_data;
         void __user *argp = (void __user *)arg;
 
-        switch (fi->iso_state) {
-        case RAW1394_ISO_INACTIVE:
-                switch (cmd) {
-                case RAW1394_IOC_ISO_XMIT_INIT:
-                        return raw1394_iso_xmit_init(fi, argp);
-                case RAW1394_IOC_ISO_RECV_INIT:
-                        return raw1394_iso_recv_init(fi, argp);
-                default:
-                        break;
+        switch (cmd) {
+        case RAW1394_IOC_ISO_RECV_START:{
+                        int args[3];
+
+                        if (copy_from_user(&args[0], argp, sizeof(args)))
+                                return -EFAULT;
+                        return hpsb_iso_recv_start(fi->iso_handle,
+                                                   args[0], args[1], args[2]);
                 }
-                break;
-        case RAW1394_ISO_RECV:
-                switch (cmd) {
-                case RAW1394_IOC_ISO_RECV_START:{
-                                /* copy args from user-space */
-                                int args[3];
-                                if (copy_from_user
-                                    (&args[0], argp, sizeof(args)))
-                                        return -EFAULT;
-                                return hpsb_iso_recv_start(fi->iso_handle,
-                                                           args[0], args[1],
-                                                           args[2]);
-                        }
-                case RAW1394_IOC_ISO_XMIT_RECV_STOP:
-                        hpsb_iso_stop(fi->iso_handle);
-                        return 0;
-                case RAW1394_IOC_ISO_RECV_LISTEN_CHANNEL:
-                        return hpsb_iso_recv_listen_channel(fi->iso_handle,
-                                                            arg);
-                case RAW1394_IOC_ISO_RECV_UNLISTEN_CHANNEL:
-                        return hpsb_iso_recv_unlisten_channel(fi->iso_handle,
-                                                              arg);
-                case RAW1394_IOC_ISO_RECV_SET_CHANNEL_MASK:{
-                                /* copy the u64 from user-space */
-                                u64 mask;
-                                if (copy_from_user(&mask, argp, sizeof(mask)))
-                                        return -EFAULT;
-                                return hpsb_iso_recv_set_channel_mask(fi->
-                                                                      iso_handle,
-                                                                      mask);
-                        }
-                case RAW1394_IOC_ISO_GET_STATUS:
-                        return raw1394_iso_get_status(fi, argp);
-                case RAW1394_IOC_ISO_RECV_PACKETS:
-                        return raw1394_iso_recv_packets(fi, argp);
-                case RAW1394_IOC_ISO_RECV_RELEASE_PACKETS:
-                        return hpsb_iso_recv_release_packets(fi->iso_handle,
-                                                             arg);
-                case RAW1394_IOC_ISO_RECV_FLUSH:
-                        return hpsb_iso_recv_flush(fi->iso_handle);
-                case RAW1394_IOC_ISO_SHUTDOWN:
-                        raw1394_iso_shutdown(fi);
-                        return 0;
-                case RAW1394_IOC_ISO_QUEUE_ACTIVITY:
-                        queue_rawiso_event(fi);
-                        return 0;
+        case RAW1394_IOC_ISO_XMIT_RECV_STOP:
+                hpsb_iso_stop(fi->iso_handle);
+                return 0;
+        case RAW1394_IOC_ISO_RECV_LISTEN_CHANNEL:
+                return hpsb_iso_recv_listen_channel(fi->iso_handle, arg);
+        case RAW1394_IOC_ISO_RECV_UNLISTEN_CHANNEL:
+                return hpsb_iso_recv_unlisten_channel(fi->iso_handle, arg);
+        case RAW1394_IOC_ISO_RECV_SET_CHANNEL_MASK:{
+                        u64 mask;
+
+                        if (copy_from_user(&mask, argp, sizeof(mask)))
+                                return -EFAULT;
+                        return hpsb_iso_recv_set_channel_mask(fi->iso_handle,
+                                                              mask);
                 }
-                break;
-        case RAW1394_ISO_XMIT:
-                switch (cmd) {
-                case RAW1394_IOC_ISO_XMIT_START:{
-                                /* copy two ints from user-space */
-                                int args[2];
-                                if (copy_from_user
-                                    (&args[0], argp, sizeof(args)))
-                                        return -EFAULT;
-                                return hpsb_iso_xmit_start(fi->iso_handle,
-                                                           args[0], args[1]);
-                        }
-                case RAW1394_IOC_ISO_XMIT_SYNC:
-                        return hpsb_iso_xmit_sync(fi->iso_handle);
-                case RAW1394_IOC_ISO_XMIT_RECV_STOP:
-                        hpsb_iso_stop(fi->iso_handle);
-                        return 0;
-                case RAW1394_IOC_ISO_GET_STATUS:
-                        return raw1394_iso_get_status(fi, argp);
-                case RAW1394_IOC_ISO_XMIT_PACKETS:
-                        return raw1394_iso_send_packets(fi, argp);
-                case RAW1394_IOC_ISO_SHUTDOWN:
-                        raw1394_iso_shutdown(fi);
-                        return 0;
-                case RAW1394_IOC_ISO_QUEUE_ACTIVITY:
-                        queue_rawiso_event(fi);
-                        return 0;
+        case RAW1394_IOC_ISO_GET_STATUS:
+                return raw1394_iso_get_status(fi, argp);
+        case RAW1394_IOC_ISO_RECV_PACKETS:
+                return raw1394_iso_recv_packets(fi, argp);
+        case RAW1394_IOC_ISO_RECV_RELEASE_PACKETS:
+                return hpsb_iso_recv_release_packets(fi->iso_handle, arg);
+        case RAW1394_IOC_ISO_RECV_FLUSH:
+                return hpsb_iso_recv_flush(fi->iso_handle);
+        case RAW1394_IOC_ISO_SHUTDOWN:
+                raw1394_iso_shutdown(fi);
+                return 0;
+        case RAW1394_IOC_ISO_QUEUE_ACTIVITY:
+                queue_rawiso_event(fi);
+                return 0;
+        default:
+                return -EINVAL;
+        }
+}
+
+static long raw1394_ioctl_xmit(struct file_info *fi, unsigned int cmd,
+                               void __user *argp)
+{
+        switch (cmd) {
+        case RAW1394_IOC_ISO_XMIT_START:{
+                        int args[2];
+
+                        if (copy_from_user(&args[0], argp, sizeof(args)))
+                                return -EFAULT;
+                        return hpsb_iso_xmit_start(fi->iso_handle,
+                                                   args[0], args[1]);
                 }
-                break;
+        case RAW1394_IOC_ISO_XMIT_SYNC:
+                return hpsb_iso_xmit_sync(fi->iso_handle);
+        case RAW1394_IOC_ISO_XMIT_RECV_STOP:
+                hpsb_iso_stop(fi->iso_handle);
+                return 0;
+        case RAW1394_IOC_ISO_GET_STATUS:
+                return raw1394_iso_get_status(fi, argp);
+        case RAW1394_IOC_ISO_XMIT_PACKETS:
+                return raw1394_iso_send_packets(fi, argp);
+        case RAW1394_IOC_ISO_SHUTDOWN:
+                raw1394_iso_shutdown(fi);
+                return 0;
+        case RAW1394_IOC_ISO_QUEUE_ACTIVITY:
+                queue_rawiso_event(fi);
+                return 0;
         default:
-                break;
+                return -EINVAL;
         }
+}
+
+/* ioctl is only used for rawiso operations */
+static long raw1394_ioctl(struct file *file, unsigned int cmd,
+                          unsigned long arg)
+{
+        struct file_info *fi = file->private_data;
+        void __user *argp = (void __user *)arg;
+        long ret;
 
         /* state-independent commands */
         switch(cmd) {
@@ -2653,16 +2669,25 @@ static long do_raw1394_ioctl(struct file *file, unsigned int cmd,
                 break;
         }
 
-        return -EINVAL;
-}
+        mutex_lock(&fi->state_mutex);
+
+        switch (fi->iso_state) {
+        case RAW1394_ISO_INACTIVE:
+                ret = raw1394_ioctl_inactive(fi, cmd, argp);
+                break;
+        case RAW1394_ISO_RECV:
+                ret = raw1394_ioctl_recv(fi, cmd, arg);
+                break;
+        case RAW1394_ISO_XMIT:
+                ret = raw1394_ioctl_xmit(fi, cmd, argp);
+                break;
+        default:
+                ret = -EINVAL;
+                break;
+        }
+
+        mutex_unlock(&fi->state_mutex);
 
-static long raw1394_ioctl(struct file *file, unsigned int cmd,
-                                                        unsigned long arg)
-{
-        long ret;
-        lock_kernel();
-        ret = do_raw1394_ioctl(file, cmd, arg);
-        unlock_kernel();
         return ret;
 }
 
@@ -2700,7 +2725,7 @@ static long raw1394_iso_xmit_recv_packets32(struct file *file, unsigned int cmd,
             !copy_from_user(&infos32, &arg->infos, sizeof infos32)) {
                 infos = compat_ptr(infos32);
                 if (!copy_to_user(&dst->infos, &infos, sizeof infos))
-                        err = do_raw1394_ioctl(file, cmd, (unsigned long)dst);
+                        err = raw1394_ioctl(file, cmd, (unsigned long)dst);
         }
         return err;
 }
@@ -2724,7 +2749,6 @@ static long raw1394_compat_ioctl(struct file *file,
         void __user *argp = (void __user *)arg;
         long err;
 
-        lock_kernel();
         switch (cmd) {
         /* These requests have same format as long as 'int' has same size. */
         case RAW1394_IOC_ISO_RECV_INIT:
@@ -2741,7 +2765,7 @@ static long raw1394_compat_ioctl(struct file *file,
         case RAW1394_IOC_ISO_GET_STATUS:
         case RAW1394_IOC_ISO_SHUTDOWN:
         case RAW1394_IOC_ISO_QUEUE_ACTIVITY:
-                err = do_raw1394_ioctl(file, cmd, arg);
+                err = raw1394_ioctl(file, cmd, arg);
                 break;
         /* These request have different format. */
         case RAW1394_IOC_ISO_RECV_PACKETS32:
@@ -2757,7 +2781,6 @@ static long raw1394_compat_ioctl(struct file *file,
                 err = -EINVAL;
                 break;
         }
-        unlock_kernel();
 
         return err;
 }
@@ -2791,6 +2814,7 @@ static int raw1394_open(struct inode *inode, struct file *file)
         fi->notification = (u8) RAW1394_NOTIFY_ON;      /* busreset notification */
 
         INIT_LIST_HEAD(&fi->list);
+        mutex_init(&fi->state_mutex);
         fi->state = opened;
         INIT_LIST_HEAD(&fi->req_pending);
         INIT_LIST_HEAD(&fi->req_complete);
@@ -3010,10 +3034,10 @@ static int __init init_raw1394(void)
         hpsb_register_highlevel(&raw1394_highlevel);
 
         if (IS_ERR
-            (device_create_drvdata(
-              hpsb_protocol_class, NULL,
-              MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16),
-              NULL, RAW1394_DEVICE_NAME))) {
+            (device_create(hpsb_protocol_class, NULL,
+                           MKDEV(IEEE1394_MAJOR,
+                                 IEEE1394_MINOR_BLOCK_RAW1394 * 16),
+                           NULL, RAW1394_DEVICE_NAME))) {
                 ret = -EFAULT;
                 goto out_unreg;
         }
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index 1d6ad3435537..c52f6e6e8af2 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -526,26 +526,41 @@ static void sbp2util_write_doorbell(struct work_struct *work)
 
 static int sbp2util_create_command_orb_pool(struct sbp2_lu *lu)
 {
-        struct sbp2_fwhost_info *hi = lu->hi;
         struct sbp2_command_info *cmd;
+        struct device *dmadev = lu->hi->host->device.parent;
         int i, orbs = sbp2_serialize_io ? 2 : SBP2_MAX_CMDS;
 
         for (i = 0; i < orbs; i++) {
                 cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
                 if (!cmd)
-                        return -ENOMEM;
-                cmd->command_orb_dma = dma_map_single(hi->host->device.parent,
-                                                &cmd->command_orb,
-                                                sizeof(struct sbp2_command_orb),
-                                                DMA_TO_DEVICE);
-                cmd->sge_dma = dma_map_single(hi->host->device.parent,
-                                        &cmd->scatter_gather_element,
-                                        sizeof(cmd->scatter_gather_element),
-                                        DMA_TO_DEVICE);
+                        goto failed_alloc;
+
+                cmd->command_orb_dma =
+                    dma_map_single(dmadev, &cmd->command_orb,
+                                   sizeof(struct sbp2_command_orb),
+                                   DMA_TO_DEVICE);
+                if (dma_mapping_error(dmadev, cmd->command_orb_dma))
+                        goto failed_orb;
+
+                cmd->sge_dma =
+                    dma_map_single(dmadev, &cmd->scatter_gather_element,
+                                   sizeof(cmd->scatter_gather_element),
+                                   DMA_TO_DEVICE);
+                if (dma_mapping_error(dmadev, cmd->sge_dma))
+                        goto failed_sge;
+
                 INIT_LIST_HEAD(&cmd->list);
                 list_add_tail(&cmd->list, &lu->cmd_orb_completed);
         }
         return 0;
+
+failed_sge:
+        dma_unmap_single(dmadev, cmd->command_orb_dma,
+                         sizeof(struct sbp2_command_orb), DMA_TO_DEVICE);
+failed_orb:
+        kfree(cmd);
+failed_alloc:
+        return -ENOMEM;
 }
 
 static void sbp2util_remove_command_orb_pool(struct sbp2_lu *lu,
@@ -641,24 +656,11 @@ static struct sbp2_command_info *sbp2util_allocate_command_orb(
 static void sbp2util_mark_command_completed(struct sbp2_lu *lu,
                                             struct sbp2_command_info *cmd)
 {
-        struct hpsb_host *host = lu->ud->ne->host;
-
-        if (cmd->cmd_dma) {
-                if (cmd->dma_type == CMD_DMA_SINGLE)
-                        dma_unmap_single(host->device.parent, cmd->cmd_dma,
-                                         cmd->dma_size, cmd->dma_dir);
-                else if (cmd->dma_type == CMD_DMA_PAGE)
-                        dma_unmap_page(host->device.parent, cmd->cmd_dma,
-                                       cmd->dma_size, cmd->dma_dir);
-                /* XXX: Check for CMD_DMA_NONE bug */
-                cmd->dma_type = CMD_DMA_NONE;
-                cmd->cmd_dma = 0;
-        }
-        if (cmd->sge_buffer) {
-                dma_unmap_sg(host->device.parent, cmd->sge_buffer,
-                             cmd->dma_size, cmd->dma_dir);
-                cmd->sge_buffer = NULL;
-        }
+        if (scsi_sg_count(cmd->Current_SCpnt))
+                dma_unmap_sg(lu->ud->ne->host->device.parent,
+                             scsi_sglist(cmd->Current_SCpnt),
+                             scsi_sg_count(cmd->Current_SCpnt),
+                             cmd->Current_SCpnt->sc_data_direction);
         list_move_tail(&cmd->list, &lu->cmd_orb_completed);
 }
 
@@ -823,6 +825,10 @@ static struct sbp2_lu *sbp2_alloc_device(struct unit_directory *ud)
 #endif
         }
 
+        if (dma_get_max_seg_size(hi->host->device.parent) > SBP2_MAX_SEG_SIZE)
+                BUG_ON(dma_set_max_seg_size(hi->host->device.parent,
+                                            SBP2_MAX_SEG_SIZE));
+
         /* Prevent unloading of the 1394 host */
         if (!try_module_get(hi->host->driver->owner)) {
                 SBP2_ERR("failed to get a reference on 1394 host driver");
@@ -1494,84 +1500,65 @@ static int sbp2_agent_reset(struct sbp2_lu *lu, int wait)
         return 0;
 }
 
-static void sbp2_prep_command_orb_sg(struct sbp2_command_orb *orb,
-                                     struct sbp2_fwhost_info *hi,
-                                     struct sbp2_command_info *cmd,
-                                     unsigned int scsi_use_sg,
-                                     struct scatterlist *sg,
-                                     u32 orb_direction,
-                                     enum dma_data_direction dma_dir)
+static int sbp2_prep_command_orb_sg(struct sbp2_command_orb *orb,
+                                    struct sbp2_fwhost_info *hi,
+                                    struct sbp2_command_info *cmd,
+                                    unsigned int sg_count,
+                                    struct scatterlist *sg,
+                                    u32 orb_direction,
+                                    enum dma_data_direction dma_dir)
 {
-        cmd->dma_dir = dma_dir;
+        struct device *dmadev = hi->host->device.parent;
+        struct sbp2_unrestricted_page_table *pt;
+        int i, n;
+
+        n = dma_map_sg(dmadev, sg, sg_count, dma_dir);
+        if (n == 0)
+                return -ENOMEM;
+
         orb->data_descriptor_hi = ORB_SET_NODE_ID(hi->host->node_id);
         orb->misc |= ORB_SET_DIRECTION(orb_direction);
 
         /* special case if only one element (and less than 64KB in size) */
-        if (scsi_use_sg == 1 && sg->length <= SBP2_MAX_SG_ELEMENT_LENGTH) {
-
-                cmd->dma_size = sg->length;
-                cmd->dma_type = CMD_DMA_PAGE;
-                cmd->cmd_dma = dma_map_page(hi->host->device.parent,
-                                            sg_page(sg), sg->offset,
-                                            cmd->dma_size, cmd->dma_dir);
-
-                orb->data_descriptor_lo = cmd->cmd_dma;
-                orb->misc |= ORB_SET_DATA_SIZE(cmd->dma_size);
-
+        if (n == 1) {
+                orb->misc |= ORB_SET_DATA_SIZE(sg_dma_len(sg));
+                orb->data_descriptor_lo = sg_dma_address(sg);
         } else {
-                struct sbp2_unrestricted_page_table *sg_element =
-                                                &cmd->scatter_gather_element[0];
-                u32 sg_count, sg_len;
-                dma_addr_t sg_addr;
-                int i, count = dma_map_sg(hi->host->device.parent, sg,
-                                          scsi_use_sg, dma_dir);
-
-                cmd->dma_size = scsi_use_sg;
-                cmd->sge_buffer = sg;
-
-                /* use page tables (s/g) */
-                orb->misc |= ORB_SET_PAGE_TABLE_PRESENT(0x1);
-                orb->data_descriptor_lo = cmd->sge_dma;
+                pt = &cmd->scatter_gather_element[0];
 
-                /* loop through and fill out our SBP-2 page tables
-                 * (and split up anything too large) */
-                for (i = 0, sg_count = 0; i < count; i++, sg = sg_next(sg)) {
-                        sg_len = sg_dma_len(sg);
-                        sg_addr = sg_dma_address(sg);
-                        while (sg_len) {
-                                sg_element[sg_count].segment_base_lo = sg_addr;
-                                if (sg_len > SBP2_MAX_SG_ELEMENT_LENGTH) {
-                                        sg_element[sg_count].length_segment_base_hi =
-                                                PAGE_TABLE_SET_SEGMENT_LENGTH(SBP2_MAX_SG_ELEMENT_LENGTH);
-                                        sg_addr += SBP2_MAX_SG_ELEMENT_LENGTH;
-                                        sg_len -= SBP2_MAX_SG_ELEMENT_LENGTH;
-                                } else {
-                                        sg_element[sg_count].length_segment_base_hi =
-                                                PAGE_TABLE_SET_SEGMENT_LENGTH(sg_len);
-                                        sg_len = 0;
-                                }
-                                sg_count++;
-                        }
+                dma_sync_single_for_cpu(dmadev, cmd->sge_dma,
+                                        sizeof(cmd->scatter_gather_element),
+                                        DMA_TO_DEVICE);
+
+                for_each_sg(sg, sg, n, i) {
+                        pt[i].high = cpu_to_be32(sg_dma_len(sg) << 16);
+                        pt[i].low = cpu_to_be32(sg_dma_address(sg));
                 }
 
-                orb->misc |= ORB_SET_DATA_SIZE(sg_count);
+                orb->misc |= ORB_SET_PAGE_TABLE_PRESENT(0x1) |
+                             ORB_SET_DATA_SIZE(n);
+                orb->data_descriptor_lo = cmd->sge_dma;
 
-                sbp2util_cpu_to_be32_buffer(sg_element,
-                                (sizeof(struct sbp2_unrestricted_page_table)) *
-                                sg_count);
+                dma_sync_single_for_device(dmadev, cmd->sge_dma,
+                                           sizeof(cmd->scatter_gather_element),
+                                           DMA_TO_DEVICE);
         }
+        return 0;
 }
 
-static void sbp2_create_command_orb(struct sbp2_lu *lu,
-                                    struct sbp2_command_info *cmd,
-                                    struct scsi_cmnd *SCpnt)
+static int sbp2_create_command_orb(struct sbp2_lu *lu,
+                                   struct sbp2_command_info *cmd,
+                                   struct scsi_cmnd *SCpnt)
 {
-        struct sbp2_fwhost_info *hi = lu->hi;
+        struct device *dmadev = lu->hi->host->device.parent;
         struct sbp2_command_orb *orb = &cmd->command_orb;
-        u32 orb_direction;
         unsigned int scsi_request_bufflen = scsi_bufflen(SCpnt);
         enum dma_data_direction dma_dir = SCpnt->sc_data_direction;
+        u32 orb_direction;
+        int ret;
 
+        dma_sync_single_for_cpu(dmadev, cmd->command_orb_dma,
+                                sizeof(struct sbp2_command_orb), DMA_TO_DEVICE);
         /*
          * Set-up our command ORB.
          *
@@ -1602,15 +1589,21 @@ static void sbp2_create_command_orb(struct sbp2_lu *lu,
                 orb->data_descriptor_hi = 0x0;
                 orb->data_descriptor_lo = 0x0;
                 orb->misc |= ORB_SET_DIRECTION(1);
-        } else
-                sbp2_prep_command_orb_sg(orb, hi, cmd, scsi_sg_count(SCpnt),
-                                         scsi_sglist(SCpnt),
-                                         orb_direction, dma_dir);
-
+                ret = 0;
+        } else {
+                ret = sbp2_prep_command_orb_sg(orb, lu->hi, cmd,
+                                               scsi_sg_count(SCpnt),
+                                               scsi_sglist(SCpnt),
+                                               orb_direction, dma_dir);
+        }
         sbp2util_cpu_to_be32_buffer(orb, sizeof(*orb));
 
         memset(orb->cdb, 0, sizeof(orb->cdb));
         memcpy(orb->cdb, SCpnt->cmnd, SCpnt->cmd_len);
+
+        dma_sync_single_for_device(dmadev, cmd->command_orb_dma,
+                        sizeof(struct sbp2_command_orb), DMA_TO_DEVICE);
+        return ret;
 }
 
 static void sbp2_link_orb_command(struct sbp2_lu *lu,
@@ -1624,14 +1617,6 @@ static void sbp2_link_orb_command(struct sbp2_lu *lu,
         size_t length;
         unsigned long flags;
 
-        dma_sync_single_for_device(hi->host->device.parent,
-                                   cmd->command_orb_dma,
-                                   sizeof(struct sbp2_command_orb),
-                                   DMA_TO_DEVICE);
-        dma_sync_single_for_device(hi->host->device.parent, cmd->sge_dma,
-                                   sizeof(cmd->scatter_gather_element),
-                                   DMA_TO_DEVICE);
-
         /* check to see if there are any previous orbs to use */
         spin_lock_irqsave(&lu->cmd_orb_lock, flags);
         last_orb = lu->last_orb;
@@ -1699,9 +1684,10 @@ static int sbp2_send_command(struct sbp2_lu *lu, struct scsi_cmnd *SCpnt,
         if (!cmd)
                 return -EIO;
 
-        sbp2_create_command_orb(lu, cmd, SCpnt);
-        sbp2_link_orb_command(lu, cmd);
+        if (sbp2_create_command_orb(lu, cmd, SCpnt))
+                return -ENOMEM;
 
+        sbp2_link_orb_command(lu, cmd);
         return 0;
 }
 
@@ -1789,13 +1775,6 @@ static int sbp2_handle_status_write(struct hpsb_host *host, int nodeid,
         else
                 cmd = sbp2util_find_command_for_orb(lu, sb->ORB_offset_lo);
         if (cmd) {
-                dma_sync_single_for_cpu(hi->host->device.parent,
-                                        cmd->command_orb_dma,
-                                        sizeof(struct sbp2_command_orb),
-                                        DMA_TO_DEVICE);
-                dma_sync_single_for_cpu(hi->host->device.parent, cmd->sge_dma,
-                                        sizeof(cmd->scatter_gather_element),
-                                        DMA_TO_DEVICE);
                 /* Grab SCSI command pointers and check status. */
                 /*
                  * FIXME: If the src field in the status is 1, the ORB DMA must
@@ -1912,7 +1891,6 @@ done:
 
 static void sbp2scsi_complete_all_commands(struct sbp2_lu *lu, u32 status)
 {
-        struct sbp2_fwhost_info *hi = lu->hi;
         struct list_head *lh;
         struct sbp2_command_info *cmd;
         unsigned long flags;
@@ -1921,13 +1899,6 @@ static void sbp2scsi_complete_all_commands(struct sbp2_lu *lu, u32 status)
         while (!list_empty(&lu->cmd_orb_inuse)) {
                 lh = lu->cmd_orb_inuse.next;
                 cmd = list_entry(lh, struct sbp2_command_info, list);
-                dma_sync_single_for_cpu(hi->host->device.parent,
-                                        cmd->command_orb_dma,
-                                        sizeof(struct sbp2_command_orb),
-                                        DMA_TO_DEVICE);
-                dma_sync_single_for_cpu(hi->host->device.parent, cmd->sge_dma,
-                                        sizeof(cmd->scatter_gather_element),
-                                        DMA_TO_DEVICE);
                 sbp2util_mark_command_completed(lu, cmd);
                 if (cmd->Current_SCpnt) {
                         cmd->Current_SCpnt->result = status << 16;
@@ -2033,6 +2004,8 @@ static int sbp2scsi_slave_configure(struct scsi_device *sdev)
                 sdev->start_stop_pwr_cond = 1;
         if (lu->workarounds & SBP2_WORKAROUND_128K_MAX_TRANS)
                 blk_queue_max_sectors(sdev->request_queue, 128 * 1024 / 512);
+
+        blk_queue_max_segment_size(sdev->request_queue, SBP2_MAX_SEG_SIZE);
         return 0;
 }
 
@@ -2049,7 +2022,6 @@ static void sbp2scsi_slave_destroy(struct scsi_device *sdev)
 static int sbp2scsi_abort(struct scsi_cmnd *SCpnt)
 {
         struct sbp2_lu *lu = (struct sbp2_lu *)SCpnt->device->host->hostdata[0];
-        struct sbp2_fwhost_info *hi = lu->hi;
         struct sbp2_command_info *cmd;
         unsigned long flags;
 
@@ -2063,14 +2035,6 @@ static int sbp2scsi_abort(struct scsi_cmnd *SCpnt)
                 spin_lock_irqsave(&lu->cmd_orb_lock, flags);
                 cmd = sbp2util_find_command_for_SCpnt(lu, SCpnt);
                 if (cmd) {
-                        dma_sync_single_for_cpu(hi->host->device.parent,
-                                        cmd->command_orb_dma,
-                                        sizeof(struct sbp2_command_orb),
-                                        DMA_TO_DEVICE);
-                        dma_sync_single_for_cpu(hi->host->device.parent,
-                                        cmd->sge_dma,
-                                        sizeof(cmd->scatter_gather_element),
-                                        DMA_TO_DEVICE);
                         sbp2util_mark_command_completed(lu, cmd);
                         if (cmd->Current_SCpnt) {
                                 cmd->Current_SCpnt->result = DID_ABORT << 16;
diff --git a/drivers/ieee1394/sbp2.h b/drivers/ieee1394/sbp2.h
index 875428bc8d29..c5036f1cc5b0 100644
--- a/drivers/ieee1394/sbp2.h
+++ b/drivers/ieee1394/sbp2.h
@@ -139,13 +139,10 @@ struct sbp2_logout_orb {
         u32 status_fifo_lo;
 } __attribute__((packed));
 
-#define PAGE_TABLE_SET_SEGMENT_BASE_HI(v)       ((v) & 0xffff)
-#define PAGE_TABLE_SET_SEGMENT_LENGTH(v)        (((v) & 0xffff) << 16)
-
 struct sbp2_unrestricted_page_table {
-        u32 length_segment_base_hi;
-        u32 segment_base_lo;
-} __attribute__((packed));
+        __be32 high;
+        __be32 low;
+};
 
 #define RESP_STATUS_REQUEST_COMPLETE            0x0
 #define RESP_STATUS_TRANSPORT_FAILURE           0x1
@@ -216,15 +213,18 @@ struct sbp2_status_block {
 #define SBP2_UNIT_SPEC_ID_ENTRY                 0x0000609e
 #define SBP2_SW_VERSION_ENTRY                   0x00010483
 
-
 /*
- * SCSI specific definitions
+ * The default maximum s/g segment size of a FireWire controller is
+ * usually 0x10000, but SBP-2 only allows 0xffff. Since buffers have to
+ * be quadlet-aligned, we set the length limit to 0xffff & ~3.
  */
+#define SBP2_MAX_SEG_SIZE                       0xfffc
 
-#define SBP2_MAX_SG_ELEMENT_LENGTH              0xf000
-/* There is no real limitation of the queue depth (i.e. length of the linked
+/*
+ * There is no real limitation of the queue depth (i.e. length of the linked
  * list of command ORBs) at the target. The chosen depth is merely an
- * implementation detail of the sbp2 driver. */
+ * implementation detail of the sbp2 driver.
+ */
 #define SBP2_MAX_CMDS                           8
 
 #define SBP2_SCSI_STATUS_GOOD                   0x0
@@ -240,12 +240,6 @@ struct sbp2_status_block {
  * Representations of commands and devices
  */
 
-enum sbp2_dma_types {
-        CMD_DMA_NONE,
-        CMD_DMA_PAGE,
-        CMD_DMA_SINGLE
-};
-
 /* Per SCSI command */
 struct sbp2_command_info {
         struct list_head list;
@@ -258,11 +252,6 @@ struct sbp2_command_info {
         struct sbp2_unrestricted_page_table
                 scatter_gather_element[SG_ALL] __attribute__((aligned(8)));
         dma_addr_t sge_dma;
-        void *sge_buffer;
-        dma_addr_t cmd_dma;
-        enum sbp2_dma_types dma_type;
-        unsigned long dma_size;
-        enum dma_data_direction dma_dir;
 };
 
 /* Per FireWire host */
diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c
index 25db6e67fa4e..679a918a5cc7 100644
--- a/drivers/ieee1394/video1394.c
+++ b/drivers/ieee1394/video1394.c
@@ -893,7 +893,7 @@ static long video1394_ioctl(struct file *file,
                 if (unlikely(d == NULL))
                         return -EFAULT;
 
-                if (unlikely((v.buffer<0) || (v.buffer>=d->num_desc - 1))) {
+                if (unlikely(v.buffer >= d->num_desc - 1)) {
                         PRINT(KERN_ERR, ohci->host->id,
                               "Buffer %d out of range",v.buffer);
                         return -EINVAL;
@@ -959,7 +959,7 @@ static long video1394_ioctl(struct file *file,
                 if (unlikely(d == NULL))
                         return -EFAULT;
 
-                if (unlikely((v.buffer<0) || (v.buffer>d->num_desc - 1))) {
+                if (unlikely(v.buffer > d->num_desc - 1)) {
                         PRINT(KERN_ERR, ohci->host->id,
                               "Buffer %d out of range",v.buffer);
                         return -EINVAL;
@@ -1030,7 +1030,7 @@ static long video1394_ioctl(struct file *file,
                 d = find_ctx(&ctx->context_list, OHCI_ISO_TRANSMIT, v.channel);
                 if (d == NULL) return -EFAULT;
 
-                if ((v.buffer<0) || (v.buffer>=d->num_desc - 1)) {
+                if (v.buffer >= d->num_desc - 1) {
                         PRINT(KERN_ERR, ohci->host->id,
                               "Buffer %d out of range",v.buffer);
                         return -EINVAL;
@@ -1137,7 +1137,7 @@ static long video1394_ioctl(struct file *file,
                 d = find_ctx(&ctx->context_list, OHCI_ISO_TRANSMIT, v.channel);
                 if (d == NULL) return -EFAULT;
 
-                if ((v.buffer<0) || (v.buffer>=d->num_desc-1)) {
+                if (v.buffer >= d->num_desc - 1) {
                         PRINT(KERN_ERR, ohci->host->id,
                               "Buffer %d out of range",v.buffer);
                         return -EINVAL;
@@ -1341,9 +1341,8 @@ static void video1394_add_host (struct hpsb_host *host)
         hpsb_set_hostinfo_key(&video1394_highlevel, host, ohci->host->id);
 
         minor = IEEE1394_MINOR_BLOCK_VIDEO1394 * 16 + ohci->host->id;
-        device_create_drvdata(hpsb_protocol_class, NULL,
-                              MKDEV(IEEE1394_MAJOR, minor), NULL,
-                              "%s-%d", VIDEO1394_DRIVER_NAME, ohci->host->id);
+        device_create(hpsb_protocol_class, NULL, MKDEV(IEEE1394_MAJOR, minor),
+                      NULL, "%s-%d", VIDEO1394_DRIVER_NAME, ohci->host->id);
 }
 
 
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 3cab0cedfca2..a78d35aecee3 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -3691,9 +3691,9 @@ static void cm_add_one(struct ib_device *ib_device)
         cm_dev->ib_device = ib_device;
         cm_get_ack_delay(cm_dev);
 
-        cm_dev->device = device_create_drvdata(&cm_class, &ib_device->dev,
-                                               MKDEV(0, 0), NULL,
-                                               "%s", ib_device->name);
+        cm_dev->device = device_create(&cm_class, &ib_device->dev,
+                                       MKDEV(0, 0), NULL,
+                                       "%s", ib_device->name);
         if (!cm_dev->device) {
                 kfree(cm_dev);
                 return;
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index 268a2d23b7c9..8c46f2257098 100644
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -1016,9 +1016,9 @@ static int ib_umad_init_port(struct ib_device *device, int port_num,
         if (cdev_add(port->cdev, base_dev + port->dev_num, 1))
                 goto err_cdev;
 
-        port->dev = device_create_drvdata(umad_class, device->dma_device,
-                                          port->cdev->dev, port,
-                                          "umad%d", port->dev_num);
+        port->dev = device_create(umad_class, device->dma_device,
+                                  port->cdev->dev, port,
+                                  "umad%d", port->dev_num);
         if (IS_ERR(port->dev))
                 goto err_cdev;
 
@@ -1036,9 +1036,9 @@ static int ib_umad_init_port(struct ib_device *device, int port_num,
         if (cdev_add(port->sm_cdev, base_dev + port->dev_num + IB_UMAD_MAX_PORTS, 1))
                 goto err_sm_cdev;
 
-        port->sm_dev = device_create_drvdata(umad_class, device->dma_device,
-                                             port->sm_cdev->dev, port,
-                                             "issm%d", port->dev_num);
+        port->sm_dev = device_create(umad_class, device->dma_device,
+                                     port->sm_cdev->dev, port,
+                                     "issm%d", port->dev_num);
         if (IS_ERR(port->sm_dev))
                 goto err_sm_cdev;
 
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index aeee856c4060..d85af1b67027 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -764,12 +764,9 @@ static void ib_uverbs_add_one(struct ib_device *device)
         if (cdev_add(uverbs_dev->cdev, IB_UVERBS_BASE_DEV + uverbs_dev->devnum, 1))
                 goto err_cdev;
 
-        uverbs_dev->dev = device_create_drvdata(uverbs_class,
-                                                device->dma_device,
-                                                uverbs_dev->cdev->dev,
-                                                uverbs_dev,
-                                                "uverbs%d",
-                                                uverbs_dev->devnum);
+        uverbs_dev->dev = device_create(uverbs_class, device->dma_device,
+                                        uverbs_dev->cdev->dev, uverbs_dev,
+                                        "uverbs%d", uverbs_dev->devnum);
         if (IS_ERR(uverbs_dev->dev))
                 goto err_cdev;
 
diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/infiniband/hw/ipath/ipath_file_ops.c
index 56c0eda3c077..1af1f3a907c6 100644
--- a/drivers/infiniband/hw/ipath/ipath_file_ops.c
+++ b/drivers/infiniband/hw/ipath/ipath_file_ops.c
@@ -2455,7 +2455,7 @@ static int init_cdev(int minor, char *name, const struct file_operations *fops,
                 goto err_cdev;
         }
 
-        device = device_create_drvdata(ipath_class, NULL, dev, NULL, name);
+        device = device_create(ipath_class, NULL, dev, NULL, name);
 
         if (IS_ERR(device)) {
                 ret = PTR_ERR(device);
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index ed7c5f72cb8b..5b8b533f2908 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -1683,7 +1683,7 @@ enum {
                                    SRP_OPT_SERVICE_ID),
 };
 
-static match_table_t srp_opt_tokens = {
+static const match_table_t srp_opt_tokens = {
         { SRP_OPT_ID_EXT,               "id_ext=%s"             },
         { SRP_OPT_IOC_GUID,             "ioc_guid=%s"           },
         { SRP_OPT_DGID,                 "dgid=%s"               },
diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
index 078e4eed0894..2880eaae157a 100644
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
@@ -231,6 +231,7 @@ static void gameport_find_driver(struct gameport *gameport)
 enum gameport_event_type {
         GAMEPORT_REGISTER_PORT,
         GAMEPORT_REGISTER_DRIVER,
+        GAMEPORT_ATTACH_DRIVER,
 };
 
 struct gameport_event {
@@ -245,11 +246,12 @@ static LIST_HEAD(gameport_event_list);
 static DECLARE_WAIT_QUEUE_HEAD(gameport_wait);
 static struct task_struct *gameport_task;
 
-static void gameport_queue_event(void *object, struct module *owner,
-                              enum gameport_event_type event_type)
+static int gameport_queue_event(void *object, struct module *owner,
+                                enum gameport_event_type event_type)
 {
         unsigned long flags;
         struct gameport_event *event;
+        int retval = 0;
 
         spin_lock_irqsave(&gameport_event_lock, flags);
 
@@ -268,24 +270,34 @@ static void gameport_queue_event(void *object, struct module *owner,
                 }
         }
 
-        if ((event = kmalloc(sizeof(struct gameport_event), GFP_ATOMIC))) {
-                if (!try_module_get(owner)) {
-                        printk(KERN_WARNING "gameport: Can't get module reference, dropping event %d\n", event_type);
-                        kfree(event);
-                        goto out;
-                }
-
-                event->type = event_type;
-                event->object = object;
-                event->owner = owner;
+        event = kmalloc(sizeof(struct gameport_event), GFP_ATOMIC);
+        if (!event) {
+                printk(KERN_ERR
+                        "gameport: Not enough memory to queue event %d\n",
+                        event_type);
+                retval = -ENOMEM;
+                goto out;
+        }
 
-                list_add_tail(&event->node, &gameport_event_list);
-                wake_up(&gameport_wait);
-        } else {
-                printk(KERN_ERR "gameport: Not enough memory to queue event %d\n", event_type);
+        if (!try_module_get(owner)) {
+                printk(KERN_WARNING
+                        "gameport: Can't get module reference, dropping event %d\n",
+                        event_type);
+                kfree(event);
+                retval = -EINVAL;
+                goto out;
         }
+
+        event->type = event_type;
+        event->object = object;
+        event->owner = owner;
+
+        list_add_tail(&event->node, &gameport_event_list);
+        wake_up(&gameport_wait);
+
 out:
         spin_unlock_irqrestore(&gameport_event_lock, flags);
+        return retval;
 }
 
 static void gameport_free_event(struct gameport_event *event)
@@ -378,9 +390,10 @@ static void gameport_handle_event(void)
 }
 
 /*
- * Remove all events that have been submitted for a given gameport port.
+ * Remove all events that have been submitted for a given object,
+ * be it a gameport port or a driver.
  */
-static void gameport_remove_pending_events(struct gameport *gameport)
+static void gameport_remove_pending_events(void *object)
 {
         struct list_head *node, *next;
         struct gameport_event *event;
@@ -390,7 +403,7 @@ static void gameport_remove_pending_events(struct gameport *gameport)
 
         list_for_each_safe(node, next, &gameport_event_list) {
                 event = list_entry(node, struct gameport_event, node);
-                if (event->object == gameport) {
+                if (event->object == object) {
                         list_del_init(node);
                         gameport_free_event(event);
                 }
@@ -705,10 +718,40 @@ static void gameport_add_driver(struct gameport_driver *drv)
                         drv->driver.name, error);
 }
 
-void __gameport_register_driver(struct gameport_driver *drv, struct module *owner)
+int __gameport_register_driver(struct gameport_driver *drv, struct module *owner,
+                                const char *mod_name)
 {
+        int error;
+
         drv->driver.bus = &gameport_bus;
-        gameport_queue_event(drv, owner, GAMEPORT_REGISTER_DRIVER);
+        drv->driver.owner = owner;
+        drv->driver.mod_name = mod_name;
+
+        /*
+         * Temporarily disable automatic binding because probing
+         * takes long time and we are better off doing it in kgameportd
+         */
+        drv->ignore = 1;
+
+        error = driver_register(&drv->driver);
+        if (error) {
+                printk(KERN_ERR
+                        "gameport: driver_register() failed for %s, error: %d\n",
+                        drv->driver.name, error);
+                return error;
+        }
+
+        /*
+         * Reset ignore flag and let kgameportd bind the driver to free ports
+         */
+        drv->ignore = 0;
+        error = gameport_queue_event(drv, NULL, GAMEPORT_ATTACH_DRIVER);
+        if (error) {
+                driver_unregister(&drv->driver);
+                return error;
+        }
+
+        return 0;
 }
 
 void gameport_unregister_driver(struct gameport_driver *drv)
@@ -716,7 +759,9 @@ void gameport_unregister_driver(struct gameport_driver *drv)
         struct gameport *gameport;
 
         mutex_lock(&gameport_mutex);
+
         drv->ignore = 1;        /* so gameport_find_driver ignores it */
+        gameport_remove_pending_events(drv);
 
 start_over:
         list_for_each_entry(gameport, &gameport_list, node) {
@@ -729,6 +774,7 @@ start_over:
         }
 
         driver_unregister(&drv->driver);
+
         mutex_unlock(&gameport_mutex);
 }
 
diff --git a/drivers/input/joystick/a3d.c b/drivers/input/joystick/a3d.c
index 92498d470b1f..6489f4010c4f 100644
--- a/drivers/input/joystick/a3d.c
+++ b/drivers/input/joystick/a3d.c
@@ -414,8 +414,7 @@ static struct gameport_driver a3d_drv = {
 
 static int __init a3d_init(void)
 {
-        gameport_register_driver(&a3d_drv);
-        return 0;
+        return gameport_register_driver(&a3d_drv);
 }
 
 static void __exit a3d_exit(void)
diff --git a/drivers/input/joystick/adi.c b/drivers/input/joystick/adi.c
index d1ca8a14950f..89c4c084d4ad 100644
--- a/drivers/input/joystick/adi.c
+++ b/drivers/input/joystick/adi.c
@@ -572,8 +572,7 @@ static struct gameport_driver adi_drv = {
 
 static int __init adi_init(void)
 {
-        gameport_register_driver(&adi_drv);
-        return 0;
+        return gameport_register_driver(&adi_drv);
 }
 
 static void __exit adi_exit(void)
diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c
index 708c5ae13b24..356b3a25efa2 100644
--- a/drivers/input/joystick/analog.c
+++ b/drivers/input/joystick/analog.c
@@ -761,9 +761,7 @@ static struct gameport_driver analog_drv = {
 static int __init analog_init(void)
 {
         analog_parse_options();
-        gameport_register_driver(&analog_drv);
-
-        return 0;
+        return gameport_register_driver(&analog_drv);
 }
 
 static void __exit analog_exit(void)
diff --git a/drivers/input/joystick/cobra.c b/drivers/input/joystick/cobra.c
index 639b975a8ed7..3497b87c3d05 100644
--- a/drivers/input/joystick/cobra.c
+++ b/drivers/input/joystick/cobra.c
@@ -263,8 +263,7 @@ static struct gameport_driver cobra_drv = {
 
 static int __init cobra_init(void)
 {
-        gameport_register_driver(&cobra_drv);
-        return 0;
+        return gameport_register_driver(&cobra_drv);
 }
 
 static void __exit cobra_exit(void)
diff --git a/drivers/input/joystick/gf2k.c b/drivers/input/joystick/gf2k.c
index cb6eef1f2d99..67c207f5b1a1 100644
--- a/drivers/input/joystick/gf2k.c
+++ b/drivers/input/joystick/gf2k.c
@@ -375,8 +375,7 @@ static struct gameport_driver gf2k_drv = {
 
 static int __init gf2k_init(void)
 {
-        gameport_register_driver(&gf2k_drv);
-        return 0;
+        return gameport_register_driver(&gf2k_drv);
 }
 
 static void __exit gf2k_exit(void)
diff --git a/drivers/input/joystick/grip.c b/drivers/input/joystick/grip.c
index 684e07cfccc8..fc55899ba6c5 100644
--- a/drivers/input/joystick/grip.c
+++ b/drivers/input/joystick/grip.c
@@ -426,8 +426,7 @@ static struct gameport_driver grip_drv = {
 
 static int __init grip_init(void)
 {
-        gameport_register_driver(&grip_drv);
-        return 0;
+        return gameport_register_driver(&grip_drv);
 }
 
 static void __exit grip_exit(void)
diff --git a/drivers/input/joystick/grip_mp.c b/drivers/input/joystick/grip_mp.c
index 8279481b16e7..2d47baf47769 100644
--- a/drivers/input/joystick/grip_mp.c
+++ b/drivers/input/joystick/grip_mp.c
@@ -689,8 +689,7 @@ static struct gameport_driver grip_drv = {
 
 static int __init grip_init(void)
 {
-        gameport_register_driver(&grip_drv);
-        return 0;
+        return gameport_register_driver(&grip_drv);
 }
 
 static void __exit grip_exit(void)
diff --git a/drivers/input/joystick/guillemot.c b/drivers/input/joystick/guillemot.c
index 25ec3fad9f27..4058d4b272fe 100644
--- a/drivers/input/joystick/guillemot.c
+++ b/drivers/input/joystick/guillemot.c
@@ -283,8 +283,7 @@ static struct gameport_driver guillemot_drv = {
 
 static int __init guillemot_init(void)
 {
-        gameport_register_driver(&guillemot_drv);
-        return 0;
+        return gameport_register_driver(&guillemot_drv);
 }
 
 static void __exit guillemot_exit(void)
diff --git a/drivers/input/joystick/interact.c b/drivers/input/joystick/interact.c
index 8c3290b68205..2478289aeeea 100644
--- a/drivers/input/joystick/interact.c
+++ b/drivers/input/joystick/interact.c
@@ -317,8 +317,7 @@ static struct gameport_driver interact_drv = {
 
 static int __init interact_init(void)
 {
-        gameport_register_driver(&interact_drv);
-        return 0;
+        return gameport_register_driver(&interact_drv);
 }
 
 static void __exit interact_exit(void)
diff --git a/drivers/input/joystick/joydump.c b/drivers/input/joystick/joydump.c
index 2a1b82c8b31c..cd894a0564a2 100644
--- a/drivers/input/joystick/joydump.c
+++ b/drivers/input/joystick/joydump.c
@@ -161,8 +161,7 @@ static struct gameport_driver joydump_drv = {
 
 static int __init joydump_init(void)
 {
-        gameport_register_driver(&joydump_drv);
-        return 0;
+        return gameport_register_driver(&joydump_drv);
 }
 
 static void __exit joydump_exit(void)
diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
index 7b4865fdee54..ca13a6bec33e 100644
--- a/drivers/input/joystick/sidewinder.c
+++ b/drivers/input/joystick/sidewinder.c
@@ -818,8 +818,7 @@ static struct gameport_driver sw_drv = {
 
 static int __init sw_init(void)
 {
-        gameport_register_driver(&sw_drv);
-        return 0;
+        return gameport_register_driver(&sw_drv);
 }
 
 static void __exit sw_exit(void)
diff --git a/drivers/input/joystick/tmdc.c b/drivers/input/joystick/tmdc.c
index 60c37bcb938d..d6c609807115 100644
--- a/drivers/input/joystick/tmdc.c
+++ b/drivers/input/joystick/tmdc.c
@@ -438,8 +438,7 @@ static struct gameport_driver tmdc_drv = {
 
 static int __init tmdc_init(void)
 {
-        gameport_register_driver(&tmdc_drv);
-        return 0;
+        return gameport_register_driver(&tmdc_drv);
 }
 
 static void __exit tmdc_exit(void)
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 6791be81eb29..839d1c9622f6 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -455,10 +455,10 @@ static void xpad_bulk_out(struct urb *urb)
         case -ENOENT:
         case -ESHUTDOWN:
                 /* this urb is terminated, clean up */
-                dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status);
+                dbg("%s - urb shutting down with status: %d", __func__, urb->status);
                 break;
         default:
-                dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status);
+                dbg("%s - nonzero urb status received: %d", __func__, urb->status);
         }
 }
 
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index b1ce10f50bcf..22016ca15351 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -834,10 +834,10 @@ static void atkbd_disconnect(struct serio *serio)
 }
 
 /*
- * Most special keys (Fn+F?) on Dell Latitudes do not generate release
+ * Most special keys (Fn+F?) on Dell laptops do not generate release
  * events so we have to do it ourselves.
  */
-static void atkbd_latitude_keymap_fixup(struct atkbd *atkbd)
+static void atkbd_dell_laptop_keymap_fixup(struct atkbd *atkbd)
 {
         const unsigned int forced_release_keys[] = {
                 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8f, 0x93,
@@ -1207,15 +1207,13 @@ static ssize_t atkbd_set_extra(struct atkbd *atkbd, const char *buf, size_t coun
 {
         struct input_dev *old_dev, *new_dev;
         unsigned long value;
-        char *rest;
         int err;
         unsigned char old_extra, old_set;
 
         if (!atkbd->write)
                 return -EIO;
 
-        value = simple_strtoul(buf, &rest, 10);
-        if (*rest || value > 1)
+        if (strict_strtoul(buf, 10, &value) || value > 1)
                 return -EINVAL;
 
         if (atkbd->extra != value) {
@@ -1264,12 +1262,10 @@ static ssize_t atkbd_set_scroll(struct atkbd *atkbd, const char *buf, size_t cou
 {
         struct input_dev *old_dev, *new_dev;
         unsigned long value;
-        char *rest;
         int err;
         unsigned char old_scroll;
 
-        value = simple_strtoul(buf, &rest, 10);
-        if (*rest || value > 1)
+        if (strict_strtoul(buf, 10, &value) || value > 1)
                 return -EINVAL;
 
         if (atkbd->scroll != value) {
@@ -1310,15 +1306,13 @@ static ssize_t atkbd_set_set(struct atkbd *atkbd, const char *buf, size_t count)
 {
         struct input_dev *old_dev, *new_dev;
         unsigned long value;
-        char *rest;
         int err;
         unsigned char old_set, old_extra;
 
         if (!atkbd->write)
                 return -EIO;
 
-        value = simple_strtoul(buf, &rest, 10);
-        if (*rest || (value != 2 && value != 3))
+        if (strict_strtoul(buf, 10, &value) || (value != 2 && value != 3))
                 return -EINVAL;
 
         if (atkbd->set != value) {
@@ -1361,15 +1355,13 @@ static ssize_t atkbd_set_softrepeat(struct atkbd *atkbd, const char *buf, size_t
 {
         struct input_dev *old_dev, *new_dev;
         unsigned long value;
-        char *rest;
         int err;
         unsigned char old_softrepeat, old_softraw;
 
         if (!atkbd->write)
                 return -EIO;
 
-        value = simple_strtoul(buf, &rest, 10);
-        if (*rest || value > 1)
+        if (strict_strtoul(buf, 10, &value) || value > 1)
                 return -EINVAL;
 
         if (atkbd->softrepeat != value) {
@@ -1413,12 +1405,10 @@ static ssize_t atkbd_set_softraw(struct atkbd *atkbd, const char *buf, size_t co
 {
         struct input_dev *old_dev, *new_dev;
         unsigned long value;
-        char *rest;
         int err;
         unsigned char old_softraw;
 
-        value = simple_strtoul(buf, &rest, 10);
-        if (*rest || value > 1)
+        if (strict_strtoul(buf, 10, &value) || value > 1)
                 return -EINVAL;
 
         if (atkbd->softraw != value) {
@@ -1461,13 +1451,13 @@ static int __init atkbd_setup_fixup(const struct dmi_system_id *id)
 
 static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
         {
-                .ident = "Dell Latitude series",
+                .ident = "Dell Laptop",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Latitude"),
+                        DMI_MATCH(DMI_CHASSIS_TYPE, "8"), /* Portable */
                 },
                 .callback = atkbd_setup_fixup,
-                .driver_data = atkbd_latitude_keymap_fixup,
+                .driver_data = atkbd_dell_laptop_keymap_fixup,
         },
         {
                 .ident = "HP 2133",
diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c
index e348cfccc17a..19284016e0f4 100644
--- a/drivers/input/keyboard/bf54x-keys.c
+++ b/drivers/input/keyboard/bf54x-keys.c
@@ -8,7 +8,7 @@
  *
  *
  * Modified:
- *               Copyright 2007 Analog Devices Inc.
+ *               Copyright 2007-2008 Analog Devices Inc.
  *
  * Bugs:         Enter bugs at http://blackfin.uclinux.org/
  *
@@ -81,6 +81,9 @@ struct bf54x_kpad {
         unsigned short *keycode;
         struct timer_list timer;
         unsigned int keyup_test_jiffies;
+        unsigned short kpad_msel;
+        unsigned short kpad_prescale;
+        unsigned short kpad_ctl;
 };
 
 static inline int bfin_kpad_find_key(struct bf54x_kpad *bf54x_kpad,
@@ -360,6 +363,10 @@ static int bfin_kpad_suspend(struct platform_device *pdev, pm_message_t state)
 {
         struct bf54x_kpad *bf54x_kpad = platform_get_drvdata(pdev);
 
+        bf54x_kpad->kpad_msel = bfin_read_KPAD_MSEL();
+        bf54x_kpad->kpad_prescale = bfin_read_KPAD_PRESCALE();
+        bf54x_kpad->kpad_ctl = bfin_read_KPAD_CTL();
+
         if (device_may_wakeup(&pdev->dev))
                 enable_irq_wake(bf54x_kpad->irq);
 
@@ -370,6 +377,10 @@ static int bfin_kpad_resume(struct platform_device *pdev)
 {
         struct bf54x_kpad *bf54x_kpad = platform_get_drvdata(pdev);
 
+        bfin_write_KPAD_MSEL(bf54x_kpad->kpad_msel);
+        bfin_write_KPAD_PRESCALE(bf54x_kpad->kpad_prescale);
+        bfin_write_KPAD_CTL(bf54x_kpad->kpad_ctl);
+
         if (device_may_wakeup(&pdev->dev))
                 disable_irq_wake(bf54x_kpad->irq);
 
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index ec96b369dd7a..05f3f43582c2 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -36,9 +36,10 @@ struct gpio_keys_drvdata {
         struct gpio_button_data data[0];
 };
 
-static void gpio_keys_report_event(struct gpio_keys_button *button,
-                                   struct input_dev *input)
+static void gpio_keys_report_event(struct gpio_button_data *bdata)
 {
+        struct gpio_keys_button *button = bdata->button;
+        struct input_dev *input = bdata->input;
         unsigned int type = button->type ?: EV_KEY;
         int state = (gpio_get_value(button->gpio) ? 1 : 0) ^ button->active_low;
 
@@ -50,34 +51,23 @@ static void gpio_check_button(unsigned long _data)
 {
         struct gpio_button_data *data = (struct gpio_button_data *)_data;
 
-        gpio_keys_report_event(data->button, data->input);
+        gpio_keys_report_event(data);
 }
 
 static irqreturn_t gpio_keys_isr(int irq, void *dev_id)
 {
-        struct platform_device *pdev = dev_id;
-        struct gpio_keys_platform_data *pdata = pdev->dev.platform_data;
-        struct gpio_keys_drvdata *ddata = platform_get_drvdata(pdev);
-        int i;
+        struct gpio_button_data *bdata = dev_id;
+        struct gpio_keys_button *button = bdata->button;
 
-        for (i = 0; i < pdata->nbuttons; i++) {
-                struct gpio_keys_button *button = &pdata->buttons[i];
+        BUG_ON(irq != gpio_to_irq(button->gpio));
 
-                if (irq == gpio_to_irq(button->gpio)) {
-                        struct gpio_button_data *bdata = &ddata->data[i];
-
-                        if (button->debounce_interval)
-                                mod_timer(&bdata->timer,
-                                          jiffies +
-                                          msecs_to_jiffies(button->debounce_interval));
-                        else
-                                gpio_keys_report_event(button, bdata->input);
-
-                        return IRQ_HANDLED;
-                }
-        }
+        if (button->debounce_interval)
+                mod_timer(&bdata->timer,
+                        jiffies + msecs_to_jiffies(button->debounce_interval));
+        else
+                gpio_keys_report_event(bdata);
 
-        return IRQ_NONE;
+        return IRQ_HANDLED;
 }
 
 static int __devinit gpio_keys_probe(struct platform_device *pdev)
@@ -151,7 +141,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
                                     IRQF_SAMPLE_RANDOM | IRQF_TRIGGER_RISING |
                                         IRQF_TRIGGER_FALLING,
                                     button->desc ? button->desc : "gpio_keys",
-                                    pdev);
+                                    bdata);
                 if (error) {
                         pr_err("gpio-keys: Unable to claim irq %d; error %d\n",
                                 irq, error);
@@ -178,7 +168,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
 
  fail2:
         while (--i >= 0) {
-                free_irq(gpio_to_irq(pdata->buttons[i].gpio), pdev);
+                free_irq(gpio_to_irq(pdata->buttons[i].gpio), &ddata->data[i]);
                 if (pdata->buttons[i].debounce_interval)
                         del_timer_sync(&ddata->data[i].timer);
                 gpio_free(pdata->buttons[i].gpio);
@@ -203,7 +193,7 @@ static int __devexit gpio_keys_remove(struct platform_device *pdev)
 
         for (i = 0; i < pdata->nbuttons; i++) {
                 int irq = gpio_to_irq(pdata->buttons[i].gpio);
-                free_irq(irq, pdev);
+                free_irq(irq, &ddata->data[i]);
                 if (pdata->buttons[i].debounce_interval)
                         del_timer_sync(&ddata->data[i].timer);
                 gpio_free(pdata->buttons[i].gpio);
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index dcea87a0bc56..69e674ecf19a 100644
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -62,7 +62,7 @@ struct omap_kp {
         unsigned int debounce;
 };
 
-DECLARE_TASKLET_DISABLED(kp_tasklet, omap_kp_tasklet, 0);
+static DECLARE_TASKLET_DISABLED(kp_tasklet, omap_kp_tasklet, 0);
 
 static int *keymap;
 static unsigned int *row_gpios;
@@ -72,12 +72,9 @@ static unsigned int *col_gpios;
 static void set_col_gpio_val(struct omap_kp *omap_kp, u8 value)
 {
         int col;
-        for (col = 0; col < omap_kp->cols; col++) {
-                if (value & (1 << col))
-                        omap_set_gpio_dataout(col_gpios[col], 1);
-                else
-                        omap_set_gpio_dataout(col_gpios[col], 0);
-        }
+
+        for (col = 0; col < omap_kp->cols; col++)
+                gpio_set_value(col_gpios[col], value & (1 << col));
 }
 
 static u8 get_row_gpio_val(struct omap_kp *omap_kp)
@@ -86,7 +83,7 @@ static u8 get_row_gpio_val(struct omap_kp *omap_kp)
         u8 value = 0;
 
         for (row = 0; row < omap_kp->rows; row++) {
-                if (omap_get_gpio_datain(row_gpios[row]))
+                if (gpio_get_value(row_gpios[row]))
                         value |= (1 << row);
         }
         return value;
@@ -333,23 +330,23 @@ static int __init omap_kp_probe(struct platform_device *pdev)
         if (cpu_is_omap24xx()) {
                 /* Cols: outputs */
                 for (col_idx = 0; col_idx < omap_kp->cols; col_idx++) {
-                        if (omap_request_gpio(col_gpios[col_idx]) < 0) {
+                        if (gpio_request(col_gpios[col_idx], "omap_kp_col") < 0) {
                                 printk(KERN_ERR "Failed to request"
                                        "GPIO%d for keypad\n",
                                        col_gpios[col_idx]);
                                 goto err1;
                         }
-                        omap_set_gpio_direction(col_gpios[col_idx], 0);
+                        gpio_direction_output(col_gpios[col_idx], 0);
                 }
                 /* Rows: inputs */
                 for (row_idx = 0; row_idx < omap_kp->rows; row_idx++) {
-                        if (omap_request_gpio(row_gpios[row_idx]) < 0) {
+                        if (gpio_request(row_gpios[row_idx], "omap_kp_row") < 0) {
                                 printk(KERN_ERR "Failed to request"
                                        "GPIO%d for keypad\n",
                                        row_gpios[row_idx]);
                                 goto err2;
                         }
-                        omap_set_gpio_direction(row_gpios[row_idx], 1);
+                        gpio_direction_input(row_gpios[row_idx]);
                 }
         } else {
                 col_idx = 0;
@@ -418,10 +415,10 @@ err3:
         device_remove_file(&pdev->dev, &dev_attr_enable);
 err2:
         for (i = row_idx - 1; i >=0; i--)
-                omap_free_gpio(row_gpios[i]);
+                gpio_free(row_gpios[i]);
 err1:
         for (i = col_idx - 1; i >=0; i--)
-                omap_free_gpio(col_gpios[i]);
+                gpio_free(col_gpios[i]);
 
         kfree(omap_kp);
         input_free_device(input_dev);
@@ -438,9 +435,9 @@ static int omap_kp_remove(struct platform_device *pdev)
         if (cpu_is_omap24xx()) {
                 int i;
                 for (i = 0; i < omap_kp->cols; i++)
-                        omap_free_gpio(col_gpios[i]);
+                        gpio_free(col_gpios[i]);
                 for (i = 0; i < omap_kp->rows; i++) {
-                        omap_free_gpio(row_gpios[i]);
+                        gpio_free(row_gpios[i]);
                         free_irq(OMAP_GPIO_IRQ(row_gpios[i]), 0);
                 }
         } else {
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index e99b7882f382..199055db5082 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -180,6 +180,19 @@ config INPUT_YEALINK
           To compile this driver as a module, choose M here: the module will be
           called yealink.
 
+config INPUT_CM109
+        tristate "C-Media CM109 USB I/O Controller"
+        depends on EXPERIMENTAL
+        depends on USB_ARCH_HAS_HCD
+        select USB
+        help
+          Say Y here if you want to enable keyboard and buzzer functions of the
+          C-Media CM109 usb phones. The audio part is enabled by the generic
+          usb sound driver, so you might want to enable that as well.
+
+          To compile this driver as a module, choose M here: the module will be
+          called cm109.
+
 config INPUT_UINPUT
         tristate "User level driver support"
         help
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index f48009b52226..d7db2aeb8a98 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_INPUT_ATI_REMOTE2)		+= ati_remote2.o
 obj-$(CONFIG_INPUT_KEYSPAN_REMOTE)      += keyspan_remote.o
 obj-$(CONFIG_INPUT_POWERMATE)           += powermate.o
 obj-$(CONFIG_INPUT_YEALINK)             += yealink.o
+obj-$(CONFIG_INPUT_CM109)               += cm109.o
 obj-$(CONFIG_HP_SDC_RTC)                += hp_sdc_rtc.o
 obj-$(CONFIG_INPUT_UINPUT)              += uinput.o
 obj-$(CONFIG_INPUT_APANEL)              += apanel.o
diff --git a/drivers/input/misc/ati_remote2.c b/drivers/input/misc/ati_remote2.c
index a7fabafbd94c..3c9988dc0e9f 100644
--- a/drivers/input/misc/ati_remote2.c
+++ b/drivers/input/misc/ati_remote2.c
@@ -1,8 +1,8 @@
 /*
  * ati_remote2 - ATI/Philips USB RF remote driver
  *
- * Copyright (C) 2005 Ville Syrjala <syrjala@sci.fi>
- * Copyright (C) 2007 Peter Stokes <linux@dadeos.freeserve.co.uk>
+ * Copyright (C) 2005-2008 Ville Syrjala <syrjala@sci.fi>
+ * Copyright (C) 2007-2008 Peter Stokes <linux@dadeos.co.uk>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2
@@ -12,7 +12,7 @@
 #include <linux/usb/input.h>
 
 #define DRIVER_DESC    "ATI/Philips USB RF remote driver"
-#define DRIVER_VERSION "0.2"
+#define DRIVER_VERSION "0.3"
 
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_VERSION(DRIVER_VERSION);
@@ -27,7 +27,7 @@ MODULE_LICENSE("GPL");
  * A remote's "channel" may be altered by pressing and holding the "PC" button for
  * approximately 3 seconds, after which the button will slowly flash the count of the
  * currently configured "channel", using the numeric keypad enter a number between 1 and
- * 16 and then the "PC" button again, the button will slowly flash the count of the
+ * 16 and then press the "PC" button again, the button will slowly flash the count of the
  * newly configured "channel".
  */
 
@@ -45,9 +45,25 @@ static struct usb_device_id ati_remote2_id_table[] = {
 };
 MODULE_DEVICE_TABLE(usb, ati_remote2_id_table);
 
-static struct {
-        int hw_code;
-        int key_code;
+static DEFINE_MUTEX(ati_remote2_mutex);
+
+enum {
+        ATI_REMOTE2_OPENED = 0x1,
+        ATI_REMOTE2_SUSPENDED = 0x2,
+};
+
+enum {
+        ATI_REMOTE2_AUX1,
+        ATI_REMOTE2_AUX2,
+        ATI_REMOTE2_AUX3,
+        ATI_REMOTE2_AUX4,
+        ATI_REMOTE2_PC,
+        ATI_REMOTE2_MODES,
+};
+
+static const struct {
+        u8  hw_code;
+        u16 keycode;
 } ati_remote2_key_table[] = {
         { 0x00, KEY_0 },
         { 0x01, KEY_1 },
@@ -73,6 +89,7 @@ static struct {
         { 0x37, KEY_RECORD },
         { 0x38, KEY_DVD },
         { 0x39, KEY_TV },
+        { 0x3f, KEY_PROG1 }, /* AUX1-AUX4 and PC */
         { 0x54, KEY_MENU },
         { 0x58, KEY_UP },
         { 0x59, KEY_DOWN },
@@ -91,15 +108,9 @@ static struct {
         { 0xa9, BTN_LEFT },
         { 0xaa, BTN_RIGHT },
         { 0xbe, KEY_QUESTION },
-        { 0xd5, KEY_FRONT },
         { 0xd0, KEY_EDIT },
+        { 0xd5, KEY_FRONT },
         { 0xf9, KEY_INFO },
-        { (0x00 << 8) | 0x3f, KEY_PROG1 },
-        { (0x01 << 8) | 0x3f, KEY_PROG2 },
-        { (0x02 << 8) | 0x3f, KEY_PROG3 },
-        { (0x03 << 8) | 0x3f, KEY_PROG4 },
-        { (0x04 << 8) | 0x3f, KEY_PC },
-        { 0, KEY_RESERVED }
 };
 
 struct ati_remote2 {
@@ -117,46 +128,106 @@ struct ati_remote2 {
 
         char name[64];
         char phys[64];
+
+        /* Each mode (AUX1-AUX4 and PC) can have an independent keymap. */
+        u16 keycode[ATI_REMOTE2_MODES][ARRAY_SIZE(ati_remote2_key_table)];
+
+        unsigned int flags;
 };
 
 static int ati_remote2_probe(struct usb_interface *interface, const struct usb_device_id *id);
 static void ati_remote2_disconnect(struct usb_interface *interface);
+static int ati_remote2_suspend(struct usb_interface *interface, pm_message_t message);
+static int ati_remote2_resume(struct usb_interface *interface);
 
 static struct usb_driver ati_remote2_driver = {
         .name       = "ati_remote2",
         .probe      = ati_remote2_probe,
         .disconnect = ati_remote2_disconnect,
         .id_table   = ati_remote2_id_table,
+        .suspend    = ati_remote2_suspend,
+        .resume     = ati_remote2_resume,
+        .supports_autosuspend = 1,
 };
 
-static int ati_remote2_open(struct input_dev *idev)
+static int ati_remote2_submit_urbs(struct ati_remote2 *ar2)
 {
-        struct ati_remote2 *ar2 = input_get_drvdata(idev);
         int r;
 
         r = usb_submit_urb(ar2->urb[0], GFP_KERNEL);
         if (r) {
                 dev_err(&ar2->intf[0]->dev,
-                        "%s: usb_submit_urb() = %d\n", __func__, r);
+                        "%s(): usb_submit_urb() = %d\n", __func__, r);
                 return r;
         }
         r = usb_submit_urb(ar2->urb[1], GFP_KERNEL);
         if (r) {
                 usb_kill_urb(ar2->urb[0]);
                 dev_err(&ar2->intf[1]->dev,
-                        "%s: usb_submit_urb() = %d\n", __func__, r);
+                        "%s(): usb_submit_urb() = %d\n", __func__, r);
                 return r;
         }
 
         return 0;
 }
 
+static void ati_remote2_kill_urbs(struct ati_remote2 *ar2)
+{
+        usb_kill_urb(ar2->urb[1]);
+        usb_kill_urb(ar2->urb[0]);
+}
+
+static int ati_remote2_open(struct input_dev *idev)
+{
+        struct ati_remote2 *ar2 = input_get_drvdata(idev);
+        int r;
+
+        dev_dbg(&ar2->intf[0]->dev, "%s()\n", __func__);
+
+        r = usb_autopm_get_interface(ar2->intf[0]);
+        if (r) {
+                dev_err(&ar2->intf[0]->dev,
+                        "%s(): usb_autopm_get_interface() = %d\n", __func__, r);
+                goto fail1;
+        }
+
+        mutex_lock(&ati_remote2_mutex);
+
+        if (!(ar2->flags & ATI_REMOTE2_SUSPENDED)) {
+                r = ati_remote2_submit_urbs(ar2);
+                if (r)
+                        goto fail2;
+        }
+
+        ar2->flags |= ATI_REMOTE2_OPENED;
+
+        mutex_unlock(&ati_remote2_mutex);
+
+        usb_autopm_put_interface(ar2->intf[0]);
+
+        return 0;
+
+ fail2:
+        mutex_unlock(&ati_remote2_mutex);
+        usb_autopm_put_interface(ar2->intf[0]);
+ fail1:
+        return r;
+}
+
 static void ati_remote2_close(struct input_dev *idev)
 {
         struct ati_remote2 *ar2 = input_get_drvdata(idev);
 
-        usb_kill_urb(ar2->urb[0]);
-        usb_kill_urb(ar2->urb[1]);
+        dev_dbg(&ar2->intf[0]->dev, "%s()\n", __func__);
+
+        mutex_lock(&ati_remote2_mutex);
+
+        if (!(ar2->flags & ATI_REMOTE2_SUSPENDED))
+                ati_remote2_kill_urbs(ar2);
+
+        ar2->flags &= ~ATI_REMOTE2_OPENED;
+
+        mutex_unlock(&ati_remote2_mutex);
 }
 
 static void ati_remote2_input_mouse(struct ati_remote2 *ar2)
@@ -172,7 +243,7 @@ static void ati_remote2_input_mouse(struct ati_remote2 *ar2)
 
         mode = data[0] & 0x0F;
 
-        if (mode > 4) {
+        if (mode > ATI_REMOTE2_PC) {
                 dev_err(&ar2->intf[0]->dev,
                         "Unknown mode byte (%02x %02x %02x %02x)\n",
                         data[3], data[2], data[1], data[0]);
@@ -191,7 +262,7 @@ static int ati_remote2_lookup(unsigned int hw_code)
 {
         int i;
 
-        for (i = 0; ati_remote2_key_table[i].key_code != KEY_RESERVED; i++)
+        for (i = 0; i < ARRAY_SIZE(ati_remote2_key_table); i++)
                 if (ati_remote2_key_table[i].hw_code == hw_code)
                         return i;
 
@@ -211,7 +282,7 @@ static void ati_remote2_input_key(struct ati_remote2 *ar2)
 
         mode = data[0] & 0x0F;
 
-        if (mode > 4) {
+        if (mode > ATI_REMOTE2_PC) {
                 dev_err(&ar2->intf[1]->dev,
                         "Unknown mode byte (%02x %02x %02x %02x)\n",
                         data[3], data[2], data[1], data[0]);
@@ -219,10 +290,6 @@ static void ati_remote2_input_key(struct ati_remote2 *ar2)
         }
 
         hw_code = data[2];
-        /*
-         * Mode keys (AUX1-AUX4, PC) all generate the same code byte.
-         * Use the mode byte to figure out which one was pressed.
-         */
         if (hw_code == 0x3f) {
                 /*
                  * For some incomprehensible reason the mouse pad generates
@@ -236,8 +303,6 @@ static void ati_remote2_input_key(struct ati_remote2 *ar2)
 
                 if (data[1] == 0)
                         ar2->mode = mode;
-
-                hw_code |= mode << 8;
         }
 
         if (!((1 << mode) & mode_mask))
@@ -260,8 +325,8 @@ static void ati_remote2_input_key(struct ati_remote2 *ar2)
         case 2: /* repeat */
 
                 /* No repeat for mouse buttons. */
-                if (ati_remote2_key_table[index].key_code == BTN_LEFT ||
-                    ati_remote2_key_table[index].key_code == BTN_RIGHT)
+                if (ar2->keycode[mode][index] == BTN_LEFT ||
+                    ar2->keycode[mode][index] == BTN_RIGHT)
                         return;
 
                 if (!time_after_eq(jiffies, ar2->jiffies))
@@ -276,7 +341,7 @@ static void ati_remote2_input_key(struct ati_remote2 *ar2)
                 return;
         }
 
-        input_event(idev, EV_KEY, ati_remote2_key_table[index].key_code, data[1]);
+        input_event(idev, EV_KEY, ar2->keycode[mode][index], data[1]);
         input_sync(idev);
 }
 
@@ -287,6 +352,7 @@ static void ati_remote2_complete_mouse(struct urb *urb)
 
         switch (urb->status) {
         case 0:
+                usb_mark_last_busy(ar2->udev);
                 ati_remote2_input_mouse(ar2);
                 break;
         case -ENOENT:
@@ -297,6 +363,7 @@ static void ati_remote2_complete_mouse(struct urb *urb)
                         "%s(): urb status = %d\n", __func__, urb->status);
                 return;
         default:
+                usb_mark_last_busy(ar2->udev);
                 dev_err(&ar2->intf[0]->dev,
                         "%s(): urb status = %d\n", __func__, urb->status);
         }
@@ -314,6 +381,7 @@ static void ati_remote2_complete_key(struct urb *urb)
 
         switch (urb->status) {
         case 0:
+                usb_mark_last_busy(ar2->udev);
                 ati_remote2_input_key(ar2);
                 break;
         case -ENOENT:
@@ -324,6 +392,7 @@ static void ati_remote2_complete_key(struct urb *urb)
                         "%s(): urb status = %d\n", __func__, urb->status);
                 return;
         default:
+                usb_mark_last_busy(ar2->udev);
                 dev_err(&ar2->intf[1]->dev,
                         "%s(): urb status = %d\n", __func__, urb->status);
         }
@@ -334,10 +403,60 @@ static void ati_remote2_complete_key(struct urb *urb)
                         "%s(): usb_submit_urb() = %d\n", __func__, r);
 }
 
+static int ati_remote2_getkeycode(struct input_dev *idev,
+                                  int scancode, int *keycode)
+{
+        struct ati_remote2 *ar2 = input_get_drvdata(idev);
+        int index, mode;
+
+        mode = scancode >> 8;
+        if (mode > ATI_REMOTE2_PC || !((1 << mode) & mode_mask))
+                return -EINVAL;
+
+        index = ati_remote2_lookup(scancode & 0xFF);
+        if (index < 0)
+                return -EINVAL;
+
+        *keycode = ar2->keycode[mode][index];
+        return 0;
+}
+
+static int ati_remote2_setkeycode(struct input_dev *idev, int scancode, int keycode)
+{
+        struct ati_remote2 *ar2 = input_get_drvdata(idev);
+        int index, mode, old_keycode;
+
+        mode = scancode >> 8;
+        if (mode > ATI_REMOTE2_PC || !((1 << mode) & mode_mask))
+                return -EINVAL;
+
+        index = ati_remote2_lookup(scancode & 0xFF);
+        if (index < 0)
+                return -EINVAL;
+
+        if (keycode < KEY_RESERVED || keycode > KEY_MAX)
+                return -EINVAL;
+
+        old_keycode = ar2->keycode[mode][index];
+        ar2->keycode[mode][index] = keycode;
+        set_bit(keycode, idev->keybit);
+
+        for (mode = 0; mode < ATI_REMOTE2_MODES; mode++) {
+                for (index = 0; index < ARRAY_SIZE(ati_remote2_key_table); index++) {
+                        if (ar2->keycode[mode][index] == old_keycode)
+                                return 0;
+                }
+        }
+
+        clear_bit(old_keycode, idev->keybit);
+
+        return 0;
+}
+
 static int ati_remote2_input_init(struct ati_remote2 *ar2)
 {
         struct input_dev *idev;
-        int i, retval;
+        int index, mode, retval;
 
         idev = input_allocate_device();
         if (!idev)
@@ -350,8 +469,26 @@ static int ati_remote2_input_init(struct ati_remote2 *ar2)
         idev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_LEFT) |
                 BIT_MASK(BTN_RIGHT);
         idev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
-        for (i = 0; ati_remote2_key_table[i].key_code != KEY_RESERVED; i++)
-                set_bit(ati_remote2_key_table[i].key_code, idev->keybit);
+
+        for (mode = 0; mode < ATI_REMOTE2_MODES; mode++) {
+                for (index = 0; index < ARRAY_SIZE(ati_remote2_key_table); index++) {
+                        ar2->keycode[mode][index] = ati_remote2_key_table[index].keycode;
+                        set_bit(ar2->keycode[mode][index], idev->keybit);
+                }
+        }
+
+        /* AUX1-AUX4 and PC generate the same scancode. */
+        index = ati_remote2_lookup(0x3f);
+        ar2->keycode[ATI_REMOTE2_AUX1][index] = KEY_PROG1;
+        ar2->keycode[ATI_REMOTE2_AUX2][index] = KEY_PROG2;
+        ar2->keycode[ATI_REMOTE2_AUX3][index] = KEY_PROG3;
+        ar2->keycode[ATI_REMOTE2_AUX4][index] = KEY_PROG4;
+        ar2->keycode[ATI_REMOTE2_PC][index] = KEY_PC;
+        set_bit(KEY_PROG1, idev->keybit);
+        set_bit(KEY_PROG2, idev->keybit);
+        set_bit(KEY_PROG3, idev->keybit);
+        set_bit(KEY_PROG4, idev->keybit);
+        set_bit(KEY_PC, idev->keybit);
 
         idev->rep[REP_DELAY]  = 250;
         idev->rep[REP_PERIOD] = 33;
@@ -359,6 +496,9 @@ static int ati_remote2_input_init(struct ati_remote2 *ar2)
         idev->open = ati_remote2_open;
         idev->close = ati_remote2_close;
 
+        idev->getkeycode = ati_remote2_getkeycode;
+        idev->setkeycode = ati_remote2_setkeycode;
+
         idev->name = ar2->name;
         idev->phys = ar2->phys;
 
@@ -490,6 +630,8 @@ static int ati_remote2_probe(struct usb_interface *interface, const struct usb_d
 
         usb_set_intfdata(interface, ar2);
 
+        interface->needs_remote_wakeup = 1;
+
         return 0;
 
  fail2:
@@ -522,6 +664,57 @@ static void ati_remote2_disconnect(struct usb_interface *interface)
         kfree(ar2);
 }
 
+static int ati_remote2_suspend(struct usb_interface *interface,
+                               pm_message_t message)
+{
+        struct ati_remote2 *ar2;
+        struct usb_host_interface *alt = interface->cur_altsetting;
+
+        if (alt->desc.bInterfaceNumber)
+                return 0;
+
+        ar2 = usb_get_intfdata(interface);
+
+        dev_dbg(&ar2->intf[0]->dev, "%s()\n", __func__);
+
+        mutex_lock(&ati_remote2_mutex);
+
+        if (ar2->flags & ATI_REMOTE2_OPENED)
+                ati_remote2_kill_urbs(ar2);
+
+        ar2->flags |= ATI_REMOTE2_SUSPENDED;
+
+        mutex_unlock(&ati_remote2_mutex);
+
+        return 0;
+}
+
+static int ati_remote2_resume(struct usb_interface *interface)
+{
+        struct ati_remote2 *ar2;
+        struct usb_host_interface *alt = interface->cur_altsetting;
+        int r = 0;
+
+        if (alt->desc.bInterfaceNumber)
+                return 0;
+
+        ar2 = usb_get_intfdata(interface);
+
+        dev_dbg(&ar2->intf[0]->dev, "%s()\n", __func__);
+
+        mutex_lock(&ati_remote2_mutex);
+
+        if (ar2->flags & ATI_REMOTE2_OPENED)
+                r = ati_remote2_submit_urbs(ar2);
+
+        if (!r)
+                ar2->flags &= ~ATI_REMOTE2_SUSPENDED;
+
+        mutex_unlock(&ati_remote2_mutex);
+
+        return r;
+}
+
 static int __init ati_remote2_init(void)
 {
         int r;
diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c
new file mode 100644
index 000000000000..bce160f4349b
--- /dev/null
+++ b/drivers/input/misc/cm109.c
@@ -0,0 +1,882 @@
+/*
+ * Driver for the VoIP USB phones with CM109 chipsets.
+ *
+ * Copyright (C) 2007 - 2008 Alfred E. Heggestad <aeh@db.org>
+ *
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License as
+ *      published by the Free Software Foundation, version 2.
+ */
+
+/*
+ *   Tested devices:
+ *      - Komunikate KIP1000
+ *      - Genius G-talk
+ *      - Allied-Telesis Corega USBPH01
+ *      - ...
+ *
+ * This driver is based on the yealink.c driver
+ *
+ * Thanks to:
+ *   - Authors of yealink.c
+ *   - Thomas Reitmayr
+ *   - Oliver Neukum for good review comments and code
+ *   - Shaun Jackman <sjackman@gmail.com> for Genius G-talk keymap
+ *   - Dmitry Torokhov for valuable input and review
+ *
+ * Todo:
+ *   - Read/write EEPROM
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/rwsem.h>
+#include <linux/usb/input.h>
+
+#define DRIVER_VERSION "20080805"
+#define DRIVER_AUTHOR  "Alfred E. Heggestad"
+#define DRIVER_DESC    "CM109 phone driver"
+
+static char *phone = "kip1000";
+module_param(phone, charp, S_IRUSR);
+MODULE_PARM_DESC(phone, "Phone name {kip1000, gtalk, usbph01}");
+
+enum {
+        /* HID Registers */
+        HID_IR0 = 0x00, /* Record/Playback-mute button, Volume up/down  */
+        HID_IR1 = 0x01, /* GPI, generic registers or EEPROM_DATA0       */
+        HID_IR2 = 0x02, /* Generic registers or EEPROM_DATA1            */
+        HID_IR3 = 0x03, /* Generic registers or EEPROM_CTRL             */
+        HID_OR0 = 0x00, /* Mapping control, buzzer, SPDIF (offset 0x04) */
+        HID_OR1 = 0x01, /* GPO - General Purpose Output                 */
+        HID_OR2 = 0x02, /* Set GPIO to input/output mode                */
+        HID_OR3 = 0x03, /* SPDIF status channel or EEPROM_CTRL          */
+
+        /* HID_IR0 */
+        RECORD_MUTE   = 1 << 3,
+        PLAYBACK_MUTE = 1 << 2,
+        VOLUME_DOWN   = 1 << 1,
+        VOLUME_UP     = 1 << 0,
+
+        /* HID_OR0 */
+        /* bits 7-6
+           0: HID_OR1-2 are used for GPO; HID_OR0, 3 are used for buzzer
+              and SPDIF
+           1: HID_OR0-3 are used as generic HID registers
+           2: Values written to HID_OR0-3 are also mapped to MCU_CTRL,
+              EEPROM_DATA0-1, EEPROM_CTRL (see Note)
+           3: Reserved
+         */
+        HID_OR_GPO_BUZ_SPDIF   = 0 << 6,
+        HID_OR_GENERIC_HID_REG = 1 << 6,
+        HID_OR_MAP_MCU_EEPROM  = 2 << 6,
+
+        BUZZER_ON = 1 << 5,
+
+        /* up to 256 normal keys, up to 16 special keys */
+        KEYMAP_SIZE = 256 + 16,
+};
+
+/* CM109 protocol packet */
+struct cm109_ctl_packet {
+        u8 byte[4];
+} __attribute__ ((packed));
+
+enum { USB_PKT_LEN = sizeof(struct cm109_ctl_packet) };
+
+/* CM109 device structure */
+struct cm109_dev {
+        struct input_dev *idev;  /* input device */
+        struct usb_device *udev; /* usb device */
+        struct usb_interface *intf;
+
+        /* irq input channel */
+        struct cm109_ctl_packet *irq_data;
+        dma_addr_t irq_dma;
+        struct urb *urb_irq;
+
+        /* control output channel */
+        struct cm109_ctl_packet *ctl_data;
+        dma_addr_t ctl_dma;
+        struct usb_ctrlrequest *ctl_req;
+        dma_addr_t ctl_req_dma;
+        struct urb *urb_ctl;
+        /*
+         * The 3 bitfields below are protected by ctl_submit_lock.
+         * They have to be separate since they are accessed from IRQ
+         * context.
+         */
+        unsigned irq_urb_pending:1;     /* irq_urb is in flight */
+        unsigned ctl_urb_pending:1;     /* ctl_urb is in flight */
+        unsigned buzzer_pending:1;      /* need to issue buzz command */
+        spinlock_t ctl_submit_lock;
+
+        unsigned char buzzer_state;     /* on/off */
+
+        /* flags */
+        unsigned open:1;
+        unsigned resetting:1;
+        unsigned shutdown:1;
+
+        /* This mutex protects writes to the above flags */
+        struct mutex pm_mutex;
+
+        unsigned short keymap[KEYMAP_SIZE];
+
+        char phys[64];          /* physical device path */
+        int key_code;           /* last reported key */
+        int keybit;             /* 0=new scan  1,2,4,8=scan columns  */
+        u8 gpi;                 /* Cached value of GPI (high nibble) */
+};
+
+/******************************************************************************
+ * CM109 key interface
+ *****************************************************************************/
+
+static unsigned short special_keymap(int code)
+{
+        if (code > 0xff) {
+                switch (code - 0xff) {
+                case RECORD_MUTE:       return KEY_MUTE;
+                case PLAYBACK_MUTE:     return KEY_MUTE;
+                case VOLUME_DOWN:       return KEY_VOLUMEDOWN;
+                case VOLUME_UP:         return KEY_VOLUMEUP;
+                }
+        }
+        return KEY_RESERVED;
+}
+
+/* Map device buttons to internal key events.
+ *
+ * The "up" and "down" keys, are symbolised by arrows on the button.
+ * The "pickup" and "hangup" keys are symbolised by a green and red phone
+ * on the button.
+
+ Komunikate KIP1000 Keyboard Matrix
+
+     -> -- 1 -- 2 -- 3  --> GPI pin 4 (0x10)
+      |    |    |    |
+     <- -- 4 -- 5 -- 6  --> GPI pin 5 (0x20)
+      |    |    |    |
+     END - 7 -- 8 -- 9  --> GPI pin 6 (0x40)
+      |    |    |    |
+     OK -- * -- 0 -- #  --> GPI pin 7 (0x80)
+      |    |    |    |
+
+     /|\  /|\  /|\  /|\
+      |    |    |    |
+GPO
+pin:  3    2    1    0
+     0x8  0x4  0x2  0x1
+
+ */
+static unsigned short keymap_kip1000(int scancode)
+{
+        switch (scancode) {                             /* phone key:   */
+        case 0x82: return KEY_NUMERIC_0;                /*   0          */
+        case 0x14: return KEY_NUMERIC_1;                /*   1          */
+        case 0x12: return KEY_NUMERIC_2;                /*   2          */
+        case 0x11: return KEY_NUMERIC_3;                /*   3          */
+        case 0x24: return KEY_NUMERIC_4;                /*   4          */
+        case 0x22: return KEY_NUMERIC_5;                /*   5          */
+        case 0x21: return KEY_NUMERIC_6;                /*   6          */
+        case 0x44: return KEY_NUMERIC_7;                /*   7          */
+        case 0x42: return KEY_NUMERIC_8;                /*   8          */
+        case 0x41: return KEY_NUMERIC_9;                /*   9          */
+        case 0x81: return KEY_NUMERIC_POUND;            /*   #          */
+        case 0x84: return KEY_NUMERIC_STAR;             /*   *          */
+        case 0x88: return KEY_ENTER;                    /*   pickup     */
+        case 0x48: return KEY_ESC;                      /*   hangup     */
+        case 0x28: return KEY_LEFT;                     /*   IN         */
+        case 0x18: return KEY_RIGHT;                    /*   OUT        */
+        default:   return special_keymap(scancode);
+        }
+}
+
+/*
+  Contributed by Shaun Jackman <sjackman@gmail.com>
+
+  Genius G-Talk keyboard matrix
+     0 1 2 3
+  4: 0 4 8 Talk
+  5: 1 5 9 End
+  6: 2 6 # Up
+  7: 3 7 * Down
+*/
+static unsigned short keymap_gtalk(int scancode)
+{
+        switch (scancode) {
+        case 0x11: return KEY_NUMERIC_0;
+        case 0x21: return KEY_NUMERIC_1;
+        case 0x41: return KEY_NUMERIC_2;
+        case 0x81: return KEY_NUMERIC_3;
+        case 0x12: return KEY_NUMERIC_4;
+        case 0x22: return KEY_NUMERIC_5;
+        case 0x42: return KEY_NUMERIC_6;
+        case 0x82: return KEY_NUMERIC_7;
+        case 0x14: return KEY_NUMERIC_8;
+        case 0x24: return KEY_NUMERIC_9;
+        case 0x44: return KEY_NUMERIC_POUND;    /* # */
+        case 0x84: return KEY_NUMERIC_STAR;     /* * */
+        case 0x18: return KEY_ENTER;            /* Talk (green handset) */
+        case 0x28: return KEY_ESC;              /* End (red handset) */
+        case 0x48: return KEY_UP;               /* Menu up (rocker switch) */
+        case 0x88: return KEY_DOWN;             /* Menu down (rocker switch) */
+        default:   return special_keymap(scancode);
+        }
+}
+
+/*
+ * Keymap for Allied-Telesis Corega USBPH01
+ * http://www.alliedtelesis-corega.com/2/1344/1437/1360/chprd.html
+ *
+ * Contributed by july@nat.bg
+ */
+static unsigned short keymap_usbph01(int scancode)
+{
+        switch (scancode) {
+        case 0x11: return KEY_NUMERIC_0;                /*   0          */
+        case 0x21: return KEY_NUMERIC_1;                /*   1          */
+        case 0x41: return KEY_NUMERIC_2;                /*   2          */
+        case 0x81: return KEY_NUMERIC_3;                /*   3          */
+        case 0x12: return KEY_NUMERIC_4;                /*   4          */
+        case 0x22: return KEY_NUMERIC_5;                /*   5          */
+        case 0x42: return KEY_NUMERIC_6;                /*   6          */
+        case 0x82: return KEY_NUMERIC_7;                /*   7          */
+        case 0x14: return KEY_NUMERIC_8;                /*   8          */
+        case 0x24: return KEY_NUMERIC_9;                /*   9          */
+        case 0x44: return KEY_NUMERIC_POUND;            /*   #          */
+        case 0x84: return KEY_NUMERIC_STAR;             /*   *          */
+        case 0x18: return KEY_ENTER;                    /*   pickup     */
+        case 0x28: return KEY_ESC;                      /*   hangup     */
+        case 0x48: return KEY_LEFT;                     /*   IN         */
+        case 0x88: return KEY_RIGHT;                    /*   OUT        */
+        default:   return special_keymap(scancode);
+        }
+}
+
+static unsigned short (*keymap)(int) = keymap_kip1000;
+
+/*
+ * Completes a request by converting the data into events for the
+ * input subsystem.
+ */
+static void report_key(struct cm109_dev *dev, int key)
+{
+        struct input_dev *idev = dev->idev;
+
+        if (dev->key_code >= 0) {
+                /* old key up */
+                input_report_key(idev, dev->key_code, 0);
+        }
+
+        dev->key_code = key;
+        if (key >= 0) {
+                /* new valid key */
+                input_report_key(idev, key, 1);
+        }
+
+        input_sync(idev);
+}
+
+/******************************************************************************
+ * CM109 usb communication interface
+ *****************************************************************************/
+
+static void cm109_submit_buzz_toggle(struct cm109_dev *dev)
+{
+        int error;
+
+        if (dev->buzzer_state)
+                dev->ctl_data->byte[HID_OR0] |= BUZZER_ON;
+        else
+                dev->ctl_data->byte[HID_OR0] &= ~BUZZER_ON;
+
+        error = usb_submit_urb(dev->urb_ctl, GFP_ATOMIC);
+        if (error)
+                err("%s: usb_submit_urb (urb_ctl) failed %d", __func__, error);
+}
+
+/*
+ * IRQ handler
+ */
+static void cm109_urb_irq_callback(struct urb *urb)
+{
+        struct cm109_dev *dev = urb->context;
+        const int status = urb->status;
+        int error;
+
+        dev_dbg(&urb->dev->dev, "### URB IRQ: [0x%02x 0x%02x 0x%02x 0x%02x] keybit=0x%02x\n",
+             dev->irq_data->byte[0],
+             dev->irq_data->byte[1],
+             dev->irq_data->byte[2],
+             dev->irq_data->byte[3],
+             dev->keybit);
+
+        if (status) {
+                if (status == -ESHUTDOWN)
+                        return;
+                err("%s: urb status %d", __func__, status);
+        }
+
+        /* Special keys */
+        if (dev->irq_data->byte[HID_IR0] & 0x0f) {
+                const int code = (dev->irq_data->byte[HID_IR0] & 0x0f);
+                report_key(dev, dev->keymap[0xff + code]);
+        }
+
+        /* Scan key column */
+        if (dev->keybit == 0xf) {
+
+                /* Any changes ? */
+                if ((dev->gpi & 0xf0) == (dev->irq_data->byte[HID_IR1] & 0xf0))
+                        goto out;
+
+                dev->gpi = dev->irq_data->byte[HID_IR1] & 0xf0;
+                dev->keybit = 0x1;
+        } else {
+                report_key(dev, dev->keymap[dev->irq_data->byte[HID_IR1]]);
+
+                dev->keybit <<= 1;
+                if (dev->keybit > 0x8)
+                        dev->keybit = 0xf;
+        }
+
+ out:
+
+        spin_lock(&dev->ctl_submit_lock);
+
+        dev->irq_urb_pending = 0;
+
+        if (likely(!dev->shutdown)) {
+
+                if (dev->buzzer_state)
+                        dev->ctl_data->byte[HID_OR0] |= BUZZER_ON;
+                else
+                        dev->ctl_data->byte[HID_OR0] &= ~BUZZER_ON;
+
+                dev->ctl_data->byte[HID_OR1] = dev->keybit;
+                dev->ctl_data->byte[HID_OR2] = dev->keybit;
+
+                dev->buzzer_pending = 0;
+                dev->ctl_urb_pending = 1;
+
+                error = usb_submit_urb(dev->urb_ctl, GFP_ATOMIC);
+                if (error)
+                        err("%s: usb_submit_urb (urb_ctl) failed %d",
+                                __func__, error);
+        }
+
+        spin_unlock(&dev->ctl_submit_lock);
+}
+
+static void cm109_urb_ctl_callback(struct urb *urb)
+{
+        struct cm109_dev *dev = urb->context;
+        const int status = urb->status;
+        int error;
+
+        dev_dbg(&urb->dev->dev, "### URB CTL: [0x%02x 0x%02x 0x%02x 0x%02x]\n",
+             dev->ctl_data->byte[0],
+             dev->ctl_data->byte[1],
+             dev->ctl_data->byte[2],
+             dev->ctl_data->byte[3]);
+
+        if (status)
+                err("%s: urb status %d", __func__, status);
+
+        spin_lock(&dev->ctl_submit_lock);
+
+        dev->ctl_urb_pending = 0;
+
+        if (likely(!dev->shutdown)) {
+
+                if (dev->buzzer_pending) {
+                        dev->buzzer_pending = 0;
+                        dev->ctl_urb_pending = 1;
+                        cm109_submit_buzz_toggle(dev);
+                } else if (likely(!dev->irq_urb_pending)) {
+                        /* ask for key data */
+                        dev->irq_urb_pending = 1;
+                        error = usb_submit_urb(dev->urb_irq, GFP_ATOMIC);
+                        if (error)
+                                err("%s: usb_submit_urb (urb_irq) failed %d",
+                                        __func__, error);
+                }
+        }
+
+        spin_unlock(&dev->ctl_submit_lock);
+}
+
+static void cm109_toggle_buzzer_async(struct cm109_dev *dev)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&dev->ctl_submit_lock, flags);
+
+        if (dev->ctl_urb_pending) {
+                /* URB completion will resubmit */
+                dev->buzzer_pending = 1;
+        } else {
+                dev->ctl_urb_pending = 1;
+                cm109_submit_buzz_toggle(dev);
+        }
+
+        spin_unlock_irqrestore(&dev->ctl_submit_lock, flags);
+}
+
+static void cm109_toggle_buzzer_sync(struct cm109_dev *dev, int on)
+{
+        int error;
+
+        if (on)
+                dev->ctl_data->byte[HID_OR0] |= BUZZER_ON;
+        else
+                dev->ctl_data->byte[HID_OR0] &= ~BUZZER_ON;
+
+        error = usb_control_msg(dev->udev,
+                                usb_sndctrlpipe(dev->udev, 0),
+                                dev->ctl_req->bRequest,
+                                dev->ctl_req->bRequestType,
+                                le16_to_cpu(dev->ctl_req->wValue),
+                                le16_to_cpu(dev->ctl_req->wIndex),
+                                dev->ctl_data,
+                                USB_PKT_LEN, USB_CTRL_SET_TIMEOUT);
+        if (error && error != EINTR)
+                err("%s: usb_control_msg() failed %d", __func__, error);
+}
+
+static void cm109_stop_traffic(struct cm109_dev *dev)
+{
+        dev->shutdown = 1;
+        /*
+         * Make sure other CPUs see this
+         */
+        smp_wmb();
+
+        usb_kill_urb(dev->urb_ctl);
+        usb_kill_urb(dev->urb_irq);
+
+        cm109_toggle_buzzer_sync(dev, 0);
+
+        dev->shutdown = 0;
+        smp_wmb();
+}
+
+static void cm109_restore_state(struct cm109_dev *dev)
+{
+        if (dev->open) {
+                /*
+                 * Restore buzzer state.
+                 * This will also kick regular URB submission
+                 */
+                cm109_toggle_buzzer_async(dev);
+        }
+}
+
+/******************************************************************************
+ * input event interface
+ *****************************************************************************/
+
+static int cm109_input_open(struct input_dev *idev)
+{
+        struct cm109_dev *dev = input_get_drvdata(idev);
+        int error;
+
+        error = usb_autopm_get_interface(dev->intf);
+        if (error < 0) {
+                err("%s - cannot autoresume, result %d",
+                    __func__, error);
+                return error;
+        }
+
+        mutex_lock(&dev->pm_mutex);
+
+        dev->buzzer_state = 0;
+        dev->key_code = -1;     /* no keys pressed */
+        dev->keybit = 0xf;
+
+        /* issue INIT */
+        dev->ctl_data->byte[HID_OR0] = HID_OR_GPO_BUZ_SPDIF;
+        dev->ctl_data->byte[HID_OR1] = dev->keybit;
+        dev->ctl_data->byte[HID_OR2] = dev->keybit;
+        dev->ctl_data->byte[HID_OR3] = 0x00;
+
+        error = usb_submit_urb(dev->urb_ctl, GFP_KERNEL);
+        if (error)
+                err("%s: usb_submit_urb (urb_ctl) failed %d", __func__, error);
+        else
+                dev->open = 1;
+
+        mutex_unlock(&dev->pm_mutex);
+
+        if (error)
+                usb_autopm_put_interface(dev->intf);
+
+        return error;
+}
+
+static void cm109_input_close(struct input_dev *idev)
+{
+        struct cm109_dev *dev = input_get_drvdata(idev);
+
+        mutex_lock(&dev->pm_mutex);
+
+        /*
+         * Once we are here event delivery is stopped so we
+         * don't need to worry about someone starting buzzer
+         * again
+         */
+        cm109_stop_traffic(dev);
+        dev->open = 0;
+
+        mutex_unlock(&dev->pm_mutex);
+
+        usb_autopm_put_interface(dev->intf);
+}
+
+static int cm109_input_ev(struct input_dev *idev, unsigned int type,
+                          unsigned int code, int value)
+{
+        struct cm109_dev *dev = input_get_drvdata(idev);
+
+        dev_dbg(&dev->udev->dev,
+                "input_ev: type=%u code=%u value=%d\n", type, code, value);
+
+        if (type != EV_SND)
+                return -EINVAL;
+
+        switch (code) {
+        case SND_TONE:
+        case SND_BELL:
+                dev->buzzer_state = !!value;
+                if (!dev->resetting)
+                        cm109_toggle_buzzer_async(dev);
+                return 0;
+
+        default:
+                return -EINVAL;
+        }
+}
+
+
+/******************************************************************************
+ * Linux interface and usb initialisation
+ *****************************************************************************/
+
+struct driver_info {
+        char *name;
+};
+
+static const struct driver_info info_cm109 = {
+        .name = "CM109 USB driver",
+};
+
+enum {
+        VENDOR_ID        = 0x0d8c, /* C-Media Electronics */
+        PRODUCT_ID_CM109 = 0x000e, /* CM109 defines range 0x0008 - 0x000f */
+};
+
+/* table of devices that work with this driver */
+static const struct usb_device_id cm109_usb_table[] = {
+        {
+                .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
+                                USB_DEVICE_ID_MATCH_INT_INFO,
+                .idVendor = VENDOR_ID,
+                .idProduct = PRODUCT_ID_CM109,
+                .bInterfaceClass = USB_CLASS_HID,
+                .bInterfaceSubClass = 0,
+                .bInterfaceProtocol = 0,
+                .driver_info = (kernel_ulong_t) &info_cm109
+        },
+        /* you can add more devices here with product ID 0x0008 - 0x000f */
+        { }
+};
+
+static void cm109_usb_cleanup(struct cm109_dev *dev)
+{
+        if (dev->ctl_req)
+                usb_buffer_free(dev->udev, sizeof(*(dev->ctl_req)),
+                                dev->ctl_req, dev->ctl_req_dma);
+        if (dev->ctl_data)
+                usb_buffer_free(dev->udev, USB_PKT_LEN,
+                                dev->ctl_data, dev->ctl_dma);
+        if (dev->irq_data)
+                usb_buffer_free(dev->udev, USB_PKT_LEN,
+                                dev->irq_data, dev->irq_dma);
+
+        usb_free_urb(dev->urb_irq);     /* parameter validation in core/urb */
+        usb_free_urb(dev->urb_ctl);     /* parameter validation in core/urb */
+        kfree(dev);
+}
+
+static void cm109_usb_disconnect(struct usb_interface *interface)
+{
+        struct cm109_dev *dev = usb_get_intfdata(interface);
+
+        usb_set_intfdata(interface, NULL);
+        input_unregister_device(dev->idev);
+        cm109_usb_cleanup(dev);
+}
+
+static int cm109_usb_probe(struct usb_interface *intf,
+                           const struct usb_device_id *id)
+{
+        struct usb_device *udev = interface_to_usbdev(intf);
+        struct driver_info *nfo = (struct driver_info *)id->driver_info;
+        struct usb_host_interface *interface;
+        struct usb_endpoint_descriptor *endpoint;
+        struct cm109_dev *dev;
+        struct input_dev *input_dev = NULL;
+        int ret, pipe, i;
+        int error = -ENOMEM;
+
+        interface = intf->cur_altsetting;
+        endpoint = &interface->endpoint[0].desc;
+
+        if (!usb_endpoint_is_int_in(endpoint))
+                return -ENODEV;
+
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+        if (!dev)
+                return -ENOMEM;
+
+        spin_lock_init(&dev->ctl_submit_lock);
+        mutex_init(&dev->pm_mutex);
+
+        dev->udev = udev;
+        dev->intf = intf;
+
+        dev->idev = input_dev = input_allocate_device();
+        if (!input_dev)
+                goto err_out;
+
+        /* allocate usb buffers */
+        dev->irq_data = usb_buffer_alloc(udev, USB_PKT_LEN,
+                                         GFP_KERNEL, &dev->irq_dma);
+        if (!dev->irq_data)
+                goto err_out;
+
+        dev->ctl_data = usb_buffer_alloc(udev, USB_PKT_LEN,
+                                         GFP_KERNEL, &dev->ctl_dma);
+        if (!dev->ctl_data)
+                goto err_out;
+
+        dev->ctl_req = usb_buffer_alloc(udev, sizeof(*(dev->ctl_req)),
+                                        GFP_KERNEL, &dev->ctl_req_dma);
+        if (!dev->ctl_req)
+                goto err_out;
+
+        /* allocate urb structures */
+        dev->urb_irq = usb_alloc_urb(0, GFP_KERNEL);
+        if (!dev->urb_irq)
+                goto err_out;
+
+        dev->urb_ctl = usb_alloc_urb(0, GFP_KERNEL);
+        if (!dev->urb_ctl)
+                goto err_out;
+
+        /* get a handle to the interrupt data pipe */
+        pipe = usb_rcvintpipe(udev, endpoint->bEndpointAddress);
+        ret = usb_maxpacket(udev, pipe, usb_pipeout(pipe));
+        if (ret != USB_PKT_LEN)
+                err("invalid payload size %d, expected %d", ret, USB_PKT_LEN);
+
+        /* initialise irq urb */
+        usb_fill_int_urb(dev->urb_irq, udev, pipe, dev->irq_data,
+                         USB_PKT_LEN,
+                         cm109_urb_irq_callback, dev, endpoint->bInterval);
+        dev->urb_irq->transfer_dma = dev->irq_dma;
+        dev->urb_irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
+        dev->urb_irq->dev = udev;
+
+        /* initialise ctl urb */
+        dev->ctl_req->bRequestType = USB_TYPE_CLASS | USB_RECIP_INTERFACE |
+                                        USB_DIR_OUT;
+        dev->ctl_req->bRequest = USB_REQ_SET_CONFIGURATION;
+        dev->ctl_req->wValue = cpu_to_le16(0x200);
+        dev->ctl_req->wIndex = cpu_to_le16(interface->desc.bInterfaceNumber);
+        dev->ctl_req->wLength = cpu_to_le16(USB_PKT_LEN);
+
+        usb_fill_control_urb(dev->urb_ctl, udev, usb_sndctrlpipe(udev, 0),
+                             (void *)dev->ctl_req, dev->ctl_data, USB_PKT_LEN,
+                             cm109_urb_ctl_callback, dev);
+        dev->urb_ctl->setup_dma = dev->ctl_req_dma;
+        dev->urb_ctl->transfer_dma = dev->ctl_dma;
+        dev->urb_ctl->transfer_flags |= URB_NO_SETUP_DMA_MAP |
+                                        URB_NO_TRANSFER_DMA_MAP;
+        dev->urb_ctl->dev = udev;
+
+        /* find out the physical bus location */
+        usb_make_path(udev, dev->phys, sizeof(dev->phys));
+        strlcat(dev->phys, "/input0", sizeof(dev->phys));
+
+        /* register settings for the input device */
+        input_dev->name = nfo->name;
+        input_dev->phys = dev->phys;
+        usb_to_input_id(udev, &input_dev->id);
+        input_dev->dev.parent = &intf->dev;
+
+        input_set_drvdata(input_dev, dev);
+        input_dev->open = cm109_input_open;
+        input_dev->close = cm109_input_close;
+        input_dev->event = cm109_input_ev;
+
+        input_dev->keycode = dev->keymap;
+        input_dev->keycodesize = sizeof(unsigned char);
+        input_dev->keycodemax = ARRAY_SIZE(dev->keymap);
+
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_SND);
+        input_dev->sndbit[0] = BIT_MASK(SND_BELL) | BIT_MASK(SND_TONE);
+
+        /* register available key events */
+        for (i = 0; i < KEYMAP_SIZE; i++) {
+                unsigned short k = keymap(i);
+                dev->keymap[i] = k;
+                __set_bit(k, input_dev->keybit);
+        }
+        __clear_bit(KEY_RESERVED, input_dev->keybit);
+
+        error = input_register_device(dev->idev);
+        if (error)
+                goto err_out;
+
+        usb_set_intfdata(intf, dev);
+
+        return 0;
+
+ err_out:
+        input_free_device(input_dev);
+        cm109_usb_cleanup(dev);
+        return error;
+}
+
+static int cm109_usb_suspend(struct usb_interface *intf, pm_message_t message)
+{
+        struct cm109_dev *dev = usb_get_intfdata(intf);
+
+        dev_info(&intf->dev, "cm109: usb_suspend (event=%d)\n", message.event);
+
+        mutex_lock(&dev->pm_mutex);
+        cm109_stop_traffic(dev);
+        mutex_unlock(&dev->pm_mutex);
+
+        return 0;
+}
+
+static int cm109_usb_resume(struct usb_interface *intf)
+{
+        struct cm109_dev *dev = usb_get_intfdata(intf);
+
+        dev_info(&intf->dev, "cm109: usb_resume\n");
+
+        mutex_lock(&dev->pm_mutex);
+        cm109_restore_state(dev);
+        mutex_unlock(&dev->pm_mutex);
+
+        return 0;
+}
+
+static int cm109_usb_pre_reset(struct usb_interface *intf)
+{
+        struct cm109_dev *dev = usb_get_intfdata(intf);
+
+        mutex_lock(&dev->pm_mutex);
+
+        /*
+         * Make sure input events don't try to toggle buzzer
+         * while we are resetting
+         */
+        dev->resetting = 1;
+        smp_wmb();
+
+        cm109_stop_traffic(dev);
+
+        return 0;
+}
+
+static int cm109_usb_post_reset(struct usb_interface *intf)
+{
+        struct cm109_dev *dev = usb_get_intfdata(intf);
+
+        dev->resetting = 0;
+        smp_wmb();
+
+        cm109_restore_state(dev);
+
+        mutex_unlock(&dev->pm_mutex);
+
+        return 0;
+}
+
+static struct usb_driver cm109_driver = {
+        .name           = "cm109",
+        .probe          = cm109_usb_probe,
+        .disconnect     = cm109_usb_disconnect,
+        .suspend        = cm109_usb_suspend,
+        .resume         = cm109_usb_resume,
+        .reset_resume   = cm109_usb_resume,
+        .pre_reset      = cm109_usb_pre_reset,
+        .post_reset     = cm109_usb_post_reset,
+        .id_table       = cm109_usb_table,
+        .supports_autosuspend = 1,
+};
+
+static int __init cm109_select_keymap(void)
+{
+        /* Load the phone keymap */
+        if (!strcasecmp(phone, "kip1000")) {
+                keymap = keymap_kip1000;
+                printk(KERN_INFO KBUILD_MODNAME ": "
+                        "Keymap for Komunikate KIP1000 phone loaded\n");
+        } else if (!strcasecmp(phone, "gtalk")) {
+                keymap = keymap_gtalk;
+                printk(KERN_INFO KBUILD_MODNAME ": "
+                        "Keymap for Genius G-talk phone loaded\n");
+        } else if (!strcasecmp(phone, "usbph01")) {
+                keymap = keymap_usbph01;
+                printk(KERN_INFO KBUILD_MODNAME ": "
+                        "Keymap for Allied-Telesis Corega USBPH01 phone loaded\n");
+        } else {
+                printk(KERN_ERR KBUILD_MODNAME ": "
+                        "Unsupported phone: %s\n", phone);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int __init cm109_init(void)
+{
+        int err;
+
+        err = cm109_select_keymap();
+        if (err)
+                return err;
+
+        err = usb_register(&cm109_driver);
+        if (err)
+                return err;
+
+        printk(KERN_INFO KBUILD_MODNAME ": "
+                DRIVER_DESC ": " DRIVER_VERSION " (C) " DRIVER_AUTHOR "\n");
+
+        return 0;
+}
+
+static void __exit cm109_exit(void)
+{
+        usb_deregister(&cm109_driver);
+}
+
+module_init(cm109_init);
+module_exit(cm109_exit);
+
+MODULE_DEVICE_TABLE(usb, cm109_usb_table);
+
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c
index daa9d4220331..82ec6b1b6467 100644
--- a/drivers/input/misc/hp_sdc_rtc.c
+++ b/drivers/input/misc/hp_sdc_rtc.c
@@ -458,35 +458,35 @@ static int hp_sdc_rtc_proc_output (char *buf)
                 p += sprintf(p, "i8042 rtc\t: READ FAILED!\n");
         } else {
                 p += sprintf(p, "i8042 rtc\t: %ld.%02d seconds\n", 
-                             tv.tv_sec, tv.tv_usec/1000);
+                             tv.tv_sec, (int)tv.tv_usec/1000);
         }
 
         if (hp_sdc_rtc_read_fhs(&tv)) {
                 p += sprintf(p, "handshake\t: READ FAILED!\n");
         } else {
                 p += sprintf(p, "handshake\t: %ld.%02d seconds\n", 
-                             tv.tv_sec, tv.tv_usec/1000);
+                             tv.tv_sec, (int)tv.tv_usec/1000);
         }
 
         if (hp_sdc_rtc_read_mt(&tv)) {
                 p += sprintf(p, "alarm\t\t: READ FAILED!\n");
         } else {
                 p += sprintf(p, "alarm\t\t: %ld.%02d seconds\n", 
-                             tv.tv_sec, tv.tv_usec/1000);
+                             tv.tv_sec, (int)tv.tv_usec/1000);
         }
 
         if (hp_sdc_rtc_read_dt(&tv)) {
                 p += sprintf(p, "delay\t\t: READ FAILED!\n");
         } else {
                 p += sprintf(p, "delay\t\t: %ld.%02d seconds\n", 
-                             tv.tv_sec, tv.tv_usec/1000);
+                             tv.tv_sec, (int)tv.tv_usec/1000);
         }
 
         if (hp_sdc_rtc_read_ct(&tv)) {
                 p += sprintf(p, "periodic\t: READ FAILED!\n");
         } else {
                 p += sprintf(p, "periodic\t: %ld.%02d seconds\n", 
-                             tv.tv_sec, tv.tv_usec/1000);
+                             tv.tv_sec, (int)tv.tv_usec/1000);
         }
 
         p += sprintf(p,
diff --git a/drivers/input/misc/map_to_7segment.h b/drivers/input/misc/map_to_7segment.h
deleted file mode 100644
index a424094d9fe2..000000000000
--- a/drivers/input/misc/map_to_7segment.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * drivers/usb/input/map_to_7segment.h
- *
- * Copyright (c) 2005 Henk Vergonet <Henk.Vergonet@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 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
- */
-
-#ifndef MAP_TO_7SEGMENT_H
-#define MAP_TO_7SEGMENT_H
-
-/* This file provides translation primitives and tables for the conversion
- * of (ASCII) characters to a 7-segments notation.
- *
- * The 7 segment's wikipedia notation below is used as standard.
- * See: http://en.wikipedia.org/wiki/Seven_segment_display
- *
- * Notation:    +-a-+
- *              f   b
- *              +-g-+
- *              e   c
- *              +-d-+
- *
- * Usage:
- *
- *   Register a map variable, and fill it with a character set:
- *      static SEG7_DEFAULT_MAP(map_seg7);
- *
- *
- *   Then use for conversion:
- *      seg7 = map_to_seg7(&map_seg7, some_char);
- *      ...
- *
- * In device drivers it is recommended, if required, to make the char map
- * accessible via the sysfs interface using the following scheme:
- *
- * static ssize_t show_map(struct device *dev, char *buf) {
- *      memcpy(buf, &map_seg7, sizeof(map_seg7));
- *      return sizeof(map_seg7);
- * }
- * static ssize_t store_map(struct device *dev, const char *buf, size_t cnt) {
- *      if(cnt != sizeof(map_seg7))
- *              return -EINVAL;
- *      memcpy(&map_seg7, buf, cnt);
- *      return cnt;
- * }
- * static DEVICE_ATTR(map_seg7, PERMS_RW, show_map, store_map);
- *
- * History:
- * 2005-05-31   RFC linux-kernel@vger.kernel.org
- */
-#include <linux/errno.h>
-
-
-#define BIT_SEG7_A              0
-#define BIT_SEG7_B              1
-#define BIT_SEG7_C              2
-#define BIT_SEG7_D              3
-#define BIT_SEG7_E              4
-#define BIT_SEG7_F              5
-#define BIT_SEG7_G              6
-#define BIT_SEG7_RESERVED       7
-
-struct seg7_conversion_map {
-        unsigned char   table[128];
-};
-
-static inline int map_to_seg7(struct seg7_conversion_map *map, int c)
-{
-        return c >= 0 && c < sizeof(map->table) ? map->table[c] : -EINVAL;
-}
-
-#define SEG7_CONVERSION_MAP(_name, _map)        \
-        struct seg7_conversion_map _name = { .table = { _map } }
-
-/*
- * It is recommended to use a facility that allows user space to redefine
- * custom character sets for LCD devices. Please use a sysfs interface
- * as described above.
- */
-#define MAP_TO_SEG7_SYSFS_FILE  "map_seg7"
-
-/*******************************************************************************
- * ASCII conversion table
- ******************************************************************************/
-
-#define _SEG7(l,a,b,c,d,e,f,g)  \
-      ( a<<BIT_SEG7_A | b<<BIT_SEG7_B | c<<BIT_SEG7_C | d<<BIT_SEG7_D | \
-        e<<BIT_SEG7_E | f<<BIT_SEG7_F | g<<BIT_SEG7_G )
-
-#define _MAP_0_32_ASCII_SEG7_NON_PRINTABLE      \
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-
-#define _MAP_33_47_ASCII_SEG7_SYMBOL            \
- _SEG7('!',0,0,0,0,1,1,0), _SEG7('"',0,1,0,0,0,1,0), _SEG7('#',0,1,1,0,1,1,0),\
- _SEG7('$',1,0,1,1,0,1,1), _SEG7('%',0,0,1,0,0,1,0), _SEG7('&',1,0,1,1,1,1,1),\
- _SEG7('\'',0,0,0,0,0,1,0),_SEG7('(',1,0,0,1,1,1,0), _SEG7(')',1,1,1,1,0,0,0),\
- _SEG7('*',0,1,1,0,1,1,1), _SEG7('+',0,1,1,0,0,0,1), _SEG7(',',0,0,0,0,1,0,0),\
- _SEG7('-',0,0,0,0,0,0,1), _SEG7('.',0,0,0,0,1,0,0), _SEG7('/',0,1,0,0,1,0,1),
-
-#define _MAP_48_57_ASCII_SEG7_NUMERIC           \
- _SEG7('0',1,1,1,1,1,1,0), _SEG7('1',0,1,1,0,0,0,0), _SEG7('2',1,1,0,1,1,0,1),\
- _SEG7('3',1,1,1,1,0,0,1), _SEG7('4',0,1,1,0,0,1,1), _SEG7('5',1,0,1,1,0,1,1),\
- _SEG7('6',1,0,1,1,1,1,1), _SEG7('7',1,1,1,0,0,0,0), _SEG7('8',1,1,1,1,1,1,1),\
- _SEG7('9',1,1,1,1,0,1,1),
-
-#define _MAP_58_64_ASCII_SEG7_SYMBOL            \
- _SEG7(':',0,0,0,1,0,0,1), _SEG7(';',0,0,0,1,0,0,1), _SEG7('<',1,0,0,0,0,1,1),\
- _SEG7('=',0,0,0,1,0,0,1), _SEG7('>',1,1,0,0,0,0,1), _SEG7('?',1,1,1,0,0,1,0),\
- _SEG7('@',1,1,0,1,1,1,1),
-
-#define _MAP_65_90_ASCII_SEG7_ALPHA_UPPR        \
- _SEG7('A',1,1,1,0,1,1,1), _SEG7('B',1,1,1,1,1,1,1), _SEG7('C',1,0,0,1,1,1,0),\
- _SEG7('D',1,1,1,1,1,1,0), _SEG7('E',1,0,0,1,1,1,1), _SEG7('F',1,0,0,0,1,1,1),\
- _SEG7('G',1,1,1,1,0,1,1), _SEG7('H',0,1,1,0,1,1,1), _SEG7('I',0,1,1,0,0,0,0),\
- _SEG7('J',0,1,1,1,0,0,0), _SEG7('K',0,1,1,0,1,1,1), _SEG7('L',0,0,0,1,1,1,0),\
- _SEG7('M',1,1,1,0,1,1,0), _SEG7('N',1,1,1,0,1,1,0), _SEG7('O',1,1,1,1,1,1,0),\
- _SEG7('P',1,1,0,0,1,1,1), _SEG7('Q',1,1,1,1,1,1,0), _SEG7('R',1,1,1,0,1,1,1),\
- _SEG7('S',1,0,1,1,0,1,1), _SEG7('T',0,0,0,1,1,1,1), _SEG7('U',0,1,1,1,1,1,0),\
- _SEG7('V',0,1,1,1,1,1,0), _SEG7('W',0,1,1,1,1,1,1), _SEG7('X',0,1,1,0,1,1,1),\
- _SEG7('Y',0,1,1,0,0,1,1), _SEG7('Z',1,1,0,1,1,0,1),
-
-#define _MAP_91_96_ASCII_SEG7_SYMBOL            \
- _SEG7('[',1,0,0,1,1,1,0), _SEG7('\\',0,0,1,0,0,1,1),_SEG7(']',1,1,1,1,0,0,0),\
- _SEG7('^',1,1,0,0,0,1,0), _SEG7('_',0,0,0,1,0,0,0), _SEG7('`',0,1,0,0,0,0,0),
-
-#define _MAP_97_122_ASCII_SEG7_ALPHA_LOWER      \
- _SEG7('A',1,1,1,0,1,1,1), _SEG7('b',0,0,1,1,1,1,1), _SEG7('c',0,0,0,1,1,0,1),\
- _SEG7('d',0,1,1,1,1,0,1), _SEG7('E',1,0,0,1,1,1,1), _SEG7('F',1,0,0,0,1,1,1),\
- _SEG7('G',1,1,1,1,0,1,1), _SEG7('h',0,0,1,0,1,1,1), _SEG7('i',0,0,1,0,0,0,0),\
- _SEG7('j',0,0,1,1,0,0,0), _SEG7('k',0,0,1,0,1,1,1), _SEG7('L',0,0,0,1,1,1,0),\
- _SEG7('M',1,1,1,0,1,1,0), _SEG7('n',0,0,1,0,1,0,1), _SEG7('o',0,0,1,1,1,0,1),\
- _SEG7('P',1,1,0,0,1,1,1), _SEG7('q',1,1,1,0,0,1,1), _SEG7('r',0,0,0,0,1,0,1),\
- _SEG7('S',1,0,1,1,0,1,1), _SEG7('T',0,0,0,1,1,1,1), _SEG7('u',0,0,1,1,1,0,0),\
- _SEG7('v',0,0,1,1,1,0,0), _SEG7('W',0,1,1,1,1,1,1), _SEG7('X',0,1,1,0,1,1,1),\
- _SEG7('y',0,1,1,1,0,1,1), _SEG7('Z',1,1,0,1,1,0,1),
-
-#define _MAP_123_126_ASCII_SEG7_SYMBOL          \
- _SEG7('{',1,0,0,1,1,1,0), _SEG7('|',0,0,0,0,1,1,0), _SEG7('}',1,1,1,1,0,0,0),\
- _SEG7('~',1,0,0,0,0,0,0),
-
-/* Maps */
-
-/* This set tries to map as close as possible to the visible characteristics
- * of the ASCII symbol, lowercase and uppercase letters may differ in
- * presentation on the display.
- */
-#define MAP_ASCII7SEG_ALPHANUM                  \
-        _MAP_0_32_ASCII_SEG7_NON_PRINTABLE      \
-        _MAP_33_47_ASCII_SEG7_SYMBOL            \
-        _MAP_48_57_ASCII_SEG7_NUMERIC           \
-        _MAP_58_64_ASCII_SEG7_SYMBOL            \
-        _MAP_65_90_ASCII_SEG7_ALPHA_UPPR        \
-        _MAP_91_96_ASCII_SEG7_SYMBOL            \
-        _MAP_97_122_ASCII_SEG7_ALPHA_LOWER      \
-        _MAP_123_126_ASCII_SEG7_SYMBOL
-
-/* This set tries to map as close as possible to the symbolic characteristics
- * of the ASCII character for maximum discrimination.
- * For now this means all alpha chars are in lower case representations.
- * (This for example facilitates the use of hex numbers with uppercase input.)
- */
-#define MAP_ASCII7SEG_ALPHANUM_LC                       \
-        _MAP_0_32_ASCII_SEG7_NON_PRINTABLE      \
-        _MAP_33_47_ASCII_SEG7_SYMBOL            \
-        _MAP_48_57_ASCII_SEG7_NUMERIC           \
-        _MAP_58_64_ASCII_SEG7_SYMBOL            \
-        _MAP_97_122_ASCII_SEG7_ALPHA_LOWER      \
-        _MAP_91_96_ASCII_SEG7_SYMBOL            \
-        _MAP_97_122_ASCII_SEG7_ALPHA_LOWER      \
-        _MAP_123_126_ASCII_SEG7_SYMBOL
-
-#define SEG7_DEFAULT_MAP(_name)         \
-        SEG7_CONVERSION_MAP(_name,MAP_ASCII7SEG_ALPHANUM)
-
-#endif  /* MAP_TO_7SEGMENT_H */
-
diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c
index fe268be3293b..7c8957dd22c0 100644
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
@@ -277,6 +277,16 @@ static struct key_entry keymap_fs_amilo_pro_v2000[] __initdata = {
         { KE_END,  0 }
 };
 
+static struct key_entry keymap_fs_amilo_pro_v3505[] __initdata = {
+        { KE_KEY,       0x01, {KEY_HELP} },          /* Fn+F1 */
+        { KE_KEY,       0x06, {KEY_DISPLAYTOGGLE} }, /* Fn+F4 */
+        { KE_BLUETOOTH, 0x30 },                      /* Fn+F10 */
+        { KE_KEY,       0x31, {KEY_MAIL} },          /* mail button */
+        { KE_KEY,       0x36, {KEY_WWW} },           /* www button */
+        { KE_WIFI,      0x78 },                      /* satelite dish button */
+        { KE_END,       0 }
+};
+
 static struct key_entry keymap_fujitsu_n3510[] __initdata = {
         { KE_KEY, 0x11, {KEY_PROG1} },
         { KE_KEY, 0x12, {KEY_PROG2} },
@@ -618,6 +628,15 @@ static struct dmi_system_id dmi_ids[] __initdata = {
         },
         {
                 .callback = dmi_matched,
+                .ident = "Fujitsu-Siemens Amilo Pro Edition V3505",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pro Edition V3505"),
+                },
+                .driver_data = keymap_fs_amilo_pro_v3505
+        },
+        {
+                .callback = dmi_matched,
                 .ident = "Fujitsu-Siemens Amilo M7400",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
diff --git a/drivers/input/misc/yealink.c b/drivers/input/misc/yealink.c
index facefd3dba29..11b5c7e84ed1 100644
--- a/drivers/input/misc/yealink.c
+++ b/drivers/input/misc/yealink.c
@@ -52,8 +52,8 @@
 #include <linux/module.h>
 #include <linux/rwsem.h>
 #include <linux/usb/input.h>
+#include <linux/map_to_7segment.h>
 
-#include "map_to_7segment.h"
 #include "yealink.h"
 
 #define DRIVER_VERSION "yld-20051230"
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index f996546fc443..f488b6852baf 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -96,6 +96,16 @@ config MOUSE_PS2_TOUCHKIT
 
           If unsure, say N.
 
+config MOUSE_PS2_OLPC
+        bool "OLPC PS/2 mouse protocol extension"
+        depends on MOUSE_PS2 && OLPC
+        help
+          Say Y here if you have an OLPC XO-1 laptop (with built-in
+          PS/2 touchpad/tablet device).  The manufacturer calls the
+          touchpad an HGPK.
+
+          If unsure, say N.
+
 config MOUSE_SERIAL
         tristate "Serial mouse"
         select SERIO
diff --git a/drivers/input/mouse/Makefile b/drivers/input/mouse/Makefile
index d4d202516090..8e6e69097801 100644
--- a/drivers/input/mouse/Makefile
+++ b/drivers/input/mouse/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_MOUSE_GPIO)	+= gpio_mouse.o
 psmouse-objs := psmouse-base.o synaptics.o
 
 psmouse-$(CONFIG_MOUSE_PS2_ALPS)        += alps.o
+psmouse-$(CONFIG_MOUSE_PS2_OLPC)        += hgpk.o
 psmouse-$(CONFIG_MOUSE_PS2_LOGIPS2PP)   += logips2pp.o
 psmouse-$(CONFIG_MOUSE_PS2_LIFEBOOK)    += lifebook.o
 psmouse-$(CONFIG_MOUSE_PS2_TRACKPOINT)  += trackpoint.o
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 385e32bcf6a6..cbedf957cc58 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -54,6 +54,7 @@ static const struct alps_model_info alps_model_data[] = {
         { { 0x20, 0x02, 0x0e }, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT }, /* XXX */
         { { 0x22, 0x02, 0x0a }, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT },
         { { 0x22, 0x02, 0x14 }, 0xff, 0xff, ALPS_PASS | ALPS_DUALPOINT }, /* Dell Latitude D600 */
+        { { 0x62, 0x02, 0x14 }, 0xcf, 0xcf, ALPS_PASS | ALPS_DUALPOINT }, /* Dell Latitude E6500 */
         { { 0x73, 0x02, 0x50 }, 0xcf, 0xcf, ALPS_FW_BK_1 } /* Dell Vostro 1400 */
 };
 
diff --git a/drivers/input/mouse/appletouch.c b/drivers/input/mouse/appletouch.c
index 1f41ae94f26b..079816e6b23b 100644
--- a/drivers/input/mouse/appletouch.c
+++ b/drivers/input/mouse/appletouch.c
@@ -136,12 +136,28 @@ MODULE_DEVICE_TABLE(usb, atp_table);
 #define ATP_GEYSER_MODE_REQUEST_INDEX           0
 #define ATP_GEYSER_MODE_VENDOR_VALUE            0x04
 
+/**
+ * enum atp_status_bits - status bit meanings
+ *
+ * These constants represent the meaning of the status bits.
+ * (only Geyser 3/4)
+ *
+ * @ATP_STATUS_BUTTON: The button was pressed
+ * @ATP_STATUS_BASE_UPDATE: Update of the base values (untouched pad)
+ * @ATP_STATUS_FROM_RESET: Reset previously performed
+ */
+enum atp_status_bits {
+        ATP_STATUS_BUTTON       = BIT(0),
+        ATP_STATUS_BASE_UPDATE  = BIT(2),
+        ATP_STATUS_FROM_RESET   = BIT(4),
+};
+
 /* Structure to hold all of our device specific stuff */
 struct atp {
         char                    phys[64];
         struct usb_device       *udev;          /* usb device */
         struct urb              *urb;           /* usb request block */
-        signed char             *data;          /* transferred data */
+        u8                      *data;          /* transferred data */
         struct input_dev        *input;         /* input dev */
         enum atp_touchpad_type  type;           /* type of touchpad */
         bool                    open;
@@ -251,8 +267,6 @@ static void atp_reinit(struct work_struct *work)
         int retval;
 
         dprintk("appletouch: putting appletouch to sleep (reinit)\n");
-        dev->idlecount = 0;
-
         atp_geyser_init(udev);
 
         retval = usb_submit_urb(dev->urb, GFP_ATOMIC);
@@ -327,11 +341,14 @@ static inline void atp_report_fingers(struct input_dev *input, int fingers)
         input_report_key(input, BTN_TOOL_TRIPLETAP, fingers > 2);
 }
 
-static void atp_complete(struct urb *urb)
+/* Check URB status and for correct length of data package */
+
+#define ATP_URB_STATUS_SUCCESS          0
+#define ATP_URB_STATUS_ERROR            1
+#define ATP_URB_STATUS_ERROR_FATAL      2
+
+static int atp_status_check(struct urb *urb)
 {
-        int x, y, x_z, y_z, x_f, y_f;
-        int retval, i, j;
-        int key;
         struct atp *dev = urb->context;
 
         switch (urb->status) {
@@ -351,11 +368,12 @@ static void atp_complete(struct urb *urb)
                 /* This urb is terminated, clean up */
                 dbg("atp_complete: urb shutting down with status: %d",
                     urb->status);
-                return;
+                return ATP_URB_STATUS_ERROR_FATAL;
+
         default:
                 dbg("atp_complete: nonzero urb status received: %d",
                     urb->status);
-                goto exit;
+                return ATP_URB_STATUS_ERROR;
         }
 
         /* drop incomplete datasets */
@@ -363,30 +381,33 @@ static void atp_complete(struct urb *urb)
                 dprintk("appletouch: incomplete data package"
                         " (first byte: %d, length: %d).\n",
                         dev->data[0], dev->urb->actual_length);
-                goto exit;
+                return ATP_URB_STATUS_ERROR;
         }
 
-        /* reorder the sensors values */
-        if (dev->type == ATP_GEYSER3 || dev->type == ATP_GEYSER4) {
-                memset(dev->xy_cur, 0, sizeof(dev->xy_cur));
+        return ATP_URB_STATUS_SUCCESS;
+}
 
-                /*
-                 * The values are laid out like this:
-                 * -, Y1, Y2, -, Y3, Y4, -, ..., -, X1, X2, -, X3, X4, ...
-                 * '-' is an unused value.
-                 */
+/*
+ * USB interrupt callback functions
+ */
 
-                /* read X values */
-                for (i = 0, j = 19; i < 20; i += 2, j += 3) {
-                        dev->xy_cur[i] = dev->data[j + 1];
-                        dev->xy_cur[i + 1] = dev->data[j + 2];
-                }
-                /* read Y values */
-                for (i = 0, j = 1; i < 9; i += 2, j += 3) {
-                        dev->xy_cur[ATP_XSENSORS + i] = dev->data[j + 1];
-                        dev->xy_cur[ATP_XSENSORS + i + 1] = dev->data[j + 2];
-                }
-        } else if (dev->type == ATP_GEYSER2) {
+/* Interrupt function for older touchpads: FOUNTAIN/GEYSER1/GEYSER2 */
+
+static void atp_complete_geyser_1_2(struct urb *urb)
+{
+        int x, y, x_z, y_z, x_f, y_f;
+        int retval, i, j;
+        int key;
+        struct atp *dev = urb->context;
+        int status = atp_status_check(urb);
+
+        if (status == ATP_URB_STATUS_ERROR_FATAL)
+                return;
+        else if (status == ATP_URB_STATUS_ERROR)
+                goto exit;
+
+        /* reorder the sensors values */
+        if (dev->type == ATP_GEYSER2) {
                 memset(dev->xy_cur, 0, sizeof(dev->xy_cur));
 
                 /*
@@ -427,34 +448,40 @@ static void atp_complete(struct urb *urb)
                 /* first sample */
                 dev->valid = true;
                 dev->x_old = dev->y_old = -1;
+
+                /* Store first sample */
                 memcpy(dev->xy_old, dev->xy_cur, sizeof(dev->xy_old));
 
-                if (dev->size_detect_done ||
-                    dev->type == ATP_GEYSER3) /* No 17" Macbooks (yet) */
-                        goto exit;
+                /* Perform size detection, if not done already */
+                if (!dev->size_detect_done) {
+
+                        /* 17" Powerbooks have extra X sensors */
+                        for (i = (dev->type == ATP_GEYSER2 ? 15 : 16);
+                             i < ATP_XSENSORS; i++) {
+                                if (!dev->xy_cur[i])
+                                        continue;
+
+                                printk(KERN_INFO
+                                        "appletouch: 17\" model detected.\n");
+
+                                if (dev->type == ATP_GEYSER2)
+                                        input_set_abs_params(dev->input, ABS_X,
+                                                             0,
+                                                             (20 - 1) *
+                                                             ATP_XFACT - 1,
+                                                             ATP_FUZZ, 0);
+                                else
+                                        input_set_abs_params(dev->input, ABS_X,
+                                                             0,
+                                                             (26 - 1) *
+                                                             ATP_XFACT - 1,
+                                                             ATP_FUZZ, 0);
+                                break;
+                        }
 
-                /* 17" Powerbooks have extra X sensors */
-                for (i = (dev->type == ATP_GEYSER2 ? 15 : 16);
-                     i < ATP_XSENSORS; i++) {
-                        if (!dev->xy_cur[i])
-                                continue;
-
-                        printk(KERN_INFO "appletouch: 17\" model detected.\n");
-                        if (dev->type == ATP_GEYSER2)
-                                input_set_abs_params(dev->input, ABS_X, 0,
-                                                     (20 - 1) *
-                                                     ATP_XFACT - 1,
-                                                     ATP_FUZZ, 0);
-                        else
-                                input_set_abs_params(dev->input, ABS_X, 0,
-                                                     (ATP_XSENSORS - 1) *
-                                                     ATP_XFACT - 1,
-                                                     ATP_FUZZ, 0);
-                        break;
+                        dev->size_detect_done = 1;
+                        goto exit;
                 }
-
-                dev->size_detect_done = 1;
-                goto exit;
         }
 
         for (i = 0; i < ATP_XSENSORS + ATP_YSENSORS; i++) {
@@ -475,7 +502,118 @@ static void atp_complete(struct urb *urb)
                               ATP_XFACT, &x_z, &x_f);
         y = atp_calculate_abs(dev->xy_acc + ATP_XSENSORS, ATP_YSENSORS,
                               ATP_YFACT, &y_z, &y_f);
-        key = dev->data[dev->datalen - 1] & 1;
+        key = dev->data[dev->datalen - 1] & ATP_STATUS_BUTTON;
+
+        if (x && y) {
+                if (dev->x_old != -1) {
+                        x = (dev->x_old * 3 + x) >> 2;
+                        y = (dev->y_old * 3 + y) >> 2;
+                        dev->x_old = x;
+                        dev->y_old = y;
+
+                        if (debug > 1)
+                                printk(KERN_DEBUG "appletouch: "
+                                        "X: %3d Y: %3d Xz: %3d Yz: %3d\n",
+                                        x, y, x_z, y_z);
+
+                        input_report_key(dev->input, BTN_TOUCH, 1);
+                        input_report_abs(dev->input, ABS_X, x);
+                        input_report_abs(dev->input, ABS_Y, y);
+                        input_report_abs(dev->input, ABS_PRESSURE,
+                                         min(ATP_PRESSURE, x_z + y_z));
+                        atp_report_fingers(dev->input, max(x_f, y_f));
+                }
+                dev->x_old = x;
+                dev->y_old = y;
+
+        } else if (!x && !y) {
+
+                dev->x_old = dev->y_old = -1;
+                input_report_key(dev->input, BTN_TOUCH, 0);
+                input_report_abs(dev->input, ABS_PRESSURE, 0);
+                atp_report_fingers(dev->input, 0);
+
+                /* reset the accumulator on release */
+                memset(dev->xy_acc, 0, sizeof(dev->xy_acc));
+        }
+
+        input_report_key(dev->input, BTN_LEFT, key);
+        input_sync(dev->input);
+
+ exit:
+        retval = usb_submit_urb(dev->urb, GFP_ATOMIC);
+        if (retval)
+                err("atp_complete: usb_submit_urb failed with result %d",
+                    retval);
+}
+
+/* Interrupt function for older touchpads: GEYSER3/GEYSER4 */
+
+static void atp_complete_geyser_3_4(struct urb *urb)
+{
+        int x, y, x_z, y_z, x_f, y_f;
+        int retval, i, j;
+        int key;
+        struct atp *dev = urb->context;
+        int status = atp_status_check(urb);
+
+        if (status == ATP_URB_STATUS_ERROR_FATAL)
+                return;
+        else if (status == ATP_URB_STATUS_ERROR)
+                goto exit;
+
+        /* Reorder the sensors values:
+         *
+         * The values are laid out like this:
+         * -, Y1, Y2, -, Y3, Y4, -, ..., -, X1, X2, -, X3, X4, ...
+         * '-' is an unused value.
+         */
+
+        /* read X values */
+        for (i = 0, j = 19; i < 20; i += 2, j += 3) {
+                dev->xy_cur[i] = dev->data[j + 1];
+                dev->xy_cur[i + 1] = dev->data[j + 2];
+        }
+        /* read Y values */
+        for (i = 0, j = 1; i < 9; i += 2, j += 3) {
+                dev->xy_cur[ATP_XSENSORS + i] = dev->data[j + 1];
+                dev->xy_cur[ATP_XSENSORS + i + 1] = dev->data[j + 2];
+        }
+
+        dbg_dump("sample", dev->xy_cur);
+
+        /* Just update the base values (i.e. touchpad in untouched state) */
+        if (dev->data[dev->datalen - 1] & ATP_STATUS_BASE_UPDATE) {
+
+                dprintk(KERN_DEBUG "appletouch: updated base values\n");
+
+                memcpy(dev->xy_old, dev->xy_cur, sizeof(dev->xy_old));
+                goto exit;
+        }
+
+        for (i = 0; i < ATP_XSENSORS + ATP_YSENSORS; i++) {
+                /* calculate the change */
+                dev->xy_acc[i] = dev->xy_cur[i] - dev->xy_old[i];
+
+                /* this is a round-robin value, so couple with that */
+                if (dev->xy_acc[i] > 127)
+                        dev->xy_acc[i] -= 256;
+
+                if (dev->xy_acc[i] < -127)
+                        dev->xy_acc[i] += 256;
+
+                /* prevent down drifting */
+                if (dev->xy_acc[i] < 0)
+                        dev->xy_acc[i] = 0;
+        }
+
+        dbg_dump("accumulator", dev->xy_acc);
+
+        x = atp_calculate_abs(dev->xy_acc, ATP_XSENSORS,
+                              ATP_XFACT, &x_z, &x_f);
+        y = atp_calculate_abs(dev->xy_acc + ATP_XSENSORS, ATP_YSENSORS,
+                              ATP_YFACT, &y_z, &y_f);
+        key = dev->data[dev->datalen - 1] & ATP_STATUS_BUTTON;
 
         if (x && y) {
                 if (dev->x_old != -1) {
@@ -514,28 +652,27 @@ static void atp_complete(struct urb *urb)
         input_sync(dev->input);
 
         /*
-         * Many Geysers will continue to send packets continually after
+         * Geysers 3/4 will continue to send packets continually after
          * the first touch unless reinitialised. Do so if it's been
          * idle for a while in order to avoid waking the kernel up
-         * several hundred times a second. Re-initialization does not
-         * work on Fountain touchpads.
+         * several hundred times a second.
          */
-        if (dev->type != ATP_FOUNTAIN) {
-                /*
-                 * Button must not be pressed when entering suspend,
-                 * otherwise we will never release the button.
-                 */
-                if (!x && !y && !key) {
-                        dev->idlecount++;
-                        if (dev->idlecount == 10) {
-                                dev->valid = false;
-                                schedule_work(&dev->work);
-                                /* Don't resubmit urb here, wait for reinit */
-                                return;
-                        }
-                } else
+
+        /*
+         * Button must not be pressed when entering suspend,
+         * otherwise we will never release the button.
+         */
+        if (!x && !y && !key) {
+                dev->idlecount++;
+                if (dev->idlecount == 10) {
+                        dev->x_old = dev->y_old = -1;
                         dev->idlecount = 0;
-        }
+                        schedule_work(&dev->work);
+                        /* Don't resubmit urb here, wait for reinit */
+                        return;
+                }
+        } else
+                dev->idlecount = 0;
 
  exit:
         retval = usb_submit_urb(dev->urb, GFP_ATOMIC);
@@ -632,9 +769,19 @@ static int atp_probe(struct usb_interface *iface,
         if (!dev->data)
                 goto err_free_urb;
 
-        usb_fill_int_urb(dev->urb, udev,
-                         usb_rcvintpipe(udev, int_in_endpointAddr),
-                         dev->data, dev->datalen, atp_complete, dev, 1);
+        /* Select the USB complete (callback) function */
+        if (dev->type == ATP_FOUNTAIN ||
+            dev->type == ATP_GEYSER1 ||
+            dev->type == ATP_GEYSER2)
+                usb_fill_int_urb(dev->urb, udev,
+                                 usb_rcvintpipe(udev, int_in_endpointAddr),
+                                 dev->data, dev->datalen,
+                                 atp_complete_geyser_1_2, dev, 1);
+        else
+                usb_fill_int_urb(dev->urb, udev,
+                                 usb_rcvintpipe(udev, int_in_endpointAddr),
+                                 dev->data, dev->datalen,
+                                 atp_complete_geyser_3_4, dev, 1);
 
         error = atp_handle_geyser(dev);
         if (error)
@@ -751,8 +898,6 @@ static int atp_suspend(struct usb_interface *iface, pm_message_t message)
         struct atp *dev = usb_get_intfdata(iface);
 
         usb_kill_urb(dev->urb);
-        dev->valid = false;
-
         return 0;
 }
 
diff --git a/drivers/input/mouse/hgpk.c b/drivers/input/mouse/hgpk.c
new file mode 100644
index 000000000000..e82d34201e97
--- /dev/null
+++ b/drivers/input/mouse/hgpk.c
@@ -0,0 +1,477 @@
+/*
+ * OLPC HGPK (XO-1) touchpad PS/2 mouse driver
+ *
+ * Copyright (c) 2006-2008 One Laptop Per Child
+ * Authors:
+ *   Zephaniah E. Hull
+ *   Andres Salomon <dilinger@debian.org>
+ *
+ * This driver is partly based on the ALPS driver, which is:
+ *
+ * Copyright (c) 2003 Neil Brown <neilb@cse.unsw.edu.au>
+ * Copyright (c) 2003-2005 Peter Osterlund <petero2@telia.com>
+ * Copyright (c) 2004 Dmitry Torokhov <dtor@mail.ru>
+ * Copyright (c) 2005 Vojtech Pavlik <vojtech@suse.cz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/*
+ * The spec from ALPS is available from
+ * <http://wiki.laptop.org/go/Touch_Pad/Tablet>.  It refers to this
+ * device as HGPK (Hybrid GS, PT, and Keymatrix).
+ *
+ * The earliest versions of the device had simultaneous reporting; that
+ * was removed.  After that, the device used the Advanced Mode GS/PT streaming
+ * stuff.  That turned out to be too buggy to support, so we've finally
+ * switched to Mouse Mode (which utilizes only the center 1/3 of the touchpad).
+ */
+
+#define DEBUG
+#include <linux/input.h>
+#include <linux/serio.h>
+#include <linux/libps2.h>
+#include <linux/delay.h>
+#include <asm/olpc.h>
+
+#include "psmouse.h"
+#include "hgpk.h"
+
+static int tpdebug;
+module_param(tpdebug, int, 0644);
+MODULE_PARM_DESC(tpdebug, "enable debugging, dumping packets to KERN_DEBUG.");
+
+static int recalib_delta = 100;
+module_param(recalib_delta, int, 0644);
+MODULE_PARM_DESC(recalib_delta,
+        "packets containing a delta this large will cause a recalibration.");
+
+/*
+ * When the touchpad gets ultra-sensitive, one can keep their finger 1/2"
+ * above the pad and still have it send packets.  This causes a jump cursor
+ * when one places their finger on the pad.  We can probably detect the
+ * jump as we see a large deltas (>= 100px).  In mouse mode, I've been
+ * unable to even come close to 100px deltas during normal usage, so I think
+ * this threshold is safe.  If a large delta occurs, trigger a recalibration.
+ */
+static void hgpk_jumpy_hack(struct psmouse *psmouse, int x, int y)
+{
+        struct hgpk_data *priv = psmouse->private;
+
+        if (abs(x) > recalib_delta || abs(y) > recalib_delta) {
+                hgpk_err(psmouse, ">%dpx jump detected (%d,%d)\n",
+                                recalib_delta, x, y);
+                /* My car gets forty rods to the hogshead and that's the
+                 * way I likes it! */
+                psmouse_queue_work(psmouse, &priv->recalib_wq,
+                                msecs_to_jiffies(1000));
+        }
+}
+
+/*
+ * We have no idea why this particular hardware bug occurs.  The touchpad
+ * will randomly start spewing packets without anything touching the
+ * pad.  This wouldn't necessarily be bad, but it's indicative of a
+ * severely miscalibrated pad; attempting to use the touchpad while it's
+ * spewing means the cursor will jump all over the place, and act "drunk".
+ *
+ * The packets that are spewed tend to all have deltas between -2 and 2, and
+ * the cursor will move around without really going very far.  It will
+ * tend to end up in the same location; if we tally up the changes over
+ * 100 packets, we end up w/ a final delta of close to 0.  This happens
+ * pretty regularly when the touchpad is spewing, and is pretty hard to
+ * manually trigger (at least for *my* fingers).  So, it makes a perfect
+ * scheme for detecting spews.
+ */
+static void hgpk_spewing_hack(struct psmouse *psmouse,
+                              int l, int r, int x, int y)
+{
+        struct hgpk_data *priv = psmouse->private;
+
+        /* ignore button press packets; many in a row could trigger
+         * a false-positive! */
+        if (l || r)
+                return;
+
+        priv->x_tally += x;
+        priv->y_tally += y;
+
+        if (++priv->count > 100) {
+                if (abs(priv->x_tally) < 3 && abs(priv->y_tally) < 3) {
+                        hgpk_dbg(psmouse, "packet spew detected (%d,%d)\n",
+                                 priv->x_tally, priv->y_tally);
+                        psmouse_queue_work(psmouse, &priv->recalib_wq,
+                                           msecs_to_jiffies(1000));
+                }
+                /* reset every 100 packets */
+                priv->count = 0;
+                priv->x_tally = 0;
+                priv->y_tally = 0;
+        }
+}
+
+/*
+ * HGPK Mouse Mode format (standard mouse format, sans middle button)
+ *
+ * byte 0:      y-over  x-over  y-neg   x-neg   1       0       swr     swl
+ * byte 1:      x7      x6      x5      x4      x3      x2      x1      x0
+ * byte 2:      y7      y6      y5      y4      y3      y2      y1      y0
+ *
+ * swr/swl are the left/right buttons.
+ * x-neg/y-neg are the x and y delta negative bits
+ * x-over/y-over are the x and y overflow bits
+ */
+static int hgpk_validate_byte(unsigned char *packet)
+{
+        return (packet[0] & 0x0C) == 0x08;
+}
+
+static void hgpk_process_packet(struct psmouse *psmouse)
+{
+        struct input_dev *dev = psmouse->dev;
+        unsigned char *packet = psmouse->packet;
+        int x, y, left, right;
+
+        left = packet[0] & 1;
+        right = (packet[0] >> 1) & 1;
+
+        x = packet[1] - ((packet[0] << 4) & 0x100);
+        y = ((packet[0] << 3) & 0x100) - packet[2];
+
+        hgpk_jumpy_hack(psmouse, x, y);
+        hgpk_spewing_hack(psmouse, left, right, x, y);
+
+        if (tpdebug)
+                hgpk_dbg(psmouse, "l=%d r=%d x=%d y=%d\n", left, right, x, y);
+
+        input_report_key(dev, BTN_LEFT, left);
+        input_report_key(dev, BTN_RIGHT, right);
+
+        input_report_rel(dev, REL_X, x);
+        input_report_rel(dev, REL_Y, y);
+
+        input_sync(dev);
+}
+
+static psmouse_ret_t hgpk_process_byte(struct psmouse *psmouse)
+{
+        struct hgpk_data *priv = psmouse->private;
+
+        if (hgpk_validate_byte(psmouse->packet)) {
+                hgpk_dbg(psmouse, "%s: (%d) %02x %02x %02x\n",
+                                __func__, psmouse->pktcnt, psmouse->packet[0],
+                                psmouse->packet[1], psmouse->packet[2]);
+                return PSMOUSE_BAD_DATA;
+        }
+
+        if (psmouse->pktcnt >= psmouse->pktsize) {
+                hgpk_process_packet(psmouse);
+                return PSMOUSE_FULL_PACKET;
+        }
+
+        if (priv->recalib_window) {
+                if (time_before(jiffies, priv->recalib_window)) {
+                        /*
+                         * ugh, got a packet inside our recalibration
+                         * window, schedule another recalibration.
+                         */
+                        hgpk_dbg(psmouse,
+                                 "packet inside calibration window, "
+                                 "queueing another recalibration\n");
+                        psmouse_queue_work(psmouse, &priv->recalib_wq,
+                                        msecs_to_jiffies(1000));
+                }
+                priv->recalib_window = 0;
+        }
+
+        return PSMOUSE_GOOD_DATA;
+}
+
+static int hgpk_force_recalibrate(struct psmouse *psmouse)
+{
+        struct ps2dev *ps2dev = &psmouse->ps2dev;
+        struct hgpk_data *priv = psmouse->private;
+
+        /* C-series touchpads added the recalibrate command */
+        if (psmouse->model < HGPK_MODEL_C)
+                return 0;
+
+        /* we don't want to race with the irq handler, nor with resyncs */
+        psmouse_set_state(psmouse, PSMOUSE_INITIALIZING);
+
+        /* start by resetting the device */
+        psmouse_reset(psmouse);
+
+        /* send the recalibrate request */
+        if (ps2_command(ps2dev, NULL, 0xf5) ||
+            ps2_command(ps2dev, NULL, 0xf5) ||
+            ps2_command(ps2dev, NULL, 0xe6) ||
+            ps2_command(ps2dev, NULL, 0xf5)) {
+                return -1;
+        }
+
+        /* according to ALPS, 150mS is required for recalibration */
+        msleep(150);
+
+        /* XXX: If a finger is down during this delay, recalibration will
+         * detect capacitance incorrectly.  This is a hardware bug, and
+         * we don't have a good way to deal with it.  The 2s window stuff
+         * (below) is our best option for now.
+         */
+
+        if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE))
+                return -1;
+
+        psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);
+
+        /* After we recalibrate, we shouldn't get any packets for 2s.  If
+         * we do, it's likely that someone's finger was on the touchpad.
+         * If someone's finger *was* on the touchpad, it's probably
+         * miscalibrated.  So, we should schedule another recalibration
+         */
+        priv->recalib_window = jiffies +  msecs_to_jiffies(2000);
+
+        return 0;
+}
+
+/*
+ * This kills power to the touchpad; according to ALPS, current consumption
+ * goes down to 50uA after running this.  To turn power back on, we drive
+ * MS-DAT low.
+ */
+static int hgpk_toggle_power(struct psmouse *psmouse, int enable)
+{
+        struct ps2dev *ps2dev = &psmouse->ps2dev;
+        int timeo;
+
+        /* Added on D-series touchpads */
+        if (psmouse->model < HGPK_MODEL_D)
+                return 0;
+
+        if (enable) {
+                psmouse_set_state(psmouse, PSMOUSE_INITIALIZING);
+
+                /*
+                 * Sending a byte will drive MS-DAT low; this will wake up
+                 * the controller.  Once we get an ACK back from it, it
+                 * means we can continue with the touchpad re-init.  ALPS
+                 * tells us that 1s should be long enough, so set that as
+                 * the upper bound.
+                 */
+                for (timeo = 20; timeo > 0; timeo--) {
+                        if (!ps2_sendbyte(&psmouse->ps2dev,
+                                        PSMOUSE_CMD_DISABLE, 20))
+                                break;
+                        msleep(50);
+                }
+
+                psmouse_reset(psmouse);
+
+                /* should be all set, enable the touchpad */
+                ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_ENABLE);
+                psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);
+
+        } else {
+                hgpk_dbg(psmouse, "Powering off touchpad.\n");
+                psmouse_set_state(psmouse, PSMOUSE_IGNORE);
+
+                if (ps2_command(ps2dev, NULL, 0xec) ||
+                    ps2_command(ps2dev, NULL, 0xec) ||
+                    ps2_command(ps2dev, NULL, 0xea)) {
+                        return -1;
+                }
+
+                /* probably won't see an ACK, the touchpad will be off */
+                ps2_sendbyte(&psmouse->ps2dev, 0xec, 20);
+        }
+
+        return 0;
+}
+
+static int hgpk_poll(struct psmouse *psmouse)
+{
+        /* We can't poll, so always return failure. */
+        return -1;
+}
+
+static int hgpk_reconnect(struct psmouse *psmouse)
+{
+        /* During suspend/resume the ps2 rails remain powered.  We don't want
+         * to do a reset because it's flush data out of buffers; however,
+         * earlier prototypes (B1) had some brokenness that required a reset. */
+        if (olpc_board_at_least(olpc_board(0xb2)))
+                if (psmouse->ps2dev.serio->dev.power.power_state.event !=
+                                PM_EVENT_ON)
+                        return 0;
+
+        psmouse_reset(psmouse);
+
+        return 0;
+}
+
+static ssize_t hgpk_show_powered(struct psmouse *psmouse, void *data, char *buf)
+{
+        struct hgpk_data *priv = psmouse->private;
+
+        return sprintf(buf, "%d\n", priv->powered);
+}
+
+static ssize_t hgpk_set_powered(struct psmouse *psmouse, void *data,
+                                const char *buf, size_t count)
+{
+        struct hgpk_data *priv = psmouse->private;
+        unsigned long value;
+        int err;
+
+        err = strict_strtoul(buf, 10, &value);
+        if (err || value > 1)
+                return -EINVAL;
+
+        if (value != priv->powered) {
+                /*
+                 * hgpk_toggle_power will deal w/ state so
+                 * we're not racing w/ irq
+                 */
+                err = hgpk_toggle_power(psmouse, value);
+                if (!err)
+                        priv->powered = value;
+        }
+
+        return err ? err : count;
+}
+
+__PSMOUSE_DEFINE_ATTR(powered, S_IWUSR | S_IRUGO, NULL,
+                      hgpk_show_powered, hgpk_set_powered, 0);
+
+static void hgpk_disconnect(struct psmouse *psmouse)
+{
+        struct hgpk_data *priv = psmouse->private;
+
+        device_remove_file(&psmouse->ps2dev.serio->dev,
+                           &psmouse_attr_powered.dattr);
+        psmouse_reset(psmouse);
+        kfree(priv);
+}
+
+static void hgpk_recalib_work(struct work_struct *work)
+{
+        struct delayed_work *w = container_of(work, struct delayed_work, work);
+        struct hgpk_data *priv = container_of(w, struct hgpk_data, recalib_wq);
+        struct psmouse *psmouse = priv->psmouse;
+
+        hgpk_dbg(psmouse, "recalibrating touchpad..\n");
+
+        if (hgpk_force_recalibrate(psmouse))
+                hgpk_err(psmouse, "recalibration failed!\n");
+}
+
+static int hgpk_register(struct psmouse *psmouse)
+{
+        struct input_dev *dev = psmouse->dev;
+        int err;
+
+        /* unset the things that psmouse-base sets which we don't have */
+        __clear_bit(BTN_MIDDLE, dev->keybit);
+
+        /* set the things we do have */
+        __set_bit(EV_KEY, dev->evbit);
+        __set_bit(EV_REL, dev->evbit);
+
+        __set_bit(REL_X, dev->relbit);
+        __set_bit(REL_Y, dev->relbit);
+
+        __set_bit(BTN_LEFT, dev->keybit);
+        __set_bit(BTN_RIGHT, dev->keybit);
+
+        /* register handlers */
+        psmouse->protocol_handler = hgpk_process_byte;
+        psmouse->poll = hgpk_poll;
+        psmouse->disconnect = hgpk_disconnect;
+        psmouse->reconnect = hgpk_reconnect;
+        psmouse->pktsize = 3;
+
+        /* Disable the idle resync. */
+        psmouse->resync_time = 0;
+        /* Reset after a lot of bad bytes. */
+        psmouse->resetafter = 1024;
+
+        err = device_create_file(&psmouse->ps2dev.serio->dev,
+                                 &psmouse_attr_powered.dattr);
+        if (err)
+                hgpk_err(psmouse, "Failed to create sysfs attribute\n");
+
+        return err;
+}
+
+int hgpk_init(struct psmouse *psmouse)
+{
+        struct hgpk_data *priv;
+        int err = -ENOMEM;
+
+        priv = kzalloc(sizeof(struct hgpk_data), GFP_KERNEL);
+        if (!priv)
+                goto alloc_fail;
+
+        psmouse->private = priv;
+        priv->psmouse = psmouse;
+        priv->powered = 1;
+        INIT_DELAYED_WORK(&priv->recalib_wq, hgpk_recalib_work);
+
+        err = psmouse_reset(psmouse);
+        if (err)
+                goto init_fail;
+
+        err = hgpk_register(psmouse);
+        if (err)
+                goto init_fail;
+
+        return 0;
+
+init_fail:
+        kfree(priv);
+alloc_fail:
+        return err;
+}
+
+static enum hgpk_model_t hgpk_get_model(struct psmouse *psmouse)
+{
+        struct ps2dev *ps2dev = &psmouse->ps2dev;
+        unsigned char param[3];
+
+        /* E7, E7, E7, E9 gets us a 3 byte identifier */
+        if (ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE21) ||
+            ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE21) ||
+            ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE21) ||
+            ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO)) {
+                return -EIO;
+        }
+
+        hgpk_dbg(psmouse, "ID: %02x %02x %02x", param[0], param[1], param[2]);
+
+        /* HGPK signature: 0x67, 0x00, 0x<model> */
+        if (param[0] != 0x67 || param[1] != 0x00)
+                return -ENODEV;
+
+        hgpk_info(psmouse, "OLPC touchpad revision 0x%x\n", param[2]);
+
+        return param[2];
+}
+
+int hgpk_detect(struct psmouse *psmouse, int set_properties)
+{
+        int version;
+
+        version = hgpk_get_model(psmouse);
+        if (version < 0)
+                return version;
+
+        if (set_properties) {
+                psmouse->vendor = "ALPS";
+                psmouse->name = "HGPK";
+                psmouse->model = version;
+        }
+
+        return 0;
+}
diff --git a/drivers/input/mouse/hgpk.h b/drivers/input/mouse/hgpk.h
new file mode 100644
index 000000000000..a4b2a96f5f54
--- /dev/null
+++ b/drivers/input/mouse/hgpk.h
@@ -0,0 +1,49 @@
+/*
+ * OLPC HGPK (XO-1) touchpad PS/2 mouse driver
+ */
+
+#ifndef _HGPK_H
+#define _HGPK_H
+
+enum hgpk_model_t {
+        HGPK_MODEL_PREA = 0x0a, /* pre-B1s */
+        HGPK_MODEL_A = 0x14,    /* found on B1s, PT disabled in hardware */
+        HGPK_MODEL_B = 0x28,    /* B2s, has capacitance issues */
+        HGPK_MODEL_C = 0x3c,
+        HGPK_MODEL_D = 0x50,    /* C1, mass production */
+};
+
+struct hgpk_data {
+        struct psmouse *psmouse;
+        int powered;
+        int count, x_tally, y_tally;    /* hardware workaround stuff */
+        unsigned long recalib_window;
+        struct delayed_work recalib_wq;
+};
+
+#define hgpk_dbg(psmouse, format, arg...)               \
+        dev_dbg(&(psmouse)->ps2dev.serio->dev, format, ## arg)
+#define hgpk_err(psmouse, format, arg...)               \
+        dev_err(&(psmouse)->ps2dev.serio->dev, format, ## arg)
+#define hgpk_info(psmouse, format, arg...)              \
+        dev_info(&(psmouse)->ps2dev.serio->dev, format, ## arg)
+#define hgpk_warn(psmouse, format, arg...)              \
+        dev_warn(&(psmouse)->ps2dev.serio->dev, format, ## arg)
+#define hgpk_notice(psmouse, format, arg...)            \
+        dev_notice(&(psmouse)->ps2dev.serio->dev, format, ## arg)
+
+#ifdef CONFIG_MOUSE_PS2_OLPC
+int hgpk_detect(struct psmouse *psmouse, int set_properties);
+int hgpk_init(struct psmouse *psmouse);
+#else
+static inline int hgpk_detect(struct psmouse *psmouse, int set_properties)
+{
+        return -ENODEV;
+}
+static inline int hgpk_init(struct psmouse *psmouse)
+{
+        return -ENODEV;
+}
+#endif
+
+#endif
diff --git a/drivers/input/mouse/logips2pp.c b/drivers/input/mouse/logips2pp.c
index 0c5660d28caa..390f1dbb98a4 100644
--- a/drivers/input/mouse/logips2pp.c
+++ b/drivers/input/mouse/logips2pp.c
@@ -157,10 +157,8 @@ static ssize_t ps2pp_attr_show_smartscroll(struct psmouse *psmouse, void *data,
 static ssize_t ps2pp_attr_set_smartscroll(struct psmouse *psmouse, void *data, const char *buf, size_t count)
 {
         unsigned long value;
-        char *rest;
 
-        value = simple_strtoul(buf, &rest, 10);
-        if (*rest || value > 1)
+        if (strict_strtoul(buf, 10, &value) || value > 1)
                 return -EINVAL;
 
         ps2pp_set_smartscroll(psmouse, value);
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index f5a6be1d3c46..126e977e199e 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -25,6 +25,7 @@
 #include "synaptics.h"
 #include "logips2pp.h"
 #include "alps.h"
+#include "hgpk.h"
 #include "lifebook.h"
 #include "trackpoint.h"
 #include "touchkit_ps2.h"
@@ -201,6 +202,12 @@ static psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse)
         return PSMOUSE_FULL_PACKET;
 }
 
+void psmouse_queue_work(struct psmouse *psmouse, struct delayed_work *work,
+                unsigned long delay)
+{
+        queue_delayed_work(kpsmoused_wq, work, delay);
+}
+
 /*
  * __psmouse_set_state() sets new psmouse state and resets all flags.
  */
@@ -220,7 +227,7 @@ static inline void __psmouse_set_state(struct psmouse *psmouse, enum psmouse_sta
  * is not a concern.
  */
 
-static void psmouse_set_state(struct psmouse *psmouse, enum psmouse_state new_state)
+void psmouse_set_state(struct psmouse *psmouse, enum psmouse_state new_state)
 {
         serio_pause_rx(psmouse->ps2dev.serio);
         __psmouse_set_state(psmouse, new_state);
@@ -305,7 +312,7 @@ static irqreturn_t psmouse_interrupt(struct serio *serio,
                        psmouse->name, psmouse->phys, psmouse->pktcnt);
                 psmouse->badbyte = psmouse->packet[0];
                 __psmouse_set_state(psmouse, PSMOUSE_RESYNCING);
-                queue_work(kpsmoused_wq, &psmouse->resync_work);
+                psmouse_queue_work(psmouse, &psmouse->resync_work, 0);
                 goto out;
         }
 
@@ -342,7 +349,7 @@ static irqreturn_t psmouse_interrupt(struct serio *serio,
             time_after(jiffies, psmouse->last + psmouse->resync_time * HZ)) {
                 psmouse->badbyte = psmouse->packet[0];
                 __psmouse_set_state(psmouse, PSMOUSE_RESYNCING);
-                queue_work(kpsmoused_wq, &psmouse->resync_work);
+                psmouse_queue_work(psmouse, &psmouse->resync_work, 0);
                 goto out;
         }
 
@@ -630,8 +637,20 @@ static int psmouse_extensions(struct psmouse *psmouse,
                 }
         }
 
-        if (max_proto > PSMOUSE_IMEX) {
+/*
+ * Try OLPC HGPK touchpad.
+ */
+        if (max_proto > PSMOUSE_IMEX &&
+                        hgpk_detect(psmouse, set_properties) == 0) {
+                if (!set_properties || hgpk_init(psmouse) == 0)
+                        return PSMOUSE_HGPK;
+/*
+ * Init failed, try basic relative protocols
+ */
+                max_proto = PSMOUSE_IMEX;
+        }
 
+        if (max_proto > PSMOUSE_IMEX) {
                 if (genius_detect(psmouse, set_properties) == 0)
                         return PSMOUSE_GENPS;
 
@@ -762,6 +781,14 @@ static const struct psmouse_protocol psmouse_protocols[] = {
                 .detect         = touchkit_ps2_detect,
         },
 #endif
+#ifdef CONFIG_MOUSE_PS2_OLPC
+        {
+                .type           = PSMOUSE_HGPK,
+                .name           = "OLPC HGPK",
+                .alias          = "hgpk",
+                .detect         = hgpk_detect,
+        },
+#endif
         {
                 .type           = PSMOUSE_CORTRON,
                 .name           = "CortronPS/2",
@@ -935,7 +962,7 @@ static int psmouse_poll(struct psmouse *psmouse)
 static void psmouse_resync(struct work_struct *work)
 {
         struct psmouse *parent = NULL, *psmouse =
-                container_of(work, struct psmouse, resync_work);
+                container_of(work, struct psmouse, resync_work.work);
         struct serio *serio = psmouse->ps2dev.serio;
         psmouse_ret_t rc = PSMOUSE_GOOD_DATA;
         int failed = 0, enabled = 0;
@@ -1194,7 +1221,7 @@ static int psmouse_connect(struct serio *serio, struct serio_driver *drv)
                 goto err_free;
 
         ps2_init(&psmouse->ps2dev, serio);
-        INIT_WORK(&psmouse->resync_work, psmouse_resync);
+        INIT_DELAYED_WORK(&psmouse->resync_work, psmouse_resync);
         psmouse->dev = input_dev;
         snprintf(psmouse->phys, sizeof(psmouse->phys), "%s/input0", serio->phys);
 
@@ -1395,25 +1422,29 @@ ssize_t psmouse_attr_set_helper(struct device *dev, struct device_attribute *dev
 
         psmouse = serio_get_drvdata(serio);
 
-        if (psmouse->state == PSMOUSE_IGNORE) {
-                retval = -ENODEV;
-                goto out_unlock;
-        }
+        if (attr->protect) {
+                if (psmouse->state == PSMOUSE_IGNORE) {
+                        retval = -ENODEV;
+                        goto out_unlock;
+                }
 
-        if (serio->parent && serio->id.type == SERIO_PS_PSTHRU) {
-                parent = serio_get_drvdata(serio->parent);
-                psmouse_deactivate(parent);
-        }
+                if (serio->parent && serio->id.type == SERIO_PS_PSTHRU) {
+                        parent = serio_get_drvdata(serio->parent);
+                        psmouse_deactivate(parent);
+                }
 
-        psmouse_deactivate(psmouse);
+                psmouse_deactivate(psmouse);
+        }
 
         retval = attr->set(psmouse, attr->data, buf, count);
 
-        if (retval != -ENODEV)
-                psmouse_activate(psmouse);
+        if (attr->protect) {
+                if (retval != -ENODEV)
+                        psmouse_activate(psmouse);
 
-        if (parent)
-                psmouse_activate(parent);
+                if (parent)
+                        psmouse_activate(parent);
+        }
 
  out_unlock:
         mutex_unlock(&psmouse_mutex);
@@ -1433,10 +1464,8 @@ static ssize_t psmouse_set_int_attr(struct psmouse *psmouse, void *offset, const
 {
         unsigned int *field = (unsigned int *)((char *)psmouse + (size_t)offset);
         unsigned long value;
-        char *rest;
 
-        value = simple_strtoul(buf, &rest, 10);
-        if (*rest)
+        if (strict_strtoul(buf, 10, &value))
                 return -EINVAL;
 
         if ((unsigned int)value != value)
@@ -1549,10 +1578,8 @@ static ssize_t psmouse_attr_set_protocol(struct psmouse *psmouse, void *data, co
 static ssize_t psmouse_attr_set_rate(struct psmouse *psmouse, void *data, const char *buf, size_t count)
 {
         unsigned long value;
-        char *rest;
 
-        value = simple_strtoul(buf, &rest, 10);
-        if (*rest)
+        if (strict_strtoul(buf, 10, &value))
                 return -EINVAL;
 
         psmouse->set_rate(psmouse, value);
@@ -1562,10 +1589,8 @@ static ssize_t psmouse_attr_set_rate(struct psmouse *psmouse, void *data, const
 static ssize_t psmouse_attr_set_resolution(struct psmouse *psmouse, void *data, const char *buf, size_t count)
 {
         unsigned long value;
-        char *rest;
 
-        value = simple_strtoul(buf, &rest, 10);
-        if (*rest)
+        if (strict_strtoul(buf, 10, &value))
                 return -EINVAL;
 
         psmouse->set_resolution(psmouse, value);
diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
index 1317bdd8cc7c..8b608a1cdd12 100644
--- a/drivers/input/mouse/psmouse.h
+++ b/drivers/input/mouse/psmouse.h
@@ -39,7 +39,7 @@ struct psmouse {
         void *private;
         struct input_dev *dev;
         struct ps2dev ps2dev;
-        struct work_struct resync_work;
+        struct delayed_work resync_work;
         char *vendor;
         char *name;
         unsigned char packet[8];
@@ -89,20 +89,24 @@ enum psmouse_type {
         PSMOUSE_TRACKPOINT,
         PSMOUSE_TOUCHKIT_PS2,
         PSMOUSE_CORTRON,
+        PSMOUSE_HGPK,
         PSMOUSE_AUTO            /* This one should always be last */
 };
 
+void psmouse_queue_work(struct psmouse *psmouse, struct delayed_work *work,
+                unsigned long delay);
 int psmouse_sliced_command(struct psmouse *psmouse, unsigned char command);
 int psmouse_reset(struct psmouse *psmouse);
+void psmouse_set_state(struct psmouse *psmouse, enum psmouse_state new_state);
 void psmouse_set_resolution(struct psmouse *psmouse, unsigned int resolution);
 
-
 struct psmouse_attribute {
         struct device_attribute dattr;
         void *data;
         ssize_t (*show)(struct psmouse *psmouse, void *data, char *buf);
         ssize_t (*set)(struct psmouse *psmouse, void *data,
                         const char *buf, size_t count);
+        int protect;
 };
 #define to_psmouse_attr(a)      container_of((a), struct psmouse_attribute, dattr)
 
@@ -111,7 +115,7 @@ ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *at
 ssize_t psmouse_attr_set_helper(struct device *dev, struct device_attribute *attr,
                                 const char *buf, size_t count);
 
-#define PSMOUSE_DEFINE_ATTR(_name, _mode, _data, _show, _set)                   \
+#define __PSMOUSE_DEFINE_ATTR(_name, _mode, _data, _show, _set, _protect)       \
 static ssize_t _show(struct psmouse *, void *data, char *);                     \
 static ssize_t _set(struct psmouse *, void *data, const char *, size_t);        \
 static struct psmouse_attribute psmouse_attr_##_name = {                        \
@@ -126,6 +130,10 @@ static struct psmouse_attribute psmouse_attr_##_name = {			\
         .data   = _data,                                                        \
         .show   = _show,                                                        \
         .set    = _set,                                                         \
+        .protect = _protect,                                                    \
 }
 
+#define PSMOUSE_DEFINE_ATTR(_name, _mode, _data, _show, _set)   \
+                __PSMOUSE_DEFINE_ATTR(_name, _mode, _data, _show, _set, 1)
+
 #endif /* _PSMOUSE_H */
diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c
index 26b845fc186a..e68c814c4361 100644
--- a/drivers/input/mouse/trackpoint.c
+++ b/drivers/input/mouse/trackpoint.c
@@ -89,10 +89,8 @@ static ssize_t trackpoint_set_int_attr(struct psmouse *psmouse, void *data,
         struct trackpoint_attr_data *attr = data;
         unsigned char *field = (unsigned char *)((char *)tp + attr->field_offset);
         unsigned long value;
-        char *rest;
 
-        value = simple_strtoul(buf, &rest, 10);
-        if (*rest || value > 255)
+        if (strict_strtoul(buf, 10, &value) || value > 255)
                 return -EINVAL;
 
         *field = value;
@@ -117,10 +115,8 @@ static ssize_t trackpoint_set_bit_attr(struct psmouse *psmouse, void *data,
         struct trackpoint_attr_data *attr = data;
         unsigned char *field = (unsigned char *)((char *)tp + attr->field_offset);
         unsigned long value;
-        char *rest;
 
-        value = simple_strtoul(buf, &rest, 10);
-        if (*rest || value > 1)
+        if (strict_strtoul(buf, 10, &value) || value > 1)
                 return -EINVAL;
 
         if (attr->inverted)
diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c
index 0d395979b2d1..bfe49243f38b 100644
--- a/drivers/input/serio/hp_sdc.c
+++ b/drivers/input/serio/hp_sdc.c
@@ -323,7 +323,7 @@ static void hp_sdc_tasklet(unsigned long foo)
                          * it back to the application. and be less verbose.
                          */
                         printk(KERN_WARNING PREFIX "read timeout (%ius)!\n",
-                               tv.tv_usec - hp_sdc.rtv.tv_usec);
+                               (int)(tv.tv_usec - hp_sdc.rtv.tv_usec));
                         curr->idx += hp_sdc.rqty;
                         hp_sdc.rqty = 0;
                         tmp = curr->seq[curr->actidx];
diff --git a/drivers/input/serio/i8042-io.h b/drivers/input/serio/i8042-io.h
index f451c7351a9d..847f4aad7ed5 100644
--- a/drivers/input/serio/i8042-io.h
+++ b/drivers/input/serio/i8042-io.h
@@ -67,7 +67,7 @@ static inline int i8042_platform_init(void)
  * On some platforms touching the i8042 data register region can do really
  * bad things. Because of this the region is always reserved on such boxes.
  */
-#if defined(CONFIG_PPC_MERGE)
+#if defined(CONFIG_PPC)
         if (check_legacy_ioport(I8042_DATA_REG))
                 return -ENODEV;
 #endif
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 5aafe24984c5..a321aea2c7b5 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -322,6 +322,13 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "N34AS6"),
                 },
         },
+        {
+                .ident = "IBM 2656",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "2656"),
+                },
+        },
         { }
 };
 
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index c9397c8ee97e..470770c09260 100644
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -373,6 +373,12 @@ static struct serio_device_id serio_raw_serio_ids[] = {
                 .id     = SERIO_ANY,
                 .extra  = SERIO_ANY,
         },
+        {
+                .type   = SERIO_8042_XL,
+                .proto  = SERIO_ANY,
+                .id     = SERIO_ANY,
+                .extra  = SERIO_ANY,
+        },
         { 0 }
 };
 
diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c
index 8f037a1d44a6..e53c838f1866 100644
--- a/drivers/input/tablet/aiptek.c
+++ b/drivers/input/tablet/aiptek.c
@@ -1202,16 +1202,22 @@ static ssize_t
 store_tabletXtilt(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
-        int x;
+        long x;
+
+        if (strict_strtol(buf, 10, &x)) {
+                size_t len = buf[count - 1] == '\n' ? count - 1 : count;
+
+                if (strncmp(buf, "disable", len))
+                        return -EINVAL;
 
-        if (strcmp(buf, "disable") == 0) {
                 aiptek->newSetting.xTilt = AIPTEK_TILT_DISABLE;
         } else {
-                x = (int)simple_strtol(buf, NULL, 10);
-                if (x >= AIPTEK_TILT_MIN && x <= AIPTEK_TILT_MAX) {
-                        aiptek->newSetting.xTilt = x;
-                }
+                if (x < AIPTEK_TILT_MIN || x > AIPTEK_TILT_MAX)
+                        return -EINVAL;
+
+                aiptek->newSetting.xTilt = x;
         }
+
         return count;
 }
 
@@ -1238,16 +1244,22 @@ static ssize_t
 store_tabletYtilt(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
-        int y;
+        long y;
+
+        if (strict_strtol(buf, 10, &y)) {
+                size_t len = buf[count - 1] == '\n' ? count - 1 : count;
+
+                if (strncmp(buf, "disable", len))
+                        return -EINVAL;
 
-        if (strcmp(buf, "disable") == 0) {
                 aiptek->newSetting.yTilt = AIPTEK_TILT_DISABLE;
         } else {
-                y = (int)simple_strtol(buf, NULL, 10);
-                if (y >= AIPTEK_TILT_MIN && y <= AIPTEK_TILT_MAX) {
-                        aiptek->newSetting.yTilt = y;
-                }
+                if (y < AIPTEK_TILT_MIN || y > AIPTEK_TILT_MAX)
+                        return -EINVAL;
+
+                aiptek->newSetting.yTilt = y;
         }
+
         return count;
 }
 
@@ -1269,8 +1281,12 @@ static ssize_t
 store_tabletJitterDelay(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
+        long j;
+
+        if (strict_strtol(buf, 10, &j))
+                return -EINVAL;
 
-        aiptek->newSetting.jitterDelay = (int)simple_strtol(buf, NULL, 10);
+        aiptek->newSetting.jitterDelay = (int)j;
         return count;
 }
 
@@ -1294,8 +1310,12 @@ static ssize_t
 store_tabletProgrammableDelay(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
+        long d;
 
-        aiptek->newSetting.programmableDelay = (int)simple_strtol(buf, NULL, 10);
+        if (strict_strtol(buf, 10, &d))
+                return -EINVAL;
+
+        aiptek->newSetting.programmableDelay = (int)d;
         return count;
 }
 
@@ -1541,8 +1561,11 @@ static ssize_t
 store_tabletWheel(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
+        long w;
+
+        if (strict_strtol(buf, 10, &w)) return -EINVAL;
 
-        aiptek->newSetting.wheel = (int)simple_strtol(buf, NULL, 10);
+        aiptek->newSetting.wheel = (int)w;
         return count;
 }
 
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 8583c766d565..b9b7fc6ff1eb 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -69,6 +69,17 @@ struct ts_event {
         int     ignore;
 };
 
+/*
+ * We allocate this separately to avoid cache line sharing issues when
+ * driver is used with DMA-based SPI controllers (like atmel_spi) on
+ * systems where main memory is not DMA-coherent (most non-x86 boards).
+ */
+struct ads7846_packet {
+        u8                      read_x, read_y, read_z1, read_z2, pwrdown;
+        u16                     dummy;          /* for the pwrdown read */
+        struct ts_event         tc;
+};
+
 struct ads7846 {
         struct input_dev        *input;
         char                    phys[32];
@@ -86,9 +97,7 @@ struct ads7846 {
         u16                     x_plate_ohms;
         u16                     pressure_max;
 
-        u8                      read_x, read_y, read_z1, read_z2, pwrdown;
-        u16                     dummy;          /* for the pwrdown read */
-        struct ts_event         tc;
+        struct ads7846_packet   *packet;
 
         struct spi_transfer     xfer[18];
         struct spi_message      msg[5];
@@ -463,10 +472,11 @@ static ssize_t ads7846_disable_store(struct device *dev,
                                      const char *buf, size_t count)
 {
         struct ads7846 *ts = dev_get_drvdata(dev);
-        char *endp;
-        int i;
+        long i;
+
+        if (strict_strtoul(buf, 10, &i))
+                return -EINVAL;
 
-        i = simple_strtoul(buf, &endp, 10);
         spin_lock_irq(&ts->lock);
 
         if (i)
@@ -512,16 +522,17 @@ static int get_pendown_state(struct ads7846 *ts)
 static void ads7846_rx(void *ads)
 {
         struct ads7846          *ts = ads;
+        struct ads7846_packet   *packet = ts->packet;
         unsigned                Rt;
         u16                     x, y, z1, z2;
 
         /* ads7846_rx_val() did in-place conversion (including byteswap) from
          * on-the-wire format as part of debouncing to get stable readings.
          */
-        x = ts->tc.x;
-        y = ts->tc.y;
-        z1 = ts->tc.z1;
-        z2 = ts->tc.z2;
+        x = packet->tc.x;
+        y = packet->tc.y;
+        z1 = packet->tc.z1;
+        z2 = packet->tc.z2;
 
         /* range filtering */
         if (x == MAX_12BIT)
@@ -545,10 +556,10 @@ static void ads7846_rx(void *ads)
          * the maximum. Don't report it to user space, repeat at least
          * once more the measurement
          */
-        if (ts->tc.ignore || Rt > ts->pressure_max) {
+        if (packet->tc.ignore || Rt > ts->pressure_max) {
 #ifdef VERBOSE
                 pr_debug("%s: ignored %d pressure %d\n",
-                        ts->spi->dev.bus_id, ts->tc.ignore, Rt);
+                        ts->spi->dev.bus_id, packet->tc.ignore, Rt);
 #endif
                 hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_PERIOD),
                               HRTIMER_MODE_REL);
@@ -641,6 +652,7 @@ static int ads7846_no_filter(void *ads, int data_idx, int *val)
 static void ads7846_rx_val(void *ads)
 {
         struct ads7846 *ts = ads;
+        struct ads7846_packet *packet = ts->packet;
         struct spi_message *m;
         struct spi_transfer *t;
         int val;
@@ -660,7 +672,7 @@ static void ads7846_rx_val(void *ads)
         case ADS7846_FILTER_REPEAT:
                 break;
         case ADS7846_FILTER_IGNORE:
-                ts->tc.ignore = 1;
+                packet->tc.ignore = 1;
                 /* Last message will contain ads7846_rx() as the
                  * completion function.
                  */
@@ -668,7 +680,7 @@ static void ads7846_rx_val(void *ads)
                 break;
         case ADS7846_FILTER_OK:
                 *(u16 *)t->rx_buf = val;
-                ts->tc.ignore = 0;
+                packet->tc.ignore = 0;
                 m = &ts->msg[++ts->msg_idx];
                 break;
         default:
@@ -773,7 +785,6 @@ static void ads7846_disable(struct ads7846 *ts)
         /* we know the chip's in lowpower mode since we always
          * leave it that way after every request
          */
-
 }
 
 /* Must be called with ts->lock held */
@@ -849,6 +860,7 @@ static int __devinit setup_pendown(struct spi_device *spi, struct ads7846 *ts)
 static int __devinit ads7846_probe(struct spi_device *spi)
 {
         struct ads7846                  *ts;
+        struct ads7846_packet           *packet;
         struct input_dev                *input_dev;
         struct ads7846_platform_data    *pdata = spi->dev.platform_data;
         struct spi_message              *m;
@@ -884,14 +896,16 @@ static int __devinit ads7846_probe(struct spi_device *spi)
                 return err;
 
         ts = kzalloc(sizeof(struct ads7846), GFP_KERNEL);
+        packet = kzalloc(sizeof(struct ads7846_packet), GFP_KERNEL);
         input_dev = input_allocate_device();
-        if (!ts || !input_dev) {
+        if (!ts || !packet || !input_dev) {
                 err = -ENOMEM;
                 goto err_free_mem;
         }
 
         dev_set_drvdata(&spi->dev, ts);
 
+        ts->packet = packet;
         ts->spi = spi;
         ts->input = input_dev;
         ts->vref_mv = pdata->vref_mv;
@@ -963,13 +977,13 @@ static int __devinit ads7846_probe(struct spi_device *spi)
         spi_message_init(m);
 
         /* y- still on; turn on only y+ (and ADC) */
-        ts->read_y = READ_Y(vref);
-        x->tx_buf = &ts->read_y;
+        packet->read_y = READ_Y(vref);
+        x->tx_buf = &packet->read_y;
         x->len = 1;
         spi_message_add_tail(x, m);
 
         x++;
-        x->rx_buf = &ts->tc.y;
+        x->rx_buf = &packet->tc.y;
         x->len = 2;
         spi_message_add_tail(x, m);
 
@@ -981,12 +995,12 @@ static int __devinit ads7846_probe(struct spi_device *spi)
                 x->delay_usecs = pdata->settle_delay_usecs;
 
                 x++;
-                x->tx_buf = &ts->read_y;
+                x->tx_buf = &packet->read_y;
                 x->len = 1;
                 spi_message_add_tail(x, m);
 
                 x++;
-                x->rx_buf = &ts->tc.y;
+                x->rx_buf = &packet->tc.y;
                 x->len = 2;
                 spi_message_add_tail(x, m);
         }
@@ -999,13 +1013,13 @@ static int __devinit ads7846_probe(struct spi_device *spi)
 
         /* turn y- off, x+ on, then leave in lowpower */
         x++;
-        ts->read_x = READ_X(vref);
-        x->tx_buf = &ts->read_x;
+        packet->read_x = READ_X(vref);
+        x->tx_buf = &packet->read_x;
         x->len = 1;
         spi_message_add_tail(x, m);
 
         x++;
-        x->rx_buf = &ts->tc.x;
+        x->rx_buf = &packet->tc.x;
         x->len = 2;
         spi_message_add_tail(x, m);
 
@@ -1014,12 +1028,12 @@ static int __devinit ads7846_probe(struct spi_device *spi)
                 x->delay_usecs = pdata->settle_delay_usecs;
 
                 x++;
-                x->tx_buf = &ts->read_x;
+                x->tx_buf = &packet->read_x;
                 x->len = 1;
                 spi_message_add_tail(x, m);
 
                 x++;
-                x->rx_buf = &ts->tc.x;
+                x->rx_buf = &packet->tc.x;
                 x->len = 2;
                 spi_message_add_tail(x, m);
         }
@@ -1033,13 +1047,13 @@ static int __devinit ads7846_probe(struct spi_device *spi)
                 spi_message_init(m);
 
                 x++;
-                ts->read_z1 = READ_Z1(vref);
-                x->tx_buf = &ts->read_z1;
+                packet->read_z1 = READ_Z1(vref);
+                x->tx_buf = &packet->read_z1;
                 x->len = 1;
                 spi_message_add_tail(x, m);
 
                 x++;
-                x->rx_buf = &ts->tc.z1;
+                x->rx_buf = &packet->tc.z1;
                 x->len = 2;
                 spi_message_add_tail(x, m);
 
@@ -1048,12 +1062,12 @@ static int __devinit ads7846_probe(struct spi_device *spi)
                         x->delay_usecs = pdata->settle_delay_usecs;
 
                         x++;
-                        x->tx_buf = &ts->read_z1;
+                        x->tx_buf = &packet->read_z1;
                         x->len = 1;
                         spi_message_add_tail(x, m);
 
                         x++;
-                        x->rx_buf = &ts->tc.z1;
+                        x->rx_buf = &packet->tc.z1;
                         x->len = 2;
                         spi_message_add_tail(x, m);
                 }
@@ -1065,13 +1079,13 @@ static int __devinit ads7846_probe(struct spi_device *spi)
                 spi_message_init(m);
 
                 x++;
-                ts->read_z2 = READ_Z2(vref);
-                x->tx_buf = &ts->read_z2;
+                packet->read_z2 = READ_Z2(vref);
+                x->tx_buf = &packet->read_z2;
                 x->len = 1;
                 spi_message_add_tail(x, m);
 
                 x++;
-                x->rx_buf = &ts->tc.z2;
+                x->rx_buf = &packet->tc.z2;
                 x->len = 2;
                 spi_message_add_tail(x, m);
 
@@ -1080,12 +1094,12 @@ static int __devinit ads7846_probe(struct spi_device *spi)
                         x->delay_usecs = pdata->settle_delay_usecs;
 
                         x++;
-                        x->tx_buf = &ts->read_z2;
+                        x->tx_buf = &packet->read_z2;
                         x->len = 1;
                         spi_message_add_tail(x, m);
 
                         x++;
-                        x->rx_buf = &ts->tc.z2;
+                        x->rx_buf = &packet->tc.z2;
                         x->len = 2;
                         spi_message_add_tail(x, m);
                 }
@@ -1099,13 +1113,13 @@ static int __devinit ads7846_probe(struct spi_device *spi)
         spi_message_init(m);
 
         x++;
-        ts->pwrdown = PWRDOWN;
-        x->tx_buf = &ts->pwrdown;
+        packet->pwrdown = PWRDOWN;
+        x->tx_buf = &packet->pwrdown;
         x->len = 1;
         spi_message_add_tail(x, m);
 
         x++;
-        x->rx_buf = &ts->dummy;
+        x->rx_buf = &packet->dummy;
         x->len = 2;
         CS_CHANGE(*x);
         spi_message_add_tail(x, m);
@@ -1158,6 +1172,7 @@ static int __devinit ads7846_probe(struct spi_device *spi)
                 ts->filter_cleanup(ts->filter_data);
  err_free_mem:
         input_free_device(input_dev);
+        kfree(packet);
         kfree(ts);
         return err;
 }
@@ -1183,6 +1198,7 @@ static int __devexit ads7846_remove(struct spi_device *spi)
         if (ts->filter_cleanup)
                 ts->filter_cleanup(ts->filter_data);
 
+        kfree(ts->packet);
         kfree(ts);
 
         dev_dbg(&spi->dev, "unregistered touchscreen\n");
diff --git a/drivers/input/touchscreen/atmel_tsadcc.c b/drivers/input/touchscreen/atmel_tsadcc.c
index eee126b19e8b..a89a6a8f05e6 100644
--- a/drivers/input/touchscreen/atmel_tsadcc.c
+++ b/drivers/input/touchscreen/atmel_tsadcc.c
@@ -91,6 +91,9 @@ struct atmel_tsadcc {
         char                    phys[32];
         struct clk              *clk;
         int                     irq;
+        unsigned int            prev_absx;
+        unsigned int            prev_absy;
+        unsigned char           bufferedmeasure;
 };
 
 static void __iomem             *tsc_base;
@@ -100,10 +103,9 @@ static void __iomem		*tsc_base;
 
 static irqreturn_t atmel_tsadcc_interrupt(int irq, void *dev)
 {
-        struct input_dev *input_dev = ((struct atmel_tsadcc *)dev)->input;
+        struct atmel_tsadcc     *ts_dev = (struct atmel_tsadcc *)dev;
+        struct input_dev        *input_dev = ts_dev->input;
 
-        unsigned int absx;
-        unsigned int absy;
         unsigned int status;
         unsigned int reg;
 
@@ -121,6 +123,7 @@ static irqreturn_t atmel_tsadcc_interrupt(int irq, void *dev)
                 atmel_tsadcc_write(ATMEL_TSADCC_IER, ATMEL_TSADCC_PENCNT);
 
                 input_report_key(input_dev, BTN_TOUCH, 0);
+                ts_dev->bufferedmeasure = 0;
                 input_sync(input_dev);
 
         } else if (status & ATMEL_TSADCC_PENCNT) {
@@ -138,16 +141,23 @@ static irqreturn_t atmel_tsadcc_interrupt(int irq, void *dev)
         } else if (status & ATMEL_TSADCC_EOC(3)) {
                 /* Conversion finished */
 
-                absx = atmel_tsadcc_read(ATMEL_TSADCC_CDR3) << 10;
-                absx /= atmel_tsadcc_read(ATMEL_TSADCC_CDR2);
-
-                absy = atmel_tsadcc_read(ATMEL_TSADCC_CDR1) << 10;
-                absy /= atmel_tsadcc_read(ATMEL_TSADCC_CDR0);
-
-                input_report_abs(input_dev, ABS_X, absx);
-                input_report_abs(input_dev, ABS_Y, absy);
-                input_report_key(input_dev, BTN_TOUCH, 1);
-                input_sync(input_dev);
+                if (ts_dev->bufferedmeasure) {
+                        /* Last measurement is always discarded, since it can
+                         * be erroneous.
+                         * Always report previous measurement */
+                        input_report_abs(input_dev, ABS_X, ts_dev->prev_absx);
+                        input_report_abs(input_dev, ABS_Y, ts_dev->prev_absy);
+                        input_report_key(input_dev, BTN_TOUCH, 1);
+                        input_sync(input_dev);
+                } else
+                        ts_dev->bufferedmeasure = 1;
+
+                /* Now make new measurement */
+                ts_dev->prev_absx = atmel_tsadcc_read(ATMEL_TSADCC_CDR3) << 10;
+                ts_dev->prev_absx /= atmel_tsadcc_read(ATMEL_TSADCC_CDR2);
+
+                ts_dev->prev_absy = atmel_tsadcc_read(ATMEL_TSADCC_CDR1) << 10;
+                ts_dev->prev_absy /= atmel_tsadcc_read(ATMEL_TSADCC_CDR0);
         }
 
         return IRQ_HANDLED;
@@ -223,6 +233,7 @@ static int __devinit atmel_tsadcc_probe(struct platform_device *pdev)
         }
 
         ts_dev->input = input_dev;
+        ts_dev->bufferedmeasure = 0;
 
         snprintf(ts_dev->phys, sizeof(ts_dev->phys),
                  "%s/input0", pdev->dev.bus_id);
diff --git a/drivers/input/touchscreen/mainstone-wm97xx.c b/drivers/input/touchscreen/mainstone-wm97xx.c
index 37a555f37306..ba648750a8d9 100644
--- a/drivers/input/touchscreen/mainstone-wm97xx.c
+++ b/drivers/input/touchscreen/mainstone-wm97xx.c
@@ -3,8 +3,7 @@
  *                         Wolfson WM97xx AC97 Codecs.
  *
  * Copyright 2004, 2007 Wolfson Microelectronics PLC.
- * Author: Liam Girdwood
- *         liam.girdwood@wolfsonmicro.com or linux@wolfsonmicro.com
+ * Author: Liam Girdwood <lrg@slimlogic.co.uk>
  * Parts Copyright : Ian Molton <spyro@f2s.com>
  *                   Andrew Zabolotny <zap@homelink.ru>
  *
@@ -296,6 +295,6 @@ module_init(mainstone_wm97xx_init);
 module_exit(mainstone_wm97xx_exit);
 
 /* Module information */
-MODULE_AUTHOR("Liam Girdwood <liam.girdwood@wolfsonmicro.com>");
+MODULE_AUTHOR("Liam Girdwood <lrg@slimlogic.co.uk>");
 MODULE_DESCRIPTION("wm97xx continuous touch driver for mainstone");
 MODULE_LICENSE("GPL");
diff --git a/drivers/input/touchscreen/wm9705.c b/drivers/input/touchscreen/wm9705.c
index 372efbc694ff..6b5be742c27d 100644
--- a/drivers/input/touchscreen/wm9705.c
+++ b/drivers/input/touchscreen/wm9705.c
@@ -2,8 +2,7 @@
  * wm9705.c  --  Codec driver for Wolfson WM9705 AC97 Codec.
  *
  * Copyright 2003, 2004, 2005, 2006, 2007 Wolfson Microelectronics PLC.
- * Author: Liam Girdwood
- *         liam.girdwood@wolfsonmicro.com or linux@wolfsonmicro.com
+ * Author: Liam Girdwood <lrg@slimlogic.co.uk>
  * Parts Copyright : Ian Molton <spyro@f2s.com>
  *                   Andrew Zabolotny <zap@homelink.ru>
  *                   Russell King <rmk@arm.linux.org.uk>
@@ -347,6 +346,6 @@ struct wm97xx_codec_drv wm9705_codec = {
 EXPORT_SYMBOL_GPL(wm9705_codec);
 
 /* Module information */
-MODULE_AUTHOR("Liam Girdwood <liam.girdwood@wolfsonmicro.com>");
+MODULE_AUTHOR("Liam Girdwood <lrg@slimlogic.co.uk>");
 MODULE_DESCRIPTION("WM9705 Touch Screen Driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/input/touchscreen/wm9712.c b/drivers/input/touchscreen/wm9712.c
index c8bb1e7335fc..7490b05c3566 100644
--- a/drivers/input/touchscreen/wm9712.c
+++ b/drivers/input/touchscreen/wm9712.c
@@ -2,8 +2,7 @@
  * wm9712.c  --  Codec driver for Wolfson WM9712 AC97 Codecs.
  *
  * Copyright 2003, 2004, 2005, 2006, 2007 Wolfson Microelectronics PLC.
- * Author: Liam Girdwood
- *         liam.girdwood@wolfsonmicro.com or linux@wolfsonmicro.com
+ * Author: Liam Girdwood <lrg@slimlogic.co.uk>
  * Parts Copyright : Ian Molton <spyro@f2s.com>
  *                   Andrew Zabolotny <zap@homelink.ru>
  *                   Russell King <rmk@arm.linux.org.uk>
@@ -462,6 +461,6 @@ struct wm97xx_codec_drv wm9712_codec = {
 EXPORT_SYMBOL_GPL(wm9712_codec);
 
 /* Module information */
-MODULE_AUTHOR("Liam Girdwood <liam.girdwood@wolfsonmicro.com>");
+MODULE_AUTHOR("Liam Girdwood <lrg@slimlogic.co.uk>");
 MODULE_DESCRIPTION("WM9712 Touch Screen Driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/input/touchscreen/wm9713.c b/drivers/input/touchscreen/wm9713.c
index 781ee83547e6..238b5132712e 100644
--- a/drivers/input/touchscreen/wm9713.c
+++ b/drivers/input/touchscreen/wm9713.c
@@ -2,8 +2,7 @@
  * wm9713.c  --  Codec touch driver for Wolfson WM9713 AC97 Codec.
  *
  * Copyright 2003, 2004, 2005, 2006, 2007, 2008 Wolfson Microelectronics PLC.
- * Author: Liam Girdwood
- *         liam.girdwood@wolfsonmicro.com or linux@wolfsonmicro.com
+ * Author: Liam Girdwood <lrg@slimlogic.co.uk>
  * Parts Copyright : Ian Molton <spyro@f2s.com>
  *                   Andrew Zabolotny <zap@homelink.ru>
  *                   Russell King <rmk@arm.linux.org.uk>
@@ -476,6 +475,6 @@ struct wm97xx_codec_drv wm9713_codec = {
 EXPORT_SYMBOL_GPL(wm9713_codec);
 
 /* Module information */
-MODULE_AUTHOR("Liam Girdwood <liam.girdwood@wolfsonmicro.com>");
+MODULE_AUTHOR("Liam Girdwood <lrg@slimlogic.co.uk>");
 MODULE_DESCRIPTION("WM9713 Touch Screen Driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c
index d589ab0e3adc..d15aa11d7056 100644
--- a/drivers/input/touchscreen/wm97xx-core.c
+++ b/drivers/input/touchscreen/wm97xx-core.c
@@ -3,8 +3,7 @@
  *                    and WM9713 AC97 Codecs.
  *
  * Copyright 2003, 2004, 2005, 2006, 2007, 2008 Wolfson Microelectronics PLC.
- * Author: Liam Girdwood
- *         liam.girdwood@wolfsonmicro.com or linux@wolfsonmicro.com
+ * Author: Liam Girdwood <lrg@slimlogic.co.uk>
  * Parts Copyright : Ian Molton <spyro@f2s.com>
  *                   Andrew Zabolotny <zap@homelink.ru>
  *                   Russell King <rmk@arm.linux.org.uk>
@@ -824,6 +823,6 @@ module_init(wm97xx_init);
 module_exit(wm97xx_exit);
 
 /* Module information */
-MODULE_AUTHOR("Liam Girdwood <liam.girdwood@wolfsonmicro.com>");
+MODULE_AUTHOR("Liam Girdwood <lrg@slimlogic.co.uk>");
 MODULE_DESCRIPTION("WM97xx Core - Touch Screen / AUX ADC / GPIO Driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index 871b0cbca5e4..1b5bf87c4cf4 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -1231,7 +1231,7 @@ static int capinc_tty_ioctl(struct tty_struct *tty, struct file * file,
         int error = 0;
         switch (cmd) {
         default:
-                error = n_tty_ioctl (tty, file, cmd, arg);
+                error = n_tty_ioctl_helper(tty, file, cmd, arg);
                 break;
         }
         return error;
@@ -1553,8 +1553,7 @@ static int __init capi_init(void)
                 return PTR_ERR(capi_class);
         }
 
-        device_create_drvdata(capi_class, NULL, MKDEV(capi_major, 0), NULL,
-                              "capi");
+        device_create(capi_class, NULL, MKDEV(capi_major, 0), NULL, "capi");
 
 #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
         if (capinc_tty_init() < 0) {
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
index 5e89fa177816..07052ed2a0c5 100644
--- a/drivers/isdn/gigaset/ser-gigaset.c
+++ b/drivers/isdn/gigaset/ser-gigaset.c
@@ -571,6 +571,7 @@ gigaset_tty_close(struct tty_struct *tty)
         }
 
         /* prevent other callers from entering ldisc methods */
+        /* FIXME: should use the tty state flags */
         tty->disc_data = NULL;
 
         if (!cs->hw.ser)
@@ -642,10 +643,11 @@ gigaset_tty_ioctl(struct tty_struct *tty, struct file *file,
                 return -ENXIO;
 
         switch (cmd) {
-        case TCGETS:
-        case TCGETA:
-                /* pass through to underlying serial device */
-                rc = n_tty_ioctl(tty, file, cmd, arg);
+
+        case FIONREAD:
+                /* unused, always return zero */
+                val = 0;
+                rc = put_user(val, p);
                 break;
 
         case TCFLSH:
@@ -659,20 +661,13 @@ gigaset_tty_ioctl(struct tty_struct *tty, struct file *file,
                         flush_send_queue(cs);
                         break;
                 }
-                /* flush the serial port's buffer */
-                rc = n_tty_ioctl(tty, file, cmd, arg);
-                break;
-
-        case FIONREAD:
-                /* unused, always return zero */
-                val = 0;
-                rc = put_user(val, p);
-                break;
+                /* Pass through */
 
         default:
-                rc = -ENOIOCTLCMD;
+                /* pass through to underlying serial device */
+                rc = n_tty_ioctl_helper(tty, file, cmd, arg);
+                break;
         }
-
         cs_put(cs);
         return rc;
 }
@@ -680,6 +675,8 @@ gigaset_tty_ioctl(struct tty_struct *tty, struct file *file,
 /*
  * Poll on the tty.
  * Unused, always return zero.
+ *
+ * FIXME: should probably return an exception - especially on hangup
  */
 static unsigned int
 gigaset_tty_poll(struct tty_struct *tty, struct file *file, poll_table *wait)
diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
index a5b941c327f7..c72565520e41 100644
--- a/drivers/isdn/hardware/avm/avm_cs.c
+++ b/drivers/isdn/hardware/avm/avm_cs.c
@@ -154,83 +154,50 @@ static void avmcs_detach(struct pcmcia_device *link)
     
 ======================================================================*/
 
-static int get_tuple(struct pcmcia_device *handle, tuple_t *tuple,
-                     cisparse_t *parse)
+static int avmcs_configcheck(struct pcmcia_device *p_dev,
+                             cistpl_cftable_entry_t *cf,
+                             cistpl_cftable_entry_t *dflt,
+                             unsigned int vcc,
+                             void *priv_data)
 {
-    int i = pcmcia_get_tuple_data(handle, tuple);
-    if (i != CS_SUCCESS) return i;
-    return pcmcia_parse_tuple(handle, tuple, parse);
-}
-
-static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple,
-                     cisparse_t *parse)
-{
-    int i = pcmcia_get_first_tuple(handle, tuple);
-    if (i != CS_SUCCESS) return i;
-    return get_tuple(handle, tuple, parse);
-}
-
-static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,
-                     cisparse_t *parse)
-{
-    int i = pcmcia_get_next_tuple(handle, tuple);
-    if (i != CS_SUCCESS) return i;
-    return get_tuple(handle, tuple, parse);
+        if (cf->io.nwin <= 0)
+                return -ENODEV;
+
+        p_dev->io.BasePort1 = cf->io.win[0].base;
+        p_dev->io.NumPorts1 = cf->io.win[0].len;
+        p_dev->io.NumPorts2 = 0;
+        printk(KERN_INFO "avm_cs: testing i/o %#x-%#x\n",
+               p_dev->io.BasePort1,
+               p_dev->io.BasePort1+p_dev->io.NumPorts1-1);
+        return pcmcia_request_io(p_dev, &p_dev->io);
 }
 
 static int avmcs_config(struct pcmcia_device *link)
 {
-    tuple_t tuple;
-    cisparse_t parse;
-    cistpl_cftable_entry_t *cf = &parse.cftable_entry;
     local_info_t *dev;
     int i;
-    u_char buf[64];
     char devname[128];
     int cardtype;
     int (*addcard)(unsigned int port, unsigned irq);
 
     dev = link->priv;
 
-    do {
-        devname[0] = 0;
-        if (link->prod_id[1])
-                strlcpy(devname, link->prod_id[1], sizeof(devname));
+    devname[0] = 0;
+    if (link->prod_id[1])
+            strlcpy(devname, link->prod_id[1], sizeof(devname));
 
-        /*
-         * find IO port
-         */
-        tuple.TupleData = (cisdata_t *)buf;
-        tuple.TupleOffset = 0; tuple.TupleDataMax = 255;
-        tuple.Attributes = 0;
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        i = first_tuple(link, &tuple, &parse);
-        while (i == CS_SUCCESS) {
-            if (cf->io.nwin > 0) {
-                link->conf.ConfigIndex = cf->index;
-                link->io.BasePort1 = cf->io.win[0].base;
-                link->io.NumPorts1 = cf->io.win[0].len;
-                link->io.NumPorts2 = 0;
-                printk(KERN_INFO "avm_cs: testing i/o %#x-%#x\n",
-                        link->io.BasePort1,
-                        link->io.BasePort1+link->io.NumPorts1-1);
-                i = pcmcia_request_io(link, &link->io);
-                if (i == CS_SUCCESS) goto found_port;
-            }
-            i = next_tuple(link, &tuple, &parse);
-        }
-
-found_port:
-        if (i != CS_SUCCESS) {
-            cs_error(link, RequestIO, i);
-            break;
-        }
+    /*
+     * find IO port
+     */
+    if (pcmcia_loop_config(link, avmcs_configcheck, NULL))
+            return -ENODEV;
 
+    do {
         /*
          * allocate an interrupt line
          */
         i = pcmcia_request_irq(link, &link->irq);
-        if (i != CS_SUCCESS) {
+        if (i != 0) {
             cs_error(link, RequestIRQ, i);
             /* undo */
             pcmcia_disable_device(link);
@@ -241,7 +208,7 @@ found_port:
          * configure the PCMCIA socket
           */
         i = pcmcia_request_configuration(link, &link->conf);
-        if (i != CS_SUCCESS) {
+        if (i != 0) {
             cs_error(link, RequestConfiguration, i);
             pcmcia_disable_device(link);
             break;
diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c
index fc6cc2c065b8..23560c897ec3 100644
--- a/drivers/isdn/hisax/avma1_cs.c
+++ b/drivers/isdn/hisax/avma1_cs.c
@@ -174,38 +174,29 @@ static void avma1cs_detach(struct pcmcia_device *link)
     
 ======================================================================*/
 
-static int get_tuple(struct pcmcia_device *handle, tuple_t *tuple,
-                     cisparse_t *parse)
+static int avma1cs_configcheck(struct pcmcia_device *p_dev,
+                               cistpl_cftable_entry_t *cf,
+                               cistpl_cftable_entry_t *dflt,
+                               unsigned int vcc,
+                               void *priv_data)
 {
-    int i = pcmcia_get_tuple_data(handle, tuple);
-    if (i != CS_SUCCESS) return i;
-    return pcmcia_parse_tuple(handle, tuple, parse);
+        if (cf->io.nwin <= 0)
+                return -ENODEV;
+
+        p_dev->io.BasePort1 = cf->io.win[0].base;
+        p_dev->io.NumPorts1 = cf->io.win[0].len;
+        p_dev->io.NumPorts2 = 0;
+        printk(KERN_INFO "avma1_cs: testing i/o %#x-%#x\n",
+               p_dev->io.BasePort1,
+               p_dev->io.BasePort1+p_dev->io.NumPorts1-1);
+        return pcmcia_request_io(p_dev, &p_dev->io);
 }
 
-static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple,
-                     cisparse_t *parse)
-{
-    int i = pcmcia_get_first_tuple(handle, tuple);
-    if (i != CS_SUCCESS) return i;
-    return get_tuple(handle, tuple, parse);
-}
-
-static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,
-                     cisparse_t *parse)
-{
-    int i = pcmcia_get_next_tuple(handle, tuple);
-    if (i != CS_SUCCESS) return i;
-    return get_tuple(handle, tuple, parse);
-}
 
 static int avma1cs_config(struct pcmcia_device *link)
 {
-    tuple_t tuple;
-    cisparse_t parse;
-    cistpl_cftable_entry_t *cf = &parse.cftable_entry;
     local_info_t *dev;
     int i;
-    u_char buf[64];
     char devname[128];
     IsdnCard_t  icard;
     int busy = 0;
@@ -214,45 +205,19 @@ static int avma1cs_config(struct pcmcia_device *link)
 
     DEBUG(0, "avma1cs_config(0x%p)\n", link);
 
-    do {
-        devname[0] = 0;
-        if (link->prod_id[1])
-                strlcpy(devname, link->prod_id[1], sizeof(devname));
+    devname[0] = 0;
+    if (link->prod_id[1])
+            strlcpy(devname, link->prod_id[1], sizeof(devname));
 
-        /*
-         * find IO port
-         */
-        tuple.TupleData = (cisdata_t *)buf;
-        tuple.TupleOffset = 0; tuple.TupleDataMax = 255;
-        tuple.Attributes = 0;
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        i = first_tuple(link, &tuple, &parse);
-        while (i == CS_SUCCESS) {
-            if (cf->io.nwin > 0) {
-                link->conf.ConfigIndex = cf->index;
-                link->io.BasePort1 = cf->io.win[0].base;
-                link->io.NumPorts1 = cf->io.win[0].len;
-                link->io.NumPorts2 = 0;
-                printk(KERN_INFO "avma1_cs: testing i/o %#x-%#x\n",
-                        link->io.BasePort1,
-                        link->io.BasePort1+link->io.NumPorts1 - 1);
-                i = pcmcia_request_io(link, &link->io);
-                if (i == CS_SUCCESS) goto found_port;
-            }
-            i = next_tuple(link, &tuple, &parse);
-        }
+    if (pcmcia_loop_config(link, avma1cs_configcheck, NULL))
+            return -ENODEV;
 
-found_port:
-        if (i != CS_SUCCESS) {
-            cs_error(link, RequestIO, i);
-            break;
-        }
-        
+    do {
         /*
          * allocate an interrupt line
          */
         i = pcmcia_request_irq(link, &link->irq);
-        if (i != CS_SUCCESS) {
+        if (i != 0) {
             cs_error(link, RequestIRQ, i);
             /* undo */
             pcmcia_disable_device(link);
@@ -263,7 +228,7 @@ found_port:
          * configure the PCMCIA socket
          */
         i = pcmcia_request_configuration(link, &link->conf);
-        if (i != CS_SUCCESS) {
+        if (i != 0) {
             cs_error(link, RequestConfiguration, i);
             pcmcia_disable_device(link);
             break;
diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c
index db7e64424afe..f4d0fe29bcf8 100644
--- a/drivers/isdn/hisax/elsa_cs.c
+++ b/drivers/isdn/hisax/elsa_cs.c
@@ -203,82 +203,55 @@ static void elsa_cs_detach(struct pcmcia_device *link)
     device available to the system.
 
 ======================================================================*/
-static int get_tuple(struct pcmcia_device *handle, tuple_t *tuple,
-                     cisparse_t *parse)
-{
-    int i = pcmcia_get_tuple_data(handle, tuple);
-    if (i != CS_SUCCESS) return i;
-    return pcmcia_parse_tuple(handle, tuple, parse);
-}
-
-static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple,
-                     cisparse_t *parse)
-{
-    int i = pcmcia_get_first_tuple(handle, tuple);
-    if (i != CS_SUCCESS) return i;
-    return get_tuple(handle, tuple, parse);
-}
 
-static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,
-                     cisparse_t *parse)
+static int elsa_cs_configcheck(struct pcmcia_device *p_dev,
+                               cistpl_cftable_entry_t *cf,
+                               cistpl_cftable_entry_t *dflt,
+                               unsigned int vcc,
+                               void *priv_data)
 {
-    int i = pcmcia_get_next_tuple(handle, tuple);
-    if (i != CS_SUCCESS) return i;
-    return get_tuple(handle, tuple, parse);
+        int j;
+
+        if ((cf->io.nwin > 0) && cf->io.win[0].base) {
+                printk(KERN_INFO "(elsa_cs: looks like the 96 model)\n");
+                p_dev->io.BasePort1 = cf->io.win[0].base;
+                if (!pcmcia_request_io(p_dev, &p_dev->io))
+                        return 0;
+        } else {
+                printk(KERN_INFO "(elsa_cs: looks like the 97 model)\n");
+                for (j = 0x2f0; j > 0x100; j -= 0x10) {
+                        p_dev->io.BasePort1 = j;
+                        if (!pcmcia_request_io(p_dev, &p_dev->io))
+                                return 0;
+                }
+        }
+        return -ENODEV;
 }
 
 static int elsa_cs_config(struct pcmcia_device *link)
 {
-    tuple_t tuple;
-    cisparse_t parse;
     local_info_t *dev;
-    int i, j, last_fn;
-    u_short buf[128];
-    cistpl_cftable_entry_t *cf = &parse.cftable_entry;
+    int i, last_fn;
     IsdnCard_t icard;
 
     DEBUG(0, "elsa_config(0x%p)\n", link);
     dev = link->priv;
 
-    tuple.TupleData = (cisdata_t *)buf;
-    tuple.TupleOffset = 0; tuple.TupleDataMax = 255;
-    tuple.Attributes = 0;
-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-    i = first_tuple(link, &tuple, &parse);
-    while (i == CS_SUCCESS) {
-        if ( (cf->io.nwin > 0) && cf->io.win[0].base) {
-            printk(KERN_INFO "(elsa_cs: looks like the 96 model)\n");
-            link->conf.ConfigIndex = cf->index;
-            link->io.BasePort1 = cf->io.win[0].base;
-            i = pcmcia_request_io(link, &link->io);
-            if (i == CS_SUCCESS) break;
-        } else {
-          printk(KERN_INFO "(elsa_cs: looks like the 97 model)\n");
-          link->conf.ConfigIndex = cf->index;
-          for (i = 0, j = 0x2f0; j > 0x100; j -= 0x10) {
-            link->io.BasePort1 = j;
-            i = pcmcia_request_io(link, &link->io);
-            if (i == CS_SUCCESS) break;
-          }
-          break;
-        }
-        i = next_tuple(link, &tuple, &parse);
-    }
-
-    if (i != CS_SUCCESS) {
+    i = pcmcia_loop_config(link, elsa_cs_configcheck, NULL);
+    if (i != 0) {
         last_fn = RequestIO;
         goto cs_failed;
     }
 
     i = pcmcia_request_irq(link, &link->irq);
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
         link->irq.AssignedIRQ = 0;
         last_fn = RequestIRQ;
         goto cs_failed;
     }
 
     i = pcmcia_request_configuration(link, &link->conf);
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
       last_fn = RequestConfiguration;
       goto cs_failed;
     }
diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c
index 439cb530def8..9a3c9f5e4fe8 100644
--- a/drivers/isdn/hisax/sedlbauer_cs.c
+++ b/drivers/isdn/hisax/sedlbauer_cs.c
@@ -217,101 +217,61 @@ static void sedlbauer_detach(struct pcmcia_device *link)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
-static int sedlbauer_config(struct pcmcia_device *link)
+static int sedlbauer_config_check(struct pcmcia_device *p_dev,
+                                  cistpl_cftable_entry_t *cfg,
+                                  cistpl_cftable_entry_t *dflt,
+                                  unsigned int vcc,
+                                  void *priv_data)
 {
-    local_info_t *dev = link->priv;
-    tuple_t tuple;
-    cisparse_t parse;
-    int last_fn, last_ret;
-    u8 buf[64];
-    config_info_t conf;
-    win_req_t req;
-    memreq_t map;
-    IsdnCard_t  icard;
-
-    DEBUG(0, "sedlbauer_config(0x%p)\n", link);
-
-    tuple.Attributes = 0;
-    tuple.TupleData = buf;
-    tuple.TupleDataMax = sizeof(buf);
-    tuple.TupleOffset = 0;
+        win_req_t *req = priv_data;
 
-    CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(link, &conf));
+        if (cfg->index == 0)
+                return -ENODEV;
 
-    /*
-      In this loop, we scan the CIS for configuration table entries,
-      each of which describes a valid card configuration, including
-      voltage, IO window, memory window, and interrupt settings.
-
-      We make no assumptions about the card to be configured: we use
-      just the information available in the CIS.  In an ideal world,
-      this would work for any PCMCIA card, but it requires a complete
-      and accurate CIS.  In practice, a driver usually "knows" most of
-      these things without consulting the CIS, and most client drivers
-      will only use the CIS to fill in implementation-defined details.
-    */
-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-    while (1) {
-        cistpl_cftable_entry_t dflt = { 0 };
-        cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
-        if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
-                pcmcia_parse_tuple(link, &tuple, &parse) != 0)
-            goto next_entry;
-
-        if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg;
-        if (cfg->index == 0) goto next_entry;
-        link->conf.ConfigIndex = cfg->index;
-        
         /* Does this card need audio output? */
         if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
-            link->conf.Attributes |= CONF_ENABLE_SPKR;
-            link->conf.Status = CCSR_AUDIO_ENA;
+                p_dev->conf.Attributes |= CONF_ENABLE_SPKR;
+                p_dev->conf.Status = CCSR_AUDIO_ENA;
         }
-        
+
         /* Use power settings for Vcc and Vpp if present */
         /*  Note that the CIS values need to be rescaled */
         if (cfg->vcc.present & (1<<CISTPL_POWER_VNOM)) {
-            if (conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM]/10000)
-                goto next_entry;
-        } else if (dflt.vcc.present & (1<<CISTPL_POWER_VNOM)) {
-            if (conf.Vcc != dflt.vcc.param[CISTPL_POWER_VNOM]/10000)
-                goto next_entry;
+                if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM]/10000)
+                        return -ENODEV;
+        } else if (dflt->vcc.present & (1<<CISTPL_POWER_VNOM)) {
+                if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM]/10000)
+                        return -ENODEV;
         }
-            
+
         if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM))
-            link->conf.Vpp =
-                cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
-        else if (dflt.vpp1.present & (1<<CISTPL_POWER_VNOM))
-            link->conf.Vpp =
-                dflt.vpp1.param[CISTPL_POWER_VNOM]/10000;
-        
+                p_dev->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
+        else if (dflt->vpp1.present & (1<<CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM]/10000;
+
         /* Do we need to allocate an interrupt? */
-        if (cfg->irq.IRQInfo1 || dflt.irq.IRQInfo1)
-            link->conf.Attributes |= CONF_ENABLE_IRQ;
-        
+        if (cfg->irq.IRQInfo1 || dflt->irq.IRQInfo1)
+                p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
+
         /* IO window settings */
-        link->io.NumPorts1 = link->io.NumPorts2 = 0;
-        if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
-            cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io;
-            link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-            if (!(io->flags & CISTPL_IO_8BIT))
-                link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
-            if (!(io->flags & CISTPL_IO_16BIT))
-                link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-/* new in dummy.cs 2001/01/28 MN 
-            link->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
-*/
-            link->io.BasePort1 = io->win[0].base;
-            link->io.NumPorts1 = io->win[0].len;
-            if (io->nwin > 1) {
-                link->io.Attributes2 = link->io.Attributes1;
-                link->io.BasePort2 = io->win[1].base;
-                link->io.NumPorts2 = io->win[1].len;
-            }
-            /* This reserves IO space but doesn't actually enable it */
-            if (pcmcia_request_io(link, &link->io) != 0)
-                goto next_entry;
+        p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
+        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
+                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+                if (!(io->flags & CISTPL_IO_8BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+                if (!(io->flags & CISTPL_IO_16BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                p_dev->io.BasePort1 = io->win[0].base;
+                p_dev->io.NumPorts1 = io->win[0].len;
+                if (io->nwin > 1) {
+                        p_dev->io.Attributes2 = p_dev->io.Attributes1;
+                        p_dev->io.BasePort2 = io->win[1].base;
+                        p_dev->io.NumPorts2 = io->win[1].len;
+                }
+                /* This reserves IO space but doesn't actually enable it */
+                if (pcmcia_request_io(p_dev, &p_dev->io) != 0)
+                        return -ENODEV;
         }
 
         /*
@@ -325,30 +285,54 @@ static int sedlbauer_config(struct pcmcia_device *link)
           needs to be mapped to virtual space with ioremap() before it
           is used.
         */
-        if ((cfg->mem.nwin > 0) || (dflt.mem.nwin > 0)) {
-            cistpl_mem_t *mem =
-                (cfg->mem.nwin) ? &cfg->mem : &dflt.mem;
-            req.Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM;
-            req.Attributes |= WIN_ENABLE;
-            req.Base = mem->win[0].host_addr;
-            req.Size = mem->win[0].len;
-/* new in dummy.cs 2001/01/28 MN 
-            if (req.Size < 0x1000)
-                req.Size = 0x1000;
-*/
-            req.AccessSpeed = 0;
-            if (pcmcia_request_window(&link, &req, &link->win) != 0)
-                goto next_entry;
-            map.Page = 0; map.CardOffset = mem->win[0].card_addr;
-            if (pcmcia_map_mem_page(link->win, &map) != 0)
-                goto next_entry;
+        if ((cfg->mem.nwin > 0) || (dflt->mem.nwin > 0)) {
+                cistpl_mem_t *mem = (cfg->mem.nwin) ? &cfg->mem : &dflt->mem;
+                memreq_t map;
+                req->Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM;
+                req->Attributes |= WIN_ENABLE;
+                req->Base = mem->win[0].host_addr;
+                req->Size = mem->win[0].len;
+                req->AccessSpeed = 0;
+                if (pcmcia_request_window(&p_dev, req, &p_dev->win) != 0)
+                        return -ENODEV;
+                map.Page = 0;
+                map.CardOffset = mem->win[0].card_addr;
+                if (pcmcia_map_mem_page(p_dev->win, &map) != 0)
+                        return -ENODEV;
         }
-        /* If we got this far, we're cool! */
-        break;
+        return 0;
+}
 
-    next_entry:
-        CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
-    }
+
+
+static int sedlbauer_config(struct pcmcia_device *link)
+{
+    local_info_t *dev = link->priv;
+    win_req_t *req;
+    int last_fn, last_ret;
+    IsdnCard_t  icard;
+
+    DEBUG(0, "sedlbauer_config(0x%p)\n", link);
+
+    req = kzalloc(sizeof(win_req_t), GFP_KERNEL);
+    if (!req)
+            return -ENOMEM;
+
+    /*
+      In this loop, we scan the CIS for configuration table entries,
+      each of which describes a valid card configuration, including
+      voltage, IO window, memory window, and interrupt settings.
+
+      We make no assumptions about the card to be configured: we use
+      just the information available in the CIS.  In an ideal world,
+      this would work for any PCMCIA card, but it requires a complete
+      and accurate CIS.  In practice, a driver usually "knows" most of
+      these things without consulting the CIS, and most client drivers
+      will only use the CIS to fill in implementation-defined details.
+    */
+    last_ret = pcmcia_loop_config(link, sedlbauer_config_check, req);
+    if (last_ret)
+            goto failed;
 
     /*
        Allocate an interrupt line.  Note that this does not assign a
@@ -387,8 +371,8 @@ static int sedlbauer_config(struct pcmcia_device *link)
         printk(" & 0x%04x-0x%04x", link->io.BasePort2,
                link->io.BasePort2+link->io.NumPorts2-1);
     if (link->win)
-        printk(", mem 0x%06lx-0x%06lx", req.Base,
-               req.Base+req.Size-1);
+        printk(", mem 0x%06lx-0x%06lx", req->Base,
+               req->Base+req->Size-1);
     printk("\n");
 
     icard.para[0] = link->irq.AssignedIRQ;
@@ -409,6 +393,7 @@ static int sedlbauer_config(struct pcmcia_device *link)
 
 cs_failed:
     cs_error(link, last_fn, last_ret);
+failed:
     sedlbauer_release(link);
     return -ENODEV;
 
diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c
index ab4bd455450e..623d111544d4 100644
--- a/drivers/isdn/hisax/teles_cs.c
+++ b/drivers/isdn/hisax/teles_cs.c
@@ -193,82 +193,55 @@ static void teles_detach(struct pcmcia_device *link)
     device available to the system.
 
 ======================================================================*/
-static int get_tuple(struct pcmcia_device *handle, tuple_t *tuple,
-                     cisparse_t *parse)
-{
-    int i = pcmcia_get_tuple_data(handle, tuple);
-    if (i != CS_SUCCESS) return i;
-    return pcmcia_parse_tuple(handle, tuple, parse);
-}
-
-static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple,
-                     cisparse_t *parse)
-{
-    int i = pcmcia_get_first_tuple(handle, tuple);
-    if (i != CS_SUCCESS) return i;
-    return get_tuple(handle, tuple, parse);
-}
 
-static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,
-                     cisparse_t *parse)
+static int teles_cs_configcheck(struct pcmcia_device *p_dev,
+                                cistpl_cftable_entry_t *cf,
+                                cistpl_cftable_entry_t *dflt,
+                                unsigned int vcc,
+                                void *priv_data)
 {
-    int i = pcmcia_get_next_tuple(handle, tuple);
-    if (i != CS_SUCCESS) return i;
-    return get_tuple(handle, tuple, parse);
+        int j;
+
+        if ((cf->io.nwin > 0) && cf->io.win[0].base) {
+                printk(KERN_INFO "(teles_cs: looks like the 96 model)\n");
+                p_dev->io.BasePort1 = cf->io.win[0].base;
+                if (!pcmcia_request_io(p_dev, &p_dev->io))
+                        return 0;
+        } else {
+                printk(KERN_INFO "(teles_cs: looks like the 97 model)\n");
+                for (j = 0x2f0; j > 0x100; j -= 0x10) {
+                        p_dev->io.BasePort1 = j;
+                        if (!pcmcia_request_io(p_dev, &p_dev->io))
+                                return 0;
+                }
+        }
+        return -ENODEV;
 }
 
 static int teles_cs_config(struct pcmcia_device *link)
 {
-    tuple_t tuple;
-    cisparse_t parse;
     local_info_t *dev;
-    int i, j, last_fn;
-    u_short buf[128];
-    cistpl_cftable_entry_t *cf = &parse.cftable_entry;
+    int i, last_fn;
     IsdnCard_t icard;
 
     DEBUG(0, "teles_config(0x%p)\n", link);
     dev = link->priv;
 
-    tuple.TupleData = (cisdata_t *)buf;
-    tuple.TupleOffset = 0; tuple.TupleDataMax = 255;
-    tuple.Attributes = 0;
-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-    i = first_tuple(link, &tuple, &parse);
-    while (i == CS_SUCCESS) {
-        if ( (cf->io.nwin > 0) && cf->io.win[0].base) {
-            printk(KERN_INFO "(teles_cs: looks like the 96 model)\n");
-            link->conf.ConfigIndex = cf->index;
-            link->io.BasePort1 = cf->io.win[0].base;
-            i = pcmcia_request_io(link, &link->io);
-            if (i == CS_SUCCESS) break;
-        } else {
-          printk(KERN_INFO "(teles_cs: looks like the 97 model)\n");
-          link->conf.ConfigIndex = cf->index;
-          for (i = 0, j = 0x2f0; j > 0x100; j -= 0x10) {
-            link->io.BasePort1 = j;
-            i = pcmcia_request_io(link, &link->io);
-            if (i == CS_SUCCESS) break;
-          }
-          break;
-        }
-        i = next_tuple(link, &tuple, &parse);
-    }
-
-    if (i != CS_SUCCESS) {
+    i = pcmcia_loop_config(link, teles_cs_configcheck, NULL);
+    if (i != 0) {
         last_fn = RequestIO;
         goto cs_failed;
     }
 
     i = pcmcia_request_irq(link, &link->irq);
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
         link->irq.AssignedIRQ = 0;
         last_fn = RequestIRQ;
         goto cs_failed;
     }
 
     i = pcmcia_request_configuration(link, &link->conf);
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
       last_fn = RequestConfiguration;
       goto cs_failed;
     }
diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
index e92b1ba4b45e..c2f51cc50760 100644
--- a/drivers/isdn/mISDN/dsp_cmx.c
+++ b/drivers/isdn/mISDN/dsp_cmx.c
@@ -452,10 +452,10 @@ one_member:
                         if (finddsp->features.pcm_id == dsp->features.pcm_id) {
                                 if (finddsp->pcm_slot_rx >= 0 &&
                                     finddsp->pcm_slot_rx < sizeof(freeslots))
-                                        freeslots[finddsp->pcm_slot_tx] = 0;
+                                        freeslots[finddsp->pcm_slot_rx] = 0;
                                 if (finddsp->pcm_slot_tx >= 0 &&
                                     finddsp->pcm_slot_tx < sizeof(freeslots))
-                                        freeslots[finddsp->pcm_slot_rx] = 0;
+                                        freeslots[finddsp->pcm_slot_tx] = 0;
                         }
                 }
                 i = 0;
diff --git a/drivers/isdn/mISDN/timerdev.c b/drivers/isdn/mISDN/timerdev.c
index e7462924b505..875fabe16e36 100644
--- a/drivers/isdn/mISDN/timerdev.c
+++ b/drivers/isdn/mISDN/timerdev.c
@@ -61,7 +61,7 @@ mISDN_open(struct inode *ino, struct file *filep)
         init_waitqueue_head(&dev->wait);
         filep->private_data = dev;
         __module_get(THIS_MODULE);
-        return 0;
+        return nonseekable_open(ino, filep);
 }
 
 static int
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index 559a40861c39..ee74ee7b2acc 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -103,8 +103,8 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev)
 {
         int rc;
 
-        led_cdev->dev = device_create_drvdata(leds_class, parent, 0, led_cdev,
-                                              "%s", led_cdev->name);
+        led_cdev->dev = device_create(leds_class, parent, 0, led_cdev,
+                                      "%s", led_cdev->name);
         if (IS_ERR(led_cdev->dev))
                 return PTR_ERR(led_cdev->dev);
 
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index cae52485208a..23741cec45e3 100644
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -862,8 +862,7 @@ adbdev_init(void)
         adb_dev_class = class_create(THIS_MODULE, "adb");
         if (IS_ERR(adb_dev_class))
                 return;
-        device_create_drvdata(adb_dev_class, NULL, MKDEV(ADB_MAJOR, 0), NULL,
-                              "adb");
+        device_create(adb_dev_class, NULL, MKDEV(ADB_MAJOR, 0), NULL, "adb");
 
         platform_device_register(&adb_pfdev);
         platform_driver_probe(&adb_pfdrv, adb_dummy_probe);
diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 07d92c11b5d8..2281b5098e95 100644
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -30,6 +30,20 @@ config BLK_DEV_MD
 
           If unsure, say N.
 
+config MD_AUTODETECT
+        bool "Autodetect RAID arrays during kernel boot"
+        depends on BLK_DEV_MD=y
+        default y
+        ---help---
+          If you say Y here, then the kernel will try to autodetect raid
+          arrays as part of its boot process. 
+
+          If you don't use raid and say Y, this autodetection can cause 
+          a several-second delay in the boot time due to various
+          synchronisation steps that are part of this step.
+
+          If unsure, say Y.
+
 config MD_LINEAR
         tristate "Linear (append) mode"
         depends on BLK_DEV_MD
diff --git a/drivers/md/faulty.c b/drivers/md/faulty.c
index 268547dbfbd3..f26c1f9a475b 100644
--- a/drivers/md/faulty.c
+++ b/drivers/md/faulty.c
@@ -287,6 +287,8 @@ static int run(mddev_t *mddev)
         int i;
 
         conf_t *conf = kmalloc(sizeof(*conf), GFP_KERNEL);
+        if (!conf)
+                return -ENOMEM;
 
         for (i=0; i<Modes; i++) {
                 atomic_set(&conf->counters[i], 0);
diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index b9cbee688fae..190147c79e79 100644
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -16,16 +16,8 @@
    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  
 */
 
-#include <linux/module.h>
-
-#include <linux/raid/md.h>
-#include <linux/slab.h>
 #include <linux/raid/linear.h>
 
-#define MAJOR_NR MD_MAJOR
-#define MD_DRIVER
-#define MD_PERSONALITY
-
 /*
  * find which device holds a particular offset 
  */
@@ -33,16 +25,15 @@ static inline dev_info_t *which_dev(mddev_t *mddev, sector_t sector)
 {
         dev_info_t *hash;
         linear_conf_t *conf = mddev_to_conf(mddev);
-        sector_t block = sector >> 1;
 
         /*
          * sector_div(a,b) returns the remainer and sets a to a/b
          */
-        block >>= conf->preshift;
-        (void)sector_div(block, conf->hash_spacing);
-        hash = conf->hash_table[block];
+        sector >>= conf->sector_shift;
+        (void)sector_div(sector, conf->spacing);
+        hash = conf->hash_table[sector];
 
-        while ((sector>>1) >= (hash->size + hash->offset))
+        while (sector >= hash->num_sectors + hash->start_sector)
                 hash++;
         return hash;
 }
@@ -65,7 +56,7 @@ static int linear_mergeable_bvec(struct request_queue *q,
         sector_t sector = bvm->bi_sector + get_start_sect(bvm->bi_bdev);
 
         dev0 = which_dev(mddev, sector);
-        maxsectors = (dev0->size << 1) - (sector - (dev0->offset<<1));
+        maxsectors = dev0->num_sectors - (sector - dev0->start_sector);
 
         if (maxsectors < bio_sectors)
                 maxsectors = 0;
@@ -112,8 +103,8 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks)
         dev_info_t **table;
         mdk_rdev_t *rdev;
         int i, nb_zone, cnt;
-        sector_t min_spacing;
-        sector_t curr_offset;
+        sector_t min_sectors;
+        sector_t curr_sector;
         struct list_head *tmp;
 
         conf = kzalloc (sizeof (*conf) + raid_disks*sizeof(dev_info_t),
@@ -145,7 +136,7 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks)
                     mddev->queue->max_sectors > (PAGE_SIZE>>9))
                         blk_queue_max_sectors(mddev->queue, PAGE_SIZE>>9);
 
-                disk->size = rdev->size;
+                disk->num_sectors = rdev->size * 2;
                 conf->array_sectors += rdev->size * 2;
 
                 cnt++;
@@ -155,34 +146,34 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks)
                 goto out;
         }
 
-        min_spacing = conf->array_sectors / 2;
-        sector_div(min_spacing, PAGE_SIZE/sizeof(struct dev_info *));
+        min_sectors = conf->array_sectors;
+        sector_div(min_sectors, PAGE_SIZE/sizeof(struct dev_info *));
 
-        /* min_spacing is the minimum spacing that will fit the hash
+        /* min_sectors is the minimum spacing that will fit the hash
          * table in one PAGE.  This may be much smaller than needed.
          * We find the smallest non-terminal set of consecutive devices
-         * that is larger than min_spacing as use the size of that as
+         * that is larger than min_sectors and use the size of that as
          * the actual spacing
          */
-        conf->hash_spacing = conf->array_sectors / 2;
+        conf->spacing = conf->array_sectors;
         for (i=0; i < cnt-1 ; i++) {
-                sector_t sz = 0;
+                sector_t tmp = 0;
                 int j;
-                for (j = i; j < cnt - 1 && sz < min_spacing; j++)
-                        sz += conf->disks[j].size;
-                if (sz >= min_spacing && sz < conf->hash_spacing)
-                        conf->hash_spacing = sz;
+                for (j = i; j < cnt - 1 && tmp < min_sectors; j++)
+                        tmp += conf->disks[j].num_sectors;
+                if (tmp >= min_sectors && tmp < conf->spacing)
+                        conf->spacing = tmp;
         }
 
-        /* hash_spacing may be too large for sector_div to work with,
+        /* spacing may be too large for sector_div to work with,
          * so we might need to pre-shift
          */
-        conf->preshift = 0;
+        conf->sector_shift = 0;
         if (sizeof(sector_t) > sizeof(u32)) {
-                sector_t space = conf->hash_spacing;
+                sector_t space = conf->spacing;
                 while (space > (sector_t)(~(u32)0)) {
                         space >>= 1;
-                        conf->preshift++;
+                        conf->sector_shift++;
                 }
         }
         /*
@@ -194,9 +185,9 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks)
                 unsigned round;
                 unsigned long base;
 
-                sz = conf->array_sectors >> (conf->preshift + 1);
+                sz = conf->array_sectors >> conf->sector_shift;
                 sz += 1; /* force round-up */
-                base = conf->hash_spacing >> conf->preshift;
+                base = conf->spacing >> conf->sector_shift;
                 round = sector_div(sz, base);
                 nb_zone = sz + (round ? 1 : 0);
         }
@@ -211,32 +202,31 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks)
          * Here we generate the linear hash table
          * First calculate the device offsets.
          */
-        conf->disks[0].offset = 0;
+        conf->disks[0].start_sector = 0;
         for (i = 1; i < raid_disks; i++)
-                conf->disks[i].offset =
-                        conf->disks[i-1].offset +
-                        conf->disks[i-1].size;
+                conf->disks[i].start_sector =
+                        conf->disks[i-1].start_sector +
+                        conf->disks[i-1].num_sectors;
 
         table = conf->hash_table;
-        curr_offset = 0;
         i = 0;
-        for (curr_offset = 0;
-             curr_offset < conf->array_sectors / 2;
-             curr_offset += conf->hash_spacing) {
+        for (curr_sector = 0;
+             curr_sector < conf->array_sectors;
+             curr_sector += conf->spacing) {
 
                 while (i < raid_disks-1 &&
-                       curr_offset >= conf->disks[i+1].offset)
+                       curr_sector >= conf->disks[i+1].start_sector)
                         i++;
 
                 *table ++ = conf->disks + i;
         }
 
-        if (conf->preshift) {
-                conf->hash_spacing >>= conf->preshift;
-                /* round hash_spacing up so that when we divide by it,
+        if (conf->sector_shift) {
+                conf->spacing >>= conf->sector_shift;
+                /* round spacing up so that when we divide by it,
                  * we err on the side of "too-low", which is safest.
                  */
-                conf->hash_spacing++;
+                conf->spacing++;
         }
 
         BUG_ON(table - conf->hash_table > nb_zone);
@@ -317,7 +307,6 @@ static int linear_make_request (struct request_queue *q, struct bio *bio)
         const int rw = bio_data_dir(bio);
         mddev_t *mddev = q->queuedata;
         dev_info_t *tmp_dev;
-        sector_t block;
         int cpu;
 
         if (unlikely(bio_barrier(bio))) {
@@ -332,29 +321,33 @@ static int linear_make_request (struct request_queue *q, struct bio *bio)
         part_stat_unlock();
 
         tmp_dev = which_dev(mddev, bio->bi_sector);
-        block = bio->bi_sector >> 1;
     
-        if (unlikely(block >= (tmp_dev->size + tmp_dev->offset)
-                     || block < tmp_dev->offset)) {
+        if (unlikely(bio->bi_sector >= (tmp_dev->num_sectors +
+                                        tmp_dev->start_sector)
+                     || (bio->bi_sector <
+                         tmp_dev->start_sector))) {
                 char b[BDEVNAME_SIZE];
 
-                printk("linear_make_request: Block %llu out of bounds on "
-                        "dev %s size %llu offset %llu\n",
-                        (unsigned long long)block,
+                printk("linear_make_request: Sector %llu out of bounds on "
+                        "dev %s: %llu sectors, offset %llu\n",
+                        (unsigned long long)bio->bi_sector,
                         bdevname(tmp_dev->rdev->bdev, b),
-                        (unsigned long long)tmp_dev->size,
-                        (unsigned long long)tmp_dev->offset);
+                        (unsigned long long)tmp_dev->num_sectors,
+                        (unsigned long long)tmp_dev->start_sector);
                 bio_io_error(bio);
                 return 0;
         }
         if (unlikely(bio->bi_sector + (bio->bi_size >> 9) >
-                     (tmp_dev->offset + tmp_dev->size)<<1)) {
+                     tmp_dev->start_sector + tmp_dev->num_sectors)) {
                 /* This bio crosses a device boundary, so we have to
                  * split it.
                  */
                 struct bio_pair *bp;
+
                 bp = bio_split(bio,
-                               ((tmp_dev->offset + tmp_dev->size)<<1) - bio->bi_sector);
+                               tmp_dev->start_sector + tmp_dev->num_sectors
+                               - bio->bi_sector);
+
                 if (linear_make_request(q, &bp->bio1))
                         generic_make_request(&bp->bio1);
                 if (linear_make_request(q, &bp->bio2))
@@ -364,7 +357,8 @@ static int linear_make_request (struct request_queue *q, struct bio *bio)
         }
                     
         bio->bi_bdev = tmp_dev->rdev->bdev;
-        bio->bi_sector = bio->bi_sector - (tmp_dev->offset << 1) + tmp_dev->rdev->data_offset;
+        bio->bi_sector = bio->bi_sector - tmp_dev->start_sector
+                + tmp_dev->rdev->data_offset;
 
         return 1;
 }
@@ -372,29 +366,6 @@ static int linear_make_request (struct request_queue *q, struct bio *bio)
 static void linear_status (struct seq_file *seq, mddev_t *mddev)
 {
 
-#undef MD_DEBUG
-#ifdef MD_DEBUG
-        int j;
-        linear_conf_t *conf = mddev_to_conf(mddev);
-        sector_t s = 0;
-  
-        seq_printf(seq, "      ");
-        for (j = 0; j < mddev->raid_disks; j++)
-        {
-                char b[BDEVNAME_SIZE];
-                s += conf->smallest_size;
-                seq_printf(seq, "[%s",
-                           bdevname(conf->hash_table[j][0].rdev->bdev,b));
-
-                while (s > conf->hash_table[j][0].offset +
-                           conf->hash_table[j][0].size)
-                        seq_printf(seq, "/%s] ",
-                                   bdevname(conf->hash_table[j][1].rdev->bdev,b));
-                else
-                        seq_printf(seq, "] ");
-        }
-        seq_printf(seq, "\n");
-#endif
         seq_printf(seq, " %dk rounding", mddev->chunk_size/1024);
 }
 
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 0a3a4bdcd4af..aaa3d465de4e 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -32,31 +32,21 @@
    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/module.h>
-#include <linux/kernel.h>
 #include <linux/kthread.h>
-#include <linux/linkage.h>
 #include <linux/raid/md.h>
 #include <linux/raid/bitmap.h>
 #include <linux/sysctl.h>
 #include <linux/buffer_head.h> /* for invalidate_bdev */
 #include <linux/poll.h>
-#include <linux/mutex.h>
 #include <linux/ctype.h>
-#include <linux/freezer.h>
-
-#include <linux/init.h>
-
+#include <linux/hdreg.h>
+#include <linux/proc_fs.h>
+#include <linux/random.h>
+#include <linux/reboot.h>
 #include <linux/file.h>
-
-#ifdef CONFIG_KMOD
-#include <linux/kmod.h>
-#endif
-
-#include <asm/unaligned.h>
+#include <linux/delay.h>
 
 #define MAJOR_NR MD_MAJOR
-#define MD_DRIVER
 
 /* 63 partitions with the alternate major number (mdp) */
 #define MdpMinorShift 6
@@ -66,7 +56,7 @@
 
 
 #ifndef MODULE
-static void autostart_arrays (int part);
+static void autostart_arrays(int part);
 #endif
 
 static LIST_HEAD(pers_list);
@@ -212,7 +202,7 @@ static DEFINE_SPINLOCK(all_mddevs_lock);
                 )
 
 
-static int md_fail_request (struct request_queue *q, struct bio *bio)
+static int md_fail_request(struct request_queue *q, struct bio *bio)
 {
         bio_io_error(bio);
         return 0;
@@ -2106,8 +2096,6 @@ rdev_size_store(mdk_rdev_t *rdev, const char *buf, size_t len)
 
         if (strict_strtoull(buf, 10, &size) < 0)
                 return -EINVAL;
-        if (size < my_mddev->size)
-                return -EINVAL;
         if (my_mddev->pers && rdev->raid_disk >= 0) {
                 if (my_mddev->persistent) {
                         size = super_types[my_mddev->major_version].
@@ -2118,9 +2106,9 @@ rdev_size_store(mdk_rdev_t *rdev, const char *buf, size_t len)
                         size = (rdev->bdev->bd_inode->i_size >> 10);
                         size -= rdev->data_offset/2;
                 }
-                if (size < my_mddev->size)
-                        return -EINVAL; /* component must fit device */
         }
+        if (size < my_mddev->size)
+                return -EINVAL; /* component must fit device */
 
         rdev->size = size;
         if (size > oldsize && my_mddev->external) {
@@ -2406,12 +2394,11 @@ safe_delay_store(mddev_t *mddev, const char *cbuf, size_t len)
         int i;
         unsigned long msec;
         char buf[30];
-        char *e;
+
         /* remove a period, and count digits after it */
         if (len >= sizeof(buf))
                 return -EINVAL;
-        strlcpy(buf, cbuf, len);
-        buf[len] = 0;
+        strlcpy(buf, cbuf, sizeof(buf));
         for (i=0; i<len; i++) {
                 if (dot) {
                         if (isdigit(buf[i])) {
@@ -2424,8 +2411,7 @@ safe_delay_store(mddev_t *mddev, const char *cbuf, size_t len)
                         buf[i] = 0;
                 }
         }
-        msec = simple_strtoul(buf, &e, 10);
-        if (e == buf || (*e && *e != '\n'))
+        if (strict_strtoul(buf, 10, &msec) < 0)
                 return -EINVAL;
         msec = (msec * 1000) / scale;
         if (msec == 0)
@@ -2727,9 +2713,9 @@ array_state_store(mddev_t *mddev, const char *buf, size_t len)
                 break;
         case read_auto:
                 if (mddev->pers) {
-                        if (mddev->ro != 1)
+                        if (mddev->ro == 0)
                                 err = do_md_stop(mddev, 1, 0);
-                        else
+                        else if (mddev->ro == 1)
                                 err = restart_array(mddev);
                         if (err == 0) {
                                 mddev->ro = 2;
@@ -2945,7 +2931,13 @@ metadata_store(mddev_t *mddev, const char *buf, size_t len)
 {
         int major, minor;
         char *e;
-        if (!list_empty(&mddev->disks))
+        /* Changing the details of 'external' metadata is
+         * always permitted.  Otherwise there must be
+         * no devices attached to the array.
+         */
+        if (mddev->external && strncmp(buf, "external:", 9) == 0)
+                ;
+        else if (!list_empty(&mddev->disks))
                 return -EBUSY;
 
         if (cmd_match(buf, "none")) {
@@ -3527,17 +3519,12 @@ static int do_md_run(mddev_t * mddev)
                         return -EINVAL;
                 }
                 /*
-                 * chunk-size has to be a power of 2 and multiples of PAGE_SIZE
+                 * chunk-size has to be a power of 2
                  */
                 if ( (1 << ffz(~chunk_size)) != chunk_size) {
                         printk(KERN_ERR "chunk_size of %d not valid\n", chunk_size);
                         return -EINVAL;
                 }
-                if (chunk_size < PAGE_SIZE) {
-                        printk(KERN_ERR "too small chunk_size: %d < %ld\n",
-                                chunk_size, PAGE_SIZE);
-                        return -EINVAL;
-                }
 
                 /* devices must have minimum size of one chunk */
                 rdev_for_each(rdev, tmp, mddev) {
@@ -3555,12 +3542,10 @@ static int do_md_run(mddev_t * mddev)
                 }
         }
 
-#ifdef CONFIG_KMOD
         if (mddev->level != LEVEL_NONE)
                 request_module("md-level-%d", mddev->level);
         else if (mddev->clevel[0])
                 request_module("md-%s", mddev->clevel);
-#endif
 
         /*
          * Drop all container device buffers, from now on
@@ -3971,10 +3956,10 @@ static void autorun_array(mddev_t *mddev)
         }
         printk("\n");
 
-        err = do_md_run (mddev);
+        err = do_md_run(mddev);
         if (err) {
                 printk(KERN_WARNING "md: do_md_run() returned %d\n", err);
-                do_md_stop (mddev, 0, 0);
+                do_md_stop(mddev, 0, 0);
         }
 }
 
@@ -4333,7 +4318,7 @@ static int add_new_disk(mddev_t * mddev, mdu_disk_info_t *info)
 
         if (!(info->state & (1<<MD_DISK_FAULTY))) {
                 int err;
-                rdev = md_import_device (dev, -1, 0);
+                rdev = md_import_device(dev, -1, 0);
                 if (IS_ERR(rdev)) {
                         printk(KERN_WARNING 
                                 "md: error, md_import_device() returned %ld\n",
@@ -4415,7 +4400,7 @@ static int hot_add_disk(mddev_t * mddev, dev_t dev)
                 return -EINVAL;
         }
 
-        rdev = md_import_device (dev, -1, 0);
+        rdev = md_import_device(dev, -1, 0);
         if (IS_ERR(rdev)) {
                 printk(KERN_WARNING 
                         "md: error, md_import_device() returned %ld\n",
@@ -4934,11 +4919,11 @@ static int md_ioctl(struct inode *inode, struct file *file,
                         goto done_unlock;
 
                 case STOP_ARRAY:
-                        err = do_md_stop (mddev, 0, 1);
+                        err = do_md_stop(mddev, 0, 1);
                         goto done_unlock;
 
                 case STOP_ARRAY_RO:
-                        err = do_md_stop (mddev, 1, 1);
+                        err = do_md_stop(mddev, 1, 1);
                         goto done_unlock;
 
         }
@@ -4987,7 +4972,7 @@ static int md_ioctl(struct inode *inode, struct file *file,
                         goto done_unlock;
 
                 case RUN_ARRAY:
-                        err = do_md_run (mddev);
+                        err = do_md_run(mddev);
                         goto done_unlock;
 
                 case SET_BITMAP_FILE:
@@ -5425,11 +5410,11 @@ static int md_seq_show(struct seq_file *seq, void *v)
                         seq_printf(seq, " super non-persistent");
 
                 if (mddev->pers) {
-                        mddev->pers->status (seq, mddev);
+                        mddev->pers->status(seq, mddev);
                         seq_printf(seq, "\n      ");
                         if (mddev->pers->sync_request) {
                                 if (mddev->curr_resync > 2) {
-                                        status_resync (seq, mddev);
+                                        status_resync(seq, mddev);
                                         seq_printf(seq, "\n      ");
                                 } else if (mddev->curr_resync == 1 || mddev->curr_resync == 2)
                                         seq_printf(seq, "\tresync=DELAYED\n      ");
@@ -6260,7 +6245,7 @@ static int md_notify_reboot(struct notifier_block *this,
                                  * appears to still be in use.  Hence
                                  * the '100'.
                                  */
-                                do_md_stop (mddev, 1, 100);
+                                do_md_stop(mddev, 1, 100);
                                 mddev_unlock(mddev);
                         }
                 /*
@@ -6304,7 +6289,7 @@ static int __init md_init(void)
         raid_table_header = register_sysctl_table(raid_root_table);
 
         md_geninit();
-        return (0);
+        return 0;
 }
 
 
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index 7ae33ebaf7ec..d4ac47d11279 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -19,16 +19,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/spinlock.h>
 #include <linux/raid/multipath.h>
-#include <linux/buffer_head.h>
-#include <asm/atomic.h>
-
-#define MAJOR_NR MD_MAJOR
-#define MD_DRIVER
-#define MD_PERSONALITY
 
 #define MAX_WORK_PER_DISK 128
 
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index 53508a8a981d..8ac6488ad0dc 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -18,13 +18,8 @@
    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  
 */
 
-#include <linux/module.h>
 #include <linux/raid/raid0.h>
 
-#define MAJOR_NR MD_MAJOR
-#define MD_DRIVER
-#define MD_PERSONALITY
-
 static void raid0_unplug(struct request_queue *q)
 {
         mddev_t *mddev = q->queuedata;
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index b9764429d856..9c788e2489b1 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -32,6 +32,7 @@
  */
 
 #include "dm-bio-list.h"
+#include <linux/delay.h>
 #include <linux/raid/raid1.h>
 #include <linux/raid/bitmap.h>
 
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 8bdc9bfc2887..da5129a24b18 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -19,6 +19,7 @@
  */
 
 #include "dm-bio-list.h"
+#include <linux/delay.h>
 #include <linux/raid/raid10.h>
 #include <linux/raid/bitmap.h>
 
@@ -2028,8 +2029,9 @@ static int run(mddev_t *mddev)
         int nc, fc, fo;
         sector_t stride, size;
 
-        if (mddev->chunk_size == 0) {
-                printk(KERN_ERR "md/raid10: non-zero chunk size required.\n");
+        if (mddev->chunk_size < PAGE_SIZE) {
+                printk(KERN_ERR "md/raid10: chunk size must be "
+                       "at least PAGE_SIZE(%ld).\n", PAGE_SIZE);
                 return -EINVAL;
         }
 
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index ae16794bef20..a36a7435edf5 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -43,12 +43,7 @@
  * miss any bits.
  */
 
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/highmem.h>
-#include <linux/bitops.h>
 #include <linux/kthread.h>
-#include <asm/atomic.h>
 #include "raid6.h"
 
 #include <linux/raid/bitmap.h>
@@ -275,7 +270,7 @@ static int grow_buffers(struct stripe_head *sh, int num)
         return 0;
 }
 
-static void raid5_build_block (struct stripe_head *sh, int i);
+static void raid5_build_block(struct stripe_head *sh, int i);
 
 static void init_stripe(struct stripe_head *sh, sector_t sector, int pd_idx, int disks)
 {
@@ -1151,7 +1146,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
         release_stripe(sh);
 }
 
-static void raid5_end_write_request (struct bio *bi, int error)
+static void raid5_end_write_request(struct bio *bi, int error)
 {
         struct stripe_head *sh = bi->bi_private;
         raid5_conf_t *conf = sh->raid_conf;
@@ -1183,7 +1178,7 @@ static void raid5_end_write_request (struct bio *bi, int error)
 
 static sector_t compute_blocknr(struct stripe_head *sh, int i);
         
-static void raid5_build_block (struct stripe_head *sh, int i)
+static void raid5_build_block(struct stripe_head *sh, int i)
 {
         struct r5dev *dev = &sh->dev[i];
 
@@ -1221,10 +1216,10 @@ static void error(mddev_t *mddev, mdk_rdev_t *rdev)
                         set_bit(MD_RECOVERY_INTR, &mddev->recovery);
                 }
                 set_bit(Faulty, &rdev->flags);
-                printk (KERN_ALERT
-                        "raid5: Disk failure on %s, disabling device.\n"
-                        "raid5: Operation continuing on %d devices.\n",
-                        bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded);
+                printk(KERN_ALERT
+                       "raid5: Disk failure on %s, disabling device.\n"
+                       "raid5: Operation continuing on %d devices.\n",
+                       bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded);
         }
 }
 
@@ -1320,8 +1315,8 @@ static sector_t raid5_compute_sector(sector_t r_sector, unsigned int raid_disks,
                         *dd_idx = (*pd_idx + 2 + *dd_idx) % raid_disks;
                         break;
                 default:
-                        printk (KERN_CRIT "raid6: unsupported algorithm %d\n",
-                                conf->algorithm);
+                        printk(KERN_CRIT "raid6: unsupported algorithm %d\n",
+                               conf->algorithm);
                 }
                 break;
         }
@@ -1396,8 +1391,8 @@ static sector_t compute_blocknr(struct stripe_head *sh, int i)
                         }
                         break;
                 default:
-                        printk (KERN_CRIT "raid6: unsupported algorithm %d\n",
-                                conf->algorithm);
+                        printk(KERN_CRIT "raid6: unsupported algorithm %d\n",
+                               conf->algorithm);
                 }
                 break;
         }
@@ -1405,7 +1400,7 @@ static sector_t compute_blocknr(struct stripe_head *sh, int i)
         chunk_number = stripe * data_disks + i;
         r_sector = (sector_t)chunk_number * sectors_per_chunk + chunk_offset;
 
-        check = raid5_compute_sector (r_sector, raid_disks, data_disks, &dummy1, &dummy2, conf);
+        check = raid5_compute_sector(r_sector, raid_disks, data_disks, &dummy1, &dummy2, conf);
         if (check != sh->sector || dummy1 != dd_idx || dummy2 != sh->pd_idx) {
                 printk(KERN_ERR "compute_blocknr: map not correct\n");
                 return 0;
@@ -4012,6 +4007,13 @@ static int run(mddev_t *mddev)
                 return -EIO;
         }
 
+        if (mddev->chunk_size < PAGE_SIZE) {
+                printk(KERN_ERR "md/raid5: chunk_size must be at least "
+                       "PAGE_SIZE but %d < %ld\n",
+                       mddev->chunk_size, PAGE_SIZE);
+                return -EINVAL;
+        }
+
         if (mddev->reshape_position != MaxSector) {
                 /* Check that we can continue the reshape.
                  * Currently only disks can change, it must
@@ -4289,7 +4291,7 @@ static int stop(mddev_t *mddev)
 }
 
 #ifdef DEBUG
-static void print_sh (struct seq_file *seq, struct stripe_head *sh)
+static void print_sh(struct seq_file *seq, struct stripe_head *sh)
 {
         int i;
 
@@ -4305,7 +4307,7 @@ static void print_sh (struct seq_file *seq, struct stripe_head *sh)
         seq_printf(seq, "\n");
 }
 
-static void printall (struct seq_file *seq, raid5_conf_t *conf)
+static void printall(struct seq_file *seq, raid5_conf_t *conf)
 {
         struct stripe_head *sh;
         struct hlist_node *hn;
@@ -4323,7 +4325,7 @@ static void printall (struct seq_file *seq, raid5_conf_t *conf)
 }
 #endif
 
-static void status (struct seq_file *seq, mddev_t *mddev)
+static void status(struct seq_file *seq, mddev_t *mddev)
 {
         raid5_conf_t *conf = (raid5_conf_t *) mddev->private;
         int i;
diff --git a/drivers/md/raid6.h b/drivers/md/raid6.h
index 31cbee71365f..98dcde88470e 100644
--- a/drivers/md/raid6.h
+++ b/drivers/md/raid6.h
@@ -18,15 +18,6 @@
 /* Set to 1 to use kernel-wide empty_zero_page */
 #define RAID6_USE_EMPTY_ZERO_PAGE 0
 
-#include <linux/module.h>
-#include <linux/stddef.h>
-#include <linux/compiler.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/mempool.h>
-#include <linux/list.h>
-#include <linux/vmalloc.h>
 #include <linux/raid/md.h>
 #include <linux/raid/raid5.h>
 
diff --git a/drivers/media/common/ir-keymaps.c b/drivers/media/common/ir-keymaps.c
index 8fa91f846d59..4952aeb5dd80 100644
--- a/drivers/media/common/ir-keymaps.c
+++ b/drivers/media/common/ir-keymaps.c
@@ -103,6 +103,56 @@ IR_KEYTAB_TYPE ir_codes_avermedia_dvbt[IR_KEYTAB_SIZE] = {
 
 EXPORT_SYMBOL_GPL(ir_codes_avermedia_dvbt);
 
+/* Mauro Carvalho Chehab <mchehab@infradead.org> */
+IR_KEYTAB_TYPE ir_codes_avermedia_m135a[IR_KEYTAB_SIZE] = {
+        [0x00] = KEY_POWER2,
+        [0x2e] = KEY_DOT,               /* '.' */
+        [0x01] = KEY_MODE,              /* TV/FM */
+
+        [0x05] = KEY_1,
+        [0x06] = KEY_2,
+        [0x07] = KEY_3,
+        [0x09] = KEY_4,
+        [0x0a] = KEY_5,
+        [0x0b] = KEY_6,
+        [0x0d] = KEY_7,
+        [0x0e] = KEY_8,
+        [0x0f] = KEY_9,
+        [0x11] = KEY_0,
+
+        [0x13] = KEY_RIGHT,             /* -> */
+        [0x12] = KEY_LEFT,              /* <- */
+
+        [0x17] = KEY_SLEEP,             /* Capturar Imagem */
+        [0x10] = KEY_SHUFFLE,           /* Amostra */
+
+        /* FIXME: The keys bellow aren't ok */
+
+        [0x43] = KEY_CHANNELUP,
+        [0x42] = KEY_CHANNELDOWN,
+        [0x1f] = KEY_VOLUMEUP,
+        [0x1e] = KEY_VOLUMEDOWN,
+        [0x0c] = KEY_ENTER,
+
+        [0x14] = KEY_MUTE,
+        [0x08] = KEY_AUDIO,
+
+        [0x03] = KEY_TEXT,
+        [0x04] = KEY_EPG,
+        [0x2b] = KEY_TV2,               /* TV2 */
+
+        [0x1d] = KEY_RED,
+        [0x1c] = KEY_YELLOW,
+        [0x41] = KEY_GREEN,
+        [0x40] = KEY_BLUE,
+
+        [0x1a] = KEY_PLAYPAUSE,
+        [0x19] = KEY_RECORD,
+        [0x18] = KEY_PLAY,
+        [0x1b] = KEY_STOP,
+};
+EXPORT_SYMBOL_GPL(ir_codes_avermedia_m135a);
+
 /* Attila Kondoros <attila.kondoros@chello.hu> */
 IR_KEYTAB_TYPE ir_codes_apac_viewcomp[IR_KEYTAB_SIZE] = {
 
@@ -467,7 +517,8 @@ EXPORT_SYMBOL_GPL(ir_codes_adstech_dvb_t_pci);
 
 /* ---------------------------------------------------------------------- */
 
-/* MSI TV@nywhere remote */
+/* MSI TV@nywhere MASTER remote */
+
 IR_KEYTAB_TYPE ir_codes_msi_tvanywhere[IR_KEYTAB_SIZE] = {
         /* Keys 0 to 9 */
         [ 0x00 ] = KEY_0,
@@ -501,6 +552,95 @@ EXPORT_SYMBOL_GPL(ir_codes_msi_tvanywhere);
 
 /* ---------------------------------------------------------------------- */
 
+/*
+  Keycodes for remote on the MSI TV@nywhere Plus. The controller IC on the card
+  is marked "KS003". The controller is I2C at address 0x30, but does not seem
+  to respond to probes until a read is performed from a valid device.
+  I don't know why...
+
+  Note: This remote may be of similar or identical design to the
+  Pixelview remote (?).  The raw codes and duplicate button codes
+  appear to be the same.
+
+  Henry Wong <henry@stuffedcow.net>
+  Some changes to formatting and keycodes by Mark Schultz <n9xmj@yahoo.com>
+
+*/
+
+IR_KEYTAB_TYPE ir_codes_msi_tvanywhere_plus[IR_KEYTAB_SIZE] = {
+
+/*  ---- Remote Button Layout ----
+
+    POWER   SOURCE  SCAN    MUTE
+    TV/FM   1       2       3
+    |>      4       5       6
+    <|      7       8       9
+    ^^UP    0       +       RECALL
+    vvDN    RECORD  STOP    PLAY
+
+        MINIMIZE          ZOOM
+
+                  CH+
+      VOL-                   VOL+
+                  CH-
+
+        SNAPSHOT           MTS
+
+     <<      FUNC    >>     RESET
+*/
+
+        [0x01] = KEY_KP1,             /* 1 */
+        [0x0b] = KEY_KP2,             /* 2 */
+        [0x1b] = KEY_KP3,             /* 3 */
+        [0x05] = KEY_KP4,             /* 4 */
+        [0x09] = KEY_KP5,             /* 5 */
+        [0x15] = KEY_KP6,             /* 6 */
+        [0x06] = KEY_KP7,             /* 7 */
+        [0x0a] = KEY_KP8,             /* 8 */
+        [0x12] = KEY_KP9,             /* 9 */
+        [0x02] = KEY_KP0,             /* 0 */
+        [0x10] = KEY_KPPLUS,          /* + */
+        [0x13] = KEY_AGAIN,           /* Recall */
+
+        [0x1e] = KEY_POWER,           /* Power */
+        [0x07] = KEY_TUNER,           /* Source */
+        [0x1c] = KEY_SEARCH,          /* Scan */
+        [0x18] = KEY_MUTE,            /* Mute */
+
+        [0x03] = KEY_RADIO,           /* TV/FM */
+        /* The next four keys are duplicates that appear to send the
+           same IR code as Ch+, Ch-, >>, and << .  The raw code assigned
+           to them is the actual code + 0x20 - they will never be
+           detected as such unless some way is discovered to distinguish
+           these buttons from those that have the same code. */
+        [0x3f] = KEY_RIGHT,           /* |> and Ch+ */
+        [0x37] = KEY_LEFT,            /* <| and Ch- */
+        [0x2c] = KEY_UP,              /* ^^Up and >> */
+        [0x24] = KEY_DOWN,            /* vvDn and << */
+
+        [0x00] = KEY_RECORD,          /* Record */
+        [0x08] = KEY_STOP,            /* Stop */
+        [0x11] = KEY_PLAY,            /* Play */
+
+        [0x0f] = KEY_CLOSE,           /* Minimize */
+        [0x19] = KEY_ZOOM,            /* Zoom */
+        [0x1a] = KEY_SHUFFLE,         /* Snapshot */
+        [0x0d] = KEY_LANGUAGE,        /* MTS */
+
+        [0x14] = KEY_VOLUMEDOWN,      /* Vol- */
+        [0x16] = KEY_VOLUMEUP,        /* Vol+ */
+        [0x17] = KEY_CHANNELDOWN,     /* Ch- */
+        [0x1f] = KEY_CHANNELUP,       /* Ch+ */
+
+        [0x04] = KEY_REWIND,          /* << */
+        [0x0e] = KEY_MENU,            /* Function */
+        [0x0c] = KEY_FASTFORWARD,     /* >> */
+        [0x1d] = KEY_RESTART,         /* Reset */
+};
+EXPORT_SYMBOL_GPL(ir_codes_msi_tvanywhere_plus);
+
+/* ---------------------------------------------------------------------- */
+
 /* Cinergy 1400 DVB-T */
 IR_KEYTAB_TYPE ir_codes_cinergy_1400[IR_KEYTAB_SIZE] = {
         [ 0x01 ] = KEY_POWER,
@@ -1792,12 +1932,61 @@ IR_KEYTAB_TYPE ir_codes_encore_enltv[IR_KEYTAB_SIZE] = {
         [ 0x41 ] = KEY_GREEN,           /* AP2 */
         [ 0x47 ] = KEY_YELLOW,          /* AP3 */
         [ 0x57 ] = KEY_BLUE,            /* AP4 */
-
-
 };
-
 EXPORT_SYMBOL_GPL(ir_codes_encore_enltv);
 
+/* Encore ENLTV2-FM  - silver plastic - "Wand Media" written at the botton
+    Mauro Carvalho Chehab <mchehab@infradead.org> */
+IR_KEYTAB_TYPE ir_codes_encore_enltv2[IR_KEYTAB_SIZE] = {
+        [0x4c] = KEY_POWER2,
+        [0x4a] = KEY_TUNER,
+        [0x40] = KEY_1,
+        [0x60] = KEY_2,
+        [0x50] = KEY_3,
+        [0x70] = KEY_4,
+        [0x48] = KEY_5,
+        [0x68] = KEY_6,
+        [0x58] = KEY_7,
+        [0x78] = KEY_8,
+        [0x44] = KEY_9,
+        [0x54] = KEY_0,
+
+        [0x64] = KEY_LAST,              /* +100 */
+        [0x4e] = KEY_AGAIN,             /* Recall */
+
+        [0x6c] = KEY_SWITCHVIDEOMODE,   /* Video Source */
+        [0x5e] = KEY_MENU,
+        [0x56] = KEY_SCREEN,
+        [0x7a] = KEY_SETUP,
+
+        [0x46] = KEY_MUTE,
+        [0x5c] = KEY_MODE,              /* Stereo */
+        [0x74] = KEY_INFO,
+        [0x7c] = KEY_CLEAR,
+
+        [0x55] = KEY_UP,
+        [0x49] = KEY_DOWN,
+        [0x7e] = KEY_LEFT,
+        [0x59] = KEY_RIGHT,
+        [0x6a] = KEY_ENTER,
+
+        [0x42] = KEY_VOLUMEUP,
+        [0x62] = KEY_VOLUMEDOWN,
+        [0x52] = KEY_CHANNELUP,
+        [0x72] = KEY_CHANNELDOWN,
+
+        [0x41] = KEY_RECORD,
+        [0x51] = KEY_SHUFFLE,   /* Snapshot */
+        [0x75] = KEY_TIME,      /* Timeshift */
+        [0x71] = KEY_TV2,       /* PIP */
+
+        [0x45] = KEY_REWIND,
+        [0x6f] = KEY_PAUSE,
+        [0x7d] = KEY_FORWARD,
+        [0x79] = KEY_STOP,
+};
+EXPORT_SYMBOL_GPL(ir_codes_encore_enltv2);
+
 /* for the Technotrend 1500 bundled remotes (grey and black): */
 IR_KEYTAB_TYPE ir_codes_tt_1500[IR_KEYTAB_SIZE] = {
         [ 0x01 ] = KEY_POWER,
@@ -2239,3 +2428,86 @@ IR_KEYTAB_TYPE ir_codes_avermedia_a16d[IR_KEYTAB_SIZE] = {
         [0x2a] = KEY_MENU,
 };
 EXPORT_SYMBOL_GPL(ir_codes_avermedia_a16d);
+
+/* Encore ENLTV-FM v5.3
+   Mauro Carvalho Chehab <mchehab@infradead.org>
+ */
+IR_KEYTAB_TYPE ir_codes_encore_enltv_fm53[IR_KEYTAB_SIZE] = {
+        [0x10] = KEY_POWER2,
+        [0x06] = KEY_MUTE,
+
+        [0x09] = KEY_1,
+        [0x1d] = KEY_2,
+        [0x1f] = KEY_3,
+        [0x19] = KEY_4,
+        [0x1b] = KEY_5,
+        [0x11] = KEY_6,
+        [0x17] = KEY_7,
+        [0x12] = KEY_8,
+        [0x16] = KEY_9,
+        [0x48] = KEY_0,
+
+        [0x04] = KEY_LIST,              /* -/-- */
+        [0x40] = KEY_LAST,              /* recall */
+
+        [0x02] = KEY_MODE,              /* TV/AV */
+        [0x05] = KEY_SHUFFLE,           /* SNAPSHOT */
+
+        [0x4c] = KEY_CHANNELUP,         /* UP */
+        [0x00] = KEY_CHANNELDOWN,       /* DOWN */
+        [0x0d] = KEY_VOLUMEUP,          /* RIGHT */
+        [0x15] = KEY_VOLUMEDOWN,        /* LEFT */
+        [0x49] = KEY_ENTER,             /* OK */
+
+        [0x54] = KEY_RECORD,
+        [0x4d] = KEY_PLAY,              /* pause */
+
+        [0x1e] = KEY_UP,                /* video setting */
+        [0x0e] = KEY_RIGHT,             /* <- */
+        [0x1a] = KEY_LEFT,              /* -> */
+
+        [0x0a] = KEY_DOWN,              /* video default */
+        [0x0c] = KEY_ZOOM,              /* hide pannel */
+        [0x47] = KEY_SLEEP,             /* shutdown */
+};
+EXPORT_SYMBOL_GPL(ir_codes_encore_enltv_fm53);
+
+/* Zogis Real Audio 220 - 32 keys IR */
+IR_KEYTAB_TYPE ir_codes_real_audio_220_32_keys[IR_KEYTAB_SIZE] = {
+        [0x1c] = KEY_RADIO,
+        [0x12] = KEY_POWER2,
+
+        [0x01] = KEY_1,
+        [0x02] = KEY_2,
+        [0x03] = KEY_3,
+        [0x04] = KEY_4,
+        [0x05] = KEY_5,
+        [0x06] = KEY_6,
+        [0x07] = KEY_7,
+        [0x08] = KEY_8,
+        [0x09] = KEY_9,
+        [0x00] = KEY_0,
+
+        [0x0c] = KEY_VOLUMEUP,
+        [0x18] = KEY_VOLUMEDOWN,
+        [0x0b] = KEY_CHANNELUP,
+        [0x15] = KEY_CHANNELDOWN,
+        [0x16] = KEY_ENTER,
+
+        [0x11] = KEY_LIST,              /* Source */
+        [0x0d] = KEY_AUDIO,             /* stereo */
+
+        [0x0f] = KEY_PREVIOUS,          /* Prev */
+        [0x1b] = KEY_PAUSE,             /* Timeshift */
+        [0x1a] = KEY_NEXT,              /* Next */
+
+        [0x0e] = KEY_STOP,
+        [0x1f] = KEY_PLAY,
+        [0x1e] = KEY_PLAYPAUSE,         /* Pause */
+
+        [0x1d] = KEY_RECORD,
+        [0x13] = KEY_MUTE,
+        [0x19] = KEY_SHUFFLE,           /* Snapshot */
+
+};
+EXPORT_SYMBOL_GPL(ir_codes_real_audio_220_32_keys);
diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c
index d01965e96927..d599d360da3f 100644
--- a/drivers/media/common/saa7146_core.c
+++ b/drivers/media/common/saa7146_core.c
@@ -234,7 +234,7 @@ void saa7146_pgtable_free(struct pci_dev *pci, struct saa7146_pgtable *pt)
 int saa7146_pgtable_alloc(struct pci_dev *pci, struct saa7146_pgtable *pt)
 {
         __le32       *cpu;
-        dma_addr_t   dma_addr;
+        dma_addr_t   dma_addr = 0;
 
         cpu = pci_alloc_consistent(pci, PAGE_SIZE, &dma_addr);
         if (NULL == cpu) {
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index cf6a817d5059..5b34c134aa25 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -533,7 +533,7 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev,
         memcpy(vfd, &device_template, sizeof(struct video_device));
         strlcpy(vfd->name, name, sizeof(vfd->name));
         vfd->release = video_device_release;
-        vfd->priv = dev;
+        video_set_drvdata(vfd, dev);
 
         // fixme: -1 should be an insmod parameter *for the extension* (like "video_nr");
         if (video_register_device(vfd, type, -1) < 0) {
diff --git a/drivers/media/common/tuners/mt2060.c b/drivers/media/common/tuners/mt2060.c
index 1305b0e63ce5..12206d75dd4e 100644
--- a/drivers/media/common/tuners/mt2060.c
+++ b/drivers/media/common/tuners/mt2060.c
@@ -170,6 +170,9 @@ static int mt2060_set_params(struct dvb_frontend *fe, struct dvb_frontend_parame
         b[0] = REG_LO1B1;
         b[1] = 0xFF;
 
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1); /* open i2c_gate */
+
         mt2060_writeregs(priv,b,2);
 
         freq = params->frequency / 1000; // Hz -> kHz
@@ -233,6 +236,9 @@ static int mt2060_set_params(struct dvb_frontend *fe, struct dvb_frontend_parame
                 i++;
         } while (i<10);
 
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 0); /* close i2c_gate */
+
         return ret;
 }
 
@@ -296,13 +302,35 @@ static int mt2060_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)
 static int mt2060_init(struct dvb_frontend *fe)
 {
         struct mt2060_priv *priv = fe->tuner_priv;
-        return mt2060_writereg(priv, REG_VGAG, (priv->cfg->clock_out << 6) | 0x33);
+        int ret;
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1); /* open i2c_gate */
+
+        ret = mt2060_writereg(priv, REG_VGAG,
+                              (priv->cfg->clock_out << 6) | 0x33);
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 0); /* close i2c_gate */
+
+        return ret;
 }
 
 static int mt2060_sleep(struct dvb_frontend *fe)
 {
         struct mt2060_priv *priv = fe->tuner_priv;
-        return mt2060_writereg(priv, REG_VGAG, (priv->cfg->clock_out << 6) | 0x30);
+        int ret;
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1); /* open i2c_gate */
+
+        ret = mt2060_writereg(priv, REG_VGAG,
+                              (priv->cfg->clock_out << 6) | 0x30);
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 0); /* close i2c_gate */
+
+        return ret;
 }
 
 static int mt2060_release(struct dvb_frontend *fe)
@@ -344,6 +372,9 @@ struct dvb_frontend * mt2060_attach(struct dvb_frontend *fe, struct i2c_adapter
         priv->i2c      = i2c;
         priv->if1_freq = if1;
 
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1); /* open i2c_gate */
+
         if (mt2060_readreg(priv,REG_PART_REV,&id) != 0) {
                 kfree(priv);
                 return NULL;
@@ -360,6 +391,9 @@ struct dvb_frontend * mt2060_attach(struct dvb_frontend *fe, struct i2c_adapter
 
         mt2060_calibrate(priv);
 
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 0); /* close i2c_gate */
+
         return fe;
 }
 EXPORT_SYMBOL(mt2060_attach);
diff --git a/drivers/media/common/tuners/mxl5007t.c b/drivers/media/common/tuners/mxl5007t.c
index cb25e43502fe..64379f2bf237 100644
--- a/drivers/media/common/tuners/mxl5007t.c
+++ b/drivers/media/common/tuners/mxl5007t.c
@@ -979,7 +979,6 @@ struct dvb_frontend *mxl5007t_attach(struct dvb_frontend *fe,
         switch (instance) {
         case 0:
                 goto fail;
-                break;
         case 1:
                 /* new tuner instance */
                 state->config = cfg;
diff --git a/drivers/media/common/tuners/tda18271-fe.c b/drivers/media/common/tuners/tda18271-fe.c
index 93063c6fbbf6..1b48b5d0bf1e 100644
--- a/drivers/media/common/tuners/tda18271-fe.c
+++ b/drivers/media/common/tuners/tda18271-fe.c
@@ -1155,7 +1155,6 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
         switch (instance) {
         case 0:
                 goto fail;
-                break;
         case 1:
                 /* new tuner instance */
                 priv->gate = (cfg) ? cfg->gate : TDA18271_GATE_AUTO;
diff --git a/drivers/media/common/tuners/tda827x.c b/drivers/media/common/tuners/tda827x.c
index 8555d9cf9051..4a74f65e759a 100644
--- a/drivers/media/common/tuners/tda827x.c
+++ b/drivers/media/common/tuners/tda827x.c
@@ -447,17 +447,19 @@ static void tda827xa_lna_gain(struct dvb_frontend *fe, int high,
                         else
                                 arg = 0;
                 }
-                if (priv->cfg->tuner_callback)
-                        priv->cfg->tuner_callback(priv->i2c_adap->algo_data,
-                                                                gp_func, arg);
+                if (fe->callback)
+                        fe->callback(priv->i2c_adap->algo_data,
+                                     DVB_FRONTEND_COMPONENT_TUNER,
+                                     gp_func, arg);
                 buf[1] = high ? 0 : 1;
                 if (priv->cfg->config == 2)
                         buf[1] = high ? 1 : 0;
                 i2c_transfer(priv->i2c_adap, &msg, 1);
                 break;
         case 3: /* switch with GPIO of saa713x */
-                if (priv->cfg->tuner_callback)
-                        priv->cfg->tuner_callback(priv->i2c_adap->algo_data, 0, high);
+                if (fe->callback)
+                        fe->callback(priv->i2c_adap->algo_data,
+                                     DVB_FRONTEND_COMPONENT_TUNER, 0, high);
                 break;
         }
 }
diff --git a/drivers/media/common/tuners/tda827x.h b/drivers/media/common/tuners/tda827x.h
index 7850a9a1dc8f..7d72ce0a0c2d 100644
--- a/drivers/media/common/tuners/tda827x.h
+++ b/drivers/media/common/tuners/tda827x.h
@@ -36,7 +36,6 @@ struct tda827x_config
         /* interface to tda829x driver */
         unsigned int config;
         int          switch_addr;
-        int (*tuner_callback) (void *dev, int command, int arg);
 
         void (*agcf)(struct dvb_frontend *fe);
 };
diff --git a/drivers/media/common/tuners/tda8290.c b/drivers/media/common/tuners/tda8290.c
index 91204d3f282d..c112bdd4e0f0 100644
--- a/drivers/media/common/tuners/tda8290.c
+++ b/drivers/media/common/tuners/tda8290.c
@@ -672,10 +672,8 @@ struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe,
         priv->i2c_props.addr     = i2c_addr;
         priv->i2c_props.adap     = i2c_adap;
         priv->i2c_props.name     = "tda829x";
-        if (cfg) {
+        if (cfg)
                 priv->cfg.config         = cfg->lna_cfg;
-                priv->cfg.tuner_callback = cfg->tuner_callback;
-        }
 
         if (tda8290_probe(&priv->i2c_props) == 0) {
                 priv->ver = TDA8290;
diff --git a/drivers/media/common/tuners/tda8290.h b/drivers/media/common/tuners/tda8290.h
index aa074f3f0c07..7e288b26fcc3 100644
--- a/drivers/media/common/tuners/tda8290.h
+++ b/drivers/media/common/tuners/tda8290.h
@@ -22,7 +22,6 @@
 
 struct tda829x_config {
         unsigned int lna_cfg;
-        int (*tuner_callback) (void *dev, int command, int arg);
 
         unsigned int probe_tuner:1;
 #define TDA829X_PROBE_TUNER 0
diff --git a/drivers/media/common/tuners/tda9887.c b/drivers/media/common/tuners/tda9887.c
index 72abf0b73486..ff1788cc5d48 100644
--- a/drivers/media/common/tuners/tda9887.c
+++ b/drivers/media/common/tuners/tda9887.c
@@ -686,7 +686,6 @@ struct dvb_frontend *tda9887_attach(struct dvb_frontend *fe,
         case 0:
                 mutex_unlock(&tda9887_list_mutex);
                 return NULL;
-                break;
         case 1:
                 fe->analog_demod_priv = priv;
                 priv->mode = T_STANDBY;
diff --git a/drivers/media/common/tuners/tuner-simple.c b/drivers/media/common/tuners/tuner-simple.c
index aa773a658a2a..2a1aac1cc755 100644
--- a/drivers/media/common/tuners/tuner-simple.c
+++ b/drivers/media/common/tuners/tuner-simple.c
@@ -142,6 +142,7 @@ static inline int tuner_stereo(const int type, const int status)
         case TUNER_PHILIPS_FM1236_MK3:
         case TUNER_PHILIPS_FM1256_IH3:
         case TUNER_LG_NTSC_TAPE:
+        case TUNER_TCL_MF02GIP_5N:
                 return ((status & TUNER_SIGNAL) == TUNER_STEREO_MK3);
         default:
                 return status & TUNER_STEREO;
@@ -494,6 +495,7 @@ static int simple_radio_bandswitch(struct dvb_frontend *fe, u8 *buffer)
         case TUNER_PHILIPS_FMD1216ME_MK3:
         case TUNER_LG_NTSC_TAPE:
         case TUNER_PHILIPS_FM1256_IH3:
+        case TUNER_TCL_MF02GIP_5N:
                 buffer[3] = 0x19;
                 break;
         case TUNER_TNF_5335MF:
@@ -1038,7 +1040,6 @@ struct dvb_frontend *simple_tuner_attach(struct dvb_frontend *fe,
         case 0:
                 mutex_unlock(&tuner_simple_list_mutex);
                 return NULL;
-                break;
         case 1:
                 fe->tuner_priv = priv;
 
diff --git a/drivers/media/common/tuners/tuner-types.c b/drivers/media/common/tuners/tuner-types.c
index 10dddca8b5d1..04961a1f44be 100644
--- a/drivers/media/common/tuners/tuner-types.c
+++ b/drivers/media/common/tuners/tuner-types.c
@@ -1216,6 +1216,23 @@ static struct tuner_params tuner_samsung_tcpg_6121p30a_params[] = {
         },
 };
 
+/* ------------ TUNER_TCL_MF02GIP-5N-E - TCL MF02GIP-5N ------------ */
+
+static struct tuner_range tuner_tcl_mf02gip_5n_ntsc_ranges[] = {
+        { 16 * 172.00 /*MHz*/, 0x8e, 0x01, },
+        { 16 * 448.00 /*MHz*/, 0x8e, 0x02, },
+        { 16 * 999.99        , 0x8e, 0x04, },
+};
+
+static struct tuner_params tuner_tcl_mf02gip_5n_params[] = {
+        {
+                .type   = TUNER_PARAM_TYPE_NTSC,
+                .ranges = tuner_tcl_mf02gip_5n_ntsc_ranges,
+                .count  = ARRAY_SIZE(tuner_tcl_mf02gip_5n_ntsc_ranges),
+                .cb_first_if_lower_freq = 1,
+        },
+};
+
 /* --------------------------------------------------------------------- */
 
 struct tunertype tuners[] = {
@@ -1641,6 +1658,11 @@ struct tunertype tuners[] = {
                 .name   = "Xceive 5000 tuner",
                 /* see xc5000.c for details */
         },
+        [TUNER_TCL_MF02GIP_5N] = { /* TCL tuner MF02GIP-5N-E */
+                .name   = "TCL tuner MF02GIP-5N-E",
+                .params = tuner_tcl_mf02gip_5n_params,
+                .count  = ARRAY_SIZE(tuner_tcl_mf02gip_5n_params),
+        },
 };
 EXPORT_SYMBOL(tuners);
 
diff --git a/drivers/media/common/tuners/tuner-xc2028.c b/drivers/media/common/tuners/tuner-xc2028.c
index 4dd1d2421cc5..b65e6803e6c6 100644
--- a/drivers/media/common/tuners/tuner-xc2028.c
+++ b/drivers/media/common/tuners/tuner-xc2028.c
@@ -71,9 +71,6 @@ struct firmware_properties {
 struct xc2028_data {
         struct list_head        hybrid_tuner_instance_list;
         struct tuner_i2c_props  i2c_props;
-        int                     (*tuner_callback) (void *dev,
-                                                   int command, int arg);
-        void                    *video_dev;
         __u32                   frequency;
 
         struct firmware_description *firm;
@@ -492,6 +489,23 @@ ret:
         return i;
 }
 
+static inline int do_tuner_callback(struct dvb_frontend *fe, int cmd, int arg)
+{
+        struct xc2028_data *priv = fe->tuner_priv;
+
+        /* analog side (tuner-core) uses i2c_adap->algo_data.
+         * digital side is not guaranteed to have algo_data defined.
+         *
+         * digital side will always have fe->dvb defined.
+         * analog side (tuner-core) doesn't (yet) define fe->dvb.
+         */
+
+        return (!fe->callback) ? -EINVAL :
+                fe->callback(((fe->dvb) && (fe->dvb->priv)) ?
+                                fe->dvb->priv : priv->i2c_props.adap->algo_data,
+                             DVB_FRONTEND_COMPONENT_TUNER, cmd, arg);
+}
+
 static int load_firmware(struct dvb_frontend *fe, unsigned int type,
                          v4l2_std_id *id)
 {
@@ -530,8 +544,7 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
 
                 if (!size) {
                         /* Special callback command received */
-                        rc = priv->tuner_callback(priv->video_dev,
-                                                  XC2028_TUNER_RESET, 0);
+                        rc = do_tuner_callback(fe, XC2028_TUNER_RESET, 0);
                         if (rc < 0) {
                                 tuner_err("Error at RESET code %d\n",
                                            (*p) & 0x7f);
@@ -542,8 +555,7 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
                 if (size >= 0xff00) {
                         switch (size) {
                         case 0xff00:
-                                rc = priv->tuner_callback(priv->video_dev,
-                                                        XC2028_RESET_CLK, 0);
+                                rc = do_tuner_callback(fe, XC2028_RESET_CLK, 0);
                                 if (rc < 0) {
                                         tuner_err("Error at RESET code %d\n",
                                                   (*p) & 0x7f);
@@ -715,8 +727,7 @@ retry:
         memset(&priv->cur_fw, 0, sizeof(priv->cur_fw));
 
         /* Reset is needed before loading firmware */
-        rc = priv->tuner_callback(priv->video_dev,
-                                  XC2028_TUNER_RESET, 0);
+        rc = do_tuner_callback(fe, XC2028_TUNER_RESET, 0);
         if (rc < 0)
                 goto fail;
 
@@ -933,7 +944,7 @@ static int generic_set_freq(struct dvb_frontend *fe, u32 freq /* in HZ */,
            The reset CLK is needed only with tm6000.
            Driver should work fine even if this fails.
          */
-        priv->tuner_callback(priv->video_dev, XC2028_RESET_CLK, 1);
+        do_tuner_callback(fe, XC2028_RESET_CLK, 1);
 
         msleep(10);
 
@@ -1002,11 +1013,6 @@ static int xc2028_set_params(struct dvb_frontend *fe,
 
         tuner_dbg("%s called\n", __func__);
 
-        if (priv->ctrl.d2633)
-                type |= D2633;
-        else
-                type |= D2620;
-
         switch(fe->ops.info.type) {
         case FE_OFDM:
                 bw = p->u.ofdm.bandwidth;
@@ -1021,10 +1027,8 @@ static int xc2028_set_params(struct dvb_frontend *fe,
                 break;
         case FE_ATSC:
                 bw = BANDWIDTH_6_MHZ;
-                /* The only ATSC firmware (at least on v2.7) is D2633,
-                   so overrides ctrl->d2633 */
-                type |= ATSC| D2633;
-                type &= ~D2620;
+                /* The only ATSC firmware (at least on v2.7) is D2633 */
+                type |= ATSC | D2633;
                 break;
         /* DVB-S is not supported */
         default:
@@ -1057,6 +1061,28 @@ static int xc2028_set_params(struct dvb_frontend *fe,
                 tuner_err("error: bandwidth not supported.\n");
         };
 
+        /*
+          Selects between D2633 or D2620 firmware.
+          It doesn't make sense for ATSC, since it should be D2633 on all cases
+         */
+        if (fe->ops.info.type != FE_ATSC) {
+                switch (priv->ctrl.type) {
+                case XC2028_D2633:
+                        type |= D2633;
+                        break;
+                case XC2028_D2620:
+                        type |= D2620;
+                        break;
+                case XC2028_AUTO:
+                default:
+                        /* Zarlink seems to need D2633 */
+                        if (priv->ctrl.demod == XC3028_FE_ZARLINK456)
+                                type |= D2633;
+                        else
+                                type |= D2620;
+                }
+        }
+
         /* All S-code tables need a 200kHz shift */
         if (priv->ctrl.demod)
                 demod = priv->ctrl.demod + 200;
@@ -1177,20 +1203,10 @@ struct dvb_frontend *xc2028_attach(struct dvb_frontend *fe,
                 break;
         case 1:
                 /* new tuner instance */
-                priv->tuner_callback = cfg->callback;
                 priv->ctrl.max_len = 13;
 
                 mutex_init(&priv->lock);
 
-                /* analog side (tuner-core) uses i2c_adap->algo_data.
-                 * digital side is not guaranteed to have algo_data defined.
-                 *
-                 * digital side will always have fe->dvb defined.
-                 * analog side (tuner-core) doesn't (yet) define fe->dvb.
-                 */
-                priv->video_dev = ((fe->dvb) && (fe->dvb->priv)) ?
-                                   fe->dvb->priv : cfg->i2c_adap->algo_data;
-
                 fe->tuner_priv = priv;
                 break;
         case 2:
diff --git a/drivers/media/common/tuners/tuner-xc2028.h b/drivers/media/common/tuners/tuner-xc2028.h
index 2c5b6282b569..19de7928a74e 100644
--- a/drivers/media/common/tuners/tuner-xc2028.h
+++ b/drivers/media/common/tuners/tuner-xc2028.h
@@ -24,24 +24,28 @@
 #define XC3028_FE_ZARLINK456    4560
 #define XC3028_FE_CHINA         5200
 
+enum firmware_type {
+        XC2028_AUTO = 0,        /* By default, auto-detects */
+        XC2028_D2633,
+        XC2028_D2620,
+};
+
 struct xc2028_ctrl {
         char                    *fname;
         int                     max_len;
         unsigned int            scode_table;
         unsigned int            mts   :1;
-        unsigned int            d2633 :1;
         unsigned int            input1:1;
         unsigned int            vhfbw7:1;
         unsigned int            uhfbw8:1;
         unsigned int            demod;
+        enum firmware_type      type:2;
 };
 
 struct xc2028_config {
         struct i2c_adapter *i2c_adap;
         u8                 i2c_addr;
-        void               *video_dev;
         struct xc2028_ctrl *ctrl;
-        int                (*callback) (void *dev, int command, int arg);
 };
 
 /* xc2028 commands for callback */
diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c
index dcddfa803a75..f9c2bb917f54 100644
--- a/drivers/media/common/tuners/xc5000.c
+++ b/drivers/media/common/tuners/xc5000.c
@@ -30,7 +30,7 @@
 #include "dvb_frontend.h"
 
 #include "xc5000.h"
-#include "xc5000_priv.h"
+#include "tuner-i2c.h"
 
 static int debug;
 module_param(debug, int, 0644);
@@ -40,12 +40,26 @@ static int xc5000_load_fw_on_attach;
 module_param_named(init_fw, xc5000_load_fw_on_attach, int, 0644);
 MODULE_PARM_DESC(init_fw, "Load firmware during driver initialization.");
 
+static DEFINE_MUTEX(xc5000_list_mutex);
+static LIST_HEAD(hybrid_tuner_instance_list);
+
 #define dprintk(level,fmt, arg...) if (debug >= level) \
         printk(KERN_INFO "%s: " fmt, "xc5000", ## arg)
 
 #define XC5000_DEFAULT_FIRMWARE "dvb-fe-xc5000-1.1.fw"
 #define XC5000_DEFAULT_FIRMWARE_SIZE 12332
 
+struct xc5000_priv {
+        struct tuner_i2c_props i2c_props;
+        struct list_head hybrid_tuner_instance_list;
+
+        u32 if_khz;
+        u32 freq_hz;
+        u32 bandwidth;
+        u8  video_standard;
+        u8  rf_mode;
+};
+
 /* Misc Defines */
 #define MAX_TV_STANDARD                 23
 #define XC_MAX_I2C_WRITE_LENGTH         64
@@ -216,9 +230,12 @@ static void xc5000_TunerReset(struct dvb_frontend *fe)
 
         dprintk(1, "%s()\n", __func__);
 
-        if (priv->cfg->tuner_callback) {
-                ret = priv->cfg->tuner_callback(priv->devptr,
-                                                XC5000_TUNER_RESET, 0);
+        if (fe->callback) {
+                ret = fe->callback(((fe->dvb) && (fe->dvb->priv)) ?
+                                           fe->dvb->priv :
+                                           priv->i2c_props.adap->algo_data,
+                                           DVB_FRONTEND_COMPONENT_TUNER,
+                                           XC5000_TUNER_RESET, 0);
                 if (ret)
                         printk(KERN_ERR "xc5000: reset failed\n");
         } else
@@ -509,13 +526,13 @@ static int xc5000_readreg(struct xc5000_priv *priv, u16 reg, u16 *val)
         u8 buf[2] = { reg >> 8, reg & 0xff };
         u8 bval[2] = { 0, 0 };
         struct i2c_msg msg[2] = {
-                { .addr = priv->cfg->i2c_address,
+                { .addr = priv->i2c_props.addr,
                         .flags = 0, .buf = &buf[0], .len = 2 },
-                { .addr = priv->cfg->i2c_address,
+                { .addr = priv->i2c_props.addr,
                         .flags = I2C_M_RD, .buf = &bval[0], .len = 2 },
         };
 
-        if (i2c_transfer(priv->i2c, msg, 2) != 2) {
+        if (i2c_transfer(priv->i2c_props.adap, msg, 2) != 2) {
                 printk(KERN_WARNING "xc5000: I2C read failed\n");
                 return -EREMOTEIO;
         }
@@ -526,10 +543,10 @@ static int xc5000_readreg(struct xc5000_priv *priv, u16 reg, u16 *val)
 
 static int xc5000_writeregs(struct xc5000_priv *priv, u8 *buf, u8 len)
 {
-        struct i2c_msg msg = { .addr = priv->cfg->i2c_address,
+        struct i2c_msg msg = { .addr = priv->i2c_props.addr,
                 .flags = 0, .buf = buf, .len = len };
 
-        if (i2c_transfer(priv->i2c, &msg, 1) != 1) {
+        if (i2c_transfer(priv->i2c_props.adap, &msg, 1) != 1) {
                 printk(KERN_ERR "xc5000: I2C write failed (len=%i)\n",
                         (int)len);
                 return -EREMOTEIO;
@@ -539,10 +556,10 @@ static int xc5000_writeregs(struct xc5000_priv *priv, u8 *buf, u8 len)
 
 static int xc5000_readregs(struct xc5000_priv *priv, u8 *buf, u8 len)
 {
-        struct i2c_msg msg = { .addr = priv->cfg->i2c_address,
+        struct i2c_msg msg = { .addr = priv->i2c_props.addr,
                 .flags = I2C_M_RD, .buf = buf, .len = len };
 
-        if (i2c_transfer(priv->i2c, &msg, 1) != 1) {
+        if (i2c_transfer(priv->i2c_props.adap, &msg, 1) != 1) {
                 printk(KERN_ERR "xc5000 I2C read failed (len=%i)\n",(int)len);
                 return -EREMOTEIO;
         }
@@ -559,7 +576,7 @@ static int xc5000_fwupload(struct dvb_frontend* fe)
         printk(KERN_INFO "xc5000: waiting for firmware upload (%s)...\n",
                 XC5000_DEFAULT_FIRMWARE);
 
-        ret = request_firmware(&fw, XC5000_DEFAULT_FIRMWARE, &priv->i2c->dev);
+        ret = request_firmware(&fw, XC5000_DEFAULT_FIRMWARE, &priv->i2c_props.adap->dev);
         if (ret) {
                 printk(KERN_ERR "xc5000: Upload failed. (file not found?)\n");
                 ret = XC_RESULT_RESET_FAILURE;
@@ -675,10 +692,10 @@ static int xc5000_set_params(struct dvb_frontend *fe,
                 return -EREMOTEIO;
         }
 
-        ret = xc_set_IF_frequency(priv, priv->cfg->if_khz);
+        ret = xc_set_IF_frequency(priv, priv->if_khz);
         if (ret != XC_RESULT_SUCCESS) {
                 printk(KERN_ERR "xc5000: xc_Set_IF_frequency(%d) failed\n",
-                        priv->cfg->if_khz);
+                       priv->if_khz);
                 return -EIO;
         }
 
@@ -897,9 +914,19 @@ static int xc5000_init(struct dvb_frontend *fe)
 
 static int xc5000_release(struct dvb_frontend *fe)
 {
+        struct xc5000_priv *priv = fe->tuner_priv;
+
         dprintk(1, "%s()\n", __func__);
-        kfree(fe->tuner_priv);
+
+        mutex_lock(&xc5000_list_mutex);
+
+        if (priv)
+                hybrid_tuner_release_state(priv);
+
+        mutex_unlock(&xc5000_list_mutex);
+
         fe->tuner_priv = NULL;
+
         return 0;
 }
 
@@ -924,29 +951,43 @@ static const struct dvb_tuner_ops xc5000_tuner_ops = {
 
 struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe,
                                    struct i2c_adapter *i2c,
-                                   struct xc5000_config *cfg, void *devptr)
+                                   struct xc5000_config *cfg)
 {
         struct xc5000_priv *priv = NULL;
+        int instance;
         u16 id = 0;
 
-        dprintk(1, "%s()\n", __func__);
+        dprintk(1, "%s(%d-%04x)\n", __func__,
+                i2c ? i2c_adapter_id(i2c) : -1,
+                cfg ? cfg->i2c_address : -1);
 
-        priv = kzalloc(sizeof(struct xc5000_priv), GFP_KERNEL);
-        if (priv == NULL)
-                return NULL;
+        mutex_lock(&xc5000_list_mutex);
 
-        priv->cfg = cfg;
-        priv->bandwidth = BANDWIDTH_6_MHZ;
-        priv->i2c = i2c;
-        priv->devptr = devptr;
+        instance = hybrid_tuner_request_state(struct xc5000_priv, priv,
+                                              hybrid_tuner_instance_list,
+                                              i2c, cfg->i2c_address, "xc5000");
+        switch (instance) {
+        case 0:
+                goto fail;
+                break;
+        case 1:
+                /* new tuner instance */
+                priv->bandwidth = BANDWIDTH_6_MHZ;
+                priv->if_khz = cfg->if_khz;
+
+                fe->tuner_priv = priv;
+                break;
+        default:
+                /* existing tuner instance */
+                fe->tuner_priv = priv;
+                break;
+        }
 
         /* Check if firmware has been loaded. It is possible that another
            instance of the driver has loaded the firmware.
          */
-        if (xc5000_readreg(priv, XREG_PRODUCT_ID, &id) != 0) {
-                kfree(priv);
-                return NULL;
-        }
+        if (xc5000_readreg(priv, XREG_PRODUCT_ID, &id) != 0)
+                goto fail;
 
         switch(id) {
         case XC_PRODUCT_ID_FW_LOADED:
@@ -967,19 +1008,23 @@ struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe,
                 printk(KERN_ERR
                         "xc5000: Device not found at addr 0x%02x (0x%x)\n",
                         cfg->i2c_address, id);
-                kfree(priv);
-                return NULL;
+                goto fail;
         }
 
+        mutex_unlock(&xc5000_list_mutex);
+
         memcpy(&fe->ops.tuner_ops, &xc5000_tuner_ops,
                 sizeof(struct dvb_tuner_ops));
 
-        fe->tuner_priv = priv;
-
         if (xc5000_load_fw_on_attach)
                 xc5000_init(fe);
 
         return fe;
+fail:
+        mutex_unlock(&xc5000_list_mutex);
+
+        xc5000_release(fe);
+        return NULL;
 }
 EXPORT_SYMBOL(xc5000_attach);
 
diff --git a/drivers/media/common/tuners/xc5000.h b/drivers/media/common/tuners/xc5000.h
index 5389f740945a..cf1a558e0e7f 100644
--- a/drivers/media/common/tuners/xc5000.h
+++ b/drivers/media/common/tuners/xc5000.h
@@ -30,8 +30,6 @@ struct i2c_adapter;
 struct xc5000_config {
         u8   i2c_address;
         u32  if_khz;
-
-        int  (*tuner_callback) (void *priv, int command, int arg);
 };
 
 /* xc5000 callback command */
@@ -49,13 +47,11 @@ struct xc5000_config {
     (defined(CONFIG_MEDIA_TUNER_XC5000_MODULE) && defined(MODULE))
 extern struct dvb_frontend* xc5000_attach(struct dvb_frontend *fe,
                                           struct i2c_adapter *i2c,
-                                          struct xc5000_config *cfg,
-                                          void *devptr);
+                                          struct xc5000_config *cfg);
 #else
 static inline struct dvb_frontend* xc5000_attach(struct dvb_frontend *fe,
                                                  struct i2c_adapter *i2c,
-                                                 struct xc5000_config *cfg,
-                                                 void *devptr)
+                                                 struct xc5000_config *cfg)
 {
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
         return NULL;
diff --git a/drivers/media/common/tuners/xc5000_priv.h b/drivers/media/common/tuners/xc5000_priv.h
deleted file mode 100644
index b2a0074c99c9..000000000000
--- a/drivers/media/common/tuners/xc5000_priv.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  Driver for Xceive XC5000 "QAM/8VSB single chip tuner"
- *
- *  Copyright (c) 2007 Steven Toth <stoth@linuxtv.org>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, 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 XC5000_PRIV_H
-#define XC5000_PRIV_H
-
-struct xc5000_priv {
-        struct xc5000_config *cfg;
-        struct i2c_adapter   *i2c;
-
-        u32 freq_hz;
-        u32 bandwidth;
-        u8  video_standard;
-        u8  rf_mode;
-
-        void *devptr;
-};
-
-#endif
diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig
index 8bc1445bd33b..0bcd852576d6 100644
--- a/drivers/media/dvb/Kconfig
+++ b/drivers/media/dvb/Kconfig
@@ -20,7 +20,6 @@ comment "Supported USB Adapters"
 source "drivers/media/dvb/dvb-usb/Kconfig"
 source "drivers/media/dvb/ttusb-budget/Kconfig"
 source "drivers/media/dvb/ttusb-dec/Kconfig"
-source "drivers/media/dvb/cinergyT2/Kconfig"
 source "drivers/media/dvb/siano/Kconfig"
 
 comment "Supported FlexCopII (B2C2) Adapters"
@@ -35,6 +34,10 @@ comment "Supported Pluto2 Adapters"
         depends on DVB_CORE && PCI && I2C
 source "drivers/media/dvb/pluto2/Kconfig"
 
+comment "Supported SDMC DM1105 Adapters"
+        depends on DVB_CORE && PCI && I2C
+source "drivers/media/dvb/dm1105/Kconfig"
+
 comment "Supported DVB Frontends"
         depends on DVB_CORE
 source "drivers/media/dvb/frontends/Kconfig"
diff --git a/drivers/media/dvb/Makefile b/drivers/media/dvb/Makefile
index d6ba4d195201..f91e9eb15e52 100644
--- a/drivers/media/dvb/Makefile
+++ b/drivers/media/dvb/Makefile
@@ -2,4 +2,4 @@
 # Makefile for the kernel multimedia device drivers.
 #
 
-obj-y        := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ b2c2/ bt8xx/ cinergyT2/ dvb-usb/ pluto2/ siano/
+obj-y        := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ b2c2/ bt8xx/ dvb-usb/ pluto2/ siano/ dm1105/
diff --git a/drivers/media/dvb/b2c2/flexcop-dma.c b/drivers/media/dvb/b2c2/flexcop-dma.c
index a91ed28f03a4..26f0011a5078 100644
--- a/drivers/media/dvb/b2c2/flexcop-dma.c
+++ b/drivers/media/dvb/b2c2/flexcop-dma.c
@@ -10,7 +10,7 @@
 int flexcop_dma_allocate(struct pci_dev *pdev, struct flexcop_dma *dma, u32 size)
 {
         u8 *tcpu;
-        dma_addr_t tdma;
+        dma_addr_t tdma = 0;
 
         if (size % 2) {
                 err("dma buffersize has to be even.");
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index 6afbfbbef0ce..48762a2b9e42 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -702,7 +702,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
         }
 
         if (card->fe == NULL)
-                printk("dvb-bt8xx: A frontend driver was not found for device %04x/%04x subsystem %04x/%04x\n",
+                printk("dvb-bt8xx: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",
                        card->bt->dev->vendor,
                        card->bt->dev->device,
                        card->bt->dev->subsystem_vendor,
diff --git a/drivers/media/dvb/cinergyT2/Kconfig b/drivers/media/dvb/cinergyT2/Kconfig
deleted file mode 100644
index c03513b2ccae..000000000000
--- a/drivers/media/dvb/cinergyT2/Kconfig
+++ /dev/null
@@ -1,85 +0,0 @@
-config DVB_CINERGYT2
-        tristate "Terratec CinergyT2/qanu USB2 DVB-T receiver"
-        depends on DVB_CORE && USB && INPUT
-        help
-          Support for "TerraTec CinergyT2" USB2.0 Highspeed DVB Receivers
-
-          Say Y if you own such a device and want to use it.
-
-
-config DVB_CINERGYT2_TUNING
-        bool "sophisticated fine-tuning for CinergyT2 cards"
-        depends on DVB_CINERGYT2
-        help
-          Here you can fine-tune some parameters of the CinergyT2 driver.
-
-          Normally you don't need to touch this, but in exotic setups you
-          may fine-tune your setup and adjust e.g. DMA buffer sizes for
-          a particular application.
-
-
-config DVB_CINERGYT2_STREAM_URB_COUNT
-        int "Number of queued USB Request Blocks for Highspeed Stream Transfers"
-        depends on DVB_CINERGYT2_TUNING
-        default "32"
-        help
-          USB Request Blocks for Highspeed Stream transfers are scheduled in
-          a queue for the Host Controller.
-
-          Usually the default value is a safe choice.
-
-          You may increase this number if you are using this device in a
-          Server Environment with many high-traffic USB Highspeed devices
-          sharing the same USB bus.
-
-
-config DVB_CINERGYT2_STREAM_BUF_SIZE
-        int "Size of URB Stream Buffers for Highspeed Transfers"
-        depends on DVB_CINERGYT2_TUNING
-        default "512"
-        help
-          Should be a multiple of native buffer size of 512 bytes.
-          Default value is a safe choice.
-
-          You may increase this number if you are using this device in a
-          Server Environment with many high-traffic USB Highspeed devices
-          sharing the same USB bus.
-
-
-config DVB_CINERGYT2_QUERY_INTERVAL
-        int "Status update interval [milliseconds]"
-        depends on DVB_CINERGYT2_TUNING
-        default "250"
-        help
-          This is the interval for status readouts from the demodulator.
-          You may try lower values if you need more responsive signal quality
-          measurements.
-
-          Please keep in mind that these updates cause traffic on the tuner
-          control bus and thus may or may not affect reception sensitivity.
-
-          The default value should be a safe choice for common applications.
-
-
-config DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE
-        bool "Register the onboard IR Remote Control Receiver as Input Device"
-        depends on DVB_CINERGYT2_TUNING
-        default y
-        help
-          Enable this option if you want to use the onboard Infrared Remote
-          Control Receiver as Linux-Input device.
-
-          Right now only the keycode table for the default Remote Control
-          delivered with the device is supported, please see the driver
-          source code to find out how to add support for other controls.
-
-
-config DVB_CINERGYT2_RC_QUERY_INTERVAL
-        int "Infrared Remote Controller update interval [milliseconds]"
-        depends on DVB_CINERGYT2_TUNING && DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE
-        default "50"
-        help
-          If you have a very fast-repeating remote control you can try lower
-          values, for normal consumer receivers the default value should be
-          a safe choice.
-
diff --git a/drivers/media/dvb/cinergyT2/Makefile b/drivers/media/dvb/cinergyT2/Makefile
deleted file mode 100644
index d762d8cb0cf1..000000000000
--- a/drivers/media/dvb/cinergyT2/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-obj-$(CONFIG_DVB_CINERGYT2) += cinergyT2.o
-
-EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c
deleted file mode 100644
index a824f3719f81..000000000000
--- a/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ /dev/null
@@ -1,1105 +0,0 @@
-/*
- * TerraTec Cinergy T²/qanu USB2 DVB-T adapter.
- *
- * Copyright (C) 2004 Daniel Mack <daniel@qanu.de> and
- *                  Holger Waechtler <holger@qanu.de>
- *
- *  Protocol Spec published on http://qanu.de/specs/terratec_cinergyT2.pdf
- *
- * 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/slab.h>
-#include <linux/usb.h>
-#include <linux/input.h>
-#include <linux/dvb/frontend.h>
-#include <linux/mutex.h>
-#include <linux/mm.h>
-#include <asm/io.h>
-
-#include "dmxdev.h"
-#include "dvb_demux.h"
-#include "dvb_net.h"
-
-#ifdef CONFIG_DVB_CINERGYT2_TUNING
-        #define STREAM_URB_COUNT (CONFIG_DVB_CINERGYT2_STREAM_URB_COUNT)
-        #define STREAM_BUF_SIZE (CONFIG_DVB_CINERGYT2_STREAM_BUF_SIZE)
-        #define QUERY_INTERVAL (CONFIG_DVB_CINERGYT2_QUERY_INTERVAL)
-        #ifdef CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE
-                #define RC_QUERY_INTERVAL (CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL)
-                #define ENABLE_RC (1)
-        #endif
-#else
-        #define STREAM_URB_COUNT (32)
-        #define STREAM_BUF_SIZE (512)   /* bytes */
-        #define ENABLE_RC (1)
-        #define RC_QUERY_INTERVAL (50)  /* milliseconds */
-        #define QUERY_INTERVAL (333)    /* milliseconds */
-#endif
-
-#define DRIVER_NAME "TerraTec/qanu USB2.0 Highspeed DVB-T Receiver"
-
-static int debug;
-module_param_named(debug, debug, int, 0644);
-MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off).");
-
-DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
-
-#define dprintk(level, args...)                                         \
-do {                                                                    \
-        if ((debug & level)) {                                          \
-                printk("%s: %s(): ", KBUILD_MODNAME,                    \
-                       __func__);                                       \
-                printk(args); }                                         \
-} while (0)
-
-enum cinergyt2_ep1_cmd {
-        CINERGYT2_EP1_PID_TABLE_RESET           = 0x01,
-        CINERGYT2_EP1_PID_SETUP                 = 0x02,
-        CINERGYT2_EP1_CONTROL_STREAM_TRANSFER   = 0x03,
-        CINERGYT2_EP1_SET_TUNER_PARAMETERS      = 0x04,
-        CINERGYT2_EP1_GET_TUNER_STATUS          = 0x05,
-        CINERGYT2_EP1_START_SCAN                = 0x06,
-        CINERGYT2_EP1_CONTINUE_SCAN             = 0x07,
-        CINERGYT2_EP1_GET_RC_EVENTS             = 0x08,
-        CINERGYT2_EP1_SLEEP_MODE                = 0x09
-};
-
-struct dvbt_set_parameters_msg {
-        uint8_t cmd;
-        __le32 freq;
-        uint8_t bandwidth;
-        __le16 tps;
-        uint8_t flags;
-} __attribute__((packed));
-
-struct dvbt_get_status_msg {
-        __le32 freq;
-        uint8_t bandwidth;
-        __le16 tps;
-        uint8_t flags;
-        __le16 gain;
-        uint8_t snr;
-        __le32 viterbi_error_rate;
-        __le32 rs_error_rate;
-        __le32 uncorrected_block_count;
-        uint8_t lock_bits;
-        uint8_t prev_lock_bits;
-} __attribute__((packed));
-
-static struct dvb_frontend_info cinergyt2_fe_info = {
-        .name = DRIVER_NAME,
-        .type = FE_OFDM,
-        .frequency_min = 174000000,
-        .frequency_max = 862000000,
-        .frequency_stepsize = 166667,
-        .caps = FE_CAN_INVERSION_AUTO | FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 |
-                FE_CAN_FEC_3_4 | FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 |
-                FE_CAN_FEC_AUTO |
-                FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
-                FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO |
-                FE_CAN_HIERARCHY_AUTO | FE_CAN_RECOVER | FE_CAN_MUTE_TS
-};
-
-struct cinergyt2 {
-        struct dvb_demux demux;
-        struct usb_device *udev;
-        struct mutex sem;
-        struct mutex wq_sem;
-        struct dvb_adapter adapter;
-        struct dvb_device *fedev;
-        struct dmxdev dmxdev;
-        struct dvb_net dvbnet;
-
-        int streaming;
-        int sleeping;
-
-        struct dvbt_set_parameters_msg param;
-        struct dvbt_get_status_msg status;
-        struct delayed_work query_work;
-
-        wait_queue_head_t poll_wq;
-        int pending_fe_events;
-        int disconnect_pending;
-        unsigned int uncorrected_block_count;
-        atomic_t inuse;
-
-        void *streambuf;
-        dma_addr_t streambuf_dmahandle;
-        struct urb *stream_urb [STREAM_URB_COUNT];
-
-#ifdef ENABLE_RC
-        struct input_dev *rc_input_dev;
-        char phys[64];
-        struct delayed_work rc_query_work;
-        int rc_input_event;
-        __le32 rc_last_code;
-        unsigned long last_event_jiffies;
-#endif
-};
-
-enum {
-        CINERGYT2_RC_EVENT_TYPE_NONE = 0x00,
-        CINERGYT2_RC_EVENT_TYPE_NEC  = 0x01,
-        CINERGYT2_RC_EVENT_TYPE_RC5  = 0x02
-};
-
-struct cinergyt2_rc_event {
-        char type;
-        __le32 value;
-} __attribute__((packed));
-
-static const uint32_t rc_keys[] = {
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xfe01eb04,     KEY_POWER,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xfd02eb04,     KEY_1,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xfc03eb04,     KEY_2,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xfb04eb04,     KEY_3,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xfa05eb04,     KEY_4,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xf906eb04,     KEY_5,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xf807eb04,     KEY_6,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xf708eb04,     KEY_7,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xf609eb04,     KEY_8,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xf50aeb04,     KEY_9,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xf30ceb04,     KEY_0,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xf40beb04,     KEY_VIDEO,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xf20deb04,     KEY_REFRESH,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xf10eeb04,     KEY_SELECT,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xf00feb04,     KEY_EPG,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xef10eb04,     KEY_UP,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xeb14eb04,     KEY_DOWN,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xee11eb04,     KEY_LEFT,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xec13eb04,     KEY_RIGHT,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xed12eb04,     KEY_OK,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xea15eb04,     KEY_TEXT,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xe916eb04,     KEY_INFO,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xe817eb04,     KEY_RED,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xe718eb04,     KEY_GREEN,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xe619eb04,     KEY_YELLOW,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xe51aeb04,     KEY_BLUE,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xe31ceb04,     KEY_VOLUMEUP,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xe11eeb04,     KEY_VOLUMEDOWN,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xe21deb04,     KEY_MUTE,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xe41beb04,     KEY_CHANNELUP,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xe01feb04,     KEY_CHANNELDOWN,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xbf40eb04,     KEY_PAUSE,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xb34ceb04,     KEY_PLAY,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xa758eb04,     KEY_RECORD,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xab54eb04,     KEY_PREVIOUS,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xb748eb04,     KEY_STOP,
-        CINERGYT2_RC_EVENT_TYPE_NEC,    0xa35ceb04,     KEY_NEXT
-};
-
-static int cinergyt2_command (struct cinergyt2 *cinergyt2,
-                              char *send_buf, int send_buf_len,
-                              char *recv_buf, int recv_buf_len)
-{
-        int actual_len;
-        char dummy;
-        int ret;
-
-        ret = usb_bulk_msg(cinergyt2->udev, usb_sndbulkpipe(cinergyt2->udev, 1),
-                           send_buf, send_buf_len, &actual_len, 1000);
-
-        if (ret)
-                dprintk(1, "usb_bulk_msg (send) failed, err %i\n", ret);
-
-        if (!recv_buf)
-                recv_buf = &dummy;
-
-        ret = usb_bulk_msg(cinergyt2->udev, usb_rcvbulkpipe(cinergyt2->udev, 1),
-                           recv_buf, recv_buf_len, &actual_len, 1000);
-
-        if (ret)
-                dprintk(1, "usb_bulk_msg (read) failed, err %i\n", ret);
-
-        return ret ? ret : actual_len;
-}
-
-static void cinergyt2_control_stream_transfer (struct cinergyt2 *cinergyt2, int enable)
-{
-        char buf [] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };
-        cinergyt2_command(cinergyt2, buf, sizeof(buf), NULL, 0);
-}
-
-static void cinergyt2_sleep (struct cinergyt2 *cinergyt2, int sleep)
-{
-        char buf [] = { CINERGYT2_EP1_SLEEP_MODE, sleep ? 1 : 0 };
-        cinergyt2_command(cinergyt2, buf, sizeof(buf), NULL, 0);
-        cinergyt2->sleeping = sleep;
-}
-
-static void cinergyt2_stream_irq (struct urb *urb);
-
-static int cinergyt2_submit_stream_urb (struct cinergyt2 *cinergyt2, struct urb *urb)
-{
-        int err;
-
-        usb_fill_bulk_urb(urb,
-                          cinergyt2->udev,
-                          usb_rcvbulkpipe(cinergyt2->udev, 0x2),
-                          urb->transfer_buffer,
-                          STREAM_BUF_SIZE,
-                          cinergyt2_stream_irq,
-                          cinergyt2);
-
-        if ((err = usb_submit_urb(urb, GFP_ATOMIC)))
-                dprintk(1, "urb submission failed (err = %i)!\n", err);
-
-        return err;
-}
-
-static void cinergyt2_stream_irq (struct urb *urb)
-{
-        struct cinergyt2 *cinergyt2 = urb->context;
-
-        if (urb->actual_length > 0)
-                dvb_dmx_swfilter(&cinergyt2->demux,
-                                 urb->transfer_buffer, urb->actual_length);
-
-        if (cinergyt2->streaming)
-                cinergyt2_submit_stream_urb(cinergyt2, urb);
-}
-
-static void cinergyt2_free_stream_urbs (struct cinergyt2 *cinergyt2)
-{
-        int i;
-
-        for (i=0; i<STREAM_URB_COUNT; i++)
-                usb_free_urb(cinergyt2->stream_urb[i]);
-
-        usb_buffer_free(cinergyt2->udev, STREAM_URB_COUNT*STREAM_BUF_SIZE,
-                            cinergyt2->streambuf, cinergyt2->streambuf_dmahandle);
-}
-
-static int cinergyt2_alloc_stream_urbs (struct cinergyt2 *cinergyt2)
-{
-        int i;
-
-        cinergyt2->streambuf = usb_buffer_alloc(cinergyt2->udev, STREAM_URB_COUNT*STREAM_BUF_SIZE,
-                                              GFP_KERNEL, &cinergyt2->streambuf_dmahandle);
-        if (!cinergyt2->streambuf) {
-                dprintk(1, "failed to alloc consistent stream memory area, bailing out!\n");
-                return -ENOMEM;
-        }
-
-        memset(cinergyt2->streambuf, 0, STREAM_URB_COUNT*STREAM_BUF_SIZE);
-
-        for (i=0; i<STREAM_URB_COUNT; i++) {
-                struct urb *urb;
-
-                if (!(urb = usb_alloc_urb(0, GFP_ATOMIC))) {
-                        dprintk(1, "failed to alloc consistent stream urbs, bailing out!\n");
-                        cinergyt2_free_stream_urbs(cinergyt2);
-                        return -ENOMEM;
-                }
-
-                urb->transfer_buffer = cinergyt2->streambuf + i * STREAM_BUF_SIZE;
-                urb->transfer_buffer_length = STREAM_BUF_SIZE;
-
-                cinergyt2->stream_urb[i] = urb;
-        }
-
-        return 0;
-}
-
-static void cinergyt2_stop_stream_xfer (struct cinergyt2 *cinergyt2)
-{
-        int i;
-
-        cinergyt2_control_stream_transfer(cinergyt2, 0);
-
-        for (i=0; i<STREAM_URB_COUNT; i++)
-                usb_kill_urb(cinergyt2->stream_urb[i]);
-}
-
-static int cinergyt2_start_stream_xfer (struct cinergyt2 *cinergyt2)
-{
-        int i, err;
-
-        for (i=0; i<STREAM_URB_COUNT; i++) {
-                if ((err = cinergyt2_submit_stream_urb(cinergyt2, cinergyt2->stream_urb[i]))) {
-                        cinergyt2_stop_stream_xfer(cinergyt2);
-                        dprintk(1, "failed urb submission (%i: err = %i)!\n", i, err);
-                        return err;
-                }
-        }
-
-        cinergyt2_control_stream_transfer(cinergyt2, 1);
-        return 0;
-}
-
-static int cinergyt2_start_feed(struct dvb_demux_feed *dvbdmxfeed)
-{
-        struct dvb_demux *demux = dvbdmxfeed->demux;
-        struct cinergyt2 *cinergyt2 = demux->priv;
-
-        if (cinergyt2->disconnect_pending)
-                return -EAGAIN;
-        if (mutex_lock_interruptible(&cinergyt2->sem))
-                return -ERESTARTSYS;
-
-        if (cinergyt2->streaming == 0)
-                cinergyt2_start_stream_xfer(cinergyt2);
-
-        cinergyt2->streaming++;
-        mutex_unlock(&cinergyt2->sem);
-        return 0;
-}
-
-static int cinergyt2_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
-{
-        struct dvb_demux *demux = dvbdmxfeed->demux;
-        struct cinergyt2 *cinergyt2 = demux->priv;
-
-        if (cinergyt2->disconnect_pending)
-                return -EAGAIN;
-        if (mutex_lock_interruptible(&cinergyt2->sem))
-                return -ERESTARTSYS;
-
-        if (--cinergyt2->streaming == 0)
-                cinergyt2_stop_stream_xfer(cinergyt2);
-
-        mutex_unlock(&cinergyt2->sem);
-        return 0;
-}
-
-/**
- *  convert linux-dvb frontend parameter set into TPS.
- *  See ETSI ETS-300744, section 4.6.2, table 9 for details.
- *
- *  This function is probably reusable and may better get placed in a support
- *  library.
- *
- *  We replace errornous fields by default TPS fields (the ones with value 0).
- */
-static uint16_t compute_tps (struct dvb_frontend_parameters *p)
-{
-        struct dvb_ofdm_parameters *op = &p->u.ofdm;
-        uint16_t tps = 0;
-
-        switch (op->code_rate_HP) {
-                case FEC_2_3:
-                        tps |= (1 << 7);
-                        break;
-                case FEC_3_4:
-                        tps |= (2 << 7);
-                        break;
-                case FEC_5_6:
-                        tps |= (3 << 7);
-                        break;
-                case FEC_7_8:
-                        tps |= (4 << 7);
-                        break;
-                case FEC_1_2:
-                case FEC_AUTO:
-                default:
-                        /* tps |= (0 << 7) */;
-        }
-
-        switch (op->code_rate_LP) {
-                case FEC_2_3:
-                        tps |= (1 << 4);
-                        break;
-                case FEC_3_4:
-                        tps |= (2 << 4);
-                        break;
-                case FEC_5_6:
-                        tps |= (3 << 4);
-                        break;
-                case FEC_7_8:
-                        tps |= (4 << 4);
-                        break;
-                case FEC_1_2:
-                case FEC_AUTO:
-                default:
-                        /* tps |= (0 << 4) */;
-        }
-
-        switch (op->constellation) {
-                case QAM_16:
-                        tps |= (1 << 13);
-                        break;
-                case QAM_64:
-                        tps |= (2 << 13);
-                        break;
-                case QPSK:
-                default:
-                        /* tps |= (0 << 13) */;
-        }
-
-        switch (op->transmission_mode) {
-                case TRANSMISSION_MODE_8K:
-                        tps |= (1 << 0);
-                        break;
-                case TRANSMISSION_MODE_2K:
-                default:
-                        /* tps |= (0 << 0) */;
-        }
-
-        switch (op->guard_interval) {
-                case GUARD_INTERVAL_1_16:
-                        tps |= (1 << 2);
-                        break;
-                case GUARD_INTERVAL_1_8:
-                        tps |= (2 << 2);
-                        break;
-                case GUARD_INTERVAL_1_4:
-                        tps |= (3 << 2);
-                        break;
-                case GUARD_INTERVAL_1_32:
-                default:
-                        /* tps |= (0 << 2) */;
-        }
-
-        switch (op->hierarchy_information) {
-                case HIERARCHY_1:
-                        tps |= (1 << 10);
-                        break;
-                case HIERARCHY_2:
-                        tps |= (2 << 10);
-                        break;
-                case HIERARCHY_4:
-                        tps |= (3 << 10);
-                        break;
-                case HIERARCHY_NONE:
-                default:
-                        /* tps |= (0 << 10) */;
-        }
-
-        return tps;
-}
-
-static int cinergyt2_open (struct inode *inode, struct file *file)
-{
-        struct dvb_device *dvbdev = file->private_data;
-        struct cinergyt2 *cinergyt2 = dvbdev->priv;
-        int err = -EAGAIN;
-
-        if (cinergyt2->disconnect_pending)
-                goto out;
-        err = mutex_lock_interruptible(&cinergyt2->wq_sem);
-        if (err)
-                goto out;
-
-        err = mutex_lock_interruptible(&cinergyt2->sem);
-        if (err)
-                goto out_unlock1;
-
-        if ((err = dvb_generic_open(inode, file)))
-                goto out_unlock2;
-
-        if ((file->f_flags & O_ACCMODE) != O_RDONLY) {
-                cinergyt2_sleep(cinergyt2, 0);
-                schedule_delayed_work(&cinergyt2->query_work, HZ/2);
-        }
-
-        atomic_inc(&cinergyt2->inuse);
-
-out_unlock2:
-        mutex_unlock(&cinergyt2->sem);
-out_unlock1:
-        mutex_unlock(&cinergyt2->wq_sem);
-out:
-        return err;
-}
-
-static void cinergyt2_unregister(struct cinergyt2 *cinergyt2)
-{
-        dvb_net_release(&cinergyt2->dvbnet);
-        dvb_dmxdev_release(&cinergyt2->dmxdev);
-        dvb_dmx_release(&cinergyt2->demux);
-        dvb_unregister_device(cinergyt2->fedev);
-        dvb_unregister_adapter(&cinergyt2->adapter);
-
-        cinergyt2_free_stream_urbs(cinergyt2);
-        kfree(cinergyt2);
-}
-
-static int cinergyt2_release (struct inode *inode, struct file *file)
-{
-        struct dvb_device *dvbdev = file->private_data;
-        struct cinergyt2 *cinergyt2 = dvbdev->priv;
-
-        mutex_lock(&cinergyt2->wq_sem);
-
-        if (!cinergyt2->disconnect_pending && (file->f_flags & O_ACCMODE) != O_RDONLY) {
-                cancel_rearming_delayed_work(&cinergyt2->query_work);
-
-                mutex_lock(&cinergyt2->sem);
-                cinergyt2_sleep(cinergyt2, 1);
-                mutex_unlock(&cinergyt2->sem);
-        }
-
-        mutex_unlock(&cinergyt2->wq_sem);
-
-        if (atomic_dec_and_test(&cinergyt2->inuse) && cinergyt2->disconnect_pending) {
-                warn("delayed unregister in release");
-                cinergyt2_unregister(cinergyt2);
-        }
-
-        return dvb_generic_release(inode, file);
-}
-
-static unsigned int cinergyt2_poll (struct file *file, struct poll_table_struct *wait)
-{
-        struct dvb_device *dvbdev = file->private_data;
-        struct cinergyt2 *cinergyt2 = dvbdev->priv;
-        unsigned int mask = 0;
-
-        if (cinergyt2->disconnect_pending)
-                return -EAGAIN;
-        if (mutex_lock_interruptible(&cinergyt2->sem))
-                return -ERESTARTSYS;
-
-        poll_wait(file, &cinergyt2->poll_wq, wait);
-
-        if (cinergyt2->pending_fe_events != 0)
-                mask |= (POLLIN | POLLRDNORM | POLLPRI);
-
-        mutex_unlock(&cinergyt2->sem);
-
-        return mask;
-}
-
-
-static int cinergyt2_ioctl (struct inode *inode, struct file *file,
-                     unsigned cmd, unsigned long arg)
-{
-        struct dvb_device *dvbdev = file->private_data;
-        struct cinergyt2 *cinergyt2 = dvbdev->priv;
-        struct dvbt_get_status_msg *stat = &cinergyt2->status;
-        fe_status_t status = 0;
-
-        switch (cmd) {
-        case FE_GET_INFO:
-                return copy_to_user((void __user*) arg, &cinergyt2_fe_info,
-                                    sizeof(struct dvb_frontend_info));
-
-        case FE_READ_STATUS:
-                if (0xffff - le16_to_cpu(stat->gain) > 30)
-                        status |= FE_HAS_SIGNAL;
-                if (stat->lock_bits & (1 << 6))
-                        status |= FE_HAS_LOCK;
-                if (stat->lock_bits & (1 << 5))
-                        status |= FE_HAS_SYNC;
-                if (stat->lock_bits & (1 << 4))
-                        status |= FE_HAS_CARRIER;
-                if (stat->lock_bits & (1 << 1))
-                        status |= FE_HAS_VITERBI;
-
-                return copy_to_user((void  __user*) arg, &status, sizeof(status));
-
-        case FE_READ_BER:
-                return put_user(le32_to_cpu(stat->viterbi_error_rate),
-                                (__u32 __user *) arg);
-
-        case FE_READ_SIGNAL_STRENGTH:
-                return put_user(0xffff - le16_to_cpu(stat->gain),
-                                (__u16 __user *) arg);
-
-        case FE_READ_SNR:
-                return put_user((stat->snr << 8) | stat->snr,
-                                (__u16 __user *) arg);
-
-        case FE_READ_UNCORRECTED_BLOCKS:
-        {
-                uint32_t unc_count;
-
-                if (mutex_lock_interruptible(&cinergyt2->sem))
-                        return -ERESTARTSYS;
-                unc_count = cinergyt2->uncorrected_block_count;
-                cinergyt2->uncorrected_block_count = 0;
-                mutex_unlock(&cinergyt2->sem);
-
-                /* UNC are already converted to host byte order... */
-                return put_user(unc_count,(__u32 __user *) arg);
-        }
-        case FE_SET_FRONTEND:
-        {
-                struct dvbt_set_parameters_msg *param = &cinergyt2->param;
-                struct dvb_frontend_parameters p;
-                int err;
-
-                if ((file->f_flags & O_ACCMODE) == O_RDONLY)
-                        return -EPERM;
-
-                if (copy_from_user(&p, (void  __user*) arg, sizeof(p)))
-                        return -EFAULT;
-
-                if (cinergyt2->disconnect_pending)
-                        return -EAGAIN;
-                if (mutex_lock_interruptible(&cinergyt2->sem))
-                        return -ERESTARTSYS;
-
-                param->cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
-                param->tps = cpu_to_le16(compute_tps(&p));
-                param->freq = cpu_to_le32(p.frequency / 1000);
-                param->bandwidth = 8 - p.u.ofdm.bandwidth - BANDWIDTH_8_MHZ;
-
-                stat->lock_bits = 0;
-                cinergyt2->pending_fe_events++;
-                wake_up_interruptible(&cinergyt2->poll_wq);
-
-                err = cinergyt2_command(cinergyt2,
-                                        (char *) param, sizeof(*param),
-                                        NULL, 0);
-
-                mutex_unlock(&cinergyt2->sem);
-
-                return (err < 0) ? err : 0;
-        }
-
-        case FE_GET_FRONTEND:
-                /**
-                 *  trivial to implement (see struct dvbt_get_status_msg).
-                 *  equivalent to FE_READ ioctls, but needs
-                 *  TPS -> linux-dvb parameter set conversion. Feel free
-                 *  to implement this and send us a patch if you need this
-                 *  functionality.
-                 */
-                break;
-
-        case FE_GET_EVENT:
-        {
-                /**
-                 *  for now we only fill the status field. the parameters
-                 *  are trivial to fill as soon FE_GET_FRONTEND is done.
-                 */
-                struct dvb_frontend_event __user *e = (void __user *) arg;
-                if (cinergyt2->pending_fe_events == 0) {
-                        if (file->f_flags & O_NONBLOCK)
-                                return -EWOULDBLOCK;
-                        wait_event_interruptible(cinergyt2->poll_wq,
-                                                 cinergyt2->pending_fe_events > 0);
-                }
-                cinergyt2->pending_fe_events = 0;
-                return cinergyt2_ioctl(inode, file, FE_READ_STATUS,
-                                        (unsigned long) &e->status);
-        }
-
-        default:
-                ;
-        }
-
-        return -EINVAL;
-}
-
-static int cinergyt2_mmap(struct file *file, struct vm_area_struct *vma)
-{
-        struct dvb_device *dvbdev = file->private_data;
-        struct cinergyt2 *cinergyt2 = dvbdev->priv;
-        int ret = 0;
-
-        lock_kernel();
-
-        if (vma->vm_flags & (VM_WRITE | VM_EXEC)) {
-                ret = -EPERM;
-                goto bailout;
-        }
-
-        if (vma->vm_end > vma->vm_start + STREAM_URB_COUNT * STREAM_BUF_SIZE) {
-                ret = -EINVAL;
-                goto bailout;
-        }
-
-        vma->vm_flags |= (VM_IO | VM_DONTCOPY);
-        vma->vm_file = file;
-
-        ret = remap_pfn_range(vma, vma->vm_start,
-                              virt_to_phys(cinergyt2->streambuf) >> PAGE_SHIFT,
-                              vma->vm_end - vma->vm_start,
-                              vma->vm_page_prot) ? -EAGAIN : 0;
-bailout:
-        unlock_kernel();
-        return ret;
-}
-
-static struct file_operations cinergyt2_fops = {
-        .owner          = THIS_MODULE,
-        .ioctl          = cinergyt2_ioctl,
-        .poll           = cinergyt2_poll,
-        .open           = cinergyt2_open,
-        .release        = cinergyt2_release,
-        .mmap           = cinergyt2_mmap
-};
-
-static struct dvb_device cinergyt2_fe_template = {
-        .users = ~0,
-        .writers = 1,
-        .readers = (~0)-1,
-        .fops = &cinergyt2_fops
-};
-
-#ifdef ENABLE_RC
-
-static void cinergyt2_query_rc (struct work_struct *work)
-{
-        struct cinergyt2 *cinergyt2 =
-                container_of(work, struct cinergyt2, rc_query_work.work);
-        char buf[1] = { CINERGYT2_EP1_GET_RC_EVENTS };
-        struct cinergyt2_rc_event rc_events[12];
-        int n, len, i;
-
-        if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->sem))
-                return;
-
-        len = cinergyt2_command(cinergyt2, buf, sizeof(buf),
-                                (char *) rc_events, sizeof(rc_events));
-        if (len < 0)
-                goto out;
-        if (len == 0) {
-                if (time_after(jiffies, cinergyt2->last_event_jiffies +
-                               msecs_to_jiffies(150))) {
-                        /* stop key repeat */
-                        if (cinergyt2->rc_input_event != KEY_MAX) {
-                                dprintk(1, "rc_input_event=%d Up\n", cinergyt2->rc_input_event);
-                                input_report_key(cinergyt2->rc_input_dev,
-                                                 cinergyt2->rc_input_event, 0);
-                                input_sync(cinergyt2->rc_input_dev);
-                                cinergyt2->rc_input_event = KEY_MAX;
-                        }
-                        cinergyt2->rc_last_code = cpu_to_le32(~0);
-                }
-                goto out;
-        }
-        cinergyt2->last_event_jiffies = jiffies;
-
-        for (n = 0; n < (len / sizeof(rc_events[0])); n++) {
-                dprintk(1, "rc_events[%d].value = %x, type=%x\n",
-                        n, le32_to_cpu(rc_events[n].value), rc_events[n].type);
-
-                if (rc_events[n].type == CINERGYT2_RC_EVENT_TYPE_NEC &&
-                    rc_events[n].value == cpu_to_le32(~0)) {
-                        /* keyrepeat bit -> just repeat last rc_input_event */
-                } else {
-                        cinergyt2->rc_input_event = KEY_MAX;
-                        for (i = 0; i < ARRAY_SIZE(rc_keys); i += 3) {
-                                if (rc_keys[i + 0] == rc_events[n].type &&
-                                    rc_keys[i + 1] == le32_to_cpu(rc_events[n].value)) {
-                                        cinergyt2->rc_input_event = rc_keys[i + 2];
-                                        break;
-                                }
-                        }
-                }
-
-                if (cinergyt2->rc_input_event != KEY_MAX) {
-                        if (rc_events[n].value == cinergyt2->rc_last_code &&
-                            cinergyt2->rc_last_code != cpu_to_le32(~0)) {
-                                /* emit a key-up so the double event is recognized */
-                                dprintk(1, "rc_input_event=%d UP\n", cinergyt2->rc_input_event);
-                                input_report_key(cinergyt2->rc_input_dev,
-                                                 cinergyt2->rc_input_event, 0);
-                        }
-                        dprintk(1, "rc_input_event=%d\n", cinergyt2->rc_input_event);
-                        input_report_key(cinergyt2->rc_input_dev,
-                                         cinergyt2->rc_input_event, 1);
-                        input_sync(cinergyt2->rc_input_dev);
-                        cinergyt2->rc_last_code = rc_events[n].value;
-                }
-        }
-
-out:
-        schedule_delayed_work(&cinergyt2->rc_query_work,
-                              msecs_to_jiffies(RC_QUERY_INTERVAL));
-
-        mutex_unlock(&cinergyt2->sem);
-}
-
-static int cinergyt2_register_rc(struct cinergyt2 *cinergyt2)
-{
-        struct input_dev *input_dev;
-        int i;
-        int err;
-
-        input_dev = input_allocate_device();
-        if (!input_dev)
-                return -ENOMEM;
-
-        usb_make_path(cinergyt2->udev, cinergyt2->phys, sizeof(cinergyt2->phys));
-        strlcat(cinergyt2->phys, "/input0", sizeof(cinergyt2->phys));
-        cinergyt2->rc_input_event = KEY_MAX;
-        cinergyt2->rc_last_code = cpu_to_le32(~0);
-        INIT_DELAYED_WORK(&cinergyt2->rc_query_work, cinergyt2_query_rc);
-
-        input_dev->name = DRIVER_NAME " remote control";
-        input_dev->phys = cinergyt2->phys;
-        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
-        for (i = 0; i < ARRAY_SIZE(rc_keys); i += 3)
-                set_bit(rc_keys[i + 2], input_dev->keybit);
-        input_dev->keycodesize = 0;
-        input_dev->keycodemax = 0;
-        input_dev->id.bustype = BUS_USB;
-        input_dev->id.vendor = le16_to_cpu(cinergyt2->udev->descriptor.idVendor);
-        input_dev->id.product = le16_to_cpu(cinergyt2->udev->descriptor.idProduct);
-        input_dev->id.version = 1;
-        input_dev->dev.parent = &cinergyt2->udev->dev;
-
-        err = input_register_device(input_dev);
-        if (err) {
-                input_free_device(input_dev);
-                return err;
-        }
-
-        cinergyt2->rc_input_dev = input_dev;
-        schedule_delayed_work(&cinergyt2->rc_query_work, HZ/2);
-
-        return 0;
-}
-
-static void cinergyt2_unregister_rc(struct cinergyt2 *cinergyt2)
-{
-        cancel_rearming_delayed_work(&cinergyt2->rc_query_work);
-        input_unregister_device(cinergyt2->rc_input_dev);
-}
-
-static inline void cinergyt2_suspend_rc(struct cinergyt2 *cinergyt2)
-{
-        cancel_rearming_delayed_work(&cinergyt2->rc_query_work);
-}
-
-static inline void cinergyt2_resume_rc(struct cinergyt2 *cinergyt2)
-{
-        schedule_delayed_work(&cinergyt2->rc_query_work, HZ/2);
-}
-
-#else
-
-static inline int cinergyt2_register_rc(struct cinergyt2 *cinergyt2) { return 0; }
-static inline void cinergyt2_unregister_rc(struct cinergyt2 *cinergyt2) { }
-static inline void cinergyt2_suspend_rc(struct cinergyt2 *cinergyt2) { }
-static inline void cinergyt2_resume_rc(struct cinergyt2 *cinergyt2) { }
-
-#endif /* ENABLE_RC */
-
-static void cinergyt2_query (struct work_struct *work)
-{
-        struct cinergyt2 *cinergyt2 =
-                container_of(work, struct cinergyt2, query_work.work);
-        char cmd [] = { CINERGYT2_EP1_GET_TUNER_STATUS };
-        struct dvbt_get_status_msg *s = &cinergyt2->status;
-        uint8_t lock_bits;
-
-        if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->sem))
-                return;
-
-        lock_bits = s->lock_bits;
-
-        cinergyt2_command(cinergyt2, cmd, sizeof(cmd), (char *) s, sizeof(*s));
-
-        cinergyt2->uncorrected_block_count +=
-                le32_to_cpu(s->uncorrected_block_count);
-
-        if (lock_bits != s->lock_bits) {
-                wake_up_interruptible(&cinergyt2->poll_wq);
-                cinergyt2->pending_fe_events++;
-        }
-
-        schedule_delayed_work(&cinergyt2->query_work,
-                              msecs_to_jiffies(QUERY_INTERVAL));
-
-        mutex_unlock(&cinergyt2->sem);
-}
-
-static int cinergyt2_probe (struct usb_interface *intf,
-                  const struct usb_device_id *id)
-{
-        struct cinergyt2 *cinergyt2;
-        int err;
-
-        if (!(cinergyt2 = kzalloc (sizeof(struct cinergyt2), GFP_KERNEL))) {
-                dprintk(1, "out of memory?!?\n");
-                return -ENOMEM;
-        }
-
-        usb_set_intfdata (intf, (void *) cinergyt2);
-
-        mutex_init(&cinergyt2->sem);
-        mutex_init(&cinergyt2->wq_sem);
-        init_waitqueue_head (&cinergyt2->poll_wq);
-        INIT_DELAYED_WORK(&cinergyt2->query_work, cinergyt2_query);
-
-        cinergyt2->udev = interface_to_usbdev(intf);
-        cinergyt2->param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
-
-        if (cinergyt2_alloc_stream_urbs (cinergyt2) < 0) {
-                dprintk(1, "unable to allocate stream urbs\n");
-                kfree(cinergyt2);
-                return -ENOMEM;
-        }
-
-        err = dvb_register_adapter(&cinergyt2->adapter, DRIVER_NAME,
-                                   THIS_MODULE, &cinergyt2->udev->dev,
-                                   adapter_nr);
-        if (err < 0) {
-                kfree(cinergyt2);
-                return err;
-        }
-
-        cinergyt2->demux.priv = cinergyt2;
-        cinergyt2->demux.filternum = 256;
-        cinergyt2->demux.feednum = 256;
-        cinergyt2->demux.start_feed = cinergyt2_start_feed;
-        cinergyt2->demux.stop_feed = cinergyt2_stop_feed;
-        cinergyt2->demux.dmx.capabilities = DMX_TS_FILTERING |
-                                            DMX_SECTION_FILTERING |
-                                            DMX_MEMORY_BASED_FILTERING;
-
-        if ((err = dvb_dmx_init(&cinergyt2->demux)) < 0) {
-                dprintk(1, "dvb_dmx_init() failed (err = %d)\n", err);
-                goto bailout;
-        }
-
-        cinergyt2->dmxdev.filternum = cinergyt2->demux.filternum;
-        cinergyt2->dmxdev.demux = &cinergyt2->demux.dmx;
-        cinergyt2->dmxdev.capabilities = 0;
-
-        if ((err = dvb_dmxdev_init(&cinergyt2->dmxdev, &cinergyt2->adapter)) < 0) {
-                dprintk(1, "dvb_dmxdev_init() failed (err = %d)\n", err);
-                goto bailout;
-        }
-
-        if (dvb_net_init(&cinergyt2->adapter, &cinergyt2->dvbnet, &cinergyt2->demux.dmx))
-                dprintk(1, "dvb_net_init() failed!\n");
-
-        dvb_register_device(&cinergyt2->adapter, &cinergyt2->fedev,
-                            &cinergyt2_fe_template, cinergyt2,
-                            DVB_DEVICE_FRONTEND);
-
-        err = cinergyt2_register_rc(cinergyt2);
-        if (err)
-                goto bailout;
-
-        return 0;
-
-bailout:
-        dvb_net_release(&cinergyt2->dvbnet);
-        dvb_dmxdev_release(&cinergyt2->dmxdev);
-        dvb_dmx_release(&cinergyt2->demux);
-        dvb_unregister_adapter(&cinergyt2->adapter);
-        cinergyt2_free_stream_urbs(cinergyt2);
-        kfree(cinergyt2);
-        return -ENOMEM;
-}
-
-static void cinergyt2_disconnect (struct usb_interface *intf)
-{
-        struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);
-
-        cinergyt2_unregister_rc(cinergyt2);
-        cancel_rearming_delayed_work(&cinergyt2->query_work);
-        wake_up_interruptible(&cinergyt2->poll_wq);
-
-        cinergyt2->demux.dmx.close(&cinergyt2->demux.dmx);
-        cinergyt2->disconnect_pending = 1;
-
-        if (!atomic_read(&cinergyt2->inuse))
-                cinergyt2_unregister(cinergyt2);
-}
-
-static int cinergyt2_suspend (struct usb_interface *intf, pm_message_t state)
-{
-        struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);
-
-        if (cinergyt2->disconnect_pending)
-                return -EAGAIN;
-        if (mutex_lock_interruptible(&cinergyt2->wq_sem))
-                return -ERESTARTSYS;
-
-        cinergyt2_suspend_rc(cinergyt2);
-        cancel_rearming_delayed_work(&cinergyt2->query_work);
-
-        mutex_lock(&cinergyt2->sem);
-        if (cinergyt2->streaming)
-                cinergyt2_stop_stream_xfer(cinergyt2);
-        cinergyt2_sleep(cinergyt2, 1);
-        mutex_unlock(&cinergyt2->sem);
-
-        mutex_unlock(&cinergyt2->wq_sem);
-
-        return 0;
-}
-
-static int cinergyt2_resume (struct usb_interface *intf)
-{
-        struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);
-        struct dvbt_set_parameters_msg *param = &cinergyt2->param;
-        int err = -EAGAIN;
-
-        if (cinergyt2->disconnect_pending)
-                goto out;
-        err = mutex_lock_interruptible(&cinergyt2->wq_sem);
-        if (err)
-                goto out;
-
-        err = mutex_lock_interruptible(&cinergyt2->sem);
-        if (err)
-                goto out_unlock1;
-
-        if (!cinergyt2->sleeping) {
-                cinergyt2_sleep(cinergyt2, 0);
-                cinergyt2_command(cinergyt2, (char *) param, sizeof(*param), NULL, 0);
-                if (cinergyt2->streaming)
-                        cinergyt2_start_stream_xfer(cinergyt2);
-                schedule_delayed_work(&cinergyt2->query_work, HZ/2);
-        }
-
-        cinergyt2_resume_rc(cinergyt2);
-
-        mutex_unlock(&cinergyt2->sem);
-out_unlock1:
-        mutex_unlock(&cinergyt2->wq_sem);
-out:
-        return err;
-}
-
-static const struct usb_device_id cinergyt2_table [] __devinitdata = {
-        { USB_DEVICE(0x0ccd, 0x0038) },
-        { 0 }
-};
-
-MODULE_DEVICE_TABLE(usb, cinergyt2_table);
-
-static struct usb_driver cinergyt2_driver = {
-        .name   = "cinergyT2",
-        .probe  = cinergyt2_probe,
-        .disconnect     = cinergyt2_disconnect,
-        .suspend        = cinergyt2_suspend,
-        .resume         = cinergyt2_resume,
-        .id_table       = cinergyt2_table
-};
-
-static int __init cinergyt2_init (void)
-{
-        int err;
-
-        if ((err = usb_register(&cinergyt2_driver)) < 0)
-                dprintk(1, "usb_register() failed! (err %i)\n", err);
-
-        return err;
-}
-
-static void __exit cinergyt2_exit (void)
-{
-        usb_deregister(&cinergyt2_driver);
-}
-
-module_init (cinergyt2_init);
-module_exit (cinergyt2_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Holger Waechtler, Daniel Mack");
diff --git a/drivers/media/dvb/dm1105/Kconfig b/drivers/media/dvb/dm1105/Kconfig
new file mode 100644
index 000000000000..1332301ef3ae
--- /dev/null
+++ b/drivers/media/dvb/dm1105/Kconfig
@@ -0,0 +1,18 @@
+config DVB_DM1105
+        tristate "SDMC DM1105 based PCI cards"
+        depends on DVB_CORE && PCI && I2C
+        select DVB_PLL if !DVB_FE_CUSTOMISE
+        select DVB_STV0299 if !DVB_FE_CUSTOMISE
+        select DVB_STV0288 if !DVB_FE_CUSTOMISE
+        select DVB_STB6000 if !DVB_FE_CUSTOMISE
+        select DVB_CX24116 if !DVB_FE_CUSTOMISE
+        select DVB_SI21XX if !DVB_FE_CUSTOMISE
+        help
+          Support for cards based on the SDMC DM1105 PCI chip like
+          DvbWorld 2002
+
+          Since these cards have no MPEG decoder onboard, they transmit
+          only compressed MPEG data over the PCI bus, so you need
+          an external software decoder to watch TV on your computer.
+
+          Say Y or M if you own such a device and want to use it.
diff --git a/drivers/media/dvb/dm1105/Makefile b/drivers/media/dvb/dm1105/Makefile
new file mode 100644
index 000000000000..8ac28b0546af
--- /dev/null
+++ b/drivers/media/dvb/dm1105/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_DVB_DM1105) += dm1105.o
+
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c
new file mode 100644
index 000000000000..f7321448b4b1
--- /dev/null
+++ b/drivers/media/dvb/dm1105/dm1105.c
@@ -0,0 +1,911 @@
+/*
+ * dm1105.c - driver for DVB cards based on SDMC DM1105 PCI chip
+ *
+ * Copyright (C) 2008 Igor M. Liplianin <liplianin@me.by>
+ *
+ * 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/version.h>
+#include <linux/i2c.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/proc_fs.h>
+#include <linux/pci.h>
+#include <linux/dma-mapping.h>
+#include <linux/input.h>
+#include <media/ir-common.h>
+
+#include "demux.h"
+#include "dmxdev.h"
+#include "dvb_demux.h"
+#include "dvb_frontend.h"
+#include "dvb_net.h"
+#include "dvbdev.h"
+#include "dvb-pll.h"
+
+#include "stv0299.h"
+#include "stv0288.h"
+#include "stb6000.h"
+#include "si21xx.h"
+#include "cx24116.h"
+#include "z0194a.h"
+
+/* ----------------------------------------------- */
+/*
+ * PCI ID's
+ */
+#ifndef PCI_VENDOR_ID_TRIGEM
+#define PCI_VENDOR_ID_TRIGEM    0x109f
+#endif
+#ifndef PCI_DEVICE_ID_DM1105
+#define PCI_DEVICE_ID_DM1105    0x036f
+#endif
+#ifndef PCI_DEVICE_ID_DW2002
+#define PCI_DEVICE_ID_DW2002    0x2002
+#endif
+#ifndef PCI_DEVICE_ID_DW2004
+#define PCI_DEVICE_ID_DW2004    0x2004
+#endif
+/* ----------------------------------------------- */
+/* sdmc dm1105 registers */
+
+/* TS Control */
+#define DM1105_TSCTR                            0x00
+#define DM1105_DTALENTH                         0x04
+
+/* GPIO Interface */
+#define DM1105_GPIOVAL                          0x08
+#define DM1105_GPIOCTR                          0x0c
+
+/* PID serial number */
+#define DM1105_PIDN                             0x10
+
+/* Odd-even secret key select */
+#define DM1105_CWSEL                            0x14
+
+/* Host Command Interface */
+#define DM1105_HOST_CTR                         0x18
+#define DM1105_HOST_AD                          0x1c
+
+/* PCI Interface */
+#define DM1105_CR                               0x30
+#define DM1105_RST                              0x34
+#define DM1105_STADR                            0x38
+#define DM1105_RLEN                             0x3c
+#define DM1105_WRP                              0x40
+#define DM1105_INTCNT                           0x44
+#define DM1105_INTMAK                           0x48
+#define DM1105_INTSTS                           0x4c
+
+/* CW Value */
+#define DM1105_ODD                              0x50
+#define DM1105_EVEN                             0x58
+
+/* PID Value */
+#define DM1105_PID                              0x60
+
+/* IR Control */
+#define DM1105_IRCTR                            0x64
+#define DM1105_IRMODE                           0x68
+#define DM1105_SYSTEMCODE                       0x6c
+#define DM1105_IRCODE                           0x70
+
+/* Unknown Values */
+#define DM1105_ENCRYPT                          0x74
+#define DM1105_VER                              0x7c
+
+/* I2C Interface */
+#define DM1105_I2CCTR                           0x80
+#define DM1105_I2CSTS                           0x81
+#define DM1105_I2CDAT                           0x82
+#define DM1105_I2C_RA                           0x83
+/* ----------------------------------------------- */
+/* Interrupt Mask Bits */
+
+#define INTMAK_TSIRQM                           0x01
+#define INTMAK_HIRQM                            0x04
+#define INTMAK_IRM                              0x08
+#define INTMAK_ALLMASK                          (INTMAK_TSIRQM | \
+                                                INTMAK_HIRQM | \
+                                                INTMAK_IRM)
+#define INTMAK_NONEMASK                         0x00
+
+/* Interrupt Status Bits */
+#define INTSTS_TSIRQ                            0x01
+#define INTSTS_HIRQ                             0x04
+#define INTSTS_IR                               0x08
+
+/* IR Control Bits */
+#define DM1105_IR_EN                            0x01
+#define DM1105_SYS_CHK                          0x02
+#define DM1105_REP_FLG                          0x08
+
+/* EEPROM addr */
+#define IIC_24C01_addr                          0xa0
+/* Max board count */
+#define DM1105_MAX                              0x04
+
+#define DRIVER_NAME                             "dm1105"
+
+#define DM1105_DMA_PACKETS                      47
+#define DM1105_DMA_PACKET_LENGTH                (128*4)
+#define DM1105_DMA_BYTES                        (128 * 4 * DM1105_DMA_PACKETS)
+
+/* GPIO's for LNB power control */
+#define DM1105_LNB_MASK                         0x00000000
+#define DM1105_LNB_13V                          0x00010100
+#define DM1105_LNB_18V                          0x00000100
+
+static int ir_debug;
+module_param(ir_debug, int, 0644);
+MODULE_PARM_DESC(ir_debug, "enable debugging information for IR decoding");
+
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
+static u16 ir_codes_dm1105_nec[128] = {
+        [0x0a] = KEY_Q,         /*power*/
+        [0x0c] = KEY_M,         /*mute*/
+        [0x11] = KEY_1,
+        [0x12] = KEY_2,
+        [0x13] = KEY_3,
+        [0x14] = KEY_4,
+        [0x15] = KEY_5,
+        [0x16] = KEY_6,
+        [0x17] = KEY_7,
+        [0x18] = KEY_8,
+        [0x19] = KEY_9,
+        [0x10] = KEY_0,
+        [0x1c] = KEY_PAGEUP,    /*ch+*/
+        [0x0f] = KEY_PAGEDOWN,  /*ch-*/
+        [0x1a] = KEY_O,         /*vol+*/
+        [0x0e] = KEY_Z,         /*vol-*/
+        [0x04] = KEY_R,         /*rec*/
+        [0x09] = KEY_D,         /*fav*/
+        [0x08] = KEY_BACKSPACE, /*rewind*/
+        [0x07] = KEY_A,         /*fast*/
+        [0x0b] = KEY_P,         /*pause*/
+        [0x02] = KEY_ESC,       /*cancel*/
+        [0x03] = KEY_G,         /*tab*/
+        [0x00] = KEY_UP,        /*up*/
+        [0x1f] = KEY_ENTER,     /*ok*/
+        [0x01] = KEY_DOWN,      /*down*/
+        [0x05] = KEY_C,         /*cap*/
+        [0x06] = KEY_S,         /*stop*/
+        [0x40] = KEY_F,         /*full*/
+        [0x1e] = KEY_W,         /*tvmode*/
+        [0x1b] = KEY_B,         /*recall*/
+};
+
+/* infrared remote control */
+struct infrared {
+        u16     key_map[128];
+        struct input_dev        *input_dev;
+        char                    input_phys[32];
+        struct tasklet_struct   ir_tasklet;
+        u32                     ir_command;
+};
+
+struct dm1105dvb {
+        /* pci */
+        struct pci_dev *pdev;
+        u8 __iomem *io_mem;
+
+        /* ir */
+        struct infrared ir;
+
+        /* dvb */
+        struct dmx_frontend hw_frontend;
+        struct dmx_frontend mem_frontend;
+        struct dmxdev dmxdev;
+        struct dvb_adapter dvb_adapter;
+        struct dvb_demux demux;
+        struct dvb_frontend *fe;
+        struct dvb_net dvbnet;
+        unsigned int full_ts_users;
+
+        /* i2c */
+        struct i2c_adapter i2c_adap;
+
+        /* dma */
+        dma_addr_t dma_addr;
+        unsigned char *ts_buf;
+        u32 wrp;
+        u32 buffer_size;
+        unsigned int    PacketErrorCount;
+        unsigned int dmarst;
+        spinlock_t lock;
+
+};
+
+#define dm_io_mem(reg)  ((unsigned long)(&dm1105dvb->io_mem[reg]))
+
+static struct dm1105dvb *dm1105dvb_local;
+
+static int dm1105_i2c_xfer(struct i2c_adapter *i2c_adap,
+                            struct i2c_msg *msgs, int num)
+{
+        struct dm1105dvb *dm1105dvb ;
+
+        int addr, rc, i, j, k, len, byte, data;
+        u8 status;
+
+        dm1105dvb = i2c_adap->algo_data;
+        for (i = 0; i < num; i++) {
+                outb(0x00, dm_io_mem(DM1105_I2CCTR));
+                if (msgs[i].flags & I2C_M_RD) {
+                        /* read bytes */
+                        addr  = msgs[i].addr << 1;
+                        addr |= 1;
+                        outb(addr, dm_io_mem(DM1105_I2CDAT));
+                        for (byte = 0; byte < msgs[i].len; byte++)
+                                outb(0, dm_io_mem(DM1105_I2CDAT + byte + 1));
+
+                        outb(0x81 + msgs[i].len, dm_io_mem(DM1105_I2CCTR));
+                        for (j = 0; j < 55; j++) {
+                                mdelay(10);
+                                status = inb(dm_io_mem(DM1105_I2CSTS));
+                                if ((status & 0xc0) == 0x40)
+                                        break;
+                        }
+                        if (j >= 55)
+                                return -1;
+
+                        for (byte = 0; byte < msgs[i].len; byte++) {
+                                rc = inb(dm_io_mem(DM1105_I2CDAT + byte + 1));
+                                if (rc < 0)
+                                        goto err;
+                                msgs[i].buf[byte] = rc;
+                        }
+                } else {
+                        if ((msgs[i].buf[0] == 0xf7) && (msgs[i].addr == 0x55)) {
+                                /* prepaired for cx24116 firmware */
+                                /* Write in small blocks */
+                                len = msgs[i].len - 1;
+                                k = 1;
+                                do {
+                                        outb(msgs[i].addr << 1, dm_io_mem(DM1105_I2CDAT));
+                                        outb(0xf7, dm_io_mem(DM1105_I2CDAT + 1));
+                                        for (byte = 0; byte < (len > 48 ? 48 : len); byte++) {
+                                                data = msgs[i].buf[k+byte];
+                                                outb(data, dm_io_mem(DM1105_I2CDAT + byte + 2));
+                                        }
+                                        outb(0x82 + (len > 48 ? 48 : len), dm_io_mem(DM1105_I2CCTR));
+                                        for (j = 0; j < 25; j++) {
+                                                mdelay(10);
+                                                status = inb(dm_io_mem(DM1105_I2CSTS));
+                                                if ((status & 0xc0) == 0x40)
+                                                        break;
+                                        }
+
+                                        if (j >= 25)
+                                                return -1;
+
+                                        k += 48;
+                                        len -= 48;
+                                } while (len > 0);
+                        } else {
+                                /* write bytes */
+                                outb(msgs[i].addr<<1, dm_io_mem(DM1105_I2CDAT));
+                                for (byte = 0; byte < msgs[i].len; byte++) {
+                                        data = msgs[i].buf[byte];
+                                        outb(data, dm_io_mem(DM1105_I2CDAT + byte + 1));
+                                }
+                                outb(0x81 + msgs[i].len, dm_io_mem(DM1105_I2CCTR));
+                                for (j = 0; j < 25; j++) {
+                                        mdelay(10);
+                                        status = inb(dm_io_mem(DM1105_I2CSTS));
+                                        if ((status & 0xc0) == 0x40)
+                                                break;
+                                }
+
+                                if (j >= 25)
+                                        return -1;
+                        }
+                }
+        }
+        return num;
+ err:
+        return rc;
+}
+
+static u32 functionality(struct i2c_adapter *adap)
+{
+        return I2C_FUNC_I2C;
+}
+
+static struct i2c_algorithm dm1105_algo = {
+        .master_xfer   = dm1105_i2c_xfer,
+        .functionality = functionality,
+};
+
+static inline struct dm1105dvb *feed_to_dm1105dvb(struct dvb_demux_feed *feed)
+{
+        return container_of(feed->demux, struct dm1105dvb, demux);
+}
+
+static inline struct dm1105dvb *frontend_to_dm1105dvb(struct dvb_frontend *fe)
+{
+        return container_of(fe->dvb, struct dm1105dvb, dvb_adapter);
+}
+
+static int dm1105dvb_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
+{
+        struct dm1105dvb *dm1105dvb = frontend_to_dm1105dvb(fe);
+
+                if (voltage == SEC_VOLTAGE_18) {
+                        outl(DM1105_LNB_MASK, dm_io_mem(DM1105_GPIOCTR));
+                        outl(DM1105_LNB_18V, dm_io_mem(DM1105_GPIOVAL));
+                } else  {
+                /*LNB ON-13V by default!*/
+                        outl(DM1105_LNB_MASK, dm_io_mem(DM1105_GPIOCTR));
+                        outl(DM1105_LNB_13V, dm_io_mem(DM1105_GPIOVAL));
+                }
+
+        return 0;
+}
+
+static void dm1105dvb_set_dma_addr(struct dm1105dvb *dm1105dvb)
+{
+        outl(cpu_to_le32(dm1105dvb->dma_addr), dm_io_mem(DM1105_STADR));
+}
+
+static int __devinit dm1105dvb_dma_map(struct dm1105dvb *dm1105dvb)
+{
+        dm1105dvb->ts_buf = pci_alloc_consistent(dm1105dvb->pdev, 6*DM1105_DMA_BYTES, &dm1105dvb->dma_addr);
+
+        return pci_dma_mapping_error(dm1105dvb->pdev, dm1105dvb->dma_addr);
+}
+
+static void dm1105dvb_dma_unmap(struct dm1105dvb *dm1105dvb)
+{
+        pci_free_consistent(dm1105dvb->pdev, 6*DM1105_DMA_BYTES, dm1105dvb->ts_buf, dm1105dvb->dma_addr);
+}
+
+static void __devinit dm1105dvb_enable_irqs(struct dm1105dvb *dm1105dvb)
+{
+        outb(INTMAK_ALLMASK, dm_io_mem(DM1105_INTMAK));
+        outb(1, dm_io_mem(DM1105_CR));
+}
+
+static void dm1105dvb_disable_irqs(struct dm1105dvb *dm1105dvb)
+{
+        outb(INTMAK_IRM, dm_io_mem(DM1105_INTMAK));
+        outb(0, dm_io_mem(DM1105_CR));
+}
+
+static int dm1105dvb_start_feed(struct dvb_demux_feed *f)
+{
+        struct dm1105dvb *dm1105dvb = feed_to_dm1105dvb(f);
+
+        if (dm1105dvb->full_ts_users++ == 0)
+                dm1105dvb_enable_irqs(dm1105dvb);
+
+        return 0;
+}
+
+static int dm1105dvb_stop_feed(struct dvb_demux_feed *f)
+{
+        struct dm1105dvb *dm1105dvb = feed_to_dm1105dvb(f);
+
+        if (--dm1105dvb->full_ts_users == 0)
+                dm1105dvb_disable_irqs(dm1105dvb);
+
+        return 0;
+}
+
+/* ir tasklet */
+static void dm1105_emit_key(unsigned long parm)
+{
+        struct infrared *ir = (struct infrared *) parm;
+        u32 ircom = ir->ir_command;
+        u8 data;
+        u16 keycode;
+
+        data = (ircom >> 8) & 0x7f;
+
+        input_event(ir->input_dev, EV_MSC, MSC_RAW, (0x0000f8 << 16) | data);
+        input_event(ir->input_dev, EV_MSC, MSC_SCAN, data);
+        keycode = ir->key_map[data];
+
+        if (!keycode)
+                return;
+
+        input_event(ir->input_dev, EV_KEY, keycode, 1);
+        input_sync(ir->input_dev);
+        input_event(ir->input_dev, EV_KEY, keycode, 0);
+        input_sync(ir->input_dev);
+
+}
+
+static irqreturn_t dm1105dvb_irq(int irq, void *dev_id)
+{
+        struct dm1105dvb *dm1105dvb = dev_id;
+        unsigned int piece;
+        unsigned int nbpackets;
+        u32 command;
+        u32 nextwrp;
+        u32 oldwrp;
+
+        /* Read-Write INSTS Ack's Interrupt for DM1105 chip 16.03.2008 */
+        unsigned int intsts = inb(dm_io_mem(DM1105_INTSTS));
+        outb(intsts, dm_io_mem(DM1105_INTSTS));
+
+        switch (intsts) {
+        case INTSTS_TSIRQ:
+        case (INTSTS_TSIRQ | INTSTS_IR):
+                nextwrp = inl(dm_io_mem(DM1105_WRP)) -
+                        inl(dm_io_mem(DM1105_STADR)) ;
+                oldwrp = dm1105dvb->wrp;
+                spin_lock(&dm1105dvb->lock);
+                if (!((dm1105dvb->ts_buf[oldwrp] == 0x47) &&
+                                (dm1105dvb->ts_buf[oldwrp + 188] == 0x47) &&
+                                (dm1105dvb->ts_buf[oldwrp + 188 * 2] == 0x47))) {
+                        dm1105dvb->PacketErrorCount++;
+                        /* bad packet found */
+                        if ((dm1105dvb->PacketErrorCount >= 2) &&
+                                        (dm1105dvb->dmarst == 0)) {
+                                outb(1, dm_io_mem(DM1105_RST));
+                                dm1105dvb->wrp = 0;
+                                dm1105dvb->PacketErrorCount = 0;
+                                dm1105dvb->dmarst = 0;
+                                spin_unlock(&dm1105dvb->lock);
+                                return IRQ_HANDLED;
+                        }
+                }
+                if (nextwrp < oldwrp) {
+                        piece = dm1105dvb->buffer_size - oldwrp;
+                        memcpy(dm1105dvb->ts_buf + dm1105dvb->buffer_size, dm1105dvb->ts_buf, nextwrp);
+                        nbpackets = (piece + nextwrp)/188;
+                } else  {
+                        nbpackets = (nextwrp - oldwrp)/188;
+                }
+                dvb_dmx_swfilter_packets(&dm1105dvb->demux, &dm1105dvb->ts_buf[oldwrp], nbpackets);
+                dm1105dvb->wrp = nextwrp;
+                spin_unlock(&dm1105dvb->lock);
+                break;
+        case INTSTS_IR:
+                command = inl(dm_io_mem(DM1105_IRCODE));
+                if (ir_debug)
+                        printk("dm1105: received byte 0x%04x\n", command);
+
+                dm1105dvb->ir.ir_command = command;
+                tasklet_schedule(&dm1105dvb->ir.ir_tasklet);
+                break;
+        }
+        return IRQ_HANDLED;
+
+
+}
+
+/* register with input layer */
+static void input_register_keys(struct infrared *ir)
+{
+        int i;
+
+        memset(ir->input_dev->keybit, 0, sizeof(ir->input_dev->keybit));
+
+        for (i = 0; i < ARRAY_SIZE(ir->key_map); i++)
+                        set_bit(ir->key_map[i], ir->input_dev->keybit);
+
+        ir->input_dev->keycode = ir->key_map;
+        ir->input_dev->keycodesize = sizeof(ir->key_map[0]);
+        ir->input_dev->keycodemax = ARRAY_SIZE(ir->key_map);
+}
+
+int __devinit dm1105_ir_init(struct dm1105dvb *dm1105)
+{
+        struct input_dev *input_dev;
+        int err;
+
+        dm1105dvb_local = dm1105;
+
+        input_dev = input_allocate_device();
+        if (!input_dev)
+                return -ENOMEM;
+
+        dm1105->ir.input_dev = input_dev;
+        snprintf(dm1105->ir.input_phys, sizeof(dm1105->ir.input_phys),
+                "pci-%s/ir0", pci_name(dm1105->pdev));
+
+        input_dev->evbit[0] = BIT(EV_KEY);
+        input_dev->name = "DVB on-card IR receiver";
+
+        input_dev->phys = dm1105->ir.input_phys;
+        input_dev->id.bustype = BUS_PCI;
+        input_dev->id.version = 2;
+        if (dm1105->pdev->subsystem_vendor) {
+                input_dev->id.vendor = dm1105->pdev->subsystem_vendor;
+                input_dev->id.product = dm1105->pdev->subsystem_device;
+        } else {
+                input_dev->id.vendor = dm1105->pdev->vendor;
+                input_dev->id.product = dm1105->pdev->device;
+        }
+        input_dev->dev.parent = &dm1105->pdev->dev;
+        /* initial keymap */
+        memcpy(dm1105->ir.key_map, ir_codes_dm1105_nec, sizeof dm1105->ir.key_map);
+        input_register_keys(&dm1105->ir);
+        err = input_register_device(input_dev);
+        if (err) {
+                input_free_device(input_dev);
+                return err;
+        }
+
+        tasklet_init(&dm1105->ir.ir_tasklet, dm1105_emit_key, (unsigned long) &dm1105->ir);
+
+        return 0;
+}
+
+
+void __devexit dm1105_ir_exit(struct dm1105dvb *dm1105)
+{
+        tasklet_kill(&dm1105->ir.ir_tasklet);
+        input_unregister_device(dm1105->ir.input_dev);
+
+}
+
+static int __devinit dm1105dvb_hw_init(struct dm1105dvb *dm1105dvb)
+{
+        dm1105dvb_disable_irqs(dm1105dvb);
+
+        outb(0, dm_io_mem(DM1105_HOST_CTR));
+
+        /*DATALEN 188,*/
+        outb(188, dm_io_mem(DM1105_DTALENTH));
+        /*TS_STRT TS_VALP MSBFIRST TS_MODE ALPAS TSPES*/
+        outw(0xc10a, dm_io_mem(DM1105_TSCTR));
+
+        /* map DMA and set address */
+        dm1105dvb_dma_map(dm1105dvb);
+        dm1105dvb_set_dma_addr(dm1105dvb);
+        /* big buffer */
+        outl(5*DM1105_DMA_BYTES, dm_io_mem(DM1105_RLEN));
+        outb(47, dm_io_mem(DM1105_INTCNT));
+
+        /* IR NEC mode enable */
+        outb((DM1105_IR_EN | DM1105_SYS_CHK), dm_io_mem(DM1105_IRCTR));
+        outb(0, dm_io_mem(DM1105_IRMODE));
+        outw(0, dm_io_mem(DM1105_SYSTEMCODE));
+
+        return 0;
+}
+
+static void dm1105dvb_hw_exit(struct dm1105dvb *dm1105dvb)
+{
+        dm1105dvb_disable_irqs(dm1105dvb);
+
+        /* IR disable */
+        outb(0, dm_io_mem(DM1105_IRCTR));
+        outb(INTMAK_NONEMASK, dm_io_mem(DM1105_INTMAK));
+
+        dm1105dvb_dma_unmap(dm1105dvb);
+}
+
+static struct stv0288_config earda_config = {
+        .demod_address = 0x68,
+        .min_delay_ms = 100,
+};
+
+static struct si21xx_config serit_config = {
+        .demod_address = 0x68,
+        .min_delay_ms = 100,
+
+};
+
+static struct cx24116_config serit_sp2633_config = {
+        .demod_address = 0x55,
+};
+
+static int __devinit frontend_init(struct dm1105dvb *dm1105dvb)
+{
+        int ret;
+
+        switch (dm1105dvb->pdev->subsystem_device) {
+        case PCI_DEVICE_ID_DW2002:
+                dm1105dvb->fe = dvb_attach(
+                        stv0299_attach, &sharp_z0194a_config,
+                        &dm1105dvb->i2c_adap);
+
+                if (dm1105dvb->fe) {
+                        dm1105dvb->fe->ops.set_voltage =
+                                                        dm1105dvb_set_voltage;
+                        dvb_attach(dvb_pll_attach, dm1105dvb->fe, 0x60,
+                                        &dm1105dvb->i2c_adap, DVB_PLL_OPERA1);
+                }
+
+                if (!dm1105dvb->fe) {
+                        dm1105dvb->fe = dvb_attach(
+                                stv0288_attach, &earda_config,
+                                &dm1105dvb->i2c_adap);
+                        if (dm1105dvb->fe) {
+                                dm1105dvb->fe->ops.set_voltage =
+                                                        dm1105dvb_set_voltage;
+                                dvb_attach(stb6000_attach, dm1105dvb->fe, 0x61,
+                                                &dm1105dvb->i2c_adap);
+                        }
+                }
+
+                if (!dm1105dvb->fe) {
+                        dm1105dvb->fe = dvb_attach(
+                                si21xx_attach, &serit_config,
+                                &dm1105dvb->i2c_adap);
+                        if (dm1105dvb->fe)
+                                dm1105dvb->fe->ops.set_voltage =
+                                                        dm1105dvb_set_voltage;
+                }
+                break;
+        case PCI_DEVICE_ID_DW2004:
+                dm1105dvb->fe = dvb_attach(
+                        cx24116_attach, &serit_sp2633_config,
+                        &dm1105dvb->i2c_adap);
+                if (dm1105dvb->fe)
+                        dm1105dvb->fe->ops.set_voltage = dm1105dvb_set_voltage;
+                break;
+        }
+
+        if (!dm1105dvb->fe) {
+                dev_err(&dm1105dvb->pdev->dev, "could not attach frontend\n");
+                return -ENODEV;
+        }
+
+        ret = dvb_register_frontend(&dm1105dvb->dvb_adapter, dm1105dvb->fe);
+        if (ret < 0) {
+                if (dm1105dvb->fe->ops.release)
+                        dm1105dvb->fe->ops.release(dm1105dvb->fe);
+                dm1105dvb->fe = NULL;
+                return ret;
+        }
+
+        return 0;
+}
+
+static void __devinit dm1105dvb_read_mac(struct dm1105dvb *dm1105dvb, u8 *mac)
+{
+        static u8 command[1] = { 0x28 };
+
+        struct i2c_msg msg[] = {
+                { .addr = IIC_24C01_addr >> 1, .flags = 0,
+                                .buf = command, .len = 1 },
+                { .addr = IIC_24C01_addr >> 1, .flags = I2C_M_RD,
+                                .buf = mac, .len = 6 },
+        };
+
+        dm1105_i2c_xfer(&dm1105dvb->i2c_adap, msg , 2);
+        dev_info(&dm1105dvb->pdev->dev, "MAC %02x:%02x:%02x:%02x:%02x:%02x\n",
+                        mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+}
+
+static int __devinit dm1105_probe(struct pci_dev *pdev,
+                                  const struct pci_device_id *ent)
+{
+        struct dm1105dvb *dm1105dvb;
+        struct dvb_adapter *dvb_adapter;
+        struct dvb_demux *dvbdemux;
+        struct dmx_demux *dmx;
+        int ret = -ENOMEM;
+
+        dm1105dvb = kzalloc(sizeof(struct dm1105dvb), GFP_KERNEL);
+        if (!dm1105dvb)
+                goto out;
+
+        dm1105dvb->pdev = pdev;
+        dm1105dvb->buffer_size = 5 * DM1105_DMA_BYTES;
+        dm1105dvb->PacketErrorCount = 0;
+        dm1105dvb->dmarst = 0;
+
+        ret = pci_enable_device(pdev);
+        if (ret < 0)
+                goto err_kfree;
+
+        ret = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+        if (ret < 0)
+                goto err_pci_disable_device;
+
+        pci_set_master(pdev);
+
+        ret = pci_request_regions(pdev, DRIVER_NAME);
+        if (ret < 0)
+                goto err_pci_disable_device;
+
+        dm1105dvb->io_mem = pci_iomap(pdev, 0, pci_resource_len(pdev, 0));
+        if (!dm1105dvb->io_mem) {
+                ret = -EIO;
+                goto err_pci_release_regions;
+        }
+
+        spin_lock_init(&dm1105dvb->lock);
+        pci_set_drvdata(pdev, dm1105dvb);
+
+        ret = request_irq(pdev->irq, dm1105dvb_irq, IRQF_SHARED, DRIVER_NAME, dm1105dvb);
+        if (ret < 0)
+                goto err_pci_iounmap;
+
+        ret = dm1105dvb_hw_init(dm1105dvb);
+        if (ret < 0)
+                goto err_free_irq;
+
+        /* i2c */
+        i2c_set_adapdata(&dm1105dvb->i2c_adap, dm1105dvb);
+        strcpy(dm1105dvb->i2c_adap.name, DRIVER_NAME);
+        dm1105dvb->i2c_adap.owner = THIS_MODULE;
+        dm1105dvb->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
+        dm1105dvb->i2c_adap.dev.parent = &pdev->dev;
+        dm1105dvb->i2c_adap.algo = &dm1105_algo;
+        dm1105dvb->i2c_adap.algo_data = dm1105dvb;
+        ret = i2c_add_adapter(&dm1105dvb->i2c_adap);
+
+        if (ret < 0)
+                goto err_dm1105dvb_hw_exit;
+
+        /* dvb */
+        ret = dvb_register_adapter(&dm1105dvb->dvb_adapter, DRIVER_NAME,
+                                        THIS_MODULE, &pdev->dev, adapter_nr);
+        if (ret < 0)
+                goto err_i2c_del_adapter;
+
+        dvb_adapter = &dm1105dvb->dvb_adapter;
+
+        dm1105dvb_read_mac(dm1105dvb, dvb_adapter->proposed_mac);
+
+        dvbdemux = &dm1105dvb->demux;
+        dvbdemux->filternum = 256;
+        dvbdemux->feednum = 256;
+        dvbdemux->start_feed = dm1105dvb_start_feed;
+        dvbdemux->stop_feed = dm1105dvb_stop_feed;
+        dvbdemux->dmx.capabilities = (DMX_TS_FILTERING |
+                        DMX_SECTION_FILTERING | DMX_MEMORY_BASED_FILTERING);
+        ret = dvb_dmx_init(dvbdemux);
+        if (ret < 0)
+                goto err_dvb_unregister_adapter;
+
+        dmx = &dvbdemux->dmx;
+        dm1105dvb->dmxdev.filternum = 256;
+        dm1105dvb->dmxdev.demux = dmx;
+        dm1105dvb->dmxdev.capabilities = 0;
+
+        ret = dvb_dmxdev_init(&dm1105dvb->dmxdev, dvb_adapter);
+        if (ret < 0)
+                goto err_dvb_dmx_release;
+
+        dm1105dvb->hw_frontend.source = DMX_FRONTEND_0;
+
+        ret = dmx->add_frontend(dmx, &dm1105dvb->hw_frontend);
+        if (ret < 0)
+                goto err_dvb_dmxdev_release;
+
+        dm1105dvb->mem_frontend.source = DMX_MEMORY_FE;
+
+        ret = dmx->add_frontend(dmx, &dm1105dvb->mem_frontend);
+        if (ret < 0)
+                goto err_remove_hw_frontend;
+
+        ret = dmx->connect_frontend(dmx, &dm1105dvb->hw_frontend);
+        if (ret < 0)
+                goto err_remove_mem_frontend;
+
+        ret = frontend_init(dm1105dvb);
+        if (ret < 0)
+                goto err_disconnect_frontend;
+
+        dvb_net_init(dvb_adapter, &dm1105dvb->dvbnet, dmx);
+        dm1105_ir_init(dm1105dvb);
+out:
+        return ret;
+
+err_disconnect_frontend:
+        dmx->disconnect_frontend(dmx);
+err_remove_mem_frontend:
+        dmx->remove_frontend(dmx, &dm1105dvb->mem_frontend);
+err_remove_hw_frontend:
+        dmx->remove_frontend(dmx, &dm1105dvb->hw_frontend);
+err_dvb_dmxdev_release:
+        dvb_dmxdev_release(&dm1105dvb->dmxdev);
+err_dvb_dmx_release:
+        dvb_dmx_release(dvbdemux);
+err_dvb_unregister_adapter:
+        dvb_unregister_adapter(dvb_adapter);
+err_i2c_del_adapter:
+        i2c_del_adapter(&dm1105dvb->i2c_adap);
+err_dm1105dvb_hw_exit:
+        dm1105dvb_hw_exit(dm1105dvb);
+err_free_irq:
+        free_irq(pdev->irq, dm1105dvb);
+err_pci_iounmap:
+        pci_iounmap(pdev, dm1105dvb->io_mem);
+err_pci_release_regions:
+        pci_release_regions(pdev);
+err_pci_disable_device:
+        pci_disable_device(pdev);
+err_kfree:
+        pci_set_drvdata(pdev, NULL);
+        kfree(dm1105dvb);
+        goto out;
+}
+
+static void __devexit dm1105_remove(struct pci_dev *pdev)
+{
+        struct dm1105dvb *dm1105dvb = pci_get_drvdata(pdev);
+        struct dvb_adapter *dvb_adapter = &dm1105dvb->dvb_adapter;
+        struct dvb_demux *dvbdemux = &dm1105dvb->demux;
+        struct dmx_demux *dmx = &dvbdemux->dmx;
+
+        dm1105_ir_exit(dm1105dvb);
+        dmx->close(dmx);
+        dvb_net_release(&dm1105dvb->dvbnet);
+        if (dm1105dvb->fe)
+                dvb_unregister_frontend(dm1105dvb->fe);
+
+        dmx->disconnect_frontend(dmx);
+        dmx->remove_frontend(dmx, &dm1105dvb->mem_frontend);
+        dmx->remove_frontend(dmx, &dm1105dvb->hw_frontend);
+        dvb_dmxdev_release(&dm1105dvb->dmxdev);
+        dvb_dmx_release(dvbdemux);
+        dvb_unregister_adapter(dvb_adapter);
+        if (&dm1105dvb->i2c_adap)
+                i2c_del_adapter(&dm1105dvb->i2c_adap);
+
+        dm1105dvb_hw_exit(dm1105dvb);
+        synchronize_irq(pdev->irq);
+        free_irq(pdev->irq, dm1105dvb);
+        pci_iounmap(pdev, dm1105dvb->io_mem);
+        pci_release_regions(pdev);
+        pci_disable_device(pdev);
+        pci_set_drvdata(pdev, NULL);
+        kfree(dm1105dvb);
+}
+
+static struct pci_device_id dm1105_id_table[] __devinitdata = {
+        {
+                .vendor = PCI_VENDOR_ID_TRIGEM,
+                .device = PCI_DEVICE_ID_DM1105,
+                .subvendor = PCI_ANY_ID,
+                .subdevice = PCI_DEVICE_ID_DW2002,
+        }, {
+                .vendor = PCI_VENDOR_ID_TRIGEM,
+                .device = PCI_DEVICE_ID_DM1105,
+                .subvendor = PCI_ANY_ID,
+                .subdevice = PCI_DEVICE_ID_DW2004,
+        }, {
+                /* empty */
+        },
+};
+
+MODULE_DEVICE_TABLE(pci, dm1105_id_table);
+
+static struct pci_driver dm1105_driver = {
+        .name = DRIVER_NAME,
+        .id_table = dm1105_id_table,
+        .probe = dm1105_probe,
+        .remove = __devexit_p(dm1105_remove),
+};
+
+static int __init dm1105_init(void)
+{
+        return pci_register_driver(&dm1105_driver);
+}
+
+static void __exit dm1105_exit(void)
+{
+        pci_unregister_driver(&dm1105_driver);
+}
+
+module_init(dm1105_init);
+module_exit(dm1105_exit);
+
+MODULE_AUTHOR("Igor M. Liplianin <liplianin@me.by>");
+MODULE_DESCRIPTION("SDMC DM1105 DVB driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 3526e3ee9487..f170e822fadc 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -40,6 +40,7 @@
 
 #include "dvb_frontend.h"
 #include "dvbdev.h"
+#include <linux/dvb/version.h>
 
 static int dvb_frontend_debug;
 static int dvb_shutdown_timeout;
@@ -755,6 +756,539 @@ static int dvb_frontend_check_parameters(struct dvb_frontend *fe,
         return 0;
 }
 
+struct dtv_cmds_h dtv_cmds[] = {
+        [DTV_TUNE] = {
+                .name   = "DTV_TUNE",
+                .cmd    = DTV_TUNE,
+                .set    = 1,
+        },
+        [DTV_CLEAR] = {
+                .name   = "DTV_CLEAR",
+                .cmd    = DTV_CLEAR,
+                .set    = 1,
+        },
+
+        /* Set */
+        [DTV_FREQUENCY] = {
+                .name   = "DTV_FREQUENCY",
+                .cmd    = DTV_FREQUENCY,
+                .set    = 1,
+        },
+        [DTV_BANDWIDTH_HZ] = {
+                .name   = "DTV_BANDWIDTH_HZ",
+                .cmd    = DTV_BANDWIDTH_HZ,
+                .set    = 1,
+        },
+        [DTV_MODULATION] = {
+                .name   = "DTV_MODULATION",
+                .cmd    = DTV_MODULATION,
+                .set    = 1,
+        },
+        [DTV_INVERSION] = {
+                .name   = "DTV_INVERSION",
+                .cmd    = DTV_INVERSION,
+                .set    = 1,
+        },
+        [DTV_DISEQC_MASTER] = {
+                .name   = "DTV_DISEQC_MASTER",
+                .cmd    = DTV_DISEQC_MASTER,
+                .set    = 1,
+                .buffer = 1,
+        },
+        [DTV_SYMBOL_RATE] = {
+                .name   = "DTV_SYMBOL_RATE",
+                .cmd    = DTV_SYMBOL_RATE,
+                .set    = 1,
+        },
+        [DTV_INNER_FEC] = {
+                .name   = "DTV_INNER_FEC",
+                .cmd    = DTV_INNER_FEC,
+                .set    = 1,
+        },
+        [DTV_VOLTAGE] = {
+                .name   = "DTV_VOLTAGE",
+                .cmd    = DTV_VOLTAGE,
+                .set    = 1,
+        },
+        [DTV_TONE] = {
+                .name   = "DTV_TONE",
+                .cmd    = DTV_TONE,
+                .set    = 1,
+        },
+        [DTV_PILOT] = {
+                .name   = "DTV_PILOT",
+                .cmd    = DTV_PILOT,
+                .set    = 1,
+        },
+        [DTV_ROLLOFF] = {
+                .name   = "DTV_ROLLOFF",
+                .cmd    = DTV_ROLLOFF,
+                .set    = 1,
+        },
+        [DTV_DELIVERY_SYSTEM] = {
+                .name   = "DTV_DELIVERY_SYSTEM",
+                .cmd    = DTV_DELIVERY_SYSTEM,
+                .set    = 1,
+        },
+        [DTV_HIERARCHY] = {
+                .name   = "DTV_HIERARCHY",
+                .cmd    = DTV_HIERARCHY,
+                .set    = 1,
+        },
+        [DTV_CODE_RATE_HP] = {
+                .name   = "DTV_CODE_RATE_HP",
+                .cmd    = DTV_CODE_RATE_HP,
+                .set    = 1,
+        },
+        [DTV_CODE_RATE_LP] = {
+                .name   = "DTV_CODE_RATE_LP",
+                .cmd    = DTV_CODE_RATE_LP,
+                .set    = 1,
+        },
+        [DTV_GUARD_INTERVAL] = {
+                .name   = "DTV_GUARD_INTERVAL",
+                .cmd    = DTV_GUARD_INTERVAL,
+                .set    = 1,
+        },
+        [DTV_TRANSMISSION_MODE] = {
+                .name   = "DTV_TRANSMISSION_MODE",
+                .cmd    = DTV_TRANSMISSION_MODE,
+                .set    = 1,
+        },
+        /* Get */
+        [DTV_DISEQC_SLAVE_REPLY] = {
+                .name   = "DTV_DISEQC_SLAVE_REPLY",
+                .cmd    = DTV_DISEQC_SLAVE_REPLY,
+                .set    = 0,
+                .buffer = 1,
+        },
+        [DTV_API_VERSION] = {
+                .name   = "DTV_API_VERSION",
+                .cmd    = DTV_API_VERSION,
+                .set    = 0,
+        },
+        [DTV_CODE_RATE_HP] = {
+                .name   = "DTV_CODE_RATE_HP",
+                .cmd    = DTV_CODE_RATE_HP,
+                .set    = 0,
+        },
+        [DTV_CODE_RATE_LP] = {
+                .name   = "DTV_CODE_RATE_LP",
+                .cmd    = DTV_CODE_RATE_LP,
+                .set    = 0,
+        },
+        [DTV_GUARD_INTERVAL] = {
+                .name   = "DTV_GUARD_INTERVAL",
+                .cmd    = DTV_GUARD_INTERVAL,
+                .set    = 0,
+        },
+        [DTV_TRANSMISSION_MODE] = {
+                .name   = "DTV_TRANSMISSION_MODE",
+                .cmd    = DTV_TRANSMISSION_MODE,
+                .set    = 0,
+        },
+        [DTV_HIERARCHY] = {
+                .name   = "DTV_HIERARCHY",
+                .cmd    = DTV_HIERARCHY,
+                .set    = 0,
+        },
+};
+
+void dtv_property_dump(struct dtv_property *tvp)
+{
+        int i;
+
+        if (tvp->cmd <= 0 || tvp->cmd > DTV_MAX_COMMAND) {
+                printk("%s: tvp.cmd = 0x%08x (undefined/unknown/invalid)\n",
+                        __func__, tvp->cmd);
+                return;
+        }
+
+        printk("%s() tvp.cmd    = 0x%08x (%s)\n"
+                ,__FUNCTION__
+                ,tvp->cmd
+                ,dtv_cmds[ tvp->cmd ].name);
+
+        if(dtv_cmds[ tvp->cmd ].buffer) {
+
+                printk("%s() tvp.u.buffer.len = 0x%02x\n"
+                        ,__FUNCTION__
+                        ,tvp->u.buffer.len);
+
+                for(i = 0; i < tvp->u.buffer.len; i++)
+                        printk("%s() tvp.u.buffer.data[0x%02x] = 0x%02x\n"
+                                ,__FUNCTION__
+                                ,i
+                                ,tvp->u.buffer.data[i]);
+
+        } else
+                printk("%s() tvp.u.data = 0x%08x\n", __FUNCTION__, tvp->u.data);
+}
+
+int is_legacy_delivery_system(fe_delivery_system_t s)
+{
+        if((s == SYS_UNDEFINED) || (s == SYS_DVBC_ANNEX_AC) ||
+                (s == SYS_DVBC_ANNEX_B) || (s == SYS_DVBT) || (s == SYS_DVBS))
+                return 1;
+
+        return 0;
+}
+
+/* Synchronise the legacy tuning parameters into the cache, so that demodulator
+ * drivers can use a single set_frontend tuning function, regardless of whether
+ * it's being used for the legacy or new API, reducing code and complexity.
+ */
+void dtv_property_cache_sync(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)
+{
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
+
+        printk("%s()\n", __FUNCTION__);
+
+        c->frequency = p->frequency;
+        c->inversion = p->inversion;
+
+        switch (fe->ops.info.type) {
+        case FE_QPSK:
+                c->modulation = QPSK;   /* implied for DVB-S in legacy API */
+                c->rolloff = ROLLOFF_35;/* implied for DVB-S */
+                c->symbol_rate = p->u.qpsk.symbol_rate;
+                c->fec_inner = p->u.qpsk.fec_inner;
+                c->delivery_system = SYS_DVBS;
+                break;
+        case FE_QAM:
+                c->symbol_rate = p->u.qam.symbol_rate;
+                c->fec_inner = p->u.qam.fec_inner;
+                c->modulation = p->u.qam.modulation;
+                c->delivery_system = SYS_DVBC_ANNEX_AC;
+                break;
+        case FE_OFDM:
+                if (p->u.ofdm.bandwidth == BANDWIDTH_6_MHZ)
+                        c->bandwidth_hz = 6000000;
+                else if (p->u.ofdm.bandwidth == BANDWIDTH_7_MHZ)
+                        c->bandwidth_hz = 7000000;
+                else if (p->u.ofdm.bandwidth == BANDWIDTH_8_MHZ)
+                        c->bandwidth_hz = 8000000;
+                else
+                        /* Including BANDWIDTH_AUTO */
+                        c->bandwidth_hz = 0;
+                c->code_rate_HP = p->u.ofdm.code_rate_HP;
+                c->code_rate_LP = p->u.ofdm.code_rate_LP;
+                c->modulation = p->u.ofdm.constellation;
+                c->transmission_mode = p->u.ofdm.transmission_mode;
+                c->guard_interval = p->u.ofdm.guard_interval;
+                c->hierarchy = p->u.ofdm.hierarchy_information;
+                c->delivery_system = SYS_DVBT;
+                break;
+        case FE_ATSC:
+                c->modulation = p->u.vsb.modulation;
+                if ((c->modulation == VSB_8) || (c->modulation == VSB_16))
+                        c->delivery_system = SYS_ATSC;
+                else
+                        c->delivery_system = SYS_DVBC_ANNEX_B;
+                break;
+        }
+}
+
+/* Ensure the cached values are set correctly in the frontend
+ * legacy tuning structures, for the advanced tuning API.
+ */
+void dtv_property_legacy_params_sync(struct dvb_frontend *fe)
+{
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
+        struct dvb_frontend_private *fepriv = fe->frontend_priv;
+        struct dvb_frontend_parameters *p = &fepriv->parameters;
+
+        printk("%s()\n", __FUNCTION__);
+
+        p->frequency = c->frequency;
+        p->inversion = c->inversion;
+
+        switch (fe->ops.info.type) {
+        case FE_QPSK:
+                printk("%s() Preparing QPSK req\n", __FUNCTION__);
+                p->u.qpsk.symbol_rate = c->symbol_rate;
+                p->u.qpsk.fec_inner = c->fec_inner;
+                c->delivery_system = SYS_DVBS;
+                break;
+        case FE_QAM:
+                printk("%s() Preparing QAM req\n", __FUNCTION__);
+                p->u.qam.symbol_rate = c->symbol_rate;
+                p->u.qam.fec_inner = c->fec_inner;
+                p->u.qam.modulation = c->modulation;
+                c->delivery_system = SYS_DVBC_ANNEX_AC;
+                break;
+        case FE_OFDM:
+                printk("%s() Preparing OFDM req\n", __FUNCTION__);
+                if (c->bandwidth_hz == 6000000)
+                        p->u.ofdm.bandwidth = BANDWIDTH_6_MHZ;
+                else if (c->bandwidth_hz == 7000000)
+                        p->u.ofdm.bandwidth = BANDWIDTH_7_MHZ;
+                else if (c->bandwidth_hz == 8000000)
+                        p->u.ofdm.bandwidth = BANDWIDTH_8_MHZ;
+                else
+                        p->u.ofdm.bandwidth = BANDWIDTH_AUTO;
+                p->u.ofdm.code_rate_HP = c->code_rate_HP;
+                p->u.ofdm.code_rate_LP = c->code_rate_LP;
+                p->u.ofdm.constellation = c->modulation;
+                p->u.ofdm.transmission_mode = c->transmission_mode;
+                p->u.ofdm.guard_interval = c->guard_interval;
+                p->u.ofdm.hierarchy_information = c->hierarchy;
+                c->delivery_system = SYS_DVBT;
+                break;
+        case FE_ATSC:
+                printk("%s() Preparing VSB req\n", __FUNCTION__);
+                p->u.vsb.modulation = c->modulation;
+                if ((c->modulation == VSB_8) || (c->modulation == VSB_16))
+                        c->delivery_system = SYS_ATSC;
+                else
+                        c->delivery_system = SYS_DVBC_ANNEX_B;
+                break;
+        }
+}
+
+/* Ensure the cached values are set correctly in the frontend
+ * legacy tuning structures, for the legacy tuning API.
+ */
+void dtv_property_adv_params_sync(struct dvb_frontend *fe)
+{
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
+        struct dvb_frontend_private *fepriv = fe->frontend_priv;
+        struct dvb_frontend_parameters *p = &fepriv->parameters;
+
+        printk("%s()\n", __FUNCTION__);
+
+        p->frequency = c->frequency;
+        p->inversion = c->inversion;
+
+        switch(c->modulation) {
+        case PSK_8:
+        case APSK_16:
+        case QPSK:
+                p->u.qpsk.symbol_rate = c->symbol_rate;
+                p->u.qpsk.fec_inner = c->fec_inner;
+                break;
+        default:
+                break;
+        }
+
+        if(c->delivery_system == SYS_ISDBT) {
+                /* Fake out a generic DVB-T request so we pass validation in the ioctl */
+                p->frequency = c->frequency;
+                p->inversion = INVERSION_AUTO;
+                p->u.ofdm.constellation = QAM_AUTO;
+                p->u.ofdm.code_rate_HP = FEC_AUTO;
+                p->u.ofdm.code_rate_LP = FEC_AUTO;
+                p->u.ofdm.bandwidth = BANDWIDTH_AUTO;
+                p->u.ofdm.transmission_mode = TRANSMISSION_MODE_AUTO;
+                p->u.ofdm.guard_interval = GUARD_INTERVAL_AUTO;
+                p->u.ofdm.hierarchy_information = HIERARCHY_AUTO;
+        }
+}
+
+void dtv_property_cache_submit(struct dvb_frontend *fe)
+{
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
+
+        printk("%s()\n", __FUNCTION__);
+
+        /* For legacy delivery systems we don't need the delivery_system to
+         * be specified, but we populate the older structures from the cache
+         * so we can call set_frontend on older drivers.
+         */
+        if(is_legacy_delivery_system(c->delivery_system)) {
+
+                printk("%s() legacy, modulation = %d\n", __FUNCTION__, c->modulation);
+                dtv_property_legacy_params_sync(fe);
+
+        } else {
+                printk("%s() adv, modulation = %d\n", __FUNCTION__, c->modulation);
+
+                /* For advanced delivery systems / modulation types ...
+                 * we seed the lecacy dvb_frontend_parameters structure
+                 * so that the sanity checking code later in the IOCTL processing
+                 * can validate our basic frequency ranges, symbolrates, modulation
+                 * etc.
+                 */
+                dtv_property_adv_params_sync(fe);
+        }
+}
+
+static int dvb_frontend_ioctl_legacy(struct inode *inode, struct file *file,
+                        unsigned int cmd, void *parg);
+static int dvb_frontend_ioctl_properties(struct inode *inode, struct file *file,
+                        unsigned int cmd, void *parg);
+
+int dtv_property_process_get(struct dvb_frontend *fe, struct dtv_property *tvp,
+        struct inode *inode, struct file *file)
+{
+        int r = 0;
+
+        printk("%s()\n", __FUNCTION__);
+
+        dtv_property_dump(tvp);
+
+        /* Allow the frontend to validate incoming properties */
+        if (fe->ops.get_property)
+                r = fe->ops.get_property(fe, tvp);
+
+        if (r < 0)
+                return r;
+
+        switch(tvp->cmd) {
+        case DTV_FREQUENCY:
+                tvp->u.data = fe->dtv_property_cache.frequency;
+                break;
+        case DTV_MODULATION:
+                tvp->u.data = fe->dtv_property_cache.modulation;
+                break;
+        case DTV_BANDWIDTH_HZ:
+                tvp->u.data = fe->dtv_property_cache.bandwidth_hz;
+                break;
+        case DTV_INVERSION:
+                tvp->u.data = fe->dtv_property_cache.inversion;
+                break;
+        case DTV_SYMBOL_RATE:
+                tvp->u.data = fe->dtv_property_cache.symbol_rate;
+                break;
+        case DTV_INNER_FEC:
+                tvp->u.data = fe->dtv_property_cache.fec_inner;
+                break;
+        case DTV_PILOT:
+                tvp->u.data = fe->dtv_property_cache.pilot;
+                break;
+        case DTV_ROLLOFF:
+                tvp->u.data = fe->dtv_property_cache.rolloff;
+                break;
+        case DTV_DELIVERY_SYSTEM:
+                tvp->u.data = fe->dtv_property_cache.delivery_system;
+                break;
+        case DTV_VOLTAGE:
+                tvp->u.data = fe->dtv_property_cache.voltage;
+                break;
+        case DTV_TONE:
+                tvp->u.data = fe->dtv_property_cache.sectone;
+                break;
+        case DTV_API_VERSION:
+                tvp->u.data = (DVB_API_VERSION << 8) | DVB_API_VERSION_MINOR;
+                break;
+        case DTV_CODE_RATE_HP:
+                tvp->u.data = fe->dtv_property_cache.code_rate_HP;
+                break;
+        case DTV_CODE_RATE_LP:
+                tvp->u.data = fe->dtv_property_cache.code_rate_LP;
+                break;
+        case DTV_GUARD_INTERVAL:
+                tvp->u.data = fe->dtv_property_cache.guard_interval;
+                break;
+        case DTV_TRANSMISSION_MODE:
+                tvp->u.data = fe->dtv_property_cache.transmission_mode;
+                break;
+        case DTV_HIERARCHY:
+                tvp->u.data = fe->dtv_property_cache.hierarchy;
+                break;
+        default:
+                r = -1;
+        }
+
+        return r;
+}
+
+int dtv_property_process_set(struct dvb_frontend *fe, struct dtv_property *tvp,
+        struct inode *inode, struct file *file)
+{
+        int r = 0;
+        struct dvb_frontend_private *fepriv = fe->frontend_priv;
+        printk("%s()\n", __FUNCTION__);
+        dtv_property_dump(tvp);
+
+        /* Allow the frontend to validate incoming properties */
+        if (fe->ops.set_property)
+                r = fe->ops.set_property(fe, tvp);
+
+        if (r < 0)
+                return r;
+
+        switch(tvp->cmd) {
+        case DTV_CLEAR:
+                /* Reset a cache of data specific to the frontend here. This does
+                 * not effect hardware.
+                 */
+                printk("%s() Flushing property cache\n", __FUNCTION__);
+                memset(&fe->dtv_property_cache, 0, sizeof(struct dtv_frontend_properties));
+                fe->dtv_property_cache.state = tvp->cmd;
+                fe->dtv_property_cache.delivery_system = SYS_UNDEFINED;
+                break;
+        case DTV_TUNE:
+                /* interpret the cache of data, build either a traditional frontend
+                 * tunerequest so we can pass validation in the FE_SET_FRONTEND
+                 * ioctl.
+                 */
+                fe->dtv_property_cache.state = tvp->cmd;
+                printk("%s() Finalised property cache\n", __FUNCTION__);
+                dtv_property_cache_submit(fe);
+
+                r |= dvb_frontend_ioctl_legacy(inode, file, FE_SET_FRONTEND,
+                        &fepriv->parameters);
+                break;
+        case DTV_FREQUENCY:
+                fe->dtv_property_cache.frequency = tvp->u.data;
+                break;
+        case DTV_MODULATION:
+                fe->dtv_property_cache.modulation = tvp->u.data;
+                break;
+        case DTV_BANDWIDTH_HZ:
+                fe->dtv_property_cache.bandwidth_hz = tvp->u.data;
+                break;
+        case DTV_INVERSION:
+                fe->dtv_property_cache.inversion = tvp->u.data;
+                break;
+        case DTV_SYMBOL_RATE:
+                fe->dtv_property_cache.symbol_rate = tvp->u.data;
+                break;
+        case DTV_INNER_FEC:
+                fe->dtv_property_cache.fec_inner = tvp->u.data;
+                break;
+        case DTV_PILOT:
+                fe->dtv_property_cache.pilot = tvp->u.data;
+                break;
+        case DTV_ROLLOFF:
+                fe->dtv_property_cache.rolloff = tvp->u.data;
+                break;
+        case DTV_DELIVERY_SYSTEM:
+                fe->dtv_property_cache.delivery_system = tvp->u.data;
+                break;
+        case DTV_VOLTAGE:
+                fe->dtv_property_cache.voltage = tvp->u.data;
+                r = dvb_frontend_ioctl_legacy(inode, file, FE_SET_VOLTAGE,
+                        (void *)fe->dtv_property_cache.voltage);
+                break;
+        case DTV_TONE:
+                fe->dtv_property_cache.sectone = tvp->u.data;
+                r = dvb_frontend_ioctl_legacy(inode, file, FE_SET_TONE,
+                        (void *)fe->dtv_property_cache.sectone);
+                break;
+        case DTV_CODE_RATE_HP:
+                fe->dtv_property_cache.code_rate_HP = tvp->u.data;
+                break;
+        case DTV_CODE_RATE_LP:
+                fe->dtv_property_cache.code_rate_LP = tvp->u.data;
+                break;
+        case DTV_GUARD_INTERVAL:
+                fe->dtv_property_cache.guard_interval = tvp->u.data;
+                break;
+        case DTV_TRANSMISSION_MODE:
+                fe->dtv_property_cache.transmission_mode = tvp->u.data;
+                break;
+        case DTV_HIERARCHY:
+                fe->dtv_property_cache.hierarchy = tvp->u.data;
+                break;
+        default:
+                r = -1;
+        }
+
+        return r;
+}
+
 static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
                         unsigned int cmd, void *parg)
 {
@@ -776,6 +1310,116 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
         if (down_interruptible (&fepriv->sem))
                 return -ERESTARTSYS;
 
+        if ((cmd == FE_SET_PROPERTY) || (cmd == FE_GET_PROPERTY))
+                err = dvb_frontend_ioctl_properties(inode, file, cmd, parg);
+        else {
+                fe->dtv_property_cache.state = DTV_UNDEFINED;
+                err = dvb_frontend_ioctl_legacy(inode, file, cmd, parg);
+        }
+
+        up(&fepriv->sem);
+        return err;
+}
+
+static int dvb_frontend_ioctl_properties(struct inode *inode, struct file *file,
+                        unsigned int cmd, void *parg)
+{
+        struct dvb_device *dvbdev = file->private_data;
+        struct dvb_frontend *fe = dvbdev->priv;
+        int err = 0;
+
+        struct dtv_properties *tvps = NULL;
+        struct dtv_property *tvp = NULL;
+        int i;
+
+        dprintk("%s\n", __func__);
+
+        if(cmd == FE_SET_PROPERTY) {
+                printk("%s() FE_SET_PROPERTY\n", __FUNCTION__);
+
+                tvps = (struct dtv_properties __user *)parg;
+
+                printk("%s() properties.num = %d\n", __FUNCTION__, tvps->num);
+                printk("%s() properties.props = %p\n", __FUNCTION__, tvps->props);
+
+                /* Put an arbitrary limit on the number of messages that can
+                 * be sent at once */
+                if ((tvps->num == 0) || (tvps->num > DTV_IOCTL_MAX_MSGS))
+                        return -EINVAL;
+
+                tvp = (struct dtv_property *) kmalloc(tvps->num *
+                        sizeof(struct dtv_property), GFP_KERNEL);
+                if (!tvp) {
+                        err = -ENOMEM;
+                        goto out;
+                }
+
+                if (copy_from_user(tvp, tvps->props, tvps->num * sizeof(struct dtv_property))) {
+                        err = -EFAULT;
+                        goto out;
+                }
+
+                for (i = 0; i < tvps->num; i++) {
+                        (tvp + i)->result = dtv_property_process_set(fe, tvp + i, inode, file);
+                        err |= (tvp + i)->result;
+                }
+
+                if(fe->dtv_property_cache.state == DTV_TUNE) {
+                        printk("%s() Property cache is full, tuning\n", __FUNCTION__);
+                }
+
+        } else
+        if(cmd == FE_GET_PROPERTY) {
+                printk("%s() FE_GET_PROPERTY\n", __FUNCTION__);
+
+                tvps = (struct dtv_properties __user *)parg;
+
+                printk("%s() properties.num = %d\n", __FUNCTION__, tvps->num);
+                printk("%s() properties.props = %p\n", __FUNCTION__, tvps->props);
+
+                /* Put an arbitrary limit on the number of messages that can
+                 * be sent at once */
+                if ((tvps->num == 0) || (tvps->num > DTV_IOCTL_MAX_MSGS))
+                        return -EINVAL;
+
+                tvp = (struct dtv_property *) kmalloc(tvps->num *
+                        sizeof(struct dtv_property), GFP_KERNEL);
+                if (!tvp) {
+                        err = -ENOMEM;
+                        goto out;
+                }
+
+                if (copy_from_user(tvp, tvps->props, tvps->num * sizeof(struct dtv_property))) {
+                        err = -EFAULT;
+                        goto out;
+                }
+
+                for (i = 0; i < tvps->num; i++) {
+                        (tvp + i)->result = dtv_property_process_get(fe, tvp + i, inode, file);
+                        err |= (tvp + i)->result;
+                }
+
+                if (copy_to_user(tvps->props, tvp, tvps->num * sizeof(struct dtv_property))) {
+                        err = -EFAULT;
+                        goto out;
+                }
+
+        } else
+                err = -EOPNOTSUPP;
+
+out:
+        kfree(tvp);
+        return err;
+}
+
+static int dvb_frontend_ioctl_legacy(struct inode *inode, struct file *file,
+                        unsigned int cmd, void *parg)
+{
+        struct dvb_device *dvbdev = file->private_data;
+        struct dvb_frontend *fe = dvbdev->priv;
+        struct dvb_frontend_private *fepriv = fe->frontend_priv;
+        int err = -EOPNOTSUPP;
+
         switch (cmd) {
         case FE_GET_INFO: {
                 struct dvb_frontend_info* info = parg;
@@ -942,13 +1586,21 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
         case FE_SET_FRONTEND: {
                 struct dvb_frontend_tune_settings fetunesettings;
 
-                if (dvb_frontend_check_parameters(fe, parg) < 0) {
-                        err = -EINVAL;
-                        break;
-                }
+                if(fe->dtv_property_cache.state == DTV_TUNE) {
+                        if (dvb_frontend_check_parameters(fe, &fepriv->parameters) < 0) {
+                                err = -EINVAL;
+                                break;
+                        }
+                } else {
+                        if (dvb_frontend_check_parameters(fe, parg) < 0) {
+                                err = -EINVAL;
+                                break;
+                        }
 
-                memcpy (&fepriv->parameters, parg,
-                        sizeof (struct dvb_frontend_parameters));
+                        memcpy (&fepriv->parameters, parg,
+                                sizeof (struct dvb_frontend_parameters));
+                        dtv_property_cache_sync(fe, &fepriv->parameters);
+                }
 
                 memset(&fetunesettings, 0, sizeof(struct dvb_frontend_tune_settings));
                 memcpy(&fetunesettings.parameters, parg,
@@ -1027,10 +1679,10 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
                 break;
         };
 
-        up (&fepriv->sem);
         return err;
 }
 
+
 static unsigned int dvb_frontend_poll(struct file *file, struct poll_table_struct *wait)
 {
         struct dvb_device *dvbdev = file->private_data;
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h
index aa4133f0bd19..3055301ff3ca 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -169,6 +169,9 @@ struct dvb_frontend_ops {
 
         struct dvb_tuner_ops tuner_ops;
         struct analog_demod_ops analog_ops;
+
+        int (*set_property)(struct dvb_frontend* fe, struct dtv_property* tvp);
+        int (*get_property)(struct dvb_frontend* fe, struct dtv_property* tvp);
 };
 
 #define MAX_EVENT 8
@@ -182,6 +185,32 @@ struct dvb_fe_events {
         struct mutex              mtx;
 };
 
+struct dtv_frontend_properties {
+
+        /* Cache State */
+        u32                     state;
+
+        u32                     frequency;
+        fe_modulation_t         modulation;
+
+        fe_sec_voltage_t        voltage;
+        fe_sec_tone_mode_t      sectone;
+        fe_spectral_inversion_t inversion;
+        fe_code_rate_t          fec_inner;
+        fe_transmit_mode_t      transmission_mode;
+        u32                     bandwidth_hz;   /* 0 = AUTO */
+        fe_guard_interval_t     guard_interval;
+        fe_hierarchy_t          hierarchy;
+        u32                     symbol_rate;
+        fe_code_rate_t          code_rate_HP;
+        fe_code_rate_t          code_rate_LP;
+
+        fe_pilot_t              pilot;
+        fe_rolloff_t            rolloff;
+
+        fe_delivery_system_t    delivery_system;
+};
+
 struct dvb_frontend {
         struct dvb_frontend_ops ops;
         struct dvb_adapter *dvb;
@@ -190,6 +219,9 @@ struct dvb_frontend {
         void *frontend_priv;
         void *sec_priv;
         void *analog_demod_priv;
+        struct dtv_frontend_properties dtv_property_cache;
+#define DVB_FRONTEND_COMPONENT_TUNER 0
+        int (*callback)(void *adapter_priv, int component, int cmd, int arg);
 };
 
 extern int dvb_register_frontend(struct dvb_adapter *dvb,
diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
index e7132770a3bf..665776d72a48 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/drivers/media/dvb/dvb-core/dvbdev.c
@@ -233,7 +233,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
 
         mutex_unlock(&dvbdev_register_lock);
 
-        clsdev = device_create_drvdata(dvb_class, adap->device,
+        clsdev = device_create(dvb_class, adap->device,
                                MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)),
                                NULL, "dvb%d.%s%d", adap->num, dnames[type], id);
         if (IS_ERR(clsdev)) {
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
index e84152b7576d..3c13bcfa6385 100644
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -72,9 +72,11 @@ config DVB_USB_DIB0700
         select DVB_DIB7000P
         select DVB_DIB7000M
         select DVB_DIB3000MC
+        select DVB_S5H1411 if !DVB_FE_CUSTOMISE
         select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE
         select MEDIA_TUNER_MT2266 if !DVB_FE_CUSTOMISE
         select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMIZE
         select DVB_TUNER_DIB0070
         help
           Support for USB2.0/1.1 DVB receivers based on the DiB0700 USB bridge. The
@@ -108,6 +110,8 @@ config DVB_USB_CXUSB
         select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
         select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMISE
         select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE
+        select DVB_DIB7000P if !DVB_FE_CUSTOMISE
+        select DVB_TUNER_DIB0070 if !DVB_FE_CUSTOMISE
         help
           Say Y here to support the Conexant USB2.0 hybrid reference design.
           Currently, only DVB and ATSC modes are supported, analog mode
@@ -245,12 +249,25 @@ config DVB_USB_AF9005_REMOTE
           Afatech AF9005 based receiver.
 
 config DVB_USB_DW2102
-        tristate "DvbWorld 2102 DVB-S USB2.0 receiver"
+        tristate "DvbWorld DVB-S/S2 USB2.0 support"
         depends on DVB_USB
-        select DVB_STV0299 if !DVB_FE_CUSTOMISE
         select DVB_PLL if !DVB_FE_CUSTOMISE
+        select DVB_STV0299 if !DVB_FE_CUSTOMISE
+        select DVB_STV0288 if !DVB_FE_CUSTOMISE
+        select DVB_STB6000 if !DVB_FE_CUSTOMISE
+        select DVB_CX24116 if !DVB_FE_CUSTOMISE
+        select DVB_SI21XX if !DVB_FE_CUSTOMISE
         help
-           Say Y here to support the DvbWorld 2102 DVB-S USB2.0 receiver.
+          Say Y here to support the DvbWorld DVB-S/S2 USB2.0 receivers
+          and the TeVii S650.
+
+config  DVB_USB_CINERGY_T2
+        tristate "Terratec CinergyT2/qanu USB 2.0 DVB-T receiver"
+        depends on DVB_USB
+        help
+          Support for "TerraTec CinergyT2" USB2.0 Highspeed DVB Receivers
+
+          Say Y if you own such a device and want to use it.
 
 config DVB_USB_ANYSEE
         tristate "Anysee DVB-T/C USB2.0 support"
@@ -262,3 +279,22 @@ config DVB_USB_ANYSEE
         help
           Say Y here to support the Anysee E30, Anysee E30 Plus or
           Anysee E30 C Plus DVB USB2.0 receiver.
+
+config DVB_USB_DTV5100
+        tristate "AME DTV-5100 USB2.0 DVB-T support"
+        depends on DVB_USB
+        select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE
+        help
+          Say Y here to support the AME DTV-5100 USB2.0 DVB-T receiver.
+
+config DVB_USB_AF9015
+        tristate "Afatech AF9015 DVB-T USB2.0 support"
+        depends on DVB_USB && EXPERIMENTAL
+        select DVB_AF9013
+        select DVB_PLL              if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_MT2060   if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_QT1010   if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE
+        help
+          Say Y here to support the Afatech AF9015 based DVB-T USB2.0 receiver
diff --git a/drivers/media/dvb/dvb-usb/Makefile b/drivers/media/dvb/dvb-usb/Makefile
index e206f1ea0027..3122b7cc2c23 100644
--- a/drivers/media/dvb/dvb-usb/Makefile
+++ b/drivers/media/dvb/dvb-usb/Makefile
@@ -67,6 +67,16 @@ obj-$(CONFIG_DVB_USB_ANYSEE) += dvb-usb-anysee.o
 dvb-usb-dw2102-objs = dw2102.o
 obj-$(CONFIG_DVB_USB_DW2102) += dvb-usb-dw2102.o
 
+dvb-usb-dtv5100-objs = dtv5100.o
+obj-$(CONFIG_DVB_USB_DTV5100) += dvb-usb-dtv5100.o
+
+dvb-usb-af9015-objs = af9015.o
+obj-$(CONFIG_DVB_USB_AF9015) += dvb-usb-af9015.o
+
+dvb-usb-cinergyT2-objs = cinergyT2-core.o cinergyT2-fe.o
+obj-$(CONFIG_DVB_USB_CINERGY_T2) += dvb-usb-cinergyT2.o
+
+
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
 # due to tuner-xc3028
 EXTRA_CFLAGS += -Idrivers/media/common/tuners
diff --git a/drivers/media/dvb/dvb-usb/af9005-remote.c b/drivers/media/dvb/dvb-usb/af9005-remote.c
index ff00c0e8f4a1..7c596f926764 100644
--- a/drivers/media/dvb/dvb-usb/af9005-remote.c
+++ b/drivers/media/dvb/dvb-usb/af9005-remote.c
@@ -25,7 +25,7 @@
  */
 #include "af9005.h"
 /* debug */
-int dvb_usb_af9005_remote_debug;
+static int dvb_usb_af9005_remote_debug;
 module_param_named(debug, dvb_usb_af9005_remote_debug, int, 0644);
 MODULE_PARM_DESC(debug,
                  "enable (1) or disable (0) debug messages."
diff --git a/drivers/media/dvb/dvb-usb/af9005-script.h b/drivers/media/dvb/dvb-usb/af9005-script.h
index 6eeaae51b1ca..4d69045426dd 100644
--- a/drivers/media/dvb/dvb-usb/af9005-script.h
+++ b/drivers/media/dvb/dvb-usb/af9005-script.h
@@ -14,7 +14,7 @@ typedef struct {
         u8 val;
 } RegDesc;
 
-RegDesc script[] = {
+static RegDesc script[] = {
         {0xa180, 0x0, 0x8, 0xa},
         {0xa181, 0x0, 0x8, 0xd7},
         {0xa182, 0x0, 0x8, 0xa3},
diff --git a/drivers/media/dvb/dvb-usb/af9005.c b/drivers/media/dvb/dvb-usb/af9005.c
index cfe71feefcad..ca5a0a4d2a47 100644
--- a/drivers/media/dvb/dvb-usb/af9005.c
+++ b/drivers/media/dvb/dvb-usb/af9005.c
@@ -35,17 +35,17 @@ module_param_named(led, dvb_usb_af9005_led, bool, 0644);
 MODULE_PARM_DESC(led, "enable led (default: 1).");
 
 /* eeprom dump */
-int dvb_usb_af9005_dump_eeprom = 0;
+static int dvb_usb_af9005_dump_eeprom;
 module_param_named(dump_eeprom, dvb_usb_af9005_dump_eeprom, int, 0);
 MODULE_PARM_DESC(dump_eeprom, "dump contents of the eeprom.");
 
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 /* remote control decoder */
-int (*rc_decode) (struct dvb_usb_device * d, u8 * data, int len, u32 * event,
-                  int *state);
-void *rc_keys;
-int *rc_keys_size;
+static int (*rc_decode) (struct dvb_usb_device *d, u8 *data, int len,
+                u32 *event, int *state);
+static void *rc_keys;
+static int *rc_keys_size;
 
 u8 regmask[8] = { 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff };
 
@@ -54,8 +54,8 @@ struct af9005_device_state {
         int led_state;
 };
 
-int af9005_usb_generic_rw(struct dvb_usb_device *d, u8 * wbuf, u16 wlen,
-                          u8 * rbuf, u16 rlen, int delay_ms)
+static int af9005_usb_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen,
+                          u8 *rbuf, u16 rlen, int delay_ms)
 {
         int actlen, ret = -ENOMEM;
 
@@ -98,12 +98,7 @@ int af9005_usb_generic_rw(struct dvb_usb_device *d, u8 * wbuf, u16 wlen,
         return ret;
 }
 
-int af9005_usb_generic_write(struct dvb_usb_device *d, u8 * buf, u16 len)
-{
-        return af9005_usb_generic_rw(d, buf, len, NULL, 0, 0);
-}
-
-int af9005_generic_read_write(struct dvb_usb_device *d, u16 reg,
+static int af9005_generic_read_write(struct dvb_usb_device *d, u16 reg,
                               int readwrite, int type, u8 * values, int len)
 {
         struct af9005_device_state *st = d->priv;
@@ -765,7 +760,7 @@ static int af9005_boot_packet(struct usb_device *udev, int type, u8 * reply)
         return 0;
 }
 
-int af9005_download_firmware(struct usb_device *udev, const struct firmware *fw)
+static int af9005_download_firmware(struct usb_device *udev, const struct firmware *fw)
 {
         int i, packets, ret, act_len;
 
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
new file mode 100644
index 000000000000..cb0829c038ce
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -0,0 +1,1474 @@
+/*
+ * DVB USB Linux driver for Afatech AF9015 DVB-T USB2.0 receiver
+ *
+ * Copyright (C) 2007 Antti Palosaari <crope@iki.fi>
+ *
+ * Thanks to Afatech who kindly provided information.
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include "af9015.h"
+#include "af9013.h"
+#include "mt2060.h"
+#include "qt1010.h"
+#include "tda18271.h"
+#include "mxl5005s.h"
+#if 0
+#include "mc44s80x.h"
+#endif
+
+int dvb_usb_af9015_debug;
+module_param_named(debug, dvb_usb_af9015_debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debugging level" DVB_USB_DEBUG_STATUS);
+int dvb_usb_af9015_remote;
+module_param_named(remote, dvb_usb_af9015_remote, int, 0644);
+MODULE_PARM_DESC(remote, "select remote");
+int dvb_usb_af9015_dual_mode;
+module_param_named(dual_mode, dvb_usb_af9015_dual_mode, int, 0644);
+MODULE_PARM_DESC(dual_mode, "enable dual mode");
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
+static DEFINE_MUTEX(af9015_usb_mutex);
+
+static struct af9015_config af9015_config;
+static struct dvb_usb_device_properties af9015_properties[2];
+int af9015_properties_count = ARRAY_SIZE(af9015_properties);
+
+static struct af9013_config af9015_af9013_config[] = {
+        {
+                .demod_address = AF9015_I2C_DEMOD,
+                .output_mode = AF9013_OUTPUT_MODE_USB,
+                .api_version = { 0, 1, 9, 0 },
+                .gpio[0] = AF9013_GPIO_HI,
+                .gpio[3] = AF9013_GPIO_TUNER_ON,
+
+        }, {
+                .output_mode = AF9013_OUTPUT_MODE_SERIAL,
+                .api_version = { 0, 1, 9, 0 },
+                .gpio[0] = AF9013_GPIO_TUNER_ON,
+                .gpio[1] = AF9013_GPIO_LO,
+        }
+};
+
+static int af9015_rw_udev(struct usb_device *udev, struct req_t *req)
+{
+        int act_len, ret;
+        u8 buf[64];
+        u8 write = 1;
+        u8 msg_len = 8;
+        static u8 seq; /* packet sequence number */
+
+        if (mutex_lock_interruptible(&af9015_usb_mutex) < 0)
+                return -EAGAIN;
+
+        buf[0] = req->cmd;
+        buf[1] = seq++;
+        buf[2] = req->i2c_addr;
+        buf[3] = req->addr >> 8;
+        buf[4] = req->addr & 0xff;
+        buf[5] = req->mbox;
+        buf[6] = req->addr_len;
+        buf[7] = req->data_len;
+
+        switch (req->cmd) {
+        case GET_CONFIG:
+        case BOOT:
+        case READ_MEMORY:
+        case RECONNECT_USB:
+        case GET_IR_CODE:
+                write = 0;
+                break;
+        case READ_I2C:
+                write = 0;
+                buf[2] |= 0x01; /* set I2C direction */
+        case WRITE_I2C:
+                buf[0] = READ_WRITE_I2C;
+                break;
+        case WRITE_MEMORY:
+                if (((req->addr & 0xff00) == 0xff00) ||
+                    ((req->addr & 0xae00) == 0xae00))
+                        buf[0] = WRITE_VIRTUAL_MEMORY;
+        case WRITE_VIRTUAL_MEMORY:
+        case COPY_FIRMWARE:
+        case DOWNLOAD_FIRMWARE:
+                break;
+        default:
+                err("unknown command:%d", req->cmd);
+                ret = -1;
+                goto error_unlock;
+        }
+
+        /* write requested */
+        if (write) {
+                memcpy(&buf[8], req->data, req->data_len);
+                msg_len += req->data_len;
+        }
+        deb_xfer(">>> ");
+        debug_dump(buf, msg_len, deb_xfer);
+
+        /* send req */
+        ret = usb_bulk_msg(udev, usb_sndbulkpipe(udev, 0x02), buf, msg_len,
+        &act_len, AF9015_USB_TIMEOUT);
+        if (ret)
+                err("bulk message failed:%d (%d/%d)", ret, msg_len, act_len);
+        else
+                if (act_len != msg_len)
+                        ret = -1; /* all data is not send */
+        if (ret)
+                goto error_unlock;
+
+        /* no ack for those packets */
+        if (req->cmd == DOWNLOAD_FIRMWARE || req->cmd == RECONNECT_USB)
+                goto exit_unlock;
+
+        /* receive ack and data if read req */
+        msg_len = 1 + 1 + req->data_len;  /* seq + status + data len */
+        ret = usb_bulk_msg(udev, usb_rcvbulkpipe(udev, 0x81), buf, msg_len,
+                           &act_len, AF9015_USB_TIMEOUT);
+        if (ret) {
+                err("recv bulk message failed:%d", ret);
+                ret = -1;
+                goto error_unlock;
+        }
+
+        deb_xfer("<<< ");
+        debug_dump(buf, act_len, deb_xfer);
+
+        /* remote controller query status is 1 if remote code is not received */
+        if (req->cmd == GET_IR_CODE && buf[1] == 1) {
+                buf[1] = 0; /* clear command "error" status */
+                memset(&buf[2], 0, req->data_len);
+                buf[3] = 1; /* no remote code received mark */
+        }
+
+        /* check status */
+        if (buf[1]) {
+                err("command failed:%d", buf[1]);
+                ret = -1;
+                goto error_unlock;
+        }
+
+        /* read request, copy returned data to return buf */
+        if (!write)
+                memcpy(req->data, &buf[2], req->data_len);
+
+error_unlock:
+exit_unlock:
+        mutex_unlock(&af9015_usb_mutex);
+
+        return ret;
+}
+
+static int af9015_ctrl_msg(struct dvb_usb_device *d, struct req_t *req)
+{
+        return af9015_rw_udev(d->udev, req);
+}
+
+static int af9015_write_regs(struct dvb_usb_device *d, u16 addr, u8 *val,
+        u8 len)
+{
+        struct req_t req = {WRITE_MEMORY, AF9015_I2C_DEMOD, addr, 0, 0, len,
+                val};
+        return af9015_ctrl_msg(d, &req);
+}
+
+static int af9015_write_reg(struct dvb_usb_device *d, u16 addr, u8 val)
+{
+        return af9015_write_regs(d, addr, &val, 1);
+}
+
+static int af9015_read_reg(struct dvb_usb_device *d, u16 addr, u8 *val)
+{
+        struct req_t req = {READ_MEMORY, AF9015_I2C_DEMOD, addr, 0, 0, 1, val};
+        return af9015_ctrl_msg(d, &req);
+}
+
+static int af9015_write_reg_i2c(struct dvb_usb_device *d, u8 addr, u16 reg,
+        u8 val)
+{
+        struct req_t req = {WRITE_I2C, addr, reg, 1, 1, 1, &val};
+
+        if (addr == af9015_af9013_config[0].demod_address ||
+            addr == af9015_af9013_config[1].demod_address)
+                req.addr_len = 3;
+
+        return af9015_ctrl_msg(d, &req);
+}
+
+static int af9015_read_reg_i2c(struct dvb_usb_device *d, u8 addr, u16 reg,
+        u8 *val)
+{
+        struct req_t req = {READ_I2C, addr, reg, 0, 1, 1, val};
+
+        if (addr == af9015_af9013_config[0].demod_address ||
+            addr == af9015_af9013_config[1].demod_address)
+                req.addr_len = 3;
+
+        return af9015_ctrl_msg(d, &req);
+}
+
+static int af9015_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
+        int num)
+{
+        struct dvb_usb_device *d = i2c_get_adapdata(adap);
+        int ret = 0, i = 0;
+        u16 addr;
+        u8 mbox, addr_len;
+        struct req_t req;
+
+/* TODO: implement bus lock
+
+The bus lock is needed because there is two tuners both using same I2C-address.
+Due to that the only way to select correct tuner is use demodulator I2C-gate.
+
+................................................
+. AF9015 includes integrated AF9013 demodulator.
+. ____________                   ____________  .                ____________
+.|     uC     |                 |   demod    | .               |    tuner   |
+.|------------|                 |------------| .               |------------|
+.|   AF9015   |                 |  AF9013/5  | .               |   MXL5003  |
+.|            |--+----I2C-------|-----/ -----|-.-----I2C-------|            |
+.|            |  |              | addr 0x38  | .               |  addr 0xc6 |
+.|____________|  |              |____________| .               |____________|
+.................|..............................
+                 |               ____________                   ____________
+                 |              |   demod    |                 |    tuner   |
+                 |              |------------|                 |------------|
+                 |              |   AF9013   |                 |   MXL5003  |
+                 +----I2C-------|-----/ -----|-------I2C-------|            |
+                                | addr 0x3a  |                 |  addr 0xc6 |
+                                |____________|                 |____________|
+*/
+        if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
+                return -EAGAIN;
+
+        while (i < num) {
+                if (msg[i].addr == af9015_af9013_config[0].demod_address ||
+                    msg[i].addr == af9015_af9013_config[1].demod_address) {
+                        addr = msg[i].buf[0] << 8;
+                        addr += msg[i].buf[1];
+                        mbox = msg[i].buf[2];
+                        addr_len = 3;
+                } else {
+                        addr = msg[i].buf[0];
+                        addr_len = 1;
+                        mbox = 0;
+                }
+
+                if (num > i + 1 && (msg[i+1].flags & I2C_M_RD)) {
+                        if (msg[i].addr ==
+                                af9015_af9013_config[0].demod_address)
+                                req.cmd = READ_MEMORY;
+                        else
+                                req.cmd = READ_I2C;
+                        req.i2c_addr = msg[i].addr;
+                        req.addr = addr;
+                        req.mbox = mbox;
+                        req.addr_len = addr_len;
+                        req.data_len = msg[i+1].len;
+                        req.data = &msg[i+1].buf[0];
+                        ret = af9015_ctrl_msg(d, &req);
+                        i += 2;
+                } else {
+                        if (msg[i].addr ==
+                                af9015_af9013_config[0].demod_address)
+                                req.cmd = WRITE_MEMORY;
+                        else
+                                req.cmd = WRITE_I2C;
+                        req.i2c_addr = msg[i].addr;
+                        req.addr = addr;
+                        req.mbox = mbox;
+                        req.addr_len = addr_len;
+                        req.data_len = msg[i].len-addr_len;
+                        req.data = &msg[i].buf[addr_len];
+                        ret = af9015_ctrl_msg(d, &req);
+                        i += 1;
+                }
+                if (ret)
+                        goto error;
+
+        }
+        ret = i;
+
+error:
+        mutex_unlock(&d->i2c_mutex);
+
+        return ret;
+}
+
+static u32 af9015_i2c_func(struct i2c_adapter *adapter)
+{
+        return I2C_FUNC_I2C;
+}
+
+static struct i2c_algorithm af9015_i2c_algo = {
+        .master_xfer = af9015_i2c_xfer,
+        .functionality = af9015_i2c_func,
+};
+
+static int af9015_do_reg_bit(struct dvb_usb_device *d, u16 addr, u8 bit, u8 op)
+{
+        int ret;
+        u8 val, mask = 0x01;
+
+        ret = af9015_read_reg(d, addr, &val);
+        if (ret)
+                return ret;
+
+        mask <<= bit;
+        if (op) {
+                /* set bit */
+                val |= mask;
+        } else {
+                /* clear bit */
+                mask ^= 0xff;
+                val &= mask;
+        }
+
+        return af9015_write_reg(d, addr, val);
+}
+
+static int af9015_set_reg_bit(struct dvb_usb_device *d, u16 addr, u8 bit)
+{
+        return af9015_do_reg_bit(d, addr, bit, 1);
+}
+
+static int af9015_clear_reg_bit(struct dvb_usb_device *d, u16 addr, u8 bit)
+{
+        return af9015_do_reg_bit(d, addr, bit, 0);
+}
+
+static int af9015_init_endpoint(struct dvb_usb_device *d)
+{
+        int ret;
+        u16 frame_size;
+        u8  packet_size;
+        deb_info("%s: USB speed:%d\n", __func__, d->udev->speed);
+
+#define TS_PACKET_SIZE            188
+
+#define TS_USB20_PACKET_COUNT     348
+#define TS_USB20_FRAME_SIZE       (TS_PACKET_SIZE*TS_USB20_PACKET_COUNT)
+
+#define TS_USB11_PACKET_COUNT      21
+#define TS_USB11_FRAME_SIZE       (TS_PACKET_SIZE*TS_USB11_PACKET_COUNT)
+
+#define TS_USB20_MAX_PACKET_SIZE  512
+#define TS_USB11_MAX_PACKET_SIZE   64
+
+        if (d->udev->speed == USB_SPEED_FULL) {
+                frame_size = TS_USB11_FRAME_SIZE/4;
+                packet_size = TS_USB11_MAX_PACKET_SIZE/4;
+        } else {
+                frame_size = TS_USB20_FRAME_SIZE/4;
+                packet_size = TS_USB20_MAX_PACKET_SIZE/4;
+        }
+
+        ret = af9015_set_reg_bit(d, 0xd507, 2); /* assert EP4 reset */
+        if (ret)
+                goto error;
+        ret = af9015_set_reg_bit(d, 0xd50b, 1); /* assert EP5 reset */
+        if (ret)
+                goto error;
+        ret = af9015_clear_reg_bit(d, 0xdd11, 5); /* disable EP4 */
+        if (ret)
+                goto error;
+        ret = af9015_clear_reg_bit(d, 0xdd11, 6); /* disable EP5 */
+        if (ret)
+                goto error;
+        ret = af9015_set_reg_bit(d, 0xdd11, 5); /* enable EP4 */
+        if (ret)
+                goto error;
+        if (af9015_config.dual_mode) {
+                ret = af9015_set_reg_bit(d, 0xdd11, 6); /* enable EP5 */
+                if (ret)
+                        goto error;
+        }
+        ret = af9015_clear_reg_bit(d, 0xdd13, 5); /* disable EP4 NAK */
+        if (ret)
+                goto error;
+        if (af9015_config.dual_mode) {
+                ret = af9015_clear_reg_bit(d, 0xdd13, 6); /* disable EP5 NAK */
+                if (ret)
+                        goto error;
+        }
+        /* EP4 xfer length */
+        ret = af9015_write_reg(d, 0xdd88, frame_size & 0xff);
+        if (ret)
+                goto error;
+        ret = af9015_write_reg(d, 0xdd89, frame_size >> 8);
+        if (ret)
+                goto error;
+        /* EP5 xfer length */
+        ret = af9015_write_reg(d, 0xdd8a, frame_size & 0xff);
+        if (ret)
+                goto error;
+        ret = af9015_write_reg(d, 0xdd8b, frame_size >> 8);
+        if (ret)
+                goto error;
+        ret = af9015_write_reg(d, 0xdd0c, packet_size); /* EP4 packet size */
+        if (ret)
+                goto error;
+        ret = af9015_write_reg(d, 0xdd0d, packet_size); /* EP5 packet size */
+        if (ret)
+                goto error;
+        ret = af9015_clear_reg_bit(d, 0xd507, 2); /* negate EP4 reset */
+        if (ret)
+                goto error;
+        if (af9015_config.dual_mode) {
+                ret = af9015_clear_reg_bit(d, 0xd50b, 1); /* negate EP5 reset */
+                if (ret)
+                        goto error;
+        }
+
+        /* enable / disable mp2if2 */
+        if (af9015_config.dual_mode)
+                ret = af9015_set_reg_bit(d, 0xd50b, 0);
+        else
+                ret = af9015_clear_reg_bit(d, 0xd50b, 0);
+error:
+        if (ret)
+                err("endpoint init failed:%d", ret);
+        return ret;
+}
+
+static int af9015_copy_firmware(struct dvb_usb_device *d)
+{
+        int ret;
+        u8 fw_params[4];
+        u8 val, i;
+        struct req_t req = {COPY_FIRMWARE, 0, 0x5100, 0, 0, sizeof(fw_params),
+                fw_params };
+        deb_info("%s:\n", __func__);
+
+        fw_params[0] = af9015_config.firmware_size >> 8;
+        fw_params[1] = af9015_config.firmware_size & 0xff;
+        fw_params[2] = af9015_config.firmware_checksum >> 8;
+        fw_params[3] = af9015_config.firmware_checksum & 0xff;
+
+        /* wait 2nd demodulator ready */
+        msleep(100);
+
+        ret = af9015_read_reg_i2c(d, 0x3a, 0x98be, &val);
+        if (ret)
+                goto error;
+        else
+                deb_info("%s: firmware status:%02x\n", __func__, val);
+
+        if (val == 0x0c) /* fw is running, no need for download */
+                goto exit;
+
+        /* set I2C master clock to fast (to speed up firmware copy) */
+        ret = af9015_write_reg(d, 0xd416, 0x04); /* 0x04 * 400ns */
+        if (ret)
+                goto error;
+
+        msleep(50);
+
+        /* copy firmware */
+        ret = af9015_ctrl_msg(d, &req);
+        if (ret)
+                err("firmware copy cmd failed:%d", ret);
+        deb_info("%s: firmware copy done\n", __func__);
+
+        /* set I2C master clock back to normal */
+        ret = af9015_write_reg(d, 0xd416, 0x14); /* 0x14 * 400ns */
+        if (ret)
+                goto error;
+
+        /* request boot firmware */
+        ret = af9015_write_reg_i2c(d, af9015_af9013_config[1].demod_address,
+                0xe205, 1);
+        deb_info("%s: firmware boot cmd status:%d\n", __func__, ret);
+        if (ret)
+                goto error;
+
+        for (i = 0; i < 15; i++) {
+                msleep(100);
+
+                /* check firmware status */
+                ret = af9015_read_reg_i2c(d,
+                        af9015_af9013_config[1].demod_address, 0x98be, &val);
+                deb_info("%s: firmware status cmd status:%d fw status:%02x\n",
+                        __func__, ret, val);
+                if (ret)
+                        goto error;
+
+                if (val == 0x0c || val == 0x04) /* success or fail */
+                        break;
+        }
+
+        if (val == 0x04) {
+                err("firmware did not run");
+                ret = -1;
+        } else if (val != 0x0c) {
+                err("firmware boot timeout");
+                ret = -1;
+        }
+
+error:
+exit:
+        return ret;
+}
+
+/* dump eeprom */
+static int af9015_eeprom_dump(struct dvb_usb_device *d)
+{
+        char buf[52], buf2[4];
+        u8 reg, val;
+
+        for (reg = 0; ; reg++) {
+                if (reg % 16 == 0) {
+                        if (reg)
+                                deb_info("%s\n", buf);
+                        sprintf(buf, "%02x: ", reg);
+                }
+                if (af9015_read_reg_i2c(d, AF9015_I2C_EEPROM, reg, &val) == 0)
+                        sprintf(buf2, "%02x ", val);
+                else
+                        strcpy(buf2, "-- ");
+                strcat(buf, buf2);
+                if (reg == 0xff)
+                        break;
+        }
+        deb_info("%s\n", buf);
+        return 0;
+}
+
+int af9015_download_ir_table(struct dvb_usb_device *d)
+{
+        int i, packets = 0, ret;
+        u16 addr = 0x9a56; /* ir-table start address */
+        struct req_t req = {WRITE_MEMORY, 0, 0, 0, 0, 1, NULL};
+        u8 *data = NULL;
+        deb_info("%s:\n", __func__);
+
+        data = af9015_config.ir_table;
+        packets = af9015_config.ir_table_size;
+
+        /* no remote */
+        if (!packets)
+                goto exit;
+
+        /* load remote ir-table */
+        for (i = 0; i < packets; i++) {
+                req.addr = addr + i;
+                req.data = &data[i];
+                ret = af9015_ctrl_msg(d, &req);
+                if (ret) {
+                        err("ir-table download failed at packet %d with " \
+                                "code %d", i, ret);
+                        return ret;
+                }
+        }
+
+exit:
+        return 0;
+}
+
+static int af9015_init(struct dvb_usb_device *d)
+{
+        int ret;
+        deb_info("%s:\n", __func__);
+
+        ret = af9015_init_endpoint(d);
+        if (ret)
+                goto error;
+
+        ret = af9015_download_ir_table(d);
+        if (ret)
+                goto error;
+
+error:
+        return ret;
+}
+
+static int af9015_pid_filter_ctrl(struct dvb_usb_adapter *adap, int onoff)
+{
+        int ret;
+        deb_info("%s: onoff:%d\n", __func__, onoff);
+
+        if (onoff)
+                ret = af9015_set_reg_bit(adap->dev, 0xd503, 0);
+        else
+                ret = af9015_clear_reg_bit(adap->dev, 0xd503, 0);
+
+        return ret;
+}
+
+static int af9015_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid,
+        int onoff)
+{
+        int ret;
+        u8 idx;
+
+        deb_info("%s: set pid filter, index %d, pid %x, onoff %d\n",
+                __func__, index, pid, onoff);
+
+        ret = af9015_write_reg(adap->dev, 0xd505, (pid & 0xff));
+        if (ret)
+                goto error;
+
+        ret = af9015_write_reg(adap->dev, 0xd506, (pid >> 8));
+        if (ret)
+                goto error;
+
+        idx = ((index & 0x1f) | (1 << 5));
+        ret = af9015_write_reg(adap->dev, 0xd504, idx);
+
+error:
+        return ret;
+}
+
+static int af9015_download_firmware(struct usb_device *udev,
+        const struct firmware *fw)
+{
+        int i, len, packets, remainder, ret;
+        struct req_t req = {DOWNLOAD_FIRMWARE, 0, 0, 0, 0, 0, NULL};
+        u16 addr = 0x5100; /* firmware start address */
+        u16 checksum = 0;
+
+        deb_info("%s:\n", __func__);
+
+        /* calc checksum */
+        for (i = 0; i < fw->size; i++)
+                checksum += fw->data[i];
+
+        af9015_config.firmware_size = fw->size;
+        af9015_config.firmware_checksum = checksum;
+
+        #define FW_PACKET_MAX_DATA  55
+
+        packets = fw->size / FW_PACKET_MAX_DATA;
+        remainder = fw->size % FW_PACKET_MAX_DATA;
+        len = FW_PACKET_MAX_DATA;
+        for (i = 0; i <= packets; i++) {
+                if (i == packets)  /* set size of the last packet */
+                        len = remainder;
+
+                req.data_len = len;
+                req.data = (u8 *)(fw->data + i * FW_PACKET_MAX_DATA);
+                req.addr = addr;
+                addr += FW_PACKET_MAX_DATA;
+
+                ret = af9015_rw_udev(udev, &req);
+                if (ret) {
+                        err("firmware download failed at packet %d with " \
+                                "code %d", i, ret);
+                        goto error;
+                }
+        }
+
+        /* firmware loaded, request boot */
+        req.cmd = BOOT;
+        ret = af9015_rw_udev(udev, &req);
+        if (ret) {
+                err("firmware boot failed:%d", ret);
+                goto error;
+        }
+
+        /* firmware is running, reconnect device in the usb bus */
+        req.cmd = RECONNECT_USB;
+        ret = af9015_rw_udev(udev, &req);
+        if (ret)
+                err("reconnect failed: %d", ret);
+
+error:
+        return ret;
+}
+
+static int af9015_read_config(struct usb_device *udev)
+{
+        int ret;
+        u8 val, i, offset = 0;
+        struct req_t req = {READ_I2C, AF9015_I2C_EEPROM, 0, 0, 1, 1, &val};
+        char manufacturer[10];
+
+        /* IR remote controller */
+        req.addr = AF9015_EEPROM_IR_MODE;
+        ret = af9015_rw_udev(udev, &req);
+        if (ret)
+                goto error;
+        deb_info("%s: IR mode:%d\n", __func__, val);
+        for (i = 0; i < af9015_properties_count; i++) {
+                if (val == AF9015_IR_MODE_DISABLED || val == 0x04) {
+                        af9015_properties[i].rc_key_map = NULL;
+                        af9015_properties[i].rc_key_map_size  = 0;
+                } else if (dvb_usb_af9015_remote) {
+                        /* load remote defined as module param */
+                        switch (dvb_usb_af9015_remote) {
+                        case AF9015_REMOTE_A_LINK_DTU_M:
+                                af9015_properties[i].rc_key_map =
+                                  af9015_rc_keys_a_link;
+                                af9015_properties[i].rc_key_map_size =
+                                  ARRAY_SIZE(af9015_rc_keys_a_link);
+                                af9015_config.ir_table = af9015_ir_table_a_link;
+                                af9015_config.ir_table_size =
+                                  ARRAY_SIZE(af9015_ir_table_a_link);
+                                break;
+                        case AF9015_REMOTE_MSI_DIGIVOX_MINI_II_V3:
+                                af9015_properties[i].rc_key_map =
+                                  af9015_rc_keys_msi;
+                                af9015_properties[i].rc_key_map_size =
+                                  ARRAY_SIZE(af9015_rc_keys_msi);
+                                af9015_config.ir_table = af9015_ir_table_msi;
+                                af9015_config.ir_table_size =
+                                  ARRAY_SIZE(af9015_ir_table_msi);
+                                break;
+                        case AF9015_REMOTE_MYGICTV_U718:
+                                af9015_properties[i].rc_key_map =
+                                  af9015_rc_keys_mygictv;
+                                af9015_properties[i].rc_key_map_size =
+                                  ARRAY_SIZE(af9015_rc_keys_mygictv);
+                                af9015_config.ir_table =
+                                  af9015_ir_table_mygictv;
+                                af9015_config.ir_table_size =
+                                  ARRAY_SIZE(af9015_ir_table_mygictv);
+                                break;
+                        }
+                } else {
+                        switch (udev->descriptor.idVendor) {
+                        case USB_VID_LEADTEK:
+                                af9015_properties[i].rc_key_map =
+                                  af9015_rc_keys_leadtek;
+                                af9015_properties[i].rc_key_map_size =
+                                  ARRAY_SIZE(af9015_rc_keys_leadtek);
+                                af9015_config.ir_table =
+                                  af9015_ir_table_leadtek;
+                                af9015_config.ir_table_size =
+                                  ARRAY_SIZE(af9015_ir_table_leadtek);
+                                break;
+                        case USB_VID_VISIONPLUS:
+                                if (udev->descriptor.idProduct ==
+                                USB_PID_AZUREWAVE_AD_TU700) {
+                                        af9015_properties[i].rc_key_map =
+                                          af9015_rc_keys_twinhan;
+                                        af9015_properties[i].rc_key_map_size =
+                                          ARRAY_SIZE(af9015_rc_keys_twinhan);
+                                        af9015_config.ir_table =
+                                          af9015_ir_table_twinhan;
+                                        af9015_config.ir_table_size =
+                                          ARRAY_SIZE(af9015_ir_table_twinhan);
+                                }
+                                break;
+                        case USB_VID_KWORLD_2:
+                                /* TODO: use correct rc keys */
+                                af9015_properties[i].rc_key_map =
+                                  af9015_rc_keys_twinhan;
+                                af9015_properties[i].rc_key_map_size =
+                                  ARRAY_SIZE(af9015_rc_keys_twinhan);
+                                af9015_config.ir_table = af9015_ir_table_kworld;
+                                af9015_config.ir_table_size =
+                                  ARRAY_SIZE(af9015_ir_table_kworld);
+                                break;
+                        /* Check USB manufacturer and product strings and try
+                           to determine correct remote in case of chip vendor
+                           reference IDs are used. */
+                        case USB_VID_AFATECH:
+                                memset(manufacturer, 0, sizeof(manufacturer));
+                                usb_string(udev, udev->descriptor.iManufacturer,
+                                        manufacturer, sizeof(manufacturer));
+                                if (!strcmp("Geniatech", manufacturer)) {
+                                        /* iManufacturer 1 Geniatech
+                                           iProduct      2 AF9015 */
+                                        af9015_properties[i].rc_key_map =
+                                          af9015_rc_keys_mygictv;
+                                        af9015_properties[i].rc_key_map_size =
+                                          ARRAY_SIZE(af9015_rc_keys_mygictv);
+                                        af9015_config.ir_table =
+                                          af9015_ir_table_mygictv;
+                                        af9015_config.ir_table_size =
+                                          ARRAY_SIZE(af9015_ir_table_mygictv);
+                                } else if (!strcmp("MSI", manufacturer)) {
+                                        /* iManufacturer 1 MSI
+                                           iProduct      2 MSI K-VOX */
+                                        af9015_properties[i].rc_key_map =
+                                          af9015_rc_keys_msi;
+                                        af9015_properties[i].rc_key_map_size =
+                                          ARRAY_SIZE(af9015_rc_keys_msi);
+                                        af9015_config.ir_table =
+                                          af9015_ir_table_msi;
+                                        af9015_config.ir_table_size =
+                                          ARRAY_SIZE(af9015_ir_table_msi);
+                                }
+                                break;
+                        }
+                }
+        }
+
+        /* TS mode - one or two receivers */
+        req.addr = AF9015_EEPROM_TS_MODE;
+        ret = af9015_rw_udev(udev, &req);
+        if (ret)
+                goto error;
+        af9015_config.dual_mode = val;
+        deb_info("%s: TS mode:%d\n", __func__, af9015_config.dual_mode);
+        /* disable dual mode by default because it is buggy */
+        if (!dvb_usb_af9015_dual_mode)
+                af9015_config.dual_mode = 0;
+
+        /* set buffer size according to USB port speed */
+        for (i = 0; i < af9015_properties_count; i++) {
+                /* USB1.1 set smaller buffersize and disable 2nd adapter */
+                if (udev->speed == USB_SPEED_FULL) {
+                        af9015_properties[i].adapter->stream.u.bulk.buffersize =
+                                TS_USB11_MAX_PACKET_SIZE;
+                        /* disable 2nd adapter because we don't have
+                           PID-filters */
+                        af9015_config.dual_mode = 0;
+                } else {
+                        af9015_properties[i].adapter->stream.u.bulk.buffersize =
+                                TS_USB20_MAX_PACKET_SIZE;
+                }
+        }
+
+        if (af9015_config.dual_mode) {
+                /* read 2nd demodulator I2C address */
+                req.addr = AF9015_EEPROM_DEMOD2_I2C;
+                ret = af9015_rw_udev(udev, &req);
+                if (ret)
+                        goto error;
+                af9015_af9013_config[1].demod_address = val;
+
+                /* enable 2nd adapter */
+                for (i = 0; i < af9015_properties_count; i++)
+                        af9015_properties[i].num_adapters = 2;
+
+        } else {
+                 /* disable 2nd adapter */
+                for (i = 0; i < af9015_properties_count; i++)
+                        af9015_properties[i].num_adapters = 1;
+        }
+
+        for (i = 0; i < af9015_properties[0].num_adapters; i++) {
+                if (i == 1)
+                        offset = AF9015_EEPROM_OFFSET;
+                /* xtal */
+                req.addr = AF9015_EEPROM_XTAL_TYPE1 + offset;
+                ret = af9015_rw_udev(udev, &req);
+                if (ret)
+                        goto error;
+                switch (val) {
+                case 0:
+                        af9015_af9013_config[i].adc_clock = 28800;
+                        break;
+                case 1:
+                        af9015_af9013_config[i].adc_clock = 20480;
+                        break;
+                case 2:
+                        af9015_af9013_config[i].adc_clock = 28000;
+                        break;
+                case 3:
+                        af9015_af9013_config[i].adc_clock = 25000;
+                        break;
+                };
+                deb_info("%s: [%d] xtal:%d set adc_clock:%d\n", __func__, i,
+                        val, af9015_af9013_config[i].adc_clock);
+
+                /* tuner IF */
+                req.addr = AF9015_EEPROM_IF1H + offset;
+                ret = af9015_rw_udev(udev, &req);
+                if (ret)
+                        goto error;
+                af9015_af9013_config[i].tuner_if = val << 8;
+                req.addr = AF9015_EEPROM_IF1L + offset;
+                ret = af9015_rw_udev(udev, &req);
+                if (ret)
+                        goto error;
+                af9015_af9013_config[i].tuner_if += val;
+                deb_info("%s: [%d] IF1:%d\n", __func__, i,
+                        af9015_af9013_config[0].tuner_if);
+
+                /* MT2060 IF1 */
+                req.addr = AF9015_EEPROM_MT2060_IF1H  + offset;
+                ret = af9015_rw_udev(udev, &req);
+                if (ret)
+                        goto error;
+                af9015_config.mt2060_if1[i] = val << 8;
+                req.addr = AF9015_EEPROM_MT2060_IF1L + offset;
+                ret = af9015_rw_udev(udev, &req);
+                if (ret)
+                        goto error;
+                af9015_config.mt2060_if1[i] += val;
+                deb_info("%s: [%d] MT2060 IF1:%d\n", __func__, i,
+                        af9015_config.mt2060_if1[i]);
+
+                /* tuner */
+                req.addr =  AF9015_EEPROM_TUNER_ID1 + offset;
+                ret = af9015_rw_udev(udev, &req);
+                if (ret)
+                        goto error;
+                switch (val) {
+                case AF9013_TUNER_ENV77H11D5:
+                case AF9013_TUNER_MT2060:
+                case AF9013_TUNER_MC44S803:
+                case AF9013_TUNER_QT1010:
+                case AF9013_TUNER_UNKNOWN:
+                case AF9013_TUNER_MT2060_2:
+                case AF9013_TUNER_TDA18271:
+                case AF9013_TUNER_QT1010A:
+                        af9015_af9013_config[i].rf_spec_inv = 1;
+                        break;
+                case AF9013_TUNER_MXL5003D:
+                case AF9013_TUNER_MXL5005D:
+                case AF9013_TUNER_MXL5005R:
+                        af9015_af9013_config[i].rf_spec_inv = 0;
+                        break;
+                default:
+                        warn("tuner id:%d not supported, please report!", val);
+                        return -ENODEV;
+                };
+
+                af9015_af9013_config[i].tuner = val;
+                deb_info("%s: [%d] tuner id:%d\n", __func__, i, val);
+        }
+
+error:
+        if (ret)
+                err("eeprom read failed:%d", ret);
+
+        return ret;
+}
+
+static int af9015_identify_state(struct usb_device *udev,
+                                 struct dvb_usb_device_properties *props,
+                                 struct dvb_usb_device_description **desc,
+                                 int *cold)
+{
+        int ret;
+        u8 reply;
+        struct req_t req = {GET_CONFIG, 0, 0, 0, 0, 1, &reply};
+
+        ret = af9015_rw_udev(udev, &req);
+        if (ret)
+                return ret;
+
+        deb_info("%s: reply:%02x\n", __func__, reply);
+        if (reply == 0x02)
+                *cold = 0;
+        else
+                *cold = 1;
+
+        return ret;
+}
+
+static int af9015_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+{
+        u8 buf[8];
+        struct req_t req = {GET_IR_CODE, 0, 0, 0, 0, sizeof(buf), buf};
+        struct dvb_usb_rc_key *keymap = d->props.rc_key_map;
+        int i, ret;
+
+        memset(buf, 0, sizeof(buf));
+
+        ret = af9015_ctrl_msg(d, &req);
+        if (ret)
+                return ret;
+
+        *event = 0;
+        *state = REMOTE_NO_KEY_PRESSED;
+
+        for (i = 0; i < d->props.rc_key_map_size; i++) {
+                if (!buf[1] && keymap[i].custom == buf[0] &&
+                    keymap[i].data == buf[2]) {
+                        *event = keymap[i].event;
+                        *state = REMOTE_KEY_PRESSED;
+                        break;
+                }
+        }
+        if (!buf[1])
+                deb_rc("%s: %02x %02x %02x %02x %02x %02x %02x %02x\n",
+                        __func__, buf[0], buf[1], buf[2], buf[3], buf[4],
+                        buf[5], buf[6], buf[7]);
+
+        return 0;
+}
+
+/* init 2nd I2C adapter */
+int af9015_i2c_init(struct dvb_usb_device *d)
+{
+        int ret;
+        struct af9015_state *state = d->priv;
+        deb_info("%s:\n", __func__);
+
+        strncpy(state->i2c_adap.name, d->desc->name,
+                sizeof(state->i2c_adap.name));
+#ifdef I2C_ADAP_CLASS_TV_DIGITAL
+        state->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL,
+#else
+        state->i2c_adap.class = I2C_CLASS_TV_DIGITAL,
+#endif
+        state->i2c_adap.algo      = d->props.i2c_algo;
+        state->i2c_adap.algo_data = NULL;
+        state->i2c_adap.dev.parent = &d->udev->dev;
+
+        i2c_set_adapdata(&state->i2c_adap, d);
+
+        ret = i2c_add_adapter(&state->i2c_adap);
+        if (ret < 0)
+                err("could not add i2c adapter");
+
+        return ret;
+}
+
+static int af9015_af9013_frontend_attach(struct dvb_usb_adapter *adap)
+{
+        int ret;
+        struct af9015_state *state = adap->dev->priv;
+        struct i2c_adapter *i2c_adap;
+
+        if (adap->id == 0) {
+                /* select I2C adapter */
+                i2c_adap = &adap->dev->i2c_adap;
+
+                deb_info("%s: init I2C\n", __func__);
+                ret = af9015_i2c_init(adap->dev);
+
+                /* dump eeprom (debug) */
+                ret = af9015_eeprom_dump(adap->dev);
+                if (ret)
+                        return ret;
+        } else {
+                /* select I2C adapter */
+                i2c_adap = &state->i2c_adap;
+
+                /* copy firmware to 2nd demodulator */
+                if (af9015_config.dual_mode) {
+                        ret = af9015_copy_firmware(adap->dev);
+                        if (ret) {
+                                err("firmware copy to 2nd frontend " \
+                                        "failed, will disable it");
+                                af9015_config.dual_mode = 0;
+                                return -ENODEV;
+                        }
+                } else {
+                        return -ENODEV;
+                }
+        }
+
+        /* attach demodulator */
+        adap->fe = dvb_attach(af9013_attach, &af9015_af9013_config[adap->id],
+                i2c_adap);
+
+        return adap->fe == NULL ? -ENODEV : 0;
+}
+
+static struct mt2060_config af9015_mt2060_config = {
+        .i2c_address = 0xc0,
+        .clock_out = 0,
+};
+
+static struct qt1010_config af9015_qt1010_config = {
+        .i2c_address = 0xc4,
+};
+
+static struct tda18271_config af9015_tda18271_config = {
+        .gate = TDA18271_GATE_DIGITAL,
+        .small_i2c = 1,
+};
+
+static struct mxl5005s_config af9015_mxl5003_config = {
+        .i2c_address     = 0xc6,
+        .if_freq         = IF_FREQ_4570000HZ,
+        .xtal_freq       = CRYSTAL_FREQ_16000000HZ,
+        .agc_mode        = MXL_SINGLE_AGC,
+        .tracking_filter = MXL_TF_DEFAULT,
+        .rssi_enable     = MXL_RSSI_ENABLE,
+        .cap_select      = MXL_CAP_SEL_ENABLE,
+        .div_out         = MXL_DIV_OUT_4,
+        .clock_out       = MXL_CLOCK_OUT_DISABLE,
+        .output_load     = MXL5005S_IF_OUTPUT_LOAD_200_OHM,
+        .top             = MXL5005S_TOP_25P2,
+        .mod_mode        = MXL_DIGITAL_MODE,
+        .if_mode         = MXL_ZERO_IF,
+        .AgcMasterByte   = 0x00,
+};
+
+static struct mxl5005s_config af9015_mxl5005_config = {
+        .i2c_address     = 0xc6,
+        .if_freq         = IF_FREQ_4570000HZ,
+        .xtal_freq       = CRYSTAL_FREQ_16000000HZ,
+        .agc_mode        = MXL_SINGLE_AGC,
+        .tracking_filter = MXL_TF_OFF,
+        .rssi_enable     = MXL_RSSI_ENABLE,
+        .cap_select      = MXL_CAP_SEL_ENABLE,
+        .div_out         = MXL_DIV_OUT_4,
+        .clock_out       = MXL_CLOCK_OUT_DISABLE,
+        .output_load     = MXL5005S_IF_OUTPUT_LOAD_200_OHM,
+        .top             = MXL5005S_TOP_25P2,
+        .mod_mode        = MXL_DIGITAL_MODE,
+        .if_mode         = MXL_ZERO_IF,
+        .AgcMasterByte   = 0x00,
+};
+
+static int af9015_tuner_attach(struct dvb_usb_adapter *adap)
+{
+        struct af9015_state *state = adap->dev->priv;
+        struct i2c_adapter *i2c_adap;
+        int ret;
+        deb_info("%s: \n", __func__);
+
+        /* select I2C adapter */
+        if (adap->id == 0)
+                i2c_adap = &adap->dev->i2c_adap;
+        else
+                i2c_adap = &state->i2c_adap;
+
+        switch (af9015_af9013_config[adap->id].tuner) {
+        case AF9013_TUNER_MT2060:
+        case AF9013_TUNER_MT2060_2:
+                ret = dvb_attach(mt2060_attach, adap->fe, i2c_adap,
+                        &af9015_mt2060_config,
+                        af9015_config.mt2060_if1[adap->id])
+                        == NULL ? -ENODEV : 0;
+                break;
+        case AF9013_TUNER_QT1010:
+        case AF9013_TUNER_QT1010A:
+                ret = dvb_attach(qt1010_attach, adap->fe, i2c_adap,
+                        &af9015_qt1010_config) == NULL ? -ENODEV : 0;
+                break;
+        case AF9013_TUNER_TDA18271:
+                ret = dvb_attach(tda18271_attach, adap->fe, 0xc0, i2c_adap,
+                        &af9015_tda18271_config) == NULL ? -ENODEV : 0;
+                break;
+        case AF9013_TUNER_MXL5003D:
+                ret = dvb_attach(mxl5005s_attach, adap->fe, i2c_adap,
+                        &af9015_mxl5003_config) == NULL ? -ENODEV : 0;
+                break;
+        case AF9013_TUNER_MXL5005D:
+        case AF9013_TUNER_MXL5005R:
+                ret = dvb_attach(mxl5005s_attach, adap->fe, i2c_adap,
+                        &af9015_mxl5005_config) == NULL ? -ENODEV : 0;
+                break;
+        case AF9013_TUNER_ENV77H11D5:
+                ret = dvb_attach(dvb_pll_attach, adap->fe, 0xc0, i2c_adap,
+                        DVB_PLL_TDA665X) == NULL ? -ENODEV : 0;
+                break;
+        case AF9013_TUNER_MC44S803:
+#if 0
+                ret = dvb_attach(mc44s80x_attach, adap->fe, i2c_adap)
+                        == NULL ? -ENODEV : 0;
+#else
+                ret = -ENODEV;
+                info("Freescale MC44S803 tuner found but no driver for that" \
+                        "tuner. Look at the Linuxtv.org for tuner driver" \
+                        "status.");
+#endif
+                break;
+        case AF9013_TUNER_UNKNOWN:
+        default:
+                ret = -ENODEV;
+                err("Unknown tuner id:%d",
+                        af9015_af9013_config[adap->id].tuner);
+        }
+        return ret;
+}
+
+static struct usb_device_id af9015_usb_table[] = {
+/*  0 */{USB_DEVICE(USB_VID_AFATECH,   USB_PID_AFATECH_AF9015_9015)},
+        {USB_DEVICE(USB_VID_AFATECH,   USB_PID_AFATECH_AF9015_9016)},
+        {USB_DEVICE(USB_VID_LEADTEK,   USB_PID_WINFAST_DTV_DONGLE_GOLD)},
+        {USB_DEVICE(USB_VID_PINNACLE,  USB_PID_PINNACLE_PCTV71E)},
+        {USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_KWORLD_399U)},
+/*  5 */{USB_DEVICE(USB_VID_VISIONPLUS,
+                USB_PID_TINYTWIN)},
+        {USB_DEVICE(USB_VID_VISIONPLUS,
+                USB_PID_AZUREWAVE_AD_TU700)},
+        {USB_DEVICE(USB_VID_TERRATEC,  USB_PID_TERRATEC_CINERGY_T_USB_XE_REV2)},
+        {USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_KWORLD_PC160_2T)},
+        {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_X)},
+/* 10 */{USB_DEVICE(USB_VID_XTENSIONS, USB_PID_XTENSIONS_XD_380)},
+        {USB_DEVICE(USB_VID_MSI_2,     USB_PID_MSI_DIGIVOX_DUO)},
+        {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_X_2)},
+        {USB_DEVICE(USB_VID_TELESTAR,  USB_PID_TELESTAR_STARSTICK_2)},
+        {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A309)},
+/* 15 */{USB_DEVICE(USB_VID_MSI_2,     USB_PID_MSI_DIGI_VOX_MINI_III)},
+        {0},
+};
+MODULE_DEVICE_TABLE(usb, af9015_usb_table);
+
+static struct dvb_usb_device_properties af9015_properties[] = {
+        {
+                .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+
+                .usb_ctrl = DEVICE_SPECIFIC,
+                .download_firmware = af9015_download_firmware,
+                .firmware = "dvb-usb-af9015.fw",
+
+                .size_of_priv = sizeof(struct af9015_state), \
+
+                .num_adapters = 2,
+                .adapter = {
+                        {
+                                .caps = DVB_USB_ADAP_HAS_PID_FILTER |
+                                DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
+
+                                .pid_filter_count = 32,
+                                .pid_filter       = af9015_pid_filter,
+                                .pid_filter_ctrl  = af9015_pid_filter_ctrl,
+
+                                .frontend_attach =
+                                        af9015_af9013_frontend_attach,
+                                .tuner_attach    = af9015_tuner_attach,
+                                .stream = {
+                                        .type = USB_BULK,
+                                        .count = 6,
+                                        .endpoint = 0x84,
+                                },
+                        },
+                        {
+                                .frontend_attach =
+                                        af9015_af9013_frontend_attach,
+                                .tuner_attach    = af9015_tuner_attach,
+                                .stream = {
+                                        .type = USB_BULK,
+                                        .count = 6,
+                                        .endpoint = 0x85,
+                                },
+                        }
+                },
+
+                .identify_state = af9015_identify_state,
+
+                .rc_query         = af9015_rc_query,
+                .rc_interval      = 150,
+
+                .i2c_algo = &af9015_i2c_algo,
+
+                .num_device_descs = 9,
+                .devices = {
+                        {
+                                .name = "Afatech AF9015 DVB-T USB2.0 stick",
+                                .cold_ids = {&af9015_usb_table[0],
+                                             &af9015_usb_table[1], NULL},
+                                .warm_ids = {NULL},
+                        },
+                        {
+                                .name = "Leadtek WinFast DTV Dongle Gold",
+                                .cold_ids = {&af9015_usb_table[2], NULL},
+                                .warm_ids = {NULL},
+                        },
+                        {
+                                .name = "Pinnacle PCTV 71e",
+                                .cold_ids = {&af9015_usb_table[3], NULL},
+                                .warm_ids = {NULL},
+                        },
+                        {
+                                .name = "KWorld PlusTV Dual DVB-T Stick " \
+                                        "(DVB-T 399U)",
+                                .cold_ids = {&af9015_usb_table[4], NULL},
+                                .warm_ids = {NULL},
+                        },
+                        {
+                                .name = "DigitalNow TinyTwin DVB-T Receiver",
+                                .cold_ids = {&af9015_usb_table[5], NULL},
+                                .warm_ids = {NULL},
+                        },
+                        {
+                                .name = "TwinHan AzureWave AD-TU700(704J)",
+                                .cold_ids = {&af9015_usb_table[6], NULL},
+                                .warm_ids = {NULL},
+                        },
+                        {
+                                .name = "TerraTec Cinergy T USB XE",
+                                .cold_ids = {&af9015_usb_table[7], NULL},
+                                .warm_ids = {NULL},
+                        },
+                        {
+                                .name = "KWorld PlusTV Dual DVB-T PCI " \
+                                        "(DVB-T PC160-2T)",
+                                .cold_ids = {&af9015_usb_table[8], NULL},
+                                .warm_ids = {NULL},
+                        },
+                        {
+                                .name = "AVerMedia AVerTV DVB-T Volar X",
+                                .cold_ids = {&af9015_usb_table[9], NULL},
+                                .warm_ids = {NULL},
+                        },
+                }
+        }, {
+                .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+
+                .usb_ctrl = DEVICE_SPECIFIC,
+                .download_firmware = af9015_download_firmware,
+                .firmware = "dvb-usb-af9015.fw",
+
+                .size_of_priv = sizeof(struct af9015_state), \
+
+                .num_adapters = 2,
+                .adapter = {
+                        {
+                                .caps = DVB_USB_ADAP_HAS_PID_FILTER |
+                                DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
+
+                                .pid_filter_count = 32,
+                                .pid_filter       = af9015_pid_filter,
+                                .pid_filter_ctrl  = af9015_pid_filter_ctrl,
+
+                                .frontend_attach =
+                                        af9015_af9013_frontend_attach,
+                                .tuner_attach    = af9015_tuner_attach,
+                                .stream = {
+                                        .type = USB_BULK,
+                                        .count = 6,
+                                        .endpoint = 0x84,
+                                },
+                        },
+                        {
+                                .frontend_attach =
+                                        af9015_af9013_frontend_attach,
+                                .tuner_attach    = af9015_tuner_attach,
+                                .stream = {
+                                        .type = USB_BULK,
+                                        .count = 6,
+                                        .endpoint = 0x85,
+                                },
+                        }
+                },
+
+                .identify_state = af9015_identify_state,
+
+                .rc_query         = af9015_rc_query,
+                .rc_interval      = 150,
+
+                .i2c_algo = &af9015_i2c_algo,
+
+                .num_device_descs = 6,
+                .devices = {
+                        {
+                                .name = "Xtensions XD-380",
+                                .cold_ids = {&af9015_usb_table[10], NULL},
+                                .warm_ids = {NULL},
+                        },
+                        {
+                                .name = "MSI DIGIVOX Duo",
+                                .cold_ids = {&af9015_usb_table[11], NULL},
+                                .warm_ids = {NULL},
+                        },
+                        {
+                                .name = "Fujitsu-Siemens Slim Mobile USB DVB-T",
+                                .cold_ids = {&af9015_usb_table[12], NULL},
+                                .warm_ids = {NULL},
+                        },
+                        {
+                                .name = "Telestar Starstick 2",
+                                .cold_ids = {&af9015_usb_table[13], NULL},
+                                .warm_ids = {NULL},
+                        },
+                        {
+                                .name = "AVerMedia A309",
+                                .cold_ids = {&af9015_usb_table[14], NULL},
+                                .warm_ids = {NULL},
+                        },
+                        {
+                                .name = "MSI Digi VOX mini III",
+                                .cold_ids = {&af9015_usb_table[15], NULL},
+                                .warm_ids = {NULL},
+                        },
+                }
+        }
+};
+
+static int af9015_usb_probe(struct usb_interface *intf,
+                            const struct usb_device_id *id)
+{
+        int ret = 0;
+        struct dvb_usb_device *d = NULL;
+        struct usb_device *udev = interface_to_usbdev(intf);
+        u8 i;
+
+        deb_info("%s: interface:%d\n", __func__,
+                intf->cur_altsetting->desc.bInterfaceNumber);
+
+        /* interface 0 is used by DVB-T receiver and
+           interface 1 is for remote controller (HID) */
+        if (intf->cur_altsetting->desc.bInterfaceNumber == 0) {
+                ret = af9015_read_config(udev);
+                if (ret)
+                        return ret;
+
+                for (i = 0; i < af9015_properties_count; i++) {
+                        ret = dvb_usb_device_init(intf, &af9015_properties[i],
+                                THIS_MODULE, &d, adapter_nr);
+                        if (!ret)
+                                break;
+                        if (ret != -ENODEV)
+                                return ret;
+                }
+                if (ret)
+                        return ret;
+
+                if (d)
+                        ret = af9015_init(d);
+        }
+
+        return ret;
+}
+
+void af9015_i2c_exit(struct dvb_usb_device *d)
+{
+        struct af9015_state *state = d->priv;
+        deb_info("%s: \n", __func__);
+
+        /* remove 2nd I2C adapter */
+        if (d->state & DVB_USB_STATE_I2C)
+                i2c_del_adapter(&state->i2c_adap);
+}
+
+static void af9015_usb_device_exit(struct usb_interface *intf)
+{
+        struct dvb_usb_device *d = usb_get_intfdata(intf);
+        deb_info("%s: \n", __func__);
+
+        /* remove 2nd I2C adapter */
+        if (d != NULL && d->desc != NULL)
+                af9015_i2c_exit(d);
+
+        dvb_usb_device_exit(intf);
+}
+
+/* usb specific object needed to register this driver with the usb subsystem */
+static struct usb_driver af9015_usb_driver = {
+        .name = "dvb_usb_af9015",
+        .probe = af9015_usb_probe,
+        .disconnect = af9015_usb_device_exit,
+        .id_table = af9015_usb_table,
+};
+
+/* module stuff */
+static int __init af9015_usb_module_init(void)
+{
+        int ret;
+        ret = usb_register(&af9015_usb_driver);
+        if (ret)
+                err("module init failed:%d", ret);
+
+        return ret;
+}
+
+static void __exit af9015_usb_module_exit(void)
+{
+        /* deregister this driver from the USB subsystem */
+        usb_deregister(&af9015_usb_driver);
+}
+
+module_init(af9015_usb_module_init);
+module_exit(af9015_usb_module_exit);
+
+MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
+MODULE_DESCRIPTION("Driver for Afatech AF9015 DVB-T");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/af9015.h b/drivers/media/dvb/dvb-usb/af9015.h
new file mode 100644
index 000000000000..882e8a4b3681
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/af9015.h
@@ -0,0 +1,524 @@
+/*
+ * DVB USB Linux driver for Afatech AF9015 DVB-T USB2.0 receiver
+ *
+ * Copyright (C) 2007 Antti Palosaari <crope@iki.fi>
+ *
+ * Thanks to Afatech who kindly provided information.
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef _DVB_USB_AF9015_H_
+#define _DVB_USB_AF9015_H_
+
+#define DVB_USB_LOG_PREFIX "af9015"
+#include "dvb-usb.h"
+
+extern int dvb_usb_af9015_debug;
+#define deb_info(args...) dprintk(dvb_usb_af9015_debug, 0x01, args)
+#define deb_rc(args...)   dprintk(dvb_usb_af9015_debug, 0x02, args)
+#define deb_xfer(args...) dprintk(dvb_usb_af9015_debug, 0x04, args)
+#define deb_reg(args...)  dprintk(dvb_usb_af9015_debug, 0x08, args)
+#define deb_i2c(args...)  dprintk(dvb_usb_af9015_debug, 0x10, args)
+#define deb_fw(args...)   dprintk(dvb_usb_af9015_debug, 0x20, args)
+
+#define AF9015_I2C_EEPROM  0xa0
+#define AF9015_I2C_DEMOD   0x38
+#define AF9015_USB_TIMEOUT 2000
+
+/* EEPROM locations */
+#define AF9015_EEPROM_IR_MODE        0x18
+#define AF9015_EEPROM_IR_REMOTE_TYPE 0x34
+#define AF9015_EEPROM_TS_MODE        0x31
+#define AF9015_EEPROM_DEMOD2_I2C     0x32
+
+#define AF9015_EEPROM_SAW_BW1        0x35
+#define AF9015_EEPROM_XTAL_TYPE1     0x36
+#define AF9015_EEPROM_SPEC_INV1      0x37
+#define AF9015_EEPROM_IF1L           0x38
+#define AF9015_EEPROM_IF1H           0x39
+#define AF9015_EEPROM_MT2060_IF1L    0x3a
+#define AF9015_EEPROM_MT2060_IF1H    0x3b
+#define AF9015_EEPROM_TUNER_ID1      0x3c
+
+#define AF9015_EEPROM_SAW_BW2        0x45
+#define AF9015_EEPROM_XTAL_TYPE2     0x46
+#define AF9015_EEPROM_SPEC_INV2      0x47
+#define AF9015_EEPROM_IF2L           0x48
+#define AF9015_EEPROM_IF2H           0x49
+#define AF9015_EEPROM_MT2060_IF2L    0x4a
+#define AF9015_EEPROM_MT2060_IF2H    0x4b
+#define AF9015_EEPROM_TUNER_ID2      0x4c
+
+#define AF9015_EEPROM_OFFSET (AF9015_EEPROM_SAW_BW2 - AF9015_EEPROM_SAW_BW1)
+
+#define AF9015_GPIO_ON (1 << 0)
+#define AF9015_GPIO_EN (1 << 1)
+#define AF9015_GPIO_O  (1 << 2)
+#define AF9015_GPIO_I  (1 << 3)
+
+#define AF9015_GPIO_TUNER_ON  (AF9015_GPIO_ON|AF9015_GPIO_EN)
+#define AF9015_GPIO_TUNER_OFF (AF9015_GPIO_ON|AF9015_GPIO_EN|AF9015_GPIO_O)
+
+struct req_t {
+        u8  cmd;       /* [0] */
+        /*  seq */     /* [1] */
+        u8  i2c_addr;  /* [2] */
+        u16 addr;      /* [3|4] */
+        u8  mbox;      /* [5] */
+        u8  addr_len;  /* [6] */
+        u8  data_len;  /* [7] */
+        u8  *data;
+};
+
+enum af9015_cmd {
+        GET_CONFIG           = 0x10,
+        DOWNLOAD_FIRMWARE    = 0x11,
+        BOOT                 = 0x13,
+        READ_MEMORY          = 0x20,
+        WRITE_MEMORY         = 0x21,
+        READ_WRITE_I2C       = 0x22,
+        COPY_FIRMWARE        = 0x23,
+        RECONNECT_USB        = 0x5a,
+        WRITE_VIRTUAL_MEMORY = 0x26,
+        GET_IR_CODE          = 0x27,
+        READ_I2C,
+        WRITE_I2C,
+};
+
+enum af9015_ir_mode {
+        AF9015_IR_MODE_DISABLED = 0,
+        AF9015_IR_MODE_HID,
+        AF9015_IR_MODE_RLC,
+        AF9015_IR_MODE_RC6,
+};
+
+struct af9015_state {
+        struct i2c_adapter i2c_adap; /* I2C adapter for 2nd FE */
+};
+
+struct af9015_config {
+        u8  dual_mode:1;
+        u16 mt2060_if1[2];
+        u16 firmware_size;
+        u16 firmware_checksum;
+        u8  *ir_table;
+        u16 ir_table_size;
+};
+
+enum af9015_remote {
+        AF9015_REMOTE_NONE                    = 0,
+        AF9015_REMOTE_A_LINK_DTU_M,
+        AF9015_REMOTE_MSI_DIGIVOX_MINI_II_V3,
+        AF9015_REMOTE_MYGICTV_U718,
+};
+
+/* Leadtek WinFast DTV Dongle Gold */
+static struct dvb_usb_rc_key af9015_rc_keys_leadtek[] = {
+        { 0x00, 0x1e, KEY_1 },
+        { 0x00, 0x1f, KEY_2 },
+        { 0x00, 0x20, KEY_3 },
+        { 0x00, 0x21, KEY_4 },
+        { 0x00, 0x22, KEY_5 },
+        { 0x00, 0x23, KEY_6 },
+        { 0x00, 0x24, KEY_7 },
+        { 0x00, 0x25, KEY_8 },
+        { 0x00, 0x26, KEY_9 },
+        { 0x00, 0x27, KEY_0 },
+        { 0x00, 0x28, KEY_ENTER },
+        { 0x00, 0x4f, KEY_VOLUMEUP },
+        { 0x00, 0x50, KEY_VOLUMEDOWN },
+        { 0x00, 0x51, KEY_CHANNELDOWN },
+        { 0x00, 0x52, KEY_CHANNELUP },
+};
+
+static u8 af9015_ir_table_leadtek[] = {
+        0x03, 0xfc, 0x00, 0xff, 0x1a, 0x01, 0x00,
+        0x03, 0xfc, 0x56, 0xa9, 0x00, 0x00, 0x00,
+        0x03, 0xfc, 0x4b, 0xb4, 0x00, 0x00, 0x00,
+        0x03, 0xfc, 0x4c, 0xb3, 0xb2, 0x04, 0x00,
+        0x03, 0xfc, 0x4d, 0xb2, 0x00, 0x00, 0x00,
+        0x03, 0xfc, 0x4e, 0xb1, 0x00, 0x00, 0x00,
+        0x03, 0xfc, 0x1f, 0xe0, 0x3d, 0x00, 0x00,
+        0x03, 0xfc, 0x40, 0xbf, 0x13, 0x01, 0x00,
+        0x03, 0xfc, 0x14, 0xeb, 0x10, 0x00, 0x00,
+        0x03, 0xfc, 0x49, 0xb6, 0x05, 0x01, 0x00,
+        0x03, 0xfc, 0x50, 0xaf, 0x29, 0x00, 0x00,
+        0x03, 0xfc, 0x0c, 0xf3, 0x52, 0x00, 0x00,
+        0x03, 0xfc, 0x03, 0xfc, 0x09, 0x00, 0x00,
+        0x03, 0xfc, 0x08, 0xf7, 0x50, 0x00, 0x00,
+        0x03, 0xfc, 0x13, 0xec, 0x28, 0x00, 0x00,
+        0x03, 0xfc, 0x04, 0xfb, 0x4f, 0x00, 0x00,
+        0x03, 0xfc, 0x4f, 0xb0, 0x0f, 0x01, 0x00,
+        0x03, 0xfc, 0x10, 0xef, 0x51, 0x00, 0x00,
+        0x03, 0xfc, 0x51, 0xae, 0x3f, 0x00, 0x00,
+        0x03, 0xfc, 0x42, 0xbd, 0x13, 0x00, 0x00,
+        0x03, 0xfc, 0x43, 0xbc, 0x00, 0x00, 0x00,
+        0x03, 0xfc, 0x44, 0xbb, 0x11, 0x00, 0x00,
+        0x03, 0xfc, 0x52, 0xad, 0x19, 0x00, 0x00,
+        0x03, 0xfc, 0x54, 0xab, 0x05, 0x00, 0x00,
+        0x03, 0xfc, 0x46, 0xb9, 0x29, 0x00, 0x00,
+        0x03, 0xfc, 0x55, 0xaa, 0x2b, 0x00, 0x00,
+        0x03, 0xfc, 0x53, 0xac, 0x41, 0x00, 0x00,
+        0x03, 0xfc, 0x05, 0xfa, 0x1e, 0x00, 0x00,
+        0x03, 0xfc, 0x06, 0xf9, 0x1f, 0x00, 0x00,
+        0x03, 0xfc, 0x07, 0xf8, 0x20, 0x00, 0x00,
+        0x03, 0xfc, 0x1e, 0xe1, 0x19, 0x00, 0x00,
+        0x03, 0xfc, 0x09, 0xf6, 0x21, 0x00, 0x00,
+        0x03, 0xfc, 0x0a, 0xf5, 0x22, 0x00, 0x00,
+        0x03, 0xfc, 0x0b, 0xf4, 0x23, 0x00, 0x00,
+        0x03, 0xfc, 0x1b, 0xe4, 0x16, 0x00, 0x00,
+        0x03, 0xfc, 0x0d, 0xf2, 0x24, 0x00, 0x00,
+        0x03, 0xfc, 0x0e, 0xf1, 0x25, 0x00, 0x00,
+        0x03, 0xfc, 0x0f, 0xf0, 0x26, 0x00, 0x00,
+        0x03, 0xfc, 0x16, 0xe9, 0x28, 0x00, 0x00,
+        0x03, 0xfc, 0x41, 0xbe, 0x37, 0x00, 0x00,
+        0x03, 0xfc, 0x12, 0xed, 0x27, 0x00, 0x00,
+        0x03, 0xfc, 0x11, 0xee, 0x2a, 0x00, 0x00,
+        0x03, 0xfc, 0x48, 0xb7, 0x2c, 0x00, 0x00,
+        0x03, 0xfc, 0x4a, 0xb5, 0x3c, 0x00, 0x00,
+        0x03, 0xfc, 0x47, 0xb8, 0x15, 0x01, 0x00,
+        0x03, 0xfc, 0x45, 0xba, 0x0b, 0x01, 0x00,
+        0x03, 0xfc, 0x5e, 0xa1, 0x43, 0x00, 0x00,
+        0x03, 0xfc, 0x5a, 0xa5, 0x42, 0x00, 0x00,
+        0x03, 0xfc, 0x5b, 0xa4, 0x4b, 0x00, 0x00,
+        0x03, 0xfc, 0x5f, 0xa0, 0x4e, 0x00, 0x00,
+};
+
+/* TwinHan AzureWave AD-TU700(704J) */
+static struct dvb_usb_rc_key af9015_rc_keys_twinhan[] = {
+        { 0x05, 0x3f, KEY_POWER },
+        { 0x00, 0x19, KEY_FAVORITES },    /* Favorite List */
+        { 0x00, 0x04, KEY_TEXT },         /* Teletext */
+        { 0x00, 0x0e, KEY_POWER },
+        { 0x00, 0x0e, KEY_INFO },         /* Preview */
+        { 0x00, 0x08, KEY_EPG },          /* Info/EPG */
+        { 0x00, 0x0f, KEY_LIST },         /* Record List */
+        { 0x00, 0x1e, KEY_1 },
+        { 0x00, 0x1f, KEY_2 },
+        { 0x00, 0x20, KEY_3 },
+        { 0x00, 0x21, KEY_4 },
+        { 0x00, 0x22, KEY_5 },
+        { 0x00, 0x23, KEY_6 },
+        { 0x00, 0x24, KEY_7 },
+        { 0x00, 0x25, KEY_8 },
+        { 0x00, 0x26, KEY_9 },
+        { 0x00, 0x27, KEY_0 },
+        { 0x00, 0x29, KEY_CANCEL },       /* Cancel */
+        { 0x00, 0x4c, KEY_CLEAR },        /* Clear */
+        { 0x00, 0x2a, KEY_BACK },         /* Back */
+        { 0x00, 0x2b, KEY_TAB },          /* Tab */
+        { 0x00, 0x52, KEY_UP },           /* up arrow */
+        { 0x00, 0x51, KEY_DOWN },         /* down arrow */
+        { 0x00, 0x4f, KEY_RIGHT },        /* right arrow */
+        { 0x00, 0x50, KEY_LEFT },         /* left arrow */
+        { 0x00, 0x28, KEY_ENTER },        /* Enter / ok */
+        { 0x02, 0x52, KEY_VOLUMEUP },
+        { 0x02, 0x51, KEY_VOLUMEDOWN },
+        { 0x00, 0x4e, KEY_CHANNELDOWN },
+        { 0x00, 0x4b, KEY_CHANNELUP },
+        { 0x00, 0x4a, KEY_RECORD },
+        { 0x01, 0x11, KEY_PLAY },
+        { 0x00, 0x17, KEY_PAUSE },
+        { 0x00, 0x0c, KEY_REWIND },       /* FR << */
+        { 0x00, 0x11, KEY_FASTFORWARD },  /* FF >> */
+        { 0x01, 0x15, KEY_PREVIOUS },     /* Replay */
+        { 0x01, 0x0e, KEY_NEXT },         /* Skip */
+        { 0x00, 0x13, KEY_CAMERA },       /* Capture */
+        { 0x01, 0x0f, KEY_LANGUAGE },     /* SAP */
+        { 0x01, 0x13, KEY_TV2 },          /* PIP */
+        { 0x00, 0x1d, KEY_ZOOM },         /* Full Screen */
+        { 0x01, 0x17, KEY_SUBTITLE },     /* Subtitle / CC */
+        { 0x00, 0x10, KEY_MUTE },
+        { 0x01, 0x19, KEY_AUDIO },        /* L/R */ /* TODO better event */
+        { 0x01, 0x16, KEY_SLEEP },        /* Hibernate */
+        { 0x01, 0x16, KEY_SWITCHVIDEOMODE },
+                                          /* A/V */ /* TODO does not work */
+        { 0x00, 0x06, KEY_AGAIN },        /* Recall */
+        { 0x01, 0x16, KEY_KPPLUS },       /* Zoom+ */ /* TODO does not work */
+        { 0x01, 0x16, KEY_KPMINUS },      /* Zoom- */ /* TODO does not work */
+        { 0x02, 0x15, KEY_RED },
+        { 0x02, 0x0a, KEY_GREEN },
+        { 0x02, 0x1c, KEY_YELLOW },
+        { 0x02, 0x05, KEY_BLUE },
+};
+
+static u8 af9015_ir_table_twinhan[] = {
+        0x00, 0xff, 0x16, 0xe9, 0x3f, 0x05, 0x00,
+        0x00, 0xff, 0x07, 0xf8, 0x16, 0x01, 0x00,
+        0x00, 0xff, 0x14, 0xeb, 0x11, 0x01, 0x00,
+        0x00, 0xff, 0x1a, 0xe5, 0x4d, 0x00, 0x00,
+        0x00, 0xff, 0x4c, 0xb3, 0x17, 0x00, 0x00,
+        0x00, 0xff, 0x12, 0xed, 0x11, 0x00, 0x00,
+        0x00, 0xff, 0x40, 0xbf, 0x0c, 0x00, 0x00,
+        0x00, 0xff, 0x11, 0xee, 0x4a, 0x00, 0x00,
+        0x00, 0xff, 0x54, 0xab, 0x13, 0x00, 0x00,
+        0x00, 0xff, 0x41, 0xbe, 0x15, 0x01, 0x00,
+        0x00, 0xff, 0x42, 0xbd, 0x0e, 0x01, 0x00,
+        0x00, 0xff, 0x43, 0xbc, 0x17, 0x01, 0x00,
+        0x00, 0xff, 0x50, 0xaf, 0x0f, 0x01, 0x00,
+        0x00, 0xff, 0x4d, 0xb2, 0x1d, 0x00, 0x00,
+        0x00, 0xff, 0x47, 0xb8, 0x13, 0x01, 0x00,
+        0x00, 0xff, 0x05, 0xfa, 0x4b, 0x00, 0x00,
+        0x00, 0xff, 0x02, 0xfd, 0x4e, 0x00, 0x00,
+        0x00, 0xff, 0x0e, 0xf1, 0x06, 0x00, 0x00,
+        0x00, 0xff, 0x1e, 0xe1, 0x52, 0x02, 0x00,
+        0x00, 0xff, 0x0a, 0xf5, 0x51, 0x02, 0x00,
+        0x00, 0xff, 0x10, 0xef, 0x10, 0x00, 0x00,
+        0x00, 0xff, 0x49, 0xb6, 0x19, 0x01, 0x00,
+        0x00, 0xff, 0x15, 0xea, 0x27, 0x00, 0x00,
+        0x00, 0xff, 0x03, 0xfc, 0x1e, 0x00, 0x00,
+        0x00, 0xff, 0x01, 0xfe, 0x1f, 0x00, 0x00,
+        0x00, 0xff, 0x06, 0xf9, 0x20, 0x00, 0x00,
+        0x00, 0xff, 0x09, 0xf6, 0x21, 0x00, 0x00,
+        0x00, 0xff, 0x1d, 0xe2, 0x22, 0x00, 0x00,
+        0x00, 0xff, 0x1f, 0xe0, 0x23, 0x00, 0x00,
+        0x00, 0xff, 0x0d, 0xf2, 0x24, 0x00, 0x00,
+        0x00, 0xff, 0x19, 0xe6, 0x25, 0x00, 0x00,
+        0x00, 0xff, 0x1b, 0xe4, 0x26, 0x00, 0x00,
+        0x00, 0xff, 0x00, 0xff, 0x2b, 0x00, 0x00,
+        0x00, 0xff, 0x4a, 0xb5, 0x4c, 0x00, 0x00,
+        0x00, 0xff, 0x4b, 0xb4, 0x52, 0x00, 0x00,
+        0x00, 0xff, 0x51, 0xae, 0x51, 0x00, 0x00,
+        0x00, 0xff, 0x52, 0xad, 0x4f, 0x00, 0x00,
+        0x00, 0xff, 0x4e, 0xb1, 0x50, 0x00, 0x00,
+        0x00, 0xff, 0x0c, 0xf3, 0x29, 0x00, 0x00,
+        0x00, 0xff, 0x4f, 0xb0, 0x28, 0x00, 0x00,
+        0x00, 0xff, 0x13, 0xec, 0x2a, 0x00, 0x00,
+        0x00, 0xff, 0x17, 0xe8, 0x19, 0x00, 0x00,
+        0x00, 0xff, 0x04, 0xfb, 0x0f, 0x00, 0x00,
+        0x00, 0xff, 0x48, 0xb7, 0x0e, 0x00, 0x00,
+        0x00, 0xff, 0x0f, 0xf0, 0x04, 0x00, 0x00,
+        0x00, 0xff, 0x1c, 0xe3, 0x08, 0x00, 0x00,
+        0x00, 0xff, 0x18, 0xe7, 0x15, 0x02, 0x00,
+        0x00, 0xff, 0x53, 0xac, 0x0a, 0x02, 0x00,
+        0x00, 0xff, 0x5e, 0xa1, 0x1c, 0x02, 0x00,
+        0x00, 0xff, 0x5f, 0xa0, 0x05, 0x02, 0x00,
+};
+
+/* A-Link DTU(m) */
+static struct dvb_usb_rc_key af9015_rc_keys_a_link[] = {
+        { 0x00, 0x1e, KEY_1 },
+        { 0x00, 0x1f, KEY_2 },
+        { 0x00, 0x20, KEY_3 },
+        { 0x00, 0x21, KEY_4 },
+        { 0x00, 0x22, KEY_5 },
+        { 0x00, 0x23, KEY_6 },
+        { 0x00, 0x24, KEY_7 },
+        { 0x00, 0x25, KEY_8 },
+        { 0x00, 0x26, KEY_9 },
+        { 0x00, 0x27, KEY_0 },
+        { 0x00, 0x2e, KEY_CHANNELUP },
+        { 0x00, 0x2d, KEY_CHANNELDOWN },
+        { 0x04, 0x28, KEY_ZOOM },
+        { 0x00, 0x41, KEY_MUTE },
+        { 0x00, 0x42, KEY_VOLUMEDOWN },
+        { 0x00, 0x43, KEY_VOLUMEUP },
+        { 0x00, 0x44, KEY_GOTO },         /* jump */
+        { 0x05, 0x45, KEY_POWER },
+};
+
+static u8 af9015_ir_table_a_link[] = {
+        0x08, 0xf7, 0x12, 0xed, 0x45, 0x05, 0x00, /* power */
+        0x08, 0xf7, 0x1a, 0xe5, 0x41, 0x00, 0x00, /* mute */
+        0x08, 0xf7, 0x01, 0xfe, 0x1e, 0x00, 0x00, /* 1 */
+        0x08, 0xf7, 0x1c, 0xe3, 0x21, 0x00, 0x00, /* 4 */
+        0x08, 0xf7, 0x03, 0xfc, 0x24, 0x00, 0x00, /* 7 */
+        0x08, 0xf7, 0x05, 0xfa, 0x28, 0x04, 0x00, /* zoom */
+        0x08, 0xf7, 0x00, 0xff, 0x43, 0x00, 0x00, /* volume up */
+        0x08, 0xf7, 0x16, 0xe9, 0x42, 0x00, 0x00, /* volume down */
+        0x08, 0xf7, 0x0f, 0xf0, 0x1f, 0x00, 0x00, /* 2 */
+        0x08, 0xf7, 0x0d, 0xf2, 0x22, 0x00, 0x00, /* 5 */
+        0x08, 0xf7, 0x1b, 0xe4, 0x25, 0x00, 0x00, /* 8 */
+        0x08, 0xf7, 0x06, 0xf9, 0x27, 0x00, 0x00, /* 0 */
+        0x08, 0xf7, 0x14, 0xeb, 0x2e, 0x00, 0x00, /* channel up */
+        0x08, 0xf7, 0x1d, 0xe2, 0x2d, 0x00, 0x00, /* channel down */
+        0x08, 0xf7, 0x02, 0xfd, 0x20, 0x00, 0x00, /* 3 */
+        0x08, 0xf7, 0x18, 0xe7, 0x23, 0x00, 0x00, /* 6 */
+        0x08, 0xf7, 0x04, 0xfb, 0x26, 0x00, 0x00, /* 9 */
+        0x08, 0xf7, 0x07, 0xf8, 0x44, 0x00, 0x00, /* jump */
+};
+
+/* MSI DIGIVOX mini II V3.0 */
+static struct dvb_usb_rc_key af9015_rc_keys_msi[] = {
+        { 0x00, 0x1e, KEY_1 },
+        { 0x00, 0x1f, KEY_2 },
+        { 0x00, 0x20, KEY_3 },
+        { 0x00, 0x21, KEY_4 },
+        { 0x00, 0x22, KEY_5 },
+        { 0x00, 0x23, KEY_6 },
+        { 0x00, 0x24, KEY_7 },
+        { 0x00, 0x25, KEY_8 },
+        { 0x00, 0x26, KEY_9 },
+        { 0x00, 0x27, KEY_0 },
+        { 0x03, 0x0f, KEY_CHANNELUP },
+        { 0x03, 0x0e, KEY_CHANNELDOWN },
+        { 0x00, 0x42, KEY_VOLUMEDOWN },
+        { 0x00, 0x43, KEY_VOLUMEUP },
+        { 0x05, 0x45, KEY_POWER },
+        { 0x00, 0x52, KEY_UP },           /* up */
+        { 0x00, 0x51, KEY_DOWN },         /* down */
+        { 0x00, 0x28, KEY_ENTER },
+};
+
+static u8 af9015_ir_table_msi[] = {
+        0x03, 0xfc, 0x17, 0xe8, 0x45, 0x05, 0x00, /* power */
+        0x03, 0xfc, 0x0d, 0xf2, 0x51, 0x00, 0x00, /* down */
+        0x03, 0xfc, 0x03, 0xfc, 0x52, 0x00, 0x00, /* up */
+        0x03, 0xfc, 0x1a, 0xe5, 0x1e, 0x00, 0x00, /* 1 */
+        0x03, 0xfc, 0x02, 0xfd, 0x1f, 0x00, 0x00, /* 2 */
+        0x03, 0xfc, 0x04, 0xfb, 0x20, 0x00, 0x00, /* 3 */
+        0x03, 0xfc, 0x1c, 0xe3, 0x21, 0x00, 0x00, /* 4 */
+        0x03, 0xfc, 0x08, 0xf7, 0x22, 0x00, 0x00, /* 5 */
+        0x03, 0xfc, 0x1d, 0xe2, 0x23, 0x00, 0x00, /* 6 */
+        0x03, 0xfc, 0x11, 0xee, 0x24, 0x00, 0x00, /* 7 */
+        0x03, 0xfc, 0x0b, 0xf4, 0x25, 0x00, 0x00, /* 8 */
+        0x03, 0xfc, 0x10, 0xef, 0x26, 0x00, 0x00, /* 9 */
+        0x03, 0xfc, 0x09, 0xf6, 0x27, 0x00, 0x00, /* 0 */
+        0x03, 0xfc, 0x14, 0xeb, 0x43, 0x00, 0x00, /* volume up */
+        0x03, 0xfc, 0x1f, 0xe0, 0x42, 0x00, 0x00, /* volume down */
+        0x03, 0xfc, 0x15, 0xea, 0x0f, 0x03, 0x00, /* channel up */
+        0x03, 0xfc, 0x05, 0xfa, 0x0e, 0x03, 0x00, /* channel down */
+        0x03, 0xfc, 0x16, 0xe9, 0x28, 0x00, 0x00, /* enter */
+};
+
+/* MYGICTV U718 */
+static struct dvb_usb_rc_key af9015_rc_keys_mygictv[] = {
+        { 0x00, 0x3d, KEY_SWITCHVIDEOMODE },
+                                          /* TV / AV */
+        { 0x05, 0x45, KEY_POWER },
+        { 0x00, 0x1e, KEY_1 },
+        { 0x00, 0x1f, KEY_2 },
+        { 0x00, 0x20, KEY_3 },
+        { 0x00, 0x21, KEY_4 },
+        { 0x00, 0x22, KEY_5 },
+        { 0x00, 0x23, KEY_6 },
+        { 0x00, 0x24, KEY_7 },
+        { 0x00, 0x25, KEY_8 },
+        { 0x00, 0x26, KEY_9 },
+        { 0x00, 0x27, KEY_0 },
+        { 0x00, 0x41, KEY_MUTE },
+        { 0x00, 0x2a, KEY_ESC },          /* Esc */
+        { 0x00, 0x2e, KEY_CHANNELUP },
+        { 0x00, 0x2d, KEY_CHANNELDOWN },
+        { 0x00, 0x42, KEY_VOLUMEDOWN },
+        { 0x00, 0x43, KEY_VOLUMEUP },
+        { 0x00, 0x52, KEY_UP },           /* up arrow */
+        { 0x00, 0x51, KEY_DOWN },         /* down arrow */
+        { 0x00, 0x4f, KEY_RIGHT },        /* right arrow */
+        { 0x00, 0x50, KEY_LEFT },         /* left arrow */
+        { 0x00, 0x28, KEY_ENTER },        /* ok */
+        { 0x01, 0x15, KEY_RECORD },
+        { 0x03, 0x13, KEY_PLAY },
+        { 0x01, 0x13, KEY_PAUSE },
+        { 0x01, 0x16, KEY_STOP },
+        { 0x03, 0x07, KEY_REWIND },       /* FR << */
+        { 0x03, 0x09, KEY_FASTFORWARD },  /* FF >> */
+        { 0x00, 0x3b, KEY_TIME },         /* TimeShift */
+        { 0x00, 0x3e, KEY_CAMERA },       /* Snapshot */
+        { 0x03, 0x16, KEY_CYCLEWINDOWS }, /* yellow, min / max */
+        { 0x00, 0x00, KEY_ZOOM },         /* 'select' (?) */
+        { 0x03, 0x16, KEY_SHUFFLE },      /* Shuffle */
+        { 0x03, 0x45, KEY_POWER },
+};
+
+static u8 af9015_ir_table_mygictv[] = {
+        0x02, 0xbd, 0x0c, 0xf3, 0x3d, 0x00, 0x00, /* TV / AV */
+        0x02, 0xbd, 0x14, 0xeb, 0x45, 0x05, 0x00, /* power */
+        0x02, 0xbd, 0x00, 0xff, 0x1e, 0x00, 0x00, /* 1 */
+        0x02, 0xbd, 0x01, 0xfe, 0x1f, 0x00, 0x00, /* 2 */
+        0x02, 0xbd, 0x02, 0xfd, 0x20, 0x00, 0x00, /* 3 */
+        0x02, 0xbd, 0x03, 0xfc, 0x21, 0x00, 0x00, /* 4 */
+        0x02, 0xbd, 0x04, 0xfb, 0x22, 0x00, 0x00, /* 5 */
+        0x02, 0xbd, 0x05, 0xfa, 0x23, 0x00, 0x00, /* 6 */
+        0x02, 0xbd, 0x06, 0xf9, 0x24, 0x00, 0x00, /* 7 */
+        0x02, 0xbd, 0x07, 0xf8, 0x25, 0x00, 0x00, /* 8 */
+        0x02, 0xbd, 0x08, 0xf7, 0x26, 0x00, 0x00, /* 9 */
+        0x02, 0xbd, 0x09, 0xf6, 0x27, 0x00, 0x00, /* 0 */
+        0x02, 0xbd, 0x0a, 0xf5, 0x41, 0x00, 0x00, /* mute */
+        0x02, 0xbd, 0x1c, 0xe3, 0x2a, 0x00, 0x00, /* esc */
+        0x02, 0xbd, 0x1f, 0xe0, 0x43, 0x00, 0x00, /* volume up */
+        0x02, 0xbd, 0x12, 0xed, 0x52, 0x00, 0x00, /* up arrow */
+        0x02, 0xbd, 0x11, 0xee, 0x50, 0x00, 0x00, /* left arrow */
+        0x02, 0xbd, 0x15, 0xea, 0x28, 0x00, 0x00, /* ok */
+        0x02, 0xbd, 0x10, 0xef, 0x4f, 0x00, 0x00, /* right arrow */
+        0x02, 0xbd, 0x13, 0xec, 0x51, 0x00, 0x00, /* down arrow */
+        0x02, 0xbd, 0x0e, 0xf1, 0x42, 0x00, 0x00, /* volume down */
+        0x02, 0xbd, 0x19, 0xe6, 0x15, 0x01, 0x00, /* record */
+        0x02, 0xbd, 0x1e, 0xe1, 0x13, 0x03, 0x00, /* play */
+        0x02, 0xbd, 0x16, 0xe9, 0x16, 0x01, 0x00, /* stop */
+        0x02, 0xbd, 0x0b, 0xf4, 0x28, 0x04, 0x00, /* yellow, min / max */
+        0x02, 0xbd, 0x0f, 0xf0, 0x3b, 0x00, 0x00, /* time shift */
+        0x02, 0xbd, 0x18, 0xe7, 0x2e, 0x00, 0x00, /* channel up */
+        0x02, 0xbd, 0x1a, 0xe5, 0x2d, 0x00, 0x00, /* channel down */
+        0x02, 0xbd, 0x17, 0xe8, 0x3e, 0x00, 0x00, /* snapshot */
+        0x02, 0xbd, 0x40, 0xbf, 0x13, 0x01, 0x00, /* pause */
+        0x02, 0xbd, 0x41, 0xbe, 0x09, 0x03, 0x00, /* FF >> */
+        0x02, 0xbd, 0x42, 0xbd, 0x07, 0x03, 0x00, /* FR << */
+        0x02, 0xbd, 0x43, 0xbc, 0x00, 0x00, 0x00, /* 'select' (?) */
+        0x02, 0xbd, 0x44, 0xbb, 0x16, 0x03, 0x00, /* shuffle */
+        0x02, 0xbd, 0x45, 0xba, 0x45, 0x03, 0x00, /* power */
+};
+
+/* KWorld PlusTV Dual DVB-T Stick (DVB-T 399U) */
+static u8 af9015_ir_table_kworld[] = {
+        0x86, 0x6b, 0x0c, 0xf3, 0x2e, 0x07, 0x00,
+        0x86, 0x6b, 0x16, 0xe9, 0x2d, 0x07, 0x00,
+        0x86, 0x6b, 0x1d, 0xe2, 0x37, 0x07, 0x00,
+        0x86, 0x6b, 0x00, 0xff, 0x1e, 0x07, 0x00,
+        0x86, 0x6b, 0x01, 0xfe, 0x1f, 0x07, 0x00,
+        0x86, 0x6b, 0x02, 0xfd, 0x20, 0x07, 0x00,
+        0x86, 0x6b, 0x03, 0xfc, 0x21, 0x07, 0x00,
+        0x86, 0x6b, 0x04, 0xfb, 0x22, 0x07, 0x00,
+        0x86, 0x6b, 0x05, 0xfa, 0x23, 0x07, 0x00,
+        0x86, 0x6b, 0x06, 0xf9, 0x24, 0x07, 0x00,
+        0x86, 0x6b, 0x07, 0xf8, 0x25, 0x07, 0x00,
+        0x86, 0x6b, 0x08, 0xf7, 0x26, 0x07, 0x00,
+        0x86, 0x6b, 0x09, 0xf6, 0x4d, 0x07, 0x00,
+        0x86, 0x6b, 0x0a, 0xf5, 0x4e, 0x07, 0x00,
+        0x86, 0x6b, 0x14, 0xeb, 0x4f, 0x07, 0x00,
+        0x86, 0x6b, 0x1e, 0xe1, 0x50, 0x07, 0x00,
+        0x86, 0x6b, 0x17, 0xe8, 0x52, 0x07, 0x00,
+        0x86, 0x6b, 0x1f, 0xe0, 0x51, 0x07, 0x00,
+        0x86, 0x6b, 0x0e, 0xf1, 0x0b, 0x07, 0x00,
+        0x86, 0x6b, 0x20, 0xdf, 0x0c, 0x07, 0x00,
+        0x86, 0x6b, 0x42, 0xbd, 0x0d, 0x07, 0x00,
+        0x86, 0x6b, 0x0b, 0xf4, 0x0e, 0x07, 0x00,
+        0x86, 0x6b, 0x43, 0xbc, 0x0f, 0x07, 0x00,
+        0x86, 0x6b, 0x10, 0xef, 0x10, 0x07, 0x00,
+        0x86, 0x6b, 0x21, 0xde, 0x11, 0x07, 0x00,
+        0x86, 0x6b, 0x13, 0xec, 0x12, 0x07, 0x00,
+        0x86, 0x6b, 0x11, 0xee, 0x13, 0x07, 0x00,
+        0x86, 0x6b, 0x12, 0xed, 0x14, 0x07, 0x00,
+        0x86, 0x6b, 0x19, 0xe6, 0x15, 0x07, 0x00,
+        0x86, 0x6b, 0x1a, 0xe5, 0x16, 0x07, 0x00,
+        0x86, 0x6b, 0x1b, 0xe4, 0x17, 0x07, 0x00,
+        0x86, 0x6b, 0x4b, 0xb4, 0x18, 0x07, 0x00,
+        0x86, 0x6b, 0x40, 0xbf, 0x19, 0x07, 0x00,
+        0x86, 0x6b, 0x44, 0xbb, 0x1a, 0x07, 0x00,
+        0x86, 0x6b, 0x41, 0xbe, 0x1b, 0x07, 0x00,
+        0x86, 0x6b, 0x22, 0xdd, 0x1c, 0x07, 0x00,
+        0x86, 0x6b, 0x15, 0xea, 0x1d, 0x07, 0x00,
+        0x86, 0x6b, 0x0f, 0xf0, 0x3f, 0x07, 0x00,
+        0x86, 0x6b, 0x1c, 0xe3, 0x40, 0x07, 0x00,
+        0x86, 0x6b, 0x4a, 0xb5, 0x41, 0x07, 0x00,
+        0x86, 0x6b, 0x48, 0xb7, 0x42, 0x07, 0x00,
+        0x86, 0x6b, 0x49, 0xb6, 0x43, 0x07, 0x00,
+        0x86, 0x6b, 0x18, 0xe7, 0x44, 0x07, 0x00,
+        0x86, 0x6b, 0x23, 0xdc, 0x45, 0x07, 0x00,
+};
+
+#endif
diff --git a/drivers/media/dvb/dvb-usb/anysee.c b/drivers/media/dvb/dvb-usb/anysee.c
index 2f408d2e1ef3..c786359fba03 100644
--- a/drivers/media/dvb/dvb-usb/anysee.c
+++ b/drivers/media/dvb/dvb-usb/anysee.c
@@ -41,6 +41,9 @@
 static int dvb_usb_anysee_debug;
 module_param_named(debug, dvb_usb_anysee_debug, int, 0644);
 MODULE_PARM_DESC(debug, "set debugging level" DVB_USB_DEBUG_STATUS);
+int dvb_usb_anysee_delsys;
+module_param_named(delsys, dvb_usb_anysee_delsys, int, 0644);
+MODULE_PARM_DESC(delsys, "select delivery mode (0=DVB-C, 1=DVB-T)");
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 static struct mutex anysee_usb_mutex;
@@ -178,14 +181,14 @@ static int anysee_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
                         inc = 1;
                 }
                 if (ret)
-                        return ret;
+                        break;
 
                 i += inc;
         }
 
         mutex_unlock(&d->i2c_mutex);
 
-        return i;
+        return ret ? ret : i;
 }
 
 static u32 anysee_i2c_func(struct i2c_adapter *adapter)
@@ -272,9 +275,11 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)
               model      demod     hw  firmware
            1. E30        MT352     02  0.2.1
            2. E30        ZL10353   02  0.2.1
-           3. E30 Plus   ZL10353   06  0.1.0
-           4. E30C Plus  TDA10023  0a  0.1.0    rev 0.2
-           4. E30C Plus  TDA10023  0f  0.1.2    rev 0.4
+           3. E30 Combo  ZL10353   0f  0.1.2    DVB-T/C combo
+           4. E30 Plus   ZL10353   06  0.1.0
+           5. E30C Plus  TDA10023  0a  0.1.0    rev 0.2
+              E30C Plus  TDA10023  0f  0.1.2    rev 0.4
+              E30 Combo  TDA10023  0f  0.1.2    DVB-T/C combo
         */
 
         /* Zarlink MT352 DVB-T demod inside of Samsung DNOS404ZH102A NIM */
@@ -293,6 +298,21 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)
                 return 0;
         }
 
+        /* for E30 Combo Plus DVB-T demodulator */
+        if (dvb_usb_anysee_delsys) {
+                ret = anysee_write_reg(adap->dev, 0xb0, 0x01);
+                if (ret)
+                        return ret;
+
+                /* Zarlink ZL10353 DVB-T demod */
+                adap->fe = dvb_attach(zl10353_attach, &anysee_zl10353_config,
+                                      &adap->dev->i2c_adap);
+                if (adap->fe != NULL) {
+                        state->tuner = DVB_PLL_SAMSUNG_DTOS403IH102A;
+                        return 0;
+                }
+        }
+
         /* connect demod on IO port D for TDA10023 & ZL10353 */
         ret = anysee_write_reg(adap->dev, 0xb0, 0x25);
         if (ret)
diff --git a/drivers/media/dvb/dvb-usb/cinergyT2-core.c b/drivers/media/dvb/dvb-usb/cinergyT2-core.c
new file mode 100644
index 000000000000..3ac9f74e9fbf
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/cinergyT2-core.c
@@ -0,0 +1,268 @@
+/*
+ * TerraTec Cinergy T2/qanu USB2 DVB-T adapter.
+ *
+ * Copyright (C) 2007 Tomi Orava (tomimo@ncircle.nullnet.fi)
+ *
+ * Based on the dvb-usb-framework code and the
+ * original Terratec Cinergy T2 driver by:
+ *
+ * Copyright (C) 2004 Daniel Mack <daniel@qanu.de> and
+ *                  Holger Waechtler <holger@qanu.de>
+ *
+ *  Protocol Spec published on http://qanu.de/specs/terratec_cinergyT2.pdf
+ *
+ * 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 "cinergyT2.h"
+
+
+/* debug */
+int dvb_usb_cinergyt2_debug;
+int disable_remote;
+
+module_param_named(debug, dvb_usb_cinergyt2_debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debugging level (1=info, xfer=2, rc=4 "
+                "(or-able)).");
+
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
+struct cinergyt2_state {
+        u8 rc_counter;
+};
+
+/* We are missing a release hook with usb_device data */
+struct dvb_usb_device *cinergyt2_usb_device;
+
+static struct dvb_usb_device_properties cinergyt2_properties;
+
+static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)
+{
+        char buf[] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };
+        char result[64];
+        return dvb_usb_generic_rw(adap->dev, buf, sizeof(buf), result,
+                                sizeof(result), 0);
+}
+
+static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)
+{
+        char buf[] = { CINERGYT2_EP1_SLEEP_MODE, enable ? 0 : 1 };
+        char state[3];
+        return dvb_usb_generic_rw(d, buf, sizeof(buf), state, sizeof(state), 0);
+}
+
+static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
+{
+        char query[] = { CINERGYT2_EP1_GET_FIRMWARE_VERSION };
+        char state[3];
+        int ret;
+
+        adap->fe = cinergyt2_fe_attach(adap->dev);
+
+        ret = dvb_usb_generic_rw(adap->dev, query, sizeof(query), state,
+                                sizeof(state), 0);
+        if (ret < 0) {
+                deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
+                        "state info\n");
+        }
+
+        /* Copy this pointer as we are gonna need it in the release phase */
+        cinergyt2_usb_device = adap->dev;
+
+        return 0;
+}
+
+static struct dvb_usb_rc_key cinergyt2_rc_keys[] = {
+        { 0x04, 0x01,   KEY_POWER },
+        { 0x04, 0x02,   KEY_1 },
+        { 0x04, 0x03,   KEY_2 },
+        { 0x04, 0x04,   KEY_3 },
+        { 0x04, 0x05,   KEY_4 },
+        { 0x04, 0x06,   KEY_5 },
+        { 0x04, 0x07,   KEY_6 },
+        { 0x04, 0x08,   KEY_7 },
+        { 0x04, 0x09,   KEY_8 },
+        { 0x04, 0x0a,   KEY_9 },
+        { 0x04, 0x0c,   KEY_0 },
+        { 0x04, 0x0b,   KEY_VIDEO },
+        { 0x04, 0x0d,   KEY_REFRESH },
+        { 0x04, 0x0e,   KEY_SELECT },
+        { 0x04, 0x0f,   KEY_EPG },
+        { 0x04, 0x10,   KEY_UP },
+        { 0x04, 0x14,   KEY_DOWN },
+        { 0x04, 0x11,   KEY_LEFT },
+        { 0x04, 0x13,   KEY_RIGHT },
+        { 0x04, 0x12,   KEY_OK },
+        { 0x04, 0x15,   KEY_TEXT },
+        { 0x04, 0x16,   KEY_INFO },
+        { 0x04, 0x17,   KEY_RED },
+        { 0x04, 0x18,   KEY_GREEN },
+        { 0x04, 0x19,   KEY_YELLOW },
+        { 0x04, 0x1a,   KEY_BLUE },
+        { 0x04, 0x1c,   KEY_VOLUMEUP },
+        { 0x04, 0x1e,   KEY_VOLUMEDOWN },
+        { 0x04, 0x1d,   KEY_MUTE },
+        { 0x04, 0x1b,   KEY_CHANNELUP },
+        { 0x04, 0x1f,   KEY_CHANNELDOWN },
+        { 0x04, 0x40,   KEY_PAUSE },
+        { 0x04, 0x4c,   KEY_PLAY },
+        { 0x04, 0x58,   KEY_RECORD },
+        { 0x04, 0x54,   KEY_PREVIOUS },
+        { 0x04, 0x48,   KEY_STOP },
+        { 0x04, 0x5c,   KEY_NEXT }
+};
+
+/* Number of keypresses to ignore before detect repeating */
+#define RC_REPEAT_DELAY 3
+
+static int repeatable_keys[] = {
+        KEY_UP,
+        KEY_DOWN,
+        KEY_LEFT,
+        KEY_RIGHT,
+        KEY_VOLUMEUP,
+        KEY_VOLUMEDOWN,
+        KEY_CHANNELUP,
+        KEY_CHANNELDOWN
+};
+
+static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+{
+        struct cinergyt2_state *st = d->priv;
+        u8 key[5] = {0, 0, 0, 0, 0}, cmd = CINERGYT2_EP1_GET_RC_EVENTS;
+        int i;
+
+        *state = REMOTE_NO_KEY_PRESSED;
+
+        dvb_usb_generic_rw(d, &cmd, 1, key, sizeof(key), 0);
+        if (key[4] == 0xff) {
+                /* key repeat */
+                st->rc_counter++;
+                if (st->rc_counter > RC_REPEAT_DELAY) {
+                        for (i = 0; i < ARRAY_SIZE(repeatable_keys); i++) {
+                                if (d->last_event == repeatable_keys[i]) {
+                                        *state = REMOTE_KEY_REPEAT;
+                                        *event = d->last_event;
+                                        deb_rc("repeat key, event %x\n",
+                                                   *event);
+                                        return 0;
+                                }
+                        }
+                        deb_rc("repeated key (non repeatable)\n");
+                }
+                return 0;
+        }
+
+        /* hack to pass checksum on the custom field */
+        key[2] = ~key[1];
+        dvb_usb_nec_rc_key_to_event(d, key, event, state);
+        if (key[0] != 0) {
+                if (*event != d->last_event)
+                        st->rc_counter = 0;
+
+                deb_rc("key: %x %x %x %x %x\n",
+                       key[0], key[1], key[2], key[3], key[4]);
+        }
+        return 0;
+}
+
+static int cinergyt2_usb_probe(struct usb_interface *intf,
+                                const struct usb_device_id *id)
+{
+        return dvb_usb_device_init(intf, &cinergyt2_properties,
+                                        THIS_MODULE, NULL, adapter_nr);
+}
+
+
+static struct usb_device_id cinergyt2_usb_table[] = {
+        { USB_DEVICE(USB_VID_TERRATEC, 0x0038) },
+        { 0 }
+};
+
+MODULE_DEVICE_TABLE(usb, cinergyt2_usb_table);
+
+static struct dvb_usb_device_properties cinergyt2_properties = {
+        .size_of_priv = sizeof(struct cinergyt2_state),
+        .num_adapters = 1,
+        .adapter = {
+                {
+                        .streaming_ctrl   = cinergyt2_streaming_ctrl,
+                        .frontend_attach  = cinergyt2_frontend_attach,
+
+                        /* parameter for the MPEG2-data transfer */
+                        .stream = {
+                                .type = USB_BULK,
+                                .count = 5,
+                                .endpoint = 0x02,
+                                .u = {
+                                        .bulk = {
+                                                .buffersize = 512,
+                                        }
+                                }
+                        },
+                }
+        },
+
+        .power_ctrl       = cinergyt2_power_ctrl,
+
+        .rc_interval      = 50,
+        .rc_key_map       = cinergyt2_rc_keys,
+        .rc_key_map_size  = ARRAY_SIZE(cinergyt2_rc_keys),
+        .rc_query         = cinergyt2_rc_query,
+
+        .generic_bulk_ctrl_endpoint = 1,
+
+        .num_device_descs = 1,
+        .devices = {
+                { .name = "TerraTec/qanu USB2.0 Highspeed DVB-T Receiver",
+                  .cold_ids = {NULL},
+                  .warm_ids = { &cinergyt2_usb_table[0], NULL },
+                },
+                { NULL },
+        }
+};
+
+
+static struct usb_driver cinergyt2_driver = {
+        .name           = "cinergyT2",
+        .probe          = cinergyt2_usb_probe,
+        .disconnect     = dvb_usb_device_exit,
+        .id_table       = cinergyt2_usb_table
+};
+
+static int __init cinergyt2_usb_init(void)
+{
+        int err;
+
+        err = usb_register(&cinergyt2_driver);
+        if (err) {
+                err("usb_register() failed! (err %i)\n", err);
+                return err;
+        }
+        return 0;
+}
+
+static void __exit cinergyt2_usb_exit(void)
+{
+        usb_deregister(&cinergyt2_driver);
+}
+
+module_init(cinergyt2_usb_init);
+module_exit(cinergyt2_usb_exit);
+
+MODULE_DESCRIPTION("Terratec Cinergy T2 DVB-T driver");
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Tomi Orava");
diff --git a/drivers/media/dvb/dvb-usb/cinergyT2-fe.c b/drivers/media/dvb/dvb-usb/cinergyT2-fe.c
new file mode 100644
index 000000000000..649f25cca49e
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/cinergyT2-fe.c
@@ -0,0 +1,351 @@
+/*
+ * TerraTec Cinergy T2/qanu USB2 DVB-T adapter.
+ *
+ * Copyright (C) 2007 Tomi Orava (tomimo@ncircle.nullnet.fi)
+ *
+ * Based on the dvb-usb-framework code and the
+ * original Terratec Cinergy T2 driver by:
+ *
+ * Copyright (C) 2004 Daniel Mack <daniel@qanu.de> and
+ *                  Holger Waechtler <holger@qanu.de>
+ *
+ *  Protocol Spec published on http://qanu.de/specs/terratec_cinergyT2.pdf
+ *
+ * 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 "cinergyT2.h"
+
+
+/**
+ *  convert linux-dvb frontend parameter set into TPS.
+ *  See ETSI ETS-300744, section 4.6.2, table 9 for details.
+ *
+ *  This function is probably reusable and may better get placed in a support
+ *  library.
+ *
+ *  We replace errornous fields by default TPS fields (the ones with value 0).
+ */
+
+static uint16_t compute_tps(struct dvb_frontend_parameters *p)
+{
+        struct dvb_ofdm_parameters *op = &p->u.ofdm;
+        uint16_t tps = 0;
+
+        switch (op->code_rate_HP) {
+        case FEC_2_3:
+                tps |= (1 << 7);
+                break;
+        case FEC_3_4:
+                tps |= (2 << 7);
+                break;
+        case FEC_5_6:
+                tps |= (3 << 7);
+                break;
+        case FEC_7_8:
+                tps |= (4 << 7);
+                break;
+        case FEC_1_2:
+        case FEC_AUTO:
+        default:
+                /* tps |= (0 << 7) */;
+        }
+
+        switch (op->code_rate_LP) {
+        case FEC_2_3:
+                tps |= (1 << 4);
+                break;
+        case FEC_3_4:
+                tps |= (2 << 4);
+                break;
+        case FEC_5_6:
+                tps |= (3 << 4);
+                break;
+        case FEC_7_8:
+                tps |= (4 << 4);
+                break;
+        case FEC_1_2:
+        case FEC_AUTO:
+        default:
+                /* tps |= (0 << 4) */;
+        }
+
+        switch (op->constellation) {
+        case QAM_16:
+                tps |= (1 << 13);
+                break;
+        case QAM_64:
+                tps |= (2 << 13);
+                break;
+        case QPSK:
+        default:
+                /* tps |= (0 << 13) */;
+        }
+
+        switch (op->transmission_mode) {
+        case TRANSMISSION_MODE_8K:
+                tps |= (1 << 0);
+                break;
+        case TRANSMISSION_MODE_2K:
+        default:
+                /* tps |= (0 << 0) */;
+        }
+
+        switch (op->guard_interval) {
+        case GUARD_INTERVAL_1_16:
+                tps |= (1 << 2);
+                break;
+        case GUARD_INTERVAL_1_8:
+                tps |= (2 << 2);
+                break;
+        case GUARD_INTERVAL_1_4:
+                tps |= (3 << 2);
+                break;
+        case GUARD_INTERVAL_1_32:
+        default:
+                /* tps |= (0 << 2) */;
+        }
+
+        switch (op->hierarchy_information) {
+        case HIERARCHY_1:
+                tps |= (1 << 10);
+                break;
+        case HIERARCHY_2:
+                tps |= (2 << 10);
+                break;
+        case HIERARCHY_4:
+                tps |= (3 << 10);
+                break;
+        case HIERARCHY_NONE:
+        default:
+                /* tps |= (0 << 10) */;
+        }
+
+        return tps;
+}
+
+struct cinergyt2_fe_state {
+        struct dvb_frontend fe;
+        struct dvb_usb_device *d;
+};
+
+static int cinergyt2_fe_read_status(struct dvb_frontend *fe,
+                                        fe_status_t *status)
+{
+        struct cinergyt2_fe_state *state = fe->demodulator_priv;
+        struct dvbt_get_status_msg result;
+        u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
+        int ret;
+
+        ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&result,
+                        sizeof(result), 0);
+        if (ret < 0)
+                return ret;
+
+        *status = 0;
+
+        if (0xffff - le16_to_cpu(result.gain) > 30)
+                *status |= FE_HAS_SIGNAL;
+        if (result.lock_bits & (1 << 6))
+                *status |= FE_HAS_LOCK;
+        if (result.lock_bits & (1 << 5))
+                *status |= FE_HAS_SYNC;
+        if (result.lock_bits & (1 << 4))
+                *status |= FE_HAS_CARRIER;
+        if (result.lock_bits & (1 << 1))
+                *status |= FE_HAS_VITERBI;
+
+        if ((*status & (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=
+                        (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))
+                *status &= ~FE_HAS_LOCK;
+
+        return 0;
+}
+
+static int cinergyt2_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
+{
+        struct cinergyt2_fe_state *state = fe->demodulator_priv;
+        struct dvbt_get_status_msg status;
+        char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
+        int ret;
+
+        ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
+                                sizeof(status), 0);
+        if (ret < 0)
+                return ret;
+
+        *ber = le32_to_cpu(status.viterbi_error_rate);
+        return 0;
+}
+
+static int cinergyt2_fe_read_unc_blocks(struct dvb_frontend *fe, u32 *unc)
+{
+        struct cinergyt2_fe_state *state = fe->demodulator_priv;
+        struct dvbt_get_status_msg status;
+        u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
+        int ret;
+
+        ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&status,
+                                sizeof(status), 0);
+        if (ret < 0) {
+                err("cinergyt2_fe_read_unc_blocks() Failed! (Error=%d)\n",
+                        ret);
+                return ret;
+        }
+        *unc = le32_to_cpu(status.uncorrected_block_count);
+        return 0;
+}
+
+static int cinergyt2_fe_read_signal_strength(struct dvb_frontend *fe,
+                                                u16 *strength)
+{
+        struct cinergyt2_fe_state *state = fe->demodulator_priv;
+        struct dvbt_get_status_msg status;
+        char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
+        int ret;
+
+        ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
+                                sizeof(status), 0);
+        if (ret < 0) {
+                err("cinergyt2_fe_read_signal_strength() Failed!"
+                        " (Error=%d)\n", ret);
+                return ret;
+        }
+        *strength = (0xffff - le16_to_cpu(status.gain));
+        return 0;
+}
+
+static int cinergyt2_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
+{
+        struct cinergyt2_fe_state *state = fe->demodulator_priv;
+        struct dvbt_get_status_msg status;
+        char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
+        int ret;
+
+        ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
+                                sizeof(status), 0);
+        if (ret < 0) {
+                err("cinergyt2_fe_read_snr() Failed! (Error=%d)\n", ret);
+                return ret;
+        }
+        *snr = (status.snr << 8) | status.snr;
+        return 0;
+}
+
+static int cinergyt2_fe_init(struct dvb_frontend *fe)
+{
+        return 0;
+}
+
+static int cinergyt2_fe_sleep(struct dvb_frontend *fe)
+{
+        deb_info("cinergyt2_fe_sleep() Called\n");
+        return 0;
+}
+
+static int cinergyt2_fe_get_tune_settings(struct dvb_frontend *fe,
+                                struct dvb_frontend_tune_settings *tune)
+{
+        tune->min_delay_ms = 800;
+        return 0;
+}
+
+static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe,
+                                  struct dvb_frontend_parameters *fep)
+{
+        struct cinergyt2_fe_state *state = fe->demodulator_priv;
+        struct dvbt_set_parameters_msg param;
+        char result[2];
+        int err;
+
+        param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
+        param.tps = cpu_to_le16(compute_tps(fep));
+        param.freq = cpu_to_le32(fep->frequency / 1000);
+        param.bandwidth = 8 - fep->u.ofdm.bandwidth - BANDWIDTH_8_MHZ;
+
+        err = dvb_usb_generic_rw(state->d,
+                        (char *)&param, sizeof(param),
+                        result, sizeof(result), 0);
+        if (err < 0)
+                err("cinergyt2_fe_set_frontend() Failed! err=%d\n", err);
+
+        return (err < 0) ? err : 0;
+}
+
+static int cinergyt2_fe_get_frontend(struct dvb_frontend *fe,
+                                  struct dvb_frontend_parameters *fep)
+{
+        return 0;
+}
+
+static void cinergyt2_fe_release(struct dvb_frontend *fe)
+{
+        struct cinergyt2_fe_state *state = fe->demodulator_priv;
+        if (state != NULL)
+                kfree(state);
+}
+
+static struct dvb_frontend_ops cinergyt2_fe_ops;
+
+struct dvb_frontend *cinergyt2_fe_attach(struct dvb_usb_device *d)
+{
+        struct cinergyt2_fe_state *s = kzalloc(sizeof(
+                                        struct cinergyt2_fe_state), GFP_KERNEL);
+        if (s == NULL)
+                return NULL;
+
+        s->d = d;
+        memcpy(&s->fe.ops, &cinergyt2_fe_ops, sizeof(struct dvb_frontend_ops));
+        s->fe.demodulator_priv = s;
+        return &s->fe;
+}
+
+
+static struct dvb_frontend_ops cinergyt2_fe_ops = {
+        .info = {
+                .name                   = DRIVER_NAME,
+                .type                   = FE_OFDM,
+                .frequency_min          = 174000000,
+                .frequency_max          = 862000000,
+                .frequency_stepsize     = 166667,
+                .caps = FE_CAN_INVERSION_AUTO | FE_CAN_FEC_1_2
+                        | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4
+                        | FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8
+                        | FE_CAN_FEC_AUTO | FE_CAN_QPSK
+                        | FE_CAN_QAM_16 | FE_CAN_QAM_64
+                        | FE_CAN_QAM_AUTO
+                        | FE_CAN_TRANSMISSION_MODE_AUTO
+                        | FE_CAN_GUARD_INTERVAL_AUTO
+                        | FE_CAN_HIERARCHY_AUTO
+                        | FE_CAN_RECOVER
+                        | FE_CAN_MUTE_TS
+        },
+
+        .release                = cinergyt2_fe_release,
+
+        .init                   = cinergyt2_fe_init,
+        .sleep                  = cinergyt2_fe_sleep,
+
+        .set_frontend           = cinergyt2_fe_set_frontend,
+        .get_frontend           = cinergyt2_fe_get_frontend,
+        .get_tune_settings      = cinergyt2_fe_get_tune_settings,
+
+        .read_status            = cinergyt2_fe_read_status,
+        .read_ber               = cinergyt2_fe_read_ber,
+        .read_signal_strength   = cinergyt2_fe_read_signal_strength,
+        .read_snr               = cinergyt2_fe_read_snr,
+        .read_ucblocks          = cinergyt2_fe_read_unc_blocks,
+};
diff --git a/drivers/media/dvb/dvb-usb/cinergyT2.h b/drivers/media/dvb/dvb-usb/cinergyT2.h
new file mode 100644
index 000000000000..11d79eb384c8
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/cinergyT2.h
@@ -0,0 +1,95 @@
+/*
+ * TerraTec Cinergy T2/qanu USB2 DVB-T adapter.
+ *
+ * Copyright (C) 2007 Tomi Orava (tomimo@ncircle.nullnet.fi)
+ *
+ * Based on the dvb-usb-framework code and the
+ * original Terratec Cinergy T2 driver by:
+ *
+ * Copyright (C) 2004 Daniel Mack <daniel@qanu.de> and
+ *                  Holger Waechtler <holger@qanu.de>
+ *
+ *  Protocol Spec published on http://qanu.de/specs/terratec_cinergyT2.pdf
+ *
+ * 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 _DVB_USB_CINERGYT2_H_
+#define _DVB_USB_CINERGYT2_H_
+
+#include <linux/usb/input.h>
+
+#define DVB_USB_LOG_PREFIX "cinergyT2"
+#include "dvb-usb.h"
+
+#define DRIVER_NAME "TerraTec/qanu USB2.0 Highspeed DVB-T Receiver"
+
+extern int dvb_usb_cinergyt2_debug;
+
+#define deb_info(args...)  dprintk(dvb_usb_cinergyt2_debug,  0x001, args)
+#define deb_xfer(args...)  dprintk(dvb_usb_cinergyt2_debug,  0x002, args)
+#define deb_pll(args...)   dprintk(dvb_usb_cinergyt2_debug,  0x004, args)
+#define deb_ts(args...)    dprintk(dvb_usb_cinergyt2_debug,  0x008, args)
+#define deb_err(args...)   dprintk(dvb_usb_cinergyt2_debug,  0x010, args)
+#define deb_rc(args...)    dprintk(dvb_usb_cinergyt2_debug,  0x020, args)
+#define deb_fw(args...)    dprintk(dvb_usb_cinergyt2_debug,  0x040, args)
+#define deb_mem(args...)   dprintk(dvb_usb_cinergyt2_debug,  0x080, args)
+#define deb_uxfer(args...) dprintk(dvb_usb_cinergyt2_debug,  0x100, args)
+
+
+
+enum cinergyt2_ep1_cmd {
+        CINERGYT2_EP1_PID_TABLE_RESET           = 0x01,
+        CINERGYT2_EP1_PID_SETUP                 = 0x02,
+        CINERGYT2_EP1_CONTROL_STREAM_TRANSFER   = 0x03,
+        CINERGYT2_EP1_SET_TUNER_PARAMETERS      = 0x04,
+        CINERGYT2_EP1_GET_TUNER_STATUS          = 0x05,
+        CINERGYT2_EP1_START_SCAN                = 0x06,
+        CINERGYT2_EP1_CONTINUE_SCAN             = 0x07,
+        CINERGYT2_EP1_GET_RC_EVENTS             = 0x08,
+        CINERGYT2_EP1_SLEEP_MODE                = 0x09,
+        CINERGYT2_EP1_GET_FIRMWARE_VERSION      = 0x0A
+};
+
+
+struct dvbt_get_status_msg {
+        uint32_t freq;
+        uint8_t bandwidth;
+        uint16_t tps;
+        uint8_t flags;
+        uint16_t gain;
+        uint8_t snr;
+        uint32_t viterbi_error_rate;
+        uint32_t rs_error_rate;
+        uint32_t uncorrected_block_count;
+        uint8_t lock_bits;
+        uint8_t prev_lock_bits;
+} __attribute__((packed));
+
+
+struct dvbt_set_parameters_msg {
+        uint8_t cmd;
+        uint32_t freq;
+        uint8_t bandwidth;
+        uint16_t tps;
+        uint8_t flags;
+} __attribute__((packed));
+
+
+extern struct dvb_frontend *cinergyt2_fe_attach(struct dvb_usb_device *d);
+
+#endif /* _DVB_USB_CINERGYT2_H_ */
+
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index 563400277a42..406d7fba369d 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -36,6 +36,9 @@
 #include "tuner-xc2028.h"
 #include "tuner-simple.h"
 #include "mxl5005s.h"
+#include "dib7000p.h"
+#include "dib0070.h"
+#include "lgs8gl5.h"
 
 /* debug */
 static int dvb_usb_cxusb_debug;
@@ -109,6 +112,25 @@ static void cxusb_nano2_led(struct dvb_usb_device *d, int onoff)
         cxusb_bluebird_gpio_rw(d, 0x40, onoff ? 0 : 0x40);
 }
 
+static int cxusb_d680_dmb_gpio_tuner(struct dvb_usb_device *d,
+                u8 addr, int onoff)
+{
+        u8  o[2] = {addr, onoff};
+        u8  i;
+        int rc;
+
+        rc = cxusb_ctrl_msg(d, CMD_GPIO_WRITE, o, 2, &i, 1);
+
+        if (rc < 0)
+                return rc;
+        if (i == 0x01)
+                return 0;
+        else {
+                deb_info("gpio_write failed.\n");
+                return -EIO;
+        }
+}
+
 /* I2C */
 static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
                           int num)
@@ -262,6 +284,20 @@ static int cxusb_nano2_power_ctrl(struct dvb_usb_device *d, int onoff)
         return rc;
 }
 
+static int cxusb_d680_dmb_power_ctrl(struct dvb_usb_device *d, int onoff)
+{
+        int ret;
+        u8  b;
+        ret = cxusb_power_ctrl(d, onoff);
+        if (!onoff)
+                return ret;
+
+        msleep(128);
+        cxusb_ctrl_msg(d, CMD_DIGITAL, NULL, 0, &b, 1);
+        msleep(100);
+        return ret;
+}
+
 static int cxusb_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
 {
         u8 buf[2] = { 0x03, 0x00 };
@@ -283,6 +319,67 @@ static int cxusb_aver_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
         return 0;
 }
 
+static void cxusb_d680_dmb_drain_message(struct dvb_usb_device *d)
+{
+        int       ep = d->props.generic_bulk_ctrl_endpoint;
+        const int timeout = 100;
+        const int junk_len = 32;
+        u8        *junk;
+        int       rd_count;
+
+        /* Discard remaining data in video pipe */
+        junk = kmalloc(junk_len, GFP_KERNEL);
+        if (!junk)
+                return;
+        while (1) {
+                if (usb_bulk_msg(d->udev,
+                        usb_rcvbulkpipe(d->udev, ep),
+                        junk, junk_len, &rd_count, timeout) < 0)
+                        break;
+                if (!rd_count)
+                        break;
+        }
+        kfree(junk);
+}
+
+static void cxusb_d680_dmb_drain_video(struct dvb_usb_device *d)
+{
+        struct usb_data_stream_properties *p = &d->props.adapter[0].stream;
+        const int timeout = 100;
+        const int junk_len = p->u.bulk.buffersize;
+        u8        *junk;
+        int       rd_count;
+
+        /* Discard remaining data in video pipe */
+        junk = kmalloc(junk_len, GFP_KERNEL);
+        if (!junk)
+                return;
+        while (1) {
+                if (usb_bulk_msg(d->udev,
+                        usb_rcvbulkpipe(d->udev, p->endpoint),
+                        junk, junk_len, &rd_count, timeout) < 0)
+                        break;
+                if (!rd_count)
+                        break;
+        }
+        kfree(junk);
+}
+
+static int cxusb_d680_dmb_streaming_ctrl(
+                struct dvb_usb_adapter *adap, int onoff)
+{
+        if (onoff) {
+                u8 buf[2] = { 0x03, 0x00 };
+                cxusb_d680_dmb_drain_video(adap->dev);
+                return cxusb_ctrl_msg(adap->dev, CMD_STREAMING_ON,
+                        buf, sizeof(buf), NULL, 0);
+        } else {
+                int ret = cxusb_ctrl_msg(adap->dev,
+                        CMD_STREAMING_OFF, NULL, 0, NULL, 0);
+                return ret;
+        }
+}
+
 static int cxusb_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 {
         struct dvb_usb_rc_key *keymap = d->props.rc_key_map;
@@ -335,6 +432,32 @@ static int cxusb_bluebird2_rc_query(struct dvb_usb_device *d, u32 *event,
         return 0;
 }
 
+static int cxusb_d680_dmb_rc_query(struct dvb_usb_device *d, u32 *event,
+                int *state)
+{
+        struct dvb_usb_rc_key *keymap = d->props.rc_key_map;
+        u8 ircode[2];
+        int i;
+
+        *event = 0;
+        *state = REMOTE_NO_KEY_PRESSED;
+
+        if (cxusb_ctrl_msg(d, 0x10, NULL, 0, ircode, 2) < 0)
+                return 0;
+
+        for (i = 0; i < d->props.rc_key_map_size; i++) {
+                if (keymap[i].custom == ircode[0] &&
+                    keymap[i].data == ircode[1]) {
+                        *event = keymap[i].event;
+                        *state = REMOTE_KEY_PRESSED;
+
+                        return 0;
+                }
+        }
+
+        return 0;
+}
+
 static struct dvb_usb_rc_key dvico_mce_rc_keys[] = {
         { 0xfe, 0x02, KEY_TV },
         { 0xfe, 0x0e, KEY_MP3 },
@@ -422,6 +545,44 @@ static struct dvb_usb_rc_key dvico_portable_rc_keys[] = {
         { 0xfc, 0x00, KEY_UNKNOWN },    /* HD */
 };
 
+static struct dvb_usb_rc_key d680_dmb_rc_keys[] = {
+        { 0x00, 0x38, KEY_UNKNOWN },    /* TV/AV */
+        { 0x08, 0x0c, KEY_ZOOM },
+        { 0x08, 0x00, KEY_0 },
+        { 0x00, 0x01, KEY_1 },
+        { 0x08, 0x02, KEY_2 },
+        { 0x00, 0x03, KEY_3 },
+        { 0x08, 0x04, KEY_4 },
+        { 0x00, 0x05, KEY_5 },
+        { 0x08, 0x06, KEY_6 },
+        { 0x00, 0x07, KEY_7 },
+        { 0x08, 0x08, KEY_8 },
+        { 0x00, 0x09, KEY_9 },
+        { 0x00, 0x0a, KEY_MUTE },
+        { 0x08, 0x29, KEY_BACK },
+        { 0x00, 0x12, KEY_CHANNELUP },
+        { 0x08, 0x13, KEY_CHANNELDOWN },
+        { 0x00, 0x2b, KEY_VOLUMEUP },
+        { 0x08, 0x2c, KEY_VOLUMEDOWN },
+        { 0x00, 0x20, KEY_UP },
+        { 0x08, 0x21, KEY_DOWN },
+        { 0x00, 0x11, KEY_LEFT },
+        { 0x08, 0x10, KEY_RIGHT },
+        { 0x00, 0x0d, KEY_OK },
+        { 0x08, 0x1f, KEY_RECORD },
+        { 0x00, 0x17, KEY_PLAYPAUSE },
+        { 0x08, 0x16, KEY_PLAYPAUSE },
+        { 0x00, 0x0b, KEY_STOP },
+        { 0x08, 0x27, KEY_FASTFORWARD },
+        { 0x00, 0x26, KEY_REWIND },
+        { 0x08, 0x1e, KEY_UNKNOWN },    /* Time Shift */
+        { 0x00, 0x0e, KEY_UNKNOWN },    /* Snapshot */
+        { 0x08, 0x2d, KEY_UNKNOWN },    /* Mouse Cursor */
+        { 0x00, 0x0f, KEY_UNKNOWN },    /* Minimize/Maximize */
+        { 0x08, 0x14, KEY_UNKNOWN },    /* Shuffle */
+        { 0x00, 0x25, KEY_POWER },
+};
+
 static int cxusb_dee1601_demod_init(struct dvb_frontend* fe)
 {
         static u8 clock_config []  = { CLOCK_CTL,  0x38, 0x28 };
@@ -527,6 +688,24 @@ static struct mxl5005s_config aver_a868r_tuner = {
         .AgcMasterByte   = 0x00,
 };
 
+/* FIXME: needs tweaking */
+static struct mxl5005s_config d680_dmb_tuner = {
+        .i2c_address     = 0x63,
+        .if_freq         = 36125000UL,
+        .xtal_freq       = CRYSTAL_FREQ_16000000HZ,
+        .agc_mode        = MXL_SINGLE_AGC,
+        .tracking_filter = MXL_TF_C,
+        .rssi_enable     = MXL_RSSI_ENABLE,
+        .cap_select      = MXL_CAP_SEL_ENABLE,
+        .div_out         = MXL_DIV_OUT_4,
+        .clock_out       = MXL_CLOCK_OUT_DISABLE,
+        .output_load     = MXL5005S_IF_OUTPUT_LOAD_200_OHM,
+        .top             = MXL5005S_TOP_25P2,
+        .mod_mode        = MXL_DIGITAL_MODE,
+        .if_mode         = MXL_ZERO_IF,
+        .AgcMasterByte   = 0x00,
+};
+
 /* Callbacks for DVB USB */
 static int cxusb_fmd1216me_tuner_attach(struct dvb_usb_adapter *adap)
 {
@@ -563,7 +742,8 @@ static int cxusb_lgh064f_tuner_attach(struct dvb_usb_adapter *adap)
         return 0;
 }
 
-static int dvico_bluebird_xc2028_callback(void *ptr, int command, int arg)
+static int dvico_bluebird_xc2028_callback(void *ptr, int component,
+                                          int command, int arg)
 {
         struct dvb_usb_adapter *adap = ptr;
         struct dvb_usb_device *d = adap->dev;
@@ -591,14 +771,16 @@ static int cxusb_dvico_xc3028_tuner_attach(struct dvb_usb_adapter *adap)
         struct xc2028_config      cfg = {
                 .i2c_adap  = &adap->dev->i2c_adap,
                 .i2c_addr  = 0x61,
-                .callback  = dvico_bluebird_xc2028_callback,
         };
         static struct xc2028_ctrl ctl = {
-                .fname       = "xc3028-v27.fw",
+                .fname       = XC2028_DEFAULT_FIRMWARE,
                 .max_len     = 64,
                 .demod       = XC3028_FE_ZARLINK456,
         };
 
+        /* FIXME: generalize & move to common area */
+        adap->fe->callback = dvico_bluebird_xc2028_callback;
+
         fe = dvb_attach(xc2028_attach, adap->fe, &cfg);
         if (fe == NULL || fe->ops.tuner_ops.set_config == NULL)
                 return -EIO;
@@ -615,6 +797,14 @@ static int cxusb_mxl5003s_tuner_attach(struct dvb_usb_adapter *adap)
         return 0;
 }
 
+static int cxusb_d680_dmb_tuner_attach(struct dvb_usb_adapter *adap)
+{
+        struct dvb_frontend *fe;
+        fe = dvb_attach(mxl5005s_attach, adap->fe,
+                        &adap->dev->i2c_adap, &d680_dmb_tuner);
+        return (fe == NULL) ? -EIO : 0;
+}
+
 static int cxusb_cx22702_frontend_attach(struct dvb_usb_adapter *adap)
 {
         u8 b;
@@ -726,6 +916,159 @@ no_IR:
         return 0;
 }
 
+static struct dibx000_agc_config dib7070_agc_config = {
+        .band_caps = BAND_UHF | BAND_VHF | BAND_LBAND | BAND_SBAND,
+
+        /*
+         * P_agc_use_sd_mod1=0, P_agc_use_sd_mod2=0, P_agc_freq_pwm_div=5,
+         * P_agc_inv_pwm1=0, P_agc_inv_pwm2=0, P_agc_inh_dc_rv_est=0,
+         * P_agc_time_est=3, P_agc_freeze=0, P_agc_nb_est=5, P_agc_write=0
+         */
+        .setup = (0 << 15) | (0 << 14) | (5 << 11) | (0 << 10) | (0 << 9) |
+                 (0 << 8) | (3 << 5) | (0 << 4) | (5 << 1) | (0 << 0),
+        .inv_gain = 600,
+        .time_stabiliz = 10,
+        .alpha_level = 0,
+        .thlock = 118,
+        .wbd_inv = 0,
+        .wbd_ref = 3530,
+        .wbd_sel = 1,
+        .wbd_alpha = 5,
+        .agc1_max = 65535,
+        .agc1_min = 0,
+        .agc2_max = 65535,
+        .agc2_min = 0,
+        .agc1_pt1 = 0,
+        .agc1_pt2 = 40,
+        .agc1_pt3 = 183,
+        .agc1_slope1 = 206,
+        .agc1_slope2 = 255,
+        .agc2_pt1 = 72,
+        .agc2_pt2 = 152,
+        .agc2_slope1 = 88,
+        .agc2_slope2 = 90,
+        .alpha_mant = 17,
+        .alpha_exp = 27,
+        .beta_mant = 23,
+        .beta_exp = 51,
+        .perform_agc_softsplit = 0,
+};
+
+static struct dibx000_bandwidth_config dib7070_bw_config_12_mhz = {
+        .internal = 60000,
+        .sampling = 15000,
+        .pll_prediv = 1,
+        .pll_ratio = 20,
+        .pll_range = 3,
+        .pll_reset = 1,
+        .pll_bypass = 0,
+        .enable_refdiv = 0,
+        .bypclk_div = 0,
+        .IO_CLK_en_core = 1,
+        .ADClkSrc = 1,
+        .modulo = 2,
+        /* refsel, sel, freq_15k */
+        .sad_cfg = (3 << 14) | (1 << 12) | (524 << 0),
+        .ifreq = (0 << 25) | 0,
+        .timf = 20452225,
+        .xtal_hz = 12000000,
+};
+
+static struct dib7000p_config cxusb_dualdig4_rev2_config = {
+        .output_mode = OUTMODE_MPEG2_PAR_GATED_CLK,
+        .output_mpeg2_in_188_bytes = 1,
+
+        .agc_config_count = 1,
+        .agc = &dib7070_agc_config,
+        .bw  = &dib7070_bw_config_12_mhz,
+        .tuner_is_baseband = 1,
+        .spur_protect = 1,
+
+        .gpio_dir = 0xfcef,
+        .gpio_val = 0x0110,
+
+        .gpio_pwm_pos = DIB7000P_GPIO_DEFAULT_PWM_POS,
+
+        .hostbus_diversity = 1,
+};
+
+static int cxusb_dualdig4_rev2_frontend_attach(struct dvb_usb_adapter *adap)
+{
+        if (usb_set_interface(adap->dev->udev, 0, 1) < 0)
+                err("set interface failed");
+
+        cxusb_ctrl_msg(adap->dev, CMD_DIGITAL, NULL, 0, NULL, 0);
+
+        cxusb_bluebird_gpio_pulse(adap->dev, 0x02, 1);
+
+        dib7000p_i2c_enumeration(&adap->dev->i2c_adap, 1, 18,
+                                 &cxusb_dualdig4_rev2_config);
+
+        adap->fe = dvb_attach(dib7000p_attach, &adap->dev->i2c_adap, 0x80,
+                              &cxusb_dualdig4_rev2_config);
+        if (adap->fe == NULL)
+                return -EIO;
+
+        return 0;
+}
+
+static int dib7070_tuner_reset(struct dvb_frontend *fe, int onoff)
+{
+        return dib7000p_set_gpio(fe, 8, 0, !onoff);
+}
+
+static int dib7070_tuner_sleep(struct dvb_frontend *fe, int onoff)
+{
+        return 0;
+}
+
+static struct dib0070_config dib7070p_dib0070_config = {
+        .i2c_address = DEFAULT_DIB0070_I2C_ADDRESS,
+        .reset = dib7070_tuner_reset,
+        .sleep = dib7070_tuner_sleep,
+        .clock_khz = 12000,
+};
+
+struct dib0700_adapter_state {
+        int (*set_param_save) (struct dvb_frontend *,
+                               struct dvb_frontend_parameters *);
+};
+
+static int dib7070_set_param_override(struct dvb_frontend *fe,
+                                      struct dvb_frontend_parameters *fep)
+{
+        struct dvb_usb_adapter *adap = fe->dvb->priv;
+        struct dib0700_adapter_state *state = adap->priv;
+
+        u16 offset;
+        u8 band = BAND_OF_FREQUENCY(fep->frequency/1000);
+        switch (band) {
+        case BAND_VHF: offset = 950; break;
+        default:
+        case BAND_UHF: offset = 550; break;
+        }
+
+        dib7000p_set_wbd_ref(fe, offset + dib0070_wbd_offset(fe));
+
+        return state->set_param_save(fe, fep);
+}
+
+static int cxusb_dualdig4_rev2_tuner_attach(struct dvb_usb_adapter *adap)
+{
+        struct dib0700_adapter_state *st = adap->priv;
+        struct i2c_adapter *tun_i2c =
+                dib7000p_get_i2c_master(adap->fe,
+                                        DIBX000_I2C_INTERFACE_TUNER, 1);
+
+        if (dvb_attach(dib0070_attach, adap->fe, tun_i2c,
+            &dib7070p_dib0070_config) == NULL)
+                return -ENODEV;
+
+        st->set_param_save = adap->fe->ops.tuner_ops.set_params;
+        adap->fe->ops.tuner_ops.set_params = dib7070_set_param_override;
+        return 0;
+}
+
 static int cxusb_nano2_frontend_attach(struct dvb_usb_adapter *adap)
 {
         if (usb_set_interface(adap->dev->udev, 0, 1) < 0)
@@ -751,6 +1094,54 @@ static int cxusb_nano2_frontend_attach(struct dvb_usb_adapter *adap)
         return -EIO;
 }
 
+static struct lgs8gl5_config lgs8gl5_cfg = {
+        .demod_address = 0x19,
+};
+
+static int cxusb_d680_dmb_frontend_attach(struct dvb_usb_adapter *adap)
+{
+        struct dvb_usb_device *d = adap->dev;
+        int n;
+
+        /* Select required USB configuration */
+        if (usb_set_interface(d->udev, 0, 0) < 0)
+                err("set interface failed");
+
+        /* Unblock all USB pipes */
+        usb_clear_halt(d->udev,
+                usb_sndbulkpipe(d->udev, d->props.generic_bulk_ctrl_endpoint));
+        usb_clear_halt(d->udev,
+                usb_rcvbulkpipe(d->udev, d->props.generic_bulk_ctrl_endpoint));
+        usb_clear_halt(d->udev,
+                usb_rcvbulkpipe(d->udev, d->props.adapter[0].stream.endpoint));
+
+        /* Drain USB pipes to avoid hang after reboot */
+        for (n = 0;  n < 5;  n++) {
+                cxusb_d680_dmb_drain_message(d);
+                cxusb_d680_dmb_drain_video(d);
+                msleep(200);
+        }
+
+        /* Reset the tuner */
+        if (cxusb_d680_dmb_gpio_tuner(d, 0x07, 0) < 0) {
+                err("clear tuner gpio failed");
+                return -EIO;
+        }
+        msleep(100);
+        if (cxusb_d680_dmb_gpio_tuner(d, 0x07, 1) < 0) {
+                err("set tuner gpio failed");
+                return -EIO;
+        }
+        msleep(100);
+
+        /* Attach frontend */
+        adap->fe = dvb_attach(lgs8gl5_attach, &lgs8gl5_cfg, &d->i2c_adap);
+        if (adap->fe == NULL)
+                return -EIO;
+
+        return 0;
+}
+
 /*
  * DViCO has shipped two devices with the same USB ID, but only one of them
  * needs a firmware download.  Check the device class details to see if they
@@ -826,9 +1217,11 @@ static struct dvb_usb_device_properties cxusb_bluebird_dee1601_properties;
 static struct dvb_usb_device_properties cxusb_bluebird_lgz201_properties;
 static struct dvb_usb_device_properties cxusb_bluebird_dtt7579_properties;
 static struct dvb_usb_device_properties cxusb_bluebird_dualdig4_properties;
+static struct dvb_usb_device_properties cxusb_bluebird_dualdig4_rev2_properties;
 static struct dvb_usb_device_properties cxusb_bluebird_nano2_properties;
 static struct dvb_usb_device_properties cxusb_bluebird_nano2_needsfirmware_properties;
 static struct dvb_usb_device_properties cxusb_aver_a868r_properties;
+static struct dvb_usb_device_properties cxusb_d680_dmb_properties;
 
 static int cxusb_probe(struct usb_interface *intf,
                        const struct usb_device_id *id)
@@ -852,6 +1245,11 @@ static int cxusb_probe(struct usb_interface *intf,
                                      THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf, &cxusb_aver_a868r_properties,
                                      THIS_MODULE, NULL, adapter_nr) ||
+            0 == dvb_usb_device_init(intf,
+                                     &cxusb_bluebird_dualdig4_rev2_properties,
+                                     THIS_MODULE, NULL, adapter_nr) ||
+            0 == dvb_usb_device_init(intf, &cxusb_d680_dmb_properties,
+                                     THIS_MODULE, NULL, adapter_nr) ||
             0)
                 return 0;
 
@@ -876,6 +1274,8 @@ static struct usb_device_id cxusb_table [] = {
         { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DVB_T_NANO_2) },
         { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DVB_T_NANO_2_NFW_WARM) },
         { USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_A868R) },
+        { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_4_REV_2) },
+        { USB_DEVICE(USB_VID_CONEXANT, USB_PID_CONEXANT_D680_DMB) },
         {}              /* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, cxusb_table);
@@ -1321,6 +1721,104 @@ static struct dvb_usb_device_properties cxusb_aver_a868r_properties = {
         }
 };
 
+static
+struct dvb_usb_device_properties cxusb_bluebird_dualdig4_rev2_properties = {
+        .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+
+        .usb_ctrl         = CYPRESS_FX2,
+
+        .size_of_priv     = sizeof(struct cxusb_state),
+
+        .num_adapters = 1,
+        .adapter = {
+                {
+                        .streaming_ctrl  = cxusb_streaming_ctrl,
+                        .frontend_attach = cxusb_dualdig4_rev2_frontend_attach,
+                        .tuner_attach    = cxusb_dualdig4_rev2_tuner_attach,
+                        .size_of_priv    = sizeof(struct dib0700_adapter_state),
+                        /* parameter for the MPEG2-data transfer */
+                        .stream = {
+                                .type = USB_BULK,
+                                .count = 7,
+                                .endpoint = 0x02,
+                                .u = {
+                                        .bulk = {
+                                                .buffersize = 4096,
+                                        }
+                                }
+                        },
+                },
+        },
+
+        .power_ctrl       = cxusb_bluebird_power_ctrl,
+
+        .i2c_algo         = &cxusb_i2c_algo,
+
+        .generic_bulk_ctrl_endpoint = 0x01,
+
+        .rc_interval      = 100,
+        .rc_key_map       = dvico_mce_rc_keys,
+        .rc_key_map_size  = ARRAY_SIZE(dvico_mce_rc_keys),
+        .rc_query         = cxusb_rc_query,
+
+        .num_device_descs = 1,
+        .devices = {
+                {   "DViCO FusionHDTV DVB-T Dual Digital 4 (rev 2)",
+                        { NULL },
+                        { &cxusb_table[17], NULL },
+                },
+        }
+};
+
+static struct dvb_usb_device_properties cxusb_d680_dmb_properties = {
+        .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+
+        .usb_ctrl         = CYPRESS_FX2,
+
+        .size_of_priv     = sizeof(struct cxusb_state),
+
+        .num_adapters = 1,
+        .adapter = {
+                {
+                        .streaming_ctrl   = cxusb_d680_dmb_streaming_ctrl,
+                        .frontend_attach  = cxusb_d680_dmb_frontend_attach,
+                        .tuner_attach     = cxusb_d680_dmb_tuner_attach,
+
+                        /* parameter for the MPEG2-data transfer */
+                        .stream = {
+                                .type = USB_BULK,
+                                .count = 5,
+                                .endpoint = 0x02,
+                                .u = {
+                                        .bulk = {
+                                                .buffersize = 8192,
+                                        }
+                                }
+                        },
+                },
+        },
+
+        .power_ctrl       = cxusb_d680_dmb_power_ctrl,
+
+        .i2c_algo         = &cxusb_i2c_algo,
+
+        .generic_bulk_ctrl_endpoint = 0x01,
+
+        .rc_interval      = 100,
+        .rc_key_map       = d680_dmb_rc_keys,
+        .rc_key_map_size  = ARRAY_SIZE(d680_dmb_rc_keys),
+        .rc_query         = cxusb_d680_dmb_rc_query,
+
+        .num_device_descs = 1,
+        .devices = {
+                {
+                        "Conexant DMB-TH Stick",
+                        { NULL },
+                        { &cxusb_table[18], NULL },
+                },
+        }
+};
+
 static struct usb_driver cxusb_driver = {
         .name           = "dvb_usb_cxusb",
         .probe          = cxusb_probe,
diff --git a/drivers/media/dvb/dvb-usb/dib0700.h b/drivers/media/dvb/dvb-usb/dib0700.h
index 66d4dc6ba46f..739193943c17 100644
--- a/drivers/media/dvb/dvb-usb/dib0700.h
+++ b/drivers/media/dvb/dvb-usb/dib0700.h
@@ -31,6 +31,8 @@ extern int dvb_usb_dib0700_debug;
         // 2 Byte: MPEG2 mode:  4MSB(1 = Master Mode, 0 = Slave Mode) 4LSB(Channel 1 = bit0, Channel 2 = bit1)
         // 2 Byte: Analog mode: 4MSB(0 = 625 lines, 1 = 525 lines)    4LSB(     "                "           )
 #define REQUEST_SET_RC       0x11
+#define REQUEST_NEW_I2C_READ 0x12
+#define REQUEST_NEW_I2C_WRITE 0x13
 #define REQUEST_GET_VERSION  0x15
 
 struct dib0700_state {
@@ -39,6 +41,8 @@ struct dib0700_state {
         u8 rc_toggle;
         u8 rc_counter;
         u8 is_dib7000pc;
+        u8 fw_use_new_i2c_api;
+        u8 disable_streaming_master_mode;
 };
 
 extern int dib0700_set_gpio(struct dvb_usb_device *, enum dib07x0_gpios gpio, u8 gpio_dir, u8 gpio_val);
diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c
index 595a04696c87..dd53cee3896d 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_core.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_core.c
@@ -82,9 +82,98 @@ int dib0700_set_gpio(struct dvb_usb_device *d, enum dib07x0_gpios gpio, u8 gpio_
 }
 
 /*
- * I2C master xfer function
+ * I2C master xfer function (supported in 1.20 firmware)
  */
-static int dib0700_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg *msg,int num)
+static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg,
+                                int num)
+{
+        /* The new i2c firmware messages are more reliable and in particular
+           properly support i2c read calls not preceded by a write */
+
+        struct dvb_usb_device *d = i2c_get_adapdata(adap);
+        uint8_t bus_mode = 1;  /* 0=eeprom bus, 1=frontend bus */
+        uint8_t gen_mode = 0; /* 0=master i2c, 1=gpio i2c */
+        uint8_t en_start = 0;
+        uint8_t en_stop = 0;
+        uint8_t buf[255]; /* TBV: malloc ? */
+        int result, i;
+
+        /* Ensure nobody else hits the i2c bus while we're sending our
+           sequence of messages, (such as the remote control thread) */
+        if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
+                return -EAGAIN;
+
+        for (i = 0; i < num; i++) {
+                if (i == 0) {
+                        /* First message in the transaction */
+                        en_start = 1;
+                } else if (!(msg[i].flags & I2C_M_NOSTART)) {
+                        /* Device supports repeated-start */
+                        en_start = 1;
+                } else {
+                        /* Not the first packet and device doesn't support
+                           repeated start */
+                        en_start = 0;
+                }
+                if (i == (num - 1)) {
+                        /* Last message in the transaction */
+                        en_stop = 1;
+                }
+
+                if (msg[i].flags & I2C_M_RD) {
+                        /* Read request */
+                        u16 index, value;
+                        uint8_t i2c_dest;
+
+                        i2c_dest = (msg[i].addr << 1);
+                        value = ((en_start << 7) | (en_stop << 6) |
+                                 (msg[i].len & 0x3F)) << 8 | i2c_dest;
+                        /* I2C ctrl + FE bus; */
+                        index = ((gen_mode<<6)&0xC0) | ((bus_mode<<4)&0x30);
+
+                        result = usb_control_msg(d->udev,
+                                                 usb_rcvctrlpipe(d->udev, 0),
+                                                 REQUEST_NEW_I2C_READ,
+                                                 USB_TYPE_VENDOR | USB_DIR_IN,
+                                                 value, index, msg[i].buf,
+                                                 msg[i].len,
+                                                 USB_CTRL_GET_TIMEOUT);
+                        if (result < 0) {
+                                err("i2c read error (status = %d)\n", result);
+                                break;
+                        }
+                } else {
+                        /* Write request */
+                        buf[0] = REQUEST_NEW_I2C_WRITE;
+                        buf[1] = (msg[i].addr << 1);
+                        buf[2] = (en_start << 7) | (en_stop << 6) |
+                                (msg[i].len & 0x3F);
+                        /* I2C ctrl + FE bus; */
+                        buf[3] = ((gen_mode<<6)&0xC0) | ((bus_mode<<4)&0x30);
+                        /* The Actual i2c payload */
+                        memcpy(&buf[4], msg[i].buf, msg[i].len);
+
+                        result = usb_control_msg(d->udev,
+                                                 usb_sndctrlpipe(d->udev, 0),
+                                                 REQUEST_NEW_I2C_WRITE,
+                                                 USB_TYPE_VENDOR | USB_DIR_OUT,
+                                                 0, 0, buf, msg[i].len + 4,
+                                                 USB_CTRL_GET_TIMEOUT);
+                        if (result < 0) {
+                                err("i2c write error (status = %d)\n", result);
+                                break;
+                        }
+                }
+        }
+        mutex_unlock(&d->i2c_mutex);
+        return i;
+}
+
+/*
+ * I2C master xfer function (pre-1.20 firmware)
+ */
+static int dib0700_i2c_xfer_legacy(struct i2c_adapter *adap,
+                                   struct i2c_msg *msg, int num)
 {
         struct dvb_usb_device *d = i2c_get_adapdata(adap);
         int i,len;
@@ -124,6 +213,21 @@ static int dib0700_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg *msg,int num
         return i;
 }
 
+static int dib0700_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
+                            int num)
+{
+        struct dvb_usb_device *d = i2c_get_adapdata(adap);
+        struct dib0700_state *st = d->priv;
+
+        if (st->fw_use_new_i2c_api == 1) {
+                /* User running at least fw 1.20 */
+                return dib0700_i2c_xfer_new(adap, msg, num);
+        } else {
+                /* Use legacy calls */
+                return dib0700_i2c_xfer_legacy(adap, msg, num);
+        }
+}
+
 static u32 dib0700_i2c_func(struct i2c_adapter *adapter)
 {
         return I2C_FUNC_I2C;
@@ -246,7 +350,12 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
 
         b[0] = REQUEST_ENABLE_VIDEO;
         b[1] = (onoff << 4) | 0x00; /* this bit gives a kind of command, rather than enabling something or not */
-        b[2] = (0x01 << 4); /* Master mode */
+
+        if (st->disable_streaming_master_mode == 1)
+                b[2] = 0x00;
+        else
+                b[2] = (0x01 << 4); /* Master mode */
+
         b[3] = 0x00;
 
         deb_info("modifying (%d) streaming state for %d\n", onoff, adap->id);
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index 6c0e5c5f4362..0cfccc24b190 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -14,6 +14,8 @@
 #include "mt2060.h"
 #include "mt2266.h"
 #include "tuner-xc2028.h"
+#include "xc5000.h"
+#include "s5h1411.h"
 #include "dib0070.h"
 
 static int force_lna_activation;
@@ -366,7 +368,8 @@ static struct dib7000p_config stk7700ph_dib7700_xc3028_config = {
         .gpio_pwm_pos = DIB7000P_GPIO_DEFAULT_PWM_POS,
 };
 
-static int stk7700ph_xc3028_callback(void *ptr, int command, int arg)
+static int stk7700ph_xc3028_callback(void *ptr, int component,
+                                     int command, int arg)
 {
         struct dvb_usb_adapter *adap = ptr;
 
@@ -394,7 +397,6 @@ static struct xc2028_ctrl stk7700ph_xc3028_ctrl = {
 
 static struct xc2028_config stk7700ph_xc3028_config = {
         .i2c_addr = 0x61,
-        .callback = stk7700ph_xc3028_callback,
         .ctrl = &stk7700ph_xc3028_ctrl,
 };
 
@@ -435,7 +437,9 @@ static int stk7700ph_tuner_attach(struct dvb_usb_adapter *adap)
                 DIBX000_I2C_INTERFACE_TUNER, 1);
 
         stk7700ph_xc3028_config.i2c_adap = tun_i2c;
-        stk7700ph_xc3028_config.video_dev = adap;
+
+        /* FIXME: generalize & move to common area */
+        adap->fe->callback = stk7700ph_xc3028_callback;
 
         return dvb_attach(xc2028_attach, adap->fe, &stk7700ph_xc3028_config)
                 == NULL ? -ENODEV : 0;
@@ -677,6 +681,43 @@ static struct dvb_usb_rc_key dib0700_rc_keys[] = {
         { 0x01, 0x7d, KEY_VOLUMEDOWN },
         { 0x02, 0x42, KEY_CHANNELUP },
         { 0x00, 0x7d, KEY_CHANNELDOWN },
+
+        /* Key codes for Nova-TD "credit card" remote control. */
+        { 0x1d, 0x00, KEY_0 },
+        { 0x1d, 0x01, KEY_1 },
+        { 0x1d, 0x02, KEY_2 },
+        { 0x1d, 0x03, KEY_3 },
+        { 0x1d, 0x04, KEY_4 },
+        { 0x1d, 0x05, KEY_5 },
+        { 0x1d, 0x06, KEY_6 },
+        { 0x1d, 0x07, KEY_7 },
+        { 0x1d, 0x08, KEY_8 },
+        { 0x1d, 0x09, KEY_9 },
+        { 0x1d, 0x0a, KEY_TEXT },
+        { 0x1d, 0x0d, KEY_MENU },
+        { 0x1d, 0x0f, KEY_MUTE },
+        { 0x1d, 0x10, KEY_VOLUMEUP },
+        { 0x1d, 0x11, KEY_VOLUMEDOWN },
+        { 0x1d, 0x12, KEY_CHANNEL },
+        { 0x1d, 0x14, KEY_UP },
+        { 0x1d, 0x15, KEY_DOWN },
+        { 0x1d, 0x16, KEY_LEFT },
+        { 0x1d, 0x17, KEY_RIGHT },
+        { 0x1d, 0x1c, KEY_TV },
+        { 0x1d, 0x1e, KEY_NEXT },
+        { 0x1d, 0x1f, KEY_BACK },
+        { 0x1d, 0x20, KEY_CHANNELUP },
+        { 0x1d, 0x21, KEY_CHANNELDOWN },
+        { 0x1d, 0x24, KEY_LAST },
+        { 0x1d, 0x25, KEY_OK },
+        { 0x1d, 0x30, KEY_PAUSE },
+        { 0x1d, 0x32, KEY_REWIND },
+        { 0x1d, 0x34, KEY_FASTFORWARD },
+        { 0x1d, 0x35, KEY_PLAY },
+        { 0x1d, 0x36, KEY_STOP },
+        { 0x1d, 0x37, KEY_RECORD },
+        { 0x1d, 0x3b, KEY_GOTO },
+        { 0x1d, 0x3d, KEY_POWER },
 };
 
 /* STK7700P: Hauppauge Nova-T Stick, AVerMedia Volar */
@@ -1078,6 +1119,97 @@ static int stk7070pd_frontend_attach1(struct dvb_usb_adapter *adap)
         return adap->fe == NULL ? -ENODEV : 0;
 }
 
+/* S5H1411 */
+static struct s5h1411_config pinnacle_801e_config = {
+        .output_mode   = S5H1411_PARALLEL_OUTPUT,
+        .gpio          = S5H1411_GPIO_OFF,
+        .mpeg_timing   = S5H1411_MPEGTIMING_NONCONTINOUS_NONINVERTING_CLOCK,
+        .qam_if        = S5H1411_IF_44000,
+        .vsb_if        = S5H1411_IF_44000,
+        .inversion     = S5H1411_INVERSION_OFF,
+        .status_mode   = S5H1411_DEMODLOCKING
+};
+
+/* Pinnacle PCTV HD Pro 801e GPIOs map:
+   GPIO0  - currently unknown
+   GPIO1  - xc5000 tuner reset
+   GPIO2  - CX25843 sleep
+   GPIO3  - currently unknown
+   GPIO4  - currently unknown
+   GPIO6  - currently unknown
+   GPIO7  - currently unknown
+   GPIO9  - currently unknown
+   GPIO10 - CX25843 reset
+ */
+static int s5h1411_frontend_attach(struct dvb_usb_adapter *adap)
+{
+        struct dib0700_state *st = adap->dev->priv;
+
+        /* Make use of the new i2c functions from FW 1.20 */
+        st->fw_use_new_i2c_api = 1;
+
+        /* The s5h1411 requires the dib0700 to not be in master mode */
+        st->disable_streaming_master_mode = 1;
+
+        /* All msleep values taken from Windows USB trace */
+        dib0700_set_gpio(adap->dev, GPIO0, GPIO_OUT, 0);
+        dib0700_set_gpio(adap->dev, GPIO3, GPIO_OUT, 0);
+        dib0700_set_gpio(adap->dev, GPIO6, GPIO_OUT, 1);
+        msleep(400);
+        dib0700_set_gpio(adap->dev, GPIO10, GPIO_OUT, 0);
+        msleep(60);
+        dib0700_set_gpio(adap->dev, GPIO10, GPIO_OUT, 1);
+        msleep(30);
+        dib0700_set_gpio(adap->dev, GPIO0, GPIO_OUT, 1);
+        dib0700_set_gpio(adap->dev, GPIO9, GPIO_OUT, 1);
+        dib0700_set_gpio(adap->dev, GPIO4, GPIO_OUT, 1);
+        dib0700_set_gpio(adap->dev, GPIO7, GPIO_OUT, 1);
+        dib0700_set_gpio(adap->dev, GPIO2, GPIO_OUT, 0);
+        msleep(30);
+
+        /* Put the CX25843 to sleep for now since we're in digital mode */
+        dib0700_set_gpio(adap->dev, GPIO2, GPIO_OUT, 1);
+
+        /* GPIOs are initialized, do the attach */
+        adap->fe = dvb_attach(s5h1411_attach, &pinnacle_801e_config,
+                              &adap->dev->i2c_adap);
+        return adap->fe == NULL ? -ENODEV : 0;
+}
+
+static int dib0700_xc5000_tuner_callback(void *priv, int component,
+                                         int command, int arg)
+{
+        struct dvb_usb_adapter *adap = priv;
+
+        if (command == XC5000_TUNER_RESET) {
+                /* Reset the tuner */
+                dib0700_set_gpio(adap->dev, GPIO1, GPIO_OUT, 0);
+                msleep(330); /* from Windows USB trace */
+                dib0700_set_gpio(adap->dev, GPIO1, GPIO_OUT, 1);
+                msleep(330); /* from Windows USB trace */
+        } else {
+                err("xc5000: unknown tuner callback command: %d\n", command);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static struct xc5000_config s5h1411_xc5000_tunerconfig = {
+        .i2c_address      = 0x64,
+        .if_khz           = 5380,
+};
+
+static int xc5000_tuner_attach(struct dvb_usb_adapter *adap)
+{
+        /* FIXME: generalize & move to common area */
+        adap->fe->callback = dib0700_xc5000_tuner_callback;
+
+        return dvb_attach(xc5000_attach, adap->fe, &adap->dev->i2c_adap,
+                          &s5h1411_xc5000_tunerconfig)
+                == NULL ? -ENODEV : 0;
+}
+
 /* DVB-USB and USB stuff follows */
 struct usb_device_id dib0700_usb_id_table[] = {
 /* 0 */ { USB_DEVICE(USB_VID_DIBCOM,    USB_PID_DIBCOM_STK7700P) },
@@ -1119,6 +1251,11 @@ struct usb_device_id dib0700_usb_id_table[] = {
         { USB_DEVICE(USB_VID_LEADTEK,   USB_PID_WINFAST_DTV_DONGLE_STK7700P_2) },
 /* 35 */{ USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_TD_STICK_52009) },
         { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_500_3) },
+        { USB_DEVICE(USB_VID_GIGABYTE,  USB_PID_GIGABYTE_U8000) },
+        { USB_DEVICE(USB_VID_YUAN,      USB_PID_YUAN_STK7700PH) },
+        { USB_DEVICE(USB_VID_ASUS,      USB_PID_ASUS_U3000H) },
+/* 40 */{ USB_DEVICE(USB_VID_PINNACLE,  USB_PID_PINNACLE_PCTV801E) },
+        { USB_DEVICE(USB_VID_PINNACLE,  USB_PID_PINNACLE_PCTV801E_SE) },
         { 0 }           /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
@@ -1126,7 +1263,7 @@ MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
 #define DIB0700_DEFAULT_DEVICE_PROPERTIES \
         .caps              = DVB_USB_IS_AN_I2C_ADAPTER, \
         .usb_ctrl          = DEVICE_SPECIFIC, \
-        .firmware          = "dvb-usb-dib0700-1.10.fw", \
+        .firmware          = "dvb-usb-dib0700-1.20.fw", \
         .download_firmware = dib0700_download_firmware, \
         .no_reconnect      = 1, \
         .size_of_priv      = sizeof(struct dib0700_state), \
@@ -1293,7 +1430,12 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                                 { &dib0700_usb_id_table[31], NULL },
                                 { NULL },
                         }
-                }
+                },
+
+                .rc_interval      = DEFAULT_RC_INTERVAL,
+                .rc_key_map       = dib0700_rc_keys,
+                .rc_key_map_size  = ARRAY_SIZE(dib0700_rc_keys),
+                .rc_query         = dib0700_rc_query
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
 
                 .num_adapters = 1,
@@ -1408,7 +1550,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         },
                 },
 
-                .num_device_descs = 3,
+                .num_device_descs = 5,
                 .devices = {
                         {   "Terratec Cinergy HT USB XE",
                                 { &dib0700_usb_id_table[27], NULL },
@@ -1422,6 +1564,47 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                                 { &dib0700_usb_id_table[32], NULL },
                                 { NULL },
                         },
+                        {   "Gigabyte U8000-RH",
+                                { &dib0700_usb_id_table[37], NULL },
+                                { NULL },
+                        },
+                        {   "YUAN High-Tech STK7700PH",
+                                { &dib0700_usb_id_table[38], NULL },
+                                { NULL },
+                        },
+                        {   "Asus My Cinema-U3000Hybrid",
+                                { &dib0700_usb_id_table[39], NULL },
+                                { NULL },
+                        },
+                },
+                .rc_interval      = DEFAULT_RC_INTERVAL,
+                .rc_key_map       = dib0700_rc_keys,
+                .rc_key_map_size  = ARRAY_SIZE(dib0700_rc_keys),
+                .rc_query         = dib0700_rc_query
+        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
+                .num_adapters = 1,
+                .adapter = {
+                        {
+                                .frontend_attach  = s5h1411_frontend_attach,
+                                .tuner_attach     = xc5000_tuner_attach,
+
+                                DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
+
+                                .size_of_priv = sizeof(struct
+                                                dib0700_adapter_state),
+                        },
+                },
+
+                .num_device_descs = 2,
+                .devices = {
+                        {   "Pinnacle PCTV HD Pro USB Stick",
+                                { &dib0700_usb_id_table[40], NULL },
+                                { NULL },
+                        },
+                        {   "Pinnacle PCTV HD USB Stick",
+                                { &dib0700_usb_id_table[41], NULL },
+                                { NULL },
+                        },
                 },
                 .rc_interval      = DEFAULT_RC_INTERVAL,
                 .rc_key_map       = dib0700_rc_keys,
diff --git a/drivers/media/dvb/dvb-usb/dtv5100.c b/drivers/media/dvb/dvb-usb/dtv5100.c
new file mode 100644
index 000000000000..078ce92ca436
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/dtv5100.c
@@ -0,0 +1,240 @@
+/*
+ * DVB USB Linux driver for AME DTV-5100 USB2.0 DVB-T
+ *
+ * Copyright (C) 2008  Antoine Jacquet <royale@zerezo.com>
+ * http://royale.zerezo.com/dtv5100/
+ *
+ * Inspired by gl861.c and au6610.c drivers
+ *
+ * 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 "dtv5100.h"
+#include "zl10353.h"
+#include "qt1010.h"
+
+/* debug */
+static int dvb_usb_dtv5100_debug;
+module_param_named(debug, dvb_usb_dtv5100_debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debugging level" DVB_USB_DEBUG_STATUS);
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
+static int dtv5100_i2c_msg(struct dvb_usb_device *d, u8 addr,
+                           u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen)
+{
+        u8 request;
+        u8 type;
+        u16 value;
+        u16 index;
+
+        switch (wlen) {
+        case 1:
+                /* write { reg }, read { value } */
+                request = (addr == DTV5100_DEMOD_ADDR ? DTV5100_DEMOD_READ :
+                                                        DTV5100_TUNER_READ);
+                type = USB_TYPE_VENDOR | USB_DIR_IN;
+                value = 0;
+                break;
+        case 2:
+                /* write { reg, value } */
+                request = (addr == DTV5100_DEMOD_ADDR ? DTV5100_DEMOD_WRITE :
+                                                        DTV5100_TUNER_WRITE);
+                type = USB_TYPE_VENDOR | USB_DIR_OUT;
+                value = wbuf[1];
+                break;
+        default:
+                warn("wlen = %x, aborting.", wlen);
+                return -EINVAL;
+        }
+        index = (addr << 8) + wbuf[0];
+
+        msleep(1); /* avoid I2C errors */
+        return usb_control_msg(d->udev, usb_rcvctrlpipe(d->udev, 0), request,
+                               type, value, index, rbuf, rlen,
+                               DTV5100_USB_TIMEOUT);
+}
+
+/* I2C */
+static int dtv5100_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
+                            int num)
+{
+        struct dvb_usb_device *d = i2c_get_adapdata(adap);
+        int i;
+
+        if (num > 2)
+                return -EINVAL;
+
+        if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
+                return -EAGAIN;
+
+        for (i = 0; i < num; i++) {
+                /* write/read request */
+                if (i+1 < num && (msg[i+1].flags & I2C_M_RD)) {
+                        if (dtv5100_i2c_msg(d, msg[i].addr, msg[i].buf,
+                                            msg[i].len, msg[i+1].buf,
+                                            msg[i+1].len) < 0)
+                                break;
+                        i++;
+                } else if (dtv5100_i2c_msg(d, msg[i].addr, msg[i].buf,
+                                           msg[i].len, NULL, 0) < 0)
+                                break;
+        }
+
+        mutex_unlock(&d->i2c_mutex);
+        return i;
+}
+
+static u32 dtv5100_i2c_func(struct i2c_adapter *adapter)
+{
+        return I2C_FUNC_I2C;
+}
+
+static struct i2c_algorithm dtv5100_i2c_algo = {
+        .master_xfer   = dtv5100_i2c_xfer,
+        .functionality = dtv5100_i2c_func,
+};
+
+/* Callbacks for DVB USB */
+static struct zl10353_config dtv5100_zl10353_config = {
+        .demod_address = DTV5100_DEMOD_ADDR,
+        .no_tuner = 1,
+        .parallel_ts = 1,
+};
+
+static int dtv5100_frontend_attach(struct dvb_usb_adapter *adap)
+{
+        adap->fe = dvb_attach(zl10353_attach, &dtv5100_zl10353_config,
+                              &adap->dev->i2c_adap);
+        if (adap->fe == NULL)
+                return -EIO;
+
+        /* disable i2c gate, or it won't work... is this safe? */
+        adap->fe->ops.i2c_gate_ctrl = NULL;
+
+        return 0;
+}
+
+static struct qt1010_config dtv5100_qt1010_config = {
+        .i2c_address = DTV5100_TUNER_ADDR
+};
+
+static int dtv5100_tuner_attach(struct dvb_usb_adapter *adap)
+{
+        return dvb_attach(qt1010_attach,
+                          adap->fe, &adap->dev->i2c_adap,
+                          &dtv5100_qt1010_config) == NULL ? -ENODEV : 0;
+}
+
+/* DVB USB Driver stuff */
+static struct dvb_usb_device_properties dtv5100_properties;
+
+static int dtv5100_probe(struct usb_interface *intf,
+                         const struct usb_device_id *id)
+{
+        int i, ret;
+        struct usb_device *udev = interface_to_usbdev(intf);
+
+        /* initialize non qt1010/zl10353 part? */
+        for (i = 0; dtv5100_init[i].request; i++) {
+                ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+                                      dtv5100_init[i].request,
+                                      USB_TYPE_VENDOR | USB_DIR_OUT,
+                                      dtv5100_init[i].value,
+                                      dtv5100_init[i].index, NULL, 0,
+                                      DTV5100_USB_TIMEOUT);
+                if (ret)
+                        return ret;
+        }
+
+        ret = dvb_usb_device_init(intf, &dtv5100_properties,
+                                  THIS_MODULE, NULL, adapter_nr);
+        if (ret)
+                return ret;
+
+        return 0;
+}
+
+static struct usb_device_id dtv5100_table[] = {
+        { USB_DEVICE(0x06be, 0xa232) },
+        { }             /* Terminating entry */
+};
+MODULE_DEVICE_TABLE(usb, dtv5100_table);
+
+static struct dvb_usb_device_properties dtv5100_properties = {
+        .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+        .usb_ctrl = DEVICE_SPECIFIC,
+
+        .size_of_priv = 0,
+
+        .num_adapters = 1,
+        .adapter = {{
+                .frontend_attach = dtv5100_frontend_attach,
+                .tuner_attach    = dtv5100_tuner_attach,
+
+                .stream = {
+                        .type = USB_BULK,
+                        .count = 8,
+                        .endpoint = 0x82,
+                        .u = {
+                                .bulk = {
+                                        .buffersize = 4096,
+                                }
+                        }
+                },
+        } },
+
+        .i2c_algo = &dtv5100_i2c_algo,
+
+        .num_device_descs = 1,
+        .devices = {
+                {
+                        .name = "AME DTV-5100 USB2.0 DVB-T",
+                        .cold_ids = { NULL },
+                        .warm_ids = { &dtv5100_table[0], NULL },
+                },
+        }
+};
+
+static struct usb_driver dtv5100_driver = {
+        .name           = "dvb_usb_dtv5100",
+        .probe          = dtv5100_probe,
+        .disconnect     = dvb_usb_device_exit,
+        .id_table       = dtv5100_table,
+};
+
+/* module stuff */
+static int __init dtv5100_module_init(void)
+{
+        int ret;
+
+        ret = usb_register(&dtv5100_driver);
+        if (ret)
+                err("usb_register failed. Error number %d", ret);
+
+        return ret;
+}
+
+static void __exit dtv5100_module_exit(void)
+{
+        /* deregister this driver from the USB subsystem */
+        usb_deregister(&dtv5100_driver);
+}
+
+module_init(dtv5100_module_init);
+module_exit(dtv5100_module_exit);
+
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/dtv5100.h b/drivers/media/dvb/dvb-usb/dtv5100.h
new file mode 100644
index 000000000000..93e96e04a82a
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/dtv5100.h
@@ -0,0 +1,51 @@
+/*
+ * DVB USB Linux driver for AME DTV-5100 USB2.0 DVB-T
+ *
+ * Copyright (C) 2008  Antoine Jacquet <royale@zerezo.com>
+ * http://royale.zerezo.com/dtv5100/
+ *
+ * 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
+ */
+
+#ifndef _DVB_USB_DTV5100_H_
+#define _DVB_USB_DTV5100_H_
+
+#define DVB_USB_LOG_PREFIX "dtv5100"
+#include "dvb-usb.h"
+
+#define DTV5100_USB_TIMEOUT 500
+
+#define DTV5100_DEMOD_ADDR      0x00
+#define DTV5100_DEMOD_WRITE     0xc0
+#define DTV5100_DEMOD_READ      0xc1
+
+#define DTV5100_TUNER_ADDR      0xc4
+#define DTV5100_TUNER_WRITE     0xc7
+#define DTV5100_TUNER_READ      0xc8
+
+#define DRIVER_AUTHOR "Antoine Jacquet, http://royale.zerezo.com/"
+#define DRIVER_DESC "AME DTV-5100 USB2.0 DVB-T"
+
+static struct {
+        u8 request;
+        u8 value;
+        u16 index;
+} dtv5100_init[] = {
+        { 0x000000c5, 0x00000000, 0x00000001 },
+        { 0x000000c5, 0x00000001, 0x00000001 },
+        { }             /* Terminating entry */
+};
+
+#endif
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 03dfb9f2fe30..7380b94b3b36 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -22,6 +22,7 @@
 #define USB_VID_AVERMEDIA                       0x07ca
 #define USB_VID_COMPRO                          0x185b
 #define USB_VID_COMPRO_UNK                      0x145f
+#define USB_VID_CONEXANT                        0x0572
 #define USB_VID_CYPRESS                         0x04b4
 #define USB_VID_DIBCOM                          0x10b8
 #define USB_VID_DPOSH                           0x1498
@@ -33,16 +34,19 @@
 #define USB_VID_HAUPPAUGE                       0x2040
 #define USB_VID_HYPER_PALTEK                    0x1025
 #define USB_VID_KWORLD                          0xeb2a
+#define USB_VID_KWORLD_2                        0x1b80
 #define USB_VID_KYE                             0x0458
 #define USB_VID_LEADTEK                         0x0413
 #define USB_VID_LITEON                          0x04ca
 #define USB_VID_MEDION                          0x1660
 #define USB_VID_MIGLIA                          0x18f3
 #define USB_VID_MSI                             0x0db0
+#define USB_VID_MSI_2                           0x1462
 #define USB_VID_OPERA1                          0x695c
 #define USB_VID_PINNACLE                        0x2304
 #define USB_VID_TECHNOTREND                     0x0b48
 #define USB_VID_TERRATEC                        0x0ccd
+#define USB_VID_TELESTAR                        0x10b9
 #define USB_VID_VISIONPLUS                      0x13d3
 #define USB_VID_TWINHAN                         0x1822
 #define USB_VID_ULTIMA_ELECTRONIC               0x05d8
@@ -50,15 +54,18 @@
 #define USB_VID_WIDEVIEW                        0x14aa
 #define USB_VID_GIGABYTE                        0x1044
 #define USB_VID_YUAN                            0x1164
-
+#define USB_VID_XTENSIONS                       0x1ae7
 
 /* Product IDs */
 #define USB_PID_ADSTECH_USB2_COLD                       0xa333
 #define USB_PID_ADSTECH_USB2_WARM                       0xa334
 #define USB_PID_AFATECH_AF9005                          0x9020
+#define USB_PID_AFATECH_AF9015_9015                     0x9015
+#define USB_PID_AFATECH_AF9015_9016                     0x9016
 #define USB_VID_ALINK_DTU                               0xf170
 #define USB_PID_ANSONIC_DVBT_USB                        0x6000
 #define USB_PID_ANYSEE                                  0x861f
+#define USB_PID_AZUREWAVE_AD_TU700                      0x3237
 #define USB_PID_AVERMEDIA_DVBT_USB_COLD                 0x0001
 #define USB_PID_AVERMEDIA_DVBT_USB_WARM                 0x0002
 #define USB_PID_AVERMEDIA_DVBT_USB2_COLD                0xa800
@@ -69,6 +76,7 @@
 #define USB_PID_COMPRO_DVBU2000_UNK_WARM                0x010d
 #define USB_PID_COMPRO_VIDEOMATE_U500                   0x1e78
 #define USB_PID_COMPRO_VIDEOMATE_U500_PC                0x1e80
+#define USB_PID_CONEXANT_D680_DMB                       0x86d6
 #define USB_PID_DIBCOM_HOOK_DEFAULT                     0x0064
 #define USB_PID_DIBCOM_HOOK_DEFAULT_REENUM              0x0065
 #define USB_PID_DIBCOM_MOD3000_COLD                     0x0bb8
@@ -87,9 +95,12 @@
 #define USB_PID_UNIWILL_STK7700P                        0x6003
 #define USB_PID_GRANDTEC_DVBT_USB_COLD                  0x0fa0
 #define USB_PID_GRANDTEC_DVBT_USB_WARM                  0x0fa1
+#define USB_PID_KWORLD_399U                             0xe399
+#define USB_PID_KWORLD_PC160_2T                         0xc160
 #define USB_PID_KWORLD_VSTREAM_COLD                     0x17de
 #define USB_PID_KWORLD_VSTREAM_WARM                     0x17df
 #define USB_PID_TERRATEC_CINERGY_T_USB_XE               0x0055
+#define USB_PID_TERRATEC_CINERGY_T_USB_XE_REV2          0x0069
 #define USB_PID_TWINHAN_VP7041_COLD                     0x3201
 #define USB_PID_TWINHAN_VP7041_WARM                     0x3202
 #define USB_PID_TWINHAN_VP7020_COLD                     0x3203
@@ -98,6 +109,7 @@
 #define USB_PID_TWINHAN_VP7045_WARM                     0x3206
 #define USB_PID_TWINHAN_VP7021_COLD                     0x3207
 #define USB_PID_TWINHAN_VP7021_WARM                     0x3208
+#define USB_PID_TINYTWIN                                0x3226
 #define USB_PID_DNTV_TINYUSB2_COLD                      0x3223
 #define USB_PID_DNTV_TINYUSB2_WARM                      0x3224
 #define USB_PID_ULTIMA_TVBOX_COLD                       0x8105
@@ -144,6 +156,9 @@
 #define USB_PID_AVERMEDIA_HYBRID_ULTRA_USB_M039R        0x0039
 #define USB_PID_AVERMEDIA_HYBRID_ULTRA_USB_M039R_ATSC   0x1039
 #define USB_PID_AVERMEDIA_HYBRID_ULTRA_USB_M039R_DVBT   0x2039
+#define USB_PID_AVERMEDIA_VOLAR_X                       0xa815
+#define USB_PID_AVERMEDIA_VOLAR_X_2                     0x8150
+#define USB_PID_AVERMEDIA_A309                          0xa309
 #define USB_PID_TECHNOTREND_CONNECT_S2400               0x3006
 #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY        0x005a
 #define USB_PID_TERRATEC_CINERGY_HT_USB_XE              0x0058
@@ -153,8 +168,11 @@
 #define USB_PID_PINNACLE_PCTV2000E                      0x022c
 #define USB_PID_PINNACLE_PCTV_DVB_T_FLASH               0x0228
 #define USB_PID_PINNACLE_PCTV_DUAL_DIVERSITY_DVB_T      0x0229
+#define USB_PID_PINNACLE_PCTV71E                        0x022b
 #define USB_PID_PINNACLE_PCTV72E                        0x0236
 #define USB_PID_PINNACLE_PCTV73E                        0x0237
+#define USB_PID_PINNACLE_PCTV801E                       0x023a
+#define USB_PID_PINNACLE_PCTV801E_SE                    0x023b
 #define USB_PID_PCTV_200E                               0x020e
 #define USB_PID_PCTV_400E                               0x020f
 #define USB_PID_PCTV_450E                               0x0222
@@ -171,6 +189,7 @@
 #define USB_PID_DVICO_BLUEBIRD_DUAL_2_COLD              0xdb58
 #define USB_PID_DVICO_BLUEBIRD_DUAL_2_WARM              0xdb59
 #define USB_PID_DVICO_BLUEBIRD_DUAL_4                   0xdb78
+#define USB_PID_DVICO_BLUEBIRD_DUAL_4_REV_2             0xdb98
 #define USB_PID_DVICO_BLUEBIRD_DVB_T_NANO_2             0xdb70
 #define USB_PID_DVICO_BLUEBIRD_DVB_T_NANO_2_NFW_WARM    0xdb71
 #define USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_COLD         0xdb54
@@ -190,6 +209,7 @@
 #define USB_PID_WINFAST_DTV_DONGLE_WARM                 0x6026
 #define USB_PID_WINFAST_DTV_DONGLE_STK7700P             0x6f00
 #define USB_PID_WINFAST_DTV_DONGLE_STK7700P_2           0x6f01
+#define USB_PID_WINFAST_DTV_DONGLE_GOLD                 0x6029
 #define USB_PID_GENPIX_8PSK_REV_1_COLD                  0x0200
 #define USB_PID_GENPIX_8PSK_REV_1_WARM                  0x0201
 #define USB_PID_GENPIX_8PSK_REV_2                       0x0202
@@ -197,14 +217,21 @@
 #define USB_PID_GENPIX_SKYWALKER_CW3K                   0x0204
 #define USB_PID_SIGMATEK_DVB_110                        0x6610
 #define USB_PID_MSI_DIGI_VOX_MINI_II                    0x1513
+#define USB_PID_MSI_DIGIVOX_DUO                         0x8801
 #define USB_PID_OPERA1_COLD                             0x2830
 #define USB_PID_OPERA1_WARM                             0x3829
 #define USB_PID_LIFEVIEW_TV_WALKER_TWIN_COLD            0x0514
 #define USB_PID_LIFEVIEW_TV_WALKER_TWIN_WARM            0x0513
 #define USB_PID_GIGABYTE_U7000                          0x7001
+#define USB_PID_GIGABYTE_U8000                          0x7002
 #define USB_PID_ASUS_U3000                              0x171f
+#define USB_PID_ASUS_U3000H                             0x1736
 #define USB_PID_ASUS_U3100                              0x173f
 #define USB_PID_YUAN_EC372S                             0x1edc
+#define USB_PID_YUAN_STK7700PH                          0x1f08
 #define USB_PID_DW2102                                  0x2102
+#define USB_PID_XTENSIONS_XD_380                        0x0381
+#define USB_PID_TELESTAR_STARSTICK_2                    0x8000
+#define USB_PID_MSI_DIGI_VOX_MINI_III                   0x8807
 
 #endif
diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c
index a4d898b44e55..ca53df61caa8 100644
--- a/drivers/media/dvb/dvb-usb/dw2102.c
+++ b/drivers/media/dvb/dvb-usb/dw2102.c
@@ -1,4 +1,5 @@
-/* DVB USB framework compliant Linux driver for the DVBWorld DVB-S 2102 Card
+/* DVB USB framework compliant Linux driver for the
+*       DVBWorld DVB-S 2101, 2102, DVB-S2 2104 Card
 *
 * Copyright (C) 2008 Igor M. Liplianin (liplianin@me.by)
 *
@@ -10,62 +11,74 @@
 */
 #include <linux/version.h>
 #include "dw2102.h"
+#include "si21xx.h"
 #include "stv0299.h"
 #include "z0194a.h"
+#include "stv0288.h"
+#include "stb6000.h"
+#include "eds1547.h"
+#include "cx24116.h"
 
 #ifndef USB_PID_DW2102
 #define USB_PID_DW2102 0x2102
 #endif
 
-#define DW2102_READ_MSG 0
-#define DW2102_WRITE_MSG 1
+#ifndef USB_PID_DW2104
+#define USB_PID_DW2104 0x2104
+#endif
+
+#define DW210X_READ_MSG 0
+#define DW210X_WRITE_MSG 1
 
 #define REG_1F_SYMBOLRATE_BYTE0 0x1f
 #define REG_20_SYMBOLRATE_BYTE1 0x20
 #define REG_21_SYMBOLRATE_BYTE2 0x21
-
+/* on my own*/
 #define DW2102_VOLTAGE_CTRL (0x1800)
 #define DW2102_RC_QUERY (0x1a00)
 
-struct dw2102_state {
+struct dw210x_state {
         u32 last_key_pressed;
 };
-struct dw2102_rc_keys {
+struct dw210x_rc_keys {
         u32 keycode;
         u32 event;
 };
 
+/* debug */
+static int dvb_usb_dw2102_debug;
+module_param_named(debug, dvb_usb_dw2102_debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debugging level (1=info 2=xfer (or-able))." DVB_USB_DEBUG_STATUS);
+
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
-static int dw2102_op_rw(struct usb_device *dev, u8 request, u16 value,
-                u8 *data, u16 len, int flags)
+static int dw210x_op_rw(struct usb_device *dev, u8 request, u16 value,
+                        u16 index, u8 * data, u16 len, int flags)
 {
         int ret;
         u8 u8buf[len];
 
-        unsigned int pipe = (flags == DW2102_READ_MSG) ?
-                usb_rcvctrlpipe(dev, 0) : usb_sndctrlpipe(dev, 0);
-        u8 request_type = (flags == DW2102_READ_MSG) ? USB_DIR_IN : USB_DIR_OUT;
+        unsigned int pipe = (flags == DW210X_READ_MSG) ?
+                                usb_rcvctrlpipe(dev, 0) : usb_sndctrlpipe(dev, 0);
+        u8 request_type = (flags == DW210X_READ_MSG) ? USB_DIR_IN : USB_DIR_OUT;
 
-        if (flags == DW2102_WRITE_MSG)
+        if (flags == DW210X_WRITE_MSG)
                 memcpy(u8buf, data, len);
-        ret = usb_control_msg(dev, pipe, request,
-                request_type | USB_TYPE_VENDOR, value, 0 , u8buf, len, 2000);
+        ret = usb_control_msg(dev, pipe, request, request_type | USB_TYPE_VENDOR,
+                                value, index , u8buf, len, 2000);
 
-        if (flags == DW2102_READ_MSG)
+        if (flags == DW210X_READ_MSG)
                 memcpy(data, u8buf, len);
         return ret;
 }
 
 /* I2C */
-
 static int dw2102_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
                 int num)
 {
 struct dvb_usb_device *d = i2c_get_adapdata(adap);
         int i = 0, ret = 0;
         u8 buf6[] = {0x2c, 0x05, 0xc0, 0, 0, 0, 0};
-        u8 request;
         u16 value;
 
         if (!d)
@@ -76,14 +89,12 @@ struct dvb_usb_device *d = i2c_get_adapdata(adap);
         switch (num) {
         case 2:
                 /* read stv0299 register */
-                request = 0xb5;
                 value = msg[0].buf[0];/* register */
                 for (i = 0; i < msg[1].len; i++) {
                         value = value + i;
-                        ret = dw2102_op_rw(d->udev, 0xb5,
-                                value, buf6, 2, DW2102_READ_MSG);
+                        ret = dw210x_op_rw(d->udev, 0xb5, value, 0,
+                                        buf6, 2, DW210X_READ_MSG);
                         msg[1].buf[i] = buf6[0];
-
                 }
                 break;
         case 1:
@@ -93,8 +104,8 @@ struct dvb_usb_device *d = i2c_get_adapdata(adap);
                         buf6[0] = 0x2a;
                         buf6[1] = msg[0].buf[0];
                         buf6[2] = msg[0].buf[1];
-                        ret = dw2102_op_rw(d->udev, 0xb2,
-                                0, buf6, 3, DW2102_WRITE_MSG);
+                        ret = dw210x_op_rw(d->udev, 0xb2, 0, 0,
+                                        buf6, 3, DW210X_WRITE_MSG);
                         break;
                 case 0x60:
                         if (msg[0].flags == 0) {
@@ -106,26 +117,26 @@ struct dvb_usb_device *d = i2c_get_adapdata(adap);
                                 buf6[4] = msg[0].buf[1];
                                 buf6[5] = msg[0].buf[2];
                                 buf6[6] = msg[0].buf[3];
-                                ret = dw2102_op_rw(d->udev, 0xb2,
-                                0, buf6, 7, DW2102_WRITE_MSG);
+                                ret = dw210x_op_rw(d->udev, 0xb2, 0, 0,
+                                                buf6, 7, DW210X_WRITE_MSG);
                         } else {
-                        /* write to tuner pll */
-                                ret = dw2102_op_rw(d->udev, 0xb5,
-                                0, buf6, 1, DW2102_READ_MSG);
+                        /* read from tuner */
+                                ret = dw210x_op_rw(d->udev, 0xb5, 0, 0,
+                                                buf6, 1, DW210X_READ_MSG);
                                 msg[0].buf[0] = buf6[0];
                         }
                         break;
                 case (DW2102_RC_QUERY):
-                        ret  = dw2102_op_rw(d->udev, 0xb8,
-                                0, buf6, 2, DW2102_READ_MSG);
+                        ret  = dw210x_op_rw(d->udev, 0xb8, 0, 0,
+                                        buf6, 2, DW210X_READ_MSG);
                         msg[0].buf[0] = buf6[0];
                         msg[0].buf[1] = buf6[1];
                         break;
                 case (DW2102_VOLTAGE_CTRL):
                         buf6[0] = 0x30;
                         buf6[1] = msg[0].buf[0];
-                        ret = dw2102_op_rw(d->udev, 0xb2,
-                                0, buf6, 2, DW2102_WRITE_MSG);
+                        ret = dw210x_op_rw(d->udev, 0xb2, 0, 0,
+                                        buf6, 2, DW210X_WRITE_MSG);
                         break;
                 }
 
@@ -136,17 +147,265 @@ struct dvb_usb_device *d = i2c_get_adapdata(adap);
         return num;
 }
 
-static u32 dw2102_i2c_func(struct i2c_adapter *adapter)
+static int dw2102_serit_i2c_transfer(struct i2c_adapter *adap,
+                                                struct i2c_msg msg[], int num)
+{
+        struct dvb_usb_device *d = i2c_get_adapdata(adap);
+        int ret = 0;
+        u8 buf6[] = {0, 0, 0, 0, 0, 0, 0};
+
+        if (!d)
+                return -ENODEV;
+        if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
+                return -EAGAIN;
+
+        switch (num) {
+        case 2:
+                /* read si2109 register by number */
+                buf6[0] = 0xd0;
+                buf6[1] = msg[0].len;
+                buf6[2] = msg[0].buf[0];
+                ret = dw210x_op_rw(d->udev, 0xc2, 0, 0,
+                                buf6, msg[0].len + 2, DW210X_WRITE_MSG);
+                /* read si2109 register */
+                ret = dw210x_op_rw(d->udev, 0xc3, 0xd0, 0,
+                                buf6, msg[1].len + 2, DW210X_READ_MSG);
+                memcpy(msg[1].buf, buf6 + 2, msg[1].len);
+
+                break;
+        case 1:
+                switch (msg[0].addr) {
+                case 0x68:
+                        /* write to si2109 register */
+                        buf6[0] = 0xd0;
+                        buf6[1] = msg[0].len;
+                        memcpy(buf6 + 2, msg[0].buf, msg[0].len);
+                        ret = dw210x_op_rw(d->udev, 0xc2, 0, 0, buf6,
+                                        msg[0].len + 2, DW210X_WRITE_MSG);
+                        break;
+                case(DW2102_RC_QUERY):
+                        ret  = dw210x_op_rw(d->udev, 0xb8, 0, 0,
+                                        buf6, 2, DW210X_READ_MSG);
+                        msg[0].buf[0] = buf6[0];
+                        msg[0].buf[1] = buf6[1];
+                        break;
+                case(DW2102_VOLTAGE_CTRL):
+                        buf6[0] = 0x30;
+                        buf6[1] = msg[0].buf[0];
+                        ret = dw210x_op_rw(d->udev, 0xb2, 0, 0,
+                                        buf6, 2, DW210X_WRITE_MSG);
+                        break;
+                }
+                break;
+        }
+
+        mutex_unlock(&d->i2c_mutex);
+        return num;
+}
+static int dw2102_earda_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], int num)
+{
+        struct dvb_usb_device *d = i2c_get_adapdata(adap);
+        int ret = 0;
+
+        if (!d)
+                return -ENODEV;
+        if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
+                return -EAGAIN;
+
+        switch (num) {
+        case 2: {
+                /* read */
+                /* first write first register number */
+                u8 ibuf [msg[1].len + 2], obuf[3];
+                obuf[0] = 0xd0;
+                obuf[1] = msg[0].len;
+                obuf[2] = msg[0].buf[0];
+                ret = dw210x_op_rw(d->udev, 0xc2, 0, 0,
+                                obuf, msg[0].len + 2, DW210X_WRITE_MSG);
+                /* second read registers */
+                ret = dw210x_op_rw(d->udev, 0xc3, 0xd1 , 0,
+                                ibuf, msg[1].len + 2, DW210X_READ_MSG);
+                memcpy(msg[1].buf, ibuf + 2, msg[1].len);
+
+                break;
+        }
+        case 1:
+                switch (msg[0].addr) {
+                case 0x68: {
+                        /* write to register */
+                        u8 obuf[msg[0].len + 2];
+                        obuf[0] = 0xd0;
+                        obuf[1] = msg[0].len;
+                        memcpy(obuf + 2, msg[0].buf, msg[0].len);
+                        ret = dw210x_op_rw(d->udev, 0xc2, 0, 0,
+                                        obuf, msg[0].len + 2, DW210X_WRITE_MSG);
+                        break;
+                }
+                case 0x61: {
+                        /* write to tuner */
+                        u8 obuf[msg[0].len + 2];
+                        obuf[0] = 0xc2;
+                        obuf[1] = msg[0].len;
+                        memcpy(obuf + 2, msg[0].buf, msg[0].len);
+                        ret = dw210x_op_rw(d->udev, 0xc2, 0, 0,
+                                        obuf, msg[0].len + 2, DW210X_WRITE_MSG);
+                        break;
+                }
+                case(DW2102_RC_QUERY): {
+                        u8 ibuf[2];
+                        ret  = dw210x_op_rw(d->udev, 0xb8, 0, 0,
+                                        ibuf, 2, DW210X_READ_MSG);
+                        memcpy(msg[0].buf, ibuf , 2);
+                        break;
+                }
+                case(DW2102_VOLTAGE_CTRL): {
+                        u8 obuf[2];
+                        obuf[0] = 0x30;
+                        obuf[1] = msg[0].buf[0];
+                        ret = dw210x_op_rw(d->udev, 0xb2, 0, 0,
+                                        obuf, 2, DW210X_WRITE_MSG);
+                        break;
+                }
+                }
+
+                break;
+        }
+
+        mutex_unlock(&d->i2c_mutex);
+        return num;
+}
+
+static int dw2104_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], int num)
+{
+        struct dvb_usb_device *d = i2c_get_adapdata(adap);
+        int ret = 0;
+        int len, i;
+
+        if (!d)
+                return -ENODEV;
+        if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
+                return -EAGAIN;
+
+        switch (num) {
+        case 2: {
+                /* read */
+                /* first write first register number */
+                u8 ibuf [msg[1].len + 2], obuf[3];
+                obuf[0] = 0xaa;
+                obuf[1] = msg[0].len;
+                obuf[2] = msg[0].buf[0];
+                ret = dw210x_op_rw(d->udev, 0xc2, 0, 0,
+                                obuf, msg[0].len + 2, DW210X_WRITE_MSG);
+                /* second read registers */
+                ret = dw210x_op_rw(d->udev, 0xc3, 0xab , 0,
+                                ibuf, msg[1].len + 2, DW210X_READ_MSG);
+                memcpy(msg[1].buf, ibuf + 2, msg[1].len);
+
+                break;
+        }
+        case 1:
+                switch (msg[0].addr) {
+                case 0x55: {
+                        if (msg[0].buf[0] == 0xf7) {
+                                /* firmware */
+                                /* Write in small blocks */
+                                u8 obuf[19];
+                                obuf[0] = 0xaa;
+                                obuf[1] = 0x11;
+                                obuf[2] = 0xf7;
+                                len = msg[0].len - 1;
+                                i = 1;
+                                do {
+                                        memcpy(obuf + 3, msg[0].buf + i, (len > 16 ? 16 : len));
+                                        ret = dw210x_op_rw(d->udev, 0xc2, 0, 0,
+                                                obuf, (len > 16 ? 16 : len) + 3, DW210X_WRITE_MSG);
+                                        i += 16;
+                                        len -= 16;
+                                } while (len > 0);
+                        } else {
+                                /* write to register */
+                                u8 obuf[msg[0].len + 2];
+                                obuf[0] = 0xaa;
+                                obuf[1] = msg[0].len;
+                                memcpy(obuf + 2, msg[0].buf, msg[0].len);
+                                ret = dw210x_op_rw(d->udev, 0xc2, 0, 0,
+                                                obuf, msg[0].len + 2, DW210X_WRITE_MSG);
+                        }
+                        break;
+                }
+                case(DW2102_RC_QUERY): {
+                        u8 ibuf[2];
+                        ret  = dw210x_op_rw(d->udev, 0xb8, 0, 0,
+                                        ibuf, 2, DW210X_READ_MSG);
+                        memcpy(msg[0].buf, ibuf , 2);
+                        break;
+                }
+                case(DW2102_VOLTAGE_CTRL): {
+                        u8 obuf[2];
+                        obuf[0] = 0x30;
+                        obuf[1] = msg[0].buf[0];
+                        ret = dw210x_op_rw(d->udev, 0xb2, 0, 0,
+                                        obuf, 2, DW210X_WRITE_MSG);
+                        break;
+                }
+                }
+
+                break;
+        }
+
+        mutex_unlock(&d->i2c_mutex);
+        return num;
+}
+
+static u32 dw210x_i2c_func(struct i2c_adapter *adapter)
 {
         return I2C_FUNC_I2C;
 }
 
 static struct i2c_algorithm dw2102_i2c_algo = {
         .master_xfer = dw2102_i2c_transfer,
-        .functionality = dw2102_i2c_func,
+        .functionality = dw210x_i2c_func,
+};
+
+static struct i2c_algorithm dw2102_serit_i2c_algo = {
+        .master_xfer = dw2102_serit_i2c_transfer,
+        .functionality = dw210x_i2c_func,
+};
+
+static struct i2c_algorithm dw2102_earda_i2c_algo = {
+        .master_xfer = dw2102_earda_i2c_transfer,
+        .functionality = dw210x_i2c_func,
+};
+
+static struct i2c_algorithm dw2104_i2c_algo = {
+        .master_xfer = dw2104_i2c_transfer,
+        .functionality = dw210x_i2c_func,
 };
 
-static int dw2102_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
+static int dw210x_read_mac_address(struct dvb_usb_device *d, u8 mac[6])
+{
+        int i;
+        u8 ibuf[] = {0, 0};
+        u8 eeprom[256], eepromline[16];
+
+        for (i = 0; i < 256; i++) {
+                if (dw210x_op_rw(d->udev, 0xb6, 0xa0 , i, ibuf, 2, DW210X_READ_MSG) < 0) {
+                        err("read eeprom failed.");
+                        return -1;
+                } else {
+                        eepromline[i%16] = ibuf[0];
+                        eeprom[i] = ibuf[0];
+                }
+                if ((i % 16) == 15) {
+                        deb_xfer("%02x: ", i - 15);
+                        debug_dump(eepromline, 16, deb_xfer);
+                }
+        }
+        memcpy(mac, eeprom + 8, 6);
+        return 0;
+};
+
+static int dw210x_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
 {
         static u8 command_13v[1] = {0x00};
         static u8 command_18v[1] = {0x01};
@@ -163,18 +422,66 @@ static int dw2102_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
         return 0;
 }
 
-static int dw2102_frontend_attach(struct dvb_usb_adapter *d)
+static struct cx24116_config dw2104_config = {
+        .demod_address = 0x55,
+        .mpg_clk_pos_pol = 0x01,
+};
+
+static struct si21xx_config serit_sp1511lhb_config = {
+        .demod_address = 0x68,
+        .min_delay_ms = 100,
+
+};
+
+static int dw2104_frontend_attach(struct dvb_usb_adapter *d)
 {
-        d->fe = dvb_attach(stv0299_attach, &sharp_z0194a_config,
-                &d->dev->i2c_adap);
-        if (d->fe != NULL) {
-                d->fe->ops.set_voltage = dw2102_set_voltage;
-                info("Attached stv0299!\n");
+        if ((d->fe = dvb_attach(cx24116_attach, &dw2104_config,
+                        &d->dev->i2c_adap)) != NULL) {
+                d->fe->ops.set_voltage = dw210x_set_voltage;
+                info("Attached cx24116!\n");
                 return 0;
         }
         return -EIO;
 }
 
+static struct dvb_usb_device_properties dw2102_properties;
+
+static int dw2102_frontend_attach(struct dvb_usb_adapter *d)
+{
+        if (dw2102_properties.i2c_algo == &dw2102_serit_i2c_algo) {
+                /*dw2102_properties.adapter->tuner_attach = NULL;*/
+                d->fe = dvb_attach(si21xx_attach, &serit_sp1511lhb_config,
+                                        &d->dev->i2c_adap);
+                if (d->fe != NULL) {
+                        d->fe->ops.set_voltage = dw210x_set_voltage;
+                        info("Attached si21xx!\n");
+                        return 0;
+                }
+        }
+        if (dw2102_properties.i2c_algo == &dw2102_earda_i2c_algo) {
+                /*dw2102_properties.adapter->tuner_attach = dw2102_tuner_attach;*/
+                d->fe = dvb_attach(stv0288_attach, &earda_config,
+                                        &d->dev->i2c_adap);
+                if (d->fe != NULL) {
+                        d->fe->ops.set_voltage = dw210x_set_voltage;
+                        info("Attached stv0288!\n");
+                        return 0;
+                }
+        }
+
+        if (dw2102_properties.i2c_algo == &dw2102_i2c_algo) {
+                /*dw2102_properties.adapter->tuner_attach = dw2102_tuner_attach;*/
+                d->fe = dvb_attach(stv0299_attach, &sharp_z0194a_config,
+                                        &d->dev->i2c_adap);
+                if (d->fe != NULL) {
+                        d->fe->ops.set_voltage = dw210x_set_voltage;
+                        info("Attached stv0299!\n");
+                        return 0;
+                }
+        }
+        return -EIO;
+}
+
 static int dw2102_tuner_attach(struct dvb_usb_adapter *adap)
 {
         dvb_attach(dvb_pll_attach, adap->fe, 0x60,
@@ -182,7 +489,15 @@ static int dw2102_tuner_attach(struct dvb_usb_adapter *adap)
         return 0;
 }
 
-static struct dvb_usb_rc_key dw2102_rc_keys[] = {
+static int dw2102_earda_tuner_attach(struct dvb_usb_adapter *adap)
+{
+        dvb_attach(stb6000_attach, adap->fe, 0x61,
+                &adap->dev->i2c_adap);
+
+        return 0;
+}
+
+static struct dvb_usb_rc_key dw210x_rc_keys[] = {
         { 0xf8, 0x0a, KEY_Q },          /*power*/
         { 0xf8, 0x0c, KEY_M },          /*mute*/
         { 0xf8, 0x11, KEY_1 },
@@ -221,7 +536,7 @@ static struct dvb_usb_rc_key dw2102_rc_keys[] = {
 
 static int dw2102_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 {
-        struct dw2102_state *st = d->priv;
+        struct dw210x_state *st = d->priv;
         u8 key[2];
         struct i2c_msg msg[] = {
                 {.addr = DW2102_RC_QUERY, .flags = I2C_M_RD, .buf = key,
@@ -231,12 +546,12 @@ static int dw2102_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 
         *state = REMOTE_NO_KEY_PRESSED;
         if (dw2102_i2c_transfer(&d->i2c_adap, msg, 1) == 1) {
-                for (i = 0; i < ARRAY_SIZE(dw2102_rc_keys); i++) {
-                        if (dw2102_rc_keys[i].data == msg[0].buf[0]) {
+                for (i = 0; i < ARRAY_SIZE(dw210x_rc_keys); i++) {
+                        if (dw210x_rc_keys[i].data == msg[0].buf[0]) {
                                 *state = REMOTE_KEY_PRESSED;
-                                *event = dw2102_rc_keys[i].event;
+                                *event = dw210x_rc_keys[i].event;
                                 st->last_key_pressed =
-                                        dw2102_rc_keys[i].event;
+                                        dw210x_rc_keys[i].event;
                                 break;
                         }
                 st->last_key_pressed = 0;
@@ -249,6 +564,8 @@ static int dw2102_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 static struct usb_device_id dw2102_table[] = {
         {USB_DEVICE(USB_VID_CYPRESS, USB_PID_DW2102)},
         {USB_DEVICE(USB_VID_CYPRESS, 0x2101)},
+        {USB_DEVICE(USB_VID_CYPRESS, 0x2104)},
+        {USB_DEVICE(0x9022, 0xd650)},
         { }
 };
 
@@ -260,7 +577,7 @@ static int dw2102_load_firmware(struct usb_device *dev,
         u8 *b, *p;
         int ret = 0, i;
         u8 reset;
-        u8 reset16 [] = {0, 0, 0, 0, 0, 0, 0};
+        u8 reset16[] = {0, 0, 0, 0, 0, 0, 0};
         const struct firmware *fw;
         const char *filename = "dvb-usb-dw2101.fw";
         switch (dev->descriptor.idProduct) {
@@ -273,25 +590,23 @@ static int dw2102_load_firmware(struct usb_device *dev,
                         return ret;
                 }
                 break;
-        case USB_PID_DW2102:
+        default:
                 fw = frmwr;
                 break;
         }
-        info("start downloading DW2102 firmware");
+        info("start downloading DW210X firmware");
         p = kmalloc(fw->size, GFP_KERNEL);
         reset = 1;
         /*stop the CPU*/
-        dw2102_op_rw(dev, 0xa0, 0x7f92, &reset, 1, DW2102_WRITE_MSG);
-        dw2102_op_rw(dev, 0xa0, 0xe600, &reset, 1, DW2102_WRITE_MSG);
+        dw210x_op_rw(dev, 0xa0, 0x7f92, 0, &reset, 1, DW210X_WRITE_MSG);
+        dw210x_op_rw(dev, 0xa0, 0xe600, 0, &reset, 1, DW210X_WRITE_MSG);
 
         if (p != NULL) {
                 memcpy(p, fw->data, fw->size);
                 for (i = 0; i < fw->size; i += 0x40) {
                         b = (u8 *) p + i;
-                        if (dw2102_op_rw
-                                (dev, 0xa0, i, b , 0x40,
-                                        DW2102_WRITE_MSG) != 0x40
-                                ) {
+                        if (dw210x_op_rw(dev, 0xa0, i, 0, b , 0x40,
+                                        DW210X_WRITE_MSG) != 0x40) {
                                 err("error while transferring firmware");
                                 ret = -EINVAL;
                                 break;
@@ -299,43 +614,66 @@ static int dw2102_load_firmware(struct usb_device *dev,
                 }
                 /* restart the CPU */
                 reset = 0;
-                if (ret || dw2102_op_rw
-                        (dev, 0xa0, 0x7f92, &reset, 1,
-                        DW2102_WRITE_MSG) != 1) {
+                if (ret || dw210x_op_rw(dev, 0xa0, 0x7f92, 0, &reset, 1,
+                                        DW210X_WRITE_MSG) != 1) {
                         err("could not restart the USB controller CPU.");
                         ret = -EINVAL;
                 }
-                if (ret || dw2102_op_rw
-                        (dev, 0xa0, 0xe600, &reset, 1,
-                        DW2102_WRITE_MSG) != 1) {
+                if (ret || dw210x_op_rw(dev, 0xa0, 0xe600, 0, &reset, 1,
+                                        DW210X_WRITE_MSG) != 1) {
                         err("could not restart the USB controller CPU.");
                         ret = -EINVAL;
                 }
                 /* init registers */
                 switch (dev->descriptor.idProduct) {
-                case USB_PID_DW2102:
-                        dw2102_op_rw
-                                (dev, 0xbf, 0x0040, &reset, 0,
-                                DW2102_WRITE_MSG);
-                        dw2102_op_rw
-                                (dev, 0xb9, 0x0000, &reset16[0], 2,
-                                DW2102_READ_MSG);
+                case USB_PID_DW2104:
+                case 0xd650:
+                        reset = 1;
+                        dw210x_op_rw(dev, 0xc4, 0x0000, 0, &reset, 1,
+                                        DW210X_WRITE_MSG);
+                        reset = 0;
+                        dw210x_op_rw(dev, 0xbf, 0x0040, 0, &reset, 0,
+                                        DW210X_WRITE_MSG);
                         break;
+                case USB_PID_DW2102:
+                        dw210x_op_rw(dev, 0xbf, 0x0040, 0, &reset, 0,
+                                        DW210X_WRITE_MSG);
+                        dw210x_op_rw(dev, 0xb9, 0x0000, 0, &reset16[0], 2,
+                                        DW210X_READ_MSG);
+                        /* check STV0299 frontend  */
+                        dw210x_op_rw(dev, 0xb5, 0, 0, &reset16[0], 2,
+                                        DW210X_READ_MSG);
+                        if (reset16[0] == 0xa1) {
+                                dw2102_properties.i2c_algo = &dw2102_i2c_algo;
+                                dw2102_properties.adapter->tuner_attach = &dw2102_tuner_attach;
+                                break;
+                        } else {
+                                /* check STV0288 frontend  */
+                                reset16[0] = 0xd0;
+                                reset16[1] = 1;
+                                reset16[2] = 0;
+                                dw210x_op_rw(dev, 0xc2, 0, 0, &reset16[0], 3,
+                                                DW210X_WRITE_MSG);
+                                dw210x_op_rw(dev, 0xc3, 0xd1, 0, &reset16[0], 3,
+                                                DW210X_READ_MSG);
+                                if (reset16[2] == 0x11) {
+                                        dw2102_properties.i2c_algo = &dw2102_earda_i2c_algo;
+                                        dw2102_properties.adapter->tuner_attach = &dw2102_earda_tuner_attach;
+                                        break;
+                                }
+                        }
                 case 0x2101:
-                        dw2102_op_rw
-                                (dev, 0xbc, 0x0030, &reset16[0], 2,
-                                DW2102_READ_MSG);
-                        dw2102_op_rw
-                                (dev, 0xba, 0x0000, &reset16[0], 7,
-                                DW2102_READ_MSG);
-                        dw2102_op_rw
-                                (dev, 0xba, 0x0000, &reset16[0], 7,
-                                DW2102_READ_MSG);
-                        dw2102_op_rw
-                                (dev, 0xb9, 0x0000, &reset16[0], 2,
-                                DW2102_READ_MSG);
+                        dw210x_op_rw(dev, 0xbc, 0x0030, 0, &reset16[0], 2,
+                                        DW210X_READ_MSG);
+                        dw210x_op_rw(dev, 0xba, 0x0000, 0, &reset16[0], 7,
+                                        DW210X_READ_MSG);
+                        dw210x_op_rw(dev, 0xba, 0x0000, 0, &reset16[0], 7,
+                                        DW210X_READ_MSG);
+                        dw210x_op_rw(dev, 0xb9, 0x0000, 0, &reset16[0], 2,
+                                        DW210X_READ_MSG);
                         break;
                 }
+                msleep(100);
                 kfree(p);
         }
         return ret;
@@ -345,12 +683,12 @@ static struct dvb_usb_device_properties dw2102_properties = {
         .caps = DVB_USB_IS_AN_I2C_ADAPTER,
         .usb_ctrl = DEVICE_SPECIFIC,
         .firmware = "dvb-usb-dw2102.fw",
-        .size_of_priv = sizeof(struct dw2102_state),
+        .size_of_priv = sizeof(struct dw210x_state),
         .no_reconnect = 1,
 
-        .i2c_algo = &dw2102_i2c_algo,
-        .rc_key_map = dw2102_rc_keys,
-        .rc_key_map_size = ARRAY_SIZE(dw2102_rc_keys),
+        .i2c_algo = &dw2102_serit_i2c_algo,
+        .rc_key_map = dw210x_rc_keys,
+        .rc_key_map_size = ARRAY_SIZE(dw210x_rc_keys),
         .rc_interval = 150,
         .rc_query = dw2102_rc_query,
 
@@ -358,11 +696,12 @@ static struct dvb_usb_device_properties dw2102_properties = {
         /* parameter for the MPEG2-data transfer */
         .num_adapters = 1,
         .download_firmware = dw2102_load_firmware,
-        .adapter = {
+        .read_mac_address = dw210x_read_mac_address,
+                .adapter = {
                 {
                         .frontend_attach = dw2102_frontend_attach,
                         .streaming_ctrl = NULL,
-                        .tuner_attach = dw2102_tuner_attach,
+                        .tuner_attach = NULL,
                         .stream = {
                                 .type = USB_BULK,
                                 .count = 8,
@@ -388,11 +727,64 @@ static struct dvb_usb_device_properties dw2102_properties = {
         }
 };
 
+static struct dvb_usb_device_properties dw2104_properties = {
+        .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+        .usb_ctrl = DEVICE_SPECIFIC,
+        .firmware = "dvb-usb-dw2104.fw",
+        .size_of_priv = sizeof(struct dw210x_state),
+        .no_reconnect = 1,
+
+        .i2c_algo = &dw2104_i2c_algo,
+        .rc_key_map = dw210x_rc_keys,
+        .rc_key_map_size = ARRAY_SIZE(dw210x_rc_keys),
+        .rc_interval = 150,
+        .rc_query = dw2102_rc_query,
+
+        .generic_bulk_ctrl_endpoint = 0x81,
+        /* parameter for the MPEG2-data transfer */
+        .num_adapters = 1,
+        .download_firmware = dw2102_load_firmware,
+        .read_mac_address = dw210x_read_mac_address,
+        .adapter = {
+                {
+                        .frontend_attach = dw2104_frontend_attach,
+                        .streaming_ctrl = NULL,
+                        /*.tuner_attach = dw2104_tuner_attach,*/
+                        .stream = {
+                                .type = USB_BULK,
+                                .count = 8,
+                                .endpoint = 0x82,
+                                .u = {
+                                        .bulk = {
+                                                .buffersize = 4096,
+                                        }
+                                }
+                        },
+                }
+        },
+        .num_device_descs = 2,
+        .devices = {
+                { "DVBWorld DW2104 USB2.0",
+                        {&dw2102_table[2], NULL},
+                        {NULL},
+                },
+                { "TeVii S650 USB2.0",
+                        {&dw2102_table[3], NULL},
+                        {NULL},
+                },
+        }
+};
+
 static int dw2102_probe(struct usb_interface *intf,
                 const struct usb_device_id *id)
 {
-        return dvb_usb_device_init(intf, &dw2102_properties,
-                THIS_MODULE, NULL, adapter_nr);
+        if (0 == dvb_usb_device_init(intf, &dw2102_properties,
+                        THIS_MODULE, NULL, adapter_nr) ||
+            0 == dvb_usb_device_init(intf, &dw2104_properties,
+                        THIS_MODULE, NULL, adapter_nr)) {
+                return 0;
+        }
+        return -ENODEV;
 }
 
 static struct usb_driver dw2102_driver = {
@@ -420,6 +812,6 @@ module_init(dw2102_module_init);
 module_exit(dw2102_module_exit);
 
 MODULE_AUTHOR("Igor M. Liplianin (c) liplianin@me.by");
-MODULE_DESCRIPTION("Driver for DVBWorld DVB-S 2101 2102 USB2.0 device");
+MODULE_DESCRIPTION("Driver for DVBWorld DVB-S 2101, 2102, DVB-S2 2104 USB2.0 device");
 MODULE_VERSION("0.1");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/dw2102.h b/drivers/media/dvb/dvb-usb/dw2102.h
index 7a310f906837..e3370734e95a 100644
--- a/drivers/media/dvb/dvb-usb/dw2102.h
+++ b/drivers/media/dvb/dvb-usb/dw2102.h
@@ -4,6 +4,5 @@
 #define DVB_USB_LOG_PREFIX "dw2102"
 #include "dvb-usb.h"
 
-extern int dvb_usb_dw2102_debug;
 #define deb_xfer(args...) dprintk(dvb_usb_dw2102_debug, 0x02, args)
 #endif
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index 7dbb4a223c99..96b93e21a84b 100644
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -43,6 +43,20 @@ config DVB_S5H1420
         help
           A DVB-S tuner module. Say Y when you want to support this frontend.
 
+config DVB_STV0288
+        tristate "ST STV0288 based"
+        depends on DVB_CORE && I2C
+        default m if DVB_FE_CUSTOMISE
+        help
+          A DVB-S tuner module. Say Y when you want to support this frontend.
+
+config DVB_STB6000
+        tristate "ST STB6000 silicon tuner"
+        depends on DVB_CORE && I2C
+        default m if DVB_FE_CUSTOMISE
+          help
+          A DVB-S silicon tuner module. Say Y when you want to support this tuner.
+
 config DVB_STV0299
         tristate "ST STV0299 based"
         depends on DVB_CORE && I2C
@@ -92,6 +106,20 @@ config DVB_TUA6100
         help
           A DVB-S PLL chip.
 
+config DVB_CX24116
+        tristate "Conexant CX24116 based"
+        depends on DVB_CORE && I2C
+        default m if DVB_FE_CUSTOMISE
+        help
+          A DVB-S/S2 tuner module. Say Y when you want to support this frontend.
+
+config DVB_SI21XX
+        tristate "Silicon Labs SI21XX based"
+        depends on DVB_CORE && I2C
+        default m if DVB_FE_CUSTOMISE
+        help
+          A DVB-S tuner module. Say Y when you want to support this frontend.
+
 comment "DVB-T (terrestrial) frontends"
         depends on DVB_CORE
 
@@ -385,4 +413,23 @@ config DVB_ISL6421
         help
           An SEC control chip.
 
+config DVB_LGS8GL5
+        tristate "Silicon Legend LGS-8GL5 demodulator (OFDM)"
+        depends on DVB_CORE && I2C
+        default m if DVB_FE_CUSTOMISE
+        help
+          A DMB-TH tuner module. Say Y when you want to support this frontend.
+
+comment "Tools to develop new frontends"
+
+config DVB_DUMMY_FE
+        tristate "Dummy frontend driver"
+        default n
+
+config DVB_AF9013
+        tristate "Afatech AF9013 demodulator"
+        depends on DVB_CORE && I2C
+        default m if DVB_FE_CUSTOMISE
+        help
+          Say Y when you want to support this frontend.
 endmenu
diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile
index 028da55611c0..aba79f4a63a7 100644
--- a/drivers/media/dvb/frontends/Makefile
+++ b/drivers/media/dvb/frontends/Makefile
@@ -48,3 +48,10 @@ obj-$(CONFIG_DVB_TUNER_ITD1000) += itd1000.o
 obj-$(CONFIG_DVB_AU8522) += au8522.o
 obj-$(CONFIG_DVB_TDA10048) += tda10048.o
 obj-$(CONFIG_DVB_S5H1411) += s5h1411.o
+obj-$(CONFIG_DVB_LGS8GL5) += lgs8gl5.o
+obj-$(CONFIG_DVB_DUMMY_FE) += dvb_dummy_fe.o
+obj-$(CONFIG_DVB_AF9013) += af9013.o
+obj-$(CONFIG_DVB_CX24116) += cx24116.o
+obj-$(CONFIG_DVB_SI21XX) += si21xx.o
+obj-$(CONFIG_DVB_STV0288) += stv0288.o
+obj-$(CONFIG_DVB_STB6000) += stb6000.o
diff --git a/drivers/media/dvb/frontends/af9013.c b/drivers/media/dvb/frontends/af9013.c
new file mode 100644
index 000000000000..21c1060cf10e
--- /dev/null
+++ b/drivers/media/dvb/frontends/af9013.c
@@ -0,0 +1,1685 @@
+/*
+ * DVB USB Linux driver for Afatech AF9015 DVB-T USB2.0 receiver
+ *
+ * Copyright (C) 2007 Antti Palosaari <crope@iki.fi>
+ *
+ * Thanks to Afatech who kindly provided information.
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/firmware.h>
+
+#include "dvb_frontend.h"
+#include "af9013_priv.h"
+#include "af9013.h"
+
+int af9013_debug;
+
+struct af9013_state {
+        struct i2c_adapter *i2c;
+        struct dvb_frontend frontend;
+
+        struct af9013_config config;
+
+        u16 signal_strength;
+        u32 ber;
+        u32 ucblocks;
+        u16 snr;
+        u32 frequency;
+        unsigned long next_statistics_check;
+};
+
+static u8 regmask[8] = { 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff };
+
+static int af9013_write_regs(struct af9013_state *state, u8 mbox, u16 reg,
+        u8 *val, u8 len)
+{
+        u8 buf[3+len];
+        struct i2c_msg msg = {
+                .addr = state->config.demod_address,
+                .flags = 0,
+                .len = sizeof(buf),
+                .buf = buf };
+
+        buf[0] = reg >> 8;
+        buf[1] = reg & 0xff;
+        buf[2] = mbox;
+        memcpy(&buf[3], val, len);
+
+        if (i2c_transfer(state->i2c, &msg, 1) != 1) {
+                warn("I2C write failed reg:%04x len:%d", reg, len);
+                return -EREMOTEIO;
+        }
+        return 0;
+}
+
+static int af9013_write_ofdm_regs(struct af9013_state *state, u16 reg, u8 *val,
+        u8 len)
+{
+        u8 mbox = (1 << 0)|(1 << 1)|((len - 1) << 2)|(0 << 6)|(0 << 7);
+        return af9013_write_regs(state, mbox, reg, val, len);
+}
+
+static int af9013_write_ofsm_regs(struct af9013_state *state, u16 reg, u8 *val,
+        u8 len)
+{
+        u8 mbox = (1 << 0)|(1 << 1)|((len - 1) << 2)|(1 << 6)|(1 << 7);
+        return af9013_write_regs(state, mbox, reg, val, len);
+}
+
+/* write single register */
+static int af9013_write_reg(struct af9013_state *state, u16 reg, u8 val)
+{
+        return af9013_write_ofdm_regs(state, reg, &val, 1);
+}
+
+/* read single register */
+static int af9013_read_reg(struct af9013_state *state, u16 reg, u8 *val)
+{
+        u8 obuf[3] = { reg >> 8, reg & 0xff, 0 };
+        u8 ibuf[1];
+        struct i2c_msg msg[2] = {
+                {
+                        .addr = state->config.demod_address,
+                        .flags = 0,
+                        .len = sizeof(obuf),
+                        .buf = obuf
+                }, {
+                        .addr = state->config.demod_address,
+                        .flags = I2C_M_RD,
+                        .len = sizeof(ibuf),
+                        .buf = ibuf
+                }
+        };
+
+        if (i2c_transfer(state->i2c, msg, 2) != 2) {
+                warn("I2C read failed reg:%04x", reg);
+                return -EREMOTEIO;
+        }
+        *val = ibuf[0];
+        return 0;
+}
+
+static int af9013_write_reg_bits(struct af9013_state *state, u16 reg, u8 pos,
+        u8 len, u8 val)
+{
+        int ret;
+        u8 tmp, mask;
+
+        ret = af9013_read_reg(state, reg, &tmp);
+        if (ret)
+                return ret;
+
+        mask = regmask[len - 1] << pos;
+        tmp = (tmp & ~mask) | ((val << pos) & mask);
+
+        return af9013_write_reg(state, reg, tmp);
+}
+
+static int af9013_read_reg_bits(struct af9013_state *state, u16 reg, u8 pos,
+        u8 len, u8 *val)
+{
+        int ret;
+        u8 tmp;
+
+        ret = af9013_read_reg(state, reg, &tmp);
+        if (ret)
+                return ret;
+        *val = (tmp >> pos) & regmask[len - 1];
+        return 0;
+}
+
+static int af9013_set_gpio(struct af9013_state *state, u8 gpio, u8 gpioval)
+{
+        int ret;
+        u8 pos;
+        u16 addr;
+        deb_info("%s: gpio:%d gpioval:%02x\n", __func__, gpio, gpioval);
+
+/* GPIO0 & GPIO1 0xd735
+   GPIO2 & GPIO3 0xd736 */
+
+        switch (gpio) {
+        case 0:
+        case 1:
+                addr = 0xd735;
+                break;
+        case 2:
+        case 3:
+                addr = 0xd736;
+                break;
+
+        default:
+                err("invalid gpio:%d\n", gpio);
+                ret = -EINVAL;
+                goto error;
+        };
+
+        switch (gpio) {
+        case 0:
+        case 2:
+                pos = 0;
+                break;
+        case 1:
+        case 3:
+        default:
+                pos = 4;
+                break;
+        };
+
+        ret = af9013_write_reg_bits(state, addr, pos, 4, gpioval);
+
+error:
+        return ret;
+}
+
+static u32 af913_div(u32 a, u32 b, u32 x)
+{
+        u32 r = 0, c = 0, i;
+        deb_info("%s: a:%d b:%d x:%d\n", __func__, a, b, x);
+
+        if (a > b) {
+                c = a / b;
+                a = a - c * b;
+        }
+
+        for (i = 0; i < x; i++) {
+                if (a >= b) {
+                        r += 1;
+                        a -= b;
+                }
+                a <<= 1;
+                r <<= 1;
+        }
+        r = (c << (u32)x) + r;
+
+        deb_info("%s: a:%d b:%d x:%d r:%d r:%x\n", __func__, a, b, x, r, r);
+        return r;
+}
+
+static int af9013_set_coeff(struct af9013_state *state, fe_bandwidth_t bw)
+{
+        int ret = 0;
+        u8 i = 0;
+        u8 buf[24];
+        u32 ns_coeff1_2048nu;
+        u32 ns_coeff1_8191nu;
+        u32 ns_coeff1_8192nu;
+        u32 ns_coeff1_8193nu;
+        u32 ns_coeff2_2k;
+        u32 ns_coeff2_8k;
+
+        deb_info("%s: adc_clock:%d bw:%d\n", __func__,
+                state->config.adc_clock, bw);
+
+        switch (state->config.adc_clock) {
+        case 28800: /* 28.800 MHz */
+                switch (bw) {
+                case BANDWIDTH_6_MHZ:
+                        ns_coeff1_2048nu = 0x01e79e7a;
+                        ns_coeff1_8191nu = 0x0079eb6e;
+                        ns_coeff1_8192nu = 0x0079e79e;
+                        ns_coeff1_8193nu = 0x0079e3cf;
+                        ns_coeff2_2k     = 0x00f3cf3d;
+                        ns_coeff2_8k     = 0x003cf3cf;
+                        break;
+                case BANDWIDTH_7_MHZ:
+                        ns_coeff1_2048nu = 0x0238e38e;
+                        ns_coeff1_8191nu = 0x008e3d55;
+                        ns_coeff1_8192nu = 0x008e38e4;
+                        ns_coeff1_8193nu = 0x008e3472;
+                        ns_coeff2_2k     = 0x011c71c7;
+                        ns_coeff2_8k     = 0x00471c72;
+                        break;
+                case BANDWIDTH_8_MHZ:
+                        ns_coeff1_2048nu = 0x028a28a3;
+                        ns_coeff1_8191nu = 0x00a28f3d;
+                        ns_coeff1_8192nu = 0x00a28a29;
+                        ns_coeff1_8193nu = 0x00a28514;
+                        ns_coeff2_2k     = 0x01451451;
+                        ns_coeff2_8k     = 0x00514514;
+                        break;
+                default:
+                        ret = -EINVAL;
+                }
+                break;
+        case 20480: /* 20.480 MHz */
+                switch (bw) {
+                case BANDWIDTH_6_MHZ:
+                        ns_coeff1_2048nu = 0x02adb6dc;
+                        ns_coeff1_8191nu = 0x00ab7313;
+                        ns_coeff1_8192nu = 0x00ab6db7;
+                        ns_coeff1_8193nu = 0x00ab685c;
+                        ns_coeff2_2k     = 0x0156db6e;
+                        ns_coeff2_8k     = 0x0055b6dc;
+                        break;
+                case BANDWIDTH_7_MHZ:
+                        ns_coeff1_2048nu = 0x03200001;
+                        ns_coeff1_8191nu = 0x00c80640;
+                        ns_coeff1_8192nu = 0x00c80000;
+                        ns_coeff1_8193nu = 0x00c7f9c0;
+                        ns_coeff2_2k     = 0x01900000;
+                        ns_coeff2_8k     = 0x00640000;
+                        break;
+                case BANDWIDTH_8_MHZ:
+                        ns_coeff1_2048nu = 0x03924926;
+                        ns_coeff1_8191nu = 0x00e4996e;
+                        ns_coeff1_8192nu = 0x00e49249;
+                        ns_coeff1_8193nu = 0x00e48b25;
+                        ns_coeff2_2k     = 0x01c92493;
+                        ns_coeff2_8k     = 0x00724925;
+                        break;
+                default:
+                        ret = -EINVAL;
+                }
+                break;
+        case 28000: /* 28.000 MHz */
+                switch (bw) {
+                case BANDWIDTH_6_MHZ:
+                        ns_coeff1_2048nu = 0x01f58d10;
+                        ns_coeff1_8191nu = 0x007d672f;
+                        ns_coeff1_8192nu = 0x007d6344;
+                        ns_coeff1_8193nu = 0x007d5f59;
+                        ns_coeff2_2k     = 0x00fac688;
+                        ns_coeff2_8k     = 0x003eb1a2;
+                        break;
+                case BANDWIDTH_7_MHZ:
+                        ns_coeff1_2048nu = 0x02492492;
+                        ns_coeff1_8191nu = 0x00924db7;
+                        ns_coeff1_8192nu = 0x00924925;
+                        ns_coeff1_8193nu = 0x00924492;
+                        ns_coeff2_2k     = 0x01249249;
+                        ns_coeff2_8k     = 0x00492492;
+                        break;
+                case BANDWIDTH_8_MHZ:
+                        ns_coeff1_2048nu = 0x029cbc15;
+                        ns_coeff1_8191nu = 0x00a7343f;
+                        ns_coeff1_8192nu = 0x00a72f05;
+                        ns_coeff1_8193nu = 0x00a729cc;
+                        ns_coeff2_2k     = 0x014e5e0a;
+                        ns_coeff2_8k     = 0x00539783;
+                        break;
+                default:
+                        ret = -EINVAL;
+                }
+                break;
+        case 25000: /* 25.000 MHz */
+                switch (bw) {
+                case BANDWIDTH_6_MHZ:
+                        ns_coeff1_2048nu = 0x0231bcb5;
+                        ns_coeff1_8191nu = 0x008c7391;
+                        ns_coeff1_8192nu = 0x008c6f2d;
+                        ns_coeff1_8193nu = 0x008c6aca;
+                        ns_coeff2_2k     = 0x0118de5b;
+                        ns_coeff2_8k     = 0x00463797;
+                        break;
+                case BANDWIDTH_7_MHZ:
+                        ns_coeff1_2048nu = 0x028f5c29;
+                        ns_coeff1_8191nu = 0x00a3dc29;
+                        ns_coeff1_8192nu = 0x00a3d70a;
+                        ns_coeff1_8193nu = 0x00a3d1ec;
+                        ns_coeff2_2k     = 0x0147ae14;
+                        ns_coeff2_8k     = 0x0051eb85;
+                        break;
+                case BANDWIDTH_8_MHZ:
+                        ns_coeff1_2048nu = 0x02ecfb9d;
+                        ns_coeff1_8191nu = 0x00bb44c1;
+                        ns_coeff1_8192nu = 0x00bb3ee7;
+                        ns_coeff1_8193nu = 0x00bb390d;
+                        ns_coeff2_2k     = 0x01767dce;
+                        ns_coeff2_8k     = 0x005d9f74;
+                        break;
+                default:
+                        ret = -EINVAL;
+                }
+                break;
+        default:
+                err("invalid xtal");
+                return -EINVAL;
+        }
+        if (ret) {
+                err("invalid bandwidth");
+                return ret;
+        }
+
+        buf[i++] = (u8) ((ns_coeff1_2048nu & 0x03000000) >> 24);
+        buf[i++] = (u8) ((ns_coeff1_2048nu & 0x00ff0000) >> 16);
+        buf[i++] = (u8) ((ns_coeff1_2048nu & 0x0000ff00) >> 8);
+        buf[i++] = (u8) ((ns_coeff1_2048nu & 0x000000ff));
+        buf[i++] = (u8) ((ns_coeff2_2k     & 0x01c00000) >> 22);
+        buf[i++] = (u8) ((ns_coeff2_2k     & 0x003fc000) >> 14);
+        buf[i++] = (u8) ((ns_coeff2_2k     & 0x00003fc0) >> 6);
+        buf[i++] = (u8) ((ns_coeff2_2k     & 0x0000003f));
+        buf[i++] = (u8) ((ns_coeff1_8191nu & 0x03000000) >> 24);
+        buf[i++] = (u8) ((ns_coeff1_8191nu & 0x00ffc000) >> 16);
+        buf[i++] = (u8) ((ns_coeff1_8191nu & 0x0000ff00) >> 8);
+        buf[i++] = (u8) ((ns_coeff1_8191nu & 0x000000ff));
+        buf[i++] = (u8) ((ns_coeff1_8192nu & 0x03000000) >> 24);
+        buf[i++] = (u8) ((ns_coeff1_8192nu & 0x00ffc000) >> 16);
+        buf[i++] = (u8) ((ns_coeff1_8192nu & 0x0000ff00) >> 8);
+        buf[i++] = (u8) ((ns_coeff1_8192nu & 0x000000ff));
+        buf[i++] = (u8) ((ns_coeff1_8193nu & 0x03000000) >> 24);
+        buf[i++] = (u8) ((ns_coeff1_8193nu & 0x00ffc000) >> 16);
+        buf[i++] = (u8) ((ns_coeff1_8193nu & 0x0000ff00) >> 8);
+        buf[i++] = (u8) ((ns_coeff1_8193nu & 0x000000ff));
+        buf[i++] = (u8) ((ns_coeff2_8k     & 0x01c00000) >> 22);
+        buf[i++] = (u8) ((ns_coeff2_8k     & 0x003fc000) >> 14);
+        buf[i++] = (u8) ((ns_coeff2_8k     & 0x00003fc0) >> 6);
+        buf[i++] = (u8) ((ns_coeff2_8k     & 0x0000003f));
+
+        deb_info("%s: coeff:", __func__);
+        debug_dump(buf, sizeof(buf), deb_info);
+
+        /* program */
+        for (i = 0; i < sizeof(buf); i++) {
+                ret = af9013_write_reg(state, 0xae00 + i, buf[i]);
+                if (ret)
+                        break;
+        }
+
+        return ret;
+}
+
+static int af9013_set_adc_ctrl(struct af9013_state *state)
+{
+        int ret;
+        u8 buf[3], tmp, i;
+        u32 adc_cw;
+
+        deb_info("%s: adc_clock:%d\n", __func__, state->config.adc_clock);
+
+        /* adc frequency type */
+        switch (state->config.adc_clock) {
+        case 28800: /* 28.800 MHz */
+                tmp = 0;
+                break;
+        case 20480: /* 20.480 MHz */
+                tmp = 1;
+                break;
+        case 28000: /* 28.000 MHz */
+                tmp = 2;
+                break;
+        case 25000: /* 25.000 MHz */
+                tmp = 3;
+                break;
+        default:
+                err("invalid xtal");
+                return -EINVAL;
+        }
+
+        adc_cw = af913_div(state->config.adc_clock*1000, 1000000ul, 19ul);
+
+        buf[0] = (u8) ((adc_cw & 0x000000ff));
+        buf[1] = (u8) ((adc_cw & 0x0000ff00) >> 8);
+        buf[2] = (u8) ((adc_cw & 0x00ff0000) >> 16);
+
+        deb_info("%s: adc_cw:", __func__);
+        debug_dump(buf, sizeof(buf), deb_info);
+
+        /* program */
+        for (i = 0; i < sizeof(buf); i++) {
+                ret = af9013_write_reg(state, 0xd180 + i, buf[i]);
+                if (ret)
+                        goto error;
+        }
+        ret = af9013_write_reg_bits(state, 0x9bd2, 0, 4, tmp);
+error:
+        return ret;
+}
+
+static int af9013_set_freq_ctrl(struct af9013_state *state, fe_bandwidth_t bw)
+{
+        int ret;
+        u16 addr;
+        u8 buf[3], i, j;
+        u32 adc_freq, freq_cw;
+        s8 bfs_spec_inv;
+        int if_sample_freq;
+
+        for (j = 0; j < 3; j++) {
+                if (j == 0) {
+                        addr = 0xd140; /* fcw normal */
+                        bfs_spec_inv = state->config.rf_spec_inv ? -1 : 1;
+                } else if (j == 1) {
+                        addr = 0x9be7; /* fcw dummy ram */
+                        bfs_spec_inv = state->config.rf_spec_inv ? -1 : 1;
+                } else {
+                        addr = 0x9bea; /* fcw inverted */
+                        bfs_spec_inv = state->config.rf_spec_inv ? 1 : -1;
+                }
+
+                adc_freq       = state->config.adc_clock * 1000;
+                if_sample_freq = state->config.tuner_if * 1000;
+
+                /* TDA18271 uses different sampling freq for every bw */
+                if (state->config.tuner == AF9013_TUNER_TDA18271) {
+                        switch (bw) {
+                        case BANDWIDTH_6_MHZ:
+                                if_sample_freq = 3300000; /* 3.3 MHz */
+                                break;
+                        case BANDWIDTH_7_MHZ:
+                                if_sample_freq = 3800000; /* 3.8 MHz */
+                                break;
+                        case BANDWIDTH_8_MHZ:
+                        default:
+                                if_sample_freq = 4300000; /* 4.3 MHz */
+                                break;
+                        }
+                }
+
+                while (if_sample_freq > (adc_freq / 2))
+                        if_sample_freq = if_sample_freq - adc_freq;
+
+                if (if_sample_freq >= 0)
+                        bfs_spec_inv = bfs_spec_inv * (-1);
+                else
+                        if_sample_freq = if_sample_freq * (-1);
+
+                freq_cw = af913_div(if_sample_freq, adc_freq, 23ul);
+
+                if (bfs_spec_inv == -1)
+                        freq_cw = 0x00800000 - freq_cw;
+
+                buf[0] = (u8) ((freq_cw & 0x000000ff));
+                buf[1] = (u8) ((freq_cw & 0x0000ff00) >> 8);
+                buf[2] = (u8) ((freq_cw & 0x007f0000) >> 16);
+
+
+                deb_info("%s: freq_cw:", __func__);
+                debug_dump(buf, sizeof(buf), deb_info);
+
+                /* program */
+                for (i = 0; i < sizeof(buf); i++) {
+                        ret = af9013_write_reg(state, addr++, buf[i]);
+                        if (ret)
+                                goto error;
+                }
+        }
+error:
+        return ret;
+}
+
+static int af9013_set_ofdm_params(struct af9013_state *state,
+        struct dvb_ofdm_parameters *params, u8 *auto_mode)
+{
+        int ret;
+        u8 i, buf[3] = {0, 0, 0};
+        *auto_mode = 0; /* set if parameters are requested to auto set */
+
+        switch (params->transmission_mode) {
+        case TRANSMISSION_MODE_AUTO:
+                *auto_mode = 1;
+        case TRANSMISSION_MODE_2K:
+                break;
+        case TRANSMISSION_MODE_8K:
+                buf[0] |= (1 << 0);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        switch (params->guard_interval) {
+        case GUARD_INTERVAL_AUTO:
+                *auto_mode = 1;
+        case GUARD_INTERVAL_1_32:
+                break;
+        case GUARD_INTERVAL_1_16:
+                buf[0] |= (1 << 2);
+                break;
+        case GUARD_INTERVAL_1_8:
+                buf[0] |= (2 << 2);
+                break;
+        case GUARD_INTERVAL_1_4:
+                buf[0] |= (3 << 2);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        switch (params->hierarchy_information) {
+        case HIERARCHY_AUTO:
+                *auto_mode = 1;
+        case HIERARCHY_NONE:
+                break;
+        case HIERARCHY_1:
+                buf[0] |= (1 << 4);
+                break;
+        case HIERARCHY_2:
+                buf[0] |= (2 << 4);
+                break;
+        case HIERARCHY_4:
+                buf[0] |= (3 << 4);
+                break;
+        default:
+                return -EINVAL;
+        };
+
+        switch (params->constellation) {
+        case QAM_AUTO:
+                *auto_mode = 1;
+        case QPSK:
+                break;
+        case QAM_16:
+                buf[1] |= (1 << 6);
+                break;
+        case QAM_64:
+                buf[1] |= (2 << 6);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        /* Use HP. How and which case we can switch to LP? */
+        buf[1] |= (1 << 4);
+
+        switch (params->code_rate_HP) {
+        case FEC_AUTO:
+                *auto_mode = 1;
+        case FEC_1_2:
+                break;
+        case FEC_2_3:
+                buf[2] |= (1 << 0);
+                break;
+        case FEC_3_4:
+                buf[2] |= (2 << 0);
+                break;
+        case FEC_5_6:
+                buf[2] |= (3 << 0);
+                break;
+        case FEC_7_8:
+                buf[2] |= (4 << 0);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        switch (params->code_rate_LP) {
+        case FEC_AUTO:
+        /* if HIERARCHY_NONE and FEC_NONE then LP FEC is set to FEC_AUTO
+           by dvb_frontend.c for compatibility */
+                if (params->hierarchy_information != HIERARCHY_NONE)
+                        *auto_mode = 1;
+        case FEC_1_2:
+                break;
+        case FEC_2_3:
+                buf[2] |= (1 << 3);
+                break;
+        case FEC_3_4:
+                buf[2] |= (2 << 3);
+                break;
+        case FEC_5_6:
+                buf[2] |= (3 << 3);
+                break;
+        case FEC_7_8:
+                buf[2] |= (4 << 3);
+                break;
+        case FEC_NONE:
+                if (params->hierarchy_information == HIERARCHY_AUTO)
+                        break;
+        default:
+                return -EINVAL;
+        }
+
+        switch (params->bandwidth) {
+        case BANDWIDTH_6_MHZ:
+                break;
+        case BANDWIDTH_7_MHZ:
+                buf[1] |= (1 << 2);
+                break;
+        case BANDWIDTH_8_MHZ:
+                buf[1] |= (2 << 2);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        /* program */
+        for (i = 0; i < sizeof(buf); i++) {
+                ret = af9013_write_reg(state, 0xd3c0 + i, buf[i]);
+                if (ret)
+                        break;
+        }
+
+        return ret;
+}
+
+static int af9013_reset(struct af9013_state *state, u8 sleep)
+{
+        int ret;
+        u8 tmp, i;
+        deb_info("%s\n", __func__);
+
+        /* enable OFDM reset */
+        ret = af9013_write_reg_bits(state, 0xd417, 4, 1, 1);
+        if (ret)
+                goto error;
+
+        /* start reset mechanism */
+        ret = af9013_write_reg(state, 0xaeff, 1);
+        if (ret)
+                goto error;
+
+        /* reset is done when bit 1 is set */
+        for (i = 0; i < 150; i++) {
+                ret = af9013_read_reg_bits(state, 0xd417, 1, 1, &tmp);
+                if (ret)
+                        goto error;
+                if (tmp)
+                        break; /* reset done */
+                msleep(10);
+        }
+        if (!tmp)
+                return -ETIMEDOUT;
+
+        /* don't clear reset when going to sleep */
+        if (!sleep) {
+                /* clear OFDM reset */
+                ret = af9013_write_reg_bits(state, 0xd417, 1, 1, 0);
+                if (ret)
+                        goto error;
+
+                /* disable OFDM reset */
+                ret = af9013_write_reg_bits(state, 0xd417, 4, 1, 0);
+        }
+error:
+        return ret;
+}
+
+static int af9013_power_ctrl(struct af9013_state *state, u8 onoff)
+{
+        int ret;
+        deb_info("%s: onoff:%d\n", __func__, onoff);
+
+        if (onoff) {
+                /* power on */
+                ret = af9013_write_reg_bits(state, 0xd73a, 3, 1, 0);
+                if (ret)
+                        goto error;
+                ret = af9013_write_reg_bits(state, 0xd417, 1, 1, 0);
+                if (ret)
+                        goto error;
+                ret = af9013_write_reg_bits(state, 0xd417, 4, 1, 0);
+        } else {
+                /* power off */
+                ret = af9013_reset(state, 1);
+                if (ret)
+                        goto error;
+                ret = af9013_write_reg_bits(state, 0xd73a, 3, 1, 1);
+        }
+error:
+        return ret;
+}
+
+static int af9013_lock_led(struct af9013_state *state, u8 onoff)
+{
+        deb_info("%s: onoff:%d\n", __func__, onoff);
+
+        return af9013_write_reg_bits(state, 0xd730, 0, 1, onoff);
+}
+
+static int af9013_set_frontend(struct dvb_frontend *fe,
+        struct dvb_frontend_parameters *params)
+{
+        struct af9013_state *state = fe->demodulator_priv;
+        int ret;
+        u8 auto_mode; /* auto set TPS */
+
+        deb_info("%s: freq:%d bw:%d\n", __func__, params->frequency,
+                params->u.ofdm.bandwidth);
+
+        state->frequency = params->frequency;
+
+        /* program CFOE coefficients */
+        ret = af9013_set_coeff(state, params->u.ofdm.bandwidth);
+        if (ret)
+                goto error;
+
+        /* program frequency control */
+        ret = af9013_set_freq_ctrl(state, params->u.ofdm.bandwidth);
+        if (ret)
+                goto error;
+
+        /* clear TPS lock flag (inverted flag) */
+        ret = af9013_write_reg_bits(state, 0xd330, 3, 1, 1);
+        if (ret)
+                goto error;
+
+        /* clear MPEG2 lock flag */
+        ret = af9013_write_reg_bits(state, 0xd507, 6, 1, 0);
+        if (ret)
+                goto error;
+
+        /* empty channel function */
+        ret = af9013_write_reg_bits(state, 0x9bfe, 0, 1, 0);
+        if (ret)
+                goto error;
+
+        /* empty DVB-T channel function */
+        ret = af9013_write_reg_bits(state, 0x9bc2, 0, 1, 0);
+        if (ret)
+                goto error;
+
+        /* program tuner */
+        if (fe->ops.tuner_ops.set_params)
+                fe->ops.tuner_ops.set_params(fe, params);
+
+        /* program TPS and bandwidth, check if auto mode needed */
+        ret = af9013_set_ofdm_params(state, &params->u.ofdm, &auto_mode);
+        if (ret)
+                goto error;
+
+        if (auto_mode) {
+                /* clear easy mode flag */
+                ret = af9013_write_reg(state, 0xaefd, 0);
+                deb_info("%s: auto TPS\n", __func__);
+        } else {
+                /* set easy mode flag */
+                ret = af9013_write_reg(state, 0xaefd, 1);
+                if (ret)
+                        goto error;
+                ret = af9013_write_reg(state, 0xaefe, 0);
+                deb_info("%s: manual TPS\n", __func__);
+        }
+        if (ret)
+                goto error;
+
+        /* everything is set, lets try to receive channel - OFSM GO! */
+        ret = af9013_write_reg(state, 0xffff, 0);
+        if (ret)
+                goto error;
+
+error:
+        return ret;
+}
+
+static int af9013_get_frontend(struct dvb_frontend *fe,
+        struct dvb_frontend_parameters *p)
+{
+        struct af9013_state *state = fe->demodulator_priv;
+        int ret;
+        u8 i, buf[3];
+        deb_info("%s\n", __func__);
+
+        /* read TPS registers */
+        for (i = 0; i < 3; i++) {
+                ret = af9013_read_reg(state, 0xd3c0 + i, &buf[i]);
+                if (ret)
+                        goto error;
+        }
+
+        switch ((buf[1] >> 6) & 3) {
+        case 0:
+                p->u.ofdm.constellation = QPSK;
+                break;
+        case 1:
+                p->u.ofdm.constellation = QAM_16;
+                break;
+        case 2:
+                p->u.ofdm.constellation = QAM_64;
+                break;
+        }
+
+        switch ((buf[0] >> 0) & 3) {
+        case 0:
+                p->u.ofdm.transmission_mode = TRANSMISSION_MODE_2K;
+                break;
+        case 1:
+                p->u.ofdm.transmission_mode = TRANSMISSION_MODE_8K;
+        }
+
+        switch ((buf[0] >> 2) & 3) {
+        case 0:
+                p->u.ofdm.guard_interval = GUARD_INTERVAL_1_32;
+                break;
+        case 1:
+                p->u.ofdm.guard_interval = GUARD_INTERVAL_1_16;
+                break;
+        case 2:
+                p->u.ofdm.guard_interval = GUARD_INTERVAL_1_8;
+                break;
+        case 3:
+                p->u.ofdm.guard_interval = GUARD_INTERVAL_1_4;
+                break;
+        }
+
+        switch ((buf[0] >> 4) & 7) {
+        case 0:
+                p->u.ofdm.hierarchy_information = HIERARCHY_NONE;
+                break;
+        case 1:
+                p->u.ofdm.hierarchy_information = HIERARCHY_1;
+                break;
+        case 2:
+                p->u.ofdm.hierarchy_information = HIERARCHY_2;
+                break;
+        case 3:
+                p->u.ofdm.hierarchy_information = HIERARCHY_4;
+                break;
+        }
+
+        switch ((buf[2] >> 0) & 7) {
+        case 0:
+                p->u.ofdm.code_rate_HP = FEC_1_2;
+                break;
+        case 1:
+                p->u.ofdm.code_rate_HP = FEC_2_3;
+                break;
+        case 2:
+                p->u.ofdm.code_rate_HP = FEC_3_4;
+                break;
+        case 3:
+                p->u.ofdm.code_rate_HP = FEC_5_6;
+                break;
+        case 4:
+                p->u.ofdm.code_rate_HP = FEC_7_8;
+                break;
+        }
+
+        switch ((buf[2] >> 3) & 7) {
+        case 0:
+                p->u.ofdm.code_rate_LP = FEC_1_2;
+                break;
+        case 1:
+                p->u.ofdm.code_rate_LP = FEC_2_3;
+                break;
+        case 2:
+                p->u.ofdm.code_rate_LP = FEC_3_4;
+                break;
+        case 3:
+                p->u.ofdm.code_rate_LP = FEC_5_6;
+                break;
+        case 4:
+                p->u.ofdm.code_rate_LP = FEC_7_8;
+                break;
+        }
+
+        switch ((buf[1] >> 2) & 3) {
+        case 0:
+                p->u.ofdm.bandwidth = BANDWIDTH_6_MHZ;
+                break;
+        case 1:
+                p->u.ofdm.bandwidth = BANDWIDTH_7_MHZ;
+                break;
+        case 2:
+                p->u.ofdm.bandwidth = BANDWIDTH_8_MHZ;
+                break;
+        }
+
+        p->inversion = INVERSION_AUTO;
+        p->frequency = state->frequency;
+
+error:
+        return ret;
+}
+
+static int af9013_update_ber_unc(struct dvb_frontend *fe)
+{
+        struct af9013_state *state = fe->demodulator_priv;
+        int ret;
+        u8 buf[3], i;
+        u32 error_bit_count = 0;
+        u32 total_bit_count = 0;
+        u32 abort_packet_count = 0;
+
+        state->ber = 0;
+
+        /* check if error bit count is ready */
+        ret = af9013_read_reg_bits(state, 0xd391, 4, 1, &buf[0]);
+        if (ret)
+                goto error;
+        if (!buf[0])
+                goto exit;
+
+        /* get RSD packet abort count */
+        for (i = 0; i < 2; i++) {
+                ret = af9013_read_reg(state, 0xd38a + i, &buf[i]);
+                if (ret)
+                        goto error;
+        }
+        abort_packet_count = (buf[1] << 8) + buf[0];
+
+        /* get error bit count */
+        for (i = 0; i < 3; i++) {
+                ret = af9013_read_reg(state, 0xd387 + i, &buf[i]);
+                if (ret)
+                        goto error;
+        }
+        error_bit_count = (buf[2] << 16) + (buf[1] << 8) + buf[0];
+        error_bit_count = error_bit_count - abort_packet_count * 8 * 8;
+
+        /* get used RSD counting period (10000 RSD packets used) */
+        for (i = 0; i < 2; i++) {
+                ret = af9013_read_reg(state, 0xd385 + i, &buf[i]);
+                if (ret)
+                        goto error;
+        }
+        total_bit_count = (buf[1] << 8) + buf[0];
+        total_bit_count = total_bit_count - abort_packet_count;
+        total_bit_count = total_bit_count * 204 * 8;
+
+        if (total_bit_count)
+                state->ber = error_bit_count * 1000000000 / total_bit_count;
+
+        state->ucblocks += abort_packet_count;
+
+        deb_info("%s: err bits:%d total bits:%d abort count:%d\n", __func__,
+                error_bit_count, total_bit_count, abort_packet_count);
+
+        /* set BER counting range */
+        ret = af9013_write_reg(state, 0xd385, 10000 & 0xff);
+        if (ret)
+                goto error;
+        ret = af9013_write_reg(state, 0xd386, 10000 >> 8);
+        if (ret)
+                goto error;
+        /* reset and start BER counter */
+        ret = af9013_write_reg_bits(state, 0xd391, 4, 1, 1);
+        if (ret)
+                goto error;
+
+exit:
+error:
+        return ret;
+}
+
+static int af9013_update_snr(struct dvb_frontend *fe)
+{
+        struct af9013_state *state = fe->demodulator_priv;
+        int ret;
+        u8 buf[3], i, len;
+        u32 quant = 0;
+        struct snr_table *snr_table;
+
+        /* check if quantizer ready (for snr) */
+        ret = af9013_read_reg_bits(state, 0xd2e1, 3, 1, &buf[0]);
+        if (ret)
+                goto error;
+        if (buf[0]) {
+                /* quantizer ready - read it */
+                for (i = 0; i < 3; i++) {
+                        ret = af9013_read_reg(state, 0xd2e3 + i, &buf[i]);
+                        if (ret)
+                                goto error;
+                }
+                quant = (buf[2] << 16) + (buf[1] << 8) + buf[0];
+
+                /* read current constellation */
+                ret = af9013_read_reg(state, 0xd3c1, &buf[0]);
+                if (ret)
+                        goto error;
+
+                switch ((buf[0] >> 6) & 3) {
+                case 0:
+                        len = ARRAY_SIZE(qpsk_snr_table);
+                        snr_table = qpsk_snr_table;
+                        break;
+                case 1:
+                        len = ARRAY_SIZE(qam16_snr_table);
+                        snr_table = qam16_snr_table;
+                        break;
+                case 2:
+                        len = ARRAY_SIZE(qam64_snr_table);
+                        snr_table = qam64_snr_table;
+                        break;
+                default:
+                        len = 0;
+                        break;
+                }
+
+                if (len) {
+                        for (i = 0; i < len; i++) {
+                                if (quant < snr_table[i].val) {
+                                        state->snr = snr_table[i].snr * 10;
+                                        break;
+                                }
+                        }
+                }
+
+                /* set quantizer super frame count */
+                ret = af9013_write_reg(state, 0xd2e2, 1);
+                if (ret)
+                        goto error;
+
+                /* check quantizer availability */
+                for (i = 0; i < 10; i++) {
+                        msleep(10);
+                        ret = af9013_read_reg_bits(state, 0xd2e6, 0, 1,
+                                &buf[0]);
+                        if (ret)
+                                goto error;
+                        if (!buf[0])
+                                break;
+                }
+
+                /* reset quantizer */
+                ret = af9013_write_reg_bits(state, 0xd2e1, 3, 1, 1);
+                if (ret)
+                        goto error;
+        }
+
+error:
+        return ret;
+}
+
+static int af9013_update_signal_strength(struct dvb_frontend *fe)
+{
+        struct af9013_state *state = fe->demodulator_priv;
+        int ret;
+        u8 tmp0;
+        u8 rf_gain, rf_50, rf_80, if_gain, if_50, if_80;
+        int signal_strength;
+
+        deb_info("%s\n", __func__);
+
+        state->signal_strength = 0;
+
+        ret = af9013_read_reg_bits(state, 0x9bee, 0, 1, &tmp0);
+        if (ret)
+                goto error;
+        if (tmp0) {
+                ret = af9013_read_reg(state, 0x9bbd, &rf_50);
+                if (ret)
+                        goto error;
+                ret = af9013_read_reg(state, 0x9bd0, &rf_80);
+                if (ret)
+                        goto error;
+                ret = af9013_read_reg(state, 0x9be2, &if_50);
+                if (ret)
+                        goto error;
+                ret = af9013_read_reg(state, 0x9be4, &if_80);
+                if (ret)
+                        goto error;
+                ret = af9013_read_reg(state, 0xd07c, &rf_gain);
+                if (ret)
+                        goto error;
+                ret = af9013_read_reg(state, 0xd07d, &if_gain);
+                if (ret)
+                        goto error;
+                signal_strength = (0xffff / (9 * (rf_50 + if_50) - \
+                        11 * (rf_80 + if_80))) * (10 * (rf_gain + if_gain) - \
+                        11 * (rf_80 + if_80));
+                if (signal_strength < 0)
+                        signal_strength = 0;
+                else if (signal_strength > 0xffff)
+                        signal_strength = 0xffff;
+
+                state->signal_strength = signal_strength;
+        }
+
+error:
+        return ret;
+}
+
+static int af9013_update_statistics(struct dvb_frontend *fe)
+{
+        struct af9013_state *state = fe->demodulator_priv;
+        int ret;
+
+        if (time_before(jiffies, state->next_statistics_check))
+                return 0;
+
+        /* set minimum statistic update interval */
+        state->next_statistics_check = jiffies + msecs_to_jiffies(1200);
+
+        ret = af9013_update_signal_strength(fe);
+        if (ret)
+                goto error;
+        ret = af9013_update_snr(fe);
+        if (ret)
+                goto error;
+        ret = af9013_update_ber_unc(fe);
+        if (ret)
+                goto error;
+
+error:
+        return ret;
+}
+
+static int af9013_get_tune_settings(struct dvb_frontend *fe,
+        struct dvb_frontend_tune_settings *fesettings)
+{
+        fesettings->min_delay_ms = 800;
+        fesettings->step_size = 0;
+        fesettings->max_drift = 0;
+
+        return 0;
+}
+
+static int af9013_read_status(struct dvb_frontend *fe, fe_status_t *status)
+{
+        struct af9013_state *state = fe->demodulator_priv;
+        int ret = 0;
+        u8 tmp;
+        *status = 0;
+
+        /* TPS lock */
+        ret = af9013_read_reg_bits(state, 0xd330, 3, 1, &tmp);
+        if (ret)
+                goto error;
+        if (tmp)
+                *status |= FE_HAS_VITERBI | FE_HAS_CARRIER | FE_HAS_SIGNAL;
+
+        /* MPEG2 lock */
+        ret = af9013_read_reg_bits(state, 0xd507, 6, 1, &tmp);
+        if (ret)
+                goto error;
+        if (tmp)
+                *status |= FE_HAS_SYNC | FE_HAS_LOCK;
+
+        if (!*status & FE_HAS_SIGNAL) {
+                /* AGC lock */
+                ret = af9013_read_reg_bits(state, 0xd1a0, 6, 1, &tmp);
+                if (ret)
+                        goto error;
+                if (tmp)
+                        *status |= FE_HAS_SIGNAL;
+        }
+
+        if (!*status & FE_HAS_CARRIER) {
+                /* CFO lock */
+                ret = af9013_read_reg_bits(state, 0xd333, 7, 1, &tmp);
+                if (ret)
+                        goto error;
+                if (tmp)
+                        *status |= FE_HAS_CARRIER;
+        }
+
+        if (!*status & FE_HAS_CARRIER) {
+                /* SFOE lock */
+                ret = af9013_read_reg_bits(state, 0xd334, 6, 1, &tmp);
+                if (ret)
+                        goto error;
+                if (tmp)
+                        *status |= FE_HAS_CARRIER;
+        }
+
+        ret = af9013_update_statistics(fe);
+
+error:
+        return ret;
+}
+
+
+static int af9013_read_ber(struct dvb_frontend *fe, u32 *ber)
+{
+        struct af9013_state *state = fe->demodulator_priv;
+        int ret;
+        ret = af9013_update_statistics(fe);
+        *ber = state->ber;
+        return ret;
+}
+
+static int af9013_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
+{
+        struct af9013_state *state = fe->demodulator_priv;
+        int ret;
+        ret = af9013_update_statistics(fe);
+        *strength = state->signal_strength;
+        return ret;
+}
+
+static int af9013_read_snr(struct dvb_frontend *fe, u16 *snr)
+{
+        struct af9013_state *state = fe->demodulator_priv;
+        int ret;
+        ret = af9013_update_statistics(fe);
+        *snr = state->snr;
+        return ret;
+}
+
+static int af9013_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
+{
+        struct af9013_state *state = fe->demodulator_priv;
+        int ret;
+        ret = af9013_update_statistics(fe);
+        *ucblocks = state->ucblocks;
+        return ret;
+}
+
+static int af9013_sleep(struct dvb_frontend *fe)
+{
+        struct af9013_state *state = fe->demodulator_priv;
+        int ret;
+        deb_info("%s\n", __func__);
+
+        ret = af9013_lock_led(state, 0);
+        if (ret)
+                goto error;
+
+        ret = af9013_power_ctrl(state, 0);
+error:
+        return ret;
+}
+
+static int af9013_init(struct dvb_frontend *fe)
+{
+        struct af9013_state *state = fe->demodulator_priv;
+        int ret, i, len;
+        u8 tmp0, tmp1;
+        struct regdesc *init;
+        deb_info("%s\n", __func__);
+
+        /* reset OFDM */
+        ret = af9013_reset(state, 0);
+        if (ret)
+                goto error;
+
+        /* power on */
+        ret = af9013_power_ctrl(state, 1);
+        if (ret)
+                goto error;
+
+        /* enable ADC */
+        ret = af9013_write_reg(state, 0xd73a, 0xa4);
+        if (ret)
+                goto error;
+
+        /* write API version to firmware */
+        for (i = 0; i < sizeof(state->config.api_version); i++) {
+                ret = af9013_write_reg(state, 0x9bf2 + i,
+                        state->config.api_version[i]);
+                if (ret)
+                        goto error;
+        }
+
+        /* program ADC control */
+        ret = af9013_set_adc_ctrl(state);
+        if (ret)
+                goto error;
+
+        /* set I2C master clock */
+        ret = af9013_write_reg(state, 0xd416, 0x14);
+        if (ret)
+                goto error;
+
+        /* set 16 embx */
+        ret = af9013_write_reg_bits(state, 0xd700, 1, 1, 1);
+        if (ret)
+                goto error;
+
+        /* set no trigger */
+        ret = af9013_write_reg_bits(state, 0xd700, 2, 1, 0);
+        if (ret)
+                goto error;
+
+        /* set read-update bit for constellation */
+        ret = af9013_write_reg_bits(state, 0xd371, 1, 1, 1);
+        if (ret)
+                goto error;
+
+        /* enable FEC monitor */
+        ret = af9013_write_reg_bits(state, 0xd392, 1, 1, 1);
+        if (ret)
+                goto error;
+
+        /* load OFSM settings */
+        deb_info("%s: load ofsm settings\n", __func__);
+        len = ARRAY_SIZE(ofsm_init);
+        init = ofsm_init;
+        for (i = 0; i < len; i++) {
+                ret = af9013_write_reg_bits(state, init[i].addr, init[i].pos,
+                        init[i].len, init[i].val);
+                if (ret)
+                        goto error;
+        }
+
+        /* load tuner specific settings */
+        deb_info("%s: load tuner specific settings\n", __func__);
+        switch (state->config.tuner) {
+        case AF9013_TUNER_MXL5003D:
+                len = ARRAY_SIZE(tuner_init_mxl5003d);
+                init = tuner_init_mxl5003d;
+                break;
+        case AF9013_TUNER_MXL5005D:
+        case AF9013_TUNER_MXL5005R:
+                len = ARRAY_SIZE(tuner_init_mxl5005);
+                init = tuner_init_mxl5005;
+                break;
+        case AF9013_TUNER_ENV77H11D5:
+                len = ARRAY_SIZE(tuner_init_env77h11d5);
+                init = tuner_init_env77h11d5;
+                break;
+        case AF9013_TUNER_MT2060:
+                len = ARRAY_SIZE(tuner_init_mt2060);
+                init = tuner_init_mt2060;
+                break;
+        case AF9013_TUNER_MC44S803:
+                len = ARRAY_SIZE(tuner_init_mc44s803);
+                init = tuner_init_mc44s803;
+                break;
+        case AF9013_TUNER_QT1010:
+        case AF9013_TUNER_QT1010A:
+                len = ARRAY_SIZE(tuner_init_qt1010);
+                init = tuner_init_qt1010;
+                break;
+        case AF9013_TUNER_MT2060_2:
+                len = ARRAY_SIZE(tuner_init_mt2060_2);
+                init = tuner_init_mt2060_2;
+                break;
+        case AF9013_TUNER_TDA18271:
+                len = ARRAY_SIZE(tuner_init_tda18271);
+                init = tuner_init_tda18271;
+                break;
+        case AF9013_TUNER_UNKNOWN:
+        default:
+                len = ARRAY_SIZE(tuner_init_unknown);
+                init = tuner_init_unknown;
+                break;
+        }
+
+        for (i = 0; i < len; i++) {
+                ret = af9013_write_reg_bits(state, init[i].addr, init[i].pos,
+                        init[i].len, init[i].val);
+                if (ret)
+                        goto error;
+        }
+
+        /* set TS mode */
+        deb_info("%s: setting ts mode\n", __func__);
+        tmp0 = 0; /* parallel mode */
+        tmp1 = 0; /* serial mode */
+        switch (state->config.output_mode) {
+        case AF9013_OUTPUT_MODE_PARALLEL:
+                tmp0 = 1;
+                break;
+        case AF9013_OUTPUT_MODE_SERIAL:
+                tmp1 = 1;
+                break;
+        case AF9013_OUTPUT_MODE_USB:
+                /* usb mode for AF9015 */
+        default:
+                break;
+        }
+        ret = af9013_write_reg_bits(state, 0xd500, 1, 1, tmp0); /* parallel */
+        if (ret)
+                goto error;
+        ret = af9013_write_reg_bits(state, 0xd500, 2, 1, tmp1); /* serial */
+        if (ret)
+                goto error;
+
+        /* enable lock led */
+        ret = af9013_lock_led(state, 1);
+        if (ret)
+                goto error;
+
+error:
+        return ret;
+}
+
+static struct dvb_frontend_ops af9013_ops;
+
+static int af9013_download_firmware(struct af9013_state *state)
+{
+        int i, len, packets, remainder, ret;
+        const struct firmware *fw;
+        u16 addr = 0x5100; /* firmware start address */
+        u16 checksum = 0;
+        u8 val;
+        u8 fw_params[4];
+        u8 *data;
+        u8 *fw_file = AF9013_DEFAULT_FIRMWARE;
+
+        msleep(100);
+        /* check whether firmware is already running */
+        ret = af9013_read_reg(state, 0x98be, &val);
+        if (ret)
+                goto error;
+        else
+                deb_info("%s: firmware status:%02x\n", __func__, val);
+
+        if (val == 0x0c) /* fw is running, no need for download */
+                goto exit;
+
+        info("found a '%s' in cold state, will try to load a firmware",
+                af9013_ops.info.name);
+
+        /* request the firmware, this will block and timeout */
+        ret = request_firmware(&fw, fw_file,  &state->i2c->dev);
+        if (ret) {
+                err("did not find the firmware file. (%s) "
+                        "Please see linux/Documentation/dvb/ for more details" \
+                        " on firmware-problems. (%d)",
+                        fw_file, ret);
+                goto error;
+        }
+
+        info("downloading firmware from file '%s'", fw_file);
+
+        /* calc checksum */
+        for (i = 0; i < fw->size; i++)
+                checksum += fw->data[i];
+
+        fw_params[0] = checksum >> 8;
+        fw_params[1] = checksum & 0xff;
+        fw_params[2] = fw->size >> 8;
+        fw_params[3] = fw->size & 0xff;
+
+        /* write fw checksum & size */
+        ret = af9013_write_ofsm_regs(state, 0x50fc,
+                fw_params, sizeof(fw_params));
+        if (ret)
+                goto error_release;
+
+        #define FW_PACKET_MAX_DATA  16
+
+        packets = fw->size / FW_PACKET_MAX_DATA;
+        remainder = fw->size % FW_PACKET_MAX_DATA;
+        len = FW_PACKET_MAX_DATA;
+        for (i = 0; i <= packets; i++) {
+                if (i == packets)  /* set size of the last packet */
+                        len = remainder;
+
+                data = (u8 *)(fw->data + i * FW_PACKET_MAX_DATA);
+                ret = af9013_write_ofsm_regs(state, addr, data, len);
+                addr += FW_PACKET_MAX_DATA;
+
+                if (ret) {
+                        err("firmware download failed at %d with %d", i, ret);
+                        goto error_release;
+                }
+        }
+
+        /* request boot firmware */
+        ret = af9013_write_reg(state, 0xe205, 1);
+        if (ret)
+                goto error_release;
+
+        for (i = 0; i < 15; i++) {
+                msleep(100);
+
+                /* check firmware status */
+                ret = af9013_read_reg(state, 0x98be, &val);
+                if (ret)
+                        goto error_release;
+
+                deb_info("%s: firmware status:%02x\n", __func__, val);
+
+                if (val == 0x0c || val == 0x04) /* success or fail */
+                        break;
+        }
+
+        if (val == 0x04) {
+                err("firmware did not run");
+                ret = -1;
+        } else if (val != 0x0c) {
+                err("firmware boot timeout");
+                ret = -1;
+        }
+
+error_release:
+        release_firmware(fw);
+error:
+exit:
+        if (!ret)
+                info("found a '%s' in warm state.", af9013_ops.info.name);
+        return ret;
+}
+
+static int af9013_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
+{
+        int ret;
+        struct af9013_state *state = fe->demodulator_priv;
+        deb_info("%s: enable:%d\n", __func__, enable);
+
+        if (state->config.output_mode == AF9013_OUTPUT_MODE_USB)
+                ret = af9013_write_reg_bits(state, 0xd417, 3, 1, enable);
+        else
+                ret = af9013_write_reg_bits(state, 0xd607, 2, 1, enable);
+
+        return ret;
+}
+
+static void af9013_release(struct dvb_frontend *fe)
+{
+        struct af9013_state *state = fe->demodulator_priv;
+        kfree(state);
+}
+
+static struct dvb_frontend_ops af9013_ops;
+
+struct dvb_frontend *af9013_attach(const struct af9013_config *config,
+        struct i2c_adapter *i2c)
+{
+        int ret;
+        struct af9013_state *state = NULL;
+        u8 buf[3], i;
+
+        /* allocate memory for the internal state */
+        state = kzalloc(sizeof(struct af9013_state), GFP_KERNEL);
+        if (state == NULL)
+                goto error;
+
+        /* setup the state */
+        state->i2c = i2c;
+        memcpy(&state->config, config, sizeof(struct af9013_config));
+
+        /* chip version */
+        ret = af9013_read_reg_bits(state, 0xd733, 4, 4, &buf[2]);
+        if (ret)
+                goto error;
+
+        /* ROM version */
+        for (i = 0; i < 2; i++) {
+                ret = af9013_read_reg(state, 0x116b + i, &buf[i]);
+                if (ret)
+                        goto error;
+        }
+        deb_info("%s: chip version:%d ROM version:%d.%d\n", __func__,
+                buf[2], buf[0], buf[1]);
+
+        /* download firmware */
+        if (state->config.output_mode != AF9013_OUTPUT_MODE_USB) {
+                ret = af9013_download_firmware(state);
+                if (ret)
+                        goto error;
+        }
+
+        /* firmware version */
+        for (i = 0; i < 3; i++) {
+                ret = af9013_read_reg(state, 0x5103 + i, &buf[i]);
+                if (ret)
+                        goto error;
+        }
+        info("firmware version:%d.%d.%d", buf[0], buf[1], buf[2]);
+
+        /* settings for mp2if */
+        if (state->config.output_mode == AF9013_OUTPUT_MODE_USB) {
+                /* AF9015 split PSB to 1.5k + 0.5k */
+                ret = af9013_write_reg_bits(state, 0xd50b, 2, 1, 1);
+        } else {
+                /* AF9013 change the output bit to data7 */
+                ret = af9013_write_reg_bits(state, 0xd500, 3, 1, 1);
+                if (ret)
+                        goto error;
+                /* AF9013 set mpeg to full speed */
+                ret = af9013_write_reg_bits(state, 0xd502, 4, 1, 1);
+        }
+        if (ret)
+                goto error;
+        ret = af9013_write_reg_bits(state, 0xd520, 4, 1, 1);
+        if (ret)
+                goto error;
+
+        /* set GPIOs */
+        for (i = 0; i < sizeof(state->config.gpio); i++) {
+                ret = af9013_set_gpio(state, i, state->config.gpio[i]);
+                if (ret)
+                        goto error;
+        }
+
+        /* create dvb_frontend */
+        memcpy(&state->frontend.ops, &af9013_ops,
+                sizeof(struct dvb_frontend_ops));
+        state->frontend.demodulator_priv = state;
+
+        return &state->frontend;
+error:
+        kfree(state);
+        return NULL;
+}
+EXPORT_SYMBOL(af9013_attach);
+
+static struct dvb_frontend_ops af9013_ops = {
+        .info = {
+                .name = "Afatech AF9013 DVB-T",
+                .type = FE_OFDM,
+                .frequency_min = 174000000,
+                .frequency_max = 862000000,
+                .frequency_stepsize = 250000,
+                .frequency_tolerance = 0,
+                .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_QPSK | FE_CAN_QAM_16 |
+                        FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
+                        FE_CAN_TRANSMISSION_MODE_AUTO |
+                        FE_CAN_GUARD_INTERVAL_AUTO |
+                        FE_CAN_HIERARCHY_AUTO |
+                        FE_CAN_RECOVER |
+                        FE_CAN_MUTE_TS
+        },
+
+        .release = af9013_release,
+        .init = af9013_init,
+        .sleep = af9013_sleep,
+        .i2c_gate_ctrl = af9013_i2c_gate_ctrl,
+
+        .set_frontend = af9013_set_frontend,
+        .get_frontend = af9013_get_frontend,
+
+        .get_tune_settings = af9013_get_tune_settings,
+
+        .read_status = af9013_read_status,
+        .read_ber = af9013_read_ber,
+        .read_signal_strength = af9013_read_signal_strength,
+        .read_snr = af9013_read_snr,
+        .read_ucblocks = af9013_read_ucblocks,
+};
+
+module_param_named(debug, af9013_debug, int, 0644);
+MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
+
+MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
+MODULE_DESCRIPTION("Afatech AF9013 DVB-T demodulator driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/frontends/af9013.h b/drivers/media/dvb/frontends/af9013.h
new file mode 100644
index 000000000000..28b90c91c766
--- /dev/null
+++ b/drivers/media/dvb/frontends/af9013.h
@@ -0,0 +1,107 @@
+/*
+ * DVB USB Linux driver for Afatech AF9015 DVB-T USB2.0 receiver
+ *
+ * Copyright (C) 2007 Antti Palosaari <crope@iki.fi>
+ *
+ * Thanks to Afatech who kindly provided information.
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef _AF9013_H_
+#define _AF9013_H_
+
+#include <linux/dvb/frontend.h>
+
+enum af9013_ts_mode {
+        AF9013_OUTPUT_MODE_PARALLEL,
+        AF9013_OUTPUT_MODE_SERIAL,
+        AF9013_OUTPUT_MODE_USB, /* only for AF9015 */
+};
+
+enum af9013_tuner {
+        AF9013_TUNER_MXL5003D   =   3, /* MaxLinear */
+        AF9013_TUNER_MXL5005D   =  13, /* MaxLinear */
+        AF9013_TUNER_MXL5005R   =  30, /* MaxLinear */
+        AF9013_TUNER_ENV77H11D5 = 129, /* Panasonic */
+        AF9013_TUNER_MT2060     = 130, /* Microtune */
+        AF9013_TUNER_MC44S803   = 133, /* Freescale */
+        AF9013_TUNER_QT1010     = 134, /* Quantek */
+        AF9013_TUNER_UNKNOWN    = 140, /* for can tuners ? */
+        AF9013_TUNER_MT2060_2   = 147, /* Microtune */
+        AF9013_TUNER_TDA18271   = 156, /* NXP */
+        AF9013_TUNER_QT1010A    = 162, /* Quantek */
+};
+
+/* AF9013/5 GPIOs (mostly guessed)
+   demod#1-gpio#0 - set demod#2 i2c-addr for dual devices
+   demod#1-gpio#1 - xtal setting (?)
+   demod#1-gpio#3 - tuner#1
+   demod#2-gpio#0 - tuner#2
+   demod#2-gpio#1 - xtal setting (?)
+*/
+#define AF9013_GPIO_ON (1 << 0)
+#define AF9013_GPIO_EN (1 << 1)
+#define AF9013_GPIO_O  (1 << 2)
+#define AF9013_GPIO_I  (1 << 3)
+
+#define AF9013_GPIO_LO (AF9013_GPIO_ON|AF9013_GPIO_EN)
+#define AF9013_GPIO_HI (AF9013_GPIO_ON|AF9013_GPIO_EN|AF9013_GPIO_O)
+
+#define AF9013_GPIO_TUNER_ON  (AF9013_GPIO_ON|AF9013_GPIO_EN)
+#define AF9013_GPIO_TUNER_OFF (AF9013_GPIO_ON|AF9013_GPIO_EN|AF9013_GPIO_O)
+
+struct af9013_config {
+        /* demodulator's I2C address */
+        u8 demod_address;
+
+        /* frequencies in kHz */
+        u32 adc_clock;
+
+        /* tuner ID */
+        u8 tuner;
+
+        /* tuner IF */
+        u16 tuner_if;
+
+        /* TS data output mode */
+        u8 output_mode:2;
+
+        /* RF spectrum inversion */
+        u8 rf_spec_inv:1;
+
+        /* API version */
+        u8 api_version[4];
+
+        /* GPIOs */
+        u8 gpio[4];
+};
+
+
+#if defined(CONFIG_DVB_AF9013) || \
+        (defined(CONFIG_DVB_AF9013_MODULE) && defined(MODULE))
+extern struct dvb_frontend *af9013_attach(const struct af9013_config *config,
+        struct i2c_adapter *i2c);
+#else
+static inline struct dvb_frontend *af9013_attach(
+const struct af9013_config *config, struct i2c_adapter *i2c)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return NULL;
+}
+#endif /* CONFIG_DVB_AF9013 */
+
+#endif /* _AF9013_H_ */
diff --git a/drivers/media/dvb/frontends/af9013_priv.h b/drivers/media/dvb/frontends/af9013_priv.h
new file mode 100644
index 000000000000..163e251d0b73
--- /dev/null
+++ b/drivers/media/dvb/frontends/af9013_priv.h
@@ -0,0 +1,869 @@
+/*
+ * DVB USB Linux driver for Afatech AF9015 DVB-T USB2.0 receiver
+ *
+ * Copyright (C) 2007 Antti Palosaari <crope@iki.fi>
+ *
+ * Thanks to Afatech who kindly provided information.
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef _AF9013_PRIV_
+#define _AF9013_PRIV_
+
+#define LOG_PREFIX "af9013"
+extern int af9013_debug;
+
+#define dprintk(var, level, args...) \
+            do { if ((var & level)) printk(args); } while (0)
+
+#define debug_dump(b, l, func) {\
+        int loop_; \
+        for (loop_ = 0; loop_ < l; loop_++) \
+                func("%02x ", b[loop_]); \
+        func("\n");\
+}
+
+#define deb_info(args...) dprintk(af9013_debug, 0x01, args)
+
+#undef err
+#define err(f, arg...)  printk(KERN_ERR     LOG_PREFIX": " f "\n" , ## arg)
+#undef info
+#define info(f, arg...) printk(KERN_INFO    LOG_PREFIX": " f "\n" , ## arg)
+#undef warn
+#define warn(f, arg...) printk(KERN_WARNING LOG_PREFIX": " f "\n" , ## arg)
+
+#define AF9013_DEFAULT_FIRMWARE     "dvb-fe-af9013.fw"
+
+struct regdesc {
+        u16 addr;
+        u8  pos:4;
+        u8  len:4;
+        u8  val;
+};
+
+struct snr_table {
+        u32 val;
+        u8 snr;
+};
+
+/* QPSK SNR lookup table */
+static struct snr_table qpsk_snr_table[] = {
+        { 0x0b4771,  0 },
+        { 0x0c1aed,  1 },
+        { 0x0d0d27,  2 },
+        { 0x0e4d19,  3 },
+        { 0x0e5da8,  4 },
+        { 0x107097,  5 },
+        { 0x116975,  6 },
+        { 0x1252d9,  7 },
+        { 0x131fa4,  8 },
+        { 0x13d5e1,  9 },
+        { 0x148e53, 10 },
+        { 0x15358b, 11 },
+        { 0x15dd29, 12 },
+        { 0x168112, 13 },
+        { 0x170b61, 14 },
+        { 0xffffff, 15 },
+};
+
+/* QAM16 SNR lookup table */
+static struct snr_table qam16_snr_table[] = {
+        { 0x05eb62,  5 },
+        { 0x05fecf,  6 },
+        { 0x060b80,  7 },
+        { 0x062501,  8 },
+        { 0x064865,  9 },
+        { 0x069604, 10 },
+        { 0x06f356, 11 },
+        { 0x07706a, 12 },
+        { 0x0804d3, 13 },
+        { 0x089d1a, 14 },
+        { 0x093e3d, 15 },
+        { 0x09e35d, 16 },
+        { 0x0a7c3c, 17 },
+        { 0x0afaf8, 18 },
+        { 0x0b719d, 19 },
+        { 0xffffff, 20 },
+};
+
+/* QAM64 SNR lookup table */
+static struct snr_table qam64_snr_table[] = {
+        { 0x03109b, 12 },
+        { 0x0310d4, 13 },
+        { 0x031920, 14 },
+        { 0x0322d0, 15 },
+        { 0x0339fc, 16 },
+        { 0x0364a1, 17 },
+        { 0x038bcc, 18 },
+        { 0x03c7d3, 19 },
+        { 0x0408cc, 20 },
+        { 0x043bed, 21 },
+        { 0x048061, 22 },
+        { 0x04be95, 23 },
+        { 0x04fa7d, 24 },
+        { 0x052405, 25 },
+        { 0x05570d, 26 },
+        { 0xffffff, 27 },
+};
+
+static struct regdesc ofsm_init[] = {
+        { 0xd73a, 0, 8, 0xa1 },
+        { 0xd73b, 0, 8, 0x1f },
+        { 0xd73c, 4, 4, 0x0a },
+        { 0xd732, 3, 1, 0x00 },
+        { 0xd731, 4, 2, 0x03 },
+        { 0xd73d, 7, 1, 0x01 },
+        { 0xd740, 0, 1, 0x00 },
+        { 0xd740, 1, 1, 0x00 },
+        { 0xd740, 2, 1, 0x00 },
+        { 0xd740, 3, 1, 0x01 },
+        { 0xd3c1, 4, 1, 0x01 },
+        { 0xd3a2, 0, 8, 0x00 },
+        { 0xd3a3, 0, 8, 0x04 },
+        { 0xd305, 0, 8, 0x32 },
+        { 0xd306, 0, 8, 0x10 },
+        { 0xd304, 0, 8, 0x04 },
+        { 0x9112, 0, 1, 0x01 },
+        { 0x911d, 0, 1, 0x01 },
+        { 0x911a, 0, 1, 0x01 },
+        { 0x911b, 0, 1, 0x01 },
+        { 0x9bce, 0, 4, 0x02 },
+        { 0x9116, 0, 1, 0x01 },
+        { 0x9bd1, 0, 1, 0x01 },
+        { 0xd2e0, 0, 8, 0xd0 },
+        { 0xd2e9, 0, 4, 0x0d },
+        { 0xd38c, 0, 8, 0xfc },
+        { 0xd38d, 0, 8, 0x00 },
+        { 0xd38e, 0, 8, 0x7e },
+        { 0xd38f, 0, 8, 0x00 },
+        { 0xd390, 0, 8, 0x2f },
+        { 0xd145, 4, 1, 0x01 },
+        { 0xd1a9, 4, 1, 0x01 },
+        { 0xd158, 5, 3, 0x01 },
+        { 0xd159, 0, 6, 0x06 },
+        { 0xd167, 0, 8, 0x00 },
+        { 0xd168, 0, 4, 0x07 },
+        { 0xd1c3, 5, 3, 0x00 },
+        { 0xd1c4, 0, 6, 0x00 },
+        { 0xd1c5, 0, 7, 0x10 },
+        { 0xd1c6, 0, 3, 0x02 },
+        { 0xd080, 2, 5, 0x03 },
+        { 0xd081, 4, 4, 0x09 },
+        { 0xd098, 4, 4, 0x0f },
+        { 0xd098, 0, 4, 0x03 },
+        { 0xdbc0, 3, 1, 0x01 },
+        { 0xdbc0, 4, 1, 0x01 },
+        { 0xdbc7, 0, 8, 0x08 },
+        { 0xdbc8, 4, 4, 0x00 },
+        { 0xdbc9, 0, 5, 0x01 },
+        { 0xd280, 0, 8, 0xe0 },
+        { 0xd281, 0, 8, 0xff },
+        { 0xd282, 0, 8, 0xff },
+        { 0xd283, 0, 8, 0xc3 },
+        { 0xd284, 0, 8, 0xff },
+        { 0xd285, 0, 4, 0x01 },
+        { 0xd0f0, 0, 7, 0x1a },
+        { 0xd0f1, 4, 1, 0x01 },
+        { 0xd0f2, 0, 8, 0x0c },
+        { 0xd103, 0, 4, 0x08 },
+        { 0xd0f8, 0, 7, 0x20 },
+        { 0xd111, 5, 1, 0x00 },
+        { 0xd111, 6, 1, 0x00 },
+        { 0x910b, 0, 8, 0x0a },
+        { 0x9115, 0, 8, 0x02 },
+        { 0x910c, 0, 8, 0x02 },
+        { 0x910d, 0, 8, 0x08 },
+        { 0x910e, 0, 8, 0x0a },
+        { 0x9bf6, 0, 8, 0x06 },
+        { 0x9bf8, 0, 8, 0x02 },
+        { 0x9bf7, 0, 8, 0x05 },
+        { 0x9bf9, 0, 8, 0x0f },
+        { 0x9bfc, 0, 8, 0x13 },
+        { 0x9bd3, 0, 8, 0xff },
+        { 0x9bbe, 0, 1, 0x01 },
+        { 0x9bcc, 0, 1, 0x01 },
+};
+
+/* Panasonic ENV77H11D5 tuner init
+   AF9013_TUNER_ENV77H11D5 = 129 */
+static struct regdesc tuner_init_env77h11d5[] = {
+        { 0x9bd5, 0, 8, 0x01 },
+        { 0x9bd6, 0, 8, 0x03 },
+        { 0x9bbe, 0, 8, 0x01 },
+        { 0xd1a0, 1, 1, 0x01 },
+        { 0xd000, 0, 1, 0x01 },
+        { 0xd000, 1, 1, 0x00 },
+        { 0xd001, 1, 1, 0x01 },
+        { 0xd001, 0, 1, 0x00 },
+        { 0xd001, 5, 1, 0x00 },
+        { 0xd002, 0, 5, 0x19 },
+        { 0xd003, 0, 5, 0x1a },
+        { 0xd004, 0, 5, 0x19 },
+        { 0xd005, 0, 5, 0x1a },
+        { 0xd00e, 0, 5, 0x10 },
+        { 0xd00f, 0, 3, 0x04 },
+        { 0xd00f, 3, 3, 0x05 },
+        { 0xd010, 0, 3, 0x04 },
+        { 0xd010, 3, 3, 0x05 },
+        { 0xd016, 4, 4, 0x03 },
+        { 0xd01f, 0, 6, 0x0a },
+        { 0xd020, 0, 6, 0x0a },
+        { 0x9bda, 0, 8, 0x00 },
+        { 0x9be3, 0, 8, 0x00 },
+        { 0xd015, 0, 8, 0x50 },
+        { 0xd016, 0, 1, 0x00 },
+        { 0xd044, 0, 8, 0x46 },
+        { 0xd045, 0, 1, 0x00 },
+        { 0xd008, 0, 8, 0xdf },
+        { 0xd009, 0, 2, 0x02 },
+        { 0xd006, 0, 8, 0x44 },
+        { 0xd007, 0, 2, 0x01 },
+        { 0xd00c, 0, 8, 0xeb },
+        { 0xd00d, 0, 2, 0x02 },
+        { 0xd00a, 0, 8, 0xf4 },
+        { 0xd00b, 0, 2, 0x01 },
+        { 0x9bba, 0, 8, 0xf9 },
+        { 0x9bc3, 0, 8, 0xdf },
+        { 0x9bc4, 0, 8, 0x02 },
+        { 0x9bc5, 0, 8, 0xeb },
+        { 0x9bc6, 0, 8, 0x02 },
+        { 0x9bc9, 0, 8, 0x52 },
+        { 0xd011, 0, 8, 0x3c },
+        { 0xd012, 0, 2, 0x01 },
+        { 0xd013, 0, 8, 0xf7 },
+        { 0xd014, 0, 2, 0x02 },
+        { 0xd040, 0, 8, 0x0b },
+        { 0xd041, 0, 2, 0x02 },
+        { 0xd042, 0, 8, 0x4d },
+        { 0xd043, 0, 2, 0x00 },
+        { 0xd045, 1, 1, 0x00 },
+        { 0x9bcf, 0, 1, 0x01 },
+        { 0xd045, 2, 1, 0x01 },
+        { 0xd04f, 0, 8, 0x9a },
+        { 0xd050, 0, 1, 0x01 },
+        { 0xd051, 0, 8, 0x5a },
+        { 0xd052, 0, 1, 0x01 },
+        { 0xd053, 0, 8, 0x50 },
+        { 0xd054, 0, 8, 0x46 },
+        { 0x9bd7, 0, 8, 0x0a },
+        { 0x9bd8, 0, 8, 0x14 },
+        { 0x9bd9, 0, 8, 0x08 },
+};
+
+/* Microtune MT2060 tuner init
+   AF9013_TUNER_MT2060     = 130 */
+static struct regdesc tuner_init_mt2060[] = {
+        { 0x9bd5, 0, 8, 0x01 },
+        { 0x9bd6, 0, 8, 0x07 },
+        { 0xd1a0, 1, 1, 0x01 },
+        { 0xd000, 0, 1, 0x01 },
+        { 0xd000, 1, 1, 0x00 },
+        { 0xd001, 1, 1, 0x01 },
+        { 0xd001, 0, 1, 0x00 },
+        { 0xd001, 5, 1, 0x00 },
+        { 0xd002, 0, 5, 0x19 },
+        { 0xd003, 0, 5, 0x1a },
+        { 0xd004, 0, 5, 0x19 },
+        { 0xd005, 0, 5, 0x1a },
+        { 0xd00e, 0, 5, 0x10 },
+        { 0xd00f, 0, 3, 0x04 },
+        { 0xd00f, 3, 3, 0x05 },
+        { 0xd010, 0, 3, 0x04 },
+        { 0xd010, 3, 3, 0x05 },
+        { 0xd016, 4, 4, 0x03 },
+        { 0xd01f, 0, 6, 0x0a },
+        { 0xd020, 0, 6, 0x0a },
+        { 0x9bda, 0, 8, 0x00 },
+        { 0x9be3, 0, 8, 0x00 },
+        { 0x9bbe, 0, 1, 0x00 },
+        { 0x9bcc, 0, 1, 0x00 },
+        { 0x9bb9, 0, 8, 0x75 },
+        { 0x9bcd, 0, 8, 0x24 },
+        { 0x9bff, 0, 8, 0x30 },
+        { 0xd015, 0, 8, 0x46 },
+        { 0xd016, 0, 1, 0x00 },
+        { 0xd044, 0, 8, 0x46 },
+        { 0xd045, 0, 1, 0x00 },
+        { 0xd008, 0, 8, 0x0f },
+        { 0xd009, 0, 2, 0x02 },
+        { 0xd006, 0, 8, 0x32 },
+        { 0xd007, 0, 2, 0x01 },
+        { 0xd00c, 0, 8, 0x36 },
+        { 0xd00d, 0, 2, 0x03 },
+        { 0xd00a, 0, 8, 0x35 },
+        { 0xd00b, 0, 2, 0x01 },
+        { 0x9bc7, 0, 8, 0x07 },
+        { 0x9bc8, 0, 8, 0x90 },
+        { 0x9bc3, 0, 8, 0x0f },
+        { 0x9bc4, 0, 8, 0x02 },
+        { 0x9bc5, 0, 8, 0x36 },
+        { 0x9bc6, 0, 8, 0x03 },
+        { 0x9bba, 0, 8, 0xc9 },
+        { 0x9bc9, 0, 8, 0x79 },
+        { 0xd011, 0, 8, 0x10 },
+        { 0xd012, 0, 2, 0x01 },
+        { 0xd013, 0, 8, 0x45 },
+        { 0xd014, 0, 2, 0x03 },
+        { 0xd040, 0, 8, 0x98 },
+        { 0xd041, 0, 2, 0x00 },
+        { 0xd042, 0, 8, 0xcf },
+        { 0xd043, 0, 2, 0x03 },
+        { 0xd045, 1, 1, 0x00 },
+        { 0x9bcf, 0, 1, 0x01 },
+        { 0xd045, 2, 1, 0x01 },
+        { 0xd04f, 0, 8, 0x9a },
+        { 0xd050, 0, 1, 0x01 },
+        { 0xd051, 0, 8, 0x5a },
+        { 0xd052, 0, 1, 0x01 },
+        { 0xd053, 0, 8, 0x50 },
+        { 0xd054, 0, 8, 0x46 },
+        { 0x9bd7, 0, 8, 0x0a },
+        { 0x9bd8, 0, 8, 0x14 },
+        { 0x9bd9, 0, 8, 0x08 },
+        { 0x9bd0, 0, 8, 0xcc },
+        { 0x9be4, 0, 8, 0xa0 },
+        { 0x9bbd, 0, 8, 0x8e },
+        { 0x9be2, 0, 8, 0x4d },
+        { 0x9bee, 0, 1, 0x01 },
+};
+
+/* Microtune MT2060 tuner init
+   AF9013_TUNER_MT2060_2   = 147 */
+static struct regdesc tuner_init_mt2060_2[] = {
+        { 0x9bd5, 0, 8, 0x01 },
+        { 0x9bd6, 0, 8, 0x06 },
+        { 0x9bbe, 0, 8, 0x01 },
+        { 0xd1a0, 1, 1, 0x01 },
+        { 0xd000, 0, 1, 0x01 },
+        { 0xd000, 1, 1, 0x00 },
+        { 0xd001, 1, 1, 0x01 },
+        { 0xd001, 0, 1, 0x00 },
+        { 0xd001, 5, 1, 0x00 },
+        { 0xd002, 0, 5, 0x19 },
+        { 0xd003, 0, 5, 0x1a },
+        { 0xd004, 0, 5, 0x19 },
+        { 0xd005, 0, 5, 0x1a },
+        { 0xd00e, 0, 5, 0x10 },
+        { 0xd00f, 0, 3, 0x04 },
+        { 0xd00f, 3, 3, 0x05 },
+        { 0xd010, 0, 3, 0x04 },
+        { 0xd010, 3, 3, 0x05 },
+        { 0xd016, 4, 4, 0x03 },
+        { 0xd01f, 0, 6, 0x0a },
+        { 0xd020, 0, 6, 0x0a },
+        { 0xd015, 0, 8, 0x46 },
+        { 0xd016, 0, 1, 0x00 },
+        { 0xd044, 0, 8, 0x46 },
+        { 0xd045, 0, 1, 0x00 },
+        { 0xd008, 0, 8, 0x0f },
+        { 0xd009, 0, 2, 0x02 },
+        { 0xd006, 0, 8, 0x32 },
+        { 0xd007, 0, 2, 0x01 },
+        { 0xd00c, 0, 8, 0x36 },
+        { 0xd00d, 0, 2, 0x03 },
+        { 0xd00a, 0, 8, 0x35 },
+        { 0xd00b, 0, 2, 0x01 },
+        { 0x9bc7, 0, 8, 0x07 },
+        { 0x9bc8, 0, 8, 0x90 },
+        { 0x9bc3, 0, 8, 0x0f },
+        { 0x9bc4, 0, 8, 0x02 },
+        { 0x9bc5, 0, 8, 0x36 },
+        { 0x9bc6, 0, 8, 0x03 },
+        { 0x9bba, 0, 8, 0xc9 },
+        { 0x9bc9, 0, 8, 0x79 },
+        { 0xd011, 0, 8, 0x10 },
+        { 0xd012, 0, 2, 0x01 },
+        { 0xd013, 0, 8, 0x45 },
+        { 0xd014, 0, 2, 0x03 },
+        { 0xd040, 0, 8, 0x98 },
+        { 0xd041, 0, 2, 0x00 },
+        { 0xd042, 0, 8, 0xcf },
+        { 0xd043, 0, 2, 0x03 },
+        { 0xd045, 1, 1, 0x00 },
+        { 0x9bcf, 0, 8, 0x01 },
+        { 0xd045, 2, 1, 0x01 },
+        { 0xd04f, 0, 8, 0x9a },
+        { 0xd050, 0, 1, 0x01 },
+        { 0xd051, 0, 8, 0x5a },
+        { 0xd052, 0, 1, 0x01 },
+        { 0xd053, 0, 8, 0x96 },
+        { 0xd054, 0, 8, 0x46 },
+        { 0xd045, 7, 1, 0x00 },
+        { 0x9bd7, 0, 8, 0x0a },
+        { 0x9bd8, 0, 8, 0x14 },
+        { 0x9bd9, 0, 8, 0x08 },
+};
+
+/* MaxLinear MXL5003 tuner init
+   AF9013_TUNER_MXL5003D   =   3 */
+static struct regdesc tuner_init_mxl5003d[] = {
+        { 0x9bd5, 0, 8, 0x01 },
+        { 0x9bd6, 0, 8, 0x09 },
+        { 0xd1a0, 1, 1, 0x01 },
+        { 0xd000, 0, 1, 0x01 },
+        { 0xd000, 1, 1, 0x00 },
+        { 0xd001, 1, 1, 0x01 },
+        { 0xd001, 0, 1, 0x00 },
+        { 0xd001, 5, 1, 0x00 },
+        { 0xd002, 0, 5, 0x19 },
+        { 0xd003, 0, 5, 0x1a },
+        { 0xd004, 0, 5, 0x19 },
+        { 0xd005, 0, 5, 0x1a },
+        { 0xd00e, 0, 5, 0x10 },
+        { 0xd00f, 0, 3, 0x04 },
+        { 0xd00f, 3, 3, 0x05 },
+        { 0xd010, 0, 3, 0x04 },
+        { 0xd010, 3, 3, 0x05 },
+        { 0xd016, 4, 4, 0x03 },
+        { 0xd01f, 0, 6, 0x0a },
+        { 0xd020, 0, 6, 0x0a },
+        { 0x9bda, 0, 8, 0x00 },
+        { 0x9be3, 0, 8, 0x00 },
+        { 0x9bfc, 0, 8, 0x0f },
+        { 0x9bf6, 0, 8, 0x01 },
+        { 0x9bbe, 0, 1, 0x01 },
+        { 0xd015, 0, 8, 0x33 },
+        { 0xd016, 0, 1, 0x00 },
+        { 0xd044, 0, 8, 0x40 },
+        { 0xd045, 0, 1, 0x00 },
+        { 0xd008, 0, 8, 0x0f },
+        { 0xd009, 0, 2, 0x02 },
+        { 0xd006, 0, 8, 0x6c },
+        { 0xd007, 0, 2, 0x00 },
+        { 0xd00c, 0, 8, 0x3d },
+        { 0xd00d, 0, 2, 0x00 },
+        { 0xd00a, 0, 8, 0x45 },
+        { 0xd00b, 0, 2, 0x01 },
+        { 0x9bc7, 0, 8, 0x07 },
+        { 0x9bc8, 0, 8, 0x52 },
+        { 0x9bc3, 0, 8, 0x0f },
+        { 0x9bc4, 0, 8, 0x02 },
+        { 0x9bc5, 0, 8, 0x3d },
+        { 0x9bc6, 0, 8, 0x00 },
+        { 0x9bba, 0, 8, 0xa2 },
+        { 0x9bc9, 0, 8, 0xa0 },
+        { 0xd011, 0, 8, 0x56 },
+        { 0xd012, 0, 2, 0x00 },
+        { 0xd013, 0, 8, 0x50 },
+        { 0xd014, 0, 2, 0x00 },
+        { 0xd040, 0, 8, 0x56 },
+        { 0xd041, 0, 2, 0x00 },
+        { 0xd042, 0, 8, 0x50 },
+        { 0xd043, 0, 2, 0x00 },
+        { 0xd045, 1, 1, 0x00 },
+        { 0x9bcf, 0, 8, 0x01 },
+        { 0xd045, 2, 1, 0x01 },
+        { 0xd04f, 0, 8, 0x9a },
+        { 0xd050, 0, 1, 0x01 },
+        { 0xd051, 0, 8, 0x5a },
+        { 0xd052, 0, 1, 0x01 },
+        { 0xd053, 0, 8, 0x50 },
+        { 0xd054, 0, 8, 0x46 },
+        { 0x9bd7, 0, 8, 0x0a },
+        { 0x9bd8, 0, 8, 0x14 },
+        { 0x9bd9, 0, 8, 0x08 },
+};
+
+/* MaxLinear MXL5005 tuner init
+   AF9013_TUNER_MXL5005D   =  13
+   AF9013_TUNER_MXL5005R   =  30 */
+static struct regdesc tuner_init_mxl5005[] = {
+        { 0x9bd5, 0, 8, 0x01 },
+        { 0x9bd6, 0, 8, 0x07 },
+        { 0xd1a0, 1, 1, 0x01 },
+        { 0xd000, 0, 1, 0x01 },
+        { 0xd000, 1, 1, 0x00 },
+        { 0xd001, 1, 1, 0x01 },
+        { 0xd001, 0, 1, 0x00 },
+        { 0xd001, 5, 1, 0x00 },
+        { 0xd002, 0, 5, 0x19 },
+        { 0xd003, 0, 5, 0x1a },
+        { 0xd004, 0, 5, 0x19 },
+        { 0xd005, 0, 5, 0x1a },
+        { 0xd00e, 0, 5, 0x10 },
+        { 0xd00f, 0, 3, 0x04 },
+        { 0xd00f, 3, 3, 0x05 },
+        { 0xd010, 0, 3, 0x04 },
+        { 0xd010, 3, 3, 0x05 },
+        { 0xd016, 4, 4, 0x03 },
+        { 0xd01f, 0, 6, 0x0a },
+        { 0xd020, 0, 6, 0x0a },
+        { 0x9bda, 0, 8, 0x01 },
+        { 0x9be3, 0, 8, 0x01 },
+        { 0x9bbe, 0, 1, 0x01 },
+        { 0x9bcc, 0, 1, 0x01 },
+        { 0x9bb9, 0, 8, 0x00 },
+        { 0x9bcd, 0, 8, 0x28 },
+        { 0x9bff, 0, 8, 0x24 },
+        { 0xd015, 0, 8, 0x40 },
+        { 0xd016, 0, 1, 0x00 },
+        { 0xd044, 0, 8, 0x40 },
+        { 0xd045, 0, 1, 0x00 },
+        { 0xd008, 0, 8, 0x0f },
+        { 0xd009, 0, 2, 0x02 },
+        { 0xd006, 0, 8, 0x73 },
+        { 0xd007, 0, 2, 0x01 },
+        { 0xd00c, 0, 8, 0xfa },
+        { 0xd00d, 0, 2, 0x01 },
+        { 0xd00a, 0, 8, 0xff },
+        { 0xd00b, 0, 2, 0x01 },
+        { 0x9bc7, 0, 8, 0x23 },
+        { 0x9bc8, 0, 8, 0x55 },
+        { 0x9bc3, 0, 8, 0x01 },
+        { 0x9bc4, 0, 8, 0x02 },
+        { 0x9bc5, 0, 8, 0xfa },
+        { 0x9bc6, 0, 8, 0x01 },
+        { 0x9bba, 0, 8, 0xff },
+        { 0x9bc9, 0, 8, 0xff },
+        { 0x9bd3, 0, 8, 0x95 },
+        { 0xd011, 0, 8, 0x70 },
+        { 0xd012, 0, 2, 0x01 },
+        { 0xd013, 0, 8, 0xfb },
+        { 0xd014, 0, 2, 0x01 },
+        { 0xd040, 0, 8, 0x70 },
+        { 0xd041, 0, 2, 0x01 },
+        { 0xd042, 0, 8, 0xfb },
+        { 0xd043, 0, 2, 0x01 },
+        { 0xd045, 1, 1, 0x00 },
+        { 0x9bcf, 0, 1, 0x01 },
+        { 0xd045, 2, 1, 0x01 },
+        { 0xd04f, 0, 8, 0x9a },
+        { 0xd050, 0, 1, 0x01 },
+        { 0xd051, 0, 8, 0x5a },
+        { 0xd052, 0, 1, 0x01 },
+        { 0xd053, 0, 8, 0x50 },
+        { 0xd054, 0, 8, 0x46 },
+        { 0x9bd7, 0, 8, 0x0a },
+        { 0x9bd8, 0, 8, 0x14 },
+        { 0x9bd9, 0, 8, 0x08 },
+        { 0x9bd0, 0, 8, 0x93 },
+        { 0x9be4, 0, 8, 0xfe },
+        { 0x9bbd, 0, 8, 0x63 },
+        { 0x9be2, 0, 8, 0xfe },
+        { 0x9bee, 0, 1, 0x01 },
+};
+
+/* Quantek QT1010 tuner init
+   AF9013_TUNER_QT1010     = 134
+   AF9013_TUNER_QT1010A    = 162 */
+static struct regdesc tuner_init_qt1010[] = {
+        { 0x9bd5, 0, 8, 0x01 },
+        { 0x9bd6, 0, 8, 0x09 },
+        { 0xd1a0, 1, 1, 0x01 },
+        { 0xd000, 0, 1, 0x01 },
+        { 0xd000, 1, 1, 0x00 },
+        { 0xd001, 1, 1, 0x01 },
+        { 0xd001, 0, 1, 0x00 },
+        { 0xd001, 5, 1, 0x00 },
+        { 0xd002, 0, 5, 0x19 },
+        { 0xd003, 0, 5, 0x1a },
+        { 0xd004, 0, 5, 0x19 },
+        { 0xd005, 0, 5, 0x1a },
+        { 0xd00e, 0, 5, 0x10 },
+        { 0xd00f, 0, 3, 0x04 },
+        { 0xd00f, 3, 3, 0x05 },
+        { 0xd010, 0, 3, 0x04 },
+        { 0xd010, 3, 3, 0x05 },
+        { 0xd016, 4, 4, 0x03 },
+        { 0xd01f, 0, 6, 0x0a },
+        { 0xd020, 0, 6, 0x0a },
+        { 0x9bda, 0, 8, 0x01 },
+        { 0x9be3, 0, 8, 0x01 },
+        { 0xd015, 0, 8, 0x46 },
+        { 0xd016, 0, 1, 0x00 },
+        { 0xd044, 0, 8, 0x46 },
+        { 0xd045, 0, 1, 0x00 },
+        { 0x9bbe, 0, 1, 0x01 },
+        { 0x9bcc, 0, 1, 0x01 },
+        { 0x9bb9, 0, 8, 0x00 },
+        { 0x9bcd, 0, 8, 0x28 },
+        { 0x9bff, 0, 8, 0x20 },
+        { 0xd008, 0, 8, 0x0f },
+        { 0xd009, 0, 2, 0x02 },
+        { 0xd006, 0, 8, 0x99 },
+        { 0xd007, 0, 2, 0x01 },
+        { 0xd00c, 0, 8, 0x0f },
+        { 0xd00d, 0, 2, 0x02 },
+        { 0xd00a, 0, 8, 0x50 },
+        { 0xd00b, 0, 2, 0x01 },
+        { 0x9bc7, 0, 8, 0x00 },
+        { 0x9bc8, 0, 8, 0x00 },
+        { 0x9bc3, 0, 8, 0x0f },
+        { 0x9bc4, 0, 8, 0x02 },
+        { 0x9bc5, 0, 8, 0x0f },
+        { 0x9bc6, 0, 8, 0x02 },
+        { 0x9bba, 0, 8, 0xc5 },
+        { 0x9bc9, 0, 8, 0xff },
+        { 0xd011, 0, 8, 0x58 },
+        { 0xd012, 0, 2, 0x02 },
+        { 0xd013, 0, 8, 0x89 },
+        { 0xd014, 0, 2, 0x01 },
+        { 0xd040, 0, 8, 0x58 },
+        { 0xd041, 0, 2, 0x02 },
+        { 0xd042, 0, 8, 0x89 },
+        { 0xd043, 0, 2, 0x01 },
+        { 0xd045, 1, 1, 0x00 },
+        { 0x9bcf, 0, 1, 0x01 },
+        { 0xd045, 2, 1, 0x01 },
+        { 0xd04f, 0, 8, 0x9a },
+        { 0xd050, 0, 1, 0x01 },
+        { 0xd051, 0, 8, 0x5a },
+        { 0xd052, 0, 1, 0x01 },
+        { 0xd053, 0, 8, 0x50 },
+        { 0xd054, 0, 8, 0x46 },
+        { 0x9bd7, 0, 8, 0x0a },
+        { 0x9bd8, 0, 8, 0x14 },
+        { 0x9bd9, 0, 8, 0x08 },
+        { 0x9bd0, 0, 8, 0xcd },
+        { 0x9be4, 0, 8, 0xbb },
+        { 0x9bbd, 0, 8, 0x93 },
+        { 0x9be2, 0, 8, 0x80 },
+        { 0x9bee, 0, 1, 0x01 },
+};
+
+/* Freescale MC44S803 tuner init
+   AF9013_TUNER_MC44S803   = 133 */
+static struct regdesc tuner_init_mc44s803[] = {
+        { 0x9bd5, 0, 8, 0x01 },
+        { 0x9bd6, 0, 8, 0x06 },
+        { 0xd1a0, 1, 1, 0x01 },
+        { 0xd000, 0, 1, 0x01 },
+        { 0xd000, 1, 1, 0x00 },
+        { 0xd001, 1, 1, 0x01 },
+        { 0xd001, 0, 1, 0x00 },
+        { 0xd001, 5, 1, 0x00 },
+        { 0xd002, 0, 5, 0x19 },
+        { 0xd003, 0, 5, 0x1a },
+        { 0xd004, 0, 5, 0x19 },
+        { 0xd005, 0, 5, 0x1a },
+        { 0xd00e, 0, 5, 0x10 },
+        { 0xd00f, 0, 3, 0x04 },
+        { 0xd00f, 3, 3, 0x05 },
+        { 0xd010, 0, 3, 0x04 },
+        { 0xd010, 3, 3, 0x05 },
+        { 0xd016, 4, 4, 0x03 },
+        { 0xd01f, 0, 6, 0x0a },
+        { 0xd020, 0, 6, 0x0a },
+        { 0x9bda, 0, 8, 0x00 },
+        { 0x9be3, 0, 8, 0x00 },
+        { 0x9bf6, 0, 8, 0x01 },
+        { 0x9bf8, 0, 8, 0x02 },
+        { 0x9bf9, 0, 8, 0x02 },
+        { 0x9bfc, 0, 8, 0x1f },
+        { 0x9bbe, 0, 1, 0x01 },
+        { 0x9bcc, 0, 1, 0x01 },
+        { 0x9bb9, 0, 8, 0x00 },
+        { 0x9bcd, 0, 8, 0x24 },
+        { 0x9bff, 0, 8, 0x24 },
+        { 0xd015, 0, 8, 0x46 },
+        { 0xd016, 0, 1, 0x00 },
+        { 0xd044, 0, 8, 0x46 },
+        { 0xd045, 0, 1, 0x00 },
+        { 0xd008, 0, 8, 0x01 },
+        { 0xd009, 0, 2, 0x02 },
+        { 0xd006, 0, 8, 0x7b },
+        { 0xd007, 0, 2, 0x00 },
+        { 0xd00c, 0, 8, 0x7c },
+        { 0xd00d, 0, 2, 0x02 },
+        { 0xd00a, 0, 8, 0xfe },
+        { 0xd00b, 0, 2, 0x01 },
+        { 0x9bc7, 0, 8, 0x08 },
+        { 0x9bc8, 0, 8, 0x9a },
+        { 0x9bc3, 0, 8, 0x01 },
+        { 0x9bc4, 0, 8, 0x02 },
+        { 0x9bc5, 0, 8, 0x7c },
+        { 0x9bc6, 0, 8, 0x02 },
+        { 0x9bba, 0, 8, 0xfc },
+        { 0x9bc9, 0, 8, 0xaa },
+        { 0xd011, 0, 8, 0x6b },
+        { 0xd012, 0, 2, 0x00 },
+        { 0xd013, 0, 8, 0x88 },
+        { 0xd014, 0, 2, 0x02 },
+        { 0xd040, 0, 8, 0x6b },
+        { 0xd041, 0, 2, 0x00 },
+        { 0xd042, 0, 8, 0x7c },
+        { 0xd043, 0, 2, 0x02 },
+        { 0xd045, 1, 1, 0x00 },
+        { 0x9bcf, 0, 1, 0x01 },
+        { 0xd045, 2, 1, 0x01 },
+        { 0xd04f, 0, 8, 0x9a },
+        { 0xd050, 0, 1, 0x01 },
+        { 0xd051, 0, 8, 0x5a },
+        { 0xd052, 0, 1, 0x01 },
+        { 0xd053, 0, 8, 0x50 },
+        { 0xd054, 0, 8, 0x46 },
+        { 0x9bd7, 0, 8, 0x0a },
+        { 0x9bd8, 0, 8, 0x14 },
+        { 0x9bd9, 0, 8, 0x08 },
+        { 0x9bd0, 0, 8, 0x9e },
+        { 0x9be4, 0, 8, 0xff },
+        { 0x9bbd, 0, 8, 0x9e },
+        { 0x9be2, 0, 8, 0x25 },
+        { 0x9bee, 0, 1, 0x01 },
+        { 0xd73b, 3, 1, 0x00 },
+};
+
+/* unknown, probably for tin can tuner, tuner init
+   AF9013_TUNER_UNKNOWN   = 140 */
+static struct regdesc tuner_init_unknown[] = {
+        { 0x9bd5, 0, 8, 0x01 },
+        { 0x9bd6, 0, 8, 0x02 },
+        { 0xd1a0, 1, 1, 0x01 },
+        { 0xd000, 0, 1, 0x01 },
+        { 0xd000, 1, 1, 0x00 },
+        { 0xd001, 1, 1, 0x01 },
+        { 0xd001, 0, 1, 0x00 },
+        { 0xd001, 5, 1, 0x00 },
+        { 0xd002, 0, 5, 0x19 },
+        { 0xd003, 0, 5, 0x1a },
+        { 0xd004, 0, 5, 0x19 },
+        { 0xd005, 0, 5, 0x1a },
+        { 0xd00e, 0, 5, 0x10 },
+        { 0xd00f, 0, 3, 0x04 },
+        { 0xd00f, 3, 3, 0x05 },
+        { 0xd010, 0, 3, 0x04 },
+        { 0xd010, 3, 3, 0x05 },
+        { 0xd016, 4, 4, 0x03 },
+        { 0xd01f, 0, 6, 0x0a },
+        { 0xd020, 0, 6, 0x0a },
+        { 0x9bda, 0, 8, 0x01 },
+        { 0x9be3, 0, 8, 0x01 },
+        { 0xd1a0, 1, 1, 0x00 },
+        { 0x9bbe, 0, 1, 0x01 },
+        { 0x9bcc, 0, 1, 0x01 },
+        { 0x9bb9, 0, 8, 0x00 },
+        { 0x9bcd, 0, 8, 0x18 },
+        { 0x9bff, 0, 8, 0x2c },
+        { 0xd015, 0, 8, 0x46 },
+        { 0xd016, 0, 1, 0x00 },
+        { 0xd044, 0, 8, 0x46 },
+        { 0xd045, 0, 1, 0x00 },
+        { 0xd008, 0, 8, 0xdf },
+        { 0xd009, 0, 2, 0x02 },
+        { 0xd006, 0, 8, 0x44 },
+        { 0xd007, 0, 2, 0x01 },
+        { 0xd00c, 0, 8, 0x00 },
+        { 0xd00d, 0, 2, 0x02 },
+        { 0xd00a, 0, 8, 0xf6 },
+        { 0xd00b, 0, 2, 0x01 },
+        { 0x9bba, 0, 8, 0xf9 },
+        { 0x9bc8, 0, 8, 0xaa },
+        { 0x9bc3, 0, 8, 0xdf },
+        { 0x9bc4, 0, 8, 0x02 },
+        { 0x9bc5, 0, 8, 0x00 },
+        { 0x9bc6, 0, 8, 0x02 },
+        { 0x9bc9, 0, 8, 0xf0 },
+        { 0xd011, 0, 8, 0x3c },
+        { 0xd012, 0, 2, 0x01 },
+        { 0xd013, 0, 8, 0xf7 },
+        { 0xd014, 0, 2, 0x02 },
+        { 0xd040, 0, 8, 0x0b },
+        { 0xd041, 0, 2, 0x02 },
+        { 0xd042, 0, 8, 0x4d },
+        { 0xd043, 0, 2, 0x00 },
+        { 0xd045, 1, 1, 0x00 },
+        { 0x9bcf, 0, 1, 0x01 },
+        { 0xd045, 2, 1, 0x01 },
+        { 0xd04f, 0, 8, 0x9a },
+        { 0xd050, 0, 1, 0x01 },
+        { 0xd051, 0, 8, 0x5a },
+        { 0xd052, 0, 1, 0x01 },
+        { 0xd053, 0, 8, 0x50 },
+        { 0xd054, 0, 8, 0x46 },
+        { 0x9bd7, 0, 8, 0x0a },
+        { 0x9bd8, 0, 8, 0x14 },
+        { 0x9bd9, 0, 8, 0x08 },
+};
+
+/* NXP TDA18271 tuner init
+   AF9013_TUNER_TDA18271   = 156 */
+static struct regdesc tuner_init_tda18271[] = {
+        { 0x9bd5, 0, 8, 0x01 },
+        { 0x9bd6, 0, 8, 0x04 },
+        { 0xd1a0, 1, 1, 0x01 },
+        { 0xd000, 0, 1, 0x01 },
+        { 0xd000, 1, 1, 0x00 },
+        { 0xd001, 1, 1, 0x01 },
+        { 0xd001, 0, 1, 0x00 },
+        { 0xd001, 5, 1, 0x00 },
+        { 0xd002, 0, 5, 0x19 },
+        { 0xd003, 0, 5, 0x1a },
+        { 0xd004, 0, 5, 0x19 },
+        { 0xd005, 0, 5, 0x1a },
+        { 0xd00e, 0, 5, 0x10 },
+        { 0xd00f, 0, 3, 0x04 },
+        { 0xd00f, 3, 3, 0x05 },
+        { 0xd010, 0, 3, 0x04 },
+        { 0xd010, 3, 3, 0x05 },
+        { 0xd016, 4, 4, 0x03 },
+        { 0xd01f, 0, 6, 0x0a },
+        { 0xd020, 0, 6, 0x0a },
+        { 0x9bda, 0, 8, 0x01 },
+        { 0x9be3, 0, 8, 0x01 },
+        { 0xd1a0, 1, 1, 0x00 },
+        { 0x9bbe, 0, 1, 0x01 },
+        { 0x9bcc, 0, 1, 0x01 },
+        { 0x9bb9, 0, 8, 0x00 },
+        { 0x9bcd, 0, 8, 0x18 },
+        { 0x9bff, 0, 8, 0x2c },
+        { 0xd015, 0, 8, 0x46 },
+        { 0xd016, 0, 1, 0x00 },
+        { 0xd044, 0, 8, 0x46 },
+        { 0xd045, 0, 1, 0x00 },
+        { 0xd008, 0, 8, 0xdf },
+        { 0xd009, 0, 2, 0x02 },
+        { 0xd006, 0, 8, 0x44 },
+        { 0xd007, 0, 2, 0x01 },
+        { 0xd00c, 0, 8, 0x00 },
+        { 0xd00d, 0, 2, 0x02 },
+        { 0xd00a, 0, 8, 0xf6 },
+        { 0xd00b, 0, 2, 0x01 },
+        { 0x9bba, 0, 8, 0xf9 },
+        { 0x9bc8, 0, 8, 0xaa },
+        { 0x9bc3, 0, 8, 0xdf },
+        { 0x9bc4, 0, 8, 0x02 },
+        { 0x9bc5, 0, 8, 0x00 },
+        { 0x9bc6, 0, 8, 0x02 },
+        { 0x9bc9, 0, 8, 0xf0 },
+        { 0xd011, 0, 8, 0x3c },
+        { 0xd012, 0, 2, 0x01 },
+        { 0xd013, 0, 8, 0xf7 },
+        { 0xd014, 0, 2, 0x02 },
+        { 0xd040, 0, 8, 0x0b },
+        { 0xd041, 0, 2, 0x02 },
+        { 0xd042, 0, 8, 0x4d },
+        { 0xd043, 0, 2, 0x00 },
+        { 0xd045, 1, 1, 0x00 },
+        { 0x9bcf, 0, 1, 0x01 },
+        { 0xd045, 2, 1, 0x01 },
+        { 0xd04f, 0, 8, 0x9a },
+        { 0xd050, 0, 1, 0x01 },
+        { 0xd051, 0, 8, 0x5a },
+        { 0xd052, 0, 1, 0x01 },
+        { 0xd053, 0, 8, 0x50 },
+        { 0xd054, 0, 8, 0x46 },
+        { 0x9bd7, 0, 8, 0x0a },
+        { 0x9bd8, 0, 8, 0x14 },
+        { 0x9bd9, 0, 8, 0x08 },
+        { 0x9bd0, 0, 8, 0xa8 },
+        { 0x9be4, 0, 8, 0x7f },
+        { 0x9bbd, 0, 8, 0xa8 },
+        { 0x9be2, 0, 8, 0x20 },
+        { 0x9bee, 0, 1, 0x01 },
+};
+
+#endif /* _AF9013_PRIV_ */
diff --git a/drivers/media/dvb/frontends/au8522.c b/drivers/media/dvb/frontends/au8522.c
index 0b82cc2a1e16..eabf9a68e7ec 100644
--- a/drivers/media/dvb/frontends/au8522.c
+++ b/drivers/media/dvb/frontends/au8522.c
@@ -40,6 +40,8 @@ struct au8522_state {
         u32 current_frequency;
         fe_modulation_t current_modulation;
 
+        u32 fe_status;
+        unsigned int led_state;
 };
 
 static int debug;
@@ -538,11 +540,98 @@ static int au8522_init(struct dvb_frontend *fe)
         return 0;
 }
 
+static int au8522_led_gpio_enable(struct au8522_state *state, int onoff)
+{
+        struct au8522_led_config *led_config = state->config->led_cfg;
+        u8 val;
+
+        /* bail out if we cant control an LED */
+        if (!led_config || !led_config->gpio_output ||
+            !led_config->gpio_output_enable || !led_config->gpio_output_disable)
+                return 0;
+
+        val = au8522_readreg(state, 0x4000 |
+                             (led_config->gpio_output & ~0xc000));
+        if (onoff) {
+                /* enable GPIO output */
+                val &= ~((led_config->gpio_output_enable >> 8) & 0xff);
+                val |=  (led_config->gpio_output_enable & 0xff);
+        } else {
+                /* disable GPIO output */
+                val &= ~((led_config->gpio_output_disable >> 8) & 0xff);
+                val |=  (led_config->gpio_output_disable & 0xff);
+        }
+        return au8522_writereg(state, 0x8000 |
+                               (led_config->gpio_output & ~0xc000), val);
+}
+
+/* led = 0 | off
+ * led = 1 | signal ok
+ * led = 2 | signal strong
+ * led < 0 | only light led if leds are currently off
+ */
+static int au8522_led_ctrl(struct au8522_state *state, int led)
+{
+        struct au8522_led_config *led_config = state->config->led_cfg;
+        int i, ret = 0;
+
+        /* bail out if we cant control an LED */
+        if (!led_config || !led_config->gpio_leds ||
+            !led_config->num_led_states || !led_config->led_states)
+                return 0;
+
+        if (led < 0) {
+                /* if LED is already lit, then leave it as-is */
+                if (state->led_state)
+                        return 0;
+                else
+                        led *= -1;
+        }
+
+        /* toggle LED if changing state */
+        if (state->led_state != led) {
+                u8 val;
+
+                dprintk("%s: %d\n", __func__, led);
+
+                au8522_led_gpio_enable(state, 1);
+
+                val = au8522_readreg(state, 0x4000 |
+                                     (led_config->gpio_leds & ~0xc000));
+
+                /* start with all leds off */
+                for (i = 0; i < led_config->num_led_states; i++)
+                        val &= ~led_config->led_states[i];
+
+                /* set selected LED state */
+                if (led < led_config->num_led_states)
+                        val |= led_config->led_states[led];
+                else if (led_config->num_led_states)
+                        val |=
+                        led_config->led_states[led_config->num_led_states - 1];
+
+                ret = au8522_writereg(state, 0x8000 |
+                                      (led_config->gpio_leds & ~0xc000), val);
+                if (ret < 0)
+                        return ret;
+
+                state->led_state = led;
+
+                if (led == 0)
+                        au8522_led_gpio_enable(state, 0);
+        }
+
+        return 0;
+}
+
 static int au8522_sleep(struct dvb_frontend *fe)
 {
         struct au8522_state *state = fe->demodulator_priv;
         dprintk("%s()\n", __func__);
 
+        /* turn off led */
+        au8522_led_ctrl(state, 0);
+
         state->current_frequency = 0;
 
         return 0;
@@ -592,12 +681,53 @@ static int au8522_read_status(struct dvb_frontend *fe, fe_status_t *status)
                         *status |= FE_HAS_CARRIER | FE_HAS_SIGNAL;
                 break;
         }
+        state->fe_status = *status;
+
+        if (*status & FE_HAS_LOCK)
+                /* turn on LED, if it isn't on already */
+                au8522_led_ctrl(state, -1);
+        else
+                /* turn off LED */
+                au8522_led_ctrl(state, 0);
 
         dprintk("%s() status 0x%08x\n", __func__, *status);
 
         return 0;
 }
 
+static int au8522_led_status(struct au8522_state *state, const u16 *snr)
+{
+        struct au8522_led_config *led_config = state->config->led_cfg;
+        int led;
+        u16 strong;
+
+        /* bail out if we cant control an LED */
+        if (!led_config)
+                return 0;
+
+        if (0 == (state->fe_status & FE_HAS_LOCK))
+                return au8522_led_ctrl(state, 0);
+        else if (state->current_modulation == QAM_256)
+                strong = led_config->qam256_strong;
+        else if (state->current_modulation == QAM_64)
+                strong = led_config->qam64_strong;
+        else /* (state->current_modulation == VSB_8) */
+                strong = led_config->vsb8_strong;
+
+        if (*snr >= strong)
+                led = 2;
+        else
+                led = 1;
+
+        if ((state->led_state) &&
+            (((strong < *snr) ? (*snr - strong) : (strong - *snr)) <= 10))
+                /* snr didn't change enough to bother
+                 * changing the color of the led */
+                return 0;
+
+        return au8522_led_ctrl(state, led);
+}
+
 static int au8522_read_snr(struct dvb_frontend *fe, u16 *snr)
 {
         struct au8522_state *state = fe->demodulator_priv;
@@ -621,6 +751,9 @@ static int au8522_read_snr(struct dvb_frontend *fe, u16 *snr)
                                             au8522_readreg(state, 0x4311),
                                             snr);
 
+        if (state->config->led_cfg)
+                au8522_led_status(state, snr);
+
         return ret;
 }
 
diff --git a/drivers/media/dvb/frontends/au8522.h b/drivers/media/dvb/frontends/au8522.h
index 595915ade8c3..7b94f554a093 100644
--- a/drivers/media/dvb/frontends/au8522.h
+++ b/drivers/media/dvb/frontends/au8522.h
@@ -30,6 +30,21 @@ enum au8522_if_freq {
         AU8522_IF_3_25MHZ,
 };
 
+struct au8522_led_config {
+        u16 vsb8_strong;
+        u16 qam64_strong;
+        u16 qam256_strong;
+
+        u16 gpio_output;
+        /* unset hi bits, set low bits */
+        u16 gpio_output_enable;
+        u16 gpio_output_disable;
+
+        u16 gpio_leds;
+        u8 *led_states;
+        unsigned int num_led_states;
+};
+
 struct au8522_config {
         /* the demodulator's i2c address */
         u8 demod_address;
@@ -39,6 +54,8 @@ struct au8522_config {
 #define AU8522_DEMODLOCKING 1
         u8 status_mode;
 
+        struct au8522_led_config *led_cfg;
+
         enum au8522_if_freq vsb_if;
         enum au8522_if_freq qam_if;
 };
diff --git a/drivers/media/dvb/frontends/cx24110.h b/drivers/media/dvb/frontends/cx24110.h
index 1792adb23c4d..fdcceee91f3a 100644
--- a/drivers/media/dvb/frontends/cx24110.h
+++ b/drivers/media/dvb/frontends/cx24110.h
@@ -33,12 +33,17 @@ struct cx24110_config
         u8 demod_address;
 };
 
-static inline int cx24110_pll_write(struct dvb_frontend *fe, u32 val) {
-        int r = 0;
-        u8 buf[] = {(u8) (val>>24), (u8) (val>>16), (u8) (val>>8)};
+static inline int cx24110_pll_write(struct dvb_frontend *fe, u32 val)
+{
+        u8 buf[] = {
+                (u8)((val >> 24) & 0xff),
+                (u8)((val >> 16) & 0xff),
+                (u8)((val >> 8) & 0xff)
+        };
+
         if (fe->ops.write)
-                r = fe->ops.write(fe, buf, 3);
-        return r;
+                return fe->ops.write(fe, buf, 3);
+        return 0;
 }
 
 #if defined(CONFIG_DVB_CX24110) || (defined(CONFIG_DVB_CX24110_MODULE) && defined(MODULE))
diff --git a/drivers/media/dvb/frontends/cx24116.c b/drivers/media/dvb/frontends/cx24116.c
new file mode 100644
index 000000000000..deb36f469ada
--- /dev/null
+++ b/drivers/media/dvb/frontends/cx24116.c
@@ -0,0 +1,1423 @@
+/*
+    Conexant cx24116/cx24118 - DVBS/S2 Satellite demod/tuner driver
+
+    Copyright (C) 2006-2008 Steven Toth <stoth@hauppauge.com>
+    Copyright (C) 2006-2007 Georg Acher
+    Copyright (C) 2007-2008 Darron Broad
+        March 2007
+            Fixed some bugs.
+            Added diseqc support.
+            Added corrected signal strength support.
+        August 2007
+            Sync with legacy version.
+            Some clean ups.
+    Copyright (C) 2008 Igor Liplianin
+        September, 9th 2008
+            Fixed locking on high symbol rates (>30000).
+            Implement MPEG initialization parameter.
+
+    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/slab.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/init.h>
+#include <linux/firmware.h>
+
+#include "dvb_frontend.h"
+#include "cx24116.h"
+
+static int debug = 0;
+#define dprintk(args...) \
+        do { \
+                if (debug) printk ("cx24116: " args); \
+        } while (0)
+
+#define CX24116_DEFAULT_FIRMWARE "dvb-fe-cx24116.fw"
+#define CX24116_SEARCH_RANGE_KHZ 5000
+
+/* known registers */
+#define CX24116_REG_COMMAND (0x00)      /* command args 0x00..0x1e */
+#define CX24116_REG_EXECUTE (0x1f)      /* execute command */
+#define CX24116_REG_MAILBOX (0x96)      /* FW or multipurpose mailbox? */
+#define CX24116_REG_RESET   (0x20)      /* reset status > 0     */
+#define CX24116_REG_SIGNAL  (0x9e)      /* signal low           */
+#define CX24116_REG_SSTATUS (0x9d)      /* signal high / status */
+#define CX24116_REG_QUALITY8 (0xa3)
+#define CX24116_REG_QSTATUS (0xbc)
+#define CX24116_REG_QUALITY0 (0xd5)
+#define CX24116_REG_BER0    (0xc9)
+#define CX24116_REG_BER8    (0xc8)
+#define CX24116_REG_BER16   (0xc7)
+#define CX24116_REG_BER24   (0xc6)
+#define CX24116_REG_UCB0    (0xcb)
+#define CX24116_REG_UCB8    (0xca)
+#define CX24116_REG_CLKDIV  (0xf3)
+#define CX24116_REG_RATEDIV (0xf9)
+#define CX24116_REG_FECSTATUS (0x9c)    /* configured fec (not tuned) or actual FEC (tuned) 1=1/2 2=2/3 etc */
+
+/* FECSTATUS bits */
+#define CX24116_FEC_FECMASK   (0x1f)    /* mask to determine configured fec (not tuned) or actual fec (tuned) */
+#define CX24116_FEC_DVBS      (0x20)    /* Select DVB-S demodulator, else DVB-S2 */
+#define CX24116_FEC_UNKNOWN   (0x40)    /* Unknown/unused */
+#define CX24116_FEC_PILOT     (0x80)    /* Pilot mode requested when tuning else always reset when tuned */
+
+/* arg buffer size */
+#define CX24116_ARGLEN (0x1e)
+
+/* rolloff */
+#define CX24116_ROLLOFF_020 (0x00)
+#define CX24116_ROLLOFF_025 (0x01)
+#define CX24116_ROLLOFF_035 (0x02)
+
+/* pilot bit */
+#define CX24116_PILOT_OFF (0x00)
+#define CX24116_PILOT_ON (0x40)
+
+/* signal status */
+#define CX24116_HAS_SIGNAL   (0x01)
+#define CX24116_HAS_CARRIER  (0x02)
+#define CX24116_HAS_VITERBI  (0x04)
+#define CX24116_HAS_SYNCLOCK (0x08)
+#define CX24116_HAS_UNKNOWN1 (0x10)
+#define CX24116_HAS_UNKNOWN2 (0x20)
+#define CX24116_STATUS_MASK  (0x3f)
+#define CX24116_SIGNAL_MASK  (0xc0)
+
+#define CX24116_DISEQC_TONEOFF   (0)    /* toneburst never sent */
+#define CX24116_DISEQC_TONECACHE (1)    /* toneburst cached     */
+#define CX24116_DISEQC_MESGCACHE (2)    /* message cached       */
+
+/* arg offset for DiSEqC */
+#define CX24116_DISEQC_BURST  (1)
+#define CX24116_DISEQC_ARG2_2 (2)   /* unknown value=2 */
+#define CX24116_DISEQC_ARG3_0 (3)   /* unknown value=0 */
+#define CX24116_DISEQC_ARG4_0 (4)   /* unknown value=0 */
+#define CX24116_DISEQC_MSGLEN (5)
+#define CX24116_DISEQC_MSGOFS (6)
+
+/* DiSEqC burst */
+#define CX24116_DISEQC_MINI_A (0)
+#define CX24116_DISEQC_MINI_B (1)
+
+/* DiSEqC tone burst */
+static int toneburst = 1;
+
+/* SNR measurements */
+static int esno_snr = 0;
+
+enum cmds
+{
+        CMD_SET_VCO     = 0x10,
+        CMD_TUNEREQUEST = 0x11,
+        CMD_MPEGCONFIG  = 0x13,
+        CMD_TUNERINIT   = 0x14,
+        CMD_BANDWIDTH   = 0x15,
+        CMD_GETAGC      = 0x19,
+        CMD_LNBCONFIG   = 0x20,
+        CMD_LNBSEND     = 0x21, /* Formerly CMD_SEND_DISEQC */
+        CMD_SET_TONEPRE = 0x22,
+        CMD_SET_TONE    = 0x23,
+        CMD_UPDFWVERS   = 0x35,
+        CMD_TUNERSLEEP  = 0x36,
+        CMD_AGCCONTROL  = 0x3b, /* Unknown */
+};
+
+/* The Demod/Tuner can't easily provide these, we cache them */
+struct cx24116_tuning
+{
+        u32 frequency;
+        u32 symbol_rate;
+        fe_spectral_inversion_t inversion;
+        fe_code_rate_t fec;
+
+        fe_modulation_t modulation;
+        fe_pilot_t pilot;
+        fe_rolloff_t rolloff;
+
+        /* Demod values */
+        u8 fec_val;
+        u8 fec_mask;
+        u8 inversion_val;
+        u8 pilot_val;
+        u8 rolloff_val;
+};
+
+/* Basic commands that are sent to the firmware */
+struct cx24116_cmd
+{
+        u8 len;
+        u8 args[CX24116_ARGLEN];
+};
+
+struct cx24116_state
+{
+        struct i2c_adapter* i2c;
+        const struct cx24116_config* config;
+
+        struct dvb_frontend frontend;
+
+        struct cx24116_tuning dcur;
+        struct cx24116_tuning dnxt;
+
+        u8 skip_fw_load;
+        u8 burst;
+        struct cx24116_cmd dsec_cmd;
+};
+
+static int cx24116_writereg(struct cx24116_state* state, int reg, int data)
+{
+        u8 buf[] = { reg, data };
+        struct i2c_msg msg = { .addr = state->config->demod_address,
+                .flags = 0, .buf = buf, .len = 2 };
+        int err;
+
+        if (debug>1)
+                printk("cx24116: %s: write reg 0x%02x, value 0x%02x\n",
+                                                __func__,reg, data);
+
+        if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) {
+                printk("%s: writereg error(err == %i, reg == 0x%02x,"
+                         " value == 0x%02x)\n", __func__, err, reg, data);
+                return -EREMOTEIO;
+        }
+
+        return 0;
+}
+
+/* Bulk byte writes to a single I2C address, for 32k firmware load */
+static int cx24116_writeregN(struct cx24116_state* state, int reg, u8 *data, u16 len)
+{
+        int ret = -EREMOTEIO;
+        struct i2c_msg msg;
+        u8 *buf;
+
+        buf = kmalloc(len + 1, GFP_KERNEL);
+        if (buf == NULL) {
+                printk("Unable to kmalloc\n");
+                ret = -ENOMEM;
+                goto error;
+        }
+
+        *(buf) = reg;
+        memcpy(buf + 1, data, len);
+
+        msg.addr = state->config->demod_address;
+        msg.flags = 0;
+        msg.buf = buf;
+        msg.len = len + 1;
+
+        if (debug>1)
+                printk("cx24116: %s:  write regN 0x%02x, len = %d\n",
+                                                __func__,reg, len);
+
+        if ((ret = i2c_transfer(state->i2c, &msg, 1)) != 1) {
+                printk("%s: writereg error(err == %i, reg == 0x%02x\n",
+                         __func__, ret, reg);
+                ret = -EREMOTEIO;
+        }
+
+error:
+        kfree(buf);
+
+        return ret;
+}
+
+static int cx24116_readreg(struct cx24116_state* state, u8 reg)
+{
+        int ret;
+        u8 b0[] = { reg };
+        u8 b1[] = { 0 };
+        struct i2c_msg msg[] = {
+                { .addr = state->config->demod_address, .flags = 0, .buf = b0, .len = 1 },
+                { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 1 }
+        };
+
+        ret = i2c_transfer(state->i2c, msg, 2);
+
+        if (ret != 2) {
+                printk("%s: reg=0x%x (error=%d)\n", __func__, reg, ret);
+                return ret;
+        }
+
+        if (debug>1)
+                printk("cx24116: read reg 0x%02x, value 0x%02x\n",reg, b1[0]);
+
+        return b1[0];
+}
+
+static int cx24116_set_inversion(struct cx24116_state* state, fe_spectral_inversion_t inversion)
+{
+        dprintk("%s(%d)\n", __func__, inversion);
+
+        switch (inversion) {
+        case INVERSION_OFF:
+                state->dnxt.inversion_val = 0x00;
+                break;
+        case INVERSION_ON:
+                state->dnxt.inversion_val = 0x04;
+                break;
+        case INVERSION_AUTO:
+                state->dnxt.inversion_val = 0x0C;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        state->dnxt.inversion = inversion;
+
+        return 0;
+}
+
+/*
+ * modfec (modulation and FEC)
+ * ===========================
+ *
+ * MOD          FEC             mask/val    standard
+ * ----         --------        ----------- --------
+ * QPSK         FEC_1_2         0x02 0x02+X DVB-S
+ * QPSK         FEC_2_3         0x04 0x02+X DVB-S
+ * QPSK         FEC_3_4         0x08 0x02+X DVB-S
+ * QPSK         FEC_4_5         0x10 0x02+X DVB-S (?)
+ * QPSK         FEC_5_6         0x20 0x02+X DVB-S
+ * QPSK         FEC_6_7         0x40 0x02+X DVB-S
+ * QPSK         FEC_7_8         0x80 0x02+X DVB-S
+ * QPSK         FEC_8_9         0x01 0x02+X DVB-S (?) (NOT SUPPORTED?)
+ * QPSK         AUTO            0xff 0x02+X DVB-S
+ *
+ * For DVB-S high byte probably represents FEC
+ * and low byte selects the modulator. The high
+ * byte is search range mask. Bit 5 may turn
+ * on DVB-S and remaining bits represent some
+ * kind of calibration (how/what i do not know).
+ *
+ * Eg.(2/3) szap "Zone Horror"
+ *
+ * mask/val = 0x04, 0x20
+ * status 1f | signal c3c0 | snr a333 | ber 00000098 | unc 00000000 | FE_HAS_LOCK
+ *
+ * mask/val = 0x04, 0x30
+ * status 1f | signal c3c0 | snr a333 | ber 00000000 | unc 00000000 | FE_HAS_LOCK
+ *
+ * After tuning FECSTATUS contains actual FEC
+ * in use numbered 1 through to 8 for 1/2 .. 2/3 etc
+ *
+ * NBC=NOT/NON BACKWARD COMPATIBLE WITH DVB-S (DVB-S2 only)
+ *
+ * NBC-QPSK     FEC_1_2         0x00, 0x04      DVB-S2
+ * NBC-QPSK     FEC_3_5         0x00, 0x05      DVB-S2
+ * NBC-QPSK     FEC_2_3         0x00, 0x06      DVB-S2
+ * NBC-QPSK     FEC_3_4         0x00, 0x07      DVB-S2
+ * NBC-QPSK     FEC_4_5         0x00, 0x08      DVB-S2
+ * NBC-QPSK     FEC_5_6         0x00, 0x09      DVB-S2
+ * NBC-QPSK     FEC_8_9         0x00, 0x0a      DVB-S2
+ * NBC-QPSK     FEC_9_10        0x00, 0x0b      DVB-S2
+ *
+ * NBC-8PSK     FEC_3_5         0x00, 0x0c      DVB-S2
+ * NBC-8PSK     FEC_2_3         0x00, 0x0d      DVB-S2
+ * NBC-8PSK     FEC_3_4         0x00, 0x0e      DVB-S2
+ * NBC-8PSK     FEC_5_6         0x00, 0x0f      DVB-S2
+ * NBC-8PSK     FEC_8_9         0x00, 0x10      DVB-S2
+ * NBC-8PSK     FEC_9_10        0x00, 0x11      DVB-S2
+ *
+ * For DVB-S2 low bytes selects both modulator
+ * and FEC. High byte is meaningless here. To
+ * set pilot, bit 6 (0x40) is set. When inspecting
+ * FECSTATUS bit 7 (0x80) represents the pilot
+ * selection whilst not tuned. When tuned, actual FEC
+ * in use is found in FECSTATUS as per above. Pilot
+ * value is reset.
+ */
+
+/* A table of modulation, fec and configuration bytes for the demod.
+ * Not all S2 mmodulation schemes are support and not all rates with
+ * a scheme are support. Especially, no auto detect when in S2 mode.
+ */
+struct cx24116_modfec {
+        fe_delivery_system_t delivery_system;
+        fe_modulation_t modulation;
+        fe_code_rate_t fec;
+        u8 mask;        /* In DVBS mode this is used to autodetect */
+        u8 val;         /* Passed to the firmware to indicate mode selection */
+} CX24116_MODFEC_MODES[] = {
+ /* QPSK. For unknown rates we set hardware to auto detect 0xfe 0x30 */
+
+ /*mod   fec       mask  val */
+ { SYS_DVBS, QPSK, FEC_NONE, 0xfe, 0x30 },
+ { SYS_DVBS, QPSK, FEC_1_2,  0x02, 0x2e }, /* 00000010 00101110 */
+ { SYS_DVBS, QPSK, FEC_2_3,  0x04, 0x2f }, /* 00000100 00101111 */
+ { SYS_DVBS, QPSK, FEC_3_4,  0x08, 0x30 }, /* 00001000 00110000 */
+ { SYS_DVBS, QPSK, FEC_4_5,  0xfe, 0x30 }, /* 000?0000 ?        */
+ { SYS_DVBS, QPSK, FEC_5_6,  0x20, 0x31 }, /* 00100000 00110001 */
+ { SYS_DVBS, QPSK, FEC_6_7,  0xfe, 0x30 }, /* 0?000000 ?        */
+ { SYS_DVBS, QPSK, FEC_7_8,  0x80, 0x32 }, /* 10000000 00110010 */
+ { SYS_DVBS, QPSK, FEC_8_9,  0xfe, 0x30 }, /* 0000000? ?        */
+ { SYS_DVBS, QPSK, FEC_AUTO, 0xfe, 0x30 },
+ /* NBC-QPSK */
+ { SYS_DVBS2, QPSK, FEC_1_2,  0x00, 0x04 },
+ { SYS_DVBS2, QPSK, FEC_3_5,  0x00, 0x05 },
+ { SYS_DVBS2, QPSK, FEC_2_3,  0x00, 0x06 },
+ { SYS_DVBS2, QPSK, FEC_3_4,  0x00, 0x07 },
+ { SYS_DVBS2, QPSK, FEC_4_5,  0x00, 0x08 },
+ { SYS_DVBS2, QPSK, FEC_5_6,  0x00, 0x09 },
+ { SYS_DVBS2, QPSK, FEC_8_9,  0x00, 0x0a },
+ { SYS_DVBS2, QPSK, FEC_9_10, 0x00, 0x0b },
+ /* 8PSK */
+ { SYS_DVBS2, PSK_8, FEC_3_5,  0x00, 0x0c },
+ { SYS_DVBS2, PSK_8, FEC_2_3,  0x00, 0x0d },
+ { SYS_DVBS2, PSK_8, FEC_3_4,  0x00, 0x0e },
+ { SYS_DVBS2, PSK_8, FEC_5_6,  0x00, 0x0f },
+ { SYS_DVBS2, PSK_8, FEC_8_9,  0x00, 0x10 },
+ { SYS_DVBS2, PSK_8, FEC_9_10, 0x00, 0x11 },
+ /*
+  * `val' can be found in the FECSTATUS register when tuning.
+  * FECSTATUS will give the actual FEC in use if tuning was successful.
+  */
+};
+
+static int cx24116_lookup_fecmod(struct cx24116_state* state,
+        fe_modulation_t m, fe_code_rate_t f)
+{
+        int i, ret = -EOPNOTSUPP;
+
+        dprintk("%s(0x%02x,0x%02x)\n", __func__, m, f);
+
+        for(i=0 ; i < sizeof(CX24116_MODFEC_MODES) / sizeof(struct cx24116_modfec) ; i++)
+        {
+                if( (m == CX24116_MODFEC_MODES[i].modulation) &&
+                        (f == CX24116_MODFEC_MODES[i].fec) )
+                        {
+                                ret = i;
+                                break;
+                        }
+        }
+
+        return ret;
+}
+
+static int cx24116_set_fec(struct cx24116_state* state, fe_modulation_t mod, fe_code_rate_t fec)
+{
+        int ret = 0;
+
+        dprintk("%s(0x%02x,0x%02x)\n", __func__, mod, fec);
+
+        ret = cx24116_lookup_fecmod(state, mod, fec);
+
+        if(ret < 0)
+                return ret;
+
+        state->dnxt.fec = fec;
+        state->dnxt.fec_val = CX24116_MODFEC_MODES[ret].val;
+        state->dnxt.fec_mask = CX24116_MODFEC_MODES[ret].mask;
+        dprintk("%s() mask/val = 0x%02x/0x%02x\n", __func__,
+                state->dnxt.fec_mask, state->dnxt.fec_val);
+
+        return 0;
+}
+
+static int cx24116_set_symbolrate(struct cx24116_state* state, u32 rate)
+{
+        dprintk("%s(%d)\n", __func__, rate);
+
+        /*  check if symbol rate is within limits */
+        if ((rate > state->frontend.ops.info.symbol_rate_max) ||
+            (rate < state->frontend.ops.info.symbol_rate_min)) {
+                dprintk("%s() unsupported symbol_rate = %d\n", __func__, rate);
+                return -EOPNOTSUPP;
+        }
+
+        state->dnxt.symbol_rate = rate;
+        dprintk("%s() symbol_rate = %d\n", __func__, rate);
+
+        return 0;
+}
+
+static int cx24116_load_firmware (struct dvb_frontend* fe, const struct firmware *fw);
+
+static int cx24116_firmware_ondemand(struct dvb_frontend* fe)
+{
+        struct cx24116_state *state = fe->demodulator_priv;
+        const struct firmware *fw;
+        int ret = 0;
+
+        dprintk("%s()\n",__func__);
+
+        if (cx24116_readreg(state, 0x20) > 0)
+        {
+
+                if (state->skip_fw_load)
+                        return 0;
+
+                /* Load firmware */
+                /* request the firmware, this will block until someone uploads it */
+                printk("%s: Waiting for firmware upload (%s)...\n", __func__, CX24116_DEFAULT_FIRMWARE);
+                ret = request_firmware(&fw, CX24116_DEFAULT_FIRMWARE, &state->i2c->dev);
+                printk("%s: Waiting for firmware upload(2)...\n", __func__);
+                if (ret) {
+                        printk("%s: No firmware uploaded (timeout or file not found?)\n", __func__);
+                        return ret;
+                }
+
+                /* Make sure we don't recurse back through here during loading */
+                state->skip_fw_load = 1;
+
+                ret = cx24116_load_firmware(fe, fw);
+                if (ret)
+                        printk("%s: Writing firmware to device failed\n", __func__);
+
+                release_firmware(fw);
+
+                printk("%s: Firmware upload %s\n", __func__, ret == 0 ? "complete" : "failed");
+
+                /* Ensure firmware is always loaded if required */
+                state->skip_fw_load = 0;
+        }
+
+        return ret;
+}
+
+/* Take a basic firmware command structure, format it and forward it for processing */
+static int cx24116_cmd_execute(struct dvb_frontend* fe, struct cx24116_cmd *cmd)
+{
+        struct cx24116_state *state = fe->demodulator_priv;
+        int i, ret;
+
+        dprintk("%s()\n", __func__);
+
+        /* Load the firmware if required */
+        if ( (ret = cx24116_firmware_ondemand(fe)) != 0)
+        {
+                printk("%s(): Unable initialise the firmware\n", __func__);
+                return ret;
+        }
+
+        /* Write the command */
+        for(i = 0; i < cmd->len ; i++)
+        {
+                dprintk("%s: 0x%02x == 0x%02x\n", __func__, i, cmd->args[i]);
+                cx24116_writereg(state, i, cmd->args[i]);
+        }
+
+        /* Start execution and wait for cmd to terminate */
+        cx24116_writereg(state, CX24116_REG_EXECUTE, 0x01);
+        while( cx24116_readreg(state, CX24116_REG_EXECUTE) )
+        {
+                msleep(10);
+                if(i++ > 64)
+                {
+                        /* Avoid looping forever if the firmware does no respond */
+                        printk("%s() Firmware not responding\n", __func__);
+                        return -EREMOTEIO;
+                }
+        }
+        return 0;
+}
+
+static int cx24116_load_firmware (struct dvb_frontend* fe, const struct firmware *fw)
+{
+        struct cx24116_state* state = fe->demodulator_priv;
+        struct cx24116_cmd cmd;
+        int i, ret;
+        unsigned char vers[4];
+
+        dprintk("%s\n", __func__);
+        dprintk("Firmware is %zu bytes (%02x %02x .. %02x %02x)\n"
+                        ,fw->size
+                        ,fw->data[0]
+                        ,fw->data[1]
+                        ,fw->data[ fw->size-2 ]
+                        ,fw->data[ fw->size-1 ]
+                        );
+
+        /* Toggle 88x SRST pin to reset demod */
+        if (state->config->reset_device)
+                state->config->reset_device(fe);
+
+        /* Begin the firmware load process */
+        /* Prepare the demod, load the firmware, cleanup after load */
+
+        /* Init PLL */
+        cx24116_writereg(state, 0xE5, 0x00);
+        cx24116_writereg(state, 0xF1, 0x08);
+        cx24116_writereg(state, 0xF2, 0x13);
+
+        /* Start PLL */
+        cx24116_writereg(state, 0xe0, 0x03);
+        cx24116_writereg(state, 0xe0, 0x00);
+
+        /* Unknown */
+        cx24116_writereg(state, CX24116_REG_CLKDIV, 0x46);
+        cx24116_writereg(state, CX24116_REG_RATEDIV, 0x00);
+
+        /* Unknown */
+        cx24116_writereg(state, 0xF0, 0x03);
+        cx24116_writereg(state, 0xF4, 0x81);
+        cx24116_writereg(state, 0xF5, 0x00);
+        cx24116_writereg(state, 0xF6, 0x00);
+
+        /* write the entire firmware as one transaction */
+        cx24116_writeregN(state, 0xF7, fw->data, fw->size);
+
+        cx24116_writereg(state, 0xF4, 0x10);
+        cx24116_writereg(state, 0xF0, 0x00);
+        cx24116_writereg(state, 0xF8, 0x06);
+
+        /* Firmware CMD 10: VCO config */
+        cmd.args[0x00] = CMD_SET_VCO;
+        cmd.args[0x01] = 0x05;
+        cmd.args[0x02] = 0xdc;
+        cmd.args[0x03] = 0xda;
+        cmd.args[0x04] = 0xae;
+        cmd.args[0x05] = 0xaa;
+        cmd.args[0x06] = 0x04;
+        cmd.args[0x07] = 0x9d;
+        cmd.args[0x08] = 0xfc;
+        cmd.args[0x09] = 0x06;
+        cmd.len= 0x0a;
+        ret = cx24116_cmd_execute(fe, &cmd);
+        if (ret != 0)
+                return ret;
+
+        cx24116_writereg(state, CX24116_REG_SSTATUS, 0x00);
+
+        /* Firmware CMD 14: Tuner config */
+        cmd.args[0x00] = CMD_TUNERINIT;
+        cmd.args[0x01] = 0x00;
+        cmd.args[0x02] = 0x00;
+        cmd.len= 0x03;
+        ret = cx24116_cmd_execute(fe, &cmd);
+        if (ret != 0)
+                return ret;
+
+        cx24116_writereg(state, 0xe5, 0x00);
+
+        /* Firmware CMD 13: MPEG config */
+        cmd.args[0x00] = CMD_MPEGCONFIG;
+        cmd.args[0x01] = 0x01;
+        cmd.args[0x02] = 0x75;
+        cmd.args[0x03] = 0x00;
+        if (state->config->mpg_clk_pos_pol)
+                cmd.args[0x04] = state->config->mpg_clk_pos_pol;
+        else
+                cmd.args[0x04] = 0x02;
+        cmd.args[0x05] = 0x00;
+        cmd.len= 0x06;
+        ret = cx24116_cmd_execute(fe, &cmd);
+        if (ret != 0)
+                return ret;
+
+        /* Firmware CMD 35: Get firmware version */
+        cmd.args[0x00] = CMD_UPDFWVERS;
+        cmd.len= 0x02;
+        for(i=0; i<4; i++) {
+                cmd.args[0x01] = i;
+                ret = cx24116_cmd_execute(fe, &cmd);
+                if (ret != 0)
+                        return ret;
+                vers[i]= cx24116_readreg(state, CX24116_REG_MAILBOX);
+        }
+        printk("%s: FW version %i.%i.%i.%i\n", __func__,
+                vers[0], vers[1], vers[2], vers[3]);
+
+        return 0;
+}
+
+static int cx24116_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)
+{
+        /* The isl6421 module will override this function in the fops. */
+        dprintk("%s() This should never appear if the isl6421 module is loaded correctly\n",__func__);
+
+        return -EOPNOTSUPP;
+}
+
+static int cx24116_read_status(struct dvb_frontend* fe, fe_status_t* status)
+{
+        struct cx24116_state *state = fe->demodulator_priv;
+
+        int lock = cx24116_readreg(state, CX24116_REG_SSTATUS);
+
+        dprintk("%s: status = 0x%02x\n", __func__, lock);
+
+        *status = 0;
+
+        if (lock & CX24116_HAS_SIGNAL)
+                *status |= FE_HAS_SIGNAL;
+        if (lock & CX24116_HAS_CARRIER)
+                *status |= FE_HAS_CARRIER;
+        if (lock & CX24116_HAS_VITERBI)
+                *status |= FE_HAS_VITERBI;
+        if (lock & CX24116_HAS_SYNCLOCK)
+                *status |= FE_HAS_SYNC | FE_HAS_LOCK;
+
+        return 0;
+}
+
+static int cx24116_read_ber(struct dvb_frontend* fe, u32* ber)
+{
+        struct cx24116_state *state = fe->demodulator_priv;
+
+        dprintk("%s()\n", __func__);
+
+        *ber =  ( cx24116_readreg(state, CX24116_REG_BER24) << 24 ) |
+                ( cx24116_readreg(state, CX24116_REG_BER16) << 16 ) |
+                ( cx24116_readreg(state, CX24116_REG_BER8 ) << 8  ) |
+                  cx24116_readreg(state, CX24116_REG_BER0 );
+
+        return 0;
+}
+
+/* TODO Determine function and scale appropriately */
+static int cx24116_read_signal_strength(struct dvb_frontend* fe, u16* signal_strength)
+{
+        struct cx24116_state *state = fe->demodulator_priv;
+        struct cx24116_cmd cmd;
+        int ret;
+        u16 sig_reading;
+
+        dprintk("%s()\n", __func__);
+
+        /* Firmware CMD 19: Get AGC */
+        cmd.args[0x00] = CMD_GETAGC;
+        cmd.len= 0x01;
+        ret = cx24116_cmd_execute(fe, &cmd);
+        if (ret != 0)
+                return ret;
+
+        sig_reading = ( cx24116_readreg(state, CX24116_REG_SSTATUS) & CX24116_SIGNAL_MASK ) |
+                ( cx24116_readreg(state, CX24116_REG_SIGNAL) << 6 );
+        *signal_strength= 0 - sig_reading;
+
+        dprintk("%s: raw / cooked = 0x%04x / 0x%04x\n", __func__, sig_reading, *signal_strength);
+
+        return 0;
+}
+
+/* SNR (0..100)% = (sig & 0xf0) * 10 + (sig & 0x0f) * 10 / 16 */
+static int cx24116_read_snr_pct(struct dvb_frontend* fe, u16* snr)
+{
+        struct cx24116_state *state = fe->demodulator_priv;
+        u8 snr_reading;
+        static const u32 snr_tab[] = { /* 10 x Table (rounded up) */
+                0x00000,0x0199A,0x03333,0x04ccD,0x06667,
+                        0x08000,0x0999A,0x0b333,0x0cccD,0x0e667,
+                0x10000,0x1199A,0x13333,0x14ccD,0x16667,0x18000 };
+
+        dprintk("%s()\n", __func__);
+
+        snr_reading = cx24116_readreg(state, CX24116_REG_QUALITY0);
+
+        if(snr_reading >= 0xa0 /* 100% */)
+                *snr = 0xffff;
+        else
+                *snr = snr_tab [ ( snr_reading & 0xf0 )   >> 4 ] +
+                        ( snr_tab [ ( snr_reading & 0x0f ) ] >> 4 );
+
+        dprintk("%s: raw / cooked = 0x%02x / 0x%04x\n", __func__,
+                snr_reading, *snr);
+
+        return 0;
+}
+
+/* The reelbox patches show the value in the registers represents
+ * ESNO, from 0->30db (values 0->300). We provide this value by
+ * default.
+ */
+static int cx24116_read_snr_esno(struct dvb_frontend* fe, u16* snr)
+{
+        struct cx24116_state *state = fe->demodulator_priv;
+
+        dprintk("%s()\n", __func__);
+
+        *snr = cx24116_readreg(state, CX24116_REG_QUALITY8) << 8 |
+                cx24116_readreg(state, CX24116_REG_QUALITY0);
+
+        dprintk("%s: raw 0x%04x\n", __func__, *snr);
+
+        return 0;
+}
+
+static int cx24116_read_snr(struct dvb_frontend* fe, u16* snr)
+{
+        if (esno_snr == 1)
+                return cx24116_read_snr_esno(fe, snr);
+        else
+                return cx24116_read_snr_pct(fe, snr);
+}
+
+static int cx24116_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
+{
+        struct cx24116_state *state = fe->demodulator_priv;
+
+        dprintk("%s()\n", __func__);
+
+        *ucblocks = ( cx24116_readreg(state, CX24116_REG_UCB8) << 8 ) |
+                cx24116_readreg(state, CX24116_REG_UCB0);
+
+        return 0;
+}
+
+/* Overwrite the current tuning params, we are about to tune */
+static void cx24116_clone_params(struct dvb_frontend* fe)
+{
+        struct cx24116_state *state = fe->demodulator_priv;
+        memcpy(&state->dcur, &state->dnxt, sizeof(state->dcur));
+}
+
+/* Wait for LNB */
+static int cx24116_wait_for_lnb(struct dvb_frontend* fe)
+{
+        struct cx24116_state *state = fe->demodulator_priv;
+        int i;
+
+        dprintk("%s() qstatus = 0x%02x\n", __func__,
+                cx24116_readreg(state, CX24116_REG_QSTATUS));
+
+        /* Wait for up to 300 ms */
+        for(i = 0; i < 30 ; i++) {
+                if (cx24116_readreg(state, CX24116_REG_QSTATUS) & 0x20)
+                        return 0;
+                msleep(10);
+        }
+
+        dprintk("%s(): LNB not ready\n", __func__);
+
+        return -ETIMEDOUT; /* -EBUSY ? */
+}
+
+static int cx24116_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
+{
+        struct cx24116_cmd cmd;
+        int ret;
+
+        dprintk("%s(%d)\n", __func__, tone);
+        if ( (tone != SEC_TONE_ON) && (tone != SEC_TONE_OFF) ) {
+                printk("%s: Invalid, tone=%d\n", __func__, tone);
+                return -EINVAL;
+        }
+
+        /* Wait for LNB ready */
+        ret = cx24116_wait_for_lnb(fe);
+        if(ret != 0)
+                return ret;
+
+        /* Min delay time after DiSEqC send */
+        msleep(15); /* XXX determine is FW does this, see send_diseqc/burst */
+
+        /* This is always done before the tone is set */
+        cmd.args[0x00] = CMD_SET_TONEPRE;
+        cmd.args[0x01] = 0x00;
+        cmd.len= 0x02;
+        ret = cx24116_cmd_execute(fe, &cmd);
+        if (ret != 0)
+                return ret;
+
+        /* Now we set the tone */
+        cmd.args[0x00] = CMD_SET_TONE;
+        cmd.args[0x01] = 0x00;
+        cmd.args[0x02] = 0x00;
+
+        switch (tone) {
+        case SEC_TONE_ON:
+                dprintk("%s: setting tone on\n", __func__);
+                cmd.args[0x03] = 0x01;
+                break;
+        case SEC_TONE_OFF:
+                dprintk("%s: setting tone off\n",__func__);
+                cmd.args[0x03] = 0x00;
+                break;
+        }
+        cmd.len= 0x04;
+
+        /* Min delay time before DiSEqC send */
+        msleep(15); /* XXX determine is FW does this, see send_diseqc/burst */
+
+        return cx24116_cmd_execute(fe, &cmd);
+}
+
+/* Initialise DiSEqC */
+static int cx24116_diseqc_init(struct dvb_frontend* fe)
+{
+        struct cx24116_state *state = fe->demodulator_priv;
+        struct cx24116_cmd cmd;
+        int ret;
+
+        /* Firmware CMD 20: LNB/DiSEqC config */
+        cmd.args[0x00] = CMD_LNBCONFIG;
+        cmd.args[0x01] = 0x00;
+        cmd.args[0x02] = 0x10;
+        cmd.args[0x03] = 0x00;
+        cmd.args[0x04] = 0x8f;
+        cmd.args[0x05] = 0x28;
+        cmd.args[0x06] = (toneburst == CX24116_DISEQC_TONEOFF) ? 0x00 : 0x01;
+        cmd.args[0x07] = 0x01;
+        cmd.len= 0x08;
+        ret = cx24116_cmd_execute(fe, &cmd);
+        if (ret != 0)
+                return ret;
+
+        /* Prepare a DiSEqC command */
+        state->dsec_cmd.args[0x00] = CMD_LNBSEND;
+
+        /* DiSEqC burst */
+        state->dsec_cmd.args[CX24116_DISEQC_BURST]  = CX24116_DISEQC_MINI_A;
+
+        /* Unknown */
+        state->dsec_cmd.args[CX24116_DISEQC_ARG2_2] = 0x02;
+        state->dsec_cmd.args[CX24116_DISEQC_ARG3_0] = 0x00;
+        state->dsec_cmd.args[CX24116_DISEQC_ARG4_0] = 0x00; /* Continuation flag? */
+
+        /* DiSEqC message length */
+        state->dsec_cmd.args[CX24116_DISEQC_MSGLEN] = 0x00;
+
+        /* Command length */
+        state->dsec_cmd.len= CX24116_DISEQC_MSGOFS;
+
+        return 0;
+}
+
+/* Send DiSEqC message with derived burst (hack) || previous burst */
+static int cx24116_send_diseqc_msg(struct dvb_frontend* fe, struct dvb_diseqc_master_cmd *d)
+{
+        struct cx24116_state *state = fe->demodulator_priv;
+        int i, ret;
+
+        /* Dump DiSEqC message */
+        if (debug) {
+                printk("cx24116: %s(", __func__);
+                for(i = 0 ; i < d->msg_len ;) {
+                        printk("0x%02x", d->msg[i]);
+                        if(++i < d->msg_len)
+                                printk(", ");
+                        }
+                printk(") toneburst=%d\n", toneburst);
+        }
+
+        /* Validate length */
+        if(d->msg_len > (CX24116_ARGLEN - CX24116_DISEQC_MSGOFS))
+                return -EINVAL;
+
+        /* DiSEqC message */
+        for (i = 0; i < d->msg_len; i++)
+                state->dsec_cmd.args[CX24116_DISEQC_MSGOFS + i] = d->msg[i];
+
+        /* DiSEqC message length */
+        state->dsec_cmd.args[CX24116_DISEQC_MSGLEN] = d->msg_len;
+
+        /* Command length */
+        state->dsec_cmd.len= CX24116_DISEQC_MSGOFS + state->dsec_cmd.args[CX24116_DISEQC_MSGLEN];
+
+        /* DiSEqC toneburst */
+        if(toneburst == CX24116_DISEQC_MESGCACHE)
+                /* Message is cached */
+                return 0;
+
+        else if(toneburst == CX24116_DISEQC_TONEOFF)
+                /* Message is sent without burst */
+                state->dsec_cmd.args[CX24116_DISEQC_BURST] = 0;
+
+        else if(toneburst == CX24116_DISEQC_TONECACHE) {
+                /*
+                 * Message is sent with derived else cached burst
+                 *
+                 * WRITE PORT GROUP COMMAND 38
+                 *
+                 * 0/A/A: E0 10 38 F0..F3
+                 * 1/B/B: E0 10 38 F4..F7
+                 * 2/C/A: E0 10 38 F8..FB
+                 * 3/D/B: E0 10 38 FC..FF
+                 *
+                 * databyte[3]= 8421:8421
+                 *              ABCD:WXYZ
+                 *              CLR :SET
+                 *
+                 *              WX= PORT SELECT 0..3    (X=TONEBURST)
+                 *              Y = VOLTAGE             (0=13V, 1=18V)
+                 *              Z = BAND                (0=LOW, 1=HIGH(22K))
+                 */
+                if(d->msg_len >= 4 && d->msg[2] == 0x38)
+                        state->dsec_cmd.args[CX24116_DISEQC_BURST] = ((d->msg[3] & 4) >> 2);
+                if(debug)
+                        dprintk("%s burst=%d\n", __func__, state->dsec_cmd.args[CX24116_DISEQC_BURST]);
+        }
+
+        /* Wait for LNB ready */
+        ret = cx24116_wait_for_lnb(fe);
+        if(ret != 0)
+                return ret;
+
+        /* Wait for voltage/min repeat delay */
+        msleep(100);
+
+        /* Command */
+        ret = cx24116_cmd_execute(fe, &state->dsec_cmd);
+        if(ret != 0)
+                return ret;
+        /*
+         * Wait for send
+         *
+         * Eutelsat spec:
+         * >15ms delay          + (XXX determine if FW does this, see set_tone)
+         *  13.5ms per byte     +
+         * >15ms delay          +
+         *  12.5ms burst        +
+         * >15ms delay            (XXX determine if FW does this, see set_tone)
+         */
+        msleep( (state->dsec_cmd.args[CX24116_DISEQC_MSGLEN] << 4) + ((toneburst == CX24116_DISEQC_TONEOFF) ? 30 : 60) );
+
+        return 0;
+}
+
+/* Send DiSEqC burst */
+static int cx24116_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t burst)
+{
+        struct cx24116_state *state = fe->demodulator_priv;
+        int ret;
+
+        dprintk("%s(%d) toneburst=%d\n",__func__, burst, toneburst);
+
+        /* DiSEqC burst */
+        if (burst == SEC_MINI_A)
+                state->dsec_cmd.args[CX24116_DISEQC_BURST] = CX24116_DISEQC_MINI_A;
+        else if(burst == SEC_MINI_B)
+                state->dsec_cmd.args[CX24116_DISEQC_BURST] = CX24116_DISEQC_MINI_B;
+        else
+                return -EINVAL;
+
+        /* DiSEqC toneburst */
+        if(toneburst != CX24116_DISEQC_MESGCACHE)
+                /* Burst is cached */
+                return 0;
+
+        /* Burst is to be sent with cached message */
+
+        /* Wait for LNB ready */
+        ret = cx24116_wait_for_lnb(fe);
+        if(ret != 0)
+                return ret;
+
+        /* Wait for voltage/min repeat delay */
+        msleep(100);
+
+        /* Command */
+        ret = cx24116_cmd_execute(fe, &state->dsec_cmd);
+        if(ret != 0)
+                return ret;
+
+        /*
+         * Wait for send
+         *
+         * Eutelsat spec:
+         * >15ms delay          + (XXX determine if FW does this, see set_tone)
+         *  13.5ms per byte     +
+         * >15ms delay          +
+         *  12.5ms burst        +
+         * >15ms delay            (XXX determine if FW does this, see set_tone)
+         */
+        msleep( (state->dsec_cmd.args[CX24116_DISEQC_MSGLEN] << 4) + 60 );
+
+        return 0;
+}
+
+static void cx24116_release(struct dvb_frontend* fe)
+{
+        struct cx24116_state* state = fe->demodulator_priv;
+        dprintk("%s\n",__func__);
+        kfree(state);
+}
+
+static struct dvb_frontend_ops cx24116_ops;
+
+struct dvb_frontend* cx24116_attach(const struct cx24116_config* config,
+                                    struct i2c_adapter* i2c)
+{
+        struct cx24116_state* state = NULL;
+        int ret;
+
+        dprintk("%s\n",__func__);
+
+        /* allocate memory for the internal state */
+        state = kmalloc(sizeof(struct cx24116_state), GFP_KERNEL);
+        if (state == NULL) {
+                printk("Unable to kmalloc\n");
+                goto error1;
+        }
+
+        /* setup the state */
+        memset(state, 0, sizeof(struct cx24116_state));
+
+        state->config = config;
+        state->i2c = i2c;
+
+        /* check if the demod is present */
+        ret = (cx24116_readreg(state, 0xFF) << 8) | cx24116_readreg(state, 0xFE);
+        if (ret != 0x0501) {
+                printk("Invalid probe, probably not a CX24116 device\n");
+                goto error2;
+        }
+
+        /* create dvb_frontend */
+        memcpy(&state->frontend.ops, &cx24116_ops, sizeof(struct dvb_frontend_ops));
+        state->frontend.demodulator_priv = state;
+        return &state->frontend;
+
+error2: kfree(state);
+error1: return NULL;
+}
+/*
+ * Initialise or wake up device
+ *
+ * Power config will reset and load initial firmware if required
+ */
+static int cx24116_initfe(struct dvb_frontend* fe)
+{
+        struct cx24116_state* state = fe->demodulator_priv;
+        struct cx24116_cmd cmd;
+        int ret;
+
+        dprintk("%s()\n",__func__);
+
+        /* Power on */
+        cx24116_writereg(state, 0xe0, 0);
+        cx24116_writereg(state, 0xe1, 0);
+        cx24116_writereg(state, 0xea, 0);
+
+        /* Firmware CMD 36: Power config */
+        cmd.args[0x00] = CMD_TUNERSLEEP;
+        cmd.args[0x01] = 0;
+        cmd.len= 0x02;
+        ret = cx24116_cmd_execute(fe, &cmd);
+        if(ret != 0)
+                return ret;
+
+        return cx24116_diseqc_init(fe);
+}
+
+/*
+ * Put device to sleep
+ */
+static int cx24116_sleep(struct dvb_frontend* fe)
+{
+        struct cx24116_state* state = fe->demodulator_priv;
+        struct cx24116_cmd cmd;
+        int ret;
+
+        dprintk("%s()\n",__func__);
+
+        /* Firmware CMD 36: Power config */
+        cmd.args[0x00] = CMD_TUNERSLEEP;
+        cmd.args[0x01] = 1;
+        cmd.len= 0x02;
+        ret = cx24116_cmd_execute(fe, &cmd);
+        if(ret != 0)
+                return ret;
+
+        /* Power off (Shutdown clocks) */
+        cx24116_writereg(state, 0xea, 0xff);
+        cx24116_writereg(state, 0xe1, 1);
+        cx24116_writereg(state, 0xe0, 1);
+
+        return 0;
+}
+
+static int cx24116_set_property(struct dvb_frontend *fe, struct dtv_property* tvp)
+{
+        dprintk("%s(..)\n", __func__);
+        return 0;
+}
+
+static int cx24116_get_property(struct dvb_frontend *fe, struct dtv_property* tvp)
+{
+        dprintk("%s(..)\n", __func__);
+        return 0;
+}
+
+/* dvb-core told us to tune, the tv property cache will be complete,
+ * it's safe for is to pull values and use them for tuning purposes.
+ */
+static int cx24116_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
+{
+        struct cx24116_state *state = fe->demodulator_priv;
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
+        struct cx24116_cmd cmd;
+        fe_status_t tunerstat;
+        int i, status, ret, retune;
+
+        dprintk("%s()\n",__func__);
+
+        switch(c->delivery_system) {
+                case SYS_DVBS:
+                        dprintk("%s: DVB-S delivery system selected\n",__func__);
+
+                        /* Only QPSK is supported for DVB-S */
+                        if(c->modulation != QPSK) {
+                                dprintk("%s: unsupported modulation selected (%d)\n",
+                                        __func__, c->modulation);
+                                return -EOPNOTSUPP;
+                        }
+
+                        /* Pilot doesn't exist in DVB-S, turn bit off */
+                        state->dnxt.pilot_val = CX24116_PILOT_OFF;
+                        retune = 1;
+
+                        /* DVB-S only supports 0.35 */
+                        if(c->rolloff != ROLLOFF_35) {
+                                dprintk("%s: unsupported rolloff selected (%d)\n",
+                                        __func__, c->rolloff);
+                                return -EOPNOTSUPP;
+                        }
+                        state->dnxt.rolloff_val = CX24116_ROLLOFF_035;
+                        break;
+
+                case SYS_DVBS2:
+                        dprintk("%s: DVB-S2 delivery system selected\n",__func__);
+
+                        /*
+                         * NBC 8PSK/QPSK with DVB-S is supported for DVB-S2,
+                         * but not hardware auto detection
+                         */
+                        if(c->modulation != PSK_8 && c->modulation != QPSK) {
+                                dprintk("%s: unsupported modulation selected (%d)\n",
+                                        __func__, c->modulation);
+                                return -EOPNOTSUPP;
+                        }
+
+                        switch(c->pilot) {
+                                case PILOT_AUTO:        /* Not supported but emulated */
+                                        retune = 2;     /* Fall-through */
+                                case PILOT_OFF:
+                                        state->dnxt.pilot_val = CX24116_PILOT_OFF;
+                                        break;
+                                case PILOT_ON:
+                                        state->dnxt.pilot_val = CX24116_PILOT_ON;
+                                        break;
+                                default:
+                                        dprintk("%s: unsupported pilot mode selected (%d)\n",
+                                                __func__, c->pilot);
+                                        return -EOPNOTSUPP;
+                        }
+
+                        switch(c->rolloff) {
+                                case ROLLOFF_20:
+                                        state->dnxt.rolloff_val= CX24116_ROLLOFF_020;
+                                        break;
+                                case ROLLOFF_25:
+                                        state->dnxt.rolloff_val= CX24116_ROLLOFF_025;
+                                        break;
+                                case ROLLOFF_35:
+                                        state->dnxt.rolloff_val= CX24116_ROLLOFF_035;
+                                        break;
+                                case ROLLOFF_AUTO:      /* Rolloff must be explicit */
+                                default:
+                                        dprintk("%s: unsupported rolloff selected (%d)\n",
+                                                __func__, c->rolloff);
+                                        return -EOPNOTSUPP;
+                        }
+                        break;
+
+                default:
+                        dprintk("%s: unsupported delivery system selected (%d)\n",
+                                __func__, c->delivery_system);
+                        return -EOPNOTSUPP;
+        }
+        state->dnxt.modulation = c->modulation;
+        state->dnxt.frequency = c->frequency;
+        state->dnxt.pilot = c->pilot;
+        state->dnxt.rolloff = c->rolloff;
+
+        if ((ret = cx24116_set_inversion(state, c->inversion)) !=  0)
+                return ret;
+
+        /* FEC_NONE/AUTO for DVB-S2 is not supported and detected here */
+        if ((ret = cx24116_set_fec(state, c->modulation, c->fec_inner)) !=  0)
+                return ret;
+
+        if ((ret = cx24116_set_symbolrate(state, c->symbol_rate)) !=  0)
+                return ret;
+
+        /* discard the 'current' tuning parameters and prepare to tune */
+        cx24116_clone_params(fe);
+
+        dprintk("%s:   modulation  = %d\n", __func__, state->dcur.modulation);
+        dprintk("%s:   frequency   = %d\n", __func__, state->dcur.frequency);
+        dprintk("%s:   pilot       = %d (val = 0x%02x)\n", __func__,
+                state->dcur.pilot, state->dcur.pilot_val);
+        dprintk("%s:   retune      = %d\n", __func__, retune);
+        dprintk("%s:   rolloff     = %d (val = 0x%02x)\n", __func__,
+                state->dcur.rolloff, state->dcur.rolloff_val);
+        dprintk("%s:   symbol_rate = %d\n", __func__, state->dcur.symbol_rate);
+        dprintk("%s:   FEC         = %d (mask/val = 0x%02x/0x%02x)\n", __func__,
+                state->dcur.fec, state->dcur.fec_mask, state->dcur.fec_val);
+        dprintk("%s:   Inversion   = %d (val = 0x%02x)\n", __func__,
+                state->dcur.inversion, state->dcur.inversion_val);
+
+        /* This is also done in advise/acquire on HVR4000 but not on LITE */
+        if (state->config->set_ts_params)
+                state->config->set_ts_params(fe, 0);
+
+        /* Set/Reset B/W */
+        cmd.args[0x00] = CMD_BANDWIDTH;
+        cmd.args[0x01] = 0x01;
+        cmd.len= 0x02;
+        ret = cx24116_cmd_execute(fe, &cmd);
+        if (ret != 0)
+                return ret;
+
+        /* Prepare a tune request */
+        cmd.args[0x00] = CMD_TUNEREQUEST;
+
+        /* Frequency */
+        cmd.args[0x01] = (state->dcur.frequency & 0xff0000) >> 16;
+        cmd.args[0x02] = (state->dcur.frequency & 0x00ff00) >> 8;
+        cmd.args[0x03] = (state->dcur.frequency & 0x0000ff);
+
+        /* Symbol Rate */
+        cmd.args[0x04] = ((state->dcur.symbol_rate / 1000) & 0xff00) >> 8;
+        cmd.args[0x05] = ((state->dcur.symbol_rate / 1000) & 0x00ff);
+
+        /* Automatic Inversion */
+        cmd.args[0x06] = state->dcur.inversion_val;
+
+        /* Modulation / FEC / Pilot */
+        cmd.args[0x07] = state->dcur.fec_val | state->dcur.pilot_val;
+
+        cmd.args[0x08] = CX24116_SEARCH_RANGE_KHZ >> 8;
+        cmd.args[0x09] = CX24116_SEARCH_RANGE_KHZ & 0xff;
+        cmd.args[0x0a] = 0x00;
+        cmd.args[0x0b] = 0x00;
+        cmd.args[0x0c] = state->dcur.rolloff_val;
+        cmd.args[0x0d] = state->dcur.fec_mask;
+
+        if (state->dcur.symbol_rate > 30000000) {
+                cmd.args[0x0e] = 0x04;
+                cmd.args[0x0f] = 0x00;
+                cmd.args[0x10] = 0x01;
+                cmd.args[0x11] = 0x77;
+                cmd.args[0x12] = 0x36;
+                cx24116_writereg(state, CX24116_REG_CLKDIV, 0x44);
+                cx24116_writereg(state, CX24116_REG_RATEDIV, 0x01);
+        } else {
+                cmd.args[0x0e] = 0x06;
+                cmd.args[0x0f] = 0x00;
+                cmd.args[0x10] = 0x00;
+                cmd.args[0x11] = 0xFA;
+                cmd.args[0x12] = 0x24;
+                cx24116_writereg(state, CX24116_REG_CLKDIV, 0x46);
+                cx24116_writereg(state, CX24116_REG_RATEDIV, 0x00);
+        }
+
+        cmd.len= 0x13;
+
+        /* We need to support pilot and non-pilot tuning in the
+         * driver automatically. This is a workaround for because
+         * the demod does not support autodetect.
+         */
+        do {
+                /* Reset status register */
+                status = cx24116_readreg(state, CX24116_REG_SSTATUS) & CX24116_SIGNAL_MASK;
+                cx24116_writereg(state, CX24116_REG_SSTATUS, status);
+
+                /* Tune */
+                ret = cx24116_cmd_execute(fe, &cmd);
+                if( ret != 0 )
+                        break;
+
+                /*
+                 * Wait for up to 500 ms before retrying
+                 *
+                 * If we are able to tune then generally it occurs within 100ms.
+                 * If it takes longer, try a different toneburst setting.
+                 */
+                for(i = 0; i < 50 ; i++) {
+                        cx24116_read_status(fe, &tunerstat);
+                        status = tunerstat & (FE_HAS_SIGNAL | FE_HAS_SYNC);
+                        if(status == (FE_HAS_SIGNAL | FE_HAS_SYNC)) {
+                                dprintk("%s: Tuned\n",__func__);
+                                goto tuned;
+                        }
+                        msleep(10);
+                }
+
+                dprintk("%s: Not tuned\n",__func__);
+
+                /* Toggle pilot bit when in auto-pilot */
+                if(state->dcur.pilot == PILOT_AUTO)
+                        cmd.args[0x07] ^= CX24116_PILOT_ON;
+        }
+        while(--retune);
+
+tuned:  /* Set/Reset B/W */
+        cmd.args[0x00] = CMD_BANDWIDTH;
+        cmd.args[0x01] = 0x00;
+        cmd.len= 0x02;
+        ret = cx24116_cmd_execute(fe, &cmd);
+        if (ret != 0)
+                return ret;
+
+        return ret;
+}
+
+static struct dvb_frontend_ops cx24116_ops = {
+
+        .info = {
+                .name = "Conexant CX24116/CX24118",
+                .type = FE_QPSK,
+                .frequency_min = 950000,
+                .frequency_max = 2150000,
+                .frequency_stepsize = 1011, /* kHz for QPSK frontends */
+                .frequency_tolerance = 5000,
+                .symbol_rate_min = 1000000,
+                .symbol_rate_max = 45000000,
+                .caps = FE_CAN_INVERSION_AUTO |
+                        FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
+                        FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 |
+                        FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
+                        FE_CAN_QPSK | FE_CAN_RECOVER
+        },
+
+        .release = cx24116_release,
+
+        .init = cx24116_initfe,
+        .sleep = cx24116_sleep,
+        .read_status = cx24116_read_status,
+        .read_ber = cx24116_read_ber,
+        .read_signal_strength = cx24116_read_signal_strength,
+        .read_snr = cx24116_read_snr,
+        .read_ucblocks = cx24116_read_ucblocks,
+        .set_tone = cx24116_set_tone,
+        .set_voltage = cx24116_set_voltage,
+        .diseqc_send_master_cmd = cx24116_send_diseqc_msg,
+        .diseqc_send_burst = cx24116_diseqc_send_burst,
+
+        .set_property = cx24116_set_property,
+        .get_property = cx24116_get_property,
+        .set_frontend = cx24116_set_frontend,
+};
+
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "Activates frontend debugging (default:0)");
+
+module_param(toneburst, int, 0644);
+MODULE_PARM_DESC(toneburst, "DiSEqC toneburst 0=OFF, 1=TONE CACHE, 2=MESSAGE CACHE (default:1)");
+
+module_param(esno_snr, int, 0644);
+MODULE_PARM_DESC(debug, "SNR return units, 0=PERCENTAGE 0-100, 1=ESNO(db * 10) (default:0)");
+
+MODULE_DESCRIPTION("DVB Frontend module for Conexant cx24116/cx24118 hardware");
+MODULE_AUTHOR("Steven Toth");
+MODULE_LICENSE("GPL");
+
+EXPORT_SYMBOL(cx24116_attach);
diff --git a/drivers/media/dvb/frontends/cx24116.h b/drivers/media/dvb/frontends/cx24116.h
new file mode 100644
index 000000000000..8dbcec268394
--- /dev/null
+++ b/drivers/media/dvb/frontends/cx24116.h
@@ -0,0 +1,53 @@
+/*
+    Conexant cx24116/cx24118 - DVBS/S2 Satellite demod/tuner driver
+
+    Copyright (C) 2006 Steven Toth <stoth@linuxtv.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 CX24116_H
+#define CX24116_H
+
+#include <linux/dvb/frontend.h>
+
+struct cx24116_config
+{
+        /* the demodulator's i2c address */
+        u8 demod_address;
+
+        /* Need to set device param for start_dma */
+        int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured);
+
+        /* Need to reset device during firmware loading */
+        int (*reset_device)(struct dvb_frontend* fe);
+
+        /* Need to set MPEG parameters */
+        u8 mpg_clk_pos_pol:0x02;
+};
+
+#if defined(CONFIG_DVB_CX24116) || defined(CONFIG_DVB_CX24116_MODULE)
+extern struct dvb_frontend* cx24116_attach(const struct cx24116_config* config,
+                                           struct i2c_adapter* i2c);
+#else
+static inline struct dvb_frontend* cx24116_attach(const struct cx24116_config* config,
+                                                  struct i2c_adapter* i2c)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+        return NULL;
+}
+#endif // CONFIG_DVB_CX24116
+
+#endif /* CX24116_H */
diff --git a/drivers/media/dvb/frontends/dib0070.h b/drivers/media/dvb/frontends/dib0070.h
index 3eedfdf505bc..21f2c5161af4 100644
--- a/drivers/media/dvb/frontends/dib0070.h
+++ b/drivers/media/dvb/frontends/dib0070.h
@@ -41,6 +41,7 @@ struct dib0070_config {
 extern struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe,
                                            struct i2c_adapter *i2c,
                                            struct dib0070_config *cfg);
+extern u16 dib0070_wbd_offset(struct dvb_frontend *);
 #else
 static inline struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe,
                                                   struct i2c_adapter *i2c,
@@ -49,9 +50,14 @@ static inline struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe,
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
         return NULL;
 }
+
+static inline u16 dib0070_wbd_offset(struct dvb_frontend *fe)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return -ENODEV;
+}
 #endif
 
 extern void dib0070_ctrl_agc_filter(struct dvb_frontend *, uint8_t open);
-extern u16 dib0070_wbd_offset(struct dvb_frontend *);
 
 #endif
diff --git a/drivers/media/dvb/frontends/dib7000m.c b/drivers/media/dvb/frontends/dib7000m.c
index 5f1375e30dfc..0109720353bd 100644
--- a/drivers/media/dvb/frontends/dib7000m.c
+++ b/drivers/media/dvb/frontends/dib7000m.c
@@ -1284,7 +1284,10 @@ struct i2c_adapter * dib7000m_get_i2c_master(struct dvb_frontend *demod, enum di
 }
 EXPORT_SYMBOL(dib7000m_get_i2c_master);
 
-int dib7000m_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 default_addr, struct dib7000m_config cfg[])
+#if 0
+/* used with some prototype boards */
+int dib7000m_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods,
+                u8 default_addr, struct dib7000m_config cfg[])
 {
         struct dib7000m_state st = { .i2c_adap = i2c };
         int k = 0;
@@ -1329,6 +1332,7 @@ int dib7000m_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 defau
         return 0;
 }
 EXPORT_SYMBOL(dib7000m_i2c_enumeration);
+#endif
 
 static struct dvb_frontend_ops dib7000m_ops;
 struct dvb_frontend * dib7000m_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000m_config *cfg)
diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c
index 1a0142e0d741..8217e5b38f47 100644
--- a/drivers/media/dvb/frontends/dib7000p.c
+++ b/drivers/media/dvb/frontends/dib7000p.c
@@ -1333,7 +1333,8 @@ struct dvb_frontend * dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr,
         /* Ensure the output mode remains at the previous default if it's
          * not specifically set by the caller.
          */
-        if (st->cfg.output_mode != OUTMODE_MPEG2_SERIAL)
+        if ((st->cfg.output_mode != OUTMODE_MPEG2_SERIAL) &&
+            (st->cfg.output_mode != OUTMODE_MPEG2_PAR_GATED_CLK))
                 st->cfg.output_mode = OUTMODE_MPEG2_FIFO;
 
         demod                   = &st->demod;
diff --git a/drivers/media/dvb/frontends/dib7000p.h b/drivers/media/dvb/frontends/dib7000p.h
index 07c4d12ed5b7..3e8126857127 100644
--- a/drivers/media/dvb/frontends/dib7000p.h
+++ b/drivers/media/dvb/frontends/dib7000p.h
@@ -41,6 +41,14 @@ struct dib7000p_config {
 extern struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap,
                                             u8 i2c_addr,
                                             struct dib7000p_config *cfg);
+extern struct i2c_adapter *dib7000p_get_i2c_master(struct dvb_frontend *,
+                                                   enum dibx000_i2c_interface,
+                                                   int);
+extern int dib7000p_i2c_enumeration(struct i2c_adapter *i2c,
+                                    int no_of_demods, u8 default_addr,
+                                    struct dib7000p_config cfg[]);
+extern int dib7000p_set_gpio(struct dvb_frontend *, u8 num, u8 dir, u8 val);
+extern int dib7000p_set_wbd_ref(struct dvb_frontend *, u16 value);
 #else
 static inline struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap,
                                                    u8 i2c_addr,
@@ -49,13 +57,36 @@ static inline struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap,
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
         return NULL;
 }
-#endif
 
-extern int dib7000p_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 default_addr, struct dib7000p_config cfg[]);
+static inline
+struct i2c_adapter *dib7000p_get_i2c_master(struct dvb_frontend *fe,
+                                            enum dibx000_i2c_interface i, int x)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return NULL;
+}
+
+extern int dib7000p_i2c_enumeration(struct i2c_adapter *i2c,
+                                    int no_of_demods, u8 default_addr,
+                                    struct dib7000p_config cfg[])
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return -ENODEV;
+}
+
+extern int dib7000p_set_gpio(struct dvb_frontend *fe, u8 num, u8 dir, u8 val)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return -ENODEV;
+}
+
+extern int dib7000p_set_wbd_ref(struct dvb_frontend *fe, u16 value)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return -ENODEV;
+}
+#endif
 
-extern struct i2c_adapter * dib7000p_get_i2c_master(struct dvb_frontend *, enum dibx000_i2c_interface, int);
 extern int dib7000pc_detection(struct i2c_adapter *i2c_adap);
-extern int dib7000p_set_gpio(struct dvb_frontend *, u8 num, u8 dir, u8 val);
-extern int dib7000p_set_wbd_ref(struct dvb_frontend *, u16 value);
 
 #endif
diff --git a/drivers/media/dvb/frontends/drx397xD.c b/drivers/media/dvb/frontends/drx397xD.c
index 3cbed874a6f8..b9ca5c8d2dd9 100644
--- a/drivers/media/dvb/frontends/drx397xD.c
+++ b/drivers/media/dvb/frontends/drx397xD.c
@@ -38,35 +38,32 @@ static const char mod_name[] = "drx397xD";
 #define F_SET_0D0h      1
 #define F_SET_0D4h      2
 
-typedef enum fw_ix {
+enum fw_ix {
 #define _FW_ENTRY(a, b)         b
 #include "drx397xD_fw.h"
-} fw_ix_t;
+};
 
 /* chip specifics */
 struct drx397xD_state {
         struct i2c_adapter *i2c;
         struct dvb_frontend frontend;
         struct drx397xD_config config;
-        fw_ix_t chip_rev;
+        enum fw_ix chip_rev;
         int flags;
         u32 bandwidth_parm;     /* internal bandwidth conversions */
         u32 f_osc;              /* w90: actual osc frequency [Hz] */
 };
 
-/*******************************************************************************
- * Firmware
- ******************************************************************************/
-
+/* Firmware */
 static const char *blob_name[] = {
 #define _BLOB_ENTRY(a, b)               a
 #include "drx397xD_fw.h"
 };
 
-typedef enum blob_ix {
+enum blob_ix {
 #define _BLOB_ENTRY(a, b)               b
 #include "drx397xD_fw.h"
-} blob_ix_t;
+};
 
 static struct {
         const char *name;
@@ -85,7 +82,7 @@ static struct {
 };
 
 /* use only with writer lock aquired */
-static void _drx_release_fw(struct drx397xD_state *s, fw_ix_t ix)
+static void _drx_release_fw(struct drx397xD_state *s, enum fw_ix ix)
 {
         memset(&fw[ix].data[0], 0, sizeof(fw[0].data));
         if (fw[ix].file)
@@ -94,9 +91,9 @@ static void _drx_release_fw(struct drx397xD_state *s, fw_ix_t ix)
 
 static void drx_release_fw(struct drx397xD_state *s)
 {
-        fw_ix_t ix = s->chip_rev;
+        enum fw_ix ix = s->chip_rev;
 
-        pr_debug("%s\n", __FUNCTION__);
+        pr_debug("%s\n", __func__);
 
         write_lock(&fw[ix].lock);
         if (fw[ix].refcnt) {
@@ -107,13 +104,13 @@ static void drx_release_fw(struct drx397xD_state *s)
         write_unlock(&fw[ix].lock);
 }
 
-static int drx_load_fw(struct drx397xD_state *s, fw_ix_t ix)
+static int drx_load_fw(struct drx397xD_state *s, enum fw_ix ix)
 {
         const u8 *data;
         size_t size, len;
         int i = 0, j, rc = -EINVAL;
 
-        pr_debug("%s\n", __FUNCTION__);
+        pr_debug("%s\n", __func__);
 
         if (ix < 0 || ix >= ARRAY_SIZE(fw))
                 return -EINVAL;
@@ -175,32 +172,34 @@ static int drx_load_fw(struct drx397xD_state *s, fw_ix_t ix)
                         goto exit_corrupt;
                 }
         } while (i < size);
-      exit_corrupt:
+
+exit_corrupt:
         printk(KERN_ERR "%s: Firmware is corrupt\n", mod_name);
-      exit_err:
+exit_err:
         _drx_release_fw(s, ix);
         fw[ix].refcnt--;
-      exit_ok:
+exit_ok:
         fw[ix].refcnt++;
         write_unlock(&fw[ix].lock);
+
         return rc;
 }
 
-/*******************************************************************************
- * i2c bus IO
- ******************************************************************************/
-
-static int write_fw(struct drx397xD_state *s, blob_ix_t ix)
+/* i2c bus IO */
+static int write_fw(struct drx397xD_state *s, enum blob_ix ix)
 {
-        struct i2c_msg msg = {.addr = s->config.demod_address,.flags = 0 };
         const u8 *data;
         int len, rc = 0, i = 0;
+        struct i2c_msg msg = {
+                .addr = s->config.demod_address,
+                .flags = 0
+        };
 
         if (ix < 0 || ix >= ARRAY_SIZE(blob_name)) {
-                pr_debug("%s drx_fw_ix_t out of range\n", __FUNCTION__);
+                pr_debug("%s drx_fw_ix_t out of range\n", __func__);
                 return -EINVAL;
         }
-        pr_debug("%s %s\n", __FUNCTION__, blob_name[ix]);
+        pr_debug("%s %s\n", __func__, blob_name[ix]);
 
         read_lock(&fw[s->chip_rev].lock);
         data = fw[s->chip_rev].data[ix];
@@ -229,33 +228,33 @@ static int write_fw(struct drx397xD_state *s, blob_ix_t ix)
                         goto exit_rc;
                 }
         }
-      exit_rc:
+exit_rc:
         read_unlock(&fw[s->chip_rev].lock);
+
         return 0;
 }
 
 /* Function is not endian safe, use the RD16 wrapper below */
-static int _read16(struct drx397xD_state *s, u32 i2c_adr)
+static int _read16(struct drx397xD_state *s, __le32 i2c_adr)
 {
         int rc;
         u8 a[4];
-        u16 v;
+        __le16 v;
         struct i2c_msg msg[2] = {
                 {
-                 .addr = s->config.demod_address,
-                 .flags = 0,
-                 .buf = a,
-                 .len = sizeof(a)
-                 }
-                , {
-                   .addr = s->config.demod_address,
-                   .flags = I2C_M_RD,
-                   .buf = (u8 *) & v,
-                   .len = sizeof(v)
-                   }
+                        .addr = s->config.demod_address,
+                        .flags = 0,
+                        .buf = a,
+                        .len = sizeof(a)
+                }, {
+                        .addr = s->config.demod_address,
+                        .flags = I2C_M_RD,
+                        .buf = (u8 *)&v,
+                        .len = sizeof(v)
+                }
         };
 
-        *(u32 *) a = i2c_adr;
+        *(__le32 *) a = i2c_adr;
 
         rc = i2c_transfer(s->i2c, msg, 2);
         if (rc != 2)
@@ -265,7 +264,7 @@ static int _read16(struct drx397xD_state *s, u32 i2c_adr)
 }
 
 /* Function is not endian safe, use the WR16.. wrappers below */
-static int _write16(struct drx397xD_state *s, u32 i2c_adr, u16 val)
+static int _write16(struct drx397xD_state *s, __le32 i2c_adr, __le16 val)
 {
         u8 a[6];
         int rc;
@@ -276,28 +275,28 @@ static int _write16(struct drx397xD_state *s, u32 i2c_adr, u16 val)
                 .len = sizeof(a)
         };
 
-        *(u32 *) a = i2c_adr;
-        *(u16 *) & a[4] = val;
+        *(__le32 *)a = i2c_adr;
+        *(__le16 *)&a[4] = val;
 
         rc = i2c_transfer(s->i2c, &msg, 1);
         if (rc != 1)
                 return -EIO;
+
         return 0;
 }
 
-#define WR16(ss,adr, val) \
+#define WR16(ss, adr, val) \
                 _write16(ss, I2C_ADR_C0(adr), cpu_to_le16(val))
-#define WR16_E0(ss,adr, val) \
+#define WR16_E0(ss, adr, val) \
                 _write16(ss, I2C_ADR_E0(adr), cpu_to_le16(val))
-#define RD16(ss,adr) \
+#define RD16(ss, adr) \
                 _read16(ss, I2C_ADR_C0(adr))
 
-#define EXIT_RC( cmd )  if ( (rc = (cmd)) < 0) goto exit_rc
-
-/*******************************************************************************
- * Tuner callback
- ******************************************************************************/
+#define EXIT_RC(cmd)    \
+        if ((rc = (cmd)) < 0)   \
+                goto exit_rc
 
+/* Tuner callback */
 static int PLL_Set(struct drx397xD_state *s,
                    struct dvb_frontend_parameters *fep, int *df_tuner)
 {
@@ -305,7 +304,7 @@ static int PLL_Set(struct drx397xD_state *s,
         u32 f_tuner, f = fep->frequency;
         int rc;
 
-        pr_debug("%s\n", __FUNCTION__);
+        pr_debug("%s\n", __func__);
 
         if ((f > s->frontend.ops.tuner_ops.info.frequency_max) ||
             (f < s->frontend.ops.tuner_ops.info.frequency_min))
@@ -325,28 +324,26 @@ static int PLL_Set(struct drx397xD_state *s,
                 return rc;
 
         *df_tuner = f_tuner - f;
-        pr_debug("%s requested %d [Hz] tuner %d [Hz]\n", __FUNCTION__, f,
+        pr_debug("%s requested %d [Hz] tuner %d [Hz]\n", __func__, f,
                  f_tuner);
 
         return 0;
 }
 
-/*******************************************************************************
- * Demodulator helper functions
- ******************************************************************************/
-
+/* Demodulator helper functions */
 static int SC_WaitForReady(struct drx397xD_state *s)
 {
         int cnt = 1000;
         int rc;
 
-        pr_debug("%s\n", __FUNCTION__);
+        pr_debug("%s\n", __func__);
 
         while (cnt--) {
                 rc = RD16(s, 0x820043);
                 if (rc == 0)
                         return 0;
         }
+
         return -1;
 }
 
@@ -354,13 +351,14 @@ static int SC_SendCommand(struct drx397xD_state *s, int cmd)
 {
         int rc;
 
-        pr_debug("%s\n", __FUNCTION__);
+        pr_debug("%s\n", __func__);
 
         WR16(s, 0x820043, cmd);
         SC_WaitForReady(s);
         rc = RD16(s, 0x820042);
         if ((rc & 0xffff) == 0xffff)
                 return -1;
+
         return 0;
 }
 
@@ -368,7 +366,7 @@ static int HI_Command(struct drx397xD_state *s, u16 cmd)
 {
         int rc, cnt = 1000;
 
-        pr_debug("%s\n", __FUNCTION__);
+        pr_debug("%s\n", __func__);
 
         rc = WR16(s, 0x420032, cmd);
         if (rc < 0)
@@ -383,22 +381,24 @@ static int HI_Command(struct drx397xD_state *s, u16 cmd)
                 if (rc < 0)
                         return rc;
         } while (--cnt);
+
         return rc;
 }
 
 static int HI_CfgCommand(struct drx397xD_state *s)
 {
 
-        pr_debug("%s\n", __FUNCTION__);
+        pr_debug("%s\n", __func__);
 
         WR16(s, 0x420033, 0x3973);
-        WR16(s, 0x420034, s->config.w50);       // code 4, log 4
-        WR16(s, 0x420035, s->config.w52);       // code 15,  log 9
+        WR16(s, 0x420034, s->config.w50);       /* code 4, log 4 */
+        WR16(s, 0x420035, s->config.w52);       /* code 15,  log 9 */
         WR16(s, 0x420036, s->config.demod_address << 1);
-        WR16(s, 0x420037, s->config.w56);       // code (set_i2c ??  initX 1 ), log 1
-//      WR16(s, 0x420033, 0x3973);
+        WR16(s, 0x420037, s->config.w56);       /* code (set_i2c ??  initX 1 ), log 1 */
+        /* WR16(s, 0x420033, 0x3973); */
         if ((s->config.w56 & 8) == 0)
                 return HI_Command(s, 3);
+
         return WR16(s, 0x420032, 0x3);
 }
 
@@ -419,7 +419,7 @@ static int SetCfgIfAgc(struct drx397xD_state *s, struct drx397xD_CfgIfAgc *agc)
         u16 w0C = agc->w0C;
         int quot, rem, i, rc = -EINVAL;
 
-        pr_debug("%s\n", __FUNCTION__);
+        pr_debug("%s\n", __func__);
 
         if (agc->w04 > 0x3ff)
                 goto exit_rc;
@@ -468,7 +468,7 @@ static int SetCfgIfAgc(struct drx397xD_state *s, struct drx397xD_CfgIfAgc *agc)
         i = slowIncrDecLUT_15272[rem / 28];
         EXIT_RC(WR16(s, 0x0c2002b, i));
         rc = WR16(s, 0x0c2002c, i);
-      exit_rc:
+exit_rc:
         return rc;
 }
 
@@ -478,7 +478,7 @@ static int SetCfgRfAgc(struct drx397xD_state *s, struct drx397xD_CfgRfAgc *agc)
         u16 w06 = agc->w06;
         int rc = -1;
 
-        pr_debug("%s %d 0x%x 0x%x\n", __FUNCTION__, agc->d00, w04, w06);
+        pr_debug("%s %d 0x%x 0x%x\n", __func__, agc->d00, w04, w06);
 
         if (w04 > 0x3ff)
                 goto exit_rc;
@@ -498,7 +498,7 @@ static int SetCfgRfAgc(struct drx397xD_state *s, struct drx397xD_CfgRfAgc *agc)
                 rc &= ~2;
                 break;
         case 0:
-                // loc_8000659
+                /* loc_8000659 */
                 s->config.w9C &= ~2;
                 EXIT_RC(WR16(s, 0x0c20015, s->config.w9C));
                 EXIT_RC(RD16(s, 0x0c20010));
@@ -522,7 +522,8 @@ static int SetCfgRfAgc(struct drx397xD_state *s, struct drx397xD_CfgRfAgc *agc)
                 rc |= 2;
         }
         rc = WR16(s, 0x0c20013, rc);
-      exit_rc:
+
+exit_rc:
         return rc;
 }
 
@@ -554,7 +555,7 @@ static int CorrectSysClockDeviation(struct drx397xD_state *s)
         int lockstat;
         u32 clk, clk_limit;
 
-        pr_debug("%s\n", __FUNCTION__);
+        pr_debug("%s\n", __func__);
 
         if (s->config.d5C == 0) {
                 EXIT_RC(WR16(s, 0x08200e8, 0x010));
@@ -598,11 +599,12 @@ static int CorrectSysClockDeviation(struct drx397xD_state *s)
 
         if (clk - s->config.f_osc * 1000 + clk_limit <= 2 * clk_limit) {
                 s->f_osc = clk;
-                pr_debug("%s: osc %d %d [Hz]\n", __FUNCTION__,
+                pr_debug("%s: osc %d %d [Hz]\n", __func__,
                          s->config.f_osc * 1000, clk - s->config.f_osc * 1000);
         }
         rc = WR16(s, 0x08200e8, 0);
-      exit_rc:
+
+exit_rc:
         return rc;
 }
 
@@ -610,7 +612,7 @@ static int ConfigureMPEGOutput(struct drx397xD_state *s, int type)
 {
         int rc, si, bp;
 
-        pr_debug("%s\n", __FUNCTION__);
+        pr_debug("%s\n", __func__);
 
         si = s->config.wA0;
         if (s->config.w98 == 0) {
@@ -620,17 +622,17 @@ static int ConfigureMPEGOutput(struct drx397xD_state *s, int type)
                 si &= ~1;
                 bp = 0x200;
         }
-        if (s->config.w9A == 0) {
+        if (s->config.w9A == 0)
                 si |= 0x80;
-        } else {
+        else
                 si &= ~0x80;
-        }
 
         EXIT_RC(WR16(s, 0x2150045, 0));
         EXIT_RC(WR16(s, 0x2150010, si));
         EXIT_RC(WR16(s, 0x2150011, bp));
         rc = WR16(s, 0x2150012, (type == 0 ? 0xfff : 0));
-      exit_rc:
+
+exit_rc:
         return rc;
 }
 
@@ -646,7 +648,7 @@ static int drx_tune(struct drx397xD_state *s,
 
         int rc, df_tuner;
         int a, b, c, d;
-        pr_debug("%s %d\n", __FUNCTION__, s->config.d60);
+        pr_debug("%s %d\n", __func__, s->config.d60);
 
         if (s->config.d60 != 2)
                 goto set_tuner;
@@ -658,7 +660,7 @@ static int drx_tune(struct drx397xD_state *s,
         rc = ConfigureMPEGOutput(s, 0);
         if (rc < 0)
                 goto set_tuner;
-      set_tuner:
+set_tuner:
 
         rc = PLL_Set(s, fep, &df_tuner);
         if (rc < 0) {
@@ -835,16 +837,16 @@ static int drx_tune(struct drx397xD_state *s,
                 rc = WR16(s, 0x2010012, 0);
                 if (rc < 0)
                         goto exit_rc;
-                //              QPSK    QAM16   QAM64
-                ebx = 0x19f;    //                 62
-                ebp = 0x1fb;    //                 15
-                v20 = 0x16a;    //  62
-                v1E = 0x195;    //         62
-                v16 = 0x1bb;    //  15
-                v14 = 0x1ef;    //         15
-                v12 = 5;        //  16
-                v10 = 5;        //         16
-                v0E = 5;        //                 16
+                                /* QPSK    QAM16  QAM64 */
+                ebx = 0x19f;    /*                 62   */
+                ebp = 0x1fb;    /*                 15   */
+                v20 = 0x16a;    /*  62                  */
+                v1E = 0x195;    /*         62           */
+                v16 = 0x1bb;    /*  15                  */
+                v14 = 0x1ef;    /*         15           */
+                v12 = 5;        /*  16                  */
+                v10 = 5;        /*         16           */
+                v0E = 5;        /*                 16   */
         }
 
         switch (fep->u.ofdm.constellation) {
@@ -997,17 +999,17 @@ static int drx_tune(struct drx397xD_state *s,
         case BANDWIDTH_8_MHZ:   /* 0 */
         case BANDWIDTH_AUTO:
                 rc = WR16(s, 0x0c2003f, 0x32);
-                s->bandwidth_parm = ebx = 0x8b8249;     // 9142857
+                s->bandwidth_parm = ebx = 0x8b8249;
                 edx = 0;
                 break;
         case BANDWIDTH_7_MHZ:
                 rc = WR16(s, 0x0c2003f, 0x3b);
-                s->bandwidth_parm = ebx = 0x7a1200;     // 8000000
+                s->bandwidth_parm = ebx = 0x7a1200;
                 edx = 0x4807;
                 break;
         case BANDWIDTH_6_MHZ:
                 rc = WR16(s, 0x0c2003f, 0x47);
-                s->bandwidth_parm = ebx = 0x68a1b6;     // 6857142
+                s->bandwidth_parm = ebx = 0x68a1b6;
                 edx = 0x0f07;
                 break;
         };
@@ -1060,8 +1062,6 @@ static int drx_tune(struct drx397xD_state *s,
         WR16(s, 0x0820040, 1);
         SC_SendCommand(s, 1);
 
-//      rc = WR16(s, 0x2150000, 1);
-//      if (rc < 0) goto exit_rc;
 
         rc = WR16(s, 0x2150000, 2);
         rc = WR16(s, 0x2150016, a);
@@ -1069,7 +1069,8 @@ static int drx_tune(struct drx397xD_state *s,
         rc = WR16(s, 0x2150036, 0);
         rc = WR16(s, 0x2150000, 1);
         s->config.d60 = 2;
-      exit_rc:
+
+exit_rc:
         return rc;
 }
 
@@ -1082,7 +1083,7 @@ static int drx397x_init(struct dvb_frontend *fe)
         struct drx397xD_state *s = fe->demodulator_priv;
         int rc;
 
-        pr_debug("%s\n", __FUNCTION__);
+        pr_debug("%s\n", __func__);
 
         s->config.rfagc.d00 = 2;        /* 0x7c */
         s->config.rfagc.w04 = 0;
@@ -1102,18 +1103,18 @@ static int drx397x_init(struct dvb_frontend *fe)
 
         /* HI_CfgCommand */
         s->config.w50 = 4;
-        s->config.w52 = 9;      // 0xf;
+        s->config.w52 = 9;
 
-        s->config.f_if = 42800000;      /* d14: intermediate frequency [Hz]     */
-        s->config.f_osc = 48000;        /* s66 : oscillator frequency [kHz]     */
-        s->config.w92 = 12000;  // 20000;
+        s->config.f_if = 42800000;      /* d14: intermediate frequency [Hz] */
+        s->config.f_osc = 48000;        /* s66 : oscillator frequency [kHz] */
+        s->config.w92 = 12000;
 
         s->config.w9C = 0x000e;
         s->config.w9E = 0x0000;
 
         /* ConfigureMPEGOutput params */
         s->config.wA0 = 4;
-        s->config.w98 = 1;      // 0;
+        s->config.w98 = 1;
         s->config.w9A = 1;
 
         /* get chip revision */
@@ -1248,7 +1249,7 @@ static int drx397x_init(struct dvb_frontend *fe)
                 rc = WR16(s, 0x0c20012, 1);
         }
 
-      write_DRXD_InitFE_1:
+write_DRXD_InitFE_1:
 
         rc = write_fw(s, DRXD_InitFE_1);
         if (rc < 0)
@@ -1311,7 +1312,8 @@ static int drx397x_init(struct dvb_frontend *fe)
         s->config.d5C = 0;
         s->config.d60 = 1;
         s->config.d48 = 1;
-      error:
+
+error:
         return rc;
 }
 
@@ -1326,7 +1328,8 @@ static int drx397x_set_frontend(struct dvb_frontend *fe,
 {
         struct drx397xD_state *s = fe->demodulator_priv;
 
-        s->config.s20d24 = 1;   // 0;
+        s->config.s20d24 = 1;
+
         return drx_tune(s, params);
 }
 
@@ -1337,18 +1340,16 @@ static int drx397x_get_tune_settings(struct dvb_frontend *fe,
         fe_tune_settings->min_delay_ms = 10000;
         fe_tune_settings->step_size = 0;
         fe_tune_settings->max_drift = 0;
+
         return 0;
 }
 
-static int drx397x_read_status(struct dvb_frontend *fe, fe_status_t * status)
+static int drx397x_read_status(struct dvb_frontend *fe, fe_status_t *status)
 {
         struct drx397xD_state *s = fe->demodulator_priv;
         int lockstat;
 
         GetLockStatus(s, &lockstat);
-        /* TODO */
-//      if (lockstat & 1)
-//      CorrectSysClockDeviation(s);
 
         *status = 0;
         if (lockstat & 2) {
@@ -1356,9 +1357,8 @@ static int drx397x_read_status(struct dvb_frontend *fe, fe_status_t * status)
                 ConfigureMPEGOutput(s, 1);
                 *status = FE_HAS_LOCK | FE_HAS_SYNC | FE_HAS_VITERBI;
         }
-        if (lockstat & 4) {
+        if (lockstat & 4)
                 *status |= FE_HAS_CARRIER | FE_HAS_SIGNAL;
-        }
 
         return 0;
 }
@@ -1366,16 +1366,18 @@ static int drx397x_read_status(struct dvb_frontend *fe, fe_status_t * status)
 static int drx397x_read_ber(struct dvb_frontend *fe, unsigned int *ber)
 {
         *ber = 0;
+
         return 0;
 }
 
-static int drx397x_read_snr(struct dvb_frontend *fe, u16 * snr)
+static int drx397x_read_snr(struct dvb_frontend *fe, u16 *snr)
 {
         *snr = 0;
+
         return 0;
 }
 
-static int drx397x_read_signal_strength(struct dvb_frontend *fe, u16 * strength)
+static int drx397x_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
 {
         struct drx397xD_state *s = fe->demodulator_priv;
         int rc;
@@ -1401,6 +1403,7 @@ static int drx397x_read_signal_strength(struct dvb_frontend *fe, u16 * strength)
          * The following does the same but with less rounding errors:
          */
         *strength = ~(7720 + (rc * 30744 >> 10));
+
         return 0;
 }
 
@@ -1408,6 +1411,7 @@ static int drx397x_read_ucblocks(struct dvb_frontend *fe,
                                  unsigned int *ucblocks)
 {
         *ucblocks = 0;
+
         return 0;
 }
 
@@ -1436,22 +1440,22 @@ static struct dvb_frontend_ops drx397x_ops = {
                  .frequency_max         = 855250000,
                  .frequency_stepsize    = 166667,
                  .frequency_tolerance   = 0,
-                 .caps =                                        /* 0x0C01B2EAE */
-                         FE_CAN_FEC_1_2                 |       // = 0x2,
-                         FE_CAN_FEC_2_3                 |       // = 0x4,
-                         FE_CAN_FEC_3_4                 |       // = 0x8,
-                         FE_CAN_FEC_5_6                 |       // = 0x20,
-                         FE_CAN_FEC_7_8                 |       // = 0x80,
-                         FE_CAN_FEC_AUTO                |       // = 0x200,
-                         FE_CAN_QPSK                    |       // = 0x400,
-                         FE_CAN_QAM_16                  |       // = 0x800,
-                         FE_CAN_QAM_64                  |       // = 0x2000,
-                         FE_CAN_QAM_AUTO                |       // = 0x10000,
-                         FE_CAN_TRANSMISSION_MODE_AUTO  |       // = 0x20000,
-                         FE_CAN_GUARD_INTERVAL_AUTO     |       // = 0x80000,
-                         FE_CAN_HIERARCHY_AUTO          |       // = 0x100000,
-                         FE_CAN_RECOVER                 |       // = 0x40000000,
-                         FE_CAN_MUTE_TS                         // = 0x80000000
+                 .caps =                                  /* 0x0C01B2EAE */
+                         FE_CAN_FEC_1_2                 | /* = 0x2, */
+                         FE_CAN_FEC_2_3                 | /* = 0x4, */
+                         FE_CAN_FEC_3_4                 | /* = 0x8, */
+                         FE_CAN_FEC_5_6                 | /* = 0x20, */
+                         FE_CAN_FEC_7_8                 | /* = 0x80, */
+                         FE_CAN_FEC_AUTO                | /* = 0x200, */
+                         FE_CAN_QPSK                    | /* = 0x400, */
+                         FE_CAN_QAM_16                  | /* = 0x800, */
+                         FE_CAN_QAM_64                  | /* = 0x2000, */
+                         FE_CAN_QAM_AUTO                | /* = 0x10000, */
+                         FE_CAN_TRANSMISSION_MODE_AUTO  | /* = 0x20000, */
+                         FE_CAN_GUARD_INTERVAL_AUTO     | /* = 0x80000, */
+                         FE_CAN_HIERARCHY_AUTO          | /* = 0x100000, */
+                         FE_CAN_RECOVER                 | /* = 0x40000000, */
+                         FE_CAN_MUTE_TS                   /* = 0x80000000 */
          },
 
         .release = drx397x_release,
@@ -1472,33 +1476,35 @@ static struct dvb_frontend_ops drx397x_ops = {
 struct dvb_frontend *drx397xD_attach(const struct drx397xD_config *config,
                                      struct i2c_adapter *i2c)
 {
-        struct drx397xD_state *s = NULL;
+        struct drx397xD_state *state;
 
         /* allocate memory for the internal state */
-        s = kzalloc(sizeof(struct drx397xD_state), GFP_KERNEL);
-        if (s == NULL)
+        state = kzalloc(sizeof(struct drx397xD_state), GFP_KERNEL);
+        if (!state)
                 goto error;
 
         /* setup the state */
-        s->i2c = i2c;
-        memcpy(&s->config, config, sizeof(struct drx397xD_config));
+        state->i2c = i2c;
+        memcpy(&state->config, config, sizeof(struct drx397xD_config));
 
         /* check if the demod is there */
-        if (RD16(s, 0x2410019) < 0)
+        if (RD16(state, 0x2410019) < 0)
                 goto error;
 
         /* create dvb_frontend */
-        memcpy(&s->frontend.ops, &drx397x_ops, sizeof(struct dvb_frontend_ops));
-        s->frontend.demodulator_priv = s;
+        memcpy(&state->frontend.ops, &drx397x_ops,
+                        sizeof(struct dvb_frontend_ops));
+        state->frontend.demodulator_priv = state;
+
+        return &state->frontend;
+error:
+        kfree(state);
 
-        return &s->frontend;
-      error:
-        kfree(s);
         return NULL;
 }
+EXPORT_SYMBOL(drx397xD_attach);
 
 MODULE_DESCRIPTION("Micronas DRX397xD DVB-T Frontend");
 MODULE_AUTHOR("Henk Vergonet");
 MODULE_LICENSE("GPL");
 
-EXPORT_SYMBOL(drx397xD_attach);
diff --git a/drivers/media/dvb/frontends/drx397xD.h b/drivers/media/dvb/frontends/drx397xD.h
index ddc7a07971b7..ba05d17290c6 100644
--- a/drivers/media/dvb/frontends/drx397xD.h
+++ b/drivers/media/dvb/frontends/drx397xD.h
@@ -28,7 +28,7 @@
 #define DRX_F_OFFSET    36000000
 
 #define I2C_ADR_C0(x) \
-(       (u32)cpu_to_le32( \
+(       cpu_to_le32( \
                 (u32)( \
                         (((u32)(x) & (u32)0x000000ffUL)      ) | \
                         (((u32)(x) & (u32)0x0000ff00UL) << 16) | \
@@ -38,7 +38,7 @@
 )
 
 #define I2C_ADR_E0(x) \
-(       (u32)cpu_to_le32( \
+(       cpu_to_le32( \
                 (u32)( \
                         (((u32)(x) & (u32)0x000000ffUL)      ) | \
                         (((u32)(x) & (u32)0x0000ff00UL) << 16) | \
@@ -122,7 +122,7 @@ extern struct dvb_frontend* drx397xD_attach(const struct drx397xD_config *config
 static inline struct dvb_frontend* drx397xD_attach(const struct drx397xD_config *config,
                                            struct i2c_adapter *i2c)
 {
-        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
         return NULL;
 }
 #endif /* CONFIG_DVB_DRX397XD */
diff --git a/drivers/media/dvb/frontends/dvb_dummy_fe.c b/drivers/media/dvb/frontends/dvb_dummy_fe.c
index fed09dfb2b7c..db8a937cc630 100644
--- a/drivers/media/dvb/frontends/dvb_dummy_fe.c
+++ b/drivers/media/dvb/frontends/dvb_dummy_fe.c
@@ -75,9 +75,10 @@ static int dvb_dummy_fe_get_frontend(struct dvb_frontend* fe, struct dvb_fronten
 
 static int dvb_dummy_fe_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
-        if (fe->ops->tuner_ops->set_params) {
-                fe->ops->tuner_ops->set_params(fe, p);
-                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+        if (fe->ops.tuner_ops.set_params) {
+                fe->ops.tuner_ops.set_params(fe, p);
+                if (fe->ops.i2c_gate_ctrl)
+                        fe->ops.i2c_gate_ctrl(fe, 0);
         }
 
         return 0;
@@ -131,7 +132,7 @@ error:
 
 static struct dvb_frontend_ops dvb_dummy_fe_qpsk_ops;
 
-struct dvb_frontend* dvb_dummy_fe_qpsk_attach()
+struct dvb_frontend *dvb_dummy_fe_qpsk_attach(void)
 {
         struct dvb_dummy_fe_state* state = NULL;
 
@@ -151,7 +152,7 @@ error:
 
 static struct dvb_frontend_ops dvb_dummy_fe_qam_ops;
 
-struct dvb_frontend* dvb_dummy_fe_qam_attach()
+struct dvb_frontend *dvb_dummy_fe_qam_attach(void)
 {
         struct dvb_dummy_fe_state* state = NULL;
 
diff --git a/drivers/media/dvb/frontends/eds1547.h b/drivers/media/dvb/frontends/eds1547.h
new file mode 100644
index 000000000000..fa79b7c83dd2
--- /dev/null
+++ b/drivers/media/dvb/frontends/eds1547.h
@@ -0,0 +1,133 @@
+/* eds1547.h Earda EDS-1547 tuner support
+*
+* Copyright (C) 2008 Igor M. Liplianin (liplianin@me.by)
+*
+*       This program is free software; you can redistribute it and/or modify it
+*       under the terms of the GNU General Public License as published by the
+*       Free Software Foundation, version 2.
+*
+* see Documentation/dvb/README.dvb-usb for more information
+*/
+
+#ifndef EDS1547
+#define EDS1547
+
+static u8 stv0288_earda_inittab[] = {
+        0x01, 0x57,
+        0x02, 0x20,
+        0x03, 0x8e,
+        0x04, 0x8e,
+        0x05, 0x12,
+        0x06, 0x00,
+        0x07, 0x00,
+        0x09, 0x00,
+        0x0a, 0x04,
+        0x0b, 0x00,
+        0x0c, 0x00,
+        0x0d, 0x00,
+        0x0e, 0xd4,
+        0x0f, 0x30,
+        0x11, 0x44,
+        0x12, 0x03,
+        0x13, 0x48,
+        0x14, 0x84,
+        0x15, 0x45,
+        0x16, 0xb7,
+        0x17, 0x9c,
+        0x18, 0x00,
+        0x19, 0xa6,
+        0x1a, 0x88,
+        0x1b, 0x8f,
+        0x1c, 0xf0,
+        0x20, 0x0b,
+        0x21, 0x54,
+        0x22, 0x00,
+        0x23, 0x00,
+        0x2b, 0xff,
+        0x2c, 0xf7,
+        0x30, 0x00,
+        0x31, 0x1e,
+        0x32, 0x14,
+        0x33, 0x0f,
+        0x34, 0x09,
+        0x35, 0x0c,
+        0x36, 0x05,
+        0x37, 0x2f,
+        0x38, 0x16,
+        0x39, 0xbd,
+        0x3a, 0x00,
+        0x3b, 0x13,
+        0x3c, 0x11,
+        0x3d, 0x30,
+        0x40, 0x63,
+        0x41, 0x04,
+        0x42, 0x60,
+        0x43, 0x00,
+        0x44, 0x00,
+        0x45, 0x00,
+        0x46, 0x00,
+        0x47, 0x00,
+        0x4a, 0x00,
+        0x50, 0x10,
+        0x51, 0x36,
+        0x52, 0x09,
+        0x53, 0x94,
+        0x54, 0x62,
+        0x55, 0x29,
+        0x56, 0x64,
+        0x57, 0x2b,
+        0x58, 0x54,
+        0x59, 0x86,
+        0x5a, 0x00,
+        0x5b, 0x9b,
+        0x5c, 0x08,
+        0x5d, 0x7f,
+        0x5e, 0x00,
+        0x5f, 0xff,
+        0x70, 0x00,
+        0x71, 0x00,
+        0x72, 0x00,
+        0x74, 0x00,
+        0x75, 0x00,
+        0x76, 0x00,
+        0x81, 0x00,
+        0x82, 0x3f,
+        0x83, 0x3f,
+        0x84, 0x00,
+        0x85, 0x00,
+        0x88, 0x00,
+        0x89, 0x00,
+        0x8a, 0x00,
+        0x8b, 0x00,
+        0x8c, 0x00,
+        0x90, 0x00,
+        0x91, 0x00,
+        0x92, 0x00,
+        0x93, 0x00,
+        0x94, 0x1c,
+        0x97, 0x00,
+        0xa0, 0x48,
+        0xa1, 0x00,
+        0xb0, 0xb8,
+        0xb1, 0x3a,
+        0xb2, 0x10,
+        0xb3, 0x82,
+        0xb4, 0x80,
+        0xb5, 0x82,
+        0xb6, 0x82,
+        0xb7, 0x82,
+        0xb8, 0x20,
+        0xb9, 0x00,
+        0xf0, 0x00,
+        0xf1, 0x00,
+        0xf2, 0xc0,
+        0xff,0xff,
+};
+
+static struct stv0288_config earda_config = {
+        .demod_address = 0x68,
+        .min_delay_ms = 100,
+        .inittab = stv0288_earda_inittab,
+};
+
+#endif
diff --git a/drivers/media/dvb/frontends/lgs8gl5.c b/drivers/media/dvb/frontends/lgs8gl5.c
new file mode 100644
index 000000000000..855852fddf22
--- /dev/null
+++ b/drivers/media/dvb/frontends/lgs8gl5.c
@@ -0,0 +1,454 @@
+/*
+    Legend Silicon LGS-8GL5 DMB-TH OFDM demodulator driver
+
+    Copyright (C) 2008 Sirius International (Hong Kong) Limited
+        Timothy Lee <timothy.lee@siriushk.com>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include "dvb_frontend.h"
+#include "lgs8gl5.h"
+
+
+#define REG_RESET               0x02
+#define REG_RESET_OFF                   0x01
+#define REG_03                  0x03
+#define REG_04                  0x04
+#define REG_07                  0x07
+#define REG_09                  0x09
+#define REG_0A                  0x0a
+#define REG_0B                  0x0b
+#define REG_0C                  0x0c
+#define REG_37                  0x37
+#define REG_STRENGTH            0x4b
+#define REG_STRENGTH_MASK               0x7f
+#define REG_STRENGTH_CARRIER            0x80
+#define REG_INVERSION           0x7c
+#define REG_INVERSION_ON                0x80
+#define REG_7D                  0x7d
+#define REG_7E                  0x7e
+#define REG_A2                  0xa2
+#define REG_STATUS              0xa4
+#define REG_STATUS_SYNC         0x04
+#define REG_STATUS_LOCK         0x01
+
+
+struct lgs8gl5_state {
+        struct i2c_adapter *i2c;
+        const struct lgs8gl5_config *config;
+        struct dvb_frontend frontend;
+};
+
+
+static int debug;
+#define dprintk(args...) \
+        do { \
+                if (debug) \
+                        printk(KERN_DEBUG "lgs8gl5: " args); \
+        } while (0)
+
+
+/* Writes into demod's register */
+static int
+lgs8gl5_write_reg(struct lgs8gl5_state *state, u8 reg, u8 data)
+{
+        int ret;
+        u8 buf[] = {reg, data};
+        struct i2c_msg msg = {
+                .addr  = state->config->demod_address,
+                .flags = 0,
+                .buf   = buf,
+                .len   = 2
+        };
+
+        ret = i2c_transfer(state->i2c, &msg, 1);
+        if (ret != 1)
+                dprintk("%s: error (reg=0x%02x, val=0x%02x, ret=%i)\n",
+                        __func__, reg, data, ret);
+        return (ret != 1) ? -1 : 0;
+}
+
+
+/* Reads from demod's register */
+static int
+lgs8gl5_read_reg(struct lgs8gl5_state *state, u8 reg)
+{
+        int ret;
+        u8 b0[] = {reg};
+        u8 b1[] = {0};
+        struct i2c_msg msg[2] = {
+                {
+                        .addr  = state->config->demod_address,
+                        .flags = 0,
+                        .buf   = b0,
+                        .len   = 1
+                },
+                {
+                        .addr  = state->config->demod_address,
+                        .flags = I2C_M_RD,
+                        .buf   = b1,
+                        .len   = 1
+                }
+        };
+
+        ret = i2c_transfer(state->i2c, msg, 2);
+        if (ret != 2)
+                return -EIO;
+
+        return b1[0];
+}
+
+
+static int
+lgs8gl5_update_reg(struct lgs8gl5_state *state, u8 reg, u8 data)
+{
+        lgs8gl5_read_reg(state, reg);
+        lgs8gl5_write_reg(state, reg, data);
+        return 0;
+}
+
+
+/* Writes into alternate device's register */
+/* TODO:  Find out what that device is for! */
+static int
+lgs8gl5_update_alt_reg(struct lgs8gl5_state *state, u8 reg, u8 data)
+{
+        int ret;
+        u8 b0[] = {reg};
+        u8 b1[] = {0};
+        u8 b2[] = {reg, data};
+        struct i2c_msg msg[3] = {
+                {
+                        .addr  = state->config->demod_address + 2,
+                        .flags = 0,
+                        .buf   = b0,
+                        .len   = 1
+                },
+                {
+                        .addr  = state->config->demod_address + 2,
+                        .flags = I2C_M_RD,
+                        .buf   = b1,
+                        .len   = 1
+                },
+                {
+                        .addr  = state->config->demod_address + 2,
+                        .flags = 0,
+                        .buf   = b2,
+                        .len   = 2
+                },
+        };
+
+        ret = i2c_transfer(state->i2c, msg, 3);
+        return (ret != 3) ? -1 : 0;
+}
+
+
+static void
+lgs8gl5_soft_reset(struct lgs8gl5_state *state)
+{
+        u8 val;
+
+        dprintk("%s\n", __func__);
+
+        val = lgs8gl5_read_reg(state, REG_RESET);
+        lgs8gl5_write_reg(state, REG_RESET, val & ~REG_RESET_OFF);
+        lgs8gl5_write_reg(state, REG_RESET, val | REG_RESET_OFF);
+        msleep(5);
+}
+
+
+/* Starts demodulation */
+static void
+lgs8gl5_start_demod(struct lgs8gl5_state *state)
+{
+        u8  val;
+        int n;
+
+        dprintk("%s\n", __func__);
+
+        lgs8gl5_update_alt_reg(state, 0xc2, 0x28);
+        lgs8gl5_soft_reset(state);
+        lgs8gl5_update_reg(state, REG_07, 0x10);
+        lgs8gl5_update_reg(state, REG_07, 0x10);
+        lgs8gl5_write_reg(state, REG_09, 0x0e);
+        lgs8gl5_write_reg(state, REG_0A, 0xe5);
+        lgs8gl5_write_reg(state, REG_0B, 0x35);
+        lgs8gl5_write_reg(state, REG_0C, 0x30);
+
+        lgs8gl5_update_reg(state, REG_03, 0x00);
+        lgs8gl5_update_reg(state, REG_7E, 0x01);
+        lgs8gl5_update_alt_reg(state, 0xc5, 0x00);
+        lgs8gl5_update_reg(state, REG_04, 0x02);
+        lgs8gl5_update_reg(state, REG_37, 0x01);
+        lgs8gl5_soft_reset(state);
+
+        /* Wait for carrier */
+        for (n = 0;  n < 10;  n++) {
+                val = lgs8gl5_read_reg(state, REG_STRENGTH);
+                dprintk("Wait for carrier[%d] 0x%02X\n", n, val);
+                if (val & REG_STRENGTH_CARRIER)
+                        break;
+                msleep(4);
+        }
+        if (!(val & REG_STRENGTH_CARRIER))
+                return;
+
+        /* Wait for lock */
+        for (n = 0;  n < 20;  n++) {
+                val = lgs8gl5_read_reg(state, REG_STATUS);
+                dprintk("Wait for lock[%d] 0x%02X\n", n, val);
+                if (val & REG_STATUS_LOCK)
+                        break;
+                msleep(12);
+        }
+        if (!(val & REG_STATUS_LOCK))
+                return;
+
+        lgs8gl5_write_reg(state, REG_7D, lgs8gl5_read_reg(state, REG_A2));
+        lgs8gl5_soft_reset(state);
+}
+
+
+static int
+lgs8gl5_init(struct dvb_frontend *fe)
+{
+        struct lgs8gl5_state *state = fe->demodulator_priv;
+
+        dprintk("%s\n", __func__);
+
+        lgs8gl5_update_alt_reg(state, 0xc2, 0x28);
+        lgs8gl5_soft_reset(state);
+        lgs8gl5_update_reg(state, REG_07, 0x10);
+        lgs8gl5_update_reg(state, REG_07, 0x10);
+        lgs8gl5_write_reg(state, REG_09, 0x0e);
+        lgs8gl5_write_reg(state, REG_0A, 0xe5);
+        lgs8gl5_write_reg(state, REG_0B, 0x35);
+        lgs8gl5_write_reg(state, REG_0C, 0x30);
+
+        return 0;
+}
+
+
+static int
+lgs8gl5_read_status(struct dvb_frontend *fe, fe_status_t *status)
+{
+        struct lgs8gl5_state *state = fe->demodulator_priv;
+        u8 level = lgs8gl5_read_reg(state, REG_STRENGTH);
+        u8 flags = lgs8gl5_read_reg(state, REG_STATUS);
+
+        *status = 0;
+
+        if ((level & REG_STRENGTH_MASK) > 0)
+                *status |= FE_HAS_SIGNAL;
+        if (level & REG_STRENGTH_CARRIER)
+                *status |= FE_HAS_CARRIER;
+        if (flags & REG_STATUS_SYNC)
+                *status |= FE_HAS_SYNC;
+        if (flags & REG_STATUS_LOCK)
+                *status |= FE_HAS_LOCK;
+
+        return 0;
+}
+
+
+static int
+lgs8gl5_read_ber(struct dvb_frontend *fe, u32 *ber)
+{
+        *ber = 0;
+
+        return 0;
+}
+
+
+static int
+lgs8gl5_read_signal_strength(struct dvb_frontend *fe, u16 *signal_strength)
+{
+        struct lgs8gl5_state *state = fe->demodulator_priv;
+        u8 level = lgs8gl5_read_reg(state, REG_STRENGTH);
+        *signal_strength = (level & REG_STRENGTH_MASK) << 8;
+
+        return 0;
+}
+
+
+static int
+lgs8gl5_read_snr(struct dvb_frontend *fe, u16 *snr)
+{
+        struct lgs8gl5_state *state = fe->demodulator_priv;
+        u8 level = lgs8gl5_read_reg(state, REG_STRENGTH);
+        *snr = (level & REG_STRENGTH_MASK) << 8;
+
+        return 0;
+}
+
+
+static int
+lgs8gl5_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
+{
+        *ucblocks = 0;
+
+        return 0;
+}
+
+
+static int
+lgs8gl5_set_frontend(struct dvb_frontend *fe,
+                struct dvb_frontend_parameters *p)
+{
+        struct lgs8gl5_state *state = fe->demodulator_priv;
+
+        dprintk("%s\n", __func__);
+
+        if (p->u.ofdm.bandwidth != BANDWIDTH_8_MHZ)
+                return -EINVAL;
+
+        if (fe->ops.tuner_ops.set_params) {
+                fe->ops.tuner_ops.set_params(fe, p);
+                if (fe->ops.i2c_gate_ctrl)
+                        fe->ops.i2c_gate_ctrl(fe, 0);
+        }
+
+        /* lgs8gl5_set_inversion(state, p->inversion); */
+
+        lgs8gl5_start_demod(state);
+
+        return 0;
+}
+
+
+static int
+lgs8gl5_get_frontend(struct dvb_frontend *fe,
+                struct dvb_frontend_parameters *p)
+{
+        struct lgs8gl5_state *state = fe->demodulator_priv;
+        u8 inv = lgs8gl5_read_reg(state, REG_INVERSION);
+        struct dvb_ofdm_parameters *o = &p->u.ofdm;
+
+        p->inversion = (inv & REG_INVERSION_ON) ? INVERSION_ON : INVERSION_OFF;
+
+        o->code_rate_HP = FEC_1_2;
+        o->code_rate_LP = FEC_7_8;
+        o->guard_interval = GUARD_INTERVAL_1_32;
+        o->transmission_mode = TRANSMISSION_MODE_2K;
+        o->constellation = QAM_64;
+        o->hierarchy_information = HIERARCHY_NONE;
+        o->bandwidth = BANDWIDTH_8_MHZ;
+
+        return 0;
+}
+
+
+static int
+lgs8gl5_get_tune_settings(struct dvb_frontend *fe,
+                struct dvb_frontend_tune_settings *fesettings)
+{
+        fesettings->min_delay_ms = 240;
+        fesettings->step_size    = 0;
+        fesettings->max_drift    = 0;
+        return 0;
+}
+
+
+static void
+lgs8gl5_release(struct dvb_frontend *fe)
+{
+        struct lgs8gl5_state *state = fe->demodulator_priv;
+        kfree(state);
+}
+
+
+static struct dvb_frontend_ops lgs8gl5_ops;
+
+
+struct dvb_frontend*
+lgs8gl5_attach(const struct lgs8gl5_config *config, struct i2c_adapter *i2c)
+{
+        struct lgs8gl5_state *state = NULL;
+
+        dprintk("%s\n", __func__);
+
+        /* Allocate memory for the internal state */
+        state = kmalloc(sizeof(struct lgs8gl5_state), GFP_KERNEL);
+        if (state == NULL)
+                goto error;
+
+        /* Setup the state */
+        state->config = config;
+        state->i2c    = i2c;
+
+        /* Check if the demod is there */
+        if (lgs8gl5_read_reg(state, REG_RESET) < 0)
+                goto error;
+
+        /* Create dvb_frontend */
+        memcpy(&state->frontend.ops, &lgs8gl5_ops,
+                sizeof(struct dvb_frontend_ops));
+        state->frontend.demodulator_priv = state;
+        return &state->frontend;
+
+error:
+        kfree(state);
+        return NULL;
+}
+EXPORT_SYMBOL(lgs8gl5_attach);
+
+
+static struct dvb_frontend_ops lgs8gl5_ops = {
+        .info = {
+                .name                   = "Legend Silicon LGS-8GL5 DMB-TH",
+                .type                   = FE_OFDM,
+                .frequency_min          = 474000000,
+                .frequency_max          = 858000000,
+                .frequency_stepsize     = 10000,
+                .frequency_tolerance    = 0,
+                .caps = FE_CAN_FEC_AUTO |
+                        FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_32 |
+                        FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
+                        FE_CAN_TRANSMISSION_MODE_AUTO |
+                        FE_CAN_BANDWIDTH_AUTO |
+                        FE_CAN_GUARD_INTERVAL_AUTO |
+                        FE_CAN_HIERARCHY_AUTO |
+                        FE_CAN_RECOVER
+        },
+
+        .release = lgs8gl5_release,
+
+        .init = lgs8gl5_init,
+
+        .set_frontend = lgs8gl5_set_frontend,
+        .get_frontend = lgs8gl5_get_frontend,
+        .get_tune_settings = lgs8gl5_get_tune_settings,
+
+        .read_status = lgs8gl5_read_status,
+        .read_ber = lgs8gl5_read_ber,
+        .read_signal_strength = lgs8gl5_read_signal_strength,
+        .read_snr = lgs8gl5_read_snr,
+        .read_ucblocks = lgs8gl5_read_ucblocks,
+};
+
+
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
+
+MODULE_DESCRIPTION("Legend Silicon LGS-8GL5 DMB-TH Demodulator driver");
+MODULE_AUTHOR("Timothy Lee");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/frontends/lgs8gl5.h b/drivers/media/dvb/frontends/lgs8gl5.h
new file mode 100644
index 000000000000..d14176787a7d
--- /dev/null
+++ b/drivers/media/dvb/frontends/lgs8gl5.h
@@ -0,0 +1,45 @@
+/*
+    Legend Silicon LGS-8GL5 DMB-TH OFDM demodulator driver
+
+    Copyright (C) 2008 Sirius International (Hong Kong) Limited
+        Timothy Lee <timothy.lee@siriushk.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 LGS8GL5_H
+#define LGS8GL5_H
+
+#include <linux/dvb/frontend.h>
+
+struct lgs8gl5_config {
+        /* the demodulator's i2c address */
+        u8 demod_address;
+};
+
+#if defined(CONFIG_DVB_LGS8GL5) || \
+        (defined(CONFIG_DVB_LGS8GL5_MODULE) && defined(MODULE))
+extern struct dvb_frontend *lgs8gl5_attach(
+        const struct lgs8gl5_config *config, struct i2c_adapter *i2c);
+#else
+static inline struct dvb_frontend *lgs8gl5_attach(
+        const struct lgs8gl5_config *config, struct i2c_adapter *i2c) {
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return NULL;
+}
+#endif /* CONFIG_DVB_LGS8GL5 */
+
+#endif /* LGS8GL5_H */
diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c
index af298358e822..a8429ebfa8a2 100644
--- a/drivers/media/dvb/frontends/nxt200x.c
+++ b/drivers/media/dvb/frontends/nxt200x.c
@@ -80,7 +80,7 @@ static int i2c_writebytes (struct nxt200x_state* state, u8 addr, u8 *buf, u8 len
         return 0;
 }
 
-static u8 i2c_readbytes (struct nxt200x_state* state, u8 addr, u8* buf, u8 len)
+static int 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 };
@@ -111,7 +111,7 @@ static int nxt200x_writebytes (struct nxt200x_state* state, u8 reg,
         return 0;
 }
 
-static u8 nxt200x_readbytes (struct nxt200x_state* state, u8 reg, u8* buf, u8 len)
+static int nxt200x_readbytes(struct nxt200x_state *state, u8 reg, u8 *buf, u8 len)
 {
         u8 reg2 [] = { reg };
 
diff --git a/drivers/media/dvb/frontends/or51211.c b/drivers/media/dvb/frontends/or51211.c
index 6afe12aaca4e..16cf2fdd5d7d 100644
--- a/drivers/media/dvb/frontends/or51211.c
+++ b/drivers/media/dvb/frontends/or51211.c
@@ -88,7 +88,7 @@ static int i2c_writebytes (struct or51211_state* state, u8 reg, const u8 *buf,
         return 0;
 }
 
-static u8 i2c_readbytes (struct or51211_state* state, u8 reg, u8* buf, int len)
+static int i2c_readbytes(struct or51211_state *state, u8 reg, u8 *buf, int len)
 {
         int err;
         struct i2c_msg msg;
diff --git a/drivers/media/dvb/frontends/si21xx.c b/drivers/media/dvb/frontends/si21xx.c
new file mode 100644
index 000000000000..3ddbe69c45ce
--- /dev/null
+++ b/drivers/media/dvb/frontends/si21xx.c
@@ -0,0 +1,974 @@
+/* DVB compliant Linux driver for the DVB-S si2109/2110 demodulator
+*
+* Copyright (C) 2008 Igor M. Liplianin (liplianin@me.by)
+*
+*       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.
+*
+*/
+#include <linux/version.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/jiffies.h>
+#include <asm/div64.h>
+
+#include "dvb_frontend.h"
+#include "si21xx.h"
+
+#define REVISION_REG                    0x00
+#define SYSTEM_MODE_REG                 0x01
+#define TS_CTRL_REG_1                   0x02
+#define TS_CTRL_REG_2                   0x03
+#define PIN_CTRL_REG_1                  0x04
+#define PIN_CTRL_REG_2                  0x05
+#define LOCK_STATUS_REG_1               0x0f
+#define LOCK_STATUS_REG_2               0x10
+#define ACQ_STATUS_REG                  0x11
+#define ACQ_CTRL_REG_1                  0x13
+#define ACQ_CTRL_REG_2                  0x14
+#define PLL_DIVISOR_REG                 0x15
+#define COARSE_TUNE_REG                 0x16
+#define FINE_TUNE_REG_L                 0x17
+#define FINE_TUNE_REG_H                 0x18
+
+#define ANALOG_AGC_POWER_LEVEL_REG      0x28
+#define CFO_ESTIMATOR_CTRL_REG_1        0x29
+#define CFO_ESTIMATOR_CTRL_REG_2        0x2a
+#define CFO_ESTIMATOR_CTRL_REG_3        0x2b
+
+#define SYM_RATE_ESTIMATE_REG_L         0x31
+#define SYM_RATE_ESTIMATE_REG_M         0x32
+#define SYM_RATE_ESTIMATE_REG_H         0x33
+
+#define CFO_ESTIMATOR_OFFSET_REG_L      0x36
+#define CFO_ESTIMATOR_OFFSET_REG_H      0x37
+#define CFO_ERROR_REG_L                 0x38
+#define CFO_ERROR_REG_H                 0x39
+#define SYM_RATE_ESTIMATOR_CTRL_REG     0x3a
+
+#define SYM_RATE_REG_L                  0x3f
+#define SYM_RATE_REG_M                  0x40
+#define SYM_RATE_REG_H                  0x41
+#define SYM_RATE_ESTIMATOR_MAXIMUM_REG  0x42
+#define SYM_RATE_ESTIMATOR_MINIMUM_REG  0x43
+
+#define C_N_ESTIMATOR_CTRL_REG          0x7c
+#define C_N_ESTIMATOR_THRSHLD_REG       0x7d
+#define C_N_ESTIMATOR_LEVEL_REG_L       0x7e
+#define C_N_ESTIMATOR_LEVEL_REG_H       0x7f
+
+#define BLIND_SCAN_CTRL_REG             0x80
+
+#define LSA_CTRL_REG_1                  0x8D
+#define SPCTRM_TILT_CORR_THRSHLD_REG    0x8f
+#define ONE_DB_BNDWDTH_THRSHLD_REG      0x90
+#define TWO_DB_BNDWDTH_THRSHLD_REG      0x91
+#define THREE_DB_BNDWDTH_THRSHLD_REG    0x92
+#define INBAND_POWER_THRSHLD_REG        0x93
+#define REF_NOISE_LVL_MRGN_THRSHLD_REG  0x94
+
+#define VIT_SRCH_CTRL_REG_1             0xa0
+#define VIT_SRCH_CTRL_REG_2             0xa1
+#define VIT_SRCH_CTRL_REG_3             0xa2
+#define VIT_SRCH_STATUS_REG             0xa3
+#define VITERBI_BER_COUNT_REG_L         0xab
+#define REED_SOLOMON_CTRL_REG           0xb0
+#define REED_SOLOMON_ERROR_COUNT_REG_L  0xb1
+#define PRBS_CTRL_REG                   0xb5
+
+#define LNB_CTRL_REG_1                  0xc0
+#define LNB_CTRL_REG_2                  0xc1
+#define LNB_CTRL_REG_3                  0xc2
+#define LNB_CTRL_REG_4                  0xc3
+#define LNB_CTRL_STATUS_REG             0xc4
+#define LNB_FIFO_REGS_0                 0xc5
+#define LNB_FIFO_REGS_1                 0xc6
+#define LNB_FIFO_REGS_2                 0xc7
+#define LNB_FIFO_REGS_3                 0xc8
+#define LNB_FIFO_REGS_4                 0xc9
+#define LNB_FIFO_REGS_5                 0xca
+#define LNB_SUPPLY_CTRL_REG_1           0xcb
+#define LNB_SUPPLY_CTRL_REG_2           0xcc
+#define LNB_SUPPLY_CTRL_REG_3           0xcd
+#define LNB_SUPPLY_CTRL_REG_4           0xce
+#define LNB_SUPPLY_STATUS_REG           0xcf
+
+#define FALSE   0
+#define TRUE    1
+#define FAIL    -1
+#define PASS    0
+
+#define ALLOWABLE_FS_COUNT      10
+#define STATUS_BER              0
+#define STATUS_UCBLOCKS         1
+
+static int debug;
+#define dprintk(args...) \
+        do { \
+                if (debug) \
+                        printk(KERN_DEBUG "si21xx: " args); \
+        } while (0)
+
+enum {
+        ACTIVE_HIGH,
+        ACTIVE_LOW
+};
+enum {
+        BYTE_WIDE,
+        BIT_WIDE
+};
+enum {
+        CLK_GAPPED_MODE,
+        CLK_CONTINUOUS_MODE
+};
+enum {
+        RISING_EDGE,
+        FALLING_EDGE
+};
+enum {
+        MSB_FIRST,
+        LSB_FIRST
+};
+enum {
+        SERIAL,
+        PARALLEL
+};
+
+struct si21xx_state {
+        struct i2c_adapter *i2c;
+        const struct si21xx_config *config;
+        struct dvb_frontend frontend;
+        u8 initialised:1;
+        int errmode;
+        int fs;                 /*Sampling rate of the ADC in MHz*/
+};
+
+/*      register default initialization */
+static u8 serit_sp1511lhb_inittab[] = {
+        0x01, 0x28,     /* set i2c_inc_disable */
+        0x20, 0x03,
+        0x27, 0x20,
+        0xe0, 0x45,
+        0xe1, 0x08,
+        0xfe, 0x01,
+        0x01, 0x28,
+        0x89, 0x09,
+        0x04, 0x80,
+        0x05, 0x01,
+        0x06, 0x00,
+        0x20, 0x03,
+        0x24, 0x88,
+        0x29, 0x09,
+        0x2a, 0x0f,
+        0x2c, 0x10,
+        0x2d, 0x19,
+        0x2e, 0x08,
+        0x2f, 0x10,
+        0x30, 0x19,
+        0x34, 0x20,
+        0x35, 0x03,
+        0x45, 0x02,
+        0x46, 0x45,
+        0x47, 0xd0,
+        0x48, 0x00,
+        0x49, 0x40,
+        0x4a, 0x03,
+        0x4c, 0xfd,
+        0x4f, 0x2e,
+        0x50, 0x2e,
+        0x51, 0x10,
+        0x52, 0x10,
+        0x56, 0x92,
+        0x59, 0x00,
+        0x5a, 0x2d,
+        0x5b, 0x33,
+        0x5c, 0x1f,
+        0x5f, 0x76,
+        0x62, 0xc0,
+        0x63, 0xc0,
+        0x64, 0xf3,
+        0x65, 0xf3,
+        0x79, 0x40,
+        0x6a, 0x40,
+        0x6b, 0x0a,
+        0x6c, 0x80,
+        0x6d, 0x27,
+        0x71, 0x06,
+        0x75, 0x60,
+        0x78, 0x00,
+        0x79, 0xb5,
+        0x7c, 0x05,
+        0x7d, 0x1a,
+        0x87, 0x55,
+        0x88, 0x72,
+        0x8f, 0x08,
+        0x90, 0xe0,
+        0x94, 0x40,
+        0xa0, 0x3f,
+        0xa1, 0xc0,
+        0xa4, 0xcc,
+        0xa5, 0x66,
+        0xa6, 0x66,
+        0xa7, 0x7b,
+        0xa8, 0x7b,
+        0xa9, 0x7b,
+        0xaa, 0x9a,
+        0xed, 0x04,
+        0xad, 0x00,
+        0xae, 0x03,
+        0xcc, 0xab,
+        0x01, 0x08,
+        0xff, 0xff
+};
+
+/*      low level read/writes */
+static int si21_writeregs(struct si21xx_state *state, u8 reg1,
+                                                        u8 *data, int len)
+{
+        int ret;
+        u8 buf[60];/* = { reg1, data };*/
+        struct i2c_msg msg = {
+                                .addr = state->config->demod_address,
+                                .flags = 0,
+                                .buf = buf,
+                                .len = len + 1
+        };
+
+        msg.buf[0] =  reg1;
+        memcpy(msg.buf + 1, data, len);
+
+        ret = i2c_transfer(state->i2c, &msg, 1);
+
+        if (ret != 1)
+                dprintk("%s: writereg error (reg1 == 0x%02x, data == 0x%02x, "
+                        "ret == %i)\n", __func__, reg1, data[0], ret);
+
+        return (ret != 1) ? -EREMOTEIO : 0;
+}
+
+static int si21_writereg(struct si21xx_state *state, u8 reg, u8 data)
+{
+        int ret;
+        u8 buf[] = { reg, data };
+        struct i2c_msg msg = {
+                                .addr = state->config->demod_address,
+                                .flags = 0,
+                                .buf = buf,
+                                .len = 2
+        };
+
+        ret = i2c_transfer(state->i2c, &msg, 1);
+
+        if (ret != 1)
+                dprintk("%s: writereg error (reg == 0x%02x, data == 0x%02x, "
+                        "ret == %i)\n", __func__, reg, data, ret);
+
+        return (ret != 1) ? -EREMOTEIO : 0;
+}
+
+static int si21_write(struct dvb_frontend *fe, u8 *buf, int len)
+{
+        struct si21xx_state *state = fe->demodulator_priv;
+
+        if (len != 2)
+                return -EINVAL;
+
+        return si21_writereg(state, buf[0], buf[1]);
+}
+
+static u8 si21_readreg(struct si21xx_state *state, u8 reg)
+{
+        int ret;
+        u8 b0[] = { reg };
+        u8 b1[] = { 0 };
+        struct i2c_msg msg[] = {
+                {
+                        .addr = state->config->demod_address,
+                        .flags = 0,
+                        .buf = b0,
+                        .len = 1
+                }, {
+                        .addr = state->config->demod_address,
+                        .flags = I2C_M_RD,
+                        .buf = b1,
+                        .len = 1
+                }
+        };
+
+        ret = i2c_transfer(state->i2c, msg, 2);
+
+        if (ret != 2)
+                dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n",
+                        __func__, reg, ret);
+
+        return b1[0];
+}
+
+static int si21_readregs(struct si21xx_state *state, u8 reg1, u8 *b, u8 len)
+{
+        int ret;
+        struct i2c_msg msg[] = {
+                {
+                        .addr = state->config->demod_address,
+                        .flags = 0,
+                        .buf = &reg1,
+                        .len = 1
+                }, {
+                        .addr = state->config->demod_address,
+                        .flags = I2C_M_RD,
+                        .buf = b,
+                        .len = len
+                }
+        };
+
+        ret = i2c_transfer(state->i2c, msg, 2);
+
+        if (ret != 2)
+                dprintk("%s: readreg error (ret == %i)\n", __func__, ret);
+
+        return ret == 2 ? 0 : -1;
+}
+
+static int si21xx_wait_diseqc_idle(struct si21xx_state *state, int timeout)
+{
+        unsigned long start = jiffies;
+
+        dprintk("%s\n", __func__);
+
+        while ((si21_readreg(state, LNB_CTRL_REG_1) & 0x8) == 8) {
+                if (jiffies - start > timeout) {
+                        dprintk("%s: timeout!!\n", __func__);
+                        return -ETIMEDOUT;
+                }
+                msleep(10);
+        };
+
+        return 0;
+}
+
+static int si21xx_set_symbolrate(struct dvb_frontend *fe, u32 srate)
+{
+        struct si21xx_state *state = fe->demodulator_priv;
+        u32 sym_rate, data_rate;
+        int i;
+        u8 sym_rate_bytes[3];
+
+        dprintk("%s : srate = %i\n", __func__ , srate);
+
+        if ((srate < 1000000) || (srate > 45000000))
+                return -EINVAL;
+
+        data_rate = srate;
+        sym_rate = 0;
+
+        for (i = 0; i < 4; ++i) {
+                sym_rate /= 100;
+                sym_rate = sym_rate + ((data_rate % 100) * 0x800000) /
+                                                                state->fs;
+                data_rate /= 100;
+        }
+        for (i = 0; i < 3; ++i)
+                sym_rate_bytes[i] = (u8)((sym_rate >> (i * 8)) & 0xff);
+
+        si21_writeregs(state, SYM_RATE_REG_L, sym_rate_bytes, 0x03);
+
+        return 0;
+}
+
+static int si21xx_send_diseqc_msg(struct dvb_frontend *fe,
+                                        struct dvb_diseqc_master_cmd *m)
+{
+        struct si21xx_state *state = fe->demodulator_priv;
+        u8 lnb_status;
+        u8 LNB_CTRL_1;
+        int status;
+
+        dprintk("%s\n", __func__);
+
+        status = PASS;
+        LNB_CTRL_1 = 0;
+
+        status |= si21_readregs(state, LNB_CTRL_STATUS_REG, &lnb_status, 0x01);
+        status |= si21_readregs(state, LNB_CTRL_REG_1, &lnb_status, 0x01);
+
+        /*fill the FIFO*/
+        status |= si21_writeregs(state, LNB_FIFO_REGS_0, m->msg, m->msg_len);
+
+        LNB_CTRL_1 = (lnb_status & 0x70);
+        LNB_CTRL_1 |= m->msg_len;
+
+        LNB_CTRL_1 |= 0x80;     /* begin LNB signaling */
+
+        status |= si21_writeregs(state, LNB_CTRL_REG_1, &LNB_CTRL_1, 0x01);
+
+        return status;
+}
+
+static int si21xx_send_diseqc_burst(struct dvb_frontend *fe,
+                                                fe_sec_mini_cmd_t burst)
+{
+        struct si21xx_state *state = fe->demodulator_priv;
+        u8 val;
+
+        dprintk("%s\n", __func__);
+
+        if (si21xx_wait_diseqc_idle(state, 100) < 0)
+                return -ETIMEDOUT;
+
+        val = (0x80 | si21_readreg(state, 0xc1));
+        if (si21_writereg(state, LNB_CTRL_REG_1,
+                        burst == SEC_MINI_A ? (val & ~0x10) : (val | 0x10)))
+                return -EREMOTEIO;
+
+        if (si21xx_wait_diseqc_idle(state, 100) < 0)
+                return -ETIMEDOUT;
+
+        if (si21_writereg(state, LNB_CTRL_REG_1, val))
+                return -EREMOTEIO;
+
+        return 0;
+}
+/*      30.06.2008 */
+static int si21xx_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone)
+{
+        struct si21xx_state *state = fe->demodulator_priv;
+        u8 val;
+
+        dprintk("%s\n", __func__);
+        val = (0x80 | si21_readreg(state, LNB_CTRL_REG_1));
+
+        switch (tone) {
+        case SEC_TONE_ON:
+                return si21_writereg(state, LNB_CTRL_REG_1, val | 0x20);
+
+        case SEC_TONE_OFF:
+                return si21_writereg(state, LNB_CTRL_REG_1, (val & ~0x20));
+
+        default:
+                return -EINVAL;
+        }
+}
+
+static int si21xx_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t volt)
+{
+        struct si21xx_state *state = fe->demodulator_priv;
+
+        u8 val;
+        dprintk("%s: %s\n", __func__,
+                volt == SEC_VOLTAGE_13 ? "SEC_VOLTAGE_13" :
+                volt == SEC_VOLTAGE_18 ? "SEC_VOLTAGE_18" : "??");
+
+
+        val = (0x80 | si21_readreg(state, LNB_CTRL_REG_1));
+
+        switch (volt) {
+        case SEC_VOLTAGE_18:
+                return si21_writereg(state, LNB_CTRL_REG_1, val | 0x40);
+                break;
+        case SEC_VOLTAGE_13:
+                return si21_writereg(state, LNB_CTRL_REG_1, (val & ~0x40));
+                break;
+        default:
+                return -EINVAL;
+        };
+}
+
+static int si21xx_init(struct dvb_frontend *fe)
+{
+        struct si21xx_state *state = fe->demodulator_priv;
+        int i;
+        int status = 0;
+        u8 reg1;
+        u8 val;
+        u8 reg2[2];
+
+        dprintk("%s\n", __func__);
+
+        for (i = 0; ; i += 2) {
+                reg1 = serit_sp1511lhb_inittab[i];
+                val = serit_sp1511lhb_inittab[i+1];
+                if (reg1 == 0xff && val == 0xff)
+                        break;
+                si21_writeregs(state, reg1, &val, 1);
+        }
+
+        /*DVB QPSK SYSTEM MODE REG*/
+        reg1 = 0x08;
+        si21_writeregs(state, SYSTEM_MODE_REG, &reg1, 0x01);
+
+        /*transport stream config*/
+        /*
+        mode = PARALLEL;
+        sdata_form = LSB_FIRST;
+        clk_edge = FALLING_EDGE;
+        clk_mode = CLK_GAPPED_MODE;
+        strt_len = BYTE_WIDE;
+        sync_pol = ACTIVE_HIGH;
+        val_pol = ACTIVE_HIGH;
+        err_pol = ACTIVE_HIGH;
+        sclk_rate = 0x00;
+        parity = 0x00 ;
+        data_delay = 0x00;
+        clk_delay = 0x00;
+        pclk_smooth = 0x00;
+        */
+        reg2[0] =
+                PARALLEL + (LSB_FIRST << 1)
+                + (FALLING_EDGE << 2) + (CLK_GAPPED_MODE << 3)
+                + (BYTE_WIDE << 4) + (ACTIVE_HIGH << 5)
+                + (ACTIVE_HIGH << 6) + (ACTIVE_HIGH << 7);
+
+        reg2[1] = 0;
+        /*      sclk_rate + (parity << 2)
+                + (data_delay << 3) + (clk_delay << 4)
+                + (pclk_smooth << 5);
+        */
+        status |= si21_writeregs(state, TS_CTRL_REG_1, reg2, 0x02);
+        if (status != 0)
+                dprintk(" %s : TS Set Error\n", __func__);
+
+        return 0;
+
+}
+
+static int si21_read_status(struct dvb_frontend *fe, fe_status_t *status)
+{
+        struct si21xx_state *state = fe->demodulator_priv;
+        u8 regs_read[2];
+        u8 reg_read;
+        u8 i;
+        u8 lock;
+        u8 signal = si21_readreg(state, ANALOG_AGC_POWER_LEVEL_REG);
+
+        si21_readregs(state, LOCK_STATUS_REG_1, regs_read, 0x02);
+        reg_read = 0;
+
+        for (i = 0; i < 7; ++i)
+                reg_read |= ((regs_read[0] >> i) & 0x01) << (6 - i);
+
+        lock = ((reg_read & 0x7f) | (regs_read[1] & 0x80));
+
+        dprintk("%s : FE_READ_STATUS : VSTATUS: 0x%02x\n", __func__, lock);
+        *status = 0;
+
+        if (signal > 10)
+                *status |= FE_HAS_SIGNAL;
+
+        if (lock & 0x2)
+                *status |= FE_HAS_CARRIER;
+
+        if (lock & 0x20)
+                *status |= FE_HAS_VITERBI;
+
+        if (lock & 0x40)
+                *status |= FE_HAS_SYNC;
+
+        if ((lock & 0x7b) == 0x7b)
+                *status |= FE_HAS_LOCK;
+
+        return 0;
+}
+
+static int si21_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
+{
+        struct si21xx_state *state = fe->demodulator_priv;
+
+        /*status = si21_readreg(state, ANALOG_AGC_POWER_LEVEL_REG,
+                                                (u8*)agclevel, 0x01);*/
+
+        u16 signal = (3 * si21_readreg(state, 0x27) *
+                                        si21_readreg(state, 0x28));
+
+        dprintk("%s : AGCPWR: 0x%02x%02x, signal=0x%04x\n", __func__,
+                si21_readreg(state, 0x27),
+                si21_readreg(state, 0x28), (int) signal);
+
+        signal  <<= 4;
+        *strength = signal;
+
+        return 0;
+}
+
+static int si21_read_ber(struct dvb_frontend *fe, u32 *ber)
+{
+        struct si21xx_state *state = fe->demodulator_priv;
+
+        dprintk("%s\n", __func__);
+
+        if (state->errmode != STATUS_BER)
+                return 0;
+
+        *ber = (si21_readreg(state, 0x1d) << 8) |
+                                si21_readreg(state, 0x1e);
+
+        return 0;
+}
+
+static int si21_read_snr(struct dvb_frontend *fe, u16 *snr)
+{
+        struct si21xx_state *state = fe->demodulator_priv;
+
+        s32 xsnr = 0xffff - ((si21_readreg(state, 0x24) << 8) |
+                                        si21_readreg(state, 0x25));
+        xsnr = 3 * (xsnr - 0xa100);
+        *snr = (xsnr > 0xffff) ? 0xffff : (xsnr < 0) ? 0 : xsnr;
+
+        dprintk("%s\n", __func__);
+
+        return 0;
+}
+
+static int si21_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
+{
+        struct si21xx_state *state = fe->demodulator_priv;
+
+        dprintk("%s\n", __func__);
+
+        if (state->errmode != STATUS_UCBLOCKS)
+                *ucblocks = 0;
+        else
+                *ucblocks = (si21_readreg(state, 0x1d) << 8) |
+                                        si21_readreg(state, 0x1e);
+
+        return 0;
+}
+
+/*      initiates a channel acquisition sequence
+        using the specified symbol rate and code rate */
+static int si21xx_setacquire(struct dvb_frontend *fe, int symbrate,
+                                                fe_code_rate_t crate)
+{
+
+        struct si21xx_state *state = fe->demodulator_priv;
+        u8 coderates[] = {
+                                0x0, 0x01, 0x02, 0x04, 0x00,
+                                0x8, 0x10, 0x20, 0x00, 0x3f
+        };
+
+        u8 coderate_ptr;
+        int status;
+        u8 start_acq = 0x80;
+        u8 reg, regs[3];
+
+        dprintk("%s\n", __func__);
+
+        status = PASS;
+        coderate_ptr = coderates[crate];
+
+        si21xx_set_symbolrate(fe, symbrate);
+
+        /* write code rates to use in the Viterbi search */
+        status |= si21_writeregs(state,
+                                VIT_SRCH_CTRL_REG_1,
+                                &coderate_ptr, 0x01);
+
+        /* clear acq_start bit */
+        status |= si21_readregs(state, ACQ_CTRL_REG_2, &reg, 0x01);
+        reg &= ~start_acq;
+        status |= si21_writeregs(state, ACQ_CTRL_REG_2, &reg, 0x01);
+
+        /* use new Carrier Frequency Offset Estimator (QuickLock) */
+        regs[0] = 0xCB;
+        regs[1] = 0x40;
+        regs[2] = 0xCB;
+
+        status |= si21_writeregs(state,
+                                TWO_DB_BNDWDTH_THRSHLD_REG,
+                                &regs[0], 0x03);
+        reg = 0x56;
+        status |= si21_writeregs(state,
+                                LSA_CTRL_REG_1, &reg, 1);
+        reg = 0x05;
+        status |= si21_writeregs(state,
+                                BLIND_SCAN_CTRL_REG, &reg, 1);
+        /* start automatic acq */
+        status |= si21_writeregs(state,
+                                ACQ_CTRL_REG_2, &start_acq, 0x01);
+
+        return status;
+}
+
+static int si21xx_set_property(struct dvb_frontend *fe, struct dtv_property *p)
+{
+        dprintk("%s(..)\n", __func__);
+        return 0;
+}
+
+static int si21xx_get_property(struct dvb_frontend *fe, struct dtv_property *p)
+{
+        dprintk("%s(..)\n", __func__);
+        return 0;
+}
+
+static int si21xx_set_frontend(struct dvb_frontend *fe,
+                                        struct dvb_frontend_parameters *dfp)
+{
+        struct si21xx_state *state = fe->demodulator_priv;
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
+
+        /* freq         Channel carrier frequency in KHz (i.e. 1550000 KHz)
+         datarate       Channel symbol rate in Sps (i.e. 22500000 Sps)*/
+
+        /* in MHz */
+        unsigned char coarse_tune_freq;
+        int fine_tune_freq;
+        unsigned char sample_rate = 0;
+        /* boolean */
+        unsigned int inband_interferer_ind;
+
+        /* INTERMEDIATE VALUES */
+        int icoarse_tune_freq; /* MHz */
+        int ifine_tune_freq; /* MHz */
+        unsigned int band_high;
+        unsigned int band_low;
+        unsigned int x1;
+        unsigned int x2;
+        int i;
+        unsigned int inband_interferer_div2[ALLOWABLE_FS_COUNT] = {
+                        FALSE, FALSE, FALSE, FALSE, FALSE,
+                        FALSE, FALSE, FALSE, FALSE, FALSE
+        };
+        unsigned int inband_interferer_div4[ALLOWABLE_FS_COUNT] = {
+                        FALSE, FALSE, FALSE, FALSE, FALSE,
+                        FALSE, FALSE, FALSE, FALSE, FALSE
+        };
+
+        int status;
+
+        /* allowable sample rates for ADC in MHz */
+        int afs[ALLOWABLE_FS_COUNT] = { 200, 192, 193, 194, 195,
+                                        196, 204, 205, 206, 207
+        };
+        /* in MHz */
+        int if_limit_high;
+        int if_limit_low;
+        int lnb_lo;
+        int lnb_uncertanity;
+
+        int rf_freq;
+        int data_rate;
+        unsigned char regs[4];
+
+        dprintk("%s : FE_SET_FRONTEND\n", __func__);
+
+        if (c->delivery_system != SYS_DVBS) {
+                        dprintk("%s: unsupported delivery system selected (%d)\n",
+                                __func__, c->delivery_system);
+                        return -EOPNOTSUPP;
+        }
+
+        for (i = 0; i < ALLOWABLE_FS_COUNT; ++i)
+                inband_interferer_div2[i] = inband_interferer_div4[i] = FALSE;
+
+        if_limit_high = -700000;
+        if_limit_low = -100000;
+        /* in MHz */
+        lnb_lo = 0;
+        lnb_uncertanity = 0;
+
+        rf_freq = 10 * c->frequency ;
+        data_rate = c->symbol_rate / 100;
+
+        status = PASS;
+
+        band_low = (rf_freq - lnb_lo) - ((lnb_uncertanity * 200)
+                                        + (data_rate * 135)) / 200;
+
+        band_high = (rf_freq - lnb_lo) + ((lnb_uncertanity * 200)
+                                        + (data_rate * 135)) / 200;
+
+
+        icoarse_tune_freq = 100000 *
+                                (((rf_freq - lnb_lo) -
+                                        (if_limit_low + if_limit_high) / 2)
+                                                                / 100000);
+
+        ifine_tune_freq = (rf_freq - lnb_lo) - icoarse_tune_freq ;
+
+        for (i = 0; i < ALLOWABLE_FS_COUNT; ++i) {
+                x1 = ((rf_freq - lnb_lo) / (afs[i] * 2500)) *
+                                        (afs[i] * 2500) + afs[i] * 2500;
+
+                x2 = ((rf_freq - lnb_lo) / (afs[i] * 2500)) *
+                                                        (afs[i] * 2500);
+
+                if (((band_low < x1) && (x1 < band_high)) ||
+                                        ((band_low < x2) && (x2 < band_high)))
+                                        inband_interferer_div4[i] = TRUE;
+
+        }
+
+        for (i = 0; i < ALLOWABLE_FS_COUNT; ++i) {
+                x1 = ((rf_freq - lnb_lo) / (afs[i] * 5000)) *
+                                        (afs[i] * 5000) + afs[i] * 5000;
+
+                x2 = ((rf_freq - lnb_lo) / (afs[i] * 5000)) *
+                                        (afs[i] * 5000);
+
+                if (((band_low < x1) && (x1 < band_high)) ||
+                                        ((band_low < x2) && (x2 < band_high)))
+                                        inband_interferer_div2[i] = TRUE;
+        }
+
+        inband_interferer_ind = TRUE;
+        for (i = 0; i < ALLOWABLE_FS_COUNT; ++i)
+                inband_interferer_ind &= inband_interferer_div2[i] |
+                                                inband_interferer_div4[i];
+
+        if (inband_interferer_ind) {
+                for (i = 0; i < ALLOWABLE_FS_COUNT; ++i) {
+                        if (inband_interferer_div2[i] == FALSE) {
+                                sample_rate = (u8) afs[i];
+                                break;
+                        }
+                }
+        } else {
+                for (i = 0; i < ALLOWABLE_FS_COUNT; ++i) {
+                        if ((inband_interferer_div2[i] |
+                                        inband_interferer_div4[i]) == FALSE) {
+                                sample_rate = (u8) afs[i];
+                                break;
+                        }
+                }
+
+        }
+
+        if (sample_rate > 207 || sample_rate < 192)
+                sample_rate = 200;
+
+        fine_tune_freq = ((0x4000 * (ifine_tune_freq / 10)) /
+                                        ((sample_rate) * 1000));
+
+        coarse_tune_freq = (u8)(icoarse_tune_freq / 100000);
+
+        regs[0] = sample_rate;
+        regs[1] = coarse_tune_freq;
+        regs[2] = fine_tune_freq & 0xFF;
+        regs[3] = fine_tune_freq >> 8 & 0xFF;
+
+        status |= si21_writeregs(state, PLL_DIVISOR_REG, &regs[0], 0x04);
+
+        state->fs = sample_rate;/*ADC MHz*/
+        si21xx_setacquire(fe, c->symbol_rate, c->fec_inner);
+
+        return 0;
+}
+
+static int si21xx_sleep(struct dvb_frontend *fe)
+{
+        struct si21xx_state *state = fe->demodulator_priv;
+        u8 regdata;
+
+        dprintk("%s\n", __func__);
+
+        si21_readregs(state, SYSTEM_MODE_REG, &regdata, 0x01);
+        regdata |= 1 << 6;
+        si21_writeregs(state, SYSTEM_MODE_REG, &regdata, 0x01);
+        state->initialised = 0;
+
+        return 0;
+}
+
+static void si21xx_release(struct dvb_frontend *fe)
+{
+        struct si21xx_state *state = fe->demodulator_priv;
+
+        dprintk("%s\n", __func__);
+
+        kfree(state);
+}
+
+static struct dvb_frontend_ops si21xx_ops = {
+
+        .info = {
+                .name                   = "SL SI21XX DVB-S",
+                .type                   = FE_QPSK,
+                .frequency_min          = 950000,
+                .frequency_max          = 2150000,
+                .frequency_stepsize     = 125,   /* kHz for QPSK frontends */
+                .frequency_tolerance    = 0,
+                .symbol_rate_min        = 1000000,
+                .symbol_rate_max        = 45000000,
+                .symbol_rate_tolerance  = 500,  /* ppm */
+                .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_QPSK |
+                FE_CAN_FEC_AUTO
+        },
+
+        .release = si21xx_release,
+        .init = si21xx_init,
+        .sleep = si21xx_sleep,
+        .write = si21_write,
+        .read_status = si21_read_status,
+        .read_ber = si21_read_ber,
+        .read_signal_strength = si21_read_signal_strength,
+        .read_snr = si21_read_snr,
+        .read_ucblocks = si21_read_ucblocks,
+        .diseqc_send_master_cmd = si21xx_send_diseqc_msg,
+        .diseqc_send_burst = si21xx_send_diseqc_burst,
+        .set_tone = si21xx_set_tone,
+        .set_voltage = si21xx_set_voltage,
+
+        .set_property = si21xx_set_property,
+        .get_property = si21xx_get_property,
+        .set_frontend = si21xx_set_frontend,
+};
+
+struct dvb_frontend *si21xx_attach(const struct si21xx_config *config,
+                                                struct i2c_adapter *i2c)
+{
+        struct si21xx_state *state = NULL;
+        int id;
+
+        dprintk("%s\n", __func__);
+
+        /* allocate memory for the internal state */
+        state = kmalloc(sizeof(struct si21xx_state), GFP_KERNEL);
+        if (state == NULL)
+                goto error;
+
+        /* setup the state */
+        state->config = config;
+        state->i2c = i2c;
+        state->initialised = 0;
+        state->errmode = STATUS_BER;
+
+        /* check if the demod is there */
+        id = si21_readreg(state, SYSTEM_MODE_REG);
+        si21_writereg(state, SYSTEM_MODE_REG, id | 0x40); /* standby off */
+        msleep(200);
+        id = si21_readreg(state, 0x00);
+
+        /* register 0x00 contains:
+                0x34 for SI2107
+                0x24 for SI2108
+                0x14 for SI2109
+                0x04 for SI2110
+        */
+        if (id != 0x04 && id != 0x14)
+                goto error;
+
+        /* create dvb_frontend */
+        memcpy(&state->frontend.ops, &si21xx_ops,
+                                        sizeof(struct dvb_frontend_ops));
+        state->frontend.demodulator_priv = state;
+        return &state->frontend;
+
+error:
+        kfree(state);
+        return NULL;
+}
+EXPORT_SYMBOL(si21xx_attach);
+
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
+
+MODULE_DESCRIPTION("SL SI21XX DVB Demodulator driver");
+MODULE_AUTHOR("Igor M. Liplianin");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/frontends/si21xx.h b/drivers/media/dvb/frontends/si21xx.h
new file mode 100644
index 000000000000..141b5b8a5f63
--- /dev/null
+++ b/drivers/media/dvb/frontends/si21xx.h
@@ -0,0 +1,37 @@
+#ifndef SI21XX_H
+#define SI21XX_H
+
+#include <linux/dvb/frontend.h>
+#include "dvb_frontend.h"
+
+struct si21xx_config {
+        /* the demodulator's i2c address */
+        u8 demod_address;
+
+        /* minimum delay before retuning */
+        int min_delay_ms;
+};
+
+#if defined(CONFIG_DVB_SI21XX) || \
+                (defined(CONFIG_DVB_SI21XX_MODULE) && defined(MODULE))
+extern struct dvb_frontend *si21xx_attach(const struct si21xx_config *config,
+                                                struct i2c_adapter *i2c);
+#else
+static inline struct dvb_frontend *si21xx_attach(
+                const struct si21xx_config *config, struct i2c_adapter *i2c)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return NULL;
+}
+#endif
+
+static inline int si21xx_writeregister(struct dvb_frontend *fe, u8 reg, u8 val)
+{
+        int r = 0;
+        u8 buf[] = {reg, val};
+        if (fe->ops.write)
+                r = fe->ops.write(fe, buf, 2);
+        return r;
+}
+
+#endif
diff --git a/drivers/media/dvb/frontends/sp887x.c b/drivers/media/dvb/frontends/sp887x.c
index 4543609e1816..559509ab4dab 100644
--- a/drivers/media/dvb/frontends/sp887x.c
+++ b/drivers/media/dvb/frontends/sp887x.c
@@ -337,7 +337,8 @@ static int sp887x_setup_frontend_parameters (struct dvb_frontend* fe,
                                              struct dvb_frontend_parameters *p)
 {
         struct sp887x_state* state = fe->demodulator_priv;
-        int actual_freq, err;
+        unsigned actual_freq;
+        int err;
         u16 val, reg0xc05;
 
         if (p->u.ofdm.bandwidth != BANDWIDTH_8_MHZ &&
diff --git a/drivers/media/dvb/frontends/stb6000.c b/drivers/media/dvb/frontends/stb6000.c
new file mode 100644
index 000000000000..0e2cb0df1441
--- /dev/null
+++ b/drivers/media/dvb/frontends/stb6000.c
@@ -0,0 +1,255 @@
+  /*
+     Driver for ST STB6000 DVBS Silicon tuner
+
+     Copyright (C) 2008 Igor M. Liplianin (liplianin@me.by)
+
+     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/dvb/frontend.h>
+#include <asm/types.h>
+
+#include "stb6000.h"
+
+static int debug;
+#define dprintk(args...) \
+        do { \
+                if (debug) \
+                        printk(KERN_DEBUG "stb6000: " args); \
+        } while (0)
+
+struct stb6000_priv {
+        /* i2c details */
+        int i2c_address;
+        struct i2c_adapter *i2c;
+        u32 frequency;
+};
+
+static int stb6000_release(struct dvb_frontend *fe)
+{
+        kfree(fe->tuner_priv);
+        fe->tuner_priv = NULL;
+        return 0;
+}
+
+static int stb6000_sleep(struct dvb_frontend *fe)
+{
+        struct stb6000_priv *priv = fe->tuner_priv;
+        int ret;
+        u8 buf[] = { 10, 0 };
+        struct i2c_msg msg = {
+                .addr = priv->i2c_address,
+                .flags = 0,
+                .buf = buf,
+                .len = 2
+        };
+
+        dprintk("%s:\n", __func__);
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
+
+        ret = i2c_transfer(priv->i2c, &msg, 1);
+        if (ret != 1)
+                dprintk("%s: i2c error\n", __func__);
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 0);
+
+        return (ret == 1) ? 0 : ret;
+}
+
+static int stb6000_set_params(struct dvb_frontend *fe,
+                                struct dvb_frontend_parameters *params)
+{
+        struct stb6000_priv *priv = fe->tuner_priv;
+        unsigned int n, m;
+        int ret;
+        u32 freq_mhz;
+        int bandwidth;
+        u8 buf[12];
+        struct i2c_msg msg = {
+                .addr = priv->i2c_address,
+                .flags = 0,
+                .buf = buf,
+                .len = 12
+        };
+
+        dprintk("%s:\n", __func__);
+
+        freq_mhz = params->frequency / 1000;
+        bandwidth = params->u.qpsk.symbol_rate / 1000000;
+
+        if (bandwidth > 31)
+                bandwidth = 31;
+
+        if ((freq_mhz > 949) && (freq_mhz < 2151)) {
+                buf[0] = 0x01;
+                buf[1] = 0xac;
+                if (freq_mhz < 1950)
+                        buf[1] = 0xaa;
+                if (freq_mhz < 1800)
+                        buf[1] = 0xa8;
+                if (freq_mhz < 1650)
+                        buf[1] = 0xa6;
+                if (freq_mhz < 1530)
+                        buf[1] = 0xa5;
+                if (freq_mhz < 1470)
+                        buf[1] = 0xa4;
+                if (freq_mhz < 1370)
+                        buf[1] = 0xa2;
+                if (freq_mhz < 1300)
+                        buf[1] = 0xa1;
+                if (freq_mhz < 1200)
+                        buf[1] = 0xa0;
+                if (freq_mhz < 1075)
+                        buf[1] = 0xbc;
+                if (freq_mhz < 1000)
+                        buf[1] = 0xba;
+                if (freq_mhz < 1075) {
+                        n = freq_mhz / 8; /* vco=lo*4 */
+                        m = 2;
+                } else {
+                        n = freq_mhz / 16; /* vco=lo*2 */
+                        m = 1;
+                }
+                buf[2] = n >> 1;
+                buf[3] = (unsigned char)(((n & 1) << 7) |
+                                        (m * freq_mhz - n * 16) | 0x60);
+                buf[4] = 0x04;
+                buf[5] = 0x0e;
+
+                buf[6] = (unsigned char)(bandwidth);
+
+                buf[7] = 0xd8;
+                buf[8] = 0xd0;
+                buf[9] = 0x50;
+                buf[10] = 0xeb;
+                buf[11] = 0x4f;
+
+                if (fe->ops.i2c_gate_ctrl)
+                        fe->ops.i2c_gate_ctrl(fe, 1);
+
+                ret = i2c_transfer(priv->i2c, &msg, 1);
+                if (ret != 1)
+                        dprintk("%s: i2c error\n", __func__);
+
+                udelay(10);
+                if (fe->ops.i2c_gate_ctrl)
+                        fe->ops.i2c_gate_ctrl(fe, 0);
+
+                buf[0] = 0x07;
+                buf[1] = 0xdf;
+                buf[2] = 0xd0;
+                buf[3] = 0x50;
+                buf[4] = 0xfb;
+                msg.len = 5;
+
+                if (fe->ops.i2c_gate_ctrl)
+                        fe->ops.i2c_gate_ctrl(fe, 1);
+
+                ret = i2c_transfer(priv->i2c, &msg, 1);
+                if (ret != 1)
+                        dprintk("%s: i2c error\n", __func__);
+
+                udelay(10);
+                if (fe->ops.i2c_gate_ctrl)
+                        fe->ops.i2c_gate_ctrl(fe, 0);
+
+                priv->frequency = freq_mhz * 1000;
+
+                return (ret == 1) ? 0 : ret;
+        }
+        return -1;
+}
+
+static int stb6000_get_frequency(struct dvb_frontend *fe, u32 *frequency)
+{
+        struct stb6000_priv *priv = fe->tuner_priv;
+        *frequency = priv->frequency;
+        return 0;
+}
+
+static struct dvb_tuner_ops stb6000_tuner_ops = {
+        .info = {
+                .name = "ST STB6000",
+                .frequency_min = 950000,
+                .frequency_max = 2150000
+        },
+        .release = stb6000_release,
+        .sleep = stb6000_sleep,
+        .set_params = stb6000_set_params,
+        .get_frequency = stb6000_get_frequency,
+};
+
+struct dvb_frontend *stb6000_attach(struct dvb_frontend *fe, int addr,
+                                                struct i2c_adapter *i2c)
+{
+        struct stb6000_priv *priv = NULL;
+        u8 b0[] = { 0 };
+        u8 b1[] = { 0, 0 };
+        struct i2c_msg msg[2] = {
+                {
+                        .addr = addr,
+                        .flags = 0,
+                        .buf = b0,
+                        .len = 0
+                }, {
+                        .addr = addr,
+                        .flags = I2C_M_RD,
+                        .buf = b1,
+                        .len = 2
+                }
+        };
+        int ret;
+
+        dprintk("%s:\n", __func__);
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
+
+        /* is some i2c device here ? */
+        ret = i2c_transfer(i2c, msg, 2);
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 0);
+
+        if (ret != 2)
+                return NULL;
+
+        priv = kzalloc(sizeof(struct stb6000_priv), GFP_KERNEL);
+        if (priv == NULL)
+                return NULL;
+
+        priv->i2c_address = addr;
+        priv->i2c = i2c;
+
+        memcpy(&fe->ops.tuner_ops, &stb6000_tuner_ops,
+                                sizeof(struct dvb_tuner_ops));
+
+        fe->tuner_priv = priv;
+
+        return fe;
+}
+EXPORT_SYMBOL(stb6000_attach);
+
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
+
+MODULE_DESCRIPTION("DVB STB6000 driver");
+MODULE_AUTHOR("Igor M. Liplianin <liplianin@me.by>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/frontends/stb6000.h b/drivers/media/dvb/frontends/stb6000.h
new file mode 100644
index 000000000000..7be479c22d5b
--- /dev/null
+++ b/drivers/media/dvb/frontends/stb6000.h
@@ -0,0 +1,51 @@
+  /*
+     Driver for ST stb6000 DVBS Silicon tuner
+
+     Copyright (C) 2008 Igor M. Liplianin (liplianin@me.by)
+
+     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 __DVB_STB6000_H__
+#define __DVB_STB6000_H__
+
+#include <linux/i2c.h>
+#include "dvb_frontend.h"
+
+/**
+ * Attach a stb6000 tuner to the supplied frontend structure.
+ *
+ * @param fe Frontend to attach to.
+ * @param addr i2c address of the tuner.
+ * @param i2c i2c adapter to use.
+ * @return FE pointer on success, NULL on failure.
+ */
+#if defined(CONFIG_DVB_STB6000) || (defined(CONFIG_DVB_STB6000_MODULE) \
+                                                        && defined(MODULE))
+extern struct dvb_frontend *stb6000_attach(struct dvb_frontend *fe, int addr,
+                                           struct i2c_adapter *i2c);
+#else
+static inline struct dvb_frontend *stb6000_attach(struct dvb_frontend *fe,
+                                                  int addr,
+                                                  struct i2c_adapter *i2c)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return NULL;
+}
+#endif /* CONFIG_DVB_STB6000 */
+
+#endif /* __DVB_STB6000_H__ */
diff --git a/drivers/media/dvb/frontends/stv0288.c b/drivers/media/dvb/frontends/stv0288.c
new file mode 100644
index 000000000000..ff1194de34c0
--- /dev/null
+++ b/drivers/media/dvb/frontends/stv0288.c
@@ -0,0 +1,618 @@
+/*
+        Driver for ST STV0288 demodulator
+        Copyright (C) 2006 Georg Acher, BayCom GmbH, acher (at) baycom (dot) de
+                for Reel Multimedia
+        Copyright (C) 2008 TurboSight.com, Bob Liu <bob@turbosight.com>
+        Copyright (C) 2008 Igor M. Liplianin <liplianin@me.by>
+                Removed stb6000 specific tuner code and revised some
+                procedures.
+
+        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/kernel.h>
+#include <linux/module.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/jiffies.h>
+#include <asm/div64.h>
+
+#include "dvb_frontend.h"
+#include "stv0288.h"
+
+struct stv0288_state {
+        struct i2c_adapter *i2c;
+        const struct stv0288_config *config;
+        struct dvb_frontend frontend;
+
+        u8 initialised:1;
+        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...) \
+        do { \
+                if (debug) \
+                        printk(KERN_DEBUG "stv0288: " args); \
+        } while (0)
+
+
+static int stv0288_writeregI(struct stv0288_state *state, u8 reg, u8 data)
+{
+        int ret;
+        u8 buf[] = { reg, data };
+        struct i2c_msg msg = {
+                .addr = state->config->demod_address,
+                .flags = 0,
+                .buf = buf,
+                .len = 2
+        };
+
+        ret = i2c_transfer(state->i2c, &msg, 1);
+
+        if (ret != 1)
+                dprintk("%s: writereg error (reg == 0x%02x, val == 0x%02x, "
+                        "ret == %i)\n", __func__, reg, data, ret);
+
+        return (ret != 1) ? -EREMOTEIO : 0;
+}
+
+static int stv0288_write(struct dvb_frontend *fe, u8 *buf, int len)
+{
+        struct stv0288_state *state = fe->demodulator_priv;
+
+        if (len != 2)
+                return -EINVAL;
+
+        return stv0288_writeregI(state, buf[0], buf[1]);
+}
+
+static u8 stv0288_readreg(struct stv0288_state *state, u8 reg)
+{
+        int ret;
+        u8 b0[] = { reg };
+        u8 b1[] = { 0 };
+        struct i2c_msg msg[] = {
+                {
+                        .addr = state->config->demod_address,
+                        .flags = 0,
+                        .buf = b0,
+                        .len = 1
+                }, {
+                        .addr = state->config->demod_address,
+                        .flags = I2C_M_RD,
+                        .buf = b1,
+                        .len = 1
+                }
+        };
+
+        ret = i2c_transfer(state->i2c, msg, 2);
+
+        if (ret != 2)
+                dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n",
+                                __func__, reg, ret);
+
+        return b1[0];
+}
+
+static int stv0288_set_symbolrate(struct dvb_frontend *fe, u32 srate)
+{
+        struct stv0288_state *state = fe->demodulator_priv;
+        unsigned int temp;
+        unsigned char b[3];
+
+        if ((srate < 1000000) || (srate > 45000000))
+                return -EINVAL;
+
+        temp = (unsigned int)srate / 1000;
+
+                temp = temp * 32768;
+                temp = temp / 25;
+                temp = temp / 125;
+                b[0] = (unsigned char)((temp >> 12) & 0xff);
+                b[1] = (unsigned char)((temp >> 4) & 0xff);
+                b[2] = (unsigned char)((temp << 4) & 0xf0);
+                stv0288_writeregI(state, 0x28, 0x80); /* SFRH */
+                stv0288_writeregI(state, 0x29, 0); /* SFRM */
+                stv0288_writeregI(state, 0x2a, 0); /* SFRL */
+
+                stv0288_writeregI(state, 0x28, b[0]);
+                stv0288_writeregI(state, 0x29, b[1]);
+                stv0288_writeregI(state, 0x2a, b[2]);
+                dprintk("stv0288: stv0288_set_symbolrate\n");
+
+        return 0;
+}
+
+static int stv0288_send_diseqc_msg(struct dvb_frontend *fe,
+                                    struct dvb_diseqc_master_cmd *m)
+{
+        struct stv0288_state *state = fe->demodulator_priv;
+
+        int i;
+
+        dprintk("%s\n", __func__);
+
+        stv0288_writeregI(state, 0x09, 0);
+        msleep(30);
+        stv0288_writeregI(state, 0x05, 0x16);
+
+        for (i = 0; i < m->msg_len; i++) {
+                if (stv0288_writeregI(state, 0x06, m->msg[i]))
+                        return -EREMOTEIO;
+                msleep(12);
+        }
+
+        return 0;
+}
+
+static int stv0288_send_diseqc_burst(struct dvb_frontend *fe,
+                                                fe_sec_mini_cmd_t burst)
+{
+        struct stv0288_state *state = fe->demodulator_priv;
+
+        dprintk("%s\n", __func__);
+
+        if (stv0288_writeregI(state, 0x05, 0x16))/* burst mode */
+                return -EREMOTEIO;
+
+        if (stv0288_writeregI(state, 0x06, burst == SEC_MINI_A ? 0x00 : 0xff))
+                return -EREMOTEIO;
+
+        if (stv0288_writeregI(state, 0x06, 0x12))
+                return -EREMOTEIO;
+
+        return 0;
+}
+
+static int stv0288_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone)
+{
+        struct stv0288_state *state = fe->demodulator_priv;
+
+        switch (tone) {
+        case SEC_TONE_ON:
+                if (stv0288_writeregI(state, 0x05, 0x10))/* burst mode */
+                        return -EREMOTEIO;
+                return stv0288_writeregI(state, 0x06, 0xff);
+
+        case SEC_TONE_OFF:
+                if (stv0288_writeregI(state, 0x05, 0x13))/* burst mode */
+                        return -EREMOTEIO;
+                return stv0288_writeregI(state, 0x06, 0x00);
+
+        default:
+                return -EINVAL;
+        }
+}
+
+static u8 stv0288_inittab[] = {
+        0x01, 0x15,
+        0x02, 0x20,
+        0x09, 0x0,
+        0x0a, 0x4,
+        0x0b, 0x0,
+        0x0c, 0x0,
+        0x0d, 0x0,
+        0x0e, 0xd4,
+        0x0f, 0x30,
+        0x11, 0x80,
+        0x12, 0x03,
+        0x13, 0x48,
+        0x14, 0x84,
+        0x15, 0x45,
+        0x16, 0xb7,
+        0x17, 0x9c,
+        0x18, 0x0,
+        0x19, 0xa6,
+        0x1a, 0x88,
+        0x1b, 0x8f,
+        0x1c, 0xf0,
+        0x20, 0x0b,
+        0x21, 0x54,
+        0x22, 0x0,
+        0x23, 0x0,
+        0x2b, 0xff,
+        0x2c, 0xf7,
+        0x30, 0x0,
+        0x31, 0x1e,
+        0x32, 0x14,
+        0x33, 0x0f,
+        0x34, 0x09,
+        0x35, 0x0c,
+        0x36, 0x05,
+        0x37, 0x2f,
+        0x38, 0x16,
+        0x39, 0xbe,
+        0x3a, 0x0,
+        0x3b, 0x13,
+        0x3c, 0x11,
+        0x3d, 0x30,
+        0x40, 0x63,
+        0x41, 0x04,
+        0x42, 0x60,
+        0x43, 0x00,
+        0x44, 0x00,
+        0x45, 0x00,
+        0x46, 0x00,
+        0x47, 0x00,
+        0x4a, 0x00,
+        0x50, 0x10,
+        0x51, 0x38,
+        0x52, 0x21,
+        0x58, 0x54,
+        0x59, 0x86,
+        0x5a, 0x0,
+        0x5b, 0x9b,
+        0x5c, 0x08,
+        0x5d, 0x7f,
+        0x5e, 0x0,
+        0x5f, 0xff,
+        0x70, 0x0,
+        0x71, 0x0,
+        0x72, 0x0,
+        0x74, 0x0,
+        0x75, 0x0,
+        0x76, 0x0,
+        0x81, 0x0,
+        0x82, 0x3f,
+        0x83, 0x3f,
+        0x84, 0x0,
+        0x85, 0x0,
+        0x88, 0x0,
+        0x89, 0x0,
+        0x8a, 0x0,
+        0x8b, 0x0,
+        0x8c, 0x0,
+        0x90, 0x0,
+        0x91, 0x0,
+        0x92, 0x0,
+        0x93, 0x0,
+        0x94, 0x1c,
+        0x97, 0x0,
+        0xa0, 0x48,
+        0xa1, 0x0,
+        0xb0, 0xb8,
+        0xb1, 0x3a,
+        0xb2, 0x10,
+        0xb3, 0x82,
+        0xb4, 0x80,
+        0xb5, 0x82,
+        0xb6, 0x82,
+        0xb7, 0x82,
+        0xb8, 0x20,
+        0xb9, 0x0,
+        0xf0, 0x0,
+        0xf1, 0x0,
+        0xf2, 0xc0,
+        0x51, 0x36,
+        0x52, 0x09,
+        0x53, 0x94,
+        0x54, 0x62,
+        0x55, 0x29,
+        0x56, 0x64,
+        0x57, 0x2b,
+        0xff, 0xff,
+};
+
+static int stv0288_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t volt)
+{
+        dprintk("%s: %s\n", __func__,
+                volt == SEC_VOLTAGE_13 ? "SEC_VOLTAGE_13" :
+                volt == SEC_VOLTAGE_18 ? "SEC_VOLTAGE_18" : "??");
+
+        return 0;
+}
+
+static int stv0288_init(struct dvb_frontend *fe)
+{
+        struct stv0288_state *state = fe->demodulator_priv;
+        int i;
+        u8 reg;
+        u8 val;
+
+        dprintk("stv0288: init chip\n");
+        stv0288_writeregI(state, 0x41, 0x04);
+        msleep(50);
+
+        /* we have default inittab */
+        if (state->config->inittab == NULL) {
+                for (i = 0; !(stv0288_inittab[i] == 0xff &&
+                                stv0288_inittab[i + 1] == 0xff); i += 2)
+                        stv0288_writeregI(state, stv0288_inittab[i],
+                                        stv0288_inittab[i + 1]);
+        } else {
+                for (i = 0; ; i += 2)  {
+                        reg = state->config->inittab[i];
+                        val = state->config->inittab[i+1];
+                        if (reg == 0xff && val == 0xff)
+                                break;
+                        stv0288_writeregI(state, reg, val);
+                }
+        }
+        return 0;
+}
+
+static int stv0288_read_status(struct dvb_frontend *fe, fe_status_t *status)
+{
+        struct stv0288_state *state = fe->demodulator_priv;
+
+        u8 sync = stv0288_readreg(state, 0x24);
+        if (sync == 255)
+                sync = 0;
+
+        dprintk("%s : FE_READ_STATUS : VSTATUS: 0x%02x\n", __func__, sync);
+
+        *status = 0;
+
+        if ((sync & 0x08) == 0x08) {
+                *status |= FE_HAS_LOCK;
+                dprintk("stv0288 has locked\n");
+        }
+
+        return 0;
+}
+
+static int stv0288_read_ber(struct dvb_frontend *fe, u32 *ber)
+{
+        struct stv0288_state *state = fe->demodulator_priv;
+
+        if (state->errmode != STATUS_BER)
+                return 0;
+        *ber = (stv0288_readreg(state, 0x26) << 8) |
+                                        stv0288_readreg(state, 0x27);
+        dprintk("stv0288_read_ber %d\n", *ber);
+
+        return 0;
+}
+
+
+static int stv0288_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
+{
+        struct stv0288_state *state = fe->demodulator_priv;
+
+        s32 signal =  0xffff - ((stv0288_readreg(state, 0x10) << 8));
+
+
+        signal = signal * 5 / 4;
+        *strength = (signal > 0xffff) ? 0xffff : (signal < 0) ? 0 : signal;
+        dprintk("stv0288_read_signal_strength %d\n", *strength);
+
+        return 0;
+}
+static int stv0288_sleep(struct dvb_frontend *fe)
+{
+        struct stv0288_state *state = fe->demodulator_priv;
+
+        stv0288_writeregI(state, 0x41, 0x84);
+        state->initialised = 0;
+
+        return 0;
+}
+static int stv0288_read_snr(struct dvb_frontend *fe, u16 *snr)
+{
+        struct stv0288_state *state = fe->demodulator_priv;
+
+        s32 xsnr = 0xffff - ((stv0288_readreg(state, 0x2d) << 8)
+                           | stv0288_readreg(state, 0x2e));
+        xsnr = 3 * (xsnr - 0xa100);
+        *snr = (xsnr > 0xffff) ? 0xffff : (xsnr < 0) ? 0 : xsnr;
+        dprintk("stv0288_read_snr %d\n", *snr);
+
+        return 0;
+}
+
+static int stv0288_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
+{
+        struct stv0288_state *state = fe->demodulator_priv;
+
+        if (state->errmode != STATUS_BER)
+                return 0;
+        *ucblocks = (stv0288_readreg(state, 0x26) << 8) |
+                                        stv0288_readreg(state, 0x27);
+        dprintk("stv0288_read_ber %d\n", *ucblocks);
+
+        return 0;
+}
+
+static int stv0288_set_property(struct dvb_frontend *fe, struct dtv_property *p)
+{
+        dprintk("%s(..)\n", __func__);
+        return 0;
+}
+
+static int stv0288_get_property(struct dvb_frontend *fe, struct dtv_property *p)
+{
+        dprintk("%s(..)\n", __func__);
+        return 0;
+}
+
+static int stv0288_set_frontend(struct dvb_frontend *fe,
+                                        struct dvb_frontend_parameters *dfp)
+{
+        struct stv0288_state *state = fe->demodulator_priv;
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
+
+        char tm;
+        unsigned char tda[3];
+
+        dprintk("%s : FE_SET_FRONTEND\n", __func__);
+
+        if (c->delivery_system != SYS_DVBS) {
+                        dprintk("%s: unsupported delivery "
+                                "system selected (%d)\n",
+                                __func__, c->delivery_system);
+                        return -EOPNOTSUPP;
+        }
+
+        if (state->config->set_ts_params)
+                state->config->set_ts_params(fe, 0);
+
+        /* only frequency & symbol_rate are used for tuner*/
+        dfp->frequency = c->frequency;
+        dfp->u.qpsk.symbol_rate = c->symbol_rate;
+        if (fe->ops.tuner_ops.set_params) {
+                fe->ops.tuner_ops.set_params(fe, dfp);
+                if (fe->ops.i2c_gate_ctrl)
+                        fe->ops.i2c_gate_ctrl(fe, 0);
+        }
+
+        udelay(10);
+        stv0288_set_symbolrate(fe, c->symbol_rate);
+        /* Carrier lock control register */
+        stv0288_writeregI(state, 0x15, 0xc5);
+
+        tda[0] = 0x2b; /* CFRM */
+        tda[2] = 0x0; /* CFRL */
+        for (tm = -6; tm < 7;) {
+                /* Viterbi status */
+                if (stv0288_readreg(state, 0x24) & 0x80)
+                        break;
+
+                tda[2] += 40;
+                if (tda[2] < 40)
+                        tm++;
+                tda[1] = (unsigned char)tm;
+                stv0288_writeregI(state, 0x2b, tda[1]);
+                stv0288_writeregI(state, 0x2c, tda[2]);
+                udelay(30);
+        }
+
+        state->tuner_frequency = c->frequency;
+        state->fec_inner = FEC_AUTO;
+        state->symbol_rate = c->symbol_rate;
+
+        return 0;
+}
+
+static int stv0288_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
+{
+        struct stv0288_state *state = fe->demodulator_priv;
+
+        if (enable)
+                stv0288_writeregI(state, 0x01, 0xb5);
+        else
+                stv0288_writeregI(state, 0x01, 0x35);
+
+        udelay(1);
+
+        return 0;
+}
+
+static void stv0288_release(struct dvb_frontend *fe)
+{
+        struct stv0288_state *state = fe->demodulator_priv;
+        kfree(state);
+}
+
+static struct dvb_frontend_ops stv0288_ops = {
+
+        .info = {
+                .name                   = "ST STV0288 DVB-S",
+                .type                   = FE_QPSK,
+                .frequency_min          = 950000,
+                .frequency_max          = 2150000,
+                .frequency_stepsize     = 1000,  /* kHz for QPSK frontends */
+                .frequency_tolerance    = 0,
+                .symbol_rate_min        = 1000000,
+                .symbol_rate_max        = 45000000,
+                .symbol_rate_tolerance  = 500,  /* ppm */
+                .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_QPSK |
+                      FE_CAN_FEC_AUTO
+        },
+
+        .release = stv0288_release,
+        .init = stv0288_init,
+        .sleep = stv0288_sleep,
+        .write = stv0288_write,
+        .i2c_gate_ctrl = stv0288_i2c_gate_ctrl,
+        .read_status = stv0288_read_status,
+        .read_ber = stv0288_read_ber,
+        .read_signal_strength = stv0288_read_signal_strength,
+        .read_snr = stv0288_read_snr,
+        .read_ucblocks = stv0288_read_ucblocks,
+        .diseqc_send_master_cmd = stv0288_send_diseqc_msg,
+        .diseqc_send_burst = stv0288_send_diseqc_burst,
+        .set_tone = stv0288_set_tone,
+        .set_voltage = stv0288_set_voltage,
+
+        .set_property = stv0288_set_property,
+        .get_property = stv0288_get_property,
+        .set_frontend = stv0288_set_frontend,
+};
+
+struct dvb_frontend *stv0288_attach(const struct stv0288_config *config,
+                                    struct i2c_adapter *i2c)
+{
+        struct stv0288_state *state = NULL;
+        int id;
+
+        /* allocate memory for the internal state */
+        state = kmalloc(sizeof(struct stv0288_state), GFP_KERNEL);
+        if (state == NULL)
+                goto error;
+
+        /* setup the state */
+        state->config = config;
+        state->i2c = i2c;
+        state->initialised = 0;
+        state->tuner_frequency = 0;
+        state->symbol_rate = 0;
+        state->fec_inner = 0;
+        state->errmode = STATUS_BER;
+
+        stv0288_writeregI(state, 0x41, 0x04);
+        msleep(200);
+        id = stv0288_readreg(state, 0x00);
+        dprintk("stv0288 id %x\n", id);
+
+        /* register 0x00 contains 0x11 for STV0288  */
+        if (id != 0x11)
+                goto error;
+
+        /* create dvb_frontend */
+        memcpy(&state->frontend.ops, &stv0288_ops,
+                        sizeof(struct dvb_frontend_ops));
+        state->frontend.demodulator_priv = state;
+        return &state->frontend;
+
+error:
+        kfree(state);
+
+        return NULL;
+}
+EXPORT_SYMBOL(stv0288_attach);
+
+module_param(debug_legacy_dish_switch, int, 0444);
+MODULE_PARM_DESC(debug_legacy_dish_switch,
+                "Enable timing analysis for Dish Network legacy switches");
+
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
+
+MODULE_DESCRIPTION("ST STV0288 DVB Demodulator driver");
+MODULE_AUTHOR("Georg Acher, Bob Liu, Igor liplianin");
+MODULE_LICENSE("GPL");
+
diff --git a/drivers/media/dvb/frontends/stv0288.h b/drivers/media/dvb/frontends/stv0288.h
new file mode 100644
index 000000000000..f2b53db0606d
--- /dev/null
+++ b/drivers/media/dvb/frontends/stv0288.h
@@ -0,0 +1,67 @@
+/*
+        Driver for ST STV0288 demodulator
+
+        Copyright (C) 2006 Georg Acher, BayCom GmbH, acher (at) baycom (dot) de
+                for Reel Multimedia
+        Copyright (C) 2008 TurboSight.com, <bob@turbosight.com>
+        Copyright (C) 2008 Igor M. Liplianin <liplianin@me.by>
+                Removed stb6000 specific tuner code and revised some
+                procedures.
+
+        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 STV0288_H
+#define STV0288_H
+
+#include <linux/dvb/frontend.h>
+#include "dvb_frontend.h"
+
+struct stv0288_config {
+        /* the demodulator's i2c address */
+        u8 demod_address;
+
+        u8* inittab;
+
+        /* minimum delay before retuning */
+        int min_delay_ms;
+
+        int (*set_ts_params)(struct dvb_frontend *fe, int is_punctured);
+};
+
+#if defined(CONFIG_DVB_STV0288) || (defined(CONFIG_DVB_STV0288_MODULE) && \
+                                                        defined(MODULE))
+extern struct dvb_frontend *stv0288_attach(const struct stv0288_config *config,
+                                           struct i2c_adapter *i2c);
+#else
+static inline struct dvb_frontend *stv0288_attach(const struct stv0288_config *config,
+                                           struct i2c_adapter *i2c)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return NULL;
+}
+#endif /* CONFIG_DVB_STV0288 */
+
+static inline int stv0288_writereg(struct dvb_frontend *fe, u8 reg, u8 val)
+{
+        int r = 0;
+        u8 buf[] = { reg, val };
+        if (fe->ops.write)
+                r = fe->ops.write(fe, buf, 2);
+        return r;
+}
+
+#endif /* STV0288_H */
diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c
index 35435bef8e79..6c1cb1973c6e 100644
--- a/drivers/media/dvb/frontends/stv0299.c
+++ b/drivers/media/dvb/frontends/stv0299.c
@@ -559,6 +559,8 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
         int invval = 0;
 
         dprintk ("%s : FE_SET_FRONTEND\n", __func__);
+        if (state->config->set_ts_params)
+                state->config->set_ts_params(fe, 0);
 
         // set the inversion
         if (p->inversion == INVERSION_OFF) invval = 0;
diff --git a/drivers/media/dvb/frontends/stv0299.h b/drivers/media/dvb/frontends/stv0299.h
index 3282f43022f5..0fd96e22b650 100644
--- a/drivers/media/dvb/frontends/stv0299.h
+++ b/drivers/media/dvb/frontends/stv0299.h
@@ -89,15 +89,18 @@ struct stv0299_config
         int min_delay_ms;
 
         /* Set the symbol rate */
-        int (*set_symbol_rate)(struct dvb_frontend* fe, u32 srate, u32 ratio);
+        int (*set_symbol_rate)(struct dvb_frontend *fe, u32 srate, u32 ratio);
+
+        /* Set device param to start dma */
+        int (*set_ts_params)(struct dvb_frontend *fe, int is_punctured);
 };
 
 #if defined(CONFIG_DVB_STV0299) || (defined(CONFIG_DVB_STV0299_MODULE) && defined(MODULE))
-extern struct dvb_frontend* stv0299_attach(const struct stv0299_config* config,
-                                           struct i2c_adapter* i2c);
+extern struct dvb_frontend *stv0299_attach(const struct stv0299_config *config,
+                                           struct i2c_adapter *i2c);
 #else
-static inline struct dvb_frontend* stv0299_attach(const struct stv0299_config* config,
-                                           struct i2c_adapter* i2c)
+static inline struct dvb_frontend *stv0299_attach(const struct stv0299_config *config,
+                                           struct i2c_adapter *i2c)
 {
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
         return NULL;
diff --git a/drivers/media/dvb/frontends/tdhd1.h b/drivers/media/dvb/frontends/tdhd1.h
new file mode 100644
index 000000000000..51f170678650
--- /dev/null
+++ b/drivers/media/dvb/frontends/tdhd1.h
@@ -0,0 +1,73 @@
+/*
+ * tdhd1.h - ALPS TDHD1-204A tuner support
+ *
+ * Copyright (C) 2008 Oliver Endriss <o.endriss@gmx.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.
+ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
+ *
+ *
+ * The project's page is at http://www.linuxtv.org
+ */
+
+#ifndef TDHD1_H
+#define TDHD1_H
+
+#include "tda1004x.h"
+
+static int alps_tdhd1_204_request_firmware(struct dvb_frontend *fe, const struct firmware **fw, char *name);
+
+static struct tda1004x_config alps_tdhd1_204a_config = {
+        .demod_address = 0x8,
+        .invert = 1,
+        .invert_oclk = 0,
+        .xtal_freq = TDA10046_XTAL_4M,
+        .agc_config = TDA10046_AGC_DEFAULT,
+        .if_freq = TDA10046_FREQ_3617,
+        .request_firmware = alps_tdhd1_204_request_firmware
+};
+
+static int alps_tdhd1_204a_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
+{
+        struct i2c_adapter *i2c = fe->tuner_priv;
+        u8 data[4];
+        struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };
+        u32 div;
+
+        div = (params->frequency + 36166666) / 166666;
+
+        data[0] = (div >> 8) & 0x7f;
+        data[1] = div & 0xff;
+        data[2] = 0x85;
+
+        if (params->frequency >= 174000000 && params->frequency <= 230000000)
+                data[3] = 0x02;
+        else if (params->frequency >= 470000000 && params->frequency <= 823000000)
+                data[3] = 0x0C;
+        else if (params->frequency > 823000000 && params->frequency <= 862000000)
+                data[3] = 0x8C;
+        else
+                return -EINVAL;
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
+        if (i2c_transfer(i2c, &msg, 1) != 1)
+                return -EIO;
+
+        return 0;
+}
+
+#endif /* TDHD1_H */
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig
index 41b5a988b619..867027ceab3e 100644
--- a/drivers/media/dvb/ttpci/Kconfig
+++ b/drivers/media/dvb/ttpci/Kconfig
@@ -86,6 +86,7 @@ config DVB_BUDGET
         select DVB_TDA10086 if !DVB_FE_CUSTOMISE
         select DVB_TDA826X if !DVB_FE_CUSTOMISE
         select DVB_LNBP21 if !DVB_FE_CUSTOMISE
+        select DVB_TDA1004X if !DVB_FE_CUSTOMISE
         help
           Support for simple SAA7146 based DVB cards (so called Budget-
           or Nova-PCI cards) without onboard MPEG2 decoder, and without
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 0777e8f9544b..c7c770c28988 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -88,6 +88,7 @@ static int budgetpatch;
 static int wss_cfg_4_3 = 0x4008;
 static int wss_cfg_16_9 = 0x0007;
 static int tv_standard;
+static int full_ts;
 
 module_param_named(debug, av7110_debug, int, 0644);
 MODULE_PARM_DESC(debug, "debug level (bitmask, default 0)");
@@ -106,6 +107,8 @@ module_param(volume, int, 0444);
 MODULE_PARM_DESC(volume, "initial volume: default 255 (range 0-255)");
 module_param(budgetpatch, int, 0444);
 MODULE_PARM_DESC(budgetpatch, "use budget-patch hardware modification: default 0 (0 no, 1 autodetect, 2 always)");
+module_param(full_ts, int, 0444);
+MODULE_PARM_DESC(full_ts, "enable code for full-ts hardware modification: 0 disable (default), 1 enable");
 module_param(wss_cfg_4_3, int, 0444);
 MODULE_PARM_DESC(wss_cfg_4_3, "WSS 4:3 - default 0x4008 - bit 15: disable, 14: burst mode, 13..0: wss data");
 module_param(wss_cfg_16_9, int, 0444);
@@ -116,6 +119,8 @@ MODULE_PARM_DESC(tv_standard, "TV standard: 0 PAL (default), 1 NTSC");
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 static void restart_feeds(struct av7110 *av7110);
+static int budget_start_feed(struct dvb_demux_feed *feed);
+static int budget_stop_feed(struct dvb_demux_feed *feed);
 
 static int av7110_num;
 
@@ -376,9 +381,9 @@ static inline void start_debi_dma(struct av7110 *av7110, int dir,
                 irdebi(av7110, DEBISWAB, addr, 0, len);
 }
 
-static void debiirq(unsigned long data)
+static void debiirq(unsigned long cookie)
 {
-        struct av7110 *av7110 = (struct av7110 *) data;
+        struct av7110 *av7110 = (struct av7110 *)cookie;
         int type = av7110->debitype;
         int handle = (type >> 8) & 0x1f;
         unsigned int xfer = 0;
@@ -487,9 +492,9 @@ debi_done:
 }
 
 /* irq from av7110 firmware writing the mailbox register in the DPRAM */
-static void gpioirq(unsigned long data)
+static void gpioirq(unsigned long cookie)
 {
-        struct av7110 *av7110 = (struct av7110 *) data;
+        struct av7110 *av7110 = (struct av7110 *)cookie;
         u32 rxbuf, txbuf;
         int len;
 
@@ -806,6 +811,9 @@ static int StartHWFilter(struct dvb_demux_filter *dvbdmxfilter)
 
         dprintk(4, "%p\n", av7110);
 
+        if (av7110->full_ts)
+                return 0;
+
         if (dvbdmxfilter->type == DMX_TYPE_SEC) {
                 if (hw_sections) {
                         buf[4] = (dvbdmxfilter->filter.filter_value[0] << 8) |
@@ -854,6 +862,9 @@ static int StopHWFilter(struct dvb_demux_filter *dvbdmxfilter)
 
         dprintk(4, "%p\n", av7110);
 
+        if (av7110->full_ts)
+                return 0;
+
         handle = dvbdmxfilter->hw_handle;
         if (handle >= 32) {
                 printk("%s tried to stop invalid filter %04x, filter type = %x\n",
@@ -913,7 +924,7 @@ static int dvb_feed_start_pid(struct dvb_demux_feed *dvbdmxfeed)
                                 return ret;
                 }
 
-        if ((dvbdmxfeed->ts_type & TS_PACKET)) {
+        if ((dvbdmxfeed->ts_type & TS_PACKET) && !av7110->full_ts) {
                 if (dvbdmxfeed->pes_type == 0 && !(dvbdmx->pids[0] & 0x8000))
                         ret = av7110_av_start_record(av7110, RP_AUDIO, dvbdmxfeed);
                 if (dvbdmxfeed->pes_type == 1 && !(dvbdmx->pids[1] & 0x8000))
@@ -974,7 +985,7 @@ static int av7110_start_feed(struct dvb_demux_feed *feed)
         if (!demux->dmx.frontend)
                 return -EINVAL;
 
-        if (feed->pid > 0x1fff)
+        if (!av7110->full_ts && feed->pid > 0x1fff)
                 return -EINVAL;
 
         if (feed->type == DMX_TYPE_TS) {
@@ -1003,7 +1014,12 @@ static int av7110_start_feed(struct dvb_demux_feed *feed)
                 }
         }
 
-        else if (feed->type == DMX_TYPE_SEC) {
+        if (av7110->full_ts) {
+                budget_start_feed(feed);
+                return ret;
+        }
+
+        if (feed->type == DMX_TYPE_SEC) {
                 int i;
 
                 for (i = 0; i < demux->filternum; i++) {
@@ -1050,7 +1066,12 @@ static int av7110_stop_feed(struct dvb_demux_feed *feed)
                                 ret = StopHWFilter(feed->filter);
         }
 
-        if (!ret && feed->type == DMX_TYPE_SEC) {
+        if (av7110->full_ts) {
+                budget_stop_feed(feed);
+                return ret;
+        }
+
+        if (feed->type == DMX_TYPE_SEC) {
                 for (i = 0; i<demux->filternum; i++) {
                         if (demux->filter[i].state == DMX_STATE_GO &&
                             demux->filter[i].filter.parent == &feed->feed.sec) {
@@ -1074,6 +1095,7 @@ static void restart_feeds(struct av7110 *av7110)
         struct dvb_demux *dvbdmx = &av7110->demux;
         struct dvb_demux_feed *feed;
         int mode;
+        int feeding;
         int i, j;
 
         dprintk(4, "%p\n", av7110);
@@ -1082,6 +1104,8 @@ static void restart_feeds(struct av7110 *av7110)
         av7110->playing = 0;
         av7110->rec_mode = 0;
 
+        feeding = av7110->feeding1; /* full_ts mod */
+
         for (i = 0; i < dvbdmx->feednum; i++) {
                 feed = &dvbdmx->feed[i];
                 if (feed->state == DMX_STATE_GO) {
@@ -1099,6 +1123,8 @@ static void restart_feeds(struct av7110 *av7110)
                 }
         }
 
+        av7110->feeding1 = feeding; /* full_ts mod */
+
         if (mode)
                 av7110_av_start_play(av7110, mode);
 }
@@ -1197,8 +1223,9 @@ static int start_ts_capture(struct av7110 *budget)
 
         if (budget->feeding1)
                 return ++budget->feeding1;
-        memset(budget->grabbing, 0x00, TS_HEIGHT * TS_WIDTH);
+        memset(budget->grabbing, 0x00, TS_BUFLEN);
         budget->ttbp = 0;
+        SAA7146_ISR_CLEAR(budget->dev, MASK_10);  /* VPE */
         SAA7146_IER_ENABLE(budget->dev, MASK_10); /* VPE */
         saa7146_write(budget->dev, MC1, (MASK_04 | MASK_20)); /* DMA3 on */
         return ++budget->feeding1;
@@ -1233,18 +1260,14 @@ static int budget_stop_feed(struct dvb_demux_feed *feed)
         return status;
 }
 
-static void vpeirq(unsigned long data)
+static void vpeirq(unsigned long cookie)
 {
-        struct av7110 *budget = (struct av7110 *) data;
+        struct av7110 *budget = (struct av7110 *)cookie;
         u8 *mem = (u8 *) (budget->grabbing);
         u32 olddma = budget->ttbp;
         u32 newdma = saa7146_read(budget->dev, PCI_VDP3);
+        struct dvb_demux *demux = budget->full_ts ? &budget->demux : &budget->demux1;
 
-        if (!budgetpatch) {
-                printk("av7110.c: vpeirq() called while budgetpatch disabled!"
-                       " check saa7146 IER register\n");
-                BUG();
-        }
         /* nearest lower position divisible by 188 */
         newdma -= newdma % 188;
 
@@ -1268,11 +1291,11 @@ static void vpeirq(unsigned long data)
 
         if (newdma > olddma)
                 /* no wraparound, dump olddma..newdma */
-                dvb_dmx_swfilter_packets(&budget->demux1, mem + olddma, (newdma - olddma) / 188);
+                dvb_dmx_swfilter_packets(demux, mem + olddma, (newdma - olddma) / 188);
         else {
                 /* wraparound, dump olddma..buflen and 0..newdma */
-                dvb_dmx_swfilter_packets(&budget->demux1, mem + olddma, (TS_BUFLEN - olddma) / 188);
-                dvb_dmx_swfilter_packets(&budget->demux1, mem, newdma / 188);
+                dvb_dmx_swfilter_packets(demux, mem + olddma, (TS_BUFLEN - olddma) / 188);
+                dvb_dmx_swfilter_packets(demux, mem, newdma / 188);
         }
 }
 
@@ -1294,8 +1317,8 @@ static int av7110_register(struct av7110 *av7110)
         for (i = 0; i < 32; i++)
                 av7110->handle2filter[i] = NULL;
 
-        dvbdemux->filternum = 32;
-        dvbdemux->feednum = 32;
+        dvbdemux->filternum = (av7110->full_ts) ? 256 : 32;
+        dvbdemux->feednum = (av7110->full_ts) ? 256 : 32;
         dvbdemux->start_feed = av7110_start_feed;
         dvbdemux->stop_feed = av7110_stop_feed;
         dvbdemux->write_to_decoder = av7110_write_to_decoder;
@@ -1305,7 +1328,7 @@ static int av7110_register(struct av7110 *av7110)
         dvb_dmx_init(&av7110->demux);
         av7110->demux.dmx.get_stc = dvb_get_stc;
 
-        av7110->dmxdev.filternum = 32;
+        av7110->dmxdev.filternum = (av7110->full_ts) ? 256 : 32;
         av7110->dmxdev.demux = &dvbdemux->dmx;
         av7110->dmxdev.capabilities = 0;
 
@@ -1422,7 +1445,6 @@ int i2c_writereg(struct av7110 *av7110, u8 id, u8 reg, u8 val)
         return i2c_transfer(&av7110->i2c_adap, &msgs, 1);
 }
 
-#if 0
 u8 i2c_readreg(struct av7110 *av7110, u8 id, u8 reg)
 {
         u8 mm1[] = {0x00};
@@ -1439,7 +1461,6 @@ u8 i2c_readreg(struct av7110 *av7110, u8 id, u8 reg)
 
         return mm2[0];
 }
-#endif
 
 /****************************************************************************
  * INITIALIZATION
@@ -2256,7 +2277,7 @@ static int frontend_init(struct av7110 *av7110)
         if (!av7110->fe) {
                 /* FIXME: propagate the failure code from the lower layers */
                 ret = -ENOMEM;
-                printk("dvb-ttpci: A frontend driver was not found for device %04x/%04x subsystem %04x/%04x\n",
+                printk("dvb-ttpci: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",
                        av7110->dev->pci->vendor,
                        av7110->dev->pci->device,
                        av7110->dev->pci->subsystem_vendor,
@@ -2484,7 +2505,47 @@ static int __devinit av7110_attach(struct saa7146_dev* dev,
                                av7110->dvb_adapter.proposed_mac);
         ret = -ENOMEM;
 
-        if (budgetpatch) {
+        /* full-ts mod? */
+        if (full_ts)
+                av7110->full_ts = true;
+
+        /* check for full-ts flag in eeprom */
+        if (i2c_readreg(av7110, 0xaa, 0) == 0x4f && i2c_readreg(av7110, 0xaa, 1) == 0x45) {
+                u8 flags = i2c_readreg(av7110, 0xaa, 2);
+                if (flags != 0xff && (flags & 0x01))
+                        av7110->full_ts = true;
+        }
+
+        if (av7110->full_ts) {
+                printk(KERN_INFO "dvb-ttpci: full-ts mode enabled for saa7146 port B\n");
+                spin_lock_init(&av7110->feedlock1);
+                av7110->grabbing = saa7146_vmalloc_build_pgtable(pdev, length,
+                                                                 &av7110->pt);
+                if (!av7110->grabbing)
+                        goto err_i2c_del_3;
+
+                saa7146_write(dev, DD1_STREAM_B, 0x00000000);
+                saa7146_write(dev, MC2, (MASK_10 | MASK_26));
+
+                saa7146_write(dev, DD1_INIT, 0x00000600);
+                saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26));
+
+                saa7146_write(dev, BRS_CTRL, 0x60000000);
+                saa7146_write(dev, MC2, MASK_08 | MASK_24);
+
+                /* dma3 */
+                saa7146_write(dev, PCI_BT_V1, 0x001c0000 | (saa7146_read(dev, PCI_BT_V1) & ~0x001f0000));
+                saa7146_write(dev, BASE_ODD3, 0);
+                saa7146_write(dev, BASE_EVEN3, 0);
+                saa7146_write(dev, PROT_ADDR3, TS_WIDTH * TS_HEIGHT);
+                saa7146_write(dev, PITCH3, TS_WIDTH);
+                saa7146_write(dev, BASE_PAGE3, av7110->pt.dma | ME1 | 0x90);
+                saa7146_write(dev, NUM_LINE_BYTE3, (TS_HEIGHT << 16) | TS_WIDTH);
+                saa7146_write(dev, MC2, MASK_04 | MASK_20);
+
+                tasklet_init(&av7110->vpe_tasklet, vpeirq, (unsigned long) av7110);
+
+        } else if (budgetpatch) {
                 spin_lock_init(&av7110->feedlock1);
                 av7110->grabbing = saa7146_vmalloc_build_pgtable(pdev, length,
                                                                  &av7110->pt);
@@ -2710,11 +2771,13 @@ static int __devexit av7110_detach(struct saa7146_dev* saa)
 #if defined(CONFIG_INPUT_EVDEV) || defined(CONFIG_INPUT_EVDEV_MODULE)
         av7110_ir_exit(av7110);
 #endif
-        if (budgetpatch) {
-                /* Disable RPS1 */
-                saa7146_write(saa, MC1, MASK_29);
-                /* VSYNC LOW (inactive) */
-                saa7146_setgpio(saa, 3, SAA7146_GPIO_OUTLO);
+        if (budgetpatch || av7110->full_ts) {
+                if (budgetpatch) {
+                        /* Disable RPS1 */
+                        saa7146_write(saa, MC1, MASK_29);
+                        /* VSYNC LOW (inactive) */
+                        saa7146_setgpio(saa, 3, SAA7146_GPIO_OUTLO);
+                }
                 saa7146_write(saa, MC1, MASK_20);       /* DMA3 off */
                 SAA7146_IER_DISABLE(saa, MASK_10);
                 SAA7146_ISR_CLEAR(saa, MASK_10);
@@ -2794,7 +2857,7 @@ static void av7110_irq(struct saa7146_dev* dev, u32 *isr)
                 tasklet_schedule(&av7110->gpio_tasklet);
         }
 
-        if ((*isr & MASK_10) && budgetpatch)
+        if (*isr & MASK_10)
                 tasklet_schedule(&av7110->vpe_tasklet);
 }
 
diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/dvb/ttpci/av7110.h
index 55f23ddcb994..d85b8512ac30 100644
--- a/drivers/media/dvb/ttpci/av7110.h
+++ b/drivers/media/dvb/ttpci/av7110.h
@@ -192,6 +192,7 @@ struct av7110 {
         unsigned char           *grabbing;
         struct saa7146_pgtable  pt;
         struct tasklet_struct   vpe_tasklet;
+        bool                    full_ts;
 
         int                     fe_synced;
         struct mutex            pid_mutex;
diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c
index 184647ad1c7c..bdc62acf2099 100644
--- a/drivers/media/dvb/ttpci/av7110_av.c
+++ b/drivers/media/dvb/ttpci/av7110_av.c
@@ -788,6 +788,9 @@ int av7110_write_to_decoder(struct dvb_demux_feed *feed, const u8 *buf, size_t l
 
         dprintk(2, "av7110:%p, \n", av7110);
 
+        if (av7110->full_ts && demux->dmx.frontend->source != DMX_MEMORY_FE)
+                return 0;
+
         switch (feed->pes_type) {
         case 0:
                 if (av7110->audiostate.stream_source == AUDIO_SOURCE_MEMORY)
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c
index b7d1f2f18d3a..1032ea77837e 100644
--- a/drivers/media/dvb/ttpci/budget-av.c
+++ b/drivers/media/dvb/ttpci/budget-av.c
@@ -57,6 +57,8 @@
 #define SLOTSTATUS_READY        8
 #define SLOTSTATUS_OCCUPIED     (SLOTSTATUS_PRESENT|SLOTSTATUS_RESET|SLOTSTATUS_READY)
 
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
 struct budget_av {
         struct budget budget;
         struct video_device *vd;
@@ -1049,7 +1051,7 @@ static void frontend_init(struct budget_av *budget_av)
 
         if (fe == NULL) {
                 printk(KERN_ERR "budget-av: A frontend driver was not found "
-                                "for device %04x/%04x subsystem %04x/%04x\n",
+                                "for device [%04x:%04x] subsystem [%04x:%04x]\n",
                        saa->pci->vendor,
                        saa->pci->device,
                        saa->pci->subsystem_vendor,
@@ -1127,7 +1129,9 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
 
         dev->ext_priv = budget_av;
 
-        if ((err = ttpci_budget_init(&budget_av->budget, dev, info, THIS_MODULE))) {
+        err = ttpci_budget_init(&budget_av->budget, dev, info, THIS_MODULE,
+                                adapter_nr);
+        if (err) {
                 kfree(budget_av);
                 return err;
         }
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 060e7c785326..0a5aad45435d 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -92,6 +92,8 @@ static int ir_debug;
 module_param(ir_debug, int, 0644);
 MODULE_PARM_DESC(ir_debug, "enable debugging information for IR decoding");
 
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
 struct budget_ci_ir {
         struct input_dev *dev;
         struct tasklet_struct msp430_irq_tasklet;
@@ -1153,7 +1155,7 @@ static void frontend_init(struct budget_ci *budget_ci)
         }
 
         if (budget_ci->budget.dvb_frontend == NULL) {
-                printk("budget-ci: A frontend driver was not found for device %04x/%04x subsystem %04x/%04x\n",
+                printk("budget-ci: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",
                        budget_ci->budget.dev->pci->vendor,
                        budget_ci->budget.dev->pci->device,
                        budget_ci->budget.dev->pci->subsystem_vendor,
@@ -1183,7 +1185,8 @@ static int budget_ci_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
 
         dev->ext_priv = budget_ci;
 
-        err = ttpci_budget_init(&budget_ci->budget, dev, info, THIS_MODULE);
+        err = ttpci_budget_init(&budget_ci->budget, dev, info, THIS_MODULE,
+                                adapter_nr);
         if (err)
                 goto out2;
 
diff --git a/drivers/media/dvb/ttpci/budget-core.c b/drivers/media/dvb/ttpci/budget-core.c
index 6f4ddb643fee..ba18e56d5f11 100644
--- a/drivers/media/dvb/ttpci/budget-core.c
+++ b/drivers/media/dvb/ttpci/budget-core.c
@@ -57,8 +57,6 @@ module_param_named(bufsize, dma_buffer_size, int, 0444);
 MODULE_PARM_DESC(debug, "Turn on/off budget debugging (default:off).");
 MODULE_PARM_DESC(bufsize, "DMA buffer size in KB, default: 188, min: 188, max: 1410 (Activy: 564)");
 
-DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
-
 /****************************************************************************
  * TT budget / WinTV Nova
  ****************************************************************************/
@@ -411,7 +409,7 @@ static void budget_unregister(struct budget *budget)
 
 int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
                       struct saa7146_pci_extension_data *info,
-                      struct module *owner)
+                      struct module *owner, short *adapter_nums)
 {
         int ret = 0;
         struct budget_info *bi = info->ext_priv;
@@ -474,7 +472,7 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
         printk("%s: dma buffer size %u\n", budget->dev->name, budget->buffer_size);
 
         ret = dvb_register_adapter(&budget->dvb_adapter, budget->card->name,
-                                   owner, &budget->dev->pci->dev, adapter_nr);
+                                   owner, &budget->dev->pci->dev, adapter_nums);
         if (ret < 0)
                 return ret;
 
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c
index aa5ed4ef19f2..60136688a9a4 100644
--- a/drivers/media/dvb/ttpci/budget-patch.c
+++ b/drivers/media/dvb/ttpci/budget-patch.c
@@ -39,6 +39,8 @@
 
 #include "bsru6.h"
 
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
 #define budget_patch budget
 
 static struct saa7146_extension budget_extension;
@@ -360,7 +362,7 @@ static void frontend_init(struct budget_patch* budget)
         }
 
         if (budget->dvb_frontend == NULL) {
-                printk("dvb-ttpci: A frontend driver was not found for device %04x/%04x subsystem %04x/%04x\n",
+                printk("dvb-ttpci: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",
                        budget->dev->pci->vendor,
                        budget->dev->pci->device,
                        budget->dev->pci->subsystem_vendor,
@@ -592,8 +594,9 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
 
         dprintk(2, "budget: %p\n", budget);
 
-        if ((err = ttpci_budget_init (budget, dev, info, THIS_MODULE))) {
-                kfree (budget);
+        err = ttpci_budget_init(budget, dev, info, THIS_MODULE, adapter_nr);
+        if (err) {
+                kfree(budget);
                 return err;
         }
 
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index f0068996ac07..1638e1d9f538 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -46,11 +46,14 @@
 #include "lnbp21.h"
 #include "bsru6.h"
 #include "bsbe1.h"
+#include "tdhd1.h"
 
 static int diseqc_method;
 module_param(diseqc_method, int, 0444);
 MODULE_PARM_DESC(diseqc_method, "Select DiSEqC method for subsystem id 13c2:1003, 0: default, 1: more reliable (for newer revisions only)");
 
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
 static void Set22K (struct budget *budget, int state)
 {
         struct saa7146_dev *dev=budget->dev;
@@ -390,6 +393,13 @@ static struct stv0299_config alps_bsbe1_config_activy = {
         .set_symbol_rate = alps_bsbe1_set_symbol_rate,
 };
 
+static int alps_tdhd1_204_request_firmware(struct dvb_frontend *fe, const struct firmware **fw, char *name)
+{
+        struct budget *budget = (struct budget *)fe->dvb->priv;
+
+        return request_firmware(fw, name, &budget->dev->pci->dev);
+}
+
 
 static int i2c_readreg(struct i2c_adapter *i2c, u8 adr, u8 reg)
 {
@@ -511,6 +521,14 @@ static void frontend_init(struct budget *budget)
                 }
                 break;
 
+        case 0x5f60: /* Fujitsu Siemens Activy Budget-T PCI rev AL (tda10046/ALPS TDHD1-204A) */
+                budget->dvb_frontend = dvb_attach(tda10046_attach, &alps_tdhd1_204a_config, &budget->i2c_adap);
+                if (budget->dvb_frontend) {
+                        budget->dvb_frontend->ops.tuner_ops.set_params = alps_tdhd1_204a_tuner_set_params;
+                        budget->dvb_frontend->tuner_priv = &budget->i2c_adap;
+                }
+                break;
+
         case 0x5f61: /* Fujitsu Siemens Activy Budget-T PCI rev GR (L64781/Grundig 29504-401(tsa5060)) */
                 budget->dvb_frontend = dvb_attach(l64781_attach, &grundig_29504_401_config_activy, &budget->i2c_adap);
                 if (budget->dvb_frontend) {
@@ -550,7 +568,7 @@ static void frontend_init(struct budget *budget)
         }
 
         if (budget->dvb_frontend == NULL) {
-                printk("budget: A frontend driver was not found for device %04x/%04x subsystem %04x/%04x\n",
+                printk("budget: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",
                        budget->dev->pci->vendor,
                        budget->dev->pci->device,
                        budget->dev->pci->subsystem_vendor,
@@ -582,7 +600,8 @@ static int budget_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_
 
         dev->ext_priv = budget;
 
-        if ((err = ttpci_budget_init (budget, dev, info, THIS_MODULE))) {
+        err = ttpci_budget_init(budget, dev, info, THIS_MODULE, adapter_nr);
+        if (err) {
                 printk("==> failed\n");
                 kfree (budget);
                 return err;
@@ -624,6 +643,7 @@ MAKE_BUDGET_INFO(ttbs1401, "TT-Budget-S-1401 PCI", BUDGET_TT);
 MAKE_BUDGET_INFO(fsacs0, "Fujitsu Siemens Activy Budget-S PCI (rev GR/grundig frontend)", BUDGET_FS_ACTIVY);
 MAKE_BUDGET_INFO(fsacs1, "Fujitsu Siemens Activy Budget-S PCI (rev AL/alps frontend)", BUDGET_FS_ACTIVY);
 MAKE_BUDGET_INFO(fsact,  "Fujitsu Siemens Activy Budget-T PCI (rev GR/Grundig frontend)", BUDGET_FS_ACTIVY);
+MAKE_BUDGET_INFO(fsact1, "Fujitsu Siemens Activy Budget-T PCI (rev AL/ALPS TDHD1-204A)", BUDGET_FS_ACTIVY);
 
 static struct pci_device_id pci_tbl[] = {
         MAKE_EXTENSION_PCI(ttbs,  0x13c2, 0x1003),
@@ -634,6 +654,7 @@ static struct pci_device_id pci_tbl[] = {
         MAKE_EXTENSION_PCI(ttbs1401, 0x13c2, 0x1018),
         MAKE_EXTENSION_PCI(fsacs1,0x1131, 0x4f60),
         MAKE_EXTENSION_PCI(fsacs0,0x1131, 0x4f61),
+        MAKE_EXTENSION_PCI(fsact1, 0x1131, 0x5f60),
         MAKE_EXTENSION_PCI(fsact, 0x1131, 0x5f61),
         {
                 .vendor    = 0,
diff --git a/drivers/media/dvb/ttpci/budget.h b/drivers/media/dvb/ttpci/budget.h
index dd450b739bff..86435bf16260 100644
--- a/drivers/media/dvb/ttpci/budget.h
+++ b/drivers/media/dvb/ttpci/budget.h
@@ -109,7 +109,7 @@ static struct saa7146_pci_extension_data x_var = { \
 
 extern int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
                              struct saa7146_pci_extension_data *info,
-                             struct module *owner);
+                             struct module *owner, short *adapter_nums);
 extern void ttpci_budget_init_hooks(struct budget *budget);
 extern int ttpci_budget_deinit(struct budget *budget);
 extern void ttpci_budget_irq10_handler(struct saa7146_dev *dev, u32 * isr);
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index e6c9cd2e3b94..66ab0c6e9783 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -1614,7 +1614,7 @@ static void frontend_init(struct ttusb* ttusb)
         }
 
         if (ttusb->fe == NULL) {
-                printk("dvb-ttusb-budget: A frontend driver was not found for device %04x/%04x\n",
+                printk("dvb-ttusb-budget: A frontend driver was not found for device [%04x:%04x]\n",
                        le16_to_cpu(ttusb->dev->descriptor.idVendor),
                        le16_to_cpu(ttusb->dev->descriptor.idProduct));
         } else {
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
index de5829b863fd..ab33fec8a19f 100644
--- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@ -1665,7 +1665,7 @@ static int ttusb_dec_probe(struct usb_interface *intf,
         }
 
         if (dec->fe == NULL) {
-                printk("dvb-ttusb-dec: A frontend driver was not found for device %04x/%04x\n",
+                printk("dvb-ttusb-dec: A frontend driver was not found for device [%04x:%04x]\n",
                        le16_to_cpu(dec->udev->descriptor.idVendor),
                        le16_to_cpu(dec->udev->descriptor.idProduct));
         } else {
diff --git a/drivers/media/dvb/ttusb-dec/ttusbdecfe.c b/drivers/media/dvb/ttusb-dec/ttusbdecfe.c
index 443af24097f3..21260aad1e54 100644
--- a/drivers/media/dvb/ttusb-dec/ttusbdecfe.c
+++ b/drivers/media/dvb/ttusb-dec/ttusbdecfe.c
@@ -38,7 +38,17 @@ struct ttusbdecfe_state {
 };
 
 
-static int ttusbdecfe_read_status(struct dvb_frontend* fe, fe_status_t* status)
+static int ttusbdecfe_dvbs_read_status(struct dvb_frontend *fe,
+        fe_status_t *status)
+{
+        *status = FE_HAS_SIGNAL | FE_HAS_VITERBI |
+                FE_HAS_SYNC | FE_HAS_CARRIER | FE_HAS_LOCK;
+        return 0;
+}
+
+
+static int ttusbdecfe_dvbt_read_status(struct dvb_frontend *fe,
+        fe_status_t *status)
 {
         struct ttusbdecfe_state* state = fe->demodulator_priv;
         u8 b[] = { 0x00, 0x00, 0x00, 0x00,
@@ -251,7 +261,7 @@ static struct dvb_frontend_ops ttusbdecfe_dvbt_ops = {
 
         .get_tune_settings = ttusbdecfe_dvbt_get_tune_settings,
 
-        .read_status = ttusbdecfe_read_status,
+        .read_status = ttusbdecfe_dvbt_read_status,
 };
 
 static struct dvb_frontend_ops ttusbdecfe_dvbs_ops = {
@@ -273,7 +283,7 @@ static struct dvb_frontend_ops ttusbdecfe_dvbs_ops = {
 
         .set_frontend = ttusbdecfe_dvbs_set_frontend,
 
-        .read_status = ttusbdecfe_read_status,
+        .read_status = ttusbdecfe_dvbs_read_status,
 
         .diseqc_send_master_cmd = ttusbdecfe_dvbs_diseqc_send_master_cmd,
         .set_voltage = ttusbdecfe_dvbs_set_voltage,
diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index 1b41b3f77cf9..e51d707e58d3 100644
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -361,4 +361,16 @@ config USB_SI470X
           To compile this driver as a module, choose M here: the
           module will be called radio-silabs.
 
+config USB_MR800
+        tristate "AverMedia MR 800 USB FM radio support"
+        depends on USB && VIDEO_V4L2
+        ---help---
+          Say Y here if you want to connect this type of radio to your
+          computer's USB port. Note that the audio is not digital, and
+          you must connect the line out connector to a sound card or a
+          set of speakers.
+
+          To compile this driver as a module, choose M here: the
+          module will be called radio-mr800.
+
 endif # RADIO_ADAPTERS
diff --git a/drivers/media/radio/Makefile b/drivers/media/radio/Makefile
index 7ca71ab96b43..240ec63cdafc 100644
--- a/drivers/media/radio/Makefile
+++ b/drivers/media/radio/Makefile
@@ -18,5 +18,6 @@ obj-$(CONFIG_RADIO_TRUST) += radio-trust.o
 obj-$(CONFIG_RADIO_MAESTRO) += radio-maestro.o
 obj-$(CONFIG_USB_DSBR) += dsbr100.o
 obj-$(CONFIG_USB_SI470X) += radio-si470x.o
+obj-$(CONFIG_USB_MR800) += radio-mr800.o
 
 EXTRA_CFLAGS += -Isound
diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
index 70c65a745923..66783fffe4c1 100644
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@ -274,7 +274,7 @@ static int vidioc_querycap(struct file *file, void *priv,
 static int vidioc_g_tuner(struct file *file, void *priv,
                                 struct v4l2_tuner *v)
 {
-        struct dsbr100_device *radio = video_get_drvdata(video_devdata(file));
+        struct dsbr100_device *radio = video_drvdata(file);
 
         if (v->index > 0)
                 return -EINVAL;
@@ -306,7 +306,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,
 static int vidioc_s_frequency(struct file *file, void *priv,
                                 struct v4l2_frequency *f)
 {
-        struct dsbr100_device *radio = video_get_drvdata(video_devdata(file));
+        struct dsbr100_device *radio = video_drvdata(file);
 
         radio->curfreq = f->frequency;
         if (dsbr100_setfreq(radio, radio->curfreq)==-1)
@@ -317,7 +317,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 static int vidioc_g_frequency(struct file *file, void *priv,
                                 struct v4l2_frequency *f)
 {
-        struct dsbr100_device *radio = video_get_drvdata(video_devdata(file));
+        struct dsbr100_device *radio = video_drvdata(file);
 
         f->type = V4L2_TUNER_RADIO;
         f->frequency = radio->curfreq;
@@ -342,7 +342,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,
 static int vidioc_g_ctrl(struct file *file, void *priv,
                                 struct v4l2_control *ctrl)
 {
-        struct dsbr100_device *radio = video_get_drvdata(video_devdata(file));
+        struct dsbr100_device *radio = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -355,16 +355,20 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
 static int vidioc_s_ctrl(struct file *file, void *priv,
                                 struct v4l2_control *ctrl)
 {
-        struct dsbr100_device *radio = video_get_drvdata(video_devdata(file));
+        struct dsbr100_device *radio = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
                 if (ctrl->value) {
-                        if (dsbr100_stop(radio)==-1)
+                        if (dsbr100_stop(radio) == -1) {
                                 warn("Radio did not respond properly");
+                                return -EBUSY;
+                        }
                 } else {
-                        if (dsbr100_start(radio)==-1)
+                        if (dsbr100_start(radio) == -1) {
                                 warn("Radio did not respond properly");
+                                return -EBUSY;
+                        }
                 }
                 return 0;
         }
@@ -405,23 +409,26 @@ static int vidioc_s_audio(struct file *file, void *priv,
 
 static int usb_dsbr100_open(struct inode *inode, struct file *file)
 {
-        struct dsbr100_device *radio=video_get_drvdata(video_devdata(file));
+        struct dsbr100_device *radio = video_drvdata(file);
 
+        lock_kernel();
         radio->users = 1;
         radio->muted = 1;
 
         if (dsbr100_start(radio)<0) {
                 warn("Radio did not start up properly");
                 radio->users = 0;
+                unlock_kernel();
                 return -EIO;
         }
         dsbr100_setfreq(radio, radio->curfreq);
+        unlock_kernel();
         return 0;
 }
 
 static int usb_dsbr100_close(struct inode *inode, struct file *file)
 {
-        struct dsbr100_device *radio=video_get_drvdata(video_devdata(file));
+        struct dsbr100_device *radio = video_drvdata(file);
 
         if (!radio)
                 return -ENODEV;
@@ -507,7 +514,8 @@ static int usb_dsbr100_probe(struct usb_interface *intf,
 static int __init dsbr100_init(void)
 {
         int retval = usb_register(&usb_dsbr100_driver);
-        info(DRIVER_VERSION ":" DRIVER_DESC);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
         return retval;
 }
 
diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
index 1f064f4b32df..9305e958fc66 100644
--- a/drivers/media/radio/radio-aimslab.c
+++ b/drivers/media/radio/radio-aimslab.c
@@ -51,6 +51,7 @@ static struct mutex lock;
 
 struct rt_device
 {
+        unsigned long in_use;
         int port;
         int curvol;
         unsigned long curfreq;
@@ -245,8 +246,7 @@ static int vidioc_querycap(struct file *file, void  *priv,
 static int vidioc_g_tuner(struct file *file, void *priv,
                                         struct v4l2_tuner *v)
 {
-        struct video_device *dev = video_devdata(file);
-        struct rt_device *rt = dev->priv;
+        struct rt_device *rt = video_drvdata(file);
 
         if (v->index > 0)
                 return -EINVAL;
@@ -273,8 +273,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,
 static int vidioc_s_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct rt_device *rt = dev->priv;
+        struct rt_device *rt = video_drvdata(file);
 
         rt->curfreq = f->frequency;
         rt_setfreq(rt, rt->curfreq);
@@ -284,8 +283,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 static int vidioc_g_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct rt_device *rt = dev->priv;
+        struct rt_device *rt = video_drvdata(file);
 
         f->type = V4L2_TUNER_RADIO;
         f->frequency = rt->curfreq;
@@ -310,8 +308,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,
 static int vidioc_g_ctrl(struct file *file, void *priv,
                                         struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct rt_device *rt = dev->priv;
+        struct rt_device *rt = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -327,8 +324,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
 static int vidioc_s_ctrl(struct file *file, void *priv,
                                         struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct rt_device *rt = dev->priv;
+        struct rt_device *rt = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -378,10 +374,21 @@ static int vidioc_s_audio(struct file *file, void *priv,
 
 static struct rt_device rtrack_unit;
 
+static int rtrack_exclusive_open(struct inode *inode, struct file *file)
+{
+        return test_and_set_bit(0, &rtrack_unit.in_use) ? -EBUSY : 0;
+}
+
+static int rtrack_exclusive_release(struct inode *inode, struct file *file)
+{
+        clear_bit(0, &rtrack_unit.in_use);
+        return 0;
+}
+
 static const struct file_operations rtrack_fops = {
         .owner          = THIS_MODULE,
-        .open           = video_exclusive_open,
-        .release        = video_exclusive_release,
+        .open           = rtrack_exclusive_open,
+        .release        = rtrack_exclusive_release,
         .ioctl          = video_ioctl2,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
@@ -408,6 +415,7 @@ static struct video_device rtrack_radio = {
         .name           = "RadioTrack radio",
         .fops           = &rtrack_fops,
         .ioctl_ops      = &rtrack_ioctl_ops,
+        .release        = video_device_release_empty,
 };
 
 static int __init rtrack_init(void)
@@ -424,7 +432,7 @@ static int __init rtrack_init(void)
                 return -EBUSY;
         }
 
-        rtrack_radio.priv=&rtrack_unit;
+        video_set_drvdata(&rtrack_radio, &rtrack_unit);
 
         if (video_register_device(&rtrack_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
                 release_region(io, 2);
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c
index 628c689e3ffe..d78489573230 100644
--- a/drivers/media/radio/radio-aztech.c
+++ b/drivers/media/radio/radio-aztech.c
@@ -70,6 +70,7 @@ static struct mutex lock;
 
 struct az_device
 {
+        unsigned long in_use;
         int curvol;
         unsigned long curfreq;
         int stereo;
@@ -195,8 +196,7 @@ static int vidioc_querycap (struct file *file, void  *priv,
 static int vidioc_g_tuner (struct file *file, void *priv,
                                 struct v4l2_tuner *v)
 {
-        struct video_device *dev = video_devdata(file);
-        struct az_device *az = dev->priv;
+        struct az_device *az = video_drvdata(file);
 
         if (v->index > 0)
                 return -EINVAL;
@@ -264,8 +264,7 @@ static int vidioc_s_audio (struct file *file, void *priv,
 static int vidioc_s_frequency (struct file *file, void *priv,
                                 struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct az_device *az = dev->priv;
+        struct az_device *az = video_drvdata(file);
 
         az->curfreq = f->frequency;
         az_setfreq(az, az->curfreq);
@@ -275,8 +274,7 @@ static int vidioc_s_frequency (struct file *file, void *priv,
 static int vidioc_g_frequency (struct file *file, void *priv,
                                 struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct az_device *az = dev->priv;
+        struct az_device *az = video_drvdata(file);
 
         f->type = V4L2_TUNER_RADIO;
         f->frequency = az->curfreq;
@@ -302,8 +300,7 @@ static int vidioc_queryctrl (struct file *file, void *priv,
 static int vidioc_g_ctrl (struct file *file, void *priv,
                             struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct az_device *az = dev->priv;
+        struct az_device *az = video_drvdata(file);
 
         switch (ctrl->id) {
                 case V4L2_CID_AUDIO_MUTE:
@@ -322,8 +319,7 @@ static int vidioc_g_ctrl (struct file *file, void *priv,
 static int vidioc_s_ctrl (struct file *file, void *priv,
                             struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct az_device *az = dev->priv;
+        struct az_device *az = video_drvdata(file);
 
         switch (ctrl->id) {
                 case V4L2_CID_AUDIO_MUTE:
@@ -342,10 +338,21 @@ static int vidioc_s_ctrl (struct file *file, void *priv,
 
 static struct az_device aztech_unit;
 
+static int aztech_exclusive_open(struct inode *inode, struct file *file)
+{
+        return test_and_set_bit(0, &aztech_unit.in_use) ? -EBUSY : 0;
+}
+
+static int aztech_exclusive_release(struct inode *inode, struct file *file)
+{
+        clear_bit(0, &aztech_unit.in_use);
+        return 0;
+}
+
 static const struct file_operations aztech_fops = {
         .owner          = THIS_MODULE,
-        .open           = video_exclusive_open,
-        .release        = video_exclusive_release,
+        .open           = aztech_exclusive_open,
+        .release        = aztech_exclusive_release,
         .ioctl          = video_ioctl2,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
@@ -369,9 +376,10 @@ static const struct v4l2_ioctl_ops aztech_ioctl_ops = {
 };
 
 static struct video_device aztech_radio = {
-        .name               = "Aztech radio",
-        .fops               = &aztech_fops,
-        .ioctl_ops          = &aztech_ioctl_ops,
+        .name           = "Aztech radio",
+        .fops           = &aztech_fops,
+        .ioctl_ops      = &aztech_ioctl_ops,
+        .release        = video_device_release_empty,
 };
 
 module_param_named(debug,aztech_radio.debug, int, 0644);
@@ -392,7 +400,7 @@ static int __init aztech_init(void)
         }
 
         mutex_init(&lock);
-        aztech_radio.priv=&aztech_unit;
+        video_set_drvdata(&aztech_radio, &aztech_unit);
 
         if (video_register_device(&aztech_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
                 release_region(io,2);
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index 04c3698d32e4..0490a1fa999d 100644
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -589,6 +589,7 @@ static struct video_device cadet_radio = {
         .name           = "Cadet radio",
         .fops           = &cadet_fops,
         .ioctl_ops      = &cadet_ioctl_ops,
+        .release        = video_device_release_empty,
 };
 
 #ifdef CONFIG_PNP
diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c
index 5cd7f032298d..e15bee6d7cfc 100644
--- a/drivers/media/radio/radio-gemtek-pci.c
+++ b/drivers/media/radio/radio-gemtek-pci.c
@@ -100,9 +100,8 @@ struct gemtek_pci_card {
         u8  mute;
 };
 
-static const char rcsid[] = "$Id: radio-gemtek-pci.c,v 1.1 2001/07/23 08:08:16 ted Exp ted $";
-
 static int nr_radio = -1;
+static unsigned long in_use;
 
 static inline u8 gemtek_pci_out( u16 value, u32 port )
 {
@@ -205,8 +204,7 @@ static int vidioc_querycap(struct file *file, void *priv,
 static int vidioc_g_tuner(struct file *file, void *priv,
                                         struct v4l2_tuner *v)
 {
-        struct video_device *dev = video_devdata(file);
-        struct gemtek_pci_card *card = dev->priv;
+        struct gemtek_pci_card *card = video_drvdata(file);
 
         if (v->index > 0)
                 return -EINVAL;
@@ -233,8 +231,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,
 static int vidioc_s_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct gemtek_pci_card *card = dev->priv;
+        struct gemtek_pci_card *card = video_drvdata(file);
 
         if ( (f->frequency < GEMTEK_PCI_RANGE_LOW) ||
                         (f->frequency > GEMTEK_PCI_RANGE_HIGH) )
@@ -248,8 +245,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 static int vidioc_g_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct gemtek_pci_card *card = dev->priv;
+        struct gemtek_pci_card *card = video_drvdata(file);
 
         f->type = V4L2_TUNER_RADIO;
         f->frequency = card->current_frequency;
@@ -273,8 +269,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,
 static int vidioc_g_ctrl(struct file *file, void *priv,
                                         struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct gemtek_pci_card *card = dev->priv;
+        struct gemtek_pci_card *card = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -293,8 +288,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
 static int vidioc_s_ctrl(struct file *file, void *priv,
                                         struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct gemtek_pci_card *card = dev->priv;
+        struct gemtek_pci_card *card = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -364,10 +358,21 @@ MODULE_DEVICE_TABLE( pci, gemtek_pci_id );
 
 static int mx = 1;
 
+static int gemtek_pci_exclusive_open(struct inode *inode, struct file *file)
+{
+        return test_and_set_bit(0, &in_use) ? -EBUSY : 0;
+}
+
+static int gemtek_pci_exclusive_release(struct inode *inode, struct file *file)
+{
+        clear_bit(0, &in_use);
+        return 0;
+}
+
 static const struct file_operations gemtek_pci_fops = {
         .owner          = THIS_MODULE,
-        .open           = video_exclusive_open,
-        .release        = video_exclusive_release,
+        .open           = gemtek_pci_exclusive_open,
+        .release        = gemtek_pci_exclusive_release,
         .ioctl          = video_ioctl2,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
@@ -391,9 +396,10 @@ static const struct v4l2_ioctl_ops gemtek_pci_ioctl_ops = {
 };
 
 static struct video_device vdev_template = {
-        .name          = "Gemtek PCI Radio",
-        .fops          = &gemtek_pci_fops,
-        .ioctl_ops     = &gemtek_pci_ioctl_ops,
+        .name           = "Gemtek PCI Radio",
+        .fops           = &gemtek_pci_fops,
+        .ioctl_ops      = &gemtek_pci_ioctl_ops,
+        .release        = video_device_release_empty,
 };
 
 static int __devinit gemtek_pci_probe( struct pci_dev *pci_dev, const struct pci_device_id *pci_id )
@@ -431,7 +437,7 @@ static int __devinit gemtek_pci_probe( struct pci_dev *pci_dev, const struct pci
         }
 
         card->videodev = devradio;
-        devradio->priv = card;
+        video_set_drvdata(devradio, card);
         gemtek_pci_mute( card );
 
         printk( KERN_INFO "Gemtek PCI Radio (rev. %d) found at 0x%04x-0x%04x.\n",
diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c
index 0a0f956bb308..d131a5d38128 100644
--- a/drivers/media/radio/radio-gemtek.c
+++ b/drivers/media/radio/radio-gemtek.c
@@ -57,6 +57,7 @@ static int shutdown	= 1;
 static int keepmuted    = 1;
 static int initmute     = 1;
 static int radio_nr     = -1;
+static unsigned long in_use;
 
 module_param(io, int, 0444);
 MODULE_PARM_DESC(io, "Force I/O port for the GemTek Radio card if automatic "
@@ -393,10 +394,21 @@ static struct v4l2_queryctrl radio_qctrl[] = {
         }
 };
 
+static int gemtek_exclusive_open(struct inode *inode, struct file *file)
+{
+        return test_and_set_bit(0, &in_use) ? -EBUSY : 0;
+}
+
+static int gemtek_exclusive_release(struct inode *inode, struct file *file)
+{
+        clear_bit(0, &in_use);
+        return 0;
+}
+
 static const struct file_operations gemtek_fops = {
         .owner          = THIS_MODULE,
-        .open           = video_exclusive_open,
-        .release        = video_exclusive_release,
+        .open           = gemtek_exclusive_open,
+        .release        = gemtek_exclusive_release,
         .ioctl          = video_ioctl2,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
@@ -447,8 +459,7 @@ static int vidioc_s_tuner(struct file *file, void *priv, struct v4l2_tuner *v)
 static int vidioc_s_frequency(struct file *file, void *priv,
                               struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct gemtek_device *rt = dev->priv;
+        struct gemtek_device *rt = video_drvdata(file);
 
         gemtek_setfreq(rt, f->frequency);
 
@@ -458,8 +469,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 static int vidioc_g_frequency(struct file *file, void *priv,
                               struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct gemtek_device *rt = dev->priv;
+        struct gemtek_device *rt = video_drvdata(file);
 
         f->type = V4L2_TUNER_RADIO;
         f->frequency = rt->lastfreq;
@@ -483,8 +493,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,
 static int vidioc_g_ctrl(struct file *file, void *priv,
                          struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct gemtek_device *rt = dev->priv;
+        struct gemtek_device *rt = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -503,8 +512,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
 static int vidioc_s_ctrl(struct file *file, void *priv,
                          struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct gemtek_device *rt = dev->priv;
+        struct gemtek_device *rt = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -569,9 +577,10 @@ static const struct v4l2_ioctl_ops gemtek_ioctl_ops = {
 };
 
 static struct video_device gemtek_radio = {
-        .name                   = "GemTek Radio card",
-        .fops                   = &gemtek_fops,
-        .ioctl_ops              = &gemtek_ioctl_ops,
+        .name           = "GemTek Radio card",
+        .fops           = &gemtek_fops,
+        .ioctl_ops      = &gemtek_ioctl_ops,
+        .release        = video_device_release_empty,
 };
 
 /*
@@ -610,7 +619,7 @@ static int __init gemtek_init(void)
                 return -EINVAL;
         }
 
-        gemtek_radio.priv = &gemtek_unit;
+        video_set_drvdata(&gemtek_radio, &gemtek_unit);
 
         if (video_register_device(&gemtek_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
                 release_region(io, 1);
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
index 9ef0a763eeb7..4bf4d007bcfa 100644
--- a/drivers/media/radio/radio-maestro.c
+++ b/drivers/media/radio/radio-maestro.c
@@ -75,7 +75,21 @@ static struct v4l2_queryctrl radio_qctrl[] = {
 static int radio_nr = -1;
 module_param(radio_nr, int, 0);
 
+static unsigned long in_use;
+
 static int maestro_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
+
+static int maestro_exclusive_open(struct inode *inode, struct file *file)
+{
+        return test_and_set_bit(0, &in_use) ? -EBUSY : 0;
+}
+
+static int maestro_exclusive_release(struct inode *inode, struct file *file)
+{
+        clear_bit(0, &in_use);
+        return 0;
+}
+
 static void maestro_remove(struct pci_dev *pdev);
 
 static struct pci_device_id maestro_r_pci_tbl[] = {
@@ -98,8 +112,8 @@ static struct pci_driver maestro_r_driver = {
 
 static const struct file_operations maestro_fops = {
         .owner          = THIS_MODULE,
-        .open           = video_exclusive_open,
-        .release        = video_exclusive_release,
+        .open           = maestro_exclusive_open,
+        .release        = maestro_exclusive_release,
         .ioctl          = video_ioctl2,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
@@ -196,8 +210,7 @@ static int vidioc_querycap(struct file *file, void  *priv,
 static int vidioc_g_tuner(struct file *file, void *priv,
                                         struct v4l2_tuner *v)
 {
-        struct video_device *dev = video_devdata(file);
-        struct radio_device *card = video_get_drvdata(dev);
+        struct radio_device *card = video_drvdata(file);
 
         if (v->index > 0)
                 return -EINVAL;
@@ -229,8 +242,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,
 static int vidioc_s_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct radio_device *card = video_get_drvdata(dev);
+        struct radio_device *card = video_drvdata(file);
 
         if (f->frequency < FREQ_LO || f->frequency > FREQ_HI)
                 return -EINVAL;
@@ -241,8 +253,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 static int vidioc_g_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct radio_device *card = video_get_drvdata(dev);
+        struct radio_device *card = video_drvdata(file);
 
         f->type = V4L2_TUNER_RADIO;
         f->frequency = BITS2FREQ(radio_bits_get(card));
@@ -267,8 +278,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,
 static int vidioc_g_ctrl(struct file *file, void *priv,
                                         struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct radio_device *card = video_get_drvdata(dev);
+        struct radio_device *card = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -281,8 +291,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
 static int vidioc_s_ctrl(struct file *file, void *priv,
                                         struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct radio_device *card = video_get_drvdata(dev);
+        struct radio_device *card = video_drvdata(file);
         register u16 io = card->io;
         register u16 omask = inw(io + IO_MASK);
 
@@ -374,6 +383,7 @@ static struct video_device maestro_radio = {
         .name           = "Maestro radio",
         .fops           = &maestro_fops,
         .ioctl_ops      = &maestro_ioctl_ops,
+        .release        = video_device_release,
 };
 
 static int __devinit maestro_probe(struct pci_dev *pdev,
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index 0cc6fcb041fd..c777a17b00bc 100644
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -85,6 +85,7 @@ static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16 ;
 static int radio_nr = -1;
 module_param(radio_nr, int, 0);
 
+static unsigned long in_use;
 
 #define FREQ_LO          50*16000
 #define FREQ_HI         150*16000
@@ -99,10 +100,21 @@ module_param(radio_nr, int, 0);
 #define BITS2FREQ(x)    ((x) * FREQ_STEP - FREQ_IF)
 
 
+static int maxiradio_exclusive_open(struct inode *inode, struct file *file)
+{
+        return test_and_set_bit(0, &in_use) ? -EBUSY : 0;
+}
+
+static int maxiradio_exclusive_release(struct inode *inode, struct file *file)
+{
+        clear_bit(0, &in_use);
+        return 0;
+}
+
 static const struct file_operations maxiradio_fops = {
         .owner          = THIS_MODULE,
-        .open           = video_exclusive_open,
-        .release        = video_exclusive_release,
+        .open           = maxiradio_exclusive_open,
+        .release        = maxiradio_exclusive_release,
         .ioctl          = video_ioctl2,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
@@ -219,8 +231,7 @@ static int vidioc_querycap (struct file *file, void  *priv,
 static int vidioc_g_tuner (struct file *file, void *priv,
                            struct v4l2_tuner *v)
 {
-        struct video_device *dev = video_devdata(file);
-        struct radio_device *card=dev->priv;
+        struct radio_device *card = video_drvdata(file);
 
         if (v->index > 0)
                 return -EINVAL;
@@ -290,8 +301,7 @@ static int vidioc_s_audio (struct file *file, void *priv,
 static int vidioc_s_frequency (struct file *file, void *priv,
                                struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct radio_device *card=dev->priv;
+        struct radio_device *card = video_drvdata(file);
 
         if (f->frequency < FREQ_LO || f->frequency > FREQ_HI) {
                 dprintk(1, "radio freq (%d.%02d MHz) out of range (%d-%d)\n",
@@ -312,8 +322,7 @@ static int vidioc_s_frequency (struct file *file, void *priv,
 static int vidioc_g_frequency (struct file *file, void *priv,
                                struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct radio_device *card=dev->priv;
+        struct radio_device *card = video_drvdata(file);
 
         f->type = V4L2_TUNER_RADIO;
         f->frequency = card->freq;
@@ -343,8 +352,7 @@ static int vidioc_queryctrl (struct file *file, void *priv,
 static int vidioc_g_ctrl (struct file *file, void *priv,
                             struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct radio_device *card=dev->priv;
+        struct radio_device *card = video_drvdata(file);
 
         switch (ctrl->id) {
                 case V4L2_CID_AUDIO_MUTE:
@@ -358,8 +366,7 @@ static int vidioc_g_ctrl (struct file *file, void *priv,
 static int vidioc_s_ctrl (struct file *file, void *priv,
                           struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct radio_device *card=dev->priv;
+        struct radio_device *card = video_drvdata(file);
 
         switch (ctrl->id) {
                 case V4L2_CID_AUDIO_MUTE:
@@ -390,9 +397,10 @@ static const struct v4l2_ioctl_ops maxiradio_ioctl_ops = {
 };
 
 static struct video_device maxiradio_radio = {
-        .name               = "Maxi Radio FM2000 radio",
-        .fops               = &maxiradio_fops,
-        .ioctl_ops          = &maxiradio_ioctl_ops,
+        .name           = "Maxi Radio FM2000 radio",
+        .fops           = &maxiradio_fops,
+        .ioctl_ops      = &maxiradio_ioctl_ops,
+        .release        = video_device_release_empty,
 };
 
 static int __devinit maxiradio_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
@@ -408,7 +416,7 @@ static int __devinit maxiradio_init_one(struct pci_dev *pdev, const struct pci_d
 
         radio_unit.io = pci_resource_start(pdev, 0);
         mutex_init(&radio_unit.lock);
-        maxiradio_radio.priv = &radio_unit;
+        video_set_drvdata(&maxiradio_radio, &radio_unit);
 
         if (video_register_device(&maxiradio_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
                 printk("radio-maxiradio: can't register device!");
diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c
new file mode 100644
index 000000000000..a33717c48003
--- /dev/null
+++ b/drivers/media/radio/radio-mr800.c
@@ -0,0 +1,628 @@
+/*
+ * A driver for the AverMedia MR 800 USB FM radio. This device plugs
+ * into both the USB and an analog audio input, so this thing
+ * only deals with initialization and frequency setting, the
+ * audio data has to be handled by a sound driver.
+ *
+ * Copyright (c) 2008 Alexey Klimov <klimov.linux@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
+ * 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
+ */
+
+/*
+ * Big thanks to authors of dsbr100.c and radio-si470x.c
+ *
+ * When work was looked pretty good, i discover this:
+ * http://av-usbradio.sourceforge.net/index.php
+ * http://sourceforge.net/projects/av-usbradio/
+ * Latest release of theirs project was in 2005.
+ * Probably, this driver could be improved trough using their
+ * achievements (specifications given).
+ * So, we have smth to begin with.
+ *
+ * History:
+ * Version 0.01:        First working version.
+ *                      It's required to blacklist AverMedia USB Radio
+ *                      in usbhid/hid-quirks.c
+ *
+ * Many things to do:
+ *      - Correct power managment of device (suspend & resume)
+ *      - Make x86 independance (little-endian and big-endian stuff)
+ *      - Add code for scanning and smooth tuning
+ *      - Checked and add stereo&mono stuff
+ *      - Add code for sensitivity value
+ *      - Correct mistakes
+ *      - In Japan another FREQ_MIN and FREQ_MAX
+ */
+
+/* kernel includes */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/input.h>
+#include <linux/videodev2.h>
+#include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
+#include <linux/usb.h>
+#include <linux/version.h>      /* for KERNEL_VERSION MACRO */
+
+/* driver and module definitions */
+#define DRIVER_AUTHOR "Alexey Klimov <klimov.linux@gmail.com>"
+#define DRIVER_DESC "AverMedia MR 800 USB FM radio driver"
+#define DRIVER_VERSION "0.01"
+#define RADIO_VERSION KERNEL_VERSION(0, 0, 1)
+
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
+
+#define USB_AMRADIO_VENDOR 0x07ca
+#define USB_AMRADIO_PRODUCT 0xb800
+
+/* Probably USB_TIMEOUT should be modified in module parameter */
+#define BUFFER_LENGTH 8
+#define USB_TIMEOUT 500
+
+/* Frequency limits in MHz -- these are European values.  For Japanese
+devices, that would be 76 and 91.  */
+#define FREQ_MIN  87.5
+#define FREQ_MAX 108.0
+#define FREQ_MUL 16000
+
+/* module parameter */
+static int radio_nr = -1;
+module_param(radio_nr, int, 0);
+MODULE_PARM_DESC(radio_nr, "Radio Nr");
+
+static struct v4l2_queryctrl radio_qctrl[] = {
+        {
+                .id            = V4L2_CID_AUDIO_MUTE,
+                .name          = "Mute",
+                .minimum       = 0,
+                .maximum       = 1,
+                .step          = 1,
+                .default_value = 1,
+                .type          = V4L2_CTRL_TYPE_BOOLEAN,
+        },
+/* HINT: the disabled controls are only here to satify kradio and such apps */
+        {       .id             = V4L2_CID_AUDIO_VOLUME,
+                .flags          = V4L2_CTRL_FLAG_DISABLED,
+        },
+        {
+                .id             = V4L2_CID_AUDIO_BALANCE,
+                .flags          = V4L2_CTRL_FLAG_DISABLED,
+        },
+        {
+                .id             = V4L2_CID_AUDIO_BASS,
+                .flags          = V4L2_CTRL_FLAG_DISABLED,
+        },
+        {
+                .id             = V4L2_CID_AUDIO_TREBLE,
+                .flags          = V4L2_CTRL_FLAG_DISABLED,
+        },
+        {
+                .id             = V4L2_CID_AUDIO_LOUDNESS,
+                .flags          = V4L2_CTRL_FLAG_DISABLED,
+        },
+};
+
+static int usb_amradio_probe(struct usb_interface *intf,
+                             const struct usb_device_id *id);
+static void usb_amradio_disconnect(struct usb_interface *intf);
+static int usb_amradio_open(struct inode *inode, struct file *file);
+static int usb_amradio_close(struct inode *inode, struct file *file);
+static int usb_amradio_suspend(struct usb_interface *intf,
+                                pm_message_t message);
+static int usb_amradio_resume(struct usb_interface *intf);
+
+/* Data for one (physical) device */
+struct amradio_device {
+        /* reference to USB and video device */
+        struct usb_device *usbdev;
+        struct video_device *videodev;
+
+        unsigned char *buffer;
+        struct mutex lock;      /* buffer locking */
+        int curfreq;
+        int stereo;
+        int users;
+        int removed;
+        int muted;
+};
+
+/* USB Device ID List */
+static struct usb_device_id usb_amradio_device_table[] = {
+        {USB_DEVICE_AND_INTERFACE_INFO(USB_AMRADIO_VENDOR, USB_AMRADIO_PRODUCT,
+                                                        USB_CLASS_HID, 0, 0) },
+        { }                                             /* Terminating entry */
+};
+
+MODULE_DEVICE_TABLE(usb, usb_amradio_device_table);
+
+/* USB subsystem interface */
+static struct usb_driver usb_amradio_driver = {
+        .name                   = "radio-mr800",
+        .probe                  = usb_amradio_probe,
+        .disconnect             = usb_amradio_disconnect,
+        .suspend                = usb_amradio_suspend,
+        .resume                 = usb_amradio_resume,
+        .reset_resume           = usb_amradio_resume,
+        .id_table               = usb_amradio_device_table,
+        .supports_autosuspend   = 1,
+};
+
+/* switch on radio. Send 8 bytes to device. */
+static int amradio_start(struct amradio_device *radio)
+{
+        int retval;
+        int size;
+
+        mutex_lock(&radio->lock);
+
+        radio->buffer[0] = 0x00;
+        radio->buffer[1] = 0x55;
+        radio->buffer[2] = 0xaa;
+        radio->buffer[3] = 0x00;
+        radio->buffer[4] = 0xab;
+        radio->buffer[5] = 0x00;
+        radio->buffer[6] = 0x00;
+        radio->buffer[7] = 0x00;
+
+        retval = usb_bulk_msg(radio->usbdev, usb_sndintpipe(radio->usbdev, 2),
+                (void *) (radio->buffer), BUFFER_LENGTH, &size, USB_TIMEOUT);
+
+        if (retval) {
+                mutex_unlock(&radio->lock);
+                return retval;
+        }
+
+        mutex_unlock(&radio->lock);
+
+        radio->muted = 0;
+
+        return retval;
+}
+
+/* switch off radio */
+static int amradio_stop(struct amradio_device *radio)
+{
+        int retval;
+        int size;
+
+        mutex_lock(&radio->lock);
+
+        radio->buffer[0] = 0x00;
+        radio->buffer[1] = 0x55;
+        radio->buffer[2] = 0xaa;
+        radio->buffer[3] = 0x00;
+        radio->buffer[4] = 0xab;
+        radio->buffer[5] = 0x01;
+        radio->buffer[6] = 0x00;
+        radio->buffer[7] = 0x00;
+
+        retval = usb_bulk_msg(radio->usbdev, usb_sndintpipe(radio->usbdev, 2),
+                (void *) (radio->buffer), BUFFER_LENGTH, &size, USB_TIMEOUT);
+
+        if (retval) {
+                mutex_unlock(&radio->lock);
+                return retval;
+        }
+
+        mutex_unlock(&radio->lock);
+
+        radio->muted = 1;
+
+        return retval;
+}
+
+/* set a frequency, freq is defined by v4l's TUNER_LOW, i.e. 1/16th kHz */
+static int amradio_setfreq(struct amradio_device *radio, int freq)
+{
+        int retval;
+        int size;
+        unsigned short freq_send = 0x13 + (freq >> 3) / 25;
+
+        mutex_lock(&radio->lock);
+
+        radio->buffer[0] = 0x00;
+        radio->buffer[1] = 0x55;
+        radio->buffer[2] = 0xaa;
+        radio->buffer[3] = 0x03;
+        radio->buffer[4] = 0xa4;
+        radio->buffer[5] = 0x00;
+        radio->buffer[6] = 0x00;
+        radio->buffer[7] = 0x08;
+
+        retval = usb_bulk_msg(radio->usbdev, usb_sndintpipe(radio->usbdev, 2),
+                (void *) (radio->buffer), BUFFER_LENGTH, &size, USB_TIMEOUT);
+
+        if (retval) {
+                mutex_unlock(&radio->lock);
+                return retval;
+        }
+
+        /* frequency is calculated from freq_send and placed in first 2 bytes */
+        radio->buffer[0] = (freq_send >> 8) & 0xff;
+        radio->buffer[1] = freq_send & 0xff;
+        radio->buffer[2] = 0x01;
+        radio->buffer[3] = 0x00;
+        radio->buffer[4] = 0x00;
+        /* 5 and 6 bytes of buffer already = 0x00 */
+        radio->buffer[7] = 0x00;
+
+        retval = usb_bulk_msg(radio->usbdev, usb_sndintpipe(radio->usbdev, 2),
+                (void *) (radio->buffer), BUFFER_LENGTH, &size, USB_TIMEOUT);
+
+        if (retval) {
+                mutex_unlock(&radio->lock);
+                return retval;
+        }
+
+        mutex_unlock(&radio->lock);
+
+        radio->stereo = 0;
+
+        return retval;
+}
+
+/* USB subsystem interface begins here */
+
+/* handle unplugging of the device, release data structures
+if nothing keeps us from doing it.  If something is still
+keeping us busy, the release callback of v4l will take care
+of releasing it. */
+static void usb_amradio_disconnect(struct usb_interface *intf)
+{
+        struct amradio_device *radio = usb_get_intfdata(intf);
+
+        usb_set_intfdata(intf, NULL);
+
+        if (radio) {
+                video_unregister_device(radio->videodev);
+                radio->videodev = NULL;
+                if (radio->users) {
+                        kfree(radio->buffer);
+                        kfree(radio);
+                } else {
+                        radio->removed = 1;
+                }
+        }
+}
+
+/* vidioc_querycap - query device capabilities */
+static int vidioc_querycap(struct file *file, void *priv,
+                                        struct v4l2_capability *v)
+{
+        strlcpy(v->driver, "radio-mr800", sizeof(v->driver));
+        strlcpy(v->card, "AverMedia MR 800 USB FM Radio", sizeof(v->card));
+        sprintf(v->bus_info, "USB");
+        v->version = RADIO_VERSION;
+        v->capabilities = V4L2_CAP_TUNER;
+        return 0;
+}
+
+/* vidioc_g_tuner - get tuner attributes */
+static int vidioc_g_tuner(struct file *file, void *priv,
+                                struct v4l2_tuner *v)
+{
+        struct amradio_device *radio = video_get_drvdata(video_devdata(file));
+
+        if (v->index > 0)
+                return -EINVAL;
+
+/* TODO: Add function which look is signal stereo or not
+ *      amradio_getstat(radio);
+ */
+        radio->stereo = -1;
+        strcpy(v->name, "FM");
+        v->type = V4L2_TUNER_RADIO;
+        v->rangelow = FREQ_MIN * FREQ_MUL;
+        v->rangehigh = FREQ_MAX * FREQ_MUL;
+        v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;
+        v->capability = V4L2_TUNER_CAP_LOW;
+        if (radio->stereo)
+                v->audmode = V4L2_TUNER_MODE_STEREO;
+        else
+                v->audmode = V4L2_TUNER_MODE_MONO;
+        v->signal = 0xffff;     /* Can't get the signal strength, sad.. */
+        v->afc = 0; /* Don't know what is this */
+        return 0;
+}
+
+/* vidioc_s_tuner - set tuner attributes */
+static int vidioc_s_tuner(struct file *file, void *priv,
+                                struct v4l2_tuner *v)
+{
+        if (v->index > 0)
+                return -EINVAL;
+        return 0;
+}
+
+/* vidioc_s_frequency - set tuner radio frequency */
+static int vidioc_s_frequency(struct file *file, void *priv,
+                                struct v4l2_frequency *f)
+{
+        struct amradio_device *radio = video_get_drvdata(video_devdata(file));
+
+        radio->curfreq = f->frequency;
+        if (amradio_setfreq(radio, radio->curfreq) < 0)
+                warn("Set frequency failed");
+        return 0;
+}
+
+/* vidioc_g_frequency - get tuner radio frequency */
+static int vidioc_g_frequency(struct file *file, void *priv,
+                                struct v4l2_frequency *f)
+{
+        struct amradio_device *radio = video_get_drvdata(video_devdata(file));
+
+        f->type = V4L2_TUNER_RADIO;
+        f->frequency = radio->curfreq;
+        return 0;
+}
+
+/* vidioc_queryctrl - enumerate control items */
+static int vidioc_queryctrl(struct file *file, void *priv,
+                                struct v4l2_queryctrl *qc)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(radio_qctrl); i++) {
+                if (qc->id && qc->id == radio_qctrl[i].id) {
+                        memcpy(qc, &(radio_qctrl[i]),
+                                                sizeof(*qc));
+                        return 0;
+                }
+        }
+        return -EINVAL;
+}
+
+/* vidioc_g_ctrl - get the value of a control */
+static int vidioc_g_ctrl(struct file *file, void *priv,
+                                struct v4l2_control *ctrl)
+{
+        struct amradio_device *radio = video_get_drvdata(video_devdata(file));
+
+        switch (ctrl->id) {
+        case V4L2_CID_AUDIO_MUTE:
+                ctrl->value = radio->muted;
+                return 0;
+        }
+        return -EINVAL;
+}
+
+/* vidioc_s_ctrl - set the value of a control */
+static int vidioc_s_ctrl(struct file *file, void *priv,
+                                struct v4l2_control *ctrl)
+{
+        struct amradio_device *radio = video_get_drvdata(video_devdata(file));
+
+        switch (ctrl->id) {
+        case V4L2_CID_AUDIO_MUTE:
+                if (ctrl->value) {
+                        if (amradio_stop(radio) < 0) {
+                                warn("amradio_stop() failed");
+                                return -1;
+                        }
+                } else {
+                        if (amradio_start(radio) < 0) {
+                                warn("amradio_start() failed");
+                                return -1;
+                        }
+                }
+                return 0;
+        }
+        return -EINVAL;
+}
+
+/* vidioc_g_audio - get audio attributes */
+static int vidioc_g_audio(struct file *file, void *priv,
+                                struct v4l2_audio *a)
+{
+        if (a->index > 1)
+                return -EINVAL;
+
+        strcpy(a->name, "Radio");
+        a->capability = V4L2_AUDCAP_STEREO;
+        return 0;
+}
+
+/* vidioc_s_audio - set audio attributes  */
+static int vidioc_s_audio(struct file *file, void *priv,
+                                        struct v4l2_audio *a)
+{
+        if (a->index != 0)
+                return -EINVAL;
+        return 0;
+}
+
+/* vidioc_g_input - get input */
+static int vidioc_g_input(struct file *filp, void *priv, unsigned int *i)
+{
+        *i = 0;
+        return 0;
+}
+
+/* vidioc_s_input - set input */
+static int vidioc_s_input(struct file *filp, void *priv, unsigned int i)
+{
+        if (i != 0)
+                return -EINVAL;
+        return 0;
+}
+
+/* open device - amradio_start() and amradio_setfreq() */
+static int usb_amradio_open(struct inode *inode, struct file *file)
+{
+        struct amradio_device *radio = video_get_drvdata(video_devdata(file));
+
+        radio->users = 1;
+        radio->muted = 1;
+
+        if (amradio_start(radio) < 0) {
+                warn("Radio did not start up properly");
+                radio->users = 0;
+                return -EIO;
+        }
+        if (amradio_setfreq(radio, radio->curfreq) < 0)
+                warn("Set frequency failed");
+        return 0;
+}
+
+/*close device - free driver structures */
+static int usb_amradio_close(struct inode *inode, struct file *file)
+{
+        struct amradio_device *radio = video_get_drvdata(video_devdata(file));
+
+        if (!radio)
+                return -ENODEV;
+        radio->users = 0;
+        if (radio->removed) {
+                kfree(radio->buffer);
+                kfree(radio);
+        }
+        return 0;
+}
+
+/* Suspend device - stop device. Need to be checked and fixed */
+static int usb_amradio_suspend(struct usb_interface *intf, pm_message_t message)
+{
+        struct amradio_device *radio = usb_get_intfdata(intf);
+
+        if (amradio_stop(radio) < 0)
+                warn("amradio_stop() failed");
+
+        info("radio-mr800: Going into suspend..");
+
+        return 0;
+}
+
+/* Resume device - start device. Need to be checked and fixed */
+static int usb_amradio_resume(struct usb_interface *intf)
+{
+        struct amradio_device *radio = usb_get_intfdata(intf);
+
+        if (amradio_start(radio) < 0)
+                warn("amradio_start() failed");
+
+        info("radio-mr800: Coming out of suspend..");
+
+        return 0;
+}
+
+/* File system interface */
+static const struct file_operations usb_amradio_fops = {
+        .owner          = THIS_MODULE,
+        .open           = usb_amradio_open,
+        .release        = usb_amradio_close,
+        .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
+        .compat_ioctl   = v4l_compat_ioctl32,
+#endif
+        .llseek         = no_llseek,
+};
+
+static const struct v4l2_ioctl_ops usb_amradio_ioctl_ops = {
+        .vidioc_querycap    = vidioc_querycap,
+        .vidioc_g_tuner     = vidioc_g_tuner,
+        .vidioc_s_tuner     = vidioc_s_tuner,
+        .vidioc_g_frequency = vidioc_g_frequency,
+        .vidioc_s_frequency = vidioc_s_frequency,
+        .vidioc_queryctrl   = vidioc_queryctrl,
+        .vidioc_g_ctrl      = vidioc_g_ctrl,
+        .vidioc_s_ctrl      = vidioc_s_ctrl,
+        .vidioc_g_audio     = vidioc_g_audio,
+        .vidioc_s_audio     = vidioc_s_audio,
+        .vidioc_g_input     = vidioc_g_input,
+        .vidioc_s_input     = vidioc_s_input,
+};
+
+/* V4L2 interface */
+static struct video_device amradio_videodev_template = {
+        .name           = "AverMedia MR 800 USB FM Radio",
+        .fops           = &usb_amradio_fops,
+        .ioctl_ops      = &usb_amradio_ioctl_ops,
+        .release        = video_device_release,
+};
+
+/* check if the device is present and register with v4l and
+usb if it is */
+static int usb_amradio_probe(struct usb_interface *intf,
+                                const struct usb_device_id *id)
+{
+        struct amradio_device *radio;
+
+        radio = kmalloc(sizeof(struct amradio_device), GFP_KERNEL);
+
+        if (!(radio))
+                return -ENOMEM;
+
+        radio->buffer = kmalloc(BUFFER_LENGTH, GFP_KERNEL);
+
+        if (!(radio->buffer)) {
+                kfree(radio);
+                return -ENOMEM;
+        }
+
+        radio->videodev = video_device_alloc();
+
+        if (!(radio->videodev)) {
+                kfree(radio->buffer);
+                kfree(radio);
+                return -ENOMEM;
+        }
+
+        memcpy(radio->videodev, &amradio_videodev_template,
+                sizeof(amradio_videodev_template));
+
+        radio->removed = 0;
+        radio->users = 0;
+        radio->usbdev = interface_to_usbdev(intf);
+        radio->curfreq = 95.16 * FREQ_MUL;
+
+        mutex_init(&radio->lock);
+
+        video_set_drvdata(radio->videodev, radio);
+        if (video_register_device(radio->videodev, VFL_TYPE_RADIO, radio_nr)) {
+                warn("Could not register video device");
+                video_device_release(radio->videodev);
+                kfree(radio->buffer);
+                kfree(radio);
+                return -EIO;
+        }
+
+        usb_set_intfdata(intf, radio);
+        return 0;
+}
+
+static int __init amradio_init(void)
+{
+        int retval = usb_register(&usb_amradio_driver);
+
+        info(DRIVER_VERSION " " DRIVER_DESC);
+        if (retval)
+                err("usb_register failed. Error number %d", retval);
+        return retval;
+}
+
+static void __exit amradio_exit(void)
+{
+        usb_deregister(&usb_amradio_driver);
+}
+
+module_init(amradio_init);
+module_exit(amradio_exit);
+
diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c
index 6d820e2481e7..a67079777419 100644
--- a/drivers/media/radio/radio-rtrack2.c
+++ b/drivers/media/radio/radio-rtrack2.c
@@ -52,6 +52,7 @@ static spinlock_t lock;
 
 struct rt_device
 {
+        unsigned long in_use;
         int port;
         unsigned long curfreq;
         int muted;
@@ -153,8 +154,7 @@ static int rt_getsigstr(struct rt_device *dev)
 static int vidioc_g_tuner(struct file *file, void *priv,
                                 struct v4l2_tuner *v)
 {
-        struct video_device *dev = video_devdata(file);
-        struct rt_device *rt = dev->priv;
+        struct rt_device *rt = video_drvdata(file);
 
         if (v->index > 0)
                 return -EINVAL;
@@ -173,8 +173,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,
 static int vidioc_s_frequency(struct file *file, void *priv,
                                 struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct rt_device *rt = dev->priv;
+        struct rt_device *rt = video_drvdata(file);
 
         rt->curfreq = f->frequency;
         rt_setfreq(rt, rt->curfreq);
@@ -184,8 +183,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 static int vidioc_g_frequency(struct file *file, void *priv,
                                 struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct rt_device *rt = dev->priv;
+        struct rt_device *rt = video_drvdata(file);
 
         f->type = V4L2_TUNER_RADIO;
         f->frequency = rt->curfreq;
@@ -210,8 +208,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,
 static int vidioc_g_ctrl(struct file *file, void *priv,
                                 struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct rt_device *rt = dev->priv;
+        struct rt_device *rt = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -230,8 +227,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
 static int vidioc_s_ctrl(struct file *file, void *priv,
                                 struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct rt_device *rt = dev->priv;
+        struct rt_device *rt = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -284,10 +280,21 @@ static int vidioc_s_audio(struct file *file, void *priv,
 
 static struct rt_device rtrack2_unit;
 
+static int rtrack2_exclusive_open(struct inode *inode, struct file *file)
+{
+        return test_and_set_bit(0, &rtrack2_unit.in_use) ? -EBUSY : 0;
+}
+
+static int rtrack2_exclusive_release(struct inode *inode, struct file *file)
+{
+        clear_bit(0, &rtrack2_unit.in_use);
+        return 0;
+}
+
 static const struct file_operations rtrack2_fops = {
         .owner          = THIS_MODULE,
-        .open           = video_exclusive_open,
-        .release        = video_exclusive_release,
+        .open           = rtrack2_exclusive_open,
+        .release        = rtrack2_exclusive_release,
         .ioctl          = video_ioctl2,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
@@ -314,6 +321,7 @@ static struct video_device rtrack2_radio = {
         .name           = "RadioTrack II radio",
         .fops           = &rtrack2_fops,
         .ioctl_ops      = &rtrack2_ioctl_ops,
+        .release        = video_device_release_empty,
 };
 
 static int __init rtrack2_init(void)
@@ -329,7 +337,7 @@ static int __init rtrack2_init(void)
                 return -EBUSY;
         }
 
-        rtrack2_radio.priv=&rtrack2_unit;
+        video_set_drvdata(&rtrack2_radio, &rtrack2_unit);
 
         spin_lock_init(&lock);
         if (video_register_device(&rtrack2_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index 0d478f54a907..329c90bddadd 100644
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -45,6 +45,7 @@ static struct v4l2_queryctrl radio_qctrl[] = {
 
 struct fmi_device
 {
+        unsigned long in_use;
         int port;
         int curvol; /* 1 or 0 */
         unsigned long curfreq; /* freq in kHz */
@@ -146,8 +147,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,
                                         struct v4l2_tuner *v)
 {
         int mult;
-        struct video_device *dev = video_devdata(file);
-        struct fmi_device *fmi = dev->priv;
+        struct fmi_device *fmi = video_drvdata(file);
 
         if (v->index > 0)
                 return -EINVAL;
@@ -175,8 +175,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,
 static int vidioc_s_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct fmi_device *fmi = dev->priv;
+        struct fmi_device *fmi = video_drvdata(file);
 
         if (!(fmi->flags & V4L2_TUNER_CAP_LOW))
                 f->frequency *= 1000;
@@ -193,8 +192,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 static int vidioc_g_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct fmi_device *fmi = dev->priv;
+        struct fmi_device *fmi = video_drvdata(file);
 
         f->type = V4L2_TUNER_RADIO;
         f->frequency = fmi->curfreq;
@@ -221,8 +219,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,
 static int vidioc_g_ctrl(struct file *file, void *priv,
                                         struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct fmi_device *fmi = dev->priv;
+        struct fmi_device *fmi = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -235,8 +232,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
 static int vidioc_s_ctrl(struct file *file, void *priv,
                                         struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct fmi_device *fmi = dev->priv;
+        struct fmi_device *fmi = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -284,10 +280,21 @@ static int vidioc_s_audio(struct file *file, void *priv,
 
 static struct fmi_device fmi_unit;
 
+static int fmi_exclusive_open(struct inode *inode, struct file *file)
+{
+        return test_and_set_bit(0, &fmi_unit.in_use) ? -EBUSY : 0;
+}
+
+static int fmi_exclusive_release(struct inode *inode, struct file *file)
+{
+        clear_bit(0, &fmi_unit.in_use);
+        return 0;
+}
+
 static const struct file_operations fmi_fops = {
         .owner          = THIS_MODULE,
-        .open           = video_exclusive_open,
-        .release        = video_exclusive_release,
+        .open           = fmi_exclusive_open,
+        .release        = fmi_exclusive_release,
         .ioctl          = video_ioctl2,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
@@ -314,6 +321,7 @@ static struct video_device fmi_radio = {
         .name           = "SF16FMx radio",
         .fops           = &fmi_fops,
         .ioctl_ops      = &fmi_ioctl_ops,
+        .release        = video_device_release_empty,
 };
 
 /* ladis: this is my card. does any other types exist? */
@@ -373,7 +381,7 @@ static int __init fmi_init(void)
         fmi_unit.curvol = 0;
         fmi_unit.curfreq = 0;
         fmi_unit.flags = V4L2_TUNER_CAP_LOW;
-        fmi_radio.priv = &fmi_unit;
+        video_set_drvdata(&fmi_radio, &fmi_unit);
 
         mutex_init(&lock);
 
diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c
index 6290553d24be..b1f47c322e02 100644
--- a/drivers/media/radio/radio-sf16fmr2.c
+++ b/drivers/media/radio/radio-sf16fmr2.c
@@ -64,6 +64,7 @@ static struct v4l2_queryctrl radio_qctrl[] = {
 /* this should be static vars for module size */
 struct fmr2_device
 {
+        unsigned long in_use;
         int port;
         int curvol; /* 0-15 */
         int mute;
@@ -229,8 +230,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,
                                         struct v4l2_tuner *v)
 {
         int mult;
-        struct video_device *dev = video_devdata(file);
-        struct fmr2_device *fmr2 = dev->priv;
+        struct fmr2_device *fmr2 = video_drvdata(file);
 
         if (v->index > 0)
                 return -EINVAL;
@@ -262,8 +262,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,
 static int vidioc_s_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct fmr2_device *fmr2 = dev->priv;
+        struct fmr2_device *fmr2 = video_drvdata(file);
 
         if (!(fmr2->flags & V4L2_TUNER_CAP_LOW))
                 f->frequency *= 1000;
@@ -286,8 +285,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 static int vidioc_g_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct fmr2_device *fmr2 = dev->priv;
+        struct fmr2_device *fmr2 = video_drvdata(file);
 
         f->type = V4L2_TUNER_RADIO;
         f->frequency = fmr2->curfreq;
@@ -313,8 +311,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,
 static int vidioc_g_ctrl(struct file *file, void *priv,
                                         struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct fmr2_device *fmr2 = dev->priv;
+        struct fmr2_device *fmr2 = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -330,8 +327,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
 static int vidioc_s_ctrl(struct file *file, void *priv,
                                         struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct fmr2_device *fmr2 = dev->priv;
+        struct fmr2_device *fmr2 = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -400,10 +396,21 @@ static int vidioc_s_audio(struct file *file, void *priv,
 
 static struct fmr2_device fmr2_unit;
 
+static int fmr2_exclusive_open(struct inode *inode, struct file *file)
+{
+        return test_and_set_bit(0, &fmr2_unit.in_use) ? -EBUSY : 0;
+}
+
+static int fmr2_exclusive_release(struct inode *inode, struct file *file)
+{
+        clear_bit(0, &fmr2_unit.in_use);
+        return 0;
+}
+
 static const struct file_operations fmr2_fops = {
         .owner          = THIS_MODULE,
-        .open           = video_exclusive_open,
-        .release        = video_exclusive_release,
+        .open           = fmr2_exclusive_open,
+        .release        = fmr2_exclusive_release,
         .ioctl          = video_ioctl2,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
@@ -430,6 +437,7 @@ static struct video_device fmr2_radio = {
         .name           = "SF16FMR2 radio",
         .fops           = &fmr2_fops,
         .ioctl_ops      = &fmr2_ioctl_ops,
+        .release        = video_device_release_empty,
 };
 
 static int __init fmr2_init(void)
@@ -441,7 +449,7 @@ static int __init fmr2_init(void)
         fmr2_unit.stereo = 1;
         fmr2_unit.flags = V4L2_TUNER_CAP_LOW;
         fmr2_unit.card_type = 0;
-        fmr2_radio.priv = &fmr2_unit;
+        video_set_drvdata(&fmr2_radio, &fmr2_unit);
 
         mutex_init(&lock);
 
diff --git a/drivers/media/radio/radio-si470x.c b/drivers/media/radio/radio-si470x.c
index 16c7ef20265c..f6cedcd3ab97 100644
--- a/drivers/media/radio/radio-si470x.c
+++ b/drivers/media/radio/radio-si470x.c
@@ -986,7 +986,7 @@ static void si470x_work(struct work_struct *work)
 static ssize_t si470x_fops_read(struct file *file, char __user *buf,
                 size_t count, loff_t *ppos)
 {
-        struct si470x_device *radio = video_get_drvdata(video_devdata(file));
+        struct si470x_device *radio = video_drvdata(file);
         int retval = 0;
         unsigned int block_count = 0;
 
@@ -1047,7 +1047,7 @@ done:
 static unsigned int si470x_fops_poll(struct file *file,
                 struct poll_table_struct *pts)
 {
-        struct si470x_device *radio = video_get_drvdata(video_devdata(file));
+        struct si470x_device *radio = video_drvdata(file);
         int retval = 0;
 
         /* switch on rds reception */
@@ -1071,9 +1071,10 @@ static unsigned int si470x_fops_poll(struct file *file,
  */
 static int si470x_fops_open(struct inode *inode, struct file *file)
 {
-        struct si470x_device *radio = video_get_drvdata(video_devdata(file));
+        struct si470x_device *radio = video_drvdata(file);
         int retval;
 
+        lock_kernel();
         radio->users++;
 
         retval = usb_autopm_get_interface(radio->intf);
@@ -1090,6 +1091,7 @@ static int si470x_fops_open(struct inode *inode, struct file *file)
         }
 
 done:
+        unlock_kernel();
         return retval;
 }
 
@@ -1099,7 +1101,7 @@ done:
  */
 static int si470x_fops_release(struct inode *inode, struct file *file)
 {
-        struct si470x_device *radio = video_get_drvdata(video_devdata(file));
+        struct si470x_device *radio = video_drvdata(file);
         int retval = 0;
 
         /* safety check */
@@ -1282,7 +1284,7 @@ done:
 static int si470x_vidioc_g_ctrl(struct file *file, void *priv,
                 struct v4l2_control *ctrl)
 {
-        struct si470x_device *radio = video_get_drvdata(video_devdata(file));
+        struct si470x_device *radio = video_drvdata(file);
         int retval = 0;
 
         /* safety checks */
@@ -1318,7 +1320,7 @@ done:
 static int si470x_vidioc_s_ctrl(struct file *file, void *priv,
                 struct v4l2_control *ctrl)
 {
-        struct si470x_device *radio = video_get_drvdata(video_devdata(file));
+        struct si470x_device *radio = video_drvdata(file);
         int retval = 0;
 
         /* safety checks */
@@ -1405,7 +1407,7 @@ done:
 static int si470x_vidioc_g_tuner(struct file *file, void *priv,
                 struct v4l2_tuner *tuner)
 {
-        struct si470x_device *radio = video_get_drvdata(video_devdata(file));
+        struct si470x_device *radio = video_drvdata(file);
         int retval = 0;
 
         /* safety checks */
@@ -1471,7 +1473,7 @@ done:
 static int si470x_vidioc_s_tuner(struct file *file, void *priv,
                 struct v4l2_tuner *tuner)
 {
-        struct si470x_device *radio = video_get_drvdata(video_devdata(file));
+        struct si470x_device *radio = video_drvdata(file);
         int retval = 0;
 
         /* safety checks */
@@ -1505,7 +1507,7 @@ done:
 static int si470x_vidioc_g_frequency(struct file *file, void *priv,
                 struct v4l2_frequency *freq)
 {
-        struct si470x_device *radio = video_get_drvdata(video_devdata(file));
+        struct si470x_device *radio = video_drvdata(file);
         int retval = 0;
 
         /* safety checks */
@@ -1534,7 +1536,7 @@ done:
 static int si470x_vidioc_s_frequency(struct file *file, void *priv,
                 struct v4l2_frequency *freq)
 {
-        struct si470x_device *radio = video_get_drvdata(video_devdata(file));
+        struct si470x_device *radio = video_drvdata(file);
         int retval = 0;
 
         /* safety checks */
@@ -1563,7 +1565,7 @@ done:
 static int si470x_vidioc_s_hw_freq_seek(struct file *file, void *priv,
                 struct v4l2_hw_freq_seek *seek)
 {
-        struct si470x_device *radio = video_get_drvdata(video_devdata(file));
+        struct si470x_device *radio = video_drvdata(file);
         int retval = 0;
 
         /* safety checks */
diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c
index 0876fecc5f27..0abb186a9473 100644
--- a/drivers/media/radio/radio-terratec.c
+++ b/drivers/media/radio/radio-terratec.c
@@ -79,6 +79,7 @@ static spinlock_t lock;
 
 struct tt_device
 {
+        unsigned long in_use;
         int port;
         int curvol;
         unsigned long curfreq;
@@ -220,8 +221,7 @@ static int vidioc_querycap(struct file *file, void *priv,
 static int vidioc_g_tuner(struct file *file, void *priv,
                                         struct v4l2_tuner *v)
 {
-        struct video_device *dev = video_devdata(file);
-        struct tt_device *tt = dev->priv;
+        struct tt_device *tt = video_drvdata(file);
 
         if (v->index > 0)
                 return -EINVAL;
@@ -248,8 +248,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,
 static int vidioc_s_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct tt_device *tt = dev->priv;
+        struct tt_device *tt = video_drvdata(file);
 
         tt->curfreq = f->frequency;
         tt_setfreq(tt, tt->curfreq);
@@ -259,8 +258,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 static int vidioc_g_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct tt_device *tt = dev->priv;
+        struct tt_device *tt = video_drvdata(file);
 
         f->type = V4L2_TUNER_RADIO;
         f->frequency = tt->curfreq;
@@ -285,8 +283,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,
 static int vidioc_g_ctrl(struct file *file, void *priv,
                                         struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct tt_device *tt = dev->priv;
+        struct tt_device *tt = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -305,8 +302,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
 static int vidioc_s_ctrl(struct file *file, void *priv,
                                         struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct tt_device *tt = dev->priv;
+        struct tt_device *tt = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -356,10 +352,21 @@ static int vidioc_s_audio(struct file *file, void *priv,
 
 static struct tt_device terratec_unit;
 
+static int terratec_exclusive_open(struct inode *inode, struct file *file)
+{
+        return test_and_set_bit(0, &terratec_unit.in_use) ? -EBUSY : 0;
+}
+
+static int terratec_exclusive_release(struct inode *inode, struct file *file)
+{
+        clear_bit(0, &terratec_unit.in_use);
+        return 0;
+}
+
 static const struct file_operations terratec_fops = {
         .owner          = THIS_MODULE,
-        .open           = video_exclusive_open,
-        .release        = video_exclusive_release,
+        .open           = terratec_exclusive_open,
+        .release        = terratec_exclusive_release,
         .ioctl          = video_ioctl2,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
@@ -386,6 +393,7 @@ static struct video_device terratec_radio = {
         .name           = "TerraTec ActiveRadio",
         .fops           = &terratec_fops,
         .ioctl_ops      = &terratec_ioctl_ops,
+        .release        = video_device_release_empty,
 };
 
 static int __init terratec_init(void)
@@ -401,7 +409,7 @@ static int __init terratec_init(void)
                 return -EBUSY;
         }
 
-        terratec_radio.priv=&terratec_unit;
+        video_set_drvdata(&terratec_radio, &terratec_unit);
 
         spin_lock_init(&lock);
 
diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c
index 193161956253..e7b111fcd105 100644
--- a/drivers/media/radio/radio-trust.c
+++ b/drivers/media/radio/radio-trust.c
@@ -78,6 +78,7 @@ static __u16 curtreble;
 static unsigned long curfreq;
 static int curstereo;
 static int curmute;
+static unsigned long in_use;
 
 /* i2c addresses */
 #define TDA7318_ADDR 0x88
@@ -336,10 +337,21 @@ static int vidioc_s_audio(struct file *file, void *priv,
         return 0;
 }
 
+static int trust_exclusive_open(struct inode *inode, struct file *file)
+{
+        return test_and_set_bit(0, &in_use) ? -EBUSY : 0;
+}
+
+static int trust_exclusive_release(struct inode *inode, struct file *file)
+{
+        clear_bit(0, &in_use);
+        return 0;
+}
+
 static const struct file_operations trust_fops = {
         .owner          = THIS_MODULE,
-        .open           = video_exclusive_open,
-        .release        = video_exclusive_release,
+        .open           = trust_exclusive_open,
+        .release        = trust_exclusive_release,
         .ioctl          = video_ioctl2,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
@@ -366,6 +378,7 @@ static struct video_device trust_radio = {
         .name           = "Trust FM Radio",
         .fops           = &trust_fops,
         .ioctl_ops      = &trust_ioctl_ops,
+        .release        = video_device_release_empty,
 };
 
 static int __init trust_init(void)
diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c
index f8d62cfea774..952ec35a8415 100644
--- a/drivers/media/radio/radio-typhoon.c
+++ b/drivers/media/radio/radio-typhoon.c
@@ -79,7 +79,7 @@ static struct v4l2_queryctrl radio_qctrl[] = {
 #endif
 
 struct typhoon_device {
-        int users;
+        unsigned long in_use;
         int iobase;
         int curvol;
         int muted;
@@ -223,8 +223,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,
 static int vidioc_s_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct typhoon_device *typhoon = dev->priv;
+        struct typhoon_device *typhoon = video_drvdata(file);
 
         typhoon->curfreq = f->frequency;
         typhoon_setfreq(typhoon, typhoon->curfreq);
@@ -234,8 +233,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 static int vidioc_g_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct typhoon_device *typhoon = dev->priv;
+        struct typhoon_device *typhoon = video_drvdata(file);
 
         f->type = V4L2_TUNER_RADIO;
         f->frequency = typhoon->curfreq;
@@ -261,8 +259,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,
 static int vidioc_g_ctrl(struct file *file, void *priv,
                                         struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct typhoon_device *typhoon = dev->priv;
+        struct typhoon_device *typhoon = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -278,8 +275,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
 static int vidioc_s_ctrl (struct file *file, void *priv,
                                         struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct typhoon_device *typhoon = dev->priv;
+        struct typhoon_device *typhoon = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -334,10 +330,21 @@ static struct typhoon_device typhoon_unit =
         .mutefreq       = CONFIG_RADIO_TYPHOON_MUTEFREQ,
 };
 
+static int typhoon_exclusive_open(struct inode *inode, struct file *file)
+{
+        return test_and_set_bit(0, &typhoon_unit.in_use) ? -EBUSY : 0;
+}
+
+static int typhoon_exclusive_release(struct inode *inode, struct file *file)
+{
+        clear_bit(0, &typhoon_unit.in_use);
+        return 0;
+}
+
 static const struct file_operations typhoon_fops = {
         .owner          = THIS_MODULE,
-        .open           = video_exclusive_open,
-        .release        = video_exclusive_release,
+        .open           = typhoon_exclusive_open,
+        .release        = typhoon_exclusive_release,
         .ioctl          = video_ioctl2,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
@@ -364,6 +371,7 @@ static struct video_device typhoon_radio = {
         .name           = "Typhoon Radio",
         .fops           = &typhoon_fops,
         .ioctl_ops      = &typhoon_ioctl_ops,
+        .release        = video_device_release_empty,
 };
 
 #ifdef CONFIG_RADIO_TYPHOON_PROC_FS
@@ -446,9 +454,8 @@ static int __init typhoon_init(void)
                 return -EBUSY;
         }
 
-        typhoon_radio.priv = &typhoon_unit;
-        if (video_register_device(&typhoon_radio, VFL_TYPE_RADIO, radio_nr) == -1)
-        {
+        video_set_drvdata(&typhoon_radio, &typhoon_unit);
+        if (video_register_device(&typhoon_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
                 release_region(io, 8);
                 return -EINVAL;
         }
diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c
index 51d57ed3b3e1..15b10bad6796 100644
--- a/drivers/media/radio/radio-zoltrix.c
+++ b/drivers/media/radio/radio-zoltrix.c
@@ -69,6 +69,7 @@ static int io = CONFIG_RADIO_ZOLTRIX_PORT;
 static int radio_nr = -1;
 
 struct zol_device {
+        unsigned long in_use;
         int port;
         int curvol;
         unsigned long curfreq;
@@ -122,8 +123,11 @@ static int zol_setfreq(struct zol_device *dev, unsigned long freq)
         unsigned int stereo = dev->stereo;
         int i;
 
-        if (freq == 0)
-                return 1;
+        if (freq == 0) {
+                printk(KERN_WARNING "zoltrix: received zero freq. Failed to set.\n");
+                return -EINVAL;
+        }
+
         m = (freq / 160 - 8800) * 2;
         f = (unsigned long long) m + 0x4d1c;
 
@@ -245,8 +249,7 @@ static int vidioc_querycap(struct file *file, void  *priv,
 static int vidioc_g_tuner(struct file *file, void *priv,
                                         struct v4l2_tuner *v)
 {
-        struct video_device *dev = video_devdata(file);
-        struct zol_device *zol = dev->priv;
+        struct zol_device *zol = video_drvdata(file);
 
         if (v->index > 0)
                 return -EINVAL;
@@ -276,19 +279,20 @@ static int vidioc_s_tuner(struct file *file, void *priv,
 static int vidioc_s_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct zol_device *zol = dev->priv;
+        struct zol_device *zol = video_drvdata(file);
 
         zol->curfreq = f->frequency;
-        zol_setfreq(zol, zol->curfreq);
+        if (zol_setfreq(zol, zol->curfreq) != 0) {
+                printk(KERN_WARNING "zoltrix: Set frequency failed.\n");
+                return -EINVAL;
+        }
         return 0;
 }
 
 static int vidioc_g_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct zol_device *zol = dev->priv;
+        struct zol_device *zol = video_drvdata(file);
 
         f->type = V4L2_TUNER_RADIO;
         f->frequency = zol->curfreq;
@@ -313,8 +317,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,
 static int vidioc_g_ctrl(struct file *file, void *priv,
                                 struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct zol_device *zol = dev->priv;
+        struct zol_device *zol = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -330,8 +333,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
 static int vidioc_s_ctrl(struct file *file, void *priv,
                                 struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct zol_device *zol = dev->priv;
+        struct zol_device *zol = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -347,7 +349,10 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
                 return 0;
         }
         zol->stereo = 1;
-        zol_setfreq(zol, zol->curfreq);
+        if (zol_setfreq(zol, zol->curfreq) != 0) {
+                printk(KERN_WARNING "zoltrix: Set frequency failed.\n");
+                return -EINVAL;
+        }
 #if 0
 /* FIXME: Implement stereo/mono switch on V4L2 */
                         if (v->mode & VIDEO_SOUND_STEREO) {
@@ -396,11 +401,22 @@ static int vidioc_s_audio(struct file *file, void *priv,
 
 static struct zol_device zoltrix_unit;
 
+static int zoltrix_exclusive_open(struct inode *inode, struct file *file)
+{
+        return test_and_set_bit(0, &zoltrix_unit.in_use) ? -EBUSY : 0;
+}
+
+static int zoltrix_exclusive_release(struct inode *inode, struct file *file)
+{
+        clear_bit(0, &zoltrix_unit.in_use);
+        return 0;
+}
+
 static const struct file_operations zoltrix_fops =
 {
         .owner          = THIS_MODULE,
-        .open           = video_exclusive_open,
-        .release        = video_exclusive_release,
+        .open           = zoltrix_exclusive_open,
+        .release        = zoltrix_exclusive_release,
         .ioctl          = video_ioctl2,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
@@ -427,6 +443,7 @@ static struct video_device zoltrix_radio = {
         .name           = "Zoltrix Radio Plus",
         .fops           = &zoltrix_fops,
         .ioctl_ops      = &zoltrix_ioctl_ops,
+        .release        = video_device_release_empty,
 };
 
 static int __init zoltrix_init(void)
@@ -440,7 +457,7 @@ static int __init zoltrix_init(void)
                 return -ENXIO;
         }
 
-        zoltrix_radio.priv = &zoltrix_unit;
+        video_set_drvdata(&zoltrix_radio, &zoltrix_unit);
         if (!request_region(io, 2, "zoltrix")) {
                 printk(KERN_ERR "zoltrix: port 0x%x already in use\n", io);
                 return -EBUSY;
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 3e9e0dcd217e..47102c2c8250 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -34,6 +34,7 @@ config VIDEOBUF_DVB
         select VIDEOBUF_GEN
 
 config VIDEO_BTCX
+        depends on PCI
         tristate
 
 config VIDEO_IR
@@ -71,6 +72,15 @@ config VIDEO_ADV_DEBUG
           V4L devices.
           In doubt, say N.
 
+config VIDEO_FIXED_MINOR_RANGES
+        bool "Enable old-style fixed minor ranges for video devices"
+        default n
+        ---help---
+          Say Y here to enable the old-style fixed-range minor assignments.
+          Only useful if you rely on the old behavior and use mknod instead of udev.
+
+          When in doubt, say N.
+
 config VIDEO_HELPER_CHIPS_AUTO
         bool "Autoselect pertinent encoders/decoders and other helper chips"
         default y
@@ -578,13 +588,6 @@ config VIDEO_SAA5249
           To compile this driver as a module, choose M here: the
           module will be called saa5249.
 
-config TUNER_3036
-        tristate "SAB3036 tuner"
-        depends on I2C && VIDEO_V4L1
-        help
-          Say Y here to include support for Philips SAB3036 compatible tuners.
-          If in doubt, say N.
-
 config VIDEO_VINO
         tristate "SGI Vino Video For Linux (EXPERIMENTAL)"
         depends on I2C && SGI_IP22 && EXPERIMENTAL && VIDEO_V4L2
@@ -602,79 +605,7 @@ config VIDEO_STRADIS
           driver for PCI.  There is a product page at
           <http://www.stradis.com/>.
 
-config VIDEO_ZORAN
-        tristate "Zoran ZR36057/36067 Video For Linux"
-        depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 && VIRT_TO_BUS
-        help
-          Say Y for support for MJPEG capture cards based on the Zoran
-          36057/36067 PCI controller chipset. This includes the Iomega
-          Buz, Pinnacle DC10+ and the Linux Media Labs LML33. There is
-          a driver homepage at <http://mjpeg.sf.net/driver-zoran/>. For
-          more information, check <file:Documentation/video4linux/Zoran>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called zr36067.
-
-config VIDEO_ZORAN_DC30
-        tristate "Pinnacle/Miro DC30(+) support"
-        depends on VIDEO_ZORAN
-        select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO
-        select VIDEO_VPX3220 if VIDEO_HELPER_CHIPS_AUTO
-        help
-          Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback
-          card. This also supports really old DC10 cards based on the
-          zr36050 MJPEG codec and zr36016 VFE.
-
-config VIDEO_ZORAN_ZR36060
-        tristate "Zoran ZR36060"
-        depends on VIDEO_ZORAN
-        help
-          Say Y to support Zoran boards based on 36060 chips.
-          This includes Iomega Buz, Pinnacle DC10, Linux media Labs 33
-          and 33 R10 and AverMedia 6 boards.
-
-config VIDEO_ZORAN_BUZ
-        tristate "Iomega Buz support"
-        depends on VIDEO_ZORAN_ZR36060
-        select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO
-        select VIDEO_SAA7185 if VIDEO_HELPER_CHIPS_AUTO
-        help
-          Support for the Iomega Buz MJPEG capture/playback card.
-
-config VIDEO_ZORAN_DC10
-        tristate "Pinnacle/Miro DC10(+) support"
-        depends on VIDEO_ZORAN_ZR36060
-        select VIDEO_SAA7110 if VIDEO_HELPER_CHIPS_AUTO
-        select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO
-        help
-          Support for the Pinnacle/Miro DC10(+) MJPEG capture/playback
-          card.
-
-config VIDEO_ZORAN_LML33
-        tristate "Linux Media Labs LML33 support"
-        depends on VIDEO_ZORAN_ZR36060
-        select VIDEO_BT819 if VIDEO_HELPER_CHIPS_AUTO
-        select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO
-        help
-          Support for the Linux Media Labs LML33 MJPEG capture/playback
-          card.
-
-config VIDEO_ZORAN_LML33R10
-        tristate "Linux Media Labs LML33R10 support"
-        depends on VIDEO_ZORAN_ZR36060
-        select VIDEO_SAA7114 if VIDEO_HELPER_CHIPS_AUTO
-        select VIDEO_ADV7170 if VIDEO_HELPER_CHIPS_AUTO
-        help
-          support for the Linux Media Labs LML33R10 MJPEG capture/playback
-          card.
-
-config VIDEO_ZORAN_AVS6EYES
-        tristate "AverMedia 6 Eyes support (EXPERIMENTAL)"
-        depends on VIDEO_ZORAN_ZR36060 && EXPERIMENTAL && VIDEO_V4L1
-        select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO
-        select VIDEO_KS0127 if VIDEO_HELPER_CHIPS_AUTO
-        help
-          Support for the AverMedia 6 Eyes video surveillance card.
+source "drivers/media/video/zoran/Kconfig"
 
 config VIDEO_MEYE
         tristate "Sony Vaio Picturebook Motion Eye Video For Linux"
@@ -697,7 +628,7 @@ config VIDEO_MXB
         depends on PCI && VIDEO_V4L1 && I2C
         select VIDEO_SAA7146_VV
         select VIDEO_TUNER
-        select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_SAA7115 if VIDEO_HELPER_CHIPS_AUTO
         select VIDEO_TDA9840 if VIDEO_HELPER_CHIPS_AUTO
         select VIDEO_TEA6415C if VIDEO_HELPER_CHIPS_AUTO
         select VIDEO_TEA6420 if VIDEO_HELPER_CHIPS_AUTO
@@ -708,21 +639,6 @@ config VIDEO_MXB
           To compile this driver as a module, choose M here: the
           module will be called mxb.
 
-config VIDEO_DPC
-        tristate "Philips-Semiconductors 'dpc7146 demonstration board'"
-        depends on PCI && VIDEO_V4L1 && I2C
-        select VIDEO_SAA7146_VV
-        select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO
-        ---help---
-          This is a video4linux driver for the 'dpc7146 demonstration
-          board' by Philips-Semiconductors. It's the reference design
-          for SAA7146 bases boards, so if you have some unsupported
-          saa7146 based, analog video card, chances are good that it
-          will work with this skeleton driver.
-
-          To compile this driver as a module, choose M here: the
-          module will be called dpc7146.
-
 config VIDEO_HEXIUM_ORION
         tristate "Hexium HV-PCI6 and Orion frame grabber"
         depends on PCI && VIDEO_V4L2 && I2C
@@ -784,6 +700,70 @@ config VIDEO_CAFE_CCIC
           CMOS camera controller.  This is the controller found on first-
           generation OLPC systems.
 
+config SOC_CAMERA
+        tristate "SoC camera support"
+        depends on VIDEO_V4L2 && HAS_DMA
+        select VIDEOBUF_GEN
+        help
+          SoC Camera is a common API to several cameras, not connecting
+          over a bus like PCI or USB. For example some i2c camera connected
+          directly to the data bus of an SoC.
+
+config SOC_CAMERA_MT9M001
+        tristate "mt9m001 support"
+        depends on SOC_CAMERA && I2C
+        select GPIO_PCA953X if MT9M001_PCA9536_SWITCH
+        help
+          This driver supports MT9M001 cameras from Micron, monochrome
+          and colour models.
+
+config MT9M001_PCA9536_SWITCH
+        bool "pca9536 datawidth switch for mt9m001"
+        depends on SOC_CAMERA_MT9M001 && GENERIC_GPIO
+        help
+          Select this if your MT9M001 camera uses a PCA9536 I2C GPIO
+          extender to switch between 8 and 10 bit datawidth modes
+
+config SOC_CAMERA_MT9M111
+        tristate "mt9m111 support"
+        depends on SOC_CAMERA && I2C
+        help
+          This driver supports MT9M111 cameras from Micron
+
+config SOC_CAMERA_MT9V022
+        tristate "mt9v022 support"
+        depends on SOC_CAMERA && I2C
+        select GPIO_PCA953X if MT9V022_PCA9536_SWITCH
+        help
+          This driver supports MT9V022 cameras from Micron
+
+config MT9V022_PCA9536_SWITCH
+        bool "pca9536 datawidth switch for mt9v022"
+        depends on SOC_CAMERA_MT9V022 && GENERIC_GPIO
+        help
+          Select this if your MT9V022 camera uses a PCA9536 I2C GPIO
+          extender to switch between 8 and 10 bit datawidth modes
+
+config SOC_CAMERA_PLATFORM
+        tristate "platform camera support"
+        depends on SOC_CAMERA
+        help
+          This is a generic SoC camera platform driver, useful for testing
+
+config VIDEO_PXA27x
+        tristate "PXA27x Quick Capture Interface driver"
+        depends on VIDEO_DEV && PXA27x && SOC_CAMERA
+        select VIDEOBUF_DMA_SG
+        ---help---
+          This is a v4l2 driver for the PXA27x Quick Capture Interface
+
+config VIDEO_SH_MOBILE_CEU
+        tristate "SuperH Mobile CEU Interface driver"
+        depends on VIDEO_DEV && SOC_CAMERA && HAS_DMA
+        select VIDEOBUF_DMA_CONTIG
+        ---help---
+          This is a v4l2 driver for the SuperH Mobile CEU Interface
+
 #
 # USB Multimedia device configuration
 #
@@ -822,8 +802,7 @@ config VIDEO_OVCAMCHIP
 
 config USB_W9968CF
         tristate "USB W996[87]CF JPEG Dual Mode Camera support"
-        depends on VIDEO_V4L1 && I2C
-        select VIDEO_OVCAMCHIP
+        depends on VIDEO_V4L1 && I2C && VIDEO_OVCAMCHIP
         ---help---
           Say Y here if you want support for cameras based on OV681 or
           Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips.
@@ -914,64 +893,4 @@ config USB_S2255
 
 endif # V4L_USB_DRIVERS
 
-config SOC_CAMERA
-        tristate "SoC camera support"
-        depends on VIDEO_V4L2 && HAS_DMA
-        select VIDEOBUF_GEN
-        help
-          SoC Camera is a common API to several cameras, not connecting
-          over a bus like PCI or USB. For example some i2c camera connected
-          directly to the data bus of an SoC.
-
-config SOC_CAMERA_MT9M001
-        tristate "mt9m001 support"
-        depends on SOC_CAMERA && I2C
-        select GPIO_PCA953X if MT9M001_PCA9536_SWITCH
-        help
-          This driver supports MT9M001 cameras from Micron, monochrome
-          and colour models.
-
-config MT9M001_PCA9536_SWITCH
-        bool "pca9536 datawidth switch for mt9m001"
-        depends on SOC_CAMERA_MT9M001 && GENERIC_GPIO
-        help
-          Select this if your MT9M001 camera uses a PCA9536 I2C GPIO
-          extender to switch between 8 and 10 bit datawidth modes
-
-config SOC_CAMERA_MT9V022
-        tristate "mt9v022 support"
-        depends on SOC_CAMERA && I2C
-        select GPIO_PCA953X if MT9V022_PCA9536_SWITCH
-        help
-          This driver supports MT9V022 cameras from Micron
-
-config MT9V022_PCA9536_SWITCH
-        bool "pca9536 datawidth switch for mt9v022"
-        depends on SOC_CAMERA_MT9V022 && GENERIC_GPIO
-        help
-          Select this if your MT9V022 camera uses a PCA9536 I2C GPIO
-          extender to switch between 8 and 10 bit datawidth modes
-
-config SOC_CAMERA_PLATFORM
-        tristate "platform camera support"
-        depends on SOC_CAMERA
-        help
-          This is a generic SoC camera platform driver, useful for testing
-
-config VIDEO_PXA27x
-        tristate "PXA27x Quick Capture Interface driver"
-        depends on VIDEO_DEV && PXA27x
-        select SOC_CAMERA
-        select VIDEOBUF_DMA_SG
-        ---help---
-          This is a v4l2 driver for the PXA27x Quick Capture Interface
-
-config VIDEO_SH_MOBILE_CEU
-        tristate "SuperH Mobile CEU Interface driver"
-        depends on VIDEO_DEV && HAS_DMA
-        select SOC_CAMERA
-        select VIDEOBUF_DMA_CONTIG
-        ---help---
-          This is a v4l2 driver for the SuperH Mobile CEU Interface
-
 endif # VIDEO_CAPTURE_DRIVERS
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index ef7c8d3ffb18..16962f3aa157 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -2,8 +2,6 @@
 # Makefile for the video capture/playback device drivers.
 #
 
-zr36067-objs    :=      zoran_procfs.o zoran_device.o \
-                        zoran_driver.o zoran_card.o
 tuner-objs      :=      tuner-core.o
 
 msp3400-objs    :=      msp3400-driver.o msp3400-kthreads.o
@@ -54,9 +52,7 @@ obj-$(CONFIG_VIDEO_BT856) += bt856.o
 obj-$(CONFIG_VIDEO_BT866) += bt866.o
 obj-$(CONFIG_VIDEO_KS0127) += ks0127.o
 
-obj-$(CONFIG_VIDEO_ZORAN) += zr36067.o videocodec.o
-obj-$(CONFIG_VIDEO_ZORAN_DC30) += zr36050.o zr36016.o
-obj-$(CONFIG_VIDEO_ZORAN_ZR36060) += zr36060.o
+obj-$(CONFIG_VIDEO_ZORAN) += zoran/
 
 obj-$(CONFIG_VIDEO_PMS) += pms.o
 obj-$(CONFIG_VIDEO_VINO) += vino.o indycam.o
@@ -84,8 +80,6 @@ obj-$(CONFIG_VIDEO_CPIA2) += cpia2/
 obj-$(CONFIG_VIDEO_MXB) += mxb.o
 obj-$(CONFIG_VIDEO_HEXIUM_ORION) += hexium_orion.o
 obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o
-obj-$(CONFIG_VIDEO_DPC) += dpc7146.o
-obj-$(CONFIG_TUNER_3036) += tuner-3036.o
 
 obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o
 obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o
@@ -137,6 +131,7 @@ obj-$(CONFIG_VIDEO_PXA27x)	+= pxa_camera.o
 obj-$(CONFIG_VIDEO_SH_MOBILE_CEU)       += sh_mobile_ceu_camera.o
 obj-$(CONFIG_SOC_CAMERA)        += soc_camera.o
 obj-$(CONFIG_SOC_CAMERA_MT9M001)        += mt9m001.o
+obj-$(CONFIG_SOC_CAMERA_MT9M111)        += mt9m111.o
 obj-$(CONFIG_SOC_CAMERA_MT9V022)        += mt9v022.o
 obj-$(CONFIG_SOC_CAMERA_PLATFORM)       += soc_camera_platform.o
 
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c
index 9e436ad3d34b..218754b4906a 100644
--- a/drivers/media/video/arv.c
+++ b/drivers/media/video/arv.c
@@ -116,6 +116,7 @@ struct ar_device {
         int width, height;
         int frame_bytes, line_bytes;
         wait_queue_head_t wait;
+        unsigned long in_use;
         struct mutex lock;
 };
 
@@ -269,7 +270,7 @@ static inline void wait_for_vertical_sync(int exp_line)
 static ssize_t ar_read(struct file *file, char *buf, size_t count, loff_t *ppos)
 {
         struct video_device *v = video_devdata(file);
-        struct ar_device *ar = v->priv;
+        struct ar_device *ar = video_get_drvdata(v);
         long ret = ar->frame_bytes;             /* return read bytes */
         unsigned long arvcr1 = 0;
         unsigned long flags;
@@ -399,7 +400,7 @@ static int ar_do_ioctl(struct inode *inode, struct file *file,
                        unsigned int cmd, void *arg)
 {
         struct video_device *dev = video_devdata(file);
-        struct ar_device *ar = dev->priv;
+        struct ar_device *ar = video_get_drvdata(dev);
 
         DEBUG(1, "ar_ioctl()\n");
         switch(cmd) {
@@ -625,7 +626,7 @@ static void ar_interrupt(int irq, void *dev)
  */
 static int ar_initialize(struct video_device *dev)
 {
-        struct ar_device *ar = dev->priv;
+        struct ar_device *ar = video_get_drvdata(dev);
         unsigned long cr = 0;
         int i,found=0;
 
@@ -732,7 +733,7 @@ static int ar_initialize(struct video_device *dev)
 
 void ar_release(struct video_device *vfd)
 {
-        struct ar_device *ar = vfd->priv;
+        struct ar_device *ar = video_get_drvdata(vfd);
         mutex_lock(&ar->lock);
         video_device_release(vfd);
 }
@@ -742,10 +743,23 @@ void ar_release(struct video_device *vfd)
  * Video4Linux Module functions
  *
  ****************************************************************************/
+static struct ar_device ardev;
+
+static int ar_exclusive_open(struct inode *inode, struct file *file)
+{
+        return test_and_set_bit(0, &ardev.in_use) ? -EBUSY : 0;
+}
+
+static int ar_exclusive_release(struct inode *inode, struct file *file)
+{
+        clear_bit(0, &ardev.in_use);
+        return 0;
+}
+
 static const struct file_operations ar_fops = {
         .owner          = THIS_MODULE,
-        .open           = video_exclusive_open,
-        .release        = video_exclusive_release,
+        .open           = ar_exclusive_open,
+        .release        = ar_exclusive_release,
         .read           = ar_read,
         .ioctl          = ar_ioctl,
 #ifdef CONFIG_COMPAT
@@ -762,7 +776,6 @@ static struct video_device ar_template = {
 };
 
 #define ALIGN4(x)       ((((int)(x)) & 0x3) == 0)
-static struct ar_device ardev;
 
 static int __init ar_init(void)
 {
@@ -802,7 +815,7 @@ static int __init ar_init(void)
                 return -ENOMEM;
         }
         memcpy(ar->vdev, &ar_template, sizeof(ar_template));
-        ar->vdev->priv = ar;
+        video_set_drvdata(ar->vdev, ar);
 
         if (vga) {
                 ar->width       = AR_WIDTH_VGA;
diff --git a/drivers/media/video/au0828/au0828-cards.c b/drivers/media/video/au0828/au0828-cards.c
index ed48908a9034..5f07a8a072b6 100644
--- a/drivers/media/video/au0828/au0828-cards.c
+++ b/drivers/media/video/au0828/au0828-cards.c
@@ -46,7 +46,7 @@ struct au0828_board au0828_boards[] = {
 /* Tuner callback function for au0828 boards. Currently only needed
  * for HVR1500Q, which has an xc5000 tuner.
  */
-int au0828_tuner_callback(void *priv, int command, int arg)
+int au0828_tuner_callback(void *priv, int component, int command, int arg)
 {
         struct au0828_dev *dev = priv;
 
diff --git a/drivers/media/video/au0828/au0828-dvb.c b/drivers/media/video/au0828/au0828-dvb.c
index ba94be7e0ac1..f0fcdb4769d7 100644
--- a/drivers/media/video/au0828/au0828-dvb.c
+++ b/drivers/media/video/au0828/au0828-dvb.c
@@ -36,11 +36,39 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 #define _AU0828_BULKPIPE 0x83
 #define _BULKPIPESIZE 0xe522
 
+static u8 hauppauge_hvr950q_led_states[] = {
+        0x00, /* off */
+        0x02, /* yellow */
+        0x04, /* green */
+};
+
+static struct au8522_led_config hauppauge_hvr950q_led_cfg = {
+        .gpio_output = 0x00e0,
+        .gpio_output_enable  = 0x6006,
+        .gpio_output_disable = 0x0660,
+
+        .gpio_leds = 0x00e2,
+        .led_states  = hauppauge_hvr950q_led_states,
+        .num_led_states = sizeof(hauppauge_hvr950q_led_states),
+
+        .vsb8_strong   = 20 /* dB */ * 10,
+        .qam64_strong  = 25 /* dB */ * 10,
+        .qam256_strong = 32 /* dB */ * 10,
+};
+
 static struct au8522_config hauppauge_hvr950q_config = {
         .demod_address = 0x8e >> 1,
         .status_mode   = AU8522_DEMODLOCKING,
         .qam_if        = AU8522_IF_6MHZ,
         .vsb_if        = AU8522_IF_6MHZ,
+        .led_cfg       = &hauppauge_hvr950q_led_cfg,
+};
+
+static struct au8522_config fusionhdtv7usb_config = {
+        .demod_address = 0x8e >> 1,
+        .status_mode   = AU8522_DEMODLOCKING,
+        .qam_if        = AU8522_IF_6MHZ,
+        .vsb_if        = AU8522_IF_6MHZ,
 };
 
 static struct au8522_config hauppauge_woodbury_config = {
@@ -53,7 +81,6 @@ static struct au8522_config hauppauge_woodbury_config = {
 static struct xc5000_config hauppauge_hvr950q_tunerconfig = {
         .i2c_address      = 0x61,
         .if_khz           = 6000,
-        .tuner_callback   = au0828_tuner_callback
 };
 
 static struct mxl5007t_config mxl5007t_hvr950q_config = {
@@ -353,14 +380,12 @@ int au0828_dvb_register(struct au0828_dev *dev)
         switch (dev->board) {
         case AU0828_BOARD_HAUPPAUGE_HVR850:
         case AU0828_BOARD_HAUPPAUGE_HVR950Q:
-        case AU0828_BOARD_DVICO_FUSIONHDTV7:
                 dvb->frontend = dvb_attach(au8522_attach,
                                 &hauppauge_hvr950q_config,
                                 &dev->i2c_adap);
                 if (dvb->frontend != NULL)
-                        dvb_attach(xc5000_attach, dvb->frontend,
-                                &dev->i2c_adap,
-                                &hauppauge_hvr950q_tunerconfig, dev);
+                        dvb_attach(xc5000_attach, dvb->frontend, &dev->i2c_adap,
+                                   &hauppauge_hvr950q_tunerconfig);
                 break;
         case AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL:
                 dvb->frontend = dvb_attach(au8522_attach,
@@ -380,6 +405,16 @@ int au0828_dvb_register(struct au0828_dev *dev)
                                    0x60, &dev->i2c_adap,
                                    &hauppauge_woodbury_tunerconfig);
                 break;
+        case AU0828_BOARD_DVICO_FUSIONHDTV7:
+                dvb->frontend = dvb_attach(au8522_attach,
+                                &fusionhdtv7usb_config,
+                                &dev->i2c_adap);
+                if (dvb->frontend != NULL) {
+                        dvb_attach(xc5000_attach, dvb->frontend,
+                                &dev->i2c_adap,
+                                &hauppauge_hvr950q_tunerconfig);
+                }
+                break;
         default:
                 printk(KERN_WARNING "The frontend of your DVB/ATSC card "
                        "isn't supported yet\n");
@@ -390,6 +425,8 @@ int au0828_dvb_register(struct au0828_dev *dev)
                        __func__);
                 return -1;
         }
+        /* define general-purpose callback pointer */
+        dvb->frontend->callback = au0828_tuner_callback;
 
         /* register everything */
         ret = dvb_register(dev);
diff --git a/drivers/media/video/au0828/au0828.h b/drivers/media/video/au0828/au0828.h
index 4f10ff300135..9d6a1161dc98 100644
--- a/drivers/media/video/au0828/au0828.h
+++ b/drivers/media/video/au0828/au0828.h
@@ -103,7 +103,8 @@ extern int au0828_debug;
 extern struct au0828_board au0828_boards[];
 extern struct usb_device_id au0828_usb_id_table[];
 extern void au0828_gpio_setup(struct au0828_dev *dev);
-extern int au0828_tuner_callback(void *priv, int command, int arg);
+extern int au0828_tuner_callback(void *priv, int component,
+                                 int command, int arg);
 extern void au0828_card_setup(struct au0828_dev *dev);
 
 /* ----------------------------------------------------------- */
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index 98ee2d8feb34..ab2ce4d7b5de 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -68,8 +68,8 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
 /* ----------------------------------------------------------------------- */
 
-#define REG_OFFSET      0xDA
-#define BT856_NR_REG    6
+#define BT856_REG_OFFSET        0xDA
+#define BT856_NR_REG            6
 
 struct bt856 {
         unsigned char reg[BT856_NR_REG];
@@ -89,7 +89,7 @@ bt856_write (struct i2c_client *client,
 {
         struct bt856 *encoder = i2c_get_clientdata(client);
 
-        encoder->reg[reg - REG_OFFSET] = value;
+        encoder->reg[reg - BT856_REG_OFFSET] = value;
         return i2c_smbus_write_byte_data(client, reg, value);
 }
 
@@ -103,7 +103,7 @@ bt856_setbit (struct i2c_client *client,
 
         return bt856_write(client, reg,
                            (encoder->
-                            reg[reg - REG_OFFSET] & ~(1 << bit)) |
+                            reg[reg - BT856_REG_OFFSET] & ~(1 << bit)) |
                             (value ? (1 << bit) : 0));
 }
 
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 6081edc362df..13742b0bbe3e 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -305,7 +305,7 @@ static struct CARD {
         { 0x00261822, BTTV_BOARD_TWINHAN_DST,   "DNTV Live! Mini "},
         { 0xd200dbc0, BTTV_BOARD_DVICO_FUSIONHDTV_2,    "DViCO FusionHDTV 2" },
         { 0x763c008a, BTTV_BOARD_GEOVISION_GV600,       "GeoVision GV-600" },
-
+        { 0x18011000, BTTV_BOARD_ENLTV_FM_2,    "Encore ENL TV-FM-2" },
         { 0, -1, NULL }
 };
 
@@ -3037,6 +3037,31 @@ struct tvcard bttv_tvcards[] = {
                 .has_radio      = 1,
                 .has_remote     = 1,
         },
+        [BTTV_BOARD_ENLTV_FM_2] = {
+                /* Encore TV Tuner Pro ENL TV-FM-2
+                   Mauro Carvalho Chehab <mchehab@infradead.org */
+                .name           = "Encore ENL TV-FM-2",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                /* bit 6          -> IR disabled
+                   bit 18/17 = 00 -> mute
+                               01 -> enable external audio input
+                               10 -> internal audio input (mono?)
+                               11 -> internal audio input
+                 */
+                .gpiomask       = 0x060040,
+                .muxsel         = { 2, 3, 3 },
+                .gpiomux        = { 0x60000, 0x60000, 0x20000, 0x20000 },
+                .gpiomute       = 0,
+                .tuner_type     = TUNER_TCL_MF02GIP_5N,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .pll            = PLL_28,
+                .has_radio      = 1,
+                .has_remote     = 1,
+        }
 };
 
 static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards);
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 933eaef41ead..5858bf5ff41c 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -76,9 +76,9 @@ static unsigned int gbuffers = 8;
 static unsigned int gbufsize = 0x208000;
 static unsigned int reset_crop = 1;
 
-static int video_nr = -1;
-static int radio_nr = -1;
-static int vbi_nr = -1;
+static int video_nr[BTTV_MAX] = { [0 ... (BTTV_MAX-1)] = -1 };
+static int radio_nr[BTTV_MAX] = { [0 ... (BTTV_MAX-1)] = -1 };
+static int vbi_nr[BTTV_MAX] = { [0 ... (BTTV_MAX-1)] = -1 };
 static int debug_latency;
 
 static unsigned int fdsr;
@@ -108,9 +108,6 @@ module_param(irq_debug,         int, 0644);
 module_param(debug_latency,     int, 0644);
 
 module_param(fdsr,              int, 0444);
-module_param(video_nr,          int, 0444);
-module_param(radio_nr,          int, 0444);
-module_param(vbi_nr,            int, 0444);
 module_param(gbuffers,          int, 0444);
 module_param(gbufsize,          int, 0444);
 module_param(reset_crop,        int, 0444);
@@ -130,7 +127,10 @@ module_param(uv_ratio,          int, 0444);
 module_param(full_luma_range,   int, 0444);
 module_param(coring,            int, 0444);
 
-module_param_array(radio, int, NULL, 0444);
+module_param_array(radio,       int, NULL, 0444);
+module_param_array(video_nr,    int, NULL, 0444);
+module_param_array(radio_nr,    int, NULL, 0444);
+module_param_array(vbi_nr,      int, NULL, 0444);
 
 MODULE_PARM_DESC(radio,"The TV card supports radio, default is 0 (no)");
 MODULE_PARM_DESC(bigendian,"byte order of the framebuffer, default is native endian");
@@ -152,6 +152,9 @@ MODULE_PARM_DESC(irq_iswitch,"switch inputs in irq handler");
 MODULE_PARM_DESC(uv_ratio,"ratio between u and v gains, default is 50");
 MODULE_PARM_DESC(full_luma_range,"use the full luma range, default is 0 (no)");
 MODULE_PARM_DESC(coring,"set the luma coring level, default is 0 (no)");
+MODULE_PARM_DESC(video_nr, "video device numbers");
+MODULE_PARM_DESC(vbi_nr, "vbi device numbers");
+MODULE_PARM_DESC(radio_nr, "radio device numbers");
 
 MODULE_DESCRIPTION("bttv - v4l/v4l2 driver module for bt848/878 based cards");
 MODULE_AUTHOR("Ralph Metzler & Marcus Metzler & Gerd Knorr");
@@ -1367,7 +1370,7 @@ static void init_irqreg(struct bttv *btv)
                         (btv->gpioirq ? BT848_INT_GPINT : 0) |
                         BT848_INT_SCERR |
                         (fdsr ? BT848_INT_FDSR : 0) |
-                        BT848_INT_RISCI|BT848_INT_OCERR|BT848_INT_VPRES|
+                        BT848_INT_RISCI | BT848_INT_OCERR |
                         BT848_INT_FMTCHG|BT848_INT_HLOCK|
                         BT848_INT_I2CDONE,
                         BT848_INT_MASK);
@@ -2661,18 +2664,6 @@ static int bttv_querycap(struct file *file, void  *priv,
         return 0;
 }
 
-static int bttv_enum_fmt_vbi_cap(struct file *file, void  *priv,
-                                struct v4l2_fmtdesc *f)
-{
-        if (0 != f->index)
-                return -EINVAL;
-
-        f->pixelformat = V4L2_PIX_FMT_GREY;
-        strcpy(f->description, "vbi data");
-
-        return 0;
-}
-
 static int bttv_enum_fmt_cap_ovr(struct v4l2_fmtdesc *f)
 {
         int index = -1, i;
@@ -3227,6 +3218,7 @@ static int bttv_open(struct inode *inode, struct file *file)
 
         dprintk(KERN_DEBUG "bttv: open minor=%d\n",minor);
 
+        lock_kernel();
         for (i = 0; i < bttv_num; i++) {
                 if (bttvs[i].video_dev &&
                     bttvs[i].video_dev->minor == minor) {
@@ -3241,16 +3233,20 @@ static int bttv_open(struct inode *inode, struct file *file)
                         break;
                 }
         }
-        if (NULL == btv)
+        if (NULL == btv) {
+                unlock_kernel();
                 return -ENODEV;
+        }
 
         dprintk(KERN_DEBUG "bttv%d: open called (type=%s)\n",
                 btv->c.nr,v4l2_type_names[type]);
 
         /* allocate per filehandle data */
         fh = kmalloc(sizeof(*fh),GFP_KERNEL);
-        if (NULL == fh)
+        if (NULL == fh) {
+                unlock_kernel();
                 return -ENOMEM;
+        }
         file->private_data = fh;
         *fh = btv->init;
         fh->type = type;
@@ -3270,6 +3266,7 @@ static int bttv_open(struct inode *inode, struct file *file)
                             sizeof(struct bttv_buffer),
                             fh);
         set_tvnorm(btv,btv->tvnorm);
+        set_input(btv, btv->input, btv->tvnorm);
 
         btv->users++;
 
@@ -3290,6 +3287,7 @@ static int bttv_open(struct inode *inode, struct file *file)
         bttv_vbi_fmt_reset(&fh->vbi_fmt, btv->tvnorm);
 
         bttv_field_count(btv);
+        unlock_kernel();
         return 0;
 }
 
@@ -3330,6 +3328,10 @@ static int bttv_release(struct inode *inode, struct file *file)
 
         btv->users--;
         bttv_field_count(btv);
+
+        if (!btv->users)
+                audio_mute(btv, 1);
+
         return 0;
 }
 
@@ -3367,7 +3369,6 @@ static const struct v4l2_ioctl_ops bttv_ioctl_ops = {
         .vidioc_g_fmt_vid_overlay       = bttv_g_fmt_vid_overlay,
         .vidioc_try_fmt_vid_overlay     = bttv_try_fmt_vid_overlay,
         .vidioc_s_fmt_vid_overlay       = bttv_s_fmt_vid_overlay,
-        .vidioc_enum_fmt_vbi_cap        = bttv_enum_fmt_vbi_cap,
         .vidioc_g_fmt_vbi_cap           = bttv_g_fmt_vbi_cap,
         .vidioc_try_fmt_vbi_cap         = bttv_try_fmt_vbi_cap,
         .vidioc_s_fmt_vbi_cap           = bttv_s_fmt_vbi_cap,
@@ -3430,21 +3431,26 @@ static int radio_open(struct inode *inode, struct file *file)
 
         dprintk("bttv: open minor=%d\n",minor);
 
+        lock_kernel();
         for (i = 0; i < bttv_num; i++) {
                 if (bttvs[i].radio_dev && bttvs[i].radio_dev->minor == minor) {
                         btv = &bttvs[i];
                         break;
                 }
         }
-        if (NULL == btv)
+        if (NULL == btv) {
+                unlock_kernel();
                 return -ENODEV;
+        }
 
         dprintk("bttv%d: open called (radio)\n",btv->c.nr);
 
         /* allocate per filehandle data */
         fh = kmalloc(sizeof(*fh), GFP_KERNEL);
-        if (NULL == fh)
+        if (NULL == fh) {
+                unlock_kernel();
                 return -ENOMEM;
+        }
         file->private_data = fh;
         *fh = btv->init;
         v4l2_prio_open(&btv->prio, &fh->prio);
@@ -3457,6 +3463,7 @@ static int radio_open(struct inode *inode, struct file *file)
         audio_input(btv,TVAUDIO_INPUT_RADIO);
 
         mutex_unlock(&btv->lock);
+        unlock_kernel();
         return 0;
 }
 
@@ -4235,7 +4242,8 @@ static int __devinit bttv_register_video(struct bttv *btv)
 
         if (NULL == btv->video_dev)
                 goto err;
-        if (video_register_device(btv->video_dev,VFL_TYPE_GRABBER,video_nr)<0)
+        if (video_register_device(btv->video_dev, VFL_TYPE_GRABBER,
+                                  video_nr[btv->c.nr]) < 0)
                 goto err;
         printk(KERN_INFO "bttv%d: registered device video%d\n",
                btv->c.nr,btv->video_dev->minor & 0x1f);
@@ -4251,7 +4259,8 @@ static int __devinit bttv_register_video(struct bttv *btv)
 
         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[btv->c.nr]) < 0)
                 goto err;
         printk(KERN_INFO "bttv%d: registered device vbi%d\n",
                btv->c.nr,btv->vbi_dev->minor & 0x1f);
@@ -4262,7 +4271,8 @@ static int __devinit bttv_register_video(struct bttv *btv)
         btv->radio_dev = vdev_init(btv, &radio_template, "radio");
         if (NULL == btv->radio_dev)
                 goto err;
-        if (video_register_device(btv->radio_dev, VFL_TYPE_RADIO,radio_nr)<0)
+        if (video_register_device(btv->radio_dev, VFL_TYPE_RADIO,
+                                  radio_nr[btv->c.nr]) < 0)
                 goto err;
         printk(KERN_INFO "bttv%d: registered device radio%d\n",
                btv->c.nr,btv->radio_dev->minor & 0x1f);
diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index a38af98f4cae..2f289d981fe6 100644
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -28,8 +28,8 @@
 #include "bttvp.h"
 
 
-static int debug;
-module_param(debug, int, 0644);    /* debug level (0,1,2) */
+static int ir_debug;
+module_param(ir_debug, int, 0644);
 static int repeat_delay = 500;
 module_param(repeat_delay, int, 0644);
 static int repeat_period = 33;
@@ -40,6 +40,12 @@ module_param(ir_rc5_remote_gap, int, 0644);
 static int ir_rc5_key_timeout = 200;
 module_param(ir_rc5_key_timeout, int, 0644);
 
+#undef dprintk
+#define dprintk(arg...) do {    \
+        if (ir_debug >= 1)      \
+                printk(arg);    \
+} while (0)
+
 #define DEVNAME "bttv-input"
 
 /* ---------------------------------------------------------------------- */
@@ -79,6 +85,45 @@ static void ir_handle_key(struct bttv *btv)
 
 }
 
+static void ir_enltv_handle_key(struct bttv *btv)
+{
+        struct card_ir *ir = btv->remote;
+        u32 gpio, data, keyup;
+
+        /* read gpio value */
+        gpio = bttv_gpio_read(&btv->c);
+
+        /* extract data */
+        data = ir_extract_bits(gpio, ir->mask_keycode);
+
+        /* Check if it is keyup */
+        keyup = (gpio & ir->mask_keyup) ? 1 << 31 : 0;
+
+        if ((ir->last_gpio & 0x7f) != data) {
+                dprintk(KERN_INFO DEVNAME ": gpio=0x%x code=%d | %s\n",
+                        gpio, data,
+                        (gpio & ir->mask_keyup) ? " up" : "up/down");
+
+                ir_input_keydown(ir->dev, &ir->ir, data, data);
+                if (keyup)
+                        ir_input_nokey(ir->dev, &ir->ir);
+        } else {
+                if ((ir->last_gpio & 1 << 31) == keyup)
+                        return;
+
+                dprintk(KERN_INFO DEVNAME ":(cnt) gpio=0x%x code=%d | %s\n",
+                        gpio, data,
+                        (gpio & ir->mask_keyup) ? " up" : "down");
+
+                if (keyup)
+                        ir_input_nokey(ir->dev, &ir->ir);
+                else
+                        ir_input_keydown(ir->dev, &ir->ir, data, data);
+        }
+
+        ir->last_gpio = data | keyup;
+}
+
 void bttv_input_irq(struct bttv *btv)
 {
         struct card_ir *ir = btv->remote;
@@ -92,7 +137,10 @@ static void bttv_input_timer(unsigned long data)
         struct bttv *btv = (struct bttv*)data;
         struct card_ir *ir = btv->remote;
 
-        ir_handle_key(btv);
+        if (btv->c.type == BTTV_BOARD_ENLTV_FM_2)
+                ir_enltv_handle_key(btv);
+        else
+                ir_handle_key(btv);
         mod_timer(&ir->timer, jiffies + msecs_to_jiffies(ir->polling));
 }
 
@@ -284,6 +332,14 @@ int bttv_input_init(struct bttv *btv)
                 ir->mask_keyup   = 0x006000;
                 ir->polling      = 50; /* ms */
                 break;
+        case BTTV_BOARD_ENLTV_FM_2:
+                ir_codes         = ir_codes_encore_enltv2;
+                ir->mask_keycode = 0x00fd00;
+                ir->mask_keyup   = 0x000080;
+                ir->polling      = 1; /* ms */
+                ir->last_gpio    = ir_extract_bits(bttv_gpio_read(&btv->c),
+                                                   ir->mask_keycode);
+                break;
         }
         if (NULL == ir_codes) {
                 dprintk(KERN_INFO "Ooops: IR config error [card=%d]\n", btv->c.type);
diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h
index 6d93d16c96e4..46cb90e0985b 100644
--- a/drivers/media/video/bt8xx/bttv.h
+++ b/drivers/media/video/bt8xx/bttv.h
@@ -176,7 +176,7 @@
 #define BTTV_BOARD_TYPHOON_TVTUNERPCI      0x95
 #define BTTV_BOARD_GEOVISION_GV600         0x96
 #define BTTV_BOARD_KOZUMI_KTV_01C          0x97
-
+#define BTTV_BOARD_ENLTV_FM_2              0x98
 
 /* more card-specific defines */
 #define PT2254_L_CHANNEL 0x10
diff --git a/drivers/media/video/btcx-risc.c b/drivers/media/video/btcx-risc.c
index 3324ab38f58c..ac1b2687a20d 100644
--- a/drivers/media/video/btcx-risc.c
+++ b/drivers/media/video/btcx-risc.c
@@ -64,7 +64,7 @@ int btcx_riscmem_alloc(struct pci_dev *pci,
                        unsigned int size)
 {
         __le32 *cpu;
-        dma_addr_t dma;
+        dma_addr_t dma = 0;
 
         if (NULL != risc->cpu && risc->size < size)
                 btcx_riscmem_free(pci,risc);
diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c
index 6e39e253ce53..ace4ff9ea023 100644
--- a/drivers/media/video/bw-qcam.c
+++ b/drivers/media/video/bw-qcam.c
@@ -495,7 +495,7 @@ static void qc_set(struct qcam_device *q)
                 val2 = (((q->port_mode & QC_MODE_MASK) == QC_BIDIR) ? 24 : 8) *
                     q->transfer_scale;
         }
-        val = (val + val2 - 1) / val2;
+        val = DIV_ROUND_UP(val, val2);
         qc_command(q, 0x13);
         qc_command(q, val);
 
@@ -651,7 +651,7 @@ static long qc_capture(struct qcam_device * q, char __user *buf, unsigned long l
         transperline = q->width * q->bpp;
         divisor = (((q->port_mode & QC_MODE_MASK) == QC_BIDIR) ? 24 : 8) *
             q->transfer_scale;
-        transperline = (transperline + divisor - 1) / divisor;
+        transperline = DIV_ROUND_UP(transperline, divisor);
 
         for (i = 0, yield = yieldlines; i < linestotrans; i++)
         {
@@ -894,10 +894,27 @@ static ssize_t qcam_read(struct file *file, char __user *buf,
         return len;
 }
 
+static int qcam_exclusive_open(struct inode *inode, struct file *file)
+{
+        struct video_device *dev = video_devdata(file);
+        struct qcam_device *qcam = (struct qcam_device *)dev;
+
+        return test_and_set_bit(0, &qcam->in_use) ? -EBUSY : 0;
+}
+
+static int qcam_exclusive_release(struct inode *inode, struct file *file)
+{
+        struct video_device *dev = video_devdata(file);
+        struct qcam_device *qcam = (struct qcam_device *)dev;
+
+        clear_bit(0, &qcam->in_use);
+        return 0;
+}
+
 static const struct file_operations qcam_fops = {
         .owner          = THIS_MODULE,
-        .open           = video_exclusive_open,
-        .release        = video_exclusive_release,
+        .open           = qcam_exclusive_open,
+        .release        = qcam_exclusive_release,
         .ioctl          = qcam_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
@@ -909,6 +926,7 @@ static struct video_device qcam_template=
 {
         .name           = "Connectix Quickcam",
         .fops           = &qcam_fops,
+        .release        = video_device_release_empty,
 };
 
 #define MAX_CAMS 4
diff --git a/drivers/media/video/bw-qcam.h b/drivers/media/video/bw-qcam.h
index 6701dafbc0da..8a60c5de0935 100644
--- a/drivers/media/video/bw-qcam.h
+++ b/drivers/media/video/bw-qcam.h
@@ -65,4 +65,5 @@ struct qcam_device {
         int top, left;
         int status;
         unsigned int saved_bits;
+        unsigned long in_use;
 };
diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c
index 7f6c6b4bec10..17aa0adb3467 100644
--- a/drivers/media/video/c-qcam.c
+++ b/drivers/media/video/c-qcam.c
@@ -51,6 +51,7 @@ struct qcam_device {
         int contrast, brightness, whitebal;
         int top, left;
         unsigned int bidirectional;
+        unsigned long in_use;
         struct mutex lock;
 };
 
@@ -687,11 +688,28 @@ static ssize_t qcam_read(struct file *file, char __user *buf,
         return len;
 }
 
+static int qcam_exclusive_open(struct inode *inode, struct file *file)
+{
+        struct video_device *dev = video_devdata(file);
+        struct qcam_device *qcam = (struct qcam_device *)dev;
+
+        return test_and_set_bit(0, &qcam->in_use) ? -EBUSY : 0;
+}
+
+static int qcam_exclusive_release(struct inode *inode, struct file *file)
+{
+        struct video_device *dev = video_devdata(file);
+        struct qcam_device *qcam = (struct qcam_device *)dev;
+
+        clear_bit(0, &qcam->in_use);
+        return 0;
+}
+
 /* video device template */
 static const struct file_operations qcam_fops = {
         .owner          = THIS_MODULE,
-        .open           = video_exclusive_open,
-        .release        = video_exclusive_release,
+        .open           = qcam_exclusive_open,
+        .release        = qcam_exclusive_release,
         .ioctl          = qcam_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
@@ -704,6 +722,7 @@ static struct video_device qcam_template=
 {
         .name           = "Colour QuickCam",
         .fops           = &qcam_fops,
+        .release        = video_device_release_empty,
 };
 
 /* Initialize the QuickCam driver control structure. */
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index 5405c30dbb04..fc9497bdd322 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -1476,9 +1476,12 @@ static int cafe_v4l_open(struct inode *inode, struct file *filp)
 {
         struct cafe_camera *cam;
 
+        lock_kernel();
         cam = cafe_find_dev(iminor(inode));
-        if (cam == NULL)
+        if (cam == NULL) {
+                unlock_kernel();
                 return -ENODEV;
+        }
         filp->private_data = cam;
 
         mutex_lock(&cam->s_mutex);
@@ -1490,6 +1493,7 @@ static int cafe_v4l_open(struct inode *inode, struct file *filp)
         }
         (cam->users)++;
         mutex_unlock(&cam->s_mutex);
+        unlock_kernel();
         return 0;
 }
 
@@ -2092,15 +2096,8 @@ static int cafe_pci_probe(struct pci_dev *pdev,
                 const struct pci_device_id *id)
 {
         int ret;
-        u16 classword;
         struct cafe_camera *cam;
-        /*
-         * Make sure we have a camera here - we'll get calls for
-         * the other cafe devices as well.
-         */
-        pci_read_config_word(pdev, PCI_CLASS_DEVICE, &classword);
-        if (classword != PCI_CLASS_MULTIMEDIA_VIDEO)
-                return -ENODEV;
+
         /*
          * Start putting together one of our big camera structures.
          */
@@ -2288,8 +2285,8 @@ static int cafe_pci_resume(struct pci_dev *pdev)
 
 
 static struct pci_device_id cafe_ids[] = {
-        { PCI_DEVICE(0x11ab, 0x4100) }, /* Eventual real ID */
-        { PCI_DEVICE(0x11ab, 0x4102) }, /* Really eventual real ID */
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL,
+                     PCI_DEVICE_ID_MARVELL_88ALP01_CCIC) },
         { 0, }
 };
 
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c
index a661800b0e69..1798b779a25a 100644
--- a/drivers/media/video/cpia.c
+++ b/drivers/media/video/cpia.c
@@ -39,10 +39,6 @@
 #include <asm/io.h>
 #include <linux/mutex.h>
 
-#ifdef CONFIG_KMOD
-#include <linux/kmod.h>
-#endif
-
 #include "cpia.h"
 
 static int video_nr = -1;
@@ -3155,7 +3151,7 @@ static void put_cam(struct cpia_camera_ops* ops)
 static int cpia_open(struct inode *inode, struct file *file)
 {
         struct video_device *dev = video_devdata(file);
-        struct cam_data *cam = dev->priv;
+        struct cam_data *cam = video_get_drvdata(dev);
         int err;
 
         if (!cam) {
@@ -3202,7 +3198,7 @@ static int cpia_open(struct inode *inode, struct file *file)
 
         /* Set ownership of /proc/cpia/videoX to current user */
         if(cam->proc_entry)
-                cam->proc_entry->uid = current->uid;
+                cam->proc_entry->uid = current_uid();
 
         /* set mark for loading first frame uncompressed */
         cam->first_frame = 1;
@@ -3232,7 +3228,7 @@ static int cpia_open(struct inode *inode, struct file *file)
 static int cpia_close(struct inode *inode, struct file *file)
 {
         struct  video_device *dev = file->private_data;
-        struct cam_data *cam = dev->priv;
+        struct cam_data *cam = video_get_drvdata(dev);
 
         if (cam->ops) {
                 /* Return ownership of /proc/cpia/videoX to root */
@@ -3284,7 +3280,7 @@ static ssize_t cpia_read(struct file *file, char __user *buf,
                          size_t count, loff_t *ppos)
 {
         struct video_device *dev = file->private_data;
-        struct cam_data *cam = dev->priv;
+        struct cam_data *cam = video_get_drvdata(dev);
         int err;
 
         /* make this _really_ smp and multithread-safe */
@@ -3341,7 +3337,7 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file,
                          unsigned int ioctlnr, void *arg)
 {
         struct video_device *dev = file->private_data;
-        struct cam_data *cam = dev->priv;
+        struct cam_data *cam = video_get_drvdata(dev);
         int retval = 0;
 
         if (!cam || !cam->ops)
@@ -3739,7 +3735,7 @@ static int cpia_mmap(struct file *file, struct vm_area_struct *vma)
         unsigned long start = vma->vm_start;
         unsigned long size  = vma->vm_end - vma->vm_start;
         unsigned long page, pos;
-        struct cam_data *cam = dev->priv;
+        struct cam_data *cam = video_get_drvdata(dev);
         int retval;
 
         if (!cam || !cam->ops)
@@ -3801,6 +3797,7 @@ static const struct file_operations cpia_fops = {
 static struct video_device cpia_template = {
         .name           = "CPiA Camera",
         .fops           = &cpia_fops,
+        .release        = video_device_release_empty,
 };
 
 /* initialise cam_data structure  */
@@ -3928,7 +3925,7 @@ static void init_camera_struct(struct cam_data *cam,
         cam->proc_entry = NULL;
 
         memcpy(&cam->vdev, &cpia_template, sizeof(cpia_template));
-        cam->vdev.priv = cam;
+        video_set_drvdata(&cam->vdev, cam);
 
         cam->curframe = 0;
         for (i = 0; i < FRAME_NUM; i++) {
diff --git a/drivers/media/video/cpia2/cpia2_core.c b/drivers/media/video/cpia2/cpia2_core.c
index af8b9ec8e358..7e791b6923f9 100644
--- a/drivers/media/video/cpia2/cpia2_core.c
+++ b/drivers/media/video/cpia2/cpia2_core.c
@@ -1537,7 +1537,7 @@ static int config_sensor_500(struct camera_data *cam,
  *
  *  This sets all user changeable properties to the values in cam->params.
  *****************************************************************************/
-int set_all_properties(struct camera_data *cam)
+static int set_all_properties(struct camera_data *cam)
 {
         /**
          * Don't set target_kb here, it will be set later.
@@ -1588,7 +1588,7 @@ void cpia2_save_camera_state(struct camera_data *cam)
  *  get_color_params
  *
  *****************************************************************************/
-void get_color_params(struct camera_data *cam)
+static void get_color_params(struct camera_data *cam)
 {
         cpia2_do_command(cam, CPIA2_CMD_GET_VP_BRIGHTNESS, TRANSFER_READ, 0);
         cpia2_do_command(cam, CPIA2_CMD_GET_VP_SATURATION, TRANSFER_READ, 0);
@@ -1881,7 +1881,7 @@ void cpia2_set_saturation(struct camera_data *cam, unsigned char value)
  *  wake_system
  *
  *****************************************************************************/
-void wake_system(struct camera_data *cam)
+static void wake_system(struct camera_data *cam)
 {
         cpia2_do_command(cam, CPIA2_CMD_SET_WAKEUP, TRANSFER_WRITE, 0);
 }
@@ -1892,7 +1892,7 @@ void wake_system(struct camera_data *cam)
  *
  *  Valid for STV500 sensor only
  *****************************************************************************/
-void set_lowlight_boost(struct camera_data *cam)
+static void set_lowlight_boost(struct camera_data *cam)
 {
         struct cpia2_command cmd;
 
@@ -2169,7 +2169,7 @@ void cpia2_dbg_dump_registers(struct camera_data *cam)
  *
  *  Sets all values to the defaults
  *****************************************************************************/
-void reset_camera_struct(struct camera_data *cam)
+static void reset_camera_struct(struct camera_data *cam)
 {
         /***
          * The following parameter values are the defaults from the register map.
diff --git a/drivers/media/video/cpia2/cpia2_usb.c b/drivers/media/video/cpia2/cpia2_usb.c
index a8a199047cbd..73511a542077 100644
--- a/drivers/media/video/cpia2/cpia2_usb.c
+++ b/drivers/media/video/cpia2/cpia2_usb.c
@@ -478,7 +478,7 @@ int cpia2_usb_change_streaming_alternate(struct camera_data *cam,
  * set_alternate
  *
  *****************************************************************************/
-int set_alternate(struct camera_data *cam, unsigned int alt)
+static int set_alternate(struct camera_data *cam, unsigned int alt)
 {
         int ret = 0;
 
diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c
index eb9f15cd4c45..897e8d1a5c3c 100644
--- a/drivers/media/video/cpia2/cpia2_v4l.c
+++ b/drivers/media/video/cpia2/cpia2_v4l.c
@@ -241,8 +241,7 @@ static struct v4l2_queryctrl controls[] = {
  *****************************************************************************/
 static int cpia2_open(struct inode *inode, struct file *file)
 {
-        struct video_device *dev = video_devdata(file);
-        struct camera_data *cam = video_get_drvdata(dev);
+        struct camera_data *cam = video_drvdata(file);
         int retval = 0;
 
         if (!cam) {
@@ -357,8 +356,7 @@ static int cpia2_close(struct inode *inode, struct file *file)
 static ssize_t cpia2_v4l_read(struct file *file, char __user *buf, size_t count,
                               loff_t *off)
 {
-        struct video_device *dev = video_devdata(file);
-        struct camera_data *cam = video_get_drvdata(dev);
+        struct camera_data *cam = video_drvdata(file);
         int noblock = file->f_flags&O_NONBLOCK;
 
         struct cpia2_fh *fh = file->private_data;
@@ -382,9 +380,7 @@ static ssize_t cpia2_v4l_read(struct file *file, char __user *buf, size_t count,
  *****************************************************************************/
 static unsigned int cpia2_v4l_poll(struct file *filp, struct poll_table_struct *wait)
 {
-        struct video_device *dev = video_devdata(filp);
-        struct camera_data *cam = video_get_drvdata(dev);
-
+        struct camera_data *cam = video_drvdata(filp);
         struct cpia2_fh *fh = filp->private_data;
 
         if(!cam)
@@ -1579,8 +1575,7 @@ static int ioctl_dqbuf(void *arg,struct camera_data *cam, struct file *file)
 static int cpia2_do_ioctl(struct inode *inode, struct file *file,
                           unsigned int ioctl_nr, void *arg)
 {
-        struct video_device *dev = video_devdata(file);
-        struct camera_data *cam = video_get_drvdata(dev);
+        struct camera_data *cam = video_drvdata(file);
         int retval = 0;
 
         if (!cam)
@@ -1860,9 +1855,8 @@ static int cpia2_ioctl(struct inode *inode, struct file *file,
  *****************************************************************************/
 static int cpia2_mmap(struct file *file, struct vm_area_struct *area)
 {
+        struct camera_data *cam = video_drvdata(file);
         int retval;
-        struct video_device *dev = video_devdata(file);
-        struct camera_data *cam = video_get_drvdata(dev);
 
         /* Priority check */
         struct cpia2_fh *fh = file->private_data;
diff --git a/drivers/media/video/cx18/Makefile b/drivers/media/video/cx18/Makefile
index b23d2e26120f..f7bf0edf93f9 100644
--- a/drivers/media/video/cx18/Makefile
+++ b/drivers/media/video/cx18/Makefile
@@ -2,7 +2,7 @@ cx18-objs    := cx18-driver.o cx18-cards.o cx18-i2c.o cx18-firmware.o cx18-gpio.
         cx18-queue.o cx18-streams.o cx18-fileops.o cx18-ioctl.o cx18-controls.o \
         cx18-mailbox.o cx18-vbi.o cx18-audio.o cx18-video.o cx18-irq.o \
         cx18-av-core.o cx18-av-audio.o cx18-av-firmware.o cx18-av-vbi.o cx18-scb.o \
-        cx18-dvb.o
+        cx18-dvb.o cx18-io.o
 
 obj-$(CONFIG_VIDEO_CX18) += cx18.o
 
diff --git a/drivers/media/video/cx18/cx18-audio.c b/drivers/media/video/cx18/cx18-audio.c
index 6d5b94fc7087..57beddf0af4d 100644
--- a/drivers/media/video/cx18/cx18-audio.c
+++ b/drivers/media/video/cx18/cx18-audio.c
@@ -22,6 +22,7 @@
  */
 
 #include "cx18-driver.h"
+#include "cx18-io.h"
 #include "cx18-i2c.h"
 #include "cx18-cards.h"
 #include "cx18-audio.h"
@@ -60,10 +61,10 @@ int cx18_audio_set_io(struct cx18 *cx)
         if (err)
                 return err;
 
-        val = read_reg(CX18_AUDIO_ENABLE) & ~0x30;
+        val = cx18_read_reg(cx, CX18_AUDIO_ENABLE) & ~0x30;
         val |= (audio_input > CX18_AV_AUDIO_SERIAL2) ? 0x20 :
                                         (audio_input << 4);
-        write_reg(val | 0xb00, CX18_AUDIO_ENABLE);
+        cx18_write_reg(cx, val | 0xb00, CX18_AUDIO_ENABLE);
         cx18_vapi(cx, CX18_APU_RESETAI, 1, 0);
         return 0;
 }
diff --git a/drivers/media/video/cx18/cx18-av-core.c b/drivers/media/video/cx18/cx18-av-core.c
index 3b0a2c450605..73f5141a42d1 100644
--- a/drivers/media/video/cx18/cx18-av-core.c
+++ b/drivers/media/video/cx18/cx18-av-core.c
@@ -22,27 +22,35 @@
  */
 
 #include "cx18-driver.h"
+#include "cx18-io.h"
 
 int cx18_av_write(struct cx18 *cx, u16 addr, u8 value)
 {
-        u32 x = readl(cx->reg_mem + 0xc40000 + (addr & ~3));
+        u32 reg = 0xc40000 + (addr & ~3);
         u32 mask = 0xff;
         int shift = (addr & 3) * 8;
+        u32 x = cx18_read_reg(cx, reg);
 
         x = (x & ~(mask << shift)) | ((u32)value << shift);
-        writel(x, cx->reg_mem + 0xc40000 + (addr & ~3));
+        cx18_write_reg(cx, x, reg);
         return 0;
 }
 
 int cx18_av_write4(struct cx18 *cx, u16 addr, u32 value)
 {
-        writel(value, cx->reg_mem + 0xc40000 + addr);
+        cx18_write_reg(cx, value, 0xc40000 + addr);
+        return 0;
+}
+
+int cx18_av_write4_noretry(struct cx18 *cx, u16 addr, u32 value)
+{
+        cx18_write_reg_noretry(cx, value, 0xc40000 + addr);
         return 0;
 }
 
 u8 cx18_av_read(struct cx18 *cx, u16 addr)
 {
-        u32 x = readl(cx->reg_mem + 0xc40000 + (addr & ~3));
+        u32 x = cx18_read_reg(cx, 0xc40000 + (addr & ~3));
         int shift = (addr & 3) * 8;
 
         return (x >> shift) & 0xff;
@@ -50,7 +58,12 @@ u8 cx18_av_read(struct cx18 *cx, u16 addr)
 
 u32 cx18_av_read4(struct cx18 *cx, u16 addr)
 {
-        return readl(cx->reg_mem + 0xc40000 + addr);
+        return cx18_read_reg(cx, 0xc40000 + addr);
+}
+
+u32 cx18_av_read4_noretry(struct cx18 *cx, u16 addr)
+{
+        return cx18_read_reg_noretry(cx, 0xc40000 + addr);
 }
 
 int cx18_av_and_or(struct cx18 *cx, u16 addr, unsigned and_mask,
diff --git a/drivers/media/video/cx18/cx18-av-core.h b/drivers/media/video/cx18/cx18-av-core.h
index eb61fa1e0965..b67d8df20cc6 100644
--- a/drivers/media/video/cx18/cx18-av-core.h
+++ b/drivers/media/video/cx18/cx18-av-core.h
@@ -301,8 +301,10 @@ struct cx18_av_state {
 /* cx18_av-core.c                                                          */
 int cx18_av_write(struct cx18 *cx, u16 addr, u8 value);
 int cx18_av_write4(struct cx18 *cx, u16 addr, u32 value);
+int cx18_av_write4_noretry(struct cx18 *cx, u16 addr, u32 value);
 u8 cx18_av_read(struct cx18 *cx, u16 addr);
 u32 cx18_av_read4(struct cx18 *cx, u16 addr);
+u32 cx18_av_read4_noretry(struct cx18 *cx, u16 addr);
 int cx18_av_and_or(struct cx18 *cx, u16 addr, unsigned mask, u8 value);
 int cx18_av_and_or4(struct cx18 *cx, u16 addr, u32 mask, u32 value);
 int cx18_av_cmd(struct cx18 *cx, unsigned int cmd, void *arg);
diff --git a/drivers/media/video/cx18/cx18-av-firmware.c b/drivers/media/video/cx18/cx18-av-firmware.c
index e996a4e3123a..522a035b2e8f 100644
--- a/drivers/media/video/cx18/cx18-av-firmware.c
+++ b/drivers/media/video/cx18/cx18-av-firmware.c
@@ -20,6 +20,7 @@
  */
 
 #include "cx18-driver.h"
+#include "cx18-io.h"
 #include <linux/firmware.h>
 
 #define CX18_AUDIO_ENABLE 0xc72014
@@ -49,7 +50,7 @@ int cx18_av_loadfw(struct cx18 *cx)
                 cx18_av_write4(cx, 0x8100, 0x00010000);
 
                 /* Put the 8051 in reset and enable firmware upload */
-                cx18_av_write4(cx, CXADEC_DL_CTL, 0x0F000000);
+                cx18_av_write4_noretry(cx, CXADEC_DL_CTL, 0x0F000000);
 
                 ptr = fw->data;
                 size = fw->size;
@@ -58,22 +59,28 @@ int cx18_av_loadfw(struct cx18 *cx)
                         u32 dl_control = 0x0F000000 | i | ((u32)ptr[i] << 16);
                         u32 value = 0;
                         int retries2;
+                        int unrec_err = 0;
 
-                        for (retries2 = 0; retries2 < 5; retries2++) {
-                                cx18_av_write4(cx, CXADEC_DL_CTL, dl_control);
+                        for (retries2 = 0; retries2 < CX18_MAX_MMIO_RETRIES;
+                             retries2++) {
+                                cx18_av_write4_noretry(cx, CXADEC_DL_CTL,
+                                                       dl_control);
                                 udelay(10);
-                                value = cx18_av_read4(cx, CXADEC_DL_CTL);
+                                value = cx18_av_read4_noretry(cx,
+                                                              CXADEC_DL_CTL);
                                 if (value == dl_control)
                                         break;
                                 /* Check if we can correct the byte by changing
                                    the address.  We can only write the lower
                                    address byte of the address. */
                                 if ((value & 0x3F00) != (dl_control & 0x3F00)) {
-                                        retries2 = 5;
+                                        unrec_err = 1;
                                         break;
                                 }
                         }
-                        if (retries2 >= 5)
+                        cx18_log_write_retries(cx, retries2,
+                                        cx->reg_mem + 0xc40000 + CXADEC_DL_CTL);
+                        if (unrec_err || retries2 >= CX18_MAX_MMIO_RETRIES)
                                 break;
                 }
                 if (i == size)
@@ -119,10 +126,10 @@ int cx18_av_loadfw(struct cx18 *cx)
            have a name in the spec. */
         cx18_av_write4(cx, 0x09CC, 1);
 
-        v = read_reg(CX18_AUDIO_ENABLE);
-        /* If bit 11 is 1 */
+        v = cx18_read_reg(cx, CX18_AUDIO_ENABLE);
+        /* If bit 11 is 1, clear bit 10 */
         if (v & 0x800)
-                write_reg(v & 0xFFFFFBFF, CX18_AUDIO_ENABLE); /* Clear bit 10 */
+                cx18_write_reg(cx, v & 0xFFFFFBFF, CX18_AUDIO_ENABLE);
 
         /* Enable WW auto audio standard detection */
         v = cx18_av_read4(cx, CXADEC_STD_DET_CTL);
diff --git a/drivers/media/video/cx18/cx18-cards.c b/drivers/media/video/cx18/cx18-cards.c
index 3cb9734ec07b..5efe01ebe9db 100644
--- a/drivers/media/video/cx18/cx18-cards.c
+++ b/drivers/media/video/cx18/cx18-cards.c
@@ -292,12 +292,111 @@ static const struct cx18_card cx18_card_cnxt_raptor_pal = {
 
 /* ------------------------------------------------------------------------- */
 
+/* Toshiba Qosmio laptop internal DVB-T/Analog Hybrid Tuner */
+
+static const struct cx18_card_pci_info cx18_pci_toshiba_qosmio_dvbt[] = {
+        { PCI_DEVICE_ID_CX23418, CX18_PCI_ID_TOSHIBA, 0x0110 },
+        { 0, 0, 0 }
+};
+
+static const struct cx18_card cx18_card_toshiba_qosmio_dvbt = {
+        .type = CX18_CARD_TOSHIBA_QOSMIO_DVBT,
+        .name = "Toshiba Qosmio DVB-T/Analog",
+        .comment = "Experimenters and photos needed for device to work well.\n"
+                  "\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n",
+        .v4l2_capabilities = CX18_CAP_ENCODER,
+        .hw_audio_ctrl = CX18_HW_CX23418,
+        .hw_all = CX18_HW_TUNER,
+        .video_inputs = {
+                { CX18_CARD_INPUT_VID_TUNER,  0, CX18_AV_COMPOSITE6 },
+                { CX18_CARD_INPUT_SVIDEO1,    1,
+                        CX18_AV_SVIDEO_LUMA3 | CX18_AV_SVIDEO_CHROMA4 },
+                { CX18_CARD_INPUT_COMPOSITE1, 1, CX18_AV_COMPOSITE1 },
+        },
+        .audio_inputs = {
+                { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5,        0 },
+                { CX18_CARD_INPUT_LINE_IN1,  CX18_AV_AUDIO_SERIAL1, 1 },
+        },
+        .tuners = {
+                { .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 },
+        },
+        .ddr = {
+                .chip_config = 0x202,
+                .refresh = 0x3bb,
+                .timing1 = 0x33320a63,
+                .timing2 = 0x0a,
+                .tune_lane = 0,
+                .initial_emrs = 0x42,
+        },
+        .xceive_pin = 15,
+        .pci_list = cx18_pci_toshiba_qosmio_dvbt,
+        .i2c = &cx18_i2c_std,
+};
+
+/* ------------------------------------------------------------------------- */
+
+/* Leadtek WinFast PVR2100 */
+
+static const struct cx18_card_pci_info cx18_pci_leadtek_pvr2100[] = {
+        { PCI_DEVICE_ID_CX23418, CX18_PCI_ID_LEADTEK, 0x6f27 },
+        { 0, 0, 0 }
+};
+
+static const struct cx18_card cx18_card_leadtek_pvr2100 = {
+        .type = CX18_CARD_LEADTEK_PVR2100,
+        .name = "Leadtek WinFast PVR2100",
+        .comment = "Experimenters and photos needed for device to work well.\n"
+                  "\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n",
+        .v4l2_capabilities = CX18_CAP_ENCODER,
+        .hw_audio_ctrl = CX18_HW_CX23418,
+        .hw_muxer = CX18_HW_GPIO,
+        .hw_all = CX18_HW_TUNER | CX18_HW_GPIO,
+        .video_inputs = {
+                { CX18_CARD_INPUT_VID_TUNER,  0, CX18_AV_COMPOSITE2 },
+                { CX18_CARD_INPUT_SVIDEO1,    1,
+                        CX18_AV_SVIDEO_LUMA3 | CX18_AV_SVIDEO_CHROMA4 },
+                { CX18_CARD_INPUT_COMPOSITE1, 1, CX18_AV_COMPOSITE7 },
+        },
+        .audio_inputs = {
+                { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5,        0 },
+                { CX18_CARD_INPUT_LINE_IN1,  CX18_AV_AUDIO_SERIAL1, 1 },
+        },
+        .tuners = {
+                /* XC3028 tuner */
+                { .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 },
+        },
+        .radio_input = { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5, 2 },
+        .ddr = {
+                /*
+                 * Pointer to proper DDR config values provided by
+                 * Terry Wu <terrywu at leadtek.com.tw>
+                 */
+                .chip_config = 0x303,
+                .refresh = 0x3bb,
+                .timing1 = 0x24220e83,
+                .timing2 = 0x1f,
+                .tune_lane = 0,
+                .initial_emrs = 0x2,
+        },
+        .gpio_init.initial_value = 0x6,
+        .gpio_init.direction = 0x7,
+        .gpio_audio_input = { .mask   = 0x7,
+                              .tuner  = 0x6, .linein = 0x2, .radio  = 0x2 },
+        .xceive_pin = 15,
+        .pci_list = cx18_pci_leadtek_pvr2100,
+        .i2c = &cx18_i2c_std,
+};
+
+/* ------------------------------------------------------------------------- */
+
 static const struct cx18_card *cx18_card_list[] = {
         &cx18_card_hvr1600_esmt,
         &cx18_card_hvr1600_samsung,
         &cx18_card_h900,
         &cx18_card_mpc718,
         &cx18_card_cnxt_raptor_pal,
+        &cx18_card_toshiba_qosmio_dvbt,
+        &cx18_card_leadtek_pvr2100,
 };
 
 const struct cx18_card *cx18_get_card(u16 index)
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index bd18afebbf86..085121c2b47f 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -4,6 +4,7 @@
  *  Derived from ivtv-driver.c
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
+ *  Copyright (C) 2008  Andy Walls <awalls@radix.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
@@ -22,6 +23,7 @@
  */
 
 #include "cx18-driver.h"
+#include "cx18-io.h"
 #include "cx18-version.h"
 #include "cx18-cards.h"
 #include "cx18-i2c.h"
@@ -73,10 +75,14 @@ static int radio[CX18_MAX_CARDS] = { -1, -1, -1, -1, -1, -1, -1, -1,
                                      -1, -1, -1, -1, -1, -1, -1, -1,
                                      -1, -1, -1, -1, -1, -1, -1, -1,
                                      -1, -1, -1, -1, -1, -1, -1, -1 };
-
+static int mmio_ndelay[CX18_MAX_CARDS] = { -1, -1, -1, -1, -1, -1, -1, -1,
+                                           -1, -1, -1, -1, -1, -1, -1, -1,
+                                           -1, -1, -1, -1, -1, -1, -1, -1,
+                                           -1, -1, -1, -1, -1, -1, -1, -1 };
 static unsigned cardtype_c = 1;
 static unsigned tuner_c = 1;
 static unsigned radio_c = 1;
+static unsigned mmio_ndelay_c = 1;
 static char pal[] = "--";
 static char secam[] = "--";
 static char ntsc[] = "-";
@@ -90,15 +96,18 @@ static int enc_pcm_buffers = CX18_DEFAULT_ENC_PCM_BUFFERS;
 
 static int cx18_pci_latency = 1;
 
+int cx18_retry_mmio = 1;
 int cx18_debug;
 
 module_param_array(tuner, int, &tuner_c, 0644);
 module_param_array(radio, bool, &radio_c, 0644);
 module_param_array(cardtype, int, &cardtype_c, 0644);
+module_param_array(mmio_ndelay, int, &mmio_ndelay_c, 0644);
 module_param_string(pal, pal, sizeof(pal), 0644);
 module_param_string(secam, secam, sizeof(secam), 0644);
 module_param_string(ntsc, ntsc, sizeof(ntsc), 0644);
 module_param_named(debug, cx18_debug, int, 0644);
+module_param_named(retry_mmio, cx18_retry_mmio, int, 0644);
 module_param(cx18_pci_latency, int, 0644);
 module_param(cx18_first_minor, int, 0644);
 
@@ -121,6 +130,8 @@ MODULE_PARM_DESC(cardtype,
                  "\t\t\t 3 = Compro VideoMate H900\n"
                  "\t\t\t 4 = Yuan MPC718\n"
                  "\t\t\t 5 = Conexant Raptor PAL/SECAM\n"
+                 "\t\t\t 6 = Toshiba Qosmio DVB-T/Analog\n"
+                 "\t\t\t 7 = Leadtek WinFast PVR2100\n"
                  "\t\t\t 0 = Autodetect (default)\n"
                  "\t\t\t-1 = Ignore this card\n\t\t");
 MODULE_PARM_DESC(pal, "Set PAL standard: B, G, H, D, K, I, M, N, Nc, 60");
@@ -140,6 +151,14 @@ MODULE_PARM_DESC(debug,
 MODULE_PARM_DESC(cx18_pci_latency,
                  "Change the PCI latency to 64 if lower: 0 = No, 1 = Yes,\n"
                  "\t\t\tDefault: Yes");
+MODULE_PARM_DESC(retry_mmio,
+                 "Check and retry memory mapped IO accesses\n"
+                 "\t\t\tDefault: 1 [Yes]");
+MODULE_PARM_DESC(mmio_ndelay,
+                 "Delay (ns) for each CX23418 memory mapped IO access.\n"
+                 "\t\t\tTry larger values that are close to a multiple of the\n"
+                 "\t\t\tPCI clock period, 30.3 ns, if your card doesn't work.\n"
+                 "\t\t\tDefault: " __stringify(CX18_DEFAULT_MMIO_NDELAY));
 MODULE_PARM_DESC(enc_mpg_buffers,
                  "Encoder MPG Buffers (in MB)\n"
                  "\t\t\tDefault: " __stringify(CX18_DEFAULT_ENC_MPG_BUFFERS));
@@ -156,7 +175,7 @@ MODULE_PARM_DESC(enc_pcm_buffers,
                  "Encoder PCM buffers (in MB)\n"
                  "\t\t\tDefault: " __stringify(CX18_DEFAULT_ENC_PCM_BUFFERS));
 
-MODULE_PARM_DESC(cx18_first_minor, "Set minor assigned to first card");
+MODULE_PARM_DESC(cx18_first_minor, "Set kernel number assigned to first card");
 
 MODULE_AUTHOR("Hans Verkuil");
 MODULE_DESCRIPTION("CX23418 driver");
@@ -356,6 +375,11 @@ static void cx18_process_options(struct cx18 *cx)
         cx->options.tuner = tuner[cx->num];
         cx->options.radio = radio[cx->num];
 
+        if (mmio_ndelay[cx->num] < 0)
+                cx->options.mmio_ndelay = CX18_DEFAULT_MMIO_NDELAY;
+        else
+                cx->options.mmio_ndelay = mmio_ndelay[cx->num];
+
         cx->std = cx18_parse_std(cx);
         if (cx->options.cardtype == -1) {
                 CX18_INFO("Ignore card\n");
@@ -395,9 +419,9 @@ done:
 
         if (cx->card == NULL) {
                 cx->card = cx18_get_card(CX18_CARD_HVR_1600_ESMT);
-                CX18_ERR("Unknown card: vendor/device: %04x/%04x\n",
+                CX18_ERR("Unknown card: vendor/device: [%04x:%04x]\n",
                      cx->dev->vendor, cx->dev->device);
-                CX18_ERR("              subsystem vendor/device: %04x/%04x\n",
+                CX18_ERR("              subsystem vendor/device: [%04x:%04x]\n",
                      cx->dev->subsystem_vendor, cx->dev->subsystem_device);
                 CX18_ERR("Defaulting to %s card\n", cx->card->name);
                 CX18_ERR("Please mail the vendor/device and subsystem vendor/device IDs and what kind of\n");
@@ -511,9 +535,9 @@ static int cx18_setup_pci(struct cx18 *cx, struct pci_dev *dev,
                 return -EIO;
         }
 
-        /* Check for bus mastering */
+        /* Enable bus mastering and memory mapped IO for the CX23418 */
         pci_read_config_word(dev, PCI_COMMAND, &cmd);
-        cmd |= PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;
+        cmd |= PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;
         pci_write_config_word(dev, PCI_COMMAND, cmd);
 
         pci_read_config_byte(dev, PCI_CLASS_REVISION, &cx->card_rev);
@@ -525,11 +549,6 @@ static int cx18_setup_pci(struct cx18 *cx, struct pci_dev *dev,
                 pci_write_config_byte(dev, PCI_LATENCY_TIMER, 64);
                 pci_read_config_byte(dev, PCI_LATENCY_TIMER, &pci_latency);
         }
-        /* This config space value relates to DMA latencies. The
-           default value 0x8080 is too low however and will lead
-           to DMA errors. 0xffff is the max value which solves
-           these problems. */
-        pci_write_config_dword(dev, 0x40, 0xffff);
 
         CX18_DEBUG_INFO("cx%d (rev %d) at %02x:%02x.%x, "
                    "irq: %d, latency: %d, memory: 0x%lx\n",
@@ -656,7 +675,7 @@ static int __devinit cx18_probe(struct pci_dev *dev,
                 goto free_mem;
         }
         cx->reg_mem = cx->enc_mem + CX18_REG_OFFSET;
-        devtype = read_reg(0xC72028);
+        devtype = cx18_read_reg(cx, 0xC72028);
         switch (devtype & 0xff000000) {
         case 0xff000000:
                 CX18_INFO("cx23418 revision %08x (A)\n", devtype);
@@ -815,6 +834,7 @@ err:
         if (retval == 0)
                 retval = -ENODEV;
         CX18_ERR("Error %d on initialization\n", retval);
+        cx18_log_statistics(cx);
 
         kfree(cx18_cards[cx18_cards_active]);
         cx18_cards[cx18_cards_active] = NULL;
@@ -902,8 +922,8 @@ static void cx18_remove(struct pci_dev *pci_dev)
                 cx18_stop_all_captures(cx);
 
         /* Interrupts */
-        sw1_irq_disable(IRQ_CPU_TO_EPU | IRQ_APU_TO_EPU);
-        sw2_irq_disable(IRQ_CPU_TO_EPU_ACK | IRQ_APU_TO_EPU_ACK);
+        cx18_sw1_irq_disable(cx, IRQ_CPU_TO_EPU | IRQ_APU_TO_EPU);
+        cx18_sw2_irq_disable(cx, IRQ_CPU_TO_EPU_ACK | IRQ_APU_TO_EPU_ACK);
 
         cx18_halt_firmware(cx);
 
@@ -919,6 +939,7 @@ static void cx18_remove(struct pci_dev *pci_dev)
 
         pci_disable_device(cx->dev);
 
+        cx18_log_statistics(cx);
         CX18_INFO("Removed %s, card #%d\n", cx->card_name, cx->num);
 }
 
@@ -938,7 +959,7 @@ static int module_start(void)
 
         /* Validate parameters */
         if (cx18_first_minor < 0 || cx18_first_minor >= CX18_MAX_CARDS) {
-                printk(KERN_ERR "cx18:  Exiting, ivtv_first_minor must be between 0 and %d\n",
+                printk(KERN_ERR "cx18:  Exiting, cx18_first_minor must be between 0 and %d\n",
                      CX18_MAX_CARDS - 1);
                 return -1;
         }
diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
index 4801bc7fb5b2..fa8be0731a3f 100644
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -38,7 +38,6 @@
 #include <linux/i2c-algo-bit.h>
 #include <linux/list.h>
 #include <linux/unistd.h>
-#include <linux/byteorder/swab.h>
 #include <linux/pagemap.h>
 #include <linux/workqueue.h>
 #include <linux/mutex.h>
@@ -64,6 +63,9 @@
 #  error "This driver requires kernel PCI support."
 #endif
 
+/* Default delay to throttle mmio access to the CX23418 */
+#define CX18_DEFAULT_MMIO_NDELAY 0 /* 0 ns = 0 PCI clock(s) / 33 MHz */
+
 #define CX18_MEM_OFFSET 0x00000000
 #define CX18_MEM_SIZE   0x04000000
 #define CX18_REG_OFFSET 0x02000000
@@ -77,7 +79,9 @@
 #define CX18_CARD_COMPRO_H900         2 /* Compro VideoMate H900 */
 #define CX18_CARD_YUAN_MPC718         3 /* Yuan MPC718 */
 #define CX18_CARD_CNXT_RAPTOR_PAL     4 /* Conexant Raptor PAL */
-#define CX18_CARD_LAST                4
+#define CX18_CARD_TOSHIBA_QOSMIO_DVBT 5 /* Toshiba Qosmio Interal DVB-T/Analog*/
+#define CX18_CARD_LEADTEK_PVR2100     6 /* Leadtek WinFast PVR2100 */
+#define CX18_CARD_LAST                6
 
 #define CX18_ENC_STREAM_TYPE_MPG  0
 #define CX18_ENC_STREAM_TYPE_TS   1
@@ -97,6 +101,8 @@
 #define CX18_PCI_ID_COMPRO              0x185b
 #define CX18_PCI_ID_YUAN                0x12ab
 #define CX18_PCI_ID_CONEXANT            0x14f1
+#define CX18_PCI_ID_TOSHIBA             0x1179
+#define CX18_PCI_ID_LEADTEK             0x107D
 
 /* ======================================================================== */
 /* ========================== START USER SETTABLE DMA VARIABLES =========== */
@@ -169,6 +175,7 @@
 
 #define CX18_MAX_PGM_INDEX (400)
 
+extern int cx18_retry_mmio;     /* enable check & retry of mmio accesses */
 extern int cx18_debug;
 
 
@@ -177,6 +184,7 @@ struct cx18_options {
         int cardtype;           /* force card type on load */
         int tuner;              /* set tuner on load */
         int radio;              /* enable/disable radio */
+        unsigned long mmio_ndelay; /* delay in ns after every PCI mmio access */
 };
 
 /* per-buffer bit flags */
@@ -216,8 +224,7 @@ struct cx18_buffer {
 
 struct cx18_queue {
         struct list_head list;
-        u32 buffers;
-        u32 length;
+        atomic_t buffers;
         u32 bytesused;
 };
 
@@ -237,6 +244,8 @@ struct cx18_dvb {
 struct cx18;     /* forward reference */
 struct cx18_scb; /* forward reference */
 
+#define CX18_INVALID_TASK_HANDLE 0xffffffff
+
 struct cx18_stream {
         /* These first four fields are always set, even if the stream
            is not actually created. */
@@ -259,7 +268,6 @@ struct cx18_stream {
         /* Buffer Stats */
         u32 buffers;
         u32 buf_size;
-        u32 buffers_stolen;
 
         /* Buffer Queues */
         struct cx18_queue q_free;       /* free buffers */
@@ -341,6 +349,13 @@ struct cx18_i2c_algo_callback_data {
         int bus_index;   /* 0 or 1 for the cx23418's 1st or 2nd I2C bus */
 };
 
+#define CX18_MAX_MMIO_RETRIES 10
+
+struct cx18_mmio_stats {
+        atomic_t retried_write[CX18_MAX_MMIO_RETRIES+1];
+        atomic_t retried_read[CX18_MAX_MMIO_RETRIES+1];
+};
+
 /* Struct to hold info about cx18 cards */
 struct cx18 {
         int num;                /* board number, -1 during init! */
@@ -430,6 +445,9 @@ struct cx18 {
         u32 gpio_val;
         struct mutex gpio_lock;
 
+        /* Statistics */
+        struct cx18_mmio_stats mmio_stats;
+
         /* v4l2 and User settings */
 
         /* codec settings */
@@ -458,47 +476,4 @@ void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv);
 /* First-open initialization: load firmware, etc. */
 int cx18_init_on_first_open(struct cx18 *cx);
 
-/* This is a PCI post thing, where if the pci register is not read, then
-   the write doesn't always take effect right away. By reading back the
-   register any pending PCI writes will be performed (in order), and so
-   you can be sure that the writes are guaranteed to be done.
-
-   Rarely needed, only in some timing sensitive cases.
-   Apparently if this is not done some motherboards seem
-   to kill the firmware and get into the broken state until computer is
-   rebooted. */
-#define write_sync(val, reg) \
-        do { writel(val, reg); readl(reg); } while (0)
-
-#define read_reg(reg) readl(cx->reg_mem + (reg))
-#define write_reg(val, reg) writel(val, cx->reg_mem + (reg))
-#define write_reg_sync(val, reg) \
-        do { write_reg(val, reg); read_reg(reg); } while (0)
-
-#define read_enc(addr) readl(cx->enc_mem + (u32)(addr))
-#define write_enc(val, addr) writel(val, cx->enc_mem + (u32)(addr))
-#define write_enc_sync(val, addr) \
-        do { write_enc(val, addr); read_enc(addr); } while (0)
-
-#define sw1_irq_enable(val) do { \
-        write_reg(val, SW1_INT_STATUS); \
-        write_reg(read_reg(SW1_INT_ENABLE_PCI) | (val), SW1_INT_ENABLE_PCI); \
-} while (0)
-
-#define sw1_irq_disable(val) \
-        write_reg(read_reg(SW1_INT_ENABLE_PCI) & ~(val), SW1_INT_ENABLE_PCI);
-
-#define sw2_irq_enable(val) do { \
-        write_reg(val, SW2_INT_STATUS); \
-        write_reg(read_reg(SW2_INT_ENABLE_PCI) | (val), SW2_INT_ENABLE_PCI); \
-} while (0)
-
-#define sw2_irq_disable(val) \
-        write_reg(read_reg(SW2_INT_ENABLE_PCI) & ~(val), SW2_INT_ENABLE_PCI);
-
-#define setup_page(addr) do { \
-    u32 val = read_reg(0xD000F8) & ~0x1f00; \
-    write_reg(val | (((addr) >> 17) & 0x1f00), 0xD000F8); \
-} while (0)
-
 #endif /* CX18_DRIVER_H */
diff --git a/drivers/media/video/cx18/cx18-dvb.c b/drivers/media/video/cx18/cx18-dvb.c
index 1e420a804fc9..afc694e7bdb2 100644
--- a/drivers/media/video/cx18/cx18-dvb.c
+++ b/drivers/media/video/cx18/cx18-dvb.c
@@ -21,6 +21,7 @@
 
 #include "cx18-version.h"
 #include "cx18-dvb.h"
+#include "cx18-io.h"
 #include "cx18-streams.h"
 #include "cx18-cards.h"
 #include "s5h1409.h"
@@ -87,13 +88,13 @@ static int cx18_dvb_start_feed(struct dvb_demux_feed *feed)
         switch (cx->card->type) {
         case CX18_CARD_HVR_1600_ESMT:
         case CX18_CARD_HVR_1600_SAMSUNG:
-                v = read_reg(CX18_REG_DMUX_NUM_PORT_0_CONTROL);
+                v = cx18_read_reg(cx, CX18_REG_DMUX_NUM_PORT_0_CONTROL);
                 v |= 0x00400000; /* Serial Mode */
                 v |= 0x00002000; /* Data Length - Byte */
                 v |= 0x00010000; /* Error - Polarity */
                 v |= 0x00020000; /* Error - Passthru */
                 v |= 0x000c0000; /* Error - Ignore */
-                write_reg(v, CX18_REG_DMUX_NUM_PORT_0_CONTROL);
+                cx18_write_reg(cx, v, CX18_REG_DMUX_NUM_PORT_0_CONTROL);
                 break;
 
         default:
diff --git a/drivers/media/video/cx18/cx18-fileops.c b/drivers/media/video/cx18/cx18-fileops.c
index 1e537fe04a23..5f9089907544 100644
--- a/drivers/media/video/cx18/cx18-fileops.c
+++ b/drivers/media/video/cx18/cx18-fileops.c
@@ -132,6 +132,7 @@ static void cx18_dualwatch(struct cx18 *cx)
         u16 new_stereo_mode;
         const u16 stereo_mask = 0x0300;
         const u16 dual = 0x0200;
+        u32 h;
 
         new_stereo_mode = cx->params.audio_properties & stereo_mask;
         memset(&vt, 0, sizeof(vt));
@@ -143,13 +144,21 @@ static void cx18_dualwatch(struct cx18 *cx)
         if (new_stereo_mode == cx->dualwatch_stereo_mode)
                 return;
 
-        new_bitmap = new_stereo_mode | (cx->params.audio_properties & ~stereo_mask);
+        new_bitmap = new_stereo_mode
+                        | (cx->params.audio_properties & ~stereo_mask);
 
-        CX18_DEBUG_INFO("dualwatch: change stereo flag from 0x%x to 0x%x. new audio_bitmask=0x%ux\n",
-                           cx->dualwatch_stereo_mode, new_stereo_mode, new_bitmap);
+        CX18_DEBUG_INFO("dualwatch: change stereo flag from 0x%x to 0x%x. "
+                        "new audio_bitmask=0x%ux\n",
+                        cx->dualwatch_stereo_mode, new_stereo_mode, new_bitmap);
 
-        if (cx18_vapi(cx, CX18_CPU_SET_AUDIO_PARAMETERS, 2,
-                                cx18_find_handle(cx), new_bitmap) == 0) {
+        h = cx18_find_handle(cx);
+        if (h == CX18_INVALID_TASK_HANDLE) {
+                CX18_DEBUG_INFO("dualwatch: can't find valid task handle\n");
+                return;
+        }
+
+        if (cx18_vapi(cx,
+                      CX18_CPU_SET_AUDIO_PARAMETERS, 2, h, new_bitmap) == 0) {
                 cx->dualwatch_stereo_mode = new_stereo_mode;
                 return;
         }
@@ -223,7 +232,7 @@ static struct cx18_buffer *cx18_get_buffer(struct cx18_stream *s, int non_block,
                 prepare_to_wait(&s->waitq, &wait, TASK_INTERRUPTIBLE);
                 /* New buffers might have become available before we were added
                    to the waitqueue */
-                if (!s->q_full.buffers)
+                if (!atomic_read(&s->q_full.buffers))
                         schedule();
                 finish_wait(&s->waitq, &wait);
                 if (signal_pending(current)) {
@@ -509,7 +518,7 @@ unsigned int cx18_v4l2_enc_poll(struct file *filp, poll_table *wait)
         CX18_DEBUG_HI_FILE("Encoder poll\n");
         poll_wait(filp, &s->waitq, wait);
 
-        if (s->q_full.length || s->q_io.length)
+        if (atomic_read(&s->q_full.buffers) || atomic_read(&s->q_io.buffers))
                 return POLLIN | POLLRDNORM;
         if (eof)
                 return POLLHUP;
@@ -695,20 +704,28 @@ int cx18_v4l2_open(struct inode *inode, struct file *filp)
 
 void cx18_mute(struct cx18 *cx)
 {
-        if (atomic_read(&cx->ana_capturing))
-                cx18_vapi(cx, CX18_CPU_SET_AUDIO_MUTE, 2,
-                                cx18_find_handle(cx), 1);
+        u32 h;
+        if (atomic_read(&cx->ana_capturing)) {
+                h = cx18_find_handle(cx);
+                if (h != CX18_INVALID_TASK_HANDLE)
+                        cx18_vapi(cx, CX18_CPU_SET_AUDIO_MUTE, 2, h, 1);
+                else
+                        CX18_ERR("Can't find valid task handle for mute\n");
+        }
         CX18_DEBUG_INFO("Mute\n");
 }
 
 void cx18_unmute(struct cx18 *cx)
 {
+        u32 h;
         if (atomic_read(&cx->ana_capturing)) {
-                cx18_msleep_timeout(100, 0);
-                cx18_vapi(cx, CX18_CPU_SET_MISC_PARAMETERS, 2,
-                                cx18_find_handle(cx), 12);
-                cx18_vapi(cx, CX18_CPU_SET_AUDIO_MUTE, 2,
-                                cx18_find_handle(cx), 0);
+                h = cx18_find_handle(cx);
+                if (h != CX18_INVALID_TASK_HANDLE) {
+                        cx18_msleep_timeout(100, 0);
+                        cx18_vapi(cx, CX18_CPU_SET_MISC_PARAMETERS, 2, h, 12);
+                        cx18_vapi(cx, CX18_CPU_SET_AUDIO_MUTE, 2, h, 0);
+                } else
+                        CX18_ERR("Can't find valid task handle for unmute\n");
         }
         CX18_DEBUG_INFO("Unmute\n");
 }
diff --git a/drivers/media/video/cx18/cx18-firmware.c b/drivers/media/video/cx18/cx18-firmware.c
index 78fadd2ada5d..51534428cd00 100644
--- a/drivers/media/video/cx18/cx18-firmware.c
+++ b/drivers/media/video/cx18/cx18-firmware.c
@@ -20,6 +20,7 @@
  */
 
 #include "cx18-driver.h"
+#include "cx18-io.h"
 #include "cx18-scb.h"
 #include "cx18-irq.h"
 #include "cx18-firmware.h"
@@ -113,11 +114,11 @@ static int load_cpu_fw_direct(const char *fn, u8 __iomem *mem, struct cx18 *cx)
         src = (const u32 *)fw->data;
 
         for (i = 0; i < fw->size; i += 4096) {
-                setup_page(i);
+                cx18_setup_page(cx, i);
                 for (j = i; j < fw->size && j < i + 4096; j += 4) {
                         /* no need for endianness conversion on the ppc */
-                        __raw_writel(*src, dst);
-                        if (__raw_readl(dst) != *src) {
+                        cx18_raw_writel(cx, *src, dst);
+                        if (cx18_raw_readl(cx, dst) != *src) {
                                 CX18_ERR("Mismatch at offset %x\n", i);
                                 release_firmware(fw);
                                 return -EIO;
@@ -170,12 +171,15 @@ static int load_apu_fw_direct(const char *fn, u8 __iomem *dst, struct cx18 *cx)
                 if (offset + seghdr.size > sz)
                         break;
                 for (i = 0; i < seghdr.size; i += 4096) {
-                        setup_page(offset + i);
+                        cx18_setup_page(cx, offset + i);
                         for (j = i; j < seghdr.size && j < i + 4096; j += 4) {
                                 /* no need for endianness conversion on the ppc */
-                                __raw_writel(src[(offset + j) / 4], dst + seghdr.addr + j);
-                                if (__raw_readl(dst + seghdr.addr + j) != src[(offset + j) / 4]) {
-                                        CX18_ERR("Mismatch at offset %x\n", offset + j);
+                                cx18_raw_writel(cx, src[(offset + j) / 4],
+                                                dst + seghdr.addr + j);
+                                if (cx18_raw_readl(cx, dst + seghdr.addr + j)
+                                    != src[(offset + j) / 4]) {
+                                        CX18_ERR("Mismatch at offset %x\n",
+                                                 offset + j);
                                         release_firmware(fw);
                                         return -EIO;
                                 }
@@ -189,43 +193,45 @@ static int load_apu_fw_direct(const char *fn, u8 __iomem *dst, struct cx18 *cx)
         size = fw->size;
         release_firmware(fw);
         /* Clear bit0 for APU to start from 0 */
-        write_reg(read_reg(0xc72030) & ~1, 0xc72030);
+        cx18_write_reg(cx, cx18_read_reg(cx, 0xc72030) & ~1, 0xc72030);
         return size;
 }
 
 void cx18_halt_firmware(struct cx18 *cx)
 {
         CX18_DEBUG_INFO("Preparing for firmware halt.\n");
-        write_reg(0x000F000F, CX18_PROC_SOFT_RESET); /* stop the fw */
-        write_reg(0x00020002, CX18_ADEC_CONTROL);
+        cx18_write_reg(cx, 0x000F000F, CX18_PROC_SOFT_RESET); /* stop the fw */
+        cx18_write_reg(cx, 0x00020002, CX18_ADEC_CONTROL);
 }
 
 void cx18_init_power(struct cx18 *cx, int lowpwr)
 {
         /* power-down Spare and AOM PLLs */
         /* power-up fast, slow and mpeg PLLs */
-        write_reg(0x00000008, CX18_PLL_POWER_DOWN);
+        cx18_write_reg(cx, 0x00000008, CX18_PLL_POWER_DOWN);
 
         /* ADEC out of sleep */
-        write_reg(0x00020000, CX18_ADEC_CONTROL);
+        cx18_write_reg(cx, 0x00020000, CX18_ADEC_CONTROL);
 
         /* The fast clock is at 200/245 MHz */
-        write_reg(lowpwr ? 0xD : 0x11, CX18_FAST_CLOCK_PLL_INT);
-        write_reg(lowpwr ? 0x1EFBF37 : 0x038E3D7, CX18_FAST_CLOCK_PLL_FRAC);
+        cx18_write_reg(cx, lowpwr ? 0xD : 0x11, CX18_FAST_CLOCK_PLL_INT);
+        cx18_write_reg(cx, lowpwr ? 0x1EFBF37 : 0x038E3D7,
+                                                CX18_FAST_CLOCK_PLL_FRAC);
 
-        write_reg(2, CX18_FAST_CLOCK_PLL_POST);
-        write_reg(1, CX18_FAST_CLOCK_PLL_PRESCALE);
-        write_reg(4, CX18_FAST_CLOCK_PLL_ADJUST_BANDWIDTH);
+        cx18_write_reg(cx, 2, CX18_FAST_CLOCK_PLL_POST);
+        cx18_write_reg(cx, 1, CX18_FAST_CLOCK_PLL_PRESCALE);
+        cx18_write_reg(cx, 4, CX18_FAST_CLOCK_PLL_ADJUST_BANDWIDTH);
 
         /* set slow clock to 125/120 MHz */
-        write_reg(lowpwr ? 0x11 : 0x10, CX18_SLOW_CLOCK_PLL_INT);
-        write_reg(lowpwr ? 0xEBAF05 : 0x18618A8, CX18_SLOW_CLOCK_PLL_FRAC);
-        write_reg(4, CX18_SLOW_CLOCK_PLL_POST);
+        cx18_write_reg(cx, lowpwr ? 0x11 : 0x10, CX18_SLOW_CLOCK_PLL_INT);
+        cx18_write_reg(cx, lowpwr ? 0xEBAF05 : 0x18618A8,
+                                                CX18_SLOW_CLOCK_PLL_FRAC);
+        cx18_write_reg(cx, 4, CX18_SLOW_CLOCK_PLL_POST);
 
         /* mpeg clock pll 54MHz */
-        write_reg(0xF, CX18_MPEG_CLOCK_PLL_INT);
-        write_reg(0x2BCFEF, CX18_MPEG_CLOCK_PLL_FRAC);
-        write_reg(8, CX18_MPEG_CLOCK_PLL_POST);
+        cx18_write_reg(cx, 0xF, CX18_MPEG_CLOCK_PLL_INT);
+        cx18_write_reg(cx, 0x2BCFEF, CX18_MPEG_CLOCK_PLL_FRAC);
+        cx18_write_reg(cx, 8, CX18_MPEG_CLOCK_PLL_POST);
 
         /* Defaults */
         /* APU = SC or SC/2 = 125/62.5 */
@@ -242,81 +248,84 @@ void cx18_init_power(struct cx18 *cx, int lowpwr)
         /* VFC = disabled */
         /* USB = disabled */
 
-        write_reg(lowpwr ? 0xFFFF0020 : 0x00060004, CX18_CLOCK_SELECT1);
-        write_reg(lowpwr ? 0xFFFF0004 : 0x00060006, CX18_CLOCK_SELECT2);
+        cx18_write_reg(cx, lowpwr ? 0xFFFF0020 : 0x00060004,
+                                                        CX18_CLOCK_SELECT1);
+        cx18_write_reg(cx, lowpwr ? 0xFFFF0004 : 0x00060006,
+                                                        CX18_CLOCK_SELECT2);
 
-        write_reg(0xFFFF0002, CX18_HALF_CLOCK_SELECT1);
-        write_reg(0xFFFF0104, CX18_HALF_CLOCK_SELECT2);
+        cx18_write_reg(cx, 0xFFFF0002, CX18_HALF_CLOCK_SELECT1);
+        cx18_write_reg(cx, 0xFFFF0104, CX18_HALF_CLOCK_SELECT2);
 
-        write_reg(0xFFFF9026, CX18_CLOCK_ENABLE1);
-        write_reg(0xFFFF3105, CX18_CLOCK_ENABLE2);
+        cx18_write_reg(cx, 0xFFFF9026, CX18_CLOCK_ENABLE1);
+        cx18_write_reg(cx, 0xFFFF3105, CX18_CLOCK_ENABLE2);
 }
 
 void cx18_init_memory(struct cx18 *cx)
 {
         cx18_msleep_timeout(10, 0);
-        write_reg(0x10000, CX18_DDR_SOFT_RESET);
+        cx18_write_reg(cx, 0x10000, CX18_DDR_SOFT_RESET);
         cx18_msleep_timeout(10, 0);
 
-        write_reg(cx->card->ddr.chip_config, CX18_DDR_CHIP_CONFIG);
+        cx18_write_reg(cx, cx->card->ddr.chip_config, CX18_DDR_CHIP_CONFIG);
 
         cx18_msleep_timeout(10, 0);
 
-        write_reg(cx->card->ddr.refresh, CX18_DDR_REFRESH);
-        write_reg(cx->card->ddr.timing1, CX18_DDR_TIMING1);
-        write_reg(cx->card->ddr.timing2, CX18_DDR_TIMING2);
+        cx18_write_reg(cx, cx->card->ddr.refresh, CX18_DDR_REFRESH);
+        cx18_write_reg(cx, cx->card->ddr.timing1, CX18_DDR_TIMING1);
+        cx18_write_reg(cx, cx->card->ddr.timing2, CX18_DDR_TIMING2);
 
         cx18_msleep_timeout(10, 0);
 
         /* Initialize DQS pad time */
-        write_reg(cx->card->ddr.tune_lane, CX18_DDR_TUNE_LANE);
-        write_reg(cx->card->ddr.initial_emrs, CX18_DDR_INITIAL_EMRS);
+        cx18_write_reg(cx, cx->card->ddr.tune_lane, CX18_DDR_TUNE_LANE);
+        cx18_write_reg(cx, cx->card->ddr.initial_emrs, CX18_DDR_INITIAL_EMRS);
 
         cx18_msleep_timeout(10, 0);
 
-        write_reg(0x20000, CX18_DDR_SOFT_RESET);
+        cx18_write_reg(cx, 0x20000, CX18_DDR_SOFT_RESET);
         cx18_msleep_timeout(10, 0);
 
         /* use power-down mode when idle */
-        write_reg(0x00000010, CX18_DDR_POWER_REG);
-
-        write_reg(0x10001, CX18_REG_BUS_TIMEOUT_EN);
-
-        write_reg(0x48, CX18_DDR_MB_PER_ROW_7);
-        write_reg(0xE0000, CX18_DDR_BASE_63_ADDR);
-
-        write_reg(0x00000101, CX18_WMB_CLIENT02);  /* AO */
-        write_reg(0x00000101, CX18_WMB_CLIENT09);  /* AI2 */
-        write_reg(0x00000101, CX18_WMB_CLIENT05);  /* VIM1 */
-        write_reg(0x00000101, CX18_WMB_CLIENT06);  /* AI1 */
-        write_reg(0x00000101, CX18_WMB_CLIENT07);  /* 3D comb */
-        write_reg(0x00000101, CX18_WMB_CLIENT10);  /* ME */
-        write_reg(0x00000101, CX18_WMB_CLIENT12);  /* ENC */
-        write_reg(0x00000101, CX18_WMB_CLIENT13);  /* PK */
-        write_reg(0x00000101, CX18_WMB_CLIENT11);  /* RC */
-        write_reg(0x00000101, CX18_WMB_CLIENT14);  /* AVO */
+        cx18_write_reg(cx, 0x00000010, CX18_DDR_POWER_REG);
+
+        cx18_write_reg(cx, 0x10001, CX18_REG_BUS_TIMEOUT_EN);
+
+        cx18_write_reg(cx, 0x48, CX18_DDR_MB_PER_ROW_7);
+        cx18_write_reg(cx, 0xE0000, CX18_DDR_BASE_63_ADDR);
+
+        cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT02);  /* AO */
+        cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT09);  /* AI2 */
+        cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT05);  /* VIM1 */
+        cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT06);  /* AI1 */
+        cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT07);  /* 3D comb */
+        cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT10);  /* ME */
+        cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT12);  /* ENC */
+        cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT13);  /* PK */
+        cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT11);  /* RC */
+        cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT14);  /* AVO */
 }
 
 int cx18_firmware_init(struct cx18 *cx)
 {
         /* Allow chip to control CLKRUN */
-        write_reg(0x5, CX18_DSP0_INTERRUPT_MASK);
+        cx18_write_reg(cx, 0x5, CX18_DSP0_INTERRUPT_MASK);
 
-        write_reg(0x000F000F, CX18_PROC_SOFT_RESET); /* stop the fw */
+        cx18_write_reg(cx, 0x000F000F, CX18_PROC_SOFT_RESET); /* stop the fw */
 
         cx18_msleep_timeout(1, 0);
 
-        sw1_irq_enable(IRQ_CPU_TO_EPU | IRQ_APU_TO_EPU);
-        sw2_irq_enable(IRQ_CPU_TO_EPU_ACK | IRQ_APU_TO_EPU_ACK);
+        cx18_sw1_irq_enable(cx, IRQ_CPU_TO_EPU | IRQ_APU_TO_EPU);
+        cx18_sw2_irq_enable(cx, IRQ_CPU_TO_EPU_ACK | IRQ_APU_TO_EPU_ACK);
 
         /* Only if the processor is not running */
-        if (read_reg(CX18_PROC_SOFT_RESET) & 8) {
+        if (cx18_read_reg(cx, CX18_PROC_SOFT_RESET) & 8) {
                 int sz = load_apu_fw_direct("v4l-cx23418-apu.fw",
                                cx->enc_mem, cx);
 
-                write_enc(0xE51FF004, 0);
-                write_enc(0xa00000, 4);  /* todo: not hardcoded */
-                write_reg(0x00010000, CX18_PROC_SOFT_RESET); /* Start APU */
+                cx18_write_enc(cx, 0xE51FF004, 0);
+                cx18_write_enc(cx, 0xa00000, 4);  /* todo: not hardcoded */
+                /* Start APU */
+                cx18_write_reg(cx, 0x00010000, CX18_PROC_SOFT_RESET);
                 cx18_msleep_timeout(500, 0);
 
                 sz = sz <= 0 ? sz : load_cpu_fw_direct("v4l-cx23418-cpu.fw",
@@ -326,9 +335,10 @@ int cx18_firmware_init(struct cx18 *cx)
                         int retries = 0;
 
                         /* start the CPU */
-                        write_reg(0x00080000, CX18_PROC_SOFT_RESET);
+                        cx18_write_reg(cx, 0x00080000, CX18_PROC_SOFT_RESET);
                         while (retries++ < 50) { /* Loop for max 500mS */
-                                if ((read_reg(CX18_PROC_SOFT_RESET) & 1) == 0)
+                                if ((cx18_read_reg(cx, CX18_PROC_SOFT_RESET)
+                                     & 1) == 0)
                                         break;
                                 cx18_msleep_timeout(10, 0);
                         }
@@ -342,6 +352,6 @@ int cx18_firmware_init(struct cx18 *cx)
                         return -EIO;
         }
         /* initialize GPIO */
-        write_reg(0x14001400, 0xC78110);
+        cx18_write_reg(cx, 0x14001400, 0xC78110);
         return 0;
 }
diff --git a/drivers/media/video/cx18/cx18-gpio.c b/drivers/media/video/cx18/cx18-gpio.c
index 3d495dba4983..0e560421989e 100644
--- a/drivers/media/video/cx18/cx18-gpio.c
+++ b/drivers/media/video/cx18/cx18-gpio.c
@@ -22,6 +22,7 @@
  */
 
 #include "cx18-driver.h"
+#include "cx18-io.h"
 #include "cx18-cards.h"
 #include "cx18-gpio.h"
 #include "tuner-xc2028.h"
@@ -49,11 +50,11 @@ static void gpio_write(struct cx18 *cx)
         u32 dir = cx->gpio_dir;
         u32 val = cx->gpio_val;
 
-        write_reg((dir & 0xffff) << 16, CX18_REG_GPIO_DIR1);
-        write_reg(((dir & 0xffff) << 16) | (val & 0xffff),
+        cx18_write_reg(cx, (dir & 0xffff) << 16, CX18_REG_GPIO_DIR1);
+        cx18_write_reg(cx, ((dir & 0xffff) << 16) | (val & 0xffff),
                         CX18_REG_GPIO_OUT1);
-        write_reg(dir & 0xffff0000, CX18_REG_GPIO_DIR2);
-        write_reg_sync((dir & 0xffff0000) | ((val & 0xffff0000) >> 16),
+        cx18_write_reg(cx, dir & 0xffff0000, CX18_REG_GPIO_DIR2);
+        cx18_write_reg_sync(cx, (dir & 0xffff0000) | ((val & 0xffff0000) >> 16),
                         CX18_REG_GPIO_OUT2);
 }
 
@@ -141,15 +142,17 @@ void cx18_gpio_init(struct cx18 *cx)
         }
 
         CX18_DEBUG_INFO("GPIO initial dir: %08x/%08x out: %08x/%08x\n",
-                   read_reg(CX18_REG_GPIO_DIR1), read_reg(CX18_REG_GPIO_DIR2),
-                   read_reg(CX18_REG_GPIO_OUT1), read_reg(CX18_REG_GPIO_OUT2));
+                        cx18_read_reg(cx, CX18_REG_GPIO_DIR1),
+                        cx18_read_reg(cx, CX18_REG_GPIO_DIR2),
+                        cx18_read_reg(cx, CX18_REG_GPIO_OUT1),
+                        cx18_read_reg(cx, CX18_REG_GPIO_OUT2));
 
         gpio_write(cx);
         mutex_unlock(&cx->gpio_lock);
 }
 
 /* Xceive tuner reset function */
-int cx18_reset_tuner_gpio(void *dev, int cmd, int value)
+int cx18_reset_tuner_gpio(void *dev, int component, int cmd, int value)
 {
         struct i2c_algo_bit_data *algo = dev;
         struct cx18_i2c_algo_callback_data *cb_data = algo->data;
diff --git a/drivers/media/video/cx18/cx18-gpio.h b/drivers/media/video/cx18/cx18-gpio.h
index 22cd7ddf8554..beb7424b9944 100644
--- a/drivers/media/video/cx18/cx18-gpio.h
+++ b/drivers/media/video/cx18/cx18-gpio.h
@@ -23,5 +23,5 @@
 void cx18_gpio_init(struct cx18 *cx);
 void cx18_reset_i2c_slaves_gpio(struct cx18 *cx);
 void cx18_reset_ir_gpio(void *data);
-int cx18_reset_tuner_gpio(void *dev, int cmd, int value);
+int cx18_reset_tuner_gpio(void *dev, int component, int cmd, int value);
 int cx18_gpio(struct cx18 *cx, unsigned int command, void *arg);
diff --git a/drivers/media/video/cx18/cx18-i2c.c b/drivers/media/video/cx18/cx18-i2c.c
index 6023ba3bd3a6..aa09e557b195 100644
--- a/drivers/media/video/cx18/cx18-i2c.c
+++ b/drivers/media/video/cx18/cx18-i2c.c
@@ -22,13 +22,12 @@
  */
 
 #include "cx18-driver.h"
+#include "cx18-io.h"
 #include "cx18-cards.h"
 #include "cx18-gpio.h"
 #include "cx18-av-core.h"
 #include "cx18-i2c.h"
 
-#include <media/ir-kbd-i2c.h>
-
 #define CX18_REG_I2C_1_WR   0xf15000
 #define CX18_REG_I2C_1_RD   0xf15008
 #define CX18_REG_I2C_2_WR   0xf25100
@@ -158,12 +157,12 @@ static void cx18_setscl(void *data, int state)
         struct cx18 *cx = ((struct cx18_i2c_algo_callback_data *)data)->cx;
         int bus_index = ((struct cx18_i2c_algo_callback_data *)data)->bus_index;
         u32 addr = bus_index ? CX18_REG_I2C_2_WR : CX18_REG_I2C_1_WR;
-        u32 r = read_reg(addr);
+        u32 r = cx18_read_reg(cx, addr);
 
         if (state)
-                write_reg_sync(r | SETSCL_BIT, addr);
+                cx18_write_reg_sync(cx, r | SETSCL_BIT, addr);
         else
-                write_reg_sync(r & ~SETSCL_BIT, addr);
+                cx18_write_reg_sync(cx, r & ~SETSCL_BIT, addr);
 }
 
 static void cx18_setsda(void *data, int state)
@@ -171,12 +170,12 @@ static void cx18_setsda(void *data, int state)
         struct cx18 *cx = ((struct cx18_i2c_algo_callback_data *)data)->cx;
         int bus_index = ((struct cx18_i2c_algo_callback_data *)data)->bus_index;
         u32 addr = bus_index ? CX18_REG_I2C_2_WR : CX18_REG_I2C_1_WR;
-        u32 r = read_reg(addr);
+        u32 r = cx18_read_reg(cx, addr);
 
         if (state)
-                write_reg_sync(r | SETSDL_BIT, addr);
+                cx18_write_reg_sync(cx, r | SETSDL_BIT, addr);
         else
-                write_reg_sync(r & ~SETSDL_BIT, addr);
+                cx18_write_reg_sync(cx, r & ~SETSDL_BIT, addr);
 }
 
 static int cx18_getscl(void *data)
@@ -185,7 +184,7 @@ static int cx18_getscl(void *data)
         int bus_index = ((struct cx18_i2c_algo_callback_data *)data)->bus_index;
         u32 addr = bus_index ? CX18_REG_I2C_2_RD : CX18_REG_I2C_1_RD;
 
-        return read_reg(addr) & GETSCL_BIT;
+        return cx18_read_reg(cx, addr) & GETSCL_BIT;
 }
 
 static int cx18_getsda(void *data)
@@ -194,7 +193,7 @@ static int cx18_getsda(void *data)
         int bus_index = ((struct cx18_i2c_algo_callback_data *)data)->bus_index;
         u32 addr = bus_index ? CX18_REG_I2C_2_RD : CX18_REG_I2C_1_RD;
 
-        return read_reg(addr) & GETSDL_BIT;
+        return cx18_read_reg(cx, addr) & GETSDL_BIT;
 }
 
 /* template for i2c-bit-algo */
@@ -394,29 +393,33 @@ int init_cx18_i2c(struct cx18 *cx)
                 cx->i2c_adap[i].dev.parent = &cx->dev->dev;
         }
 
-        if (read_reg(CX18_REG_I2C_2_WR) != 0x0003c02f) {
+        if (cx18_read_reg(cx, CX18_REG_I2C_2_WR) != 0x0003c02f) {
                 /* Reset/Unreset I2C hardware block */
-                write_reg(0x10000000, 0xc71004); /* Clock select 220MHz */
-                write_reg_sync(0x10001000, 0xc71024); /* Clock Enable */
+                /* Clock select 220MHz */
+                cx18_write_reg(cx, 0x10000000, 0xc71004);
+                /* Clock Enable */
+                cx18_write_reg_sync(cx, 0x10001000, 0xc71024);
         }
         /* courtesy of Steven Toth <stoth@hauppauge.com> */
-        write_reg_sync(0x00c00000, 0xc7001c);
+        cx18_write_reg_sync(cx, 0x00c00000, 0xc7001c);
         mdelay(10);
-        write_reg_sync(0x00c000c0, 0xc7001c);
+        cx18_write_reg_sync(cx, 0x00c000c0, 0xc7001c);
         mdelay(10);
-        write_reg_sync(0x00c00000, 0xc7001c);
+        cx18_write_reg_sync(cx, 0x00c00000, 0xc7001c);
         mdelay(10);
 
-        write_reg_sync(0x00c00000, 0xc730c8); /* Set to edge-triggered intrs. */
-        write_reg_sync(0x00c00000, 0xc730c4); /* Clear any stale intrs */
+        /* Set to edge-triggered intrs. */
+        cx18_write_reg_sync(cx, 0x00c00000, 0xc730c8);
+        /* Clear any stale intrs */
+        cx18_write_reg_sync(cx, 0x00c00000, 0xc730c4);
 
         /* Hw I2C1 Clock Freq ~100kHz */
-        write_reg_sync(0x00021c0f & ~4, CX18_REG_I2C_1_WR);
+        cx18_write_reg_sync(cx, 0x00021c0f & ~4, CX18_REG_I2C_1_WR);
         cx18_setscl(&cx->i2c_algo_cb_data[0], 1);
         cx18_setsda(&cx->i2c_algo_cb_data[0], 1);
 
         /* Hw I2C2 Clock Freq ~100kHz */
-        write_reg_sync(0x00021c0f & ~4, CX18_REG_I2C_2_WR);
+        cx18_write_reg_sync(cx, 0x00021c0f & ~4, CX18_REG_I2C_2_WR);
         cx18_setscl(&cx->i2c_algo_cb_data[1], 1);
         cx18_setsda(&cx->i2c_algo_cb_data[1], 1);
 
@@ -430,8 +433,10 @@ void exit_cx18_i2c(struct cx18 *cx)
 {
         int i;
         CX18_DEBUG_I2C("i2c exit\n");
-        write_reg(read_reg(CX18_REG_I2C_1_WR) | 4, CX18_REG_I2C_1_WR);
-        write_reg(read_reg(CX18_REG_I2C_2_WR) | 4, CX18_REG_I2C_2_WR);
+        cx18_write_reg(cx, cx18_read_reg(cx, CX18_REG_I2C_1_WR) | 4,
+                                                        CX18_REG_I2C_1_WR);
+        cx18_write_reg(cx, cx18_read_reg(cx, CX18_REG_I2C_2_WR) | 4,
+                                                        CX18_REG_I2C_2_WR);
 
         for (i = 0; i < 2; i++) {
                 i2c_del_adapter(&cx->i2c_adap[i]);
diff --git a/drivers/media/video/cx18/cx18-io.c b/drivers/media/video/cx18/cx18-io.c
new file mode 100644
index 000000000000..700ab9439c16
--- /dev/null
+++ b/drivers/media/video/cx18/cx18-io.c
@@ -0,0 +1,254 @@
+/*
+ *  cx18 driver PCI memory mapped IO access routines
+ *
+ *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
+ *  Copyright (C) 2008  Andy Walls <awalls@radix.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., 59 Temple Place, Suite 330, Boston, MA
+ *  02111-1307  USA
+ */
+
+#include "cx18-driver.h"
+#include "cx18-io.h"
+#include "cx18-irq.h"
+
+void cx18_log_statistics(struct cx18 *cx)
+{
+        int i;
+
+        if (!(cx18_debug & CX18_DBGFLG_INFO))
+                return;
+
+        for (i = 0; i <= CX18_MAX_MMIO_RETRIES; i++)
+                CX18_DEBUG_INFO("retried_write[%d] = %d\n", i,
+                                atomic_read(&cx->mmio_stats.retried_write[i]));
+        for (i = 0; i <= CX18_MAX_MMIO_RETRIES; i++)
+                CX18_DEBUG_INFO("retried_read[%d] = %d\n", i,
+                                atomic_read(&cx->mmio_stats.retried_read[i]));
+        return;
+}
+
+void cx18_raw_writel_retry(struct cx18 *cx, u32 val, void __iomem *addr)
+{
+        int i;
+        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+                cx18_raw_writel_noretry(cx, val, addr);
+                if (val == cx18_raw_readl_noretry(cx, addr))
+                        break;
+        }
+        cx18_log_write_retries(cx, i, addr);
+}
+
+u32 cx18_raw_readl_retry(struct cx18 *cx, const void __iomem *addr)
+{
+        int i;
+        u32 val;
+        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+                val = cx18_raw_readl_noretry(cx, addr);
+                if (val != 0xffffffff) /* PCI bus read error */
+                        break;
+        }
+        cx18_log_read_retries(cx, i, addr);
+        return val;
+}
+
+u16 cx18_raw_readw_retry(struct cx18 *cx, const void __iomem *addr)
+{
+        int i;
+        u16 val;
+        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+                val = cx18_raw_readw_noretry(cx, addr);
+                if (val != 0xffff) /* PCI bus read error */
+                        break;
+        }
+        cx18_log_read_retries(cx, i, addr);
+        return val;
+}
+
+void cx18_writel_retry(struct cx18 *cx, u32 val, void __iomem *addr)
+{
+        int i;
+        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+                cx18_writel_noretry(cx, val, addr);
+                if (val == cx18_readl_noretry(cx, addr))
+                        break;
+        }
+        cx18_log_write_retries(cx, i, addr);
+}
+
+void cx18_writew_retry(struct cx18 *cx, u16 val, void __iomem *addr)
+{
+        int i;
+        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+                cx18_writew_noretry(cx, val, addr);
+                if (val == cx18_readw_noretry(cx, addr))
+                        break;
+        }
+        cx18_log_write_retries(cx, i, addr);
+}
+
+void cx18_writeb_retry(struct cx18 *cx, u8 val, void __iomem *addr)
+{
+        int i;
+        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+                cx18_writeb_noretry(cx, val, addr);
+                if (val == cx18_readb_noretry(cx, addr))
+                        break;
+        }
+        cx18_log_write_retries(cx, i, addr);
+}
+
+u32 cx18_readl_retry(struct cx18 *cx, const void __iomem *addr)
+{
+        int i;
+        u32 val;
+        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+                val = cx18_readl_noretry(cx, addr);
+                if (val != 0xffffffff) /* PCI bus read error */
+                        break;
+        }
+        cx18_log_read_retries(cx, i, addr);
+        return val;
+}
+
+u16 cx18_readw_retry(struct cx18 *cx, const void __iomem *addr)
+{
+        int i;
+        u16 val;
+        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+                val = cx18_readw_noretry(cx, addr);
+                if (val != 0xffff) /* PCI bus read error */
+                        break;
+        }
+        cx18_log_read_retries(cx, i, addr);
+        return val;
+}
+
+u8 cx18_readb_retry(struct cx18 *cx, const void __iomem *addr)
+{
+        int i;
+        u8 val;
+        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+                val = cx18_readb_noretry(cx, addr);
+                if (val != 0xff) /* PCI bus read error */
+                        break;
+        }
+        cx18_log_read_retries(cx, i, addr);
+        return val;
+}
+
+void cx18_memcpy_fromio(struct cx18 *cx, void *to,
+                        const void __iomem *from, unsigned int len)
+{
+        const u8 __iomem *src = from;
+        u8 *dst = to;
+
+        /* Align reads on the CX23418's addresses */
+        if ((len > 0) && ((unsigned long) src & 1)) {
+                *dst = cx18_readb(cx, src);
+                len--;
+                dst++;
+                src++;
+        }
+        if ((len > 1) && ((unsigned long) src & 2)) {
+                *((u16 *)dst) = cx18_raw_readw(cx, src);
+                len -= 2;
+                dst += 2;
+                src += 2;
+        }
+        while (len > 3) {
+                *((u32 *)dst) = cx18_raw_readl(cx, src);
+                len -= 4;
+                dst += 4;
+                src += 4;
+        }
+        if (len > 1) {
+                *((u16 *)dst) = cx18_raw_readw(cx, src);
+                len -= 2;
+                dst += 2;
+                src += 2;
+        }
+        if (len > 0)
+                *dst = cx18_readb(cx, src);
+}
+
+void cx18_memset_io(struct cx18 *cx, void __iomem *addr, int val, size_t count)
+{
+        u8 __iomem *dst = addr;
+        u16 val2 = val | (val << 8);
+        u32 val4 = val2 | (val2 << 16);
+
+        /* Align writes on the CX23418's addresses */
+        if ((count > 0) && ((unsigned long)dst & 1)) {
+                cx18_writeb(cx, (u8) val, dst);
+                count--;
+                dst++;
+        }
+        if ((count > 1) && ((unsigned long)dst & 2)) {
+                cx18_writew(cx, val2, dst);
+                count -= 2;
+                dst += 2;
+        }
+        while (count > 3) {
+                cx18_writel(cx, val4, dst);
+                count -= 4;
+                dst += 4;
+        }
+        if (count > 1) {
+                cx18_writew(cx, val2, dst);
+                count -= 2;
+                dst += 2;
+        }
+        if (count > 0)
+                cx18_writeb(cx, (u8) val, dst);
+}
+
+void cx18_sw1_irq_enable(struct cx18 *cx, u32 val)
+{
+        u32 r;
+        cx18_write_reg(cx, val, SW1_INT_STATUS);
+        r = cx18_read_reg(cx, SW1_INT_ENABLE_PCI);
+        cx18_write_reg(cx, r | val, SW1_INT_ENABLE_PCI);
+}
+
+void cx18_sw1_irq_disable(struct cx18 *cx, u32 val)
+{
+        u32 r;
+        r = cx18_read_reg(cx, SW1_INT_ENABLE_PCI);
+        cx18_write_reg(cx, r & ~val, SW1_INT_ENABLE_PCI);
+}
+
+void cx18_sw2_irq_enable(struct cx18 *cx, u32 val)
+{
+        u32 r;
+        cx18_write_reg(cx, val, SW2_INT_STATUS);
+        r = cx18_read_reg(cx, SW2_INT_ENABLE_PCI);
+        cx18_write_reg(cx, r | val, SW2_INT_ENABLE_PCI);
+}
+
+void cx18_sw2_irq_disable(struct cx18 *cx, u32 val)
+{
+        u32 r;
+        r = cx18_read_reg(cx, SW2_INT_ENABLE_PCI);
+        cx18_write_reg(cx, r & ~val, SW2_INT_ENABLE_PCI);
+}
+
+void cx18_setup_page(struct cx18 *cx, u32 addr)
+{
+        u32 val;
+        val = cx18_read_reg(cx, 0xD000F8);
+        val = (val & ~0x1f00) | ((addr >> 17) & 0x1f00);
+        cx18_write_reg(cx, val, 0xD000F8);
+}
diff --git a/drivers/media/video/cx18/cx18-io.h b/drivers/media/video/cx18/cx18-io.h
new file mode 100644
index 000000000000..197d4fbd9f95
--- /dev/null
+++ b/drivers/media/video/cx18/cx18-io.h
@@ -0,0 +1,378 @@
+/*
+ *  cx18 driver PCI memory mapped IO access routines
+ *
+ *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
+ *  Copyright (C) 2008  Andy Walls <awalls@radix.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., 59 Temple Place, Suite 330, Boston, MA
+ *  02111-1307  USA
+ */
+
+#ifndef CX18_IO_H
+#define CX18_IO_H
+
+#include "cx18-driver.h"
+
+static inline void cx18_io_delay(struct cx18 *cx)
+{
+        if (cx->options.mmio_ndelay)
+                ndelay(cx->options.mmio_ndelay);
+}
+
+/*
+ * Readback and retry of MMIO access for reliability:
+ * The concept was suggested by Steve Toth <stoth@linuxtv.org>.
+ * The implmentation is the fault of Andy Walls <awalls@radix.net>.
+ */
+
+/* Statistics gathering */
+static inline
+void cx18_log_write_retries(struct cx18 *cx, int i, const void *addr)
+{
+        if (i > CX18_MAX_MMIO_RETRIES)
+                i = CX18_MAX_MMIO_RETRIES;
+        atomic_inc(&cx->mmio_stats.retried_write[i]);
+        return;
+}
+
+static inline
+void cx18_log_read_retries(struct cx18 *cx, int i, const void *addr)
+{
+        if (i > CX18_MAX_MMIO_RETRIES)
+                i = CX18_MAX_MMIO_RETRIES;
+        atomic_inc(&cx->mmio_stats.retried_read[i]);
+        return;
+}
+
+void cx18_log_statistics(struct cx18 *cx);
+
+/* Non byteswapping memory mapped IO */
+static inline
+void cx18_raw_writel_noretry(struct cx18 *cx, u32 val, void __iomem *addr)
+{
+        __raw_writel(val, addr);
+        cx18_io_delay(cx);
+}
+
+void cx18_raw_writel_retry(struct cx18 *cx, u32 val, void __iomem *addr);
+
+static inline void cx18_raw_writel(struct cx18 *cx, u32 val, void __iomem *addr)
+{
+        if (cx18_retry_mmio)
+                cx18_raw_writel_retry(cx, val, addr);
+        else
+                cx18_raw_writel_noretry(cx, val, addr);
+}
+
+
+static inline
+u32 cx18_raw_readl_noretry(struct cx18 *cx, const void __iomem *addr)
+{
+        u32 ret = __raw_readl(addr);
+        cx18_io_delay(cx);
+        return ret;
+}
+
+u32 cx18_raw_readl_retry(struct cx18 *cx, const void __iomem *addr);
+
+static inline u32 cx18_raw_readl(struct cx18 *cx, const void __iomem *addr)
+{
+        if (cx18_retry_mmio)
+                return cx18_raw_readl_retry(cx, addr);
+
+        return cx18_raw_readl_noretry(cx, addr);
+}
+
+
+static inline
+u16 cx18_raw_readw_noretry(struct cx18 *cx, const void __iomem *addr)
+{
+        u16 ret = __raw_readw(addr);
+        cx18_io_delay(cx);
+        return ret;
+}
+
+u16 cx18_raw_readw_retry(struct cx18 *cx, const void __iomem *addr);
+
+static inline u16 cx18_raw_readw(struct cx18 *cx, const void __iomem *addr)
+{
+        if (cx18_retry_mmio)
+                return cx18_raw_readw_retry(cx, addr);
+
+        return cx18_raw_readw_noretry(cx, addr);
+}
+
+
+/* Normal memory mapped IO */
+static inline
+void cx18_writel_noretry(struct cx18 *cx, u32 val, void __iomem *addr)
+{
+        writel(val, addr);
+        cx18_io_delay(cx);
+}
+
+void cx18_writel_retry(struct cx18 *cx, u32 val, void __iomem *addr);
+
+static inline void cx18_writel(struct cx18 *cx, u32 val, void __iomem *addr)
+{
+        if (cx18_retry_mmio)
+                cx18_writel_retry(cx, val, addr);
+        else
+                cx18_writel_noretry(cx, val, addr);
+}
+
+
+static inline
+void cx18_writew_noretry(struct cx18 *cx, u16 val, void __iomem *addr)
+{
+        writew(val, addr);
+        cx18_io_delay(cx);
+}
+
+void cx18_writew_retry(struct cx18 *cx, u16 val, void __iomem *addr);
+
+static inline void cx18_writew(struct cx18 *cx, u16 val, void __iomem *addr)
+{
+        if (cx18_retry_mmio)
+                cx18_writew_retry(cx, val, addr);
+        else
+                cx18_writew_noretry(cx, val, addr);
+}
+
+
+static inline
+void cx18_writeb_noretry(struct cx18 *cx, u8 val, void __iomem *addr)
+{
+        writeb(val, addr);
+        cx18_io_delay(cx);
+}
+
+void cx18_writeb_retry(struct cx18 *cx, u8 val, void __iomem *addr);
+
+static inline void cx18_writeb(struct cx18 *cx, u8 val, void __iomem *addr)
+{
+        if (cx18_retry_mmio)
+                cx18_writeb_retry(cx, val, addr);
+        else
+                cx18_writeb_noretry(cx, val, addr);
+}
+
+
+static inline u32 cx18_readl_noretry(struct cx18 *cx, const void __iomem *addr)
+{
+        u32 ret = readl(addr);
+        cx18_io_delay(cx);
+        return ret;
+}
+
+u32 cx18_readl_retry(struct cx18 *cx, const void __iomem *addr);
+
+static inline u32 cx18_readl(struct cx18 *cx, const void __iomem *addr)
+{
+        if (cx18_retry_mmio)
+                return cx18_readl_retry(cx, addr);
+
+        return cx18_readl_noretry(cx, addr);
+}
+
+
+static inline u16 cx18_readw_noretry(struct cx18 *cx, const void __iomem *addr)
+{
+        u16 ret = readw(addr);
+        cx18_io_delay(cx);
+        return ret;
+}
+
+u16 cx18_readw_retry(struct cx18 *cx, const void __iomem *addr);
+
+static inline u16 cx18_readw(struct cx18 *cx, const void __iomem *addr)
+{
+        if (cx18_retry_mmio)
+                return cx18_readw_retry(cx, addr);
+
+        return cx18_readw_noretry(cx, addr);
+}
+
+
+static inline u8 cx18_readb_noretry(struct cx18 *cx, const void __iomem *addr)
+{
+        u8 ret = readb(addr);
+        cx18_io_delay(cx);
+        return ret;
+}
+
+u8 cx18_readb_retry(struct cx18 *cx, const void __iomem *addr);
+
+static inline u8 cx18_readb(struct cx18 *cx, const void __iomem *addr)
+{
+        if (cx18_retry_mmio)
+                return cx18_readb_retry(cx, addr);
+
+        return cx18_readb_noretry(cx, addr);
+}
+
+
+static inline
+u32 cx18_write_sync_noretry(struct cx18 *cx, u32 val, void __iomem *addr)
+{
+        cx18_writel_noretry(cx, val, addr);
+        return cx18_readl_noretry(cx, addr);
+}
+
+static inline
+u32 cx18_write_sync_retry(struct cx18 *cx, u32 val, void __iomem *addr)
+{
+        cx18_writel_retry(cx, val, addr);
+        return cx18_readl_retry(cx, addr);
+}
+
+static inline u32 cx18_write_sync(struct cx18 *cx, u32 val, void __iomem *addr)
+{
+        if (cx18_retry_mmio)
+                return cx18_write_sync_retry(cx, val, addr);
+
+        return cx18_write_sync_noretry(cx, val, addr);
+}
+
+
+void cx18_memcpy_fromio(struct cx18 *cx, void *to,
+                        const void __iomem *from, unsigned int len);
+void cx18_memset_io(struct cx18 *cx, void __iomem *addr, int val, size_t count);
+
+
+/* Access "register" region of CX23418 memory mapped I/O */
+static inline void cx18_write_reg_noretry(struct cx18 *cx, u32 val, u32 reg)
+{
+        cx18_writel_noretry(cx, val, cx->reg_mem + reg);
+}
+
+static inline void cx18_write_reg_retry(struct cx18 *cx, u32 val, u32 reg)
+{
+        cx18_writel_retry(cx, val, cx->reg_mem + reg);
+}
+
+static inline void cx18_write_reg(struct cx18 *cx, u32 val, u32 reg)
+{
+        if (cx18_retry_mmio)
+                cx18_write_reg_retry(cx, val, reg);
+        else
+                cx18_write_reg_noretry(cx, val, reg);
+}
+
+
+static inline u32 cx18_read_reg_noretry(struct cx18 *cx, u32 reg)
+{
+        return cx18_readl_noretry(cx, cx->reg_mem + reg);
+}
+
+static inline u32 cx18_read_reg_retry(struct cx18 *cx, u32 reg)
+{
+        return cx18_readl_retry(cx, cx->reg_mem + reg);
+}
+
+static inline u32 cx18_read_reg(struct cx18 *cx, u32 reg)
+{
+        if (cx18_retry_mmio)
+                return cx18_read_reg_retry(cx, reg);
+
+        return cx18_read_reg_noretry(cx, reg);
+}
+
+
+static inline u32 cx18_write_reg_sync_noretry(struct cx18 *cx, u32 val, u32 reg)
+{
+        return cx18_write_sync_noretry(cx, val, cx->reg_mem + reg);
+}
+
+static inline u32 cx18_write_reg_sync_retry(struct cx18 *cx, u32 val, u32 reg)
+{
+        return cx18_write_sync_retry(cx, val, cx->reg_mem + reg);
+}
+
+static inline u32 cx18_write_reg_sync(struct cx18 *cx, u32 val, u32 reg)
+{
+        if (cx18_retry_mmio)
+                return cx18_write_reg_sync_retry(cx, val, reg);
+
+        return cx18_write_reg_sync_noretry(cx, val, reg);
+}
+
+
+/* Access "encoder memory" region of CX23418 memory mapped I/O */
+static inline void cx18_write_enc_noretry(struct cx18 *cx, u32 val, u32 addr)
+{
+        cx18_writel_noretry(cx, val, cx->enc_mem + addr);
+}
+
+static inline void cx18_write_enc_retry(struct cx18 *cx, u32 val, u32 addr)
+{
+        cx18_writel_retry(cx, val, cx->enc_mem + addr);
+}
+
+static inline void cx18_write_enc(struct cx18 *cx, u32 val, u32 addr)
+{
+        if (cx18_retry_mmio)
+                cx18_write_enc_retry(cx, val, addr);
+        else
+                cx18_write_enc_noretry(cx, val, addr);
+}
+
+
+static inline u32 cx18_read_enc_noretry(struct cx18 *cx, u32 addr)
+{
+        return cx18_readl_noretry(cx, cx->enc_mem + addr);
+}
+
+static inline u32 cx18_read_enc_retry(struct cx18 *cx, u32 addr)
+{
+        return cx18_readl_retry(cx, cx->enc_mem + addr);
+}
+
+static inline u32 cx18_read_enc(struct cx18 *cx, u32 addr)
+{
+        if (cx18_retry_mmio)
+                return cx18_read_enc_retry(cx, addr);
+
+        return cx18_read_enc_noretry(cx, addr);
+}
+
+static inline
+u32 cx18_write_enc_sync_noretry(struct cx18 *cx, u32 val, u32 addr)
+{
+        return cx18_write_sync_noretry(cx, val, cx->enc_mem + addr);
+}
+
+static inline
+u32 cx18_write_enc_sync_retry(struct cx18 *cx, u32 val, u32 addr)
+{
+        return cx18_write_sync_retry(cx, val, cx->enc_mem + addr);
+}
+
+static inline
+u32 cx18_write_enc_sync(struct cx18 *cx, u32 val, u32 addr)
+{
+        if (cx18_retry_mmio)
+                return cx18_write_enc_sync_retry(cx, val, addr);
+
+        return cx18_write_enc_sync_noretry(cx, val, addr);
+}
+
+void cx18_sw1_irq_enable(struct cx18 *cx, u32 val);
+void cx18_sw1_irq_disable(struct cx18 *cx, u32 val);
+void cx18_sw2_irq_enable(struct cx18 *cx, u32 val);
+void cx18_sw2_irq_disable(struct cx18 *cx, u32 val);
+void cx18_setup_page(struct cx18 *cx, u32 addr);
+
+#endif /* CX18_IO_H */
diff --git a/drivers/media/video/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c
index a7f839631d6a..f0ca50f5fdde 100644
--- a/drivers/media/video/cx18/cx18-ioctl.c
+++ b/drivers/media/video/cx18/cx18-ioctl.c
@@ -22,6 +22,7 @@
  */
 
 #include "cx18-driver.h"
+#include "cx18-io.h"
 #include "cx18-version.h"
 #include "cx18-mailbox.h"
 #include "cx18-i2c.h"
@@ -170,7 +171,6 @@ static int cx18_try_fmt_vid_cap(struct file *file, void *fh,
 {
         struct cx18_open_id *id = fh;
         struct cx18 *cx = id->cx;
-
         int w = fmt->fmt.pix.width;
         int h = fmt->fmt.pix.height;
 
@@ -202,8 +202,7 @@ static int cx18_s_fmt_vid_cap(struct file *file, void *fh,
         struct cx18_open_id *id = fh;
         struct cx18 *cx = id->cx;
         int ret;
-        int w = fmt->fmt.pix.width;
-        int h = fmt->fmt.pix.height;
+        int w, h;
 
         ret = v4l2_prio_check(&cx->prio, &id->prio);
         if (ret)
@@ -212,6 +211,8 @@ static int cx18_s_fmt_vid_cap(struct file *file, void *fh,
         ret = cx18_try_fmt_vid_cap(file, fh, fmt);
         if (ret)
                 return ret;
+        w = fmt->fmt.pix.width;
+        h = fmt->fmt.pix.height;
 
         if (cx->params.width == w && cx->params.height == h)
                 return 0;
@@ -286,9 +287,9 @@ static int cx18_cxc(struct cx18 *cx, unsigned int cmd, void *arg)
 
         spin_lock_irqsave(&cx18_cards_lock, flags);
         if (cmd == VIDIOC_DBG_G_REGISTER)
-                regs->val = read_enc(regs->reg);
+                regs->val = cx18_read_enc(cx, regs->reg);
         else
-                write_enc(regs->val, regs->reg);
+                cx18_write_enc(cx, regs->val, regs->reg);
         spin_unlock_irqrestore(&cx18_cards_lock, flags);
         return 0;
 }
@@ -345,7 +346,7 @@ static int cx18_querycap(struct file *file, void *fh,
 
         strlcpy(vcap->driver, CX18_DRIVER_NAME, sizeof(vcap->driver));
         strlcpy(vcap->card, cx->card_name, sizeof(vcap->card));
-        strlcpy(vcap->bus_info, pci_name(cx->dev), sizeof(vcap->bus_info));
+        snprintf(vcap->bus_info, sizeof(vcap->bus_info), "PCI:%s", pci_name(cx->dev));
         vcap->version = CX18_DRIVER_VERSION;        /* version */
         vcap->capabilities = cx->v4l2_cap;          /* capabilities */
         return 0;
@@ -622,6 +623,7 @@ static int cx18_encoder_cmd(struct file *file, void *fh,
 {
         struct cx18_open_id *id = fh;
         struct cx18 *cx = id->cx;
+        u32 h;
 
         switch (enc->cmd) {
         case V4L2_ENC_CMD_START:
@@ -643,8 +645,14 @@ static int cx18_encoder_cmd(struct file *file, void *fh,
                         return -EPERM;
                 if (test_and_set_bit(CX18_F_I_ENC_PAUSED, &cx->i_flags))
                         return 0;
+                h = cx18_find_handle(cx);
+                if (h == CX18_INVALID_TASK_HANDLE) {
+                        CX18_ERR("Can't find valid task handle for "
+                                 "V4L2_ENC_CMD_PAUSE\n");
+                        return -EBADFD;
+                }
                 cx18_mute(cx);
-                cx18_vapi(cx, CX18_CPU_CAPTURE_PAUSE, 1, cx18_find_handle(cx));
+                cx18_vapi(cx, CX18_CPU_CAPTURE_PAUSE, 1, h);
                 break;
 
         case V4L2_ENC_CMD_RESUME:
@@ -654,7 +662,13 @@ static int cx18_encoder_cmd(struct file *file, void *fh,
                         return -EPERM;
                 if (!test_and_clear_bit(CX18_F_I_ENC_PAUSED, &cx->i_flags))
                         return 0;
-                cx18_vapi(cx, CX18_CPU_CAPTURE_RESUME, 1, cx18_find_handle(cx));
+                h = cx18_find_handle(cx);
+                if (h == CX18_INVALID_TASK_HANDLE) {
+                        CX18_ERR("Can't find valid task handle for "
+                                 "V4L2_ENC_CMD_RESUME\n");
+                        return -EBADFD;
+                }
+                cx18_vapi(cx, CX18_CPU_CAPTURE_RESUME, 1, h);
                 cx18_unmute(cx);
                 break;
 
@@ -731,12 +745,14 @@ static int cx18_log_status(struct file *file, void *fh)
                         continue;
                 CX18_INFO("Stream %s: status 0x%04lx, %d%% of %d KiB (%d buffers) in use\n",
                           s->name, s->s_flags,
-                          (s->buffers - s->q_free.buffers) * 100 / s->buffers,
+                          (s->buffers - atomic_read(&s->q_free.buffers))
+                                * 100 / s->buffers,
                           (s->buffers * s->buf_size) / 1024, s->buffers);
         }
         CX18_INFO("Read MPEG/VBI: %lld/%lld bytes\n",
                         (long long)cx->mpg_data_received,
                         (long long)cx->vbi_data_inserted);
+        cx18_log_statistics(cx);
         CX18_INFO("==================  END STATUS CARD #%d  ==================\n", cx->num);
         return 0;
 }
diff --git a/drivers/media/video/cx18/cx18-irq.c b/drivers/media/video/cx18/cx18-irq.c
index ab218315c84b..360330f5463f 100644
--- a/drivers/media/video/cx18/cx18-irq.c
+++ b/drivers/media/video/cx18/cx18-irq.c
@@ -20,6 +20,7 @@
  */
 
 #include "cx18-driver.h"
+#include "cx18-io.h"
 #include "cx18-firmware.h"
 #include "cx18-fileops.h"
 #include "cx18-queue.h"
@@ -48,8 +49,8 @@ static void epu_dma_done(struct cx18 *cx, struct cx18_mailbox *mb)
                         break;
         }
         if (i == CX18_MAX_STREAMS) {
-                CX18_WARN("DMA done for unknown handle %d for stream %s\n",
-                        handle, s->name);
+                CX18_WARN("Got DMA done notification for unknown/inactive"
+                          " handle %d\n", handle);
                 mb->error = CXERR_NOT_OPEN;
                 mb->cmd = 0;
                 cx18_mb_ack(cx, mb);
@@ -60,8 +61,8 @@ static void epu_dma_done(struct cx18 *cx, struct cx18_mailbox *mb)
         if (mb->args[2] != 1)
                 CX18_WARN("Ack struct = %d for %s\n",
                         mb->args[2], s->name);
-        id = read_enc(off);
-        buf = cx18_queue_get_buf_irq(s, id, read_enc(off + 4));
+        id = cx18_read_enc(cx, off);
+        buf = cx18_queue_get_buf_irq(s, id, cx18_read_enc(cx, off + 4));
         CX18_DEBUG_HI_DMA("DMA DONE for %s (buffer %d)\n", s->name, id);
         if (buf) {
                 cx18_buf_sync_for_cpu(s, buf);
@@ -81,7 +82,7 @@ static void epu_dma_done(struct cx18 *cx, struct cx18_mailbox *mb)
                         set_bit(CX18_F_B_NEED_BUF_SWAP, &buf->b_flags);
         } else {
                 CX18_WARN("Could not find buf %d for stream %s\n",
-                                read_enc(off), s->name);
+                                cx18_read_enc(cx, off), s->name);
         }
         mb->error = 0;
         mb->cmd = 0;
@@ -97,8 +98,8 @@ static void epu_debug(struct cx18 *cx, struct cx18_mailbox *mb)
         char *p;
 
         if (mb->args[1]) {
-                setup_page(mb->args[1]);
-                memcpy_fromio(str, cx->enc_mem + mb->args[1], 252);
+                cx18_setup_page(cx, mb->args[1]);
+                cx18_memcpy_fromio(cx, str, cx->enc_mem + mb->args[1], 252);
                 str[252] = 0;
         }
         cx18_mb_ack(cx, mb);
@@ -113,7 +114,7 @@ static void hpu_cmd(struct cx18 *cx, u32 sw1)
         struct cx18_mailbox mb;
 
         if (sw1 & IRQ_CPU_TO_EPU) {
-                memcpy_fromio(&mb, &cx->scb->cpu2epu_mb, sizeof(mb));
+                cx18_memcpy_fromio(cx, &mb, &cx->scb->cpu2epu_mb, sizeof(mb));
                 mb.error = 0;
 
                 switch (mb.cmd) {
@@ -141,16 +142,16 @@ irqreturn_t cx18_irq_handler(int irq, void *dev_id)
 
         spin_lock(&cx->dma_reg_lock);
 
-        hw2_mask = read_reg(HW2_INT_MASK5_PCI);
-        hw2 = read_reg(HW2_INT_CLR_STATUS) & hw2_mask;
-        sw2_mask = read_reg(SW2_INT_ENABLE_PCI) | IRQ_EPU_TO_HPU_ACK;
-        sw2 = read_reg(SW2_INT_STATUS) & sw2_mask;
-        sw1_mask = read_reg(SW1_INT_ENABLE_PCI) | IRQ_EPU_TO_HPU;
-        sw1 = read_reg(SW1_INT_STATUS) & sw1_mask;
+        hw2_mask = cx18_read_reg(cx, HW2_INT_MASK5_PCI);
+        hw2 = cx18_read_reg(cx, HW2_INT_CLR_STATUS) & hw2_mask;
+        sw2_mask = cx18_read_reg(cx, SW2_INT_ENABLE_PCI) | IRQ_EPU_TO_HPU_ACK;
+        sw2 = cx18_read_reg(cx, SW2_INT_STATUS) & sw2_mask;
+        sw1_mask = cx18_read_reg(cx, SW1_INT_ENABLE_PCI) | IRQ_EPU_TO_HPU;
+        sw1 = cx18_read_reg(cx, SW1_INT_STATUS) & sw1_mask;
 
-        write_reg(sw2&sw2_mask, SW2_INT_STATUS);
-        write_reg(sw1&sw1_mask, SW1_INT_STATUS);
-        write_reg(hw2&hw2_mask, HW2_INT_CLR_STATUS);
+        cx18_write_reg(cx, sw2&sw2_mask, SW2_INT_STATUS);
+        cx18_write_reg(cx, sw1&sw1_mask, SW1_INT_STATUS);
+        cx18_write_reg(cx, hw2&hw2_mask, HW2_INT_CLR_STATUS);
 
         if (sw1 || sw2 || hw2)
                 CX18_DEBUG_HI_IRQ("SW1: %x  SW2: %x  HW2: %x\n", sw1, sw2, hw2);
@@ -161,15 +162,15 @@ irqreturn_t cx18_irq_handler(int irq, void *dev_id)
         */
 
         if (sw2) {
-                if (sw2 & (readl(&cx->scb->cpu2hpu_irq_ack) |
-                           readl(&cx->scb->cpu2epu_irq_ack)))
+                if (sw2 & (cx18_readl(cx, &cx->scb->cpu2hpu_irq_ack) |
+                           cx18_readl(cx, &cx->scb->cpu2epu_irq_ack)))
                         wake_up(&cx->mb_cpu_waitq);
-                if (sw2 & (readl(&cx->scb->apu2hpu_irq_ack) |
-                           readl(&cx->scb->apu2epu_irq_ack)))
+                if (sw2 & (cx18_readl(cx, &cx->scb->apu2hpu_irq_ack) |
+                           cx18_readl(cx, &cx->scb->apu2epu_irq_ack)))
                         wake_up(&cx->mb_apu_waitq);
-                if (sw2 & readl(&cx->scb->epu2hpu_irq_ack))
+                if (sw2 & cx18_readl(cx, &cx->scb->epu2hpu_irq_ack))
                         wake_up(&cx->mb_epu_waitq);
-                if (sw2 & readl(&cx->scb->hpu2epu_irq_ack))
+                if (sw2 & cx18_readl(cx, &cx->scb->hpu2epu_irq_ack))
                         wake_up(&cx->mb_hpu_waitq);
         }
 
diff --git a/drivers/media/video/cx18/cx18-mailbox.c b/drivers/media/video/cx18/cx18-mailbox.c
index 93177514e846..9d18dd22de76 100644
--- a/drivers/media/video/cx18/cx18-mailbox.c
+++ b/drivers/media/video/cx18/cx18-mailbox.c
@@ -22,6 +22,7 @@
 #include <stdarg.h>
 
 #include "cx18-driver.h"
+#include "cx18-io.h"
 #include "cx18-scb.h"
 #include "cx18-irq.h"
 #include "cx18-mailbox.h"
@@ -82,6 +83,7 @@ static const struct cx18_api_info api_info[] = {
         API_ENTRY(CPU, CX18_CPU_DE_SET_MDL_ACK,                 0),
         API_ENTRY(CPU, CX18_CPU_DE_SET_MDL,                     API_FAST),
         API_ENTRY(CPU, CX18_APU_RESETAI,                        API_FAST),
+        API_ENTRY(CPU, CX18_CPU_DE_RELEASE_MDL,                 0),
         API_ENTRY(0, 0,                                         0),
 };
 
@@ -105,20 +107,20 @@ static struct cx18_mailbox __iomem *cx18_mb_is_complete(struct cx18 *cx, int rpu
         switch (rpu) {
         case APU:
                 mb = &cx->scb->epu2apu_mb;
-                *state = readl(&cx->scb->apu_state);
-                *irq = readl(&cx->scb->epu2apu_irq);
+                *state = cx18_readl(cx, &cx->scb->apu_state);
+                *irq = cx18_readl(cx, &cx->scb->epu2apu_irq);
                 break;
 
         case CPU:
                 mb = &cx->scb->epu2cpu_mb;
-                *state = readl(&cx->scb->cpu_state);
-                *irq = readl(&cx->scb->epu2cpu_irq);
+                *state = cx18_readl(cx, &cx->scb->cpu_state);
+                *irq = cx18_readl(cx, &cx->scb->epu2cpu_irq);
                 break;
 
         case HPU:
                 mb = &cx->scb->epu2hpu_mb;
-                *state = readl(&cx->scb->hpu_state);
-                *irq = readl(&cx->scb->epu2hpu_irq);
+                *state = cx18_readl(cx, &cx->scb->hpu_state);
+                *irq = cx18_readl(cx, &cx->scb->epu2hpu_irq);
                 break;
         }
 
@@ -126,8 +128,8 @@ static struct cx18_mailbox __iomem *cx18_mb_is_complete(struct cx18 *cx, int rpu
                 return mb;
 
         do {
-                *req = readl(&mb->request);
-                ack = readl(&mb->ack);
+                *req = cx18_readl(cx, &mb->request);
+                ack = cx18_readl(cx, &mb->ack);
                 wait_count++;
         } while (*req != ack && wait_count < 600);
 
@@ -172,9 +174,9 @@ long cx18_mb_ack(struct cx18 *cx, const struct cx18_mailbox *mb)
                 return -EINVAL;
         }
 
-        setup_page(SCB_OFFSET);
-        write_sync(mb->request, &ack_mb->ack);
-        write_reg(ack_irq, SW2_INT_SET);
+        cx18_setup_page(cx, SCB_OFFSET);
+        cx18_write_sync(cx, mb->request, &ack_mb->ack);
+        cx18_write_reg(cx, ack_irq, SW2_INT_SET);
         return 0;
 }
 
@@ -199,7 +201,7 @@ static int cx18_api_call(struct cx18 *cx, u32 cmd, int args, u32 data[])
                 CX18_DEBUG_HI_API("%s\n", info->name);
         else
                 CX18_DEBUG_API("%s\n", info->name);
-        setup_page(SCB_OFFSET);
+        cx18_setup_page(cx, SCB_OFFSET);
         mb = cx18_mb_is_complete(cx, info->rpu, &state, &irq, &req);
 
         if (mb == NULL) {
@@ -208,11 +210,11 @@ static int cx18_api_call(struct cx18 *cx, u32 cmd, int args, u32 data[])
         }
 
         oldreq = req - 1;
-        writel(cmd, &mb->cmd);
+        cx18_writel(cx, cmd, &mb->cmd);
         for (i = 0; i < args; i++)
-                writel(data[i], &mb->args[i]);
-        writel(0, &mb->error);
-        writel(req, &mb->request);
+                cx18_writel(cx, data[i], &mb->args[i]);
+        cx18_writel(cx, 0, &mb->error);
+        cx18_writel(cx, req, &mb->request);
 
         switch (info->rpu) {
         case APU: waitq = &cx->mb_apu_waitq; break;
@@ -223,9 +225,10 @@ static int cx18_api_call(struct cx18 *cx, u32 cmd, int args, u32 data[])
         }
         if (info->flags & API_FAST)
                 timeout /= 2;
-        write_reg(irq, SW1_INT_SET);
+        cx18_write_reg(cx, irq, SW1_INT_SET);
 
-        while (!sig && readl(&mb->ack) != readl(&mb->request) && cnt < 660) {
+        while (!sig && cx18_readl(cx, &mb->ack) != cx18_readl(cx, &mb->request)
+               && cnt < 660) {
                 if (cnt > 200 && !in_atomic())
                         sig = cx18_msleep_timeout(10, 1);
                 cnt++;
@@ -233,13 +236,13 @@ static int cx18_api_call(struct cx18 *cx, u32 cmd, int args, u32 data[])
         if (sig)
                 return -EINTR;
         if (cnt == 660) {
-                writel(oldreq, &mb->request);
+                cx18_writel(cx, oldreq, &mb->request);
                 CX18_ERR("mb %s failed\n", info->name);
                 return -EINVAL;
         }
         for (i = 0; i < MAX_MB_ARGUMENTS; i++)
-                data[i] = readl(&mb->args[i]);
-        err = readl(&mb->error);
+                data[i] = cx18_readl(cx, &mb->args[i]);
+        err = cx18_readl(cx, &mb->error);
         if (!in_atomic() && (info->flags & API_SLOW))
                 cx18_msleep_timeout(300, 0);
         if (err)
diff --git a/drivers/media/video/cx18/cx18-queue.c b/drivers/media/video/cx18/cx18-queue.c
index dbe792ac3001..a33ba04a2686 100644
--- a/drivers/media/video/cx18/cx18-queue.c
+++ b/drivers/media/video/cx18/cx18-queue.c
@@ -37,8 +37,7 @@ void cx18_buf_swap(struct cx18_buffer *buf)
 void cx18_queue_init(struct cx18_queue *q)
 {
         INIT_LIST_HEAD(&q->list);
-        q->buffers = 0;
-        q->length = 0;
+        atomic_set(&q->buffers, 0);
         q->bytesused = 0;
 }
 
@@ -55,8 +54,7 @@ void cx18_enqueue(struct cx18_stream *s, struct cx18_buffer *buf,
         }
         spin_lock_irqsave(&s->qlock, flags);
         list_add_tail(&buf->list, &q->list);
-        q->buffers++;
-        q->length += s->buf_size;
+        atomic_inc(&q->buffers);
         q->bytesused += buf->bytesused - buf->readpos;
         spin_unlock_irqrestore(&s->qlock, flags);
 }
@@ -70,8 +68,7 @@ struct cx18_buffer *cx18_dequeue(struct cx18_stream *s, struct cx18_queue *q)
         if (!list_empty(&q->list)) {
                 buf = list_entry(q->list.next, struct cx18_buffer, list);
                 list_del_init(q->list.next);
-                q->buffers--;
-                q->length -= s->buf_size;
+                atomic_dec(&q->buffers);
                 q->bytesused -= buf->bytesused - buf->readpos;
         }
         spin_unlock_irqrestore(&s->qlock, flags);
@@ -95,10 +92,8 @@ struct cx18_buffer *cx18_queue_get_buf_irq(struct cx18_stream *s, u32 id,
                 /* the transport buffers are handled differently,
                    they are not moved to the full queue */
                 if (s->type != CX18_ENC_STREAM_TYPE_TS) {
-                        s->q_free.buffers--;
-                        s->q_free.length -= s->buf_size;
-                        s->q_full.buffers++;
-                        s->q_full.length += s->buf_size;
+                        atomic_dec(&s->q_free.buffers);
+                        atomic_inc(&s->q_full.buffers);
                         s->q_full.bytesused += buf->bytesused;
                         list_move_tail(&buf->list, &s->q_full.list);
                 }
@@ -124,8 +119,7 @@ static void cx18_queue_flush(struct cx18_stream *s, struct cx18_queue *q)
                 buf = list_entry(q->list.next, struct cx18_buffer, list);
                 list_move_tail(q->list.next, &s->q_free.list);
                 buf->bytesused = buf->readpos = buf->b_flags = 0;
-                s->q_free.buffers++;
-                s->q_free.length += s->buf_size;
+                atomic_inc(&s->q_free.buffers);
         }
         cx18_queue_init(q);
         spin_unlock_irqrestore(&s->qlock, flags);
diff --git a/drivers/media/video/cx18/cx18-scb.c b/drivers/media/video/cx18/cx18-scb.c
index 30bc803e30da..f56d3772aa67 100644
--- a/drivers/media/video/cx18/cx18-scb.c
+++ b/drivers/media/video/cx18/cx18-scb.c
@@ -20,102 +20,103 @@
  */
 
 #include "cx18-driver.h"
+#include "cx18-io.h"
 #include "cx18-scb.h"
 
 void cx18_init_scb(struct cx18 *cx)
 {
-        setup_page(SCB_OFFSET);
-        memset_io(cx->scb, 0, 0x10000);
+        cx18_setup_page(cx, SCB_OFFSET);
+        cx18_memset_io(cx, cx->scb, 0, 0x10000);
 
-        writel(IRQ_APU_TO_CPU,     &cx->scb->apu2cpu_irq);
-        writel(IRQ_CPU_TO_APU_ACK, &cx->scb->cpu2apu_irq_ack);
-        writel(IRQ_HPU_TO_CPU,     &cx->scb->hpu2cpu_irq);
-        writel(IRQ_CPU_TO_HPU_ACK, &cx->scb->cpu2hpu_irq_ack);
-        writel(IRQ_PPU_TO_CPU,     &cx->scb->ppu2cpu_irq);
-        writel(IRQ_CPU_TO_PPU_ACK, &cx->scb->cpu2ppu_irq_ack);
-        writel(IRQ_EPU_TO_CPU,     &cx->scb->epu2cpu_irq);
-        writel(IRQ_CPU_TO_EPU_ACK, &cx->scb->cpu2epu_irq_ack);
+        cx18_writel(cx, IRQ_APU_TO_CPU,     &cx->scb->apu2cpu_irq);
+        cx18_writel(cx, IRQ_CPU_TO_APU_ACK, &cx->scb->cpu2apu_irq_ack);
+        cx18_writel(cx, IRQ_HPU_TO_CPU,     &cx->scb->hpu2cpu_irq);
+        cx18_writel(cx, IRQ_CPU_TO_HPU_ACK, &cx->scb->cpu2hpu_irq_ack);
+        cx18_writel(cx, IRQ_PPU_TO_CPU,     &cx->scb->ppu2cpu_irq);
+        cx18_writel(cx, IRQ_CPU_TO_PPU_ACK, &cx->scb->cpu2ppu_irq_ack);
+        cx18_writel(cx, IRQ_EPU_TO_CPU,     &cx->scb->epu2cpu_irq);
+        cx18_writel(cx, IRQ_CPU_TO_EPU_ACK, &cx->scb->cpu2epu_irq_ack);
 
-        writel(IRQ_CPU_TO_APU,     &cx->scb->cpu2apu_irq);
-        writel(IRQ_APU_TO_CPU_ACK, &cx->scb->apu2cpu_irq_ack);
-        writel(IRQ_HPU_TO_APU,     &cx->scb->hpu2apu_irq);
-        writel(IRQ_APU_TO_HPU_ACK, &cx->scb->apu2hpu_irq_ack);
-        writel(IRQ_PPU_TO_APU,     &cx->scb->ppu2apu_irq);
-        writel(IRQ_APU_TO_PPU_ACK, &cx->scb->apu2ppu_irq_ack);
-        writel(IRQ_EPU_TO_APU,     &cx->scb->epu2apu_irq);
-        writel(IRQ_APU_TO_EPU_ACK, &cx->scb->apu2epu_irq_ack);
+        cx18_writel(cx, IRQ_CPU_TO_APU,     &cx->scb->cpu2apu_irq);
+        cx18_writel(cx, IRQ_APU_TO_CPU_ACK, &cx->scb->apu2cpu_irq_ack);
+        cx18_writel(cx, IRQ_HPU_TO_APU,     &cx->scb->hpu2apu_irq);
+        cx18_writel(cx, IRQ_APU_TO_HPU_ACK, &cx->scb->apu2hpu_irq_ack);
+        cx18_writel(cx, IRQ_PPU_TO_APU,     &cx->scb->ppu2apu_irq);
+        cx18_writel(cx, IRQ_APU_TO_PPU_ACK, &cx->scb->apu2ppu_irq_ack);
+        cx18_writel(cx, IRQ_EPU_TO_APU,     &cx->scb->epu2apu_irq);
+        cx18_writel(cx, IRQ_APU_TO_EPU_ACK, &cx->scb->apu2epu_irq_ack);
 
-        writel(IRQ_CPU_TO_HPU,     &cx->scb->cpu2hpu_irq);
-        writel(IRQ_HPU_TO_CPU_ACK, &cx->scb->hpu2cpu_irq_ack);
-        writel(IRQ_APU_TO_HPU,     &cx->scb->apu2hpu_irq);
-        writel(IRQ_HPU_TO_APU_ACK, &cx->scb->hpu2apu_irq_ack);
-        writel(IRQ_PPU_TO_HPU,     &cx->scb->ppu2hpu_irq);
-        writel(IRQ_HPU_TO_PPU_ACK, &cx->scb->hpu2ppu_irq_ack);
-        writel(IRQ_EPU_TO_HPU,     &cx->scb->epu2hpu_irq);
-        writel(IRQ_HPU_TO_EPU_ACK, &cx->scb->hpu2epu_irq_ack);
+        cx18_writel(cx, IRQ_CPU_TO_HPU,     &cx->scb->cpu2hpu_irq);
+        cx18_writel(cx, IRQ_HPU_TO_CPU_ACK, &cx->scb->hpu2cpu_irq_ack);
+        cx18_writel(cx, IRQ_APU_TO_HPU,     &cx->scb->apu2hpu_irq);
+        cx18_writel(cx, IRQ_HPU_TO_APU_ACK, &cx->scb->hpu2apu_irq_ack);
+        cx18_writel(cx, IRQ_PPU_TO_HPU,     &cx->scb->ppu2hpu_irq);
+        cx18_writel(cx, IRQ_HPU_TO_PPU_ACK, &cx->scb->hpu2ppu_irq_ack);
+        cx18_writel(cx, IRQ_EPU_TO_HPU,     &cx->scb->epu2hpu_irq);
+        cx18_writel(cx, IRQ_HPU_TO_EPU_ACK, &cx->scb->hpu2epu_irq_ack);
 
-        writel(IRQ_CPU_TO_PPU,     &cx->scb->cpu2ppu_irq);
-        writel(IRQ_PPU_TO_CPU_ACK, &cx->scb->ppu2cpu_irq_ack);
-        writel(IRQ_APU_TO_PPU,     &cx->scb->apu2ppu_irq);
-        writel(IRQ_PPU_TO_APU_ACK, &cx->scb->ppu2apu_irq_ack);
-        writel(IRQ_HPU_TO_PPU,     &cx->scb->hpu2ppu_irq);
-        writel(IRQ_PPU_TO_HPU_ACK, &cx->scb->ppu2hpu_irq_ack);
-        writel(IRQ_EPU_TO_PPU,     &cx->scb->epu2ppu_irq);
-        writel(IRQ_PPU_TO_EPU_ACK, &cx->scb->ppu2epu_irq_ack);
+        cx18_writel(cx, IRQ_CPU_TO_PPU,     &cx->scb->cpu2ppu_irq);
+        cx18_writel(cx, IRQ_PPU_TO_CPU_ACK, &cx->scb->ppu2cpu_irq_ack);
+        cx18_writel(cx, IRQ_APU_TO_PPU,     &cx->scb->apu2ppu_irq);
+        cx18_writel(cx, IRQ_PPU_TO_APU_ACK, &cx->scb->ppu2apu_irq_ack);
+        cx18_writel(cx, IRQ_HPU_TO_PPU,     &cx->scb->hpu2ppu_irq);
+        cx18_writel(cx, IRQ_PPU_TO_HPU_ACK, &cx->scb->ppu2hpu_irq_ack);
+        cx18_writel(cx, IRQ_EPU_TO_PPU,     &cx->scb->epu2ppu_irq);
+        cx18_writel(cx, IRQ_PPU_TO_EPU_ACK, &cx->scb->ppu2epu_irq_ack);
 
-        writel(IRQ_CPU_TO_EPU,     &cx->scb->cpu2epu_irq);
-        writel(IRQ_EPU_TO_CPU_ACK, &cx->scb->epu2cpu_irq_ack);
-        writel(IRQ_APU_TO_EPU,     &cx->scb->apu2epu_irq);
-        writel(IRQ_EPU_TO_APU_ACK, &cx->scb->epu2apu_irq_ack);
-        writel(IRQ_HPU_TO_EPU,     &cx->scb->hpu2epu_irq);
-        writel(IRQ_EPU_TO_HPU_ACK, &cx->scb->epu2hpu_irq_ack);
-        writel(IRQ_PPU_TO_EPU,     &cx->scb->ppu2epu_irq);
-        writel(IRQ_EPU_TO_PPU_ACK, &cx->scb->epu2ppu_irq_ack);
+        cx18_writel(cx, IRQ_CPU_TO_EPU,     &cx->scb->cpu2epu_irq);
+        cx18_writel(cx, IRQ_EPU_TO_CPU_ACK, &cx->scb->epu2cpu_irq_ack);
+        cx18_writel(cx, IRQ_APU_TO_EPU,     &cx->scb->apu2epu_irq);
+        cx18_writel(cx, IRQ_EPU_TO_APU_ACK, &cx->scb->epu2apu_irq_ack);
+        cx18_writel(cx, IRQ_HPU_TO_EPU,     &cx->scb->hpu2epu_irq);
+        cx18_writel(cx, IRQ_EPU_TO_HPU_ACK, &cx->scb->epu2hpu_irq_ack);
+        cx18_writel(cx, IRQ_PPU_TO_EPU,     &cx->scb->ppu2epu_irq);
+        cx18_writel(cx, IRQ_EPU_TO_PPU_ACK, &cx->scb->epu2ppu_irq_ack);
 
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, apu2cpu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, apu2cpu_mb),
                         &cx->scb->apu2cpu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, hpu2cpu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, hpu2cpu_mb),
                         &cx->scb->hpu2cpu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, ppu2cpu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, ppu2cpu_mb),
                         &cx->scb->ppu2cpu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, epu2cpu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, epu2cpu_mb),
                         &cx->scb->epu2cpu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, cpu2apu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, cpu2apu_mb),
                         &cx->scb->cpu2apu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, hpu2apu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, hpu2apu_mb),
                         &cx->scb->hpu2apu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, ppu2apu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, ppu2apu_mb),
                         &cx->scb->ppu2apu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, epu2apu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, epu2apu_mb),
                         &cx->scb->epu2apu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, cpu2hpu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, cpu2hpu_mb),
                         &cx->scb->cpu2hpu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, apu2hpu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, apu2hpu_mb),
                         &cx->scb->apu2hpu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, ppu2hpu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, ppu2hpu_mb),
                         &cx->scb->ppu2hpu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, epu2hpu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, epu2hpu_mb),
                         &cx->scb->epu2hpu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, cpu2ppu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, cpu2ppu_mb),
                         &cx->scb->cpu2ppu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, apu2ppu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, apu2ppu_mb),
                         &cx->scb->apu2ppu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, hpu2ppu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, hpu2ppu_mb),
                         &cx->scb->hpu2ppu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, epu2ppu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, epu2ppu_mb),
                         &cx->scb->epu2ppu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, cpu2epu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, cpu2epu_mb),
                         &cx->scb->cpu2epu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, apu2epu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, apu2epu_mb),
                         &cx->scb->apu2epu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, hpu2epu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, hpu2epu_mb),
                         &cx->scb->hpu2epu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, ppu2epu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, ppu2epu_mb),
                         &cx->scb->ppu2epu_mb_offset);
 
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, cpu_state),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, cpu_state),
                         &cx->scb->ipc_offset);
 
-        writel(1, &cx->scb->hpu_state);
-        writel(1, &cx->scb->epu_state);
+        cx18_writel(cx, 1, &cx->scb->hpu_state);
+        cx18_writel(cx, 1, &cx->scb->epu_state);
 }
diff --git a/drivers/media/video/cx18/cx18-streams.c b/drivers/media/video/cx18/cx18-streams.c
index 0da57f583bf7..0c8e7542cf60 100644
--- a/drivers/media/video/cx18/cx18-streams.c
+++ b/drivers/media/video/cx18/cx18-streams.c
@@ -22,6 +22,7 @@
  */
 
 #include "cx18-driver.h"
+#include "cx18-io.h"
 #include "cx18-fileops.h"
 #include "cx18-mailbox.h"
 #include "cx18-i2c.h"
@@ -56,7 +57,7 @@ static struct file_operations cx18_v4l2_enc_fops = {
 static struct {
         const char *name;
         int vfl_type;
-        int minor_offset;
+        int num_offset;
         int dma;
         enum v4l2_buf_type buf_type;
         struct file_operations *fops;
@@ -119,7 +120,7 @@ static void cx18_stream_init(struct cx18 *cx, int type)
         s->cx = cx;
         s->type = type;
         s->name = cx18_stream_info[type].name;
-        s->handle = 0xffffffff;
+        s->handle = CX18_INVALID_TASK_HANDLE;
 
         s->dma = cx18_stream_info[type].dma;
         s->buf_size = cx->stream_buf_size[type];
@@ -143,8 +144,8 @@ static int cx18_prep_dev(struct cx18 *cx, int type)
 {
         struct cx18_stream *s = &cx->streams[type];
         u32 cap = cx->v4l2_cap;
-        int minor_offset = cx18_stream_info[type].minor_offset;
-        int minor;
+        int num_offset = cx18_stream_info[type].num_offset;
+        int num = cx->num + cx18_first_minor + num_offset;
 
         /* These four fields are always initialized. If v4l2dev == NULL, then
            this stream is not in use. In that case no other fields but these
@@ -163,9 +164,6 @@ static int cx18_prep_dev(struct cx18 *cx, int type)
             !(cap & (V4L2_CAP_VBI_CAPTURE | V4L2_CAP_SLICED_VBI_CAPTURE)))
                 return 0;
 
-        /* card number + user defined offset + device offset */
-        minor = cx->num + cx18_first_minor + minor_offset;
-
         /* User explicitly selected 0 buffers for these streams, so don't
            create them. */
         if (cx18_stream_info[type].dma != PCI_DMA_NONE &&
@@ -176,7 +174,7 @@ static int cx18_prep_dev(struct cx18 *cx, int type)
 
         cx18_stream_init(cx, type);
 
-        if (minor_offset == -1)
+        if (num_offset == -1)
                 return 0;
 
         /* allocate and initialize the v4l2 video device structure */
@@ -190,7 +188,7 @@ static int cx18_prep_dev(struct cx18 *cx, int type)
         snprintf(s->v4l2dev->name, sizeof(s->v4l2dev->name), "cx18-%d",
                         cx->num);
 
-        s->v4l2dev->minor = minor;
+        s->v4l2dev->num = num;
         s->v4l2dev->parent = &cx->dev->dev;
         s->v4l2dev->fops = cx18_stream_info[type].fops;
         s->v4l2dev->release = video_device_release;
@@ -226,7 +224,7 @@ static int cx18_reg_dev(struct cx18 *cx, int type)
 {
         struct cx18_stream *s = &cx->streams[type];
         int vfl_type = cx18_stream_info[type].vfl_type;
-        int minor;
+        int num;
 
         /* TODO: Shouldn't this be a VFL_TYPE_TRANSPORT or something?
          * We need a VFL_TYPE_TS defined.
@@ -244,38 +242,44 @@ static int cx18_reg_dev(struct cx18 *cx, int type)
         if (s->v4l2dev == NULL)
                 return 0;
 
-        minor = s->v4l2dev->minor;
+        num = s->v4l2dev->num;
+        /* card number + user defined offset + device offset */
+        if (type != CX18_ENC_STREAM_TYPE_MPG) {
+                struct cx18_stream *s_mpg = &cx->streams[CX18_ENC_STREAM_TYPE_MPG];
+
+                if (s_mpg->v4l2dev)
+                        num = s_mpg->v4l2dev->num + cx18_stream_info[type].num_offset;
+        }
 
         /* Register device. First try the desired minor, then any free one. */
-        if (video_register_device(s->v4l2dev, vfl_type, minor) &&
-                        video_register_device(s->v4l2dev, vfl_type, -1)) {
-                CX18_ERR("Couldn't register v4l2 device for %s minor %d\n",
-                        s->name, minor);
+        if (video_register_device(s->v4l2dev, vfl_type, num)) {
+                CX18_ERR("Couldn't register v4l2 device for %s kernel number %d\n",
+                        s->name, num);
                 video_device_release(s->v4l2dev);
                 s->v4l2dev = NULL;
                 return -ENOMEM;
         }
-        minor = s->v4l2dev->minor;
+        num = s->v4l2dev->num;
 
         switch (vfl_type) {
         case VFL_TYPE_GRABBER:
                 CX18_INFO("Registered device video%d for %s (%d MB)\n",
-                        minor, s->name, cx->options.megabytes[type]);
+                        num, s->name, cx->options.megabytes[type]);
                 break;
 
         case VFL_TYPE_RADIO:
                 CX18_INFO("Registered device radio%d for %s\n",
-                        minor - MINOR_VFL_TYPE_RADIO_MIN, s->name);
+                        num, s->name);
                 break;
 
         case VFL_TYPE_VBI:
                 if (cx->options.megabytes[type])
                         CX18_INFO("Registered device vbi%d for %s (%d MB)\n",
-                                minor - MINOR_VFL_TYPE_VBI_MIN,
+                                num,
                                 s->name, cx->options.megabytes[type]);
                 else
                         CX18_INFO("Registered device vbi%d for %s\n",
-                                minor - MINOR_VFL_TYPE_VBI_MIN, s->name);
+                                num, s->name);
                 break;
         }
 
@@ -432,7 +436,6 @@ int cx18_start_v4l2_encode_stream(struct cx18_stream *s)
         default:
                 return -EINVAL;
         }
-        s->buffers_stolen = 0;
 
         /* mute/unmute video */
         cx18_vapi(cx, CX18_CPU_SET_VIDEO_MUTE, 2,
@@ -470,7 +473,7 @@ int cx18_start_v4l2_encode_stream(struct cx18_stream *s)
 
         if (atomic_read(&cx->tot_capturing) == 0) {
                 clear_bit(CX18_F_I_EOS, &cx->i_flags);
-                write_reg(7, CX18_DSP0_INTERRUPT_MASK);
+                cx18_write_reg(cx, 7, CX18_DSP0_INTERRUPT_MASK);
         }
 
         cx18_vapi(cx, CX18_CPU_DE_SET_MDL_ACK, 3, s->handle,
@@ -480,8 +483,9 @@ int cx18_start_v4l2_encode_stream(struct cx18_stream *s)
         list_for_each(p, &s->q_free.list) {
                 struct cx18_buffer *buf = list_entry(p, struct cx18_buffer, list);
 
-                writel(buf->dma_handle, &cx->scb->cpu_mdl[buf->id].paddr);
-                writel(s->buf_size, &cx->scb->cpu_mdl[buf->id].length);
+                cx18_writel(cx, buf->dma_handle,
+                                        &cx->scb->cpu_mdl[buf->id].paddr);
+                cx18_writel(cx, s->buf_size, &cx->scb->cpu_mdl[buf->id].length);
                 cx18_vapi(cx, CX18_CPU_DE_SET_MDL, 5, s->handle,
                         (void __iomem *)&cx->scb->cpu_mdl[buf->id] - cx->enc_mem,
                         1, buf->id, s->buf_size);
@@ -489,7 +493,14 @@ int cx18_start_v4l2_encode_stream(struct cx18_stream *s)
         /* begin_capture */
         if (cx18_vapi(cx, CX18_CPU_CAPTURE_START, 1, s->handle)) {
                 CX18_DEBUG_WARN("Error starting capture!\n");
+                /* Ensure we're really not capturing before releasing MDLs */
+                if (s->type == CX18_ENC_STREAM_TYPE_MPG)
+                        cx18_vapi(cx, CX18_CPU_CAPTURE_STOP, 2, s->handle, 1);
+                else
+                        cx18_vapi(cx, CX18_CPU_CAPTURE_STOP, 1, s->handle);
+                cx18_vapi(cx, CX18_CPU_DE_RELEASE_MDL, 1, s->handle);
                 cx18_vapi(cx, CX18_DESTROY_TASK, 1, s->handle);
+                /* FIXME - clean-up DSP0_INT mask, i_flags, s_flags, etc. */
                 return -EINVAL;
         }
 
@@ -541,6 +552,9 @@ int cx18_stop_v4l2_encode_stream(struct cx18_stream *s, int gop_end)
                 CX18_INFO("ignoring gop_end: not (yet?) supported by the firmware\n");
         }
 
+        /* Tell the CX23418 it can't use our buffers anymore */
+        cx18_vapi(cx, CX18_CPU_DE_RELEASE_MDL, 1, s->handle);
+
         if (s->type != CX18_ENC_STREAM_TYPE_TS)
                 atomic_dec(&cx->ana_capturing);
         atomic_dec(&cx->tot_capturing);
@@ -549,12 +563,12 @@ int cx18_stop_v4l2_encode_stream(struct cx18_stream *s, int gop_end)
         clear_bit(CX18_F_S_STREAMING, &s->s_flags);
 
         cx18_vapi(cx, CX18_DESTROY_TASK, 1, s->handle);
-        s->handle = 0xffffffff;
+        s->handle = CX18_INVALID_TASK_HANDLE;
 
         if (atomic_read(&cx->tot_capturing) > 0)
                 return 0;
 
-        write_reg(5, CX18_DSP0_INTERRUPT_MASK);
+        cx18_write_reg(cx, 5, CX18_DSP0_INTERRUPT_MASK);
         wake_up(&s->waitq);
 
         return 0;
@@ -568,8 +582,8 @@ u32 cx18_find_handle(struct cx18 *cx)
         for (i = 0; i < CX18_MAX_STREAMS; i++) {
                 struct cx18_stream *s = &cx->streams[i];
 
-                if (s->v4l2dev && s->handle)
+                if (s->v4l2dev && (s->handle != CX18_INVALID_TASK_HANDLE))
                         return s->handle;
         }
-        return 0;
+        return CX18_INVALID_TASK_HANDLE;
 }
diff --git a/drivers/media/video/cx18/cx18-version.h b/drivers/media/video/cx18/cx18-version.h
index d5c7a6f968dd..9f6be2d457fb 100644
--- a/drivers/media/video/cx18/cx18-version.h
+++ b/drivers/media/video/cx18/cx18-version.h
@@ -25,7 +25,7 @@
 #define CX18_DRIVER_NAME "cx18"
 #define CX18_DRIVER_VERSION_MAJOR 1
 #define CX18_DRIVER_VERSION_MINOR 0
-#define CX18_DRIVER_VERSION_PATCHLEVEL 0
+#define CX18_DRIVER_VERSION_PATCHLEVEL 1
 
 #define CX18_VERSION __stringify(CX18_DRIVER_VERSION_MAJOR) "." __stringify(CX18_DRIVER_VERSION_MINOR) "." __stringify(CX18_DRIVER_VERSION_PATCHLEVEL)
 #define CX18_DRIVER_VERSION KERNEL_VERSION(CX18_DRIVER_VERSION_MAJOR, \
diff --git a/drivers/media/video/cx18/cx23418.h b/drivers/media/video/cx18/cx23418.h
index e7ed053059a8..668f968d7761 100644
--- a/drivers/media/video/cx18/cx23418.h
+++ b/drivers/media/video/cx18/cx23418.h
@@ -351,7 +351,7 @@
    Descriptor Lists to the driver
    IN[0] - Task handle. Handle of the task to start
    ReturnCode - One of the ERR_DE_... */
-/* #define CX18_CPU_DE_ReleaseMDL               (CPU_CMD_MASK_DE | 0x0006) */
+#define CX18_CPU_DE_RELEASE_MDL                 (CPU_CMD_MASK_DE | 0x0006)
 
 /* Description: This command signals the cpu that the dat buffer has been
    consumed and ready for re-use.
diff --git a/drivers/media/video/cx2341x.c b/drivers/media/video/cx2341x.c
index 22847a0444f5..cbbe47fb87b7 100644
--- a/drivers/media/video/cx2341x.c
+++ b/drivers/media/video/cx2341x.c
@@ -508,7 +508,10 @@ int cx2341x_ctrl_query(const struct cx2341x_mpeg_params *params,
                 /* this setting is read-only for the cx2341x since the
                    V4L2_CID_MPEG_STREAM_TYPE really determines the
                    MPEG-1/2 setting */
-                err = v4l2_ctrl_query_fill_std(qctrl);
+                err = v4l2_ctrl_query_fill(qctrl,
+                                           V4L2_MPEG_VIDEO_ENCODING_MPEG_1,
+                                           V4L2_MPEG_VIDEO_ENCODING_MPEG_2, 1,
+                                           V4L2_MPEG_VIDEO_ENCODING_MPEG_2);
                 if (err == 0)
                         qctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;
                 return err;
diff --git a/drivers/media/video/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig
index e60bd31b51a3..8c1b7fa47a41 100644
--- a/drivers/media/video/cx23885/Kconfig
+++ b/drivers/media/video/cx23885/Kconfig
@@ -15,6 +15,7 @@ config VIDEO_CX23885
         select DVB_S5H1409 if !DVB_FE_CUSTOMISE
         select DVB_S5H1411 if !DVB_FE_CUSTOMISE
         select DVB_LGDT330X if !DVB_FE_CUSTOMISE
+        select DVB_ZL10353 if !DVB_FE_CUSTOMISE
         select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMIZE
         select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMIZE
         select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE
diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c
index 7b0e8c01692e..395c11fa47ce 100644
--- a/drivers/media/video/cx23885/cx23885-417.c
+++ b/drivers/media/video/cx23885/cx23885-417.c
@@ -36,7 +36,6 @@
 #include <media/cx2341x.h>
 
 #include "cx23885.h"
-#include "media/cx2341x.h"
 
 #define CX23885_FIRM_IMAGE_SIZE 376836
 #define CX23885_FIRM_IMAGE_NAME "v4l-cx23885-enc.fw"
@@ -632,7 +631,7 @@ int mc417_memory_read(struct cx23885_dev *dev, u32 address, u32 *value)
 /* ------------------------------------------------------------------ */
 
 /* MPEG encoder API */
-char *cmd_to_str(int cmd)
+static char *cmd_to_str(int cmd)
 {
         switch (cmd) {
         case CX2341X_ENC_PING_FW:
@@ -1583,6 +1582,7 @@ static int mpeg_open(struct inode *inode, struct file *file)
 
         dprintk(2, "%s()\n", __func__);
 
+        lock_kernel();
         list_for_each(list, &cx23885_devlist) {
                 h = list_entry(list, struct cx23885_dev, devlist);
                 if (h->v4l_device->minor == minor) {
@@ -1591,13 +1591,17 @@ static int mpeg_open(struct inode *inode, struct file *file)
                 }
         }
 
-        if (dev == NULL)
+        if (dev == NULL) {
+                unlock_kernel();
                 return -ENODEV;
+        }
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh), GFP_KERNEL);
-        if (NULL == fh)
+        if (NULL == fh) {
+                unlock_kernel();
                 return -ENOMEM;
+        }
 
         file->private_data = fh;
         fh->dev      = dev;
@@ -1608,6 +1612,7 @@ static int mpeg_open(struct inode *inode, struct file *file)
                             V4L2_FIELD_INTERLACED,
                             sizeof(struct cx23885_buffer),
                             fh);
+        unlock_kernel();
 
         return 0;
 }
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index c36d3f632104..2cda15f829fd 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -26,6 +26,7 @@
 #include <media/cx25840.h>
 
 #include "cx23885.h"
+#include "tuner-xc2028.h"
 
 /* ------------------------------------------------------------------ */
 /* board config info                                                  */
@@ -148,6 +149,15 @@ struct cx23885_board cx23885_boards[] = {
                 .portb          = CX23885_MPEG_DVB,
                 .portc          = CX23885_MPEG_DVB,
         },
+        [CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP] = {
+                .name           = "DViCO FusionHDTV DVB-T Dual Express",
+                .portb          = CX23885_MPEG_DVB,
+                .portc          = CX23885_MPEG_DVB,
+        },
+        [CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H] = {
+                .name           = "Leadtek Winfast PxDVR3200 H",
+                .portc          = CX23885_MPEG_DVB,
+        },
 };
 const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
 
@@ -219,6 +229,14 @@ struct cx23885_subid cx23885_subids[] = {
                 .subvendor = 0x18ac,
                 .subdevice = 0xd618,
                 .card      = CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP,
+        },{
+                .subvendor = 0x18ac,
+                .subdevice = 0xdb78,
+                .card      = CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP,
+        }, {
+                .subvendor = 0x107d,
+                .subdevice = 0x6681,
+                .card      = CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H,
         },
 };
 const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -319,15 +337,15 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data)
                         dev->name, tv.model);
 }
 
-/* Tuner callback function for cx23885 boards. Currently only needed
- * for HVR1500Q, which has an xc5000 tuner.
- */
-int cx23885_tuner_callback(void *priv, int command, int arg)
+int cx23885_tuner_callback(void *priv, int component, int command, int arg)
 {
-        struct cx23885_i2c *bus = priv;
-        struct cx23885_dev *dev = bus->dev;
+        struct cx23885_tsport *port = priv;
+        struct cx23885_dev *dev = port->dev;
         u32 bitmask = 0;
 
+        if (command == XC2028_RESET_CLK)
+                return 0;
+
         if (command != 0) {
                 printk(KERN_ERR "%s(): Unknown command 0x%x.\n",
                         __func__, command);
@@ -335,21 +353,21 @@ int cx23885_tuner_callback(void *priv, int command, int arg)
         }
 
         switch(dev->board) {
+        case CX23885_BOARD_HAUPPAUGE_HVR1400:
+        case CX23885_BOARD_HAUPPAUGE_HVR1500:
         case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
-                /* Tuner Reset Command from xc5000 */
-                if (command == 0)
-                        bitmask = 0x04;
+        case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
+                /* Tuner Reset Command */
+                bitmask = 0x04;
                 break;
         case CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP:
-                if (command == 0) {
-
-                        /* Two identical tuners on two different i2c buses,
-                         * we need to reset the correct gpio. */
-                        if (bus->nr == 0)
-                                bitmask = 0x01;
-                        else if (bus->nr == 1)
-                                bitmask = 0x04;
-                }
+        case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:
+                /* Two identical tuners on two different i2c buses,
+                 * we need to reset the correct gpio. */
+                if (port->nr == 0)
+                        bitmask = 0x01;
+                else if (port->nr == 1)
+                        bitmask = 0x04;
                 break;
         }
 
@@ -465,6 +483,32 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                 mdelay(20);
                 cx_set(GP0_IO, 0x000f000f);
                 break;
+        case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:
+                /* GPIO-0 portb xc3028 reset */
+                /* GPIO-1 portb zl10353 reset */
+                /* GPIO-2 portc xc3028 reset */
+                /* GPIO-3 portc zl10353 reset */
+
+                /* Put the parts into reset and back */
+                cx_set(GP0_IO, 0x000f0000);
+                mdelay(20);
+                cx_clear(GP0_IO, 0x0000000f);
+                mdelay(20);
+                cx_set(GP0_IO, 0x000f000f);
+                break;
+        case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
+                /* GPIO-2  xc3028 tuner reset */
+
+                /* The following GPIO's are on the internal AVCore (cx25840) */
+                /* GPIO-?  zl10353 demod reset */
+
+                /* Put the parts into reset and back */
+                cx_set(GP0_IO, 0x00040000);
+                mdelay(20);
+                cx_clear(GP0_IO, 0x00000004);
+                mdelay(20);
+                cx_set(GP0_IO, 0x00040004);
+                break;
         }
 }
 
@@ -479,6 +523,9 @@ int cx23885_ir_init(struct cx23885_dev *dev)
         case CX23885_BOARD_HAUPPAUGE_HVR1400:
                 /* FIXME: Implement me */
                 break;
+        case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:
+                request_module("ir-kbd-i2c");
+                break;
         }
 
         return 0;
@@ -516,6 +563,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
 
         switch (dev->board) {
         case CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP:
+        case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:
                 ts2->gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */
                 ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
                 ts2->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
@@ -548,6 +596,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_HAUPPAUGE_HVR1200:
         case CX23885_BOARD_HAUPPAUGE_HVR1700:
         case CX23885_BOARD_HAUPPAUGE_HVR1400:
+        case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
         default:
                 ts2->gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */
                 ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
@@ -561,6 +610,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_HAUPPAUGE_HVR1800:
         case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
         case CX23885_BOARD_HAUPPAUGE_HVR1700:
+        case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
                 request_module("cx25840");
                 break;
         }
diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index 25fb09938744..beb3e61669a3 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -1442,7 +1442,7 @@ void cx23885_cancel_buffers(struct cx23885_tsport *port)
         struct cx23885_dev *dev = port->dev;
         struct cx23885_dmaqueue *q = &port->mpegq;
 
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
         del_timer_sync(&q->timeout);
         cx23885_stop_dma(port);
         do_cancel_buffers(port, "cancel", 0);
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index 291b9d008da8..24bd18327aa0 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -42,6 +42,7 @@
 #include "tuner-simple.h"
 #include "dib7000p.h"
 #include "dibx000_common.h"
+#include "zl10353.h"
 
 static unsigned int debug;
 
@@ -188,13 +189,11 @@ static struct s5h1411_config dvico_s5h1411_config = {
 static struct xc5000_config hauppauge_hvr1500q_tunerconfig = {
         .i2c_address      = 0x61,
         .if_khz           = 5380,
-        .tuner_callback   = cx23885_tuner_callback
 };
 
 static struct xc5000_config dvico_xc5000_tunerconfig = {
         .i2c_address      = 0x64,
         .if_khz           = 5380,
-        .tuner_callback   = cx23885_tuner_callback
 };
 
 static struct tda829x_config tda829x_no_probe = {
@@ -303,35 +302,11 @@ static struct dib7000p_config hauppauge_hvr1400_dib7000_config = {
         .output_mode = OUTMODE_MPEG2_SERIAL,
 };
 
-static int cx23885_hvr1500_xc3028_callback(void *ptr, int command, int arg)
-{
-        struct cx23885_tsport *port = ptr;
-        struct cx23885_dev *dev = port->dev;
-
-        switch (command) {
-        case XC2028_TUNER_RESET:
-                /* Send the tuner in then out of reset */
-                /* GPIO-2 xc3028 tuner */
-                dprintk(1, "%s: XC2028_TUNER_RESET %d\n", __func__, arg);
-
-                cx_set(GP0_IO, 0x00040000);
-                cx_clear(GP0_IO, 0x00000004);
-                msleep(5);
-
-                cx_set(GP0_IO, 0x00040004);
-                msleep(5);
-                break;
-        case XC2028_RESET_CLK:
-                dprintk(1, "%s: XC2028_RESET_CLK %d\n", __func__, arg);
-                break;
-        default:
-                dprintk(1, "%s: unknown command %d, arg %d\n", __func__,
-                        command, arg);
-                return -EINVAL;
-        }
-
-        return 0;
-}
+static struct zl10353_config dvico_fusionhdtv_xc3028 = {
+        .demod_address = 0x0f,
+        .if2           = 45600,
+        .no_tuner      = 1,
+};
 
 static int dvb_register(struct cx23885_tsport *port)
 {
@@ -413,8 +388,8 @@ static int dvb_register(struct cx23885_tsport *port)
                                                 &dev->i2c_bus[0].i2c_adap);
                 if (port->dvb.frontend != NULL)
                         dvb_attach(xc5000_attach, port->dvb.frontend,
-                                &i2c_bus->i2c_adap,
-                                &hauppauge_hvr1500q_tunerconfig, i2c_bus);
+                                   &i2c_bus->i2c_adap,
+                                   &hauppauge_hvr1500q_tunerconfig);
                 break;
         case CX23885_BOARD_HAUPPAUGE_HVR1500:
                 i2c_bus = &dev->i2c_bus[1];
@@ -426,10 +401,9 @@ static int dvb_register(struct cx23885_tsport *port)
                         struct xc2028_config cfg = {
                                 .i2c_adap  = &i2c_bus->i2c_adap,
                                 .i2c_addr  = 0x61,
-                                .callback  = cx23885_hvr1500_xc3028_callback,
                         };
                         static struct xc2028_ctrl ctl = {
-                                .fname       = "xc3028-v27.fw",
+                                .fname       = XC2028_DEFAULT_FIRMWARE,
                                 .max_len     = 64,
                                 .scode_table = XC3028_FE_OREN538,
                         };
@@ -465,13 +439,13 @@ static int dvb_register(struct cx23885_tsport *port)
                         struct xc2028_config cfg = {
                                 .i2c_adap  = &dev->i2c_bus[1].i2c_adap,
                                 .i2c_addr  = 0x64,
-                                .callback  = cx23885_hvr1500_xc3028_callback,
                         };
                         static struct xc2028_ctrl ctl = {
-                                .fname   = "xc3028L-v36.fw",
+                                .fname   = XC3028L_DEFAULT_FIRMWARE,
                                 .max_len = 64,
                                 .demod   = 5000,
-                                .d2633   = 1
+                                /* This is true for all demods with v36 firmware? */
+                                .type    = XC2028_D2633,
                         };
 
                         fe = dvb_attach(xc2028_attach,
@@ -492,8 +466,57 @@ static int dvb_register(struct cx23885_tsport *port)
                                                         &i2c_bus->i2c_adap);
                 if (port->dvb.frontend != NULL)
                         dvb_attach(xc5000_attach, port->dvb.frontend,
-                                &i2c_bus->i2c_adap,
-                                &dvico_xc5000_tunerconfig, i2c_bus);
+                                   &i2c_bus->i2c_adap,
+                                   &dvico_xc5000_tunerconfig);
+                break;
+        case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP: {
+                i2c_bus = &dev->i2c_bus[port->nr - 1];
+
+                port->dvb.frontend = dvb_attach(zl10353_attach,
+                                               &dvico_fusionhdtv_xc3028,
+                                               &i2c_bus->i2c_adap);
+                if (port->dvb.frontend != NULL) {
+                        struct dvb_frontend      *fe;
+                        struct xc2028_config      cfg = {
+                                .i2c_adap  = &i2c_bus->i2c_adap,
+                                .i2c_addr  = 0x61,
+                        };
+                        static struct xc2028_ctrl ctl = {
+                                .fname       = XC2028_DEFAULT_FIRMWARE,
+                                .max_len     = 64,
+                                .demod       = XC3028_FE_ZARLINK456,
+                        };
+
+                        fe = dvb_attach(xc2028_attach, port->dvb.frontend,
+                                        &cfg);
+                        if (fe != NULL && fe->ops.tuner_ops.set_config != NULL)
+                                fe->ops.tuner_ops.set_config(fe, &ctl);
+                }
+                break;
+        }
+        case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
+                i2c_bus = &dev->i2c_bus[0];
+
+                port->dvb.frontend = dvb_attach(zl10353_attach,
+                        &dvico_fusionhdtv_xc3028,
+                        &i2c_bus->i2c_adap);
+                if (port->dvb.frontend != NULL) {
+                        struct dvb_frontend      *fe;
+                        struct xc2028_config      cfg = {
+                                .i2c_adap  = &dev->i2c_bus[1].i2c_adap,
+                                .i2c_addr  = 0x61,
+                        };
+                        static struct xc2028_ctrl ctl = {
+                                .fname       = XC2028_DEFAULT_FIRMWARE,
+                                .max_len     = 64,
+                                .demod       = XC3028_FE_ZARLINK456,
+                        };
+
+                        fe = dvb_attach(xc2028_attach, port->dvb.frontend,
+                                &cfg);
+                        if (fe != NULL && fe->ops.tuner_ops.set_config != NULL)
+                                fe->ops.tuner_ops.set_config(fe, &ctl);
+                }
                 break;
         default:
                 printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n",
@@ -504,6 +527,8 @@ static int dvb_register(struct cx23885_tsport *port)
                 printk("%s: frontend initialization failed\n", dev->name);
                 return -1;
         }
+        /* define general-purpose callback pointer */
+        port->dvb.frontend->callback = cx23885_tuner_callback;
 
         /* Put the analog decoder in standby to keep it quiet */
         cx23885_call_i2c_clients(i2c_bus, TUNER_SET_STANDBY, NULL);
diff --git a/drivers/media/video/cx23885/cx23885-vbi.c b/drivers/media/video/cx23885/cx23885-vbi.c
index 35e61cd112fc..5b297f0323b6 100644
--- a/drivers/media/video/cx23885/cx23885-vbi.c
+++ b/drivers/media/video/cx23885/cx23885-vbi.c
@@ -85,18 +85,8 @@ static int cx23885_start_vbi_dma(struct cx23885_dev    *dev,
         return 0;
 }
 
-int cx23885_stop_vbi_dma(struct cx23885_dev *dev)
-{
-        /* stop dma */
-        cx_clear(VID_A_DMA_CTL, 0x00000022);
-
-        /* disable irqs */
-        cx_clear(PCI_INT_MSK, 0x000001);
-        cx_clear(VID_A_INT_MSK, 0x00000022);
-        return 0;
-}
 
-int cx23885_restart_vbi_queue(struct cx23885_dev    *dev,
+static int cx23885_restart_vbi_queue(struct cx23885_dev    *dev,
                              struct cx23885_dmaqueue *q)
 {
         struct cx23885_buffer *buf;
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index 6047c78d84bf..f75ed1c9b71a 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -244,7 +244,7 @@ static struct cx23885_ctrl cx23885_ctls[] = {
 };
 static const int CX23885_CTLS = ARRAY_SIZE(cx23885_ctls);
 
-const u32 cx23885_user_ctrls[] = {
+static const u32 cx23885_user_ctrls[] = {
         V4L2_CID_USER_CLASS,
         V4L2_CID_BRIGHTNESS,
         V4L2_CID_CONTRAST,
@@ -254,14 +254,13 @@ const u32 cx23885_user_ctrls[] = {
         V4L2_CID_AUDIO_MUTE,
         0
 };
-EXPORT_SYMBOL(cx23885_user_ctrls);
 
 static const u32 *ctrl_classes[] = {
         cx23885_user_ctrls,
         NULL
 };
 
-void cx23885_video_wakeup(struct cx23885_dev *dev,
+static void cx23885_video_wakeup(struct cx23885_dev *dev,
                  struct cx23885_dmaqueue *q, u32 count)
 {
         struct cx23885_buffer *buf;
@@ -296,7 +295,7 @@ void cx23885_video_wakeup(struct cx23885_dev *dev,
                         __func__, bc);
 }
 
-int cx23885_set_tvnorm(struct cx23885_dev *dev, v4l2_std_id norm)
+static int cx23885_set_tvnorm(struct cx23885_dev *dev, v4l2_std_id norm)
 {
         dprintk(1, "%s(norm = 0x%08x) name: [%s]\n",
                 __func__,
@@ -314,7 +313,7 @@ int cx23885_set_tvnorm(struct cx23885_dev *dev, v4l2_std_id norm)
         return 0;
 }
 
-struct video_device *cx23885_vdev_init(struct cx23885_dev *dev,
+static struct video_device *cx23885_vdev_init(struct cx23885_dev *dev,
                                     struct pci_dev *pci,
                                     struct video_device *template,
                                     char *type)
@@ -334,7 +333,7 @@ struct video_device *cx23885_vdev_init(struct cx23885_dev *dev,
         return vfd;
 }
 
-int cx23885_ctrl_query(struct v4l2_queryctrl *qctrl)
+static int cx23885_ctrl_query(struct v4l2_queryctrl *qctrl)
 {
         int i;
 
@@ -351,7 +350,6 @@ int cx23885_ctrl_query(struct v4l2_queryctrl *qctrl)
         *qctrl = cx23885_ctls[i].v;
         return 0;
 }
-EXPORT_SYMBOL(cx23885_ctrl_query);
 
 /* ------------------------------------------------------------------- */
 /* resource management                                                 */
@@ -402,7 +400,7 @@ static void res_free(struct cx23885_dev *dev, struct cx23885_fh *fh,
         mutex_unlock(&dev->lock);
 }
 
-int cx23885_video_mux(struct cx23885_dev *dev, unsigned int input)
+static int cx23885_video_mux(struct cx23885_dev *dev, unsigned int input)
 {
         struct v4l2_routing route;
         memset(&route, 0, sizeof(route));
@@ -422,10 +420,9 @@ int cx23885_video_mux(struct cx23885_dev *dev, unsigned int input)
 
         return 0;
 }
-EXPORT_SYMBOL(cx23885_video_mux);
 
 /* ------------------------------------------------------------------ */
-int cx23885_set_scale(struct cx23885_dev *dev, unsigned int width,
+static int cx23885_set_scale(struct cx23885_dev *dev, unsigned int width,
         unsigned int height, enum v4l2_field field)
 {
         dprintk(1, "%s()\n", __func__);
@@ -731,6 +728,7 @@ static int video_open(struct inode *inode, struct file *file)
         enum v4l2_buf_type type = 0;
         int radio = 0;
 
+        lock_kernel();
         list_for_each(list, &cx23885_devlist) {
                 h = list_entry(list, struct cx23885_dev, devlist);
                 if (h->video_dev->minor == minor) {
@@ -748,16 +746,20 @@ static int video_open(struct inode *inode, struct file *file)
                         dev   = h;
                 }
         }
-        if (NULL == dev)
+        if (NULL == dev) {
+                unlock_kernel();
                 return -ENODEV;
+        }
 
         dprintk(1, "open minor=%d radio=%d type=%s\n",
                 minor, radio, v4l2_type_names[type]);
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh), GFP_KERNEL);
-        if (NULL == fh)
+        if (NULL == fh) {
+                unlock_kernel();
                 return -ENOMEM;
+        }
         file->private_data = fh;
         fh->dev      = dev;
         fh->radio    = radio;
@@ -775,6 +777,7 @@ static int video_open(struct inode *inode, struct file *file)
 
         dprintk(1, "post videobuf_queue_init()\n");
 
+        unlock_kernel();
 
         return 0;
 }
@@ -884,21 +887,19 @@ static int video_mmap(struct file *file, struct vm_area_struct *vma)
 /* ------------------------------------------------------------------ */
 /* VIDEO CTRL IOCTLS                                                  */
 
-int cx23885_get_control(struct cx23885_dev *dev, struct v4l2_control *ctl)
+static int cx23885_get_control(struct cx23885_dev *dev, struct v4l2_control *ctl)
 {
         dprintk(1, "%s() calling cx25840(VIDIOC_G_CTRL)\n", __func__);
         cx23885_call_i2c_clients(&dev->i2c_bus[2], VIDIOC_G_CTRL, ctl);
         return 0;
 }
-EXPORT_SYMBOL(cx23885_get_control);
 
-int cx23885_set_control(struct cx23885_dev *dev, struct v4l2_control *ctl)
+static int cx23885_set_control(struct cx23885_dev *dev, struct v4l2_control *ctl)
 {
         dprintk(1, "%s() calling cx25840(VIDIOC_S_CTRL)"
                 " (disabled - no action)\n", __func__);
         return 0;
 }
-EXPORT_SYMBOL(cx23885_set_control);
 
 static void init_controls(struct cx23885_dev *dev)
 {
@@ -1146,7 +1147,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *tvnorms)
         return 0;
 }
 
-int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i)
+static int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i)
 {
         static const char *iname[] = {
                 [CX23885_VMUX_COMPOSITE1] = "Composite1",
@@ -1179,7 +1180,6 @@ int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i)
                 i->std = CX23885_NORMS;
         return 0;
 }
-EXPORT_SYMBOL(cx23885_enum_input);
 
 static int vidioc_enum_input(struct file *file, void *priv,
                                 struct v4l2_input *i)
@@ -1288,7 +1288,7 @@ static int vidioc_g_frequency(struct file *file, void *priv,
         return 0;
 }
 
-int cx23885_set_freq(struct cx23885_dev *dev, struct v4l2_frequency *f)
+static int cx23885_set_freq(struct cx23885_dev *dev, struct v4l2_frequency *f)
 {
         if (unlikely(UNSET == dev->tuner_type))
                 return -EINVAL;
@@ -1307,7 +1307,6 @@ int cx23885_set_freq(struct cx23885_dev *dev, struct v4l2_frequency *f)
 
         return 0;
 }
-EXPORT_SYMBOL(cx23885_set_freq);
 
 static int vidioc_s_frequency(struct file *file, void *priv,
                                 struct v4l2_frequency *f)
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index e23d97c071e0..ba4e0aaed463 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -64,6 +64,8 @@
 #define CX23885_BOARD_HAUPPAUGE_HVR1700        8
 #define CX23885_BOARD_HAUPPAUGE_HVR1400        9
 #define CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP 10
+#define CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP 11
+#define CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H 12
 
 /* Currently unsupported by the driver: PAL/H, NTSC/Kr, SECAM B/G/H/LC */
 #define CX23885_NORMS (\
@@ -409,7 +411,7 @@ extern const unsigned int cx23885_bcount;
 extern struct cx23885_subid cx23885_subids[];
 extern const unsigned int cx23885_idcount;
 
-extern int cx23885_tuner_callback(void *priv, int command, int arg);
+extern int cx23885_tuner_callback(void *priv, int component, int command, int arg);
 extern void cx23885_card_list(struct cx23885_dev *dev);
 extern int  cx23885_ir_init(struct cx23885_dev *dev);
 extern void cx23885_gpio_setup(struct cx23885_dev *dev);
diff --git a/drivers/media/video/cx25840/cx25840-vbi.c b/drivers/media/video/cx25840/cx25840-vbi.c
index 69f2bbdbb929..58e6ef1c28a0 100644
--- a/drivers/media/video/cx25840/cx25840-vbi.c
+++ b/drivers/media/video/cx25840/cx25840-vbi.c
@@ -141,10 +141,11 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg)
                 u8 lcr[24];
 
                 fmt = arg;
-                if (fmt->type != V4L2_BUF_TYPE_SLICED_VBI_CAPTURE)
+                if (fmt->type != V4L2_BUF_TYPE_SLICED_VBI_CAPTURE &&
+                    fmt->type != V4L2_BUF_TYPE_VBI_CAPTURE)
                         return -EINVAL;
                 svbi = &fmt->fmt.sliced;
-                if (svbi->service_set == 0) {
+                if (fmt->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
                         /* raw VBI */
                         memset(svbi, 0, sizeof(*svbi));
 
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
index 9dd7bdf659b9..0b9e5fac6239 100644
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
@@ -58,6 +58,10 @@ config VIDEO_CX88_DVB
         select DVB_ISL6421 if !DVB_FE_CUSTOMISE
         select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
         select DVB_S5H1411 if !DVB_FE_CUSTOMISE
+        select DVB_CX24116 if !DVB_FE_CUSTOMISE
+        select DVB_STV0299 if !DVB_FE_CUSTOMISE
+        select DVB_STV0288 if !DVB_FE_CUSTOMISE
+        select DVB_STB6000 if !DVB_FE_CUSTOMISE
         ---help---
           This adds support for DVB/ATSC cards based on the
           Conexant 2388x chip.
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 9a1374a38ec7..e71369754305 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1057,12 +1057,15 @@ static int mpeg_open(struct inode *inode, struct file *file)
         struct cx8802_driver *drv = NULL;
         int err;
 
+        lock_kernel();
         dev = cx8802_get_device(inode);
 
         dprintk( 1, "%s\n", __func__);
 
-        if (dev == NULL)
+        if (dev == NULL) {
+                unlock_kernel();
                 return -ENODEV;
+        }
 
         /* Make sure we can acquire the hardware */
         drv = cx8802_get_driver(dev, CX88_MPEG_BLACKBIRD);
@@ -1070,6 +1073,7 @@ static int mpeg_open(struct inode *inode, struct file *file)
                 err = drv->request_acquire(drv);
                 if(err != 0) {
                         dprintk(1,"%s: Unable to acquire hardware, %d\n", __func__, err);
+                        unlock_kernel();
                         return err;
                 }
         }
@@ -1077,6 +1081,7 @@ static int mpeg_open(struct inode *inode, struct file *file)
         if (blackbird_initialize_codec(dev) < 0) {
                 if (drv)
                         drv->request_release(drv);
+                unlock_kernel();
                 return -EINVAL;
         }
         dprintk(1,"open minor=%d\n",minor);
@@ -1086,6 +1091,7 @@ static int mpeg_open(struct inode *inode, struct file *file)
         if (NULL == fh) {
                 if (drv)
                         drv->request_release(drv);
+                unlock_kernel();
                 return -ENOMEM;
         }
         file->private_data = fh;
@@ -1101,6 +1107,7 @@ static int mpeg_open(struct inode *inode, struct file *file)
         /* FIXME: locking against other video device */
         cx88_set_scale(dev->core, dev->width, dev->height,
                         fh->mpegq.field);
+        unlock_kernel();
 
         return 0;
 }
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index de199a206a15..5da04e811ca2 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -1349,27 +1349,30 @@ static const struct cx88_board cx88_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .audio_chip     = V4L2_IDENT_WM8775,
+                /*
+                 * gpio0 as reported by Mike Crash <mike AT mikecrash.com>
+                 */
                 .input          = {{
                         .type   = CX88_VMUX_TELEVISION,
                         .vmux   = 0,
-                        .gpio0  = 0xe780,
+                        .gpio0  = 0xef88,
                         .audioroute = 1,
                 },{
                         .type   = CX88_VMUX_COMPOSITE1,
                         .vmux   = 1,
-                        .gpio0  = 0xe780,
+                        .gpio0  = 0xef88,
                         .audioroute = 2,
                 },{
                         .type   = CX88_VMUX_SVIDEO,
                         .vmux   = 2,
-                        .gpio0  = 0xe780,
+                        .gpio0  = 0xef88,
                         .audioroute = 2,
                 }},
                 /* fixme: Add radio support */
                 .mpeg           = CX88_MPEG_DVB | CX88_MPEG_BLACKBIRD,
                 .radio = {
                         .type   = CX88_RADIO,
-                        .gpio0  = 0xe780,
+                        .gpio0  = 0xef88,
                 },
         },
         [CX88_BOARD_ADSTECH_PTV_390] = {
@@ -1446,15 +1449,26 @@ static const struct cx88_board cx88_boards[] = {
                 .name           = "Pinnacle Hybrid PCTV",
                 .tuner_type     = TUNER_XC2028,
                 .tuner_addr     = 0x61,
+                .radio_type     = TUNER_XC2028,
+                .radio_addr     = 0x61,
                 .input          = { {
                         .type   = CX88_VMUX_TELEVISION,
                         .vmux   = 0,
+                        .gpio0  = 0x004ff,
+                        .gpio1  = 0x010ff,
+                        .gpio2  = 0x00001,
                 }, {
                         .type   = CX88_VMUX_COMPOSITE1,
                         .vmux   = 1,
+                        .gpio0  = 0x004fb,
+                        .gpio1  = 0x010ef,
+                        .audioroute = 1,
                 }, {
                         .type   = CX88_VMUX_SVIDEO,
                         .vmux   = 2,
+                        .gpio0  = 0x004fb,
+                        .gpio1  = 0x010ef,
+                        .audioroute = 1,
                 } },
                 .radio = {
                         .type   = CX88_RADIO,
@@ -1462,6 +1476,7 @@ static const struct cx88_board cx88_boards[] = {
                         .gpio1  = 0x010ff,
                         .gpio2  = 0x0ff,
                 },
+                .mpeg           = CX88_MPEG_DVB,
         },
         [CX88_BOARD_WINFAST_TV2000_XP_GLOBAL] = {
                 .name           = "Winfast TV2000 XP Global",
@@ -1566,9 +1581,9 @@ static const struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PRO] = {
                 .name           = "DViCO FusionHDTV DVB-T PRO",
-                .tuner_type     = TUNER_ABSENT, /* XXX: Has XC3028 */
+                .tuner_type     = TUNER_XC2028,
+                .tuner_addr     = 0x61,
                 .radio_type     = UNSET,
-                .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .input          = { {
                         .type   = CX88_VMUX_COMPOSITE1,
@@ -1625,6 +1640,36 @@ static const struct cx88_board cx88_boards[] = {
                         .gpio2 = 0x0cfb,
                 },
         },
+        [CX88_BOARD_PROLINK_PV_GLOBAL_XTREME] = {
+                .name           = "Prolink Pixelview Global Extreme",
+                .tuner_type     = TUNER_XC2028,
+                .tuner_addr     = 0x61,
+                .input          = { {
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 0,
+                        .gpio0 = 0x04fb,
+                        .gpio1 = 0x04080,
+                        .gpio2 = 0x0cf7,
+                }, {
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 1,
+                        .gpio0 = 0x04fb,
+                        .gpio1 = 0x04080,
+                        .gpio2 = 0x0cfb,
+                }, {
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
+                        .gpio0 = 0x04fb,
+                        .gpio1 = 0x04080,
+                        .gpio2 = 0x0cfb,
+                } },
+                .radio = {
+                        .type   = CX88_RADIO,
+                        .gpio0 = 0x04ff,
+                        .gpio1 = 0x04080,
+                        .gpio2 = 0x0cf7,
+                },
+        },
         /* Both radio, analog and ATSC work with this board.
            However, for analog to work, s5h1409 gate should be open,
            otherwise, tuner-xc3028 won't be detected.
@@ -1664,6 +1709,131 @@ static const struct cx88_board cx88_boards[] = {
                 },
                 .mpeg           = CX88_MPEG_DVB,
         },
+        [CX88_BOARD_HAUPPAUGE_HVR4000] = {
+                .name           = "Hauppauge WinTV-HVR4000 DVB-S/S2/T/Hybrid",
+                .tuner_type     = TUNER_PHILIPS_FMD1216ME_MK3,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .tda9887_conf   = TDA9887_PRESENT,
+                /*
+                 * GPIO0 (WINTV2000)
+                 *
+                 * Analogue     SAT     DVB-T
+                 * Antenna      0xc4bf  0xc4bb
+                 * Composite    0xc4bf  0xc4bb
+                 * S-Video      0xc4bf  0xc4bb
+                 * Composite1   0xc4ff  0xc4fb
+                 * S-Video1     0xc4ff  0xc4fb
+                 *
+                 * BIT  VALUE   FUNCTION GP{x}_IO
+                 * 0    1       I:?
+                 * 1    1       I:?
+                 * 2    1       O:DVB-T DEMOD ENABLE LOW/ANALOG DEMOD ENABLE HIGH
+                 * 3    1       I:?
+                 * 4    1       I:?
+                 * 5    1       I:?
+                 * 6    0       O:INPUT SELECTOR 0=INTERNAL 1=EXPANSION
+                 * 7    1       O:DVB-T DEMOD RESET LOW
+                 *
+                 * BIT  VALUE   FUNCTION GP{x}_OE
+                 * 8    0       I
+                 * 9    0       I
+                 * a    1       O
+                 * b    0       I
+                 * c    0       I
+                 * d    0       I
+                 * e    1       O
+                 * f    1       O
+                 */
+                .input          = {{
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 0,
+                        .gpio0  = 0xc4bf,
+                }, {
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 1,
+                        .gpio0  = 0xc4bf,
+                }, {
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
+                        .gpio0  = 0xc4bf,
+                } },
+                /* fixme: Add radio support */
+                .mpeg           = CX88_MPEG_DVB,
+        },
+        [CX88_BOARD_HAUPPAUGE_HVR4000LITE] = {
+                .name           = "Hauppauge WinTV-HVR4000(Lite) DVB-S/S2",
+                .tuner_type     = UNSET,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .input          = {{
+                        .type   = CX88_VMUX_DVB,
+                        .vmux   = 0,
+                } },
+                .mpeg           = CX88_MPEG_DVB,
+        },
+        [CX88_BOARD_TEVII_S420] = {
+                .name           = "TeVii S420 DVB-S",
+                .tuner_type     = UNSET,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .input          = {{
+                        .type   = CX88_VMUX_DVB,
+                        .vmux   = 0,
+                } },
+                .mpeg           = CX88_MPEG_DVB,
+        },
+        [CX88_BOARD_TEVII_S460] = {
+                .name           = "TeVii S460 DVB-S/S2",
+                .tuner_type     = UNSET,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .input          = {{
+                        .type   = CX88_VMUX_DVB,
+                        .vmux   = 0,
+                } },
+                .mpeg           = CX88_MPEG_DVB,
+        },
+        [CX88_BOARD_OMICOM_SS4_PCI] = {
+                .name           = "Omicom SS4 DVB-S/S2 PCI",
+                .tuner_type     = UNSET,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .input          = {{
+                        .type   = CX88_VMUX_DVB,
+                        .vmux   = 0,
+                } },
+                .mpeg           = CX88_MPEG_DVB,
+        },
+        [CX88_BOARD_TBS_8920] = {
+                .name           = "TBS 8920 DVB-S/S2",
+                .tuner_type     = TUNER_ABSENT,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .input          = {{
+                        .type   = CX88_VMUX_DVB,
+                        .vmux   = 1,
+                } },
+                .mpeg           = CX88_MPEG_DVB,
+        },
+        [CX88_BOARD_PROF_7300] = {
+                .name           = "PROF 7300 DVB-S/S2",
+                .tuner_type     = UNSET,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .input          = {{
+                        .type   = CX88_VMUX_DVB,
+                        .vmux   = 0,
+                } },
+                .mpeg           = CX88_MPEG_DVB,
+        },
 };
 
 /* ------------------------------------------------------------------ */
@@ -2010,9 +2180,53 @@ static const struct cx88_subid cx88_subids[] = {
                 .subdevice = 0x4935,
                 .card      = CX88_BOARD_PROLINK_PV_8000GT,
         }, {
+                .subvendor = 0x1554,
+                .subdevice = 0x4976,
+                .card      = CX88_BOARD_PROLINK_PV_GLOBAL_XTREME,
+        }, {
                 .subvendor = 0x17de,
                 .subdevice = 0x08c1,
                 .card      = CX88_BOARD_KWORLD_ATSC_120,
+        }, {
+                .subvendor = 0x0070,
+                .subdevice = 0x6900,
+                .card      = CX88_BOARD_HAUPPAUGE_HVR4000,
+        }, {
+                .subvendor = 0x0070,
+                .subdevice = 0x6904,
+                .card      = CX88_BOARD_HAUPPAUGE_HVR4000,
+        }, {
+                .subvendor = 0x0070,
+                .subdevice = 0x6902,
+                .card      = CX88_BOARD_HAUPPAUGE_HVR4000,
+        }, {
+                .subvendor = 0x0070,
+                .subdevice = 0x6905,
+                .card      = CX88_BOARD_HAUPPAUGE_HVR4000LITE,
+        }, {
+                .subvendor = 0x0070,
+                .subdevice = 0x6906,
+                .card      = CX88_BOARD_HAUPPAUGE_HVR4000LITE,
+        }, {
+                .subvendor = 0xd420,
+                .subdevice = 0x9022,
+                .card      = CX88_BOARD_TEVII_S420,
+        }, {
+                .subvendor = 0xd460,
+                .subdevice = 0x9022,
+                .card      = CX88_BOARD_TEVII_S460,
+        }, {
+                .subvendor = 0xA044,
+                .subdevice = 0x2011,
+                .card      = CX88_BOARD_OMICOM_SS4_PCI,
+        }, {
+                .subvendor = 0x8920,
+                .subdevice = 0x8888,
+                .card      = CX88_BOARD_TBS_8920,
+        }, {
+                .subvendor = 0xB033,
+                .subdevice = 0x3033,
+                .card      = CX88_BOARD_PROF_7300,
         },
 };
 
@@ -2065,6 +2279,13 @@ static void hauppauge_eeprom(struct cx88_core *core, u8 *eeprom_data)
         case 14669: /* WinTV-HVR3000 (OEM, no IR, no b/panel video - Low profile) */
         case 28552: /* WinTV-PVR 'Roslyn' (No IR) */
         case 34519: /* WinTV-PCI-FM */
+        case 69009:
+                /* WinTV-HVR4000 (DVBS/S2/T, Video and IR, back panel inputs) */
+        case 69100: /* WinTV-HVR4000LITE (DVBS/S2, IR) */
+        case 69500: /* WinTV-HVR4000LITE (DVBS/S2, No IR) */
+        case 69559:
+                /* WinTV-HVR4000 (DVBS/S2/T, Video no IR, back panel inputs) */
+        case 69569: /* WinTV-HVR4000 (DVBS/S2/T, Video no IR) */
         case 90002: /* Nova-T-PCI (9002) */
         case 92001: /* Nova-S-Plus (Video and IR) */
         case 92002: /* Nova-S-Plus (Video and IR) */
@@ -2149,9 +2370,21 @@ static int cx88_dvico_xc2028_callback(struct cx88_core *core,
 {
         switch (command) {
         case XC2028_TUNER_RESET:
-                cx_write(MO_GP0_IO, 0x101000);
-                mdelay(5);
-                cx_set(MO_GP0_IO, 0x101010);
+                switch (core->boardnr) {
+                case CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO:
+                        /* GPIO-4 xc3028 tuner */
+
+                        cx_set(MO_GP0_IO, 0x00001000);
+                        cx_clear(MO_GP0_IO, 0x00000010);
+                        msleep(100);
+                        cx_set(MO_GP0_IO, 0x00000010);
+                        msleep(100);
+                        break;
+                default:
+                        cx_write(MO_GP0_IO, 0x101000);
+                        mdelay(5);
+                        cx_set(MO_GP0_IO, 0x101010);
+                }
                 break;
         default:
                 return -EINVAL;
@@ -2258,8 +2491,10 @@ static int cx88_xc2028_tuner_callback(struct cx88_core *core,
                 return cx88_xc3028_geniatech_tuner_callback(core,
                                                         command, arg);
         case CX88_BOARD_PROLINK_PV_8000GT:
+        case CX88_BOARD_PROLINK_PV_GLOBAL_XTREME:
                 return cx88_pv_8000gt_callback(core, command, arg);
         case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PRO:
+        case CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO:
                 return cx88_dvico_xc2028_callback(core, command, arg);
         }
 
@@ -2327,7 +2562,7 @@ static int cx88_xc5000_tuner_callback(struct cx88_core *core,
         return 0; /* Should never be here */
 }
 
-int cx88_tuner_callback(void *priv, int command, int arg)
+int cx88_tuner_callback(void *priv, int component, int command, int arg)
 {
         struct i2c_algo_bit_data *i2c_algo = priv;
         struct cx88_core *core;
@@ -2344,6 +2579,9 @@ int cx88_tuner_callback(void *priv, int command, int arg)
                 return -EINVAL;
         }
 
+        if (component != DVB_FRONTEND_COMPONENT_TUNER)
+                return -EINVAL;
+
         switch (core->board.tuner_type) {
                 case TUNER_XC2028:
                         info_printk(core, "Calling XC2028/3028 callback\n");
@@ -2392,16 +2630,22 @@ static void cx88_card_setup_pre_i2c(struct cx88_core *core)
 {
         switch (core->boardnr) {
         case CX88_BOARD_HAUPPAUGE_HVR1300:
-                /* Bring the 702 demod up before i2c scanning/attach or devices are hidden */
-                /* We leave here with the 702 on the bus */
-                cx_write(MO_GP0_IO, 0x0000e780);
+                /*
+                 * Bring the 702 demod up before i2c scanning/attach or devices are hidden
+                 * We leave here with the 702 on the bus
+                 *
+                 * "reset the IR receiver on GPIO[3]"
+                 * Reported by Mike Crash <mike AT mikecrash.com>
+                 */
+                cx_write(MO_GP0_IO, 0x0000ef88);
                 udelay(1000);
-                cx_clear(MO_GP0_IO, 0x00000080);
+                cx_clear(MO_GP0_IO, 0x00000088);
                 udelay(50);
-                cx_set(MO_GP0_IO, 0x00000080); /* 702 out of reset */
+                cx_set(MO_GP0_IO, 0x00000088); /* 702 out of reset */
                 udelay(1000);
                 break;
 
+        case CX88_BOARD_PROLINK_PV_GLOBAL_XTREME:
         case CX88_BOARD_PROLINK_PV_8000GT:
                 cx_write(MO_GP2_IO, 0xcf7);
                 mdelay(50);
@@ -2411,10 +2655,18 @@ static void cx88_card_setup_pre_i2c(struct cx88_core *core)
                 msleep(10);
                 break;
 
-         case CX88_BOARD_DVICO_FUSIONHDTV_7_GOLD:
+        case CX88_BOARD_DVICO_FUSIONHDTV_7_GOLD:
                 /* Enable the xc5000 tuner */
                 cx_set(MO_GP0_IO, 0x00001010);
                 break;
+
+        case CX88_BOARD_HAUPPAUGE_HVR3000:
+        case CX88_BOARD_HAUPPAUGE_HVR4000:
+        case CX88_BOARD_HAUPPAUGE_HVR4000LITE:
+                /* Init GPIO */
+                cx_write(MO_GP0_IO, core->board.input[0].gpio0);
+                udelay(1000);
+                break;
         }
 }
 
@@ -2435,17 +2687,22 @@ void cx88_setup_xc3028(struct cx88_core *core, struct xc2028_ctrl *ctl)
                         core->i2c_algo.udelay = 16;
                 break;
         case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PRO:
-                ctl->scode_table = XC3028_FE_ZARLINK456;
+                ctl->demod = XC3028_FE_ZARLINK456;
                 break;
         case CX88_BOARD_KWORLD_ATSC_120:
         case CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO:
                 ctl->demod = XC3028_FE_OREN538;
                 break;
+        case CX88_BOARD_PROLINK_PV_GLOBAL_XTREME:
         case CX88_BOARD_PROLINK_PV_8000GT:
                 /*
-                 * This board uses non-MTS firmware
+                 * Those boards uses non-MTS firmware
                  */
                 break;
+        case CX88_BOARD_PINNACLE_HYBRID_PCTV:
+                ctl->demod = XC3028_FE_ZARLINK456;
+                ctl->mts = 1;
+                break;
         default:
                 ctl->demod = XC3028_FE_OREN538;
                 ctl->mts = 1;
@@ -2489,6 +2746,8 @@ static void cx88_card_setup(struct cx88_core *core)
         case CX88_BOARD_HAUPPAUGE_HVR1100LP:
         case CX88_BOARD_HAUPPAUGE_HVR3000:
         case CX88_BOARD_HAUPPAUGE_HVR1300:
+        case CX88_BOARD_HAUPPAUGE_HVR4000:
+        case CX88_BOARD_HAUPPAUGE_HVR4000LITE:
                 if (0 == core->i2c_rc)
                         hauppauge_eeprom(core, eeprom);
                 break;
@@ -2570,7 +2829,18 @@ static void cx88_card_setup(struct cx88_core *core)
                 tea5767_cfg.priv  = &ctl;
 
                 cx88_call_i2c_clients(core, TUNER_SET_CONFIG, &tea5767_cfg);
+                break;
         }
+        case  CX88_BOARD_TEVII_S420:
+        case  CX88_BOARD_TEVII_S460:
+        case  CX88_BOARD_OMICOM_SS4_PCI:
+        case  CX88_BOARD_TBS_8920:
+        case  CX88_BOARD_PROF_7300:
+                cx_write(MO_SRST_IO, 0);
+                msleep(100);
+                cx_write(MO_SRST_IO, 1);
+                msleep(100);
+                break;
         } /*end switch() */
 
 
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index d96173ff1dba..344ed2626e59 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -48,6 +48,11 @@
 #include "tuner-simple.h"
 #include "tda9887.h"
 #include "s5h1411.h"
+#include "stv0299.h"
+#include "z0194a.h"
+#include "stv0288.h"
+#include "stb6000.h"
+#include "cx24116.h"
 
 MODULE_DESCRIPTION("driver for cx2388x based DVB cards");
 MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>");
@@ -375,37 +380,28 @@ static int geniatech_dvbs_set_voltage(struct dvb_frontend *fe,
         return 0;
 }
 
-static int cx88_pci_nano_callback(void *ptr, int command, int arg)
+static int tevii_dvbs_set_voltage(struct dvb_frontend *fe,
+                                      fe_sec_voltage_t voltage)
 {
-        struct cx88_core *core = ptr;
-
-        switch (command) {
-        case XC2028_TUNER_RESET:
-                /* Send the tuner in then out of reset */
-                dprintk(1, "%s: XC2028_TUNER_RESET %d\n", __func__, arg);
-
-                switch (core->boardnr) {
-                case CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO:
-                        /* GPIO-4 xc3028 tuner */
-
-                        cx_set(MO_GP0_IO, 0x00001000);
-                        cx_clear(MO_GP0_IO, 0x00000010);
-                        msleep(100);
-                        cx_set(MO_GP0_IO, 0x00000010);
-                        msleep(100);
-                        break;
-                }
+        struct cx8802_dev *dev= fe->dvb->priv;
+        struct cx88_core *core = dev->core;
 
-                break;
-        case XC2028_RESET_CLK:
-                dprintk(1, "%s: XC2028_RESET_CLK %d\n", __func__, arg);
-                break;
-        default:
-                dprintk(1, "%s: unknown command %d, arg %d\n", __func__,
-                        command, arg);
-                return -EINVAL;
+        switch (voltage) {
+                case SEC_VOLTAGE_13:
+                        printk("LNB Voltage SEC_VOLTAGE_13\n");
+                        cx_write(MO_GP0_IO, 0x00006040);
+                        break;
+                case SEC_VOLTAGE_18:
+                        printk("LNB Voltage SEC_VOLTAGE_18\n");
+                        cx_write(MO_GP0_IO, 0x00006060);
+                        break;
+                case SEC_VOLTAGE_OFF:
+                        printk("LNB Voltage SEC_VOLTAGE_off\n");
+                        break;
         }
 
+        if (core->prev_set_voltage)
+                return core->prev_set_voltage(fe, voltage);
         return 0;
 }
 
@@ -456,7 +452,12 @@ static struct s5h1409_config kworld_atsc_120_config = {
 static struct xc5000_config pinnacle_pctv_hd_800i_tuner_config = {
         .i2c_address    = 0x64,
         .if_khz         = 5380,
-        .tuner_callback = cx88_tuner_callback,
+};
+
+static struct zl10353_config cx88_pinnacle_hybrid_pctv = {
+        .demod_address = (0x1e >> 1),
+        .no_tuner      = 1,
+        .if2           = 45600,
 };
 
 static struct zl10353_config cx88_geniatech_x8000_mt = {
@@ -477,7 +478,6 @@ static struct s5h1411_config dvico_fusionhdtv7_config = {
 static struct xc5000_config dvico_fusionhdtv7_tuner_config = {
         .i2c_address    = 0xc2 >> 1,
         .if_khz         = 5380,
-        .tuner_callback = cx88_tuner_callback,
 };
 
 static int attach_xc3028(u8 addr, struct cx8802_dev *dev)
@@ -488,7 +488,6 @@ static int attach_xc3028(u8 addr, struct cx8802_dev *dev)
                 .i2c_adap  = &dev->core->i2c_adap,
                 .i2c_addr  = addr,
                 .ctrl      = &ctl,
-                .callback  = cx88_tuner_callback,
         };
 
         if (!dev->dvb.frontend) {
@@ -518,6 +517,60 @@ static int attach_xc3028(u8 addr, struct cx8802_dev *dev)
         return 0;
 }
 
+static int cx24116_set_ts_param(struct dvb_frontend *fe,
+        int is_punctured)
+{
+        struct cx8802_dev *dev = fe->dvb->priv;
+        dev->ts_gen_cntrl = 0x2;
+
+        return 0;
+}
+
+static int cx24116_reset_device(struct dvb_frontend *fe)
+{
+        struct cx8802_dev *dev = fe->dvb->priv;
+        struct cx88_core *core = dev->core;
+
+        /* Reset the part */
+        cx_write(MO_SRST_IO, 0);
+        msleep(10);
+        cx_write(MO_SRST_IO, 1);
+        msleep(10);
+
+        return 0;
+}
+
+static struct cx24116_config hauppauge_hvr4000_config = {
+        .demod_address          = 0x05,
+        .set_ts_params          = cx24116_set_ts_param,
+        .reset_device           = cx24116_reset_device,
+};
+
+static struct cx24116_config tevii_s460_config = {
+        .demod_address = 0x55,
+        .set_ts_params = cx24116_set_ts_param,
+        .reset_device  = cx24116_reset_device,
+};
+
+static struct stv0299_config tevii_tuner_sharp_config = {
+        .demod_address = 0x68,
+        .inittab = sharp_z0194a__inittab,
+        .mclk = 88000000UL,
+        .invert = 1,
+        .skip_reinit = 0,
+        .lock_output = 1,
+        .volt13_op0_op1 = STV0299_VOLT13_OP1,
+        .min_delay_ms = 100,
+        .set_symbol_rate = sharp_z0194a__set_symbol_rate,
+        .set_ts_params = cx24116_set_ts_param,
+};
+
+static struct stv0288_config tevii_tuner_earda_config = {
+        .demod_address = 0x68,
+        .min_delay_ms = 100,
+        .set_ts_params = cx24116_set_ts_param,
+};
+
 static int dvb_register(struct cx8802_dev *dev)
 {
         struct cx88_core *core = dev->core;
@@ -786,7 +839,7 @@ static int dvb_register(struct cx8802_dev *dev)
                                                &core->i2c_adap);
                 if (dev->dvb.frontend) {
                         if (!dvb_attach(isl6421_attach, dev->dvb.frontend,
-                                        &core->i2c_adap, 0x08, 0x00, 0x00))
+                                        &core->i2c_adap, 0x08, ISL6421_DCL, 0x00))
                                 goto frontend_detach;
                 }
                 break;
@@ -813,13 +866,9 @@ static int dvb_register(struct cx8802_dev *dev)
                                                &pinnacle_pctv_hd_800i_config,
                                                &core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        /* tuner_config.video_dev must point to
-                         * i2c_adap.algo_data
-                         */
                         if (!dvb_attach(xc5000_attach, dev->dvb.frontend,
                                         &core->i2c_adap,
-                                        &pinnacle_pctv_hd_800i_tuner_config,
-                                        core->i2c_adap.algo_data))
+                                        &pinnacle_pctv_hd_800i_tuner_config))
                                 goto frontend_detach;
                 }
                 break;
@@ -832,10 +881,9 @@ static int dvb_register(struct cx8802_dev *dev)
                         struct xc2028_config cfg = {
                                 .i2c_adap  = &core->i2c_adap,
                                 .i2c_addr  = 0x61,
-                                .callback  = cx88_pci_nano_callback,
                         };
                         static struct xc2028_ctrl ctl = {
-                                .fname       = "xc3028-v27.fw",
+                                .fname       = XC2028_DEFAULT_FIRMWARE,
                                 .max_len     = 64,
                                 .scode_table = XC3028_FE_OREN538,
                         };
@@ -848,10 +896,13 @@ static int dvb_register(struct cx8802_dev *dev)
                 break;
          case CX88_BOARD_PINNACLE_HYBRID_PCTV:
                 dev->dvb.frontend = dvb_attach(zl10353_attach,
-                                               &cx88_geniatech_x8000_mt,
+                                               &cx88_pinnacle_hybrid_pctv,
                                                &core->i2c_adap);
-                if (attach_xc3028(0x61, dev) < 0)
-                        goto frontend_detach;
+                if (dev->dvb.frontend) {
+                        dev->dvb.frontend->ops.i2c_gate_ctrl = NULL;
+                        if (attach_xc3028(0x61, dev) < 0)
+                                goto frontend_detach;
+                }
                 break;
          case CX88_BOARD_GENIATECH_X8000_MT:
                 dev->ts_gen_cntrl = 0x00;
@@ -874,16 +925,69 @@ static int dvb_register(struct cx8802_dev *dev)
                                                &dvico_fusionhdtv7_config,
                                                &core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        /* tuner_config.video_dev must point to
-                         * i2c_adap.algo_data
-                         */
                         if (!dvb_attach(xc5000_attach, dev->dvb.frontend,
                                         &core->i2c_adap,
-                                        &dvico_fusionhdtv7_tuner_config,
-                                        core->i2c_adap.algo_data))
+                                        &dvico_fusionhdtv7_tuner_config))
                                 goto frontend_detach;
                 }
                 break;
+        case CX88_BOARD_HAUPPAUGE_HVR4000:
+        case CX88_BOARD_HAUPPAUGE_HVR4000LITE:
+                /* Support for DVB-S only, not DVB-T support */
+                dev->dvb.frontend = dvb_attach(cx24116_attach,
+                        &hauppauge_hvr4000_config,
+                        &dev->core->i2c_adap);
+                if (dev->dvb.frontend) {
+                        dvb_attach(isl6421_attach, dev->dvb.frontend,
+                                &dev->core->i2c_adap,
+                                0x08, ISL6421_DCL, 0x00);
+                }
+                break;
+        case CX88_BOARD_TEVII_S420:
+                dev->dvb.frontend = dvb_attach(stv0299_attach,
+                                                &tevii_tuner_sharp_config,
+                                                &core->i2c_adap);
+                if (dev->dvb.frontend != NULL) {
+                        if (!dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60,
+                                        &core->i2c_adap, DVB_PLL_OPERA1))
+                                goto frontend_detach;
+                        core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage;
+                        dev->dvb.frontend->ops.set_voltage = tevii_dvbs_set_voltage;
+
+                } else {
+                        dev->dvb.frontend = dvb_attach(stv0288_attach,
+                                                            &tevii_tuner_earda_config,
+                                                            &core->i2c_adap);
+                                if (dev->dvb.frontend != NULL) {
+                                        if (!dvb_attach(stb6000_attach, dev->dvb.frontend, 0x61,
+                                                &core->i2c_adap))
+                                        goto frontend_detach;
+                                core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage;
+                                dev->dvb.frontend->ops.set_voltage = tevii_dvbs_set_voltage;
+
+                        }
+                }
+                break;
+        case CX88_BOARD_TEVII_S460:
+                dev->dvb.frontend = dvb_attach(cx24116_attach,
+                                               &tevii_s460_config,
+                                               &core->i2c_adap);
+                if (dev->dvb.frontend != NULL) {
+                        core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage;
+                        dev->dvb.frontend->ops.set_voltage = tevii_dvbs_set_voltage;
+                }
+                break;
+        case CX88_BOARD_OMICOM_SS4_PCI:
+        case CX88_BOARD_TBS_8920:
+        case CX88_BOARD_PROF_7300:
+                dev->dvb.frontend = dvb_attach(cx24116_attach,
+                                               &hauppauge_hvr4000_config,
+                                               &core->i2c_adap);
+                if (dev->dvb.frontend != NULL) {
+                        core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage;
+                        dev->dvb.frontend->ops.set_voltage = tevii_dvbs_set_voltage;
+                }
+                break;
         default:
                 printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card isn't supported yet\n",
                        core->name);
@@ -895,6 +999,8 @@ static int dvb_register(struct cx8802_dev *dev)
                        core->name);
                 return -EINVAL;
         }
+        /* define general-purpose callback pointer */
+        dev->dvb.frontend->callback = cx88_tuner_callback;
 
         /* Ensure all frontends negotiate bus access */
         dev->dvb.frontend->ops.ts_bus_ctrl = cx88_dvb_bus_ctrl;
diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index d7406a994f09..8e74d64fdcd2 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
@@ -201,7 +201,23 @@ int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci)
 
         core->i2c_rc = i2c_bit_add_bus(&core->i2c_adap);
         if (0 == core->i2c_rc) {
+                static u8 tuner_data[] =
+                        { 0x0b, 0xdc, 0x86, 0x52 };
+                static struct i2c_msg tuner_msg =
+                        { .flags = 0, .addr = 0xc2 >> 1, .buf = tuner_data, .len = 4 };
+
                 dprintk(1, "i2c register ok\n");
+                switch( core->boardnr ) {
+                        case CX88_BOARD_HAUPPAUGE_HVR1300:
+                        case CX88_BOARD_HAUPPAUGE_HVR3000:
+                        case CX88_BOARD_HAUPPAUGE_HVR4000:
+                                printk("%s: i2c init: enabling analog demod on HVR1300/3000/4000 tuner\n",
+                                        core->name);
+                                i2c_transfer(core->i2c_client.adapter, &tuner_msg, 1);
+                                break;
+                        default:
+                                break;
+                }
                 if (i2c_scan)
                         do_i2c_scan(core->name,&core->i2c_client);
         } else
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 53526d997a4e..8683d104de72 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -224,6 +224,8 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:
         case CX88_BOARD_HAUPPAUGE_HVR1100:
         case CX88_BOARD_HAUPPAUGE_HVR3000:
+        case CX88_BOARD_HAUPPAUGE_HVR4000:
+        case CX88_BOARD_HAUPPAUGE_HVR4000LITE:
                 ir_codes = ir_codes_hauppauge_new;
                 ir_type = IR_TYPE_RC5;
                 ir->sampling = 1;
@@ -259,6 +261,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
                 ir->polling = 1; /* ms */
                 break;
         case CX88_BOARD_PROLINK_PV_8000GT:
+        case CX88_BOARD_PROLINK_PV_GLOBAL_XTREME:
                 ir_codes = ir_codes_pixelview_new;
                 ir->gpio_addr = MO_GP1_IO;
                 ir->mask_keycode = 0x3f;
@@ -392,7 +395,7 @@ void cx88_ir_irq(struct cx88_core *core)
 {
         struct cx88_IR *ir = core->ir;
         u32 samples, ircode;
-        int i;
+        int i, start, range, toggle, dev, code;
 
         if (NULL == ir)
                 return;
@@ -461,6 +464,34 @@ void cx88_ir_irq(struct cx88_core *core)
         case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:
         case CX88_BOARD_HAUPPAUGE_HVR1100:
         case CX88_BOARD_HAUPPAUGE_HVR3000:
+        case CX88_BOARD_HAUPPAUGE_HVR4000:
+        case CX88_BOARD_HAUPPAUGE_HVR4000LITE:
+                ircode = ir_decode_biphase(ir->samples, ir->scount, 5, 7);
+                ir_dprintk("biphase decoded: %x\n", ircode);
+                /*
+                 * RC5 has an extension bit which adds a new range
+                 * of available codes, this is detected here. Also
+                 * hauppauge remotes (black/silver) always use
+                 * specific device ids. If we do not filter the
+                 * device ids then messages destined for devices
+                 * such as TVs (id=0) will get through to the
+                 * device causing mis-fired events.
+                 */
+                /* split rc5 data block ... */
+                start = (ircode & 0x2000) >> 13;
+                range = (ircode & 0x1000) >> 12;
+                toggle= (ircode & 0x0800) >> 11;
+                dev   = (ircode & 0x07c0) >> 6;
+                code  = (ircode & 0x003f) | ((range << 6) ^ 0x0040);
+                if( start != 1)
+                        /* no key pressed */
+                        break;
+                if ( dev != 0x1e && dev != 0x1f )
+                        /* not a hauppauge remote */
+                        break;
+                ir_input_keydown(ir->input, &ir->ir, code, ircode);
+                ir->release = jiffies + msecs_to_jiffies(120);
+                break;
         case CX88_BOARD_PINNACLE_PCTV_HD_800i:
                 ircode = ir_decode_biphase(ir->samples, ir->scount, 5, 7);
                 ir_dprintk("biphase decoded: %x\n", ircode);
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index ef4d56ea0027..be45955dff68 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -773,6 +773,7 @@ static int video_open(struct inode *inode, struct file *file)
         enum v4l2_buf_type type = 0;
         int radio = 0;
 
+        lock_kernel();
         list_for_each_entry(h, &cx8800_devlist, devlist) {
                 if (h->video_dev->minor == minor) {
                         dev  = h;
@@ -788,8 +789,10 @@ static int video_open(struct inode *inode, struct file *file)
                         dev   = h;
                 }
         }
-        if (NULL == dev)
+        if (NULL == dev) {
+                unlock_kernel();
                 return -ENODEV;
+        }
 
         core = dev->core;
 
@@ -798,8 +801,10 @@ static int video_open(struct inode *inode, struct file *file)
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh),GFP_KERNEL);
-        if (NULL == fh)
+        if (NULL == fh) {
+                unlock_kernel();
                 return -ENOMEM;
+        }
         file->private_data = fh;
         fh->dev      = dev;
         fh->radio    = radio;
@@ -832,6 +837,9 @@ static int video_open(struct inode *inode, struct file *file)
                 cx88_set_stereo(core,V4L2_TUNER_MODE_STEREO,1);
                 cx88_call_i2c_clients(core,AUDC_SET_RADIO,NULL);
         }
+        unlock_kernel();
+
+        atomic_inc(&core->users);
 
         return 0;
 }
@@ -920,7 +928,8 @@ static int video_release(struct inode *inode, struct file *file)
         file->private_data = NULL;
         kfree(fh);
 
-        cx88_call_i2c_clients (dev->core, TUNER_SET_STANDBY, NULL);
+        if(atomic_dec_and_test(&dev->core->users))
+                cx88_call_i2c_clients (dev->core, TUNER_SET_STANDBY, NULL);
 
         return 0;
 }
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 54fe65094711..dbf01b8b57a5 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -221,6 +221,14 @@ extern struct sram_channel cx88_sram_channels[];
 #define CX88_BOARD_DVICO_FUSIONHDTV_7_GOLD 65
 #define CX88_BOARD_PROLINK_PV_8000GT       66
 #define CX88_BOARD_KWORLD_ATSC_120         67
+#define CX88_BOARD_HAUPPAUGE_HVR4000       68
+#define CX88_BOARD_HAUPPAUGE_HVR4000LITE   69
+#define CX88_BOARD_TEVII_S460              70
+#define CX88_BOARD_OMICOM_SS4_PCI          71
+#define CX88_BOARD_TBS_8920                72
+#define CX88_BOARD_TEVII_S420              73
+#define CX88_BOARD_PROLINK_PV_GLOBAL_XTREME 74
+#define CX88_BOARD_PROF_7300               75
 
 enum cx88_itype {
         CX88_VMUX_COMPOSITE1 = 1,
@@ -342,6 +350,7 @@ struct cx88_core {
         struct mutex               lock;
         /* various v4l controls */
         u32                        freq;
+        atomic_t                   users;
 
         /* cx88-video needs to access cx8802 for hybrid tuner pll access. */
         struct cx8802_dev          *dvbdev;
@@ -601,7 +610,7 @@ extern void cx88_call_i2c_clients(struct cx88_core *core,
 /* ----------------------------------------------------------- */
 /* cx88-cards.c                                                */
 
-extern int cx88_tuner_callback(void *dev, int command, int arg);
+extern int cx88_tuner_callback(void *dev, int component, int command, int arg);
 extern int cx88_get_resources(const struct cx88_core *core,
                               struct pci_dev *pci);
 extern struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr);
diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c
index 79faedf58521..3aa538afcc0b 100644
--- a/drivers/media/video/dabusb.c
+++ b/drivers/media/video/dabusb.c
@@ -866,7 +866,8 @@ static int __init dabusb_init (void)
 
         dbg("dabusb_init: driver registered");
 
-        info(DRIVER_VERSION ":" DRIVER_DESC);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
 
 out:
         return retval;
diff --git a/drivers/media/video/dpc7146.c b/drivers/media/video/dpc7146.c
deleted file mode 100644
index 88d6df71d051..000000000000
--- a/drivers/media/video/dpc7146.c
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
-    dpc7146.c - v4l2 driver for the dpc7146 demonstration board
-
-    Copyright (C) 2000-2003 Michael Hunold <michael@mihu.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.
-*/
-
-#define DEBUG_VARIABLE debug
-
-#include <media/saa7146_vv.h>
-#include <linux/video_decoder.h>        /* for saa7111a */
-
-#define I2C_SAA7111A            0x24
-
-/* All unused bytes are reserverd. */
-#define SAA711X_CHIP_VERSION            0x00
-#define SAA711X_ANALOG_INPUT_CONTROL_1  0x02
-#define SAA711X_ANALOG_INPUT_CONTROL_2  0x03
-#define SAA711X_ANALOG_INPUT_CONTROL_3  0x04
-#define SAA711X_ANALOG_INPUT_CONTROL_4  0x05
-#define SAA711X_HORIZONTAL_SYNC_START   0x06
-#define SAA711X_HORIZONTAL_SYNC_STOP    0x07
-#define SAA711X_SYNC_CONTROL            0x08
-#define SAA711X_LUMINANCE_CONTROL       0x09
-#define SAA711X_LUMINANCE_BRIGHTNESS    0x0A
-#define SAA711X_LUMINANCE_CONTRAST      0x0B
-#define SAA711X_CHROMA_SATURATION       0x0C
-#define SAA711X_CHROMA_HUE_CONTROL      0x0D
-#define SAA711X_CHROMA_CONTROL          0x0E
-#define SAA711X_FORMAT_DELAY_CONTROL    0x10
-#define SAA711X_OUTPUT_CONTROL_1        0x11
-#define SAA711X_OUTPUT_CONTROL_2        0x12
-#define SAA711X_OUTPUT_CONTROL_3        0x13
-#define SAA711X_V_GATE_1_START          0x15
-#define SAA711X_V_GATE_1_STOP           0x16
-#define SAA711X_V_GATE_1_MSB            0x17
-#define SAA711X_TEXT_SLICER_STATUS      0x1A
-#define SAA711X_DECODED_BYTES_OF_TS_1   0x1B
-#define SAA711X_DECODED_BYTES_OF_TS_2   0x1C
-#define SAA711X_STATUS_BYTE             0x1F
-
-#define DPC_BOARD_CAN_DO_VBI(dev)   (dev->revision != 0)
-
-static int debug;
-module_param(debug, int, 0);
-MODULE_PARM_DESC(debug, "debug verbosity");
-
-static int dpc_num;
-
-#define DPC_INPUTS      2
-static struct v4l2_input dpc_inputs[DPC_INPUTS] = {
-        { 0, "Port A",  V4L2_INPUT_TYPE_CAMERA, 2, 0, V4L2_STD_PAL_BG|V4L2_STD_NTSC_M, 0 },
-        { 1, "Port B",  V4L2_INPUT_TYPE_CAMERA, 2, 0, V4L2_STD_PAL_BG|V4L2_STD_NTSC_M, 0 },
-};
-
-#define DPC_AUDIOS      0
-
-static struct saa7146_extension_ioctls ioctls[] = {
-        { VIDIOC_G_INPUT,       SAA7146_EXCLUSIVE },
-        { VIDIOC_S_INPUT,       SAA7146_EXCLUSIVE },
-        { VIDIOC_ENUMINPUT,     SAA7146_EXCLUSIVE },
-        { VIDIOC_S_STD,         SAA7146_AFTER },
-        { 0,                    0 }
-};
-
-struct dpc
-{
-        struct video_device     *video_dev;
-        struct video_device     *vbi_dev;
-
-        struct i2c_adapter      i2c_adapter;
-        struct i2c_client       *saa7111a;
-
-        int cur_input;  /* current input */
-};
-
-static int dpc_check_clients(struct device *dev, void *data)
-{
-        struct dpc* dpc = data;
-        struct i2c_client *client = i2c_verify_client(dev);
-
-        if( !client )
-                return 0;
-
-        if( I2C_SAA7111A == client->addr )
-                dpc->saa7111a = client;
-
-        return 0;
-}
-
-/* fixme: add vbi stuff here */
-static int dpc_probe(struct saa7146_dev* dev)
-{
-        struct dpc* dpc = NULL;
-
-        dpc = kzalloc(sizeof(struct dpc), GFP_KERNEL);
-        if( NULL == dpc ) {
-                printk("dpc_v4l2.o: dpc_probe: not enough kernel memory.\n");
-                return -ENOMEM;
-        }
-
-        /* FIXME: enable i2c-port pins, video-port-pins
-           video port pins should be enabled here ?! */
-        saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26));
-
-        dpc->i2c_adapter = (struct i2c_adapter) {
-                .class = I2C_CLASS_TV_ANALOG,
-                .name = "dpc7146",
-        };
-        saa7146_i2c_adapter_prepare(dev, &dpc->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);
-        if(i2c_add_adapter(&dpc->i2c_adapter) < 0) {
-                DEB_S(("cannot register i2c-device. skipping.\n"));
-                kfree(dpc);
-                return -EFAULT;
-        }
-
-        /* loop through all i2c-devices on the bus and look who is there */
-        device_for_each_child(&dpc->i2c_adapter.dev, dpc, dpc_check_clients);
-
-        /* check if all devices are present */
-        if (!dpc->saa7111a) {
-                DEB_D(("dpc_v4l2.o: dpc_attach failed for this device.\n"));
-                i2c_del_adapter(&dpc->i2c_adapter);
-                kfree(dpc);
-                return -ENODEV;
-        }
-
-        /* all devices are present, probe was successful */
-        DEB_D(("dpc_v4l2.o: dpc_probe succeeded for this device.\n"));
-
-        /* we store the pointer in our private data field */
-        dev->ext_priv = dpc;
-
-        return 0;
-}
-
-/* bring hardware to a sane state. this has to be done, just in case someone
-   wants to capture from this device before it has been properly initialized.
-   the capture engine would badly fail, because no valid signal arrives on the
-   saa7146, thus leading to timeouts and stuff. */
-static int dpc_init_done(struct saa7146_dev* dev)
-{
-        struct dpc* dpc = (struct dpc*)dev->ext_priv;
-
-        DEB_D(("dpc_v4l2.o: dpc_init_done called.\n"));
-
-        /* initialize the helper ics to useful values */
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x00, 0x11);
-
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x02, 0xc0);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x03, 0x30);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x04, 0x00);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x05, 0x00);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x06, 0xde);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x07, 0xad);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x08, 0xa8);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x09, 0x00);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x0a, 0x80);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x0b, 0x47);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x0c, 0x40);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x0d, 0x00);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x0e, 0x03);
-
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x10, 0xd0);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x11, 0x1c);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x12, 0xc1);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x13, 0x30);
-
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x1f, 0x81);
-
-        return 0;
-}
-
-static struct saa7146_ext_vv vv_data;
-
-/* this function only gets called when the probing was successful */
-static int dpc_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_data *info)
-{
-        struct dpc* dpc = (struct dpc*)dev->ext_priv;
-
-        DEB_D(("dpc_v4l2.o: dpc_attach called.\n"));
-
-        /* checking for i2c-devices can be omitted here, because we
-           already did this in "dpc_vl42_probe" */
-
-        saa7146_vv_init(dev,&vv_data);
-        if( 0 != saa7146_register_device(&dpc->video_dev, dev, "dpc", VFL_TYPE_GRABBER)) {
-                ERR(("cannot register capture v4l2 device. skipping.\n"));
-                return -1;
-        }
-
-        /* initialization stuff (vbi) (only for revision > 0 and for extensions which want it)*/
-        if( 0 != DPC_BOARD_CAN_DO_VBI(dev)) {
-                if( 0 != saa7146_register_device(&dpc->vbi_dev, dev, "dpc", VFL_TYPE_VBI)) {
-                        ERR(("cannot register vbi v4l2 device. skipping.\n"));
-                }
-        }
-
-        i2c_use_client(dpc->saa7111a);
-
-        printk("dpc: found 'dpc7146 demonstration board'-%d.\n",dpc_num);
-        dpc_num++;
-
-        /* the rest */
-        dpc->cur_input = 0;
-        dpc_init_done(dev);
-
-        return 0;
-}
-
-static int dpc_detach(struct saa7146_dev* dev)
-{
-        struct dpc* dpc = (struct dpc*)dev->ext_priv;
-
-        DEB_EE(("dev:%p\n",dev));
-
-        i2c_release_client(dpc->saa7111a);
-
-        saa7146_unregister_device(&dpc->video_dev,dev);
-        if( 0 != DPC_BOARD_CAN_DO_VBI(dev)) {
-                saa7146_unregister_device(&dpc->vbi_dev,dev);
-        }
-        saa7146_vv_release(dev);
-
-        dpc_num--;
-
-        i2c_del_adapter(&dpc->i2c_adapter);
-        kfree(dpc);
-        return 0;
-}
-
-#ifdef axa
-int dpc_vbi_bypass(struct saa7146_dev* dev)
-{
-        struct dpc* dpc = (struct dpc*)dev->ext_priv;
-
-        int i = 1;
-
-        /* switch bypass in saa7111a */
-        if ( 0 != dpc->saa7111a->driver->command(dpc->saa7111a,SAA711X_VBI_BYPASS, &i)) {
-                printk("dpc_v4l2.o: VBI_BYPASS: could not address saa7111a.\n");
-                return -1;
-        }
-
-        return 0;
-}
-#endif
-
-static int dpc_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
-{
-        struct saa7146_dev *dev = fh->dev;
-        struct dpc* dpc = (struct dpc*)dev->ext_priv;
-/*
-        struct saa7146_vv *vv = dev->vv_data;
-*/
-        switch(cmd)
-        {
-        case VIDIOC_ENUMINPUT:
-        {
-                struct v4l2_input *i = arg;
-                DEB_EE(("VIDIOC_ENUMINPUT %d.\n",i->index));
-
-                if( i->index < 0 || i->index >= DPC_INPUTS) {
-                        return -EINVAL;
-                }
-
-                memcpy(i, &dpc_inputs[i->index], sizeof(struct v4l2_input));
-
-                DEB_D(("dpc_v4l2.o: v4l2_ioctl: VIDIOC_ENUMINPUT %d.\n",i->index));
-                return 0;
-        }
-        case VIDIOC_G_INPUT:
-        {
-                int *input = (int *)arg;
-                *input = dpc->cur_input;
-
-                DEB_D(("dpc_v4l2.o: VIDIOC_G_INPUT: %d\n",*input));
-                return 0;
-        }
-        case VIDIOC_S_INPUT:
-        {
-                int     input = *(int *)arg;
-
-                if (input < 0 || input >= DPC_INPUTS) {
-                        return -EINVAL;
-                }
-
-                dpc->cur_input = input;
-
-                /* fixme: switch input here, switch audio, too! */
-//              saa7146_set_hps_source_and_sync(dev, input_port_selection[input].hps_source, input_port_selection[input].hps_sync);
-                printk("dpc_v4l2.o: VIDIOC_S_INPUT: fixme switch input.\n");
-
-                return 0;
-        }
-        default:
-/*
-                DEB_D(("dpc_v4l2.o: v4l2_ioctl does not handle this ioctl.\n"));
-*/
-                return -ENOIOCTLCMD;
-        }
-        return 0;
-}
-
-static int std_callback(struct saa7146_dev* dev, struct saa7146_standard *std)
-{
-        return 0;
-}
-
-static struct saa7146_standard standard[] = {
-        {
-                .name   = "PAL",        .id     = V4L2_STD_PAL,
-                .v_offset       = 0x17, .v_field        = 288,
-                .h_offset       = 0x14, .h_pixels       = 680,
-                .v_max_out      = 576,  .h_max_out      = 768,
-        }, {
-                .name   = "NTSC",       .id     = V4L2_STD_NTSC,
-                .v_offset       = 0x16, .v_field        = 240,
-                .h_offset       = 0x06, .h_pixels       = 708,
-                .v_max_out      = 480,  .h_max_out      = 640,
-        }, {
-                .name   = "SECAM",      .id     = V4L2_STD_SECAM,
-                .v_offset       = 0x14, .v_field        = 288,
-                .h_offset       = 0x14, .h_pixels       = 720,
-                .v_max_out      = 576,  .h_max_out      = 768,
-        }
-};
-
-static struct saa7146_extension extension;
-
-static struct saa7146_pci_extension_data dpc = {
-        .ext_priv = "Multimedia eXtension Board",
-        .ext = &extension,
-};
-
-static struct pci_device_id pci_tbl[] = {
-        {
-                .vendor    = PCI_VENDOR_ID_PHILIPS,
-                .device    = PCI_DEVICE_ID_PHILIPS_SAA7146,
-                .subvendor = 0x0000,
-                .subdevice = 0x0000,
-                .driver_data = (unsigned long)&dpc,
-        }, {
-                .vendor = 0,
-        }
-};
-
-MODULE_DEVICE_TABLE(pci, pci_tbl);
-
-static struct saa7146_ext_vv vv_data = {
-        .inputs         = DPC_INPUTS,
-        .capabilities   = V4L2_CAP_VBI_CAPTURE,
-        .stds           = &standard[0],
-        .num_stds       = sizeof(standard)/sizeof(struct saa7146_standard),
-        .std_callback   = &std_callback,
-        .ioctls         = &ioctls[0],
-        .ioctl          = dpc_ioctl,
-};
-
-static struct saa7146_extension extension = {
-        .name           = "dpc7146 demonstration board",
-        .flags          = SAA7146_USE_I2C_IRQ,
-
-        .pci_tbl        = &pci_tbl[0],
-        .module         = THIS_MODULE,
-
-        .probe          = dpc_probe,
-        .attach         = dpc_attach,
-        .detach         = dpc_detach,
-
-        .irq_mask       = 0,
-        .irq_func       = NULL,
-};
-
-static int __init dpc_init_module(void)
-{
-        if( 0 != saa7146_register_extension(&extension)) {
-                DEB_S(("failed to register extension.\n"));
-                return -ENODEV;
-        }
-
-        return 0;
-}
-
-static void __exit dpc_cleanup_module(void)
-{
-        saa7146_unregister_extension(&extension);
-}
-
-module_init(dpc_init_module);
-module_exit(dpc_cleanup_module);
-
-MODULE_DESCRIPTION("video4linux-2 driver for the 'dpc7146 demonstration board'");
-MODULE_AUTHOR("Michael Hunold <michael@mihu.de>");
-MODULE_LICENSE("GPL");
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index de943cf6c169..d65d0572403b 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1101,7 +1101,7 @@ struct usb_device_id em28xx_id_table [] = {
         { USB_DEVICE(0xeb1a, 0x2820),
                         .driver_info = EM2820_BOARD_UNKNOWN },
         { USB_DEVICE(0xeb1a, 0x2821),
-                        .driver_info = EM2820_BOARD_UNKNOWN },
+                        .driver_info = EM2820_BOARD_PROLINK_PLAYTV_USB2 },
         { USB_DEVICE(0xeb1a, 0x2860),
                         .driver_info = EM2820_BOARD_UNKNOWN },
         { USB_DEVICE(0xeb1a, 0x2861),
@@ -1271,7 +1271,7 @@ static struct em28xx_hash_table em28xx_i2c_hash[] = {
         {0x1ba50080, EM2860_BOARD_POINTNIX_INTRAORAL_CAMERA, TUNER_ABSENT},
 };
 
-int em28xx_tuner_callback(void *ptr, int command, int arg)
+int em28xx_tuner_callback(void *ptr, int component, int command, int arg)
 {
         int rc = 0;
         struct em28xx *dev = ptr;
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index d2b1a1a52689..c99e2383b7ec 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -249,7 +249,6 @@ static int attach_xc3028(u8 addr, struct em28xx *dev)
         memset(&cfg, 0, sizeof(cfg));
         cfg.i2c_adap  = &dev->i2c_adap;
         cfg.i2c_addr  = addr;
-        cfg.callback  = em28xx_tuner_callback;
 
         if (!dev->dvb->frontend) {
                 printk(KERN_ERR "%s/2: dvb frontend not attached. "
@@ -274,7 +273,7 @@ static int attach_xc3028(u8 addr, struct em28xx *dev)
 
 /* ------------------------------------------------------------------ */
 
-int register_dvb(struct em28xx_dvb *dvb,
+static int register_dvb(struct em28xx_dvb *dvb,
                  struct module *module,
                  struct em28xx *dev,
                  struct device *device)
@@ -422,6 +421,8 @@ static int dvb_init(struct em28xx *dev)
                 }
                 break;
         case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900:
+        case EM2880_BOARD_TERRATEC_HYBRID_XS:
+        case EM2880_BOARD_KWORLD_DVB_310U:
                 dvb->frontend = dvb_attach(zl10353_attach,
                                            &em28xx_zl10353_with_xc3028,
                                            &dev->i2c_adap);
@@ -443,24 +444,6 @@ static int dvb_init(struct em28xx *dev)
                 }
                 break;
 #endif
-        case EM2880_BOARD_TERRATEC_HYBRID_XS:
-                dvb->frontend = dvb_attach(zl10353_attach,
-                                                &em28xx_zl10353_with_xc3028,
-                                                &dev->i2c_adap);
-                if (attach_xc3028(0x61, dev) < 0) {
-                         result = -EINVAL;
-                        goto out_free;
-                }
-                break;
-        case EM2880_BOARD_KWORLD_DVB_310U:
-                dvb->frontend = dvb_attach(zl10353_attach,
-                                                &em28xx_zl10353_with_xc3028,
-                                                &dev->i2c_adap);
-                if (attach_xc3028(0x61, dev) < 0) {
-                        result = -EINVAL;
-                        goto out_free;
-                }
-                break;
         default:
                 printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card"
                                 " isn't supported yet\n",
@@ -474,6 +457,8 @@ static int dvb_init(struct em28xx *dev)
                 result = -EINVAL;
                 goto out_free;
         }
+        /* define general-purpose callback pointer */
+        dvb->frontend->callback = em28xx_tuner_callback;
 
         /* register everything */
         result = register_dvb(dvb, THIS_MODULE, dev, &dev->udev->dev);
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
index 97853384c943..3bab56b997fc 100644
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -143,10 +143,11 @@ static int em2800_i2c_check_for_device(struct em28xx *dev, unsigned char addr)
         }
         for (write_timeout = EM2800_I2C_WRITE_TIMEOUT; write_timeout > 0;
              write_timeout -= 5) {
-                unsigned msg = dev->em28xx_read_reg(dev, 0x5);
-                if (msg == 0x94)
+                unsigned reg = dev->em28xx_read_reg(dev, 0x5);
+
+                if (reg == 0x94)
                         return -ENODEV;
-                else if (msg == 0x84)
+                else if (reg == 0x84)
                         return 0;
                 msleep(5);
         }
@@ -335,8 +336,11 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned char *eedata, int len)
 
         /* Check if board has eeprom */
         err = i2c_master_recv(&dev->i2c_client, &buf, 0);
-        if (err < 0)
-                return -1;
+        if (err < 0) {
+                em28xx_errdev("%s: i2c_master_recv failed! err [%d]\n",
+                        __func__, err);
+                return err;
+        }
 
         buf = 0;
 
@@ -344,7 +348,7 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned char *eedata, int len)
         if (err != 1) {
                 printk(KERN_INFO "%s: Huh, no eeprom present (err=%d)?\n",
                        dev->name, err);
-                return -1;
+                return err;
         }
         while (size > 0) {
                 if (size > 16)
@@ -357,7 +361,7 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned char *eedata, int len)
                         printk(KERN_WARNING
                                "%s: i2c eeprom read error (err=%d)\n",
                                dev->name, err);
-                        return -1;
+                        return err;
                 }
                 size -= block;
                 p += block;
@@ -585,18 +589,31 @@ void em28xx_i2c_call_clients(struct em28xx *dev, unsigned int cmd, void *arg)
  */
 int em28xx_i2c_register(struct em28xx *dev)
 {
+        int retval;
+
         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);
+
+        retval = i2c_add_adapter(&dev->i2c_adap);
+        if (retval < 0) {
+                em28xx_errdev("%s: i2c_add_adapter failed! retval [%d]\n",
+                        __func__, retval);
+                return retval;
+        }
 
         dev->i2c_client = em28xx_client_template;
         dev->i2c_client.adapter = &dev->i2c_adap;
 
-        em28xx_i2c_eeprom(dev, dev->eedata, sizeof(dev->eedata));
+        retval = em28xx_i2c_eeprom(dev, dev->eedata, sizeof(dev->eedata));
+        if (retval < 0) {
+                em28xx_errdev("%s: em28xx_i2_eeprom failed! retval [%d]\n",
+                        __func__, retval);
+                return retval;
+        }
 
         if (i2c_scan)
                 em28xx_do_i2c_scan(dev);
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 49ab0629702e..c53649e5315b 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -513,10 +513,17 @@ static struct videobuf_queue_ops em28xx_video_qops = {
  */
 static int em28xx_config(struct em28xx *dev)
 {
+        int retval;
 
         /* Sets I2C speed to 100 KHz */
-        if (!dev->is_em2800)
-                em28xx_write_regs_req(dev, 0x00, 0x06, "\x40", 1);
+        if (!dev->is_em2800) {
+                retval = em28xx_write_regs_req(dev, 0x00, 0x06, "\x40", 1);
+                if (retval < 0) {
+                        em28xx_errdev("%s: em28xx_write_regs_req failed! retval [%d]\n",
+                                __func__, retval);
+                        return retval;
+                }
+        }
 
         /* enable vbi capturing */
 
@@ -1512,6 +1519,7 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
         struct em28xx_fh *fh;
         enum v4l2_buf_type fh_type = 0;
 
+        lock_kernel();
         list_for_each_entry(h, &em28xx_devlist, devlist) {
                 if (h->vdev->minor == minor) {
                         dev  = h;
@@ -1527,8 +1535,10 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
                         dev   = h;
                 }
         }
-        if (NULL == dev)
+        if (NULL == dev) {
+                unlock_kernel();
                 return -ENODEV;
+        }
 
         em28xx_videodbg("open minor=%d type=%s users=%d\n",
                                 minor, v4l2_type_names[fh_type], dev->users);
@@ -1537,6 +1547,7 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
         fh = kzalloc(sizeof(struct em28xx_fh), GFP_KERNEL);
         if (!fh) {
                 em28xx_errdev("em28xx-video.c: Out of memory?!\n");
+                unlock_kernel();
                 return -ENOMEM;
         }
         mutex_lock(&dev->lock);
@@ -1573,6 +1584,7 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
                         sizeof(struct em28xx_buffer), fh);
 
         mutex_unlock(&dev->lock);
+        unlock_kernel();
 
         return errCode;
 }
@@ -1588,8 +1600,7 @@ static void em28xx_release_resources(struct em28xx *dev)
         /*FIXME: I2C IR should be disconnected */
 
         em28xx_info("V4L2 devices /dev/video%d and /dev/vbi%d deregistered\n",
-                                dev->vdev->minor-MINOR_VFL_TYPE_GRABBER_MIN,
-                                dev->vbi_dev->minor-MINOR_VFL_TYPE_VBI_MIN);
+                                dev->vdev->num, dev->vbi_dev->num);
         list_del(&dev->devlist);
         if (dev->sbutton_input_dev)
                 em28xx_deregister_snapshot_button(dev);
@@ -1948,13 +1959,23 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
         }
 
         /* register i2c bus */
-        em28xx_i2c_register(dev);
+        errCode = em28xx_i2c_register(dev);
+        if (errCode < 0) {
+                em28xx_errdev("%s: em28xx_i2c_register - errCode [%d]!\n",
+                        __func__, errCode);
+                return errCode;
+        }
 
         /* Do board specific init and eeprom reading */
         em28xx_card_setup(dev);
 
         /* Configure audio */
-        em28xx_audio_analog_set(dev);
+        errCode = em28xx_audio_analog_set(dev);
+        if (errCode < 0) {
+                em28xx_errdev("%s: em28xx_audio_analog_set - errCode [%d]!\n",
+                        __func__, errCode);
+                return errCode;
+        }
 
         /* configure the device */
         em28xx_config_i2c(dev);
@@ -1974,6 +1995,11 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
         dev->ctl_input = 2;
 
         errCode = em28xx_config(dev);
+        if (errCode < 0) {
+                em28xx_errdev("%s: em28xx_config - errCode [%d]!\n",
+                        __func__, errCode);
+                return errCode;
+        }
 
         list_add_tail(&dev->devlist, &em28xx_devlist);
 
@@ -2026,17 +2052,27 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
 
         if (dev->has_msp34xx) {
                 /* Send a reset to other chips via gpio */
-                em28xx_write_regs_req(dev, 0x00, 0x08, "\xf7", 1);
+                errCode = em28xx_write_regs_req(dev, 0x00, 0x08, "\xf7", 1);
+                if (errCode < 0) {
+                        em28xx_errdev("%s: em28xx_write_regs_req - msp34xx(1) failed! errCode [%d]\n",
+                                __func__, errCode);
+                        return errCode;
+                }
                 msleep(3);
-                em28xx_write_regs_req(dev, 0x00, 0x08, "\xff", 1);
+
+                errCode = em28xx_write_regs_req(dev, 0x00, 0x08, "\xff", 1);
+                if (errCode < 0) {
+                        em28xx_errdev("%s: em28xx_write_regs_req - msp34xx(2) failed! errCode [%d]\n",
+                                __func__, errCode);
+                        return errCode;
+                }
                 msleep(3);
         }
 
         video_mux(dev, 0);
 
         em28xx_info("V4L2 device registered as /dev/video%d and /dev/vbi%d\n",
-                                dev->vdev->minor-MINOR_VFL_TYPE_GRABBER_MIN,
-                                dev->vbi_dev->minor-MINOR_VFL_TYPE_VBI_MIN);
+                                dev->vdev->num, dev->vbi_dev->num);
 
         mutex_lock(&em28xx_extension_devlist_lock);
         if (!list_empty(&em28xx_extension_devlist)) {
@@ -2236,7 +2272,7 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
                 em28xx_warn
                     ("device /dev/video%d is open! Deregistration and memory "
                      "deallocation are deferred on close.\n",
-                                dev->vdev->minor-MINOR_VFL_TYPE_GRABBER_MIN);
+                                dev->vdev->num);
 
                 dev->state |= DEV_MISCONFIGURED;
                 em28xx_uninit_isoc(dev);
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 9a3310748685..82781178e0a3 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -411,8 +411,8 @@ struct em28xx {
         /* frame properties */
         int width;              /* current frame width */
         int height;             /* current frame height */
-        int hscale;             /* horizontal scale factor (see datasheet) */
-        int vscale;             /* vertical scale factor (see datasheet) */
+        unsigned hscale;        /* horizontal scale factor (see datasheet) */
+        unsigned vscale;        /* vertical scale factor (see datasheet) */
         int interlaced;         /* 1=interlace fileds, 0=just top fileds */
         unsigned int video_bytesread;   /* Number of bytes read */
 
@@ -528,7 +528,7 @@ extern struct em28xx_board em28xx_boards[];
 extern struct usb_device_id em28xx_id_table[];
 extern const unsigned int em28xx_bcount;
 void em28xx_set_ir(struct em28xx *dev, struct IR_i2c *ir);
-int em28xx_tuner_callback(void *ptr, int command, int arg);
+int em28xx_tuner_callback(void *ptr, int component, int command, int arg);
 
 /* Provided by em28xx-input.c */
 /* TODO: Check if the standard get_key handlers on ir-common can be used */
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
index 8db2a05bf9c5..7a85c41b0eea 100644
--- a/drivers/media/video/et61x251/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
@@ -1214,7 +1214,7 @@ static int et61x251_open(struct inode* inode, struct file* filp)
         if (!down_read_trylock(&et61x251_dev_lock))
                 return -ERESTARTSYS;
 
-        cam = video_get_drvdata(video_devdata(filp));
+        cam = video_drvdata(filp);
 
         if (wait_for_completion_interruptible(&cam->probe)) {
                 up_read(&et61x251_dev_lock);
@@ -1297,7 +1297,7 @@ static int et61x251_release(struct inode* inode, struct file* filp)
 
         down_write(&et61x251_dev_lock);
 
-        cam = video_get_drvdata(video_devdata(filp));
+        cam = video_drvdata(filp);
 
         et61x251_stop_transfer(cam);
         et61x251_release_buffers(cam);
@@ -1318,7 +1318,7 @@ static ssize_t
 et61x251_read(struct file* filp, char __user * buf,
               size_t count, loff_t* f_pos)
 {
-        struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));
+        struct et61x251_device *cam = video_drvdata(filp);
         struct et61x251_frame_t* f, * i;
         unsigned long lock_flags;
         long timeout;
@@ -1426,7 +1426,7 @@ exit:
 
 static unsigned int et61x251_poll(struct file *filp, poll_table *wait)
 {
-        struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));
+        struct et61x251_device *cam = video_drvdata(filp);
         struct et61x251_frame_t* f;
         unsigned long lock_flags;
         unsigned int mask = 0;
@@ -1502,7 +1502,7 @@ static struct vm_operations_struct et61x251_vm_ops = {
 
 static int et61x251_mmap(struct file* filp, struct vm_area_struct *vma)
 {
-        struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));
+        struct et61x251_device *cam = video_drvdata(filp);
         unsigned long size = vma->vm_end - vma->vm_start,
                       start = vma->vm_start;
         void *pos;
@@ -2395,7 +2395,7 @@ et61x251_vidioc_s_parm(struct et61x251_device* cam, void __user * arg)
 static int et61x251_ioctl_v4l2(struct inode* inode, struct file* filp,
                                unsigned int cmd, void __user * arg)
 {
-        struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));
+        struct et61x251_device *cam = video_drvdata(filp);
 
         switch (cmd) {
 
@@ -2490,7 +2490,7 @@ static int et61x251_ioctl_v4l2(struct inode* inode, struct file* filp,
 static int et61x251_ioctl(struct inode* inode, struct file* filp,
                          unsigned int cmd, unsigned long arg)
 {
-        struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));
+        struct et61x251_device *cam = video_drvdata(filp);
         int err = 0;
 
         if (mutex_lock_interruptible(&cam->fileop_mutex))
diff --git a/drivers/media/video/gspca/Kconfig b/drivers/media/video/gspca/Kconfig
index 42b90742b40b..4d0817471c9f 100644
--- a/drivers/media/video/gspca/Kconfig
+++ b/drivers/media/video/gspca/Kconfig
@@ -1,13 +1,212 @@
-config USB_GSPCA
-        tristate "USB GSPCA driver"
+menuconfig USB_GSPCA
+        tristate "GSPCA based webcams"
         depends on VIDEO_V4L2
+        default m
         ---help---
-          Say Y here if you want support for various USB webcams.
+        Say Y here if you want to enable selecting webcams based
+        on the GSPCA framework.
 
-          See <file:Documentation/video4linux/gspca.txt> for more info.
+        See <file:Documentation/video4linux/gspca.txt> for more info.
 
-          This driver uses the Video For Linux API. You must say Y or M to
-          "Video For Linux" to use this driver.
+        This driver uses the Video For Linux API. You must say Y or M to
+        "Video For Linux" to use this driver.
 
-          To compile this driver as modules, choose M here: the
-          modules will be called gspca_xxxx.
+        To compile this driver as modules, choose M here: the
+        modules will be called gspca_main.
+
+
+if USB_GSPCA && VIDEO_V4L2
+
+source "drivers/media/video/gspca/m5602/Kconfig"
+
+config USB_GSPCA_CONEX
+        tristate "Conexant Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the Conexant chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_conex.
+
+config USB_GSPCA_ETOMS
+        tristate "Etoms USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the Etoms chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_etoms.
+
+config USB_GSPCA_FINEPIX
+        tristate "Fujifilm FinePix USB V4L2 driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the FinePix chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_finepix.
+
+config USB_GSPCA_MARS
+        tristate "Mars USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the Mars chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_mars.
+
+config USB_GSPCA_OV519
+        tristate "OV519 USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the OV519 chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_ov519.
+
+config USB_GSPCA_PAC207
+        tristate "Pixart PAC207 USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the PAC207 chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_pac207.
+
+config USB_GSPCA_PAC7311
+        tristate "Pixart PAC7311 USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the PAC7311 chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_pac7311.
+
+config USB_GSPCA_SONIXB
+        tristate "SN9C102 USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the SONIXB chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_sonixb.
+
+config USB_GSPCA_SONIXJ
+        tristate "SONIX JPEG USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the SONIXJ chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_sonixj
+
+config USB_GSPCA_SPCA500
+        tristate "SPCA500 USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the SPCA500 chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_spca500.
+
+config USB_GSPCA_SPCA501
+        tristate "SPCA501 USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the SPCA501 chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_spca501.
+
+config USB_GSPCA_SPCA505
+        tristate "SPCA505 USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the SPCA505 chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_spca505.
+
+config USB_GSPCA_SPCA506
+        tristate "SPCA506 USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the SPCA506 chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_spca506.
+
+config USB_GSPCA_SPCA508
+        tristate "SPCA508 USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the SPCA508 chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_spca508.
+
+config USB_GSPCA_SPCA561
+        tristate "SPCA561 USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the SPCA561 chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_spca561.
+
+config USB_GSPCA_STK014
+        tristate "Syntek DV4000 (STK014) USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the STK014 chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_stk014.
+
+config USB_GSPCA_SUNPLUS
+        tristate "SUNPLUS USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the Sunplus
+        SPCA504(abc) SPCA533 SPCA536 chips.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_spca5xx.
+
+config USB_GSPCA_T613
+        tristate "T613 (JPEG Compliance) USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the T613 chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_t613.
+
+config USB_GSPCA_TV8532
+        tristate "TV8532 USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the TV8531 chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_tv8532.
+
+config USB_GSPCA_VC032X
+        tristate "VC032X USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the VC032X chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_vc032x.
+
+config USB_GSPCA_ZC3XX
+        tristate "VC3xx USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the ZC3XX chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_zc3xx.
+
+endif
diff --git a/drivers/media/video/gspca/Makefile b/drivers/media/video/gspca/Makefile
index e68a8965297a..22734f5a6c32 100644
--- a/drivers/media/video/gspca/Makefile
+++ b/drivers/media/video/gspca/Makefile
@@ -1,29 +1,48 @@
-obj-$(CONFIG_USB_GSPCA) += gspca_main.o \
-        gspca_conex.o gspca_etoms.o gspca_mars.o \
-        gspca_ov519.o gspca_pac207.o gspca_pac7311.o \
-        gspca_sonixb.o gspca_sonixj.o gspca_spca500.o gspca_spca501.o \
-        gspca_spca505.o gspca_spca506.o gspca_spca508.o gspca_spca561.o \
-        gspca_sunplus.o gspca_stk014.o gspca_t613.o gspca_tv8532.o \
-        gspca_vc032x.o gspca_zc3xx.o
+obj-$(CONFIG_USB_GSPCA)         += gspca_main.o
+obj-$(CONFIG_USB_GSPCA_CONEX)   += gspca_conex.o
+obj-$(CONFIG_USB_GSPCA_ETOMS)   += gspca_etoms.o
+obj-$(CONFIG_USB_GSPCA_FINEPIX) += gspca_finepix.o
+obj-$(CONFIG_USB_GSPCA_MARS)    += gspca_mars.o
+obj-$(CONFIG_USB_GSPCA_OV519)   += gspca_ov519.o
+obj-$(CONFIG_USB_GSPCA_PAC207)  += gspca_pac207.o
+obj-$(CONFIG_USB_GSPCA_PAC7311) += gspca_pac7311.o
+obj-$(CONFIG_USB_GSPCA_SONIXB)  += gspca_sonixb.o
+obj-$(CONFIG_USB_GSPCA_SONIXJ)  += gspca_sonixj.o
+obj-$(CONFIG_USB_GSPCA_SPCA500) += gspca_spca500.o
+obj-$(CONFIG_USB_GSPCA_SPCA501) += gspca_spca501.o
+obj-$(CONFIG_USB_GSPCA_SPCA505) += gspca_spca505.o
+obj-$(CONFIG_USB_GSPCA_SPCA506) += gspca_spca506.o
+obj-$(CONFIG_USB_GSPCA_SPCA508) += gspca_spca508.o
+obj-$(CONFIG_USB_GSPCA_SPCA561) += gspca_spca561.o
+obj-$(CONFIG_USB_GSPCA_SUNPLUS) += gspca_sunplus.o
+obj-$(CONFIG_USB_GSPCA_STK014)  += gspca_stk014.o
+obj-$(CONFIG_USB_GSPCA_T613)    += gspca_t613.o
+obj-$(CONFIG_USB_GSPCA_TV8532)  += gspca_tv8532.o
+obj-$(CONFIG_USB_GSPCA_VC032X)  += gspca_vc032x.o
+obj-$(CONFIG_USB_GSPCA_ZC3XX)   += gspca_zc3xx.o
+
+gspca_main-objs                 := gspca.o
+gspca_conex-objs                := conex.o
+gspca_etoms-objs                := etoms.o
+gspca_finepix-objs              := finepix.o
+gspca_mars-objs                 := mars.o
+gspca_ov519-objs                := ov519.o
+gspca_pac207-objs               := pac207.o
+gspca_pac7311-objs              := pac7311.o
+gspca_sonixb-objs               := sonixb.o
+gspca_sonixj-objs               := sonixj.o
+gspca_spca500-objs              := spca500.o
+gspca_spca501-objs              := spca501.o
+gspca_spca505-objs              := spca505.o
+gspca_spca506-objs              := spca506.o
+gspca_spca508-objs              := spca508.o
+gspca_spca561-objs              := spca561.o
+gspca_stk014-objs               := stk014.o
+gspca_sunplus-objs              := sunplus.o
+gspca_t613-objs                 := t613.o
+gspca_tv8532-objs               := tv8532.o
+gspca_vc032x-objs               := vc032x.o
+gspca_zc3xx-objs                := zc3xx.o
+
+obj-$(CONFIG_USB_M5602)         += m5602/
 
-gspca_main-objs := gspca.o
-gspca_conex-objs := conex.o
-gspca_etoms-objs := etoms.o
-gspca_mars-objs := mars.o
-gspca_ov519-objs := ov519.o
-gspca_pac207-objs := pac207.o
-gspca_pac7311-objs := pac7311.o
-gspca_sonixb-objs := sonixb.o
-gspca_sonixj-objs := sonixj.o
-gspca_spca500-objs := spca500.o
-gspca_spca501-objs := spca501.o
-gspca_spca505-objs := spca505.o
-gspca_spca506-objs := spca506.o
-gspca_spca508-objs := spca508.o
-gspca_spca561-objs := spca561.o
-gspca_stk014-objs := stk014.o
-gspca_sunplus-objs := sunplus.o
-gspca_t613-objs := t613.o
-gspca_tv8532-objs := tv8532.o
-gspca_vc032x-objs := vc032x.o
-gspca_zc3xx-objs := zc3xx.o
diff --git a/drivers/media/video/gspca/conex.c b/drivers/media/video/gspca/conex.c
index 4d9f4cc255a9..a9d51ba7c57c 100644
--- a/drivers/media/video/gspca/conex.c
+++ b/drivers/media/video/gspca/conex.c
@@ -837,12 +837,13 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         cx11646_initsize(gspca_dev);
         cx11646_fw(gspca_dev);
         cx_sensor(gspca_dev);
         cx11646_jpeg(gspca_dev);
+        return 0;
 }
 
 static void sd_stop0(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/etoms.c b/drivers/media/video/gspca/etoms.c
index 4ff0e386914b..3be30b420a26 100644
--- a/drivers/media/video/gspca/etoms.c
+++ b/drivers/media/video/gspca/etoms.c
@@ -691,7 +691,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
 }
 
 /* -- start the camera -- */
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
@@ -704,6 +704,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
 
         reg_w_val(gspca_dev, ET_RESET_ALL, 0x08);
         et_video(gspca_dev, 1);         /* video on */
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/finepix.c b/drivers/media/video/gspca/finepix.c
new file mode 100644
index 000000000000..65d3cbfe6b27
--- /dev/null
+++ b/drivers/media/video/gspca/finepix.c
@@ -0,0 +1,466 @@
+/*
+ * Fujifilm Finepix subdriver
+ *
+ * Copyright (C) 2008 Frank Zago
+ *
+ * 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
+ * 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
+ */
+
+#define MODULE_NAME "finepix"
+
+#include "gspca.h"
+
+MODULE_AUTHOR("Frank Zago <frank@zago.net>");
+MODULE_DESCRIPTION("Fujifilm FinePix USB V4L2 driver");
+MODULE_LICENSE("GPL");
+
+/* Default timeout, in ms */
+#define FPIX_TIMEOUT (HZ / 10)
+
+/* Maximum transfer size to use. The windows driver reads by chunks of
+ * 0x2000 bytes, so do the same. Note: reading more seems to work
+ * too. */
+#define FPIX_MAX_TRANSFER 0x2000
+
+/* Structure to hold all of our device specific stuff */
+struct usb_fpix {
+        struct gspca_dev gspca_dev;     /* !! must be the first item */
+
+        /*
+         * USB stuff
+         */
+        struct usb_ctrlrequest ctrlreq;
+        struct urb *control_urb;
+        struct timer_list bulk_timer;
+
+        enum {
+                FPIX_NOP,       /* inactive, else streaming */
+                FPIX_RESET,     /* must reset */
+                FPIX_REQ_FRAME, /* requesting a frame */
+                FPIX_READ_FRAME,        /* reading frame */
+        } state;
+
+        /*
+         * Driver stuff
+         */
+        struct delayed_work wqe;
+        struct completion can_close;
+        int streaming;
+};
+
+/* Delay after which claim the next frame. If the delay is too small,
+ * the camera will return old frames. On the 4800Z, 20ms is bad, 25ms
+ * will fail every 4 or 5 frames, but 30ms is perfect. */
+#define NEXT_FRAME_DELAY  (((HZ * 30) + 999) / 1000)
+
+#define dev_new_state(new_state) {                              \
+                PDEBUG(D_STREAM, "new state from %d to %d at %s:%d",    \
+                        dev->state, new_state, __func__, __LINE__);     \
+                dev->state = new_state;                                 \
+}
+
+/* These cameras only support 320x200. */
+static struct v4l2_pix_format fpix_mode[1] = {
+        { 320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
+                .bytesperline = 320,
+                .sizeimage = 320 * 240 * 3 / 8 + 590,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 0}
+};
+
+/* Reads part of a frame */
+static void read_frame_part(struct usb_fpix *dev)
+{
+        int ret;
+
+        PDEBUG(D_STREAM, "read_frame_part");
+
+        /* Reads part of a frame */
+        ret = usb_submit_urb(dev->gspca_dev.urb[0], GFP_ATOMIC);
+        if (ret) {
+                dev_new_state(FPIX_RESET);
+                schedule_delayed_work(&dev->wqe, 1);
+                PDEBUG(D_STREAM, "usb_submit_urb failed with %d",
+                        ret);
+        } else {
+                /* Sometimes we never get a callback, so use a timer.
+                 * Is this masking a bug somewhere else? */
+                dev->bulk_timer.expires = jiffies + msecs_to_jiffies(150);
+                add_timer(&dev->bulk_timer);
+        }
+}
+
+/* Callback for URBs. */
+static void urb_callback(struct urb *urb)
+{
+        struct gspca_dev *gspca_dev = urb->context;
+        struct usb_fpix *dev = (struct usb_fpix *) gspca_dev;
+
+        PDEBUG(D_PACK,
+                "enter urb_callback - status=%d, length=%d",
+                urb->status, urb->actual_length);
+
+        if (dev->state == FPIX_READ_FRAME)
+                del_timer(&dev->bulk_timer);
+
+        if (urb->status != 0) {
+                /* We kill a stuck urb every 50 frames on average, so don't
+                 * display a log message for that. */
+                if (urb->status != -ECONNRESET)
+                        PDEBUG(D_STREAM, "bad URB status %d", urb->status);
+                dev_new_state(FPIX_RESET);
+                schedule_delayed_work(&dev->wqe, 1);
+        }
+
+        switch (dev->state) {
+        case FPIX_REQ_FRAME:
+                dev_new_state(FPIX_READ_FRAME);
+                read_frame_part(dev);
+                break;
+
+        case FPIX_READ_FRAME: {
+                unsigned char *data = urb->transfer_buffer;
+                struct gspca_frame *frame;
+
+                frame = gspca_get_i_frame(&dev->gspca_dev);
+                if (frame == NULL)
+                        gspca_dev->last_packet_type = DISCARD_PACKET;
+                if (urb->actual_length < FPIX_MAX_TRANSFER ||
+                        (data[urb->actual_length-2] == 0xff &&
+                                data[urb->actual_length-1] == 0xd9)) {
+
+                        /* If the result is less than what was asked
+                         * for, then it's the end of the
+                         * frame. Sometime the jpeg is not complete,
+                         * but there's nothing we can do. We also end
+                         * here if the the jpeg ends right at the end
+                         * of the frame. */
+                        if (frame)
+                                gspca_frame_add(gspca_dev, LAST_PACKET,
+                                                frame,
+                                                data, urb->actual_length);
+                        dev_new_state(FPIX_REQ_FRAME);
+                        schedule_delayed_work(&dev->wqe, NEXT_FRAME_DELAY);
+                } else {
+
+                        /* got a partial image */
+                        if (frame)
+                                gspca_frame_add(gspca_dev,
+                                                gspca_dev->last_packet_type
+                                                                == LAST_PACKET
+                                                ? FIRST_PACKET : INTER_PACKET,
+                                                frame,
+                                        data, urb->actual_length);
+                        read_frame_part(dev);
+                }
+                break;
+            }
+
+        case FPIX_NOP:
+        case FPIX_RESET:
+                PDEBUG(D_STREAM, "invalid state %d", dev->state);
+                break;
+        }
+}
+
+/* Request a new frame */
+static void request_frame(struct usb_fpix *dev)
+{
+        int ret;
+        struct gspca_dev *gspca_dev = &dev->gspca_dev;
+
+        /* Setup command packet */
+        memset(gspca_dev->usb_buf, 0, 12);
+        gspca_dev->usb_buf[0] = 0xd3;
+        gspca_dev->usb_buf[7] = 0x01;
+
+        /* Request a frame */
+        dev->ctrlreq.bRequestType =
+                USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE;
+        dev->ctrlreq.bRequest = USB_REQ_GET_STATUS;
+        dev->ctrlreq.wValue = 0;
+        dev->ctrlreq.wIndex = 0;
+        dev->ctrlreq.wLength = cpu_to_le16(12);
+
+        usb_fill_control_urb(dev->control_urb,
+                             gspca_dev->dev,
+                             usb_sndctrlpipe(gspca_dev->dev, 0),
+                             (unsigned char *) &dev->ctrlreq,
+                             gspca_dev->usb_buf,
+                             12, urb_callback, gspca_dev);
+
+        ret = usb_submit_urb(dev->control_urb, GFP_ATOMIC);
+        if (ret) {
+                dev_new_state(FPIX_RESET);
+                schedule_delayed_work(&dev->wqe, 1);
+                PDEBUG(D_STREAM, "usb_submit_urb failed with %d", ret);
+        }
+}
+
+/*--------------------------------------------------------------------------*/
+
+/* State machine. */
+static void fpix_sm(struct work_struct *work)
+{
+        struct usb_fpix *dev = container_of(work, struct usb_fpix, wqe.work);
+
+        PDEBUG(D_STREAM, "fpix_sm state %d", dev->state);
+
+        /* verify that the device wasn't unplugged */
+        if (!dev->gspca_dev.present) {
+                PDEBUG(D_STREAM, "device is gone");
+                dev_new_state(FPIX_NOP);
+                complete(&dev->can_close);
+                return;
+        }
+
+        if (!dev->streaming) {
+                PDEBUG(D_STREAM, "stopping state machine");
+                dev_new_state(FPIX_NOP);
+                complete(&dev->can_close);
+                return;
+        }
+
+        switch (dev->state) {
+        case FPIX_RESET:
+                dev_new_state(FPIX_REQ_FRAME);
+                schedule_delayed_work(&dev->wqe, HZ / 10);
+                break;
+
+        case FPIX_REQ_FRAME:
+                /* get an image */
+                request_frame(dev);
+                break;
+
+        case FPIX_NOP:
+        case FPIX_READ_FRAME:
+                PDEBUG(D_STREAM, "invalid state %d", dev->state);
+                break;
+        }
+}
+
+/* this function is called at probe time */
+static int sd_config(struct gspca_dev *gspca_dev,
+                const struct usb_device_id *id)
+{
+        struct cam *cam = &gspca_dev->cam;
+
+        cam->cam_mode = fpix_mode;
+        cam->nmodes = 1;
+        cam->epaddr = 0x01;     /* todo: correct for all cams? */
+        cam->bulk_size = FPIX_MAX_TRANSFER;
+
+/*      gspca_dev->nbalt = 1;    * use bulk transfer */
+        return 0;
+}
+
+/* Stop streaming and free the ressources allocated by sd_start. */
+static void sd_stopN(struct gspca_dev *gspca_dev)
+{
+        struct usb_fpix *dev = (struct usb_fpix *) gspca_dev;
+
+        dev->streaming = 0;
+
+        /* Stop the state machine */
+        if (dev->state != FPIX_NOP)
+                wait_for_completion(&dev->can_close);
+
+        usb_free_urb(dev->control_urb);
+        dev->control_urb = NULL;
+}
+
+/* Kill an URB that hasn't completed. */
+static void timeout_kill(unsigned long data)
+{
+        struct urb *urb = (struct urb *) data;
+
+        usb_unlink_urb(urb);
+}
+
+/* this function is called at probe and resume time */
+static int sd_init(struct gspca_dev *gspca_dev)
+{
+        struct usb_fpix *dev = (struct usb_fpix *) gspca_dev;
+
+        INIT_DELAYED_WORK(&dev->wqe, fpix_sm);
+
+        init_timer(&dev->bulk_timer);
+        dev->bulk_timer.function = timeout_kill;
+
+        return 0;
+}
+
+static int sd_start(struct gspca_dev *gspca_dev)
+{
+        struct usb_fpix *dev = (struct usb_fpix *) gspca_dev;
+        int ret;
+        int size_ret;
+
+        /* Reset bulk in endpoint */
+        usb_clear_halt(gspca_dev->dev, gspca_dev->cam.epaddr);
+
+        /* Init the device */
+        memset(gspca_dev->usb_buf, 0, 12);
+        gspca_dev->usb_buf[0] = 0xc6;
+        gspca_dev->usb_buf[8] = 0x20;
+
+        ret = usb_control_msg(gspca_dev->dev,
+                        usb_sndctrlpipe(gspca_dev->dev, 0),
+                        USB_REQ_GET_STATUS,
+                        USB_DIR_OUT | USB_TYPE_CLASS |
+                        USB_RECIP_INTERFACE, 0, 0, gspca_dev->usb_buf,
+                        12, FPIX_TIMEOUT);
+
+        if (ret != 12) {
+                PDEBUG(D_STREAM, "usb_control_msg failed (%d)", ret);
+                ret = -EIO;
+                goto error;
+        }
+
+        /* Read the result of the command. Ignore the result, for it
+         * varies with the device. */
+        ret = usb_bulk_msg(gspca_dev->dev,
+                        usb_rcvbulkpipe(gspca_dev->dev,
+                                        gspca_dev->cam.epaddr),
+                        gspca_dev->usb_buf, FPIX_MAX_TRANSFER, &size_ret,
+                        FPIX_TIMEOUT);
+        if (ret != 0) {
+                PDEBUG(D_STREAM, "usb_bulk_msg failed (%d)", ret);
+                ret = -EIO;
+                goto error;
+        }
+
+        /* Request a frame, but don't read it */
+        memset(gspca_dev->usb_buf, 0, 12);
+        gspca_dev->usb_buf[0] = 0xd3;
+        gspca_dev->usb_buf[7] = 0x01;
+
+        ret = usb_control_msg(gspca_dev->dev,
+                        usb_sndctrlpipe(gspca_dev->dev, 0),
+                        USB_REQ_GET_STATUS,
+                        USB_DIR_OUT | USB_TYPE_CLASS |
+                        USB_RECIP_INTERFACE, 0, 0, gspca_dev->usb_buf,
+                        12, FPIX_TIMEOUT);
+        if (ret != 12) {
+                PDEBUG(D_STREAM, "usb_control_msg failed (%d)", ret);
+                ret = -EIO;
+                goto error;
+        }
+
+        /* Again, reset bulk in endpoint */
+        usb_clear_halt(gspca_dev->dev, gspca_dev->cam.epaddr);
+
+        /* Allocate a control URB */
+        dev->control_urb = usb_alloc_urb(0, GFP_KERNEL);
+        if (!dev->control_urb) {
+                PDEBUG(D_STREAM, "No free urbs available");
+                ret = -EIO;
+                goto error;
+        }
+
+        /* Various initializations. */
+        init_completion(&dev->can_close);
+        dev->bulk_timer.data = (unsigned long)dev->gspca_dev.urb[0];
+        dev->gspca_dev.urb[0]->complete = urb_callback;
+        dev->streaming = 1;
+
+        /* Schedule a frame request. */
+        dev_new_state(FPIX_REQ_FRAME);
+        schedule_delayed_work(&dev->wqe, 1);
+
+        return 0;
+
+error:
+        /* Free the ressources */
+        sd_stopN(gspca_dev);
+        return ret;
+}
+
+/* Table of supported USB devices */
+static const __devinitdata struct usb_device_id device_table[] = {
+        {USB_DEVICE(0x04cb, 0x0104)},
+        {USB_DEVICE(0x04cb, 0x0109)},
+        {USB_DEVICE(0x04cb, 0x010b)},
+        {USB_DEVICE(0x04cb, 0x010f)},
+        {USB_DEVICE(0x04cb, 0x0111)},
+        {USB_DEVICE(0x04cb, 0x0113)},
+        {USB_DEVICE(0x04cb, 0x0115)},
+        {USB_DEVICE(0x04cb, 0x0117)},
+        {USB_DEVICE(0x04cb, 0x0119)},
+        {USB_DEVICE(0x04cb, 0x011b)},
+        {USB_DEVICE(0x04cb, 0x011d)},
+        {USB_DEVICE(0x04cb, 0x0121)},
+        {USB_DEVICE(0x04cb, 0x0123)},
+        {USB_DEVICE(0x04cb, 0x0125)},
+        {USB_DEVICE(0x04cb, 0x0127)},
+        {USB_DEVICE(0x04cb, 0x0129)},
+        {USB_DEVICE(0x04cb, 0x012b)},
+        {USB_DEVICE(0x04cb, 0x012d)},
+        {USB_DEVICE(0x04cb, 0x012f)},
+        {USB_DEVICE(0x04cb, 0x0131)},
+        {USB_DEVICE(0x04cb, 0x013b)},
+        {USB_DEVICE(0x04cb, 0x013d)},
+        {USB_DEVICE(0x04cb, 0x013f)},
+        {}
+};
+
+MODULE_DEVICE_TABLE(usb, device_table);
+
+/* sub-driver description */
+static const struct sd_desc sd_desc = {
+        .name = MODULE_NAME,
+        .config = sd_config,
+        .init = sd_init,
+        .start = sd_start,
+        .stopN = sd_stopN,
+};
+
+/* -- device connect -- */
+static int sd_probe(struct usb_interface *intf,
+                const struct usb_device_id *id)
+{
+        return gspca_dev_probe(intf, id,
+                        &sd_desc,
+                        sizeof(struct usb_fpix),
+                        THIS_MODULE);
+}
+
+static struct usb_driver sd_driver = {
+        .name = MODULE_NAME,
+        .id_table = device_table,
+        .probe = sd_probe,
+        .disconnect = gspca_disconnect,
+#ifdef CONFIG_PM
+        .suspend = gspca_suspend,
+        .resume = gspca_resume,
+#endif
+};
+
+/* -- module insert / remove -- */
+static int __init sd_mod_init(void)
+{
+        if (usb_register(&sd_driver) < 0)
+                return -1;
+        PDEBUG(D_PROBE, "registered");
+        return 0;
+}
+static void __exit sd_mod_exit(void)
+{
+        usb_deregister(&sd_driver);
+        PDEBUG(D_PROBE, "deregistered");
+}
+
+module_init(sd_mod_init);
+module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index ac95c55887df..c21af312ee7c 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -29,6 +29,7 @@
 #include <linux/string.h>
 #include <linux/pagemap.h>
 #include <linux/io.h>
+#include <linux/kref.h>
 #include <asm/page.h>
 #include <linux/uaccess.h>
 #include <linux/jiffies.h>
@@ -43,7 +44,7 @@ MODULE_AUTHOR("Jean-Francois Moine <http://moinejf.free.fr>");
 MODULE_DESCRIPTION("GSPCA USB Camera Driver");
 MODULE_LICENSE("GPL");
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 2, 0)
+#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 3, 0)
 
 static int video_nr = -1;
 
@@ -102,6 +103,22 @@ static struct vm_operations_struct gspca_vm_ops = {
         .close          = gspca_vm_close,
 };
 
+/* get the current input frame buffer */
+struct gspca_frame *gspca_get_i_frame(struct gspca_dev *gspca_dev)
+{
+        struct gspca_frame *frame;
+        int i;
+
+        i = gspca_dev->fr_i;
+        i = gspca_dev->fr_queue[i];
+        frame = &gspca_dev->frame[i];
+        if ((frame->v4l2_buf.flags & BUF_ALL_FLAGS)
+                                != V4L2_BUF_FLAG_QUEUED)
+                return NULL;
+        return frame;
+}
+EXPORT_SYMBOL(gspca_get_i_frame);
+
 /*
  * fill a video frame from an URB and resubmit
  */
@@ -110,7 +127,7 @@ static void fill_frame(struct gspca_dev *gspca_dev,
 {
         struct gspca_frame *frame;
         __u8 *data;             /* address of data in the iso message */
-        int i, j, len, st;
+        int i, len, st;
         cam_pkt_op pkt_scan;
 
         if (urb->status != 0) {
@@ -124,11 +141,8 @@ static void fill_frame(struct gspca_dev *gspca_dev,
         for (i = 0; i < urb->number_of_packets; i++) {
 
                 /* check the availability of the frame buffer */
-                j = gspca_dev->fr_i;
-                j = gspca_dev->fr_queue[j];
-                frame = &gspca_dev->frame[j];
-                if ((frame->v4l2_buf.flags & BUF_ALL_FLAGS)
-                                        != V4L2_BUF_FLAG_QUEUED) {
+                frame = gspca_get_i_frame(gspca_dev);
+                if (!frame) {
                         gspca_dev->last_packet_type = DISCARD_PACKET;
                         break;
                 }
@@ -178,6 +192,39 @@ static void isoc_irq(struct urb *urb
 }
 
 /*
+ * bulk message interrupt from the USB device
+ */
+static void bulk_irq(struct urb *urb
+)
+{
+        struct gspca_dev *gspca_dev = (struct gspca_dev *) urb->context;
+        struct gspca_frame *frame;
+
+        PDEBUG(D_PACK, "bulk irq");
+        if (!gspca_dev->streaming)
+                return;
+        if (urb->status != 0 && urb->status != -ECONNRESET) {
+#ifdef CONFIG_PM
+                if (!gspca_dev->frozen)
+#endif
+                        PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status);
+                return;         /* disconnection ? */
+        }
+
+        /* check the availability of the frame buffer */
+        frame = gspca_get_i_frame(gspca_dev);
+        if (!frame) {
+                gspca_dev->last_packet_type = DISCARD_PACKET;
+        } else {
+                PDEBUG(D_PACK, "packet l:%d", urb->actual_length);
+                gspca_dev->sd_desc->pkt_scan(gspca_dev,
+                                        frame,
+                                        urb->transfer_buffer,
+                                        urb->actual_length);
+        }
+}
+
+/*
  * add data to the current frame
  *
  * This function is called by the subdrivers at interrupt level.
@@ -190,7 +237,7 @@ static void isoc_irq(struct urb *urb
  * On LAST_PACKET, a new frame is returned.
  */
 struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev,
-                                    int packet_type,
+                                    enum gspca_packet_type packet_type,
                                     struct gspca_frame *frame,
                                     const __u8 *data,
                                     int len)
@@ -232,7 +279,7 @@ struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev,
         }
         gspca_dev->last_packet_type = packet_type;
 
-        /* if last packet, wake the application and advance in the queue */
+        /* if last packet, wake up the application and advance in the queue */
         if (packet_type == LAST_PACKET) {
                 frame->v4l2_buf.bytesused = frame->data_end - frame->data;
                 frame->v4l2_buf.flags &= ~V4L2_BUF_FLAG_QUEUED;
@@ -270,7 +317,6 @@ static void *rvmalloc(unsigned long size)
         void *mem;
         unsigned long adr;
 
-/*      size = PAGE_ALIGN(size);        (already done) */
         mem = vmalloc_32(size);
         if (mem != NULL) {
                 adr = (unsigned long) mem;
@@ -374,10 +420,11 @@ static void destroy_urbs(struct gspca_dev *gspca_dev)
 }
 
 /*
- * search an input isochronous endpoint in an alternate setting
+ * look for an input transfer endpoint in an alternate setting
  */
-static struct usb_host_endpoint *alt_isoc(struct usb_host_interface *alt,
-                                          __u8 epaddr)
+static struct usb_host_endpoint *alt_xfer(struct usb_host_interface *alt,
+                                          __u8 epaddr,
+                                          __u8 xfer)
 {
         struct usb_host_endpoint *ep;
         int i, attr;
@@ -388,7 +435,7 @@ static struct usb_host_endpoint *alt_isoc(struct usb_host_interface *alt,
                 if (ep->desc.bEndpointAddress == epaddr) {
                         attr = ep->desc.bmAttributes
                                                 & USB_ENDPOINT_XFERTYPE_MASK;
-                        if (attr == USB_ENDPOINT_XFER_ISOC)
+                        if (attr == xfer)
                                 return ep;
                         break;
                 }
@@ -397,14 +444,14 @@ static struct usb_host_endpoint *alt_isoc(struct usb_host_interface *alt,
 }
 
 /*
- * search an input isochronous endpoint
+ * look for an input (isoc or bulk) endpoint
  *
  * The endpoint is defined by the subdriver.
  * Use only the first isoc (some Zoran - 0x0572:0x0001 - have two such ep).
  * This routine may be called many times when the bandwidth is too small
  * (the bandwidth is checked on urb submit).
  */
-static struct usb_host_endpoint *get_isoc_ep(struct gspca_dev *gspca_dev)
+static struct usb_host_endpoint *get_ep(struct gspca_dev *gspca_dev)
 {
         struct usb_interface *intf;
         struct usb_host_endpoint *ep;
@@ -413,28 +460,41 @@ static struct usb_host_endpoint *get_isoc_ep(struct gspca_dev *gspca_dev)
         intf = usb_ifnum_to_if(gspca_dev->dev, gspca_dev->iface);
         ep = NULL;
         i = gspca_dev->alt;                     /* previous alt setting */
+
+        /* try isoc */
         while (--i > 0) {                       /* alt 0 is unusable */
-                ep = alt_isoc(&intf->altsetting[i], gspca_dev->cam.epaddr);
+                ep = alt_xfer(&intf->altsetting[i],
+                                gspca_dev->cam.epaddr,
+                                USB_ENDPOINT_XFER_ISOC);
                 if (ep)
                         break;
         }
+
+        /* if no isoc, try bulk */
         if (ep == NULL) {
-                err("no ISOC endpoint found");
-                return NULL;
+                ep = alt_xfer(&intf->altsetting[0],
+                                gspca_dev->cam.epaddr,
+                                USB_ENDPOINT_XFER_BULK);
+                if (ep == NULL) {
+                        err("no transfer endpoint found");
+                        return NULL;
+                }
         }
-        PDEBUG(D_STREAM, "use ISOC alt %d ep 0x%02x",
+        PDEBUG(D_STREAM, "use alt %d ep 0x%02x",
                         i, ep->desc.bEndpointAddress);
-        ret = usb_set_interface(gspca_dev->dev, gspca_dev->iface, i);
-        if (ret < 0) {
-                err("set interface err %d", ret);
-                return NULL;
+        if (i > 0) {
+                ret = usb_set_interface(gspca_dev->dev, gspca_dev->iface, i);
+                if (ret < 0) {
+                        err("set interface err %d", ret);
+                        return NULL;
+                }
         }
         gspca_dev->alt = i;             /* memorize the current alt setting */
         return ep;
 }
 
 /*
- * create the isochronous URBs
+ * create the URBs for image transfer
  */
 static int create_urbs(struct gspca_dev *gspca_dev,
                         struct usb_host_endpoint *ep)
@@ -445,15 +505,27 @@ static int create_urbs(struct gspca_dev *gspca_dev,
         /* calculate the packet size and the number of packets */
         psize = le16_to_cpu(ep->desc.wMaxPacketSize);
 
-        /* See paragraph 5.9 / table 5-11 of the usb 2.0 spec. */
-        psize = (psize & 0x07ff) * (1 + ((psize >> 11) & 3));
-        npkt = ISO_MAX_SIZE / psize;
-        if (npkt > ISO_MAX_PKT)
-                npkt = ISO_MAX_PKT;
-        bsize = psize * npkt;
-        PDEBUG(D_STREAM,
-                "isoc %d pkts size %d (bsize:%d)", npkt, psize, bsize);
-        nurbs = DEF_NURBS;
+        if (gspca_dev->alt != 0) {              /* isoc */
+
+                /* See paragraph 5.9 / table 5-11 of the usb 2.0 spec. */
+                psize = (psize & 0x07ff) * (1 + ((psize >> 11) & 3));
+                npkt = ISO_MAX_SIZE / psize;
+                if (npkt > ISO_MAX_PKT)
+                        npkt = ISO_MAX_PKT;
+                bsize = psize * npkt;
+                PDEBUG(D_STREAM,
+                        "isoc %d pkts size %d = bsize:%d",
+                        npkt, psize, bsize);
+                nurbs = DEF_NURBS;
+        } else {                                /* bulk */
+                npkt = 0;
+                bsize = gspca_dev->cam. bulk_size;
+                if (bsize == 0)
+                        bsize = psize;
+                PDEBUG(D_STREAM, "bulk bsize:%d", bsize);
+                nurbs = 1;
+        }
+
         gspca_dev->nurbs = nurbs;
         for (n = 0; n < nurbs; n++) {
                 urb = usb_alloc_urb(npkt, GFP_KERNEL);
@@ -476,17 +548,24 @@ static int create_urbs(struct gspca_dev *gspca_dev,
                 gspca_dev->urb[n] = urb;
                 urb->dev = gspca_dev->dev;
                 urb->context = gspca_dev;
-                urb->pipe = usb_rcvisocpipe(gspca_dev->dev,
-                                            ep->desc.bEndpointAddress);
-                urb->transfer_flags = URB_ISO_ASAP
-                                        | URB_NO_TRANSFER_DMA_MAP;
-                urb->interval = ep->desc.bInterval;
-                urb->complete = isoc_irq;
-                urb->number_of_packets = npkt;
                 urb->transfer_buffer_length = bsize;
-                for (i = 0; i < npkt; i++) {
-                        urb->iso_frame_desc[i].length = psize;
-                        urb->iso_frame_desc[i].offset = psize * i;
+                if (npkt != 0) {                /* ISOC */
+                        urb->pipe = usb_rcvisocpipe(gspca_dev->dev,
+                                                    ep->desc.bEndpointAddress);
+                        urb->transfer_flags = URB_ISO_ASAP
+                                        | URB_NO_TRANSFER_DMA_MAP;
+                        urb->interval = ep->desc.bInterval;
+                        urb->complete = isoc_irq;
+                        urb->number_of_packets = npkt;
+                        for (i = 0; i < npkt; i++) {
+                                urb->iso_frame_desc[i].length = psize;
+                                urb->iso_frame_desc[i].offset = psize * i;
+                        }
+                } else {                /* bulk */
+                        urb->pipe = usb_rcvbulkpipe(gspca_dev->dev,
+                                                ep->desc.bEndpointAddress),
+                        urb->transfer_flags = URB_NO_TRANSFER_DMA_MAP;
+                        urb->complete = bulk_irq;
                 }
         }
         return 0;
@@ -508,7 +587,7 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev)
         gspca_dev->alt = gspca_dev->nbalt;
         for (;;) {
                 PDEBUG(D_STREAM, "init transfer alt %d", gspca_dev->alt);
-                ep = get_isoc_ep(gspca_dev);
+                ep = get_ep(gspca_dev);
                 if (ep == NULL) {
                         ret = -EIO;
                         goto out;
@@ -518,10 +597,18 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev)
                         goto out;
 
                 /* start the cam */
-                gspca_dev->sd_desc->start(gspca_dev);
+                ret = gspca_dev->sd_desc->start(gspca_dev);
+                if (ret < 0) {
+                        destroy_urbs(gspca_dev);
+                        goto out;
+                }
                 gspca_dev->streaming = 1;
                 atomic_set(&gspca_dev->nevent, 0);
 
+                /* bulk transfers are started by the subdriver */
+                if (gspca_dev->alt == 0)
+                        break;
+
                 /* submit the URBs */
                 for (n = 0; n < gspca_dev->nurbs; n++) {
                         ret = usb_submit_urb(gspca_dev->urb[n], GFP_KERNEL);
@@ -553,7 +640,7 @@ static int gspca_set_alt0(struct gspca_dev *gspca_dev)
         return ret;
 }
 
-/* Note both the queue and the usb lock should be hold when calling this */
+/* Note: both the queue and the usb locks should be held when calling this */
 static void gspca_stream_off(struct gspca_dev *gspca_dev)
 {
         gspca_dev->streaming = 0;
@@ -759,6 +846,16 @@ out:
         return ret;
 }
 
+static void gspca_delete(struct kref *kref)
+{
+        struct gspca_dev *gspca_dev = container_of(kref, struct gspca_dev, kref);
+
+        PDEBUG(D_STREAM, "device deleted");
+
+        kfree(gspca_dev->usb_buf);
+        kfree(gspca_dev);
+}
+
 static int dev_open(struct inode *inode, struct file *file)
 {
         struct gspca_dev *gspca_dev;
@@ -778,13 +875,19 @@ static int dev_open(struct inode *inode, struct file *file)
                 goto out;
         }
         gspca_dev->users++;
+
+        /* one more user */
+        kref_get(&gspca_dev->kref);
+
         file->private_data = gspca_dev;
 #ifdef GSPCA_DEBUG
         /* activate the v4l2 debug */
         if (gspca_debug & D_V4L2)
-                gspca_dev->vdev.debug |= 3;
+                gspca_dev->vdev.debug |= V4L2_DEBUG_IOCTL
+                                        | V4L2_DEBUG_IOCTL_ARG;
         else
-                gspca_dev->vdev.debug &= ~3;
+                gspca_dev->vdev.debug &= ~(V4L2_DEBUG_IOCTL
+                                        | V4L2_DEBUG_IOCTL_ARG);
 #endif
         ret = 0;
 out:
@@ -818,7 +921,11 @@ static int dev_close(struct inode *inode, struct file *file)
         }
         file->private_data = NULL;
         mutex_unlock(&gspca_dev->queue_lock);
+
         PDEBUG(D_STREAM, "close done");
+
+        kref_put(&gspca_dev->kref, gspca_delete);
+
         return 0;
 }
 
@@ -829,7 +936,6 @@ static int vidioc_querycap(struct file *file, void  *priv,
 
         memset(cap, 0, sizeof *cap);
         strncpy(cap->driver, gspca_dev->sd_desc->name, sizeof cap->driver);
-/*      strncpy(cap->card, gspca_dev->cam.dev_name, sizeof cap->card); */
         if (gspca_dev->dev->product != NULL) {
                 strncpy(cap->card, gspca_dev->dev->product,
                         sizeof cap->card);
@@ -1463,7 +1569,6 @@ static int vidioc_qbuf(struct file *file, void *priv,
         }
 
         frame->v4l2_buf.flags |= V4L2_BUF_FLAG_QUEUED;
-/*      frame->v4l2_buf.flags &= ~V4L2_BUF_FLAG_DONE; */
 
         if (frame->v4l2_buf.memory == V4L2_MEMORY_USERPTR) {
                 frame->v4l2_buf.m.userptr = v4l2_buf->m.userptr;
@@ -1610,7 +1715,7 @@ static ssize_t dev_read(struct file *file, char __user *data,
                 }
 
                 /* if the process slept for more than 1 second,
-                 * get anewer frame */
+                 * get a newer frame */
                 frame = &gspca_dev->frame[v4l2_buf.index];
                 if (--n < 0)
                         break;                  /* avoid infinite loop */
@@ -1728,21 +1833,21 @@ int gspca_dev_probe(struct usb_interface *intf,
         if (dev_size < sizeof *gspca_dev)
                 dev_size = sizeof *gspca_dev;
         gspca_dev = kzalloc(dev_size, GFP_KERNEL);
-        if (gspca_dev == NULL) {
+        if (!gspca_dev) {
                 err("couldn't kzalloc gspca struct");
-                return -EIO;
+                return -ENOMEM;
         }
+        kref_init(&gspca_dev->kref);
         gspca_dev->usb_buf = kmalloc(USB_BUF_SZ, GFP_KERNEL);
         if (!gspca_dev->usb_buf) {
                 err("out of memory");
-                ret = -EIO;
+                ret = -ENOMEM;
                 goto out;
         }
         gspca_dev->dev = dev;
         gspca_dev->iface = interface->bInterfaceNumber;
         gspca_dev->nbalt = intf->num_altsetting;
         gspca_dev->sd_desc = sd_desc;
-/*      gspca_dev->users = 0;                   (done by kzalloc) */
         gspca_dev->nbufread = 2;
 
         /* configure the subdriver and initialize the USB device */
@@ -1781,8 +1886,7 @@ int gspca_dev_probe(struct usb_interface *intf,
         PDEBUG(D_PROBE, "probe ok");
         return 0;
 out:
-        kfree(gspca_dev->usb_buf);
-        kfree(gspca_dev);
+        kref_put(&gspca_dev->kref, gspca_delete);
         return ret;
 }
 EXPORT_SYMBOL(gspca_dev_probe);
@@ -1797,25 +1901,16 @@ void gspca_disconnect(struct usb_interface *intf)
 {
         struct gspca_dev *gspca_dev = usb_get_intfdata(intf);
 
-        if (!gspca_dev)
-                return;
-        gspca_dev->present = 0;
-        mutex_lock(&gspca_dev->queue_lock);
-        mutex_lock(&gspca_dev->usb_lock);
-        gspca_dev->streaming = 0;
-        destroy_urbs(gspca_dev);
-        mutex_unlock(&gspca_dev->usb_lock);
-        mutex_unlock(&gspca_dev->queue_lock);
-        while (gspca_dev->users != 0) {         /* wait until fully closed */
-                atomic_inc(&gspca_dev->nevent);
-                wake_up_interruptible(&gspca_dev->wq);  /* wake processes */
-                schedule();
-        }
+        usb_set_intfdata(intf, NULL);
+
 /* We don't want people trying to open up the device */
         video_unregister_device(&gspca_dev->vdev);
-/* Free the memory */
-        kfree(gspca_dev->usb_buf);
-        kfree(gspca_dev);
+
+        gspca_dev->present = 0;
+        gspca_dev->streaming = 0;
+
+        kref_put(&gspca_dev->kref, gspca_delete);
+
         PDEBUG(D_PROBE, "disconnect complete");
 }
 EXPORT_SYMBOL(gspca_disconnect);
diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h
index c17625cff9ba..4779dd0b06da 100644
--- a/drivers/media/video/gspca/gspca.h
+++ b/drivers/media/video/gspca/gspca.h
@@ -49,13 +49,14 @@ extern int gspca_debug;
         } while (0)
 
 #define GSPCA_MAX_FRAMES 16     /* maximum number of video frame buffers */
-/* ISOC transfers */
-#define MAX_NURBS 16            /* max number of URBs */
+/* image transfers */
+#define MAX_NURBS 4             /* max number of URBs */
 #define ISO_MAX_PKT 32          /* max number of packets in an ISOC transfer */
 #define ISO_MAX_SIZE 0x8000     /* max size of one URB buffer (32 Kb) */
 
 /* device information - set at probe time */
 struct cam {
+        int bulk_size;          /* buffer size when image transfer by bulk */
         struct v4l2_pix_format *cam_mode;       /* size nmodes */
         char nmodes;
         __u8 epaddr;
@@ -93,7 +94,7 @@ struct sd_desc {
 /* mandatory operations */
         cam_cf_op config;       /* called on probe */
         cam_op init;            /* called on probe and resume */
-        cam_v_op start;         /* called on stream on */
+        cam_op start;           /* called on stream on */
         cam_pkt_op pkt_scan;
 /* optional operations */
         cam_v_op stopN;         /* called on stream off - main alt */
@@ -105,10 +106,12 @@ struct sd_desc {
 };
 
 /* packet types when moving from iso buf to frame buf */
-#define DISCARD_PACKET  0
-#define FIRST_PACKET    1
-#define INTER_PACKET    2
-#define LAST_PACKET     3
+enum gspca_packet_type {
+        DISCARD_PACKET,
+        FIRST_PACKET,
+        INTER_PACKET,
+        LAST_PACKET
+};
 
 struct gspca_frame {
         __u8 *data;                     /* frame buffer */
@@ -121,6 +124,7 @@ struct gspca_dev {
         struct video_device vdev;       /* !! must be the first item */
         struct file_operations fops;
         struct usb_device *dev;
+        struct kref kref;
         struct file *capt_file;         /* file doing video capture */
 
         struct cam cam;                         /* device information */
@@ -173,10 +177,11 @@ int gspca_dev_probe(struct usb_interface *intf,
                 struct module *module);
 void gspca_disconnect(struct usb_interface *intf);
 struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev,
-                                    int packet_type,
+                                    enum gspca_packet_type packet_type,
                                     struct gspca_frame *frame,
                                     const __u8 *data,
                                     int len);
+struct gspca_frame *gspca_get_i_frame(struct gspca_dev *gspca_dev);
 #ifdef CONFIG_PM
 int gspca_suspend(struct usb_interface *intf, pm_message_t message);
 int gspca_resume(struct usb_interface *intf);
diff --git a/drivers/media/video/gspca/m5602/Kconfig b/drivers/media/video/gspca/m5602/Kconfig
new file mode 100644
index 000000000000..5a69016ed75f
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/Kconfig
@@ -0,0 +1,11 @@
+config USB_M5602
+        tristate "ALi USB m5602 Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+          Say Y here if you want support for cameras based on the
+          ALi m5602 connected to various image sensors.
+
+          See <file:Documentation/video4linux/m5602.txt> for more info.
+
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_m5602.
diff --git a/drivers/media/video/gspca/m5602/Makefile b/drivers/media/video/gspca/m5602/Makefile
new file mode 100644
index 000000000000..226ab4fc9d60
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/Makefile
@@ -0,0 +1,11 @@
+obj-$(CONFIG_USB_M5602) += gspca_m5602.o
+
+gspca_m5602-objs := m5602_core.o \
+                    m5602_ov9650.o \
+                    m5602_mt9m111.o \
+                    m5602_po1030.o \
+                    m5602_s5k83a.o \
+                    m5602_s5k4aa.o
+
+EXTRA_CFLAGS += -Idrivers/media/video/gspca
+
diff --git a/drivers/media/video/gspca/m5602/m5602_bridge.h b/drivers/media/video/gspca/m5602/m5602_bridge.h
new file mode 100644
index 000000000000..c786d7d3d44a
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_bridge.h
@@ -0,0 +1,170 @@
+/*
+ * USB Driver for ALi m5602 based webcams
+ *
+ * Copyright (C) 2008 Erik Andren
+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (C) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * 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.
+ *
+ */
+
+#ifndef M5602_BRIDGE_H_
+#define M5602_BRIDGE_H_
+
+#include "gspca.h"
+
+#define MODULE_NAME "ALi m5602"
+
+/*****************************************************************************/
+
+#undef PDEBUG
+#undef info
+#undef err
+
+#define err(format, arg...) printk(KERN_ERR KBUILD_MODNAME ": " \
+        format "\n" , ## arg)
+#define info(format, arg...) printk(KERN_INFO KBUILD_MODNAME ": " \
+        format "\n" , ## arg)
+
+/* Debug parameters */
+#define DBG_INIT 0x1
+#define DBG_PROBE 0x2
+#define DBG_V4L2 0x4
+#define DBG_TRACE 0x8
+#define DBG_DATA 0x10
+#define DBG_V4L2_CID 0x20
+#define DBG_GSPCA 0x40
+
+#define PDEBUG(level, fmt, args...) \
+        do { \
+                if (m5602_debug & level)     \
+                        info("[%s:%d] " fmt, __func__, __LINE__ , \
+                        ## args); \
+        } while (0)
+
+/*****************************************************************************/
+
+#define M5602_XB_SENSOR_TYPE 0x00
+#define M5602_XB_SENSOR_CTRL 0x01
+#define M5602_XB_LINE_OF_FRAME_H 0x02
+#define M5602_XB_LINE_OF_FRAME_L 0x03
+#define M5602_XB_PIX_OF_LINE_H 0x04
+#define M5602_XB_PIX_OF_LINE_L 0x05
+#define M5602_XB_VSYNC_PARA 0x06
+#define M5602_XB_HSYNC_PARA 0x07
+#define M5602_XB_TEST_MODE_1 0x08
+#define M5602_XB_TEST_MODE_2 0x09
+#define M5602_XB_SIG_INI 0x0a
+#define M5602_XB_DS_PARA 0x0e
+#define M5602_XB_TRIG_PARA 0x0f
+#define M5602_XB_CLK_PD 0x10
+#define M5602_XB_MCU_CLK_CTRL 0x12
+#define M5602_XB_MCU_CLK_DIV 0x13
+#define M5602_XB_SEN_CLK_CTRL 0x14
+#define M5602_XB_SEN_CLK_DIV 0x15
+#define M5602_XB_AUD_CLK_CTRL 0x16
+#define M5602_XB_AUD_CLK_DIV 0x17
+#define M5602_XB_DEVCTR1 0x41
+#define M5602_XB_EPSETR0 0x42
+#define M5602_XB_EPAFCTR 0x47
+#define M5602_XB_EPBFCTR 0x49
+#define M5602_XB_EPEFCTR 0x4f
+#define M5602_XB_TEST_REG 0x53
+#define M5602_XB_ALT2SIZE 0x54
+#define M5602_XB_ALT3SIZE 0x55
+#define M5602_XB_OBSFRAME 0x56
+#define M5602_XB_PWR_CTL 0x59
+#define M5602_XB_ADC_CTRL 0x60
+#define M5602_XB_ADC_DATA 0x61
+#define M5602_XB_MISC_CTRL 0x62
+#define M5602_XB_SNAPSHOT 0x63
+#define M5602_XB_SCRATCH_1 0x64
+#define M5602_XB_SCRATCH_2 0x65
+#define M5602_XB_SCRATCH_3 0x66
+#define M5602_XB_SCRATCH_4 0x67
+#define M5602_XB_I2C_CTRL 0x68
+#define M5602_XB_I2C_CLK_DIV 0x69
+#define M5602_XB_I2C_DEV_ADDR 0x6a
+#define M5602_XB_I2C_REG_ADDR 0x6b
+#define M5602_XB_I2C_DATA 0x6c
+#define M5602_XB_I2C_STATUS 0x6d
+#define M5602_XB_GPIO_DAT_H 0x70
+#define M5602_XB_GPIO_DAT_L 0x71
+#define M5602_XB_GPIO_DIR_H 0x72
+#define M5602_XB_GPIO_DIR_L 0x73
+#define M5602_XB_GPIO_EN_H 0x74
+#define M5602_XB_GPIO_EN_L 0x75
+#define M5602_XB_GPIO_DAT 0x76
+#define M5602_XB_GPIO_DIR 0x77
+#define M5602_XB_MISC_CTL 0x70
+
+#define I2C_BUSY 0x80
+
+/*****************************************************************************/
+
+/* Driver info */
+#define DRIVER_AUTHOR "ALi m5602 Linux Driver Project"
+#define DRIVER_DESC "ALi m5602 webcam driver"
+
+#define M5602_ISOC_ENDPOINT_ADDR 0x81
+#define M5602_INTR_ENDPOINT_ADDR 0x82
+
+#define M5602_MAX_FRAMES        32
+#define M5602_URBS              2
+#define M5602_ISOC_PACKETS      14
+
+#define M5602_URB_TIMEOUT       msecs_to_jiffies(2 * M5602_ISOC_PACKETS)
+#define M5602_URB_MSG_TIMEOUT   5000
+#define M5602_FRAME_TIMEOUT     2
+
+/*****************************************************************************/
+
+/* A skeleton used for sending messages to the m5602 bridge */
+static const unsigned char bridge_urb_skeleton[] = {
+        0x13, 0x00, 0x81, 0x00
+};
+
+/* A skeleton used for sending messages to the sensor */
+static const unsigned char sensor_urb_skeleton[] = {
+        0x23, M5602_XB_GPIO_EN_H, 0x81, 0x06,
+        0x23, M5602_XB_MISC_CTRL, 0x81, 0x80,
+        0x13, M5602_XB_I2C_DEV_ADDR, 0x81, 0x00,
+        0x13, M5602_XB_I2C_REG_ADDR, 0x81, 0x00,
+        0x13, M5602_XB_I2C_DATA, 0x81, 0x00,
+        0x13, M5602_XB_I2C_CTRL, 0x81, 0x11
+};
+
+/* m5602 device descriptor, currently it just wraps the m5602_camera struct */
+struct sd {
+        struct gspca_dev gspca_dev;
+
+        /* The name of the m5602 camera */
+        char *name;
+
+        /* A pointer to the currently connected sensor */
+        struct m5602_sensor *sensor;
+
+        struct sd_desc *desc;
+
+        /* The current frame's id, used to detect frame boundaries */
+        u8 frame_id;
+
+        /* The current frame count */
+        u32 frame_count;
+};
+
+int m5602_read_bridge(
+        struct sd *sd, u8 address, u8 *i2c_data);
+
+int m5602_write_bridge(
+        struct sd *sd, u8 address, u8 i2c_data);
+
+#endif
diff --git a/drivers/media/video/gspca/m5602/m5602_core.c b/drivers/media/video/gspca/m5602/m5602_core.c
new file mode 100644
index 000000000000..19d5e351ccc1
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_core.c
@@ -0,0 +1,313 @@
+/*
+ * USB Driver for ALi m5602 based webcams
+ *
+ * Copyright (C) 2008 Erik Andren
+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (C) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * 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.
+ *
+ */
+
+#include "m5602_ov9650.h"
+#include "m5602_mt9m111.h"
+#include "m5602_po1030.h"
+#include "m5602_s5k83a.h"
+#include "m5602_s5k4aa.h"
+
+/* Kernel module parameters */
+int force_sensor;
+int dump_bridge;
+int dump_sensor;
+unsigned int m5602_debug;
+
+static const __devinitdata struct usb_device_id m5602_table[] = {
+        {USB_DEVICE(0x0402, 0x5602)},
+        {}
+};
+
+MODULE_DEVICE_TABLE(usb, m5602_table);
+
+/* Reads a byte from the m5602 */
+int m5602_read_bridge(struct sd *sd, u8 address, u8 *i2c_data)
+{
+        int err;
+        struct usb_device *udev = sd->gspca_dev.dev;
+        __u8 *buf = sd->gspca_dev.usb_buf;
+
+        err = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+                              0x04, 0xc0, 0x14,
+                              0x8100 + address, buf,
+                              1, M5602_URB_MSG_TIMEOUT);
+        *i2c_data = buf[0];
+
+        PDEBUG(DBG_TRACE, "Reading bridge register 0x%x containing 0x%x",
+               address, *i2c_data);
+
+        /* usb_control_msg(...) returns the number of bytes sent upon success,
+        mask that and return zero upon success instead*/
+        return (err < 0) ? err : 0;
+}
+
+/* Writes a byte to to the m5602 */
+int m5602_write_bridge(struct sd *sd, u8 address, u8 i2c_data)
+{
+        int err;
+        struct usb_device *udev = sd->gspca_dev.dev;
+        __u8 *buf = sd->gspca_dev.usb_buf;
+
+        PDEBUG(DBG_TRACE, "Writing bridge register 0x%x with 0x%x",
+               address, i2c_data);
+
+        memcpy(buf, bridge_urb_skeleton,
+               sizeof(bridge_urb_skeleton));
+        buf[1] = address;
+        buf[3] = i2c_data;
+
+        err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+                                0x04, 0x40, 0x19,
+                                0x0000, buf,
+                                4, M5602_URB_MSG_TIMEOUT);
+
+        /* usb_control_msg(...) returns the number of bytes sent upon success,
+           mask that and return zero upon success instead */
+        return (err < 0) ? err : 0;
+}
+
+/* Dump all the registers of the m5602 bridge,
+   unfortunately this breaks the camera until it's power cycled */
+static void m5602_dump_bridge(struct sd *sd)
+{
+        int i;
+        for (i = 0; i < 0x80; i++) {
+                unsigned char val = 0;
+                m5602_read_bridge(sd, i, &val);
+                info("ALi m5602 address 0x%x contains 0x%x", i, val);
+        }
+        info("Warning: The camera probably won't work until it's power cycled");
+}
+
+static int m5602_probe_sensor(struct sd *sd)
+{
+        /* Try the po1030 */
+        sd->sensor = &po1030;
+        if (!sd->sensor->probe(sd))
+                return 0;
+
+        /* Try the mt9m111 sensor */
+        sd->sensor = &mt9m111;
+        if (!sd->sensor->probe(sd))
+                return 0;
+
+        /* Try the s5k4aa */
+        sd->sensor = &s5k4aa;
+        if (!sd->sensor->probe(sd))
+                return 0;
+
+        /* Try the ov9650 */
+        sd->sensor = &ov9650;
+        if (!sd->sensor->probe(sd))
+                return 0;
+
+        /* Try the s5k83a */
+        sd->sensor = &s5k83a;
+        if (!sd->sensor->probe(sd))
+                return 0;
+
+        /* More sensor probe function goes here */
+        info("Failed to find a sensor");
+        sd->sensor = NULL;
+        return -ENODEV;
+}
+
+static int m5602_configure(struct gspca_dev *gspca_dev,
+                           const struct usb_device_id *id);
+
+static int m5602_init(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        int err;
+
+        PDEBUG(DBG_TRACE, "Initializing ALi m5602 webcam");
+        /* Run the init sequence */
+        err = sd->sensor->init(sd);
+
+        return err;
+}
+
+static int m5602_start_transfer(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        __u8 *buf = sd->gspca_dev.usb_buf;
+
+        /* Send start command to the camera */
+        const u8 buffer[4] = {0x13, 0xf9, 0x0f, 0x01};
+        memcpy(buf, buffer, sizeof(buffer));
+        usb_control_msg(gspca_dev->dev, usb_sndctrlpipe(gspca_dev->dev, 0),
+                        0x04, 0x40, 0x19, 0x0000, buf,
+                        4, M5602_URB_MSG_TIMEOUT);
+
+        PDEBUG(DBG_V4L2, "Transfer started");
+        return 0;
+}
+
+static void m5602_urb_complete(struct gspca_dev *gspca_dev,
+                        struct gspca_frame *frame,
+                        __u8 *data, int len)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        if (len < 6) {
+                PDEBUG(DBG_DATA, "Packet is less than 6 bytes");
+                return;
+        }
+
+        /* Frame delimiter: ff xx xx xx ff ff */
+        if (data[0] == 0xff && data[4] == 0xff && data[5] == 0xff &&
+            data[2] != sd->frame_id) {
+                PDEBUG(DBG_DATA, "Frame delimiter detected");
+                sd->frame_id = data[2];
+
+                /* Remove the extra fluff appended on each header */
+                data += 6;
+                len -= 6;
+
+                /* Complete the last frame (if any) */
+                frame = gspca_frame_add(gspca_dev, LAST_PACKET,
+                                        frame, data, 0);
+                sd->frame_count++;
+
+                /* Create a new frame */
+                gspca_frame_add(gspca_dev, FIRST_PACKET, frame, data, len);
+
+                PDEBUG(DBG_V4L2, "Starting new frame %d",
+                       sd->frame_count);
+
+        } else {
+                int cur_frame_len = frame->data_end - frame->data;
+
+                /* Remove urb header */
+                data += 4;
+                len -= 4;
+
+                if (cur_frame_len + len <= frame->v4l2_buf.length) {
+                        PDEBUG(DBG_DATA, "Continuing frame %d copying %d bytes",
+                               sd->frame_count, len);
+
+                        gspca_frame_add(gspca_dev, INTER_PACKET, frame,
+                                        data, len);
+                } else if (frame->v4l2_buf.length - cur_frame_len > 0) {
+                        /* Add the remaining data up to frame size */
+                        gspca_frame_add(gspca_dev, INTER_PACKET, frame, data,
+                                        frame->v4l2_buf.length - cur_frame_len);
+                }
+        }
+}
+
+static void m5602_stop_transfer(struct gspca_dev *gspca_dev)
+{
+        /* Is there are a command to stop a data transfer? */
+}
+
+/* sub-driver description, the ctrl and nctrl is filled at probe time */
+static struct sd_desc sd_desc = {
+        .name           = MODULE_NAME,
+        .config         = m5602_configure,
+        .init           = m5602_init,
+        .start          = m5602_start_transfer,
+        .stopN          = m5602_stop_transfer,
+        .pkt_scan       = m5602_urb_complete
+};
+
+/* this function is called at probe time */
+static int m5602_configure(struct gspca_dev *gspca_dev,
+                           const struct usb_device_id *id)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        struct cam *cam;
+        int err;
+
+        PDEBUG(DBG_GSPCA, "m5602_configure start");
+
+        cam = &gspca_dev->cam;
+        cam->epaddr = M5602_ISOC_ENDPOINT_ADDR;
+        sd->desc = &sd_desc;
+
+        if (dump_bridge)
+                m5602_dump_bridge(sd);
+
+        /* Probe sensor */
+        err = m5602_probe_sensor(sd);
+        if (err)
+                goto fail;
+
+        PDEBUG(DBG_GSPCA, "m5602_configure end");
+        return 0;
+
+fail:
+        PDEBUG(DBG_GSPCA, "m5602_configure failed");
+        cam->cam_mode = NULL;
+        cam->nmodes = 0;
+
+        return err;
+}
+
+static int m5602_probe(struct usb_interface *intf,
+                       const struct usb_device_id *id)
+{
+        return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
+                               THIS_MODULE);
+}
+
+static struct usb_driver sd_driver = {
+        .name = MODULE_NAME,
+        .id_table = m5602_table,
+        .probe = m5602_probe,
+#ifdef CONFIG_PM
+        .suspend = gspca_suspend,
+        .resume = gspca_resume,
+#endif
+        .disconnect = gspca_disconnect
+};
+
+/* -- module insert / remove -- */
+static int __init mod_m5602_init(void)
+{
+        if (usb_register(&sd_driver) < 0)
+                return -1;
+        PDEBUG(D_PROBE, "m5602 module registered");
+        return 0;
+}
+static void __exit mod_m5602_exit(void)
+{
+        usb_deregister(&sd_driver);
+        PDEBUG(D_PROBE, "m5602 module deregistered");
+}
+
+module_init(mod_m5602_init);
+module_exit(mod_m5602_exit);
+
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
+module_param_named(debug, m5602_debug, int, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "toggles debug on/off");
+
+module_param(force_sensor, int, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(force_sensor,
+                "force detection of sensor, "
+                "1 = OV9650, 2 = S5K83A, 3 = S5K4AA, 4 = MT9M111, 5 = PO1030");
+
+module_param(dump_bridge, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(dump_bridge, "Dumps all usb bridge registers at startup");
+
+module_param(dump_sensor, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(dump_sensor, "Dumps all usb sensor registers "
+                "at startup providing a sensor is found");
diff --git a/drivers/media/video/gspca/m5602/m5602_mt9m111.c b/drivers/media/video/gspca/m5602/m5602_mt9m111.c
new file mode 100644
index 000000000000..566d4925a0e8
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_mt9m111.c
@@ -0,0 +1,345 @@
+/*
+ * Driver for the mt9m111 sensor
+ *
+ * Copyright (C) 2008 Erik Andren
+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (C) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * 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.
+ *
+ */
+
+#include "m5602_mt9m111.h"
+
+int mt9m111_probe(struct sd *sd)
+{
+        u8 data[2] = {0x00, 0x00};
+        int i;
+
+        if (force_sensor) {
+                if (force_sensor == MT9M111_SENSOR) {
+                        info("Forcing a %s sensor", mt9m111.name);
+                        goto sensor_found;
+                }
+                /* If we want to force another sensor, don't try to probe this
+                 * one */
+                return -ENODEV;
+        }
+
+        info("Probing for a mt9m111 sensor");
+
+        /* Do the preinit */
+        for (i = 0; i < ARRAY_SIZE(preinit_mt9m111); i++) {
+                if (preinit_mt9m111[i][0] == BRIDGE) {
+                        m5602_write_bridge(sd,
+                                preinit_mt9m111[i][1],
+                                preinit_mt9m111[i][2]);
+                } else {
+                        data[0] = preinit_mt9m111[i][2];
+                        data[1] = preinit_mt9m111[i][3];
+                        mt9m111_write_sensor(sd,
+                                preinit_mt9m111[i][1], data, 2);
+                }
+        }
+
+        if (mt9m111_read_sensor(sd, MT9M111_SC_CHIPVER, data, 2))
+                return -ENODEV;
+
+        if ((data[0] == 0x14) && (data[1] == 0x3a)) {
+                info("Detected a mt9m111 sensor");
+                goto sensor_found;
+        }
+
+        return -ENODEV;
+
+sensor_found:
+        sd->gspca_dev.cam.cam_mode = mt9m111.modes;
+        sd->gspca_dev.cam.nmodes = mt9m111.nmodes;
+        sd->desc->ctrls = mt9m111.ctrls;
+        sd->desc->nctrls = mt9m111.nctrls;
+        return 0;
+}
+
+int mt9m111_init(struct sd *sd)
+{
+        int i, err = 0;
+
+        /* Init the sensor */
+        for (i = 0; i < ARRAY_SIZE(init_mt9m111); i++) {
+                u8 data[2];
+
+                if (init_mt9m111[i][0] == BRIDGE) {
+                        err = m5602_write_bridge(sd,
+                                init_mt9m111[i][1],
+                                init_mt9m111[i][2]);
+                } else {
+                        data[0] = init_mt9m111[i][2];
+                        data[1] = init_mt9m111[i][3];
+                        err = mt9m111_write_sensor(sd,
+                                init_mt9m111[i][1], data, 2);
+                }
+        }
+
+        if (dump_sensor)
+                mt9m111_dump_registers(sd);
+
+        return (err < 0) ? err : 0;
+}
+
+int mt9m111_power_down(struct sd *sd)
+{
+        return 0;
+}
+
+int mt9m111_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 data[2] = {0x00, 0x00};
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = mt9m111_read_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B,
+                                  data, 2);
+        *val = data[0] & MT9M111_RMB_MIRROR_ROWS;
+        PDEBUG(DBG_V4L2_CID, "Read vertical flip %d", *val);
+
+        return (err < 0) ? err : 0;
+}
+
+int mt9m111_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 data[2] = {0x00, 0x00};
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        PDEBUG(DBG_V4L2_CID, "Set vertical flip to %d", val);
+
+        /* Set the correct page map */
+        err = mt9m111_write_sensor(sd, MT9M111_PAGE_MAP, data, 2);
+        if (err < 0)
+                goto out;
+
+        err = mt9m111_read_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B, data, 2);
+        if (err < 0)
+                goto out;
+
+        data[0] = (data[0] & 0xfe) | val;
+        err = mt9m111_write_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B,
+                                   data, 2);
+out:
+        return (err < 0) ? err : 0;
+}
+
+int mt9m111_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 data[2] = {0x00, 0x00};
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = mt9m111_read_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B,
+                                  data, 2);
+        *val = data[0] & MT9M111_RMB_MIRROR_COLS;
+        PDEBUG(DBG_V4L2_CID, "Read horizontal flip %d", *val);
+
+        return (err < 0) ? err : 0;
+}
+
+int mt9m111_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 data[2] = {0x00, 0x00};
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        PDEBUG(DBG_V4L2_CID, "Set horizontal flip to %d", val);
+
+        /* Set the correct page map */
+        err = mt9m111_write_sensor(sd, MT9M111_PAGE_MAP, data, 2);
+        if (err < 0)
+                goto out;
+
+        err = mt9m111_read_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B, data, 2);
+        if (err < 0)
+                goto out;
+
+        data[0] = (data[0] & 0xfd) | ((val << 1) & 0x02);
+        err = mt9m111_write_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B,
+                                        data, 2);
+out:
+        return (err < 0) ? err : 0;
+}
+
+int mt9m111_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err, tmp;
+        u8 data[2] = {0x00, 0x00};
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = mt9m111_read_sensor(sd, MT9M111_SC_GLOBAL_GAIN, data, 2);
+        tmp = ((data[1] << 8) | data[0]);
+
+        *val = ((tmp & (1 << 10)) * 2) |
+              ((tmp & (1 <<  9)) * 2) |
+              ((tmp & (1 <<  8)) * 2) |
+               (tmp & 0x7f);
+
+        PDEBUG(DBG_V4L2_CID, "Read gain %d", *val);
+
+        return (err < 0) ? err : 0;
+}
+
+int mt9m111_set_gain(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err, tmp;
+        u8 data[2] = {0x00, 0x00};
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        /* Set the correct page map */
+        err = mt9m111_write_sensor(sd, MT9M111_PAGE_MAP, data, 2);
+        if (err < 0)
+                goto out;
+
+        if (val >= INITIAL_MAX_GAIN * 2 * 2 * 2)
+                return -EINVAL;
+
+        if ((val >= INITIAL_MAX_GAIN * 2 * 2) &&
+            (val < (INITIAL_MAX_GAIN - 1) * 2 * 2 * 2))
+                tmp = (1 << 10) | (val << 9) |
+                                (val << 8) | (val / 8);
+        else if ((val >= INITIAL_MAX_GAIN * 2) &&
+                 (val <  INITIAL_MAX_GAIN * 2 * 2))
+                tmp = (1 << 9) | (1 << 8) | (val / 4);
+        else if ((val >= INITIAL_MAX_GAIN) &&
+                 (val < INITIAL_MAX_GAIN * 2))
+                tmp = (1 << 8) | (val / 2);
+        else
+                tmp = val;
+
+        data[1] = (tmp & 0xff00) >> 8;
+        data[0] = (tmp & 0xff);
+        PDEBUG(DBG_V4L2_CID, "tmp=%d, data[1]=%d, data[0]=%d", tmp,
+               data[1], data[0]);
+
+        err = mt9m111_write_sensor(sd, MT9M111_SC_GLOBAL_GAIN,
+                                   data, 2);
+out:
+        return (err < 0) ? err : 0;
+}
+
+int mt9m111_read_sensor(struct sd *sd, const u8 address,
+                        u8 *i2c_data, const u8 len) {
+        int err, i;
+
+        do {
+                err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
+        } while ((*i2c_data & I2C_BUSY) && !err);
+        if (err < 0)
+                goto out;
+
+        err = m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,
+                                 sd->sensor->i2c_slave_id);
+        if (err < 0)
+                goto out;
+
+        err = m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address);
+        if (err < 0)
+                goto out;
+
+        err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x1a);
+        if (err < 0)
+                goto out;
+
+        for (i = 0; i < len && !err; i++) {
+                err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &(i2c_data[i]));
+
+                PDEBUG(DBG_TRACE, "Reading sensor register "
+                       "0x%x contains 0x%x ", address, *i2c_data);
+        }
+out:
+        return (err < 0) ? err : 0;
+}
+
+int mt9m111_write_sensor(struct sd *sd, const u8 address,
+                                u8 *i2c_data, const u8 len)
+{
+        int err, i;
+        u8 *p;
+        struct usb_device *udev = sd->gspca_dev.dev;
+        __u8 *buf = sd->gspca_dev.usb_buf;
+
+        /* No sensor with a data width larger
+           than 16 bits has yet been seen, nor with 0 :p*/
+        if (len > 2 || !len)
+                return -EINVAL;
+
+        memcpy(buf, sensor_urb_skeleton,
+               sizeof(sensor_urb_skeleton));
+
+        buf[11] = sd->sensor->i2c_slave_id;
+        buf[15] = address;
+
+        p = buf + 16;
+
+        /* Copy a four byte write sequence for each byte to be written to */
+        for (i = 0; i < len; i++) {
+                memcpy(p, sensor_urb_skeleton + 16, 4);
+                p[3] = i2c_data[i];
+                p += 4;
+                PDEBUG(DBG_TRACE, "Writing sensor register 0x%x with 0x%x",
+                       address, i2c_data[i]);
+        }
+
+        /* Copy the tailer */
+        memcpy(p, sensor_urb_skeleton + 20, 4);
+
+        /* Set the total length */
+        p[3] = 0x10 + len;
+
+        err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+                              0x04, 0x40, 0x19,
+                              0x0000, buf,
+                              20 + len * 4, M5602_URB_MSG_TIMEOUT);
+
+        return (err < 0) ? err : 0;
+}
+
+void mt9m111_dump_registers(struct sd *sd)
+{
+        u8 address, value[2] = {0x00, 0x00};
+
+        info("Dumping the mt9m111 register state");
+
+        info("Dumping the mt9m111 sensor core registers");
+        value[1] = MT9M111_SENSOR_CORE;
+        mt9m111_write_sensor(sd, MT9M111_PAGE_MAP, value, 2);
+        for (address = 0; address < 0xff; address++) {
+                mt9m111_read_sensor(sd, address, value, 2);
+                info("register 0x%x contains 0x%x%x",
+                     address, value[0], value[1]);
+        }
+
+        info("Dumping the mt9m111 color pipeline registers");
+        value[1] = MT9M111_COLORPIPE;
+        mt9m111_write_sensor(sd, MT9M111_PAGE_MAP, value, 2);
+        for (address = 0; address < 0xff; address++) {
+                mt9m111_read_sensor(sd, address, value, 2);
+                info("register 0x%x contains 0x%x%x",
+                     address, value[0], value[1]);
+        }
+
+        info("Dumping the mt9m111 camera control registers");
+        value[1] = MT9M111_CAMERA_CONTROL;
+        mt9m111_write_sensor(sd, MT9M111_PAGE_MAP, value, 2);
+        for (address = 0; address < 0xff; address++) {
+                mt9m111_read_sensor(sd, address, value, 2);
+                info("register 0x%x contains 0x%x%x",
+                     address, value[0], value[1]);
+        }
+
+        info("mt9m111 register state dump complete");
+}
diff --git a/drivers/media/video/gspca/m5602/m5602_mt9m111.h b/drivers/media/video/gspca/m5602/m5602_mt9m111.h
new file mode 100644
index 000000000000..79a5d8878190
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_mt9m111.h
@@ -0,0 +1,1020 @@
+/*
+ * Driver for the mt9m111 sensor
+ *
+ * Copyright (C) 2008 Erik Andren
+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (C) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * Some defines taken from the mt9m111 sensor driver
+ * Copyright (C) 2008, Robert Jarzmik <robert.jarzmik@free.fr>
+ *
+ * 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.
+ *
+ */
+
+#ifndef M5602_MT9M111_H_
+#define M5602_MT9M111_H_
+
+#include "m5602_sensor.h"
+
+/*****************************************************************************/
+
+#define MT9M111_SC_CHIPVER                      0x00
+#define MT9M111_SC_ROWSTART                     0x01
+#define MT9M111_SC_COLSTART                     0x02
+#define MT9M111_SC_WINDOW_HEIGHT                0x03
+#define MT9M111_SC_WINDOW_WIDTH                 0x04
+#define MT9M111_SC_HBLANK_CONTEXT_B             0x05
+#define MT9M111_SC_VBLANK_CONTEXT_B             0x06
+#define MT9M111_SC_HBLANK_CONTEXT_A             0x07
+#define MT9M111_SC_VBLANK_CONTEXT_A             0x08
+#define MT9M111_SC_SHUTTER_WIDTH                0x09
+#define MT9M111_SC_ROW_SPEED                    0x0a
+
+#define MT9M111_SC_EXTRA_DELAY                  0x0b
+#define MT9M111_SC_SHUTTER_DELAY                0x0c
+#define MT9M111_SC_RESET                        0x0d
+#define MT9M111_SC_R_MODE_CONTEXT_B             0x20
+#define MT9M111_SC_R_MODE_CONTEXT_A             0x21
+#define MT9M111_SC_FLASH_CONTROL                0x23
+#define MT9M111_SC_GREEN_1_GAIN                 0x2b
+#define MT9M111_SC_BLUE_GAIN                    0x2c
+#define MT9M111_SC_RED_GAIN                     0x2d
+#define MT9M111_SC_GREEN_2_GAIN                 0x2e
+#define MT9M111_SC_GLOBAL_GAIN                  0x2f
+
+#define MT9M111_RMB_MIRROR_ROWS                 (1 << 0)
+#define MT9M111_RMB_MIRROR_COLS                 (1 << 1)
+
+#define MT9M111_CONTEXT_CONTROL                 0xc8
+#define MT9M111_PAGE_MAP                        0xf0
+#define MT9M111_BYTEWISE_ADDRESS                0xf1
+
+#define MT9M111_CP_OPERATING_MODE_CTL           0x06
+#define MT9M111_CP_LUMA_OFFSET                  0x34
+#define MT9M111_CP_LUMA_CLIP                    0x35
+#define MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_A 0x3a
+#define MT9M111_CP_LENS_CORRECTION_1            0x3b
+#define MT9M111_CP_DEFECT_CORR_CONTEXT_A        0x4c
+#define MT9M111_CP_DEFECT_CORR_CONTEXT_B        0x4d
+#define MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_B 0x9b
+#define MT9M111_CP_GLOBAL_CLK_CONTROL           0xb3
+
+#define MT9M111_CC_AUTO_EXPOSURE_PARAMETER_18   0x65
+#define MT9M111_CC_AWB_PARAMETER_7              0x28
+
+#define MT9M111_SENSOR_CORE                     0x00
+#define MT9M111_COLORPIPE                       0x01
+#define MT9M111_CAMERA_CONTROL                  0x02
+
+#define INITIAL_MAX_GAIN                        64
+#define DEFAULT_GAIN                            283
+
+/*****************************************************************************/
+
+/* Kernel module parameters */
+extern int force_sensor;
+extern int dump_sensor;
+extern unsigned int m5602_debug;
+
+int mt9m111_probe(struct sd *sd);
+int mt9m111_init(struct sd *sd);
+int mt9m111_power_down(struct sd *sd);
+
+int mt9m111_read_sensor(struct sd *sd, const u8 address,
+                        u8 *i2c_data, const u8 len);
+
+int mt9m111_write_sensor(struct sd *sd, const u8 address,
+                         u8 *i2c_data, const u8 len);
+
+void mt9m111_dump_registers(struct sd *sd);
+
+int mt9m111_set_vflip(struct gspca_dev *gspca_dev, __s32 val);
+int mt9m111_get_vflip(struct gspca_dev *gspca_dev, __s32 *val);
+int mt9m111_get_hflip(struct gspca_dev *gspca_dev, __s32 *val);
+int mt9m111_set_hflip(struct gspca_dev *gspca_dev, __s32 val);
+int mt9m111_get_gain(struct gspca_dev *gspca_dev, __s32 *val);
+int mt9m111_set_gain(struct gspca_dev *gspca_dev, __s32 val);
+
+static struct m5602_sensor mt9m111 = {
+        .name = "MT9M111",
+
+        .i2c_slave_id = 0xba,
+
+        .probe = mt9m111_probe,
+        .init = mt9m111_init,
+        .power_down = mt9m111_power_down,
+
+        .read_sensor = mt9m111_read_sensor,
+        .write_sensor = mt9m111_write_sensor,
+
+        .nctrls = 3,
+        .ctrls = {
+        {
+                {
+                        .id             = V4L2_CID_VFLIP,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "vertical flip",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 0
+                },
+                .set = mt9m111_set_vflip,
+                .get = mt9m111_get_vflip
+        }, {
+                {
+                        .id             = V4L2_CID_HFLIP,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "horizontal flip",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 0
+                },
+                .set = mt9m111_set_hflip,
+                .get = mt9m111_get_hflip
+        }, {
+                {
+                        .id             = V4L2_CID_GAIN,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "gain",
+                        .minimum        = 0,
+                        .maximum        = (INITIAL_MAX_GAIN - 1) * 2 * 2 * 2,
+                        .step           = 1,
+                        .default_value  = DEFAULT_GAIN,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = mt9m111_set_hflip,
+                .get = mt9m111_get_hflip
+        }
+        },
+
+        .nmodes = 1,
+        .modes = {
+        {
+                M5602_DEFAULT_FRAME_WIDTH,
+                M5602_DEFAULT_FRAME_HEIGHT,
+                V4L2_PIX_FMT_SBGGR8,
+                V4L2_FIELD_NONE,
+                .sizeimage =
+                        M5602_DEFAULT_FRAME_WIDTH * M5602_DEFAULT_FRAME_HEIGHT,
+                .bytesperline = M5602_DEFAULT_FRAME_WIDTH,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 1
+        }
+        }
+};
+
+static const unsigned char preinit_mt9m111[][4] =
+{
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0xff, 0xf7},
+
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x3e, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x3e, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x07, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x0b, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},
+
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a, 0x00}
+};
+
+static const unsigned char init_mt9m111[][4] =
+{
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0xff, 0xff},
+        {SENSOR, MT9M111_SC_RESET, 0xff, 0xff},
+        {SENSOR, MT9M111_SC_RESET, 0xff, 0xde},
+        {SENSOR, MT9M111_SC_RESET, 0xff, 0xff},
+        {SENSOR, MT9M111_SC_RESET, 0xff, 0xf7},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},
+
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xb3, 0x00},
+
+        {SENSOR, MT9M111_CP_GLOBAL_CLK_CONTROL, 0xff, 0xff},
+
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x3e, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x3e, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x07, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x0b, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a, 0x00},
+
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x05},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x29},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x08},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_OPERATING_MODE_CTL, 0x00, 0x10},
+        {SENSOR, MT9M111_CP_LENS_CORRECTION_1, 0x04, 0x2a},
+        {SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_A, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_B, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_LUMA_OFFSET, 0x00, 0x00},
+        {SENSOR, MT9M111_CP_LUMA_CLIP, 0xff, 0x00},
+        {SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_A, 0x14, 0x00},
+        {SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_B, 0x14, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xcd, 0x00},
+
+        {SENSOR, 0xcd, 0x00, 0x0e},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xd0, 0x00},
+        {SENSOR, 0xd0, 0x00, 0x40},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x02},
+        {SENSOR, MT9M111_CC_AUTO_EXPOSURE_PARAMETER_18, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},
+        {SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x07},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},
+        {SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x03},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},
+        {SENSOR, 0x33, 0x03, 0x49},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},
+
+        {SENSOR, 0x33, 0x03, 0x49},
+        {SENSOR, 0x34, 0xc0, 0x19},
+        {SENSOR, 0x3f, 0x20, 0x20},
+        {SENSOR, 0x40, 0x20, 0x20},
+        {SENSOR, 0x5a, 0xc0, 0x0a},
+        {SENSOR, 0x70, 0x7b, 0x0a},
+        {SENSOR, 0x71, 0xff, 0x00},
+        {SENSOR, 0x72, 0x19, 0x0e},
+        {SENSOR, 0x73, 0x18, 0x0f},
+        {SENSOR, 0x74, 0x57, 0x32},
+        {SENSOR, 0x75, 0x56, 0x34},
+        {SENSOR, 0x76, 0x73, 0x35},
+        {SENSOR, 0x77, 0x30, 0x12},
+        {SENSOR, 0x78, 0x79, 0x02},
+        {SENSOR, 0x79, 0x75, 0x06},
+        {SENSOR, 0x7a, 0x77, 0x0a},
+        {SENSOR, 0x7b, 0x78, 0x09},
+        {SENSOR, 0x7c, 0x7d, 0x06},
+        {SENSOR, 0x7d, 0x31, 0x10},
+        {SENSOR, 0x7e, 0x00, 0x7e},
+        {SENSOR, 0x80, 0x59, 0x04},
+        {SENSOR, 0x81, 0x59, 0x04},
+        {SENSOR, 0x82, 0x57, 0x0a},
+        {SENSOR, 0x83, 0x58, 0x0b},
+        {SENSOR, 0x84, 0x47, 0x0c},
+        {SENSOR, 0x85, 0x48, 0x0e},
+        {SENSOR, 0x86, 0x5b, 0x02},
+        {SENSOR, 0x87, 0x00, 0x5c},
+        {SENSOR, MT9M111_CONTEXT_CONTROL, 0x00, 0x08},
+        {SENSOR, 0x60, 0x00, 0x80},
+        {SENSOR, 0x61, 0x00, 0x00},
+        {SENSOR, 0x62, 0x00, 0x00},
+        {SENSOR, 0x63, 0x00, 0x00},
+        {SENSOR, 0x64, 0x00, 0x00},
+
+        {SENSOR, MT9M111_SC_ROWSTART, 0x00, 0x0d},
+        {SENSOR, MT9M111_SC_COLSTART, 0x00, 0x18},
+        {SENSOR, MT9M111_SC_WINDOW_HEIGHT, 0x04, 0x04},
+        {SENSOR, MT9M111_SC_WINDOW_WIDTH, 0x05, 0x08},
+        {SENSOR, MT9M111_SC_HBLANK_CONTEXT_B, 0x01, 0x38},
+        {SENSOR, MT9M111_SC_VBLANK_CONTEXT_B, 0x00, 0x11},
+        {SENSOR, MT9M111_SC_HBLANK_CONTEXT_A, 0x01, 0x38},
+        {SENSOR, MT9M111_SC_VBLANK_CONTEXT_A, 0x00, 0x11},
+        {SENSOR, MT9M111_SC_R_MODE_CONTEXT_B, 0x01, 0x03},
+        {SENSOR, MT9M111_SC_R_MODE_CONTEXT_A, 0x01, 0x03},
+        {SENSOR, 0x30, 0x04, 0x00},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x04, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x04, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x05, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x07, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xa0, 0x00},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_SHUTTER_WIDTH, 0x01, 0xf4},
+        {SENSOR, MT9M111_SC_GLOBAL_GAIN, 0x00, 0xea},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x04, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x04, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x05, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x07, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x09},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x29},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x08},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x0c},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x04},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xb3, 0x00},
+        {SENSOR, MT9M111_CP_GLOBAL_CLK_CONTROL, 0x00, 0x03},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x3e, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x3e, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x07, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x0b, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a, 0x00},
+
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x05},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x29},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x08},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_OPERATING_MODE_CTL, 0x00, 0x10},
+        {SENSOR, MT9M111_CP_LENS_CORRECTION_1, 0x04, 0x2a},
+        {SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_A, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_B, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_LUMA_OFFSET, 0x00, 0x00},
+        {SENSOR, MT9M111_CP_LUMA_CLIP, 0xff, 0x00},
+        {SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_A, 0x14, 0x00},
+        {SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_B, 0x14, 0x00},
+
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xcd, 0x00},
+        {SENSOR, 0xcd, 0x00, 0x0e},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xd0, 0x00},
+        {SENSOR, 0xd0, 0x00, 0x40},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x02},
+        {SENSOR, MT9M111_CC_AUTO_EXPOSURE_PARAMETER_18, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},
+        {SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x07},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},
+        {SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x03},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},
+        {SENSOR, 0x33, 0x03, 0x49},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},
+
+        {SENSOR, 0x33, 0x03, 0x49},
+        {SENSOR, 0x34, 0xc0, 0x19},
+        {SENSOR, 0x3f, 0x20, 0x20},
+        {SENSOR, 0x40, 0x20, 0x20},
+        {SENSOR, 0x5a, 0xc0, 0x0a},
+        {SENSOR, 0x70, 0x7b, 0x0a},
+        {SENSOR, 0x71, 0xff, 0x00},
+        {SENSOR, 0x72, 0x19, 0x0e},
+        {SENSOR, 0x73, 0x18, 0x0f},
+        {SENSOR, 0x74, 0x57, 0x32},
+        {SENSOR, 0x75, 0x56, 0x34},
+        {SENSOR, 0x76, 0x73, 0x35},
+        {SENSOR, 0x77, 0x30, 0x12},
+        {SENSOR, 0x78, 0x79, 0x02},
+        {SENSOR, 0x79, 0x75, 0x06},
+        {SENSOR, 0x7a, 0x77, 0x0a},
+        {SENSOR, 0x7b, 0x78, 0x09},
+        {SENSOR, 0x7c, 0x7d, 0x06},
+        {SENSOR, 0x7d, 0x31, 0x10},
+        {SENSOR, 0x7e, 0x00, 0x7e},
+        {SENSOR, 0x80, 0x59, 0x04},
+        {SENSOR, 0x81, 0x59, 0x04},
+        {SENSOR, 0x82, 0x57, 0x0a},
+        {SENSOR, 0x83, 0x58, 0x0b},
+        {SENSOR, 0x84, 0x47, 0x0c},
+        {SENSOR, 0x85, 0x48, 0x0e},
+        {SENSOR, 0x86, 0x5b, 0x02},
+        {SENSOR, 0x87, 0x00, 0x5c},
+        {SENSOR, MT9M111_CONTEXT_CONTROL, 0x00, 0x08},
+        {SENSOR, 0x60, 0x00, 0x80},
+        {SENSOR, 0x61, 0x00, 0x00},
+        {SENSOR, 0x62, 0x00, 0x00},
+        {SENSOR, 0x63, 0x00, 0x00},
+        {SENSOR, 0x64, 0x00, 0x00},
+
+        {SENSOR, MT9M111_SC_ROWSTART, 0x00, 0x0d},
+        {SENSOR, MT9M111_SC_COLSTART, 0x00, 0x18},
+        {SENSOR, MT9M111_SC_WINDOW_HEIGHT, 0x04, 0x04},
+        {SENSOR, MT9M111_SC_WINDOW_WIDTH, 0x05, 0x08},
+        {SENSOR, MT9M111_SC_HBLANK_CONTEXT_B, 0x01, 0x38},
+        {SENSOR, MT9M111_SC_VBLANK_CONTEXT_B, 0x00, 0x11},
+        {SENSOR, MT9M111_SC_HBLANK_CONTEXT_A, 0x01, 0x38},
+        {SENSOR, MT9M111_SC_VBLANK_CONTEXT_A, 0x00, 0x11},
+        {SENSOR, MT9M111_SC_R_MODE_CONTEXT_B, 0x01, 0x03},
+        {SENSOR, MT9M111_SC_R_MODE_CONTEXT_A, 0x01, 0x03},
+        {SENSOR, 0x30, 0x04, 0x00},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x04, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x04, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x05, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x07, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xa0, 0x00},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_SHUTTER_WIDTH, 0x01, 0xf4},
+        {SENSOR, MT9M111_SC_GLOBAL_GAIN, 0x00, 0xea},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x09},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x29},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x08},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x0c},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x04},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},
+
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xb3, 0x00},
+        {SENSOR, MT9M111_CP_GLOBAL_CLK_CONTROL, 0x00, 0x03},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x3e, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x3e, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x07, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x0b, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a, 0x00},
+
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x05},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x29},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x08},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_OPERATING_MODE_CTL, 0x00, 0x10},
+        {SENSOR, MT9M111_CP_LENS_CORRECTION_1, 0x04, 0x2a},
+        {SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_A, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_B, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_LUMA_OFFSET, 0x00, 0x00},
+        {SENSOR, MT9M111_CP_LUMA_CLIP, 0xff, 0x00},
+        {SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_A, 0x14, 0x00},
+        {SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_B, 0x14, 0x00},
+
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xcd, 0x00},
+        {SENSOR, 0xcd, 0x00, 0x0e},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xd0, 0x00},
+        {SENSOR, 0xd0, 0x00, 0x40},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x02},
+        {SENSOR, MT9M111_CC_AUTO_EXPOSURE_PARAMETER_18, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},
+        {SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x07},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},
+        {SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x03},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},
+        {SENSOR, 0x33, 0x03, 0x49},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},
+
+        {SENSOR, 0x33, 0x03, 0x49},
+        {SENSOR, 0x34, 0xc0, 0x19},
+        {SENSOR, 0x3f, 0x20, 0x20},
+        {SENSOR, 0x40, 0x20, 0x20},
+        {SENSOR, 0x5a, 0xc0, 0x0a},
+        {SENSOR, 0x70, 0x7b, 0x0a},
+        {SENSOR, 0x71, 0xff, 0x00},
+        {SENSOR, 0x72, 0x19, 0x0e},
+        {SENSOR, 0x73, 0x18, 0x0f},
+        {SENSOR, 0x74, 0x57, 0x32},
+        {SENSOR, 0x75, 0x56, 0x34},
+        {SENSOR, 0x76, 0x73, 0x35},
+        {SENSOR, 0x77, 0x30, 0x12},
+        {SENSOR, 0x78, 0x79, 0x02},
+        {SENSOR, 0x79, 0x75, 0x06},
+        {SENSOR, 0x7a, 0x77, 0x0a},
+        {SENSOR, 0x7b, 0x78, 0x09},
+        {SENSOR, 0x7c, 0x7d, 0x06},
+        {SENSOR, 0x7d, 0x31, 0x10},
+        {SENSOR, 0x7e, 0x00, 0x7e},
+        {SENSOR, 0x80, 0x59, 0x04},
+        {SENSOR, 0x81, 0x59, 0x04},
+        {SENSOR, 0x82, 0x57, 0x0a},
+        {SENSOR, 0x83, 0x58, 0x0b},
+        {SENSOR, 0x84, 0x47, 0x0c},
+        {SENSOR, 0x85, 0x48, 0x0e},
+        {SENSOR, 0x86, 0x5b, 0x02},
+        {SENSOR, 0x87, 0x00, 0x5c},
+        {SENSOR, MT9M111_CONTEXT_CONTROL, 0x00, 0x08},
+        {SENSOR, 0x60, 0x00, 0x80},
+        {SENSOR, 0x61, 0x00, 0x00},
+        {SENSOR, 0x62, 0x00, 0x00},
+        {SENSOR, 0x63, 0x00, 0x00},
+        {SENSOR, 0x64, 0x00, 0x00},
+
+        {SENSOR, MT9M111_SC_ROWSTART, 0x00, 0x0d},
+        {SENSOR, MT9M111_SC_COLSTART, 0x00, 0x18},
+        {SENSOR, MT9M111_SC_WINDOW_HEIGHT, 0x04, 0x04},
+        {SENSOR, MT9M111_SC_WINDOW_WIDTH, 0x05, 0x08},
+        {SENSOR, MT9M111_SC_HBLANK_CONTEXT_B, 0x01, 0x38},
+        {SENSOR, MT9M111_SC_VBLANK_CONTEXT_B, 0x00, 0x11},
+        {SENSOR, MT9M111_SC_HBLANK_CONTEXT_A, 0x01, 0x38},
+        {SENSOR, MT9M111_SC_VBLANK_CONTEXT_A, 0x00, 0x11},
+        {SENSOR, MT9M111_SC_R_MODE_CONTEXT_B, 0x01, 0x03},
+        {SENSOR, MT9M111_SC_R_MODE_CONTEXT_A, 0x01, 0x03},
+        {SENSOR, 0x30, 0x04, 0x00},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x04, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x04, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x05, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x07, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xa0, 0x00},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_SHUTTER_WIDTH, 0x01, 0xf4},
+        {SENSOR, MT9M111_SC_GLOBAL_GAIN, 0x00, 0xea},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x09},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x29},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x08},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x0c},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x04},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xb3, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_CP_GLOBAL_CLK_CONTROL, 0x00, 0x03},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x3e, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x3e, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x07, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x0b, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a, 0x00},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x05},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x29},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x08},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_OPERATING_MODE_CTL, 0x00, 0x10},
+        {SENSOR, MT9M111_CP_LENS_CORRECTION_1, 0x04, 0x2a},
+        {SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_A, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_B, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_LUMA_OFFSET, 0x00, 0x00},
+        {SENSOR, MT9M111_CP_LUMA_CLIP, 0xff, 0x00},
+        {SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_A, 0x14, 0x00},
+        {SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_B, 0x14, 0x00},
+
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xcd, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, 0xcd, 0x00, 0x0e},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xd0, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, 0xd0, 0x00, 0x40},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x02},
+        {SENSOR, MT9M111_CC_AUTO_EXPOSURE_PARAMETER_18, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x07},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x03},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, 0x33, 0x03, 0x49},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+
+        {SENSOR, 0x33, 0x03, 0x49},
+        {SENSOR, 0x34, 0xc0, 0x19},
+        {SENSOR, 0x3f, 0x20, 0x20},
+        {SENSOR, 0x40, 0x20, 0x20},
+        {SENSOR, 0x5a, 0xc0, 0x0a},
+        {SENSOR, 0x70, 0x7b, 0x0a},
+        {SENSOR, 0x71, 0xff, 0x00},
+        {SENSOR, 0x72, 0x19, 0x0e},
+        {SENSOR, 0x73, 0x18, 0x0f},
+        {SENSOR, 0x74, 0x57, 0x32},
+        {SENSOR, 0x75, 0x56, 0x34},
+        {SENSOR, 0x76, 0x73, 0x35},
+        {SENSOR, 0x77, 0x30, 0x12},
+        {SENSOR, 0x78, 0x79, 0x02},
+        {SENSOR, 0x79, 0x75, 0x06},
+        {SENSOR, 0x7a, 0x77, 0x0a},
+        {SENSOR, 0x7b, 0x78, 0x09},
+        {SENSOR, 0x7c, 0x7d, 0x06},
+        {SENSOR, 0x7d, 0x31, 0x10},
+        {SENSOR, 0x7e, 0x00, 0x7e},
+        {SENSOR, 0x80, 0x59, 0x04},
+        {SENSOR, 0x81, 0x59, 0x04},
+        {SENSOR, 0x82, 0x57, 0x0a},
+        {SENSOR, 0x83, 0x58, 0x0b},
+        {SENSOR, 0x84, 0x47, 0x0c},
+        {SENSOR, 0x85, 0x48, 0x0e},
+        {SENSOR, 0x86, 0x5b, 0x02},
+        {SENSOR, 0x87, 0x00, 0x5c},
+        {SENSOR, MT9M111_CONTEXT_CONTROL, 0x00, 0x08},
+        {SENSOR, 0x60, 0x00, 0x80},
+        {SENSOR, 0x61, 0x00, 0x00},
+        {SENSOR, 0x62, 0x00, 0x00},
+        {SENSOR, 0x63, 0x00, 0x00},
+        {SENSOR, 0x64, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_ROWSTART, 0x00, 0x0d},
+        {SENSOR, MT9M111_SC_COLSTART, 0x00, 0x12},
+        {SENSOR, MT9M111_SC_WINDOW_HEIGHT, 0x04, 0x00},
+        {SENSOR, MT9M111_SC_WINDOW_WIDTH, 0x05, 0x10},
+        {SENSOR, MT9M111_SC_HBLANK_CONTEXT_B, 0x01, 0x60},
+        {SENSOR, MT9M111_SC_VBLANK_CONTEXT_B, 0x00, 0x11},
+        {SENSOR, MT9M111_SC_HBLANK_CONTEXT_A, 0x01, 0x60},
+        {SENSOR, MT9M111_SC_VBLANK_CONTEXT_A, 0x00, 0x11},
+        {SENSOR, MT9M111_SC_R_MODE_CONTEXT_B, 0x01, 0x0f},
+        {SENSOR, MT9M111_SC_R_MODE_CONTEXT_A, 0x01, 0x0f},
+        {SENSOR, 0x30, 0x04, 0x00},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0xe3, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x87, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_SHUTTER_WIDTH, 0x01, 0x90},
+        {SENSOR, MT9M111_SC_GLOBAL_GAIN, 0x00, 0xe6},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x09},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x29},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x08},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x0c},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x04},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xb3, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_CP_GLOBAL_CLK_CONTROL, 0x00, 0x03},
+
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x3e, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x3e, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x07, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x0b, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a, 0x00},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x05},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x29},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x08},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_OPERATING_MODE_CTL, 0x00, 0x10},
+        {SENSOR, MT9M111_CP_LENS_CORRECTION_1, 0x04, 0x2a},
+        {SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_A, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_B, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_LUMA_OFFSET, 0x00, 0x00},
+        {SENSOR, MT9M111_CP_LUMA_CLIP, 0xff, 0x00},
+        {SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_A, 0x14, 0x00},
+        {SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_B, 0x14, 0x00},
+
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xcd, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, 0xcd, 0x00, 0x0e},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xd0, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, 0xd0, 0x00, 0x40},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x02},
+        {SENSOR, MT9M111_CC_AUTO_EXPOSURE_PARAMETER_18, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x07},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x03},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, 0x33, 0x03, 0x49},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+
+        {SENSOR, 0x33, 0x03, 0x49},
+        {SENSOR, 0x34, 0xc0, 0x19},
+        {SENSOR, 0x3f, 0x20, 0x20},
+        {SENSOR, 0x40, 0x20, 0x20},
+        {SENSOR, 0x5a, 0xc0, 0x0a},
+        {SENSOR, 0x70, 0x7b, 0x0a},
+        {SENSOR, 0x71, 0xff, 0x00},
+        {SENSOR, 0x72, 0x19, 0x0e},
+        {SENSOR, 0x73, 0x18, 0x0f},
+        {SENSOR, 0x74, 0x57, 0x32},
+        {SENSOR, 0x75, 0x56, 0x34},
+        {SENSOR, 0x76, 0x73, 0x35},
+        {SENSOR, 0x77, 0x30, 0x12},
+        {SENSOR, 0x78, 0x79, 0x02},
+        {SENSOR, 0x79, 0x75, 0x06},
+        {SENSOR, 0x7a, 0x77, 0x0a},
+        {SENSOR, 0x7b, 0x78, 0x09},
+        {SENSOR, 0x7c, 0x7d, 0x06},
+        {SENSOR, 0x7d, 0x31, 0x10},
+        {SENSOR, 0x7e, 0x00, 0x7e},
+        {SENSOR, 0x80, 0x59, 0x04},
+        {SENSOR, 0x81, 0x59, 0x04},
+        {SENSOR, 0x82, 0x57, 0x0a},
+        {SENSOR, 0x83, 0x58, 0x0b},
+        {SENSOR, 0x84, 0x47, 0x0c},
+        {SENSOR, 0x85, 0x48, 0x0e},
+        {SENSOR, 0x86, 0x5b, 0x02},
+        {SENSOR, 0x87, 0x00, 0x5c},
+        {SENSOR, MT9M111_CONTEXT_CONTROL, 0x00, 0x08},
+        {SENSOR, 0x60, 0x00, 0x80},
+        {SENSOR, 0x61, 0x00, 0x00},
+        {SENSOR, 0x62, 0x00, 0x00},
+        {SENSOR, 0x63, 0x00, 0x00},
+        {SENSOR, 0x64, 0x00, 0x00},
+
+        {SENSOR, MT9M111_SC_ROWSTART, 0x00, 0x0d},
+        {SENSOR, MT9M111_SC_COLSTART, 0x00, 0x12},
+        {SENSOR, MT9M111_SC_WINDOW_HEIGHT, 0x04, 0x00},
+        {SENSOR, MT9M111_SC_WINDOW_WIDTH, 0x05, 0x10},
+        {SENSOR, MT9M111_SC_HBLANK_CONTEXT_B, 0x01, 0x60},
+        {SENSOR, MT9M111_SC_VBLANK_CONTEXT_B, 0x00, 0x11},
+        {SENSOR, MT9M111_SC_HBLANK_CONTEXT_A, 0x01, 0x60},
+        {SENSOR, MT9M111_SC_VBLANK_CONTEXT_A, 0x00, 0x11},
+        {SENSOR, MT9M111_SC_R_MODE_CONTEXT_B, 0x01, 0x0f},
+        {SENSOR, MT9M111_SC_R_MODE_CONTEXT_A, 0x01, 0x0f},
+        {SENSOR, 0x30, 0x04, 0x00},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0xe0, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x7f, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        /* Set number of blank rows chosen to 400 */
+        {SENSOR, MT9M111_SC_SHUTTER_WIDTH, 0x01, 0x90},
+        /* Set the global gain to 283 (of 512) */
+        {SENSOR, MT9M111_SC_GLOBAL_GAIN, 0x03, 0x63}
+};
+
+#endif
diff --git a/drivers/media/video/gspca/m5602/m5602_ov9650.c b/drivers/media/video/gspca/m5602/m5602_ov9650.c
new file mode 100644
index 000000000000..31c5896250e7
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_ov9650.c
@@ -0,0 +1,546 @@
+/*
+ * Driver for the ov9650 sensor
+ *
+ * Copyright (C) 2008 Erik Andren
+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (C) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * 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.
+ *
+ */
+
+#include "m5602_ov9650.h"
+
+int ov9650_read_sensor(struct sd *sd, const u8 address,
+                      u8 *i2c_data, const u8 len)
+{
+        int err, i;
+
+        /* The ov9650 registers have a max depth of one byte */
+        if (len > 1 || !len)
+                return -EINVAL;
+
+        do {
+                err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
+        } while ((*i2c_data & I2C_BUSY) && !err);
+
+        m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,
+                           ov9650.i2c_slave_id);
+        m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address);
+        m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x10 + len);
+        m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x08);
+
+        for (i = 0; i < len; i++) {
+                err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &(i2c_data[i]));
+
+                PDEBUG(DBG_TRACE, "Reading sensor register "
+                                "0x%x containing 0x%x ", address, *i2c_data);
+        }
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_write_sensor(struct sd *sd, const u8 address,
+                        u8 *i2c_data, const u8 len)
+{
+        int err, i;
+        u8 *p;
+        struct usb_device *udev = sd->gspca_dev.dev;
+        __u8 *buf = sd->gspca_dev.usb_buf;
+
+        /* The ov9650 only supports one byte writes */
+        if (len > 1 || !len)
+                return -EINVAL;
+
+        memcpy(buf, sensor_urb_skeleton,
+               sizeof(sensor_urb_skeleton));
+
+        buf[11] = sd->sensor->i2c_slave_id;
+        buf[15] = address;
+
+        /* Special case larger sensor writes */
+        p = buf + 16;
+
+        /* Copy a four byte write sequence for each byte to be written to */
+        for (i = 0; i < len; i++) {
+                memcpy(p, sensor_urb_skeleton + 16, 4);
+                p[3] = i2c_data[i];
+                p += 4;
+                PDEBUG(DBG_TRACE, "Writing sensor register 0x%x with 0x%x",
+                       address, i2c_data[i]);
+        }
+
+        /* Copy the tailer */
+        memcpy(p, sensor_urb_skeleton + 20, 4);
+
+        /* Set the total length */
+        p[3] = 0x10 + len;
+
+        err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+                              0x04, 0x40, 0x19,
+                              0x0000, buf,
+                              20 + len * 4, M5602_URB_MSG_TIMEOUT);
+
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_probe(struct sd *sd)
+{
+        u8 prod_id = 0, ver_id = 0, i;
+
+        if (force_sensor) {
+                if (force_sensor == OV9650_SENSOR) {
+                        info("Forcing an %s sensor", ov9650.name);
+                        goto sensor_found;
+                }
+                /* If we want to force another sensor,
+                   don't try to probe this one */
+                return -ENODEV;
+        }
+
+        info("Probing for an ov9650 sensor");
+
+        /* Run the pre-init to actually probe the unit */
+        for (i = 0; i < ARRAY_SIZE(preinit_ov9650); i++) {
+                u8 data = preinit_ov9650[i][2];
+                if (preinit_ov9650[i][0] == SENSOR)
+                        ov9650_write_sensor(sd,
+                                            preinit_ov9650[i][1], &data, 1);
+                else
+                        m5602_write_bridge(sd, preinit_ov9650[i][1], data);
+        }
+
+        if (ov9650_read_sensor(sd, OV9650_PID, &prod_id, 1))
+                return -ENODEV;
+
+        if (ov9650_read_sensor(sd, OV9650_VER, &ver_id, 1))
+                return -ENODEV;
+
+        if ((prod_id == 0x96) && (ver_id == 0x52)) {
+                info("Detected an ov9650 sensor");
+                goto sensor_found;
+        }
+
+        return -ENODEV;
+
+sensor_found:
+        sd->gspca_dev.cam.cam_mode = ov9650.modes;
+        sd->gspca_dev.cam.nmodes = ov9650.nmodes;
+        sd->desc->ctrls = ov9650.ctrls;
+        sd->desc->nctrls = ov9650.nctrls;
+        return 0;
+}
+
+int ov9650_init(struct sd *sd)
+{
+        int i, err = 0;
+        u8 data;
+
+        if (dump_sensor)
+                ov9650_dump_registers(sd);
+
+        for (i = 0; i < ARRAY_SIZE(init_ov9650) && !err; i++) {
+                data = init_ov9650[i][2];
+                if (init_ov9650[i][0] == SENSOR)
+                        err = ov9650_write_sensor(sd, init_ov9650[i][1],
+                                                  &data, 1);
+                else
+                        err = m5602_write_bridge(sd, init_ov9650[i][1], data);
+        }
+
+        if (!err && dmi_check_system(ov9650_flip_dmi_table)) {
+                info("vflip quirk active");
+                data = 0x30;
+                err = ov9650_write_sensor(sd, OV9650_MVFP, &data, 1);
+        }
+
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_power_down(struct sd *sd)
+{
+        int i;
+        for (i = 0; i < ARRAY_SIZE(power_down_ov9650); i++) {
+                u8 data = power_down_ov9650[i][2];
+                if (power_down_ov9650[i][0] == SENSOR)
+                        ov9650_write_sensor(sd,
+                                            power_down_ov9650[i][1], &data, 1);
+                else
+                        m5602_write_bridge(sd, power_down_ov9650[i][1], data);
+        }
+
+        return 0;
+}
+
+int ov9650_get_exposure(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 i2c_data;
+        int err;
+
+        err = ov9650_read_sensor(sd, OV9650_COM1, &i2c_data, 1);
+        if (err < 0)
+                goto out;
+        *val = i2c_data & 0x03;
+
+        err = ov9650_read_sensor(sd, OV9650_AECH, &i2c_data, 1);
+        if (err < 0)
+                goto out;
+        *val |= (i2c_data << 2);
+
+        err = ov9650_read_sensor(sd, OV9650_AECHM, &i2c_data, 1);
+        if (err < 0)
+                goto out;
+        *val |= (i2c_data & 0x3f) << 10;
+
+        PDEBUG(DBG_V4L2_CID, "Read exposure %d", *val);
+out:
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_set_exposure(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 i2c_data;
+        int err;
+
+        PDEBUG(DBG_V4L2_CID, "Set exposure to %d",
+               val & 0xffff);
+
+        /* The 6 MSBs */
+        i2c_data = (val >> 10) & 0x3f;
+        err = ov9650_write_sensor(sd, OV9650_AECHM,
+                                  &i2c_data, 1);
+        if (err < 0)
+                goto out;
+
+        /* The 8 middle bits */
+        i2c_data = (val >> 2) & 0xff;
+        err = ov9650_write_sensor(sd, OV9650_AECH,
+                                  &i2c_data, 1);
+        if (err < 0)
+                goto out;
+
+        /* The 2 LSBs */
+        i2c_data = val & 0x03;
+        err = ov9650_write_sensor(sd, OV9650_COM1, &i2c_data, 1);
+
+out:
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        ov9650_read_sensor(sd, OV9650_VREF, &i2c_data, 1);
+        *val = (i2c_data & 0x03) << 8;
+
+        err = ov9650_read_sensor(sd, OV9650_GAIN, &i2c_data, 1);
+        *val |= i2c_data;
+        PDEBUG(DBG_V4L2_CID, "Read gain %d", *val);
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_set_gain(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        /* The 2 MSB */
+        /* Read the OV9650_VREF register first to avoid
+           corrupting the VREF high and low bits */
+        ov9650_read_sensor(sd, OV9650_VREF, &i2c_data, 1);
+        /* Mask away all uninteresting bits */
+        i2c_data = ((val & 0x0300) >> 2) |
+                        (i2c_data & 0x3F);
+        err = ov9650_write_sensor(sd, OV9650_VREF, &i2c_data, 1);
+
+        /* The 8 LSBs */
+        i2c_data = val & 0xff;
+        err = ov9650_write_sensor(sd, OV9650_GAIN, &i2c_data, 1);
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_get_red_balance(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = ov9650_read_sensor(sd, OV9650_RED, &i2c_data, 1);
+        *val = i2c_data;
+
+        PDEBUG(DBG_V4L2_CID, "Read red gain %d", *val);
+
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_set_red_balance(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        PDEBUG(DBG_V4L2_CID, "Set red gain to %d",
+                             val & 0xff);
+
+        i2c_data = val & 0xff;
+        err = ov9650_write_sensor(sd, OV9650_RED, &i2c_data, 1);
+
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_get_blue_balance(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = ov9650_read_sensor(sd, OV9650_BLUE, &i2c_data, 1);
+        *val = i2c_data;
+
+        PDEBUG(DBG_V4L2_CID, "Read blue gain %d", *val);
+
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_set_blue_balance(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        PDEBUG(DBG_V4L2_CID, "Set blue gain to %d",
+               val & 0xff);
+
+        i2c_data = val & 0xff;
+        err = ov9650_write_sensor(sd, OV9650_BLUE, &i2c_data, 1);
+
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = ov9650_read_sensor(sd, OV9650_MVFP, &i2c_data, 1);
+        if (dmi_check_system(ov9650_flip_dmi_table))
+                *val = ((i2c_data & OV9650_HFLIP) >> 5) ? 0 : 1;
+        else
+                *val = (i2c_data & OV9650_HFLIP) >> 5;
+        PDEBUG(DBG_V4L2_CID, "Read horizontal flip %d", *val);
+
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        PDEBUG(DBG_V4L2_CID, "Set horizontal flip to %d", val);
+        err = ov9650_read_sensor(sd, OV9650_MVFP, &i2c_data, 1);
+        if (err < 0)
+                goto out;
+
+        if (dmi_check_system(ov9650_flip_dmi_table))
+                i2c_data = ((i2c_data & 0xdf) |
+                                (((val ? 0 : 1) & 0x01) << 5));
+        else
+                i2c_data = ((i2c_data & 0xdf) |
+                                ((val & 0x01) << 5));
+
+        err = ov9650_write_sensor(sd, OV9650_MVFP, &i2c_data, 1);
+out:
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = ov9650_read_sensor(sd, OV9650_MVFP, &i2c_data, 1);
+        if (dmi_check_system(ov9650_flip_dmi_table))
+                *val = ((i2c_data & 0x10) >> 4) ? 0 : 1;
+        else
+                *val = (i2c_data & 0x10) >> 4;
+        PDEBUG(DBG_V4L2_CID, "Read vertical flip %d", *val);
+
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        PDEBUG(DBG_V4L2_CID, "Set vertical flip to %d", val);
+        err = ov9650_read_sensor(sd, OV9650_MVFP, &i2c_data, 1);
+        if (err < 0)
+                goto out;
+
+        if (dmi_check_system(ov9650_flip_dmi_table))
+                i2c_data = ((i2c_data & 0xef) |
+                                (((val ? 0 : 1) & 0x01) << 4));
+        else
+                i2c_data = ((i2c_data & 0xef) |
+                                ((val & 0x01) << 4));
+
+        err = ov9650_write_sensor(sd, OV9650_MVFP, &i2c_data, 1);
+out:
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_get_brightness(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = ov9650_read_sensor(sd, OV9650_VREF, &i2c_data, 1);
+        if (err < 0)
+                goto out;
+        *val = (i2c_data & 0x03) << 8;
+
+        err = ov9650_read_sensor(sd, OV9650_GAIN, &i2c_data, 1);
+        *val |= i2c_data;
+        PDEBUG(DBG_V4L2_CID, "Read gain %d", *val);
+out:
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_set_brightness(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        PDEBUG(DBG_V4L2_CID, "Set gain to %d", val & 0x3ff);
+
+        /* Read the OV9650_VREF register first to avoid
+                corrupting the VREF high and low bits */
+        err = ov9650_read_sensor(sd, OV9650_VREF, &i2c_data, 1);
+        if (err < 0)
+                goto out;
+
+        /* Mask away all uninteresting bits */
+        i2c_data = ((val & 0x0300) >> 2) | (i2c_data & 0x3F);
+        err = ov9650_write_sensor(sd, OV9650_VREF, &i2c_data, 1);
+        if (err < 0)
+                goto out;
+
+        /* The 8 LSBs */
+        i2c_data = val & 0xff;
+        err = ov9650_write_sensor(sd, OV9650_GAIN, &i2c_data, 1);
+
+out:
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_get_auto_white_balance(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = ov9650_read_sensor(sd, OV9650_COM8, &i2c_data, 1);
+        *val = (i2c_data & OV9650_AWB_EN) >> 1;
+        PDEBUG(DBG_V4L2_CID, "Read auto white balance %d", *val);
+
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_set_auto_white_balance(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        PDEBUG(DBG_V4L2_CID, "Set auto white balance to %d", val);
+        err = ov9650_read_sensor(sd, OV9650_COM8, &i2c_data, 1);
+        if (err < 0)
+                goto out;
+
+        i2c_data = ((i2c_data & 0xfd) | ((val & 0x01) << 1));
+        err = ov9650_write_sensor(sd, OV9650_COM8, &i2c_data, 1);
+out:
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_get_auto_gain(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = ov9650_read_sensor(sd, OV9650_COM8, &i2c_data, 1);
+        *val = (i2c_data & OV9650_AGC_EN) >> 2;
+        PDEBUG(DBG_V4L2_CID, "Read auto gain control %d", *val);
+
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_set_auto_gain(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        PDEBUG(DBG_V4L2_CID, "Set auto gain control to %d", val);
+        err = ov9650_read_sensor(sd, OV9650_COM8, &i2c_data, 1);
+        if (err < 0)
+                goto out;
+
+        i2c_data = ((i2c_data & 0xfb) | ((val & 0x01) << 2));
+        err = ov9650_write_sensor(sd, OV9650_COM8, &i2c_data, 1);
+out:
+        return (err < 0) ? err : 0;
+}
+
+void ov9650_dump_registers(struct sd *sd)
+{
+        int address;
+        info("Dumping the ov9650 register state");
+        for (address = 0; address < 0xa9; address++) {
+                u8 value;
+                ov9650_read_sensor(sd, address, &value, 1);
+                info("register 0x%x contains 0x%x",
+                     address, value);
+        }
+
+        info("ov9650 register state dump complete");
+
+        info("Probing for which registers that are read/write");
+        for (address = 0; address < 0xff; address++) {
+                u8 old_value, ctrl_value;
+                u8 test_value[2] = {0xff, 0xff};
+
+                ov9650_read_sensor(sd, address, &old_value, 1);
+                ov9650_write_sensor(sd, address, test_value, 1);
+                ov9650_read_sensor(sd, address, &ctrl_value, 1);
+
+                if (ctrl_value == test_value[0])
+                        info("register 0x%x is writeable", address);
+                else
+                        info("register 0x%x is read only", address);
+
+                /* Restore original value */
+                ov9650_write_sensor(sd, address, &old_value, 1);
+        }
+}
diff --git a/drivers/media/video/gspca/m5602/m5602_ov9650.h b/drivers/media/video/gspca/m5602/m5602_ov9650.h
new file mode 100644
index 000000000000..2f29cb056f30
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_ov9650.h
@@ -0,0 +1,503 @@
+/*
+ * Driver for the ov9650 sensor
+ *
+ * Copyright (C) 2008 Erik Andren
+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (C) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * 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.
+ *
+ */
+
+#ifndef M5602_OV9650_H_
+#define M5602_OV9650_H_
+
+#include <linux/dmi.h>
+
+#include "m5602_sensor.h"
+
+/*****************************************************************************/
+
+#define OV9650_GAIN                     0x00
+#define OV9650_BLUE                     0x01
+#define OV9650_RED                      0x02
+#define OV9650_VREF                     0x03
+#define OV9650_COM1                     0x04
+#define OV9650_BAVE                     0x05
+#define OV9650_GEAVE                    0x06
+#define OV9650_RSVD7                    0x07
+#define OV9650_PID                      0x0a
+#define OV9650_VER                      0x0b
+#define OV9650_COM3                     0x0c
+#define OV9650_COM5                     0x0e
+#define OV9650_COM6                     0x0f
+#define OV9650_AECH                     0x10
+#define OV9650_CLKRC                    0x11
+#define OV9650_COM7                     0x12
+#define OV9650_COM8                     0x13
+#define OV9650_COM9                     0x14
+#define OV9650_COM10                    0x15
+#define OV9650_RSVD16                   0x16
+#define OV9650_HSTART                   0x17
+#define OV9650_HSTOP                    0x18
+#define OV9650_VSTRT                    0x19
+#define OV9650_VSTOP                    0x1a
+#define OV9650_PSHFT                    0x1b
+#define OV9650_MVFP                     0x1e
+#define OV9650_AEW                      0x24
+#define OV9650_AEB                      0x25
+#define OV9650_VPT                      0x26
+#define OV9650_BBIAS                    0x27
+#define OV9650_GbBIAS                   0x28
+#define OV9650_Gr_COM                   0x29
+#define OV9650_RBIAS                    0x2c
+#define OV9650_HREF                     0x32
+#define OV9650_CHLF                     0x33
+#define OV9650_ARBLM                    0x34
+#define OV9650_RSVD35                   0x35
+#define OV9650_RSVD36                   0x36
+#define OV9650_ADC                      0x37
+#define OV9650_ACOM38                   0x38
+#define OV9650_OFON                     0x39
+#define OV9650_TSLB                     0x3a
+#define OV9650_COM12                    0x3c
+#define OV9650_COM13                    0x3d
+#define OV9650_COM15                    0x40
+#define OV9650_COM16                    0x41
+#define OV9650_LCC1                     0x62
+#define OV9650_LCC2                     0x63
+#define OV9650_LCC3                     0x64
+#define OV9650_LCC4                     0x65
+#define OV9650_LCC5                     0x66
+#define OV9650_HV                       0x69
+#define OV9650_DBLV                     0x6b
+#define OV9650_COM21                    0x8b
+#define OV9650_COM22                    0x8c
+#define OV9650_COM24                    0x8e
+#define OV9650_DBLC1                    0x8f
+#define OV9650_RSVD94                   0x94
+#define OV9650_RSVD95                   0x95
+#define OV9650_RSVD96                   0x96
+#define OV9650_LCCFB                    0x9d
+#define OV9650_LCCFR                    0x9e
+#define OV9650_AECHM                    0xa1
+#define OV9650_COM26                    0xa5
+#define OV9650_ACOMA8                   0xa8
+#define OV9650_ACOMA9                   0xa9
+
+#define OV9650_REGISTER_RESET           (1 << 7)
+#define OV9650_VGA_SELECT               (1 << 6)
+#define OV9650_RGB_SELECT               (1 << 2)
+#define OV9650_RAW_RGB_SELECT           (1 << 0)
+
+#define OV9650_FAST_AGC_AEC             (1 << 7)
+#define OV9650_AEC_UNLIM_STEP_SIZE      (1 << 6)
+#define OV9650_BANDING                  (1 << 5)
+#define OV9650_AGC_EN                   (1 << 2)
+#define OV9650_AWB_EN                   (1 << 1)
+#define OV9650_AEC_EN                   (1 << 0)
+
+#define OV9650_VARIOPIXEL               (1 << 2)
+#define OV9650_SYSTEM_CLK_SEL           (1 << 7)
+#define OV9650_SLAM_MODE                (1 << 4)
+
+#define OV9650_VFLIP                    (1 << 4)
+#define OV9650_HFLIP                    (1 << 5)
+
+#define GAIN_DEFAULT                    0x14
+#define RED_GAIN_DEFAULT                0x70
+#define BLUE_GAIN_DEFAULT               0x20
+#define EXPOSURE_DEFAULT                0x5003
+
+/*****************************************************************************/
+
+/* Kernel module parameters */
+extern int force_sensor;
+extern int dump_sensor;
+extern unsigned int m5602_debug;
+
+int ov9650_probe(struct sd *sd);
+int ov9650_init(struct sd *sd);
+int ov9650_power_down(struct sd *sd);
+
+int ov9650_read_sensor(struct sd *sd, const u8 address,
+                       u8 *i2c_data, const u8 len);
+int ov9650_write_sensor(struct sd *sd, const u8 address,
+                       u8 *i2c_data, const u8 len);
+
+void ov9650_dump_registers(struct sd *sd);
+
+int ov9650_set_exposure(struct gspca_dev *gspca_dev, __s32 val);
+int ov9650_get_exposure(struct gspca_dev *gspca_dev, __s32 *val);
+int ov9650_get_gain(struct gspca_dev *gspca_dev, __s32 *val);
+int ov9650_set_gain(struct gspca_dev *gspca_dev, __s32 val);
+int ov9650_get_red_balance(struct gspca_dev *gspca_dev, __s32 *val);
+int ov9650_set_red_balance(struct gspca_dev *gspca_dev, __s32 val);
+int ov9650_get_blue_balance(struct gspca_dev *gspca_dev, __s32 *val);
+int ov9650_set_blue_balance(struct gspca_dev *gspca_dev, __s32 val);
+int ov9650_get_hflip(struct gspca_dev *gspca_dev, __s32 *val);
+int ov9650_set_hflip(struct gspca_dev *gspca_dev, __s32 val);
+int ov9650_get_vflip(struct gspca_dev *gspca_dev, __s32 *val);
+int ov9650_set_vflip(struct gspca_dev *gspca_dev, __s32 val);
+int ov9650_get_brightness(struct gspca_dev *gspca_dev, __s32 *val);
+int ov9650_set_brightness(struct gspca_dev *gspca_dev, __s32 val);
+int ov9650_get_auto_white_balance(struct gspca_dev *gspca_dev, __s32 *val);
+int ov9650_set_auto_white_balance(struct gspca_dev *gspca_dev, __s32 val);
+int ov9650_get_auto_gain(struct gspca_dev *gspca_dev, __s32 *val);
+int ov9650_set_auto_gain(struct gspca_dev *gspca_dev, __s32 val);
+
+static struct m5602_sensor ov9650 = {
+        .name = "OV9650",
+        .i2c_slave_id = 0x60,
+        .probe = ov9650_probe,
+        .init = ov9650_init,
+        .power_down = ov9650_power_down,
+        .read_sensor = ov9650_read_sensor,
+        .write_sensor = ov9650_write_sensor,
+
+        .nctrls = 8,
+        .ctrls = {
+        {
+                {
+                        .id             = V4L2_CID_EXPOSURE,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "exposure",
+                        .minimum        = 0x00,
+                        .maximum        = 0xffff,
+                        .step           = 0x1,
+                        .default_value  = EXPOSURE_DEFAULT,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = ov9650_set_exposure,
+                .get = ov9650_get_exposure
+        }, {
+                {
+                        .id             = V4L2_CID_GAIN,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "gain",
+                        .minimum        = 0x00,
+                        .maximum        = 0x3ff,
+                        .step           = 0x1,
+                        .default_value  = GAIN_DEFAULT,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = ov9650_set_gain,
+                .get = ov9650_get_gain
+        }, {
+                {
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "red balance",
+                        .minimum        = 0x00,
+                        .maximum        = 0xff,
+                        .step           = 0x1,
+                        .default_value  = RED_GAIN_DEFAULT,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = ov9650_set_red_balance,
+                .get = ov9650_get_red_balance
+        }, {
+                {
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "blue balance",
+                        .minimum        = 0x00,
+                        .maximum        = 0xff,
+                        .step           = 0x1,
+                        .default_value  = BLUE_GAIN_DEFAULT,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = ov9650_set_blue_balance,
+                .get = ov9650_get_blue_balance
+        }, {
+                {
+                        .id             = V4L2_CID_HFLIP,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "horizontal flip",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 0
+                },
+                .set = ov9650_set_hflip,
+                .get = ov9650_get_hflip
+        }, {
+                {
+                        .id             = V4L2_CID_VFLIP,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "vertical flip",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 0
+                },
+                .set = ov9650_set_vflip,
+                .get = ov9650_get_vflip
+        }, {
+                {
+                        .id             = V4L2_CID_AUTO_WHITE_BALANCE,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "auto white balance",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 0
+                },
+                .set = ov9650_set_auto_white_balance,
+                .get = ov9650_get_auto_white_balance
+        }, {
+                {
+                        .id             = V4L2_CID_AUTOGAIN,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "auto gain control",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 0
+                },
+                .set = ov9650_set_auto_gain,
+                .get = ov9650_get_auto_gain
+        }
+        },
+
+        .nmodes = 1,
+        .modes = {
+        {
+                M5602_DEFAULT_FRAME_WIDTH,
+                M5602_DEFAULT_FRAME_HEIGHT,
+                V4L2_PIX_FMT_SBGGR8,
+                V4L2_FIELD_NONE,
+                .sizeimage =
+                        M5602_DEFAULT_FRAME_WIDTH * M5602_DEFAULT_FRAME_HEIGHT,
+                .bytesperline = M5602_DEFAULT_FRAME_WIDTH,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 1
+        }
+        }
+};
+
+static const unsigned char preinit_ov9650[][3] =
+{
+        /* [INITCAM] */
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
+        {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00},
+
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x08},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x00},
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a},
+        /* Reset chip */
+        {SENSOR, OV9650_COM7, OV9650_REGISTER_RESET},
+        /* Enable double clock */
+        {SENSOR, OV9650_CLKRC, 0x80},
+        /* Do something out of spec with the power */
+        {SENSOR, OV9650_OFON, 0x40}
+};
+
+static const unsigned char init_ov9650[][3] =
+{
+        /* [INITCAM] */
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
+        {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00},
+
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x08},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x00},
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a},
+        /* Reset chip */
+        {SENSOR, OV9650_COM7, OV9650_REGISTER_RESET},
+        /* Enable double clock */
+        {SENSOR, OV9650_CLKRC, 0x80},
+        /* Do something out of spec with the power */
+        {SENSOR, OV9650_OFON, 0x40},
+
+        /* Set QQVGA */
+        {SENSOR, OV9650_COM1, 0x20},
+        /* Set fast AGC/AEC algorithm with unlimited step size */
+        {SENSOR, OV9650_COM8, OV9650_FAST_AGC_AEC |
+                              OV9650_AEC_UNLIM_STEP_SIZE |
+                              OV9650_AWB_EN | OV9650_AGC_EN},
+
+        {SENSOR, OV9650_CHLF, 0x10},
+        {SENSOR, OV9650_ARBLM, 0xbf},
+        {SENSOR, OV9650_ACOM38, 0x81},
+        /* Turn off color matrix coefficient double option */
+        {SENSOR, OV9650_COM16, 0x00},
+                /* Enable color matrix for RGB/YUV, Delay Y channel,
+        set output Y/UV delay to 1 */
+        {SENSOR, OV9650_COM13, 0x19},
+        /* Enable digital BLC, Set output mode to U Y V Y */
+        {SENSOR, OV9650_TSLB, 0x0c},
+        /* Limit the AGC/AEC stable upper region */
+        {SENSOR, OV9650_COM24, 0x00},
+        /* Enable HREF and some out of spec things */
+        {SENSOR, OV9650_COM12, 0x73},
+                /* Set all DBLC offset signs to positive and
+        do some out of spec stuff */
+        {SENSOR, OV9650_DBLC1, 0xdf},
+        {SENSOR, OV9650_COM21, 0x06},
+        {SENSOR, OV9650_RSVD35, 0x91},
+        /* Necessary, no camera stream without it */
+        {SENSOR, OV9650_RSVD16, 0x06},
+        {SENSOR, OV9650_RSVD94, 0x99},
+        {SENSOR, OV9650_RSVD95, 0x99},
+        {SENSOR, OV9650_RSVD96, 0x04},
+        /* Enable full range output */
+        {SENSOR, OV9650_COM15, 0x0},
+                /* Enable HREF at optical black, enable ADBLC bias,
+        enable ADBLC, reset timings at format change */
+        {SENSOR, OV9650_COM6, 0x4b},
+        /* Subtract 32 from the B channel bias */
+        {SENSOR, OV9650_BBIAS, 0xa0},
+        /* Subtract 32 from the Gb channel bias */
+        {SENSOR, OV9650_GbBIAS, 0xa0},
+        /* Do not bypass the analog BLC and to some out of spec stuff */
+        {SENSOR, OV9650_Gr_COM, 0x00},
+        /* Subtract 32 from the R channel bias */
+        {SENSOR, OV9650_RBIAS, 0xa0},
+        /* Subtract 32 from the R channel bias */
+        {SENSOR, OV9650_RBIAS, 0x0},
+        {SENSOR, OV9650_COM26, 0x80},
+        {SENSOR, OV9650_ACOMA9, 0x98},
+        /* Set the AGC/AEC stable region upper limit */
+        {SENSOR, OV9650_AEW, 0x68},
+        /* Set the AGC/AEC stable region lower limit */
+        {SENSOR, OV9650_AEB, 0x5c},
+        /* Set the high and low limit nibbles to 3 */
+        {SENSOR, OV9650_VPT, 0xc3},
+                /* Set the Automatic Gain Ceiling (AGC) to 128x,
+        drop VSYNC at frame drop,
+        limit exposure timing,
+        drop frame when the AEC step is larger than the exposure gap */
+        {SENSOR, OV9650_COM9, 0x6e},
+        /* Set VSYNC negative, Set RESET to SLHS (slave mode horizontal sync)
+        and set PWDN to SLVS (slave mode vertical sync) */
+        {SENSOR, OV9650_COM10, 0x42},
+        /* Set horizontal column start high to default value */
+        {SENSOR, OV9650_HSTART, 0x1a},
+        /* Set horizontal column end */
+        {SENSOR, OV9650_HSTOP, 0xbf},
+        /* Complementing register to the two writes above */
+        {SENSOR, OV9650_HREF, 0xb2},
+        /* Set vertical row start high bits */
+        {SENSOR, OV9650_VSTRT, 0x02},
+        /* Set vertical row end low bits */
+        {SENSOR, OV9650_VSTOP, 0x7e},
+        /* Set complementing vertical frame control */
+        {SENSOR, OV9650_VREF, 0x10},
+        /* Set raw RGB output format with VGA resolution */
+        {SENSOR, OV9650_COM7, OV9650_VGA_SELECT |
+                              OV9650_RGB_SELECT |
+                              OV9650_RAW_RGB_SELECT},
+        {SENSOR, OV9650_ADC, 0x04},
+        {SENSOR, OV9650_HV, 0x40},
+        /* Enable denoise, and white-pixel erase */
+        {SENSOR, OV9650_COM22, 0x23},
+
+        /* Set the high bits of the exposure value */
+        {SENSOR, OV9650_AECH, ((EXPOSURE_DEFAULT & 0xff00) >> 8)},
+
+        /* Set the low bits of the exposure value */
+        {SENSOR, OV9650_COM1, (EXPOSURE_DEFAULT & 0xff)},
+        {SENSOR, OV9650_GAIN, GAIN_DEFAULT},
+        {SENSOR, OV9650_BLUE, BLUE_GAIN_DEFAULT},
+        {SENSOR, OV9650_RED, RED_GAIN_DEFAULT},
+
+        {SENSOR, OV9650_COM3, OV9650_VARIOPIXEL},
+        {SENSOR, OV9650_COM5, OV9650_SYSTEM_CLK_SEL},
+
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x82},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_L, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_L, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x09},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0xe0},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x5e},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x02},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0xde}
+};
+
+static const unsigned char power_down_ov9650[][3] =
+{
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        {SENSOR, OV9650_COM7, 0x80},
+        {SENSOR, OV9650_OFON, 0xf4},
+        {SENSOR, OV9650_MVFP, 0x80},
+        {SENSOR, OV9650_DBLV, 0x3f},
+        {SENSOR, OV9650_RSVD36, 0x49},
+        {SENSOR, OV9650_COM7, 0x05},
+
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0}
+};
+
+/* Vertically and horizontally flips the image if matched, needed for machines
+   where the sensor is mounted upside down */
+static
+    const
+        struct dmi_system_id ov9650_flip_dmi_table[] = {
+        {
+                .ident = "ASUS A6VC",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "A6VC")
+                }
+        },
+        {
+                .ident = "ASUS A6VM",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "A6VM")
+                }
+        },
+        {
+                .ident = "ASUS A6JC",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "A6JC")
+                }
+        },
+        {
+                .ident = "ASUS A6Kt",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "A6Kt")
+                }
+        },
+        { }
+};
+
+#endif
diff --git a/drivers/media/video/gspca/m5602/m5602_po1030.c b/drivers/media/video/gspca/m5602/m5602_po1030.c
new file mode 100644
index 000000000000..08c015bde115
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_po1030.c
@@ -0,0 +1,336 @@
+/*
+ * Driver for the po1030 sensor
+ *
+ * Copyright (c) 2008 Erik Andren
+ * Copyright (c) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (c) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * 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.
+ *
+ */
+
+#include "m5602_po1030.h"
+
+int po1030_probe(struct sd *sd)
+{
+        u8 prod_id = 0, ver_id = 0, i;
+
+        if (force_sensor) {
+                if (force_sensor == PO1030_SENSOR) {
+                        info("Forcing a %s sensor", po1030.name);
+                        goto sensor_found;
+                }
+                /* If we want to force another sensor, don't try to probe this
+                 * one */
+                return -ENODEV;
+        }
+
+        info("Probing for a po1030 sensor");
+
+        /* Run the pre-init to actually probe the unit */
+        for (i = 0; i < ARRAY_SIZE(preinit_po1030); i++) {
+                u8 data = preinit_po1030[i][2];
+                if (preinit_po1030[i][0] == SENSOR)
+                        po1030_write_sensor(sd,
+                                preinit_po1030[i][1], &data, 1);
+                else
+                        m5602_write_bridge(sd, preinit_po1030[i][1], data);
+        }
+
+        if (po1030_read_sensor(sd, 0x3, &prod_id, 1))
+                return -ENODEV;
+
+        if (po1030_read_sensor(sd, 0x4, &ver_id, 1))
+                return -ENODEV;
+
+        if ((prod_id == 0x02) && (ver_id == 0xef)) {
+                info("Detected a po1030 sensor");
+                goto sensor_found;
+        }
+        return -ENODEV;
+
+sensor_found:
+        sd->gspca_dev.cam.cam_mode = po1030.modes;
+        sd->gspca_dev.cam.nmodes = po1030.nmodes;
+        sd->desc->ctrls = po1030.ctrls;
+        sd->desc->nctrls = po1030.nctrls;
+        return 0;
+}
+
+int po1030_read_sensor(struct sd *sd, const u8 address,
+                        u8 *i2c_data, const u8 len)
+{
+        int err, i;
+
+        do {
+                err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
+        } while ((*i2c_data & I2C_BUSY) && !err);
+
+        m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,
+                           sd->sensor->i2c_slave_id);
+        m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address);
+        m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x10 + len);
+        m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x08);
+
+        for (i = 0; i < len; i++) {
+                err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &(i2c_data[i]));
+
+                PDEBUG(DBG_TRACE, "Reading sensor register "
+                                "0x%x containing 0x%x ", address, *i2c_data);
+        }
+        return (err < 0) ? err : 0;
+}
+
+int po1030_write_sensor(struct sd *sd, const u8 address,
+                        u8 *i2c_data, const u8 len)
+{
+        int err, i;
+        u8 *p;
+        struct usb_device *udev = sd->gspca_dev.dev;
+        __u8 *buf = sd->gspca_dev.usb_buf;
+
+        /* The po1030 only supports one byte writes */
+        if (len > 1 || !len)
+                return -EINVAL;
+
+        memcpy(buf, sensor_urb_skeleton, sizeof(sensor_urb_skeleton));
+
+        buf[11] = sd->sensor->i2c_slave_id;
+        buf[15] = address;
+
+        p = buf + 16;
+
+        /* Copy a four byte write sequence for each byte to be written to */
+        for (i = 0; i < len; i++) {
+                memcpy(p, sensor_urb_skeleton + 16, 4);
+                p[3] = i2c_data[i];
+                p += 4;
+                PDEBUG(DBG_TRACE, "Writing sensor register 0x%x with 0x%x",
+                       address, i2c_data[i]);
+        }
+
+        /* Copy the footer */
+        memcpy(p, sensor_urb_skeleton + 20, 4);
+
+        /* Set the total length */
+        p[3] = 0x10 + len;
+
+        err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+                              0x04, 0x40, 0x19,
+                              0x0000, buf,
+                              20 + len * 4, M5602_URB_MSG_TIMEOUT);
+
+        return (err < 0) ? err : 0;
+}
+
+int po1030_init(struct sd *sd)
+{
+        int i, err = 0;
+
+        /* Init the sensor */
+        for (i = 0; i < ARRAY_SIZE(init_po1030); i++) {
+                u8 data[2] = {0x00, 0x00};
+
+                switch (init_po1030[i][0]) {
+                case BRIDGE:
+                        err = m5602_write_bridge(sd,
+                                init_po1030[i][1],
+                                init_po1030[i][2]);
+                        break;
+
+                case SENSOR:
+                        data[0] = init_po1030[i][2];
+                        err = po1030_write_sensor(sd,
+                                init_po1030[i][1], data, 1);
+                        break;
+
+                case SENSOR_LONG:
+                        data[0] = init_po1030[i][2];
+                        data[1] = init_po1030[i][3];
+                        err = po1030_write_sensor(sd,
+                                init_po1030[i][1], data, 2);
+                        break;
+                default:
+                        info("Invalid stream command, exiting init");
+                        return -EINVAL;
+                }
+        }
+
+        if (dump_sensor)
+                po1030_dump_registers(sd);
+
+        return (err < 0) ? err : 0;
+}
+
+int po1030_get_exposure(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 i2c_data;
+        int err;
+
+        err = po1030_read_sensor(sd, PO1030_REG_INTEGLINES_H,
+                                 &i2c_data, 1);
+        if (err < 0)
+                goto out;
+        *val = (i2c_data << 8);
+
+        err = po1030_read_sensor(sd, PO1030_REG_INTEGLINES_M,
+                                 &i2c_data, 1);
+        *val |= i2c_data;
+
+        PDEBUG(DBG_V4L2_CID, "Exposure read as %d", *val);
+out:
+        return (err < 0) ? err : 0;
+}
+
+int po1030_set_exposure(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 i2c_data;
+        int err;
+
+        PDEBUG(DBG_V4L2, "Set exposure to %d", val & 0xffff);
+
+        i2c_data = ((val & 0xff00) >> 8);
+        PDEBUG(DBG_V4L2, "Set exposure to high byte to 0x%x",
+               i2c_data);
+
+        err = po1030_write_sensor(sd, PO1030_REG_INTEGLINES_H,
+                                  &i2c_data, 1);
+        if (err < 0)
+                goto out;
+
+        i2c_data = (val & 0xff);
+        PDEBUG(DBG_V4L2, "Set exposure to low byte to 0x%x",
+               i2c_data);
+        err = po1030_write_sensor(sd, PO1030_REG_INTEGLINES_M,
+                                  &i2c_data, 1);
+
+out:
+        return (err < 0) ? err : 0;
+}
+
+int po1030_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 i2c_data;
+        int err;
+
+        err = po1030_read_sensor(sd, PO1030_REG_GLOBALGAIN,
+                                 &i2c_data, 1);
+        *val = i2c_data;
+        PDEBUG(DBG_V4L2_CID, "Read global gain %d", *val);
+
+        return (err < 0) ? err : 0;
+}
+
+int po1030_set_gain(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 i2c_data;
+        int err;
+
+        i2c_data = val & 0xff;
+        PDEBUG(DBG_V4L2, "Set global gain to %d", i2c_data);
+        err = po1030_write_sensor(sd, PO1030_REG_GLOBALGAIN,
+                                  &i2c_data, 1);
+        return (err < 0) ? err : 0;
+}
+
+int po1030_get_red_balance(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 i2c_data;
+        int err;
+
+        err = po1030_read_sensor(sd, PO1030_REG_RED_GAIN,
+                                 &i2c_data, 1);
+        *val = i2c_data;
+        PDEBUG(DBG_V4L2_CID, "Read red gain %d", *val);
+        return (err < 0) ? err : 0;
+}
+
+int po1030_set_red_balance(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 i2c_data;
+        int err;
+
+        i2c_data = val & 0xff;
+        PDEBUG(DBG_V4L2, "Set red gain to %d", i2c_data);
+        err = po1030_write_sensor(sd, PO1030_REG_RED_GAIN,
+                                  &i2c_data, 1);
+        return (err < 0) ? err : 0;
+}
+
+int po1030_get_blue_balance(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 i2c_data;
+        int err;
+
+        err = po1030_read_sensor(sd, PO1030_REG_BLUE_GAIN,
+                                 &i2c_data, 1);
+        *val = i2c_data;
+        PDEBUG(DBG_V4L2_CID, "Read blue gain %d", *val);
+
+        return (err < 0) ? err : 0;
+}
+
+int po1030_set_blue_balance(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 i2c_data;
+        int err;
+        i2c_data = val & 0xff;
+        PDEBUG(DBG_V4L2, "Set blue gain to %d", i2c_data);
+        err = po1030_write_sensor(sd, PO1030_REG_BLUE_GAIN,
+                                  &i2c_data, 1);
+
+        return (err < 0) ? err : 0;
+}
+
+int po1030_power_down(struct sd *sd)
+{
+        return 0;
+}
+
+void po1030_dump_registers(struct sd *sd)
+{
+        int address;
+        u8 value = 0;
+
+        info("Dumping the po1030 sensor core registers");
+        for (address = 0; address < 0x7f; address++) {
+                po1030_read_sensor(sd, address, &value, 1);
+                info("register 0x%x contains 0x%x",
+                     address, value);
+        }
+
+        info("po1030 register state dump complete");
+
+        info("Probing for which registers that are read/write");
+        for (address = 0; address < 0xff; address++) {
+                u8 old_value, ctrl_value;
+                u8 test_value[2] = {0xff, 0xff};
+
+                po1030_read_sensor(sd, address, &old_value, 1);
+                po1030_write_sensor(sd, address, test_value, 1);
+                po1030_read_sensor(sd, address, &ctrl_value, 1);
+
+                if (ctrl_value == test_value[0])
+                        info("register 0x%x is writeable", address);
+                else
+                        info("register 0x%x is read only", address);
+
+                /* Restore original value */
+                po1030_write_sensor(sd, address, &old_value, 1);
+        }
+}
diff --git a/drivers/media/video/gspca/m5602/m5602_po1030.h b/drivers/media/video/gspca/m5602/m5602_po1030.h
new file mode 100644
index 000000000000..68f34c97bf44
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_po1030.h
@@ -0,0 +1,478 @@
+/*
+ * Driver for the po1030 sensor.
+ * This is probably a pixel plus sensor but we haven't identified it yet
+ *
+ * Copyright (c) 2008 Erik Andren
+ * Copyright (c) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (c) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * Register defines taken from Pascal Stangs Proxycon Armlib
+ *
+ * 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.
+ *
+ */
+
+#ifndef M5602_PO1030_H_
+#define M5602_PO1030_H_
+
+#include "m5602_sensor.h"
+
+/*****************************************************************************/
+
+#define PO1030_REG_DEVID_H              0x00
+#define PO1030_REG_DEVID_L              0x01
+#define PO1030_REG_FRAMEWIDTH_H         0x04
+#define PO1030_REG_FRAMEWIDTH_L         0x05
+#define PO1030_REG_FRAMEHEIGHT_H        0x06
+#define PO1030_REG_FRAMEHEIGHT_L        0x07
+#define PO1030_REG_WINDOWX_H            0x08
+#define PO1030_REG_WINDOWX_L            0x09
+#define PO1030_REG_WINDOWY_H            0x0a
+#define PO1030_REG_WINDOWY_L            0x0b
+#define PO1030_REG_WINDOWWIDTH_H        0x0c
+#define PO1030_REG_WINDOWWIDTH_L        0x0d
+#define PO1030_REG_WINDOWHEIGHT_H       0x0e
+#define PO1030_REG_WINDOWHEIGHT_L       0x0f
+
+#define PO1030_REG_GLOBALIBIAS          0x12
+#define PO1030_REG_PIXELIBIAS           0x13
+
+#define PO1030_REG_GLOBALGAIN           0x15
+#define PO1030_REG_RED_GAIN             0x16
+#define PO1030_REG_GREEN_1_GAIN         0x17
+#define PO1030_REG_BLUE_GAIN            0x18
+#define PO1030_REG_GREEN_2_GAIN         0x19
+
+#define PO1030_REG_INTEGLINES_H         0x1a
+#define PO1030_REG_INTEGLINES_M         0x1b
+#define PO1030_REG_INTEGLINES_L         0x1c
+
+#define PO1030_REG_CONTROL1             0x1d
+#define PO1030_REG_CONTROL2             0x1e
+#define PO1030_REG_CONTROL3             0x1f
+#define PO1030_REG_CONTROL4             0x20
+
+#define PO1030_REG_PERIOD50_H           0x23
+#define PO1030_REG_PERIOD50_L           0x24
+#define PO1030_REG_PERIOD60_H           0x25
+#define PO1030_REG_PERIOD60_L           0x26
+#define PO1030_REG_REGCLK167            0x27
+#define PO1030_REG_DELTA50              0x28
+#define PO1030_REG_DELTA60              0x29
+
+#define PO1030_REG_ADCOFFSET            0x2c
+
+/* Gamma Correction Coeffs */
+#define PO1030_REG_GC0                  0x2d
+#define PO1030_REG_GC1                  0x2e
+#define PO1030_REG_GC2                  0x2f
+#define PO1030_REG_GC3                  0x30
+#define PO1030_REG_GC4                  0x31
+#define PO1030_REG_GC5                  0x32
+#define PO1030_REG_GC6                  0x33
+#define PO1030_REG_GC7                  0x34
+
+/* Color Transform Matrix */
+#define PO1030_REG_CT0                  0x35
+#define PO1030_REG_CT1                  0x36
+#define PO1030_REG_CT2                  0x37
+#define PO1030_REG_CT3                  0x38
+#define PO1030_REG_CT4                  0x39
+#define PO1030_REG_CT5                  0x3a
+#define PO1030_REG_CT6                  0x3b
+#define PO1030_REG_CT7                  0x3c
+#define PO1030_REG_CT8                  0x3d
+
+#define PO1030_REG_AUTOCTRL1            0x3e
+#define PO1030_REG_AUTOCTRL2            0x3f
+
+#define PO1030_REG_YTARGET              0x40
+#define PO1030_REG_GLOBALGAINMIN        0x41
+#define PO1030_REG_GLOBALGAINMAX        0x42
+
+/* Output format control */
+#define PO1030_REG_OUTFORMCTRL1         0x5a
+#define PO1030_REG_OUTFORMCTRL2         0x5b
+#define PO1030_REG_OUTFORMCTRL3         0x5c
+#define PO1030_REG_OUTFORMCTRL4         0x5d
+#define PO1030_REG_OUTFORMCTRL5         0x5e
+
+/* Imaging coefficients */
+#define PO1030_REG_YBRIGHT              0x73
+#define PO1030_REG_YCONTRAST            0x74
+#define PO1030_REG_YSATURATION          0x75
+
+/*****************************************************************************/
+
+#define PO1030_GLOBAL_GAIN_DEFAULT      0x12
+#define PO1030_EXPOSURE_DEFAULT         0xf0ff
+#define PO1030_BLUE_GAIN_DEFAULT        0x40
+#define PO1030_RED_GAIN_DEFAULT         0x40
+
+/*****************************************************************************/
+
+/* Kernel module parameters */
+extern int force_sensor;
+extern int dump_sensor;
+extern unsigned int m5602_debug;
+
+int po1030_probe(struct sd *sd);
+int po1030_init(struct sd *sd);
+int po1030_power_down(struct sd *sd);
+
+void po1030_dump_registers(struct sd *sd);
+
+int po1030_read_sensor(struct sd *sd, const u8 address,
+                              u8 *i2c_data, const u8 len);
+int po1030_write_sensor(struct sd *sd, const u8 address,
+                               u8 *i2c_data, const u8 len);
+
+int po1030_get_exposure(struct gspca_dev *gspca_dev, __s32 *val);
+int po1030_set_exposure(struct gspca_dev *gspca_dev, __s32 val);
+int po1030_get_gain(struct gspca_dev *gspca_dev, __s32 *val);
+int po1030_set_gain(struct gspca_dev *gspca_dev, __s32 val);
+int po1030_get_red_balance(struct gspca_dev *gspca_dev, __s32 *val);
+int po1030_set_red_balance(struct gspca_dev *gspca_dev, __s32 val);
+int po1030_get_blue_balance(struct gspca_dev *gspca_dev, __s32 *val);
+int po1030_set_blue_balance(struct gspca_dev *gspca_dev, __s32 val);
+
+static struct m5602_sensor po1030 = {
+        .name = "PO1030",
+
+        .i2c_slave_id = 0xdc,
+
+        .probe = po1030_probe,
+        .init = po1030_init,
+        .power_down = po1030_power_down,
+
+        .nctrls = 4,
+        .ctrls = {
+        {
+                {
+                        .id             = V4L2_CID_GAIN,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "gain",
+                        .minimum        = 0x00,
+                        .maximum        = 0xff,
+                        .step           = 0x1,
+                        .default_value  = PO1030_GLOBAL_GAIN_DEFAULT,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = po1030_set_gain,
+                .get = po1030_get_gain
+        }, {
+                {
+                        .id             = V4L2_CID_EXPOSURE,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "exposure",
+                        .minimum        = 0x00,
+                        .maximum        = 0xffff,
+                        .step           = 0x1,
+                        .default_value  = PO1030_EXPOSURE_DEFAULT,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = po1030_set_exposure,
+                .get = po1030_get_exposure
+        }, {
+                {
+                        .id             = V4L2_CID_RED_BALANCE,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "red balance",
+                        .minimum        = 0x00,
+                        .maximum        = 0xff,
+                        .step           = 0x1,
+                        .default_value  = PO1030_RED_GAIN_DEFAULT,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = po1030_set_red_balance,
+                .get = po1030_get_red_balance
+        }, {
+                {
+                        .id             = V4L2_CID_BLUE_BALANCE,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "blue balance",
+                        .minimum        = 0x00,
+                        .maximum        = 0xff,
+                        .step           = 0x1,
+                        .default_value  = PO1030_BLUE_GAIN_DEFAULT,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = po1030_set_blue_balance,
+                .get = po1030_get_blue_balance
+        }
+        },
+        .nmodes = 1,
+        .modes = {
+        {
+                M5602_DEFAULT_FRAME_WIDTH,
+                M5602_DEFAULT_FRAME_HEIGHT,
+                V4L2_PIX_FMT_SBGGR8,
+                V4L2_FIELD_NONE,
+                .sizeimage =
+                        M5602_DEFAULT_FRAME_WIDTH * M5602_DEFAULT_FRAME_HEIGHT,
+                .bytesperline = M5602_DEFAULT_FRAME_WIDTH,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 1
+        }
+        }
+};
+
+static const unsigned char preinit_po1030[][3] =
+{
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d},
+        {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
+
+        {SENSOR, PO1030_REG_AUTOCTRL2, 0x24},
+
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x02},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0xec},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x02},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x02},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x87},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00},
+
+        {SENSOR, PO1030_REG_AUTOCTRL2, 0x24},
+
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x00}
+};
+
+static const unsigned char init_po1030[][4] =
+{
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0},
+        /*sequence 1*/
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d},
+
+        {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
+        /*end of sequence 1*/
+
+        /*sequence 2 (same as stop sequence)*/
+        {SENSOR, PO1030_REG_AUTOCTRL2, 0x24},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        /*end of sequence 2*/
+
+        /*sequence 5*/
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x02},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0xec},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x02},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x02},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x87},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00},
+        /*end of sequence 5*/
+
+        /*sequence 2 stop */
+        {SENSOR, PO1030_REG_AUTOCTRL2, 0x24},
+
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        /*end of sequence 2 stop */
+
+/* ---------------------------------
+ * end of init - begin of start
+ * --------------------------------- */
+
+        /*sequence 3*/
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
+        /*end of sequence 3*/
+        /*sequence 4*/
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00},
+
+        {SENSOR, PO1030_REG_AUTOCTRL2, 0x04},
+
+        /* Set the width to 751 */
+        {SENSOR, PO1030_REG_FRAMEWIDTH_H, 0x02},
+        {SENSOR, PO1030_REG_FRAMEWIDTH_L, 0xef},
+
+        /* Set the height to 540 */
+        {SENSOR, PO1030_REG_FRAMEHEIGHT_H, 0x02},
+        {SENSOR, PO1030_REG_FRAMEHEIGHT_L, 0x1c},
+
+        /* Set the x window to 1 */
+        {SENSOR, PO1030_REG_WINDOWX_H, 0x00},
+        {SENSOR, PO1030_REG_WINDOWX_L, 0x01},
+
+        /* Set the y window to 1 */
+        {SENSOR, PO1030_REG_WINDOWY_H, 0x00},
+        {SENSOR, PO1030_REG_WINDOWX_L, 0x01},
+
+        {SENSOR, PO1030_REG_WINDOWWIDTH_H, 0x02},
+        {SENSOR, PO1030_REG_WINDOWWIDTH_L, 0x87},
+        {SENSOR, PO1030_REG_WINDOWHEIGHT_H, 0x01},
+        {SENSOR, PO1030_REG_WINDOWHEIGHT_L, 0xe3},
+
+        {SENSOR, PO1030_REG_OUTFORMCTRL2, 0x04},
+        {SENSOR, PO1030_REG_OUTFORMCTRL2, 0x04},
+        {SENSOR, PO1030_REG_AUTOCTRL1, 0x08},
+        {SENSOR, PO1030_REG_CONTROL2, 0x03},
+        {SENSOR, 0x21, 0x90},
+        {SENSOR, PO1030_REG_YTARGET, 0x60},
+        {SENSOR, 0x59, 0x13},
+        {SENSOR, PO1030_REG_OUTFORMCTRL1, 0x40},
+        {SENSOR, 0x5f, 0x00},
+        {SENSOR, 0x60, 0x80},
+        {SENSOR, 0x78, 0x14},
+        {SENSOR, 0x6f, 0x01},
+        {SENSOR, PO1030_REG_CONTROL1, 0x18},
+        {SENSOR, PO1030_REG_GLOBALGAINMAX, 0x14},
+        {SENSOR, 0x63, 0x38},
+        {SENSOR, 0x64, 0x38},
+        {SENSOR, PO1030_REG_CONTROL1, 0x58},
+        {SENSOR, PO1030_REG_RED_GAIN, 0x30},
+        {SENSOR, PO1030_REG_GREEN_1_GAIN, 0x30},
+        {SENSOR, PO1030_REG_BLUE_GAIN, 0x30},
+        {SENSOR, PO1030_REG_GREEN_2_GAIN, 0x30},
+        {SENSOR, PO1030_REG_GC0, 0x10},
+        {SENSOR, PO1030_REG_GC1, 0x20},
+        {SENSOR, PO1030_REG_GC2, 0x40},
+        {SENSOR, PO1030_REG_GC3, 0x60},
+        {SENSOR, PO1030_REG_GC4, 0x80},
+        {SENSOR, PO1030_REG_GC5, 0xa0},
+        {SENSOR, PO1030_REG_GC6, 0xc0},
+        {SENSOR, PO1030_REG_GC7, 0xff},
+        /*end of sequence 4*/
+        /*sequence 5*/
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x02},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0xec},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x02},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x7e},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00},
+        /*end of sequence 5*/
+
+        /*sequence 6*/
+        /* Changing 40 in f0 the image becomes green in bayer mode and red in
+         * rgb mode */
+        {SENSOR, PO1030_REG_RED_GAIN, PO1030_RED_GAIN_DEFAULT},
+        /* in changing 40 in f0 the image becomes green in bayer mode and red in
+         * rgb mode */
+        {SENSOR, PO1030_REG_BLUE_GAIN, PO1030_BLUE_GAIN_DEFAULT},
+
+        /* with a very low lighted environment increase the exposure but
+         * decrease the FPS (Frame Per Second) */
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+
+        /* Controls high exposure more than SENSOR_LOW_EXPOSURE, use only in
+         * low lighted environment (f0 is more than ff ?)*/
+        {SENSOR, PO1030_REG_INTEGLINES_H, ((PO1030_EXPOSURE_DEFAULT >> 2)
+                & 0xff)},
+
+        /* Controls middle exposure, use only in high lighted environment */
+        {SENSOR, PO1030_REG_INTEGLINES_M, PO1030_EXPOSURE_DEFAULT & 0xff},
+
+        /* Controls clarity (not sure) */
+        {SENSOR, PO1030_REG_INTEGLINES_L, 0x00},
+        /* Controls gain (the image is more lighted) */
+        {SENSOR, PO1030_REG_GLOBALGAIN, PO1030_GLOBAL_GAIN_DEFAULT},
+
+        /* Sets the width */
+        {SENSOR, PO1030_REG_FRAMEWIDTH_H, 0x02},
+        {SENSOR, PO1030_REG_FRAMEWIDTH_L, 0xef}
+        /*end of sequence 6*/
+};
+
+#endif
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
new file mode 100644
index 000000000000..68202565325d
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
@@ -0,0 +1,463 @@
+/*
+ * Driver for the s5k4aa sensor
+ *
+ * Copyright (C) 2008 Erik Andren
+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (C) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * 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.
+ *
+ */
+
+#include "m5602_s5k4aa.h"
+
+int s5k4aa_probe(struct sd *sd)
+{
+        u8 prod_id[6] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        const u8 expected_prod_id[6] = {0x00, 0x10, 0x00, 0x4b, 0x33, 0x75};
+        int i, err = 0;
+
+        if (force_sensor) {
+                if (force_sensor == S5K4AA_SENSOR) {
+                        info("Forcing a %s sensor", s5k4aa.name);
+                        goto sensor_found;
+                }
+                /* If we want to force another sensor, don't try to probe this
+                 * one */
+                return -ENODEV;
+        }
+
+        info("Probing for a s5k4aa sensor");
+
+        /* Preinit the sensor */
+        for (i = 0; i < ARRAY_SIZE(preinit_s5k4aa) && !err; i++) {
+                u8 data[2] = {0x00, 0x00};
+
+                switch (preinit_s5k4aa[i][0]) {
+                case BRIDGE:
+                        err = m5602_write_bridge(sd,
+                                                 preinit_s5k4aa[i][1],
+                                                 preinit_s5k4aa[i][2]);
+                        break;
+
+                case SENSOR:
+                        data[0] = preinit_s5k4aa[i][2];
+                        err = s5k4aa_write_sensor(sd,
+                                                  preinit_s5k4aa[i][1],
+                                                  data, 1);
+                        break;
+
+                case SENSOR_LONG:
+                        data[0] = preinit_s5k4aa[i][2];
+                        data[1] = preinit_s5k4aa[i][3];
+                        err = s5k4aa_write_sensor(sd,
+                                                  preinit_s5k4aa[i][1],
+                                                  data, 2);
+                        break;
+                default:
+                        info("Invalid stream command, exiting init");
+                        return -EINVAL;
+                }
+        }
+
+        /* Test some registers, but we don't know their exact meaning yet */
+        if (s5k4aa_read_sensor(sd, 0x00, prod_id, sizeof(prod_id)))
+                return -ENODEV;
+
+        if (memcmp(prod_id, expected_prod_id, sizeof(prod_id)))
+                return -ENODEV;
+        else
+                info("Detected a s5k4aa sensor");
+sensor_found:
+        sd->gspca_dev.cam.cam_mode = s5k4aa.modes;
+        sd->gspca_dev.cam.nmodes = s5k4aa.nmodes;
+        sd->desc->ctrls = s5k4aa.ctrls;
+        sd->desc->nctrls = s5k4aa.nctrls;
+
+        return 0;
+}
+
+int s5k4aa_read_sensor(struct sd *sd, const u8 address,
+                       u8 *i2c_data, const u8 len)
+{
+        int err, i;
+
+        do {
+                err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
+        } while ((*i2c_data & I2C_BUSY) && !err);
+        if (err < 0)
+                goto out;
+
+        err = m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,
+                                 sd->sensor->i2c_slave_id);
+        if (err < 0)
+                goto out;
+
+        err = m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address);
+        if (err < 0)
+                goto out;
+
+        err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x18 + len);
+        if (err < 0)
+                goto out;
+
+        do {
+                err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
+        } while ((*i2c_data & I2C_BUSY) && !err);
+        if (err < 0)
+                goto out;
+
+        for (i = 0; (i < len) & !err; i++) {
+                err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &(i2c_data[i]));
+
+                PDEBUG(DBG_TRACE, "Reading sensor register "
+                                  "0x%x containing 0x%x ", address, *i2c_data);
+        }
+out:
+        return (err < 0) ? err : 0;
+}
+
+int s5k4aa_write_sensor(struct sd *sd, const u8 address,
+                        u8 *i2c_data, const u8 len)
+{
+        int err, i;
+        u8 *p;
+        struct usb_device *udev = sd->gspca_dev.dev;
+        __u8 *buf = sd->gspca_dev.usb_buf;
+
+        /* No sensor with a data width larger than 16 bits has yet been seen */
+        if (len > 2 || !len)
+                return -EINVAL;
+
+        memcpy(buf, sensor_urb_skeleton,
+               sizeof(sensor_urb_skeleton));
+
+        buf[11] = sd->sensor->i2c_slave_id;
+        buf[15] = address;
+
+        /* Special case larger sensor writes */
+        p = buf + 16;
+
+        /* Copy a four byte write sequence for each byte to be written to */
+        for (i = 0; i < len; i++) {
+                memcpy(p, sensor_urb_skeleton + 16, 4);
+                p[3] = i2c_data[i];
+                p += 4;
+                PDEBUG(DBG_TRACE, "Writing sensor register 0x%x with 0x%x",
+                       address, i2c_data[i]);
+        }
+
+        /* Copy the tailer */
+        memcpy(p, sensor_urb_skeleton + 20, 4);
+
+        /* Set the total length */
+        p[3] = 0x10 + len;
+
+        err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+                              0x04, 0x40, 0x19,
+                              0x0000, buf,
+                              20 + len * 4, M5602_URB_MSG_TIMEOUT);
+
+        return (err < 0) ? err : 0;
+}
+
+int s5k4aa_init(struct sd *sd)
+{
+        int i, err = 0;
+
+        for (i = 0; i < ARRAY_SIZE(init_s5k4aa) && !err; i++) {
+                u8 data[2] = {0x00, 0x00};
+
+                switch (init_s5k4aa[i][0]) {
+                case BRIDGE:
+                        err = m5602_write_bridge(sd,
+                                init_s5k4aa[i][1],
+                                init_s5k4aa[i][2]);
+                        break;
+
+                case SENSOR:
+                        data[0] = init_s5k4aa[i][2];
+                        err = s5k4aa_write_sensor(sd,
+                                init_s5k4aa[i][1], data, 1);
+                        break;
+
+                case SENSOR_LONG:
+                        data[0] = init_s5k4aa[i][2];
+                        data[1] = init_s5k4aa[i][3];
+                        err = s5k4aa_write_sensor(sd,
+                                init_s5k4aa[i][1], data, 2);
+                        break;
+                default:
+                        info("Invalid stream command, exiting init");
+                        return -EINVAL;
+                }
+        }
+
+        if (dump_sensor)
+                s5k4aa_dump_registers(sd);
+
+        if (!err && dmi_check_system(s5k4aa_vflip_dmi_table)) {
+                u8 data = 0x02;
+                info("vertical flip quirk active");
+                s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
+                s5k4aa_read_sensor(sd, S5K4AA_READ_MODE, &data, 1);
+                data |= S5K4AA_RM_V_FLIP;
+                data &= ~S5K4AA_RM_H_FLIP;
+                s5k4aa_write_sensor(sd, S5K4AA_READ_MODE, &data, 1);
+
+                /* Decrement COLSTART to preserve color order (BGGR) */
+                s5k4aa_read_sensor(sd, S5K4AA_COLSTART_LO, &data, 1);
+                data--;
+                s5k4aa_write_sensor(sd, S5K4AA_COLSTART_LO, &data, 1);
+
+                /* Increment ROWSTART to preserve color order (BGGR) */
+                s5k4aa_read_sensor(sd, S5K4AA_ROWSTART_LO, &data, 1);
+                data++;
+                s5k4aa_write_sensor(sd, S5K4AA_ROWSTART_LO, &data, 1);
+        }
+
+        return (err < 0) ? err : 0;
+}
+
+int s5k4aa_power_down(struct sd *sd)
+{
+        return 0;
+}
+
+int s5k4aa_get_exposure(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 data = S5K4AA_PAGE_MAP_2;
+        int err;
+
+        err = s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
+        if (err < 0)
+                goto out;
+
+        err = s5k4aa_read_sensor(sd, S5K4AA_EXPOSURE_HI, &data, 1);
+        if (err < 0)
+                goto out;
+
+        *val = data << 8;
+        err = s5k4aa_read_sensor(sd, S5K4AA_EXPOSURE_LO, &data, 1);
+        *val |= data;
+        PDEBUG(DBG_V4L2_CID, "Read exposure %d", *val);
+out:
+        return (err < 0) ? err : 0;
+}
+
+int s5k4aa_set_exposure(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 data = S5K4AA_PAGE_MAP_2;
+        int err;
+
+        PDEBUG(DBG_V4L2_CID, "Set exposure to %d", val);
+        err = s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
+        if (err < 0)
+                goto out;
+        data = (val >> 8) & 0xff;
+        err = s5k4aa_write_sensor(sd, S5K4AA_EXPOSURE_HI, &data, 1);
+        if (err < 0)
+                goto out;
+        data = val & 0xff;
+        err = s5k4aa_write_sensor(sd, S5K4AA_EXPOSURE_LO, &data, 1);
+out:
+        return (err < 0) ? err : 0;
+}
+
+int s5k4aa_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 data = S5K4AA_PAGE_MAP_2;
+        int err;
+
+        err = s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
+        if (err < 0)
+                goto out;
+
+        err = s5k4aa_read_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
+        *val = (data & S5K4AA_RM_V_FLIP) >> 7;
+        PDEBUG(DBG_V4L2_CID, "Read vertical flip %d", *val);
+
+out:
+        return (err < 0) ? err : 0;
+}
+
+int s5k4aa_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 data = S5K4AA_PAGE_MAP_2;
+        int err;
+
+        PDEBUG(DBG_V4L2_CID, "Set vertical flip to %d", val);
+        err = s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
+        if (err < 0)
+                goto out;
+        err = s5k4aa_write_sensor(sd, S5K4AA_READ_MODE, &data, 1);
+        if (err < 0)
+                goto out;
+        data = ((data & ~S5K4AA_RM_V_FLIP)
+                        | ((val & 0x01) << 7));
+        err = s5k4aa_write_sensor(sd, S5K4AA_READ_MODE, &data, 1);
+        if (err < 0)
+                goto out;
+
+        if (val) {
+                err = s5k4aa_read_sensor(sd, S5K4AA_ROWSTART_LO, &data, 1);
+                if (err < 0)
+                        goto out;
+
+                data++;
+                err = s5k4aa_write_sensor(sd, S5K4AA_ROWSTART_LO, &data, 1);
+        } else {
+                err = s5k4aa_read_sensor(sd, S5K4AA_ROWSTART_LO, &data, 1);
+                if (err < 0)
+                        goto out;
+
+                data--;
+                err = s5k4aa_write_sensor(sd, S5K4AA_ROWSTART_LO, &data, 1);
+        }
+out:
+        return (err < 0) ? err : 0;
+}
+
+int s5k4aa_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 data = S5K4AA_PAGE_MAP_2;
+        int err;
+
+        err = s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
+        if (err < 0)
+                goto out;
+
+        err = s5k4aa_read_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
+        *val = (data & S5K4AA_RM_H_FLIP) >> 6;
+        PDEBUG(DBG_V4L2_CID, "Read horizontal flip %d", *val);
+out:
+        return (err < 0) ? err : 0;
+}
+
+int s5k4aa_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 data = S5K4AA_PAGE_MAP_2;
+        int err;
+
+        PDEBUG(DBG_V4L2_CID, "Set horizontal flip to %d",
+               val);
+        err = s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
+        if (err < 0)
+                goto out;
+        err = s5k4aa_write_sensor(sd, S5K4AA_READ_MODE, &data, 1);
+        if (err < 0)
+                goto out;
+
+        data = ((data & ~S5K4AA_RM_H_FLIP) | ((val & 0x01) << 6));
+        err = s5k4aa_write_sensor(sd, S5K4AA_READ_MODE, &data, 1);
+        if (err < 0)
+                goto out;
+
+        if (val) {
+                err = s5k4aa_read_sensor(sd, S5K4AA_COLSTART_LO, &data, 1);
+                if (err < 0)
+                        goto out;
+                data++;
+                err = s5k4aa_write_sensor(sd, S5K4AA_COLSTART_LO, &data, 1);
+                if (err < 0)
+                        goto out;
+        } else {
+                err = s5k4aa_read_sensor(sd, S5K4AA_COLSTART_LO, &data, 1);
+                if (err < 0)
+                        goto out;
+                data--;
+                err = s5k4aa_write_sensor(sd, S5K4AA_COLSTART_LO, &data, 1);
+        }
+out:
+        return (err < 0) ? err : 0;
+}
+
+int s5k4aa_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 data = S5K4AA_PAGE_MAP_2;
+        int err;
+
+        err = s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
+        if (err < 0)
+                goto out;
+
+        err = s5k4aa_read_sensor(sd, S5K4AA_GAIN_2, &data, 1);
+        *val = data;
+        PDEBUG(DBG_V4L2_CID, "Read gain %d", *val);
+
+out:
+        return (err < 0) ? err : 0;
+}
+
+int s5k4aa_set_gain(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 data = S5K4AA_PAGE_MAP_2;
+        int err;
+
+        PDEBUG(DBG_V4L2_CID, "Set gain to %d", val);
+        err = s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
+        if (err < 0)
+                goto out;
+
+        data = val & 0xff;
+        err = s5k4aa_write_sensor(sd, S5K4AA_GAIN_2, &data, 1);
+
+out:
+        return (err < 0) ? err : 0;
+}
+
+void s5k4aa_dump_registers(struct sd *sd)
+{
+        int address;
+        u8 page, old_page;
+        s5k4aa_read_sensor(sd, S5K4AA_PAGE_MAP, &old_page, 1);
+        for (page = 0; page < 16; page++) {
+                s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &page, 1);
+                info("Dumping the s5k4aa register state for page 0x%x", page);
+                for (address = 0; address <= 0xff; address++) {
+                        u8 value = 0;
+                        s5k4aa_read_sensor(sd, address, &value, 1);
+                        info("register 0x%x contains 0x%x",
+                             address, value);
+                }
+        }
+        info("s5k4aa register state dump complete");
+
+        for (page = 0; page < 16; page++) {
+                s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &page, 1);
+                info("Probing for which registers that are "
+                     "read/write for page 0x%x", page);
+                for (address = 0; address <= 0xff; address++) {
+                        u8 old_value, ctrl_value, test_value = 0xff;
+
+                        s5k4aa_read_sensor(sd, address, &old_value, 1);
+                        s5k4aa_write_sensor(sd, address, &test_value, 1);
+                        s5k4aa_read_sensor(sd, address, &ctrl_value, 1);
+
+                        if (ctrl_value == test_value)
+                                info("register 0x%x is writeable", address);
+                        else
+                                info("register 0x%x is read only", address);
+
+                        /* Restore original value */
+                        s5k4aa_write_sensor(sd, address, &old_value, 1);
+                }
+        }
+        info("Read/write register probing complete");
+        s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &old_page, 1);
+}
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.h b/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
new file mode 100644
index 000000000000..bb7f7e3e90af
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
@@ -0,0 +1,370 @@
+/*
+ * Driver for the s5k4aa sensor
+ *
+ * Copyright (C) 2008 Erik Andren
+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (C) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * 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.
+ *
+ */
+
+#ifndef M5602_S5K4AA_H_
+#define M5602_S5K4AA_H_
+
+#include <linux/dmi.h>
+
+#include "m5602_sensor.h"
+
+/*****************************************************************************/
+
+#define S5K4AA_PAGE_MAP                 0xec
+
+#define S5K4AA_PAGE_MAP_0               0x00
+#define S5K4AA_PAGE_MAP_1               0x01
+#define S5K4AA_PAGE_MAP_2               0x02
+
+/* Sensor register definitions for page 0x02 */
+#define S5K4AA_READ_MODE                0x03
+#define S5K4AA_ROWSTART_HI              0x04
+#define S5K4AA_ROWSTART_LO              0x05
+#define S5K4AA_COLSTART_HI              0x06
+#define S5K4AA_COLSTART_LO              0x07
+#define S5K4AA_WINDOW_HEIGHT_HI         0x08
+#define S5K4AA_WINDOW_HEIGHT_LO         0x09
+#define S5K4AA_WINDOW_WIDTH_HI          0x0a
+#define S5K4AA_WINDOW_WIDTH_LO          0x0b
+#define S5K4AA_GLOBAL_GAIN__            0x0f /* Only a guess ATM !!! */
+#define S5K4AA_H_BLANK_HI__             0x1d /* Only a guess ATM !!! sync lost
+                                                if too low, reduces frame rate
+                                                if too high */
+#define S5K4AA_H_BLANK_LO__             0x1e /* Only a guess ATM !!! */
+#define S5K4AA_EXPOSURE_HI              0x17
+#define S5K4AA_EXPOSURE_LO              0x18
+#define S5K4AA_GAIN_1                   0x1f /* (digital?) gain : 5 bits */
+#define S5K4AA_GAIN_2                   0x20 /* (analogue?) gain : 7 bits */
+
+#define S5K4AA_RM_ROW_SKIP_4X           0x08
+#define S5K4AA_RM_ROW_SKIP_2X           0x04
+#define S5K4AA_RM_COL_SKIP_4X           0x02
+#define S5K4AA_RM_COL_SKIP_2X           0x01
+#define S5K4AA_RM_H_FLIP                0x40
+#define S5K4AA_RM_V_FLIP                0x80
+
+/*****************************************************************************/
+
+/* Kernel module parameters */
+extern int force_sensor;
+extern int dump_sensor;
+extern unsigned int m5602_debug;
+
+int s5k4aa_probe(struct sd *sd);
+int s5k4aa_init(struct sd *sd);
+int s5k4aa_power_down(struct sd *sd);
+
+void s5k4aa_dump_registers(struct sd *sd);
+
+int s5k4aa_read_sensor(struct sd *sd, const u8 address,
+                       u8 *i2c_data, const u8 len);
+int s5k4aa_write_sensor(struct sd *sd, const u8 address,
+                        u8 *i2c_data, const u8 len);
+
+int s5k4aa_get_exposure(struct gspca_dev *gspca_dev, __s32 *val);
+int s5k4aa_set_exposure(struct gspca_dev *gspca_dev, __s32 val);
+int s5k4aa_get_vflip(struct gspca_dev *gspca_dev, __s32 *val);
+int s5k4aa_set_vflip(struct gspca_dev *gspca_dev, __s32 val);
+int s5k4aa_get_hflip(struct gspca_dev *gspca_dev, __s32 *val);
+int s5k4aa_set_hflip(struct gspca_dev *gspca_dev, __s32 val);
+int s5k4aa_get_gain(struct gspca_dev *gspca_dev, __s32 *val);
+int s5k4aa_set_gain(struct gspca_dev *gspca_dev, __s32 val);
+
+static struct m5602_sensor s5k4aa = {
+        .name = "S5K4AA",
+        .probe = s5k4aa_probe,
+        .init = s5k4aa_init,
+        .power_down = s5k4aa_power_down,
+        .read_sensor = s5k4aa_read_sensor,
+        .write_sensor = s5k4aa_write_sensor,
+        .i2c_slave_id = 0x5a,
+        .nctrls = 4,
+        .ctrls = {
+        {
+                {
+                        .id             = V4L2_CID_VFLIP,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "vertical flip",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 0
+                },
+                .set = s5k4aa_set_vflip,
+                .get = s5k4aa_get_vflip
+
+        }, {
+                {
+                        .id             = V4L2_CID_HFLIP,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "horizontal flip",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 0
+                },
+                .set = s5k4aa_set_hflip,
+                .get = s5k4aa_get_hflip
+
+        }, {
+                {
+                        .id             = V4L2_CID_GAIN,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "Gain",
+                        .minimum        = 0,
+                        .maximum        = 127,
+                        .step           = 1,
+                        .default_value  = 0xa0,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = s5k4aa_set_gain,
+                .get = s5k4aa_get_gain
+        }, {
+                {
+                        .id             = V4L2_CID_EXPOSURE,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "Exposure",
+                        .minimum        = 13,
+                        .maximum        = 0xfff,
+                        .step           = 1,
+                        .default_value  = 0x100,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = s5k4aa_set_exposure,
+                .get = s5k4aa_get_exposure
+        }
+        },
+
+        .nmodes = 1,
+        .modes = {
+        {
+                M5602_DEFAULT_FRAME_WIDTH,
+                M5602_DEFAULT_FRAME_HEIGHT,
+                V4L2_PIX_FMT_SBGGR8,
+                V4L2_FIELD_NONE,
+                .sizeimage =
+                        M5602_DEFAULT_FRAME_WIDTH * M5602_DEFAULT_FRAME_HEIGHT,
+                .bytesperline = M5602_DEFAULT_FRAME_WIDTH,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 1
+        }
+        }
+};
+
+static const unsigned char preinit_s5k4aa[][4] =
+{
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00, 0x00},
+
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x08, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0x80, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x3f, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x3f, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x08, 0x00},
+
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x14, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xf0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x1c, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x20, 0x00},
+
+        {SENSOR, S5K4AA_PAGE_MAP, 0x00, 0x00}
+};
+
+static const unsigned char init_s5k4aa[][4] =
+{
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00, 0x00},
+
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x08, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0x80, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x3f, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x3f, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x08, 0x00},
+
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x14, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xf0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x1c, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x20, 0x00},
+
+        {SENSOR, S5K4AA_PAGE_MAP, 0x07, 0x00},
+        {SENSOR, 0x36, 0x01, 0x00},
+        {SENSOR, S5K4AA_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, 0x7b, 0xff, 0x00},
+        {SENSOR, S5K4AA_PAGE_MAP, 0x02, 0x00},
+        {SENSOR, 0x0c, 0x05, 0x00},
+        {SENSOR, 0x02, 0x0e, 0x00},
+        {SENSOR, S5K4AA_GAIN_1, 0x0f, 0x00},
+        {SENSOR, S5K4AA_GAIN_2, 0x00, 0x00},
+        {SENSOR, S5K4AA_GLOBAL_GAIN__, 0x01, 0x00},
+        {SENSOR, 0x11, 0x00, 0x00},
+        {SENSOR, 0x12, 0x00, 0x00},
+        {SENSOR, S5K4AA_PAGE_MAP, 0x02, 0x00},
+        {SENSOR, S5K4AA_READ_MODE, 0xa0, 0x00},
+        {SENSOR, 0x37, 0x00, 0x00},
+        {SENSOR, S5K4AA_ROWSTART_HI, 0x00, 0x00},
+        {SENSOR, S5K4AA_ROWSTART_LO, 0x2a, 0x00},
+        {SENSOR, S5K4AA_COLSTART_HI, 0x00, 0x00},
+        {SENSOR, S5K4AA_COLSTART_LO, 0x0b, 0x00},
+        {SENSOR, S5K4AA_WINDOW_HEIGHT_HI, 0x03, 0x00},
+        {SENSOR, S5K4AA_WINDOW_HEIGHT_LO, 0xc4, 0x00},
+        {SENSOR, S5K4AA_WINDOW_WIDTH_HI, 0x05, 0x00},
+        {SENSOR, S5K4AA_WINDOW_WIDTH_LO, 0x08, 0x00},
+        {SENSOR, S5K4AA_H_BLANK_HI__, 0x00, 0x00},
+        {SENSOR, S5K4AA_H_BLANK_LO__, 0x48, 0x00},
+        {SENSOR, S5K4AA_EXPOSURE_HI, 0x00, 0x00},
+        {SENSOR, S5K4AA_EXPOSURE_LO, 0x43, 0x00},
+        {SENSOR, 0x11, 0x04, 0x00},
+        {SENSOR, 0x12, 0xc3, 0x00},
+        {SENSOR, S5K4AA_PAGE_MAP, 0x02, 0x00},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x08, 0x00},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        /* VSYNC_PARA, VSYNC_PARA : img height 480 = 0x01e0 */
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0xe0, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        /* HSYNC_PARA, HSYNC_PARA : img width 640 = 0x0280 */
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x80, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xa0, 0x00}, /* 48 MHz */
+
+        {SENSOR, S5K4AA_PAGE_MAP, 0x02, 0x00},
+        {SENSOR, S5K4AA_READ_MODE, S5K4AA_RM_H_FLIP | S5K4AA_RM_ROW_SKIP_2X
+                | S5K4AA_RM_COL_SKIP_2X, 0x00},
+        /* 0x37 : Fix image stability when light is too bright and improves
+         * image quality in 640x480, but worsens it in 1280x1024 */
+        {SENSOR, 0x37, 0x01, 0x00},
+        /* ROWSTART_HI, ROWSTART_LO : 10 + (1024-960)/2 = 42 = 0x002a */
+        {SENSOR, S5K4AA_ROWSTART_HI, 0x00, 0x00},
+        {SENSOR, S5K4AA_ROWSTART_LO, 0x2a, 0x00},
+        {SENSOR, S5K4AA_COLSTART_HI, 0x00, 0x00},
+        {SENSOR, S5K4AA_COLSTART_LO, 0x0c, 0x00},
+        /* window_height_hi, window_height_lo : 960 = 0x03c0 */
+        {SENSOR, S5K4AA_WINDOW_HEIGHT_HI, 0x03, 0x00},
+        {SENSOR, S5K4AA_WINDOW_HEIGHT_LO, 0xc0, 0x00},
+        /* window_width_hi, window_width_lo : 1280 = 0x0500 */
+        {SENSOR, S5K4AA_WINDOW_WIDTH_HI, 0x05, 0x00},
+        {SENSOR, S5K4AA_WINDOW_WIDTH_LO, 0x00, 0x00},
+        {SENSOR, S5K4AA_H_BLANK_HI__, 0x00, 0x00},
+        {SENSOR, S5K4AA_H_BLANK_LO__, 0xa8, 0x00}, /* helps to sync... */
+        {SENSOR, S5K4AA_EXPOSURE_HI, 0x01, 0x00},
+        {SENSOR, S5K4AA_EXPOSURE_LO, 0x00, 0x00},
+        {SENSOR, 0x11, 0x04, 0x00},
+        {SENSOR, 0x12, 0xc3, 0x00},
+        {SENSOR, S5K4AA_PAGE_MAP, 0x02, 0x00},
+        {SENSOR, 0x02, 0x0e, 0x00},
+        {SENSOR_LONG, S5K4AA_GLOBAL_GAIN__, 0x0f, 0x00},
+        {SENSOR, S5K4AA_GAIN_1, 0x0b, 0x00},
+        {SENSOR, S5K4AA_GAIN_2, 0xa0, 0x00}
+};
+
+static
+    const
+        struct dmi_system_id s5k4aa_vflip_dmi_table[] = {
+        {
+                .ident = "Fujitsu-Siemens Amilo Xa 2528",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Xa 2528")
+                }
+        },
+        {
+                .ident = "Fujitsu-Siemens Amilo Xi 2550",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Xi 2550")
+                }
+        },
+                {
+                .ident = "MSI GX700",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "GX700"),
+                        DMI_MATCH(DMI_BIOS_DATE, "07/26/2007")
+                }
+        },
+        { }
+};
+
+#endif
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k83a.c b/drivers/media/video/gspca/m5602/m5602_s5k83a.c
new file mode 100644
index 000000000000..b4b33c2d0499
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_s5k83a.c
@@ -0,0 +1,423 @@
+/*
+ * Driver for the s5k83a sensor
+ *
+ * Copyright (C) 2008 Erik Andren
+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (C) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * 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.
+ *
+ */
+
+#include "m5602_s5k83a.h"
+
+int s5k83a_probe(struct sd *sd)
+{
+        u8 prod_id = 0, ver_id = 0;
+        int i, err = 0;
+
+        if (force_sensor) {
+                if (force_sensor == S5K83A_SENSOR) {
+                        info("Forcing a %s sensor", s5k83a.name);
+                        goto sensor_found;
+                }
+                /* If we want to force another sensor, don't try to probe this
+                 * one */
+                return -ENODEV;
+        }
+
+        info("Probing for a s5k83a sensor");
+
+        /* Preinit the sensor */
+        for (i = 0; i < ARRAY_SIZE(preinit_s5k83a) && !err; i++) {
+                u8 data[2] = {preinit_s5k83a[i][2], preinit_s5k83a[i][3]};
+                if (preinit_s5k83a[i][0] == SENSOR)
+                        err = s5k83a_write_sensor(sd, preinit_s5k83a[i][1],
+                                data, 2);
+                else
+                        err = m5602_write_bridge(sd, preinit_s5k83a[i][1],
+                                data[0]);
+        }
+
+        /* We don't know what register (if any) that contain the product id
+         * Just pick the first addresses that seem to produce the same results
+         * on multiple machines */
+        if (s5k83a_read_sensor(sd, 0x00, &prod_id, 1))
+                return -ENODEV;
+
+        if (s5k83a_read_sensor(sd, 0x01, &ver_id, 1))
+                return -ENODEV;
+
+        if ((prod_id == 0xff) || (ver_id == 0xff))
+                return -ENODEV;
+        else
+                info("Detected a s5k83a sensor");
+
+sensor_found:
+        sd->gspca_dev.cam.cam_mode = s5k83a.modes;
+        sd->gspca_dev.cam.nmodes = s5k83a.nmodes;
+        sd->desc->ctrls = s5k83a.ctrls;
+        sd->desc->nctrls = s5k83a.nctrls;
+        return 0;
+}
+
+int s5k83a_read_sensor(struct sd *sd, const u8 address,
+                              u8 *i2c_data, const u8 len)
+{
+        int err, i;
+
+        do {
+                err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
+        } while ((*i2c_data & I2C_BUSY) && !err);
+        if (err < 0)
+                goto out;
+
+        err = m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,
+                                 sd->sensor->i2c_slave_id);
+        if (err < 0)
+                goto out;
+
+        err = m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address);
+        if (err < 0)
+                goto out;
+
+        err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x18 + len);
+        if (err < 0)
+                goto out;
+
+        do {
+                err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
+        } while ((*i2c_data & I2C_BUSY) && !err);
+
+        if (err < 0)
+                goto out;
+        for (i = 0; i < len && !len; i++) {
+                err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &(i2c_data[i]));
+
+                PDEBUG(DBG_TRACE, "Reading sensor register "
+                                  "0x%x containing 0x%x ", address, *i2c_data);
+        }
+
+out:
+        return (err < 0) ? err : 0;
+}
+
+int s5k83a_write_sensor(struct sd *sd, const u8 address,
+                               u8 *i2c_data, const u8 len)
+{
+        int err, i;
+        u8 *p;
+        struct usb_device *udev = sd->gspca_dev.dev;
+        __u8 *buf = sd->gspca_dev.usb_buf;
+
+        /* No sensor with a data width larger than 16 bits has yet been seen */
+        if (len > 2 || !len)
+                return -EINVAL;
+
+        memcpy(buf, sensor_urb_skeleton,
+               sizeof(sensor_urb_skeleton));
+
+        buf[11] = sd->sensor->i2c_slave_id;
+        buf[15] = address;
+
+        /* Special case larger sensor writes */
+        p = buf + 16;
+
+        /* Copy a four byte write sequence for each byte to be written to */
+        for (i = 0; i < len; i++) {
+                memcpy(p, sensor_urb_skeleton + 16, 4);
+                p[3] = i2c_data[i];
+                p += 4;
+                PDEBUG(DBG_TRACE, "Writing sensor register 0x%x with 0x%x",
+                       address, i2c_data[i]);
+        }
+
+        /* Copy the tailer */
+        memcpy(p, sensor_urb_skeleton + 20, 4);
+
+        /* Set the total length */
+        p[3] = 0x10 + len;
+
+        err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+                              0x04, 0x40, 0x19,
+                              0x0000, buf,
+                              20 + len * 4, M5602_URB_MSG_TIMEOUT);
+
+        return (err < 0) ? err : 0;
+}
+
+int s5k83a_init(struct sd *sd)
+{
+        int i, err = 0;
+
+        for (i = 0; i < ARRAY_SIZE(init_s5k83a) && !err; i++) {
+                u8 data[2] = {0x00, 0x00};
+
+                switch (init_s5k83a[i][0]) {
+                case BRIDGE:
+                        err = m5602_write_bridge(sd,
+                                        init_s5k83a[i][1],
+                                        init_s5k83a[i][2]);
+                        break;
+
+                case SENSOR:
+                        data[0] = init_s5k83a[i][2];
+                        err = s5k83a_write_sensor(sd,
+                                init_s5k83a[i][1], data, 1);
+                        break;
+
+                case SENSOR_LONG:
+                        data[0] = init_s5k83a[i][2];
+                        data[1] = init_s5k83a[i][3];
+                        err = s5k83a_write_sensor(sd,
+                                init_s5k83a[i][1], data, 2);
+                        break;
+                default:
+                        info("Invalid stream command, exiting init");
+                        return -EINVAL;
+                }
+        }
+
+        if (dump_sensor)
+                s5k83a_dump_registers(sd);
+
+        return (err < 0) ? err : 0;
+}
+
+int s5k83a_power_down(struct sd *sd)
+{
+        return 0;
+}
+
+void s5k83a_dump_registers(struct sd *sd)
+{
+        int address;
+        u8 page, old_page;
+        s5k83a_read_sensor(sd, S5K83A_PAGE_MAP, &old_page, 1);
+
+        for (page = 0; page < 16; page++) {
+                s5k83a_write_sensor(sd, S5K83A_PAGE_MAP, &page, 1);
+                info("Dumping the s5k83a register state for page 0x%x", page);
+                for (address = 0; address <= 0xff; address++) {
+                        u8 val = 0;
+                        s5k83a_read_sensor(sd, address, &val, 1);
+                        info("register 0x%x contains 0x%x",
+                             address, val);
+                }
+        }
+        info("s5k83a register state dump complete");
+
+        for (page = 0; page < 16; page++) {
+                s5k83a_write_sensor(sd, S5K83A_PAGE_MAP, &page, 1);
+                info("Probing for which registers that are read/write "
+                      "for page 0x%x", page);
+                for (address = 0; address <= 0xff; address++) {
+                        u8 old_val, ctrl_val, test_val = 0xff;
+
+                        s5k83a_read_sensor(sd, address, &old_val, 1);
+                        s5k83a_write_sensor(sd, address, &test_val, 1);
+                        s5k83a_read_sensor(sd, address, &ctrl_val, 1);
+
+                        if (ctrl_val == test_val)
+                                info("register 0x%x is writeable", address);
+                        else
+                                info("register 0x%x is read only", address);
+
+                        /* Restore original val */
+                        s5k83a_write_sensor(sd, address, &old_val, 1);
+                }
+        }
+        info("Read/write register probing complete");
+        s5k83a_write_sensor(sd, S5K83A_PAGE_MAP, &old_page, 1);
+}
+
+int s5k83a_get_brightness(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 data[2];
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = s5k83a_read_sensor(sd, S5K83A_BRIGHTNESS, data, 2);
+        data[1] = data[1] << 1;
+        *val = data[1];
+
+        return (err < 0) ? err : 0;
+}
+
+int s5k83a_set_brightness(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 data[2];
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        data[0] = 0x00;
+        data[1] = 0x20;
+        err = s5k83a_write_sensor(sd, 0x14, data, 2);
+        if (err < 0)
+                return err;
+
+        data[0] = 0x01;
+        data[1] = 0x00;
+        err = s5k83a_write_sensor(sd, 0x0d, data, 2);
+        if (err < 0)
+                return err;
+
+        /* FIXME: This is not sane, we need to figure out the composition
+                  of these registers */
+        data[0] = val >> 3; /* brightness, high 5 bits */
+        data[1] = val >> 1; /* brightness, high 7 bits */
+        err = s5k83a_write_sensor(sd, S5K83A_BRIGHTNESS, data, 2);
+
+        return (err < 0) ? err : 0;
+}
+
+int s5k83a_get_whiteness(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = s5k83a_read_sensor(sd, S5K83A_WHITENESS, &data, 1);
+
+        *val = data;
+        return (err < 0) ? err : 0;
+}
+
+int s5k83a_set_whiteness(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 data[1];
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        data[0] = val;
+        err = s5k83a_write_sensor(sd, S5K83A_WHITENESS, data, 1);
+
+        return (err < 0) ? err : 0;
+}
+
+int s5k83a_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 data[2];
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = s5k83a_read_sensor(sd, S5K83A_GAIN, data, 2);
+
+        data[1] = data[1] & 0x3f;
+        if (data[1] > S5K83A_MAXIMUM_GAIN)
+                data[1] = S5K83A_MAXIMUM_GAIN;
+
+        *val = data[1];
+
+        return (err < 0) ? err : 0;
+}
+
+int s5k83a_set_gain(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 data[2];
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        data[0] = 0;
+        data[1] = val;
+        err = s5k83a_write_sensor(sd, S5K83A_GAIN, data, 2);
+
+        return (err < 0) ? err : 0;
+}
+
+int s5k83a_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 data[1];
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        data[0] = 0x05;
+        err = s5k83a_write_sensor(sd, S5K83A_PAGE_MAP, data, 1);
+        if (err < 0)
+                return err;
+
+        err = s5k83a_read_sensor(sd, S5K83A_FLIP, data, 1);
+        *val = (data[0] | 0x40) ? 1 : 0;
+
+        return (err < 0) ? err : 0;
+}
+
+int s5k83a_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 data[1];
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        data[0] = 0x05;
+        err = s5k83a_write_sensor(sd, S5K83A_PAGE_MAP, data, 1);
+        if (err < 0)
+                return err;
+
+        err = s5k83a_read_sensor(sd, S5K83A_FLIP, data, 1);
+        if (err < 0)
+                return err;
+
+        /* set or zero six bit, seven is hflip */
+        data[0] = (val) ? (data[0] & 0x80) | 0x40 | S5K83A_FLIP_MASK
+                        : (data[0] & 0x80) | S5K83A_FLIP_MASK;
+        err = s5k83a_write_sensor(sd, S5K83A_FLIP, data, 1);
+        if (err < 0)
+                return err;
+
+        data[0] = (val) ? 0x0b : 0x0a;
+        err = s5k83a_write_sensor(sd, S5K83A_VFLIP_TUNE, data, 1);
+
+        return (err < 0) ? err : 0;
+}
+
+int s5k83a_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 data[1];
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        data[0] = 0x05;
+        err = s5k83a_write_sensor(sd, S5K83A_PAGE_MAP, data, 1);
+        if (err < 0)
+                return err;
+
+        err = s5k83a_read_sensor(sd, S5K83A_FLIP, data, 1);
+        *val = (data[0] | 0x80) ? 1 : 0;
+
+        return (err < 0) ? err : 0;
+}
+
+int s5k83a_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 data[1];
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        data[0] = 0x05;
+        err = s5k83a_write_sensor(sd, S5K83A_PAGE_MAP, data, 1);
+        if (err < 0)
+                return err;
+
+        err = s5k83a_read_sensor(sd, S5K83A_FLIP, data, 1);
+        if (err < 0)
+                return err;
+
+        /* set or zero seven bit, six is vflip */
+        data[0] = (val) ? (data[0] & 0x40) | 0x80 | S5K83A_FLIP_MASK
+                        : (data[0] & 0x40) | S5K83A_FLIP_MASK;
+        err = s5k83a_write_sensor(sd, S5K83A_FLIP, data, 1);
+        if (err < 0)
+                return err;
+
+        data[0] = (val) ? 0x0a : 0x0b;
+        err = s5k83a_write_sensor(sd, S5K83A_HFLIP_TUNE, data, 1);
+
+        return (err < 0) ? err : 0;
+}
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k83a.h b/drivers/media/video/gspca/m5602/m5602_s5k83a.h
new file mode 100644
index 000000000000..833708eb5a42
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_s5k83a.h
@@ -0,0 +1,484 @@
+/*
+ * Driver for the s5k83a sensor
+ *
+ * Copyright (C) 2008 Erik Andren
+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (C) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * 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.
+ *
+ */
+
+#ifndef M5602_S5K83A_H_
+#define M5602_S5K83A_H_
+
+#include "m5602_sensor.h"
+
+#define S5K83A_FLIP                             0x01
+#define S5K83A_HFLIP_TUNE               0x03
+#define S5K83A_VFLIP_TUNE               0x05
+#define S5K83A_WHITENESS                0x0a
+#define S5K83A_GAIN                             0x18
+#define S5K83A_BRIGHTNESS               0x1b
+#define S5K83A_PAGE_MAP                 0xec
+
+#define S5K83A_DEFAULT_BRIGHTNESS       0x71
+#define S5K83A_DEFAULT_WHITENESS        0x7e
+#define S5K83A_DEFAULT_GAIN                     0x00
+#define S5K83A_MAXIMUM_GAIN                     0x3c
+#define S5K83A_FLIP_MASK                        0x10
+
+
+/*****************************************************************************/
+
+/* Kernel module parameters */
+extern int force_sensor;
+extern int dump_sensor;
+extern unsigned int m5602_debug;
+
+
+int s5k83a_probe(struct sd *sd);
+int s5k83a_init(struct sd *sd);
+int s5k83a_power_down(struct sd *sd);
+
+void s5k83a_dump_registers(struct sd *sd);
+
+int s5k83a_read_sensor(struct sd *sd, const u8 address,
+                       u8 *i2c_data, const u8 len);
+int s5k83a_write_sensor(struct sd *sd, const u8 address,
+                        u8 *i2c_data, const u8 len);
+
+int s5k83a_set_brightness(struct gspca_dev *gspca_dev, __s32 val);
+int s5k83a_get_brightness(struct gspca_dev *gspca_dev, __s32 *val);
+int s5k83a_set_whiteness(struct gspca_dev *gspca_dev, __s32 val);
+int s5k83a_get_whiteness(struct gspca_dev *gspca_dev, __s32 *val);
+int s5k83a_set_gain(struct gspca_dev *gspca_dev, __s32 val);
+int s5k83a_get_gain(struct gspca_dev *gspca_dev, __s32 *val);
+int s5k83a_get_vflip(struct gspca_dev *gspca_dev, __s32 *val);
+int s5k83a_set_vflip(struct gspca_dev *gspca_dev, __s32 val);
+int s5k83a_get_hflip(struct gspca_dev *gspca_dev, __s32 *val);
+int s5k83a_set_hflip(struct gspca_dev *gspca_dev, __s32 val);
+
+
+static struct m5602_sensor s5k83a = {
+        .name = "S5K83A",
+        .probe = s5k83a_probe,
+        .init = s5k83a_init,
+        .power_down = s5k83a_power_down,
+        .read_sensor = s5k83a_read_sensor,
+        .write_sensor = s5k83a_write_sensor,
+        .i2c_slave_id = 0x5a,
+        .nctrls = 5,
+        .ctrls = {
+        {
+                {
+                        .id = V4L2_CID_BRIGHTNESS,
+                        .type = V4L2_CTRL_TYPE_INTEGER,
+                        .name = "brightness",
+                        .minimum = 0x00,
+                        .maximum = 0xff,
+                        .step = 0x01,
+                        .default_value = S5K83A_DEFAULT_BRIGHTNESS,
+                        .flags = V4L2_CTRL_FLAG_SLIDER
+                },
+                        .set = s5k83a_set_brightness,
+                        .get = s5k83a_get_brightness
+
+        }, {
+                {
+                        .id = V4L2_CID_WHITENESS,
+                        .type = V4L2_CTRL_TYPE_INTEGER,
+                        .name = "whiteness",
+                        .minimum = 0x00,
+                        .maximum = 0xff,
+                        .step = 0x01,
+                        .default_value = S5K83A_DEFAULT_WHITENESS,
+                        .flags = V4L2_CTRL_FLAG_SLIDER
+                },
+                        .set = s5k83a_set_whiteness,
+                        .get = s5k83a_get_whiteness,
+        }, {
+                {
+                        .id = V4L2_CID_GAIN,
+                        .type = V4L2_CTRL_TYPE_INTEGER,
+                        .name = "gain",
+                        .minimum = 0x00,
+                        .maximum = S5K83A_MAXIMUM_GAIN,
+                        .step = 0x01,
+                        .default_value = S5K83A_DEFAULT_GAIN,
+                        .flags = V4L2_CTRL_FLAG_SLIDER
+                },
+                        .set = s5k83a_set_gain,
+                        .get = s5k83a_get_gain
+        }, {
+                {
+                        .id         = V4L2_CID_HFLIP,
+                        .type       = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name       = "horizontal flip",
+                        .minimum    = 0,
+                        .maximum    = 1,
+                        .step       = 1,
+                        .default_value  = 0
+                },
+                        .set = s5k83a_set_hflip,
+                        .get = s5k83a_get_hflip
+        }, {
+                {
+                 .id         = V4L2_CID_VFLIP,
+                .type       = V4L2_CTRL_TYPE_BOOLEAN,
+                .name       = "vertical flip",
+                .minimum    = 0,
+                .maximum    = 1,
+                .step       = 1,
+                .default_value  = 0
+                },
+                .set = s5k83a_set_vflip,
+                .get = s5k83a_get_vflip
+                }
+        },
+        .nmodes = 1,
+        .modes = {
+        {
+                M5602_DEFAULT_FRAME_WIDTH,
+                M5602_DEFAULT_FRAME_HEIGHT,
+                V4L2_PIX_FMT_SBGGR8,
+                V4L2_FIELD_NONE,
+                .sizeimage =
+                        M5602_DEFAULT_FRAME_WIDTH * M5602_DEFAULT_FRAME_HEIGHT,
+                .bytesperline = M5602_DEFAULT_FRAME_WIDTH,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 1
+        }
+        }
+};
+
+static const unsigned char preinit_s5k83a[][4] =
+{
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00, 0x00},
+
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x08, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x3f, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x3f, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0x80, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xf0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x1c, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x20, 0x00},
+
+        {SENSOR, S5K83A_PAGE_MAP, 0x00, 0x00}
+};
+
+/* This could probably be considerably shortened.
+   I don't have the hardware to experiment with it, patches welcome
+*/
+static const unsigned char init_s5k83a[][4] =
+{
+        {SENSOR, S5K83A_PAGE_MAP, 0x04, 0x00},
+        {SENSOR, 0xaf, 0x01, 0x00},
+        {SENSOR, S5K83A_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, 0x7b, 0xff, 0x00},
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+        {SENSOR, 0x01, 0x50, 0x00},
+        {SENSOR, 0x12, 0x20, 0x00},
+        {SENSOR, 0x17, 0x40, 0x00},
+        {SENSOR, S5K83A_BRIGHTNESS, 0x0f, 0x00},
+        {SENSOR, 0x1c, 0x00, 0x00},
+        {SENSOR, 0x02, 0x70, 0x00},
+        {SENSOR, 0x03, 0x0b, 0x00},
+        {SENSOR, 0x04, 0xf0, 0x00},
+        {SENSOR, 0x05, 0x0b, 0x00},
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0xe4, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x87, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+        {SENSOR, 0x06, 0x71, 0x00},
+        {SENSOR, 0x07, 0xe8, 0x00},
+        {SENSOR, 0x08, 0x02, 0x00},
+        {SENSOR, 0x09, 0x88, 0x00},
+        {SENSOR, 0x14, 0x00, 0x00},
+        {SENSOR, 0x15, 0x20, 0x00},
+        {SENSOR, 0x19, 0x00, 0x00},
+        {SENSOR, 0x1a, 0x98, 0x00},
+        {SENSOR, 0x0f, 0x02, 0x00},
+        {SENSOR, 0x10, 0xe5, 0x00},
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+        {SENSOR_LONG, 0x14, 0x00, 0x20},
+        {SENSOR_LONG, 0x0d, 0x00, 0x7d},
+        {SENSOR_LONG, 0x1b, 0x0d, 0x05},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0xe4, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x87, 0x00},
+
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x08, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x3f, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x3f, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0x80, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xf0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x1c, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x20, 0x00},
+
+        {SENSOR, S5K83A_PAGE_MAP, 0x04, 0x00},
+        {SENSOR, 0xaf, 0x01, 0x00},
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+        /* ff ( init value )is very dark) || 71 and f0 better */
+        {SENSOR, 0x7b, 0xff, 0x00},
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+        {SENSOR, 0x01, 0x50, 0x00},
+        {SENSOR, 0x12, 0x20, 0x00},
+        {SENSOR, 0x17, 0x40, 0x00},
+        {SENSOR, S5K83A_BRIGHTNESS, 0x0f, 0x00},
+        {SENSOR, 0x1c, 0x00, 0x00},
+        {SENSOR, 0x02, 0x70, 0x00},
+        /* some values like 0x10 give a blue-purple image */
+        {SENSOR, 0x03, 0x0b, 0x00},
+        {SENSOR, 0x04, 0xf0, 0x00},
+        {SENSOR, 0x05, 0x0b, 0x00},
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},
+        /* under 80 don't work, highter depend on value */
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0xe4, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x7f, 0x00},
+
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+        {SENSOR, 0x06, 0x71, 0x00},
+        {SENSOR, 0x07, 0xe8, 0x00},
+        {SENSOR, 0x08, 0x02, 0x00},
+        {SENSOR, 0x09, 0x88, 0x00},
+        {SENSOR, 0x14, 0x00, 0x00},
+        {SENSOR, 0x15, 0x20, 0x00},
+        {SENSOR, 0x19, 0x00, 0x00},
+        {SENSOR, 0x1a, 0x98, 0x00},
+        {SENSOR, 0x0f, 0x02, 0x00},
+        {SENSOR, 0x10, 0xe5, 0x00},
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+        {SENSOR_LONG, 0x14, 0x00, 0x20},
+        {SENSOR_LONG, 0x0d, 0x00, 0x7d},
+        {SENSOR_LONG, 0x1b, 0x0d, 0x05},
+
+        /* The following sequence is useless after a clean boot
+           but is necessary after resume from suspend */
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x08, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x3f, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x3f, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0x80, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xf0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x1c, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x20, 0x00},
+
+        {SENSOR, S5K83A_PAGE_MAP, 0x04, 0x00},
+        {SENSOR, 0xaf, 0x01, 0x00},
+        {SENSOR, S5K83A_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, 0x7b, 0xff, 0x00},
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+        {SENSOR, 0x01, 0x50, 0x00},
+        {SENSOR, 0x12, 0x20, 0x00},
+        {SENSOR, 0x17, 0x40, 0x00},
+        {SENSOR, S5K83A_BRIGHTNESS, 0x0f, 0x00},
+        {SENSOR, 0x1c, 0x00, 0x00},
+        {SENSOR, 0x02, 0x70, 0x00},
+        {SENSOR, 0x03, 0x0b, 0x00},
+        {SENSOR, 0x04, 0xf0, 0x00},
+        {SENSOR, 0x05, 0x0b, 0x00},
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0xe4, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x7f, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+        {SENSOR, 0x06, 0x71, 0x00},
+        {SENSOR, 0x07, 0xe8, 0x00},
+        {SENSOR, 0x08, 0x02, 0x00},
+        {SENSOR, 0x09, 0x88, 0x00},
+        {SENSOR, 0x14, 0x00, 0x00},
+        {SENSOR, 0x15, 0x20, 0x00},
+        {SENSOR, 0x19, 0x00, 0x00},
+        {SENSOR, 0x1a, 0x98, 0x00},
+        {SENSOR, 0x0f, 0x02, 0x00},
+
+        {SENSOR, 0x10, 0xe5, 0x00},
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+        {SENSOR_LONG, 0x14, 0x00, 0x20},
+        {SENSOR_LONG, 0x0d, 0x00, 0x7d},
+        {SENSOR_LONG, 0x1b, 0x0d, 0x05},
+
+        /* normal colors
+           (this is value after boot, but after tries can be different) */
+        {SENSOR, 0x00, 0x06, 0x00},
+
+        /* set default brightness */
+        {SENSOR_LONG, 0x14, 0x00, 0x20},
+        {SENSOR_LONG, 0x0d, 0x01, 0x00},
+        {SENSOR_LONG, 0x1b, S5K83A_DEFAULT_BRIGHTNESS >> 3,
+                            S5K83A_DEFAULT_BRIGHTNESS >> 1},
+
+        /* set default whiteness */
+        {SENSOR, S5K83A_WHITENESS, S5K83A_DEFAULT_WHITENESS, 0x00},
+
+        /* set default gain */
+        {SENSOR_LONG, 0x18, 0x00, S5K83A_DEFAULT_GAIN},
+
+        /* set default flip */
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+        {SENSOR, S5K83A_FLIP, 0x00 | S5K83A_FLIP_MASK, 0x00},
+        {SENSOR, S5K83A_HFLIP_TUNE, 0x0b, 0x00},
+        {SENSOR, S5K83A_VFLIP_TUNE, 0x0a, 0x00}
+
+};
+
+#endif
diff --git a/drivers/media/video/gspca/m5602/m5602_sensor.h b/drivers/media/video/gspca/m5602/m5602_sensor.h
new file mode 100644
index 000000000000..930fcaab4416
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_sensor.h
@@ -0,0 +1,76 @@
+/*
+ * USB Driver for ALi m5602 based webcams
+ *
+ * Copyright (C) 2008 Erik Andren
+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (C) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * 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.
+ *
+ */
+
+#ifndef M5602_SENSOR_H_
+#define M5602_SENSOR_H_
+
+#include "m5602_bridge.h"
+
+#define M5602_DEFAULT_FRAME_WIDTH  640
+#define M5602_DEFAULT_FRAME_HEIGHT 480
+
+#define M5602_MAX_CTRLS         (V4L2_CID_LASTP1 - V4L2_CID_BASE + 10)
+
+/* Enumerates all supported sensors */
+enum sensors {
+        OV9650_SENSOR   = 1,
+        S5K83A_SENSOR   = 2,
+        S5K4AA_SENSOR   = 3,
+        MT9M111_SENSOR  = 4,
+        PO1030_SENSOR   = 5
+};
+
+/* Enumerates all possible instruction types */
+enum instruction {
+        BRIDGE,
+        SENSOR,
+        SENSOR_LONG
+};
+
+struct m5602_sensor {
+        /* Defines the name of a sensor */
+        char name[32];
+
+        /* What i2c address the sensor is connected to */
+        u8 i2c_slave_id;
+
+        /* Probes if the sensor is connected */
+        int (*probe)(struct sd *sd);
+
+        /* Performs a initialization sequence */
+        int (*init)(struct sd *sd);
+
+        /* Performs a power down sequence */
+        int (*power_down)(struct sd *sd);
+
+        /* Reads a sensor register */
+        int (*read_sensor)(struct sd *sd, const u8 address,
+              u8 *i2c_data, const u8 len);
+
+        /* Writes to a sensor register */
+        int (*write_sensor)(struct sd *sd, const u8 address,
+              u8 *i2c_data, const u8 len);
+
+        int nctrls;
+        struct ctrl ctrls[M5602_MAX_CTRLS];
+
+        char nmodes;
+        struct v4l2_pix_format modes[];
+};
+
+#endif
diff --git a/drivers/media/video/gspca/mars.c b/drivers/media/video/gspca/mars.c
index 4d5db47ba8cb..277ca34a8817 100644
--- a/drivers/media/video/gspca/mars.c
+++ b/drivers/media/video/gspca/mars.c
@@ -134,7 +134,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         int err_code;
         __u8 *data;
@@ -143,9 +143,10 @@ static void sd_start(struct gspca_dev *gspca_dev)
         int intpipe;
 
         PDEBUG(D_STREAM, "camera start, iface %d, alt 8", gspca_dev->iface);
-        if (usb_set_interface(gspca_dev->dev, gspca_dev->iface, 8) < 0) {
+        err_code = usb_set_interface(gspca_dev->dev, gspca_dev->iface, 8);
+        if (err_code < 0) {
                 PDEBUG(D_ERR|D_STREAM, "Set packet size: set interface error");
-                return;
+                return err_code;
         }
 
         data = gspca_dev->usb_buf;
@@ -154,7 +155,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
 
         err_code = reg_w(gspca_dev, data[0], 2);
         if (err_code < 0)
-                return;
+                return err_code;
 
         /*
            Initialize the MR97113 chip register
@@ -180,14 +181,14 @@ static void sd_start(struct gspca_dev *gspca_dev)
 
         err_code = reg_w(gspca_dev, data[0], 11);
         if (err_code < 0)
-                return;
+                return err_code;
 
         data[0] = 0x23;         /* address */
         data[1] = 0x09;         /* reg 35, append frame header */
 
         err_code = reg_w(gspca_dev, data[0], 2);
         if (err_code < 0)
-                return;
+                return err_code;
 
         data[0] = 0x3c;         /* address */
 /*      if (gspca_dev->width == 1280) */
@@ -198,7 +199,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
                                  *      (unit: 4KB) 200KB */
         err_code = reg_w(gspca_dev, data[0], 2);
         if (err_code < 0)
-                return;
+                return err_code;
 
         if (0) {                        /* fixed dark-gain */
                 data[1] = 0;            /* reg 94, Y Gain (1.75) */
@@ -240,13 +241,13 @@ static void sd_start(struct gspca_dev *gspca_dev)
 
         err_code = reg_w(gspca_dev, data[0], 6);
         if (err_code < 0)
-                return;
+                return err_code;
 
         data[0] = 0x67;
         data[1] = 0x13;         /* reg 103, first pixel B, disable sharpness */
         err_code = reg_w(gspca_dev, data[0], 2);
         if (err_code < 0)
-                return;
+                return err_code;
 
         /*
          * initialize the value of MI sensor...
@@ -326,6 +327,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
         data[0] = 0x00;
         data[1] = 0x4d;         /* ISOC transfering enable... */
         reg_w(gspca_dev, data[0], 2);
+        return err_code;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c
index 4df4eec9f7e7..ca671194679e 100644
--- a/drivers/media/video/gspca/ov519.c
+++ b/drivers/media/video/gspca/ov519.c
@@ -1854,7 +1854,7 @@ static int set_ov_sensor_window(struct sd *sd)
 }
 
 /* -- start the camera -- */
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         int ret;
@@ -1871,9 +1871,10 @@ static void sd_start(struct gspca_dev *gspca_dev)
                 goto out;
         PDEBUG(D_STREAM, "camera started alt: 0x%02x", gspca_dev->alt);
         ov51x_led_control(sd, 1);
-        return;
+        return 0;
 out:
         PDEBUG(D_ERR, "camera start error:%d", ret);
+        return ret;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/pac207.c b/drivers/media/video/gspca/pac207.c
index 83b5f740c947..0b0c573d06da 100644
--- a/drivers/media/video/gspca/pac207.c
+++ b/drivers/media/video/gspca/pac207.c
@@ -281,7 +281,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
 }
 
 /* -- start the camera -- */
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         __u8 mode;
@@ -323,6 +323,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
         sd->sof_read = 0;
         sd->autogain_ignore_frames = 0;
         atomic_set(&sd->avg_lum, -1);
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
@@ -534,6 +535,7 @@ static const __devinitdata struct usb_device_id device_table[] = {
         {USB_DEVICE(0x093a, 0x2470)},
         {USB_DEVICE(0x093a, 0x2471)},
         {USB_DEVICE(0x093a, 0x2472)},
+        {USB_DEVICE(0x093a, 0x2476)},
         {USB_DEVICE(0x2001, 0xf115)},
         {}
 };
diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c
index ba865b7f1ed8..e5ff9a6199ef 100644
--- a/drivers/media/video/gspca/pac7311.c
+++ b/drivers/media/video/gspca/pac7311.c
@@ -675,7 +675,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
@@ -724,6 +724,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
                 reg_w(gspca_dev, 0x78, 0x01);
         else
                 reg_w(gspca_dev, 0x78, 0x05);
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c
index 12b81ae526b7..6c69bc7778fc 100644
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
@@ -490,7 +490,7 @@ static const __u8 tas5130_sensor_init[][8] = {
         {0x30, 0x11, 0x02, 0x20, 0x70, 0x00, 0x00, 0x10},
 };
 
-struct sensor_data sensor_data[] = {
+static struct sensor_data sensor_data[] = {
 SENS(initHv7131, NULL, hv7131_sensor_init, NULL, NULL, 0, NO_EXPO|NO_FREQ, 0),
 SENS(initOv6650, NULL, ov6650_sensor_init, NULL, NULL, F_GAIN|F_SIF, 0, 0x60),
 SENS(initOv7630, initOv7630_3, ov7630_sensor_init, NULL, ov7630_sensor_init_3,
@@ -892,7 +892,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
 }
 
 /* -- start the camera -- */
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         struct cam *cam = &gspca_dev->cam;
@@ -976,6 +976,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
         sd->frames_to_drop = 0;
         sd->autogain_ignore_frames = 0;
         atomic_set(&sd->avg_lum, -1);
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index 572b0f363b64..53cb82d9e7c6 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -39,6 +39,7 @@ struct sd {
         unsigned char contrast;
         unsigned char colors;
         unsigned char autogain;
+        __u8 vflip;                     /* ov7630 only */
 
         signed char ag_cnt;
 #define AG_CNT_START 13
@@ -70,6 +71,8 @@ static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val);
 static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val);
 static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val);
 static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val);
+static int sd_setvflip(struct gspca_dev *gspca_dev, __s32 val);
+static int sd_getvflip(struct gspca_dev *gspca_dev, __s32 *val);
 
 static struct ctrl sd_ctrls[] = {
         {
@@ -131,6 +134,22 @@ static struct ctrl sd_ctrls[] = {
             .set = sd_setautogain,
             .get = sd_getautogain,
         },
+/* ov7630 only */
+#define VFLIP_IDX 4
+        {
+            {
+                .id      = V4L2_CID_VFLIP,
+                .type    = V4L2_CTRL_TYPE_BOOLEAN,
+                .name    = "Vflip",
+                .minimum = 0,
+                .maximum = 1,
+                .step    = 1,
+#define VFLIP_DEF 1
+                .default_value = VFLIP_DEF,
+            },
+            .set = sd_setvflip,
+            .get = sd_getvflip,
+        },
 };
 
 static struct v4l2_pix_format vga_mode[] = {
@@ -248,10 +267,12 @@ static const __u8 gamma_def[] = {
         0xa6, 0xb2, 0xbf, 0xca, 0xd5, 0xe0, 0xeb, 0xf5, 0xff
 };
 
+/* color matrix and offsets */
 static const __u8 reg84[] = {
-        0x14, 0x00, 0x27, 0x00, 0x07, 0x00, 0xe5, 0x0f,
-        0xe4, 0x0f, 0x38, 0x00, 0x3e, 0x00, 0xc3, 0x0f,
-        0xf7, 0x0f, 0x00, 0x00, 0x00
+        0x14, 0x00, 0x27, 0x00, 0x07, 0x00,     /* YR YG YB gains */
+        0xe8, 0x0f, 0xda, 0x0f, 0x40, 0x00,     /* UR UG UB */
+        0x3e, 0x00, 0xcd, 0x0f, 0xf7, 0x0f,     /* VR VG VB */
+        0x00, 0x00, 0x00                        /* YUV offsets */
 };
 static const __u8 hv7131r_sensor_init[][8] = {
         {0xC1, 0x11, 0x01, 0x08, 0x01, 0x00, 0x00, 0x10},
@@ -434,7 +455,8 @@ static const __u8 ov7630_sensor_init[][8] = {
         {0xa1, 0x21, 0x12, 0x48, 0x00, 0x00, 0x00, 0x10},
         {0xa1, 0x21, 0x12, 0x48, 0x00, 0x00, 0x00, 0x10},
 /*fixme: + 0x12, 0x04*/
-        {0xa1, 0x21, 0x75, 0x82, 0x00, 0x00, 0x00, 0x10},
+/*      {0xa1, 0x21, 0x75, 0x82, 0x00, 0x00, 0x00, 0x10},  * COMN
+                                                         * set by setvflip */
         {0xa1, 0x21, 0x10, 0x32, 0x00, 0x00, 0x00, 0x10},
         {0xa1, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10},
         {0xb1, 0x21, 0x01, 0x80, 0x80, 0x00, 0x00, 0x10},
@@ -949,6 +971,8 @@ static int sd_config(struct gspca_dev *gspca_dev,
                 gspca_dev->ctrl_dis = (1 << AUTOGAIN_IDX);
                 break;
         }
+        if (sd->sensor != SENSOR_OV7630)
+                gspca_dev->ctrl_dis |= (1 << VFLIP_IDX);
 
         return 0;
 }
@@ -1080,20 +1104,17 @@ static unsigned int setexposure(struct gspca_dev *gspca_dev,
 static void setbrightcont(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        unsigned val;
+        int val;
         __u8 reg84_full[0x15];
 
-        memset(reg84_full, 0, sizeof reg84_full);
-        val = sd->contrast * 0x20 / CONTRAST_MAX + 0x10;        /* 10..30 */
-        reg84_full[2] = val;
-        reg84_full[0] = (val + 1) / 2;
-        reg84_full[4] = (val + 1) / 5;
-        if (val > BRIGHTNESS_DEF)
-                val = (sd->brightness - BRIGHTNESS_DEF) * 0x20
+        memcpy(reg84_full, reg84, sizeof reg84_full);
+        val = sd->contrast * 0x30 / CONTRAST_MAX + 0x10;        /* 10..40 */
+        reg84_full[0] = (val + 1) / 2;          /* red */
+        reg84_full[2] = val;                    /* green */
+        reg84_full[4] = (val + 1) / 5;          /* blue */
+        val = (sd->brightness - BRIGHTNESS_DEF) * 0x10
                         / BRIGHTNESS_MAX;
-        else
-                val = 0;
-        reg84_full[0x12] = val;                 /* 00..1f */
+        reg84_full[0x12] = val & 0x1f;          /* 5:0 signed value */
         reg_w(gspca_dev, 0x84, reg84_full, sizeof reg84_full);
 }
 
@@ -1172,8 +1193,16 @@ static void setautogain(struct gspca_dev *gspca_dev)
                 sd->ag_cnt = -1;
 }
 
+static void setvflip(struct sd *sd)
+{
+        if (sd->sensor != SENSOR_OV7630)
+                return;
+        i2c_w1(&sd->gspca_dev, 0x75,                    /* COMN */
+                sd->vflip ? 0x82 : 0x02);
+}
+
 /* -- start the camera -- */
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         int i;
@@ -1263,6 +1292,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
                 break;
         case SENSOR_OV7630:
                 ov7630_InitSensor(gspca_dev);
+                setvflip(sd);
                 reg17 = 0xe2;
                 reg1 = 0x44;
                 break;
@@ -1320,12 +1350,16 @@ static void sd_start(struct gspca_dev *gspca_dev)
                 setbrightness(gspca_dev);
                 setcontrast(gspca_dev);
                 break;
+        case SENSOR_OV7630:
+                setvflip(sd);
+                /* fall thru */
         default:                        /* OV76xx */
                 setbrightcont(gspca_dev);
                 break;
         }
         setautogain(gspca_dev);
         reg_w1(gspca_dev, 0x01, reg1);
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
@@ -1546,6 +1580,24 @@ static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val)
         return 0;
 }
 
+static int sd_setvflip(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        sd->vflip = val;
+        if (gspca_dev->streaming)
+                setvflip(sd);
+        return 0;
+}
+
+static int sd_getvflip(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        *val = sd->vflip;
+        return 0;
+}
+
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
@@ -1567,6 +1619,7 @@ static const struct sd_desc sd_desc = {
 static const __devinitdata struct usb_device_id device_table[] = {
 #if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
         {USB_DEVICE(0x0458, 0x7025), BSI(SN9C120, MI0360, 0x5d)},
+        {USB_DEVICE(0x0458, 0x702e), BSI(SN9C120, OV7660, 0x21)},
         {USB_DEVICE(0x045e, 0x00f5), BSI(SN9C105, OV7660, 0x21)},
         {USB_DEVICE(0x045e, 0x00f7), BSI(SN9C105, OV7660, 0x21)},
         {USB_DEVICE(0x0471, 0x0327), BSI(SN9C105, MI0360, 0x5d)},
@@ -1588,7 +1641,9 @@ static const __devinitdata struct usb_device_id device_table[] = {
 /*      {USB_DEVICE(0x0c45, 0x60fa), BSI(SN9C105, OV7648, 0x??)}, */
         {USB_DEVICE(0x0c45, 0x60fb), BSI(SN9C105, OV7660, 0x21)},
         {USB_DEVICE(0x0c45, 0x60fc), BSI(SN9C105, HV7131R, 0x11)},
-/*      {USB_DEVICE(0x0c45, 0x60fe), BSI(SN9C105, OV7630, 0x??)}, */
+#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
+        {USB_DEVICE(0x0c45, 0x60fe), BSI(SN9C105, OV7630, 0x21)},
+#endif
 /*      {USB_DEVICE(0x0c45, 0x6108), BSI(SN9C120, OM6801, 0x??)}, */
 /*      {USB_DEVICE(0x0c45, 0x6122), BSI(SN9C110, ICM105C, 0x??)}, */
 /*      {USB_DEVICE(0x0c45, 0x6123), BSI(SN9C110, SanyoCCD, 0x??)}, */
diff --git a/drivers/media/video/gspca/spca500.c b/drivers/media/video/gspca/spca500.c
index 6e733901fcca..bca106c153fa 100644
--- a/drivers/media/video/gspca/spca500.c
+++ b/drivers/media/video/gspca/spca500.c
@@ -660,7 +660,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         int err;
@@ -867,6 +867,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
                 write_vector(gspca_dev, Clicksmart510_defaults);
                 break;
         }
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/spca501.c b/drivers/media/video/gspca/spca501.c
index e9eb59bae4fb..b742f260c7ca 100644
--- a/drivers/media/video/gspca/spca501.c
+++ b/drivers/media/video/gspca/spca501.c
@@ -1980,7 +1980,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct usb_device *dev = gspca_dev->dev;
         int mode;
@@ -2012,6 +2012,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
         setbrightness(gspca_dev);
         setcontrast(gspca_dev);
         setcolors(gspca_dev);
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/spca505.c b/drivers/media/video/gspca/spca505.c
index f601daf19ebe..b345749213cf 100644
--- a/drivers/media/video/gspca/spca505.c
+++ b/drivers/media/video/gspca/spca505.c
@@ -688,7 +688,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct usb_device *dev = gspca_dev->dev;
         int ret;
@@ -733,6 +733,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
 /*      reg_write(dev, 0x5, 0x0, 0x0); */
 /*      reg_write(dev, 0x5, 0x0, 0x1); */
 /*      reg_write(dev, 0x5, 0x11, 0x2); */
+        return ret;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/spca506.c b/drivers/media/video/gspca/spca506.c
index 195dce96ef06..645ee9d44d02 100644
--- a/drivers/media/video/gspca/spca506.c
+++ b/drivers/media/video/gspca/spca506.c
@@ -422,7 +422,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct usb_device *dev = gspca_dev->dev;
         __u16 norme;
@@ -549,6 +549,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
         PDEBUG(D_STREAM, "webcam started");
         spca506_GetNormeInput(gspca_dev, &norme, &channel);
         spca506_SetNormeInput(gspca_dev, norme, channel);
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/spca508.c b/drivers/media/video/gspca/spca508.c
index 281ce02103a3..63ec902c895d 100644
--- a/drivers/media/video/gspca/spca508.c
+++ b/drivers/media/video/gspca/spca508.c
@@ -1528,7 +1528,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         int mode;
 
@@ -1546,6 +1546,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
                 break;
         }
         reg_write(gspca_dev->dev, 0x8112, 0x10 | 0x20);
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c
index 95fcfcb9e31b..020a03c466c1 100644
--- a/drivers/media/video/gspca/spca561.c
+++ b/drivers/media/video/gspca/spca561.c
@@ -152,7 +152,7 @@ static void reg_w_val(struct usb_device *dev, __u16 index, __u8 value)
 
         ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
                               0,                /* request */
-                              USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                              USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
                               value, index, NULL, 0, 500);
         PDEBUG(D_USBO, "reg write: 0x%02x:0x%02x", index, value);
         if (ret < 0)
@@ -699,7 +699,7 @@ static void setautogain(struct gspca_dev *gspca_dev)
                 sd->ag_cnt = -1;
 }
 
-static void sd_start_12a(struct gspca_dev *gspca_dev)
+static int sd_start_12a(struct gspca_dev *gspca_dev)
 {
         struct usb_device *dev = gspca_dev->dev;
         int Clck = 0x8a; /* lower 0x8X values lead to fps > 30 */
@@ -725,8 +725,9 @@ static void sd_start_12a(struct gspca_dev *gspca_dev)
         setwhite(gspca_dev);
         setautogain(gspca_dev);
         setexposure(gspca_dev);
+        return 0;
 }
-static void sd_start_72a(struct gspca_dev *gspca_dev)
+static int sd_start_72a(struct gspca_dev *gspca_dev)
 {
         struct usb_device *dev = gspca_dev->dev;
         int Clck;
@@ -750,6 +751,7 @@ static void sd_start_72a(struct gspca_dev *gspca_dev)
         reg_w_val(dev, 0x8700, Clck);   /* 0x27 clock */
         reg_w_val(dev, 0x8112, 0x10 | 0x20);
         setautogain(gspca_dev);
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
@@ -1064,7 +1066,7 @@ static struct ctrl sd_ctrls_12a[] = {
             {
                 .id = V4L2_CID_DO_WHITE_BALANCE,
                 .type = V4L2_CTRL_TYPE_INTEGER,
-                .name = "While Balance",
+                .name = "White Balance",
                 .minimum = WHITE_MIN,
                 .maximum = WHITE_MAX,
                 .step = 1,
diff --git a/drivers/media/video/gspca/stk014.c b/drivers/media/video/gspca/stk014.c
index 2f2de429e273..d9d64911f22a 100644
--- a/drivers/media/video/gspca/stk014.c
+++ b/drivers/media/video/gspca/stk014.c
@@ -324,7 +324,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
 }
 
 /* -- start the camera -- */
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         int ret, value;
 
@@ -374,9 +374,10 @@ static void sd_start(struct gspca_dev *gspca_dev)
         set_par(gspca_dev, 0x01000000);
         set_par(gspca_dev, 0x01000000);
         PDEBUG(D_STREAM, "camera started alt: 0x%02x", gspca_dev->alt);
-        return;
+        return 0;
 out:
         PDEBUG(D_ERR|D_STREAM, "camera start err %d", ret);
+        return ret;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c
index 1cfcc6c49558..bd9288665a80 100644
--- a/drivers/media/video/gspca/sunplus.c
+++ b/drivers/media/video/gspca/sunplus.c
@@ -961,7 +961,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         struct usb_device *dev = gspca_dev->dev;
@@ -1042,6 +1042,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
                 break;
         }
         sp5xx_initContBrigHueRegisters(gspca_dev);
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/t613.c b/drivers/media/video/gspca/t613.c
index f034c748fc7e..b561f7c4f066 100644
--- a/drivers/media/video/gspca/t613.c
+++ b/drivers/media/video/gspca/t613.c
@@ -28,8 +28,6 @@
 
 #include "gspca.h"
 
-#define MAX_GAMMA 0x10          /* 0 to 15 */
-
 #define V4L2_CID_EFFECTS (V4L2_CID_PRIVATE_BASE + 0)
 
 MODULE_AUTHOR("Leandro Costantino <le_costantino@pixartargentina.com.ar>");
@@ -49,6 +47,10 @@ struct sd {
         unsigned char whitebalance;
         unsigned char mirror;
         unsigned char effect;
+
+        __u8 sensor;
+#define SENSOR_TAS5130A 0
+#define SENSOR_OTHER 1
 };
 
 /* V4L2 controls supported by the driver */
@@ -83,9 +85,9 @@ static struct ctrl sd_ctrls[] = {
           .type = V4L2_CTRL_TYPE_INTEGER,
           .name = "Brightness",
           .minimum = 0,
-          .maximum = 0x0f,
+          .maximum = 14,
           .step = 1,
-          .default_value = 0x09,
+          .default_value = 8,
           },
          .set = sd_setbrightness,
          .get = sd_getbrightness,
@@ -118,16 +120,17 @@ static struct ctrl sd_ctrls[] = {
          .set = sd_setcolors,
          .get = sd_getcolors,
          },
-#define SD_GAMMA 3
+#define GAMMA_MAX 16
+#define GAMMA_DEF 10
         {
          {
           .id = V4L2_CID_GAMMA, /* (gamma on win) */
           .type = V4L2_CTRL_TYPE_INTEGER,
-          .name = "Gamma (Untested)",
+          .name = "Gamma",
           .minimum = 0,
-          .maximum = MAX_GAMMA,
+          .maximum = GAMMA_MAX - 1,
           .step = 1,
-          .default_value = 0x09,
+          .default_value = GAMMA_DEF,
           },
          .set = sd_setgamma,
          .get = sd_getgamma,
@@ -197,7 +200,7 @@ static struct ctrl sd_ctrls[] = {
           .type = V4L2_CTRL_TYPE_INTEGER,
           .name = "Sharpness",
           .minimum = 0,
-          .maximum = MAX_GAMMA, /* 0 to 16 */
+          .maximum = 15,
           .step = 1,
           .default_value = 0x06,
           },
@@ -258,7 +261,6 @@ static struct v4l2_pix_format vga_mode_t16[] = {
                 .priv = 0},
 };
 
-#define T16_OFFSET_DATA 631
 #define MAX_EFFECTS 7
 /* easily done by soft, this table could be removed,
  * i keep it here just in case */
@@ -272,87 +274,87 @@ static const __u8 effects_table[MAX_EFFECTS][6] = {
         {0xa8, 0xc8, 0xc6, 0xd2, 0xc0, 0x40},   /* Negative */
 };
 
-static const __u8 gamma_table[MAX_GAMMA][34] = {
-        {0x90, 0x00, 0x91, 0x3e, 0x92, 0x69, 0x93, 0x85,
+static const __u8 gamma_table[GAMMA_MAX][34] = {
+        {0x90, 0x00, 0x91, 0x3e, 0x92, 0x69, 0x93, 0x85,        /* 0 */
          0x94, 0x95, 0x95, 0xa1, 0x96, 0xae, 0x97, 0xb9,
          0x98, 0xc2, 0x99, 0xcb, 0x9a, 0xd4, 0x9b, 0xdb,
          0x9c, 0xe3, 0x9d, 0xea, 0x9e, 0xf1, 0x9f, 0xf8,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x33, 0x92, 0x5A, 0x93, 0x75,
-         0x94, 0x85, 0x95, 0x93, 0x96, 0xA1, 0x97, 0xAD,
-         0x98, 0xB7, 0x99, 0xC2, 0x9A, 0xCB, 0x9B, 0xD4,
-         0x9C, 0xDE, 0x9D, 0xE7, 0x9E, 0xF0, 0x9F, 0xF7,
+        {0x90, 0x00, 0x91, 0x33, 0x92, 0x5a, 0x93, 0x75,        /* 1 */
+         0x94, 0x85, 0x95, 0x93, 0x96, 0xa1, 0x97, 0xad,
+         0x98, 0xb7, 0x99, 0xc2, 0x9a, 0xcb, 0x9b, 0xd4,
+         0x9c, 0xde, 0x9D, 0xe7, 0x9e, 0xf0, 0x9f, 0xf7,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x2F, 0x92, 0x51, 0x93, 0x6B,
-         0x94, 0x7C, 0x95, 0x8A, 0x96, 0x99, 0x97, 0xA6,
-         0x98, 0xB1, 0x99, 0xBC, 0x9A, 0xC6, 0x9B, 0xD0,
-         0x9C, 0xDB, 0x9D, 0xE4, 0x9E, 0xED, 0x9F, 0xF6,
+        {0x90, 0x00, 0x91, 0x2f, 0x92, 0x51, 0x93, 0x6b,        /* 2 */
+         0x94, 0x7c, 0x95, 0x8a, 0x96, 0x99, 0x97, 0xa6,
+         0x98, 0xb1, 0x99, 0xbc, 0x9a, 0xc6, 0x9b, 0xd0,
+         0x9c, 0xdb, 0x9d, 0xe4, 0x9e, 0xed, 0x9f, 0xf6,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x29, 0x92, 0x48, 0x93, 0x60,
-         0x94, 0x72, 0x95, 0x81, 0x96, 0x90, 0x97, 0x9E,
-         0x98, 0xAA, 0x99, 0xB5, 0x9A, 0xBF, 0x9B, 0xCB,
-         0x9C, 0xD6, 0x9D, 0xE1, 0x9E, 0xEB, 0x9F, 0xF5,
+        {0x90, 0x00, 0x91, 0x29, 0x92, 0x48, 0x93, 0x60,        /* 3 */
+         0x94, 0x72, 0x95, 0x81, 0x96, 0x90, 0x97, 0x9e,
+         0x98, 0xaa, 0x99, 0xb5, 0x9a, 0xbf, 0x9b, 0xcb,
+         0x9c, 0xd6, 0x9d, 0xe1, 0x9e, 0xeb, 0x9f, 0xf5,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x23, 0x92, 0x3F, 0x93, 0x55,
+        {0x90, 0x00, 0x91, 0x23, 0x92, 0x3f, 0x93, 0x55,        /* 4 */
          0x94, 0x68, 0x95, 0x77, 0x96, 0x86, 0x97, 0x95,
-         0x98, 0xA2, 0x99, 0xAD, 0x9A, 0xB9, 0x9B, 0xC6,
-         0x9C, 0xD2, 0x9D, 0xDE, 0x9E, 0xE9, 0x9F, 0xF4,
+         0x98, 0xa2, 0x99, 0xad, 0x9a, 0xb9, 0x9b, 0xc6,
+         0x9c, 0xd2, 0x9d, 0xde, 0x9e, 0xe9, 0x9f, 0xf4,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x1B, 0x92, 0x33, 0x93, 0x48,
+        {0x90, 0x00, 0x91, 0x1b, 0x92, 0x33, 0x93, 0x48,        /* 5 */
          0x94, 0x59, 0x95, 0x69, 0x96, 0x79, 0x97, 0x87,
-         0x98, 0x96, 0x99, 0xA3, 0x9A, 0xB1, 0x9B, 0xBE,
-         0x9C, 0xCC, 0x9D, 0xDA, 0x9E, 0xE7, 0x9F, 0xF3,
+         0x98, 0x96, 0x99, 0xa3, 0x9a, 0xb1, 0x9b, 0xbe,
+         0x9c, 0xcc, 0x9d, 0xda, 0x9e, 0xe7, 0x9f, 0xf3,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x02, 0x92, 0x10, 0x93, 0x20,
+        {0x90, 0x00, 0x91, 0x02, 0x92, 0x10, 0x93, 0x20,        /* 6 */
          0x94, 0x32, 0x95, 0x40, 0x96, 0x57, 0x97, 0x67,
          0x98, 0x77, 0x99, 0x88, 0x9a, 0x99, 0x9b, 0xaa,
          0x9c, 0xbb, 0x9d, 0xcc, 0x9e, 0xdd, 0x9f, 0xee,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x02, 0x92, 0x14, 0x93, 0x26,
-         0x94, 0x38, 0x95, 0x4A, 0x96, 0x60, 0x97, 0x70,
-         0x98, 0x80, 0x99, 0x90, 0x9A, 0xA0, 0x9B, 0xB0,
-         0x9C, 0xC0, 0x9D, 0xD0, 0x9E, 0xE0, 0x9F, 0xF0,
+        {0x90, 0x00, 0x91, 0x02, 0x92, 0x14, 0x93, 0x26,        /* 7 */
+         0x94, 0x38, 0x95, 0x4a, 0x96, 0x60, 0x97, 0x70,
+         0x98, 0x80, 0x99, 0x90, 0x9a, 0xa0, 0x9b, 0xb0,
+         0x9c, 0xc0, 0x9D, 0xd0, 0x9e, 0xe0, 0x9f, 0xf0,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x10, 0x92, 0x22, 0x93, 0x35,
-         0x94, 0x47, 0x95, 0x5A, 0x96, 0x69, 0x97, 0x79,
-         0x98, 0x88, 0x99, 0x97, 0x9A, 0xA7, 0x9B, 0xB6,
-         0x9C, 0xC4, 0x9D, 0xD3, 0x9E, 0xE0, 0x9F, 0xF0,
+        {0x90, 0x00, 0x91, 0x10, 0x92, 0x22, 0x93, 0x35,        /* 8 */
+         0x94, 0x47, 0x95, 0x5a, 0x96, 0x69, 0x97, 0x79,
+         0x98, 0x88, 0x99, 0x97, 0x9a, 0xa7, 0x9b, 0xb6,
+         0x9c, 0xc4, 0x9d, 0xd3, 0x9e, 0xe0, 0x9f, 0xf0,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x10, 0x92, 0x26, 0x93, 0x40,
+        {0x90, 0x00, 0x91, 0x10, 0x92, 0x26, 0x93, 0x40,        /* 9 */
          0x94, 0x54, 0x95, 0x65, 0x96, 0x75, 0x97, 0x84,
          0x98, 0x93, 0x99, 0xa1, 0x9a, 0xb0, 0x9b, 0xbd,
          0x9c, 0xca, 0x9d, 0xd6, 0x9e, 0xe0, 0x9f, 0xf0,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x18, 0x92, 0x2B, 0x93, 0x44,
-         0x94, 0x60, 0x95, 0x70, 0x96, 0x80, 0x97, 0x8E,
-         0x98, 0x9C, 0x99, 0xAA, 0x9A, 0xB7, 0x9B, 0xC4,
-         0x9C, 0xD0, 0x9D, 0xD8, 0x9E, 0xE2, 0x9F, 0xF0,
+        {0x90, 0x00, 0x91, 0x18, 0x92, 0x2b, 0x93, 0x44,        /* 10 */
+         0x94, 0x60, 0x95, 0x70, 0x96, 0x80, 0x97, 0x8e,
+         0x98, 0x9c, 0x99, 0xaa, 0x9a, 0xb7, 0x9b, 0xc4,
+         0x9c, 0xd0, 0x9d, 0xd8, 0x9e, 0xe2, 0x9f, 0xf0,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x1A, 0x92, 0x34, 0x93, 0x52,
-         0x94, 0x66, 0x95, 0x7E, 0x96, 0x8D, 0x97, 0x9B,
-         0x98, 0xA8, 0x99, 0xB4, 0x9A, 0xC0, 0x9B, 0xCB,
-         0x9C, 0xD6, 0x9D, 0xE1, 0x9E, 0xEB, 0x9F, 0xF5,
+        {0x90, 0x00, 0x91, 0x1a, 0x92, 0x34, 0x93, 0x52,        /* 11 */
+         0x94, 0x66, 0x95, 0x7e, 0x96, 0x8D, 0x97, 0x9B,
+         0x98, 0xa8, 0x99, 0xb4, 0x9a, 0xc0, 0x9b, 0xcb,
+         0x9c, 0xd6, 0x9d, 0xe1, 0x9e, 0xeb, 0x9f, 0xf5,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x3F, 0x92, 0x5A, 0x93, 0x6E,
-         0x94, 0x7F, 0x95, 0x8E, 0x96, 0x9C, 0x97, 0xA8,
-         0x98, 0xB4, 0x99, 0xBF, 0x9A, 0xC9, 0x9B, 0xD3,
-         0x9C, 0xDC, 0x9D, 0xE5, 0x9E, 0xEE, 0x9F, 0xF6,
-         0xA0, 0xFF},
-        {0x90, 0x00, 0x91, 0x54, 0x92, 0x6F, 0x93, 0x83,
-         0x94, 0x93, 0x95, 0xA0, 0x96, 0xAD, 0x97, 0xB7,
-         0x98, 0xC2, 0x99, 0xCB, 0x9A, 0xD4, 0x9B, 0xDC,
-         0x9C, 0xE4, 0x9D, 0xEB, 0x9E, 0xF2, 0x9F, 0xF9,
+        {0x90, 0x00, 0x91, 0x3f, 0x92, 0x5a, 0x93, 0x6e,        /* 12 */
+         0x94, 0x7f, 0x95, 0x8e, 0x96, 0x9c, 0x97, 0xa8,
+         0x98, 0xb4, 0x99, 0xbf, 0x9a, 0xc9, 0x9b, 0xd3,
+         0x9c, 0xdc, 0x9d, 0xe5, 0x9e, 0xee, 0x9f, 0xf6,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x6E, 0x92, 0x88, 0x93, 0x9A,
-         0x94, 0xA8, 0x95, 0xB3, 0x96, 0xBD, 0x97, 0xC6,
-         0x98, 0xCF, 0x99, 0xD6, 0x9A, 0xDD, 0x9B, 0xE3,
-         0x9C, 0xE9, 0x9D, 0xEF, 0x9E, 0xF4, 0x9F, 0xFA,
+        {0x90, 0x00, 0x91, 0x54, 0x92, 0x6f, 0x93, 0x83,        /* 13 */
+         0x94, 0x93, 0x95, 0xa0, 0x96, 0xad, 0x97, 0xb7,
+         0x98, 0xc2, 0x99, 0xcb, 0x9a, 0xd4, 0x9b, 0xdc,
+         0x9c, 0xe4, 0x9d, 0xeb, 0x9e, 0xf2, 0x9f, 0xf9,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x93, 0x92, 0xA8, 0x93, 0xB7,
-         0x94, 0xC1, 0x95, 0xCA, 0x96, 0xD2, 0x97, 0xD8,
-         0x98, 0xDE, 0x99, 0xE3, 0x9A, 0xE8, 0x9B, 0xED,
-         0x9C, 0xF1, 0x9D, 0xF5, 0x9E, 0xF8, 0x9F, 0xFC,
-         0xA0, 0xFF}
+        {0x90, 0x00, 0x91, 0x6e, 0x92, 0x88, 0x93, 0x9a,        /* 14 */
+         0x94, 0xa8, 0x95, 0xb3, 0x96, 0xbd, 0x97, 0xc6,
+         0x98, 0xcf, 0x99, 0xd6, 0x9a, 0xdd, 0x9b, 0xe3,
+         0x9c, 0xe9, 0x9d, 0xef, 0x9e, 0xf4, 0x9f, 0xfa,
+         0xa0, 0xff},
+        {0x90, 0x00, 0x91, 0x93, 0x92, 0xa8, 0x93, 0xb7,        /* 15 */
+         0x94, 0xc1, 0x95, 0xca, 0x96, 0xd2, 0x97, 0xd8,
+         0x98, 0xde, 0x99, 0xe3, 0x9a, 0xe8, 0x9b, 0xed,
+         0x9c, 0xf1, 0x9d, 0xf5, 0x9e, 0xf8, 0x9f, 0xfc,
+         0xa0, 0xff}
 };
 
 static const __u8 tas5130a_sensor_init[][8] = {
@@ -364,7 +366,7 @@ static const __u8 tas5130a_sensor_init[][8] = {
 };
 
 /* read 1 byte */
-static int reg_r_1(struct gspca_dev *gspca_dev,
+static int reg_r(struct gspca_dev *gspca_dev,
                    __u16 index)
 {
         usb_control_msg(gspca_dev->dev,
@@ -378,26 +380,26 @@ static int reg_r_1(struct gspca_dev *gspca_dev,
 }
 
 static void reg_w(struct gspca_dev *gspca_dev,
-                        __u16 value,
-                        __u16 index,
-                        const __u8 *buffer, __u16 len)
+                  __u16 index)
+{
+        usb_control_msg(gspca_dev->dev,
+                        usb_sndctrlpipe(gspca_dev->dev, 0),
+                        0,
+                        USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
+                        0, index,
+                        NULL, 0, 500);
+}
+
+static void i2c_w(struct gspca_dev *gspca_dev,
+                  const __u8 *buffer, __u16 len)
 {
-        if (buffer == NULL) {
-                usb_control_msg(gspca_dev->dev,
-                                usb_sndctrlpipe(gspca_dev->dev, 0),
-                                0,
-                           USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
-                                value, index,
-                                NULL, 0, 500);
-                return;
-        }
         if (len <= USB_BUF_SZ) {
                 memcpy(gspca_dev->usb_buf, buffer, len);
                 usb_control_msg(gspca_dev->dev,
                                 usb_sndctrlpipe(gspca_dev->dev, 0),
                                 0,
                            USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
-                                value, index,
+                                0x01, 0,
                                 gspca_dev->usb_buf, len, 500);
         } else {
                 __u8 *tmpbuf;
@@ -408,12 +410,56 @@ static void reg_w(struct gspca_dev *gspca_dev,
                                 usb_sndctrlpipe(gspca_dev->dev, 0),
                                 0,
                            USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
-                                value, index,
+                                0x01, 0,
                                 tmpbuf, len, 500);
                 kfree(tmpbuf);
         }
 }
 
+static void other_sensor_init(struct gspca_dev *gspca_dev)
+{
+        int i;
+        const __u8 *p;
+        __u8 byte;
+        __u8 val[6] = {0x62, 0, 0x64, 0, 0x60, 0x05};
+        static const __u8 sensor_init[] = {
+                0xdf, 0x6d,
+                0xdd, 0x18,
+                0x5a, 0xe0,
+                0x5c, 0x07,
+                0x5d, 0xb0,
+                0x5e, 0x1e,
+                0x60, 0x71,
+                0xef, 0x00,
+                0xe9, 0x00,
+                0xea, 0x00,
+                0x90, 0x24,
+                0x91, 0xb2,
+                0x82, 0x32,
+                0xfd, 0x00,
+                0xfd, 0x01,
+                0xfd, 0x41,
+                0x00                    /* table end */
+        };
+
+        p = sensor_init;
+        while (*p != 0) {
+                val[1] = *p++;
+                val[3] = *p++;
+                if (*p == 0)
+                        reg_w(gspca_dev, 0x3c80);
+                i2c_w(gspca_dev, val, sizeof val);
+                i = 4;
+                while (--i >= 0) {
+                        msleep(15);
+                        byte = reg_r(gspca_dev, 0x60);
+                        if (!(byte & 0x01))
+                                break;
+                }
+        }
+                        reg_w(gspca_dev, 0x3c80);
+}
+
 /* this function is called at probe time */
 static int sd_config(struct gspca_dev *gspca_dev,
                      const struct usb_device_id *id)
@@ -430,7 +476,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
         sd->brightness = sd_ctrls[SD_BRIGHTNESS].qctrl.default_value;
         sd->contrast = sd_ctrls[SD_CONTRAST].qctrl.default_value;
         sd->colors = sd_ctrls[SD_COLOR].qctrl.default_value;
-        sd->gamma = sd_ctrls[SD_GAMMA].qctrl.default_value;
+        sd->gamma = GAMMA_DEF;
         sd->mirror = sd_ctrls[SD_MIRROR].qctrl.default_value;
         sd->freq = sd_ctrls[SD_LIGHTFREQ].qctrl.default_value;
         sd->whitebalance = sd_ctrls[SD_WHITE_BALANCE].qctrl.default_value;
@@ -439,27 +485,37 @@ static int sd_config(struct gspca_dev *gspca_dev,
         return 0;
 }
 
-static int init_default_parameters(struct gspca_dev *gspca_dev)
+static void setgamma(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        PDEBUG(D_CONF, "Gamma: %d", sd->gamma);
+        i2c_w(gspca_dev, gamma_table[sd->gamma], sizeof gamma_table[0]);
+}
+
+/* this function is called at probe and resume time */
+static int sd_init(struct gspca_dev *gspca_dev)
 {
         /* some of this registers are not really neded, because
          * they are overriden by setbrigthness, setcontrast, etc,
          * but wont hurt anyway, and can help someone with similar webcam
          * to see the initial parameters.*/
-        int i = 0;
-        __u8 test_byte;
+        struct sd *sd = (struct sd *) gspca_dev;
+        int i;
+        __u8 byte, test_byte;
 
         static const __u8 read_indexs[] =
                 { 0x06, 0x07, 0x0a, 0x0b, 0x66, 0x80, 0x81, 0x8e, 0x8f, 0xa5,
                   0xa6, 0xa8, 0xbb, 0xbc, 0xc6, 0x00, 0x00 };
-        static const __u8 n1[6] =
+        static const __u8 n1[] =
                         {0x08, 0x03, 0x09, 0x03, 0x12, 0x04};
-        static const __u8 n2[2] =
+        static const __u8 n2[] =
                         {0x08, 0x00};
-        static const __u8 nset[6] =
-                { 0x61, 0x68, 0x62, 0xff, 0x60, 0x07 };
-        static const __u8 n3[6] =
+        static const __u8 nset[] =
+                        { 0x61, 0x68, 0x62, 0xff, 0x60, 0x07 };
+        static const __u8 n3[] =
                         {0x61, 0x68, 0x65, 0x0a, 0x60, 0x04};
-        static const __u8 n4[0x46] =
+        static const __u8 n4[] =
                 {0x09, 0x01, 0x12, 0x04, 0x66, 0x8a, 0x80, 0x3c,
                  0x81, 0x22, 0x84, 0x50, 0x8a, 0x78, 0x8b, 0x68,
                  0x8c, 0x88, 0x8e, 0x33, 0x8f, 0x24, 0xaa, 0xb1,
@@ -469,33 +525,26 @@ static int init_default_parameters(struct gspca_dev *gspca_dev)
                  0x65, 0x0a, 0xbb, 0x86, 0xaf, 0x58, 0xb0, 0x68,
                  0x87, 0x40, 0x89, 0x2b, 0x8d, 0xff, 0x83, 0x40,
                  0xac, 0x84, 0xad, 0x86, 0xaf, 0x46};
-        static const __u8 nset4[18] = {
+        static const __u8 nset4[] = {
                 0xe0, 0x60, 0xe1, 0xa8, 0xe2, 0xe0, 0xe3, 0x60, 0xe4, 0xa8,
                 0xe5, 0xe0, 0xe6, 0x60, 0xe7, 0xa8,
                 0xe8, 0xe0
         };
         /* ojo puede ser 0xe6 en vez de 0xe9 */
-        static const __u8 nset2[20] = {
+        static const __u8 nset2[] = {
                 0xd0, 0xbb, 0xd1, 0x28, 0xd2, 0x10, 0xd3, 0x10, 0xd4, 0xbb,
                 0xd5, 0x28, 0xd6, 0x1e, 0xd7, 0x27,
                 0xd8, 0xc8, 0xd9, 0xfc
         };
-        static const __u8 missing[8] =
+        static const __u8 missing[] =
                 { 0x87, 0x20, 0x88, 0x20, 0x89, 0x20, 0x80, 0x38 };
-        static const __u8 nset3[18] = {
+        static const __u8 nset3[] = {
                 0xc7, 0x60, 0xc8, 0xa8, 0xc9, 0xe0, 0xca, 0x60, 0xcb, 0xa8,
                 0xcc, 0xe0, 0xcd, 0x60, 0xce, 0xa8,
                 0xcf, 0xe0
         };
-        static const __u8 nset5[4] =
-                { 0x8f, 0x24, 0xc3, 0x00 };     /* bright */
-        static const __u8 nset6[34] = {
-                0x90, 0x00, 0x91, 0x1c, 0x92, 0x30, 0x93, 0x43, 0x94, 0x54,
-                0x95, 0x65, 0x96, 0x75, 0x97, 0x84,
-                0x98, 0x93, 0x99, 0xa1, 0x9a, 0xb0, 0x9b, 0xbd, 0x9c, 0xca,
-                0x9d, 0xd8, 0x9e, 0xe5, 0x9f, 0xf2,
-                0xa0, 0xff
-        };                      /* Gamma */
+        static const __u8 nset5[] =
+                        { 0x8f, 0x24, 0xc3, 0x00 };     /* bright */
         static const __u8 nset7[4] =
                         { 0x66, 0xca, 0xa8, 0xf8 };     /* 50/60 Hz */
         static const __u8 nset9[4] =
@@ -505,95 +554,111 @@ static int init_default_parameters(struct gspca_dev *gspca_dev)
         static const __u8 nset10[6] =
                         { 0x0c, 0x03, 0xab, 0x10, 0x81, 0x20 };
 
-        reg_w(gspca_dev, 0x01, 0x0000, n1, 0x06);
-        reg_w(gspca_dev, 0x01, 0x0000, nset, 0x06);
-        reg_r_1(gspca_dev, 0x0063);
-        reg_w(gspca_dev, 0x01, 0x0000, n2, 0x02);
+        byte = reg_r(gspca_dev, 0x06);
+        test_byte = reg_r(gspca_dev, 0x07);
+        if (byte == 0x08 && test_byte == 0x07) {
+                PDEBUG(D_CONF, "other sensor");
+                sd->sensor = SENSOR_OTHER;
+        } else {
+                PDEBUG(D_CONF, "sensor %02x %02x", byte, test_byte);
+                sd->sensor = SENSOR_TAS5130A;
+        }
+
+        i2c_w(gspca_dev, n1, sizeof n1);
+        test_byte = 0;
+        i = 5;
+        while (--i >= 0) {
+                i2c_w(gspca_dev, nset, sizeof nset);
+                msleep(5);
+                test_byte = reg_r(gspca_dev, 0x0063);
+                msleep(100);
+                if (test_byte == 0x17)
+                        break;          /* OK */
+        }
+        if (i < 0) {
+                err("Bad sensor reset %02x", test_byte);
+/*              return -EIO; */
+/*fixme: test - continue */
+        }
+        i2c_w(gspca_dev, n2, sizeof n2);
 
+        i = 0;
         while (read_indexs[i] != 0x00) {
-                test_byte = reg_r_1(gspca_dev, read_indexs[i]);
-                PDEBUG(D_CONF, "Reg 0x%02x => 0x%02x", read_indexs[i],
+                test_byte = reg_r(gspca_dev, read_indexs[i]);
+                PDEBUG(D_STREAM, "Reg 0x%02x = 0x%02x", read_indexs[i],
                        test_byte);
                 i++;
         }
 
-        reg_w(gspca_dev, 0x01, 0x0000, n3, 0x06);
-        reg_w(gspca_dev, 0x01, 0x0000, n4, 0x46);
-        reg_r_1(gspca_dev, 0x0080);
-        reg_w(gspca_dev, 0x00, 0x2c80, NULL, 0);
-        reg_w(gspca_dev, 0x01, 0x0000, nset2, 0x14);
-        reg_w(gspca_dev, 0x01, 0x0000, nset3, 0x12);
-        reg_w(gspca_dev, 0x01, 0x0000, nset4, 0x12);
-        reg_w(gspca_dev, 0x00, 0x3880, NULL, 0);
-        reg_w(gspca_dev, 0x00, 0x3880, NULL, 0);
-        reg_w(gspca_dev, 0x00, 0x338e, NULL, 0);
-        reg_w(gspca_dev, 0x01, 0x0000, nset5, 0x04);
-        reg_w(gspca_dev, 0x00, 0x00a9, NULL, 0);
-        reg_w(gspca_dev, 0x01, 0x0000, nset6, 0x22);
-        reg_w(gspca_dev, 0x00, 0x86bb, NULL, 0);
-        reg_w(gspca_dev, 0x00, 0x4aa6, NULL, 0);
-
-        reg_w(gspca_dev, 0x01, 0x0000, missing, 0x08);
-
-        reg_w(gspca_dev, 0x00, 0x2087, NULL, 0);
-        reg_w(gspca_dev, 0x00, 0x2088, NULL, 0);
-        reg_w(gspca_dev, 0x00, 0x2089, NULL, 0);
-
-        reg_w(gspca_dev, 0x01, 0x0000, nset7, 0x04);
-        reg_w(gspca_dev, 0x01, 0x0000, nset10, 0x06);
-        reg_w(gspca_dev, 0x01, 0x0000, nset8, 0x06);
-        reg_w(gspca_dev, 0x01, 0x0000, nset9, 0x04);
-
-        reg_w(gspca_dev, 0x00, 0x2880, NULL, 0);
-        reg_w(gspca_dev, 0x01, 0x0000, nset2, 0x14);
-        reg_w(gspca_dev, 0x01, 0x0000, nset3, 0x12);
-        reg_w(gspca_dev, 0x01, 0x0000, nset4, 0x12);
+        i2c_w(gspca_dev, n3, sizeof n3);
+        i2c_w(gspca_dev, n4, sizeof n4);
+        reg_r(gspca_dev, 0x0080);
+        reg_w(gspca_dev, 0x2c80);
+        i2c_w(gspca_dev, nset2, sizeof nset2);
+        i2c_w(gspca_dev, nset3, sizeof nset3);
+        i2c_w(gspca_dev, nset4, sizeof nset4);
+        reg_w(gspca_dev, 0x3880);
+        reg_w(gspca_dev, 0x3880);
+        reg_w(gspca_dev, 0x338e);
+        i2c_w(gspca_dev, nset5, sizeof nset5);
+        reg_w(gspca_dev, 0x00a9);
+        setgamma(gspca_dev);
+        reg_w(gspca_dev, 0x86bb);
+        reg_w(gspca_dev, 0x4aa6);
+
+        i2c_w(gspca_dev, missing, sizeof missing);
+
+        reg_w(gspca_dev, 0x2087);
+        reg_w(gspca_dev, 0x2088);
+        reg_w(gspca_dev, 0x2089);
+
+        i2c_w(gspca_dev, nset7, sizeof nset7);
+        i2c_w(gspca_dev, nset10, sizeof nset10);
+        i2c_w(gspca_dev, nset8, sizeof nset8);
+        i2c_w(gspca_dev, nset9, sizeof nset9);
+
+        reg_w(gspca_dev, 0x2880);
+        i2c_w(gspca_dev, nset2, sizeof nset2);
+        i2c_w(gspca_dev, nset3, sizeof nset3);
+        i2c_w(gspca_dev, nset4, sizeof nset4);
 
         return 0;
 }
 
-/* this function is called at probe and resume time */
-static int sd_init(struct gspca_dev *gspca_dev)
-{
-        init_default_parameters(gspca_dev);
-        return 0;
-}
-
 static void setbrightness(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         unsigned int brightness;
-        __u8 set6[4] = { 0x8f, 0x26, 0xc3, 0x80 };
-        brightness = sd->brightness;
+        __u8 set6[4] = { 0x8f, 0x26, 0xc3, 0x00 };
 
+        brightness = sd->brightness;
         if (brightness < 7) {
-                set6[3] = 0x70 - (brightness * 0xa);
+                set6[3] = 0x70 - brightness * 0x10;
         } else {
                 set6[1] = 0x24;
-                set6[3] = 0x00 + ((brightness - 7) * 0xa);
+                set6[3] = 0x00 + ((brightness - 7) * 0x10);
         }
 
-        reg_w(gspca_dev, 0x01, 0x0000, set6, 4);
+        i2c_w(gspca_dev, set6, sizeof set6);
 }
 
 static void setflip(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-
         __u8 flipcmd[8] =
-            { 0x62, 0x07, 0x63, 0x03, 0x64, 0x00, 0x60, 0x09 };
+                {0x62, 0x07, 0x63, 0x03, 0x64, 0x00, 0x60, 0x09};
 
-        if (sd->mirror == 1)
+        if (sd->mirror)
                 flipcmd[3] = 0x01;
 
-        reg_w(gspca_dev, 0x01, 0x0000, flipcmd, 8);
+        i2c_w(gspca_dev, flipcmd, sizeof flipcmd);
 }
 
 static void seteffect(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
-        reg_w(gspca_dev, 0x01, 0x0000, effects_table[sd->effect], 0x06);
+        i2c_w(gspca_dev, effects_table[sd->effect], sizeof effects_table[0]);
         if (sd->effect == 1 || sd->effect == 5) {
                 PDEBUG(D_CONF,
                        "This effect have been disabled for webcam \"safety\"");
@@ -601,9 +666,9 @@ static void seteffect(struct gspca_dev *gspca_dev)
         }
 
         if (sd->effect == 1 || sd->effect == 4)
-                reg_w(gspca_dev, 0x00, 0x4aa6, NULL, 0);
+                reg_w(gspca_dev, 0x4aa6);
         else
-                reg_w(gspca_dev, 0x00, 0xfaa6, NULL, 0);
+                reg_w(gspca_dev, 0xfaa6);
 }
 
 static void setwhitebalance(struct gspca_dev *gspca_dev)
@@ -616,7 +681,7 @@ static void setwhitebalance(struct gspca_dev *gspca_dev)
         if (sd->whitebalance == 1)
                 white_balance[7] = 0x3c;
 
-        reg_w(gspca_dev, 0x01, 0x0000, white_balance, 8);
+        i2c_w(gspca_dev, white_balance, sizeof white_balance);
 }
 
 static void setlightfreq(struct gspca_dev *gspca_dev)
@@ -627,21 +692,21 @@ static void setlightfreq(struct gspca_dev *gspca_dev)
         if (sd->freq == 2)      /* 60hz */
                 freq[1] = 0x00;
 
-        reg_w(gspca_dev, 0x1, 0x0000, freq, 0x4);
+        i2c_w(gspca_dev, freq, sizeof freq);
 }
 
 static void setcontrast(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         unsigned int contrast = sd->contrast;
-        __u16 reg_to_write = 0x00;
+        __u16 reg_to_write;
 
         if (contrast < 7)
                 reg_to_write = 0x8ea9 - (0x200 * contrast);
         else
                 reg_to_write = (0x00a9 + ((contrast - 7) * 0x200));
 
-        reg_w(gspca_dev, 0x00, reg_to_write, NULL, 0);
+        reg_w(gspca_dev, reg_to_write);
 }
 
 static void setcolors(struct gspca_dev *gspca_dev)
@@ -650,11 +715,7 @@ static void setcolors(struct gspca_dev *gspca_dev)
         __u16 reg_to_write;
 
         reg_to_write = 0xc0bb + sd->colors * 0x100;
-        reg_w(gspca_dev, 0x00, reg_to_write, NULL, 0);
-}
-
-static void setgamma(struct gspca_dev *gspca_dev)
-{
+        reg_w(gspca_dev, reg_to_write);
 }
 
 static void setsharpness(struct gspca_dev *gspca_dev)
@@ -664,7 +725,99 @@ static void setsharpness(struct gspca_dev *gspca_dev)
 
         reg_to_write = 0x0aa6 + 0x1000 * sd->sharpness;
 
-        reg_w(gspca_dev, 0x00, reg_to_write, NULL, 0);
+        reg_w(gspca_dev, reg_to_write);
+}
+
+static int sd_start(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        int i, mode;
+        static const __u8 t1[] = { 0x66, 0x00, 0xa8, 0xe8 };
+        __u8 t2[] = { 0x07, 0x00, 0x0d, 0x60, 0x0e, 0x80 };
+        static const __u8 t3[] =
+                { 0xb3, 0x07, 0xb4, 0x00, 0xb5, 0x88, 0xb6, 0x02, 0xb7, 0x06,
+                  0xb8, 0x00, 0xb9, 0xe7, 0xba, 0x01 };
+        static const __u8 t4[] = { 0x0b, 0x04, 0x0a, 0x40 };
+
+        mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode]. priv;
+        switch (mode) {
+        case 1:         /* 352x288 */
+                t2[1] = 0x40;
+                break;
+        case 2:         /* 320x240 */
+                t2[1] = 0x10;
+                break;
+        case 3:         /* 176x144 */
+                t2[1] = 0x50;
+                break;
+        case 4:         /* 160x120 */
+                t2[1] = 0x20;
+                break;
+        default:        /* 640x480 (0x00) */
+                break;
+        }
+
+        if (sd->sensor == SENSOR_TAS5130A) {
+                i = 0;
+                while (tas5130a_sensor_init[i][0] != 0) {
+                        i2c_w(gspca_dev, tas5130a_sensor_init[i],
+                                         sizeof tas5130a_sensor_init[0]);
+                        i++;
+                }
+                reg_w(gspca_dev, 0x3c80);
+                /* just in case and to keep sync with logs (for mine) */
+                i2c_w(gspca_dev, tas5130a_sensor_init[3],
+                                 sizeof tas5130a_sensor_init[0]);
+                reg_w(gspca_dev, 0x3c80);
+        } else {
+                other_sensor_init(gspca_dev);
+        }
+        /* just in case and to keep sync with logs  (for mine) */
+        i2c_w(gspca_dev, t1, sizeof t1);
+        i2c_w(gspca_dev, t2, sizeof t2);
+        reg_r(gspca_dev, 0x0012);
+        i2c_w(gspca_dev, t3, sizeof t3);
+        reg_w(gspca_dev, 0x0013);
+        i2c_w(gspca_dev, t4, sizeof t4);
+        /* restart on each start, just in case, sometimes regs goes wrong
+         * when using controls from app */
+        setbrightness(gspca_dev);
+        setcontrast(gspca_dev);
+        setcolors(gspca_dev);
+        return 0;
+}
+
+static void sd_pkt_scan(struct gspca_dev *gspca_dev,
+                        struct gspca_frame *frame,      /* target */
+                        __u8 *data,                     /* isoc packet */
+                        int len)                        /* iso packet length */
+{
+        static __u8 ffd9[] = { 0xff, 0xd9 };
+
+        if (data[0] == 0x5a) {
+                /* Control Packet, after this came the header again,
+                 * but extra bytes came in the packet before this,
+                 * sometimes an EOF arrives, sometimes not... */
+                return;
+        }
+        data += 2;
+        len -= 2;
+        if (data[0] == 0xff && data[1] == 0xd8) {
+                /* extra bytes....., could be processed too but would be
+                 * a waste of time, right now leave the application and
+                 * libjpeg do it for ourserlves.. */
+                frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,
+                                        ffd9, 2);
+                gspca_frame_add(gspca_dev, FIRST_PACKET, frame, data, len);
+                return;
+        }
+
+        if (data[len - 2] == 0xff && data[len - 1] == 0xd9) {
+                /* Just in case, i have seen packets with the marker,
+                 * other's do not include it... */
+                len -= 2;
+        }
+        gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);
 }
 
 static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
@@ -788,6 +941,7 @@ static int sd_setgamma(struct gspca_dev *gspca_dev, __s32 val)
 static int sd_getgamma(struct gspca_dev *gspca_dev, __s32 *val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
+
         *val = sd->gamma;
         return 0;
 }
@@ -835,9 +989,9 @@ static int sd_setlowlight(struct gspca_dev *gspca_dev, __s32 val)
 
         sd->autogain = val;
         if (val != 0)
-                reg_w(gspca_dev, 0x00, 0xf48e, NULL, 0);
+                reg_w(gspca_dev, 0xf48e);
         else
-                reg_w(gspca_dev, 0x00, 0xb48e, NULL, 0);
+                reg_w(gspca_dev, 0xb48e);
         return 0;
 }
 
@@ -849,99 +1003,6 @@ static int sd_getlowlight(struct gspca_dev *gspca_dev, __s32 *val)
         return 0;
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
-{
-        int mode;
-
-        static const __u8 t1[] = { 0x66, 0x00, 0xa8, 0xe8 };
-        __u8 t2[] = { 0x07, 0x00, 0x0d, 0x60, 0x0e, 0x80 };
-        static const __u8 t3[] =
-                { 0xb3, 0x07, 0xb4, 0x00, 0xb5, 0x88, 0xb6, 0x02, 0xb7, 0x06,
-                  0xb8, 0x00, 0xb9, 0xe7, 0xba, 0x01 };
-        static const __u8 t4[] = { 0x0b, 0x04, 0x0a, 0x40 };
-
-        mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode]. priv;
-        switch (mode) {
-        case 1:         /* 352x288 */
-                t2[1] = 0x40;
-                break;
-        case 2:         /* 320x240 */
-                t2[1] = 0x10;
-                break;
-        case 3:         /* 176x144 */
-                t2[1] = 0x50;
-                break;
-        case 4:         /* 160x120 */
-                t2[1] = 0x20;
-                break;
-        default:        /* 640x480 (0x00) */
-                break;
-        }
-
-        reg_w(gspca_dev, 0x01, 0x0000, tas5130a_sensor_init[0], 0x8);
-        reg_w(gspca_dev, 0x01, 0x0000, tas5130a_sensor_init[1], 0x8);
-        reg_w(gspca_dev, 0x01, 0x0000, tas5130a_sensor_init[2], 0x8);
-        reg_w(gspca_dev, 0x01, 0x0000, tas5130a_sensor_init[3], 0x8);
-        reg_w(gspca_dev, 0x00, 0x3c80, NULL, 0);
-                /* just in case and to keep sync with logs  (for mine) */
-        reg_w(gspca_dev, 0x01, 0x0000, tas5130a_sensor_init[3], 0x8);
-        reg_w(gspca_dev, 0x00, 0x3c80, NULL, 0);
-                /* just in case and to keep sync with logs  (for mine) */
-        reg_w(gspca_dev, 0x01, 0x0000, t1, 4);
-        reg_w(gspca_dev, 0x01, 0x0000, t2, 6);
-        reg_r_1(gspca_dev, 0x0012);
-        reg_w(gspca_dev, 0x01, 0x0000, t3, 0x10);
-        reg_w(gspca_dev, 0x00, 0x0013, NULL, 0);
-        reg_w(gspca_dev, 0x01, 0x0000, t4, 0x4);
-        /* restart on each start, just in case, sometimes regs goes wrong
-         * when using controls from app */
-        setbrightness(gspca_dev);
-        setcontrast(gspca_dev);
-        setcolors(gspca_dev);
-}
-
-static void sd_pkt_scan(struct gspca_dev *gspca_dev,
-                        struct gspca_frame *frame,      /* target */
-                        __u8 *data,                     /* isoc packet */
-                        int len)                        /* iso packet length */
-{
-        int sof = 0;
-        static __u8 ffd9[] = { 0xff, 0xd9 };
-
-        if (data[0] == 0x5a) {
-                /* Control Packet, after this came the header again,
-                 * but extra bytes came in the packet before this,
-                 * sometimes an EOF arrives, sometimes not... */
-                return;
-        }
-
-        if (data[len - 1] == 0xff && data[len] == 0xd9) {
-                /* Just in case, i have seen packets with the marker,
-                 * other's do not include it... */
-                data += 2;
-                len -= 4;
-        } else if (data[2] == 0xff && data[3] == 0xd8) {
-                sof = 1;
-                data += 2;
-                len -= 2;
-        } else {
-                data += 2;
-                len -= 2;
-        }
-
-        if (sof) {
-                /* extra bytes....., could be processed too but would be
-                 * a waste of time, right now leave the application and
-                 * libjpeg do it for ourserlves.. */
-                frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,
-                                        ffd9, 2);
-                gspca_frame_add(gspca_dev, FIRST_PACKET, frame, data, len);
-                return;
-        }
-
-        gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);
-}
-
 static int sd_querymenu(struct gspca_dev *gspca_dev,
                         struct v4l2_querymenu *menu)
 {
diff --git a/drivers/media/video/gspca/tv8532.c b/drivers/media/video/gspca/tv8532.c
index 084af05302a0..968a5911704f 100644
--- a/drivers/media/video/gspca/tv8532.c
+++ b/drivers/media/video/gspca/tv8532.c
@@ -390,7 +390,7 @@ static void setbrightness(struct gspca_dev *gspca_dev)
 }
 
 /* -- start the camera -- */
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         reg_w_1(gspca_dev, TV8532_AD_SLOPE, 0x32);
         reg_w_1(gspca_dev, TV8532_AD_BITCTRL, 0x00);
@@ -443,6 +443,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
         /************************************************/
         tv_8532_PollReg(gspca_dev);
         reg_w_1(gspca_dev, TV8532_UDP_UPDATE, 0x00);    /* 0x31 */
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/vc032x.c b/drivers/media/video/gspca/vc032x.c
index bd4c226c9a07..be46d9232540 100644
--- a/drivers/media/video/gspca/vc032x.c
+++ b/drivers/media/video/gspca/vc032x.c
@@ -80,7 +80,6 @@ static struct ctrl sd_ctrls[] = {
                 .step    = 1,
 #define FREQ_DEF 1
                 .default_value = FREQ_DEF,
-                .default_value = 1,
             },
             .set = sd_setfreq,
             .get = sd_getfreq,
@@ -1502,7 +1501,7 @@ static void setlightfreq(struct gspca_dev *gspca_dev)
         usb_exchange(gspca_dev, ov7660_freq_tb[sd->lightfreq]);
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         const __u8 *GammaT = NULL;
@@ -1586,7 +1585,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
                 break;
         default:
                 PDEBUG(D_PROBE, "Damned !! no sensor found Bye");
-                return;
+                return -EMEDIUMTYPE;
         }
         if (GammaT && MatrixT) {
                 put_tab_to_reg(gspca_dev, GammaT, 17, 0xb84a);
@@ -1622,6 +1621,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
                 setautogain(gspca_dev);
                 setlightfreq(gspca_dev);
         }
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c
index d61ef727e0c2..d0a4451dc46f 100644
--- a/drivers/media/video/gspca/zc3xx.c
+++ b/drivers/media/video/gspca/zc3xx.c
@@ -7178,7 +7178,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         struct usb_device *dev = gspca_dev->dev;
@@ -7331,6 +7331,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
                 reg_w(dev, 0x02, 0x0008);
                 break;
         }
+        return 0;
 }
 
 static void sd_stop0(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index a30254bed311..efe849981ab7 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -12,6 +12,10 @@
  *      Markus Rechberger <mrechberger@gmail.com>
  * modified for DViCO Fusion HDTV 5 RT GOLD by
  *      Chaogui Zhang <czhang1974@gmail.com>
+ * modified for MSI TV@nywhere Plus by
+ *      Henry Wong <henry@stuffedcow.net>
+ *      Mark Schultz <n9xmj@yahoo.com>
+ *      Brian Rogers <brian_rogers@comcast.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
@@ -65,7 +69,7 @@ static int get_key_haup_common(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw,
                                int size, int offset)
 {
         unsigned char buf[6];
-        int start, range, toggle, dev, code;
+        int start, range, toggle, dev, code, ircode;
 
         /* poll IR chip */
         if (size != i2c_master_recv(&ir->c,buf,size))
@@ -85,6 +89,24 @@ static int get_key_haup_common(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw,
         if (!start)
                 /* no key pressed */
                 return 0;
+        /*
+         * Hauppauge remotes (black/silver) always use
+         * specific device ids. If we do not filter the
+         * device ids then messages destined for devices
+         * such as TVs (id=0) will get through causing
+         * mis-fired events.
+         *
+         * We also filter out invalid key presses which
+         * produce annoying debug log entries.
+         */
+        ircode= (start << 12) | (toggle << 11) | (dev << 6) | code;
+        if ((ircode & 0x1fff)==0x1fff)
+                /* invalid key press */
+                return 0;
+
+        if (dev!=0x1e && dev!=0x1f)
+                /* not a hauppauge remote */
+                return 0;
 
         if (!range)
                 code += 64;
@@ -94,7 +116,7 @@ static int get_key_haup_common(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw,
 
         /* return key */
         *ir_key = code;
-        *ir_raw = (start << 12) | (toggle << 11) | (dev << 6) | code;
+        *ir_raw = ircode;
         return 1;
 }
 
@@ -224,9 +246,15 @@ static void ir_timer(unsigned long data)
 static void ir_work(struct work_struct *work)
 {
         struct IR_i2c *ir = container_of(work, struct IR_i2c, work);
+        int polling_interval = 100;
+
+        /* MSI TV@nywhere Plus requires more frequent polling
+           otherwise it will miss some keypresses */
+        if (ir->c.adapter->id == I2C_HW_SAA7134 && ir->c.addr == 0x30)
+                polling_interval = 50;
 
         ir_key_poll(ir);
-        mod_timer(&ir->timer, jiffies + msecs_to_jiffies(100));
+        mod_timer(&ir->timer, jiffies + msecs_to_jiffies(polling_interval));
 }
 
 /* ----------------------------------------------------------------------- */
@@ -465,9 +493,37 @@ static int ir_probe(struct i2c_adapter *adap)
                         (1 == rc) ? "yes" : "no");
                 if (1 == rc) {
                         ir_attach(adap, probe[i], 0, 0);
-                        break;
+                        return 0;
                 }
         }
+
+        /* Special case for MSI TV@nywhere Plus remote */
+        if (adap->id == I2C_HW_SAA7134) {
+                u8 temp;
+
+                /* MSI TV@nywhere Plus controller doesn't seem to
+                   respond to probes unless we read something from
+                   an existing device. Weird... */
+
+                msg.addr = 0x50;
+                rc = i2c_transfer(adap, &msg, 1);
+                        dprintk(1, "probe 0x%02x @ %s: %s\n",
+                        msg.addr, adap->name,
+                        (1 == rc) ? "yes" : "no");
+
+                /* Now do the probe. The controller does not respond
+                   to 0-byte reads, so we use a 1-byte read instead. */
+                msg.addr = 0x30;
+                msg.len = 1;
+                msg.buf = &temp;
+                rc = i2c_transfer(adap, &msg, 1);
+                dprintk(1, "probe 0x%02x @ %s: %s\n",
+                        msg.addr, adap->name,
+                        (1 == rc) ? "yes" : "no");
+                if (1 == rc)
+                        ir_attach(adap, msg.addr, 0, 0);
+        }
+
         return 0;
 }
 
diff --git a/drivers/media/video/ivtv/ivtv-cards.h b/drivers/media/video/ivtv/ivtv-cards.h
index 381af1bceef8..0b8fe85fb697 100644
--- a/drivers/media/video/ivtv/ivtv-cards.h
+++ b/drivers/media/video/ivtv/ivtv-cards.h
@@ -154,7 +154,7 @@
 #define IVTV_CAP_ENCODER (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_TUNER | \
                           V4L2_CAP_AUDIO | V4L2_CAP_READWRITE | V4L2_CAP_VBI_CAPTURE | \
                           V4L2_CAP_SLICED_VBI_CAPTURE)
-#define IVTV_CAP_DECODER (V4L2_CAP_VBI_OUTPUT | V4L2_CAP_VIDEO_OUTPUT | \
+#define IVTV_CAP_DECODER (V4L2_CAP_VIDEO_OUTPUT | \
                           V4L2_CAP_SLICED_VBI_OUTPUT | V4L2_CAP_VIDEO_OUTPUT_OVERLAY)
 
 struct ivtv_card_video_input {
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 4afc7ea07e86..aeaa13f6cb36 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -61,14 +61,14 @@
 #include "tuner-xc2028.h"
 
 /* var to keep track of the number of array elements in use */
-int ivtv_cards_active = 0;
+int ivtv_cards_active;
 
 /* If you have already X v4l cards, then set this to X. This way
    the device numbers stay matched. Example: you have a WinTV card
    without radio and a PVR-350 with. Normally this would give a
    video1 device together with a radio0 device for the PVR. By
    setting this to 1 you ensure that radio0 is now also radio1. */
-int ivtv_first_minor = 0;
+int ivtv_first_minor;
 
 /* Master variable for all ivtv info */
 struct ivtv *ivtv_cards[IVTV_MAX_CARDS];
@@ -251,7 +251,7 @@ MODULE_PARM_DESC(newi2c,
                  "\t\t\t-1 is autodetect, 0 is off, 1 is on\n"
                  "\t\t\tDefault is autodetect");
 
-MODULE_PARM_DESC(ivtv_first_minor, "Set minor assigned to first card");
+MODULE_PARM_DESC(ivtv_first_minor, "Set kernel number assigned to first card");
 
 MODULE_AUTHOR("Kevin Thayer, Chris Kennedy, Hans Verkuil");
 MODULE_DESCRIPTION("CX23415/CX23416 driver");
@@ -655,9 +655,9 @@ done:
 
         if (itv->card == NULL) {
                 itv->card = ivtv_get_card(IVTV_CARD_PVR_150);
-                IVTV_ERR("Unknown card: vendor/device: %04x/%04x\n",
+                IVTV_ERR("Unknown card: vendor/device: [%04x:%04x]\n",
                      itv->dev->vendor, itv->dev->device);
-                IVTV_ERR("              subsystem vendor/device: %04x/%04x\n",
+                IVTV_ERR("              subsystem vendor/device: [%04x:%04x]\n",
                      itv->dev->subsystem_vendor, itv->dev->subsystem_device);
                 IVTV_ERR("              %s based\n", chipname);
                 IVTV_ERR("Defaulting to %s card\n", itv->card->name);
@@ -720,7 +720,7 @@ static int __devinit ivtv_init_struct1(struct ivtv *itv)
         itv->speed = 1000;
 
         /* VBI */
-        itv->vbi.in.type = V4L2_BUF_TYPE_SLICED_VBI_CAPTURE;
+        itv->vbi.in.type = V4L2_BUF_TYPE_VBI_CAPTURE;
         itv->vbi.sliced_in = &itv->vbi.in.fmt.sliced;
 
         /* Init the sg table for osd/yuv output */
diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h
index 2ceb5227637c..bc29436e8a3c 100644
--- a/drivers/media/video/ivtv/ivtv-driver.h
+++ b/drivers/media/video/ivtv/ivtv-driver.h
@@ -49,7 +49,6 @@
 #include <linux/i2c-algo-bit.h>
 #include <linux/list.h>
 #include <linux/unistd.h>
-#include <linux/byteorder/swab.h>
 #include <linux/pagemap.h>
 #include <linux/scatterlist.h>
 #include <linux/workqueue.h>
@@ -507,6 +506,8 @@ struct yuv_playback_info
         struct v4l2_rect main_rect;
         u32 v4l2_src_w;
         u32 v4l2_src_h;
+
+        u8 running; /* Have any frames been displayed */
 };
 
 #define IVTV_VBI_FRAMES 32
@@ -751,6 +752,12 @@ void ivtv_read_eeprom(struct ivtv *itv, struct tveeprom *tv);
 /* First-open initialization: load firmware, init cx25840, etc. */
 int ivtv_init_on_first_open(struct ivtv *itv);
 
+/* Test if the current VBI mode is raw (1) or sliced (0) */
+static inline int ivtv_raw_vbi(const struct ivtv *itv)
+{
+        return itv->vbi.in.type == V4L2_BUF_TYPE_VBI_CAPTURE;
+}
+
 /* This is a PCI post thing, where if the pci register is not read, then
    the write doesn't always take effect right away. By reading back the
    register any pending PCI writes will be performed (in order), and so
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index 7ec5c99f9ad1..b7457fc60ba5 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -39,7 +39,7 @@
    associated VBI streams are also automatically claimed.
    Possible error returns: -EBUSY if someone else has claimed
    the stream or 0 on success. */
-int ivtv_claim_stream(struct ivtv_open_id *id, int type)
+static int ivtv_claim_stream(struct ivtv_open_id *id, int type)
 {
         struct ivtv *itv = id->itv;
         struct ivtv_stream *s = &itv->streams[type];
@@ -78,7 +78,7 @@ int ivtv_claim_stream(struct ivtv_open_id *id, int type)
         if (type == IVTV_DEC_STREAM_TYPE_MPG) {
                 vbi_type = IVTV_DEC_STREAM_TYPE_VBI;
         } else if (type == IVTV_ENC_STREAM_TYPE_MPG &&
-                   itv->vbi.insert_mpeg && itv->vbi.sliced_in->service_set) {
+                   itv->vbi.insert_mpeg && !ivtv_raw_vbi(itv)) {
                 vbi_type = IVTV_ENC_STREAM_TYPE_VBI;
         } else {
                 return 0;
@@ -305,7 +305,7 @@ static size_t ivtv_copy_buf_to_user(struct ivtv_stream *s, struct ivtv_buffer *b
 
         if (len > ucount) len = ucount;
         if (itv->vbi.insert_mpeg && s->type == IVTV_ENC_STREAM_TYPE_MPG &&
-            itv->vbi.sliced_in->service_set && buf != &itv->vbi.sliced_mpeg_buf) {
+            !ivtv_raw_vbi(itv) && buf != &itv->vbi.sliced_mpeg_buf) {
                 const char *start = buf->buf + buf->readpos;
                 const char *p = start + 1;
                 const u8 *q;
@@ -372,7 +372,7 @@ static ssize_t ivtv_read(struct ivtv_stream *s, char __user *ubuf, size_t tot_co
         /* Each VBI buffer is one frame, the v4l2 API says that for VBI the frames should
            arrive one-by-one, so make sure we never output more than one VBI frame at a time */
         if (s->type == IVTV_DEC_STREAM_TYPE_VBI ||
-                        (s->type == IVTV_ENC_STREAM_TYPE_VBI && itv->vbi.sliced_in->service_set))
+            (s->type == IVTV_ENC_STREAM_TYPE_VBI && !ivtv_raw_vbi(itv)))
                 single_frame = 1;
 
         for (;;) {
diff --git a/drivers/media/video/ivtv/ivtv-fileops.h b/drivers/media/video/ivtv/ivtv-fileops.h
index 2c8d5186c9c3..df81e790147f 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.h
+++ b/drivers/media/video/ivtv/ivtv-fileops.h
@@ -38,11 +38,6 @@ void ivtv_unmute(struct ivtv *itv);
 
 /* Utilities */
 
-/* Try to claim a stream for the filehandle. Return 0 on success,
-   -EBUSY if stream already claimed. Once a stream is claimed, it
-   remains claimed until the associated filehandle is closed. */
-int ivtv_claim_stream(struct ivtv_open_id *id, int type);
-
 /* Release a previously claimed stream. */
 void ivtv_release_stream(struct ivtv_stream *s);
 
diff --git a/drivers/media/video/ivtv/ivtv-gpio.c b/drivers/media/video/ivtv/ivtv-gpio.c
index bc22905ea20f..74a44844ccaf 100644
--- a/drivers/media/video/ivtv/ivtv-gpio.c
+++ b/drivers/media/video/ivtv/ivtv-gpio.c
@@ -124,7 +124,7 @@ void ivtv_reset_ir_gpio(struct ivtv *itv)
 }
 
 /* Xceive tuner reset function */
-int ivtv_reset_tuner_gpio(void *dev, int cmd, int value)
+int ivtv_reset_tuner_gpio(void *dev, int component, int cmd, int value)
 {
         struct i2c_algo_bit_data *algo = dev;
         struct ivtv *itv = algo->data;
diff --git a/drivers/media/video/ivtv/ivtv-gpio.h b/drivers/media/video/ivtv/ivtv-gpio.h
index 964a265d91a9..48b6291613a2 100644
--- a/drivers/media/video/ivtv/ivtv-gpio.h
+++ b/drivers/media/video/ivtv/ivtv-gpio.h
@@ -24,7 +24,7 @@
 /* GPIO stuff */
 void ivtv_gpio_init(struct ivtv *itv);
 void ivtv_reset_ir_gpio(struct ivtv *itv);
-int ivtv_reset_tuner_gpio(void *dev, int cmd, int value);
+int ivtv_reset_tuner_gpio(void *dev, int component, int cmd, int value);
 int ivtv_gpio(struct ivtv *itv, unsigned int command, void *arg);
 
 #endif
diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv-i2c.c
index af154238fb9a..24700c211d52 100644
--- a/drivers/media/video/ivtv/ivtv-i2c.c
+++ b/drivers/media/video/ivtv/ivtv-i2c.c
@@ -64,8 +64,6 @@
 #include "ivtv-gpio.h"
 #include "ivtv-i2c.h"
 
-#include <media/ir-kbd-i2c.h>
-
 /* i2c implementation for cx23415/6 chip, ivtv project.
  * Author: Kevin Thayer (nufan_wfk at yahoo.com)
  */
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index 61030309d0ad..8696527ab134 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -101,18 +101,15 @@ void ivtv_expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal)
         }
 }
 
-static int check_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal)
+static void check_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal)
 {
         int f, l;
-        u16 set = 0;
 
         for (f = 0; f < 2; f++) {
                 for (l = 0; l < 24; l++) {
                         fmt->service_lines[f][l] = select_service_from_set(f, l, fmt->service_lines[f][l], is_pal);
-                        set |= fmt->service_lines[f][l];
                 }
         }
-        return set != 0;
 }
 
 u16 ivtv_get_service_set(struct v4l2_sliced_vbi_format *fmt)
@@ -474,7 +471,7 @@ static int ivtv_try_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format
         int h = fmt->fmt.pix.height;
 
         w = min(w, 720);
-        w = max(w, 1);
+        w = max(w, 2);
         h = min(h, itv->is_50hz ? 576 : 480);
         h = max(h, 2);
         ivtv_g_fmt_vid_cap(file, fh, fmt);
@@ -512,27 +509,20 @@ static int ivtv_try_fmt_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_
 static int ivtv_try_fmt_vid_out(struct file *file, void *fh, struct v4l2_format *fmt)
 {
         struct ivtv_open_id *id = fh;
-        s32 w, h;
-        int field;
-        int ret;
+        struct ivtv *itv = id->itv;
+        s32 w = fmt->fmt.pix.width;
+        s32 h = fmt->fmt.pix.height;
+        int field = fmt->fmt.pix.field;
+        int ret = ivtv_g_fmt_vid_out(file, fh, fmt);
 
-        w = fmt->fmt.pix.width;
-        h = fmt->fmt.pix.height;
-        field = fmt->fmt.pix.field;
-        ret = ivtv_g_fmt_vid_out(file, fh, fmt);
+        w = min(w, 720);
+        w = max(w, 2);
+        h = min(h, itv->is_out_50hz ? 576 : 480);
+        h = max(h, 2);
+        if (id->type == IVTV_DEC_STREAM_TYPE_YUV)
+                fmt->fmt.pix.field = field;
         fmt->fmt.pix.width = w;
         fmt->fmt.pix.height = h;
-        if (!ret && id->type == IVTV_DEC_STREAM_TYPE_YUV) {
-                fmt->fmt.pix.field = field;
-                if (fmt->fmt.pix.width < 2)
-                        fmt->fmt.pix.width = 2;
-                if (fmt->fmt.pix.width > 720)
-                        fmt->fmt.pix.width = 720;
-                if (fmt->fmt.pix.height < 2)
-                        fmt->fmt.pix.height = 2;
-                if (fmt->fmt.pix.height > 576)
-                        fmt->fmt.pix.height = 576;
-        }
         return ret;
 }
 
@@ -560,9 +550,9 @@ static int ivtv_s_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f
         struct ivtv_open_id *id = fh;
         struct ivtv *itv = id->itv;
         struct cx2341x_mpeg_params *p = &itv->params;
+        int ret = ivtv_try_fmt_vid_cap(file, fh, fmt);
         int w = fmt->fmt.pix.width;
         int h = fmt->fmt.pix.height;
-        int ret = ivtv_try_fmt_vid_cap(file, fh, fmt);
 
         if (ret)
                 return ret;
@@ -585,8 +575,11 @@ static int ivtv_s_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *f
 {
         struct ivtv *itv = ((struct ivtv_open_id *)fh)->itv;
 
+        if (!ivtv_raw_vbi(itv) && atomic_read(&itv->capturing) > 0)
+                return -EBUSY;
         itv->vbi.sliced_in->service_set = 0;
-        itv->video_dec_func(itv, VIDIOC_S_FMT, &itv->vbi.in);
+        itv->vbi.in.type = V4L2_BUF_TYPE_VBI_CAPTURE;
+        itv->video_dec_func(itv, VIDIOC_S_FMT, fmt);
         return ivtv_g_fmt_vbi_cap(file, fh, fmt);
 }
 
@@ -600,10 +593,10 @@ static int ivtv_s_fmt_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_fo
         if (ret || id->type == IVTV_DEC_STREAM_TYPE_VBI)
                 return ret;
 
-        if (check_service_set(vbifmt, itv->is_50hz) == 0)
-                return -EINVAL;
-        if (atomic_read(&itv->capturing) > 0)
+        check_service_set(vbifmt, itv->is_50hz);
+        if (ivtv_raw_vbi(itv) && atomic_read(&itv->capturing) > 0)
                 return -EBUSY;
+        itv->vbi.in.type = V4L2_BUF_TYPE_SLICED_VBI_CAPTURE;
         itv->video_dec_func(itv, VIDIOC_S_FMT, fmt);
         memcpy(itv->vbi.sliced_in, vbifmt, sizeof(*itv->vbi.sliced_in));
         return 0;
@@ -651,8 +644,6 @@ static int ivtv_s_fmt_vid_out(struct file *file, void *fh, struct v4l2_format *f
                 itv->dma_data_req_size =
                         1080 * ((yi->v4l2_src_h + 31) & ~31);
 
-        /* Force update of yuv registers */
-        yi->yuv_forced_update = 1;
         return 0;
 }
 
@@ -761,7 +752,7 @@ static int ivtv_querycap(struct file *file, void *fh, struct v4l2_capability *vc
 
         strlcpy(vcap->driver, IVTV_DRIVER_NAME, sizeof(vcap->driver));
         strlcpy(vcap->card, itv->card_name, sizeof(vcap->card));
-        strlcpy(vcap->bus_info, pci_name(itv->dev), sizeof(vcap->bus_info));
+        snprintf(vcap->bus_info, sizeof(vcap->bus_info), "PCI:%s", pci_name(itv->dev));
         vcap->version = IVTV_DRIVER_VERSION;        /* version */
         vcap->capabilities = itv->v4l2_cap;         /* capabilities */
         return 0;
@@ -1370,6 +1361,9 @@ static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb)
         if (itv->osd_global_alpha_state)
                 fb->flags |= V4L2_FBUF_FLAG_GLOBAL_ALPHA;
 
+        if (yi->track_osd)
+                fb->flags |= V4L2_FBUF_FLAG_OVERLAY;
+
         pixfmt &= 7;
 
         /* no local alpha for RGB565 or unknown formats */
@@ -1389,8 +1383,6 @@ static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb)
                 else
                         fb->flags |= V4L2_FBUF_FLAG_LOCAL_ALPHA;
         }
-        if (yi->track_osd)
-                fb->flags |= V4L2_FBUF_FLAG_OVERLAY;
 
         return 0;
 }
diff --git a/drivers/media/video/ivtv/ivtv-irq.c b/drivers/media/video/ivtv/ivtv-irq.c
index 34f3ab827858..f5d00ec5da73 100644
--- a/drivers/media/video/ivtv/ivtv-irq.c
+++ b/drivers/media/video/ivtv/ivtv-irq.c
@@ -753,7 +753,7 @@ static void ivtv_irq_vsync(struct ivtv *itv)
          */
         unsigned int frame = read_reg(0x28c0) & 1;
         struct yuv_playback_info *yi = &itv->yuv_info;
-        int last_dma_frame = atomic_read(&itv->yuv_info.next_dma_frame);
+        int last_dma_frame = atomic_read(&yi->next_dma_frame);
         struct yuv_frame_info *f = &yi->new_frame_info[last_dma_frame];
 
         if (0) IVTV_DEBUG_IRQ("DEC VSYNC\n");
@@ -772,6 +772,7 @@ static void ivtv_irq_vsync(struct ivtv *itv)
                                 next_dma_frame = (next_dma_frame + 1) % IVTV_YUV_BUFFERS;
                                 atomic_set(&yi->next_dma_frame, next_dma_frame);
                                 yi->fields_lapsed = -1;
+                                yi->running = 1;
                         }
                 }
         }
@@ -804,9 +805,11 @@ static void ivtv_irq_vsync(struct ivtv *itv)
                 }
 
                 /* Check if we need to update the yuv registers */
-                if ((yi->yuv_forced_update || f->update) && last_dma_frame != -1) {
+                if (yi->running && (yi->yuv_forced_update || f->update)) {
                         if (!f->update) {
-                                last_dma_frame = (u8)(last_dma_frame - 1) % IVTV_YUV_BUFFERS;
+                                last_dma_frame =
+                                        (u8)(atomic_read(&yi->next_dma_frame) -
+                                                 1) % IVTV_YUV_BUFFERS;
                                 f = &yi->new_frame_info[last_dma_frame];
                         }
 
diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c
index 730e85d86fc8..5bbf31e39304 100644
--- a/drivers/media/video/ivtv/ivtv-streams.c
+++ b/drivers/media/video/ivtv/ivtv-streams.c
@@ -75,7 +75,7 @@ static const struct file_operations ivtv_v4l2_dec_fops = {
 static struct {
         const char *name;
         int vfl_type;
-        int minor_offset;
+        int num_offset;
         int dma, pio;
         enum v4l2_buf_type buf_type;
         const struct file_operations *fops;
@@ -171,8 +171,8 @@ static void ivtv_stream_init(struct ivtv *itv, int type)
 static int ivtv_prep_dev(struct ivtv *itv, int type)
 {
         struct ivtv_stream *s = &itv->streams[type];
-        int minor_offset = ivtv_stream_info[type].minor_offset;
-        int minor;
+        int num_offset = ivtv_stream_info[type].num_offset;
+        int num = itv->num + ivtv_first_minor + num_offset;
 
         /* These four fields are always initialized. If v4l2dev == NULL, then
            this stream is not in use. In that case no other fields but these
@@ -188,9 +188,6 @@ static int ivtv_prep_dev(struct ivtv *itv, int type)
         if (type >= IVTV_DEC_STREAM_TYPE_MPG && !(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))
                 return 0;
 
-        /* card number + user defined offset + device offset */
-        minor = itv->num + ivtv_first_minor + minor_offset;
-
         /* User explicitly selected 0 buffers for these streams, so don't
            create them. */
         if (ivtv_stream_info[type].dma != PCI_DMA_NONE &&
@@ -211,7 +208,7 @@ static int ivtv_prep_dev(struct ivtv *itv, int type)
         snprintf(s->v4l2dev->name, sizeof(s->v4l2dev->name), "ivtv%d %s",
                         itv->num, s->name);
 
-        s->v4l2dev->minor = minor;
+        s->v4l2dev->num = num;
         s->v4l2dev->parent = &itv->dev->dev;
         s->v4l2dev->fops = ivtv_stream_info[type].fops;
         s->v4l2dev->release = video_device_release;
@@ -250,39 +247,46 @@ static int ivtv_reg_dev(struct ivtv *itv, int type)
 {
         struct ivtv_stream *s = &itv->streams[type];
         int vfl_type = ivtv_stream_info[type].vfl_type;
-        int minor;
+        int num;
 
         if (s->v4l2dev == NULL)
                 return 0;
 
-        minor = s->v4l2dev->minor;
+        num = s->v4l2dev->num;
+        /* card number + user defined offset + device offset */
+        if (type != IVTV_ENC_STREAM_TYPE_MPG) {
+                struct ivtv_stream *s_mpg = &itv->streams[IVTV_ENC_STREAM_TYPE_MPG];
+
+                if (s_mpg->v4l2dev)
+                        num = s_mpg->v4l2dev->num + ivtv_stream_info[type].num_offset;
+        }
+
         /* Register device. First try the desired minor, then any free one. */
-        if (video_register_device(s->v4l2dev, vfl_type, minor) &&
-                        video_register_device(s->v4l2dev, vfl_type, -1)) {
-                IVTV_ERR("Couldn't register v4l2 device for %s minor %d\n",
-                                s->name, minor);
+        if (video_register_device(s->v4l2dev, vfl_type, num)) {
+                IVTV_ERR("Couldn't register v4l2 device for %s kernel number %d\n",
+                                s->name, num);
                 video_device_release(s->v4l2dev);
                 s->v4l2dev = NULL;
                 return -ENOMEM;
         }
+        num = s->v4l2dev->num;
 
         switch (vfl_type) {
         case VFL_TYPE_GRABBER:
                 IVTV_INFO("Registered device video%d for %s (%d kB)\n",
-                        s->v4l2dev->minor, s->name, itv->options.kilobytes[type]);
+                        num, s->name, itv->options.kilobytes[type]);
                 break;
         case VFL_TYPE_RADIO:
                 IVTV_INFO("Registered device radio%d for %s\n",
-                        s->v4l2dev->minor - MINOR_VFL_TYPE_RADIO_MIN, s->name);
+                        num, s->name);
                 break;
         case VFL_TYPE_VBI:
                 if (itv->options.kilobytes[type])
                         IVTV_INFO("Registered device vbi%d for %s (%d kB)\n",
-                                s->v4l2dev->minor - MINOR_VFL_TYPE_VBI_MIN,
-                                s->name, itv->options.kilobytes[type]);
+                                num, s->name, itv->options.kilobytes[type]);
                 else
                         IVTV_INFO("Registered device vbi%d for %s\n",
-                                s->v4l2dev->minor - MINOR_VFL_TYPE_VBI_MIN, s->name);
+                                num, s->name);
                 break;
         }
         return 0;
@@ -330,7 +334,7 @@ void ivtv_streams_cleanup(struct ivtv *itv, int unregister)
 
 static void ivtv_vbi_setup(struct ivtv *itv)
 {
-        int raw = itv->vbi.sliced_in->service_set == 0;
+        int raw = ivtv_raw_vbi(itv);
         u32 data[CX2341X_MBOX_MAX_DATA];
         int lines;
         int i;
diff --git a/drivers/media/video/ivtv/ivtv-vbi.c b/drivers/media/video/ivtv/ivtv-vbi.c
index 1ce9deb1104f..4a37a7d2e69d 100644
--- a/drivers/media/video/ivtv/ivtv-vbi.c
+++ b/drivers/media/video/ivtv/ivtv-vbi.c
@@ -334,7 +334,7 @@ void ivtv_process_vbi_data(struct ivtv *itv, struct ivtv_buffer *buf,
         int y;
 
         /* Raw VBI data */
-        if (streamtype == IVTV_ENC_STREAM_TYPE_VBI && itv->vbi.sliced_in->service_set == 0) {
+        if (streamtype == IVTV_ENC_STREAM_TYPE_VBI && ivtv_raw_vbi(itv)) {
                 u8 type;
 
                 ivtv_buf_swap(buf);
diff --git a/drivers/media/video/ivtv/ivtv-yuv.c b/drivers/media/video/ivtv/ivtv-yuv.c
index 3092ff1d00a0..ee91107376c7 100644
--- a/drivers/media/video/ivtv/ivtv-yuv.c
+++ b/drivers/media/video/ivtv/ivtv-yuv.c
@@ -1147,6 +1147,7 @@ void ivtv_yuv_close(struct ivtv *itv)
         IVTV_DEBUG_YUV("ivtv_yuv_close\n");
         ivtv_waitq(&itv->vsync_waitq);
 
+        yi->running = 0;
         atomic_set(&yi->next_dma_frame, -1);
         atomic_set(&yi->next_fill_frame, 0);
 
diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c
index bdfda48e56bf..8a4a150b12fb 100644
--- a/drivers/media/video/ivtv/ivtvfb.c
+++ b/drivers/media/video/ivtv/ivtvfb.c
@@ -275,7 +275,6 @@ static int ivtvfb_prep_dec_dma_to_device(struct ivtv *itv,
                                   int size_in_bytes)
 {
         DEFINE_WAIT(wait);
-        int ret = 0;
         int got_sig = 0;
 
         mutex_lock(&itv->udma.lock);
@@ -316,7 +315,7 @@ static int ivtvfb_prep_dec_dma_to_device(struct ivtv *itv,
                 return -EINTR;
         }
 
-        return ret;
+        return 0;
 }
 
 static int ivtvfb_prep_frame(struct ivtv *itv, int cmd, void __user *source,
@@ -368,11 +367,12 @@ static int ivtvfb_prep_frame(struct ivtv *itv, int cmd, void __user *source,
 }
 
 static ssize_t ivtvfb_write(struct fb_info *info, const char __user *buf,
-                     size_t count, loff_t *ppos)
+                                                size_t count, loff_t *ppos)
 {
         unsigned long p = *ppos;
         void *dst;
         int err = 0;
+        int dma_err;
         unsigned long total_size;
         struct ivtv *itv = (struct ivtv *) info->par;
         unsigned long dma_offset =
@@ -399,7 +399,6 @@ static ssize_t ivtvfb_write(struct fb_info *info, const char __user *buf,
         if (count + p > total_size) {
                 if (!err)
                         err = -ENOSPC;
-
                 count = total_size - p;
         }
 
@@ -408,39 +407,34 @@ static ssize_t ivtvfb_write(struct fb_info *info, const char __user *buf,
         if (info->fbops->fb_sync)
                 info->fbops->fb_sync(info);
 
-        if (!access_ok(VERIFY_READ, buf, count)) {
-                IVTVFB_WARN("Invalid userspace pointer 0x%08lx\n",
-                        (unsigned long)buf);
-                err = -EFAULT;
-        }
-
-        if (!err) {
-                /* If transfer size > threshold and both src/dst
-                addresses are aligned, use DMA */
-                if (count >= 4096 &&
-                    ((unsigned long)buf & 3) == ((unsigned long)dst & 3)) {
-                        /* Odd address = can't DMA. Align */
-                        if ((unsigned long)dst & 3) {
-                                lead = 4 - ((unsigned long)dst & 3);
-                                memcpy(dst, buf, lead);
-                                buf += lead;
-                                dst += lead;
-                        }
-                        /* DMA resolution is 32 bits */
-                        if ((count - lead) & 3)
-                                tail = (count - lead) & 3;
-                        /* DMA the data */
-                        dma_size = count - lead - tail;
-                        err = ivtvfb_prep_dec_dma_to_device(itv,
-                               p + lead + dma_offset, (void *)buf, dma_size);
-                        dst += dma_size;
-                        buf += dma_size;
-                        /* Copy any leftover data */
-                        if (tail)
-                                memcpy(dst, buf, tail);
-                } else {
-                        memcpy(dst, buf, count);
+        /* If transfer size > threshold and both src/dst
+        addresses are aligned, use DMA */
+        if (count >= 4096 &&
+            ((unsigned long)buf & 3) == ((unsigned long)dst & 3)) {
+                /* Odd address = can't DMA. Align */
+                if ((unsigned long)dst & 3) {
+                        lead = 4 - ((unsigned long)dst & 3);
+                        if (copy_from_user(dst, buf, lead))
+                                return -EFAULT;
+                        buf += lead;
+                        dst += lead;
                 }
+                /* DMA resolution is 32 bits */
+                if ((count - lead) & 3)
+                        tail = (count - lead) & 3;
+                /* DMA the data */
+                dma_size = count - lead - tail;
+                dma_err = ivtvfb_prep_dec_dma_to_device(itv,
+                       p + lead + dma_offset, (void __user *)buf, dma_size);
+                if (dma_err)
+                        return dma_err;
+                dst += dma_size;
+                buf += dma_size;
+                /* Copy any leftover data */
+                if (tail && copy_from_user(dst, buf, tail))
+                        return -EFAULT;
+        } else if (copy_from_user(dst, buf, count)) {
+                return -EFAULT;
         }
 
         if  (!err)
@@ -463,9 +457,12 @@ static int ivtvfb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long ar
                         vblank.flags = FB_VBLANK_HAVE_COUNT |FB_VBLANK_HAVE_VCOUNT |
                                         FB_VBLANK_HAVE_VSYNC;
                         trace = read_reg(0x028c0) >> 16;
-                        if (itv->is_50hz && trace > 312) trace -= 312;
-                        else if (itv->is_60hz && trace > 262) trace -= 262;
-                        if (trace == 1) vblank.flags |= FB_VBLANK_VSYNCING;
+                        if (itv->is_50hz && trace > 312)
+                                trace -= 312;
+                        else if (itv->is_60hz && trace > 262)
+                                trace -= 262;
+                        if (trace == 1)
+                                vblank.flags |= FB_VBLANK_VSYNCING;
                         vblank.count = itv->last_vsync_field;
                         vblank.vcount = trace;
                         vblank.hcount = 0;
@@ -476,7 +473,8 @@ static int ivtvfb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long ar
 
                 case FBIO_WAITFORVSYNC:
                         prepare_to_wait(&itv->vsync_waitq, &wait, TASK_INTERRUPTIBLE);
-                        if (!schedule_timeout(msecs_to_jiffies(50))) rc = -ETIMEDOUT;
+                        if (!schedule_timeout(msecs_to_jiffies(50)))
+                                rc = -ETIMEDOUT;
                         finish_wait(&itv->vsync_waitq, &wait);
                         return rc;
 
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index a9ef7802eb5f..6418f4a78f2a 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -843,17 +843,16 @@ again:
 
 static int meye_open(struct inode *inode, struct file *file)
 {
-        int i, err;
+        int i;
 
-        err = video_exclusive_open(inode, file);
-        if (err < 0)
-                return err;
+        if (test_and_set_bit(0, &meye.in_use))
+                return -EBUSY;
 
         mchip_hic_stop();
 
         if (mchip_dma_alloc()) {
                 printk(KERN_ERR "meye: mchip framebuffer allocation failed\n");
-                video_exclusive_release(inode, file);
+                clear_bit(0, &meye.in_use);
                 return -ENOBUFS;
         }
 
@@ -868,7 +867,7 @@ static int meye_release(struct inode *inode, struct file *file)
 {
         mchip_hic_stop();
         mchip_dma_free();
-        video_exclusive_release(inode, file);
+        clear_bit(0, &meye.in_use);
         return 0;
 }
 
@@ -1774,6 +1773,7 @@ static int __devinit meye_probe(struct pci_dev *pcidev,
                 goto outnotdev;
         }
 
+        ret = -ENOMEM;
         meye.mchip_dev = pcidev;
         meye.video_dev = video_device_alloc();
         if (!meye.video_dev) {
@@ -1781,7 +1781,6 @@ static int __devinit meye_probe(struct pci_dev *pcidev,
                 goto outnotdev;
         }
 
-        ret = -ENOMEM;
         meye.grab_temp = vmalloc(MCHIP_NB_PAGES_MJPEG * PAGE_SIZE);
         if (!meye.grab_temp) {
                 printk(KERN_ERR "meye: grab buffer allocation failed\n");
diff --git a/drivers/media/video/meye.h b/drivers/media/video/meye.h
index d535748df445..5f70a106ba2b 100644
--- a/drivers/media/video/meye.h
+++ b/drivers/media/video/meye.h
@@ -311,6 +311,7 @@ struct meye {
         struct video_device *video_dev; /* video device parameters */
         struct video_picture picture;   /* video picture parameters */
         struct meye_params params;      /* additional parameters */
+        unsigned long in_use;           /* set to 1 if the device is in use */
 #ifdef CONFIG_PM
         u8 pm_mchip_mode;               /* old mchip mode */
 #endif
diff --git a/drivers/media/video/mt9m001.c b/drivers/media/video/mt9m001.c
index 554d2295484e..0c524376b67e 100644
--- a/drivers/media/video/mt9m001.c
+++ b/drivers/media/video/mt9m001.c
@@ -117,24 +117,51 @@ static int reg_clear(struct soc_camera_device *icd, const u8 reg,
 
 static int mt9m001_init(struct soc_camera_device *icd)
 {
+        struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);
+        struct soc_camera_link *icl = mt9m001->client->dev.platform_data;
         int ret;
 
-        /* Disable chip, synchronous option update */
         dev_dbg(icd->vdev->parent, "%s\n", __func__);
 
-        ret = reg_write(icd, MT9M001_RESET, 1);
-        if (ret >= 0)
-                ret = reg_write(icd, MT9M001_RESET, 0);
-        if (ret >= 0)
+        if (icl->power) {
+                ret = icl->power(&mt9m001->client->dev, 1);
+                if (ret < 0) {
+                        dev_err(icd->vdev->parent,
+                                "Platform failed to power-on the camera.\n");
+                        return ret;
+                }
+        }
+
+        /* The camera could have been already on, we reset it additionally */
+        if (icl->reset)
+                ret = icl->reset(&mt9m001->client->dev);
+        else
+                ret = -ENODEV;
+
+        if (ret < 0) {
+                /* Either no platform reset, or platform reset failed */
+                ret = reg_write(icd, MT9M001_RESET, 1);
+                if (!ret)
+                        ret = reg_write(icd, MT9M001_RESET, 0);
+        }
+        /* Disable chip, synchronous option update */
+        if (!ret)
                 ret = reg_write(icd, MT9M001_OUTPUT_CONTROL, 0);
 
-        return ret >= 0 ? 0 : -EIO;
+        return ret;
 }
 
 static int mt9m001_release(struct soc_camera_device *icd)
 {
+        struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);
+        struct soc_camera_link *icl = mt9m001->client->dev.platform_data;
+
         /* Disable the chip */
         reg_write(icd, MT9M001_OUTPUT_CONTROL, 0);
+
+        if (icl->power)
+                icl->power(&mt9m001->client->dev, 0);
+
         return 0;
 }
 
@@ -267,24 +294,24 @@ static int mt9m001_set_fmt_cap(struct soc_camera_device *icd,
 
         /* Blanking and start values - default... */
         ret = reg_write(icd, MT9M001_HORIZONTAL_BLANKING, hblank);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9M001_VERTICAL_BLANKING, vblank);
 
         /* The caller provides a supported format, as verified per
          * call to icd->try_fmt_cap() */
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9M001_COLUMN_START, rect->left);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9M001_ROW_START, rect->top);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9M001_WINDOW_WIDTH, rect->width - 1);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9M001_WINDOW_HEIGHT,
                                 rect->height + icd->y_skip_top - 1);
-        if (ret >= 0 && mt9m001->autoexposure) {
+        if (!ret && mt9m001->autoexposure) {
                 ret = reg_write(icd, MT9M001_SHUTTER_WIDTH,
                                 rect->height + icd->y_skip_top + vblank);
-                if (ret >= 0) {
+                if (!ret) {
                         const struct v4l2_queryctrl *qctrl =
                                 soc_camera_find_qctrl(icd->ops,
                                                       V4L2_CID_EXPOSURE);
@@ -295,7 +322,7 @@ static int mt9m001_set_fmt_cap(struct soc_camera_device *icd,
                 }
         }
 
-        return ret < 0 ? ret : 0;
+        return ret;
 }
 
 static int mt9m001_try_fmt_cap(struct soc_camera_device *icd,
diff --git a/drivers/media/video/mt9m111.c b/drivers/media/video/mt9m111.c
new file mode 100644
index 000000000000..da0b2d553fd0
--- /dev/null
+++ b/drivers/media/video/mt9m111.c
@@ -0,0 +1,973 @@
+/*
+ * Driver for MT9M111 CMOS Image Sensor from Micron
+ *
+ * Copyright (C) 2008, Robert Jarzmik <robert.jarzmik@free.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/videodev2.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/log2.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+
+#include <media/v4l2-common.h>
+#include <media/v4l2-chip-ident.h>
+#include <media/soc_camera.h>
+
+/*
+ * mt9m111 i2c address is 0x5d or 0x48 (depending on SAddr pin)
+ * The platform has to define i2c_board_info and call i2c_register_board_info()
+ */
+
+/* mt9m111: Sensor register addresses */
+#define MT9M111_CHIP_VERSION            0x000
+#define MT9M111_ROW_START               0x001
+#define MT9M111_COLUMN_START            0x002
+#define MT9M111_WINDOW_HEIGHT           0x003
+#define MT9M111_WINDOW_WIDTH            0x004
+#define MT9M111_HORIZONTAL_BLANKING_B   0x005
+#define MT9M111_VERTICAL_BLANKING_B     0x006
+#define MT9M111_HORIZONTAL_BLANKING_A   0x007
+#define MT9M111_VERTICAL_BLANKING_A     0x008
+#define MT9M111_SHUTTER_WIDTH           0x009
+#define MT9M111_ROW_SPEED               0x00a
+#define MT9M111_EXTRA_DELAY             0x00b
+#define MT9M111_SHUTTER_DELAY           0x00c
+#define MT9M111_RESET                   0x00d
+#define MT9M111_READ_MODE_B             0x020
+#define MT9M111_READ_MODE_A             0x021
+#define MT9M111_FLASH_CONTROL           0x023
+#define MT9M111_GREEN1_GAIN             0x02b
+#define MT9M111_BLUE_GAIN               0x02c
+#define MT9M111_RED_GAIN                0x02d
+#define MT9M111_GREEN2_GAIN             0x02e
+#define MT9M111_GLOBAL_GAIN             0x02f
+#define MT9M111_CONTEXT_CONTROL         0x0c8
+#define MT9M111_PAGE_MAP                0x0f0
+#define MT9M111_BYTE_WISE_ADDR          0x0f1
+
+#define MT9M111_RESET_SYNC_CHANGES      (1 << 15)
+#define MT9M111_RESET_RESTART_BAD_FRAME (1 << 9)
+#define MT9M111_RESET_SHOW_BAD_FRAMES   (1 << 8)
+#define MT9M111_RESET_RESET_SOC         (1 << 5)
+#define MT9M111_RESET_OUTPUT_DISABLE    (1 << 4)
+#define MT9M111_RESET_CHIP_ENABLE       (1 << 3)
+#define MT9M111_RESET_ANALOG_STANDBY    (1 << 2)
+#define MT9M111_RESET_RESTART_FRAME     (1 << 1)
+#define MT9M111_RESET_RESET_MODE        (1 << 0)
+
+#define MT9M111_RMB_MIRROR_COLS         (1 << 1)
+#define MT9M111_RMB_MIRROR_ROWS         (1 << 0)
+#define MT9M111_CTXT_CTRL_RESTART       (1 << 15)
+#define MT9M111_CTXT_CTRL_DEFECTCOR_B   (1 << 12)
+#define MT9M111_CTXT_CTRL_RESIZE_B      (1 << 10)
+#define MT9M111_CTXT_CTRL_CTRL2_B       (1 << 9)
+#define MT9M111_CTXT_CTRL_GAMMA_B       (1 << 8)
+#define MT9M111_CTXT_CTRL_XENON_EN      (1 << 7)
+#define MT9M111_CTXT_CTRL_READ_MODE_B   (1 << 3)
+#define MT9M111_CTXT_CTRL_LED_FLASH_EN  (1 << 2)
+#define MT9M111_CTXT_CTRL_VBLANK_SEL_B  (1 << 1)
+#define MT9M111_CTXT_CTRL_HBLANK_SEL_B  (1 << 0)
+/*
+ * mt9m111: Colorpipe register addresses (0x100..0x1ff)
+ */
+#define MT9M111_OPER_MODE_CTRL          0x106
+#define MT9M111_OUTPUT_FORMAT_CTRL      0x108
+#define MT9M111_REDUCER_XZOOM_B         0x1a0
+#define MT9M111_REDUCER_XSIZE_B         0x1a1
+#define MT9M111_REDUCER_YZOOM_B         0x1a3
+#define MT9M111_REDUCER_YSIZE_B         0x1a4
+#define MT9M111_REDUCER_XZOOM_A         0x1a6
+#define MT9M111_REDUCER_XSIZE_A         0x1a7
+#define MT9M111_REDUCER_YZOOM_A         0x1a9
+#define MT9M111_REDUCER_YSIZE_A         0x1aa
+
+#define MT9M111_OUTPUT_FORMAT_CTRL2_A   0x13a
+#define MT9M111_OUTPUT_FORMAT_CTRL2_B   0x19b
+
+#define MT9M111_OPMODE_AUTOEXPO_EN      (1 << 14)
+
+
+#define MT9M111_OUTFMT_PROCESSED_BAYER  (1 << 14)
+#define MT9M111_OUTFMT_BYPASS_IFP       (1 << 10)
+#define MT9M111_OUTFMT_INV_PIX_CLOCK    (1 << 9)
+#define MT9M111_OUTFMT_RGB              (1 << 8)
+#define MT9M111_OUTFMT_RGB565           (0x0 << 6)
+#define MT9M111_OUTFMT_RGB555           (0x1 << 6)
+#define MT9M111_OUTFMT_RGB444x          (0x2 << 6)
+#define MT9M111_OUTFMT_RGBx444          (0x3 << 6)
+#define MT9M111_OUTFMT_TST_RAMP_OFF     (0x0 << 4)
+#define MT9M111_OUTFMT_TST_RAMP_COL     (0x1 << 4)
+#define MT9M111_OUTFMT_TST_RAMP_ROW     (0x2 << 4)
+#define MT9M111_OUTFMT_TST_RAMP_FRAME   (0x3 << 4)
+#define MT9M111_OUTFMT_SHIFT_3_UP       (1 << 3)
+#define MT9M111_OUTFMT_AVG_CHROMA       (1 << 2)
+#define MT9M111_OUTFMT_SWAP_YCbCr_C_Y   (1 << 1)
+#define MT9M111_OUTFMT_SWAP_RGB_EVEN    (1 << 1)
+#define MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr (1 << 0)
+/*
+ * mt9m111: Camera control register addresses (0x200..0x2ff not implemented)
+ */
+
+#define reg_read(reg) mt9m111_reg_read(icd, MT9M111_##reg)
+#define reg_write(reg, val) mt9m111_reg_write(icd, MT9M111_##reg, (val))
+#define reg_set(reg, val) mt9m111_reg_set(icd, MT9M111_##reg, (val))
+#define reg_clear(reg, val) mt9m111_reg_clear(icd, MT9M111_##reg, (val))
+
+#define MT9M111_MIN_DARK_ROWS   8
+#define MT9M111_MIN_DARK_COLS   24
+#define MT9M111_MAX_HEIGHT      1024
+#define MT9M111_MAX_WIDTH       1280
+
+#define COL_FMT(_name, _depth, _fourcc, _colorspace) \
+        { .name = _name, .depth = _depth, .fourcc = _fourcc, \
+        .colorspace = _colorspace }
+#define RGB_FMT(_name, _depth, _fourcc) \
+        COL_FMT(_name, _depth, _fourcc, V4L2_COLORSPACE_SRGB)
+
+static const struct soc_camera_data_format mt9m111_colour_formats[] = {
+        COL_FMT("YCrYCb 8 bit", 8, V4L2_PIX_FMT_YUYV, V4L2_COLORSPACE_JPEG),
+        RGB_FMT("RGB 565", 16, V4L2_PIX_FMT_RGB565),
+        RGB_FMT("RGB 555", 16, V4L2_PIX_FMT_RGB555),
+        RGB_FMT("Bayer (sRGB) 10 bit", 10, V4L2_PIX_FMT_SBGGR16),
+        RGB_FMT("Bayer (sRGB) 8 bit", 8, V4L2_PIX_FMT_SBGGR8),
+};
+
+enum mt9m111_context {
+        HIGHPOWER = 0,
+        LOWPOWER,
+};
+
+struct mt9m111 {
+        struct i2c_client *client;
+        struct soc_camera_device icd;
+        int model;      /* V4L2_IDENT_MT9M111* codes from v4l2-chip-ident.h */
+        enum mt9m111_context context;
+        unsigned int left, top, width, height;
+        u32 pixfmt;
+        unsigned char autoexposure;
+        unsigned char datawidth;
+        unsigned int powered:1;
+        unsigned int hflip:1;
+        unsigned int vflip:1;
+        unsigned int swap_rgb_even_odd:1;
+        unsigned int swap_rgb_red_blue:1;
+        unsigned int swap_yuv_y_chromas:1;
+        unsigned int swap_yuv_cb_cr:1;
+};
+
+static int reg_page_map_set(struct i2c_client *client, const u16 reg)
+{
+        int ret;
+        u16 page;
+        static int lastpage = -1;       /* PageMap cache value */
+
+        page = (reg >> 8);
+        if (page == lastpage)
+                return 0;
+        if (page > 2)
+                return -EINVAL;
+
+        ret = i2c_smbus_write_word_data(client, MT9M111_PAGE_MAP, swab16(page));
+        if (!ret)
+                lastpage = page;
+        return ret;
+}
+
+static int mt9m111_reg_read(struct soc_camera_device *icd, const u16 reg)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        struct i2c_client *client = mt9m111->client;
+        int ret;
+
+        ret = reg_page_map_set(client, reg);
+        if (!ret)
+                ret = swab16(i2c_smbus_read_word_data(client, (reg & 0xff)));
+
+        dev_dbg(&icd->dev, "read  reg.%03x -> %04x\n", reg, ret);
+        return ret;
+}
+
+static int mt9m111_reg_write(struct soc_camera_device *icd, const u16 reg,
+                             const u16 data)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        struct i2c_client *client = mt9m111->client;
+        int ret;
+
+        ret = reg_page_map_set(client, reg);
+        if (!ret)
+                ret = i2c_smbus_write_word_data(mt9m111->client, (reg & 0xff),
+                                                swab16(data));
+        dev_dbg(&icd->dev, "write reg.%03x = %04x -> %d\n", reg, data, ret);
+        return ret;
+}
+
+static int mt9m111_reg_set(struct soc_camera_device *icd, const u16 reg,
+                           const u16 data)
+{
+        int ret;
+
+        ret = mt9m111_reg_read(icd, reg);
+        if (ret >= 0)
+                ret = mt9m111_reg_write(icd, reg, ret | data);
+        return ret;
+}
+
+static int mt9m111_reg_clear(struct soc_camera_device *icd, const u16 reg,
+                             const u16 data)
+{
+        int ret;
+
+        ret = mt9m111_reg_read(icd, reg);
+        return mt9m111_reg_write(icd, reg, ret & ~data);
+}
+
+static int mt9m111_set_context(struct soc_camera_device *icd,
+                               enum mt9m111_context ctxt)
+{
+        int valB = MT9M111_CTXT_CTRL_RESTART | MT9M111_CTXT_CTRL_DEFECTCOR_B
+                | MT9M111_CTXT_CTRL_RESIZE_B | MT9M111_CTXT_CTRL_CTRL2_B
+                | MT9M111_CTXT_CTRL_GAMMA_B | MT9M111_CTXT_CTRL_READ_MODE_B
+                | MT9M111_CTXT_CTRL_VBLANK_SEL_B
+                | MT9M111_CTXT_CTRL_HBLANK_SEL_B;
+        int valA = MT9M111_CTXT_CTRL_RESTART;
+
+        if (ctxt == HIGHPOWER)
+                return reg_write(CONTEXT_CONTROL, valB);
+        else
+                return reg_write(CONTEXT_CONTROL, valA);
+}
+
+static int mt9m111_setup_rect(struct soc_camera_device *icd)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        int ret, is_raw_format;
+        int width = mt9m111->width;
+        int height = mt9m111->height;
+
+        if ((mt9m111->pixfmt == V4L2_PIX_FMT_SBGGR8)
+            || (mt9m111->pixfmt == V4L2_PIX_FMT_SBGGR16))
+                is_raw_format = 1;
+        else
+                is_raw_format = 0;
+
+        ret = reg_write(COLUMN_START, mt9m111->left);
+        if (!ret)
+                ret = reg_write(ROW_START, mt9m111->top);
+
+        if (is_raw_format) {
+                if (!ret)
+                        ret = reg_write(WINDOW_WIDTH, width);
+                if (!ret)
+                        ret = reg_write(WINDOW_HEIGHT, height);
+        } else {
+                if (!ret)
+                        ret = reg_write(REDUCER_XZOOM_B, MT9M111_MAX_WIDTH);
+                if (!ret)
+                        ret = reg_write(REDUCER_YZOOM_B, MT9M111_MAX_HEIGHT);
+                if (!ret)
+                        ret = reg_write(REDUCER_XSIZE_B, width);
+                if (!ret)
+                        ret = reg_write(REDUCER_YSIZE_B, height);
+                if (!ret)
+                        ret = reg_write(REDUCER_XZOOM_A, MT9M111_MAX_WIDTH);
+                if (!ret)
+                        ret = reg_write(REDUCER_YZOOM_A, MT9M111_MAX_HEIGHT);
+                if (!ret)
+                        ret = reg_write(REDUCER_XSIZE_A, width);
+                if (!ret)
+                        ret = reg_write(REDUCER_YSIZE_A, height);
+        }
+
+        return ret;
+}
+
+static int mt9m111_setup_pixfmt(struct soc_camera_device *icd, u16 outfmt)
+{
+        int ret;
+
+        ret = reg_write(OUTPUT_FORMAT_CTRL2_A, outfmt);
+        if (!ret)
+                ret = reg_write(OUTPUT_FORMAT_CTRL2_B, outfmt);
+        return ret;
+}
+
+static int mt9m111_setfmt_bayer8(struct soc_camera_device *icd)
+{
+        return mt9m111_setup_pixfmt(icd, MT9M111_OUTFMT_PROCESSED_BAYER);
+}
+
+static int mt9m111_setfmt_bayer10(struct soc_camera_device *icd)
+{
+        return mt9m111_setup_pixfmt(icd, MT9M111_OUTFMT_BYPASS_IFP);
+}
+
+static int mt9m111_setfmt_rgb565(struct soc_camera_device *icd)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        int val = 0;
+
+        if (mt9m111->swap_rgb_red_blue)
+                val |= MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr;
+        if (mt9m111->swap_rgb_even_odd)
+                val |= MT9M111_OUTFMT_SWAP_RGB_EVEN;
+        val |= MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB565;
+
+        return mt9m111_setup_pixfmt(icd, val);
+}
+
+static int mt9m111_setfmt_rgb555(struct soc_camera_device *icd)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        int val = 0;
+
+        if (mt9m111->swap_rgb_red_blue)
+                val |= MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr;
+        if (mt9m111->swap_rgb_even_odd)
+                val |= MT9M111_OUTFMT_SWAP_RGB_EVEN;
+        val |= MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB555;
+
+        return mt9m111_setup_pixfmt(icd, val);
+}
+
+static int mt9m111_setfmt_yuv(struct soc_camera_device *icd)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        int val = 0;
+
+        if (mt9m111->swap_yuv_cb_cr)
+                val |= MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr;
+        if (mt9m111->swap_yuv_y_chromas)
+                val |= MT9M111_OUTFMT_SWAP_YCbCr_C_Y;
+
+        return mt9m111_setup_pixfmt(icd, val);
+}
+
+static int mt9m111_enable(struct soc_camera_device *icd)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        struct soc_camera_link *icl = mt9m111->client->dev.platform_data;
+        int ret;
+
+        if (icl->power) {
+                ret = icl->power(&mt9m111->client->dev, 1);
+                if (ret < 0) {
+                        dev_err(icd->vdev->parent,
+                                "Platform failed to power-on the camera.\n");
+                        return ret;
+                }
+        }
+
+        ret = reg_set(RESET, MT9M111_RESET_CHIP_ENABLE);
+        if (!ret)
+                mt9m111->powered = 1;
+        return ret;
+}
+
+static int mt9m111_disable(struct soc_camera_device *icd)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        struct soc_camera_link *icl = mt9m111->client->dev.platform_data;
+        int ret;
+
+        ret = reg_clear(RESET, MT9M111_RESET_CHIP_ENABLE);
+        if (!ret)
+                mt9m111->powered = 0;
+
+        if (icl->power)
+                icl->power(&mt9m111->client->dev, 0);
+
+        return ret;
+}
+
+static int mt9m111_reset(struct soc_camera_device *icd)
+{
+        int ret;
+
+        ret = reg_set(RESET, MT9M111_RESET_RESET_MODE);
+        if (!ret)
+                ret = reg_set(RESET, MT9M111_RESET_RESET_SOC);
+        if (!ret)
+                ret = reg_clear(RESET, MT9M111_RESET_RESET_MODE
+                                | MT9M111_RESET_RESET_SOC);
+        return ret;
+}
+
+static int mt9m111_start_capture(struct soc_camera_device *icd)
+{
+        return 0;
+}
+
+static int mt9m111_stop_capture(struct soc_camera_device *icd)
+{
+        return 0;
+}
+
+static unsigned long mt9m111_query_bus_param(struct soc_camera_device *icd)
+{
+        return SOCAM_MASTER | SOCAM_PCLK_SAMPLE_RISING |
+                SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH |
+                SOCAM_DATAWIDTH_8;
+}
+
+static int mt9m111_set_bus_param(struct soc_camera_device *icd, unsigned long f)
+{
+        return 0;
+}
+
+static int mt9m111_set_pixfmt(struct soc_camera_device *icd, u32 pixfmt)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        int ret;
+
+        switch (pixfmt) {
+        case V4L2_PIX_FMT_SBGGR8:
+                ret = mt9m111_setfmt_bayer8(icd);
+                break;
+        case V4L2_PIX_FMT_SBGGR16:
+                ret = mt9m111_setfmt_bayer10(icd);
+                break;
+        case V4L2_PIX_FMT_RGB555:
+                ret = mt9m111_setfmt_rgb555(icd);
+                break;
+        case V4L2_PIX_FMT_RGB565:
+                ret = mt9m111_setfmt_rgb565(icd);
+                break;
+        case V4L2_PIX_FMT_YUYV:
+                ret = mt9m111_setfmt_yuv(icd);
+                break;
+        default:
+                dev_err(&icd->dev, "Pixel format not handled : %x\n", pixfmt);
+                ret = -EINVAL;
+        }
+
+        if (!ret)
+                mt9m111->pixfmt = pixfmt;
+
+        return ret;
+}
+
+static int mt9m111_set_fmt_cap(struct soc_camera_device *icd,
+                               __u32 pixfmt, struct v4l2_rect *rect)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        int ret;
+
+        mt9m111->left = rect->left;
+        mt9m111->top = rect->top;
+        mt9m111->width = rect->width;
+        mt9m111->height = rect->height;
+
+        dev_dbg(&icd->dev, "%s fmt=%x left=%d, top=%d, width=%d, height=%d\n",
+                __func__, pixfmt, mt9m111->left, mt9m111->top, mt9m111->width,
+                mt9m111->height);
+
+        ret = mt9m111_setup_rect(icd);
+        if (!ret)
+                ret = mt9m111_set_pixfmt(icd, pixfmt);
+        return ret;
+}
+
+static int mt9m111_try_fmt_cap(struct soc_camera_device *icd,
+                               struct v4l2_format *f)
+{
+        if (f->fmt.pix.height > MT9M111_MAX_HEIGHT)
+                f->fmt.pix.height = MT9M111_MAX_HEIGHT;
+        if (f->fmt.pix.width > MT9M111_MAX_WIDTH)
+                f->fmt.pix.width = MT9M111_MAX_WIDTH;
+
+        return 0;
+}
+
+static int mt9m111_get_chip_id(struct soc_camera_device *icd,
+                               struct v4l2_chip_ident *id)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+
+        if (id->match_type != V4L2_CHIP_MATCH_I2C_ADDR)
+                return -EINVAL;
+
+        if (id->match_chip != mt9m111->client->addr)
+                return -ENODEV;
+
+        id->ident       = mt9m111->model;
+        id->revision    = 0;
+
+        return 0;
+}
+
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+static int mt9m111_get_register(struct soc_camera_device *icd,
+                                struct v4l2_register *reg)
+{
+        int val;
+
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+
+        if (reg->match_type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0x2ff)
+                return -EINVAL;
+        if (reg->match_chip != mt9m111->client->addr)
+                return -ENODEV;
+
+        val = mt9m111_reg_read(icd, reg->reg);
+        reg->val = (u64)val;
+
+        if (reg->val > 0xffff)
+                return -EIO;
+
+        return 0;
+}
+
+static int mt9m111_set_register(struct soc_camera_device *icd,
+                                struct v4l2_register *reg)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+
+        if (reg->match_type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0x2ff)
+                return -EINVAL;
+
+        if (reg->match_chip != mt9m111->client->addr)
+                return -ENODEV;
+
+        if (mt9m111_reg_write(icd, reg->reg, reg->val) < 0)
+                return -EIO;
+
+        return 0;
+}
+#endif
+
+static const struct v4l2_queryctrl mt9m111_controls[] = {
+        {
+                .id             = V4L2_CID_VFLIP,
+                .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                .name           = "Flip Verticaly",
+                .minimum        = 0,
+                .maximum        = 1,
+                .step           = 1,
+                .default_value  = 0,
+        }, {
+                .id             = V4L2_CID_HFLIP,
+                .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                .name           = "Flip Horizontaly",
+                .minimum        = 0,
+                .maximum        = 1,
+                .step           = 1,
+                .default_value  = 0,
+        }, {    /* gain = 1/32*val (=>gain=1 if val==32) */
+                .id             = V4L2_CID_GAIN,
+                .type           = V4L2_CTRL_TYPE_INTEGER,
+                .name           = "Gain",
+                .minimum        = 0,
+                .maximum        = 63 * 2 * 2,
+                .step           = 1,
+                .default_value  = 32,
+                .flags          = V4L2_CTRL_FLAG_SLIDER,
+        }, {
+                .id             = V4L2_CID_EXPOSURE_AUTO,
+                .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                .name           = "Auto Exposure",
+                .minimum        = 0,
+                .maximum        = 1,
+                .step           = 1,
+                .default_value  = 1,
+        }
+};
+
+static int mt9m111_video_probe(struct soc_camera_device *);
+static void mt9m111_video_remove(struct soc_camera_device *);
+static int mt9m111_get_control(struct soc_camera_device *,
+                               struct v4l2_control *);
+static int mt9m111_set_control(struct soc_camera_device *,
+                               struct v4l2_control *);
+static int mt9m111_resume(struct soc_camera_device *icd);
+static int mt9m111_init(struct soc_camera_device *icd);
+static int mt9m111_release(struct soc_camera_device *icd);
+
+static struct soc_camera_ops mt9m111_ops = {
+        .owner                  = THIS_MODULE,
+        .probe                  = mt9m111_video_probe,
+        .remove                 = mt9m111_video_remove,
+        .init                   = mt9m111_init,
+        .resume                 = mt9m111_resume,
+        .release                = mt9m111_release,
+        .start_capture          = mt9m111_start_capture,
+        .stop_capture           = mt9m111_stop_capture,
+        .set_fmt_cap            = mt9m111_set_fmt_cap,
+        .try_fmt_cap            = mt9m111_try_fmt_cap,
+        .query_bus_param        = mt9m111_query_bus_param,
+        .set_bus_param          = mt9m111_set_bus_param,
+        .controls               = mt9m111_controls,
+        .num_controls           = ARRAY_SIZE(mt9m111_controls),
+        .get_control            = mt9m111_get_control,
+        .set_control            = mt9m111_set_control,
+        .get_chip_id            = mt9m111_get_chip_id,
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+        .get_register           = mt9m111_get_register,
+        .set_register           = mt9m111_set_register,
+#endif
+};
+
+static int mt9m111_set_flip(struct soc_camera_device *icd, int flip, int mask)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        int ret;
+
+        if (mt9m111->context == HIGHPOWER) {
+                if (flip)
+                        ret = reg_set(READ_MODE_B, mask);
+                else
+                        ret = reg_clear(READ_MODE_B, mask);
+        } else {
+                if (flip)
+                        ret = reg_set(READ_MODE_A, mask);
+                else
+                        ret = reg_clear(READ_MODE_A, mask);
+        }
+
+        return ret;
+}
+
+static int mt9m111_get_global_gain(struct soc_camera_device *icd)
+{
+        unsigned int data, gain;
+
+        data = reg_read(GLOBAL_GAIN);
+        if (data >= 0)
+                gain = ((data & (1 << 10)) * 2)
+                        | ((data & (1 << 9)) * 2)
+                        | (data & 0x2f);
+        else
+                gain = data;
+
+        return gain;
+}
+static int mt9m111_set_global_gain(struct soc_camera_device *icd, int gain)
+{
+        u16 val;
+
+        if (gain > 63 * 2 * 2)
+                return -EINVAL;
+
+        icd->gain = gain;
+        if ((gain >= 64 * 2) && (gain < 63 * 2 * 2))
+                val = (1 << 10) | (1 << 9) | (gain / 4);
+        else if ((gain >= 64) && (gain < 64 * 2))
+                val = (1 << 9) | (gain / 2);
+        else
+                val = gain;
+
+        return reg_write(GLOBAL_GAIN, val);
+}
+
+static int mt9m111_set_autoexposure(struct soc_camera_device *icd, int on)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        int ret;
+
+        if (on)
+                ret = reg_set(OPER_MODE_CTRL, MT9M111_OPMODE_AUTOEXPO_EN);
+        else
+                ret = reg_clear(OPER_MODE_CTRL, MT9M111_OPMODE_AUTOEXPO_EN);
+
+        if (!ret)
+                mt9m111->autoexposure = on;
+
+        return ret;
+}
+static int mt9m111_get_control(struct soc_camera_device *icd,
+                               struct v4l2_control *ctrl)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        int data;
+
+        switch (ctrl->id) {
+        case V4L2_CID_VFLIP:
+                if (mt9m111->context == HIGHPOWER)
+                        data = reg_read(READ_MODE_B);
+                else
+                        data = reg_read(READ_MODE_A);
+
+                if (data < 0)
+                        return -EIO;
+                ctrl->value = !!(data & MT9M111_RMB_MIRROR_ROWS);
+                break;
+        case V4L2_CID_HFLIP:
+                if (mt9m111->context == HIGHPOWER)
+                        data = reg_read(READ_MODE_B);
+                else
+                        data = reg_read(READ_MODE_A);
+
+                if (data < 0)
+                        return -EIO;
+                ctrl->value = !!(data & MT9M111_RMB_MIRROR_COLS);
+                break;
+        case V4L2_CID_GAIN:
+                data = mt9m111_get_global_gain(icd);
+                if (data < 0)
+                        return data;
+                ctrl->value = data;
+                break;
+        case V4L2_CID_EXPOSURE_AUTO:
+                ctrl->value = mt9m111->autoexposure;
+                break;
+        }
+        return 0;
+}
+
+static int mt9m111_set_control(struct soc_camera_device *icd,
+                               struct v4l2_control *ctrl)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        const struct v4l2_queryctrl *qctrl;
+        int ret;
+
+        qctrl = soc_camera_find_qctrl(&mt9m111_ops, ctrl->id);
+
+        if (!qctrl)
+                return -EINVAL;
+
+        switch (ctrl->id) {
+        case V4L2_CID_VFLIP:
+                mt9m111->vflip = ctrl->value;
+                ret = mt9m111_set_flip(icd, ctrl->value,
+                                        MT9M111_RMB_MIRROR_ROWS);
+                break;
+        case V4L2_CID_HFLIP:
+                mt9m111->hflip = ctrl->value;
+                ret = mt9m111_set_flip(icd, ctrl->value,
+                                        MT9M111_RMB_MIRROR_COLS);
+                break;
+        case V4L2_CID_GAIN:
+                ret = mt9m111_set_global_gain(icd, ctrl->value);
+                break;
+        case V4L2_CID_EXPOSURE_AUTO:
+                ret =  mt9m111_set_autoexposure(icd, ctrl->value);
+                break;
+        default:
+                ret = -EINVAL;
+        }
+
+        return ret;
+}
+
+static int mt9m111_restore_state(struct soc_camera_device *icd)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+
+        mt9m111_set_context(icd, mt9m111->context);
+        mt9m111_set_pixfmt(icd, mt9m111->pixfmt);
+        mt9m111_setup_rect(icd);
+        mt9m111_set_flip(icd, mt9m111->hflip, MT9M111_RMB_MIRROR_COLS);
+        mt9m111_set_flip(icd, mt9m111->vflip, MT9M111_RMB_MIRROR_ROWS);
+        mt9m111_set_global_gain(icd, icd->gain);
+        mt9m111_set_autoexposure(icd, mt9m111->autoexposure);
+        return 0;
+}
+
+static int mt9m111_resume(struct soc_camera_device *icd)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        int ret = 0;
+
+        if (mt9m111->powered) {
+                ret = mt9m111_enable(icd);
+                if (!ret)
+                        ret = mt9m111_reset(icd);
+                if (!ret)
+                        ret = mt9m111_restore_state(icd);
+        }
+        return ret;
+}
+
+static int mt9m111_init(struct soc_camera_device *icd)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        int ret;
+
+        mt9m111->context = HIGHPOWER;
+        ret = mt9m111_enable(icd);
+        if (!ret)
+                ret = mt9m111_reset(icd);
+        if (!ret)
+                ret = mt9m111_set_context(icd, mt9m111->context);
+        if (!ret)
+                ret = mt9m111_set_autoexposure(icd, mt9m111->autoexposure);
+        if (ret)
+                dev_err(&icd->dev, "mt9m111 init failed: %d\n", ret);
+        return ret;
+}
+
+static int mt9m111_release(struct soc_camera_device *icd)
+{
+        int ret;
+
+        ret = mt9m111_disable(icd);
+        if (ret < 0)
+                dev_err(&icd->dev, "mt9m111 release failed: %d\n", ret);
+
+        return ret;
+}
+
+/*
+ * Interface active, can use i2c. If it fails, it can indeed mean, that
+ * this wasn't our capture interface, so, we wait for the right one
+ */
+static int mt9m111_video_probe(struct soc_camera_device *icd)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        s32 data;
+        int ret;
+
+        /*
+         * We must have a parent by now. And it cannot be a wrong one.
+         * So this entire test is completely redundant.
+         */
+        if (!icd->dev.parent ||
+            to_soc_camera_host(icd->dev.parent)->nr != icd->iface)
+                return -ENODEV;
+
+        ret = mt9m111_enable(icd);
+        if (ret)
+                goto ei2c;
+        ret = mt9m111_reset(icd);
+        if (ret)
+                goto ei2c;
+
+        data = reg_read(CHIP_VERSION);
+
+        switch (data) {
+        case 0x143a:
+                mt9m111->model = V4L2_IDENT_MT9M111;
+                icd->formats = mt9m111_colour_formats;
+                icd->num_formats = ARRAY_SIZE(mt9m111_colour_formats);
+                break;
+        default:
+                ret = -ENODEV;
+                dev_err(&icd->dev,
+                        "No MT9M111 chip detected, register read %x\n", data);
+                goto ei2c;
+        }
+
+        dev_info(&icd->dev, "Detected a MT9M111 chip ID 0x143a\n");
+
+        ret = soc_camera_video_start(icd);
+        if (ret)
+                goto eisis;
+
+        mt9m111->autoexposure = 1;
+
+        mt9m111->swap_rgb_even_odd = 1;
+        mt9m111->swap_rgb_red_blue = 1;
+
+        return 0;
+eisis:
+ei2c:
+        return ret;
+}
+
+static void mt9m111_video_remove(struct soc_camera_device *icd)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+
+        dev_dbg(&icd->dev, "Video %x removed: %p, %p\n", mt9m111->client->addr,
+                mt9m111->icd.dev.parent, mt9m111->icd.vdev);
+        soc_camera_video_stop(&mt9m111->icd);
+}
+
+static int mt9m111_probe(struct i2c_client *client,
+                         const struct i2c_device_id *did)
+{
+        struct mt9m111 *mt9m111;
+        struct soc_camera_device *icd;
+        struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
+        struct soc_camera_link *icl = client->dev.platform_data;
+        int ret;
+
+        if (!icl) {
+                dev_err(&client->dev, "MT9M111 driver needs platform data\n");
+                return -EINVAL;
+        }
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA)) {
+                dev_warn(&adapter->dev,
+                         "I2C-Adapter doesn't support I2C_FUNC_SMBUS_WORD\n");
+                return -EIO;
+        }
+
+        mt9m111 = kzalloc(sizeof(struct mt9m111), GFP_KERNEL);
+        if (!mt9m111)
+                return -ENOMEM;
+
+        mt9m111->client = client;
+        i2c_set_clientdata(client, mt9m111);
+
+        /* Second stage probe - when a capture adapter is there */
+        icd             = &mt9m111->icd;
+        icd->ops        = &mt9m111_ops;
+        icd->control    = &client->dev;
+        icd->x_min      = MT9M111_MIN_DARK_COLS;
+        icd->y_min      = MT9M111_MIN_DARK_ROWS;
+        icd->x_current  = icd->x_min;
+        icd->y_current  = icd->y_min;
+        icd->width_min  = MT9M111_MIN_DARK_ROWS;
+        icd->width_max  = MT9M111_MAX_WIDTH;
+        icd->height_min = MT9M111_MIN_DARK_COLS;
+        icd->height_max = MT9M111_MAX_HEIGHT;
+        icd->y_skip_top = 0;
+        icd->iface      = icl->bus_id;
+
+        ret = soc_camera_device_register(icd);
+        if (ret)
+                goto eisdr;
+        return 0;
+
+eisdr:
+        kfree(mt9m111);
+        return ret;
+}
+
+static int mt9m111_remove(struct i2c_client *client)
+{
+        struct mt9m111 *mt9m111 = i2c_get_clientdata(client);
+        soc_camera_device_unregister(&mt9m111->icd);
+        kfree(mt9m111);
+
+        return 0;
+}
+
+static const struct i2c_device_id mt9m111_id[] = {
+        { "mt9m111", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, mt9m111_id);
+
+static struct i2c_driver mt9m111_i2c_driver = {
+        .driver = {
+                .name = "mt9m111",
+        },
+        .probe          = mt9m111_probe,
+        .remove         = mt9m111_remove,
+        .id_table       = mt9m111_id,
+};
+
+static int __init mt9m111_mod_init(void)
+{
+        return i2c_add_driver(&mt9m111_i2c_driver);
+}
+
+static void __exit mt9m111_mod_exit(void)
+{
+        i2c_del_driver(&mt9m111_i2c_driver);
+}
+
+module_init(mt9m111_mod_init);
+module_exit(mt9m111_mod_exit);
+
+MODULE_DESCRIPTION("Micron MT9M111 Camera driver");
+MODULE_AUTHOR("Robert Jarzmik");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/video/mt9v022.c b/drivers/media/video/mt9v022.c
index 56808cd2f8a9..2584201059d8 100644
--- a/drivers/media/video/mt9v022.c
+++ b/drivers/media/video/mt9v022.c
@@ -134,34 +134,56 @@ static int reg_clear(struct soc_camera_device *icd, const u8 reg,
 static int mt9v022_init(struct soc_camera_device *icd)
 {
         struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd);
+        struct soc_camera_link *icl = mt9v022->client->dev.platform_data;
         int ret;
 
+        if (icl->power) {
+                ret = icl->power(&mt9v022->client->dev, 1);
+                if (ret < 0) {
+                        dev_err(icd->vdev->parent,
+                                "Platform failed to power-on the camera.\n");
+                        return ret;
+                }
+        }
+
+        /*
+         * The camera could have been already on, we hard-reset it additionally,
+         * if available. Soft reset is done in video_probe().
+         */
+        if (icl->reset)
+                icl->reset(&mt9v022->client->dev);
+
         /* Almost the default mode: master, parallel, simultaneous, and an
          * undocumented bit 0x200, which is present in table 7, but not in 8,
          * plus snapshot mode to disable scan for now */
         mt9v022->chip_control |= 0x10;
         ret = reg_write(icd, MT9V022_CHIP_CONTROL, mt9v022->chip_control);
-        if (ret >= 0)
-                reg_write(icd, MT9V022_READ_MODE, 0x300);
+        if (!ret)
+                ret = reg_write(icd, MT9V022_READ_MODE, 0x300);
 
         /* All defaults */
-        if (ret >= 0)
+        if (!ret)
                 /* AEC, AGC on */
                 ret = reg_set(icd, MT9V022_AEC_AGC_ENABLE, 0x3);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9V022_MAX_TOTAL_SHUTTER_WIDTH, 480);
-        if (ret >= 0)
+        if (!ret)
                 /* default - auto */
                 ret = reg_clear(icd, MT9V022_BLACK_LEVEL_CALIB_CTRL, 1);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9V022_DIGITAL_TEST_PATTERN, 0);
 
-        return ret >= 0 ? 0 : -EIO;
+        return ret;
 }
 
 static int mt9v022_release(struct soc_camera_device *icd)
 {
-        /* Nothing? */
+        struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd);
+        struct soc_camera_link *icl = mt9v022->client->dev.platform_data;
+
+        if (icl->power)
+                icl->power(&mt9v022->client->dev, 0);
+
         return 0;
 }
 
@@ -352,21 +374,21 @@ static int mt9v022_set_fmt_cap(struct soc_camera_device *icd,
                                         rect->height + icd->y_skip_top + 43);
         }
         /* Setup frame format: defaults apart from width and height */
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9V022_COLUMN_START, rect->left);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9V022_ROW_START, rect->top);
-        if (ret >= 0)
+        if (!ret)
                 /* Default 94, Phytec driver says:
                  * "width + horizontal blank >= 660" */
                 ret = reg_write(icd, MT9V022_HORIZONTAL_BLANKING,
                                 rect->width > 660 - 43 ? 43 :
                                 660 - rect->width);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9V022_VERTICAL_BLANKING, 45);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9V022_WINDOW_WIDTH, rect->width);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9V022_WINDOW_HEIGHT,
                                 rect->height + icd->y_skip_top);
 
@@ -717,7 +739,7 @@ static int mt9v022_video_probe(struct soc_camera_device *icd)
                         icd->num_formats = 1;
         }
 
-        if (ret >= 0)
+        if (!ret)
                 ret = soc_camera_video_start(icd);
         if (ret < 0)
                 goto eisis;
diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c
index 8ef578caba3b..7f130284b5c7 100644
--- a/drivers/media/video/mxb.c
+++ b/drivers/media/video/mxb.c
@@ -27,6 +27,7 @@
 #include <media/tuner.h>
 #include <linux/video_decoder.h>
 #include <media/v4l2-common.h>
+#include <media/saa7115.h>
 
 #include "mxb.h"
 #include "tea6415c.h"
@@ -122,6 +123,8 @@ static struct saa7146_extension_ioctls ioctls[] = {
         { VIDIOC_S_FREQUENCY,   SAA7146_EXCLUSIVE },
         { VIDIOC_G_AUDIO,       SAA7146_EXCLUSIVE },
         { VIDIOC_S_AUDIO,       SAA7146_EXCLUSIVE },
+        { VIDIOC_DBG_G_REGISTER,        SAA7146_EXCLUSIVE },
+        { VIDIOC_DBG_S_REGISTER,        SAA7146_EXCLUSIVE },
         { MXB_S_AUDIO_CD,       SAA7146_EXCLUSIVE },    /* custom control */
         { MXB_S_AUDIO_LINE,     SAA7146_EXCLUSIVE },    /* custom control */
         { 0,                    0 }
@@ -134,12 +137,12 @@ struct mxb
 
         struct i2c_adapter      i2c_adapter;
 
-        struct i2c_client*      saa7111a;
-        struct i2c_client*      tda9840;
-        struct i2c_client*      tea6415c;
-        struct i2c_client*      tuner;
-        struct i2c_client*      tea6420_1;
-        struct i2c_client*      tea6420_2;
+        struct i2c_client       *saa7111a;
+        struct i2c_client       *tda9840;
+        struct i2c_client       *tea6415c;
+        struct i2c_client       *tuner;
+        struct i2c_client       *tea6420_1;
+        struct i2c_client       *tea6420_2;
 
         int     cur_mode;       /* current audio mode (mono, stereo, ...) */
         int     cur_input;      /* current input */
@@ -151,23 +154,23 @@ static struct saa7146_extension extension;
 
 static int mxb_check_clients(struct device *dev, void *data)
 {
-        struct mxb* mxb = data;
+        struct mxb *mxb = data;
         struct i2c_client *client = i2c_verify_client(dev);
 
-        if( !client )
+        if (!client)
                 return 0;
 
-        if( I2C_ADDR_TEA6420_1 == client->addr )
+        if (I2C_ADDR_TEA6420_1 == client->addr)
                 mxb->tea6420_1 = client;
-        if( I2C_ADDR_TEA6420_2 == client->addr )
+        if (I2C_ADDR_TEA6420_2 == client->addr)
                 mxb->tea6420_2 = client;
-        if( I2C_TEA6415C_2 == client->addr )
+        if (I2C_TEA6415C_2 == client->addr)
                 mxb->tea6415c = client;
-        if( I2C_ADDR_TDA9840 == client->addr )
+        if (I2C_ADDR_TDA9840 == client->addr)
                 mxb->tda9840 = client;
-        if( I2C_SAA7111 == client->addr )
+        if (I2C_SAA7111 == client->addr)
                 mxb->saa7111a = client;
-        if( 0x60 == client->addr )
+        if (0x60 == client->addr)
                 mxb->tuner = client;
 
         return 0;
@@ -178,23 +181,28 @@ static int mxb_probe(struct saa7146_dev* dev)
         struct mxb* mxb = NULL;
         int result;
 
-        if ((result = request_module("saa7111")) < 0) {
+        result = request_module("saa7115");
+        if (result < 0) {
                 printk("mxb: saa7111 i2c module not available.\n");
                 return -ENODEV;
         }
-        if ((result = request_module("tea6420")) < 0) {
+        result = request_module("tea6420");
+        if (result < 0) {
                 printk("mxb: tea6420 i2c module not available.\n");
                 return -ENODEV;
         }
-        if ((result = request_module("tea6415c")) < 0) {
+        result = request_module("tea6415c");
+        if (result < 0) {
                 printk("mxb: tea6415c i2c module not available.\n");
                 return -ENODEV;
         }
-        if ((result = request_module("tda9840")) < 0) {
+        result = request_module("tda9840");
+        if (result < 0) {
                 printk("mxb: tda9840 i2c module not available.\n");
                 return -ENODEV;
         }
-        if ((result = request_module("tuner")) < 0) {
+        result = request_module("tuner");
+        if (result < 0) {
                 printk("mxb: tuner i2c module not available.\n");
                 return -ENODEV;
         }
@@ -207,9 +215,10 @@ static int mxb_probe(struct saa7146_dev* dev)
 
         mxb->i2c_adapter = (struct i2c_adapter) {
                 .class = I2C_CLASS_TV_ANALOG,
-                .name = "mxb",
         };
 
+        snprintf(mxb->i2c_adapter.name, sizeof(mxb->i2c_adapter.name), "mxb%d", mxb_num);
+
         saa7146_i2c_adapter_prepare(dev, &mxb->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);
         if(i2c_add_adapter(&mxb->i2c_adapter) < 0) {
                 DEB_S(("cannot register i2c-device. skipping.\n"));
@@ -290,38 +299,7 @@ static struct {
         { 9, { 0x1d, 0xed, 0xd0, 0x68, 0x29, 0xb4, 0xe1, 0x00, 0xb8 } },
         { 9, { 0x3d, 0xed, 0xd0, 0x68, 0x29, 0xb4, 0xe1, 0x00, 0xb8 } },
         { 3, { 0x80, 0xb3, 0x0a } },
-        {-1, { 0} }
-};
-
-static const unsigned char mxb_saa7111_init[] = {
-        0x00, 0x00,       /* 00 - ID byte */
-        0x01, 0x00,       /* 01 - reserved */
-
-        /*front end */
-        0x02, 0xd8,       /* 02 - FUSE=x, GUDL=x, MODE=x */
-        0x03, 0x23,       /* 03 - HLNRS=0, VBSL=1, WPOFF=0, HOLDG=0, GAFIX=0, GAI1=256, GAI2=256 */
-        0x04, 0x00,       /* 04 - GAI1=256 */
-        0x05, 0x00,       /* 05 - GAI2=256 */
-
-        /* decoder */
-        0x06, 0xf0,       /* 06 - HSB at  xx(50Hz) /  xx(60Hz) pixels after end of last line */
-        0x07, 0x30,       /* 07 - HSS at  xx(50Hz) /  xx(60Hz) pixels after end of last line */
-        0x08, 0xa8,       /* 08 - AUFD=x, FSEL=x, EXFIL=x, VTRC=x, HPLL=x, VNOI=x */
-        0x09, 0x02,       /* 09 - BYPS=x, PREF=x, BPSS=x, VBLB=x, UPTCV=x, APER=x */
-        0x0a, 0x80,       /* 0a - BRIG=128 */
-        0x0b, 0x47,       /* 0b - CONT=1.109 */
-        0x0c, 0x40,       /* 0c - SATN=1.0 */
-        0x0d, 0x00,       /* 0d - HUE=0 */
-        0x0e, 0x01,       /* 0e - CDTO=0, CSTD=0, DCCF=0, FCTC=0, CHBW=1 */
-        0x0f, 0x00,       /* 0f - reserved */
-        0x10, 0xd0,       /* 10 - OFTS=x, HDEL=x, VRLN=x, YDEL=x */
-        0x11, 0x8c,       /* 11 - GPSW=x, CM99=x, FECO=x, COMPO=x, OEYC=1, OEHV=1, VIPB=0, COLO=0 */
-        0x12, 0x80,       /* 12 - xx output control 2 */
-        0x13, 0x30,       /* 13 - xx output control 3 */
-        0x14, 0x00,       /* 14 - reserved */
-        0x15, 0x15,       /* 15 - VBI */
-        0x16, 0x04,       /* 16 - VBI */
-        0x17, 0x00,       /* 17 - VBI */
+        {-1, { 0 } }
 };
 
 /* bring hardware to a sane state. this has to be done, just in case someone
@@ -331,37 +309,28 @@ static const unsigned char mxb_saa7111_init[] = {
 static int mxb_init_done(struct saa7146_dev* dev)
 {
         struct mxb* mxb = (struct mxb*)dev->ext_priv;
-        struct video_decoder_init init;
         struct i2c_msg msg;
         struct tuner_setup tun_setup;
         v4l2_std_id std = V4L2_STD_PAL_BG;
+        struct v4l2_routing route;
 
         int i = 0, err = 0;
-        struct  tea6415c_multiplex vm;
+        struct tea6415c_multiplex vm;
 
         /* select video mode in saa7111a */
-        i = VIDEO_MODE_PAL;
-        /* fixme: currently pointless: gets overwritten by configuration below */
-        mxb->saa7111a->driver->command(mxb->saa7111a,DECODER_SET_NORM, &i);
-
-        /* write configuration to saa7111a */
-        init.data = mxb_saa7111_init;
-        init.len = sizeof(mxb_saa7111_init);
-        mxb->saa7111a->driver->command(mxb->saa7111a,DECODER_INIT, &init);
+        mxb->saa7111a->driver->command(mxb->saa7111a, VIDIOC_S_STD, &std);
 
         /* select tuner-output on saa7111a */
         i = 0;
-        mxb->saa7111a->driver->command(mxb->saa7111a,DECODER_SET_INPUT, &i);
-
-        /* enable vbi bypass */
-        i = 1;
-        mxb->saa7111a->driver->command(mxb->saa7111a,DECODER_SET_VBI_BYPASS, &i);
+        route.input = SAA7115_COMPOSITE0;
+        route.output = SAA7111_FMT_CCIR | SAA7111_VBI_BYPASS;
+        mxb->saa7111a->driver->command(mxb->saa7111a, VIDIOC_INT_S_VIDEO_ROUTING, &route);
 
         /* select a tuner type */
         tun_setup.mode_mask = T_ANALOG_TV;
         tun_setup.addr = ADDR_UNSET;
         tun_setup.type = TUNER_PHILIPS_PAL;
-        mxb->tuner->driver->command(mxb->tuner,TUNER_SET_TYPE_ADDR, &tun_setup);
+        mxb->tuner->driver->command(mxb->tuner, TUNER_SET_TYPE_ADDR, &tun_setup);
         /* tune in some frequency on tuner */
         mxb->cur_freq.tuner = 0;
         mxb->cur_freq.type = V4L2_TUNER_ANALOG_TV;
@@ -373,27 +342,26 @@ static int mxb_init_done(struct saa7146_dev* dev)
         mxb->tuner->driver->command(mxb->tuner, VIDIOC_S_STD, &std);
 
         /* mute audio on tea6420s */
-        mxb->tea6420_1->driver->command(mxb->tea6420_1,TEA6420_SWITCH, &TEA6420_line[6][0]);
-        mxb->tea6420_2->driver->command(mxb->tea6420_2,TEA6420_SWITCH, &TEA6420_line[6][1]);
-        mxb->tea6420_1->driver->command(mxb->tea6420_1,TEA6420_SWITCH, &TEA6420_cd[6][0]);
-        mxb->tea6420_2->driver->command(mxb->tea6420_2,TEA6420_SWITCH, &TEA6420_cd[6][1]);
+        mxb->tea6420_1->driver->command(mxb->tea6420_1, TEA6420_SWITCH, &TEA6420_line[6][0]);
+        mxb->tea6420_2->driver->command(mxb->tea6420_2, TEA6420_SWITCH, &TEA6420_line[6][1]);
+        mxb->tea6420_1->driver->command(mxb->tea6420_1, TEA6420_SWITCH, &TEA6420_cd[6][0]);
+        mxb->tea6420_2->driver->command(mxb->tea6420_2, TEA6420_SWITCH, &TEA6420_cd[6][1]);
 
         /* switch to tuner-channel on tea6415c*/
         vm.out = 17;
         vm.in  = 3;
-        mxb->tea6415c->driver->command(mxb->tea6415c,TEA6415C_SWITCH, &vm);
+        mxb->tea6415c->driver->command(mxb->tea6415c, TEA6415C_SWITCH, &vm);
 
         /* select tuner-output on multicable on tea6415c*/
         vm.in  = 3;
         vm.out = 13;
-        mxb->tea6415c->driver->command(mxb->tea6415c,TEA6415C_SWITCH, &vm);
+        mxb->tea6415c->driver->command(mxb->tea6415c, TEA6415C_SWITCH, &vm);
 
         /* the rest for mxb */
         mxb->cur_input = 0;
         mxb->cur_mute = 1;
 
         mxb->cur_mode = V4L2_TUNER_MODE_STEREO;
-        mxb->tda9840->driver->command(mxb->tda9840, TDA9840_SWITCH, &mxb->cur_mode);
 
         /* check if the saa7740 (aka 'sound arena module') is present
            on the mxb. if so, we must initialize it. due to lack of
@@ -404,21 +372,22 @@ static int mxb_init_done(struct saa7146_dev* dev)
         msg.len = mxb_saa7740_init[0].length;
         msg.buf = &mxb_saa7740_init[0].data[0];
 
-        if( 1 == (err = i2c_transfer(&mxb->i2c_adapter, &msg, 1))) {
+        err = i2c_transfer(&mxb->i2c_adapter, &msg, 1);
+        if (err == 1) {
                 /* the sound arena module is a pos, that's probably the reason
                    philips refuses to hand out a datasheet for the saa7740...
                    it seems to screw up the i2c bus, so we disable fast irq
                    based i2c transactions here and rely on the slow and safe
                    polling method ... */
                 extension.flags &= ~SAA7146_USE_I2C_IRQ;
-                for(i = 1;;i++) {
-                        if( -1 == mxb_saa7740_init[i].length ) {
+                for (i = 1; ; i++) {
+                        if (-1 == mxb_saa7740_init[i].length)
                                 break;
-                        }
 
                         msg.len = mxb_saa7740_init[i].length;
                         msg.buf = &mxb_saa7740_init[i].data[0];
-                        if( 1 != (err = i2c_transfer(&mxb->i2c_adapter, &msg, 1))) {
+                        err = i2c_transfer(&mxb->i2c_adapter, &msg, 1);
+                        if (err != 1) {
                                 DEB_D(("failed to initialize 'sound arena module'.\n"));
                                 goto err;
                         }
@@ -432,7 +401,8 @@ err:
         /* ext->saa has been filled by the core driver */
 
         /* some stuff is done via variables */
-        saa7146_set_hps_source_and_sync(dev, input_port_selection[mxb->cur_input].hps_source, input_port_selection[mxb->cur_input].hps_sync);
+        saa7146_set_hps_source_and_sync(dev, input_port_selection[mxb->cur_input].hps_source,
+                        input_port_selection[mxb->cur_input].hps_sync);
 
         /* some stuff is done via direct write to the registers */
 
@@ -457,24 +427,24 @@ void mxb_irq_bh(struct saa7146_dev* dev, u32* irq_mask)
 static struct saa7146_ext_vv vv_data;
 
 /* this function only gets called when the probing was successful */
-static int mxb_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_data *info)
+static int mxb_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_data *info)
 {
-        struct mxb* mxb = (struct mxb*)dev->ext_priv;
+        struct mxb *mxb = (struct mxb *)dev->ext_priv;
 
-        DEB_EE(("dev:%p\n",dev));
+        DEB_EE(("dev:%p\n", dev));
 
         /* checking for i2c-devices can be omitted here, because we
            already did this in "mxb_vl42_probe" */
 
-        saa7146_vv_init(dev,&vv_data);
-        if( 0 != saa7146_register_device(&mxb->video_dev, dev, "mxb", VFL_TYPE_GRABBER)) {
+        saa7146_vv_init(dev, &vv_data);
+        if (saa7146_register_device(&mxb->video_dev, dev, "mxb", VFL_TYPE_GRABBER)) {
                 ERR(("cannot register capture v4l2 device. skipping.\n"));
                 return -1;
         }
 
         /* initialization stuff (vbi) (only for revision > 0 and for extensions which want it)*/
-        if( 0 != MXB_BOARD_CAN_DO_VBI(dev)) {
-                if( 0 != saa7146_register_device(&mxb->vbi_dev, dev, "mxb", VFL_TYPE_VBI)) {
+        if (MXB_BOARD_CAN_DO_VBI(dev)) {
+                if (saa7146_register_device(&mxb->vbi_dev, dev, "mxb", VFL_TYPE_VBI)) {
                         ERR(("cannot register vbi v4l2 device. skipping.\n"));
                 }
         }
@@ -486,18 +456,18 @@ static int mxb_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_data
         i2c_use_client(mxb->saa7111a);
         i2c_use_client(mxb->tuner);
 
-        printk("mxb: found 'Multimedia eXtension Board'-%d.\n",mxb_num);
+        printk("mxb: found Multimedia eXtension Board #%d.\n", mxb_num);
 
         mxb_num++;
         mxb_init_done(dev);
         return 0;
 }
 
-static int mxb_detach(struct saa7146_dev* dev)
+static int mxb_detach(struct saa7146_dev *dev)
 {
-        struct mxb* mxb = (struct mxb*)dev->ext_priv;
+        struct mxb *mxb = (struct mxb *)dev->ext_priv;
 
-        DEB_EE(("dev:%p\n",dev));
+        DEB_EE(("dev:%p\n", dev));
 
         i2c_release_client(mxb->tea6420_1);
         i2c_release_client(mxb->tea6420_2);
@@ -507,9 +477,8 @@ static int mxb_detach(struct saa7146_dev* dev)
         i2c_release_client(mxb->tuner);
 
         saa7146_unregister_device(&mxb->video_dev,dev);
-        if( 0 != MXB_BOARD_CAN_DO_VBI(dev)) {
-                saa7146_unregister_device(&mxb->vbi_dev,dev);
-        }
+        if (MXB_BOARD_CAN_DO_VBI(dev))
+                saa7146_unregister_device(&mxb->vbi_dev, dev);
         saa7146_vv_release(dev);
 
         mxb_num--;
@@ -523,7 +492,7 @@ static int mxb_detach(struct saa7146_dev* dev)
 static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
 {
         struct saa7146_dev *dev = fh->dev;
-        struct mxb* mxb = (struct mxb*)dev->ext_priv;
+        struct mxb *mxb = (struct mxb *)dev->ext_priv;
         struct saa7146_vv *vv = dev->vv_data;
 
         switch(cmd) {
@@ -532,11 +501,9 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
                 struct v4l2_input *i = arg;
 
                 DEB_EE(("VIDIOC_ENUMINPUT %d.\n",i->index));
-                if( i->index < 0 || i->index >= MXB_INPUTS) {
+                if (i->index < 0 || i->index >= MXB_INPUTS)
                         return -EINVAL;
-                }
                 memcpy(i, &mxb_inputs[i->index], sizeof(struct v4l2_input));
-
                 return 0;
         }
         /* the saa7146 provides some controls (brightness, contrast, saturation)
@@ -550,7 +517,7 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
                 for (i = MAXCONTROLS - 1; i >= 0; i--) {
                         if (mxb_controls[i].id == qc->id) {
                                 *qc = mxb_controls[i];
-                                DEB_D(("VIDIOC_QUERYCTRL %d.\n",qc->id));
+                                DEB_D(("VIDIOC_QUERYCTRL %d.\n", qc->id));
                                 return 0;
                         }
                 }
@@ -562,56 +529,51 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
                 int i;
 
                 for (i = MAXCONTROLS - 1; i >= 0; i--) {
-                        if (mxb_controls[i].id == vc->id) {
+                        if (mxb_controls[i].id == vc->id)
                                 break;
-                        }
                 }
 
-                if( i < 0 ) {
+                if (i < 0)
                         return -EAGAIN;
-                }
 
-                switch (vc->id ) {
-                        case V4L2_CID_AUDIO_MUTE: {
-                                vc->value = mxb->cur_mute;
-                                DEB_D(("VIDIOC_G_CTRL V4L2_CID_AUDIO_MUTE:%d.\n",vc->value));
-                                return 0;
-                        }
+                if (vc->id == V4L2_CID_AUDIO_MUTE) {
+                        vc->value = mxb->cur_mute;
+                        DEB_D(("VIDIOC_G_CTRL V4L2_CID_AUDIO_MUTE:%d.\n", vc->value));
+                        return 0;
                 }
 
-                DEB_EE(("VIDIOC_G_CTRL V4L2_CID_AUDIO_MUTE:%d.\n",vc->value));
+                DEB_EE(("VIDIOC_G_CTRL V4L2_CID_AUDIO_MUTE:%d.\n", vc->value));
                 return 0;
         }
 
         case VIDIOC_S_CTRL:
         {
-                struct  v4l2_control    *vc = arg;
+                struct v4l2_control *vc = arg;
                 int i = 0;
 
                 for (i = MAXCONTROLS - 1; i >= 0; i--) {
-                        if (mxb_controls[i].id == vc->id) {
+                        if (mxb_controls[i].id == vc->id)
                                 break;
-                        }
                 }
 
-                if( i < 0 ) {
+                if (i < 0)
                         return -EAGAIN;
-                }
 
-                switch (vc->id ) {
-                        case V4L2_CID_AUDIO_MUTE: {
-                                mxb->cur_mute = vc->value;
-                                if( 0 == vc->value ) {
-                                        /* switch the audio-source */
-                                        mxb->tea6420_1->driver->command(mxb->tea6420_1,TEA6420_SWITCH, &TEA6420_line[video_audio_connect[mxb->cur_input]][0]);
-                                        mxb->tea6420_2->driver->command(mxb->tea6420_2,TEA6420_SWITCH, &TEA6420_line[video_audio_connect[mxb->cur_input]][1]);
-                                } else {
-                                        mxb->tea6420_1->driver->command(mxb->tea6420_1,TEA6420_SWITCH, &TEA6420_line[6][0]);
-                                        mxb->tea6420_2->driver->command(mxb->tea6420_2,TEA6420_SWITCH, &TEA6420_line[6][1]);
-                                }
-                                DEB_EE(("VIDIOC_S_CTRL, V4L2_CID_AUDIO_MUTE: %d.\n",vc->value));
-                                break;
+                if (vc->id == V4L2_CID_AUDIO_MUTE) {
+                        mxb->cur_mute = vc->value;
+                        if (!vc->value) {
+                                /* switch the audio-source */
+                                mxb->tea6420_1->driver->command(mxb->tea6420_1, TEA6420_SWITCH,
+                                                &TEA6420_line[video_audio_connect[mxb->cur_input]][0]);
+                                mxb->tea6420_2->driver->command(mxb->tea6420_2, TEA6420_SWITCH,
+                                                &TEA6420_line[video_audio_connect[mxb->cur_input]][1]);
+                        } else {
+                                mxb->tea6420_1->driver->command(mxb->tea6420_1, TEA6420_SWITCH,
+                                                &TEA6420_line[6][0]);
+                                mxb->tea6420_2->driver->command(mxb->tea6420_2, TEA6420_SWITCH,
+                                                &TEA6420_line[6][1]);
                         }
+                        DEB_EE(("VIDIOC_S_CTRL, V4L2_CID_AUDIO_MUTE: %d.\n", vc->value));
                 }
                 return 0;
         }
@@ -620,106 +582,84 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
                 int *input = (int *)arg;
                 *input = mxb->cur_input;
 
-                DEB_EE(("VIDIOC_G_INPUT %d.\n",*input));
+                DEB_EE(("VIDIOC_G_INPUT %d.\n", *input));
                 return 0;
         }
         case VIDIOC_S_INPUT:
         {
                 int input = *(int *)arg;
-                struct  tea6415c_multiplex vm;
+                struct tea6415c_multiplex vm;
+                struct v4l2_routing route;
                 int i = 0;
 
-                DEB_EE(("VIDIOC_S_INPUT %d.\n",input));
+                DEB_EE(("VIDIOC_S_INPUT %d.\n", input));
 
-                if (input < 0 || input >= MXB_INPUTS) {
+                if (input < 0 || input >= MXB_INPUTS)
                         return -EINVAL;
-                }
-
-                /* fixme: locke das setzen des inputs mit hilfe des mutexes
-                mutex_lock(&dev->lock);
-                video_mux(dev,*i);
-                mutex_unlock(&dev->lock);
-                */
-
-                /* fixme: check if streaming capture
-                if ( 0 != dev->streaming ) {
-                        DEB_D(("VIDIOC_S_INPUT illegal while streaming.\n"));
-                        return -EPERM;
-                }
-                */
 
                 mxb->cur_input = input;
 
-                saa7146_set_hps_source_and_sync(dev, input_port_selection[input].hps_source, input_port_selection[input].hps_sync);
+                saa7146_set_hps_source_and_sync(dev, input_port_selection[input].hps_source,
+                                input_port_selection[input].hps_sync);
 
                 /* prepare switching of tea6415c and saa7111a;
                    have a look at the 'background'-file for further informations  */
-                switch( input ) {
-
-                        case TUNER:
-                        {
-                                i = 0;
-                                vm.in  = 3;
-                                vm.out = 17;
-
-                        if ( 0 != mxb->tea6415c->driver->command(mxb->tea6415c,TEA6415C_SWITCH, &vm)) {
-                                        printk("VIDIOC_S_INPUT: could not address tea6415c #1\n");
-                                        return -EFAULT;
-                                }
-                                /* connect tuner-output always to multicable */
-                                vm.in  = 3;
-                                vm.out = 13;
-                                break;
-                        }
-                        case AUX3_YC:
-                        {
-                                /* nothing to be done here. aux3_yc is
-                                   directly connected to the saa711a */
-                                i = 5;
-                                break;
-                        }
-                        case AUX3:
-                        {
-                                /* nothing to be done here. aux3 is
-                                   directly connected to the saa711a */
-                                i = 1;
-                                break;
-                        }
-                        case AUX1:
-                        {
-                                i = 0;
-                                vm.in  = 1;
-                                vm.out = 17;
-                                break;
+                switch (input) {
+                case TUNER:
+                        i = SAA7115_COMPOSITE0;
+                        vm.in  = 3;
+                        vm.out = 17;
+
+                        if (mxb->tea6415c->driver->command(mxb->tea6415c, TEA6415C_SWITCH, &vm)) {
+                                printk(KERN_ERR "VIDIOC_S_INPUT: could not address tea6415c #1\n");
+                                return -EFAULT;
                         }
+                        /* connect tuner-output always to multicable */
+                        vm.in  = 3;
+                        vm.out = 13;
+                        break;
+                case AUX3_YC:
+                        /* nothing to be done here. aux3_yc is
+                           directly connected to the saa711a */
+                        i = SAA7115_SVIDEO1;
+                        break;
+                case AUX3:
+                        /* nothing to be done here. aux3 is
+                           directly connected to the saa711a */
+                        i = SAA7115_COMPOSITE1;
+                        break;
+                case AUX1:
+                        i = SAA7115_COMPOSITE0;
+                        vm.in  = 1;
+                        vm.out = 17;
+                        break;
                 }
 
                 /* switch video in tea6415c only if necessary */
-                switch( input ) {
-                        case TUNER:
-                        case AUX1:
-                        {
-                                if ( 0 != mxb->tea6415c->driver->command(mxb->tea6415c,TEA6415C_SWITCH, &vm)) {
-                                        printk("VIDIOC_S_INPUT: could not address tea6415c #3\n");
-                                        return -EFAULT;
-                                }
-                                break;
-                        }
-                        default:
-                        {
-                                break;
+                switch (input) {
+                case TUNER:
+                case AUX1:
+                        if (mxb->tea6415c->driver->command(mxb->tea6415c, TEA6415C_SWITCH, &vm)) {
+                                printk(KERN_ERR "VIDIOC_S_INPUT: could not address tea6415c #3\n");
+                                return -EFAULT;
                         }
+                        break;
+                default:
+                        break;
                 }
 
                 /* switch video in saa7111a */
-                if ( 0 != mxb->saa7111a->driver->command(mxb->saa7111a,DECODER_SET_INPUT, &i)) {
+                route.input = i;
+                route.output = 0;
+                if (mxb->saa7111a->driver->command(mxb->saa7111a, VIDIOC_INT_S_VIDEO_ROUTING, &route))
                         printk("VIDIOC_S_INPUT: could not address saa7111a #1.\n");
-                }
 
                 /* switch the audio-source only if necessary */
                 if( 0 == mxb->cur_mute ) {
-                        mxb->tea6420_1->driver->command(mxb->tea6420_1,TEA6420_SWITCH, &TEA6420_line[video_audio_connect[input]][0]);
-                        mxb->tea6420_2->driver->command(mxb->tea6420_2,TEA6420_SWITCH, &TEA6420_line[video_audio_connect[input]][1]);
+                        mxb->tea6420_1->driver->command(mxb->tea6420_1, TEA6420_SWITCH,
+                                        &TEA6420_line[video_audio_connect[input]][0]);
+                        mxb->tea6420_2->driver->command(mxb->tea6420_2, TEA6420_SWITCH,
+                                       &TEA6420_line[video_audio_connect[input]][1]);
                 }
 
                 return 0;
@@ -727,114 +667,44 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
         case VIDIOC_G_TUNER:
         {
                 struct v4l2_tuner *t = arg;
-                int byte = 0;
 
-                if( 0 != t->index ) {
+                if (t->index) {
                         DEB_D(("VIDIOC_G_TUNER: channel %d does not have a tuner attached.\n", t->index));
                         return -EINVAL;
                 }
 
                 DEB_EE(("VIDIOC_G_TUNER: %d\n", t->index));
 
-                memset(t,0,sizeof(*t));
-                strcpy(t->name, "Television");
+                memset(t, 0, sizeof(*t));
+                i2c_clients_command(&mxb->i2c_adapter, cmd, arg);
 
+                strlcpy(t->name, "TV Tuner", sizeof(t->name));
                 t->type = V4L2_TUNER_ANALOG_TV;
-                t->capability = V4L2_TUNER_CAP_NORM | V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2 | V4L2_TUNER_CAP_SAP;
-                t->rangelow = 772;      /* 48.25 MHZ / 62.5 kHz = 772, see fi1216mk2-specs, page 2 */
-                t->rangehigh = 13684;   /* 855.25 MHz / 62.5 kHz = 13684 */
-                /* FIXME: add the real signal strength here */
-                t->signal = 0xffff;
-                t->afc = 0;
-
-                mxb->tda9840->driver->command(mxb->tda9840,TDA9840_DETECT, &byte);
+                t->capability = V4L2_TUNER_CAP_NORM | V4L2_TUNER_CAP_STEREO | \
+                        V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2 | V4L2_TUNER_CAP_SAP;
                 t->audmode = mxb->cur_mode;
-
-                if( byte < 0 ) {
-                        t->rxsubchans  = V4L2_TUNER_SUB_MONO;
-                } else {
-                        switch(byte) {
-                                case TDA9840_MONO_DETECT: {
-                                        t->rxsubchans   = V4L2_TUNER_SUB_MONO;
-                                        DEB_D(("VIDIOC_G_TUNER: V4L2_TUNER_MODE_MONO.\n"));
-                                        break;
-                                }
-                                case TDA9840_DUAL_DETECT: {
-                                        t->rxsubchans   = V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2;
-                                        DEB_D(("VIDIOC_G_TUNER: V4L2_TUNER_MODE_LANG1.\n"));
-                                        break;
-                                }
-                                case TDA9840_STEREO_DETECT: {
-                                        t->rxsubchans   = V4L2_TUNER_SUB_STEREO | V4L2_TUNER_SUB_MONO;
-                                        DEB_D(("VIDIOC_G_TUNER: V4L2_TUNER_MODE_STEREO.\n"));
-                                        break;
-                                }
-                                default: { /* TDA9840_INCORRECT_DETECT */
-                                        t->rxsubchans   = V4L2_TUNER_MODE_MONO;
-                                        DEB_D(("VIDIOC_G_TUNER: TDA9840_INCORRECT_DETECT => V4L2_TUNER_MODE_MONO\n"));
-                                        break;
-                                }
-                        }
-                }
-
                 return 0;
         }
         case VIDIOC_S_TUNER:
         {
                 struct v4l2_tuner *t = arg;
-                int result = 0;
-                int byte = 0;
 
-                if( 0 != t->index ) {
+                if (t->index) {
                         DEB_D(("VIDIOC_S_TUNER: channel %d does not have a tuner attached.\n",t->index));
                         return -EINVAL;
                 }
 
-                switch(t->audmode) {
-                        case V4L2_TUNER_MODE_STEREO: {
-                                mxb->cur_mode = V4L2_TUNER_MODE_STEREO;
-                                byte = TDA9840_SET_STEREO;
-                                DEB_D(("VIDIOC_S_TUNER: V4L2_TUNER_MODE_STEREO\n"));
-                                break;
-                        }
-                        case V4L2_TUNER_MODE_LANG1_LANG2: {
-                                mxb->cur_mode = V4L2_TUNER_MODE_LANG1_LANG2;
-                                byte = TDA9840_SET_BOTH;
-                                DEB_D(("VIDIOC_S_TUNER: V4L2_TUNER_MODE_LANG1_LANG2\n"));
-                                break;
-                        }
-                        case V4L2_TUNER_MODE_LANG1: {
-                                mxb->cur_mode = V4L2_TUNER_MODE_LANG1;
-                                byte = TDA9840_SET_LANG1;
-                                DEB_D(("VIDIOC_S_TUNER: V4L2_TUNER_MODE_LANG1\n"));
-                                break;
-                        }
-                        case V4L2_TUNER_MODE_LANG2: {
-                                mxb->cur_mode = V4L2_TUNER_MODE_LANG2;
-                                byte = TDA9840_SET_LANG2;
-                                DEB_D(("VIDIOC_S_TUNER: V4L2_TUNER_MODE_LANG2\n"));
-                                break;
-                        }
-                        default: { /* case V4L2_TUNER_MODE_MONO: {*/
-                                mxb->cur_mode = V4L2_TUNER_MODE_MONO;
-                                byte = TDA9840_SET_MONO;
-                                DEB_D(("VIDIOC_S_TUNER: TDA9840_SET_MONO\n"));
-                                break;
-                        }
-                }
-
-                if( 0 != (result = mxb->tda9840->driver->command(mxb->tda9840, TDA9840_SWITCH, &byte))) {
-                        printk("VIDIOC_S_TUNER error. result:%d, byte:%d\n",result,byte);
-                }
-
+                mxb->cur_mode = t->audmode;
+                i2c_clients_command(&mxb->i2c_adapter, cmd, arg);
                 return 0;
         }
         case VIDIOC_G_FREQUENCY:
         {
                 struct v4l2_frequency *f = arg;
 
-                if(0 != mxb->cur_input) {
-                        DEB_D(("VIDIOC_G_FREQ: channel %d does not have a tuner!\n",mxb->cur_input));
+                if (mxb->cur_input) {
+                        DEB_D(("VIDIOC_G_FREQ: channel %d does not have a tuner!\n",
+                                                mxb->cur_input));
                         return -EINVAL;
                 }
 
@@ -847,14 +717,14 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
         {
                 struct v4l2_frequency *f = arg;
 
-                if (0 != f->tuner)
+                if (f->tuner)
                         return -EINVAL;
 
                 if (V4L2_TUNER_ANALOG_TV != f->type)
                         return -EINVAL;
 
-                if(0 != mxb->cur_input) {
-                        DEB_D(("VIDIOC_S_FREQ: channel %d does not have a tuner!\n",mxb->cur_input));
+                if (mxb->cur_input) {
+                        DEB_D(("VIDIOC_S_FREQ: channel %d does not have a tuner!\n", mxb->cur_input));
                         return -EINVAL;
                 }
 
@@ -875,7 +745,7 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
         {
                 int i = *(int*)arg;
 
-                if( i < 0 || i >= MXB_AUDIOS ) {
+                if (i < 0 || i >= MXB_AUDIOS) {
                         DEB_D(("illegal argument to MXB_S_AUDIO_CD: i:%d.\n",i));
                         return -EINVAL;
                 }
@@ -891,7 +761,7 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
         {
                 int i = *(int*)arg;
 
-                if( i < 0 || i >= MXB_AUDIOS ) {
+                if (i < 0 || i >= MXB_AUDIOS) {
                         DEB_D(("illegal argument to MXB_S_AUDIO_LINE: i:%d.\n",i));
                         return -EINVAL;
                 }
@@ -906,12 +776,12 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
         {
                 struct v4l2_audio *a = arg;
 
-                if( a->index < 0 || a->index > MXB_INPUTS ) {
-                        DEB_D(("VIDIOC_G_AUDIO %d out of range.\n",a->index));
+                if (a->index < 0 || a->index > MXB_INPUTS) {
+                        DEB_D(("VIDIOC_G_AUDIO %d out of range.\n", a->index));
                         return -EINVAL;
                 }
 
-                DEB_EE(("VIDIOC_G_AUDIO %d.\n",a->index));
+                DEB_EE(("VIDIOC_G_AUDIO %d.\n", a->index));
                 memcpy(a, &mxb_audios[video_audio_connect[mxb->cur_input]], sizeof(struct v4l2_audio));
 
                 return 0;
@@ -919,9 +789,16 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
         case VIDIOC_S_AUDIO:
         {
                 struct v4l2_audio *a = arg;
-                DEB_D(("VIDIOC_S_AUDIO %d.\n",a->index));
+
+                DEB_D(("VIDIOC_S_AUDIO %d.\n", a->index));
                 return 0;
         }
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+        case VIDIOC_DBG_S_REGISTER:
+        case VIDIOC_DBG_G_REGISTER:
+                i2c_clients_command(&mxb->i2c_adapter, cmd, arg);
+                return 0;
+#endif
         default:
 /*
                 DEB2(printk("does not handle this ioctl.\n"));
@@ -944,7 +821,7 @@ static int std_callback(struct saa7146_dev *dev, struct saa7146_standard *standa
                 /* set the 7146 gpio register -- I don't know what this does exactly */
                 saa7146_write(dev, GPIO_CTRL, 0x00404050);
                 /* unset the 7111 gpio register -- I don't know what this does exactly */
-                mxb->saa7111a->driver->command(mxb->saa7111a, DECODER_SET_GPIO, &zero);
+                mxb->saa7111a->driver->command(mxb->saa7111a, VIDIOC_INT_S_GPIO, &zero);
                 mxb->tuner->driver->command(mxb->tuner, VIDIOC_S_STD, &std);
         } else {
                 v4l2_std_id std = V4L2_STD_PAL_BG;
@@ -953,7 +830,7 @@ static int std_callback(struct saa7146_dev *dev, struct saa7146_standard *standa
                 /* set the 7146 gpio register -- I don't know what this does exactly */
                 saa7146_write(dev, GPIO_CTRL, 0x00404050);
                 /* set the 7111 gpio register -- I don't know what this does exactly */
-                mxb->saa7111a->driver->command(mxb->saa7111a, DECODER_SET_GPIO, &one);
+                mxb->saa7111a->driver->command(mxb->saa7111a, VIDIOC_INT_S_GPIO, &one);
                 mxb->tuner->driver->command(mxb->tuner, VIDIOC_S_STD, &std);
         }
         return 0;
@@ -1029,7 +906,7 @@ static struct saa7146_extension extension = {
 
 static int __init mxb_init_module(void)
 {
-        if( 0 != saa7146_register_extension(&extension)) {
+        if (saa7146_register_extension(&extension)) {
                 DEB_S(("failed to register extension.\n"));
                 return -ENODEV;
         }
diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c
index c6852402c5e9..935d73de57bd 100644
--- a/drivers/media/video/ov511.c
+++ b/drivers/media/video/ov511.c
@@ -974,14 +974,14 @@ dump_i2c_range(struct usb_ov511 *ov, int reg1, int regn)
 
         for (i = reg1; i <= regn; i++) {
                 rc = i2c_r(ov, i);
-                info("Sensor[0x%02X] = 0x%02X", i, rc);
+                dev_info(&ov->dev->dev, "Sensor[0x%02X] = 0x%02X\n", i, rc);
         }
 }
 
 static void
 dump_i2c_regs(struct usb_ov511 *ov)
 {
-        info("I2C REGS");
+        dev_info(&ov->dev->dev, "I2C REGS\n");
         dump_i2c_range(ov, 0x00, 0x7C);
 }
 
@@ -992,28 +992,28 @@ dump_reg_range(struct usb_ov511 *ov, int reg1, int regn)
 
         for (i = reg1; i <= regn; i++) {
                 rc = reg_r(ov, i);
-                info("OV511[0x%02X] = 0x%02X", i, rc);
+                dev_info(&ov->dev->dev, "OV511[0x%02X] = 0x%02X\n", i, rc);
         }
 }
 
 static void
 ov511_dump_regs(struct usb_ov511 *ov)
 {
-        info("CAMERA INTERFACE REGS");
+        dev_info(&ov->dev->dev, "CAMERA INTERFACE REGS\n");
         dump_reg_range(ov, 0x10, 0x1f);
-        info("DRAM INTERFACE REGS");
+        dev_info(&ov->dev->dev, "DRAM INTERFACE REGS\n");
         dump_reg_range(ov, 0x20, 0x23);
-        info("ISO FIFO REGS");
+        dev_info(&ov->dev->dev, "ISO FIFO REGS\n");
         dump_reg_range(ov, 0x30, 0x31);
-        info("PIO REGS");
+        dev_info(&ov->dev->dev, "PIO REGS\n");
         dump_reg_range(ov, 0x38, 0x39);
         dump_reg_range(ov, 0x3e, 0x3e);
-        info("I2C REGS");
+        dev_info(&ov->dev->dev, "I2C REGS\n");
         dump_reg_range(ov, 0x40, 0x49);
-        info("SYSTEM CONTROL REGS");
+        dev_info(&ov->dev->dev, "SYSTEM CONTROL REGS\n");
         dump_reg_range(ov, 0x50, 0x55);
         dump_reg_range(ov, 0x5e, 0x5f);
-        info("OmniCE REGS");
+        dev_info(&ov->dev->dev, "OmniCE REGS\n");
         dump_reg_range(ov, 0x70, 0x79);
         /* NOTE: Quantization tables are not readable. You will get the value
          * in reg. 0x79 for every table register */
@@ -1025,25 +1025,25 @@ ov511_dump_regs(struct usb_ov511 *ov)
 static void
 ov518_dump_regs(struct usb_ov511 *ov)
 {
-        info("VIDEO MODE REGS");
+        dev_info(&ov->dev->dev, "VIDEO MODE REGS\n");
         dump_reg_range(ov, 0x20, 0x2f);
-        info("DATA PUMP AND SNAPSHOT REGS");
+        dev_info(&ov->dev->dev, "DATA PUMP AND SNAPSHOT REGS\n");
         dump_reg_range(ov, 0x30, 0x3f);
-        info("I2C REGS");
+        dev_info(&ov->dev->dev, "I2C REGS\n");
         dump_reg_range(ov, 0x40, 0x4f);
-        info("SYSTEM CONTROL AND VENDOR REGS");
+        dev_info(&ov->dev->dev, "SYSTEM CONTROL AND VENDOR REGS\n");
         dump_reg_range(ov, 0x50, 0x5f);
-        info("60 - 6F");
+        dev_info(&ov->dev->dev, "60 - 6F\n");
         dump_reg_range(ov, 0x60, 0x6f);
-        info("70 - 7F");
+        dev_info(&ov->dev->dev, "70 - 7F\n");
         dump_reg_range(ov, 0x70, 0x7f);
-        info("Y QUANTIZATION TABLE");
+        dev_info(&ov->dev->dev, "Y QUANTIZATION TABLE\n");
         dump_reg_range(ov, 0x80, 0x8f);
-        info("UV QUANTIZATION TABLE");
+        dev_info(&ov->dev->dev, "UV QUANTIZATION TABLE\n");
         dump_reg_range(ov, 0x90, 0x9f);
-        info("A0 - BF");
+        dev_info(&ov->dev->dev, "A0 - BF\n");
         dump_reg_range(ov, 0xa0, 0xbf);
-        info("CBR");
+        dev_info(&ov->dev->dev, "CBR\n");
         dump_reg_range(ov, 0xc0, 0xcf);
 }
 #endif
@@ -3205,9 +3205,10 @@ ov511_move_data(struct usb_ov511 *ov, unsigned char *in, int n)
          */
 
         if (printph) {
-                info("ph(%3d): %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x",
-                     pnum, in[0], in[1], in[2], in[3], in[4], in[5], in[6],
-                     in[7], in[8], in[9], in[10], in[11]);
+                dev_info(&ov->dev->dev,
+                         "ph(%3d): %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x\n",
+                         pnum, in[0], in[1], in[2], in[3], in[4], in[5], in[6],
+                         in[7], in[8], in[9], in[10], in[11]);
         }
 
         /* Check for SOF/EOF packet */
@@ -3366,8 +3367,10 @@ ov518_move_data(struct usb_ov511 *ov, unsigned char *in, int n)
          * the definitive SOF/EOF format */
         if ((!(in[0] | in[1] | in[2] | in[3] | in[5])) && in[6]) {
                 if (printph) {
-                        info("ph: %2x %2x %2x %2x %2x %2x %2x %2x", in[0],
-                             in[1], in[2], in[3], in[4], in[5], in[6], in[7]);
+                        dev_info(&ov->dev->dev,
+                                 "ph: %2x %2x %2x %2x %2x %2x %2x %2x\n",
+                                 in[0], in[1], in[2], in[3], in[4], in[5],
+                                 in[6], in[7]);
                 }
 
                 if (frame->scanstate == STATE_LINES) {
@@ -3646,14 +3649,16 @@ ov51x_init_isoc(struct usb_ov511 *ov)
                 if (packetsize == -1) {
                         ov518_set_packet_size(ov, 640);
                 } else {
-                        info("Forcing packet size to %d", packetsize);
+                        dev_info(&ov->dev->dev, "Forcing packet size to %d\n",
+                                 packetsize);
                         ov518_set_packet_size(ov, packetsize);
                 }
         } else {
                 if (packetsize == -1) {
                         ov511_set_packet_size(ov, size);
                 } else {
-                        info("Forcing packet size to %d", packetsize);
+                        dev_info(&ov->dev->dev, "Forcing packet size to %d\n",
+                                 packetsize);
                         ov511_set_packet_size(ov, packetsize);
                 }
         }
@@ -4121,7 +4126,7 @@ ov51x_v4l1_ioctl_internal(struct inode *inode, struct file *file,
                         return -EIO;
 
                 if (force_palette && p->palette != force_palette) {
-                        info("Palette rejected (%s)",
+                        dev_info(&ov->dev->dev, "Palette rejected (%s)\n",
                              symbolic(v4l1_plist, p->palette));
                         return -EINVAL;
                 }
@@ -4849,26 +4854,27 @@ ov7xx0_configure(struct usb_ov511 *ov)
                 err("Error detecting sensor type");
                 return -1;
         } else if ((rc & 3) == 3) {
-                info("Sensor is an OV7610");
+                dev_info(&ov->dev->dev, "Sensor is an OV7610\n");
                 ov->sensor = SEN_OV7610;
         } else if ((rc & 3) == 1) {
                 /* I don't know what's different about the 76BE yet. */
                 if (i2c_r(ov, 0x15) & 1)
-                        info("Sensor is an OV7620AE");
+                        dev_info(&ov->dev->dev, "Sensor is an OV7620AE\n");
                 else
-                        info("Sensor is an OV76BE");
+                        dev_info(&ov->dev->dev, "Sensor is an OV76BE\n");
 
                 /* OV511+ will return all zero isoc data unless we
                  * configure the sensor as a 7620. Someone needs to
                  * find the exact reg. setting that causes this. */
                 if (ov->bridge == BRG_OV511PLUS) {
-                        info("Enabling 511+/7620AE workaround");
+                        dev_info(&ov->dev->dev,
+                                 "Enabling 511+/7620AE workaround\n");
                         ov->sensor = SEN_OV7620;
                 } else {
                         ov->sensor = SEN_OV76BE;
                 }
         } else if ((rc & 3) == 0) {
-                info("Sensor is an OV7620");
+                dev_info(&ov->dev->dev, "Sensor is an OV7620\n");
                 ov->sensor = SEN_OV7620;
         } else {
                 err("Unknown image sensor version: %d", rc & 3);
@@ -5024,16 +5030,16 @@ ov6xx0_configure(struct usb_ov511 *ov)
 
         if ((rc & 3) == 0) {
                 ov->sensor = SEN_OV6630;
-                info("Sensor is an OV6630");
+                dev_info(&ov->dev->dev, "Sensor is an OV6630\n");
         } else if ((rc & 3) == 1) {
                 ov->sensor = SEN_OV6620;
-                info("Sensor is an OV6620");
+                dev_info(&ov->dev->dev, "Sensor is an OV6620\n");
         } else if ((rc & 3) == 2) {
                 ov->sensor = SEN_OV6630;
-                info("Sensor is an OV6630AE");
+                dev_info(&ov->dev->dev, "Sensor is an OV6630AE\n");
         } else if ((rc & 3) == 3) {
                 ov->sensor = SEN_OV6630;
-                info("Sensor is an OV6630AF");
+                dev_info(&ov->dev->dev, "Sensor is an OV6630AF\n");
         }
 
         /* Set sensor-specific vars */
@@ -5088,10 +5094,10 @@ ks0127_configure(struct usb_ov511 *ov)
                         err("Error detecting sensor type");
                         return -1;
                 } else if ((rc & 0x0f) == 0) {
-                        info("Sensor is a KS0127");
+                        dev_info(&ov->dev->dev, "Sensor is a KS0127\n");
                         ov->sensor = SEN_KS0127;
                 } else if ((rc & 0x0f) == 9) {
-                        info("Sensor is a KS0127B Rev. A");
+                        dev_info(&ov->dev->dev, "Sensor is a KS0127B Rev. A\n");
                         ov->sensor = SEN_KS0127B;
                 }
         } else {
@@ -5200,7 +5206,8 @@ saa7111a_configure(struct usb_ov511 *ov)
                 err("Error detecting sensor version");
                 return -1;
         } else {
-                info("Sensor is an SAA7111A (version 0x%x)", rc);
+                dev_info(&ov->dev->dev,
+                         "Sensor is an SAA7111A (version 0x%x)\n", rc);
                 ov->sensor = SEN_SAA7111A;
         }
 
@@ -5262,7 +5269,7 @@ ov511_configure(struct usb_ov511 *ov)
 
         PDEBUG (1, "CustomID = %d", ov->customid);
         ov->desc = symbolic(camlist, ov->customid);
-        info("model: %s", ov->desc);
+        dev_info(&ov->dev->dev, "model: %s\n", ov->desc);
 
         if (0 == strcmp(ov->desc, NOT_DEFINED_STR)) {
                 err("Camera type (%d) not recognized", ov->customid);
@@ -5426,7 +5433,8 @@ ov518_configure(struct usb_ov511 *ov)
         PDEBUG(4, "");
 
         /* First 5 bits of custom ID reg are a revision ID on OV518 */
-        info("Device revision %d", 0x1F & reg_r(ov, R511_SYS_CUST_ID));
+        dev_info(&ov->dev->dev, "Device revision %d\n",
+                 0x1F & reg_r(ov, R511_SYS_CUST_ID));
 
         /* Give it the default description */
         ov->desc = symbolic(camlist, 0);
@@ -5773,7 +5781,8 @@ ov51x_probe(struct usb_interface *intf, const struct usb_device_id *id)
                 goto error;
         }
 
-        info("USB %s video device found", symbolic(brglist, ov->bridge));
+        dev_info(&intf->dev, "USB %s video device found\n",
+                 symbolic(brglist, ov->bridge));
 
         init_waitqueue_head(&ov->wq);
 
@@ -5854,8 +5863,8 @@ ov51x_probe(struct usb_interface *intf, const struct usb_device_id *id)
                 goto error;
         }
 
-        info("Device at %s registered to minor %d", ov->usb_path,
-             ov->vdev->minor);
+        dev_info(&intf->dev, "Device at %s registered to minor %d\n",
+                 ov->usb_path, ov->vdev->minor);
 
         usb_set_intfdata(intf, ov);
         if (ov_create_sysfs(ov->vdev)) {
@@ -5958,7 +5967,8 @@ usb_ov511_init(void)
         if (retval)
                 goto out;
 
-        info(DRIVER_VERSION " : " DRIVER_DESC);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
 
 out:
         return retval;
@@ -5968,8 +5978,7 @@ static void __exit
 usb_ov511_exit(void)
 {
         usb_deregister(&ov511_driver);
-        info("driver deregistered");
-
+        printk(KERN_INFO KBUILD_MODNAME ": driver deregistered\n");
 }
 
 module_init(usb_ov511_init);
diff --git a/drivers/media/video/ov511.h b/drivers/media/video/ov511.h
index baded1262ca9..70d99e52329d 100644
--- a/drivers/media/video/ov511.h
+++ b/drivers/media/video/ov511.h
@@ -12,7 +12,8 @@
 
 #ifdef OV511_DEBUG
         #define PDEBUG(level, fmt, args...) \
-                if (debug >= (level)) info("[%s:%d] " fmt, \
+                if (debug >= (level))   \
+                        printk(KERN_INFO KBUILD_MODNAME "[%s:%d] \n" fmt, \
                 __func__, __LINE__ , ## args)
 #else
         #define PDEBUG(level, fmt, args...) do {} while(0)
diff --git a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c
index 065c2454113e..2c4acbf5a4fe 100644
--- a/drivers/media/video/ovcamchip/ovcamchip_core.c
+++ b/drivers/media/video/ovcamchip/ovcamchip_core.c
@@ -49,12 +49,6 @@ MODULE_LICENSE("GPL");
 #define GENERIC_REG_ID_LOW        0x1D  /* manufacturer ID LSB */
 #define GENERIC_REG_COM_I         0x29  /* misc ID bits */
 
-extern struct ovcamchip_ops ov6x20_ops;
-extern struct ovcamchip_ops ov6x30_ops;
-extern struct ovcamchip_ops ov7x10_ops;
-extern struct ovcamchip_ops ov7x20_ops;
-extern struct ovcamchip_ops ov76be_ops;
-
 static char *chip_names[NUM_CC_TYPES] = {
         [CC_UNKNOWN]    = "Unknown chip",
         [CC_OV76BE]     = "OV76BE",
diff --git a/drivers/media/video/ovcamchip/ovcamchip_priv.h b/drivers/media/video/ovcamchip/ovcamchip_priv.h
index 9afa4fe47726..a05650faedda 100644
--- a/drivers/media/video/ovcamchip/ovcamchip_priv.h
+++ b/drivers/media/video/ovcamchip/ovcamchip_priv.h
@@ -53,6 +53,12 @@ struct ovcamchip {
         int initialized;           /* OVCAMCHIP_CMD_INITIALIZE was successful */
 };
 
+extern struct ovcamchip_ops ov6x20_ops;
+extern struct ovcamchip_ops ov6x30_ops;
+extern struct ovcamchip_ops ov7x10_ops;
+extern struct ovcamchip_ops ov7x20_ops;
+extern struct ovcamchip_ops ov76be_ops;
+
 /* --------------------------------- */
 /*              I2C I/O              */
 /* --------------------------------- */
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c
index 7c84f795db54..994807818aa2 100644
--- a/drivers/media/video/pms.c
+++ b/drivers/media/video/pms.c
@@ -47,6 +47,7 @@ struct pms_device
         struct video_picture picture;
         int height;
         int width;
+        unsigned long in_use;
         struct mutex lock;
 };
 
@@ -881,10 +882,27 @@ static ssize_t pms_read(struct file *file, char __user *buf,
         return len;
 }
 
+static int pms_exclusive_open(struct inode *inode, struct file *file)
+{
+        struct video_device *v = video_devdata(file);
+        struct pms_device *pd = (struct pms_device *)v;
+
+        return test_and_set_bit(0, &pd->in_use) ? -EBUSY : 0;
+}
+
+static int pms_exclusive_release(struct inode *inode, struct file *file)
+{
+        struct video_device *v = video_devdata(file);
+        struct pms_device *pd = (struct pms_device *)v;
+
+        clear_bit(0, &pd->in_use);
+        return 0;
+}
+
 static const struct file_operations pms_fops = {
         .owner          = THIS_MODULE,
-        .open           = video_exclusive_open,
-        .release        = video_exclusive_release,
+        .open           = pms_exclusive_open,
+        .release        = pms_exclusive_release,
         .ioctl          = pms_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
@@ -897,6 +915,7 @@ static struct video_device pms_template=
 {
         .name           = "Mediavision PMS",
         .fops           = &pms_fops,
+        .release        = video_device_release_empty,
 };
 
 static struct pms_device pms_device;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
index 0764fbfffb73..203f54cd18a1 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
@@ -134,13 +134,17 @@ int pvr2_ctrl_get_min(struct pvr2_ctrl *cptr)
 
 
 /* Retrieve control's default value (any type) */
-int pvr2_ctrl_get_def(struct pvr2_ctrl *cptr)
+int pvr2_ctrl_get_def(struct pvr2_ctrl *cptr, int *valptr)
 {
         int ret = 0;
         if (!cptr) return 0;
         LOCK_TAKE(cptr->hdw->big_lock); do {
                 if (cptr->info->type == pvr2_ctl_int) {
-                        ret = cptr->info->default_value;
+                        if (cptr->info->get_def_value) {
+                                ret = cptr->info->get_def_value(cptr, valptr);
+                        } else {
+                                *valptr = cptr->info->default_value;
+                        }
                 }
         } while(0); LOCK_GIVE(cptr->hdw->big_lock);
         return ret;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-ctrl.h b/drivers/media/video/pvrusb2/pvrusb2-ctrl.h
index 0371ae6e6e4e..794ff90121c7 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-ctrl.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-ctrl.h
@@ -49,7 +49,7 @@ int pvr2_ctrl_get_max(struct pvr2_ctrl *);
 int pvr2_ctrl_get_min(struct pvr2_ctrl *);
 
 /* Retrieve control's default value (any type) */
-int pvr2_ctrl_get_def(struct pvr2_ctrl *);
+int pvr2_ctrl_get_def(struct pvr2_ctrl *, int *valptr);
 
 /* Retrieve control's enumeration count (enum only) */
 int pvr2_ctrl_get_cnt(struct pvr2_ctrl *);
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
index 657f861593b3..de7ee7264be6 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
@@ -82,6 +82,7 @@ struct pvr2_ctl_info {
 
         /* Control's implementation */
         pvr2_ctlf_get_value get_value;      /* Get its value */
+        pvr2_ctlf_get_value get_def_value;  /* Get its default value */
         pvr2_ctlf_get_value get_min_value;  /* Get minimum allowed value */
         pvr2_ctlf_get_value get_max_value;  /* Get maximum allowed value */
         pvr2_ctlf_set_value set_value;      /* Set its value */
@@ -307,6 +308,10 @@ struct pvr2_hdw {
         struct v4l2_tuner tuner_signal_info;
         int tuner_signal_stale;
 
+        /* Cropping capability info */
+        struct v4l2_cropcap cropcap_info;
+        int cropcap_stale;
+
         /* Video standard handling */
         v4l2_std_id std_mask_eeprom; // Hardware supported selections
         v4l2_std_id std_mask_avail;  // Which standards we may select from
@@ -367,6 +372,10 @@ struct pvr2_hdw {
         VCREATE_DATA(bass);
         VCREATE_DATA(treble);
         VCREATE_DATA(mute);
+        VCREATE_DATA(cropl);
+        VCREATE_DATA(cropt);
+        VCREATE_DATA(cropw);
+        VCREATE_DATA(croph);
         VCREATE_DATA(input);
         VCREATE_DATA(audiomode);
         VCREATE_DATA(res_hor);
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index f051c6aa7f1f..94265bd3d926 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -298,6 +298,7 @@ static int pvr2_send_request_ex(struct pvr2_hdw *hdw,
                                 unsigned int timeout,int probe_fl,
                                 void *write_data,unsigned int write_len,
                                 void *read_data,unsigned int read_len);
+static int pvr2_hdw_check_cropcap(struct pvr2_hdw *hdw);
 
 
 static void trace_stbit(const char *name,int val)
@@ -402,6 +403,194 @@ static int ctrl_freq_set(struct pvr2_ctrl *cptr,int m,int v)
         return 0;
 }
 
+static int ctrl_cropl_min_get(struct pvr2_ctrl *cptr, int *left)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *left = cap->bounds.left;
+        return 0;
+}
+
+static int ctrl_cropl_max_get(struct pvr2_ctrl *cptr, int *left)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *left = cap->bounds.left;
+        if (cap->bounds.width > cptr->hdw->cropw_val) {
+                *left += cap->bounds.width - cptr->hdw->cropw_val;
+        }
+        return 0;
+}
+
+static int ctrl_cropt_min_get(struct pvr2_ctrl *cptr, int *top)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *top = cap->bounds.top;
+        return 0;
+}
+
+static int ctrl_cropt_max_get(struct pvr2_ctrl *cptr, int *top)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *top = cap->bounds.top;
+        if (cap->bounds.height > cptr->hdw->croph_val) {
+                *top += cap->bounds.height - cptr->hdw->croph_val;
+        }
+        return 0;
+}
+
+static int ctrl_cropw_max_get(struct pvr2_ctrl *cptr, int *val)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *val = 0;
+        if (cap->bounds.width > cptr->hdw->cropl_val) {
+                *val = cap->bounds.width - cptr->hdw->cropl_val;
+        }
+        return 0;
+}
+
+static int ctrl_croph_max_get(struct pvr2_ctrl *cptr, int *val)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *val = 0;
+        if (cap->bounds.height > cptr->hdw->cropt_val) {
+                *val = cap->bounds.height - cptr->hdw->cropt_val;
+        }
+        return 0;
+}
+
+static int ctrl_get_cropcapbl(struct pvr2_ctrl *cptr, int *val)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *val = cap->bounds.left;
+        return 0;
+}
+
+static int ctrl_get_cropcapbt(struct pvr2_ctrl *cptr, int *val)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *val = cap->bounds.top;
+        return 0;
+}
+
+static int ctrl_get_cropcapbw(struct pvr2_ctrl *cptr, int *val)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *val = cap->bounds.width;
+        return 0;
+}
+
+static int ctrl_get_cropcapbh(struct pvr2_ctrl *cptr, int *val)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *val = cap->bounds.height;
+        return 0;
+}
+
+static int ctrl_get_cropcapdl(struct pvr2_ctrl *cptr, int *val)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *val = cap->defrect.left;
+        return 0;
+}
+
+static int ctrl_get_cropcapdt(struct pvr2_ctrl *cptr, int *val)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *val = cap->defrect.top;
+        return 0;
+}
+
+static int ctrl_get_cropcapdw(struct pvr2_ctrl *cptr, int *val)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *val = cap->defrect.width;
+        return 0;
+}
+
+static int ctrl_get_cropcapdh(struct pvr2_ctrl *cptr, int *val)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *val = cap->defrect.height;
+        return 0;
+}
+
+static int ctrl_get_cropcappan(struct pvr2_ctrl *cptr, int *val)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *val = cap->pixelaspect.numerator;
+        return 0;
+}
+
+static int ctrl_get_cropcappad(struct pvr2_ctrl *cptr, int *val)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *val = cap->pixelaspect.denominator;
+        return 0;
+}
+
 static int ctrl_vres_max_get(struct pvr2_ctrl *cptr,int *vp)
 {
         /* Actual maximum depends on the video standard in effect. */
@@ -779,6 +968,10 @@ VCREATE_FUNCS(balance)
 VCREATE_FUNCS(bass)
 VCREATE_FUNCS(treble)
 VCREATE_FUNCS(mute)
+VCREATE_FUNCS(cropl)
+VCREATE_FUNCS(cropt)
+VCREATE_FUNCS(cropw)
+VCREATE_FUNCS(croph)
 VCREATE_FUNCS(audiomode)
 VCREATE_FUNCS(res_hor)
 VCREATE_FUNCS(res_ver)
@@ -849,6 +1042,72 @@ static const struct pvr2_ctl_info control_defs[] = {
                 .default_value = 0,
                 DEFREF(mute),
                 DEFBOOL,
+        }, {
+                .desc = "Capture crop left margin",
+                .name = "crop_left",
+                .internal_id = PVR2_CID_CROPL,
+                .default_value = 0,
+                DEFREF(cropl),
+                DEFINT(-129, 340),
+                .get_min_value = ctrl_cropl_min_get,
+                .get_max_value = ctrl_cropl_max_get,
+                .get_def_value = ctrl_get_cropcapdl,
+        }, {
+                .desc = "Capture crop top margin",
+                .name = "crop_top",
+                .internal_id = PVR2_CID_CROPT,
+                .default_value = 0,
+                DEFREF(cropt),
+                DEFINT(-35, 544),
+                .get_min_value = ctrl_cropt_min_get,
+                .get_max_value = ctrl_cropt_max_get,
+                .get_def_value = ctrl_get_cropcapdt,
+        }, {
+                .desc = "Capture crop width",
+                .name = "crop_width",
+                .internal_id = PVR2_CID_CROPW,
+                .default_value = 720,
+                DEFREF(cropw),
+                .get_max_value = ctrl_cropw_max_get,
+                .get_def_value = ctrl_get_cropcapdw,
+        }, {
+                .desc = "Capture crop height",
+                .name = "crop_height",
+                .internal_id = PVR2_CID_CROPH,
+                .default_value = 480,
+                DEFREF(croph),
+                .get_max_value = ctrl_croph_max_get,
+                .get_def_value = ctrl_get_cropcapdh,
+        }, {
+                .desc = "Capture capability pixel aspect numerator",
+                .name = "cropcap_pixel_numerator",
+                .internal_id = PVR2_CID_CROPCAPPAN,
+                .get_value = ctrl_get_cropcappan,
+        }, {
+                .desc = "Capture capability pixel aspect denominator",
+                .name = "cropcap_pixel_denominator",
+                .internal_id = PVR2_CID_CROPCAPPAD,
+                .get_value = ctrl_get_cropcappad,
+        }, {
+                .desc = "Capture capability bounds top",
+                .name = "cropcap_bounds_top",
+                .internal_id = PVR2_CID_CROPCAPBT,
+                .get_value = ctrl_get_cropcapbt,
+        }, {
+                .desc = "Capture capability bounds left",
+                .name = "cropcap_bounds_left",
+                .internal_id = PVR2_CID_CROPCAPBL,
+                .get_value = ctrl_get_cropcapbl,
+        }, {
+                .desc = "Capture capability bounds width",
+                .name = "cropcap_bounds_width",
+                .internal_id = PVR2_CID_CROPCAPBW,
+                .get_value = ctrl_get_cropcapbw,
+        }, {
+                .desc = "Capture capability bounds height",
+                .name = "cropcap_bounds_height",
+                .internal_id = PVR2_CID_CROPCAPBH,
+                .get_value = ctrl_get_cropcapbh,
         },{
                 .desc = "Video Source",
                 .name = "input",
@@ -1313,9 +1572,19 @@ int pvr2_upload_firmware2(struct pvr2_hdw *hdw)
                 if (bcnt > FIRMWARE_CHUNK_SIZE) bcnt = FIRMWARE_CHUNK_SIZE;
                 memcpy(fw_ptr, fw_entry->data + fw_done, bcnt);
                 /* Usbsnoop log shows that we must swap bytes... */
+                /* Some background info: The data being swapped here is a
+                   firmware image destined for the mpeg encoder chip that
+                   lives at the other end of a USB endpoint.  The encoder
+                   chip always talks in 32 bit chunks and its storage is
+                   organized into 32 bit words.  However from the file
+                   system to the encoder chip everything is purely a byte
+                   stream.  The firmware file's contents are always 32 bit
+                   swapped from what the encoder expects.  Thus the need
+                   always exists to swap the bytes regardless of the endian
+                   type of the host processor and therefore swab32() makes
+                   the most sense. */
                 for (icnt = 0; icnt < bcnt/4 ; icnt++)
-                        ((u32 *)fw_ptr)[icnt] =
-                                ___swab32(((u32 *)fw_ptr)[icnt]);
+                        ((u32 *)fw_ptr)[icnt] = swab32(((u32 *)fw_ptr)[icnt]);
 
                 ret |= usb_bulk_msg(hdw->usb_dev, pipe, fw_ptr,bcnt,
                                     &actual_length, HZ);
@@ -1905,7 +2174,7 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
                                  const struct usb_device_id *devid)
 {
         unsigned int idx,cnt1,cnt2,m;
-        struct pvr2_hdw *hdw;
+        struct pvr2_hdw *hdw = NULL;
         int valid_std_mask;
         struct pvr2_ctrl *cptr;
         const struct pvr2_device_desc *hdw_desc;
@@ -1915,6 +2184,16 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
 
         hdw_desc = (const struct pvr2_device_desc *)(devid->driver_info);
 
+        if (hdw_desc == NULL) {
+                pvr2_trace(PVR2_TRACE_INIT, "pvr2_hdw_create:"
+                           " No device description pointer,"
+                           " unable to continue.");
+                pvr2_trace(PVR2_TRACE_INIT, "If you have a new device type,"
+                           " please contact Mike Isely <isely@pobox.com>"
+                           " to get it included in the driver\n");
+                goto fail;
+        }
+
         hdw = kzalloc(sizeof(*hdw),GFP_KERNEL);
         pvr2_trace(PVR2_TRACE_INIT,"pvr2_hdw_create: hdw=%p, type \"%s\"",
                    hdw,hdw_desc->description);
@@ -2072,6 +2351,7 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
                         valid_std_mask;
         }
 
+        hdw->cropcap_stale = !0;
         hdw->eeprom_addr = -1;
         hdw->unit_number = -1;
         hdw->v4l_minor_number_video = -1;
@@ -2508,6 +2788,28 @@ static int pvr2_hdw_commit_execute(struct pvr2_hdw *hdw)
                 /* Can't commit anything until pathway is ok. */
                 return 0;
         }
+        /* The broadcast decoder can only scale down, so if
+         * res_*_dirty && crop window < output format ==> enlarge crop.
+         *
+         * The mpeg encoder receives fields of res_hor_val dots and
+         * res_ver_val halflines.  Limits: hor<=720, ver<=576.
+         */
+        if (hdw->res_hor_dirty && hdw->cropw_val < hdw->res_hor_val) {
+                hdw->cropw_val = hdw->res_hor_val;
+                hdw->cropw_dirty = !0;
+        } else if (hdw->cropw_dirty) {
+                hdw->res_hor_dirty = !0;           /* must rescale */
+                hdw->res_hor_val = min(720, hdw->cropw_val);
+        }
+        if (hdw->res_ver_dirty && hdw->croph_val < hdw->res_ver_val) {
+                hdw->croph_val = hdw->res_ver_val;
+                hdw->croph_dirty = !0;
+        } else if (hdw->croph_dirty) {
+                int nvres = hdw->std_mask_cur & V4L2_STD_525_60 ? 480 : 576;
+                hdw->res_ver_dirty = !0;
+                hdw->res_ver_val = min(nvres, hdw->croph_val);
+        }
+
         /* If any of the below has changed, then we can't do the update
            while the pipeline is running.  Pipeline must be paused first
            and decoder -> encoder connection be made quiescent before we
@@ -2518,6 +2820,8 @@ static int pvr2_hdw_commit_execute(struct pvr2_hdw *hdw)
                  hdw->srate_dirty ||
                  hdw->res_ver_dirty ||
                  hdw->res_hor_dirty ||
+                 hdw->cropw_dirty ||
+                 hdw->croph_dirty ||
                  hdw->input_dirty ||
                  (hdw->active_stream_type != hdw->desired_stream_type));
         if (disruptive_change && !hdw->state_pipeline_idle) {
@@ -2587,6 +2891,9 @@ static int pvr2_hdw_commit_execute(struct pvr2_hdw *hdw)
         }
 
         hdw->state_pipeline_config = !0;
+        /* Hardware state may have changed in a way to cause the cropping
+           capabilities to have changed.  So mark it stale, which will
+           cause a later re-fetch. */
         trace_stbit("state_pipeline_config",hdw->state_pipeline_config);
         return !0;
 }
@@ -2677,6 +2984,33 @@ void pvr2_hdw_execute_tuner_poll(struct pvr2_hdw *hdw)
 }
 
 
+static int pvr2_hdw_check_cropcap(struct pvr2_hdw *hdw)
+{
+        if (!hdw->cropcap_stale) {
+                return 0;
+        }
+        pvr2_i2c_core_status_poll(hdw);
+        if (hdw->cropcap_stale) {
+                return -EIO;
+        }
+        return 0;
+}
+
+
+/* Return information about cropping capabilities */
+int pvr2_hdw_get_cropcap(struct pvr2_hdw *hdw, struct v4l2_cropcap *pp)
+{
+        int stat = 0;
+        LOCK_TAKE(hdw->big_lock);
+        stat = pvr2_hdw_check_cropcap(hdw);
+        if (!stat) {
+                memcpy(pp, &hdw->cropcap_info, sizeof(hdw->cropcap_info));
+        }
+        LOCK_GIVE(hdw->big_lock);
+        return stat;
+}
+
+
 /* Return information about the tuner */
 int pvr2_hdw_get_tuner_status(struct pvr2_hdw *hdw,struct v4l2_tuner *vtp)
 {
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.h b/drivers/media/video/pvrusb2/pvrusb2-hdw.h
index c04956d304a7..49482d1f2b28 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.h
@@ -36,6 +36,16 @@
 #define PVR2_CID_FREQUENCY 6
 #define PVR2_CID_HRES 7
 #define PVR2_CID_VRES 8
+#define PVR2_CID_CROPL 9
+#define PVR2_CID_CROPT 10
+#define PVR2_CID_CROPW 11
+#define PVR2_CID_CROPH 12
+#define PVR2_CID_CROPCAPPAN 13
+#define PVR2_CID_CROPCAPPAD 14
+#define PVR2_CID_CROPCAPBL 15
+#define PVR2_CID_CROPCAPBT 16
+#define PVR2_CID_CROPCAPBW 17
+#define PVR2_CID_CROPCAPBH 18
 
 /* Legal values for the INPUT state variable */
 #define PVR2_CVAL_INPUT_TV 0
@@ -170,6 +180,9 @@ void pvr2_hdw_execute_tuner_poll(struct pvr2_hdw *);
 /* Return information about the tuner */
 int pvr2_hdw_get_tuner_status(struct pvr2_hdw *,struct v4l2_tuner *);
 
+/* Return information about cropping capabilities */
+int pvr2_hdw_get_cropcap(struct pvr2_hdw *, struct v4l2_cropcap *);
+
 /* Query device and see if it thinks it is on a high-speed USB link */
 int pvr2_hdw_is_hsm(struct pvr2_hdw *);
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
index ccdb429fc7af..94a47718e88e 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
@@ -37,8 +37,9 @@
 #define OP_VOLUME 3
 #define OP_FREQ 4
 #define OP_AUDIORATE 5
-#define OP_SIZE 6
-#define OP_LOG 7
+#define OP_CROP 6
+#define OP_SIZE 7
+#define OP_LOG 8
 
 static const struct pvr2_i2c_op * const ops[] = {
         [OP_STANDARD] = &pvr2_i2c_op_v4l2_standard,
@@ -46,6 +47,7 @@ static const struct pvr2_i2c_op * const ops[] = {
         [OP_BCSH] = &pvr2_i2c_op_v4l2_bcsh,
         [OP_VOLUME] = &pvr2_i2c_op_v4l2_volume,
         [OP_FREQ] = &pvr2_i2c_op_v4l2_frequency,
+        [OP_CROP] = &pvr2_i2c_op_v4l2_crop,
         [OP_SIZE] = &pvr2_i2c_op_v4l2_size,
         [OP_LOG] = &pvr2_i2c_op_v4l2_log,
 };
@@ -59,6 +61,7 @@ void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
                         (1 << OP_BCSH) |
                         (1 << OP_VOLUME) |
                         (1 << OP_FREQ) |
+                        (1 << OP_CROP) |
                         (1 << OP_SIZE) |
                         (1 << OP_LOG));
         cp->status_poll = pvr2_v4l2_cmd_status_poll;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
index 55f04a0b2047..16bb11902a52 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
@@ -37,6 +37,7 @@ static void set_standard(struct pvr2_hdw *hdw)
                 pvr2_i2c_core_cmd(hdw,VIDIOC_S_STD,&vs);
         }
         hdw->tuner_signal_stale = !0;
+        hdw->cropcap_stale = !0;
 }
 
 
@@ -233,6 +234,37 @@ const struct pvr2_i2c_op pvr2_i2c_op_v4l2_size = {
 };
 
 
+static void set_crop(struct pvr2_hdw *hdw)
+{
+        struct v4l2_crop crop;
+
+        memset(&crop, 0, sizeof crop);
+        crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        crop.c.left = hdw->cropl_val;
+        crop.c.top = hdw->cropt_val;
+        crop.c.height = hdw->croph_val;
+        crop.c.width = hdw->cropw_val;
+
+        pvr2_trace(PVR2_TRACE_CHIPS,
+                   "i2c v4l2 set_crop crop=%d:%d:%d:%d",
+                   crop.c.width, crop.c.height, crop.c.left, crop.c.top);
+
+        pvr2_i2c_core_cmd(hdw, VIDIOC_S_CROP, &crop);
+}
+
+static int check_crop(struct pvr2_hdw *hdw)
+{
+        return (hdw->cropl_dirty || hdw->cropt_dirty ||
+                hdw->cropw_dirty || hdw->croph_dirty);
+}
+
+const struct pvr2_i2c_op pvr2_i2c_op_v4l2_crop = {
+        .check = check_crop,
+        .update = set_crop,
+        .name = "v4l2_crop",
+};
+
+
 static void do_log(struct pvr2_hdw *hdw)
 {
         pvr2_trace(PVR2_TRACE_CHIPS,"i2c v4l2 do_log()");
@@ -263,7 +295,19 @@ void pvr2_v4l2_cmd_stream(struct pvr2_i2c_client *cp,int fl)
 
 void pvr2_v4l2_cmd_status_poll(struct pvr2_i2c_client *cp)
 {
-        pvr2_i2c_client_cmd(cp,VIDIOC_G_TUNER,&cp->hdw->tuner_signal_info);
+        int stat;
+        struct pvr2_hdw *hdw = cp->hdw;
+        if (hdw->cropcap_stale) {
+                hdw->cropcap_info.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                stat = pvr2_i2c_client_cmd(cp, VIDIOC_CROPCAP,
+                                           &hdw->cropcap_info);
+                if (stat == 0) {
+                        /* Check was successful, so the data is no
+                           longer considered stale. */
+                        hdw->cropcap_stale = 0;
+                }
+        }
+        pvr2_i2c_client_cmd(cp, VIDIOC_G_TUNER, &hdw->tuner_signal_info);
 }
 
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h
index 7fa38683b3b1..eb744a20610d 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h
@@ -29,6 +29,7 @@ extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_radio;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_bcsh;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_volume;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_frequency;
+extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_crop;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_size;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_audiomode;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_log;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
index e600576a6c4b..d6a35401fefb 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
@@ -827,7 +827,7 @@ static unsigned int pvr2_i2c_client_describe(struct pvr2_i2c_client *cp,
         if ((detail & PVR2_I2C_DETAIL_CTLMASK) && cp->ctl_mask) {
                 unsigned int idx;
                 unsigned long msk,sm;
-                int spcfl;
+
                 bcnt = scnprintf(buf,maxlen," [");
                 ccnt += bcnt; buf += bcnt; maxlen -= bcnt;
                 sm = 0;
@@ -891,6 +891,7 @@ static int pvr2_i2c_attach_inform(struct i2c_client *client)
         INIT_LIST_HEAD(&cp->list);
         cp->client = client;
         mutex_lock(&hdw->i2c_list_lock); do {
+                hdw->cropcap_stale = !0;
                 list_add_tail(&cp->list,&hdw->i2c_clients);
                 hdw->i2c_pend_types |= PVR2_I2C_PEND_DETECT;
         } while (0); mutex_unlock(&hdw->i2c_list_lock);
@@ -905,6 +906,7 @@ static int pvr2_i2c_detach_inform(struct i2c_client *client)
         unsigned long amask = 0;
         int foundfl = 0;
         mutex_lock(&hdw->i2c_list_lock); do {
+                hdw->cropcap_stale = !0;
                 list_for_each_entry_safe(cp, ncp, &hdw->i2c_clients, list) {
                         if (cp->client == client) {
                                 trace_i2c("pvr2_i2c_detach"
@@ -946,22 +948,32 @@ static struct i2c_adapter pvr2_i2c_adap_template = {
         .client_unregister = pvr2_i2c_detach_inform,
 };
 
-static void do_i2c_scan(struct pvr2_hdw *hdw)
+
+/* Return true if device exists at given address */
+static int do_i2c_probe(struct pvr2_hdw *hdw, int addr)
 {
         struct i2c_msg msg[1];
-        int i,rc;
+        int rc;
         msg[0].addr = 0;
         msg[0].flags = I2C_M_RD;
         msg[0].len = 0;
         msg[0].buf = NULL;
-        printk("%s: i2c scan beginning\n",hdw->name);
+        msg[0].addr = addr;
+        rc = i2c_transfer(&hdw->i2c_adap, msg, ARRAY_SIZE(msg));
+        return rc == 1;
+}
+
+static void do_i2c_scan(struct pvr2_hdw *hdw)
+{
+        int i;
+        printk(KERN_INFO "%s: i2c scan beginning\n", hdw->name);
         for (i = 0; i < 128; i++) {
-                msg[0].addr = i;
-                rc = i2c_transfer(&hdw->i2c_adap,msg, ARRAY_SIZE(msg));
-                if (rc != 1) continue;
-                printk("%s: i2c scan: found device @ 0x%x\n",hdw->name,i);
+                if (do_i2c_probe(hdw, i)) {
+                        printk(KERN_INFO "%s: i2c scan: found device @ 0x%x\n",
+                               hdw->name, i);
+                }
         }
-        printk("%s: i2c scan done.\n",hdw->name);
+        printk(KERN_INFO "%s: i2c scan done.\n", hdw->name);
 }
 
 void pvr2_i2c_core_init(struct pvr2_hdw *hdw)
@@ -980,8 +992,6 @@ void pvr2_i2c_core_init(struct pvr2_hdw *hdw)
                 hdw->i2c_func[0x18] = i2c_black_hole;
         } else if (ir_mode[hdw->unit_number] == 1) {
                 if (hdw->hdw_desc->ir_scheme == PVR2_IR_SCHEME_24XXX) {
-                        /* This comment is present PURELY to get
-                           checkpatch.pl to STFU.  Lovely, eh? */
                         hdw->i2c_func[0x18] = i2c_24xxx_ir;
                 }
         }
@@ -1006,6 +1016,16 @@ void pvr2_i2c_core_init(struct pvr2_hdw *hdw)
         mutex_init(&hdw->i2c_list_lock);
         hdw->i2c_linked = !0;
         i2c_add_adapter(&hdw->i2c_adap);
+        if (hdw->i2c_func[0x18] == i2c_24xxx_ir) {
+                /* Probe for a different type of IR receiver on this
+                   device.  If present, disable the emulated IR receiver. */
+                if (do_i2c_probe(hdw, 0x71)) {
+                        pvr2_trace(PVR2_TRACE_INFO,
+                                   "Device has newer IR hardware;"
+                                   " disabling unneeded virtual IR device");
+                        hdw->i2c_func[0x18] = NULL;
+                }
+        }
         if (i2c_scan) do_i2c_scan(hdw);
 }
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-main.c b/drivers/media/video/pvrusb2/pvrusb2-main.c
index ad0d98c2ebb4..9b3c874d96d6 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-main.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-main.c
@@ -137,9 +137,11 @@ static int __init pvr_init(void)
         ret = usb_register(&pvr_driver);
 
         if (ret == 0)
-                info(DRIVER_DESC " : " DRIVER_VERSION);
-        if (pvrusb2_debug) info("Debug mask is %d (0x%x)",
-                                pvrusb2_debug,pvrusb2_debug);
+                printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+                       DRIVER_DESC "\n");
+        if (pvrusb2_debug)
+                printk(KERN_INFO KBUILD_MODNAME ": Debug mask is %d (0x%x)\n",
+                       pvrusb2_debug,pvrusb2_debug);
 
         pvr2_trace(PVR2_TRACE_INIT,"pvr_init complete");
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
index 46a8c39ba030..733680f21317 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
@@ -65,6 +65,7 @@ struct pvr2_sysfs_ctl_item {
         struct device_attribute attr_type;
         struct device_attribute attr_min;
         struct device_attribute attr_max;
+        struct device_attribute attr_def;
         struct device_attribute attr_enum;
         struct device_attribute attr_bits;
         struct device_attribute attr_val;
@@ -145,6 +146,23 @@ static ssize_t show_max(struct device *class_dev,
         return scnprintf(buf, PAGE_SIZE, "%ld\n", val);
 }
 
+static ssize_t show_def(struct device *class_dev,
+                        struct device_attribute *attr,
+                        char *buf)
+{
+        struct pvr2_sysfs_ctl_item *cip;
+        int val;
+        int ret;
+        cip = container_of(attr, struct pvr2_sysfs_ctl_item, attr_def);
+        ret = pvr2_ctrl_get_def(cip->cptr, &val);
+        pvr2_sysfs_trace("pvr2_sysfs(%p) show_def(cid=%d) is %d, stat=%d",
+                         cip->chptr, cip->ctl_id, val, ret);
+        if (ret < 0) {
+                return ret;
+        }
+        return scnprintf(buf, PAGE_SIZE, "%d\n", val);
+}
+
 static ssize_t show_val_norm(struct device *class_dev,
                              struct device_attribute *attr,
                              char *buf)
@@ -320,6 +338,10 @@ static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id)
         cip->attr_max.attr.mode = S_IRUGO;
         cip->attr_max.show = show_max;
 
+        cip->attr_def.attr.name = "def_val";
+        cip->attr_def.attr.mode = S_IRUGO;
+        cip->attr_def.show = show_def;
+
         cip->attr_val.attr.name = "cur_val";
         cip->attr_val.attr.mode = S_IRUGO;
 
@@ -343,6 +365,7 @@ static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id)
         cip->attr_gen[acnt++] = &cip->attr_name.attr;
         cip->attr_gen[acnt++] = &cip->attr_type.attr;
         cip->attr_gen[acnt++] = &cip->attr_val.attr;
+        cip->attr_gen[acnt++] = &cip->attr_def.attr;
         cip->attr_val.show = show_val_norm;
         cip->attr_val.store = store_val_norm;
         if (pvr2_ctrl_has_custom_symbols(cptr)) {
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 00306faeac01..f048d80b77e5 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -533,7 +533,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
 
                         lmin = pvr2_ctrl_get_min(hcp);
                         lmax = pvr2_ctrl_get_max(hcp);
-                        ldef = pvr2_ctrl_get_def(hcp);
+                        pvr2_ctrl_get_def(hcp, &ldef);
                         if (w == -1) {
                                 w = ldef;
                         } else if (w < lmin) {
@@ -543,7 +543,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
                         }
                         lmin = pvr2_ctrl_get_min(vcp);
                         lmax = pvr2_ctrl_get_max(vcp);
-                        ldef = pvr2_ctrl_get_def(vcp);
+                        pvr2_ctrl_get_def(vcp, &ldef);
                         if (h == -1) {
                                 h = ldef;
                         } else if (h < lmin) {
@@ -604,6 +604,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
         case VIDIOC_QUERYCTRL:
         {
                 struct pvr2_ctrl *cptr;
+                int val;
                 struct v4l2_queryctrl *vc = (struct v4l2_queryctrl *)arg;
                 ret = 0;
                 if (vc->id & V4L2_CTRL_FLAG_NEXT_CTRL) {
@@ -627,7 +628,8 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
                            pvr2_ctrl_get_desc(cptr));
                 strlcpy(vc->name,pvr2_ctrl_get_desc(cptr),sizeof(vc->name));
                 vc->flags = pvr2_ctrl_get_v4lflags(cptr);
-                vc->default_value = pvr2_ctrl_get_def(cptr);
+                pvr2_ctrl_get_def(cptr, &val);
+                vc->default_value = val;
                 switch (pvr2_ctrl_get_type(cptr)) {
                 case pvr2_ctl_enum:
                         vc->type = V4L2_CTRL_TYPE_MENU;
@@ -753,6 +755,92 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
                 break;
         }
 
+        case VIDIOC_CROPCAP:
+        {
+                struct v4l2_cropcap *cap = (struct v4l2_cropcap *)arg;
+                if (cap->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                        ret = -EINVAL;
+                        break;
+                }
+                ret = pvr2_hdw_get_cropcap(hdw, cap);
+                cap->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; /* paranoia */
+                break;
+        }
+        case VIDIOC_G_CROP:
+        {
+                struct v4l2_crop *crop = (struct v4l2_crop *)arg;
+                int val = 0;
+                if (crop->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                        ret = -EINVAL;
+                        break;
+                }
+                ret = pvr2_ctrl_get_value(
+                        pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPL), &val);
+                if (ret != 0) {
+                        ret = -EINVAL;
+                        break;
+                }
+                crop->c.left = val;
+                ret = pvr2_ctrl_get_value(
+                        pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPT), &val);
+                if (ret != 0) {
+                        ret = -EINVAL;
+                        break;
+                }
+                crop->c.top = val;
+                ret = pvr2_ctrl_get_value(
+                        pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPW), &val);
+                if (ret != 0) {
+                        ret = -EINVAL;
+                        break;
+                }
+                crop->c.width = val;
+                ret = pvr2_ctrl_get_value(
+                        pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPH), &val);
+                if (ret != 0) {
+                        ret = -EINVAL;
+                        break;
+                }
+                crop->c.height = val;
+        }
+        case VIDIOC_S_CROP:
+        {
+                struct v4l2_crop *crop = (struct v4l2_crop *)arg;
+                struct v4l2_cropcap cap;
+                if (crop->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                        ret = -EINVAL;
+                        break;
+                }
+                cap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                ret = pvr2_ctrl_set_value(
+                        pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPL),
+                        crop->c.left);
+                if (ret != 0) {
+                        ret = -EINVAL;
+                        break;
+                }
+                ret = pvr2_ctrl_set_value(
+                        pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPT),
+                        crop->c.top);
+                if (ret != 0) {
+                        ret = -EINVAL;
+                        break;
+                }
+                ret = pvr2_ctrl_set_value(
+                        pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPW),
+                        crop->c.width);
+                if (ret != 0) {
+                        ret = -EINVAL;
+                        break;
+                }
+                ret = pvr2_ctrl_set_value(
+                        pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPH),
+                        crop->c.height);
+                if (ret != 0) {
+                        ret = -EINVAL;
+                        break;
+                }
+        }
         case VIDIOC_LOG_STATUS:
         {
                 pvr2_hdw_trigger_module_log(hdw);
diff --git a/drivers/media/video/pwc/pwc-ctrl.c b/drivers/media/video/pwc/pwc-ctrl.c
index dbc560742553..c66530210192 100644
--- a/drivers/media/video/pwc/pwc-ctrl.c
+++ b/drivers/media/video/pwc/pwc-ctrl.c
@@ -41,7 +41,6 @@
 #include <asm/uaccess.h>
 #endif
 #include <asm/errno.h>
-#include <linux/version.h>
 
 #include "pwc.h"
 #include "pwc-uncompress.h"
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index 9aee7cb6f79a..ab28389b4cda 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -1112,7 +1112,7 @@ static int pwc_video_open(struct inode *inode, struct file *file)
 
         PWC_DEBUG_OPEN(">> video_open called(vdev = 0x%p).\n", vdev);
 
-        pdev = (struct pwc_device *)vdev->priv;
+        pdev = video_get_drvdata(vdev);
         BUG_ON(!pdev);
         if (pdev->vopen) {
                 PWC_DEBUG_OPEN("I'm busy, someone is using the device.\n");
@@ -1233,7 +1233,7 @@ static int pwc_video_close(struct inode *inode, struct file *file)
         PWC_DEBUG_OPEN(">> video_close called(vdev = 0x%p).\n", vdev);
 
         lock_kernel();
-        pdev = (struct pwc_device *)vdev->priv;
+        pdev = video_get_drvdata(vdev);
         if (pdev->vopen == 0)
                 PWC_DEBUG_MODULE("video_close() called on closed device?\n");
 
@@ -1304,7 +1304,7 @@ static ssize_t pwc_video_read(struct file *file, char __user *buf,
                         vdev, buf, count);
         if (vdev == NULL)
                 return -EFAULT;
-        pdev = vdev->priv;
+        pdev = video_get_drvdata(vdev);
         if (pdev == NULL)
                 return -EFAULT;
 
@@ -1386,7 +1386,7 @@ static unsigned int pwc_video_poll(struct file *file, poll_table *wait)
 
         if (vdev == NULL)
                 return -EFAULT;
-        pdev = vdev->priv;
+        pdev = video_get_drvdata(vdev);
         if (pdev == NULL)
                 return -EFAULT;
 
@@ -1408,7 +1408,7 @@ static int pwc_video_ioctl(struct inode *inode, struct file *file,
 
         if (!vdev)
                 goto out;
-        pdev = vdev->priv;
+        pdev = video_get_drvdata(vdev);
 
         mutex_lock(&pdev->modlock);
         if (!pdev->unplugged)
@@ -1428,7 +1428,7 @@ static int pwc_video_mmap(struct file *file, struct vm_area_struct *vma)
         int index;
 
         PWC_DEBUG_MEMORY(">> %s\n", __func__);
-        pdev = vdev->priv;
+        pdev = video_get_drvdata(vdev);
         size = vma->vm_end - vma->vm_start;
         start = vma->vm_start;
 
diff --git a/drivers/media/video/pwc/pwc-v4l.c b/drivers/media/video/pwc/pwc-v4l.c
index 1742889874df..76a1376c9751 100644
--- a/drivers/media/video/pwc/pwc-v4l.c
+++ b/drivers/media/video/pwc/pwc-v4l.c
@@ -346,7 +346,7 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
 
         if (vdev == NULL)
                 return -EFAULT;
-        pdev = vdev->priv;
+        pdev = video_get_drvdata(vdev);
         if (pdev == NULL)
                 return -EFAULT;
 
diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c
index cf96b2cc4f1c..eb6be5802928 100644
--- a/drivers/media/video/pxa_camera.c
+++ b/drivers/media/video/pxa_camera.c
@@ -629,17 +629,6 @@ static void pxa_camera_activate(struct pxa_camera_dev *pcdev)
                 pdata->init(pcdev->dev);
         }
 
-        if (pdata && pdata->power) {
-                dev_dbg(pcdev->dev, "%s: Power on camera\n", __func__);
-                pdata->power(pcdev->dev, 1);
-        }
-
-        if (pdata && pdata->reset) {
-                dev_dbg(pcdev->dev, "%s: Releasing camera reset\n",
-                        __func__);
-                pdata->reset(pcdev->dev, 1);
-        }
-
         CICR0 = 0x3FF;   /* disable all interrupts */
 
         if (pcdev->platform_flags & PXA_CAMERA_PCLK_EN)
@@ -660,20 +649,7 @@ static void pxa_camera_activate(struct pxa_camera_dev *pcdev)
 
 static void pxa_camera_deactivate(struct pxa_camera_dev *pcdev)
 {
-        struct pxacamera_platform_data *board = pcdev->pdata;
-
         clk_disable(pcdev->clk);
-
-        if (board && board->reset) {
-                dev_dbg(pcdev->dev, "%s: Asserting camera reset\n",
-                        __func__);
-                board->reset(pcdev->dev, 0);
-        }
-
-        if (board && board->power) {
-                dev_dbg(pcdev->dev, "%s: Power off camera\n", __func__);
-                board->power(pcdev->dev, 0);
-        }
 }
 
 static irqreturn_t pxa_camera_irq(int irq, void *data)
@@ -1144,31 +1120,31 @@ static int pxa_camera_probe(struct platform_device *pdev)
         pcdev->dev = &pdev->dev;
 
         /* request dma */
-        pcdev->dma_chans[0] = pxa_request_dma("CI_Y", DMA_PRIO_HIGH,
-                                              pxa_camera_dma_irq_y, pcdev);
-        if (pcdev->dma_chans[0] < 0) {
+        err = pxa_request_dma("CI_Y", DMA_PRIO_HIGH,
+                              pxa_camera_dma_irq_y, pcdev);
+        if (err < 0) {
                 dev_err(pcdev->dev, "Can't request DMA for Y\n");
-                err = -ENOMEM;
                 goto exit_iounmap;
         }
+        pcdev->dma_chans[0] = err;
         dev_dbg(pcdev->dev, "got DMA channel %d\n", pcdev->dma_chans[0]);
 
-        pcdev->dma_chans[1] = pxa_request_dma("CI_U", DMA_PRIO_HIGH,
-                                              pxa_camera_dma_irq_u, pcdev);
-        if (pcdev->dma_chans[1] < 0) {
+        err = pxa_request_dma("CI_U", DMA_PRIO_HIGH,
+                              pxa_camera_dma_irq_u, pcdev);
+        if (err < 0) {
                 dev_err(pcdev->dev, "Can't request DMA for U\n");
-                err = -ENOMEM;
                 goto exit_free_dma_y;
         }
+        pcdev->dma_chans[1] = err;
         dev_dbg(pcdev->dev, "got DMA channel (U) %d\n", pcdev->dma_chans[1]);
 
-        pcdev->dma_chans[2] = pxa_request_dma("CI_V", DMA_PRIO_HIGH,
-                                              pxa_camera_dma_irq_v, pcdev);
-        if (pcdev->dma_chans[0] < 0) {
+        err = pxa_request_dma("CI_V", DMA_PRIO_HIGH,
+                              pxa_camera_dma_irq_v, pcdev);
+        if (err < 0) {
                 dev_err(pcdev->dev, "Can't request DMA for V\n");
-                err = -ENOMEM;
                 goto exit_free_dma_u;
         }
+        pcdev->dma_chans[2] = err;
         dev_dbg(pcdev->dev, "got DMA channel (V) %d\n", pcdev->dma_chans[2]);
 
         DRCMR(68) = pcdev->dma_chans[0] | DRCMR_MAPVLD;
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
index 92b83feae366..5272926db73e 100644
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
@@ -58,6 +58,8 @@
 
 
 
+/* default JPEG quality */
+#define S2255_DEF_JPEG_QUAL     50
 /* vendor request in */
 #define S2255_VR_IN             0
 /* vendor request out */
@@ -67,20 +69,21 @@
 /* USB endpoint number for configuring the device */
 #define S2255_CONFIG_EP         2
 /* maximum time for DSP to start responding after last FW word loaded(ms) */
-#define S2255_DSP_BOOTTIME      400
+#define S2255_DSP_BOOTTIME      800
 /* maximum time to wait for firmware to load (ms) */
 #define S2255_LOAD_TIMEOUT      (5000 + S2255_DSP_BOOTTIME)
 #define S2255_DEF_BUFS          16
+#define S2255_SETMODE_TIMEOUT   500
 #define MAX_CHANNELS            4
-#define FRAME_MARKER            0x2255DA4AL
-#define MAX_PIPE_USBBLOCK       (40 * 1024)
-#define DEFAULT_PIPE_USBBLOCK   (16 * 1024)
+#define S2255_MARKER_FRAME      0x2255DA4AL
+#define S2255_MARKER_RESPONSE   0x2255ACACL
+#define S2255_USB_XFER_SIZE     (16 * 1024)
 #define MAX_CHANNELS            4
 #define MAX_PIPE_BUFFERS        1
 #define SYS_FRAMES              4
 /* maximum size is PAL full size plus room for the marker header(s) */
-#define SYS_FRAMES_MAXSIZE      (720 * 288 * 2 * 2 + 4096)
-#define DEF_USB_BLOCK           (4096)
+#define SYS_FRAMES_MAXSIZE      (720*288*2*2 + 4096)
+#define DEF_USB_BLOCK           S2255_USB_XFER_SIZE
 #define LINE_SZ_4CIFS_NTSC      640
 #define LINE_SZ_2CIFS_NTSC      640
 #define LINE_SZ_1CIFS_NTSC      320
@@ -108,6 +111,9 @@
 #define COLOR_YUVPL     1       /* YUV planar */
 #define COLOR_YUVPK     2       /* YUV packed */
 #define COLOR_Y8        4       /* monochrome */
+#define COLOR_JPG       5       /* JPEG */
+#define MASK_COLOR      0xff
+#define MASK_JPG_QUALITY 0xff00
 
 /* frame decimation. Not implemented by V4L yet(experimental in V4L) */
 #define FDEC_1          1       /* capture every frame. default */
@@ -148,16 +154,14 @@ struct s2255_mode {
         u32 restart;    /* if DSP requires restart */
 };
 
-/* frame structure */
-#define FRAME_STATE_UNUSED      0
-#define FRAME_STATE_FILLING     1
-#define FRAME_STATE_FULL        2
 
+#define S2255_READ_IDLE         0
+#define S2255_READ_FRAME        1
 
+/* frame structure */
 struct s2255_framei {
         unsigned long size;
-
-        unsigned long ulState;  /* ulState ==0 unused, 1 being filled, 2 full */
+        unsigned long ulState;  /* ulState:S2255_READ_IDLE, S2255_READ_FRAME*/
         void *lpvbits;          /* image data */
         unsigned long cur_size; /* current data copied to it */
 };
@@ -188,6 +192,10 @@ struct s2255_dmaqueue {
 #define S2255_FW_FAILED         3
 #define S2255_FW_DISCONNECTING  4
 
+#define S2255_FW_MARKER         0x22552f2f
+/* 2255 read states */
+#define S2255_READ_IDLE         0
+#define S2255_READ_FRAME        1
 struct s2255_fw {
         int                   fw_loaded;
         int                   fw_size;
@@ -195,7 +203,6 @@ struct s2255_fw {
         atomic_t              fw_state;
         void                  *pfw_data;
         wait_queue_head_t     wait_fw;
-        struct timer_list     dsp_wait;
         const struct firmware *fw;
 };
 
@@ -237,15 +244,27 @@ struct s2255_dev {
         struct s2255_pipeinfo   pipes[MAX_PIPE_BUFFERS];
         struct s2255_bufferi            buffer[MAX_CHANNELS];
         struct s2255_mode       mode[MAX_CHANNELS];
+        /* jpeg compression */
+        struct v4l2_jpegcompression jc[MAX_CHANNELS];
         const struct s2255_fmt  *cur_fmt[MAX_CHANNELS];
         int                     cur_frame[MAX_CHANNELS];
         int                     last_frame[MAX_CHANNELS];
         u32                     cc;     /* current channel */
         int                     b_acquire[MAX_CHANNELS];
+        /* allocated image size */
         unsigned long           req_image_size[MAX_CHANNELS];
+        /* received packet size */
+        unsigned long           pkt_size[MAX_CHANNELS];
         int                     bad_payload[MAX_CHANNELS];
         unsigned long           frame_count[MAX_CHANNELS];
         int                     frame_ready;
+        /* if JPEG image */
+        int                     jpg_size[MAX_CHANNELS];
+        /* if channel configured to default state */
+        int                     chn_configured[MAX_CHANNELS];
+        wait_queue_head_t       wait_setmode[MAX_CHANNELS];
+        int                     setmode_ready[MAX_CHANNELS];
+        int                     chn_ready;
         struct kref             kref;
         spinlock_t              slock;
 };
@@ -306,12 +325,16 @@ static void s2255_stop_readpipe(struct s2255_dev *dev);
 static int s2255_start_acquire(struct s2255_dev *dev, unsigned long chn);
 static int s2255_stop_acquire(struct s2255_dev *dev, unsigned long chn);
 static void s2255_fillbuff(struct s2255_dev *dev, struct s2255_buffer *buf,
-                           int chn);
+                           int chn, int jpgsize);
 static int s2255_set_mode(struct s2255_dev *dev, unsigned long chn,
                           struct s2255_mode *mode);
 static int s2255_board_shutdown(struct s2255_dev *dev);
 static void s2255_exit_v4l(struct s2255_dev *dev);
-static void s2255_fwload_start(struct s2255_dev *dev);
+static void s2255_fwload_start(struct s2255_dev *dev, int reset);
+static void s2255_destroy(struct kref *kref);
+static long s2255_vendor_req(struct s2255_dev *dev, unsigned char req,
+                             u16 index, u16 value, void *buf,
+                             s32 buf_len, int bOut);
 
 #define dprintk(level, fmt, arg...)                                     \
         do {                                                            \
@@ -407,6 +430,10 @@ static const struct s2255_fmt formats[] = {
                 .fourcc = V4L2_PIX_FMT_UYVY,
                 .depth = 16
         }, {
+                .name = "JPG",
+                .fourcc = V4L2_PIX_FMT_JPEG,
+                .depth = 24
+        }, {
                 .name = "8bpp GREY",
                 .fourcc = V4L2_PIX_FMT_GREY,
                 .depth = 8
@@ -464,6 +491,13 @@ static void planar422p_to_yuv_packed(const unsigned char *in,
         return;
 }
 
+static void s2255_reset_dsppower(struct s2255_dev *dev)
+{
+        s2255_vendor_req(dev, 0x40, 0x0b0b, 0x0b0b, NULL, 0, 1);
+        msleep(10);
+        s2255_vendor_req(dev, 0x50, 0x0000, 0x0000, NULL, 0, 1);
+        return;
+}
 
 /* kickstarts the firmware loading. from probe
  */
@@ -480,18 +514,6 @@ static void s2255_timer(unsigned long user_data)
         }
 }
 
-/* called when DSP is up and running.  DSP is guaranteed to
-   be running after S2255_DSP_BOOTTIME */
-static void s2255_dsp_running(unsigned long user_data)
-{
-        struct s2255_fw *data = (struct s2255_fw *)user_data;
-        dprintk(1, "dsp running\n");
-        atomic_set(&data->fw_state, S2255_FW_SUCCESS);
-        wake_up(&data->wait_fw);
-        printk(KERN_INFO "s2255: firmware loaded successfully\n");
-        return;
-}
-
 
 /* this loads the firmware asynchronously.
    Originally this was done synchroously in probe.
@@ -549,19 +571,14 @@ static void s2255_fwchunk_complete(struct urb *urb)
                 }
                 data->fw_loaded += len;
         } else {
-                init_timer(&data->dsp_wait);
-                data->dsp_wait.function = s2255_dsp_running;
-                data->dsp_wait.data = (unsigned long)data;
                 atomic_set(&data->fw_state, S2255_FW_LOADED_DSPWAIT);
-                mod_timer(&data->dsp_wait, msecs_to_jiffies(S2255_DSP_BOOTTIME)
-                          + jiffies);
         }
         dprintk(100, "2255 complete done\n");
         return;
 
 }
 
-static int s2255_got_frame(struct s2255_dev *dev, int chn)
+static int s2255_got_frame(struct s2255_dev *dev, int chn, int jpgsize)
 {
         struct s2255_dmaqueue *dma_q = &dev->vidq[chn];
         struct s2255_buffer *buf;
@@ -586,8 +603,7 @@ static int s2255_got_frame(struct s2255_dev *dev, int chn)
         list_del(&buf->vb.queue);
         do_gettimeofday(&buf->vb.ts);
         dprintk(100, "[%p/%d] wakeup\n", buf, buf->vb.i);
-
-        s2255_fillbuff(dev, buf, dma_q->channel);
+        s2255_fillbuff(dev, buf, dma_q->channel, jpgsize);
         wake_up(&buf->vb.done);
         dprintk(2, "wakeup [buf/i] [%p/%d]\n", buf, buf->vb.i);
 unlock:
@@ -621,7 +637,7 @@ static const struct s2255_fmt *format_by_fourcc(int fourcc)
  *
  */
 static void s2255_fillbuff(struct s2255_dev *dev, struct s2255_buffer *buf,
-                           int chn)
+                           int chn, int jpgsize)
 {
         int pos = 0;
         struct timeval ts;
@@ -649,6 +665,10 @@ static void s2255_fillbuff(struct s2255_dev *dev, struct s2255_buffer *buf,
                 case V4L2_PIX_FMT_GREY:
                         memcpy(vbuf, tmpbuf, buf->vb.width * buf->vb.height);
                         break;
+                case V4L2_PIX_FMT_JPEG:
+                        buf->vb.size = jpgsize;
+                        memcpy(vbuf, tmpbuf, buf->vb.size);
+                        break;
                 case V4L2_PIX_FMT_YUV422P:
                         memcpy(vbuf, tmpbuf,
                                buf->vb.width * buf->vb.height * 2);
@@ -657,9 +677,6 @@ static void s2255_fillbuff(struct s2255_dev *dev, struct s2255_buffer *buf,
                         printk(KERN_DEBUG "s2255: unknown format?\n");
                 }
                 dev->last_frame[chn] = -1;
-                /* done with the frame, free it */
-                frm->ulState = 0;
-                dprintk(4, "freeing buffer\n");
         } else {
                 printk(KERN_ERR "s2255: =======no frame\n");
                 return;
@@ -1021,6 +1038,10 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
         case V4L2_PIX_FMT_GREY:
                 fh->mode.color = COLOR_Y8;
                 break;
+        case V4L2_PIX_FMT_JPEG:
+                fh->mode.color = COLOR_JPG |
+                        (fh->dev->jc[fh->channel].quality << 8);
+                break;
         case V4L2_PIX_FMT_YUV422P:
                 fh->mode.color = COLOR_YUVPL;
                 break;
@@ -1139,7 +1160,7 @@ static u32 get_transfer_size(struct s2255_mode *mode)
                 }
         }
         outImageSize = linesPerFrame * pixelsPerLine;
-        if (mode->color != COLOR_Y8) {
+        if ((mode->color & MASK_COLOR) != COLOR_Y8) {
                 /* 2 bytes/pixel if not monochrome */
                 outImageSize *= 2;
         }
@@ -1185,12 +1206,17 @@ static int s2255_set_mode(struct s2255_dev *dev, unsigned long chn,
         u32 *buffer;
         unsigned long chn_rev;
 
+        mutex_lock(&dev->lock);
         chn_rev = G_chnmap[chn];
         dprintk(3, "mode scale [%ld] %p %d\n", chn, mode, mode->scale);
         dprintk(3, "mode scale [%ld] %p %d\n", chn, &dev->mode[chn],
                 dev->mode[chn].scale);
         dprintk(2, "mode contrast %x\n", mode->contrast);
 
+        /* if JPEG, set the quality */
+        if ((mode->color & MASK_COLOR) == COLOR_JPG)
+                mode->color = (dev->jc[chn].quality << 8) | COLOR_JPG;
+
         /* save the mode */
         dev->mode[chn] = *mode;
         dev->req_image_size[chn] = get_transfer_size(mode);
@@ -1199,6 +1225,7 @@ static int s2255_set_mode(struct s2255_dev *dev, unsigned long chn,
         buffer = kzalloc(512, GFP_KERNEL);
         if (buffer == NULL) {
                 dev_err(&dev->udev->dev, "out of mem\n");
+                mutex_unlock(&dev->lock);
                 return -ENOMEM;
         }
 
@@ -1214,12 +1241,20 @@ static int s2255_set_mode(struct s2255_dev *dev, unsigned long chn,
         dprintk(1, "set mode done chn %lu, %d\n", chn, res);
 
         /* wait at least 3 frames before continuing */
-        if (mode->restart)
-                msleep(125);
+        if (mode->restart) {
+                dev->setmode_ready[chn] = 0;
+                wait_event_timeout(dev->wait_setmode[chn],
+                                   (dev->setmode_ready[chn] != 0),
+                                   msecs_to_jiffies(S2255_SETMODE_TIMEOUT));
+                if (dev->setmode_ready[chn] != 1) {
+                        printk(KERN_DEBUG "s2255: no set mode response\n");
+                        res = -EFAULT;
+                }
+        }
 
         /* clear the restart flag */
         dev->mode[chn].restart = 0;
-
+        mutex_unlock(&dev->lock);
         return res;
 }
 
@@ -1270,7 +1305,7 @@ static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
         dev->cur_frame[chn] = 0;
         dev->frame_count[chn] = 0;
         for (j = 0; j < SYS_FRAMES; j++) {
-                dev->buffer[chn].frame[j].ulState = 0;
+                dev->buffer[chn].frame[j].ulState = S2255_READ_IDLE;
                 dev->buffer[chn].frame[j].cur_size = 0;
         }
         res = videobuf_streamon(&fh->vb_vidq);
@@ -1446,6 +1481,27 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
         return -EINVAL;
 }
 
+static int vidioc_g_jpegcomp(struct file *file, void *priv,
+                         struct v4l2_jpegcompression *jc)
+{
+        struct s2255_fh *fh = priv;
+        struct s2255_dev *dev = fh->dev;
+        *jc = dev->jc[fh->channel];
+        dprintk(2, "getting jpegcompression, quality %d\n", jc->quality);
+        return 0;
+}
+
+static int vidioc_s_jpegcomp(struct file *file, void *priv,
+                         struct v4l2_jpegcompression *jc)
+{
+        struct s2255_fh *fh = priv;
+        struct s2255_dev *dev = fh->dev;
+        if (jc->quality < 0 || jc->quality > 100)
+                return -EINVAL;
+        dev->jc[fh->channel].quality = jc->quality;
+        dprintk(2, "setting jpeg quality %d\n", jc->quality);
+        return 0;
+}
 static int s2255_open(struct inode *inode, struct file *file)
 {
         int minor = iminor(inode);
@@ -1455,8 +1511,10 @@ static int s2255_open(struct inode *inode, struct file *file)
         enum v4l2_buf_type type = 0;
         int i = 0;
         int cur_channel = -1;
+        int state;
         dprintk(1, "s2255: open called (minor=%d)\n", minor);
 
+        lock_kernel();
         list_for_each(list, &s2255_devlist) {
                 h = list_entry(list, struct s2255_dev, s2255_devlist);
                 for (i = 0; i < MAX_CHANNELS; i++) {
@@ -1469,45 +1527,78 @@ static int s2255_open(struct inode *inode, struct file *file)
         }
 
         if ((NULL == dev) || (cur_channel == -1)) {
-                dprintk(1, "s2255: openv4l no dev\n");
+                unlock_kernel();
+                printk(KERN_INFO "s2255: openv4l no dev\n");
                 return -ENODEV;
         }
 
+        if (atomic_read(&dev->fw_data->fw_state) == S2255_FW_DISCONNECTING) {
+                unlock_kernel();
+                printk(KERN_INFO "disconnecting\n");
+                return -ENODEV;
+        }
+        kref_get(&dev->kref);
         mutex_lock(&dev->open_lock);
 
         dev->users[cur_channel]++;
         dprintk(4, "s2255: open_handles %d\n", dev->users[cur_channel]);
 
-        if (atomic_read(&dev->fw_data->fw_state) == S2255_FW_FAILED) {
+        switch (atomic_read(&dev->fw_data->fw_state)) {
+        case S2255_FW_FAILED:
                 err("2255 firmware load failed. retrying.\n");
-                s2255_fwload_start(dev);
+                s2255_fwload_start(dev, 1);
                 wait_event_timeout(dev->fw_data->wait_fw,
-                                   (atomic_read(&dev->fw_data->fw_state)
-                                    != S2255_FW_NOTLOADED),
+                                   ((atomic_read(&dev->fw_data->fw_state)
+                                     == S2255_FW_SUCCESS) ||
+                                    (atomic_read(&dev->fw_data->fw_state)
+                                     == S2255_FW_DISCONNECTING)),
                                    msecs_to_jiffies(S2255_LOAD_TIMEOUT));
-                if (atomic_read(&dev->fw_data->fw_state)
-                    != S2255_FW_SUCCESS) {
-                        printk(KERN_INFO "2255 FW load failed.\n");
-                        dev->users[cur_channel]--;
-                        mutex_unlock(&dev->open_lock);
-                        return -EFAULT;
-                }
-        } else if (atomic_read(&dev->fw_data->fw_state) == S2255_FW_NOTLOADED) {
+                break;
+        case S2255_FW_NOTLOADED:
+        case S2255_FW_LOADED_DSPWAIT:
                 /* give S2255_LOAD_TIMEOUT time for firmware to load in case
                    driver loaded and then device immediately opened */
                 printk(KERN_INFO "%s waiting for firmware load\n", __func__);
                 wait_event_timeout(dev->fw_data->wait_fw,
-                                   (atomic_read(&dev->fw_data->fw_state)
-                                   != S2255_FW_NOTLOADED),
-                                   msecs_to_jiffies(S2255_LOAD_TIMEOUT));
-                if (atomic_read(&dev->fw_data->fw_state)
-                    != S2255_FW_SUCCESS) {
-                        printk(KERN_INFO "2255 firmware not loaded"
-                               "try again\n");
-                        dev->users[cur_channel]--;
-                        mutex_unlock(&dev->open_lock);
-                        return -EBUSY;
+                                   ((atomic_read(&dev->fw_data->fw_state)
+                                     == S2255_FW_SUCCESS) ||
+                                    (atomic_read(&dev->fw_data->fw_state)
+                                     == S2255_FW_DISCONNECTING)),
+                        msecs_to_jiffies(S2255_LOAD_TIMEOUT));
+                break;
+        case S2255_FW_SUCCESS:
+        default:
+                break;
+        }
+        state = atomic_read(&dev->fw_data->fw_state);
+        if (state != S2255_FW_SUCCESS) {
+                int rc;
+                switch (state) {
+                case S2255_FW_FAILED:
+                        printk(KERN_INFO "2255 FW load failed. %d\n", state);
+                        rc = -ENODEV;
+                        break;
+                case S2255_FW_DISCONNECTING:
+                        printk(KERN_INFO "%s: disconnecting\n", __func__);
+                        rc = -ENODEV;
+                        break;
+                case S2255_FW_LOADED_DSPWAIT:
+                case S2255_FW_NOTLOADED:
+                        printk(KERN_INFO "%s: firmware not loaded yet"
+                               "please try again later\n",
+                               __func__);
+                        rc = -EAGAIN;
+                        break;
+                default:
+                        printk(KERN_INFO "%s: unknown state\n", __func__);
+                        rc = -EFAULT;
+                        break;
                 }
+                dev->users[cur_channel]--;
+                mutex_unlock(&dev->open_lock);
+                kref_put(&dev->kref, s2255_destroy);
+                unlock_kernel();
+                return rc;
         }
 
         /* allocate + initialize per filehandle data */
@@ -1515,6 +1606,8 @@ static int s2255_open(struct inode *inode, struct file *file)
         if (NULL == fh) {
                 dev->users[cur_channel]--;
                 mutex_unlock(&dev->open_lock);
+                kref_put(&dev->kref, s2255_destroy);
+                unlock_kernel();
                 return -ENOMEM;
         }
 
@@ -1528,6 +1621,13 @@ static int s2255_open(struct inode *inode, struct file *file)
         fh->height = NUM_LINES_4CIFS_NTSC * 2;
         fh->channel = cur_channel;
 
+        /* configure channel to default state */
+        if (!dev->chn_configured[cur_channel]) {
+                s2255_set_mode(dev, cur_channel, &fh->mode);
+                dev->chn_configured[cur_channel] = 1;
+        }
+
+
         /* Put all controls at a sane state */
         for (i = 0; i < ARRAY_SIZE(s2255_qctrl); i++)
                 qctl_regs[i] = s2255_qctrl[i].default_value;
@@ -1546,8 +1646,8 @@ static int s2255_open(struct inode *inode, struct file *file)
                                     V4L2_FIELD_INTERLACED,
                                     sizeof(struct s2255_buffer), fh);
 
-        kref_get(&dev->kref);
         mutex_unlock(&dev->open_lock);
+        unlock_kernel();
         return 0;
 }
 
@@ -1569,30 +1669,24 @@ static unsigned int s2255_poll(struct file *file,
 static void s2255_destroy(struct kref *kref)
 {
         struct s2255_dev *dev = to_s2255_dev(kref);
+        struct list_head *list;
+        int i;
         if (!dev) {
                 printk(KERN_ERR "s2255drv: kref problem\n");
                 return;
         }
-
-        /*
-         * Wake up any firmware load waiting (only done in .open,
-         * which holds the open_lock mutex)
-         */
         atomic_set(&dev->fw_data->fw_state, S2255_FW_DISCONNECTING);
         wake_up(&dev->fw_data->wait_fw);
-
-        /* prevent s2255_disconnect from racing s2255_open */
+        for (i = 0; i < MAX_CHANNELS; i++) {
+                dev->setmode_ready[i] = 1;
+                wake_up(&dev->wait_setmode[i]);
+        }
         mutex_lock(&dev->open_lock);
+        /* reset the DSP so firmware can be reload next time */
+        s2255_reset_dsppower(dev);
         s2255_exit_v4l(dev);
-        /*
-         * device unregistered so no longer possible to open. open_mutex
-         *  can be unlocked and timers deleted afterwards.
-         */
-        mutex_unlock(&dev->open_lock);
-
         /* board shutdown stops the read pipe if it is running */
         s2255_board_shutdown(dev);
-
         /* make sure firmware still not trying to load */
         del_timer(&dev->timer);  /* only started in .probe and .open */
 
@@ -1602,23 +1696,19 @@ static void s2255_destroy(struct kref *kref)
                 usb_free_urb(dev->fw_data->fw_urb);
                 dev->fw_data->fw_urb = NULL;
         }
-
-        /*
-         * delete the dsp_wait timer, which sets the firmware
-         * state on completion.  This is done before fw_data
-         * is freed below.
-         */
-
-        del_timer(&dev->fw_data->dsp_wait); /* only started in .open */
-
         if (dev->fw_data->fw)
                 release_firmware(dev->fw_data->fw);
         kfree(dev->fw_data->pfw_data);
         kfree(dev->fw_data);
-
         usb_put_dev(dev->udev);
         dprintk(1, "%s", __func__);
         kfree(dev);
+
+        while (!list_empty(&s2255_devlist)) {
+                list = s2255_devlist.next;
+                list_del(list);
+        }
+        mutex_unlock(&dev->open_lock);
 }
 
 static int s2255_close(struct inode *inode, struct file *file)
@@ -1702,6 +1792,8 @@ static const struct v4l2_ioctl_ops s2255_ioctl_ops = {
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
         .vidiocgmbuf = vidioc_cgmbuf,
 #endif
+        .vidioc_s_jpegcomp = vidioc_s_jpegcomp,
+        .vidioc_g_jpegcomp = vidioc_g_jpegcomp,
 };
 
 static struct video_device template = {
@@ -1740,7 +1832,7 @@ static int s2255_probe_v4l(struct s2255_dev *dev)
                         ret = video_register_device(dev->vdev[i],
                                                     VFL_TYPE_GRABBER,
                                                     cur_nr + i);
-                dev->vdev[i]->priv = dev;
+                video_set_drvdata(dev->vdev[i], dev);
 
                 if (ret != 0) {
                         dev_err(&dev->udev->dev,
@@ -1754,18 +1846,16 @@ static int s2255_probe_v4l(struct s2255_dev *dev)
 
 static void s2255_exit_v4l(struct s2255_dev *dev)
 {
-        struct list_head *list;
+
         int i;
-        /* unregister the video devices */
-        while (!list_empty(&s2255_devlist)) {
-                list = s2255_devlist.next;
-                list_del(list);
-        }
         for (i = 0; i < MAX_CHANNELS; i++) {
-                if (-1 != dev->vdev[i]->minor)
+                if (-1 != dev->vdev[i]->minor) {
                         video_unregister_device(dev->vdev[i]);
-                else
+                        printk(KERN_INFO "s2255 unregistered\n");
+                } else {
                         video_device_release(dev->vdev[i]);
+                        printk(KERN_INFO "s2255 released\n");
+                }
         }
 }
 
@@ -1775,134 +1865,123 @@ static void s2255_exit_v4l(struct s2255_dev *dev)
  * function again).
  *
  * Received frame structure:
- * bytes 0-3:  marker : 0x2255DA4AL (FRAME_MARKER)
+ * bytes 0-3:  marker : 0x2255DA4AL (S2255_MARKER_FRAME)
  * bytes 4-7:  channel: 0-3
  * bytes 8-11: payload size:  size of the frame
  * bytes 12-payloadsize+12:  frame data
  */
 static int save_frame(struct s2255_dev *dev, struct s2255_pipeinfo *pipe_info)
 {
-        static int dbgsync; /* = 0; */
         char *pdest;
         u32 offset = 0;
-        int bsync = 0;
-        int btrunc = 0;
+        int bframe = 0;
         char *psrc;
         unsigned long copy_size;
         unsigned long size;
         s32 idx = -1;
         struct s2255_framei *frm;
         unsigned char *pdata;
-        unsigned long cur_size;
-        int bsearch = 0;
-        struct s2255_bufferi *buf;
+
         dprintk(100, "buffer to user\n");
 
         idx = dev->cur_frame[dev->cc];
-        buf = &dev->buffer[dev->cc];
-        frm = &buf->frame[idx];
-
-        if (frm->ulState == 0) {
-                frm->ulState = 1;
-                frm->cur_size = 0;
-                bsearch = 1;
-        } else if (frm->ulState == 2) {
-                /* system frame was not freed */
-                dprintk(2, "sys frame not free.  overrun ringbuf\n");
-                bsearch = 1;
-                frm->ulState = 1;
-                frm->cur_size = 0;
-        }
-
-        if (bsearch) {
-                if (*(s32 *) pipe_info->transfer_buffer != FRAME_MARKER) {
-                        u32 jj;
-                        if (dbgsync == 0) {
-                                dprintk(3, "not synched, discarding all packets"
-                                        "until marker\n");
+        frm = &dev->buffer[dev->cc].frame[idx];
 
-                                dbgsync++;
-                        }
-                        pdata = (unsigned char *)pipe_info->transfer_buffer;
-                        for (jj = 0; jj < (pipe_info->cur_transfer_size - 12);
-                             jj++) {
-                                if (*(s32 *) pdata == FRAME_MARKER) {
-                                        int cc;
-                                        dprintk(3,
-                                                "found frame marker at offset:"
-                                                " %d [%x %x]\n", jj, pdata[0],
-                                                pdata[1]);
-                                        offset = jj;
-                                        bsync = 1;
-                                        cc = *(u32 *) (pdata + sizeof(u32));
-                                        if (cc >= MAX_CHANNELS) {
-                                                printk(KERN_ERR
-                                                       "bad channel\n");
-                                                return -EINVAL;
-                                        }
-                                        /* reverse it */
-                                        dev->cc = G_chnmap[cc];
+        if (frm->ulState == S2255_READ_IDLE) {
+                int jj;
+                unsigned int cc;
+                s32 *pdword;
+                int payload;
+                /* search for marker codes */
+                pdata = (unsigned char *)pipe_info->transfer_buffer;
+                for (jj = 0; jj < (pipe_info->cur_transfer_size - 12); jj++) {
+                        switch (*(s32 *) pdata) {
+                        case S2255_MARKER_FRAME:
+                                pdword = (s32 *)pdata;
+                                dprintk(4, "found frame marker at offset:"
+                                        " %d [%x %x]\n", jj, pdata[0],
+                                        pdata[1]);
+                                offset = jj + PREFIX_SIZE;
+                                bframe = 1;
+                                cc = pdword[1];
+                                if (cc >= MAX_CHANNELS) {
+                                        printk(KERN_ERR
+                                               "bad channel\n");
+                                        return -EINVAL;
+                                }
+                                /* reverse it */
+                                dev->cc = G_chnmap[cc];
+                                payload =  pdword[3];
+                                if (payload > dev->req_image_size[dev->cc]) {
+                                        dev->bad_payload[dev->cc]++;
+                                        /* discard the bad frame */
+                                        return -EINVAL;
+                                }
+                                dev->pkt_size[dev->cc] = payload;
+                                dev->jpg_size[dev->cc] = pdword[4];
+                                break;
+                        case S2255_MARKER_RESPONSE:
+                                pdword = (s32 *)pdata;
+                                pdata += DEF_USB_BLOCK;
+                                jj += DEF_USB_BLOCK;
+                                if (pdword[1] >= MAX_CHANNELS)
+                                        break;
+                                cc = G_chnmap[pdword[1]];
+                                if (!(cc >= 0 && cc < MAX_CHANNELS))
+                                        break;
+                                switch (pdword[2]) {
+                                case 0x01:
+                                        /* check if channel valid */
+                                        /* set mode ready */
+                                        dev->setmode_ready[cc] = 1;
+                                        wake_up(&dev->wait_setmode[cc]);
+                                        dprintk(5, "setmode ready %d\n", cc);
                                         break;
+                                case 0x10:
+
+                                        dev->chn_ready |= (1 << cc);
+                                        if ((dev->chn_ready & 0x0f) != 0x0f)
+                                                break;
+                                        /* all channels ready */
+                                        printk(KERN_INFO "s2255: fw loaded\n");
+                                        atomic_set(&dev->fw_data->fw_state,
+                                                   S2255_FW_SUCCESS);
+                                        wake_up(&dev->fw_data->wait_fw);
+                                        break;
+                                default:
+                                        printk(KERN_INFO "s2255 unknwn resp\n");
                                 }
+                        default:
                                 pdata++;
+                                break;
                         }
-                        if (bsync == 0)
-                                return -EINVAL;
-                } else {
-                        u32 *pword;
-                        u32 payload;
-                        int cc;
-                        dbgsync = 0;
-                        bsync = 1;
-                        pword = (u32 *) pipe_info->transfer_buffer;
-                        cc = pword[1];
-
-                        if (cc >= MAX_CHANNELS) {
-                                printk("invalid channel found. "
-                                        "throwing out data!\n");
-                                return -EINVAL;
-                        }
-                        dev->cc = G_chnmap[cc];
-                        payload = pword[2];
-                        if (payload != dev->req_image_size[dev->cc]) {
-                                dprintk(1, "[%d][%d]unexpected payload: %d"
-                                        "required: %lu \n", cc, dev->cc,
-                                        payload, dev->req_image_size[dev->cc]);
-                                dev->bad_payload[dev->cc]++;
-                                /* discard the bad frame */
-                                return -EINVAL;
-                        }
-
-                }
-        }
-        /* search done.  now find out if should be acquiring
-           on this channel */
-        if (!dev->b_acquire[dev->cc]) {
-                frm->ulState = 0;
-                return -EINVAL;
+                        if (bframe)
+                                break;
+                } /* for */
+                if (!bframe)
+                        return -EINVAL;
         }
 
+
         idx = dev->cur_frame[dev->cc];
         frm = &dev->buffer[dev->cc].frame[idx];
 
-        if (frm->ulState == 0) {
-                frm->ulState = 1;
-                frm->cur_size = 0;
-        } else if (frm->ulState == 2) {
-                /* system frame ring buffer overrun */
-                dprintk(2, "sys frame overrun.  overwriting frame %d %d\n",
-                        dev->cc, idx);
-                frm->ulState = 1;
-                frm->cur_size = 0;
+        /* search done.  now find out if should be acquiring on this channel */
+        if (!dev->b_acquire[dev->cc]) {
+                /* we found a frame, but this channel is turned off */
+                frm->ulState = S2255_READ_IDLE;
+                return -EINVAL;
         }
 
-        if (bsync) {
-                /* skip the marker 512 bytes (and offset if out of sync) */
-                psrc = (u8 *)pipe_info->transfer_buffer + offset + PREFIX_SIZE;
-        } else {
-                psrc = (u8 *)pipe_info->transfer_buffer;
+        if (frm->ulState == S2255_READ_IDLE) {
+                frm->ulState = S2255_READ_FRAME;
+                frm->cur_size = 0;
         }
 
+        /* skip the marker 512 bytes (and offset if out of sync) */
+        psrc = (u8 *)pipe_info->transfer_buffer + offset;
+
+
         if (frm->lpvbits == NULL) {
                 dprintk(1, "s2255 frame buffer == NULL.%p %p %d %d",
                         frm, dev, dev->cc, idx);
@@ -1911,33 +1990,20 @@ static int save_frame(struct s2255_dev *dev, struct s2255_pipeinfo *pipe_info)
 
         pdest = frm->lpvbits + frm->cur_size;
 
-        if (bsync) {
-                copy_size =
-                    (pipe_info->cur_transfer_size - offset) - PREFIX_SIZE;
-                if (copy_size > pipe_info->cur_transfer_size) {
-                        printk("invalid copy size, overflow!\n");
-                        return -ENOMEM;
-                }
-        } else {
-                copy_size = pipe_info->cur_transfer_size;
-        }
+        copy_size = (pipe_info->cur_transfer_size - offset);
 
-        cur_size = frm->cur_size;
-        size = dev->req_image_size[dev->cc];
+        size = dev->pkt_size[dev->cc] - PREFIX_SIZE;
 
-        if ((copy_size + cur_size) > size) {
-                copy_size = size - cur_size;
-                btrunc = 1;
-        }
+        /* sanity check on pdest */
+        if ((copy_size + frm->cur_size) < dev->req_image_size[dev->cc])
+                memcpy(pdest, psrc, copy_size);
 
-        memcpy(pdest, psrc, copy_size);
-        cur_size += copy_size;
         frm->cur_size += copy_size;
-        dprintk(50, "cur_size size %lu size %lu \n", cur_size, size);
+        dprintk(4, "cur_size size %lu size %lu \n", frm->cur_size, size);
+
+        if (frm->cur_size >= size) {
 
-        if (cur_size >= (size - PREFIX_SIZE)) {
                 u32 cc = dev->cc;
-                frm->ulState = 2;
                 dprintk(2, "****************[%d]Buffer[%d]full*************\n",
                         cc, idx);
                 dev->last_frame[cc] = dev->cur_frame[cc];
@@ -1946,16 +2012,13 @@ static int save_frame(struct s2255_dev *dev, struct s2255_pipeinfo *pipe_info)
                 if ((dev->cur_frame[cc] == SYS_FRAMES) ||
                     (dev->cur_frame[cc] == dev->buffer[cc].dwFrames))
                         dev->cur_frame[cc] = 0;
-
-                /* signal the semaphore for this channel */
+                /* frame ready */
                 if (dev->b_acquire[cc])
-                        s2255_got_frame(dev, cc);
+                        s2255_got_frame(dev, cc, dev->jpg_size[cc]);
                 dev->frame_count[cc]++;
-        }
-        /* frame was truncated */
-        if (btrunc) {
-                /* return more data to process */
-                return EAGAIN;
+                frm->ulState = S2255_READ_IDLE;
+                frm->cur_size = 0;
+
         }
         /* done successfully */
         return 0;
@@ -1974,8 +2037,8 @@ static void s2255_read_video_callback(struct s2255_dev *dev,
         }
         /* otherwise copy to the system buffers */
         res = save_frame(dev, pipe_info);
-        if (res == EAGAIN)
-                save_frame(dev, pipe_info);
+        if (res != 0)
+                dprintk(4, "s2255: read callback failed\n");
 
         dprintk(50, "callback read video done\n");
         return;
@@ -2095,11 +2158,9 @@ static int s2255_board_init(struct s2255_dev *dev)
 
                 memset(pipe, 0, sizeof(*pipe));
                 pipe->dev = dev;
-                pipe->cur_transfer_size = DEFAULT_PIPE_USBBLOCK;
-                pipe->max_transfer_size = MAX_PIPE_USBBLOCK;
+                pipe->cur_transfer_size = S2255_USB_XFER_SIZE;
+                pipe->max_transfer_size = S2255_USB_XFER_SIZE;
 
-                if (pipe->cur_transfer_size > pipe->max_transfer_size)
-                        pipe->cur_transfer_size = pipe->max_transfer_size;
                 pipe->transfer_buffer = kzalloc(pipe->max_transfer_size,
                                                 GFP_KERNEL);
                 if (pipe->transfer_buffer == NULL) {
@@ -2119,6 +2180,7 @@ static int s2255_board_init(struct s2255_dev *dev)
         for (j = 0; j < MAX_CHANNELS; j++) {
                 dev->b_acquire[j] = 0;
                 dev->mode[j] = mode_def;
+                dev->jc[j].quality = S2255_DEF_JPEG_QUAL;
                 dev->cur_fmt[j] = &formats[0];
                 dev->mode[j].restart = 1;
                 dev->req_image_size[j] = get_transfer_size(&mode_def);
@@ -2323,7 +2385,7 @@ static int s2255_stop_acquire(struct s2255_dev *dev, unsigned long chn)
         kfree(buffer);
         dev->b_acquire[chn] = 0;
 
-        return 0;
+        return res;
 }
 
 static void s2255_stop_readpipe(struct s2255_dev *dev)
@@ -2359,8 +2421,10 @@ static void s2255_stop_readpipe(struct s2255_dev *dev)
         return;
 }
 
-static void s2255_fwload_start(struct s2255_dev *dev)
+static void s2255_fwload_start(struct s2255_dev *dev, int reset)
 {
+        if (reset)
+                s2255_reset_dsppower(dev);
         dev->fw_data->fw_size = dev->fw_data->fw->size;
         atomic_set(&dev->fw_data->fw_state, S2255_FW_NOTLOADED);
         memcpy(dev->fw_data->pfw_data,
@@ -2383,6 +2447,8 @@ static int s2255_probe(struct usb_interface *interface,
         struct usb_endpoint_descriptor *endpoint;
         int i;
         int retval = -ENOMEM;
+        __le32 *pdata;
+        int fw_size;
 
         dprintk(2, "s2255: probe\n");
 
@@ -2437,6 +2503,8 @@ static int s2255_probe(struct usb_interface *interface,
         dev->timer.data = (unsigned long)dev->fw_data;
 
         init_waitqueue_head(&dev->fw_data->wait_fw);
+        for (i = 0; i < MAX_CHANNELS; i++)
+                init_waitqueue_head(&dev->wait_setmode[i]);
 
 
         dev->fw_data->fw_urb = usb_alloc_urb(0, GFP_KERNEL);
@@ -2456,16 +2524,30 @@ static int s2255_probe(struct usb_interface *interface,
                 printk(KERN_ERR "sensoray 2255 failed to get firmware\n");
                 goto error;
         }
+        /* check the firmware is valid */
+        fw_size = dev->fw_data->fw->size;
+        pdata = (__le32 *) &dev->fw_data->fw->data[fw_size - 8];
 
+        if (*pdata != S2255_FW_MARKER) {
+                printk(KERN_INFO "Firmware invalid.\n");
+                retval = -ENODEV;
+                goto error;
+        } else {
+                /* make sure firmware is the latest */
+                __le32 *pRel;
+                pRel = (__le32 *) &dev->fw_data->fw->data[fw_size - 4];
+                printk(KERN_INFO "s2255 dsp fw version %x\n", *pRel);
+        }
         /* loads v4l specific */
         s2255_probe_v4l(dev);
+        usb_reset_device(dev->udev);
         /* load 2255 board specific */
         s2255_board_init(dev);
 
         dprintk(4, "before probe done %p\n", dev);
         spin_lock_init(&dev->slock);
 
-        s2255_fwload_start(dev);
+        s2255_fwload_start(dev, 0);
         dev_info(&interface->dev, "Sensoray 2255 detected\n");
         return 0;
 error:
@@ -2476,14 +2558,30 @@ error:
 static void s2255_disconnect(struct usb_interface *interface)
 {
         struct s2255_dev *dev = NULL;
+        int i;
         dprintk(1, "s2255: disconnect interface %p\n", interface);
         dev = usb_get_intfdata(interface);
+
+        /*
+         * wake up any of the timers to allow open_lock to be
+         * acquired sooner
+         */
+        atomic_set(&dev->fw_data->fw_state, S2255_FW_DISCONNECTING);
+        wake_up(&dev->fw_data->wait_fw);
+        for (i = 0; i < MAX_CHANNELS; i++) {
+                dev->setmode_ready[i] = 1;
+                wake_up(&dev->wait_setmode[i]);
+        }
+
+        mutex_lock(&dev->open_lock);
+        usb_set_intfdata(interface, NULL);
+        mutex_unlock(&dev->open_lock);
+
         if (dev) {
                 kref_put(&dev->kref, s2255_destroy);
                 dprintk(1, "s2255drv: disconnect\n");
                 dev_info(&interface->dev, "s2255usb now disconnected\n");
         }
-        usb_set_intfdata(interface, NULL);
 }
 
 static struct usb_driver s2255_driver = {
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index 6ee63e69b36c..4a21b8a6a709 100644
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -43,135 +43,363 @@
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
+#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/videotext.h>
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
-#include <linux/mutex.h>
-
-#include "saa5246a.h"
+#include <media/v4l2-i2c-drv-legacy.h>
 
 MODULE_AUTHOR("Michael Geng <linux@MichaelGeng.de>");
 MODULE_DESCRIPTION("Philips SAA5246A, SAA5281 Teletext decoder driver");
 MODULE_LICENSE("GPL");
 
-struct saa5246a_device
-{
-        u8     pgbuf[NUM_DAUS][VTX_VIRTUALSIZE];
-        int    is_searching[NUM_DAUS];
-        struct i2c_client *client;
-        struct mutex lock;
-};
+#define MAJOR_VERSION 1         /* driver major version number */
+#define MINOR_VERSION 8         /* driver minor version number */
+
+/* Number of DAUs = number of pages that can be searched at the same time. */
+#define NUM_DAUS 4
+
+#define NUM_ROWS_PER_PAGE 40
+
+/* first column is 0 (not 1) */
+#define POS_TIME_START 32
+#define POS_TIME_END 39
+
+#define POS_HEADER_START 7
+#define POS_HEADER_END 31
+
+/* Returns 'true' if the part of the videotext page described with req contains
+   (at least parts of) the time field */
+#define REQ_CONTAINS_TIME(p_req) \
+        ((p_req)->start <= POS_TIME_END && \
+         (p_req)->end   >= POS_TIME_START)
+
+/* Returns 'true' if the part of the videotext page described with req contains
+   (at least parts of) the page header */
+#define REQ_CONTAINS_HEADER(p_req) \
+        ((p_req)->start <= POS_HEADER_END && \
+         (p_req)->end   >= POS_HEADER_START)
+
+/*****************************************************************************/
+/* Mode register numbers of the SAA5246A                                     */
+/*****************************************************************************/
+#define SAA5246A_REGISTER_R0    0
+#define SAA5246A_REGISTER_R1    1
+#define SAA5246A_REGISTER_R2    2
+#define SAA5246A_REGISTER_R3    3
+#define SAA5246A_REGISTER_R4    4
+#define SAA5246A_REGISTER_R5    5
+#define SAA5246A_REGISTER_R6    6
+#define SAA5246A_REGISTER_R7    7
+#define SAA5246A_REGISTER_R8    8
+#define SAA5246A_REGISTER_R9    9
+#define SAA5246A_REGISTER_R10  10
+#define SAA5246A_REGISTER_R11  11
+#define SAA5246A_REGISTER_R11B 11
+
+/* SAA5246A mode registers often autoincrement to the next register.
+   Therefore we use variable argument lists. The following macro indicates
+   the end of a command list. */
+#define COMMAND_END (-1)
+
+/*****************************************************************************/
+/* Contents of the mode registers of the SAA5246A                            */
+/*****************************************************************************/
+/* Register R0 (Advanced Control) */
+#define R0_SELECT_R11                                      0x00
+#define R0_SELECT_R11B                                     0x01
+
+#define R0_PLL_TIME_CONSTANT_LONG                          0x00
+#define R0_PLL_TIME_CONSTANT_SHORT                         0x02
+
+#define R0_ENABLE_nODD_EVEN_OUTPUT                         0x00
+#define R0_DISABLE_nODD_EVEN_OUTPUT                        0x04
+
+#define R0_ENABLE_HDR_POLL                                 0x00
+#define R0_DISABLE_HDR_POLL                                0x10
+
+#define R0_DO_NOT_FORCE_nODD_EVEN_LOW_IF_PICTURE_DISPLAYED 0x00
+#define R0_FORCE_nODD_EVEN_LOW_IF_PICTURE_DISPLAYED        0x20
+
+#define R0_NO_FREE_RUN_PLL                                 0x00
+#define R0_FREE_RUN_PLL                                    0x40
+
+#define R0_NO_AUTOMATIC_FASTEXT_PROMPT                     0x00
+#define R0_AUTOMATIC_FASTEXT_PROMPT                        0x80
+
+/* Register R1 (Mode) */
+#define R1_INTERLACED_312_AND_HALF_312_AND_HALF_LINES      0x00
+#define R1_NON_INTERLACED_312_313_LINES                    0x01
+#define R1_NON_INTERLACED_312_312_LINES                    0x02
+#define R1_FFB_LEADING_EDGE_IN_FIRST_BROAD_PULSE           0x03
+#define R1_FFB_LEADING_EDGE_IN_SECOND_BROAD_PULSE          0x07
+
+#define R1_DEW                                             0x00
+#define R1_FULL_FIELD                                      0x08
+
+#define R1_EXTENDED_PACKET_DISABLE                         0x00
+#define R1_EXTENDED_PACKET_ENABLE                          0x10
+
+#define R1_DAUS_ALL_ON                                     0x00
+#define R1_DAUS_ALL_OFF                                    0x20
+
+#define R1_7_BITS_PLUS_PARITY                              0x00
+#define R1_8_BITS_NO_PARITY                                0x40
+
+#define R1_VCS_TO_SCS                                      0x00
+#define R1_NO_VCS_TO_SCS                                   0x80
+
+/* Register R2 (Page request address) */
+#define R2_IN_R3_SELECT_PAGE_HUNDREDS                      0x00
+#define R2_IN_R3_SELECT_PAGE_TENS                          0x01
+#define R2_IN_R3_SELECT_PAGE_UNITS                         0x02
+#define R2_IN_R3_SELECT_HOURS_TENS                         0x03
+#define R2_IN_R3_SELECT_HOURS_UNITS                        0x04
+#define R2_IN_R3_SELECT_MINUTES_TENS                       0x05
+#define R2_IN_R3_SELECT_MINUTES_UNITS                      0x06
+
+#define R2_DAU_0                                           0x00
+#define R2_DAU_1                                           0x10
+#define R2_DAU_2                                           0x20
+#define R2_DAU_3                                           0x30
+
+#define R2_BANK_0                                          0x00
+#define R2_BANK 1                                          0x40
+
+#define R2_HAMMING_CHECK_ON                                0x80
+#define R2_HAMMING_CHECK_OFF                               0x00
+
+/* Register R3 (Page request data) */
+#define R3_PAGE_HUNDREDS_0                                 0x00
+#define R3_PAGE_HUNDREDS_1                                 0x01
+#define R3_PAGE_HUNDREDS_2                                 0x02
+#define R3_PAGE_HUNDREDS_3                                 0x03
+#define R3_PAGE_HUNDREDS_4                                 0x04
+#define R3_PAGE_HUNDREDS_5                                 0x05
+#define R3_PAGE_HUNDREDS_6                                 0x06
+#define R3_PAGE_HUNDREDS_7                                 0x07
 
-static struct video_device saa_template;        /* Declared near bottom */
+#define R3_HOLD_PAGE                                       0x00
+#define R3_UPDATE_PAGE                                     0x08
 
-/* Addresses to scan */
-static unsigned short normal_i2c[]       = { I2C_ADDRESS, I2C_CLIENT_END };
+#define R3_PAGE_HUNDREDS_DO_NOT_CARE                       0x00
+#define R3_PAGE_HUNDREDS_DO_CARE                           0x10
 
-I2C_CLIENT_INSMOD;
+#define R3_PAGE_TENS_DO_NOT_CARE                           0x00
+#define R3_PAGE_TENS_DO_CARE                               0x10
 
-static struct i2c_client client_template;
+#define R3_PAGE_UNITS_DO_NOT_CARE                          0x00
+#define R3_PAGE_UNITS_DO_CARE                              0x10
 
-static int saa5246a_attach(struct i2c_adapter *adap, int addr, int kind)
-{
-        int pgbuf;
-        int err;
-        struct i2c_client *client;
-        struct video_device *vd;
-        struct saa5246a_device *t;
+#define R3_HOURS_TENS_DO_NOT_CARE                          0x00
+#define R3_HOURS_TENS_DO_CARE                              0x10
 
-        printk(KERN_INFO "saa5246a: teletext chip found.\n");
-        client=kmalloc(sizeof(*client), GFP_KERNEL);
-        if(client==NULL)
-                return -ENOMEM;
-        client_template.adapter = adap;
-        client_template.addr = addr;
-        memcpy(client, &client_template, sizeof(*client));
-        t = kzalloc(sizeof(*t), GFP_KERNEL);
-        if(t==NULL)
-        {
-                kfree(client);
-                return -ENOMEM;
-        }
-        strlcpy(client->name, IF_NAME, I2C_NAME_SIZE);
-        mutex_init(&t->lock);
+#define R3_HOURS_UNITS_DO_NOT_CARE                         0x00
+#define R3_HOURS_UNITS_DO_CARE                             0x10
 
-        /*
-         *      Now create a video4linux device
-         */
+#define R3_MINUTES_TENS_DO_NOT_CARE                        0x00
+#define R3_MINUTES_TENS_DO_CARE                            0x10
 
-        vd = video_device_alloc();
-        if(vd==NULL)
-        {
-                kfree(t);
-                kfree(client);
-                return -ENOMEM;
-        }
-        i2c_set_clientdata(client, vd);
-        memcpy(vd, &saa_template, sizeof(*vd));
+#define R3_MINUTES_UNITS_DO_NOT_CARE                       0x00
+#define R3_MINUTES_UNITS_DO_CARE                           0x10
 
-        for (pgbuf = 0; pgbuf < NUM_DAUS; pgbuf++)
-        {
-                memset(t->pgbuf[pgbuf], ' ', sizeof(t->pgbuf[0]));
-                t->is_searching[pgbuf] = false;
-        }
-        vd->priv=t;
+/* Register R4 (Display chapter) */
+#define R4_DISPLAY_PAGE_0                                  0x00
+#define R4_DISPLAY_PAGE_1                                  0x01
+#define R4_DISPLAY_PAGE_2                                  0x02
+#define R4_DISPLAY_PAGE_3                                  0x03
+#define R4_DISPLAY_PAGE_4                                  0x04
+#define R4_DISPLAY_PAGE_5                                  0x05
+#define R4_DISPLAY_PAGE_6                                  0x06
+#define R4_DISPLAY_PAGE_7                                  0x07
 
+/* Register R5 (Normal display control) */
+#define R5_PICTURE_INSIDE_BOXING_OFF                       0x00
+#define R5_PICTURE_INSIDE_BOXING_ON                        0x01
 
-        /*
-         *      Register it
-         */
+#define R5_PICTURE_OUTSIDE_BOXING_OFF                      0x00
+#define R5_PICTURE_OUTSIDE_BOXING_ON                       0x02
 
-        if((err=video_register_device(vd, VFL_TYPE_VTX,-1))<0)
-        {
-                kfree(t);
-                kfree(client);
-                video_device_release(vd);
-                return err;
-        }
-        t->client = client;
-        i2c_attach_client(client);
-        return 0;
-}
+#define R5_TEXT_INSIDE_BOXING_OFF                          0x00
+#define R5_TEXT_INSIDE_BOXING_ON                           0x04
 
-/*
- *      We do most of the hard work when we become a device on the i2c.
- */
-static int saa5246a_probe(struct i2c_adapter *adap)
-{
-        if (adap->class & I2C_CLASS_TV_ANALOG)
-                return i2c_probe(adap, &addr_data, saa5246a_attach);
-        return 0;
-}
+#define R5_TEXT_OUTSIDE_BOXING_OFF                         0x00
+#define R5_TEXT_OUTSIDE_BOXING_ON                          0x08
 
-static int saa5246a_detach(struct i2c_client *client)
-{
-        struct video_device *vd = i2c_get_clientdata(client);
-        i2c_detach_client(client);
-        video_unregister_device(vd);
-        kfree(vd->priv);
-        kfree(client);
-        return 0;
-}
+#define R5_CONTRAST_REDUCTION_INSIDE_BOXING_OFF            0x00
+#define R5_CONTRAST_REDUCTION_INSIDE_BOXING_ON             0x10
 
-/*
- *      I2C interfaces
- */
+#define R5_CONTRAST_REDUCTION_OUTSIDE_BOXING_OFF           0x00
+#define R5_CONTRAST_REDUCTION_OUTSIDE_BOXING_ON            0x20
+
+#define R5_BACKGROUND_COLOR_INSIDE_BOXING_OFF              0x00
+#define R5_BACKGROUND_COLOR_INSIDE_BOXING_ON               0x40
+
+#define R5_BACKGROUND_COLOR_OUTSIDE_BOXING_OFF             0x00
+#define R5_BACKGROUND_COLOR_OUTSIDE_BOXING_ON              0x80
+
+/* Register R6 (Newsflash display) */
+#define R6_NEWSFLASH_PICTURE_INSIDE_BOXING_OFF             0x00
+#define R6_NEWSFLASH_PICTURE_INSIDE_BOXING_ON              0x01
+
+#define R6_NEWSFLASH_PICTURE_OUTSIDE_BOXING_OFF            0x00
+#define R6_NEWSFLASH_PICTURE_OUTSIDE_BOXING_ON             0x02
+
+#define R6_NEWSFLASH_TEXT_INSIDE_BOXING_OFF                0x00
+#define R6_NEWSFLASH_TEXT_INSIDE_BOXING_ON                 0x04
+
+#define R6_NEWSFLASH_TEXT_OUTSIDE_BOXING_OFF               0x00
+#define R6_NEWSFLASH_TEXT_OUTSIDE_BOXING_ON                0x08
+
+#define R6_NEWSFLASH_CONTRAST_REDUCTION_INSIDE_BOXING_OFF  0x00
+#define R6_NEWSFLASH_CONTRAST_REDUCTION_INSIDE_BOXING_ON   0x10
+
+#define R6_NEWSFLASH_CONTRAST_REDUCTION_OUTSIDE_BOXING_OFF 0x00
+#define R6_NEWSFLASH_CONTRAST_REDUCTION_OUTSIDE_BOXING_ON  0x20
+
+#define R6_NEWSFLASH_BACKGROUND_COLOR_INSIDE_BOXING_OFF    0x00
+#define R6_NEWSFLASH_BACKGROUND_COLOR_INSIDE_BOXING_ON     0x40
+
+#define R6_NEWSFLASH_BACKGROUND_COLOR_OUTSIDE_BOXING_OFF   0x00
+#define R6_NEWSFLASH_BACKGROUND_COLOR_OUTSIDE_BOXING_ON    0x80
+
+/* Register R7 (Display mode) */
+#define R7_BOX_OFF_ROW_0                                   0x00
+#define R7_BOX_ON_ROW_0                                    0x01
+
+#define R7_BOX_OFF_ROW_1_TO_23                             0x00
+#define R7_BOX_ON_ROW_1_TO_23                              0x02
+
+#define R7_BOX_OFF_ROW_24                                  0x00
+#define R7_BOX_ON_ROW_24                                   0x04
+
+#define R7_SINGLE_HEIGHT                                   0x00
+#define R7_DOUBLE_HEIGHT                                   0x08
+
+#define R7_TOP_HALF                                        0x00
+#define R7_BOTTOM_HALF                                     0x10
+
+#define R7_REVEAL_OFF                                      0x00
+#define R7_REVEAL_ON                                       0x20
+
+#define R7_CURSER_OFF                                      0x00
+#define R7_CURSER_ON                                       0x40
+
+#define R7_STATUS_BOTTOM                                   0x00
+#define R7_STATUS_TOP                                      0x80
+
+/* Register R8 (Active chapter) */
+#define R8_ACTIVE_CHAPTER_0                                0x00
+#define R8_ACTIVE_CHAPTER_1                                0x01
+#define R8_ACTIVE_CHAPTER_2                                0x02
+#define R8_ACTIVE_CHAPTER_3                                0x03
+#define R8_ACTIVE_CHAPTER_4                                0x04
+#define R8_ACTIVE_CHAPTER_5                                0x05
+#define R8_ACTIVE_CHAPTER_6                                0x06
+#define R8_ACTIVE_CHAPTER_7                                0x07
+
+#define R8_CLEAR_MEMORY                                    0x08
+#define R8_DO_NOT_CLEAR_MEMORY                             0x00
+
+/* Register R9 (Curser row) */
+#define R9_CURSER_ROW_0                                    0x00
+#define R9_CURSER_ROW_1                                    0x01
+#define R9_CURSER_ROW_2                                    0x02
+#define R9_CURSER_ROW_25                                   0x19
+
+/* Register R10 (Curser column) */
+#define R10_CURSER_COLUMN_0                                0x00
+#define R10_CURSER_COLUMN_6                                0x06
+#define R10_CURSER_COLUMN_8                                0x08
+
+/*****************************************************************************/
+/* Row 25 control data in column 0 to 9                                      */
+/*****************************************************************************/
+#define ROW25_COLUMN0_PAGE_UNITS                           0x0F
+
+#define ROW25_COLUMN1_PAGE_TENS                            0x0F
+
+#define ROW25_COLUMN2_MINUTES_UNITS                        0x0F
 
-static struct i2c_driver i2c_driver_videotext =
+#define ROW25_COLUMN3_MINUTES_TENS                         0x07
+#define ROW25_COLUMN3_DELETE_PAGE                          0x08
+
+#define ROW25_COLUMN4_HOUR_UNITS                           0x0F
+
+#define ROW25_COLUMN5_HOUR_TENS                            0x03
+#define ROW25_COLUMN5_INSERT_HEADLINE                      0x04
+#define ROW25_COLUMN5_INSERT_SUBTITLE                      0x08
+
+#define ROW25_COLUMN6_SUPPRESS_HEADER                      0x01
+#define ROW25_COLUMN6_UPDATE_PAGE                          0x02
+#define ROW25_COLUMN6_INTERRUPTED_SEQUENCE                 0x04
+#define ROW25_COLUMN6_SUPPRESS_DISPLAY                     0x08
+
+#define ROW25_COLUMN7_SERIAL_MODE                          0x01
+#define ROW25_COLUMN7_CHARACTER_SET                        0x0E
+
+#define ROW25_COLUMN8_PAGE_HUNDREDS                        0x07
+#define ROW25_COLUMN8_PAGE_NOT_FOUND                       0x10
+
+#define ROW25_COLUMN9_PAGE_BEING_LOOKED_FOR                0x20
+
+#define ROW25_COLUMN0_TO_7_HAMMING_ERROR                   0x10
+
+/*****************************************************************************/
+/* Helper macros for extracting page, hour and minute digits                 */
+/*****************************************************************************/
+/* BYTE_POS  0 is at row 0, column 0,
+   BYTE_POS  1 is at row 0, column 1,
+   BYTE_POS 40 is at row 1, column 0, (with NUM_ROWS_PER_PAGE = 40)
+   BYTE_POS 41 is at row 1, column 1, (with NUM_ROWS_PER_PAGE = 40),
+   ... */
+#define ROW(BYTE_POS)    (BYTE_POS / NUM_ROWS_PER_PAGE)
+#define COLUMN(BYTE_POS) (BYTE_POS % NUM_ROWS_PER_PAGE)
+
+/*****************************************************************************/
+/* Helper macros for extracting page, hour and minute digits                 */
+/*****************************************************************************/
+/* Macros for extracting hundreds, tens and units of a page number which
+   must be in the range 0 ... 0x799.
+   Note that page is coded in hexadecimal, i.e. 0x123 means page 123.
+   page 0x.. means page 8.. */
+#define HUNDREDS_OF_PAGE(page) (((page) / 0x100) & 0x7)
+#define TENS_OF_PAGE(page)     (((page) / 0x10)  & 0xF)
+#define UNITS_OF_PAGE(page)     ((page) & 0xF)
+
+/* Macros for extracting tens and units of a hour information which
+   must be in the range 0 ... 0x24.
+   Note that hour is coded in hexadecimal, i.e. 0x12 means 12 hours */
+#define TENS_OF_HOUR(hour)  ((hour) / 0x10)
+#define UNITS_OF_HOUR(hour) ((hour) & 0xF)
+
+/* Macros for extracting tens and units of a minute information which
+   must be in the range 0 ... 0x59.
+   Note that minute is coded in hexadecimal, i.e. 0x12 means 12 minutes */
+#define TENS_OF_MINUTE(minute)  ((minute) / 0x10)
+#define UNITS_OF_MINUTE(minute) ((minute) & 0xF)
+
+#define HOUR_MAX   0x23
+#define MINUTE_MAX 0x59
+#define PAGE_MAX   0x8FF
+
+
+struct saa5246a_device
 {
-        .driver = {
-                .name   = IF_NAME,              /* name */
-        },
-        .id             = I2C_DRIVERID_SAA5249, /* in i2c.h */
-        .attach_adapter = saa5246a_probe,
-        .detach_client  = saa5246a_detach,
+        u8     pgbuf[NUM_DAUS][VTX_VIRTUALSIZE];
+        int    is_searching[NUM_DAUS];
+        struct i2c_client *client;
+        unsigned long in_use;
+        struct mutex lock;
 };
 
-static struct i2c_client client_template = {
-        .driver         = &i2c_driver_videotext,
-        .name           = "(unset)",
-};
+static struct video_device saa_template;        /* Declared near bottom */
+
+/*
+ *      I2C interfaces
+ */
 
 static int i2c_sendbuf(struct saa5246a_device *t, int reg, int count, u8 *data)
 {
@@ -579,8 +807,8 @@ static inline int saa5246a_stop_dau(struct saa5246a_device *t,
 static int do_saa5246a_ioctl(struct inode *inode, struct file *file,
                             unsigned int cmd, void *arg)
 {
-        struct video_device *vd = video_devdata(file);
-        struct saa5246a_device *t=vd->priv;
+        struct saa5246a_device *t = video_drvdata(file);
+
         switch(cmd)
         {
                 case VTXIOCGETINFO:
@@ -720,8 +948,7 @@ static inline unsigned int vtx_fix_command(unsigned int cmd)
 static int saa5246a_ioctl(struct inode *inode, struct file *file,
                          unsigned int cmd, unsigned long arg)
 {
-        struct video_device *vd = video_devdata(file);
-        struct saa5246a_device *t = vd->priv;
+        struct saa5246a_device *t = video_drvdata(file);
         int err;
 
         cmd = vtx_fix_command(cmd);
@@ -733,21 +960,15 @@ static int saa5246a_ioctl(struct inode *inode, struct file *file,
 
 static int saa5246a_open(struct inode *inode, struct file *file)
 {
-        struct video_device *vd = video_devdata(file);
-        struct saa5246a_device *t = vd->priv;
-        int err;
+        struct saa5246a_device *t = video_drvdata(file);
 
-        err = video_exclusive_open(inode,file);
-        if (err < 0)
-                return err;
+        if (t->client == NULL)
+                return -ENODEV;
 
-        if (t->client==NULL) {
-                err = -ENODEV;
-                goto fail;
-        }
+        if (test_and_set_bit(0, &t->in_use))
+                return -EBUSY;
 
         if (i2c_senddata(t, SAA5246A_REGISTER_R0,
-
                 R0_SELECT_R11 |
                 R0_PLL_TIME_CONSTANT_LONG |
                 R0_ENABLE_nODD_EVEN_OUTPUT |
@@ -773,21 +994,15 @@ static int saa5246a_open(struct inode *inode, struct file *file)
 
                 COMMAND_END))
         {
-                err = -EIO;
-                goto fail;
+                clear_bit(0, &t->in_use);
+                return -EIO;
         }
-
         return 0;
-
-fail:
-        video_exclusive_release(inode,file);
-        return err;
 }
 
 static int saa5246a_release(struct inode *inode, struct file *file)
 {
-        struct video_device *vd = video_devdata(file);
-        struct saa5246a_device *t = vd->priv;
+        struct saa5246a_device *t = video_drvdata(file);
 
         /* Stop all acquisition circuits. */
         i2c_senddata(t, SAA5246A_REGISTER_R1,
@@ -800,26 +1015,10 @@ static int saa5246a_release(struct inode *inode, struct file *file)
                 R1_VCS_TO_SCS,
 
                 COMMAND_END);
-        video_exclusive_release(inode,file);
+        clear_bit(0, &t->in_use);
         return 0;
 }
 
-static int __init init_saa_5246a (void)
-{
-        printk(KERN_INFO
-                "SAA5246A (or compatible) Teletext decoder driver version %d.%d\n",
-                MAJOR_VERSION, MINOR_VERSION);
-        return i2c_add_driver(&i2c_driver_videotext);
-}
-
-static void __exit cleanup_saa_5246a (void)
-{
-        i2c_del_driver(&i2c_driver_videotext);
-}
-
-module_init(init_saa_5246a);
-module_exit(cleanup_saa_5246a);
-
 static const struct file_operations saa_fops = {
         .owner   = THIS_MODULE,
         .open    = saa5246a_open,
@@ -830,8 +1029,79 @@ static const struct file_operations saa_fops = {
 
 static struct video_device saa_template =
 {
-        .name     = IF_NAME,
+        .name     = "saa5246a",
         .fops     = &saa_fops,
         .release  = video_device_release,
         .minor    = -1,
 };
+
+/* Addresses to scan */
+static unsigned short normal_i2c[] = { 0x22 >> 1, I2C_CLIENT_END };
+
+I2C_CLIENT_INSMOD;
+
+static int saa5246a_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
+{
+        int pgbuf;
+        int err;
+        struct video_device *vd;
+        struct saa5246a_device *t;
+
+        v4l_info(client, "chip found @ 0x%x (%s)\n",
+                        client->addr << 1, client->adapter->name);
+        v4l_info(client, "VideoText version %d.%d\n",
+                        MAJOR_VERSION, MINOR_VERSION);
+        t = kzalloc(sizeof(*t), GFP_KERNEL);
+        if (t == NULL)
+                return -ENOMEM;
+        mutex_init(&t->lock);
+
+        /* Now create a video4linux device */
+        vd = video_device_alloc();
+        if (vd == NULL) {
+                kfree(t);
+                return -ENOMEM;
+        }
+        i2c_set_clientdata(client, vd);
+        memcpy(vd, &saa_template, sizeof(*vd));
+
+        for (pgbuf = 0; pgbuf < NUM_DAUS; pgbuf++) {
+                memset(t->pgbuf[pgbuf], ' ', sizeof(t->pgbuf[0]));
+                t->is_searching[pgbuf] = false;
+        }
+        video_set_drvdata(vd, t);
+
+        /* Register it */
+        err = video_register_device(vd, VFL_TYPE_VTX, -1);
+        if (err < 0) {
+                kfree(t);
+                video_device_release(vd);
+                return err;
+        }
+        t->client = client;
+        return 0;
+}
+
+static int saa5246a_remove(struct i2c_client *client)
+{
+        struct video_device *vd = i2c_get_clientdata(client);
+
+        video_unregister_device(vd);
+        kfree(video_get_drvdata(vd));
+        return 0;
+}
+
+static const struct i2c_device_id saa5246a_id[] = {
+        { "saa5246a", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, saa5246a_id);
+
+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
+        .name = "saa5246a",
+        .driverid = I2C_DRIVERID_SAA5249,
+        .probe = saa5246a_probe,
+        .remove = saa5246a_remove,
+        .id_table = saa5246a_id,
+};
diff --git a/drivers/media/video/saa5246a.h b/drivers/media/video/saa5246a.h
deleted file mode 100644
index 64394c036c60..000000000000
--- a/drivers/media/video/saa5246a.h
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
-   Driver for the SAA5246A or SAA5281 Teletext (=Videotext) decoder chips from
-   Philips.
-
-   Copyright (C) 2004 Michael Geng (linux@MichaelGeng.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 __SAA5246A_H__
-#define __SAA5246A_H__
-
-#define MAJOR_VERSION 1         /* driver major version number */
-#define MINOR_VERSION 8         /* driver minor version number */
-
-#define IF_NAME "SAA5246A"
-
-#define I2C_ADDRESS 17
-
-/* Number of DAUs = number of pages that can be searched at the same time. */
-#define NUM_DAUS 4
-
-#define NUM_ROWS_PER_PAGE 40
-
-/* first column is 0 (not 1) */
-#define POS_TIME_START 32
-#define POS_TIME_END 39
-
-#define POS_HEADER_START 7
-#define POS_HEADER_END 31
-
-/* Returns 'true' if the part of the videotext page described with req contains
-   (at least parts of) the time field */
-#define REQ_CONTAINS_TIME(p_req) \
-        ((p_req)->start <= POS_TIME_END && \
-         (p_req)->end   >= POS_TIME_START)
-
-/* Returns 'true' if the part of the videotext page described with req contains
-   (at least parts of) the page header */
-#define REQ_CONTAINS_HEADER(p_req) \
-        ((p_req)->start <= POS_HEADER_END && \
-         (p_req)->end   >= POS_HEADER_START)
-
-/*****************************************************************************/
-/* Mode register numbers of the SAA5246A                                     */
-/*****************************************************************************/
-#define SAA5246A_REGISTER_R0    0
-#define SAA5246A_REGISTER_R1    1
-#define SAA5246A_REGISTER_R2    2
-#define SAA5246A_REGISTER_R3    3
-#define SAA5246A_REGISTER_R4    4
-#define SAA5246A_REGISTER_R5    5
-#define SAA5246A_REGISTER_R6    6
-#define SAA5246A_REGISTER_R7    7
-#define SAA5246A_REGISTER_R8    8
-#define SAA5246A_REGISTER_R9    9
-#define SAA5246A_REGISTER_R10  10
-#define SAA5246A_REGISTER_R11  11
-#define SAA5246A_REGISTER_R11B 11
-
-/* SAA5246A mode registers often autoincrement to the next register.
-   Therefore we use variable argument lists. The following macro indicates
-   the end of a command list. */
-#define COMMAND_END (- 1)
-
-/*****************************************************************************/
-/* Contents of the mode registers of the SAA5246A                            */
-/*****************************************************************************/
-/* Register R0 (Advanced Control) */
-#define R0_SELECT_R11                                      0x00
-#define R0_SELECT_R11B                                     0x01
-
-#define R0_PLL_TIME_CONSTANT_LONG                          0x00
-#define R0_PLL_TIME_CONSTANT_SHORT                         0x02
-
-#define R0_ENABLE_nODD_EVEN_OUTPUT                         0x00
-#define R0_DISABLE_nODD_EVEN_OUTPUT                        0x04
-
-#define R0_ENABLE_HDR_POLL                                 0x00
-#define R0_DISABLE_HDR_POLL                                0x10
-
-#define R0_DO_NOT_FORCE_nODD_EVEN_LOW_IF_PICTURE_DISPLAYED 0x00
-#define R0_FORCE_nODD_EVEN_LOW_IF_PICTURE_DISPLAYED        0x20
-
-#define R0_NO_FREE_RUN_PLL                                 0x00
-#define R0_FREE_RUN_PLL                                    0x40
-
-#define R0_NO_AUTOMATIC_FASTEXT_PROMPT                     0x00
-#define R0_AUTOMATIC_FASTEXT_PROMPT                        0x80
-
-/* Register R1 (Mode) */
-#define R1_INTERLACED_312_AND_HALF_312_AND_HALF_LINES      0x00
-#define R1_NON_INTERLACED_312_313_LINES                    0x01
-#define R1_NON_INTERLACED_312_312_LINES                    0x02
-#define R1_FFB_LEADING_EDGE_IN_FIRST_BROAD_PULSE           0x03
-#define R1_FFB_LEADING_EDGE_IN_SECOND_BROAD_PULSE          0x07
-
-#define R1_DEW                                             0x00
-#define R1_FULL_FIELD                                      0x08
-
-#define R1_EXTENDED_PACKET_DISABLE                         0x00
-#define R1_EXTENDED_PACKET_ENABLE                          0x10
-
-#define R1_DAUS_ALL_ON                                     0x00
-#define R1_DAUS_ALL_OFF                                    0x20
-
-#define R1_7_BITS_PLUS_PARITY                              0x00
-#define R1_8_BITS_NO_PARITY                                0x40
-
-#define R1_VCS_TO_SCS                                      0x00
-#define R1_NO_VCS_TO_SCS                                   0x80
-
-/* Register R2 (Page request address) */
-#define R2_IN_R3_SELECT_PAGE_HUNDREDS                      0x00
-#define R2_IN_R3_SELECT_PAGE_TENS                          0x01
-#define R2_IN_R3_SELECT_PAGE_UNITS                         0x02
-#define R2_IN_R3_SELECT_HOURS_TENS                         0x03
-#define R2_IN_R3_SELECT_HOURS_UNITS                        0x04
-#define R2_IN_R3_SELECT_MINUTES_TENS                       0x05
-#define R2_IN_R3_SELECT_MINUTES_UNITS                      0x06
-
-#define R2_DAU_0                                           0x00
-#define R2_DAU_1                                           0x10
-#define R2_DAU_2                                           0x20
-#define R2_DAU_3                                           0x30
-
-#define R2_BANK_0                                          0x00
-#define R2_BANK 1                                          0x40
-
-#define R2_HAMMING_CHECK_ON                                0x80
-#define R2_HAMMING_CHECK_OFF                               0x00
-
-/* Register R3 (Page request data) */
-#define R3_PAGE_HUNDREDS_0                                 0x00
-#define R3_PAGE_HUNDREDS_1                                 0x01
-#define R3_PAGE_HUNDREDS_2                                 0x02
-#define R3_PAGE_HUNDREDS_3                                 0x03
-#define R3_PAGE_HUNDREDS_4                                 0x04
-#define R3_PAGE_HUNDREDS_5                                 0x05
-#define R3_PAGE_HUNDREDS_6                                 0x06
-#define R3_PAGE_HUNDREDS_7                                 0x07
-
-#define R3_HOLD_PAGE                                       0x00
-#define R3_UPDATE_PAGE                                     0x08
-
-#define R3_PAGE_HUNDREDS_DO_NOT_CARE                       0x00
-#define R3_PAGE_HUNDREDS_DO_CARE                           0x10
-
-#define R3_PAGE_TENS_DO_NOT_CARE                           0x00
-#define R3_PAGE_TENS_DO_CARE                               0x10
-
-#define R3_PAGE_UNITS_DO_NOT_CARE                          0x00
-#define R3_PAGE_UNITS_DO_CARE                              0x10
-
-#define R3_HOURS_TENS_DO_NOT_CARE                          0x00
-#define R3_HOURS_TENS_DO_CARE                              0x10
-
-#define R3_HOURS_UNITS_DO_NOT_CARE                         0x00
-#define R3_HOURS_UNITS_DO_CARE                             0x10
-
-#define R3_MINUTES_TENS_DO_NOT_CARE                        0x00
-#define R3_MINUTES_TENS_DO_CARE                            0x10
-
-#define R3_MINUTES_UNITS_DO_NOT_CARE                       0x00
-#define R3_MINUTES_UNITS_DO_CARE                           0x10
-
-/* Register R4 (Display chapter) */
-#define R4_DISPLAY_PAGE_0                                  0x00
-#define R4_DISPLAY_PAGE_1                                  0x01
-#define R4_DISPLAY_PAGE_2                                  0x02
-#define R4_DISPLAY_PAGE_3                                  0x03
-#define R4_DISPLAY_PAGE_4                                  0x04
-#define R4_DISPLAY_PAGE_5                                  0x05
-#define R4_DISPLAY_PAGE_6                                  0x06
-#define R4_DISPLAY_PAGE_7                                  0x07
-
-/* Register R5 (Normal display control) */
-#define R5_PICTURE_INSIDE_BOXING_OFF                       0x00
-#define R5_PICTURE_INSIDE_BOXING_ON                        0x01
-
-#define R5_PICTURE_OUTSIDE_BOXING_OFF                      0x00
-#define R5_PICTURE_OUTSIDE_BOXING_ON                       0x02
-
-#define R5_TEXT_INSIDE_BOXING_OFF                          0x00
-#define R5_TEXT_INSIDE_BOXING_ON                           0x04
-
-#define R5_TEXT_OUTSIDE_BOXING_OFF                         0x00
-#define R5_TEXT_OUTSIDE_BOXING_ON                          0x08
-
-#define R5_CONTRAST_REDUCTION_INSIDE_BOXING_OFF            0x00
-#define R5_CONTRAST_REDUCTION_INSIDE_BOXING_ON             0x10
-
-#define R5_CONTRAST_REDUCTION_OUTSIDE_BOXING_OFF           0x00
-#define R5_CONTRAST_REDUCTION_OUTSIDE_BOXING_ON            0x20
-
-#define R5_BACKGROUND_COLOR_INSIDE_BOXING_OFF              0x00
-#define R5_BACKGROUND_COLOR_INSIDE_BOXING_ON               0x40
-
-#define R5_BACKGROUND_COLOR_OUTSIDE_BOXING_OFF             0x00
-#define R5_BACKGROUND_COLOR_OUTSIDE_BOXING_ON              0x80
-
-/* Register R6 (Newsflash display) */
-#define R6_NEWSFLASH_PICTURE_INSIDE_BOXING_OFF             0x00
-#define R6_NEWSFLASH_PICTURE_INSIDE_BOXING_ON              0x01
-
-#define R6_NEWSFLASH_PICTURE_OUTSIDE_BOXING_OFF            0x00
-#define R6_NEWSFLASH_PICTURE_OUTSIDE_BOXING_ON             0x02
-
-#define R6_NEWSFLASH_TEXT_INSIDE_BOXING_OFF                0x00
-#define R6_NEWSFLASH_TEXT_INSIDE_BOXING_ON                 0x04
-
-#define R6_NEWSFLASH_TEXT_OUTSIDE_BOXING_OFF               0x00
-#define R6_NEWSFLASH_TEXT_OUTSIDE_BOXING_ON                0x08
-
-#define R6_NEWSFLASH_CONTRAST_REDUCTION_INSIDE_BOXING_OFF  0x00
-#define R6_NEWSFLASH_CONTRAST_REDUCTION_INSIDE_BOXING_ON   0x10
-
-#define R6_NEWSFLASH_CONTRAST_REDUCTION_OUTSIDE_BOXING_OFF 0x00
-#define R6_NEWSFLASH_CONTRAST_REDUCTION_OUTSIDE_BOXING_ON  0x20
-
-#define R6_NEWSFLASH_BACKGROUND_COLOR_INSIDE_BOXING_OFF    0x00
-#define R6_NEWSFLASH_BACKGROUND_COLOR_INSIDE_BOXING_ON     0x40
-
-#define R6_NEWSFLASH_BACKGROUND_COLOR_OUTSIDE_BOXING_OFF   0x00
-#define R6_NEWSFLASH_BACKGROUND_COLOR_OUTSIDE_BOXING_ON    0x80
-
-/* Register R7 (Display mode) */
-#define R7_BOX_OFF_ROW_0                                   0x00
-#define R7_BOX_ON_ROW_0                                    0x01
-
-#define R7_BOX_OFF_ROW_1_TO_23                             0x00
-#define R7_BOX_ON_ROW_1_TO_23                              0x02
-
-#define R7_BOX_OFF_ROW_24                                  0x00
-#define R7_BOX_ON_ROW_24                                   0x04
-
-#define R7_SINGLE_HEIGHT                                   0x00
-#define R7_DOUBLE_HEIGHT                                   0x08
-
-#define R7_TOP_HALF                                        0x00
-#define R7_BOTTOM_HALF                                     0x10
-
-#define R7_REVEAL_OFF                                      0x00
-#define R7_REVEAL_ON                                       0x20
-
-#define R7_CURSER_OFF                                      0x00
-#define R7_CURSER_ON                                       0x40
-
-#define R7_STATUS_BOTTOM                                   0x00
-#define R7_STATUS_TOP                                      0x80
-
-/* Register R8 (Active chapter) */
-#define R8_ACTIVE_CHAPTER_0                                0x00
-#define R8_ACTIVE_CHAPTER_1                                0x01
-#define R8_ACTIVE_CHAPTER_2                                0x02
-#define R8_ACTIVE_CHAPTER_3                                0x03
-#define R8_ACTIVE_CHAPTER_4                                0x04
-#define R8_ACTIVE_CHAPTER_5                                0x05
-#define R8_ACTIVE_CHAPTER_6                                0x06
-#define R8_ACTIVE_CHAPTER_7                                0x07
-
-#define R8_CLEAR_MEMORY                                    0x08
-#define R8_DO_NOT_CLEAR_MEMORY                             0x00
-
-/* Register R9 (Curser row) */
-#define R9_CURSER_ROW_0                                    0x00
-#define R9_CURSER_ROW_1                                    0x01
-#define R9_CURSER_ROW_2                                    0x02
-#define R9_CURSER_ROW_25                                   0x19
-
-/* Register R10 (Curser column) */
-#define R10_CURSER_COLUMN_0                                0x00
-#define R10_CURSER_COLUMN_6                                0x06
-#define R10_CURSER_COLUMN_8                                0x08
-
-/*****************************************************************************/
-/* Row 25 control data in column 0 to 9                                      */
-/*****************************************************************************/
-#define ROW25_COLUMN0_PAGE_UNITS                           0x0F
-
-#define ROW25_COLUMN1_PAGE_TENS                            0x0F
-
-#define ROW25_COLUMN2_MINUTES_UNITS                        0x0F
-
-#define ROW25_COLUMN3_MINUTES_TENS                         0x07
-#define ROW25_COLUMN3_DELETE_PAGE                          0x08
-
-#define ROW25_COLUMN4_HOUR_UNITS                           0x0F
-
-#define ROW25_COLUMN5_HOUR_TENS                            0x03
-#define ROW25_COLUMN5_INSERT_HEADLINE                      0x04
-#define ROW25_COLUMN5_INSERT_SUBTITLE                      0x08
-
-#define ROW25_COLUMN6_SUPPRESS_HEADER                      0x01
-#define ROW25_COLUMN6_UPDATE_PAGE                          0x02
-#define ROW25_COLUMN6_INTERRUPTED_SEQUENCE                 0x04
-#define ROW25_COLUMN6_SUPPRESS_DISPLAY                     0x08
-
-#define ROW25_COLUMN7_SERIAL_MODE                          0x01
-#define ROW25_COLUMN7_CHARACTER_SET                        0x0E
-
-#define ROW25_COLUMN8_PAGE_HUNDREDS                        0x07
-#define ROW25_COLUMN8_PAGE_NOT_FOUND                       0x10
-
-#define ROW25_COLUMN9_PAGE_BEING_LOOKED_FOR                0x20
-
-#define ROW25_COLUMN0_TO_7_HAMMING_ERROR                   0x10
-
-/*****************************************************************************/
-/* Helper macros for extracting page, hour and minute digits                 */
-/*****************************************************************************/
-/* BYTE_POS  0 is at row 0, column 0,
-   BYTE_POS  1 is at row 0, column 1,
-   BYTE_POS 40 is at row 1, column 0, (with NUM_ROWS_PER_PAGE = 40)
-   BYTE_POS 41 is at row 1, column 1, (with NUM_ROWS_PER_PAGE = 40),
-   ... */
-#define ROW(BYTE_POS)    (BYTE_POS / NUM_ROWS_PER_PAGE)
-#define COLUMN(BYTE_POS) (BYTE_POS % NUM_ROWS_PER_PAGE)
-
-/*****************************************************************************/
-/* Helper macros for extracting page, hour and minute digits                 */
-/*****************************************************************************/
-/* Macros for extracting hundreds, tens and units of a page number which
-   must be in the range 0 ... 0x799.
-   Note that page is coded in hexadecimal, i.e. 0x123 means page 123.
-   page 0x.. means page 8.. */
-#define HUNDREDS_OF_PAGE(page) (((page) / 0x100) & 0x7)
-#define TENS_OF_PAGE(page)     (((page) / 0x10)  & 0xF)
-#define UNITS_OF_PAGE(page)     ((page) & 0xF)
-
-/* Macros for extracting tens and units of a hour information which
-   must be in the range 0 ... 0x24.
-   Note that hour is coded in hexadecimal, i.e. 0x12 means 12 hours */
-#define TENS_OF_HOUR(hour)  ((hour) / 0x10)
-#define UNITS_OF_HOUR(hour) ((hour) & 0xF)
-
-/* Macros for extracting tens and units of a minute information which
-   must be in the range 0 ... 0x59.
-   Note that minute is coded in hexadecimal, i.e. 0x12 means 12 minutes */
-#define TENS_OF_MINUTE(minute)  ((minute) / 0x10)
-#define UNITS_OF_MINUTE(minute) ((minute) & 0xF)
-
-#define HOUR_MAX   0x23
-#define MINUTE_MAX 0x59
-#define PAGE_MAX   0x8FF
-
-#endif  /* __SAA5246A_H__ */
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index 0d639738d4e6..3bb959c25d9d 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -15,8 +15,6 @@
  *
  *      Copyright (c) 1998 Richard Guenther <richard.guenther@student.uni-tuebingen.de>
  *
- * $Id: saa5249.c,v 1.1 1998/03/30 22:23:23 alan Exp $
- *
  *      Derived From
  *
  * vtx.c:
@@ -45,33 +43,28 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/errno.h>
-#include <linux/delay.h>
-#include <linux/ioport.h>
-#include <linux/slab.h>
 #include <linux/init.h>
-#include <stdarg.h>
 #include <linux/i2c.h>
+#include <linux/smp_lock.h>
+#include <linux/mutex.h>
+#include <linux/delay.h>
 #include <linux/videotext.h>
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
-#include <linux/mutex.h>
-
+#include <media/v4l2-i2c-drv-legacy.h>
 
-#include <asm/io.h>
-#include <asm/uaccess.h>
+MODULE_AUTHOR("Michael Geng <linux@MichaelGeng.de>");
+MODULE_DESCRIPTION("Philips SAA5249 Teletext decoder driver");
+MODULE_LICENSE("GPL");
 
 #define VTX_VER_MAJ 1
 #define VTX_VER_MIN 8
 
 
-
 #define NUM_DAUS 4
 #define NUM_BUFS 8
-#define IF_NAME "SAA5249"
 
 static const int disp_modes[8][3] =
 {
@@ -109,6 +102,7 @@ struct saa5249_device
         int disp_mode;
         int virtual_mode;
         struct i2c_client *client;
+        unsigned long in_use;
         struct mutex lock;
 };
 
@@ -123,125 +117,8 @@ struct saa5249_device
 
 #define VTX_DEV_MINOR 0
 
-/* General defines and debugging support */
-
-#define RESCHED do { cond_resched(); } while(0)
-
 static struct video_device saa_template;        /* Declared near bottom */
 
-/* Addresses to scan */
-static unsigned short normal_i2c[] = {34>>1,I2C_CLIENT_END};
-
-I2C_CLIENT_INSMOD;
-
-static struct i2c_client client_template;
-
-static int saa5249_attach(struct i2c_adapter *adap, int addr, int kind)
-{
-        int pgbuf;
-        int err;
-        struct i2c_client *client;
-        struct video_device *vd;
-        struct saa5249_device *t;
-
-        printk(KERN_INFO "saa5249: teletext chip found.\n");
-        client=kmalloc(sizeof(*client), GFP_KERNEL);
-        if(client==NULL)
-                return -ENOMEM;
-        client_template.adapter = adap;
-        client_template.addr = addr;
-        memcpy(client, &client_template, sizeof(*client));
-        t = kzalloc(sizeof(*t), GFP_KERNEL);
-        if(t==NULL)
-        {
-                kfree(client);
-                return -ENOMEM;
-        }
-        strlcpy(client->name, IF_NAME, I2C_NAME_SIZE);
-        mutex_init(&t->lock);
-
-        /*
-         *      Now create a video4linux device
-         */
-
-        vd = kmalloc(sizeof(struct video_device), GFP_KERNEL);
-        if(vd==NULL)
-        {
-                kfree(t);
-                kfree(client);
-                return -ENOMEM;
-        }
-        i2c_set_clientdata(client, vd);
-        memcpy(vd, &saa_template, sizeof(*vd));
-
-        for (pgbuf = 0; pgbuf < NUM_DAUS; pgbuf++)
-        {
-                memset(t->vdau[pgbuf].pgbuf, ' ', sizeof(t->vdau[0].pgbuf));
-                memset(t->vdau[pgbuf].sregs, 0, sizeof(t->vdau[0].sregs));
-                memset(t->vdau[pgbuf].laststat, 0, sizeof(t->vdau[0].laststat));
-                t->vdau[pgbuf].expire = 0;
-                t->vdau[pgbuf].clrfound = true;
-                t->vdau[pgbuf].stopped = true;
-                t->is_searching[pgbuf] = false;
-        }
-        vd->priv=t;
-
-
-        /*
-         *      Register it
-         */
-
-        if((err=video_register_device(vd, VFL_TYPE_VTX,-1))<0)
-        {
-                kfree(t);
-                kfree(vd);
-                kfree(client);
-                return err;
-        }
-        t->client = client;
-        i2c_attach_client(client);
-        return 0;
-}
-
-/*
- *      We do most of the hard work when we become a device on the i2c.
- */
-
-static int saa5249_probe(struct i2c_adapter *adap)
-{
-        if (adap->class & I2C_CLASS_TV_ANALOG)
-                return i2c_probe(adap, &addr_data, saa5249_attach);
-        return 0;
-}
-
-static int saa5249_detach(struct i2c_client *client)
-{
-        struct video_device *vd = i2c_get_clientdata(client);
-        i2c_detach_client(client);
-        video_unregister_device(vd);
-        kfree(vd->priv);
-        kfree(vd);
-        kfree(client);
-        return 0;
-}
-
-/* new I2C driver support */
-
-static struct i2c_driver i2c_driver_videotext =
-{
-        .driver = {
-                .name   = IF_NAME,              /* name */
-        },
-        .id             = I2C_DRIVERID_SAA5249, /* in i2c.h */
-        .attach_adapter = saa5249_probe,
-        .detach_client  = saa5249_detach,
-};
-
-static struct i2c_client client_template = {
-        .driver         = &i2c_driver_videotext,
-        .name           = "(unset)",
-};
-
 /*
  *      Wait the given number of jiffies (10ms). This calls the scheduler, so the actual
  *      delay may be longer.
@@ -275,7 +152,7 @@ static int i2c_sendbuf(struct saa5249_device *t, int reg, int count, u8 *data)
         buf[0] = reg;
         memcpy(buf+1, data, count);
 
-        if(i2c_master_send(t->client, buf, count+1)==count+1)
+        if (i2c_master_send(t->client, buf, count + 1) == count + 1)
                 return 0;
         return -1;
 }
@@ -317,246 +194,236 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
                             unsigned int cmd, void *arg)
 {
         static int virtual_mode = false;
-        struct video_device *vd = video_devdata(file);
-        struct saa5249_device *t=vd->priv;
+        struct saa5249_device *t = video_drvdata(file);
 
-        switch(cmd)
+        switch (cmd) {
+        case VTXIOCGETINFO:
         {
-                case VTXIOCGETINFO:
-                {
-                        vtx_info_t *info = arg;
-                        info->version_major = VTX_VER_MAJ;
-                        info->version_minor = VTX_VER_MIN;
-                        info->numpages = NUM_DAUS;
-                        /*info->cct_type = CCT_TYPE;*/
-                        return 0;
-                }
+                vtx_info_t *info = arg;
+                info->version_major = VTX_VER_MAJ;
+                info->version_minor = VTX_VER_MIN;
+                info->numpages = NUM_DAUS;
+                /*info->cct_type = CCT_TYPE;*/
+                return 0;
+        }
 
-                case VTXIOCCLRPAGE:
-                {
-                        vtx_pagereq_t *req = arg;
+        case VTXIOCCLRPAGE:
+        {
+                vtx_pagereq_t *req = arg;
 
-                        if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
-                                return -EINVAL;
-                        memset(t->vdau[req->pgbuf].pgbuf, ' ', sizeof(t->vdau[0].pgbuf));
-                        t->vdau[req->pgbuf].clrfound = true;
-                        return 0;
-                }
+                if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
+                        return -EINVAL;
+                memset(t->vdau[req->pgbuf].pgbuf, ' ', sizeof(t->vdau[0].pgbuf));
+                t->vdau[req->pgbuf].clrfound = true;
+                return 0;
+        }
 
-                case VTXIOCCLRFOUND:
-                {
-                        vtx_pagereq_t *req = arg;
+        case VTXIOCCLRFOUND:
+        {
+                vtx_pagereq_t *req = arg;
 
-                        if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
-                                return -EINVAL;
-                        t->vdau[req->pgbuf].clrfound = true;
-                        return 0;
-                }
+                if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
+                        return -EINVAL;
+                t->vdau[req->pgbuf].clrfound = true;
+                return 0;
+        }
 
-                case VTXIOCPAGEREQ:
-                {
-                        vtx_pagereq_t *req = arg;
-                        if (!(req->pagemask & PGMASK_PAGE))
-                                req->page = 0;
-                        if (!(req->pagemask & PGMASK_HOUR))
-                                req->hour = 0;
-                        if (!(req->pagemask & PGMASK_MINUTE))
-                                req->minute = 0;
-                        if (req->page < 0 || req->page > 0x8ff) /* 7FF ?? */
-                                return -EINVAL;
-                        req->page &= 0x7ff;
-                        if (req->hour < 0 || req->hour > 0x3f || req->minute < 0 || req->minute > 0x7f ||
-                                req->pagemask < 0 || req->pagemask >= PGMASK_MAX || req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
-                                return -EINVAL;
-                        t->vdau[req->pgbuf].sregs[0] = (req->pagemask & PG_HUND ? 0x10 : 0) | (req->page / 0x100);
-                        t->vdau[req->pgbuf].sregs[1] = (req->pagemask & PG_TEN ? 0x10 : 0) | ((req->page / 0x10) & 0xf);
-                        t->vdau[req->pgbuf].sregs[2] = (req->pagemask & PG_UNIT ? 0x10 : 0) | (req->page & 0xf);
-                        t->vdau[req->pgbuf].sregs[3] = (req->pagemask & HR_TEN ? 0x10 : 0) | (req->hour / 0x10);
-                        t->vdau[req->pgbuf].sregs[4] = (req->pagemask & HR_UNIT ? 0x10 : 0) | (req->hour & 0xf);
-                        t->vdau[req->pgbuf].sregs[5] = (req->pagemask & MIN_TEN ? 0x10 : 0) | (req->minute / 0x10);
-                        t->vdau[req->pgbuf].sregs[6] = (req->pagemask & MIN_UNIT ? 0x10 : 0) | (req->minute & 0xf);
-                        t->vdau[req->pgbuf].stopped = false;
-                        t->vdau[req->pgbuf].clrfound = true;
-                        t->is_searching[req->pgbuf] = true;
-                        return 0;
-                }
+        case VTXIOCPAGEREQ:
+        {
+                vtx_pagereq_t *req = arg;
+                if (!(req->pagemask & PGMASK_PAGE))
+                        req->page = 0;
+                if (!(req->pagemask & PGMASK_HOUR))
+                        req->hour = 0;
+                if (!(req->pagemask & PGMASK_MINUTE))
+                        req->minute = 0;
+                if (req->page < 0 || req->page > 0x8ff) /* 7FF ?? */
+                        return -EINVAL;
+                req->page &= 0x7ff;
+                if (req->hour < 0 || req->hour > 0x3f || req->minute < 0 || req->minute > 0x7f ||
+                        req->pagemask < 0 || req->pagemask >= PGMASK_MAX || req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
+                        return -EINVAL;
+                t->vdau[req->pgbuf].sregs[0] = (req->pagemask & PG_HUND ? 0x10 : 0) | (req->page / 0x100);
+                t->vdau[req->pgbuf].sregs[1] = (req->pagemask & PG_TEN ? 0x10 : 0) | ((req->page / 0x10) & 0xf);
+                t->vdau[req->pgbuf].sregs[2] = (req->pagemask & PG_UNIT ? 0x10 : 0) | (req->page & 0xf);
+                t->vdau[req->pgbuf].sregs[3] = (req->pagemask & HR_TEN ? 0x10 : 0) | (req->hour / 0x10);
+                t->vdau[req->pgbuf].sregs[4] = (req->pagemask & HR_UNIT ? 0x10 : 0) | (req->hour & 0xf);
+                t->vdau[req->pgbuf].sregs[5] = (req->pagemask & MIN_TEN ? 0x10 : 0) | (req->minute / 0x10);
+                t->vdau[req->pgbuf].sregs[6] = (req->pagemask & MIN_UNIT ? 0x10 : 0) | (req->minute & 0xf);
+                t->vdau[req->pgbuf].stopped = false;
+                t->vdau[req->pgbuf].clrfound = true;
+                t->is_searching[req->pgbuf] = true;
+                return 0;
+        }
 
-                case VTXIOCGETSTAT:
-                {
-                        vtx_pagereq_t *req = arg;
-                        u8 infobits[10];
-                        vtx_pageinfo_t info;
-                        int a;
-
-                        if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
-                                return -EINVAL;
-                        if (!t->vdau[req->pgbuf].stopped)
-                        {
-                                if (i2c_senddata(t, 2, 0, -1) ||
-                                        i2c_sendbuf(t, 3, sizeof(t->vdau[0].sregs), t->vdau[req->pgbuf].sregs) ||
-                                        i2c_senddata(t, 8, 0, 25, 0, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', -1) ||
-                                        i2c_senddata(t, 2, 0, t->vdau[req->pgbuf].sregs[0] | 8, -1) ||
-                                        i2c_senddata(t, 8, 0, 25, 0, -1))
-                                        return -EIO;
-                                jdelay(PAGE_WAIT);
-                                if (i2c_getdata(t, 10, infobits))
-                                        return -EIO;
+        case VTXIOCGETSTAT:
+        {
+                vtx_pagereq_t *req = arg;
+                u8 infobits[10];
+                vtx_pageinfo_t info;
+                int a;
+
+                if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
+                        return -EINVAL;
+                if (!t->vdau[req->pgbuf].stopped) {
+                        if (i2c_senddata(t, 2, 0, -1) ||
+                                i2c_sendbuf(t, 3, sizeof(t->vdau[0].sregs), t->vdau[req->pgbuf].sregs) ||
+                                i2c_senddata(t, 8, 0, 25, 0, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', -1) ||
+                                i2c_senddata(t, 2, 0, t->vdau[req->pgbuf].sregs[0] | 8, -1) ||
+                                i2c_senddata(t, 8, 0, 25, 0, -1))
+                                return -EIO;
+                        jdelay(PAGE_WAIT);
+                        if (i2c_getdata(t, 10, infobits))
+                                return -EIO;
 
-                                if (!(infobits[8] & 0x10) && !(infobits[7] & 0xf0) &&   /* check FOUND-bit */
-                                        (memcmp(infobits, t->vdau[req->pgbuf].laststat, sizeof(infobits)) ||
-                                        time_after_eq(jiffies, t->vdau[req->pgbuf].expire)))
-                                {               /* check if new page arrived */
-                                        if (i2c_senddata(t, 8, 0, 0, 0, -1) ||
-                                                i2c_getdata(t, VTX_PAGESIZE, t->vdau[req->pgbuf].pgbuf))
+                        if (!(infobits[8] & 0x10) && !(infobits[7] & 0xf0) &&   /* check FOUND-bit */
+                                (memcmp(infobits, t->vdau[req->pgbuf].laststat, sizeof(infobits)) ||
+                                time_after_eq(jiffies, t->vdau[req->pgbuf].expire)))
+                        {               /* check if new page arrived */
+                                if (i2c_senddata(t, 8, 0, 0, 0, -1) ||
+                                        i2c_getdata(t, VTX_PAGESIZE, t->vdau[req->pgbuf].pgbuf))
+                                        return -EIO;
+                                t->vdau[req->pgbuf].expire = jiffies + PGBUF_EXPIRE;
+                                memset(t->vdau[req->pgbuf].pgbuf + VTX_PAGESIZE, ' ', VTX_VIRTUALSIZE - VTX_PAGESIZE);
+                                if (t->virtual_mode) {
+                                        /* Packet X/24 */
+                                        if (i2c_senddata(t, 8, 0, 0x20, 0, -1) ||
+                                                i2c_getdata(t, 40, t->vdau[req->pgbuf].pgbuf + VTX_PAGESIZE + 20 * 40))
+                                                return -EIO;
+                                        /* Packet X/27/0 */
+                                        if (i2c_senddata(t, 8, 0, 0x21, 0, -1) ||
+                                                i2c_getdata(t, 40, t->vdau[req->pgbuf].pgbuf + VTX_PAGESIZE + 16 * 40))
+                                                return -EIO;
+                                        /* Packet 8/30/0...8/30/15
+                                         * FIXME: AFAIK, the 5249 does hamming-decoding for some bytes in packet 8/30,
+                                         *        so we should undo this here.
+                                         */
+                                        if (i2c_senddata(t, 8, 0, 0x22, 0, -1) ||
+                                                i2c_getdata(t, 40, t->vdau[req->pgbuf].pgbuf + VTX_PAGESIZE + 23 * 40))
                                                 return -EIO;
-                                        t->vdau[req->pgbuf].expire = jiffies + PGBUF_EXPIRE;
-                                        memset(t->vdau[req->pgbuf].pgbuf + VTX_PAGESIZE, ' ', VTX_VIRTUALSIZE - VTX_PAGESIZE);
-                                        if (t->virtual_mode)
-                                        {
-                                                /* Packet X/24 */
-                                                if (i2c_senddata(t, 8, 0, 0x20, 0, -1) ||
-                                                        i2c_getdata(t, 40, t->vdau[req->pgbuf].pgbuf + VTX_PAGESIZE + 20 * 40))
-                                                        return -EIO;
-                                                /* Packet X/27/0 */
-                                                if (i2c_senddata(t, 8, 0, 0x21, 0, -1) ||
-                                                        i2c_getdata(t, 40, t->vdau[req->pgbuf].pgbuf + VTX_PAGESIZE + 16 * 40))
-                                                        return -EIO;
-                                                /* Packet 8/30/0...8/30/15
-                                                 * FIXME: AFAIK, the 5249 does hamming-decoding for some bytes in packet 8/30,
-                                                 *        so we should undo this here.
-                                                 */
-                                                if (i2c_senddata(t, 8, 0, 0x22, 0, -1) ||
-                                                        i2c_getdata(t, 40, t->vdau[req->pgbuf].pgbuf + VTX_PAGESIZE + 23 * 40))
-                                                        return -EIO;
-                                        }
-                                        t->vdau[req->pgbuf].clrfound = false;
-                                        memcpy(t->vdau[req->pgbuf].laststat, infobits, sizeof(infobits));
-                                }
-                                else
-                                {
-                                        memcpy(infobits, t->vdau[req->pgbuf].laststat, sizeof(infobits));
                                 }
-                        }
-                        else
-                        {
+                                t->vdau[req->pgbuf].clrfound = false;
+                                memcpy(t->vdau[req->pgbuf].laststat, infobits, sizeof(infobits));
+                        } else {
                                 memcpy(infobits, t->vdau[req->pgbuf].laststat, sizeof(infobits));
                         }
+                } else {
+                        memcpy(infobits, t->vdau[req->pgbuf].laststat, sizeof(infobits));
+                }
 
-                        info.pagenum = ((infobits[8] << 8) & 0x700) | ((infobits[1] << 4) & 0xf0) | (infobits[0] & 0x0f);
-                        if (info.pagenum < 0x100)
-                                info.pagenum += 0x800;
-                        info.hour = ((infobits[5] << 4) & 0x30) | (infobits[4] & 0x0f);
-                        info.minute = ((infobits[3] << 4) & 0x70) | (infobits[2] & 0x0f);
-                        info.charset = ((infobits[7] >> 1) & 7);
-                        info.delete = !!(infobits[3] & 8);
-                        info.headline = !!(infobits[5] & 4);
-                        info.subtitle = !!(infobits[5] & 8);
-                        info.supp_header = !!(infobits[6] & 1);
-                        info.update = !!(infobits[6] & 2);
-                        info.inter_seq = !!(infobits[6] & 4);
-                        info.dis_disp = !!(infobits[6] & 8);
-                        info.serial = !!(infobits[7] & 1);
-                        info.notfound = !!(infobits[8] & 0x10);
-                        info.pblf = !!(infobits[9] & 0x20);
-                        info.hamming = 0;
-                        for (a = 0; a <= 7; a++)
-                        {
-                                if (infobits[a] & 0xf0)
-                                {
-                                        info.hamming = 1;
-                                        break;
-                                }
-                        }
-                        if (t->vdau[req->pgbuf].clrfound)
-                                info.notfound = 1;
-                        if(copy_to_user(req->buffer, &info, sizeof(vtx_pageinfo_t)))
-                                return -EFAULT;
-                        if (!info.hamming && !info.notfound)
-                        {
-                                t->is_searching[req->pgbuf] = false;
+                info.pagenum = ((infobits[8] << 8) & 0x700) | ((infobits[1] << 4) & 0xf0) | (infobits[0] & 0x0f);
+                if (info.pagenum < 0x100)
+                        info.pagenum += 0x800;
+                info.hour = ((infobits[5] << 4) & 0x30) | (infobits[4] & 0x0f);
+                info.minute = ((infobits[3] << 4) & 0x70) | (infobits[2] & 0x0f);
+                info.charset = ((infobits[7] >> 1) & 7);
+                info.delete = !!(infobits[3] & 8);
+                info.headline = !!(infobits[5] & 4);
+                info.subtitle = !!(infobits[5] & 8);
+                info.supp_header = !!(infobits[6] & 1);
+                info.update = !!(infobits[6] & 2);
+                info.inter_seq = !!(infobits[6] & 4);
+                info.dis_disp = !!(infobits[6] & 8);
+                info.serial = !!(infobits[7] & 1);
+                info.notfound = !!(infobits[8] & 0x10);
+                info.pblf = !!(infobits[9] & 0x20);
+                info.hamming = 0;
+                for (a = 0; a <= 7; a++) {
+                        if (infobits[a] & 0xf0) {
+                                info.hamming = 1;
+                                break;
                         }
-                        return 0;
                 }
+                if (t->vdau[req->pgbuf].clrfound)
+                        info.notfound = 1;
+                if (copy_to_user(req->buffer, &info, sizeof(vtx_pageinfo_t)))
+                        return -EFAULT;
+                if (!info.hamming && !info.notfound)
+                        t->is_searching[req->pgbuf] = false;
+                return 0;
+        }
 
-                case VTXIOCGETPAGE:
-                {
-                        vtx_pagereq_t *req = arg;
-                        int start, end;
-
-                        if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS || req->start < 0 ||
-                                req->start > req->end || req->end >= (virtual_mode ? VTX_VIRTUALSIZE : VTX_PAGESIZE))
-                                return -EINVAL;
-                        if(copy_to_user(req->buffer, &t->vdau[req->pgbuf].pgbuf[req->start], req->end - req->start + 1))
+        case VTXIOCGETPAGE:
+        {
+                vtx_pagereq_t *req = arg;
+                int start, end;
+
+                if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS || req->start < 0 ||
+                        req->start > req->end || req->end >= (virtual_mode ? VTX_VIRTUALSIZE : VTX_PAGESIZE))
+                        return -EINVAL;
+                if (copy_to_user(req->buffer, &t->vdau[req->pgbuf].pgbuf[req->start], req->end - req->start + 1))
+                        return -EFAULT;
+
+                 /*
+                  *     Always read the time directly from SAA5249
+                  */
+
+                if (req->start <= 39 && req->end >= 32) {
+                        int len;
+                        char buf[16];
+                        start = max(req->start, 32);
+                        end = min(req->end, 39);
+                        len = end - start + 1;
+                        if (i2c_senddata(t, 8, 0, 0, start, -1) ||
+                                i2c_getdata(t, len, buf))
+                                return -EIO;
+                        if (copy_to_user(req->buffer + start - req->start, buf, len))
+                                return -EFAULT;
+                }
+                /* Insert the current header if DAU is still searching for a page */
+                if (req->start <= 31 && req->end >= 7 && t->is_searching[req->pgbuf]) {
+                        char buf[32];
+                        int len;
+
+                        start = max(req->start, 7);
+                        end = min(req->end, 31);
+                        len = end - start + 1;
+                        if (i2c_senddata(t, 8, 0, 0, start, -1) ||
+                                i2c_getdata(t, len, buf))
+                                return -EIO;
+                        if (copy_to_user(req->buffer + start - req->start, buf, len))
                                 return -EFAULT;
-
-                         /*
-                          *     Always read the time directly from SAA5249
-                          */
-
-                        if (req->start <= 39 && req->end >= 32)
-                        {
-                                int len;
-                                char buf[16];
-                                start = max(req->start, 32);
-                                end = min(req->end, 39);
-                                len=end-start+1;
-                                if (i2c_senddata(t, 8, 0, 0, start, -1) ||
-                                        i2c_getdata(t, len, buf))
-                                        return -EIO;
-                                if(copy_to_user(req->buffer+start-req->start, buf, len))
-                                        return -EFAULT;
-                        }
-                        /* Insert the current header if DAU is still searching for a page */
-                        if (req->start <= 31 && req->end >= 7 && t->is_searching[req->pgbuf])
-                        {
-                                char buf[32];
-                                int len;
-                                start = max(req->start, 7);
-                                end = min(req->end, 31);
-                                len=end-start+1;
-                                if (i2c_senddata(t, 8, 0, 0, start, -1) ||
-                                        i2c_getdata(t, len, buf))
-                                        return -EIO;
-                                if(copy_to_user(req->buffer+start-req->start, buf, len))
-                                        return -EFAULT;
-                        }
-                        return 0;
                 }
+                return 0;
+        }
 
-                case VTXIOCSTOPDAU:
-                {
-                        vtx_pagereq_t *req = arg;
+        case VTXIOCSTOPDAU:
+        {
+                vtx_pagereq_t *req = arg;
 
-                        if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
-                                return -EINVAL;
-                        t->vdau[req->pgbuf].stopped = true;
-                        t->is_searching[req->pgbuf] = false;
-                        return 0;
-                }
+                if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
+                        return -EINVAL;
+                t->vdau[req->pgbuf].stopped = true;
+                t->is_searching[req->pgbuf] = false;
+                return 0;
+        }
 
-                case VTXIOCPUTPAGE:
-                case VTXIOCSETDISP:
-                case VTXIOCPUTSTAT:
-                        return 0;
+        case VTXIOCPUTPAGE:
+        case VTXIOCSETDISP:
+        case VTXIOCPUTSTAT:
+                return 0;
 
-                case VTXIOCCLRCACHE:
-                {
-                        if (i2c_senddata(t, 0, NUM_DAUS, 0, 8, -1) || i2c_senddata(t, 11,
-                                ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',
-                                ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ', -1))
-                                return -EIO;
-                        if (i2c_senddata(t, 3, 0x20, -1))
-                                return -EIO;
-                        jdelay(10 * CLEAR_DELAY);                       /* I have no idea how long we have to wait here */
-                        return 0;
-                }
+        case VTXIOCCLRCACHE:
+        {
+                if (i2c_senddata(t, 0, NUM_DAUS, 0, 8, -1) || i2c_senddata(t, 11,
+                        ' ', ' ', ' ', ' ', ' ', ' ',
+                        ' ', ' ', ' ', ' ', ' ', ' ',
+                        ' ', ' ', ' ', ' ', ' ', ' ',
+                        ' ', ' ', ' ', ' ', ' ', ' ',
+                        -1))
+                        return -EIO;
+                if (i2c_senddata(t, 3, 0x20, -1))
+                        return -EIO;
+                jdelay(10 * CLEAR_DELAY);                       /* I have no idea how long we have to wait here */
+                return 0;
+        }
 
-                case VTXIOCSETVIRT:
-                {
-                        /* The SAA5249 has virtual-row reception turned on always */
-                        t->virtual_mode = (int)(long)arg;
-                        return 0;
-                }
+        case VTXIOCSETVIRT:
+        {
+                /* The SAA5249 has virtual-row reception turned on always */
+                t->virtual_mode = (int)(long)arg;
+                return 0;
+        }
         }
         return -EINVAL;
 }
@@ -616,8 +483,7 @@ static inline unsigned int vtx_fix_command(unsigned int cmd)
 static int saa5249_ioctl(struct inode *inode, struct file *file,
                          unsigned int cmd, unsigned long arg)
 {
-        struct video_device *vd = video_devdata(file);
-        struct saa5249_device *t=vd->priv;
+        struct saa5249_device *t = video_drvdata(file);
         int err;
 
         cmd = vtx_fix_command(cmd);
@@ -629,32 +495,27 @@ static int saa5249_ioctl(struct inode *inode, struct file *file,
 
 static int saa5249_open(struct inode *inode, struct file *file)
 {
-        struct video_device *vd = video_devdata(file);
-        struct saa5249_device *t=vd->priv;
-        int err,pgbuf;
+        struct saa5249_device *t = video_drvdata(file);
+        int pgbuf;
 
-        err = video_exclusive_open(inode,file);
-        if (err < 0)
-                return err;
+        if (t->client == NULL)
+                return -ENODEV;
 
-        if (t->client==NULL) {
-                err = -ENODEV;
-                goto fail;
-        }
+        if (test_and_set_bit(0, &t->in_use))
+                return -EBUSY;
 
-        if (i2c_senddata(t, 0, 0, -1) ||                /* Select R11 */
-                                                /* Turn off parity checks (we do this ourselves) */
+        if (i2c_senddata(t, 0, 0, -1) || /* Select R11 */
+                /* Turn off parity checks (we do this ourselves) */
                 i2c_senddata(t, 1, disp_modes[t->disp_mode][0], 0, -1) ||
-                                                /* Display TV-picture, no virtual rows */
-                i2c_senddata(t, 4, NUM_DAUS, disp_modes[t->disp_mode][1], disp_modes[t->disp_mode][2], 7, -1)) /* Set display to page 4 */
-
+                /* Display TV-picture, no virtual rows */
+                i2c_senddata(t, 4, NUM_DAUS, disp_modes[t->disp_mode][1], disp_modes[t->disp_mode][2], 7, -1))
+                /* Set display to page 4 */
         {
-                err = -EIO;
-                goto fail;
+                clear_bit(0, &t->in_use);
+                return -EIO;
         }
 
-        for (pgbuf = 0; pgbuf < NUM_DAUS; pgbuf++)
-        {
+        for (pgbuf = 0; pgbuf < NUM_DAUS; pgbuf++) {
                 memset(t->vdau[pgbuf].pgbuf, ' ', sizeof(t->vdau[0].pgbuf));
                 memset(t->vdau[pgbuf].sregs, 0, sizeof(t->vdau[0].sregs));
                 memset(t->vdau[pgbuf].laststat, 0, sizeof(t->vdau[0].laststat));
@@ -665,39 +526,20 @@ static int saa5249_open(struct inode *inode, struct file *file)
         }
         t->virtual_mode = false;
         return 0;
-
- fail:
-        video_exclusive_release(inode,file);
-        return err;
 }
 
 
 
 static int saa5249_release(struct inode *inode, struct file *file)
 {
-        struct video_device *vd = video_devdata(file);
-        struct saa5249_device *t=vd->priv;
+        struct saa5249_device *t = video_drvdata(file);
+
         i2c_senddata(t, 1, 0x20, -1);           /* Turn off CCT */
         i2c_senddata(t, 5, 3, 3, -1);           /* Turn off TV-display */
-        video_exclusive_release(inode,file);
+        clear_bit(0, &t->in_use);
         return 0;
 }
 
-static int __init init_saa_5249 (void)
-{
-        printk(KERN_INFO "SAA5249 driver (" IF_NAME " interface) for VideoText version %d.%d\n",
-                        VTX_VER_MAJ, VTX_VER_MIN);
-        return i2c_add_driver(&i2c_driver_videotext);
-}
-
-static void __exit cleanup_saa_5249 (void)
-{
-        i2c_del_driver(&i2c_driver_videotext);
-}
-
-module_init(init_saa_5249);
-module_exit(cleanup_saa_5249);
-
 static const struct file_operations saa_fops = {
         .owner          = THIS_MODULE,
         .open           = saa5249_open,
@@ -711,8 +553,84 @@ static const struct file_operations saa_fops = {
 
 static struct video_device saa_template =
 {
-        .name           = IF_NAME,
+        .name           = "saa5249",
         .fops           = &saa_fops,
+        .release        = video_device_release,
 };
 
-MODULE_LICENSE("GPL");
+/* Addresses to scan */
+static unsigned short normal_i2c[] = { 0x22 >> 1, I2C_CLIENT_END };
+
+I2C_CLIENT_INSMOD;
+
+static int saa5249_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
+{
+        int pgbuf;
+        int err;
+        struct video_device *vd;
+        struct saa5249_device *t;
+
+        v4l_info(client, "chip found @ 0x%x (%s)\n",
+                        client->addr << 1, client->adapter->name);
+        v4l_info(client, "VideoText version %d.%d\n",
+                        VTX_VER_MAJ, VTX_VER_MIN);
+        t = kzalloc(sizeof(*t), GFP_KERNEL);
+        if (t == NULL)
+                return -ENOMEM;
+        mutex_init(&t->lock);
+
+        /* Now create a video4linux device */
+        vd = kmalloc(sizeof(struct video_device), GFP_KERNEL);
+        if (vd == NULL) {
+                kfree(client);
+                return -ENOMEM;
+        }
+        i2c_set_clientdata(client, vd);
+        memcpy(vd, &saa_template, sizeof(*vd));
+
+        for (pgbuf = 0; pgbuf < NUM_DAUS; pgbuf++) {
+                memset(t->vdau[pgbuf].pgbuf, ' ', sizeof(t->vdau[0].pgbuf));
+                memset(t->vdau[pgbuf].sregs, 0, sizeof(t->vdau[0].sregs));
+                memset(t->vdau[pgbuf].laststat, 0, sizeof(t->vdau[0].laststat));
+                t->vdau[pgbuf].expire = 0;
+                t->vdau[pgbuf].clrfound = true;
+                t->vdau[pgbuf].stopped = true;
+                t->is_searching[pgbuf] = false;
+        }
+        video_set_drvdata(vd, t);
+
+        /* Register it */
+        err = video_register_device(vd, VFL_TYPE_VTX, -1);
+        if (err < 0) {
+                kfree(t);
+                kfree(vd);
+                return err;
+        }
+        t->client = client;
+        return 0;
+}
+
+static int saa5249_remove(struct i2c_client *client)
+{
+        struct video_device *vd = i2c_get_clientdata(client);
+
+        video_unregister_device(vd);
+        kfree(video_get_drvdata(vd));
+        kfree(vd);
+        return 0;
+}
+
+static const struct i2c_device_id saa5249_id[] = {
+        { "saa5249", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, saa5249_id);
+
+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
+        .name = "saa5249",
+        .driverid = I2C_DRIVERID_SAA5249,
+        .probe = saa5249_probe,
+        .remove = saa5249_remove,
+        .id_table = saa5249_id,
+};
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index ad733caec720..c8e9cb3db30a 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1057,7 +1057,7 @@ static void saa711x_set_lcr(struct i2c_client *client, struct v4l2_sliced_vbi_fo
         for (i = 0; i <= 23; i++)
                 lcr[i] = 0xff;
 
-        if (fmt->service_set == 0) {
+        if (fmt == NULL) {
                 /* raw VBI */
                 if (is_50hz)
                         for (i = 6; i <= 23; i++)
@@ -1113,7 +1113,7 @@ static void saa711x_set_lcr(struct i2c_client *client, struct v4l2_sliced_vbi_fo
         }
 
         /* enable/disable raw VBI capturing */
-        saa711x_writeregs(client, fmt->service_set == 0 ?
+        saa711x_writeregs(client, fmt == NULL ?
                                 saa7115_cfg_vbi_on :
                                 saa7115_cfg_vbi_off);
 }
@@ -1153,6 +1153,10 @@ static int saa711x_set_v4lfmt(struct i2c_client *client, struct v4l2_format *fmt
                 saa711x_set_lcr(client, &fmt->fmt.sliced);
                 return 0;
         }
+        if (fmt->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
+                saa711x_set_lcr(client, NULL);
+                return 0;
+        }
         if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                 return -EINVAL;
 
@@ -1309,10 +1313,13 @@ static int saa7115_command(struct i2c_client *client, unsigned int cmd, void *ar
         case VIDIOC_INT_S_VIDEO_ROUTING:
         {
                 struct v4l2_routing *route = arg;
+                u32 input = route->input;
+                u8 mask = (state->ident == V4L2_IDENT_SAA7111) ? 0xf8 : 0xf0;
 
                 v4l_dbg(1, debug, client, "decoder set input %d output %d\n", route->input, route->output);
-                /* saa7113 does not have these inputs */
-                if (state->ident == V4L2_IDENT_SAA7113 &&
+                /* saa7111/3 does not have these inputs */
+                if ((state->ident == V4L2_IDENT_SAA7113 ||
+                     state->ident == V4L2_IDENT_SAA7111) &&
                     (route->input == SAA7115_COMPOSITE4 ||
                      route->input == SAA7115_COMPOSITE5)) {
                         return -EINVAL;
@@ -1327,10 +1334,23 @@ static int saa7115_command(struct i2c_client *client, unsigned int cmd, void *ar
                         (route->input >= SAA7115_SVIDEO0) ? "S-Video" : "Composite", (route->output == SAA7115_IPORT_ON) ? "iport on" : "iport off");
                 state->input = route->input;
 
+                /* saa7111 has slightly different input numbering */
+                if (state->ident == V4L2_IDENT_SAA7111) {
+                        if (input >= SAA7115_COMPOSITE4)
+                                input -= 2;
+                        /* saa7111 specific */
+                        saa711x_write(client, R_10_CHROMA_CNTL_2,
+                                        (saa711x_read(client, R_10_CHROMA_CNTL_2) & 0x3f) |
+                                        ((route->output & 0xc0) ^ 0x40));
+                        saa711x_write(client, R_13_RT_X_PORT_OUT_CNTL,
+                                        (saa711x_read(client, R_13_RT_X_PORT_OUT_CNTL) & 0xf0) |
+                                        ((route->output & 2) ? 0x0a : 0));
+                }
+
                 /* select mode */
                 saa711x_write(client, R_02_INPUT_CNTL_1,
-                              (saa711x_read(client, R_02_INPUT_CNTL_1) & 0xf0) |
-                               state->input);
+                              (saa711x_read(client, R_02_INPUT_CNTL_1) & mask) |
+                               input);
 
                 /* bypass chrominance trap for S-Video modes */
                 saa711x_write(client, R_09_LUMA_CNTL,
@@ -1384,6 +1404,13 @@ static int saa7115_command(struct i2c_client *client, unsigned int cmd, void *ar
                 saa711x_writeregs(client, saa7115_cfg_reset_scaler);
                 break;
 
+        case VIDIOC_INT_S_GPIO:
+                if (state->ident != V4L2_IDENT_SAA7111)
+                        return -EINVAL;
+                saa711x_write(client, 0x11, (saa711x_read(client, 0x11) & 0x7f) |
+                        (*(u32 *)arg ? 0x80 : 0));
+                break;
+
         case VIDIOC_INT_G_VBI_DATA:
         {
                 struct v4l2_sliced_vbi_data *data = arg;
@@ -1539,7 +1566,8 @@ static int saa7115_probe(struct i2c_client *client,
                 state->crystal_freq = SAA7115_FREQ_32_11_MHZ;
                 saa711x_writeregs(client, saa7115_init_auto_input);
         }
-        saa711x_writeregs(client, saa7115_init_misc);
+        if (state->ident != V4L2_IDENT_SAA7111)
+                saa711x_writeregs(client, saa7115_init_misc);
         saa711x_set_v4lstd(client, V4L2_STD_NTSC);
 
         v4l_dbg(1, debug, client, "status: (1E) 0x%02x, (1F) 0x%02x\n",
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index 707be175509d..1fb6eccdade3 100644
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -1,3 +1,27 @@
+ /*
+    saa6752hs - i2c-driver for the saa6752hs by Philips
+
+    Copyright (C) 2004 Andrew de Quincey
+
+    AC-3 support:
+
+    Copyright (C) 2008 Hans Verkuil <hverkuil@xs4all.nl>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License vs 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 Mvss Ave, Cambridge, MA 02139, USA.
+  */
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -10,6 +34,8 @@
 #include <linux/types.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-chip-ident.h>
+#include <media/v4l2-i2c-drv-legacy.h>
 #include <linux/init.h>
 #include <linux/crc32.h>
 
@@ -27,9 +53,6 @@ MODULE_DESCRIPTION("device driver for saa6752hs MPEG2 encoder");
 MODULE_AUTHOR("Andrew de Quincey");
 MODULE_LICENSE("GPL");
 
-static struct i2c_driver driver;
-static struct i2c_client client_template;
-
 enum saa6752hs_videoformat {
         SAA6752HS_VF_D1 = 0,    /* standard D1 video format: 720x576 */
         SAA6752HS_VF_2_3_D1 = 1,/* 2/3D1 video format: 480x576 */
@@ -46,7 +69,9 @@ struct saa6752hs_mpeg_params {
         __u16                           ts_pid_pcr;
 
         /* audio */
-        enum v4l2_mpeg_audio_l2_bitrate au_l2_bitrate;
+        enum v4l2_mpeg_audio_encoding    au_encoding;
+        enum v4l2_mpeg_audio_l2_bitrate  au_l2_bitrate;
+        enum v4l2_mpeg_audio_ac3_bitrate au_ac3_bitrate;
 
         /* video */
         enum v4l2_mpeg_video_aspect     vi_aspect;
@@ -70,7 +95,9 @@ static const struct v4l2_format v4l2_format_table[] =
 };
 
 struct saa6752hs_state {
-        struct i2c_client             client;
+        int                           chip;
+        u32                           revision;
+        int                           has_ac3;
         struct saa6752hs_mpeg_params  params;
         enum saa6752hs_videoformat    video_format;
         v4l2_std_id                   standard;
@@ -145,6 +172,39 @@ static u8 PMT[] = {
         0x00, 0x00, 0x00, 0x00 /* CRC32 */
 };
 
+static u8 PMT_AC3[] = {
+        0xc2, /* i2c register */
+        0x01, /* table number for encoder(1) */
+        0x47, /* sync */
+
+        0x40, /* transport_error_indicator(0), payload_unit_start(1), transport_priority(0) */
+        0x10, /* PMT PID (0x0010) */
+        0x10, /* transport_scrambling_control(00), adaptation_field_control(01), continuity_counter(0) */
+
+        0x00, /* PSI pointer to start of table */
+
+        0x02, /* TID (2) */
+        0xb0, 0x1a, /* section_syntax_indicator(1), section_length(26) */
+
+        0x00, 0x01, /* program_number(1) */
+
+        0xc1, /* version_number(0), current_next_indicator(1) */
+
+        0x00, 0x00, /* section_number(0), last_section_number(0) */
+
+        0xe1, 0x04, /* PCR_PID (0x0104) */
+
+        0xf0, 0x00, /* program_info_length(0) */
+
+        0x02, 0xe1, 0x00, 0xf0, 0x00, /* video stream type(2), pid */
+        0x06, 0xe1, 0x03, 0xf0, 0x03, /* audio stream type(6), pid */
+        0x6a, /* AC3 */
+        0x01, /* Descriptor_length(1) */
+        0x00, /* component_type_flag(0), bsid_flag(0), mainid_flag(0), asvc_flag(0), reserved flags(0) */
+
+        0xED, 0xDE, 0x2D, 0xF3 /* CRC32 BE */
+};
+
 static struct saa6752hs_mpeg_params param_defaults =
 {
         .ts_pid_pmt      = 16,
@@ -157,12 +217,14 @@ static struct saa6752hs_mpeg_params param_defaults =
         .vi_bitrate_peak = 6000,
         .vi_bitrate_mode = V4L2_MPEG_VIDEO_BITRATE_MODE_VBR,
 
+        .au_encoding     = V4L2_MPEG_AUDIO_ENCODING_LAYER_2,
         .au_l2_bitrate   = V4L2_MPEG_AUDIO_L2_BITRATE_256K,
+        .au_ac3_bitrate  = V4L2_MPEG_AUDIO_AC3_BITRATE_256K,
 };
 
 /* ---------------------------------------------------------------------- */
 
-static int saa6752hs_chip_command(struct i2c_client* client,
+static int saa6752hs_chip_command(struct i2c_client *client,
                                   enum saa6752hs_command command)
 {
         unsigned char buf[3];
@@ -229,45 +291,61 @@ static int saa6752hs_chip_command(struct i2c_client* client,
 }
 
 
-static int saa6752hs_set_bitrate(struct i2c_client* client,
-                                 struct saa6752hs_mpeg_params* params)
+static inline void set_reg8(struct i2c_client *client, uint8_t reg, uint8_t val)
+{
+        u8 buf[2];
+
+        buf[0] = reg;
+        buf[1] = val;
+        i2c_master_send(client, buf, 2);
+}
+
+static inline void set_reg16(struct i2c_client *client, uint8_t reg, uint16_t val)
 {
         u8 buf[3];
+
+        buf[0] = reg;
+        buf[1] = val >> 8;
+        buf[2] = val & 0xff;
+        i2c_master_send(client, buf, 3);
+}
+
+static int saa6752hs_set_bitrate(struct i2c_client *client,
+                                 struct saa6752hs_state *h)
+{
+        struct saa6752hs_mpeg_params *params = &h->params;
         int tot_bitrate;
+        int is_384k;
 
         /* set the bitrate mode */
-        buf[0] = 0x71;
-        buf[1] = (params->vi_bitrate_mode == V4L2_MPEG_VIDEO_BITRATE_MODE_VBR) ? 0 : 1;
-        i2c_master_send(client, buf, 2);
+        set_reg8(client, 0x71,
+                params->vi_bitrate_mode != V4L2_MPEG_VIDEO_BITRATE_MODE_VBR);
 
         /* set the video bitrate */
         if (params->vi_bitrate_mode == V4L2_MPEG_VIDEO_BITRATE_MODE_VBR) {
                 /* set the target bitrate */
-                buf[0] = 0x80;
-                buf[1] = params->vi_bitrate >> 8;
-                buf[2] = params->vi_bitrate & 0xff;
-                i2c_master_send(client, buf, 3);
+                set_reg16(client, 0x80, params->vi_bitrate);
 
                 /* set the max bitrate */
-                buf[0] = 0x81;
-                buf[1] = params->vi_bitrate_peak >> 8;
-                buf[2] = params->vi_bitrate_peak & 0xff;
-                i2c_master_send(client, buf, 3);
+                set_reg16(client, 0x81, params->vi_bitrate_peak);
                 tot_bitrate = params->vi_bitrate_peak;
         } else {
                 /* set the target bitrate (no max bitrate for CBR) */
-                buf[0] = 0x81;
-                buf[1] = params->vi_bitrate >> 8;
-                buf[2] = params->vi_bitrate & 0xff;
-                i2c_master_send(client, buf, 3);
+                set_reg16(client, 0x81, params->vi_bitrate);
                 tot_bitrate = params->vi_bitrate;
         }
 
+        /* set the audio encoding */
+        set_reg8(client, 0x93,
+                        params->au_encoding == V4L2_MPEG_AUDIO_ENCODING_AC3);
+
         /* set the audio bitrate */
-        buf[0] = 0x94;
-        buf[1] = (V4L2_MPEG_AUDIO_L2_BITRATE_256K == params->au_l2_bitrate) ? 0 : 1;
-        i2c_master_send(client, buf, 2);
-        tot_bitrate += (V4L2_MPEG_AUDIO_L2_BITRATE_256K == params->au_l2_bitrate) ? 256 : 384;
+        if (params->au_encoding == V4L2_MPEG_AUDIO_ENCODING_AC3)
+                is_384k = V4L2_MPEG_AUDIO_AC3_BITRATE_384K == params->au_ac3_bitrate;
+        else
+                is_384k = V4L2_MPEG_AUDIO_L2_BITRATE_384K == params->au_l2_bitrate;
+        set_reg8(client, 0x94, is_384k);
+        tot_bitrate += is_384k ? 384 : 256;
 
         /* Note: the total max bitrate is determined by adding the video and audio
            bitrates together and also adding an extra 768kbit/s to stay on the
@@ -278,16 +356,12 @@ static int saa6752hs_set_bitrate(struct i2c_client* client,
                 tot_bitrate = MPEG_TOTAL_TARGET_BITRATE_MAX;
 
         /* set the total bitrate */
-        buf[0] = 0xb1;
-        buf[1] = tot_bitrate >> 8;
-        buf[2] = tot_bitrate & 0xff;
-        i2c_master_send(client, buf, 3);
-
+        set_reg16(client, 0xb1, tot_bitrate);
         return 0;
 }
 
-static void saa6752hs_set_subsampling(struct i2c_client* client,
-                                      struct v4l2_format* f)
+static void saa6752hs_set_subsampling(struct i2c_client *client,
+                                      struct v4l2_format *f)
 {
         struct saa6752hs_state *h = i2c_get_clientdata(client);
         int dist_352, dist_480, dist_720;
@@ -332,7 +406,7 @@ static void saa6752hs_set_subsampling(struct i2c_client* client,
 }
 
 
-static int handle_ctrl(struct saa6752hs_mpeg_params *params,
+static int handle_ctrl(int has_ac3, struct saa6752hs_mpeg_params *params,
                 struct v4l2_ext_control *ctrl, unsigned int cmd)
 {
         int old = 0, new;
@@ -379,8 +453,9 @@ static int handle_ctrl(struct saa6752hs_mpeg_params *params,
                         params->ts_pid_pcr = new;
                         break;
                 case V4L2_CID_MPEG_AUDIO_ENCODING:
-                        old = V4L2_MPEG_AUDIO_ENCODING_LAYER_2;
-                        if (set && new != old)
+                        old = params->au_encoding;
+                        if (set && new != V4L2_MPEG_AUDIO_ENCODING_LAYER_2 &&
+                            (!has_ac3 || new != V4L2_MPEG_AUDIO_ENCODING_AC3))
                                 return -ERANGE;
                         new = old;
                         break;
@@ -395,6 +470,19 @@ static int handle_ctrl(struct saa6752hs_mpeg_params *params,
                                 new = V4L2_MPEG_AUDIO_L2_BITRATE_384K;
                         params->au_l2_bitrate = new;
                         break;
+                case V4L2_CID_MPEG_AUDIO_AC3_BITRATE:
+                        if (!has_ac3)
+                                return -EINVAL;
+                        old = params->au_ac3_bitrate;
+                        if (set && new != V4L2_MPEG_AUDIO_AC3_BITRATE_256K &&
+                                   new != V4L2_MPEG_AUDIO_AC3_BITRATE_384K)
+                                return -ERANGE;
+                        if (new <= V4L2_MPEG_AUDIO_AC3_BITRATE_256K)
+                                new = V4L2_MPEG_AUDIO_AC3_BITRATE_256K;
+                        else
+                                new = V4L2_MPEG_AUDIO_AC3_BITRATE_384K;
+                        params->au_ac3_bitrate = new;
+                        break;
                 case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:
                         old = V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000;
                         if (set && new != old)
@@ -448,17 +536,19 @@ static int handle_ctrl(struct saa6752hs_mpeg_params *params,
         return 0;
 }
 
-static int saa6752hs_qctrl(struct saa6752hs_mpeg_params *params,
+static int saa6752hs_qctrl(struct saa6752hs_state *h,
                 struct v4l2_queryctrl *qctrl)
 {
+        struct saa6752hs_mpeg_params *params = &h->params;
         int err;
 
         switch (qctrl->id) {
         case V4L2_CID_MPEG_AUDIO_ENCODING:
                 return v4l2_ctrl_query_fill(qctrl,
                                 V4L2_MPEG_AUDIO_ENCODING_LAYER_2,
-                                V4L2_MPEG_AUDIO_ENCODING_LAYER_2, 1,
-                                V4L2_MPEG_AUDIO_ENCODING_LAYER_2);
+                                h->has_ac3 ? V4L2_MPEG_AUDIO_ENCODING_AC3 :
+                                        V4L2_MPEG_AUDIO_ENCODING_LAYER_2,
+                                1, V4L2_MPEG_AUDIO_ENCODING_LAYER_2);
 
         case V4L2_CID_MPEG_AUDIO_L2_BITRATE:
                 return v4l2_ctrl_query_fill(qctrl,
@@ -466,6 +556,14 @@ static int saa6752hs_qctrl(struct saa6752hs_mpeg_params *params,
                                 V4L2_MPEG_AUDIO_L2_BITRATE_384K, 1,
                                 V4L2_MPEG_AUDIO_L2_BITRATE_256K);
 
+        case V4L2_CID_MPEG_AUDIO_AC3_BITRATE:
+                if (!h->has_ac3)
+                        return -EINVAL;
+                return v4l2_ctrl_query_fill(qctrl,
+                                V4L2_MPEG_AUDIO_AC3_BITRATE_256K,
+                                V4L2_MPEG_AUDIO_AC3_BITRATE_384K, 1,
+                                V4L2_MPEG_AUDIO_AC3_BITRATE_256K);
+
         case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:
                 return v4l2_ctrl_query_fill(qctrl,
                                 V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000,
@@ -512,44 +610,57 @@ static int saa6752hs_qctrl(struct saa6752hs_mpeg_params *params,
         return -EINVAL;
 }
 
-static int saa6752hs_qmenu(struct saa6752hs_mpeg_params *params,
+static int saa6752hs_qmenu(struct saa6752hs_state *h,
                 struct v4l2_querymenu *qmenu)
 {
-        static const char *mpeg_audio_l2_bitrate[] = {
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "256 kbps",
-                "",
-                "384 kbps",
-                NULL
+        static const u32 mpeg_audio_encoding[] = {
+                V4L2_MPEG_AUDIO_ENCODING_LAYER_2,
+                V4L2_CTRL_MENU_IDS_END
+        };
+        static const u32 mpeg_audio_ac3_encoding[] = {
+                V4L2_MPEG_AUDIO_ENCODING_LAYER_2,
+                V4L2_MPEG_AUDIO_ENCODING_AC3,
+                V4L2_CTRL_MENU_IDS_END
+        };
+        static u32 mpeg_audio_l2_bitrate[] = {
+                V4L2_MPEG_AUDIO_L2_BITRATE_256K,
+                V4L2_MPEG_AUDIO_L2_BITRATE_384K,
+                V4L2_CTRL_MENU_IDS_END
+        };
+        static u32 mpeg_audio_ac3_bitrate[] = {
+                V4L2_MPEG_AUDIO_AC3_BITRATE_256K,
+                V4L2_MPEG_AUDIO_AC3_BITRATE_384K,
+                V4L2_CTRL_MENU_IDS_END
         };
         struct v4l2_queryctrl qctrl;
         int err;
 
         qctrl.id = qmenu->id;
-        err = saa6752hs_qctrl(params, &qctrl);
+        err = saa6752hs_qctrl(h, &qctrl);
         if (err)
                 return err;
-        if (qmenu->id == V4L2_CID_MPEG_AUDIO_L2_BITRATE)
-                return v4l2_ctrl_query_menu(qmenu, &qctrl,
+        switch (qmenu->id) {
+        case V4L2_CID_MPEG_AUDIO_L2_BITRATE:
+                return v4l2_ctrl_query_menu_valid_items(qmenu,
                                 mpeg_audio_l2_bitrate);
-        return v4l2_ctrl_query_menu(qmenu, &qctrl,
-                        v4l2_ctrl_get_menu(qmenu->id));
+        case V4L2_CID_MPEG_AUDIO_AC3_BITRATE:
+                if (!h->has_ac3)
+                        return -EINVAL;
+                return v4l2_ctrl_query_menu_valid_items(qmenu,
+                                mpeg_audio_ac3_bitrate);
+        case V4L2_CID_MPEG_AUDIO_ENCODING:
+                return v4l2_ctrl_query_menu_valid_items(qmenu,
+                        h->has_ac3 ? mpeg_audio_ac3_encoding :
+                                mpeg_audio_encoding);
+        }
+        return v4l2_ctrl_query_menu(qmenu, &qctrl, NULL);
 }
 
-static int saa6752hs_init(struct i2c_client* client)
+static int saa6752hs_init(struct i2c_client *client, u32 leading_null_bytes)
 {
         unsigned char buf[9], buf2[4];
         struct saa6752hs_state *h;
+        unsigned size;
         u32 crc;
         unsigned char localPAT[256];
         unsigned char localPMT[256];
@@ -557,45 +668,31 @@ 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 */
-        buf[0] = 0x41;
-        buf[1] = h->video_format;
-        i2c_master_send(client, buf, 2);
+        set_reg8(client, 0x41, h->video_format);
 
         /* 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_reg8(client, 0x40, (h->standard & V4L2_STD_525_60) ? 1 : 0);
 
         /* set bitrate */
-        saa6752hs_set_bitrate(client, &h->params);
+        saa6752hs_set_bitrate(client, h);
 
         /* Set GOP structure {3, 13} */
-        buf[0] = 0x72;
-        buf[1] = 0x03;
-        buf[2] = 0x0D;
-        i2c_master_send(client,buf,3);
+        set_reg16(client, 0x72, 0x030d);
 
         /* Set minimum Q-scale {4} */
-        buf[0] = 0x82;
-        buf[1] = 0x04;
-        i2c_master_send(client,buf,2);
+        set_reg8(client, 0x82, 0x04);
 
         /* Set maximum Q-scale {12} */
-        buf[0] = 0x83;
-        buf[1] = 0x0C;
-        i2c_master_send(client,buf,2);
+        set_reg8(client, 0x83, 0x0c);
 
         /* Set Output Protocol */
-        buf[0] = 0xD0;
-        buf[1] = 0x81;
-        i2c_master_send(client,buf,2);
+        set_reg8(client, 0xd0, 0x81);
 
         /* Set video output stream format {TS} */
-        buf[0] = 0xB0;
-        buf[1] = 0x05;
-        i2c_master_send(client,buf,2);
+        set_reg8(client, 0xb0, 0x05);
+
+        /* Set leading null byte for TS */
+        set_reg16(client, 0xf6, leading_null_bytes);
 
         /* compute PAT */
         memcpy(localPAT, PAT, sizeof(PAT));
@@ -608,7 +705,13 @@ static int saa6752hs_init(struct i2c_client* client)
         localPAT[sizeof(PAT) - 1] = crc & 0xFF;
 
         /* compute PMT */
-        memcpy(localPMT, PMT, sizeof(PMT));
+        if (h->params.au_encoding == V4L2_MPEG_AUDIO_ENCODING_AC3) {
+                size = sizeof(PMT_AC3);
+                memcpy(localPMT, PMT_AC3, size);
+        } else {
+                size = sizeof(PMT);
+                memcpy(localPMT, PMT, size);
+        }
         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);
@@ -617,40 +720,28 @@ static int saa6752hs_init(struct i2c_client* client)
         localPMT[21] = h->params.ts_pid_video & 0xFF;
         localPMT[25] = 0xE0 | ((h->params.ts_pid_audio >> 8) & 0x0F);
         localPMT[26] = h->params.ts_pid_audio & 0xFF;
-        crc = crc32_be(~0, &localPMT[7], sizeof(PMT) - 7 - 4);
-        localPMT[sizeof(PMT) - 4] = (crc >> 24) & 0xFF;
-        localPMT[sizeof(PMT) - 3] = (crc >> 16) & 0xFF;
-        localPMT[sizeof(PMT) - 2] = (crc >> 8) & 0xFF;
-        localPMT[sizeof(PMT) - 1] = crc & 0xFF;
+        crc = crc32_be(~0, &localPMT[7], size - 7 - 4);
+        localPMT[size - 4] = (crc >> 24) & 0xFF;
+        localPMT[size - 3] = (crc >> 16) & 0xFF;
+        localPMT[size - 2] = (crc >> 8) & 0xFF;
+        localPMT[size - 1] = crc & 0xFF;
 
         /* 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_reg16(client, 0xc1, h->params.ts_pid_audio);
 
         /* 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_reg16(client, 0xc0, h->params.ts_pid_video);
 
         /* 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);
+        set_reg16(client, 0xc4, h->params.ts_pid_pcr);
 
         /* Send SI tables */
-        i2c_master_send(client,localPAT,sizeof(PAT));
-        i2c_master_send(client,localPMT,sizeof(PMT));
+        i2c_master_send(client, localPAT, sizeof(PAT));
+        i2c_master_send(client, localPMT, size);
 
         /* mute then unmute audio. This removes buzzing artefacts */
-        buf[0] = 0xa4;
-        buf[1] = 1;
-        i2c_master_send(client, buf, 2);
-        buf[1] = 0;
-        i2c_master_send(client, buf, 2);
+        set_reg8(client, 0xa4, 1);
+        set_reg8(client, 0xa4, 0);
 
         /* start it going */
         saa6752hs_chip_command(client, SAA6752HS_COMMAND_START);
@@ -688,45 +779,6 @@ static int saa6752hs_init(struct i2c_client* client)
         return 0;
 }
 
-static int saa6752hs_attach(struct i2c_adapter *adap, int addr, int kind)
-{
-        struct saa6752hs_state *h;
-
-
-        if (NULL == (h = kzalloc(sizeof(*h), GFP_KERNEL)))
-                return -ENOMEM;
-        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);
-
-        v4l_info(&h->client,"saa6752hs: chip found @ 0x%x\n", addr<<1);
-        return 0;
-}
-
-static int saa6752hs_probe(struct i2c_adapter *adap)
-{
-        if (adap->class & I2C_CLASS_TV_ANALOG)
-                return i2c_probe(adap, &addr_data, saa6752hs_attach);
-        return 0;
-}
-
-static int saa6752hs_detach(struct i2c_client *client)
-{
-        struct saa6752hs_state *h;
-
-        h = i2c_get_clientdata(client);
-        i2c_detach_client(client);
-        kfree(h);
-        return 0;
-}
-
 static int
 saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
 {
@@ -737,14 +789,13 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
         int i;
 
         switch (cmd) {
+        case VIDIOC_INT_INIT:
+                /* apply settings and start encoder */
+                saa6752hs_init(client, *(u32 *)arg);
+                break;
         case VIDIOC_S_EXT_CTRLS:
                 if (ctrls->ctrl_class != V4L2_CTRL_CLASS_MPEG)
                         return -EINVAL;
-                if (ctrls->count == 0) {
-                        /* apply settings and start encoder */
-                        saa6752hs_init(client);
-                        break;
-                }
                 /* fall through */
         case VIDIOC_TRY_EXT_CTRLS:
         case VIDIOC_G_EXT_CTRLS:
@@ -752,7 +803,8 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
                         return -EINVAL;
                 params = h->params;
                 for (i = 0; i < ctrls->count; i++) {
-                        if ((err = handle_ctrl(&params, ctrls->controls + i, cmd))) {
+                        err = handle_ctrl(h->has_ac3, &params, ctrls->controls + i, cmd);
+                        if (err) {
                                 ctrls->error_idx = i;
                                 return err;
                         }
@@ -760,9 +812,9 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
                 h->params = params;
                 break;
         case VIDIOC_QUERYCTRL:
-                return saa6752hs_qctrl(&h->params, arg);
+                return saa6752hs_qctrl(h, arg);
         case VIDIOC_QUERYMENU:
-                return saa6752hs_qmenu(&h->params, arg);
+                return saa6752hs_qmenu(h, arg);
         case VIDIOC_G_FMT:
         {
            struct v4l2_format *f = arg;
@@ -785,6 +837,11 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
         case VIDIOC_S_STD:
                 h->standard = *((v4l2_std_id *) arg);
                 break;
+
+        case VIDIOC_G_CHIP_IDENT:
+                return v4l2_chip_ident_i2c_client(client,
+                                arg, h->chip, h->revision);
+
         default:
                 /* nothing */
                 break;
@@ -793,36 +850,55 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
         return err;
 }
 
-/* ----------------------------------------------------------------------- */
+static int saa6752hs_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
+{
+        struct saa6752hs_state *h = kzalloc(sizeof(*h), GFP_KERNEL);
+        u8 addr = 0x13;
+        u8 data[12];
 
-static struct i2c_driver driver = {
-        .driver = {
-                .name   = "saa6752hs",
-        },
-        .id             = I2C_DRIVERID_SAA6752HS,
-        .attach_adapter = saa6752hs_probe,
-        .detach_client  = saa6752hs_detach,
-        .command        = saa6752hs_command,
-};
+        v4l_info(client, "chip found @ 0x%x (%s)\n",
+                        client->addr << 1, client->adapter->name);
+        if (h == NULL)
+                return -ENOMEM;
 
-static struct i2c_client client_template =
-{
-        .name       = "saa6752hs",
-        .driver     = &driver,
-};
+        i2c_master_send(client, &addr, 1);
+        i2c_master_recv(client, data, sizeof(data));
+        h->chip = V4L2_IDENT_SAA6752HS;
+        h->revision = (data[8] << 8) | data[9];
+        h->has_ac3 = 0;
+        if (h->revision == 0x0206) {
+                h->chip = V4L2_IDENT_SAA6752HS_AC3;
+                h->has_ac3 = 1;
+                v4l_info(client, "support AC-3\n");
+        }
+        h->params = param_defaults;
+        h->standard = 0; /* Assume 625 input lines */
 
-static int __init saa6752hs_init_module(void)
-{
-        return i2c_add_driver(&driver);
+        i2c_set_clientdata(client, h);
+        return 0;
 }
 
-static void __exit saa6752hs_cleanup_module(void)
+static int saa6752hs_remove(struct i2c_client *client)
 {
-        i2c_del_driver(&driver);
+        kfree(i2c_get_clientdata(client));
+        return 0;
 }
 
-module_init(saa6752hs_init_module);
-module_exit(saa6752hs_cleanup_module);
+static const struct i2c_device_id saa6752hs_id[] = {
+        { "saa6752hs", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, saa6752hs_id);
+
+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
+        .name = "saa6752hs",
+        .driverid = I2C_DRIVERID_SAA6752HS,
+        .command = saa6752hs_command,
+        .probe = saa6752hs_probe,
+        .remove = saa6752hs_remove,
+        .id_table = saa6752hs_id,
+};
 
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 98364d171def..ddc5402c5fb0 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -3260,6 +3260,7 @@ struct saa7134_board saa7134_boards[] = {
         },
         [SAA7134_BOARD_HAUPPAUGE_HVR1110] = {
                 /* Thomas Genty <tomlohave@gmail.com> */
+                /* David Bentham <db260179@hotmail.com> */
                 .name           = "Hauppauge WinTV-HVR1110 DVB-T/Hybrid",
                 .audio_clock    = 0x00187de7,
                 .tuner_type     = TUNER_PHILIPS_TDA8290,
@@ -3268,23 +3269,26 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tuner_config   = 1,
                 .mpeg           = SAA7134_MPEG_DVB,
+                .gpiomask       = 0x0200100,
                 .inputs         = {{
                         .name = name_tv,
                         .vmux = 1,
                         .amux = TV,
                         .tv   = 1,
-                },{
-                        .name   = name_comp1,
-                        .vmux   = 3,
-                        .amux   = LINE2, /* FIXME: audio doesn't work on svideo/composite */
-                },{
-                        .name   = name_svideo,
-                        .vmux   = 8,
-                        .amux   = LINE2, /* FIXME: audio doesn't work on svideo/composite */
-                }},
+                        .gpio = 0x0000100,
+                }, {
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = LINE1,
+                }, {
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE1,
+                } },
                 .radio = {
                         .name = name_radio,
-                        .amux   = TV,
+                        .amux = TV,
+                        .gpio = 0x0200100,
                 },
         },
         [SAA7134_BOARD_CINERGY_HT_PCMCIA] = {
@@ -3388,6 +3392,42 @@ struct saa7134_board saa7134_boards[] = {
                         .amux = 0,
                 },
         },
+        [SAA7134_BOARD_ENCORE_ENLTV_FM53] = {
+                .name           = "Encore ENLTV-FM v5.3",
+                .audio_clock    = 0x00200000,
+                .tuner_type     = TUNER_TNF_5335MF,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .gpiomask       = 0x7000,
+                .inputs         = { {
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = 1,
+                        .tv   = 1,
+                        .gpio = 0x50000,
+                }, {
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = 2,
+                        .gpio = 0x2000,
+                }, {
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = 2,
+                        .gpio = 0x2000,
+                } },
+                .radio = {
+                        .name = name_radio,
+                        .vmux = 1,
+                        .amux = 1,
+                },
+                .mute = {
+                        .name = name_mute,
+                        .gpio = 0xf000,
+                        .amux = 0,
+                },
+        },
         [SAA7134_BOARD_CINERGY_HT_PCI] = {
                 .name           = "Terratec Cinergy HT PCI",
                 .audio_clock    = 0x00187de7,
@@ -3631,6 +3671,40 @@ struct saa7134_board saa7134_boards[] = {
                         .tv     = 1,
                 }},
         },
+        [SAA7134_BOARD_AVERMEDIA_M135A] = {
+                .name           = "Avermedia PCI pure analog (M135A)",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .tuner_config   = 2,
+                .gpiomask       = 0x020200000,
+                .inputs         = {{
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = TV,
+                        .tv   = 1,
+                }, {
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = LINE1,
+                }, {
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE1,
+                } },
+                .radio = {
+                        .name = name_radio,
+                        .amux = TV,
+                        .gpio = 0x00200000,
+                },
+                .mute = {
+                        .name = name_mute,
+                        .amux = TV,
+                        .gpio = 0x01,
+                },
+        },
         [SAA7134_BOARD_BEHOLD_401] = {
                 /*       Beholder Intl. Ltd. 2008      */
                 /*Dmitry Belimov <d.belimov@gmail.com> */
@@ -4409,6 +4483,129 @@ struct saa7134_board saa7134_boards[] = {
                 /* no DVB support for now */
                 /* .mpeg           = SAA7134_MPEG_DVB, */
         },
+        [SAA7134_BOARD_ASUSTeK_TIGER_3IN1] = {
+                .name           = "Asus Tiger 3in1",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .tuner_config   = 2,
+                .gpiomask       = 1 << 21,
+                .mpeg           = SAA7134_MPEG_DVB,
+                .inputs         = {{
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = TV,
+                        .tv   = 1,
+                }, {
+                        .name = name_comp,
+                        .vmux = 0,
+                        .amux = LINE2,
+                }, {
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE2,
+                } },
+                .radio = {
+                        .name = name_radio,
+                        .amux = TV,
+                        .gpio = 0x0200000,
+                },
+        },
+        [SAA7134_BOARD_REAL_ANGEL_220] = {
+                .name           = "Zogis Real Angel 220",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_TNF_5335MF,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .gpiomask       = 0x801a8087,
+                .inputs = { {
+                        .name   = name_tv,
+                        .vmux   = 3,
+                        .amux   = LINE2,
+                        .tv     = 1,
+                        .gpio   = 0x624000,
+                }, {
+                        .name   = name_comp1,
+                        .vmux   = 1,
+                        .amux   = LINE1,
+                        .gpio   = 0x624000,
+                }, {
+                        .name   = name_svideo,
+                        .vmux   = 1,
+                        .amux   = LINE1,
+                        .gpio   = 0x624000,
+                } },
+                .radio = {
+                        .name   = name_radio,
+                        .amux   = LINE2,
+                        .gpio   = 0x624001,
+                },
+                .mute = {
+                        .name = name_mute,
+                        .amux = TV,
+                },
+        },
+        [SAA7134_BOARD_ADS_INSTANT_HDTV_PCI] = {
+                .name           = "ADS Tech Instant HDTV",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TUV1236D,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .tda9887_conf   = TDA9887_PRESENT,
+                .mpeg           = SAA7134_MPEG_DVB,
+                .inputs         = { {
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = TV,
+                        .tv   = 1,
+                }, {
+                        .name = name_comp,
+                        .vmux = 4,
+                        .amux = LINE1,
+                }, {
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE1,
+                } },
+        },
+        [SAA7134_BOARD_ASUSTeK_TIGER] = {
+                .name           = "Asus Tiger Rev:1.00",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .tuner_config   = 0,
+                .mpeg           = SAA7134_MPEG_DVB,
+                .gpiomask       = 0x0200000,
+                .inputs = { {
+                        .name   = name_tv,
+                        .vmux   = 1,
+                        .amux   = TV,
+                        .tv     = 1,
+                }, {
+                        .name   = name_comp1,
+                        .vmux   = 3,
+                        .amux   = LINE2,
+                }, {
+                        .name   = name_comp2,
+                        .vmux   = 0,
+                        .amux   = LINE2,
+                }, {
+                        .name   = name_svideo,
+                        .vmux   = 8,
+                        .amux   = LINE2,
+                } },
+                .radio = {
+                        .name   = name_radio,
+                        .amux   = TV,
+                        .gpio   = 0x0200000,
+                },
+        },
 };
 
 const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -4777,6 +4974,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
 
         },{
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x1461, /* Avermedia Technologies Inc */
+                .subdevice    = 0xf11d,
+                .driver_data  = SAA7134_BOARD_AVERMEDIA_M135A,
+        }, {
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
                 .subvendor    = PCI_VENDOR_ID_PHILIPS,
                 .subdevice    = 0x2004,
@@ -5157,6 +5360,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .driver_data  = SAA7134_BOARD_ENCORE_ENLTV_FM,
         },{
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
+                .subvendor    = 0x1a7f,
+                .subdevice    = 0x2008,
+                .driver_data  = SAA7134_BOARD_ENCORE_ENLTV_FM53,
+        }, {
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
                 .subvendor    = 0x153b,
                 .subdevice    = 0x1175,
@@ -5183,8 +5392,8 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
                 .subvendor    = 0x1043,
-                .subdevice    = 0x4857,
-                .driver_data  = SAA7134_BOARD_ASUSTeK_P7131_DUAL,
+                .subdevice    = 0x4857,         /* REV:1.00 */
+                .driver_data  = SAA7134_BOARD_ASUSTeK_TIGER,
         },{
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -5415,6 +5624,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .driver_data  = SAA7134_BOARD_VIDEOMATE_T750,
         }, {
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133, /* SAA7135HL */
+                .subvendor    = 0x1421,
+                .subdevice    = 0x0380,
+                .driver_data  = SAA7134_BOARD_ADS_INSTANT_HDTV_PCI,
+        }, {
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
                 .subvendor    = 0x5169,
                 .subdevice    = 0x1502,
@@ -5432,6 +5647,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .subdevice    = 0xf636,
                 .driver_data  = SAA7134_BOARD_AVERMEDIA_M103,
         }, {
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x1043,
+                .subdevice    = 0x4878, /* REV:1.02G */
+                .driver_data  = SAA7134_BOARD_ASUSTeK_TIGER_3IN1,
+        }, {
                 /* --- boards without eeprom + subsystem ID --- */
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -5540,7 +5761,7 @@ static int saa7134_tda8290_callback(struct saa7134_dev *dev,
         return 0;
 }
 
-int saa7134_tuner_callback(void *priv, int command, int arg)
+int saa7134_tuner_callback(void *priv, int component, int command, int arg)
 {
         struct saa7134_dev *dev = priv;
         if (dev != NULL) {
@@ -5620,6 +5841,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
         case SAA7134_BOARD_AVERMEDIA_STUDIO_507:
         case SAA7134_BOARD_AVERMEDIA_GO_007_FM:
         case SAA7134_BOARD_AVERMEDIA_777:
+        case SAA7134_BOARD_AVERMEDIA_M135A:
 /*      case SAA7134_BOARD_SABRENT_SBTTVFM:  */ /* not finished yet */
         case SAA7134_BOARD_VIDEOMATE_TV_PVR:
         case SAA7134_BOARD_VIDEOMATE_GOLD_PLUS:
@@ -5644,6 +5866,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
         case SAA7134_BOARD_AVERMEDIA_A16AR:
         case SAA7134_BOARD_ENCORE_ENLTV:
         case SAA7134_BOARD_ENCORE_ENLTV_FM:
+        case SAA7134_BOARD_ENCORE_ENLTV_FM53:
         case SAA7134_BOARD_10MOONSTVMASTER3:
         case SAA7134_BOARD_BEHOLD_401:
         case SAA7134_BOARD_BEHOLD_403:
@@ -5656,6 +5879,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
         case SAA7134_BOARD_BEHOLD_505FM:
         case SAA7134_BOARD_BEHOLD_507_9FM:
         case SAA7134_BOARD_GENIUS_TVGO_A11MCE:
+        case SAA7134_BOARD_REAL_ANGEL_220:
                 dev->has_remote = SAA7134_REMOTE_GPIO;
                 break;
         case SAA7134_BOARD_FLYDVBS_LR300:
@@ -5745,6 +5969,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
         case SAA7134_BOARD_PINNACLE_PCTV_110i:
         case SAA7134_BOARD_PINNACLE_PCTV_310i:
         case SAA7134_BOARD_UPMOST_PURPLE_TV:
+        case SAA7134_BOARD_MSI_TVATANYWHERE_PLUS:
         case SAA7134_BOARD_HAUPPAUGE_HVR1110:
         case SAA7134_BOARD_BEHOLD_607_9FM:
         case SAA7134_BOARD_BEHOLD_M6:
@@ -5987,6 +6212,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
         case SAA7134_BOARD_PINNACLE_PCTV_310i:
         case SAA7134_BOARD_KWORLD_DVBT_210:
         case SAA7134_BOARD_TEVION_DVBT_220RF:
+        case SAA7134_BOARD_ASUSTeK_TIGER:
         case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
         case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA:
         case SAA7134_BOARD_MEDION_MD8800_QUADRO:
@@ -6002,6 +6228,14 @@ int saa7134_board_init2(struct saa7134_dev *dev)
                 i2c_transfer(&dev->i2c_adap, &msg, 1);
                 break;
         }
+        case SAA7134_BOARD_ASUSTeK_TIGER_3IN1:
+        {
+                u8 data[] = { 0x3c, 0x33, 0x60};
+                struct i2c_msg msg = {.addr = 0x0b, .flags = 0, .buf = data,
+                                                        .len = sizeof(data)};
+                i2c_transfer(&dev->i2c_adap, &msg, 1);
+                break;
+        }
         case SAA7134_BOARD_FLYDVB_TRIO:
         {
                 u8 data[] = { 0x3c, 0x33, 0x62};
@@ -6027,6 +6261,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
                 i2c_transfer(&dev->i2c_adap, &msg, 1);
                 break;
         }
+        case SAA7134_BOARD_ADS_INSTANT_HDTV_PCI:
         case SAA7134_BOARD_KWORLD_ATSC110:
         {
                 /* enable tuner */
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 75d618415f4f..b686bfabbde0 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -215,7 +215,7 @@ 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;
+        dma_addr_t   dma_addr = 0;
 
         cpu = pci_alloc_consistent(pci, SAA7134_PGTABLE_SIZE, &dma_addr);
         if (NULL == cpu)
@@ -359,32 +359,6 @@ void saa7134_buffer_timeout(unsigned long data)
         spin_unlock_irqrestore(&dev->slock,flags);
 }
 
-/* resends a current buffer in queue after resume */
-
-static int saa7134_buffer_requeue(struct saa7134_dev *dev,
-                                  struct saa7134_dmaqueue *q)
-{
-        struct saa7134_buf *buf, *next;
-
-        assert_spin_locked(&dev->slock);
-
-        buf  = q->curr;
-        next = buf;
-        dprintk("buffer_requeue\n");
-
-        if (!buf)
-                return 0;
-
-        dprintk("buffer_requeue : resending active buffers \n");
-
-        if (!list_empty(&q->queue))
-                next = list_entry(q->queue.next, struct saa7134_buf,
-                                          vb.queue);
-        buf->activate(dev, buf, next);
-
-        return 0;
-}
-
 /* ------------------------------------------------------------------ */
 
 int saa7134_set_dmabits(struct saa7134_dev *dev)
@@ -442,9 +416,7 @@ int saa7134_set_dmabits(struct saa7134_dev *dev)
         /* TS capture -- dma 5 */
         if (dev->ts_q.curr) {
                 ctrl |= SAA7134_MAIN_CTRL_TE5;
-                irq  |= SAA7134_IRQ1_INTE_RA2_3 |
-                        SAA7134_IRQ1_INTE_RA2_2 |
-                        SAA7134_IRQ1_INTE_RA2_1 |
+                irq  |= SAA7134_IRQ1_INTE_RA2_1 |
                         SAA7134_IRQ1_INTE_RA2_0;
         }
 
@@ -727,6 +699,10 @@ static int saa7134_hw_enable2(struct saa7134_dev *dev)
                         irq2_mask |= SAA7134_IRQ2_INTE_GPIO18A;
         }
 
+        if (dev->has_remote == SAA7134_REMOTE_I2C) {
+                request_module("ir-kbd-i2c");
+        }
+
         saa_writel(SAA7134_IRQ1, 0);
         saa_writel(SAA7134_IRQ2, irq2_mask);
 
@@ -1139,6 +1115,32 @@ static void __devexit saa7134_finidev(struct pci_dev *pci_dev)
 }
 
 #ifdef CONFIG_PM
+
+/* resends a current buffer in queue after resume */
+static int saa7134_buffer_requeue(struct saa7134_dev *dev,
+                                  struct saa7134_dmaqueue *q)
+{
+        struct saa7134_buf *buf, *next;
+
+        assert_spin_locked(&dev->slock);
+
+        buf  = q->curr;
+        next = buf;
+        dprintk("buffer_requeue\n");
+
+        if (!buf)
+                return 0;
+
+        dprintk("buffer_requeue : resending active buffers \n");
+
+        if (!list_empty(&q->queue))
+                next = list_entry(q->queue.next, struct saa7134_buf,
+                                          vb.queue);
+        buf->activate(dev, buf, next);
+
+        return 0;
+}
+
 static int saa7134_suspend(struct pci_dev *pci_dev , pm_message_t state)
 {
 
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index be48b9b66a67..87c10983266f 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -553,7 +553,6 @@ static int configure_tda827x_fe(struct saa7134_dev *dev,
 /* ------------------------------------------------------------------ */
 
 static struct tda827x_config tda827x_cfg_0 = {
-        .tuner_callback = saa7134_tuner_callback,
         .init = philips_tda827x_tuner_init,
         .sleep = philips_tda827x_tuner_sleep,
         .config = 0,
@@ -561,7 +560,6 @@ static struct tda827x_config tda827x_cfg_0 = {
 };
 
 static struct tda827x_config tda827x_cfg_1 = {
-        .tuner_callback = saa7134_tuner_callback,
         .init = philips_tda827x_tuner_init,
         .sleep = philips_tda827x_tuner_sleep,
         .config = 1,
@@ -569,7 +567,6 @@ static struct tda827x_config tda827x_cfg_1 = {
 };
 
 static struct tda827x_config tda827x_cfg_2 = {
-        .tuner_callback = saa7134_tuner_callback,
         .init = philips_tda827x_tuner_init,
         .sleep = philips_tda827x_tuner_sleep,
         .config = 2,
@@ -577,7 +574,6 @@ static struct tda827x_config tda827x_cfg_2 = {
 };
 
 static struct tda827x_config tda827x_cfg_2_sw42 = {
-        .tuner_callback = saa7134_tuner_callback,
         .init = philips_tda827x_tuner_init,
         .sleep = philips_tda827x_tuner_sleep,
         .config = 2,
@@ -799,6 +795,20 @@ static struct tda1004x_config twinhan_dtv_dvb_3056_config = {
         .request_firmware = philips_tda1004x_request_firmware
 };
 
+static struct tda1004x_config asus_tiger_3in1_config = {
+        .demod_address = 0x0b,
+        .invert        = 1,
+        .invert_oclk   = 0,
+        .xtal_freq     = TDA10046_XTAL_16M,
+        .agc_config    = TDA10046_AGC_TDA827X,
+        .gpio_config   = TDA10046_GP11_I,
+        .if_freq       = TDA10046_FREQ_045,
+        .i2c_gate      = 0x4b,
+        .tuner_address = 0x61,
+        .antenna_switch = 1,
+        .request_firmware = philips_tda1004x_request_firmware
+};
+
 /* ------------------------------------------------------------------
  * special case: this card uses saa713x GPIO22 for the mode switch
  */
@@ -822,7 +832,6 @@ static int ads_duo_tuner_sleep(struct dvb_frontend *fe)
 }
 
 static struct tda827x_config ads_duo_cfg = {
-        .tuner_callback = saa7134_tuner_callback,
         .init = ads_duo_tuner_init,
         .sleep = ads_duo_tuner_sleep,
         .config = 0
@@ -1147,6 +1156,7 @@ static int dvb_init(struct saa7134_dev *dev)
                         dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
                                    NULL, DVB_PLL_TDHU2);
                 break;
+        case SAA7134_BOARD_ADS_INSTANT_HDTV_PCI:
         case SAA7134_BOARD_KWORLD_ATSC110:
                 dev->dvb.frontend = dvb_attach(nxt200x_attach, &kworldatsc110,
                                                &dev->i2c_adap);
@@ -1300,6 +1310,36 @@ static int dvb_init(struct saa7134_dev *dev)
                                                 &dev->i2c_adap);
                 attach_xc3028 = 1;
                 break;
+        case SAA7134_BOARD_ASUSTeK_TIGER_3IN1:
+                if (!use_frontend) {     /* terrestrial */
+                        if (configure_tda827x_fe(dev, &asus_tiger_3in1_config,
+                                                        &tda827x_cfg_2) < 0)
+                                goto dettach_frontend;
+                } else {                /* satellite */
+                        dev->dvb.frontend = dvb_attach(tda10086_attach,
+                                                &flydvbs, &dev->i2c_adap);
+                        if (dev->dvb.frontend) {
+                                if (dvb_attach(tda826x_attach,
+                                                dev->dvb.frontend, 0x60,
+                                                &dev->i2c_adap, 0) == NULL) {
+                                        wprintk("%s: Asus Tiger 3in1, no "
+                                                "tda826x found!\n", __func__);
+                                        goto dettach_frontend;
+                                }
+                                if (dvb_attach(lnbp21_attach, dev->dvb.frontend,
+                                                &dev->i2c_adap, 0, 0) == NULL) {
+                                        wprintk("%s: Asus Tiger 3in1, no lnbp21"
+                                                " found!\n", __func__);
+                                        goto dettach_frontend;
+                                }
+                        }
+                }
+                break;
+        case SAA7134_BOARD_ASUSTeK_TIGER:
+                if (configure_tda827x_fe(dev, &philips_tiger_config,
+                                         &tda827x_cfg_0) < 0)
+                        goto dettach_frontend;
+                break;
         default:
                 wprintk("Huh? unknown DVB card?\n");
                 break;
@@ -1327,6 +1367,8 @@ static int dvb_init(struct saa7134_dev *dev)
                 printk(KERN_ERR "%s/dvb: frontend initialization failed\n", dev->name);
                 return -1;
         }
+        /* define general-purpose callback pointer */
+        dev->dvb.frontend->callback = saa7134_tuner_callback;
 
         /* register everything else */
         ret = videobuf_dvb_register(&dev->dvb, THIS_MODULE, dev, &dev->pci->dev,
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index c0c5d7509c25..9a8766a78a0c 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -29,6 +29,7 @@
 
 #include <media/saa6752hs.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-chip-ident.h>
 
 /* ------------------------------------------------------------------ */
 
@@ -63,10 +64,19 @@ static void ts_reset_encoder(struct saa7134_dev* dev)
 
 static int ts_init_encoder(struct saa7134_dev* dev)
 {
-        struct v4l2_ext_controls ctrls = { V4L2_CTRL_CLASS_MPEG, 0 };
+        u32 leading_null_bytes = 0;
 
+        /* If more cards start to need this, then this
+           should probably be added to the card definitions. */
+        switch (dev->board) {
+        case SAA7134_BOARD_BEHOLD_M6:
+        case SAA7134_BOARD_BEHOLD_M63:
+        case SAA7134_BOARD_BEHOLD_M6_EXTRA:
+                leading_null_bytes = 1;
+                break;
+        }
         ts_reset_encoder(dev);
-        saa7134_i2c_call_clients(dev, VIDIOC_S_EXT_CTRLS, &ctrls);
+        saa7134_i2c_call_clients(dev, VIDIOC_INT_INIT, &leading_null_bytes);
         dev->empress_started = 1;
         return 0;
 }
@@ -79,9 +89,11 @@ static int ts_open(struct inode *inode, struct file *file)
         struct saa7134_dev *dev;
         int err;
 
+        lock_kernel();
         list_for_each_entry(dev, &saa7134_devlist, devlist)
                 if (dev->empress_dev && dev->empress_dev->minor == minor)
                         goto found;
+        unlock_kernel();
         return -ENODEV;
  found:
 
@@ -103,6 +115,7 @@ static int ts_open(struct inode *inode, struct file *file)
 done_up:
         mutex_unlock(&dev->empress_tsq.vb_lock);
 done:
+        unlock_kernel();
         return err;
 }
 
@@ -290,15 +303,6 @@ static int empress_streamoff(struct file *file, void *priv,
         return videobuf_streamoff(&dev->empress_tsq);
 }
 
-static int saa7134_i2c_call_saa6752(struct saa7134_dev *dev,
-                                              unsigned int cmd, void *arg)
-{
-        if (dev->mpeg_i2c_client == NULL)
-                return -EINVAL;
-        return dev->mpeg_i2c_client->driver->command(dev->mpeg_i2c_client,
-                                                                cmd, arg);
-}
-
 static int empress_s_ext_ctrls(struct file *file, void *priv,
                                struct v4l2_ext_controls *ctrls)
 {
@@ -400,6 +404,39 @@ static int empress_querymenu(struct file *file, void *priv,
         return saa7134_i2c_call_saa6752(dev, VIDIOC_QUERYMENU, c);
 }
 
+static int empress_g_chip_ident(struct file *file, void *fh,
+               struct v4l2_chip_ident *chip)
+{
+        struct saa7134_dev *dev = file->private_data;
+
+        chip->ident = V4L2_IDENT_NONE;
+        chip->revision = 0;
+        if (dev->mpeg_i2c_client == NULL)
+                return -EINVAL;
+        if (chip->match_type == V4L2_CHIP_MATCH_I2C_DRIVER &&
+            chip->match_chip == I2C_DRIVERID_SAA6752HS)
+                return saa7134_i2c_call_saa6752(dev, VIDIOC_G_CHIP_IDENT, chip);
+        if (chip->match_type == V4L2_CHIP_MATCH_I2C_ADDR &&
+            chip->match_chip == dev->mpeg_i2c_client->addr)
+                return saa7134_i2c_call_saa6752(dev, VIDIOC_G_CHIP_IDENT, chip);
+        return -EINVAL;
+}
+
+static int empress_s_std(struct file *file, void *priv, v4l2_std_id *id)
+{
+        struct saa7134_dev *dev = file->private_data;
+
+        return saa7134_s_std_internal(dev, NULL, id);
+}
+
+static int empress_g_std(struct file *file, void *priv, v4l2_std_id *id)
+{
+        struct saa7134_dev *dev = file->private_data;
+
+        *id = dev->tvnorm->id;
+        return 0;
+}
+
 static const struct file_operations ts_fops =
 {
         .owner    = THIS_MODULE,
@@ -428,11 +465,13 @@ static const struct v4l2_ioctl_ops ts_ioctl_ops = {
         .vidioc_enum_input              = empress_enum_input,
         .vidioc_g_input                 = empress_g_input,
         .vidioc_s_input                 = empress_s_input,
-
         .vidioc_queryctrl               = empress_queryctrl,
         .vidioc_querymenu               = empress_querymenu,
         .vidioc_g_ctrl                  = empress_g_ctrl,
         .vidioc_s_ctrl                  = empress_s_ctrl,
+        .vidioc_g_chip_ident            = empress_g_chip_ident,
+        .vidioc_s_std                   = empress_s_std,
+        .vidioc_g_std                   = empress_g_std,
 };
 
 /* ----------------------------------------------------------- */
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index 5f713e637683..20c1b33caf7b 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -337,6 +337,7 @@ static int attach_inform(struct i2c_client *client)
                 case 0x47:
                 case 0x71:
                 case 0x2d:
+                case 0x30:
                 {
                         struct IR_i2c *ir = i2c_get_clientdata(client);
                         d1printk("%s i2c IR detected (%s).\n",
@@ -427,6 +428,16 @@ void saa7134_i2c_call_clients(struct saa7134_dev *dev,
         i2c_clients_command(&dev->i2c_adap, cmd, arg);
 }
 
+int saa7134_i2c_call_saa6752(struct saa7134_dev *dev,
+                                              unsigned int cmd, void *arg)
+{
+        if (dev->mpeg_i2c_client == NULL)
+                return -EINVAL;
+        return dev->mpeg_i2c_client->driver->command(dev->mpeg_i2c_client,
+                                                                cmd, arg);
+}
+EXPORT_SYMBOL_GPL(saa7134_i2c_call_saa6752);
+
 int saa7134_i2c_register(struct saa7134_dev *dev)
 {
         dev->i2c_adap = saa7134_adap_template;
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index ad08d13dffdd..c53fd5f9f6b5 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -62,8 +62,11 @@ MODULE_PARM_DESC(disable_other_ir, "disable full codes of "
 #define i2cdprintk(fmt, arg...)    if (ir_debug) \
         printk(KERN_DEBUG "%s/ir: " fmt, ir->c.name , ## arg)
 
-/** rc5 functions */
+/* Helper functions for RC5 and NEC decoding at GPIO16 or GPIO18 */
 static int saa7134_rc5_irq(struct saa7134_dev *dev);
+static int saa7134_nec_irq(struct saa7134_dev *dev);
+static void nec_task(unsigned long data);
+static void saa7134_nec_timer(unsigned long data);
 
 /* -------------------- GPIO generic keycode builder -------------------- */
 
@@ -115,6 +118,53 @@ static int build_key(struct saa7134_dev *dev)
 
 /* --------------------- Chip specific I2C key builders ----------------- */
 
+static int get_key_msi_tvanywhere_plus(struct IR_i2c *ir, u32 *ir_key,
+                                       u32 *ir_raw)
+{
+        unsigned char b;
+        int gpio;
+
+        /* <dev> is needed to access GPIO. Used by the saa_readl macro. */
+        struct saa7134_dev *dev = ir->c.adapter->algo_data;
+        if (dev == NULL) {
+                dprintk("get_key_msi_tvanywhere_plus: "
+                        "gir->c.adapter->algo_data is NULL!\n");
+                return -EIO;
+        }
+
+        /* rising SAA7134_GPIO_GPRESCAN reads the status */
+
+        saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+        saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+
+        gpio = saa_readl(SAA7134_GPIO_GPSTATUS0 >> 2);
+
+        /* GPIO&0x40 is pulsed low when a button is pressed. Don't do
+           I2C receive if gpio&0x40 is not low. */
+
+        if (gpio & 0x40)
+                return 0;       /* No button press */
+
+        /* GPIO says there is a button press. Get it. */
+
+        if (1 != i2c_master_recv(&ir->c, &b, 1)) {
+                i2cdprintk("read error\n");
+                return -EIO;
+        }
+
+        /* No button press */
+
+        if (b == 0xff)
+                return 0;
+
+        /* Button pressed */
+
+        dprintk("get_key_msi_tvanywhere_plus: Key = 0x%02X\n", b);
+        *ir_key = b;
+        *ir_raw = b;
+        return 1;
+}
+
 static int get_key_purpletv(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
 {
         unsigned char b;
@@ -280,7 +330,9 @@ void saa7134_input_irq(struct saa7134_dev *dev)
 {
         struct card_ir *ir = dev->remote;
 
-        if (!ir->polling && !ir->rc5_gpio) {
+        if (ir->nec_gpio) {
+                saa7134_nec_irq(dev);
+        } else if (!ir->polling && !ir->rc5_gpio) {
                 build_key(dev);
         } else if (ir->rc5_gpio) {
                 saa7134_rc5_irq(dev);
@@ -316,6 +368,10 @@ void saa7134_ir_start(struct saa7134_dev *dev, struct card_ir *ir)
                 ir->addr = 0x17;
                 ir->rc5_key_timeout = ir_rc5_key_timeout;
                 ir->rc5_remote_gap = ir_rc5_remote_gap;
+        } else if (ir->nec_gpio) {
+                setup_timer(&ir->timer_keyup, saa7134_nec_timer,
+                            (unsigned long)dev);
+                tasklet_init(&ir->tlet, nec_task, (unsigned long)dev);
         }
 }
 
@@ -335,6 +391,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
         u32 mask_keyup   = 0;
         int polling      = 0;
         int rc5_gpio     = 0;
+        int nec_gpio     = 0;
         int ir_type      = IR_TYPE_OTHER;
         int err;
 
@@ -391,6 +448,12 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 saa_setb(SAA7134_GPIO_GPMODE0, 0x4);
                 saa_setb(SAA7134_GPIO_GPSTATUS0, 0x4);
                 break;
+        case SAA7134_BOARD_AVERMEDIA_M135A:
+                ir_codes     = ir_codes_avermedia_m135a;
+                mask_keydown = 0x0040000;
+                mask_keycode = 0x00013f;
+                nec_gpio     = 1;
+                break;
         case SAA7134_BOARD_AVERMEDIA_777:
         case SAA7134_BOARD_AVERMEDIA_A16AR:
                 ir_codes     = ir_codes_avermedia;
@@ -499,6 +562,12 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 mask_keyup   = 0x040000;
                 polling      = 50; // ms
                 break;
+        case SAA7134_BOARD_ENCORE_ENLTV_FM53:
+                ir_codes     = ir_codes_encore_enltv_fm53;
+                mask_keydown = 0x0040000;
+                mask_keycode = 0x00007f;
+                nec_gpio = 1;
+                break;
         case SAA7134_BOARD_10MOONSTVMASTER3:
                 ir_codes     = ir_codes_encore_enltv;
                 mask_keycode = 0x5f80000;
@@ -511,6 +580,12 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 mask_keydown = 0xf00000;
                 polling = 50; /* ms */
                 break;
+        case SAA7134_BOARD_REAL_ANGEL_220:
+                ir_codes     = ir_codes_real_audio_220_32_keys;
+                mask_keycode = 0x3f00;
+                mask_keyup   = 0x4000;
+                polling = 50; /* ms */
+                break;
         }
         if (NULL == ir_codes) {
                 printk("%s: Oops: IR config error [card=%d]\n",
@@ -533,6 +608,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
         ir->mask_keyup   = mask_keyup;
         ir->polling      = polling;
         ir->rc5_gpio     = rc5_gpio;
+        ir->nec_gpio     = nec_gpio;
 
         /* init input device */
         snprintf(ir->name, sizeof(ir->name), "saa7134 IR (%s)",
@@ -612,6 +688,11 @@ void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir)
                 ir->get_key   = get_key_purpletv;
                 ir->ir_codes  = ir_codes_purpletv;
                 break;
+        case SAA7134_BOARD_MSI_TVATANYWHERE_PLUS:
+                snprintf(ir->c.name, sizeof(ir->c.name), "MSI TV@nywhere Plus");
+                ir->get_key  = get_key_msi_tvanywhere_plus;
+                ir->ir_codes = ir_codes_msi_tvanywhere_plus;
+                break;
         case SAA7134_BOARD_HAUPPAUGE_HVR1110:
                 snprintf(ir->c.name, sizeof(ir->c.name), "HVR 1110");
                 ir->get_key   = get_key_hvr1110;
@@ -675,8 +756,125 @@ static int saa7134_rc5_irq(struct saa7134_dev *dev)
         return 1;
 }
 
-/* ----------------------------------------------------------------------
- * Local variables:
- * c-basic-offset: 8
- * End:
+
+/* On NEC protocol, One has 2.25 ms, and zero has 1.125 ms
+   The first pulse (start) has 9 + 4.5 ms
  */
+
+static void saa7134_nec_timer(unsigned long data)
+{
+        struct saa7134_dev *dev = (struct saa7134_dev *) data;
+        struct card_ir *ir = dev->remote;
+
+        dprintk("Cancel key repeat\n");
+
+        ir_input_nokey(ir->dev, &ir->ir);
+}
+
+static void nec_task(unsigned long data)
+{
+        struct saa7134_dev *dev = (struct saa7134_dev *) data;
+        struct card_ir *ir;
+        struct timeval tv;
+        int count, pulse, oldpulse, gap;
+        u32 ircode = 0, not_code = 0;
+        int ngap = 0;
+
+        if (!data) {
+                printk(KERN_ERR "saa713x/ir: Can't recover dev struct\n");
+                /* GPIO will be kept disabled */
+                return;
+        }
+
+        ir = dev->remote;
+
+        /* rising SAA7134_GPIO_GPRESCAN reads the status */
+        saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+        saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+
+        oldpulse = saa_readl(SAA7134_GPIO_GPSTATUS0 >> 2) & ir->mask_keydown;
+        pulse = oldpulse;
+
+        do_gettimeofday(&tv);
+        ir->base_time = tv;
+
+        /* Decode NEC pulsecode. This code can take up to 76.5 ms to run.
+           Unfortunately, using IRQ to decode pulse didn't work, since it uses
+           a pulse train of 38KHz. This means one pulse on each 52 us
+         */
+        do {
+                /* Wait until the end of pulse/space or 5 ms */
+                for (count = 0; count < 500; count++)  {
+                        udelay(10);
+                        /* rising SAA7134_GPIO_GPRESCAN reads the status */
+                        saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+                        saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+                        pulse = saa_readl(SAA7134_GPIO_GPSTATUS0 >> 2)
+                                & ir->mask_keydown;
+                        if (pulse != oldpulse)
+                                break;
+                }
+
+                do_gettimeofday(&tv);
+                gap = 1000000 * (tv.tv_sec - ir->base_time.tv_sec) +
+                                tv.tv_usec - ir->base_time.tv_usec;
+
+                if (!pulse) {
+                        /* Bit 0 has 560 us, while bit 1 has 1120 us.
+                           Do something only if bit == 1
+                         */
+                        if (ngap && (gap > 560 + 280)) {
+                                unsigned int shift = ngap - 1;
+
+                                /* Address first, then command */
+                                if (shift < 8) {
+                                        shift += 8;
+                                        ircode |= 1 << shift;
+                                } else if (shift < 16) {
+                                        not_code |= 1 << shift;
+                                } else if (shift < 24) {
+                                        shift -= 16;
+                                        ircode |= 1 << shift;
+                                } else {
+                                        shift -= 24;
+                                        not_code |= 1 << shift;
+                                }
+                        }
+                        ngap++;
+                }
+
+
+                ir->base_time = tv;
+
+                /* TIMEOUT - Long pulse */
+                if (gap >= 5000)
+                        break;
+                oldpulse = pulse;
+        } while (ngap < 32);
+
+        if (ngap == 32) {
+                /* FIXME: should check if not_code == ~ircode */
+                ir->code = ir_extract_bits(ircode, ir->mask_keycode);
+
+                dprintk("scancode = 0x%02x (code = 0x%02x, notcode= 0x%02x)\n",
+                         ir->code, ircode, not_code);
+
+                ir_input_keydown(ir->dev, &ir->ir, ir->code, ir->code);
+        } else
+                dprintk("Repeat last key\n");
+
+        /* Keep repeating the last key */
+        mod_timer(&ir->timer_keyup, jiffies + msecs_to_jiffies(150));
+
+        saa_setl(SAA7134_IRQ2, SAA7134_IRQ2_INTE_GPIO18);
+}
+
+static int saa7134_nec_irq(struct saa7134_dev *dev)
+{
+        struct card_ir *ir = dev->remote;
+
+        saa_clearl(SAA7134_IRQ2, SAA7134_IRQ2_INTE_GPIO18);
+        tasklet_schedule(&ir->tlet);
+
+        return 1;
+}
diff --git a/drivers/media/video/saa7134/saa7134-ts.c b/drivers/media/video/saa7134/saa7134-ts.c
index eae72fd60cec..ef55a59f0cda 100644
--- a/drivers/media/video/saa7134/saa7134-ts.c
+++ b/drivers/media/video/saa7134/saa7134-ts.c
@@ -66,11 +66,29 @@ static int buffer_activate(struct saa7134_dev *dev,
         saa7134_set_dmabits(dev);
 
         mod_timer(&dev->ts_q.timeout, jiffies+BUFFER_TIMEOUT);
+
+        if (dev->ts_state == SAA7134_TS_BUFF_DONE) {
+                /* Clear TS cache */
+                dev->buff_cnt = 0;
+                saa_writeb(SAA7134_TS_SERIAL1, 0x00);
+                saa_writeb(SAA7134_TS_SERIAL1, 0x03);
+                saa_writeb(SAA7134_TS_SERIAL1, 0x00);
+                saa_writeb(SAA7134_TS_SERIAL1, 0x01);
+
+                /* TS clock non-inverted */
+                saa_writeb(SAA7134_TS_SERIAL1, 0x00);
+
+                /* Start TS stream */
+                saa_writeb(SAA7134_TS_SERIAL0, 0x40);
+                saa_writeb(SAA7134_TS_PARALLEL, 0xEC);
+                dev->ts_state = SAA7134_TS_STARTED;
+        }
+
         return 0;
 }
 
 static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
-                          enum v4l2_field field)
+                enum v4l2_field field)
 {
         struct saa7134_dev *dev = q->priv_data;
         struct saa7134_buf *buf = container_of(vb,struct saa7134_buf,vb);
@@ -110,16 +128,22 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
                         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);
+        dev->buff_cnt++;
+
+        if (dev->buff_cnt == dev->ts.nr_bufs) {
+                dev->ts_state = SAA7134_TS_BUFF_DONE;
+                /* 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);
+                /* TSNOPIT=0, TSCOLAP=0 */
+                saa_writeb(SAA7134_TS_DMA2, (((lines - 1) >> 16) & 0x3f) | 0x00);
+                saa_writel(SAA7134_RS_PITCH(5), TS_PACKET_SIZE);
+                saa_writel(SAA7134_RS_CONTROL(5), control);
+        }
 
         buf->vb.state = VIDEOBUF_PREPARED;
         buf->activate = buffer_activate;
@@ -140,6 +164,8 @@ buffer_setup(struct videobuf_queue *q, unsigned int *count, unsigned int *size)
         if (0 == *count)
                 *count = dev->ts.nr_bufs;
         *count = saa7134_buffer_count(*size,*count);
+        dev->buff_cnt = 0;
+        dev->ts_state = SAA7134_TS_STOPPED;
         return 0;
 }
 
@@ -154,7 +180,13 @@ static void buffer_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
 static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
 {
         struct saa7134_buf *buf = container_of(vb,struct saa7134_buf,vb);
+        struct saa7134_dev *dev = q->priv_data;
 
+        if (dev->ts_state == SAA7134_TS_STARTED) {
+                /* Stop TS transport */
+                saa_writeb(SAA7134_TS_PARALLEL, 0x6c);
+                dev->ts_state = SAA7134_TS_STOPPED;
+        }
         saa7134_dma_free(q,buf);
 }
 
@@ -182,7 +214,7 @@ int saa7134_ts_init_hw(struct saa7134_dev *dev)
         /* deactivate TS softreset */
         saa_writeb(SAA7134_TS_SERIAL1, 0x00);
         /* TSSOP high active, TSVAL high active, TSLOCK ignored */
-        saa_writeb(SAA7134_TS_PARALLEL, 0xec);
+        saa_writeb(SAA7134_TS_PARALLEL, 0x6c);
         saa_writeb(SAA7134_TS_PARALLEL_SERIAL, (TS_PACKET_SIZE-1));
         saa_writeb(SAA7134_TS_DMA0, ((dev->ts.nr_packets-1)&0xff));
         saa_writeb(SAA7134_TS_DMA1, (((dev->ts.nr_packets-1)>>8)&0xff));
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 68c268981861..02bb6747a39c 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -628,6 +628,9 @@ void saa7134_set_tvnorm_hw(struct saa7134_dev *dev)
 
         if (card_in(dev, dev->ctl_input).tv)
                 saa7134_i2c_call_clients(dev, VIDIOC_S_STD, &dev->tvnorm->id);
+        /* Set the correct norm for the saa6752hs. This function
+           does nothing if there is no saa6752hs. */
+        saa7134_i2c_call_saa6752(dev, VIDIOC_S_STD, &dev->tvnorm->id);
 }
 
 static void set_h_prescale(struct saa7134_dev *dev, int task, int prescale)
@@ -1330,6 +1333,8 @@ static int video_open(struct inode *inode, struct file *file)
         struct saa7134_fh *fh;
         enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         int radio = 0;
+
+        lock_kernel();
         list_for_each_entry(dev, &saa7134_devlist, devlist) {
                 if (dev->video_dev && (dev->video_dev->minor == minor))
                         goto found;
@@ -1342,6 +1347,7 @@ static int video_open(struct inode *inode, struct file *file)
                         goto found;
                 }
         }
+        unlock_kernel();
         return -ENODEV;
  found:
 
@@ -1350,8 +1356,10 @@ static int video_open(struct inode *inode, struct file *file)
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh),GFP_KERNEL);
-        if (NULL == fh)
+        if (NULL == fh) {
+                unlock_kernel();
                 return -ENOMEM;
+        }
         file->private_data = fh;
         fh->dev      = dev;
         fh->radio    = radio;
@@ -1384,6 +1392,7 @@ static int video_open(struct inode *inode, struct file *file)
                 /* switch to video/vbi mode */
                 video_mux(dev,dev->ctl_input);
         }
+        unlock_kernel();
         return 0;
 }
 
@@ -1790,18 +1799,25 @@ static int saa7134_querycap(struct file *file, void  *priv,
                 return 0;
 }
 
-static int saa7134_s_std(struct file *file, void *priv, v4l2_std_id *id)
+int saa7134_s_std_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, v4l2_std_id *id)
 {
-        struct saa7134_fh *fh = priv;
-        struct saa7134_dev *dev = fh->dev;
         unsigned long flags;
         unsigned int i;
         v4l2_std_id fixup;
         int err;
 
-        err = v4l2_prio_check(&dev->prio, &fh->prio);
-        if (0 != err)
-                return err;
+        /* When called from the empress code fh == NULL.
+           That needs to be fixed somehow, but for now this is
+           good enough. */
+        if (fh) {
+                err = v4l2_prio_check(&dev->prio, &fh->prio);
+                if (0 != err)
+                        return err;
+        } else if (res_locked(dev, RESOURCE_OVERLAY)) {
+                /* Don't change the std from the mpeg device
+                   if overlay is active. */
+                return -EBUSY;
+        }
 
         for (i = 0; i < TVNORMS; i++)
                 if (*id == tvnorms[i].id)
@@ -1834,7 +1850,7 @@ static int saa7134_s_std(struct file *file, void *priv, v4l2_std_id *id)
         *id = tvnorms[i].id;
 
         mutex_lock(&dev->lock);
-        if (res_check(fh, RESOURCE_OVERLAY)) {
+        if (fh && res_check(fh, RESOURCE_OVERLAY)) {
                 spin_lock_irqsave(&dev->slock, flags);
                 stop_preview(dev, fh);
                 spin_unlock_irqrestore(&dev->slock, flags);
@@ -1851,6 +1867,23 @@ static int saa7134_s_std(struct file *file, void *priv, v4l2_std_id *id)
         mutex_unlock(&dev->lock);
         return 0;
 }
+EXPORT_SYMBOL_GPL(saa7134_s_std_internal);
+
+static int saa7134_s_std(struct file *file, void *priv, v4l2_std_id *id)
+{
+        struct saa7134_fh *fh = priv;
+
+        return saa7134_s_std_internal(fh->dev, fh, id);
+}
+
+static int saa7134_g_std(struct file *file, void *priv, v4l2_std_id *id)
+{
+        struct saa7134_fh *fh = priv;
+        struct saa7134_dev *dev = fh->dev;
+
+        *id = dev->tvnorm->id;
+        return 0;
+}
 
 static int saa7134_cropcap(struct file *file, void *priv,
                                         struct v4l2_cropcap *cap)
@@ -2077,18 +2110,6 @@ static int saa7134_enum_fmt_vid_overlay(struct file *file, void  *priv,
         return 0;
 }
 
-static int saa7134_enum_fmt_vbi_cap(struct file *file, void  *priv,
-                                        struct v4l2_fmtdesc *f)
-{
-        if (0 != f->index)
-                return -EINVAL;
-
-        f->pixelformat = V4L2_PIX_FMT_GREY;
-        strcpy(f->description, "vbi data");
-
-        return 0;
-}
-
 static int saa7134_g_fbuf(struct file *file, void *f,
                                 struct v4l2_framebuffer *fb)
 {
@@ -2379,7 +2400,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
         .vidioc_g_fmt_vid_overlay       = saa7134_g_fmt_vid_overlay,
         .vidioc_try_fmt_vid_overlay     = saa7134_try_fmt_vid_overlay,
         .vidioc_s_fmt_vid_overlay       = saa7134_s_fmt_vid_overlay,
-        .vidioc_enum_fmt_vbi_cap        = saa7134_enum_fmt_vbi_cap,
         .vidioc_g_fmt_vbi_cap           = saa7134_try_get_set_fmt_vbi_cap,
         .vidioc_try_fmt_vbi_cap         = saa7134_try_get_set_fmt_vbi_cap,
         .vidioc_s_fmt_vbi_cap           = saa7134_try_get_set_fmt_vbi_cap,
@@ -2391,6 +2411,7 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
         .vidioc_qbuf                    = saa7134_qbuf,
         .vidioc_dqbuf                   = saa7134_dqbuf,
         .vidioc_s_std                   = saa7134_s_std,
+        .vidioc_g_std                   = saa7134_g_std,
         .vidioc_enum_input              = saa7134_enum_input,
         .vidioc_g_input                 = saa7134_g_input,
         .vidioc_s_input                 = saa7134_s_input,
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index a0884f639f65..491ab1f8fdd3 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -269,6 +269,12 @@ struct saa7134_format {
 #define SAA7134_BOARD_BEHOLD_M6_EXTRA    144
 #define SAA7134_BOARD_AVERMEDIA_M103    145
 #define SAA7134_BOARD_ASUSTeK_P7131_ANALOG 146
+#define SAA7134_BOARD_ASUSTeK_TIGER_3IN1   147
+#define SAA7134_BOARD_ENCORE_ENLTV_FM53 148
+#define SAA7134_BOARD_AVERMEDIA_M135A    149
+#define SAA7134_BOARD_REAL_ANGEL_220     150
+#define SAA7134_BOARD_ADS_INSTANT_HDTV_PCI  151
+#define SAA7134_BOARD_ASUSTeK_TIGER         152
 
 #define SAA7134_MAXBOARDS 8
 #define SAA7134_INPUT_MAX 8
@@ -462,6 +468,12 @@ struct saa7134_mpeg_ops {
         void                       (*signal_change)(struct saa7134_dev *dev);
 };
 
+enum saa7134_ts_status {
+        SAA7134_TS_STOPPED,
+        SAA7134_TS_BUFF_DONE,
+        SAA7134_TS_STARTED,
+};
+
 /* global device status */
 struct saa7134_dev {
         struct list_head           devlist;
@@ -555,6 +567,8 @@ struct saa7134_dev {
         /* SAA7134_MPEG_* */
         struct saa7134_ts          ts;
         struct saa7134_dmaqueue    ts_q;
+        enum saa7134_ts_status     ts_state;
+        unsigned int               buff_cnt;
         struct saa7134_mpeg_ops    *mops;
         struct i2c_client          *mpeg_i2c_client;
 
@@ -644,7 +658,7 @@ extern struct pci_device_id __devinitdata saa7134_pci_tbl[];
 
 extern int saa7134_board_init1(struct saa7134_dev *dev);
 extern int saa7134_board_init2(struct saa7134_dev *dev);
-int saa7134_tuner_callback(void *priv, int command, int arg);
+int saa7134_tuner_callback(void *priv, int component, int command, int arg);
 
 
 /* ----------------------------------------------------------- */
@@ -654,6 +668,8 @@ int saa7134_i2c_register(struct saa7134_dev *dev);
 int saa7134_i2c_unregister(struct saa7134_dev *dev);
 void saa7134_i2c_call_clients(struct saa7134_dev *dev,
                               unsigned int cmd, void *arg);
+int saa7134_i2c_call_saa6752(struct saa7134_dev *dev,
+                              unsigned int cmd, void *arg);
 
 
 /* ----------------------------------------------------------- */
@@ -666,6 +682,7 @@ extern struct video_device saa7134_radio_template;
 int saa7134_s_ctrl_internal(struct saa7134_dev *dev,  struct saa7134_fh *fh, struct v4l2_control *c);
 int saa7134_g_ctrl_internal(struct saa7134_dev *dev,  struct saa7134_fh *fh, struct v4l2_control *c);
 int saa7134_queryctrl(struct file *file, void *priv, struct v4l2_queryctrl *c);
+int saa7134_s_std_internal(struct saa7134_dev *dev,  struct saa7134_fh *fh, v4l2_std_id *id);
 
 int saa7134_videoport_init(struct saa7134_dev *dev);
 void saa7134_set_tvnorm_hw(struct saa7134_dev *dev);
diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c
index acceed5d04ae..ae3949180c4e 100644
--- a/drivers/media/video/se401.c
+++ b/drivers/media/video/se401.c
@@ -288,7 +288,7 @@ static void se401_button_irq(struct urb *urb)
         int status;
 
         if (!se401->dev) {
-                info("ohoh: device vapourished");
+                dev_info(&urb->dev->dev, "device vapourished\n");
                 return;
         }
 
@@ -328,7 +328,7 @@ static void se401_video_irq(struct urb *urb)
                 return;
 
         if (!se401->dev) {
-                info ("ohoh: device vapourished");
+                dev_info(&urb->dev->dev, "device vapourished\n");
                 return;
         }
 
@@ -375,7 +375,7 @@ static void se401_video_irq(struct urb *urb)
         urb->status=0;
         urb->dev=se401->dev;
         if(usb_submit_urb(urb, GFP_KERNEL))
-                info("urb burned down");
+                dev_info(&urb->dev->dev, "urb burned down\n");
         return;
 }
 
@@ -860,7 +860,8 @@ static int se401_newframe(struct usb_se401 *se401, int framenr)
                 );
                 if (se401->nullpackets > SE401_MAX_NULLPACKETS) {
                         se401->nullpackets=0;
-                        info("to many null length packets, restarting capture");
+                        dev_info(&se401->dev->dev,
+                                 "too many null length packets, restarting capture\n");
                         se401_stop_stream(se401);
                         se401_start_stream(se401);
                 } else {
@@ -880,7 +881,8 @@ static int se401_newframe(struct usb_se401 *se401, int framenr)
                                 se401->scratch_use=0;
                         if (errors > SE401_MAX_ERRORS) {
                                 errors=0;
-                                info("to much errors, restarting capture");
+                                dev_info(&se401->dev->dev,
+                                         "too many errors, restarting capture\n");
                                 se401_stop_stream(se401);
                                 se401_start_stream(se401);
                         }
@@ -913,7 +915,7 @@ static void usb_se401_remove_disconnected (struct usb_se401 *se401)
                 usb_kill_urb(se401->inturb);
                 usb_free_urb(se401->inturb);
         }
-        info("%s disconnected", se401->camera_name);
+        dev_info(&se401->dev->dev, "%s disconnected", se401->camera_name);
 
         /* Free the memory */
         kfree(se401->width);
@@ -936,14 +938,18 @@ static int se401_open(struct inode *inode, struct file *file)
         struct usb_se401 *se401 = (struct usb_se401 *)dev;
         int err = 0;
 
-        if (se401->user)
+        lock_kernel();
+        if (se401->user) {
+                unlock_kernel();
                 return -EBUSY;
+        }
         se401->fbuf = rvmalloc(se401->maxframesize * SE401_NUMFRAMES);
         if (se401->fbuf)
                 file->private_data = dev;
         else
                 err = -ENOMEM;
         se401->user = !err;
+        unlock_kernel();
 
         return err;
 }
@@ -956,8 +962,8 @@ static int se401_close(struct inode *inode, struct file *file)
 
         rvfree(se401->fbuf, se401->maxframesize * SE401_NUMFRAMES);
         if (se401->removed) {
+                dev_info(&se401->dev->dev, "device unregistered\n");
                 usb_se401_remove_disconnected(se401);
-                info("device unregistered");
         } else {
                 for (i=0; i<SE401_NUMFRAMES; i++)
                         se401->frame[i].grabstate=FRAME_UNUSED;
@@ -1232,6 +1238,7 @@ static const struct file_operations se401_fops = {
 static struct video_device se401_template = {
         .name =         "se401 USB camera",
         .fops =         &se401_fops,
+        .release = video_device_release_empty,
 };
 
 
@@ -1271,7 +1278,7 @@ static int se401_init(struct usb_se401 *se401, int button)
         for (i=0; i<se401->sizes; i++) {
                 sprintf(temp, "%s %dx%d", temp, se401->width[i], se401->height[i]);
         }
-        info("%s", temp);
+        dev_info(&se401->dev->dev, "%s\n", temp);
         se401->maxframesize=se401->width[se401->sizes-1]*se401->height[se401->sizes-1]*3;
 
         rc=se401_sndctrl(0, se401, SE401_REQ_GET_WIDTH, 0, cp, sizeof(cp));
@@ -1305,7 +1312,8 @@ static int se401_init(struct usb_se401 *se401, int button)
         if (button) {
                 se401->inturb=usb_alloc_urb(0, GFP_KERNEL);
                 if (!se401->inturb) {
-                        info("Allocation of inturb failed");
+                        dev_info(&se401->dev->dev,
+                                 "Allocation of inturb failed\n");
                         return 1;
                 }
                 usb_fill_int_urb(se401->inturb, se401->dev,
@@ -1316,7 +1324,7 @@ static int se401_init(struct usb_se401 *se401, int button)
                     8
                 );
                 if (usb_submit_urb(se401->inturb, GFP_KERNEL)) {
-                        info("int urb burned down");
+                        dev_info(&se401->dev->dev, "int urb burned down\n");
                         return 1;
                 }
         } else
@@ -1373,7 +1381,7 @@ static int se401_probe(struct usb_interface *intf,
                 return -ENODEV;
 
         /* We found one */
-        info("SE401 camera found: %s", camera_name);
+        dev_info(&intf->dev, "SE401 camera found: %s\n", camera_name);
 
         if ((se401 = kzalloc(sizeof(*se401), GFP_KERNEL)) == NULL) {
                 err("couldn't kmalloc se401 struct");
@@ -1384,7 +1392,8 @@ static int se401_probe(struct usb_interface *intf,
         se401->iface = interface->bInterfaceNumber;
         se401->camera_name = camera_name;
 
-        info("firmware version: %02x", le16_to_cpu(dev->descriptor.bcdDevice) & 255);
+        dev_info(&intf->dev, "firmware version: %02x\n",
+                 le16_to_cpu(dev->descriptor.bcdDevice) & 255);
 
         if (se401_init(se401, button)) {
                 kfree(se401);
@@ -1402,7 +1411,8 @@ static int se401_probe(struct usb_interface *intf,
                 err("video_register_device failed");
                 return -EIO;
         }
-        info("registered new video device: video%d", se401->vdev.minor);
+        dev_info(&intf->dev, "registered new video device: video%d\n",
+                 se401->vdev.minor);
 
         usb_set_intfdata (intf, se401);
         return 0;
@@ -1446,10 +1456,10 @@ static struct usb_driver se401_driver = {
 
 static int __init usb_se401_init(void)
 {
-        info("SE401 usb camera driver version %s registering", version);
+        printk(KERN_INFO "SE401 usb camera driver version %s registering\n", version);
         if (flickerless)
                 if (flickerless!=50 && flickerless!=60) {
-                        info("Invallid flickerless value, use 0, 50 or 60.");
+                        printk(KERN_ERR "Invallid flickerless value, use 0, 50 or 60.\n");
                         return -1;
         }
         return usb_register(&se401_driver);
@@ -1458,7 +1468,7 @@ static int __init usb_se401_init(void)
 static void __exit usb_se401_exit(void)
 {
         usb_deregister(&se401_driver);
-        info("SE401 driver deregistered");
+        printk(KERN_INFO "SE401 driver deregistered\frame");
 }
 
 module_init(usb_se401_init);
diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c
index 318754e73132..76838091dc66 100644
--- a/drivers/media/video/sh_mobile_ceu_camera.c
+++ b/drivers/media/video/sh_mobile_ceu_camera.c
@@ -304,9 +304,6 @@ static int sh_mobile_ceu_add_device(struct soc_camera_device *icd)
                  "SuperH Mobile CEU driver attached to camera %d\n",
                  icd->devnum);
 
-        if (pcdev->pdata->enable_camera)
-                pcdev->pdata->enable_camera();
-
         ret = icd->ops->init(icd);
         if (ret)
                 goto err;
@@ -333,8 +330,6 @@ static void sh_mobile_ceu_remove_device(struct soc_camera_device *icd)
         ceu_write(pcdev, CEIER, 0);
         ceu_write(pcdev, CAPSR, 1 << 16); /* reset */
         icd->ops->release(icd);
-        if (pcdev->pdata->disable_camera)
-                pcdev->pdata->disable_camera();
 
         dev_info(&icd->dev,
                  "SuperH Mobile CEU driver detached from camera %d\n",
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
index 2da6938718f2..20e30bd9364b 100644
--- a/drivers/media/video/sn9c102/sn9c102_core.c
+++ b/drivers/media/video/sn9c102/sn9c102_core.c
@@ -116,6 +116,26 @@ MODULE_PARM_DESC(debug,
                  "\n");
 #endif
 
+/*
+   Add the probe entries to this table. Be sure to add the entry in the right
+   place, since, on failure, the next probing routine is called according to
+   the order of the list below, from top to bottom.
+*/
+static int (*sn9c102_sensor_table[])(struct sn9c102_device *) = {
+        &sn9c102_probe_hv7131d, /* strong detection based on SENSOR ids */
+        &sn9c102_probe_hv7131r, /* strong detection based on SENSOR ids */
+        &sn9c102_probe_mi0343, /* strong detection based on SENSOR ids */
+        &sn9c102_probe_mi0360, /* strong detection based on SENSOR ids */
+        &sn9c102_probe_mt9v111, /* strong detection based on SENSOR ids */
+        &sn9c102_probe_pas106b, /* strong detection based on SENSOR ids */
+        &sn9c102_probe_pas202bcb, /* strong detection based on SENSOR ids */
+        &sn9c102_probe_ov7630, /* strong detection based on SENSOR ids */
+        &sn9c102_probe_ov7660, /* strong detection based on SENSOR ids */
+        &sn9c102_probe_tas5110c1b, /* detection based on USB pid/vid */
+        &sn9c102_probe_tas5110d, /* detection based on USB pid/vid */
+        &sn9c102_probe_tas5130d1b, /* detection based on USB pid/vid */
+};
+
 /*****************************************************************************/
 
 static u32
@@ -1746,7 +1766,7 @@ static int sn9c102_open(struct inode* inode, struct file* filp)
         if (!down_read_trylock(&sn9c102_dev_lock))
                 return -ERESTARTSYS;
 
-        cam = video_get_drvdata(video_devdata(filp));
+        cam = video_drvdata(filp);
 
         if (wait_for_completion_interruptible(&cam->probe)) {
                 up_read(&sn9c102_dev_lock);
@@ -1843,7 +1863,7 @@ static int sn9c102_release(struct inode* inode, struct file* filp)
 
         down_write(&sn9c102_dev_lock);
 
-        cam = video_get_drvdata(video_devdata(filp));
+        cam = video_drvdata(filp);
 
         sn9c102_stop_transfer(cam);
         sn9c102_release_buffers(cam);
@@ -1863,7 +1883,7 @@ static int sn9c102_release(struct inode* inode, struct file* filp)
 static ssize_t
 sn9c102_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos)
 {
-        struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));
+        struct sn9c102_device *cam = video_drvdata(filp);
         struct sn9c102_frame_t* f, * i;
         unsigned long lock_flags;
         long timeout;
@@ -1987,7 +2007,7 @@ exit:
 
 static unsigned int sn9c102_poll(struct file *filp, poll_table *wait)
 {
-        struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));
+        struct sn9c102_device *cam = video_drvdata(filp);
         struct sn9c102_frame_t* f;
         unsigned long lock_flags;
         unsigned int mask = 0;
@@ -2063,7 +2083,7 @@ static struct vm_operations_struct sn9c102_vm_ops = {
 
 static int sn9c102_mmap(struct file* filp, struct vm_area_struct *vma)
 {
-        struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));
+        struct sn9c102_device *cam = video_drvdata(filp);
         unsigned long size = vma->vm_end - vma->vm_start,
                       start = vma->vm_start;
         void *pos;
@@ -3075,7 +3095,7 @@ sn9c102_vidioc_s_audio(struct sn9c102_device* cam, void __user * arg)
 static int sn9c102_ioctl_v4l2(struct inode* inode, struct file* filp,
                               unsigned int cmd, void __user * arg)
 {
-        struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));
+        struct sn9c102_device *cam = video_drvdata(filp);
 
         switch (cmd) {
 
@@ -3179,7 +3199,7 @@ static int sn9c102_ioctl_v4l2(struct inode* inode, struct file* filp,
 static int sn9c102_ioctl(struct inode* inode, struct file* filp,
                          unsigned int cmd, unsigned long arg)
 {
-        struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));
+        struct sn9c102_device *cam = video_drvdata(filp);
         int err = 0;
 
         if (mutex_lock_interruptible(&cam->fileop_mutex))
diff --git a/drivers/media/video/sn9c102/sn9c102_devtable.h b/drivers/media/video/sn9c102/sn9c102_devtable.h
index 90a401dc3884..e23734f6d6e2 100644
--- a/drivers/media/video/sn9c102/sn9c102_devtable.h
+++ b/drivers/media/video/sn9c102/sn9c102_devtable.h
@@ -140,24 +140,4 @@ extern int sn9c102_probe_tas5110c1b(struct sn9c102_device* cam);
 extern int sn9c102_probe_tas5110d(struct sn9c102_device* cam);
 extern int sn9c102_probe_tas5130d1b(struct sn9c102_device* cam);
 
-/*
-   Add the above entries to this table. Be sure to add the entry in the right
-   place, since, on failure, the next probing routine is called according to
-   the order of the list below, from top to bottom.
-*/
-static int (*sn9c102_sensor_table[])(struct sn9c102_device*) = {
-        &sn9c102_probe_hv7131d, /* strong detection based on SENSOR ids */
-        &sn9c102_probe_hv7131r, /* strong detection based on SENSOR ids */
-        &sn9c102_probe_mi0343, /* strong detection based on SENSOR ids */
-        &sn9c102_probe_mi0360, /* strong detection based on SENSOR ids */
-        &sn9c102_probe_mt9v111, /* strong detection based on SENSOR ids */
-        &sn9c102_probe_pas106b, /* strong detection based on SENSOR ids */
-        &sn9c102_probe_pas202bcb, /* strong detection based on SENSOR ids */
-        &sn9c102_probe_ov7630, /* strong detection based on SENSOR ids */
-        &sn9c102_probe_ov7660, /* strong detection based on SENSOR ids */
-        &sn9c102_probe_tas5110c1b, /* detection based on USB pid/vid */
-        &sn9c102_probe_tas5110d, /* detection based on USB pid/vid */
-        &sn9c102_probe_tas5130d1b, /* detection based on USB pid/vid */
-};
-
 #endif /* _SN9C102_DEVTABLE_H_ */
diff --git a/drivers/media/video/sn9c102/sn9c102_hv7131d.c b/drivers/media/video/sn9c102/sn9c102_hv7131d.c
index eaf9ad0dc8a6..db2434948939 100644
--- a/drivers/media/video/sn9c102/sn9c102_hv7131d.c
+++ b/drivers/media/video/sn9c102/sn9c102_hv7131d.c
@@ -20,6 +20,7 @@
  ***************************************************************************/
 
 #include "sn9c102_sensor.h"
+#include "sn9c102_devtable.h"
 
 
 static int hv7131d_init(struct sn9c102_device* cam)
diff --git a/drivers/media/video/sn9c102/sn9c102_hv7131r.c b/drivers/media/video/sn9c102/sn9c102_hv7131r.c
index 0fc401223cfc..4295887ff609 100644
--- a/drivers/media/video/sn9c102/sn9c102_hv7131r.c
+++ b/drivers/media/video/sn9c102/sn9c102_hv7131r.c
@@ -20,6 +20,7 @@
  ***************************************************************************/
 
 #include "sn9c102_sensor.h"
+#include "sn9c102_devtable.h"
 
 
 static int hv7131r_init(struct sn9c102_device* cam)
diff --git a/drivers/media/video/sn9c102/sn9c102_mi0343.c b/drivers/media/video/sn9c102/sn9c102_mi0343.c
index 00b134ca0a3d..1f5b09bec89c 100644
--- a/drivers/media/video/sn9c102/sn9c102_mi0343.c
+++ b/drivers/media/video/sn9c102/sn9c102_mi0343.c
@@ -20,6 +20,7 @@
  ***************************************************************************/
 
 #include "sn9c102_sensor.h"
+#include "sn9c102_devtable.h"
 
 
 static int mi0343_init(struct sn9c102_device* cam)
diff --git a/drivers/media/video/sn9c102/sn9c102_mi0360.c b/drivers/media/video/sn9c102/sn9c102_mi0360.c
index f8d81d82e8d5..d973fc1973d9 100644
--- a/drivers/media/video/sn9c102/sn9c102_mi0360.c
+++ b/drivers/media/video/sn9c102/sn9c102_mi0360.c
@@ -20,6 +20,7 @@
  ***************************************************************************/
 
 #include "sn9c102_sensor.h"
+#include "sn9c102_devtable.h"
 
 
 static int mi0360_init(struct sn9c102_device* cam)
diff --git a/drivers/media/video/sn9c102/sn9c102_mt9v111.c b/drivers/media/video/sn9c102/sn9c102_mt9v111.c
index 3b98ac3bbc38..95986eb492e4 100644
--- a/drivers/media/video/sn9c102/sn9c102_mt9v111.c
+++ b/drivers/media/video/sn9c102/sn9c102_mt9v111.c
@@ -20,6 +20,7 @@
  ***************************************************************************/
 
 #include "sn9c102_sensor.h"
+#include "sn9c102_devtable.h"
 
 
 static int mt9v111_init(struct sn9c102_device *cam)
diff --git a/drivers/media/video/sn9c102/sn9c102_ov7630.c b/drivers/media/video/sn9c102/sn9c102_ov7630.c
index e4856fd77982..803712c29f02 100644
--- a/drivers/media/video/sn9c102/sn9c102_ov7630.c
+++ b/drivers/media/video/sn9c102/sn9c102_ov7630.c
@@ -20,6 +20,7 @@
  ***************************************************************************/
 
 #include "sn9c102_sensor.h"
+#include "sn9c102_devtable.h"
 
 
 static int ov7630_init(struct sn9c102_device* cam)
diff --git a/drivers/media/video/sn9c102/sn9c102_ov7660.c b/drivers/media/video/sn9c102/sn9c102_ov7660.c
index 8aae416ba8ec..7977795d342b 100644
--- a/drivers/media/video/sn9c102/sn9c102_ov7660.c
+++ b/drivers/media/video/sn9c102/sn9c102_ov7660.c
@@ -20,6 +20,7 @@
  ***************************************************************************/
 
 #include "sn9c102_sensor.h"
+#include "sn9c102_devtable.h"
 
 
 static int ov7660_init(struct sn9c102_device* cam)
diff --git a/drivers/media/video/sn9c102/sn9c102_pas106b.c b/drivers/media/video/sn9c102/sn9c102_pas106b.c
index 360f2a848bc0..81cd969c1b7b 100644
--- a/drivers/media/video/sn9c102/sn9c102_pas106b.c
+++ b/drivers/media/video/sn9c102/sn9c102_pas106b.c
@@ -21,6 +21,7 @@
 
 #include <linux/delay.h>
 #include "sn9c102_sensor.h"
+#include "sn9c102_devtable.h"
 
 
 static int pas106b_init(struct sn9c102_device* cam)
diff --git a/drivers/media/video/sn9c102/sn9c102_pas202bcb.c b/drivers/media/video/sn9c102/sn9c102_pas202bcb.c
index ca4a1506ed3d..2782f94cf6f8 100644
--- a/drivers/media/video/sn9c102/sn9c102_pas202bcb.c
+++ b/drivers/media/video/sn9c102/sn9c102_pas202bcb.c
@@ -26,6 +26,7 @@
 
 #include <linux/delay.h>
 #include "sn9c102_sensor.h"
+#include "sn9c102_devtable.h"
 
 
 static int pas202bcb_init(struct sn9c102_device* cam)
diff --git a/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c b/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c
index e7d2de2bace1..04cdfdde8564 100644
--- a/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c
+++ b/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c
@@ -20,6 +20,7 @@
  ***************************************************************************/
 
 #include "sn9c102_sensor.h"
+#include "sn9c102_devtable.h"
 
 
 static int tas5110c1b_init(struct sn9c102_device* cam)
diff --git a/drivers/media/video/sn9c102/sn9c102_tas5110d.c b/drivers/media/video/sn9c102/sn9c102_tas5110d.c
index d32fdbccdc5e..9372e6f9fcff 100644
--- a/drivers/media/video/sn9c102/sn9c102_tas5110d.c
+++ b/drivers/media/video/sn9c102/sn9c102_tas5110d.c
@@ -20,6 +20,7 @@
  ***************************************************************************/
 
 #include "sn9c102_sensor.h"
+#include "sn9c102_devtable.h"
 
 
 static int tas5110d_init(struct sn9c102_device* cam)
diff --git a/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c b/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c
index 56fb1d575a8a..a30bbc4389f5 100644
--- a/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c
+++ b/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c
@@ -20,6 +20,7 @@
  ***************************************************************************/
 
 #include "sn9c102_sensor.h"
+#include "sn9c102_devtable.h"
 
 
 static int tas5130d1b_init(struct sn9c102_device* cam)
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c
index ad36af30e099..db69bc5556d6 100644
--- a/drivers/media/video/stk-webcam.c
+++ b/drivers/media/video/stk-webcam.c
@@ -65,22 +65,6 @@ static struct usb_device_id stkwebcam_table[] = {
 };
 MODULE_DEVICE_TABLE(usb, stkwebcam_table);
 
-static void stk_camera_cleanup(struct kref *kref)
-{
-        struct stk_camera *dev = to_stk_camera(kref);
-
-        STK_INFO("Syntek USB2.0 Camera release resources"
-                " video device /dev/video%d\n", dev->vdev.minor);
-        video_unregister_device(&dev->vdev);
-        dev->vdev.priv = NULL;
-
-        if (dev->sio_bufs != NULL || dev->isobufs != NULL)
-                STK_ERROR("We are leaking memory\n");
-        usb_put_intf(dev->interface);
-        kfree(dev);
-}
-
-
 /*
  * Basic stuff
  */
@@ -689,34 +673,24 @@ static int v4l_stk_open(struct inode *inode, struct file *fp)
         vdev = video_devdata(fp);
         dev = vdev_to_camera(vdev);
 
-        if (dev == NULL || !is_present(dev))
+        lock_kernel();
+        if (dev == NULL || !is_present(dev)) {
+                unlock_kernel();
                 return -ENXIO;
-        fp->private_data = vdev;
-        kref_get(&dev->kref);
+        }
+        fp->private_data = dev;
         usb_autopm_get_interface(dev->interface);
+        unlock_kernel();
 
         return 0;
 }
 
 static int v4l_stk_release(struct inode *inode, struct file *fp)
 {
-        struct stk_camera *dev;
-        struct video_device *vdev;
-
-        vdev = video_devdata(fp);
-        if (vdev == NULL) {
-                STK_ERROR("v4l_release called w/o video devdata\n");
-                return -EFAULT;
-        }
-        dev = vdev_to_camera(vdev);
-        if (dev == NULL) {
-                STK_ERROR("v4l_release called on removed device\n");
-                return -ENODEV;
-        }
+        struct stk_camera *dev = fp->private_data;
 
         if (dev->owner != fp) {
                 usb_autopm_put_interface(dev->interface);
-                kref_put(&dev->kref, stk_camera_cleanup);
                 return 0;
         }
 
@@ -727,7 +701,6 @@ static int v4l_stk_release(struct inode *inode, struct file *fp)
         dev->owner = NULL;
 
         usb_autopm_put_interface(dev->interface);
-        kref_put(&dev->kref, stk_camera_cleanup);
 
         return 0;
 }
@@ -738,14 +711,8 @@ static ssize_t v4l_stk_read(struct file *fp, char __user *buf,
         int i;
         int ret;
         unsigned long flags;
-        struct stk_camera *dev;
-        struct video_device *vdev;
         struct stk_sio_buffer *sbuf;
-
-        vdev = video_devdata(fp);
-        if (vdev == NULL)
-                return -EFAULT;
-        dev = vdev_to_camera(vdev);
+        struct stk_camera *dev = fp->private_data;
 
         if (dev == NULL)
                 return -EIO;
@@ -804,15 +771,8 @@ static ssize_t v4l_stk_read(struct file *fp, char __user *buf,
 
 static unsigned int v4l_stk_poll(struct file *fp, poll_table *wait)
 {
-        struct stk_camera *dev;
-        struct video_device *vdev;
-
-        vdev = video_devdata(fp);
-
-        if (vdev == NULL)
-                return -EFAULT;
+        struct stk_camera *dev = fp->private_data;
 
-        dev = vdev_to_camera(vdev);
         if (dev == NULL)
                 return -ENODEV;
 
@@ -850,16 +810,12 @@ static int v4l_stk_mmap(struct file *fp, struct vm_area_struct *vma)
         unsigned int i;
         int ret;
         unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
-        struct stk_camera *dev;
-        struct video_device *vdev;
+        struct stk_camera *dev = fp->private_data;
         struct stk_sio_buffer *sbuf = NULL;
 
         if (!(vma->vm_flags & VM_WRITE) || !(vma->vm_flags & VM_SHARED))
                 return -EINVAL;
 
-        vdev = video_devdata(fp);
-        dev = vdev_to_camera(vdev);
-
         for (i = 0; i < dev->n_sbufs; i++) {
                 if (dev->sio_bufs[i].v4lbuf.m.offset == offset) {
                         sbuf = dev->sio_bufs + i;
@@ -1355,6 +1311,12 @@ static const struct v4l2_ioctl_ops v4l_stk_ioctl_ops = {
 
 static void stk_v4l_dev_release(struct video_device *vd)
 {
+        struct stk_camera *dev = vdev_to_camera(vd);
+
+        if (dev->sio_bufs != NULL || dev->isobufs != NULL)
+                STK_ERROR("We are leaking memory\n");
+        usb_put_intf(dev->interface);
+        kfree(dev);
 }
 
 static struct video_device stk_v4l_data = {
@@ -1375,7 +1337,6 @@ static int stk_register_video_device(struct stk_camera *dev)
         dev->vdev = stk_v4l_data;
         dev->vdev.debug = debug;
         dev->vdev.parent = &dev->interface->dev;
-        dev->vdev.priv = dev;
         err = video_register_device(&dev->vdev, VFL_TYPE_GRABBER, -1);
         if (err)
                 STK_ERROR("v4l registration failed\n");
@@ -1392,7 +1353,7 @@ static int stk_camera_probe(struct usb_interface *interface,
                 const struct usb_device_id *id)
 {
         int i;
-        int err;
+        int err = 0;
 
         struct stk_camera *dev = NULL;
         struct usb_device *udev = interface_to_usbdev(interface);
@@ -1405,7 +1366,6 @@ static int stk_camera_probe(struct usb_interface *interface,
                 return -ENOMEM;
         }
 
-        kref_init(&dev->kref);
         spin_lock_init(&dev->spinlock);
         init_waitqueue_head(&dev->wait_frame);
 
@@ -1438,8 +1398,8 @@ static int stk_camera_probe(struct usb_interface *interface,
         }
         if (!dev->isoc_ep) {
                 STK_ERROR("Could not find isoc-in endpoint");
-                kref_put(&dev->kref, stk_camera_cleanup);
-                return -ENODEV;
+                err = -ENODEV;
+                goto error;
         }
         dev->vsettings.brightness = 0x7fff;
         dev->vsettings.palette = V4L2_PIX_FMT_RGB565;
@@ -1453,14 +1413,17 @@ static int stk_camera_probe(struct usb_interface *interface,
 
         err = stk_register_video_device(dev);
         if (err) {
-                kref_put(&dev->kref, stk_camera_cleanup);
-                return err;
+                goto error;
         }
 
         stk_create_sysfs_files(&dev->vdev);
         usb_autopm_enable(dev->interface);
 
         return 0;
+
+error:
+        kfree(dev);
+        return err;
 }
 
 static void stk_camera_disconnect(struct usb_interface *interface)
@@ -1473,7 +1436,10 @@ static void stk_camera_disconnect(struct usb_interface *interface)
         wake_up_interruptible(&dev->wait_frame);
         stk_remove_sysfs_files(&dev->vdev);
 
-        kref_put(&dev->kref, stk_camera_cleanup);
+        STK_INFO("Syntek USB2.0 Camera release resources"
+                "video device /dev/video%d\n", dev->vdev.minor);
+
+        video_unregister_device(&dev->vdev);
 }
 
 #ifdef CONFIG_PM
diff --git a/drivers/media/video/stk-webcam.h b/drivers/media/video/stk-webcam.h
index df4dfefc5327..084a85bdd16e 100644
--- a/drivers/media/video/stk-webcam.h
+++ b/drivers/media/video/stk-webcam.h
@@ -99,7 +99,6 @@ struct stk_camera {
 
         u8 isoc_ep;
 
-        struct kref kref;
         /* Not sure if this is right */
         atomic_t urbs_used;
 
@@ -121,7 +120,6 @@ struct stk_camera {
         unsigned sequence;
 };
 
-#define to_stk_camera(d) container_of(d, struct stk_camera, kref)
 #define vdev_to_camera(d) container_of(d, struct stk_camera, vdev)
 
 void stk_camera_delete(struct kref *);
diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c
index 276bded06ab3..bbad54f85c83 100644
--- a/drivers/media/video/stradis.c
+++ b/drivers/media/video/stradis.c
@@ -1882,12 +1882,16 @@ static int saa_open(struct inode *inode, struct file *file)
         struct video_device *vdev = video_devdata(file);
         struct saa7146 *saa = container_of(vdev, struct saa7146, video_dev);
 
+        lock_kernel();
         file->private_data = saa;
 
         saa->user++;
-        if (saa->user > 1)
+        if (saa->user > 1) {
+                unlock_kernel();
                 return 0;       /* device open already, don't reset */
+        }
         saa->writemode = VID_WRITE_MPEG_VID;    /* default to video */
+        unlock_kernel();
         return 0;
 }
 
@@ -1921,6 +1925,7 @@ static struct video_device saa_template = {
         .name = "SAA7146A",
         .fops = &saa_fops,
         .minor = -1,
+        .release = video_device_release_empty,
 };
 
 static int __devinit configure_saa7146(struct pci_dev *pdev, int num)
diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c
index dce947439459..9c549d935994 100644
--- a/drivers/media/video/stv680.c
+++ b/drivers/media/video/stv680.c
@@ -84,7 +84,8 @@ static unsigned int debug;
 #define PDEBUG(level, fmt, args...) \
         do { \
         if (debug >= level)     \
-                info("[%s:%d] " fmt, __func__, __LINE__ , ## args);     \
+                printk(KERN_INFO KBUILD_MODNAME " [%s:%d] \n" fmt,      \
+                        __func__, __LINE__ , ## args);  \
         } while (0)
 
 
@@ -1086,6 +1087,7 @@ static int stv_open (struct inode *inode, struct file *file)
         int err = 0;
 
         /* we are called with the BKL held */
+        lock_kernel();
         stv680->user = 1;
         err = stv_init (stv680);        /* main initialization routine for camera */
 
@@ -1099,6 +1101,7 @@ static int stv_open (struct inode *inode, struct file *file)
         }
         if (err)
                 stv680->user = 0;
+        unlock_kernel();
 
         return err;
 }
@@ -1550,7 +1553,8 @@ static int __init usb_stv680_init (void)
         }
         PDEBUG (0, "STV(i): usb camera driver version %s registering", DRIVER_VERSION);
 
-        info(DRIVER_DESC " " DRIVER_VERSION);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
         return 0;
 }
 
diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index 2437c1a269c5..1c391f0328fd 100644
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -2,6 +2,7 @@
     tda9840 - i2c-driver for the tda9840 by SGS Thomson
 
     Copyright (C) 1998-2003 Michael Hunold <michael@mihu.de>
+    Copyright (C) 2008 Hans Verkuil <hverkuil@xs4all.nl>
 
     The tda9840 is a stereo/dual sound processor with digital
     identification. It can be found at address 0x84 on the i2c-bus.
@@ -28,59 +29,118 @@
 #include <linux/module.h>
 #include <linux/ioctl.h>
 #include <linux/i2c.h>
-
+#include <media/v4l2-common.h>
+#include <media/v4l2-i2c-drv-legacy.h>
 #include "tda9840.h"
 
-static int debug;               /* insmod parameter */
+MODULE_AUTHOR("Michael Hunold <michael@mihu.de>");
+MODULE_DESCRIPTION("tda9840 driver");
+MODULE_LICENSE("GPL");
+
+static int debug;
 module_param(debug, int, 0644);
-MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
 
-#define dprintk(args...) \
-            do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __func__, __LINE__); printk(args); } } while (0)
+MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
 #define SWITCH          0x00
 #define LEVEL_ADJUST    0x02
 #define STEREO_ADJUST   0x03
 #define TEST            0x04
 
+#define TDA9840_SET_MUTE                0x00
+#define TDA9840_SET_MONO                0x10
+#define TDA9840_SET_STEREO              0x2a
+#define TDA9840_SET_LANG1               0x12
+#define TDA9840_SET_LANG2               0x1e
+#define TDA9840_SET_BOTH                0x1a
+#define TDA9840_SET_BOTH_R              0x16
+#define TDA9840_SET_EXTERNAL            0x7a
+
 /* addresses to scan, found only at 0x42 (7-Bit) */
 static unsigned short normal_i2c[] = { I2C_ADDR_TDA9840, I2C_CLIENT_END };
 
 /* magic definition of all other variables and things */
 I2C_CLIENT_INSMOD;
 
-static struct i2c_driver driver;
-static struct i2c_client client_template;
+static void tda9840_write(struct i2c_client *client, u8 reg, u8 val)
+{
+        if (i2c_smbus_write_byte_data(client, reg, val))
+                v4l_dbg(1, debug, client, "error writing %02x to %02x\n",
+                                val, reg);
+}
 
-static int command(struct i2c_client *client, unsigned int cmd, void *arg)
+static int tda9840_command(struct i2c_client *client, unsigned cmd, void *arg)
 {
-        int result;
         int byte = *(int *)arg;
 
         switch (cmd) {
-        case TDA9840_SWITCH:
-
-                dprintk("TDA9840_SWITCH: 0x%02x\n", byte);
-
-                if (byte != TDA9840_SET_MONO
-                    && byte != TDA9840_SET_MUTE
-                    && byte != TDA9840_SET_STEREO
-                    && byte != TDA9840_SET_LANG1
-                    && byte != TDA9840_SET_LANG2
-                    && byte != TDA9840_SET_BOTH
-                    && byte != TDA9840_SET_BOTH_R
-                    && byte != TDA9840_SET_EXTERNAL) {
+        case VIDIOC_S_TUNER: {
+                struct v4l2_tuner *t = arg;
+                int byte;
+
+                if (t->index)
                         return -EINVAL;
+
+                switch (t->audmode) {
+                case V4L2_TUNER_MODE_STEREO:
+                        byte = TDA9840_SET_STEREO;
+                        break;
+                case V4L2_TUNER_MODE_LANG1_LANG2:
+                        byte = TDA9840_SET_BOTH;
+                        break;
+                case V4L2_TUNER_MODE_LANG1:
+                        byte = TDA9840_SET_LANG1;
+                        break;
+                case V4L2_TUNER_MODE_LANG2:
+                        byte = TDA9840_SET_LANG2;
+                        break;
+                default:
+                        byte = TDA9840_SET_MONO;
+                        break;
+                }
+                v4l_dbg(1, debug, client, "TDA9840_SWITCH: 0x%02x\n", byte);
+                tda9840_write(client, SWITCH, byte);
+                break;
+        }
+
+        case VIDIOC_G_TUNER: {
+                struct v4l2_tuner *t = arg;
+                u8 byte;
+
+                t->rxsubchans = V4L2_TUNER_SUB_MONO;
+                if (1 != i2c_master_recv(client, &byte, 1)) {
+                        v4l_dbg(1, debug, client,
+                                "i2c_master_recv() failed\n");
+                        return -EIO;
                 }
 
-                result = i2c_smbus_write_byte_data(client, SWITCH, byte);
-                if (result)
-                        dprintk("i2c_smbus_write_byte() failed, ret:%d\n", result);
+                if (byte & 0x80) {
+                        v4l_dbg(1, debug, client,
+                                "TDA9840_DETECT: register contents invalid\n");
+                        return -EINVAL;
+                }
+
+                v4l_dbg(1, debug, client, "TDA9840_DETECT: byte: 0x%02x\n", byte);
+
+                switch (byte & 0x60) {
+                case 0x00:
+                        t->rxsubchans = V4L2_TUNER_SUB_MONO;
+                        break;
+                case 0x20:
+                        t->rxsubchans = V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2;
+                        break;
+                case 0x40:
+                        t->rxsubchans = V4L2_TUNER_SUB_STEREO | V4L2_TUNER_SUB_MONO;
+                        break;
+                default: /* Incorrect detect */
+                        t->rxsubchans = V4L2_TUNER_MODE_MONO;
+                        break;
+                }
                 break;
+        }
 
         case TDA9840_LEVEL_ADJUST:
-
-                dprintk("TDA9840_LEVEL_ADJUST: %d\n", byte);
+                v4l_dbg(1, debug, client, "TDA9840_LEVEL_ADJUST: %d\n", byte);
 
                 /* check for correct range */
                 if (byte > 25 || byte < -20)
@@ -92,15 +152,11 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
                         byte += 0x8;
                 else
                         byte = -byte;
-
-                result = i2c_smbus_write_byte_data(client, LEVEL_ADJUST, byte);
-                if (result)
-                        dprintk("i2c_smbus_write_byte() failed, ret:%d\n", result);
+                tda9840_write(client, LEVEL_ADJUST, byte);
                 break;
 
         case TDA9840_STEREO_ADJUST:
-
-                dprintk("TDA9840_STEREO_ADJUST: %d\n", byte);
+                v4l_dbg(1, debug, client, "TDA9840_STEREO_ADJUST: %d\n", byte);
 
                 /* check for correct range */
                 if (byte > 25 || byte < -24)
@@ -113,143 +169,59 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
                 else
                         byte = -byte;
 
-                result = i2c_smbus_write_byte_data(client, STEREO_ADJUST, byte);
-                if (result)
-                        dprintk("i2c_smbus_write_byte() failed, ret:%d\n", result);
-                break;
-
-        case TDA9840_DETECT: {
-                int *ret = (int *)arg;
-
-                byte = i2c_smbus_read_byte_data(client, STEREO_ADJUST);
-                if (byte == -1) {
-                        dprintk("i2c_smbus_read_byte_data() failed\n");
-                        return -EIO;
-                }
-
-                if (0 != (byte & 0x80)) {
-                        dprintk("TDA9840_DETECT: register contents invalid\n");
-                        return -EINVAL;
-                }
-
-                dprintk("TDA9840_DETECT: byte: 0x%02x\n", byte);
-                *ret = ((byte & 0x60) >> 5);
-                result = 0;
-                break;
-        }
-        case TDA9840_TEST:
-                dprintk("TDA9840_TEST: 0x%02x\n", byte);
-
-                /* mask out irrelevant bits */
-                byte &= 0x3;
-
-                result = i2c_smbus_write_byte_data(client, TEST, byte);
-                if (result)
-                        dprintk("i2c_smbus_write_byte() failed, ret:%d\n", result);
+                tda9840_write(client, STEREO_ADJUST, byte);
                 break;
         default:
                 return -ENOIOCTLCMD;
         }
 
-        if (result)
-                return -EIO;
-
         return 0;
 }
 
-static int detect(struct i2c_adapter *adapter, int address, int kind)
+static int tda9840_probe(struct i2c_client *client,
+                          const struct i2c_device_id *id)
 {
-        struct i2c_client *client;
-        int result = 0;
-
-        int byte = 0x0;
+        int result;
+        int byte;
 
         /* let's see whether this adapter can support what we need */
-        if (0 == i2c_check_functionality(adapter,
-                                    I2C_FUNC_SMBUS_READ_BYTE_DATA |
-                                    I2C_FUNC_SMBUS_WRITE_BYTE_DATA)) {
+        if (!i2c_check_functionality(client->adapter,
+                        I2C_FUNC_SMBUS_READ_BYTE_DATA |
+                        I2C_FUNC_SMBUS_WRITE_BYTE_DATA))
                 return 0;
-        }
-
-        /* allocate memory for client structure */
-        client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (!client) {
-                printk("not enough kernel memory\n");
-                return -ENOMEM;
-        }
-
-        /* fill client structure */
-        memcpy(client, &client_template, sizeof(struct i2c_client));
-        client->addr = address;
-        client->adapter = adapter;
 
-        /* tell the i2c layer a new client has arrived */
-        if (0 != (result = i2c_attach_client(client))) {
-                kfree(client);
-                return result;
-        }
+        v4l_info(client, "chip found @ 0x%x (%s)\n",
+                        client->addr << 1, client->adapter->name);
 
         /* set initial values for level & stereo - adjustment, mode */
         byte = 0;
-        result  = command(client, TDA9840_LEVEL_ADJUST, &byte);
-        result += command(client, TDA9840_STEREO_ADJUST, &byte);
-        byte = TDA9840_SET_MONO;
-        result = command(client, TDA9840_SWITCH, &byte);
+        result = tda9840_command(client, TDA9840_LEVEL_ADJUST, &byte);
+        result += tda9840_command(client, TDA9840_STEREO_ADJUST, &byte);
+        tda9840_write(client, SWITCH, TDA9840_SET_STEREO);
         if (result) {
-                dprintk("could not initialize tda9840\n");
+                v4l_dbg(1, debug, client, "could not initialize tda9840\n");
                 return -ENODEV;
         }
-
-        printk("tda9840: detected @ 0x%02x on adapter %s\n", address, &client->adapter->name[0]);
         return 0;
 }
 
-static int attach(struct i2c_adapter *adapter)
-{
-        /* let's see whether this is a know adapter we can attach to */
-        if (adapter->id != I2C_HW_SAA7146) {
-                dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter->name, adapter->id);
-                return -ENODEV;
-        }
-
-        return i2c_probe(adapter, &addr_data, &detect);
-}
-
-static int detach(struct i2c_client *client)
+static int tda9840_legacy_probe(struct i2c_adapter *adapter)
 {
-        int ret = i2c_detach_client(client);
-        kfree(client);
-        return ret;
+        /* Let's see whether this is a known adapter we can attach to.
+           Prevents conflicts with tvaudio.c. */
+        return adapter->id == I2C_HW_SAA7146;
 }
-
-static struct i2c_driver driver = {
-        .driver = {
-                .name = "tda9840",
-        },
-        .id     = I2C_DRIVERID_TDA9840,
-        .attach_adapter = attach,
-        .detach_client  = detach,
-        .command        = command,
+static const struct i2c_device_id tda9840_id[] = {
+        { "tda9840", 0 },
+        { }
 };
+MODULE_DEVICE_TABLE(i2c, tda9840_id);
 
-static struct i2c_client client_template = {
+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "tda9840",
-        .driver = &driver,
+        .driverid = I2C_DRIVERID_TDA9840,
+        .command = tda9840_command,
+        .probe = tda9840_probe,
+        .legacy_probe = tda9840_legacy_probe,
+        .id_table = tda9840_id,
 };
-
-static int __init this_module_init(void)
-{
-        return i2c_add_driver(&driver);
-}
-
-static void __exit this_module_exit(void)
-{
-        i2c_del_driver(&driver);
-}
-
-module_init(this_module_init);
-module_exit(this_module_exit);
-
-MODULE_AUTHOR("Michael Hunold <michael@mihu.de>");
-MODULE_DESCRIPTION("tda9840 driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/media/video/tda9840.h b/drivers/media/video/tda9840.h
index 7da8432cdca7..dc12ae7caf6f 100644
--- a/drivers/media/video/tda9840.h
+++ b/drivers/media/video/tda9840.h
@@ -3,24 +3,6 @@
 
 #define I2C_ADDR_TDA9840                0x42
 
-#define TDA9840_DETECT          _IOR('v',1,int)
-/* return values for TDA9840_DETCT */
-#define TDA9840_MONO_DETECT             0x0
-#define TDA9840_DUAL_DETECT             0x1
-#define TDA9840_STEREO_DETECT           0x2
-#define TDA9840_INCORRECT_DETECT        0x3
-
-#define TDA9840_SWITCH          _IOW('v',2,int)
-/* modes than can be set with TDA9840_SWITCH */
-#define TDA9840_SET_MUTE                0x00
-#define TDA9840_SET_MONO                0x10
-#define TDA9840_SET_STEREO              0x2a
-#define TDA9840_SET_LANG1               0x12
-#define TDA9840_SET_LANG2               0x1e
-#define TDA9840_SET_BOTH                0x1a
-#define TDA9840_SET_BOTH_R              0x16
-#define TDA9840_SET_EXTERNAL            0x7a
-
 /* values may range between +2.5 and -2.0;
    the value has to be multiplied with 10 */
 #define TDA9840_LEVEL_ADJUST    _IOW('v',3,int)
@@ -29,7 +11,4 @@
    the value has to be multiplied with 10 */
 #define TDA9840_STEREO_ADJUST   _IOW('v',4,int)
 
-/* currently not implemented */
-#define TDA9840_TEST            _IOW('v',5,int)
-
 #endif
diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
index 421c1445e96c..cde092adbb5a 100644
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -2,6 +2,7 @@
     tea6415c - i2c-driver for the tea6415c by SGS Thomson
 
     Copyright (C) 1998-2003 Michael Hunold <michael@mihu.de>
+    Copyright (C) 2008 Hans Verkuil <hverkuil@xs4all.nl>
 
     The tea6415c is a bus controlled video-matrix-switch
     with 8 inputs and 6 outputs.
@@ -30,18 +31,18 @@
 #include <linux/module.h>
 #include <linux/ioctl.h>
 #include <linux/i2c.h>
-
+#include <media/v4l2-common.h>
+#include <media/v4l2-i2c-drv-legacy.h>
 #include "tea6415c.h"
 
-static int debug;               /* insmod parameter */
-module_param(debug, int, 0644);
-MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
+MODULE_AUTHOR("Michael Hunold <michael@mihu.de>");
+MODULE_DESCRIPTION("tea6415c driver");
+MODULE_LICENSE("GPL");
 
-#define dprintk(args...) \
-            do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __func__, __LINE__); printk(args); } } while (0)
+static int debug;
+module_param(debug, int, 0644);
 
-#define TEA6415C_NUM_INPUTS     8
-#define TEA6415C_NUM_OUTPUTS    6
+MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
 /* addresses to scan, found only at 0x03 and/or 0x43 (7-bit) */
 static unsigned short normal_i2c[] = { I2C_TEA6415C_1, I2C_TEA6415C_2, I2C_CLIENT_END };
@@ -49,60 +50,6 @@ static unsigned short normal_i2c[] = { I2C_TEA6415C_1, I2C_TEA6415C_2, I2C_CLIEN
 /* magic definition of all other variables and things */
 I2C_CLIENT_INSMOD;
 
-static struct i2c_driver driver;
-static struct i2c_client client_template;
-
-/* this function is called by i2c_probe */
-static int detect(struct i2c_adapter *adapter, int address, int kind)
-{
-        struct i2c_client *client = NULL;
-        int err = 0;
-
-        /* let's see whether this adapter can support what we need */
-        if (0 == i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WRITE_BYTE)) {
-                return 0;
-        }
-
-        /* allocate memory for client structure */
-        client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (!client) {
-                return -ENOMEM;
-        }
-
-        /* fill client structure */
-        memcpy(client, &client_template, sizeof(struct i2c_client));
-        client->addr = address;
-        client->adapter = adapter;
-
-        /* tell the i2c layer a new client has arrived */
-        if (0 != (err = i2c_attach_client(client))) {
-                kfree(client);
-                return err;
-        }
-
-        printk("tea6415c: detected @ 0x%02x on adapter %s\n", address, &client->adapter->name[0]);
-
-        return 0;
-}
-
-static int attach(struct i2c_adapter *adapter)
-{
-        /* let's see whether this is a know adapter we can attach to */
-        if (adapter->id != I2C_HW_SAA7146) {
-                dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter->name, adapter->id);
-                return -ENODEV;
-        }
-
-        return i2c_probe(adapter, &addr_data, &detect);
-}
-
-static int detach(struct i2c_client *client)
-{
-        int ret = i2c_detach_client(client);
-        kfree(client);
-        return ret;
-}
-
 /* makes a connection between the input-pin 'i' and the output-pin 'o'
    for the tea6415c-client 'client' */
 static int switch_matrix(struct i2c_client *client, int i, int o)
@@ -110,7 +57,7 @@ static int switch_matrix(struct i2c_client *client, int i, int o)
         u8 byte = 0;
         int ret;
 
-        dprintk("adr:0x%02x, i:%d, o:%d\n", client->addr, i, o);
+        v4l_dbg(1, debug, client, "i=%d, o=%d\n", i, o);
 
         /* check if the pins are valid */
         if (0 == ((1 == i ||  3 == i ||  5 == i ||  6 == i ||  8 == i || 10 == i || 20 == i || 11 == i)
@@ -168,14 +115,14 @@ static int switch_matrix(struct i2c_client *client, int i, int o)
 
         ret = i2c_smbus_write_byte(client, byte);
         if (ret) {
-                dprintk("i2c_smbus_write_byte() failed, ret:%d\n", ret);
+                v4l_dbg(1, debug, client,
+                        "i2c_smbus_write_byte() failed, ret:%d\n", ret);
                 return -EIO;
         }
-
         return ret;
 }
 
-static int command(struct i2c_client *client, unsigned int cmd, void *arg)
+static int tea6415c_command(struct i2c_client *client, unsigned cmd, void *arg)
 {
         struct tea6415c_multiplex *v = (struct tea6415c_multiplex *)arg;
         int result = 0;
@@ -187,38 +134,40 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
         default:
                 return -ENOIOCTLCMD;
         }
-
         return result;
 }
 
-static struct i2c_driver driver = {
-        .driver = {
-                .name = "tea6415c",
-        },
-        .id     = I2C_DRIVERID_TEA6415C,
-        .attach_adapter = attach,
-        .detach_client  = detach,
-        .command        = command,
-};
-
-static struct i2c_client client_template = {
-        .name = "tea6415c",
-        .driver = &driver,
-};
-
-static int __init this_module_init(void)
+/* this function is called by i2c_probe */
+static int tea6415c_probe(struct i2c_client *client,
+                          const struct i2c_device_id *id)
 {
-        return i2c_add_driver(&driver);
+        /* let's see whether this adapter can support what we need */
+        if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WRITE_BYTE))
+                return 0;
+
+        v4l_info(client, "chip found @ 0x%x (%s)\n",
+                        client->addr << 1, client->adapter->name);
+        return 0;
 }
 
-static void __exit this_module_exit(void)
+static int tea6415c_legacy_probe(struct i2c_adapter *adapter)
 {
-        i2c_del_driver(&driver);
+        /* Let's see whether this is a known adapter we can attach to.
+           Prevents conflicts with tvaudio.c. */
+        return adapter->id == I2C_HW_SAA7146;
 }
 
-module_init(this_module_init);
-module_exit(this_module_exit);
+static const struct i2c_device_id tea6415c_id[] = {
+        { "tea6415c", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, tea6415c_id);
 
-MODULE_AUTHOR("Michael Hunold <michael@mihu.de>");
-MODULE_DESCRIPTION("tea6415c driver");
-MODULE_LICENSE("GPL");
+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
+        .name = "tea6415c",
+        .driverid = I2C_DRIVERID_TEA6415C,
+        .command = tea6415c_command,
+        .probe = tea6415c_probe,
+        .legacy_probe = tea6415c_legacy_probe,
+        .id_table = tea6415c_id,
+};
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index b5c8957d130e..e50820969e64 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -2,6 +2,7 @@
     tea6420 - i2c-driver for the tea6420 by SGS Thomson
 
     Copyright (C) 1998-2003 Michael Hunold <michael@mihu.de>
+    Copyright (C) 2008 Hans Verkuil <hverkuil@xs4all.nl>
 
     The tea6420 is a bus controlled audio-matrix with 5 stereo inputs,
     4 stereo outputs and gain control for each output.
@@ -30,15 +31,18 @@
 #include <linux/module.h>
 #include <linux/ioctl.h>
 #include <linux/i2c.h>
-
+#include <media/v4l2-common.h>
+#include <media/v4l2-i2c-drv-legacy.h>
 #include "tea6420.h"
 
-static int debug;               /* insmod parameter */
+MODULE_AUTHOR("Michael Hunold <michael@mihu.de>");
+MODULE_DESCRIPTION("tea6420 driver");
+MODULE_LICENSE("GPL");
+
+static int debug;
 module_param(debug, int, 0644);
-MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
 
-#define dprintk(args...) \
-            do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __func__, __LINE__); printk(args); } } while (0)
+MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
 /* addresses to scan, found only at 0x4c and/or 0x4d (7-Bit) */
 static unsigned short normal_i2c[] = { I2C_ADDR_TEA6420_1, I2C_ADDR_TEA6420_2, I2C_CLIENT_END };
@@ -46,23 +50,20 @@ static unsigned short normal_i2c[] = { I2C_ADDR_TEA6420_1, I2C_ADDR_TEA6420_2, I
 /* magic definition of all other variables and things */
 I2C_CLIENT_INSMOD;
 
-static struct i2c_driver driver;
-static struct i2c_client client_template;
-
 /* make a connection between the input 'i' and the output 'o'
    with gain 'g' for the tea6420-client 'client' (note: i = 6 means 'mute') */
 static int tea6420_switch(struct i2c_client *client, int i, int o, int g)
 {
-        u8 byte = 0;
+        u8 byte;
         int ret;
 
-        dprintk("adr:0x%02x, i:%d, o:%d, g:%d\n", client->addr, i, o, g);
+        v4l_dbg(1, debug, client, "i=%d, o=%d, g=%d\n", i, o, g);
 
         /* check if the parameters are valid */
         if (i < 1 || i > 6 || o < 1 || o > 4 || g < 0 || g > 6 || g % 2 != 0)
                 return -1;
 
-        byte  = ((o - 1) << 5);
+        byte = ((o - 1) << 5);
         byte |= (i - 1);
 
         /* to understand this, have a look at the tea6420-specs (p.5) */
@@ -82,40 +83,41 @@ static int tea6420_switch(struct i2c_client *client, int i, int o, int g)
 
         ret = i2c_smbus_write_byte(client, byte);
         if (ret) {
-                dprintk("i2c_smbus_write_byte() failed, ret:%d\n", ret);
+                v4l_dbg(1, debug, client,
+                        "i2c_smbus_write_byte() failed, ret:%d\n", ret);
                 return -EIO;
         }
-
         return 0;
 }
 
-/* this function is called by i2c_probe */
-static int tea6420_detect(struct i2c_adapter *adapter, int address, int kind)
+static int tea6420_command(struct i2c_client *client, unsigned cmd, void *arg)
 {
-        struct i2c_client *client;
-        int err = 0, i = 0;
+        struct tea6420_multiplex *a = (struct tea6420_multiplex *)arg;
+        int result = 0;
 
-        /* let's see whether this adapter can support what we need */
-        if (0 == i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WRITE_BYTE)) {
-                return 0;
+        switch (cmd) {
+        case TEA6420_SWITCH:
+                result = tea6420_switch(client, a->in, a->out, a->gain);
+                break;
+        default:
+                return -ENOIOCTLCMD;
         }
 
-        /* allocate memory for client structure */
-        client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (!client) {
-                return -ENOMEM;
-        }
+        return result;
+}
 
-        /* fill client structure */
-        memcpy(client, &client_template, sizeof(struct i2c_client));
-        client->addr = address;
-        client->adapter = adapter;
+/* this function is called by i2c_probe */
+static int tea6420_probe(struct i2c_client *client,
+                          const struct i2c_device_id *id)
+{
+        int err, i;
 
-        /* tell the i2c layer a new client has arrived */
-        if (0 != (err = i2c_attach_client(client))) {
-                kfree(client);
-                return err;
-        }
+        /* let's see whether this adapter can support what we need */
+        if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WRITE_BYTE))
+                return -EIO;
+
+        v4l_info(client, "chip found @ 0x%x (%s)\n",
+                        client->addr << 1, client->adapter->name);
 
         /* set initial values: set "mute"-input to all outputs at gain 0 */
         err = 0;
@@ -123,78 +125,31 @@ static int tea6420_detect(struct i2c_adapter *adapter, int address, int kind)
                 err += tea6420_switch(client, 6, i, 0);
         }
         if (err) {
-                dprintk("could not initialize tea6420\n");
+                v4l_dbg(1, debug, client, "could not initialize tea6420\n");
                 kfree(client);
                 return -ENODEV;
         }
-
-        printk("tea6420: detected @ 0x%02x on adapter %s\n", address, &client->adapter->name[0]);
-
         return 0;
 }
 
-static int attach(struct i2c_adapter *adapter)
+static int tea6420_legacy_probe(struct i2c_adapter *adapter)
 {
-        /* let's see whether this is a know adapter we can attach to */
-        if (adapter->id != I2C_HW_SAA7146) {
-                dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter->name, adapter->id);
-                return -ENODEV;
-        }
-
-        return i2c_probe(adapter, &addr_data, &tea6420_detect);
-}
-
-static int detach(struct i2c_client *client)
-{
-        int ret = i2c_detach_client(client);
-        kfree(client);
-        return ret;
-}
-
-static int command(struct i2c_client *client, unsigned int cmd, void *arg)
-{
-        struct tea6420_multiplex *a = (struct tea6420_multiplex *)arg;
-        int result = 0;
-
-        switch (cmd) {
-        case TEA6420_SWITCH:
-                result = tea6420_switch(client, a->in, a->out, a->gain);
-                break;
-        default:
-                return -ENOIOCTLCMD;
-        }
-
-        return result;
+        /* Let's see whether this is a known adapter we can attach to.
+           Prevents conflicts with tvaudio.c. */
+        return adapter->id == I2C_HW_SAA7146;
 }
 
-static struct i2c_driver driver = {
-        .driver = {
-                .name = "tea6420",
-        },
-        .id     = I2C_DRIVERID_TEA6420,
-        .attach_adapter = attach,
-        .detach_client  = detach,
-        .command        = command,
+static const struct i2c_device_id tea6420_id[] = {
+        { "tea6420", 0 },
+        { }
 };
+MODULE_DEVICE_TABLE(i2c, tea6420_id);
 
-static struct i2c_client client_template = {
+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "tea6420",
-        .driver = &driver,
+        .driverid = I2C_DRIVERID_TEA6420,
+        .command = tea6420_command,
+        .probe = tea6420_probe,
+        .legacy_probe = tea6420_legacy_probe,
+        .id_table = tea6420_id,
 };
-
-static int __init this_module_init(void)
-{
-        return i2c_add_driver(&driver);
-}
-
-static void __exit this_module_exit(void)
-{
-        i2c_del_driver(&driver);
-}
-
-module_init(this_module_init);
-module_exit(this_module_exit);
-
-MODULE_AUTHOR("Michael Hunold <michael@mihu.de>");
-MODULE_DESCRIPTION("tea6420 driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c
deleted file mode 100644
index bdf506e6ae27..000000000000
--- a/drivers/media/video/tuner-3036.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Driver for Philips SAB3036 "CITAC" tuner control chip.
- *
- * Author: Phil Blundell <philb@gnu.org>
- *
- * The SAB3036 is just about different enough from the chips that
- * tuner.c copes with to make it not worth the effort to crowbar
- * the support into that file.  So instead we have a separate 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.
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <linux/timer.h>
-#include <linux/delay.h>
-#include <linux/errno.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-
-#include <linux/i2c.h>
-#include <linux/videodev.h>
-#include <media/v4l2-common.h>
-
-#include <media/tuner.h>
-
-static int debug;       /* insmod parameter */
-static int this_adap;
-
-static struct i2c_client client_template;
-
-/* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x60, 0x61, I2C_CLIENT_END };
-static unsigned short ignore = I2C_CLIENT_END;
-
-static struct i2c_client_address_data addr_data = {
-        .normal_i2c     = normal_i2c,
-        .probe          = &ignore,
-        .ignore         = &ignore,
-};
-
-/* ---------------------------------------------------------------------- */
-
-static unsigned char
-tuner_getstatus (struct i2c_client *c)
-{
-        unsigned char byte;
-        if (i2c_master_recv(c, &byte, 1) != 1)
-                printk(KERN_ERR "tuner-3036: I/O error.\n");
-        return byte;
-}
-
-#define TUNER_FL        0x80
-
-static int
-tuner_islocked (struct i2c_client *c)
-{
-        return (tuner_getstatus(c) & TUNER_FL);
-}
-
-/* ---------------------------------------------------------------------- */
-
-static void
-set_tv_freq(struct i2c_client *c, int freq)
-{
-        u16 div = ((freq * 20) / 16);
-        unsigned long give_up = jiffies + HZ;
-        unsigned char buffer[2];
-
-        if (debug)
-                printk(KERN_DEBUG "tuner: setting frequency %dMHz, divisor %x\n", freq / 16, div);
-
-        /* Select high tuning current */
-        buffer[0] = 0x29;
-        buffer[1] = 0x3e;
-
-        if (i2c_master_send(c, buffer, 2) != 2)
-                printk("tuner: i2c i/o error 1\n");
-
-        buffer[0] = 0x80 | ((div>>8) & 0x7f);
-        buffer[1] = div & 0xff;
-
-        if (i2c_master_send(c, buffer, 2) != 2)
-                printk("tuner: i2c i/o error 2\n");
-
-        while (!tuner_islocked(c) && time_before(jiffies, give_up))
-                schedule();
-
-        if (!tuner_islocked(c))
-                printk(KERN_WARNING "tuner: failed to achieve PLL lock\n");
-
-        /* Select low tuning current and engage AFC */
-        buffer[0] = 0x29;
-        buffer[1] = 0xb2;
-
-        if (i2c_master_send(c, buffer, 2) != 2)
-                printk("tuner: i2c i/o error 3\n");
-
-        if (debug)
-                printk(KERN_DEBUG "tuner: status %02x\n", tuner_getstatus(c));
-}
-
-/* ---------------------------------------------------------------------- */
-
-static int
-tuner_attach(struct i2c_adapter *adap, int addr, int kind)
-{
-        static unsigned char buffer[] = { 0x29, 0x32, 0x2a, 0, 0x2b, 0 };
-
-        struct i2c_client *client;
-
-        if (this_adap > 0)
-                return -1;
-        this_adap++;
-
-        client_template.adapter = adap;
-        client_template.addr = addr;
-
-        client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == NULL)
-                return -ENOMEM;
-        memcpy(client, &client_template, sizeof(struct i2c_client));
-
-        printk("tuner: SAB3036 found, status %02x\n", tuner_getstatus(client));
-
-        i2c_attach_client(client);
-
-        if (i2c_master_send(client, buffer, 2) != 2)
-                printk("tuner: i2c i/o error 1\n");
-        if (i2c_master_send(client, buffer+2, 2) != 2)
-                printk("tuner: i2c i/o error 2\n");
-        if (i2c_master_send(client, buffer+4, 2) != 2)
-                printk("tuner: i2c i/o error 3\n");
-        return 0;
-}
-
-static int
-tuner_detach(struct i2c_client *c)
-{
-        return 0;
-}
-
-static int
-tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
-{
-        int *iarg = (int*)arg;
-
-        switch (cmd)
-        {
-                case VIDIOCSFREQ:
-                        set_tv_freq(client, *iarg);
-                        break;
-
-                default:
-                        return -EINVAL;
-        }
-        return 0;
-}
-
-static int
-tuner_probe(struct i2c_adapter *adap)
-{
-        this_adap = 0;
-        if (adap->id == I2C_HW_B_LP)
-                return i2c_probe(adap, &addr_data, tuner_attach);
-        return 0;
-}
-
-/* ----------------------------------------------------------------------- */
-
-static struct i2c_driver
-i2c_driver_tuner =
-{
-        .driver = {
-                .name   =       "sab3036",
-        },
-        .id             =       I2C_DRIVERID_SAB3036,
-        .attach_adapter =       tuner_probe,
-        .detach_client  =       tuner_detach,
-        .command        =       tuner_command
-};
-
-static struct i2c_client client_template =
-{
-        .driver         = &i2c_driver_tuner,
-        .name           = "SAB3036",
-};
-
-static int __init
-tuner3036_init(void)
-{
-        return i2c_add_driver(&i2c_driver_tuner);
-}
-
-static void __exit
-tuner3036_exit(void)
-{
-        i2c_del_driver(&i2c_driver_tuner);
-}
-
-MODULE_DESCRIPTION("SAB3036 tuner driver");
-MODULE_AUTHOR("Philip Blundell <philb@gnu.org>");
-MODULE_LICENSE("GPL");
-
-module_param(debug, int, 0);
-MODULE_PARM_DESC(debug,"Enable debugging output");
-
-module_init(tuner3036_init);
-module_exit(tuner3036_exit);
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index d806a3556eed..4a7735c6c1a6 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -92,7 +92,6 @@ struct tuner {
 
         unsigned int        type; /* chip type id */
         unsigned int        config;
-        int (*tuner_callback) (void *dev, int command, int arg);
         const char          *name;
 };
 
@@ -346,7 +345,7 @@ static struct xc5000_config xc5000_cfg;
 
 static void set_type(struct i2c_client *c, unsigned int type,
                      unsigned int new_mode_mask, unsigned int new_config,
-                     int (*tuner_callback) (void *dev, int command,int arg))
+                     int (*tuner_callback) (void *dev, int component, int cmd, int arg))
 {
         struct tuner *t = i2c_get_clientdata(c);
         struct dvb_tuner_ops *fe_tuner_ops = &t->fe.ops.tuner_ops;
@@ -362,7 +361,7 @@ static void set_type(struct i2c_client *c, unsigned int type,
         t->config = new_config;
         if (tuner_callback != NULL) {
                 tuner_dbg("defining GPIO callback\n");
-                t->tuner_callback = tuner_callback;
+                t->fe.callback = tuner_callback;
         }
 
         if (t->mode == T_UNINITIALIZED) {
@@ -385,7 +384,6 @@ static void set_type(struct i2c_client *c, unsigned int type,
         {
                 struct tda829x_config cfg = {
                         .lna_cfg        = t->config,
-                        .tuner_callback = t->tuner_callback,
                 };
                 if (!dvb_attach(tda829x_attach, &t->fe, t->i2c->adapter,
                                 t->i2c->addr, &cfg))
@@ -433,7 +431,6 @@ static void set_type(struct i2c_client *c, unsigned int type,
                 struct xc2028_config cfg = {
                         .i2c_adap  = t->i2c->adapter,
                         .i2c_addr  = t->i2c->addr,
-                        .callback  = t->tuner_callback,
                 };
                 if (!dvb_attach(xc2028_attach, &t->fe, &cfg))
                         goto attach_failed;
@@ -450,10 +447,8 @@ static void set_type(struct i2c_client *c, unsigned int type,
 
                 xc5000_cfg.i2c_address    = t->i2c->addr;
                 xc5000_cfg.if_khz         = 5380;
-                xc5000_cfg.tuner_callback = t->tuner_callback;
                 if (!dvb_attach(xc5000_attach,
-                                &t->fe, t->i2c->adapter, &xc5000_cfg,
-                                c->adapter->algo_data))
+                                &t->fe, t->i2c->adapter, &xc5000_cfg))
                         goto attach_failed;
 
                 xc_tuner_ops = &t->fe.ops.tuner_ops;
@@ -1225,7 +1220,7 @@ register_client:
         } else {
                 t->mode = V4L2_TUNER_DIGITAL_TV;
         }
-        set_type(client, t->type, t->mode_mask, t->config, t->tuner_callback);
+        set_type(client, t->type, t->mode_mask, t->config, t->fe.callback);
         list_add_tail(&t->list, &tuner_list);
         return 0;
 }
diff --git a/drivers/media/video/usbvideo/ibmcam.c b/drivers/media/video/usbvideo/ibmcam.c
index cc27efe121dd..28421d386f1e 100644
--- a/drivers/media/video/usbvideo/ibmcam.c
+++ b/drivers/media/video/usbvideo/ibmcam.c
@@ -258,7 +258,9 @@ static enum ParseState ibmcam_find_header(struct uvd *uvd) /* FIXME: Add frame h
                             (RING_QUEUE_PEEK(&uvd->dp, 2) == 0x00))
                         {
 #if 0                           /* This code helps to detect new frame markers */
-                                info("Header sig: 00 FF 00 %02X", RING_QUEUE_PEEK(&uvd->dp, 3));
+                                dev_info(&uvd->dev->dev,
+                                         "Header sig: 00 FF 00 %02X\n",
+                                         RING_QUEUE_PEEK(&uvd->dp, 3));
 #endif
                                 frame->header = RING_QUEUE_PEEK(&uvd->dp, 3);
                                 if ((frame->header == HDRSIG_MODEL1_128x96) ||
@@ -266,7 +268,8 @@ static enum ParseState ibmcam_find_header(struct uvd *uvd) /* FIXME: Add frame h
                                     (frame->header == HDRSIG_MODEL1_352x288))
                                 {
 #if 0
-                                        info("Header found.");
+                                        dev_info(&uvd->dev->dev,
+                                                 "Header found.\n");
 #endif
                                         RING_QUEUE_DEQUEUE_BYTES(&uvd->dp, marker_len);
                                         icam->has_hdr = 1;
@@ -295,7 +298,7 @@ case IBMCAM_MODEL_4:
                             (RING_QUEUE_PEEK(&uvd->dp, 1) == 0xFF))
                         {
 #if 0
-                                info("Header found.");
+                                dev_info(&uvd->dev->dev, "Header found.\n");
 #endif
                                 RING_QUEUE_DEQUEUE_BYTES(&uvd->dp, marker_len);
                                 icam->has_hdr = 1;
@@ -338,7 +341,7 @@ case IBMCAM_MODEL_4:
                                 byte4 = RING_QUEUE_PEEK(&uvd->dp, 3);
                                 frame->header = (byte3 << 8) | byte4;
 #if 0
-                                info("Header found.");
+                                dev_info(&uvd->dev->dev, "Header found.\n");
 #endif
                                 RING_QUEUE_DEQUEUE_BYTES(&uvd->dp, marker_len);
                                 icam->has_hdr = 1;
@@ -354,7 +357,8 @@ case IBMCAM_MODEL_4:
         }
         if (!icam->has_hdr) {
                 if (uvd->debug > 2)
-                        info("Skipping frame, no header");
+                        dev_info(&uvd->dev->dev,
+                                 "Skipping frame, no header\n");
                 return scan_EndParse;
         }
 
@@ -881,7 +885,9 @@ static enum ParseState ibmcam_model3_parse_lines(
          */
         if ((frame->curline + 1) >= data_h) {
                 if (uvd->debug >= 3)
-                        info("Reached line %d. (frame is done)", frame->curline);
+                        dev_info(&uvd->dev->dev,
+                                 "Reached line %d. (frame is done)\n",
+                                 frame->curline);
                 return scan_NextFrame;
         }
 
@@ -954,8 +960,9 @@ static enum ParseState ibmcam_model3_parse_lines(
 
         if (frame->curline >= VIDEOSIZE_Y(frame->request)) {
                 if (uvd->debug >= 3) {
-                        info("All requested lines (%ld.) done.",
-                             VIDEOSIZE_Y(frame->request));
+                        dev_info(&uvd->dev->dev,
+                                 "All requested lines (%ld.) done.\n",
+                                 VIDEOSIZE_Y(frame->request));
                 }
                 return scan_NextFrame;
         } else
@@ -1000,7 +1007,9 @@ static enum ParseState ibmcam_model4_128x96_parse_lines(
          */
         if ((frame->curline + 1) >= data_h) {
                 if (uvd->debug >= 3)
-                        info("Reached line %d. (frame is done)", frame->curline);
+                        dev_info(&uvd->dev->dev,
+                                 "Reached line %d. (frame is done)\n",
+                                 frame->curline);
                 return scan_NextFrame;
         }
 
@@ -1049,8 +1058,9 @@ static enum ParseState ibmcam_model4_128x96_parse_lines(
 
         if (frame->curline >= VIDEOSIZE_Y(frame->request)) {
                 if (uvd->debug >= 3) {
-                        info("All requested lines (%ld.) done.",
-                             VIDEOSIZE_Y(frame->request));
+                        dev_info(&uvd->dev->dev,
+                                 "All requested lines (%ld.) done.\n",
+                                 VIDEOSIZE_Y(frame->request));
                 }
                 return scan_NextFrame;
         } else
@@ -1171,10 +1181,11 @@ static int ibmcam_veio(
                         sizeof(cp),
                         1000);
 #if 0
-                info("USB => %02x%02x%02x%02x%02x%02x%02x%02x "
-                       "(req=$%02x val=$%04x ind=$%04x)",
-                       cp[0],cp[1],cp[2],cp[3],cp[4],cp[5],cp[6],cp[7],
-                       req, value, index);
+                dev_info(&uvd->dev->dev,
+                         "USB => %02x%02x%02x%02x%02x%02x%02x%02x "
+                         "(req=$%02x val=$%04x ind=$%04x)\n",
+                         cp[0],cp[1],cp[2],cp[3],cp[4],cp[5],cp[6],cp[7],
+                         req, value, index);
 #endif
         } else {
                 i = usb_control_msg(
@@ -1449,10 +1460,9 @@ static void ibmcam_adjust_contrast(struct uvd *uvd)
  */
 static void ibmcam_change_lighting_conditions(struct uvd *uvd)
 {
-        static const char proc[] = "ibmcam_change_lighting_conditions";
-
         if (debug > 0)
-                info("%s: Set lighting to %hu.", proc, lighting);
+                dev_info(&uvd->dev->dev,
+                         "%s: Set lighting to %hu.\n", __func__, lighting);
 
         switch (IBMCAM_T(uvd)->camera_model) {
         case IBMCAM_MODEL_1:
@@ -1495,8 +1505,6 @@ static void ibmcam_change_lighting_conditions(struct uvd *uvd)
  */
 static void ibmcam_set_sharpness(struct uvd *uvd)
 {
-        static const char proc[] = "ibmcam_set_sharpness";
-
         switch (IBMCAM_T(uvd)->camera_model) {
         case IBMCAM_MODEL_1:
         {
@@ -1505,7 +1513,8 @@ static void ibmcam_set_sharpness(struct uvd *uvd)
 
                 RESTRICT_TO_RANGE(sharpness, SHARPNESS_MIN, SHARPNESS_MAX);
                 if (debug > 0)
-                        info("%s: Set sharpness to %hu.", proc, sharpness);
+                        dev_info(&uvd->dev->dev, "%s: Set sharpness to %hu.\n",
+                                 __func__, sharpness);
 
                 sv = sa[sharpness - SHARPNESS_MIN];
                 for (i=0; i < 2; i++) {
@@ -1564,11 +1573,11 @@ static void ibmcam_set_sharpness(struct uvd *uvd)
  */
 static void ibmcam_set_brightness(struct uvd *uvd)
 {
-        static const char proc[] = "ibmcam_set_brightness";
         static const unsigned short n = 1;
 
         if (debug > 0)
-                info("%s: Set brightness to %hu.", proc, uvd->vpic.brightness);
+                dev_info(&uvd->dev->dev, "%s: Set brightness to %hu.\n",
+                         __func__, uvd->vpic.brightness);
 
         switch (IBMCAM_T(uvd)->camera_model) {
         case IBMCAM_MODEL_1:
@@ -2115,7 +2124,8 @@ static void ibmcam_model2_setup_after_video_if(struct uvd *uvd)
                         break;
                 }
                 if (uvd->debug > 0)
-                        info("Framerate (hardware): %hd.", hw_fps);
+                        dev_info(&uvd->dev->dev, "Framerate (hardware): %hd.\n",
+                                 hw_fps);
                 RESTRICT_TO_RANGE(hw_fps, 0, 31);
                 ibmcam_model2_Packet1(uvd, mod2_set_framerate, hw_fps);
         }
@@ -3487,7 +3497,7 @@ static void ibmcam_model3_setup_after_video_if(struct uvd *uvd)
         /* 01.01.08 - Added for RCA video in support -LO */
         if(init_model3_input) {
                 if (debug > 0)
-                        info("Setting input to RCA.");
+                        dev_info(&uvd->dev->dev, "Setting input to RCA.\n");
                 for (i=0; i < ARRAY_SIZE(initData); i++) {
                         ibmcam_veio(uvd, initData[i].req, initData[i].value, initData[i].index);
                 }
@@ -3685,7 +3695,7 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *
         unsigned char video_ep = 0;
 
         if (debug >= 1)
-                info("ibmcam_probe(%p,%u.)", intf, ifnum);
+                dev_info(&uvd->dev->dev, "ibmcam_probe(%p,%u.)\n", intf, ifnum);
 
         /* We don't handle multi-config cameras */
         if (dev->descriptor.bNumConfigurations != 1)
@@ -3736,14 +3746,16 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *
                         brand = "IBM PC Camera"; /* a.k.a. Xirlink C-It */
                         break;
                 }
-                info("%s USB camera found (model %d, rev. 0x%04x)",
-                     brand, model, le16_to_cpu(dev->descriptor.bcdDevice));
+                dev_info(&uvd->dev->dev,
+                         "%s USB camera found (model %d, rev. 0x%04x)\n",
+                         brand, model, le16_to_cpu(dev->descriptor.bcdDevice));
         } while (0);
 
         /* Validate found interface: must have one ISO endpoint */
         nas = intf->num_altsetting;
         if (debug > 0)
-                info("Number of alternate settings=%d.", nas);
+                dev_info(&uvd->dev->dev, "Number of alternate settings=%d.\n",
+                         nas);
         if (nas < 2) {
                 err("Too few alternate settings for this camera!");
                 return -ENODEV;
@@ -3787,7 +3799,9 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *
                                 actInterface = i;
                                 maxPS = le16_to_cpu(endpoint->wMaxPacketSize);
                                 if (debug > 0)
-                                        info("Active setting=%d. maxPS=%d.", i, maxPS);
+                                        dev_info(&uvd->dev->dev,
+                                                 "Active setting=%d. "
+                                                 "maxPS=%d.\n", i, maxPS);
                         } else
                                 err("More than one active alt. setting! Ignoring #%d.", i);
                 }
@@ -3826,7 +3840,7 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *
                         RESTRICT_TO_RANGE(framerate, 0, 5);
                         break;
                 default:
-                        info("IBM camera: using 320x240");
+                        dev_info(&uvd->dev->dev, "IBM camera: using 320x240\n");
                         size = SIZE_320x240;
                         /* No break here */
                 case SIZE_320x240:
@@ -3855,7 +3869,7 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *
                         canvasY = 120;
                         break;
                 default:
-                        info("IBM NetCamera: using 176x144");
+                        dev_info(&uvd->dev->dev, "IBM NetCamera: using 176x144\n");
                         size = SIZE_176x144;
                         /* No break here */
                 case SIZE_176x144:
diff --git a/drivers/media/video/usbvideo/konicawc.c b/drivers/media/video/usbvideo/konicawc.c
index 1c180284ec6c..e986c28b7bb0 100644
--- a/drivers/media/video/usbvideo/konicawc.c
+++ b/drivers/media/video/usbvideo/konicawc.c
@@ -337,7 +337,8 @@ static int konicawc_compress_iso(struct uvd *uvd, struct urb *dataurb, struct ur
                 }
 
                 if((sts > 0x01) && (sts < 0x80)) {
-                        info("unknown status %2.2x", sts);
+                        dev_info(&uvd->dev->dev, "unknown status %2.2x\n",
+                                 sts);
                         bad++;
                         continue;
                 }
@@ -568,8 +569,12 @@ static void konicawc_process_isoc(struct uvd *uvd, struct usbvideo_frame *frame)
                                         fdrops = (0x80 + curframe - cam->lastframe) & 0x7F;
                                         fdrops--;
                                         if(fdrops) {
-                                                info("Dropped %d frames (%d -> %d)", fdrops,
-                                                     cam->lastframe, curframe);
+                                                dev_info(&uvd->dev->dev,
+                                                         "Dropped %d frames "
+                                                         "(%d -> %d)\n",
+                                                         fdrops,
+                                                         cam->lastframe,
+                                                         curframe);
                                         }
                                 }
                                 cam->lastframe = curframe;
@@ -784,7 +789,8 @@ static int konicawc_probe(struct usb_interface *intf, const struct usb_device_id
         if (dev->descriptor.bNumConfigurations != 1)
                 return -ENODEV;
 
-        info("Konica Webcam (rev. 0x%04x)", le16_to_cpu(dev->descriptor.bcdDevice));
+        dev_info(&intf->dev, "Konica Webcam (rev. 0x%04x)\n",
+                 le16_to_cpu(dev->descriptor.bcdDevice));
         RESTRICT_TO_RANGE(speed, 0, MAX_SPEED);
 
         /* Validate found interface: must have one ISO endpoint */
@@ -925,7 +931,8 @@ static struct usb_device_id id_table[] = {
 static int __init konicawc_init(void)
 {
         struct usbvideo_cb cbTbl;
-        info(DRIVER_DESC " " DRIVER_VERSION);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
         memset(&cbTbl, 0, sizeof(cbTbl));
         cbTbl.probe = konicawc_probe;
         cbTbl.setupOnOpen = konicawc_setup_on_open;
diff --git a/drivers/media/video/usbvideo/quickcam_messenger.c b/drivers/media/video/usbvideo/quickcam_messenger.c
index 3d26a30abe1e..05c61b523115 100644
--- a/drivers/media/video/usbvideo/quickcam_messenger.c
+++ b/drivers/media/video/usbvideo/quickcam_messenger.c
@@ -1080,7 +1080,8 @@ static struct usbvideo_cb qcm_driver = {
 
 static int __init qcm_init(void)
 {
-        info(DRIVER_DESC " " DRIVER_VERSION);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
 
         return usbvideo_register(
                 &cams,
diff --git a/drivers/media/video/usbvideo/ultracam.c b/drivers/media/video/usbvideo/ultracam.c
index 9544e644bf0d..9714baab7833 100644
--- a/drivers/media/video/usbvideo/ultracam.c
+++ b/drivers/media/video/usbvideo/ultracam.c
@@ -156,10 +156,11 @@ static int ultracam_veio(
                         sizeof(cp),
                         1000);
 #if 1
-                info("USB => %02x%02x%02x%02x%02x%02x%02x%02x "
-                       "(req=$%02x val=$%04x ind=$%04x)",
-                       cp[0],cp[1],cp[2],cp[3],cp[4],cp[5],cp[6],cp[7],
-                       req, value, index);
+                dev_info(&uvd->dev->dev,
+                         "USB => %02x%02x%02x%02x%02x%02x%02x%02x "
+                         "(req=$%02x val=$%04x ind=$%04x)\n",
+                         cp[0],cp[1],cp[2],cp[3],cp[4],cp[5],cp[6],cp[7],
+                         req, value, index);
 #endif
         } else {
                 i = usb_control_msg(
@@ -517,19 +518,20 @@ static int ultracam_probe(struct usb_interface *intf, const struct usb_device_id
         unsigned char video_ep = 0;
 
         if (debug >= 1)
-                info("ultracam_probe(%p)", intf);
+                dev_info(&intf->dev, "ultracam_probe\n");
 
         /* We don't handle multi-config cameras */
         if (dev->descriptor.bNumConfigurations != 1)
                 return -ENODEV;
 
-        info("IBM Ultra camera found (rev. 0x%04x)",
-                le16_to_cpu(dev->descriptor.bcdDevice));
+        dev_info(&intf->dev, "IBM Ultra camera found (rev. 0x%04x)\n",
+                 le16_to_cpu(dev->descriptor.bcdDevice));
 
         /* Validate found interface: must have one ISO endpoint */
         nas = intf->num_altsetting;
         if (debug > 0)
-                info("Number of alternate settings=%d.", nas);
+                dev_info(&intf->dev, "Number of alternate settings=%d.\n",
+                         nas);
         if (nas < 8) {
                 err("Too few alternate settings for this camera!");
                 return -ENODEV;
@@ -576,7 +578,9 @@ static int ultracam_probe(struct usb_interface *intf, const struct usb_device_id
                                 actInterface = i;
                                 maxPS = le16_to_cpu(endpoint->wMaxPacketSize);
                                 if (debug > 0)
-                                        info("Active setting=%d. maxPS=%d.", i, maxPS);
+                                        dev_info(&intf->dev,
+                                                 "Active setting=%d. "
+                                                 "maxPS=%d.\n", i, maxPS);
                         } else {
                                 /* Got another active alt. setting */
                                 if (maxPS < le16_to_cpu(endpoint->wMaxPacketSize)) {
@@ -584,8 +588,11 @@ static int ultracam_probe(struct usb_interface *intf, const struct usb_device_id
                                         actInterface = i;
                                         maxPS = le16_to_cpu(endpoint->wMaxPacketSize);
                                         if (debug > 0) {
-                                                info("Even better ctive setting=%d. maxPS=%d.",
-                                                     i, maxPS);
+                                                dev_info(&intf->dev,
+                                                         "Even better ctive "
+                                                         "setting=%d. "
+                                                         "maxPS=%d.\n",
+                                                         i, maxPS);
                                         }
                                 }
                         }
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c
index bf1bc2f69b02..07cd87d16f69 100644
--- a/drivers/media/video/usbvideo/usbvideo.c
+++ b/drivers/media/video/usbvideo/usbvideo.c
@@ -468,8 +468,9 @@ static void usbvideo_ReportStatistics(const struct uvd *uvd)
                         percent = (100 * goodPackets) / allPackets;
                 else
                         percent = goodPackets / (allPackets / 100);
-                info("Packet Statistics: Total=%lu. Empty=%lu. Usage=%lu%%",
-                     allPackets, badPackets, percent);
+                dev_info(&uvd->dev->dev,
+                         "Packet Statistics: Total=%lu. Empty=%lu. Usage=%lu%%\n",
+                         allPackets, badPackets, percent);
                 if (uvd->iso_packet_len > 0) {
                         unsigned long allBytes, xferBytes;
                         char multiplier = ' ';
@@ -497,8 +498,9 @@ static void usbvideo_ReportStatistics(const struct uvd *uvd)
                                         }
                                 }
                         }
-                        info("Transfer Statistics: Transferred=%lu%cB Usage=%lu%%",
-                             xferBytes, multiplier, percent);
+                        dev_info(&uvd->dev->dev,
+                                 "Transfer Statistics: Transferred=%lu%cB Usage=%lu%%\n",
+                                 xferBytes, multiplier, percent);
                 }
         }
 }
@@ -545,7 +547,7 @@ void usbvideo_TestPattern(struct uvd *uvd, int fullframe, int pmode)
         {       /* For debugging purposes only */
                 char tmp[20];
                 usbvideo_VideosizeToString(tmp, sizeof(tmp), frame->request);
-                info("testpattern: frame=%s", tmp);
+                dev_info(&uvd->dev->dev, "testpattern: frame=%s\n", tmp);
         }
 #endif
         /* Form every scan line */
@@ -854,7 +856,7 @@ static void usbvideo_Disconnect(struct usb_interface *intf)
 
         usbvideo_ClientIncModCount(uvd);
         if (uvd->debug > 0)
-                info("%s(%p.)", __func__, intf);
+                dev_info(&intf->dev, "%s(%p.)\n", __func__, intf);
 
         mutex_lock(&uvd->lock);
         uvd->remove_pending = 1; /* Now all ISO data will be ignored */
@@ -870,14 +872,15 @@ static void usbvideo_Disconnect(struct usb_interface *intf)
 
         video_unregister_device(&uvd->vdev);
         if (uvd->debug > 0)
-                info("%s: Video unregistered.", __func__);
+                dev_info(&intf->dev, "%s: Video unregistered.\n", __func__);
 
         if (uvd->user)
-                info("%s: In use, disconnect pending.", __func__);
+                dev_info(&intf->dev, "%s: In use, disconnect pending.\n",
+                         __func__);
         else
                 usbvideo_CameraRelease(uvd);
         mutex_unlock(&uvd->lock);
-        info("USB camera disconnected.");
+        dev_info(&intf->dev, "USB camera disconnected.\n");
 
         usbvideo_ClientDecModCount(uvd);
 }
@@ -1015,14 +1018,17 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd)
                 return -EINVAL;
         }
         if (uvd->video_endp == 0) {
-                info("%s: No video endpoint specified; data pump disabled.", __func__);
+                dev_info(&uvd->dev->dev,
+                         "%s: No video endpoint specified; data pump disabled.\n",
+                         __func__);
         }
         if (uvd->paletteBits == 0) {
                 err("%s: No palettes specified!", __func__);
                 return -EINVAL;
         }
         if (uvd->defaultPalette == 0) {
-                info("%s: No default palette!", __func__);
+                dev_info(&uvd->dev->dev, "%s: No default palette!\n",
+                         __func__);
         }
 
         uvd->max_frame_size = VIDEOSIZE_X(uvd->canvas) *
@@ -1031,25 +1037,29 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd)
         usbvideo_VideosizeToString(tmp2, sizeof(tmp2), uvd->canvas);
 
         if (uvd->debug > 0) {
-                info("%s: iface=%d. endpoint=$%02x paletteBits=$%08lx",
-                     __func__, uvd->iface, uvd->video_endp, uvd->paletteBits);
+                dev_info(&uvd->dev->dev,
+                         "%s: iface=%d. endpoint=$%02x paletteBits=$%08lx\n",
+                         __func__, uvd->iface, uvd->video_endp,
+                         uvd->paletteBits);
         }
         if (uvd->dev == NULL) {
                 err("%s: uvd->dev == NULL", __func__);
                 return -EINVAL;
         }
         uvd->vdev.parent = &uvd->dev->dev;
-        if (video_register_device(&uvd->vdev, VFL_TYPE_GRABBER, video_nr) == -1) {
+        uvd->vdev.release = video_device_release_empty;
+        if (video_register_device(&uvd->vdev, VFL_TYPE_GRABBER, video_nr) < 0) {
                 err("%s: video_register_device failed", __func__);
                 return -EPIPE;
         }
         if (uvd->debug > 1) {
-                info("%s: video_register_device() successful", __func__);
+                dev_info(&uvd->dev->dev,
+                         "%s: video_register_device() successful\n", __func__);
         }
 
-        info("%s on /dev/video%d: canvas=%s videosize=%s",
-             (uvd->handle != NULL) ? uvd->handle->drvName : "???",
-             uvd->vdev.minor, tmp2, tmp1);
+        dev_info(&uvd->dev->dev, "%s on /dev/video%d: canvas=%s videosize=%s\n",
+                 (uvd->handle != NULL) ? uvd->handle->drvName : "???",
+                 uvd->vdev.minor, tmp2, tmp1);
 
         usb_get_dev(uvd->dev);
         return 0;
@@ -1111,7 +1121,7 @@ static int usbvideo_v4l_open(struct inode *inode, struct file *file)
         int i, errCode = 0;
 
         if (uvd->debug > 1)
-                info("%s($%p)", __func__, dev);
+                dev_info(&uvd->dev->dev, "%s($%p)\n", __func__, dev);
 
         if (0 < usbvideo_ClientIncModCount(uvd))
                 return -ENODEV;
@@ -1178,19 +1188,25 @@ static int usbvideo_v4l_open(struct inode *inode, struct file *file)
                 if (errCode == 0) {
                         if (VALID_CALLBACK(uvd, setupOnOpen)) {
                                 if (uvd->debug > 1)
-                                        info("%s: setupOnOpen callback", __func__);
+                                        dev_info(&uvd->dev->dev,
+                                                 "%s: setupOnOpen callback\n",
+                                                 __func__);
                                 errCode = GET_CALLBACK(uvd, setupOnOpen)(uvd);
                                 if (errCode < 0) {
                                         err("%s: setupOnOpen callback failed (%d.).",
                                             __func__, errCode);
                                 } else if (uvd->debug > 1) {
-                                        info("%s: setupOnOpen callback successful", __func__);
+                                        dev_info(&uvd->dev->dev,
+                                                 "%s: setupOnOpen callback successful\n",
+                                                 __func__);
                                 }
                         }
                         if (errCode == 0) {
                                 uvd->settingsAdjusted = 0;
                                 if (uvd->debug > 1)
-                                        info("%s: Open succeeded.", __func__);
+                                        dev_info(&uvd->dev->dev,
+                                                 "%s: Open succeeded.\n",
+                                                 __func__);
                                 uvd->user++;
                                 file->private_data = uvd;
                         }
@@ -1200,7 +1216,8 @@ static int usbvideo_v4l_open(struct inode *inode, struct file *file)
         if (errCode != 0)
                 usbvideo_ClientDecModCount(uvd);
         if (uvd->debug > 0)
-                info("%s: Returning %d.", __func__, errCode);
+                dev_info(&uvd->dev->dev, "%s: Returning %d.\n", __func__,
+                         errCode);
         return errCode;
 }
 
@@ -1223,7 +1240,7 @@ static int usbvideo_v4l_close(struct inode *inode, struct file *file)
         int i;
 
         if (uvd->debug > 1)
-                info("%s($%p)", __func__, dev);
+                dev_info(&uvd->dev->dev, "%s($%p)\n", __func__, dev);
 
         mutex_lock(&uvd->lock);
         GET_CALLBACK(uvd, stopDataPump)(uvd);
@@ -1243,14 +1260,15 @@ static int usbvideo_v4l_close(struct inode *inode, struct file *file)
         uvd->user--;
         if (uvd->remove_pending) {
                 if (uvd->debug > 0)
-                        info("usbvideo_v4l_close: Final disconnect.");
+                        dev_info(&uvd->dev->dev, "%s: Final disconnect.\n",
+                                 __func__);
                 usbvideo_CameraRelease(uvd);
         }
         mutex_unlock(&uvd->lock);
         usbvideo_ClientDecModCount(uvd);
 
         if (uvd->debug > 1)
-                info("%s: Completed.", __func__);
+                dev_info(&uvd->dev->dev, "%s: Completed.\n", __func__);
         file->private_data = NULL;
         return 0;
 }
@@ -1364,8 +1382,9 @@ static int usbvideo_v4l_do_ioctl(struct inode *inode, struct file *file,
                         struct video_mmap *vm = arg;
 
                         if (uvd->debug >= 1) {
-                                info("VIDIOCMCAPTURE: frame=%d. size=%dx%d, format=%d.",
-                                     vm->frame, vm->width, vm->height, vm->format);
+                                dev_info(&uvd->dev->dev,
+                                         "VIDIOCMCAPTURE: frame=%d. size=%dx%d, format=%d.\n",
+                                         vm->frame, vm->width, vm->height, vm->format);
                         }
                         /*
                          * Check if the requested size is supported. If the requestor
@@ -1383,18 +1402,24 @@ static int usbvideo_v4l_do_ioctl(struct inode *inode, struct file *file,
                         if ((vm->width > VIDEOSIZE_X(uvd->canvas)) ||
                             (vm->height > VIDEOSIZE_Y(uvd->canvas))) {
                                 if (uvd->debug > 0) {
-                                        info("VIDIOCMCAPTURE: Size=%dx%d too large; "
-                                             "allowed only up to %ldx%ld", vm->width, vm->height,
-                                             VIDEOSIZE_X(uvd->canvas), VIDEOSIZE_Y(uvd->canvas));
+                                        dev_info(&uvd->dev->dev,
+                                                 "VIDIOCMCAPTURE: Size=%dx%d "
+                                                 "too large; allowed only up "
+                                                 "to %ldx%ld\n", vm->width,
+                                                 vm->height,
+                                                 VIDEOSIZE_X(uvd->canvas),
+                                                 VIDEOSIZE_Y(uvd->canvas));
                                 }
                                 return -EINVAL;
                         }
                         /* Check if the palette is supported */
                         if (((1L << vm->format) & uvd->paletteBits) == 0) {
                                 if (uvd->debug > 0) {
-                                        info("VIDIOCMCAPTURE: format=%d. not supported"
-                                             " (paletteBits=$%08lx)",
-                                             vm->format, uvd->paletteBits);
+                                        dev_info(&uvd->dev->dev,
+                                                 "VIDIOCMCAPTURE: format=%d. "
+                                                 "not supported "
+                                                 "(paletteBits=$%08lx)\n",
+                                                 vm->format, uvd->paletteBits);
                                 }
                                 return -EINVAL;
                         }
@@ -1422,7 +1447,9 @@ static int usbvideo_v4l_do_ioctl(struct inode *inode, struct file *file,
                                 return -EINVAL;
 
                         if (uvd->debug >= 1)
-                                info("VIDIOCSYNC: syncing to frame %d.", *frameNum);
+                                dev_info(&uvd->dev->dev,
+                                         "VIDIOCSYNC: syncing to frame %d.\n",
+                                         *frameNum);
                         if (uvd->flags & FLAGS_NO_DECODING)
                                 ret = usbvideo_GetFrame(uvd, *frameNum);
                         else if (VALID_CALLBACK(uvd, getFrame)) {
@@ -1504,7 +1531,9 @@ static ssize_t usbvideo_v4l_read(struct file *file, char __user *buf,
                 return -EFAULT;
 
         if (uvd->debug >= 1)
-                info("%s: %Zd. bytes, noblock=%d.", __func__, count, noblock);
+                dev_info(&uvd->dev->dev,
+                         "%s: %Zd. bytes, noblock=%d.\n",
+                         __func__, count, noblock);
 
         mutex_lock(&uvd->lock);
 
@@ -1685,18 +1714,21 @@ static void usbvideo_IsocIrq(struct urb *urb)
                 return;
 #if 0
         if (urb->actual_length > 0) {
-                info("urb=$%p status=%d. errcount=%d. length=%d.",
-                     urb, urb->status, urb->error_count, urb->actual_length);
+                dev_info(&uvd->dev->dev,
+                         "urb=$%p status=%d. errcount=%d. length=%d.\n",
+                         urb, urb->status, urb->error_count,
+                         urb->actual_length);
         } else {
                 static int c = 0;
                 if (c++ % 100 == 0)
-                        info("No Isoc data");
+                        dev_info(&uvd->dev->dev, "No Isoc data\n");
         }
 #endif
 
         if (!uvd->streaming) {
                 if (uvd->debug >= 1)
-                        info("Not streaming, but interrupt!");
+                        dev_info(&uvd->dev->dev,
+                                 "Not streaming, but interrupt!\n");
                 return;
         }
 
@@ -1741,7 +1773,7 @@ static int usbvideo_StartDataPump(struct uvd *uvd)
         int i, errFlag;
 
         if (uvd->debug > 1)
-                info("%s($%p)", __func__, uvd);
+                dev_info(&uvd->dev->dev, "%s($%p)\n", __func__, uvd);
 
         if (!CAMERA_IS_OPERATIONAL(uvd)) {
                 err("%s: Camera is not operational", __func__);
@@ -1789,7 +1821,9 @@ static int usbvideo_StartDataPump(struct uvd *uvd)
 
         uvd->streaming = 1;
         if (uvd->debug > 1)
-                info("%s: streaming=1 video_endp=$%02x", __func__, uvd->video_endp);
+                dev_info(&uvd->dev->dev,
+                         "%s: streaming=1 video_endp=$%02x\n", __func__,
+                         uvd->video_endp);
         return 0;
 }
 
@@ -1811,14 +1845,14 @@ static void usbvideo_StopDataPump(struct uvd *uvd)
                 return;
 
         if (uvd->debug > 1)
-                info("%s($%p)", __func__, uvd);
+                dev_info(&uvd->dev->dev, "%s($%p)\n", __func__, uvd);
 
         /* Unschedule all of the iso td's */
         for (i=0; i < USBVIDEO_NUMSBUF; i++) {
                 usb_kill_urb(uvd->sbuf[i].urb);
         }
         if (uvd->debug > 1)
-                info("%s: streaming=0", __func__);
+                dev_info(&uvd->dev->dev, "%s: streaming=0\n", __func__);
         uvd->streaming = 0;
 
         if (!uvd->remove_pending) {
@@ -1850,7 +1884,8 @@ static int usbvideo_NewFrame(struct uvd *uvd, int framenum)
         int n;
 
         if (uvd->debug > 1)
-                info("usbvideo_NewFrame($%p,%d.)", uvd, framenum);
+                dev_info(&uvd->dev->dev, "usbvideo_NewFrame($%p,%d.)\n", uvd,
+                         framenum);
 
         /* If we're not grabbing a frame right now and the other frame is */
         /*  ready to be grabbed into, then use it instead */
@@ -1955,12 +1990,14 @@ static int usbvideo_GetFrame(struct uvd *uvd, int frameNum)
         struct usbvideo_frame *frame = &uvd->frame[frameNum];
 
         if (uvd->debug >= 2)
-                info("%s($%p,%d.)", __func__, uvd, frameNum);
+                dev_info(&uvd->dev->dev, "%s($%p,%d.)\n", __func__, uvd,
+                         frameNum);
 
         switch (frame->frameState) {
         case FrameState_Unused:
                 if (uvd->debug >= 2)
-                        info("%s: FrameState_Unused", __func__);
+                        dev_info(&uvd->dev->dev, "%s: FrameState_Unused\n",
+                                 __func__);
                 return -EINVAL;
         case FrameState_Ready:
         case FrameState_Grabbing:
@@ -1970,7 +2007,9 @@ static int usbvideo_GetFrame(struct uvd *uvd, int frameNum)
         redo:
                 if (!CAMERA_IS_OPERATIONAL(uvd)) {
                         if (uvd->debug >= 2)
-                                info("%s: Camera is not operational (1)", __func__);
+                                dev_info(&uvd->dev->dev,
+                                         "%s: Camera is not operational (1)\n",
+                                         __func__);
                         return -EIO;
                 }
                 ntries = 0;
@@ -1979,24 +2018,33 @@ static int usbvideo_GetFrame(struct uvd *uvd, int frameNum)
                         signalPending = signal_pending(current);
                         if (!CAMERA_IS_OPERATIONAL(uvd)) {
                                 if (uvd->debug >= 2)
-                                        info("%s: Camera is not operational (2)", __func__);
+                                        dev_info(&uvd->dev->dev,
+                                                 "%s: Camera is not "
+                                                 "operational (2)\n", __func__);
                                 return -EIO;
                         }
                         assert(uvd->fbuf != NULL);
                         if (signalPending) {
                                 if (uvd->debug >= 2)
-                                        info("%s: Signal=$%08x", __func__, signalPending);
+                                        dev_info(&uvd->dev->dev,
+                                        "%s: Signal=$%08x\n", __func__,
+                                        signalPending);
                                 if (uvd->flags & FLAGS_RETRY_VIDIOCSYNC) {
                                         usbvideo_TestPattern(uvd, 1, 0);
                                         uvd->curframe = -1;
                                         uvd->stats.frame_num++;
                                         if (uvd->debug >= 2)
-                                                info("%s: Forced test pattern screen", __func__);
+                                                dev_info(&uvd->dev->dev,
+                                                         "%s: Forced test "
+                                                         "pattern screen\n",
+                                                         __func__);
                                         return 0;
                                 } else {
                                         /* Standard answer: Interrupted! */
                                         if (uvd->debug >= 2)
-                                                info("%s: Interrupted!", __func__);
+                                                dev_info(&uvd->dev->dev,
+                                                         "%s: Interrupted!\n",
+                                                         __func__);
                                         return -EINTR;
                                 }
                         } else {
@@ -2010,8 +2058,10 @@ static int usbvideo_GetFrame(struct uvd *uvd, int frameNum)
                         }
                 } while (frame->frameState == FrameState_Grabbing);
                 if (uvd->debug >= 2) {
-                        info("%s: Grabbing done; state=%d. (%lu. bytes)",
-                             __func__, frame->frameState, frame->seqRead_Length);
+                        dev_info(&uvd->dev->dev,
+                                 "%s: Grabbing done; state=%d. (%lu. bytes)\n",
+                                 __func__, frame->frameState,
+                                 frame->seqRead_Length);
                 }
                 if (frame->frameState == FrameState_Error) {
                         int ret = usbvideo_NewFrame(uvd, frameNum);
@@ -2048,7 +2098,9 @@ static int usbvideo_GetFrame(struct uvd *uvd, int frameNum)
                 }
                 frame->frameState = FrameState_Done_Hold;
                 if (uvd->debug >= 2)
-                        info("%s: Entered FrameState_Done_Hold state.", __func__);
+                        dev_info(&uvd->dev->dev,
+                                 "%s: Entered FrameState_Done_Hold state.\n",
+                                 __func__);
                 return 0;
 
         case FrameState_Done_Hold:
@@ -2059,7 +2111,9 @@ static int usbvideo_GetFrame(struct uvd *uvd, int frameNum)
                  * it will be released back into the wild to roam freely.
                  */
                 if (uvd->debug >= 2)
-                        info("%s: FrameState_Done_Hold state.", __func__);
+                        dev_info(&uvd->dev->dev,
+                                 "%s: FrameState_Done_Hold state.\n",
+                                 __func__);
                 return 0;
         }
 
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c
index 2eb45829791c..7a127d6bfdee 100644
--- a/drivers/media/video/usbvideo/vicam.c
+++ b/drivers/media/video/usbvideo/vicam.c
@@ -472,9 +472,8 @@ vicam_ioctl(struct inode *inode, struct file *file, unsigned int ioctlnr, unsign
 static int
 vicam_open(struct inode *inode, struct file *file)
 {
-        struct video_device *dev = video_devdata(file);
-        struct vicam_camera *cam =
-            (struct vicam_camera *) dev->priv;
+        struct vicam_camera *cam = video_drvdata(file);
+
         DBG("open\n");
 
         if (!cam) {
@@ -488,20 +487,24 @@ vicam_open(struct inode *inode, struct file *file)
          * rely on this fact forever.
          */
 
+        lock_kernel();
         if (cam->open_count > 0) {
                 printk(KERN_INFO
                        "vicam_open called on already opened camera");
+                unlock_kernel();
                 return -EBUSY;
         }
 
         cam->raw_image = kmalloc(VICAM_MAX_READ_SIZE, GFP_KERNEL);
         if (!cam->raw_image) {
+                unlock_kernel();
                 return -ENOMEM;
         }
 
         cam->framebuf = rvmalloc(VICAM_MAX_FRAME_SIZE * VICAM_FRAMES);
         if (!cam->framebuf) {
                 kfree(cam->raw_image);
+                unlock_kernel();
                 return -ENOMEM;
         }
 
@@ -509,6 +512,7 @@ vicam_open(struct inode *inode, struct file *file)
         if (!cam->cntrlbuf) {
                 kfree(cam->raw_image);
                 rvfree(cam->framebuf, VICAM_MAX_FRAME_SIZE * VICAM_FRAMES);
+                unlock_kernel();
                 return -ENOMEM;
         }
 
@@ -526,6 +530,7 @@ vicam_open(struct inode *inode, struct file *file)
         cam->open_count++;
 
         file->private_data = cam;
+        unlock_kernel();
 
         return 0;
 }
@@ -795,6 +800,7 @@ static struct video_device vicam_template = {
         .name           = "ViCam-based USB Camera",
         .fops           = &vicam_fops,
         .minor          = -1,
+        .release        = video_device_release_empty,
 };
 
 /* table of devices that work with this driver */
@@ -859,9 +865,8 @@ vicam_probe( struct usb_interface *intf, const struct usb_device_id *id)
 
         mutex_init(&cam->cam_lock);
 
-        memcpy(&cam->vdev, &vicam_template,
-               sizeof (vicam_template));
-        cam->vdev.priv = cam;   // sort of a reverse mapping for those functions that get vdev only
+        memcpy(&cam->vdev, &vicam_template, sizeof(vicam_template));
+        video_set_drvdata(&cam->vdev, cam);
 
         cam->udev = dev;
         cam->bulkEndpoint = bulkEndpoint;
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
index c317ed7a8482..9e4f50639975 100644
--- a/drivers/media/video/usbvision/usbvision-core.c
+++ b/drivers/media/video/usbvision/usbvision-core.c
@@ -45,10 +45,6 @@
 
 #include <linux/workqueue.h>
 
-#ifdef CONFIG_KMOD
-#include <linux/kmod.h>
-#endif
-
 #include "usbvision.h"
 
 static unsigned int core_debug;
@@ -84,7 +80,8 @@ MODULE_PARM_DESC(adjust_Y_Offset, "adjust Y offset display [core]");
 #ifdef USBVISION_DEBUG
         #define PDEBUG(level, fmt, args...) { \
                 if (core_debug & (level)) \
-                        info("[%s:%d] " fmt, __func__, __LINE__ , ## args); \
+                        printk(KERN_INFO KBUILD_MODNAME ":[%s:%d] " fmt, \
+                                __func__, __LINE__ , ## args); \
         }
 #else
         #define PDEBUG(level, fmt, args...) do {} while(0)
diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c
index a6d00858b07e..92427fdc1459 100644
--- a/drivers/media/video/usbvision/usbvision-i2c.c
+++ b/drivers/media/video/usbvision/usbvision-i2c.c
@@ -47,7 +47,8 @@ MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
 
 #define PDEBUG(level, fmt, args...) { \
                 if (i2c_debug & (level)) \
-                        info("[%s:%d] " fmt, __func__, __LINE__ , ## args); \
+                        printk(KERN_INFO KBUILD_MODNAME ":[%s:%d] " fmt, \
+                                __func__, __LINE__ , ## args); \
         }
 
 static int usbvision_i2c_write(struct usb_usbvision *usbvision, unsigned char addr, char *buf,
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index b977116a0dd9..77aeb39b2750 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -69,10 +69,6 @@
 
 #include <linux/workqueue.h>
 
-#ifdef CONFIG_KMOD
-#include <linux/kmod.h>
-#endif
-
 #include "usbvision.h"
 #include "usbvision-cards.h"
 
@@ -98,7 +94,8 @@ USBVISION_DRIVER_VERSION_PATCHLEVEL)
 #ifdef USBVISION_DEBUG
         #define PDEBUG(level, fmt, args...) { \
                 if (video_debug & (level)) \
-                        info("[%s:%d] " fmt, __func__, __LINE__ , ## args); \
+                        printk(KERN_INFO KBUILD_MODNAME ":[%s:%d] " fmt, \
+                                __func__, __LINE__ , ## args); \
         }
 #else
         #define PDEBUG(level, fmt, args...) do {} while(0)
@@ -360,13 +357,12 @@ static void usbvision_remove_sysfs(struct video_device *vdev)
  */
 static int usbvision_v4l2_open(struct inode *inode, struct file *file)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int errCode = 0;
 
         PDEBUG(DBG_IO, "open");
 
+        lock_kernel();
         usbvision_reset_powerOffTimer(usbvision);
 
         if (usbvision->user)
@@ -424,6 +420,7 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file)
         usbvision_empty_framequeues(usbvision);
 
         PDEBUG(DBG_IO, "success");
+        unlock_kernel();
         return errCode;
 }
 
@@ -437,9 +434,7 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file)
  */
 static int usbvision_v4l2_close(struct inode *inode, struct file *file)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
 
         PDEBUG(DBG_IO, "close");
         mutex_lock(&usbvision->lock);
@@ -484,9 +479,7 @@ static int usbvision_v4l2_close(struct inode *inode, struct file *file)
 static int vidioc_g_register (struct file *file, void *priv,
                                 struct v4l2_register *reg)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int errCode;
 
         if (!v4l2_chip_match_host(reg->match_type, reg->match_chip))
@@ -505,9 +498,7 @@ static int vidioc_g_register (struct file *file, void *priv,
 static int vidioc_s_register (struct file *file, void *priv,
                                 struct v4l2_register *reg)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int errCode;
 
         if (!v4l2_chip_match_host(reg->match_type, reg->match_chip))
@@ -526,9 +517,7 @@ static int vidioc_s_register (struct file *file, void *priv,
 static int vidioc_querycap (struct file *file, void  *priv,
                                         struct v4l2_capability *vc)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
 
         strlcpy(vc->driver, "USBVision", sizeof(vc->driver));
         strlcpy(vc->card,
@@ -548,9 +537,7 @@ static int vidioc_querycap (struct file *file, void  *priv,
 static int vidioc_enum_input (struct file *file, void *priv,
                                 struct v4l2_input *vi)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int chan;
 
         if ((vi->index >= usbvision->video_inputs) || (vi->index < 0) )
@@ -603,9 +590,7 @@ static int vidioc_enum_input (struct file *file, void *priv,
 
 static int vidioc_g_input (struct file *file, void *priv, unsigned int *input)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
 
         *input = usbvision->ctl_input;
         return 0;
@@ -613,9 +598,7 @@ static int vidioc_g_input (struct file *file, void *priv, unsigned int *input)
 
 static int vidioc_s_input (struct file *file, void *priv, unsigned int input)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
 
         if ((input >= usbvision->video_inputs) || (input < 0) )
                 return -EINVAL;
@@ -632,9 +615,8 @@ static int vidioc_s_input (struct file *file, void *priv, unsigned int input)
 
 static int vidioc_s_std (struct file *file, void *priv, v4l2_std_id *id)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
+
         usbvision->tvnormId=*id;
 
         mutex_lock(&usbvision->lock);
@@ -650,9 +632,7 @@ static int vidioc_s_std (struct file *file, void *priv, v4l2_std_id *id)
 static int vidioc_g_tuner (struct file *file, void *priv,
                                 struct v4l2_tuner *vt)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
 
         if (!usbvision->have_tuner || vt->index)        // Only tuner 0
                 return -EINVAL;
@@ -671,9 +651,7 @@ static int vidioc_g_tuner (struct file *file, void *priv,
 static int vidioc_s_tuner (struct file *file, void *priv,
                                 struct v4l2_tuner *vt)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
 
         // Only no or one tuner for now
         if (!usbvision->have_tuner || vt->index)
@@ -687,9 +665,7 @@ static int vidioc_s_tuner (struct file *file, void *priv,
 static int vidioc_g_frequency (struct file *file, void *priv,
                                 struct v4l2_frequency *freq)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
 
         freq->tuner = 0; // Only one tuner
         if(usbvision->radio) {
@@ -705,9 +681,7 @@ static int vidioc_g_frequency (struct file *file, void *priv,
 static int vidioc_s_frequency (struct file *file, void *priv,
                                 struct v4l2_frequency *freq)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
 
         // Only no or one tuner for now
         if (!usbvision->have_tuner || freq->tuner)
@@ -721,9 +695,7 @@ static int vidioc_s_frequency (struct file *file, void *priv,
 
 static int vidioc_g_audio (struct file *file, void *priv, struct v4l2_audio *a)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
 
         memset(a,0,sizeof(*a));
         if(usbvision->radio) {
@@ -748,9 +720,7 @@ static int vidioc_s_audio (struct file *file, void *fh,
 static int vidioc_queryctrl (struct file *file, void *priv,
                             struct v4l2_queryctrl *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int id=ctrl->id;
 
         memset(ctrl,0,sizeof(*ctrl));
@@ -767,9 +737,7 @@ static int vidioc_queryctrl (struct file *file, void *priv,
 static int vidioc_g_ctrl (struct file *file, void *priv,
                                 struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         call_i2c_clients(usbvision, VIDIOC_G_CTRL, ctrl);
 
         return 0;
@@ -778,9 +746,7 @@ static int vidioc_g_ctrl (struct file *file, void *priv,
 static int vidioc_s_ctrl (struct file *file, void *priv,
                                 struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         call_i2c_clients(usbvision, VIDIOC_S_CTRL, ctrl);
 
         return 0;
@@ -789,9 +755,7 @@ static int vidioc_s_ctrl (struct file *file, void *priv,
 static int vidioc_reqbufs (struct file *file,
                            void *priv, struct v4l2_requestbuffers *vr)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int ret;
 
         RESTRICT_TO_RANGE(vr->count,1,USBVISION_NUMFRAMES);
@@ -819,9 +783,7 @@ static int vidioc_reqbufs (struct file *file,
 static int vidioc_querybuf (struct file *file,
                             void *priv, struct v4l2_buffer *vb)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         struct usbvision_frame *frame;
 
         /* FIXME : must control
@@ -857,9 +819,7 @@ static int vidioc_querybuf (struct file *file,
 
 static int vidioc_qbuf (struct file *file, void *priv, struct v4l2_buffer *vb)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         struct usbvision_frame *frame;
         unsigned long lock_flags;
 
@@ -896,9 +856,7 @@ static int vidioc_qbuf (struct file *file, void *priv, struct v4l2_buffer *vb)
 
 static int vidioc_dqbuf (struct file *file, void *priv, struct v4l2_buffer *vb)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int ret;
         struct usbvision_frame *f;
         unsigned long lock_flags;
@@ -939,9 +897,7 @@ static int vidioc_dqbuf (struct file *file, void *priv, struct v4l2_buffer *vb)
 
 static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int b=V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
         usbvision->streaming = Stream_On;
@@ -953,9 +909,7 @@ static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
 static int vidioc_streamoff(struct file *file,
                             void *priv, enum v4l2_buf_type type)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int b=V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
         if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
@@ -988,9 +942,7 @@ static int vidioc_enum_fmt_vid_cap (struct file *file, void  *priv,
 static int vidioc_g_fmt_vid_cap (struct file *file, void *priv,
                                         struct v4l2_format *vf)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         vf->fmt.pix.width = usbvision->curwidth;
         vf->fmt.pix.height = usbvision->curheight;
         vf->fmt.pix.pixelformat = usbvision->palette.format;
@@ -1006,9 +958,7 @@ static int vidioc_g_fmt_vid_cap (struct file *file, void *priv,
 static int vidioc_try_fmt_vid_cap (struct file *file, void *priv,
                                struct v4l2_format *vf)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int formatIdx;
 
         /* Find requested format in available ones */
@@ -1036,9 +986,7 @@ static int vidioc_try_fmt_vid_cap (struct file *file, void *priv,
 static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
                                struct v4l2_format *vf)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int ret;
 
         if( 0 != (ret=vidioc_try_fmt_vid_cap (file, priv, vf)) ) {
@@ -1066,9 +1014,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
 static ssize_t usbvision_v4l2_read(struct file *file, char __user *buf,
                       size_t count, loff_t *ppos)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int noblock = file->f_flags & O_NONBLOCK;
         unsigned long lock_flags;
 
@@ -1177,10 +1123,7 @@ static int usbvision_v4l2_mmap(struct file *file, struct vm_area_struct *vma)
                 start = vma->vm_start;
         void *pos;
         u32 i;
-
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
 
         PDEBUG(DBG_MMAP, "mmap");
 
@@ -1237,9 +1180,7 @@ static int usbvision_v4l2_mmap(struct file *file, struct vm_area_struct *vma)
  */
 static int usbvision_radio_open(struct inode *inode, struct file *file)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int errCode = 0;
 
         PDEBUG(DBG_IO, "%s:", __func__);
@@ -1289,9 +1230,7 @@ out:
 
 static int usbvision_radio_close(struct inode *inode, struct file *file)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int errCode = 0;
 
         PDEBUG(DBG_IO, "");
diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c
index feab12aa2c7b..f16aafe9cf14 100644
--- a/drivers/media/video/uvc/uvc_ctrl.c
+++ b/drivers/media/video/uvc/uvc_ctrl.c
@@ -83,6 +83,22 @@ static struct uvc_control_info uvc_ctrls[] = {
         },
         {
                 .entity         = UVC_GUID_UVC_PROCESSING,
+                .selector       = PU_WHITE_BALANCE_TEMPERATURE_CONTROL,
+                .index          = 6,
+                .size           = 2,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
+                                | UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_PROCESSING,
+                .selector       = PU_WHITE_BALANCE_COMPONENT_CONTROL,
+                .index          = 7,
+                .size           = 4,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
+                                | UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_PROCESSING,
                 .selector       = PU_BACKLIGHT_COMPENSATION_CONTROL,
                 .index          = 8,
                 .size           = 2,
@@ -114,6 +130,60 @@ static struct uvc_control_info uvc_ctrls[] = {
                                 | UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE,
         },
         {
+                .entity         = UVC_GUID_UVC_PROCESSING,
+                .selector       = PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL,
+                .index          = 12,
+                .size           = 1,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR
+                                | UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_PROCESSING,
+                .selector       = PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL,
+                .index          = 13,
+                .size           = 1,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR
+                                | UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_PROCESSING,
+                .selector       = PU_DIGITAL_MULTIPLIER_CONTROL,
+                .index          = 14,
+                .size           = 2,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
+                                | UVC_CONTROL_RESTORE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_PROCESSING,
+                .selector       = PU_DIGITAL_MULTIPLIER_LIMIT_CONTROL,
+                .index          = 15,
+                .size           = 2,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
+                                | UVC_CONTROL_RESTORE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_PROCESSING,
+                .selector       = PU_ANALOG_VIDEO_STANDARD_CONTROL,
+                .index          = 16,
+                .size           = 1,
+                .flags          = UVC_CONTROL_GET_CUR,
+        },
+        {
+                .entity         = UVC_GUID_UVC_PROCESSING,
+                .selector       = PU_ANALOG_LOCK_STATUS_CONTROL,
+                .index          = 17,
+                .size           = 1,
+                .flags          = UVC_CONTROL_GET_CUR,
+        },
+        {
+                .entity         = UVC_GUID_UVC_CAMERA,
+                .selector       = CT_SCANNING_MODE_CONTROL,
+                .index          = 0,
+                .size           = 1,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR
+                                | UVC_CONTROL_RESTORE,
+        },
+        {
                 .entity         = UVC_GUID_UVC_CAMERA,
                 .selector       = CT_AE_MODE_CONTROL,
                 .index          = 1,
@@ -140,6 +210,14 @@ static struct uvc_control_info uvc_ctrls[] = {
         },
         {
                 .entity         = UVC_GUID_UVC_CAMERA,
+                .selector       = CT_EXPOSURE_TIME_RELATIVE_CONTROL,
+                .index          = 4,
+                .size           = 1,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR
+                                | UVC_CONTROL_RESTORE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_CAMERA,
                 .selector       = CT_FOCUS_ABSOLUTE_CONTROL,
                 .index          = 5,
                 .size           = 2,
@@ -148,42 +226,90 @@ static struct uvc_control_info uvc_ctrls[] = {
         },
         {
                 .entity         = UVC_GUID_UVC_CAMERA,
-                .selector       = CT_FOCUS_AUTO_CONTROL,
-                .index          = 17,
-                .size           = 1,
-                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR
-                                | UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE,
+                .selector       = CT_FOCUS_RELATIVE_CONTROL,
+                .index          = 6,
+                .size           = 2,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
+                                | UVC_CONTROL_AUTO_UPDATE,
         },
         {
-                .entity         = UVC_GUID_UVC_PROCESSING,
-                .selector       = PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL,
-                .index          = 12,
+                .entity         = UVC_GUID_UVC_CAMERA,
+                .selector       = CT_IRIS_ABSOLUTE_CONTROL,
+                .index          = 7,
+                .size           = 2,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
+                                | UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_CAMERA,
+                .selector       = CT_IRIS_RELATIVE_CONTROL,
+                .index          = 8,
                 .size           = 1,
                 .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR
-                                | UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE,
+                                | UVC_CONTROL_AUTO_UPDATE,
         },
         {
-                .entity         = UVC_GUID_UVC_PROCESSING,
-                .selector       = PU_WHITE_BALANCE_TEMPERATURE_CONTROL,
-                .index          = 6,
+                .entity         = UVC_GUID_UVC_CAMERA,
+                .selector       = CT_ZOOM_ABSOLUTE_CONTROL,
+                .index          = 9,
                 .size           = 2,
                 .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
                                 | UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,
         },
         {
-                .entity         = UVC_GUID_UVC_PROCESSING,
-                .selector       = PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL,
+                .entity         = UVC_GUID_UVC_CAMERA,
+                .selector       = CT_ZOOM_RELATIVE_CONTROL,
+                .index          = 10,
+                .size           = 3,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
+                                | UVC_CONTROL_AUTO_UPDATE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_CAMERA,
+                .selector       = CT_PANTILT_ABSOLUTE_CONTROL,
+                .index          = 11,
+                .size           = 8,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
+                                | UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_CAMERA,
+                .selector       = CT_PANTILT_RELATIVE_CONTROL,
+                .index          = 12,
+                .size           = 4,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
+                                | UVC_CONTROL_AUTO_UPDATE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_CAMERA,
+                .selector       = CT_ROLL_ABSOLUTE_CONTROL,
                 .index          = 13,
+                .size           = 2,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
+                                | UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_CAMERA,
+                .selector       = CT_ROLL_RELATIVE_CONTROL,
+                .index          = 14,
+                .size           = 2,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
+                                | UVC_CONTROL_AUTO_UPDATE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_CAMERA,
+                .selector       = CT_FOCUS_AUTO_CONTROL,
+                .index          = 17,
                 .size           = 1,
                 .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR
                                 | UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE,
         },
         {
-                .entity         = UVC_GUID_UVC_PROCESSING,
-                .selector       = PU_WHITE_BALANCE_COMPONENT_CONTROL,
-                .index          = 7,
-                .size           = 4,
-                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
+                .entity         = UVC_GUID_UVC_CAMERA,
+                .selector       = CT_PRIVACY_CONTROL,
+                .index          = 18,
+                .size           = 1,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR
                                 | UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,
         },
 };
@@ -711,7 +837,17 @@ static int uvc_ctrl_commit_entity(struct uvc_device *dev,
 
         for (i = 0; i < entity->ncontrols; ++i) {
                 ctrl = &entity->controls[i];
-                if (ctrl->info == NULL || !ctrl->dirty)
+                if (ctrl->info == NULL)
+                        continue;
+
+                /* Reset the loaded flag for auto-update controls that were
+                 * marked as loaded in uvc_ctrl_get/uvc_ctrl_set to prevent
+                 * uvc_ctrl_get from using the cached value.
+                 */
+                if (ctrl->info->flags & UVC_CONTROL_AUTO_UPDATE)
+                        ctrl->loaded = 0;
+
+                if (!ctrl->dirty)
                         continue;
 
                 if (!rollback)
@@ -727,9 +863,6 @@ static int uvc_ctrl_commit_entity(struct uvc_device *dev,
                                uvc_ctrl_data(ctrl, UVC_CTRL_DATA_BACKUP),
                                ctrl->info->size);
 
-                if ((ctrl->info->flags & UVC_CONTROL_GET_CUR) == 0)
-                        ctrl->loaded = 0;
-
                 ctrl->dirty = 0;
 
                 if (ret < 0)
@@ -787,8 +920,7 @@ int uvc_ctrl_get(struct uvc_video_device *video,
                 if (ret < 0)
                         return ret;
 
-                if ((ctrl->info->flags & UVC_CONTROL_AUTO_UPDATE) == 0)
-                        ctrl->loaded = 1;
+                ctrl->loaded = 1;
         }
 
         xctrl->value = uvc_get_le_value(
@@ -839,8 +971,7 @@ int uvc_ctrl_set(struct uvc_video_device *video,
                                 return ret;
                 }
 
-                if ((ctrl->info->flags & UVC_CONTROL_AUTO_UPDATE) == 0)
-                        ctrl->loaded = 1;
+                ctrl->loaded = 1;
         }
 
         if (!ctrl->dirty) {
diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c
index 7e102034d38d..d7ad060640bc 100644
--- a/drivers/media/video/uvc/uvc_driver.c
+++ b/drivers/media/video/uvc/uvc_driver.c
@@ -1663,7 +1663,7 @@ static int uvc_suspend(struct usb_interface *intf, pm_message_t message)
         return uvc_video_suspend(&dev->video);
 }
 
-static int uvc_resume(struct usb_interface *intf)
+static int __uvc_resume(struct usb_interface *intf, int reset)
 {
         struct uvc_device *dev = usb_get_intfdata(intf);
         int ret;
@@ -1672,7 +1672,7 @@ static int uvc_resume(struct usb_interface *intf)
                 intf->cur_altsetting->desc.bInterfaceNumber);
 
         if (intf->cur_altsetting->desc.bInterfaceSubClass == SC_VIDEOCONTROL) {
-                if ((ret = uvc_ctrl_resume_device(dev)) < 0)
+                if (reset && (ret = uvc_ctrl_resume_device(dev)) < 0)
                         return ret;
 
                 return uvc_status_resume(dev);
@@ -1687,6 +1687,16 @@ static int uvc_resume(struct usb_interface *intf)
         return uvc_video_resume(&dev->video);
 }
 
+static int uvc_resume(struct usb_interface *intf)
+{
+        return __uvc_resume(intf, 0);
+}
+
+static int uvc_reset_resume(struct usb_interface *intf)
+{
+        return __uvc_resume(intf, 1);
+}
+
 /* ------------------------------------------------------------------------
  * Driver initialization and cleanup
  */
@@ -1902,6 +1912,24 @@ static struct usb_device_id uvc_ids[] = {
           .bInterfaceSubClass   = 1,
           .bInterfaceProtocol   = 0,
           .driver_info          = UVC_QUIRK_PROBE_MINMAX },
+        /* Compaq Presario B1200 - Bison Electronics */
+        { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
+                                | USB_DEVICE_ID_MATCH_INT_INFO,
+          .idVendor             = 0x5986,
+          .idProduct            = 0x0104,
+          .bInterfaceClass      = USB_CLASS_VIDEO,
+          .bInterfaceSubClass   = 1,
+          .bInterfaceProtocol   = 0,
+          .driver_info          = UVC_QUIRK_PROBE_MINMAX },
+        /* Acer Travelmate 7720 - Bison Electronics */
+        { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
+                                | USB_DEVICE_ID_MATCH_INT_INFO,
+          .idVendor             = 0x5986,
+          .idProduct            = 0x0105,
+          .bInterfaceClass      = USB_CLASS_VIDEO,
+          .bInterfaceSubClass   = 1,
+          .bInterfaceProtocol   = 0,
+          .driver_info          = UVC_QUIRK_PROBE_MINMAX },
         /* Medion Akoya Mini E1210 - Bison Electronics */
         { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
                                 | USB_DEVICE_ID_MATCH_INT_INFO,
@@ -1920,6 +1948,24 @@ static struct usb_device_id uvc_ids[] = {
           .bInterfaceSubClass   = 1,
           .bInterfaceProtocol   = 0,
           .driver_info          = UVC_QUIRK_PROBE_MINMAX },
+        /*  Fujitsu Amilo SI2636 - Bison Electronics */
+        { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
+                                | USB_DEVICE_ID_MATCH_INT_INFO,
+          .idVendor             = 0x5986,
+          .idProduct            = 0x0202,
+          .bInterfaceClass      = USB_CLASS_VIDEO,
+          .bInterfaceSubClass   = 1,
+          .bInterfaceProtocol   = 0,
+          .driver_info          = UVC_QUIRK_PROBE_MINMAX },
+        /*  Advent 4211 - Bison Electronics */
+        { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
+                                | USB_DEVICE_ID_MATCH_INT_INFO,
+          .idVendor             = 0x5986,
+          .idProduct            = 0x0203,
+          .bInterfaceClass      = USB_CLASS_VIDEO,
+          .bInterfaceSubClass   = 1,
+          .bInterfaceProtocol   = 0,
+          .driver_info          = UVC_QUIRK_PROBE_MINMAX },
         /* Bison Electronics */
         { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
                                 | USB_DEVICE_ID_MATCH_INT_INFO,
@@ -1952,6 +1998,7 @@ struct uvc_driver uvc_driver = {
                 .disconnect     = uvc_disconnect,
                 .suspend        = uvc_suspend,
                 .resume         = uvc_resume,
+                .reset_resume   = uvc_reset_resume,
                 .id_table       = uvc_ids,
                 .supports_autosuspend = 1,
         },
diff --git a/drivers/media/video/uvc/uvc_status.c b/drivers/media/video/uvc/uvc_status.c
index 75e678ac54eb..5d60b264d59a 100644
--- a/drivers/media/video/uvc/uvc_status.c
+++ b/drivers/media/video/uvc/uvc_status.c
@@ -177,9 +177,15 @@ int uvc_status_init(struct uvc_device *dev)
 
         uvc_input_init(dev);
 
+        dev->status = kzalloc(UVC_MAX_STATUS_SIZE, GFP_KERNEL);
+        if (dev->status == NULL)
+                return -ENOMEM;
+
         dev->int_urb = usb_alloc_urb(0, GFP_KERNEL);
-        if (dev->int_urb == NULL)
+        if (dev->int_urb == NULL) {
+                kfree(dev->status);
                 return -ENOMEM;
+        }
 
         pipe = usb_rcvintpipe(dev->udev, ep->desc.bEndpointAddress);
 
@@ -192,7 +198,7 @@ int uvc_status_init(struct uvc_device *dev)
                 interval = fls(interval) - 1;
 
         usb_fill_int_urb(dev->int_urb, dev->udev, pipe,
-                dev->status, sizeof dev->status, uvc_status_complete,
+                dev->status, UVC_MAX_STATUS_SIZE, uvc_status_complete,
                 dev, interval);
 
         return usb_submit_urb(dev->int_urb, GFP_KERNEL);
@@ -202,6 +208,7 @@ void uvc_status_cleanup(struct uvc_device *dev)
 {
         usb_kill_urb(dev->int_urb);
         usb_free_urb(dev->int_urb);
+        kfree(dev->status);
         uvc_input_cleanup(dev);
 }
 
diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c
index d7bd71be40a9..78e4c4e09d89 100644
--- a/drivers/media/video/uvc/uvc_v4l2.c
+++ b/drivers/media/video/uvc/uvc_v4l2.c
@@ -400,15 +400,13 @@ static int uvc_has_privileges(struct uvc_fh *handle)
 
 static int uvc_v4l2_open(struct inode *inode, struct file *file)
 {
-        struct video_device *vdev;
         struct uvc_video_device *video;
         struct uvc_fh *handle;
         int ret = 0;
 
         uvc_trace(UVC_TRACE_CALLS, "uvc_v4l2_open\n");
         mutex_lock(&uvc_driver.open_mutex);
-        vdev = video_devdata(file);
-        video = video_get_drvdata(vdev);
+        video = video_drvdata(file);
 
         if (video->dev->state & UVC_DEV_DISCONNECTED) {
                 ret = -ENODEV;
@@ -440,8 +438,7 @@ done:
 
 static int uvc_v4l2_release(struct inode *inode, struct file *file)
 {
-        struct video_device *vdev = video_devdata(file);
-        struct uvc_video_device *video = video_get_drvdata(vdev);
+        struct uvc_video_device *video = video_drvdata(file);
         struct uvc_fh *handle = (struct uvc_fh *)file->private_data;
 
         uvc_trace(UVC_TRACE_CALLS, "uvc_v4l2_release\n");
@@ -845,10 +842,6 @@ static int uvc_v4l2_do_ioctl(struct inode *inode, struct file *file,
                 if (ret < 0)
                         return ret;
 
-                if (!(video->streaming->cur_format->flags &
-                    UVC_FMT_FLAG_COMPRESSED))
-                        video->queue.flags |= UVC_QUEUE_DROP_INCOMPLETE;
-
                 rb->count = ret;
                 ret = 0;
                 break;
@@ -1031,8 +1024,7 @@ static struct vm_operations_struct uvc_vm_ops = {
 
 static int uvc_v4l2_mmap(struct file *file, struct vm_area_struct *vma)
 {
-        struct video_device *vdev = video_devdata(file);
-        struct uvc_video_device *video = video_get_drvdata(vdev);
+        struct uvc_video_device *video = video_drvdata(file);
         struct uvc_buffer *uninitialized_var(buffer);
         struct page *page;
         unsigned long addr, start, size;
@@ -1085,8 +1077,7 @@ done:
 
 static unsigned int uvc_v4l2_poll(struct file *file, poll_table *wait)
 {
-        struct video_device *vdev = video_devdata(file);
-        struct uvc_video_device *video = video_get_drvdata(vdev);
+        struct uvc_video_device *video = video_drvdata(file);
 
         uvc_trace(UVC_TRACE_CALLS, "uvc_v4l2_poll\n");
 
diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c
index 6854ac78a161..b7bb23820d80 100644
--- a/drivers/media/video/uvc/uvc_video.c
+++ b/drivers/media/video/uvc/uvc_video.c
@@ -455,7 +455,8 @@ static void uvc_video_decode_isoc(struct urb *urb,
                         urb->iso_frame_desc[i].actual_length - ret);
 
                 /* Process the header again. */
-                uvc_video_decode_end(video, buf, mem, ret);
+                uvc_video_decode_end(video, buf, mem,
+                        urb->iso_frame_desc[i].actual_length);
 
                 if (buf->state == UVC_BUF_STATE_DONE ||
                     buf->state == UVC_BUF_STATE_ERROR)
@@ -512,7 +513,7 @@ static void uvc_video_decode_bulk(struct urb *urb,
             video->bulk.payload_size >= video->bulk.max_payload_size) {
                 if (!video->bulk.skip_payload && buf != NULL) {
                         uvc_video_decode_end(video, buf, video->bulk.header,
-                                video->bulk.header_size);
+                                video->bulk.payload_size);
                         if (buf->state == UVC_BUF_STATE_DONE ||
                             buf->state == UVC_BUF_STATE_ERROR)
                                 buf = uvc_queue_next_buffer(&video->queue, buf);
@@ -655,7 +656,7 @@ static int uvc_init_video_isoc(struct uvc_video_device *video,
         if (size > UVC_MAX_FRAME_SIZE)
                 return -EINVAL;
 
-        npackets = (size + psize - 1) / psize;
+        npackets = DIV_ROUND_UP(size, psize);
         if (npackets > UVC_MAX_ISO_PACKETS)
                 npackets = UVC_MAX_ISO_PACKETS;
 
@@ -970,6 +971,11 @@ int uvc_video_enable(struct uvc_video_device *video, int enable)
                 return 0;
         }
 
+        if (video->streaming->cur_format->flags & UVC_FMT_FLAG_COMPRESSED)
+                video->queue.flags &= ~UVC_QUEUE_DROP_INCOMPLETE;
+        else
+                video->queue.flags |= UVC_QUEUE_DROP_INCOMPLETE;
+
         if ((ret = uvc_queue_enable(&video->queue, 1)) < 0)
                 return ret;
 
diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h
index bafe3406e305..9a6bc1aafb16 100644
--- a/drivers/media/video/uvc/uvcvideo.h
+++ b/drivers/media/video/uvc/uvcvideo.h
@@ -303,6 +303,8 @@ struct uvc_xu_control {
 #define UVC_MAX_FRAME_SIZE      (16*1024*1024)
 /* Maximum number of video buffers. */
 #define UVC_MAX_VIDEO_BUFFERS   32
+/* Maximum status buffer size in bytes of interrupt URB. */
+#define UVC_MAX_STATUS_SIZE     16
 
 #define UVC_CTRL_CONTROL_TIMEOUT        300
 #define UVC_CTRL_STREAMING_TIMEOUT      1000
@@ -634,7 +636,7 @@ struct uvc_device {
         /* Status Interrupt Endpoint */
         struct usb_host_endpoint *int_ep;
         struct urb *int_urb;
-        __u8 status[16];
+        __u8 *status;
         struct input_dev *input;
 
         /* Video Streaming interfaces */
diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c
index 79937d1031fc..928cb4037372 100644
--- a/drivers/media/video/v4l1-compat.c
+++ b/drivers/media/video/v4l1-compat.c
@@ -36,10 +36,6 @@
 #include <asm/system.h>
 #include <asm/pgtable.h>
 
-#ifdef CONFIG_KMOD
-#include <linux/kmod.h>
-#endif
-
 static unsigned int debug;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "enable debug messages");
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index 88ca13104417..846763d7349e 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -60,10 +60,6 @@
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
 
-#ifdef CONFIG_KMOD
-#include <linux/kmod.h>
-#endif
-
 #include <linux/videodev2.h>
 
 MODULE_AUTHOR("Bill Dirks, Justin Schoeman, Gerd Knorr");
@@ -187,9 +183,11 @@ const char **v4l2_ctrl_get_menu(u32 id)
                 NULL
         };
         static const char *mpeg_audio_encoding[] = {
-                "Layer I",
-                "Layer II",
-                "Layer III",
+                "MPEG-1/2 Layer I",
+                "MPEG-1/2 Layer II",
+                "MPEG-1/2 Layer III",
+                "MPEG-2/4 AAC",
+                "AC-3",
                 NULL
         };
         static const char *mpeg_audio_l1_bitrate[] = {
@@ -243,6 +241,28 @@ const char **v4l2_ctrl_get_menu(u32 id)
                 "320 kbps",
                 NULL
         };
+        static const char *mpeg_audio_ac3_bitrate[] = {
+                "32 kbps",
+                "40 kbps",
+                "48 kbps",
+                "56 kbps",
+                "64 kbps",
+                "80 kbps",
+                "96 kbps",
+                "112 kbps",
+                "128 kbps",
+                "160 kbps",
+                "192 kbps",
+                "224 kbps",
+                "256 kbps",
+                "320 kbps",
+                "384 kbps",
+                "448 kbps",
+                "512 kbps",
+                "576 kbps",
+                "640 kbps",
+                NULL
+        };
         static const char *mpeg_audio_mode[] = {
                 "Stereo",
                 "Joint Stereo",
@@ -271,6 +291,7 @@ const char **v4l2_ctrl_get_menu(u32 id)
         static const char *mpeg_video_encoding[] = {
                 "MPEG-1",
                 "MPEG-2",
+                "MPEG-4 AVC",
                 NULL
         };
         static const char *mpeg_video_aspect[] = {
@@ -311,6 +332,8 @@ const char **v4l2_ctrl_get_menu(u32 id)
                         return mpeg_audio_l2_bitrate;
                 case V4L2_CID_MPEG_AUDIO_L3_BITRATE:
                         return mpeg_audio_l3_bitrate;
+                case V4L2_CID_MPEG_AUDIO_AC3_BITRATE:
+                        return mpeg_audio_ac3_bitrate;
                 case V4L2_CID_MPEG_AUDIO_MODE:
                         return mpeg_audio_mode;
                 case V4L2_CID_MPEG_AUDIO_MODE_EXTENSION:
@@ -335,62 +358,73 @@ const char **v4l2_ctrl_get_menu(u32 id)
 }
 EXPORT_SYMBOL(v4l2_ctrl_get_menu);
 
-/* Fill in a struct v4l2_queryctrl */
-int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 step, s32 def)
+/* Return the control name. */
+const char *v4l2_ctrl_get_name(u32 id)
 {
-        const char *name;
-
-        qctrl->flags = 0;
-        switch (qctrl->id) {
+        switch (id) {
         /* USER controls */
-        case V4L2_CID_USER_CLASS:       name = "User Controls"; break;
-        case V4L2_CID_AUDIO_VOLUME:     name = "Volume"; break;
-        case V4L2_CID_AUDIO_MUTE:       name = "Mute"; break;
-        case V4L2_CID_AUDIO_BALANCE:    name = "Balance"; break;
-        case V4L2_CID_AUDIO_BASS:       name = "Bass"; break;
-        case V4L2_CID_AUDIO_TREBLE:     name = "Treble"; break;
-        case V4L2_CID_AUDIO_LOUDNESS:   name = "Loudness"; break;
-        case V4L2_CID_BRIGHTNESS:       name = "Brightness"; break;
-        case V4L2_CID_CONTRAST:         name = "Contrast"; break;
-        case V4L2_CID_SATURATION:       name = "Saturation"; break;
-        case V4L2_CID_HUE:              name = "Hue"; break;
+        case V4L2_CID_USER_CLASS:       return "User Controls";
+        case V4L2_CID_AUDIO_VOLUME:     return "Volume";
+        case V4L2_CID_AUDIO_MUTE:       return "Mute";
+        case V4L2_CID_AUDIO_BALANCE:    return "Balance";
+        case V4L2_CID_AUDIO_BASS:       return "Bass";
+        case V4L2_CID_AUDIO_TREBLE:     return "Treble";
+        case V4L2_CID_AUDIO_LOUDNESS:   return "Loudness";
+        case V4L2_CID_BRIGHTNESS:       return "Brightness";
+        case V4L2_CID_CONTRAST:         return "Contrast";
+        case V4L2_CID_SATURATION:       return "Saturation";
+        case V4L2_CID_HUE:              return "Hue";
 
         /* MPEG controls */
-        case V4L2_CID_MPEG_CLASS:               name = "MPEG Encoder Controls"; break;
-        case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ: name = "Audio Sampling Frequency"; break;
-        case V4L2_CID_MPEG_AUDIO_ENCODING:      name = "Audio Encoding Layer"; break;
-        case V4L2_CID_MPEG_AUDIO_L1_BITRATE:    name = "Audio Layer I Bitrate"; break;
-        case V4L2_CID_MPEG_AUDIO_L2_BITRATE:    name = "Audio Layer II Bitrate"; break;
-        case V4L2_CID_MPEG_AUDIO_L3_BITRATE:    name = "Audio Layer III Bitrate"; break;
-        case V4L2_CID_MPEG_AUDIO_MODE:          name = "Audio Stereo Mode"; break;
-        case V4L2_CID_MPEG_AUDIO_MODE_EXTENSION: name = "Audio Stereo Mode Extension"; break;
-        case V4L2_CID_MPEG_AUDIO_EMPHASIS:      name = "Audio Emphasis"; break;
-        case V4L2_CID_MPEG_AUDIO_CRC:           name = "Audio CRC"; break;
-        case V4L2_CID_MPEG_AUDIO_MUTE:          name = "Audio Mute"; break;
-        case V4L2_CID_MPEG_VIDEO_ENCODING:      name = "Video Encoding"; break;
-        case V4L2_CID_MPEG_VIDEO_ASPECT:        name = "Video Aspect"; break;
-        case V4L2_CID_MPEG_VIDEO_B_FRAMES:      name = "Video B Frames"; break;
-        case V4L2_CID_MPEG_VIDEO_GOP_SIZE:      name = "Video GOP Size"; break;
-        case V4L2_CID_MPEG_VIDEO_GOP_CLOSURE:   name = "Video GOP Closure"; break;
-        case V4L2_CID_MPEG_VIDEO_PULLDOWN:      name = "Video Pulldown"; break;
-        case V4L2_CID_MPEG_VIDEO_BITRATE_MODE:  name = "Video Bitrate Mode"; break;
-        case V4L2_CID_MPEG_VIDEO_BITRATE:       name = "Video Bitrate"; break;
-        case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK:  name = "Video Peak Bitrate"; break;
-        case V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION: name = "Video Temporal Decimation"; break;
-        case V4L2_CID_MPEG_VIDEO_MUTE:          name = "Video Mute"; break;
-        case V4L2_CID_MPEG_VIDEO_MUTE_YUV:      name = "Video Mute YUV"; break;
-        case V4L2_CID_MPEG_STREAM_TYPE:         name = "Stream Type"; break;
-        case V4L2_CID_MPEG_STREAM_PID_PMT:      name = "Stream PMT Program ID"; break;
-        case V4L2_CID_MPEG_STREAM_PID_AUDIO:    name = "Stream Audio Program ID"; break;
-        case V4L2_CID_MPEG_STREAM_PID_VIDEO:    name = "Stream Video Program ID"; break;
-        case V4L2_CID_MPEG_STREAM_PID_PCR:      name = "Stream PCR Program ID"; break;
-        case V4L2_CID_MPEG_STREAM_PES_ID_AUDIO: name = "Stream PES Audio ID"; break;
-        case V4L2_CID_MPEG_STREAM_PES_ID_VIDEO: name = "Stream PES Video ID"; break;
-        case V4L2_CID_MPEG_STREAM_VBI_FMT:      name = "Stream VBI Format"; break;
+        case V4L2_CID_MPEG_CLASS:               return "MPEG Encoder Controls";
+        case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ: return "Audio Sampling Frequency";
+        case V4L2_CID_MPEG_AUDIO_ENCODING:      return "Audio Encoding";
+        case V4L2_CID_MPEG_AUDIO_L1_BITRATE:    return "Audio Layer I Bitrate";
+        case V4L2_CID_MPEG_AUDIO_L2_BITRATE:    return "Audio Layer II Bitrate";
+        case V4L2_CID_MPEG_AUDIO_L3_BITRATE:    return "Audio Layer III Bitrate";
+        case V4L2_CID_MPEG_AUDIO_AAC_BITRATE:   return "Audio AAC Bitrate";
+        case V4L2_CID_MPEG_AUDIO_AC3_BITRATE:   return "Audio AC-3 Bitrate";
+        case V4L2_CID_MPEG_AUDIO_MODE:          return "Audio Stereo Mode";
+        case V4L2_CID_MPEG_AUDIO_MODE_EXTENSION: return "Audio Stereo Mode Extension";
+        case V4L2_CID_MPEG_AUDIO_EMPHASIS:      return "Audio Emphasis";
+        case V4L2_CID_MPEG_AUDIO_CRC:           return "Audio CRC";
+        case V4L2_CID_MPEG_AUDIO_MUTE:          return "Audio Mute";
+        case V4L2_CID_MPEG_VIDEO_ENCODING:      return "Video Encoding";
+        case V4L2_CID_MPEG_VIDEO_ASPECT:        return "Video Aspect";
+        case V4L2_CID_MPEG_VIDEO_B_FRAMES:      return "Video B Frames";
+        case V4L2_CID_MPEG_VIDEO_GOP_SIZE:      return "Video GOP Size";
+        case V4L2_CID_MPEG_VIDEO_GOP_CLOSURE:   return "Video GOP Closure";
+        case V4L2_CID_MPEG_VIDEO_PULLDOWN:      return "Video Pulldown";
+        case V4L2_CID_MPEG_VIDEO_BITRATE_MODE:  return "Video Bitrate Mode";
+        case V4L2_CID_MPEG_VIDEO_BITRATE:       return "Video Bitrate";
+        case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK:  return "Video Peak Bitrate";
+        case V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION: return "Video Temporal Decimation";
+        case V4L2_CID_MPEG_VIDEO_MUTE:          return "Video Mute";
+        case V4L2_CID_MPEG_VIDEO_MUTE_YUV:      return "Video Mute YUV";
+        case V4L2_CID_MPEG_STREAM_TYPE:         return "Stream Type";
+        case V4L2_CID_MPEG_STREAM_PID_PMT:      return "Stream PMT Program ID";
+        case V4L2_CID_MPEG_STREAM_PID_AUDIO:    return "Stream Audio Program ID";
+        case V4L2_CID_MPEG_STREAM_PID_VIDEO:    return "Stream Video Program ID";
+        case V4L2_CID_MPEG_STREAM_PID_PCR:      return "Stream PCR Program ID";
+        case V4L2_CID_MPEG_STREAM_PES_ID_AUDIO: return "Stream PES Audio ID";
+        case V4L2_CID_MPEG_STREAM_PES_ID_VIDEO: return "Stream PES Video ID";
+        case V4L2_CID_MPEG_STREAM_VBI_FMT:      return "Stream VBI Format";
 
         default:
-                return -EINVAL;
+                return NULL;
         }
+}
+EXPORT_SYMBOL(v4l2_ctrl_get_name);
+
+/* Fill in a struct v4l2_queryctrl */
+int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 step, s32 def)
+{
+        const char *name = v4l2_ctrl_get_name(qctrl->id);
+
+        qctrl->flags = 0;
+        if (name == NULL)
+                return -EINVAL;
+
         switch (qctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
         case V4L2_CID_AUDIO_LOUDNESS:
@@ -407,6 +441,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste
         case V4L2_CID_MPEG_AUDIO_L1_BITRATE:
         case V4L2_CID_MPEG_AUDIO_L2_BITRATE:
         case V4L2_CID_MPEG_AUDIO_L3_BITRATE:
+        case V4L2_CID_MPEG_AUDIO_AC3_BITRATE:
         case V4L2_CID_MPEG_AUDIO_MODE:
         case V4L2_CID_MPEG_AUDIO_MODE_EXTENSION:
         case V4L2_CID_MPEG_AUDIO_EMPHASIS:
@@ -493,7 +528,7 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)
         case V4L2_CID_MPEG_AUDIO_ENCODING:
                 return v4l2_ctrl_query_fill(qctrl,
                                 V4L2_MPEG_AUDIO_ENCODING_LAYER_1,
-                                V4L2_MPEG_AUDIO_ENCODING_LAYER_3, 1,
+                                V4L2_MPEG_AUDIO_ENCODING_AC3, 1,
                                 V4L2_MPEG_AUDIO_ENCODING_LAYER_2);
         case V4L2_CID_MPEG_AUDIO_L1_BITRATE:
                 return v4l2_ctrl_query_fill(qctrl,
@@ -510,6 +545,13 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)
                                 V4L2_MPEG_AUDIO_L3_BITRATE_32K,
                                 V4L2_MPEG_AUDIO_L3_BITRATE_320K, 1,
                                 V4L2_MPEG_AUDIO_L3_BITRATE_192K);
+        case V4L2_CID_MPEG_AUDIO_AAC_BITRATE:
+                return v4l2_ctrl_query_fill(qctrl, 0, 6400, 1, 3200000);
+        case V4L2_CID_MPEG_AUDIO_AC3_BITRATE:
+                return v4l2_ctrl_query_fill(qctrl,
+                                V4L2_MPEG_AUDIO_AC3_BITRATE_32K,
+                                V4L2_MPEG_AUDIO_AC3_BITRATE_640K, 1,
+                                V4L2_MPEG_AUDIO_AC3_BITRATE_384K);
         case V4L2_CID_MPEG_AUDIO_MODE:
                 return v4l2_ctrl_query_fill(qctrl,
                                 V4L2_MPEG_AUDIO_MODE_STEREO,
@@ -535,7 +577,7 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)
         case V4L2_CID_MPEG_VIDEO_ENCODING:
                 return v4l2_ctrl_query_fill(qctrl,
                                 V4L2_MPEG_VIDEO_ENCODING_MPEG_1,
-                                V4L2_MPEG_VIDEO_ENCODING_MPEG_2, 1,
+                                V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC, 1,
                                 V4L2_MPEG_VIDEO_ENCODING_MPEG_2);
         case V4L2_CID_MPEG_VIDEO_ASPECT:
                 return v4l2_ctrl_query_fill(qctrl,
@@ -594,12 +636,17 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)
 EXPORT_SYMBOL(v4l2_ctrl_query_fill_std);
 
 /* Fill in a struct v4l2_querymenu based on the struct v4l2_queryctrl and
-   the menu. The qctrl pointer may be NULL, in which case it is ignored. */
+   the menu. The qctrl pointer may be NULL, in which case it is ignored.
+   If menu_items is NULL, then the menu items are retrieved using
+   v4l2_ctrl_get_menu. */
 int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu, struct v4l2_queryctrl *qctrl,
                const char **menu_items)
 {
         int i;
 
+        qmenu->reserved = 0;
+        if (menu_items == NULL)
+                menu_items = v4l2_ctrl_get_menu(qmenu->id);
         if (menu_items == NULL ||
             (qctrl && (qmenu->index < qctrl->minimum || qmenu->index > qctrl->maximum)))
                 return -EINVAL;
@@ -607,11 +654,31 @@ int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu, struct v4l2_queryctrl *qc
         if (menu_items[i] == NULL || menu_items[i][0] == '\0')
                 return -EINVAL;
         snprintf(qmenu->name, sizeof(qmenu->name), menu_items[qmenu->index]);
-        qmenu->reserved = 0;
         return 0;
 }
 EXPORT_SYMBOL(v4l2_ctrl_query_menu);
 
+/* Fill in a struct v4l2_querymenu based on the specified array of valid
+   menu items (terminated by V4L2_CTRL_MENU_IDS_END).
+   Use this if there are 'holes' in the list of valid menu items. */
+int v4l2_ctrl_query_menu_valid_items(struct v4l2_querymenu *qmenu, const u32 *ids)
+{
+        const char **menu_items = v4l2_ctrl_get_menu(qmenu->id);
+
+        qmenu->reserved = 0;
+        if (menu_items == NULL || ids == NULL)
+                return -EINVAL;
+        while (*ids != V4L2_CTRL_MENU_IDS_END) {
+                if (*ids++ == qmenu->index) {
+                        snprintf(qmenu->name, sizeof(qmenu->name),
+                                       menu_items[qmenu->index]);
+                        return 0;
+                }
+        }
+        return -EINVAL;
+}
+EXPORT_SYMBOL(v4l2_ctrl_query_menu_valid_items);
+
 /* ctrl_classes points to an array of u32 pointers, the last element is
    a NULL pointer. Each u32 array is a 0-terminated array of control IDs.
    Each array must be sorted low to high and belong to the same control
diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
index 155fdec9ac7d..ccd6566a515e 100644
--- a/drivers/media/video/v4l2-dev.c
+++ b/drivers/media/video/v4l2-dev.c
@@ -42,6 +42,7 @@ static ssize_t show_index(struct device *cd,
                          struct device_attribute *attr, char *buf)
 {
         struct video_device *vfd = container_of(cd, struct video_device, dev);
+
         return sprintf(buf, "%i\n", vfd->index);
 }
 
@@ -49,6 +50,7 @@ static ssize_t show_name(struct device *cd,
                          struct device_attribute *attr, char *buf)
 {
         struct video_device *vfd = container_of(cd, struct video_device, dev);
+
         return sprintf(buf, "%.*s\n", (int)sizeof(vfd->name), vfd->name);
 }
 
@@ -58,12 +60,16 @@ static struct device_attribute video_device_attrs[] = {
         __ATTR_NULL
 };
 
+/*
+ *      Active devices
+ */
+static struct video_device *video_device[VIDEO_NUM_DEVICES];
+static DEFINE_MUTEX(videodev_lock);
+static DECLARE_BITMAP(video_nums[VFL_TYPE_MAX], VIDEO_NUM_DEVICES);
+
 struct video_device *video_device_alloc(void)
 {
-        struct video_device *vfd;
-
-        vfd = kzalloc(sizeof(*vfd), GFP_KERNEL);
-        return vfd;
+        return kzalloc(sizeof(struct video_device), GFP_KERNEL);
 }
 EXPORT_SYMBOL(video_device_alloc);
 
@@ -73,16 +79,52 @@ void video_device_release(struct video_device *vfd)
 }
 EXPORT_SYMBOL(video_device_release);
 
+void video_device_release_empty(struct video_device *vfd)
+{
+        /* Do nothing */
+        /* Only valid when the video_device struct is a static. */
+}
+EXPORT_SYMBOL(video_device_release_empty);
+
+/* Called when the last user of the character device is gone. */
+static void v4l2_chardev_release(struct kobject *kobj)
+{
+        struct video_device *vfd = container_of(kobj, struct video_device, cdev.kobj);
+
+        mutex_lock(&videodev_lock);
+        if (video_device[vfd->minor] != vfd) {
+                mutex_unlock(&videodev_lock);
+                BUG();
+                return;
+        }
+
+        /* Free up this device for reuse */
+        video_device[vfd->minor] = NULL;
+        clear_bit(vfd->num, video_nums[vfd->vfl_type]);
+        mutex_unlock(&videodev_lock);
+
+        /* Release the character device */
+        vfd->cdev_release(kobj);
+        /* Release video_device and perform other
+           cleanups as needed. */
+        if (vfd->release)
+                vfd->release(vfd);
+}
+
+/* The new kobj_type for the character device */
+static struct kobj_type v4l2_ktype_cdev_default = {
+        .release = v4l2_chardev_release,
+};
+
 static void video_release(struct device *cd)
 {
         struct video_device *vfd = container_of(cd, struct video_device, dev);
 
-#if 1
-        /* needed until all drivers are fixed */
-        if (!vfd->release)
-                return;
-#endif
-        vfd->release(vfd);
+        /* It's now safe to delete the char device.
+           This will either trigger the v4l2_chardev_release immediately (if
+           the refcount goes to 0) or later when the last user of the
+           character device closes it. */
+        cdev_del(&vfd->cdev);
 }
 
 static struct class video_class = {
@@ -91,87 +133,12 @@ static struct class video_class = {
         .dev_release = video_release,
 };
 
-/*
- *      Active devices
- */
-
-static struct video_device *video_device[VIDEO_NUM_DEVICES];
-static DEFINE_MUTEX(videodev_lock);
-
 struct video_device *video_devdata(struct file *file)
 {
         return video_device[iminor(file->f_path.dentry->d_inode)];
 }
 EXPORT_SYMBOL(video_devdata);
 
-/*
- *      Open a video device - FIXME: Obsoleted
- */
-static int video_open(struct inode *inode, struct file *file)
-{
-        unsigned int minor = iminor(inode);
-        int err = 0;
-        struct video_device *vfl;
-        const struct file_operations *old_fops;
-
-        if (minor >= VIDEO_NUM_DEVICES)
-                return -ENODEV;
-        lock_kernel();
-        mutex_lock(&videodev_lock);
-        vfl = video_device[minor];
-        if (vfl == NULL) {
-                mutex_unlock(&videodev_lock);
-                request_module("char-major-%d-%d", VIDEO_MAJOR, minor);
-                mutex_lock(&videodev_lock);
-                vfl = video_device[minor];
-                if (vfl == NULL) {
-                        mutex_unlock(&videodev_lock);
-                        unlock_kernel();
-                        return -ENODEV;
-                }
-        }
-        old_fops = file->f_op;
-        file->f_op = fops_get(vfl->fops);
-        if (file->f_op->open)
-                err = file->f_op->open(inode, file);
-        if (err) {
-                fops_put(file->f_op);
-                file->f_op = fops_get(old_fops);
-        }
-        fops_put(old_fops);
-        mutex_unlock(&videodev_lock);
-        unlock_kernel();
-        return err;
-}
-
-/*
- * open/release helper functions -- handle exclusive opens
- * Should be removed soon
- */
-int video_exclusive_open(struct inode *inode, struct file *file)
-{
-        struct video_device *vfl = video_devdata(file);
-        int retval = 0;
-
-        mutex_lock(&vfl->lock);
-        if (vfl->users)
-                retval = -EBUSY;
-        else
-                vfl->users++;
-        mutex_unlock(&vfl->lock);
-        return retval;
-}
-EXPORT_SYMBOL(video_exclusive_open);
-
-int video_exclusive_release(struct inode *inode, struct file *file)
-{
-        struct video_device *vfl = video_devdata(file);
-
-        vfl->users--;
-        return 0;
-}
-EXPORT_SYMBOL(video_exclusive_release);
-
 /**
  * get_index - assign stream number based on parent device
  * @vdev: video_device to assign index number to, vdev->dev should be assigned
@@ -252,33 +219,29 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
                                         int index)
 {
         int i = 0;
-        int base;
-        int end;
         int ret;
-        char *name_base;
+        int minor_offset = 0;
+        int minor_cnt = VIDEO_NUM_DEVICES;
+        const char *name_base;
+        void *priv = video_get_drvdata(vfd);
+
+        /* the release callback MUST be present */
+        BUG_ON(!vfd->release);
 
         if (vfd == NULL)
                 return -EINVAL;
 
         switch (type) {
         case VFL_TYPE_GRABBER:
-                base = MINOR_VFL_TYPE_GRABBER_MIN;
-                end = MINOR_VFL_TYPE_GRABBER_MAX+1;
                 name_base = "video";
                 break;
         case VFL_TYPE_VTX:
-                base = MINOR_VFL_TYPE_VTX_MIN;
-                end = MINOR_VFL_TYPE_VTX_MAX+1;
                 name_base = "vtx";
                 break;
         case VFL_TYPE_VBI:
-                base = MINOR_VFL_TYPE_VBI_MIN;
-                end = MINOR_VFL_TYPE_VBI_MAX+1;
                 name_base = "vbi";
                 break;
         case VFL_TYPE_RADIO:
-                base = MINOR_VFL_TYPE_RADIO_MIN;
-                end = MINOR_VFL_TYPE_RADIO_MAX+1;
                 name_base = "radio";
                 break;
         default:
@@ -287,28 +250,70 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
                 return -EINVAL;
         }
 
+        vfd->vfl_type = type;
+
+#ifdef CONFIG_VIDEO_FIXED_MINOR_RANGES
+        /* Keep the ranges for the first four types for historical
+         * reasons.
+         * Newer devices (not yet in place) should use the range
+         * of 128-191 and just pick the first free minor there
+         * (new style). */
+        switch (type) {
+        case VFL_TYPE_GRABBER:
+                minor_offset = 0;
+                minor_cnt = 64;
+                break;
+        case VFL_TYPE_RADIO:
+                minor_offset = 64;
+                minor_cnt = 64;
+                break;
+        case VFL_TYPE_VTX:
+                minor_offset = 192;
+                minor_cnt = 32;
+                break;
+        case VFL_TYPE_VBI:
+                minor_offset = 224;
+                minor_cnt = 32;
+                break;
+        default:
+                minor_offset = 128;
+                minor_cnt = 64;
+                break;
+        }
+#endif
+
+        /* Initialize the character device */
+        cdev_init(&vfd->cdev, vfd->fops);
+        vfd->cdev.owner = vfd->fops->owner;
         /* pick a minor number */
         mutex_lock(&videodev_lock);
-        if (nr >= 0  &&  nr < end-base) {
-                /* use the one the driver asked for */
-                i = base + nr;
-                if (NULL != video_device[i]) {
-                        mutex_unlock(&videodev_lock);
-                        return -ENFILE;
-                }
-        } else {
-                /* use first free */
-                for (i = base; i < end; i++)
-                        if (NULL == video_device[i])
-                                break;
-                if (i == end) {
-                        mutex_unlock(&videodev_lock);
-                        return -ENFILE;
-                }
+        nr = find_next_zero_bit(video_nums[type], minor_cnt, nr == -1 ? 0 : nr);
+        if (nr == minor_cnt)
+                nr = find_first_zero_bit(video_nums[type], minor_cnt);
+        if (nr == minor_cnt) {
+                printk(KERN_ERR "could not get a free kernel number\n");
+                mutex_unlock(&videodev_lock);
+                return -ENFILE;
         }
-        video_device[i] = vfd;
-        vfd->vfl_type = type;
-        vfd->minor = i;
+#ifdef CONFIG_VIDEO_FIXED_MINOR_RANGES
+        /* 1-on-1 mapping of kernel number to minor number */
+        i = nr;
+#else
+        /* The kernel number and minor numbers are independent */
+        for (i = 0; i < VIDEO_NUM_DEVICES; i++)
+                if (video_device[i] == NULL)
+                        break;
+        if (i == VIDEO_NUM_DEVICES) {
+                mutex_unlock(&videodev_lock);
+                printk(KERN_ERR "could not get a free minor\n");
+                return -ENFILE;
+        }
+#endif
+        vfd->minor = i + minor_offset;
+        vfd->num = nr;
+        set_bit(nr, video_nums[type]);
+        BUG_ON(video_device[vfd->minor]);
+        video_device[vfd->minor] = vfd;
 
         ret = get_index(vfd, index);
         vfd->index = ret;
@@ -320,35 +325,41 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
                 goto fail_minor;
         }
 
-        mutex_init(&vfd->lock);
-
+        ret = cdev_add(&vfd->cdev, MKDEV(VIDEO_MAJOR, vfd->minor), 1);
+        if (ret < 0) {
+                printk(KERN_ERR "%s: cdev_add failed\n", __func__);
+                goto fail_minor;
+        }
         /* sysfs class */
-        memset(&vfd->dev, 0x00, sizeof(vfd->dev));
+        memset(&vfd->dev, 0, sizeof(vfd->dev));
+        /* The memset above cleared the device's drvdata, so
+           put back the copy we made earlier. */
+        video_set_drvdata(vfd, priv);
         vfd->dev.class = &video_class;
         vfd->dev.devt = MKDEV(VIDEO_MAJOR, vfd->minor);
         if (vfd->parent)
                 vfd->dev.parent = vfd->parent;
-        sprintf(vfd->dev.bus_id, "%s%d", name_base, i - base);
+        sprintf(vfd->dev.bus_id, "%s%d", name_base, nr);
         ret = device_register(&vfd->dev);
         if (ret < 0) {
                 printk(KERN_ERR "%s: device_register failed\n", __func__);
-                goto fail_minor;
+                goto del_cdev;
         }
-
-#if 1
-        /* needed until all drivers are fixed */
-        if (!vfd->release)
-                printk(KERN_WARNING "videodev: \"%s\" has no release callback. "
-                       "Please fix your driver for proper sysfs support, see "
-                       "http://lwn.net/Articles/36850/\n", vfd->name);
-#endif
+        /* Remember the cdev's release function */
+        vfd->cdev_release = vfd->cdev.kobj.ktype->release;
+        /* Install our own */
+        vfd->cdev.kobj.ktype = &v4l2_ktype_cdev_default;
         return 0;
 
+del_cdev:
+        cdev_del(&vfd->cdev);
+
 fail_minor:
         mutex_lock(&videodev_lock);
         video_device[vfd->minor] = NULL;
-        vfd->minor = -1;
+        clear_bit(vfd->num, video_nums[type]);
         mutex_unlock(&videodev_lock);
+        vfd->minor = -1;
         return ret;
 }
 EXPORT_SYMBOL(video_register_device_index);
@@ -363,42 +374,29 @@ EXPORT_SYMBOL(video_register_device_index);
 
 void video_unregister_device(struct video_device *vfd)
 {
-        mutex_lock(&videodev_lock);
-        if (video_device[vfd->minor] != vfd)
-                panic("videodev: bad unregister");
-
-        video_device[vfd->minor] = NULL;
         device_unregister(&vfd->dev);
-        mutex_unlock(&videodev_lock);
 }
 EXPORT_SYMBOL(video_unregister_device);
 
 /*
- * Video fs operations
- */
-static const struct file_operations video_fops = {
-        .owner          = THIS_MODULE,
-        .llseek         = no_llseek,
-        .open           = video_open,
-};
-
-/*
  *      Initialise video for linux
  */
-
 static int __init videodev_init(void)
 {
+        dev_t dev = MKDEV(VIDEO_MAJOR, 0);
         int ret;
 
         printk(KERN_INFO "Linux video capture interface: v2.00\n");
-        if (register_chrdev(VIDEO_MAJOR, VIDEO_NAME, &video_fops)) {
-                printk(KERN_WARNING "video_dev: unable to get major %d\n", VIDEO_MAJOR);
-                return -EIO;
+        ret = register_chrdev_region(dev, VIDEO_NUM_DEVICES, VIDEO_NAME);
+        if (ret < 0) {
+                printk(KERN_WARNING "videodev: unable to get major %d\n",
+                                VIDEO_MAJOR);
+                return ret;
         }
 
         ret = class_register(&video_class);
         if (ret < 0) {
-                unregister_chrdev(VIDEO_MAJOR, VIDEO_NAME);
+                unregister_chrdev_region(dev, VIDEO_NUM_DEVICES);
                 printk(KERN_WARNING "video_dev: class_register failed\n");
                 return -EIO;
         }
@@ -408,8 +406,10 @@ static int __init videodev_init(void)
 
 static void __exit videodev_exit(void)
 {
+        dev_t dev = MKDEV(VIDEO_MAJOR, 0);
+
         class_unregister(&video_class);
-        unregister_chrdev(VIDEO_MAJOR, VIDEO_NAME);
+        unregister_chrdev_region(dev, VIDEO_NUM_DEVICES);
 }
 
 module_init(videodev_init)
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index 140ef92c19c1..155c9d77a463 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -746,18 +746,6 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
                                 ret = ops->vidioc_enum_fmt_vid_overlay(file,
                                         fh, f);
                         break;
-#if 1
-                /* V4L2_BUF_TYPE_VBI_CAPTURE should not support VIDIOC_ENUM_FMT
-                 * according to the spec. The bttv and saa7134 drivers support
-                 * it though, so just warn that this is deprecated and will be
-                 * removed in the near future. */
-                case V4L2_BUF_TYPE_VBI_CAPTURE:
-                        if (ops->vidioc_enum_fmt_vbi_cap) {
-                                printk(KERN_WARNING "vidioc_enum_fmt_vbi_cap will be removed in 2.6.28!\n");
-                                ret = ops->vidioc_enum_fmt_vbi_cap(file, fh, f);
-                        }
-                        break;
-#endif
                 case V4L2_BUF_TYPE_VIDEO_OUTPUT:
                         if (ops->vidioc_enum_fmt_vid_out)
                                 ret = ops->vidioc_enum_fmt_vid_out(file, fh, f);
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index 1edda456fc64..1efc5f3462c6 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -30,16 +30,12 @@
 #include <linux/mm.h>
 #include <linux/time.h>
 #include <linux/version.h>
-
-#ifdef CONFIG_KMOD
 #include <linux/kmod.h>
-#endif
 
 #include <linux/i2c.h>
 #include <linux/i2c-algo-sgi.h>
 
 #include <linux/videodev2.h>
-#include <media/v4l2-ioctl.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
 #include <linux/video_decoder.h>
@@ -810,7 +806,7 @@ static void vino_free_buffer_with_count(struct vino_framebuffer *fb,
         dprintk("vino_free_buffer_with_count(): count = %d\n", count);
 
         for (i = 0; i < count; i++) {
-                ClearPageReserved(virt_to_page(fb->desc_table.virtual[i]));
+                ClearPageReserved(virt_to_page((void *)fb->desc_table.virtual[i]));
                 dma_unmap_single(NULL,
                                  fb->desc_table.dma_cpu[VINO_PAGE_RATIO * i],
                                  PAGE_SIZE, DMA_FROM_DEVICE);
@@ -888,7 +884,7 @@ static int vino_allocate_buffer(struct vino_framebuffer *fb,
                                 dma_data_addr + VINO_PAGE_SIZE * j;
                 }
 
-                SetPageReserved(virt_to_page(fb->desc_table.virtual[i]));
+                SetPageReserved(virt_to_page((void *)fb->desc_table.virtual[i]));
         }
 
         /* page_count needs to be set anyway, because the descriptor table has
@@ -975,7 +971,7 @@ static int vino_prepare_user_buffer(struct vino_framebuffer *fb,
                                 dma_data_addr + VINO_PAGE_SIZE * j;
                 }
 
-                SetPageReserved(virt_to_page(fb->desc_table.virtual[i]));
+                SetPageReserved(virt_to_page((void *)fb->desc_table.virtual[i]));
         }
 
         /* page_count needs to be set anyway, because the descriptor table has
@@ -4025,8 +4021,7 @@ out:
 
 static int vino_open(struct inode *inode, struct file *file)
 {
-        struct video_device *dev = video_devdata(file);
-        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        struct vino_channel_settings *vcs = video_drvdata(file);
         int ret = 0;
         dprintk("open(): channel = %c\n",
                (vcs->channel == VINO_CHANNEL_A) ? 'A' : 'B');
@@ -4057,8 +4052,7 @@ static int vino_open(struct inode *inode, struct file *file)
 
 static int vino_close(struct inode *inode, struct file *file)
 {
-        struct video_device *dev = video_devdata(file);
-        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        struct vino_channel_settings *vcs = video_drvdata(file);
         dprintk("close():\n");
 
         mutex_lock(&vcs->mutex);
@@ -4101,8 +4095,7 @@ static struct vm_operations_struct vino_vm_ops = {
 
 static int vino_mmap(struct file *file, struct vm_area_struct *vma)
 {
-        struct video_device *dev = video_devdata(file);
-        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        struct vino_channel_settings *vcs = video_drvdata(file);
 
         unsigned long start = vma->vm_start;
         unsigned long size = vma->vm_end - vma->vm_start;
@@ -4207,8 +4200,7 @@ out:
 
 static unsigned int vino_poll(struct file *file, poll_table *pt)
 {
-        struct video_device *dev = video_devdata(file);
-        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        struct vino_channel_settings *vcs = video_drvdata(file);
         unsigned int outgoing;
         unsigned int ret = 0;
 
@@ -4248,8 +4240,7 @@ error:
 static int vino_do_ioctl(struct inode *inode, struct file *file,
                       unsigned int cmd, void *arg)
 {
-        struct video_device *dev = video_devdata(file);
-        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        struct vino_channel_settings *vcs = video_drvdata(file);
 
 #ifdef VINO_DEBUG
         switch (_IOC_TYPE(cmd)) {
@@ -4356,8 +4347,7 @@ static int vino_do_ioctl(struct inode *inode, struct file *file,
 static int vino_ioctl(struct inode *inode, struct file *file,
                       unsigned int cmd, unsigned long arg)
 {
-        struct video_device *dev = video_devdata(file);
-        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        struct vino_channel_settings *vcs = video_drvdata(file);
         int ret;
 
         if (mutex_lock_interruptible(&vcs->mutex))
@@ -4641,7 +4631,7 @@ static int __init vino_module_init(void)
         }
         vino_init_stage++;
 
-#if defined(CONFIG_KMOD) && defined(MODULE)
+#ifdef MODULE
         request_module("saa7191");
         request_module("indycam");
 #endif
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 8ba8daafd7ea..65c8af18e767 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -898,9 +898,11 @@ static int vivi_open(struct inode *inode, struct file *file)
 
         printk(KERN_DEBUG "vivi: open called (minor=%d)\n", minor);
 
+        lock_kernel();
         list_for_each_entry(dev, &vivi_devlist, vivi_devlist)
                 if (dev->vfd->minor == minor)
                         goto found;
+        unlock_kernel();
         return -ENODEV;
 
 found:
@@ -925,8 +927,10 @@ found:
         }
 unlock:
         mutex_unlock(&dev->mutex);
-        if (retval)
+        if (retval) {
+                unlock_kernel();
                 return retval;
+        }
 
         file->private_data = fh;
         fh->dev      = dev;
@@ -955,6 +959,7 @@ unlock:
                         sizeof(struct vivi_buffer), fh);
 
         vivi_start_thread(fh);
+        unlock_kernel();
 
         return 0;
 }
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index 35293029da02..45be9ec8edc4 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -24,8 +24,6 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 
-#include <linux/byteorder/swab.h>
-
 #include <asm/io.h>
 #include <asm/uaccess.h>
 
diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c
index 2ff00bc5ad64..b2dbe48a92bb 100644
--- a/drivers/media/video/w9966.c
+++ b/drivers/media/video/w9966.c
@@ -113,6 +113,7 @@ struct w9966_dev {
         signed char contrast;
         signed char color;
         signed char hue;
+        unsigned long in_use;
 };
 
 /*
@@ -184,10 +185,25 @@ static int w9966_v4l_ioctl(struct inode *inode, struct file *file,
 static ssize_t w9966_v4l_read(struct file *file, char __user *buf,
                               size_t count, loff_t *ppos);
 
+static int w9966_exclusive_open(struct inode *inode, struct file *file)
+{
+        struct w9966_dev *cam = video_drvdata(file);
+
+        return test_and_set_bit(0, &cam->in_use) ? -EBUSY : 0;
+}
+
+static int w9966_exclusive_release(struct inode *inode, struct file *file)
+{
+        struct w9966_dev *cam = video_drvdata(file);
+
+        clear_bit(0, &cam->in_use);
+        return 0;
+}
+
 static const struct file_operations w9966_fops = {
         .owner          = THIS_MODULE,
-        .open           = video_exclusive_open,
-        .release        = video_exclusive_release,
+        .open           = w9966_exclusive_open,
+        .release        = w9966_exclusive_release,
         .ioctl          = w9966_v4l_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
@@ -198,6 +214,7 @@ static const struct file_operations w9966_fops = {
 static struct video_device w9966_template = {
         .name           = W9966_DRIVERNAME,
         .fops           = &w9966_fops,
+        .release        = video_device_release_empty,
 };
 
 /*
@@ -332,7 +349,7 @@ static int w9966_init(struct w9966_dev* cam, struct parport* port)
 
 // Fill in the video_device struct and register us to v4l
         memcpy(&cam->vdev, &w9966_template, sizeof(struct video_device));
-        cam->vdev.priv = cam;
+        video_set_drvdata(&cam->vdev, cam);
 
         if (video_register_device(&cam->vdev, VFL_TYPE_GRABBER, video_nr) < 0)
                 return -1;
@@ -713,8 +730,7 @@ static int w9966_wReg_i2c(struct w9966_dev* cam, int reg, int data)
 static int w9966_v4l_do_ioctl(struct inode *inode, struct file *file,
                               unsigned int cmd, void *arg)
 {
-        struct video_device *vdev = video_devdata(file);
-        struct w9966_dev *cam = vdev->priv;
+        struct w9966_dev *cam = video_drvdata(file);
 
         switch(cmd)
         {
@@ -872,8 +888,7 @@ static int w9966_v4l_ioctl(struct inode *inode, struct file *file,
 static ssize_t w9966_v4l_read(struct file *file, char  __user *buf,
                               size_t count, loff_t *ppos)
 {
-        struct video_device *vdev = video_devdata(file);
-        struct w9966_dev *cam = vdev->priv;
+        struct w9966_dev *cam = video_drvdata(file);
         unsigned char addr = 0xa0;      // ECP, read, CCD-transfer, 00000
         unsigned char __user *dest = (unsigned char __user *)buf;
         unsigned long dleft = count;
diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c
index 11edf79f57be..dcd45dbd82dc 100644
--- a/drivers/media/video/w9968cf.c
+++ b/drivers/media/video/w9968cf.c
@@ -111,7 +111,7 @@ static int specific_debug = W9968CF_SPECIFIC_DEBUG;
 
 static unsigned int param_nv[24]; /* number of values per parameter */
 
-#ifdef CONFIG_KMOD
+#ifdef CONFIG_MODULES
 module_param(ovmod_load, bool, 0644);
 #endif
 module_param(simcams, ushort, 0644);
@@ -144,7 +144,7 @@ module_param(debug, ushort, 0644);
 module_param(specific_debug, bool, 0644);
 #endif
 
-#ifdef CONFIG_KMOD
+#ifdef CONFIG_MODULES
 MODULE_PARM_DESC(ovmod_load,
                  "\n<0|1> Automatic 'ovcamchip' module loading."
                  "\n0 disabled, 1 enabled."
diff --git a/drivers/media/video/zc0301/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c
index 0c3287734c93..6a0902bcba6b 100644
--- a/drivers/media/video/zc0301/zc0301_core.c
+++ b/drivers/media/video/zc0301/zc0301_core.c
@@ -657,7 +657,7 @@ static int zc0301_open(struct inode* inode, struct file* filp)
         if (!down_read_trylock(&zc0301_dev_lock))
                 return -EAGAIN;
 
-        cam = video_get_drvdata(video_devdata(filp));
+        cam = video_drvdata(filp);
 
         if (wait_for_completion_interruptible(&cam->probe)) {
                 up_read(&zc0301_dev_lock);
@@ -739,7 +739,7 @@ static int zc0301_release(struct inode* inode, struct file* filp)
 
         down_write(&zc0301_dev_lock);
 
-        cam = video_get_drvdata(video_devdata(filp));
+        cam = video_drvdata(filp);
 
         zc0301_stop_transfer(cam);
         zc0301_release_buffers(cam);
@@ -759,7 +759,7 @@ static int zc0301_release(struct inode* inode, struct file* filp)
 static ssize_t
 zc0301_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos)
 {
-        struct zc0301_device* cam = video_get_drvdata(video_devdata(filp));
+        struct zc0301_device *cam = video_drvdata(filp);
         struct zc0301_frame_t* f, * i;
         unsigned long lock_flags;
         long timeout;
@@ -866,7 +866,7 @@ exit:
 
 static unsigned int zc0301_poll(struct file *filp, poll_table *wait)
 {
-        struct zc0301_device* cam = video_get_drvdata(video_devdata(filp));
+        struct zc0301_device *cam = video_drvdata(filp);
         struct zc0301_frame_t* f;
         unsigned long lock_flags;
         unsigned int mask = 0;
@@ -941,7 +941,7 @@ static struct vm_operations_struct zc0301_vm_ops = {
 
 static int zc0301_mmap(struct file* filp, struct vm_area_struct *vma)
 {
-        struct zc0301_device* cam = video_get_drvdata(video_devdata(filp));
+        struct zc0301_device *cam = video_drvdata(filp);
         unsigned long size = vma->vm_end - vma->vm_start,
                       start = vma->vm_start;
         void *pos;
@@ -1796,7 +1796,7 @@ zc0301_vidioc_s_parm(struct zc0301_device* cam, void __user * arg)
 static int zc0301_ioctl_v4l2(struct inode* inode, struct file* filp,
                              unsigned int cmd, void __user * arg)
 {
-        struct zc0301_device* cam = video_get_drvdata(video_devdata(filp));
+        struct zc0301_device *cam = video_drvdata(filp);
 
         switch (cmd) {
 
@@ -1891,7 +1891,7 @@ static int zc0301_ioctl_v4l2(struct inode* inode, struct file* filp,
 static int zc0301_ioctl(struct inode* inode, struct file* filp,
                         unsigned int cmd, unsigned long arg)
 {
-        struct zc0301_device* cam = video_get_drvdata(video_devdata(filp));
+        struct zc0301_device *cam = video_drvdata(filp);
         int err = 0;
 
         if (mutex_lock_interruptible(&cam->fileop_mutex))
diff --git a/drivers/media/video/zoran/Kconfig b/drivers/media/video/zoran/Kconfig
new file mode 100644
index 000000000000..4ea5fa71de89
--- /dev/null
+++ b/drivers/media/video/zoran/Kconfig
@@ -0,0 +1,73 @@
+config VIDEO_ZORAN
+        tristate "Zoran ZR36057/36067 Video For Linux"
+        depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 && VIRT_TO_BUS
+        help
+          Say Y for support for MJPEG capture cards based on the Zoran
+          36057/36067 PCI controller chipset. This includes the Iomega
+          Buz, Pinnacle DC10+ and the Linux Media Labs LML33. There is
+          a driver homepage at <http://mjpeg.sf.net/driver-zoran/>. For
+          more information, check <file:Documentation/video4linux/Zoran>.
+
+          To compile this driver as a module, choose M here: the
+          module will be called zr36067.
+
+config VIDEO_ZORAN_DC30
+        tristate "Pinnacle/Miro DC30(+) support"
+        depends on VIDEO_ZORAN
+        select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_VPX3220 if VIDEO_HELPER_CHIPS_AUTO
+        help
+          Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback
+          card. This also supports really old DC10 cards based on the
+          zr36050 MJPEG codec and zr36016 VFE.
+
+config VIDEO_ZORAN_ZR36060
+        tristate "Zoran ZR36060"
+        depends on VIDEO_ZORAN
+        help
+          Say Y to support Zoran boards based on 36060 chips.
+          This includes Iomega Buz, Pinnacle DC10, Linux media Labs 33
+          and 33 R10 and AverMedia 6 boards.
+
+config VIDEO_ZORAN_BUZ
+        tristate "Iomega Buz support"
+        depends on VIDEO_ZORAN_ZR36060
+        select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_SAA7185 if VIDEO_HELPER_CHIPS_AUTO
+        help
+          Support for the Iomega Buz MJPEG capture/playback card.
+
+config VIDEO_ZORAN_DC10
+        tristate "Pinnacle/Miro DC10(+) support"
+        depends on VIDEO_ZORAN_ZR36060
+        select VIDEO_SAA7110 if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO
+        help
+          Support for the Pinnacle/Miro DC10(+) MJPEG capture/playback
+          card.
+
+config VIDEO_ZORAN_LML33
+        tristate "Linux Media Labs LML33 support"
+        depends on VIDEO_ZORAN_ZR36060
+        select VIDEO_BT819 if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO
+        help
+          Support for the Linux Media Labs LML33 MJPEG capture/playback
+          card.
+
+config VIDEO_ZORAN_LML33R10
+        tristate "Linux Media Labs LML33R10 support"
+        depends on VIDEO_ZORAN_ZR36060
+        select VIDEO_SAA7114 if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_ADV7170 if VIDEO_HELPER_CHIPS_AUTO
+        help
+          support for the Linux Media Labs LML33R10 MJPEG capture/playback
+          card.
+
+config VIDEO_ZORAN_AVS6EYES
+        tristate "AverMedia 6 Eyes support (EXPERIMENTAL)"
+        depends on VIDEO_ZORAN_ZR36060 && EXPERIMENTAL && VIDEO_V4L1
+        select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_KS0127 if VIDEO_HELPER_CHIPS_AUTO
+        help
+          Support for the AverMedia 6 Eyes video surveillance card.
diff --git a/drivers/media/video/zoran/Makefile b/drivers/media/video/zoran/Makefile
new file mode 100644
index 000000000000..44cc13352c88
--- /dev/null
+++ b/drivers/media/video/zoran/Makefile
@@ -0,0 +1,6 @@
+zr36067-objs    :=      zoran_procfs.o zoran_device.o \
+                        zoran_driver.o zoran_card.o
+
+obj-$(CONFIG_VIDEO_ZORAN) += zr36067.o videocodec.o
+obj-$(CONFIG_VIDEO_ZORAN_DC30) += zr36050.o zr36016.o
+obj-$(CONFIG_VIDEO_ZORAN_ZR36060) += zr36060.o
diff --git a/drivers/media/video/videocodec.c b/drivers/media/video/zoran/videocodec.c
index cf24956f3204..cf24956f3204 100644
--- a/drivers/media/video/videocodec.c
+++ b/drivers/media/video/zoran/videocodec.c
diff --git a/drivers/media/video/videocodec.h b/drivers/media/video/zoran/videocodec.h
index 97a3bbeda505..97a3bbeda505 100644
--- a/drivers/media/video/videocodec.h
+++ b/drivers/media/video/zoran/videocodec.h
diff --git a/drivers/media/video/zoran.h b/drivers/media/video/zoran/zoran.h
index 46b7ad477ceb..46b7ad477ceb 100644
--- a/drivers/media/video/zoran.h
+++ b/drivers/media/video/zoran/zoran.h
diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran/zoran_card.c
index 3282be730298..3282be730298 100644
--- a/drivers/media/video/zoran_card.c
+++ b/drivers/media/video/zoran/zoran_card.c
diff --git a/drivers/media/video/zoran_card.h b/drivers/media/video/zoran/zoran_card.h
index e4dc9d29b404..e4dc9d29b404 100644
--- a/drivers/media/video/zoran_card.h
+++ b/drivers/media/video/zoran/zoran_card.h
diff --git a/drivers/media/video/zoran_device.c b/drivers/media/video/zoran/zoran_device.c
index 88d369708e4c..5d948ff7faf0 100644
--- a/drivers/media/video/zoran_device.c
+++ b/drivers/media/video/zoran/zoran_device.c
@@ -58,8 +58,6 @@
                    ZR36057_ISR_GIRQ1 | \
                    ZR36057_ISR_JPEGRepIRQ )
 
-extern const struct zoran_format zoran_formats[];
-
 static int lml33dpath;          /* default = 0
                                  * 1 will use digital path in capture
                                  * mode instead of analog. It can be
@@ -377,7 +375,7 @@ zr36057_set_vfe (struct zoran              *zr,
 
         /* horizontal */
         VidWinWid = video_width;
-        X = (VidWinWid * 64 + tvn->Wa - 1) / tvn->Wa;
+        X = DIV_ROUND_UP(VidWinWid * 64, tvn->Wa);
         We = (VidWinWid * 64) / X;
         HorDcm = 64 - X;
         hcrop1 = 2 * ((tvn->Wa - We) / 4);
@@ -403,7 +401,7 @@ zr36057_set_vfe (struct zoran              *zr,
         /* Vertical */
         DispMode = !(video_height > BUZ_MAX_HEIGHT / 2);
         VidWinHt = DispMode ? video_height : video_height / 2;
-        Y = (VidWinHt * 64 * 2 + tvn->Ha - 1) / tvn->Ha;
+        Y = DIV_ROUND_UP(VidWinHt * 64 * 2, tvn->Ha);
         He = (VidWinHt * 64) / Y;
         VerDcm = 64 - Y;
         vcrop1 = (tvn->Ha / 2 - He) / 2;
diff --git a/drivers/media/video/zoran_device.h b/drivers/media/video/zoran/zoran_device.h
index 37fa86a34083..74c6c8edb7d0 100644
--- a/drivers/media/video/zoran_device.h
+++ b/drivers/media/video/zoran/zoran_device.h
@@ -78,6 +78,14 @@ extern void zoran_set_pci_master(struct zoran *zr,
 extern void zoran_init_hardware(struct zoran *zr);
 extern void zr36057_restart(struct zoran *zr);
 
+extern const struct zoran_format zoran_formats[];
+
+extern int v4l_nbufs;
+extern int v4l_bufsize;
+extern int jpg_nbufs;
+extern int jpg_bufsize;
+extern int pass_through;
+
 /* i2c */
 extern int decoder_command(struct zoran *zr,
                            int cmd,
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index 2dab9eea4def..25de7631443e 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
@@ -194,12 +194,6 @@ const struct zoran_format zoran_formats[] = {
 // RJ: Test only - want to test BUZ_USE_HIMEM even when CONFIG_BIGPHYS_AREA is defined
 
 
-extern int v4l_nbufs;
-extern int v4l_bufsize;
-extern int jpg_nbufs;
-extern int jpg_bufsize;
-extern int pass_through;
-
 static int lock_norm;   /* 0 = default 1 = Don't change TV standard (norm) */
 module_param(lock_norm, int, 0644);
 MODULE_PARM_DESC(lock_norm, "Prevent norm changes (1 = ignore, >1 = fail)");
@@ -1211,6 +1205,7 @@ zoran_open (struct inode *inode,
         struct zoran_fh *fh;
         int i, res, first_open = 0, have_module_locks = 0;
 
+        lock_kernel();
         /* find the device */
         for (i = 0; i < zoran_num; i++) {
                 if (zoran[i]->video_dev->minor == minor) {
@@ -1321,6 +1316,7 @@ zoran_open (struct inode *inode,
         file->private_data = fh;
         fh->zr = zr;
         zoran_open_init_session(file);
+        unlock_kernel();
 
         return 0;
 
@@ -1338,6 +1334,7 @@ open_unlock_and_return:
         if (zr) {
                 /*mutex_unlock(&zr->resource_lock);*/
         }
+        unlock_kernel();
 
         return res;
 }
@@ -2920,6 +2917,8 @@ zoran_do_ioctl (struct inode *inode,
                                 fmt->fmt.pix.bytesperline = 0;
                                 fmt->fmt.pix.sizeimage =
                                     fh->jpg_buffers.buffer_size;
+                                fmt->fmt.pix.colorspace =
+                                    V4L2_COLORSPACE_SMPTE170M;
 
                                 /* we hereby abuse this variable to show that
                                  * we're gonna do mjpeg capture */
@@ -2979,6 +2978,8 @@ zoran_do_ioctl (struct inode *inode,
                                 fmt->fmt.pix.sizeimage =
                                         fh->v4l_settings.height *
                                         fh->v4l_settings.bytesperline;
+                                fmt->fmt.pix.colorspace =
+                                        fh->v4l_settings.format->colorspace;
                                 if (BUZ_MAX_HEIGHT <
                                     (fh->v4l_settings.height * 2))
                                         fmt->fmt.pix.field =
diff --git a/drivers/media/video/zoran_procfs.c b/drivers/media/video/zoran/zoran_procfs.c
index 870bc5a70e3f..870bc5a70e3f 100644
--- a/drivers/media/video/zoran_procfs.c
+++ b/drivers/media/video/zoran/zoran_procfs.c
diff --git a/drivers/media/video/zoran_procfs.h b/drivers/media/video/zoran/zoran_procfs.h
index f2d5b1ba448f..f2d5b1ba448f 100644
--- a/drivers/media/video/zoran_procfs.h
+++ b/drivers/media/video/zoran/zoran_procfs.h
diff --git a/drivers/media/video/zr36016.c b/drivers/media/video/zoran/zr36016.c
index 00d132bcd1e4..00d132bcd1e4 100644
--- a/drivers/media/video/zr36016.c
+++ b/drivers/media/video/zoran/zr36016.c
diff --git a/drivers/media/video/zr36016.h b/drivers/media/video/zoran/zr36016.h
index 8c79229f69d1..8c79229f69d1 100644
--- a/drivers/media/video/zr36016.h
+++ b/drivers/media/video/zoran/zr36016.h
diff --git a/drivers/media/video/zr36050.c b/drivers/media/video/zoran/zr36050.c
index cf8b271a1c8f..cf8b271a1c8f 100644
--- a/drivers/media/video/zr36050.c
+++ b/drivers/media/video/zoran/zr36050.c
diff --git a/drivers/media/video/zr36050.h b/drivers/media/video/zoran/zr36050.h
index 9f52f0cdde50..9f52f0cdde50 100644
--- a/drivers/media/video/zr36050.h
+++ b/drivers/media/video/zoran/zr36050.h
diff --git a/drivers/media/video/zr36057.h b/drivers/media/video/zoran/zr36057.h
index 54c9362aa980..54c9362aa980 100644
--- a/drivers/media/video/zr36057.h
+++ b/drivers/media/video/zoran/zr36057.h
diff --git a/drivers/media/video/zr36060.c b/drivers/media/video/zoran/zr36060.c
index 8e74054d5ef1..8e74054d5ef1 100644
--- a/drivers/media/video/zr36060.c
+++ b/drivers/media/video/zoran/zr36060.c
diff --git a/drivers/media/video/zr36060.h b/drivers/media/video/zoran/zr36060.h
index 914ffa4ad8d3..914ffa4ad8d3 100644
--- a/drivers/media/video/zr36060.h
+++ b/drivers/media/video/zoran/zr36060.h
diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c
index 18d1c4ba79fb..7cdac99deea6 100644
--- a/drivers/media/video/zr364xx.c
+++ b/drivers/media/video/zr364xx.c
@@ -52,7 +52,7 @@
 
 
 /* Debug macro */
-#define DBG(x...) if (debug) info(x)
+#define DBG(x...) if (debug) printk(KERN_INFO KBUILD_MODNAME x)
 
 
 /* Init methods, need to find nicer names for these
@@ -116,6 +116,7 @@ struct zr364xx_camera {
         int height;
         int method;
         struct mutex lock;
+        int users;
 };
 
 
@@ -127,7 +128,7 @@ static int send_control_msg(struct usb_device *udev, u8 request, u16 value,
 
         unsigned char *transfer_buffer = kmalloc(size, GFP_KERNEL);
         if (!transfer_buffer) {
-                info("kmalloc(%d) failed", size);
+                dev_err(&udev->dev, "kmalloc(%d) failed\n", size);
                 return -ENOMEM;
         }
 
@@ -143,7 +144,8 @@ static int send_control_msg(struct usb_device *udev, u8 request, u16 value,
         kfree(transfer_buffer);
 
         if (status < 0)
-                info("Failed sending control message, error %d.", status);
+                dev_err(&udev->dev,
+                        "Failed sending control message, error %d.\n", status);
 
         return status;
 }
@@ -303,11 +305,11 @@ static int read_frame(struct zr364xx_camera *cam, int framenum)
                 DBG("buffer : %d %d", cam->buffer[0], cam->buffer[1]);
                 DBG("bulk : n=%d size=%d", n, actual_length);
                 if (n < 0) {
-                        info("error reading bulk msg");
+                        dev_err(&cam->udev->dev, "error reading bulk msg\n");
                         return 0;
                 }
                 if (actual_length < 0 || actual_length > BUFFER_SIZE) {
-                        info("wrong number of bytes");
+                        dev_err(&cam->udev->dev, "wrong number of bytes\n");
                         return 0;
                 }
 
@@ -641,42 +643,47 @@ static int zr364xx_open(struct inode *inode, struct file *file)
 
         DBG("zr364xx_open");
 
-        cam->skip = 2;
+        mutex_lock(&cam->lock);
 
-        err = video_exclusive_open(inode, file);
-        if (err < 0)
-                return err;
+        if (cam->users) {
+                err = -EBUSY;
+                goto out;
+        }
 
         if (!cam->framebuf) {
                 cam->framebuf = vmalloc_32(MAX_FRAME_SIZE * FRAMES);
                 if (!cam->framebuf) {
-                        info("vmalloc_32 failed!");
-                        return -ENOMEM;
+                        dev_err(&cam->udev->dev, "vmalloc_32 failed!\n");
+                        err = -ENOMEM;
+                        goto out;
                 }
         }
 
-        mutex_lock(&cam->lock);
         for (i = 0; init[cam->method][i].size != -1; i++) {
                 err =
                     send_control_msg(udev, 1, init[cam->method][i].value,
                                      0, init[cam->method][i].bytes,
                                      init[cam->method][i].size);
                 if (err < 0) {
-                        info("error during open sequence: %d", i);
-                        mutex_unlock(&cam->lock);
-                        return err;
+                        dev_err(&cam->udev->dev,
+                                "error during open sequence: %d\n", i);
+                        goto out;
                 }
         }
 
+        cam->skip = 2;
+        cam->users++;
         file->private_data = vdev;
 
         /* Added some delay here, since opening/closing the camera quickly,
          * like Ekiga does during its startup, can crash the webcam
          */
         mdelay(100);
+        err = 0;
 
+out:
         mutex_unlock(&cam->lock);
-        return 0;
+        return err;
 }
 
 
@@ -697,28 +704,30 @@ static int zr364xx_release(struct inode *inode, struct file *file)
         udev = cam->udev;
 
         mutex_lock(&cam->lock);
+
+        cam->users--;
+        file->private_data = NULL;
+
         for (i = 0; i < 2; i++) {
                 err =
                     send_control_msg(udev, 1, init[cam->method][i].value,
                                      0, init[i][cam->method].bytes,
                                      init[cam->method][i].size);
                 if (err < 0) {
-                        info("error during release sequence");
-                        mutex_unlock(&cam->lock);
-                        return err;
+                        dev_err(&udev->dev, "error during release sequence\n");
+                        goto out;
                 }
         }
 
-        file->private_data = NULL;
-        video_exclusive_release(inode, file);
-
         /* Added some delay here, since opening/closing the camera quickly,
          * like Ekiga does during its startup, can crash the webcam
          */
         mdelay(100);
+        err = 0;
 
+out:
         mutex_unlock(&cam->lock);
-        return 0;
+        return err;
 }
 
 
@@ -801,13 +810,14 @@ static int zr364xx_probe(struct usb_interface *intf,
 
         DBG("probing...");
 
-        info(DRIVER_DESC " compatible webcam plugged");
-        info("model %04x:%04x detected", udev->descriptor.idVendor,
-             udev->descriptor.idProduct);
+        dev_info(&intf->dev, DRIVER_DESC " compatible webcam plugged\n");
+        dev_info(&intf->dev, "model %04x:%04x detected\n",
+                 le16_to_cpu(udev->descriptor.idVendor),
+                 le16_to_cpu(udev->descriptor.idProduct));
 
         cam = kzalloc(sizeof(struct zr364xx_camera), GFP_KERNEL);
         if (cam == NULL) {
-                info("cam: out of memory !");
+                dev_err(&udev->dev, "cam: out of memory !\n");
                 return -ENOMEM;
         }
         /* save the init method used by this camera */
@@ -815,7 +825,7 @@ static int zr364xx_probe(struct usb_interface *intf,
 
         cam->vdev = video_device_alloc();
         if (cam->vdev == NULL) {
-                info("cam->vdev: out of memory !");
+                dev_err(&udev->dev, "cam->vdev: out of memory !\n");
                 kfree(cam);
                 return -ENOMEM;
         }
@@ -827,7 +837,7 @@ static int zr364xx_probe(struct usb_interface *intf,
         cam->udev = udev;
 
         if ((cam->buffer = kmalloc(BUFFER_SIZE, GFP_KERNEL)) == NULL) {
-                info("cam->buffer: out of memory !");
+                dev_info(&udev->dev, "cam->buffer: out of memory !\n");
                 video_device_release(cam->vdev);
                 kfree(cam);
                 return -ENODEV;
@@ -835,17 +845,17 @@ static int zr364xx_probe(struct usb_interface *intf,
 
         switch (mode) {
         case 1:
-                info("160x120 mode selected");
+                dev_info(&udev->dev, "160x120 mode selected\n");
                 cam->width = 160;
                 cam->height = 120;
                 break;
         case 2:
-                info("640x480 mode selected");
+                dev_info(&udev->dev, "640x480 mode selected\n");
                 cam->width = 640;
                 cam->height = 480;
                 break;
         default:
-                info("320x240 mode selected");
+                dev_info(&udev->dev, "320x240 mode selected\n");
                 cam->width = 320;
                 cam->height = 240;
                 break;
@@ -865,7 +875,7 @@ static int zr364xx_probe(struct usb_interface *intf,
 
         err = video_register_device(cam->vdev, VFL_TYPE_GRABBER, -1);
         if (err) {
-                info("video_register_device failed");
+                dev_err(&udev->dev, "video_register_device failed\n");
                 video_device_release(cam->vdev);
                 kfree(cam->buffer);
                 kfree(cam);
@@ -874,7 +884,8 @@ static int zr364xx_probe(struct usb_interface *intf,
 
         usb_set_intfdata(intf, cam);
 
-        info(DRIVER_DESC " controlling video device %d", cam->vdev->minor);
+        dev_info(&udev->dev, DRIVER_DESC " controlling video device %d\n",
+                 cam->vdev->minor);
         return 0;
 }
 
@@ -884,7 +895,7 @@ static void zr364xx_disconnect(struct usb_interface *intf)
         struct zr364xx_camera *cam = usb_get_intfdata(intf);
         usb_set_intfdata(intf, NULL);
         dev_set_drvdata(&intf->dev, NULL);
-        info(DRIVER_DESC " webcam unplugged");
+        dev_info(&intf->dev, DRIVER_DESC " webcam unplugged\n");
         if (cam->vdev)
                 video_unregister_device(cam->vdev);
         cam->vdev = NULL;
@@ -913,16 +924,16 @@ static int __init zr364xx_init(void)
         int retval;
         retval = usb_register(&zr364xx_driver);
         if (retval)
-                info("usb_register failed!");
+                printk(KERN_ERR KBUILD_MODNAME ": usb_register failed!\n");
         else
-                info(DRIVER_DESC " module loaded");
+                printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
         return retval;
 }
 
 
 static void __exit zr364xx_exit(void)
 {
-        info(DRIVER_DESC " module unloaded");
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC " module unloaded\n");
         usb_deregister(&zr364xx_driver);
 }
 
diff --git a/drivers/message/i2o/Makefile b/drivers/message/i2o/Makefile
index 2c2e39aa1efa..b0982dacfd0a 100644
--- a/drivers/message/i2o/Makefile
+++ b/drivers/message/i2o/Makefile
@@ -5,7 +5,7 @@
 # In the future, some of these should be built conditionally.
 #
 
-i2o_core-y              += iop.o driver.o device.o debug.o pci.o exec-osm.o
+i2o_core-y              += iop.o driver.o device.o debug.o pci.o exec-osm.o memory.o
 i2o_bus-y               += bus-osm.o
 i2o_config-y            += config-osm.o
 obj-$(CONFIG_I2O)       += i2o_core.o
diff --git a/drivers/message/i2o/device.c b/drivers/message/i2o/device.c
index 8774c670e668..54c2e9ae23e5 100644
--- a/drivers/message/i2o/device.c
+++ b/drivers/message/i2o/device.c
@@ -467,7 +467,7 @@ int i2o_parm_issue(struct i2o_device *i2o_dev, int cmd, void *oplist,
 
         res.virt = NULL;
 
-        if (i2o_dma_alloc(dev, &res, reslen, GFP_KERNEL))
+        if (i2o_dma_alloc(dev, &res, reslen))
                 return -ENOMEM;
 
         msg = i2o_msg_get_wait(c, I2O_TIMEOUT_MESSAGE_GET);
diff --git a/drivers/message/i2o/exec-osm.c b/drivers/message/i2o/exec-osm.c
index 6cbcc21de518..56faef1a1d55 100644
--- a/drivers/message/i2o/exec-osm.c
+++ b/drivers/message/i2o/exec-osm.c
@@ -388,8 +388,8 @@ static int i2o_exec_lct_notify(struct i2o_controller *c, u32 change_ind)
 
         dev = &c->pdev->dev;
 
-        if (i2o_dma_realloc
-            (dev, &c->dlct, le32_to_cpu(sb->expected_lct_size), GFP_KERNEL))
+        if (i2o_dma_realloc(dev, &c->dlct,
+                                        le32_to_cpu(sb->expected_lct_size)))
                 return -ENOMEM;
 
         msg = i2o_msg_get_wait(c, I2O_TIMEOUT_MESSAGE_GET);
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
index 4238de98d4a6..a3fabdbe6ca6 100644
--- a/drivers/message/i2o/i2o_config.c
+++ b/drivers/message/i2o/i2o_config.c
@@ -260,7 +260,7 @@ static int i2o_cfg_swdl(unsigned long arg)
         if (IS_ERR(msg))
                 return PTR_ERR(msg);
 
-        if (i2o_dma_alloc(&c->pdev->dev, &buffer, fragsize, GFP_KERNEL)) {
+        if (i2o_dma_alloc(&c->pdev->dev, &buffer, fragsize)) {
                 i2o_msg_nop(c, msg);
                 return -ENOMEM;
         }
@@ -339,7 +339,7 @@ static int i2o_cfg_swul(unsigned long arg)
         if (IS_ERR(msg))
                 return PTR_ERR(msg);
 
-        if (i2o_dma_alloc(&c->pdev->dev, &buffer, fragsize, GFP_KERNEL)) {
+        if (i2o_dma_alloc(&c->pdev->dev, &buffer, fragsize)) {
                 i2o_msg_nop(c, msg);
                 return -ENOMEM;
         }
@@ -634,9 +634,7 @@ static int i2o_cfg_passthru32(struct file *file, unsigned cmnd,
                         sg_size = sg[i].flag_count & 0xffffff;
                         p = &(sg_list[sg_index]);
                         /* Allocate memory for the transfer */
-                        if (i2o_dma_alloc
-                            (&c->pdev->dev, p, sg_size,
-                             PCI_DMA_BIDIRECTIONAL)) {
+                        if (i2o_dma_alloc(&c->pdev->dev, p, sg_size)) {
                                 printk(KERN_DEBUG
                                        "%s: Could not allocate SG buffer - size = %d buffer number %d of %d\n",
                                        c->name, sg_size, i, sg_count);
@@ -780,12 +778,11 @@ static int i2o_cfg_passthru(unsigned long arg)
         u32 size = 0;
         u32 reply_size = 0;
         u32 rcode = 0;
-        void *sg_list[SG_TABLESIZE];
+        struct i2o_dma sg_list[SG_TABLESIZE];
         u32 sg_offset = 0;
         u32 sg_count = 0;
         int sg_index = 0;
         u32 i = 0;
-        void *p = NULL;
         i2o_status_block *sb;
         struct i2o_message *msg;
         unsigned int iop;
@@ -842,6 +839,7 @@ static int i2o_cfg_passthru(unsigned long arg)
         memset(sg_list, 0, sizeof(sg_list[0]) * SG_TABLESIZE);
         if (sg_offset) {
                 struct sg_simple_element *sg;
+                struct i2o_dma *p;
 
                 if (sg_offset * 4 >= size) {
                         rcode = -EFAULT;
@@ -871,22 +869,22 @@ static int i2o_cfg_passthru(unsigned long arg)
                                 goto sg_list_cleanup;
                         }
                         sg_size = sg[i].flag_count & 0xffffff;
+                        p = &(sg_list[sg_index]);
+                        if (i2o_dma_alloc(&c->pdev->dev, p, sg_size)) {
                         /* Allocate memory for the transfer */
-                        p = kmalloc(sg_size, GFP_KERNEL);
-                        if (!p) {
                                 printk(KERN_DEBUG
                                        "%s: Could not allocate SG buffer - size = %d buffer number %d of %d\n",
                                        c->name, sg_size, i, sg_count);
                                 rcode = -ENOMEM;
                                 goto sg_list_cleanup;
                         }
-                        sg_list[sg_index++] = p;        // sglist indexed with input frame, not our internal frame.
+                        sg_index++;
                         /* Copy in the user's SG buffer if necessary */
                         if (sg[i].
                             flag_count & 0x04000000 /*I2O_SGL_FLAGS_DIR */ ) {
                                 // TODO 64bit fix
                                 if (copy_from_user
-                                    (p, (void __user *)sg[i].addr_bus,
+                                    (p->virt, (void __user *)sg[i].addr_bus,
                                      sg_size)) {
                                         printk(KERN_DEBUG
                                                "%s: Could not copy SG buf %d FROM user\n",
@@ -895,8 +893,7 @@ static int i2o_cfg_passthru(unsigned long arg)
                                         goto sg_list_cleanup;
                                 }
                         }
-                        //TODO 64bit fix
-                        sg[i].addr_bus = virt_to_bus(p);
+                        sg[i].addr_bus = p->phys;
                 }
         }
 
@@ -908,7 +905,7 @@ static int i2o_cfg_passthru(unsigned long arg)
         }
 
         if (sg_offset) {
-                u32 rmsg[128];
+                u32 rmsg[I2O_OUTBOUND_MSG_FRAME_SIZE];
                 /* Copy back the Scatter Gather buffers back to user space */
                 u32 j;
                 // TODO 64bit fix
@@ -942,11 +939,11 @@ static int i2o_cfg_passthru(unsigned long arg)
                                 sg_size = sg[j].flag_count & 0xffffff;
                                 // TODO 64bit fix
                                 if (copy_to_user
-                                    ((void __user *)sg[j].addr_bus, sg_list[j],
+                                    ((void __user *)sg[j].addr_bus, sg_list[j].virt,
                                      sg_size)) {
                                         printk(KERN_WARNING
                                                "%s: Could not copy %p TO user %x\n",
-                                               c->name, sg_list[j],
+                                               c->name, sg_list[j].virt,
                                                sg[j].addr_bus);
                                         rcode = -EFAULT;
                                         goto sg_list_cleanup;
@@ -973,7 +970,7 @@ sg_list_cleanup:
         }
 
         for (i = 0; i < sg_index; i++)
-                kfree(sg_list[i]);
+                i2o_dma_free(&c->pdev->dev, &sg_list[i]);
 
 cleanup:
         kfree(reply);
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
index da715e11c1b2..be2b5926d26c 100644
--- a/drivers/message/i2o/iop.c
+++ b/drivers/message/i2o/iop.c
@@ -1004,7 +1004,7 @@ static int i2o_hrt_get(struct i2o_controller *c)
 
                 size = hrt->num_entries * hrt->entry_len << 2;
                 if (size > c->hrt.len) {
-                        if (i2o_dma_realloc(dev, &c->hrt, size, GFP_KERNEL))
+                        if (i2o_dma_realloc(dev, &c->hrt, size))
                                 return -ENOMEM;
                         else
                                 hrt = c->hrt.virt;
diff --git a/drivers/message/i2o/memory.c b/drivers/message/i2o/memory.c
new file mode 100644
index 000000000000..f5cc95c564e2
--- /dev/null
+++ b/drivers/message/i2o/memory.c
@@ -0,0 +1,313 @@
+/*
+ *      Functions to handle I2O memory
+ *
+ *      Pulled from the inlines in i2o headers and uninlined
+ *
+ *
+ *      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.
+ */
+
+#include <linux/module.h>
+#include <linux/i2o.h>
+#include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include "core.h"
+
+/* Protects our 32/64bit mask switching */
+static DEFINE_MUTEX(mem_lock);
+
+/**
+ *      i2o_sg_tablesize - Calculate the maximum number of elements in a SGL
+ *      @c: I2O controller for which the calculation should be done
+ *      @body_size: maximum body size used for message in 32-bit words.
+ *
+ *      Return the maximum number of SG elements in a SG list.
+ */
+u16 i2o_sg_tablesize(struct i2o_controller *c, u16 body_size)
+{
+        i2o_status_block *sb = c->status_block.virt;
+        u16 sg_count =
+            (sb->inbound_frame_size - sizeof(struct i2o_message) / 4) -
+            body_size;
+
+        if (c->pae_support) {
+                /*
+                 * for 64-bit a SG attribute element must be added and each
+                 * SG element needs 12 bytes instead of 8.
+                 */
+                sg_count -= 2;
+                sg_count /= 3;
+        } else
+                sg_count /= 2;
+
+        if (c->short_req && (sg_count > 8))
+                sg_count = 8;
+
+        return sg_count;
+}
+EXPORT_SYMBOL_GPL(i2o_sg_tablesize);
+
+
+/**
+ *      i2o_dma_map_single - Map pointer to controller and fill in I2O message.
+ *      @c: I2O controller
+ *      @ptr: pointer to the data which should be mapped
+ *      @size: size of data in bytes
+ *      @direction: DMA_TO_DEVICE / DMA_FROM_DEVICE
+ *      @sg_ptr: pointer to the SG list inside the I2O message
+ *
+ *      This function does all necessary DMA handling and also writes the I2O
+ *      SGL elements into the I2O message. For details on DMA handling see also
+ *      dma_map_single(). The pointer sg_ptr will only be set to the end of the
+ *      SG list if the allocation was successful.
+ *
+ *      Returns DMA address which must be checked for failures using
+ *      dma_mapping_error().
+ */
+dma_addr_t i2o_dma_map_single(struct i2o_controller *c, void *ptr,
+                                            size_t size,
+                                            enum dma_data_direction direction,
+                                            u32 ** sg_ptr)
+{
+        u32 sg_flags;
+        u32 *mptr = *sg_ptr;
+        dma_addr_t dma_addr;
+
+        switch (direction) {
+        case DMA_TO_DEVICE:
+                sg_flags = 0xd4000000;
+                break;
+        case DMA_FROM_DEVICE:
+                sg_flags = 0xd0000000;
+                break;
+        default:
+                return 0;
+        }
+
+        dma_addr = dma_map_single(&c->pdev->dev, ptr, size, direction);
+        if (!dma_mapping_error(&c->pdev->dev, dma_addr)) {
+#ifdef CONFIG_I2O_EXT_ADAPTEC_DMA64
+                if ((sizeof(dma_addr_t) > 4) && c->pae_support) {
+                        *mptr++ = cpu_to_le32(0x7C020002);
+                        *mptr++ = cpu_to_le32(PAGE_SIZE);
+                }
+#endif
+
+                *mptr++ = cpu_to_le32(sg_flags | size);
+                *mptr++ = cpu_to_le32(i2o_dma_low(dma_addr));
+#ifdef CONFIG_I2O_EXT_ADAPTEC_DMA64
+                if ((sizeof(dma_addr_t) > 4) && c->pae_support)
+                        *mptr++ = cpu_to_le32(i2o_dma_high(dma_addr));
+#endif
+                *sg_ptr = mptr;
+        }
+        return dma_addr;
+}
+EXPORT_SYMBOL_GPL(i2o_dma_map_single);
+
+/**
+ *      i2o_dma_map_sg - Map a SG List to controller and fill in I2O message.
+ *      @c: I2O controller
+ *      @sg: SG list to be mapped
+ *      @sg_count: number of elements in the SG list
+ *      @direction: DMA_TO_DEVICE / DMA_FROM_DEVICE
+ *      @sg_ptr: pointer to the SG list inside the I2O message
+ *
+ *      This function does all necessary DMA handling and also writes the I2O
+ *      SGL elements into the I2O message. For details on DMA handling see also
+ *      dma_map_sg(). The pointer sg_ptr will only be set to the end of the SG
+ *      list if the allocation was successful.
+ *
+ *      Returns 0 on failure or 1 on success.
+ */
+int i2o_dma_map_sg(struct i2o_controller *c, struct scatterlist *sg,
+            int sg_count, enum dma_data_direction direction, u32 ** sg_ptr)
+{
+        u32 sg_flags;
+        u32 *mptr = *sg_ptr;
+
+        switch (direction) {
+        case DMA_TO_DEVICE:
+                sg_flags = 0x14000000;
+                break;
+        case DMA_FROM_DEVICE:
+                sg_flags = 0x10000000;
+                break;
+        default:
+                return 0;
+        }
+
+        sg_count = dma_map_sg(&c->pdev->dev, sg, sg_count, direction);
+        if (!sg_count)
+                return 0;
+
+#ifdef CONFIG_I2O_EXT_ADAPTEC_DMA64
+        if ((sizeof(dma_addr_t) > 4) && c->pae_support) {
+                *mptr++ = cpu_to_le32(0x7C020002);
+                *mptr++ = cpu_to_le32(PAGE_SIZE);
+        }
+#endif
+
+        while (sg_count-- > 0) {
+                if (!sg_count)
+                        sg_flags |= 0xC0000000;
+                *mptr++ = cpu_to_le32(sg_flags | sg_dma_len(sg));
+                *mptr++ = cpu_to_le32(i2o_dma_low(sg_dma_address(sg)));
+#ifdef CONFIG_I2O_EXT_ADAPTEC_DMA64
+                if ((sizeof(dma_addr_t) > 4) && c->pae_support)
+                        *mptr++ = cpu_to_le32(i2o_dma_high(sg_dma_address(sg)));
+#endif
+                sg = sg_next(sg);
+        }
+        *sg_ptr = mptr;
+
+        return 1;
+}
+EXPORT_SYMBOL_GPL(i2o_dma_map_sg);
+
+/**
+ *      i2o_dma_alloc - Allocate DMA memory
+ *      @dev: struct device pointer to the PCI device of the I2O controller
+ *      @addr: i2o_dma struct which should get the DMA buffer
+ *      @len: length of the new DMA memory
+ *
+ *      Allocate a coherent DMA memory and write the pointers into addr.
+ *
+ *      Returns 0 on success or -ENOMEM on failure.
+ */
+int i2o_dma_alloc(struct device *dev, struct i2o_dma *addr, size_t len)
+{
+        struct pci_dev *pdev = to_pci_dev(dev);
+        int dma_64 = 0;
+
+        mutex_lock(&mem_lock);
+        if ((sizeof(dma_addr_t) > 4) && (pdev->dma_mask == DMA_64BIT_MASK)) {
+                dma_64 = 1;
+                if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
+                        mutex_unlock(&mem_lock);
+                        return -ENOMEM;
+                }
+        }
+
+        addr->virt = dma_alloc_coherent(dev, len, &addr->phys, GFP_KERNEL);
+
+        if ((sizeof(dma_addr_t) > 4) && dma_64)
+                if (pci_set_dma_mask(pdev, DMA_64BIT_MASK))
+                        printk(KERN_WARNING "i2o: unable to set 64-bit DMA");
+        mutex_unlock(&mem_lock);
+
+        if (!addr->virt)
+                return -ENOMEM;
+
+        memset(addr->virt, 0, len);
+        addr->len = len;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(i2o_dma_alloc);
+
+
+/**
+ *      i2o_dma_free - Free DMA memory
+ *      @dev: struct device pointer to the PCI device of the I2O controller
+ *      @addr: i2o_dma struct which contains the DMA buffer
+ *
+ *      Free a coherent DMA memory and set virtual address of addr to NULL.
+ */
+void i2o_dma_free(struct device *dev, struct i2o_dma *addr)
+{
+        if (addr->virt) {
+                if (addr->phys)
+                        dma_free_coherent(dev, addr->len, addr->virt,
+                                          addr->phys);
+                else
+                        kfree(addr->virt);
+                addr->virt = NULL;
+        }
+}
+EXPORT_SYMBOL_GPL(i2o_dma_free);
+
+
+/**
+ *      i2o_dma_realloc - Realloc DMA memory
+ *      @dev: struct device pointer to the PCI device of the I2O controller
+ *      @addr: pointer to a i2o_dma struct DMA buffer
+ *      @len: new length of memory
+ *
+ *      If there was something allocated in the addr, free it first. If len > 0
+ *      than try to allocate it and write the addresses back to the addr
+ *      structure. If len == 0 set the virtual address to NULL.
+ *
+ *      Returns the 0 on success or negative error code on failure.
+ */
+int i2o_dma_realloc(struct device *dev, struct i2o_dma *addr, size_t len)
+{
+        i2o_dma_free(dev, addr);
+
+        if (len)
+                return i2o_dma_alloc(dev, addr, len);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(i2o_dma_realloc);
+
+/*
+ *      i2o_pool_alloc - Allocate an slab cache and mempool
+ *      @mempool: pointer to struct i2o_pool to write data into.
+ *      @name: name which is used to identify cache
+ *      @size: size of each object
+ *      @min_nr: minimum number of objects
+ *
+ *      First allocates a slab cache with name and size. Then allocates a
+ *      mempool which uses the slab cache for allocation and freeing.
+ *
+ *      Returns 0 on success or negative error code on failure.
+ */
+int i2o_pool_alloc(struct i2o_pool *pool, const char *name,
+                                 size_t size, int min_nr)
+{
+        pool->name = kmalloc(strlen(name) + 1, GFP_KERNEL);
+        if (!pool->name)
+                goto exit;
+        strcpy(pool->name, name);
+
+        pool->slab =
+            kmem_cache_create(pool->name, size, 0, SLAB_HWCACHE_ALIGN, NULL);
+        if (!pool->slab)
+                goto free_name;
+
+        pool->mempool = mempool_create_slab_pool(min_nr, pool->slab);
+        if (!pool->mempool)
+                goto free_slab;
+
+        return 0;
+
+free_slab:
+        kmem_cache_destroy(pool->slab);
+
+free_name:
+        kfree(pool->name);
+
+exit:
+        return -ENOMEM;
+}
+EXPORT_SYMBOL_GPL(i2o_pool_alloc);
+
+/*
+ *      i2o_pool_free - Free slab cache and mempool again
+ *      @mempool: pointer to struct i2o_pool which should be freed
+ *
+ *      Note that you have to return all objects to the mempool again before
+ *      calling i2o_pool_free().
+ */
+void i2o_pool_free(struct i2o_pool *pool)
+{
+        mempool_destroy(pool->mempool);
+        kmem_cache_destroy(pool->slab);
+        kfree(pool->name);
+};
+EXPORT_SYMBOL_GPL(i2o_pool_free);
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c
index 685a89547a51..610ef1204e68 100644
--- a/drivers/message/i2o/pci.c
+++ b/drivers/message/i2o/pci.c
@@ -186,31 +186,29 @@ static int __devinit i2o_pci_alloc(struct i2o_controller *c)
                 }
         }
 
-        if (i2o_dma_alloc(dev, &c->status, 8, GFP_KERNEL)) {
+        if (i2o_dma_alloc(dev, &c->status, 8)) {
                 i2o_pci_free(c);
                 return -ENOMEM;
         }
 
-        if (i2o_dma_alloc(dev, &c->hrt, sizeof(i2o_hrt), GFP_KERNEL)) {
+        if (i2o_dma_alloc(dev, &c->hrt, sizeof(i2o_hrt))) {
                 i2o_pci_free(c);
                 return -ENOMEM;
         }
 
-        if (i2o_dma_alloc(dev, &c->dlct, 8192, GFP_KERNEL)) {
+        if (i2o_dma_alloc(dev, &c->dlct, 8192)) {
                 i2o_pci_free(c);
                 return -ENOMEM;
         }
 
-        if (i2o_dma_alloc(dev, &c->status_block, sizeof(i2o_status_block),
-                          GFP_KERNEL)) {
+        if (i2o_dma_alloc(dev, &c->status_block, sizeof(i2o_status_block))) {
                 i2o_pci_free(c);
                 return -ENOMEM;
         }
 
-        if (i2o_dma_alloc
-            (dev, &c->out_queue,
-             I2O_MAX_OUTBOUND_MSG_FRAMES * I2O_OUTBOUND_MSG_FRAME_SIZE *
-             sizeof(u32), GFP_KERNEL)) {
+        if (i2o_dma_alloc(dev, &c->out_queue,
+                I2O_MAX_OUTBOUND_MSG_FRAMES * I2O_OUTBOUND_MSG_FRAME_SIZE *
+                                sizeof(u32))) {
                 i2o_pci_free(c);
                 return -ENOMEM;
         }
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 0dae245c6259..5eff8ad834d6 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -87,6 +87,44 @@ config MFD_TC6393XB
         help
           Support for Toshiba Mobile IO Controller TC6393XB
 
+config MFD_WM8400
+        tristate "Support Wolfson Microelectronics WM8400"
+        help
+          Support for the Wolfson Microelecronics WM8400 PMIC and audio
+          CODEC.  This driver adds provides common support for accessing
+          the device, additional drivers must be enabled in order to use
+          the functionality of the device.
+
+config MFD_WM8350
+        tristate
+
+config MFD_WM8350_CONFIG_MODE_0
+        bool
+        depends on MFD_WM8350
+
+config MFD_WM8350_CONFIG_MODE_1
+        bool
+        depends on MFD_WM8350
+
+config MFD_WM8350_CONFIG_MODE_2
+        bool
+        depends on MFD_WM8350
+
+config MFD_WM8350_CONFIG_MODE_3
+        bool
+        depends on MFD_WM8350
+
+config MFD_WM8350_I2C
+        tristate "Support Wolfson Microelectronics WM8350 with I2C"
+        select MFD_WM8350
+        depends on I2C
+        help
+          The WM8350 is an integrated audio and power management
+          subsystem with watchdog and RTC functionality for embedded
+          systems.  This option enables core support for the WM8350 with
+          I2C as the control interface.  Additional options must be
+          selected to enable support for the functionality of the chip.
+
 endmenu
 
 menu "Multimedia Capabilities Port drivers"
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 6abebe364419..759b1fe1c891 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -12,6 +12,11 @@ obj-$(CONFIG_MFD_T7L66XB)	+= t7l66xb.o
 obj-$(CONFIG_MFD_TC6387XB)      += tc6387xb.o
 obj-$(CONFIG_MFD_TC6393XB)      += tc6393xb.o
 
+obj-$(CONFIG_MFD_WM8400)        += wm8400-core.o
+wm8350-objs                     := wm8350-core.o wm8350-regmap.o wm8350-gpio.o
+obj-$(CONFIG_MFD_WM8350)        += wm8350.o
+obj-$(CONFIG_MFD_WM8350_I2C)    += wm8350-i2c.o
+
 obj-$(CONFIG_MFD_CORE)          += mfd-core.o
 
 obj-$(CONFIG_MCP)               += mcp-core.o
diff --git a/drivers/mfd/wm8350-core.c b/drivers/mfd/wm8350-core.c
new file mode 100644
index 000000000000..25a7a5d08bce
--- /dev/null
+++ b/drivers/mfd/wm8350-core.c
@@ -0,0 +1,1273 @@
+/*
+ * wm8350-core.c  --  Device access for Wolfson WM8350
+ *
+ * Copyright 2007, 2008 Wolfson Microelectronics PLC.
+ *
+ * Author: Liam Girdwood, Mark Brown
+ *
+ *  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.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/bug.h>
+#include <linux/device.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/workqueue.h>
+
+#include <linux/mfd/wm8350/core.h>
+#include <linux/mfd/wm8350/audio.h>
+#include <linux/mfd/wm8350/comparator.h>
+#include <linux/mfd/wm8350/gpio.h>
+#include <linux/mfd/wm8350/pmic.h>
+#include <linux/mfd/wm8350/rtc.h>
+#include <linux/mfd/wm8350/supply.h>
+#include <linux/mfd/wm8350/wdt.h>
+
+#define WM8350_UNLOCK_KEY               0x0013
+#define WM8350_LOCK_KEY                 0x0000
+
+#define WM8350_CLOCK_CONTROL_1          0x28
+#define WM8350_AIF_TEST                 0x74
+
+/* debug */
+#define WM8350_BUS_DEBUG 0
+#if WM8350_BUS_DEBUG
+#define dump(regs, src) do { \
+        int i_; \
+        u16 *src_ = src; \
+        printk(KERN_DEBUG); \
+        for (i_ = 0; i_ < regs; i_++) \
+                printk(" 0x%4.4x", *src_++); \
+        printk("\n"); \
+} while (0);
+#else
+#define dump(bytes, src)
+#endif
+
+#define WM8350_LOCK_DEBUG 0
+#if WM8350_LOCK_DEBUG
+#define ldbg(format, arg...) printk(format, ## arg)
+#else
+#define ldbg(format, arg...)
+#endif
+
+/*
+ * WM8350 Device IO
+ */
+static DEFINE_MUTEX(io_mutex);
+static DEFINE_MUTEX(reg_lock_mutex);
+static DEFINE_MUTEX(auxadc_mutex);
+
+/* Perform a physical read from the device.
+ */
+static int wm8350_phys_read(struct wm8350 *wm8350, u8 reg, int num_regs,
+                            u16 *dest)
+{
+        int i, ret;
+        int bytes = num_regs * 2;
+
+        dev_dbg(wm8350->dev, "volatile read\n");
+        ret = wm8350->read_dev(wm8350, reg, bytes, (char *)dest);
+
+        for (i = reg; i < reg + num_regs; i++) {
+                /* Cache is CPU endian */
+                dest[i - reg] = be16_to_cpu(dest[i - reg]);
+
+                /* Satisfy non-volatile bits from cache */
+                dest[i - reg] &= wm8350_reg_io_map[i].vol;
+                dest[i - reg] |= wm8350->reg_cache[i];
+
+                /* Mask out non-readable bits */
+                dest[i - reg] &= wm8350_reg_io_map[i].readable;
+        }
+
+        dump(num_regs, dest);
+
+        return ret;
+}
+
+static int wm8350_read(struct wm8350 *wm8350, u8 reg, int num_regs, u16 *dest)
+{
+        int i;
+        int end = reg + num_regs;
+        int ret = 0;
+        int bytes = num_regs * 2;
+
+        if (wm8350->read_dev == NULL)
+                return -ENODEV;
+
+        if ((reg + num_regs - 1) > WM8350_MAX_REGISTER) {
+                dev_err(wm8350->dev, "invalid reg %x\n",
+                        reg + num_regs - 1);
+                return -EINVAL;
+        }
+
+        dev_dbg(wm8350->dev,
+                "%s R%d(0x%2.2x) %d regs\n", __func__, reg, reg, num_regs);
+
+#if WM8350_BUS_DEBUG
+        /* we can _safely_ read any register, but warn if read not supported */
+        for (i = reg; i < end; i++) {
+                if (!wm8350_reg_io_map[i].readable)
+                        dev_warn(wm8350->dev,
+                                "reg R%d is not readable\n", i);
+        }
+#endif
+
+        /* if any volatile registers are required, then read back all */
+        for (i = reg; i < end; i++)
+                if (wm8350_reg_io_map[i].vol)
+                        return wm8350_phys_read(wm8350, reg, num_regs, dest);
+
+        /* no volatiles, then cache is good */
+        dev_dbg(wm8350->dev, "cache read\n");
+        memcpy(dest, &wm8350->reg_cache[reg], bytes);
+        dump(num_regs, dest);
+        return ret;
+}
+
+static inline int is_reg_locked(struct wm8350 *wm8350, u8 reg)
+{
+        if (reg == WM8350_SECURITY ||
+            wm8350->reg_cache[WM8350_SECURITY] == WM8350_UNLOCK_KEY)
+                return 0;
+
+        if ((reg == WM8350_GPIO_CONFIGURATION_I_O) ||
+            (reg >= WM8350_GPIO_FUNCTION_SELECT_1 &&
+             reg <= WM8350_GPIO_FUNCTION_SELECT_4) ||
+            (reg >= WM8350_BATTERY_CHARGER_CONTROL_1 &&
+             reg <= WM8350_BATTERY_CHARGER_CONTROL_3))
+                return 1;
+        return 0;
+}
+
+static int wm8350_write(struct wm8350 *wm8350, u8 reg, int num_regs, u16 *src)
+{
+        int i;
+        int end = reg + num_regs;
+        int bytes = num_regs * 2;
+
+        if (wm8350->write_dev == NULL)
+                return -ENODEV;
+
+        if ((reg + num_regs - 1) > WM8350_MAX_REGISTER) {
+                dev_err(wm8350->dev, "invalid reg %x\n",
+                        reg + num_regs - 1);
+                return -EINVAL;
+        }
+
+        /* it's generally not a good idea to write to RO or locked registers */
+        for (i = reg; i < end; i++) {
+                if (!wm8350_reg_io_map[i].writable) {
+                        dev_err(wm8350->dev,
+                                "attempted write to read only reg R%d\n", i);
+                        return -EINVAL;
+                }
+
+                if (is_reg_locked(wm8350, i)) {
+                        dev_err(wm8350->dev,
+                               "attempted write to locked reg R%d\n", i);
+                        return -EINVAL;
+                }
+
+                src[i - reg] &= wm8350_reg_io_map[i].writable;
+
+                wm8350->reg_cache[i] =
+                        (wm8350->reg_cache[i] & ~wm8350_reg_io_map[i].writable)
+                        | src[i - reg];
+
+                src[i - reg] = cpu_to_be16(src[i - reg]);
+        }
+
+        /* Actually write it out */
+        return wm8350->write_dev(wm8350, reg, bytes, (char *)src);
+}
+
+/*
+ * Safe read, modify, write methods
+ */
+int wm8350_clear_bits(struct wm8350 *wm8350, u16 reg, u16 mask)
+{
+        u16 data;
+        int err;
+
+        mutex_lock(&io_mutex);
+        err = wm8350_read(wm8350, reg, 1, &data);
+        if (err) {
+                dev_err(wm8350->dev, "read from reg R%d failed\n", reg);
+                goto out;
+        }
+
+        data &= ~mask;
+        err = wm8350_write(wm8350, reg, 1, &data);
+        if (err)
+                dev_err(wm8350->dev, "write to reg R%d failed\n", reg);
+out:
+        mutex_unlock(&io_mutex);
+        return err;
+}
+EXPORT_SYMBOL_GPL(wm8350_clear_bits);
+
+int wm8350_set_bits(struct wm8350 *wm8350, u16 reg, u16 mask)
+{
+        u16 data;
+        int err;
+
+        mutex_lock(&io_mutex);
+        err = wm8350_read(wm8350, reg, 1, &data);
+        if (err) {
+                dev_err(wm8350->dev, "read from reg R%d failed\n", reg);
+                goto out;
+        }
+
+        data |= mask;
+        err = wm8350_write(wm8350, reg, 1, &data);
+        if (err)
+                dev_err(wm8350->dev, "write to reg R%d failed\n", reg);
+out:
+        mutex_unlock(&io_mutex);
+        return err;
+}
+EXPORT_SYMBOL_GPL(wm8350_set_bits);
+
+u16 wm8350_reg_read(struct wm8350 *wm8350, int reg)
+{
+        u16 data;
+        int err;
+
+        mutex_lock(&io_mutex);
+        err = wm8350_read(wm8350, reg, 1, &data);
+        if (err)
+                dev_err(wm8350->dev, "read from reg R%d failed\n", reg);
+
+        mutex_unlock(&io_mutex);
+        return data;
+}
+EXPORT_SYMBOL_GPL(wm8350_reg_read);
+
+int wm8350_reg_write(struct wm8350 *wm8350, int reg, u16 val)
+{
+        int ret;
+        u16 data = val;
+
+        mutex_lock(&io_mutex);
+        ret = wm8350_write(wm8350, reg, 1, &data);
+        if (ret)
+                dev_err(wm8350->dev, "write to reg R%d failed\n", reg);
+        mutex_unlock(&io_mutex);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(wm8350_reg_write);
+
+int wm8350_block_read(struct wm8350 *wm8350, int start_reg, int regs,
+                      u16 *dest)
+{
+        int err = 0;
+
+        mutex_lock(&io_mutex);
+        err = wm8350_read(wm8350, start_reg, regs, dest);
+        if (err)
+                dev_err(wm8350->dev, "block read starting from R%d failed\n",
+                        start_reg);
+        mutex_unlock(&io_mutex);
+        return err;
+}
+EXPORT_SYMBOL_GPL(wm8350_block_read);
+
+int wm8350_block_write(struct wm8350 *wm8350, int start_reg, int regs,
+                       u16 *src)
+{
+        int ret = 0;
+
+        mutex_lock(&io_mutex);
+        ret = wm8350_write(wm8350, start_reg, regs, src);
+        if (ret)
+                dev_err(wm8350->dev, "block write starting at R%d failed\n",
+                        start_reg);
+        mutex_unlock(&io_mutex);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(wm8350_block_write);
+
+int wm8350_reg_lock(struct wm8350 *wm8350)
+{
+        u16 key = WM8350_LOCK_KEY;
+        int ret;
+
+        ldbg(__func__);
+        mutex_lock(&io_mutex);
+        ret = wm8350_write(wm8350, WM8350_SECURITY, 1, &key);
+        if (ret)
+                dev_err(wm8350->dev, "lock failed\n");
+        mutex_unlock(&io_mutex);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(wm8350_reg_lock);
+
+int wm8350_reg_unlock(struct wm8350 *wm8350)
+{
+        u16 key = WM8350_UNLOCK_KEY;
+        int ret;
+
+        ldbg(__func__);
+        mutex_lock(&io_mutex);
+        ret = wm8350_write(wm8350, WM8350_SECURITY, 1, &key);
+        if (ret)
+                dev_err(wm8350->dev, "unlock failed\n");
+        mutex_unlock(&io_mutex);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(wm8350_reg_unlock);
+
+static void wm8350_irq_call_handler(struct wm8350 *wm8350, int irq)
+{
+        mutex_lock(&wm8350->irq_mutex);
+
+        if (wm8350->irq[irq].handler)
+                wm8350->irq[irq].handler(wm8350, irq, wm8350->irq[irq].data);
+        else {
+                dev_err(wm8350->dev, "irq %d nobody cared. now masked.\n",
+                        irq);
+                wm8350_mask_irq(wm8350, irq);
+        }
+
+        mutex_unlock(&wm8350->irq_mutex);
+}
+
+/*
+ * wm8350_irq_worker actually handles the interrupts.  Since all
+ * interrupts are clear on read the IRQ line will be reasserted and
+ * the physical IRQ will be handled again if another interrupt is
+ * asserted while we run - in the normal course of events this is a
+ * rare occurrence so we save I2C/SPI reads.
+ */
+static void wm8350_irq_worker(struct work_struct *work)
+{
+        struct wm8350 *wm8350 = container_of(work, struct wm8350, irq_work);
+        u16 level_one, status1, status2, comp;
+
+        /* TODO: Use block reads to improve performance? */
+        level_one = wm8350_reg_read(wm8350, WM8350_SYSTEM_INTERRUPTS)
+                & ~wm8350_reg_read(wm8350, WM8350_SYSTEM_INTERRUPTS_MASK);
+        status1 = wm8350_reg_read(wm8350, WM8350_INT_STATUS_1)
+                & ~wm8350_reg_read(wm8350, WM8350_INT_STATUS_1_MASK);
+        status2 = wm8350_reg_read(wm8350, WM8350_INT_STATUS_2)
+                & ~wm8350_reg_read(wm8350, WM8350_INT_STATUS_2_MASK);
+        comp = wm8350_reg_read(wm8350, WM8350_COMPARATOR_INT_STATUS)
+                & ~wm8350_reg_read(wm8350, WM8350_COMPARATOR_INT_STATUS_MASK);
+
+        /* over current */
+        if (level_one & WM8350_OC_INT) {
+                u16 oc;
+
+                oc = wm8350_reg_read(wm8350, WM8350_OVER_CURRENT_INT_STATUS);
+                oc &= ~wm8350_reg_read(wm8350,
+                                       WM8350_OVER_CURRENT_INT_STATUS_MASK);
+
+                if (oc & WM8350_OC_LS_EINT)     /* limit switch */
+                        wm8350_irq_call_handler(wm8350, WM8350_IRQ_OC_LS);
+        }
+
+        /* under voltage */
+        if (level_one & WM8350_UV_INT) {
+                u16 uv;
+
+                uv = wm8350_reg_read(wm8350, WM8350_UNDER_VOLTAGE_INT_STATUS);
+                uv &= ~wm8350_reg_read(wm8350,
+                                       WM8350_UNDER_VOLTAGE_INT_STATUS_MASK);
+
+                if (uv & WM8350_UV_DC1_EINT)
+                        wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_DC1);
+                if (uv & WM8350_UV_DC2_EINT)
+                        wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_DC2);
+                if (uv & WM8350_UV_DC3_EINT)
+                        wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_DC3);
+                if (uv & WM8350_UV_DC4_EINT)
+                        wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_DC4);
+                if (uv & WM8350_UV_DC5_EINT)
+                        wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_DC5);
+                if (uv & WM8350_UV_DC6_EINT)
+                        wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_DC6);
+                if (uv & WM8350_UV_LDO1_EINT)
+                        wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_LDO1);
+                if (uv & WM8350_UV_LDO2_EINT)
+                        wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_LDO2);
+                if (uv & WM8350_UV_LDO3_EINT)
+                        wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_LDO3);
+                if (uv & WM8350_UV_LDO4_EINT)
+                        wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_LDO4);
+        }
+
+        /* charger, RTC */
+        if (status1) {
+                if (status1 & WM8350_CHG_BAT_HOT_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_CHG_BAT_HOT);
+                if (status1 & WM8350_CHG_BAT_COLD_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_CHG_BAT_COLD);
+                if (status1 & WM8350_CHG_BAT_FAIL_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_CHG_BAT_FAIL);
+                if (status1 & WM8350_CHG_TO_EINT)
+                        wm8350_irq_call_handler(wm8350, WM8350_IRQ_CHG_TO);
+                if (status1 & WM8350_CHG_END_EINT)
+                        wm8350_irq_call_handler(wm8350, WM8350_IRQ_CHG_END);
+                if (status1 & WM8350_CHG_START_EINT)
+                        wm8350_irq_call_handler(wm8350, WM8350_IRQ_CHG_START);
+                if (status1 & WM8350_CHG_FAST_RDY_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_CHG_FAST_RDY);
+                if (status1 & WM8350_CHG_VBATT_LT_3P9_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_CHG_VBATT_LT_3P9);
+                if (status1 & WM8350_CHG_VBATT_LT_3P1_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_CHG_VBATT_LT_3P1);
+                if (status1 & WM8350_CHG_VBATT_LT_2P85_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_CHG_VBATT_LT_2P85);
+                if (status1 & WM8350_RTC_ALM_EINT)
+                        wm8350_irq_call_handler(wm8350, WM8350_IRQ_RTC_ALM);
+                if (status1 & WM8350_RTC_SEC_EINT)
+                        wm8350_irq_call_handler(wm8350, WM8350_IRQ_RTC_SEC);
+                if (status1 & WM8350_RTC_PER_EINT)
+                        wm8350_irq_call_handler(wm8350, WM8350_IRQ_RTC_PER);
+        }
+
+        /* current sink, system, aux adc */
+        if (status2) {
+                if (status2 & WM8350_CS1_EINT)
+                        wm8350_irq_call_handler(wm8350, WM8350_IRQ_CS1);
+                if (status2 & WM8350_CS2_EINT)
+                        wm8350_irq_call_handler(wm8350, WM8350_IRQ_CS2);
+
+                if (status2 & WM8350_SYS_HYST_COMP_FAIL_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_SYS_HYST_COMP_FAIL);
+                if (status2 & WM8350_SYS_CHIP_GT115_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_SYS_CHIP_GT115);
+                if (status2 & WM8350_SYS_CHIP_GT140_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_SYS_CHIP_GT140);
+                if (status2 & WM8350_SYS_WDOG_TO_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_SYS_WDOG_TO);
+
+                if (status2 & WM8350_AUXADC_DATARDY_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_AUXADC_DATARDY);
+                if (status2 & WM8350_AUXADC_DCOMP4_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_AUXADC_DCOMP4);
+                if (status2 & WM8350_AUXADC_DCOMP3_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_AUXADC_DCOMP3);
+                if (status2 & WM8350_AUXADC_DCOMP2_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_AUXADC_DCOMP2);
+                if (status2 & WM8350_AUXADC_DCOMP1_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_AUXADC_DCOMP1);
+
+                if (status2 & WM8350_USB_LIMIT_EINT)
+                        wm8350_irq_call_handler(wm8350, WM8350_IRQ_USB_LIMIT);
+        }
+
+        /* wake, codec, ext */
+        if (comp) {
+                if (comp & WM8350_WKUP_OFF_STATE_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_WKUP_OFF_STATE);
+                if (comp & WM8350_WKUP_HIB_STATE_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_WKUP_HIB_STATE);
+                if (comp & WM8350_WKUP_CONV_FAULT_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_WKUP_CONV_FAULT);
+                if (comp & WM8350_WKUP_WDOG_RST_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_WKUP_WDOG_RST);
+                if (comp & WM8350_WKUP_GP_PWR_ON_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_WKUP_GP_PWR_ON);
+                if (comp & WM8350_WKUP_ONKEY_EINT)
+                        wm8350_irq_call_handler(wm8350, WM8350_IRQ_WKUP_ONKEY);
+                if (comp & WM8350_WKUP_GP_WAKEUP_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_WKUP_GP_WAKEUP);
+
+                if (comp & WM8350_CODEC_JCK_DET_L_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_CODEC_JCK_DET_L);
+                if (comp & WM8350_CODEC_JCK_DET_R_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_CODEC_JCK_DET_R);
+                if (comp & WM8350_CODEC_MICSCD_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_CODEC_MICSCD);
+                if (comp & WM8350_CODEC_MICD_EINT)
+                        wm8350_irq_call_handler(wm8350, WM8350_IRQ_CODEC_MICD);
+
+                if (comp & WM8350_EXT_USB_FB_EINT)
+                        wm8350_irq_call_handler(wm8350, WM8350_IRQ_EXT_USB_FB);
+                if (comp & WM8350_EXT_WALL_FB_EINT)
+                        wm8350_irq_call_handler(wm8350,
+                                                WM8350_IRQ_EXT_WALL_FB);
+                if (comp & WM8350_EXT_BAT_FB_EINT)
+                        wm8350_irq_call_handler(wm8350, WM8350_IRQ_EXT_BAT_FB);
+        }
+
+        if (level_one & WM8350_GP_INT) {
+                int i;
+                u16 gpio;
+
+                gpio = wm8350_reg_read(wm8350, WM8350_GPIO_INT_STATUS);
+                gpio &= ~wm8350_reg_read(wm8350,
+                                         WM8350_GPIO_INT_STATUS_MASK);
+
+                for (i = 0; i < 12; i++) {
+                        if (gpio & (1 << i))
+                                wm8350_irq_call_handler(wm8350,
+                                                        WM8350_IRQ_GPIO(i));
+                }
+        }
+
+        enable_irq(wm8350->chip_irq);
+}
+
+static irqreturn_t wm8350_irq(int irq, void *data)
+{
+        struct wm8350 *wm8350 = data;
+
+        disable_irq_nosync(irq);
+        schedule_work(&wm8350->irq_work);
+
+        return IRQ_HANDLED;
+}
+
+int wm8350_register_irq(struct wm8350 *wm8350, int irq,
+                        void (*handler) (struct wm8350 *, int, void *),
+                        void *data)
+{
+        if (irq < 0 || irq > WM8350_NUM_IRQ || !handler)
+                return -EINVAL;
+
+        if (wm8350->irq[irq].handler)
+                return -EBUSY;
+
+        mutex_lock(&wm8350->irq_mutex);
+        wm8350->irq[irq].handler = handler;
+        wm8350->irq[irq].data = data;
+        mutex_unlock(&wm8350->irq_mutex);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(wm8350_register_irq);
+
+int wm8350_free_irq(struct wm8350 *wm8350, int irq)
+{
+        if (irq < 0 || irq > WM8350_NUM_IRQ)
+                return -EINVAL;
+
+        mutex_lock(&wm8350->irq_mutex);
+        wm8350->irq[irq].handler = NULL;
+        mutex_unlock(&wm8350->irq_mutex);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(wm8350_free_irq);
+
+int wm8350_mask_irq(struct wm8350 *wm8350, int irq)
+{
+        switch (irq) {
+        case WM8350_IRQ_CHG_BAT_HOT:
+                return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                       WM8350_IM_CHG_BAT_HOT_EINT);
+        case WM8350_IRQ_CHG_BAT_COLD:
+                return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                       WM8350_IM_CHG_BAT_COLD_EINT);
+        case WM8350_IRQ_CHG_BAT_FAIL:
+                return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                       WM8350_IM_CHG_BAT_FAIL_EINT);
+        case WM8350_IRQ_CHG_TO:
+                return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                       WM8350_IM_CHG_TO_EINT);
+        case WM8350_IRQ_CHG_END:
+                return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                       WM8350_IM_CHG_END_EINT);
+        case WM8350_IRQ_CHG_START:
+                return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                       WM8350_IM_CHG_START_EINT);
+        case WM8350_IRQ_CHG_FAST_RDY:
+                return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                       WM8350_IM_CHG_FAST_RDY_EINT);
+        case WM8350_IRQ_RTC_PER:
+                return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                       WM8350_IM_RTC_PER_EINT);
+        case WM8350_IRQ_RTC_SEC:
+                return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                       WM8350_IM_RTC_SEC_EINT);
+        case WM8350_IRQ_RTC_ALM:
+                return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                       WM8350_IM_RTC_ALM_EINT);
+        case WM8350_IRQ_CHG_VBATT_LT_3P9:
+                return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                       WM8350_IM_CHG_VBATT_LT_3P9_EINT);
+        case WM8350_IRQ_CHG_VBATT_LT_3P1:
+                return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                       WM8350_IM_CHG_VBATT_LT_3P1_EINT);
+        case WM8350_IRQ_CHG_VBATT_LT_2P85:
+                return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                       WM8350_IM_CHG_VBATT_LT_2P85_EINT);
+        case WM8350_IRQ_CS1:
+                return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,
+                                       WM8350_IM_CS1_EINT);
+        case WM8350_IRQ_CS2:
+                return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,
+                                       WM8350_IM_CS2_EINT);
+        case WM8350_IRQ_USB_LIMIT:
+                return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,
+                                       WM8350_IM_USB_LIMIT_EINT);
+        case WM8350_IRQ_AUXADC_DATARDY:
+                return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,
+                                       WM8350_IM_AUXADC_DATARDY_EINT);
+        case WM8350_IRQ_AUXADC_DCOMP4:
+                return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,
+                                       WM8350_IM_AUXADC_DCOMP4_EINT);
+        case WM8350_IRQ_AUXADC_DCOMP3:
+                return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,
+                                       WM8350_IM_AUXADC_DCOMP3_EINT);
+        case WM8350_IRQ_AUXADC_DCOMP2:
+                return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,
+                                       WM8350_IM_AUXADC_DCOMP2_EINT);
+        case WM8350_IRQ_AUXADC_DCOMP1:
+                return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,
+                                       WM8350_IM_AUXADC_DCOMP1_EINT);
+        case WM8350_IRQ_SYS_HYST_COMP_FAIL:
+                return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,
+                                       WM8350_IM_SYS_HYST_COMP_FAIL_EINT);
+        case WM8350_IRQ_SYS_CHIP_GT115:
+                return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,
+                                       WM8350_IM_SYS_CHIP_GT115_EINT);
+        case WM8350_IRQ_SYS_CHIP_GT140:
+                return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,
+                                       WM8350_IM_SYS_CHIP_GT140_EINT);
+        case WM8350_IRQ_SYS_WDOG_TO:
+                return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,
+                                       WM8350_IM_SYS_WDOG_TO_EINT);
+        case WM8350_IRQ_UV_LDO4:
+                return wm8350_set_bits(wm8350,
+                                       WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
+                                       WM8350_IM_UV_LDO4_EINT);
+        case WM8350_IRQ_UV_LDO3:
+                return wm8350_set_bits(wm8350,
+                                       WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
+                                       WM8350_IM_UV_LDO3_EINT);
+        case WM8350_IRQ_UV_LDO2:
+                return wm8350_set_bits(wm8350,
+                                       WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
+                                       WM8350_IM_UV_LDO2_EINT);
+        case WM8350_IRQ_UV_LDO1:
+                return wm8350_set_bits(wm8350,
+                                       WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
+                                       WM8350_IM_UV_LDO1_EINT);
+        case WM8350_IRQ_UV_DC6:
+                return wm8350_set_bits(wm8350,
+                                       WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
+                                       WM8350_IM_UV_DC6_EINT);
+        case WM8350_IRQ_UV_DC5:
+                return wm8350_set_bits(wm8350,
+                                       WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
+                                       WM8350_IM_UV_DC5_EINT);
+        case WM8350_IRQ_UV_DC4:
+                return wm8350_set_bits(wm8350,
+                                       WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
+                                       WM8350_IM_UV_DC4_EINT);
+        case WM8350_IRQ_UV_DC3:
+                return wm8350_set_bits(wm8350,
+                                       WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
+                                       WM8350_IM_UV_DC3_EINT);
+        case WM8350_IRQ_UV_DC2:
+                return wm8350_set_bits(wm8350,
+                                       WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
+                                       WM8350_IM_UV_DC2_EINT);
+        case WM8350_IRQ_UV_DC1:
+                return wm8350_set_bits(wm8350,
+                                       WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
+                                       WM8350_IM_UV_DC1_EINT);
+        case WM8350_IRQ_OC_LS:
+                return wm8350_set_bits(wm8350,
+                                       WM8350_OVER_CURRENT_INT_STATUS_MASK,
+                                       WM8350_IM_OC_LS_EINT);
+        case WM8350_IRQ_EXT_USB_FB:
+                return wm8350_set_bits(wm8350,
+                                       WM8350_COMPARATOR_INT_STATUS_MASK,
+                                       WM8350_IM_EXT_USB_FB_EINT);
+        case WM8350_IRQ_EXT_WALL_FB:
+                return wm8350_set_bits(wm8350,
+                                       WM8350_COMPARATOR_INT_STATUS_MASK,
+                                       WM8350_IM_EXT_WALL_FB_EINT);
+        case WM8350_IRQ_EXT_BAT_FB:
+                return wm8350_set_bits(wm8350,
+                                       WM8350_COMPARATOR_INT_STATUS_MASK,
+                                       WM8350_IM_EXT_BAT_FB_EINT);
+        case WM8350_IRQ_CODEC_JCK_DET_L:
+                return wm8350_set_bits(wm8350,
+                                       WM8350_COMPARATOR_INT_STATUS_MASK,
+                                       WM8350_IM_CODEC_JCK_DET_L_EINT);
+        case WM8350_IRQ_CODEC_JCK_DET_R:
+                return wm8350_set_bits(wm8350,
+                                       WM8350_COMPARATOR_INT_STATUS_MASK,
+                                       WM8350_IM_CODEC_JCK_DET_R_EINT);
+        case WM8350_IRQ_CODEC_MICSCD:
+                return wm8350_set_bits(wm8350,
+                                       WM8350_COMPARATOR_INT_STATUS_MASK,
+                                       WM8350_IM_CODEC_MICSCD_EINT);
+        case WM8350_IRQ_CODEC_MICD:
+                return wm8350_set_bits(wm8350,
+                                       WM8350_COMPARATOR_INT_STATUS_MASK,
+                                       WM8350_IM_CODEC_MICD_EINT);
+        case WM8350_IRQ_WKUP_OFF_STATE:
+                return wm8350_set_bits(wm8350,
+                                       WM8350_COMPARATOR_INT_STATUS_MASK,
+                                       WM8350_IM_WKUP_OFF_STATE_EINT);
+        case WM8350_IRQ_WKUP_HIB_STATE:
+                return wm8350_set_bits(wm8350,
+                                       WM8350_COMPARATOR_INT_STATUS_MASK,
+                                       WM8350_IM_WKUP_HIB_STATE_EINT);
+        case WM8350_IRQ_WKUP_CONV_FAULT:
+                return wm8350_set_bits(wm8350,
+                                       WM8350_COMPARATOR_INT_STATUS_MASK,
+                                       WM8350_IM_WKUP_CONV_FAULT_EINT);
+        case WM8350_IRQ_WKUP_WDOG_RST:
+                return wm8350_set_bits(wm8350,
+                                       WM8350_COMPARATOR_INT_STATUS_MASK,
+                                       WM8350_IM_WKUP_OFF_STATE_EINT);
+        case WM8350_IRQ_WKUP_GP_PWR_ON:
+                return wm8350_set_bits(wm8350,
+                                       WM8350_COMPARATOR_INT_STATUS_MASK,
+                                       WM8350_IM_WKUP_GP_PWR_ON_EINT);
+        case WM8350_IRQ_WKUP_ONKEY:
+                return wm8350_set_bits(wm8350,
+                                       WM8350_COMPARATOR_INT_STATUS_MASK,
+                                       WM8350_IM_WKUP_ONKEY_EINT);
+        case WM8350_IRQ_WKUP_GP_WAKEUP:
+                return wm8350_set_bits(wm8350,
+                                       WM8350_COMPARATOR_INT_STATUS_MASK,
+                                       WM8350_IM_WKUP_GP_WAKEUP_EINT);
+        case WM8350_IRQ_GPIO(0):
+                return wm8350_set_bits(wm8350,
+                                       WM8350_GPIO_INT_STATUS_MASK,
+                                       WM8350_IM_GP0_EINT);
+        case WM8350_IRQ_GPIO(1):
+                return wm8350_set_bits(wm8350,
+                                       WM8350_GPIO_INT_STATUS_MASK,
+                                       WM8350_IM_GP1_EINT);
+        case WM8350_IRQ_GPIO(2):
+                return wm8350_set_bits(wm8350,
+                                       WM8350_GPIO_INT_STATUS_MASK,
+                                       WM8350_IM_GP2_EINT);
+        case WM8350_IRQ_GPIO(3):
+                return wm8350_set_bits(wm8350,
+                                       WM8350_GPIO_INT_STATUS_MASK,
+                                       WM8350_IM_GP3_EINT);
+        case WM8350_IRQ_GPIO(4):
+                return wm8350_set_bits(wm8350,
+                                       WM8350_GPIO_INT_STATUS_MASK,
+                                       WM8350_IM_GP4_EINT);
+        case WM8350_IRQ_GPIO(5):
+                return wm8350_set_bits(wm8350,
+                                       WM8350_GPIO_INT_STATUS_MASK,
+                                       WM8350_IM_GP5_EINT);
+        case WM8350_IRQ_GPIO(6):
+                return wm8350_set_bits(wm8350,
+                                       WM8350_GPIO_INT_STATUS_MASK,
+                                       WM8350_IM_GP6_EINT);
+        case WM8350_IRQ_GPIO(7):
+                return wm8350_set_bits(wm8350,
+                                       WM8350_GPIO_INT_STATUS_MASK,
+                                       WM8350_IM_GP7_EINT);
+        case WM8350_IRQ_GPIO(8):
+                return wm8350_set_bits(wm8350,
+                                       WM8350_GPIO_INT_STATUS_MASK,
+                                       WM8350_IM_GP8_EINT);
+        case WM8350_IRQ_GPIO(9):
+                return wm8350_set_bits(wm8350,
+                                       WM8350_GPIO_INT_STATUS_MASK,
+                                       WM8350_IM_GP9_EINT);
+        case WM8350_IRQ_GPIO(10):
+                return wm8350_set_bits(wm8350,
+                                       WM8350_GPIO_INT_STATUS_MASK,
+                                       WM8350_IM_GP10_EINT);
+        case WM8350_IRQ_GPIO(11):
+                return wm8350_set_bits(wm8350,
+                                       WM8350_GPIO_INT_STATUS_MASK,
+                                       WM8350_IM_GP11_EINT);
+        case WM8350_IRQ_GPIO(12):
+                return wm8350_set_bits(wm8350,
+                                       WM8350_GPIO_INT_STATUS_MASK,
+                                       WM8350_IM_GP12_EINT);
+        default:
+                dev_warn(wm8350->dev, "Attempting to mask unknown IRQ %d\n",
+                         irq);
+                return -EINVAL;
+        }
+        return 0;
+}
+EXPORT_SYMBOL_GPL(wm8350_mask_irq);
+
+int wm8350_unmask_irq(struct wm8350 *wm8350, int irq)
+{
+        switch (irq) {
+        case WM8350_IRQ_CHG_BAT_HOT:
+                return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                         WM8350_IM_CHG_BAT_HOT_EINT);
+        case WM8350_IRQ_CHG_BAT_COLD:
+                return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                         WM8350_IM_CHG_BAT_COLD_EINT);
+        case WM8350_IRQ_CHG_BAT_FAIL:
+                return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                         WM8350_IM_CHG_BAT_FAIL_EINT);
+        case WM8350_IRQ_CHG_TO:
+                return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                         WM8350_IM_CHG_TO_EINT);
+        case WM8350_IRQ_CHG_END:
+                return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                         WM8350_IM_CHG_END_EINT);
+        case WM8350_IRQ_CHG_START:
+                return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                         WM8350_IM_CHG_START_EINT);
+        case WM8350_IRQ_CHG_FAST_RDY:
+                return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                         WM8350_IM_CHG_FAST_RDY_EINT);
+        case WM8350_IRQ_RTC_PER:
+                return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                         WM8350_IM_RTC_PER_EINT);
+        case WM8350_IRQ_RTC_SEC:
+                return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                         WM8350_IM_RTC_SEC_EINT);
+        case WM8350_IRQ_RTC_ALM:
+                return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                         WM8350_IM_RTC_ALM_EINT);
+        case WM8350_IRQ_CHG_VBATT_LT_3P9:
+                return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                         WM8350_IM_CHG_VBATT_LT_3P9_EINT);
+        case WM8350_IRQ_CHG_VBATT_LT_3P1:
+                return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                         WM8350_IM_CHG_VBATT_LT_3P1_EINT);
+        case WM8350_IRQ_CHG_VBATT_LT_2P85:
+                return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
+                                         WM8350_IM_CHG_VBATT_LT_2P85_EINT);
+        case WM8350_IRQ_CS1:
+                return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,
+                                         WM8350_IM_CS1_EINT);
+        case WM8350_IRQ_CS2:
+                return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,
+                                         WM8350_IM_CS2_EINT);
+        case WM8350_IRQ_USB_LIMIT:
+                return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,
+                                         WM8350_IM_USB_LIMIT_EINT);
+        case WM8350_IRQ_AUXADC_DATARDY:
+                return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,
+                                         WM8350_IM_AUXADC_DATARDY_EINT);
+        case WM8350_IRQ_AUXADC_DCOMP4:
+                return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,
+                                         WM8350_IM_AUXADC_DCOMP4_EINT);
+        case WM8350_IRQ_AUXADC_DCOMP3:
+                return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,
+                                         WM8350_IM_AUXADC_DCOMP3_EINT);
+        case WM8350_IRQ_AUXADC_DCOMP2:
+                return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,
+                                         WM8350_IM_AUXADC_DCOMP2_EINT);
+        case WM8350_IRQ_AUXADC_DCOMP1:
+                return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,
+                                         WM8350_IM_AUXADC_DCOMP1_EINT);
+        case WM8350_IRQ_SYS_HYST_COMP_FAIL:
+                return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,
+                                         WM8350_IM_SYS_HYST_COMP_FAIL_EINT);
+        case WM8350_IRQ_SYS_CHIP_GT115:
+                return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,
+                                         WM8350_IM_SYS_CHIP_GT115_EINT);
+        case WM8350_IRQ_SYS_CHIP_GT140:
+                return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,
+                                         WM8350_IM_SYS_CHIP_GT140_EINT);
+        case WM8350_IRQ_SYS_WDOG_TO:
+                return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,
+                                         WM8350_IM_SYS_WDOG_TO_EINT);
+        case WM8350_IRQ_UV_LDO4:
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
+                                         WM8350_IM_UV_LDO4_EINT);
+        case WM8350_IRQ_UV_LDO3:
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
+                                         WM8350_IM_UV_LDO3_EINT);
+        case WM8350_IRQ_UV_LDO2:
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
+                                         WM8350_IM_UV_LDO2_EINT);
+        case WM8350_IRQ_UV_LDO1:
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
+                                         WM8350_IM_UV_LDO1_EINT);
+        case WM8350_IRQ_UV_DC6:
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
+                                         WM8350_IM_UV_DC6_EINT);
+        case WM8350_IRQ_UV_DC5:
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
+                                         WM8350_IM_UV_DC5_EINT);
+        case WM8350_IRQ_UV_DC4:
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
+                                         WM8350_IM_UV_DC4_EINT);
+        case WM8350_IRQ_UV_DC3:
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
+                                         WM8350_IM_UV_DC3_EINT);
+        case WM8350_IRQ_UV_DC2:
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
+                                         WM8350_IM_UV_DC2_EINT);
+        case WM8350_IRQ_UV_DC1:
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
+                                         WM8350_IM_UV_DC1_EINT);
+        case WM8350_IRQ_OC_LS:
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_OVER_CURRENT_INT_STATUS_MASK,
+                                         WM8350_IM_OC_LS_EINT);
+        case WM8350_IRQ_EXT_USB_FB:
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_COMPARATOR_INT_STATUS_MASK,
+                                         WM8350_IM_EXT_USB_FB_EINT);
+        case WM8350_IRQ_EXT_WALL_FB:
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_COMPARATOR_INT_STATUS_MASK,
+                                         WM8350_IM_EXT_WALL_FB_EINT);
+        case WM8350_IRQ_EXT_BAT_FB:
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_COMPARATOR_INT_STATUS_MASK,
+                                         WM8350_IM_EXT_BAT_FB_EINT);
+        case WM8350_IRQ_CODEC_JCK_DET_L:
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_COMPARATOR_INT_STATUS_MASK,
+                                         WM8350_IM_CODEC_JCK_DET_L_EINT);
+        case WM8350_IRQ_CODEC_JCK_DET_R:
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_COMPARATOR_INT_STATUS_MASK,
+                                         WM8350_IM_CODEC_JCK_DET_R_EINT);
+        case WM8350_IRQ_CODEC_MICSCD:
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_COMPARATOR_INT_STATUS_MASK,
+                                         WM8350_IM_CODEC_MICSCD_EINT);
+        case WM8350_IRQ_CODEC_MICD:
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_COMPARATOR_INT_STATUS_MASK,
+                                         WM8350_IM_CODEC_MICD_EINT);
+        case WM8350_IRQ_WKUP_OFF_STATE:
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_COMPARATOR_INT_STATUS_MASK,
+                                         WM8350_IM_WKUP_OFF_STATE_EINT);
+        case WM8350_IRQ_WKUP_HIB_STATE:
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_COMPARATOR_INT_STATUS_MASK,
+                                         WM8350_IM_WKUP_HIB_STATE_EINT);
+        case WM8350_IRQ_WKUP_CONV_FAULT:
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_COMPARATOR_INT_STATUS_MASK,
+                                         WM8350_IM_WKUP_CONV_FAULT_EINT);
+        case WM8350_IRQ_WKUP_WDOG_RST:
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_COMPARATOR_INT_STATUS_MASK,
+                                         WM8350_IM_WKUP_OFF_STATE_EINT);
+        case WM8350_IRQ_WKUP_GP_PWR_ON:
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_COMPARATOR_INT_STATUS_MASK,
+                                         WM8350_IM_WKUP_GP_PWR_ON_EINT);
+        case WM8350_IRQ_WKUP_ONKEY:
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_COMPARATOR_INT_STATUS_MASK,
+                                         WM8350_IM_WKUP_ONKEY_EINT);
+        case WM8350_IRQ_WKUP_GP_WAKEUP:
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_COMPARATOR_INT_STATUS_MASK,
+                                         WM8350_IM_WKUP_GP_WAKEUP_EINT);
+        case WM8350_IRQ_GPIO(0):
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_GPIO_INT_STATUS_MASK,
+                                         WM8350_IM_GP0_EINT);
+        case WM8350_IRQ_GPIO(1):
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_GPIO_INT_STATUS_MASK,
+                                         WM8350_IM_GP1_EINT);
+        case WM8350_IRQ_GPIO(2):
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_GPIO_INT_STATUS_MASK,
+                                         WM8350_IM_GP2_EINT);
+        case WM8350_IRQ_GPIO(3):
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_GPIO_INT_STATUS_MASK,
+                                         WM8350_IM_GP3_EINT);
+        case WM8350_IRQ_GPIO(4):
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_GPIO_INT_STATUS_MASK,
+                                         WM8350_IM_GP4_EINT);
+        case WM8350_IRQ_GPIO(5):
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_GPIO_INT_STATUS_MASK,
+                                         WM8350_IM_GP5_EINT);
+        case WM8350_IRQ_GPIO(6):
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_GPIO_INT_STATUS_MASK,
+                                         WM8350_IM_GP6_EINT);
+        case WM8350_IRQ_GPIO(7):
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_GPIO_INT_STATUS_MASK,
+                                         WM8350_IM_GP7_EINT);
+        case WM8350_IRQ_GPIO(8):
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_GPIO_INT_STATUS_MASK,
+                                         WM8350_IM_GP8_EINT);
+        case WM8350_IRQ_GPIO(9):
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_GPIO_INT_STATUS_MASK,
+                                         WM8350_IM_GP9_EINT);
+        case WM8350_IRQ_GPIO(10):
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_GPIO_INT_STATUS_MASK,
+                                         WM8350_IM_GP10_EINT);
+        case WM8350_IRQ_GPIO(11):
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_GPIO_INT_STATUS_MASK,
+                                         WM8350_IM_GP11_EINT);
+        case WM8350_IRQ_GPIO(12):
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_GPIO_INT_STATUS_MASK,
+                                         WM8350_IM_GP12_EINT);
+        default:
+                dev_warn(wm8350->dev, "Attempting to unmask unknown IRQ %d\n",
+                         irq);
+                return -EINVAL;
+        }
+        return 0;
+}
+EXPORT_SYMBOL_GPL(wm8350_unmask_irq);
+
+/*
+ * Cache is always host endian.
+ */
+static int wm8350_create_cache(struct wm8350 *wm8350, int mode)
+{
+        int i, ret = 0;
+        u16 value;
+        const u16 *reg_map;
+
+        switch (mode) {
+#ifdef CONFIG_MFD_WM8350_CONFIG_MODE_0
+        case 0:
+                reg_map = wm8350_mode0_defaults;
+                break;
+#endif
+#ifdef CONFIG_MFD_WM8350_CONFIG_MODE_1
+        case 1:
+                reg_map = wm8350_mode1_defaults;
+                break;
+#endif
+#ifdef CONFIG_MFD_WM8350_CONFIG_MODE_2
+        case 2:
+                reg_map = wm8350_mode2_defaults;
+                break;
+#endif
+#ifdef CONFIG_MFD_WM8350_CONFIG_MODE_3
+        case 3:
+                reg_map = wm8350_mode3_defaults;
+                break;
+#endif
+        default:
+                dev_err(wm8350->dev, "Configuration mode %d not supported\n",
+                        mode);
+                return -EINVAL;
+        }
+
+        wm8350->reg_cache =
+            kzalloc(sizeof(u16) * (WM8350_MAX_REGISTER + 1), GFP_KERNEL);
+        if (wm8350->reg_cache == NULL)
+                return -ENOMEM;
+
+        /* Read the initial cache state back from the device - this is
+         * a PMIC so the device many not be in a virgin state and we
+         * can't rely on the silicon values.
+         */
+        for (i = 0; i < WM8350_MAX_REGISTER; i++) {
+                /* audio register range */
+                if (wm8350_reg_io_map[i].readable &&
+                    (i < WM8350_CLOCK_CONTROL_1 || i > WM8350_AIF_TEST)) {
+                        ret = wm8350->read_dev(wm8350, i, 2, (char *)&value);
+                        if (ret < 0) {
+                                dev_err(wm8350->dev,
+                                       "failed to read initial cache value\n");
+                                goto out;
+                        }
+                        value = be16_to_cpu(value);
+                        value &= wm8350_reg_io_map[i].readable;
+                        wm8350->reg_cache[i] = value;
+                } else
+                        wm8350->reg_cache[i] = reg_map[i];
+        }
+
+out:
+        return ret;
+}
+EXPORT_SYMBOL_GPL(wm8350_create_cache);
+
+/*
+ * Register a client device.  This is non-fatal since there is no need to
+ * fail the entire device init due to a single platform device failing.
+ */
+static void wm8350_client_dev_register(struct wm8350 *wm8350,
+                                       const char *name,
+                                       struct platform_device **pdev)
+{
+        int ret;
+
+        *pdev = platform_device_alloc(name, -1);
+        if (pdev == NULL) {
+                dev_err(wm8350->dev, "Failed to allocate %s\n", name);
+                return;
+        }
+
+        (*pdev)->dev.parent = wm8350->dev;
+        platform_set_drvdata(*pdev, wm8350);
+        ret = platform_device_add(*pdev);
+        if (ret != 0) {
+                dev_err(wm8350->dev, "Failed to register %s: %d\n", name, ret);
+                platform_device_put(*pdev);
+                *pdev = NULL;
+        }
+}
+
+int wm8350_device_init(struct wm8350 *wm8350, int irq,
+                       struct wm8350_platform_data *pdata)
+{
+        int ret = -EINVAL;
+        u16 id1, id2, mask, mode;
+
+        /* get WM8350 revision and config mode */
+        wm8350->read_dev(wm8350, WM8350_RESET_ID, sizeof(id1), &id1);
+        wm8350->read_dev(wm8350, WM8350_ID, sizeof(id2), &id2);
+
+        id1 = be16_to_cpu(id1);
+        id2 = be16_to_cpu(id2);
+
+        if (id1 == 0x6143) {
+                switch ((id2 & WM8350_CHIP_REV_MASK) >> 12) {
+                case WM8350_REV_E:
+                        dev_info(wm8350->dev, "Found Rev E device\n");
+                        wm8350->rev = WM8350_REV_E;
+                        break;
+                case WM8350_REV_F:
+                        dev_info(wm8350->dev, "Found Rev F device\n");
+                        wm8350->rev = WM8350_REV_F;
+                        break;
+                case WM8350_REV_G:
+                        dev_info(wm8350->dev, "Found Rev G device\n");
+                        wm8350->rev = WM8350_REV_G;
+                        break;
+                default:
+                        /* For safety we refuse to run on unknown hardware */
+                        dev_info(wm8350->dev, "Found unknown rev\n");
+                        ret = -ENODEV;
+                        goto err;
+                }
+        } else {
+                dev_info(wm8350->dev, "Device with ID %x is not a WM8350\n",
+                         id1);
+                ret = -ENODEV;
+                goto err;
+        }
+
+        mode = id2 & WM8350_CONF_STS_MASK >> 10;
+        mask = id2 & WM8350_CUST_ID_MASK;
+        dev_info(wm8350->dev, "Config mode %d, ROM mask %d\n", mode, mask);
+
+        ret = wm8350_create_cache(wm8350, mode);
+        if (ret < 0) {
+                printk(KERN_ERR "wm8350: failed to create register cache\n");
+                return ret;
+        }
+
+        if (pdata->init) {
+                ret = pdata->init(wm8350);
+                if (ret != 0) {
+                        dev_err(wm8350->dev, "Platform init() failed: %d\n",
+                                ret);
+                        goto err;
+                }
+        }
+
+        mutex_init(&wm8350->irq_mutex);
+        INIT_WORK(&wm8350->irq_work, wm8350_irq_worker);
+        if (irq != NO_IRQ) {
+                ret = request_irq(irq, wm8350_irq, 0,
+                                  "wm8350", wm8350);
+                if (ret != 0) {
+                        dev_err(wm8350->dev, "Failed to request IRQ: %d\n",
+                                ret);
+                        goto err;
+                }
+        } else {
+                dev_err(wm8350->dev, "No IRQ configured\n");
+                goto err;
+        }
+        wm8350->chip_irq = irq;
+
+        wm8350_reg_write(wm8350, WM8350_SYSTEM_INTERRUPTS_MASK, 0x0);
+
+        wm8350_client_dev_register(wm8350, "wm8350-codec",
+                                   &(wm8350->codec.pdev));
+        wm8350_client_dev_register(wm8350, "wm8350-gpio",
+                                   &(wm8350->gpio.pdev));
+        wm8350_client_dev_register(wm8350, "wm8350-power",
+                                   &(wm8350->power.pdev));
+        wm8350_client_dev_register(wm8350, "wm8350-rtc", &(wm8350->rtc.pdev));
+        wm8350_client_dev_register(wm8350, "wm8350-wdt", &(wm8350->wdt.pdev));
+
+        return 0;
+
+err:
+        kfree(wm8350->reg_cache);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(wm8350_device_init);
+
+void wm8350_device_exit(struct wm8350 *wm8350)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(wm8350->pmic.pdev); i++)
+                platform_device_unregister(wm8350->pmic.pdev[i]);
+
+        platform_device_unregister(wm8350->wdt.pdev);
+        platform_device_unregister(wm8350->rtc.pdev);
+        platform_device_unregister(wm8350->power.pdev);
+        platform_device_unregister(wm8350->gpio.pdev);
+        platform_device_unregister(wm8350->codec.pdev);
+
+        free_irq(wm8350->chip_irq, wm8350);
+        flush_work(&wm8350->irq_work);
+        kfree(wm8350->reg_cache);
+}
+EXPORT_SYMBOL_GPL(wm8350_device_exit);
+
+MODULE_DESCRIPTION("WM8350 AudioPlus PMIC core driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/mfd/wm8350-gpio.c b/drivers/mfd/wm8350-gpio.c
new file mode 100644
index 000000000000..ebf99bef392f
--- /dev/null
+++ b/drivers/mfd/wm8350-gpio.c
@@ -0,0 +1,222 @@
+/*
+ * wm8350-core.c  --  Device access for Wolfson WM8350
+ *
+ * Copyright 2007, 2008 Wolfson Microelectronics PLC.
+ *
+ * Author: Liam Girdwood
+ *
+ *  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.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/errno.h>
+
+#include <linux/mfd/wm8350/core.h>
+#include <linux/mfd/wm8350/gpio.h>
+#include <linux/mfd/wm8350/pmic.h>
+
+static int gpio_set_dir(struct wm8350 *wm8350, int gpio, int dir)
+{
+        int ret;
+
+        wm8350_reg_unlock(wm8350);
+        if (dir == WM8350_GPIO_DIR_OUT)
+                ret = wm8350_clear_bits(wm8350,
+                                        WM8350_GPIO_CONFIGURATION_I_O,
+                                        1 << gpio);
+        else
+                ret = wm8350_set_bits(wm8350,
+                                      WM8350_GPIO_CONFIGURATION_I_O,
+                                      1 << gpio);
+        wm8350_reg_lock(wm8350);
+        return ret;
+}
+
+static int gpio_set_debounce(struct wm8350 *wm8350, int gpio, int db)
+{
+        if (db == WM8350_GPIO_DEBOUNCE_ON)
+                return wm8350_set_bits(wm8350, WM8350_GPIO_DEBOUNCE,
+                                       1 << gpio);
+        else
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_GPIO_DEBOUNCE, 1 << gpio);
+}
+
+static int gpio_set_func(struct wm8350 *wm8350, int gpio, int func)
+{
+        u16 reg;
+
+        wm8350_reg_unlock(wm8350);
+        switch (gpio) {
+        case 0:
+                reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_1)
+                    & ~WM8350_GP0_FN_MASK;
+                wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_1,
+                                 reg | ((func & 0xf) << 0));
+                break;
+        case 1:
+                reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_1)
+                    & ~WM8350_GP1_FN_MASK;
+                wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_1,
+                                 reg | ((func & 0xf) << 4));
+                break;
+        case 2:
+                reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_1)
+                    & ~WM8350_GP2_FN_MASK;
+                wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_1,
+                                 reg | ((func & 0xf) << 8));
+                break;
+        case 3:
+                reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_1)
+                    & ~WM8350_GP3_FN_MASK;
+                wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_1,
+                                 reg | ((func & 0xf) << 12));
+                break;
+        case 4:
+                reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_2)
+                    & ~WM8350_GP4_FN_MASK;
+                wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_2,
+                                 reg | ((func & 0xf) << 0));
+                break;
+        case 5:
+                reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_2)
+                    & ~WM8350_GP5_FN_MASK;
+                wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_2,
+                                 reg | ((func & 0xf) << 4));
+                break;
+        case 6:
+                reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_2)
+                    & ~WM8350_GP6_FN_MASK;
+                wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_2,
+                                 reg | ((func & 0xf) << 8));
+                break;
+        case 7:
+                reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_2)
+                    & ~WM8350_GP7_FN_MASK;
+                wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_2,
+                                 reg | ((func & 0xf) << 12));
+                break;
+        case 8:
+                reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_3)
+                    & ~WM8350_GP8_FN_MASK;
+                wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_3,
+                                 reg | ((func & 0xf) << 0));
+                break;
+        case 9:
+                reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_3)
+                    & ~WM8350_GP9_FN_MASK;
+                wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_3,
+                                 reg | ((func & 0xf) << 4));
+                break;
+        case 10:
+                reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_3)
+                    & ~WM8350_GP10_FN_MASK;
+                wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_3,
+                                 reg | ((func & 0xf) << 8));
+                break;
+        case 11:
+                reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_3)
+                    & ~WM8350_GP11_FN_MASK;
+                wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_3,
+                                 reg | ((func & 0xf) << 12));
+                break;
+        case 12:
+                reg = wm8350_reg_read(wm8350, WM8350_GPIO_FUNCTION_SELECT_4)
+                    & ~WM8350_GP12_FN_MASK;
+                wm8350_reg_write(wm8350, WM8350_GPIO_FUNCTION_SELECT_4,
+                                 reg | ((func & 0xf) << 0));
+                break;
+        default:
+                wm8350_reg_lock(wm8350);
+                return -EINVAL;
+        }
+
+        wm8350_reg_lock(wm8350);
+        return 0;
+}
+
+static int gpio_set_pull_up(struct wm8350 *wm8350, int gpio, int up)
+{
+        if (up)
+                return wm8350_set_bits(wm8350,
+                                       WM8350_GPIO_PIN_PULL_UP_CONTROL,
+                                       1 << gpio);
+        else
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_GPIO_PIN_PULL_UP_CONTROL,
+                                         1 << gpio);
+}
+
+static int gpio_set_pull_down(struct wm8350 *wm8350, int gpio, int down)
+{
+        if (down)
+                return wm8350_set_bits(wm8350,
+                                       WM8350_GPIO_PULL_DOWN_CONTROL,
+                                       1 << gpio);
+        else
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_GPIO_PULL_DOWN_CONTROL,
+                                         1 << gpio);
+}
+
+static int gpio_set_polarity(struct wm8350 *wm8350, int gpio, int pol)
+{
+        if (pol == WM8350_GPIO_ACTIVE_HIGH)
+                return wm8350_set_bits(wm8350,
+                                       WM8350_GPIO_PIN_POLARITY_TYPE,
+                                       1 << gpio);
+        else
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_GPIO_PIN_POLARITY_TYPE,
+                                         1 << gpio);
+}
+
+static int gpio_set_invert(struct wm8350 *wm8350, int gpio, int invert)
+{
+        if (invert == WM8350_GPIO_INVERT_ON)
+                return wm8350_set_bits(wm8350, WM8350_GPIO_INT_MODE, 1 << gpio);
+        else
+                return wm8350_clear_bits(wm8350,
+                                         WM8350_GPIO_INT_MODE, 1 << gpio);
+}
+
+int wm8350_gpio_config(struct wm8350 *wm8350, int gpio, int dir, int func,
+                       int pol, int pull, int invert, int debounce)
+{
+        /* make sure we never pull up and down at the same time */
+        if (pull == WM8350_GPIO_PULL_NONE) {
+                if (gpio_set_pull_up(wm8350, gpio, 0))
+                        goto err;
+                if (gpio_set_pull_down(wm8350, gpio, 0))
+                        goto err;
+        } else if (pull == WM8350_GPIO_PULL_UP) {
+                if (gpio_set_pull_down(wm8350, gpio, 0))
+                        goto err;
+                if (gpio_set_pull_up(wm8350, gpio, 1))
+                        goto err;
+        } else if (pull == WM8350_GPIO_PULL_DOWN) {
+                if (gpio_set_pull_up(wm8350, gpio, 0))
+                        goto err;
+                if (gpio_set_pull_down(wm8350, gpio, 1))
+                        goto err;
+        }
+
+        if (gpio_set_invert(wm8350, gpio, invert))
+                goto err;
+        if (gpio_set_polarity(wm8350, gpio, pol))
+                goto err;
+        if (gpio_set_debounce(wm8350, gpio, debounce))
+                goto err;
+        if (gpio_set_dir(wm8350, gpio, dir))
+                goto err;
+        return gpio_set_func(wm8350, gpio, func);
+
+err:
+        return -EIO;
+}
+EXPORT_SYMBOL_GPL(wm8350_gpio_config);
diff --git a/drivers/mfd/wm8350-i2c.c b/drivers/mfd/wm8350-i2c.c
new file mode 100644
index 000000000000..8dfe21bb3bd1
--- /dev/null
+++ b/drivers/mfd/wm8350-i2c.c
@@ -0,0 +1,120 @@
+/*
+ * wm8350-i2c.c  --  Generic I2C driver for Wolfson WM8350 PMIC
+ *
+ * This driver defines and configures the WM8350 for the Freescale i.MX32ADS.
+ *
+ * Copyright 2007, 2008 Wolfson Microelectronics PLC.
+ *
+ * Author: Liam Girdwood
+ *         linux@wolfsonmicro.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.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/init.h>
+#include <linux/i2c.h>
+#include <linux/platform_device.h>
+#include <linux/mfd/wm8350/core.h>
+
+static int wm8350_i2c_read_device(struct wm8350 *wm8350, char reg,
+                                  int bytes, void *dest)
+{
+        int ret;
+
+        ret = i2c_master_send(wm8350->i2c_client, &reg, 1);
+        if (ret < 0)
+                return ret;
+        return i2c_master_recv(wm8350->i2c_client, dest, bytes);
+}
+
+static int wm8350_i2c_write_device(struct wm8350 *wm8350, char reg,
+                                   int bytes, void *src)
+{
+        /* we add 1 byte for device register */
+        u8 msg[(WM8350_MAX_REGISTER << 1) + 1];
+
+        if (bytes > ((WM8350_MAX_REGISTER << 1) + 1))
+                return -EINVAL;
+
+        msg[0] = reg;
+        memcpy(&msg[1], src, bytes);
+        return i2c_master_send(wm8350->i2c_client, msg, bytes + 1);
+}
+
+static int wm8350_i2c_probe(struct i2c_client *i2c,
+                            const struct i2c_device_id *id)
+{
+        struct wm8350 *wm8350;
+        int ret = 0;
+
+        wm8350 = kzalloc(sizeof(struct wm8350), GFP_KERNEL);
+        if (wm8350 == NULL) {
+                kfree(i2c);
+                return -ENOMEM;
+        }
+
+        i2c_set_clientdata(i2c, wm8350);
+        wm8350->dev = &i2c->dev;
+        wm8350->i2c_client = i2c;
+        wm8350->read_dev = wm8350_i2c_read_device;
+        wm8350->write_dev = wm8350_i2c_write_device;
+
+        ret = wm8350_device_init(wm8350, i2c->irq, i2c->dev.platform_data);
+        if (ret < 0)
+                goto err;
+
+        return ret;
+
+err:
+        kfree(wm8350);
+        return ret;
+}
+
+static int wm8350_i2c_remove(struct i2c_client *i2c)
+{
+        struct wm8350 *wm8350 = i2c_get_clientdata(i2c);
+
+        wm8350_device_exit(wm8350);
+        kfree(wm8350);
+
+        return 0;
+}
+
+static const struct i2c_device_id wm8350_i2c_id[] = {
+       { "wm8350", 0 },
+       { }
+};
+MODULE_DEVICE_TABLE(i2c, wm8350_i2c_id);
+
+
+static struct i2c_driver wm8350_i2c_driver = {
+        .driver = {
+                   .name = "wm8350",
+                   .owner = THIS_MODULE,
+        },
+        .probe = wm8350_i2c_probe,
+        .remove = wm8350_i2c_remove,
+        .id_table = wm8350_i2c_id,
+};
+
+static int __init wm8350_i2c_init(void)
+{
+        return i2c_add_driver(&wm8350_i2c_driver);
+}
+/* init early so consumer devices can complete system boot */
+subsys_initcall(wm8350_i2c_init);
+
+static void __exit wm8350_i2c_exit(void)
+{
+        i2c_del_driver(&wm8350_i2c_driver);
+}
+module_exit(wm8350_i2c_exit);
+
+MODULE_DESCRIPTION("I2C support for the WM8350 AudioPlus PMIC");
+MODULE_LICENSE("GPL");
diff --git a/drivers/mfd/wm8350-regmap.c b/drivers/mfd/wm8350-regmap.c
new file mode 100644
index 000000000000..974678db22cd
--- /dev/null
+++ b/drivers/mfd/wm8350-regmap.c
@@ -0,0 +1,1347 @@
+/*
+ * wm8350-regmap.c  --  Wolfson Microelectronics WM8350 register map
+ *
+ * This file splits out the tables describing the defaults and access
+ * status of the WM8350 registers since they are rather large.
+ *
+ * Copyright 2007, 2008 Wolfson Microelectronics PLC.
+ *
+ *  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.
+ */
+
+#include <linux/mfd/wm8350/core.h>
+
+#ifdef CONFIG_MFD_WM8350_CONFIG_MODE_0
+
+#undef WM8350_HAVE_CONFIG_MODE
+#define WM8350_HAVE_CONFIG_MODE
+
+const u16 wm8350_mode0_defaults[] = {
+        0x17FF,     /* R0   - Reset/ID */
+        0x1000,     /* R1   - ID */
+        0x0000,     /* R2 */
+        0x1002,     /* R3   - System Control 1 */
+        0x0004,     /* R4   - System Control 2 */
+        0x0000,     /* R5   - System Hibernate */
+        0x8A00,     /* R6   - Interface Control */
+        0x0000,     /* R7 */
+        0x8000,     /* R8   - Power mgmt (1) */
+        0x0000,     /* R9   - Power mgmt (2) */
+        0x0000,     /* R10  - Power mgmt (3) */
+        0x2000,     /* R11  - Power mgmt (4) */
+        0x0E00,     /* R12  - Power mgmt (5) */
+        0x0000,     /* R13  - Power mgmt (6) */
+        0x0000,     /* R14  - Power mgmt (7) */
+        0x0000,     /* R15 */
+        0x0000,     /* R16  - RTC Seconds/Minutes */
+        0x0100,     /* R17  - RTC Hours/Day */
+        0x0101,     /* R18  - RTC Date/Month */
+        0x1400,     /* R19  - RTC Year */
+        0x0000,     /* R20  - Alarm Seconds/Minutes */
+        0x0000,     /* R21  - Alarm Hours/Day */
+        0x0000,     /* R22  - Alarm Date/Month */
+        0x0320,     /* R23  - RTC Time Control */
+        0x0000,     /* R24  - System Interrupts */
+        0x0000,     /* R25  - Interrupt Status 1 */
+        0x0000,     /* R26  - Interrupt Status 2 */
+        0x0000,     /* R27  - Power Up Interrupt Status */
+        0x0000,     /* R28  - Under Voltage Interrupt status */
+        0x0000,     /* R29  - Over Current Interrupt status */
+        0x0000,     /* R30  - GPIO Interrupt Status */
+        0x0000,     /* R31  - Comparator Interrupt Status */
+        0x3FFF,     /* R32  - System Interrupts Mask */
+        0x0000,     /* R33  - Interrupt Status 1 Mask */
+        0x0000,     /* R34  - Interrupt Status 2 Mask */
+        0x0000,     /* R35  - Power Up Interrupt Status Mask */
+        0x0000,     /* R36  - Under Voltage Interrupt status Mask */
+        0x0000,     /* R37  - Over Current Interrupt status Mask */
+        0x0000,     /* R38  - GPIO Interrupt Status Mask */
+        0x0000,     /* R39  - Comparator Interrupt Status Mask */
+        0x0040,     /* R40  - Clock Control 1 */
+        0x0000,     /* R41  - Clock Control 2 */
+        0x3B00,     /* R42  - FLL Control 1 */
+        0x7086,     /* R43  - FLL Control 2 */
+        0xC226,     /* R44  - FLL Control 3 */
+        0x0000,     /* R45  - FLL Control 4 */
+        0x0000,     /* R46 */
+        0x0000,     /* R47 */
+        0x0000,     /* R48  - DAC Control */
+        0x0000,     /* R49 */
+        0x00C0,     /* R50  - DAC Digital Volume L */
+        0x00C0,     /* R51  - DAC Digital Volume R */
+        0x0000,     /* R52 */
+        0x0040,     /* R53  - DAC LR Rate */
+        0x0000,     /* R54  - DAC Clock Control */
+        0x0000,     /* R55 */
+        0x0000,     /* R56 */
+        0x0000,     /* R57 */
+        0x4000,     /* R58  - DAC Mute */
+        0x0000,     /* R59  - DAC Mute Volume */
+        0x0000,     /* R60  - DAC Side */
+        0x0000,     /* R61 */
+        0x0000,     /* R62 */
+        0x0000,     /* R63 */
+        0x8000,     /* R64  - ADC Control */
+        0x0000,     /* R65 */
+        0x00C0,     /* R66  - ADC Digital Volume L */
+        0x00C0,     /* R67  - ADC Digital Volume R */
+        0x0000,     /* R68  - ADC Divider */
+        0x0000,     /* R69 */
+        0x0040,     /* R70  - ADC LR Rate */
+        0x0000,     /* R71 */
+        0x0303,     /* R72  - Input Control */
+        0x0000,     /* R73  - IN3 Input Control */
+        0x0000,     /* R74  - Mic Bias Control */
+        0x0000,     /* R75 */
+        0x0000,     /* R76  - Output Control */
+        0x0000,     /* R77  - Jack Detect */
+        0x0000,     /* R78  - Anti Pop Control */
+        0x0000,     /* R79 */
+        0x0040,     /* R80  - Left Input Volume */
+        0x0040,     /* R81  - Right Input Volume */
+        0x0000,     /* R82 */
+        0x0000,     /* R83 */
+        0x0000,     /* R84 */
+        0x0000,     /* R85 */
+        0x0000,     /* R86 */
+        0x0000,     /* R87 */
+        0x0800,     /* R88  - Left Mixer Control */
+        0x1000,     /* R89  - Right Mixer Control */
+        0x0000,     /* R90 */
+        0x0000,     /* R91 */
+        0x0000,     /* R92  - OUT3 Mixer Control */
+        0x0000,     /* R93  - OUT4 Mixer Control */
+        0x0000,     /* R94 */
+        0x0000,     /* R95 */
+        0x0000,     /* R96  - Output Left Mixer Volume */
+        0x0000,     /* R97  - Output Right Mixer Volume */
+        0x0000,     /* R98  - Input Mixer Volume L */
+        0x0000,     /* R99  - Input Mixer Volume R */
+        0x0000,     /* R100 - Input Mixer Volume */
+        0x0000,     /* R101 */
+        0x0000,     /* R102 */
+        0x0000,     /* R103 */
+        0x00E4,     /* R104 - LOUT1 Volume */
+        0x00E4,     /* R105 - ROUT1 Volume */
+        0x00E4,     /* R106 - LOUT2 Volume */
+        0x02E4,     /* R107 - ROUT2 Volume */
+        0x0000,     /* R108 */
+        0x0000,     /* R109 */
+        0x0000,     /* R110 */
+        0x0000,     /* R111 - BEEP Volume */
+        0x0A00,     /* R112 - AI Formating */
+        0x0000,     /* R113 - ADC DAC COMP */
+        0x0020,     /* R114 - AI ADC Control */
+        0x0020,     /* R115 - AI DAC Control */
+        0x0000,     /* R116 - AIF Test */
+        0x0000,     /* R117 */
+        0x0000,     /* R118 */
+        0x0000,     /* R119 */
+        0x0000,     /* R120 */
+        0x0000,     /* R121 */
+        0x0000,     /* R122 */
+        0x0000,     /* R123 */
+        0x0000,     /* R124 */
+        0x0000,     /* R125 */
+        0x0000,     /* R126 */
+        0x0000,     /* R127 */
+        0x1FFF,     /* R128 - GPIO Debounce */
+        0x0000,     /* R129 - GPIO Pin pull up Control */
+        0x03FC,     /* R130 - GPIO Pull down Control */
+        0x0000,     /* R131 - GPIO Interrupt Mode */
+        0x0000,     /* R132 */
+        0x0000,     /* R133 - GPIO Control */
+        0x0FFC,     /* R134 - GPIO Configuration (i/o) */
+        0x0FFC,     /* R135 - GPIO Pin Polarity / Type */
+        0x0000,     /* R136 */
+        0x0000,     /* R137 */
+        0x0000,     /* R138 */
+        0x0000,     /* R139 */
+        0x0013,     /* R140 - GPIO Function Select 1 */
+        0x0000,     /* R141 - GPIO Function Select 2 */
+        0x0000,     /* R142 - GPIO Function Select 3 */
+        0x0003,     /* R143 - GPIO Function Select 4 */
+        0x0000,     /* R144 - Digitiser Control (1) */
+        0x0002,     /* R145 - Digitiser Control (2) */
+        0x0000,     /* R146 */
+        0x0000,     /* R147 */
+        0x0000,     /* R148 */
+        0x0000,     /* R149 */
+        0x0000,     /* R150 */
+        0x0000,     /* R151 */
+        0x7000,     /* R152 - AUX1 Readback */
+        0x7000,     /* R153 - AUX2 Readback */
+        0x7000,     /* R154 - AUX3 Readback */
+        0x7000,     /* R155 - AUX4 Readback */
+        0x0000,     /* R156 - USB Voltage Readback */
+        0x0000,     /* R157 - LINE Voltage Readback */
+        0x0000,     /* R158 - BATT Voltage Readback */
+        0x0000,     /* R159 - Chip Temp Readback */
+        0x0000,     /* R160 */
+        0x0000,     /* R161 */
+        0x0000,     /* R162 */
+        0x0000,     /* R163 - Generic Comparator Control */
+        0x0000,     /* R164 - Generic comparator 1 */
+        0x0000,     /* R165 - Generic comparator 2 */
+        0x0000,     /* R166 - Generic comparator 3 */
+        0x0000,     /* R167 - Generic comparator 4 */
+        0xA00F,     /* R168 - Battery Charger Control 1 */
+        0x0B06,     /* R169 - Battery Charger Control 2 */
+        0x0000,     /* R170 - Battery Charger Control 3 */
+        0x0000,     /* R171 */
+        0x0000,     /* R172 - Current Sink Driver A */
+        0x0000,     /* R173 - CSA Flash control */
+        0x0000,     /* R174 - Current Sink Driver B */
+        0x0000,     /* R175 - CSB Flash control */
+        0x0000,     /* R176 - DCDC/LDO requested */
+        0x002D,     /* R177 - DCDC Active options */
+        0x0000,     /* R178 - DCDC Sleep options */
+        0x0025,     /* R179 - Power-check comparator */
+        0x000E,     /* R180 - DCDC1 Control */
+        0x0000,     /* R181 - DCDC1 Timeouts */
+        0x1006,     /* R182 - DCDC1 Low Power */
+        0x0018,     /* R183 - DCDC2 Control */
+        0x0000,     /* R184 - DCDC2 Timeouts */
+        0x0000,     /* R185 */
+        0x0000,     /* R186 - DCDC3 Control */
+        0x0000,     /* R187 - DCDC3 Timeouts */
+        0x0006,     /* R188 - DCDC3 Low Power */
+        0x0000,     /* R189 - DCDC4 Control */
+        0x0000,     /* R190 - DCDC4 Timeouts */
+        0x0006,     /* R191 - DCDC4 Low Power */
+        0x0008,     /* R192 - DCDC5 Control */
+        0x0000,     /* R193 - DCDC5 Timeouts */
+        0x0000,     /* R194 */
+        0x0000,     /* R195 - DCDC6 Control */
+        0x0000,     /* R196 - DCDC6 Timeouts */
+        0x0006,     /* R197 - DCDC6 Low Power */
+        0x0000,     /* R198 */
+        0x0003,     /* R199 - Limit Switch Control */
+        0x001C,     /* R200 - LDO1 Control */
+        0x0000,     /* R201 - LDO1 Timeouts */
+        0x001C,     /* R202 - LDO1 Low Power */
+        0x001B,     /* R203 - LDO2 Control */
+        0x0000,     /* R204 - LDO2 Timeouts */
+        0x001C,     /* R205 - LDO2 Low Power */
+        0x001B,     /* R206 - LDO3 Control */
+        0x0000,     /* R207 - LDO3 Timeouts */
+        0x001C,     /* R208 - LDO3 Low Power */
+        0x001B,     /* R209 - LDO4 Control */
+        0x0000,     /* R210 - LDO4 Timeouts */
+        0x001C,     /* R211 - LDO4 Low Power */
+        0x0000,     /* R212 */
+        0x0000,     /* R213 */
+        0x0000,     /* R214 */
+        0x0000,     /* R215 - VCC_FAULT Masks */
+        0x001F,     /* R216 - Main Bandgap Control */
+        0x0000,     /* R217 - OSC Control */
+        0x9000,     /* R218 - RTC Tick Control */
+        0x0000,     /* R219 */
+        0x4000,     /* R220 - RAM BIST 1 */
+        0x0000,     /* R221 */
+        0x0000,     /* R222 */
+        0x0000,     /* R223 */
+        0x0000,     /* R224 */
+        0x0000,     /* R225 - DCDC/LDO status */
+        0x0000,     /* R226 */
+        0x0000,     /* R227 */
+        0x0000,     /* R228 */
+        0x0000,     /* R229 */
+        0xE000,     /* R230 - GPIO Pin Status */
+        0x0000,     /* R231 */
+        0x0000,     /* R232 */
+        0x0000,     /* R233 */
+        0x0000,     /* R234 */
+        0x0000,     /* R235 */
+        0x0000,     /* R236 */
+        0x0000,     /* R237 */
+        0x0000,     /* R238 */
+        0x0000,     /* R239 */
+        0x0000,     /* R240 */
+        0x0000,     /* R241 */
+        0x0000,     /* R242 */
+        0x0000,     /* R243 */
+        0x0000,     /* R244 */
+        0x0000,     /* R245 */
+        0x0000,     /* R246 */
+        0x0000,     /* R247 */
+        0x0000,     /* R248 */
+        0x0000,     /* R249 */
+        0x0000,     /* R250 */
+        0x0000,     /* R251 */
+        0x0000,     /* R252 */
+        0x0000,     /* R253 */
+        0x0000,     /* R254 */
+        0x0000,     /* R255 */
+};
+#endif
+
+#ifdef CONFIG_MFD_WM8350_CONFIG_MODE_1
+
+#undef WM8350_HAVE_CONFIG_MODE
+#define WM8350_HAVE_CONFIG_MODE
+
+const u16 wm8350_mode1_defaults[] = {
+        0x17FF,     /* R0   - Reset/ID */
+        0x1000,     /* R1   - ID */
+        0x0000,     /* R2 */
+        0x1002,     /* R3   - System Control 1 */
+        0x0014,     /* R4   - System Control 2 */
+        0x0000,     /* R5   - System Hibernate */
+        0x8A00,     /* R6   - Interface Control */
+        0x0000,     /* R7 */
+        0x8000,     /* R8   - Power mgmt (1) */
+        0x0000,     /* R9   - Power mgmt (2) */
+        0x0000,     /* R10  - Power mgmt (3) */
+        0x2000,     /* R11  - Power mgmt (4) */
+        0x0E00,     /* R12  - Power mgmt (5) */
+        0x0000,     /* R13  - Power mgmt (6) */
+        0x0000,     /* R14  - Power mgmt (7) */
+        0x0000,     /* R15 */
+        0x0000,     /* R16  - RTC Seconds/Minutes */
+        0x0100,     /* R17  - RTC Hours/Day */
+        0x0101,     /* R18  - RTC Date/Month */
+        0x1400,     /* R19  - RTC Year */
+        0x0000,     /* R20  - Alarm Seconds/Minutes */
+        0x0000,     /* R21  - Alarm Hours/Day */
+        0x0000,     /* R22  - Alarm Date/Month */
+        0x0320,     /* R23  - RTC Time Control */
+        0x0000,     /* R24  - System Interrupts */
+        0x0000,     /* R25  - Interrupt Status 1 */
+        0x0000,     /* R26  - Interrupt Status 2 */
+        0x0000,     /* R27  - Power Up Interrupt Status */
+        0x0000,     /* R28  - Under Voltage Interrupt status */
+        0x0000,     /* R29  - Over Current Interrupt status */
+        0x0000,     /* R30  - GPIO Interrupt Status */
+        0x0000,     /* R31  - Comparator Interrupt Status */
+        0x3FFF,     /* R32  - System Interrupts Mask */
+        0x0000,     /* R33  - Interrupt Status 1 Mask */
+        0x0000,     /* R34  - Interrupt Status 2 Mask */
+        0x0000,     /* R35  - Power Up Interrupt Status Mask */
+        0x0000,     /* R36  - Under Voltage Interrupt status Mask */
+        0x0000,     /* R37  - Over Current Interrupt status Mask */
+        0x0000,     /* R38  - GPIO Interrupt Status Mask */
+        0x0000,     /* R39  - Comparator Interrupt Status Mask */
+        0x0040,     /* R40  - Clock Control 1 */
+        0x0000,     /* R41  - Clock Control 2 */
+        0x3B00,     /* R42  - FLL Control 1 */
+        0x7086,     /* R43  - FLL Control 2 */
+        0xC226,     /* R44  - FLL Control 3 */
+        0x0000,     /* R45  - FLL Control 4 */
+        0x0000,     /* R46 */
+        0x0000,     /* R47 */
+        0x0000,     /* R48  - DAC Control */
+        0x0000,     /* R49 */
+        0x00C0,     /* R50  - DAC Digital Volume L */
+        0x00C0,     /* R51  - DAC Digital Volume R */
+        0x0000,     /* R52 */
+        0x0040,     /* R53  - DAC LR Rate */
+        0x0000,     /* R54  - DAC Clock Control */
+        0x0000,     /* R55 */
+        0x0000,     /* R56 */
+        0x0000,     /* R57 */
+        0x4000,     /* R58  - DAC Mute */
+        0x0000,     /* R59  - DAC Mute Volume */
+        0x0000,     /* R60  - DAC Side */
+        0x0000,     /* R61 */
+        0x0000,     /* R62 */
+        0x0000,     /* R63 */
+        0x8000,     /* R64  - ADC Control */
+        0x0000,     /* R65 */
+        0x00C0,     /* R66  - ADC Digital Volume L */
+        0x00C0,     /* R67  - ADC Digital Volume R */
+        0x0000,     /* R68  - ADC Divider */
+        0x0000,     /* R69 */
+        0x0040,     /* R70  - ADC LR Rate */
+        0x0000,     /* R71 */
+        0x0303,     /* R72  - Input Control */
+        0x0000,     /* R73  - IN3 Input Control */
+        0x0000,     /* R74  - Mic Bias Control */
+        0x0000,     /* R75 */
+        0x0000,     /* R76  - Output Control */
+        0x0000,     /* R77  - Jack Detect */
+        0x0000,     /* R78  - Anti Pop Control */
+        0x0000,     /* R79 */
+        0x0040,     /* R80  - Left Input Volume */
+        0x0040,     /* R81  - Right Input Volume */
+        0x0000,     /* R82 */
+        0x0000,     /* R83 */
+        0x0000,     /* R84 */
+        0x0000,     /* R85 */
+        0x0000,     /* R86 */
+        0x0000,     /* R87 */
+        0x0800,     /* R88  - Left Mixer Control */
+        0x1000,     /* R89  - Right Mixer Control */
+        0x0000,     /* R90 */
+        0x0000,     /* R91 */
+        0x0000,     /* R92  - OUT3 Mixer Control */
+        0x0000,     /* R93  - OUT4 Mixer Control */
+        0x0000,     /* R94 */
+        0x0000,     /* R95 */
+        0x0000,     /* R96  - Output Left Mixer Volume */
+        0x0000,     /* R97  - Output Right Mixer Volume */
+        0x0000,     /* R98  - Input Mixer Volume L */
+        0x0000,     /* R99  - Input Mixer Volume R */
+        0x0000,     /* R100 - Input Mixer Volume */
+        0x0000,     /* R101 */
+        0x0000,     /* R102 */
+        0x0000,     /* R103 */
+        0x00E4,     /* R104 - LOUT1 Volume */
+        0x00E4,     /* R105 - ROUT1 Volume */
+        0x00E4,     /* R106 - LOUT2 Volume */
+        0x02E4,     /* R107 - ROUT2 Volume */
+        0x0000,     /* R108 */
+        0x0000,     /* R109 */
+        0x0000,     /* R110 */
+        0x0000,     /* R111 - BEEP Volume */
+        0x0A00,     /* R112 - AI Formating */
+        0x0000,     /* R113 - ADC DAC COMP */
+        0x0020,     /* R114 - AI ADC Control */
+        0x0020,     /* R115 - AI DAC Control */
+        0x0000,     /* R116 - AIF Test */
+        0x0000,     /* R117 */
+        0x0000,     /* R118 */
+        0x0000,     /* R119 */
+        0x0000,     /* R120 */
+        0x0000,     /* R121 */
+        0x0000,     /* R122 */
+        0x0000,     /* R123 */
+        0x0000,     /* R124 */
+        0x0000,     /* R125 */
+        0x0000,     /* R126 */
+        0x0000,     /* R127 */
+        0x1FFF,     /* R128 - GPIO Debounce */
+        0x0000,     /* R129 - GPIO Pin pull up Control */
+        0x03FC,     /* R130 - GPIO Pull down Control */
+        0x0000,     /* R131 - GPIO Interrupt Mode */
+        0x0000,     /* R132 */
+        0x0000,     /* R133 - GPIO Control */
+        0x00FB,     /* R134 - GPIO Configuration (i/o) */
+        0x04FE,     /* R135 - GPIO Pin Polarity / Type */
+        0x0000,     /* R136 */
+        0x0000,     /* R137 */
+        0x0000,     /* R138 */
+        0x0000,     /* R139 */
+        0x0312,     /* R140 - GPIO Function Select 1 */
+        0x1003,     /* R141 - GPIO Function Select 2 */
+        0x1331,     /* R142 - GPIO Function Select 3 */
+        0x0003,     /* R143 - GPIO Function Select 4 */
+        0x0000,     /* R144 - Digitiser Control (1) */
+        0x0002,     /* R145 - Digitiser Control (2) */
+        0x0000,     /* R146 */
+        0x0000,     /* R147 */
+        0x0000,     /* R148 */
+        0x0000,     /* R149 */
+        0x0000,     /* R150 */
+        0x0000,     /* R151 */
+        0x7000,     /* R152 - AUX1 Readback */
+        0x7000,     /* R153 - AUX2 Readback */
+        0x7000,     /* R154 - AUX3 Readback */
+        0x7000,     /* R155 - AUX4 Readback */
+        0x0000,     /* R156 - USB Voltage Readback */
+        0x0000,     /* R157 - LINE Voltage Readback */
+        0x0000,     /* R158 - BATT Voltage Readback */
+        0x0000,     /* R159 - Chip Temp Readback */
+        0x0000,     /* R160 */
+        0x0000,     /* R161 */
+        0x0000,     /* R162 */
+        0x0000,     /* R163 - Generic Comparator Control */
+        0x0000,     /* R164 - Generic comparator 1 */
+        0x0000,     /* R165 - Generic comparator 2 */
+        0x0000,     /* R166 - Generic comparator 3 */
+        0x0000,     /* R167 - Generic comparator 4 */
+        0xA00F,     /* R168 - Battery Charger Control 1 */
+        0x0B06,     /* R169 - Battery Charger Control 2 */
+        0x0000,     /* R170 - Battery Charger Control 3 */
+        0x0000,     /* R171 */
+        0x0000,     /* R172 - Current Sink Driver A */
+        0x0000,     /* R173 - CSA Flash control */
+        0x0000,     /* R174 - Current Sink Driver B */
+        0x0000,     /* R175 - CSB Flash control */
+        0x0000,     /* R176 - DCDC/LDO requested */
+        0x002D,     /* R177 - DCDC Active options */
+        0x0000,     /* R178 - DCDC Sleep options */
+        0x0025,     /* R179 - Power-check comparator */
+        0x0062,     /* R180 - DCDC1 Control */
+        0x0400,     /* R181 - DCDC1 Timeouts */
+        0x1006,     /* R182 - DCDC1 Low Power */
+        0x0018,     /* R183 - DCDC2 Control */
+        0x0000,     /* R184 - DCDC2 Timeouts */
+        0x0000,     /* R185 */
+        0x0026,     /* R186 - DCDC3 Control */
+        0x0400,     /* R187 - DCDC3 Timeouts */
+        0x0006,     /* R188 - DCDC3 Low Power */
+        0x0062,     /* R189 - DCDC4 Control */
+        0x0400,     /* R190 - DCDC4 Timeouts */
+        0x0006,     /* R191 - DCDC4 Low Power */
+        0x0008,     /* R192 - DCDC5 Control */
+        0x0000,     /* R193 - DCDC5 Timeouts */
+        0x0000,     /* R194 */
+        0x0026,     /* R195 - DCDC6 Control */
+        0x0800,     /* R196 - DCDC6 Timeouts */
+        0x0006,     /* R197 - DCDC6 Low Power */
+        0x0000,     /* R198 */
+        0x0003,     /* R199 - Limit Switch Control */
+        0x0006,     /* R200 - LDO1 Control */
+        0x0400,     /* R201 - LDO1 Timeouts */
+        0x001C,     /* R202 - LDO1 Low Power */
+        0x0006,     /* R203 - LDO2 Control */
+        0x0400,     /* R204 - LDO2 Timeouts */
+        0x001C,     /* R205 - LDO2 Low Power */
+        0x001B,     /* R206 - LDO3 Control */
+        0x0000,     /* R207 - LDO3 Timeouts */
+        0x001C,     /* R208 - LDO3 Low Power */
+        0x001B,     /* R209 - LDO4 Control */
+        0x0000,     /* R210 - LDO4 Timeouts */
+        0x001C,     /* R211 - LDO4 Low Power */
+        0x0000,     /* R212 */
+        0x0000,     /* R213 */
+        0x0000,     /* R214 */
+        0x0000,     /* R215 - VCC_FAULT Masks */
+        0x001F,     /* R216 - Main Bandgap Control */
+        0x0000,     /* R217 - OSC Control */
+        0x9000,     /* R218 - RTC Tick Control */
+        0x0000,     /* R219 */
+        0x4000,     /* R220 - RAM BIST 1 */
+        0x0000,     /* R221 */
+        0x0000,     /* R222 */
+        0x0000,     /* R223 */
+        0x0000,     /* R224 */
+        0x0000,     /* R225 - DCDC/LDO status */
+        0x0000,     /* R226 */
+        0x0000,     /* R227 */
+        0x0000,     /* R228 */
+        0x0000,     /* R229 */
+        0xE000,     /* R230 - GPIO Pin Status */
+        0x0000,     /* R231 */
+        0x0000,     /* R232 */
+        0x0000,     /* R233 */
+        0x0000,     /* R234 */
+        0x0000,     /* R235 */
+        0x0000,     /* R236 */
+        0x0000,     /* R237 */
+        0x0000,     /* R238 */
+        0x0000,     /* R239 */
+        0x0000,     /* R240 */
+        0x0000,     /* R241 */
+        0x0000,     /* R242 */
+        0x0000,     /* R243 */
+        0x0000,     /* R244 */
+        0x0000,     /* R245 */
+        0x0000,     /* R246 */
+        0x0000,     /* R247 */
+        0x0000,     /* R248 */
+        0x0000,     /* R249 */
+        0x0000,     /* R250 */
+        0x0000,     /* R251 */
+        0x0000,     /* R252 */
+        0x0000,     /* R253 */
+        0x0000,     /* R254 */
+        0x0000,     /* R255 */
+};
+#endif
+
+#ifdef CONFIG_MFD_WM8350_CONFIG_MODE_2
+
+#undef WM8350_HAVE_CONFIG_MODE
+#define WM8350_HAVE_CONFIG_MODE
+
+const u16 wm8350_mode2_defaults[] = {
+        0x17FF,     /* R0   - Reset/ID */
+        0x1000,     /* R1   - ID */
+        0x0000,     /* R2 */
+        0x1002,     /* R3   - System Control 1 */
+        0x0014,     /* R4   - System Control 2 */
+        0x0000,     /* R5   - System Hibernate */
+        0x8A00,     /* R6   - Interface Control */
+        0x0000,     /* R7 */
+        0x8000,     /* R8   - Power mgmt (1) */
+        0x0000,     /* R9   - Power mgmt (2) */
+        0x0000,     /* R10  - Power mgmt (3) */
+        0x2000,     /* R11  - Power mgmt (4) */
+        0x0E00,     /* R12  - Power mgmt (5) */
+        0x0000,     /* R13  - Power mgmt (6) */
+        0x0000,     /* R14  - Power mgmt (7) */
+        0x0000,     /* R15 */
+        0x0000,     /* R16  - RTC Seconds/Minutes */
+        0x0100,     /* R17  - RTC Hours/Day */
+        0x0101,     /* R18  - RTC Date/Month */
+        0x1400,     /* R19  - RTC Year */
+        0x0000,     /* R20  - Alarm Seconds/Minutes */
+        0x0000,     /* R21  - Alarm Hours/Day */
+        0x0000,     /* R22  - Alarm Date/Month */
+        0x0320,     /* R23  - RTC Time Control */
+        0x0000,     /* R24  - System Interrupts */
+        0x0000,     /* R25  - Interrupt Status 1 */
+        0x0000,     /* R26  - Interrupt Status 2 */
+        0x0000,     /* R27  - Power Up Interrupt Status */
+        0x0000,     /* R28  - Under Voltage Interrupt status */
+        0x0000,     /* R29  - Over Current Interrupt status */
+        0x0000,     /* R30  - GPIO Interrupt Status */
+        0x0000,     /* R31  - Comparator Interrupt Status */
+        0x3FFF,     /* R32  - System Interrupts Mask */
+        0x0000,     /* R33  - Interrupt Status 1 Mask */
+        0x0000,     /* R34  - Interrupt Status 2 Mask */
+        0x0000,     /* R35  - Power Up Interrupt Status Mask */
+        0x0000,     /* R36  - Under Voltage Interrupt status Mask */
+        0x0000,     /* R37  - Over Current Interrupt status Mask */
+        0x0000,     /* R38  - GPIO Interrupt Status Mask */
+        0x0000,     /* R39  - Comparator Interrupt Status Mask */
+        0x0040,     /* R40  - Clock Control 1 */
+        0x0000,     /* R41  - Clock Control 2 */
+        0x3B00,     /* R42  - FLL Control 1 */
+        0x7086,     /* R43  - FLL Control 2 */
+        0xC226,     /* R44  - FLL Control 3 */
+        0x0000,     /* R45  - FLL Control 4 */
+        0x0000,     /* R46 */
+        0x0000,     /* R47 */
+        0x0000,     /* R48  - DAC Control */
+        0x0000,     /* R49 */
+        0x00C0,     /* R50  - DAC Digital Volume L */
+        0x00C0,     /* R51  - DAC Digital Volume R */
+        0x0000,     /* R52 */
+        0x0040,     /* R53  - DAC LR Rate */
+        0x0000,     /* R54  - DAC Clock Control */
+        0x0000,     /* R55 */
+        0x0000,     /* R56 */
+        0x0000,     /* R57 */
+        0x4000,     /* R58  - DAC Mute */
+        0x0000,     /* R59  - DAC Mute Volume */
+        0x0000,     /* R60  - DAC Side */
+        0x0000,     /* R61 */
+        0x0000,     /* R62 */
+        0x0000,     /* R63 */
+        0x8000,     /* R64  - ADC Control */
+        0x0000,     /* R65 */
+        0x00C0,     /* R66  - ADC Digital Volume L */
+        0x00C0,     /* R67  - ADC Digital Volume R */
+        0x0000,     /* R68  - ADC Divider */
+        0x0000,     /* R69 */
+        0x0040,     /* R70  - ADC LR Rate */
+        0x0000,     /* R71 */
+        0x0303,     /* R72  - Input Control */
+        0x0000,     /* R73  - IN3 Input Control */
+        0x0000,     /* R74  - Mic Bias Control */
+        0x0000,     /* R75 */
+        0x0000,     /* R76  - Output Control */
+        0x0000,     /* R77  - Jack Detect */
+        0x0000,     /* R78  - Anti Pop Control */
+        0x0000,     /* R79 */
+        0x0040,     /* R80  - Left Input Volume */
+        0x0040,     /* R81  - Right Input Volume */
+        0x0000,     /* R82 */
+        0x0000,     /* R83 */
+        0x0000,     /* R84 */
+        0x0000,     /* R85 */
+        0x0000,     /* R86 */
+        0x0000,     /* R87 */
+        0x0800,     /* R88  - Left Mixer Control */
+        0x1000,     /* R89  - Right Mixer Control */
+        0x0000,     /* R90 */
+        0x0000,     /* R91 */
+        0x0000,     /* R92  - OUT3 Mixer Control */
+        0x0000,     /* R93  - OUT4 Mixer Control */
+        0x0000,     /* R94 */
+        0x0000,     /* R95 */
+        0x0000,     /* R96  - Output Left Mixer Volume */
+        0x0000,     /* R97  - Output Right Mixer Volume */
+        0x0000,     /* R98  - Input Mixer Volume L */
+        0x0000,     /* R99  - Input Mixer Volume R */
+        0x0000,     /* R100 - Input Mixer Volume */
+        0x0000,     /* R101 */
+        0x0000,     /* R102 */
+        0x0000,     /* R103 */
+        0x00E4,     /* R104 - LOUT1 Volume */
+        0x00E4,     /* R105 - ROUT1 Volume */
+        0x00E4,     /* R106 - LOUT2 Volume */
+        0x02E4,     /* R107 - ROUT2 Volume */
+        0x0000,     /* R108 */
+        0x0000,     /* R109 */
+        0x0000,     /* R110 */
+        0x0000,     /* R111 - BEEP Volume */
+        0x0A00,     /* R112 - AI Formating */
+        0x0000,     /* R113 - ADC DAC COMP */
+        0x0020,     /* R114 - AI ADC Control */
+        0x0020,     /* R115 - AI DAC Control */
+        0x0000,     /* R116 - AIF Test */
+        0x0000,     /* R117 */
+        0x0000,     /* R118 */
+        0x0000,     /* R119 */
+        0x0000,     /* R120 */
+        0x0000,     /* R121 */
+        0x0000,     /* R122 */
+        0x0000,     /* R123 */
+        0x0000,     /* R124 */
+        0x0000,     /* R125 */
+        0x0000,     /* R126 */
+        0x0000,     /* R127 */
+        0x1FFF,     /* R128 - GPIO Debounce */
+        0x0000,     /* R129 - GPIO Pin pull up Control */
+        0x03FC,     /* R130 - GPIO Pull down Control */
+        0x0000,     /* R131 - GPIO Interrupt Mode */
+        0x0000,     /* R132 */
+        0x0000,     /* R133 - GPIO Control */
+        0x08FB,     /* R134 - GPIO Configuration (i/o) */
+        0x0CFE,     /* R135 - GPIO Pin Polarity / Type */
+        0x0000,     /* R136 */
+        0x0000,     /* R137 */
+        0x0000,     /* R138 */
+        0x0000,     /* R139 */
+        0x0312,     /* R140 - GPIO Function Select 1 */
+        0x0003,     /* R141 - GPIO Function Select 2 */
+        0x2331,     /* R142 - GPIO Function Select 3 */
+        0x0003,     /* R143 - GPIO Function Select 4 */
+        0x0000,     /* R144 - Digitiser Control (1) */
+        0x0002,     /* R145 - Digitiser Control (2) */
+        0x0000,     /* R146 */
+        0x0000,     /* R147 */
+        0x0000,     /* R148 */
+        0x0000,     /* R149 */
+        0x0000,     /* R150 */
+        0x0000,     /* R151 */
+        0x7000,     /* R152 - AUX1 Readback */
+        0x7000,     /* R153 - AUX2 Readback */
+        0x7000,     /* R154 - AUX3 Readback */
+        0x7000,     /* R155 - AUX4 Readback */
+        0x0000,     /* R156 - USB Voltage Readback */
+        0x0000,     /* R157 - LINE Voltage Readback */
+        0x0000,     /* R158 - BATT Voltage Readback */
+        0x0000,     /* R159 - Chip Temp Readback */
+        0x0000,     /* R160 */
+        0x0000,     /* R161 */
+        0x0000,     /* R162 */
+        0x0000,     /* R163 - Generic Comparator Control */
+        0x0000,     /* R164 - Generic comparator 1 */
+        0x0000,     /* R165 - Generic comparator 2 */
+        0x0000,     /* R166 - Generic comparator 3 */
+        0x0000,     /* R167 - Generic comparator 4 */
+        0xA00F,     /* R168 - Battery Charger Control 1 */
+        0x0B06,     /* R169 - Battery Charger Control 2 */
+        0x0000,     /* R170 - Battery Charger Control 3 */
+        0x0000,     /* R171 */
+        0x0000,     /* R172 - Current Sink Driver A */
+        0x0000,     /* R173 - CSA Flash control */
+        0x0000,     /* R174 - Current Sink Driver B */
+        0x0000,     /* R175 - CSB Flash control */
+        0x0000,     /* R176 - DCDC/LDO requested */
+        0x002D,     /* R177 - DCDC Active options */
+        0x0000,     /* R178 - DCDC Sleep options */
+        0x0025,     /* R179 - Power-check comparator */
+        0x000E,     /* R180 - DCDC1 Control */
+        0x0400,     /* R181 - DCDC1 Timeouts */
+        0x1006,     /* R182 - DCDC1 Low Power */
+        0x0018,     /* R183 - DCDC2 Control */
+        0x0000,     /* R184 - DCDC2 Timeouts */
+        0x0000,     /* R185 */
+        0x002E,     /* R186 - DCDC3 Control */
+        0x0800,     /* R187 - DCDC3 Timeouts */
+        0x0006,     /* R188 - DCDC3 Low Power */
+        0x000E,     /* R189 - DCDC4 Control */
+        0x0800,     /* R190 - DCDC4 Timeouts */
+        0x0006,     /* R191 - DCDC4 Low Power */
+        0x0008,     /* R192 - DCDC5 Control */
+        0x0000,     /* R193 - DCDC5 Timeouts */
+        0x0000,     /* R194 */
+        0x0026,     /* R195 - DCDC6 Control */
+        0x0C00,     /* R196 - DCDC6 Timeouts */
+        0x0006,     /* R197 - DCDC6 Low Power */
+        0x0000,     /* R198 */
+        0x0003,     /* R199 - Limit Switch Control */
+        0x001A,     /* R200 - LDO1 Control */
+        0x0800,     /* R201 - LDO1 Timeouts */
+        0x001C,     /* R202 - LDO1 Low Power */
+        0x0010,     /* R203 - LDO2 Control */
+        0x0800,     /* R204 - LDO2 Timeouts */
+        0x001C,     /* R205 - LDO2 Low Power */
+        0x000A,     /* R206 - LDO3 Control */
+        0x0C00,     /* R207 - LDO3 Timeouts */
+        0x001C,     /* R208 - LDO3 Low Power */
+        0x001A,     /* R209 - LDO4 Control */
+        0x0800,     /* R210 - LDO4 Timeouts */
+        0x001C,     /* R211 - LDO4 Low Power */
+        0x0000,     /* R212 */
+        0x0000,     /* R213 */
+        0x0000,     /* R214 */
+        0x0000,     /* R215 - VCC_FAULT Masks */
+        0x001F,     /* R216 - Main Bandgap Control */
+        0x0000,     /* R217 - OSC Control */
+        0x9000,     /* R218 - RTC Tick Control */
+        0x0000,     /* R219 */
+        0x4000,     /* R220 - RAM BIST 1 */
+        0x0000,     /* R221 */
+        0x0000,     /* R222 */
+        0x0000,     /* R223 */
+        0x0000,     /* R224 */
+        0x0000,     /* R225 - DCDC/LDO status */
+        0x0000,     /* R226 */
+        0x0000,     /* R227 */
+        0x0000,     /* R228 */
+        0x0000,     /* R229 */
+        0xE000,     /* R230 - GPIO Pin Status */
+        0x0000,     /* R231 */
+        0x0000,     /* R232 */
+        0x0000,     /* R233 */
+        0x0000,     /* R234 */
+        0x0000,     /* R235 */
+        0x0000,     /* R236 */
+        0x0000,     /* R237 */
+        0x0000,     /* R238 */
+        0x0000,     /* R239 */
+        0x0000,     /* R240 */
+        0x0000,     /* R241 */
+        0x0000,     /* R242 */
+        0x0000,     /* R243 */
+        0x0000,     /* R244 */
+        0x0000,     /* R245 */
+        0x0000,     /* R246 */
+        0x0000,     /* R247 */
+        0x0000,     /* R248 */
+        0x0000,     /* R249 */
+        0x0000,     /* R250 */
+        0x0000,     /* R251 */
+        0x0000,     /* R252 */
+        0x0000,     /* R253 */
+        0x0000,     /* R254 */
+        0x0000,     /* R255 */
+};
+#endif
+
+#ifdef CONFIG_MFD_WM8350_CONFIG_MODE_3
+
+#undef WM8350_HAVE_CONFIG_MODE
+#define WM8350_HAVE_CONFIG_MODE
+
+const u16 wm8350_mode3_defaults[] = {
+        0x17FF,     /* R0   - Reset/ID */
+        0x1000,     /* R1   - ID */
+        0x0000,     /* R2 */
+        0x1000,     /* R3   - System Control 1 */
+        0x0004,     /* R4   - System Control 2 */
+        0x0000,     /* R5   - System Hibernate */
+        0x8A00,     /* R6   - Interface Control */
+        0x0000,     /* R7 */
+        0x8000,     /* R8   - Power mgmt (1) */
+        0x0000,     /* R9   - Power mgmt (2) */
+        0x0000,     /* R10  - Power mgmt (3) */
+        0x2000,     /* R11  - Power mgmt (4) */
+        0x0E00,     /* R12  - Power mgmt (5) */
+        0x0000,     /* R13  - Power mgmt (6) */
+        0x0000,     /* R14  - Power mgmt (7) */
+        0x0000,     /* R15 */
+        0x0000,     /* R16  - RTC Seconds/Minutes */
+        0x0100,     /* R17  - RTC Hours/Day */
+        0x0101,     /* R18  - RTC Date/Month */
+        0x1400,     /* R19  - RTC Year */
+        0x0000,     /* R20  - Alarm Seconds/Minutes */
+        0x0000,     /* R21  - Alarm Hours/Day */
+        0x0000,     /* R22  - Alarm Date/Month */
+        0x0320,     /* R23  - RTC Time Control */
+        0x0000,     /* R24  - System Interrupts */
+        0x0000,     /* R25  - Interrupt Status 1 */
+        0x0000,     /* R26  - Interrupt Status 2 */
+        0x0000,     /* R27  - Power Up Interrupt Status */
+        0x0000,     /* R28  - Under Voltage Interrupt status */
+        0x0000,     /* R29  - Over Current Interrupt status */
+        0x0000,     /* R30  - GPIO Interrupt Status */
+        0x0000,     /* R31  - Comparator Interrupt Status */
+        0x3FFF,     /* R32  - System Interrupts Mask */
+        0x0000,     /* R33  - Interrupt Status 1 Mask */
+        0x0000,     /* R34  - Interrupt Status 2 Mask */
+        0x0000,     /* R35  - Power Up Interrupt Status Mask */
+        0x0000,     /* R36  - Under Voltage Interrupt status Mask */
+        0x0000,     /* R37  - Over Current Interrupt status Mask */
+        0x0000,     /* R38  - GPIO Interrupt Status Mask */
+        0x0000,     /* R39  - Comparator Interrupt Status Mask */
+        0x0040,     /* R40  - Clock Control 1 */
+        0x0000,     /* R41  - Clock Control 2 */
+        0x3B00,     /* R42  - FLL Control 1 */
+        0x7086,     /* R43  - FLL Control 2 */
+        0xC226,     /* R44  - FLL Control 3 */
+        0x0000,     /* R45  - FLL Control 4 */
+        0x0000,     /* R46 */
+        0x0000,     /* R47 */
+        0x0000,     /* R48  - DAC Control */
+        0x0000,     /* R49 */
+        0x00C0,     /* R50  - DAC Digital Volume L */
+        0x00C0,     /* R51  - DAC Digital Volume R */
+        0x0000,     /* R52 */
+        0x0040,     /* R53  - DAC LR Rate */
+        0x0000,     /* R54  - DAC Clock Control */
+        0x0000,     /* R55 */
+        0x0000,     /* R56 */
+        0x0000,     /* R57 */
+        0x4000,     /* R58  - DAC Mute */
+        0x0000,     /* R59  - DAC Mute Volume */
+        0x0000,     /* R60  - DAC Side */
+        0x0000,     /* R61 */
+        0x0000,     /* R62 */
+        0x0000,     /* R63 */
+        0x8000,     /* R64  - ADC Control */
+        0x0000,     /* R65 */
+        0x00C0,     /* R66  - ADC Digital Volume L */
+        0x00C0,     /* R67  - ADC Digital Volume R */
+        0x0000,     /* R68  - ADC Divider */
+        0x0000,     /* R69 */
+        0x0040,     /* R70  - ADC LR Rate */
+        0x0000,     /* R71 */
+        0x0303,     /* R72  - Input Control */
+        0x0000,     /* R73  - IN3 Input Control */
+        0x0000,     /* R74  - Mic Bias Control */
+        0x0000,     /* R75 */
+        0x0000,     /* R76  - Output Control */
+        0x0000,     /* R77  - Jack Detect */
+        0x0000,     /* R78  - Anti Pop Control */
+        0x0000,     /* R79 */
+        0x0040,     /* R80  - Left Input Volume */
+        0x0040,     /* R81  - Right Input Volume */
+        0x0000,     /* R82 */
+        0x0000,     /* R83 */
+        0x0000,     /* R84 */
+        0x0000,     /* R85 */
+        0x0000,     /* R86 */
+        0x0000,     /* R87 */
+        0x0800,     /* R88  - Left Mixer Control */
+        0x1000,     /* R89  - Right Mixer Control */
+        0x0000,     /* R90 */
+        0x0000,     /* R91 */
+        0x0000,     /* R92  - OUT3 Mixer Control */
+        0x0000,     /* R93  - OUT4 Mixer Control */
+        0x0000,     /* R94 */
+        0x0000,     /* R95 */
+        0x0000,     /* R96  - Output Left Mixer Volume */
+        0x0000,     /* R97  - Output Right Mixer Volume */
+        0x0000,     /* R98  - Input Mixer Volume L */
+        0x0000,     /* R99  - Input Mixer Volume R */
+        0x0000,     /* R100 - Input Mixer Volume */
+        0x0000,     /* R101 */
+        0x0000,     /* R102 */
+        0x0000,     /* R103 */
+        0x00E4,     /* R104 - LOUT1 Volume */
+        0x00E4,     /* R105 - ROUT1 Volume */
+        0x00E4,     /* R106 - LOUT2 Volume */
+        0x02E4,     /* R107 - ROUT2 Volume */
+        0x0000,     /* R108 */
+        0x0000,     /* R109 */
+        0x0000,     /* R110 */
+        0x0000,     /* R111 - BEEP Volume */
+        0x0A00,     /* R112 - AI Formating */
+        0x0000,     /* R113 - ADC DAC COMP */
+        0x0020,     /* R114 - AI ADC Control */
+        0x0020,     /* R115 - AI DAC Control */
+        0x0000,     /* R116 - AIF Test */
+        0x0000,     /* R117 */
+        0x0000,     /* R118 */
+        0x0000,     /* R119 */
+        0x0000,     /* R120 */
+        0x0000,     /* R121 */
+        0x0000,     /* R122 */
+        0x0000,     /* R123 */
+        0x0000,     /* R124 */
+        0x0000,     /* R125 */
+        0x0000,     /* R126 */
+        0x0000,     /* R127 */
+        0x1FFF,     /* R128 - GPIO Debounce */
+        0x0000,     /* R129 - GPIO Pin pull up Control */
+        0x03FC,     /* R130 - GPIO Pull down Control */
+        0x0000,     /* R131 - GPIO Interrupt Mode */
+        0x0000,     /* R132 */
+        0x0000,     /* R133 - GPIO Control */
+        0x0A7B,     /* R134 - GPIO Configuration (i/o) */
+        0x06FE,     /* R135 - GPIO Pin Polarity / Type */
+        0x0000,     /* R136 */
+        0x0000,     /* R137 */
+        0x0000,     /* R138 */
+        0x0000,     /* R139 */
+        0x1312,     /* R140 - GPIO Function Select 1 */
+        0x1030,     /* R141 - GPIO Function Select 2 */
+        0x2231,     /* R142 - GPIO Function Select 3 */
+        0x0003,     /* R143 - GPIO Function Select 4 */
+        0x0000,     /* R144 - Digitiser Control (1) */
+        0x0002,     /* R145 - Digitiser Control (2) */
+        0x0000,     /* R146 */
+        0x0000,     /* R147 */
+        0x0000,     /* R148 */
+        0x0000,     /* R149 */
+        0x0000,     /* R150 */
+        0x0000,     /* R151 */
+        0x7000,     /* R152 - AUX1 Readback */
+        0x7000,     /* R153 - AUX2 Readback */
+        0x7000,     /* R154 - AUX3 Readback */
+        0x7000,     /* R155 - AUX4 Readback */
+        0x0000,     /* R156 - USB Voltage Readback */
+        0x0000,     /* R157 - LINE Voltage Readback */
+        0x0000,     /* R158 - BATT Voltage Readback */
+        0x0000,     /* R159 - Chip Temp Readback */
+        0x0000,     /* R160 */
+        0x0000,     /* R161 */
+        0x0000,     /* R162 */
+        0x0000,     /* R163 - Generic Comparator Control */
+        0x0000,     /* R164 - Generic comparator 1 */
+        0x0000,     /* R165 - Generic comparator 2 */
+        0x0000,     /* R166 - Generic comparator 3 */
+        0x0000,     /* R167 - Generic comparator 4 */
+        0xA00F,     /* R168 - Battery Charger Control 1 */
+        0x0B06,     /* R169 - Battery Charger Control 2 */
+        0x0000,     /* R170 - Battery Charger Control 3 */
+        0x0000,     /* R171 */
+        0x0000,     /* R172 - Current Sink Driver A */
+        0x0000,     /* R173 - CSA Flash control */
+        0x0000,     /* R174 - Current Sink Driver B */
+        0x0000,     /* R175 - CSB Flash control */
+        0x0000,     /* R176 - DCDC/LDO requested */
+        0x002D,     /* R177 - DCDC Active options */
+        0x0000,     /* R178 - DCDC Sleep options */
+        0x0025,     /* R179 - Power-check comparator */
+        0x000E,     /* R180 - DCDC1 Control */
+        0x0400,     /* R181 - DCDC1 Timeouts */
+        0x1006,     /* R182 - DCDC1 Low Power */
+        0x0018,     /* R183 - DCDC2 Control */
+        0x0000,     /* R184 - DCDC2 Timeouts */
+        0x0000,     /* R185 */
+        0x000E,     /* R186 - DCDC3 Control */
+        0x0400,     /* R187 - DCDC3 Timeouts */
+        0x0006,     /* R188 - DCDC3 Low Power */
+        0x0026,     /* R189 - DCDC4 Control */
+        0x0400,     /* R190 - DCDC4 Timeouts */
+        0x0006,     /* R191 - DCDC4 Low Power */
+        0x0008,     /* R192 - DCDC5 Control */
+        0x0000,     /* R193 - DCDC5 Timeouts */
+        0x0000,     /* R194 */
+        0x0026,     /* R195 - DCDC6 Control */
+        0x0400,     /* R196 - DCDC6 Timeouts */
+        0x0006,     /* R197 - DCDC6 Low Power */
+        0x0000,     /* R198 */
+        0x0003,     /* R199 - Limit Switch Control */
+        0x001C,     /* R200 - LDO1 Control */
+        0x0000,     /* R201 - LDO1 Timeouts */
+        0x001C,     /* R202 - LDO1 Low Power */
+        0x001C,     /* R203 - LDO2 Control */
+        0x0400,     /* R204 - LDO2 Timeouts */
+        0x001C,     /* R205 - LDO2 Low Power */
+        0x001C,     /* R206 - LDO3 Control */
+        0x0400,     /* R207 - LDO3 Timeouts */
+        0x001C,     /* R208 - LDO3 Low Power */
+        0x001F,     /* R209 - LDO4 Control */
+        0x0400,     /* R210 - LDO4 Timeouts */
+        0x001C,     /* R211 - LDO4 Low Power */
+        0x0000,     /* R212 */
+        0x0000,     /* R213 */
+        0x0000,     /* R214 */
+        0x0000,     /* R215 - VCC_FAULT Masks */
+        0x001F,     /* R216 - Main Bandgap Control */
+        0x0000,     /* R217 - OSC Control */
+        0x9000,     /* R218 - RTC Tick Control */
+        0x0000,     /* R219 */
+        0x4000,     /* R220 - RAM BIST 1 */
+        0x0000,     /* R221 */
+        0x0000,     /* R222 */
+        0x0000,     /* R223 */
+        0x0000,     /* R224 */
+        0x0000,     /* R225 - DCDC/LDO status */
+        0x0000,     /* R226 */
+        0x0000,     /* R227 */
+        0x0000,     /* R228 */
+        0x0000,     /* R229 */
+        0xE000,     /* R230 - GPIO Pin Status */
+        0x0000,     /* R231 */
+        0x0000,     /* R232 */
+        0x0000,     /* R233 */
+        0x0000,     /* R234 */
+        0x0000,     /* R235 */
+        0x0000,     /* R236 */
+        0x0000,     /* R237 */
+        0x0000,     /* R238 */
+        0x0000,     /* R239 */
+        0x0000,     /* R240 */
+        0x0000,     /* R241 */
+        0x0000,     /* R242 */
+        0x0000,     /* R243 */
+        0x0000,     /* R244 */
+        0x0000,     /* R245 */
+        0x0000,     /* R246 */
+        0x0000,     /* R247 */
+        0x0000,     /* R248 */
+        0x0000,     /* R249 */
+        0x0000,     /* R250 */
+        0x0000,     /* R251 */
+        0x0000,     /* R252 */
+        0x0000,     /* R253 */
+        0x0000,     /* R254 */
+        0x0000,     /* R255 */
+};
+#endif
+
+/* The register defaults for the config mode used must be compiled in but
+ * due to the impact on kernel size it is possible to disable
+ */
+#ifndef WM8350_HAVE_CONFIG_MODE
+#warning No WM8350 config modes supported - select at least one of the
+#warning MFD_WM8350_CONFIG_MODE_n options from the board driver.
+#endif
+
+/*
+ * Access masks.
+ */
+
+const struct wm8350_reg_access wm8350_reg_io_map[] = {
+        /*  read    write volatile */
+        { 0xFFFF, 0xFFFF, 0xFFFF }, /* R0   - Reset/ID */
+        { 0x7CFF, 0x0C00, 0x7FFF }, /* R1   - ID */
+        { 0x0000, 0x0000, 0x0000 }, /* R2 */
+        { 0xBE3B, 0xBE3B, 0x8000 }, /* R3   - System Control 1 */
+        { 0xFCF7, 0xFCF7, 0xF800 }, /* R4   - System Control 2 */
+        { 0x80FF, 0x80FF, 0x8000 }, /* R5   - System Hibernate */
+        { 0xFB0E, 0xFB0E, 0x0000 }, /* R6   - Interface Control */
+        { 0x0000, 0x0000, 0x0000 }, /* R7 */
+        { 0xE537, 0xE537, 0xFFFF }, /* R8   - Power mgmt (1) */
+        { 0x0FF3, 0x0FF3, 0xFFFF }, /* R9   - Power mgmt (2) */
+        { 0x008F, 0x008F, 0xFFFF }, /* R10  - Power mgmt (3) */
+        { 0x6D3C, 0x6D3C, 0xFFFF }, /* R11  - Power mgmt (4) */
+        { 0x1F8F, 0x1F8F, 0xFFFF }, /* R12  - Power mgmt (5) */
+        { 0x8F3F, 0x8F3F, 0xFFFF }, /* R13  - Power mgmt (6) */
+        { 0x0003, 0x0003, 0xFFFF }, /* R14  - Power mgmt (7) */
+        { 0x0000, 0x0000, 0x0000 }, /* R15 */
+        { 0x7F7F, 0x7F7F, 0xFFFF }, /* R16  - RTC Seconds/Minutes */
+        { 0x073F, 0x073F, 0xFFFF }, /* R17  - RTC Hours/Day */
+        { 0x1F3F, 0x1F3F, 0xFFFF }, /* R18  - RTC Date/Month */
+        { 0x3FFF, 0x00FF, 0xFFFF }, /* R19  - RTC Year */
+        { 0x7F7F, 0x7F7F, 0x0000 }, /* R20  - Alarm Seconds/Minutes */
+        { 0x0F3F, 0x0F3F, 0x0000 }, /* R21  - Alarm Hours/Day */
+        { 0x1F3F, 0x1F3F, 0x0000 }, /* R22  - Alarm Date/Month */
+        { 0xEF7F, 0xEA7F, 0xFFFF }, /* R23  - RTC Time Control */
+        { 0x3BFF, 0x0000, 0xFFFF }, /* R24  - System Interrupts */
+        { 0xFEE7, 0x0000, 0xFFFF }, /* R25  - Interrupt Status 1 */
+        { 0x35FF, 0x0000, 0xFFFF }, /* R26  - Interrupt Status 2 */
+        { 0x0F3F, 0x0000, 0xFFFF }, /* R27  - Power Up Interrupt Status */
+        { 0x0F3F, 0x0000, 0xFFFF }, /* R28  - Under Voltage Interrupt status */
+        { 0x8000, 0x0000, 0xFFFF }, /* R29  - Over Current Interrupt status */
+        { 0x1FFF, 0x0000, 0xFFFF }, /* R30  - GPIO Interrupt Status */
+        { 0xEF7F, 0x0000, 0xFFFF }, /* R31  - Comparator Interrupt Status */
+        { 0x3FFF, 0x3FFF, 0x0000 }, /* R32  - System Interrupts Mask */
+        { 0xFEE7, 0xFEE7, 0x0000 }, /* R33  - Interrupt Status 1 Mask */
+        { 0xF5FF, 0xF5FF, 0x0000 }, /* R34  - Interrupt Status 2 Mask */
+        { 0x0F3F, 0x0F3F, 0x0000 }, /* R35  - Power Up Interrupt Status Mask */
+        { 0x0F3F, 0x0F3F, 0x0000 }, /* R36  - Under Voltage Int status Mask */
+        { 0x8000, 0x8000, 0x0000 }, /* R37  - Over Current Int status Mask */
+        { 0x1FFF, 0x1FFF, 0x0000 }, /* R38  - GPIO Interrupt Status Mask */
+        { 0xEF7F, 0xEF7F, 0x0000 }, /* R39  - Comparator IntStatus Mask */
+        { 0xC9F7, 0xC9F7, 0xFFFF }, /* R40  - Clock Control 1 */
+        { 0x8001, 0x8001, 0x0000 }, /* R41  - Clock Control 2 */
+        { 0xFFF7, 0xFFF7, 0xFFFF }, /* R42  - FLL Control 1 */
+        { 0xFBFF, 0xFBFF, 0x0000 }, /* R43  - FLL Control 2 */
+        { 0xFFFF, 0xFFFF, 0x0000 }, /* R44  - FLL Control 3 */
+        { 0x0033, 0x0033, 0x0000 }, /* R45  - FLL Control 4 */
+        { 0x0000, 0x0000, 0x0000 }, /* R46 */
+        { 0x0000, 0x0000, 0x0000 }, /* R47 */
+        { 0x3033, 0x3033, 0x0000 }, /* R48  - DAC Control */
+        { 0x0000, 0x0000, 0x0000 }, /* R49 */
+        { 0x81FF, 0x81FF, 0xFFFF }, /* R50  - DAC Digital Volume L */
+        { 0x81FF, 0x81FF, 0xFFFF }, /* R51  - DAC Digital Volume R */
+        { 0x0000, 0x0000, 0x0000 }, /* R52 */
+        { 0x0FFF, 0x0FFF, 0xFFFF }, /* R53  - DAC LR Rate */
+        { 0x0017, 0x0017, 0x0000 }, /* R54  - DAC Clock Control */
+        { 0x0000, 0x0000, 0x0000 }, /* R55 */
+        { 0x0000, 0x0000, 0x0000 }, /* R56 */
+        { 0x0000, 0x0000, 0x0000 }, /* R57 */
+        { 0x4000, 0x4000, 0x0000 }, /* R58  - DAC Mute */
+        { 0x7000, 0x7000, 0x0000 }, /* R59  - DAC Mute Volume */
+        { 0x3C00, 0x3C00, 0x0000 }, /* R60  - DAC Side */
+        { 0x0000, 0x0000, 0x0000 }, /* R61 */
+        { 0x0000, 0x0000, 0x0000 }, /* R62 */
+        { 0x0000, 0x0000, 0x0000 }, /* R63 */
+        { 0x8303, 0x8303, 0xFFFF }, /* R64  - ADC Control */
+        { 0x0000, 0x0000, 0x0000 }, /* R65 */
+        { 0x81FF, 0x81FF, 0xFFFF }, /* R66  - ADC Digital Volume L */
+        { 0x81FF, 0x81FF, 0xFFFF }, /* R67  - ADC Digital Volume R */
+        { 0x0FFF, 0x0FFF, 0x0000 }, /* R68  - ADC Divider */
+        { 0x0000, 0x0000, 0x0000 }, /* R69 */
+        { 0x0FFF, 0x0FFF, 0xFFFF }, /* R70  - ADC LR Rate */
+        { 0x0000, 0x0000, 0x0000 }, /* R71 */
+        { 0x0707, 0x0707, 0xFFFF }, /* R72  - Input Control */
+        { 0xC0C0, 0xC0C0, 0xFFFF }, /* R73  - IN3 Input Control */
+        { 0xC09F, 0xC09F, 0xFFFF }, /* R74  - Mic Bias Control */
+        { 0x0000, 0x0000, 0x0000 }, /* R75 */
+        { 0x0F15, 0x0F15, 0xFFFF }, /* R76  - Output Control */
+        { 0xC000, 0xC000, 0xFFFF }, /* R77  - Jack Detect */
+        { 0x03FF, 0x03FF, 0x0000 }, /* R78  - Anti Pop Control */
+        { 0x0000, 0x0000, 0x0000 }, /* R79 */
+        { 0xE1FC, 0xE1FC, 0x8000 }, /* R80  - Left Input Volume */
+        { 0xE1FC, 0xE1FC, 0x8000 }, /* R81  - Right Input Volume */
+        { 0x0000, 0x0000, 0x0000 }, /* R82 */
+        { 0x0000, 0x0000, 0x0000 }, /* R83 */
+        { 0x0000, 0x0000, 0x0000 }, /* R84 */
+        { 0x0000, 0x0000, 0x0000 }, /* R85 */
+        { 0x0000, 0x0000, 0x0000 }, /* R86 */
+        { 0x0000, 0x0000, 0x0000 }, /* R87 */
+        { 0x9807, 0x9807, 0xFFFF }, /* R88  - Left Mixer Control */
+        { 0x980B, 0x980B, 0xFFFF }, /* R89  - Right Mixer Control */
+        { 0x0000, 0x0000, 0x0000 }, /* R90 */
+        { 0x0000, 0x0000, 0x0000 }, /* R91 */
+        { 0x8909, 0x8909, 0xFFFF }, /* R92  - OUT3 Mixer Control */
+        { 0x9E07, 0x9E07, 0xFFFF }, /* R93  - OUT4 Mixer Control */
+        { 0x0000, 0x0000, 0x0000 }, /* R94 */
+        { 0x0000, 0x0000, 0x0000 }, /* R95 */
+        { 0x0EEE, 0x0EEE, 0x0000 }, /* R96  - Output Left Mixer Volume */
+        { 0xE0EE, 0xE0EE, 0x0000 }, /* R97  - Output Right Mixer Volume */
+        { 0x0E0F, 0x0E0F, 0x0000 }, /* R98  - Input Mixer Volume L */
+        { 0xE0E1, 0xE0E1, 0x0000 }, /* R99  - Input Mixer Volume R */
+        { 0x800E, 0x800E, 0x0000 }, /* R100 - Input Mixer Volume */
+        { 0x0000, 0x0000, 0x0000 }, /* R101 */
+        { 0x0000, 0x0000, 0x0000 }, /* R102 */
+        { 0x0000, 0x0000, 0x0000 }, /* R103 */
+        { 0xE1FC, 0xE1FC, 0xFFFF }, /* R104 - LOUT1 Volume */
+        { 0xE1FC, 0xE1FC, 0xFFFF }, /* R105 - ROUT1 Volume */
+        { 0xE1FC, 0xE1FC, 0xFFFF }, /* R106 - LOUT2 Volume */
+        { 0xE7FC, 0xE7FC, 0xFFFF }, /* R107 - ROUT2 Volume */
+        { 0x0000, 0x0000, 0x0000 }, /* R108 */
+        { 0x0000, 0x0000, 0x0000 }, /* R109 */
+        { 0x0000, 0x0000, 0x0000 }, /* R110 */
+        { 0x80E0, 0x80E0, 0xFFFF }, /* R111 - BEEP Volume */
+        { 0xBF00, 0xBF00, 0x0000 }, /* R112 - AI Formating */
+        { 0x00F1, 0x00F1, 0x0000 }, /* R113 - ADC DAC COMP */
+        { 0x00F8, 0x00F8, 0x0000 }, /* R114 - AI ADC Control */
+        { 0x40FB, 0x40FB, 0x0000 }, /* R115 - AI DAC Control */
+        { 0x7C30, 0x7C30, 0x0000 }, /* R116 - AIF Test */
+        { 0x0000, 0x0000, 0x0000 }, /* R117 */
+        { 0x0000, 0x0000, 0x0000 }, /* R118 */
+        { 0x0000, 0x0000, 0x0000 }, /* R119 */
+        { 0x0000, 0x0000, 0x0000 }, /* R120 */
+        { 0x0000, 0x0000, 0x0000 }, /* R121 */
+        { 0x0000, 0x0000, 0x0000 }, /* R122 */
+        { 0x0000, 0x0000, 0x0000 }, /* R123 */
+        { 0x0000, 0x0000, 0x0000 }, /* R124 */
+        { 0x0000, 0x0000, 0x0000 }, /* R125 */
+        { 0x0000, 0x0000, 0x0000 }, /* R126 */
+        { 0x0000, 0x0000, 0x0000 }, /* R127 */
+        { 0x1FFF, 0x1FFF, 0x0000 }, /* R128 - GPIO Debounce */
+        { 0x1FFF, 0x1FFF, 0x0000 }, /* R129 - GPIO Pin pull up Control */
+        { 0x1FFF, 0x1FFF, 0x0000 }, /* R130 - GPIO Pull down Control */
+        { 0x1FFF, 0x1FFF, 0x0000 }, /* R131 - GPIO Interrupt Mode */
+        { 0x0000, 0x0000, 0x0000 }, /* R132 */
+        { 0x00C0, 0x00C0, 0x0000 }, /* R133 - GPIO Control */
+        { 0x1FFF, 0x1FFF, 0x0000 }, /* R134 - GPIO Configuration (i/o) */
+        { 0x1FFF, 0x1FFF, 0x0000 }, /* R135 - GPIO Pin Polarity / Type */
+        { 0x0000, 0x0000, 0x0000 }, /* R136 */
+        { 0x0000, 0x0000, 0x0000 }, /* R137 */
+        { 0x0000, 0x0000, 0x0000 }, /* R138 */
+        { 0x0000, 0x0000, 0x0000 }, /* R139 */
+        { 0xFFFF, 0xFFFF, 0x0000 }, /* R140 - GPIO Function Select 1 */
+        { 0xFFFF, 0xFFFF, 0x0000 }, /* R141 - GPIO Function Select 2 */
+        { 0xFFFF, 0xFFFF, 0x0000 }, /* R142 - GPIO Function Select 3 */
+        { 0x000F, 0x000F, 0x0000 }, /* R143 - GPIO Function Select 4 */
+        { 0xF0FF, 0xF0FF, 0xA000 }, /* R144 - Digitiser Control (1) */
+        { 0x3707, 0x3707, 0x0000 }, /* R145 - Digitiser Control (2) */
+        { 0x0000, 0x0000, 0x0000 }, /* R146 */
+        { 0x0000, 0x0000, 0x0000 }, /* R147 */
+        { 0x0000, 0x0000, 0x0000 }, /* R148 */
+        { 0x0000, 0x0000, 0x0000 }, /* R149 */
+        { 0x0000, 0x0000, 0x0000 }, /* R150 */
+        { 0x0000, 0x0000, 0x0000 }, /* R151 */
+        { 0x7FFF, 0x7000, 0xFFFF }, /* R152 - AUX1 Readback */
+        { 0x7FFF, 0x7000, 0xFFFF }, /* R153 - AUX2 Readback */
+        { 0x7FFF, 0x7000, 0xFFFF }, /* R154 - AUX3 Readback */
+        { 0x7FFF, 0x7000, 0xFFFF }, /* R155 - AUX4 Readback */
+        { 0x0FFF, 0x0000, 0xFFFF }, /* R156 - USB Voltage Readback */
+        { 0x0FFF, 0x0000, 0xFFFF }, /* R157 - LINE Voltage Readback */
+        { 0x0FFF, 0x0000, 0xFFFF }, /* R158 - BATT Voltage Readback */
+        { 0x0FFF, 0x0000, 0xFFFF }, /* R159 - Chip Temp Readback */
+        { 0x0000, 0x0000, 0x0000 }, /* R160 */
+        { 0x0000, 0x0000, 0x0000 }, /* R161 */
+        { 0x0000, 0x0000, 0x0000 }, /* R162 */
+        { 0x000F, 0x000F, 0x0000 }, /* R163 - Generic Comparator Control */
+        { 0xFFFF, 0xFFFF, 0x0000 }, /* R164 - Generic comparator 1 */
+        { 0xFFFF, 0xFFFF, 0x0000 }, /* R165 - Generic comparator 2 */
+        { 0xFFFF, 0xFFFF, 0x0000 }, /* R166 - Generic comparator 3 */
+        { 0xFFFF, 0xFFFF, 0x0000 }, /* R167 - Generic comparator 4 */
+        { 0xBFFF, 0xBFFF, 0x8000 }, /* R168 - Battery Charger Control 1 */
+        { 0xFFFF, 0x4FFF, 0xB000 }, /* R169 - Battery Charger Control 2 */
+        { 0x007F, 0x007F, 0x0000 }, /* R170 - Battery Charger Control 3 */
+        { 0x0000, 0x0000, 0x0000 }, /* R171 */
+        { 0x903F, 0x903F, 0xFFFF }, /* R172 - Current Sink Driver A */
+        { 0xE333, 0xE333, 0xFFFF }, /* R173 - CSA Flash control */
+        { 0x903F, 0x903F, 0xFFFF }, /* R174 - Current Sink Driver B */
+        { 0xE333, 0xE333, 0xFFFF }, /* R175 - CSB Flash control */
+        { 0x8F3F, 0x8F3F, 0xFFFF }, /* R176 - DCDC/LDO requested */
+        { 0x332D, 0x332D, 0x0000 }, /* R177 - DCDC Active options */
+        { 0x002D, 0x002D, 0x0000 }, /* R178 - DCDC Sleep options */
+        { 0x5177, 0x5177, 0x8000 }, /* R179 - Power-check comparator */
+        { 0x047F, 0x047F, 0x0000 }, /* R180 - DCDC1 Control */
+        { 0xFFC0, 0xFFC0, 0x0000 }, /* R181 - DCDC1 Timeouts */
+        { 0x737F, 0x737F, 0x0000 }, /* R182 - DCDC1 Low Power */
+        { 0x535B, 0x535B, 0x0000 }, /* R183 - DCDC2 Control */
+        { 0xFFC0, 0xFFC0, 0x0000 }, /* R184 - DCDC2 Timeouts */
+        { 0x0000, 0x0000, 0x0000 }, /* R185 */
+        { 0x047F, 0x047F, 0x0000 }, /* R186 - DCDC3 Control */
+        { 0xFFC0, 0xFFC0, 0x0000 }, /* R187 - DCDC3 Timeouts */
+        { 0x737F, 0x737F, 0x0000 }, /* R188 - DCDC3 Low Power */
+        { 0x047F, 0x047F, 0x0000 }, /* R189 - DCDC4 Control */
+        { 0xFFC0, 0xFFC0, 0x0000 }, /* R190 - DCDC4 Timeouts */
+        { 0x737F, 0x737F, 0x0000 }, /* R191 - DCDC4 Low Power */
+        { 0x535B, 0x535B, 0x0000 }, /* R192 - DCDC5 Control */
+        { 0xFFC0, 0xFFC0, 0x0000 }, /* R193 - DCDC5 Timeouts */
+        { 0x0000, 0x0000, 0x0000 }, /* R194 */
+        { 0x047F, 0x047F, 0x0000 }, /* R195 - DCDC6 Control */
+        { 0xFFC0, 0xFFC0, 0x0000 }, /* R196 - DCDC6 Timeouts */
+        { 0x737F, 0x737F, 0x0000 }, /* R197 - DCDC6 Low Power */
+        { 0x0000, 0x0000, 0x0000 }, /* R198 */
+        { 0xFFD3, 0xFFD3, 0x0000 }, /* R199 - Limit Switch Control */
+        { 0x441F, 0x441F, 0x0000 }, /* R200 - LDO1 Control */
+        { 0xFFC0, 0xFFC0, 0x0000 }, /* R201 - LDO1 Timeouts */
+        { 0x331F, 0x331F, 0x0000 }, /* R202 - LDO1 Low Power */
+        { 0x441F, 0x441F, 0x0000 }, /* R203 - LDO2 Control */
+        { 0xFFC0, 0xFFC0, 0x0000 }, /* R204 - LDO2 Timeouts */
+        { 0x331F, 0x331F, 0x0000 }, /* R205 - LDO2 Low Power */
+        { 0x441F, 0x441F, 0x0000 }, /* R206 - LDO3 Control */
+        { 0xFFC0, 0xFFC0, 0x0000 }, /* R207 - LDO3 Timeouts */
+        { 0x331F, 0x331F, 0x0000 }, /* R208 - LDO3 Low Power */
+        { 0x441F, 0x441F, 0x0000 }, /* R209 - LDO4 Control */
+        { 0xFFC0, 0xFFC0, 0x0000 }, /* R210 - LDO4 Timeouts */
+        { 0x331F, 0x331F, 0x0000 }, /* R211 - LDO4 Low Power */
+        { 0x0000, 0x0000, 0x0000 }, /* R212 */
+        { 0x0000, 0x0000, 0x0000 }, /* R213 */
+        { 0x0000, 0x0000, 0x0000 }, /* R214 */
+        { 0x8F3F, 0x8F3F, 0x0000 }, /* R215 - VCC_FAULT Masks */
+        { 0xFF3F, 0xE03F, 0x0000 }, /* R216 - Main Bandgap Control */
+        { 0xEF2F, 0xE02F, 0x0000 }, /* R217 - OSC Control */
+        { 0xF3FF, 0xB3FF, 0xc000 }, /* R218 - RTC Tick Control */
+        { 0xFFFF, 0xFFFF, 0xFFFF }, /* R219 */
+        { 0x09FF, 0x01FF, 0x0000 }, /* R220 - RAM BIST 1 */
+        { 0x0000, 0x0000, 0x0000 }, /* R221 */
+        { 0xFFFF, 0xFFFF, 0xFFFF }, /* R222 */
+        { 0xFFFF, 0xFFFF, 0xFFFF }, /* R223 */
+        { 0x0000, 0x0000, 0x0000 }, /* R224 */
+        { 0x8F3F, 0x0000, 0xFFFF }, /* R225 - DCDC/LDO status */
+        { 0x0000, 0x0000, 0x0000 }, /* R226 */
+        { 0x0000, 0x0000, 0xFFFF }, /* R227 */
+        { 0x0000, 0x0000, 0x0000 }, /* R228 */
+        { 0x0000, 0x0000, 0x0000 }, /* R229 */
+        { 0xFFFF, 0x1FFF, 0xFFFF }, /* R230 - GPIO Pin Status */
+        { 0xFFFF, 0x1FFF, 0xFFFF }, /* R231 */
+        { 0xFFFF, 0x1FFF, 0xFFFF }, /* R232 */
+        { 0xFFFF, 0x1FFF, 0xFFFF }, /* R233 */
+        { 0x0000, 0x0000, 0x0000 }, /* R234 */
+        { 0x0000, 0x0000, 0x0000 }, /* R235 */
+        { 0x0000, 0x0000, 0x0000 }, /* R236 */
+        { 0x0000, 0x0000, 0x0000 }, /* R237 */
+        { 0x0000, 0x0000, 0x0000 }, /* R238 */
+        { 0x0000, 0x0000, 0x0000 }, /* R239 */
+        { 0x0000, 0x0000, 0x0000 }, /* R240 */
+        { 0x0000, 0x0000, 0x0000 }, /* R241 */
+        { 0x0000, 0x0000, 0x0000 }, /* R242 */
+        { 0x0000, 0x0000, 0x0000 }, /* R243 */
+        { 0x0000, 0x0000, 0x0000 }, /* R244 */
+        { 0x0000, 0x0000, 0x0000 }, /* R245 */
+        { 0x0000, 0x0000, 0x0000 }, /* R246 */
+        { 0x0000, 0x0000, 0x0000 }, /* R247 */
+        { 0xFFFF, 0x0010, 0xFFFF }, /* R248 */
+        { 0x0000, 0x0000, 0x0000 }, /* R249 */
+        { 0xFFFF, 0x0010, 0xFFFF }, /* R250 */
+        { 0xFFFF, 0x0010, 0xFFFF }, /* R251 */
+        { 0x0000, 0x0000, 0x0000 }, /* R252 */
+        { 0xFFFF, 0x0010, 0xFFFF }, /* R253 */
+        { 0x0000, 0x0000, 0x0000 }, /* R254 */
+        { 0x0000, 0x0000, 0x0000 }, /* R255 */
+};
diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c
new file mode 100644
index 000000000000..6a0cedb5bb8a
--- /dev/null
+++ b/drivers/mfd/wm8400-core.c
@@ -0,0 +1,455 @@
+/*
+ * Core driver for WM8400.
+ *
+ * Copyright 2008 Wolfson Microelectronics PLC.
+ *
+ * Author: Mark Brown <broonie@opensource.wolfsonmicro.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.
+ *
+ */
+
+#include <linux/bug.h>
+#include <linux/i2c.h>
+#include <linux/kernel.h>
+#include <linux/mfd/wm8400-private.h>
+#include <linux/mfd/wm8400-audio.h>
+
+static struct {
+        u16  readable;    /* Mask of readable bits */
+        u16  writable;    /* Mask of writable bits */
+        u16  vol;         /* Mask of volatile bits */
+        int  is_codec;    /* Register controlled by codec reset */
+        u16  default_val; /* Value on reset */
+} reg_data[] = {
+        { 0xFFFF, 0xFFFF, 0x0000, 0, 0x6172 }, /* R0 */
+        { 0x7000, 0x0000, 0x8000, 0, 0x0000 }, /* R1 */
+        { 0xFF17, 0xFF17, 0x0000, 0, 0x0000 }, /* R2 */
+        { 0xEBF3, 0xEBF3, 0x0000, 1, 0x6000 }, /* R3 */
+        { 0x3CF3, 0x3CF3, 0x0000, 1, 0x0000 }, /* R4  */
+        { 0xF1F8, 0xF1F8, 0x0000, 1, 0x4050 }, /* R5  */
+        { 0xFC1F, 0xFC1F, 0x0000, 1, 0x4000 }, /* R6  */
+        { 0xDFDE, 0xDFDE, 0x0000, 1, 0x01C8 }, /* R7  */
+        { 0xFCFC, 0xFCFC, 0x0000, 1, 0x0000 }, /* R8  */
+        { 0xEFFF, 0xEFFF, 0x0000, 1, 0x0040 }, /* R9  */
+        { 0xEFFF, 0xEFFF, 0x0000, 1, 0x0040 }, /* R10 */
+        { 0x27F7, 0x27F7, 0x0000, 1, 0x0004 }, /* R11 */
+        { 0x01FF, 0x01FF, 0x0000, 1, 0x00C0 }, /* R12 */
+        { 0x01FF, 0x01FF, 0x0000, 1, 0x00C0 }, /* R13 */
+        { 0x1FEF, 0x1FEF, 0x0000, 1, 0x0000 }, /* R14 */
+        { 0x0163, 0x0163, 0x0000, 1, 0x0100 }, /* R15 */
+        { 0x01FF, 0x01FF, 0x0000, 1, 0x00C0 }, /* R16 */
+        { 0x01FF, 0x01FF, 0x0000, 1, 0x00C0 }, /* R17 */
+        { 0x1FFF, 0x0FFF, 0x0000, 1, 0x0000 }, /* R18 */
+        { 0xFFFF, 0xFFFF, 0x0000, 1, 0x1000 }, /* R19 */
+        { 0xFFFF, 0xFFFF, 0x0000, 1, 0x1010 }, /* R20 */
+        { 0xFFFF, 0xFFFF, 0x0000, 1, 0x1010 }, /* R21 */
+        { 0x0FDD, 0x0FDD, 0x0000, 1, 0x8000 }, /* R22 */
+        { 0x1FFF, 0x1FFF, 0x0000, 1, 0x0800 }, /* R23 */
+        { 0x0000, 0x01DF, 0x0000, 1, 0x008B }, /* R24 */
+        { 0x0000, 0x01DF, 0x0000, 1, 0x008B }, /* R25 */
+        { 0x0000, 0x01DF, 0x0000, 1, 0x008B }, /* R26 */
+        { 0x0000, 0x01DF, 0x0000, 1, 0x008B }, /* R27 */
+        { 0x0000, 0x01FF, 0x0000, 1, 0x0000 }, /* R28 */
+        { 0x0000, 0x01FF, 0x0000, 1, 0x0000 }, /* R29 */
+        { 0x0000, 0x0077, 0x0000, 1, 0x0066 }, /* R30 */
+        { 0x0000, 0x0033, 0x0000, 1, 0x0022 }, /* R31 */
+        { 0x0000, 0x01FF, 0x0000, 1, 0x0079 }, /* R32 */
+        { 0x0000, 0x01FF, 0x0000, 1, 0x0079 }, /* R33 */
+        { 0x0000, 0x0003, 0x0000, 1, 0x0003 }, /* R34 */
+        { 0x0000, 0x01FF, 0x0000, 1, 0x0003 }, /* R35 */
+        { 0x0000, 0x0000, 0x0000, 0, 0x0000 }, /* R36 */
+        { 0x0000, 0x003F, 0x0000, 1, 0x0100 }, /* R37 */
+        { 0x0000, 0x0000, 0x0000, 0, 0x0000 }, /* R38 */
+        { 0x0000, 0x000F, 0x0000, 0, 0x0000 }, /* R39 */
+        { 0x0000, 0x00FF, 0x0000, 1, 0x0000 }, /* R40 */
+        { 0x0000, 0x01B7, 0x0000, 1, 0x0000 }, /* R41 */
+        { 0x0000, 0x01B7, 0x0000, 1, 0x0000 }, /* R42 */
+        { 0x0000, 0x01FF, 0x0000, 1, 0x0000 }, /* R43 */
+        { 0x0000, 0x01FF, 0x0000, 1, 0x0000 }, /* R44 */
+        { 0x0000, 0x00FD, 0x0000, 1, 0x0000 }, /* R45 */
+        { 0x0000, 0x00FD, 0x0000, 1, 0x0000 }, /* R46 */
+        { 0x0000, 0x01FF, 0x0000, 1, 0x0000 }, /* R47 */
+        { 0x0000, 0x01FF, 0x0000, 1, 0x0000 }, /* R48 */
+        { 0x0000, 0x01FF, 0x0000, 1, 0x0000 }, /* R49 */
+        { 0x0000, 0x01FF, 0x0000, 1, 0x0000 }, /* R50 */
+        { 0x0000, 0x01B3, 0x0000, 1, 0x0180 }, /* R51 */
+        { 0x0000, 0x0077, 0x0000, 1, 0x0000 }, /* R52 */
+        { 0x0000, 0x0077, 0x0000, 1, 0x0000 }, /* R53 */
+        { 0x0000, 0x00FF, 0x0000, 1, 0x0000 }, /* R54 */
+        { 0x0000, 0x0001, 0x0000, 1, 0x0000 }, /* R55 */
+        { 0x0000, 0x003F, 0x0000, 1, 0x0000 }, /* R56 */
+        { 0x0000, 0x004F, 0x0000, 1, 0x0000 }, /* R57 */
+        { 0x0000, 0x00FD, 0x0000, 1, 0x0000 }, /* R58 */
+        { 0x0000, 0x0000, 0x0000, 0, 0x0000 }, /* R59 */
+        { 0x1FFF, 0x1FFF, 0x0000, 1, 0x0000 }, /* R60 */
+        { 0xFFFF, 0xFFFF, 0x0000, 1, 0x0000 }, /* R61 */
+        { 0x03FF, 0x03FF, 0x0000, 1, 0x0000 }, /* R62 */
+        { 0x007F, 0x007F, 0x0000, 1, 0x0000 }, /* R63 */
+        { 0x0000, 0x0000, 0x0000, 0, 0x0000 }, /* R64 */
+        { 0xDFFF, 0xDFFF, 0x0000, 0, 0x0000 }, /* R65 */
+        { 0xDFFF, 0xDFFF, 0x0000, 0, 0x0000 }, /* R66 */
+        { 0xDFFF, 0xDFFF, 0x0000, 0, 0x0000 }, /* R67 */
+        { 0xDFFF, 0xDFFF, 0x0000, 0, 0x0000 }, /* R68 */
+        { 0x0000, 0x0000, 0x0000, 0, 0x0000 }, /* R69 */
+        { 0xFFFF, 0xFFFF, 0x0000, 0, 0x4400 }, /* R70 */
+        { 0x23FF, 0x23FF, 0x0000, 0, 0x0000 }, /* R71 */
+        { 0xFFFF, 0xFFFF, 0x0000, 0, 0x4400 }, /* R72 */
+        { 0x23FF, 0x23FF, 0x0000, 0, 0x0000 }, /* R73 */
+        { 0x0000, 0x0000, 0x0000, 0, 0x0000 }, /* R74 */
+        { 0x000E, 0x000E, 0x0000, 0, 0x0008 }, /* R75 */
+        { 0xE00F, 0xE00F, 0x0000, 0, 0x0000 }, /* R76 */
+        { 0x0000, 0x0000, 0x0000, 0, 0x0000 }, /* R77 */
+        { 0x03C0, 0x03C0, 0x0000, 0, 0x02C0 }, /* R78 */
+        { 0xFFFF, 0x0000, 0xffff, 0, 0x0000 }, /* R79 */
+        { 0xFFFF, 0xFFFF, 0x0000, 0, 0x0000 }, /* R80 */
+        { 0xFFFF, 0x0000, 0xffff, 0, 0x0000 }, /* R81 */
+        { 0x2BFF, 0x0000, 0xffff, 0, 0x0000 }, /* R82 */
+        { 0x0000, 0x0000, 0x0000, 0, 0x0000 }, /* R83 */
+        { 0x80FF, 0x80FF, 0x0000, 0, 0x00ff }, /* R84 */
+};
+
+static int wm8400_read(struct wm8400 *wm8400, u8 reg, int num_regs, u16 *dest)
+{
+        int i, ret = 0;
+
+        BUG_ON(reg + num_regs - 1 > ARRAY_SIZE(wm8400->reg_cache));
+
+        /* If there are any volatile reads then read back the entire block */
+        for (i = reg; i < reg + num_regs; i++)
+                if (reg_data[i].vol) {
+                        ret = wm8400->read_dev(wm8400->io_data, reg,
+                                               num_regs, dest);
+                        if (ret != 0)
+                                return ret;
+                        for (i = 0; i < num_regs; i++)
+                                dest[i] = be16_to_cpu(dest[i]);
+
+                        return 0;
+                }
+
+        /* Otherwise use the cache */
+        memcpy(dest, &wm8400->reg_cache[reg], num_regs * sizeof(u16));
+
+        return 0;
+}
+
+static int wm8400_write(struct wm8400 *wm8400, u8 reg, int num_regs,
+                        u16 *src)
+{
+        int ret, i;
+
+        BUG_ON(reg + num_regs - 1 > ARRAY_SIZE(wm8400->reg_cache));
+
+        for (i = 0; i < num_regs; i++) {
+                BUG_ON(!reg_data[reg + i].writable);
+                wm8400->reg_cache[reg + i] = src[i];
+                src[i] = cpu_to_be16(src[i]);
+        }
+
+        /* Do the actual I/O */
+        ret = wm8400->write_dev(wm8400->io_data, reg, num_regs, src);
+        if (ret != 0)
+                return -EIO;
+
+        return 0;
+}
+
+/**
+ * wm8400_reg_read - Single register read
+ *
+ * @wm8400: Pointer to wm8400 control structure
+ * @reg:    Register to read
+ *
+ * @return  Read value
+ */
+u16 wm8400_reg_read(struct wm8400 *wm8400, u8 reg)
+{
+        u16 val;
+
+        mutex_lock(&wm8400->io_lock);
+
+        wm8400_read(wm8400, reg, 1, &val);
+
+        mutex_unlock(&wm8400->io_lock);
+
+        return val;
+}
+EXPORT_SYMBOL_GPL(wm8400_reg_read);
+
+int wm8400_block_read(struct wm8400 *wm8400, u8 reg, int count, u16 *data)
+{
+        int ret;
+
+        mutex_lock(&wm8400->io_lock);
+
+        ret = wm8400_read(wm8400, reg, count, data);
+
+        mutex_unlock(&wm8400->io_lock);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(wm8400_block_read);
+
+/**
+ * wm8400_set_bits - Bitmask write
+ *
+ * @wm8400: Pointer to wm8400 control structure
+ * @reg:    Register to access
+ * @mask:   Mask of bits to change
+ * @val:    Value to set for masked bits
+ */
+int wm8400_set_bits(struct wm8400 *wm8400, u8 reg, u16 mask, u16 val)
+{
+        u16 tmp;
+        int ret;
+
+        mutex_lock(&wm8400->io_lock);
+
+        ret = wm8400_read(wm8400, reg, 1, &tmp);
+        tmp = (tmp & ~mask) | val;
+        if (ret == 0)
+                ret = wm8400_write(wm8400, reg, 1, &tmp);
+
+        mutex_unlock(&wm8400->io_lock);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(wm8400_set_bits);
+
+/**
+ * wm8400_reset_codec_reg_cache - Reset cached codec registers to
+ * their default values.
+ */
+void wm8400_reset_codec_reg_cache(struct wm8400 *wm8400)
+{
+        int i;
+
+        mutex_lock(&wm8400->io_lock);
+
+        /* Reset all codec registers to their initial value */
+        for (i = 0; i < ARRAY_SIZE(wm8400->reg_cache); i++)
+                if (reg_data[i].is_codec)
+                        wm8400->reg_cache[i] = reg_data[i].default_val;
+
+        mutex_unlock(&wm8400->io_lock);
+}
+EXPORT_SYMBOL_GPL(wm8400_reset_codec_reg_cache);
+
+/*
+ * wm8400_init - Generic initialisation
+ *
+ * The WM8400 can be configured as either an I2C or SPI device.  Probe
+ * functions for each bus set up the accessors then call into this to
+ * set up the device itself.
+ */
+static int wm8400_init(struct wm8400 *wm8400,
+                       struct wm8400_platform_data *pdata)
+{
+        u16 reg;
+        int ret, i;
+
+        mutex_init(&wm8400->io_lock);
+
+        wm8400->dev->driver_data = wm8400;
+
+        /* Check that this is actually a WM8400 */
+        ret = wm8400->read_dev(wm8400->io_data, WM8400_RESET_ID, 1, &reg);
+        if (ret != 0) {
+                dev_err(wm8400->dev, "Chip ID register read failed\n");
+                return -EIO;
+        }
+        if (be16_to_cpu(reg) != reg_data[WM8400_RESET_ID].default_val) {
+                dev_err(wm8400->dev, "Device is not a WM8400, ID is %x\n",
+                        be16_to_cpu(reg));
+                return -ENODEV;
+        }
+
+        /* We don't know what state the hardware is in and since this
+         * is a PMIC we can't reset it safely so initialise the register
+         * cache from the hardware.
+         */
+        ret = wm8400->read_dev(wm8400->io_data, 0,
+                               ARRAY_SIZE(wm8400->reg_cache),
+                               wm8400->reg_cache);
+        if (ret != 0) {
+                dev_err(wm8400->dev, "Register cache read failed\n");
+                return -EIO;
+        }
+        for (i = 0; i < ARRAY_SIZE(wm8400->reg_cache); i++)
+                wm8400->reg_cache[i] = be16_to_cpu(wm8400->reg_cache[i]);
+
+        /* If the codec is in reset use hard coded values */
+        if (!(wm8400->reg_cache[WM8400_POWER_MANAGEMENT_1] & WM8400_CODEC_ENA))
+                for (i = 0; i < ARRAY_SIZE(wm8400->reg_cache); i++)
+                        if (reg_data[i].is_codec)
+                                wm8400->reg_cache[i] = reg_data[i].default_val;
+
+        ret = wm8400_read(wm8400, WM8400_ID, 1, &reg);
+        if (ret != 0) {
+                dev_err(wm8400->dev, "ID register read failed: %d\n", ret);
+                return ret;
+        }
+        reg = (reg & WM8400_CHIP_REV_MASK) >> WM8400_CHIP_REV_SHIFT;
+        dev_info(wm8400->dev, "WM8400 revision %x\n", reg);
+
+        if (pdata && pdata->platform_init) {
+                ret = pdata->platform_init(wm8400->dev);
+                if (ret != 0)
+                        dev_err(wm8400->dev, "Platform init failed: %d\n",
+                                ret);
+        } else
+                dev_warn(wm8400->dev, "No platform initialisation supplied\n");
+
+        return ret;
+}
+
+static void wm8400_release(struct wm8400 *wm8400)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(wm8400->regulators); i++)
+                if (wm8400->regulators[i].name)
+                        platform_device_unregister(&wm8400->regulators[i]);
+}
+
+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+static int wm8400_i2c_read(void *io_data, char reg, int count, u16 *dest)
+{
+        struct i2c_client *i2c = io_data;
+        struct i2c_msg xfer[2];
+        int ret;
+
+        /* Write register */
+        xfer[0].addr = i2c->addr;
+        xfer[0].flags = 0;
+        xfer[0].len = 1;
+        xfer[0].buf = &reg;
+
+        /* Read data */
+        xfer[1].addr = i2c->addr;
+        xfer[1].flags = I2C_M_RD;
+        xfer[1].len = count * sizeof(u16);
+        xfer[1].buf = (u8 *)dest;
+
+        ret = i2c_transfer(i2c->adapter, xfer, 2);
+        if (ret == 2)
+                ret = 0;
+        else if (ret >= 0)
+                ret = -EIO;
+
+        return ret;
+}
+
+static int wm8400_i2c_write(void *io_data, char reg, int count, const u16 *src)
+{
+        struct i2c_client *i2c = io_data;
+        u8 *msg;
+        int ret;
+
+        /* We add 1 byte for device register - ideally I2C would gather. */
+        msg = kmalloc((count * sizeof(u16)) + 1, GFP_KERNEL);
+        if (msg == NULL)
+                return -ENOMEM;
+
+        msg[0] = reg;
+        memcpy(&msg[1], src, count * sizeof(u16));
+
+        ret = i2c_master_send(i2c, msg, (count * sizeof(u16)) + 1);
+
+        if (ret == (count * 2) + 1)
+                ret = 0;
+        else if (ret >= 0)
+                ret = -EIO;
+
+        kfree(msg);
+
+        return ret;
+}
+
+static int wm8400_i2c_probe(struct i2c_client *i2c,
+                            const struct i2c_device_id *id)
+{
+        struct wm8400 *wm8400;
+        int ret;
+
+        wm8400 = kzalloc(sizeof(struct wm8400), GFP_KERNEL);
+        if (wm8400 == NULL) {
+                ret = -ENOMEM;
+                goto err;
+        }
+
+        wm8400->io_data = i2c;
+        wm8400->read_dev = wm8400_i2c_read;
+        wm8400->write_dev = wm8400_i2c_write;
+        wm8400->dev = &i2c->dev;
+        i2c_set_clientdata(i2c, wm8400);
+
+        ret = wm8400_init(wm8400, i2c->dev.platform_data);
+        if (ret != 0)
+                goto struct_err;
+
+        return 0;
+
+struct_err:
+        i2c_set_clientdata(i2c, NULL);
+        kfree(wm8400);
+err:
+        return ret;
+}
+
+static int wm8400_i2c_remove(struct i2c_client *i2c)
+{
+        struct wm8400 *wm8400 = i2c_get_clientdata(i2c);
+
+        wm8400_release(wm8400);
+        i2c_set_clientdata(i2c, NULL);
+        kfree(wm8400);
+
+        return 0;
+}
+
+static const struct i2c_device_id wm8400_i2c_id[] = {
+       { "wm8400", 0 },
+       { }
+};
+MODULE_DEVICE_TABLE(i2c, wm8400_i2c_id);
+
+static struct i2c_driver wm8400_i2c_driver = {
+        .driver = {
+                .name = "WM8400",
+                .owner = THIS_MODULE,
+        },
+        .probe    = wm8400_i2c_probe,
+        .remove   = wm8400_i2c_remove,
+        .id_table = wm8400_i2c_id,
+};
+#endif
+
+static int __init wm8400_module_init(void)
+{
+        int ret = -ENODEV;
+
+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+        ret = i2c_add_driver(&wm8400_i2c_driver);
+        if (ret != 0)
+                pr_err("Failed to register I2C driver: %d\n", ret);
+#endif
+
+        return ret;
+}
+module_init(wm8400_module_init);
+
+static void __exit wm8400_module_exit(void)
+{
+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+        i2c_del_driver(&wm8400_i2c_driver);
+#endif
+}
+module_exit(wm8400_module_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index a726f3b01a6b..efd3aa08b88b 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -15,7 +15,7 @@ if MISC_DEVICES
 
 config ATMEL_PWM
         tristate "Atmel AT32/AT91 PWM support"
-        depends on AVR32 || ARCH_AT91
+        depends on AVR32 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9
         help
           This option enables device driver support for the PWM channels
           on certain Atmel prcoessors.  Pulse Width Modulation is used for
@@ -409,6 +409,7 @@ config EEEPC_LAPTOP
         depends on BACKLIGHT_CLASS_DEVICE
         depends on HWMON
         depends on EXPERIMENTAL
+        depends on RFKILL
         ---help---
           This driver supports the Fn-Fx keys on Eee PC laptops.
           It also adds the ability to switch camera/wlan on/off.
diff --git a/drivers/misc/hp-wmi.c b/drivers/misc/hp-wmi.c
index 6d407c2a4f91..5dabfb69ee53 100644
--- a/drivers/misc/hp-wmi.c
+++ b/drivers/misc/hp-wmi.c
@@ -309,7 +309,7 @@ static int hp_wmi_setkeycode(struct input_dev *dev, int scancode, int keycode)
         return -EINVAL;
 }
 
-void hp_wmi_notify(u32 value, void *context)
+static void hp_wmi_notify(u32 value, void *context)
 {
         struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
         static struct key_entry *key;
diff --git a/drivers/misc/phantom.c b/drivers/misc/phantom.c
index daf585689ce3..abdebe347383 100644
--- a/drivers/misc/phantom.c
+++ b/drivers/misc/phantom.c
@@ -399,9 +399,9 @@ static int __devinit phantom_probe(struct pci_dev *pdev,
                 goto err_irq;
         }
 
-        if (IS_ERR(device_create_drvdata(phantom_class, &pdev->dev,
-                                         MKDEV(phantom_major, minor),
-                                         NULL, "phantom%u", minor)))
+        if (IS_ERR(device_create(phantom_class, &pdev->dev,
+                                 MKDEV(phantom_major, minor), NULL,
+                                 "phantom%u", minor)))
                 dev_err(&pdev->dev, "can't create device\n");
 
         pci_set_drvdata(pdev, pht);
diff --git a/drivers/misc/sgi-gru/gru.h b/drivers/misc/sgi-gru/gru.h
index 40df7cb3f0a5..f93f03a9e6e9 100644
--- a/drivers/misc/sgi-gru/gru.h
+++ b/drivers/misc/sgi-gru/gru.h
@@ -30,9 +30,9 @@
 /*
  * Size used to map GRU GSeg
  */
-#if defined CONFIG_IA64
+#if defined(CONFIG_IA64)
 #define GRU_GSEG_PAGESIZE       (256 * 1024UL)
-#elif defined CONFIG_X86_64
+#elif defined(CONFIG_X86_64)
 #define GRU_GSEG_PAGESIZE       (256 * 1024UL)          /* ZZZ 2MB ??? */
 #else
 #error "Unsupported architecture"
diff --git a/drivers/misc/sgi-gru/gru_instructions.h b/drivers/misc/sgi-gru/gru_instructions.h
index 0dc36225c7c6..48762e7b98be 100644
--- a/drivers/misc/sgi-gru/gru_instructions.h
+++ b/drivers/misc/sgi-gru/gru_instructions.h
@@ -26,7 +26,7 @@
  * Architecture dependent functions
  */
 
-#if defined CONFIG_IA64
+#if defined(CONFIG_IA64)
 #include <linux/compiler.h>
 #include <asm/intrinsics.h>
 #define __flush_cache(p)                ia64_fc(p)
@@ -36,7 +36,7 @@
                         barrier();                                      \
                         *((volatile int *)(p)) = v; /* force st.rel */  \
                 } while (0)
-#elif defined CONFIG_X86_64
+#elif defined(CONFIG_X86_64)
 #define __flush_cache(p)                clflush(p)
 #define gru_ordered_store_int(p,v)                                      \
                 do {                                                    \
@@ -299,6 +299,7 @@ static inline void gru_flush_cache(void *p)
 static inline void gru_start_instruction(struct gru_instruction *ins, int op32)
 {
         gru_ordered_store_int(ins, op32);
+        gru_flush_cache(ins);
 }
 
 
@@ -604,8 +605,9 @@ static inline int gru_get_cb_substatus(void *cb)
 static inline int gru_check_status(void *cb)
 {
         struct gru_control_block_status *cbs = (void *)cb;
-        int ret = cbs->istatus;
+        int ret;
 
+        ret = cbs->istatus;
         if (ret == CBS_CALL_OS)
                 ret = gru_check_status_proc(cb);
         return ret;
@@ -617,7 +619,7 @@ static inline int gru_check_status(void *cb)
 static inline int gru_wait(void *cb)
 {
         struct gru_control_block_status *cbs = (void *)cb;
-        int ret = cbs->istatus;;
+        int ret = cbs->istatus;
 
         if (ret != CBS_IDLE)
                 ret = gru_wait_proc(cb);
diff --git a/drivers/misc/sgi-gru/grufault.c b/drivers/misc/sgi-gru/grufault.c
index 3d33015bbf31..8c389d606c30 100644
--- a/drivers/misc/sgi-gru/grufault.c
+++ b/drivers/misc/sgi-gru/grufault.c
@@ -214,12 +214,14 @@ static int non_atomic_pte_lookup(struct vm_area_struct *vma,
 }
 
 /*
- *
  * atomic_pte_lookup
  *
  * Convert a user virtual address to a physical address
  * Only supports Intel large pages (2MB only) on x86_64.
  *      ZZZ - hugepage support is incomplete
+ *
+ * NOTE: mmap_sem is already held on entry to this function. This
+ * guarantees existence of the page tables.
  */
 static int atomic_pte_lookup(struct vm_area_struct *vma, unsigned long vaddr,
         int write, unsigned long *paddr, int *pageshift)
@@ -229,9 +231,6 @@ static int atomic_pte_lookup(struct vm_area_struct *vma, unsigned long vaddr,
         pud_t *pudp;
         pte_t pte;
 
-        WARN_ON(irqs_disabled());               /* ZZZ debug */
-
-        local_irq_disable();
         pgdp = pgd_offset(vma->vm_mm, vaddr);
         if (unlikely(pgd_none(*pgdp)))
                 goto err;
@@ -250,8 +249,6 @@ static int atomic_pte_lookup(struct vm_area_struct *vma, unsigned long vaddr,
 #endif
                 pte = *pte_offset_kernel(pmdp, vaddr);
 
-        local_irq_enable();
-
         if (unlikely(!pte_present(pte) ||
                      (write && (!pte_write(pte) || !pte_dirty(pte)))))
                 return 1;
@@ -324,6 +321,7 @@ static int gru_try_dropin(struct gru_thread_state *gts,
          * Atomic lookup is faster & usually works even if called in non-atomic
          * context.
          */
+        rmb();  /* Must/check ms_range_active before loading PTEs */
         ret = atomic_pte_lookup(vma, vaddr, write, &paddr, &pageshift);
         if (ret) {
                 if (!cb)
@@ -543,6 +541,7 @@ int gru_get_exception_detail(unsigned long arg)
                 ucbnum = get_cb_number((void *)excdet.cb);
                 cbrnum = thread_cbr_number(gts, ucbnum);
                 cbe = get_cbe_by_index(gts->ts_gru, cbrnum);
+                prefetchw(cbe);         /* Harmless on hardware, required for emulator */
                 excdet.opc = cbe->opccpy;
                 excdet.exopc = cbe->exopccpy;
                 excdet.ecause = cbe->ecause;
diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c
index d61cee796efd..5c027b6b4e5a 100644
--- a/drivers/misc/sgi-gru/grufile.c
+++ b/drivers/misc/sgi-gru/grufile.c
@@ -113,7 +113,7 @@ static int gru_file_mmap(struct file *file, struct vm_area_struct *vma)
                 return -EPERM;
 
         if (vma->vm_start & (GRU_GSEG_PAGESIZE - 1) ||
-                        vma->vm_end & (GRU_GSEG_PAGESIZE - 1))
+                                vma->vm_end & (GRU_GSEG_PAGESIZE - 1))
                 return -EINVAL;
 
         vma->vm_flags |=
@@ -398,6 +398,12 @@ static int __init gru_init(void)
         irq = get_base_irq();
         for (chip = 0; chip < GRU_CHIPLETS_PER_BLADE; chip++) {
                 ret = request_irq(irq + chip, gru_intr, 0, id, NULL);
+                /* TODO: fix irq handling on x86. For now ignore failures because
+                 * interrupts are not required & not yet fully supported */
+                if (ret) {
+                        printk("!!!WARNING: GRU ignoring request failure!!!\n");
+                        ret = 0;
+                }
                 if (ret) {
                         printk(KERN_ERR "%s: request_irq failed\n",
                                GRU_DRIVER_ID_STR);
diff --git a/drivers/misc/sgi-gru/gruhandles.h b/drivers/misc/sgi-gru/gruhandles.h
index d16031d62673..b63018d60fe1 100644
--- a/drivers/misc/sgi-gru/gruhandles.h
+++ b/drivers/misc/sgi-gru/gruhandles.h
@@ -91,12 +91,7 @@
 #define GSEGPOFF(h)             ((h) & (GRU_SIZE - 1))
 
 /* Convert an arbitrary handle address to the beginning of the GRU segment */
-#ifndef __PLUGIN__
 #define GRUBASE(h)              ((void *)((unsigned long)(h) & ~(GRU_SIZE - 1)))
-#else
-extern void *gmu_grubase(void *h);
-#define GRUBASE(h)              gmu_grubase(h)
-#endif
 
 /* General addressing macros. */
 static inline void *get_gseg_base_address(void *base, int ctxnum)
diff --git a/drivers/misc/sgi-gru/grukservices.c b/drivers/misc/sgi-gru/grukservices.c
index dfd49af0fe18..880c55dfb662 100644
--- a/drivers/misc/sgi-gru/grukservices.c
+++ b/drivers/misc/sgi-gru/grukservices.c
@@ -122,6 +122,7 @@ int gru_get_cb_exception_detail(void *cb,
         struct gru_control_block_extended *cbe;
 
         cbe = get_cbe(GRUBASE(cb), get_cb_number(cb));
+        prefetchw(cbe);         /* Harmless on hardware, required for emulator */
         excdet->opc = cbe->opccpy;
         excdet->exopc = cbe->exopccpy;
         excdet->ecause = cbe->ecause;
@@ -466,7 +467,7 @@ int gru_send_message_gpa(unsigned long mq, void *mesg, unsigned int bytes)
         STAT(mesq_send);
         BUG_ON(bytes < sizeof(int) || bytes > 2 * GRU_CACHE_LINE_BYTES);
 
-        clines = (bytes + GRU_CACHE_LINE_BYTES - 1) / GRU_CACHE_LINE_BYTES;
+        clines = DIV_ROUND_UP(bytes, GRU_CACHE_LINE_BYTES);
         if (gru_get_cpu_resources(bytes, &cb, &dsr))
                 return MQE_BUG_NO_RESOURCES;
         memcpy(dsr, mesg, bytes);
diff --git a/drivers/misc/sgi-gru/grumain.c b/drivers/misc/sgi-gru/grumain.c
index 0eeb8dddd2f5..e11e1ac50900 100644
--- a/drivers/misc/sgi-gru/grumain.c
+++ b/drivers/misc/sgi-gru/grumain.c
@@ -432,29 +432,35 @@ static inline long gru_copy_handle(void *d, void *s)
         return GRU_HANDLE_BYTES;
 }
 
-/* rewrite in assembly & use lots of prefetch */
-static void gru_load_context_data(void *save, void *grubase, int ctxnum,
-                                  unsigned long cbrmap, unsigned long dsrmap)
+static void gru_prefetch_context(void *gseg, void *cb, void *cbe, unsigned long cbrmap,
+                                unsigned long length)
 {
-        void *gseg, *cb, *cbe;
-        unsigned long length;
         int i, scr;
 
-        gseg = grubase + ctxnum * GRU_GSEG_STRIDE;
-        length = hweight64(dsrmap) * GRU_DSR_AU_BYTES;
         prefetch_data(gseg + GRU_DS_BASE, length / GRU_CACHE_LINE_BYTES,
                       GRU_CACHE_LINE_BYTES);
 
-        cb = gseg + GRU_CB_BASE;
-        cbe = grubase + GRU_CBE_BASE;
         for_each_cbr_in_allocation_map(i, &cbrmap, scr) {
                 prefetch_data(cb, 1, GRU_CACHE_LINE_BYTES);
                 prefetch_data(cbe + i * GRU_HANDLE_STRIDE, 1,
                               GRU_CACHE_LINE_BYTES);
                 cb += GRU_HANDLE_STRIDE;
         }
+}
+
+static void gru_load_context_data(void *save, void *grubase, int ctxnum,
+                                  unsigned long cbrmap, unsigned long dsrmap)
+{
+        void *gseg, *cb, *cbe;
+        unsigned long length;
+        int i, scr;
 
+        gseg = grubase + ctxnum * GRU_GSEG_STRIDE;
         cb = gseg + GRU_CB_BASE;
+        cbe = grubase + GRU_CBE_BASE;
+        length = hweight64(dsrmap) * GRU_DSR_AU_BYTES;
+        gru_prefetch_context(gseg, cb, cbe, cbrmap, length);
+
         for_each_cbr_in_allocation_map(i, &cbrmap, scr) {
                 save += gru_copy_handle(cb, save);
                 save += gru_copy_handle(cbe + i * GRU_HANDLE_STRIDE, save);
@@ -472,15 +478,16 @@ static void gru_unload_context_data(void *save, void *grubase, int ctxnum,
         int i, scr;
 
         gseg = grubase + ctxnum * GRU_GSEG_STRIDE;
-
         cb = gseg + GRU_CB_BASE;
         cbe = grubase + GRU_CBE_BASE;
+        length = hweight64(dsrmap) * GRU_DSR_AU_BYTES;
+        gru_prefetch_context(gseg, cb, cbe, cbrmap, length);
+
         for_each_cbr_in_allocation_map(i, &cbrmap, scr) {
                 save += gru_copy_handle(save, cb);
                 save += gru_copy_handle(save, cbe + i * GRU_HANDLE_STRIDE);
                 cb += GRU_HANDLE_STRIDE;
         }
-        length = hweight64(dsrmap) * GRU_DSR_AU_BYTES;
         memcpy(save, gseg + GRU_DS_BASE, length);
 }
 
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index c16028872bbb..1b9fc3c6b875 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -172,7 +172,7 @@ struct mmc_omap_host {
         struct omap_mmc_platform_data *pdata;
 };
 
-void mmc_omap_fclk_offdelay(struct mmc_omap_slot *slot)
+static void mmc_omap_fclk_offdelay(struct mmc_omap_slot *slot)
 {
         unsigned long tick_ns;
 
@@ -182,7 +182,7 @@ void mmc_omap_fclk_offdelay(struct mmc_omap_slot *slot)
         }
 }
 
-void mmc_omap_fclk_enable(struct mmc_omap_host *host, unsigned int enable)
+static void mmc_omap_fclk_enable(struct mmc_omap_host *host, unsigned int enable)
 {
         unsigned long flags;
 
@@ -1455,7 +1455,9 @@ static int __init mmc_omap_probe(struct platform_device *pdev)
 
         host->irq = irq;
         host->phys_base = host->mem_res->start;
-        host->virt_base = (void __iomem *) IO_ADDRESS(host->phys_base);
+        host->virt_base = ioremap(res->start, res->end - res->start + 1);
+        if (!host->virt_base)
+                goto err_ioremap;
 
         if (cpu_is_omap24xx()) {
                 host->iclk = clk_get(&pdev->dev, "mmc_ick");
@@ -1510,6 +1512,8 @@ err_free_iclk:
                 clk_put(host->iclk);
         }
 err_free_mmc_host:
+        iounmap(host->virt_base);
+err_ioremap:
         kfree(host);
 err_free_mem_region:
         release_mem_region(res->start, res->end - res->start + 1);
@@ -1536,6 +1540,7 @@ static int mmc_omap_remove(struct platform_device *pdev)
         if (host->fclk && !IS_ERR(host->fclk))
                 clk_put(host->fclk);
 
+        iounmap(host->virt_base);
         release_mem_region(pdev->resource[0].start,
                            pdev->resource[0].end - pdev->resource[0].start + 1);
 
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index 0a84f10d719c..9bd7026b0021 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -327,7 +327,7 @@ static const struct pci_device_id pci_ids[] __devinitdata = {
 
         {
                 .vendor         = PCI_VENDOR_ID_MARVELL,
-                .device         = PCI_DEVICE_ID_MARVELL_CAFE_SD,
+                .device         = PCI_DEVICE_ID_MARVELL_88ALP01_SD,
                 .subvendor      = PCI_ANY_ID,
                 .subdevice      = PCI_ANY_ID,
                 .driver_data    = (kernel_ulong_t)&sdhci_cafe,
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index 90924fb00481..d600c2deff73 100644
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -118,7 +118,8 @@ static caddr_t remap_window(struct map_info *map, unsigned long to)
                 DEBUG(2, "Remapping window from 0x%8.8x to 0x%8.8x",
                       dev->offset, mrq.CardOffset);
                 mrq.Page = 0;
-                if( (ret = pcmcia_map_mem_page(win, &mrq)) != CS_SUCCESS) {
+                ret = pcmcia_map_mem_page(win, &mrq);
+                if (ret != 0) {
                         cs_error(dev->p_dev, MapMemPage, ret);
                         return NULL;
                 }
@@ -326,9 +327,8 @@ static void pcmciamtd_set_vpp(struct map_info *map, int on)
 
         DEBUG(2, "dev = %p on = %d vpp = %d\n", dev, on, dev->vpp);
         ret = pcmcia_modify_configuration(link, &mod);
-        if(ret != CS_SUCCESS) {
+        if (ret != 0)
                 cs_error(link, ModifyConfiguration, ret);
-        }
 }
 
 
@@ -368,14 +368,14 @@ static void card_settings(struct pcmciamtd_dev *dev, struct pcmcia_device *link,
         tuple.DesiredTuple = RETURN_FIRST_TUPLE;
 
         rc = pcmcia_get_first_tuple(link, &tuple);
-        while(rc == CS_SUCCESS) {
+        while (rc == 0) {
                 rc = pcmcia_get_tuple_data(link, &tuple);
-                if(rc != CS_SUCCESS) {
+                if (rc != 0) {
                         cs_error(link, GetTupleData, rc);
                         break;
                 }
-                rc = pcmcia_parse_tuple(link, &tuple, &parse);
-                if(rc != CS_SUCCESS) {
+                rc = pcmcia_parse_tuple(&tuple, &parse);
+                if (rc != 0) {
                         cs_error(link, ParseTuple, rc);
                         break;
                 }
@@ -493,18 +493,11 @@ static int pcmciamtd_config(struct pcmcia_device *link)
         int last_ret = 0, last_fn = 0;
         int ret;
         int i;
-        config_info_t t;
         static char *probes[] = { "jedec_probe", "cfi_probe" };
         int new_name = 0;
 
         DEBUG(3, "link=0x%p", link);
 
-        DEBUG(2, "Validating CIS");
-        ret = pcmcia_validate_cis(link, NULL);
-        if(ret != CS_SUCCESS) {
-                cs_error(link, GetTupleData, ret);
-        }
-
         card_settings(dev, link, &new_name);
 
         dev->pcmcia_map.phys = NO_XIP;
@@ -571,10 +564,7 @@ static int pcmciamtd_config(struct pcmcia_device *link)
         dev->pcmcia_map.map_priv_1 = (unsigned long)dev;
         dev->pcmcia_map.map_priv_2 = (unsigned long)link->win;
 
-        DEBUG(2, "Getting configuration");
-        CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(link, &t));
-        DEBUG(2, "Vcc = %d Vpp1 = %d Vpp2 = %d", t.Vcc, t.Vpp1, t.Vpp2);
-        dev->vpp = (vpp) ? vpp : t.Vpp1;
+        dev->vpp = (vpp) ? vpp : link->socket.socket.Vpp;
         link->conf.Attributes = 0;
         if(setvpp == 2) {
                 link->conf.Vpp = dev->vpp;
@@ -583,16 +573,10 @@ static int pcmciamtd_config(struct pcmcia_device *link)
         }
 
         link->conf.IntType = INT_MEMORY;
-        link->conf.ConfigBase = t.ConfigBase;
-        link->conf.Status = t.Status;
-        link->conf.Pin = t.Pin;
-        link->conf.Copy = t.Copy;
-        link->conf.ExtStatus = t.ExtStatus;
         link->conf.ConfigIndex = 0;
-        link->conf.Present = t.Present;
         DEBUG(2, "Setting Configuration");
         ret = pcmcia_request_configuration(link, &link->conf);
-        if(ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, RequestConfiguration, ret);
                 if (dev->win_base) {
                         iounmap(dev->win_base);
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index e00d424e6575..1c74762dec89 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -26,13 +26,11 @@ static void mtd_notify_add(struct mtd_info* mtd)
         if (!mtd)
                 return;
 
-        device_create_drvdata(mtd_class, NULL,
-                              MKDEV(MTD_CHAR_MAJOR, mtd->index*2),
-                              NULL, "mtd%d", mtd->index);
+        device_create(mtd_class, NULL, MKDEV(MTD_CHAR_MAJOR, mtd->index*2),
+                      NULL, "mtd%d", mtd->index);
 
-        device_create_drvdata(mtd_class, NULL,
-                              MKDEV(MTD_CHAR_MAJOR, mtd->index*2+1),
-                              NULL, "mtd%dro", mtd->index);
+        device_create(mtd_class, NULL, MKDEV(MTD_CHAR_MAJOR, mtd->index*2+1),
+                      NULL, "mtd%dro", mtd->index);
 }
 
 static void mtd_notify_remove(struct mtd_info* mtd)
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index edb90b58a9b1..9a06dc93ee0d 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -564,10 +564,8 @@ int parse_mtd_partitions(struct mtd_info *master, const char **types,
 
         for ( ; ret <= 0 && *types; types++) {
                 parser = get_partition_parser(*types);
-#ifdef CONFIG_KMOD
                 if (!parser && !request_module("%s", *types))
                                 parser = get_partition_parser(*types);
-#endif
                 if (!parser) {
                         printk(KERN_NOTICE "%s partition parsing not available\n",
                                *types);
diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c
index 26d42987971f..782994ead0e8 100644
--- a/drivers/mtd/nand/ams-delta.c
+++ b/drivers/mtd/nand/ams-delta.c
@@ -145,7 +145,7 @@ static void ams_delta_hwcontrol(struct mtd_info *mtd, int cmd,
 
 static int ams_delta_nand_ready(struct mtd_info *mtd)
 {
-        return omap_get_gpio_datain(AMS_DELTA_GPIO_PIN_NAND_RB);
+        return gpio_get_value(AMS_DELTA_GPIO_PIN_NAND_RB);
 }
 
 /*
@@ -185,7 +185,7 @@ static int __init ams_delta_init(void)
         this->read_buf = ams_delta_read_buf;
         this->verify_buf = ams_delta_verify_buf;
         this->cmd_ctrl = ams_delta_hwcontrol;
-        if (!omap_request_gpio(AMS_DELTA_GPIO_PIN_NAND_RB)) {
+        if (gpio_request(AMS_DELTA_GPIO_PIN_NAND_RB, "nand_rdy") == 0) {
                 this->dev_ready = ams_delta_nand_ready;
         } else {
                 this->dev_ready = NULL;
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c
index 95345d051579..b8064bf3aee4 100644
--- a/drivers/mtd/nand/cafe_nand.c
+++ b/drivers/mtd/nand/cafe_nand.c
@@ -1,6 +1,9 @@
 /*
  * Driver for One Laptop Per Child ‘CAFÉ’ controller, aka Marvell 88ALP01
  *
+ * The data sheet for this device can be found at:
+ *    http://www.marvell.com/products/pcconn/88ALP01.jsp
+ *
  * Copyright © 2006 Red Hat, Inc.
  * Copyright © 2006 David Woodhouse <dwmw2@infradead.org>
  */
@@ -842,7 +845,8 @@ static void __devexit cafe_nand_remove(struct pci_dev *pdev)
 }
 
 static struct pci_device_id cafe_nand_tbl[] = {
-        { 0x11ab, 0x4100, PCI_ANY_ID, PCI_ANY_ID },
+        { PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_88ALP01_NAND,
+          PCI_ANY_ID, PCI_ANY_ID },
         { }
 };
 
diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c
index 5ba4bab6d43e..7d15e7c6bcad 100644
--- a/drivers/net/3c501.c
+++ b/drivers/net/3c501.c
@@ -17,7 +17,7 @@
         Annapolis MD 21403
 
     Fixed (again!) the missing interrupt locking on TX/RX shifting.
-        Alan Cox <Alan.Cox@linux.org>
+        Alan Cox <alan@lxorguk.ukuu.org.uk>
 
     Removed calls to init_etherdev since they are no longer needed, and
     cleaned up modularization just a bit. The driver still allows only
@@ -29,16 +29,16 @@
     the board. Now getting 150K/second FTP with a 3c501 card. Still playing
     with a TX-TX optimisation to see if we can touch 180-200K/second as seems
     theoretically maximum.
-                19950402 Alan Cox <Alan.Cox@linux.org>
+                19950402 Alan Cox <alan@lxorguk.ukuu.org.uk>
 
     Cleaned up for 2.3.x because we broke SMP now.
-                20000208 Alan Cox <alan@redhat.com>
+                20000208 Alan Cox <alan@lxorguk.ukuu.org.uk>
 
     Check up pass for 2.5. Nothing significant changed
-                20021009 Alan Cox <alan@redhat.com>
+                20021009 Alan Cox <alan@lxorguk.ukuu.org.uk>
 
     Fixed zero fill corner case
-                20030104 Alan Cox <alan@redhat.com>
+                20030104 Alan Cox <alan@lxorguk.ukuu.org.uk>
 
 
    For the avoidance of doubt the "preferred form" of this code is one which
@@ -104,7 +104,7 @@
 
 
 static const char version[] =
-        DRV_NAME ".c: " DRV_VERSION " Alan Cox (alan@redhat.com).\n";
+        DRV_NAME ".c: " DRV_VERSION " Alan Cox (alan@lxorguk.ukuu.org.uk).\n";
 
 /*
  *      Braindamage remaining:
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c
index b9d097c9f6bb..3a7bc524af33 100644
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -40,7 +40,7 @@
                 v1.14 10/15/97 Avoided waiting..discard message for fast machines -djb
                 v1.15 1/31/98 Faster recovery for Tx errors. -djb
                 v1.16 2/3/98 Different ID port handling to avoid sound cards. -djb
-                v1.18 12Mar2001 Andrew Morton <andrewm@uow.edu.au>
+                v1.18 12Mar2001 Andrew Morton
                         - Avoid bogus detect of 3c590's (Andrzej Krzysztofowicz)
                         - Reviewed against 1.18 from scyld.com
                 v1.18a 17Nov2001 Jeff Garzik <jgarzik@pobox.com>
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index e4e3241628d6..a0f8b6e2d0af 100644
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -18,7 +18,7 @@
 
         2001/11/17 - Added ethtool support (jgarzik)
 
-        2002/10/28 - Locking updates for 2.5 (alan@redhat.com)
+        2002/10/28 - Locking updates for 2.5 (alan@lxorguk.ukuu.org.uk)
 
 */
 
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index e9d529442b06..ad301ace6085 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2400,7 +2400,7 @@ config EHEA
           will be called ehea.
 
 config ENIC
-        tristate "E, the Cisco 10G Ethernet NIC"
+        tristate "Cisco 10G Ethernet NIC support"
         depends on PCI && INET
         select INET_LRO
         help
@@ -2410,7 +2410,6 @@ config IXGBE
         tristate "Intel(R) 10GbE PCI Express adapters support"
         depends on PCI && INET
         select INET_LRO
-        select INTEL_IOATDMA
         ---help---
           This driver supports Intel(R) 10GbE PCI Express family of
           adapters.  For more information on how to identify your adapter, go
@@ -2426,6 +2425,11 @@ config IXGBE
           To compile this driver as a module, choose M here. The module
           will be called ixgbe.
 
+config IXGBE_DCA
+        bool
+        default y
+        depends on IXGBE && DCA && !(IXGBE=y && DCA=m)
+
 config IXGB
         tristate "Intel(R) PRO/10GbE support"
         depends on PCI
@@ -2462,7 +2466,6 @@ config MYRI10GE
         select FW_LOADER
         select CRC32
         select INET_LRO
-        select INTEL_IOATDMA
         ---help---
           This driver supports Myricom Myri-10G Dual Protocol interface in
           Ethernet mode. If the eeprom on your board is not recent enough,
@@ -2474,6 +2477,11 @@ config MYRI10GE
           To compile this driver as a module, choose M here. The module
           will be called myri10ge.
 
+config MYRI10GE_DCA
+        bool
+        default y
+        depends on MYRI10GE && DCA && !(MYRI10GE=y && DCA=m)
+
 config NETXEN_NIC
         tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC"
         depends on PCI
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c
index a0b4c8516073..735fc9476403 100644
--- a/drivers/net/appletalk/cops.c
+++ b/drivers/net/appletalk/cops.c
@@ -4,7 +4,7 @@
  *      - Jay Schulist <jschlst@samba.org>
  *
  *      With more than a little help from;
- *      - Alan Cox <Alan.Cox@linux.org> 
+ *      - Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  *      Derived from:
  *      - skeleton.c: A network driver outline for linux.
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index 7b92201a7b50..019b13c08ae6 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -94,8 +94,8 @@ static irqreturn_t au1000_interrupt(int, void *);
 static void au1000_tx_timeout(struct net_device *);
 static void set_rx_mode(struct net_device *);
 static int au1000_ioctl(struct net_device *, struct ifreq *, int);
-static int mdio_read(struct net_device *, int, int);
-static void mdio_write(struct net_device *, int, int, u16);
+static int au1000_mdio_read(struct net_device *, int, int);
+static void au1000_mdio_write(struct net_device *, int, int, u16);
 static void au1000_adjust_link(struct net_device *);
 static void enable_mac(struct net_device *, int);
 
@@ -191,7 +191,7 @@ struct au1000_private *au_macs[NUM_ETH_INTERFACES];
 /*
  * MII operations
  */
-static int mdio_read(struct net_device *dev, int phy_addr, int reg)
+static int au1000_mdio_read(struct net_device *dev, int phy_addr, int reg)
 {
         struct au1000_private *aup = (struct au1000_private *) dev->priv;
         volatile u32 *const mii_control_reg = &aup->mac->mii_control;
@@ -225,7 +225,8 @@ static int mdio_read(struct net_device *dev, int phy_addr, int reg)
         return (int)*mii_data_reg;
 }
 
-static void mdio_write(struct net_device *dev, int phy_addr, int reg, u16 value)
+static void au1000_mdio_write(struct net_device *dev, int phy_addr,
+                              int reg, u16 value)
 {
         struct au1000_private *aup = (struct au1000_private *) dev->priv;
         volatile u32 *const mii_control_reg = &aup->mac->mii_control;
@@ -249,7 +250,7 @@ static void mdio_write(struct net_device *dev, int phy_addr, int reg, u16 value)
         *mii_control_reg = mii_control;
 }
 
-static int mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum)
+static int au1000_mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum)
 {
         /* WARNING: bus->phy_map[phy_addr].attached_dev == dev does
          * _NOT_ hold (e.g. when PHY is accessed through other MAC's MII bus) */
@@ -257,21 +258,21 @@ static int mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum)
 
         enable_mac(dev, 0); /* make sure the MAC associated with this
                              * mii_bus is enabled */
-        return mdio_read(dev, phy_addr, regnum);
+        return au1000_mdio_read(dev, phy_addr, regnum);
 }
 
-static int mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum,
-                         u16 value)
+static int au1000_mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum,
+                                u16 value)
 {
         struct net_device *const dev = bus->priv;
 
         enable_mac(dev, 0); /* make sure the MAC associated with this
                              * mii_bus is enabled */
-        mdio_write(dev, phy_addr, regnum, value);
+        au1000_mdio_write(dev, phy_addr, regnum, value);
         return 0;
 }
 
-static int mdiobus_reset(struct mii_bus *bus)
+static int au1000_mdiobus_reset(struct mii_bus *bus)
 {
         struct net_device *const dev = bus->priv;
 
@@ -703,9 +704,9 @@ static struct net_device * au1000_probe(int port_num)
                 goto err_out;
 
         aup->mii_bus->priv = dev;
-        aup->mii_bus->read = mdiobus_read;
-        aup->mii_bus->write = mdiobus_write;
-        aup->mii_bus->reset = mdiobus_reset;
+        aup->mii_bus->read = au1000_mdiobus_read;
+        aup->mii_bus->write = au1000_mdiobus_write;
+        aup->mii_bus->reset = au1000_mdiobus_reset;
         aup->mii_bus->name = "au1000_eth_mii";
         snprintf(aup->mii_bus->id, MII_BUS_ID_SIZE, "%x", aup->mac_id);
         aup->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index a0d41c5d97d8..b458d607a9c6 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -253,7 +253,7 @@ init_error:
  * MII operations
  */
 /* Wait until the previous MDC/MDIO transaction has completed */
-static void mdio_poll(void)
+static void bfin_mdio_poll(void)
 {
         int timeout_cnt = MAX_TIMEOUT_CNT;
 
@@ -269,25 +269,25 @@ static void mdio_poll(void)
 }
 
 /* Read an off-chip register in a PHY through the MDC/MDIO port */
-static int mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum)
+static int bfin_mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum)
 {
-        mdio_poll();
+        bfin_mdio_poll();
 
         /* read mode */
         bfin_write_EMAC_STAADD(SET_PHYAD((u16) phy_addr) |
                                 SET_REGAD((u16) regnum) |
                                 STABUSY);
 
-        mdio_poll();
+        bfin_mdio_poll();
 
         return (int) bfin_read_EMAC_STADAT();
 }
 
 /* Write an off-chip register in a PHY through the MDC/MDIO port */
-static int mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum,
-                         u16 value)
+static int bfin_mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum,
+                              u16 value)
 {
-        mdio_poll();
+        bfin_mdio_poll();
 
         bfin_write_EMAC_STADAT((u32) value);
 
@@ -297,12 +297,12 @@ static int mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum,
                                 STAOP |
                                 STABUSY);
 
-        mdio_poll();
+        bfin_mdio_poll();
 
         return 0;
 }
 
-static int mdiobus_reset(struct mii_bus *bus)
+static int bfin_mdiobus_reset(struct mii_bus *bus)
 {
         return 0;
 }
@@ -818,7 +818,7 @@ static void bfin_mac_enable(void)
         bfin_write_DMA1_CONFIG(rx_list_head->desc_a.config);
 
         /* Wait MII done */
-        mdio_poll();
+        bfin_mdio_poll();
 
         /* We enable only RX here */
         /* ASTP   : Enable Automatic Pad Stripping
@@ -1063,9 +1063,9 @@ static int __devinit bfin_mac_probe(struct platform_device *pdev)
                 goto out_err_mdiobus_alloc;
 
         lp->mii_bus->priv = ndev;
-        lp->mii_bus->read = mdiobus_read;
-        lp->mii_bus->write = mdiobus_write;
-        lp->mii_bus->reset = mdiobus_reset;
+        lp->mii_bus->read = bfin_mdiobus_read;
+        lp->mii_bus->write = bfin_mdiobus_write;
+        lp->mii_bus->reset = bfin_mdiobus_reset;
         lp->mii_bus->name = "bfin_mac_mdio";
         snprintf(lp->mii_bus->id, MII_BUS_ID_SIZE, "0");
         lp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index a28de8182802..7107620f615d 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -36,8 +36,7 @@
 
   Alan Cox          : Removed 1.2 support, added 2.1 extra counters.
 
-  Andrew Morton     : andrewm@uow.edu.au
-                    : Kernel 2.3.48
+  Andrew Morton     : Kernel 2.3.48
                     : Handle kmalloc() failures
                     : Other resource allocation fixes
                     : Add SMP locks
@@ -49,7 +48,7 @@
                     : Fixed an out-of-mem bug in dma_rx()
                     : Updated Documentation/networking/cs89x0.txt
 
-  Andrew Morton     : andrewm@uow.edu.au / Kernel 2.3.99-pre1
+  Andrew Morton     : Kernel 2.3.99-pre1
                     : Use skb_reserve to longword align IP header (two places)
                     : Remove a delay loop from dma_rx()
                     : Replace '100' with HZ
@@ -57,11 +56,11 @@
                     : Added 'cs89x0_dma=N' kernel boot option
                     : Correctly initialise lp->lock in non-module compile
 
-  Andrew Morton     : andrewm@uow.edu.au / Kernel 2.3.99-pre4-1
+  Andrew Morton     : Kernel 2.3.99-pre4-1
                     : MOD_INC/DEC race fix (see
                     : http://www.uwsg.indiana.edu/hypermail/linux/kernel/0003.3/1532.html)
 
-  Andrew Morton     : andrewm@uow.edu.au / Kernel 2.4.0-test7-pre2
+  Andrew Morton     : Kernel 2.4.0-test7-pre2
                     : Enhanced EEPROM support to cover more devices,
                     :   abstracted IRQ mapping to support CONFIG_ARCH_CLPS7500 arch
                     :   (Jason Gunthorpe <jgg@ualberta.ca>)
@@ -156,7 +155,7 @@
 #include "cs89x0.h"
 
 static char version[] __initdata =
-"cs89x0.c: v2.4.3-pre1 Russell Nelson <nelson@crynwr.com>, Andrew Morton <andrewm@uow.edu.au>\n";
+"cs89x0.c: v2.4.3-pre1 Russell Nelson <nelson@crynwr.com>, Andrew Morton\n";
 
 #define DRV_NAME "cs89x0"
 
@@ -1877,7 +1876,7 @@ MODULE_PARM_DESC(dmasize , "(ignored)");
 MODULE_PARM_DESC(use_dma , "(ignored)");
 #endif
 
-MODULE_AUTHOR("Mike Cruse, Russwll Nelson <nelson@crynwr.com>, Andrew Morton <andrewm@uow.edu.au>");
+MODULE_AUTHOR("Mike Cruse, Russwll Nelson <nelson@crynwr.com>, Andrew Morton");
 MODULE_LICENSE("GPL");
 
 
diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/cxgb3/adapter.h
index 455ef529cd62..bc8e2413abd2 100644
--- a/drivers/net/cxgb3/adapter.h
+++ b/drivers/net/cxgb3/adapter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/net/cxgb3/ael1002.c b/drivers/net/cxgb3/ael1002.c
index 744fac0b1617..5c3c05da4d96 100644
--- a/drivers/net/cxgb3/ael1002.c
+++ b/drivers/net/cxgb3/ael1002.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2005-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/net/cxgb3/common.h b/drivers/net/cxgb3/common.h
index 593fb643a615..e312d315a42d 100644
--- a/drivers/net/cxgb3/common.h
+++ b/drivers/net/cxgb3/common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2005-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/net/cxgb3/cxgb3_ctl_defs.h b/drivers/net/cxgb3/cxgb3_ctl_defs.h
index 6ad92405d9a0..1d8d46eb3c96 100644
--- a/drivers/net/cxgb3/cxgb3_ctl_defs.h
+++ b/drivers/net/cxgb3/cxgb3_ctl_defs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/net/cxgb3/cxgb3_defs.h b/drivers/net/cxgb3/cxgb3_defs.h
index 45e92164c260..47e53769af5b 100644
--- a/drivers/net/cxgb3/cxgb3_defs.h
+++ b/drivers/net/cxgb3/cxgb3_defs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2006-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/net/cxgb3/cxgb3_ioctl.h b/drivers/net/cxgb3/cxgb3_ioctl.h
index 3e8d5faec3a4..b19e4376ba76 100644
--- a/drivers/net/cxgb3/cxgb3_ioctl.h
+++ b/drivers/net/cxgb3/cxgb3_ioctl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index f31985df0bb9..1ace41a13ac3 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/cxgb3/cxgb3_offload.c
index 0f6fd63b2847..265aa8a15afa 100644
--- a/drivers/net/cxgb3/cxgb3_offload.c
+++ b/drivers/net/cxgb3/cxgb3_offload.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2006-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/net/cxgb3/cxgb3_offload.h b/drivers/net/cxgb3/cxgb3_offload.h
index 7a379138b5a6..d514e5019dfc 100644
--- a/drivers/net/cxgb3/cxgb3_offload.h
+++ b/drivers/net/cxgb3/cxgb3_offload.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2006-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/net/cxgb3/firmware_exports.h b/drivers/net/cxgb3/firmware_exports.h
index b75ddd8777fe..0d9b0e6dccff 100644
--- a/drivers/net/cxgb3/firmware_exports.h
+++ b/drivers/net/cxgb3/firmware_exports.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2004-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/net/cxgb3/l2t.c b/drivers/net/cxgb3/l2t.c
index b2c5314582aa..4407ac9bb555 100644
--- a/drivers/net/cxgb3/l2t.c
+++ b/drivers/net/cxgb3/l2t.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/net/cxgb3/l2t.h b/drivers/net/cxgb3/l2t.h
index 42ce65f76a87..fd3eb07e3f40 100644
--- a/drivers/net/cxgb3/l2t.h
+++ b/drivers/net/cxgb3/l2t.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/net/cxgb3/mc5.c b/drivers/net/cxgb3/mc5.c
index 4c4d6e877ea6..3b5517b8fbde 100644
--- a/drivers/net/cxgb3/mc5.c
+++ b/drivers/net/cxgb3/mc5.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index 87919419b707..c6480be0bc1f 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2005-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/net/cxgb3/t3_cpl.h b/drivers/net/cxgb3/t3_cpl.h
index 917970ed24a1..852c399a8b0a 100644
--- a/drivers/net/cxgb3/t3_cpl.h
+++ b/drivers/net/cxgb3/t3_cpl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2004-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index 4da5b09b9bc2..968f64be3743 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/net/cxgb3/t3cdev.h b/drivers/net/cxgb3/t3cdev.h
index 0a21cfbd2b21..be55e9ae74d1 100644
--- a/drivers/net/cxgb3/t3cdev.h
+++ b/drivers/net/cxgb3/t3cdev.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2007 Chelsio Communications.  All rights reserved.
+ * Copyright (C) 2006-2008 Chelsio Communications.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/net/cxgb3/version.h b/drivers/net/cxgb3/version.h
index 29db711303b9..bb8698a86754 100644
--- a/drivers/net/cxgb3/version.h
+++ b/drivers/net/cxgb3/version.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -35,7 +35,7 @@
 #define DRV_DESC "Chelsio T3 Network Driver"
 #define DRV_NAME "cxgb3"
 /* Driver version */
-#define DRV_VERSION "1.0-ko"
+#define DRV_VERSION "1.1.0-ko"
 
 /* Firmware version */
 #define FW_VERSION_MAJOR 7
diff --git a/drivers/net/cxgb3/vsc8211.c b/drivers/net/cxgb3/vsc8211.c
index 306c2dc4ab34..33f956bd6b59 100644
--- a/drivers/net/cxgb3/vsc8211.c
+++ b/drivers/net/cxgb3/vsc8211.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2005-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/net/cxgb3/xgmac.c b/drivers/net/cxgb3/xgmac.c
index ffdc0a1892bd..9d7786937aad 100644
--- a/drivers/net/cxgb3/xgmac.c
+++ b/drivers/net/cxgb3/xgmac.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2005-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index 795c594a4b7c..b751c1b96cfa 100644
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -8,7 +8,7 @@
  *
  * Many modifications, and currently maintained, by
  *  Philip Blundell <philb@gnu.org>
- * Added the Compaq LTE  Alan Cox <alan@redhat.com>
+ * Added the Compaq LTE  Alan Cox <alan@lxorguk.ukuu.org.uk>
  * Added MCA support Adam Fritzler
  *
  * Note - this driver is experimental still - it has problems on faster
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index f3a47a87dbbe..180e968dc54d 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -34,6 +34,7 @@
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 #include <linux/tcp.h>
+#include <net/ip6_checksum.h>
 
 #include "cq_enet_desc.h"
 #include "vnic_dev.h"
diff --git a/drivers/net/ibm_newemac/Kconfig b/drivers/net/ibm_newemac/Kconfig
index bcec7320895c..78a1628c9892 100644
--- a/drivers/net/ibm_newemac/Kconfig
+++ b/drivers/net/ibm_newemac/Kconfig
@@ -62,3 +62,15 @@ config IBM_NEW_EMAC_TAH
 config IBM_NEW_EMAC_EMAC4
         bool
         default n
+
+config IBM_NEW_EMAC_NO_FLOW_CTRL
+        bool
+        default n
+
+config IBM_NEW_EMAC_MAL_CLR_ICINTSTAT
+        bool
+        default n
+
+config IBM_NEW_EMAC_MAL_COMMON_ERR
+        bool
+        default n
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 58dfd32ccca8..efcf21c9f5c7 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -202,13 +202,15 @@ static inline int emac_phy_supports_gige(int phy_mode)
 {
         return  phy_mode == PHY_MODE_GMII ||
                 phy_mode == PHY_MODE_RGMII ||
+                phy_mode == PHY_MODE_SGMII ||
                 phy_mode == PHY_MODE_TBI ||
                 phy_mode == PHY_MODE_RTBI;
 }
 
 static inline int emac_phy_gpcs(int phy_mode)
 {
-        return  phy_mode == PHY_MODE_TBI ||
+        return  phy_mode == PHY_MODE_SGMII ||
+                phy_mode == PHY_MODE_TBI ||
                 phy_mode == PHY_MODE_RTBI;
 }
 
@@ -562,8 +564,9 @@ static int emac_configure(struct emac_instance *dev)
         switch (dev->phy.speed) {
         case SPEED_1000:
                 if (emac_phy_gpcs(dev->phy.mode)) {
-                        mr1 |= EMAC_MR1_MF_1000GPCS |
-                                EMAC_MR1_MF_IPPA(dev->phy.address);
+                        mr1 |= EMAC_MR1_MF_1000GPCS | EMAC_MR1_MF_IPPA(
+                                (dev->phy.gpcs_address != 0xffffffff) ?
+                                 dev->phy.gpcs_address : dev->phy.address);
 
                         /* Put some arbitrary OUI, Manuf & Rev IDs so we can
                          * identify this GPCS PHY later.
@@ -675,8 +678,12 @@ static int emac_configure(struct emac_instance *dev)
         out_be32(&p->iser,  r);
 
         /* We need to take GPCS PHY out of isolate mode after EMAC reset */
-        if (emac_phy_gpcs(dev->phy.mode))
-                emac_mii_reset_phy(&dev->phy);
+        if (emac_phy_gpcs(dev->phy.mode)) {
+                if (dev->phy.gpcs_address != 0xffffffff)
+                        emac_mii_reset_gpcs(&dev->phy);
+                else
+                        emac_mii_reset_phy(&dev->phy);
+        }
 
         return 0;
 }
@@ -881,7 +888,9 @@ static int emac_mdio_read(struct net_device *ndev, int id, int reg)
         struct emac_instance *dev = netdev_priv(ndev);
         int res;
 
-        res = __emac_mdio_read(dev->mdio_instance ? dev->mdio_instance : dev,
+        res = __emac_mdio_read((dev->mdio_instance &&
+                                dev->phy.gpcs_address != id) ?
+                                dev->mdio_instance : dev,
                                (u8) id, (u8) reg);
         return res;
 }
@@ -890,7 +899,9 @@ static void emac_mdio_write(struct net_device *ndev, int id, int reg, int val)
 {
         struct emac_instance *dev = netdev_priv(ndev);
 
-        __emac_mdio_write(dev->mdio_instance ? dev->mdio_instance : dev,
+        __emac_mdio_write((dev->mdio_instance &&
+                           dev->phy.gpcs_address != id) ?
+                           dev->mdio_instance : dev,
                           (u8) id, (u8) reg, (u16) val);
 }
 
@@ -2382,7 +2393,11 @@ static int __devinit emac_init_phy(struct emac_instance *dev)
                  * XXX I probably should move these settings to the dev tree
                  */
                 dev->phy.address = -1;
-                dev->phy.features = SUPPORTED_100baseT_Full | SUPPORTED_MII;
+                dev->phy.features = SUPPORTED_MII;
+                if (emac_phy_supports_gige(dev->phy_mode))
+                        dev->phy.features |= SUPPORTED_1000baseT_Full;
+                else
+                        dev->phy.features |= SUPPORTED_100baseT_Full;
                 dev->phy.pause = 1;
 
                 return 0;
@@ -2421,7 +2436,9 @@ static int __devinit emac_init_phy(struct emac_instance *dev)
                  * Note that the busy_phy_map is currently global
                  * while it should probably be per-ASIC...
                  */
-                dev->phy.address = dev->cell_index;
+                dev->phy.gpcs_address = dev->gpcs_address;
+                if (dev->phy.gpcs_address == 0xffffffff)
+                        dev->phy.address = dev->cell_index;
         }
 
         emac_configure(dev);
@@ -2531,6 +2548,8 @@ static int __devinit emac_init_config(struct emac_instance *dev)
                 dev->phy_address = 0xffffffff;
         if (emac_read_uint_prop(np, "phy-map", &dev->phy_map, 0))
                 dev->phy_map = 0xffffffff;
+        if (emac_read_uint_prop(np, "gpcs-address", &dev->gpcs_address, 0))
+                dev->gpcs_address = 0xffffffff;
         if (emac_read_uint_prop(np->parent, "clock-frequency", &dev->opb_bus_freq, 1))
                 return -ENXIO;
         if (emac_read_uint_prop(np, "tah-device", &dev->tah_ph, 0))
@@ -2585,6 +2604,8 @@ static int __devinit emac_init_config(struct emac_instance *dev)
                 if (of_device_is_compatible(np, "ibm,emac-440ep") ||
                     of_device_is_compatible(np, "ibm,emac-440gr"))
                         dev->features |= EMAC_FTR_440EP_PHY_CLK_FIX;
+                if (of_device_is_compatible(np, "ibm,emac-405ez"))
+                        dev->features |= EMAC_FTR_NO_FLOW_CONTROL_40x;
         }
 
         /* Fixup some feature bits based on the device tree */
@@ -2842,6 +2863,9 @@ static int __devinit emac_probe(struct of_device *ofdev,
                ndev->dev_addr[0], ndev->dev_addr[1], ndev->dev_addr[2],
                ndev->dev_addr[3], ndev->dev_addr[4], ndev->dev_addr[5]);
 
+        if (dev->phy_mode == PHY_MODE_SGMII)
+                printk(KERN_NOTICE "%s: in SGMII mode\n", ndev->name);
+
         if (dev->phy.address >= 0)
                 printk("%s: found %s PHY (0x%02x)\n", ndev->name,
                        dev->phy.def->name, dev->phy.address);
diff --git a/drivers/net/ibm_newemac/core.h b/drivers/net/ibm_newemac/core.h
index 5ca70e55b6c5..18d56c6c4238 100644
--- a/drivers/net/ibm_newemac/core.h
+++ b/drivers/net/ibm_newemac/core.h
@@ -190,6 +190,9 @@ struct emac_instance {
         struct delayed_work             link_work;
         int                             link_polling;
 
+        /* GPCS PHY infos */
+        u32                             gpcs_address;
+
         /* Shared MDIO if any */
         u32                             mdio_ph;
         struct of_device                *mdio_dev;
@@ -345,6 +348,9 @@ enum {
 #ifdef CONFIG_IBM_NEW_EMAC_RGMII
             EMAC_FTR_HAS_RGMII  |
 #endif
+#ifdef CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL
+            EMAC_FTR_NO_FLOW_CONTROL_40x |
+#endif
         EMAC_FTR_460EX_PHY_CLK_FIX |
         EMAC_FTR_440EP_PHY_CLK_FIX,
 };
diff --git a/drivers/net/ibm_newemac/mal.c b/drivers/net/ibm_newemac/mal.c
index 10c267b2b961..1839d3f154a3 100644
--- a/drivers/net/ibm_newemac/mal.c
+++ b/drivers/net/ibm_newemac/mal.c
@@ -28,6 +28,7 @@
 #include <linux/delay.h>
 
 #include "core.h"
+#include <asm/dcr-regs.h>
 
 static int mal_count;
 
@@ -279,6 +280,10 @@ static irqreturn_t mal_txeob(int irq, void *dev_instance)
         mal_schedule_poll(mal);
         set_mal_dcrn(mal, MAL_TXEOBISR, r);
 
+        if (mal_has_feature(mal, MAL_FTR_CLEAR_ICINTSTAT))
+                mtdcri(SDR0, DCRN_SDR_ICINTSTAT,
+                                (mfdcri(SDR0, DCRN_SDR_ICINTSTAT) | ICINTSTAT_ICTX));
+
         return IRQ_HANDLED;
 }
 
@@ -293,6 +298,10 @@ static irqreturn_t mal_rxeob(int irq, void *dev_instance)
         mal_schedule_poll(mal);
         set_mal_dcrn(mal, MAL_RXEOBISR, r);
 
+        if (mal_has_feature(mal, MAL_FTR_CLEAR_ICINTSTAT))
+                mtdcri(SDR0, DCRN_SDR_ICINTSTAT,
+                                (mfdcri(SDR0, DCRN_SDR_ICINTSTAT) | ICINTSTAT_ICRX));
+
         return IRQ_HANDLED;
 }
 
@@ -336,6 +345,25 @@ static irqreturn_t mal_rxde(int irq, void *dev_instance)
         return IRQ_HANDLED;
 }
 
+static irqreturn_t mal_int(int irq, void *dev_instance)
+{
+        struct mal_instance *mal = dev_instance;
+        u32 esr = get_mal_dcrn(mal, MAL_ESR);
+
+        if (esr & MAL_ESR_EVB) {
+                /* descriptor error */
+                if (esr & MAL_ESR_DE) {
+                        if (esr & MAL_ESR_CIDT)
+                                return mal_rxde(irq, dev_instance);
+                        else
+                                return mal_txde(irq, dev_instance);
+                } else { /* SERR */
+                        return mal_serr(irq, dev_instance);
+                }
+        }
+        return IRQ_HANDLED;
+}
+
 void mal_poll_disable(struct mal_instance *mal, struct mal_commac *commac)
 {
         /* Spinlock-type semantics: only one caller disable poll at a time */
@@ -493,6 +521,8 @@ static int __devinit mal_probe(struct of_device *ofdev,
         unsigned int dcr_base;
         const u32 *prop;
         u32 cfg;
+        unsigned long irqflags;
+        irq_handler_t hdlr_serr, hdlr_txde, hdlr_rxde;
 
         mal = kzalloc(sizeof(struct mal_instance), GFP_KERNEL);
         if (!mal) {
@@ -542,11 +572,21 @@ static int __devinit mal_probe(struct of_device *ofdev,
                 goto fail;
         }
 
+        if (of_device_is_compatible(ofdev->node, "ibm,mcmal-405ez"))
+                mal->features |= (MAL_FTR_CLEAR_ICINTSTAT |
+                                MAL_FTR_COMMON_ERR_INT);
+
         mal->txeob_irq = irq_of_parse_and_map(ofdev->node, 0);
         mal->rxeob_irq = irq_of_parse_and_map(ofdev->node, 1);
         mal->serr_irq = irq_of_parse_and_map(ofdev->node, 2);
-        mal->txde_irq = irq_of_parse_and_map(ofdev->node, 3);
-        mal->rxde_irq = irq_of_parse_and_map(ofdev->node, 4);
+
+        if (mal_has_feature(mal, MAL_FTR_COMMON_ERR_INT)) {
+                mal->txde_irq = mal->rxde_irq = mal->serr_irq;
+        } else {
+                mal->txde_irq = irq_of_parse_and_map(ofdev->node, 3);
+                mal->rxde_irq = irq_of_parse_and_map(ofdev->node, 4);
+        }
+
         if (mal->txeob_irq == NO_IRQ || mal->rxeob_irq == NO_IRQ ||
             mal->serr_irq == NO_IRQ || mal->txde_irq == NO_IRQ ||
             mal->rxde_irq == NO_IRQ) {
@@ -608,16 +648,26 @@ static int __devinit mal_probe(struct of_device *ofdev,
                              sizeof(struct mal_descriptor) *
                              mal_rx_bd_offset(mal, i));
 
-        err = request_irq(mal->serr_irq, mal_serr, 0, "MAL SERR", mal);
+        if (mal_has_feature(mal, MAL_FTR_COMMON_ERR_INT)) {
+                irqflags = IRQF_SHARED;
+                hdlr_serr = hdlr_txde = hdlr_rxde = mal_int;
+        } else {
+                irqflags = 0;
+                hdlr_serr = mal_serr;
+                hdlr_txde = mal_txde;
+                hdlr_rxde = mal_rxde;
+        }
+
+        err = request_irq(mal->serr_irq, hdlr_serr, irqflags, "MAL SERR", mal);
         if (err)
                 goto fail2;
-        err = request_irq(mal->txde_irq, mal_txde, 0, "MAL TX DE", mal);
+        err = request_irq(mal->txde_irq, hdlr_txde, irqflags, "MAL TX DE", mal);
         if (err)
                 goto fail3;
         err = request_irq(mal->txeob_irq, mal_txeob, 0, "MAL TX EOB", mal);
         if (err)
                 goto fail4;
-        err = request_irq(mal->rxde_irq, mal_rxde, 0, "MAL RX DE", mal);
+        err = request_irq(mal->rxde_irq, hdlr_rxde, irqflags, "MAL RX DE", mal);
         if (err)
                 goto fail5;
         err = request_irq(mal->rxeob_irq, mal_rxeob, 0, "MAL RX EOB", mal);
diff --git a/drivers/net/ibm_newemac/mal.h b/drivers/net/ibm_newemac/mal.h
index 717dc38b6858..2f0a87360844 100644
--- a/drivers/net/ibm_newemac/mal.h
+++ b/drivers/net/ibm_newemac/mal.h
@@ -213,6 +213,8 @@ struct mal_instance {
         struct of_device        *ofdev;
         int                     index;
         spinlock_t              lock;
+
+        unsigned int features;
 };
 
 static inline u32 get_mal_dcrn(struct mal_instance *mal, int reg)
@@ -225,6 +227,38 @@ static inline void set_mal_dcrn(struct mal_instance *mal, int reg, u32 val)
         dcr_write(mal->dcr_host, reg, val);
 }
 
+/* Features of various MAL implementations */
+
+/* Set if you have interrupt coalescing and you have to clear the SDR
+ * register for TXEOB and RXEOB interrupts to work
+ */
+#define MAL_FTR_CLEAR_ICINTSTAT 0x00000001
+
+/* Set if your MAL has SERR, TXDE, and RXDE OR'd into a single UIC
+ * interrupt
+ */
+#define MAL_FTR_COMMON_ERR_INT  0x00000002
+
+enum {
+        MAL_FTRS_ALWAYS = 0,
+
+        MAL_FTRS_POSSIBLE =
+#ifdef CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT
+                MAL_FTR_CLEAR_ICINTSTAT |
+#endif
+#ifdef CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR
+                MAL_FTR_COMMON_ERR_INT |
+#endif
+                0,
+};
+
+static inline int mal_has_feature(struct mal_instance *dev,
+                unsigned long feature)
+{
+        return (MAL_FTRS_ALWAYS & feature) ||
+                (MAL_FTRS_POSSIBLE & dev->features & feature);
+}
+
 /* Register MAL devices */
 int mal_init(void);
 void mal_exit(void);
diff --git a/drivers/net/ibm_newemac/phy.c b/drivers/net/ibm_newemac/phy.c
index 9164abb72d9b..c40cd8df2212 100644
--- a/drivers/net/ibm_newemac/phy.c
+++ b/drivers/net/ibm_newemac/phy.c
@@ -38,6 +38,16 @@ static inline void phy_write(struct mii_phy *phy, int reg, int val)
         phy->mdio_write(phy->dev, phy->address, reg, val);
 }
 
+static inline int gpcs_phy_read(struct mii_phy *phy, int reg)
+{
+        return phy->mdio_read(phy->dev, phy->gpcs_address, reg);
+}
+
+static inline void gpcs_phy_write(struct mii_phy *phy, int reg, int val)
+{
+        phy->mdio_write(phy->dev, phy->gpcs_address, reg, val);
+}
+
 int emac_mii_reset_phy(struct mii_phy *phy)
 {
         int val;
@@ -62,6 +72,37 @@ int emac_mii_reset_phy(struct mii_phy *phy)
         return limit <= 0;
 }
 
+int emac_mii_reset_gpcs(struct mii_phy *phy)
+{
+        int val;
+        int limit = 10000;
+
+        val = gpcs_phy_read(phy, MII_BMCR);
+        val &= ~(BMCR_ISOLATE | BMCR_ANENABLE);
+        val |= BMCR_RESET;
+        gpcs_phy_write(phy, MII_BMCR, val);
+
+        udelay(300);
+
+        while (limit--) {
+                val = gpcs_phy_read(phy, MII_BMCR);
+                if (val >= 0 && (val & BMCR_RESET) == 0)
+                        break;
+                udelay(10);
+        }
+        if ((val & BMCR_ISOLATE) && limit > 0)
+                gpcs_phy_write(phy, MII_BMCR, val & ~BMCR_ISOLATE);
+
+        if (limit > 0 && phy->mode == PHY_MODE_SGMII) {
+                /* Configure GPCS interface to recommended setting for SGMII */
+                gpcs_phy_write(phy, 0x04, 0x8120); /* AsymPause, FDX */
+                gpcs_phy_write(phy, 0x07, 0x2801); /* msg_pg, toggle */
+                gpcs_phy_write(phy, 0x00, 0x0140); /* 1Gbps, FDX     */
+        }
+
+        return limit <= 0;
+}
+
 static int genmii_setup_aneg(struct mii_phy *phy, u32 advertise)
 {
         int ctl, adv;
@@ -332,6 +373,33 @@ static int m88e1111_init(struct mii_phy *phy)
         return  0;
 }
 
+static int m88e1112_init(struct mii_phy *phy)
+{
+        /*
+         * Marvell 88E1112 PHY needs to have the SGMII MAC
+         * interace (page 2) properly configured to
+         * communicate with the 460EX/GT GPCS interface.
+         */
+
+        u16 reg_short;
+
+        pr_debug("%s: Marvell 88E1112 Ethernet\n", __func__);
+
+        /* Set access to Page 2 */
+        phy_write(phy, 0x16, 0x0002);
+
+        phy_write(phy, 0x00, 0x0040); /* 1Gbps */
+        reg_short = (u16)(phy_read(phy, 0x1a));
+        reg_short |= 0x8000; /* bypass Auto-Negotiation */
+        phy_write(phy, 0x1a, reg_short);
+        emac_mii_reset_phy(phy); /* reset MAC interface */
+
+        /* Reset access to Page 0 */
+        phy_write(phy, 0x16, 0x0000);
+
+        return  0;
+}
+
 static int et1011c_init(struct mii_phy *phy)
 {
         u16 reg_short;
@@ -384,11 +452,27 @@ static struct mii_phy_def m88e1111_phy_def = {
         .ops            = &m88e1111_phy_ops,
 };
 
+static struct mii_phy_ops m88e1112_phy_ops = {
+        .init           = m88e1112_init,
+        .setup_aneg     = genmii_setup_aneg,
+        .setup_forced   = genmii_setup_forced,
+        .poll_link      = genmii_poll_link,
+        .read_link      = genmii_read_link
+};
+
+static struct mii_phy_def m88e1112_phy_def = {
+        .phy_id         = 0x01410C90,
+        .phy_id_mask    = 0x0ffffff0,
+        .name           = "Marvell 88E1112 Ethernet",
+        .ops            = &m88e1112_phy_ops,
+};
+
 static struct mii_phy_def *mii_phy_table[] = {
         &et1011c_phy_def,
         &cis8201_phy_def,
         &bcm5248_phy_def,
         &m88e1111_phy_def,
+        &m88e1112_phy_def,
         &genmii_phy_def,
         NULL
 };
diff --git a/drivers/net/ibm_newemac/phy.h b/drivers/net/ibm_newemac/phy.h
index 1b65c81f6557..5d2bf4cbe50b 100644
--- a/drivers/net/ibm_newemac/phy.h
+++ b/drivers/net/ibm_newemac/phy.h
@@ -57,6 +57,7 @@ struct mii_phy {
                                    or determined automaticaly */
         int address;            /* PHY address */
         int mode;               /* PHY mode */
+        int gpcs_address;       /* GPCS PHY address */
 
         /* 1: autoneg enabled, 0: disabled */
         int autoneg;
@@ -81,5 +82,6 @@ struct mii_phy {
  */
 int emac_mii_phy_probe(struct mii_phy *phy, int address);
 int emac_mii_reset_phy(struct mii_phy *phy);
+int emac_mii_reset_gpcs(struct mii_phy *phy);
 
 #endif /* __IBM_NEWEMAC_PHY_H */
diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c
index 95e3464068db..f02764725a22 100644
--- a/drivers/net/ibmlana.c
+++ b/drivers/net/ibmlana.c
@@ -71,7 +71,7 @@ History:
   June 1st, 2000
         corrected version codes, added support for the latest 2.3 changes
   Oct 28th, 2002
-        cleaned up for the 2.5 tree <alan@redhat.com>
+        cleaned up for the 2.5 tree <alan@lxorguk.ukuu.org.uk>
 
  *************************************************************************/
 
diff --git a/drivers/net/irda/sir_dongle.c b/drivers/net/irda/sir_dongle.c
index 36030241f7a9..2a9930e6e2af 100644
--- a/drivers/net/irda/sir_dongle.c
+++ b/drivers/net/irda/sir_dongle.c
@@ -67,9 +67,7 @@ int sirdev_get_dongle(struct sir_dev *dev, IRDA_DONGLE type)
         const struct dongle_driver *drv = NULL;
         int err = -EINVAL;
 
-#ifdef CONFIG_KMOD
         request_module("irda-dongle-%d", type);
-#endif
 
         if (dev->dongle_drv != NULL)
                 return -EBUSY;
diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h
index 2198b77c53ed..e116d340dcc6 100644
--- a/drivers/net/ixgbe/ixgbe.h
+++ b/drivers/net/ixgbe/ixgbe.h
@@ -36,7 +36,7 @@
 #include "ixgbe_type.h"
 #include "ixgbe_common.h"
 
-#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
+#ifdef CONFIG_IXGBE_DCA
 #include <linux/dca.h>
 #endif
 
@@ -136,7 +136,7 @@ struct ixgbe_ring {
                       * offset associated with this ring, which is different
                       * for DCE and RSS modes */
 
-#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
+#ifdef CONFIG_IXGBE_DCA
         /* cpu for tx queue */
         int cpu;
 #endif
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index ca17af4349d0..7548fb7360d9 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -80,7 +80,7 @@ static struct pci_device_id ixgbe_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, ixgbe_pci_tbl);
 
-#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
+#ifdef CONFIG_IXGBE_DCA
 static int ixgbe_notify_dca(struct notifier_block *, unsigned long event,
                             void *p);
 static struct notifier_block dca_notifier = {
@@ -296,7 +296,7 @@ done_cleaning:
         return (total_packets ? true : false);
 }
 
-#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
+#ifdef CONFIG_IXGBE_DCA
 static void ixgbe_update_rx_dca(struct ixgbe_adapter *adapter,
                                 struct ixgbe_ring *rx_ring)
 {
@@ -383,7 +383,7 @@ static int __ixgbe_notify_dca(struct device *dev, void *data)
         return 0;
 }
 
-#endif /* CONFIG_DCA or CONFIG_DCA_MODULE */
+#endif /* CONFIG_IXGBE_DCA */
 /**
  * ixgbe_receive_skb - Send a completed packet up the stack
  * @adapter: board private structure
@@ -947,7 +947,7 @@ static irqreturn_t ixgbe_msix_clean_tx(int irq, void *data)
         r_idx = find_first_bit(q_vector->txr_idx, adapter->num_tx_queues);
         for (i = 0; i < q_vector->txr_count; i++) {
                 tx_ring = &(adapter->tx_ring[r_idx]);
-#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
+#ifdef CONFIG_IXGBE_DCA
                 if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
                         ixgbe_update_tx_dca(adapter, tx_ring);
 #endif
@@ -1022,7 +1022,7 @@ static int ixgbe_clean_rxonly(struct napi_struct *napi, int budget)
 
         r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
         rx_ring = &(adapter->rx_ring[r_idx]);
-#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
+#ifdef CONFIG_IXGBE_DCA
         if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
                 ixgbe_update_rx_dca(adapter, rx_ring);
 #endif
@@ -1066,7 +1066,7 @@ static int ixgbe_clean_rxonly_many(struct napi_struct *napi, int budget)
         r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
         for (i = 0; i < q_vector->rxr_count; i++) {
                 rx_ring = &(adapter->rx_ring[r_idx]);
-#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
+#ifdef CONFIG_IXGBE_DCA
                 if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
                         ixgbe_update_rx_dca(adapter, rx_ring);
 #endif
@@ -2155,7 +2155,7 @@ void ixgbe_down(struct ixgbe_adapter *adapter)
 
         netif_carrier_off(netdev);
 
-#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
+#ifdef CONFIG_IXGBE_DCA
         if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) {
                 adapter->flags &= ~IXGBE_FLAG_DCA_ENABLED;
                 dca_remove_requester(&adapter->pdev->dev);
@@ -2167,7 +2167,7 @@ void ixgbe_down(struct ixgbe_adapter *adapter)
         ixgbe_clean_all_tx_rings(adapter);
         ixgbe_clean_all_rx_rings(adapter);
 
-#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
+#ifdef CONFIG_IXGBE_DCA
         /* since we reset the hardware DCA settings were cleared */
         if (dca_add_requester(&adapter->pdev->dev) == 0) {
                 adapter->flags |= IXGBE_FLAG_DCA_ENABLED;
@@ -2193,7 +2193,7 @@ static int ixgbe_poll(struct napi_struct *napi, int budget)
         struct ixgbe_adapter *adapter = q_vector->adapter;
         int tx_cleaned, work_done = 0;
 
-#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
+#ifdef CONFIG_IXGBE_DCA
         if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) {
                 ixgbe_update_tx_dca(adapter, adapter->tx_ring);
                 ixgbe_update_rx_dca(adapter, adapter->rx_ring);
@@ -3922,7 +3922,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         if (err)
                 goto err_register;
 
-#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
+#ifdef CONFIG_IXGBE_DCA
         if (dca_add_requester(&pdev->dev) == 0) {
                 adapter->flags |= IXGBE_FLAG_DCA_ENABLED;
                 /* always use CB2 mode, difference is masked
@@ -3972,7 +3972,7 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev)
 
         flush_scheduled_work();
 
-#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
+#ifdef CONFIG_IXGBE_DCA
         if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) {
                 adapter->flags &= ~IXGBE_FLAG_DCA_ENABLED;
                 dca_remove_requester(&pdev->dev);
@@ -4105,10 +4105,10 @@ static int __init ixgbe_init_module(void)
 
         printk(KERN_INFO "%s: %s\n", ixgbe_driver_name, ixgbe_copyright);
 
-#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
+#ifdef CONFIG_IXGBE_DCA
         dca_register_notify(&dca_notifier);
-
 #endif
+
         ret = pci_register_driver(&ixgbe_driver);
         return ret;
 }
@@ -4123,13 +4123,13 @@ module_init(ixgbe_init_module);
  **/
 static void __exit ixgbe_exit_module(void)
 {
-#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
+#ifdef CONFIG_IXGBE_DCA
         dca_unregister_notify(&dca_notifier);
 #endif
         pci_unregister_driver(&ixgbe_driver);
 }
 
-#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
+#ifdef CONFIG_IXGBE_DCA
 static int ixgbe_notify_dca(struct notifier_block *nb, unsigned long event,
                             void *p)
 {
@@ -4140,7 +4140,7 @@ static int ixgbe_notify_dca(struct notifier_block *nb, unsigned long event,
 
         return ret_val ? NOTIFY_BAD : NOTIFY_DONE;
 }
-#endif /* CONFIG_DCA or CONFIG_DCA_MODULE */
+#endif /* CONFIG_IXGBE_DCA */
 
 module_exit(ixgbe_exit_module);
 
diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index 5f9a1313fa3e..81c6cdc3851f 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -21,7 +21,6 @@
  *
  */
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
@@ -38,6 +37,7 @@
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <linux/if_vlan.h>
+#include <net/ip6_checksum.h>
 #include "jme.h"
 
 static int force_pseudohp = -1;
diff --git a/drivers/net/macmace.c b/drivers/net/macmace.c
index 51ad3765e075..85587a6667b9 100644
--- a/drivers/net/macmace.c
+++ b/drivers/net/macmace.c
@@ -9,7 +9,7 @@
  *      2 of the License, or (at your option) any later version.
  *
  *      Copyright (C) 1996 Paul Mackerras.
- *      Copyright (C) 1998 Alan Cox <alan@redhat.com>
+ *      Copyright (C) 1998 Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  *      Modified heavily by Joshua M. Thompson based on Dave Huang's NetBSD driver
  *
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 6dce901c7f45..a9aebad52652 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -188,7 +188,7 @@ struct myri10ge_slice_state {
         dma_addr_t fw_stats_bus;
         int watchdog_tx_done;
         int watchdog_tx_req;
-#if (defined CONFIG_DCA) || (defined CONFIG_DCA_MODULE)
+#ifdef CONFIG_MYRI10GE_DCA
         int cached_dca_tag;
         int cpu;
         __be32 __iomem *dca_tag;
@@ -220,7 +220,7 @@ struct myri10ge_priv {
         int msi_enabled;
         int msix_enabled;
         struct msix_entry *msix_vectors;
-#if (defined CONFIG_DCA) || (defined CONFIG_DCA_MODULE)
+#ifdef CONFIG_MYRI10GE_DCA
         int dca_enabled;
 #endif
         u32 link_state;
@@ -902,7 +902,7 @@ static int myri10ge_reset(struct myri10ge_priv *mgp)
         struct myri10ge_slice_state *ss;
         int i, status;
         size_t bytes;
-#if (defined CONFIG_DCA) || (defined CONFIG_DCA_MODULE)
+#ifdef CONFIG_MYRI10GE_DCA
         unsigned long dca_tag_off;
 #endif
 
@@ -1012,7 +1012,7 @@ static int myri10ge_reset(struct myri10ge_priv *mgp)
         }
         put_be32(htonl(mgp->intr_coal_delay), mgp->intr_coal_delay_ptr);
 
-#if (defined CONFIG_DCA) || (defined CONFIG_DCA_MODULE)
+#ifdef CONFIG_MYRI10GE_DCA
         status = myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_DCA_OFFSET, &cmd, 0);
         dca_tag_off = cmd.data0;
         for (i = 0; i < mgp->num_slices; i++) {
@@ -1051,7 +1051,7 @@ static int myri10ge_reset(struct myri10ge_priv *mgp)
         return status;
 }
 
-#if (defined CONFIG_DCA) || (defined CONFIG_DCA_MODULE)
+#ifdef CONFIG_MYRI10GE_DCA
 static void
 myri10ge_write_dca(struct myri10ge_slice_state *ss, int cpu, int tag)
 {
@@ -1505,7 +1505,7 @@ static int myri10ge_poll(struct napi_struct *napi, int budget)
         struct net_device *netdev = ss->mgp->dev;
         int work_done;
 
-#if (defined CONFIG_DCA) || (defined CONFIG_DCA_MODULE)
+#ifdef CONFIG_MYRI10GE_DCA
         if (ss->mgp->dca_enabled)
                 myri10ge_update_dca(ss);
 #endif
@@ -1736,7 +1736,7 @@ static const char myri10ge_gstrings_main_stats[][ETH_GSTRING_LEN] = {
         "tx_boundary", "WC", "irq", "MSI", "MSIX",
         "read_dma_bw_MBs", "write_dma_bw_MBs", "read_write_dma_bw_MBs",
         "serial_number", "watchdog_resets",
-#if (defined CONFIG_DCA) || (defined CONFIG_DCA_MODULE)
+#ifdef CONFIG_MYRI10GE_DCA
         "dca_capable_firmware", "dca_device_present",
 #endif
         "link_changes", "link_up", "dropped_link_overflow",
@@ -1815,7 +1815,7 @@ myri10ge_get_ethtool_stats(struct net_device *netdev,
         data[i++] = (unsigned int)mgp->read_write_dma;
         data[i++] = (unsigned int)mgp->serial_number;
         data[i++] = (unsigned int)mgp->watchdog_resets;
-#if (defined CONFIG_DCA) || (defined CONFIG_DCA_MODULE)
+#ifdef CONFIG_MYRI10GE_DCA
         data[i++] = (unsigned int)(mgp->ss[0].dca_tag != NULL);
         data[i++] = (unsigned int)(mgp->dca_enabled);
 #endif
@@ -3844,7 +3844,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 dev_err(&pdev->dev, "failed reset\n");
                 goto abort_with_slices;
         }
-#if (defined CONFIG_DCA) || (defined CONFIG_DCA_MODULE)
+#ifdef CONFIG_MYRI10GE_DCA
         myri10ge_setup_dca(mgp);
 #endif
         pci_set_drvdata(pdev, mgp);
@@ -3948,7 +3948,7 @@ static void myri10ge_remove(struct pci_dev *pdev)
         netdev = mgp->dev;
         unregister_netdev(netdev);
 
-#if (defined CONFIG_DCA) || (defined CONFIG_DCA_MODULE)
+#ifdef CONFIG_MYRI10GE_DCA
         myri10ge_teardown_dca(mgp);
 #endif
         myri10ge_dummy_rdma(mgp, 0);
@@ -3993,7 +3993,7 @@ static struct pci_driver myri10ge_driver = {
 #endif
 };
 
-#if (defined CONFIG_DCA) || (defined CONFIG_DCA_MODULE)
+#ifdef CONFIG_MYRI10GE_DCA
 static int
 myri10ge_notify_dca(struct notifier_block *nb, unsigned long event, void *p)
 {
@@ -4024,7 +4024,7 @@ static __init int myri10ge_init_module(void)
                        myri10ge_driver.name, myri10ge_rss_hash);
                 myri10ge_rss_hash = MXGEFW_RSS_HASH_TYPE_SRC_PORT;
         }
-#if (defined CONFIG_DCA) || (defined CONFIG_DCA_MODULE)
+#ifdef CONFIG_MYRI10GE_DCA
         dca_register_notify(&myri10ge_dca_notifier);
 #endif
         if (myri10ge_max_slices > MYRI10GE_MAX_SLICES)
@@ -4037,7 +4037,7 @@ module_init(myri10ge_init_module);
 
 static __exit void myri10ge_cleanup_module(void)
 {
-#if (defined CONFIG_DCA) || (defined CONFIG_DCA_MODULE)
+#ifdef CONFIG_MYRI10GE_DCA
         dca_unregister_notify(&myri10ge_dca_notifier);
 #endif
         pci_unregister_driver(&myri10ge_driver);
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index 7112fd5e0e1b..08c4dd896077 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -355,9 +355,10 @@ static int tc574_config(struct pcmcia_device *link)
         for (i = j = 0; j < 0x400; j += 0x20) {
                 link->io.BasePort1 = j ^ 0x300;
                 i = pcmcia_request_io(link, &link->io);
-                if (i == CS_SUCCESS) break;
+                if (i == 0)
+                        break;
         }
-        if (i != CS_SUCCESS) {
+        if (i != 0) {
                 cs_error(link, RequestIO, i);
                 goto failed;
         }
@@ -377,7 +378,7 @@ static int tc574_config(struct pcmcia_device *link)
         tuple.TupleDataMax = 64;
         tuple.TupleOffset = 0;
         tuple.DesiredTuple = 0x88;
-        if (pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) {
+        if (pcmcia_get_first_tuple(link, &tuple) == 0) {
                 pcmcia_get_tuple_data(link, &tuple);
                 for (i = 0; i < 3; i++)
                         phys_addr[i] = htons(le16_to_cpu(buf[i]));
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index 549a64558420..c235cdba69c6 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -15,7 +15,7 @@
     incorporated herein by reference.
     Donald Becker may be reached at becker@scyld.com
     
-    Updated for 2.5.x by Alan Cox <alan@redhat.com>
+    Updated for 2.5.x by Alan Cox <alan@lxorguk.ukuu.org.uk>
 
 ======================================================================*/
 
@@ -278,9 +278,10 @@ static int tc589_config(struct pcmcia_device *link)
         if (multi && (j & 0x80)) continue;
         link->io.BasePort1 = j ^ 0x300;
         i = pcmcia_request_io(link, &link->io);
-        if (i == CS_SUCCESS) break;
+        if (i == 0)
+                break;
     }
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
         cs_error(link, RequestIO, i);
         goto failed;
     }
@@ -295,7 +296,7 @@ static int tc589_config(struct pcmcia_device *link)
     /* The 3c589 has an extra EEPROM for configuration info, including
        the hardware address.  The 3c562 puts the address in the CIS. */
     tuple.DesiredTuple = 0x88;
-    if (pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) {
+    if (pcmcia_get_first_tuple(link, &tuple) == 0) {
         pcmcia_get_tuple_data(link, &tuple);
         for (i = 0; i < 3; i++)
             phys_addr[i] = htons(le16_to_cpu(buf[i]));
diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig
index e8f55d8ed7a9..9b8f793b1cc8 100644
--- a/drivers/net/pcmcia/Kconfig
+++ b/drivers/net/pcmcia/Kconfig
@@ -111,7 +111,7 @@ config ARCNET_COM20020_CS
 
 config PCMCIA_IBMTR
         tristate "IBM PCMCIA tokenring adapter support"
-        depends on IBMTR!=y && TR && !64BIT
+        depends on IBMTR!=y && TR
         help
           Say Y here if you intend to attach this type of Token Ring PCMCIA
           card to your computer. You then also need to say Y to "Token Ring
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 52bf11b73c6e..b37a498939ae 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -262,7 +262,7 @@ static int try_io_port(struct pcmcia_device *link)
         if (link->io.NumPorts2 > 0) {
             /* for master/slave multifunction cards */
             link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
-            link->irq.Attributes = 
+            link->irq.Attributes =
                 IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
         }
     } else {
@@ -276,7 +276,8 @@ static int try_io_port(struct pcmcia_device *link)
             link->io.BasePort1 = j ^ 0x300;
             link->io.BasePort2 = (j ^ 0x300) + 0x10;
             ret = pcmcia_request_io(link, &link->io);
-            if (ret == CS_SUCCESS) return ret;
+            if (ret == 0)
+                    return ret;
         }
         return ret;
     } else {
@@ -284,59 +285,50 @@ static int try_io_port(struct pcmcia_device *link)
     }
 }
 
+static int axnet_configcheck(struct pcmcia_device *p_dev,
+                             cistpl_cftable_entry_t *cfg,
+                             cistpl_cftable_entry_t *dflt,
+                             unsigned int vcc,
+                             void *priv_data)
+{
+        int i;
+        cistpl_io_t *io = &cfg->io;
+
+        if (cfg->index == 0 || cfg->io.nwin == 0)
+                return -ENODEV;
+
+        p_dev->conf.ConfigIndex = 0x05;
+        /* For multifunction cards, by convention, we configure the
+           network function with window 0, and serial with window 1 */
+        if (io->nwin > 1) {
+                i = (io->win[1].len > io->win[0].len);
+                p_dev->io.BasePort2 = io->win[1-i].base;
+                p_dev->io.NumPorts2 = io->win[1-i].len;
+        } else {
+                i = p_dev->io.NumPorts2 = 0;
+        }
+        p_dev->io.BasePort1 = io->win[i].base;
+        p_dev->io.NumPorts1 = io->win[i].len;
+        p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
+        if (p_dev->io.NumPorts1 + p_dev->io.NumPorts2 >= 32)
+                return try_io_port(p_dev);
+
+        return -ENODEV;
+}
+
 static int axnet_config(struct pcmcia_device *link)
 {
     struct net_device *dev = link->priv;
     axnet_dev_t *info = PRIV(dev);
-    tuple_t tuple;
-    cisparse_t parse;
     int i, j, last_ret, last_fn;
-    u_short buf[64];
     DECLARE_MAC_BUF(mac);
 
     DEBUG(0, "axnet_config(0x%p)\n", link);
 
-    tuple.Attributes = 0;
-    tuple.TupleData = (cisdata_t *)buf;
-    tuple.TupleDataMax = sizeof(buf);
-    tuple.TupleOffset = 0;
-
     /* don't trust the CIS on this; Linksys got it wrong */
     link->conf.Present = 0x63;
-
-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-    tuple.Attributes = 0;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-    while (last_ret == CS_SUCCESS) {
-        cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
-        cistpl_io_t *io = &(parse.cftable_entry.io);
-        
-        if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
-                pcmcia_parse_tuple(link, &tuple, &parse) != 0 ||
-                cfg->index == 0 || cfg->io.nwin == 0)
-            goto next_entry;
-        
-        link->conf.ConfigIndex = 0x05;
-        /* For multifunction cards, by convention, we configure the
-           network function with window 0, and serial with window 1 */
-        if (io->nwin > 1) {
-            i = (io->win[1].len > io->win[0].len);
-            link->io.BasePort2 = io->win[1-i].base;
-            link->io.NumPorts2 = io->win[1-i].len;
-        } else {
-            i = link->io.NumPorts2 = 0;
-        }
-        link->io.BasePort1 = io->win[i].base;
-        link->io.NumPorts1 = io->win[i].len;
-        link->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
-        if (link->io.NumPorts1 + link->io.NumPorts2 >= 32) {
-            last_ret = try_io_port(link);
-            if (last_ret == CS_SUCCESS) break;
-        }
-    next_entry:
-        last_ret = pcmcia_get_next_tuple(link, &tuple);
-    }
-    if (last_ret != CS_SUCCESS) {
+    last_ret = pcmcia_loop_config(link, axnet_configcheck, NULL);
+    if (last_ret != 0) {
         cs_error(link, RequestIO, last_ret);
         goto failed;
     }
diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/pcmcia/com20020_cs.c
index ea9414c4d900..831090c75622 100644
--- a/drivers/net/pcmcia/com20020_cs.c
+++ b/drivers/net/pcmcia/com20020_cs.c
@@ -260,21 +260,21 @@ static int com20020_config(struct pcmcia_device *link)
     DEBUG(0, "com20020_config(0x%p)\n", link);
 
     DEBUG(1,"arcnet: baseport1 is %Xh\n", link->io.BasePort1);
-    i = !CS_SUCCESS;
+    i = -ENODEV;
     if (!link->io.BasePort1)
     {
         for (ioaddr = 0x100; ioaddr < 0x400; ioaddr += 0x10)
         {
             link->io.BasePort1 = ioaddr;
             i = pcmcia_request_io(link, &link->io);
-            if (i == CS_SUCCESS)
+            if (i == 0)
                 break;
         }
     }
     else
         i = pcmcia_request_io(link, &link->io);
     
-    if (i != CS_SUCCESS)
+    if (i != 0)
     {
         DEBUG(1,"arcnet: requestIO failed totally!\n");
         goto failed;
@@ -287,7 +287,7 @@ static int com20020_config(struct pcmcia_device *link)
            link->irq.AssignedIRQ,
            link->irq.IRQInfo1, link->irq.IRQInfo2);
     i = pcmcia_request_irq(link, &link->irq);
-    if (i != CS_SUCCESS)
+    if (i != 0)
     {
         DEBUG(1,"arcnet: requestIRQ failed totally!\n");
         goto failed;
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index a550c9bd126f..69d916daa7bb 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -309,7 +309,8 @@ static int mfc_try_io_port(struct pcmcia_device *link)
             printk(KERN_NOTICE "fmvj18x_cs: out of resource for serial\n");
         }
         ret = pcmcia_request_io(link, &link->io);
-        if (ret == CS_SUCCESS) return ret;
+        if (ret == 0)
+                return ret;
     }
     return ret;
 }
@@ -325,7 +326,7 @@ static int ungermann_try_io_port(struct pcmcia_device *link)
     for (ioaddr = 0x300; ioaddr < 0x3e0; ioaddr += 0x20) {
         link->io.BasePort1 = ioaddr;
         ret = pcmcia_request_io(link, &link->io);
-        if (ret == CS_SUCCESS) {
+        if (ret == 0) {
             /* calculate ConfigIndex value */
             link->conf.ConfigIndex = 
                 ((link->io.BasePort1 & 0x0f0) >> 3) | 0x22;
@@ -356,12 +357,12 @@ static int fmvj18x_config(struct pcmcia_device *link)
     tuple.TupleOffset = 0;
     tuple.DesiredTuple = CISTPL_FUNCE;
     tuple.TupleOffset = 0;
-    if (pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) {
+    if (pcmcia_get_first_tuple(link, &tuple) == 0) {
         /* Yes, I have CISTPL_FUNCE. Let's check CISTPL_MANFID */
         tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
         CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
         CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
-        CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
+        CS_CHECK(ParseTuple, pcmcia_parse_tuple(&tuple, &parse));
         link->conf.ConfigIndex = parse.cftable_entry.index;
         switch (link->manf_id) {
         case MANFID_TDK:
@@ -430,10 +431,10 @@ static int fmvj18x_config(struct pcmcia_device *link)
         link->irq.Attributes =
                 IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED|IRQ_HANDLE_PRESENT;
         ret = mfc_try_io_port(link);
-        if (ret != CS_SUCCESS) goto cs_failed;
+        if (ret != 0) goto cs_failed;
     } else if (cardtype == UNGERMANN) {
         ret = ungermann_try_io_port(link);
-        if (ret != CS_SUCCESS) goto cs_failed;
+        if (ret != 0) goto cs_failed;
     } else { 
         CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io));
     }
@@ -565,7 +566,7 @@ static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id)
     req.Base = 0; req.Size = 0;
     req.AccessSpeed = 0;
     i = pcmcia_request_window(&link, &req, &link->win);
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
         cs_error(link, RequestWindow, i);
         return -1;
     }
@@ -599,7 +600,7 @@ static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id)
 
     iounmap(base);
     j = pcmcia_release_window(link->win);
-    if (j != CS_SUCCESS)
+    if (j != 0)
         cs_error(link, ReleaseWindow, j);
     return (i != 0x200) ? 0 : -1;
 
@@ -620,7 +621,7 @@ static int fmvj18x_setup_mfc(struct pcmcia_device *link)
     req.Base = 0; req.Size = 0;
     req.AccessSpeed = 0;
     i = pcmcia_request_window(&link, &req, &link->win);
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
         cs_error(link, RequestWindow, i);
         return -1;
     }
@@ -642,7 +643,7 @@ static int fmvj18x_setup_mfc(struct pcmcia_device *link)
 
     iounmap(base);
     j = pcmcia_release_window(link->win);
-    if (j != CS_SUCCESS)
+    if (j != 0)
         cs_error(link, ReleaseWindow, j);
     return 0;
 
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c
index 4eafa4f42cff..cf3cca4642f2 100644
--- a/drivers/net/pcmcia/ibmtr_cs.c
+++ b/drivers/net/pcmcia/ibmtr_cs.c
@@ -238,7 +238,7 @@ static int __devinit ibmtr_config(struct pcmcia_device *link)
     /* Try PRIMARY card at 0xA20-0xA23 */
     link->io.BasePort1 = 0xA20;
     i = pcmcia_request_io(link, &link->io);
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
         /* Couldn't get 0xA20-0xA23.  Try ALTERNATE at 0xA24-0xA27. */
         link->io.BasePort1 = 0xA24;
         CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io));
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index cfcbea9b7e2e..448cd40aeba5 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -69,7 +69,7 @@ Driver Notes and Issues
 History
 -------------------------------------------------------------------------------
 Log: nmclan_cs.c,v
- * 2.5.75-ac1 2003/07/11 Alan Cox <alan@redhat.com>
+ * 2.5.75-ac1 2003/07/11 Alan Cox <alan@lxorguk.ukuu.org.uk>
  * Fixed hang on card eject as we probe it
  * Cleaned up to use new style locking.
  *
@@ -925,7 +925,7 @@ static void mace_tx_timeout(struct net_device *dev)
   printk(KERN_NOTICE "%s: transmit timed out -- ", dev->name);
 #if RESET_ON_TIMEOUT
   printk("resetting card\n");
-  pcmcia_reset_card(link, NULL);
+  pcmcia_reset_card(link->socket);
 #else /* #if RESET_ON_TIMEOUT */
   printk("NOT resetting card\n");
 #endif /* #if RESET_ON_TIMEOUT */
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index ebc1ae6bcbe5..e40d6301aa7a 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -310,7 +310,7 @@ static hw_info_t *get_hwinfo(struct pcmcia_device *link)
     req.Base = 0; req.Size = 0;
     req.AccessSpeed = 0;
     i = pcmcia_request_window(&link, &req, &link->win);
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
         cs_error(link, RequestWindow, i);
         return NULL;
     }
@@ -333,7 +333,7 @@ static hw_info_t *get_hwinfo(struct pcmcia_device *link)
 
     iounmap(virt);
     j = pcmcia_release_window(link->win);
-    if (j != CS_SUCCESS)
+    if (j != 0)
         cs_error(link, ReleaseWindow, j);
     return (i < NR_INFO) ? hw_info+i : NULL;
 } /* get_hwinfo */
@@ -504,7 +504,8 @@ static int try_io_port(struct pcmcia_device *link)
             link->io.BasePort1 = j ^ 0x300;
             link->io.BasePort2 = (j ^ 0x300) + 0x10;
             ret = pcmcia_request_io(link, &link->io);
-            if (ret == CS_SUCCESS) return ret;
+            if (ret == 0)
+                    return ret;
         }
         return ret;
     } else {
@@ -512,58 +513,53 @@ static int try_io_port(struct pcmcia_device *link)
     }
 }
 
+static int pcnet_confcheck(struct pcmcia_device *p_dev,
+                           cistpl_cftable_entry_t *cfg,
+                           cistpl_cftable_entry_t *dflt,
+                           unsigned int vcc,
+                           void *priv_data)
+{
+        int *has_shmem = priv_data;
+        int i;
+        cistpl_io_t *io = &cfg->io;
+
+        if (cfg->index == 0 || cfg->io.nwin == 0)
+                return -EINVAL;
+
+        /* For multifunction cards, by convention, we configure the
+           network function with window 0, and serial with window 1 */
+        if (io->nwin > 1) {
+                i = (io->win[1].len > io->win[0].len);
+                p_dev->io.BasePort2 = io->win[1-i].base;
+                p_dev->io.NumPorts2 = io->win[1-i].len;
+        } else {
+                i = p_dev->io.NumPorts2 = 0;
+        }
+
+        *has_shmem = ((cfg->mem.nwin == 1) &&
+                      (cfg->mem.win[0].len >= 0x4000));
+        p_dev->io.BasePort1 = io->win[i].base;
+        p_dev->io.NumPorts1 = io->win[i].len;
+        p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
+        if (p_dev->io.NumPorts1 + p_dev->io.NumPorts2 >= 32)
+                return try_io_port(p_dev);
+
+        return 0;
+}
+
 static int pcnet_config(struct pcmcia_device *link)
 {
     struct net_device *dev = link->priv;
     pcnet_dev_t *info = PRIV(dev);
-    tuple_t tuple;
-    cisparse_t parse;
-    int i, last_ret, last_fn, start_pg, stop_pg, cm_offset;
+    int last_ret, last_fn, start_pg, stop_pg, cm_offset;
     int has_shmem = 0;
-    u_short buf[64];
     hw_info_t *local_hw_info;
     DECLARE_MAC_BUF(mac);
 
     DEBUG(0, "pcnet_config(0x%p)\n", link);
 
-    tuple.TupleData = (cisdata_t *)buf;
-    tuple.TupleDataMax = sizeof(buf);
-    tuple.TupleOffset = 0;
-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-    tuple.Attributes = 0;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-    while (last_ret == CS_SUCCESS) {
-        cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
-        cistpl_io_t *io = &(parse.cftable_entry.io);
-
-        if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
-                        pcmcia_parse_tuple(link, &tuple, &parse) != 0 ||
-                        cfg->index == 0 || cfg->io.nwin == 0)
-                goto next_entry;
-
-        link->conf.ConfigIndex = cfg->index;
-        /* For multifunction cards, by convention, we configure the
-           network function with window 0, and serial with window 1 */
-        if (io->nwin > 1) {
-            i = (io->win[1].len > io->win[0].len);
-            link->io.BasePort2 = io->win[1-i].base;
-            link->io.NumPorts2 = io->win[1-i].len;
-        } else {
-            i = link->io.NumPorts2 = 0;
-        }
-        has_shmem = ((cfg->mem.nwin == 1) &&
-                     (cfg->mem.win[0].len >= 0x4000));
-        link->io.BasePort1 = io->win[i].base;
-        link->io.NumPorts1 = io->win[i].len;
-        link->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
-        if (link->io.NumPorts1 + link->io.NumPorts2 >= 32) {
-            last_ret = try_io_port(link);
-            if (last_ret == CS_SUCCESS) break;
-        }
-    next_entry:
-        last_ret = pcmcia_get_next_tuple(link, &tuple);
-    }
-    if (last_ret != CS_SUCCESS) {
+    last_ret = pcmcia_loop_config(link, pcnet_confcheck, &has_shmem);
+    if (last_ret) {
         cs_error(link, RequestIO, last_ret);
         goto failed;
     }
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index 250eb1954c34..c74d6656d266 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -409,10 +409,13 @@ static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple,
 {
         int i;
 
-        if ((i = pcmcia_get_first_tuple(handle, tuple)) != CS_SUCCESS ||
-                        (i = pcmcia_get_tuple_data(handle, tuple)) != CS_SUCCESS)
+        i = pcmcia_get_first_tuple(handle, tuple);
+        if (i != 0)
                 return i;
-        return pcmcia_parse_tuple(handle, tuple, parse);
+        i = pcmcia_get_tuple_data(handle, tuple);
+        if (i != 0)
+                return i;
+        return pcmcia_parse_tuple(tuple, parse);
 }
 
 static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,
@@ -420,10 +423,10 @@ static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,
 {
         int i;
 
-        if ((i = pcmcia_get_next_tuple(handle, tuple)) != CS_SUCCESS ||
-                        (i = pcmcia_get_tuple_data(handle, tuple)) != CS_SUCCESS)
+        if ((i = pcmcia_get_next_tuple(handle, tuple)) != 0 ||
+                        (i = pcmcia_get_tuple_data(handle, tuple)) != 0)
                 return i;
-        return pcmcia_parse_tuple(handle, tuple, parse);
+        return pcmcia_parse_tuple(tuple, parse);
 }
 
 /*======================================================================
@@ -459,27 +462,36 @@ static int mhz_3288_power(struct pcmcia_device *link)
     return 0;
 }
 
+static int mhz_mfc_config_check(struct pcmcia_device *p_dev,
+                                cistpl_cftable_entry_t *cf,
+                                cistpl_cftable_entry_t *dflt,
+                                unsigned int vcc,
+                                void *priv_data)
+{
+        int k;
+        p_dev->io.BasePort2 = cf->io.win[0].base;
+        for (k = 0; k < 0x400; k += 0x10) {
+                if (k & 0x80)
+                        continue;
+                p_dev->io.BasePort1 = k ^ 0x300;
+                if (!pcmcia_request_io(p_dev, &p_dev->io))
+                        return 0;
+        }
+        return -ENODEV;
+}
+
 static int mhz_mfc_config(struct pcmcia_device *link)
 {
     struct net_device *dev = link->priv;
     struct smc_private *smc = netdev_priv(dev);
     struct smc_cfg_mem *cfg_mem;
-    tuple_t *tuple;
-    cisparse_t *parse;
-    cistpl_cftable_entry_t *cf;
-    u_char *buf;
     win_req_t req;
     memreq_t mem;
-    int i, k;
+    int i;
 
     cfg_mem = kmalloc(sizeof(struct smc_cfg_mem), GFP_KERNEL);
     if (!cfg_mem)
-        return CS_OUT_OF_RESOURCE;
-
-    tuple = &cfg_mem->tuple;
-    parse = &cfg_mem->parse;
-    cf = &parse->cftable_entry;
-    buf = cfg_mem->buf;
+            return -ENOMEM;
 
     link->conf.Attributes |= CONF_ENABLE_SPKR;
     link->conf.Status = CCSR_AUDIO_ENA;
@@ -489,27 +501,9 @@ static int mhz_mfc_config(struct pcmcia_device *link)
     link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
     link->io.NumPorts2 = 8;
 
-    tuple->Attributes = tuple->TupleOffset = 0;
-    tuple->TupleData = (cisdata_t *)buf;
-    tuple->TupleDataMax = 255;
-    tuple->DesiredTuple = CISTPL_CFTABLE_ENTRY;
-
-    i = first_tuple(link, tuple, parse);
     /* The Megahertz combo cards have modem-like CIS entries, so
        we have to explicitly try a bunch of port combinations. */
-    while (i == CS_SUCCESS) {
-        link->conf.ConfigIndex = cf->index;
-        link->io.BasePort2 = cf->io.win[0].base;
-        for (k = 0; k < 0x400; k += 0x10) {
-            if (k & 0x80) continue;
-            link->io.BasePort1 = k ^ 0x300;
-            i = pcmcia_request_io(link, &link->io);
-            if (i == CS_SUCCESS) break;
-        }
-        if (i == CS_SUCCESS) break;
-        i = next_tuple(link, tuple, parse);
-    }
-    if (i != CS_SUCCESS)
+    if (pcmcia_loop_config(link, mhz_mfc_config_check, NULL))
         goto free_cfg_mem;
     dev->base_addr = link->io.BasePort1;
 
@@ -518,7 +512,7 @@ static int mhz_mfc_config(struct pcmcia_device *link)
     req.Base = req.Size = 0;
     req.AccessSpeed = 0;
     i = pcmcia_request_window(&link, &req, &link->win);
-    if (i != CS_SUCCESS)
+    if (i != 0)
         goto free_cfg_mem;
     smc->base = ioremap(req.Base, req.Size);
     mem.CardOffset = mem.Page = 0;
@@ -526,14 +520,14 @@ static int mhz_mfc_config(struct pcmcia_device *link)
         mem.CardOffset = link->conf.ConfigBase;
     i = pcmcia_map_mem_page(link->win, &mem);
 
-    if ((i == CS_SUCCESS)
+    if ((i == 0)
         && (smc->manfid == MANFID_MEGAHERTZ)
         && (smc->cardid == PRODID_MEGAHERTZ_EM3288))
         mhz_3288_power(link);
 
 free_cfg_mem:
     kfree(cfg_mem);
-    return i;
+    return -ENODEV;
 }
 
 static int mhz_setup(struct pcmcia_device *link)
@@ -560,12 +554,12 @@ static int mhz_setup(struct pcmcia_device *link)
     /* Read the station address from the CIS.  It is stored as the last
        (fourth) string in the Version 1 Version/ID tuple. */
     tuple->DesiredTuple = CISTPL_VERS_1;
-    if (first_tuple(link, tuple, parse) != CS_SUCCESS) {
+    if (first_tuple(link, tuple, parse) != 0) {
         rc = -1;
         goto free_cfg_mem;
     }
     /* Ugh -- the EM1144 card has two VERS_1 tuples!?! */
-    if (next_tuple(link, tuple, parse) != CS_SUCCESS)
+    if (next_tuple(link, tuple, parse) != 0)
         first_tuple(link, tuple, parse);
     if (parse->version_1.ns > 3) {
         station_addr = parse->version_1.str + parse->version_1.ofs[3];
@@ -577,11 +571,11 @@ static int mhz_setup(struct pcmcia_device *link)
 
     /* Another possibility: for the EM3288, in a special tuple */
     tuple->DesiredTuple = 0x81;
-    if (pcmcia_get_first_tuple(link, tuple) != CS_SUCCESS) {
+    if (pcmcia_get_first_tuple(link, tuple) != 0) {
         rc = -1;
         goto free_cfg_mem;
     }
-    if (pcmcia_get_tuple_data(link, tuple) != CS_SUCCESS) {
+    if (pcmcia_get_tuple_data(link, tuple) != 0) {
         rc = -1;
         goto free_cfg_mem;
     }
@@ -660,46 +654,27 @@ static int mot_setup(struct pcmcia_device *link)
 
 /*====================================================================*/
 
+static int smc_configcheck(struct pcmcia_device *p_dev,
+                           cistpl_cftable_entry_t *cf,
+                           cistpl_cftable_entry_t *dflt,
+                           unsigned int vcc,
+                           void *priv_data)
+{
+        p_dev->io.BasePort1 = cf->io.win[0].base;
+        p_dev->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK;
+        return pcmcia_request_io(p_dev, &p_dev->io);
+}
+
 static int smc_config(struct pcmcia_device *link)
 {
     struct net_device *dev = link->priv;
-    struct smc_cfg_mem *cfg_mem;
-    tuple_t *tuple;
-    cisparse_t *parse;
-    cistpl_cftable_entry_t *cf;
-    u_char *buf;
     int i;
 
-    cfg_mem = kmalloc(sizeof(struct smc_cfg_mem), GFP_KERNEL);
-    if (!cfg_mem)
-        return CS_OUT_OF_RESOURCE;
-
-    tuple = &cfg_mem->tuple;
-    parse = &cfg_mem->parse;
-    cf = &parse->cftable_entry;
-    buf = cfg_mem->buf;
-
-    tuple->Attributes = tuple->TupleOffset = 0;
-    tuple->TupleData = (cisdata_t *)buf;
-    tuple->TupleDataMax = 255;
-    tuple->DesiredTuple = CISTPL_CFTABLE_ENTRY;
-
     link->io.NumPorts1 = 16;
-    i = first_tuple(link, tuple, parse);
-    while (i != CS_NO_MORE_ITEMS) {
-        if (i == CS_SUCCESS) {
-            link->conf.ConfigIndex = cf->index;
-            link->io.BasePort1 = cf->io.win[0].base;
-            link->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK;
-            i = pcmcia_request_io(link, &link->io);
-            if (i == CS_SUCCESS) break;
-        }
-        i = next_tuple(link, tuple, parse);
-    }
-    if (i == CS_SUCCESS)
-        dev->base_addr = link->io.BasePort1;
+    i = pcmcia_loop_config(link, smc_configcheck, NULL);
+    if (!i)
+            dev->base_addr = link->io.BasePort1;
 
-    kfree(cfg_mem);
     return i;
 }
 
@@ -715,7 +690,7 @@ static int smc_setup(struct pcmcia_device *link)
 
     cfg_mem = kmalloc(sizeof(struct smc_cfg_mem), GFP_KERNEL);
     if (!cfg_mem)
-        return CS_OUT_OF_RESOURCE;
+            return -ENOMEM;
 
     tuple = &cfg_mem->tuple;
     parse = &cfg_mem->parse;
@@ -728,12 +703,12 @@ static int smc_setup(struct pcmcia_device *link)
     /* Check for a LAN function extension tuple */
     tuple->DesiredTuple = CISTPL_FUNCE;
     i = first_tuple(link, tuple, parse);
-    while (i == CS_SUCCESS) {
+    while (i == 0) {
         if (parse->funce.type == CISTPL_FUNCE_LAN_NODE_ID)
             break;
         i = next_tuple(link, tuple, parse);
     }
-    if (i == CS_SUCCESS) {
+    if (i == 0) {
         node_id = (cistpl_lan_node_id_t *)parse->funce.data;
         if (node_id->nb == 6) {
             for (i = 0; i < 6; i++)
@@ -780,9 +755,10 @@ static int osi_config(struct pcmcia_device *link)
     for (i = j = 0; j < 4; j++) {
         link->io.BasePort2 = com[j];
         i = pcmcia_request_io(link, &link->io);
-        if (i == CS_SUCCESS) break;
+        if (i == 0)
+                break;
     }
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
         /* Fallback: turn off hard decode */
         link->conf.ConfigIndex = 0x03;
         link->io.NumPorts2 = 0;
@@ -815,13 +791,13 @@ static int osi_setup(struct pcmcia_device *link, u_short manfid, u_short cardid)
     /* Read the station address from tuple 0x90, subtuple 0x04 */
     tuple->DesiredTuple = 0x90;
     i = pcmcia_get_first_tuple(link, tuple);
-    while (i == CS_SUCCESS) {
+    while (i == 0) {
         i = pcmcia_get_tuple_data(link, tuple);
-        if ((i != CS_SUCCESS) || (buf[0] == 0x04))
+        if ((i != 0) || (buf[0] == 0x04))
             break;
         i = pcmcia_get_next_tuple(link, tuple);
     }
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
         rc = -1;
         goto free_cfg_mem;
     }
@@ -959,8 +935,11 @@ static int check_sig(struct pcmcia_device *link)
 
 ======================================================================*/
 
-#define CS_EXIT_TEST(ret, svc, label) \
-if (ret != CS_SUCCESS) { cs_error(link, svc, ret); goto label; }
+#define CS_EXIT_TEST(ret, svc, label)   \
+if (ret != 0) {                         \
+        cs_error(link, svc, ret);       \
+        goto label;                     \
+}
 
 static int smc91c92_config(struct pcmcia_device *link)
 {
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index c33a3d523566..e1fd585e7131 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -377,7 +377,7 @@ first_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)
 
         if ((err = pcmcia_get_first_tuple(handle, tuple)) == 0 &&
                         (err = pcmcia_get_tuple_data(handle, tuple)) == 0)
-                err = pcmcia_parse_tuple(handle, tuple, parse);
+                err = pcmcia_parse_tuple(tuple, parse);
         return err;
 }
 
@@ -388,7 +388,7 @@ next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)
 
         if ((err = pcmcia_get_next_tuple(handle, tuple)) == 0 &&
                         (err = pcmcia_get_tuple_data(handle, tuple)) == 0)
-                err = pcmcia_parse_tuple(handle, tuple, parse);
+                err = pcmcia_parse_tuple(tuple, parse);
         return err;
 }
 
@@ -715,6 +715,47 @@ has_ce2_string(struct pcmcia_device * p_dev)
         return 0;
 }
 
+static int
+xirc2ps_config_modem(struct pcmcia_device *p_dev,
+                     cistpl_cftable_entry_t *cf,
+                     cistpl_cftable_entry_t *dflt,
+                     unsigned int vcc,
+                     void *priv_data)
+{
+        unsigned int ioaddr;
+
+        if (cf->io.nwin > 0  &&  (cf->io.win[0].base & 0xf) == 8) {
+                for (ioaddr = 0x300; ioaddr < 0x400; ioaddr += 0x10) {
+                        p_dev->io.BasePort2 = cf->io.win[0].base;
+                        p_dev->io.BasePort1 = ioaddr;
+                        if (!pcmcia_request_io(p_dev, &p_dev->io))
+                                return 0;
+                }
+        }
+        return -ENODEV;
+}
+
+static int
+xirc2ps_config_check(struct pcmcia_device *p_dev,
+                     cistpl_cftable_entry_t *cf,
+                     cistpl_cftable_entry_t *dflt,
+                     unsigned int vcc,
+                     void *priv_data)
+{
+        int *pass = priv_data;
+
+        if (cf->io.nwin > 0 && (cf->io.win[0].base & 0xf) == 8) {
+                p_dev->io.BasePort2 = cf->io.win[0].base;
+                p_dev->io.BasePort1 = p_dev->io.BasePort2
+                        + (*pass ? (cf->index & 0x20 ? -24:8)
+                           : (cf->index & 0x20 ?   8:-24));
+                if (!pcmcia_request_io(p_dev, &p_dev->io))
+                        return 0;
+        }
+        return -ENODEV;
+
+}
+
 /****************
  * xirc2ps_config() is scheduled to run after a CARD_INSERTION event
  * is received, to configure the PCMCIA socket, and to make the
@@ -725,13 +766,12 @@ xirc2ps_config(struct pcmcia_device * link)
 {
     struct net_device *dev = link->priv;
     local_info_t *local = netdev_priv(dev);
+    unsigned int ioaddr;
     tuple_t tuple;
     cisparse_t parse;
-    unsigned int ioaddr;
     int err, i;
     u_char buf[64];
     cistpl_lan_node_id_t *node_id = (cistpl_lan_node_id_t*)parse.funce.data;
-    cistpl_cftable_entry_t *cf = &parse.cftable_entry;
     DECLARE_MAC_BUF(mac);
 
     local->dingo_ccr = NULL;
@@ -846,19 +886,8 @@ xirc2ps_config(struct pcmcia_device * link)
             /* Take the Modem IO port from the CIS and scan for a free
              * Ethernet port */
             link->io.NumPorts1 = 16; /* no Mako stuff anymore */
-            tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-            for (err = first_tuple(link, &tuple, &parse); !err;
-                                 err = next_tuple(link, &tuple, &parse)) {
-                if (cf->io.nwin > 0  &&  (cf->io.win[0].base & 0xf) == 8) {
-                    for (ioaddr = 0x300; ioaddr < 0x400; ioaddr += 0x10) {
-                        link->conf.ConfigIndex = cf->index ;
-                        link->io.BasePort2 = cf->io.win[0].base;
-                        link->io.BasePort1 = ioaddr;
-                        if (!(err=pcmcia_request_io(link, &link->io)))
-                            goto port_found;
-                    }
-                }
-            }
+            if (!pcmcia_loop_config(link, xirc2ps_config_modem, NULL))
+                    goto port_found;
         } else {
             link->io.NumPorts1 = 18;
             /* We do 2 passes here: The first one uses the regular mapping and
@@ -866,21 +895,9 @@ xirc2ps_config(struct pcmcia_device * link)
              * mirrored every 32 bytes. Actually we use a mirrored port for
              * the Mako if (on the first pass) the COR bit 5 is set.
              */
-            for (pass=0; pass < 2; pass++) {
-                tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-                for (err = first_tuple(link, &tuple, &parse); !err;
-                                     err = next_tuple(link, &tuple, &parse)){
-                    if (cf->io.nwin > 0  &&  (cf->io.win[0].base & 0xf) == 8){
-                        link->conf.ConfigIndex = cf->index ;
-                        link->io.BasePort2 = cf->io.win[0].base;
-                        link->io.BasePort1 = link->io.BasePort2
-                                    + (pass ? (cf->index & 0x20 ? -24:8)
-                                            : (cf->index & 0x20 ?   8:-24));
-                        if (!(err=pcmcia_request_io(link, &link->io)))
+            for (pass=0; pass < 2; pass++)
+                    if (!pcmcia_loop_config(link, xirc2ps_config_check, &pass))
                             goto port_found;
-                    }
-                }
-            }
             /* if special option:
              * try to configure as Ethernet only.
              * .... */
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 6671e2da0d57..d0ed1ef284a8 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -55,6 +55,7 @@ EXPORT_SYMBOL(mdiobus_alloc);
 
 /**
  * mdiobus_release - mii_bus device release callback
+ * @d: the target struct device that contains the mii_bus
  *
  * Description: called when the last reference to an mii_bus is
  * dropped, to free the underlying memory.
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 171627480058..e11b03b2b25a 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -309,11 +309,6 @@ void phy_disconnect(struct phy_device *phydev)
 }
 EXPORT_SYMBOL(phy_disconnect);
 
-static int phy_compare_id(struct device *dev, void *data)
-{
-        return strcmp((char *)data, dev->bus_id) ? 0 : 1;
-}
-
 /**
  * phy_attach - attach a network device to a particular PHY device
  * @dev: network device to attach
@@ -337,8 +332,7 @@ struct phy_device *phy_attach(struct net_device *dev,
 
         /* Search the list of PHY devices on the mdio bus for the
          * PHY with the requested name */
-        d = bus_find_device(bus, NULL, (void *)bus_id, phy_compare_id);
-
+        d = bus_find_device_by_name(bus, NULL, bus_id);
         if (d) {
                 phydev = to_phy_device(d);
         } else {
@@ -557,6 +551,7 @@ int genphy_restart_aneg(struct phy_device *phydev)
 
         return ctl;
 }
+EXPORT_SYMBOL(genphy_restart_aneg);
 
 
 /**
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index 0ca0fcbb7c01..7e857e938adb 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -866,8 +866,8 @@ static int __init ppp_init(void)
                         err = PTR_ERR(ppp_class);
                         goto out_chrdev;
                 }
-                device_create_drvdata(ppp_class, NULL, MKDEV(PPP_MAJOR, 0),
-                                      NULL, "ppp");
+                device_create(ppp_class, NULL, MKDEV(PPP_MAJOR, 0), NULL,
+                              "ppp");
         }
 
 out:
@@ -2127,13 +2127,9 @@ ppp_set_compress(struct ppp *ppp, unsigned long arg)
             || ccp_option[1] < 2 || ccp_option[1] > data.length)
                 goto out;
 
-        cp = find_compressor(ccp_option[0]);
-#ifdef CONFIG_KMOD
-        if (!cp) {
-                request_module("ppp-compress-%d", ccp_option[0]);
-                cp = find_compressor(ccp_option[0]);
-        }
-#endif /* CONFIG_KMOD */
+        cp = try_then_request_module(
+                find_compressor(ccp_option[0]),
+                "ppp-compress-%d", ccp_option[0]);
         if (!cp)
                 goto out;
 
diff --git a/drivers/net/pppox.c b/drivers/net/pppox.c
index c6898c1fc54d..03aecc97fb45 100644
--- a/drivers/net/pppox.c
+++ b/drivers/net/pppox.c
@@ -115,13 +115,8 @@ static int pppox_create(struct net *net, struct socket *sock, int protocol)
                 goto out;
 
         rc = -EPROTONOSUPPORT;
-#ifdef CONFIG_KMOD
-        if (!pppox_protos[protocol]) {
-                char buffer[32];
-                sprintf(buffer, "pppox-proto-%d", protocol);
-                request_module(buffer);
-        }
-#endif
+        if (!pppox_protos[protocol])
+                request_module("pppox-proto-%d", protocol);
         if (!pppox_protos[protocol] ||
             !try_module_get(pppox_protos[protocol]->owner))
                 goto out;
diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h
index c37ea436c918..38116f9d4163 100644
--- a/drivers/net/qlge/qlge.h
+++ b/drivers/net/qlge/qlge.h
@@ -58,7 +58,7 @@
  */
 #if (PAGE_SHIFT == 12) || (PAGE_SHIFT == 13)    /* 4k & 8k pages */
 #define TX_DESC_PER_OAL ((MAX_SKB_FRAGS - TX_DESC_PER_IOCB) + 2)
-#elif (PAGE_SHIFT == 16)        /* 64k pages */
+#else /* all other page sizes */
 #define TX_DESC_PER_OAL 0
 #endif
 
diff --git a/drivers/net/qlge/qlge_ethtool.c b/drivers/net/qlge/qlge_ethtool.c
index 6457f8c4fdaa..b62fbd4bf00f 100644
--- a/drivers/net/qlge/qlge_ethtool.c
+++ b/drivers/net/qlge/qlge_ethtool.c
@@ -29,7 +29,6 @@
 #include <linux/skbuff.h>
 #include <linux/rtnetlink.h>
 #include <linux/if_vlan.h>
-#include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 3af822b6226e..4b2caa6b7ac5 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -36,10 +36,10 @@
 #include <linux/skbuff.h>
 #include <linux/rtnetlink.h>
 #include <linux/if_vlan.h>
-#include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
+#include <net/ip6_checksum.h>
 
 #include "qlge.h"
 
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index bdae2c59a750..c821da21d8eb 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2154,6 +2154,8 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         spin_lock_init(&tp->lock);
 
+        tp->mmio_addr = ioaddr;
+
         rtl_init_mac_address(tp, ioaddr);
 
         /* Get MAC address */
@@ -2186,7 +2188,6 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 #endif
 
         tp->intr_mask = 0xffff;
-        tp->mmio_addr = ioaddr;
         tp->align = cfg->align;
         tp->hw_start = cfg->hw_start;
         tp->intr_event = cfg->intr_event;
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 3805b9318be7..3813d15e2df7 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -3034,7 +3034,8 @@ static int sky2_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
         struct sky2_port *sky2 = netdev_priv(dev);
         struct sky2_hw *hw = sky2->hw;
 
-        if (wol->wolopts & ~sky2_wol_supported(sky2->hw))
+        if ((wol->wolopts & ~sky2_wol_supported(sky2->hw))
+            || !device_can_wakeup(&hw->pdev->dev))
                 return -EOPNOTSUPP;
 
         sky2->wol = wol->wolopts;
@@ -3045,6 +3046,8 @@ static int sky2_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
                 sky2_write32(hw, B0_CTST, sky2->wol
                              ? Y2_HW_WOL_ON : Y2_HW_WOL_OFF);
 
+        device_set_wakeup_enable(&hw->pdev->dev, sky2->wol);
+
         if (!netif_running(dev))
                 sky2_wol_init(sky2);
         return 0;
@@ -4179,18 +4182,6 @@ static int __devinit sky2_test_msi(struct sky2_hw *hw)
         return err;
 }
 
-static int __devinit pci_wake_enabled(struct pci_dev *dev)
-{
-        int pm  = pci_find_capability(dev, PCI_CAP_ID_PM);
-        u16 value;
-
-        if (!pm)
-                return 0;
-        if (pci_read_config_word(dev, pm + PCI_PM_CTRL, &value))
-                return 0;
-        return value & PCI_PM_CTRL_PME_ENABLE;
-}
-
 /*
  * Read and parse the first part of Vital Product Data
  */
@@ -4314,7 +4305,7 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
                 }
         }
 
-        wol_default = pci_wake_enabled(pdev) ? WAKE_MAGIC : 0;
+        wol_default = device_may_wakeup(&pdev->dev) ? WAKE_MAGIC : 0;
 
         err = -ENOMEM;
         hw = kzalloc(sizeof(*hw), GFP_KERNEL);
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 3d19d00e8eec..8aa7460ef0e3 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -685,8 +685,10 @@ static void smc911x_phy_detect(struct net_device *dev)
          * PHY#1 to PHY#31, and then PHY#0 last.
          */
         switch(lp->version) {
-                case 0x115:
-                case 0x117:
+                case CHIP_9115:
+                case CHIP_9117:
+                case CHIP_9215:
+                case CHIP_9217:
                         cfg = SMC_GET_HW_CFG(lp);
                         if (cfg & HW_CFG_EXT_PHY_DET_) {
                                 cfg &= ~HW_CFG_PHY_CLK_SEL_;
diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h
index 2abfc2845198..bf6240f23f5d 100644
--- a/drivers/net/smc911x.h
+++ b/drivers/net/smc911x.h
@@ -666,10 +666,13 @@ smc_pxa_dma_outsl(struct smc911x_local *lp, u_long physaddr,
 #define LAN911X_INTERNAL_PHY_ID         (0x0007C000)
 
 /* Chip ID values */
-#define CHIP_9115       0x115
-#define CHIP_9116       0x116
-#define CHIP_9117       0x117
-#define CHIP_9118       0x118
+#define CHIP_9115       0x0115
+#define CHIP_9116       0x0116
+#define CHIP_9117       0x0117
+#define CHIP_9118       0x0118
+#define CHIP_9215       0x115A
+#define CHIP_9217       0x117A
+#define CHIP_9218       0x118A
 
 struct chip_id {
         u16 id;
@@ -681,6 +684,9 @@ static const struct chip_id chip_ids[] =  {
         { CHIP_9116, "LAN9116" },
         { CHIP_9117, "LAN9117" },
         { CHIP_9118, "LAN9118" },
+        { CHIP_9215, "LAN9215" },
+        { CHIP_9217, "LAN9217" },
+        { CHIP_9218, "LAN9218" },
         { 0, NULL },
 };
 
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index 4980b12b6219..df20cafff7dd 100644
--- a/drivers/net/tc35815.c
+++ b/drivers/net/tc35815.c
@@ -796,7 +796,7 @@ err_out_unregister_bus:
         mdiobus_unregister(lp->mii_bus);
 err_out_free_mdio_irq:
         kfree(lp->mii_bus->irq);
-err_out_free_mii_bus;
+err_out_free_mii_bus:
         mdiobus_free(lp->mii_bus);
 err_out:
         return err;
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index ec871f646766..c41d68761364 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -29,7 +29,8 @@
  *
  *      Tigran Aivazian <tigran@sco.com>:       TLan_PciProbe() now uses
  *                                              new PCI BIOS interface.
- *      Alan Cox        <alan@redhat.com>:      Fixed the out of memory
+ *      Alan Cox        <alan@lxorguk.ukuu.org.uk>:
+ *                                              Fixed the out of memory
  *                                              handling.
  *
  *      Torben Mathiasen <torben.mathiasen@compaq.com> New Maintainer!
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
index fa73e6eed6be..ed50d288e494 100644
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
@@ -25,7 +25,7 @@
  *  To do:
  *    1. Multicast support.
  *
- *  Initial 2.5 cleanup Alan Cox <alan@redhat.com>  2002/10/28
+ *  Initial 2.5 cleanup Alan Cox <alan@lxorguk.ukuu.org.uk>  2002/10/28
  */
 
 #include <linux/module.h>
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index f54c45049d50..124d5d690dde 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -1688,6 +1688,7 @@ static void __devinit de21040_get_mac_address (struct de_private *de)
         unsigned i;
 
         dw32 (ROMCmd, 0);       /* Reset the pointer with a dummy write. */
+        udelay(5);
 
         for (i = 0; i < 6; i++) {
                 int value, boguscnt = 100000;
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index 656200472fa1..8e46a513a252 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -23,7 +23,7 @@
     Marcelo Tosatti <marcelo@conectiva.com.br> :
     Made it compile in 2.3 (device to net_device)
 
-    Alan Cox <alan@redhat.com> :
+    Alan Cox <alan@lxorguk.ukuu.org.uk> :
     Cleaned up for kernel merge.
     Removed the back compatibility support
     Reformatted, fixing spelling etc as I went
@@ -49,7 +49,7 @@
     support.  Updated PCI resource allocation.  Do not
     forget to unmap PCI mapped skbs.
 
-    Alan Cox <alan@redhat.com>
+    Alan Cox <alan@lxorguk.ukuu.org.uk>
     Added new PCI identifiers provided by Clear Zhang at ALi
     for their 1563 ethernet device.
 
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index ad20f96edfa1..2dced383bcfb 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -12,7 +12,7 @@
  *      Scatter gather
  *      More testing
  *
- * The changes are (c) Copyright 2004, Red Hat Inc. <alan@redhat.com>
+ * The changes are (c) Copyright 2004, Red Hat Inc. <alan@lxorguk.ukuu.org.uk>
  * Additional fixes and clean up: Francois Romieu
  *
  * This source has not been verified for use in safety critical systems.
diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index 2ae2ec40015d..21efd99b9294 100644
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -205,7 +205,7 @@ config WANXL_BUILD_FIRMWARE
 
 config PC300
         tristate "Cyclades-PC300 support (RS-232/V.35, X.21, T1/E1 boards)"
-        depends on HDLC && PCI
+        depends on HDLC && PCI && BROKEN
         ---help---
           Driver for the Cyclades-PC300 synchronous communication boards.
 
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index f14051556c87..7f97f8d08c39 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -388,8 +388,8 @@ static int __init cosa_init(void)
                 goto out_chrdev;
         }
         for (i = 0; i < nr_cards; i++)
-                device_create_drvdata(cosa_class, NULL, MKDEV(cosa_major, i),
-                                      NULL, "cosa%d", i);
+                device_create(cosa_class, NULL, MKDEV(cosa_major, i), NULL,
+                              "cosa%d", i);
         err = 0;
         goto out;
 
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index f80640f5a744..d7bb63e616b5 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -122,7 +122,6 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
      * Most functions mess with the structure
      * Disable interrupts while we do the polling
      */
-    spin_lock_irqsave(&sc->lmc_lock, flags);
 
     switch (cmd) {
         /*
@@ -152,6 +151,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
                 break;
         }
 
+        spin_lock_irqsave(&sc->lmc_lock, flags);
         sc->lmc_media->set_status (sc, &ctl);
 
         if(ctl.crc_length != sc->ictl.crc_length) {
@@ -161,6 +161,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
             else
                 sc->TxDescriptControlInit &= ~LMC_TDES_ADD_CRC_DISABLE;
         }
+        spin_unlock_irqrestore(&sc->lmc_lock, flags);
 
         ret = 0;
         break;
@@ -187,15 +188,18 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
                 break;                          /* no change */
             }
             
+            spin_lock_irqsave(&sc->lmc_lock, flags);
             lmc_proto_close(sc);
 
             sc->if_type = new_type;
             lmc_proto_attach(sc);
             ret = lmc_proto_open(sc);
+            spin_unlock_irqrestore(&sc->lmc_lock, flags);
             break;
         }
 
     case LMCIOCGETXINFO: /*fold01*/
+        spin_lock_irqsave(&sc->lmc_lock, flags);
         sc->lmc_xinfo.Magic0 = 0xBEEFCAFE;
 
         sc->lmc_xinfo.PciCardType = sc->lmc_cardtype;
@@ -208,6 +212,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
         sc->lmc_xinfo.MaxFrameSize = LMC_PKT_BUF_SZ;
         sc->lmc_xinfo.link_status = sc->lmc_media->get_link_status (sc);
         sc->lmc_xinfo.mii_reg16 = lmc_mii_readreg (sc, 0, 16);
+        spin_unlock_irqrestore(&sc->lmc_lock, flags);
 
         sc->lmc_xinfo.Magic1 = 0xDEADBEEF;
 
@@ -220,6 +225,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
         break;
 
     case LMCIOCGETLMCSTATS:
+            spin_lock_irqsave(&sc->lmc_lock, flags);
             if (sc->lmc_cardtype == LMC_CARDTYPE_T1) {
                     lmc_mii_writereg(sc, 0, 17, T1FRAMER_FERR_LSB);
                     sc->extra_stats.framingBitErrorCount +=
@@ -243,6 +249,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
                     sc->extra_stats.severelyErroredFrameCount +=
                             regVal & T1FRAMER_SEF_MASK;
             }
+            spin_unlock_irqrestore(&sc->lmc_lock, flags);
             if (copy_to_user(ifr->ifr_data, &sc->lmc_device->stats,
                              sizeof(sc->lmc_device->stats)) ||
                 copy_to_user(ifr->ifr_data + sizeof(sc->lmc_device->stats),
@@ -258,12 +265,14 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
                     break;
             }
 
+            spin_lock_irqsave(&sc->lmc_lock, flags);
             memset(&sc->lmc_device->stats, 0, sizeof(sc->lmc_device->stats));
             memset(&sc->extra_stats, 0, sizeof(sc->extra_stats));
             sc->extra_stats.check = STATCHECK;
             sc->extra_stats.version_size = (DRIVER_VERSION << 16) +
                     sizeof(sc->lmc_device->stats) + sizeof(sc->extra_stats);
             sc->extra_stats.lmc_cardtype = sc->lmc_cardtype;
+            spin_unlock_irqrestore(&sc->lmc_lock, flags);
             ret = 0;
             break;
 
@@ -282,8 +291,10 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
                 ret = -EFAULT;
                 break;
         }
+        spin_lock_irqsave(&sc->lmc_lock, flags);
         sc->lmc_media->set_circuit_type(sc, ctl.circuit_type);
         sc->ictl.circuit_type = ctl.circuit_type;
+        spin_unlock_irqrestore(&sc->lmc_lock, flags);
         ret = 0;
 
         break;
@@ -294,12 +305,14 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
             break;
         }
 
+        spin_lock_irqsave(&sc->lmc_lock, flags);
         /* Reset driver and bring back to current state */
         printk (" REG16 before reset +%04x\n", lmc_mii_readreg (sc, 0, 16));
         lmc_running_reset (dev);
         printk (" REG16 after reset +%04x\n", lmc_mii_readreg (sc, 0, 16));
 
         LMC_EVENT_LOG(LMC_EVENT_FORCEDRESET, LMC_CSR_READ (sc, csr_status), lmc_mii_readreg (sc, 0, 16));
+        spin_unlock_irqrestore(&sc->lmc_lock, flags);
 
         ret = 0;
         break;
@@ -338,14 +351,15 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
              */
             netif_stop_queue(dev);
 
-        if (copy_from_user(&xc, ifr->ifr_data, sizeof(struct lmc_xilinx_control))) {
+            if (copy_from_user(&xc, ifr->ifr_data, sizeof(struct lmc_xilinx_control))) {
                 ret = -EFAULT;
                 break;
-        }
+            }
             switch(xc.command){
             case lmc_xilinx_reset: /*fold02*/
                 {
                     u16 mii;
+                    spin_lock_irqsave(&sc->lmc_lock, flags);
                     mii = lmc_mii_readreg (sc, 0, 16);
 
                     /*
@@ -404,6 +418,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
                             lmc_led_off(sc, LMC_DS3_LED2);
                         }
                     }
+                    spin_unlock_irqrestore(&sc->lmc_lock, flags);
                     
                     
 
@@ -416,6 +431,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
                 {
                     u16 mii;
                     int timeout = 500000;
+                    spin_lock_irqsave(&sc->lmc_lock, flags);
                     mii = lmc_mii_readreg (sc, 0, 16);
 
                     /*
@@ -451,13 +467,14 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
                      */
                     while( (LMC_CSR_READ(sc, csr_gp) & LMC_GEP_INIT) == 0 &&
                            (timeout-- > 0))
-                        ;
+                        cpu_relax();
 
 
                     /*
                      * stop driving Xilinx-related signals
                      */
                     lmc_gpio_mkinput(sc, 0xff);
+                    spin_unlock_irqrestore(&sc->lmc_lock, flags);
 
                     ret = 0x0;
                     
@@ -493,6 +510,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
 
                     printk("%s: Starting load of data Len: %d at 0x%p == 0x%p\n", dev->name, xc.len, xc.data, data);
 
+                    spin_lock_irqsave(&sc->lmc_lock, flags);
                     lmc_gpio_mkinput(sc, 0xff);
 
                     /*
@@ -545,7 +563,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
                      */
                     while( (LMC_CSR_READ(sc, csr_gp) & LMC_GEP_INIT) == 0 &&
                            (timeout-- > 0))
-                        ;
+                        cpu_relax();
 
                     printk(KERN_DEBUG "%s: Waited %d for the Xilinx to clear it's memory\n", dev->name, 500000-timeout);
 
@@ -588,6 +606,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
 
                     sc->lmc_miireg16 &= ~LMC_MII16_FIFO_RESET;
                     lmc_mii_writereg(sc, 0, 16, sc->lmc_miireg16);
+                    spin_unlock_irqrestore(&sc->lmc_lock, flags);
 
                     kfree(data);
                     
@@ -611,8 +630,6 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
         break;
     }
 
-    spin_unlock_irqrestore(&sc->lmc_lock, flags); /*fold01*/
-
     lmc_trace(dev, "lmc_ioctl out");
 
     return ret;
diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
index 243bd8d918fe..ccd9cd35ecbe 100644
--- a/drivers/net/wan/z85230.c
+++ b/drivers/net/wan/z85230.c
@@ -18,7 +18,8 @@
  *      DMA now uses get_free_page as kmalloc buffers may span a 64K 
  *      boundary.
  *
- *      Modified for SMP safety and SMP locking by Alan Cox <alan@redhat.com>
+ *      Modified for SMP safety and SMP locking by Alan Cox
+ *                                      <alan@lxorguk.ukuu.org.uk>
  *
  *      Performance
  *
diff --git a/drivers/net/wan/z85230.h b/drivers/net/wan/z85230.h
index 4f372396c512..85b3e785d484 100644
--- a/drivers/net/wan/z85230.h
+++ b/drivers/net/wan/z85230.h
@@ -2,7 +2,7 @@
  *      Description of Z8530 Z85C30 and Z85230 communications chips
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
- * Copyright (C) 1998 Alan Cox <alan@redhat.com>
+ * Copyright (C) 1998 Alan Cox <alan@lxorguk.ukuu.org.uk>
  */
 
 #ifndef _Z8530_H
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index fd72e427cb28..27696c20f4c2 100644
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -206,126 +206,123 @@ static void airo_detach(struct pcmcia_device *link)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
+static int airo_cs_config_check(struct pcmcia_device *p_dev,
+                                cistpl_cftable_entry_t *cfg,
+                                cistpl_cftable_entry_t *dflt,
+                                unsigned int vcc,
+                                void *priv_data)
+{
+        win_req_t *req = priv_data;
+
+        if (cfg->index == 0)
+                return -ENODEV;
+
+        /* Does this card need audio output? */
+        if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
+                p_dev->conf.Attributes |= CONF_ENABLE_SPKR;
+                p_dev->conf.Status = CCSR_AUDIO_ENA;
+        }
+
+        /* Use power settings for Vcc and Vpp if present */
+        /*  Note that the CIS values need to be rescaled */
+        if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
+        else if (dflt->vpp1.present & (1<<CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM]/10000;
+
+        /* Do we need to allocate an interrupt? */
+        if (cfg->irq.IRQInfo1 || dflt->irq.IRQInfo1)
+                p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
+
+        /* IO window settings */
+        p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
+        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
+                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+                if (!(io->flags & CISTPL_IO_8BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+                if (!(io->flags & CISTPL_IO_16BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                p_dev->io.BasePort1 = io->win[0].base;
+                p_dev->io.NumPorts1 = io->win[0].len;
+                if (io->nwin > 1) {
+                        p_dev->io.Attributes2 = p_dev->io.Attributes1;
+                        p_dev->io.BasePort2 = io->win[1].base;
+                        p_dev->io.NumPorts2 = io->win[1].len;
+                }
+        }
+
+        /* This reserves IO space but doesn't actually enable it */
+        if (pcmcia_request_io(p_dev, &p_dev->io) != 0)
+                return -ENODEV;
+
+        /*
+          Now set up a common memory window, if needed.  There is room
+          in the struct pcmcia_device structure for one memory window handle,
+          but if the base addresses need to be saved, or if multiple
+          windows are needed, the info should go in the private data
+          structure for this device.
+
+          Note that the memory window base is a physical address, and
+          needs to be mapped to virtual space with ioremap() before it
+          is used.
+        */
+        if ((cfg->mem.nwin > 0) || (dflt->mem.nwin > 0)) {
+                cistpl_mem_t *mem = (cfg->mem.nwin) ? &cfg->mem : &dflt->mem;
+                memreq_t map;
+                req->Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM;
+                req->Base = mem->win[0].host_addr;
+                req->Size = mem->win[0].len;
+                req->AccessSpeed = 0;
+                if (pcmcia_request_window(&p_dev, req, &p_dev->win) != 0)
+                        return -ENODEV;
+                map.Page = 0;
+                map.CardOffset = mem->win[0].card_addr;
+                if (pcmcia_map_mem_page(p_dev->win, &map) != 0)
+                        return -ENODEV;
+        }
+        /* If we got this far, we're cool! */
+        return 0;
+}
+
+
 static int airo_config(struct pcmcia_device *link)
 {
-        tuple_t tuple;
-        cisparse_t parse;
         local_info_t *dev;
+        win_req_t *req;
         int last_fn, last_ret;
-        u_char buf[64];
-        win_req_t req;
-        memreq_t map;
 
         dev = link->priv;
 
         DEBUG(0, "airo_config(0x%p)\n", link);
 
+        req = kzalloc(sizeof(win_req_t), GFP_KERNEL);
+        if (!req)
+                return -ENOMEM;
+
+        /*
+         * In this loop, we scan the CIS for configuration table
+         * entries, each of which describes a valid card
+         * configuration, including voltage, IO window, memory window,
+         * and interrupt settings.
+         *
+         * We make no assumptions about the card to be configured: we
+         * use just the information available in the CIS.  In an ideal
+         * world, this would work for any PCMCIA card, but it requires
+         * a complete and accurate CIS.  In practice, a driver usually
+         * "knows" most of these things without consulting the CIS,
+         * and most client drivers will only use the CIS to fill in
+         * implementation-defined details.
+         */
+        last_ret = pcmcia_loop_config(link, airo_cs_config_check, req);
+        if (last_ret)
+                goto failed;
+
         /*
-          In this loop, we scan the CIS for configuration table entries,
-          each of which describes a valid card configuration, including
-          voltage, IO window, memory window, and interrupt settings.
-          
-          We make no assumptions about the card to be configured: we use
-          just the information available in the CIS.  In an ideal world,
-          this would work for any PCMCIA card, but it requires a complete
-          and accurate CIS.  In practice, a driver usually "knows" most of
-          these things without consulting the CIS, and most client drivers
-          will only use the CIS to fill in implementation-defined details.
+          Allocate an interrupt line.  Note that this does not assign a
+          handler to the interrupt, unless the 'Handler' member of the
+          irq structure is initialized.
         */
-        tuple.Attributes = 0;
-        tuple.TupleData = buf;
-        tuple.TupleDataMax = sizeof(buf);
-        tuple.TupleOffset = 0;
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-        while (1) {
-                cistpl_cftable_entry_t dflt = { 0 };
-                cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
-                if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
-                                pcmcia_parse_tuple(link, &tuple, &parse) != 0)
-                        goto next_entry;
-                
-                if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg;
-                if (cfg->index == 0) goto next_entry;
-                link->conf.ConfigIndex = cfg->index;
-                
-                /* Does this card need audio output? */
-                if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
-                        link->conf.Attributes |= CONF_ENABLE_SPKR;
-                        link->conf.Status = CCSR_AUDIO_ENA;
-                }
-                
-                /* Use power settings for Vcc and Vpp if present */
-                /*  Note that the CIS values need to be rescaled */
-                if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                                cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
-                else if (dflt.vpp1.present & (1<<CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                                dflt.vpp1.param[CISTPL_POWER_VNOM]/10000;
-                
-                /* Do we need to allocate an interrupt? */
-                if (cfg->irq.IRQInfo1 || dflt.irq.IRQInfo1)
-                        link->conf.Attributes |= CONF_ENABLE_IRQ;
-                
-                /* IO window settings */
-                link->io.NumPorts1 = link->io.NumPorts2 = 0;
-                if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
-                        cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io;
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-                        if (!(io->flags & CISTPL_IO_8BIT))
-                                link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
-                        if (!(io->flags & CISTPL_IO_16BIT))
-                                link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-                        link->io.BasePort1 = io->win[0].base;
-                        link->io.NumPorts1 = io->win[0].len;
-                        if (io->nwin > 1) {
-                                link->io.Attributes2 = link->io.Attributes1;
-                                link->io.BasePort2 = io->win[1].base;
-                                link->io.NumPorts2 = io->win[1].len;
-                        }
-                }
-                
-                /* This reserves IO space but doesn't actually enable it */
-                if (pcmcia_request_io(link, &link->io) != 0)
-                        goto next_entry;
-                
-                /*
-                  Now set up a common memory window, if needed.  There is room
-                  in the struct pcmcia_device structure for one memory window handle,
-                  but if the base addresses need to be saved, or if multiple
-                  windows are needed, the info should go in the private data
-                  structure for this device.
-                  
-                  Note that the memory window base is a physical address, and
-                  needs to be mapped to virtual space with ioremap() before it
-                  is used.
-                */
-                if ((cfg->mem.nwin > 0) || (dflt.mem.nwin > 0)) {
-                        cistpl_mem_t *mem =
-                                (cfg->mem.nwin) ? &cfg->mem : &dflt.mem;
-                        req.Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM;
-                        req.Base = mem->win[0].host_addr;
-                        req.Size = mem->win[0].len;
-                        req.AccessSpeed = 0;
-                        if (pcmcia_request_window(&link, &req, &link->win) != 0)
-                                goto next_entry;
-                        map.Page = 0; map.CardOffset = mem->win[0].card_addr;
-                        if (pcmcia_map_mem_page(link->win, &map) != 0)
-                                goto next_entry;
-                }
-                /* If we got this far, we're cool! */
-                break;
-                
-        next_entry:
-                CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
-        }
-        
-    /*
-      Allocate an interrupt line.  Note that this does not assign a
-      handler to the interrupt, unless the 'Handler' member of the
-      irq structure is initialized.
-    */
         if (link->conf.Attributes & CONF_ENABLE_IRQ)
                 CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
         
@@ -362,14 +359,17 @@ static int airo_config(struct pcmcia_device *link)
                 printk(" & 0x%04x-0x%04x", link->io.BasePort2,
                        link->io.BasePort2+link->io.NumPorts2-1);
         if (link->win)
-                printk(", mem 0x%06lx-0x%06lx", req.Base,
-                       req.Base+req.Size-1);
+                printk(", mem 0x%06lx-0x%06lx", req->Base,
+                       req->Base+req->Size-1);
         printk("\n");
+        kfree(req);
         return 0;
 
  cs_failed:
         cs_error(link, last_fn, last_ret);
+ failed:
         airo_release(link);
+        kfree(req);
         return -ENODEV;
 } /* airo_config */
 
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index 74726990d59e..f05f584ab7bc 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -1640,6 +1640,11 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw,
         return ret;
 }
 
+static int ath9k_no_fragmentation(struct ieee80211_hw *hw, u32 value)
+{
+        return -EOPNOTSUPP;
+}
+
 static struct ieee80211_ops ath9k_ops = {
         .tx                 = ath9k_tx,
         .start              = ath9k_start,
@@ -1664,7 +1669,8 @@ static struct ieee80211_ops ath9k_ops = {
         .get_tsf            = ath9k_get_tsf,
         .reset_tsf          = ath9k_reset_tsf,
         .tx_last_beacon     = NULL,
-        .ampdu_action       = ath9k_ampdu_action
+        .ampdu_action       = ath9k_ampdu_action,
+        .set_frag_threshold = ath9k_no_fragmentation,
 };
 
 static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index d2388e8d179a..77406245dc7b 100644
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -224,13 +224,58 @@ static int card_present(void *arg)
         return 0;
 }
 
+static int atmel_config_check(struct pcmcia_device *p_dev,
+                              cistpl_cftable_entry_t *cfg,
+                              cistpl_cftable_entry_t *dflt,
+                              unsigned int vcc,
+                              void *priv_data)
+{
+        if (cfg->index == 0)
+                return -ENODEV;
+
+        /* Does this card need audio output? */
+        if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
+                p_dev->conf.Attributes |= CONF_ENABLE_SPKR;
+                p_dev->conf.Status = CCSR_AUDIO_ENA;
+        }
+
+        /* Use power settings for Vcc and Vpp if present */
+        /*  Note that the CIS values need to be rescaled */
+        if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
+        else if (dflt->vpp1.present & (1<<CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM]/10000;
+
+        /* Do we need to allocate an interrupt? */
+        if (cfg->irq.IRQInfo1 || dflt->irq.IRQInfo1)
+                p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
+
+        /* IO window settings */
+        p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
+        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
+                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+                if (!(io->flags & CISTPL_IO_8BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+                if (!(io->flags & CISTPL_IO_16BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                p_dev->io.BasePort1 = io->win[0].base;
+                p_dev->io.NumPorts1 = io->win[0].len;
+                if (io->nwin > 1) {
+                        p_dev->io.Attributes2 = p_dev->io.Attributes1;
+                        p_dev->io.BasePort2 = io->win[1].base;
+                        p_dev->io.NumPorts2 = io->win[1].len;
+                }
+        }
+
+        /* This reserves IO space but doesn't actually enable it */
+        return pcmcia_request_io(p_dev, &p_dev->io);
+}
+
 static int atmel_config(struct pcmcia_device *link)
 {
-        tuple_t tuple;
-        cisparse_t parse;
         local_info_t *dev;
         int last_fn, last_ret;
-        u_char buf[64];
         struct pcmcia_device_id *did;
 
         dev = link->priv;
@@ -238,11 +283,6 @@ static int atmel_config(struct pcmcia_device *link)
 
         DEBUG(0, "atmel_config(0x%p)\n", link);
 
-        tuple.Attributes = 0;
-        tuple.TupleData = buf;
-        tuple.TupleDataMax = sizeof(buf);
-        tuple.TupleOffset = 0;
-
         /*
           In this loop, we scan the CIS for configuration table entries,
           each of which describes a valid card configuration, including
@@ -255,66 +295,8 @@ static int atmel_config(struct pcmcia_device *link)
           these things without consulting the CIS, and most client drivers
           will only use the CIS to fill in implementation-defined details.
         */
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-        while (1) {
-                cistpl_cftable_entry_t dflt = { 0 };
-                cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
-                if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
-                                pcmcia_parse_tuple(link, &tuple, &parse) != 0)
-                        goto next_entry;
-
-                if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg;
-                if (cfg->index == 0) goto next_entry;
-                link->conf.ConfigIndex = cfg->index;
-
-                /* Does this card need audio output? */
-                if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
-                        link->conf.Attributes |= CONF_ENABLE_SPKR;
-                        link->conf.Status = CCSR_AUDIO_ENA;
-                }
-
-                /* Use power settings for Vcc and Vpp if present */
-                /*  Note that the CIS values need to be rescaled */
-                if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                                cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
-                else if (dflt.vpp1.present & (1<<CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                                dflt.vpp1.param[CISTPL_POWER_VNOM]/10000;
-
-                /* Do we need to allocate an interrupt? */
-                if (cfg->irq.IRQInfo1 || dflt.irq.IRQInfo1)
-                        link->conf.Attributes |= CONF_ENABLE_IRQ;
-
-                /* IO window settings */
-                link->io.NumPorts1 = link->io.NumPorts2 = 0;
-                if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
-                        cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io;
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-                        if (!(io->flags & CISTPL_IO_8BIT))
-                                link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
-                        if (!(io->flags & CISTPL_IO_16BIT))
-                                link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-                        link->io.BasePort1 = io->win[0].base;
-                        link->io.NumPorts1 = io->win[0].len;
-                        if (io->nwin > 1) {
-                                link->io.Attributes2 = link->io.Attributes1;
-                                link->io.BasePort2 = io->win[1].base;
-                                link->io.NumPorts2 = io->win[1].len;
-                        }
-                }
-
-                /* This reserves IO space but doesn't actually enable it */
-                if (pcmcia_request_io(link, &link->io) != 0)
-                        goto next_entry;
-
-                /* If we got this far, we're cool! */
-                break;
-
-        next_entry:
-                CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
-        }
+        if (pcmcia_loop_config(link, atmel_config_check, NULL))
+                goto failed;
 
         /*
           Allocate an interrupt line.  Note that this does not assign a
@@ -360,6 +342,7 @@ static int atmel_config(struct pcmcia_device *link)
 
  cs_failed:
         cs_error(link, last_fn, last_ret);
+ failed:
         atmel_release(link);
         return -ENODEV;
 }
diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c
index b8aa16307f79..3cfc30307a27 100644
--- a/drivers/net/wireless/b43/pcmcia.c
+++ b/drivers/net/wireless/b43/pcmcia.c
@@ -82,13 +82,13 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
         tuple.TupleOffset = 0;
 
         res = pcmcia_get_first_tuple(dev, &tuple);
-        if (res != CS_SUCCESS)
+        if (res != 0)
                 goto err_kfree_ssb;
         res = pcmcia_get_tuple_data(dev, &tuple);
-        if (res != CS_SUCCESS)
+        if (res != 0)
                 goto err_kfree_ssb;
-        res = pcmcia_parse_tuple(dev, &tuple, &parse);
-        if (res != CS_SUCCESS)
+        res = pcmcia_parse_tuple(&tuple, &parse);
+        if (res != 0)
                 goto err_kfree_ssb;
 
         dev->conf.ConfigBase = parse.config.base;
@@ -107,13 +107,13 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
         win.Size = SSB_CORE_SIZE;
         win.AccessSpeed = 250;
         res = pcmcia_request_window(&dev, &win, &dev->win);
-        if (res != CS_SUCCESS)
+        if (res != 0)
                 goto err_kfree_ssb;
 
         mem.CardOffset = 0;
         mem.Page = 0;
         res = pcmcia_map_mem_page(dev->win, &mem);
-        if (res != CS_SUCCESS)
+        if (res != 0)
                 goto err_disable;
 
         dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
@@ -121,11 +121,11 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
         dev->irq.Handler = NULL; /* The handler is registered later. */
         dev->irq.Instance = NULL;
         res = pcmcia_request_irq(dev, &dev->irq);
-        if (res != CS_SUCCESS)
+        if (res != 0)
                 goto err_disable;
 
         res = pcmcia_request_configuration(dev, &dev->conf);
-        if (res != CS_SUCCESS)
+        if (res != 0)
                 goto err_disable;
 
         err = ssb_bus_pcmciabus_register(ssb, dev, win.Base);
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 3b4e55cf33cd..633740277352 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -234,7 +234,7 @@ static void sandisk_set_iobase(local_info_t *local)
         reg.Value = hw_priv->link->io.BasePort1 & 0x00ff;
         res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                 printk(KERN_DEBUG "Prism3 SanDisk - failed to set I/O base 0 -"
                        " res=%d\n", res);
         }
@@ -246,7 +246,7 @@ static void sandisk_set_iobase(local_info_t *local)
         reg.Value = (hw_priv->link->io.BasePort1 & 0xff00) >> 8;
         res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                 printk(KERN_DEBUG "Prism3 SanDisk - failed to set I/O base 1 -"
                        " res=%d\n", res);
         }
@@ -305,7 +305,7 @@ static int sandisk_enable_wireless(struct net_device *dev)
         tuple.DesiredTuple = CISTPL_LONGLINK_MFC;
         if (pcmcia_get_first_tuple(hw_priv->link, &tuple) ||
             pcmcia_get_tuple_data(hw_priv->link, &tuple) ||
-            pcmcia_parse_tuple(hw_priv->link, &tuple, parse) ||
+            pcmcia_parse_tuple(&tuple, parse) ||
                 parse->longlink_mfc.nfn < 2) {
                 /* No multi-function links found */
                 ret = -ENODEV;
@@ -322,7 +322,7 @@ static int sandisk_enable_wireless(struct net_device *dev)
         reg.Value = COR_SOFT_RESET;
         res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                 printk(KERN_DEBUG "%s: SanDisk - COR sreset failed (%d)\n",
                        dev->name, res);
                 goto done;
@@ -339,7 +339,7 @@ static int sandisk_enable_wireless(struct net_device *dev)
         reg.Value = COR_LEVEL_REQ | 0x8 | COR_ADDR_DECODE | COR_FUNC_ENA;
         res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                 printk(KERN_DEBUG "%s: SanDisk - COR sreset failed (%d)\n",
                        dev->name, res);
                 goto done;
@@ -374,7 +374,7 @@ static void prism2_pccard_cor_sreset(local_info_t *local)
         reg.Value = 0;
         res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                 printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 1 (%d)\n",
                        res);
                 return;
@@ -386,7 +386,7 @@ static void prism2_pccard_cor_sreset(local_info_t *local)
         reg.Value |= COR_SOFT_RESET;
         res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                 printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 2 (%d)\n",
                        res);
                 return;
@@ -399,7 +399,7 @@ static void prism2_pccard_cor_sreset(local_info_t *local)
                 reg.Value |= COR_IREQ_ENA;
         res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                 printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 3 (%d)\n",
                        res);
                 return;
@@ -433,7 +433,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
         reg.Value = 0;
         res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                 printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 1 "
                        "(%d)\n", res);
                 return;
@@ -446,7 +446,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
         reg.Value |= COR_SOFT_RESET;
         res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                 printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 2 "
                        "(%d)\n", res);
                 return;
@@ -460,7 +460,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
         reg.Offset = CISREG_CCSR;
         res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                 printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 3 "
                        "(%d)\n", res);
                 return;
@@ -472,7 +472,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
         reg.Value = old_cor & ~COR_SOFT_RESET;
         res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                 printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 4 "
                        "(%d)\n", res);
                 return;
@@ -532,145 +532,118 @@ static void prism2_detach(struct pcmcia_device *link)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
-#define CFG_CHECK2(fn, retf) \
-do { int _ret = (retf); \
-if (_ret != 0) { \
-        PDEBUG(DEBUG_EXTRA, "CardServices(" #fn ") returned %d\n", _ret); \
-        cs_error(link, fn, _ret); \
-        goto next_entry; \
-} \
-} while (0)
-
 
 /* run after a CARD_INSERTION event is received to configure the PCMCIA
  * socket and make the device available to the system */
+
+static int prism2_config_check(struct pcmcia_device *p_dev,
+                               cistpl_cftable_entry_t *cfg,
+                               cistpl_cftable_entry_t *dflt,
+                               unsigned int vcc,
+                               void *priv_data)
+{
+        if (cfg->index == 0)
+                return -ENODEV;
+
+        PDEBUG(DEBUG_EXTRA, "Checking CFTABLE_ENTRY 0x%02X "
+               "(default 0x%02X)\n", cfg->index, dflt->index);
+
+        /* Does this card need audio output? */
+        if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
+                p_dev->conf.Attributes |= CONF_ENABLE_SPKR;
+                p_dev->conf.Status = CCSR_AUDIO_ENA;
+        }
+
+        /* Use power settings for Vcc and Vpp if present */
+        /*  Note that the CIS values need to be rescaled */
+        if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM] /
+                    10000 && !ignore_cis_vcc) {
+                        PDEBUG(DEBUG_EXTRA, "  Vcc mismatch - skipping"
+                               " this entry\n");
+                        return -ENODEV;
+                }
+        } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] /
+                    10000 && !ignore_cis_vcc) {
+                        PDEBUG(DEBUG_EXTRA, "  Vcc (default) mismatch "
+                               "- skipping this entry\n");
+                        return -ENODEV;
+                }
+        }
+
+        if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+        else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+
+        /* Do we need to allocate an interrupt? */
+        if (cfg->irq.IRQInfo1 || dflt->irq.IRQInfo1)
+                p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
+        else if (!(p_dev->conf.Attributes & CONF_ENABLE_IRQ)) {
+                /* At least Compaq WL200 does not have IRQInfo1 set,
+                 * but it does not work without interrupts.. */
+                printk(KERN_WARNING "Config has no IRQ info, but trying to "
+                       "enable IRQ anyway..\n");
+                p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
+        }
+
+        /* IO window settings */
+        PDEBUG(DEBUG_EXTRA, "IO window settings: cfg->io.nwin=%d "
+               "dflt->io.nwin=%d\n",
+               cfg->io.nwin, dflt->io.nwin);
+        p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
+        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
+                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+                PDEBUG(DEBUG_EXTRA, "io->flags = 0x%04X, "
+                       "io.base=0x%04x, len=%d\n", io->flags,
+                       io->win[0].base, io->win[0].len);
+                if (!(io->flags & CISTPL_IO_8BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+                if (!(io->flags & CISTPL_IO_16BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                p_dev->io.IOAddrLines = io->flags &
+                        CISTPL_IO_LINES_MASK;
+                p_dev->io.BasePort1 = io->win[0].base;
+                p_dev->io.NumPorts1 = io->win[0].len;
+                if (io->nwin > 1) {
+                        p_dev->io.Attributes2 = p_dev->io.Attributes1;
+                        p_dev->io.BasePort2 = io->win[1].base;
+                        p_dev->io.NumPorts2 = io->win[1].len;
+                }
+        }
+
+        /* This reserves IO space but doesn't actually enable it */
+        return pcmcia_request_io(p_dev, &p_dev->io);
+}
+
 static int prism2_config(struct pcmcia_device *link)
 {
         struct net_device *dev;
         struct hostap_interface *iface;
         local_info_t *local;
         int ret = 1;
-        tuple_t tuple;
-        cisparse_t *parse;
         int last_fn, last_ret;
-        u_char buf[64];
-        config_info_t conf;
-        cistpl_cftable_entry_t dflt = { 0 };
         struct hostap_cs_priv *hw_priv;
 
         PDEBUG(DEBUG_FLOW, "prism2_config()\n");
 
-        parse = kmalloc(sizeof(cisparse_t), GFP_KERNEL);
         hw_priv = kzalloc(sizeof(*hw_priv), GFP_KERNEL);
-        if (parse == NULL || hw_priv == NULL) {
+        if (hw_priv == NULL) {
                 ret = -ENOMEM;
                 goto failed;
         }
 
-        tuple.Attributes = 0;
-        tuple.TupleData = buf;
-        tuple.TupleDataMax = sizeof(buf);
-        tuple.TupleOffset = 0;
-
-        CS_CHECK(GetConfigurationInfo,
-                 pcmcia_get_configuration_info(link, &conf));
-
         /* Look for an appropriate configuration table entry in the CIS */
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-        for (;;) {
-                cistpl_cftable_entry_t *cfg = &(parse->cftable_entry);
-                CFG_CHECK2(GetTupleData,
-                           pcmcia_get_tuple_data(link, &tuple));
-                CFG_CHECK2(ParseTuple,
-                           pcmcia_parse_tuple(link, &tuple, parse));
-
-                if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
-                        dflt = *cfg;
-                if (cfg->index == 0)
-                        goto next_entry;
-                link->conf.ConfigIndex = cfg->index;
-                PDEBUG(DEBUG_EXTRA, "Checking CFTABLE_ENTRY 0x%02X "
-                       "(default 0x%02X)\n", cfg->index, dflt.index);
-
-                /* Does this card need audio output? */
-                if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
-                        link->conf.Attributes |= CONF_ENABLE_SPKR;
-                        link->conf.Status = CCSR_AUDIO_ENA;
-                }
-
-                /* Use power settings for Vcc and Vpp if present */
-                /*  Note that the CIS values need to be rescaled */
-                if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                        if (conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM] /
-                            10000 && !ignore_cis_vcc) {
-                                PDEBUG(DEBUG_EXTRA, "  Vcc mismatch - skipping"
-                                       " this entry\n");
-                                goto next_entry;
-                        }
-                } else if (dflt.vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                        if (conf.Vcc != dflt.vcc.param[CISTPL_POWER_VNOM] /
-                            10000 && !ignore_cis_vcc) {
-                                PDEBUG(DEBUG_EXTRA, "  Vcc (default) mismatch "
-                                       "- skipping this entry\n");
-                                goto next_entry;
-                        }
-                }
-
-                if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                                cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
-                else if (dflt.vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                                dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;
-
-                /* Do we need to allocate an interrupt? */
-                if (cfg->irq.IRQInfo1 || dflt.irq.IRQInfo1)
-                        link->conf.Attributes |= CONF_ENABLE_IRQ;
-                else if (!(link->conf.Attributes & CONF_ENABLE_IRQ)) {
-                        /* At least Compaq WL200 does not have IRQInfo1 set,
-                         * but it does not work without interrupts.. */
-                        printk("Config has no IRQ info, but trying to enable "
-                               "IRQ anyway..\n");
-                        link->conf.Attributes |= CONF_ENABLE_IRQ;
-                }
-
-                /* IO window settings */
-                PDEBUG(DEBUG_EXTRA, "IO window settings: cfg->io.nwin=%d "
-                       "dflt.io.nwin=%d\n",
-                       cfg->io.nwin, dflt.io.nwin);
-                link->io.NumPorts1 = link->io.NumPorts2 = 0;
-                if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
-                        cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io;
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-                        PDEBUG(DEBUG_EXTRA, "io->flags = 0x%04X, "
-                               "io.base=0x%04x, len=%d\n", io->flags,
-                               io->win[0].base, io->win[0].len);
-                        if (!(io->flags & CISTPL_IO_8BIT))
-                                link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
-                        if (!(io->flags & CISTPL_IO_16BIT))
-                                link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-                        link->io.IOAddrLines = io->flags &
-                                CISTPL_IO_LINES_MASK;
-                        link->io.BasePort1 = io->win[0].base;
-                        link->io.NumPorts1 = io->win[0].len;
-                        if (io->nwin > 1) {
-                                link->io.Attributes2 = link->io.Attributes1;
-                                link->io.BasePort2 = io->win[1].base;
-                                link->io.NumPorts2 = io->win[1].len;
-                        }
-                }
-
-                /* This reserves IO space but doesn't actually enable it */
-                CFG_CHECK2(RequestIO,
-                           pcmcia_request_io(link, &link->io));
-
-                /* This configuration table entry is OK */
-                break;
-
-        next_entry:
-                CS_CHECK(GetNextTuple,
-                         pcmcia_get_next_tuple(link, &tuple));
+        last_ret = pcmcia_loop_config(link, prism2_config_check, NULL);
+        if (last_ret) {
+                if (!ignore_cis_vcc)
+                        printk(KERN_ERR "GetNextTuple(): No matching "
+                               "CIS configuration.  Maybe you need the "
+                               "ignore_cis_vcc=1 parameter.\n");
+                cs_error(link, RequestIO, last_ret);
+                goto failed;
         }
 
         /* Need to allocate net_device before requesting IRQ handler */
@@ -738,14 +711,12 @@ static int prism2_config(struct pcmcia_device *link)
                 if (ret == 0 && local->ddev)
                         strcpy(hw_priv->node.dev_name, local->ddev->name);
         }
-        kfree(parse);
         return ret;
 
  cs_failed:
         cs_error(link, last_fn, last_ret);
 
  failed:
-        kfree(parse);
         kfree(hw_priv);
         prism2_release((u_long)link);
         return ret;
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index f6003e7996af..5155b8a760a7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -833,12 +833,12 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv)
         switch (priv->hw_rev & CSR_HW_REV_TYPE_MSK) {
         case CSR_HW_REV_TYPE_5100:
         case CSR_HW_REV_TYPE_5300:
-                /* 5X00 wants in Celsius */
+        case CSR_HW_REV_TYPE_5350:
+                /* 5X00 and 5350 wants in Celsius */
                 priv->hw_params.ct_kill_threshold = CT_KILL_THRESHOLD;
                 break;
         case CSR_HW_REV_TYPE_5150:
-        case CSR_HW_REV_TYPE_5350:
-                /* 5X50 wants in Kelvin */
+                /* 5150 wants in Kelvin */
                 priv->hw_params.ct_kill_threshold =
                                 CELSIUS_TO_KELVIN(CT_KILL_THRESHOLD);
                 break;
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index 93944de923ca..e2a58e477036 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
@@ -2422,7 +2422,7 @@ static void rs_free_sta(void *priv_r, struct ieee80211_sta *sta,
                         void *priv_sta)
 {
         struct iwl_lq_sta *lq_sta = priv_sta;
-        struct iwl_priv *priv = priv_r;
+        struct iwl_priv *priv __maybe_unused = priv_r;
 
         IWL_DEBUG_RATE("enter\n");
         kfree(lq_sta);
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index a912fb68c099..297696de2da0 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -823,7 +823,9 @@ int lbs_update_channel(struct lbs_private *priv)
 int lbs_set_channel(struct lbs_private *priv, u8 channel)
 {
         struct cmd_ds_802_11_rf_channel cmd;
+#ifdef DEBUG
         u8 old_channel = priv->curbssparams.channel;
+#endif
         int ret = 0;
 
         lbs_deb_enter(LBS_DEB_CMD);
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
index e3505c110af6..842a08d1f106 100644
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
@@ -791,7 +791,7 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
         tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
         if ((ret = pcmcia_get_first_tuple(p_dev, &tuple)) != 0 ||
             (ret = pcmcia_get_tuple_data(p_dev, &tuple)) != 0 ||
-            (ret = pcmcia_parse_tuple(p_dev, &tuple, &parse)) != 0)
+            (ret = pcmcia_parse_tuple(&tuple, &parse)) != 0)
         {
                 lbs_pr_err("error in pcmcia_get_first_tuple etc\n");
                 goto out1;
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index c9e4a435b2fc..1a019e98dac3 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -533,11 +533,11 @@ static int __init init_mac80211_hwsim(void)
                 data = hw->priv;
                 data->hw = hw;
 
-                data->dev = device_create_drvdata(hwsim_class, NULL, 0, hw,
-                                                "hwsim%d", i);
+                data->dev = device_create(hwsim_class, NULL, 0, hw,
+                                          "hwsim%d", i);
                 if (IS_ERR(data->dev)) {
                         printk(KERN_DEBUG
-                               "mac80211_hwsim: device_create_drvdata "
+                               "mac80211_hwsim: device_create "
                                "failed (%ld)\n", PTR_ERR(data->dev));
                         err = -ENOMEM;
                         goto failed_drvdata;
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c
index 25bae7933aa5..a670f36b5f3f 100644
--- a/drivers/net/wireless/netwave_cs.c
+++ b/drivers/net/wireless/netwave_cs.c
@@ -749,9 +749,10 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) {
     for (i = j = 0x0; j < 0x400; j += 0x20) {
         link->io.BasePort1 = j ^ 0x300;
         i = pcmcia_request_io(link, &link->io);
-        if (i == CS_SUCCESS) break;
+        if (i == 0)
+                break;
     }
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
         cs_error(link, RequestIO, i);
         goto failed;
     }
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c
index 9eaa252c2430..6fcf2bda7cdf 100644
--- a/drivers/net/wireless/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco_cs.c
@@ -80,7 +80,7 @@ orinoco_cs_hard_reset(struct orinoco_private *priv)
         /* We need atomic ops here, because we're not holding the lock */
         set_bit(0, &card->hard_reset_in_progress);
 
-        err = pcmcia_reset_card(link, NULL);
+        err = pcmcia_reset_card(link->socket);
         if (err)
                 return err;
 
@@ -165,6 +165,70 @@ static void orinoco_cs_detach(struct pcmcia_device *link)
                 last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; \
         } while (0)
 
+static int orinoco_cs_config_check(struct pcmcia_device *p_dev,
+                                   cistpl_cftable_entry_t *cfg,
+                                   cistpl_cftable_entry_t *dflt,
+                                   unsigned int vcc,
+                                   void *priv_data)
+{
+        if (cfg->index == 0)
+                goto next_entry;
+
+        /* Use power settings for Vcc and Vpp if present */
+        /* Note that the CIS values need to be rescaled */
+        if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) {
+                        DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n",  vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
+                        if (!ignore_cis_vcc)
+                                goto next_entry;
+                }
+        } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] / 10000) {
+                        DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n",  vcc, dflt->vcc.param[CISTPL_POWER_VNOM] / 10000);
+                        if (!ignore_cis_vcc)
+                                goto next_entry;
+                }
+        }
+
+        if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp =
+                        cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+        else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp =
+                        dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+
+        /* Do we need to allocate an interrupt? */
+        p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
+
+        /* IO window settings */
+        p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
+        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
+                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+                if (!(io->flags & CISTPL_IO_8BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+                if (!(io->flags & CISTPL_IO_16BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
+                p_dev->io.BasePort1 = io->win[0].base;
+                p_dev->io.NumPorts1 = io->win[0].len;
+                if (io->nwin > 1) {
+                        p_dev->io.Attributes2 = p_dev->io.Attributes1;
+                        p_dev->io.BasePort2 = io->win[1].base;
+                        p_dev->io.NumPorts2 = io->win[1].len;
+                }
+
+                /* This reserves IO space but doesn't actually enable it */
+                if (pcmcia_request_io(p_dev, &p_dev->io) != 0)
+                        goto next_entry;
+        }
+        return 0;
+
+next_entry:
+        pcmcia_disable_device(p_dev);
+        return -ENODEV;
+};
+
 static int
 orinoco_cs_config(struct pcmcia_device *link)
 {
@@ -173,16 +237,8 @@ orinoco_cs_config(struct pcmcia_device *link)
         struct orinoco_pccard *card = priv->card;
         hermes_t *hw = &priv->hw;
         int last_fn, last_ret;
-        u_char buf[64];
-        config_info_t conf;
-        tuple_t tuple;
-        cisparse_t parse;
         void __iomem *mem;
 
-        /* Look up the current Vcc */
-        CS_CHECK(GetConfigurationInfo,
-                 pcmcia_get_configuration_info(link, &conf));
-
         /*
          * In this loop, we scan the CIS for configuration table
          * entries, each of which describes a valid card
@@ -197,94 +253,14 @@ orinoco_cs_config(struct pcmcia_device *link)
          * and most client drivers will only use the CIS to fill in
          * implementation-defined details.
          */
-        tuple.Attributes = 0;
-        tuple.TupleData = buf;
-        tuple.TupleDataMax = sizeof(buf);
-        tuple.TupleOffset = 0;
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-        while (1) {
-                cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
-                cistpl_cftable_entry_t dflt = { .index = 0 };
-
-                if ( (pcmcia_get_tuple_data(link, &tuple) != 0)
-                    || (pcmcia_parse_tuple(link, &tuple, &parse) != 0))
-                        goto next_entry;
-
-                if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
-                        dflt = *cfg;
-                if (cfg->index == 0)
-                        goto next_entry;
-                link->conf.ConfigIndex = cfg->index;
-
-                /* Use power settings for Vcc and Vpp if present */
-                /* Note that the CIS values need to be rescaled */
-                if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                        if (conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) {
-                                DEBUG(2, "orinoco_cs_config: Vcc mismatch (conf.Vcc = %d, cfg CIS = %d)\n",  conf.Vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
-                                if (!ignore_cis_vcc)
-                                        goto next_entry;
-                        }
-                } else if (dflt.vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                        if (conf.Vcc != dflt.vcc.param[CISTPL_POWER_VNOM] / 10000) {
-                                DEBUG(2, "orinoco_cs_config: Vcc mismatch (conf.Vcc = %d, dflt CIS = %d)\n",  conf.Vcc, dflt.vcc.param[CISTPL_POWER_VNOM] / 10000);
-                                if(!ignore_cis_vcc)
-                                        goto next_entry;
-                        }
-                }
-
-                if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                            cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
-                else if (dflt.vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                            dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;
-                
-                /* Do we need to allocate an interrupt? */
-                link->conf.Attributes |= CONF_ENABLE_IRQ;
-
-                /* IO window settings */
-                link->io.NumPorts1 = link->io.NumPorts2 = 0;
-                if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
-                        cistpl_io_t *io =
-                            (cfg->io.nwin) ? &cfg->io : &dflt.io;
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-                        if (!(io->flags & CISTPL_IO_8BIT))
-                                link->io.Attributes1 =
-                                    IO_DATA_PATH_WIDTH_16;
-                        if (!(io->flags & CISTPL_IO_16BIT))
-                                link->io.Attributes1 =
-                                    IO_DATA_PATH_WIDTH_8;
-                        link->io.IOAddrLines =
-                            io->flags & CISTPL_IO_LINES_MASK;
-                        link->io.BasePort1 = io->win[0].base;
-                        link->io.NumPorts1 = io->win[0].len;
-                        if (io->nwin > 1) {
-                                link->io.Attributes2 =
-                                    link->io.Attributes1;
-                                link->io.BasePort2 = io->win[1].base;
-                                link->io.NumPorts2 = io->win[1].len;
-                        }
-
-                        /* This reserves IO space but doesn't actually enable it */
-                        if (pcmcia_request_io(link, &link->io) != 0)
-                                goto next_entry;
-                }
-
-
-                /* If we got this far, we're cool! */
-
-                break;
-                
-        next_entry:
-                pcmcia_disable_device(link);
-                last_ret = pcmcia_get_next_tuple(link, &tuple);
-                if (last_ret  == CS_NO_MORE_ITEMS) {
+        last_ret = pcmcia_loop_config(link, orinoco_cs_config_check, NULL);
+        if (last_ret) {
+                if (!ignore_cis_vcc)
                         printk(KERN_ERR PFX "GetNextTuple(): No matching "
                                "CIS configuration.  Maybe you need the "
                                "ignore_cis_vcc=1 parameter.\n");
-                        goto cs_failed;
-                }
+                cs_error(link, RequestIO, last_ret);
+                goto failed;
         }
 
         /*
@@ -335,7 +311,6 @@ orinoco_cs_config(struct pcmcia_device *link)
                "0x%04x-0x%04x\n", dev->name, dev->dev.parent->bus_id,
                link->irq.AssignedIRQ, link->io.BasePort1,
                link->io.BasePort1 + link->io.NumPorts1 - 1);
-
         return 0;
 
  cs_failed:
@@ -403,6 +378,7 @@ static int orinoco_cs_resume(struct pcmcia_device *link)
         struct orinoco_private *priv = netdev_priv(dev);
         struct orinoco_pccard *card = priv->card;
         int err = 0;
+        unsigned long flags;
 
         if (! test_bit(0, &card->hard_reset_in_progress)) {
                 err = orinoco_reinit_firmware(dev);
@@ -412,7 +388,7 @@ static int orinoco_cs_resume(struct pcmcia_device *link)
                         return -EIO;
                 }
 
-                spin_lock(&priv->lock);
+                spin_lock_irqsave(&priv->lock, flags);
 
                 netif_device_attach(dev);
                 priv->hw_unavailable--;
@@ -424,7 +400,7 @@ static int orinoco_cs_resume(struct pcmcia_device *link)
                                        dev->name, err);
                 }
 
-                spin_unlock(&priv->lock);
+                spin_unlock_irqrestore(&priv->lock, flags);
         }
 
         return err;
diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c
index 1994aa199d37..117c7d3a52b0 100644
--- a/drivers/net/wireless/p54/p54common.c
+++ b/drivers/net/wireless/p54/p54common.c
@@ -479,7 +479,6 @@ static int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
         printk(KERN_ERR "p54: eeprom parse failed!\n");
         return err;
 }
-EXPORT_SYMBOL_GPL(p54_parse_eeprom);
 
 static int p54_rssi_to_dbm(struct ieee80211_hw *dev, int rssi)
 {
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
index 1912f5e9a0a9..75d749bccb0d 100644
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
@@ -39,6 +39,7 @@ static struct usb_device_id p54u_table[] __devinitdata = {
         {USB_DEVICE(0x0846, 0x4200)},   /* Netgear WG121 */
         {USB_DEVICE(0x0846, 0x4210)},   /* Netgear WG121 the second ? */
         {USB_DEVICE(0x0846, 0x4220)},   /* Netgear WG111 */
+        {USB_DEVICE(0x09aa, 0x1000)},   /* Spinnaker Proto board */
         {USB_DEVICE(0x0cde, 0x0006)},   /* Medion 40900, Roper Europe */
         {USB_DEVICE(0x124a, 0x4023)},   /* Shuttle PN15, Airvast WM168g, IOGear GWU513 */
         {USB_DEVICE(0x1915, 0x2234)},   /* Linksys WUSB54G OEM */
@@ -63,8 +64,8 @@ static struct usb_device_id p54u_table[] __devinitdata = {
         {USB_DEVICE(0x0cde, 0x0006)},   /* Medion MD40900 */
         {USB_DEVICE(0x0cde, 0x0008)},   /* Sagem XG703A */
         {USB_DEVICE(0x0d8e, 0x3762)},   /* DLink DWL-G120 Cohiba */
-        {USB_DEVICE(0x09aa, 0x1000)},   /* Spinnaker Proto board */
         {USB_DEVICE(0x124a, 0x4025)},   /* IOGear GWU513 (GW3887IK chip) */
+        {USB_DEVICE(0x1260, 0xee22)},   /* SMC 2862W-G version 2 */
         {USB_DEVICE(0x13b1, 0x000a)},   /* Linksys WUSB54G ver 2 */
         {USB_DEVICE(0x13B1, 0x000C)},   /* Linksys WUSB54AG */
         {USB_DEVICE(0x1435, 0x0427)},   /* Inventel UR054G */
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 44da0d19b5c8..1404a5717520 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -798,9 +798,9 @@ static void ray_release(struct pcmcia_device *link)
     iounmap(local->amem);
     /* Do bother checking to see if these succeed or not */
     i = pcmcia_release_window(local->amem_handle);
-    if ( i != CS_SUCCESS ) DEBUG(0,"ReleaseWindow(local->amem) ret = %x\n",i);
+    if ( i != 0 ) DEBUG(0,"ReleaseWindow(local->amem) ret = %x\n",i);
     i = pcmcia_release_window(local->rmem_handle);
-    if ( i != CS_SUCCESS ) DEBUG(0,"ReleaseWindow(local->rmem) ret = %x\n",i);
+    if ( i != 0 ) DEBUG(0,"ReleaseWindow(local->rmem) ret = %x\n",i);
     pcmcia_disable_device(link);
 
     DEBUG(2,"ray_release ending\n");
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index 1676ac484790..451d410ecdae 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -374,7 +374,7 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb)
         struct queue_entry *entry = rt2x00queue_get_entry(queue, Q_INDEX);
         struct txentry_desc txdesc;
         struct skb_frame_desc *skbdesc;
-        unsigned int iv_len;
+        unsigned int iv_len = 0;
 
         if (unlikely(rt2x00queue_full(queue)))
                 return -EINVAL;
@@ -395,6 +395,9 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb)
         entry->skb = skb;
         rt2x00queue_create_tx_descriptor(entry, &txdesc);
 
+        if (IEEE80211_SKB_CB(skb)->control.hw_key != NULL)
+                iv_len = IEEE80211_SKB_CB(skb)->control.hw_key->iv_len;
+
         /*
          * All information is retreived from the skb->cb array,
          * now we should claim ownership of the driver part of that
@@ -410,9 +413,7 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb)
          * the frame so we can provide it to the driver seperately.
          */
         if (test_bit(ENTRY_TXD_ENCRYPT, &txdesc.flags) &&
-            !test_bit(ENTRY_TXD_ENCRYPT_IV, &txdesc.flags) &&
-                (IEEE80211_SKB_CB(skb)->control.hw_key != NULL)) {
-                iv_len = IEEE80211_SKB_CB(skb)->control.hw_key->iv_len;
+            !test_bit(ENTRY_TXD_ENCRYPT_IV, &txdesc.flags)) {
                 rt2x00crypto_tx_remove_iv(skb, iv_len);
         }
 
diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c
index e9902613e2ee..431e3c78bf27 100644
--- a/drivers/net/wireless/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl8187_dev.c
@@ -33,10 +33,13 @@ MODULE_LICENSE("GPL");
 static struct usb_device_id rtl8187_table[] __devinitdata = {
         /* Asus */
         {USB_DEVICE(0x0b05, 0x171d), .driver_info = DEVICE_RTL8187},
+        /* Belkin */
+        {USB_DEVICE(0x050d, 0x705e), .driver_info = DEVICE_RTL8187B},
         /* Realtek */
         {USB_DEVICE(0x0bda, 0x8187), .driver_info = DEVICE_RTL8187},
         {USB_DEVICE(0x0bda, 0x8189), .driver_info = DEVICE_RTL8187B},
         {USB_DEVICE(0x0bda, 0x8197), .driver_info = DEVICE_RTL8187B},
+        {USB_DEVICE(0x0bda, 0x8198), .driver_info = DEVICE_RTL8187B},
         /* Netgear */
         {USB_DEVICE(0x0846, 0x6100), .driver_info = DEVICE_RTL8187},
         {USB_DEVICE(0x0846, 0x6a00), .driver_info = DEVICE_RTL8187},
diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c
index 67b26d3c3cd5..852789ad34b3 100644
--- a/drivers/net/wireless/spectrum_cs.c
+++ b/drivers/net/wireless/spectrum_cs.c
@@ -235,6 +235,70 @@ static void spectrum_cs_detach(struct pcmcia_device *link)
  * device available to the system.
  */
 
+static int spectrum_cs_config_check(struct pcmcia_device *p_dev,
+                                    cistpl_cftable_entry_t *cfg,
+                                    cistpl_cftable_entry_t *dflt,
+                                    unsigned int vcc,
+                                    void *priv_data)
+{
+        if (cfg->index == 0)
+                goto next_entry;
+
+        /* Use power settings for Vcc and Vpp if present */
+        /* Note that the CIS values need to be rescaled */
+        if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) {
+                        DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n",  vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
+                        if (!ignore_cis_vcc)
+                                goto next_entry;
+                }
+        } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] / 10000) {
+                        DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n",  vcc, dflt->vcc.param[CISTPL_POWER_VNOM] / 10000);
+                        if (!ignore_cis_vcc)
+                                goto next_entry;
+                }
+        }
+
+        if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp =
+                        cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+        else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp =
+                        dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+
+        /* Do we need to allocate an interrupt? */
+        p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
+
+        /* IO window settings */
+        p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
+        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
+                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+                if (!(io->flags & CISTPL_IO_8BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+                if (!(io->flags & CISTPL_IO_16BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
+                p_dev->io.BasePort1 = io->win[0].base;
+                p_dev->io.NumPorts1 = io->win[0].len;
+                if (io->nwin > 1) {
+                        p_dev->io.Attributes2 = p_dev->io.Attributes1;
+                        p_dev->io.BasePort2 = io->win[1].base;
+                        p_dev->io.NumPorts2 = io->win[1].len;
+                }
+
+                /* This reserves IO space but doesn't actually enable it */
+                if (pcmcia_request_io(p_dev, &p_dev->io) != 0)
+                        goto next_entry;
+        }
+        return 0;
+
+next_entry:
+        pcmcia_disable_device(p_dev);
+        return -ENODEV;
+};
+
 static int
 spectrum_cs_config(struct pcmcia_device *link)
 {
@@ -243,16 +307,8 @@ spectrum_cs_config(struct pcmcia_device *link)
         struct orinoco_pccard *card = priv->card;
         hermes_t *hw = &priv->hw;
         int last_fn, last_ret;
-        u_char buf[64];
-        config_info_t conf;
-        tuple_t tuple;
-        cisparse_t parse;
         void __iomem *mem;
 
-        /* Look up the current Vcc */
-        CS_CHECK(GetConfigurationInfo,
-                 pcmcia_get_configuration_info(link, &conf));
-
         /*
          * In this loop, we scan the CIS for configuration table
          * entries, each of which describes a valid card
@@ -267,94 +323,14 @@ spectrum_cs_config(struct pcmcia_device *link)
          * and most client drivers will only use the CIS to fill in
          * implementation-defined details.
          */
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        tuple.Attributes = 0;
-        tuple.TupleData = buf;
-        tuple.TupleDataMax = sizeof(buf);
-        tuple.TupleOffset = 0;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-        while (1) {
-                cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
-                cistpl_cftable_entry_t dflt = { .index = 0 };
-
-                if ( (pcmcia_get_tuple_data(link, &tuple) != 0)
-                    || (pcmcia_parse_tuple(link, &tuple, &parse) != 0))
-                        goto next_entry;
-
-                if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
-                        dflt = *cfg;
-                if (cfg->index == 0)
-                        goto next_entry;
-                link->conf.ConfigIndex = cfg->index;
-
-                /* Use power settings for Vcc and Vpp if present */
-                /* Note that the CIS values need to be rescaled */
-                if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                        if (conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) {
-                                DEBUG(2, "spectrum_cs_config: Vcc mismatch (conf.Vcc = %d, CIS = %d)\n",  conf.Vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
-                                if (!ignore_cis_vcc)
-                                        goto next_entry;
-                        }
-                } else if (dflt.vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                        if (conf.Vcc != dflt.vcc.param[CISTPL_POWER_VNOM] / 10000) {
-                                DEBUG(2, "spectrum_cs_config: Vcc mismatch (conf.Vcc = %d, CIS = %d)\n",  conf.Vcc, dflt.vcc.param[CISTPL_POWER_VNOM] / 10000);
-                                if(!ignore_cis_vcc)
-                                        goto next_entry;
-                        }
-                }
-
-                if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                            cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
-                else if (dflt.vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                            dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;
-                
-                /* Do we need to allocate an interrupt? */
-                link->conf.Attributes |= CONF_ENABLE_IRQ;
-
-                /* IO window settings */
-                link->io.NumPorts1 = link->io.NumPorts2 = 0;
-                if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
-                        cistpl_io_t *io =
-                            (cfg->io.nwin) ? &cfg->io : &dflt.io;
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-                        if (!(io->flags & CISTPL_IO_8BIT))
-                                link->io.Attributes1 =
-                                    IO_DATA_PATH_WIDTH_16;
-                        if (!(io->flags & CISTPL_IO_16BIT))
-                                link->io.Attributes1 =
-                                    IO_DATA_PATH_WIDTH_8;
-                        link->io.IOAddrLines =
-                            io->flags & CISTPL_IO_LINES_MASK;
-                        link->io.BasePort1 = io->win[0].base;
-                        link->io.NumPorts1 = io->win[0].len;
-                        if (io->nwin > 1) {
-                                link->io.Attributes2 =
-                                    link->io.Attributes1;
-                                link->io.BasePort2 = io->win[1].base;
-                                link->io.NumPorts2 = io->win[1].len;
-                        }
-
-                        /* This reserves IO space but doesn't actually enable it */
-                        if (pcmcia_request_io(link, &link->io) != 0)
-                                goto next_entry;
-                }
-
-
-                /* If we got this far, we're cool! */
-
-                break;
-                
-        next_entry:
-                pcmcia_disable_device(link);
-                last_ret = pcmcia_get_next_tuple(link, &tuple);
-                if (last_ret  == CS_NO_MORE_ITEMS) {
+        last_ret = pcmcia_loop_config(link, spectrum_cs_config_check, NULL);
+        if (last_ret) {
+                if (!ignore_cis_vcc)
                         printk(KERN_ERR PFX "GetNextTuple(): No matching "
                                "CIS configuration.  Maybe you need the "
                                "ignore_cis_vcc=1 parameter.\n");
-                        goto cs_failed;
-                }
+                cs_error(link, RequestIO, last_ret);
+                goto failed;
         }
 
         /*
@@ -450,10 +426,11 @@ spectrum_cs_suspend(struct pcmcia_device *link)
 {
         struct net_device *dev = link->priv;
         struct orinoco_private *priv = netdev_priv(dev);
+        unsigned long flags;
         int err = 0;
 
         /* Mark the device as stopped, to block IO until later */
-        spin_lock(&priv->lock);
+        spin_lock_irqsave(&priv->lock, flags);
 
         err = __orinoco_down(dev);
         if (err)
@@ -463,7 +440,7 @@ spectrum_cs_suspend(struct pcmcia_device *link)
         netif_device_detach(dev);
         priv->hw_unavailable++;
 
-        spin_unlock(&priv->lock);
+        spin_unlock_irqrestore(&priv->lock, flags);
 
         return err;
 }
diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c
index 136220b5ca81..e939a73ff794 100644
--- a/drivers/net/wireless/wavelan.c
+++ b/drivers/net/wireless/wavelan.c
@@ -4387,7 +4387,7 @@ MODULE_LICENSE("GPL");
  *
  * Thanks go also to:
  *      James Ashton (jaa101@syseng.anu.edu.au),
- *      Alan Cox (alan@redhat.com),
+ *      Alan Cox (alan@lxorguk.ukuu.org.uk),
  *      Allan Creighton (allanc@cs.usyd.edu.au),
  *      Matthew Geier (matthew@cs.usyd.edu.au),
  *      Remo di Giovanni (remo@cs.usyd.edu.au),
diff --git a/drivers/net/wireless/wavelan.p.h b/drivers/net/wireless/wavelan.p.h
index b33ac47dd8df..44d31bbf39e4 100644
--- a/drivers/net/wireless/wavelan.p.h
+++ b/drivers/net/wireless/wavelan.p.h
@@ -186,7 +186,7 @@
  *
  * Thanks go also to:
  *      James Ashton <jaa101@syseng.anu.edu.au>,
- *      Alan Cox <alan@redhat.com>,
+ *      Alan Cox <alan@lxorguk.ukuu.org.uk>,
  *      Allan Creighton <allanc@cs.usyd.edu.au>,
  *      Matthew Geier <matthew@cs.usyd.edu.au>,
  *      Remo di Giovanni <remo@cs.usyd.edu.au>,
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index b5de38a9b791..e124b1d6267a 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -3702,7 +3702,7 @@ wv_pcmcia_reset(struct net_device *	dev)
 #endif
 
   i = pcmcia_access_configuration_register(link, &reg);
-  if(i != CS_SUCCESS)
+  if (i != 0)
     {
       cs_error(link, AccessConfigurationRegister, i);
       return FALSE;
@@ -3716,7 +3716,7 @@ wv_pcmcia_reset(struct net_device *	dev)
   reg.Action = CS_WRITE;
   reg.Value = reg.Value | COR_SW_RESET;
   i = pcmcia_access_configuration_register(link, &reg);
-  if(i != CS_SUCCESS)
+  if (i != 0)
     {
       cs_error(link, AccessConfigurationRegister, i);
       return FALSE;
@@ -3725,7 +3725,7 @@ wv_pcmcia_reset(struct net_device *	dev)
   reg.Action = CS_WRITE;
   reg.Value = COR_LEVEL_IRQ | COR_CONFIG;
   i = pcmcia_access_configuration_register(link, &reg);
-  if(i != CS_SUCCESS)
+  if (i != 0)
     {
       cs_error(link, AccessConfigurationRegister, i);
       return FALSE;
@@ -3903,7 +3903,7 @@ wv_pcmcia_config(struct pcmcia_device *	link)
   do
     {
       i = pcmcia_request_io(link, &link->io);
-      if(i != CS_SUCCESS)
+      if (i != 0)
         {
           cs_error(link, RequestIO, i);
           break;
@@ -3914,7 +3914,7 @@ wv_pcmcia_config(struct pcmcia_device *	link)
        * actually assign a handler to the interrupt.
        */
       i = pcmcia_request_irq(link, &link->irq);
-      if(i != CS_SUCCESS)
+      if (i != 0)
         {
           cs_error(link, RequestIRQ, i);
           break;
@@ -3926,7 +3926,7 @@ wv_pcmcia_config(struct pcmcia_device *	link)
        */
       link->conf.ConfigIndex = 1;
       i = pcmcia_request_configuration(link, &link->conf);
-      if(i != CS_SUCCESS)
+      if (i != 0)
         {
           cs_error(link, RequestConfiguration, i);
           break;
@@ -3942,7 +3942,7 @@ wv_pcmcia_config(struct pcmcia_device *	link)
       req.Base = req.Size = 0;
       req.AccessSpeed = mem_speed;
       i = pcmcia_request_window(&link, &req, &link->win);
-      if(i != CS_SUCCESS)
+      if (i != 0)
         {
           cs_error(link, RequestWindow, i);
           break;
@@ -3954,7 +3954,7 @@ wv_pcmcia_config(struct pcmcia_device *	link)
 
       mem.CardOffset = 0; mem.Page = 0;
       i = pcmcia_map_mem_page(link->win, &mem);
-      if(i != CS_SUCCESS)
+      if (i != 0)
         {
           cs_error(link, MapMemPage, i);
           break;
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 74a5ad2f1223..68789c6e1ce9 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -1977,10 +1977,10 @@ static int wl3501_config(struct pcmcia_device *link)
                 link->io.BasePort1 = j;
                 link->io.BasePort2 = link->io.BasePort1 + 0x10;
                 i = pcmcia_request_io(link, &link->io);
-                if (i == CS_SUCCESS)
+                if (i == 0)
                         break;
         }
-        if (i != CS_SUCCESS) {
+        if (i != 0) {
                 cs_error(link, RequestIO, i);
                 goto failed;
         }
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 3c3dd403f5dd..c6948d8f53f6 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -239,11 +239,14 @@ static void xennet_alloc_rx_buffers(struct net_device *dev)
          */
         batch_target = np->rx_target - (req_prod - np->rx.rsp_cons);
         for (i = skb_queue_len(&np->rx_batch); i < batch_target; i++) {
-                skb = __netdev_alloc_skb(dev, RX_COPY_THRESHOLD,
+                skb = __netdev_alloc_skb(dev, RX_COPY_THRESHOLD + NET_IP_ALIGN,
                                          GFP_ATOMIC | __GFP_NOWARN);
                 if (unlikely(!skb))
                         goto no_skb;
 
+                /* Align ip header to a 16 bytes boundary */
+                skb_reserve(skb, NET_IP_ALIGN);
+
                 page = alloc_page(GFP_ATOMIC | __GFP_NOWARN);
                 if (!page) {
                         kfree_skb(skb);
@@ -471,7 +474,7 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
         unsigned int offset = offset_in_page(data);
         unsigned int len = skb_headlen(skb);
 
-        frags += (offset + len + PAGE_SIZE - 1) / PAGE_SIZE;
+        frags += DIV_ROUND_UP(offset + len, PAGE_SIZE);
         if (unlikely(frags > MAX_SKB_FRAGS + 1)) {
                 printk(KERN_ALERT "xennet: skb rides the rocket: %d frags\n",
                        frags);
diff --git a/drivers/nubus/nubus.c b/drivers/nubus/nubus.c
index 2f047e573d86..f5f75844954c 100644
--- a/drivers/nubus/nubus.c
+++ b/drivers/nubus/nubus.c
@@ -126,7 +126,7 @@ static void nubus_advance(unsigned char **ptr, int len, int map)
         {
                 while(not_useful(p,map))
                         p++;
-                        p++;
+                p++;
                 len--;
         }
         *ptr = p;
diff --git a/drivers/of/base.c b/drivers/of/base.c
index ad8ac1a8af28..7c79e94a35ea 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -410,7 +410,7 @@ struct of_modalias_table {
         char *modalias;
 };
 static struct of_modalias_table of_modalias_table[] = {
-        /* Empty for now; add entries as needed */
+        { "fsl,mcu-mpc8349emitx", "mcu-mpc8349emitx" },
 };
 
 /**
@@ -420,13 +420,12 @@ static struct of_modalias_table of_modalias_table[] = {
  * @len:        Length of modalias value
  *
  * Based on the value of the compatible property, this routine will determine
- * an appropriate modalias value for a particular device tree node.  Three
- * separate methods are used to derive a modalias value.
+ * an appropriate modalias value for a particular device tree node.  Two
+ * separate methods are attempted to derive a modalias value.
  *
  * First method is to lookup the compatible value in of_modalias_table.
- * Second is to look for a "linux,<modalias>" entry in the compatible list
- * and used that for modalias.  Third is to strip off the manufacturer
- * prefix from the first compatible entry and use the remainder as modalias
+ * Second is to strip off the manufacturer prefix from the first
+ * compatible entry and use the remainder as modalias
  *
  * This routine returns 0 on success
  */
@@ -449,21 +448,7 @@ int of_modalias_node(struct device_node *node, char *modalias, int len)
         if (!compatible)
                 return -ENODEV;
 
-        /* 2. search for linux,<modalias> entry */
-        p = compatible;
-        while (cplen > 0) {
-                if (!strncmp(p, "linux,", 6)) {
-                        p += 6;
-                        strlcpy(modalias, p, len);
-                        return 0;
-                }
-
-                i = strlen(p) + 1;
-                p += i;
-                cplen -= i;
-        }
-
-        /* 3. take first compatible entry and strip manufacturer */
+        /* 2. take first compatible entry and strip manufacturer */
         p = strchr(compatible, ',');
         if (!p)
                 return -ENODEV;
@@ -473,3 +458,112 @@ int of_modalias_node(struct device_node *node, char *modalias, int len)
 }
 EXPORT_SYMBOL_GPL(of_modalias_node);
 
+/**
+ * of_parse_phandles_with_args - Find a node pointed by phandle in a list
+ * @np:         pointer to a device tree node containing a list
+ * @list_name:  property name that contains a list
+ * @cells_name: property name that specifies phandles' arguments count
+ * @index:      index of a phandle to parse out
+ * @out_node:   pointer to device_node struct pointer (will be filled)
+ * @out_args:   pointer to arguments pointer (will be filled)
+ *
+ * This function is useful to parse lists of phandles and their arguments.
+ * Returns 0 on success and fills out_node and out_args, on error returns
+ * appropriate errno value.
+ *
+ * Example:
+ *
+ * phandle1: node1 {
+ *      #list-cells = <2>;
+ * }
+ *
+ * phandle2: node2 {
+ *      #list-cells = <1>;
+ * }
+ *
+ * node3 {
+ *      list = <&phandle1 1 2 &phandle2 3>;
+ * }
+ *
+ * To get a device_node of the `node2' node you may call this:
+ * of_parse_phandles_with_args(node3, "list", "#list-cells", 2, &node2, &args);
+ */
+int of_parse_phandles_with_args(struct device_node *np, const char *list_name,
+                                const char *cells_name, int index,
+                                struct device_node **out_node,
+                                const void **out_args)
+{
+        int ret = -EINVAL;
+        const u32 *list;
+        const u32 *list_end;
+        int size;
+        int cur_index = 0;
+        struct device_node *node = NULL;
+        const void *args;
+
+        list = of_get_property(np, list_name, &size);
+        if (!list) {
+                ret = -ENOENT;
+                goto err0;
+        }
+        list_end = list + size / sizeof(*list);
+
+        while (list < list_end) {
+                const u32 *cells;
+                const phandle *phandle;
+
+                phandle = list;
+                args = list + 1;
+
+                /* one cell hole in the list = <>; */
+                if (!*phandle) {
+                        list++;
+                        goto next;
+                }
+
+                node = of_find_node_by_phandle(*phandle);
+                if (!node) {
+                        pr_debug("%s: could not find phandle\n",
+                                 np->full_name);
+                        goto err0;
+                }
+
+                cells = of_get_property(node, cells_name, &size);
+                if (!cells || size != sizeof(*cells)) {
+                        pr_debug("%s: could not get %s for %s\n",
+                                 np->full_name, cells_name, node->full_name);
+                        goto err1;
+                }
+
+                /* Next phandle is at offset of one phandle cell + #cells */
+                list += 1 + *cells;
+                if (list > list_end) {
+                        pr_debug("%s: insufficient arguments length\n",
+                                 np->full_name);
+                        goto err1;
+                }
+next:
+                if (cur_index == index)
+                        break;
+
+                of_node_put(node);
+                node = NULL;
+                cur_index++;
+        }
+
+        if (!node) {
+                ret = -ENOENT;
+                goto err0;
+        }
+
+        *out_node = node;
+        *out_args = args;
+
+        return 0;
+err1:
+        of_node_put(node);
+err0:
+        pr_debug("%s failed with status %d\n", __func__, ret);
+        return ret;
+}
+EXPORT_SYMBOL(of_parse_phandles_with_args);
diff --git a/drivers/of/gpio.c b/drivers/of/gpio.c
index 1c9cab844f10..7cd7301b5839 100644
--- a/drivers/of/gpio.c
+++ b/drivers/of/gpio.c
@@ -28,78 +28,35 @@
  */
 int of_get_gpio(struct device_node *np, int index)
 {
-        int ret = -EINVAL;
+        int ret;
         struct device_node *gc;
         struct of_gpio_chip *of_gc = NULL;
         int size;
-        const u32 *gpios;
-        u32 nr_cells;
-        int i;
         const void *gpio_spec;
         const u32 *gpio_cells;
-        int gpio_index = 0;
 
-        gpios = of_get_property(np, "gpios", &size);
-        if (!gpios) {
-                ret = -ENOENT;
+        ret = of_parse_phandles_with_args(np, "gpios", "#gpio-cells", index,
+                                          &gc, &gpio_spec);
+        if (ret) {
+                pr_debug("%s: can't parse gpios property\n", __func__);
                 goto err0;
         }
-        nr_cells = size / sizeof(u32);
-
-        for (i = 0; i < nr_cells; gpio_index++) {
-                const phandle *gpio_phandle;
-
-                gpio_phandle = gpios + i;
-                gpio_spec = gpio_phandle + 1;
-
-                /* one cell hole in the gpios = <>; */
-                if (!*gpio_phandle) {
-                        if (gpio_index == index)
-                                return -ENOENT;
-                        i++;
-                        continue;
-                }
-
-                gc = of_find_node_by_phandle(*gpio_phandle);
-                if (!gc) {
-                        pr_debug("%s: could not find phandle for gpios\n",
-                                 np->full_name);
-                        goto err0;
-                }
-
-                of_gc = gc->data;
-                if (!of_gc) {
-                        pr_debug("%s: gpio controller %s isn't registered\n",
-                                 np->full_name, gc->full_name);
-                        goto err1;
-                }
-
-                gpio_cells = of_get_property(gc, "#gpio-cells", &size);
-                if (!gpio_cells || size != sizeof(*gpio_cells) ||
-                                *gpio_cells != of_gc->gpio_cells) {
-                        pr_debug("%s: wrong #gpio-cells for %s\n",
-                                 np->full_name, gc->full_name);
-                        goto err1;
-                }
-
-                /* Next phandle is at phandle cells + #gpio-cells */
-                i += sizeof(*gpio_phandle) / sizeof(u32) + *gpio_cells;
-                if (i >= nr_cells + 1) {
-                        pr_debug("%s: insufficient gpio-spec length\n",
-                                 np->full_name);
-                        goto err1;
-                }
-
-                if (gpio_index == index)
-                        break;
-
-                of_gc = NULL;
-                of_node_put(gc);
-        }
 
+        of_gc = gc->data;
         if (!of_gc) {
-                ret = -ENOENT;
-                goto err0;
+                pr_debug("%s: gpio controller %s isn't registered\n",
+                         np->full_name, gc->full_name);
+                ret = -ENODEV;
+                goto err1;
+        }
+
+        gpio_cells = of_get_property(gc, "#gpio-cells", &size);
+        if (!gpio_cells || size != sizeof(*gpio_cells) ||
+                        *gpio_cells != of_gc->gpio_cells) {
+                pr_debug("%s: wrong #gpio-cells for %s\n",
+                         np->full_name, gc->full_name);
+                ret = -EINVAL;
+                goto err1;
         }
 
         ret = of_gc->xlate(of_gc, np, gpio_spec);
diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
index 9304c4555079..ed982273fb8b 100644
--- a/drivers/oprofile/buffer_sync.c
+++ b/drivers/oprofile/buffer_sync.c
@@ -5,6 +5,7 @@
  * @remark Read the file COPYING
  *
  * @author John Levon <levon@movementarian.org>
+ * @author Barry Kasindorf
  *
  * This is the core of the buffer management. Each
  * CPU buffer is processed and entered into the
@@ -33,7 +34,7 @@
 #include "event_buffer.h"
 #include "cpu_buffer.h"
 #include "buffer_sync.h"
- 
+
 static LIST_HEAD(dying_tasks);
 static LIST_HEAD(dead_tasks);
 static cpumask_t marked_cpus = CPU_MASK_NONE;
@@ -48,10 +49,11 @@ static void process_task_mortuary(void);
  * Can be invoked from softirq via RCU callback due to
  * call_rcu() of the task struct, hence the _irqsave.
  */
-static int task_free_notify(struct notifier_block * self, unsigned long val, void * data)
+static int
+task_free_notify(struct notifier_block *self, unsigned long val, void *data)
 {
         unsigned long flags;
-        struct task_struct * task = data;
+        struct task_struct *task = data;
         spin_lock_irqsave(&task_mortuary, flags);
         list_add(&task->tasks, &dying_tasks);
         spin_unlock_irqrestore(&task_mortuary, flags);
@@ -62,13 +64,14 @@ static int task_free_notify(struct notifier_block * self, unsigned long val, voi
 /* The task is on its way out. A sync of the buffer means we can catch
  * any remaining samples for this task.
  */
-static int task_exit_notify(struct notifier_block * self, unsigned long val, void * data)
+static int
+task_exit_notify(struct notifier_block *self, unsigned long val, void *data)
 {
         /* To avoid latency problems, we only process the current CPU,
          * hoping that most samples for the task are on this CPU
          */
         sync_buffer(raw_smp_processor_id());
-        return 0;
+        return 0;
 }
 
 
@@ -77,11 +80,12 @@ static int task_exit_notify(struct notifier_block * self, unsigned long val, voi
  * we don't lose any. This does not have to be exact, it's a QoI issue
  * only.
  */
-static int munmap_notify(struct notifier_block * self, unsigned long val, void * data)
+static int
+munmap_notify(struct notifier_block *self, unsigned long val, void *data)
 {
         unsigned long addr = (unsigned long)data;
-        struct mm_struct * mm = current->mm;
-        struct vm_area_struct * mpnt;
+        struct mm_struct *mm = current->mm;
+        struct vm_area_struct *mpnt;
 
         down_read(&mm->mmap_sem);
 
@@ -99,11 +103,12 @@ static int munmap_notify(struct notifier_block * self, unsigned long val, void *
         return 0;
 }
 
- 
+
 /* We need to be told about new modules so we don't attribute to a previously
  * loaded module, or drop the samples on the floor.
  */
-static int module_load_notify(struct notifier_block * self, unsigned long val, void * data)
+static int
+module_load_notify(struct notifier_block *self, unsigned long val, void *data)
 {
 #ifdef CONFIG_MODULES
         if (val != MODULE_STATE_COMING)
@@ -118,7 +123,7 @@ static int module_load_notify(struct notifier_block * self, unsigned long val, v
         return 0;
 }
 
- 
+
 static struct notifier_block task_free_nb = {
         .notifier_call  = task_free_notify,
 };
@@ -135,7 +140,7 @@ static struct notifier_block module_load_nb = {
         .notifier_call = module_load_notify,
 };
 
- 
+
 static void end_sync(void)
 {
         end_cpu_work();
@@ -208,14 +213,14 @@ static inline unsigned long fast_get_dcookie(struct path *path)
  * not strictly necessary but allows oprofile to associate
  * shared-library samples with particular applications
  */
-static unsigned long get_exec_dcookie(struct mm_struct * mm)
+static unsigned long get_exec_dcookie(struct mm_struct *mm)
 {
         unsigned long cookie = NO_COOKIE;
-        struct vm_area_struct * vma;
- 
+        struct vm_area_struct *vma;
+
         if (!mm)
                 goto out;
- 
+
         for (vma = mm->mmap; vma; vma = vma->vm_next) {
                 if (!vma->vm_file)
                         continue;
@@ -235,13 +240,14 @@ out:
  * sure to do this lookup before a mm->mmap modification happens so
  * we don't lose track.
  */
-static unsigned long lookup_dcookie(struct mm_struct * mm, unsigned long addr, off_t * offset)
+static unsigned long
+lookup_dcookie(struct mm_struct *mm, unsigned long addr, off_t *offset)
 {
         unsigned long cookie = NO_COOKIE;
-        struct vm_area_struct * vma;
+        struct vm_area_struct *vma;
 
         for (vma = find_vma(mm, addr); vma; vma = vma->vm_next) {
- 
+
                 if (addr < vma->vm_start || addr >= vma->vm_end)
                         continue;
 
@@ -263,9 +269,20 @@ static unsigned long lookup_dcookie(struct mm_struct * mm, unsigned long addr, o
         return cookie;
 }
 
+static void increment_tail(struct oprofile_cpu_buffer *b)
+{
+        unsigned long new_tail = b->tail_pos + 1;
+
+        rmb();  /* be sure fifo pointers are synchromized */
+
+        if (new_tail < b->buffer_size)
+                b->tail_pos = new_tail;
+        else
+                b->tail_pos = 0;
+}
 
 static unsigned long last_cookie = INVALID_COOKIE;
- 
+
 static void add_cpu_switch(int i)
 {
         add_event_entry(ESCAPE_CODE);
@@ -278,16 +295,16 @@ static void add_kernel_ctx_switch(unsigned int in_kernel)
 {
         add_event_entry(ESCAPE_CODE);
         if (in_kernel)
-                add_event_entry(KERNEL_ENTER_SWITCH_CODE); 
+                add_event_entry(KERNEL_ENTER_SWITCH_CODE);
         else
-                add_event_entry(KERNEL_EXIT_SWITCH_CODE); 
+                add_event_entry(KERNEL_EXIT_SWITCH_CODE);
 }
- 
+
 static void
-add_user_ctx_switch(struct task_struct const * task, unsigned long cookie)
+add_user_ctx_switch(struct task_struct const *task, unsigned long cookie)
 {
         add_event_entry(ESCAPE_CODE);
-        add_event_entry(CTX_SWITCH_CODE); 
+        add_event_entry(CTX_SWITCH_CODE);
         add_event_entry(task->pid);
         add_event_entry(cookie);
         /* Another code for daemon back-compat */
@@ -296,7 +313,7 @@ add_user_ctx_switch(struct task_struct const * task, unsigned long cookie)
         add_event_entry(task->tgid);
 }
 
- 
+
 static void add_cookie_switch(unsigned long cookie)
 {
         add_event_entry(ESCAPE_CODE);
@@ -304,13 +321,78 @@ static void add_cookie_switch(unsigned long cookie)
         add_event_entry(cookie);
 }
 
- 
+
 static void add_trace_begin(void)
 {
         add_event_entry(ESCAPE_CODE);
         add_event_entry(TRACE_BEGIN_CODE);
 }
 
+#ifdef CONFIG_OPROFILE_IBS
+
+#define IBS_FETCH_CODE_SIZE     2
+#define IBS_OP_CODE_SIZE        5
+#define IBS_EIP(offset)                         \
+        (((struct op_sample *)&cpu_buf->buffer[(offset)])->eip)
+#define IBS_EVENT(offset)                               \
+        (((struct op_sample *)&cpu_buf->buffer[(offset)])->event)
+
+/*
+ * Add IBS fetch and op entries to event buffer
+ */
+static void add_ibs_begin(struct oprofile_cpu_buffer *cpu_buf, int code,
+        int in_kernel, struct mm_struct *mm)
+{
+        unsigned long rip;
+        int i, count;
+        unsigned long ibs_cookie = 0;
+        off_t offset;
+
+        increment_tail(cpu_buf);        /* move to RIP entry */
+
+        rip = IBS_EIP(cpu_buf->tail_pos);
+
+#ifdef __LP64__
+        rip += IBS_EVENT(cpu_buf->tail_pos) << 32;
+#endif
+
+        if (mm) {
+                ibs_cookie = lookup_dcookie(mm, rip, &offset);
+
+                if (ibs_cookie == NO_COOKIE)
+                        offset = rip;
+                if (ibs_cookie == INVALID_COOKIE) {
+                        atomic_inc(&oprofile_stats.sample_lost_no_mapping);
+                        offset = rip;
+                }
+                if (ibs_cookie != last_cookie) {
+                        add_cookie_switch(ibs_cookie);
+                        last_cookie = ibs_cookie;
+                }
+        } else
+                offset = rip;
+
+        add_event_entry(ESCAPE_CODE);
+        add_event_entry(code);
+        add_event_entry(offset);        /* Offset from Dcookie */
+
+        /* we send the Dcookie offset, but send the raw Linear Add also*/
+        add_event_entry(IBS_EIP(cpu_buf->tail_pos));
+        add_event_entry(IBS_EVENT(cpu_buf->tail_pos));
+
+        if (code == IBS_FETCH_CODE)
+                count = IBS_FETCH_CODE_SIZE;    /*IBS FETCH is 2 int64s*/
+        else
+                count = IBS_OP_CODE_SIZE;       /*IBS OP is 5 int64s*/
+
+        for (i = 0; i < count; i++) {
+                increment_tail(cpu_buf);
+                add_event_entry(IBS_EIP(cpu_buf->tail_pos));
+                add_event_entry(IBS_EVENT(cpu_buf->tail_pos));
+        }
+}
+
+#endif
 
 static void add_sample_entry(unsigned long offset, unsigned long event)
 {
@@ -319,13 +401,13 @@ static void add_sample_entry(unsigned long offset, unsigned long event)
 }
 
 
-static int add_us_sample(struct mm_struct * mm, struct op_sample * s)
+static int add_us_sample(struct mm_struct *mm, struct op_sample *s)
 {
         unsigned long cookie;
         off_t offset;
- 
-        cookie = lookup_dcookie(mm, s->eip, &offset);
- 
+
+        cookie = lookup_dcookie(mm, s->eip, &offset);
+
         if (cookie == INVALID_COOKIE) {
                 atomic_inc(&oprofile_stats.sample_lost_no_mapping);
                 return 0;
@@ -341,13 +423,13 @@ static int add_us_sample(struct mm_struct * mm, struct op_sample * s)
         return 1;
 }
 
- 
+
 /* Add a sample to the global event buffer. If possible the
  * sample is converted into a persistent dentry/offset pair
  * for later lookup from userspace.
  */
 static int
-add_sample(struct mm_struct * mm, struct op_sample * s, int in_kernel)
+add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
 {
         if (in_kernel) {
                 add_sample_entry(s->eip, s->event);
@@ -359,9 +441,9 @@ add_sample(struct mm_struct * mm, struct op_sample * s, int in_kernel)
         }
         return 0;
 }
- 
 
-static void release_mm(struct mm_struct * mm)
+
+static void release_mm(struct mm_struct *mm)
 {
         if (!mm)
                 return;
@@ -370,9 +452,9 @@ static void release_mm(struct mm_struct * mm)
 }
 
 
-static struct mm_struct * take_tasks_mm(struct task_struct * task)
+static struct mm_struct *take_tasks_mm(struct task_struct *task)
 {
-        struct mm_struct * mm = get_task_mm(task);
+        struct mm_struct *mm = get_task_mm(task);
         if (mm)
                 down_read(&mm->mmap_sem);
         return mm;
@@ -383,10 +465,10 @@ static inline int is_code(unsigned long val)
 {
         return val == ESCAPE_CODE;
 }
- 
+
 
 /* "acquire" as many cpu buffer slots as we can */
-static unsigned long get_slots(struct oprofile_cpu_buffer * b)
+static unsigned long get_slots(struct oprofile_cpu_buffer *b)
 {
         unsigned long head = b->head_pos;
         unsigned long tail = b->tail_pos;
@@ -412,19 +494,6 @@ static unsigned long get_slots(struct oprofile_cpu_buffer * b)
 }
 
 
-static void increment_tail(struct oprofile_cpu_buffer * b)
-{
-        unsigned long new_tail = b->tail_pos + 1;
-
-        rmb();
-
-        if (new_tail < b->buffer_size)
-                b->tail_pos = new_tail;
-        else
-                b->tail_pos = 0;
-}
-
-
 /* Move tasks along towards death. Any tasks on dead_tasks
  * will definitely have no remaining references in any
  * CPU buffers at this point, because we use two lists,
@@ -435,8 +504,8 @@ static void process_task_mortuary(void)
 {
         unsigned long flags;
         LIST_HEAD(local_dead_tasks);
-        struct task_struct * task;
-        struct task_struct * ttask;
+        struct task_struct *task;
+        struct task_struct *ttask;
 
         spin_lock_irqsave(&task_mortuary, flags);
 
@@ -493,7 +562,7 @@ void sync_buffer(int cpu)
 {
         struct oprofile_cpu_buffer *cpu_buf = &per_cpu(cpu_buffer, cpu);
         struct mm_struct *mm = NULL;
-        struct task_struct * new;
+        struct task_struct *new;
         unsigned long cookie = 0;
         int in_kernel = 1;
         unsigned int i;
@@ -501,7 +570,7 @@ void sync_buffer(int cpu)
         unsigned long available;
 
         mutex_lock(&buffer_mutex);
- 
+
         add_cpu_switch(cpu);
 
         /* Remember, only we can modify tail_pos */
@@ -509,8 +578,8 @@ void sync_buffer(int cpu)
         available = get_slots(cpu_buf);
 
         for (i = 0; i < available; ++i) {
-                struct op_sample * s = &cpu_buf->buffer[cpu_buf->tail_pos];
- 
+                struct op_sample *s = &cpu_buf->buffer[cpu_buf->tail_pos];
+
                 if (is_code(s->eip)) {
                         if (s->event <= CPU_IS_KERNEL) {
                                 /* kernel/userspace switch */
@@ -521,8 +590,18 @@ void sync_buffer(int cpu)
                         } else if (s->event == CPU_TRACE_BEGIN) {
                                 state = sb_bt_start;
                                 add_trace_begin();
+#ifdef CONFIG_OPROFILE_IBS
+                        } else if (s->event == IBS_FETCH_BEGIN) {
+                                state = sb_bt_start;
+                                add_ibs_begin(cpu_buf,
+                                        IBS_FETCH_CODE, in_kernel, mm);
+                        } else if (s->event == IBS_OP_BEGIN) {
+                                state = sb_bt_start;
+                                add_ibs_begin(cpu_buf,
+                                        IBS_OP_CODE, in_kernel, mm);
+#endif
                         } else {
-                                struct mm_struct * oldmm = mm;
+                                struct mm_struct *oldmm = mm;
 
                                 /* userspace context switch */
                                 new = (struct task_struct *)s->event;
@@ -533,13 +612,11 @@ void sync_buffer(int cpu)
                                         cookie = get_exec_dcookie(mm);
                                 add_user_ctx_switch(new, cookie);
                         }
-                } else {
-                        if (state >= sb_bt_start &&
-                            !add_sample(mm, s, in_kernel)) {
-                                if (state == sb_bt_start) {
-                                        state = sb_bt_ignore;
-                                        atomic_inc(&oprofile_stats.bt_lost_no_mapping);
-                                }
+                } else if (state >= sb_bt_start &&
+                           !add_sample(mm, s, in_kernel)) {
+                        if (state == sb_bt_start) {
+                                state = sb_bt_ignore;
+                                atomic_inc(&oprofile_stats.bt_lost_no_mapping);
                         }
                 }
 
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c
index 7ba78e6d210e..e1bd5a937f6c 100644
--- a/drivers/oprofile/cpu_buffer.c
+++ b/drivers/oprofile/cpu_buffer.c
@@ -5,6 +5,7 @@
  * @remark Read the file COPYING
  *
  * @author John Levon <levon@movementarian.org>
+ * @author Barry Kasindorf <barry.kasindorf@amd.com>
  *
  * Each CPU has a local buffer that stores PC value/event
  * pairs. We also log context switches when we notice them.
@@ -209,7 +210,7 @@ static int log_sample(struct oprofile_cpu_buffer * cpu_buf, unsigned long pc,
         return 1;
 }
 
-static int oprofile_begin_trace(struct oprofile_cpu_buffer * cpu_buf)
+static int oprofile_begin_trace(struct oprofile_cpu_buffer *cpu_buf)
 {
         if (nr_available_slots(cpu_buf) < 4) {
                 cpu_buf->sample_lost_overflow++;
@@ -254,6 +255,75 @@ void oprofile_add_sample(struct pt_regs * const regs, unsigned long event)
         oprofile_add_ext_sample(pc, regs, event, is_kernel);
 }
 
+#ifdef CONFIG_OPROFILE_IBS
+
+#define MAX_IBS_SAMPLE_SIZE     14
+static int log_ibs_sample(struct oprofile_cpu_buffer *cpu_buf,
+        unsigned long pc, int is_kernel, unsigned  int *ibs, int ibs_code)
+{
+        struct task_struct *task;
+
+        cpu_buf->sample_received++;
+
+        if (nr_available_slots(cpu_buf) < MAX_IBS_SAMPLE_SIZE) {
+                cpu_buf->sample_lost_overflow++;
+                return 0;
+        }
+
+        is_kernel = !!is_kernel;
+
+        /* notice a switch from user->kernel or vice versa */
+        if (cpu_buf->last_is_kernel != is_kernel) {
+                cpu_buf->last_is_kernel = is_kernel;
+                add_code(cpu_buf, is_kernel);
+        }
+
+        /* notice a task switch */
+        if (!is_kernel) {
+                task = current;
+
+                if (cpu_buf->last_task != task) {
+                        cpu_buf->last_task = task;
+                        add_code(cpu_buf, (unsigned long)task);
+                }
+        }
+
+        add_code(cpu_buf, ibs_code);
+        add_sample(cpu_buf, ibs[0], ibs[1]);
+        add_sample(cpu_buf, ibs[2], ibs[3]);
+        add_sample(cpu_buf, ibs[4], ibs[5]);
+
+        if (ibs_code == IBS_OP_BEGIN) {
+        add_sample(cpu_buf, ibs[6], ibs[7]);
+        add_sample(cpu_buf, ibs[8], ibs[9]);
+        add_sample(cpu_buf, ibs[10], ibs[11]);
+        }
+
+        return 1;
+}
+
+void oprofile_add_ibs_sample(struct pt_regs *const regs,
+                                unsigned int * const ibs_sample, u8 code)
+{
+        int is_kernel = !user_mode(regs);
+        unsigned long pc = profile_pc(regs);
+
+        struct oprofile_cpu_buffer *cpu_buf =
+                         &per_cpu(cpu_buffer, smp_processor_id());
+
+        if (!backtrace_depth) {
+                log_ibs_sample(cpu_buf, pc, is_kernel, ibs_sample, code);
+                return;
+        }
+
+        /* if log_sample() fails we can't backtrace since we lost the source
+        * of this event */
+        if (log_ibs_sample(cpu_buf, pc, is_kernel, ibs_sample, code))
+                oprofile_ops.backtrace(regs, backtrace_depth);
+}
+
+#endif
+
 void oprofile_add_pc(unsigned long pc, int is_kernel, unsigned long event)
 {
         struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var(cpu_buffer);
@@ -296,7 +366,7 @@ static void wq_sync_buffer(struct work_struct *work)
         struct oprofile_cpu_buffer * b =
                 container_of(work, struct oprofile_cpu_buffer, work.work);
         if (b->cpu != smp_processor_id()) {
-                printk("WQ on CPU%d, prefer CPU%d\n",
+                printk(KERN_DEBUG "WQ on CPU%d, prefer CPU%d\n",
                        smp_processor_id(), b->cpu);
         }
         sync_buffer(b->cpu);
diff --git a/drivers/oprofile/cpu_buffer.h b/drivers/oprofile/cpu_buffer.h
index c3e366b52261..9c44d004da69 100644
--- a/drivers/oprofile/cpu_buffer.h
+++ b/drivers/oprofile/cpu_buffer.h
@@ -55,5 +55,7 @@ void cpu_buffer_reset(struct oprofile_cpu_buffer * cpu_buf);
 /* transient events for the CPU buffer -> event buffer */
 #define CPU_IS_KERNEL 1
 #define CPU_TRACE_BEGIN 2
+#define IBS_FETCH_BEGIN 3
+#define IBS_OP_BEGIN    4
 
 #endif /* OPROFILE_CPU_BUFFER_H */
diff --git a/drivers/parport/ChangeLog b/drivers/parport/ChangeLog
index db717c1d62a5..8565bbbeb6ec 100644
--- a/drivers/parport/ChangeLog
+++ b/drivers/parport/ChangeLog
@@ -311,7 +311,7 @@
         * ieee1284_ops.c (parport_ieee1284_read_nibble): Reset nAutoFd
         on timeout.  Matches 2.2.x behaviour.
 
-2001-03-02  Andrew Morton <andrewm@uow.edu.au>
+2001-03-02  Andrew Morton
 
         * parport_pc.c (registered_parport): New static variable.
         (parport_pc_find_ports): Set it when we register PCI driver.
diff --git a/drivers/parport/ieee1284.c b/drivers/parport/ieee1284.c
index e97059415ab4..ac2a805ac7ea 100644
--- a/drivers/parport/ieee1284.c
+++ b/drivers/parport/ieee1284.c
@@ -1,4 +1,4 @@
-/* $Id: parport_ieee1284.c,v 1.4 1997/10/19 21:37:21 philip Exp $
+/*
  * IEEE-1284 implementation for parport.
  *
  * Authors: Phil Blundell <philb@gnu.org>
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c
index 00e1d9620f7c..b1899e9c1f65 100644
--- a/drivers/parport/parport_cs.c
+++ b/drivers/parport/parport_cs.c
@@ -149,52 +149,44 @@ static void parport_detach(struct pcmcia_device *link)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
+static int parport_config_check(struct pcmcia_device *p_dev,
+                                cistpl_cftable_entry_t *cfg,
+                                cistpl_cftable_entry_t *dflt,
+                                unsigned int vcc,
+                                void *priv_data)
+{
+        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
+                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+                if (epp_mode)
+                        p_dev->conf.ConfigIndex |= FORCE_EPP_MODE;
+                p_dev->io.BasePort1 = io->win[0].base;
+                p_dev->io.NumPorts1 = io->win[0].len;
+                p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
+                if (io->nwin == 2) {
+                        p_dev->io.BasePort2 = io->win[1].base;
+                        p_dev->io.NumPorts2 = io->win[1].len;
+                }
+                if (pcmcia_request_io(p_dev, &p_dev->io) != 0)
+                        return -ENODEV;
+                return 0;
+        }
+        return -ENODEV;
+}
+
 static int parport_config(struct pcmcia_device *link)
 {
     parport_info_t *info = link->priv;
-    tuple_t tuple;
-    u_short buf[128];
-    cisparse_t parse;
-    cistpl_cftable_entry_t *cfg = &parse.cftable_entry;
-    cistpl_cftable_entry_t dflt = { 0 };
     struct parport *p;
     int last_ret, last_fn;
-    
+
     DEBUG(0, "parport_config(0x%p)\n", link);
-    
-    tuple.TupleData = (cisdata_t *)buf;
-    tuple.TupleOffset = 0; tuple.TupleDataMax = 255;
-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-    tuple.Attributes = 0;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-    while (1) {
-        if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
-                pcmcia_parse_tuple(link, &tuple, &parse) != 0)
-            goto next_entry;
-
-        if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
-            cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io;
-            link->conf.ConfigIndex = cfg->index;
-            if (epp_mode)
-                link->conf.ConfigIndex |= FORCE_EPP_MODE;
-            link->io.BasePort1 = io->win[0].base;
-            link->io.NumPorts1 = io->win[0].len;
-            link->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
-            if (io->nwin == 2) {
-                link->io.BasePort2 = io->win[1].base;
-                link->io.NumPorts2 = io->win[1].len;
-            }
-            if (pcmcia_request_io(link, &link->io) != 0)
-                goto next_entry;
-            /* If we've got this far, we're done */
-            break;
-        }
-        
-    next_entry:
-        if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg;
-        CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
+
+    last_ret = pcmcia_loop_config(link, parport_config_check, NULL);
+    if (last_ret) {
+            cs_error(link, RequestIO, last_ret);
+            goto failed;
     }
-    
+
     CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
     CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
 
diff --git a/drivers/parport/probe.c b/drivers/parport/probe.c
index cd565bb4e1a9..0f6550719bcf 100644
--- a/drivers/parport/probe.c
+++ b/drivers/parport/probe.c
@@ -1,4 +1,4 @@
-/* $Id: parport_probe.c,v 1.1 1999/07/03 08:56:17 davem Exp $
+/*
  * Parallel port device probing code
  *
  * Authors:    Carsten Gross, carsten@sol.wohnheim.uni-ulm.de
diff --git a/drivers/parport/share.c b/drivers/parport/share.c
index a8a62bbbb576..0ebca450ed29 100644
--- a/drivers/parport/share.c
+++ b/drivers/parport/share.c
@@ -1,4 +1,4 @@
-/* $Id: parport_share.c,v 1.15 1998/01/11 12:06:17 philip Exp $
+/*
  * Parallel-port resource manager code.
  * 
  * Authors: David Campbell <campbell@tirian.che.curtin.edu.au>
diff --git a/drivers/pci/dma_remapping.h b/drivers/pci/dma_remapping.h
deleted file mode 100644
index bff5c65f81dc..000000000000
--- a/drivers/pci/dma_remapping.h
+++ /dev/null
@@ -1,157 +0,0 @@
-#ifndef _DMA_REMAPPING_H
-#define _DMA_REMAPPING_H
-
-/*
- * We need a fixed PAGE_SIZE of 4K irrespective of
- * arch PAGE_SIZE for IOMMU page tables.
- */
-#define PAGE_SHIFT_4K           (12)
-#define PAGE_SIZE_4K            (1UL << PAGE_SHIFT_4K)
-#define PAGE_MASK_4K            (((u64)-1) << PAGE_SHIFT_4K)
-#define PAGE_ALIGN_4K(addr)     (((addr) + PAGE_SIZE_4K - 1) & PAGE_MASK_4K)
-
-#define IOVA_PFN(addr)          ((addr) >> PAGE_SHIFT_4K)
-#define DMA_32BIT_PFN           IOVA_PFN(DMA_32BIT_MASK)
-#define DMA_64BIT_PFN           IOVA_PFN(DMA_64BIT_MASK)
-
-
-/*
- * 0: Present
- * 1-11: Reserved
- * 12-63: Context Ptr (12 - (haw-1))
- * 64-127: Reserved
- */
-struct root_entry {
-        u64     val;
-        u64     rsvd1;
-};
-#define ROOT_ENTRY_NR (PAGE_SIZE_4K/sizeof(struct root_entry))
-static inline bool root_present(struct root_entry *root)
-{
-        return (root->val & 1);
-}
-static inline void set_root_present(struct root_entry *root)
-{
-        root->val |= 1;
-}
-static inline void set_root_value(struct root_entry *root, unsigned long value)
-{
-        root->val |= value & PAGE_MASK_4K;
-}
-
-struct context_entry;
-static inline struct context_entry *
-get_context_addr_from_root(struct root_entry *root)
-{
-        return (struct context_entry *)
-                (root_present(root)?phys_to_virt(
-                root->val & PAGE_MASK_4K):
-                NULL);
-}
-
-/*
- * low 64 bits:
- * 0: present
- * 1: fault processing disable
- * 2-3: translation type
- * 12-63: address space root
- * high 64 bits:
- * 0-2: address width
- * 3-6: aval
- * 8-23: domain id
- */
-struct context_entry {
-        u64 lo;
-        u64 hi;
-};
-#define context_present(c) ((c).lo & 1)
-#define context_fault_disable(c) (((c).lo >> 1) & 1)
-#define context_translation_type(c) (((c).lo >> 2) & 3)
-#define context_address_root(c) ((c).lo & PAGE_MASK_4K)
-#define context_address_width(c) ((c).hi &  7)
-#define context_domain_id(c) (((c).hi >> 8) & ((1 << 16) - 1))
-
-#define context_set_present(c) do {(c).lo |= 1;} while (0)
-#define context_set_fault_enable(c) \
-        do {(c).lo &= (((u64)-1) << 2) | 1;} while (0)
-#define context_set_translation_type(c, val) \
-        do { \
-                (c).lo &= (((u64)-1) << 4) | 3; \
-                (c).lo |= ((val) & 3) << 2; \
-        } while (0)
-#define CONTEXT_TT_MULTI_LEVEL 0
-#define context_set_address_root(c, val) \
-        do {(c).lo |= (val) & PAGE_MASK_4K;} while (0)
-#define context_set_address_width(c, val) do {(c).hi |= (val) & 7;} while (0)
-#define context_set_domain_id(c, val) \
-        do {(c).hi |= ((val) & ((1 << 16) - 1)) << 8;} while (0)
-#define context_clear_entry(c) do {(c).lo = 0; (c).hi = 0;} while (0)
-
-/*
- * 0: readable
- * 1: writable
- * 2-6: reserved
- * 7: super page
- * 8-11: available
- * 12-63: Host physcial address
- */
-struct dma_pte {
-        u64 val;
-};
-#define dma_clear_pte(p)        do {(p).val = 0;} while (0)
-
-#define DMA_PTE_READ (1)
-#define DMA_PTE_WRITE (2)
-
-#define dma_set_pte_readable(p) do {(p).val |= DMA_PTE_READ;} while (0)
-#define dma_set_pte_writable(p) do {(p).val |= DMA_PTE_WRITE;} while (0)
-#define dma_set_pte_prot(p, prot) \
-                do {(p).val = ((p).val & ~3) | ((prot) & 3); } while (0)
-#define dma_pte_addr(p) ((p).val & PAGE_MASK_4K)
-#define dma_set_pte_addr(p, addr) do {\
-                (p).val |= ((addr) & PAGE_MASK_4K); } while (0)
-#define dma_pte_present(p) (((p).val & 3) != 0)
-
-struct intel_iommu;
-
-struct dmar_domain {
-        int     id;                     /* domain id */
-        struct intel_iommu *iommu;      /* back pointer to owning iommu */
-
-        struct list_head devices;       /* all devices' list */
-        struct iova_domain iovad;       /* iova's that belong to this domain */
-
-        struct dma_pte  *pgd;           /* virtual address */
-        spinlock_t      mapping_lock;   /* page table lock */
-        int             gaw;            /* max guest address width */
-
-        /* adjusted guest address width, 0 is level 2 30-bit */
-        int             agaw;
-
-#define DOMAIN_FLAG_MULTIPLE_DEVICES 1
-        int             flags;
-};
-
-/* PCI domain-device relationship */
-struct device_domain_info {
-        struct list_head link;  /* link to domain siblings */
-        struct list_head global; /* link to global list */
-        u8 bus;                 /* PCI bus numer */
-        u8 devfn;               /* PCI devfn number */
-        struct pci_dev *dev; /* it's NULL for PCIE-to-PCI bridge */
-        struct dmar_domain *domain; /* pointer to domain */
-};
-
-extern int init_dmars(void);
-extern void free_dmar_iommu(struct intel_iommu *iommu);
-
-extern int dmar_disabled;
-
-#ifndef CONFIG_DMAR_GFX_WA
-static inline void iommu_prepare_gfx_mapping(void)
-{
-        return;
-}
-#endif /* !CONFIG_DMAR_GFX_WA */
-
-#endif
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index bd2c01674f5e..e842e756308a 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -28,9 +28,9 @@
 
 #include <linux/pci.h>
 #include <linux/dmar.h>
+#include <linux/iova.h>
+#include <linux/intel-iommu.h>
 #include <linux/timer.h>
-#include "iova.h"
-#include "intel-iommu.h"
 
 #undef PREFIX
 #define PREFIX "DMAR:"
diff --git a/drivers/pci/hotplug/ibmphp_ebda.c b/drivers/pci/hotplug/ibmphp_ebda.c
index 8467d0287325..7d27631e6e62 100644
--- a/drivers/pci/hotplug/ibmphp_ebda.c
+++ b/drivers/pci/hotplug/ibmphp_ebda.c
@@ -276,7 +276,7 @@ int __init ibmphp_access_ebda (void)
         iounmap (io_mem);
         debug ("returned ebda segment: %x\n", ebda_seg);
         
-        io_mem = ioremap (ebda_seg<<4, 65000);
+        io_mem = ioremap(ebda_seg<<4, 1024);
         if (!io_mem )
                 return -ENOMEM;
         next_offset = 0x180;
diff --git a/drivers/pci/hotplug/rpaphp_slot.c b/drivers/pci/hotplug/rpaphp_slot.c
index 9b714ea93d20..50884507b8be 100644
--- a/drivers/pci/hotplug/rpaphp_slot.c
+++ b/drivers/pci/hotplug/rpaphp_slot.c
@@ -147,9 +147,5 @@ int rpaphp_register_slot(struct slot *slot)
         list_add(&slot->rpaphp_slot_list, &rpaphp_slot_head);
         info("Slot [%s] registered\n", slot->name);
         return 0;
-
-sysfs_fail:
-        pci_hp_deregister(php_slot);
-        return retval;
 }
 
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 389fdd6f4a9f..fc5f2dbf5323 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -33,8 +33,8 @@
 #include <linux/dma-mapping.h>
 #include <linux/mempool.h>
 #include <linux/timer.h>
-#include "iova.h"
-#include "intel-iommu.h"
+#include <linux/iova.h>
+#include <linux/intel-iommu.h>
 #include <asm/proto.h> /* force_iommu in this header in x86-64*/
 #include <asm/cacheflush.h>
 #include <asm/iommu.h>
@@ -156,7 +156,7 @@ static inline void *alloc_domain_mem(void)
         return iommu_kmem_cache_alloc(iommu_domain_cache);
 }
 
-static inline void free_domain_mem(void *vaddr)
+static void free_domain_mem(void *vaddr)
 {
         kmem_cache_free(iommu_domain_cache, vaddr);
 }
@@ -1341,7 +1341,7 @@ static void domain_remove_dev_info(struct dmar_domain *domain)
  * find_domain
  * Note: we use struct pci_dev->dev.archdata.iommu stores the info
  */
-struct dmar_domain *
+static struct dmar_domain *
 find_domain(struct pci_dev *pdev)
 {
         struct device_domain_info *info;
@@ -2318,3 +2318,111 @@ int __init intel_iommu_init(void)
         return 0;
 }
 
+void intel_iommu_domain_exit(struct dmar_domain *domain)
+{
+        u64 end;
+
+        /* Domain 0 is reserved, so dont process it */
+        if (!domain)
+                return;
+
+        end = DOMAIN_MAX_ADDR(domain->gaw);
+        end = end & (~PAGE_MASK_4K);
+
+        /* clear ptes */
+        dma_pte_clear_range(domain, 0, end);
+
+        /* free page tables */
+        dma_pte_free_pagetable(domain, 0, end);
+
+        iommu_free_domain(domain);
+        free_domain_mem(domain);
+}
+EXPORT_SYMBOL_GPL(intel_iommu_domain_exit);
+
+struct dmar_domain *intel_iommu_domain_alloc(struct pci_dev *pdev)
+{
+        struct dmar_drhd_unit *drhd;
+        struct dmar_domain *domain;
+        struct intel_iommu *iommu;
+
+        drhd = dmar_find_matched_drhd_unit(pdev);
+        if (!drhd) {
+                printk(KERN_ERR "intel_iommu_domain_alloc: drhd == NULL\n");
+                return NULL;
+        }
+
+        iommu = drhd->iommu;
+        if (!iommu) {
+                printk(KERN_ERR
+                        "intel_iommu_domain_alloc: iommu == NULL\n");
+                return NULL;
+        }
+        domain = iommu_alloc_domain(iommu);
+        if (!domain) {
+                printk(KERN_ERR
+                        "intel_iommu_domain_alloc: domain == NULL\n");
+                return NULL;
+        }
+        if (domain_init(domain, DEFAULT_DOMAIN_ADDRESS_WIDTH)) {
+                printk(KERN_ERR
+                        "intel_iommu_domain_alloc: domain_init() failed\n");
+                intel_iommu_domain_exit(domain);
+                return NULL;
+        }
+        return domain;
+}
+EXPORT_SYMBOL_GPL(intel_iommu_domain_alloc);
+
+int intel_iommu_context_mapping(
+        struct dmar_domain *domain, struct pci_dev *pdev)
+{
+        int rc;
+        rc = domain_context_mapping(domain, pdev);
+        return rc;
+}
+EXPORT_SYMBOL_GPL(intel_iommu_context_mapping);
+
+int intel_iommu_page_mapping(
+        struct dmar_domain *domain, dma_addr_t iova,
+        u64 hpa, size_t size, int prot)
+{
+        int rc;
+        rc = domain_page_mapping(domain, iova, hpa, size, prot);
+        return rc;
+}
+EXPORT_SYMBOL_GPL(intel_iommu_page_mapping);
+
+void intel_iommu_detach_dev(struct dmar_domain *domain, u8 bus, u8 devfn)
+{
+        detach_domain_for_dev(domain, bus, devfn);
+}
+EXPORT_SYMBOL_GPL(intel_iommu_detach_dev);
+
+struct dmar_domain *
+intel_iommu_find_domain(struct pci_dev *pdev)
+{
+        return find_domain(pdev);
+}
+EXPORT_SYMBOL_GPL(intel_iommu_find_domain);
+
+int intel_iommu_found(void)
+{
+        return g_num_of_iommus;
+}
+EXPORT_SYMBOL_GPL(intel_iommu_found);
+
+u64 intel_iommu_iova_to_pfn(struct dmar_domain *domain, u64 iova)
+{
+        struct dma_pte *pte;
+        u64 pfn;
+
+        pfn = 0;
+        pte = addr_to_dma_pte(domain, iova);
+
+        if (pte)
+                pfn = dma_pte_addr(*pte);
+
+        return pfn >> PAGE_SHIFT_4K;
+}
+EXPORT_SYMBOL_GPL(intel_iommu_iova_to_pfn);
diff --git a/drivers/pci/intel-iommu.h b/drivers/pci/intel-iommu.h
deleted file mode 100644
index 2142c01e0143..000000000000
--- a/drivers/pci/intel-iommu.h
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- * Copyright (c) 2006, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.
- *
- * Copyright (C) 2006-2008 Intel Corporation
- * Author: Ashok Raj <ashok.raj@intel.com>
- * Author: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
- */
-
-#ifndef _INTEL_IOMMU_H_
-#define _INTEL_IOMMU_H_
-
-#include <linux/types.h>
-#include <linux/msi.h>
-#include <linux/sysdev.h>
-#include "iova.h"
-#include <linux/io.h>
-#include <asm/cacheflush.h>
-#include "dma_remapping.h"
-
-/*
- * Intel IOMMU register specification per version 1.0 public spec.
- */
-
-#define DMAR_VER_REG    0x0     /* Arch version supported by this IOMMU */
-#define DMAR_CAP_REG    0x8     /* Hardware supported capabilities */
-#define DMAR_ECAP_REG   0x10    /* Extended capabilities supported */
-#define DMAR_GCMD_REG   0x18    /* Global command register */
-#define DMAR_GSTS_REG   0x1c    /* Global status register */
-#define DMAR_RTADDR_REG 0x20    /* Root entry table */
-#define DMAR_CCMD_REG   0x28    /* Context command reg */
-#define DMAR_FSTS_REG   0x34    /* Fault Status register */
-#define DMAR_FECTL_REG  0x38    /* Fault control register */
-#define DMAR_FEDATA_REG 0x3c    /* Fault event interrupt data register */
-#define DMAR_FEADDR_REG 0x40    /* Fault event interrupt addr register */
-#define DMAR_FEUADDR_REG 0x44   /* Upper address register */
-#define DMAR_AFLOG_REG  0x58    /* Advanced Fault control */
-#define DMAR_PMEN_REG   0x64    /* Enable Protected Memory Region */
-#define DMAR_PLMBASE_REG 0x68   /* PMRR Low addr */
-#define DMAR_PLMLIMIT_REG 0x6c  /* PMRR low limit */
-#define DMAR_PHMBASE_REG 0x70   /* pmrr high base addr */
-#define DMAR_PHMLIMIT_REG 0x78  /* pmrr high limit */
-#define DMAR_IQH_REG    0x80    /* Invalidation queue head register */
-#define DMAR_IQT_REG    0x88    /* Invalidation queue tail register */
-#define DMAR_IQA_REG    0x90    /* Invalidation queue addr register */
-#define DMAR_ICS_REG    0x98    /* Invalidation complete status register */
-#define DMAR_IRTA_REG   0xb8    /* Interrupt remapping table addr register */
-
-#define OFFSET_STRIDE           (9)
-/*
-#define dmar_readl(dmar, reg) readl(dmar + reg)
-#define dmar_readq(dmar, reg) ({ \
-                u32 lo, hi; \
-                lo = readl(dmar + reg); \
-                hi = readl(dmar + reg + 4); \
-                (((u64) hi) << 32) + lo; })
-*/
-static inline u64 dmar_readq(void __iomem *addr)
-{
-        u32 lo, hi;
-        lo = readl(addr);
-        hi = readl(addr + 4);
-        return (((u64) hi) << 32) + lo;
-}
-
-static inline void dmar_writeq(void __iomem *addr, u64 val)
-{
-        writel((u32)val, addr);
-        writel((u32)(val >> 32), addr + 4);
-}
-
-#define DMAR_VER_MAJOR(v)               (((v) & 0xf0) >> 4)
-#define DMAR_VER_MINOR(v)               ((v) & 0x0f)
-
-/*
- * Decoding Capability Register
- */
-#define cap_read_drain(c)       (((c) >> 55) & 1)
-#define cap_write_drain(c)      (((c) >> 54) & 1)
-#define cap_max_amask_val(c)    (((c) >> 48) & 0x3f)
-#define cap_num_fault_regs(c)   ((((c) >> 40) & 0xff) + 1)
-#define cap_pgsel_inv(c)        (((c) >> 39) & 1)
-
-#define cap_super_page_val(c)   (((c) >> 34) & 0xf)
-#define cap_super_offset(c)     (((find_first_bit(&cap_super_page_val(c), 4)) \
-                                        * OFFSET_STRIDE) + 21)
-
-#define cap_fault_reg_offset(c) ((((c) >> 24) & 0x3ff) * 16)
-#define cap_max_fault_reg_offset(c) \
-        (cap_fault_reg_offset(c) + cap_num_fault_regs(c) * 16)
-
-#define cap_zlr(c)              (((c) >> 22) & 1)
-#define cap_isoch(c)            (((c) >> 23) & 1)
-#define cap_mgaw(c)             ((((c) >> 16) & 0x3f) + 1)
-#define cap_sagaw(c)            (((c) >> 8) & 0x1f)
-#define cap_caching_mode(c)     (((c) >> 7) & 1)
-#define cap_phmr(c)             (((c) >> 6) & 1)
-#define cap_plmr(c)             (((c) >> 5) & 1)
-#define cap_rwbf(c)             (((c) >> 4) & 1)
-#define cap_afl(c)              (((c) >> 3) & 1)
-#define cap_ndoms(c)            (((unsigned long)1) << (4 + 2 * ((c) & 0x7)))
-/*
- * Extended Capability Register
- */
-
-#define ecap_niotlb_iunits(e)   ((((e) >> 24) & 0xff) + 1)
-#define ecap_iotlb_offset(e)    ((((e) >> 8) & 0x3ff) * 16)
-#define ecap_max_iotlb_offset(e) \
-        (ecap_iotlb_offset(e) + ecap_niotlb_iunits(e) * 16)
-#define ecap_coherent(e)        ((e) & 0x1)
-#define ecap_qis(e)             ((e) & 0x2)
-#define ecap_eim_support(e)     ((e >> 4) & 0x1)
-#define ecap_ir_support(e)      ((e >> 3) & 0x1)
-#define ecap_max_handle_mask(e) ((e >> 20) & 0xf)
-
-
-/* IOTLB_REG */
-#define DMA_TLB_GLOBAL_FLUSH (((u64)1) << 60)
-#define DMA_TLB_DSI_FLUSH (((u64)2) << 60)
-#define DMA_TLB_PSI_FLUSH (((u64)3) << 60)
-#define DMA_TLB_IIRG(type) ((type >> 60) & 7)
-#define DMA_TLB_IAIG(val) (((val) >> 57) & 7)
-#define DMA_TLB_READ_DRAIN (((u64)1) << 49)
-#define DMA_TLB_WRITE_DRAIN (((u64)1) << 48)
-#define DMA_TLB_DID(id) (((u64)((id) & 0xffff)) << 32)
-#define DMA_TLB_IVT (((u64)1) << 63)
-#define DMA_TLB_IH_NONLEAF (((u64)1) << 6)
-#define DMA_TLB_MAX_SIZE (0x3f)
-
-/* INVALID_DESC */
-#define DMA_ID_TLB_GLOBAL_FLUSH (((u64)1) << 3)
-#define DMA_ID_TLB_DSI_FLUSH    (((u64)2) << 3)
-#define DMA_ID_TLB_PSI_FLUSH    (((u64)3) << 3)
-#define DMA_ID_TLB_READ_DRAIN   (((u64)1) << 7)
-#define DMA_ID_TLB_WRITE_DRAIN  (((u64)1) << 6)
-#define DMA_ID_TLB_DID(id)      (((u64)((id & 0xffff) << 16)))
-#define DMA_ID_TLB_IH_NONLEAF   (((u64)1) << 6)
-#define DMA_ID_TLB_ADDR(addr)   (addr)
-#define DMA_ID_TLB_ADDR_MASK(mask)      (mask)
-
-/* PMEN_REG */
-#define DMA_PMEN_EPM (((u32)1)<<31)
-#define DMA_PMEN_PRS (((u32)1)<<0)
-
-/* GCMD_REG */
-#define DMA_GCMD_TE (((u32)1) << 31)
-#define DMA_GCMD_SRTP (((u32)1) << 30)
-#define DMA_GCMD_SFL (((u32)1) << 29)
-#define DMA_GCMD_EAFL (((u32)1) << 28)
-#define DMA_GCMD_WBF (((u32)1) << 27)
-#define DMA_GCMD_QIE (((u32)1) << 26)
-#define DMA_GCMD_SIRTP (((u32)1) << 24)
-#define DMA_GCMD_IRE (((u32) 1) << 25)
-
-/* GSTS_REG */
-#define DMA_GSTS_TES (((u32)1) << 31)
-#define DMA_GSTS_RTPS (((u32)1) << 30)
-#define DMA_GSTS_FLS (((u32)1) << 29)
-#define DMA_GSTS_AFLS (((u32)1) << 28)
-#define DMA_GSTS_WBFS (((u32)1) << 27)
-#define DMA_GSTS_QIES (((u32)1) << 26)
-#define DMA_GSTS_IRTPS (((u32)1) << 24)
-#define DMA_GSTS_IRES (((u32)1) << 25)
-
-/* CCMD_REG */
-#define DMA_CCMD_ICC (((u64)1) << 63)
-#define DMA_CCMD_GLOBAL_INVL (((u64)1) << 61)
-#define DMA_CCMD_DOMAIN_INVL (((u64)2) << 61)
-#define DMA_CCMD_DEVICE_INVL (((u64)3) << 61)
-#define DMA_CCMD_FM(m) (((u64)((m) & 0x3)) << 32)
-#define DMA_CCMD_MASK_NOBIT 0
-#define DMA_CCMD_MASK_1BIT 1
-#define DMA_CCMD_MASK_2BIT 2
-#define DMA_CCMD_MASK_3BIT 3
-#define DMA_CCMD_SID(s) (((u64)((s) & 0xffff)) << 16)
-#define DMA_CCMD_DID(d) ((u64)((d) & 0xffff))
-
-/* FECTL_REG */
-#define DMA_FECTL_IM (((u32)1) << 31)
-
-/* FSTS_REG */
-#define DMA_FSTS_PPF ((u32)2)
-#define DMA_FSTS_PFO ((u32)1)
-#define dma_fsts_fault_record_index(s) (((s) >> 8) & 0xff)
-
-/* FRCD_REG, 32 bits access */
-#define DMA_FRCD_F (((u32)1) << 31)
-#define dma_frcd_type(d) ((d >> 30) & 1)
-#define dma_frcd_fault_reason(c) (c & 0xff)
-#define dma_frcd_source_id(c) (c & 0xffff)
-#define dma_frcd_page_addr(d) (d & (((u64)-1) << 12)) /* low 64 bit */
-
-#define DMAR_OPERATION_TIMEOUT ((cycles_t) tsc_khz*10*1000) /* 10sec */
-
-#define IOMMU_WAIT_OP(iommu, offset, op, cond, sts) \
-{\
-        cycles_t start_time = get_cycles();\
-        while (1) {\
-                sts = op (iommu->reg + offset);\
-                if (cond)\
-                        break;\
-                if (DMAR_OPERATION_TIMEOUT < (get_cycles() - start_time))\
-                        panic("DMAR hardware is malfunctioning\n");\
-                cpu_relax();\
-        }\
-}
-
-#define QI_LENGTH       256     /* queue length */
-
-enum {
-        QI_FREE,
-        QI_IN_USE,
-        QI_DONE
-};
-
-#define QI_CC_TYPE              0x1
-#define QI_IOTLB_TYPE           0x2
-#define QI_DIOTLB_TYPE          0x3
-#define QI_IEC_TYPE             0x4
-#define QI_IWD_TYPE             0x5
-
-#define QI_IEC_SELECTIVE        (((u64)1) << 4)
-#define QI_IEC_IIDEX(idx)       (((u64)(idx & 0xffff) << 32))
-#define QI_IEC_IM(m)            (((u64)(m & 0x1f) << 27))
-
-#define QI_IWD_STATUS_DATA(d)   (((u64)d) << 32)
-#define QI_IWD_STATUS_WRITE     (((u64)1) << 5)
-
-struct qi_desc {
-        u64 low, high;
-};
-
-struct q_inval {
-        spinlock_t      q_lock;
-        struct qi_desc  *desc;          /* invalidation queue */
-        int             *desc_status;   /* desc status */
-        int             free_head;      /* first free entry */
-        int             free_tail;      /* last free entry */
-        int             free_cnt;
-};
-
-#ifdef CONFIG_INTR_REMAP
-/* 1MB - maximum possible interrupt remapping table size */
-#define INTR_REMAP_PAGE_ORDER   8
-#define INTR_REMAP_TABLE_REG_SIZE       0xf
-
-#define INTR_REMAP_TABLE_ENTRIES        65536
-
-struct ir_table {
-        struct irte *base;
-};
-#endif
-
-struct intel_iommu {
-        void __iomem    *reg; /* Pointer to hardware regs, virtual addr */
-        u64             cap;
-        u64             ecap;
-        int             seg;
-        u32             gcmd; /* Holds TE, EAFL. Don't need SRTP, SFL, WBF */
-        spinlock_t      register_lock; /* protect register handling */
-        int             seq_id; /* sequence id of the iommu */
-
-#ifdef CONFIG_DMAR
-        unsigned long   *domain_ids; /* bitmap of domains */
-        struct dmar_domain **domains; /* ptr to domains */
-        spinlock_t      lock; /* protect context, domain ids */
-        struct root_entry *root_entry; /* virtual address */
-
-        unsigned int irq;
-        unsigned char name[7];    /* Device Name */
-        struct msi_msg saved_msg;
-        struct sys_device sysdev;
-#endif
-        struct q_inval  *qi;            /* Queued invalidation info */
-#ifdef CONFIG_INTR_REMAP
-        struct ir_table *ir_table;      /* Interrupt remapping info */
-#endif
-};
-
-static inline void __iommu_flush_cache(
-        struct intel_iommu *iommu, void *addr, int size)
-{
-        if (!ecap_coherent(iommu->ecap))
-                clflush_cache_range(addr, size);
-}
-
-extern struct dmar_drhd_unit * dmar_find_matched_drhd_unit(struct pci_dev *dev);
-
-extern int alloc_iommu(struct dmar_drhd_unit *drhd);
-extern void free_iommu(struct intel_iommu *iommu);
-extern int dmar_enable_qi(struct intel_iommu *iommu);
-extern void qi_global_iec(struct intel_iommu *iommu);
-
-extern void qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu);
-#endif
diff --git a/drivers/pci/intr_remapping.c b/drivers/pci/intr_remapping.c
index bb642cc5e18c..738d4c89581c 100644
--- a/drivers/pci/intr_remapping.c
+++ b/drivers/pci/intr_remapping.c
@@ -4,7 +4,7 @@
 #include <linux/pci.h>
 #include <linux/irq.h>
 #include <asm/io_apic.h>
-#include "intel-iommu.h"
+#include <linux/intel-iommu.h>
 #include "intr_remapping.h"
 
 static struct ioapic_scope ir_ioapic[MAX_IO_APICS];
diff --git a/drivers/pci/intr_remapping.h b/drivers/pci/intr_remapping.h
index 05f2635bbe4e..ca48f0df8ac9 100644
--- a/drivers/pci/intr_remapping.h
+++ b/drivers/pci/intr_remapping.h
@@ -1,4 +1,4 @@
-#include "intel-iommu.h"
+#include <linux/intel-iommu.h>
 
 struct ioapic_scope {
         struct intel_iommu *iommu;
diff --git a/drivers/pci/iova.c b/drivers/pci/iova.c
index 3ef4ac064315..2287116e9822 100644
--- a/drivers/pci/iova.c
+++ b/drivers/pci/iova.c
@@ -7,7 +7,7 @@
  * Author: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
  */
 
-#include "iova.h"
+#include <linux/iova.h>
 
 void
 init_iova_domain(struct iova_domain *iovad, unsigned long pfn_32bit)
diff --git a/drivers/pci/iova.h b/drivers/pci/iova.h
deleted file mode 100644
index 228f6c94b69c..000000000000
--- a/drivers/pci/iova.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2006, Intel Corporation.
- *
- * This file is released under the GPLv2.
- *
- * Copyright (C) 2006-2008 Intel Corporation
- * Author: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
- *
- */
-
-#ifndef _IOVA_H_
-#define _IOVA_H_
-
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/rbtree.h>
-#include <linux/dma-mapping.h>
-
-/* IO virtual address start page frame number */
-#define IOVA_START_PFN          (1)
-
-/* iova structure */
-struct iova {
-        struct rb_node  node;
-        unsigned long   pfn_hi; /* IOMMU dish out addr hi */
-        unsigned long   pfn_lo; /* IOMMU dish out addr lo */
-};
-
-/* holds all the iova translations for a domain */
-struct iova_domain {
-        spinlock_t      iova_alloc_lock;/* Lock to protect iova  allocation */
-        spinlock_t      iova_rbtree_lock; /* Lock to protect update of rbtree */
-        struct rb_root  rbroot;         /* iova domain rbtree root */
-        struct rb_node  *cached32_node; /* Save last alloced node */
-        unsigned long   dma_32bit_pfn;
-};
-
-struct iova *alloc_iova_mem(void);
-void free_iova_mem(struct iova *iova);
-void free_iova(struct iova_domain *iovad, unsigned long pfn);
-void __free_iova(struct iova_domain *iovad, struct iova *iova);
-struct iova *alloc_iova(struct iova_domain *iovad, unsigned long size,
-        unsigned long limit_pfn,
-        bool size_aligned);
-struct iova *reserve_iova(struct iova_domain *iovad, unsigned long pfn_lo,
-        unsigned long pfn_hi);
-void copy_reserved_iova(struct iova_domain *from, struct iova_domain *to);
-void init_iova_domain(struct iova_domain *iovad, unsigned long pfn_32bit);
-struct iova *find_iova(struct iova_domain *iovad, unsigned long pfn);
-void put_iova_domain(struct iova_domain *iovad);
-
-#endif
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 36698e57b97f..dd9161a054e1 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1237,8 +1237,11 @@ EXPORT_SYMBOL(pci_scan_bridge);
 EXPORT_SYMBOL_GPL(pci_scan_child_bus);
 #endif
 
-static int __init pci_sort_bf_cmp(const struct pci_dev *a, const struct pci_dev *b)
+static int __init pci_sort_bf_cmp(const struct device *d_a, const struct device *d_b)
 {
+        const struct pci_dev *a = to_pci_dev(d_a);
+        const struct pci_dev *b = to_pci_dev(d_b);
+
         if      (pci_domain_nr(a->bus) < pci_domain_nr(b->bus)) return -1;
         else if (pci_domain_nr(a->bus) > pci_domain_nr(b->bus)) return  1;
 
@@ -1251,50 +1254,7 @@ static int __init pci_sort_bf_cmp(const struct pci_dev *a, const struct pci_dev
         return 0;
 }
 
-/*
- * Yes, this forcably breaks the klist abstraction temporarily.  It
- * just wants to sort the klist, not change reference counts and
- * take/drop locks rapidly in the process.  It does all this while
- * holding the lock for the list, so objects can't otherwise be
- * added/removed while we're swizzling.
- */
-static void __init pci_insertion_sort_klist(struct pci_dev *a, struct list_head *list)
-{
-        struct list_head *pos;
-        struct klist_node *n;
-        struct device *dev;
-        struct pci_dev *b;
-
-        list_for_each(pos, list) {
-                n = container_of(pos, struct klist_node, n_node);
-                dev = container_of(n, struct device, knode_bus);
-                b = to_pci_dev(dev);
-                if (pci_sort_bf_cmp(a, b) <= 0) {
-                        list_move_tail(&a->dev.knode_bus.n_node, &b->dev.knode_bus.n_node);
-                        return;
-                }
-        }
-        list_move_tail(&a->dev.knode_bus.n_node, list);
-}
-
 void __init pci_sort_breadthfirst(void)
 {
-        LIST_HEAD(sorted_devices);
-        struct list_head *pos, *tmp;
-        struct klist_node *n;
-        struct device *dev;
-        struct pci_dev *pdev;
-        struct klist *device_klist;
-
-        device_klist = bus_get_device_klist(&pci_bus_type);
-
-        spin_lock(&device_klist->k_lock);
-        list_for_each_safe(pos, tmp, &device_klist->k_list) {
-                n = container_of(pos, struct klist_node, n_node);
-                dev = container_of(n, struct device, knode_bus);
-                pdev = to_pci_dev(dev);
-                pci_insertion_sort_klist(pdev, &sorted_devices);
-        }
-        list_splice(&sorted_devices, &device_klist->k_list);
-        spin_unlock(&device_klist->k_lock);
+        bus_sort_breadthfirst(&pci_bus_type, &pci_sort_bf_cmp);
 }
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 9236e7f869c8..e872ac925b4b 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -1561,8 +1561,7 @@ static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_f
                 if ((f->vendor == dev->vendor || f->vendor == (u16) PCI_ANY_ID) &&
                     (f->device == dev->device || f->device == (u16) PCI_ANY_ID)) {
 #ifdef DEBUG
-                        dev_dbg(&dev->dev, "calling ");
-                        print_fn_descriptor_symbol("%s\n", f->hook);
+                        dev_dbg(&dev->dev, "calling %pF\n", f->hook);
 #endif
                         f->hook(dev);
                 }
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 3abbfad9ddab..d5e2106760f8 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -378,11 +378,10 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned long
         align = 0;
         min_align = 0;
         for (order = 0; order <= max_order; order++) {
-#ifdef CONFIG_RESOURCES_64BIT
-                resource_size_t align1 = 1ULL << (order + 20);
-#else
-                resource_size_t align1 = 1U << (order + 20);
-#endif
+                resource_size_t align1 = 1;
+
+                align1 <<= (order + 20);
+
                 if (!align)
                         min_align = align1;
                 else if (ALIGN(align + min_align, min_align) < align1)
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index a87902de8d3b..b46c60b72708 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -2,10 +2,6 @@
 # Makefile for the kernel pcmcia subsystem (c/o David Hinds)
 #
 
-ifeq ($(CONFIG_PCMCIA_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
-
 pcmcia_core-y                                   += cs.o cistpl.o rsrc_mgr.o socket_sysfs.o
 pcmcia_core-$(CONFIG_CARDBUS)                   += cardbus.o
 obj-$(CONFIG_PCCARD)                            += pcmcia_core.o
@@ -68,10 +64,11 @@ sa1100_cs-$(CONFIG_SA1100_SHANNON)		+= sa1100_shannon.o
 sa1100_cs-$(CONFIG_SA1100_SIMPAD)               += sa1100_simpad.o
 
 pxa2xx_lubbock_cs-y                             += pxa2xx_lubbock.o sa1111_generic.o
+pxa2xx_cm_x2xx_cs-y                             += pxa2xx_cm_x2xx.o pxa2xx_cm_x255.o pxa2xx_cm_x270.o
 pxa2xx-obj-$(CONFIG_ARCH_LUBBOCK)               += pxa2xx_lubbock_cs.o
 pxa2xx-obj-$(CONFIG_MACH_MAINSTONE)             += pxa2xx_mainstone.o
 pxa2xx-obj-$(CONFIG_PXA_SHARPSL)                += pxa2xx_sharpsl.o
-pxa2xx-obj-$(CONFIG_MACH_ARMCORE)               += pxa2xx_cm_x2xx.o pxa2xx_cm_x255.o pxa2xx_cm_x270.o
+pxa2xx-obj-$(CONFIG_MACH_ARMCORE)               += pxa2xx_cm_x2xx_cs.o
 pxa2xx-obj-$(CONFIG_ARCH_VIPER)                 += pxa2xx_viper.o
 pxa2xx-obj-$(CONFIG_TRIZEPS_PCMCIA)             += pxa2xx_trizeps.o
 pxa2xx-obj-$(CONFIG_MACH_PALMTX)                += pxa2xx_palmtx.o
diff --git a/drivers/pcmcia/au1000_generic.c b/drivers/pcmcia/au1000_generic.c
index 75e8f8505e47..fc1de46fd20a 100644
--- a/drivers/pcmcia/au1000_generic.c
+++ b/drivers/pcmcia/au1000_generic.c
@@ -292,7 +292,7 @@ au1x00_pcmcia_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *map)
                 skt->spd_io[map->map] = speed;
         }
 
-        map->start=(ioaddr_t)(u32)skt->virt_io;
+        map->start=(unsigned int)(u32)skt->virt_io;
         map->stop=map->start+MAP_SIZE;
         return 0;
 
diff --git a/drivers/pcmcia/au1000_generic.h b/drivers/pcmcia/au1000_generic.h
index a53ef5902518..13a4fbc58711 100644
--- a/drivers/pcmcia/au1000_generic.h
+++ b/drivers/pcmcia/au1000_generic.h
@@ -116,7 +116,7 @@ struct au1000_pcmcia_socket {
         struct resource         res_attr;
 
         void *                  virt_io;
-        ioaddr_t                phys_io;
+        unsigned int            phys_io;
         unsigned int            phys_attr;
         unsigned int            phys_mem;
         unsigned short          speed_io, speed_attr, speed_mem;
diff --git a/drivers/pcmcia/au1000_pb1x00.c b/drivers/pcmcia/au1000_pb1x00.c
index aa1cd4d3aa29..d6b4bd1db7d7 100644
--- a/drivers/pcmcia/au1000_pb1x00.c
+++ b/drivers/pcmcia/au1000_pb1x00.c
@@ -37,7 +37,6 @@
 #include <pcmcia/ss.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/bus_ops.h>
-#include "cs_internal.h"
 
 #include <asm/io.h>
 #include <asm/irq.h>
diff --git a/drivers/pcmcia/au1000_xxs1500.c b/drivers/pcmcia/au1000_xxs1500.c
index 8a9b18cee847..9627390835ca 100644
--- a/drivers/pcmcia/au1000_xxs1500.c
+++ b/drivers/pcmcia/au1000_xxs1500.c
@@ -41,7 +41,6 @@
 #include <pcmcia/ss.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/bus_ops.h>
-#include "cs_internal.h"
 
 #include <asm/io.h>
 #include <asm/irq.h>
diff --git a/drivers/pcmcia/cardbus.c b/drivers/pcmcia/cardbus.c
index 911ca0e8dfc2..db77e1f3309a 100644
--- a/drivers/pcmcia/cardbus.c
+++ b/drivers/pcmcia/cardbus.c
@@ -238,7 +238,7 @@ int __ref cb_alloc(struct pcmcia_socket * s)
         pci_bus_add_devices(bus);
 
         s->irq.AssignedIRQ = s->pci_irq;
-        return CS_SUCCESS;
+        return 0;
 }
 
 void cb_free(struct pcmcia_socket * s)
diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c
index 65129b54eb09..dcce9f5d8465 100644
--- a/drivers/pcmcia/cistpl.c
+++ b/drivers/pcmcia/cistpl.c
@@ -92,7 +92,8 @@ set_cis_map(struct pcmcia_socket *s, unsigned int card_offset, unsigned int flag
         if (!(s->features & SS_CAP_STATIC_MAP) && (mem->res == NULL)) {
                 mem->res = pcmcia_find_mem_region(0, s->map_size, s->map_size, 0, s);
                 if (mem->res == NULL) {
-                        printk(KERN_NOTICE "cs: unable to map card memory!\n");
+                        dev_printk(KERN_NOTICE, &s->dev,
+                                   "cs: unable to map card memory!\n");
                         return NULL;
                 }
                 s->cis_virt = NULL;
@@ -265,13 +266,13 @@ EXPORT_SYMBOL(pcmcia_write_cis_mem);
 ======================================================================*/
 
 static void read_cis_cache(struct pcmcia_socket *s, int attr, u_int addr,
-                           u_int len, void *ptr)
+                           size_t len, void *ptr)
 {
     struct cis_cache_entry *cis;
     int ret;
 
     if (s->fake_cis) {
-        if (s->fake_cis_len > addr+len)
+        if (s->fake_cis_len >= addr+len)
             memcpy(ptr, s->fake_cis+addr, len);
         else
             memset(ptr, 0xff, len);
@@ -351,7 +352,9 @@ int verify_cis_cache(struct pcmcia_socket *s)
 
         buf = kmalloc(256, GFP_KERNEL);
         if (buf == NULL)
-                return -1;
+                dev_printk(KERN_WARNING, &s->dev,
+                           "no memory for verifying CIS\n");
+                return -ENOMEM;
         list_for_each_entry(cis, &s->cis_cache, node) {
                 int len = cis->len;
 
@@ -380,18 +383,22 @@ int verify_cis_cache(struct pcmcia_socket *s)
     
 ======================================================================*/
 
-int pcmcia_replace_cis(struct pcmcia_socket *s, cisdump_t *cis)
+int pcmcia_replace_cis(struct pcmcia_socket *s,
+                       const u8 *data, const size_t len)
 {
-    kfree(s->fake_cis);
-    s->fake_cis = NULL;
-    if (cis->Length > CISTPL_MAX_CIS_SIZE)
-        return CS_BAD_SIZE;
-    s->fake_cis = kmalloc(cis->Length, GFP_KERNEL);
-    if (s->fake_cis == NULL)
-        return CS_OUT_OF_RESOURCE;
-    s->fake_cis_len = cis->Length;
-    memcpy(s->fake_cis, cis->Data, cis->Length);
-    return CS_SUCCESS;
+        if (len > CISTPL_MAX_CIS_SIZE) {
+                dev_printk(KERN_WARNING, &s->dev, "replacement CIS too big\n");
+                return -EINVAL;
+        }
+        kfree(s->fake_cis);
+        s->fake_cis = kmalloc(len, GFP_KERNEL);
+        if (s->fake_cis == NULL) {
+                dev_printk(KERN_WARNING, &s->dev, "no memory to replace CIS\n");
+                return -ENOMEM;
+        }
+        s->fake_cis_len = len;
+        memcpy(s->fake_cis, data, len);
+        return 0;
 }
 EXPORT_SYMBOL(pcmcia_replace_cis);
 
@@ -418,9 +425,9 @@ int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int func, tuple_t *t
 int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function, tuple_t *tuple)
 {
     if (!s)
-        return CS_BAD_HANDLE;
+        return -EINVAL;
     if (!(s->state & SOCKET_PRESENT))
-        return CS_NO_CARD;
+        return -ENODEV;
     tuple->TupleLink = tuple->Flags = 0;
 #ifdef CONFIG_CARDBUS
     if (s->state & SOCKET_CARDBUS) {
@@ -440,10 +447,10 @@ int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function, tuple
         !(tuple->Attributes & TUPLE_RETURN_COMMON)) {
         cisdata_t req = tuple->DesiredTuple;
         tuple->DesiredTuple = CISTPL_LONGLINK_MFC;
-        if (pccard_get_next_tuple(s, function, tuple) == CS_SUCCESS) {
+        if (pccard_get_next_tuple(s, function, tuple) == 0) {
             tuple->DesiredTuple = CISTPL_LINKTARGET;
-            if (pccard_get_next_tuple(s, function, tuple) != CS_SUCCESS)
-                return CS_NO_MORE_ITEMS;
+            if (pccard_get_next_tuple(s, function, tuple) != 0)
+                return -ENOSPC;
         } else
             tuple->CISOffset = tuple->TupleLink = 0;
         tuple->DesiredTuple = req;
@@ -498,9 +505,9 @@ int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function, tuple_
     int ofs, i, attr;
 
     if (!s)
-        return CS_BAD_HANDLE;
+        return -EINVAL;
     if (!(s->state & SOCKET_PRESENT))
-        return CS_NO_CARD;
+        return -ENODEV;
 
     link[1] = tuple->TupleLink;
     ofs = tuple->CISOffset + tuple->TupleLink;
@@ -519,7 +526,7 @@ int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function, tuple_
         /* End of chain?  Follow long link if possible */
         if (link[0] == CISTPL_END) {
             if ((ofs = follow_link(s, tuple)) < 0)
-                return CS_NO_MORE_ITEMS;
+                return -ENOSPC;
             attr = SPACE(tuple->Flags);
             read_cis_cache(s, attr, ofs, 2, link);
         }
@@ -577,13 +584,13 @@ int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function, tuple_
     }
     if (i == MAX_TUPLES) {
         cs_dbg(s, 1, "cs: overrun in pcmcia_get_next_tuple\n");
-        return CS_NO_MORE_ITEMS;
+        return -ENOSPC;
     }
     
     tuple->TupleCode = link[0];
     tuple->TupleLink = link[1];
     tuple->CISOffset = ofs + 2;
-    return CS_SUCCESS;
+    return 0;
 }
 EXPORT_SYMBOL(pccard_get_next_tuple);
 
@@ -596,18 +603,18 @@ int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple)
     u_int len;
 
     if (!s)
-        return CS_BAD_HANDLE;
+        return -EINVAL;
 
     if (tuple->TupleLink < tuple->TupleOffset)
-        return CS_NO_MORE_ITEMS;
+        return -ENOSPC;
     len = tuple->TupleLink - tuple->TupleOffset;
     tuple->TupleDataLen = tuple->TupleLink;
     if (len == 0)
-        return CS_SUCCESS;
+        return 0;
     read_cis_cache(s, SPACE(tuple->Flags),
                    tuple->CISOffset + tuple->TupleOffset,
                    _MIN(len, tuple->TupleDataMax), tuple->TupleData);
-    return CS_SUCCESS;
+    return 0;
 }
 EXPORT_SYMBOL(pccard_get_tuple_data);
 
@@ -640,25 +647,31 @@ static int parse_device(tuple_t *tuple, cistpl_device_t *device)
         case 3: device->dev[i].speed = 150; break;
         case 4: device->dev[i].speed = 100; break;
         case 7:
-            if (++p == q) return CS_BAD_TUPLE;
+            if (++p == q)
+                    return -EINVAL;
             device->dev[i].speed = SPEED_CVT(*p);
             while (*p & 0x80)
-                if (++p == q) return CS_BAD_TUPLE;
+                if (++p == q)
+                        return -EINVAL;
             break;
         default:
-            return CS_BAD_TUPLE;
+            return -EINVAL;
         }
 
-        if (++p == q) return CS_BAD_TUPLE;
-        if (*p == 0xff) break;
+        if (++p == q)
+                return -EINVAL;
+        if (*p == 0xff)
+                break;
         scale = *p & 7;
-        if (scale == 7) return CS_BAD_TUPLE;
+        if (scale == 7)
+                return -EINVAL;
         device->dev[i].size = ((*p >> 3) + 1) * (512 << (scale*2));
         device->ndev++;
-        if (++p == q) break;
+        if (++p == q)
+                break;
     }
     
-    return CS_SUCCESS;
+    return 0;
 }
 
 /*====================================================================*/
@@ -667,12 +680,12 @@ static int parse_checksum(tuple_t *tuple, cistpl_checksum_t *csum)
 {
     u_char *p;
     if (tuple->TupleDataLen < 5)
-        return CS_BAD_TUPLE;
+        return -EINVAL;
     p = (u_char *) tuple->TupleData;
     csum->addr = tuple->CISOffset + get_unaligned_le16(p) - 2;
     csum->len = get_unaligned_le16(p + 2);
     csum->sum = *(p + 4);
-    return CS_SUCCESS;
+    return 0;
 }
 
 /*====================================================================*/
@@ -680,9 +693,9 @@ static int parse_checksum(tuple_t *tuple, cistpl_checksum_t *csum)
 static int parse_longlink(tuple_t *tuple, cistpl_longlink_t *link)
 {
     if (tuple->TupleDataLen < 4)
-        return CS_BAD_TUPLE;
+        return -EINVAL;
     link->addr = get_unaligned_le32(tuple->TupleData);
-    return CS_SUCCESS;
+    return 0;
 }
 
 /*====================================================================*/
@@ -697,13 +710,13 @@ static int parse_longlink_mfc(tuple_t *tuple,
     
     link->nfn = *p; p++;
     if (tuple->TupleDataLen <= link->nfn*5)
-        return CS_BAD_TUPLE;
+        return -EINVAL;
     for (i = 0; i < link->nfn; i++) {
         link->fn[i].space = *p; p++;
         link->fn[i].addr = get_unaligned_le32(p);
         p += 4;
     }
-    return CS_SUCCESS;
+    return 0;
 }
 
 /*====================================================================*/
@@ -713,24 +726,27 @@ static int parse_strings(u_char *p, u_char *q, int max,
 {
     int i, j, ns;
 
-    if (p == q) return CS_BAD_TUPLE;
+    if (p == q)
+            return -EINVAL;
     ns = 0; j = 0;
     for (i = 0; i < max; i++) {
-        if (*p == 0xff) break;
+        if (*p == 0xff)
+                break;
         ofs[i] = j;
         ns++;
         for (;;) {
             s[j++] = (*p == 0xff) ? '\0' : *p;
             if ((*p == '\0') || (*p == 0xff)) break;
-            if (++p == q) return CS_BAD_TUPLE;
+            if (++p == q)
+                    return -EINVAL;
         }
         if ((*p == 0xff) || (++p == q)) break;
     }
     if (found) {
         *found = ns;
-        return CS_SUCCESS;
+        return 0;
     } else {
-        return (ns == max) ? CS_SUCCESS : CS_BAD_TUPLE;
+        return (ns == max) ? 0 : -EINVAL;
     }
 }
 
@@ -745,7 +761,8 @@ static int parse_vers_1(tuple_t *tuple, cistpl_vers_1_t *vers_1)
     
     vers_1->major = *p; p++;
     vers_1->minor = *p; p++;
-    if (p >= q) return CS_BAD_TUPLE;
+    if (p >= q)
+            return -EINVAL;
 
     return parse_strings(p, q, CISTPL_VERS_1_MAX_PROD_STRINGS,
                          vers_1->str, vers_1->ofs, &vers_1->ns);
@@ -781,7 +798,7 @@ static int parse_jedec(tuple_t *tuple, cistpl_jedec_t *jedec)
         p += 2;
     }
     jedec->nid = nid;
-    return CS_SUCCESS;
+    return 0;
 }
 
 /*====================================================================*/
@@ -789,10 +806,10 @@ static int parse_jedec(tuple_t *tuple, cistpl_jedec_t *jedec)
 static int parse_manfid(tuple_t *tuple, cistpl_manfid_t *m)
 {
     if (tuple->TupleDataLen < 4)
-        return CS_BAD_TUPLE;
+        return -EINVAL;
     m->manf = get_unaligned_le16(tuple->TupleData);
     m->card = get_unaligned_le16(tuple->TupleData + 2);
-    return CS_SUCCESS;
+    return 0;
 }
 
 /*====================================================================*/
@@ -801,11 +818,11 @@ static int parse_funcid(tuple_t *tuple, cistpl_funcid_t *f)
 {
     u_char *p;
     if (tuple->TupleDataLen < 2)
-        return CS_BAD_TUPLE;
+        return -EINVAL;
     p = (u_char *)tuple->TupleData;
     f->func = p[0];
     f->sysinit = p[1];
-    return CS_SUCCESS;
+    return 0;
 }
 
 /*====================================================================*/
@@ -815,12 +832,12 @@ static int parse_funce(tuple_t *tuple, cistpl_funce_t *f)
     u_char *p;
     int i;
     if (tuple->TupleDataLen < 1)
-        return CS_BAD_TUPLE;
+        return -EINVAL;
     p = (u_char *)tuple->TupleData;
     f->type = p[0];
     for (i = 1; i < tuple->TupleDataLen; i++)
         f->data[i-1] = p[i];
-    return CS_SUCCESS;
+    return 0;
 }
 
 /*====================================================================*/
@@ -834,7 +851,7 @@ static int parse_config(tuple_t *tuple, cistpl_config_t *config)
     rasz = *p & 0x03;
     rmsz = (*p & 0x3c) >> 2;
     if (tuple->TupleDataLen < rasz+rmsz+4)
-        return CS_BAD_TUPLE;
+        return -EINVAL;
     config->last_idx = *(++p);
     p++;
     config->base = 0;
@@ -846,7 +863,7 @@ static int parse_config(tuple_t *tuple, cistpl_config_t *config)
     for (i = 0; i <= rmsz; i++)
         config->rmask[i>>2] += p[i] << (8*(i%4));
     config->subtuples = tuple->TupleDataLen - (rasz+rmsz+4);
-    return CS_SUCCESS;
+    return 0;
 }
 
 /*======================================================================
@@ -1002,10 +1019,12 @@ static u_char *parse_mem(u_char *p, u_char *q, cistpl_mem_t *mem)
 
 static u_char *parse_irq(u_char *p, u_char *q, cistpl_irq_t *irq)
 {
-    if (p == q) return NULL;
+    if (p == q)
+            return NULL;
     irq->IRQInfo1 = *p; p++;
     if (irq->IRQInfo1 & IRQ_INFO2_VALID) {
-        if (p+2 > q) return NULL;
+        if (p+2 > q)
+                return NULL;
         irq->IRQInfo2 = (p[1]<<8) + p[0];
         p += 2;
     }
@@ -1026,7 +1045,8 @@ static int parse_cftable_entry(tuple_t *tuple,
     if (*p & 0x40)
         entry->flags |= CISTPL_CFTABLE_DEFAULT;
     if (*p & 0x80) {
-        if (++p == q) return CS_BAD_TUPLE;
+        if (++p == q)
+                return -EINVAL;
         if (*p & 0x10)
             entry->flags |= CISTPL_CFTABLE_BVDS;
         if (*p & 0x20)
@@ -1040,30 +1060,35 @@ static int parse_cftable_entry(tuple_t *tuple,
         entry->interface = 0;
 
     /* Process optional features */
-    if (++p == q) return CS_BAD_TUPLE;
+    if (++p == q)
+            return -EINVAL;
     features = *p; p++;
 
     /* Power options */
     if ((features & 3) > 0) {
         p = parse_power(p, q, &entry->vcc);
-        if (p == NULL) return CS_BAD_TUPLE;
+        if (p == NULL)
+                return -EINVAL;
     } else
         entry->vcc.present = 0;
     if ((features & 3) > 1) {
         p = parse_power(p, q, &entry->vpp1);
-        if (p == NULL) return CS_BAD_TUPLE;
+        if (p == NULL)
+                return -EINVAL;
     } else
         entry->vpp1.present = 0;
     if ((features & 3) > 2) {
         p = parse_power(p, q, &entry->vpp2);
-        if (p == NULL) return CS_BAD_TUPLE;
+        if (p == NULL)
+                return -EINVAL;
     } else
         entry->vpp2.present = 0;
 
     /* Timing options */
     if (features & 0x04) {
         p = parse_timing(p, q, &entry->timing);
-        if (p == NULL) return CS_BAD_TUPLE;
+        if (p == NULL)
+                return -EINVAL;
     } else {
         entry->timing.wait = 0;
         entry->timing.ready = 0;
@@ -1073,14 +1098,16 @@ static int parse_cftable_entry(tuple_t *tuple,
     /* I/O window options */
     if (features & 0x08) {
         p = parse_io(p, q, &entry->io);
-        if (p == NULL) return CS_BAD_TUPLE;
+        if (p == NULL)
+                return -EINVAL;
     } else
         entry->io.nwin = 0;
     
     /* Interrupt options */
     if (features & 0x10) {
         p = parse_irq(p, q, &entry->irq);
-        if (p == NULL) return CS_BAD_TUPLE;
+        if (p == NULL)
+                return -EINVAL;
     } else
         entry->irq.IRQInfo1 = 0;
 
@@ -1094,7 +1121,8 @@ static int parse_cftable_entry(tuple_t *tuple,
         entry->mem.win[0].card_addr = 0;
         entry->mem.win[0].host_addr = 0;
         p += 2;
-        if (p > q) return CS_BAD_TUPLE;
+        if (p > q)
+                return -EINVAL;
         break;
     case 0x40:
         entry->mem.nwin = 1;
@@ -1102,26 +1130,30 @@ static int parse_cftable_entry(tuple_t *tuple,
         entry->mem.win[0].card_addr = get_unaligned_le16(p + 2) << 8;
         entry->mem.win[0].host_addr = 0;
         p += 4;
-        if (p > q) return CS_BAD_TUPLE;
+        if (p > q)
+                return -EINVAL;
         break;
     case 0x60:
         p = parse_mem(p, q, &entry->mem);
-        if (p == NULL) return CS_BAD_TUPLE;
+        if (p == NULL)
+                return -EINVAL;
         break;
     }
 
     /* Misc features */
     if (features & 0x80) {
-        if (p == q) return CS_BAD_TUPLE;
+        if (p == q)
+                return -EINVAL;
         entry->flags |= (*p << 8);
         while (*p & 0x80)
-            if (++p == q) return CS_BAD_TUPLE;
+            if (++p == q)
+                    return -EINVAL;
         p++;
     }
 
     entry->subtuples = q-p;
     
-    return CS_SUCCESS;
+    return 0;
 }
 
 /*====================================================================*/
@@ -1132,12 +1164,12 @@ static int parse_bar(tuple_t *tuple, cistpl_bar_t *bar)
 {
     u_char *p;
     if (tuple->TupleDataLen < 6)
-        return CS_BAD_TUPLE;
+        return -EINVAL;
     p = (u_char *)tuple->TupleData;
     bar->attr = *p;
     p += 2;
     bar->size = get_unaligned_le32(p);
-    return CS_SUCCESS;
+    return 0;
 }
 
 static int parse_config_cb(tuple_t *tuple, cistpl_config_t *config)
@@ -1146,12 +1178,12 @@ static int parse_config_cb(tuple_t *tuple, cistpl_config_t *config)
     
     p = (u_char *)tuple->TupleData;
     if ((*p != 3) || (tuple->TupleDataLen < 6))
-        return CS_BAD_TUPLE;
+        return -EINVAL;
     config->last_idx = *(++p);
     p++;
     config->base = get_unaligned_le32(p);
     config->subtuples = tuple->TupleDataLen - 6;
-    return CS_SUCCESS;
+    return 0;
 }
 
 static int parse_cftable_entry_cb(tuple_t *tuple,
@@ -1167,29 +1199,34 @@ static int parse_cftable_entry_cb(tuple_t *tuple,
         entry->flags |= CISTPL_CFTABLE_DEFAULT;
 
     /* Process optional features */
-    if (++p == q) return CS_BAD_TUPLE;
+    if (++p == q)
+            return -EINVAL;
     features = *p; p++;
 
     /* Power options */
     if ((features & 3) > 0) {
         p = parse_power(p, q, &entry->vcc);
-        if (p == NULL) return CS_BAD_TUPLE;
+        if (p == NULL)
+                return -EINVAL;
     } else
         entry->vcc.present = 0;
     if ((features & 3) > 1) {
         p = parse_power(p, q, &entry->vpp1);
-        if (p == NULL) return CS_BAD_TUPLE;
+        if (p == NULL)
+                return -EINVAL;
     } else
         entry->vpp1.present = 0;
     if ((features & 3) > 2) {
         p = parse_power(p, q, &entry->vpp2);
-        if (p == NULL) return CS_BAD_TUPLE;
+        if (p == NULL)
+                return -EINVAL;
     } else
         entry->vpp2.present = 0;
 
     /* I/O window options */
     if (features & 0x08) {
-        if (p == q) return CS_BAD_TUPLE;
+        if (p == q)
+                return -EINVAL;
         entry->io = *p; p++;
     } else
         entry->io = 0;
@@ -1197,32 +1234,37 @@ static int parse_cftable_entry_cb(tuple_t *tuple,
     /* Interrupt options */
     if (features & 0x10) {
         p = parse_irq(p, q, &entry->irq);
-        if (p == NULL) return CS_BAD_TUPLE;
+        if (p == NULL)
+                return -EINVAL;
     } else
         entry->irq.IRQInfo1 = 0;
 
     if (features & 0x20) {
-        if (p == q) return CS_BAD_TUPLE;
+        if (p == q)
+                return -EINVAL;
         entry->mem = *p; p++;
     } else
         entry->mem = 0;
 
     /* Misc features */
     if (features & 0x80) {
-        if (p == q) return CS_BAD_TUPLE;
+        if (p == q)
+                return -EINVAL;
         entry->flags |= (*p << 8);
         if (*p & 0x80) {
-            if (++p == q) return CS_BAD_TUPLE;
+            if (++p == q)
+                    return -EINVAL;
             entry->flags |= (*p << 16);
         }
         while (*p & 0x80)
-            if (++p == q) return CS_BAD_TUPLE;
+            if (++p == q)
+                    return -EINVAL;
         p++;
     }
 
     entry->subtuples = q-p;
     
-    return CS_SUCCESS;
+    return 0;
 }
 
 #endif
@@ -1248,7 +1290,7 @@ static int parse_device_geo(tuple_t *tuple, cistpl_device_geo_t *geo)
         p += 6;
     }
     geo->ngeo = n;
-    return CS_SUCCESS;
+    return 0;
 }
 
 /*====================================================================*/
@@ -1258,7 +1300,7 @@ static int parse_vers_2(tuple_t *tuple, cistpl_vers_2_t *v2)
     u_char *p, *q;
 
     if (tuple->TupleDataLen < 10)
-        return CS_BAD_TUPLE;
+        return -EINVAL;
     
     p = tuple->TupleData;
     q = p + tuple->TupleDataLen;
@@ -1282,15 +1324,18 @@ static int parse_org(tuple_t *tuple, cistpl_org_t *org)
     
     p = tuple->TupleData;
     q = p + tuple->TupleDataLen;
-    if (p == q) return CS_BAD_TUPLE;
+    if (p == q)
+            return -EINVAL;
     org->data_org = *p;
-    if (++p == q) return CS_BAD_TUPLE;
+    if (++p == q)
+            return -EINVAL;
     for (i = 0; i < 30; i++) {
         org->desc[i] = *p;
         if (*p == '\0') break;
-        if (++p == q) return CS_BAD_TUPLE;
+        if (++p == q)
+                return -EINVAL;
     }
-    return CS_SUCCESS;
+    return 0;
 }
 
 /*====================================================================*/
@@ -1300,7 +1345,7 @@ static int parse_format(tuple_t *tuple, cistpl_format_t *fmt)
     u_char *p;
 
     if (tuple->TupleDataLen < 10)
-        return CS_BAD_TUPLE;
+        return -EINVAL;
 
     p = tuple->TupleData;
 
@@ -1309,17 +1354,17 @@ static int parse_format(tuple_t *tuple, cistpl_format_t *fmt)
     fmt->offset = get_unaligned_le32(p + 2);
     fmt->length = get_unaligned_le32(p + 6);
 
-    return CS_SUCCESS;
+    return 0;
 }
 
 /*====================================================================*/
 
-int pccard_parse_tuple(tuple_t *tuple, cisparse_t *parse)
+int pcmcia_parse_tuple(tuple_t *tuple, cisparse_t *parse)
 {
-    int ret = CS_SUCCESS;
+    int ret = 0;
     
     if (tuple->TupleDataLen > tuple->TupleDataMax)
-        return CS_BAD_TUPLE;
+        return -EINVAL;
     switch (tuple->TupleCode) {
     case CISTPL_DEVICE:
     case CISTPL_DEVICE_A:
@@ -1387,15 +1432,17 @@ int pccard_parse_tuple(tuple_t *tuple, cisparse_t *parse)
         break;
     case CISTPL_NO_LINK:
     case CISTPL_LINKTARGET:
-        ret = CS_SUCCESS;
+        ret = 0;
         break;
     default:
-        ret = CS_UNSUPPORTED_FUNCTION;
+        ret = -EINVAL;
         break;
     }
+    if (ret)
+            __cs_dbg(0, "parse_tuple failed %d\n", ret);
     return ret;
 }
-EXPORT_SYMBOL(pccard_parse_tuple);
+EXPORT_SYMBOL(pcmcia_parse_tuple);
 
 /*======================================================================
 
@@ -1410,18 +1457,22 @@ int pccard_read_tuple(struct pcmcia_socket *s, unsigned int function, cisdata_t
     int ret;
 
     buf = kmalloc(256, GFP_KERNEL);
-    if (buf == NULL)
-        return CS_OUT_OF_RESOURCE;
+    if (buf == NULL) {
+            dev_printk(KERN_WARNING, &s->dev, "no memory to read tuple\n");
+            return -ENOMEM;
+    }
     tuple.DesiredTuple = code;
     tuple.Attributes = TUPLE_RETURN_COMMON;
     ret = pccard_get_first_tuple(s, function, &tuple);
-    if (ret != CS_SUCCESS) goto done;
+    if (ret != 0)
+            goto done;
     tuple.TupleData = buf;
     tuple.TupleOffset = 0;
     tuple.TupleDataMax = 255;
     ret = pccard_get_tuple_data(s, &tuple);
-    if (ret != CS_SUCCESS) goto done;
-    ret = pccard_parse_tuple(&tuple, parse);
+    if (ret != 0)
+            goto done;
+    ret = pcmcia_parse_tuple(&tuple, parse);
 done:
     kfree(buf);
     return ret;
@@ -1446,37 +1497,40 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, unsigned
     int ret, reserved, dev_ok = 0, ident_ok = 0;
 
     if (!s)
-        return CS_BAD_HANDLE;
+        return -EINVAL;
 
     tuple = kmalloc(sizeof(*tuple), GFP_KERNEL);
-    if (tuple == NULL)
-        return CS_OUT_OF_RESOURCE;
+    if (tuple == NULL) {
+            dev_printk(KERN_WARNING, &s->dev, "no memory to validate CIS\n");
+            return -ENOMEM;
+    }
     p = kmalloc(sizeof(*p), GFP_KERNEL);
     if (p == NULL) {
-        kfree(tuple);
-        return CS_OUT_OF_RESOURCE;
+            kfree(tuple);
+            dev_printk(KERN_WARNING, &s->dev, "no memory to validate CIS\n");
+            return -ENOMEM;
     }
 
     count = reserved = 0;
     tuple->DesiredTuple = RETURN_FIRST_TUPLE;
     tuple->Attributes = TUPLE_RETURN_COMMON;
     ret = pccard_get_first_tuple(s, function, tuple);
-    if (ret != CS_SUCCESS)
+    if (ret != 0)
         goto done;
 
     /* First tuple should be DEVICE; we should really have either that
        or a CFTABLE_ENTRY of some sort */
     if ((tuple->TupleCode == CISTPL_DEVICE) ||
-        (pccard_read_tuple(s, function, CISTPL_CFTABLE_ENTRY, p) == CS_SUCCESS) ||
-        (pccard_read_tuple(s, function, CISTPL_CFTABLE_ENTRY_CB, p) == CS_SUCCESS))
+        (pccard_read_tuple(s, function, CISTPL_CFTABLE_ENTRY, p) == 0) ||
+        (pccard_read_tuple(s, function, CISTPL_CFTABLE_ENTRY_CB, p) == 0))
         dev_ok++;
 
     /* All cards should have a MANFID tuple, and/or a VERS_1 or VERS_2
        tuple, for card identification.  Certain old D-Link and Linksys
        cards have only a broken VERS_2 tuple; hence the bogus test. */
-    if ((pccard_read_tuple(s, function, CISTPL_MANFID, p) == CS_SUCCESS) ||
-        (pccard_read_tuple(s, function, CISTPL_VERS_1, p) == CS_SUCCESS) ||
-        (pccard_read_tuple(s, function, CISTPL_VERS_2, p) != CS_NO_MORE_ITEMS))
+    if ((pccard_read_tuple(s, function, CISTPL_MANFID, p) == 0) ||
+        (pccard_read_tuple(s, function, CISTPL_VERS_1, p) == 0) ||
+        (pccard_read_tuple(s, function, CISTPL_VERS_2, p) != -ENOSPC))
         ident_ok++;
 
     if (!dev_ok && !ident_ok)
@@ -1484,7 +1538,8 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, unsigned
 
     for (count = 1; count < MAX_TUPLES; count++) {
         ret = pccard_get_next_tuple(s, function, tuple);
-        if (ret != CS_SUCCESS) break;
+        if (ret != 0)
+                break;
         if (((tuple->TupleCode > 0x23) && (tuple->TupleCode < 0x40)) ||
             ((tuple->TupleCode > 0x47) && (tuple->TupleCode < 0x80)) ||
             ((tuple->TupleCode > 0x90) && (tuple->TupleCode < 0xff)))
@@ -1499,6 +1554,6 @@ done:
             *info = count;
     kfree(tuple);
     kfree(p);
-    return CS_SUCCESS;
+    return 0;
 }
 EXPORT_SYMBOL(pccard_validate_cis);
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index d1207393fc3e..c68c5d338285 100644
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -61,7 +61,7 @@ INT_MODULE_PARM(unreset_limit,	30);		/* unreset_check's */
 /* Access speed for attribute memory windows */
 INT_MODULE_PARM(cis_speed,      300);           /* ns */
 
-#ifdef DEBUG
+#ifdef CONFIG_PCMCIA_DEBUG
 static int pc_debug;
 
 module_param(pc_debug, int, 0644);
@@ -247,7 +247,8 @@ int pcmcia_register_socket(struct pcmcia_socket *socket)
 
         wait_for_completion(&socket->thread_done);
         if (!socket->thread) {
-                printk(KERN_WARNING "PCMCIA: warning: socket thread for socket %p did not start\n", socket);
+                dev_printk(KERN_WARNING, &socket->dev,
+                           "PCMCIA: warning: socket thread did not start\n");
                 return -EIO;
         }
 
@@ -366,16 +367,16 @@ static int socket_reset(struct pcmcia_socket *skt)
                 skt->ops->get_status(skt, &status);
 
                 if (!(status & SS_DETECT))
-                        return CS_NO_CARD;
+                        return -ENODEV;
 
                 if (status & SS_READY)
-                        return CS_SUCCESS;
+                        return 0;
 
                 msleep(unreset_check * 10);
         }
 
         cs_err(skt, "time out after reset.\n");
-        return CS_GENERAL_FAILURE;
+        return -ETIMEDOUT;
 }
 
 /*
@@ -412,7 +413,8 @@ static void socket_shutdown(struct pcmcia_socket *s)
 
         s->ops->get_status(s, &status);
         if (status & SS_POWERON) {
-                printk(KERN_ERR "PCMCIA: socket %p: *** DANGER *** unable to remove socket power\n", s);
+                dev_printk(KERN_ERR, &s->dev,
+                           "*** DANGER *** unable to remove socket power\n");
         }
 
         cs_socket_put(s);
@@ -426,14 +428,14 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay)
 
         skt->ops->get_status(skt, &status);
         if (!(status & SS_DETECT))
-                return CS_NO_CARD;
+                return -ENODEV;
 
         msleep(initial_delay * 10);
 
         for (i = 0; i < 100; i++) {
                 skt->ops->get_status(skt, &status);
                 if (!(status & SS_DETECT))
-                        return CS_NO_CARD;
+                        return -ENODEV;
 
                 if (!(status & SS_PENDING))
                         break;
@@ -443,13 +445,13 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay)
 
         if (status & SS_PENDING) {
                 cs_err(skt, "voltage interrogation timed out.\n");
-                return CS_GENERAL_FAILURE;
+                return -ETIMEDOUT;
         }
 
         if (status & SS_CARDBUS) {
                 if (!(skt->features & SS_CAP_CARDBUS)) {
                         cs_err(skt, "cardbus cards are not supported.\n");
-                        return CS_BAD_TYPE;
+                        return -EINVAL;
                 }
                 skt->state |= SOCKET_CARDBUS;
         }
@@ -463,7 +465,7 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay)
                 skt->socket.Vcc = skt->socket.Vpp = 50;
         else {
                 cs_err(skt, "unsupported voltage key.\n");
-                return CS_BAD_TYPE;
+                return -EIO;
         }
 
         if (skt->power_hook)
@@ -480,7 +482,7 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay)
         skt->ops->get_status(skt, &status);
         if (!(status & SS_POWERON)) {
                 cs_err(skt, "unable to apply power.\n");
-                return CS_BAD_TYPE;
+                return -EIO;
         }
 
         status = socket_reset(skt);
@@ -502,15 +504,16 @@ static int socket_insert(struct pcmcia_socket *skt)
         cs_dbg(skt, 4, "insert\n");
 
         if (!cs_socket_get(skt))
-                return CS_NO_CARD;
+                return -ENODEV;
 
         ret = socket_setup(skt, setup_delay);
-        if (ret == CS_SUCCESS) {
+        if (ret == 0) {
                 skt->state |= SOCKET_PRESENT;
 
-                printk(KERN_NOTICE "pccard: %s card inserted into slot %d\n",
-                       (skt->state & SOCKET_CARDBUS) ? "CardBus" : "PCMCIA",
-                       skt->sock);
+                dev_printk(KERN_NOTICE, &skt->dev,
+                           "pccard: %s card inserted into slot %d\n",
+                           (skt->state & SOCKET_CARDBUS) ? "CardBus" : "PCMCIA",
+                           skt->sock);
 
 #ifdef CONFIG_CARDBUS
                 if (skt->state & SOCKET_CARDBUS) {
@@ -531,7 +534,7 @@ static int socket_insert(struct pcmcia_socket *skt)
 static int socket_suspend(struct pcmcia_socket *skt)
 {
         if (skt->state & SOCKET_SUSPEND)
-                return CS_IN_USE;
+                return -EBUSY;
 
         send_event(skt, CS_EVENT_PM_SUSPEND, CS_EVENT_PRI_LOW);
         skt->socket = dead_socket;
@@ -540,7 +543,7 @@ static int socket_suspend(struct pcmcia_socket *skt)
                 skt->ops->suspend(skt);
         skt->state |= SOCKET_SUSPEND;
 
-        return CS_SUCCESS;
+        return 0;
 }
 
 /*
@@ -553,7 +556,7 @@ static int socket_resume(struct pcmcia_socket *skt)
         int ret;
 
         if (!(skt->state & SOCKET_SUSPEND))
-                return CS_IN_USE;
+                return -EBUSY;
 
         skt->socket = dead_socket;
         skt->ops->init(skt);
@@ -565,7 +568,7 @@ static int socket_resume(struct pcmcia_socket *skt)
         }
 
         ret = socket_setup(skt, resume_delay);
-        if (ret == CS_SUCCESS) {
+        if (ret == 0) {
                 /*
                  * FIXME: need a better check here for cardbus cards.
                  */
@@ -590,12 +593,13 @@ static int socket_resume(struct pcmcia_socket *skt)
 
         skt->state &= ~SOCKET_SUSPEND;
 
-        return CS_SUCCESS;
+        return 0;
 }
 
 static void socket_remove(struct pcmcia_socket *skt)
 {
-        printk(KERN_NOTICE "pccard: card ejected from slot %d\n", skt->sock);
+        dev_printk(KERN_NOTICE, &skt->dev,
+                   "pccard: card ejected from slot %d\n", skt->sock);
         socket_shutdown(skt);
 }
 
@@ -641,8 +645,8 @@ static int pccardd(void *__skt)
         /* register with the device core */
         ret = device_register(&skt->dev);
         if (ret) {
-                printk(KERN_WARNING "PCMCIA: unable to register socket 0x%p\n",
-                        skt);
+                dev_printk(KERN_WARNING, &skt->dev,
+                           "PCMCIA: unable to register socket\n");
                 skt->thread = NULL;
                 complete(&skt->thread_done);
                 return 0;
@@ -748,7 +752,7 @@ EXPORT_SYMBOL(pccard_register_pcmcia);
  * CIS register.
  */
 
-int pccard_reset_card(struct pcmcia_socket *skt)
+int pcmcia_reset_card(struct pcmcia_socket *skt)
 {
         int ret;
 
@@ -757,15 +761,15 @@ int pccard_reset_card(struct pcmcia_socket *skt)
         mutex_lock(&skt->skt_mutex);
         do {
                 if (!(skt->state & SOCKET_PRESENT)) {
-                        ret = CS_NO_CARD;
+                        ret = -ENODEV;
                         break;
                 }
                 if (skt->state & SOCKET_SUSPEND) {
-                        ret = CS_IN_USE;
+                        ret = -EBUSY;
                         break;
                 }
                 if (skt->state & SOCKET_CARDBUS) {
-                        ret = CS_UNSUPPORTED_FUNCTION;
+                        ret = -EPERM;
                         break;
                 }
 
@@ -774,20 +778,20 @@ int pccard_reset_card(struct pcmcia_socket *skt)
                         send_event(skt, CS_EVENT_RESET_PHYSICAL, CS_EVENT_PRI_LOW);
                         if (skt->callback)
                                 skt->callback->suspend(skt);
-                        if (socket_reset(skt) == CS_SUCCESS) {
+                        if (socket_reset(skt) == 0) {
                                 send_event(skt, CS_EVENT_CARD_RESET, CS_EVENT_PRI_LOW);
                                 if (skt->callback)
                                         skt->callback->resume(skt);
                         }
                 }
 
-                ret = CS_SUCCESS;
+                ret = 0;
         } while (0);
         mutex_unlock(&skt->skt_mutex);
 
         return ret;
 } /* reset_card */
-EXPORT_SYMBOL(pccard_reset_card);
+EXPORT_SYMBOL(pcmcia_reset_card);
 
 
 /* These shut down or wake up a socket.  They are sort of user
@@ -802,11 +806,11 @@ int pcmcia_suspend_card(struct pcmcia_socket *skt)
         mutex_lock(&skt->skt_mutex);
         do {
                 if (!(skt->state & SOCKET_PRESENT)) {
-                        ret = CS_NO_CARD;
+                        ret = -ENODEV;
                         break;
                 }
                 if (skt->state & SOCKET_CARDBUS) {
-                        ret = CS_UNSUPPORTED_FUNCTION;
+                        ret = -EPERM;
                         break;
                 }
                 if (skt->callback) {
@@ -832,11 +836,11 @@ int pcmcia_resume_card(struct pcmcia_socket *skt)
         mutex_lock(&skt->skt_mutex);
         do {
                 if (!(skt->state & SOCKET_PRESENT)) {
-                        ret = CS_NO_CARD;
+                        ret = -ENODEV;
                         break;
                 }
                 if (skt->state & SOCKET_CARDBUS) {
-                        ret = CS_UNSUPPORTED_FUNCTION;
+                        ret = -EPERM;
                         break;
                 }
                 ret = socket_resume(skt);
@@ -892,7 +896,7 @@ int pcmcia_insert_card(struct pcmcia_socket *skt)
                         ret = -EBUSY;
                         break;
                 }
-                if (socket_insert(skt) == CS_NO_CARD) {
+                if (socket_insert(skt) == -ENODEV) {
                         ret = -ENODEV;
                         break;
                 }
diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h
index 63dc1a28bda2..79615e6d540b 100644
--- a/drivers/pcmcia/cs_internal.h
+++ b/drivers/pcmcia/cs_internal.h
@@ -1,5 +1,5 @@
 /*
- * cs_internal.h
+ * cs_internal.h -- definitions internal to the PCMCIA core modules
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -10,6 +10,12 @@
  * are Copyright (C) 1999 David A. Hinds.  All Rights Reserved.
  *
  * (C) 1999             David A. Hinds
+ * (C) 2003 - 2008      Dominik Brodowski
+ *
+ *
+ * This file contains definitions _only_ needed by the PCMCIA core modules.
+ * It must not be included by PCMCIA socket drivers or by PCMCIA device
+ * drivers.
  */
 
 #ifndef _LINUX_CS_INTERNAL_H
@@ -18,29 +24,24 @@
 #include <linux/kref.h>
 
 /* Flags in client state */
-#define CLIENT_CONFIG_LOCKED    0x0001
-#define CLIENT_IRQ_REQ          0x0002
-#define CLIENT_IO_REQ           0x0004
-#define CLIENT_UNBOUND          0x0008
-#define CLIENT_STALE            0x0010
 #define CLIENT_WIN_REQ(i)       (0x1<<(i))
-#define CLIENT_CARDBUS          0x8000
 
 /* Each card function gets one of these guys */
 typedef struct config_t {
         struct kref     ref;
-    u_int               state;
-    u_int               Attributes;
-    u_int               IntType;
-    u_int               ConfigBase;
-    u_char              Status, Pin, Copy, Option, ExtStatus;
-    u_int               CardValues;
-    io_req_t            io;
-    struct {
-        u_int           Attributes;
-    } irq;
+        unsigned int    state;
+        unsigned int    Attributes;
+        unsigned int    IntType;
+        unsigned int    ConfigBase;
+        unsigned char   Status, Pin, Copy, Option, ExtStatus;
+        unsigned int    CardValues;
+        io_req_t        io;
+        struct {
+                u_int   Attributes;
+        } irq;
 } config_t;
 
+
 struct cis_cache_entry {
         struct list_head        node;
         unsigned int            addr;
@@ -49,6 +50,30 @@ struct cis_cache_entry {
         unsigned char           cache[0];
 };
 
+struct pccard_resource_ops {
+        int     (*validate_mem)         (struct pcmcia_socket *s);
+        int     (*adjust_io_region)     (struct resource *res,
+                                         unsigned long r_start,
+                                         unsigned long r_end,
+                                         struct pcmcia_socket *s);
+        struct resource* (*find_io)     (unsigned long base, int num,
+                                         unsigned long align,
+                                         struct pcmcia_socket *s);
+        struct resource* (*find_mem)    (unsigned long base, unsigned long num,
+                                         unsigned long align, int low,
+                                         struct pcmcia_socket *s);
+        int     (*add_io)               (struct pcmcia_socket *s,
+                                         unsigned int action,
+                                         unsigned long r_start,
+                                         unsigned long r_end);
+        int     (*add_mem)              (struct pcmcia_socket *s,
+                                         unsigned int action,
+                                         unsigned long r_start,
+                                         unsigned long r_end);
+        int     (*init)                 (struct pcmcia_socket *s);
+        void    (*exit)                 (struct pcmcia_socket *s);
+};
+
 /* Flags in config state */
 #define CONFIG_LOCKED           0x01
 #define CONFIG_IRQ_REQ          0x02
@@ -59,7 +84,6 @@ struct cis_cache_entry {
 #define SOCKET_INUSE            0x0010
 #define SOCKET_SUSPEND          0x0080
 #define SOCKET_WIN_REQ(i)       (0x0100<<(i))
-#define SOCKET_REGION_INFO      0x4000
 #define SOCKET_CARDBUS          0x8000
 #define SOCKET_CARDBUS_CONFIG   0x10000
 
@@ -83,69 +107,153 @@ static inline void cs_socket_put(struct pcmcia_socket *skt)
         }
 }
 
-/* In cardbus.c */
-int cb_alloc(struct pcmcia_socket *s);
-void cb_free(struct pcmcia_socket *s);
-int read_cb_mem(struct pcmcia_socket *s, int space, u_int addr, u_int len, void *ptr);
+#ifdef CONFIG_PCMCIA_DEBUG
+extern int cs_debug_level(int);
 
-/* In cistpl.c */
-int pcmcia_read_cis_mem(struct pcmcia_socket *s, int attr,
-                 u_int addr, u_int len, void *ptr);
-void pcmcia_write_cis_mem(struct pcmcia_socket *s, int attr,
-                   u_int addr, u_int len, void *ptr);
-void release_cis_mem(struct pcmcia_socket *s);
-void destroy_cis_cache(struct pcmcia_socket *s);
+#define cs_dbg(skt, lvl, fmt, arg...) do {              \
+        if (cs_debug_level(lvl))                        \
+                dev_printk(KERN_DEBUG, &skt->dev,       \
+                 "cs: " fmt, ## arg);                   \
+} while (0)
+#define __cs_dbg(lvl, fmt, arg...) do {                 \
+        if (cs_debug_level(lvl))                        \
+                printk(KERN_DEBUG                       \
+                 "cs: " fmt, ## arg);                   \
+} while (0)
+
+#else
+#define cs_dbg(skt, lvl, fmt, arg...) do { } while (0)
+#define __cs_dbg(lvl, fmt, arg...) do { } while (0)
+#endif
+
+#define cs_err(skt, fmt, arg...) \
+        dev_printk(KERN_ERR, &skt->dev, "cs: " fmt, ## arg)
+
+
+/*
+ * Stuff internal to module "pcmcia_core":
+ */
+
+/* cistpl.c */
 int verify_cis_cache(struct pcmcia_socket *s);
-int pccard_read_tuple(struct pcmcia_socket *s, unsigned int function, cisdata_t code, void *parse);
 
-/* In rsrc_mgr */
-int pcmcia_validate_mem(struct pcmcia_socket *s);
-struct resource *pcmcia_find_io_region(unsigned long base, int num, unsigned long align,
-                   struct pcmcia_socket *s);
-int pcmcia_adjust_io_region(struct resource *res, unsigned long r_start,
-                     unsigned long r_end, struct pcmcia_socket *s);
-struct resource *pcmcia_find_mem_region(u_long base, u_long num, u_long align,
-                    int low, struct pcmcia_socket *s);
+/* rsrc_mgr.c */
 void release_resource_db(struct pcmcia_socket *s);
 
-/* In socket_sysfs.c */
+/* socket_sysfs.c */
 extern int pccard_sysfs_add_socket(struct device *dev);
 extern void pccard_sysfs_remove_socket(struct device *dev);
 
-/* In cs.c */
-extern struct rw_semaphore pcmcia_socket_list_rwsem;
-extern struct list_head pcmcia_socket_list;
-int pcmcia_get_window(struct pcmcia_socket *s, window_handle_t *handle, int idx, win_req_t *req);
-int pccard_get_configuration_info(struct pcmcia_socket *s, struct pcmcia_device *p_dev, config_info_t *config);
-int pccard_reset_card(struct pcmcia_socket *skt);
+/* cardbus.c */
+int cb_alloc(struct pcmcia_socket *s);
+void cb_free(struct pcmcia_socket *s);
+int read_cb_mem(struct pcmcia_socket *s, int space, u_int addr, u_int len,
+                void *ptr);
+
 
 
+/*
+ * Stuff exported by module "pcmcia_core" to module "pcmcia"
+ */
+
 struct pcmcia_callback{
         struct module   *owner;
-        int             (*event) (struct pcmcia_socket *s, event_t event, int priority);
+        int             (*event) (struct pcmcia_socket *s,
+                                  event_t event, int priority);
         void            (*requery) (struct pcmcia_socket *s, int new_cis);
         int             (*suspend) (struct pcmcia_socket *s);
         int             (*resume) (struct pcmcia_socket *s);
 };
 
+/* cs.c */
+extern struct rw_semaphore pcmcia_socket_list_rwsem;
+extern struct list_head pcmcia_socket_list;
+extern struct class pcmcia_socket_class;
+
+int pcmcia_get_window(struct pcmcia_socket *s,
+                      window_handle_t *handle,
+                      int idx,
+                      win_req_t *req);
 int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c);
+struct pcmcia_socket *pcmcia_get_socket_by_nr(unsigned int nr);
 
-#define cs_socket_name(skt)     ((skt)->dev.bus_id)
+int pcmcia_suspend_card(struct pcmcia_socket *skt);
+int pcmcia_resume_card(struct pcmcia_socket *skt);
 
-#ifdef DEBUG
-extern int cs_debug_level(int);
+int pcmcia_eject_card(struct pcmcia_socket *skt);
+int pcmcia_insert_card(struct pcmcia_socket *skt);
 
-#define cs_dbg(skt, lvl, fmt, arg...) do {              \
-        if (cs_debug_level(lvl))                        \
-                printk(KERN_DEBUG "cs: %s: " fmt,       \
-                       cs_socket_name(skt) , ## arg);   \
-} while (0)
+struct pcmcia_socket *pcmcia_get_socket(struct pcmcia_socket *skt);
+void pcmcia_put_socket(struct pcmcia_socket *skt);
 
-#else
-#define cs_dbg(skt, lvl, fmt, arg...) do { } while (0)
-#endif
+/* cistpl.c */
+int pcmcia_read_cis_mem(struct pcmcia_socket *s, int attr,
+                        u_int addr, u_int len, void *ptr);
+void pcmcia_write_cis_mem(struct pcmcia_socket *s, int attr,
+                          u_int addr, u_int len, void *ptr);
+void release_cis_mem(struct pcmcia_socket *s);
+void destroy_cis_cache(struct pcmcia_socket *s);
+int pccard_read_tuple(struct pcmcia_socket *s, unsigned int function,
+                      cisdata_t code, void *parse);
+int pcmcia_replace_cis(struct pcmcia_socket *s,
+                       const u8 *data, const size_t len);
+int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function,
+                        unsigned int *count);
 
-#define cs_err(skt, fmt, arg...) \
-        printk(KERN_ERR "cs: %s: " fmt, (skt)->dev.bus_id , ## arg)
+/* rsrc_mgr.c */
+int pcmcia_validate_mem(struct pcmcia_socket *s);
+struct resource *pcmcia_find_io_region(unsigned long base,
+                                       int num,
+                                       unsigned long align,
+                                       struct pcmcia_socket *s);
+int pcmcia_adjust_io_region(struct resource *res,
+                            unsigned long r_start,
+                            unsigned long r_end,
+                            struct pcmcia_socket *s);
+struct resource *pcmcia_find_mem_region(u_long base,
+                                        u_long num,
+                                        u_long align,
+                                        int low,
+                                        struct pcmcia_socket *s);
+
+/*
+ * Stuff internal to module "pcmcia".
+ */
+/* ds.c */
+extern struct bus_type pcmcia_bus_type;
+
+/* pcmcia_resource.c */
+extern int pcmcia_release_configuration(struct pcmcia_device *p_dev);
+
+#ifdef CONFIG_PCMCIA_IOCTL
+/* ds.c */
+extern spinlock_t pcmcia_dev_list_lock;
+
+extern struct pcmcia_device *pcmcia_get_dev(struct pcmcia_device *p_dev);
+extern void pcmcia_put_dev(struct pcmcia_device *p_dev);
+
+struct pcmcia_device *pcmcia_device_add(struct pcmcia_socket *s,
+                                        unsigned int function);
+
+/* pcmcia_ioctl.c */
+extern void __init pcmcia_setup_ioctl(void);
+extern void __exit pcmcia_cleanup_ioctl(void);
+extern void handle_event(struct pcmcia_socket *s, event_t event);
+extern int handle_request(struct pcmcia_socket *s, event_t event);
+
+#else /* CONFIG_PCMCIA_IOCTL */
+
+static inline void __init pcmcia_setup_ioctl(void) { return; }
+static inline void __exit pcmcia_cleanup_ioctl(void) { return; }
+static inline void handle_event(struct pcmcia_socket *s, event_t event)
+{
+        return;
+}
+static inline int handle_request(struct pcmcia_socket *s, event_t event)
+{
+        return 0;
+}
+
+#endif /* CONFIG_PCMCIA_IOCTL */
 
 #endif /* _LINUX_CS_INTERNAL_H */
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 34c83d3ca0fa..795660255490 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -32,7 +32,6 @@
 #include <pcmcia/ss.h>
 
 #include "cs_internal.h"
-#include "ds_internal.h"
 
 /*====================================================================*/
 
@@ -42,17 +41,22 @@ MODULE_AUTHOR("David Hinds <dahinds@users.sourceforge.net>");
 MODULE_DESCRIPTION("PCMCIA Driver Services");
 MODULE_LICENSE("GPL");
 
-#ifdef DEBUG
+#ifdef CONFIG_PCMCIA_DEBUG
 int ds_pc_debug;
 
 module_param_named(pc_debug, ds_pc_debug, int, 0644);
 
 #define ds_dbg(lvl, fmt, arg...) do {                           \
-        if (ds_pc_debug > (lvl))                                        \
+        if (ds_pc_debug > (lvl))                                \
                 printk(KERN_DEBUG "ds: " fmt , ## arg);         \
 } while (0)
+#define ds_dev_dbg(lvl, dev, fmt, arg...) do {                          \
+        if (ds_pc_debug > (lvl))                                        \
+                dev_printk(KERN_DEBUG, dev, "ds: " fmt , ## arg);       \
+} while (0)
 #else
 #define ds_dbg(lvl, fmt, arg...) do { } while (0)
+#define ds_dev_dbg(lvl, dev, fmt, arg...) do { } while (0)
 #endif
 
 spinlock_t pcmcia_dev_list_lock;
@@ -64,42 +68,19 @@ spinlock_t pcmcia_dev_list_lock;
 /* String tables for error messages */
 
 typedef struct lookup_t {
-    int key;
-    char *msg;
+    const int key;
+    const char *msg;
 } lookup_t;
 
 static const lookup_t error_table[] = {
-    { CS_SUCCESS,               "Operation succeeded" },
-    { CS_BAD_ADAPTER,           "Bad adapter" },
-    { CS_BAD_ATTRIBUTE,         "Bad attribute", },
-    { CS_BAD_BASE,              "Bad base address" },
-    { CS_BAD_EDC,               "Bad EDC" },
-    { CS_BAD_IRQ,               "Bad IRQ" },
-    { CS_BAD_OFFSET,            "Bad offset" },
-    { CS_BAD_PAGE,              "Bad page number" },
-    { CS_READ_FAILURE,          "Read failure" },
-    { CS_BAD_SIZE,              "Bad size" },
-    { CS_BAD_SOCKET,            "Bad socket" },
-    { CS_BAD_TYPE,              "Bad type" },
-    { CS_BAD_VCC,               "Bad Vcc" },
-    { CS_BAD_VPP,               "Bad Vpp" },
-    { CS_BAD_WINDOW,            "Bad window" },
-    { CS_WRITE_FAILURE,         "Write failure" },
-    { CS_NO_CARD,               "No card present" },
-    { CS_UNSUPPORTED_FUNCTION,  "Usupported function" },
-    { CS_UNSUPPORTED_MODE,      "Unsupported mode" },
-    { CS_BAD_SPEED,             "Bad speed" },
-    { CS_BUSY,                  "Resource busy" },
-    { CS_GENERAL_FAILURE,       "General failure" },
-    { CS_WRITE_PROTECTED,       "Write protected" },
-    { CS_BAD_ARG_LENGTH,        "Bad argument length" },
-    { CS_BAD_ARGS,              "Bad arguments" },
-    { CS_CONFIGURATION_LOCKED,  "Configuration locked" },
-    { CS_IN_USE,                "Resource in use" },
-    { CS_NO_MORE_ITEMS,         "No more items" },
-    { CS_OUT_OF_RESOURCE,       "Out of resource" },
-    { CS_BAD_HANDLE,            "Bad handle" },
-    { CS_BAD_TUPLE,             "Bad CIS tuple" }
+    { 0,                        "Operation succeeded" },
+    { -EIO,                     "Input/Output error" },
+    { -ENODEV,                  "No card present" },
+    { -EINVAL,                  "Bad parameter" },
+    { -EACCES,                  "Configuration locked" },
+    { -EBUSY,                   "Resource in use" },
+    { -ENOSPC,                  "No more items" },
+    { -ENOMEM,                  "Out of resource" },
 };
 
 
@@ -155,46 +136,32 @@ static const lookup_t service_table[] = {
     { ReplaceCIS,                       "ReplaceCIS" }
 };
 
-
-static int pcmcia_report_error(struct pcmcia_device *p_dev, error_info_t *err)
+const char *pcmcia_error_func(int func)
 {
         int i;
-        char *serv;
-
-        if (!p_dev)
-                printk(KERN_NOTICE);
-        else
-                printk(KERN_NOTICE "%s: ", p_dev->dev.bus_id);
 
         for (i = 0; i < ARRAY_SIZE(service_table); i++)
-                if (service_table[i].key == err->func)
-                        break;
-        if (i < ARRAY_SIZE(service_table))
-                serv = service_table[i].msg;
-        else
-                serv = "Unknown service number";
+                if (service_table[i].key == func)
+                        return service_table[i].msg;
 
-        for (i = 0; i < ARRAY_SIZE(error_table); i++)
-                if (error_table[i].key == err->retcode)
-                        break;
-        if (i < ARRAY_SIZE(error_table))
-                printk("%s: %s\n", serv, error_table[i].msg);
-        else
-                printk("%s: Unknown error code %#x\n", serv, err->retcode);
+        return "Unknown service number";
+}
+EXPORT_SYMBOL(pcmcia_error_func);
 
-        return CS_SUCCESS;
-} /* report_error */
+const char *pcmcia_error_ret(int ret)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(error_table); i++)
+                if (error_table[i].key == ret)
+                        return error_table[i].msg;
 
-/* end of code which was in cs.c before */
+        return "unknown";
+}
+EXPORT_SYMBOL(pcmcia_error_ret);
 
 /*======================================================================*/
 
-void cs_error(struct pcmcia_device *p_dev, int func, int ret)
-{
-        error_info_t err = { func, ret };
-        pcmcia_report_error(p_dev, &err);
-}
-EXPORT_SYMBOL(cs_error);
 
 
 static void pcmcia_check_driver(struct pcmcia_driver *p_drv)
@@ -391,7 +358,7 @@ static void pcmcia_release_function(struct kref *ref)
 static void pcmcia_release_dev(struct device *dev)
 {
         struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
-        ds_dbg(1, "releasing device %s\n", p_dev->dev.bus_id);
+        ds_dev_dbg(1, dev, "releasing device\n");
         pcmcia_put_socket(p_dev->socket);
         kfree(p_dev->devname);
         kref_put(&p_dev->function_config->ref, pcmcia_release_function);
@@ -401,7 +368,7 @@ static void pcmcia_release_dev(struct device *dev)
 static void pcmcia_add_device_later(struct pcmcia_socket *s, int mfc)
 {
         if (!s->pcmcia_state.device_add_pending) {
-                ds_dbg(1, "scheduling to add %s secondary"
+                ds_dev_dbg(1, &s->dev, "scheduling to add %s secondary"
                        " device to %d\n", mfc ? "mfc" : "pfc", s->sock);
                 s->pcmcia_state.device_add_pending = 1;
                 s->pcmcia_state.mfc_pfc = mfc;
@@ -439,8 +406,7 @@ static int pcmcia_device_probe(struct device * dev)
          */
         did = p_dev->dev.driver_data;
 
-        ds_dbg(1, "trying to bind %s to %s\n", p_dev->dev.bus_id,
-               p_drv->drv.name);
+        ds_dev_dbg(1, dev, "trying to bind to %s\n", p_drv->drv.name);
 
         if ((!p_drv->probe) || (!p_dev->function_config) ||
             (!try_module_get(p_drv->owner))) {
@@ -455,15 +421,16 @@ static int pcmcia_device_probe(struct device * dev)
                 p_dev->conf.ConfigBase = cis_config.base;
                 p_dev->conf.Present = cis_config.rmask[0];
         } else {
-                printk(KERN_INFO "pcmcia: could not parse base and rmask0 of CIS\n");
+                dev_printk(KERN_INFO, dev,
+                           "pcmcia: could not parse base and rmask0 of CIS\n");
                 p_dev->conf.ConfigBase = 0;
                 p_dev->conf.Present = 0;
         }
 
         ret = p_drv->probe(p_dev);
         if (ret) {
-                ds_dbg(1, "binding %s to %s failed with %d\n",
-                       p_dev->dev.bus_id, p_drv->drv.name, ret);
+                ds_dev_dbg(1, dev, "binding to %s failed with %d\n",
+                           p_drv->drv.name, ret);
                 goto put_module;
         }
 
@@ -490,8 +457,9 @@ static void pcmcia_card_remove(struct pcmcia_socket *s, struct pcmcia_device *le
         struct pcmcia_device    *tmp;
         unsigned long           flags;
 
-        ds_dbg(2, "pcmcia_card_remove(%d) %s\n", s->sock,
-               leftover ? leftover->devname : "");
+        ds_dev_dbg(2, leftover ? &leftover->dev : &s->dev,
+                   "pcmcia_card_remove(%d) %s\n", s->sock,
+                   leftover ? leftover->devname : "");
 
         if (!leftover)
                 s->device_count = 0;
@@ -508,7 +476,7 @@ static void pcmcia_card_remove(struct pcmcia_socket *s, struct pcmcia_device *le
                 p_dev->_removed=1;
                 spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags);
 
-                ds_dbg(2, "unregistering device %s\n", p_dev->dev.bus_id);
+                ds_dev_dbg(2, &p_dev->dev, "unregistering device\n");
                 device_unregister(&p_dev->dev);
         }
 
@@ -525,7 +493,7 @@ static int pcmcia_device_remove(struct device * dev)
         p_dev = to_pcmcia_dev(dev);
         p_drv = to_pcmcia_drv(dev->driver);
 
-        ds_dbg(1, "removing device %s\n", p_dev->dev.bus_id);
+        ds_dev_dbg(1, dev, "removing device\n");
 
         /* If we're removing the primary module driving a
          * pseudo multi-function card, we need to unbind
@@ -548,13 +516,15 @@ static int pcmcia_device_remove(struct device * dev)
 
         /* check for proper unloading */
         if (p_dev->_irq || p_dev->_io || p_dev->_locked)
-                printk(KERN_INFO "pcmcia: driver %s did not release config properly\n",
-                       p_drv->drv.name);
+                dev_printk(KERN_INFO, dev,
+                        "pcmcia: driver %s did not release config properly\n",
+                        p_drv->drv.name);
 
         for (i = 0; i < MAX_WIN; i++)
                 if (p_dev->_win & CLIENT_WIN_REQ(i))
-                        printk(KERN_INFO "pcmcia: driver %s did not release windows properly\n",
-                               p_drv->drv.name);
+                        dev_printk(KERN_INFO, dev,
+                          "pcmcia: driver %s did not release window properly\n",
+                           p_drv->drv.name);
 
         /* references from pcmcia_probe_device */
         pcmcia_put_dev(p_dev);
@@ -603,8 +573,9 @@ static int pcmcia_device_query(struct pcmcia_device *p_dev)
                 }
                 if (!pccard_read_tuple(p_dev->socket, p_dev->func,
                                       CISTPL_DEVICE_GEO, devgeo)) {
-                        ds_dbg(0, "mem device geometry probably means "
-                               "FUNCID_MEMORY\n");
+                        ds_dev_dbg(0, &p_dev->dev,
+                                   "mem device geometry probably means "
+                                   "FUNCID_MEMORY\n");
                         p_dev->func_id = CISTPL_FUNCID_MEMORY;
                         p_dev->has_func_id = 1;
                 }
@@ -685,7 +656,7 @@ struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int f
         if (!p_dev->devname)
                 goto err_free;
         sprintf (p_dev->devname, "pcmcia%s", p_dev->dev.bus_id);
-        ds_dbg(3, "devname is %s\n", p_dev->devname);
+        ds_dev_dbg(3, &p_dev->dev, "devname is %s\n", p_dev->devname);
 
         spin_lock_irqsave(&pcmcia_dev_list_lock, flags);
 
@@ -706,7 +677,7 @@ struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int f
         spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags);
 
         if (!p_dev->function_config) {
-                ds_dbg(3, "creating config_t for %s\n", p_dev->dev.bus_id);
+                ds_dev_dbg(3, &p_dev->dev, "creating config_t\n");
                 p_dev->function_config = kzalloc(sizeof(struct config_t),
                                                  GFP_KERNEL);
                 if (!p_dev->function_config)
@@ -714,8 +685,9 @@ struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int f
                 kref_init(&p_dev->function_config->ref);
         }
 
-        printk(KERN_NOTICE "pcmcia: registering new device %s\n",
-               p_dev->devname);
+        dev_printk(KERN_NOTICE, &p_dev->dev,
+                   "pcmcia: registering new device %s\n",
+                   p_dev->devname);
 
         pcmcia_device_query(p_dev);
 
@@ -750,19 +722,20 @@ static int pcmcia_card_add(struct pcmcia_socket *s)
         int ret = 0;
 
         if (!(s->resource_setup_done)) {
-                ds_dbg(3, "no resources available, delaying card_add\n");
+                ds_dev_dbg(3, &s->dev,
+                           "no resources available, delaying card_add\n");
                 return -EAGAIN; /* try again, but later... */
         }
 
         if (pcmcia_validate_mem(s)) {
-                ds_dbg(3, "validating mem resources failed, "
+                ds_dev_dbg(3, &s->dev, "validating mem resources failed, "
                        "delaying card_add\n");
                 return -EAGAIN; /* try again, but later... */
         }
 
         ret = pccard_validate_cis(s, BIND_FN_ALL, &no_chains);
         if (ret || !no_chains) {
-                ds_dbg(0, "invalid CIS or invalid resources\n");
+                ds_dev_dbg(0, &s->dev, "invalid CIS or invalid resources\n");
                 return -ENODEV;
         }
 
@@ -783,7 +756,7 @@ static void pcmcia_delayed_add_device(struct work_struct *work)
 {
         struct pcmcia_socket *s =
                 container_of(work, struct pcmcia_socket, device_add);
-        ds_dbg(1, "adding additional device to %d\n", s->sock);
+        ds_dev_dbg(1, &s->dev, "adding additional device to %d\n", s->sock);
         pcmcia_device_add(s, s->pcmcia_state.mfc_pfc);
         s->pcmcia_state.device_add_pending = 0;
         s->pcmcia_state.mfc_pfc = 0;
@@ -793,8 +766,7 @@ static int pcmcia_requery(struct device *dev, void * _data)
 {
         struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
         if (!p_dev->dev.driver) {
-                ds_dbg(1, "update device information for %s\n",
-                       p_dev->dev.bus_id);
+                ds_dev_dbg(1, dev, "update device information\n");
                 pcmcia_device_query(p_dev);
         }
 
@@ -808,7 +780,7 @@ static void pcmcia_bus_rescan(struct pcmcia_socket *skt, int new_cis)
         unsigned long flags;
 
         /* must be called with skt_mutex held */
-        ds_dbg(0, "re-scanning socket %d\n", skt->sock);
+        ds_dev_dbg(0, &skt->dev, "re-scanning socket %d\n", skt->sock);
 
         spin_lock_irqsave(&pcmcia_dev_list_lock, flags);
         if (list_empty(&skt->devices_list))
@@ -859,17 +831,17 @@ static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename)
         int ret = -ENOMEM;
         int no_funcs;
         int old_funcs;
-        cisdump_t *cis;
         cistpl_longlink_mfc_t mfc;
 
         if (!filename)
                 return -EINVAL;
 
-        ds_dbg(1, "trying to load CIS file %s\n", filename);
+        ds_dev_dbg(1, &dev->dev, "trying to load CIS file %s\n", filename);
 
         if (strlen(filename) > (FIRMWARE_NAME_MAX - 1)) {
-                printk(KERN_WARNING "pcmcia: CIS filename is too long [%s]\n",
-                        filename);
+                dev_printk(KERN_WARNING, &dev->dev,
+                           "pcmcia: CIS filename is too long [%s]\n",
+                           filename);
                 return -EINVAL;
         }
 
@@ -878,23 +850,16 @@ static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename)
         if (request_firmware(&fw, path, &dev->dev) == 0) {
                 if (fw->size >= CISTPL_MAX_CIS_SIZE) {
                         ret = -EINVAL;
-                        printk(KERN_ERR "pcmcia: CIS override is too big\n");
+                        dev_printk(KERN_ERR, &dev->dev,
+                                   "pcmcia: CIS override is too big\n");
                         goto release;
                 }
 
-                cis = kzalloc(sizeof(cisdump_t), GFP_KERNEL);
-                if (!cis) {
-                        ret = -ENOMEM;
-                        goto release;
-                }
-
-                cis->Length = fw->size + 1;
-                memcpy(cis->Data, fw->data, fw->size);
-
-                if (!pcmcia_replace_cis(s, cis))
+                if (!pcmcia_replace_cis(s, fw->data, fw->size))
                         ret = 0;
                 else {
-                        printk(KERN_ERR "pcmcia: CIS override failed\n");
+                        dev_printk(KERN_ERR, &dev->dev,
+                                   "pcmcia: CIS override failed\n");
                         goto release;
                 }
 
@@ -998,14 +963,14 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev,
                  * after it has re-checked that there is no possible module
                  * with a prod_id/manf_id/card_id match.
                  */
-                ds_dbg(0, "skipping FUNC_ID match for %s until userspace "
-                       "interaction\n", dev->dev.bus_id);
+                ds_dev_dbg(0, &dev->dev,
+                        "skipping FUNC_ID match until userspace interaction\n");
                 if (!dev->allow_func_id_match)
                         return 0;
         }
 
         if (did->match_flags & PCMCIA_DEV_ID_MATCH_FAKE_CIS) {
-                ds_dbg(0, "device %s needs a fake CIS\n", dev->dev.bus_id);
+                ds_dev_dbg(0, &dev->dev, "device needs a fake CIS\n");
                 if (!dev->socket->fake_cis)
                         pcmcia_load_firmware(dev, did->cisfile);
 
@@ -1037,11 +1002,9 @@ static int pcmcia_bus_match(struct device * dev, struct device_driver * drv) {
         /* match dynamic devices first */
         spin_lock(&p_drv->dynids.lock);
         list_for_each_entry(dynid, &p_drv->dynids.list, node) {
-                ds_dbg(3, "trying to match %s to %s\n", dev->bus_id,
-                       drv->name);
+                ds_dev_dbg(3, dev, "trying to match to %s\n", drv->name);
                 if (pcmcia_devmatch(p_dev, &dynid->id)) {
-                        ds_dbg(0, "matched %s to %s\n", dev->bus_id,
-                               drv->name);
+                        ds_dev_dbg(0, dev, "matched to %s\n", drv->name);
                         spin_unlock(&p_drv->dynids.lock);
                         return 1;
                 }
@@ -1051,18 +1014,15 @@ static int pcmcia_bus_match(struct device * dev, struct device_driver * drv) {
 #ifdef CONFIG_PCMCIA_IOCTL
         /* matching by cardmgr */
         if (p_dev->cardmgr == p_drv) {
-                ds_dbg(0, "cardmgr matched %s to %s\n", dev->bus_id,
-                       drv->name);
+                ds_dev_dbg(0, dev, "cardmgr matched to %s\n", drv->name);
                 return 1;
         }
 #endif
 
         while (did && did->match_flags) {
-                ds_dbg(3, "trying to match %s to %s\n", dev->bus_id,
-                       drv->name);
+                ds_dev_dbg(3, dev, "trying to match to %s\n", drv->name);
                 if (pcmcia_devmatch(p_dev, did)) {
-                        ds_dbg(0, "matched %s to %s\n", dev->bus_id,
-                               drv->name);
+                        ds_dev_dbg(0, dev, "matched to %s\n", drv->name);
                         return 1;
                 }
                 did++;
@@ -1268,7 +1228,7 @@ static int pcmcia_dev_suspend(struct device * dev, pm_message_t state)
         if (p_dev->suspended)
                 return 0;
 
-        ds_dbg(2, "suspending %s\n", dev->bus_id);
+        ds_dev_dbg(2, dev, "suspending\n");
 
         if (dev->driver)
                 p_drv = to_pcmcia_drv(dev->driver);
@@ -1279,15 +1239,16 @@ static int pcmcia_dev_suspend(struct device * dev, pm_message_t state)
         if (p_drv->suspend) {
                 ret = p_drv->suspend(p_dev);
                 if (ret) {
-                        printk(KERN_ERR "pcmcia: device %s (driver %s) did "
-                               "not want to go to sleep (%d)\n",
-                               p_dev->devname, p_drv->drv.name, ret);
+                        dev_printk(KERN_ERR, dev,
+                                   "pcmcia: device %s (driver %s) did "
+                                   "not want to go to sleep (%d)\n",
+                                   p_dev->devname, p_drv->drv.name, ret);
                         goto out;
                 }
         }
 
         if (p_dev->device_no == p_dev->func) {
-                ds_dbg(2, "releasing configuration for %s\n", dev->bus_id);
+                ds_dev_dbg(2, dev, "releasing configuration\n");
                 pcmcia_release_configuration(p_dev);
         }
 
@@ -1307,7 +1268,7 @@ static int pcmcia_dev_resume(struct device * dev)
         if (!p_dev->suspended)
                 return 0;
 
-        ds_dbg(2, "resuming %s\n", dev->bus_id);
+        ds_dev_dbg(2, dev, "resuming\n");
 
         if (dev->driver)
                 p_drv = to_pcmcia_drv(dev->driver);
@@ -1316,7 +1277,7 @@ static int pcmcia_dev_resume(struct device * dev)
                 goto out;
 
         if (p_dev->device_no == p_dev->func) {
-                ds_dbg(2, "requesting configuration for %s\n", dev->bus_id);
+                ds_dev_dbg(2, dev, "requesting configuration\n");
                 ret = pcmcia_request_configuration(p_dev, &p_dev->conf);
                 if (ret)
                         goto out;
@@ -1358,14 +1319,14 @@ static int pcmcia_bus_resume_callback(struct device *dev, void * _data)
 
 static int pcmcia_bus_resume(struct pcmcia_socket *skt)
 {
-        ds_dbg(2, "resuming socket %d\n", skt->sock);
+        ds_dev_dbg(2, &skt->dev, "resuming socket %d\n", skt->sock);
         bus_for_each_dev(&pcmcia_bus_type, NULL, skt, pcmcia_bus_resume_callback);
         return 0;
 }
 
 static int pcmcia_bus_suspend(struct pcmcia_socket *skt)
 {
-        ds_dbg(2, "suspending socket %d\n", skt->sock);
+        ds_dev_dbg(2, &skt->dev, "suspending socket %d\n", skt->sock);
         if (bus_for_each_dev(&pcmcia_bus_type, NULL, skt,
                              pcmcia_bus_suspend_callback)) {
                 pcmcia_bus_resume(skt);
@@ -1391,13 +1352,14 @@ static int ds_event(struct pcmcia_socket *skt, event_t event, int priority)
         struct pcmcia_socket *s = pcmcia_get_socket(skt);
 
         if (!s) {
-                printk(KERN_ERR "PCMCIA obtaining reference to socket %p " \
-                        "failed, event 0x%x lost!\n", skt, event);
+                dev_printk(KERN_ERR, &skt->dev,
+                           "PCMCIA obtaining reference to socket "      \
+                           "failed, event 0x%x lost!\n", event);
                 return -ENODEV;
         }
 
-        ds_dbg(1, "ds_event(0x%06x, %d, 0x%p)\n",
-               event, priority, skt);
+        ds_dev_dbg(1, &skt->dev, "ds_event(0x%06x, %d, 0x%p)\n",
+                   event, priority, skt);
 
         switch (event) {
         case CS_EVENT_CARD_REMOVAL:
@@ -1472,7 +1434,8 @@ static int __devinit pcmcia_bus_add_socket(struct device *dev,
 
         socket = pcmcia_get_socket(socket);
         if (!socket) {
-                printk(KERN_ERR "PCMCIA obtaining reference to socket %p failed\n", socket);
+                dev_printk(KERN_ERR, dev,
+                           "PCMCIA obtaining reference to socket failed\n");
                 return -ENODEV;
         }
 
@@ -1492,7 +1455,7 @@ static int __devinit pcmcia_bus_add_socket(struct device *dev,
 
         ret = pccard_register_pcmcia(socket, &pcmcia_bus_callback);
         if (ret) {
-                printk(KERN_ERR "PCMCIA registration PCCard core failed for socket %p\n", socket);
+                dev_printk(KERN_ERR, dev, "PCMCIA registration failed\n");
                 pcmcia_put_socket(socket);
                 return (ret);
         }
diff --git a/drivers/pcmcia/ds_internal.h b/drivers/pcmcia/ds_internal.h
deleted file mode 100644
index 3a2b25e6ed73..000000000000
--- a/drivers/pcmcia/ds_internal.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* ds_internal.h - internal header for 16-bit PCMCIA devices management */
-
-extern spinlock_t pcmcia_dev_list_lock;
-extern struct bus_type pcmcia_bus_type;
-
-extern struct pcmcia_device * pcmcia_get_dev(struct pcmcia_device *p_dev);
-extern void pcmcia_put_dev(struct pcmcia_device *p_dev);
-
-struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int function);
-
-extern int pcmcia_release_configuration(struct pcmcia_device *p_dev);
-
-#ifdef CONFIG_PCMCIA_IOCTL
-extern void __init pcmcia_setup_ioctl(void);
-extern void __exit pcmcia_cleanup_ioctl(void);
-extern void handle_event(struct pcmcia_socket *s, event_t event);
-extern int handle_request(struct pcmcia_socket *s, event_t event);
-#else
-static inline void __init pcmcia_setup_ioctl(void) { return; }
-static inline void __exit pcmcia_cleanup_ioctl(void) { return; }
-static inline void handle_event(struct pcmcia_socket *s, event_t event) { return; }
-static inline int handle_request(struct pcmcia_socket *s, event_t event) { return CS_SUCCESS; }
-#endif
diff --git a/drivers/pcmcia/hd64465_ss.c b/drivers/pcmcia/hd64465_ss.c
index fb2bc1fb015d..117dc12ab438 100644
--- a/drivers/pcmcia/hd64465_ss.c
+++ b/drivers/pcmcia/hd64465_ss.c
@@ -46,7 +46,6 @@
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ds.h>
 #include <pcmcia/ss.h>
-#include "cs_internal.h"
 
 #define MODNAME "hd64465_ss"
 
diff --git a/drivers/pcmcia/i82365.c b/drivers/pcmcia/i82365.c
index 68f6b2702bc4..71653ab84890 100644
--- a/drivers/pcmcia/i82365.c
+++ b/drivers/pcmcia/i82365.c
@@ -63,7 +63,7 @@
 #include "vg468.h"
 #include "ricoh.h"
 
-#ifdef DEBUG
+#ifdef CONFIG_PCMCIA_DEBUG
 static const char version[] =
 "i82365.c 1.265 1999/11/10 18:36:21 (David Hinds)";
 
diff --git a/drivers/pcmcia/m32r_cfc.c b/drivers/pcmcia/m32r_cfc.c
index 3616da227152..2ab4f22c21de 100644
--- a/drivers/pcmcia/m32r_cfc.c
+++ b/drivers/pcmcia/m32r_cfc.c
@@ -38,7 +38,7 @@
 
 #include "m32r_cfc.h"
 
-#ifdef DEBUG
+#ifdef CONFIG_PCMCIA_DEBUG
 static int m32r_cfc_debug;
 module_param(m32r_cfc_debug, int, 0644);
 #define debug(lvl, fmt, arg...) do {                            \
@@ -505,7 +505,7 @@ static int _pcc_set_socket(u_short sock, socket_state_t *state)
                 pcc_set(sock,(unsigned int)PLD_CFBUFCR,1);
         }
 
-#ifdef DEBUG
+#ifdef CONFIG_PCMCIA_DEBUG
         if(state->flags & SS_IOCARD){
                 debug(3, ":IOCARD");
         }
diff --git a/drivers/pcmcia/m32r_pcc.c b/drivers/pcmcia/m32r_pcc.c
index 2b42b7155e34..2f108c23dbd9 100644
--- a/drivers/pcmcia/m32r_pcc.c
+++ b/drivers/pcmcia/m32r_pcc.c
@@ -45,7 +45,7 @@
 
 #define PCC_DEBUG_DBEX
 
-#ifdef DEBUG
+#ifdef CONFIG_PCMCIA_DEBUG
 static int m32r_pcc_debug;
 module_param(m32r_pcc_debug, int, 0644);
 #define debug(lvl, fmt, arg...) do {                            \
@@ -460,7 +460,7 @@ static int _pcc_set_socket(u_short sock, socket_state_t *state)
 
         pcc_set(sock,PCCSIGCR,reg);
 
-#ifdef DEBUG
+#ifdef CONFIG_PCMCIA_DEBUG
         if(state->flags & SS_IOCARD){
                 debug(3, ":IOCARD");
         }
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c
index ff66604e90d4..d1ad0966392d 100644
--- a/drivers/pcmcia/m8xx_pcmcia.c
+++ b/drivers/pcmcia/m8xx_pcmcia.c
@@ -64,8 +64,8 @@
 #include <pcmcia/cs.h>
 #include <pcmcia/ss.h>
 
-#ifdef PCMCIA_DEBUG
-static int pc_debug = PCMCIA_DEBUG;
+#ifdef CONFIG_PCMCIA_DEBUG
+static int pc_debug;
 module_param(pc_debug, int, 0);
 #define dprintk(args...) printk(KERN_DEBUG "m8xx_pcmcia: " args);
 #else
diff --git a/drivers/pcmcia/o2micro.h b/drivers/pcmcia/o2micro.h
index a234ce1967a3..5554015a7813 100644
--- a/drivers/pcmcia/o2micro.h
+++ b/drivers/pcmcia/o2micro.h
@@ -140,7 +140,8 @@ static int o2micro_override(struct yenta_socket *socket)
                 a = config_readb(socket, O2_RESERVED1);
                 b = config_readb(socket, O2_RESERVED2);
 
-                printk(KERN_INFO "Yenta O2: res at 0x94/0xD4: %02x/%02x\n", a, b);
+                dev_printk(KERN_INFO, &socket->dev->dev,
+                           "O2: res at 0x94/0xD4: %02x/%02x\n", a, b);
 
                 switch (socket->dev->device) {
                 /*
@@ -153,7 +154,9 @@ static int o2micro_override(struct yenta_socket *socket)
                 case PCI_DEVICE_ID_O2_6812:
                 case PCI_DEVICE_ID_O2_6832:
                 case PCI_DEVICE_ID_O2_6836:
-                        printk(KERN_INFO "Yenta O2: old bridge, disabling read prefetch/write burst\n");
+                        dev_printk(KERN_INFO, &socket->dev->dev,
+                                   "Yenta O2: old bridge, disabling read "
+                                   "prefetch/write burst\n");
                         config_writeb(socket, O2_RESERVED1,
                                       a & ~(O2_RES_READ_PREFETCH | O2_RES_WRITE_BURST));
                         config_writeb(socket, O2_RESERVED2,
@@ -161,7 +164,8 @@ static int o2micro_override(struct yenta_socket *socket)
                         break;
 
                 default:
-                        printk(KERN_INFO "Yenta O2: enabling read prefetch/write burst\n");
+                        dev_printk(KERN_INFO , &socket->dev->dev,
+                                   "O2: enabling read prefetch/write burst\n");
                         config_writeb(socket, O2_RESERVED1,
                                       a | O2_RES_READ_PREFETCH | O2_RES_WRITE_BURST);
                         config_writeb(socket, O2_RESERVED2,
diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c
index 419f97fc9a62..1703b20cad5d 100644
--- a/drivers/pcmcia/pcmcia_ioctl.c
+++ b/drivers/pcmcia/pcmcia_ioctl.c
@@ -38,7 +38,6 @@
 #include <pcmcia/ss.h>
 
 #include "cs_internal.h"
-#include "ds_internal.h"
 
 static int major_dev = -1;
 
@@ -58,7 +57,7 @@ typedef struct user_info_t {
 } user_info_t;
 
 
-#ifdef DEBUG
+#ifdef CONFIG_PCMCIA_DEBUG
 extern int ds_pc_debug;
 
 #define ds_dbg(lvl, fmt, arg...) do {           \
@@ -149,7 +148,7 @@ static int adjust_irq(struct pcmcia_socket *s, adjust_t *adj)
 
         irq = adj->resource.irq.IRQ;
         if ((irq < 0) || (irq > 15))
-                return CS_BAD_IRQ;
+                return -EINVAL;
 
         if (adj->Action != REMOVE_MANAGED_RESOURCE)
                 return 0;
@@ -167,7 +166,7 @@ static int adjust_irq(struct pcmcia_socket *s, adjust_t *adj)
 #else
 
 static inline int adjust_irq(struct pcmcia_socket *s, adjust_t *adj) {
-        return CS_SUCCESS;
+        return 0;
 }
 
 #endif
@@ -175,7 +174,7 @@ static inline int adjust_irq(struct pcmcia_socket *s, adjust_t *adj) {
 static int pcmcia_adjust_resource_info(adjust_t *adj)
 {
         struct pcmcia_socket *s;
-        int ret = CS_UNSUPPORTED_FUNCTION;
+        int ret = -ENOSYS;
         unsigned long flags;
 
         down_read(&pcmcia_socket_list_rwsem);
@@ -248,7 +247,7 @@ static int pccard_get_status(struct pcmcia_socket *s,
         if (s->state & SOCKET_SUSPEND)
                 status->CardState |= CS_EVENT_PM_SUSPEND;
         if (!(s->state & SOCKET_PRESENT))
-                return CS_NO_CARD;
+                return -ENODEV;
 
         c = (p_dev) ? p_dev->function_config : NULL;
 
@@ -274,7 +273,7 @@ static int pccard_get_status(struct pcmcia_socket *s,
                         status->CardState |=
                                 (reg & ESR_REQ_ATTN) ? CS_EVENT_REQUEST_ATTENTION : 0;
                 }
-                return CS_SUCCESS;
+                return 0;
         }
         status->CardState |=
                 (val & SS_WRPROT) ? CS_EVENT_WRITE_PROTECT : 0;
@@ -284,9 +283,81 @@ static int pccard_get_status(struct pcmcia_socket *s,
                 (val & SS_BATWARN) ? CS_EVENT_BATTERY_LOW : 0;
         status->CardState |=
                 (val & SS_READY) ? CS_EVENT_READY_CHANGE : 0;
-        return CS_SUCCESS;
+        return 0;
 } /* pccard_get_status */
 
+int pccard_get_configuration_info(struct pcmcia_socket *s,
+                                  struct pcmcia_device *p_dev,
+                                  config_info_t *config)
+{
+        config_t *c;
+
+        if (!(s->state & SOCKET_PRESENT))
+                return -ENODEV;
+
+
+#ifdef CONFIG_CARDBUS
+        if (s->state & SOCKET_CARDBUS) {
+                memset(config, 0, sizeof(config_info_t));
+                config->Vcc = s->socket.Vcc;
+                config->Vpp1 = config->Vpp2 = s->socket.Vpp;
+                config->Option = s->cb_dev->subordinate->number;
+                if (s->state & SOCKET_CARDBUS_CONFIG) {
+                        config->Attributes = CONF_VALID_CLIENT;
+                        config->IntType = INT_CARDBUS;
+                        config->AssignedIRQ = s->irq.AssignedIRQ;
+                        if (config->AssignedIRQ)
+                                config->Attributes |= CONF_ENABLE_IRQ;
+                        if (s->io[0].res) {
+                                config->BasePort1 = s->io[0].res->start;
+                                config->NumPorts1 = s->io[0].res->end -
+                                        config->BasePort1 + 1;
+                        }
+                }
+                return 0;
+        }
+#endif
+
+        if (p_dev) {
+                c = p_dev->function_config;
+                config->Function = p_dev->func;
+        } else {
+                c = NULL;
+                config->Function = 0;
+        }
+
+        if ((c == NULL) || !(c->state & CONFIG_LOCKED)) {
+                config->Attributes = 0;
+                config->Vcc = s->socket.Vcc;
+                config->Vpp1 = config->Vpp2 = s->socket.Vpp;
+                return 0;
+        }
+
+        config->Attributes = c->Attributes | CONF_VALID_CLIENT;
+        config->Vcc = s->socket.Vcc;
+        config->Vpp1 = config->Vpp2 = s->socket.Vpp;
+        config->IntType = c->IntType;
+        config->ConfigBase = c->ConfigBase;
+        config->Status = c->Status;
+        config->Pin = c->Pin;
+        config->Copy = c->Copy;
+        config->Option = c->Option;
+        config->ExtStatus = c->ExtStatus;
+        config->Present = config->CardValues = c->CardValues;
+        config->IRQAttributes = c->irq.Attributes;
+        config->AssignedIRQ = s->irq.AssignedIRQ;
+        config->BasePort1 = c->io.BasePort1;
+        config->NumPorts1 = c->io.NumPorts1;
+        config->Attributes1 = c->io.Attributes1;
+        config->BasePort2 = c->io.BasePort2;
+        config->NumPorts2 = c->io.NumPorts2;
+        config->Attributes2 = c->io.Attributes2;
+        config->IOAddrLines = c->io.IOAddrLines;
+
+        return 0;
+} /* pccard_get_configuration_info */
+
+
 /*======================================================================
 
     These manage a ring buffer of events pending for one user process
@@ -764,7 +835,7 @@ static int ds_ioctl(struct inode * inode, struct file * file,
     case DS_GET_CONFIGURATION_INFO:
         if (buf->config.Function &&
            (buf->config.Function >= s->functions))
-            ret = CS_BAD_ARGS;
+            ret = -EINVAL;
         else {
             struct pcmcia_device *p_dev = get_pcmcia_device(s, buf->config.Function);
             ret = pccard_get_configuration_info(s, p_dev, &buf->config);
@@ -787,15 +858,15 @@ static int ds_ioctl(struct inode * inode, struct file * file,
         break;
     case DS_PARSE_TUPLE:
         buf->tuple.TupleData = buf->tuple_parse.data;
-        ret = pccard_parse_tuple(&buf->tuple, &buf->tuple_parse.parse);
+        ret = pcmcia_parse_tuple(&buf->tuple, &buf->tuple_parse.parse);
         break;
     case DS_RESET_CARD:
-        ret = pccard_reset_card(s);
+        ret = pcmcia_reset_card(s);
         break;
     case DS_GET_STATUS:
             if (buf->status.Function &&
                 (buf->status.Function >= s->functions))
-                    ret = CS_BAD_ARGS;
+                    ret = -EINVAL;
             else {
                     struct pcmcia_device *p_dev = get_pcmcia_device(s, buf->status.Function);
                     ret = pccard_get_status(s, p_dev, &buf->status);
@@ -826,7 +897,7 @@ static int ds_ioctl(struct inode * inode, struct file * file,
             goto free_out;
         }
 
-        ret = CS_BAD_ARGS;
+        ret = -EINVAL;
 
         if (!(buf->conf_reg.Function &&
              (buf->conf_reg.Function >= s->functions))) {
@@ -867,7 +938,7 @@ static int ds_ioctl(struct inode * inode, struct file * file,
                            &buf->win_info.map);
         break;
     case DS_REPLACE_CIS:
-        ret = pcmcia_replace_cis(s, &buf->cisdump);
+        ret = pcmcia_replace_cis(s, buf->cisdump.Data, buf->cisdump.Length);
         break;
     case DS_BIND_REQUEST:
         if (!capable(CAP_SYS_ADMIN)) {
@@ -889,22 +960,19 @@ static int ds_ioctl(struct inode * inode, struct file * file,
         err = -EINVAL;
     }
 
-    if ((err == 0) && (ret != CS_SUCCESS)) {
+    if ((err == 0) && (ret != 0)) {
         ds_dbg(2, "ds_ioctl: ret = %d\n", ret);
         switch (ret) {
-        case CS_BAD_SOCKET: case CS_NO_CARD:
-            err = -ENODEV; break;
-        case CS_BAD_ARGS: case CS_BAD_ATTRIBUTE: case CS_BAD_IRQ:
-        case CS_BAD_TUPLE:
-            err = -EINVAL; break;
-        case CS_IN_USE:
-            err = -EBUSY; break;
-        case CS_OUT_OF_RESOURCE:
+        case -ENODEV:
+        case -EINVAL:
+        case -EBUSY:
+        case -ENOSYS:
+            err = ret;
+            break;
+        case -ENOMEM:
             err = -ENOSPC; break;
-        case CS_NO_MORE_ITEMS:
+        case -ENOSPC:
             err = -ENODATA; break;
-        case CS_UNSUPPORTED_FUNCTION:
-            err = -ENOSYS; break;
         default:
             err = -EIO; break;
         }
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index 4884a18cf9e6..afea2b2558b5 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -29,7 +29,6 @@
 #include <pcmcia/ds.h>
 
 #include "cs_internal.h"
-#include "ds_internal.h"
 
 
 /* Access speed for IO windows */
@@ -44,16 +43,17 @@ static u8 pcmcia_used_irq[NR_IRQS];
 #endif
 
 
-#ifdef DEBUG
+#ifdef CONFIG_PCMCIA_DEBUG
 extern int ds_pc_debug;
 
 #define ds_dbg(skt, lvl, fmt, arg...) do {                      \
         if (ds_pc_debug >= lvl)                                 \
-                printk(KERN_DEBUG "pcmcia_resource: %s: " fmt,  \
-                        cs_socket_name(skt) , ## arg);          \
+                dev_printk(KERN_DEBUG, &skt->dev,               \
+                           "pcmcia_resource: " fmt,             \
+                           ## arg);                             \
 } while (0)
 #else
-#define ds_dbg(lvl, fmt, arg...) do { } while (0)
+#define ds_dbg(skt, lvl, fmt, arg...) do { } while (0)
 #endif
 
 
@@ -168,13 +168,13 @@ int pcmcia_access_configuration_register(struct pcmcia_device *p_dev,
         u_char val;
 
         if (!p_dev || !p_dev->function_config)
-                return CS_NO_CARD;
+                return -EINVAL;
 
         s = p_dev->socket;
         c = p_dev->function_config;
 
         if (!(c->state & CONFIG_LOCKED))
-                return CS_CONFIGURATION_LOCKED;
+                return -EACCES;
 
         addr = (c->ConfigBase + reg->Offset) >> 1;
 
@@ -188,93 +188,14 @@ int pcmcia_access_configuration_register(struct pcmcia_device *p_dev,
                 pcmcia_write_cis_mem(s, 1, addr, 1, &val);
                 break;
         default:
-                return CS_BAD_ARGS;
+                return -EINVAL;
                 break;
         }
-        return CS_SUCCESS;
+        return 0;
 } /* pcmcia_access_configuration_register */
 EXPORT_SYMBOL(pcmcia_access_configuration_register);
 
 
-int pccard_get_configuration_info(struct pcmcia_socket *s,
-                                  struct pcmcia_device *p_dev,
-                                  config_info_t *config)
-{
-        config_t *c;
-
-        if (!(s->state & SOCKET_PRESENT))
-                return CS_NO_CARD;
-
-
-#ifdef CONFIG_CARDBUS
-        if (s->state & SOCKET_CARDBUS) {
-                memset(config, 0, sizeof(config_info_t));
-                config->Vcc = s->socket.Vcc;
-                config->Vpp1 = config->Vpp2 = s->socket.Vpp;
-                config->Option = s->cb_dev->subordinate->number;
-                if (s->state & SOCKET_CARDBUS_CONFIG) {
-                        config->Attributes = CONF_VALID_CLIENT;
-                        config->IntType = INT_CARDBUS;
-                        config->AssignedIRQ = s->irq.AssignedIRQ;
-                        if (config->AssignedIRQ)
-                                config->Attributes |= CONF_ENABLE_IRQ;
-                        if (s->io[0].res) {
-                                config->BasePort1 = s->io[0].res->start;
-                                config->NumPorts1 = s->io[0].res->end - config->BasePort1 + 1;
-                        }
-                }
-                return CS_SUCCESS;
-        }
-#endif
-
-        if (p_dev) {
-                c = p_dev->function_config;
-                config->Function = p_dev->func;
-        } else {
-                c = NULL;
-                config->Function = 0;
-        }
-
-        if ((c == NULL) || !(c->state & CONFIG_LOCKED)) {
-                config->Attributes = 0;
-                config->Vcc = s->socket.Vcc;
-                config->Vpp1 = config->Vpp2 = s->socket.Vpp;
-                return CS_SUCCESS;
-        }
-
-        config->Attributes = c->Attributes | CONF_VALID_CLIENT;
-        config->Vcc = s->socket.Vcc;
-        config->Vpp1 = config->Vpp2 = s->socket.Vpp;
-        config->IntType = c->IntType;
-        config->ConfigBase = c->ConfigBase;
-        config->Status = c->Status;
-        config->Pin = c->Pin;
-        config->Copy = c->Copy;
-        config->Option = c->Option;
-        config->ExtStatus = c->ExtStatus;
-        config->Present = config->CardValues = c->CardValues;
-        config->IRQAttributes = c->irq.Attributes;
-        config->AssignedIRQ = s->irq.AssignedIRQ;
-        config->BasePort1 = c->io.BasePort1;
-        config->NumPorts1 = c->io.NumPorts1;
-        config->Attributes1 = c->io.Attributes1;
-        config->BasePort2 = c->io.BasePort2;
-        config->NumPorts2 = c->io.NumPorts2;
-        config->Attributes2 = c->io.Attributes2;
-        config->IOAddrLines = c->io.IOAddrLines;
-
-        return CS_SUCCESS;
-} /* pccard_get_configuration_info */
-
-int pcmcia_get_configuration_info(struct pcmcia_device *p_dev,
-                                  config_info_t *config)
-{
-        return pccard_get_configuration_info(p_dev->socket, p_dev,
-                                             config);
-}
-EXPORT_SYMBOL(pcmcia_get_configuration_info);
-
-
 /** pcmcia_get_window
  */
 int pcmcia_get_window(struct pcmcia_socket *s, window_handle_t *handle,
@@ -284,12 +205,12 @@ int pcmcia_get_window(struct pcmcia_socket *s, window_handle_t *handle,
         int w;
 
         if (!s || !(s->state & SOCKET_PRESENT))
-                return CS_NO_CARD;
+                return -ENODEV;
         for (w = idx; w < MAX_WIN; w++)
                 if (s->state & SOCKET_WIN_REQ(w))
                         break;
         if (w == MAX_WIN)
-                return CS_NO_MORE_ITEMS;
+                return -EINVAL;
         win = &s->win[w];
         req->Base = win->ctl.res->start;
         req->Size = win->ctl.res->end - win->ctl.res->start + 1;
@@ -304,7 +225,7 @@ int pcmcia_get_window(struct pcmcia_socket *s, window_handle_t *handle,
         if (win->ctl.flags & MAP_USE_WAIT)
                 req->Attributes |= WIN_USE_WAIT;
         *handle = win;
-        return CS_SUCCESS;
+        return 0;
 } /* pcmcia_get_window */
 EXPORT_SYMBOL(pcmcia_get_window);
 
@@ -316,10 +237,10 @@ EXPORT_SYMBOL(pcmcia_get_window);
 int pcmcia_get_mem_page(window_handle_t win, memreq_t *req)
 {
         if ((win == NULL) || (win->magic != WINDOW_MAGIC))
-                return CS_BAD_HANDLE;
+                return -EINVAL;
         req->Page = 0;
         req->CardOffset = win->ctl.card_start;
-        return CS_SUCCESS;
+        return 0;
 } /* pcmcia_get_mem_page */
 EXPORT_SYMBOL(pcmcia_get_mem_page);
 
@@ -328,14 +249,18 @@ int pcmcia_map_mem_page(window_handle_t win, memreq_t *req)
 {
         struct pcmcia_socket *s;
         if ((win == NULL) || (win->magic != WINDOW_MAGIC))
-                return CS_BAD_HANDLE;
-        if (req->Page != 0)
-                return CS_BAD_PAGE;
+                return -EINVAL;
         s = win->sock;
+        if (req->Page != 0) {
+                ds_dbg(s, 0, "failure: requested page is zero\n");
+                return -EINVAL;
+        }
         win->ctl.card_start = req->CardOffset;
-        if (s->ops->set_mem_map(s, &win->ctl) != 0)
-                return CS_BAD_OFFSET;
-        return CS_SUCCESS;
+        if (s->ops->set_mem_map(s, &win->ctl) != 0) {
+                ds_dbg(s, 0, "failed to set_mem_map\n");
+                return -EIO;
+        }
+        return 0;
 } /* pcmcia_map_mem_page */
 EXPORT_SYMBOL(pcmcia_map_mem_page);
 
@@ -354,9 +279,9 @@ int pcmcia_modify_configuration(struct pcmcia_device *p_dev,
         c = p_dev->function_config;
 
         if (!(s->state & SOCKET_PRESENT))
-                return CS_NO_CARD;
+                return -ENODEV;
         if (!(c->state & CONFIG_LOCKED))
-                return CS_CONFIGURATION_LOCKED;
+                return -EACCES;
 
         if (mod->Attributes & CONF_IRQ_CHANGE_VALID) {
                 if (mod->Attributes & CONF_ENABLE_IRQ) {
@@ -369,20 +294,28 @@ int pcmcia_modify_configuration(struct pcmcia_device *p_dev,
                 s->ops->set_socket(s, &s->socket);
         }
 
-        if (mod->Attributes & CONF_VCC_CHANGE_VALID)
-                return CS_BAD_VCC;
+        if (mod->Attributes & CONF_VCC_CHANGE_VALID) {
+                ds_dbg(s, 0, "changing Vcc is not allowed at this time\n");
+                return -EINVAL;
+        }
 
         /* We only allow changing Vpp1 and Vpp2 to the same value */
         if ((mod->Attributes & CONF_VPP1_CHANGE_VALID) &&
             (mod->Attributes & CONF_VPP2_CHANGE_VALID)) {
                 if (mod->Vpp1 != mod->Vpp2)
-                        return CS_BAD_VPP;
+                        ds_dbg(s, 0, "Vpp1 and Vpp2 must be the same\n");
+                        return -EINVAL;
                 s->socket.Vpp = mod->Vpp1;
-                if (s->ops->set_socket(s, &s->socket))
-                        return CS_BAD_VPP;
+                if (s->ops->set_socket(s, &s->socket)) {
+                        dev_printk(KERN_WARNING, &s->dev,
+                                   "Unable to set VPP\n");
+                        return -EIO;
+                }
         } else if ((mod->Attributes & CONF_VPP1_CHANGE_VALID) ||
-                   (mod->Attributes & CONF_VPP2_CHANGE_VALID))
-                return CS_BAD_VPP;
+                   (mod->Attributes & CONF_VPP2_CHANGE_VALID)) {
+                ds_dbg(s, 0, "changing Vcc is not allowed at this time\n");
+                return -EINVAL;
+        }
 
         if (mod->Attributes & CONF_IO_CHANGE_WIDTH) {
                 pccard_io_map io_off = { 0, 0, 0, 0, 1 };
@@ -406,7 +339,7 @@ int pcmcia_modify_configuration(struct pcmcia_device *p_dev,
                 }
         }
 
-        return CS_SUCCESS;
+        return 0;
 } /* modify_configuration */
 EXPORT_SYMBOL(pcmcia_modify_configuration);
 
@@ -441,7 +374,7 @@ int pcmcia_release_configuration(struct pcmcia_device *p_dev)
                         }
         }
 
-        return CS_SUCCESS;
+        return 0;
 } /* pcmcia_release_configuration */
 
 
@@ -459,7 +392,7 @@ static int pcmcia_release_io(struct pcmcia_device *p_dev, io_req_t *req)
         config_t *c = p_dev->function_config;
 
         if (!p_dev->_io )
-                return CS_BAD_HANDLE;
+                return -EINVAL;
 
         p_dev->_io = 0;
 
@@ -467,7 +400,7 @@ static int pcmcia_release_io(struct pcmcia_device *p_dev, io_req_t *req)
             (c->io.NumPorts1 != req->NumPorts1) ||
             (c->io.BasePort2 != req->BasePort2) ||
             (c->io.NumPorts2 != req->NumPorts2))
-                return CS_BAD_ARGS;
+                return -EINVAL;
 
         c->state &= ~CONFIG_IO_REQ;
 
@@ -475,7 +408,7 @@ static int pcmcia_release_io(struct pcmcia_device *p_dev, io_req_t *req)
         if (req->NumPorts2)
                 release_io_space(s, req->BasePort2, req->NumPorts2);
 
-        return CS_SUCCESS;
+        return 0;
 } /* pcmcia_release_io */
 
 
@@ -485,15 +418,19 @@ static int pcmcia_release_irq(struct pcmcia_device *p_dev, irq_req_t *req)
         config_t *c= p_dev->function_config;
 
         if (!p_dev->_irq)
-                return CS_BAD_HANDLE;
+                return -EINVAL;
         p_dev->_irq = 0;
 
         if (c->state & CONFIG_LOCKED)
-                return CS_CONFIGURATION_LOCKED;
-        if (c->irq.Attributes != req->Attributes)
-                return CS_BAD_ATTRIBUTE;
-        if (s->irq.AssignedIRQ != req->AssignedIRQ)
-                return CS_BAD_IRQ;
+                return -EACCES;
+        if (c->irq.Attributes != req->Attributes) {
+                ds_dbg(s, 0, "IRQ attributes must match assigned ones\n");
+                return -EINVAL;
+        }
+        if (s->irq.AssignedIRQ != req->AssignedIRQ) {
+                ds_dbg(s, 0, "IRQ must match assigned one\n");
+                return -EINVAL;
+        }
         if (--s->irq.Config == 0) {
                 c->state &= ~CONFIG_IRQ_REQ;
                 s->irq.AssignedIRQ = 0;
@@ -507,7 +444,7 @@ static int pcmcia_release_irq(struct pcmcia_device *p_dev, irq_req_t *req)
         pcmcia_used_irq[req->AssignedIRQ]--;
 #endif
 
-        return CS_SUCCESS;
+        return 0;
 } /* pcmcia_release_irq */
 
 
@@ -516,10 +453,10 @@ int pcmcia_release_window(window_handle_t win)
         struct pcmcia_socket *s;
 
         if ((win == NULL) || (win->magic != WINDOW_MAGIC))
-                return CS_BAD_HANDLE;
+                return -EINVAL;
         s = win->sock;
         if (!(win->handle->_win & CLIENT_WIN_REQ(win->index)))
-                return CS_BAD_HANDLE;
+                return -EINVAL;
 
         /* Shut down memory window */
         win->ctl.flags &= ~MAP_ACTIVE;
@@ -536,7 +473,7 @@ int pcmcia_release_window(window_handle_t win)
 
         win->magic = 0;
 
-        return CS_SUCCESS;
+        return 0;
 } /* pcmcia_release_window */
 EXPORT_SYMBOL(pcmcia_release_window);
 
@@ -551,18 +488,23 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev,
         pccard_io_map iomap;
 
         if (!(s->state & SOCKET_PRESENT))
-                return CS_NO_CARD;
+                return -ENODEV;;
 
-        if (req->IntType & INT_CARDBUS)
-                return CS_UNSUPPORTED_MODE;
+        if (req->IntType & INT_CARDBUS) {
+                ds_dbg(p_dev->socket, 0, "IntType may not be INT_CARDBUS\n");
+                return -EINVAL;
+        }
         c = p_dev->function_config;
         if (c->state & CONFIG_LOCKED)
-                return CS_CONFIGURATION_LOCKED;
+                return -EACCES;
 
         /* Do power control.  We don't allow changes in Vcc. */
         s->socket.Vpp = req->Vpp;
-        if (s->ops->set_socket(s, &s->socket))
-                return CS_BAD_VPP;
+        if (s->ops->set_socket(s, &s->socket)) {
+                dev_printk(KERN_WARNING, &s->dev,
+                           "Unable to set socket state\n");
+                return -EINVAL;
+        }
 
         /* Pick memory or I/O card, DMA mode, interrupt */
         c->IntType = req->IntType;
@@ -651,7 +593,7 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev,
 
         c->state |= CONFIG_LOCKED;
         p_dev->_locked = 1;
-        return CS_SUCCESS;
+        return 0;
 } /* pcmcia_request_configuration */
 EXPORT_SYMBOL(pcmcia_request_configuration);
 
@@ -667,37 +609,48 @@ int pcmcia_request_io(struct pcmcia_device *p_dev, io_req_t *req)
         config_t *c;
 
         if (!(s->state & SOCKET_PRESENT))
-                return CS_NO_CARD;
+                return -ENODEV;
 
         if (!req)
-                return CS_UNSUPPORTED_MODE;
+                return -EINVAL;
         c = p_dev->function_config;
         if (c->state & CONFIG_LOCKED)
-                return CS_CONFIGURATION_LOCKED;
-        if (c->state & CONFIG_IO_REQ)
-                return CS_IN_USE;
-        if (req->Attributes1 & (IO_SHARED | IO_FORCE_ALIAS_ACCESS))
-                return CS_BAD_ATTRIBUTE;
+                return -EACCES;
+        if (c->state & CONFIG_IO_REQ) {
+                ds_dbg(s, 0, "IO already configured\n");
+                return -EBUSY;
+        }
+        if (req->Attributes1 & (IO_SHARED | IO_FORCE_ALIAS_ACCESS)) {
+                ds_dbg(s, 0, "bad attribute setting for IO region 1\n");
+                return -EINVAL;
+        }
         if ((req->NumPorts2 > 0) &&
-            (req->Attributes2 & (IO_SHARED | IO_FORCE_ALIAS_ACCESS)))
-                return CS_BAD_ATTRIBUTE;
+            (req->Attributes2 & (IO_SHARED | IO_FORCE_ALIAS_ACCESS))) {
+                ds_dbg(s, 0, "bad attribute setting for IO region 2\n");
+                return -EINVAL;
+        }
 
+        ds_dbg(s, 1, "trying to allocate resource 1\n");
         if (alloc_io_space(s, req->Attributes1, &req->BasePort1,
-                           req->NumPorts1, req->IOAddrLines))
-                return CS_IN_USE;
+                           req->NumPorts1, req->IOAddrLines)) {
+                ds_dbg(s, 0, "allocation of resource 1 failed\n");
+                return -EBUSY;
+        }
 
         if (req->NumPorts2) {
+                ds_dbg(s, 1, "trying to allocate resource 2\n");
                 if (alloc_io_space(s, req->Attributes2, &req->BasePort2,
                                    req->NumPorts2, req->IOAddrLines)) {
+                        ds_dbg(s, 0, "allocation of resource 2 failed\n");
                         release_io_space(s, req->BasePort1, req->NumPorts1);
-                        return CS_IN_USE;
+                        return -EBUSY;
                 }
         }
 
         c->io = *req;
         c->state |= CONFIG_IO_REQ;
         p_dev->_io = 1;
-        return CS_SUCCESS;
+        return 0;
 } /* pcmcia_request_io */
 EXPORT_SYMBOL(pcmcia_request_io);
 
@@ -723,16 +676,18 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
 {
         struct pcmcia_socket *s = p_dev->socket;
         config_t *c;
-        int ret = CS_IN_USE, irq = 0;
+        int ret = -EINVAL, irq = 0;
         int type;
 
         if (!(s->state & SOCKET_PRESENT))
-                return CS_NO_CARD;
+                return -ENODEV;
         c = p_dev->function_config;
         if (c->state & CONFIG_LOCKED)
-                return CS_CONFIGURATION_LOCKED;
-        if (c->state & CONFIG_IRQ_REQ)
-                return CS_IN_USE;
+                return -EACCES;
+        if (c->state & CONFIG_IRQ_REQ) {
+                ds_dbg(s, 0, "IRQ already configured\n");
+                return -EBUSY;
+        }
 
         /* Decide what type of interrupt we are registering */
         type = 0;
@@ -795,15 +750,19 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
         }
 
         if (ret && (req->Attributes & IRQ_HANDLE_PRESENT)) {
-                if (request_irq(irq, req->Handler, type,  p_dev->devname, req->Instance))
-                        return CS_IN_USE;
+                ret = request_irq(irq, req->Handler, type,
+                                  p_dev->devname, req->Instance);
+                if (ret)
+                        return ret;
         }
 
         /* Make sure the fact the request type was overridden is passed back */
         if (type == IRQF_SHARED && !(req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)) {
                 req->Attributes |= IRQ_TYPE_DYNAMIC_SHARING;
-                printk(KERN_WARNING "pcmcia: request for exclusive IRQ could not be fulfilled.\n");
-                printk(KERN_WARNING "pcmcia: the driver needs updating to supported shared IRQ lines.\n");
+                dev_printk(KERN_WARNING, &p_dev->dev, "pcmcia: "
+                        "request for exclusive IRQ could not be fulfilled.\n");
+                dev_printk(KERN_WARNING, &p_dev->dev, "pcmcia: the driver "
+                        "needs updating to supported shared IRQ lines.\n");
         }
         c->irq.Attributes = req->Attributes;
         s->irq.AssignedIRQ = req->AssignedIRQ = irq;
@@ -816,7 +775,7 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
         pcmcia_used_irq[irq]++;
 #endif
 
-        return CS_SUCCESS;
+        return 0;
 } /* pcmcia_request_irq */
 EXPORT_SYMBOL(pcmcia_request_irq);
 
@@ -834,9 +793,11 @@ int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_h
         int w;
 
         if (!(s->state & SOCKET_PRESENT))
-                return CS_NO_CARD;
-        if (req->Attributes & (WIN_PAGED | WIN_SHARED))
-                return CS_BAD_ATTRIBUTE;
+                return -ENODEV;
+        if (req->Attributes & (WIN_PAGED | WIN_SHARED)) {
+                ds_dbg(s, 0, "bad attribute setting for iomem region\n");
+                return -EINVAL;
+        }
 
         /* Window size defaults to smallest available */
         if (req->Size == 0)
@@ -844,19 +805,25 @@ int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_h
         align = (((s->features & SS_CAP_MEM_ALIGN) ||
                   (req->Attributes & WIN_STRICT_ALIGN)) ?
                  req->Size : s->map_size);
-        if (req->Size & (s->map_size-1))
-                return CS_BAD_SIZE;
+        if (req->Size & (s->map_size-1)) {
+                ds_dbg(s, 0, "invalid map size\n");
+                return -EINVAL;
+        }
         if ((req->Base && (s->features & SS_CAP_STATIC_MAP)) ||
-            (req->Base & (align-1)))
-                return CS_BAD_BASE;
+            (req->Base & (align-1))) {
+                ds_dbg(s, 0, "invalid base address\n");
+                return -EINVAL;
+        }
         if (req->Base)
                 align = 0;
 
         /* Allocate system memory window */
         for (w = 0; w < MAX_WIN; w++)
                 if (!(s->state & SOCKET_WIN_REQ(w))) break;
-        if (w == MAX_WIN)
-                return CS_OUT_OF_RESOURCE;
+        if (w == MAX_WIN) {
+                ds_dbg(s, 0, "all windows are used already\n");
+                return -EINVAL;
+        }
 
         win = &s->win[w];
         win->magic = WINDOW_MAGIC;
@@ -867,8 +834,10 @@ int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_h
         if (!(s->features & SS_CAP_STATIC_MAP)) {
                 win->ctl.res = pcmcia_find_mem_region(req->Base, req->Size, align,
                                                       (req->Attributes & WIN_MAP_BELOW_1MB), s);
-                if (!win->ctl.res)
-                        return CS_IN_USE;
+                if (!win->ctl.res) {
+                        ds_dbg(s, 0, "allocating mem region failed\n");
+                        return -EINVAL;
+                }
         }
         (*p_dev)->_win |= CLIENT_WIN_REQ(w);
 
@@ -885,8 +854,10 @@ int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_h
         if (req->Attributes & WIN_USE_WAIT)
                 win->ctl.flags |= MAP_USE_WAIT;
         win->ctl.card_start = 0;
-        if (s->ops->set_mem_map(s, &win->ctl) != 0)
-                return CS_BAD_ARGS;
+        if (s->ops->set_mem_map(s, &win->ctl) != 0) {
+                ds_dbg(s, 0, "failed to set memory mapping\n");
+                return -EIO;
+        }
         s->state |= SOCKET_WIN_REQ(w);
 
         /* Return window handle */
@@ -897,7 +868,7 @@ int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_h
         }
         *wh = win;
 
-        return CS_SUCCESS;
+        return 0;
 } /* pcmcia_request_window */
 EXPORT_SYMBOL(pcmcia_request_window);
 
@@ -909,3 +880,79 @@ void pcmcia_disable_device(struct pcmcia_device *p_dev) {
                 pcmcia_release_window(p_dev->win);
 }
 EXPORT_SYMBOL(pcmcia_disable_device);
+
+
+struct pcmcia_cfg_mem {
+        tuple_t tuple;
+        cisparse_t parse;
+        u8 buf[256];
+        cistpl_cftable_entry_t dflt;
+};
+
+/**
+ * pcmcia_loop_config() - loop over configuration options
+ * @p_dev:      the struct pcmcia_device which we need to loop for.
+ * @conf_check: function to call for each configuration option.
+ *              It gets passed the struct pcmcia_device, the CIS data
+ *              describing the configuration option, and private data
+ *              being passed to pcmcia_loop_config()
+ * @priv_data:  private data to be passed to the conf_check function.
+ *
+ * pcmcia_loop_config() loops over all configuration options, and calls
+ * the driver-specific conf_check() for each one, checking whether
+ * it is a valid one.
+ */
+int pcmcia_loop_config(struct pcmcia_device *p_dev,
+                       int      (*conf_check)   (struct pcmcia_device *p_dev,
+                                                 cistpl_cftable_entry_t *cfg,
+                                                 cistpl_cftable_entry_t *dflt,
+                                                 unsigned int vcc,
+                                                 void *priv_data),
+                       void *priv_data)
+{
+        struct pcmcia_cfg_mem *cfg_mem;
+
+        tuple_t *tuple;
+        int ret = -ENODEV;
+        unsigned int vcc;
+
+        cfg_mem = kzalloc(sizeof(struct pcmcia_cfg_mem), GFP_KERNEL);
+        if (cfg_mem == NULL)
+                return -ENOMEM;
+
+        /* get the current Vcc setting */
+        vcc = p_dev->socket->socket.Vcc;
+
+        tuple = &cfg_mem->tuple;
+        tuple->TupleData = cfg_mem->buf;
+        tuple->TupleDataMax = 255;
+        tuple->TupleOffset = 0;
+        tuple->DesiredTuple = CISTPL_CFTABLE_ENTRY;
+        tuple->Attributes = 0;
+
+        ret = pcmcia_get_first_tuple(p_dev, tuple);
+        while (!ret) {
+                cistpl_cftable_entry_t *cfg = &cfg_mem->parse.cftable_entry;
+
+                if (pcmcia_get_tuple_data(p_dev, tuple))
+                        goto next_entry;
+
+                if (pcmcia_parse_tuple(tuple, &cfg_mem->parse))
+                        goto next_entry;
+
+                /* default values */
+                p_dev->conf.ConfigIndex = cfg->index;
+                if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
+                        cfg_mem->dflt = *cfg;
+
+                ret = conf_check(p_dev, cfg, &cfg_mem->dflt, vcc, priv_data);
+                if (!ret)
+                        break;
+
+next_entry:
+                ret = pcmcia_get_next_tuple(p_dev, tuple);
+        }
+
+        return ret;
+}
+EXPORT_SYMBOL(pcmcia_loop_config);
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index 13f1e0fd3f31..bb9ddb9532e3 100644
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -36,7 +36,6 @@
 #include <pcmcia/ss.h>
 #include <pcmcia/cistpl.h>
 
-#include "cs_internal.h"
 #include "soc_common.h"
 #include "pxa2xx_base.h"
 
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c
index 203e579ebbd2..17f4ecf1c0c5 100644
--- a/drivers/pcmcia/rsrc_nonstatic.c
+++ b/drivers/pcmcia/rsrc_nonstatic.c
@@ -122,19 +122,22 @@ static void free_region(struct resource *res)
 
 static int add_interval(struct resource_map *map, u_long base, u_long num)
 {
-    struct resource_map *p, *q;
+        struct resource_map *p, *q;
 
-    for (p = map; ; p = p->next) {
-        if ((p != map) && (p->base+p->num-1 >= base))
-            return -1;
-        if ((p->next == map) || (p->next->base > base+num-1))
-            break;
-    }
-    q = kmalloc(sizeof(struct resource_map), GFP_KERNEL);
-    if (!q) return CS_OUT_OF_RESOURCE;
-    q->base = base; q->num = num;
-    q->next = p->next; p->next = q;
-    return CS_SUCCESS;
+        for (p = map; ; p = p->next) {
+                if ((p != map) && (p->base+p->num-1 >= base))
+                        return -1;
+                if ((p->next == map) || (p->next->base > base+num-1))
+                        break;
+        }
+        q = kmalloc(sizeof(struct resource_map), GFP_KERNEL);
+        if (!q) {
+                printk(KERN_WARNING "out of memory to update resources\n");
+                return -ENOMEM;
+        }
+        q->base = base; q->num = num;
+        q->next = p->next; p->next = q;
+        return 0;
 }
 
 /*====================================================================*/
@@ -166,7 +169,10 @@ static int sub_interval(struct resource_map *map, u_long base, u_long num)
             } else {
                 /* Split the block into two pieces */
                 p = kmalloc(sizeof(struct resource_map), GFP_KERNEL);
-                if (!p) return CS_OUT_OF_RESOURCE;
+                if (!p) {
+                    printk(KERN_WARNING "out of memory to update resources\n");
+                    return -ENOMEM;
+                }
                 p->base = base+num;
                 p->num = q->base+q->num - p->base;
                 q->num = base - q->base;
@@ -174,7 +180,7 @@ static int sub_interval(struct resource_map *map, u_long base, u_long num)
             }
         }
     }
-    return CS_SUCCESS;
+    return 0;
 }
 
 /*======================================================================
@@ -194,13 +200,14 @@ static void do_io_probe(struct pcmcia_socket *s, unsigned int base,
     int any;
     u_char *b, hole, most;
 
-    printk(KERN_INFO "cs: IO port probe %#x-%#x:",
-           base, base+num-1);
+    dev_printk(KERN_INFO, &s->dev, "cs: IO port probe %#x-%#x:",
+               base, base+num-1);
 
     /* First, what does a floating port look like? */
     b = kzalloc(256, GFP_KERNEL);
     if (!b) {
-            printk(KERN_ERR "do_io_probe: unable to kmalloc 256 bytes");
+            dev_printk(KERN_ERR, &s->dev,
+                   "do_io_probe: unable to kmalloc 256 bytes");
             return;
     }
     for (i = base, most = 0; i < base+num; i += 8) {
@@ -366,8 +373,8 @@ static int do_mem_probe(u_long base, u_long num, struct pcmcia_socket *s)
     struct socket_data *s_data = s->resource_data;
     u_long i, j, bad, fail, step;
 
-    printk(KERN_INFO "cs: memory probe 0x%06lx-0x%06lx:",
-           base, base+num-1);
+    dev_printk(KERN_INFO, &s->dev, "cs: memory probe 0x%06lx-0x%06lx:",
+               base, base+num-1);
     bad = fail = 0;
     step = (num < 0x20000) ? 0x2000 : ((num>>4) & ~0x1fff);
     /* don't allow too large steps */
@@ -431,8 +438,8 @@ static int validate_mem(struct pcmcia_socket *s, unsigned int probe_mask)
         if (probe_mask & MEM_PROBE_HIGH) {
                 if (inv_probe(s_data->mem_db.next, s) > 0)
                         return 0;
-                printk(KERN_NOTICE "cs: warning: no high memory space "
-                       "available!\n");
+                dev_printk(KERN_NOTICE, &s->dev,
+                           "cs: warning: no high memory space available!\n");
                 return -ENODEV;
         }
 
@@ -794,10 +801,11 @@ static int nonstatic_autoadd_resources(struct pcmcia_socket *s)
                 if (res->flags & IORESOURCE_IO) {
                         if (res == &ioport_resource)
                                 continue;
-                        printk(KERN_INFO "pcmcia: parent PCI bridge I/O "
-                                "window: 0x%llx - 0x%llx\n",
-                                (unsigned long long)res->start,
-                                (unsigned long long)res->end);
+                        dev_printk(KERN_INFO, &s->cb_dev->dev,
+                                   "pcmcia: parent PCI bridge I/O "
+                                   "window: 0x%llx - 0x%llx\n",
+                                   (unsigned long long)res->start,
+                                   (unsigned long long)res->end);
                         if (!adjust_io(s, ADD_MANAGED_RESOURCE, res->start, res->end))
                                 done |= IORESOURCE_IO;
 
@@ -806,10 +814,11 @@ static int nonstatic_autoadd_resources(struct pcmcia_socket *s)
                 if (res->flags & IORESOURCE_MEM) {
                         if (res == &iomem_resource)
                                 continue;
-                        printk(KERN_INFO "pcmcia: parent PCI bridge Memory "
-                                "window: 0x%llx - 0x%llx\n",
-                                (unsigned long long)res->start,
-                                (unsigned long long)res->end);
+                        dev_printk(KERN_INFO, &s->cb_dev->dev,
+                                   "pcmcia: parent PCI bridge Memory "
+                                   "window: 0x%llx - 0x%llx\n",
+                                   (unsigned long long)res->start,
+                                   (unsigned long long)res->end);
                         if (!adjust_memory(s, ADD_MANAGED_RESOURCE, res->start, res->end))
                                 done |= IORESOURCE_MEM;
                 }
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c
index da3972153226..f49ac6666153 100644
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
@@ -54,7 +54,7 @@
 #include <mach/pxa-regs.h>
 #endif
 
-#ifdef DEBUG
+#ifdef CONFIG_PCMCIA_DEBUG
 
 static int pc_debug;
 module_param(pc_debug, int, 0644);
diff --git a/drivers/pcmcia/soc_common.h b/drivers/pcmcia/soc_common.h
index 91ef6a0da3ab..38c67375f363 100644
--- a/drivers/pcmcia/soc_common.h
+++ b/drivers/pcmcia/soc_common.h
@@ -15,7 +15,6 @@
 #include <pcmcia/cs.h>
 #include <pcmcia/ss.h>
 #include <pcmcia/cistpl.h>
-#include "cs_internal.h"
 
 
 struct device;
@@ -137,7 +136,7 @@ extern int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_lev
 extern int soc_common_drv_pcmcia_remove(struct device *dev);
 
 
-#ifdef DEBUG
+#ifdef CONFIG_PCMCIA_DEBUG
 
 extern void soc_pcmcia_debug(struct soc_pcmcia_socket *skt, const char *func,
                              int lvl, const char *fmt, ...);
diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c
index 006a29e91d83..ff9a3bb3c88d 100644
--- a/drivers/pcmcia/socket_sysfs.c
+++ b/drivers/pcmcia/socket_sysfs.c
@@ -316,27 +316,18 @@ static ssize_t pccard_store_cis(struct kobject *kobj,
                                 char *buf, loff_t off, size_t count)
 {
         struct pcmcia_socket *s = to_socket(container_of(kobj, struct device, kobj));
-        cisdump_t *cis;
         int error;
 
         if (off)
                 return -EINVAL;
 
-        if (count >= 0x200)
+        if (count >= CISTPL_MAX_CIS_SIZE)
                 return -EINVAL;
 
         if (!(s->state & SOCKET_PRESENT))
                 return -ENODEV;
 
-        cis = kzalloc(sizeof(cisdump_t), GFP_KERNEL);
-        if (!cis)
-                return -ENOMEM;
-
-        cis->Length = count + 1;
-        memcpy(cis->Data, buf, count);
-
-        error = pcmcia_replace_cis(s, cis);
-        kfree(cis);
+        error = pcmcia_replace_cis(s, buf, count);
         if (error)
                 return -EIO;
 
diff --git a/drivers/pcmcia/tcic.c b/drivers/pcmcia/tcic.c
index 5792bd5c54f9..2a613e920fd4 100644
--- a/drivers/pcmcia/tcic.c
+++ b/drivers/pcmcia/tcic.c
@@ -55,7 +55,7 @@
 #include <pcmcia/ss.h>
 #include "tcic.h"
 
-#ifdef DEBUG
+#ifdef CONFIG_PCMCIA_DEBUG
 static int pc_debug;
 
 module_param(pc_debug, int, 0644);
diff --git a/drivers/pcmcia/ti113x.h b/drivers/pcmcia/ti113x.h
index 129db7bd06c3..aaa70227bfb0 100644
--- a/drivers/pcmcia/ti113x.h
+++ b/drivers/pcmcia/ti113x.h
@@ -339,8 +339,8 @@ static void ti12xx_irqroute_func0(struct yenta_socket *socket)
 
         mfunc = mfunc_old = config_readl(socket, TI122X_MFUNC);
         devctl = config_readb(socket, TI113X_DEVICE_CONTROL);
-        printk(KERN_INFO "Yenta TI: socket %s, mfunc 0x%08x, devctl 0x%02x\n",
-               pci_name(socket->dev), mfunc, devctl);
+        dev_printk(KERN_INFO, &socket->dev->dev,
+                   "TI: mfunc 0x%08x, devctl 0x%02x\n", mfunc, devctl);
 
         /* make sure PCI interrupts are enabled before probing */
         ti_init(socket);
@@ -354,8 +354,8 @@ static void ti12xx_irqroute_func0(struct yenta_socket *socket)
          * We're here which means PCI interrupts are _not_ delivered. try to
          * find the right setting (all serial or parallel)
          */
-        printk(KERN_INFO "Yenta TI: socket %s probing PCI interrupt failed, trying to fix\n",
-               pci_name(socket->dev));
+        dev_printk(KERN_INFO, &socket->dev->dev,
+                   "TI: probing PCI interrupt failed, trying to fix\n");
 
         /* for serial PCI make sure MFUNC3 is set to IRQSER */
         if ((devctl & TI113X_DCR_IMODE_MASK) == TI12XX_DCR_IMODE_ALL_SERIAL) {
@@ -379,8 +379,8 @@ static void ti12xx_irqroute_func0(struct yenta_socket *socket)
 
                                 pci_irq_status = yenta_probe_cb_irq(socket);
                                 if (pci_irq_status == 1) {
-                                        printk(KERN_INFO "Yenta TI: socket %s all-serial interrupts ok\n",
-                                               pci_name(socket->dev));
+                                        dev_printk(KERN_INFO, &socket->dev->dev,
+                                            "TI: all-serial interrupts ok\n");
                                         mfunc_old = mfunc;
                                         goto out;
                                 }
@@ -395,8 +395,8 @@ static void ti12xx_irqroute_func0(struct yenta_socket *socket)
                 }
 
                 /* serial PCI interrupts not working fall back to parallel */
-                printk(KERN_INFO "Yenta TI: socket %s falling back to parallel PCI interrupts\n",
-                       pci_name(socket->dev));
+                dev_printk(KERN_INFO, &socket->dev->dev,
+                           "TI: falling back to parallel PCI interrupts\n");
                 devctl &= ~TI113X_DCR_IMODE_MASK;
                 devctl |= TI113X_DCR_IMODE_SERIAL; /* serial ISA could be right */
                 config_writeb(socket, TI113X_DEVICE_CONTROL, devctl);
@@ -427,8 +427,8 @@ static void ti12xx_irqroute_func0(struct yenta_socket *socket)
         pci_irq_status = yenta_probe_cb_irq(socket);
         if (pci_irq_status == 1) {
                 mfunc_old = mfunc;
-                printk(KERN_INFO "Yenta TI: socket %s parallel PCI interrupts ok\n",
-                       pci_name(socket->dev));
+                dev_printk(KERN_INFO, &socket->dev->dev,
+                           "TI: parallel PCI interrupts ok\n");
         } else {
                 /* not working, back to old value */
                 mfunc = mfunc_old;
@@ -440,8 +440,9 @@ static void ti12xx_irqroute_func0(struct yenta_socket *socket)
 out:
         if (pci_irq_status < 1) {
                 socket->cb_irq = 0;
-                printk(KERN_INFO "Yenta TI: socket %s no PCI interrupts. Fish. Please report.\n",
-                       pci_name(socket->dev));
+                dev_printk(KERN_INFO, &socket->dev->dev,
+                           "Yenta TI: no PCI interrupts. Fish. "
+                           "Please report.\n");
         }
 }
 
@@ -513,8 +514,9 @@ static void ti12xx_irqroute_func1(struct yenta_socket *socket)
 
         mfunc = mfunc_old = config_readl(socket, TI122X_MFUNC);
         devctl = config_readb(socket, TI113X_DEVICE_CONTROL);
-        printk(KERN_INFO "Yenta TI: socket %s, mfunc 0x%08x, devctl 0x%02x\n",
-               pci_name(socket->dev), mfunc, devctl);
+        dev_printk(KERN_INFO, &socket->dev->dev,
+                   "TI: mfunc 0x%08x, devctl 0x%02x\n",
+                   mfunc, devctl);
 
         /* if IRQs are configured as tied, align irq of func1 with func0 */
         sysctl = config_readl(socket, TI113X_SYSTEM_CONTROL);
@@ -533,9 +535,8 @@ static void ti12xx_irqroute_func1(struct yenta_socket *socket)
          * We're here which means PCI interrupts are _not_ delivered. try to
          * find the right setting
          */
-        printk(KERN_INFO "Yenta TI: socket %s probing PCI interrupt failed, trying to fix\n",
-               pci_name(socket->dev));
-
+        dev_printk(KERN_INFO, &socket->dev->dev,
+                   "TI: probing PCI interrupt failed, trying to fix\n");
 
         /* if all serial: set INTRTIE, probe again */
         if ((devctl & TI113X_DCR_IMODE_MASK) == TI12XX_DCR_IMODE_ALL_SERIAL) {
@@ -544,8 +545,8 @@ static void ti12xx_irqroute_func1(struct yenta_socket *socket)
                 if (ti12xx_tie_interrupts(socket, &old_irq)) {
                         pci_irq_status = yenta_probe_cb_irq(socket);
                         if (pci_irq_status == 1) {
-                                printk(KERN_INFO "Yenta TI: socket %s all-serial interrupts, tied ok\n",
-                                       pci_name(socket->dev));
+                                dev_printk(KERN_INFO, &socket->dev->dev,
+                                        "TI: all-serial interrupts, tied ok\n");
                                 goto out;
                         }
 
@@ -582,8 +583,8 @@ static void ti12xx_irqroute_func1(struct yenta_socket *socket)
 
                         pci_irq_status = yenta_probe_cb_irq(socket);
                         if (pci_irq_status == 1) {
-                                printk(KERN_INFO "Yenta TI: socket %s parallel PCI interrupts ok\n",
-                                       pci_name(socket->dev));
+                                dev_printk(KERN_INFO, &socket->dev->dev,
+                                           "TI: parallel PCI interrupts ok\n");
                                 goto out;
                         }
 
@@ -593,13 +594,13 @@ static void ti12xx_irqroute_func1(struct yenta_socket *socket)
                         if (pci_irq_status == -1)
                                 goto out;
                 }
-                
+
                 /* still nothing: set INTRTIE */
                 if (ti12xx_tie_interrupts(socket, &old_irq)) {
                         pci_irq_status = yenta_probe_cb_irq(socket);
                         if (pci_irq_status == 1) {
-                                printk(KERN_INFO "Yenta TI: socket %s parallel PCI interrupts, tied ok\n",
-                                       pci_name(socket->dev));
+                                dev_printk(KERN_INFO, &socket->dev->dev,
+                                    "TI: parallel PCI interrupts, tied ok\n");
                                 goto out;
                         }
 
@@ -610,8 +611,8 @@ static void ti12xx_irqroute_func1(struct yenta_socket *socket)
 out:
         if (pci_irq_status < 1) {
                 socket->cb_irq = 0;
-                printk(KERN_INFO "Yenta TI: socket %s no PCI interrupts. Fish. Please report.\n",
-                       pci_name(socket->dev));
+                dev_printk(KERN_INFO, &socket->dev->dev,
+                           "TI: no PCI interrupts. Fish. Please report.\n");
         }
 }
 
@@ -815,11 +816,13 @@ static int ti12xx_override(struct yenta_socket *socket)
         /* make sure that memory burst is active */
         val_orig = val = config_readl(socket, TI113X_SYSTEM_CONTROL);
         if (disable_clkrun && PCI_FUNC(socket->dev->devfn) == 0) {
-                printk(KERN_INFO "Yenta: Disabling CLKRUN feature\n");
+                dev_printk(KERN_INFO, &socket->dev->dev,
+                           "Disabling CLKRUN feature\n");
                 val |= TI113X_SCR_KEEPCLK;
         }
         if (!(val & TI122X_SCR_MRBURSTUP)) {
-                printk(KERN_INFO "Yenta: Enabling burst memory read transactions\n");
+                dev_printk(KERN_INFO, &socket->dev->dev,
+                           "Enabling burst memory read transactions\n");
                 val |= TI122X_SCR_MRBURSTUP;
         }
         if (val_orig != val)
@@ -830,10 +833,12 @@ static int ti12xx_override(struct yenta_socket *socket)
          * CSC interrupts to PCI rather than INTVAL.
          */
         val = config_readb(socket, TI1250_DIAGNOSTIC);
-        printk(KERN_INFO "Yenta: Using %s to route CSC interrupts to PCI\n",
-                (val & TI1250_DIAG_PCI_CSC) ? "CSCINT" : "INTVAL");
-        printk(KERN_INFO "Yenta: Routing CardBus interrupts to %s\n",
-                (val & TI1250_DIAG_PCI_IREQ) ? "PCI" : "ISA");
+        dev_printk(KERN_INFO, &socket->dev->dev,
+                   "Using %s to route CSC interrupts to PCI\n",
+                   (val & TI1250_DIAG_PCI_CSC) ? "CSCINT" : "INTVAL");
+        dev_printk(KERN_INFO, &socket->dev->dev,
+                   "Routing CardBus interrupts to %s\n",
+                   (val & TI1250_DIAG_PCI_IREQ) ? "PCI" : "ISA");
 
         /* do irqrouting, depending on function */
         if (PCI_FUNC(socket->dev->devfn) == 0)
@@ -858,8 +863,9 @@ static int ti1250_override(struct yenta_socket *socket)
                 diag |= TI1250_DIAG_PCI_CSC | TI1250_DIAG_PCI_IREQ;
 
         if (diag != old) {
-                printk(KERN_INFO "Yenta: adjusting diagnostic: %02x -> %02x\n",
-                        old, diag);
+                dev_printk(KERN_INFO, &socket->dev->dev,
+                           "adjusting diagnostic: %02x -> %02x\n",
+                           old, diag);
                 config_writeb(socket, TI1250_DIAGNOSTIC, diag);
         }
 
@@ -924,7 +930,9 @@ static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
                 /* default to clear TLTEnable bit, old behaviour */
                 test_c9 &= ~ENE_TEST_C9_TLTENABLE;
 
-        printk(KERN_INFO "yenta EnE: chaning testregister 0xC9, %02x -> %02x\n", old_c9, test_c9);
+        dev_printk(KERN_INFO, &socket->dev->dev,
+                   "EnE: chaning testregister 0xC9, %02x -> %02x\n",
+                   old_c9, test_c9);
         config_writeb(socket, ENE_TEST_C9, test_c9);
 }
 
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index 0ab1fb65cdc3..3ecd7c99d8eb 100644
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -38,11 +38,7 @@ static int pwr_irqs_off;
 module_param(pwr_irqs_off, bool, 0644);
 MODULE_PARM_DESC(pwr_irqs_off, "Force IRQs off during power-on of slot. Use only when seeing IRQ storms!");
 
-#if 0
-#define debug(x,args...) printk(KERN_DEBUG "%s: " x, __func__ , ##args)
-#else
-#define debug(x,args...)
-#endif
+#define debug(x, s, args...) dev_dbg(&s->dev->dev, x, ##args)
 
 /* Don't ask.. */
 #define to_cycles(ns)   ((ns)/120)
@@ -69,13 +65,13 @@ MODULE_PARM_DESC (override_bios, "yenta ignore bios resource allocation");
 static inline u32 cb_readl(struct yenta_socket *socket, unsigned reg)
 {
         u32 val = readl(socket->base + reg);
-        debug("%p %04x %08x\n", socket, reg, val);
+        debug("%04x %08x\n", socket, reg, val);
         return val;
 }
 
 static inline void cb_writel(struct yenta_socket *socket, unsigned reg, u32 val)
 {
-        debug("%p %04x %08x\n", socket, reg, val);
+        debug("%04x %08x\n", socket, reg, val);
         writel(val, socket->base + reg);
         readl(socket->base + reg); /* avoid problems with PCI write posting */
 }
@@ -84,7 +80,7 @@ static inline u8 config_readb(struct yenta_socket *socket, unsigned offset)
 {
         u8 val;
         pci_read_config_byte(socket->dev, offset, &val);
-        debug("%p %04x %02x\n", socket, offset, val);
+        debug("%04x %02x\n", socket, offset, val);
         return val;
 }
 
@@ -92,7 +88,7 @@ static inline u16 config_readw(struct yenta_socket *socket, unsigned offset)
 {
         u16 val;
         pci_read_config_word(socket->dev, offset, &val);
-        debug("%p %04x %04x\n", socket, offset, val);
+        debug("%04x %04x\n", socket, offset, val);
         return val;
 }
 
@@ -100,32 +96,32 @@ static inline u32 config_readl(struct yenta_socket *socket, unsigned offset)
 {
         u32 val;
         pci_read_config_dword(socket->dev, offset, &val);
-        debug("%p %04x %08x\n", socket, offset, val);
+        debug("%04x %08x\n", socket, offset, val);
         return val;
 }
 
 static inline void config_writeb(struct yenta_socket *socket, unsigned offset, u8 val)
 {
-        debug("%p %04x %02x\n", socket, offset, val);
+        debug("%04x %02x\n", socket, offset, val);
         pci_write_config_byte(socket->dev, offset, val);
 }
 
 static inline void config_writew(struct yenta_socket *socket, unsigned offset, u16 val)
 {
-        debug("%p %04x %04x\n", socket, offset, val);
+        debug("%04x %04x\n", socket, offset, val);
         pci_write_config_word(socket->dev, offset, val);
 }
 
 static inline void config_writel(struct yenta_socket *socket, unsigned offset, u32 val)
 {
-        debug("%p %04x %08x\n", socket, offset, val);
+        debug("%04x %08x\n", socket, offset, val);
         pci_write_config_dword(socket->dev, offset, val);
 }
 
 static inline u8 exca_readb(struct yenta_socket *socket, unsigned reg)
 {
         u8 val = readb(socket->base + 0x800 + reg);
-        debug("%p %04x %02x\n", socket, reg, val);
+        debug("%04x %02x\n", socket, reg, val);
         return val;
 }
 
@@ -134,20 +130,20 @@ static inline u8 exca_readw(struct yenta_socket *socket, unsigned reg)
         u16 val;
         val = readb(socket->base + 0x800 + reg);
         val |= readb(socket->base + 0x800 + reg + 1) << 8;
-        debug("%p %04x %04x\n", socket, reg, val);
+        debug("%04x %04x\n", socket, reg, val);
         return val;
 }
 
 static inline void exca_writeb(struct yenta_socket *socket, unsigned reg, u8 val)
 {
-        debug("%p %04x %02x\n", socket, reg, val);
+        debug("%04x %02x\n", socket, reg, val);
         writeb(val, socket->base + 0x800 + reg);
         readb(socket->base + 0x800 + reg); /* PCI write posting... */
 }
 
 static void exca_writew(struct yenta_socket *socket, unsigned reg, u16 val)
 {
-        debug("%p %04x %04x\n", socket, reg, val);
+        debug("%04x %04x\n", socket, reg, val);
         writeb(val, socket->base + 0x800 + reg);
         writeb(val >> 8, socket->base + 0x800 + reg + 1);
 
@@ -207,7 +203,7 @@ static int yenta_get_status(struct pcmcia_socket *sock, unsigned int *value)
 
 
         if (state & CB_CBCARD) {
-                val |= SS_CARDBUS;      
+                val |= SS_CARDBUS;
                 val |= (state & CB_CARDSTS) ? SS_STSCHG : 0;
                 val |= (state & (CB_CDETECT1 | CB_CDETECT2)) ? 0 : SS_DETECT;
                 val |= (state & CB_PWRCYCLE) ? SS_POWERON | SS_READY : 0;
@@ -650,8 +646,10 @@ static int yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned type
                 root = pci_find_parent_resource(socket->dev, res);
                 if (root && (request_resource(root, res) == 0))
                         return 0;
-                printk(KERN_INFO "yenta %s: Preassigned resource %d busy or not available, reconfiguring...\n",
-                                pci_name(socket->dev), nr);
+                dev_printk(KERN_INFO, &socket->dev->dev,
+                           "Preassigned resource %d busy or not available, "
+                           "reconfiguring...\n",
+                           nr);
         }
 
         if (type & IORESOURCE_IO) {
@@ -674,8 +672,9 @@ static int yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned type
                         return 1;
         }
 
-        printk(KERN_INFO "yenta %s: no resource of type %x available, trying to continue...\n",
-               pci_name(socket->dev), type);
+        dev_printk(KERN_INFO, &socket->dev->dev,
+                   "no resource of type %x available, trying to continue...\n",
+                   type);
         res->start = res->end = res->flags = 0;
         return 0;
 }
@@ -923,7 +922,8 @@ static int yenta_probe_cb_irq(struct yenta_socket *socket)
         socket->probe_status = 0;
 
         if (request_irq(socket->cb_irq, yenta_probe_handler, IRQF_SHARED, "yenta", socket)) {
-                printk(KERN_WARNING "Yenta: request_irq() in yenta_probe_cb_irq() failed!\n");
+                dev_printk(KERN_WARNING, &socket->dev->dev,
+                           "request_irq() in yenta_probe_cb_irq() failed!\n");
                 return -1;
         }
 
@@ -960,8 +960,9 @@ static void yenta_get_socket_capabilities(struct yenta_socket *socket, u32 isa_i
         else
                 socket->socket.irq_mask = 0;
 
-        printk(KERN_INFO "Yenta: ISA IRQ mask 0x%04x, PCI irq %d\n",
-               socket->socket.irq_mask, socket->cb_irq);
+        dev_printk(KERN_INFO, &socket->dev->dev,
+                   "ISA IRQ mask 0x%04x, PCI irq %d\n",
+                   socket->socket.irq_mask, socket->cb_irq);
 }
 
 /*
@@ -1051,8 +1052,9 @@ static void yenta_fixup_parent_bridge(struct pci_bus *cardbus_bridge)
 
         /* Show that the wanted subordinate number is not possible: */
         if (cardbus_bridge->subordinate > upper_limit)
-                printk(KERN_WARNING "Yenta: Upper limit for fixing this "
-                        "bridge's parent bridge: #%02x\n", upper_limit);
+                dev_printk(KERN_WARNING, &cardbus_bridge->dev,
+                           "Upper limit for fixing this "
+                           "bridge's parent bridge: #%02x\n", upper_limit);
 
         /* If we have room to increase the bridge's subordinate number, */
         if (bridge_to_fix->subordinate < upper_limit) {
@@ -1061,10 +1063,11 @@ static void yenta_fixup_parent_bridge(struct pci_bus *cardbus_bridge)
                 unsigned char subordinate_to_assign =
                         min(cardbus_bridge->subordinate, upper_limit);
 
-                printk(KERN_INFO "Yenta: Raising subordinate bus# of parent "
-                        "bus (#%02x) from #%02x to #%02x\n",
-                        bridge_to_fix->number,
-                        bridge_to_fix->subordinate, subordinate_to_assign);
+                dev_printk(KERN_INFO, &bridge_to_fix->dev,
+                           "Raising subordinate bus# of parent "
+                           "bus (#%02x) from #%02x to #%02x\n",
+                           bridge_to_fix->number,
+                           bridge_to_fix->subordinate, subordinate_to_assign);
 
                 /* Save the new subordinate in the bus struct of the bridge */
                 bridge_to_fix->subordinate = subordinate_to_assign;
@@ -1091,8 +1094,8 @@ static int __devinit yenta_probe (struct pci_dev *dev, const struct pci_device_i
          * Bail out if so.
          */
         if (!dev->subordinate) {
-                printk(KERN_ERR "Yenta: no bus associated with %s! "
-                        "(try 'pci=assign-busses')\n", pci_name(dev));
+                dev_printk(KERN_ERR, &dev->dev, "no bus associated! "
+                           "(try 'pci=assign-busses')\n");
                 return -ENODEV;
         }
 
@@ -1127,7 +1130,7 @@ static int __devinit yenta_probe (struct pci_dev *dev, const struct pci_device_i
                 goto disable;
 
         if (!pci_resource_start(dev, 0)) {
-                printk(KERN_ERR "No cardbus resource!\n");
+                dev_printk(KERN_ERR, &dev->dev, "No cardbus resource!\n");
                 ret = -ENODEV;
                 goto release;
         }
@@ -1146,8 +1149,8 @@ static int __devinit yenta_probe (struct pci_dev *dev, const struct pci_device_i
          * report the subsystem vendor and device for help debugging
          * the irq stuff...
          */
-        printk(KERN_INFO "Yenta: CardBus bridge found at %s [%04x:%04x]\n",
-                pci_name(dev), dev->subsystem_vendor, dev->subsystem_device);
+        dev_printk(KERN_INFO, &dev->dev, "CardBus bridge found [%04x:%04x]\n",
+                   dev->subsystem_vendor, dev->subsystem_device);
 
         yenta_config_init(socket);
 
@@ -1179,8 +1182,12 @@ static int __devinit yenta_probe (struct pci_dev *dev, const struct pci_device_i
                 socket->poll_timer.data = (unsigned long)socket;
                 socket->poll_timer.expires = jiffies + HZ;
                 add_timer(&socket->poll_timer);
-                printk(KERN_INFO "Yenta: no PCI IRQ, CardBus support disabled for this socket.\n"
-                       KERN_INFO "Yenta: check your BIOS CardBus, BIOS IRQ or ACPI settings.\n");
+                dev_printk(KERN_INFO, &dev->dev,
+                           "no PCI IRQ, CardBus support disabled for this "
+                           "socket.\n");
+                dev_printk(KERN_INFO, &dev->dev,
+                           "check your BIOS CardBus, BIOS IRQ or ACPI "
+                           "settings.\n");
         } else {
                 socket->socket.features |= SS_CAP_CARDBUS;
         }
@@ -1188,7 +1195,8 @@ static int __devinit yenta_probe (struct pci_dev *dev, const struct pci_device_i
         /* Figure out what the dang thing can do for the PCMCIA layer... */
         yenta_interrogate(socket);
         yenta_get_socket_capabilities(socket, isa_interrupts);
-        printk(KERN_INFO "Socket status: %08x\n", cb_readl(socket, CB_SOCKET_STATE));
+        dev_printk(KERN_INFO, &dev->dev,
+                   "Socket status: %08x\n", cb_readl(socket, CB_SOCKET_STATE));
 
         yenta_fixup_parent_bridge(dev->subordinate);
 
diff --git a/drivers/pnp/base.h b/drivers/pnp/base.h
index 9fd7bb9b7dce..3b8b9d3cb03d 100644
--- a/drivers/pnp/base.h
+++ b/drivers/pnp/base.h
@@ -4,6 +4,7 @@
  */
 
 extern spinlock_t pnp_lock;
+extern struct device_attribute pnp_interface_attrs[];
 void *pnp_alloc(long size);
 
 int pnp_register_protocol(struct pnp_protocol *protocol);
@@ -16,7 +17,6 @@ struct pnp_card *pnp_alloc_card(struct pnp_protocol *, int id, char *pnpid);
 
 int pnp_add_device(struct pnp_dev *dev);
 struct pnp_id *pnp_add_id(struct pnp_dev *dev, char *id);
-int pnp_interface_attach_device(struct pnp_dev *dev);
 
 int pnp_add_card(struct pnp_card *card);
 void pnp_remove_card(struct pnp_card *card);
@@ -147,7 +147,7 @@ char *pnp_resource_type_name(struct resource *res);
 void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc);
 
 void pnp_free_resources(struct pnp_dev *dev);
-int pnp_resource_type(struct resource *res);
+unsigned long pnp_resource_type(struct resource *res);
 
 struct pnp_resource {
         struct list_head list;
diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c
index a411582bcd72..817fe626e15b 100644
--- a/drivers/pnp/core.c
+++ b/drivers/pnp/core.c
@@ -159,21 +159,13 @@ struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *protocol, int id, char *pnpid
 
 int __pnp_add_device(struct pnp_dev *dev)
 {
-        int ret;
-
         pnp_fixup_device(dev);
         dev->status = PNP_READY;
         spin_lock(&pnp_lock);
         list_add_tail(&dev->global_list, &pnp_global);
         list_add_tail(&dev->protocol_list, &dev->protocol->devices);
         spin_unlock(&pnp_lock);
-
-        ret = device_register(&dev->dev);
-        if (ret)
-                return ret;
-
-        pnp_interface_attach_device(dev);
-        return 0;
+        return device_register(&dev->dev);
 }
 
 /*
@@ -218,7 +210,6 @@ void __pnp_remove_device(struct pnp_dev *dev)
 
 static int __init pnp_init(void)
 {
-        printk(KERN_INFO "Linux Plug and Play Support v0.97 (c) Adam Belay\n");
         return bus_register(&pnp_bus_type);
 }
 
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index d3f869ee1d92..e3f7e89c4dfb 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -206,6 +206,7 @@ struct bus_type pnp_bus_type = {
         .remove  = pnp_device_remove,
         .suspend = pnp_bus_suspend,
         .resume  = pnp_bus_resume,
+        .dev_attrs = pnp_interface_attrs,
 };
 
 int pnp_register_driver(struct pnp_driver *drv)
diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c
index a876ecf7028c..478a4a739c00 100644
--- a/drivers/pnp/interface.c
+++ b/drivers/pnp/interface.c
@@ -243,8 +243,6 @@ static ssize_t pnp_show_options(struct device *dmdev,
         return ret;
 }
 
-static DEVICE_ATTR(options, S_IRUGO, pnp_show_options, NULL);
-
 static ssize_t pnp_show_current_resources(struct device *dmdev,
                                           struct device_attribute *attr,
                                           char *buf)
@@ -420,9 +418,6 @@ done:
         return count;
 }
 
-static DEVICE_ATTR(resources, S_IRUGO | S_IWUSR,
-                   pnp_show_current_resources, pnp_set_current_resources);
-
 static ssize_t pnp_show_current_ids(struct device *dmdev,
                                     struct device_attribute *attr, char *buf)
 {
@@ -437,27 +432,11 @@ static ssize_t pnp_show_current_ids(struct device *dmdev,
         return (str - buf);
 }
 
-static DEVICE_ATTR(id, S_IRUGO, pnp_show_current_ids, NULL);
-
-int pnp_interface_attach_device(struct pnp_dev *dev)
-{
-        int rc = device_create_file(&dev->dev, &dev_attr_options);
-
-        if (rc)
-                goto err;
-        rc = device_create_file(&dev->dev, &dev_attr_resources);
-        if (rc)
-                goto err_opt;
-        rc = device_create_file(&dev->dev, &dev_attr_id);
-        if (rc)
-                goto err_res;
-
-        return 0;
-
-err_res:
-        device_remove_file(&dev->dev, &dev_attr_resources);
-err_opt:
-        device_remove_file(&dev->dev, &dev_attr_options);
-err:
-        return rc;
-}
+struct device_attribute pnp_interface_attrs[] = {
+        __ATTR(resources, S_IRUGO | S_IWUSR,
+                   pnp_show_current_resources,
+                   pnp_set_current_resources),
+        __ATTR(options, S_IRUGO, pnp_show_options, NULL),
+        __ATTR(id, S_IRUGO, pnp_show_current_ids, NULL),
+        __ATTR_NULL,
+};
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index 101a835e8759..46455fbab6d5 100644
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -1012,7 +1012,7 @@ static int __init isapnp_init(void)
                 printk(KERN_INFO "isapnp: ISA Plug & Play support disabled\n");
                 return 0;
         }
-#ifdef CONFIG_PPC_MERGE
+#ifdef CONFIG_PPC
         if (check_legacy_ioport(_PIDXR) || check_legacy_ioport(_PNPWRP))
                 return -EINVAL;
 #endif
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index 662dfcddedc6..2bfe13369df5 100644
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -519,7 +519,7 @@ static int __init pnpbios_init(void)
 {
         int ret;
 
-#if defined(CONFIG_PPC_MERGE)
+#if defined(CONFIG_PPC)
         if (check_legacy_ioport(PNPBIOS_BASE))
                 return -ENODEV;
 #endif
@@ -577,7 +577,7 @@ static int __init pnpbios_thread_init(void)
 {
         struct task_struct *task;
 
-#if defined(CONFIG_PPC_MERGE)
+#if defined(CONFIG_PPC)
         if (check_legacy_ioport(PNPBIOS_BASE))
                 return 0;
 #endif
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index 0bdf9b8a5e58..c144bd575611 100644
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -245,7 +245,7 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)
          */
         for_each_pci_dev(pdev) {
                 for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
-                        unsigned int type;
+                        unsigned long type;
 
                         type = pci_resource_flags(pdev, i) &
                                         (IORESOURCE_IO | IORESOURCE_MEM);
@@ -338,8 +338,7 @@ void pnp_fixup_device(struct pnp_dev *dev)
                 if (!compare_pnp_id(dev->id, f->id))
                         continue;
 #ifdef DEBUG
-                dev_dbg(&dev->dev, "%s: calling ", f->id);
-                print_fn_descriptor_symbol("%s\n", f->quirk_function);
+                dev_dbg(&dev->dev, "%s: calling %pF\n", f->id, f->quirk_function);
 #endif
                 f->quirk_function(dev);
         }
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index 4cfe3a1efdfb..dbae23acdd5b 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -467,14 +467,14 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
 #endif
 }
 
-int pnp_resource_type(struct resource *res)
+unsigned long pnp_resource_type(struct resource *res)
 {
         return res->flags & (IORESOURCE_IO  | IORESOURCE_MEM |
                              IORESOURCE_IRQ | IORESOURCE_DMA);
 }
 
 struct resource *pnp_get_resource(struct pnp_dev *dev,
-                                  unsigned int type, unsigned int num)
+                                  unsigned long type, unsigned int num)
 {
         struct pnp_resource *pnp_res;
         struct resource *res;
diff --git a/drivers/power/olpc_battery.c b/drivers/power/olpc_battery.c
index 32570af3c5c9..5fbca2681baa 100644
--- a/drivers/power/olpc_battery.c
+++ b/drivers/power/olpc_battery.c
@@ -205,9 +205,9 @@ static int olpc_bat_get_property(struct power_supply *psy,
                                  union power_supply_propval *val)
 {
         int ret = 0;
-        int16_t ec_word;
+        __be16 ec_word;
         uint8_t ec_byte;
-        uint64_t ser_buf;
+        __be64 ser_buf;
 
         ret = olpc_ec_cmd(EC_BAT_STATUS, NULL, 0, &ec_byte, 1);
         if (ret)
@@ -257,16 +257,14 @@ static int olpc_bat_get_property(struct power_supply *psy,
                 if (ret)
                         return ret;
 
-                ec_word = be16_to_cpu(ec_word);
-                val->intval = ec_word * 9760L / 32;
+                val->intval = (int)be16_to_cpu(ec_word) * 9760L / 32;
                 break;
         case POWER_SUPPLY_PROP_CURRENT_AVG:
                 ret = olpc_ec_cmd(EC_BAT_CURRENT, NULL, 0, (void *)&ec_word, 2);
                 if (ret)
                         return ret;
 
-                ec_word = be16_to_cpu(ec_word);
-                val->intval = ec_word * 15625L / 120;
+                val->intval = (int)be16_to_cpu(ec_word) * 15625L / 120;
                 break;
         case POWER_SUPPLY_PROP_CAPACITY:
                 ret = olpc_ec_cmd(EC_BAT_SOC, NULL, 0, &ec_byte, 1);
@@ -278,24 +276,22 @@ static int olpc_bat_get_property(struct power_supply *psy,
                 ret = olpc_ec_cmd(EC_BAT_TEMP, NULL, 0, (void *)&ec_word, 2);
                 if (ret)
                         return ret;
-                ec_word = be16_to_cpu(ec_word);
-                val->intval = ec_word * 100 / 256;
+
+                val->intval = (int)be16_to_cpu(ec_word) * 100 / 256;
                 break;
         case POWER_SUPPLY_PROP_TEMP_AMBIENT:
                 ret = olpc_ec_cmd(EC_AMB_TEMP, NULL, 0, (void *)&ec_word, 2);
                 if (ret)
                         return ret;
 
-                ec_word = be16_to_cpu(ec_word);
-                val->intval = ec_word * 100 / 256;
+                val->intval = (int)be16_to_cpu(ec_word) * 100 / 256;
                 break;
         case POWER_SUPPLY_PROP_CHARGE_COUNTER:
                 ret = olpc_ec_cmd(EC_BAT_ACR, NULL, 0, (void *)&ec_word, 2);
                 if (ret)
                         return ret;
 
-                ec_word = be16_to_cpu(ec_word);
-                val->intval = ec_word * 6250 / 15;
+                val->intval = (int)be16_to_cpu(ec_word) * 6250 / 15;
                 break;
         case POWER_SUPPLY_PROP_SERIAL_NUMBER:
                 ret = olpc_ec_cmd(EC_BAT_SERIAL, NULL, 0, (void *)&ser_buf, 8);
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
index cb1ccb472921..3007695f90c8 100644
--- a/drivers/power/power_supply_core.c
+++ b/drivers/power/power_supply_core.c
@@ -91,8 +91,8 @@ int power_supply_register(struct device *parent, struct power_supply *psy)
 {
         int rc = 0;
 
-        psy->dev = device_create_drvdata(power_supply_class, parent, 0,
-                                         psy, "%s", psy->name);
+        psy->dev = device_create(power_supply_class, parent, 0, psy,
+                                 "%s", psy->name);
         if (IS_ERR(psy->dev)) {
                 rc = PTR_ERR(psy->dev);
                 goto dev_create_failed;
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index a656128f1fdd..4dada6ee1119 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -56,4 +56,28 @@ config REGULATOR_BQ24022
           charging select between 100 mA and 500 mA charging current
           limit.
 
+config REGULATOR_WM8350
+        tristate "Wolfson Microelectroncis WM8350 AudioPlus PMIC"
+        depends on MFD_WM8350
+        select REGULATOR
+        help
+          This driver provides support for the voltage and current regulators
+          of the WM8350 AudioPlus PMIC.
+
+config REGULATOR_WM8400
+        tristate "Wolfson Microelectroncis WM8400 AudioPlus PMIC"
+        depends on MFD_WM8400
+        select REGULATOR
+        help
+          This driver provides support for the voltage regulators of the
+          WM8400 AudioPlus PMIC.
+
+config REGULATOR_DA903X
+        tristate "Support regulators on Dialog Semiconductor DA9030/DA9034 PMIC"
+        depends on PMIC_DA903X
+        select REGULATOR
+        help
+          Say y here to support the BUCKs and LDOs regulators found on
+          Dialog Semiconductor DA9030/DA9034 PMIC.
+
 endmenu
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index ac2c64efe65c..254d40c02ee8 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -8,5 +8,8 @@ obj-$(CONFIG_REGULATOR_FIXED_VOLTAGE) += fixed.o
 obj-$(CONFIG_REGULATOR_VIRTUAL_CONSUMER) += virtual.o
 
 obj-$(CONFIG_REGULATOR_BQ24022) += bq24022.o
+obj-$(CONFIG_REGULATOR_WM8350) += wm8350-regulator.o
+obj-$(CONFIG_REGULATOR_WM8400) += wm8400-regulator.o
+obj-$(CONFIG_REGULATOR_DA903X)  += da903x.o
 
 ccflags-$(CONFIG_REGULATOR_DEBUG) += -DDEBUG
diff --git a/drivers/regulator/bq24022.c b/drivers/regulator/bq24022.c
index 263699d6152d..366565aba865 100644
--- a/drivers/regulator/bq24022.c
+++ b/drivers/regulator/bq24022.c
@@ -18,13 +18,13 @@
 #include <linux/regulator/bq24022.h>
 #include <linux/regulator/driver.h>
 
+
 static int bq24022_set_current_limit(struct regulator_dev *rdev,
                                         int min_uA, int max_uA)
 {
-        struct platform_device *pdev = rdev_get_drvdata(rdev);
-        struct bq24022_mach_info *pdata = pdev->dev.platform_data;
+        struct bq24022_mach_info *pdata = rdev_get_drvdata(rdev);
 
-        dev_dbg(&pdev->dev, "setting current limit to %s mA\n",
+        dev_dbg(rdev_get_dev(rdev), "setting current limit to %s mA\n",
                 max_uA >= 500000 ? "500" : "100");
 
         /* REVISIT: maybe return error if min_uA != 0 ? */
@@ -34,18 +34,16 @@ static int bq24022_set_current_limit(struct regulator_dev *rdev,
 
 static int bq24022_get_current_limit(struct regulator_dev *rdev)
 {
-        struct platform_device *pdev = rdev_get_drvdata(rdev);
-        struct bq24022_mach_info *pdata = pdev->dev.platform_data;
+        struct bq24022_mach_info *pdata = rdev_get_drvdata(rdev);
 
         return gpio_get_value(pdata->gpio_iset2) ? 500000 : 100000;
 }
 
 static int bq24022_enable(struct regulator_dev *rdev)
 {
-        struct platform_device *pdev = rdev_get_drvdata(rdev);
-        struct bq24022_mach_info *pdata = pdev->dev.platform_data;
+        struct bq24022_mach_info *pdata = rdev_get_drvdata(rdev);
 
-        dev_dbg(&pdev->dev, "enabling charger\n");
+        dev_dbg(rdev_get_dev(rdev), "enabling charger\n");
 
         gpio_set_value(pdata->gpio_nce, 0);
         return 0;
@@ -53,10 +51,9 @@ static int bq24022_enable(struct regulator_dev *rdev)
 
 static int bq24022_disable(struct regulator_dev *rdev)
 {
-        struct platform_device *pdev = rdev_get_drvdata(rdev);
-        struct bq24022_mach_info *pdata = pdev->dev.platform_data;
+        struct bq24022_mach_info *pdata = rdev_get_drvdata(rdev);
 
-        dev_dbg(&pdev->dev, "disabling charger\n");
+        dev_dbg(rdev_get_dev(rdev), "disabling charger\n");
 
         gpio_set_value(pdata->gpio_nce, 1);
         return 0;
@@ -108,7 +105,7 @@ static int __init bq24022_probe(struct platform_device *pdev)
         ret = gpio_direction_output(pdata->gpio_iset2, 0);
         ret = gpio_direction_output(pdata->gpio_nce, 1);
 
-        bq24022 = regulator_register(&bq24022_desc, pdev);
+        bq24022 = regulator_register(&bq24022_desc, &pdev->dev, pdata);
         if (IS_ERR(bq24022)) {
                 dev_dbg(&pdev->dev, "couldn't register regulator\n");
                 ret = PTR_ERR(bq24022);
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 9c7986261568..02a774424e8d 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2,8 +2,9 @@
  * core.c  --  Voltage/Current Regulator framework.
  *
  * Copyright 2007, 2008 Wolfson Microelectronics PLC.
+ * Copyright 2008 SlimLogic Ltd.
  *
- * Author: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
+ * Author: Liam Girdwood <lrg@slimlogic.co.uk>
  *
  *  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
@@ -64,14 +65,9 @@ struct regulator_map {
         struct list_head list;
         struct device *dev;
         const char *supply;
-        const char *regulator;
+        struct regulator_dev *regulator;
 };
 
-static inline struct regulator_dev *to_rdev(struct device *d)
-{
-        return container_of(d, struct regulator_dev, dev);
-}
-
 /*
  * struct regulator
  *
@@ -227,7 +223,7 @@ static ssize_t device_requested_uA_show(struct device *dev,
 static ssize_t regulator_uV_show(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
-        struct regulator_dev *rdev = to_rdev(dev);
+        struct regulator_dev *rdev = dev_get_drvdata(dev);
         ssize_t ret;
 
         mutex_lock(&rdev->mutex);
@@ -240,15 +236,31 @@ static ssize_t regulator_uV_show(struct device *dev,
 static ssize_t regulator_uA_show(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
-        struct regulator_dev *rdev = to_rdev(dev);
+        struct regulator_dev *rdev = dev_get_drvdata(dev);
 
         return sprintf(buf, "%d\n", _regulator_get_current_limit(rdev));
 }
 
+static ssize_t regulator_name_show(struct device *dev,
+                             struct device_attribute *attr, char *buf)
+{
+        struct regulator_dev *rdev = dev_get_drvdata(dev);
+        const char *name;
+
+        if (rdev->constraints->name)
+                name = rdev->constraints->name;
+        else if (rdev->desc->name)
+                name = rdev->desc->name;
+        else
+                name = "";
+
+        return sprintf(buf, "%s\n", name);
+}
+
 static ssize_t regulator_opmode_show(struct device *dev,
                                     struct device_attribute *attr, char *buf)
 {
-        struct regulator_dev *rdev = to_rdev(dev);
+        struct regulator_dev *rdev = dev_get_drvdata(dev);
         int mode = _regulator_get_mode(rdev);
 
         switch (mode) {
@@ -267,7 +279,7 @@ static ssize_t regulator_opmode_show(struct device *dev,
 static ssize_t regulator_state_show(struct device *dev,
                                    struct device_attribute *attr, char *buf)
 {
-        struct regulator_dev *rdev = to_rdev(dev);
+        struct regulator_dev *rdev = dev_get_drvdata(dev);
         int state = _regulator_is_enabled(rdev);
 
         if (state > 0)
@@ -281,7 +293,7 @@ static ssize_t regulator_state_show(struct device *dev,
 static ssize_t regulator_min_uA_show(struct device *dev,
                                     struct device_attribute *attr, char *buf)
 {
-        struct regulator_dev *rdev = to_rdev(dev);
+        struct regulator_dev *rdev = dev_get_drvdata(dev);
 
         if (!rdev->constraints)
                 return sprintf(buf, "constraint not defined\n");
@@ -292,7 +304,7 @@ static ssize_t regulator_min_uA_show(struct device *dev,
 static ssize_t regulator_max_uA_show(struct device *dev,
                                     struct device_attribute *attr, char *buf)
 {
-        struct regulator_dev *rdev = to_rdev(dev);
+        struct regulator_dev *rdev = dev_get_drvdata(dev);
 
         if (!rdev->constraints)
                 return sprintf(buf, "constraint not defined\n");
@@ -303,7 +315,7 @@ static ssize_t regulator_max_uA_show(struct device *dev,
 static ssize_t regulator_min_uV_show(struct device *dev,
                                     struct device_attribute *attr, char *buf)
 {
-        struct regulator_dev *rdev = to_rdev(dev);
+        struct regulator_dev *rdev = dev_get_drvdata(dev);
 
         if (!rdev->constraints)
                 return sprintf(buf, "constraint not defined\n");
@@ -314,7 +326,7 @@ static ssize_t regulator_min_uV_show(struct device *dev,
 static ssize_t regulator_max_uV_show(struct device *dev,
                                     struct device_attribute *attr, char *buf)
 {
-        struct regulator_dev *rdev = to_rdev(dev);
+        struct regulator_dev *rdev = dev_get_drvdata(dev);
 
         if (!rdev->constraints)
                 return sprintf(buf, "constraint not defined\n");
@@ -325,7 +337,7 @@ static ssize_t regulator_max_uV_show(struct device *dev,
 static ssize_t regulator_total_uA_show(struct device *dev,
                                       struct device_attribute *attr, char *buf)
 {
-        struct regulator_dev *rdev = to_rdev(dev);
+        struct regulator_dev *rdev = dev_get_drvdata(dev);
         struct regulator *regulator;
         int uA = 0;
 
@@ -339,14 +351,14 @@ static ssize_t regulator_total_uA_show(struct device *dev,
 static ssize_t regulator_num_users_show(struct device *dev,
                                       struct device_attribute *attr, char *buf)
 {
-        struct regulator_dev *rdev = to_rdev(dev);
+        struct regulator_dev *rdev = dev_get_drvdata(dev);
         return sprintf(buf, "%d\n", rdev->use_count);
 }
 
 static ssize_t regulator_type_show(struct device *dev,
                                   struct device_attribute *attr, char *buf)
 {
-        struct regulator_dev *rdev = to_rdev(dev);
+        struct regulator_dev *rdev = dev_get_drvdata(dev);
 
         switch (rdev->desc->type) {
         case REGULATOR_VOLTAGE:
@@ -360,7 +372,7 @@ static ssize_t regulator_type_show(struct device *dev,
 static ssize_t regulator_suspend_mem_uV_show(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
-        struct regulator_dev *rdev = to_rdev(dev);
+        struct regulator_dev *rdev = dev_get_drvdata(dev);
 
         if (!rdev->constraints)
                 return sprintf(buf, "not defined\n");
@@ -370,7 +382,7 @@ static ssize_t regulator_suspend_mem_uV_show(struct device *dev,
 static ssize_t regulator_suspend_disk_uV_show(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
-        struct regulator_dev *rdev = to_rdev(dev);
+        struct regulator_dev *rdev = dev_get_drvdata(dev);
 
         if (!rdev->constraints)
                 return sprintf(buf, "not defined\n");
@@ -380,7 +392,7 @@ static ssize_t regulator_suspend_disk_uV_show(struct device *dev,
 static ssize_t regulator_suspend_standby_uV_show(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
-        struct regulator_dev *rdev = to_rdev(dev);
+        struct regulator_dev *rdev = dev_get_drvdata(dev);
 
         if (!rdev->constraints)
                 return sprintf(buf, "not defined\n");
@@ -406,7 +418,7 @@ static ssize_t suspend_opmode_show(struct regulator_dev *rdev,
 static ssize_t regulator_suspend_mem_mode_show(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
-        struct regulator_dev *rdev = to_rdev(dev);
+        struct regulator_dev *rdev = dev_get_drvdata(dev);
 
         if (!rdev->constraints)
                 return sprintf(buf, "not defined\n");
@@ -417,7 +429,7 @@ static ssize_t regulator_suspend_mem_mode_show(struct device *dev,
 static ssize_t regulator_suspend_disk_mode_show(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
-        struct regulator_dev *rdev = to_rdev(dev);
+        struct regulator_dev *rdev = dev_get_drvdata(dev);
 
         if (!rdev->constraints)
                 return sprintf(buf, "not defined\n");
@@ -428,7 +440,7 @@ static ssize_t regulator_suspend_disk_mode_show(struct device *dev,
 static ssize_t regulator_suspend_standby_mode_show(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
-        struct regulator_dev *rdev = to_rdev(dev);
+        struct regulator_dev *rdev = dev_get_drvdata(dev);
 
         if (!rdev->constraints)
                 return sprintf(buf, "not defined\n");
@@ -439,7 +451,7 @@ static ssize_t regulator_suspend_standby_mode_show(struct device *dev,
 static ssize_t regulator_suspend_mem_state_show(struct device *dev,
                                    struct device_attribute *attr, char *buf)
 {
-        struct regulator_dev *rdev = to_rdev(dev);
+        struct regulator_dev *rdev = dev_get_drvdata(dev);
 
         if (!rdev->constraints)
                 return sprintf(buf, "not defined\n");
@@ -453,7 +465,7 @@ static ssize_t regulator_suspend_mem_state_show(struct device *dev,
 static ssize_t regulator_suspend_disk_state_show(struct device *dev,
                                    struct device_attribute *attr, char *buf)
 {
-        struct regulator_dev *rdev = to_rdev(dev);
+        struct regulator_dev *rdev = dev_get_drvdata(dev);
 
         if (!rdev->constraints)
                 return sprintf(buf, "not defined\n");
@@ -467,7 +479,7 @@ static ssize_t regulator_suspend_disk_state_show(struct device *dev,
 static ssize_t regulator_suspend_standby_state_show(struct device *dev,
                                    struct device_attribute *attr, char *buf)
 {
-        struct regulator_dev *rdev = to_rdev(dev);
+        struct regulator_dev *rdev = dev_get_drvdata(dev);
 
         if (!rdev->constraints)
                 return sprintf(buf, "not defined\n");
@@ -477,7 +489,9 @@ static ssize_t regulator_suspend_standby_state_show(struct device *dev,
         else
                 return sprintf(buf, "disabled\n");
 }
+
 static struct device_attribute regulator_dev_attrs[] = {
+        __ATTR(name, 0444, regulator_name_show, NULL),
         __ATTR(microvolts, 0444, regulator_uV_show, NULL),
         __ATTR(microamps, 0444, regulator_uA_show, NULL),
         __ATTR(opmode, 0444, regulator_opmode_show, NULL),
@@ -512,7 +526,7 @@ static struct device_attribute regulator_dev_attrs[] = {
 
 static void regulator_dev_release(struct device *dev)
 {
-        struct regulator_dev *rdev = to_rdev(dev);
+        struct regulator_dev *rdev = dev_get_drvdata(dev);
         kfree(rdev);
 }
 
@@ -569,8 +583,11 @@ static int suspend_set_state(struct regulator_dev *rdev,
 
         /* enable & disable are mandatory for suspend control */
         if (!rdev->desc->ops->set_suspend_enable ||
-                !rdev->desc->ops->set_suspend_disable)
+                !rdev->desc->ops->set_suspend_disable) {
+                printk(KERN_ERR "%s: no way to set suspend state\n",
+                        __func__);
                 return -EINVAL;
+        }
 
         if (rstate->enabled)
                 ret = rdev->desc->ops->set_suspend_enable(rdev);
@@ -656,6 +673,155 @@ static void print_constraints(struct regulator_dev *rdev)
         printk(KERN_INFO "regulator: %s: %s\n", rdev->desc->name, buf);
 }
 
+/**
+ * set_machine_constraints - sets regulator constraints
+ * @regulator: regulator source
+ *
+ * Allows platform initialisation code to define and constrain
+ * regulator circuits e.g. valid voltage/current ranges, etc.  NOTE:
+ * Constraints *must* be set by platform code in order for some
+ * regulator operations to proceed i.e. set_voltage, set_current_limit,
+ * set_mode.
+ */
+static int set_machine_constraints(struct regulator_dev *rdev,
+        struct regulation_constraints *constraints)
+{
+        int ret = 0;
+        const char *name;
+        struct regulator_ops *ops = rdev->desc->ops;
+
+        if (constraints->name)
+                name = constraints->name;
+        else if (rdev->desc->name)
+                name = rdev->desc->name;
+        else
+                name = "regulator";
+
+        rdev->constraints = constraints;
+
+        /* do we need to apply the constraint voltage */
+        if (rdev->constraints->apply_uV &&
+                rdev->constraints->min_uV == rdev->constraints->max_uV &&
+                ops->set_voltage) {
+                ret = ops->set_voltage(rdev,
+                        rdev->constraints->min_uV, rdev->constraints->max_uV);
+                        if (ret < 0) {
+                                printk(KERN_ERR "%s: failed to apply %duV constraint to %s\n",
+                                       __func__,
+                                       rdev->constraints->min_uV, name);
+                                rdev->constraints = NULL;
+                                goto out;
+                        }
+        }
+
+        /* are we enabled at boot time by firmware / bootloader */
+        if (rdev->constraints->boot_on)
+                rdev->use_count = 1;
+
+        /* do we need to setup our suspend state */
+        if (constraints->initial_state) {
+                ret = suspend_prepare(rdev, constraints->initial_state);
+                if (ret < 0) {
+                        printk(KERN_ERR "%s: failed to set suspend state for %s\n",
+                               __func__, name);
+                        rdev->constraints = NULL;
+                        goto out;
+                }
+        }
+
+        /* if always_on is set then turn the regulator on if it's not
+         * already on. */
+        if (constraints->always_on && ops->enable &&
+            ((ops->is_enabled && !ops->is_enabled(rdev)) ||
+             (!ops->is_enabled && !constraints->boot_on))) {
+                ret = ops->enable(rdev);
+                if (ret < 0) {
+                        printk(KERN_ERR "%s: failed to enable %s\n",
+                               __func__, name);
+                        rdev->constraints = NULL;
+                        goto out;
+                }
+        }
+
+        print_constraints(rdev);
+out:
+        return ret;
+}
+
+/**
+ * set_supply - set regulator supply regulator
+ * @regulator: regulator name
+ * @supply: supply regulator name
+ *
+ * Called by platform initialisation code to set the supply regulator for this
+ * regulator. This ensures that a regulators supply will also be enabled by the
+ * core if it's child is enabled.
+ */
+static int set_supply(struct regulator_dev *rdev,
+        struct regulator_dev *supply_rdev)
+{
+        int err;
+
+        err = sysfs_create_link(&rdev->dev.kobj, &supply_rdev->dev.kobj,
+                                "supply");
+        if (err) {
+                printk(KERN_ERR
+                       "%s: could not add device link %s err %d\n",
+                       __func__, supply_rdev->dev.kobj.name, err);
+                       goto out;
+        }
+        rdev->supply = supply_rdev;
+        list_add(&rdev->slist, &supply_rdev->supply_list);
+out:
+        return err;
+}
+
+/**
+ * set_consumer_device_supply: Bind a regulator to a symbolic supply
+ * @regulator: regulator source
+ * @dev:       device the supply applies to
+ * @supply:    symbolic name for supply
+ *
+ * Allows platform initialisation code to map physical regulator
+ * sources to symbolic names for supplies for use by devices.  Devices
+ * should use these symbolic names to request regulators, avoiding the
+ * need to provide board-specific regulator names as platform data.
+ */
+static int set_consumer_device_supply(struct regulator_dev *rdev,
+        struct device *consumer_dev, const char *supply)
+{
+        struct regulator_map *node;
+
+        if (supply == NULL)
+                return -EINVAL;
+
+        node = kmalloc(sizeof(struct regulator_map), GFP_KERNEL);
+        if (node == NULL)
+                return -ENOMEM;
+
+        node->regulator = rdev;
+        node->dev = consumer_dev;
+        node->supply = supply;
+
+        list_add(&node->list, &regulator_map_list);
+        return 0;
+}
+
+static void unset_consumer_device_supply(struct regulator_dev *rdev,
+        struct device *consumer_dev)
+{
+        struct regulator_map *node, *n;
+
+        list_for_each_entry_safe(node, n, &regulator_map_list, list) {
+                if (rdev == node->regulator &&
+                        consumer_dev == node->dev) {
+                        list_del(&node->list);
+                        kfree(node);
+                        return;
+                }
+        }
+}
+
 #define REG_STR_SIZE    32
 
 static struct regulator *create_regulator(struct regulator_dev *rdev,
@@ -746,7 +912,6 @@ struct regulator *regulator_get(struct device *dev, const char *id)
         struct regulator_dev *rdev;
         struct regulator_map *map;
         struct regulator *regulator = ERR_PTR(-ENODEV);
-        const char *supply = id;
 
         if (id == NULL) {
                 printk(KERN_ERR "regulator: get() with no identifier\n");
@@ -758,15 +923,9 @@ struct regulator *regulator_get(struct device *dev, const char *id)
         list_for_each_entry(map, &regulator_map_list, list) {
                 if (dev == map->dev &&
                     strcmp(map->supply, id) == 0) {
-                        supply = map->regulator;
-                        break;
-                }
-        }
-
-        list_for_each_entry(rdev, &regulator_list, list) {
-                if (strcmp(supply, rdev->desc->name) == 0 &&
-                    try_module_get(rdev->owner))
+                        rdev = map->regulator;
                         goto found;
+                }
         }
         printk(KERN_ERR "regulator: Unable to get requested regulator: %s\n",
                id);
@@ -774,12 +933,16 @@ struct regulator *regulator_get(struct device *dev, const char *id)
         return regulator;
 
 found:
+        if (!try_module_get(rdev->owner))
+                goto out;
+
         regulator = create_regulator(rdev, dev, id);
         if (regulator == NULL) {
                 regulator = ERR_PTR(-ENOMEM);
                 module_put(rdev->owner);
         }
 
+out:
         mutex_unlock(&regulator_list_mutex);
         return regulator;
 }
@@ -1559,11 +1722,12 @@ EXPORT_SYMBOL_GPL(regulator_notifier_call_chain);
  * Returns 0 on success.
  */
 struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
-                                          void *reg_data)
+        struct device *dev, void *driver_data)
 {
         static atomic_t regulator_no = ATOMIC_INIT(0);
         struct regulator_dev *rdev;
-        int ret;
+        struct regulator_init_data *init_data = dev->platform_data;
+        int ret, i;
 
         if (regulator_desc == NULL)
                 return ERR_PTR(-EINVAL);
@@ -1575,6 +1739,9 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
             !regulator_desc->type == REGULATOR_CURRENT)
                 return ERR_PTR(-EINVAL);
 
+        if (!init_data)
+                return ERR_PTR(-EINVAL);
+
         rdev = kzalloc(sizeof(struct regulator_dev), GFP_KERNEL);
         if (rdev == NULL)
                 return ERR_PTR(-ENOMEM);
@@ -1582,7 +1749,7 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
         mutex_lock(&regulator_list_mutex);
 
         mutex_init(&rdev->mutex);
-        rdev->reg_data = reg_data;
+        rdev->reg_data = driver_data;
         rdev->owner = regulator_desc->owner;
         rdev->desc = regulator_desc;
         INIT_LIST_HEAD(&rdev->consumer_list);
@@ -1591,20 +1758,68 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
         INIT_LIST_HEAD(&rdev->slist);
         BLOCKING_INIT_NOTIFIER_HEAD(&rdev->notifier);
 
+        /* preform any regulator specific init */
+        if (init_data->regulator_init) {
+                ret = init_data->regulator_init(rdev->reg_data);
+                if (ret < 0) {
+                        kfree(rdev);
+                        rdev = ERR_PTR(ret);
+                        goto out;
+                }
+        }
+
+        /* set regulator constraints */
+        ret = set_machine_constraints(rdev, &init_data->constraints);
+        if (ret < 0) {
+                kfree(rdev);
+                rdev = ERR_PTR(ret);
+                goto out;
+        }
+
+        /* register with sysfs */
         rdev->dev.class = &regulator_class;
-        device_initialize(&rdev->dev);
+        rdev->dev.parent = dev;
         snprintf(rdev->dev.bus_id, sizeof(rdev->dev.bus_id),
-                 "regulator_%ld_%s",
-                 (unsigned long)atomic_inc_return(&regulator_no) - 1,
-                 regulator_desc->name);
-
-        ret = device_add(&rdev->dev);
-        if (ret == 0)
-                list_add(&rdev->list, &regulator_list);
-        else {
+                 "regulator.%d", atomic_inc_return(&regulator_no) - 1);
+        ret = device_register(&rdev->dev);
+        if (ret != 0) {
                 kfree(rdev);
                 rdev = ERR_PTR(ret);
+                goto out;
+        }
+
+        dev_set_drvdata(&rdev->dev, rdev);
+
+        /* set supply regulator if it exists */
+        if (init_data->supply_regulator_dev) {
+                ret = set_supply(rdev,
+                        dev_get_drvdata(init_data->supply_regulator_dev));
+                if (ret < 0) {
+                        device_unregister(&rdev->dev);
+                        kfree(rdev);
+                        rdev = ERR_PTR(ret);
+                        goto out;
+                }
         }
+
+        /* add consumers devices */
+        for (i = 0; i < init_data->num_consumer_supplies; i++) {
+                ret = set_consumer_device_supply(rdev,
+                        init_data->consumer_supplies[i].dev,
+                        init_data->consumer_supplies[i].supply);
+                if (ret < 0) {
+                        for (--i; i >= 0; i--)
+                                unset_consumer_device_supply(rdev,
+                                        init_data->consumer_supplies[i].dev);
+                        device_unregister(&rdev->dev);
+                        kfree(rdev);
+                        rdev = ERR_PTR(ret);
+                        goto out;
+                }
+        }
+
+        list_add(&rdev->list, &regulator_list);
+out:
         mutex_unlock(&regulator_list_mutex);
         return rdev;
 }
@@ -1631,187 +1846,6 @@ void regulator_unregister(struct regulator_dev *rdev)
 EXPORT_SYMBOL_GPL(regulator_unregister);
 
 /**
- * regulator_set_supply - set regulator supply regulator
- * @regulator: regulator name
- * @supply: supply regulator name
- *
- * Called by platform initialisation code to set the supply regulator for this
- * regulator. This ensures that a regulators supply will also be enabled by the
- * core if it's child is enabled.
- */
-int regulator_set_supply(const char *regulator, const char *supply)
-{
-        struct regulator_dev *rdev, *supply_rdev;
-        int err;
-
-        if (regulator == NULL || supply == NULL)
-                return -EINVAL;
-
-        mutex_lock(&regulator_list_mutex);
-
-        list_for_each_entry(rdev, &regulator_list, list) {
-                if (!strcmp(rdev->desc->name, regulator))
-                        goto found_regulator;
-        }
-        mutex_unlock(&regulator_list_mutex);
-        return -ENODEV;
-
-found_regulator:
-        list_for_each_entry(supply_rdev, &regulator_list, list) {
-                if (!strcmp(supply_rdev->desc->name, supply))
-                        goto found_supply;
-        }
-        mutex_unlock(&regulator_list_mutex);
-        return -ENODEV;
-
-found_supply:
-        err = sysfs_create_link(&rdev->dev.kobj, &supply_rdev->dev.kobj,
-                                "supply");
-        if (err) {
-                printk(KERN_ERR
-                       "%s: could not add device link %s err %d\n",
-                       __func__, supply_rdev->dev.kobj.name, err);
-                       goto out;
-        }
-        rdev->supply = supply_rdev;
-        list_add(&rdev->slist, &supply_rdev->supply_list);
-out:
-        mutex_unlock(&regulator_list_mutex);
-        return err;
-}
-EXPORT_SYMBOL_GPL(regulator_set_supply);
-
-/**
- * regulator_get_supply - get regulator supply regulator
- * @regulator: regulator name
- *
- * Returns the supply supply regulator name or NULL if no supply regulator
- * exists (i.e the regulator is supplied directly from USB, Line, Battery, etc)
- */
-const char *regulator_get_supply(const char *regulator)
-{
-        struct regulator_dev *rdev;
-
-        if (regulator == NULL)
-                return NULL;
-
-        mutex_lock(&regulator_list_mutex);
-        list_for_each_entry(rdev, &regulator_list, list) {
-                if (!strcmp(rdev->desc->name, regulator))
-                        goto found;
-        }
-        mutex_unlock(&regulator_list_mutex);
-        return NULL;
-
-found:
-        mutex_unlock(&regulator_list_mutex);
-        if (rdev->supply)
-                return rdev->supply->desc->name;
-        else
-                return NULL;
-}
-EXPORT_SYMBOL_GPL(regulator_get_supply);
-
-/**
- * regulator_set_machine_constraints - sets regulator constraints
- * @regulator: regulator source
- *
- * Allows platform initialisation code to define and constrain
- * regulator circuits e.g. valid voltage/current ranges, etc.  NOTE:
- * Constraints *must* be set by platform code in order for some
- * regulator operations to proceed i.e. set_voltage, set_current_limit,
- * set_mode.
- */
-int regulator_set_machine_constraints(const char *regulator_name,
-        struct regulation_constraints *constraints)
-{
-        struct regulator_dev *rdev;
-        int ret = 0;
-
-        if (regulator_name == NULL)
-                return -EINVAL;
-
-        mutex_lock(&regulator_list_mutex);
-
-        list_for_each_entry(rdev, &regulator_list, list) {
-                if (!strcmp(regulator_name, rdev->desc->name))
-                        goto found;
-        }
-        ret = -ENODEV;
-        goto out;
-
-found:
-        mutex_lock(&rdev->mutex);
-        rdev->constraints = constraints;
-
-        /* do we need to apply the constraint voltage */
-        if (rdev->constraints->apply_uV &&
-                rdev->constraints->min_uV == rdev->constraints->max_uV &&
-                rdev->desc->ops->set_voltage) {
-                ret = rdev->desc->ops->set_voltage(rdev,
-                        rdev->constraints->min_uV, rdev->constraints->max_uV);
-                        if (ret < 0) {
-                                printk(KERN_ERR "%s: failed to apply %duV"
-                                        " constraint\n", __func__,
-                                        rdev->constraints->min_uV);
-                                rdev->constraints = NULL;
-                                goto out;
-                        }
-        }
-
-        /* are we enabled at boot time by firmware / bootloader */
-        if (rdev->constraints->boot_on)
-                rdev->use_count = 1;
-
-        /* do we need to setup our suspend state */
-        if (constraints->initial_state)
-                ret = suspend_prepare(rdev, constraints->initial_state);
-
-        print_constraints(rdev);
-        mutex_unlock(&rdev->mutex);
-
-out:
-        mutex_unlock(&regulator_list_mutex);
-        return ret;
-}
-EXPORT_SYMBOL_GPL(regulator_set_machine_constraints);
-
-
-/**
- * regulator_set_device_supply: Bind a regulator to a symbolic supply
- * @regulator: regulator source
- * @dev:       device the supply applies to
- * @supply:    symbolic name for supply
- *
- * Allows platform initialisation code to map physical regulator
- * sources to symbolic names for supplies for use by devices.  Devices
- * should use these symbolic names to request regulators, avoiding the
- * need to provide board-specific regulator names as platform data.
- */
-int regulator_set_device_supply(const char *regulator, struct device *dev,
-                                const char *supply)
-{
-        struct regulator_map *node;
-
-        if (regulator == NULL || supply == NULL)
-                return -EINVAL;
-
-        node = kmalloc(sizeof(struct regulator_map), GFP_KERNEL);
-        if (node == NULL)
-                return -ENOMEM;
-
-        node->regulator = regulator;
-        node->dev = dev;
-        node->supply = supply;
-
-        mutex_lock(&regulator_list_mutex);
-        list_add(&node->list, &regulator_map_list);
-        mutex_unlock(&regulator_list_mutex);
-        return 0;
-}
-EXPORT_SYMBOL_GPL(regulator_set_device_supply);
-
-/**
  * regulator_suspend_prepare: prepare regulators for system wide suspend
  * @state: system suspend state
  *
@@ -1893,6 +1927,18 @@ int rdev_get_id(struct regulator_dev *rdev)
 }
 EXPORT_SYMBOL_GPL(rdev_get_id);
 
+struct device *rdev_get_dev(struct regulator_dev *rdev)
+{
+        return &rdev->dev;
+}
+EXPORT_SYMBOL_GPL(rdev_get_dev);
+
+void *regulator_get_init_drvdata(struct regulator_init_data *reg_init_data)
+{
+        return reg_init_data->driver_data;
+}
+EXPORT_SYMBOL_GPL(regulator_get_init_drvdata);
+
 static int __init regulator_init(void)
 {
         printk(KERN_INFO "regulator: core version %s\n", REGULATOR_VERSION);
diff --git a/drivers/regulator/da903x.c b/drivers/regulator/da903x.c
new file mode 100644
index 000000000000..3688e339db87
--- /dev/null
+++ b/drivers/regulator/da903x.c
@@ -0,0 +1,513 @@
+/*
+ * Regulators driver for Dialog Semiconductor DA903x
+ *
+ * Copyright (C) 2006-2008 Marvell International Ltd.
+ * Copyright (C) 2008 Compulab Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/driver.h>
+#include <linux/regulator/machine.h>
+#include <linux/mfd/da903x.h>
+
+/* DA9030 Registers */
+#define DA9030_INVAL            (-1)
+#define DA9030_LDO1011          (0x10)
+#define DA9030_LDO15            (0x11)
+#define DA9030_LDO1416          (0x12)
+#define DA9030_LDO1819          (0x13)
+#define DA9030_LDO17            (0x14)
+#define DA9030_BUCK2DVM1        (0x15)
+#define DA9030_BUCK2DVM2        (0x16)
+#define DA9030_RCTL11           (0x17)
+#define DA9030_RCTL21           (0x18)
+#define DA9030_LDO1             (0x90)
+#define DA9030_LDO23            (0x91)
+#define DA9030_LDO45            (0x92)
+#define DA9030_LDO6             (0x93)
+#define DA9030_LDO78            (0x94)
+#define DA9030_LDO912           (0x95)
+#define DA9030_BUCK             (0x96)
+#define DA9030_RCTL12           (0x97)
+#define DA9030_RCTL22           (0x98)
+#define DA9030_LDO_UNLOCK       (0xa0)
+#define DA9030_LDO_UNLOCK_MASK  (0xe0)
+#define DA9034_OVER1            (0x10)
+
+/* DA9034 Registers */
+#define DA9034_INVAL            (-1)
+#define DA9034_OVER2            (0x11)
+#define DA9034_OVER3            (0x12)
+#define DA9034_LDO643           (0x13)
+#define DA9034_LDO987           (0x14)
+#define DA9034_LDO1110          (0x15)
+#define DA9034_LDO1312          (0x16)
+#define DA9034_LDO1514          (0x17)
+#define DA9034_VCC1             (0x20)
+#define DA9034_ADTV1            (0x23)
+#define DA9034_ADTV2            (0x24)
+#define DA9034_AVRC             (0x25)
+#define DA9034_CDTV1            (0x26)
+#define DA9034_CDTV2            (0x27)
+#define DA9034_CVRC             (0x28)
+#define DA9034_SDTV1            (0x29)
+#define DA9034_SDTV2            (0x2a)
+#define DA9034_SVRC             (0x2b)
+#define DA9034_MDTV1            (0x32)
+#define DA9034_MDTV2            (0x33)
+#define DA9034_MVRC             (0x34)
+
+struct da903x_regulator_info {
+        struct regulator_desc desc;
+
+        int     min_uV;
+        int     max_uV;
+        int     step_uV;
+        int     vol_reg;
+        int     vol_shift;
+        int     vol_nbits;
+        int     update_reg;
+        int     update_bit;
+        int     enable_reg;
+        int     enable_bit;
+};
+
+static inline int check_range(struct da903x_regulator_info *info,
+                                int min_uV, int max_uV)
+{
+        if (min_uV < info->min_uV || min_uV > info->max_uV)
+                return -EINVAL;
+
+        return 0;
+}
+
+/* DA9030/DA9034 common operations */
+static int da903x_set_ldo_voltage(struct regulator_dev *rdev,
+                                  int min_uV, int max_uV)
+{
+        struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
+        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        uint8_t val, mask;
+
+        if (check_range(info, min_uV, max_uV)) {
+                pr_err("invalid voltage range (%d, %d) uV", min_uV, max_uV);
+                return -EINVAL;
+        }
+
+        val = (min_uV - info->min_uV + info->step_uV - 1) / info->step_uV;
+        val <<= info->vol_shift;
+        mask = ((1 << info->vol_nbits) - 1)  << info->vol_shift;
+
+        return da903x_update(da9034_dev, info->vol_reg, val, mask);
+}
+
+static int da903x_get_voltage(struct regulator_dev *rdev)
+{
+        struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
+        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        uint8_t val, mask;
+        int ret;
+
+        ret = da903x_read(da9034_dev, info->vol_reg, &val);
+        if (ret)
+                return ret;
+
+        mask = ((1 << info->vol_nbits) - 1)  << info->vol_shift;
+        val = (val & mask) >> info->vol_shift;
+
+        return info->min_uV + info->step_uV * val;
+}
+
+static int da903x_enable(struct regulator_dev *rdev)
+{
+        struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
+        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+
+        return da903x_set_bits(da9034_dev, info->enable_reg,
+                                        1 << info->enable_bit);
+}
+
+static int da903x_disable(struct regulator_dev *rdev)
+{
+        struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
+        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+
+        return da903x_clr_bits(da9034_dev, info->enable_reg,
+                                        1 << info->enable_bit);
+}
+
+static int da903x_is_enabled(struct regulator_dev *rdev)
+{
+        struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
+        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        uint8_t reg_val;
+        int ret;
+
+        ret = da903x_read(da9034_dev, info->enable_reg, &reg_val);
+        if (ret)
+                return ret;
+
+        return reg_val & (1 << info->enable_bit);
+}
+
+/* DA9030 specific operations */
+static int da9030_set_ldo1_15_voltage(struct regulator_dev *rdev,
+                                       int min_uV, int max_uV)
+{
+        struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
+        struct device *da903x_dev = rdev_get_dev(rdev)->parent;
+        uint8_t val, mask;
+        int ret;
+
+        if (check_range(info, min_uV, max_uV)) {
+                pr_err("invalid voltage range (%d, %d) uV", min_uV, max_uV);
+                return -EINVAL;
+        }
+
+        val = (min_uV - info->min_uV + info->step_uV - 1) / info->step_uV;
+        val <<= info->vol_shift;
+        mask = ((1 << info->vol_nbits) - 1)  << info->vol_shift;
+        val |= DA9030_LDO_UNLOCK; /* have to set UNLOCK bits */
+        mask |= DA9030_LDO_UNLOCK_MASK;
+
+        /* write twice */
+        ret = da903x_update(da903x_dev, info->vol_reg, val, mask);
+        if (ret)
+                return ret;
+
+        return da903x_update(da903x_dev, info->vol_reg, val, mask);
+}
+
+static int da9030_set_ldo14_voltage(struct regulator_dev *rdev,
+                                  int min_uV, int max_uV)
+{
+        struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
+        struct device *da903x_dev = rdev_get_dev(rdev)->parent;
+        uint8_t val, mask;
+        int thresh;
+
+        if (check_range(info, min_uV, max_uV)) {
+                pr_err("invalid voltage range (%d, %d) uV", min_uV, max_uV);
+                return -EINVAL;
+        }
+
+        thresh = (info->max_uV + info->min_uV) / 2;
+        if (min_uV < thresh) {
+                val = (thresh - min_uV + info->step_uV - 1) / info->step_uV;
+                val |= 0x4;
+        } else {
+                val = (min_uV - thresh + info->step_uV - 1) / info->step_uV;
+        }
+
+        val <<= info->vol_shift;
+        mask = ((1 << info->vol_nbits) - 1)  << info->vol_shift;
+
+        return da903x_update(da903x_dev, info->vol_reg, val, mask);
+}
+
+static int da9030_get_ldo14_voltage(struct regulator_dev *rdev)
+{
+        struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
+        struct device *da903x_dev = rdev_get_dev(rdev)->parent;
+        uint8_t val, mask;
+        int ret;
+
+        ret = da903x_read(da903x_dev, info->vol_reg, &val);
+        if (ret)
+                return ret;
+
+        mask = ((1 << info->vol_nbits) - 1)  << info->vol_shift;
+        val = (val & mask) >> info->vol_shift;
+
+        if (val & 0x4)
+                return info->min_uV + info->step_uV * (3 - (val & ~0x4));
+        else
+                return (info->max_uV + info->min_uV) / 2 +
+                        info->step_uV * (val & ~0x4);
+}
+
+/* DA9034 specific operations */
+static int da9034_set_dvc_voltage(struct regulator_dev *rdev,
+                                  int min_uV, int max_uV)
+{
+        struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
+        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        uint8_t val, mask;
+        int ret;
+
+        if (check_range(info, min_uV, max_uV)) {
+                pr_err("invalid voltage range (%d, %d) uV", min_uV, max_uV);
+                return -EINVAL;
+        }
+
+        val = (min_uV - info->min_uV + info->step_uV - 1) / info->step_uV;
+        val <<= info->vol_shift;
+        mask = ((1 << info->vol_nbits) - 1)  << info->vol_shift;
+
+        ret = da903x_update(da9034_dev, info->vol_reg, val, mask);
+        if (ret)
+                return ret;
+
+        ret = da903x_set_bits(da9034_dev, info->update_reg,
+                                        1 << info->update_bit);
+        return ret;
+}
+
+static int da9034_set_ldo12_voltage(struct regulator_dev *rdev,
+                                    int min_uV, int max_uV)
+{
+        struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
+        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        uint8_t val, mask;
+
+        if (check_range(info, min_uV, max_uV)) {
+                pr_err("invalid voltage range (%d, %d) uV", min_uV, max_uV);
+                return -EINVAL;
+        }
+
+        val = (min_uV - info->min_uV + info->step_uV - 1) / info->step_uV;
+        val = (val > 7 || val < 20) ? 8 : val - 12;
+        val <<= info->vol_shift;
+        mask = ((1 << info->vol_nbits) - 1)  << info->vol_shift;
+
+        return da903x_update(da9034_dev, info->vol_reg, val, mask);
+}
+
+static int da9034_get_ldo12_voltage(struct regulator_dev *rdev)
+{
+        struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
+        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        uint8_t val, mask;
+        int ret;
+
+        ret = da903x_read(da9034_dev, info->vol_reg, &val);
+        if (ret)
+                return ret;
+
+        mask = ((1 << info->vol_nbits) - 1)  << info->vol_shift;
+        val = (val & mask) >> info->vol_shift;
+
+        if (val >= 8)
+                return 2700000 + info->step_uV * (val - 8);
+
+        return info->min_uV + info->step_uV * val;
+}
+
+static struct regulator_ops da903x_regulator_ldo_ops = {
+        .set_voltage    = da903x_set_ldo_voltage,
+        .get_voltage    = da903x_get_voltage,
+        .enable         = da903x_enable,
+        .disable        = da903x_disable,
+        .is_enabled     = da903x_is_enabled,
+};
+
+/* NOTE: this is dedicated for the insane DA9030 LDO14 */
+static struct regulator_ops da9030_regulator_ldo14_ops = {
+        .set_voltage    = da9030_set_ldo14_voltage,
+        .get_voltage    = da9030_get_ldo14_voltage,
+        .enable         = da903x_enable,
+        .disable        = da903x_disable,
+        .is_enabled     = da903x_is_enabled,
+};
+
+/* NOTE: this is dedicated for the DA9030 LDO1 and LDO15 that have locks  */
+static struct regulator_ops da9030_regulator_ldo1_15_ops = {
+        .set_voltage    = da9030_set_ldo1_15_voltage,
+        .get_voltage    = da903x_get_voltage,
+        .enable         = da903x_enable,
+        .disable        = da903x_disable,
+        .is_enabled     = da903x_is_enabled,
+};
+
+static struct regulator_ops da9034_regulator_dvc_ops = {
+        .set_voltage    = da9034_set_dvc_voltage,
+        .get_voltage    = da903x_get_voltage,
+        .enable         = da903x_enable,
+        .disable        = da903x_disable,
+        .is_enabled     = da903x_is_enabled,
+};
+
+/* NOTE: this is dedicated for the insane LDO12 */
+static struct regulator_ops da9034_regulator_ldo12_ops = {
+        .set_voltage    = da9034_set_ldo12_voltage,
+        .get_voltage    = da9034_get_ldo12_voltage,
+        .enable         = da903x_enable,
+        .disable        = da903x_disable,
+        .is_enabled     = da903x_is_enabled,
+};
+
+#define DA903x_LDO(_pmic, _id, min, max, step, vreg, shift, nbits, ereg, ebit)  \
+{                                                                       \
+        .desc   = {                                                     \
+                .name   = "LDO" #_id,                                   \
+                .ops    = &da903x_regulator_ldo_ops,                    \
+                .type   = REGULATOR_VOLTAGE,                            \
+                .id     = _pmic##_ID_LDO##_id,                          \
+                .owner  = THIS_MODULE,                                  \
+        },                                                              \
+        .min_uV         = (min) * 1000,                                 \
+        .max_uV         = (max) * 1000,                                 \
+        .step_uV        = (step) * 1000,                                \
+        .vol_reg        = _pmic##_##vreg,                               \
+        .vol_shift      = (shift),                                      \
+        .vol_nbits      = (nbits),                                      \
+        .enable_reg     = _pmic##_##ereg,                               \
+        .enable_bit     = (ebit),                                       \
+}
+
+#define DA9034_DVC(_id, min, max, step, vreg, nbits, ureg, ubit, ereg, ebit) \
+{                                                                       \
+        .desc   = {                                                     \
+                .name   = #_id,                                         \
+                .ops    = &da9034_regulator_dvc_ops,                    \
+                .type   = REGULATOR_VOLTAGE,                            \
+                .id     = DA9034_ID_##_id,                              \
+                .owner  = THIS_MODULE,                                  \
+        },                                                              \
+        .min_uV         = (min) * 1000,                                 \
+        .max_uV         = (max) * 1000,                                 \
+        .step_uV        = (step) * 1000,                                \
+        .vol_reg        = DA9034_##vreg,                                \
+        .vol_shift      = (0),                                          \
+        .vol_nbits      = (nbits),                                      \
+        .update_reg     = DA9034_##ureg,                                \
+        .update_bit     = (ubit),                                       \
+        .enable_reg     = DA9034_##ereg,                                \
+        .enable_bit     = (ebit),                                       \
+}
+
+#define DA9034_LDO(_id, min, max, step, vreg, shift, nbits, ereg, ebit) \
+        DA903x_LDO(DA9034, _id, min, max, step, vreg, shift, nbits, ereg, ebit)
+
+#define DA9030_LDO(_id, min, max, step, vreg, shift, nbits, ereg, ebit) \
+        DA903x_LDO(DA9030, _id, min, max, step, vreg, shift, nbits, ereg, ebit)
+
+static struct da903x_regulator_info da903x_regulator_info[] = {
+        /* DA9030 */
+        DA9030_LDO( 1, 1200, 3200, 100,    LDO1, 0, 5, RCTL12, 1),
+        DA9030_LDO( 2, 1800, 3200, 100,   LDO23, 0, 4, RCTL12, 2),
+        DA9030_LDO( 3, 1800, 3200, 100,   LDO23, 4, 4, RCTL12, 3),
+        DA9030_LDO( 4, 1800, 3200, 100,   LDO45, 0, 4, RCTL12, 4),
+        DA9030_LDO( 5, 1800, 3200, 100,   LDO45, 4, 4, RCTL12, 5),
+        DA9030_LDO( 6, 1800, 3200, 100,    LDO6, 0, 4, RCTL12, 6),
+        DA9030_LDO( 7, 1800, 3200, 100,   LDO78, 0, 4, RCTL12, 7),
+        DA9030_LDO( 8, 1800, 3200, 100,   LDO78, 4, 4, RCTL22, 0),
+        DA9030_LDO( 9, 1800, 3200, 100,  LDO912, 0, 4, RCTL22, 1),
+        DA9030_LDO(10, 1800, 3200, 100, LDO1011, 0, 4, RCTL22, 2),
+        DA9030_LDO(11, 1800, 3200, 100, LDO1011, 4, 4, RCTL22, 3),
+        DA9030_LDO(12, 1800, 3200, 100,  LDO912, 4, 4, RCTL22, 4),
+        DA9030_LDO(14, 2760, 2940,  30, LDO1416, 0, 3, RCTL11, 4),
+        DA9030_LDO(15, 1100, 2650,  50,   LDO15, 0, 5, RCTL11, 5),
+        DA9030_LDO(16, 1100, 2650,  50, LDO1416, 3, 5, RCTL11, 6),
+        DA9030_LDO(17, 1800, 3200, 100,   LDO17, 0, 4, RCTL11, 7),
+        DA9030_LDO(18, 1800, 3200, 100, LDO1819, 0, 4, RCTL21, 2),
+        DA9030_LDO(19, 1800, 3200, 100, LDO1819, 4, 4, RCTL21, 1),
+        DA9030_LDO(13, 2100, 2100, 0, INVAL, 0, 0, RCTL11, 3), /* fixed @2.1V */
+
+        /* DA9034 */
+        DA9034_DVC(BUCK1, 725, 1500, 25, ADTV1, 5, VCC1, 0, OVER1, 0),
+        DA9034_DVC(BUCK2, 725, 1500, 25, CDTV1, 5, VCC1, 2, OVER1, 1),
+        DA9034_DVC(LDO2,  725, 1500, 25, SDTV1, 5, VCC1, 4, OVER1, 2),
+        DA9034_DVC(LDO1, 1700, 2075, 25, MDTV1, 4, VCC1, 6, OVER3, 4),
+
+        DA9034_LDO( 3, 1800, 3300, 100,  LDO643, 0, 4, OVER3, 5),
+        DA9034_LDO( 4, 1800, 2900,1100,  LDO643, 4, 1, OVER3, 6),
+        DA9034_LDO( 6, 2500, 2850,  50,  LDO643, 5, 3, OVER2, 0),
+        DA9034_LDO( 7, 2700, 3050,  50,  LDO987, 0, 3, OVER2, 1),
+        DA9034_LDO( 8, 2700, 2850,  50,  LDO987, 3, 2, OVER2, 2),
+        DA9034_LDO( 9, 2700, 3050,  50,  LDO987, 5, 3, OVER2, 3),
+        DA9034_LDO(10, 2700, 3050,  50, LDO1110, 0, 3, OVER2, 4),
+        DA9034_LDO(11, 1800, 3300, 100, LDO1110, 4, 4, OVER2, 5),
+        DA9034_LDO(12, 1700, 3050,  50, LDO1312, 0, 4, OVER3, 6),
+        DA9034_LDO(13, 1800, 3300, 100, LDO1312, 4, 4, OVER2, 7),
+        DA9034_LDO(14, 1800, 3300, 100, LDO1514, 0, 4, OVER3, 0),
+        DA9034_LDO(15, 1800, 3300, 100, LDO1514, 4, 4, OVER3, 1),
+        DA9034_LDO(5, 3100, 3100, 0, INVAL, 0, 0, OVER3, 7), /* fixed @3.1V */
+};
+
+static inline struct da903x_regulator_info *find_regulator_info(int id)
+{
+        struct da903x_regulator_info *ri;
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(da903x_regulator_info); i++) {
+                ri = &da903x_regulator_info[i];
+                if (ri->desc.id == id)
+                        return ri;
+        }
+        return NULL;
+}
+
+static int __devinit da903x_regulator_probe(struct platform_device *pdev)
+{
+        struct da903x_regulator_info *ri = NULL;
+        struct regulator_dev *rdev;
+
+        ri = find_regulator_info(pdev->id);
+        if (ri == NULL) {
+                dev_err(&pdev->dev, "invalid regulator ID specified\n");
+                return -EINVAL;
+        }
+
+        /* Workaround for the weird LDO12 voltage setting */
+        if (ri->desc.id == DA9034_ID_LDO12)
+                ri->desc.ops = &da9034_regulator_ldo12_ops;
+
+        if (ri->desc.id == DA9030_ID_LDO14)
+                ri->desc.ops = &da9030_regulator_ldo14_ops;
+
+        if (ri->desc.id == DA9030_ID_LDO1 || ri->desc.id == DA9030_ID_LDO15)
+                ri->desc.ops = &da9030_regulator_ldo1_15_ops;
+
+        rdev = regulator_register(&ri->desc, pdev->dev.parent, ri);
+        if (IS_ERR(rdev)) {
+                dev_err(&pdev->dev, "failed to register regulator %s\n",
+                                ri->desc.name);
+                return PTR_ERR(rdev);
+        }
+
+        platform_set_drvdata(pdev, rdev);
+        return 0;
+}
+
+static int __devexit da903x_regulator_remove(struct platform_device *pdev)
+{
+        struct regulator_dev *rdev = platform_get_drvdata(pdev);
+
+        regulator_unregister(rdev);
+        return 0;
+}
+
+static struct platform_driver da903x_regulator_driver = {
+        .driver = {
+                .name   = "da903x-regulator",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = da903x_regulator_probe,
+        .remove         = da903x_regulator_remove,
+};
+
+static int __init da903x_regulator_init(void)
+{
+        return platform_driver_register(&da903x_regulator_driver);
+}
+module_init(da903x_regulator_init);
+
+static void __exit da903x_regulator_exit(void)
+{
+        platform_driver_unregister(&da903x_regulator_driver);
+}
+module_exit(da903x_regulator_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Eric Miao <eric.miao@marvell.com>"
+              "Mike Rapoport <mike@compulab.co.il>");
+MODULE_DESCRIPTION("Regulator Driver for Dialog Semiconductor DA903X PMIC");
+MODULE_ALIAS("platform:da903x-regulator");
diff --git a/drivers/regulator/wm8350-regulator.c b/drivers/regulator/wm8350-regulator.c
new file mode 100644
index 000000000000..1f44b17e23b1
--- /dev/null
+++ b/drivers/regulator/wm8350-regulator.c
@@ -0,0 +1,1431 @@
+/*
+ * wm8350.c  --  Voltage and current regulation for the Wolfson WM8350 PMIC
+ *
+ * Copyright 2007, 2008 Wolfson Microelectronics PLC.
+ *
+ * Author: Liam Girdwood
+ *         linux@wolfsonmicro.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.
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/init.h>
+#include <linux/bitops.h>
+#include <linux/err.h>
+#include <linux/i2c.h>
+#include <linux/mfd/wm8350/core.h>
+#include <linux/mfd/wm8350/pmic.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/driver.h>
+#include <linux/regulator/machine.h>
+
+/* Microamps */
+static const int isink_cur[] = {
+        4,
+        5,
+        6,
+        7,
+        8,
+        10,
+        11,
+        14,
+        16,
+        19,
+        23,
+        27,
+        32,
+        39,
+        46,
+        54,
+        65,
+        77,
+        92,
+        109,
+        130,
+        154,
+        183,
+        218,
+        259,
+        308,
+        367,
+        436,
+        518,
+        616,
+        733,
+        872,
+        1037,
+        1233,
+        1466,
+        1744,
+        2073,
+        2466,
+        2933,
+        3487,
+        4147,
+        4932,
+        5865,
+        6975,
+        8294,
+        9864,
+        11730,
+        13949,
+        16589,
+        19728,
+        23460,
+        27899,
+        33178,
+        39455,
+        46920,
+        55798,
+        66355,
+        78910,
+        93840,
+        111596,
+        132710,
+        157820,
+        187681,
+        223191
+};
+
+static int get_isink_val(int min_uA, int max_uA, u16 *setting)
+{
+        int i;
+
+        for (i = ARRAY_SIZE(isink_cur) - 1; i >= 0; i--) {
+                if (min_uA <= isink_cur[i] && max_uA >= isink_cur[i]) {
+                        *setting = i;
+                        return 0;
+                }
+        }
+        return -EINVAL;
+}
+
+static inline int wm8350_ldo_val_to_mvolts(unsigned int val)
+{
+        if (val < 16)
+                return (val * 50) + 900;
+        else
+                return ((val - 16) * 100) + 1800;
+
+}
+
+static inline unsigned int wm8350_ldo_mvolts_to_val(int mV)
+{
+        if (mV < 1800)
+                return (mV - 900) / 50;
+        else
+                return ((mV - 1800) / 100) + 16;
+}
+
+static inline int wm8350_dcdc_val_to_mvolts(unsigned int val)
+{
+        return (val * 25) + 850;
+}
+
+static inline unsigned int wm8350_dcdc_mvolts_to_val(int mV)
+{
+        return (mV - 850) / 25;
+}
+
+static int wm8350_isink_set_current(struct regulator_dev *rdev, int min_uA,
+        int max_uA)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int isink = rdev_get_id(rdev);
+        u16 val, setting;
+        int ret;
+
+        ret = get_isink_val(min_uA, max_uA, &setting);
+        if (ret != 0)
+                return ret;
+
+        switch (isink) {
+        case WM8350_ISINK_A:
+                val = wm8350_reg_read(wm8350, WM8350_CURRENT_SINK_DRIVER_A) &
+                    ~WM8350_CS1_ISEL_MASK;
+                wm8350_reg_write(wm8350, WM8350_CURRENT_SINK_DRIVER_A,
+                                 val | setting);
+                break;
+        case WM8350_ISINK_B:
+                val = wm8350_reg_read(wm8350, WM8350_CURRENT_SINK_DRIVER_B) &
+                    ~WM8350_CS1_ISEL_MASK;
+                wm8350_reg_write(wm8350, WM8350_CURRENT_SINK_DRIVER_B,
+                                 val | setting);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int wm8350_isink_get_current(struct regulator_dev *rdev)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int isink = rdev_get_id(rdev);
+        u16 val;
+
+        switch (isink) {
+        case WM8350_ISINK_A:
+                val = wm8350_reg_read(wm8350, WM8350_CURRENT_SINK_DRIVER_A) &
+                    WM8350_CS1_ISEL_MASK;
+                break;
+        case WM8350_ISINK_B:
+                val = wm8350_reg_read(wm8350, WM8350_CURRENT_SINK_DRIVER_B) &
+                    WM8350_CS1_ISEL_MASK;
+                break;
+        default:
+                return 0;
+        }
+
+        return (isink_cur[val] + 50) / 100;
+}
+
+/* turn on ISINK followed by DCDC */
+static int wm8350_isink_enable(struct regulator_dev *rdev)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int isink = rdev_get_id(rdev);
+
+        switch (isink) {
+        case WM8350_ISINK_A:
+                switch (wm8350->pmic.isink_A_dcdc) {
+                case WM8350_DCDC_2:
+                case WM8350_DCDC_5:
+                        wm8350_set_bits(wm8350, WM8350_POWER_MGMT_7,
+                                        WM8350_CS1_ENA);
+                        wm8350_set_bits(wm8350, WM8350_CSA_FLASH_CONTROL,
+                                        WM8350_CS1_DRIVE);
+                        wm8350_set_bits(wm8350, WM8350_DCDC_LDO_REQUESTED,
+                                        1 << (wm8350->pmic.isink_A_dcdc -
+                                              WM8350_DCDC_1));
+                        break;
+                default:
+                        return -EINVAL;
+                }
+                break;
+        case WM8350_ISINK_B:
+                switch (wm8350->pmic.isink_B_dcdc) {
+                case WM8350_DCDC_2:
+                case WM8350_DCDC_5:
+                        wm8350_set_bits(wm8350, WM8350_POWER_MGMT_7,
+                                        WM8350_CS2_ENA);
+                        wm8350_set_bits(wm8350, WM8350_CSB_FLASH_CONTROL,
+                                        WM8350_CS2_DRIVE);
+                        wm8350_set_bits(wm8350, WM8350_DCDC_LDO_REQUESTED,
+                                        1 << (wm8350->pmic.isink_B_dcdc -
+                                              WM8350_DCDC_1));
+                        break;
+                default:
+                        return -EINVAL;
+                }
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+
+static int wm8350_isink_disable(struct regulator_dev *rdev)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int isink = rdev_get_id(rdev);
+
+        switch (isink) {
+        case WM8350_ISINK_A:
+                switch (wm8350->pmic.isink_A_dcdc) {
+                case WM8350_DCDC_2:
+                case WM8350_DCDC_5:
+                        wm8350_clear_bits(wm8350, WM8350_DCDC_LDO_REQUESTED,
+                                          1 << (wm8350->pmic.isink_A_dcdc -
+                                                WM8350_DCDC_1));
+                        wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_7,
+                                          WM8350_CS1_ENA);
+                        break;
+                default:
+                        return -EINVAL;
+                }
+                break;
+        case WM8350_ISINK_B:
+                switch (wm8350->pmic.isink_B_dcdc) {
+                case WM8350_DCDC_2:
+                case WM8350_DCDC_5:
+                        wm8350_clear_bits(wm8350, WM8350_DCDC_LDO_REQUESTED,
+                                          1 << (wm8350->pmic.isink_B_dcdc -
+                                                WM8350_DCDC_1));
+                        wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_7,
+                                          WM8350_CS2_ENA);
+                        break;
+                default:
+                        return -EINVAL;
+                }
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+
+static int wm8350_isink_is_enabled(struct regulator_dev *rdev)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int isink = rdev_get_id(rdev);
+
+        switch (isink) {
+        case WM8350_ISINK_A:
+                return wm8350_reg_read(wm8350, WM8350_CURRENT_SINK_DRIVER_A) &
+                    0x8000;
+        case WM8350_ISINK_B:
+                return wm8350_reg_read(wm8350, WM8350_CURRENT_SINK_DRIVER_B) &
+                    0x8000;
+        }
+        return -EINVAL;
+}
+
+int wm8350_isink_set_flash(struct wm8350 *wm8350, int isink, u16 mode,
+                           u16 trigger, u16 duration, u16 on_ramp, u16 off_ramp,
+                           u16 drive)
+{
+        switch (isink) {
+        case WM8350_ISINK_A:
+                wm8350_reg_write(wm8350, WM8350_CSA_FLASH_CONTROL,
+                                 (mode ? WM8350_CS1_FLASH_MODE : 0) |
+                                 (trigger ? WM8350_CS1_TRIGSRC : 0) |
+                                 duration | on_ramp | off_ramp | drive);
+                break;
+        case WM8350_ISINK_B:
+                wm8350_reg_write(wm8350, WM8350_CSB_FLASH_CONTROL,
+                                 (mode ? WM8350_CS2_FLASH_MODE : 0) |
+                                 (trigger ? WM8350_CS2_TRIGSRC : 0) |
+                                 duration | on_ramp | off_ramp | drive);
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+EXPORT_SYMBOL_GPL(wm8350_isink_set_flash);
+
+static int wm8350_dcdc_set_voltage(struct regulator_dev *rdev, int min_uV,
+        int max_uV)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int volt_reg, dcdc = rdev_get_id(rdev), mV,
+                min_mV = min_uV / 1000, max_mV = max_uV / 1000;
+        u16 val;
+
+        if (min_mV < 850 || min_mV > 4025)
+                return -EINVAL;
+        if (max_mV < 850 || max_mV > 4025)
+                return -EINVAL;
+
+        /* step size is 25mV */
+        mV = (min_mV - 826) / 25;
+        if (wm8350_dcdc_val_to_mvolts(mV) > max_mV)
+                return -EINVAL;
+        BUG_ON(wm8350_dcdc_val_to_mvolts(mV) < min_mV);
+
+        switch (dcdc) {
+        case WM8350_DCDC_1:
+                volt_reg = WM8350_DCDC1_CONTROL;
+                break;
+        case WM8350_DCDC_3:
+                volt_reg = WM8350_DCDC3_CONTROL;
+                break;
+        case WM8350_DCDC_4:
+                volt_reg = WM8350_DCDC4_CONTROL;
+                break;
+        case WM8350_DCDC_6:
+                volt_reg = WM8350_DCDC6_CONTROL;
+                break;
+        case WM8350_DCDC_2:
+        case WM8350_DCDC_5:
+        default:
+                return -EINVAL;
+        }
+
+        /* all DCDCs have same mV bits */
+        val = wm8350_reg_read(wm8350, volt_reg) & ~WM8350_DC1_VSEL_MASK;
+        wm8350_reg_write(wm8350, volt_reg, val | mV);
+        return 0;
+}
+
+static int wm8350_dcdc_get_voltage(struct regulator_dev *rdev)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int volt_reg, dcdc = rdev_get_id(rdev);
+        u16 val;
+
+        switch (dcdc) {
+        case WM8350_DCDC_1:
+                volt_reg = WM8350_DCDC1_CONTROL;
+                break;
+        case WM8350_DCDC_3:
+                volt_reg = WM8350_DCDC3_CONTROL;
+                break;
+        case WM8350_DCDC_4:
+                volt_reg = WM8350_DCDC4_CONTROL;
+                break;
+        case WM8350_DCDC_6:
+                volt_reg = WM8350_DCDC6_CONTROL;
+                break;
+        case WM8350_DCDC_2:
+        case WM8350_DCDC_5:
+        default:
+                return -EINVAL;
+        }
+
+        /* all DCDCs have same mV bits */
+        val = wm8350_reg_read(wm8350, volt_reg) & WM8350_DC1_VSEL_MASK;
+        return wm8350_dcdc_val_to_mvolts(val) * 1000;
+}
+
+static int wm8350_dcdc_set_suspend_voltage(struct regulator_dev *rdev, int uV)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int volt_reg, mV = uV / 1000, dcdc = rdev_get_id(rdev);
+        u16 val;
+
+        dev_dbg(wm8350->dev, "%s %d mV %d\n", __func__, dcdc, mV);
+
+        if (mV && (mV < 850 || mV > 4025)) {
+                dev_err(wm8350->dev,
+                        "DCDC%d suspend voltage %d mV out of range\n",
+                        dcdc, mV);
+                return -EINVAL;
+        }
+        if (mV == 0)
+                mV = 850;
+
+        switch (dcdc) {
+        case WM8350_DCDC_1:
+                volt_reg = WM8350_DCDC1_LOW_POWER;
+                break;
+        case WM8350_DCDC_3:
+                volt_reg = WM8350_DCDC3_LOW_POWER;
+                break;
+        case WM8350_DCDC_4:
+                volt_reg = WM8350_DCDC4_LOW_POWER;
+                break;
+        case WM8350_DCDC_6:
+                volt_reg = WM8350_DCDC6_LOW_POWER;
+                break;
+        case WM8350_DCDC_2:
+        case WM8350_DCDC_5:
+        default:
+                return -EINVAL;
+        }
+
+        /* all DCDCs have same mV bits */
+        val = wm8350_reg_read(wm8350, volt_reg) & ~WM8350_DC1_VSEL_MASK;
+        wm8350_reg_write(wm8350, volt_reg,
+                         val | wm8350_dcdc_mvolts_to_val(mV));
+        return 0;
+}
+
+static int wm8350_dcdc_set_suspend_enable(struct regulator_dev *rdev)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int dcdc = rdev_get_id(rdev);
+        u16 val;
+
+        switch (dcdc) {
+        case WM8350_DCDC_1:
+                val = wm8350_reg_read(wm8350, WM8350_DCDC1_LOW_POWER)
+                        & ~WM8350_DCDC_HIB_MODE_MASK;
+                wm8350_reg_write(wm8350, WM8350_DCDC1_LOW_POWER,
+                        wm8350->pmic.dcdc1_hib_mode);
+                break;
+        case WM8350_DCDC_3:
+                val = wm8350_reg_read(wm8350, WM8350_DCDC3_LOW_POWER)
+                        & ~WM8350_DCDC_HIB_MODE_MASK;
+                wm8350_reg_write(wm8350, WM8350_DCDC3_LOW_POWER,
+                        wm8350->pmic.dcdc3_hib_mode);
+                break;
+        case WM8350_DCDC_4:
+                val = wm8350_reg_read(wm8350, WM8350_DCDC4_LOW_POWER)
+                        & ~WM8350_DCDC_HIB_MODE_MASK;
+                wm8350_reg_write(wm8350, WM8350_DCDC4_LOW_POWER,
+                        wm8350->pmic.dcdc4_hib_mode);
+                break;
+        case WM8350_DCDC_6:
+                val = wm8350_reg_read(wm8350, WM8350_DCDC6_LOW_POWER)
+                        & ~WM8350_DCDC_HIB_MODE_MASK;
+                wm8350_reg_write(wm8350, WM8350_DCDC6_LOW_POWER,
+                        wm8350->pmic.dcdc6_hib_mode);
+                break;
+        case WM8350_DCDC_2:
+        case WM8350_DCDC_5:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int wm8350_dcdc_set_suspend_disable(struct regulator_dev *rdev)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int dcdc = rdev_get_id(rdev);
+        u16 val;
+
+        switch (dcdc) {
+        case WM8350_DCDC_1:
+                val = wm8350_reg_read(wm8350, WM8350_DCDC1_LOW_POWER);
+                wm8350->pmic.dcdc1_hib_mode = val & WM8350_DCDC_HIB_MODE_MASK;
+                wm8350_reg_write(wm8350, WM8350_DCDC1_LOW_POWER,
+                        WM8350_DCDC_HIB_MODE_DIS);
+                break;
+        case WM8350_DCDC_3:
+                val = wm8350_reg_read(wm8350, WM8350_DCDC3_LOW_POWER);
+                wm8350->pmic.dcdc3_hib_mode = val & WM8350_DCDC_HIB_MODE_MASK;
+                wm8350_reg_write(wm8350, WM8350_DCDC3_LOW_POWER,
+                        WM8350_DCDC_HIB_MODE_DIS);
+                break;
+        case WM8350_DCDC_4:
+                val = wm8350_reg_read(wm8350, WM8350_DCDC4_LOW_POWER);
+                wm8350->pmic.dcdc4_hib_mode = val & WM8350_DCDC_HIB_MODE_MASK;
+                wm8350_reg_write(wm8350, WM8350_DCDC4_LOW_POWER,
+                        WM8350_DCDC_HIB_MODE_DIS);
+                break;
+        case WM8350_DCDC_6:
+                val = wm8350_reg_read(wm8350, WM8350_DCDC6_LOW_POWER);
+                wm8350->pmic.dcdc6_hib_mode = val & WM8350_DCDC_HIB_MODE_MASK;
+                wm8350_reg_write(wm8350, WM8350_DCDC6_LOW_POWER,
+                        WM8350_DCDC_HIB_MODE_DIS);
+                break;
+        case WM8350_DCDC_2:
+        case WM8350_DCDC_5:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int wm8350_dcdc25_set_suspend_enable(struct regulator_dev *rdev)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int dcdc = rdev_get_id(rdev);
+        u16 val;
+
+        switch (dcdc) {
+        case WM8350_DCDC_2:
+                val = wm8350_reg_read(wm8350, WM8350_DCDC2_CONTROL)
+                    & ~WM8350_DC2_HIB_MODE_MASK;
+                wm8350_reg_write(wm8350, WM8350_DCDC2_CONTROL, val |
+                                 WM8350_DC2_HIB_MODE_ACTIVE);
+                break;
+        case WM8350_DCDC_5:
+                val = wm8350_reg_read(wm8350, WM8350_DCDC5_CONTROL)
+                    & ~WM8350_DC2_HIB_MODE_MASK;
+                wm8350_reg_write(wm8350, WM8350_DCDC5_CONTROL, val |
+                                 WM8350_DC5_HIB_MODE_ACTIVE);
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+
+static int wm8350_dcdc25_set_suspend_disable(struct regulator_dev *rdev)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int dcdc = rdev_get_id(rdev);
+        u16 val;
+
+        switch (dcdc) {
+        case WM8350_DCDC_2:
+                val = wm8350_reg_read(wm8350, WM8350_DCDC2_CONTROL)
+                    & ~WM8350_DC2_HIB_MODE_MASK;
+                wm8350_reg_write(wm8350, WM8350_DCDC2_CONTROL, val |
+                                 WM8350_DC2_HIB_MODE_DISABLE);
+                break;
+        case WM8350_DCDC_5:
+                val = wm8350_reg_read(wm8350, WM8350_DCDC5_CONTROL)
+                    & ~WM8350_DC2_HIB_MODE_MASK;
+                wm8350_reg_write(wm8350, WM8350_DCDC5_CONTROL, val |
+                                 WM8350_DC2_HIB_MODE_DISABLE);
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+
+static int wm8350_dcdc_set_suspend_mode(struct regulator_dev *rdev,
+        unsigned int mode)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int dcdc = rdev_get_id(rdev);
+        u16 *hib_mode;
+
+        switch (dcdc) {
+        case WM8350_DCDC_1:
+                hib_mode = &wm8350->pmic.dcdc1_hib_mode;
+                break;
+        case WM8350_DCDC_3:
+                hib_mode = &wm8350->pmic.dcdc3_hib_mode;
+                break;
+        case WM8350_DCDC_4:
+                hib_mode = &wm8350->pmic.dcdc4_hib_mode;
+                break;
+        case WM8350_DCDC_6:
+                hib_mode = &wm8350->pmic.dcdc6_hib_mode;
+                break;
+        case WM8350_DCDC_2:
+        case WM8350_DCDC_5:
+        default:
+                return -EINVAL;
+        }
+
+        switch (mode) {
+        case REGULATOR_MODE_NORMAL:
+                *hib_mode = WM8350_DCDC_HIB_MODE_IMAGE;
+                break;
+        case REGULATOR_MODE_IDLE:
+                *hib_mode = WM8350_DCDC_HIB_MODE_STANDBY;
+                break;
+        case REGULATOR_MODE_STANDBY:
+                *hib_mode = WM8350_DCDC_HIB_MODE_LDO_IM;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int wm8350_ldo_set_suspend_voltage(struct regulator_dev *rdev, int uV)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int volt_reg, mV = uV / 1000, ldo = rdev_get_id(rdev);
+        u16 val;
+
+        dev_dbg(wm8350->dev, "%s %d mV %d\n", __func__, ldo, mV);
+
+        if (mV < 900 || mV > 3300) {
+                dev_err(wm8350->dev, "LDO%d voltage %d mV out of range\n",
+                        ldo, mV);
+                return -EINVAL;
+        }
+
+        switch (ldo) {
+        case WM8350_LDO_1:
+                volt_reg = WM8350_LDO1_LOW_POWER;
+                break;
+        case WM8350_LDO_2:
+                volt_reg = WM8350_LDO2_LOW_POWER;
+                break;
+        case WM8350_LDO_3:
+                volt_reg = WM8350_LDO3_LOW_POWER;
+                break;
+        case WM8350_LDO_4:
+                volt_reg = WM8350_LDO4_LOW_POWER;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        /* all LDOs have same mV bits */
+        val = wm8350_reg_read(wm8350, volt_reg) & ~WM8350_LDO1_VSEL_MASK;
+        wm8350_reg_write(wm8350, volt_reg,
+                         val | wm8350_ldo_mvolts_to_val(mV));
+        return 0;
+}
+
+static int wm8350_ldo_set_suspend_enable(struct regulator_dev *rdev)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int volt_reg, ldo = rdev_get_id(rdev);
+        u16 val;
+
+        switch (ldo) {
+        case WM8350_LDO_1:
+                volt_reg = WM8350_LDO1_LOW_POWER;
+                break;
+        case WM8350_LDO_2:
+                volt_reg = WM8350_LDO2_LOW_POWER;
+                break;
+        case WM8350_LDO_3:
+                volt_reg = WM8350_LDO3_LOW_POWER;
+                break;
+        case WM8350_LDO_4:
+                volt_reg = WM8350_LDO4_LOW_POWER;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        /* all LDOs have same mV bits */
+        val = wm8350_reg_read(wm8350, volt_reg) & ~WM8350_LDO1_HIB_MODE_MASK;
+        wm8350_reg_write(wm8350, volt_reg, val);
+        return 0;
+}
+
+static int wm8350_ldo_set_suspend_disable(struct regulator_dev *rdev)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int volt_reg, ldo = rdev_get_id(rdev);
+        u16 val;
+
+        switch (ldo) {
+        case WM8350_LDO_1:
+                volt_reg = WM8350_LDO1_LOW_POWER;
+                break;
+        case WM8350_LDO_2:
+                volt_reg = WM8350_LDO2_LOW_POWER;
+                break;
+        case WM8350_LDO_3:
+                volt_reg = WM8350_LDO3_LOW_POWER;
+                break;
+        case WM8350_LDO_4:
+                volt_reg = WM8350_LDO4_LOW_POWER;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        /* all LDOs have same mV bits */
+        val = wm8350_reg_read(wm8350, volt_reg) & ~WM8350_LDO1_HIB_MODE_MASK;
+        wm8350_reg_write(wm8350, volt_reg, WM8350_LDO1_HIB_MODE_DIS);
+        return 0;
+}
+
+static int wm8350_ldo_set_voltage(struct regulator_dev *rdev, int min_uV,
+        int max_uV)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int volt_reg, ldo = rdev_get_id(rdev), mV, min_mV = min_uV / 1000,
+                max_mV = max_uV / 1000;
+        u16 val;
+
+        if (min_mV < 900 || min_mV > 3300)
+                return -EINVAL;
+        if (max_mV < 900 || max_mV > 3300)
+                return -EINVAL;
+
+        if (min_mV < 1800) {
+                /* step size is 50mV < 1800mV */
+                mV = (min_mV - 851) / 50;
+                if (wm8350_ldo_val_to_mvolts(mV) > max_mV)
+                        return -EINVAL;
+                BUG_ON(wm8350_ldo_val_to_mvolts(mV) < min_mV);
+        } else {
+                /* step size is 100mV > 1800mV */
+                mV = ((min_mV - 1701) / 100) + 16;
+                if (wm8350_ldo_val_to_mvolts(mV) > max_mV)
+                        return -EINVAL;
+                BUG_ON(wm8350_ldo_val_to_mvolts(mV) < min_mV);
+        }
+
+        switch (ldo) {
+        case WM8350_LDO_1:
+                volt_reg = WM8350_LDO1_CONTROL;
+                break;
+        case WM8350_LDO_2:
+                volt_reg = WM8350_LDO2_CONTROL;
+                break;
+        case WM8350_LDO_3:
+                volt_reg = WM8350_LDO3_CONTROL;
+                break;
+        case WM8350_LDO_4:
+                volt_reg = WM8350_LDO4_CONTROL;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        /* all LDOs have same mV bits */
+        val = wm8350_reg_read(wm8350, volt_reg) & ~WM8350_LDO1_VSEL_MASK;
+        wm8350_reg_write(wm8350, volt_reg, val | mV);
+        return 0;
+}
+
+static int wm8350_ldo_get_voltage(struct regulator_dev *rdev)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int volt_reg, ldo = rdev_get_id(rdev);
+        u16 val;
+
+        switch (ldo) {
+        case WM8350_LDO_1:
+                volt_reg = WM8350_LDO1_CONTROL;
+                break;
+        case WM8350_LDO_2:
+                volt_reg = WM8350_LDO2_CONTROL;
+                break;
+        case WM8350_LDO_3:
+                volt_reg = WM8350_LDO3_CONTROL;
+                break;
+        case WM8350_LDO_4:
+                volt_reg = WM8350_LDO4_CONTROL;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        /* all LDOs have same mV bits */
+        val = wm8350_reg_read(wm8350, volt_reg) & WM8350_LDO1_VSEL_MASK;
+        return wm8350_ldo_val_to_mvolts(val) * 1000;
+}
+
+int wm8350_dcdc_set_slot(struct wm8350 *wm8350, int dcdc, u16 start,
+                         u16 stop, u16 fault)
+{
+        int slot_reg;
+        u16 val;
+
+        dev_dbg(wm8350->dev, "%s %d start %d stop %d\n",
+                __func__, dcdc, start, stop);
+
+        /* slot valid ? */
+        if (start > 15 || stop > 15)
+                return -EINVAL;
+
+        switch (dcdc) {
+        case WM8350_DCDC_1:
+                slot_reg = WM8350_DCDC1_TIMEOUTS;
+                break;
+        case WM8350_DCDC_2:
+                slot_reg = WM8350_DCDC2_TIMEOUTS;
+                break;
+        case WM8350_DCDC_3:
+                slot_reg = WM8350_DCDC3_TIMEOUTS;
+                break;
+        case WM8350_DCDC_4:
+                slot_reg = WM8350_DCDC4_TIMEOUTS;
+                break;
+        case WM8350_DCDC_5:
+                slot_reg = WM8350_DCDC5_TIMEOUTS;
+                break;
+        case WM8350_DCDC_6:
+                slot_reg = WM8350_DCDC6_TIMEOUTS;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        val = wm8350_reg_read(wm8350, slot_reg) &
+            ~(WM8350_DC1_ENSLOT_MASK | WM8350_DC1_SDSLOT_MASK |
+              WM8350_DC1_ERRACT_MASK);
+        wm8350_reg_write(wm8350, slot_reg,
+                         val | (start << WM8350_DC1_ENSLOT_SHIFT) |
+                         (stop << WM8350_DC1_SDSLOT_SHIFT) |
+                         (fault << WM8350_DC1_ERRACT_SHIFT));
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(wm8350_dcdc_set_slot);
+
+int wm8350_ldo_set_slot(struct wm8350 *wm8350, int ldo, u16 start, u16 stop)
+{
+        int slot_reg;
+        u16 val;
+
+        dev_dbg(wm8350->dev, "%s %d start %d stop %d\n",
+                __func__, ldo, start, stop);
+
+        /* slot valid ? */
+        if (start > 15 || stop > 15)
+                return -EINVAL;
+
+        switch (ldo) {
+        case WM8350_LDO_1:
+                slot_reg = WM8350_LDO1_TIMEOUTS;
+                break;
+        case WM8350_LDO_2:
+                slot_reg = WM8350_LDO2_TIMEOUTS;
+                break;
+        case WM8350_LDO_3:
+                slot_reg = WM8350_LDO3_TIMEOUTS;
+                break;
+        case WM8350_LDO_4:
+                slot_reg = WM8350_LDO4_TIMEOUTS;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        val = wm8350_reg_read(wm8350, slot_reg) & ~WM8350_LDO1_SDSLOT_MASK;
+        wm8350_reg_write(wm8350, slot_reg, val | ((start << 10) | (stop << 6)));
+        return 0;
+}
+EXPORT_SYMBOL_GPL(wm8350_ldo_set_slot);
+
+int wm8350_dcdc25_set_mode(struct wm8350 *wm8350, int dcdc, u16 mode,
+                           u16 ilim, u16 ramp, u16 feedback)
+{
+        u16 val;
+
+        dev_dbg(wm8350->dev, "%s %d mode: %s %s\n", __func__, dcdc,
+                mode ? "normal" : "boost", ilim ? "low" : "normal");
+
+        switch (dcdc) {
+        case WM8350_DCDC_2:
+                val = wm8350_reg_read(wm8350, WM8350_DCDC2_CONTROL)
+                    & ~(WM8350_DC2_MODE_MASK | WM8350_DC2_ILIM_MASK |
+                        WM8350_DC2_RMP_MASK | WM8350_DC2_FBSRC_MASK);
+                wm8350_reg_write(wm8350, WM8350_DCDC2_CONTROL, val |
+                                 (mode << WM8350_DC2_MODE_SHIFT) |
+                                 (ilim << WM8350_DC2_ILIM_SHIFT) |
+                                 (ramp << WM8350_DC2_RMP_SHIFT) |
+                                 (feedback << WM8350_DC2_FBSRC_SHIFT));
+                break;
+        case WM8350_DCDC_5:
+                val = wm8350_reg_read(wm8350, WM8350_DCDC5_CONTROL)
+                    & ~(WM8350_DC5_MODE_MASK | WM8350_DC5_ILIM_MASK |
+                        WM8350_DC5_RMP_MASK | WM8350_DC5_FBSRC_MASK);
+                wm8350_reg_write(wm8350, WM8350_DCDC5_CONTROL, val |
+                                 (mode << WM8350_DC5_MODE_SHIFT) |
+                                 (ilim << WM8350_DC5_ILIM_SHIFT) |
+                                 (ramp << WM8350_DC5_RMP_SHIFT) |
+                                 (feedback << WM8350_DC5_FBSRC_SHIFT));
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(wm8350_dcdc25_set_mode);
+
+static int wm8350_dcdc_enable(struct regulator_dev *rdev)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int dcdc = rdev_get_id(rdev);
+        u16 shift;
+
+        if (dcdc < WM8350_DCDC_1 || dcdc > WM8350_DCDC_6)
+                return -EINVAL;
+
+        shift = dcdc - WM8350_DCDC_1;
+        wm8350_set_bits(wm8350, WM8350_DCDC_LDO_REQUESTED, 1 << shift);
+        return 0;
+}
+
+static int wm8350_dcdc_disable(struct regulator_dev *rdev)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int dcdc = rdev_get_id(rdev);
+        u16 shift;
+
+        if (dcdc < WM8350_DCDC_1 || dcdc > WM8350_DCDC_6)
+                return -EINVAL;
+
+        shift = dcdc - WM8350_DCDC_1;
+        wm8350_clear_bits(wm8350, WM8350_DCDC_LDO_REQUESTED, 1 << shift);
+
+        return 0;
+}
+
+static int wm8350_ldo_enable(struct regulator_dev *rdev)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int ldo = rdev_get_id(rdev);
+        u16 shift;
+
+        if (ldo < WM8350_LDO_1 || ldo > WM8350_LDO_4)
+                return -EINVAL;
+
+        shift = (ldo - WM8350_LDO_1) + 8;
+        wm8350_set_bits(wm8350, WM8350_DCDC_LDO_REQUESTED, 1 << shift);
+        return 0;
+}
+
+static int wm8350_ldo_disable(struct regulator_dev *rdev)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int ldo = rdev_get_id(rdev);
+        u16 shift;
+
+        if (ldo < WM8350_LDO_1 || ldo > WM8350_LDO_4)
+                return -EINVAL;
+
+        shift = (ldo - WM8350_LDO_1) + 8;
+        wm8350_clear_bits(wm8350, WM8350_DCDC_LDO_REQUESTED, 1 << shift);
+        return 0;
+}
+
+static int force_continuous_enable(struct wm8350 *wm8350, int dcdc, int enable)
+{
+        int reg = 0, ret;
+
+        switch (dcdc) {
+        case WM8350_DCDC_1:
+                reg = WM8350_DCDC1_FORCE_PWM;
+                break;
+        case WM8350_DCDC_3:
+                reg = WM8350_DCDC3_FORCE_PWM;
+                break;
+        case WM8350_DCDC_4:
+                reg = WM8350_DCDC4_FORCE_PWM;
+                break;
+        case WM8350_DCDC_6:
+                reg = WM8350_DCDC6_FORCE_PWM;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        if (enable)
+                ret = wm8350_set_bits(wm8350, reg,
+                        WM8350_DCDC1_FORCE_PWM_ENA);
+        else
+                ret = wm8350_clear_bits(wm8350, reg,
+                        WM8350_DCDC1_FORCE_PWM_ENA);
+        return ret;
+}
+
+static int wm8350_dcdc_set_mode(struct regulator_dev *rdev, unsigned int mode)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int dcdc = rdev_get_id(rdev);
+        u16 val;
+
+        if (dcdc < WM8350_DCDC_1 || dcdc > WM8350_DCDC_6)
+                return -EINVAL;
+
+        if (dcdc == WM8350_DCDC_2 || dcdc == WM8350_DCDC_5)
+                return -EINVAL;
+
+        val = 1 << (dcdc - WM8350_DCDC_1);
+
+        switch (mode) {
+        case REGULATOR_MODE_FAST:
+                /* force continuous mode */
+                wm8350_set_bits(wm8350, WM8350_DCDC_ACTIVE_OPTIONS, val);
+                wm8350_clear_bits(wm8350, WM8350_DCDC_SLEEP_OPTIONS, val);
+                force_continuous_enable(wm8350, dcdc, 1);
+                break;
+        case REGULATOR_MODE_NORMAL:
+                /* active / pulse skipping */
+                wm8350_set_bits(wm8350, WM8350_DCDC_ACTIVE_OPTIONS, val);
+                wm8350_clear_bits(wm8350, WM8350_DCDC_SLEEP_OPTIONS, val);
+                force_continuous_enable(wm8350, dcdc, 0);
+                break;
+        case REGULATOR_MODE_IDLE:
+                /* standby mode */
+                force_continuous_enable(wm8350, dcdc, 0);
+                wm8350_clear_bits(wm8350, WM8350_DCDC_SLEEP_OPTIONS, val);
+                wm8350_clear_bits(wm8350, WM8350_DCDC_ACTIVE_OPTIONS, val);
+                break;
+        case REGULATOR_MODE_STANDBY:
+                /* LDO mode */
+                force_continuous_enable(wm8350, dcdc, 0);
+                wm8350_set_bits(wm8350, WM8350_DCDC_SLEEP_OPTIONS, val);
+                break;
+        }
+
+        return 0;
+}
+
+static unsigned int wm8350_dcdc_get_mode(struct regulator_dev *rdev)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int dcdc = rdev_get_id(rdev);
+        u16 mask, sleep, active, force;
+        int mode = REGULATOR_MODE_NORMAL;
+
+        if (dcdc < WM8350_DCDC_1 || dcdc > WM8350_DCDC_6)
+                return -EINVAL;
+
+        if (dcdc == WM8350_DCDC_2 || dcdc == WM8350_DCDC_5)
+                return -EINVAL;
+
+        mask = 1 << (dcdc - WM8350_DCDC_1);
+        active = wm8350_reg_read(wm8350, WM8350_DCDC_ACTIVE_OPTIONS) & mask;
+        sleep = wm8350_reg_read(wm8350, WM8350_DCDC_SLEEP_OPTIONS) & mask;
+        force = wm8350_reg_read(wm8350, WM8350_DCDC1_FORCE_PWM)
+            & WM8350_DCDC1_FORCE_PWM_ENA;
+        dev_dbg(wm8350->dev, "mask %x active %x sleep %x force %x",
+                mask, active, sleep, force);
+
+        if (active && !sleep) {
+                if (force)
+                        mode = REGULATOR_MODE_FAST;
+                else
+                        mode = REGULATOR_MODE_NORMAL;
+        } else if (!active && !sleep)
+                mode = REGULATOR_MODE_IDLE;
+        else if (!sleep)
+                mode = REGULATOR_MODE_STANDBY;
+
+        return mode;
+}
+
+static unsigned int wm8350_ldo_get_mode(struct regulator_dev *rdev)
+{
+        return REGULATOR_MODE_NORMAL;
+}
+
+struct wm8350_dcdc_efficiency {
+        int uA_load_min;
+        int uA_load_max;
+        unsigned int mode;
+};
+
+static const struct wm8350_dcdc_efficiency dcdc1_6_efficiency[] = {
+        {0, 10000, REGULATOR_MODE_STANDBY},       /* 0 - 10mA - LDO */
+        {10000, 100000, REGULATOR_MODE_IDLE},     /* 10mA - 100mA - Standby */
+        {100000, 1000000, REGULATOR_MODE_NORMAL}, /* > 100mA - Active */
+        {-1, -1, REGULATOR_MODE_NORMAL},
+};
+
+static const struct wm8350_dcdc_efficiency dcdc3_4_efficiency[] = {
+        {0, 10000, REGULATOR_MODE_STANDBY},      /* 0 - 10mA - LDO */
+        {10000, 100000, REGULATOR_MODE_IDLE},    /* 10mA - 100mA - Standby */
+        {100000, 800000, REGULATOR_MODE_NORMAL}, /* > 100mA - Active */
+        {-1, -1, REGULATOR_MODE_NORMAL},
+};
+
+static unsigned int get_mode(int uA, const struct wm8350_dcdc_efficiency *eff)
+{
+        int i = 0;
+
+        while (eff[i].uA_load_min != -1) {
+                if (uA >= eff[i].uA_load_min && uA <= eff[i].uA_load_max)
+                        return eff[i].mode;
+        }
+        return REGULATOR_MODE_NORMAL;
+}
+
+/* Query the regulator for it's most efficient mode @ uV,uA
+ * WM8350 regulator efficiency is pretty similar over
+ * different input and output uV.
+ */
+static unsigned int wm8350_dcdc_get_optimum_mode(struct regulator_dev *rdev,
+                                                 int input_uV, int output_uV,
+                                                 int output_uA)
+{
+        int dcdc = rdev_get_id(rdev), mode;
+
+        switch (dcdc) {
+        case WM8350_DCDC_1:
+        case WM8350_DCDC_6:
+                mode = get_mode(output_uA, dcdc1_6_efficiency);
+                break;
+        case WM8350_DCDC_3:
+        case WM8350_DCDC_4:
+                mode = get_mode(output_uA, dcdc3_4_efficiency);
+                break;
+        default:
+                mode = REGULATOR_MODE_NORMAL;
+                break;
+        }
+        return mode;
+}
+
+static int wm8350_dcdc_is_enabled(struct regulator_dev *rdev)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int dcdc = rdev_get_id(rdev), shift;
+
+        if (dcdc < WM8350_DCDC_1 || dcdc > WM8350_DCDC_6)
+                return -EINVAL;
+
+        shift = dcdc - WM8350_DCDC_1;
+        return wm8350_reg_read(wm8350, WM8350_DCDC_LDO_REQUESTED)
+            & (1 << shift);
+}
+
+static int wm8350_ldo_is_enabled(struct regulator_dev *rdev)
+{
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+        int ldo = rdev_get_id(rdev), shift;
+
+        if (ldo < WM8350_LDO_1 || ldo > WM8350_LDO_4)
+                return -EINVAL;
+
+        shift = (ldo - WM8350_LDO_1) + 8;
+        return wm8350_reg_read(wm8350, WM8350_DCDC_LDO_REQUESTED)
+            & (1 << shift);
+}
+
+static struct regulator_ops wm8350_dcdc_ops = {
+        .set_voltage = wm8350_dcdc_set_voltage,
+        .get_voltage = wm8350_dcdc_get_voltage,
+        .enable = wm8350_dcdc_enable,
+        .disable = wm8350_dcdc_disable,
+        .get_mode = wm8350_dcdc_get_mode,
+        .set_mode = wm8350_dcdc_set_mode,
+        .get_optimum_mode = wm8350_dcdc_get_optimum_mode,
+        .is_enabled = wm8350_dcdc_is_enabled,
+        .set_suspend_voltage = wm8350_dcdc_set_suspend_voltage,
+        .set_suspend_enable = wm8350_dcdc_set_suspend_enable,
+        .set_suspend_disable = wm8350_dcdc_set_suspend_disable,
+        .set_suspend_mode = wm8350_dcdc_set_suspend_mode,
+};
+
+static struct regulator_ops wm8350_dcdc2_5_ops = {
+        .enable = wm8350_dcdc_enable,
+        .disable = wm8350_dcdc_disable,
+        .is_enabled = wm8350_dcdc_is_enabled,
+        .set_suspend_enable = wm8350_dcdc25_set_suspend_enable,
+        .set_suspend_disable = wm8350_dcdc25_set_suspend_disable,
+};
+
+static struct regulator_ops wm8350_ldo_ops = {
+        .set_voltage = wm8350_ldo_set_voltage,
+        .get_voltage = wm8350_ldo_get_voltage,
+        .enable = wm8350_ldo_enable,
+        .disable = wm8350_ldo_disable,
+        .is_enabled = wm8350_ldo_is_enabled,
+        .get_mode = wm8350_ldo_get_mode,
+        .set_suspend_voltage = wm8350_ldo_set_suspend_voltage,
+        .set_suspend_enable = wm8350_ldo_set_suspend_enable,
+        .set_suspend_disable = wm8350_ldo_set_suspend_disable,
+};
+
+static struct regulator_ops wm8350_isink_ops = {
+        .set_current_limit = wm8350_isink_set_current,
+        .get_current_limit = wm8350_isink_get_current,
+        .enable = wm8350_isink_enable,
+        .disable = wm8350_isink_disable,
+        .is_enabled = wm8350_isink_is_enabled,
+};
+
+static struct regulator_desc wm8350_reg[NUM_WM8350_REGULATORS] = {
+        {
+                .name = "DCDC1",
+                .id = WM8350_DCDC_1,
+                .ops = &wm8350_dcdc_ops,
+                .irq = WM8350_IRQ_UV_DC1,
+                .type = REGULATOR_VOLTAGE,
+                .owner = THIS_MODULE,
+        },
+        {
+                .name = "DCDC2",
+                .id = WM8350_DCDC_2,
+                .ops = &wm8350_dcdc2_5_ops,
+                .irq = WM8350_IRQ_UV_DC2,
+                .type = REGULATOR_VOLTAGE,
+                .owner = THIS_MODULE,
+        },
+        {
+                .name = "DCDC3",
+                .id = WM8350_DCDC_3,
+                .ops = &wm8350_dcdc_ops,
+                .irq = WM8350_IRQ_UV_DC3,
+                .type = REGULATOR_VOLTAGE,
+                .owner = THIS_MODULE,
+        },
+        {
+                .name = "DCDC4",
+                .id = WM8350_DCDC_4,
+                .ops = &wm8350_dcdc_ops,
+                .irq = WM8350_IRQ_UV_DC4,
+                .type = REGULATOR_VOLTAGE,
+                .owner = THIS_MODULE,
+        },
+        {
+                .name = "DCDC5",
+                .id = WM8350_DCDC_5,
+                .ops = &wm8350_dcdc2_5_ops,
+                .irq = WM8350_IRQ_UV_DC5,
+                .type = REGULATOR_VOLTAGE,
+                .owner = THIS_MODULE,
+         },
+        {
+                .name = "DCDC6",
+                .id = WM8350_DCDC_6,
+                .ops = &wm8350_dcdc_ops,
+                .irq = WM8350_IRQ_UV_DC6,
+                .type = REGULATOR_VOLTAGE,
+                .owner = THIS_MODULE,
+        },
+        {
+                .name = "LDO1",
+                .id = WM8350_LDO_1,
+                .ops = &wm8350_ldo_ops,
+                .irq = WM8350_IRQ_UV_LDO1,
+                .type = REGULATOR_VOLTAGE,
+                .owner = THIS_MODULE,
+        },
+        {
+                .name = "LDO2",
+                .id = WM8350_LDO_2,
+                .ops = &wm8350_ldo_ops,
+                .irq = WM8350_IRQ_UV_LDO2,
+                .type = REGULATOR_VOLTAGE,
+                .owner = THIS_MODULE,
+        },
+        {
+                .name = "LDO3",
+                .id = WM8350_LDO_3,
+                .ops = &wm8350_ldo_ops,
+                .irq = WM8350_IRQ_UV_LDO3,
+                .type = REGULATOR_VOLTAGE,
+                .owner = THIS_MODULE,
+        },
+        {
+                .name = "LDO4",
+                .id = WM8350_LDO_4,
+                .ops = &wm8350_ldo_ops,
+                .irq = WM8350_IRQ_UV_LDO4,
+                .type = REGULATOR_VOLTAGE,
+                .owner = THIS_MODULE,
+        },
+        {
+                .name = "ISINKA",
+                .id = WM8350_ISINK_A,
+                .ops = &wm8350_isink_ops,
+                .irq = WM8350_IRQ_CS1,
+                .type = REGULATOR_CURRENT,
+                .owner = THIS_MODULE,
+         },
+        {
+                .name = "ISINKB",
+                .id = WM8350_ISINK_B,
+                .ops = &wm8350_isink_ops,
+                .irq = WM8350_IRQ_CS2,
+                .type = REGULATOR_CURRENT,
+                .owner = THIS_MODULE,
+         },
+};
+
+static void pmic_uv_handler(struct wm8350 *wm8350, int irq, void *data)
+{
+        struct regulator_dev *rdev = (struct regulator_dev *)data;
+
+        if (irq == WM8350_IRQ_CS1 || irq == WM8350_IRQ_CS2)
+                regulator_notifier_call_chain(rdev,
+                                              REGULATOR_EVENT_REGULATION_OUT,
+                                              wm8350);
+        else
+                regulator_notifier_call_chain(rdev,
+                                              REGULATOR_EVENT_UNDER_VOLTAGE,
+                                              wm8350);
+}
+
+static int wm8350_regulator_probe(struct platform_device *pdev)
+{
+        struct wm8350 *wm8350 = dev_get_drvdata(&pdev->dev);
+        struct regulator_dev *rdev;
+        int ret;
+        u16 val;
+
+        if (pdev->id < WM8350_DCDC_1 || pdev->id > WM8350_ISINK_B)
+                return -ENODEV;
+
+        /* do any regulatior specific init */
+        switch (pdev->id) {
+        case WM8350_DCDC_1:
+                val = wm8350_reg_read(wm8350, WM8350_DCDC1_LOW_POWER);
+                wm8350->pmic.dcdc1_hib_mode = val & WM8350_DCDC_HIB_MODE_MASK;
+                break;
+        case WM8350_DCDC_3:
+                val = wm8350_reg_read(wm8350, WM8350_DCDC3_LOW_POWER);
+                wm8350->pmic.dcdc3_hib_mode = val & WM8350_DCDC_HIB_MODE_MASK;
+                break;
+        case WM8350_DCDC_4:
+                val = wm8350_reg_read(wm8350, WM8350_DCDC4_LOW_POWER);
+                wm8350->pmic.dcdc4_hib_mode = val & WM8350_DCDC_HIB_MODE_MASK;
+                break;
+        case WM8350_DCDC_6:
+                val = wm8350_reg_read(wm8350, WM8350_DCDC6_LOW_POWER);
+                wm8350->pmic.dcdc6_hib_mode = val & WM8350_DCDC_HIB_MODE_MASK;
+                break;
+        }
+
+
+        /* register regulator */
+        rdev = regulator_register(&wm8350_reg[pdev->id], &pdev->dev,
+                                  dev_get_drvdata(&pdev->dev));
+        if (IS_ERR(rdev)) {
+                dev_err(&pdev->dev, "failed to register %s\n",
+                        wm8350_reg[pdev->id].name);
+                return PTR_ERR(rdev);
+        }
+
+        /* register regulator IRQ */
+        ret = wm8350_register_irq(wm8350, wm8350_reg[pdev->id].irq,
+                                  pmic_uv_handler, rdev);
+        if (ret < 0) {
+                regulator_unregister(rdev);
+                dev_err(&pdev->dev, "failed to register regulator %s IRQ\n",
+                        wm8350_reg[pdev->id].name);
+                return ret;
+        }
+
+        wm8350_unmask_irq(wm8350, wm8350_reg[pdev->id].irq);
+
+        return 0;
+}
+
+static int wm8350_regulator_remove(struct platform_device *pdev)
+{
+        struct regulator_dev *rdev = platform_get_drvdata(pdev);
+        struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
+
+        wm8350_mask_irq(wm8350, wm8350_reg[pdev->id].irq);
+        wm8350_free_irq(wm8350, wm8350_reg[pdev->id].irq);
+
+        regulator_unregister(rdev);
+
+        return 0;
+}
+
+int wm8350_register_regulator(struct wm8350 *wm8350, int reg,
+                              struct regulator_init_data *initdata)
+{
+        struct platform_device *pdev;
+        int ret;
+
+        if (wm8350->pmic.pdev[reg])
+                return -EBUSY;
+
+        pdev = platform_device_alloc("wm8350-regulator", reg);
+        if (!pdev)
+                return -ENOMEM;
+
+        wm8350->pmic.pdev[reg] = pdev;
+
+        initdata->driver_data = wm8350;
+
+        pdev->dev.platform_data = initdata;
+        pdev->dev.parent = wm8350->dev;
+        platform_set_drvdata(pdev, wm8350);
+
+        ret = platform_device_add(pdev);
+
+        if (ret != 0) {
+                dev_err(wm8350->dev, "Failed to register regulator %d: %d\n",
+                        reg, ret);
+                platform_device_del(pdev);
+                wm8350->pmic.pdev[reg] = NULL;
+        }
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(wm8350_register_regulator);
+
+static struct platform_driver wm8350_regulator_driver = {
+        .probe = wm8350_regulator_probe,
+        .remove = wm8350_regulator_remove,
+        .driver         = {
+                .name   = "wm8350-regulator",
+        },
+};
+
+static int __init wm8350_regulator_init(void)
+{
+        return platform_driver_register(&wm8350_regulator_driver);
+}
+subsys_initcall(wm8350_regulator_init);
+
+static void __exit wm8350_regulator_exit(void)
+{
+        platform_driver_unregister(&wm8350_regulator_driver);
+}
+module_exit(wm8350_regulator_exit);
+
+/* Module information */
+MODULE_AUTHOR("Liam Girdwood");
+MODULE_DESCRIPTION("WM8350 voltage and current regulator driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/regulator/wm8400-regulator.c b/drivers/regulator/wm8400-regulator.c
new file mode 100644
index 000000000000..48b372e038a8
--- /dev/null
+++ b/drivers/regulator/wm8400-regulator.c
@@ -0,0 +1,368 @@
+/*
+ * Regulator support for WM8400
+ *
+ * Copyright 2008 Wolfson Microelectronics PLC.
+ *
+ * Author: Mark Brown <broonie@opensource.wolfsonmicro.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.
+ *
+ */
+
+#include <linux/bug.h>
+#include <linux/err.h>
+#include <linux/kernel.h>
+#include <linux/regulator/driver.h>
+#include <linux/mfd/wm8400-private.h>
+
+static int wm8400_ldo_is_enabled(struct regulator_dev *dev)
+{
+        struct wm8400 *wm8400 = rdev_get_drvdata(dev);
+        u16 val;
+
+        val = wm8400_reg_read(wm8400, WM8400_LDO1_CONTROL + rdev_get_id(dev));
+        return (val & WM8400_LDO1_ENA) != 0;
+}
+
+static int wm8400_ldo_enable(struct regulator_dev *dev)
+{
+        struct wm8400 *wm8400 = rdev_get_drvdata(dev);
+
+        return wm8400_set_bits(wm8400, WM8400_LDO1_CONTROL + rdev_get_id(dev),
+                               WM8400_LDO1_ENA, WM8400_LDO1_ENA);
+}
+
+static int wm8400_ldo_disable(struct regulator_dev *dev)
+{
+        struct wm8400 *wm8400 = rdev_get_drvdata(dev);
+
+        return wm8400_set_bits(wm8400, WM8400_LDO1_CONTROL + rdev_get_id(dev),
+                               WM8400_LDO1_ENA, 0);
+}
+
+static int wm8400_ldo_get_voltage(struct regulator_dev *dev)
+{
+        struct wm8400 *wm8400 = rdev_get_drvdata(dev);
+        u16 val;
+
+        val = wm8400_reg_read(wm8400, WM8400_LDO1_CONTROL + rdev_get_id(dev));
+        val &= WM8400_LDO1_VSEL_MASK;
+
+        if (val < 15)
+                return 900000 + (val * 50000);
+        else
+                return 1600000 + ((val - 14) * 100000);
+}
+
+static int wm8400_ldo_set_voltage(struct regulator_dev *dev,
+                                  int min_uV, int max_uV)
+{
+        struct wm8400 *wm8400 = rdev_get_drvdata(dev);
+        u16 val;
+
+        if (min_uV < 900000 || min_uV > 3300000)
+                return -EINVAL;
+
+        if (min_uV < 1700000) {
+                /* Steps of 50mV from 900mV;  */
+                val = (min_uV - 850001) / 50000;
+
+                if ((val * 50000) + 900000 > max_uV)
+                        return -EINVAL;
+                BUG_ON((val * 50000) + 900000 < min_uV);
+        } else {
+                /* Steps of 100mV from 1700mV */
+                val = ((min_uV - 1600001) / 100000);
+
+                if ((val * 100000) + 1700000 > max_uV)
+                        return -EINVAL;
+                BUG_ON((val * 100000) + 1700000 < min_uV);
+
+                val += 0xf;
+        }
+
+        return wm8400_set_bits(wm8400, WM8400_LDO1_CONTROL + rdev_get_id(dev),
+                               WM8400_LDO1_VSEL_MASK, val);
+}
+
+static struct regulator_ops wm8400_ldo_ops = {
+        .is_enabled = wm8400_ldo_is_enabled,
+        .enable = wm8400_ldo_enable,
+        .disable = wm8400_ldo_disable,
+        .get_voltage = wm8400_ldo_get_voltage,
+        .set_voltage = wm8400_ldo_set_voltage,
+};
+
+static int wm8400_dcdc_is_enabled(struct regulator_dev *dev)
+{
+        struct wm8400 *wm8400 = rdev_get_drvdata(dev);
+        int offset = (rdev_get_id(dev) - WM8400_DCDC1) * 2;
+        u16 val;
+
+        val = wm8400_reg_read(wm8400, WM8400_DCDC1_CONTROL_1 + offset);
+        return (val & WM8400_DC1_ENA) != 0;
+}
+
+static int wm8400_dcdc_enable(struct regulator_dev *dev)
+{
+        struct wm8400 *wm8400 = rdev_get_drvdata(dev);
+        int offset = (rdev_get_id(dev) - WM8400_DCDC1) * 2;
+
+        return wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,
+                               WM8400_DC1_ENA, WM8400_DC1_ENA);
+}
+
+static int wm8400_dcdc_disable(struct regulator_dev *dev)
+{
+        struct wm8400 *wm8400 = rdev_get_drvdata(dev);
+        int offset = (rdev_get_id(dev) - WM8400_DCDC1) * 2;
+
+        return wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,
+                               WM8400_DC1_ENA, 0);
+}
+
+static int wm8400_dcdc_get_voltage(struct regulator_dev *dev)
+{
+        struct wm8400 *wm8400 = rdev_get_drvdata(dev);
+        u16 val;
+        int offset = (rdev_get_id(dev) - WM8400_DCDC1) * 2;
+
+        val = wm8400_reg_read(wm8400, WM8400_DCDC1_CONTROL_1 + offset);
+        val &= WM8400_DC1_VSEL_MASK;
+
+        return 850000 + (25000 * val);
+}
+
+static int wm8400_dcdc_set_voltage(struct regulator_dev *dev,
+                                  int min_uV, int max_uV)
+{
+        struct wm8400 *wm8400 = rdev_get_drvdata(dev);
+        u16 val;
+        int offset = (rdev_get_id(dev) - WM8400_DCDC1) * 2;
+
+        if (min_uV < 850000)
+                return -EINVAL;
+
+        val = (min_uV - 825001) / 25000;
+
+        if (850000 + (25000 * val) > max_uV)
+                return -EINVAL;
+        BUG_ON(850000 + (25000 * val) < min_uV);
+
+        return wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,
+                               WM8400_DC1_VSEL_MASK, val);
+}
+
+static unsigned int wm8400_dcdc_get_mode(struct regulator_dev *dev)
+{
+        struct wm8400 *wm8400 = rdev_get_drvdata(dev);
+        int offset = (rdev_get_id(dev) - WM8400_DCDC1) * 2;
+        u16 data[2];
+        int ret;
+
+        ret = wm8400_block_read(wm8400, WM8400_DCDC1_CONTROL_1 + offset, 2,
+                                data);
+        if (ret != 0)
+                return 0;
+
+        /* Datasheet: hibernate */
+        if (data[0] & WM8400_DC1_SLEEP)
+                return REGULATOR_MODE_STANDBY;
+
+        /* Datasheet: standby */
+        if (!(data[0] & WM8400_DC1_ACTIVE))
+                return REGULATOR_MODE_IDLE;
+
+        /* Datasheet: active with or without force PWM */
+        if (data[1] & WM8400_DC1_FRC_PWM)
+                return REGULATOR_MODE_FAST;
+        else
+                return REGULATOR_MODE_NORMAL;
+}
+
+static int wm8400_dcdc_set_mode(struct regulator_dev *dev, unsigned int mode)
+{
+        struct wm8400 *wm8400 = rdev_get_drvdata(dev);
+        int offset = (rdev_get_id(dev) - WM8400_DCDC1) * 2;
+        int ret;
+
+        switch (mode) {
+        case REGULATOR_MODE_FAST:
+                /* Datasheet: active with force PWM */
+                ret = wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_2 + offset,
+                                      WM8400_DC1_FRC_PWM, WM8400_DC1_FRC_PWM);
+                if (ret != 0)
+                        return ret;
+
+                return wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,
+                                       WM8400_DC1_ACTIVE | WM8400_DC1_SLEEP,
+                                       WM8400_DC1_ACTIVE);
+
+        case REGULATOR_MODE_NORMAL:
+                /* Datasheet: active */
+                ret = wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_2 + offset,
+                                      WM8400_DC1_FRC_PWM, 0);
+                if (ret != 0)
+                        return ret;
+
+                return wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,
+                                       WM8400_DC1_ACTIVE | WM8400_DC1_SLEEP,
+                                       WM8400_DC1_ACTIVE);
+
+        case REGULATOR_MODE_IDLE:
+                /* Datasheet: standby */
+                ret = wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,
+                                      WM8400_DC1_ACTIVE, 0);
+                if (ret != 0)
+                        return ret;
+                return wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,
+                                       WM8400_DC1_SLEEP, 0);
+
+        default:
+                return -EINVAL;
+        }
+}
+
+static unsigned int wm8400_dcdc_get_optimum_mode(struct regulator_dev *dev,
+                                                 int input_uV, int output_uV,
+                                                 int load_uA)
+{
+        return REGULATOR_MODE_NORMAL;
+}
+
+static struct regulator_ops wm8400_dcdc_ops = {
+        .is_enabled = wm8400_dcdc_is_enabled,
+        .enable = wm8400_dcdc_enable,
+        .disable = wm8400_dcdc_disable,
+        .get_voltage = wm8400_dcdc_get_voltage,
+        .set_voltage = wm8400_dcdc_set_voltage,
+        .get_mode = wm8400_dcdc_get_mode,
+        .set_mode = wm8400_dcdc_set_mode,
+        .get_optimum_mode = wm8400_dcdc_get_optimum_mode,
+};
+
+static struct regulator_desc regulators[] = {
+        {
+                .name = "LDO1",
+                .id = WM8400_LDO1,
+                .ops = &wm8400_ldo_ops,
+                .type = REGULATOR_VOLTAGE,
+                .owner = THIS_MODULE,
+        },
+        {
+                .name = "LDO2",
+                .id = WM8400_LDO2,
+                .ops = &wm8400_ldo_ops,
+                .type = REGULATOR_VOLTAGE,
+                .owner = THIS_MODULE,
+        },
+        {
+                .name = "LDO3",
+                .id = WM8400_LDO3,
+                .ops = &wm8400_ldo_ops,
+                .type = REGULATOR_VOLTAGE,
+                .owner = THIS_MODULE,
+        },
+        {
+                .name = "LDO4",
+                .id = WM8400_LDO4,
+                .ops = &wm8400_ldo_ops,
+                .type = REGULATOR_VOLTAGE,
+                .owner = THIS_MODULE,
+        },
+        {
+                .name = "DCDC1",
+                .id = WM8400_DCDC1,
+                .ops = &wm8400_dcdc_ops,
+                .type = REGULATOR_VOLTAGE,
+                .owner = THIS_MODULE,
+        },
+        {
+                .name = "DCDC2",
+                .id = WM8400_DCDC2,
+                .ops = &wm8400_dcdc_ops,
+                .type = REGULATOR_VOLTAGE,
+                .owner = THIS_MODULE,
+        },
+};
+
+static int __init wm8400_regulator_probe(struct platform_device *pdev)
+{
+        struct regulator_dev *rdev;
+
+        rdev = regulator_register(&regulators[pdev->id], &pdev->dev,
+                pdev->dev.driver_data);
+
+        if (IS_ERR(rdev))
+                return PTR_ERR(rdev);
+
+        return 0;
+}
+
+static int __devexit wm8400_regulator_remove(struct platform_device *pdev)
+{
+        struct regulator_dev *rdev = platform_get_drvdata(pdev);
+
+        regulator_unregister(rdev);
+
+        return 0;
+}
+
+static struct platform_driver wm8400_regulator_driver = {
+        .driver = {
+                .name = "wm8400-regulator",
+        },
+        .probe = wm8400_regulator_probe,
+        .remove = __devexit_p(wm8400_regulator_remove),
+};
+
+/**
+ * wm8400_register_regulator - enable software control of a WM8400 regulator
+ *
+ * This function enables software control of a WM8400 regulator via
+ * the regulator API.  It is intended to be called from the
+ * platform_init() callback of the WM8400 MFD driver.
+ *
+ * @param dev      The WM8400 device to operate on.
+ * @param reg      The regulator to control.
+ * @param initdata Regulator initdata for the regulator.
+ */
+int wm8400_register_regulator(struct device *dev, int reg,
+                              struct regulator_init_data *initdata)
+{
+        struct wm8400 *wm8400 = dev->driver_data;
+
+        if (wm8400->regulators[reg].name)
+                return -EBUSY;
+
+        initdata->driver_data = wm8400;
+
+        wm8400->regulators[reg].name = "wm8400-regulator";
+        wm8400->regulators[reg].id = reg;
+        wm8400->regulators[reg].dev.parent = dev;
+        wm8400->regulators[reg].dev.driver_data = wm8400;
+        wm8400->regulators[reg].dev.platform_data = initdata;
+
+        return platform_device_register(&wm8400->regulators[reg]);
+}
+EXPORT_SYMBOL_GPL(wm8400_register_regulator);
+
+static int __init wm8400_regulator_init(void)
+{
+        return platform_driver_register(&wm8400_regulator_driver);
+}
+module_init(wm8400_regulator_init);
+
+static void __exit wm8400_regulator_exit(void)
+{
+        platform_driver_unregister(&wm8400_regulator_driver);
+}
+module_exit(wm8400_regulator_exit);
+
+MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
+MODULE_DESCRIPTION("WM8400 regulator driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:wm8400-regulator");
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index b57fba5c6d02..f660ef3e5b29 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -220,22 +220,22 @@ config RTC_DRV_PCF8583
           will be called rtc-pcf8583.
 
 config RTC_DRV_M41T80
-        tristate "ST M41T80/81/82/83/84/85/87"
+        tristate "ST M41T65/M41T80/81/82/83/84/85/87"
         help
-          If you say Y here you will get support for the
-          ST M41T80 RTC chips series. Currently following chips are
-          supported: M41T80, M41T81, M41T82, M41T83, M41ST84, M41ST85
-          and M41ST87.
+          If you say Y here you will get support for the ST M41T60
+          and M41T80 RTC chips series. Currently, the following chips are
+          supported: M41T65, M41T80, M41T81, M41T82, M41T83, M41ST84,
+          M41ST85, and M41ST87.
 
           This driver can also be built as a module. If so, the module
           will be called rtc-m41t80.
 
 config RTC_DRV_M41T80_WDT
-        bool "ST M41T80 series RTC watchdog timer"
+        bool "ST M41T65/M41T80 series RTC watchdog timer"
         depends on RTC_DRV_M41T80
         help
           If you say Y here you will get support for the
-          watchdog timer in ST M41T80 RTC chips series.
+          watchdog timer in the ST M41T60 and M41T80 RTC chips series.
 
 config RTC_DRV_TWL92330
         boolean "TI TWL92330/Menelaus"
@@ -319,6 +319,15 @@ config RTC_DRV_RS5C348
           This driver can also be built as a module. If so, the module
           will be called rtc-rs5c348.
 
+config RTC_DRV_DS3234
+        tristate "Maxim/Dallas DS3234"
+        help
+          If you say yes here you get support for the
+          Maxim/Dallas DS3234 SPI RTC chip.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-ds3234.
+
 endif # SPI_MASTER
 
 comment "Platform RTC drivers"
@@ -352,6 +361,11 @@ config RTC_DRV_DS1216
         help
           If you say yes here you get support for the Dallas DS1216 RTC chips.
 
+config RTC_DRV_DS1286
+        tristate "Dallas DS1286"
+        help
+          If you say yes here you get support for the Dallas DS1286 RTC chips.
+
 config RTC_DRV_DS1302
         tristate "Dallas DS1302"
         depends on SH_SECUREEDGE5410
@@ -405,6 +419,15 @@ config RTC_DRV_M48T86
           This driver can also be built as a module. If so, the module
           will be called rtc-m48t86.
 
+config RTC_DRV_M48T35
+        tristate "ST M48T35"
+        help
+          If you say Y here you will get support for the
+          ST M48T35 RTC chip.
+
+          This driver can also be built as a module, if so, the module
+          will be called "rtc-m48t35".
+
 config RTC_DRV_M48T59
         tristate "ST M48T59/M48T08/M48T02"
         help
@@ -589,7 +612,7 @@ config RTC_DRV_RS5C313
 
 config RTC_DRV_PPC
        tristate "PowerPC machine dependent RTC support"
-       depends on PPC_MERGE
+       depends on PPC
        help
          The PowerPC kernel has machine-specific functions for accessing
          the RTC. This exposes that functionality through the generic RTC
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 10f41f85c38a..d05928b3ca94 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_RTC_DRV_AT91SAM9)	+= rtc-at91sam9.o
 obj-$(CONFIG_RTC_DRV_BFIN)      += rtc-bfin.o
 obj-$(CONFIG_RTC_DRV_CMOS)      += rtc-cmos.o
 obj-$(CONFIG_RTC_DRV_DS1216)    += rtc-ds1216.o
+obj-$(CONFIG_RTC_DRV_DS1286)    += rtc-ds1286.o
 obj-$(CONFIG_RTC_DRV_DS1302)    += rtc-ds1302.o
 obj-$(CONFIG_RTC_DRV_DS1305)    += rtc-ds1305.o
 obj-$(CONFIG_RTC_DRV_DS1307)    += rtc-ds1307.o
@@ -31,11 +32,13 @@ obj-$(CONFIG_RTC_DRV_DS1511)	+= rtc-ds1511.o
 obj-$(CONFIG_RTC_DRV_DS1553)    += rtc-ds1553.o
 obj-$(CONFIG_RTC_DRV_DS1672)    += rtc-ds1672.o
 obj-$(CONFIG_RTC_DRV_DS1742)    += rtc-ds1742.o
+obj-$(CONFIG_RTC_DRV_DS3234)    += rtc-ds3234.o
 obj-$(CONFIG_RTC_DRV_EP93XX)    += rtc-ep93xx.o
 obj-$(CONFIG_RTC_DRV_FM3130)    += rtc-fm3130.o
 obj-$(CONFIG_RTC_DRV_ISL1208)   += rtc-isl1208.o
 obj-$(CONFIG_RTC_DRV_M41T80)    += rtc-m41t80.o
 obj-$(CONFIG_RTC_DRV_M41T94)    += rtc-m41t94.o
+obj-$(CONFIG_RTC_DRV_M48T35)    += rtc-m48t35.o
 obj-$(CONFIG_RTC_DRV_M48T59)    += rtc-m48t59.o
 obj-$(CONFIG_RTC_DRV_M48T86)    += rtc-m48t86.o
 obj-$(CONFIG_RTC_DRV_BQ4802)    += rtc-bq4802.o
diff --git a/drivers/rtc/rtc-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c
index 4e888cc8be5b..37082616482b 100644
--- a/drivers/rtc/rtc-at91rm9200.c
+++ b/drivers/rtc/rtc-at91rm9200.c
@@ -29,10 +29,10 @@
 #include <linux/completion.h>
 
 #include <asm/uaccess.h>
+
 #include <mach/at91_rtc.h>
 
 
-#define AT91_RTC_FREQ           1
 #define AT91_RTC_EPOCH          1900UL  /* just like arch/arm/common/rtctime.c */
 
 static DECLARE_COMPLETION(at91_rtc_updated);
@@ -228,8 +228,6 @@ static int at91_rtc_proc(struct device *dev, struct seq_file *seq)
                         (imr & AT91_RTC_ACKUPD) ? "yes" : "no");
         seq_printf(seq, "periodic_IRQ\t: %s\n",
                         (imr & AT91_RTC_SECEV) ? "yes" : "no");
-        seq_printf(seq, "periodic_freq\t: %ld\n",
-                        (unsigned long) AT91_RTC_FREQ);
 
         return 0;
 }
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index b23af0c2a869..963ad0b6a4e9 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -913,6 +913,92 @@ static inline int cmos_poweroff(struct device *dev)
  * predate even PNPBIOS should set up platform_bus devices.
  */
 
+#ifdef  CONFIG_ACPI
+
+#include <linux/acpi.h>
+
+#ifdef  CONFIG_PM
+static u32 rtc_handler(void *context)
+{
+        acpi_clear_event(ACPI_EVENT_RTC);
+        acpi_disable_event(ACPI_EVENT_RTC, 0);
+        return ACPI_INTERRUPT_HANDLED;
+}
+
+static inline void rtc_wake_setup(void)
+{
+        acpi_install_fixed_event_handler(ACPI_EVENT_RTC, rtc_handler, NULL);
+        /*
+         * After the RTC handler is installed, the Fixed_RTC event should
+         * be disabled. Only when the RTC alarm is set will it be enabled.
+         */
+        acpi_clear_event(ACPI_EVENT_RTC);
+        acpi_disable_event(ACPI_EVENT_RTC, 0);
+}
+
+static void rtc_wake_on(struct device *dev)
+{
+        acpi_clear_event(ACPI_EVENT_RTC);
+        acpi_enable_event(ACPI_EVENT_RTC, 0);
+}
+
+static void rtc_wake_off(struct device *dev)
+{
+        acpi_disable_event(ACPI_EVENT_RTC, 0);
+}
+#else
+#define rtc_wake_setup()        do{}while(0)
+#define rtc_wake_on             NULL
+#define rtc_wake_off            NULL
+#endif
+
+/* Every ACPI platform has a mc146818 compatible "cmos rtc".  Here we find
+ * its device node and pass extra config data.  This helps its driver use
+ * capabilities that the now-obsolete mc146818 didn't have, and informs it
+ * that this board's RTC is wakeup-capable (per ACPI spec).
+ */
+static struct cmos_rtc_board_info acpi_rtc_info;
+
+static void __devinit
+cmos_wake_setup(struct device *dev)
+{
+        if (acpi_disabled)
+                return;
+
+        rtc_wake_setup();
+        acpi_rtc_info.wake_on = rtc_wake_on;
+        acpi_rtc_info.wake_off = rtc_wake_off;
+
+        /* workaround bug in some ACPI tables */
+        if (acpi_gbl_FADT.month_alarm && !acpi_gbl_FADT.day_alarm) {
+                dev_dbg(dev, "bogus FADT month_alarm (%d)\n",
+                        acpi_gbl_FADT.month_alarm);
+                acpi_gbl_FADT.month_alarm = 0;
+        }
+
+        acpi_rtc_info.rtc_day_alarm = acpi_gbl_FADT.day_alarm;
+        acpi_rtc_info.rtc_mon_alarm = acpi_gbl_FADT.month_alarm;
+        acpi_rtc_info.rtc_century = acpi_gbl_FADT.century;
+
+        /* NOTE:  S4_RTC_WAKE is NOT currently useful to Linux */
+        if (acpi_gbl_FADT.flags & ACPI_FADT_S4_RTC_WAKE)
+                dev_info(dev, "RTC can wake from S4\n");
+
+        dev->platform_data = &acpi_rtc_info;
+
+        /* RTC always wakes from S1/S2/S3, and often S4/STD */
+        device_init_wakeup(dev, 1);
+}
+
+#else
+
+static void __devinit
+cmos_wake_setup(struct device *dev)
+{
+}
+
+#endif
+
 #ifdef  CONFIG_PNP
 
 #include <linux/pnp.h>
@@ -920,6 +1006,8 @@ static inline int cmos_poweroff(struct device *dev)
 static int __devinit
 cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
 {
+        cmos_wake_setup(&pnp->dev);
+
         if (pnp_port_start(pnp,0) == 0x70 && !pnp_irq_valid(pnp,0))
                 /* Some machines contain a PNP entry for the RTC, but
                  * don't define the IRQ. It should always be safe to
@@ -997,6 +1085,7 @@ static struct pnp_driver cmos_pnp_driver = {
 
 static int __init cmos_platform_probe(struct platform_device *pdev)
 {
+        cmos_wake_setup(&pdev->dev);
         return cmos_do_probe(&pdev->dev,
                         platform_get_resource(pdev, IORESOURCE_IO, 0),
                         platform_get_irq(pdev, 0));
@@ -1031,29 +1120,32 @@ static struct platform_driver cmos_platform_driver = {
 
 static int __init cmos_init(void)
 {
+        int retval = 0;
+
 #ifdef  CONFIG_PNP
-        if (pnp_platform_devices)
-                return pnp_register_driver(&cmos_pnp_driver);
-        else
-                return platform_driver_probe(&cmos_platform_driver,
-                        cmos_platform_probe);
-#else
-        return platform_driver_probe(&cmos_platform_driver,
-                        cmos_platform_probe);
-#endif /* CONFIG_PNP */
+        pnp_register_driver(&cmos_pnp_driver);
+#endif
+
+        if (!cmos_rtc.dev)
+                retval = platform_driver_probe(&cmos_platform_driver,
+                                               cmos_platform_probe);
+
+        if (retval == 0)
+                return 0;
+
+#ifdef  CONFIG_PNP
+        pnp_unregister_driver(&cmos_pnp_driver);
+#endif
+        return retval;
 }
 module_init(cmos_init);
 
 static void __exit cmos_exit(void)
 {
 #ifdef  CONFIG_PNP
-        if (pnp_platform_devices)
-                pnp_unregister_driver(&cmos_pnp_driver);
-        else
-                platform_driver_unregister(&cmos_platform_driver);
-#else
+        pnp_unregister_driver(&cmos_pnp_driver);
+#endif
         platform_driver_unregister(&cmos_platform_driver);
-#endif /* CONFIG_PNP */
 }
 module_exit(cmos_exit);
 
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
index 52e2743b04ec..079e9ed907e0 100644
--- a/drivers/rtc/rtc-dev.c
+++ b/drivers/rtc/rtc-dev.c
@@ -432,9 +432,15 @@ static int rtc_dev_release(struct inode *inode, struct file *file)
 {
         struct rtc_device *rtc = file->private_data;
 
-#ifdef CONFIG_RTC_INTF_DEV_UIE_EMUL
-        clear_uie(rtc);
-#endif
+        /* We shut down the repeating IRQs that userspace enabled,
+         * since nothing is listening to them.
+         *  - Update (UIE) ... currently only managed through ioctls
+         *  - Periodic (PIE) ... also used through rtc_*() interface calls
+         *
+         * Leave the alarm alone; it may be set to trigger a system wakeup
+         * later, or be used by kernel code, and is a one-shot event anyway.
+         */
+        rtc_dev_ioctl(file, RTC_UIE_OFF, 0);
         rtc_irq_set_state(rtc, NULL, 0);
 
         if (rtc->ops->release)
diff --git a/drivers/rtc/rtc-ds1286.c b/drivers/rtc/rtc-ds1286.c
new file mode 100644
index 000000000000..4fcb16bbff4a
--- /dev/null
+++ b/drivers/rtc/rtc-ds1286.c
@@ -0,0 +1,410 @@
+/*
+ * DS1286 Real Time Clock interface for Linux
+ *
+ * Copyright (C) 1998, 1999, 2000 Ralf Baechle
+ * Copyright (C) 2008 Thomas Bogendoerfer
+ *
+ * Based on code written by Paul Gortmaker.
+ *
+ * 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.
+ */
+
+#include <linux/module.h>
+#include <linux/rtc.h>
+#include <linux/platform_device.h>
+#include <linux/bcd.h>
+#include <linux/ds1286.h>
+#include <linux/io.h>
+
+#define DRV_VERSION             "1.0"
+
+struct ds1286_priv {
+        struct rtc_device *rtc;
+        u32 __iomem *rtcregs;
+        size_t size;
+        unsigned long baseaddr;
+        spinlock_t lock;
+};
+
+static inline u8 ds1286_rtc_read(struct ds1286_priv *priv, int reg)
+{
+        return __raw_readl(&priv->rtcregs[reg]) & 0xff;
+}
+
+static inline void ds1286_rtc_write(struct ds1286_priv *priv, u8 data, int reg)
+{
+        __raw_writel(data, &priv->rtcregs[reg]);
+}
+
+#ifdef CONFIG_RTC_INTF_DEV
+
+static int ds1286_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
+{
+        struct ds1286_priv *priv = dev_get_drvdata(dev);
+        unsigned long flags;
+        unsigned char val;
+
+        switch (cmd) {
+        case RTC_AIE_OFF:
+                /* Mask alarm int. enab. bit    */
+                spin_lock_irqsave(&priv->lock, flags);
+                val = ds1286_rtc_read(priv, RTC_CMD);
+                val |=  RTC_TDM;
+                ds1286_rtc_write(priv, val, RTC_CMD);
+                spin_unlock_irqrestore(&priv->lock, flags);
+                break;
+        case RTC_AIE_ON:
+                /* Allow alarm interrupts.      */
+                spin_lock_irqsave(&priv->lock, flags);
+                val = ds1286_rtc_read(priv, RTC_CMD);
+                val &=  ~RTC_TDM;
+                ds1286_rtc_write(priv, val, RTC_CMD);
+                spin_unlock_irqrestore(&priv->lock, flags);
+                break;
+        case RTC_WIE_OFF:
+                /* Mask watchdog int. enab. bit */
+                spin_lock_irqsave(&priv->lock, flags);
+                val = ds1286_rtc_read(priv, RTC_CMD);
+                val |= RTC_WAM;
+                ds1286_rtc_write(priv, val, RTC_CMD);
+                spin_unlock_irqrestore(&priv->lock, flags);
+                break;
+        case RTC_WIE_ON:
+                /* Allow watchdog interrupts.   */
+                spin_lock_irqsave(&priv->lock, flags);
+                val = ds1286_rtc_read(priv, RTC_CMD);
+                val &= ~RTC_WAM;
+                ds1286_rtc_write(priv, val, RTC_CMD);
+                spin_unlock_irqrestore(&priv->lock, flags);
+                break;
+        default:
+                return -ENOIOCTLCMD;
+        }
+        return 0;
+}
+
+#else
+#define ds1286_ioctl    NULL
+#endif
+
+#ifdef CONFIG_PROC_FS
+
+static int ds1286_proc(struct device *dev, struct seq_file *seq)
+{
+        struct ds1286_priv *priv = dev_get_drvdata(dev);
+        unsigned char month, cmd, amode;
+        const char *s;
+
+        month = ds1286_rtc_read(priv, RTC_MONTH);
+        seq_printf(seq,
+                   "oscillator\t: %s\n"
+                   "square_wave\t: %s\n",
+                   (month & RTC_EOSC) ? "disabled" : "enabled",
+                   (month & RTC_ESQW) ? "disabled" : "enabled");
+
+        amode = ((ds1286_rtc_read(priv, RTC_MINUTES_ALARM) & 0x80) >> 5) |
+                ((ds1286_rtc_read(priv, RTC_HOURS_ALARM) & 0x80) >> 6) |
+                ((ds1286_rtc_read(priv, RTC_DAY_ALARM) & 0x80) >> 7);
+        switch (amode) {
+        case 7:
+                s = "each minute";
+                break;
+        case 3:
+                s = "minutes match";
+                break;
+        case 1:
+                s = "hours and minutes match";
+                break;
+        case 0:
+                s = "days, hours and minutes match";
+                break;
+        default:
+                s = "invalid";
+                break;
+        }
+        seq_printf(seq, "alarm_mode\t: %s\n", s);
+
+        cmd = ds1286_rtc_read(priv, RTC_CMD);
+        seq_printf(seq,
+                   "alarm_enable\t: %s\n"
+                   "wdog_alarm\t: %s\n"
+                   "alarm_mask\t: %s\n"
+                   "wdog_alarm_mask\t: %s\n"
+                   "interrupt_mode\t: %s\n"
+                   "INTB_mode\t: %s_active\n"
+                   "interrupt_pins\t: %s\n",
+                   (cmd & RTC_TDF) ? "yes" : "no",
+                   (cmd & RTC_WAF) ? "yes" : "no",
+                   (cmd & RTC_TDM) ? "disabled" : "enabled",
+                   (cmd & RTC_WAM) ? "disabled" : "enabled",
+                   (cmd & RTC_PU_LVL) ? "pulse" : "level",
+                   (cmd & RTC_IBH_LO) ? "low" : "high",
+                   (cmd & RTC_IPSW) ? "unswapped" : "swapped");
+        return 0;
+}
+
+#else
+#define ds1286_proc     NULL
+#endif
+
+static int ds1286_read_time(struct device *dev, struct rtc_time *tm)
+{
+        struct ds1286_priv *priv = dev_get_drvdata(dev);
+        unsigned char save_control;
+        unsigned long flags;
+        unsigned long uip_watchdog = jiffies;
+
+        /*
+         * read RTC once any update in progress is done. The update
+         * can take just over 2ms. We wait 10 to 20ms. There is no need to
+         * to poll-wait (up to 1s - eeccch) for the falling edge of RTC_UIP.
+         * If you need to know *exactly* when a second has started, enable
+         * periodic update complete interrupts, (via ioctl) and then
+         * immediately read /dev/rtc which will block until you get the IRQ.
+         * Once the read clears, read the RTC time (again via ioctl). Easy.
+         */
+
+        if (ds1286_rtc_read(priv, RTC_CMD) & RTC_TE)
+                while (time_before(jiffies, uip_watchdog + 2*HZ/100))
+                        barrier();
+
+        /*
+         * Only the values that we read from the RTC are set. We leave
+         * tm_wday, tm_yday and tm_isdst untouched. Even though the
+         * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
+         * by the RTC when initially set to a non-zero value.
+         */
+        spin_lock_irqsave(&priv->lock, flags);
+        save_control = ds1286_rtc_read(priv, RTC_CMD);
+        ds1286_rtc_write(priv, (save_control|RTC_TE), RTC_CMD);
+
+        tm->tm_sec = ds1286_rtc_read(priv, RTC_SECONDS);
+        tm->tm_min = ds1286_rtc_read(priv, RTC_MINUTES);
+        tm->tm_hour = ds1286_rtc_read(priv, RTC_HOURS) & 0x3f;
+        tm->tm_mday = ds1286_rtc_read(priv, RTC_DATE);
+        tm->tm_mon = ds1286_rtc_read(priv, RTC_MONTH) & 0x1f;
+        tm->tm_year = ds1286_rtc_read(priv, RTC_YEAR);
+
+        ds1286_rtc_write(priv, save_control, RTC_CMD);
+        spin_unlock_irqrestore(&priv->lock, flags);
+
+        tm->tm_sec = bcd2bin(tm->tm_sec);
+        tm->tm_min = bcd2bin(tm->tm_min);
+        tm->tm_hour = bcd2bin(tm->tm_hour);
+        tm->tm_mday = bcd2bin(tm->tm_mday);
+        tm->tm_mon = bcd2bin(tm->tm_mon);
+        tm->tm_year = bcd2bin(tm->tm_year);
+
+        /*
+         * Account for differences between how the RTC uses the values
+         * and how they are defined in a struct rtc_time;
+         */
+        if (tm->tm_year < 45)
+                tm->tm_year += 30;
+        tm->tm_year += 40;
+        if (tm->tm_year < 70)
+                tm->tm_year += 100;
+
+        tm->tm_mon--;
+
+        return rtc_valid_tm(tm);
+}
+
+static int ds1286_set_time(struct device *dev, struct rtc_time *tm)
+{
+        struct ds1286_priv *priv = dev_get_drvdata(dev);
+        unsigned char mon, day, hrs, min, sec;
+        unsigned char save_control;
+        unsigned int yrs;
+        unsigned long flags;
+
+        yrs = tm->tm_year + 1900;
+        mon = tm->tm_mon + 1;   /* tm_mon starts at zero */
+        day = tm->tm_mday;
+        hrs = tm->tm_hour;
+        min = tm->tm_min;
+        sec = tm->tm_sec;
+
+        if (yrs < 1970)
+                return -EINVAL;
+
+        yrs -= 1940;
+        if (yrs > 255)    /* They are unsigned */
+                return -EINVAL;
+
+        if (yrs >= 100)
+                yrs -= 100;
+
+        sec = bin2bcd(sec);
+        min = bin2bcd(min);
+        hrs = bin2bcd(hrs);
+        day = bin2bcd(day);
+        mon = bin2bcd(mon);
+        yrs = bin2bcd(yrs);
+
+        spin_lock_irqsave(&priv->lock, flags);
+        save_control = ds1286_rtc_read(priv, RTC_CMD);
+        ds1286_rtc_write(priv, (save_control|RTC_TE), RTC_CMD);
+
+        ds1286_rtc_write(priv, yrs, RTC_YEAR);
+        ds1286_rtc_write(priv, mon, RTC_MONTH);
+        ds1286_rtc_write(priv, day, RTC_DATE);
+        ds1286_rtc_write(priv, hrs, RTC_HOURS);
+        ds1286_rtc_write(priv, min, RTC_MINUTES);
+        ds1286_rtc_write(priv, sec, RTC_SECONDS);
+        ds1286_rtc_write(priv, 0, RTC_HUNDREDTH_SECOND);
+
+        ds1286_rtc_write(priv, save_control, RTC_CMD);
+        spin_unlock_irqrestore(&priv->lock, flags);
+        return 0;
+}
+
+static int ds1286_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
+{
+        struct ds1286_priv *priv = dev_get_drvdata(dev);
+        unsigned char cmd;
+        unsigned long flags;
+
+        /*
+         * Only the values that we read from the RTC are set. That
+         * means only tm_wday, tm_hour, tm_min.
+         */
+        spin_lock_irqsave(&priv->lock, flags);
+        alm->time.tm_min = ds1286_rtc_read(priv, RTC_MINUTES_ALARM) & 0x7f;
+        alm->time.tm_hour = ds1286_rtc_read(priv, RTC_HOURS_ALARM)  & 0x1f;
+        alm->time.tm_wday = ds1286_rtc_read(priv, RTC_DAY_ALARM)    & 0x07;
+        cmd = ds1286_rtc_read(priv, RTC_CMD);
+        spin_unlock_irqrestore(&priv->lock, flags);
+
+        alm->time.tm_min = bcd2bin(alm->time.tm_min);
+        alm->time.tm_hour = bcd2bin(alm->time.tm_hour);
+        alm->time.tm_sec = 0;
+        return 0;
+}
+
+static int ds1286_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
+{
+        struct ds1286_priv *priv = dev_get_drvdata(dev);
+        unsigned char hrs, min, sec;
+
+        hrs = alm->time.tm_hour;
+        min = alm->time.tm_min;
+        sec = alm->time.tm_sec;
+
+        if (hrs >= 24)
+                hrs = 0xff;
+
+        if (min >= 60)
+                min = 0xff;
+
+        if (sec != 0)
+                return -EINVAL;
+
+        min = bin2bcd(min);
+        hrs = bin2bcd(hrs);
+
+        spin_lock(&priv->lock);
+        ds1286_rtc_write(priv, hrs, RTC_HOURS_ALARM);
+        ds1286_rtc_write(priv, min, RTC_MINUTES_ALARM);
+        spin_unlock(&priv->lock);
+
+        return 0;
+}
+
+static const struct rtc_class_ops ds1286_ops = {
+        .ioctl          = ds1286_ioctl,
+        .proc           = ds1286_proc,
+        .read_time      = ds1286_read_time,
+        .set_time       = ds1286_set_time,
+        .read_alarm     = ds1286_read_alarm,
+        .set_alarm      = ds1286_set_alarm,
+};
+
+static int __devinit ds1286_probe(struct platform_device *pdev)
+{
+        struct rtc_device *rtc;
+        struct resource *res;
+        struct ds1286_priv *priv;
+        int ret = 0;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res)
+                return -ENODEV;
+        priv = kzalloc(sizeof(struct ds1286_priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        priv->size = res->end - res->start + 1;
+        if (!request_mem_region(res->start, priv->size, pdev->name)) {
+                ret = -EBUSY;
+                goto out;
+        }
+        priv->baseaddr = res->start;
+        priv->rtcregs = ioremap(priv->baseaddr, priv->size);
+        if (!priv->rtcregs) {
+                ret = -ENOMEM;
+                goto out;
+        }
+        spin_lock_init(&priv->lock);
+        rtc = rtc_device_register("ds1286", &pdev->dev,
+                                  &ds1286_ops, THIS_MODULE);
+        if (IS_ERR(rtc)) {
+                ret = PTR_ERR(rtc);
+                goto out;
+        }
+        priv->rtc = rtc;
+        platform_set_drvdata(pdev, priv);
+        return 0;
+
+out:
+        if (priv->rtc)
+                rtc_device_unregister(priv->rtc);
+        if (priv->rtcregs)
+                iounmap(priv->rtcregs);
+        if (priv->baseaddr)
+                release_mem_region(priv->baseaddr, priv->size);
+        kfree(priv);
+        return ret;
+}
+
+static int __devexit ds1286_remove(struct platform_device *pdev)
+{
+        struct ds1286_priv *priv = platform_get_drvdata(pdev);
+
+        rtc_device_unregister(priv->rtc);
+        iounmap(priv->rtcregs);
+        release_mem_region(priv->baseaddr, priv->size);
+        kfree(priv);
+        return 0;
+}
+
+static struct platform_driver ds1286_platform_driver = {
+        .driver         = {
+                .name   = "rtc-ds1286",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = ds1286_probe,
+        .remove         = __devexit_p(ds1286_remove),
+};
+
+static int __init ds1286_init(void)
+{
+        return platform_driver_register(&ds1286_platform_driver);
+}
+
+static void __exit ds1286_exit(void)
+{
+        platform_driver_unregister(&ds1286_platform_driver);
+}
+
+MODULE_AUTHOR("Thomas Bogendoerfer <tsbogend@alpha.franken.de>");
+MODULE_DESCRIPTION("DS1286 RTC driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
+MODULE_ALIAS("platform:rtc-ds1286");
+
+module_init(ds1286_init);
+module_exit(ds1286_exit);
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index bbf97e65202a..4fcf0734a6ef 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -23,10 +23,6 @@
  * to have set the chip up as a clock (turning on the oscillator and
  * setting the date and time), Linux can ignore the non-clock features.
  * That's a natural job for a factory or repair bench.
- *
- * This is currently a simple no-alarms driver.  If your board has the
- * alarm irq wired up on a ds1337 or ds1339, and you want to use that,
- * then look at the rtc-rs5c372 driver for code to steal...
  */
 enum ds_type {
         ds_1307,
@@ -67,6 +63,7 @@ enum ds_type {
 #       define DS1307_BIT_RS0           0x01
 #define DS1337_REG_CONTROL      0x0e
 #       define DS1337_BIT_nEOSC         0x80
+#       define DS1339_BIT_BBSQI         0x20
 #       define DS1337_BIT_RS2           0x10
 #       define DS1337_BIT_RS1           0x08
 #       define DS1337_BIT_INTCN         0x04
@@ -83,19 +80,22 @@ enum ds_type {
 #       define DS1337_BIT_OSF           0x80
 #       define DS1337_BIT_A2I           0x02
 #       define DS1337_BIT_A1I           0x01
+#define DS1339_REG_ALARM1_SECS  0x07
 #define DS1339_REG_TRICKLE      0x10
 
 
 
 struct ds1307 {
         u8                      reg_addr;
-        bool                    has_nvram;
-        u8                      regs[8];
+        u8                      regs[11];
         enum ds_type            type;
+        unsigned long           flags;
+#define HAS_NVRAM       0               /* bit 0 == sysfs file active */
+#define HAS_ALARM       1               /* bit 1 == irq claimed */
         struct i2c_msg          msg[2];
         struct i2c_client       *client;
-        struct i2c_client       dev;
         struct rtc_device       *rtc;
+        struct work_struct      work;
 };
 
 struct chip_desc {
@@ -132,12 +132,79 @@ static const struct i2c_device_id ds1307_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, ds1307_id);
 
+/*----------------------------------------------------------------------*/
+
+/*
+ * The IRQ logic includes a "real" handler running in IRQ context just
+ * long enough to schedule this workqueue entry.   We need a task context
+ * to talk to the RTC, since I2C I/O calls require that; and disable the
+ * IRQ until we clear its status on the chip, so that this handler can
+ * work with any type of triggering (not just falling edge).
+ *
+ * The ds1337 and ds1339 both have two alarms, but we only use the first
+ * one (with a "seconds" field).  For ds1337 we expect nINTA is our alarm
+ * signal; ds1339 chips have only one alarm signal.
+ */
+static void ds1307_work(struct work_struct *work)
+{
+        struct ds1307           *ds1307;
+        struct i2c_client       *client;
+        struct mutex            *lock;
+        int                     stat, control;
+
+        ds1307 = container_of(work, struct ds1307, work);
+        client = ds1307->client;
+        lock = &ds1307->rtc->ops_lock;
+
+        mutex_lock(lock);
+        stat = i2c_smbus_read_byte_data(client, DS1337_REG_STATUS);
+        if (stat < 0)
+                goto out;
+
+        if (stat & DS1337_BIT_A1I) {
+                stat &= ~DS1337_BIT_A1I;
+                i2c_smbus_write_byte_data(client, DS1337_REG_STATUS, stat);
+
+                control = i2c_smbus_read_byte_data(client, DS1337_REG_CONTROL);
+                if (control < 0)
+                        goto out;
+
+                control &= ~DS1337_BIT_A1IE;
+                i2c_smbus_write_byte_data(client, DS1337_REG_CONTROL, control);
+
+                /* rtc_update_irq() assumes that it is called
+                 * from IRQ-disabled context.
+                 */
+                local_irq_disable();
+                rtc_update_irq(ds1307->rtc, 1, RTC_AF | RTC_IRQF);
+                local_irq_enable();
+        }
+
+out:
+        if (test_bit(HAS_ALARM, &ds1307->flags))
+                enable_irq(client->irq);
+        mutex_unlock(lock);
+}
+
+static irqreturn_t ds1307_irq(int irq, void *dev_id)
+{
+        struct i2c_client       *client = dev_id;
+        struct ds1307           *ds1307 = i2c_get_clientdata(client);
+
+        disable_irq_nosync(irq);
+        schedule_work(&ds1307->work);
+        return IRQ_HANDLED;
+}
+
+/*----------------------------------------------------------------------*/
+
 static int ds1307_get_time(struct device *dev, struct rtc_time *t)
 {
         struct ds1307   *ds1307 = dev_get_drvdata(dev);
         int             tmp;
 
         /* read the RTC date and time registers all at once */
+        ds1307->reg_addr = 0;
         ds1307->msg[1].flags = I2C_M_RD;
         ds1307->msg[1].len = 7;
 
@@ -231,9 +298,186 @@ static int ds1307_set_time(struct device *dev, struct rtc_time *t)
         return 0;
 }
 
+static int ds1307_read_alarm(struct device *dev, struct rtc_wkalrm *t)
+{
+        struct i2c_client       *client = to_i2c_client(dev);
+        struct ds1307           *ds1307 = i2c_get_clientdata(client);
+        int                     ret;
+
+        if (!test_bit(HAS_ALARM, &ds1307->flags))
+                return -EINVAL;
+
+        /* read all ALARM1, ALARM2, and status registers at once */
+        ds1307->reg_addr = DS1339_REG_ALARM1_SECS;
+        ds1307->msg[1].flags = I2C_M_RD;
+        ds1307->msg[1].len = 9;
+
+        ret = i2c_transfer(to_i2c_adapter(client->dev.parent),
+                        ds1307->msg, 2);
+        if (ret != 2) {
+                dev_err(dev, "%s error %d\n", "alarm read", ret);
+                return -EIO;
+        }
+
+        dev_dbg(dev, "%s: %02x %02x %02x %02x, %02x %02x %02x, %02x %02x\n",
+                        "alarm read",
+                        ds1307->regs[0], ds1307->regs[1],
+                        ds1307->regs[2], ds1307->regs[3],
+                        ds1307->regs[4], ds1307->regs[5],
+                        ds1307->regs[6], ds1307->regs[7],
+                        ds1307->regs[8]);
+
+        /* report alarm time (ALARM1); assume 24 hour and day-of-month modes,
+         * and that all four fields are checked matches
+         */
+        t->time.tm_sec = bcd2bin(ds1307->regs[0] & 0x7f);
+        t->time.tm_min = bcd2bin(ds1307->regs[1] & 0x7f);
+        t->time.tm_hour = bcd2bin(ds1307->regs[2] & 0x3f);
+        t->time.tm_mday = bcd2bin(ds1307->regs[3] & 0x3f);
+        t->time.tm_mon = -1;
+        t->time.tm_year = -1;
+        t->time.tm_wday = -1;
+        t->time.tm_yday = -1;
+        t->time.tm_isdst = -1;
+
+        /* ... and status */
+        t->enabled = !!(ds1307->regs[7] & DS1337_BIT_A1IE);
+        t->pending = !!(ds1307->regs[8] & DS1337_BIT_A1I);
+
+        dev_dbg(dev, "%s secs=%d, mins=%d, "
+                "hours=%d, mday=%d, enabled=%d, pending=%d\n",
+                "alarm read", t->time.tm_sec, t->time.tm_min,
+                t->time.tm_hour, t->time.tm_mday,
+                t->enabled, t->pending);
+
+        return 0;
+}
+
+static int ds1307_set_alarm(struct device *dev, struct rtc_wkalrm *t)
+{
+        struct i2c_client       *client = to_i2c_client(dev);
+        struct ds1307           *ds1307 = i2c_get_clientdata(client);
+        unsigned char           *buf = ds1307->regs;
+        u8                      control, status;
+        int                     ret;
+
+        if (!test_bit(HAS_ALARM, &ds1307->flags))
+                return -EINVAL;
+
+        dev_dbg(dev, "%s secs=%d, mins=%d, "
+                "hours=%d, mday=%d, enabled=%d, pending=%d\n",
+                "alarm set", t->time.tm_sec, t->time.tm_min,
+                t->time.tm_hour, t->time.tm_mday,
+                t->enabled, t->pending);
+
+        /* read current status of both alarms and the chip */
+        ds1307->reg_addr = DS1339_REG_ALARM1_SECS;
+        ds1307->msg[1].flags = I2C_M_RD;
+        ds1307->msg[1].len = 9;
+
+        ret = i2c_transfer(to_i2c_adapter(client->dev.parent),
+                        ds1307->msg, 2);
+        if (ret != 2) {
+                dev_err(dev, "%s error %d\n", "alarm write", ret);
+                return -EIO;
+        }
+        control = ds1307->regs[7];
+        status = ds1307->regs[8];
+
+        dev_dbg(dev, "%s: %02x %02x %02x %02x, %02x %02x %02x, %02x %02x\n",
+                        "alarm set (old status)",
+                        ds1307->regs[0], ds1307->regs[1],
+                        ds1307->regs[2], ds1307->regs[3],
+                        ds1307->regs[4], ds1307->regs[5],
+                        ds1307->regs[6], control, status);
+
+        /* set ALARM1, using 24 hour and day-of-month modes */
+        *buf++ = DS1339_REG_ALARM1_SECS;        /* first register addr */
+        buf[0] = bin2bcd(t->time.tm_sec);
+        buf[1] = bin2bcd(t->time.tm_min);
+        buf[2] = bin2bcd(t->time.tm_hour);
+        buf[3] = bin2bcd(t->time.tm_mday);
+
+        /* set ALARM2 to non-garbage */
+        buf[4] = 0;
+        buf[5] = 0;
+        buf[6] = 0;
+
+        /* optionally enable ALARM1 */
+        buf[7] = control & ~(DS1337_BIT_A1IE | DS1337_BIT_A2IE);
+        if (t->enabled) {
+                dev_dbg(dev, "alarm IRQ armed\n");
+                buf[7] |= DS1337_BIT_A1IE;      /* only ALARM1 is used */
+        }
+        buf[8] = status & ~(DS1337_BIT_A1I | DS1337_BIT_A2I);
+
+        ds1307->msg[1].flags = 0;
+        ds1307->msg[1].len = 10;
+
+        ret = i2c_transfer(to_i2c_adapter(client->dev.parent),
+                        &ds1307->msg[1], 1);
+        if (ret != 1) {
+                dev_err(dev, "can't set alarm time\n");
+                return -EIO;
+        }
+
+        return 0;
+}
+
+static int ds1307_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
+{
+        struct i2c_client       *client = to_i2c_client(dev);
+        struct ds1307           *ds1307 = i2c_get_clientdata(client);
+        int                     ret;
+
+        switch (cmd) {
+        case RTC_AIE_OFF:
+                if (!test_bit(HAS_ALARM, &ds1307->flags))
+                        return -ENOTTY;
+
+                ret = i2c_smbus_read_byte_data(client, DS1337_REG_CONTROL);
+                if (ret < 0)
+                        return ret;
+
+                ret &= ~DS1337_BIT_A1IE;
+
+                ret = i2c_smbus_write_byte_data(client,
+                                                DS1337_REG_CONTROL, ret);
+                if (ret < 0)
+                        return ret;
+
+                break;
+
+        case RTC_AIE_ON:
+                if (!test_bit(HAS_ALARM, &ds1307->flags))
+                        return -ENOTTY;
+
+                ret = i2c_smbus_read_byte_data(client, DS1337_REG_CONTROL);
+                if (ret < 0)
+                        return ret;
+
+                ret |= DS1337_BIT_A1IE;
+
+                ret = i2c_smbus_write_byte_data(client,
+                                                DS1337_REG_CONTROL, ret);
+                if (ret < 0)
+                        return ret;
+
+                break;
+
+        default:
+                return -ENOIOCTLCMD;
+        }
+
+        return 0;
+}
+
 static const struct rtc_class_ops ds13xx_rtc_ops = {
         .read_time      = ds1307_get_time,
         .set_time       = ds1307_set_time,
+        .read_alarm     = ds1307_read_alarm,
+        .set_alarm      = ds1307_set_alarm,
+        .ioctl          = ds1307_ioctl,
 };
 
 /*----------------------------------------------------------------------*/
@@ -327,6 +571,7 @@ static int __devinit ds1307_probe(struct i2c_client *client,
         int                     tmp;
         const struct chip_desc  *chip = &chips[id->driver_data];
         struct i2c_adapter      *adapter = to_i2c_adapter(client->dev.parent);
+        int                     want_irq = false;
 
         if (!i2c_check_functionality(adapter,
                         I2C_FUNC_I2C | I2C_FUNC_SMBUS_WRITE_BYTE_DATA))
@@ -353,6 +598,12 @@ static int __devinit ds1307_probe(struct i2c_client *client,
         switch (ds1307->type) {
         case ds_1337:
         case ds_1339:
+                /* has IRQ? */
+                if (ds1307->client->irq > 0 && chip->alarm) {
+                        INIT_WORK(&ds1307->work, ds1307_work);
+                        want_irq = true;
+                }
+
                 ds1307->reg_addr = DS1337_REG_CONTROL;
                 ds1307->msg[1].len = 2;
 
@@ -369,8 +620,20 @@ static int __devinit ds1307_probe(struct i2c_client *client,
 
                 /* oscillator off?  turn it on, so clock can tick. */
                 if (ds1307->regs[0] & DS1337_BIT_nEOSC)
-                        i2c_smbus_write_byte_data(client, DS1337_REG_CONTROL,
-                                ds1307->regs[0] & ~DS1337_BIT_nEOSC);
+                        ds1307->regs[0] &= ~DS1337_BIT_nEOSC;
+
+                /* Using IRQ?  Disable the square wave and both alarms.
+                 * For ds1339, be sure alarms can trigger when we're
+                 * running on Vbackup (BBSQI); we assume ds1337 will
+                 * ignore that bit
+                 */
+                if (want_irq) {
+                        ds1307->regs[0] |= DS1337_BIT_INTCN | DS1339_BIT_BBSQI;
+                        ds1307->regs[0] &= ~(DS1337_BIT_A2IE | DS1337_BIT_A1IE);
+                }
+
+                i2c_smbus_write_byte_data(client, DS1337_REG_CONTROL,
+                                                        ds1307->regs[0]);
 
                 /* oscillator fault?  clear flag, and warn */
                 if (ds1307->regs[1] & DS1337_BIT_OSF) {
@@ -495,10 +758,22 @@ read_rtc:
                 goto exit_free;
         }
 
+        if (want_irq) {
+                err = request_irq(client->irq, ds1307_irq, 0,
+                          ds1307->rtc->name, client);
+                if (err) {
+                        dev_err(&client->dev,
+                                "unable to request IRQ!\n");
+                        goto exit_irq;
+                }
+                set_bit(HAS_ALARM, &ds1307->flags);
+                dev_dbg(&client->dev, "got IRQ %d\n", client->irq);
+        }
+
         if (chip->nvram56) {
                 err = sysfs_create_bin_file(&client->dev.kobj, &nvram);
                 if (err == 0) {
-                        ds1307->has_nvram = true;
+                        set_bit(HAS_NVRAM, &ds1307->flags);
                         dev_info(&client->dev, "56 bytes nvram\n");
                 }
         }
@@ -512,7 +787,9 @@ exit_bad:
                         ds1307->regs[2], ds1307->regs[3],
                         ds1307->regs[4], ds1307->regs[5],
                         ds1307->regs[6]);
-
+exit_irq:
+        if (ds1307->rtc)
+                rtc_device_unregister(ds1307->rtc);
 exit_free:
         kfree(ds1307);
         return err;
@@ -520,9 +797,14 @@ exit_free:
 
 static int __devexit ds1307_remove(struct i2c_client *client)
 {
-        struct ds1307   *ds1307 = i2c_get_clientdata(client);
+        struct ds1307           *ds1307 = i2c_get_clientdata(client);
+
+        if (test_and_clear_bit(HAS_ALARM, &ds1307->flags)) {
+                free_irq(client->irq, client);
+                cancel_work_sync(&ds1307->work);
+        }
 
-        if (ds1307->has_nvram)
+        if (test_and_clear_bit(HAS_NVRAM, &ds1307->flags))
                 sysfs_remove_bin_file(&client->dev.kobj, &nvram);
 
         rtc_device_unregister(ds1307->rtc);
diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c
index a150418fba76..a5b0fc09f0c6 100644
--- a/drivers/rtc/rtc-ds1374.c
+++ b/drivers/rtc/rtc-ds1374.c
@@ -429,12 +429,33 @@ static int __devexit ds1374_remove(struct i2c_client *client)
         return 0;
 }
 
+#ifdef CONFIG_PM
+static int ds1374_suspend(struct i2c_client *client, pm_message_t state)
+{
+        if (client->irq >= 0 && device_may_wakeup(&client->dev))
+                enable_irq_wake(client->irq);
+        return 0;
+}
+
+static int ds1374_resume(struct i2c_client *client)
+{
+        if (client->irq >= 0 && device_may_wakeup(&client->dev))
+                disable_irq_wake(client->irq);
+        return 0;
+}
+#else
+#define ds1374_suspend  NULL
+#define ds1374_resume   NULL
+#endif
+
 static struct i2c_driver ds1374_driver = {
         .driver = {
                 .name = "rtc-ds1374",
                 .owner = THIS_MODULE,
         },
         .probe = ds1374_probe,
+        .suspend = ds1374_suspend,
+        .resume = ds1374_resume,
         .remove = __devexit_p(ds1374_remove),
         .id_table = ds1374_id,
 };
diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c
index 0f0d27d1c4ca..86981d34fbb6 100644
--- a/drivers/rtc/rtc-ds1511.c
+++ b/drivers/rtc/rtc-ds1511.c
@@ -379,18 +379,6 @@ ds1511_interrupt(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
- static void
-ds1511_rtc_release(struct device *dev)
-{
-        struct platform_device *pdev = to_platform_device(dev);
-        struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
-
-        if (pdata->irq >= 0) {
-                pdata->irqen = 0;
-                ds1511_rtc_update_alarm(pdata);
-        }
-}
-
  static int
 ds1511_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
 {
@@ -428,7 +416,6 @@ static const struct rtc_class_ops ds1511_rtc_ops = {
         .set_time       = ds1511_rtc_set_time,
         .read_alarm     = ds1511_rtc_read_alarm,
         .set_alarm      = ds1511_rtc_set_alarm,
-        .release        = ds1511_rtc_release,
         .ioctl          = ds1511_rtc_ioctl,
 };
 
diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c
index a19f11415540..4ef59285b489 100644
--- a/drivers/rtc/rtc-ds1553.c
+++ b/drivers/rtc/rtc-ds1553.c
@@ -207,17 +207,6 @@ static irqreturn_t ds1553_rtc_interrupt(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static void ds1553_rtc_release(struct device *dev)
-{
-        struct platform_device *pdev = to_platform_device(dev);
-        struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
-
-        if (pdata->irq >= 0) {
-                pdata->irqen = 0;
-                ds1553_rtc_update_alarm(pdata);
-        }
-}
-
 static int ds1553_rtc_ioctl(struct device *dev, unsigned int cmd,
                             unsigned long arg)
 {
@@ -254,7 +243,6 @@ static const struct rtc_class_ops ds1553_rtc_ops = {
         .set_time       = ds1553_rtc_set_time,
         .read_alarm     = ds1553_rtc_read_alarm,
         .set_alarm      = ds1553_rtc_set_alarm,
-        .release        = ds1553_rtc_release,
         .ioctl          = ds1553_rtc_ioctl,
 };
 
diff --git a/drivers/rtc/rtc-ds1672.c b/drivers/rtc/rtc-ds1672.c
index 6fa4556f5f5c..341d7a5b45a2 100644
--- a/drivers/rtc/rtc-ds1672.c
+++ b/drivers/rtc/rtc-ds1672.c
@@ -9,17 +9,10 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/module.h>
 #include <linux/i2c.h>
 #include <linux/rtc.h>
 
-#define DRV_VERSION "0.3"
-
-/* Addresses to scan: none. This chip cannot be detected. */
-static const unsigned short normal_i2c[] = { I2C_CLIENT_END };
-
-/* Insmod parameters */
-I2C_CLIENT_INSMOD;
+#define DRV_VERSION "0.4"
 
 /* Registers */
 
@@ -29,8 +22,7 @@ I2C_CLIENT_INSMOD;
 
 #define DS1672_REG_CONTROL_EOSC 0x80
 
-/* Prototypes */
-static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind);
+static struct i2c_driver ds1672_driver;
 
 /*
  * In the routines that deal directly with the ds1672 hardware, we use
@@ -44,8 +36,8 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm)
         unsigned char buf[4];
 
         struct i2c_msg msgs[] = {
-                { client->addr, 0, 1, &addr },          /* setup read ptr */
-                { client->addr, I2C_M_RD, 4, buf },     /* read date */
+                {client->addr, 0, 1, &addr},    /* setup read ptr */
+                {client->addr, I2C_M_RD, 4, buf},       /* read date */
         };
 
         /* read date registers */
@@ -80,7 +72,7 @@ static int ds1672_set_mmss(struct i2c_client *client, unsigned long secs)
         buf[2] = (secs & 0x0000FF00) >> 8;
         buf[3] = (secs & 0x00FF0000) >> 16;
         buf[4] = (secs & 0xFF000000) >> 24;
-        buf[5] = 0;     /* set control reg to enable counting */
+        buf[5] = 0;             /* set control reg to enable counting */
 
         xfer = i2c_master_send(client, buf, 6);
         if (xfer != 6) {
@@ -127,8 +119,8 @@ static int ds1672_get_control(struct i2c_client *client, u8 *status)
         unsigned char addr = DS1672_REG_CONTROL;
 
         struct i2c_msg msgs[] = {
-                { client->addr, 0, 1, &addr },          /* setup read ptr */
-                { client->addr, I2C_M_RD, 1, status },  /* read control */
+                {client->addr, 0, 1, &addr},    /* setup read ptr */
+                {client->addr, I2C_M_RD, 1, status},    /* read control */
         };
 
         /* read control register */
@@ -141,7 +133,8 @@ static int ds1672_get_control(struct i2c_client *client, u8 *status)
 }
 
 /* following are the sysfs callback functions */
-static ssize_t show_control(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_control(struct device *dev, struct device_attribute *attr,
+                            char *buf)
 {
         struct i2c_client *client = to_i2c_client(dev);
         u8 control;
@@ -152,85 +145,46 @@ static ssize_t show_control(struct device *dev, struct device_attribute *attr, c
                 return err;
 
         return sprintf(buf, "%s\n", (control & DS1672_REG_CONTROL_EOSC)
-                                        ? "disabled" : "enabled");
+                       ? "disabled" : "enabled");
 }
+
 static DEVICE_ATTR(control, S_IRUGO, show_control, NULL);
 
 static const struct rtc_class_ops ds1672_rtc_ops = {
-        .read_time      = ds1672_rtc_read_time,
-        .set_time       = ds1672_rtc_set_time,
-        .set_mmss       = ds1672_rtc_set_mmss,
+        .read_time = ds1672_rtc_read_time,
+        .set_time = ds1672_rtc_set_time,
+        .set_mmss = ds1672_rtc_set_mmss,
 };
 
-static int ds1672_attach(struct i2c_adapter *adapter)
+static int ds1672_remove(struct i2c_client *client)
 {
-        return i2c_probe(adapter, &addr_data, ds1672_probe);
-}
-
-static int ds1672_detach(struct i2c_client *client)
-{
-        int err;
         struct rtc_device *rtc = i2c_get_clientdata(client);
 
-        if (rtc)
+        if (rtc)
                 rtc_device_unregister(rtc);
 
-        if ((err = i2c_detach_client(client)))
-                return err;
-
-        kfree(client);
-
         return 0;
 }
 
-static struct i2c_driver ds1672_driver = {
-        .driver         = {
-                .name   = "ds1672",
-        },
-        .id             = I2C_DRIVERID_DS1672,
-        .attach_adapter = &ds1672_attach,
-        .detach_client  = &ds1672_detach,
-};
-
-static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind)
+static int ds1672_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
 {
         int err = 0;
         u8 control;
-        struct i2c_client *client;
         struct rtc_device *rtc;
 
-        dev_dbg(&adapter->dev, "%s\n", __func__);
+        dev_dbg(&client->dev, "%s\n", __func__);
 
-        if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
-                err = -ENODEV;
-                goto exit;
-        }
-
-        if (!(client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL))) {
-                err = -ENOMEM;
-                goto exit;
-        }
-
-        /* I2C client */
-        client->addr = address;
-        client->driver = &ds1672_driver;
-        client->adapter = adapter;
-
-        strlcpy(client->name, ds1672_driver.driver.name, I2C_NAME_SIZE);
-
-        /* Inform the i2c layer */
-        if ((err = i2c_attach_client(client)))
-                goto exit_kfree;
+        if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
+                return -ENODEV;
 
         dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");
 
         rtc = rtc_device_register(ds1672_driver.driver.name, &client->dev,
-                                &ds1672_rtc_ops, THIS_MODULE);
+                                  &ds1672_rtc_ops, THIS_MODULE);
 
-        if (IS_ERR(rtc)) {
-                err = PTR_ERR(rtc);
-                goto exit_detach;
-        }
+        if (IS_ERR(rtc))
+                return PTR_ERR(rtc);
 
         i2c_set_clientdata(client, rtc);
 
@@ -241,7 +195,7 @@ static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind)
 
         if (control & DS1672_REG_CONTROL_EOSC)
                 dev_warn(&client->dev, "Oscillator not enabled. "
-                                        "Set time to enable.\n");
+                         "Set time to enable.\n");
 
         /* Register sysfs hooks */
         err = device_create_file(&client->dev, &dev_attr_control);
@@ -250,19 +204,19 @@ static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
-exit_devreg:
+ exit_devreg:
         rtc_device_unregister(rtc);
-
-exit_detach:
-        i2c_detach_client(client);
-
-exit_kfree:
-        kfree(client);
-
-exit:
         return err;
 }
 
+static struct i2c_driver ds1672_driver = {
+        .driver = {
+                   .name = "rtc-ds1672",
+                   },
+        .probe = &ds1672_probe,
+        .remove = &ds1672_remove,
+};
+
 static int __init ds1672_init(void)
 {
         return i2c_add_driver(&ds1672_driver);
diff --git a/drivers/rtc/rtc-ds3234.c b/drivers/rtc/rtc-ds3234.c
new file mode 100644
index 000000000000..37d131d03f33
--- /dev/null
+++ b/drivers/rtc/rtc-ds3234.c
@@ -0,0 +1,290 @@
+/* drivers/rtc/rtc-ds3234.c
+ *
+ * Driver for Dallas Semiconductor (DS3234) SPI RTC with Integrated Crystal
+ * and SRAM.
+ *
+ * Copyright (C) 2008 MIMOMax Wireless Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Changelog:
+ *
+ * 07-May-2008: Dennis Aberilla <denzzzhome@yahoo.com>
+ *              - Created based on the max6902 code. Only implements the
+ *                date/time keeping functions; no SRAM yet.
+ */
+
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/rtc.h>
+#include <linux/spi/spi.h>
+#include <linux/bcd.h>
+
+#define DS3234_REG_SECONDS      0x00
+#define DS3234_REG_MINUTES      0x01
+#define DS3234_REG_HOURS        0x02
+#define DS3234_REG_DAY          0x03
+#define DS3234_REG_DATE         0x04
+#define DS3234_REG_MONTH        0x05
+#define DS3234_REG_YEAR         0x06
+#define DS3234_REG_CENTURY      (1 << 7) /* Bit 7 of the Month register */
+
+#define DS3234_REG_CONTROL      0x0E
+#define DS3234_REG_CONT_STAT    0x0F
+
+#undef DS3234_DEBUG
+
+struct ds3234 {
+        struct rtc_device *rtc;
+        u8 buf[8]; /* Burst read: addr + 7 regs */
+        u8 tx_buf[2];
+        u8 rx_buf[2];
+};
+
+static void ds3234_set_reg(struct device *dev, unsigned char address,
+                                unsigned char data)
+{
+        struct spi_device *spi = to_spi_device(dev);
+        unsigned char buf[2];
+
+        /* MSB must be '1' to indicate write */
+        buf[0] = address | 0x80;
+        buf[1] = data;
+
+        spi_write(spi, buf, 2);
+}
+
+static int ds3234_get_reg(struct device *dev, unsigned char address,
+                                unsigned char *data)
+{
+        struct spi_device *spi = to_spi_device(dev);
+        struct ds3234 *chip = dev_get_drvdata(dev);
+        struct spi_message message;
+        struct spi_transfer xfer;
+        int status;
+
+        if (!data)
+                return -EINVAL;
+
+        /* Build our spi message */
+        spi_message_init(&message);
+        memset(&xfer, 0, sizeof(xfer));
+
+        /* Address + dummy tx byte */
+        xfer.len = 2;
+        xfer.tx_buf = chip->tx_buf;
+        xfer.rx_buf = chip->rx_buf;
+
+        chip->tx_buf[0] = address;
+        chip->tx_buf[1] = 0xff;
+
+        spi_message_add_tail(&xfer, &message);
+
+        /* do the i/o */
+        status = spi_sync(spi, &message);
+        if (status == 0)
+                status = message.status;
+        else
+                return status;
+
+        *data = chip->rx_buf[1];
+
+        return status;
+}
+
+static int ds3234_get_datetime(struct device *dev, struct rtc_time *dt)
+{
+        struct spi_device *spi = to_spi_device(dev);
+        struct ds3234 *chip = dev_get_drvdata(dev);
+        struct spi_message message;
+        struct spi_transfer xfer;
+        int status;
+
+        /* build the message */
+        spi_message_init(&message);
+        memset(&xfer, 0, sizeof(xfer));
+        xfer.len = 1 + 7;       /* Addr + 7 registers */
+        xfer.tx_buf = chip->buf;
+        xfer.rx_buf = chip->buf;
+        chip->buf[0] = 0x00;    /* Start address */
+        spi_message_add_tail(&xfer, &message);
+
+        /* do the i/o */
+        status = spi_sync(spi, &message);
+        if (status == 0)
+                status = message.status;
+        else
+                return status;
+
+        /* Seconds, Minutes, Hours, Day, Date, Month, Year */
+        dt->tm_sec      = bcd2bin(chip->buf[1]);
+        dt->tm_min      = bcd2bin(chip->buf[2]);
+        dt->tm_hour     = bcd2bin(chip->buf[3] & 0x3f);
+        dt->tm_wday     = bcd2bin(chip->buf[4]) - 1; /* 0 = Sun */
+        dt->tm_mday     = bcd2bin(chip->buf[5]);
+        dt->tm_mon      = bcd2bin(chip->buf[6] & 0x1f) - 1; /* 0 = Jan */
+        dt->tm_year     = bcd2bin(chip->buf[7] & 0xff) + 100; /* Assume 20YY */
+
+#ifdef DS3234_DEBUG
+        dev_dbg(dev, "\n%s : Read RTC values\n", __func__);
+        dev_dbg(dev, "tm_hour: %i\n", dt->tm_hour);
+        dev_dbg(dev, "tm_min : %i\n", dt->tm_min);
+        dev_dbg(dev, "tm_sec : %i\n", dt->tm_sec);
+        dev_dbg(dev, "tm_wday: %i\n", dt->tm_wday);
+        dev_dbg(dev, "tm_mday: %i\n", dt->tm_mday);
+        dev_dbg(dev, "tm_mon : %i\n", dt->tm_mon);
+        dev_dbg(dev, "tm_year: %i\n", dt->tm_year);
+#endif
+
+        return 0;
+}
+
+static int ds3234_set_datetime(struct device *dev, struct rtc_time *dt)
+{
+#ifdef DS3234_DEBUG
+        dev_dbg(dev, "\n%s : Setting RTC values\n", __func__);
+        dev_dbg(dev, "tm_sec : %i\n", dt->tm_sec);
+        dev_dbg(dev, "tm_min : %i\n", dt->tm_min);
+        dev_dbg(dev, "tm_hour: %i\n", dt->tm_hour);
+        dev_dbg(dev, "tm_wday: %i\n", dt->tm_wday);
+        dev_dbg(dev, "tm_mday: %i\n", dt->tm_mday);
+        dev_dbg(dev, "tm_mon : %i\n", dt->tm_mon);
+        dev_dbg(dev, "tm_year: %i\n", dt->tm_year);
+#endif
+
+        ds3234_set_reg(dev, DS3234_REG_SECONDS, bin2bcd(dt->tm_sec));
+        ds3234_set_reg(dev, DS3234_REG_MINUTES, bin2bcd(dt->tm_min));
+        ds3234_set_reg(dev, DS3234_REG_HOURS, bin2bcd(dt->tm_hour) & 0x3f);
+
+        /* 0 = Sun */
+        ds3234_set_reg(dev, DS3234_REG_DAY, bin2bcd(dt->tm_wday + 1));
+        ds3234_set_reg(dev, DS3234_REG_DATE, bin2bcd(dt->tm_mday));
+
+        /* 0 = Jan */
+        ds3234_set_reg(dev, DS3234_REG_MONTH, bin2bcd(dt->tm_mon + 1));
+
+        /* Assume 20YY although we just want to make sure not to go negative. */
+        if (dt->tm_year > 100)
+                dt->tm_year -= 100;
+
+        ds3234_set_reg(dev, DS3234_REG_YEAR, bin2bcd(dt->tm_year));
+
+        return 0;
+}
+
+static int ds3234_read_time(struct device *dev, struct rtc_time *tm)
+{
+        return ds3234_get_datetime(dev, tm);
+}
+
+static int ds3234_set_time(struct device *dev, struct rtc_time *tm)
+{
+        return ds3234_set_datetime(dev, tm);
+}
+
+static const struct rtc_class_ops ds3234_rtc_ops = {
+        .read_time      = ds3234_read_time,
+        .set_time       = ds3234_set_time,
+};
+
+static int ds3234_probe(struct spi_device *spi)
+{
+        struct rtc_device *rtc;
+        unsigned char tmp;
+        struct ds3234 *chip;
+        int res;
+
+        rtc = rtc_device_register("ds3234",
+                                &spi->dev, &ds3234_rtc_ops, THIS_MODULE);
+        if (IS_ERR(rtc))
+                return PTR_ERR(rtc);
+
+        spi->mode = SPI_MODE_3;
+        spi->bits_per_word = 8;
+        spi_setup(spi);
+
+        chip = kzalloc(sizeof(struct ds3234), GFP_KERNEL);
+        if (!chip) {
+                rtc_device_unregister(rtc);
+                return -ENOMEM;
+        }
+        chip->rtc = rtc;
+        dev_set_drvdata(&spi->dev, chip);
+
+        res = ds3234_get_reg(&spi->dev, DS3234_REG_SECONDS, &tmp);
+        if (res) {
+                rtc_device_unregister(rtc);
+                return res;
+        }
+
+        /* Control settings
+         *
+         * CONTROL_REG
+         * BIT 7        6       5       4       3       2       1       0
+         *     EOSC     BBSQW   CONV    RS2     RS1     INTCN   A2IE    A1IE
+         *
+         *     0        0       0       1       1       1       0       0
+         *
+         * CONTROL_STAT_REG
+         * BIT 7        6       5       4       3       2       1       0
+         *     OSF      BB32kHz CRATE1  CRATE0  EN32kHz BSY     A2F     A1F
+         *
+         *     1        0       0       0       1       0       0       0
+         */
+        ds3234_get_reg(&spi->dev, DS3234_REG_CONTROL, &tmp);
+        ds3234_set_reg(&spi->dev, DS3234_REG_CONTROL, tmp & 0x1c);
+
+        ds3234_get_reg(&spi->dev, DS3234_REG_CONT_STAT, &tmp);
+        ds3234_set_reg(&spi->dev, DS3234_REG_CONT_STAT, tmp & 0x88);
+
+        /* Print our settings */
+        ds3234_get_reg(&spi->dev, DS3234_REG_CONTROL, &tmp);
+        dev_info(&spi->dev, "Control Reg: 0x%02x\n", tmp);
+
+        ds3234_get_reg(&spi->dev, DS3234_REG_CONT_STAT, &tmp);
+        dev_info(&spi->dev, "Ctrl/Stat Reg: 0x%02x\n", tmp);
+
+        return 0;
+}
+
+static int __exit ds3234_remove(struct spi_device *spi)
+{
+        struct ds3234 *chip = platform_get_drvdata(spi);
+        struct rtc_device *rtc = chip->rtc;
+
+        if (rtc)
+                rtc_device_unregister(rtc);
+
+        kfree(chip);
+
+        return 0;
+}
+
+static struct spi_driver ds3234_driver = {
+        .driver = {
+                .name    = "ds3234",
+                .bus    = &spi_bus_type,
+                .owner  = THIS_MODULE,
+        },
+        .probe   = ds3234_probe,
+        .remove = __devexit_p(ds3234_remove),
+};
+
+static __init int ds3234_init(void)
+{
+        printk(KERN_INFO "DS3234 SPI RTC Driver\n");
+        return spi_register_driver(&ds3234_driver);
+}
+module_init(ds3234_init);
+
+static __exit void ds3234_exit(void)
+{
+        spi_unregister_driver(&ds3234_driver);
+}
+module_exit(ds3234_exit);
+
+MODULE_DESCRIPTION("DS3234 SPI RTC driver");
+MODULE_AUTHOR("Dennis Aberilla <denzzzhome@yahoo.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c
index 24bc1689fc74..470fb2d29545 100644
--- a/drivers/rtc/rtc-m41t80.c
+++ b/drivers/rtc/rtc-m41t80.c
@@ -56,21 +56,27 @@
 #define M41T80_ALHOUR_HT        (1 << 6)        /* HT: Halt Update Bit */
 #define M41T80_FLAGS_AF         (1 << 6)        /* AF: Alarm Flag Bit */
 #define M41T80_FLAGS_BATT_LOW   (1 << 4)        /* BL: Battery Low Bit */
+#define M41T80_WATCHDOG_RB2     (1 << 7)        /* RB: Watchdog resolution */
+#define M41T80_WATCHDOG_RB1     (1 << 1)        /* RB: Watchdog resolution */
+#define M41T80_WATCHDOG_RB0     (1 << 0)        /* RB: Watchdog resolution */
 
-#define M41T80_FEATURE_HT       (1 << 0)
-#define M41T80_FEATURE_BL       (1 << 1)
+#define M41T80_FEATURE_HT       (1 << 0)        /* Halt feature */
+#define M41T80_FEATURE_BL       (1 << 1)        /* Battery low indicator */
+#define M41T80_FEATURE_SQ       (1 << 2)        /* Squarewave feature */
+#define M41T80_FEATURE_WD       (1 << 3)        /* Extra watchdog resolution */
 
 #define DRV_VERSION "0.05"
 
 static const struct i2c_device_id m41t80_id[] = {
-        { "m41t80", 0 },
-        { "m41t81", M41T80_FEATURE_HT },
-        { "m41t81s", M41T80_FEATURE_HT | M41T80_FEATURE_BL },
-        { "m41t82", M41T80_FEATURE_HT | M41T80_FEATURE_BL },
-        { "m41t83", M41T80_FEATURE_HT | M41T80_FEATURE_BL },
-        { "m41st84", M41T80_FEATURE_HT | M41T80_FEATURE_BL },
-        { "m41st85", M41T80_FEATURE_HT | M41T80_FEATURE_BL },
-        { "m41st87", M41T80_FEATURE_HT | M41T80_FEATURE_BL },
+        { "m41t65", M41T80_FEATURE_HT | M41T80_FEATURE_WD },
+        { "m41t80", M41T80_FEATURE_SQ },
+        { "m41t81", M41T80_FEATURE_HT | M41T80_FEATURE_SQ},
+        { "m41t81s", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },
+        { "m41t82", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },
+        { "m41t83", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },
+        { "m41st84", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },
+        { "m41st85", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },
+        { "m41st87", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, m41t80_id);
@@ -386,8 +392,12 @@ static ssize_t m41t80_sysfs_show_sqwfreq(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
         struct i2c_client *client = to_i2c_client(dev);
+        struct m41t80_data *clientdata = i2c_get_clientdata(client);
         int val;
 
+        if (!(clientdata->features & M41T80_FEATURE_SQ))
+                return -EINVAL;
+
         val = i2c_smbus_read_byte_data(client, M41T80_REG_SQW);
         if (val < 0)
                 return -EIO;
@@ -408,9 +418,13 @@ static ssize_t m41t80_sysfs_set_sqwfreq(struct device *dev,
                                 const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
+        struct m41t80_data *clientdata = i2c_get_clientdata(client);
         int almon, sqw;
         int val = simple_strtoul(buf, NULL, 0);
 
+        if (!(clientdata->features & M41T80_FEATURE_SQ))
+                return -EINVAL;
+
         if (val) {
                 if (!is_power_of_2(val))
                         return -EINVAL;
@@ -499,6 +513,8 @@ static void wdt_ping(void)
                         .buf    = i2c_data,
                 },
         };
+        struct m41t80_data *clientdata = i2c_get_clientdata(save_client);
+
         i2c_data[0] = 0x09;             /* watchdog register */
 
         if (wdt_margin > 31)
@@ -509,6 +525,13 @@ static void wdt_ping(void)
                  */
                 i2c_data[1] = wdt_margin<<2 | 0x82;
 
+        /*
+         * M41T65 has three bits for watchdog resolution.  Don't set bit 7, as
+         * that would be an invalid resolution.
+         */
+        if (clientdata->features & M41T80_FEATURE_WD)
+                i2c_data[1] &= ~M41T80_WATCHDOG_RB2;
+
         i2c_transfer(save_client->adapter, msgs1, 1);
 }
 
diff --git a/drivers/rtc/rtc-m48t35.c b/drivers/rtc/rtc-m48t35.c
new file mode 100644
index 000000000000..0b2197559940
--- /dev/null
+++ b/drivers/rtc/rtc-m48t35.c
@@ -0,0 +1,235 @@
+/*
+ * Driver for the SGS-Thomson M48T35 Timekeeper RAM chip
+ *
+ * Copyright (C) 2000 Silicon Graphics, Inc.
+ * Written by Ulf Carlsson (ulfc@engr.sgi.com)
+ *
+ * Copyright (C) 2008 Thomas Bogendoerfer
+ *
+ * Based on code written by Paul Gortmaker.
+ *
+ * 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.
+ */
+
+#include <linux/module.h>
+#include <linux/rtc.h>
+#include <linux/platform_device.h>
+#include <linux/bcd.h>
+#include <linux/io.h>
+
+#define DRV_VERSION             "1.0"
+
+struct m48t35_rtc {
+        u8      pad[0x7ff8];    /* starts at 0x7ff8 */
+        u8      control;
+        u8      sec;
+        u8      min;
+        u8      hour;
+        u8      day;
+        u8      date;
+        u8      month;
+        u8      year;
+};
+
+#define M48T35_RTC_SET          0x80
+#define M48T35_RTC_READ         0x40
+
+struct m48t35_priv {
+        struct rtc_device *rtc;
+        struct m48t35_rtc __iomem *reg;
+        size_t size;
+        unsigned long baseaddr;
+        spinlock_t lock;
+};
+
+static int m48t35_read_time(struct device *dev, struct rtc_time *tm)
+{
+        struct m48t35_priv *priv = dev_get_drvdata(dev);
+        u8 control;
+
+        /*
+         * Only the values that we read from the RTC are set. We leave
+         * tm_wday, tm_yday and tm_isdst untouched. Even though the
+         * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
+         * by the RTC when initially set to a non-zero value.
+         */
+        spin_lock_irq(&priv->lock);
+        control = readb(&priv->reg->control);
+        writeb(control | M48T35_RTC_READ, &priv->reg->control);
+        tm->tm_sec = readb(&priv->reg->sec);
+        tm->tm_min = readb(&priv->reg->min);
+        tm->tm_hour = readb(&priv->reg->hour);
+        tm->tm_mday = readb(&priv->reg->date);
+        tm->tm_mon = readb(&priv->reg->month);
+        tm->tm_year = readb(&priv->reg->year);
+        writeb(control, &priv->reg->control);
+        spin_unlock_irq(&priv->lock);
+
+        tm->tm_sec = bcd2bin(tm->tm_sec);
+        tm->tm_min = bcd2bin(tm->tm_min);
+        tm->tm_hour = bcd2bin(tm->tm_hour);
+        tm->tm_mday = bcd2bin(tm->tm_mday);
+        tm->tm_mon = bcd2bin(tm->tm_mon);
+        tm->tm_year = bcd2bin(tm->tm_year);
+
+        /*
+         * Account for differences between how the RTC uses the values
+         * and how they are defined in a struct rtc_time;
+         */
+        tm->tm_year += 70;
+        if (tm->tm_year <= 69)
+                tm->tm_year += 100;
+
+        tm->tm_mon--;
+        return rtc_valid_tm(tm);
+}
+
+static int m48t35_set_time(struct device *dev, struct rtc_time *tm)
+{
+        struct m48t35_priv *priv = dev_get_drvdata(dev);
+        unsigned char mon, day, hrs, min, sec;
+        unsigned int yrs;
+        u8 control;
+
+        yrs = tm->tm_year + 1900;
+        mon = tm->tm_mon + 1;   /* tm_mon starts at zero */
+        day = tm->tm_mday;
+        hrs = tm->tm_hour;
+        min = tm->tm_min;
+        sec = tm->tm_sec;
+
+        if (yrs < 1970)
+                return -EINVAL;
+
+        yrs -= 1970;
+        if (yrs > 255)    /* They are unsigned */
+                return -EINVAL;
+
+        if (yrs > 169)
+                return -EINVAL;
+
+        if (yrs >= 100)
+                yrs -= 100;
+
+        sec = bin2bcd(sec);
+        min = bin2bcd(min);
+        hrs = bin2bcd(hrs);
+        day = bin2bcd(day);
+        mon = bin2bcd(mon);
+        yrs = bin2bcd(yrs);
+
+        spin_lock_irq(&priv->lock);
+        control = readb(&priv->reg->control);
+        writeb(control | M48T35_RTC_SET, &priv->reg->control);
+        writeb(yrs, &priv->reg->year);
+        writeb(mon, &priv->reg->month);
+        writeb(day, &priv->reg->date);
+        writeb(hrs, &priv->reg->hour);
+        writeb(min, &priv->reg->min);
+        writeb(sec, &priv->reg->sec);
+        writeb(control, &priv->reg->control);
+        spin_unlock_irq(&priv->lock);
+        return 0;
+}
+
+static const struct rtc_class_ops m48t35_ops = {
+        .read_time      = m48t35_read_time,
+        .set_time       = m48t35_set_time,
+};
+
+static int __devinit m48t35_probe(struct platform_device *pdev)
+{
+        struct rtc_device *rtc;
+        struct resource *res;
+        struct m48t35_priv *priv;
+        int ret = 0;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res)
+                return -ENODEV;
+        priv = kzalloc(sizeof(struct m48t35_priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        priv->size = res->end - res->start + 1;
+        /*
+         * kludge: remove the #ifndef after ioc3 resource
+         * conflicts are resolved
+         */
+#ifndef CONFIG_SGI_IP27
+        if (!request_mem_region(res->start, priv->size, pdev->name)) {
+                ret = -EBUSY;
+                goto out;
+        }
+#endif
+        priv->baseaddr = res->start;
+        priv->reg = ioremap(priv->baseaddr, priv->size);
+        if (!priv->reg) {
+                ret = -ENOMEM;
+                goto out;
+        }
+        spin_lock_init(&priv->lock);
+        rtc = rtc_device_register("m48t35", &pdev->dev,
+                                  &m48t35_ops, THIS_MODULE);
+        if (IS_ERR(rtc)) {
+                ret = PTR_ERR(rtc);
+                goto out;
+        }
+        priv->rtc = rtc;
+        platform_set_drvdata(pdev, priv);
+        return 0;
+
+out:
+        if (priv->rtc)
+                rtc_device_unregister(priv->rtc);
+        if (priv->reg)
+                iounmap(priv->reg);
+        if (priv->baseaddr)
+                release_mem_region(priv->baseaddr, priv->size);
+        kfree(priv);
+        return ret;
+}
+
+static int __devexit m48t35_remove(struct platform_device *pdev)
+{
+        struct m48t35_priv *priv = platform_get_drvdata(pdev);
+
+        rtc_device_unregister(priv->rtc);
+        iounmap(priv->reg);
+#ifndef CONFIG_SGI_IP27
+        release_mem_region(priv->baseaddr, priv->size);
+#endif
+        kfree(priv);
+        return 0;
+}
+
+static struct platform_driver m48t35_platform_driver = {
+        .driver         = {
+                .name   = "rtc-m48t35",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = m48t35_probe,
+        .remove         = __devexit_p(m48t35_remove),
+};
+
+static int __init m48t35_init(void)
+{
+        return platform_driver_register(&m48t35_platform_driver);
+}
+
+static void __exit m48t35_exit(void)
+{
+        platform_driver_unregister(&m48t35_platform_driver);
+}
+
+MODULE_AUTHOR("Thomas Bogendoerfer <tsbogend@alpha.franken.de>");
+MODULE_DESCRIPTION("M48T35 RTC driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
+MODULE_ALIAS("platform:rtc-m48t35");
+
+module_init(m48t35_init);
+module_exit(m48t35_exit);
diff --git a/drivers/rtc/rtc-max6900.c b/drivers/rtc/rtc-max6900.c
index ded3c0abad83..12c9cd25cad8 100644
--- a/drivers/rtc/rtc-max6900.c
+++ b/drivers/rtc/rtc-max6900.c
@@ -17,19 +17,18 @@
 #include <linux/rtc.h>
 #include <linux/delay.h>
 
-#define DRV_NAME "max6900"
-#define DRV_VERSION "0.1"
+#define DRV_VERSION "0.2"
 
 /*
  * register indices
  */
-#define MAX6900_REG_SC                  0       /* seconds      00-59 */
-#define MAX6900_REG_MN                  1       /* minutes      00-59 */
-#define MAX6900_REG_HR                  2       /* hours        00-23 */
-#define MAX6900_REG_DT                  3       /* day of month 00-31 */
-#define MAX6900_REG_MO                  4       /* month        01-12 */
-#define MAX6900_REG_DW                  5       /* day of week   1-7  */
-#define MAX6900_REG_YR                  6       /* year         00-99 */
+#define MAX6900_REG_SC                  0       /* seconds      00-59 */
+#define MAX6900_REG_MN                  1       /* minutes      00-59 */
+#define MAX6900_REG_HR                  2       /* hours        00-23 */
+#define MAX6900_REG_DT                  3       /* day of month 00-31 */
+#define MAX6900_REG_MO                  4       /* month        01-12 */
+#define MAX6900_REG_DW                  5       /* day of week   1-7  */
+#define MAX6900_REG_YR                  6       /* year         00-99 */
 #define MAX6900_REG_CT                  7       /* control */
                                                 /* register 8 is undocumented */
 #define MAX6900_REG_CENTURY             9       /* century */
@@ -39,7 +38,6 @@
 
 #define MAX6900_REG_CT_WP               (1 << 7)        /* Write Protect */
 
-
 /*
  * register read/write commands
  */
@@ -52,16 +50,7 @@
 
 #define MAX6900_IDLE_TIME_AFTER_WRITE   3       /* specification says 2.5 mS */
 
-#define MAX6900_I2C_ADDR                0xa0
-
-static const unsigned short normal_i2c[] = {
-        MAX6900_I2C_ADDR >> 1,
-        I2C_CLIENT_END
-};
-
-I2C_CLIENT_INSMOD;                      /* defines addr_data */
-
-static int max6900_probe(struct i2c_adapter *adapter, int addr, int kind);
+static struct i2c_driver max6900_driver;
 
 static int max6900_i2c_read_regs(struct i2c_client *client, u8 *buf)
 {
@@ -69,36 +58,35 @@ static int max6900_i2c_read_regs(struct i2c_client *client, u8 *buf)
         u8 reg_century_read[1] = { MAX6900_REG_CENTURY_READ };
         struct i2c_msg msgs[4] = {
                 {
-                        .addr   = client->addr,
-                        .flags  = 0, /* write */
-                        .len    = sizeof(reg_burst_read),
-                        .buf    = reg_burst_read
-                },
+                 .addr = client->addr,
+                 .flags = 0,    /* write */
+                 .len = sizeof(reg_burst_read),
+                 .buf = reg_burst_read}
+                ,
                 {
-                        .addr   = client->addr,
-                        .flags  = I2C_M_RD,
-                        .len    = MAX6900_BURST_LEN,
-                        .buf    = buf
-                },
+                 .addr = client->addr,
+                 .flags = I2C_M_RD,
+                 .len = MAX6900_BURST_LEN,
+                 .buf = buf}
+                ,
                 {
-                        .addr   = client->addr,
-                        .flags  = 0, /* write */
-                        .len    = sizeof(reg_century_read),
-                        .buf    = reg_century_read
-                },
+                 .addr = client->addr,
+                 .flags = 0,    /* write */
+                 .len = sizeof(reg_century_read),
+                 .buf = reg_century_read}
+                ,
                 {
-                        .addr   = client->addr,
-                        .flags  = I2C_M_RD,
-                        .len    = sizeof(buf[MAX6900_REG_CENTURY]),
-                        .buf    = &buf[MAX6900_REG_CENTURY]
-                }
+                 .addr = client->addr,
+                 .flags = I2C_M_RD,
+                 .len = sizeof(buf[MAX6900_REG_CENTURY]),
+                 .buf = &buf[MAX6900_REG_CENTURY]
+                 }
         };
         int rc;
 
         rc = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
         if (rc != ARRAY_SIZE(msgs)) {
-                dev_err(&client->dev, "%s: register read failed\n",
-                        __func__);
+                dev_err(&client->dev, "%s: register read failed\n", __func__);
                 return -EIO;
         }
         return 0;
@@ -109,20 +97,18 @@ static int max6900_i2c_write_regs(struct i2c_client *client, u8 const *buf)
         u8 i2c_century_buf[1 + 1] = { MAX6900_REG_CENTURY_WRITE };
         struct i2c_msg century_msgs[1] = {
                 {
-                        .addr   = client->addr,
-                        .flags  = 0, /* write */
-                        .len    = sizeof(i2c_century_buf),
-                        .buf    = i2c_century_buf
-                }
+                 .addr = client->addr,
+                 .flags = 0,    /* write */
+                 .len = sizeof(i2c_century_buf),
+                 .buf = i2c_century_buf}
         };
         u8 i2c_burst_buf[MAX6900_BURST_LEN + 1] = { MAX6900_REG_BURST_WRITE };
         struct i2c_msg burst_msgs[1] = {
                 {
-                        .addr   = client->addr,
-                        .flags  = 0, /* write */
-                        .len    = sizeof(i2c_burst_buf),
-                        .buf    = i2c_burst_buf
-                }
+                 .addr = client->addr,
+                 .flags = 0,    /* write */
+                 .len = sizeof(i2c_burst_buf),
+                 .buf = i2c_burst_buf}
         };
         int rc;
 
@@ -133,10 +119,12 @@ static int max6900_i2c_write_regs(struct i2c_client *client, u8 const *buf)
          * bit as part of the burst write.
          */
         i2c_century_buf[1] = buf[MAX6900_REG_CENTURY];
+
         rc = i2c_transfer(client->adapter, century_msgs,
                           ARRAY_SIZE(century_msgs));
         if (rc != ARRAY_SIZE(century_msgs))
                 goto write_failed;
+
         msleep(MAX6900_IDLE_TIME_AFTER_WRITE);
 
         memcpy(&i2c_burst_buf[1], buf, MAX6900_BURST_LEN);
@@ -148,45 +136,11 @@ static int max6900_i2c_write_regs(struct i2c_client *client, u8 const *buf)
 
         return 0;
 
-write_failed:
-        dev_err(&client->dev, "%s: register write failed\n",
-                __func__);
+ write_failed:
+        dev_err(&client->dev, "%s: register write failed\n", __func__);
         return -EIO;
 }
 
-static int max6900_i2c_validate_client(struct i2c_client *client)
-{
-        u8 regs[MAX6900_REG_LEN];
-        u8 zero_mask[] = {
-                0x80,   /* seconds */
-                0x80,   /* minutes */
-                0x40,   /* hours */
-                0xc0,   /* day of month */
-                0xe0,   /* month */
-                0xf8,   /* day of week */
-                0x00,   /* year */
-                0x7f,   /* control */
-        };
-        int i;
-        int rc;
-        int reserved;
-
-        reserved = i2c_smbus_read_byte_data(client, MAX6900_REG_RESERVED_READ);
-        if (reserved != 0x07)
-                return -ENODEV;
-
-        rc = max6900_i2c_read_regs(client, regs);
-        if (rc < 0)
-                return rc;
-
-        for (i = 0; i < ARRAY_SIZE(zero_mask); ++i) {
-                if (regs[i] & zero_mask[i])
-                        return -ENODEV;
-        }
-
-        return 0;
-}
-
 static int max6900_i2c_read_time(struct i2c_client *client, struct rtc_time *tm)
 {
         int rc;
@@ -202,7 +156,7 @@ static int max6900_i2c_read_time(struct i2c_client *client, struct rtc_time *tm)
         tm->tm_mday = BCD2BIN(regs[MAX6900_REG_DT]);
         tm->tm_mon = BCD2BIN(regs[MAX6900_REG_MO]) - 1;
         tm->tm_year = BCD2BIN(regs[MAX6900_REG_YR]) +
-                      BCD2BIN(regs[MAX6900_REG_CENTURY]) * 100 - 1900;
+            BCD2BIN(regs[MAX6900_REG_CENTURY]) * 100 - 1900;
         tm->tm_wday = BCD2BIN(regs[MAX6900_REG_DW]);
 
         return 0;
@@ -211,7 +165,7 @@ static int max6900_i2c_read_time(struct i2c_client *client, struct rtc_time *tm)
 static int max6900_i2c_clear_write_protect(struct i2c_client *client)
 {
         int rc;
-        rc = i2c_smbus_write_byte_data (client, MAX6900_REG_CONTROL_WRITE, 0);
+        rc = i2c_smbus_write_byte_data(client, MAX6900_REG_CONTROL_WRITE, 0);
         if (rc < 0) {
                 dev_err(&client->dev, "%s: control register write failed\n",
                         __func__);
@@ -220,8 +174,8 @@ static int max6900_i2c_clear_write_protect(struct i2c_client *client)
         return 0;
 }
 
-static int max6900_i2c_set_time(struct i2c_client *client,
-                                struct rtc_time const *tm)
+static int
+max6900_i2c_set_time(struct i2c_client *client, struct rtc_time const *tm)
 {
         u8 regs[MAX6900_REG_LEN];
         int rc;
@@ -258,89 +212,49 @@ static int max6900_rtc_set_time(struct device *dev, struct rtc_time *tm)
         return max6900_i2c_set_time(to_i2c_client(dev), tm);
 }
 
-static int max6900_attach_adapter(struct i2c_adapter *adapter)
-{
-        return i2c_probe(adapter, &addr_data, max6900_probe);
-}
-
-static int max6900_detach_client(struct i2c_client *client)
+static int max6900_remove(struct i2c_client *client)
 {
-        struct rtc_device *const rtc = i2c_get_clientdata(client);
+        struct rtc_device *rtc = i2c_get_clientdata(client);
 
         if (rtc)
                 rtc_device_unregister(rtc);
 
-        return i2c_detach_client(client);
+        return 0;
 }
 
-static struct i2c_driver max6900_driver = {
-        .driver         = {
-                .name   = DRV_NAME,
-        },
-        .id             = I2C_DRIVERID_MAX6900,
-        .attach_adapter = max6900_attach_adapter,
-        .detach_client  = max6900_detach_client,
-};
-
 static const struct rtc_class_ops max6900_rtc_ops = {
-        .read_time      = max6900_rtc_read_time,
-        .set_time       = max6900_rtc_set_time,
+        .read_time = max6900_rtc_read_time,
+        .set_time = max6900_rtc_set_time,
 };
 
-static int max6900_probe(struct i2c_adapter *adapter, int addr, int kind)
+static int
+max6900_probe(struct i2c_client *client, const struct i2c_device_id *id)
 {
-        int rc = 0;
-        struct i2c_client *client = NULL;
-        struct rtc_device *rtc = NULL;
-
-        if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
-                rc = -ENODEV;
-                goto failout;
-        }
-
-        client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == NULL) {
-                rc = -ENOMEM;
-                goto failout;
-        }
-
-        client->addr = addr;
-        client->adapter = adapter;
-        client->driver = &max6900_driver;
-        strlcpy(client->name, DRV_NAME, I2C_NAME_SIZE);
-
-        if (kind < 0) {
-                rc = max6900_i2c_validate_client(client);
-                if (rc < 0)
-                        goto failout;
-        }
+        struct rtc_device *rtc;
 
-        rc = i2c_attach_client(client);
-        if (rc < 0)
-                goto failout;
+        if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
+                return -ENODEV;
 
-        dev_info(&client->dev,
-                 "chip found, driver version " DRV_VERSION "\n");
+        dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");
 
         rtc = rtc_device_register(max6900_driver.driver.name,
-                                  &client->dev,
-                                  &max6900_rtc_ops, THIS_MODULE);
-        if (IS_ERR(rtc)) {
-                rc = PTR_ERR(rtc);
-                goto failout_detach;
-        }
+                                  &client->dev, &max6900_rtc_ops, THIS_MODULE);
+        if (IS_ERR(rtc))
+                return PTR_ERR(rtc);
 
         i2c_set_clientdata(client, rtc);
 
         return 0;
-
-failout_detach:
-        i2c_detach_client(client);
-failout:
-        kfree(client);
-        return rc;
 }
 
+static struct i2c_driver max6900_driver = {
+        .driver = {
+                   .name = "rtc-max6900",
+                   },
+        .probe = max6900_probe,
+        .remove = max6900_remove,
+};
+
 static int __init max6900_init(void)
 {
         return i2c_add_driver(&max6900_driver);
@@ -352,6 +266,7 @@ static void __exit max6900_exit(void)
 }
 
 MODULE_DESCRIPTION("Maxim MAX6900 RTC driver");
+MODULE_AUTHOR("Dale Farnsworth <dale@farnsworth.org>");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
 
diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c
index 748a502a6355..a829f20ad6d6 100644
--- a/drivers/rtc/rtc-pcf8563.c
+++ b/drivers/rtc/rtc-pcf8563.c
@@ -179,58 +179,6 @@ struct pcf8563_limit
         unsigned char max;
 };
 
-static int pcf8563_validate_client(struct i2c_client *client)
-{
-        int i;
-
-        static const struct pcf8563_limit pattern[] = {
-                /* register, mask, min, max */
-                { PCF8563_REG_SC,       0x7F,   0,      59      },
-                { PCF8563_REG_MN,       0x7F,   0,      59      },
-                { PCF8563_REG_HR,       0x3F,   0,      23      },
-                { PCF8563_REG_DM,       0x3F,   0,      31      },
-                { PCF8563_REG_MO,       0x1F,   0,      12      },
-        };
-
-        /* check limits (only registers with bcd values) */
-        for (i = 0; i < ARRAY_SIZE(pattern); i++) {
-                int xfer;
-                unsigned char value;
-                unsigned char buf = pattern[i].reg;
-
-                struct i2c_msg msgs[] = {
-                        { client->addr, 0, 1, &buf },
-                        { client->addr, I2C_M_RD, 1, &buf },
-                };
-
-                xfer = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
-
-                if (xfer != ARRAY_SIZE(msgs)) {
-                        dev_err(&client->dev,
-                                "%s: could not read register 0x%02X\n",
-                                __func__, pattern[i].reg);
-
-                        return -EIO;
-                }
-
-                value = BCD2BIN(buf & pattern[i].mask);
-
-                if (value > pattern[i].max ||
-                        value < pattern[i].min) {
-                        dev_dbg(&client->dev,
-                                "%s: pattern=%d, reg=%x, mask=0x%02x, min=%d, "
-                                "max=%d, value=%d, raw=0x%02X\n",
-                                __func__, i, pattern[i].reg, pattern[i].mask,
-                                pattern[i].min, pattern[i].max,
-                                value, buf);
-
-                        return -ENODEV;
-                }
-        }
-
-        return 0;
-}
-
 static int pcf8563_rtc_read_time(struct device *dev, struct rtc_time *tm)
 {
         return pcf8563_get_datetime(to_i2c_client(dev), tm);
@@ -262,12 +210,6 @@ static int pcf8563_probe(struct i2c_client *client,
         if (!pcf8563)
                 return -ENOMEM;
 
-        /* Verify the chip is really an PCF8563 */
-        if (pcf8563_validate_client(client) < 0) {
-                err = -ENODEV;
-                goto exit_kfree;
-        }
-
         dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");
 
         pcf8563->rtc = rtc_device_register(pcf8563_driver.driver.name,
diff --git a/drivers/rtc/rtc-pl030.c b/drivers/rtc/rtc-pl030.c
index 8448eeb9d675..826153552157 100644
--- a/drivers/rtc/rtc-pl030.c
+++ b/drivers/rtc/rtc-pl030.c
@@ -34,15 +34,6 @@ static irqreturn_t pl030_interrupt(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static int pl030_open(struct device *dev)
-{
-        return 0;
-}
-
-static void pl030_release(struct device *dev)
-{
-}
-
 static int pl030_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
 {
         return -ENOIOCTLCMD;
@@ -104,8 +95,6 @@ static int pl030_set_time(struct device *dev, struct rtc_time *tm)
 }
 
 static const struct rtc_class_ops pl030_ops = {
-        .open           = pl030_open,
-        .release        = pl030_release,
         .ioctl          = pl030_ioctl,
         .read_time      = pl030_read_time,
         .set_time       = pl030_set_time,
diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c
index 08b4610ec5a6..333eec689d2f 100644
--- a/drivers/rtc/rtc-pl031.c
+++ b/drivers/rtc/rtc-pl031.c
@@ -45,18 +45,6 @@ static irqreturn_t pl031_interrupt(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static int pl031_open(struct device *dev)
-{
-        /*
-         * We request IRQ in pl031_probe, so nothing to do here...
-         */
-        return 0;
-}
-
-static void pl031_release(struct device *dev)
-{
-}
-
 static int pl031_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
 {
         struct pl031_local *ldata = dev_get_drvdata(dev);
@@ -118,8 +106,6 @@ static int pl031_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
 }
 
 static const struct rtc_class_ops pl031_ops = {
-        .open = pl031_open,
-        .release = pl031_release,
         .ioctl = pl031_ioctl,
         .read_time = pl031_read_time,
         .set_time = pl031_set_time,
diff --git a/drivers/rtc/rtc-rs5c372.c b/drivers/rtc/rtc-rs5c372.c
index 56caf6b2c3e5..8b561958fb1e 100644
--- a/drivers/rtc/rtc-rs5c372.c
+++ b/drivers/rtc/rtc-rs5c372.c
@@ -1,8 +1,9 @@
 /*
- * An I2C driver for Ricoh RS5C372 and RV5C38[67] RTCs
+ * An I2C driver for Ricoh RS5C372, R2025S/D and RV5C38[67] RTCs
  *
  * Copyright (C) 2005 Pavel Mironchik <pmironchik@optifacio.net>
  * Copyright (C) 2006 Tower Technologies
+ * Copyright (C) 2008 Paul Mundt
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -13,7 +14,7 @@
 #include <linux/rtc.h>
 #include <linux/bcd.h>
 
-#define DRV_VERSION "0.5"
+#define DRV_VERSION "0.6"
 
 
 /*
@@ -51,7 +52,8 @@
 #       define RS5C_CTRL1_CT4           (4 << 0)        /* 1 Hz level irq */
 #define RS5C_REG_CTRL2          15
 #       define RS5C372_CTRL2_24         (1 << 5)
-#       define RS5C_CTRL2_XSTP          (1 << 4)
+#       define R2025_CTRL2_XST          (1 << 5)
+#       define RS5C_CTRL2_XSTP          (1 << 4)        /* only if !R2025S/D */
 #       define RS5C_CTRL2_CTFG          (1 << 2)
 #       define RS5C_CTRL2_AAFG          (1 << 1)        /* or WAFG */
 #       define RS5C_CTRL2_BAFG          (1 << 0)        /* or DAFG */
@@ -63,6 +65,7 @@
 
 enum rtc_type {
         rtc_undef = 0,
+        rtc_r2025sd,
         rtc_rs5c372a,
         rtc_rs5c372b,
         rtc_rv5c386,
@@ -70,6 +73,7 @@ enum rtc_type {
 };
 
 static const struct i2c_device_id rs5c372_id[] = {
+        { "r2025sd", rtc_r2025sd },
         { "rs5c372a", rtc_rs5c372a },
         { "rs5c372b", rtc_rs5c372b },
         { "rv5c386", rtc_rv5c386 },
@@ -89,6 +93,7 @@ struct rs5c372 {
         enum rtc_type           type;
         unsigned                time24:1;
         unsigned                has_irq:1;
+        unsigned                smbus:1;
         char                    buf[17];
         char                    *regs;
 };
@@ -106,10 +111,25 @@ static int rs5c_get_regs(struct rs5c372 *rs5c)
          *
          * The first method doesn't work with the iop3xx adapter driver, on at
          * least 80219 chips; this works around that bug.
+         *
+         * The third method on the other hand doesn't work for the SMBus-only
+         * configurations, so we use the the first method there, stripping off
+         * the extra register in the process.
          */
-        if ((i2c_transfer(client->adapter, msgs, 1)) != 1) {
-                dev_warn(&client->dev, "can't read registers\n");
-                return -EIO;
+        if (rs5c->smbus) {
+                int addr = RS5C_ADDR(RS5C372_REG_SECS);
+                int size = sizeof(rs5c->buf) - 1;
+
+                if (i2c_smbus_read_i2c_block_data(client, addr, size,
+                                                  rs5c->buf + 1) != size) {
+                        dev_warn(&client->dev, "can't read registers\n");
+                        return -EIO;
+                }
+        } else {
+                if ((i2c_transfer(client->adapter, msgs, 1)) != 1) {
+                        dev_warn(&client->dev, "can't read registers\n");
+                        return -EIO;
+                }
         }
 
         dev_dbg(&client->dev,
@@ -187,6 +207,7 @@ static int rs5c372_set_datetime(struct i2c_client *client, struct rtc_time *tm)
 {
         struct rs5c372  *rs5c = i2c_get_clientdata(client);
         unsigned char   buf[8];
+        int             addr;
 
         dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d "
                 "mday=%d, mon=%d, year=%d, wday=%d\n",
@@ -194,16 +215,16 @@ static int rs5c372_set_datetime(struct i2c_client *client, struct rtc_time *tm)
                 tm->tm_sec, tm->tm_min, tm->tm_hour,
                 tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
 
-        buf[0] = RS5C_ADDR(RS5C372_REG_SECS);
-        buf[1] = BIN2BCD(tm->tm_sec);
-        buf[2] = BIN2BCD(tm->tm_min);
-        buf[3] = rs5c_hr2reg(rs5c, tm->tm_hour);
-        buf[4] = BIN2BCD(tm->tm_wday);
-        buf[5] = BIN2BCD(tm->tm_mday);
-        buf[6] = BIN2BCD(tm->tm_mon + 1);
-        buf[7] = BIN2BCD(tm->tm_year - 100);
+        addr   = RS5C_ADDR(RS5C372_REG_SECS);
+        buf[0] = BIN2BCD(tm->tm_sec);
+        buf[1] = BIN2BCD(tm->tm_min);
+        buf[2] = rs5c_hr2reg(rs5c, tm->tm_hour);
+        buf[3] = BIN2BCD(tm->tm_wday);
+        buf[4] = BIN2BCD(tm->tm_mday);
+        buf[5] = BIN2BCD(tm->tm_mon + 1);
+        buf[6] = BIN2BCD(tm->tm_year - 100);
 
-        if ((i2c_master_send(client, buf, 8)) != 8) {
+        if (i2c_smbus_write_i2c_block_data(client, addr, sizeof(buf), buf) < 0) {
                 dev_err(&client->dev, "%s: write error\n", __func__);
                 return -EIO;
         }
@@ -266,16 +287,16 @@ rs5c_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
 {
         struct i2c_client       *client = to_i2c_client(dev);
         struct rs5c372          *rs5c = i2c_get_clientdata(client);
-        unsigned char           buf[2];
-        int                     status;
+        unsigned char           buf;
+        int                     status, addr;
 
-        buf[1] = rs5c->regs[RS5C_REG_CTRL1];
+        buf = rs5c->regs[RS5C_REG_CTRL1];
         switch (cmd) {
         case RTC_UIE_OFF:
         case RTC_UIE_ON:
                 /* some 327a modes use a different IRQ pin for 1Hz irqs */
                 if (rs5c->type == rtc_rs5c372a
-                                && (buf[1] & RS5C372A_CTRL1_SL1))
+                                && (buf & RS5C372A_CTRL1_SL1))
                         return -ENOIOCTLCMD;
         case RTC_AIE_OFF:
         case RTC_AIE_ON:
@@ -293,28 +314,30 @@ rs5c_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
         if (status < 0)
                 return status;
 
-        buf[0] = RS5C_ADDR(RS5C_REG_CTRL1);
+        addr = RS5C_ADDR(RS5C_REG_CTRL1);
         switch (cmd) {
         case RTC_AIE_OFF:       /* alarm off */
-                buf[1] &= ~RS5C_CTRL1_AALE;
+                buf &= ~RS5C_CTRL1_AALE;
                 break;
         case RTC_AIE_ON:        /* alarm on */
-                buf[1] |= RS5C_CTRL1_AALE;
+                buf |= RS5C_CTRL1_AALE;
                 break;
         case RTC_UIE_OFF:       /* update off */
-                buf[1] &= ~RS5C_CTRL1_CT_MASK;
+                buf &= ~RS5C_CTRL1_CT_MASK;
                 break;
         case RTC_UIE_ON:        /* update on */
-                buf[1] &= ~RS5C_CTRL1_CT_MASK;
-                buf[1] |= RS5C_CTRL1_CT4;
+                buf &= ~RS5C_CTRL1_CT_MASK;
+                buf |= RS5C_CTRL1_CT4;
                 break;
         }
-        if ((i2c_master_send(client, buf, 2)) != 2) {
+
+        if (i2c_smbus_write_byte_data(client, addr, buf) < 0) {
                 printk(KERN_WARNING "%s: can't update alarm\n",
                         rs5c->rtc->name);
                 status = -EIO;
         } else
-                rs5c->regs[RS5C_REG_CTRL1] = buf[1];
+                rs5c->regs[RS5C_REG_CTRL1] = buf;
+
         return status;
 }
 
@@ -364,8 +387,8 @@ static int rs5c_set_alarm(struct device *dev, struct rtc_wkalrm *t)
 {
         struct i2c_client       *client = to_i2c_client(dev);
         struct rs5c372          *rs5c = i2c_get_clientdata(client);
-        int                     status;
-        unsigned char           buf[4];
+        int                     status, addr, i;
+        unsigned char           buf[3];
 
         /* only handle up to 24 hours in the future, like RTC_ALM_SET */
         if (t->time.tm_mday != -1
@@ -380,33 +403,36 @@ static int rs5c_set_alarm(struct device *dev, struct rtc_wkalrm *t)
         if (status < 0)
                 return status;
         if (rs5c->regs[RS5C_REG_CTRL1] & RS5C_CTRL1_AALE) {
-                buf[0] = RS5C_ADDR(RS5C_REG_CTRL1);
-                buf[1] = rs5c->regs[RS5C_REG_CTRL1] & ~RS5C_CTRL1_AALE;
-                if (i2c_master_send(client, buf, 2) != 2) {
+                addr = RS5C_ADDR(RS5C_REG_CTRL1);
+                buf[0] = rs5c->regs[RS5C_REG_CTRL1] & ~RS5C_CTRL1_AALE;
+                if (i2c_smbus_write_byte_data(client, addr, buf[0]) < 0) {
                         pr_debug("%s: can't disable alarm\n", rs5c->rtc->name);
                         return -EIO;
                 }
-                rs5c->regs[RS5C_REG_CTRL1] = buf[1];
+                rs5c->regs[RS5C_REG_CTRL1] = buf[0];
         }
 
         /* set alarm */
-        buf[0] = RS5C_ADDR(RS5C_REG_ALARM_A_MIN);
-        buf[1] = BIN2BCD(t->time.tm_min);
-        buf[2] = rs5c_hr2reg(rs5c, t->time.tm_hour);
-        buf[3] = 0x7f;  /* any/all days */
-        if ((i2c_master_send(client, buf, 4)) != 4) {
-                pr_debug("%s: can't set alarm time\n", rs5c->rtc->name);
-                return -EIO;
+        buf[0] = BIN2BCD(t->time.tm_min);
+        buf[1] = rs5c_hr2reg(rs5c, t->time.tm_hour);
+        buf[2] = 0x7f;  /* any/all days */
+
+        for (i = 0; i < sizeof(buf); i++) {
+                addr = RS5C_ADDR(RS5C_REG_ALARM_A_MIN + i);
+                if (i2c_smbus_write_byte_data(client, addr, buf[i]) < 0) {
+                        pr_debug("%s: can't set alarm time\n", rs5c->rtc->name);
+                        return -EIO;
+                }
         }
 
         /* ... and maybe enable its irq */
         if (t->enabled) {
-                buf[0] = RS5C_ADDR(RS5C_REG_CTRL1);
-                buf[1] = rs5c->regs[RS5C_REG_CTRL1] | RS5C_CTRL1_AALE;
-                if ((i2c_master_send(client, buf, 2)) != 2)
+                addr = RS5C_ADDR(RS5C_REG_CTRL1);
+                buf[0] = rs5c->regs[RS5C_REG_CTRL1] | RS5C_CTRL1_AALE;
+                if (i2c_smbus_write_byte_data(client, addr, buf[0]) < 0)
                         printk(KERN_WARNING "%s: can't enable alarm\n",
                                 rs5c->rtc->name);
-                rs5c->regs[RS5C_REG_CTRL1] = buf[1];
+                rs5c->regs[RS5C_REG_CTRL1] = buf[0];
         }
 
         return 0;
@@ -503,18 +529,81 @@ static void rs5c_sysfs_unregister(struct device *dev)
 
 static struct i2c_driver rs5c372_driver;
 
+static int rs5c_oscillator_setup(struct rs5c372 *rs5c372)
+{
+        unsigned char buf[2];
+        int addr, i, ret = 0;
+
+        if (rs5c372->type == rtc_r2025sd) {
+                if (!(rs5c372->regs[RS5C_REG_CTRL2] & R2025_CTRL2_XST))
+                        return ret;
+                rs5c372->regs[RS5C_REG_CTRL2] &= ~R2025_CTRL2_XST;
+        } else {
+                if (!(rs5c372->regs[RS5C_REG_CTRL2] & RS5C_CTRL2_XSTP))
+                        return ret;
+                rs5c372->regs[RS5C_REG_CTRL2] &= ~RS5C_CTRL2_XSTP;
+        }
+
+        addr   = RS5C_ADDR(RS5C_REG_CTRL1);
+        buf[0] = rs5c372->regs[RS5C_REG_CTRL1];
+        buf[1] = rs5c372->regs[RS5C_REG_CTRL2];
+
+        /* use 24hr mode */
+        switch (rs5c372->type) {
+        case rtc_rs5c372a:
+        case rtc_rs5c372b:
+                buf[1] |= RS5C372_CTRL2_24;
+                rs5c372->time24 = 1;
+                break;
+        case rtc_r2025sd:
+        case rtc_rv5c386:
+        case rtc_rv5c387a:
+                buf[0] |= RV5C387_CTRL1_24;
+                rs5c372->time24 = 1;
+                break;
+        default:
+                /* impossible */
+                break;
+        }
+
+        for (i = 0; i < sizeof(buf); i++) {
+                addr = RS5C_ADDR(RS5C_REG_CTRL1 + i);
+                ret = i2c_smbus_write_byte_data(rs5c372->client, addr, buf[i]);
+                if (unlikely(ret < 0))
+                        return ret;
+        }
+
+        rs5c372->regs[RS5C_REG_CTRL1] = buf[0];
+        rs5c372->regs[RS5C_REG_CTRL2] = buf[1];
+
+        return 0;
+}
+
 static int rs5c372_probe(struct i2c_client *client,
                          const struct i2c_device_id *id)
 {
         int err = 0;
+        int smbus_mode = 0;
         struct rs5c372 *rs5c372;
         struct rtc_time tm;
 
         dev_dbg(&client->dev, "%s\n", __func__);
 
-        if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
-                err = -ENODEV;
-                goto exit;
+        if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C |
+                        I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_I2C_BLOCK)) {
+                /*
+                 * If we don't have any master mode adapter, try breaking
+                 * it down in to the barest of capabilities.
+                 */
+                if (i2c_check_functionality(client->adapter,
+                                I2C_FUNC_SMBUS_BYTE_DATA |
+                                I2C_FUNC_SMBUS_I2C_BLOCK))
+                        smbus_mode = 1;
+                else {
+                        /* Still no good, give up */
+                        err = -ENODEV;
+                        goto exit;
+                }
         }
 
         if (!(rs5c372 = kzalloc(sizeof(struct rs5c372), GFP_KERNEL))) {
@@ -528,6 +617,7 @@ static int rs5c372_probe(struct i2c_client *client,
 
         /* we read registers 0x0f then 0x00-0x0f; skip the first one */
         rs5c372->regs = &rs5c372->buf[1];
+        rs5c372->smbus = smbus_mode;
 
         err = rs5c_get_regs(rs5c372);
         if (err < 0)
@@ -543,6 +633,7 @@ static int rs5c372_probe(struct i2c_client *client,
                 if (rs5c372->regs[RS5C_REG_CTRL2] & RS5C372_CTRL2_24)
                         rs5c372->time24 = 1;
                 break;
+        case rtc_r2025sd:
         case rtc_rv5c386:
         case rtc_rv5c387a:
                 if (rs5c372->regs[RS5C_REG_CTRL1] & RV5C387_CTRL1_24)
@@ -558,39 +649,14 @@ static int rs5c372_probe(struct i2c_client *client,
 
         /* if the oscillator lost power and no other software (like
          * the bootloader) set it up, do it here.
+         *
+         * The R2025S/D does this a little differently than the other
+         * parts, so we special case that..
          */
-        if (rs5c372->regs[RS5C_REG_CTRL2] & RS5C_CTRL2_XSTP) {
-                unsigned char buf[3];
-
-                rs5c372->regs[RS5C_REG_CTRL2] &= ~RS5C_CTRL2_XSTP;
-
-                buf[0] = RS5C_ADDR(RS5C_REG_CTRL1);
-                buf[1] = rs5c372->regs[RS5C_REG_CTRL1];
-                buf[2] = rs5c372->regs[RS5C_REG_CTRL2];
-
-                /* use 24hr mode */
-                switch (rs5c372->type) {
-                case rtc_rs5c372a:
-                case rtc_rs5c372b:
-                        buf[2] |= RS5C372_CTRL2_24;
-                        rs5c372->time24 = 1;
-                        break;
-                case rtc_rv5c386:
-                case rtc_rv5c387a:
-                        buf[1] |= RV5C387_CTRL1_24;
-                        rs5c372->time24 = 1;
-                        break;
-                default:
-                        /* impossible */
-                        break;
-                }
-
-                if ((i2c_master_send(client, buf, 3)) != 3) {
-                        dev_err(&client->dev, "setup error\n");
-                        goto exit_kfree;
-                }
-                rs5c372->regs[RS5C_REG_CTRL1] = buf[1];
-                rs5c372->regs[RS5C_REG_CTRL2] = buf[2];
+        err = rs5c_oscillator_setup(rs5c372);
+        if (unlikely(err < 0)) {
+                dev_err(&client->dev, "setup error\n");
+                goto exit_kfree;
         }
 
         if (rs5c372_get_datetime(client, &tm) < 0)
@@ -598,6 +664,7 @@ static int rs5c372_probe(struct i2c_client *client,
 
         dev_info(&client->dev, "%s found, %s, driver version " DRV_VERSION "\n",
                         ({ char *s; switch (rs5c372->type) {
+                        case rtc_r2025sd:       s = "r2025sd"; break;
                         case rtc_rs5c372a:      s = "rs5c372a"; break;
                         case rtc_rs5c372b:      s = "rs5c372b"; break;
                         case rtc_rv5c386:       s = "rv5c386"; break;
@@ -667,7 +734,8 @@ module_exit(rs5c372_exit);
 
 MODULE_AUTHOR(
                 "Pavel Mironchik <pmironchik@optifacio.net>, "
-                "Alessandro Zummo <a.zummo@towertech.it>");
+                "Alessandro Zummo <a.zummo@towertech.it>, "
+                "Paul Mundt <lethal@linux-sh.org>");
 MODULE_DESCRIPTION("Ricoh RS5C372 RTC driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index 1f88e9e914ec..fcead4c4cd1f 100644
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -257,12 +257,6 @@ static inline void sh_rtc_setaie(struct device *dev, unsigned int enable)
         spin_unlock_irq(&rtc->lock);
 }
 
-static void sh_rtc_release(struct device *dev)
-{
-        sh_rtc_setpie(dev, 0);
-        sh_rtc_setaie(dev, 0);
-}
-
 static int sh_rtc_proc(struct device *dev, struct seq_file *seq)
 {
         struct sh_rtc *rtc = dev_get_drvdata(dev);
@@ -559,7 +553,6 @@ static int sh_rtc_irq_set_freq(struct device *dev, int freq)
 }
 
 static struct rtc_class_ops sh_rtc_ops = {
-        .release        = sh_rtc_release,
         .ioctl          = sh_rtc_ioctl,
         .read_time      = sh_rtc_read_time,
         .set_time       = sh_rtc_set_time,
diff --git a/drivers/rtc/rtc-stk17ta8.c b/drivers/rtc/rtc-stk17ta8.c
index 31d3c8c28588..9a7e920315fa 100644
--- a/drivers/rtc/rtc-stk17ta8.c
+++ b/drivers/rtc/rtc-stk17ta8.c
@@ -215,17 +215,6 @@ static irqreturn_t stk17ta8_rtc_interrupt(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static void stk17ta8_rtc_release(struct device *dev)
-{
-        struct platform_device *pdev = to_platform_device(dev);
-        struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
-
-        if (pdata->irq >= 0) {
-                pdata->irqen = 0;
-                stk17ta8_rtc_update_alarm(pdata);
-        }
-}
-
 static int stk17ta8_rtc_ioctl(struct device *dev, unsigned int cmd,
                             unsigned long arg)
 {
@@ -254,7 +243,6 @@ static const struct rtc_class_ops stk17ta8_rtc_ops = {
         .set_time       = stk17ta8_rtc_set_time,
         .read_alarm     = stk17ta8_rtc_read_alarm,
         .set_alarm      = stk17ta8_rtc_set_alarm,
-        .release        = stk17ta8_rtc_release,
         .ioctl          = stk17ta8_rtc_ioctl,
 };
 
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c
index d18e6d2e0b49..40759c33477d 100644
--- a/drivers/s390/char/fs3270.c
+++ b/drivers/s390/char/fs3270.c
@@ -418,25 +418,22 @@ fs3270_open(struct inode *inode, struct file *filp)
 {
         struct fs3270 *fp;
         struct idal_buffer *ib;
-        int minor, rc;
+        int minor, rc = 0;
 
         if (imajor(filp->f_path.dentry->d_inode) != IBM_FS3270_MAJOR)
                 return -ENODEV;
-        lock_kernel();
         minor = iminor(filp->f_path.dentry->d_inode);
         /* Check for minor 0 multiplexer. */
         if (minor == 0) {
-                struct tty_struct *tty;
-                mutex_lock(&tty_mutex);
-                tty = get_current_tty();
+                struct tty_struct *tty = get_current_tty();
                 if (!tty || tty->driver->major != IBM_TTY3270_MAJOR) {
-                        mutex_unlock(&tty_mutex);
-                        rc = -ENODEV;
-                        goto out;
+                        tty_kref_put(tty);
+                        return -ENODEV;
                 }
                 minor = tty->index + RAW3270_FIRSTMINOR;
-                mutex_unlock(&tty_mutex);
+                tty_kref_put(tty);
         }
+        lock_kernel();
         /* Check if some other program is already using fullscreen mode. */
         fp = (struct fs3270 *) raw3270_find_view(&fs3270_fn, minor);
         if (!IS_ERR(fp)) {
@@ -478,7 +475,7 @@ fs3270_open(struct inode *inode, struct file *filp)
         filp->private_data = fp;
 out:
         unlock_kernel();
-        return 0;
+        return rc;
 }
 
 /*
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index 1792b2c0130e..0b15cf107ec9 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -1168,19 +1168,17 @@ static int raw3270_create_attributes(struct raw3270 *rp)
         if (rc)
                 goto out;
 
-        rp->clttydev = device_create_drvdata(class3270, &rp->cdev->dev,
-                                             MKDEV(IBM_TTY3270_MAJOR, rp->minor),
-                                             NULL,
-                                             "tty%s", dev_name(&rp->cdev->dev));
+        rp->clttydev = device_create(class3270, &rp->cdev->dev,
+                                     MKDEV(IBM_TTY3270_MAJOR, rp->minor), NULL,
+                                     "tty%s", dev_name(&rp->cdev->dev));
         if (IS_ERR(rp->clttydev)) {
                 rc = PTR_ERR(rp->clttydev);
                 goto out_ttydev;
         }
 
-        rp->cltubdev = device_create_drvdata(class3270, &rp->cdev->dev,
-                                             MKDEV(IBM_FS3270_MAJOR, rp->minor),
-                                             NULL,
-                                             "tub%s", dev_name(&rp->cdev->dev));
+        rp->cltubdev = device_create(class3270, &rp->cdev->dev,
+                                     MKDEV(IBM_FS3270_MAJOR, rp->minor), NULL,
+                                     "tub%s", dev_name(&rp->cdev->dev));
         if (!IS_ERR(rp->cltubdev))
                 goto out;
 
diff --git a/drivers/s390/char/tape_class.c b/drivers/s390/char/tape_class.c
index 12c2a5aaf31b..ddc914ccea8f 100644
--- a/drivers/s390/char/tape_class.c
+++ b/drivers/s390/char/tape_class.c
@@ -69,9 +69,9 @@ struct tape_class_device *register_tape_dev(
         if (rc)
                 goto fail_with_cdev;
 
-        tcd->class_device = device_create_drvdata(tape_class, device,
-                                                  tcd->char_device->dev,
-                                                  NULL, "%s", tcd->device_name);
+        tcd->class_device = device_create(tape_class, device,
+                                          tcd->char_device->dev, NULL,
+                                          "%s", tcd->device_name);
         rc = IS_ERR(tcd->class_device) ? PTR_ERR(tcd->class_device) : 0;
         if (rc)
                 goto fail_with_cdev;
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index 42173cc34610..24762727bc27 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -747,10 +747,10 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv)
                 device_unregister(dev);
                 return ret;
         }
-        priv->class_device = device_create_drvdata(vmlogrdr_class, dev,
-                                                   MKDEV(vmlogrdr_major,
-                                                         priv->minor_num),
-                                                   priv, "%s", dev_name(dev));
+        priv->class_device = device_create(vmlogrdr_class, dev,
+                                           MKDEV(vmlogrdr_major,
+                                                 priv->minor_num),
+                                           priv, "%s", dev_name(dev));
         if (IS_ERR(priv->class_device)) {
                 ret = PTR_ERR(priv->class_device);
                 priv->class_device=NULL;
diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c
index 6fdfa5ddeca8..9020eba620ee 100644
--- a/drivers/s390/char/vmur.c
+++ b/drivers/s390/char/vmur.c
@@ -896,9 +896,8 @@ static int ur_set_online(struct ccw_device *cdev)
                 goto fail_free_cdev;
         }
 
-        urd->device = device_create_drvdata(vmur_class, NULL,
-                                            urd->char_device->dev, NULL,
-                                            "%s", node_id);
+        urd->device = device_create(vmur_class, NULL, urd->char_device->dev,
+                                    NULL, "%s", node_id);
         if (IS_ERR(urd->device)) {
                 rc = PTR_ERR(urd->device);
                 TRACE("ur_set_online: device_create rc=%d\n", rc);
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index 8f83fc994f50..f5e618562c5f 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -2913,7 +2913,7 @@ claw_new_device(struct ccwgroup_device *cgdev)
         if (ret != 0) {
                 printk(KERN_WARNING
                         "claw: ccw_device_set_online %s WRITE failed "
-                       "with ret = %d\n", dev_name(&cgdev->cdev[WRITE]->dev)
+                       "with ret = %d\n", dev_name(&cgdev->cdev[WRITE]->dev),
                        ret);
                 goto out;
         }
diff --git a/drivers/s390/net/ctcm_mpc.c b/drivers/s390/net/ctcm_mpc.c
index cbe470493bf0..19f5d5ed85e0 100644
--- a/drivers/s390/net/ctcm_mpc.c
+++ b/drivers/s390/net/ctcm_mpc.c
@@ -1673,7 +1673,7 @@ static int mpc_validate_xid(struct mpcg_info *mpcginfo)
 
 done:
         if (rc) {
-                ctcm_pr_info("ctcmpc       :  %s() failed\n", __FUNCTION__);
+                ctcm_pr_info("ctcmpc       :  %s() failed\n", __func__);
                 priv->xid->xid2_flag2 = 0x40;
                 grp->saved_xid2->xid2_flag2 = 0x40;
         }
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index d3b211af4e1c..403ecad48d4b 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1640,6 +1640,7 @@ config ATARI_SCSI
         tristate "Atari native SCSI support"
         depends on ATARI && SCSI
         select SCSI_SPI_ATTRS
+        select NVRAM
         ---help---
           If you have an Atari with built-in NCR5380 SCSI controller (TT,
           Falcon, ...) say Y to get it supported. Of course also, if you have
@@ -1670,14 +1671,6 @@ config ATARI_SCSI_RESET_BOOT
           boot process fractionally longer but may assist recovery from errors
           that leave the devices with SCSI operations partway completed.
 
-config TT_DMA_EMUL
-        bool "Hades SCSI DMA emulator"
-        depends on ATARI_SCSI && HADES
-        help
-          This option enables code which emulates the TT SCSI DMA chip on the
-          Hades. This increases the SCSI transfer rates at least ten times
-          compared to PIO transfers.
-
 config MAC_SCSI
         bool "Macintosh NCR5380 SCSI"
         depends on MAC && SCSI=y
diff --git a/drivers/scsi/atari_dma_emul.c b/drivers/scsi/atari_dma_emul.c
deleted file mode 100644
index cdc710ea00fa..000000000000
--- a/drivers/scsi/atari_dma_emul.c
+++ /dev/null
@@ -1,468 +0,0 @@
-/*
- * atari_dma_emul.c -- TT SCSI DMA emulator for the Hades.
- *
- * Copyright 1997 Wout Klaren <W.Klaren@inter.nl.net>
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file COPYING in the main directory of this archive
- * for more details.
- *
- * This code was written using the Hades TOS source code as a
- * reference. This source code can be found on the home page
- * of Medusa Computer Systems.
- *
- * Version 0.1, 1997-09-24.
- * 
- * This code should be considered experimental. It has only been
- * tested on a Hades with a 68060. It might not work on a Hades
- * with a 68040. Make backups of your hard drives before using
- * this code.
- */
-
-#include <linux/compiler.h>
-#include <asm/thread_info.h>
-#include <asm/uaccess.h>
-
-#define hades_dma_ctrl          (*(unsigned char *) 0xffff8717)
-#define hades_psdm_reg          (*(unsigned char *) 0xffff8741)
-
-#define TRANSFER_SIZE           16
-
-struct m68040_frame {
-        unsigned long  effaddr;  /* effective address */
-        unsigned short ssw;      /* special status word */
-        unsigned short wb3s;     /* write back 3 status */
-        unsigned short wb2s;     /* write back 2 status */
-        unsigned short wb1s;     /* write back 1 status */
-        unsigned long  faddr;    /* fault address */
-        unsigned long  wb3a;     /* write back 3 address */
-        unsigned long  wb3d;     /* write back 3 data */
-        unsigned long  wb2a;     /* write back 2 address */
-        unsigned long  wb2d;     /* write back 2 data */
-        unsigned long  wb1a;     /* write back 1 address */
-        unsigned long  wb1dpd0;  /* write back 1 data/push data 0*/
-        unsigned long  pd1;      /* push data 1*/
-        unsigned long  pd2;      /* push data 2*/
-        unsigned long  pd3;      /* push data 3*/
-};
-
-static void writeback (unsigned short wbs, unsigned long wba,
-                       unsigned long wbd, void *old_buserr)
-{
-        mm_segment_t fs = get_fs();
-        static void *save_buserr;
-
-        __asm__ __volatile__ ("movec.l  %%vbr,%%a0\n\t"
-                              "move.l   %0,8(%%a0)\n\t"
-                              :
-                              : "r" (&&bus_error)
-                              : "a0" );
-
-        save_buserr = old_buserr;
-
-        set_fs (MAKE_MM_SEG(wbs & WBTM_040));
-
-        switch (wbs & WBSIZ_040) {
-            case BA_SIZE_BYTE:
-                put_user (wbd & 0xff, (char *)wba);
-                break;
-            case BA_SIZE_WORD:
-                put_user (wbd & 0xffff, (short *)wba);
-                break;
-            case BA_SIZE_LONG:
-                put_user (wbd, (int *)wba);
-                break;
-        }
-
-        set_fs (fs);
-        return;
-
-bus_error:
-        __asm__ __volatile__ ("cmp.l    %0,2(%%sp)\n\t"
-                              "bcs.s    .jump_old\n\t"
-                              "cmp.l    %1,2(%%sp)\n\t"
-                              "bls.s    .restore_old\n"
-                        ".jump_old:\n\t"
-                              "move.l   %2,-(%%sp)\n\t"
-                              "rts\n"
-                        ".restore_old:\n\t"
-                              "move.l   %%a0,-(%%sp)\n\t"
-                              "movec.l  %%vbr,%%a0\n\t"
-                              "move.l   %2,8(%%a0)\n\t"
-                              "move.l   (%%sp)+,%%a0\n\t"
-                              "rte\n\t"
-                              :
-                              : "i" (writeback), "i" (&&bus_error),
-                                "m" (save_buserr) );
-}
-
-/*
- * static inline void set_restdata_reg(unsigned char *cur_addr)
- *
- * Set the rest data register if necessary.
- */
-
-static inline void set_restdata_reg(unsigned char *cur_addr)
-{
-        if (((long) cur_addr & ~3) != 0)
-                tt_scsi_dma.dma_restdata =
-                        *((unsigned long *) ((long) cur_addr & ~3));
-}
-
-/*
- * void hades_dma_emulator(int irq, void *dummy)
- * 
- * This code emulates TT SCSI DMA on the Hades.
- * 
- * Note the following:
- * 
- * 1. When there is no byte available to read from the SCSI bus, or
- *    when a byte cannot yet bet written to the SCSI bus, a bus
- *    error occurs when reading or writing the pseudo DMA data
- *    register (hades_psdm_reg). We have to catch this bus error
- *    and try again to read or write the byte. If after several tries
- *    we still get a bus error, the interrupt handler is left. When
- *    the byte can be read or written, the interrupt handler is
- *    called again.
- * 
- * 2. The SCSI interrupt must be disabled in this interrupt handler.
- * 
- * 3. If we set the EOP signal, the SCSI controller still expects one
- *    byte to be read or written. Therefore the last byte is transferred
- *    separately, after setting the EOP signal.
- * 
- * 4. When this function is left, the address pointer (start_addr) is
- *    converted to a physical address. Because it points one byte
- *    further than the last transferred byte, it can point outside the
- *    current page. If virt_to_phys() is called with this address we
- *    might get an access error. Therefore virt_to_phys() is called with
- *    start_addr - 1 if the count has reached zero. The result is
- *    increased with one.
- */
-
-static irqreturn_t hades_dma_emulator(int irq, void *dummy)
-{
-        unsigned long dma_base;
-        register unsigned long dma_cnt asm ("d3");
-        static long save_buserr;
-        register unsigned long save_sp asm ("d4");
-        register int tries asm ("d5");
-        register unsigned char *start_addr asm ("a3"), *end_addr asm ("a4");
-        register unsigned char *eff_addr;
-        register unsigned char *psdm_reg;
-        unsigned long rem;
-
-        atari_disable_irq(IRQ_TT_MFP_SCSI);
-
-        /*
-         * Read the dma address and count registers.
-         */
-
-        dma_base = SCSI_DMA_READ_P(dma_addr);
-        dma_cnt = SCSI_DMA_READ_P(dma_cnt);
-
-        /*
-         * Check if DMA is still enabled.
-         */
-
-        if ((tt_scsi_dma.dma_ctrl & 2) == 0)
-        {
-                atari_enable_irq(IRQ_TT_MFP_SCSI);
-                return IRQ_HANDLED;
-        }
-
-        if (dma_cnt == 0)
-        {
-                printk(KERN_NOTICE "DMA emulation: count is zero.\n");
-                tt_scsi_dma.dma_ctrl &= 0xfd;   /* DMA ready. */
-                atari_enable_irq(IRQ_TT_MFP_SCSI);
-                return IRQ_HANDLED;
-        }
-
-        /*
-         * Install new bus error routine.
-         */
-
-        __asm__ __volatile__ ("movec.l  %%vbr,%%a0\n\t"
-                              "move.l   8(%%a0),%0\n\t"
-                              "move.l   %1,8(%%a0)\n\t"
-                              : "=&r" (save_buserr)
-                              : "r" (&&scsi_bus_error)
-                              : "a0" );
-
-        hades_dma_ctrl &= 0xfc;         /* Bus error and EOP off. */
-
-        /*
-         * Save the stack pointer.
-         */
-
-        __asm__ __volatile__ ("move.l   %%sp,%0\n\t"
-                              : "=&r" (save_sp) );
-
-        tries = 100;                    /* Maximum number of bus errors. */
-        start_addr = phys_to_virt(dma_base);
-        end_addr = start_addr + dma_cnt;
-
-scsi_loop:
-        dma_cnt--;
-        rem = dma_cnt & (TRANSFER_SIZE - 1);
-        dma_cnt &= ~(TRANSFER_SIZE - 1);
-        psdm_reg = &hades_psdm_reg;
-
-        if (tt_scsi_dma.dma_ctrl & 1)   /* Read or write? */
-        {
-                /*
-                 * SCSI write. Abort when count is zero.
-                 */
-
-                switch (rem)
-                {
-                case 0:
-                        while (dma_cnt > 0)
-                        {
-                                dma_cnt -= TRANSFER_SIZE;
-
-                                *psdm_reg = *start_addr++;
-                case 15:
-                                *psdm_reg = *start_addr++;
-                case 14:
-                                *psdm_reg = *start_addr++;
-                case 13:
-                                *psdm_reg = *start_addr++;
-                case 12:
-                                *psdm_reg = *start_addr++;
-                case 11:
-                                *psdm_reg = *start_addr++;
-                case 10:
-                                *psdm_reg = *start_addr++;
-                case 9:
-                                *psdm_reg = *start_addr++;
-                case 8:
-                                *psdm_reg = *start_addr++;
-                case 7:
-                                *psdm_reg = *start_addr++;
-                case 6:
-                                *psdm_reg = *start_addr++;
-                case 5:
-                                *psdm_reg = *start_addr++;
-                case 4:
-                                *psdm_reg = *start_addr++;
-                case 3:
-                                *psdm_reg = *start_addr++;
-                case 2:
-                                *psdm_reg = *start_addr++;
-                case 1:
-                                *psdm_reg = *start_addr++;
-                        }
-                }
-
-                hades_dma_ctrl |= 1;    /* Set EOP. */
-                udelay(10);
-                *psdm_reg = *start_addr++;      /* Dummy byte. */
-                tt_scsi_dma.dma_ctrl &= 0xfd;   /* DMA ready. */
-        }
-        else
-        {
-                /*
-                 * SCSI read. Abort when count is zero.
-                 */
-
-                switch (rem)
-                {
-                case 0:
-                        while (dma_cnt > 0)
-                        {
-                                dma_cnt -= TRANSFER_SIZE;
-
-                                *start_addr++ = *psdm_reg;
-                case 15:
-                                *start_addr++ = *psdm_reg;
-                case 14:
-                                *start_addr++ = *psdm_reg;
-                case 13:
-                                *start_addr++ = *psdm_reg;
-                case 12:
-                                *start_addr++ = *psdm_reg;
-                case 11:
-                                *start_addr++ = *psdm_reg;
-                case 10:
-                                *start_addr++ = *psdm_reg;
-                case 9:
-                                *start_addr++ = *psdm_reg;
-                case 8:
-                                *start_addr++ = *psdm_reg;
-                case 7:
-                                *start_addr++ = *psdm_reg;
-                case 6:
-                                *start_addr++ = *psdm_reg;
-                case 5:
-                                *start_addr++ = *psdm_reg;
-                case 4:
-                                *start_addr++ = *psdm_reg;
-                case 3:
-                                *start_addr++ = *psdm_reg;
-                case 2:
-                                *start_addr++ = *psdm_reg;
-                case 1:
-                                *start_addr++ = *psdm_reg;
-                        }
-                }
-
-                hades_dma_ctrl |= 1;    /* Set EOP. */
-                udelay(10);
-                *start_addr++ = *psdm_reg;
-                tt_scsi_dma.dma_ctrl &= 0xfd;   /* DMA ready. */
-
-                set_restdata_reg(start_addr);
-        }
-
-        if (start_addr != end_addr)
-                printk(KERN_CRIT "DMA emulation: FATAL: Count is not zero at end of transfer.\n");
-
-        dma_cnt = end_addr - start_addr;
-
-scsi_end:
-        dma_base = (dma_cnt == 0) ? virt_to_phys(start_addr - 1) + 1 :  
-                                    virt_to_phys(start_addr);
-
-        SCSI_DMA_WRITE_P(dma_addr, dma_base);
-        SCSI_DMA_WRITE_P(dma_cnt, dma_cnt);
-
-        /*
-         * Restore old bus error routine.
-         */
-
-        __asm__ __volatile__ ("movec.l  %%vbr,%%a0\n\t"
-                              "move.l   %0,8(%%a0)\n\t"
-                              :
-                              : "r" (save_buserr)
-                              : "a0" );
-
-        atari_enable_irq(IRQ_TT_MFP_SCSI);
-
-        return IRQ_HANDLED;
-
-scsi_bus_error:
-        /*
-         * First check if the bus error is caused by our code.
-         * If not, call the original handler.
-         */
-
-        __asm__ __volatile__ ("cmp.l    %0,2(%%sp)\n\t"
-                              "bcs.s    .old_vector\n\t"
-                              "cmp.l    %1,2(%%sp)\n\t"
-                              "bls.s    .scsi_buserr\n"
-                        ".old_vector:\n\t"
-                              "move.l   %2,-(%%sp)\n\t"
-                              "rts\n"
-                        ".scsi_buserr:\n\t"
-                              :
-                              : "i" (&&scsi_loop), "i" (&&scsi_end),
-                                "m" (save_buserr) );
-
-        if (CPU_IS_060)
-        {
-                /*
-                 * Get effective address and restore the stack.
-                 */
-
-                __asm__ __volatile__ ("move.l   8(%%sp),%0\n\t"
-                                      "move.l   %1,%%sp\n\t"
-                                      : "=a&" (eff_addr)
-                                      : "r" (save_sp) );
-        }
-        else
-        {
-                register struct m68040_frame *frame;
-
-                __asm__ __volatile__ ("lea      8(%%sp),%0\n\t"
-                                      : "=a&" (frame) );
-
-                if (tt_scsi_dma.dma_ctrl & 1)
-                {
-                        /*
-                         * Bus error while writing.
-                         */
-
-                        if (frame->wb3s & WBV_040)
-                        {
-                                if (frame->wb3a == (long) &hades_psdm_reg)
-                                        start_addr--;
-                                else
-                                        writeback(frame->wb3s, frame->wb3a,
-                                                  frame->wb3d, &&scsi_bus_error);
-                        }
-
-                        if (frame->wb2s & WBV_040)
-                        {
-                                if (frame->wb2a == (long) &hades_psdm_reg)
-                                        start_addr--;
-                                else
-                                        writeback(frame->wb2s, frame->wb2a,
-                                                  frame->wb2d, &&scsi_bus_error);
-                        }
-
-                        if (frame->wb1s & WBV_040)
-                        {
-                                if (frame->wb1a == (long) &hades_psdm_reg)
-                                        start_addr--;
-                        }
-                }
-                else
-                {
-                        /*
-                         * Bus error while reading.
-                         */
-
-                        if (frame->wb3s & WBV_040)
-                                writeback(frame->wb3s, frame->wb3a,
-                                          frame->wb3d, &&scsi_bus_error);
-                }
-
-                eff_addr = (unsigned char *) frame->faddr;
-
-                __asm__ __volatile__ ("move.l   %0,%%sp\n\t"
-                                      :
-                                      : "r" (save_sp) );
-        }
-
-        dma_cnt = end_addr - start_addr;
-
-        if (eff_addr == &hades_psdm_reg)
-        {
-                /*
-                 * Bus error occurred while reading the pseudo
-                 * DMA register. Time out.
-                 */
-
-                tries--;
-
-                if (tries <= 0)
-                {
-                        if ((tt_scsi_dma.dma_ctrl & 1) == 0)    /* Read or write? */
-                                set_restdata_reg(start_addr);
-
-                        if (dma_cnt <= 1)
-                                printk(KERN_CRIT "DMA emulation: Fatal "
-                                       "error while %s the last byte.\n",
-                                       (tt_scsi_dma.dma_ctrl & 1)
-                                       ? "writing" : "reading");
-
-                        goto scsi_end;
-                }
-                else
-                        goto scsi_loop;
-        }
-        else
-        {
-                /*
-                 * Bus error during pseudo DMA transfer.
-                 * Terminate the DMA transfer.
-                 */
-
-                hades_dma_ctrl |= 3;    /* Set EOP and bus error. */
-                if ((tt_scsi_dma.dma_ctrl & 1) == 0)    /* Read or write? */
-                        set_restdata_reg(start_addr);
-                goto scsi_end;
-        }
-}
diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c
index f5732d8f67fe..21fe07f9df87 100644
--- a/drivers/scsi/atari_scsi.c
+++ b/drivers/scsi/atari_scsi.c
@@ -249,10 +249,6 @@ static int setup_hostid = -1;
 module_param(setup_hostid, int, 0);
 
 
-#if defined(CONFIG_TT_DMA_EMUL)
-#include "atari_dma_emul.c"
-#endif
-
 #if defined(REAL_DMA)
 
 static int scsi_dma_is_ignored_buserr(unsigned char dma_stat)
@@ -695,21 +691,8 @@ int atari_scsi_detect(struct scsi_host_template *host)
 #ifdef REAL_DMA
                 tt_scsi_dma.dma_ctrl = 0;
                 atari_dma_residual = 0;
-#ifdef CONFIG_TT_DMA_EMUL
-                if (MACH_IS_HADES) {
-                        if (request_irq(IRQ_AUTO_2, hades_dma_emulator,
-                                         IRQ_TYPE_PRIO, "Hades DMA emulator",
-                                         hades_dma_emulator)) {
-                                printk(KERN_ERR "atari_scsi_detect: cannot allocate irq %d, aborting (MACH_IS_HADES)",IRQ_AUTO_2);
-                                free_irq(IRQ_TT_MFP_SCSI, instance);
-                                scsi_unregister(atari_scsi_host);
-                                atari_stram_free(atari_dma_buffer);
-                                atari_dma_buffer = 0;
-                                return 0;
-                        }
-                }
-#endif
-                if (MACH_IS_MEDUSA || MACH_IS_HADES) {
+
+                if (MACH_IS_MEDUSA) {
                         /* While the read overruns (described by Drew Eckhardt in
                          * NCR5380.c) never happened on TTs, they do in fact on the Medusa
                          * (This was the cause why SCSI didn't work right for so long
@@ -1007,11 +990,7 @@ static unsigned long atari_dma_xfer_len(unsigned long wanted_len,
                                         Scsi_Cmnd *cmd, int write_flag)
 {
         unsigned long   possible_len, limit;
-#ifndef CONFIG_TT_DMA_EMUL
-        if (MACH_IS_HADES)
-                /* Hades has no SCSI DMA at all :-( Always force use of PIO */
-                return 0;
-#endif
+
         if (IS_A_TT())
                 /* TT SCSI DMA can transfer arbitrary #bytes */
                 return wanted_len;
diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c
index 3c257fe0893e..88ecf94ad979 100644
--- a/drivers/scsi/ch.c
+++ b/drivers/scsi/ch.c
@@ -914,9 +914,9 @@ static int ch_probe(struct device *dev)
         ch->minor = minor;
         sprintf(ch->name,"ch%d",ch->minor);
 
-        class_dev = device_create_drvdata(ch_sysfs_class, dev,
-                                          MKDEV(SCSI_CHANGER_MAJOR, ch->minor),
-                                          ch, "s%s", ch->name);
+        class_dev = device_create(ch_sysfs_class, dev,
+                                  MKDEV(SCSI_CHANGER_MAJOR, ch->minor), ch,
+                                  "s%s", ch->name);
         if (IS_ERR(class_dev)) {
                 printk(KERN_WARNING "ch%d: device_create failed\n",
                        ch->minor);
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index 1fe0901e8119..8aba4fdfb522 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -271,7 +271,7 @@ rebuild_sys_tab:
                 pHba->initialized = TRUE;
                 pHba->state &= ~DPTI_STATE_RESET;
                 if (adpt_sysfs_class) {
-                        struct device *dev = device_create_drvdata(adpt_sysfs_class,
+                        struct device *dev = device_create(adpt_sysfs_class,
                                 NULL, MKDEV(DPTI_I2O_MAJOR, pHba->unit), NULL,
                                 "dpti%d", pHba->unit);
                         if (IS_ERR(dev)) {
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 90212ac33be3..740bad435995 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -82,7 +82,6 @@ typedef struct ide_scsi_obj {
         struct gendisk          *disk;
         struct Scsi_Host        *host;
 
-        struct ide_atapi_pc *pc;                /* Current packet command */
         unsigned long transform;                /* SCSI cmd translation layer */
         unsigned long log;                      /* log flags */
 } idescsi_scsi_t;
@@ -137,10 +136,10 @@ static void ide_scsi_hex_dump(u8 *data, int len)
 
 static int idescsi_end_request(ide_drive_t *, int, int);
 
-static void ide_scsi_callback(ide_drive_t *drive)
+static void ide_scsi_callback(ide_drive_t *drive, int dsc)
 {
         idescsi_scsi_t *scsi = drive_to_idescsi(drive);
-        struct ide_atapi_pc *pc = scsi->pc;
+        struct ide_atapi_pc *pc = drive->pc;
 
         if (pc->flags & PC_FLAG_TIMEDOUT)
                 debug_log("%s: got timed out packet %lu at %lu\n", __func__,
@@ -267,49 +266,10 @@ static int idescsi_end_request (ide_drive_t *drive, int uptodate, int nrsecs)
         spin_unlock_irqrestore(host->host_lock, flags);
         kfree(pc);
         blk_put_request(rq);
-        scsi->pc = NULL;
+        drive->pc = NULL;
         return 0;
 }
 
-static inline unsigned long get_timeout(struct ide_atapi_pc *pc)
-{
-        return max_t(unsigned long, WAIT_CMD, pc->timeout - jiffies);
-}
-
-static int idescsi_expiry(ide_drive_t *drive)
-{
-        idescsi_scsi_t *scsi = drive_to_idescsi(drive);
-        struct ide_atapi_pc   *pc   = scsi->pc;
-
-        debug_log("%s called for %lu at %lu\n", __func__,
-                  pc->scsi_cmd->serial_number, jiffies);
-
-        pc->flags |= PC_FLAG_TIMEDOUT;
-
-        return 0;                                       /* we do not want the ide subsystem to retry */
-}
-
-/*
- *      Our interrupt handler.
- */
-static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
-{
-        idescsi_scsi_t *scsi = drive_to_idescsi(drive);
-        struct ide_atapi_pc *pc = scsi->pc;
-
-        return ide_pc_intr(drive, pc, idescsi_pc_intr, get_timeout(pc),
-                           idescsi_expiry, NULL, NULL, NULL,
-                           ide_io_buffers);
-}
-
-static ide_startstop_t idescsi_transfer_pc(ide_drive_t *drive)
-{
-        idescsi_scsi_t *scsi = drive_to_idescsi(drive);
-
-        return ide_transfer_pc(drive, scsi->pc, idescsi_pc_intr,
-                               get_timeout(scsi->pc), idescsi_expiry);
-}
-
 static inline int idescsi_set_direction(struct ide_atapi_pc *pc)
 {
         switch (pc->c[0]) {
@@ -352,13 +312,10 @@ static int idescsi_map_sg(ide_drive_t *drive, struct ide_atapi_pc *pc)
 static ide_startstop_t idescsi_issue_pc(ide_drive_t *drive,
                 struct ide_atapi_pc *pc)
 {
-        idescsi_scsi_t *scsi = drive_to_idescsi(drive);
-
         /* Set the current packet command */
-        scsi->pc = pc;
+        drive->pc = pc;
 
-        return ide_issue_pc(drive, pc, idescsi_transfer_pc,
-                            get_timeout(pc), idescsi_expiry);
+        return ide_issue_pc(drive, ide_scsi_get_timeout(pc), ide_scsi_expiry);
 }
 
 /*
@@ -374,7 +331,8 @@ static ide_startstop_t idescsi_do_request (ide_drive_t *drive, struct request *r
         if (blk_sense_request(rq) || blk_special_request(rq)) {
                 struct ide_atapi_pc *pc = (struct ide_atapi_pc *)rq->special;
 
-                if (drive->using_dma && !idescsi_map_sg(drive, pc))
+                if ((drive->dev_flags & IDE_DFLAG_USING_DMA) &&
+                    idescsi_map_sg(drive, pc) == 0)
                         pc->flags |= PC_FLAG_DMA_OK;
 
                 return idescsi_issue_pc(drive, pc);
@@ -427,14 +385,14 @@ static const struct ide_proc_devset idescsi_settings[] = {
  */
 static void idescsi_setup (ide_drive_t *drive, idescsi_scsi_t *scsi)
 {
-        if ((drive->id[ATA_ID_CONFIG] & 0x0060) == 0x20)
-                set_bit(IDE_AFLAG_DRQ_INTERRUPT, &drive->atapi_flags);
         clear_bit(IDESCSI_SG_TRANSFORM, &scsi->transform);
 #if IDESCSI_DEBUG_LOG
         set_bit(IDESCSI_LOG_CMD, &scsi->log);
 #endif /* IDESCSI_DEBUG_LOG */
 
-        drive->pc_callback = ide_scsi_callback;
+        drive->pc_callback       = ide_scsi_callback;
+        drive->pc_update_buffers = NULL;
+        drive->pc_io_buffers     = ide_io_buffers;
 
         ide_proc_register_driver(drive, scsi->driver);
 }
@@ -456,7 +414,7 @@ static void ide_scsi_remove(ide_drive_t *drive)
 
         ide_scsi_put(scsi);
 
-        drive->scsi = 0;
+        drive->dev_flags &= ~IDE_DFLAG_SCSI;
 }
 
 static int ide_scsi_probe(ide_drive_t *);
@@ -477,7 +435,6 @@ static ide_driver_t idescsi_driver = {
         .probe                  = ide_scsi_probe,
         .remove                 = ide_scsi_remove,
         .version                = IDESCSI_VERSION,
-        .media                  = ide_scsi,
         .do_request             = idescsi_do_request,
         .end_request            = idescsi_end_request,
         .error                  = idescsi_atapi_error,
@@ -622,6 +579,8 @@ static int idescsi_eh_abort (struct scsi_cmnd *cmd)
         int             busy;
         int             ret   = FAILED;
 
+        struct ide_atapi_pc *pc;
+
         /* In idescsi_eh_abort we try to gently pry our command from the ide subsystem */
 
         if (test_bit(IDESCSI_LOG_CMD, &scsi->log))
@@ -642,26 +601,27 @@ static int idescsi_eh_abort (struct scsi_cmnd *cmd)
         spin_lock_irq(&ide_lock);
 
         /* If there is no pc running we're done (our interrupt took care of it) */
-        if (!scsi->pc) {
+        pc = drive->pc;
+        if (pc == NULL) {
                 ret = SUCCESS;
                 goto ide_unlock;
         }
 
         /* It's somewhere in flight. Does ide subsystem agree? */
-        if (scsi->pc->scsi_cmd->serial_number == cmd->serial_number && !busy &&
-            elv_queue_empty(drive->queue) && HWGROUP(drive)->rq != scsi->pc->rq) {
+        if (pc->scsi_cmd->serial_number == cmd->serial_number && !busy &&
+            elv_queue_empty(drive->queue) && HWGROUP(drive)->rq != pc->rq) {
                 /*
                  * FIXME - not sure this condition can ever occur
                  */
                 printk (KERN_ERR "ide-scsi: cmd aborted!\n");
 
-                if (blk_sense_request(scsi->pc->rq))
-                        kfree(scsi->pc->buf);
+                if (blk_sense_request(pc->rq))
+                        kfree(pc->buf);
                 /* we need to call blk_put_request twice. */
-                blk_put_request(scsi->pc->rq);
-                blk_put_request(scsi->pc->rq);
-                kfree(scsi->pc);
-                scsi->pc = NULL;
+                blk_put_request(pc->rq);
+                blk_put_request(pc->rq);
+                kfree(pc);
+                drive->pc = NULL;
 
                 ret = SUCCESS;
         }
@@ -683,6 +643,8 @@ static int idescsi_eh_reset (struct scsi_cmnd *cmd)
         int             ready = 0;
         int             ret   = SUCCESS;
 
+        struct ide_atapi_pc *pc;
+
         /* In idescsi_eh_reset we forcefully remove the command from the ide subsystem and reset the device. */
 
         if (test_bit(IDESCSI_LOG_CMD, &scsi->log))
@@ -697,7 +659,9 @@ static int idescsi_eh_reset (struct scsi_cmnd *cmd)
         spin_lock_irq(cmd->device->host->host_lock);
         spin_lock(&ide_lock);
 
-        if (!scsi->pc || (req = scsi->pc->rq) != HWGROUP(drive)->rq || !HWGROUP(drive)->handler) {
+        pc = drive->pc;
+
+        if (pc == NULL || (req = pc->rq) != HWGROUP(drive)->rq || !HWGROUP(drive)->handler) {
                 printk (KERN_WARNING "ide-scsi: No active request in idescsi_eh_reset\n");
                 spin_unlock(&ide_lock);
                 spin_unlock_irq(cmd->device->host->host_lock);
@@ -708,9 +672,9 @@ static int idescsi_eh_reset (struct scsi_cmnd *cmd)
         if (__blk_end_request(req, -EIO, 0))
                 BUG();
         if (blk_sense_request(req))
-                kfree(scsi->pc->buf);
-        kfree(scsi->pc);
-        scsi->pc = NULL;
+                kfree(pc->buf);
+        kfree(pc);
+        drive->pc = NULL;
         blk_put_request(req);
 
         /* now nuke the drive queue */
@@ -801,7 +765,7 @@ static int ide_scsi_probe(ide_drive_t *drive)
             !(host = scsi_host_alloc(&idescsi_template,sizeof(idescsi_scsi_t))))
                 return -ENODEV;
 
-        drive->scsi = 1;
+        drive->dev_flags |= IDE_DFLAG_SCSI;
 
         g = alloc_disk(1 << PARTN_BITS);
         if (!g)
@@ -842,7 +806,7 @@ static int ide_scsi_probe(ide_drive_t *drive)
 
         put_disk(g);
 out_host_put:
-        drive->scsi = 0;
+        drive->dev_flags &= ~IDE_DFLAG_SCSI;
         scsi_host_put(host);
         return err;
 }
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 1c79f9794f4e..0ea78d9a37db 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -5708,7 +5708,8 @@ static int osst_sysfs_add(dev_t dev, struct device *device, struct osst_tape * S
         struct device *osst_member;
         int err;
 
-        osst_member = device_create_drvdata(osst_sysfs_class, device, dev, STp, "%s", name);
+        osst_member = device_create(osst_sysfs_class, device, dev, STp,
+                                    "%s", name);
         if (IS_ERR(osst_member)) {
                 printk(KERN_WARNING "osst :W: Unable to add sysfs class member %s\n", name);
                 return PTR_ERR(osst_member);
diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c
index 2dd0dc9a9aed..165ff884f48e 100644
--- a/drivers/scsi/pcmcia/aha152x_stub.c
+++ b/drivers/scsi/pcmcia/aha152x_stub.c
@@ -140,44 +140,41 @@ static void aha152x_detach(struct pcmcia_device *link)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
+static int aha152x_config_check(struct pcmcia_device *p_dev,
+                                cistpl_cftable_entry_t *cfg,
+                                cistpl_cftable_entry_t *dflt,
+                                unsigned int vcc,
+                                void *priv_data)
+{
+        /* For New Media T&J, look for a SCSI window */
+        if (cfg->io.win[0].len >= 0x20)
+                p_dev->io.BasePort1 = cfg->io.win[0].base;
+        else if ((cfg->io.nwin > 1) &&
+                 (cfg->io.win[1].len >= 0x20))
+                p_dev->io.BasePort1 = cfg->io.win[1].base;
+        if ((cfg->io.nwin > 0) &&
+            (p_dev->io.BasePort1 < 0xffff)) {
+                if (!pcmcia_request_io(p_dev, &p_dev->io))
+                        return 0;
+        }
+        return -EINVAL;
+}
+
 static int aha152x_config_cs(struct pcmcia_device *link)
 {
     scsi_info_t *info = link->priv;
     struct aha152x_setup s;
-    tuple_t tuple;
-    cisparse_t parse;
-    int i, last_ret, last_fn;
-    u_char tuple_data[64];
+    int last_ret, last_fn;
     struct Scsi_Host *host;
-    
+
     DEBUG(0, "aha152x_config(0x%p)\n", link);
 
-    tuple.TupleData = tuple_data;
-    tuple.TupleDataMax = 64;
-    tuple.TupleOffset = 0;
-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-    tuple.Attributes = 0;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-    while (1) {
-        if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
-                pcmcia_parse_tuple(link, &tuple, &parse) != 0)
-            goto next_entry;
-        /* For New Media T&J, look for a SCSI window */
-        if (parse.cftable_entry.io.win[0].len >= 0x20)
-            link->io.BasePort1 = parse.cftable_entry.io.win[0].base;
-        else if ((parse.cftable_entry.io.nwin > 1) &&
-                 (parse.cftable_entry.io.win[1].len >= 0x20))
-            link->io.BasePort1 = parse.cftable_entry.io.win[1].base;
-        if ((parse.cftable_entry.io.nwin > 0) &&
-            (link->io.BasePort1 < 0xffff)) {
-            link->conf.ConfigIndex = parse.cftable_entry.index;
-            i = pcmcia_request_io(link, &link->io);
-            if (i == CS_SUCCESS) break;
-        }
-    next_entry:
-        CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
+    last_ret = pcmcia_loop_config(link, aha152x_config_check, NULL);
+    if (last_ret) {
+        cs_error(link, RequestIO, last_ret);
+        goto failed;
     }
-    
+
     CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
     CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
     
@@ -208,6 +205,7 @@ static int aha152x_config_cs(struct pcmcia_device *link)
 
 cs_failed:
     cs_error(link, last_fn, last_ret);
+failed:
     aha152x_release_cs(link);
     return -ENODEV;
 }
diff --git a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c
index d8b99351b053..06254f46a0dd 100644
--- a/drivers/scsi/pcmcia/fdomain_stub.c
+++ b/drivers/scsi/pcmcia/fdomain_stub.c
@@ -123,34 +123,30 @@ static void fdomain_detach(struct pcmcia_device *link)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
+static int fdomain_config_check(struct pcmcia_device *p_dev,
+                                cistpl_cftable_entry_t *cfg,
+                                cistpl_cftable_entry_t *dflt,
+                                unsigned int vcc,
+                                void *priv_data)
+{
+        p_dev->io.BasePort1 = cfg->io.win[0].base;
+        return pcmcia_request_io(p_dev, &p_dev->io);
+}
+
+
 static int fdomain_config(struct pcmcia_device *link)
 {
     scsi_info_t *info = link->priv;
-    tuple_t tuple;
-    cisparse_t parse;
-    int i, last_ret, last_fn;
-    u_char tuple_data[64];
+    int last_ret, last_fn;
     char str[22];
     struct Scsi_Host *host;
 
     DEBUG(0, "fdomain_config(0x%p)\n", link);
 
-    tuple.TupleData = tuple_data;
-    tuple.TupleDataMax = 64;
-    tuple.TupleOffset = 0;
-
-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-    while (1) {
-        if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
-                pcmcia_parse_tuple(link, &tuple, &parse) != 0)
-            goto next_entry;
-        link->conf.ConfigIndex = parse.cftable_entry.index;
-        link->io.BasePort1 = parse.cftable_entry.io.win[0].base;
-        i = pcmcia_request_io(link, &link->io);
-        if (i == CS_SUCCESS) break;
-    next_entry:
-        CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
+    last_ret = pcmcia_loop_config(link, fdomain_config_check, NULL);
+    if (last_ret) {
+            cs_error(link, RequestIO, last_ret);
+            goto failed;
     }
 
     CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
@@ -181,6 +177,7 @@ static int fdomain_config(struct pcmcia_device *link)
 
 cs_failed:
     cs_error(link, last_fn, last_ret);
+failed:
     fdomain_release(link);
     return -ENODEV;
 } /* fdomain_config */
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 24e6cb8396e3..11a61ea8d5d9 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -1606,133 +1606,129 @@ static void nsp_cs_detach(struct pcmcia_device *link)
     is received, to configure the PCMCIA socket, and to make the
     ethernet device available to the system.
 ======================================================================*/
-#define CS_CHECK(fn, ret) \
-do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
-/*====================================================================*/
-static int nsp_cs_config(struct pcmcia_device *link)
-{
-        int               ret;
-        scsi_info_t      *info   = link->priv;
-        tuple_t           tuple;
-        cisparse_t        parse;
-        int               last_ret, last_fn;
-        unsigned char     tuple_data[64];
-        config_info_t     conf;
-        win_req_t         req;
-        memreq_t          map;
-        cistpl_cftable_entry_t dflt = { 0 };
-        struct Scsi_Host *host;
-        nsp_hw_data      *data = &nsp_data_base;
-
-        nsp_dbg(NSP_DEBUG_INIT, "in");
-
-        tuple.Attributes      = 0;
-        tuple.TupleData       = tuple_data;
-        tuple.TupleDataMax    = sizeof(tuple_data);
-        tuple.TupleOffset     = 0;
-
-        /* Look up the current Vcc */
-        CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(link, &conf));
 
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-        while (1) {
-                cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
+struct nsp_cs_configdata {
+        nsp_hw_data             *data;
+        win_req_t               req;
+};
 
-                if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
-                                pcmcia_parse_tuple(link, &tuple, &parse) != 0)
-                        goto next_entry;
+static int nsp_cs_config_check(struct pcmcia_device *p_dev,
+                               cistpl_cftable_entry_t *cfg,
+                               cistpl_cftable_entry_t *dflt,
+                               unsigned int vcc,
+                               void *priv_data)
+{
+        struct nsp_cs_configdata *cfg_mem = priv_data;
 
-                if (cfg->flags & CISTPL_CFTABLE_DEFAULT) { dflt = *cfg; }
-                if (cfg->index == 0) { goto next_entry; }
-                link->conf.ConfigIndex = cfg->index;
+        if (cfg->index == 0)
+                return -ENODEV;
 
-                /* Does this card need audio output? */
-                if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
-                        link->conf.Attributes |= CONF_ENABLE_SPKR;
-                        link->conf.Status = CCSR_AUDIO_ENA;
-                }
+        /* Does this card need audio output? */
+        if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
+                p_dev->conf.Attributes |= CONF_ENABLE_SPKR;
+                p_dev->conf.Status = CCSR_AUDIO_ENA;
+        }
 
-                /* Use power settings for Vcc and Vpp if present */
-                /*  Note that the CIS values need to be rescaled */
-                if (cfg->vcc.present & (1<<CISTPL_POWER_VNOM)) {
-                        if (conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM]/10000) {
-                                goto next_entry;
-                        }
-                } else if (dflt.vcc.present & (1<<CISTPL_POWER_VNOM)) {
-                        if (conf.Vcc != dflt.vcc.param[CISTPL_POWER_VNOM]/10000) {
-                                goto next_entry;
-                        }
+        /* Use power settings for Vcc and Vpp if present */
+        /*  Note that the CIS values need to be rescaled */
+        if (cfg->vcc.present & (1<<CISTPL_POWER_VNOM)) {
+                if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM]/10000)
+                        return -ENODEV;
+                else if (dflt->vcc.present & (1<<CISTPL_POWER_VNOM)) {
+                        if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM]/10000)
+                                return -ENODEV;
                 }
 
                 if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM)) {
-                        link->conf.Vpp =
+                        p_dev->conf.Vpp =
                                 cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
-                } else if (dflt.vpp1.present & (1 << CISTPL_POWER_VNOM)) {
-                        link->conf.Vpp =
-                                dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;
+                } else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM)) {
+                        p_dev->conf.Vpp =
+                                dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000;
                 }
 
                 /* Do we need to allocate an interrupt? */
-                if (cfg->irq.IRQInfo1 || dflt.irq.IRQInfo1) {
-                        link->conf.Attributes |= CONF_ENABLE_IRQ;
-                }
+                if (cfg->irq.IRQInfo1 || dflt->irq.IRQInfo1)
+                        p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
 
                 /* IO window settings */
-                link->io.NumPorts1 = link->io.NumPorts2 = 0;
-                if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
-                        cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io;
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+                p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
+                if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
+                        cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
                         if (!(io->flags & CISTPL_IO_8BIT))
-                                link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+                                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
                         if (!(io->flags & CISTPL_IO_16BIT))
-                                link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-                        link->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
-                        link->io.BasePort1 = io->win[0].base;
-                        link->io.NumPorts1 = io->win[0].len;
+                                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                        p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
+                        p_dev->io.BasePort1 = io->win[0].base;
+                        p_dev->io.NumPorts1 = io->win[0].len;
                         if (io->nwin > 1) {
-                                link->io.Attributes2 = link->io.Attributes1;
-                                link->io.BasePort2 = io->win[1].base;
-                                link->io.NumPorts2 = io->win[1].len;
+                                p_dev->io.Attributes2 = p_dev->io.Attributes1;
+                                p_dev->io.BasePort2 = io->win[1].base;
+                                p_dev->io.NumPorts2 = io->win[1].len;
                         }
                         /* This reserves IO space but doesn't actually enable it */
-                        if (pcmcia_request_io(link, &link->io) != 0)
+                        if (pcmcia_request_io(p_dev, &p_dev->io) != 0)
                                 goto next_entry;
                 }
 
-                if ((cfg->mem.nwin > 0) || (dflt.mem.nwin > 0)) {
-                        cistpl_mem_t *mem =
-                                (cfg->mem.nwin) ? &cfg->mem : &dflt.mem;
-                        req.Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM;
-                        req.Attributes |= WIN_ENABLE;
-                        req.Base = mem->win[0].host_addr;
-                        req.Size = mem->win[0].len;
-                        if (req.Size < 0x1000) {
-                                req.Size = 0x1000;
-                        }
-                        req.AccessSpeed = 0;
-                        if (pcmcia_request_window(&link, &req, &link->win) != 0)
+                if ((cfg->mem.nwin > 0) || (dflt->mem.nwin > 0)) {
+                        memreq_t        map;
+                        cistpl_mem_t    *mem =
+                                (cfg->mem.nwin) ? &cfg->mem : &dflt->mem;
+                        cfg_mem->req.Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM;
+                        cfg_mem->req.Attributes |= WIN_ENABLE;
+                        cfg_mem->req.Base = mem->win[0].host_addr;
+                        cfg_mem->req.Size = mem->win[0].len;
+                        if (cfg_mem->req.Size < 0x1000)
+                                cfg_mem->req.Size = 0x1000;
+                        cfg_mem->req.AccessSpeed = 0;
+                        if (pcmcia_request_window(&p_dev, &cfg_mem->req, &p_dev->win) != 0)
                                 goto next_entry;
                         map.Page = 0; map.CardOffset = mem->win[0].card_addr;
-                        if (pcmcia_map_mem_page(link->win, &map) != 0)
+                        if (pcmcia_map_mem_page(p_dev->win, &map) != 0)
                                 goto next_entry;
 
-                        data->MmioAddress = (unsigned long)ioremap_nocache(req.Base, req.Size);
-                        data->MmioLength  = req.Size;
+                        cfg_mem->data->MmioAddress = (unsigned long) ioremap_nocache(cfg_mem->req.Base, cfg_mem->req.Size);
+                        cfg_mem->data->MmioLength  = cfg_mem->req.Size;
                 }
                 /* If we got this far, we're cool! */
-                break;
-
-        next_entry:
-                nsp_dbg(NSP_DEBUG_INIT, "next");
-                pcmcia_disable_device(link);
-                CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
+                return 0;
         }
 
+next_entry:
+        nsp_dbg(NSP_DEBUG_INIT, "next");
+        pcmcia_disable_device(p_dev);
+        return -ENODEV;
+}
+
+static int nsp_cs_config(struct pcmcia_device *link)
+{
+        int               ret;
+        scsi_info_t      *info   = link->priv;
+        struct nsp_cs_configdata *cfg_mem;
+        struct Scsi_Host *host;
+        nsp_hw_data      *data = &nsp_data_base;
+
+        nsp_dbg(NSP_DEBUG_INIT, "in");
+
+        cfg_mem = kzalloc(sizeof(cfg_mem), GFP_KERNEL);
+        if (!cfg_mem)
+                return -ENOMEM;
+        cfg_mem->data = data;
+
+        ret = pcmcia_loop_config(link, nsp_cs_config_check, cfg_mem);
+                goto cs_failed;
+
         if (link->conf.Attributes & CONF_ENABLE_IRQ) {
-                CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
+                if (pcmcia_request_irq(link, &link->irq))
+                        goto cs_failed;
         }
-        CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
+
+        ret = pcmcia_request_configuration(link, &link->conf);
+        if (ret)
+                goto cs_failed;
 
         if (free_ports) {
                 if (link->io.BasePort1) {
@@ -1790,20 +1786,20 @@ static int nsp_cs_config(struct pcmcia_device *link)
                 printk(" & 0x%04x-0x%04x", link->io.BasePort2,
                        link->io.BasePort2+link->io.NumPorts2-1);
         if (link->win)
-                printk(", mem 0x%06lx-0x%06lx", req.Base,
-                       req.Base+req.Size-1);
+                printk(", mem 0x%06lx-0x%06lx", cfg_mem->req.Base,
+                       cfg_mem->req.Base+cfg_mem->req.Size-1);
         printk("\n");
 
+        kfree(cfg_mem);
         return 0;
 
  cs_failed:
         nsp_dbg(NSP_DEBUG_INIT, "config fail");
-        cs_error(link, last_fn, last_ret);
         nsp_cs_release(link);
+        kfree(cfg_mem);
 
         return -ENODEV;
 } /* nsp_cs_config */
-#undef CS_CHECK
 
 
 /*======================================================================
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index 67c5a58d17df..20c3e5e6d88a 100644
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -195,39 +195,33 @@ static void qlogic_detach(struct pcmcia_device *link)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
+static int qlogic_config_check(struct pcmcia_device *p_dev,
+                               cistpl_cftable_entry_t *cfg,
+                               cistpl_cftable_entry_t *dflt,
+                               unsigned int vcc,
+                               void *priv_data)
+{
+        p_dev->io.BasePort1 = cfg->io.win[0].base;
+        p_dev->io.NumPorts1 = cfg->io.win[0].len;
+
+        if (p_dev->io.BasePort1 == 0)
+                return -ENODEV;
+
+        return pcmcia_request_io(p_dev, &p_dev->io);
+}
+
 static int qlogic_config(struct pcmcia_device * link)
 {
         scsi_info_t *info = link->priv;
-        tuple_t tuple;
-        cisparse_t parse;
-        int i, last_ret, last_fn;
-        unsigned short tuple_data[32];
+        int last_ret, last_fn;
         struct Scsi_Host *host;
 
         DEBUG(0, "qlogic_config(0x%p)\n", link);
 
-        info->manf_id = link->manf_id;
-
-        tuple.TupleData = (cisdata_t *) tuple_data;
-        tuple.TupleDataMax = 64;
-        tuple.TupleOffset = 0;
-
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-        while (1) {
-                if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
-                                pcmcia_parse_tuple(link, &tuple, &parse) != 0)
-                        goto next_entry;
-                link->conf.ConfigIndex = parse.cftable_entry.index;
-                link->io.BasePort1 = parse.cftable_entry.io.win[0].base;
-                link->io.NumPorts1 = parse.cftable_entry.io.win[0].len;
-                if (link->io.BasePort1 != 0) {
-                        i = pcmcia_request_io(link, &link->io);
-                        if (i == CS_SUCCESS)
-                                break;
-                }
-              next_entry:
-                CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
+        last_ret = pcmcia_loop_config(link, qlogic_config_check, NULL);
+        if (last_ret) {
+                cs_error(link, RequestIO, last_ret);
+                goto failed;
         }
 
         CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
@@ -262,6 +256,7 @@ static int qlogic_config(struct pcmcia_device * link)
 cs_failed:
         cs_error(link, last_fn, last_ret);
         pcmcia_disable_device(link);
+failed:
         return -ENODEV;
 
 }                               /* qlogic_config */
diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c
index 0be232b58ffb..b330c11a1752 100644
--- a/drivers/scsi/pcmcia/sym53c500_cs.c
+++ b/drivers/scsi/pcmcia/sym53c500_cs.c
@@ -700,15 +700,27 @@ static struct scsi_host_template sym53c500_driver_template = {
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
+static int SYM53C500_config_check(struct pcmcia_device *p_dev,
+                                  cistpl_cftable_entry_t *cfg,
+                                  cistpl_cftable_entry_t *dflt,
+                                  unsigned int vcc,
+                                  void *priv_data)
+{
+        p_dev->io.BasePort1 = cfg->io.win[0].base;
+        p_dev->io.NumPorts1 = cfg->io.win[0].len;
+
+        if (p_dev->io.BasePort1 == 0)
+                return -ENODEV;
+
+        return pcmcia_request_io(p_dev, &p_dev->io);
+}
+
 static int
 SYM53C500_config(struct pcmcia_device *link)
 {
         struct scsi_info_t *info = link->priv;
-        tuple_t tuple;
-        cisparse_t parse;
-        int i, last_ret, last_fn;
+        int last_ret, last_fn;
         int irq_level, port_base;
-        unsigned short tuple_data[32];
         struct Scsi_Host *host;
         struct scsi_host_template *tpnt = &sym53c500_driver_template;
         struct sym53c500_data *data;
@@ -717,27 +729,10 @@ SYM53C500_config(struct pcmcia_device *link)
 
         info->manf_id = link->manf_id;
 
-        tuple.TupleData = (cisdata_t *)tuple_data;
-        tuple.TupleDataMax = 64;
-        tuple.TupleOffset = 0;
-
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-        while (1) {
-                if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
-                    pcmcia_parse_tuple(link, &tuple, &parse) != 0)
-                        goto next_entry;
-                link->conf.ConfigIndex = parse.cftable_entry.index;
-                link->io.BasePort1 = parse.cftable_entry.io.win[0].base;
-                link->io.NumPorts1 = parse.cftable_entry.io.win[0].len;
-
-                if (link->io.BasePort1 != 0) {
-                        i = pcmcia_request_io(link, &link->io);
-                        if (i == CS_SUCCESS)
-                                break;
-                }
-next_entry:
-                CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
+        last_ret = pcmcia_loop_config(link, SYM53C500_config_check, NULL);
+        if (last_ret) {
+                cs_error(link, RequestIO, last_ret);
+                goto failed;
         }
 
         CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
@@ -831,6 +826,7 @@ err_release:
 
 cs_failed:
         cs_error(link, last_fn, last_ret);
+failed:
         SYM53C500_release(link);
         return -ENODEV;
 } /* SYM53C500_config */
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index ba9b9bbd4e73..93bd59a1ed79 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1450,12 +1450,10 @@ sg_add(struct device *cl_dev, struct class_interface *cl_intf)
         if (sg_sysfs_valid) {
                 struct device *sg_class_member;
 
-                sg_class_member = device_create_drvdata(sg_sysfs_class,
-                                                        cl_dev->parent,
-                                                        MKDEV(SCSI_GENERIC_MAJOR,
-                                                              sdp->index),
-                                                        sdp,
-                                                        "%s", disk->disk_name);
+                sg_class_member = device_create(sg_sysfs_class, cl_dev->parent,
+                                                MKDEV(SCSI_GENERIC_MAJOR,
+                                                      sdp->index),
+                                                sdp, "%s", disk->disk_name);
                 if (IS_ERR(sg_class_member)) {
                         printk(KERN_ERR "sg_add: "
                                "device_create failed\n");
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index c2bb53e3d941..5c28d08f18f4 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -4428,13 +4428,10 @@ static int do_create_class_files(struct scsi_tape *STp, int dev_num, int mode)
                 snprintf(name, 10, "%s%s%s", rew ? "n" : "",
                          STp->disk->disk_name, st_formats[i]);
                 st_class_member =
-                        device_create_drvdata(st_sysfs_class,
-                                              &STp->device->sdev_gendev,
-                                              MKDEV(SCSI_TAPE_MAJOR,
-                                                    TAPE_MINOR(dev_num,
-                                                              mode, rew)),
-                                              &STp->modes[mode],
-                                              "%s", name);
+                        device_create(st_sysfs_class, &STp->device->sdev_gendev,
+                                      MKDEV(SCSI_TAPE_MAJOR,
+                                            TAPE_MINOR(dev_num, mode, rew)),
+                                      &STp->modes[mode], "%s", name);
                 if (IS_ERR(st_class_member)) {
                         printk(KERN_WARNING "st%d: device_create failed\n",
                                dev_num);
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 9ccc563d8730..1528de23a650 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -44,6 +44,10 @@
 
 #include "8250.h"
 
+#ifdef CONFIG_SPARC
+#include "suncore.h"
+#endif
+
 /*
  * Configuration:
  *   share_irqs - whether we pass IRQF_SHARED to request_irq().  This option
@@ -53,6 +57,13 @@ static unsigned int share_irqs = SERIAL8250_SHARE_IRQS;
 
 static unsigned int nr_uarts = CONFIG_SERIAL_8250_RUNTIME_UARTS;
 
+static struct uart_driver serial8250_reg;
+
+static int serial_index(struct uart_port *port)
+{
+        return (serial8250_reg.minor - 64) + port->line;
+}
+
 /*
  * Debugging.
  */
@@ -536,7 +547,7 @@ static unsigned int serial_icr_read(struct uart_8250_port *up, int offset)
 /*
  * FIFO support.
  */
-static inline void serial8250_clear_fifos(struct uart_8250_port *p)
+static void serial8250_clear_fifos(struct uart_8250_port *p)
 {
         if (p->capabilities & UART_CAP_FIFO) {
                 serial_outp(p, UART_FCR, UART_FCR_ENABLE_FIFO);
@@ -551,7 +562,7 @@ static inline void serial8250_clear_fifos(struct uart_8250_port *p)
  * capability" bit enabled.  Note that on XR16C850s, we need to
  * reset LCR to write to IER.
  */
-static inline void serial8250_set_sleep(struct uart_8250_port *p, int sleep)
+static void serial8250_set_sleep(struct uart_8250_port *p, int sleep)
 {
         if (p->capabilities & UART_CAP_SLEEP) {
                 if (p->capabilities & UART_CAP_EFR) {
@@ -993,7 +1004,7 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
                 return;
 
         DEBUG_AUTOCONF("ttyS%d: autoconf (0x%04x, 0x%p): ",
-                        up->port.line, up->port.iobase, up->port.membase);
+                       serial_index(&up->port), up->port.iobase, up->port.membase);
 
         /*
          * We really do need global IRQs disabled here - we're going to
@@ -1128,8 +1139,8 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
         if (up->capabilities != uart_config[up->port.type].flags) {
                 printk(KERN_WARNING
                        "ttyS%d: detected caps %08x should be %08x\n",
-                        up->port.line, up->capabilities,
-                        uart_config[up->port.type].flags);
+                       serial_index(&up->port), up->capabilities,
+                       uart_config[up->port.type].flags);
         }
 
         up->port.fifosize = uart_config[up->port.type].fifo_size;
@@ -1424,8 +1435,7 @@ static unsigned int check_modem_status(struct uart_8250_port *up)
 /*
  * This handles the interrupt from one port.
  */
-static inline void
-serial8250_handle_port(struct uart_8250_port *up)
+static void serial8250_handle_port(struct uart_8250_port *up)
 {
         unsigned int status;
         unsigned long flags;
@@ -1719,7 +1729,7 @@ static void serial8250_break_ctl(struct uart_port *port, int break_state)
 /*
  *      Wait for transmitter & holding register to empty
  */
-static inline void wait_for_xmitr(struct uart_8250_port *up, int bits)
+static void wait_for_xmitr(struct uart_8250_port *up, int bits)
 {
         unsigned int status, tmout = 10000;
 
@@ -1854,7 +1864,8 @@ static int serial8250_startup(struct uart_port *port)
          */
         if (!(up->port.flags & UPF_BUGGY_UART) &&
             (serial_inp(up, UART_LSR) == 0xff)) {
-                printk("ttyS%d: LSR safety check engaged!\n", up->port.line);
+                printk(KERN_INFO "ttyS%d: LSR safety check engaged!\n",
+                       serial_index(&up->port));
                 return -ENODEV;
         }
 
@@ -1909,7 +1920,8 @@ static int serial8250_startup(struct uart_port *port)
                  */
                 if (!(iir1 & UART_IIR_NO_INT) && (iir & UART_IIR_NO_INT)) {
                         up->bugs |= UART_BUG_THRE;
-                        pr_debug("ttyS%d - using backup timer\n", port->line);
+                        pr_debug("ttyS%d - using backup timer\n",
+                                 serial_index(port));
                 }
         }
 
@@ -1969,7 +1981,7 @@ static int serial8250_startup(struct uart_port *port)
                 if (!(up->bugs & UART_BUG_TXEN)) {
                         up->bugs |= UART_BUG_TXEN;
                         pr_debug("ttyS%d - enabling bad tx status workarounds\n",
-                                 port->line);
+                                 serial_index(port));
                 }
         } else {
                 up->bugs &= ~UART_BUG_TXEN;
@@ -2211,9 +2223,9 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
                 serial_outp(up, UART_EFR, efr);
         }
 
-#ifdef CONFIG_ARCH_OMAP15XX
+#ifdef CONFIG_ARCH_OMAP
         /* Workaround to enable 115200 baud on OMAP1510 internal ports */
-        if (cpu_is_omap1510() && is_omap_port((unsigned int)up->port.membase)) {
+        if (cpu_is_omap1510() && is_omap_port(up)) {
                 if (baud == 115200) {
                         quot = 1;
                         serial_out(up, UART_OMAP_OSC_12M_SEL, 1);
@@ -2266,18 +2278,27 @@ serial8250_pm(struct uart_port *port, unsigned int state,
                 p->pm(port, state, oldstate);
 }
 
+static unsigned int serial8250_port_size(struct uart_8250_port *pt)
+{
+        if (pt->port.iotype == UPIO_AU)
+                return 0x100000;
+#ifdef CONFIG_ARCH_OMAP
+        if (is_omap_port(pt))
+                return 0x16 << pt->port.regshift;
+#endif
+        return 8 << pt->port.regshift;
+}
+
 /*
  * Resource handling.
  */
 static int serial8250_request_std_resource(struct uart_8250_port *up)
 {
-        unsigned int size = 8 << up->port.regshift;
+        unsigned int size = serial8250_port_size(up);
         int ret = 0;
 
         switch (up->port.iotype) {
         case UPIO_AU:
-                size = 0x100000;
-                /* fall thru */
         case UPIO_TSI:
         case UPIO_MEM32:
         case UPIO_MEM:
@@ -2311,12 +2332,10 @@ static int serial8250_request_std_resource(struct uart_8250_port *up)
 
 static void serial8250_release_std_resource(struct uart_8250_port *up)
 {
-        unsigned int size = 8 << up->port.regshift;
+        unsigned int size = serial8250_port_size(up);
 
         switch (up->port.iotype) {
         case UPIO_AU:
-                size = 0x100000;
-                /* fall thru */
         case UPIO_TSI:
         case UPIO_MEM32:
         case UPIO_MEM:
@@ -2630,7 +2649,6 @@ static int serial8250_console_early_setup(void)
         return serial8250_find_port_for_earlycon();
 }
 
-static struct uart_driver serial8250_reg;
 static struct console serial8250_console = {
         .name           = "ttyS",
         .write          = serial8250_console_write,
@@ -2677,7 +2695,6 @@ static struct uart_driver serial8250_reg = {
         .dev_name               = "ttyS",
         .major                  = TTY_MAJOR,
         .minor                  = 64,
-        .nr                     = UART_NR,
         .cons                   = SERIAL8250_CONSOLE,
 };
 
@@ -2962,7 +2979,12 @@ static int __init serial8250_init(void)
         for (i = 0; i < NR_IRQS; i++)
                 spin_lock_init(&irq_lists[i].lock);
 
+#ifdef CONFIG_SPARC
+        ret = sunserial_register_minors(&serial8250_reg, UART_NR);
+#else
+        serial8250_reg.nr = UART_NR;
         ret = uart_register_driver(&serial8250_reg);
+#endif
         if (ret)
                 goto out;
 
@@ -2987,7 +3009,11 @@ static int __init serial8250_init(void)
  put_dev:
         platform_device_put(serial8250_isa_devs);
  unreg_uart_drv:
+#ifdef CONFIG_SPARC
+        sunserial_unregister_minors(&serial8250_reg, UART_NR);
+#else
         uart_unregister_driver(&serial8250_reg);
+#endif
  out:
         return ret;
 }
@@ -3006,7 +3032,11 @@ static void __exit serial8250_exit(void)
         platform_driver_unregister(&serial8250_isa_driver);
         platform_device_unregister(isa_dev);
 
+#ifdef CONFIG_SPARC
+        sunserial_unregister_minors(&serial8250_reg, UART_NR);
+#else
         uart_unregister_driver(&serial8250_reg);
+#endif
 }
 
 module_init(serial8250_init);
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index c2f23933155b..c014ffb110e9 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -2041,9 +2041,9 @@ static int pciserial_resume_one(struct pci_dev *dev)
                  * The device may have been disabled.  Re-enable it.
                  */
                 err = pci_enable_device(dev);
+                /* FIXME: We cannot simply error out here */
                 if (err)
-                        return err;
-
+                        printk(KERN_ERR "pciserial: Unable to re-enable ports, trying to continue.\n");
                 pciserial_resume_ports(priv);
         }
         return 0;
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 77cb34270fc1..db783b77a881 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -9,7 +9,6 @@ menu "Serial drivers"
 # The new 8250/16550 serial drivers
 config SERIAL_8250
         tristate "8250/16550 and compatible serial support"
-        depends on (BROKEN || !SPARC)
         select SERIAL_CORE
         ---help---
           This selects whether you want to include the driver for the standard
@@ -994,24 +993,12 @@ config SERIAL_68328_RTS_CTS
         bool "Support RTS/CTS on 68328 serial port"
         depends on SERIAL_68328
 
-config SERIAL_COLDFIRE
-        bool "ColdFire serial support (DEPRECATED)"
-        depends on COLDFIRE
-        help
-          This driver supports the built-in serial ports of the Motorola ColdFire
-          family of CPUs.
-          This driver is deprecated because it supports only the old interface
-          for serial drivers and features like magic keys are not working.
-          Please switch to the new style driver because this driver will be
-          removed soon.
-
 config SERIAL_MCF
-        bool "Coldfire serial support (new style driver)"
+        bool "Coldfire serial support"
         depends on COLDFIRE
         select SERIAL_CORE
         help
-          This new serial driver supports the Freescale Coldfire serial ports
-          using the new serial driver subsystem.
+          This serial driver supports the Freescale Coldfire serial ports.
 
 config SERIAL_MCF_BAUDRATE
         int "Default baudrate for Coldfire serial ports"
@@ -1136,42 +1123,6 @@ config SERIAL_CPM_CONSOLE
           your boot loader (lilo or loadlin) about how to pass options to the
           kernel at boot time.)
 
-config SERIAL_CPM_SCC1
-        bool "Support for SCC1 serial port"
-        depends on SERIAL_CPM=y
-        help
-          Select this option to use SCC1 as a serial port
-
-config SERIAL_CPM_SCC2
-        bool "Support for SCC2 serial port"
-        depends on SERIAL_CPM=y
-        help
-          Select this option to use SCC2 as a serial port
-
-config SERIAL_CPM_SCC3
-        bool "Support for SCC3 serial port"
-        depends on SERIAL_CPM=y
-        help
-          Select this option to use SCC3 as a serial port
-
-config SERIAL_CPM_SCC4
-        bool "Support for SCC4 serial port"
-        depends on SERIAL_CPM=y
-        help
-          Select this option to use SCC4 as a serial port
-
-config SERIAL_CPM_SMC1
-        bool "Support for SMC1 serial port"
-        depends on SERIAL_CPM=y
-        help
-          Select this option to use SMC1 as a serial port
-
-config SERIAL_CPM_SMC2
-        bool "Support for SMC2 serial port"
-        depends on SERIAL_CPM=y
-        help
-          Select this option to use SMC2 as a serial port
-
 config SERIAL_SGI_L1_CONSOLE
         bool "SGI Altix L1 serial console support"
         depends on IA64_GENERIC || IA64_SGI_SN2
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 7e7383e890d8..0c17c8ddb19d 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -4,6 +4,16 @@
 
 obj-$(CONFIG_SERIAL_CORE) += serial_core.o
 obj-$(CONFIG_SERIAL_21285) += 21285.o
+
+# These Sparc drivers have to appear before others such as 8250
+# which share ttySx minor node space.  Otherwise console device
+# names change and other unplesantries.
+obj-$(CONFIG_SERIAL_SUNCORE) += suncore.o
+obj-$(CONFIG_SERIAL_SUNHV) += sunhv.o
+obj-$(CONFIG_SERIAL_SUNZILOG) += sunzilog.o
+obj-$(CONFIG_SERIAL_SUNSU) += sunsu.o
+obj-$(CONFIG_SERIAL_SUNSAB) += sunsab.o
+
 obj-$(CONFIG_SERIAL_8250) += 8250.o
 obj-$(CONFIG_SERIAL_8250_PNP) += 8250_pnp.o
 obj-$(CONFIG_SERIAL_8250_GSC) += 8250_gsc.o
@@ -31,16 +41,10 @@ obj-$(CONFIG_SERIAL_S3C2400) += s3c2400.o
 obj-$(CONFIG_SERIAL_S3C2410) += s3c2410.o
 obj-$(CONFIG_SERIAL_S3C2412) += s3c2412.o
 obj-$(CONFIG_SERIAL_S3C2440) += s3c2440.o
-obj-$(CONFIG_SERIAL_SUNCORE) += suncore.o
-obj-$(CONFIG_SERIAL_SUNHV) += sunhv.o
-obj-$(CONFIG_SERIAL_SUNZILOG) += sunzilog.o
 obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o
-obj-$(CONFIG_SERIAL_SUNSU) += sunsu.o
-obj-$(CONFIG_SERIAL_SUNSAB) += sunsab.o
 obj-$(CONFIG_SERIAL_MUX) += mux.o
 obj-$(CONFIG_SERIAL_68328) += 68328serial.o
 obj-$(CONFIG_SERIAL_68360) += 68360serial.o
-obj-$(CONFIG_SERIAL_COLDFIRE) += mcfserial.o
 obj-$(CONFIG_SERIAL_MCF) += mcf.o
 obj-$(CONFIG_SERIAL_PMACZILOG) += pmac_zilog.o
 obj-$(CONFIG_SERIAL_LH7A40X) += serial_lh7a40x.o
diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c
index 4a0d30bed9f1..569f0e2476c6 100644
--- a/drivers/serial/bfin_5xx.c
+++ b/drivers/serial/bfin_5xx.c
@@ -1,7 +1,7 @@
 /*
  * Blackfin On-Chip Serial Driver
  *
- * Copyright 2006-2007 Analog Devices Inc.
+ * Copyright 2006-2008 Analog Devices Inc.
  *
  * Enter bugs at http://blackfin.uclinux.org/
  *
@@ -42,6 +42,9 @@
 #define BFIN_SERIAL_MAJOR       204
 #define BFIN_SERIAL_MINOR       64
 
+static struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS];
+static int nr_active_ports = ARRAY_SIZE(bfin_serial_resource);
+
 /*
  * Setup for console. Argument comes from the menuconfig
  */
@@ -126,13 +129,13 @@ static int kgdb_entry_state;
 void kgdb_put_debug_char(int chr)
 {
         struct bfin_serial_port *uart;
-        
+
         if (CONFIG_KGDB_UART_PORT < 0
                 || CONFIG_KGDB_UART_PORT >= BFIN_UART_NR_PORTS)
                 uart = &bfin_serial_ports[0];
         else
                 uart = &bfin_serial_ports[CONFIG_KGDB_UART_PORT];
-        
+
         while (!(UART_GET_LSR(uart) & THRE)) {
                 SSYNC();
         }
@@ -152,7 +155,7 @@ int kgdb_get_debug_char(void)
                 uart = &bfin_serial_ports[0];
         else
                 uart = &bfin_serial_ports[CONFIG_KGDB_UART_PORT];
-        
+
         while(!(UART_GET_LSR(uart) & DR)) {
                 SSYNC();
         }
@@ -298,7 +301,11 @@ static void bfin_serial_tx_chars(struct bfin_serial_port *uart)
         bfin_serial_mctrl_check(uart);
 
         if (uart_circ_empty(xmit) || uart_tx_stopped(&uart->port)) {
-                bfin_serial_stop_tx(&uart->port);
+#ifdef CONFIG_BF54x
+                /* Clear TFI bit */
+                UART_PUT_LSR(uart, TFI);
+#endif
+                UART_CLEAR_IER(uart, ETBEI);
                 return;
         }
 
@@ -317,9 +324,6 @@ static void bfin_serial_tx_chars(struct bfin_serial_port *uart)
 
         if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
                 uart_write_wakeup(&uart->port);
-
-        if (uart_circ_empty(xmit))
-                bfin_serial_stop_tx(&uart->port);
 }
 
 static irqreturn_t bfin_serial_rx_int(int irq, void *dev_id)
@@ -645,6 +649,42 @@ static int bfin_serial_startup(struct uart_port *port)
                 free_irq(uart->port.irq, uart);
                 return -EBUSY;
         }
+
+# ifdef CONFIG_BF54x
+        {
+                unsigned uart_dma_ch_rx, uart_dma_ch_tx;
+
+                switch (uart->port.irq) {
+                case IRQ_UART3_RX:
+                        uart_dma_ch_rx = CH_UART3_RX;
+                        uart_dma_ch_tx = CH_UART3_TX;
+                        break;
+                case IRQ_UART2_RX:
+                        uart_dma_ch_rx = CH_UART2_RX;
+                        uart_dma_ch_tx = CH_UART2_TX;
+                        break;
+                default:
+                        uart_dma_ch_rx = uart_dma_ch_tx = 0;
+                        break;
+                };
+
+                if (uart_dma_ch_rx &&
+                        request_dma(uart_dma_ch_rx, "BFIN_UART_RX") < 0) {
+                        printk(KERN_NOTICE"Fail to attach UART interrupt\n");
+                        free_irq(uart->port.irq, uart);
+                        free_irq(uart->port.irq + 1, uart);
+                        return -EBUSY;
+                }
+                if (uart_dma_ch_tx &&
+                        request_dma(uart_dma_ch_tx, "BFIN_UART_TX") < 0) {
+                        printk(KERN_NOTICE "Fail to attach UART interrupt\n");
+                        free_dma(uart_dma_ch_rx);
+                        free_irq(uart->port.irq, uart);
+                        free_irq(uart->port.irq + 1, uart);
+                        return -EBUSY;
+                }
+        }
+# endif
 #endif
         UART_SET_IER(uart, ERBFI);
         return 0;
@@ -662,6 +702,20 @@ static void bfin_serial_shutdown(struct uart_port *port)
         del_timer(&(uart->rx_dma_timer));
         dma_free_coherent(NULL, PAGE_SIZE, uart->rx_dma_buf.buf, 0);
 #else
+#ifdef CONFIG_BF54x
+        switch (uart->port.irq) {
+        case IRQ_UART3_RX:
+                free_dma(CH_UART3_RX);
+                free_dma(CH_UART3_TX);
+                break;
+        case IRQ_UART2_RX:
+                free_dma(CH_UART2_RX);
+                free_dma(CH_UART2_TX);
+                break;
+        default:
+                break;
+        };
+#endif
 #ifdef  CONFIG_KGDB_UART
         if (uart->port.line != CONFIG_KGDB_UART_PORT)
 #endif
@@ -757,6 +811,9 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios,
         val |= UCEN;
         UART_PUT_GCTL(uart, val);
 
+        /* Port speed changed, update the per-port timeout. */
+        uart_update_timeout(port, termios->c_cflag, baud);
+
         spin_unlock_irqrestore(&uart->port.lock, flags);
 }
 
@@ -859,8 +916,9 @@ static void __init bfin_serial_init_ports(void)
                 return;
         first = 0;
 
-        for (i = 0; i < nr_ports; i++) {
+        for (i = 0; i < nr_active_ports; i++) {
                 bfin_serial_ports[i].port.uartclk   = get_sclk();
+                bfin_serial_ports[i].port.fifosize  = BFIN_UART_TX_FIFO_SIZE;
                 bfin_serial_ports[i].port.ops       = &bfin_serial_pops;
                 bfin_serial_ports[i].port.line      = i;
                 bfin_serial_ports[i].port.iotype    = UPIO_MEM;
@@ -961,7 +1019,7 @@ bfin_serial_console_setup(struct console *co, char *options)
          * if so, search for the first available port that does have
          * console support.
          */
-        if (co->index == -1 || co->index >= nr_ports)
+        if (co->index == -1 || co->index >= nr_active_ports)
                 co->index = 0;
         uart = &bfin_serial_ports[co->index];
 
@@ -1056,7 +1114,7 @@ static __init void early_serial_write(struct console *con, const char *s,
         }
 }
 
-static struct __init console bfin_early_serial_console = {
+static struct __initdata console bfin_early_serial_console = {
         .name = "early_BFuart",
         .write = early_serial_write,
         .device = uart_console_device,
@@ -1072,7 +1130,7 @@ struct console __init *bfin_earlyserial_init(unsigned int port,
         struct bfin_serial_port *uart;
         struct ktermios t;
 
-        if (port == -1 || port >= nr_ports)
+        if (port == -1 || port >= nr_active_ports)
                 port = 0;
         bfin_serial_init_ports();
         bfin_early_serial_console.index = port;
@@ -1100,20 +1158,26 @@ static struct uart_driver bfin_serial_reg = {
 
 static int bfin_serial_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct bfin_serial_port *uart = platform_get_drvdata(dev);
+        int i;
 
-        if (uart)
-                uart_suspend_port(&bfin_serial_reg, &uart->port);
+        for (i = 0; i < nr_active_ports; i++) {
+                if (bfin_serial_ports[i].port.dev != &dev->dev)
+                        continue;
+                uart_suspend_port(&bfin_serial_reg, &bfin_serial_ports[i].port);
+        }
 
         return 0;
 }
 
 static int bfin_serial_resume(struct platform_device *dev)
 {
-        struct bfin_serial_port *uart = platform_get_drvdata(dev);
+        int i;
 
-        if (uart)
-                uart_resume_port(&bfin_serial_reg, &uart->port);
+        for (i = 0; i < nr_active_ports; i++) {
+                if (bfin_serial_ports[i].port.dev != &dev->dev)
+                        continue;
+                uart_resume_port(&bfin_serial_reg, &bfin_serial_ports[i].port);
+        }
 
         return 0;
 }
@@ -1128,32 +1192,31 @@ static int bfin_serial_probe(struct platform_device *dev)
                         break;
 
         if (i < dev->num_resources) {
-                for (i = 0; i < nr_ports; i++, res++) {
+                for (i = 0; i < nr_active_ports; i++, res++) {
                         if (bfin_serial_ports[i].port.mapbase != res->start)
                                 continue;
                         bfin_serial_ports[i].port.dev = &dev->dev;
                         uart_add_one_port(&bfin_serial_reg, &bfin_serial_ports[i].port);
-                        platform_set_drvdata(dev, &bfin_serial_ports[i]);
                 }
         }
 
         return 0;
 }
 
-static int bfin_serial_remove(struct platform_device *pdev)
+static int bfin_serial_remove(struct platform_device *dev)
 {
-        struct bfin_serial_port *uart = platform_get_drvdata(pdev);
-
+        int i;
 
+        for (i = 0; i < nr_active_ports; i++) {
+                if (bfin_serial_ports[i].port.dev != &dev->dev)
+                        continue;
+                uart_remove_one_port(&bfin_serial_reg, &bfin_serial_ports[i].port);
+                bfin_serial_ports[i].port.dev = NULL;
 #ifdef CONFIG_SERIAL_BFIN_CTSRTS
-        gpio_free(uart->cts_pin);
-        gpio_free(uart->rts_pin);
+                gpio_free(bfin_serial_ports[i].cts_pin);
+                gpio_free(bfin_serial_ports[i].rts_pin);
 #endif
-
-        platform_set_drvdata(pdev, NULL);
-
-        if (uart)
-                uart_remove_one_port(&bfin_serial_reg, &uart->port);
+        }
 
         return 0;
 }
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c
index 25efca5a7a1f..a6c4d744495e 100644
--- a/drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -1333,6 +1333,9 @@ static int __devinit cpm_uart_probe(struct of_device *ofdev,
         if (ret)
                 return ret;
 
+        /* initialize the device pointer for the port */
+        pinfo->port.dev = &ofdev->dev;
+
         return uart_add_one_port(&cpm_reg, &pinfo->port);
 }
 
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/serial/cpm_uart/cpm_uart_cpm1.c
index 0f0aff06c596..1b94c56ec239 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm1.c
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.c
@@ -100,7 +100,7 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
                 mem_addr = (u8 *) cpm_dpram_addr(cpm_dpalloc(memsz, 8));
                 dma_addr = (u32)cpm_dpram_phys(mem_addr);
         } else
-                mem_addr = dma_alloc_coherent(NULL, memsz, &dma_addr,
+                mem_addr = dma_alloc_coherent(pinfo->port.dev, memsz, &dma_addr,
                                               GFP_KERNEL);
 
         if (mem_addr == NULL) {
@@ -127,8 +127,8 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
 
 void cpm_uart_freebuf(struct uart_cpm_port *pinfo)
 {
-        dma_free_coherent(NULL, L1_CACHE_ALIGN(pinfo->rx_nrfifos *
-                                               pinfo->rx_fifosize) +
+        dma_free_coherent(pinfo->port.dev, L1_CACHE_ALIGN(pinfo->rx_nrfifos *
+                                                          pinfo->rx_fifosize) +
                           L1_CACHE_ALIGN(pinfo->tx_nrfifos *
                                          pinfo->tx_fifosize), pinfo->mem_addr,
                           pinfo->dma_addr);
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
index b8db4d3eed36..141c0a3333ad 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
@@ -136,7 +136,7 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
                 dma_addr = virt_to_bus(mem_addr);
         }
         else
-                mem_addr = dma_alloc_coherent(NULL, memsz, &dma_addr,
+                mem_addr = dma_alloc_coherent(pinfo->port.dev, memsz, &dma_addr,
                                               GFP_KERNEL);
 
         if (mem_addr == NULL) {
@@ -163,8 +163,8 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
 
 void cpm_uart_freebuf(struct uart_cpm_port *pinfo)
 {
-        dma_free_coherent(NULL, L1_CACHE_ALIGN(pinfo->rx_nrfifos *
-                                               pinfo->rx_fifosize) +
+        dma_free_coherent(pinfo->port.dev, L1_CACHE_ALIGN(pinfo->rx_nrfifos *
+                                                          pinfo->rx_fifosize) +
                           L1_CACHE_ALIGN(pinfo->tx_nrfifos *
                                          pinfo->tx_fifosize), (void __force *)pinfo->mem_addr,
                           pinfo->dma_addr);
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index bf94a770bb44..211c21797ce0 100644
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -457,7 +457,6 @@ static struct e100_serial rs_table[] = {
 #define NR_PORTS (sizeof(rs_table)/sizeof(struct e100_serial))
 
 static struct ktermios *serial_termios[NR_PORTS];
-static struct ktermios *serial_termios_locked[NR_PORTS];
 #ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER
 static struct fast_timer fast_timers[NR_PORTS];
 #endif
@@ -4419,6 +4418,7 @@ rs_init(void)
                         rs485_pa_bit)) {
                 printk(KERN_CRIT "ETRAX100LX serial: Could not allocate "
                         "RS485 pin\n");
+                put_tty_driver(driver);
                 return -EBUSY;
         }
 #endif
@@ -4427,6 +4427,7 @@ rs_init(void)
                         rs485_port_g_bit)) {
                 printk(KERN_CRIT "ETRAX100LX serial: Could not allocate "
                         "RS485 pin\n");
+                put_tty_driver(driver);
                 return -EBUSY;
         }
 #endif
@@ -4446,8 +4447,6 @@ rs_init(void)
         driver->init_termios.c_ispeed = 115200;
         driver->init_termios.c_ospeed = 115200;
         driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
-        driver->termios = serial_termios;
-        driver->termios_locked = serial_termios_locked;
 
         tty_set_operations(driver, &rs_ops);
         serial_driver = driver;
diff --git a/drivers/serial/mcfserial.c b/drivers/serial/mcfserial.c
deleted file mode 100644
index fbe3835f6b77..000000000000
--- a/drivers/serial/mcfserial.c
+++ /dev/null
@@ -1,1965 +0,0 @@
-#warning This driver is deprecated. Check Kconfig for details.
-/*
- * mcfserial.c -- serial driver for ColdFire internal UARTS.
- *
- * Copyright (C) 1999-2003 Greg Ungerer <gerg@snapgear.com>
- * Copyright (c) 2000-2001 Lineo, Inc. <www.lineo.com> 
- * Copyright (C) 2001-2002 SnapGear Inc. <www.snapgear.com> 
- *
- * Based on code from 68332serial.c which was:
- *
- * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
- * Copyright (C) 1998 TSHG
- * Copyright (c) 1999 Rt-Control Inc. <jeff@uclinux.org>
- *
- * Changes:
- * 08/07/2003    Daniele Bellucci <bellucda@tiscali.it>
- *               some cleanups in mcfrs_write.
- *
- */
- 
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/timer.h>
-#include <linux/wait.h>
-#include <linux/interrupt.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/string.h>
-#include <linux/fcntl.h>
-#include <linux/mm.h>
-#include <linux/kernel.h>
-#include <linux/serial.h>
-#include <linux/serialP.h>
-#include <linux/console.h>
-#include <linux/init.h>
-#include <linux/bitops.h>
-#include <linux/delay.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/system.h>
-#include <asm/delay.h>
-#include <asm/coldfire.h>
-#include <asm/mcfsim.h>
-#include <asm/mcfuart.h>
-#include <asm/nettel.h>
-#include <asm/uaccess.h>
-#include "mcfserial.h"
-
-struct timer_list mcfrs_timer_struct;
-
-/*
- *      Default console baud rate,  we use this as the default
- *      for all ports so init can just open /dev/console and
- *      keep going.  Perhaps one day the cflag settings for the
- *      console can be used instead.
- */
-#if defined(CONFIG_HW_FEITH)
-#define CONSOLE_BAUD_RATE       38400
-#define DEFAULT_CBAUD           B38400
-#elif defined(CONFIG_MOD5272) || defined(CONFIG_M5208EVB) || \
-      defined(CONFIG_M5329EVB) || defined(CONFIG_GILBARCO)
-#define CONSOLE_BAUD_RATE       115200
-#define DEFAULT_CBAUD           B115200
-#elif defined(CONFIG_ARNEWSH) || defined(CONFIG_FREESCALE) || \
-      defined(CONFIG_senTec) || defined(CONFIG_SNEHA) || defined(CONFIG_AVNET)
-#define CONSOLE_BAUD_RATE       19200
-#define DEFAULT_CBAUD           B19200
-#endif
-
-#ifndef CONSOLE_BAUD_RATE
-#define CONSOLE_BAUD_RATE       9600
-#define DEFAULT_CBAUD           B9600
-#endif
-
-int mcfrs_console_inited = 0;
-int mcfrs_console_port = -1;
-int mcfrs_console_baud = CONSOLE_BAUD_RATE;
-int mcfrs_console_cbaud = DEFAULT_CBAUD;
-
-/*
- *      Driver data structures.
- */
-static struct tty_driver *mcfrs_serial_driver;
-
-/* number of characters left in xmit buffer before we ask for more */
-#define WAKEUP_CHARS 256
-
-/* Debugging...
- */
-#undef SERIAL_DEBUG_OPEN
-#undef SERIAL_DEBUG_FLOW
-
-#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
-    defined(CONFIG_M520x) || defined(CONFIG_M532x)
-#define IRQBASE (MCFINT_VECBASE+MCFINT_UART0)
-#else
-#define IRQBASE 73
-#endif
-
-/*
- *      Configuration table, UARTs to look for at startup.
- */
-static struct mcf_serial mcfrs_table[] = {
-        {  /* ttyS0 */
-                .magic = 0,
-                .addr = (volatile unsigned char *) (MCF_MBAR+MCFUART_BASE1),
-                .irq = IRQBASE,
-                .flags = ASYNC_BOOT_AUTOCONF,
-        },
-#ifdef MCFUART_BASE2
-        {  /* ttyS1 */
-                .magic = 0,
-                .addr = (volatile unsigned char *) (MCF_MBAR+MCFUART_BASE2),
-                .irq = IRQBASE+1,
-                .flags = ASYNC_BOOT_AUTOCONF,
-        },
-#endif
-#ifdef MCFUART_BASE3
-        {  /* ttyS2 */
-                .magic = 0,
-                .addr = (volatile unsigned char *) (MCF_MBAR+MCFUART_BASE3),
-                .irq = IRQBASE+2,
-                .flags = ASYNC_BOOT_AUTOCONF,
-        },
-#endif
-#ifdef MCFUART_BASE4
-        {  /* ttyS3 */
-                .magic = 0,
-                .addr = (volatile unsigned char *) (MCF_MBAR+MCFUART_BASE4),
-                .irq = IRQBASE+3,
-                .flags = ASYNC_BOOT_AUTOCONF,
-        },
-#endif
-};
-
-
-#define NR_PORTS        (sizeof(mcfrs_table) / sizeof(struct mcf_serial))
-
-/*
- * This is used to figure out the divisor speeds and the timeouts.
- */
-static int mcfrs_baud_table[] = {
-        0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800,
-        9600, 19200, 38400, 57600, 115200, 230400, 460800, 0
-};
-#define MCFRS_BAUD_TABLE_SIZE \
-                        (sizeof(mcfrs_baud_table)/sizeof(mcfrs_baud_table[0]))
-
-
-#ifdef CONFIG_MAGIC_SYSRQ
-/*
- *      Magic system request keys. Used for debugging...
- */
-extern int      magic_sysrq_key(int ch);
-#endif
-
-
-/*
- *      Forware declarations...
- */
-static void     mcfrs_change_speed(struct mcf_serial *info);
-static void     mcfrs_wait_until_sent(struct tty_struct *tty, int timeout);
-
-
-static inline int serial_paranoia_check(struct mcf_serial *info,
-                                        char *name, const char *routine)
-{
-#ifdef SERIAL_PARANOIA_CHECK
-        static const char badmagic[] =
-                "MCFRS(warning): bad magic number for serial struct %s in %s\n";
-        static const char badinfo[] =
-                "MCFRS(warning): null mcf_serial for %s in %s\n";
-
-        if (!info) {
-                printk(badinfo, name, routine);
-                return 1;
-        }
-        if (info->magic != SERIAL_MAGIC) {
-                printk(badmagic, name, routine);
-                return 1;
-        }
-#endif
-        return 0;
-}
-
-/*
- *      Sets or clears DTR and RTS on the requested line.
- */
-static void mcfrs_setsignals(struct mcf_serial *info, int dtr, int rts)
-{
-        volatile unsigned char  *uartp;
-        unsigned long           flags;
-        
-#if 0
-        printk("%s(%d): mcfrs_setsignals(info=%x,dtr=%d,rts=%d)\n",
-                __FILE__, __LINE__, info, dtr, rts);
-#endif
-
-        local_irq_save(flags);
-        if (dtr >= 0) {
-#ifdef MCFPP_DTR0
-                if (info->line)
-                        mcf_setppdata(MCFPP_DTR1, (dtr ? 0 : MCFPP_DTR1));
-                else
-                        mcf_setppdata(MCFPP_DTR0, (dtr ? 0 : MCFPP_DTR0));
-#endif
-        }
-        if (rts >= 0) {
-                uartp = info->addr;
-                if (rts) {
-                        info->sigs |= TIOCM_RTS;
-                        uartp[MCFUART_UOP1] = MCFUART_UOP_RTS;
-                } else {
-                        info->sigs &= ~TIOCM_RTS;
-                        uartp[MCFUART_UOP0] = MCFUART_UOP_RTS;
-                }
-        }
-        local_irq_restore(flags);
-        return;
-}
-
-/*
- *      Gets values of serial signals.
- */
-static int mcfrs_getsignals(struct mcf_serial *info)
-{
-        volatile unsigned char  *uartp;
-        unsigned long           flags;
-        int                     sigs;
-#if defined(CONFIG_NETtel) && defined(CONFIG_M5307)
-        unsigned short          ppdata;
-#endif
-
-#if 0
-        printk("%s(%d): mcfrs_getsignals(info=%x)\n", __FILE__, __LINE__);
-#endif
-
-        local_irq_save(flags);
-        uartp = info->addr;
-        sigs = (uartp[MCFUART_UIPR] & MCFUART_UIPR_CTS) ? 0 : TIOCM_CTS;
-        sigs |= (info->sigs & TIOCM_RTS);
-
-#ifdef MCFPP_DCD0
-{
-        unsigned int ppdata;
-        ppdata = mcf_getppdata();
-        if (info->line == 0) {
-                sigs |= (ppdata & MCFPP_DCD0) ? 0 : TIOCM_CD;
-                sigs |= (ppdata & MCFPP_DTR0) ? 0 : TIOCM_DTR;
-        } else if (info->line == 1) {
-                sigs |= (ppdata & MCFPP_DCD1) ? 0 : TIOCM_CD;
-                sigs |= (ppdata & MCFPP_DTR1) ? 0 : TIOCM_DTR;
-        }
-}
-#endif
-
-        local_irq_restore(flags);
-        return(sigs);
-}
-
-/*
- * ------------------------------------------------------------
- * mcfrs_stop() and mcfrs_start()
- *
- * This routines are called before setting or resetting tty->stopped.
- * They enable or disable transmitter interrupts, as necessary.
- * ------------------------------------------------------------
- */
-static void mcfrs_stop(struct tty_struct *tty)
-{
-        volatile unsigned char  *uartp;
-        struct mcf_serial       *info = (struct mcf_serial *)tty->driver_data;
-        unsigned long           flags;
-
-        if (serial_paranoia_check(info, tty->name, "mcfrs_stop"))
-                return;
-        
-        local_irq_save(flags);
-        uartp = info->addr;
-        info->imr &= ~MCFUART_UIR_TXREADY;
-        uartp[MCFUART_UIMR] = info->imr;
-        local_irq_restore(flags);
-}
-
-static void mcfrs_start(struct tty_struct *tty)
-{
-        volatile unsigned char  *uartp;
-        struct mcf_serial       *info = (struct mcf_serial *)tty->driver_data;
-        unsigned long           flags;
-        
-        if (serial_paranoia_check(info, tty->name, "mcfrs_start"))
-                return;
-
-        local_irq_save(flags);
-        if (info->xmit_cnt && info->xmit_buf) {
-                uartp = info->addr;
-                info->imr |= MCFUART_UIR_TXREADY;
-                uartp[MCFUART_UIMR] = info->imr;
-        }
-        local_irq_restore(flags);
-}
-
-/*
- * ----------------------------------------------------------------------
- *
- * Here starts the interrupt handling routines.  All of the following
- * subroutines are declared as inline and are folded into
- * mcfrs_interrupt().  They were separated out for readability's sake.
- *
- * Note: mcfrs_interrupt() is a "fast" interrupt, which means that it
- * runs with interrupts turned off.  People who may want to modify
- * mcfrs_interrupt() should try to keep the interrupt handler as fast as
- * possible.  After you are done making modifications, it is not a bad
- * idea to do:
- * 
- * gcc -S -DKERNEL -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer serial.c
- *
- * and look at the resulting assemble code in serial.s.
- *
- *                              - Ted Ts'o (tytso@mit.edu), 7-Mar-93
- * -----------------------------------------------------------------------
- */
-
-static inline void receive_chars(struct mcf_serial *info)
-{
-        volatile unsigned char  *uartp;
-        struct tty_struct       *tty = info->port.tty;
-        unsigned char           status, ch, flag;
-
-        if (!tty)
-                return;
-
-        uartp = info->addr;
-
-        while ((status = uartp[MCFUART_USR]) & MCFUART_USR_RXREADY) {
-                ch = uartp[MCFUART_URB];
-                info->stats.rx++;
-
-#ifdef CONFIG_MAGIC_SYSRQ
-                if (mcfrs_console_inited && (info->line == mcfrs_console_port)) {
-                        if (magic_sysrq_key(ch))
-                                continue;
-                }
-#endif
-
-                flag = TTY_NORMAL;
-                if (status & MCFUART_USR_RXERR) {
-                        uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETERR;
-                        if (status & MCFUART_USR_RXBREAK) {
-                                info->stats.rxbreak++;
-                                flag = TTY_BREAK;
-                        } else if (status & MCFUART_USR_RXPARITY) {
-                                info->stats.rxparity++;
-                                flag = TTY_PARITY;
-                        } else if (status & MCFUART_USR_RXOVERRUN) {
-                                info->stats.rxoverrun++;
-                                flag = TTY_OVERRUN;
-                        } else if (status & MCFUART_USR_RXFRAMING) {
-                                info->stats.rxframing++;
-                                flag = TTY_FRAME;
-                        }
-                }
-                tty_insert_flip_char(tty, ch, flag);
-        }
-        tty_schedule_flip(tty);
-        return;
-}
-
-static inline void transmit_chars(struct mcf_serial *info)
-{
-        volatile unsigned char  *uartp;
-
-        uartp = info->addr;
-
-        if (info->x_char) {
-                /* Send special char - probably flow control */
-                uartp[MCFUART_UTB] = info->x_char;
-                info->x_char = 0;
-                info->stats.tx++;
-        }
-
-        if ((info->xmit_cnt <= 0) || info->port.tty->stopped) {
-                info->imr &= ~MCFUART_UIR_TXREADY;
-                uartp[MCFUART_UIMR] = info->imr;
-                return;
-        }
-
-        while (uartp[MCFUART_USR] & MCFUART_USR_TXREADY) {
-                uartp[MCFUART_UTB] = info->xmit_buf[info->xmit_tail++];
-                info->xmit_tail = info->xmit_tail & (SERIAL_XMIT_SIZE-1);
-                info->stats.tx++;
-                if (--info->xmit_cnt <= 0)
-                        break;
-        }
-
-        if (info->xmit_cnt < WAKEUP_CHARS)
-                schedule_work(&info->tqueue);
-        return;
-}
-
-/*
- * This is the serial driver's generic interrupt routine
- */
-irqreturn_t mcfrs_interrupt(int irq, void *dev_id)
-{
-        struct mcf_serial       *info;
-        unsigned char           isr;
-
-        info = &mcfrs_table[(irq - IRQBASE)];
-        isr = info->addr[MCFUART_UISR] & info->imr;
-
-        if (isr & MCFUART_UIR_RXREADY)
-                receive_chars(info);
-        if (isr & MCFUART_UIR_TXREADY)
-                transmit_chars(info);
-        return IRQ_HANDLED;
-}
-
-/*
- * -------------------------------------------------------------------
- * Here ends the serial interrupt routines.
- * -------------------------------------------------------------------
- */
-
-static void mcfrs_offintr(struct work_struct *work)
-{
-        struct mcf_serial *info = container_of(work, struct mcf_serial, tqueue);
-        struct tty_struct *tty = info->port.tty;
-        
-        if (tty)
-                tty_wakeup(tty);
-}
-
-
-/*
- *      Change of state on a DCD line.
- */
-void mcfrs_modem_change(struct mcf_serial *info, int dcd)
-{
-        if (info->count == 0)
-                return;
-
-        if (info->flags & ASYNC_CHECK_CD) {
-                if (dcd)
-                        wake_up_interruptible(&info->open_wait);
-                else 
-                        schedule_work(&info->tqueue_hangup);
-        }
-}
-
-
-#ifdef MCFPP_DCD0
-
-unsigned short  mcfrs_ppstatus;
-
-/*
- * This subroutine is called when the RS_TIMER goes off. It is used
- * to monitor the state of the DCD lines - since they have no edge
- * sensors and interrupt generators.
- */
-static void mcfrs_timer(void)
-{
-        unsigned int    ppstatus, dcdval, i;
-
-        ppstatus = mcf_getppdata() & (MCFPP_DCD0 | MCFPP_DCD1);
-
-        if (ppstatus != mcfrs_ppstatus) {
-                for (i = 0; (i < 2); i++) {
-                        dcdval = (i ? MCFPP_DCD1 : MCFPP_DCD0);
-                        if ((ppstatus & dcdval) != (mcfrs_ppstatus & dcdval)) {
-                                mcfrs_modem_change(&mcfrs_table[i],
-                                        ((ppstatus & dcdval) ? 0 : 1));
-                        }
-                }
-        }
-        mcfrs_ppstatus = ppstatus;
-
-        /* Re-arm timer */
-        mcfrs_timer_struct.expires = jiffies + HZ/25;
-        add_timer(&mcfrs_timer_struct);
-}
-
-#endif  /* MCFPP_DCD0 */
-
-
-/*
- * This routine is called from the scheduler tqueue when the interrupt
- * routine has signalled that a hangup has occurred. The path of
- * hangup processing is:
- *
- *      serial interrupt routine -> (scheduler tqueue) ->
- *      do_serial_hangup() -> tty->hangup() -> mcfrs_hangup()
- * 
- */
-static void do_serial_hangup(struct work_struct *work)
-{
-        struct mcf_serial *info = container_of(work, struct mcf_serial, tqueue_hangup);
-        struct tty_struct *tty = info->port.tty;
-        
-        if (tty)
-                tty_hangup(tty);
-}
-
-static int startup(struct mcf_serial * info)
-{
-        volatile unsigned char  *uartp;
-        unsigned long           flags;
-        
-        if (info->flags & ASYNC_INITIALIZED)
-                return 0;
-
-        if (!info->xmit_buf) {
-                info->xmit_buf = (unsigned char *) __get_free_page(GFP_KERNEL);
-                if (!info->xmit_buf)
-                        return -ENOMEM;
-        }
-
-        local_irq_save(flags);
-
-#ifdef SERIAL_DEBUG_OPEN
-        printk("starting up ttyS%d (irq %d)...\n", info->line, info->irq);
-#endif
-
-        /*
-         *      Reset UART, get it into known state...
-         */
-        uartp = info->addr;
-        uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETRX;  /* reset RX */
-        uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETTX;  /* reset TX */
-        mcfrs_setsignals(info, 1, 1);
-
-        if (info->port.tty)
-                clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
-        info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
-
-        /*
-         * and set the speed of the serial port
-         */
-        mcfrs_change_speed(info);
-
-        /*
-         * Lastly enable the UART transmitter and receiver, and
-         * interrupt enables.
-         */
-        info->imr = MCFUART_UIR_RXREADY;
-        uartp[MCFUART_UCR] = MCFUART_UCR_RXENABLE | MCFUART_UCR_TXENABLE;
-        uartp[MCFUART_UIMR] = info->imr;
-
-        info->flags |= ASYNC_INITIALIZED;
-        local_irq_restore(flags);
-        return 0;
-}
-
-/*
- * This routine will shutdown a serial port; interrupts are disabled, and
- * DTR is dropped if the hangup on close termio flag is on.
- */
-static void shutdown(struct mcf_serial * info)
-{
-        volatile unsigned char  *uartp;
-        unsigned long           flags;
-
-        if (!(info->flags & ASYNC_INITIALIZED))
-                return;
-
-#ifdef SERIAL_DEBUG_OPEN
-        printk("Shutting down serial port %d (irq %d)....\n", info->line,
-               info->irq);
-#endif
-        
-        local_irq_save(flags);
-
-        uartp = info->addr;
-        uartp[MCFUART_UIMR] = 0;  /* mask all interrupts */
-        uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETRX;  /* reset RX */
-        uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETTX;  /* reset TX */
-
-        if (!info->port.tty || (info->port.tty->termios->c_cflag & HUPCL))
-                mcfrs_setsignals(info, 0, 0);
-
-        if (info->xmit_buf) {
-                free_page((unsigned long) info->xmit_buf);
-                info->xmit_buf = 0;
-        }
-
-        if (info->port.tty)
-                set_bit(TTY_IO_ERROR, &info->port.tty->flags);
-        
-        info->flags &= ~ASYNC_INITIALIZED;
-        local_irq_restore(flags);
-}
-
-
-/*
- * This routine is called to set the UART divisor registers to match
- * the specified baud rate for a serial port.
- */
-static void mcfrs_change_speed(struct mcf_serial *info)
-{
-        volatile unsigned char  *uartp;
-        unsigned int            baudclk, cflag;
-        unsigned long           flags;
-        unsigned char           mr1, mr2;
-        int                     i;
-#ifdef  CONFIG_M5272
-        unsigned int            fraction;
-#endif
-
-        if (!info->port.tty || !info->port.tty->termios)
-                return;
-        cflag = info->port.tty->termios->c_cflag;
-        if (info->addr == 0)
-                return;
-
-#if 0
-        printk("%s(%d): mcfrs_change_speed()\n", __FILE__, __LINE__);
-#endif
-
-        i = cflag & CBAUD;
-        if (i & CBAUDEX) {
-                i &= ~CBAUDEX;
-                if (i < 1 || i > 4)
-                        info->port.tty->termios->c_cflag &= ~CBAUDEX;
-                else
-                        i += 15;
-        }
-        if (i == 0) {
-                mcfrs_setsignals(info, 0, -1);
-                return;
-        }
-
-        /* compute the baudrate clock */
-#ifdef  CONFIG_M5272
-        /*
-         * For the MCF5272, also compute the baudrate fraction.
-         */
-        baudclk = (MCF_BUSCLK / mcfrs_baud_table[i]) / 32;
-        fraction = MCF_BUSCLK - (baudclk * 32 * mcfrs_baud_table[i]);
-        fraction *= 16;
-        fraction /= (32 * mcfrs_baud_table[i]);
-#else
-        baudclk = ((MCF_BUSCLK / mcfrs_baud_table[i]) + 16) / 32;
-#endif
-
-        info->baud = mcfrs_baud_table[i];
-
-        mr1 = MCFUART_MR1_RXIRQRDY | MCFUART_MR1_RXERRCHAR;
-        mr2 = 0;
-
-        switch (cflag & CSIZE) {
-        case CS5:       mr1 |= MCFUART_MR1_CS5; break;
-        case CS6:       mr1 |= MCFUART_MR1_CS6; break;
-        case CS7:       mr1 |= MCFUART_MR1_CS7; break;
-        case CS8:
-        default:        mr1 |= MCFUART_MR1_CS8; break;
-        }
-
-        if (cflag & PARENB) {
-                if (cflag & CMSPAR) {
-                        if (cflag & PARODD)
-                                mr1 |= MCFUART_MR1_PARITYMARK;
-                        else
-                                mr1 |= MCFUART_MR1_PARITYSPACE;
-                } else {
-                        if (cflag & PARODD)
-                                mr1 |= MCFUART_MR1_PARITYODD;
-                        else
-                                mr1 |= MCFUART_MR1_PARITYEVEN;
-                }
-        } else {
-                mr1 |= MCFUART_MR1_PARITYNONE;
-        }
-
-        if (cflag & CSTOPB)
-                mr2 |= MCFUART_MR2_STOP2;
-        else
-                mr2 |= MCFUART_MR2_STOP1;
-
-        if (cflag & CRTSCTS) {
-                mr1 |= MCFUART_MR1_RXRTS;
-                mr2 |= MCFUART_MR2_TXCTS;
-        }
-
-        if (cflag & CLOCAL)
-                info->flags &= ~ASYNC_CHECK_CD;
-        else
-                info->flags |= ASYNC_CHECK_CD;
-
-        uartp = info->addr;
-
-        local_irq_save(flags);
-#if 0
-        printk("%s(%d): mr1=%x mr2=%x baudclk=%x\n", __FILE__, __LINE__,
-                mr1, mr2, baudclk);
-#endif
-        /*
-          Note: pg 12-16 of MCF5206e User's Manual states that a
-          software reset should be performed prior to changing
-          UMR1,2, UCSR, UACR, bit 7
-        */
-        uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETRX;    /* reset RX */
-        uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETTX;    /* reset TX */
-        uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETMRPTR; /* reset MR pointer */
-        uartp[MCFUART_UMR] = mr1;
-        uartp[MCFUART_UMR] = mr2;
-        uartp[MCFUART_UBG1] = (baudclk & 0xff00) >> 8;  /* set msb byte */
-        uartp[MCFUART_UBG2] = (baudclk & 0xff);         /* set lsb byte */
-#ifdef  CONFIG_M5272
-        uartp[MCFUART_UFPD] = (fraction & 0xf);         /* set fraction */
-#endif
-        uartp[MCFUART_UCSR] = MCFUART_UCSR_RXCLKTIMER | MCFUART_UCSR_TXCLKTIMER;
-        uartp[MCFUART_UCR] = MCFUART_UCR_RXENABLE | MCFUART_UCR_TXENABLE;
-        mcfrs_setsignals(info, 1, -1);
-        local_irq_restore(flags);
-        return;
-}
-
-static void mcfrs_flush_chars(struct tty_struct *tty)
-{
-        volatile unsigned char  *uartp;
-        struct mcf_serial       *info = (struct mcf_serial *)tty->driver_data;
-        unsigned long           flags;
-
-        if (serial_paranoia_check(info, tty->name, "mcfrs_flush_chars"))
-                return;
-
-        uartp = (volatile unsigned char *) info->addr;
-
-        /*
-         * re-enable receiver interrupt
-         */
-        local_irq_save(flags);
-        if ((!(info->imr & MCFUART_UIR_RXREADY)) &&
-            (info->flags & ASYNC_INITIALIZED) ) {
-                info->imr |= MCFUART_UIR_RXREADY;
-                uartp[MCFUART_UIMR] = info->imr;
-        }
-        local_irq_restore(flags);
-
-        if (info->xmit_cnt <= 0 || tty->stopped || tty->hw_stopped ||
-            !info->xmit_buf)
-                return;
-
-        /* Enable transmitter */
-        local_irq_save(flags);
-        info->imr |= MCFUART_UIR_TXREADY;
-        uartp[MCFUART_UIMR] = info->imr;
-        local_irq_restore(flags);
-}
-
-static int mcfrs_write(struct tty_struct * tty,
-                    const unsigned char *buf, int count)
-{
-        volatile unsigned char  *uartp;
-        struct mcf_serial       *info = (struct mcf_serial *)tty->driver_data;
-        unsigned long           flags;
-        int                     c, total = 0;
-
-#if 0
-        printk("%s(%d): mcfrs_write(tty=%x,buf=%x,count=%d)\n",
-                __FILE__, __LINE__, (int)tty, (int)buf, count);
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "mcfrs_write"))
-                return 0;
-
-        if (!tty || !info->xmit_buf)
-                return 0;
-        
-        local_save_flags(flags);
-        while (1) {
-                local_irq_disable();            
-                c = min(count, (int) min(((int)SERIAL_XMIT_SIZE) - info->xmit_cnt - 1,
-                        ((int)SERIAL_XMIT_SIZE) - info->xmit_head));
-                local_irq_restore(flags);
-
-                if (c <= 0)
-                        break;
-
-                memcpy(info->xmit_buf + info->xmit_head, buf, c);
-
-                local_irq_disable();
-                info->xmit_head = (info->xmit_head + c) & (SERIAL_XMIT_SIZE-1);
-                info->xmit_cnt += c;
-                local_irq_restore(flags);
-
-                buf += c;
-                count -= c;
-                total += c;
-        }
-
-        local_irq_disable();
-        uartp = info->addr;
-        info->imr |= MCFUART_UIR_TXREADY;
-        uartp[MCFUART_UIMR] = info->imr;
-        local_irq_restore(flags);
-
-        return total;
-}
-
-static int mcfrs_write_room(struct tty_struct *tty)
-{
-        struct mcf_serial *info = (struct mcf_serial *)tty->driver_data;
-        int     ret;
-
-        if (serial_paranoia_check(info, tty->name, "mcfrs_write_room"))
-                return 0;
-        ret = SERIAL_XMIT_SIZE - info->xmit_cnt - 1;
-        if (ret < 0)
-                ret = 0;
-        return ret;
-}
-
-static int mcfrs_chars_in_buffer(struct tty_struct *tty)
-{
-        struct mcf_serial *info = (struct mcf_serial *)tty->driver_data;
-
-        if (serial_paranoia_check(info, tty->name, "mcfrs_chars_in_buffer"))
-                return 0;
-        return info->xmit_cnt;
-}
-
-static void mcfrs_flush_buffer(struct tty_struct *tty)
-{
-        struct mcf_serial       *info = (struct mcf_serial *)tty->driver_data;
-        unsigned long           flags;
-
-        if (serial_paranoia_check(info, tty->name, "mcfrs_flush_buffer"))
-                return;
-
-        local_irq_save(flags);
-        info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
-        local_irq_restore(flags);
-
-        tty_wakeup(tty);
-}
-
-/*
- * ------------------------------------------------------------
- * mcfrs_throttle()
- * 
- * This routine is called by the upper-layer tty layer to signal that
- * incoming characters should be throttled.
- * ------------------------------------------------------------
- */
-static void mcfrs_throttle(struct tty_struct * tty)
-{
-        struct mcf_serial *info = (struct mcf_serial *)tty->driver_data;
-#ifdef SERIAL_DEBUG_THROTTLE
-        char    buf[64];
-        
-        printk("throttle %s: %d....\n", tty_name(tty, buf),
-               tty->ldisc.chars_in_buffer(tty));
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "mcfrs_throttle"))
-                return;
-        
-        if (I_IXOFF(tty))
-                info->x_char = STOP_CHAR(tty);
-
-        /* Turn off RTS line (do this atomic) */
-}
-
-static void mcfrs_unthrottle(struct tty_struct * tty)
-{
-        struct mcf_serial *info = (struct mcf_serial *)tty->driver_data;
-#ifdef SERIAL_DEBUG_THROTTLE
-        char    buf[64];
-        
-        printk("unthrottle %s: %d....\n", tty_name(tty, buf),
-               tty->ldisc.chars_in_buffer(tty));
-#endif
-
-        if (serial_paranoia_check(info, tty->name, "mcfrs_unthrottle"))
-                return;
-        
-        if (I_IXOFF(tty)) {
-                if (info->x_char)
-                        info->x_char = 0;
-                else
-                        info->x_char = START_CHAR(tty);
-        }
-
-        /* Assert RTS line (do this atomic) */
-}
-
-/*
- * ------------------------------------------------------------
- * mcfrs_ioctl() and friends
- * ------------------------------------------------------------
- */
-
-static int get_serial_info(struct mcf_serial * info,
-                           struct serial_struct * retinfo)
-{
-        struct serial_struct tmp;
-  
-        if (!retinfo)
-                return -EFAULT;
-        memset(&tmp, 0, sizeof(tmp));
-        tmp.type = info->type;
-        tmp.line = info->line;
-        tmp.port = (unsigned int) info->addr;
-        tmp.irq = info->irq;
-        tmp.flags = info->flags;
-        tmp.baud_base = info->baud_base;
-        tmp.close_delay = info->close_delay;
-        tmp.closing_wait = info->closing_wait;
-        tmp.custom_divisor = info->custom_divisor;
-        return copy_to_user(retinfo,&tmp,sizeof(*retinfo)) ? -EFAULT : 0;
-}
-
-static int set_serial_info(struct mcf_serial * info,
-                           struct serial_struct * new_info)
-{
-        struct serial_struct new_serial;
-        struct mcf_serial old_info;
-        int     retval = 0;
-
-        if (!new_info)
-                return -EFAULT;
-        if (copy_from_user(&new_serial,new_info,sizeof(new_serial)))
-                return -EFAULT;
-        old_info = *info;
-
-        if (!capable(CAP_SYS_ADMIN)) {
-                if ((new_serial.baud_base != info->baud_base) ||
-                    (new_serial.type != info->type) ||
-                    (new_serial.close_delay != info->close_delay) ||
-                    ((new_serial.flags & ~ASYNC_USR_MASK) !=
-                     (info->flags & ~ASYNC_USR_MASK)))
-                        return -EPERM;
-                info->flags = ((info->flags & ~ASYNC_USR_MASK) |
-                               (new_serial.flags & ASYNC_USR_MASK));
-                info->custom_divisor = new_serial.custom_divisor;
-                goto check_and_exit;
-        }
-
-        if (info->count > 1)
-                return -EBUSY;
-
-        /*
-         * OK, past this point, all the error checking has been done.
-         * At this point, we start making changes.....
-         */
-
-        info->baud_base = new_serial.baud_base;
-        info->flags = ((info->flags & ~ASYNC_FLAGS) |
-                        (new_serial.flags & ASYNC_FLAGS));
-        info->type = new_serial.type;
-        info->close_delay = new_serial.close_delay;
-        info->closing_wait = new_serial.closing_wait;
-
-check_and_exit:
-        retval = startup(info);
-        return retval;
-}
-
-/*
- * get_lsr_info - get line status register info
- *
- * Purpose: Let user call ioctl() to get info when the UART physically
- *          is emptied.  On bus types like RS485, the transmitter must
- *          release the bus after transmitting. This must be done when
- *          the transmit shift register is empty, not be done when the
- *          transmit holding register is empty.  This functionality
- *          allows an RS485 driver to be written in user space. 
- */
-static int get_lsr_info(struct mcf_serial * info, unsigned int *value)
-{
-        volatile unsigned char  *uartp;
-        unsigned long           flags;
-        unsigned char           status;
-
-        local_irq_save(flags);
-        uartp = info->addr;
-        status = (uartp[MCFUART_USR] & MCFUART_USR_TXEMPTY) ? TIOCSER_TEMT : 0;
-        local_irq_restore(flags);
-
-        return put_user(status,value);
-}
-
-/*
- * This routine sends a break character out the serial port.
- */
-static void send_break( struct mcf_serial * info, int duration)
-{
-        volatile unsigned char  *uartp;
-        unsigned long           flags;
-
-        if (!info->addr)
-                return;
-        set_current_state(TASK_INTERRUPTIBLE);
-        uartp = info->addr;
-
-        local_irq_save(flags);
-        uartp[MCFUART_UCR] = MCFUART_UCR_CMDBREAKSTART;
-        schedule_timeout(duration);
-        uartp[MCFUART_UCR] = MCFUART_UCR_CMDBREAKSTOP;
-        local_irq_restore(flags);
-}
-
-static int mcfrs_tiocmget(struct tty_struct *tty, struct file *file)
-{
-        struct mcf_serial * info = (struct mcf_serial *)tty->driver_data;
-
-        if (serial_paranoia_check(info, tty->name, "mcfrs_ioctl"))
-                return -ENODEV;
-        if (tty->flags & (1 << TTY_IO_ERROR))
-                return -EIO;
-
-        return mcfrs_getsignals(info);
-}
-
-static int mcfrs_tiocmset(struct tty_struct *tty, struct file *file,
-                          unsigned int set, unsigned int clear)
-{
-        struct mcf_serial * info = (struct mcf_serial *)tty->driver_data;
-        int rts = -1, dtr = -1;
-
-        if (serial_paranoia_check(info, tty->name, "mcfrs_ioctl"))
-                return -ENODEV;
-        if (tty->flags & (1 << TTY_IO_ERROR))
-                return -EIO;
-
-        if (set & TIOCM_RTS)
-                rts = 1;
-        if (set & TIOCM_DTR)
-                dtr = 1;
-        if (clear & TIOCM_RTS)
-                rts = 0;
-        if (clear & TIOCM_DTR)
-                dtr = 0;
-
-        mcfrs_setsignals(info, dtr, rts);
-
-        return 0;
-}
-
-static int mcfrs_ioctl(struct tty_struct *tty, struct file * file,
-                    unsigned int cmd, unsigned long arg)
-{
-        struct mcf_serial * info = (struct mcf_serial *)tty->driver_data;
-        int retval, error;
-
-        if (serial_paranoia_check(info, tty->name, "mcfrs_ioctl"))
-                return -ENODEV;
-
-        if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
-            (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGWILD)  &&
-            (cmd != TIOCSERSWILD) && (cmd != TIOCSERGSTRUCT)) {
-                if (tty->flags & (1 << TTY_IO_ERROR))
-                    return -EIO;
-        }
-        
-        switch (cmd) {
-                case TCSBRK:    /* SVID version: non-zero arg --> no break */
-                        retval = tty_check_change(tty);
-                        if (retval)
-                                return retval;
-                        tty_wait_until_sent(tty, 0);
-                        if (!arg)
-                                send_break(info, HZ/4); /* 1/4 second */
-                        return 0;
-                case TCSBRKP:   /* support for POSIX tcsendbreak() */
-                        retval = tty_check_change(tty);
-                        if (retval)
-                                return retval;
-                        tty_wait_until_sent(tty, 0);
-                        send_break(info, arg ? arg*(HZ/10) : HZ/4);
-                        return 0;
-                case TIOCGSERIAL:
-                        if (access_ok(VERIFY_WRITE, (void *) arg,
-                                                sizeof(struct serial_struct)))
-                                return get_serial_info(info,
-                                               (struct serial_struct *) arg);
-                        return -EFAULT;
-                case TIOCSSERIAL:
-                        return set_serial_info(info,
-                                               (struct serial_struct *) arg);
-                case TIOCSERGETLSR: /* Get line status register */
-                        if (access_ok(VERIFY_WRITE, (void *) arg,
-                                                sizeof(unsigned int)))
-                                return get_lsr_info(info, (unsigned int *) arg);
-                        return -EFAULT;
-                case TIOCSERGSTRUCT:
-                        error = copy_to_user((struct mcf_serial *) arg,
-                                    info, sizeof(struct mcf_serial));
-                        if (error)
-                                return -EFAULT;
-                        return 0;
-                        
-#ifdef TIOCSET422
-                case TIOCSET422: {
-                        unsigned int val;
-                        get_user(val, (unsigned int *) arg);
-                        mcf_setpa(MCFPP_PA11, (val ? 0 : MCFPP_PA11));
-                        break;
-                }
-                case TIOCGET422: {
-                        unsigned int val;
-                        val = (mcf_getpa() & MCFPP_PA11) ? 0 : 1;
-                        put_user(val, (unsigned int *) arg);
-                        break;
-                }
-#endif
-
-                default:
-                        return -ENOIOCTLCMD;
-                }
-        return 0;
-}
-
-static void mcfrs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
-{
-        struct mcf_serial *info = (struct mcf_serial *)tty->driver_data;
-
-        if (tty->termios->c_cflag == old_termios->c_cflag)
-                return;
-
-        mcfrs_change_speed(info);
-
-        if ((old_termios->c_cflag & CRTSCTS) &&
-            !(tty->termios->c_cflag & CRTSCTS)) {
-                tty->hw_stopped = 0;
-                mcfrs_setsignals(info, -1, 1);
-#if 0
-                mcfrs_start(tty);
-#endif
-        }
-}
-
-/*
- * ------------------------------------------------------------
- * mcfrs_close()
- * 
- * This routine is called when the serial port gets closed.  First, we
- * wait for the last remaining data to be sent.  Then, we unlink its
- * S structure from the interrupt chain if necessary, and we free
- * that IRQ if nothing is left in the chain.
- * ------------------------------------------------------------
- */
-static void mcfrs_close(struct tty_struct *tty, struct file * filp)
-{
-        volatile unsigned char  *uartp;
-        struct mcf_serial       *info = (struct mcf_serial *)tty->driver_data;
-        unsigned long           flags;
-
-        if (!info || serial_paranoia_check(info, tty->name, "mcfrs_close"))
-                return;
-        
-        local_irq_save(flags);
-        
-        if (tty_hung_up_p(filp)) {
-                local_irq_restore(flags);
-                return;
-        }
-        
-#ifdef SERIAL_DEBUG_OPEN
-        printk("mcfrs_close ttyS%d, count = %d\n", info->line, info->count);
-#endif
-        if ((tty->count == 1) && (info->count != 1)) {
-                /*
-                 * Uh, oh.  tty->count is 1, which means that the tty
-                 * structure will be freed.  Info->count should always
-                 * be one in these conditions.  If it's greater than
-                 * one, we've got real problems, since it means the
-                 * serial port won't be shutdown.
-                 */
-                printk("MCFRS: bad serial port count; tty->count is 1, "
-                       "info->count is %d\n", info->count);
-                info->count = 1;
-        }
-        if (--info->count < 0) {
-                printk("MCFRS: bad serial port count for ttyS%d: %d\n",
-                       info->line, info->count);
-                info->count = 0;
-        }
-        if (info->count) {
-                local_irq_restore(flags);
-                return;
-        }
-        info->flags |= ASYNC_CLOSING;
-
-        /*
-         * Now we wait for the transmit buffer to clear; and we notify 
-         * the line discipline to only process XON/XOFF characters.
-         */
-        tty->closing = 1;
-        if (info->closing_wait != ASYNC_CLOSING_WAIT_NONE)
-                tty_wait_until_sent(tty, info->closing_wait);
-
-        /*
-         * At this point we stop accepting input.  To do this, we
-         * disable the receive line status interrupts, and tell the
-         * interrupt driver to stop checking the data ready bit in the
-         * line status register.
-         */
-        info->imr &= ~MCFUART_UIR_RXREADY;
-        uartp = info->addr;
-        uartp[MCFUART_UIMR] = info->imr;
-
-#if 0
-        /* FIXME: do we need to keep this enabled for console?? */
-        if (mcfrs_console_inited && (mcfrs_console_port == info->line)) {
-                /* Do not disable the UART */ ;
-        } else
-#endif
-        shutdown(info);
-        mcfrs_flush_buffer(tty);
-        tty_ldisc_flush(tty);
-        
-        tty->closing = 0;
-        info->event = 0;
-        info->port.tty = NULL;
-#if 0   
-        if (tty->ldisc.num != ldiscs[N_TTY].num) {
-                if (tty->ldisc.close)
-                        (tty->ldisc.close)(tty);
-                tty->ldisc = ldiscs[N_TTY];
-                tty->termios->c_line = N_TTY;
-                if (tty->ldisc.open)
-                        (tty->ldisc.open)(tty);
-        }
-#endif  
-        if (info->blocked_open) {
-                if (info->close_delay) {
-                        msleep_interruptible(jiffies_to_msecs(info->close_delay));
-                }
-                wake_up_interruptible(&info->open_wait);
-        }
-        info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
-        wake_up_interruptible(&info->close_wait);
-        local_irq_restore(flags);
-}
-
-/*
- * mcfrs_wait_until_sent() --- wait until the transmitter is empty
- */
-static void
-mcfrs_wait_until_sent(struct tty_struct *tty, int timeout)
-{
-#ifdef  CONFIG_M5272
-#define MCF5272_FIFO_SIZE       25              /* fifo size + shift reg */
-
-        struct mcf_serial * info = (struct mcf_serial *)tty->driver_data;
-        volatile unsigned char *uartp;
-        unsigned long orig_jiffies, fifo_time, char_time, fifo_cnt;
-
-        if (serial_paranoia_check(info, tty->name, "mcfrs_wait_until_sent"))
-                return;
-
-        orig_jiffies = jiffies;
-
-        /*
-         * Set the check interval to be 1/5 of the approximate time
-         * to send the entire fifo, and make it at least 1.  The check
-         * interval should also be less than the timeout.
-         *
-         * Note: we have to use pretty tight timings here to satisfy
-         * the NIST-PCTS.
-         */
-        lock_kernel();
-
-        fifo_time = (MCF5272_FIFO_SIZE * HZ * 10) / info->baud;
-        char_time = fifo_time / 5;
-        if (char_time == 0)
-                char_time = 1;
-        if (timeout && timeout < char_time)
-                char_time = timeout;
-
-        /*
-         * Clamp the timeout period at 2 * the time to empty the
-         * fifo.  Just to be safe, set the minimum at .5 seconds.
-         */
-        fifo_time *= 2;
-        if (fifo_time < (HZ/2))
-                fifo_time = HZ/2;
-        if (!timeout || timeout > fifo_time)
-                timeout = fifo_time;
-
-        /*
-         * Account for the number of bytes in the UART
-         * transmitter FIFO plus any byte being shifted out.
-         */
-        uartp = (volatile unsigned char *) info->addr;
-        for (;;) {
-                fifo_cnt = (uartp[MCFUART_UTF] & MCFUART_UTF_TXB);
-                if ((uartp[MCFUART_USR] & (MCFUART_USR_TXREADY|
-                                MCFUART_USR_TXEMPTY)) ==
-                        MCFUART_USR_TXREADY)
-                        fifo_cnt++;
-                if (fifo_cnt == 0)
-                        break;
-                msleep_interruptible(jiffies_to_msecs(char_time));
-                if (signal_pending(current))
-                        break;
-                if (timeout && time_after(jiffies, orig_jiffies + timeout))
-                        break;
-        }
-        unlock_kernel();
-#else
-        /*
-         * For the other coldfire models, assume all data has been sent
-         */
-#endif
-}
-
-/*
- * mcfrs_hangup() --- called by tty_hangup() when a hangup is signaled.
- */
-void mcfrs_hangup(struct tty_struct *tty)
-{
-        struct mcf_serial * info = (struct mcf_serial *)tty->driver_data;
-        
-        if (serial_paranoia_check(info, tty->name, "mcfrs_hangup"))
-                return;
-        
-        mcfrs_flush_buffer(tty);
-        shutdown(info);
-        info->event = 0;
-        info->count = 0;
-        info->flags &= ~ASYNC_NORMAL_ACTIVE;
-        info->port.tty = NULL;
-        wake_up_interruptible(&info->open_wait);
-}
-
-/*
- * ------------------------------------------------------------
- * mcfrs_open() and friends
- * ------------------------------------------------------------
- */
-static int block_til_ready(struct tty_struct *tty, struct file * filp,
-                           struct mcf_serial *info)
-{
-        DECLARE_WAITQUEUE(wait, current);
-        int     retval;
-        int     do_clocal = 0;
-
-        /*
-         * If the device is in the middle of being closed, then block
-         * until it's done, and then try again.
-         */
-        if (info->flags & ASYNC_CLOSING) {
-                interruptible_sleep_on(&info->close_wait);
-#ifdef SERIAL_DO_RESTART
-                if (info->flags & ASYNC_HUP_NOTIFY)
-                        return -EAGAIN;
-                else
-                        return -ERESTARTSYS;
-#else
-                return -EAGAIN;
-#endif
-        }
-        
-        /*
-         * If non-blocking mode is set, or the port is not enabled,
-         * then make the check up front and then exit.
-         */
-        if ((filp->f_flags & O_NONBLOCK) ||
-            (tty->flags & (1 << TTY_IO_ERROR))) {
-                info->flags |= ASYNC_NORMAL_ACTIVE;
-                return 0;
-        }
-
-        if (tty->termios->c_cflag & CLOCAL)
-                do_clocal = 1;
-
-        /*
-         * Block waiting for the carrier detect and the line to become
-         * free (i.e., not in use by the callout).  While we are in
-         * this loop, info->count is dropped by one, so that
-         * mcfrs_close() knows when to free things.  We restore it upon
-         * exit, either normal or abnormal.
-         */
-        retval = 0;
-        add_wait_queue(&info->open_wait, &wait);
-#ifdef SERIAL_DEBUG_OPEN
-        printk("block_til_ready before block: ttyS%d, count = %d\n",
-               info->line, info->count);
-#endif
-        info->count--;
-        info->blocked_open++;
-        while (1) {
-                local_irq_disable();
-                mcfrs_setsignals(info, 1, 1);
-                local_irq_enable();
-                current->state = TASK_INTERRUPTIBLE;
-                if (tty_hung_up_p(filp) ||
-                    !(info->flags & ASYNC_INITIALIZED)) {
-#ifdef SERIAL_DO_RESTART
-                        if (info->flags & ASYNC_HUP_NOTIFY)
-                                retval = -EAGAIN;
-                        else
-                                retval = -ERESTARTSYS;  
-#else
-                        retval = -EAGAIN;
-#endif
-                        break;
-                }
-                if (!(info->flags & ASYNC_CLOSING) &&
-                    (do_clocal || (mcfrs_getsignals(info) & TIOCM_CD)))
-                        break;
-                if (signal_pending(current)) {
-                        retval = -ERESTARTSYS;
-                        break;
-                }
-#ifdef SERIAL_DEBUG_OPEN
-                printk("block_til_ready blocking: ttyS%d, count = %d\n",
-                       info->line, info->count);
-#endif
-                schedule();
-        }
-        current->state = TASK_RUNNING;
-        remove_wait_queue(&info->open_wait, &wait);
-        if (!tty_hung_up_p(filp))
-                info->count++;
-        info->blocked_open--;
-#ifdef SERIAL_DEBUG_OPEN
-        printk("block_til_ready after blocking: ttyS%d, count = %d\n",
-               info->line, info->count);
-#endif
-        if (retval)
-                return retval;
-        info->flags |= ASYNC_NORMAL_ACTIVE;
-        return 0;
-}       
-
-/*
- * This routine is called whenever a serial port is opened. It
- * enables interrupts for a serial port, linking in its structure into
- * the IRQ chain.   It also performs the serial-specific
- * initialization for the tty structure.
- */
-int mcfrs_open(struct tty_struct *tty, struct file * filp)
-{
-        struct mcf_serial       *info;
-        int                     retval, line;
-
-        line = tty->index;
-        if ((line < 0) || (line >= NR_PORTS))
-                return -ENODEV;
-        info = mcfrs_table + line;
-        if (serial_paranoia_check(info, tty->name, "mcfrs_open"))
-                return -ENODEV;
-#ifdef SERIAL_DEBUG_OPEN
-        printk("mcfrs_open %s, count = %d\n", tty->name, info->count);
-#endif
-        info->count++;
-        tty->driver_data = info;
-        info->port.tty = tty;
-
-        /*
-         * Start up serial port
-         */
-        retval = startup(info);
-        if (retval)
-                return retval;
-
-        retval = block_til_ready(tty, filp, info);
-        if (retval) {
-#ifdef SERIAL_DEBUG_OPEN
-                printk("mcfrs_open returning after block_til_ready with %d\n",
-                       retval);
-#endif
-                return retval;
-        }
-
-#ifdef SERIAL_DEBUG_OPEN
-        printk("mcfrs_open %s successful...\n", tty->name);
-#endif
-        return 0;
-}
-
-/*
- *      Based on the line number set up the internal interrupt stuff.
- */
-static void mcfrs_irqinit(struct mcf_serial *info)
-{
-#if defined(CONFIG_M5272)
-        volatile unsigned long  *icrp;
-        volatile unsigned long  *portp;
-        volatile unsigned char  *uartp;
-
-        uartp = info->addr;
-        icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR2);
-
-        switch (info->line) {
-        case 0:
-                *icrp = 0xe0000000;
-                break;
-        case 1:
-                *icrp = 0x0e000000;
-                break;
-        default:
-                printk("MCFRS: don't know how to handle UART %d interrupt?\n",
-                        info->line);
-                return;
-        }
-
-        /* Enable the output lines for the serial ports */
-        portp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_PBCNT);
-        *portp = (*portp & ~0x000000ff) | 0x00000055;
-        portp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_PDCNT);
-        *portp = (*portp & ~0x000003fc) | 0x000002a8;
-#elif defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x)
-        volatile unsigned char *icrp, *uartp;
-        volatile unsigned long *imrp;
-
-        uartp = info->addr;
-
-        icrp = (volatile unsigned char *) (MCF_MBAR + MCFICM_INTC0 +
-                MCFINTC_ICR0 + MCFINT_UART0 + info->line);
-        *icrp = 0x30 + info->line; /* level 6, line based priority */
-
-        imrp = (volatile unsigned long *) (MCF_MBAR + MCFICM_INTC0 +
-                MCFINTC_IMRL);
-        *imrp &= ~((1 << (info->irq - MCFINT_VECBASE)) | 1);
-#if defined(CONFIG_M527x)
-        {
-                /*
-                 * External Pin Mask Setting & Enable External Pin for Interface
-                 * mrcbis@aliceposta.it
-                 */
-                u16 *serpin_enable_mask;
-                serpin_enable_mask = (u16 *) (MCF_IPSBAR + MCF_GPIO_PAR_UART);
-                if (info->line == 0)
-                        *serpin_enable_mask |= UART0_ENABLE_MASK;
-                else if (info->line == 1)
-                        *serpin_enable_mask |= UART1_ENABLE_MASK;
-                else if (info->line == 2)
-                        *serpin_enable_mask |= UART2_ENABLE_MASK;
-        }
-#endif
-#if defined(CONFIG_M528x)
-        /* make sure PUAPAR is set for UART0 and UART1 */
-        if (info->line < 2) {
-                volatile unsigned char *portp = (volatile unsigned char *) (MCF_MBAR + MCF5282_GPIO_PUAPAR);
-                *portp |= (0x03 << (info->line * 2));
-        }
-#endif
-#elif defined(CONFIG_M520x)
-        volatile unsigned char *icrp, *uartp;
-        volatile unsigned long *imrp;
-
-        uartp = info->addr;
-
-        icrp = (volatile unsigned char *) (MCF_MBAR + MCFICM_INTC0 +
-                MCFINTC_ICR0 + MCFINT_UART0 + info->line);
-        *icrp = 0x03;
-
-        imrp = (volatile unsigned long *) (MCF_MBAR + MCFICM_INTC0 +
-                MCFINTC_IMRL);
-        *imrp &= ~((1 << (info->irq - MCFINT_VECBASE)) | 1);
-        if (info->line < 2) {
-                unsigned short *uart_par;
-                uart_par = (unsigned short *)(MCF_IPSBAR + MCF_GPIO_PAR_UART);
-                if (info->line == 0)
-                        *uart_par |=  MCF_GPIO_PAR_UART_PAR_UTXD0
-                                  | MCF_GPIO_PAR_UART_PAR_URXD0;
-                else if (info->line == 1)
-                        *uart_par |=  MCF_GPIO_PAR_UART_PAR_UTXD1
-                                  | MCF_GPIO_PAR_UART_PAR_URXD1;
-                } else if (info->line == 2) {
-                        unsigned char *feci2c_par;
-                        feci2c_par = (unsigned char *)(MCF_IPSBAR +  MCF_GPIO_PAR_FECI2C);
-                        *feci2c_par &= ~0x0F;
-                        *feci2c_par |=  MCF_GPIO_PAR_FECI2C_PAR_SCL_UTXD2
-                                    | MCF_GPIO_PAR_FECI2C_PAR_SDA_URXD2;
-                }
-#elif defined(CONFIG_M532x)
-        volatile unsigned char *uartp;
-        uartp = info->addr;
-        switch (info->line) {
-        case 0:
-                MCF_INTC0_ICR26 = 0x3;
-                MCF_INTC0_CIMR = 26;
-                /* GPIO initialization */
-                MCF_GPIO_PAR_UART |= 0x000F;
-                break;
-        case 1:
-                MCF_INTC0_ICR27 = 0x3;
-                MCF_INTC0_CIMR = 27;
-                /* GPIO initialization */
-                MCF_GPIO_PAR_UART |= 0x0FF0;
-                break;
-        case 2:
-                MCF_INTC0_ICR28 = 0x3;
-                MCF_INTC0_CIMR = 28;
-                /* GPIOs also must be initalized, depends on board */
-                break;
-        }
-#else
-        volatile unsigned char  *icrp, *uartp;
-
-        switch (info->line) {
-        case 0:
-                icrp = (volatile unsigned char *) (MCF_MBAR + MCFSIM_UART1ICR);
-                *icrp = /*MCFSIM_ICR_AUTOVEC |*/ MCFSIM_ICR_LEVEL6 |
-                        MCFSIM_ICR_PRI1;
-                mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_UART1);
-                break;
-        case 1:
-                icrp = (volatile unsigned char *) (MCF_MBAR + MCFSIM_UART2ICR);
-                *icrp = /*MCFSIM_ICR_AUTOVEC |*/ MCFSIM_ICR_LEVEL6 |
-                        MCFSIM_ICR_PRI2;
-                mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_UART2);
-                break;
-        default:
-                printk("MCFRS: don't know how to handle UART %d interrupt?\n",
-                        info->line);
-                return;
-        }
-
-        uartp = info->addr;
-        uartp[MCFUART_UIVR] = info->irq;
-#endif
-
-        /* Clear mask, so no surprise interrupts. */
-        uartp[MCFUART_UIMR] = 0;
-
-        if (request_irq(info->irq, mcfrs_interrupt, IRQF_DISABLED,
-            "ColdFire UART", NULL)) {
-                printk("MCFRS: Unable to attach ColdFire UART %d interrupt "
-                        "vector=%d\n", info->line, info->irq);
-        }
-
-        return;
-}
-
-
-char *mcfrs_drivername = "ColdFire internal UART serial driver version 1.00\n";
-
-
-/*
- * Serial stats reporting...
- */
-int mcfrs_readproc(char *page, char **start, off_t off, int count,
-                         int *eof, void *data)
-{
-        struct mcf_serial       *info;
-        char                    str[20];
-        int                     len, sigs, i;
-
-        len = sprintf(page, mcfrs_drivername);
-        for (i = 0; (i < NR_PORTS); i++) {
-                info = &mcfrs_table[i];
-                len += sprintf((page + len), "%d: port:%x irq=%d baud:%d ",
-                        i, (unsigned int) info->addr, info->irq, info->baud);
-                if (info->stats.rx || info->stats.tx)
-                        len += sprintf((page + len), "tx:%d rx:%d ",
-                        info->stats.tx, info->stats.rx);
-                if (info->stats.rxframing)
-                        len += sprintf((page + len), "fe:%d ",
-                        info->stats.rxframing);
-                if (info->stats.rxparity)
-                        len += sprintf((page + len), "pe:%d ",
-                        info->stats.rxparity);
-                if (info->stats.rxbreak)
-                        len += sprintf((page + len), "brk:%d ",
-                        info->stats.rxbreak);
-                if (info->stats.rxoverrun)
-                        len += sprintf((page + len), "oe:%d ",
-                        info->stats.rxoverrun);
-
-                str[0] = str[1] = 0;
-                if ((sigs = mcfrs_getsignals(info))) {
-                        if (sigs & TIOCM_RTS)
-                                strcat(str, "|RTS");
-                        if (sigs & TIOCM_CTS)
-                                strcat(str, "|CTS");
-                        if (sigs & TIOCM_DTR)
-                                strcat(str, "|DTR");
-                        if (sigs & TIOCM_CD)
-                                strcat(str, "|CD");
-                }
-
-                len += sprintf((page + len), "%s\n", &str[1]);
-        }
-
-        return(len);
-}
-
-
-/* Finally, routines used to initialize the serial driver. */
-
-static void show_serial_version(void)
-{
-        printk(mcfrs_drivername);
-}
-
-static const struct tty_operations mcfrs_ops = {
-        .open = mcfrs_open,
-        .close = mcfrs_close,
-        .write = mcfrs_write,
-        .flush_chars = mcfrs_flush_chars,
-        .write_room = mcfrs_write_room,
-        .chars_in_buffer = mcfrs_chars_in_buffer,
-        .flush_buffer = mcfrs_flush_buffer,
-        .ioctl = mcfrs_ioctl,
-        .throttle = mcfrs_throttle,
-        .unthrottle = mcfrs_unthrottle,
-        .set_termios = mcfrs_set_termios,
-        .stop = mcfrs_stop,
-        .start = mcfrs_start,
-        .hangup = mcfrs_hangup,
-        .read_proc = mcfrs_readproc,
-        .wait_until_sent = mcfrs_wait_until_sent,
-        .tiocmget = mcfrs_tiocmget,
-        .tiocmset = mcfrs_tiocmset,
-};
-
-/* mcfrs_init inits the driver */
-static int __init
-mcfrs_init(void)
-{
-        struct mcf_serial       *info;
-        unsigned long           flags;
-        int                     i;
-
-        /* Setup base handler, and timer table. */
-#ifdef MCFPP_DCD0
-        init_timer(&mcfrs_timer_struct);
-        mcfrs_timer_struct.function = mcfrs_timer;
-        mcfrs_timer_struct.data = 0;
-        mcfrs_timer_struct.expires = jiffies + HZ/25;
-        add_timer(&mcfrs_timer_struct);
-        mcfrs_ppstatus = mcf_getppdata() & (MCFPP_DCD0 | MCFPP_DCD1);
-#endif
-        mcfrs_serial_driver = alloc_tty_driver(NR_PORTS);
-        if (!mcfrs_serial_driver)
-                return -ENOMEM;
-
-        show_serial_version();
-
-        /* Initialize the tty_driver structure */
-        mcfrs_serial_driver->owner = THIS_MODULE;
-        mcfrs_serial_driver->name = "ttyS";
-        mcfrs_serial_driver->driver_name = "mcfserial";
-        mcfrs_serial_driver->major = TTY_MAJOR;
-        mcfrs_serial_driver->minor_start = 64;
-        mcfrs_serial_driver->type = TTY_DRIVER_TYPE_SERIAL;
-        mcfrs_serial_driver->subtype = SERIAL_TYPE_NORMAL;
-        mcfrs_serial_driver->init_termios = tty_std_termios;
-
-        mcfrs_serial_driver->init_termios.c_cflag =
-                mcfrs_console_cbaud | CS8 | CREAD | HUPCL | CLOCAL;
-        mcfrs_serial_driver->flags = TTY_DRIVER_REAL_RAW;
-
-        tty_set_operations(mcfrs_serial_driver, &mcfrs_ops);
-
-        if (tty_register_driver(mcfrs_serial_driver)) {
-                printk("MCFRS: Couldn't register serial driver\n");
-                put_tty_driver(mcfrs_serial_driver);
-                return(-EBUSY);
-        }
-
-        local_irq_save(flags);
-
-        /*
-         *      Configure all the attached serial ports.
-         */
-        for (i = 0, info = mcfrs_table; (i < NR_PORTS); i++, info++) {
-                info->magic = SERIAL_MAGIC;
-                info->line = i;
-                info->port.tty = NULL;
-                info->custom_divisor = 16;
-                info->close_delay = 50;
-                info->closing_wait = 3000;
-                info->x_char = 0;
-                info->event = 0;
-                info->count = 0;
-                info->blocked_open = 0;
-                INIT_WORK(&info->tqueue, mcfrs_offintr);
-                INIT_WORK(&info->tqueue_hangup, do_serial_hangup);
-                init_waitqueue_head(&info->open_wait);
-                init_waitqueue_head(&info->close_wait);
-
-                info->imr = 0;
-                mcfrs_setsignals(info, 0, 0);
-                mcfrs_irqinit(info);
-
-                printk("ttyS%d at 0x%04x (irq = %d)", info->line,
-                        (unsigned int) info->addr, info->irq);
-                printk(" is a builtin ColdFire UART\n");
-        }
-
-        local_irq_restore(flags);
-        return 0;
-}
-
-module_init(mcfrs_init);
-
-/****************************************************************************/
-/*                          Serial Console                                  */
-/****************************************************************************/
-
-/*
- *      Quick and dirty UART initialization, for console output.
- */
-
-void mcfrs_init_console(void)
-{
-        volatile unsigned char  *uartp;
-        unsigned int            clk;
-
-        /*
-         *      Reset UART, get it into known state...
-         */
-        uartp = (volatile unsigned char *) (MCF_MBAR +
-                (mcfrs_console_port ? MCFUART_BASE2 : MCFUART_BASE1));
-
-        uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETRX;  /* reset RX */
-        uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETTX;  /* reset TX */
-        uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETMRPTR;  /* reset MR pointer */
-
-        /*
-         * Set port for defined baud , 8 data bits, 1 stop bit, no parity.
-         */
-        uartp[MCFUART_UMR] = MCFUART_MR1_PARITYNONE | MCFUART_MR1_CS8;
-        uartp[MCFUART_UMR] = MCFUART_MR2_STOP1;
-
-#ifdef  CONFIG_M5272
-{
-        /*
-         * For the MCF5272, also compute the baudrate fraction.
-         */
-        int fraction = MCF_BUSCLK - (clk * 32 * mcfrs_console_baud);
-        fraction *= 16;
-        fraction /= (32 * mcfrs_console_baud);
-        uartp[MCFUART_UFPD] = (fraction & 0xf);         /* set fraction */
-        clk = (MCF_BUSCLK / mcfrs_console_baud) / 32;
-}
-#else
-        clk = ((MCF_BUSCLK / mcfrs_console_baud) + 16) / 32; /* set baud */
-#endif
-
-        uartp[MCFUART_UBG1] = (clk & 0xff00) >> 8;  /* set msb baud */
-        uartp[MCFUART_UBG2] = (clk & 0xff);  /* set lsb baud */
-        uartp[MCFUART_UCSR] = MCFUART_UCSR_RXCLKTIMER | MCFUART_UCSR_TXCLKTIMER;
-        uartp[MCFUART_UCR] = MCFUART_UCR_RXENABLE | MCFUART_UCR_TXENABLE;
-
-        mcfrs_console_inited++;
-        return;
-}
-
-
-/*
- *      Setup for console. Argument comes from the boot command line.
- */
-
-int mcfrs_console_setup(struct console *cp, char *arg)
-{
-        int             i, n = CONSOLE_BAUD_RATE;
-
-        if (!cp)
-                return(-1);
-
-        if (!strncmp(cp->name, "ttyS", 4))
-                mcfrs_console_port = cp->index;
-        else if (!strncmp(cp->name, "cua", 3))
-                mcfrs_console_port = cp->index;
-        else
-                return(-1);
-
-        if (arg)
-                n = simple_strtoul(arg,NULL,0);
-        for (i = 0; i < MCFRS_BAUD_TABLE_SIZE; i++)
-                if (mcfrs_baud_table[i] == n)
-                        break;
-        if (i < MCFRS_BAUD_TABLE_SIZE) {
-                mcfrs_console_baud = n;
-                mcfrs_console_cbaud = 0;
-                if (i > 15) {
-                        mcfrs_console_cbaud |= CBAUDEX;
-                        i -= 15;
-                }
-                mcfrs_console_cbaud |= i;
-        }
-        mcfrs_init_console(); /* make sure baud rate changes */
-        return(0);
-}
-
-
-static struct tty_driver *mcfrs_console_device(struct console *c, int *index)
-{
-        *index = c->index;
-        return mcfrs_serial_driver;
-}
-
-
-/*
- *      Output a single character, using UART polled mode.
- *      This is used for console output.
- */
-
-int mcfrs_put_char(char ch)
-{
-        volatile unsigned char  *uartp;
-        unsigned long           flags;
-        int                     i;
-
-        uartp = (volatile unsigned char *) (MCF_MBAR +
-                (mcfrs_console_port ? MCFUART_BASE2 : MCFUART_BASE1));
-
-        local_irq_save(flags);
-        for (i = 0; (i < 0x10000); i++) {
-                if (uartp[MCFUART_USR] & MCFUART_USR_TXREADY)
-                        break;
-        }
-        if (i < 0x10000) {
-                uartp[MCFUART_UTB] = ch;
-                for (i = 0; (i < 0x10000); i++)
-                        if (uartp[MCFUART_USR] & MCFUART_USR_TXEMPTY)
-                                break;
-        }
-        if (i >= 0x10000)
-                mcfrs_init_console(); /* try and get it back */
-        local_irq_restore(flags);
-
-        return 1;
-}
-
-
-/*
- * rs_console_write is registered for printk output.
- */
-
-void mcfrs_console_write(struct console *cp, const char *p, unsigned len)
-{
-        if (!mcfrs_console_inited)
-                mcfrs_init_console();
-        while (len-- > 0) {
-                if (*p == '\n')
-                        mcfrs_put_char('\r');
-                mcfrs_put_char(*p++);
-        }
-}
-
-/*
- * declare our consoles
- */
-
-struct console mcfrs_console = {
-        .name           = "ttyS",
-        .write          = mcfrs_console_write,
-        .device         = mcfrs_console_device,
-        .setup          = mcfrs_console_setup,
-        .flags          = CON_PRINTBUFFER,
-        .index          = -1,
-};
-
-static int __init mcfrs_console_init(void)
-{
-        register_console(&mcfrs_console);
-        return 0;
-}
-
-console_initcall(mcfrs_console_init);
-
-/****************************************************************************/
diff --git a/drivers/serial/mcfserial.h b/drivers/serial/mcfserial.h
deleted file mode 100644
index 56420e2cb110..000000000000
--- a/drivers/serial/mcfserial.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * mcfserial.c -- serial driver for ColdFire internal UARTS.
- *
- * Copyright (c) 1999 Greg Ungerer <gerg@snapgear.com>
- * Copyright (c) 2000-2001 Lineo, Inc. <www.lineo.com>
- * Copyright (c) 2002 SnapGear Inc., <www.snapgear.com>
- *
- * Based on code from 68332serial.c which was:
- *
- * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
- * Copyright (C) 1998 TSHG
- * Copyright (c) 1999 Rt-Control Inc. <jeff@uclinux.org>
- */ 
-#ifndef _MCF_SERIAL_H
-#define _MCF_SERIAL_H
-
-#include <linux/serial.h>
-
-#ifdef __KERNEL__
-
-/*
- *      Define a local serial stats structure.
- */
-
-struct mcf_stats {
-        unsigned int    rx;
-        unsigned int    tx;
-        unsigned int    rxbreak;
-        unsigned int    rxframing;
-        unsigned int    rxparity;
-        unsigned int    rxoverrun;
-};
-
-
-/*
- * This is our internal structure for each serial port's state.
- * Each serial port has one of these structures associated with it.
- */
-
-struct mcf_serial {
-        int                     magic;
-        volatile unsigned char  *addr;          /* UART memory address */
-        int                     irq;
-        int                     flags;          /* defined in tty.h */
-        int                     type;           /* UART type */
-        struct tty_struct       *tty;
-        unsigned char           imr;            /* Software imr register */
-        unsigned int            baud;
-        int                     sigs;
-        int                     custom_divisor;
-        int                     x_char; /* xon/xoff character */
-        int                     baud_base;
-        int                     close_delay;
-        unsigned short          closing_wait;
-        unsigned short          closing_wait2;
-        unsigned long           event;
-        int                     line;
-        int                     count;      /* # of fd on device */
-        int                     blocked_open; /* # of blocked opens */
-        unsigned char           *xmit_buf;
-        int                     xmit_head;
-        int                     xmit_tail;
-        int                     xmit_cnt;
-        struct mcf_stats        stats;
-        struct work_struct      tqueue;
-        struct work_struct      tqueue_hangup;
-        wait_queue_head_t       open_wait;
-        wait_queue_head_t       close_wait;
-
-};
-
-#endif /* __KERNEL__ */
-
-#endif /* _MCF_SERIAL_H */
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 36126070d9af..6117d3db0b66 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -72,13 +72,8 @@
 #include <linux/console.h>
 #include <linux/delay.h>
 #include <linux/io.h>
-
-#if defined(CONFIG_PPC_MERGE)
 #include <linux/of.h>
 #include <linux/of_platform.h>
-#else
-#include <linux/platform_device.h>
-#endif
 
 #include <asm/mpc52xx.h>
 #include <asm/mpc512x.h>
@@ -107,12 +102,11 @@ static struct uart_port mpc52xx_uart_ports[MPC52xx_PSC_MAXNUM];
          *        it's cleared, then a memset(...,0,...) should be added to
          *        the console_init
          */
-#if defined(CONFIG_PPC_MERGE)
+
 /* lookup table for matching device nodes to index numbers */
 static struct device_node *mpc52xx_uart_nodes[MPC52xx_PSC_MAXNUM];
 
 static void mpc52xx_uart_of_enumerate(void);
-#endif
 
 
 #define PSC(port) ((struct mpc52xx_psc __iomem *)((port)->membase))
@@ -255,17 +249,12 @@ static void mpc52xx_psc_cw_restore_ints(struct uart_port *port)
 /* Search for bus-frequency property in this node or a parent */
 static unsigned long mpc52xx_getuartclk(void *p)
 {
-#if defined(CONFIG_PPC_MERGE)
         /*
          * 5200 UARTs have a / 32 prescaler
          * but the generic serial code assumes 16
          * so return ipb freq / 2
          */
         return mpc52xx_find_ipb_freq(p) / 2;
-#else
-        pr_debug("unexpected call to mpc52xx_getuartclk with arch/ppc\n");
-        return NULL;
-#endif
 }
 
 static struct psc_ops mpc52xx_psc_ops = {
@@ -886,10 +875,6 @@ mpc52xx_console_get_options(struct uart_port *port,
 
         /* CT{U,L}R are write-only ! */
         *baud = CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD;
-#if !defined(CONFIG_PPC_MERGE)
-        if (__res.bi_baudrate)
-                *baud = __res.bi_baudrate;
-#endif
 
         /* Parse them */
         switch (mr1 & MPC52xx_PSC_MODE_BITS_MASK) {
@@ -946,42 +931,6 @@ mpc52xx_console_write(struct console *co, const char *s, unsigned int count)
         psc_ops->cw_restore_ints(port);
 }
 
-#if !defined(CONFIG_PPC_MERGE)
-static int __init
-mpc52xx_console_setup(struct console *co, char *options)
-{
-        struct uart_port *port = &mpc52xx_uart_ports[co->index];
-
-        int baud = CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD;
-        int bits = 8;
-        int parity = 'n';
-        int flow = 'n';
-
-        if (co->index < 0 || co->index >= MPC52xx_PSC_MAXNUM)
-                return -EINVAL;
-
-        /* Basic port init. Needed since we use some uart_??? func before
-         * real init for early access */
-        spin_lock_init(&port->lock);
-        port->uartclk   = __res.bi_ipbfreq / 2; /* Look at CTLR doc */
-        port->ops       = &mpc52xx_uart_ops;
-        port->mapbase   = MPC52xx_PA(MPC52xx_PSCx_OFFSET(co->index+1));
-
-        /* We ioremap ourself */
-        port->membase = ioremap(port->mapbase, MPC52xx_PSC_SIZE);
-        if (port->membase == NULL)
-                return -EINVAL;
-
-        /* Setup the port parameters accoding to options */
-        if (options)
-                uart_parse_options(options, &baud, &parity, &bits, &flow);
-        else
-                mpc52xx_console_get_options(port, &baud, &parity, &bits, &flow);
-
-        return uart_set_options(port, co, baud, parity, bits, flow);
-}
-
-#else
 
 static int __init
 mpc52xx_console_setup(struct console *co, char *options)
@@ -1053,7 +1002,6 @@ mpc52xx_console_setup(struct console *co, char *options)
 
         return uart_set_options(port, co, baud, parity, bits, flow);
 }
-#endif /* defined(CONFIG_PPC_MERGE) */
 
 
 static struct uart_driver mpc52xx_uart_driver;
@@ -1072,9 +1020,7 @@ static struct console mpc52xx_console = {
 static int __init
 mpc52xx_console_init(void)
 {
-#if defined(CONFIG_PPC_MERGE)
         mpc52xx_uart_of_enumerate();
-#endif
         register_console(&mpc52xx_console);
         return 0;
 }
@@ -1100,115 +1046,6 @@ static struct uart_driver mpc52xx_uart_driver = {
         .cons           = MPC52xx_PSC_CONSOLE,
 };
 
-
-#if !defined(CONFIG_PPC_MERGE)
-/* ======================================================================== */
-/* Platform Driver                                                          */
-/* ======================================================================== */
-
-static int __devinit
-mpc52xx_uart_probe(struct platform_device *dev)
-{
-        struct resource *res = dev->resource;
-
-        struct uart_port *port = NULL;
-        int i, idx, ret;
-
-        /* Check validity & presence */
-        idx = dev->id;
-        if (idx < 0 || idx >= MPC52xx_PSC_MAXNUM)
-                return -EINVAL;
-
-        if (!mpc52xx_match_psc_function(idx, "uart"))
-                return -ENODEV;
-
-        /* Init the port structure */
-        port = &mpc52xx_uart_ports[idx];
-
-        spin_lock_init(&port->lock);
-        port->uartclk   = __res.bi_ipbfreq / 2; /* Look at CTLR doc */
-        port->fifosize  = 512;
-        port->iotype    = UPIO_MEM;
-        port->flags     = UPF_BOOT_AUTOCONF |
-                          (uart_console(port) ? 0 : UPF_IOREMAP);
-        port->line      = idx;
-        port->ops       = &mpc52xx_uart_ops;
-        port->dev       = &dev->dev;
-
-        /* Search for IRQ and mapbase */
-        for (i = 0 ; i < dev->num_resources ; i++, res++) {
-                if (res->flags & IORESOURCE_MEM)
-                        port->mapbase = res->start;
-                else if (res->flags & IORESOURCE_IRQ)
-                        port->irq = res->start;
-        }
-        if (!port->irq || !port->mapbase)
-                return -EINVAL;
-
-        /* Add the port to the uart sub-system */
-        ret = uart_add_one_port(&mpc52xx_uart_driver, port);
-        if (!ret)
-                platform_set_drvdata(dev, (void *)port);
-
-        return ret;
-}
-
-static int
-mpc52xx_uart_remove(struct platform_device *dev)
-{
-        struct uart_port *port = (struct uart_port *) platform_get_drvdata(dev);
-
-        platform_set_drvdata(dev, NULL);
-
-        if (port)
-                uart_remove_one_port(&mpc52xx_uart_driver, port);
-
-        return 0;
-}
-
-#ifdef CONFIG_PM
-static int
-mpc52xx_uart_suspend(struct platform_device *dev, pm_message_t state)
-{
-        struct uart_port *port = (struct uart_port *) platform_get_drvdata(dev);
-
-        if (port)
-                uart_suspend_port(&mpc52xx_uart_driver, port);
-
-        return 0;
-}
-
-static int
-mpc52xx_uart_resume(struct platform_device *dev)
-{
-        struct uart_port *port = (struct uart_port *) platform_get_drvdata(dev);
-
-        if (port)
-                uart_resume_port(&mpc52xx_uart_driver, port);
-
-        return 0;
-}
-#endif
-
-/* work with hotplug and coldplug */
-MODULE_ALIAS("platform:mpc52xx-psc");
-
-static struct platform_driver mpc52xx_uart_platform_driver = {
-        .probe          = mpc52xx_uart_probe,
-        .remove         = mpc52xx_uart_remove,
-#ifdef CONFIG_PM
-        .suspend        = mpc52xx_uart_suspend,
-        .resume         = mpc52xx_uart_resume,
-#endif
-        .driver         = {
-                .owner  = THIS_MODULE,
-                .name   = "mpc52xx-psc",
-        },
-};
-#endif /* !defined(CONFIG_PPC_MERGE) */
-
-
-#if defined(CONFIG_PPC_MERGE)
 /* ======================================================================== */
 /* OF Platform Driver                                                       */
 /* ======================================================================== */
@@ -1402,7 +1239,6 @@ static struct of_platform_driver mpc52xx_uart_of_driver = {
                 .name   = "mpc52xx-psc-uart",
         },
 };
-#endif /* defined(CONFIG_PPC_MERGE) */
 
 
 /* ======================================================================== */
@@ -1423,7 +1259,6 @@ mpc52xx_uart_init(void)
                 return ret;
         }
 
-#if defined(CONFIG_PPC_MERGE)
         mpc52xx_uart_of_enumerate();
 
         ret = of_register_platform_driver(&mpc52xx_uart_of_driver);
@@ -1433,16 +1268,6 @@ mpc52xx_uart_init(void)
                 uart_unregister_driver(&mpc52xx_uart_driver);
                 return ret;
         }
-#else
-        psc_ops = &mpc52xx_psc_ops;
-        ret = platform_driver_register(&mpc52xx_uart_platform_driver);
-        if (ret) {
-                printk(KERN_ERR "%s: platform_driver_register failed (%i)\n",
-                       __FILE__, ret);
-                uart_unregister_driver(&mpc52xx_uart_driver);
-                return ret;
-        }
-#endif
 
         return 0;
 }
@@ -1450,11 +1275,7 @@ mpc52xx_uart_init(void)
 static void __exit
 mpc52xx_uart_exit(void)
 {
-#if defined(CONFIG_PPC_MERGE)
         of_unregister_platform_driver(&mpc52xx_uart_of_driver);
-#else
-        platform_driver_unregister(&mpc52xx_uart_platform_driver);
-#endif
         uart_unregister_driver(&mpc52xx_uart_driver);
 }
 
diff --git a/drivers/serial/s3c2400.c b/drivers/serial/s3c2400.c
index c8b4266ac35f..4873f2978bd2 100644
--- a/drivers/serial/s3c2400.c
+++ b/drivers/serial/s3c2400.c
@@ -19,7 +19,7 @@
 
 #include <mach/hardware.h>
 
-#include <asm/plat-s3c/regs-serial.h>
+#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 
 #include "samsung.h"
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
index 40a2531b5541..87c182ef71b8 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -21,7 +21,7 @@
 #include <asm/irq.h>
 #include <mach/hardware.h>
 
-#include <asm/plat-s3c/regs-serial.h>
+#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 
 #include "samsung.h"
diff --git a/drivers/serial/s3c2412.c b/drivers/serial/s3c2412.c
index d0170319c729..fd017b375568 100644
--- a/drivers/serial/s3c2412.c
+++ b/drivers/serial/s3c2412.c
@@ -21,7 +21,7 @@
 #include <asm/irq.h>
 #include <mach/hardware.h>
 
-#include <asm/plat-s3c/regs-serial.h>
+#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 
 #include "samsung.h"
diff --git a/drivers/serial/s3c2440.c b/drivers/serial/s3c2440.c
index d4a2b17b2498..317d239ab740 100644
--- a/drivers/serial/s3c2440.c
+++ b/drivers/serial/s3c2440.c
@@ -21,7 +21,7 @@
 #include <asm/irq.h>
 #include <mach/hardware.h>
 
-#include <asm/plat-s3c/regs-serial.h>
+#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 
 #include "samsung.h"
diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c
index 5a88b3f9fe9b..1e219d3d0352 100644
--- a/drivers/serial/samsung.c
+++ b/drivers/serial/samsung.c
@@ -47,7 +47,7 @@
 
 #include <mach/hardware.h>
 
-#include <asm/plat-s3c/regs-serial.h>
+#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 
 #include "samsung.h"
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index f977c98cfa95..6bdf3362e3b1 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -2051,7 +2051,8 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *port)
                                         "transmitter\n",
                                port->dev ? port->dev->bus_id : "",
                                port->dev ? ": " : "",
-                               drv->dev_name, port->line);
+                               drv->dev_name,
+                               drv->tty_driver->name_base + port->line);
 
                 ops->shutdown(port);
         }
@@ -2154,12 +2155,11 @@ uart_report_port(struct uart_driver *drv, struct uart_port *port)
 
         switch (port->iotype) {
         case UPIO_PORT:
-                snprintf(address, sizeof(address),
-                         "I/O 0x%x", port->iobase);
+                snprintf(address, sizeof(address), "I/O 0x%lx", port->iobase);
                 break;
         case UPIO_HUB6:
                 snprintf(address, sizeof(address),
-                         "I/O 0x%x offset 0x%x", port->iobase, port->hub6);
+                         "I/O 0x%lx offset 0x%x", port->iobase, port->hub6);
                 break;
         case UPIO_MEM:
         case UPIO_MEM32:
@@ -2177,7 +2177,9 @@ uart_report_port(struct uart_driver *drv, struct uart_port *port)
         printk(KERN_INFO "%s%s%s%d at %s (irq = %d) is a %s\n",
                port->dev ? port->dev->bus_id : "",
                port->dev ? ": " : "",
-               drv->dev_name, port->line, address, port->irq, uart_type(port));
+               drv->dev_name,
+               drv->tty_driver->name_base + port->line,
+               address, port->irq, uart_type(port));
 }
 
 static void
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index 164d2a42eb59..7546aa887fa7 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -431,131 +431,103 @@ first_tuple(struct pcmcia_device *handle, tuple_t * tuple, cisparse_t * parse)
 {
         int i;
         i = pcmcia_get_first_tuple(handle, tuple);
-        if (i != CS_SUCCESS)
-                return CS_NO_MORE_ITEMS;
-        i = pcmcia_get_tuple_data(handle, tuple);
-        if (i != CS_SUCCESS)
+        if (i != 0)
                 return i;
-        return pcmcia_parse_tuple(handle, tuple, parse);
-}
-
-static int
-next_tuple(struct pcmcia_device *handle, tuple_t * tuple, cisparse_t * parse)
-{
-        int i;
-        i = pcmcia_get_next_tuple(handle, tuple);
-        if (i != CS_SUCCESS)
-                return CS_NO_MORE_ITEMS;
         i = pcmcia_get_tuple_data(handle, tuple);
-        if (i != CS_SUCCESS)
+        if (i != 0)
                 return i;
-        return pcmcia_parse_tuple(handle, tuple, parse);
+        return pcmcia_parse_tuple(tuple, parse);
 }
 
 /*====================================================================*/
 
-static int simple_config(struct pcmcia_device *link)
+static int simple_config_check(struct pcmcia_device *p_dev,
+                               cistpl_cftable_entry_t *cf,
+                               cistpl_cftable_entry_t *dflt,
+                               unsigned int vcc,
+                               void *priv_data)
 {
-        static const unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
         static const int size_table[2] = { 8, 16 };
-        struct serial_info *info = link->priv;
-        struct serial_cfg_mem *cfg_mem;
-        tuple_t *tuple;
-        u_char *buf;
-        cisparse_t *parse;
-        cistpl_cftable_entry_t *cf;
-        config_info_t config;
-        int i, j, try;
-        int s;
+        int *try = priv_data;
+
+        if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp =
+                        cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+
+        if ((cf->io.nwin > 0) && (cf->io.win[0].len == size_table[(*try >> 1)])
+            && (cf->io.win[0].base != 0)) {
+                p_dev->io.BasePort1 = cf->io.win[0].base;
+                p_dev->io.IOAddrLines = ((*try & 0x1) == 0) ?
+                        16 : cf->io.flags & CISTPL_IO_LINES_MASK;
+                if (!pcmcia_request_io(p_dev, &p_dev->io))
+                        return 0;
+        }
+        return -EINVAL;
+}
 
-        cfg_mem = kmalloc(sizeof(struct serial_cfg_mem), GFP_KERNEL);
-        if (!cfg_mem)
-                return -1;
+static int simple_config_check_notpicky(struct pcmcia_device *p_dev,
+                                        cistpl_cftable_entry_t *cf,
+                                        cistpl_cftable_entry_t *dflt,
+                                        unsigned int vcc,
+                                        void *priv_data)
+{
+        static const unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
+        int j;
+
+        if ((cf->io.nwin > 0) && ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) {
+                for (j = 0; j < 5; j++) {
+                        p_dev->io.BasePort1 = base[j];
+                        p_dev->io.IOAddrLines = base[j] ? 16 : 3;
+                        if (!pcmcia_request_io(p_dev, &p_dev->io))
+                                return 0;
+                }
+        }
+        return -ENODEV;
+}
 
-        tuple = &cfg_mem->tuple;
-        parse = &cfg_mem->parse;
-        cf = &parse->cftable_entry;
-        buf = cfg_mem->buf;
+static int simple_config(struct pcmcia_device *link)
+{
+        struct serial_info *info = link->priv;
+        int i = -ENODEV, try;
 
         /* If the card is already configured, look up the port and irq */
-        i = pcmcia_get_configuration_info(link, &config);
-        if ((i == CS_SUCCESS) && (config.Attributes & CONF_VALID_CLIENT)) {
+        if (link->function_config) {
                 unsigned int port = 0;
-                if ((config.BasePort2 != 0) && (config.NumPorts2 == 8)) {
-                        port = config.BasePort2;
+                if ((link->io.BasePort2 != 0) &&
+                    (link->io.NumPorts2 == 8)) {
+                        port = link->io.BasePort2;
                         info->slave = 1;
                 } else if ((info->manfid == MANFID_OSITECH) &&
-                           (config.NumPorts1 == 0x40)) {
-                        port = config.BasePort1 + 0x28;
+                           (link->io.NumPorts1 == 0x40)) {
+                        port = link->io.BasePort1 + 0x28;
                         info->slave = 1;
                 }
                 if (info->slave) {
-                        kfree(cfg_mem);
-                        return setup_serial(link, info, port, config.AssignedIRQ);
+                        return setup_serial(link, info, port,
+                                            link->irq.AssignedIRQ);
                 }
         }
 
-        /* First pass: look for a config entry that looks normal. */
-        tuple->TupleData = (cisdata_t *) buf;
-        tuple->TupleOffset = 0;
-        tuple->TupleDataMax = 255;
-        tuple->Attributes = 0;
-        tuple->DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        /* Two tries: without IO aliases, then with aliases */
-        for (s = 0; s < 2; s++) {
-                for (try = 0; try < 2; try++) {
-                        i = first_tuple(link, tuple, parse);
-                        while (i != CS_NO_MORE_ITEMS) {
-                                if (i != CS_SUCCESS)
-                                        goto next_entry;
-                                if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM))
-                                        link->conf.Vpp =
-                                            cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;
-                                if ((cf->io.nwin > 0) && (cf->io.win[0].len == size_table[s]) &&
-                                            (cf->io.win[0].base != 0)) {
-                                        link->conf.ConfigIndex = cf->index;
-                                        link->io.BasePort1 = cf->io.win[0].base;
-                                        link->io.IOAddrLines = (try == 0) ?
-                                            16 : cf->io.flags & CISTPL_IO_LINES_MASK;
-                                        i = pcmcia_request_io(link, &link->io);
-                                        if (i == CS_SUCCESS)
-                                                goto found_port;
-                                }
-next_entry:
-                                i = next_tuple(link, tuple, parse);
-                        }
-                }
-        }
+        /* First pass: look for a config entry that looks normal.
+         * Two tries: without IO aliases, then with aliases */
+        for (try = 0; try < 4; try++)
+                if (!pcmcia_loop_config(link, simple_config_check, &try))
+                        goto found_port;
+
         /* Second pass: try to find an entry that isn't picky about
            its base address, then try to grab any standard serial port
            address, and finally try to get any free port. */
-        i = first_tuple(link, tuple, parse);
-        while (i != CS_NO_MORE_ITEMS) {
-                if ((i == CS_SUCCESS) && (cf->io.nwin > 0) &&
-                    ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) {
-                        link->conf.ConfigIndex = cf->index;
-                        for (j = 0; j < 5; j++) {
-                                link->io.BasePort1 = base[j];
-                                link->io.IOAddrLines = base[j] ? 16 : 3;
-                                i = pcmcia_request_io(link, &link->io);
-                                if (i == CS_SUCCESS)
-                                        goto found_port;
-                        }
-                }
-                i = next_tuple(link, tuple, parse);
-        }
+        if (!pcmcia_loop_config(link, simple_config_check_notpicky, NULL))
+                goto found_port;
 
-      found_port:
-        if (i != CS_SUCCESS) {
-                printk(KERN_NOTICE
-                       "serial_cs: no usable port range found, giving up\n");
-                cs_error(link, RequestIO, i);
-                kfree(cfg_mem);
-                return -1;
-        }
+        printk(KERN_NOTICE
+               "serial_cs: no usable port range found, giving up\n");
+        cs_error(link, RequestIO, i);
+        return -1;
 
+found_port:
         i = pcmcia_request_irq(link, &link->irq);
-        if (i != CS_SUCCESS) {
+        if (i != 0) {
                 cs_error(link, RequestIRQ, i);
                 link->irq.AssignedIRQ = 0;
         }
@@ -569,88 +541,76 @@ next_entry:
                 info->quirk->config(link);
 
         i = pcmcia_request_configuration(link, &link->conf);
-        if (i != CS_SUCCESS) {
+        if (i != 0) {
                 cs_error(link, RequestConfiguration, i);
-                kfree(cfg_mem);
                 return -1;
         }
-        kfree(cfg_mem);
         return setup_serial(link, info, link->io.BasePort1, link->irq.AssignedIRQ);
 }
 
-static int multi_config(struct pcmcia_device * link)
+static int multi_config_check(struct pcmcia_device *p_dev,
+                              cistpl_cftable_entry_t *cf,
+                              cistpl_cftable_entry_t *dflt,
+                              unsigned int vcc,
+                              void *priv_data)
 {
-        struct serial_info *info = link->priv;
-        struct serial_cfg_mem *cfg_mem;
-        tuple_t *tuple;
-        u_char *buf;
-        cisparse_t *parse;
-        cistpl_cftable_entry_t *cf;
-        int i, rc, base2 = 0;
+        int *base2 = priv_data;
+
+        /* The quad port cards have bad CIS's, so just look for a
+           window larger than 8 ports and assume it will be right */
+        if ((cf->io.nwin == 1) && (cf->io.win[0].len > 8)) {
+                p_dev->io.BasePort1 = cf->io.win[0].base;
+                p_dev->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK;
+                if (!pcmcia_request_io(p_dev, &p_dev->io)) {
+                        *base2 = p_dev->io.BasePort1 + 8;
+                        return 0;
+                }
+        }
+        return -ENODEV;
+}
 
-        cfg_mem = kmalloc(sizeof(struct serial_cfg_mem), GFP_KERNEL);
-        if (!cfg_mem)
-                return -1;
-        tuple = &cfg_mem->tuple;
-        parse = &cfg_mem->parse;
-        cf = &parse->cftable_entry;
-        buf = cfg_mem->buf;
+static int multi_config_check_notpicky(struct pcmcia_device *p_dev,
+                                       cistpl_cftable_entry_t *cf,
+                                       cistpl_cftable_entry_t *dflt,
+                                       unsigned int vcc,
+                                       void *priv_data)
+{
+        int *base2 = priv_data;
+
+        if (cf->io.nwin == 2) {
+                p_dev->io.BasePort1 = cf->io.win[0].base;
+                p_dev->io.BasePort2 = cf->io.win[1].base;
+                p_dev->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK;
+                if (!pcmcia_request_io(p_dev, &p_dev->io)) {
+                        *base2 = p_dev->io.BasePort2;
+                        return 0;
+                }
+        }
+        return -ENODEV;
+}
 
-        tuple->TupleData = (cisdata_t *) buf;
-        tuple->TupleOffset = 0;
-        tuple->TupleDataMax = 255;
-        tuple->Attributes = 0;
-        tuple->DesiredTuple = CISTPL_CFTABLE_ENTRY;
+static int multi_config(struct pcmcia_device *link)
+{
+        struct serial_info *info = link->priv;
+        int i, base2 = 0;
 
         /* First, look for a generic full-sized window */
         link->io.NumPorts1 = info->multi * 8;
-        i = first_tuple(link, tuple, parse);
-        while (i != CS_NO_MORE_ITEMS) {
-                /* The quad port cards have bad CIS's, so just look for a
-                   window larger than 8 ports and assume it will be right */
-                if ((i == CS_SUCCESS) && (cf->io.nwin == 1) &&
-                    (cf->io.win[0].len > 8)) {
-                        link->conf.ConfigIndex = cf->index;
-                        link->io.BasePort1 = cf->io.win[0].base;
-                        link->io.IOAddrLines =
-                            cf->io.flags & CISTPL_IO_LINES_MASK;
-                        i = pcmcia_request_io(link, &link->io);
-                        base2 = link->io.BasePort1 + 8;
-                        if (i == CS_SUCCESS)
-                                break;
-                }
-                i = next_tuple(link, tuple, parse);
-        }
-
-        /* If that didn't work, look for two windows */
-        if (i != CS_SUCCESS) {
+        if (pcmcia_loop_config(link, multi_config_check, &base2)) {
+                /* If that didn't work, look for two windows */
                 link->io.NumPorts1 = link->io.NumPorts2 = 8;
                 info->multi = 2;
-                i = first_tuple(link, tuple, parse);
-                while (i != CS_NO_MORE_ITEMS) {
-                        if ((i == CS_SUCCESS) && (cf->io.nwin == 2)) {
-                                link->conf.ConfigIndex = cf->index;
-                                link->io.BasePort1 = cf->io.win[0].base;
-                                link->io.BasePort2 = cf->io.win[1].base;
-                                link->io.IOAddrLines =
-                                    cf->io.flags & CISTPL_IO_LINES_MASK;
-                                i = pcmcia_request_io(link, &link->io);
-                                base2 = link->io.BasePort2;
-                                if (i == CS_SUCCESS)
-                                        break;
-                        }
-                        i = next_tuple(link, tuple, parse);
+                if (pcmcia_loop_config(link, multi_config_check_notpicky,
+                                       &base2)) {
+                        printk(KERN_NOTICE "serial_cs: no usable port range"
+                               "found, giving up\n");
+                        return -ENODEV;
                 }
         }
 
-        if (i != CS_SUCCESS) {
-                cs_error(link, RequestIO, i);
-                rc = -1;
-                goto free_cfg_mem;
-        }
-
         i = pcmcia_request_irq(link, &link->irq);
-        if (i != CS_SUCCESS) {
+        if (i != 0) {
+                /* FIXME: comment does not fit, error handling does not fit */
                 printk(KERN_NOTICE
                        "serial_cs: no usable port range found, giving up\n");
                 cs_error(link, RequestIRQ, i);
@@ -664,10 +624,9 @@ static int multi_config(struct pcmcia_device * link)
                 info->quirk->config(link);
 
         i = pcmcia_request_configuration(link, &link->conf);
-        if (i != CS_SUCCESS) {
+        if (i != 0) {
                 cs_error(link, RequestConfiguration, i);
-                rc = -1;
-                goto free_cfg_mem;
+                return -ENODEV;
         }
 
         /* The Oxford Semiconductor OXCF950 cards are in fact single-port:
@@ -678,7 +637,8 @@ static int multi_config(struct pcmcia_device * link)
                                 info->prodid == PRODID_POSSIO_GCC)) {
                 int err;
 
-                if (cf->index == 1 || cf->index == 3) {
+                if (link->conf.ConfigIndex == 1 ||
+                    link->conf.ConfigIndex == 3) {
                         err = setup_serial(link, info, base2,
                                         link->irq.AssignedIRQ);
                         base2 = link->io.BasePort1;
@@ -695,18 +655,14 @@ static int multi_config(struct pcmcia_device * link)
                 if (info->quirk && info->quirk->wakeup)
                         info->quirk->wakeup(link);
 
-                rc = 0;
-                goto free_cfg_mem;
+                return 0;
         }
 
         setup_serial(link, info, link->io.BasePort1, link->irq.AssignedIRQ);
         for (i = 0; i < info->multi - 1; i++)
                 setup_serial(link, info, base2 + (8 * i),
                                 link->irq.AssignedIRQ);
-        rc = 0;
-free_cfg_mem:
-        kfree(cfg_mem);
-        return rc;
+        return 0;
 }
 
 /*======================================================================
@@ -746,7 +702,7 @@ static int serial_config(struct pcmcia_device * link)
         /* Is this a compliant multifunction card? */
         tuple->DesiredTuple = CISTPL_LONGLINK_MFC;
         tuple->Attributes = TUPLE_RETURN_COMMON | TUPLE_RETURN_LINK;
-        info->multi = (first_tuple(link, tuple, parse) == CS_SUCCESS);
+        info->multi = (first_tuple(link, tuple, parse) == 0);
 
         /* Is this a multiport card? */
         tuple->DesiredTuple = CISTPL_MANFID;
@@ -770,7 +726,7 @@ static int serial_config(struct pcmcia_device * link)
             ((link->func_id == CISTPL_FUNCID_MULTI) ||
              (link->func_id == CISTPL_FUNCID_SERIAL))) {
                 tuple->DesiredTuple = CISTPL_CFTABLE_ENTRY;
-                if (first_tuple(link, tuple, parse) == CS_SUCCESS) {
+                if (first_tuple(link, tuple, parse) == 0) {
                         if ((cf->io.nwin == 1) && (cf->io.win[0].len % 8 == 0))
                                 info->multi = cf->io.win[0].len >> 3;
                         if ((cf->io.nwin == 2) && (cf->io.win[0].len == 8) &&
diff --git a/drivers/serial/ucc_uart.c b/drivers/serial/ucc_uart.c
index 5c5d18dcb6ac..539c933b335f 100644
--- a/drivers/serial/ucc_uart.c
+++ b/drivers/serial/ucc_uart.c
@@ -1009,7 +1009,7 @@ static int qe_uart_request_port(struct uart_port *port)
         rx_size = L1_CACHE_ALIGN(qe_port->rx_nrfifos * qe_port->rx_fifosize);
         tx_size = L1_CACHE_ALIGN(qe_port->tx_nrfifos * qe_port->tx_fifosize);
 
-        bd_virt = dma_alloc_coherent(NULL, rx_size + tx_size, &bd_dma_addr,
+        bd_virt = dma_alloc_coherent(port->dev, rx_size + tx_size, &bd_dma_addr,
                 GFP_KERNEL);
         if (!bd_virt) {
                 dev_err(port->dev, "could not allocate buffer descriptors\n");
@@ -1051,7 +1051,7 @@ static void qe_uart_release_port(struct uart_port *port)
                 container_of(port, struct uart_qe_port, port);
         struct ucc_slow_private *uccs = qe_port->us_private;
 
-        dma_free_coherent(NULL, qe_port->bd_size, qe_port->bd_virt,
+        dma_free_coherent(port->dev, qe_port->bd_size, qe_port->bd_virt,
                           qe_port->bd_dma_addr);
 
         ucc_slow_free(uccs);
diff --git a/drivers/spi/mpc52xx_psc_spi.c b/drivers/spi/mpc52xx_psc_spi.c
index 25eda71f4bf4..0debe11b67b4 100644
--- a/drivers/spi/mpc52xx_psc_spi.c
+++ b/drivers/spi/mpc52xx_psc_spi.c
@@ -15,13 +15,7 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/interrupt.h>
-
-#if defined(CONFIG_PPC_MERGE)
 #include <linux/of_platform.h>
-#else
-#include <linux/platform_device.h>
-#endif
-
 #include <linux/workqueue.h>
 #include <linux/completion.h>
 #include <linux/io.h>
@@ -108,13 +102,13 @@ static void mpc52xx_psc_spi_activate_cs(struct spi_device *spi)
          * Because psc->ccr is defined as 16bit register instead of 32bit
          * just set the lower byte of BitClkDiv
          */
-        ccr = in_be16(&psc->ccr);
+        ccr = in_be16((u16 __iomem *)&psc->ccr);
         ccr &= 0xFF00;
         if (cs->speed_hz)
                 ccr |= (MCLK / cs->speed_hz - 1) & 0xFF;
         else /* by default SPI Clk 1MHz */
                 ccr |= (MCLK / 1000000 - 1) & 0xFF;
-        out_be16(&psc->ccr, ccr);
+        out_be16((u16 __iomem *)&psc->ccr, ccr);
         mps->bits_per_word = cs->bits_per_word;
 
         if (mps->activate_cs)
@@ -347,7 +341,7 @@ static int mpc52xx_psc_spi_port_config(int psc_id, struct mpc52xx_psc_spi *mps)
         /* Configure 8bit codec mode as a SPI master and use EOF flags */
         /* SICR_SIM_CODEC8|SICR_GENCLK|SICR_SPI|SICR_MSTR|SICR_USEEOF */
         out_be32(&psc->sicr, 0x0180C800);
-        out_be16(&psc->ccr, 0x070F); /* by default SPI Clk 1MHz */
+        out_be16((u16 __iomem *)&psc->ccr, 0x070F); /* default SPI Clk 1MHz */
 
         /* Set 2ms DTL delay */
         out_8(&psc->ctur, 0x00);
@@ -471,53 +465,6 @@ static int __exit mpc52xx_psc_spi_do_remove(struct device *dev)
         return 0;
 }
 
-#if !defined(CONFIG_PPC_MERGE)
-static int __init mpc52xx_psc_spi_probe(struct platform_device *dev)
-{
-        switch(dev->id) {
-        case 1:
-        case 2:
-        case 3:
-        case 6:
-                return mpc52xx_psc_spi_do_probe(&dev->dev,
-                        MPC52xx_PA(MPC52xx_PSCx_OFFSET(dev->id)),
-                        MPC52xx_PSC_SIZE, platform_get_irq(dev, 0), dev->id);
-        default:
-                return -EINVAL;
-        }
-}
-
-static int __exit mpc52xx_psc_spi_remove(struct platform_device *dev)
-{
-        return mpc52xx_psc_spi_do_remove(&dev->dev);
-}
-
-/* work with hotplug and coldplug */
-MODULE_ALIAS("platform:mpc52xx-psc-spi");
-
-static struct platform_driver mpc52xx_psc_spi_platform_driver = {
-        .remove = __exit_p(mpc52xx_psc_spi_remove),
-        .driver = {
-                .name = "mpc52xx-psc-spi",
-                .owner = THIS_MODULE,
-        },
-};
-
-static int __init mpc52xx_psc_spi_init(void)
-{
-        return platform_driver_probe(&mpc52xx_psc_spi_platform_driver,
-                        mpc52xx_psc_spi_probe);
-}
-module_init(mpc52xx_psc_spi_init);
-
-static void __exit mpc52xx_psc_spi_exit(void)
-{
-        platform_driver_unregister(&mpc52xx_psc_spi_platform_driver);
-}
-module_exit(mpc52xx_psc_spi_exit);
-
-#else   /* defined(CONFIG_PPC_MERGE) */
-
 static int __init mpc52xx_psc_spi_of_probe(struct of_device *op,
         const struct of_device_id *match)
 {
@@ -586,8 +533,6 @@ static void __exit mpc52xx_psc_spi_exit(void)
 }
 module_exit(mpc52xx_psc_spi_exit);
 
-#endif  /* defined(CONFIG_PPC_MERGE) */
-
 MODULE_AUTHOR("Dragos Carp");
 MODULE_DESCRIPTION("MPC52xx PSC SPI Driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c
index 9d2186fd74aa..454a2712e629 100644
--- a/drivers/spi/omap2_mcspi.c
+++ b/drivers/spi/omap2_mcspi.c
@@ -119,12 +119,14 @@ struct omap2_mcspi {
         struct clk              *fck;
         /* Virtual base address of the controller */
         void __iomem            *base;
+        unsigned long           phys;
         /* SPI1 has 4 channels, while SPI2 has 2 */
         struct omap2_mcspi_dma  *dma_channels;
 };
 
 struct omap2_mcspi_cs {
         void __iomem            *base;
+        unsigned long           phys;
         int                     word_len;
 };
 
@@ -233,7 +235,7 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer)
         c = count;
         word_len = cs->word_len;
 
-        base = (unsigned long) io_v2p(cs->base);
+        base = cs->phys;
         tx_reg = base + OMAP2_MCSPI_TX0;
         rx_reg = base + OMAP2_MCSPI_RX0;
         rx = xfer->rx_buf;
@@ -633,6 +635,7 @@ static int omap2_mcspi_setup(struct spi_device *spi)
                 if (!cs)
                         return -ENOMEM;
                 cs->base = mcspi->base + spi->chip_select * 0x14;
+                cs->phys = mcspi->phys + spi->chip_select * 0x14;
                 spi->controller_state = cs;
         }
 
@@ -1005,7 +1008,13 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev)
                 goto err1;
         }
 
-        mcspi->base = (void __iomem *) io_p2v(r->start);
+        mcspi->phys = r->start;
+        mcspi->base = ioremap(r->start, r->end - r->start + 1);
+        if (!mcspi->base) {
+                dev_dbg(&pdev->dev, "can't ioremap MCSPI\n");
+                status = -ENOMEM;
+                goto err1aa;
+        }
 
         INIT_WORK(&mcspi->work, omap2_mcspi_work);
 
@@ -1055,6 +1064,8 @@ err3:
 err2:
         clk_put(mcspi->ick);
 err1a:
+        iounmap(mcspi->base);
+err1aa:
         release_mem_region(r->start, (r->end - r->start) + 1);
 err1:
         spi_master_put(master);
@@ -1067,6 +1078,7 @@ static int __exit omap2_mcspi_remove(struct platform_device *pdev)
         struct omap2_mcspi      *mcspi;
         struct omap2_mcspi_dma  *dma_channels;
         struct resource         *r;
+        void __iomem *base;
 
         master = dev_get_drvdata(&pdev->dev);
         mcspi = spi_master_get_devdata(master);
@@ -1078,7 +1090,9 @@ static int __exit omap2_mcspi_remove(struct platform_device *pdev)
         r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         release_mem_region(r->start, (r->end - r->start) + 1);
 
+        base = mcspi->base;
         spi_unregister_master(master);
+        iounmap(base);
         kfree(dma_channels);
 
         return 0;
diff --git a/drivers/spi/omap_uwire.c b/drivers/spi/omap_uwire.c
index 5515eb97d7c5..bab6ff061e91 100644
--- a/drivers/spi/omap_uwire.c
+++ b/drivers/spi/omap_uwire.c
@@ -59,7 +59,6 @@
  * and irqs should show there too...
  */
 #define UWIRE_BASE_PHYS         0xFFFB3000
-#define UWIRE_BASE              ((void *__iomem)IO_ADDRESS(UWIRE_BASE_PHYS))
 
 /* uWire Registers: */
 #define UWIRE_IO_SIZE 0x20
@@ -103,16 +102,21 @@ struct uwire_state {
 };
 
 /* REVISIT compile time constant for idx_shift? */
+/*
+ * Or, put it in a structure which is used throughout the driver;
+ * that avoids having to issue two loads for each bit of static data.
+ */
 static unsigned int uwire_idx_shift;
+static void __iomem *uwire_base;
 
 static inline void uwire_write_reg(int idx, u16 val)
 {
-        __raw_writew(val, UWIRE_BASE + (idx << uwire_idx_shift));
+        __raw_writew(val, uwire_base + (idx << uwire_idx_shift));
 }
 
 static inline u16 uwire_read_reg(int idx)
 {
-        return __raw_readw(UWIRE_BASE + (idx << uwire_idx_shift));
+        return __raw_readw(uwire_base + (idx << uwire_idx_shift));
 }
 
 static inline void omap_uwire_configure_mode(u8 cs, unsigned long flags)
@@ -492,6 +496,14 @@ static int __init uwire_probe(struct platform_device *pdev)
                 return -ENODEV;
 
         uwire = spi_master_get_devdata(master);
+
+        uwire_base = ioremap(UWIRE_BASE_PHYS, UWIRE_IO_SIZE);
+        if (!uwire_base) {
+                dev_dbg(&pdev->dev, "can't ioremap UWIRE\n");
+                spi_master_put(master);
+                return -ENOMEM;
+        }
+
         dev_set_drvdata(&pdev->dev, uwire);
 
         uwire->ck = clk_get(&pdev->dev, "armxor_ck");
@@ -520,8 +532,10 @@ static int __init uwire_probe(struct platform_device *pdev)
         uwire->bitbang.txrx_bufs = uwire_txrx;
 
         status = spi_bitbang_start(&uwire->bitbang);
-        if (status < 0)
+        if (status < 0) {
                 uwire_off(uwire);
+                iounmap(uwire_base);
+        }
         return status;
 }
 
@@ -534,6 +548,7 @@ static int __exit uwire_remove(struct platform_device *pdev)
 
         status = spi_bitbang_stop(&uwire->bitbang);
         uwire_off(uwire);
+        iounmap(uwire_base);
         return status;
 }
 
diff --git a/drivers/spi/orion_spi.c b/drivers/spi/orion_spi.c
index b872bfaf4bd2..014becb7d530 100644
--- a/drivers/spi/orion_spi.c
+++ b/drivers/spi/orion_spi.c
@@ -364,6 +364,11 @@ static int orion_spi_setup(struct spi_device *spi)
                 return -EINVAL;
         }
 
+        /* Fix ac timing if required.   */
+        if (orion_spi->spi_info->enable_clock_fix)
+                orion_spi_setbits(orion_spi, ORION_SPI_IF_CONFIG_REG,
+                                  (1 << 14));
+
         if (spi->bits_per_word == 0)
                 spi->bits_per_word = 8;
 
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index d47d3636227f..dae87b1a4c6e 100644
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -47,6 +47,10 @@ MODULE_ALIAS("platform:pxa2xx-spi");
 
 #define MAX_BUSES 3
 
+#define RX_THRESH_DFLT  8
+#define TX_THRESH_DFLT  8
+#define TIMOUT_DFLT             1000
+
 #define DMA_INT_MASK            (DCSR_ENDINTR | DCSR_STARTINTR | DCSR_BUSERR)
 #define RESET_DMA_CHANNEL       (DCSR_NODESC | DMA_INT_MASK)
 #define IS_DMA_ALIGNED(x)       ((((u32)(x)) & 0x07) == 0)
@@ -1171,6 +1175,8 @@ static int setup(struct spi_device *spi)
         struct driver_data *drv_data = spi_master_get_devdata(spi->master);
         struct ssp_device *ssp = drv_data->ssp;
         unsigned int clk_div;
+        uint tx_thres = TX_THRESH_DFLT;
+        uint rx_thres = RX_THRESH_DFLT;
 
         if (!spi->bits_per_word)
                 spi->bits_per_word = 8;
@@ -1209,8 +1215,7 @@ static int setup(struct spi_device *spi)
 
                 chip->cs_control = null_cs_control;
                 chip->enable_dma = 0;
-                chip->timeout = 1000;
-                chip->threshold = SSCR1_RxTresh(1) | SSCR1_TxTresh(1);
+                chip->timeout = TIMOUT_DFLT;
                 chip->dma_burst_size = drv_data->master_info->enable_dma ?
                                         DCMD_BURST8 : 0;
         }
@@ -1224,22 +1229,21 @@ static int setup(struct spi_device *spi)
         if (chip_info) {
                 if (chip_info->cs_control)
                         chip->cs_control = chip_info->cs_control;
-
-                chip->timeout = chip_info->timeout;
-
-                chip->threshold = (SSCR1_RxTresh(chip_info->rx_threshold) &
-                                                                SSCR1_RFT) |
-                                (SSCR1_TxTresh(chip_info->tx_threshold) &
-                                                                SSCR1_TFT);
-
-                chip->enable_dma = chip_info->dma_burst_size != 0
-                                        && drv_data->master_info->enable_dma;
+                if (chip_info->timeout)
+                        chip->timeout = chip_info->timeout;
+                if (chip_info->tx_threshold)
+                        tx_thres = chip_info->tx_threshold;
+                if (chip_info->rx_threshold)
+                        rx_thres = chip_info->rx_threshold;
+                chip->enable_dma = drv_data->master_info->enable_dma;
                 chip->dma_threshold = 0;
-
                 if (chip_info->enable_loopback)
                         chip->cr1 = SSCR1_LBM;
         }
 
+        chip->threshold = (SSCR1_RxTresh(rx_thres) & SSCR1_RFT) |
+                        (SSCR1_TxTresh(tx_thres) & SSCR1_TFT);
+
         /* set dma burst and threshold outside of chip_info path so that if
          * chip_info goes away after setting chip->enable_dma, the
          * burst and threshold can still respond to changes in bits_per_word */
@@ -1268,17 +1272,19 @@ static int setup(struct spi_device *spi)
 
         /* NOTE:  PXA25x_SSP _could_ use external clocking ... */
         if (drv_data->ssp_type != PXA25x_SSP)
-                dev_dbg(&spi->dev, "%d bits/word, %ld Hz, mode %d\n",
+                dev_dbg(&spi->dev, "%d bits/word, %ld Hz, mode %d, %s\n",
                                 spi->bits_per_word,
                                 clk_get_rate(ssp->clk)
                                         / (1 + ((chip->cr0 & SSCR0_SCR) >> 8)),
-                                spi->mode & 0x3);
+                                spi->mode & 0x3,
+                                chip->enable_dma ? "DMA" : "PIO");
         else
-                dev_dbg(&spi->dev, "%d bits/word, %ld Hz, mode %d\n",
+                dev_dbg(&spi->dev, "%d bits/word, %ld Hz, mode %d, %s\n",
                                 spi->bits_per_word,
-                                clk_get_rate(ssp->clk)
+                                clk_get_rate(ssp->clk) / 2
                                         / (1 + ((chip->cr0 & SSCR0_SCR) >> 8)),
-                                spi->mode & 0x3);
+                                spi->mode & 0x3,
+                                chip->enable_dma ? "DMA" : "PIO");
 
         if (spi->bits_per_word <= 8) {
                 chip->n_bytes = 1;
@@ -1407,9 +1413,9 @@ static int __init pxa2xx_spi_probe(struct platform_device *pdev)
         struct device *dev = &pdev->dev;
         struct pxa2xx_spi_master *platform_info;
         struct spi_master *master;
-        struct driver_data *drv_data = NULL;
+        struct driver_data *drv_data;
         struct ssp_device *ssp;
-        int status = 0;
+        int status;
 
         platform_info = dev->platform_data;
 
@@ -1422,7 +1428,7 @@ static int __init pxa2xx_spi_probe(struct platform_device *pdev)
         /* Allocate master with space for drv_data and null dma buffer */
         master = spi_alloc_master(dev, sizeof(struct driver_data) + 16);
         if (!master) {
-                dev_err(&pdev->dev, "can not alloc spi_master\n");
+                dev_err(&pdev->dev, "cannot alloc spi_master\n");
                 ssp_free(ssp);
                 return -ENOMEM;
         }
@@ -1458,7 +1464,7 @@ static int __init pxa2xx_spi_probe(struct platform_device *pdev)
 
         status = request_irq(ssp->irq, ssp_int, 0, dev->bus_id, drv_data);
         if (status < 0) {
-                dev_err(&pdev->dev, "can not get IRQ\n");
+                dev_err(&pdev->dev, "cannot get IRQ %d\n", ssp->irq);
                 goto out_error_master_alloc;
         }
 
@@ -1498,7 +1504,9 @@ static int __init pxa2xx_spi_probe(struct platform_device *pdev)
 
         /* Load default SSP configuration */
         write_SSCR0(0, drv_data->ioaddr);
-        write_SSCR1(SSCR1_RxTresh(4) | SSCR1_TxTresh(12), drv_data->ioaddr);
+        write_SSCR1(SSCR1_RxTresh(RX_THRESH_DFLT) |
+                                SSCR1_TxTresh(TX_THRESH_DFLT),
+                                drv_data->ioaddr);
         write_SSCR0(SSCR0_SerClkDiv(2)
                         | SSCR0_Motorola
                         | SSCR0_DataSize(8),
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 75e86865234c..3734dc9708e1 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -660,7 +660,7 @@ int spi_write_then_read(struct spi_device *spi,
 
         int                     status;
         struct spi_message      message;
-        struct spi_transfer     x[2];
+        struct spi_transfer     x;
         u8                      *local_buf;
 
         /* Use preallocated DMA-safe buffer.  We can't avoid copying here,
@@ -671,15 +671,9 @@ int spi_write_then_read(struct spi_device *spi,
                 return -EINVAL;
 
         spi_message_init(&message);
-        memset(x, 0, sizeof x);
-        if (n_tx) {
-                x[0].len = n_tx;
-                spi_message_add_tail(&x[0], &message);
-        }
-        if (n_rx) {
-                x[1].len = n_rx;
-                spi_message_add_tail(&x[1], &message);
-        }
+        memset(&x, 0, sizeof x);
+        x.len = n_tx + n_rx;
+        spi_message_add_tail(&x, &message);
 
         /* ... unless someone else is using the pre-allocated buffer */
         if (!mutex_trylock(&lock)) {
@@ -690,15 +684,15 @@ int spi_write_then_read(struct spi_device *spi,
                 local_buf = buf;
 
         memcpy(local_buf, txbuf, n_tx);
-        x[0].tx_buf = local_buf;
-        x[1].rx_buf = local_buf + n_tx;
+        x.tx_buf = local_buf;
+        x.rx_buf = local_buf;
 
         /* do the i/o */
         status = spi_sync(spi, &message);
         if (status == 0)
-                memcpy(rxbuf, x[1].rx_buf, n_rx);
+                memcpy(rxbuf, x.rx_buf + n_tx, n_rx);
 
-        if (x[0].tx_buf == buf)
+        if (x.tx_buf == buf)
                 mutex_unlock(&lock);
         else
                 kfree(local_buf);
@@ -744,5 +738,5 @@ err0:
  * driver registration) _could_ be dynamically linked (modular) ... costs
  * include needing to have boardinfo data structures be much more public.
  */
-subsys_initcall(spi_init);
+postcore_initcall(spi_init);
 
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c
index 3eb414b84a9d..c252cbac00f1 100644
--- a/drivers/spi/spi_s3c24xx.c
+++ b/drivers/spi/spi_s3c24xx.c
@@ -247,6 +247,9 @@ static void s3c24xx_spi_initialsetup(struct s3c24xx_spi *hw)
         writeb(0xff, hw->regs + S3C2410_SPPRE);
         writeb(SPPIN_DEFAULT, hw->regs + S3C2410_SPPIN);
         writeb(SPCON_DEFAULT, hw->regs + S3C2410_SPCON);
+
+        if (hw->pdata && hw->pdata->gpio_setup)
+                hw->pdata->gpio_setup(hw->pdata, 1);
 }
 
 static int __init s3c24xx_spi_probe(struct platform_device *pdev)
@@ -412,6 +415,9 @@ static int s3c24xx_spi_suspend(struct platform_device *pdev, pm_message_t msg)
 {
         struct s3c24xx_spi *hw = platform_get_drvdata(pdev);
 
+        if (hw->pdata && hw->pdata->gpio_setup)
+                hw->pdata->gpio_setup(hw->pdata, 0);
+
         clk_disable(hw->clk);
         return 0;
 }
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index e5e0cfed5e3b..89a43755a453 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -583,10 +583,9 @@ static int spidev_probe(struct spi_device *spi)
                 struct device *dev;
 
                 spidev->devt = MKDEV(SPIDEV_MAJOR, minor);
-                dev = device_create_drvdata(spidev_class, &spi->dev,
-                                spidev->devt, spidev,
-                                "spidev%d.%d",
-                                spi->master->bus_num, spi->chip_select);
+                dev = device_create(spidev_class, &spi->dev, spidev->devt,
+                                    spidev, "spidev%d.%d",
+                                    spi->master->bus_num, spi->chip_select);
                 status = IS_ERR(dev) ? PTR_ERR(dev) : 0;
         } else {
                 dev_dbg(&spi->dev, "no minor number available!\n");
diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c
index 24c2a46c1476..fbfadbac67e8 100644
--- a/drivers/ssb/pcmcia.c
+++ b/drivers/ssb/pcmcia.c
@@ -80,7 +80,7 @@ static int ssb_pcmcia_cfg_write(struct ssb_bus *bus, u8 offset, u8 value)
         reg.Action = CS_WRITE;
         reg.Value = value;
         res = pcmcia_access_configuration_register(bus->host_pcmcia, &reg);
-        if (unlikely(res != CS_SUCCESS))
+        if (unlikely(res != 0))
                 return -EBUSY;
 
         return 0;
@@ -96,7 +96,7 @@ static int ssb_pcmcia_cfg_read(struct ssb_bus *bus, u8 offset, u8 *value)
         reg.Offset = offset;
         reg.Action = CS_READ;
         res = pcmcia_access_configuration_register(bus->host_pcmcia, &reg);
-        if (unlikely(res != CS_SUCCESS))
+        if (unlikely(res != 0))
                 return -EBUSY;
         *value = reg.Value;
 
@@ -638,17 +638,17 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
         tuple.TupleData = buf;
         tuple.TupleDataMax = sizeof(buf);
         res = pcmcia_get_first_tuple(bus->host_pcmcia, &tuple);
-        GOTO_ERROR_ON(res != CS_SUCCESS, "MAC first tpl");
+        GOTO_ERROR_ON(res != 0, "MAC first tpl");
         res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
-        GOTO_ERROR_ON(res != CS_SUCCESS, "MAC first tpl data");
+        GOTO_ERROR_ON(res != 0, "MAC first tpl data");
         while (1) {
                 GOTO_ERROR_ON(tuple.TupleDataLen < 1, "MAC tpl < 1");
                 if (tuple.TupleData[0] == CISTPL_FUNCE_LAN_NODE_ID)
                         break;
                 res = pcmcia_get_next_tuple(bus->host_pcmcia, &tuple);
-                GOTO_ERROR_ON(res != CS_SUCCESS, "MAC next tpl");
+                GOTO_ERROR_ON(res != 0, "MAC next tpl");
                 res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
-                GOTO_ERROR_ON(res != CS_SUCCESS, "MAC next tpl data");
+                GOTO_ERROR_ON(res != 0, "MAC next tpl data");
         }
         GOTO_ERROR_ON(tuple.TupleDataLen != ETH_ALEN + 2, "MAC tpl size");
         memcpy(sprom->il0mac, &tuple.TupleData[2], ETH_ALEN);
@@ -659,9 +659,9 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
         tuple.TupleData = buf;
         tuple.TupleDataMax = sizeof(buf);
         res = pcmcia_get_first_tuple(bus->host_pcmcia, &tuple);
-        GOTO_ERROR_ON(res != CS_SUCCESS, "VEN first tpl");
+        GOTO_ERROR_ON(res != 0, "VEN first tpl");
         res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
-        GOTO_ERROR_ON(res != CS_SUCCESS, "VEN first tpl data");
+        GOTO_ERROR_ON(res != 0, "VEN first tpl data");
         while (1) {
                 GOTO_ERROR_ON(tuple.TupleDataLen < 1, "VEN tpl < 1");
                 switch (tuple.TupleData[0]) {
@@ -733,11 +733,11 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
                         break;
                 }
                 res = pcmcia_get_next_tuple(bus->host_pcmcia, &tuple);
-                if (res == CS_NO_MORE_ITEMS)
+                if (res == -ENOSPC)
                         break;
-                GOTO_ERROR_ON(res != CS_SUCCESS, "VEN next tpl");
+                GOTO_ERROR_ON(res != 0, "VEN next tpl");
                 res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
-                GOTO_ERROR_ON(res != CS_SUCCESS, "VEN next tpl data");
+                GOTO_ERROR_ON(res != 0, "VEN next tpl data");
         }
 
         return 0;
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c
index ec7aeb502d15..41b6530b8f25 100644
--- a/drivers/telephony/ixj.c
+++ b/drivers/telephony/ixj.c
@@ -42,8 +42,6 @@
  ***************************************************************************/
 
 /*
- * $Log: ixj.c,v $
- *
  * Revision 4.8  2003/07/09 19:39:00  Daniele Bellucci
  * Audit some copy_*_user and minor cleanup.
  *
diff --git a/drivers/telephony/ixj_pcmcia.c b/drivers/telephony/ixj_pcmcia.c
index ff9a29b76336..347c3ed1d9f1 100644
--- a/drivers/telephony/ixj_pcmcia.c
+++ b/drivers/telephony/ixj_pcmcia.c
@@ -124,65 +124,53 @@ static void ixj_get_serial(struct pcmcia_device * link, IXJ * j)
         return;
 }
 
+static int ixj_config_check(struct pcmcia_device *p_dev,
+                            cistpl_cftable_entry_t *cfg,
+                            cistpl_cftable_entry_t *dflt,
+                            unsigned int vcc,
+                            void *priv_data)
+{
+        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
+                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+                p_dev->io.BasePort1 = io->win[0].base;
+                p_dev->io.NumPorts1 = io->win[0].len;
+                if (io->nwin == 2) {
+                        p_dev->io.BasePort2 = io->win[1].base;
+                        p_dev->io.NumPorts2 = io->win[1].len;
+                }
+                if (!pcmcia_request_io(p_dev, &p_dev->io))
+                        return 0;
+        }
+        return -ENODEV;
+}
+
 static int ixj_config(struct pcmcia_device * link)
 {
         IXJ *j;
         ixj_info_t *info;
-        tuple_t tuple;
-        u_short buf[128];
-        cisparse_t parse;
-        cistpl_cftable_entry_t *cfg = &parse.cftable_entry;
-        cistpl_cftable_entry_t dflt =
-        {
-                0
-        };
-        int last_ret, last_fn;
+        cistpl_cftable_entry_t dflt = { 0 };
+
         info = link->priv;
         DEBUG(0, "ixj_config(0x%p)\n", link);
-        tuple.TupleData = (cisdata_t *) buf;
-        tuple.TupleOffset = 0;
-        tuple.TupleDataMax = 255;
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        tuple.Attributes = 0;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-        while (1) {
-                if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
-                                pcmcia_parse_tuple(link, &tuple, &parse) != 0)
-                        goto next_entry;
-                if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
-                        cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io;
-                        link->conf.ConfigIndex = cfg->index;
-                        link->io.BasePort1 = io->win[0].base;
-                        link->io.NumPorts1 = io->win[0].len;
-                        if (io->nwin == 2) {
-                                link->io.BasePort2 = io->win[1].base;
-                                link->io.NumPorts2 = io->win[1].len;
-                        }
-                        if (pcmcia_request_io(link, &link->io) != 0)
-                                goto next_entry;
-                        /* If we've got this far, we're done */
-                        break;
-                }
-              next_entry:
-                if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
-                        dflt = *cfg;
-                CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
-        }
 
-        CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
+        if (pcmcia_loop_config(link, ixj_config_check, &dflt))
+                goto cs_failed;
+
+        if (pcmcia_request_configuration(link, &link->conf))
+                goto cs_failed;
 
         /*
          *      Register the card with the core.
-         */     
-        j=ixj_pcmcia_probe(link->io.BasePort1,link->io.BasePort1 + 0x10);
+         */
+        j = ixj_pcmcia_probe(link->io.BasePort1, link->io.BasePort1 + 0x10);
 
         info->ndev = 1;
         info->node.major = PHONE_MAJOR;
         link->dev_node = &info->node;
         ixj_get_serial(link, j);
         return 0;
+
       cs_failed:
-        cs_error(link, last_fn, last_ret);
         ixj_cs_release(link);
         return -ENODEV;
 }
diff --git a/drivers/uio/Kconfig b/drivers/uio/Kconfig
index 4190be64917f..04b954cfce76 100644
--- a/drivers/uio/Kconfig
+++ b/drivers/uio/Kconfig
@@ -58,4 +58,17 @@ config UIO_SMX
 
           If you compile this as a module, it will be called uio_smx.
 
+config UIO_SERCOS3
+        tristate "Automata Sercos III PCI card driver"
+        default n
+        help
+          Userspace I/O interface for the Sercos III PCI card from
+          Automata GmbH. The userspace part of this driver will be
+          available for download from the Automata GmbH web site.
+
+          Automata GmbH:        http://www.automataweb.com
+          Sercos III interface: http://www.sercos.com
+
+          If you compile this as a module, it will be called uio_sercos3.
+
 endif
diff --git a/drivers/uio/Makefile b/drivers/uio/Makefile
index 8667bbdef904..e69558149859 100644
--- a/drivers/uio/Makefile
+++ b/drivers/uio/Makefile
@@ -3,3 +3,4 @@ obj-$(CONFIG_UIO_CIF)	+= uio_cif.o
 obj-$(CONFIG_UIO_PDRV)  += uio_pdrv.o
 obj-$(CONFIG_UIO_PDRV_GENIRQ)   += uio_pdrv_genirq.o
 obj-$(CONFIG_UIO_SMX)   += uio_smx.o
+obj-$(CONFIG_UIO_SERCOS3)       += uio_sercos3.o
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index 3a6934bf7131..5dccf057a7dd 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -67,6 +67,11 @@ static ssize_t map_size_show(struct uio_mem *mem, char *buf)
         return sprintf(buf, "0x%lx\n", mem->size);
 }
 
+static ssize_t map_offset_show(struct uio_mem *mem, char *buf)
+{
+        return sprintf(buf, "0x%lx\n", mem->addr & ~PAGE_MASK);
+}
+
 struct uio_sysfs_entry {
         struct attribute attr;
         ssize_t (*show)(struct uio_mem *, char *);
@@ -77,10 +82,13 @@ static struct uio_sysfs_entry addr_attribute =
         __ATTR(addr, S_IRUGO, map_addr_show, NULL);
 static struct uio_sysfs_entry size_attribute =
         __ATTR(size, S_IRUGO, map_size_show, NULL);
+static struct uio_sysfs_entry offset_attribute =
+        __ATTR(offset, S_IRUGO, map_offset_show, NULL);
 
 static struct attribute *attrs[] = {
         &addr_attribute.attr,
         &size_attribute.attr,
+        &offset_attribute.attr,
         NULL,   /* need to NULL terminate the list of attributes */
 };
 
@@ -482,15 +490,23 @@ static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         struct uio_device *idev = vma->vm_private_data;
         struct page *page;
+        unsigned long offset;
 
         int mi = uio_find_mem_index(vma);
         if (mi < 0)
                 return VM_FAULT_SIGBUS;
 
+        /*
+         * We need to subtract mi because userspace uses offset = N*PAGE_SIZE
+         * to use mem[N].
+         */
+        offset = (vmf->pgoff - mi) << PAGE_SHIFT;
+
         if (idev->info->mem[mi].memtype == UIO_MEM_LOGICAL)
-                page = virt_to_page(idev->info->mem[mi].addr);
+                page = virt_to_page(idev->info->mem[mi].addr + offset);
         else
-                page = vmalloc_to_page((void*)idev->info->mem[mi].addr);
+                page = vmalloc_to_page((void *)idev->info->mem[mi].addr
+                                                        + offset);
         get_page(page);
         vmf->page = page;
         return 0;
@@ -682,9 +698,9 @@ int __uio_register_device(struct module *owner,
         if (ret)
                 goto err_get_minor;
 
-        idev->dev = device_create_drvdata(uio_class->class, parent,
-                                          MKDEV(uio_major, idev->minor), idev,
-                                          "uio%d", idev->minor);
+        idev->dev = device_create(uio_class->class, parent,
+                                  MKDEV(uio_major, idev->minor), idev,
+                                  "uio%d", idev->minor);
         if (IS_ERR(idev->dev)) {
                 printk(KERN_ERR "UIO: device register failed\n");
                 ret = PTR_ERR(idev->dev);
diff --git a/drivers/uio/uio_pdrv.c b/drivers/uio/uio_pdrv.c
index 0b4ef39cd85d..d494ce9288c3 100644
--- a/drivers/uio/uio_pdrv.c
+++ b/drivers/uio/uio_pdrv.c
@@ -12,7 +12,7 @@
 #include <linux/uio_driver.h>
 #include <linux/stringify.h>
 
-#define DRIVER_NAME "uio"
+#define DRIVER_NAME "uio_pdrv"
 
 struct uio_platdata {
         struct uio_info *uioinfo;
diff --git a/drivers/uio/uio_sercos3.c b/drivers/uio/uio_sercos3.c
new file mode 100644
index 000000000000..a6d1b2bc47f3
--- /dev/null
+++ b/drivers/uio/uio_sercos3.c
@@ -0,0 +1,243 @@
+/* sercos3: UIO driver for the Automata Sercos III PCI card
+
+   Copyright (C) 2008 Linutronix GmbH
+     Author: John Ogness <john.ogness@linutronix.de>
+
+   This is a straight-forward UIO driver, where interrupts are disabled
+   by the interrupt handler and re-enabled via a write to the UIO device
+   by the userspace-part.
+
+   The only part that may seem odd is the use of a logical OR when
+   storing and restoring enabled interrupts. This is done because the
+   userspace-part could directly modify the Interrupt Enable Register
+   at any time. To reduce possible conflicts, the kernel driver uses
+   a logical OR to make more controlled changes (rather than blindly
+   overwriting previous values).
+
+   Race conditions exist if the userspace-part directly modifies the
+   Interrupt Enable Register while in operation. The consequences are
+   that certain interrupts would fail to be enabled or disabled. For
+   this reason, the userspace-part should only directly modify the
+   Interrupt Enable Register at the beginning (to get things going).
+   The userspace-part can safely disable interrupts at any time using
+   a write to the UIO device.
+*/
+
+#include <linux/device.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/uio_driver.h>
+#include <linux/io.h>
+
+/* ID's for SERCOS III PCI card (PLX 9030) */
+#define SERCOS_SUB_VENDOR_ID  0x1971
+#define SERCOS_SUB_SYSID_3530 0x3530
+#define SERCOS_SUB_SYSID_3535 0x3535
+#define SERCOS_SUB_SYSID_3780 0x3780
+
+/* Interrupt Enable Register */
+#define IER0_OFFSET 0x08
+
+/* Interrupt Status Register */
+#define ISR0_OFFSET 0x18
+
+struct sercos3_priv {
+        u32 ier0_cache;
+        spinlock_t ier0_cache_lock;
+};
+
+/* this function assumes ier0_cache_lock is locked! */
+static void sercos3_disable_interrupts(struct uio_info *info,
+                                       struct sercos3_priv *priv)
+{
+        void __iomem *ier0 = info->mem[3].internal_addr + IER0_OFFSET;
+
+        /* add enabled interrupts to cache */
+        priv->ier0_cache |= ioread32(ier0);
+
+        /* disable interrupts */
+        iowrite32(0, ier0);
+}
+
+/* this function assumes ier0_cache_lock is locked! */
+static void sercos3_enable_interrupts(struct uio_info *info,
+                                      struct sercos3_priv *priv)
+{
+        void __iomem *ier0 = info->mem[3].internal_addr + IER0_OFFSET;
+
+        /* restore previously enabled interrupts */
+        iowrite32(ioread32(ier0) | priv->ier0_cache, ier0);
+        priv->ier0_cache = 0;
+}
+
+static irqreturn_t sercos3_handler(int irq, struct uio_info *info)
+{
+        struct sercos3_priv *priv = info->priv;
+        void __iomem *isr0 = info->mem[3].internal_addr + ISR0_OFFSET;
+        void __iomem *ier0 = info->mem[3].internal_addr + IER0_OFFSET;
+
+        if (!(ioread32(isr0) & ioread32(ier0)))
+                return IRQ_NONE;
+
+        spin_lock(&priv->ier0_cache_lock);
+        sercos3_disable_interrupts(info, priv);
+        spin_unlock(&priv->ier0_cache_lock);
+
+        return IRQ_HANDLED;
+}
+
+static int sercos3_irqcontrol(struct uio_info *info, s32 irq_on)
+{
+        struct sercos3_priv *priv = info->priv;
+
+        spin_lock_irq(&priv->ier0_cache_lock);
+        if (irq_on)
+                sercos3_enable_interrupts(info, priv);
+        else
+                sercos3_disable_interrupts(info, priv);
+        spin_unlock_irq(&priv->ier0_cache_lock);
+
+        return 0;
+}
+
+static int sercos3_setup_iomem(struct pci_dev *dev, struct uio_info *info,
+                               int n, int pci_bar)
+{
+        info->mem[n].addr = pci_resource_start(dev, pci_bar);
+        if (!info->mem[n].addr)
+                return -1;
+        info->mem[n].internal_addr = ioremap(pci_resource_start(dev, pci_bar),
+                                             pci_resource_len(dev, pci_bar));
+        if (!info->mem[n].internal_addr)
+                return -1;
+        info->mem[n].size = pci_resource_len(dev, pci_bar);
+        info->mem[n].memtype = UIO_MEM_PHYS;
+        return 0;
+}
+
+static int __devinit sercos3_pci_probe(struct pci_dev *dev,
+                                       const struct pci_device_id *id)
+{
+        struct uio_info *info;
+        struct sercos3_priv *priv;
+        int i;
+
+        info = kzalloc(sizeof(struct uio_info), GFP_KERNEL);
+        if (!info)
+                return -ENOMEM;
+
+        priv = kzalloc(sizeof(struct sercos3_priv), GFP_KERNEL);
+        if (!priv)
+                goto out_free;
+
+        if (pci_enable_device(dev))
+                goto out_free_priv;
+
+        if (pci_request_regions(dev, "sercos3"))
+                goto out_disable;
+
+        /* we only need PCI BAR's 0, 2, 3, 4, 5 */
+        if (sercos3_setup_iomem(dev, info, 0, 0))
+                goto out_unmap;
+        if (sercos3_setup_iomem(dev, info, 1, 2))
+                goto out_unmap;
+        if (sercos3_setup_iomem(dev, info, 2, 3))
+                goto out_unmap;
+        if (sercos3_setup_iomem(dev, info, 3, 4))
+                goto out_unmap;
+        if (sercos3_setup_iomem(dev, info, 4, 5))
+                goto out_unmap;
+
+        spin_lock_init(&priv->ier0_cache_lock);
+        info->priv = priv;
+        info->name = "Sercos_III_PCI";
+        info->version = "0.0.1";
+        info->irq = dev->irq;
+        info->irq_flags = IRQF_DISABLED | IRQF_SHARED;
+        info->handler = sercos3_handler;
+        info->irqcontrol = sercos3_irqcontrol;
+
+        pci_set_drvdata(dev, info);
+
+        if (uio_register_device(&dev->dev, info))
+                goto out_unmap;
+
+        return 0;
+
+out_unmap:
+        for (i = 0; i < 5; i++) {
+                if (info->mem[i].internal_addr)
+                        iounmap(info->mem[i].internal_addr);
+        }
+        pci_release_regions(dev);
+out_disable:
+        pci_disable_device(dev);
+out_free_priv:
+        kfree(priv);
+out_free:
+        kfree(info);
+        return -ENODEV;
+}
+
+static void sercos3_pci_remove(struct pci_dev *dev)
+{
+        struct uio_info *info = pci_get_drvdata(dev);
+        int i;
+
+        uio_unregister_device(info);
+        pci_release_regions(dev);
+        pci_disable_device(dev);
+        pci_set_drvdata(dev, NULL);
+        for (i = 0; i < 5; i++) {
+                if (info->mem[i].internal_addr)
+                        iounmap(info->mem[i].internal_addr);
+        }
+        kfree(info->priv);
+        kfree(info);
+}
+
+static struct pci_device_id sercos3_pci_ids[] __devinitdata = {
+        {
+                .vendor =       PCI_VENDOR_ID_PLX,
+                .device =       PCI_DEVICE_ID_PLX_9030,
+                .subvendor =    SERCOS_SUB_VENDOR_ID,
+                .subdevice =    SERCOS_SUB_SYSID_3530,
+        },
+        {
+                .vendor =       PCI_VENDOR_ID_PLX,
+                .device =       PCI_DEVICE_ID_PLX_9030,
+                .subvendor =    SERCOS_SUB_VENDOR_ID,
+                .subdevice =    SERCOS_SUB_SYSID_3535,
+        },
+        {
+                .vendor =       PCI_VENDOR_ID_PLX,
+                .device =       PCI_DEVICE_ID_PLX_9030,
+                .subvendor =    SERCOS_SUB_VENDOR_ID,
+                .subdevice =    SERCOS_SUB_SYSID_3780,
+        },
+        { 0, }
+};
+
+static struct pci_driver sercos3_pci_driver = {
+        .name = "sercos3",
+        .id_table = sercos3_pci_ids,
+        .probe = sercos3_pci_probe,
+        .remove = sercos3_pci_remove,
+};
+
+static int __init sercos3_init_module(void)
+{
+        return pci_register_driver(&sercos3_pci_driver);
+}
+
+static void __exit sercos3_exit_module(void)
+{
+        pci_unregister_driver(&sercos3_pci_driver);
+}
+
+module_init(sercos3_init_module);
+module_exit(sercos3_exit_module);
+
+MODULE_DESCRIPTION("UIO driver for the Automata Sercos III PCI card");
+MODULE_AUTHOR("John Ogness <john.ogness@linutronix.de>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 20290c5b1562..7a4fa791dc19 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -1729,9 +1729,9 @@ static int usb_classdev_add(struct usb_device *dev)
 {
         struct device *cldev;
 
-        cldev = device_create_drvdata(usb_classdev_class, &dev->dev,
-                                      dev->dev.devt, NULL, "usbdev%d.%d",
-                                      dev->bus->busnum, dev->devnum);
+        cldev = device_create(usb_classdev_class, &dev->dev, dev->dev.devt,
+                              NULL, "usbdev%d.%d", dev->bus->busnum,
+                              dev->devnum);
         if (IS_ERR(cldev))
                 return PTR_ERR(cldev);
         dev->usb_classdev = cldev;
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c
index 6b1b229e38cd..55f7f310924b 100644
--- a/drivers/usb/core/file.c
+++ b/drivers/usb/core/file.c
@@ -196,9 +196,9 @@ int usb_register_dev(struct usb_interface *intf,
                 ++temp;
         else
                 temp = name;
-        intf->usb_dev = device_create_drvdata(usb_class->class, &intf->dev,
-                                              MKDEV(USB_MAJOR, minor), NULL,
-                                              "%s", temp);
+        intf->usb_dev = device_create(usb_class->class, &intf->dev,
+                                      MKDEV(USB_MAJOR, minor), NULL,
+                                      "%s", temp);
         if (IS_ERR(intf->usb_dev)) {
                 down_write(&minor_rwsem);
                 usb_minors[intf->minor] = NULL;
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 8ab389dca2b9..c8035a8216bd 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -818,9 +818,8 @@ static int usb_register_bus(struct usb_bus *bus)
         set_bit (busnum, busmap.busmap);
         bus->busnum = busnum;
 
-        bus->dev = device_create_drvdata(usb_host_class, bus->controller,
-                                         MKDEV(0, 0), bus,
-                                         "usb_host%d", busnum);
+        bus->dev = device_create(usb_host_class, bus->controller, MKDEV(0, 0),
+                                 bus, "usb_host%d", busnum);
         result = PTR_ERR(bus->dev);
         if (IS_ERR(bus->dev))
                 goto error_create_class_dev;
diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c
index db410e92c80d..77fa7a080801 100644
--- a/drivers/usb/core/inode.c
+++ b/drivers/usb/core/inode.c
@@ -97,7 +97,7 @@ enum {
         Opt_err,
 };
 
-static match_table_t tokens = {
+static const match_table_t tokens = {
         {Opt_devuid, "devuid=%u"},
         {Opt_devgid, "devgid=%u"},
         {Opt_devmode, "devmode=%o"},
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index fcb5cb9094d9..2267fa0b51b2 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -22,24 +22,15 @@ obj-$(CONFIG_USB_M66592)	+= m66592-udc.o
 #
 # USB gadget drivers
 #
-C_UTILS =       composite.o usbstring.o config.o epautoconf.o
-
-g_zero-objs                     := zero.o f_sourcesink.o f_loopback.o $(C_UTILS)
-g_ether-objs                    := ether.o u_ether.o f_subset.o f_ecm.o $(C_UTILS)
-g_serial-objs                   := serial.o u_serial.o f_acm.o f_serial.o $(C_UTILS)
-g_midi-objs                     := gmidi.o usbstring.o config.o epautoconf.o
+g_zero-objs                     := zero.o
+g_ether-objs                    := ether.o
+g_serial-objs                   := serial.o
+g_midi-objs                     := gmidi.o
 gadgetfs-objs                   := inode.o
-g_file_storage-objs             := file_storage.o usbstring.o config.o \
-                                        epautoconf.o
-g_printer-objs                  := printer.o usbstring.o config.o \
-                                        epautoconf.o
-g_cdc-objs                      := cdc2.o u_ether.o f_ecm.o \
-                                        u_serial.o f_acm.o $(C_UTILS)
+g_file_storage-objs             := file_storage.o
+g_printer-objs                  := printer.o
+g_cdc-objs                      := cdc2.o
 
-ifeq ($(CONFIG_USB_ETH_RNDIS),y)
-        g_ether-objs            += f_rndis.o rndis.o
-endif
- 
 obj-$(CONFIG_USB_ZERO)          += g_zero.o
 obj-$(CONFIG_USB_ETH)           += g_ether.o
 obj-$(CONFIG_USB_GADGETFS)      += gadgetfs.o
diff --git a/drivers/usb/gadget/cdc2.c b/drivers/usb/gadget/cdc2.c
index a39a4b940c33..a724fc149850 100644
--- a/drivers/usb/gadget/cdc2.c
+++ b/drivers/usb/gadget/cdc2.c
@@ -43,6 +43,25 @@
 
 /*-------------------------------------------------------------------------*/
 
+/*
+ * Kbuild is not very cooperative with respect to linking separately
+ * compiled library objects into one module.  So for now we won't use
+ * separate compilation ... ensuring init/exit sections work to shrink
+ * the runtime footprint, and giving us at least some parts of what
+ * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
+ */
+
+#include "composite.c"
+#include "usbstring.c"
+#include "config.c"
+#include "epautoconf.c"
+#include "u_serial.c"
+#include "f_acm.c"
+#include "f_ecm.c"
+#include "u_ether.c"
+
+/*-------------------------------------------------------------------------*/
+
 static struct usb_device_descriptor device_desc = {
         .bLength =              sizeof device_desc,
         .bDescriptorType =      USB_DT_DEVICE,
@@ -148,7 +167,8 @@ static int __init cdc_bind(struct usb_composite_dev *cdev)
         int                     status;
 
         if (!can_support_ecm(cdev->gadget)) {
-                ERROR(cdev, "controller '%s' not usable\n", gadget->name);
+                dev_err(&gadget->dev, "controller '%s' not usable\n",
+                                gadget->name);
                 return -EINVAL;
         }
 
@@ -203,7 +223,8 @@ static int __init cdc_bind(struct usb_composite_dev *cdev)
         if (status < 0)
                 goto fail1;
 
-        INFO(cdev, "%s, version: " DRIVER_VERSION "\n", DRIVER_DESC);
+        dev_info(&gadget->dev, "%s, version: " DRIVER_VERSION "\n",
+                        DRIVER_DESC);
 
         return 0;
 
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index bcac2e68660d..944c8e889ab4 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -96,6 +96,28 @@ static inline bool has_rndis(void)
 
 /*-------------------------------------------------------------------------*/
 
+/*
+ * Kbuild is not very cooperative with respect to linking separately
+ * compiled library objects into one module.  So for now we won't use
+ * separate compilation ... ensuring init/exit sections work to shrink
+ * the runtime footprint, and giving us at least some parts of what
+ * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
+ */
+#include "composite.c"
+#include "usbstring.c"
+#include "config.c"
+#include "epautoconf.c"
+
+#include "f_ecm.c"
+#include "f_subset.c"
+#ifdef  CONFIG_USB_ETH_RNDIS
+#include "f_rndis.c"
+#include "rndis.c"
+#endif
+#include "u_ether.c"
+
+/*-------------------------------------------------------------------------*/
+
 /* DO NOT REUSE THESE IDs with a protocol-incompatible driver!!  Ever!!
  * Instead:  allocate your own, using normal USB-IF procedures.
  */
@@ -293,7 +315,8 @@ static int __init eth_bind(struct usb_composite_dev *cdev)
                  * but if the controller isn't recognized at all then
                  * that assumption is a bit more likely to be wrong.
                  */
-                WARNING(cdev, "controller '%s' not recognized; trying %s\n",
+                dev_warn(&gadget->dev,
+                                "controller '%s' not recognized; trying %s\n",
                                 gadget->name,
                                 eth_config_driver.label);
                 device_desc.bcdDevice =
@@ -332,7 +355,8 @@ static int __init eth_bind(struct usb_composite_dev *cdev)
         if (status < 0)
                 goto fail;
 
-        INFO(cdev, "%s, version: " DRIVER_VERSION "\n", DRIVER_DESC);
+        dev_info(&gadget->dev, "%s, version: " DRIVER_VERSION "\n",
+                        DRIVER_DESC);
 
         return 0;
 
diff --git a/drivers/usb/gadget/f_ecm.c b/drivers/usb/gadget/f_ecm.c
index a2b5c092bda0..4ae579948e54 100644
--- a/drivers/usb/gadget/f_ecm.c
+++ b/drivers/usb/gadget/f_ecm.c
@@ -83,7 +83,7 @@ static inline struct f_ecm *func_to_ecm(struct usb_function *f)
 }
 
 /* peak (theoretical) bulk transfer rate in bits-per-second */
-static inline unsigned bitrate(struct usb_gadget *g)
+static inline unsigned ecm_bitrate(struct usb_gadget *g)
 {
         if (gadget_is_dualspeed(g) && g->speed == USB_SPEED_HIGH)
                 return 13 * 512 * 8 * 1000 * 8;
@@ -107,7 +107,7 @@ static inline unsigned bitrate(struct usb_gadget *g)
  */
 
 #define LOG2_STATUS_INTERVAL_MSEC       5       /* 1 << 5 == 32 msec */
-#define STATUS_BYTECOUNT                16      /* 8 byte header + data */
+#define ECM_STATUS_BYTECOUNT            16      /* 8 byte header + data */
 
 
 /* interface descriptor: */
@@ -125,8 +125,8 @@ static struct usb_interface_descriptor ecm_control_intf __initdata = {
         /* .iInterface = DYNAMIC */
 };
 
-static struct usb_cdc_header_desc header_desc __initdata = {
-        .bLength =              sizeof header_desc,
+static struct usb_cdc_header_desc ecm_header_desc __initdata = {
+        .bLength =              sizeof ecm_header_desc,
         .bDescriptorType =      USB_DT_CS_INTERFACE,
         .bDescriptorSubType =   USB_CDC_HEADER_TYPE,
 
@@ -141,8 +141,8 @@ static struct usb_cdc_union_desc ecm_union_desc __initdata = {
         /* .bSlaveInterface0 =  DYNAMIC */
 };
 
-static struct usb_cdc_ether_desc ether_desc __initdata = {
-        .bLength =              sizeof ether_desc,
+static struct usb_cdc_ether_desc ecm_desc __initdata = {
+        .bLength =              sizeof ecm_desc,
         .bDescriptorType =      USB_DT_CS_INTERFACE,
         .bDescriptorSubType =   USB_CDC_ETHERNET_TYPE,
 
@@ -186,17 +186,17 @@ static struct usb_interface_descriptor ecm_data_intf __initdata = {
 
 /* full speed support: */
 
-static struct usb_endpoint_descriptor fs_notify_desc __initdata = {
+static struct usb_endpoint_descriptor fs_ecm_notify_desc __initdata = {
         .bLength =              USB_DT_ENDPOINT_SIZE,
         .bDescriptorType =      USB_DT_ENDPOINT,
 
         .bEndpointAddress =     USB_DIR_IN,
         .bmAttributes =         USB_ENDPOINT_XFER_INT,
-        .wMaxPacketSize =       __constant_cpu_to_le16(STATUS_BYTECOUNT),
+        .wMaxPacketSize =       __constant_cpu_to_le16(ECM_STATUS_BYTECOUNT),
         .bInterval =            1 << LOG2_STATUS_INTERVAL_MSEC,
 };
 
-static struct usb_endpoint_descriptor fs_in_desc __initdata = {
+static struct usb_endpoint_descriptor fs_ecm_in_desc __initdata = {
         .bLength =              USB_DT_ENDPOINT_SIZE,
         .bDescriptorType =      USB_DT_ENDPOINT,
 
@@ -204,7 +204,7 @@ static struct usb_endpoint_descriptor fs_in_desc __initdata = {
         .bmAttributes =         USB_ENDPOINT_XFER_BULK,
 };
 
-static struct usb_endpoint_descriptor fs_out_desc __initdata = {
+static struct usb_endpoint_descriptor fs_ecm_out_desc __initdata = {
         .bLength =              USB_DT_ENDPOINT_SIZE,
         .bDescriptorType =      USB_DT_ENDPOINT,
 
@@ -212,34 +212,34 @@ static struct usb_endpoint_descriptor fs_out_desc __initdata = {
         .bmAttributes =         USB_ENDPOINT_XFER_BULK,
 };
 
-static struct usb_descriptor_header *eth_fs_function[] __initdata = {
+static struct usb_descriptor_header *ecm_fs_function[] __initdata = {
         /* CDC ECM control descriptors */
         (struct usb_descriptor_header *) &ecm_control_intf,
-        (struct usb_descriptor_header *) &header_desc,
+        (struct usb_descriptor_header *) &ecm_header_desc,
         (struct usb_descriptor_header *) &ecm_union_desc,
-        (struct usb_descriptor_header *) &ether_desc,
+        (struct usb_descriptor_header *) &ecm_desc,
         /* NOTE: status endpoint might need to be removed */
-        (struct usb_descriptor_header *) &fs_notify_desc,
+        (struct usb_descriptor_header *) &fs_ecm_notify_desc,
         /* data interface, altsettings 0 and 1 */
         (struct usb_descriptor_header *) &ecm_data_nop_intf,
         (struct usb_descriptor_header *) &ecm_data_intf,
-        (struct usb_descriptor_header *) &fs_in_desc,
-        (struct usb_descriptor_header *) &fs_out_desc,
+        (struct usb_descriptor_header *) &fs_ecm_in_desc,
+        (struct usb_descriptor_header *) &fs_ecm_out_desc,
         NULL,
 };
 
 /* high speed support: */
 
-static struct usb_endpoint_descriptor hs_notify_desc __initdata = {
+static struct usb_endpoint_descriptor hs_ecm_notify_desc __initdata = {
         .bLength =              USB_DT_ENDPOINT_SIZE,
         .bDescriptorType =      USB_DT_ENDPOINT,
 
         .bEndpointAddress =     USB_DIR_IN,
         .bmAttributes =         USB_ENDPOINT_XFER_INT,
-        .wMaxPacketSize =       __constant_cpu_to_le16(STATUS_BYTECOUNT),
+        .wMaxPacketSize =       __constant_cpu_to_le16(ECM_STATUS_BYTECOUNT),
         .bInterval =            LOG2_STATUS_INTERVAL_MSEC + 4,
 };
-static struct usb_endpoint_descriptor hs_in_desc __initdata = {
+static struct usb_endpoint_descriptor hs_ecm_in_desc __initdata = {
         .bLength =              USB_DT_ENDPOINT_SIZE,
         .bDescriptorType =      USB_DT_ENDPOINT,
 
@@ -248,7 +248,7 @@ static struct usb_endpoint_descriptor hs_in_desc __initdata = {
         .wMaxPacketSize =       __constant_cpu_to_le16(512),
 };
 
-static struct usb_endpoint_descriptor hs_out_desc __initdata = {
+static struct usb_endpoint_descriptor hs_ecm_out_desc __initdata = {
         .bLength =              USB_DT_ENDPOINT_SIZE,
         .bDescriptorType =      USB_DT_ENDPOINT,
 
@@ -257,19 +257,19 @@ static struct usb_endpoint_descriptor hs_out_desc __initdata = {
         .wMaxPacketSize =       __constant_cpu_to_le16(512),
 };
 
-static struct usb_descriptor_header *eth_hs_function[] __initdata = {
+static struct usb_descriptor_header *ecm_hs_function[] __initdata = {
         /* CDC ECM control descriptors */
         (struct usb_descriptor_header *) &ecm_control_intf,
-        (struct usb_descriptor_header *) &header_desc,
+        (struct usb_descriptor_header *) &ecm_header_desc,
         (struct usb_descriptor_header *) &ecm_union_desc,
-        (struct usb_descriptor_header *) &ether_desc,
+        (struct usb_descriptor_header *) &ecm_desc,
         /* NOTE: status endpoint might need to be removed */
-        (struct usb_descriptor_header *) &hs_notify_desc,
+        (struct usb_descriptor_header *) &hs_ecm_notify_desc,
         /* data interface, altsettings 0 and 1 */
         (struct usb_descriptor_header *) &ecm_data_nop_intf,
         (struct usb_descriptor_header *) &ecm_data_intf,
-        (struct usb_descriptor_header *) &hs_in_desc,
-        (struct usb_descriptor_header *) &hs_out_desc,
+        (struct usb_descriptor_header *) &hs_ecm_in_desc,
+        (struct usb_descriptor_header *) &hs_ecm_out_desc,
         NULL,
 };
 
@@ -329,14 +329,14 @@ static void ecm_do_notify(struct f_ecm *ecm)
                 event->bNotificationType = USB_CDC_NOTIFY_SPEED_CHANGE;
                 event->wValue = cpu_to_le16(0);
                 event->wLength = cpu_to_le16(8);
-                req->length = STATUS_BYTECOUNT;
+                req->length = ECM_STATUS_BYTECOUNT;
 
                 /* SPEED_CHANGE data is up/down speeds in bits/sec */
                 data = req->buf + sizeof *event;
-                data[0] = cpu_to_le32(bitrate(cdev->gadget));
+                data[0] = cpu_to_le32(ecm_bitrate(cdev->gadget));
                 data[1] = data[0];
 
-                DBG(cdev, "notify speed %d\n", bitrate(cdev->gadget));
+                DBG(cdev, "notify speed %d\n", ecm_bitrate(cdev->gadget));
                 ecm->notify_state = ECM_NOTIFY_NONE;
                 break;
         }
@@ -628,13 +628,13 @@ ecm_bind(struct usb_configuration *c, struct usb_function *f)
         status = -ENODEV;
 
         /* allocate instance-specific endpoints */
-        ep = usb_ep_autoconfig(cdev->gadget, &fs_in_desc);
+        ep = usb_ep_autoconfig(cdev->gadget, &fs_ecm_in_desc);
         if (!ep)
                 goto fail;
         ecm->port.in_ep = ep;
         ep->driver_data = cdev; /* claim */
 
-        ep = usb_ep_autoconfig(cdev->gadget, &fs_out_desc);
+        ep = usb_ep_autoconfig(cdev->gadget, &fs_ecm_out_desc);
         if (!ep)
                 goto fail;
         ecm->port.out_ep = ep;
@@ -644,7 +644,7 @@ ecm_bind(struct usb_configuration *c, struct usb_function *f)
          * don't treat it that way.  It's simpler, and some newer CDC
          * profiles (wireless handsets) no longer treat it as optional.
          */
-        ep = usb_ep_autoconfig(cdev->gadget, &fs_notify_desc);
+        ep = usb_ep_autoconfig(cdev->gadget, &fs_ecm_notify_desc);
         if (!ep)
                 goto fail;
         ecm->notify = ep;
@@ -656,47 +656,47 @@ ecm_bind(struct usb_configuration *c, struct usb_function *f)
         ecm->notify_req = usb_ep_alloc_request(ep, GFP_KERNEL);
         if (!ecm->notify_req)
                 goto fail;
-        ecm->notify_req->buf = kmalloc(STATUS_BYTECOUNT, GFP_KERNEL);
+        ecm->notify_req->buf = kmalloc(ECM_STATUS_BYTECOUNT, GFP_KERNEL);
         if (!ecm->notify_req->buf)
                 goto fail;
         ecm->notify_req->context = ecm;
         ecm->notify_req->complete = ecm_notify_complete;
 
         /* copy descriptors, and track endpoint copies */
-        f->descriptors = usb_copy_descriptors(eth_fs_function);
+        f->descriptors = usb_copy_descriptors(ecm_fs_function);
         if (!f->descriptors)
                 goto fail;
 
-        ecm->fs.in = usb_find_endpoint(eth_fs_function,
-                        f->descriptors, &fs_in_desc);
-        ecm->fs.out = usb_find_endpoint(eth_fs_function,
-                        f->descriptors, &fs_out_desc);
-        ecm->fs.notify = usb_find_endpoint(eth_fs_function,
-                        f->descriptors, &fs_notify_desc);
+        ecm->fs.in = usb_find_endpoint(ecm_fs_function,
+                        f->descriptors, &fs_ecm_in_desc);
+        ecm->fs.out = usb_find_endpoint(ecm_fs_function,
+                        f->descriptors, &fs_ecm_out_desc);
+        ecm->fs.notify = usb_find_endpoint(ecm_fs_function,
+                        f->descriptors, &fs_ecm_notify_desc);
 
         /* support all relevant hardware speeds... we expect that when
          * hardware is dual speed, all bulk-capable endpoints work at
          * both speeds
          */
         if (gadget_is_dualspeed(c->cdev->gadget)) {
-                hs_in_desc.bEndpointAddress =
-                                fs_in_desc.bEndpointAddress;
-                hs_out_desc.bEndpointAddress =
-                                fs_out_desc.bEndpointAddress;
-                hs_notify_desc.bEndpointAddress =
-                                fs_notify_desc.bEndpointAddress;
+                hs_ecm_in_desc.bEndpointAddress =
+                                fs_ecm_in_desc.bEndpointAddress;
+                hs_ecm_out_desc.bEndpointAddress =
+                                fs_ecm_out_desc.bEndpointAddress;
+                hs_ecm_notify_desc.bEndpointAddress =
+                                fs_ecm_notify_desc.bEndpointAddress;
 
                 /* copy descriptors, and track endpoint copies */
-                f->hs_descriptors = usb_copy_descriptors(eth_hs_function);
+                f->hs_descriptors = usb_copy_descriptors(ecm_hs_function);
                 if (!f->hs_descriptors)
                         goto fail;
 
-                ecm->hs.in = usb_find_endpoint(eth_hs_function,
-                                f->hs_descriptors, &hs_in_desc);
-                ecm->hs.out = usb_find_endpoint(eth_hs_function,
-                                f->hs_descriptors, &hs_out_desc);
-                ecm->hs.notify = usb_find_endpoint(eth_hs_function,
-                                f->hs_descriptors, &hs_notify_desc);
+                ecm->hs.in = usb_find_endpoint(ecm_hs_function,
+                                f->hs_descriptors, &hs_ecm_in_desc);
+                ecm->hs.out = usb_find_endpoint(ecm_hs_function,
+                                f->hs_descriptors, &hs_ecm_out_desc);
+                ecm->hs.notify = usb_find_endpoint(ecm_hs_function,
+                                f->hs_descriptors, &hs_ecm_notify_desc);
         }
 
         /* NOTE:  all that is done without knowing or caring about
@@ -795,7 +795,7 @@ int __init ecm_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN])
                 if (status < 0)
                         return status;
                 ecm_string_defs[1].id = status;
-                ether_desc.iMACAddress = status;
+                ecm_desc.iMACAddress = status;
         }
 
         /* allocate and initialize one new instance */
diff --git a/drivers/usb/gadget/f_loopback.c b/drivers/usb/gadget/f_loopback.c
index eda4cde72c82..87dde012dacc 100644
--- a/drivers/usb/gadget/f_loopback.c
+++ b/drivers/usb/gadget/f_loopback.c
@@ -70,7 +70,7 @@ static struct usb_interface_descriptor loopback_intf = {
 
 /* full speed support: */
 
-static struct usb_endpoint_descriptor fs_source_desc = {
+static struct usb_endpoint_descriptor fs_loop_source_desc = {
         .bLength =              USB_DT_ENDPOINT_SIZE,
         .bDescriptorType =      USB_DT_ENDPOINT,
 
@@ -78,7 +78,7 @@ static struct usb_endpoint_descriptor fs_source_desc = {
         .bmAttributes =         USB_ENDPOINT_XFER_BULK,
 };
 
-static struct usb_endpoint_descriptor fs_sink_desc = {
+static struct usb_endpoint_descriptor fs_loop_sink_desc = {
         .bLength =              USB_DT_ENDPOINT_SIZE,
         .bDescriptorType =      USB_DT_ENDPOINT,
 
@@ -88,14 +88,14 @@ static struct usb_endpoint_descriptor fs_sink_desc = {
 
 static struct usb_descriptor_header *fs_loopback_descs[] = {
         (struct usb_descriptor_header *) &loopback_intf,
-        (struct usb_descriptor_header *) &fs_sink_desc,
-        (struct usb_descriptor_header *) &fs_source_desc,
+        (struct usb_descriptor_header *) &fs_loop_sink_desc,
+        (struct usb_descriptor_header *) &fs_loop_source_desc,
         NULL,
 };
 
 /* high speed support: */
 
-static struct usb_endpoint_descriptor hs_source_desc = {
+static struct usb_endpoint_descriptor hs_loop_source_desc = {
         .bLength =              USB_DT_ENDPOINT_SIZE,
         .bDescriptorType =      USB_DT_ENDPOINT,
 
@@ -103,7 +103,7 @@ static struct usb_endpoint_descriptor hs_source_desc = {
         .wMaxPacketSize =       __constant_cpu_to_le16(512),
 };
 
-static struct usb_endpoint_descriptor hs_sink_desc = {
+static struct usb_endpoint_descriptor hs_loop_sink_desc = {
         .bLength =              USB_DT_ENDPOINT_SIZE,
         .bDescriptorType =      USB_DT_ENDPOINT,
 
@@ -113,8 +113,8 @@ static struct usb_endpoint_descriptor hs_sink_desc = {
 
 static struct usb_descriptor_header *hs_loopback_descs[] = {
         (struct usb_descriptor_header *) &loopback_intf,
-        (struct usb_descriptor_header *) &hs_source_desc,
-        (struct usb_descriptor_header *) &hs_sink_desc,
+        (struct usb_descriptor_header *) &hs_loop_source_desc,
+        (struct usb_descriptor_header *) &hs_loop_sink_desc,
         NULL,
 };
 
@@ -152,7 +152,7 @@ loopback_bind(struct usb_configuration *c, struct usb_function *f)
 
         /* allocate endpoints */
 
-        loop->in_ep = usb_ep_autoconfig(cdev->gadget, &fs_source_desc);
+        loop->in_ep = usb_ep_autoconfig(cdev->gadget, &fs_loop_source_desc);
         if (!loop->in_ep) {
 autoconf_fail:
                 ERROR(cdev, "%s: can't autoconfigure on %s\n",
@@ -161,17 +161,17 @@ autoconf_fail:
         }
         loop->in_ep->driver_data = cdev;        /* claim */
 
-        loop->out_ep = usb_ep_autoconfig(cdev->gadget, &fs_sink_desc);
+        loop->out_ep = usb_ep_autoconfig(cdev->gadget, &fs_loop_sink_desc);
         if (!loop->out_ep)
                 goto autoconf_fail;
         loop->out_ep->driver_data = cdev;       /* claim */
 
         /* support high speed hardware */
         if (gadget_is_dualspeed(c->cdev->gadget)) {
-                hs_source_desc.bEndpointAddress =
-                                fs_source_desc.bEndpointAddress;
-                hs_sink_desc.bEndpointAddress =
-                                fs_sink_desc.bEndpointAddress;
+                hs_loop_source_desc.bEndpointAddress =
+                                fs_loop_source_desc.bEndpointAddress;
+                hs_loop_sink_desc.bEndpointAddress =
+                                fs_loop_sink_desc.bEndpointAddress;
                 f->hs_descriptors = hs_loopback_descs;
         }
 
@@ -255,8 +255,10 @@ enable_loopback(struct usb_composite_dev *cdev, struct f_loopback *loop)
         struct usb_request                      *req;
         unsigned                                i;
 
-        src = ep_choose(cdev->gadget, &hs_source_desc, &fs_source_desc);
-        sink = ep_choose(cdev->gadget, &hs_sink_desc, &fs_sink_desc);
+        src = ep_choose(cdev->gadget,
+                        &hs_loop_source_desc, &fs_loop_source_desc);
+        sink = ep_choose(cdev->gadget,
+                        &hs_loop_sink_desc, &fs_loop_sink_desc);
 
         /* one endpoint writes data back IN to the host */
         ep = loop->in_ep;
diff --git a/drivers/usb/gadget/f_subset.c b/drivers/usb/gadget/f_subset.c
index acb8d233aa1d..fe1832875771 100644
--- a/drivers/usb/gadget/f_subset.c
+++ b/drivers/usb/gadget/f_subset.c
@@ -103,8 +103,8 @@ static struct usb_interface_descriptor subset_data_intf __initdata = {
         /* .iInterface = DYNAMIC */
 };
 
-static struct usb_cdc_header_desc header_desc __initdata = {
-        .bLength =              sizeof header_desc,
+static struct usb_cdc_header_desc mdlm_header_desc __initdata = {
+        .bLength =              sizeof mdlm_header_desc,
         .bDescriptorType =      USB_DT_CS_INTERFACE,
         .bDescriptorSubType =   USB_CDC_HEADER_TYPE,
 
@@ -152,7 +152,7 @@ static struct usb_cdc_ether_desc ether_desc __initdata = {
 
 /* full speed support: */
 
-static struct usb_endpoint_descriptor fs_in_desc __initdata = {
+static struct usb_endpoint_descriptor fs_subset_in_desc __initdata = {
         .bLength =              USB_DT_ENDPOINT_SIZE,
         .bDescriptorType =      USB_DT_ENDPOINT,
 
@@ -160,7 +160,7 @@ static struct usb_endpoint_descriptor fs_in_desc __initdata = {
         .bmAttributes =         USB_ENDPOINT_XFER_BULK,
 };
 
-static struct usb_endpoint_descriptor fs_out_desc __initdata = {
+static struct usb_endpoint_descriptor fs_subset_out_desc __initdata = {
         .bLength =              USB_DT_ENDPOINT_SIZE,
         .bDescriptorType =      USB_DT_ENDPOINT,
 
@@ -170,18 +170,18 @@ static struct usb_endpoint_descriptor fs_out_desc __initdata = {
 
 static struct usb_descriptor_header *fs_eth_function[] __initdata = {
         (struct usb_descriptor_header *) &subset_data_intf,
-        (struct usb_descriptor_header *) &header_desc,
+        (struct usb_descriptor_header *) &mdlm_header_desc,
         (struct usb_descriptor_header *) &mdlm_desc,
         (struct usb_descriptor_header *) &mdlm_detail_desc,
         (struct usb_descriptor_header *) &ether_desc,
-        (struct usb_descriptor_header *) &fs_in_desc,
-        (struct usb_descriptor_header *) &fs_out_desc,
+        (struct usb_descriptor_header *) &fs_subset_in_desc,
+        (struct usb_descriptor_header *) &fs_subset_out_desc,
         NULL,
 };
 
 /* high speed support: */
 
-static struct usb_endpoint_descriptor hs_in_desc __initdata = {
+static struct usb_endpoint_descriptor hs_subset_in_desc __initdata = {
         .bLength =              USB_DT_ENDPOINT_SIZE,
         .bDescriptorType =      USB_DT_ENDPOINT,
 
@@ -189,7 +189,7 @@ static struct usb_endpoint_descriptor hs_in_desc __initdata = {
         .wMaxPacketSize =       __constant_cpu_to_le16(512),
 };
 
-static struct usb_endpoint_descriptor hs_out_desc __initdata = {
+static struct usb_endpoint_descriptor hs_subset_out_desc __initdata = {
         .bLength =              USB_DT_ENDPOINT_SIZE,
         .bDescriptorType =      USB_DT_ENDPOINT,
 
@@ -199,12 +199,12 @@ static struct usb_endpoint_descriptor hs_out_desc __initdata = {
 
 static struct usb_descriptor_header *hs_eth_function[] __initdata = {
         (struct usb_descriptor_header *) &subset_data_intf,
-        (struct usb_descriptor_header *) &header_desc,
+        (struct usb_descriptor_header *) &mdlm_header_desc,
         (struct usb_descriptor_header *) &mdlm_desc,
         (struct usb_descriptor_header *) &mdlm_detail_desc,
         (struct usb_descriptor_header *) &ether_desc,
-        (struct usb_descriptor_header *) &hs_in_desc,
-        (struct usb_descriptor_header *) &hs_out_desc,
+        (struct usb_descriptor_header *) &hs_subset_in_desc,
+        (struct usb_descriptor_header *) &hs_subset_out_desc,
         NULL,
 };
 
@@ -281,13 +281,13 @@ geth_bind(struct usb_configuration *c, struct usb_function *f)
         status = -ENODEV;
 
         /* allocate instance-specific endpoints */
-        ep = usb_ep_autoconfig(cdev->gadget, &fs_in_desc);
+        ep = usb_ep_autoconfig(cdev->gadget, &fs_subset_in_desc);
         if (!ep)
                 goto fail;
         geth->port.in_ep = ep;
         ep->driver_data = cdev; /* claim */
 
-        ep = usb_ep_autoconfig(cdev->gadget, &fs_out_desc);
+        ep = usb_ep_autoconfig(cdev->gadget, &fs_subset_out_desc);
         if (!ep)
                 goto fail;
         geth->port.out_ep = ep;
@@ -297,9 +297,9 @@ geth_bind(struct usb_configuration *c, struct usb_function *f)
         f->descriptors = usb_copy_descriptors(fs_eth_function);
 
         geth->fs.in = usb_find_endpoint(fs_eth_function,
-                        f->descriptors, &fs_in_desc);
+                        f->descriptors, &fs_subset_in_desc);
         geth->fs.out = usb_find_endpoint(fs_eth_function,
-                        f->descriptors, &fs_out_desc);
+                        f->descriptors, &fs_subset_out_desc);
 
 
         /* support all relevant hardware speeds... we expect that when
@@ -307,18 +307,18 @@ geth_bind(struct usb_configuration *c, struct usb_function *f)
          * both speeds
          */
         if (gadget_is_dualspeed(c->cdev->gadget)) {
-                hs_in_desc.bEndpointAddress =
-                                fs_in_desc.bEndpointAddress;
-                hs_out_desc.bEndpointAddress =
-                                fs_out_desc.bEndpointAddress;
+                hs_subset_in_desc.bEndpointAddress =
+                                fs_subset_in_desc.bEndpointAddress;
+                hs_subset_out_desc.bEndpointAddress =
+                                fs_subset_out_desc.bEndpointAddress;
 
                 /* copy descriptors, and track endpoint copies */
                 f->hs_descriptors = usb_copy_descriptors(hs_eth_function);
 
                 geth->hs.in = usb_find_endpoint(hs_eth_function,
-                                f->hs_descriptors, &hs_in_desc);
+                                f->hs_descriptors, &hs_subset_in_desc);
                 geth->hs.out = usb_find_endpoint(hs_eth_function,
-                                f->hs_descriptors, &hs_out_desc);
+                                f->hs_descriptors, &hs_subset_out_desc);
         }
 
         /* NOTE:  all that is done without knowing or caring about
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index ea2c31d18080..0c632d22a631 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -245,6 +245,18 @@
 #include "gadget_chips.h"
 
 
+
+/*
+ * Kbuild is not very cooperative with respect to linking separately
+ * compiled library objects into one module.  So for now we won't use
+ * separate compilation ... ensuring init/exit sections work to shrink
+ * the runtime footprint, and giving us at least some parts of what
+ * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
+ */
+#include "usbstring.c"
+#include "config.c"
+#include "epautoconf.c"
+
 /*-------------------------------------------------------------------------*/
 
 #define DRIVER_DESC             "File-backed Storage Gadget"
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
index ea8651e3da1a..6eee760410d6 100644
--- a/drivers/usb/gadget/gmidi.c
+++ b/drivers/usb/gadget/gmidi.c
@@ -35,6 +35,21 @@
 
 #include "gadget_chips.h"
 
+
+/*
+ * Kbuild is not very cooperative with respect to linking separately
+ * compiled library objects into one module.  So for now we won't use
+ * separate compilation ... ensuring init/exit sections work to shrink
+ * the runtime footprint, and giving us at least some parts of what
+ * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
+ */
+#include "usbstring.c"
+#include "config.c"
+#include "epautoconf.c"
+
+/*-------------------------------------------------------------------------*/
+
+
 MODULE_AUTHOR("Ben Williamson");
 MODULE_LICENSE("GPL v2");
 
diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c
index e0090085b78e..2b3b9e1dd2ee 100644
--- a/drivers/usb/gadget/printer.c
+++ b/drivers/usb/gadget/printer.c
@@ -53,6 +53,20 @@
 
 #include "gadget_chips.h"
 
+
+/*
+ * Kbuild is not very cooperative with respect to linking separately
+ * compiled library objects into one module.  So for now we won't use
+ * separate compilation ... ensuring init/exit sections work to shrink
+ * the runtime footprint, and giving us at least some parts of what
+ * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
+ */
+#include "usbstring.c"
+#include "config.c"
+#include "epautoconf.c"
+
+/*-------------------------------------------------------------------------*/
+
 #define DRIVER_DESC             "Printer Gadget"
 #define DRIVER_VERSION          "2007 OCT 06"
 
@@ -1360,8 +1374,8 @@ printer_bind(struct usb_gadget *gadget)
 
 
         /* Setup the sysfs files for the printer gadget. */
-        dev->pdev = device_create_drvdata(usb_gadget_class, NULL,
-                                          g_printer_devno, NULL, "g_printer");
+        dev->pdev = device_create(usb_gadget_class, NULL, g_printer_devno,
+                                  NULL, "g_printer");
         if (IS_ERR(dev->pdev)) {
                 ERROR(dev, "Failed to create device: g_printer\n");
                 goto fail;
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c
index 7228e8562236..8c26f5ea2b83 100644
--- a/drivers/usb/gadget/rndis.c
+++ b/drivers/usb/gadget/rndis.c
@@ -57,11 +57,6 @@ MODULE_PARM_DESC (rndis_debug, "enable debugging");
 #define rndis_debug             0
 #endif
 
-#define DBG(str,args...) do { \
-        if (rndis_debug) \
-                pr_debug(str , ## args); \
-        } while (0)
-
 #define RNDIS_MAX_CONFIGS       1
 
 
@@ -183,9 +178,9 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
         if (!resp) return -ENOMEM;
 
         if (buf_len && rndis_debug > 1) {
-                DBG("query OID %08x value, len %d:\n", OID, buf_len);
+                pr_debug("query OID %08x value, len %d:\n", OID, buf_len);
                 for (i = 0; i < buf_len; i += 16) {
-                        DBG("%03d: %08x %08x %08x %08x\n", i,
+                        pr_debug("%03d: %08x %08x %08x %08x\n", i,
                                 get_unaligned_le32(&buf[i]),
                                 get_unaligned_le32(&buf[i + 4]),
                                 get_unaligned_le32(&buf[i + 8]),
@@ -209,7 +204,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
 
         /* mandatory */
         case OID_GEN_SUPPORTED_LIST:
-                DBG("%s: OID_GEN_SUPPORTED_LIST\n", __func__);
+                pr_debug("%s: OID_GEN_SUPPORTED_LIST\n", __func__);
                 length = sizeof (oid_supported_list);
                 count  = length / sizeof (u32);
                 for (i = 0; i < count; i++)
@@ -219,7 +214,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
 
         /* mandatory */
         case OID_GEN_HARDWARE_STATUS:
-                DBG("%s: OID_GEN_HARDWARE_STATUS\n", __func__);
+                pr_debug("%s: OID_GEN_HARDWARE_STATUS\n", __func__);
                 /* Bogus question!
                  * Hardware must be ready to receive high level protocols.
                  * BTW:
@@ -232,14 +227,14 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
 
         /* mandatory */
         case OID_GEN_MEDIA_SUPPORTED:
-                DBG("%s: OID_GEN_MEDIA_SUPPORTED\n", __func__);
+                pr_debug("%s: OID_GEN_MEDIA_SUPPORTED\n", __func__);
                 *outbuf = cpu_to_le32 (rndis_per_dev_params [configNr].medium);
                 retval = 0;
                 break;
 
         /* mandatory */
         case OID_GEN_MEDIA_IN_USE:
-                DBG("%s: OID_GEN_MEDIA_IN_USE\n", __func__);
+                pr_debug("%s: OID_GEN_MEDIA_IN_USE\n", __func__);
                 /* one medium, one transport... (maybe you do it better) */
                 *outbuf = cpu_to_le32 (rndis_per_dev_params [configNr].medium);
                 retval = 0;
@@ -247,7 +242,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
 
         /* mandatory */
         case OID_GEN_MAXIMUM_FRAME_SIZE:
-                DBG("%s: OID_GEN_MAXIMUM_FRAME_SIZE\n", __func__);
+                pr_debug("%s: OID_GEN_MAXIMUM_FRAME_SIZE\n", __func__);
                 if (rndis_per_dev_params [configNr].dev) {
                         *outbuf = cpu_to_le32 (
                                 rndis_per_dev_params [configNr].dev->mtu);
@@ -258,7 +253,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
         /* mandatory */
         case OID_GEN_LINK_SPEED:
                 if (rndis_debug > 1)
-                        DBG("%s: OID_GEN_LINK_SPEED\n", __func__);
+                        pr_debug("%s: OID_GEN_LINK_SPEED\n", __func__);
                 if (rndis_per_dev_params [configNr].media_state
                                 == NDIS_MEDIA_STATE_DISCONNECTED)
                         *outbuf = __constant_cpu_to_le32 (0);
@@ -270,7 +265,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
 
         /* mandatory */
         case OID_GEN_TRANSMIT_BLOCK_SIZE:
-                DBG("%s: OID_GEN_TRANSMIT_BLOCK_SIZE\n", __func__);
+                pr_debug("%s: OID_GEN_TRANSMIT_BLOCK_SIZE\n", __func__);
                 if (rndis_per_dev_params [configNr].dev) {
                         *outbuf = cpu_to_le32 (
                                 rndis_per_dev_params [configNr].dev->mtu);
@@ -280,7 +275,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
 
         /* mandatory */
         case OID_GEN_RECEIVE_BLOCK_SIZE:
-                DBG("%s: OID_GEN_RECEIVE_BLOCK_SIZE\n", __func__);
+                pr_debug("%s: OID_GEN_RECEIVE_BLOCK_SIZE\n", __func__);
                 if (rndis_per_dev_params [configNr].dev) {
                         *outbuf = cpu_to_le32 (
                                 rndis_per_dev_params [configNr].dev->mtu);
@@ -290,7 +285,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
 
         /* mandatory */
         case OID_GEN_VENDOR_ID:
-                DBG("%s: OID_GEN_VENDOR_ID\n", __func__);
+                pr_debug("%s: OID_GEN_VENDOR_ID\n", __func__);
                 *outbuf = cpu_to_le32 (
                         rndis_per_dev_params [configNr].vendorID);
                 retval = 0;
@@ -298,7 +293,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
 
         /* mandatory */
         case OID_GEN_VENDOR_DESCRIPTION:
-                DBG("%s: OID_GEN_VENDOR_DESCRIPTION\n", __func__);
+                pr_debug("%s: OID_GEN_VENDOR_DESCRIPTION\n", __func__);
                 length = strlen (rndis_per_dev_params [configNr].vendorDescr);
                 memcpy (outbuf,
                         rndis_per_dev_params [configNr].vendorDescr, length);
@@ -306,7 +301,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
                 break;
 
         case OID_GEN_VENDOR_DRIVER_VERSION:
-                DBG("%s: OID_GEN_VENDOR_DRIVER_VERSION\n", __func__);
+                pr_debug("%s: OID_GEN_VENDOR_DRIVER_VERSION\n", __func__);
                 /* Created as LE */
                 *outbuf = rndis_driver_version;
                 retval = 0;
@@ -314,14 +309,14 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
 
         /* mandatory */
         case OID_GEN_CURRENT_PACKET_FILTER:
-                DBG("%s: OID_GEN_CURRENT_PACKET_FILTER\n", __func__);
+                pr_debug("%s: OID_GEN_CURRENT_PACKET_FILTER\n", __func__);
                 *outbuf = cpu_to_le32 (*rndis_per_dev_params[configNr].filter);
                 retval = 0;
                 break;
 
         /* mandatory */
         case OID_GEN_MAXIMUM_TOTAL_SIZE:
-                DBG("%s: OID_GEN_MAXIMUM_TOTAL_SIZE\n", __func__);
+                pr_debug("%s: OID_GEN_MAXIMUM_TOTAL_SIZE\n", __func__);
                 *outbuf = __constant_cpu_to_le32(RNDIS_MAX_TOTAL_SIZE);
                 retval = 0;
                 break;
@@ -329,14 +324,14 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
         /* mandatory */
         case OID_GEN_MEDIA_CONNECT_STATUS:
                 if (rndis_debug > 1)
-                        DBG("%s: OID_GEN_MEDIA_CONNECT_STATUS\n", __func__);
+                        pr_debug("%s: OID_GEN_MEDIA_CONNECT_STATUS\n", __func__);
                 *outbuf = cpu_to_le32 (rndis_per_dev_params [configNr]
                                                 .media_state);
                 retval = 0;
                 break;
 
         case OID_GEN_PHYSICAL_MEDIUM:
-                DBG("%s: OID_GEN_PHYSICAL_MEDIUM\n", __func__);
+                pr_debug("%s: OID_GEN_PHYSICAL_MEDIUM\n", __func__);
                 *outbuf = __constant_cpu_to_le32 (0);
                 retval = 0;
                 break;
@@ -346,7 +341,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
          * versions emit undefined RNDIS messages. DOCUMENT ALL THESE!
          */
         case OID_GEN_MAC_OPTIONS:               /* from WinME */
-                DBG("%s: OID_GEN_MAC_OPTIONS\n", __func__);
+                pr_debug("%s: OID_GEN_MAC_OPTIONS\n", __func__);
                 *outbuf = __constant_cpu_to_le32(
                           NDIS_MAC_OPTION_RECEIVE_SERIALIZED
                         | NDIS_MAC_OPTION_FULL_DUPLEX);
@@ -358,7 +353,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
         /* mandatory */
         case OID_GEN_XMIT_OK:
                 if (rndis_debug > 1)
-                        DBG("%s: OID_GEN_XMIT_OK\n", __func__);
+                        pr_debug("%s: OID_GEN_XMIT_OK\n", __func__);
                 if (stats) {
                         *outbuf = cpu_to_le32(stats->tx_packets
                                 - stats->tx_errors - stats->tx_dropped);
@@ -369,7 +364,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
         /* mandatory */
         case OID_GEN_RCV_OK:
                 if (rndis_debug > 1)
-                        DBG("%s: OID_GEN_RCV_OK\n", __func__);
+                        pr_debug("%s: OID_GEN_RCV_OK\n", __func__);
                 if (stats) {
                         *outbuf = cpu_to_le32(stats->rx_packets
                                 - stats->rx_errors - stats->rx_dropped);
@@ -380,7 +375,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
         /* mandatory */
         case OID_GEN_XMIT_ERROR:
                 if (rndis_debug > 1)
-                        DBG("%s: OID_GEN_XMIT_ERROR\n", __func__);
+                        pr_debug("%s: OID_GEN_XMIT_ERROR\n", __func__);
                 if (stats) {
                         *outbuf = cpu_to_le32(stats->tx_errors);
                         retval = 0;
@@ -390,7 +385,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
         /* mandatory */
         case OID_GEN_RCV_ERROR:
                 if (rndis_debug > 1)
-                        DBG("%s: OID_GEN_RCV_ERROR\n", __func__);
+                        pr_debug("%s: OID_GEN_RCV_ERROR\n", __func__);
                 if (stats) {
                         *outbuf = cpu_to_le32(stats->rx_errors);
                         retval = 0;
@@ -399,7 +394,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
 
         /* mandatory */
         case OID_GEN_RCV_NO_BUFFER:
-                DBG("%s: OID_GEN_RCV_NO_BUFFER\n", __func__);
+                pr_debug("%s: OID_GEN_RCV_NO_BUFFER\n", __func__);
                 if (stats) {
                         *outbuf = cpu_to_le32(stats->rx_dropped);
                         retval = 0;
@@ -410,7 +405,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
 
         /* mandatory */
         case OID_802_3_PERMANENT_ADDRESS:
-                DBG("%s: OID_802_3_PERMANENT_ADDRESS\n", __func__);
+                pr_debug("%s: OID_802_3_PERMANENT_ADDRESS\n", __func__);
                 if (rndis_per_dev_params [configNr].dev) {
                         length = ETH_ALEN;
                         memcpy (outbuf,
@@ -422,7 +417,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
 
         /* mandatory */
         case OID_802_3_CURRENT_ADDRESS:
-                DBG("%s: OID_802_3_CURRENT_ADDRESS\n", __func__);
+                pr_debug("%s: OID_802_3_CURRENT_ADDRESS\n", __func__);
                 if (rndis_per_dev_params [configNr].dev) {
                         length = ETH_ALEN;
                         memcpy (outbuf,
@@ -434,7 +429,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
 
         /* mandatory */
         case OID_802_3_MULTICAST_LIST:
-                DBG("%s: OID_802_3_MULTICAST_LIST\n", __func__);
+                pr_debug("%s: OID_802_3_MULTICAST_LIST\n", __func__);
                 /* Multicast base address only */
                 *outbuf = __constant_cpu_to_le32 (0xE0000000);
                 retval = 0;
@@ -442,21 +437,21 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
 
         /* mandatory */
         case OID_802_3_MAXIMUM_LIST_SIZE:
-                DBG("%s: OID_802_3_MAXIMUM_LIST_SIZE\n", __func__);
+                pr_debug("%s: OID_802_3_MAXIMUM_LIST_SIZE\n", __func__);
                 /* Multicast base address only */
                 *outbuf = __constant_cpu_to_le32 (1);
                 retval = 0;
                 break;
 
         case OID_802_3_MAC_OPTIONS:
-                DBG("%s: OID_802_3_MAC_OPTIONS\n", __func__);
+                pr_debug("%s: OID_802_3_MAC_OPTIONS\n", __func__);
                 break;
 
         /* ieee802.3 statistics OIDs (table 4-4) */
 
         /* mandatory */
         case OID_802_3_RCV_ERROR_ALIGNMENT:
-                DBG("%s: OID_802_3_RCV_ERROR_ALIGNMENT\n", __func__);
+                pr_debug("%s: OID_802_3_RCV_ERROR_ALIGNMENT\n", __func__);
                 if (stats) {
                         *outbuf = cpu_to_le32(stats->rx_frame_errors);
                         retval = 0;
@@ -465,14 +460,14 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
 
         /* mandatory */
         case OID_802_3_XMIT_ONE_COLLISION:
-                DBG("%s: OID_802_3_XMIT_ONE_COLLISION\n", __func__);
+                pr_debug("%s: OID_802_3_XMIT_ONE_COLLISION\n", __func__);
                 *outbuf = __constant_cpu_to_le32 (0);
                 retval = 0;
                 break;
 
         /* mandatory */
         case OID_802_3_XMIT_MORE_COLLISIONS:
-                DBG("%s: OID_802_3_XMIT_MORE_COLLISIONS\n", __func__);
+                pr_debug("%s: OID_802_3_XMIT_MORE_COLLISIONS\n", __func__);
                 *outbuf = __constant_cpu_to_le32 (0);
                 retval = 0;
                 break;
@@ -504,9 +499,9 @@ static int gen_ndis_set_resp (u8 configNr, u32 OID, u8 *buf, u32 buf_len,
                 return -ENOMEM;
 
         if (buf_len && rndis_debug > 1) {
-                DBG("set OID %08x value, len %d:\n", OID, buf_len);
+                pr_debug("set OID %08x value, len %d:\n", OID, buf_len);
                 for (i = 0; i < buf_len; i += 16) {
-                        DBG("%03d: %08x %08x %08x %08x\n", i,
+                        pr_debug("%03d: %08x %08x %08x %08x\n", i,
                                 get_unaligned_le32(&buf[i]),
                                 get_unaligned_le32(&buf[i + 4]),
                                 get_unaligned_le32(&buf[i + 8]),
@@ -525,7 +520,7 @@ static int gen_ndis_set_resp (u8 configNr, u32 OID, u8 *buf, u32 buf_len,
                  *      MULTICAST, ALL_MULTICAST, BROADCAST
                  */
                 *params->filter = (u16)get_unaligned_le32(buf);
-                DBG("%s: OID_GEN_CURRENT_PACKET_FILTER %08x\n",
+                pr_debug("%s: OID_GEN_CURRENT_PACKET_FILTER %08x\n",
                         __func__, *params->filter);
 
                 /* this call has a significant side effect:  it's
@@ -547,7 +542,7 @@ static int gen_ndis_set_resp (u8 configNr, u32 OID, u8 *buf, u32 buf_len,
 
         case OID_802_3_MULTICAST_LIST:
                 /* I think we can ignore this */
-                DBG("%s: OID_802_3_MULTICAST_LIST\n", __func__);
+                pr_debug("%s: OID_802_3_MULTICAST_LIST\n", __func__);
                 retval = 0;
                 break;
 
@@ -606,7 +601,7 @@ static int rndis_query_response (int configNr, rndis_query_msg_type *buf)
         rndis_resp_t            *r;
         struct rndis_params     *params = rndis_per_dev_params + configNr;
 
-        // DBG("%s: OID = %08X\n", __func__, cpu_to_le32(buf->OID));
+        /* pr_debug("%s: OID = %08X\n", __func__, cpu_to_le32(buf->OID)); */
         if (!params->dev)
                 return -ENOTSUPP;
 
@@ -659,15 +654,15 @@ static int rndis_set_response (int configNr, rndis_set_msg_type *buf)
         BufOffset = le32_to_cpu (buf->InformationBufferOffset);
 
 #ifdef  VERBOSE_DEBUG
-        DBG("%s: Length: %d\n", __func__, BufLength);
-        DBG("%s: Offset: %d\n", __func__, BufOffset);
-        DBG("%s: InfoBuffer: ", __func__);
+        pr_debug("%s: Length: %d\n", __func__, BufLength);
+        pr_debug("%s: Offset: %d\n", __func__, BufOffset);
+        pr_debug("%s: InfoBuffer: ", __func__);
 
         for (i = 0; i < BufLength; i++) {
-                DBG("%02x ", *(((u8 *) buf) + i + 8 + BufOffset));
+                pr_debug("%02x ", *(((u8 *) buf) + i + 8 + BufOffset));
         }
 
-        DBG("\n");
+        pr_debug("\n");
 #endif
 
         resp->MessageType = __constant_cpu_to_le32 (REMOTE_NDIS_SET_CMPLT);
@@ -821,14 +816,14 @@ int rndis_msg_parser (u8 configNr, u8 *buf)
         /* For USB: responses may take up to 10 seconds */
         switch (MsgType) {
         case REMOTE_NDIS_INITIALIZE_MSG:
-                DBG("%s: REMOTE_NDIS_INITIALIZE_MSG\n",
+                pr_debug("%s: REMOTE_NDIS_INITIALIZE_MSG\n",
                         __func__ );
                 params->state = RNDIS_INITIALIZED;
                 return  rndis_init_response (configNr,
                                         (rndis_init_msg_type *) buf);
 
         case REMOTE_NDIS_HALT_MSG:
-                DBG("%s: REMOTE_NDIS_HALT_MSG\n",
+                pr_debug("%s: REMOTE_NDIS_HALT_MSG\n",
                         __func__ );
                 params->state = RNDIS_UNINITIALIZED;
                 if (params->dev) {
@@ -846,7 +841,7 @@ int rndis_msg_parser (u8 configNr, u8 *buf)
                                         (rndis_set_msg_type *) buf);
 
         case REMOTE_NDIS_RESET_MSG:
-                DBG("%s: REMOTE_NDIS_RESET_MSG\n",
+                pr_debug("%s: REMOTE_NDIS_RESET_MSG\n",
                         __func__ );
                 return rndis_reset_response (configNr,
                                         (rndis_reset_msg_type *) buf);
@@ -854,7 +849,7 @@ int rndis_msg_parser (u8 configNr, u8 *buf)
         case REMOTE_NDIS_KEEPALIVE_MSG:
                 /* For USB: host does this every 5 seconds */
                 if (rndis_debug > 1)
-                        DBG("%s: REMOTE_NDIS_KEEPALIVE_MSG\n",
+                        pr_debug("%s: REMOTE_NDIS_KEEPALIVE_MSG\n",
                                 __func__ );
                 return rndis_keepalive_response (configNr,
                                                  (rndis_keepalive_msg_type *)
@@ -870,7 +865,7 @@ int rndis_msg_parser (u8 configNr, u8 *buf)
                 {
                         unsigned i;
                         for (i = 0; i < MsgLength; i += 16) {
-                                DBG("%03d: "
+                                pr_debug("%03d: "
                                         " %02x %02x %02x %02x"
                                         " %02x %02x %02x %02x"
                                         " %02x %02x %02x %02x"
@@ -905,18 +900,18 @@ int rndis_register(void (*resp_avail)(void *v), void *v)
                         rndis_per_dev_params [i].used = 1;
                         rndis_per_dev_params [i].resp_avail = resp_avail;
                         rndis_per_dev_params [i].v = v;
-                        DBG("%s: configNr = %d\n", __func__, i);
+                        pr_debug("%s: configNr = %d\n", __func__, i);
                         return i;
                 }
         }
-        DBG("failed\n");
+        pr_debug("failed\n");
 
         return -ENODEV;
 }
 
 void rndis_deregister (int configNr)
 {
-        DBG("%s: \n", __func__ );
+        pr_debug("%s: \n", __func__);
 
         if (configNr >= RNDIS_MAX_CONFIGS) return;
         rndis_per_dev_params [configNr].used = 0;
@@ -926,7 +921,7 @@ void rndis_deregister (int configNr)
 
 int rndis_set_param_dev(u8 configNr, struct net_device *dev, u16 *cdc_filter)
 {
-        DBG("%s:\n", __func__ );
+        pr_debug("%s:\n", __func__);
         if (!dev)
                 return -EINVAL;
         if (configNr >= RNDIS_MAX_CONFIGS) return -1;
@@ -939,7 +934,7 @@ int rndis_set_param_dev(u8 configNr, struct net_device *dev, u16 *cdc_filter)
 
 int rndis_set_param_vendor (u8 configNr, u32 vendorID, const char *vendorDescr)
 {
-        DBG("%s:\n", __func__ );
+        pr_debug("%s:\n", __func__);
         if (!vendorDescr) return -1;
         if (configNr >= RNDIS_MAX_CONFIGS) return -1;
 
@@ -951,7 +946,7 @@ int rndis_set_param_vendor (u8 configNr, u32 vendorID, const char *vendorDescr)
 
 int rndis_set_param_medium (u8 configNr, u32 medium, u32 speed)
 {
-        DBG("%s: %u %u\n", __func__, medium, speed);
+        pr_debug("%s: %u %u\n", __func__, medium, speed);
         if (configNr >= RNDIS_MAX_CONFIGS) return -1;
 
         rndis_per_dev_params [configNr].medium = medium;
@@ -1114,7 +1109,7 @@ static ssize_t rndis_proc_write(struct file *file, const char __user *buffer,
                         break;
                 default:
                         if (fl_speed) p->speed = speed;
-                        else DBG("%c is not valid\n", c);
+                        else pr_debug("%c is not valid\n", c);
                         break;
                 }
 
@@ -1159,12 +1154,12 @@ int __init rndis_init (void)
                                         &rndis_proc_fops,
                                         (void *)(rndis_per_dev_params + i))))
                 {
-                        DBG("%s :remove entries", __func__);
+                        pr_debug("%s :remove entries", __func__);
                         while (i) {
                                 sprintf (name, NAME_TEMPLATE, --i);
                                 remove_proc_entry (name, NULL);
                         }
-                        DBG("\n");
+                        pr_debug("\n");
                         return -EIO;
                 }
 #endif
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
index b3699afff002..3faa7a7022df 100644
--- a/drivers/usb/gadget/serial.c
+++ b/drivers/usb/gadget/serial.c
@@ -30,6 +30,24 @@
 
 /*-------------------------------------------------------------------------*/
 
+/*
+ * Kbuild is not very cooperative with respect to linking separately
+ * compiled library objects into one module.  So for now we won't use
+ * separate compilation ... ensuring init/exit sections work to shrink
+ * the runtime footprint, and giving us at least some parts of what
+ * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
+ */
+#include "composite.c"
+#include "usbstring.c"
+#include "config.c"
+#include "epautoconf.c"
+
+#include "f_acm.c"
+#include "f_serial.c"
+#include "u_serial.c"
+
+/*-------------------------------------------------------------------------*/
+
 /* Thanks to NetChip Technologies for donating this product ID.
 *
 * DO NOT REUSE THESE IDs with a protocol-incompatible driver!!  Ever!!
diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c
index 3791e6271903..dbd575a194f3 100644
--- a/drivers/usb/gadget/u_ether.c
+++ b/drivers/usb/gadget/u_ether.c
@@ -52,7 +52,7 @@
  * this single "physical" link to be used by multiple virtual links.)
  */
 
-#define DRIVER_VERSION  "29-May-2008"
+#define UETH__VERSION   "29-May-2008"
 
 struct eth_dev {
         /* lock is held while accessing port_usb
@@ -170,7 +170,7 @@ static void eth_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *p)
         struct eth_dev  *dev = netdev_priv(net);
 
         strlcpy(p->driver, "g_ether", sizeof p->driver);
-        strlcpy(p->version, DRIVER_VERSION, sizeof p->version);
+        strlcpy(p->version, UETH__VERSION, sizeof p->version);
         strlcpy(p->fw_version, dev->gadget->name, sizeof p->fw_version);
         strlcpy(p->bus_info, dev_name(&dev->gadget->dev), sizeof p->bus_info);
 }
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c
index aa0bd4f126a1..361d9659ac48 100644
--- a/drivers/usb/gadget/zero.c
+++ b/drivers/usb/gadget/zero.c
@@ -59,6 +59,23 @@
 
 /*-------------------------------------------------------------------------*/
 
+/*
+ * Kbuild is not very cooperative with respect to linking separately
+ * compiled library objects into one module.  So for now we won't use
+ * separate compilation ... ensuring init/exit sections work to shrink
+ * the runtime footprint, and giving us at least some parts of what
+ * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
+ */
+#include "composite.c"
+#include "usbstring.c"
+#include "config.c"
+#include "epautoconf.c"
+
+#include "f_sourcesink.c"
+#include "f_loopback.c"
+
+/*-------------------------------------------------------------------------*/
+
 #define DRIVER_VERSION          "Cinco de Mayo 2008"
 
 static const char longname[] = "Gadget Zero";
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index 95b3ec89c126..522185629624 100644
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -344,7 +344,12 @@ static int usb_hcd_omap_probe (const struct hc_driver *driver,
                 goto err1;
         }
 
-        hcd->regs = (void __iomem *) (int) IO_ADDRESS(hcd->rsrc_start);
+        hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
+        if (!hcd->regs) {
+                dev_err(&pdev->dev, "can't ioremap OHCI HCD\n");
+                retval = -ENOMEM;
+                goto err2;
+        }
 
         ohci = hcd_to_ohci(hcd);
         ohci_hcd_init(ohci);
@@ -355,11 +360,11 @@ static int usb_hcd_omap_probe (const struct hc_driver *driver,
         irq = platform_get_irq(pdev, 0);
         if (irq < 0) {
                 retval = -ENXIO;
-                goto err2;
+                goto err3;
         }
         retval = usb_add_hcd(hcd, irq, IRQF_DISABLED);
         if (retval)
-                goto err2;
+                goto err3;
 
         host_initialized = 1;
 
@@ -367,6 +372,8 @@ static int usb_hcd_omap_probe (const struct hc_driver *driver,
                 omap_ohci_clock_power(0);
 
         return 0;
+err3:
+        iounmap(hcd->regs);
 err2:
         release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
 err1:
@@ -401,6 +408,7 @@ usb_hcd_omap_remove (struct usb_hcd *hcd, struct platform_device *pdev)
         }
         if (machine_is_omap_osk())
                 omap_free_gpio(9);
+        iounmap(hcd->regs);
         release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
         usb_put_hcd(hcd);
         clk_put(usb_dc_ck);
diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c
index 5da63f535005..516848dd9b48 100644
--- a/drivers/usb/host/sl811_cs.c
+++ b/drivers/usb/host/sl811_cs.c
@@ -112,7 +112,8 @@ static struct platform_device platform_dev = {
         .num_resources          = ARRAY_SIZE(resources),
 };
 
-static int sl811_hc_init(struct device *parent, ioaddr_t base_addr, int irq)
+static int sl811_hc_init(struct device *parent, resource_size_t base_addr,
+                         int irq)
 {
         if (platform_dev.dev.parent)
                 return -EBUSY;
@@ -155,97 +156,72 @@ static void sl811_cs_release(struct pcmcia_device * link)
         platform_device_unregister(&platform_dev);
 }
 
+static int sl811_cs_config_check(struct pcmcia_device *p_dev,
+                                 cistpl_cftable_entry_t *cfg,
+                                 cistpl_cftable_entry_t *dflt,
+                                 unsigned int vcc,
+                                 void *priv_data)
+{
+        if (cfg->index == 0)
+                return -ENODEV;
+
+        /* Use power settings for Vcc and Vpp if present */
+        /*  Note that the CIS values need to be rescaled */
+        if (cfg->vcc.present & (1<<CISTPL_POWER_VNOM)) {
+                if (cfg->vcc.param[CISTPL_POWER_VNOM]/10000 != vcc)
+                        return -ENODEV;
+        } else if (dflt->vcc.present & (1<<CISTPL_POWER_VNOM)) {
+                if (dflt->vcc.param[CISTPL_POWER_VNOM]/10000 != vcc)
+                        return -ENODEV;
+                }
+
+        if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp =
+                        cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
+        else if (dflt->vpp1.present & (1<<CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp =
+                        dflt->vpp1.param[CISTPL_POWER_VNOM]/10000;
+
+        /* we need an interrupt */
+        if (cfg->irq.IRQInfo1 || dflt->irq.IRQInfo1)
+                p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
+
+        /* IO window settings */
+        p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
+        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
+                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
+                p_dev->io.BasePort1 = io->win[0].base;
+                p_dev->io.NumPorts1 = io->win[0].len;
+
+                return pcmcia_request_io(p_dev, &p_dev->io);
+        }
+        pcmcia_disable_device(p_dev);
+        return -ENODEV;
+}
+
+
 static int sl811_cs_config(struct pcmcia_device *link)
 {
         struct device           *parent = &handle_to_dev(link);
         local_info_t            *dev = link->priv;
-        tuple_t                 tuple;
-        cisparse_t              parse;
         int                     last_fn, last_ret;
-        u_char                  buf[64];
-        config_info_t           conf;
-        cistpl_cftable_entry_t  dflt = { 0 };
 
         DBG(0, "sl811_cs_config(0x%p)\n", link);
 
-        /* Look up the current Vcc */
-        CS_CHECK(GetConfigurationInfo,
-                        pcmcia_get_configuration_info(link, &conf));
-
-        tuple.Attributes = 0;
-        tuple.TupleData = buf;
-        tuple.TupleDataMax = sizeof(buf);
-        tuple.TupleOffset = 0;
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-        while (1) {
-                cistpl_cftable_entry_t  *cfg = &(parse.cftable_entry);
-
-                if (pcmcia_get_tuple_data(link, &tuple) != 0
-                                || pcmcia_parse_tuple(link, &tuple, &parse)
-                                                != 0)
-                        goto next_entry;
-
-                if (cfg->flags & CISTPL_CFTABLE_DEFAULT) {
-                        dflt = *cfg;
-                }
-
-                if (cfg->index == 0)
-                        goto next_entry;
-
-                link->conf.ConfigIndex = cfg->index;
-
-                /* Use power settings for Vcc and Vpp if present */
-                /*  Note that the CIS values need to be rescaled */
-                if (cfg->vcc.present & (1<<CISTPL_POWER_VNOM)) {
-                        if (cfg->vcc.param[CISTPL_POWER_VNOM]/10000
-                                        != conf.Vcc)
-                                goto next_entry;
-                } else if (dflt.vcc.present & (1<<CISTPL_POWER_VNOM)) {
-                        if (dflt.vcc.param[CISTPL_POWER_VNOM]/10000
-                                        != conf.Vcc)
-                                goto next_entry;
-                }
-
-                if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                                cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
-                else if (dflt.vpp1.present & (1<<CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                                dflt.vpp1.param[CISTPL_POWER_VNOM]/10000;
-
-                /* we need an interrupt */
-                if (cfg->irq.IRQInfo1 || dflt.irq.IRQInfo1)
-                        link->conf.Attributes |= CONF_ENABLE_IRQ;
-
-                /* IO window settings */
-                link->io.NumPorts1 = link->io.NumPorts2 = 0;
-                if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
-                        cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io;
-
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-                        link->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
-                        link->io.BasePort1 = io->win[0].base;
-                        link->io.NumPorts1 = io->win[0].len;
-
-                        if (pcmcia_request_io(link, &link->io) != 0)
-                                goto next_entry;
-                }
-                break;
-
-next_entry:
-                pcmcia_disable_device(link);
-                last_ret = pcmcia_get_next_tuple(link, &tuple);
-        }
+        if (pcmcia_loop_config(link, sl811_cs_config_check, NULL))
+                goto failed;
 
         /* require an IRQ and two registers */
         if (!link->io.NumPorts1 || link->io.NumPorts1 < 2)
-                goto cs_failed;
+                goto failed;
         if (link->conf.Attributes & CONF_ENABLE_IRQ)
                 CS_CHECK(RequestIRQ,
                         pcmcia_request_irq(link, &link->irq));
         else
-                goto cs_failed;
+                goto failed;
 
         CS_CHECK(RequestConfiguration,
                 pcmcia_request_configuration(link, &link->conf));
@@ -266,8 +242,9 @@ next_entry:
         if (sl811_hc_init(parent, link->io.BasePort1, link->irq.AssignedIRQ)
                         < 0) {
 cs_failed:
-                printk("sl811_cs_config failed\n");
                 cs_error(link, last_fn, last_ret);
+failed:
+                printk(KERN_WARNING "sl811_cs_config failed\n");
                 sl811_cs_release(link);
                 return  -ENODEV;
         }
diff --git a/drivers/usb/host/uhci-q.c b/drivers/usb/host/uhci-q.c
index db645936eedd..1f0c2cf26e5d 100644
--- a/drivers/usb/host/uhci-q.c
+++ b/drivers/usb/host/uhci-q.c
@@ -123,14 +123,10 @@ static struct uhci_td *uhci_alloc_td(struct uhci_hcd *uhci)
 
 static void uhci_free_td(struct uhci_hcd *uhci, struct uhci_td *td)
 {
-        if (!list_empty(&td->list)) {
-                dev_warn(uhci_dev(uhci), "td %p still in list!\n", td);
-                WARN_ON(1);
-        }
-        if (!list_empty(&td->fl_list)) {
-                dev_warn(uhci_dev(uhci), "td %p still in fl_list!\n", td);
-                WARN_ON(1);
-        }
+        if (!list_empty(&td->list))
+                dev_WARN(uhci_dev(uhci), "td %p still in list!\n", td);
+        if (!list_empty(&td->fl_list))
+                dev_WARN(uhci_dev(uhci), "td %p still in fl_list!\n", td);
 
         dma_pool_free(uhci->td_pool, td, td->dma_handle);
 }
@@ -295,10 +291,8 @@ static struct uhci_qh *uhci_alloc_qh(struct uhci_hcd *uhci,
 static void uhci_free_qh(struct uhci_hcd *uhci, struct uhci_qh *qh)
 {
         WARN_ON(qh->state != QH_STATE_IDLE && qh->udev);
-        if (!list_empty(&qh->queue)) {
-                dev_warn(uhci_dev(uhci), "qh %p list not empty!\n", qh);
-                WARN_ON(1);
-        }
+        if (!list_empty(&qh->queue))
+                dev_WARN(uhci_dev(uhci), "qh %p list not empty!\n", qh);
 
         list_del(&qh->node);
         if (qh->udev) {
@@ -746,11 +740,9 @@ static void uhci_free_urb_priv(struct uhci_hcd *uhci,
 {
         struct uhci_td *td, *tmp;
 
-        if (!list_empty(&urbp->node)) {
-                dev_warn(uhci_dev(uhci), "urb %p still on QH's list!\n",
+        if (!list_empty(&urbp->node))
+                dev_WARN(uhci_dev(uhci), "urb %p still on QH's list!\n",
                                 urbp->urb);
-                WARN_ON(1);
-        }
 
         list_for_each_entry_safe(td, tmp, &urbp->td_list, list) {
                 uhci_remove_td_from_urbp(td);
diff --git a/drivers/usb/misc/phidgetkit.c b/drivers/usb/misc/phidgetkit.c
index 4cfa25b0f44e..cc8e0a926f99 100644
--- a/drivers/usb/misc/phidgetkit.c
+++ b/drivers/usb/misc/phidgetkit.c
@@ -595,9 +595,8 @@ static int interfacekit_probe(struct usb_interface *intf, const struct usb_devic
         } while(value);
         kit->dev_no = bit;
 
-        kit->dev = device_create_drvdata(phidget_class, &kit->udev->dev,
-                                        MKDEV(0, 0), kit,
-                                        "interfacekit%d", kit->dev_no);
+        kit->dev = device_create(phidget_class, &kit->udev->dev, MKDEV(0, 0),
+                                 kit, "interfacekit%d", kit->dev_no);
         if (IS_ERR(kit->dev)) {
                 rc = PTR_ERR(kit->dev);
                 kit->dev = NULL;
diff --git a/drivers/usb/misc/phidgetmotorcontrol.c b/drivers/usb/misc/phidgetmotorcontrol.c
index 9b4696f21b22..38088b44349e 100644
--- a/drivers/usb/misc/phidgetmotorcontrol.c
+++ b/drivers/usb/misc/phidgetmotorcontrol.c
@@ -365,9 +365,8 @@ static int motorcontrol_probe(struct usb_interface *intf, const struct usb_devic
         } while(value);
         mc->dev_no = bit;
 
-        mc->dev = device_create_drvdata(phidget_class, &mc->udev->dev,
-                                        MKDEV(0, 0), mc,
-                                        "motorcontrol%d", mc->dev_no);
+        mc->dev = device_create(phidget_class, &mc->udev->dev, MKDEV(0, 0), mc,
+                                "motorcontrol%d", mc->dev_no);
         if (IS_ERR(mc->dev)) {
                 rc = PTR_ERR(mc->dev);
                 mc->dev = NULL;
diff --git a/drivers/usb/misc/phidgetservo.c b/drivers/usb/misc/phidgetservo.c
index 1ca7ddb41d4d..bef6fe16364b 100644
--- a/drivers/usb/misc/phidgetservo.c
+++ b/drivers/usb/misc/phidgetservo.c
@@ -275,9 +275,8 @@ servo_probe(struct usb_interface *interface, const struct usb_device_id *id)
         } while (value);
         dev->dev_no = bit;
 
-        dev->dev = device_create_drvdata(phidget_class, &dev->udev->dev,
-                                         MKDEV(0, 0), dev,
-                                         "servo%d", dev->dev_no);
+        dev->dev = device_create(phidget_class, &dev->udev->dev, MKDEV(0, 0),
+                                 dev, "servo%d", dev->dev_no);
         if (IS_ERR(dev->dev)) {
                 rc = PTR_ERR(dev->dev);
                 dev->dev = NULL;
diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c
index 6566fc0a3228..c9de3f027aab 100644
--- a/drivers/usb/mon/mon_bin.c
+++ b/drivers/usb/mon/mon_bin.c
@@ -1162,9 +1162,9 @@ int mon_bin_add(struct mon_bus *mbus, const struct usb_bus *ubus)
         if (minor >= MON_BIN_MAX_MINOR)
                 return 0;
 
-        dev = device_create_drvdata(mon_bin_class, ubus? ubus->controller: NULL,
-                                    MKDEV(MAJOR(mon_bin_dev0), minor), NULL,
-                                    "usbmon%d", minor);
+        dev = device_create(mon_bin_class, ubus ? ubus->controller : NULL,
+                            MKDEV(MAJOR(mon_bin_dev0), minor), NULL,
+                            "usbmon%d", minor);
         if (IS_ERR(dev))
                 return 0;
 
diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c
index 79ea98c66fa8..99fb7dc59c45 100644
--- a/drivers/usb/serial/aircable.c
+++ b/drivers/usb/serial/aircable.c
@@ -272,7 +272,7 @@ static void aircable_read(struct work_struct *work)
          * 64 bytes, to ensure I do not get throttled.
          * Ask USB mailing list for better aproach.
          */
-        tty = port->port.tty;
+        tty = tty_port_tty_get(&port->port);
 
         if (!tty) {
                 schedule_work(&priv->rx_work);
@@ -283,12 +283,13 @@ static void aircable_read(struct work_struct *work)
         count = min(64, serial_buf_data_avail(priv->rx_buf));
 
         if (count <= 0)
-                return; /* We have finished sending everything. */
+                goto out; /* We have finished sending everything. */
 
         tty_prepare_flip_string(tty, &data, count);
         if (!data) {
-                err("%s- kzalloc(%d) failed.", __func__, count);
-                return;
+                dev_err(&port->dev, "%s- kzalloc(%d) failed.",
+                                                        __func__, count);
+                goto out;
         }
 
         serial_buf_get(priv->rx_buf, data, count);
@@ -297,7 +298,8 @@ static void aircable_read(struct work_struct *work)
 
         if (serial_buf_data_avail(priv->rx_buf))
                 schedule_work(&priv->rx_work);
-
+out:            
+        tty_kref_put(tty);
         return;
 }
 /* End of private methods */
@@ -495,7 +497,7 @@ static void aircable_read_bulk_callback(struct urb *urb)
         usb_serial_debug_data(debug, &port->dev, __func__,
                                 urb->actual_length, urb->transfer_buffer);
 
-        tty = port->port.tty;
+        tty = tty_port_tty_get(&port->port);
         if (tty && urb->actual_length) {
                 if (urb->actual_length <= 2) {
                         /* This is an incomplete package */
@@ -527,6 +529,7 @@ static void aircable_read_bulk_callback(struct urb *urb)
                 }
                 aircable_read(&priv->rx_work);
         }
+        tty_kref_put(tty);
 
         /* Schedule the next read _if_ we are still open */
         if (port->port.count) {
diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c
index 2ebe06c3405a..1913bc7c5f0b 100644
--- a/drivers/usb/serial/belkin_sa.c
+++ b/drivers/usb/serial/belkin_sa.c
@@ -322,7 +322,7 @@ static void belkin_sa_read_int_callback(struct urb *urb)
          * to look in to this before committing any code.
          */
         if (priv->last_lsr & BELKIN_SA_LSR_ERR) {
-                tty = port->port.tty;
+                tty = tty_port_tty_get(&port->port);
                 /* Overrun Error */
                 if (priv->last_lsr & BELKIN_SA_LSR_OE) {
                 }
@@ -335,6 +335,7 @@ static void belkin_sa_read_int_callback(struct urb *urb)
                 /* Break Indicator */
                 if (priv->last_lsr & BELKIN_SA_LSR_BI) {
                 }
+                tty_kref_put(tty);
         }
 #endif
         spin_unlock_irqrestore(&priv->lock, flags);
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index e980766bb84b..5b20de130e08 100644
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
@@ -117,7 +117,7 @@ static int usb_console_setup(struct console *co, char *options)
         }
 
         port = serial->port[0];
-        port->port.tty = NULL;
+        tty_port_tty_set(&port->port, NULL);
 
         info->port = port;
 
@@ -143,7 +143,7 @@ static int usb_console_setup(struct console *co, char *options)
                         }
                         memset(&dummy, 0, sizeof(struct ktermios));
                         tty->termios = termios;
-                        port->port.tty = tty;
+                        tty_port_tty_set(&port->port, tty);
                 }
 
                 /* only call the device specific open if this
@@ -163,7 +163,7 @@ static int usb_console_setup(struct console *co, char *options)
                         tty_termios_encode_baud_rate(termios, baud, baud);
                         serial->type->set_termios(tty, port, &dummy);
 
-                        port->port.tty = NULL;
+                        tty_port_tty_set(&port->port, NULL);
                         kfree(termios);
                         kfree(tty);
                 }
@@ -176,7 +176,7 @@ out:
         return retval;
 free_termios:
         kfree(termios);
-        port->port.tty = NULL;
+        tty_port_tty_set(&port->port, NULL);
 free_tty:
         kfree(tty);
 reset_open_count:
diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index b4d72351cb96..94ef36c4764b 100644
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -384,7 +384,7 @@ static void cyberjack_read_bulk_callback(struct urb *urb)
                 return;
         }
 
-        tty = port->port.tty;
+        tty = tty_port_tty_get(&port->port);
         if (!tty) {
                 dbg("%s - ignoring since device not open\n", __func__);
                 return;
@@ -394,6 +394,7 @@ static void cyberjack_read_bulk_callback(struct urb *urb)
                 tty_insert_flip_string(tty, data, urb->actual_length);
                 tty_flip_buffer_push(tty);
         }
+        tty_kref_put(tty);
 
         spin_lock(&priv->lock);
 
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index 22837a3f2f89..f3514a91f915 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -1286,7 +1286,7 @@ static void cypress_read_int_callback(struct urb *urb)
         }
         spin_unlock_irqrestore(&priv->lock, flags);
 
-        tty = port->port.tty;
+        tty = tty_port_tty_get(&port->port);
         if (!tty) {
                 dbg("%s - bad tty pointer - exiting", __func__);
                 return;
@@ -1362,7 +1362,7 @@ static void cypress_read_int_callback(struct urb *urb)
                                         data[i]);
                         tty_insert_flip_char(tty, data[i], tty_flag);
                 }
-                tty_flip_buffer_push(port->port.tty);
+                tty_flip_buffer_push(tty);
         }
 
         spin_lock_irqsave(&priv->lock, flags);
@@ -1371,6 +1371,7 @@ static void cypress_read_int_callback(struct urb *urb)
         spin_unlock_irqrestore(&priv->lock, flags);
 
 continue_read:
+        tty_kref_put(tty);
 
         /* Continue trying to always read... unless the port has closed. */
 
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index 240aad1acaab..5756ac6d6c92 100644
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@ -604,7 +604,9 @@ static void digi_wakeup_write_lock(struct work_struct *work)
 
 static void digi_wakeup_write(struct usb_serial_port *port)
 {
-        tty_wakeup(port->port.tty);
+        struct tty_struct *tty = tty_port_tty_get(&port->port);
+        tty_wakeup(tty);
+        tty_kref_put(tty);
 }
 
 
@@ -1668,7 +1670,7 @@ static int digi_read_inb_callback(struct urb *urb)
 {
 
         struct usb_serial_port *port = urb->context;
-        struct tty_struct *tty = port->port.tty;
+        struct tty_struct *tty;
         struct digi_port *priv = usb_get_serial_port_data(port);
         int opcode = ((unsigned char *)urb->transfer_buffer)[0];
         int len = ((unsigned char *)urb->transfer_buffer)[1];
@@ -1692,6 +1694,7 @@ static int digi_read_inb_callback(struct urb *urb)
                 return -1;
         }
 
+        tty = tty_port_tty_get(&port->port);
         spin_lock(&priv->dp_port_lock);
 
         /* check for throttle; if set, do not resubmit read urb */
@@ -1735,6 +1738,7 @@ static int digi_read_inb_callback(struct urb *urb)
                 }
         }
         spin_unlock(&priv->dp_port_lock);
+        tty_kref_put(tty);
 
         if (opcode == DIGI_CMD_RECEIVE_DISABLE)
                 dbg("%s: got RECEIVE_DISABLE", __func__);
@@ -1760,6 +1764,7 @@ static int digi_read_oob_callback(struct urb *urb)
 
         struct usb_serial_port *port = urb->context;
         struct usb_serial *serial = port->serial;
+        struct tty_struct *tty;
         struct digi_port *priv = usb_get_serial_port_data(port);
         int opcode, line, status, val;
         int i;
@@ -1787,10 +1792,11 @@ static int digi_read_oob_callback(struct urb *urb)
                 if (priv == NULL)
                         return -1;
 
+                tty = tty_port_tty_get(&port->port);
                 rts = 0;
                 if (port->port.count)
-                        rts = port->port.tty->termios->c_cflag & CRTSCTS;
-
+                        rts = tty->termios->c_cflag & CRTSCTS;
+                
                 if (opcode == DIGI_CMD_READ_INPUT_SIGNALS) {
                         spin_lock(&priv->dp_port_lock);
                         /* convert from digi flags to termiox flags */
@@ -1798,14 +1804,14 @@ static int digi_read_oob_callback(struct urb *urb)
                                 priv->dp_modem_signals |= TIOCM_CTS;
                                 /* port must be open to use tty struct */
                                 if (rts) {
-                                        port->port.tty->hw_stopped = 0;
+                                        tty->hw_stopped = 0;
                                         digi_wakeup_write(port);
                                 }
                         } else {
                                 priv->dp_modem_signals &= ~TIOCM_CTS;
                                 /* port must be open to use tty struct */
                                 if (rts)
-                                        port->port.tty->hw_stopped = 1;
+                                        tty->hw_stopped = 1;
                         }
                         if (val & DIGI_READ_INPUT_SIGNALS_DSR)
                                 priv->dp_modem_signals |= TIOCM_DSR;
@@ -1830,6 +1836,7 @@ static int digi_read_oob_callback(struct urb *urb)
                 } else if (opcode == DIGI_CMD_IFLUSH_FIFO) {
                         wake_up_interruptible(&priv->dp_flush_wait);
                 }
+                tty_kref_put(tty);
         }
         return 0;
 
diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c
index a6ab5b58d9ca..1072e847280f 100644
--- a/drivers/usb/serial/empeg.c
+++ b/drivers/usb/serial/empeg.c
@@ -33,9 +33,8 @@
  *      Moved MOD_DEC_USE_COUNT to end of empeg_close().
  *
  * (12/03/2000) gb
- *      Added port->port.tty->ldisc.set_termios(port->port.tty, NULL) to
- *      empeg_open(). This notifies the tty driver that the termios have
- *      changed.
+ *      Added tty->ldisc.set_termios(port, tty, NULL) to empeg_open().
+ *      This notifies the tty driver that the termios have changed.
  *
  * (11/13/2000) gb
  *      Moved tty->low_latency = 1 from empeg_read_bulk_callback() to
@@ -354,7 +353,7 @@ static void empeg_read_bulk_callback(struct urb *urb)
 
         usb_serial_debug_data(debug, &port->dev, __func__,
                                                 urb->actual_length, data);
-        tty = port->port.tty;
+        tty = tty_port_tty_get(&port->port);
 
         if (urb->actual_length) {
                 tty_buffer_request_room(tty, urb->actual_length);
@@ -362,6 +361,7 @@ static void empeg_read_bulk_callback(struct urb *urb)
                 tty_flip_buffer_push(tty);
                 bytes_in += urb->actual_length;
         }
+        tty_kref_put(tty);
 
         /* Continue trying to always read  */
         usb_fill_bulk_urb(
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 3dc93b542b30..c2ac129557aa 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -860,7 +860,7 @@ static int update_mctrl(struct usb_serial_port *port, unsigned int set,
 
         kfree(buf);
         if (rv < 0) {
-                err("%s Error from MODEM_CTRL urb: DTR %s, RTS %s",
+                dbg("%s Error from MODEM_CTRL urb: DTR %s, RTS %s",
                                 __func__,
                                 (set & TIOCM_DTR) ? "HIGH" :
                                 (clear & TIOCM_DTR) ? "LOW" : "unchanged",
@@ -1808,7 +1808,7 @@ static void ftdi_read_bulk_callback(struct urb *urb)
         if (port->port.count <= 0)
                 return;
 
-        tty = port->port.tty;
+        tty = tty_port_tty_get(&port->port);
         if (!tty) {
                 dbg("%s - bad tty pointer - exiting", __func__);
                 return;
@@ -1817,7 +1817,7 @@ static void ftdi_read_bulk_callback(struct urb *urb)
         priv = usb_get_serial_port_data(port);
         if (!priv) {
                 dbg("%s - bad port private data pointer - exiting", __func__);
-                return;
+                goto out;
         }
 
         if (urb != port->read_urb)
@@ -1827,7 +1827,7 @@ static void ftdi_read_bulk_callback(struct urb *urb)
                 /* This will happen at close every time so it is a dbg not an
                    err */
                 dbg("(this is ok on close) nonzero read bulk status received: %d", status);
-                return;
+                goto out;
         }
 
         /* count data bytes, but not status bytes */
@@ -1838,7 +1838,8 @@ static void ftdi_read_bulk_callback(struct urb *urb)
         spin_unlock_irqrestore(&priv->rx_lock, flags);
 
         ftdi_process_read(&priv->rx_work.work);
-
+out:
+        tty_kref_put(tty);
 } /* ftdi_read_bulk_callback */
 
 
@@ -1863,7 +1864,7 @@ static void ftdi_process_read(struct work_struct *work)
         if (port->port.count <= 0)
                 return;
 
-        tty = port->port.tty;
+        tty = tty_port_tty_get(&port->port);
         if (!tty) {
                 dbg("%s - bad tty pointer - exiting", __func__);
                 return;
@@ -1872,13 +1873,13 @@ static void ftdi_process_read(struct work_struct *work)
         priv = usb_get_serial_port_data(port);
         if (!priv) {
                 dbg("%s - bad port private data pointer - exiting", __func__);
-                return;
+                goto out;
         }
 
         urb = port->read_urb;
         if (!urb) {
                 dbg("%s - bad read_urb pointer - exiting", __func__);
-                return;
+                goto out;
         }
 
         data = urb->transfer_buffer;
@@ -2020,7 +2021,7 @@ static void ftdi_process_read(struct work_struct *work)
                         schedule_delayed_work(&priv->rx_work, 1);
                 else
                         dbg("%s - port is closed", __func__);
-                return;
+                goto out;
         }
 
         /* urb is completely processed */
@@ -2041,6 +2042,8 @@ static void ftdi_process_read(struct work_struct *work)
                         err("%s - failed resubmitting read urb, error %d",
                                                         __func__, result);
         }
+out:
+        tty_kref_put(tty);
 } /* ftdi_process_read */
 
 
@@ -2256,7 +2259,7 @@ static int ftdi_tiocmget(struct tty_struct *tty, struct file *file)
                            0, 0,
                            buf, 1, WDR_TIMEOUT);
                 if (ret < 0) {
-                        err("%s Could not get modem status of device - err: %d", __func__,
+                        dbg("%s Could not get modem status of device - err: %d", __func__,
                             ret);
                         return ret;
                 }
@@ -2275,7 +2278,7 @@ static int ftdi_tiocmget(struct tty_struct *tty, struct file *file)
                                    0, priv->interface,
                                    buf, 2, WDR_TIMEOUT);
                 if (ret < 0) {
-                        err("%s Could not get modem status of device - err: %d", __func__,
+                        dbg("%s Could not get modem status of device - err: %d", __func__,
                             ret);
                         return ret;
                 }
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index d95382088075..2ad0569bcf19 100644
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -276,7 +276,7 @@ static inline int isAbortTrfCmnd(const unsigned char *buf)
 static void send_to_tty(struct usb_serial_port *port,
                         char *data, unsigned int actual_length)
 {
-        struct tty_struct *tty = port->port.tty;
+        struct tty_struct *tty = tty_port_tty_get(&port->port);
 
         if (tty && actual_length) {
 
@@ -287,6 +287,7 @@ static void send_to_tty(struct usb_serial_port *port,
                 tty_insert_flip_string(tty, data, actual_length);
                 tty_flip_buffer_push(tty);
         }
+        tty_kref_put(tty);
 }
 
 
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index fe84c88ec20c..814909f1ee63 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -330,7 +330,7 @@ static void resubmit_read_urb(struct usb_serial_port *port, gfp_t mem_flags)
 static void flush_and_resubmit_read_urb(struct usb_serial_port *port)
 {
         struct urb *urb = port->read_urb;
-        struct tty_struct *tty = port->port.tty;
+        struct tty_struct *tty = tty_port_tty_get(&port->port);
         int room;
 
         /* Push data to tty */
@@ -341,6 +341,7 @@ static void flush_and_resubmit_read_urb(struct usb_serial_port *port)
                         tty_flip_buffer_push(tty);
                 }
         }
+        tty_kref_put(tty);
 
         resubmit_read_urb(port, GFP_ATOMIC);
 }
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index bfa508ddb0fe..611f97fd62f1 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -600,6 +600,7 @@ static void edge_interrupt_callback(struct urb *urb)
         struct edgeport_serial  *edge_serial = urb->context;
         struct edgeport_port *edge_port;
         struct usb_serial_port *port;
+        struct tty_struct *tty;
         unsigned char *data = urb->transfer_buffer;
         int length = urb->actual_length;
         int bytes_avail;
@@ -675,9 +676,12 @@ static void edge_interrupt_callback(struct urb *urb)
 
                                         /* tell the tty driver that something
                                            has changed */
-                                        if (edge_port->port->port.tty)
-                                                tty_wakeup(edge_port->port->port.tty);
-
+                                        tty = tty_port_tty_get(
+                                                &edge_port->port->port);
+                                        if (tty) {
+                                                tty_wakeup(tty);
+                                                tty_kref_put(tty);
+                                        }
                                         /* Since we have more credit, check
                                            if more data can be sent */
                                         send_more_port_data(edge_serial,
@@ -778,13 +782,14 @@ static void edge_bulk_out_data_callback(struct urb *urb)
                     __func__, status);
         }
 
-        tty = edge_port->port->port.tty;
+        tty = tty_port_tty_get(&edge_port->port->port);
 
         if (tty && edge_port->open) {
                 /* let the tty driver wakeup if it has a special
                    write_wakeup function */
                 tty_wakeup(tty);
         }
+        tty_kref_put(tty);
 
         /* Release the Write URB */
         edge_port->write_in_progress = false;
@@ -826,11 +831,12 @@ static void edge_bulk_out_cmd_callback(struct urb *urb)
         }
 
         /* Get pointer to tty */
-        tty = edge_port->port->port.tty;
+        tty = tty_port_tty_get(&edge_port->port->port);
 
         /* tell the tty driver that something has changed */
         if (tty && edge_port->open)
                 tty_wakeup(tty);
+        tty_kref_put(tty);
 
         /* we have completed the command */
         edge_port->commandPending = false;
@@ -1932,11 +1938,13 @@ static void process_rcvd_data(struct edgeport_serial *edge_serial,
                                                         edge_serial->rxPort];
                                 edge_port = usb_get_serial_port_data(port);
                                 if (edge_port->open) {
-                                        tty = edge_port->port->port.tty;
+                                        tty = tty_port_tty_get(
+                                                &edge_port->port->port);
                                         if (tty) {
                                                 dbg("%s - Sending %d bytes to TTY for port %d",
                                                         __func__, rxLen, edge_serial->rxPort);
                                                 edge_tty_recv(&edge_serial->serial->dev->dev, tty, buffer, rxLen);
+                                                tty_kref_put(tty);
                                         }
                                         edge_port->icount.rx += rxLen;
                                 }
@@ -1971,6 +1979,7 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial,
 {
         struct usb_serial_port *port;
         struct edgeport_port *edge_port;
+        struct tty_struct *tty;
         __u8 code = edge_serial->rxStatusCode;
 
         /* switch the port pointer to the one being currently talked about */
@@ -2020,10 +2029,12 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial,
 
                 /* send the current line settings to the port so we are
                    in sync with any further termios calls */
-                /* FIXME: locking on tty */
-                if (edge_port->port->port.tty)
-                        change_port_settings(edge_port->port->port.tty,
-                                edge_port, edge_port->port->port.tty->termios);
+                tty = tty_port_tty_get(&edge_port->port->port);
+                if (tty) {
+                        change_port_settings(tty,
+                                edge_port, tty->termios);
+                        tty_kref_put(tty);
+                }
 
                 /* we have completed the open */
                 edge_port->openPending = false;
@@ -2163,10 +2174,14 @@ static void handle_new_lsr(struct edgeport_port *edge_port, __u8 lsrData,
         }
 
         /* Place LSR data byte into Rx buffer */
-        if (lsrData && edge_port->port->port.tty)
-                edge_tty_recv(&edge_port->port->dev,
-                                        edge_port->port->port.tty, &data, 1);
-
+        if (lsrData) {
+                struct tty_struct *tty =
+                                tty_port_tty_get(&edge_port->port->port);
+                if (tty) {
+                        edge_tty_recv(&edge_port->port->dev, tty, &data, 1);
+                        tty_kref_put(tty);
+                }
+        }
         /* update input line counters */
         icount = &edge_port->icount;
         if (newLsr & LSR_BREAK)
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index cb4c54316cf5..541dd8e6e7a2 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -572,7 +572,7 @@ static void chase_port(struct edgeport_port *port, unsigned long timeout,
                                                                 int flush)
 {
         int baud_rate;
-        struct tty_struct *tty = port->port->port.tty;
+        struct tty_struct *tty = tty_port_tty_get(&port->port->port);
         wait_queue_t wait;
         unsigned long flags;
 
@@ -599,6 +599,7 @@ static void chase_port(struct edgeport_port *port, unsigned long timeout,
         if (flush)
                 edge_buf_clear(port->ep_out_buf);
         spin_unlock_irqrestore(&port->ep_lock, flags);
+        tty_kref_put(tty);
 
         /* wait for data to drain from the device */
         timeout += jiffies;
@@ -1554,7 +1555,7 @@ static void handle_new_msr(struct edgeport_port *edge_port, __u8 msr)
         /* Save the new modem status */
         edge_port->shadow_msr = msr & 0xf0;
 
-        tty = edge_port->port->port.tty;
+        tty = tty_port_tty_get(&edge_port->port->port);
         /* handle CTS flow control */
         if (tty && C_CRTSCTS(tty)) {
                 if (msr & EDGEPORT_MSR_CTS) {
@@ -1564,6 +1565,7 @@ static void handle_new_msr(struct edgeport_port *edge_port, __u8 msr)
                         tty->hw_stopped = 1;
                 }
         }
+        tty_kref_put(tty);
 
         return;
 }
@@ -1574,6 +1576,7 @@ static void handle_new_lsr(struct edgeport_port *edge_port, int lsr_data,
         struct async_icount *icount;
         __u8 new_lsr = (__u8)(lsr & (__u8)(LSR_OVER_ERR | LSR_PAR_ERR |
                                                 LSR_FRM_ERR | LSR_BREAK));
+        struct tty_struct *tty;
 
         dbg("%s - %02x", __func__, new_lsr);
 
@@ -1587,8 +1590,13 @@ static void handle_new_lsr(struct edgeport_port *edge_port, int lsr_data,
                 new_lsr &= (__u8)(LSR_OVER_ERR | LSR_BREAK);
 
         /* Place LSR data byte into Rx buffer */
-        if (lsr_data && edge_port->port->port.tty)
-                edge_tty_recv(&edge_port->port->dev, edge_port->port->port.tty, &data, 1);
+        if (lsr_data) {
+                tty = tty_port_tty_get(&edge_port->port->port);
+                if (tty) {
+                        edge_tty_recv(&edge_port->port->dev, tty, &data, 1);
+                        tty_kref_put(tty);
+                }
+        }
 
         /* update input line counters */
         icount = &edge_port->icount;
@@ -1749,7 +1757,7 @@ static void edge_bulk_in_callback(struct urb *urb)
                 ++data;
         }
 
-        tty = edge_port->port->port.tty;
+        tty = tty_port_tty_get(&edge_port->port->port);
         if (tty && urb->actual_length) {
                 usb_serial_debug_data(debug, &edge_port->port->dev,
                                         __func__, urb->actual_length, data);
@@ -1761,6 +1769,7 @@ static void edge_bulk_in_callback(struct urb *urb)
                                                         urb->actual_length);
                 edge_port->icount.rx += urb->actual_length;
         }
+        tty_kref_put(tty);
 
 exit:
         /* continue read unless stopped */
@@ -1796,6 +1805,7 @@ static void edge_bulk_out_callback(struct urb *urb)
         struct usb_serial_port *port = urb->context;
         struct edgeport_port *edge_port = usb_get_serial_port_data(port);
         int status = urb->status;
+        struct tty_struct *tty;
 
         dbg("%s - port %d", __func__, port->number);
 
@@ -1818,7 +1828,9 @@ static void edge_bulk_out_callback(struct urb *urb)
         }
 
         /* send any buffered data */
-        edge_send(port->port.tty);
+        tty = tty_port_tty_get(&port->port);
+        edge_send(tty);
+        tty_kref_put(tty);
 }
 
 static int edge_open(struct tty_struct *tty,
@@ -1876,7 +1888,7 @@ static int edge_open(struct tty_struct *tty,
 
         /* set up the port settings */
         if (tty)
-                edge_set_termios(tty, port, port->port.tty->termios);
+                edge_set_termios(tty, port, tty->termios);
 
         /* open up the port */
 
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index cd9a2e138c8b..2affa9c118b2 100644
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -764,13 +764,14 @@ static void ipaq_read_bulk_callback(struct urb *urb)
         usb_serial_debug_data(debug, &port->dev, __func__,
                                                 urb->actual_length, data);
 
-        tty = port->port.tty;
+        tty = tty_port_tty_get(&port->port);
         if (tty && urb->actual_length) {
                 tty_buffer_request_room(tty, urb->actual_length);
                 tty_insert_flip_string(tty, data, urb->actual_length);
                 tty_flip_buffer_push(tty);
                 bytes_in += urb->actual_length;
         }
+        tty_kref_put(tty);
 
         /* Continue trying to always read  */
         usb_fill_bulk_urb(port->read_urb, port->serial->dev,
diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c
index a842025b9b57..480cac27d646 100644
--- a/drivers/usb/serial/ipw.c
+++ b/drivers/usb/serial/ipw.c
@@ -170,12 +170,13 @@ static void ipw_read_bulk_callback(struct urb *urb)
         usb_serial_debug_data(debug, &port->dev, __func__,
                                         urb->actual_length, data);
 
-        tty = port->port.tty;
+        tty = tty_port_tty_get(&port->port);
         if (tty && urb->actual_length) {
                 tty_buffer_request_room(tty, urb->actual_length);
                 tty_insert_flip_string(tty, data, urb->actual_length);
                 tty_flip_buffer_push(tty);
         }
+        tty_kref_put(tty);
 
         /* Continue trying to always read  */
         usb_fill_bulk_urb(port->read_urb, port->serial->dev,
diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c
index e59155c6607d..45d4043e04ab 100644
--- a/drivers/usb/serial/ir-usb.c
+++ b/drivers/usb/serial/ir-usb.c
@@ -465,11 +465,12 @@ static void ir_read_bulk_callback(struct urb *urb)
                         ir_baud = *data & 0x0f;
                 usb_serial_debug_data(debug, &port->dev, __func__,
                                                 urb->actual_length, data);
-                tty = port->port.tty;
+                tty = tty_port_tty_get(&port->port);
                 if (tty_buffer_request_room(tty, urb->actual_length - 1)) {
                         tty_insert_flip_string(tty, data+1, urb->actual_length - 1);
                         tty_flip_buffer_push(tty);
                 }
+                tty_kref_put(tty);
 
                 /*
                  * No break here.
diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c
index ddff37fa6339..53710aa7eadd 100644
--- a/drivers/usb/serial/iuu_phoenix.c
+++ b/drivers/usb/serial/iuu_phoenix.c
@@ -629,13 +629,14 @@ static void read_buf_callback(struct urb *urb)
         }
 
         dbg("%s - %i chars to write", __func__, urb->actual_length);
-        tty = port->port.tty;
+        tty = tty_port_tty_get(&port->port);
         if (data == NULL)
                 dbg("%s - data is NULL !!!", __func__);
         if (tty && urb->actual_length && data) {
                 tty_insert_flip_string(tty, data, urb->actual_length);
                 tty_flip_buffer_push(tty);
         }
+        tty_kref_put(tty);
         iuu_led_activity_on(urb);
 }
 
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index 704716f6f6d3..15447af48691 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -430,7 +430,7 @@ static void	usa26_indat_callback(struct urb *urb)
         }
 
         port =  urb->context;
-        tty = port->port.tty;
+        tty = tty_port_tty_get(&port->port);
         if (tty && urb->actual_length) {
                 /* 0x80 bit is error flag */
                 if ((data[0] & 0x80) == 0) {
@@ -459,6 +459,7 @@ static void	usa26_indat_callback(struct urb *urb)
                 }
                 tty_flip_buffer_push(tty);
         }
+        tty_kref_put(tty);
 
         /* Resubmit urb so we continue receiving */
         urb->dev = port->serial->dev;
@@ -513,6 +514,7 @@ static void	usa26_instat_callback(struct urb *urb)
         struct usb_serial                       *serial;
         struct usb_serial_port                  *port;
         struct keyspan_port_private             *p_priv;
+        struct tty_struct                       *tty;
         int old_dcd_state, err;
         int status = urb->status;
 
@@ -553,12 +555,11 @@ static void	usa26_instat_callback(struct urb *urb)
         p_priv->dcd_state = ((msg->gpia_dcd) ? 1 : 0);
         p_priv->ri_state = ((msg->ri) ? 1 : 0);
 
-        if (port->port.tty && !C_CLOCAL(port->port.tty)
-            && old_dcd_state != p_priv->dcd_state) {
-                if (old_dcd_state)
-                        tty_hangup(port->port.tty);
-                /*  else */
-                /*      wake_up_interruptible(&p_priv->open_wait); */
+        if (old_dcd_state != p_priv->dcd_state) {
+                tty = tty_port_tty_get(&port->port);
+                if (tty && !C_CLOCAL(tty))
+                        tty_hangup(tty);
+                tty_kref_put(tty);
         }
 
         /* Resubmit urb so we continue receiving */
@@ -604,11 +605,12 @@ static void usa28_indat_callback(struct urb *urb)
                 p_priv = usb_get_serial_port_data(port);
                 data = urb->transfer_buffer;
 
-                tty = port->port.tty;
-                if (urb->actual_length) {
+                tty =tty_port_tty_get(&port->port);
+                if (tty && urb->actual_length) {
                         tty_insert_flip_string(tty, data, urb->actual_length);
                         tty_flip_buffer_push(tty);
                 }
+                tty_kref_put(tty);
 
                 /* Resubmit urb so we continue receiving */
                 urb->dev = port->serial->dev;
@@ -652,6 +654,7 @@ static void	usa28_instat_callback(struct urb *urb)
         struct usb_serial                       *serial;
         struct usb_serial_port                  *port;
         struct keyspan_port_private             *p_priv;
+        struct tty_struct                       *tty;
         int old_dcd_state;
         int status = urb->status;
 
@@ -689,12 +692,11 @@ static void	usa28_instat_callback(struct urb *urb)
         p_priv->dcd_state = ((msg->dcd) ? 1 : 0);
         p_priv->ri_state = ((msg->ri) ? 1 : 0);
 
-        if (port->port.tty && !C_CLOCAL(port->port.tty)
-            && old_dcd_state != p_priv->dcd_state) {
-                if (old_dcd_state)
-                        tty_hangup(port->port.tty);
-                /*  else */
-                /*      wake_up_interruptible(&p_priv->open_wait); */
+        if( old_dcd_state != p_priv->dcd_state && old_dcd_state) {
+                tty = tty_port_tty_get(&port->port);
+                if (tty && !C_CLOCAL(tty)) 
+                        tty_hangup(tty);
+                tty_kref_put(tty);
         }
 
                 /* Resubmit urb so we continue receiving */
@@ -785,12 +787,11 @@ static void	usa49_instat_callback(struct urb *urb)
         p_priv->dcd_state = ((msg->dcd) ? 1 : 0);
         p_priv->ri_state = ((msg->ri) ? 1 : 0);
 
-        if (port->port.tty && !C_CLOCAL(port->port.tty)
-            && old_dcd_state != p_priv->dcd_state) {
-                if (old_dcd_state)
-                        tty_hangup(port->port.tty);
-                /*  else */
-                /*      wake_up_interruptible(&p_priv->open_wait); */
+        if (old_dcd_state != p_priv->dcd_state && old_dcd_state) {
+                struct tty_struct *tty = tty_port_tty_get(&port->port);
+                if (tty && !C_CLOCAL(tty))
+                        tty_hangup(tty);
+                tty_kref_put(tty);
         }
 
         /* Resubmit urb so we continue receiving */
@@ -827,7 +828,7 @@ static void	usa49_indat_callback(struct urb *urb)
         }
 
         port =  urb->context;
-        tty = port->port.tty;
+        tty = tty_port_tty_get(&port->port);
         if (tty && urb->actual_length) {
                 /* 0x80 bit is error flag */
                 if ((data[0] & 0x80) == 0) {
@@ -850,6 +851,7 @@ static void	usa49_indat_callback(struct urb *urb)
                 }
                 tty_flip_buffer_push(tty);
         }
+        tty_kref_put(tty);
 
         /* Resubmit urb so we continue receiving */
         urb->dev = port->serial->dev;
@@ -893,7 +895,7 @@ static void usa49wg_indat_callback(struct urb *urb)
                                 return;
                         }
                         port = serial->port[data[i++]];
-                        tty = port->port.tty;
+                        tty = tty_port_tty_get(&port->port);
                         len = data[i++];
 
                         /* 0x80 bit is error flag */
@@ -927,6 +929,7 @@ static void usa49wg_indat_callback(struct urb *urb)
                         }
                         if (port->port.count)
                                 tty_flip_buffer_push(tty);
+                        tty_kref_put(tty);
                 }
         }
 
@@ -967,8 +970,8 @@ static void usa90_indat_callback(struct urb *urb)
         port =  urb->context;
         p_priv = usb_get_serial_port_data(port);
 
-        tty = port->port.tty;
         if (urb->actual_length) {
+                tty = tty_port_tty_get(&port->port);
                 /* if current mode is DMA, looks like usa28 format
                    otherwise looks like usa26 data format */
 
@@ -1004,6 +1007,7 @@ static void usa90_indat_callback(struct urb *urb)
                         }
                 }
                 tty_flip_buffer_push(tty);
+                tty_kref_put(tty);
         }
 
         /* Resubmit urb so we continue receiving */
@@ -1025,6 +1029,7 @@ static void	usa90_instat_callback(struct urb *urb)
         struct usb_serial                       *serial;
         struct usb_serial_port                  *port;
         struct keyspan_port_private             *p_priv;
+        struct tty_struct                       *tty;
         int old_dcd_state, err;
         int status = urb->status;
 
@@ -1053,12 +1058,11 @@ static void	usa90_instat_callback(struct urb *urb)
         p_priv->dcd_state = ((msg->dcd) ? 1 : 0);
         p_priv->ri_state = ((msg->ri) ? 1 : 0);
 
-        if (port->port.tty && !C_CLOCAL(port->port.tty)
-            && old_dcd_state != p_priv->dcd_state) {
-                if (old_dcd_state)
-                        tty_hangup(port->port.tty);
-                /*  else */
-                /*      wake_up_interruptible(&p_priv->open_wait); */
+        if (old_dcd_state != p_priv->dcd_state && old_dcd_state) {
+                tty = tty_port_tty_get(&port->port);
+                if (tty && !C_CLOCAL(tty))
+                        tty_hangup(tty);
+                tty_kref_put(tty);
         }
 
         /* Resubmit urb so we continue receiving */
@@ -1130,12 +1134,11 @@ static void	usa67_instat_callback(struct urb *urb)
         p_priv->cts_state = ((msg->hskia_cts) ? 1 : 0);
         p_priv->dcd_state = ((msg->gpia_dcd) ? 1 : 0);
 
-        if (port->port.tty && !C_CLOCAL(port->port.tty)
-            && old_dcd_state != p_priv->dcd_state) {
-                if (old_dcd_state)
-                        tty_hangup(port->port.tty);
-                /*  else */
-                /*      wake_up_interruptible(&p_priv->open_wait); */
+        if (old_dcd_state != p_priv->dcd_state && old_dcd_state) {
+                struct tty_struct *tty = tty_port_tty_get(&port->port);
+                if (tty && !C_CLOCAL(tty))
+                        tty_hangup(tty);
+                tty_kref_put(tty);
         }
 
         /* Resubmit urb so we continue receiving */
@@ -1332,7 +1335,7 @@ static void keyspan_close(struct tty_struct *tty,
                         stop_urb(p_priv->out_urbs[i]);
                 }
         }
-        port->port.tty = NULL;
+        tty_port_tty_set(&port->port, NULL);
 }
 
 /* download the firmware to a pre-renumeration device */
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index 040040a267d9..99e9a14c5bf6 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -172,8 +172,9 @@ static void keyspan_pda_wakeup_write(struct work_struct *work)
         struct keyspan_pda_private *priv =
                 container_of(work, struct keyspan_pda_private, wakeup_work);
         struct usb_serial_port *port = priv->port;
-
-        tty_wakeup(port->port.tty);
+        struct tty_struct *tty = tty_port_tty_get(&port->port);
+        tty_wakeup(tty);
+        tty_kref_put(tty);
 }
 
 static void keyspan_pda_request_unthrottle(struct work_struct *work)
@@ -205,7 +206,7 @@ static void keyspan_pda_request_unthrottle(struct work_struct *work)
 static void keyspan_pda_rx_interrupt(struct urb *urb)
 {
         struct usb_serial_port *port = urb->context;
-        struct tty_struct *tty = port->port.tty;
+        struct tty_struct *tty = tty_port_tty_get(&port->port);
         unsigned char *data = urb->transfer_buffer;
         int retval;
         int status = urb->status;
@@ -222,7 +223,7 @@ static void keyspan_pda_rx_interrupt(struct urb *urb)
                 /* this urb is terminated, clean up */
                 dbg("%s - urb shutting down with status: %d",
                     __func__, status);
-                return;
+                goto out;
         default:
                 dbg("%s - nonzero urb status received: %d",
                     __func__, status);
@@ -261,8 +262,11 @@ static void keyspan_pda_rx_interrupt(struct urb *urb)
 exit:
         retval = usb_submit_urb(urb, GFP_ATOMIC);
         if (retval)
-                err("%s - usb_submit_urb failed with result %d",
-                     __func__, retval);
+                dev_err(&port->dev,
+                        "%s - usb_submit_urb failed with result %d",
+                        __func__, retval);
+out:
+        tty_kref_put(tty);                   
 }
 
 
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index b84dddc71124..ff3a07f5102f 100644
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -658,7 +658,7 @@ static void klsi_105_read_bulk_callback(struct urb *urb)
         } else {
                 int bytes_sent = ((__u8 *) data)[0] +
                                  ((unsigned int) ((__u8 *) data)[1] << 8);
-                tty = port->port.tty;
+                tty = tty_port_tty_get(&port->port);
                 /* we should immediately resubmit the URB, before attempting
                  * to pass the data on to the tty layer. But that needs locking
                  * against re-entry an then mixed-up data because of
@@ -679,6 +679,7 @@ static void klsi_105_read_bulk_callback(struct urb *urb)
                 tty_buffer_request_room(tty, bytes_sent);
                 tty_insert_flip_string(tty, data + 2, bytes_sent);
                 tty_flip_buffer_push(tty);
+                tty_kref_put(tty);
 
                 /* again lockless, but debug info only */
                 priv->bytes_in += bytes_sent;
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
index deba28ec77e8..cfcf37c2b957 100644
--- a/drivers/usb/serial/kobil_sct.c
+++ b/drivers/usb/serial/kobil_sct.c
@@ -383,7 +383,7 @@ static void kobil_read_int_callback(struct urb *urb)
                 return;
         }
 
-        tty = port->port.tty;
+        tty = tty_port_tty_get(&port->port);
         if (urb->actual_length) {
 
                 /* BEGIN DEBUG */
@@ -405,6 +405,7 @@ static void kobil_read_int_callback(struct urb *urb)
                 tty_insert_flip_string(tty, data, urb->actual_length);
                 tty_flip_buffer_push(tty);
         }
+        tty_kref_put(tty);
         /* someone sets the dev to 0 if the close method has been called */
         port->interrupt_in_urb->dev = port->serial->dev;
 
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index 0ded8bd6ec85..9b2cef81cde0 100644
--- a/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@ -563,10 +563,11 @@ static void mct_u232_read_int_callback(struct urb *urb)
          * Work-a-round: handle the 'usual' bulk-in pipe here
          */
         if (urb->transfer_buffer_length > 2) {
-                tty = port->port.tty;
+                tty = tty_port_tty_get(&port->port);
                 if (urb->actual_length) {
                         tty_insert_flip_string(tty, data, urb->actual_length);
                         tty_flip_buffer_push(tty);
+                        tty_kref_put(tty);
                 }
                 goto exit;
         }
@@ -591,7 +592,7 @@ static void mct_u232_read_int_callback(struct urb *urb)
          * to look in to this before committing any code.
          */
         if (priv->last_lsr & MCT_U232_LSR_ERR) {
-                tty = port->port.tty;
+                tty = tty_port_tty_get(&port->port);
                 /* Overrun Error */
                 if (priv->last_lsr & MCT_U232_LSR_OE) {
                 }
@@ -604,6 +605,7 @@ static void mct_u232_read_int_callback(struct urb *urb)
                 /* Break Indicator */
                 if (priv->last_lsr & MCT_U232_LSR_BI) {
                 }
+                tty_kref_put(tty);
         }
 #endif
         spin_unlock_irqrestore(&priv->lock, flags);
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index 7c4917d77c0a..7b538caec37f 100644
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -216,12 +216,13 @@ static void mos7720_bulk_in_callback(struct urb *urb)
 
         data = urb->transfer_buffer;
 
-        tty = port->port.tty;
+        tty = tty_port_tty_get(&port->port);
         if (tty && urb->actual_length) {
                 tty_buffer_request_room(tty, urb->actual_length);
                 tty_insert_flip_string(tty, data, urb->actual_length);
                 tty_flip_buffer_push(tty);
         }
+        tty_kref_put(tty);
 
         if (!port->read_urb) {
                 dbg("URB KILLED !!!");
@@ -262,10 +263,11 @@ static void mos7720_bulk_out_data_callback(struct urb *urb)
 
         dbg("Entering .........");
 
-        tty = mos7720_port->port->port.tty;
+        tty = tty_port_tty_get(&mos7720_port->port->port);
 
         if (tty && mos7720_port->open)
                 tty_wakeup(tty);
+        tty_kref_put(tty);
 }
 
 /*
@@ -1267,29 +1269,6 @@ static int get_lsr_info(struct tty_struct *tty,
         return 0;
 }
 
-/*
- * get_number_bytes_avail - get number of bytes available
- *
- * Purpose: Let user call ioctl to get the count of number of bytes available.
- */
-static int get_number_bytes_avail(struct moschip_port *mos7720_port,
-                                  unsigned int __user *value)
-{
-        unsigned int result = 0;
-        struct tty_struct *tty = mos7720_port->port->port.tty;
-
-        if (!tty)
-                return -ENOIOCTLCMD;
-
-        result = tty->read_cnt;
-
-        dbg("%s(%d) = %d", __func__,  mos7720_port->port->number, result);
-        if (copy_to_user(value, &result, sizeof(int)))
-                return -EFAULT;
-
-        return -ENOIOCTLCMD;
-}
-
 static int set_modem_info(struct moschip_port *mos7720_port, unsigned int cmd,
                           unsigned int __user *value)
 {
@@ -1409,13 +1388,6 @@ static int mos7720_ioctl(struct tty_struct *tty, struct file *file,
         dbg("%s - port %d, cmd = 0x%x", __func__, port->number, cmd);
 
         switch (cmd) {
-        case TIOCINQ:
-                /* return number of bytes available */
-                dbg("%s (%d) TIOCINQ", __func__,  port->number);
-                return get_number_bytes_avail(mos7720_port,
-                                              (unsigned int __user *)arg);
-                break;
-
         case TIOCSERGETLSR:
                 dbg("%s (%d) TIOCSERGETLSR", __func__,  port->number);
                 return get_lsr_info(tty, mos7720_port,
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index 09d82062b973..60543d79ef56 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -709,12 +709,13 @@ static void mos7840_bulk_in_callback(struct urb *urb)
         dbg("%s", "Entering ........... \n");
 
         if (urb->actual_length) {
-                tty = mos7840_port->port->port.tty;
+                tty = tty_port_tty_get(&mos7840_port->port->port);
                 if (tty) {
                         tty_buffer_request_room(tty, urb->actual_length);
                         tty_insert_flip_string(tty, data, urb->actual_length);
                         dbg(" %s \n", data);
                         tty_flip_buffer_push(tty);
+                        tty_kref_put(tty);
                 }
                 mos7840_port->icount.rx += urb->actual_length;
                 smp_wmb();
@@ -773,10 +774,10 @@ static void mos7840_bulk_out_data_callback(struct urb *urb)
 
         dbg("%s \n", "Entering .........");
 
-        tty = mos7840_port->port->port.tty;
-
+        tty = tty_port_tty_get(&mos7840_port->port->port);
         if (tty && mos7840_port->open)
                 tty_wakeup(tty);
+        tty_kref_put(tty);
 
 }
 
diff --git a/drivers/usb/serial/navman.c b/drivers/usb/serial/navman.c
index d6736531a0fa..bcdcbb822705 100644
--- a/drivers/usb/serial/navman.c
+++ b/drivers/usb/serial/navman.c
@@ -64,12 +64,13 @@ static void navman_read_int_callback(struct urb *urb)
         usb_serial_debug_data(debug, &port->dev, __func__,
                               urb->actual_length, data);
 
-        tty = port->port.tty;
+        tty = tty_port_tty_get(&port->port);
         if (tty && urb->actual_length) {
                 tty_buffer_request_room(tty, urb->actual_length);
                 tty_insert_flip_string(tty, data, urb->actual_length);
                 tty_flip_buffer_push(tty);
         }
+        tty_kref_put(tty);
 
 exit:
         result = usb_submit_urb(urb, GFP_ATOMIC);
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index ae8e227f3db2..c4d70b0f1e48 100644
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -172,7 +172,7 @@ static int omninet_open(struct tty_struct *tty,
         dbg("%s - port %d", __func__, port->number);
 
         wport = serial->port[1];
-        wport->port.tty = tty;          /* FIXME */
+        tty_port_tty_set(&wport->port, tty);
 
         /* Start reading from the device */
         usb_fill_bulk_urb(port->read_urb, serial->dev,
@@ -229,9 +229,11 @@ static void omninet_read_bulk_callback(struct urb *urb)
         }
 
         if (urb->actual_length && header->oh_len) {
-                tty_insert_flip_string(port->port.tty,
-                        data + OMNINET_DATAOFFSET, header->oh_len);
-                tty_flip_buffer_push(port->port.tty);
+                struct tty_struct *tty = tty_port_tty_get(&port->port);
+                tty_insert_flip_string(tty, data + OMNINET_DATAOFFSET,
+                                                        header->oh_len);
+                tty_flip_buffer_push(tty);
+                tty_kref_put(tty);
         }
 
         /* Continue trying to always read  */
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 73f8277f88f2..6b1727e751e3 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -571,14 +571,14 @@ static void option_indat_callback(struct urb *urb)
                 dbg("%s: nonzero status: %d on endpoint %02x.",
                     __func__, status, endpoint);
         } else {
-                tty = port->port.tty;
+                tty = tty_port_tty_get(&port->port);
                 if (urb->actual_length) {
                         tty_buffer_request_room(tty, urb->actual_length);
                         tty_insert_flip_string(tty, data, urb->actual_length);
                         tty_flip_buffer_push(tty);
-                } else {
+                } else 
                         dbg("%s: empty read urb received", __func__);
-                }
+                tty_kref_put(tty);
 
                 /* Resubmit urb so we continue receiving */
                 if (port->port.count && status != -ESHUTDOWN) {
@@ -647,9 +647,13 @@ static void option_instat_callback(struct urb *urb)
                         portdata->dsr_state = ((signals & 0x02) ? 1 : 0);
                         portdata->ri_state = ((signals & 0x08) ? 1 : 0);
 
-                        if (port->port.tty && !C_CLOCAL(port->port.tty) &&
-                                        old_dcd_state && !portdata->dcd_state)
-                                tty_hangup(port->port.tty);
+                        if (old_dcd_state && !portdata->dcd_state) {
+                                struct tty_struct *tty =
+                                                tty_port_tty_get(&port->port);
+                                if (tty && !C_CLOCAL(tty))
+                                        tty_hangup(tty);
+                                tty_kref_put(tty);
+                        }
                 } else {
                         dbg("%s: type %x req %x", __func__,
                                 req_pkt->bRequestType, req_pkt->bRequest);
@@ -793,7 +797,7 @@ static void option_close(struct tty_struct *tty,
                 for (i = 0; i < N_OUT_URB; i++)
                         usb_kill_urb(portdata->out_urbs[i]);
         }
-        port->port.tty = NULL;  /* FIXME */
+        tty_port_tty_set(&port->port, NULL);
 }
 
 /* Helper functions used by option_setup_urbs */
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index 81db5715ee25..ba551f00f16f 100644
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -224,10 +224,6 @@ struct oti6858_private {
         struct usb_serial_port *port;   /* USB port with which associated */
 };
 
-#undef dbg
-/* #define dbg(format, arg...) printk(KERN_INFO "%s: " format "\n", __FILE__, ## arg) */
-#define dbg(format, arg...) printk(KERN_INFO "" format "\n", ## arg)
-
 static void setup_line(struct work_struct *work)
 {
         struct oti6858_private *priv = container_of(work,
@@ -1002,11 +998,12 @@ static void oti6858_read_bulk_callback(struct urb *urb)
                 return;
         }
 
-        tty = port->port.tty;
+        tty = tty_port_tty_get(&port->port);
         if (tty != NULL && urb->actual_length > 0) {
                 tty_insert_flip_string(tty, data, urb->actual_length);
                 tty_flip_buffer_push(tty);
         }
+        tty_kref_put(tty);
 
         /* schedule the interrupt urb if we are still open */
         if (port->port.count != 0) {
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 1ede1441cb1b..908437847165 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -154,7 +154,6 @@ struct pl2303_private {
         wait_queue_head_t delta_msr_wait;
         u8 line_control;
         u8 line_status;
-        u8 termios_initialized;
         enum pl2303_type type;
 };
 
@@ -526,16 +525,6 @@ static void pl2303_set_termios(struct tty_struct *tty,
 
         dbg("%s -  port %d", __func__, port->number);
 
-        spin_lock_irqsave(&priv->lock, flags);
-        if (!priv->termios_initialized) {
-                *(tty->termios) = tty_std_termios;
-                tty->termios->c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;
-                tty->termios->c_ispeed = 9600;
-                tty->termios->c_ospeed = 9600;
-                priv->termios_initialized = 1;
-        }
-        spin_unlock_irqrestore(&priv->lock, flags);
-
         /* The PL2303 is reported to lose bytes if you change
            serial settings even to the same values as before. Thus
            we actually need to filter in this specific case */
@@ -1057,7 +1046,7 @@ static void pl2303_read_bulk_callback(struct urb *urb)
                 tty_flag = TTY_FRAME;
         dbg("%s - tty_flag = %d", __func__, tty_flag);
 
-        tty = port->port.tty;
+        tty = tty_port_tty_get(&port->port);
         if (tty && urb->actual_length) {
                 tty_buffer_request_room(tty, urb->actual_length + 1);
                 /* overrun is special, not associated with a char */
@@ -1067,7 +1056,7 @@ static void pl2303_read_bulk_callback(struct urb *urb)
                         tty_insert_flip_char(tty, data[i], tty_flag);
                 tty_flip_buffer_push(tty);
         }
-
+        tty_kref_put(tty);
         /* Schedule the next read _if_ we are still open */
         if (port->port.count) {
                 urb->dev = port->serial->dev;
diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c
index def52d07a4ea..72903ac9f5c0 100644
--- a/drivers/usb/serial/safe_serial.c
+++ b/drivers/usb/serial/safe_serial.c
@@ -217,6 +217,7 @@ static void safe_read_bulk_callback(struct urb *urb)
         struct usb_serial_port *port =  urb->context;
         unsigned char *data = urb->transfer_buffer;
         unsigned char length = urb->actual_length;
+        struct tty_struct *tty;
         int result;
         int status = urb->status;
 
@@ -242,6 +243,7 @@ static void safe_read_bulk_callback(struct urb *urb)
                 printk("\n");
         }
 #endif
+        tty = tty_port_tty_get(&port->port);
         if (safe) {
                 __u16 fcs;
                 fcs = fcs_compute10(data, length, CRC10_INITFCS);
@@ -250,9 +252,9 @@ static void safe_read_bulk_callback(struct urb *urb)
                         if (actual_length <= (length - 2)) {
                                 info("%s - actual: %d", __func__,
                                                         actual_length);
-                                tty_insert_flip_string(port->port.tty,
+                                tty_insert_flip_string(tty,
                                                         data, actual_length);
-                                tty_flip_buffer_push(port->port.tty);
+                                tty_flip_buffer_push(tty);
                         } else {
                                 err("%s - inconsistent lengths %d:%d",
                                         __func__, actual_length, length);
@@ -261,9 +263,10 @@ static void safe_read_bulk_callback(struct urb *urb)
                         err("%s - bad CRC %x", __func__, fcs);
                 }
         } else {
-                tty_insert_flip_string(port->port.tty, data, length);
-                tty_flip_buffer_push(port->port.tty);
+                tty_insert_flip_string(tty, data, length);
+                tty_flip_buffer_push(tty);
         }
+        tty_kref_put(tty);
 
         /* Continue trying to always read  */
         usb_fill_bulk_urb(urb, port->serial->dev,
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index ea1a103c99be..8b9eaf383679 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -440,14 +440,14 @@ static void sierra_indat_callback(struct urb *urb)
                 dbg("%s: nonzero status: %d on endpoint %02x.",
                     __func__, status, endpoint);
         } else {
-                tty = port->port.tty;
                 if (urb->actual_length) {
+                tty = tty_port_tty_get(&port->port);
                         tty_buffer_request_room(tty, urb->actual_length);
                         tty_insert_flip_string(tty, data, urb->actual_length);
                         tty_flip_buffer_push(tty);
-                } else {
+                        tty_kref_put(tty);
+                } else
                         dbg("%s: empty read urb received", __func__);
-                }
 
                 /* Resubmit urb so we continue receiving */
                 if (port->port.count && status != -ESHUTDOWN) {
@@ -485,6 +485,7 @@ static void sierra_instat_callback(struct urb *urb)
                         unsigned char signals = *((unsigned char *)
                                         urb->transfer_buffer +
                                         sizeof(struct usb_ctrlrequest));
+                        struct tty_struct *tty;
 
                         dbg("%s: signal x%x", __func__, signals);
 
@@ -494,9 +495,11 @@ static void sierra_instat_callback(struct urb *urb)
                         portdata->dsr_state = ((signals & 0x02) ? 1 : 0);
                         portdata->ri_state = ((signals & 0x08) ? 1 : 0);
 
-                        if (port->port.tty && !C_CLOCAL(port->port.tty) &&
+                        tty = tty_port_tty_get(&port->port);
+                        if (tty && !C_CLOCAL(tty) &&
                                         old_dcd_state && !portdata->dcd_state)
-                                tty_hangup(port->port.tty);
+                                tty_hangup(tty);
+                        tty_kref_put(tty);
                 } else {
                         dbg("%s: type %x req %x", __func__,
                                 req_pkt->bRequestType, req_pkt->bRequest);
@@ -616,8 +619,7 @@ static void sierra_close(struct tty_struct *tty,
         }
 
         usb_kill_urb(port->interrupt_in_urb);
-
-        port->port.tty = NULL;  /* FIXME */
+        tty_port_tty_set(&port->port, NULL);
 }
 
 static int sierra_startup(struct usb_serial *serial)
diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c
index 283cf6b36b2c..1533d6e12238 100644
--- a/drivers/usb/serial/spcp8x5.c
+++ b/drivers/usb/serial/spcp8x5.c
@@ -755,7 +755,7 @@ static void spcp8x5_read_bulk_callback(struct urb *urb)
                 tty_flag = TTY_FRAME;
         dev_dbg(&port->dev, "tty_flag = %d\n", tty_flag);
 
-        tty = port->port.tty;
+        tty = tty_port_tty_get(&port->port);
         if (tty && urb->actual_length) {
                 tty_buffer_request_room(tty, urb->actual_length + 1);
                 /* overrun is special, not associated with a char */
@@ -765,6 +765,7 @@ static void spcp8x5_read_bulk_callback(struct urb *urb)
                         tty_insert_flip_char(tty, data[i], tty_flag);
                 tty_flip_buffer_push(tty);
         }
+        tty_kref_put(tty);
 
         /* Schedule the next read _if_ we are still open */
         if (port->port.count) {
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index 9a3e495c769c..c90237d48b0e 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -179,7 +179,7 @@ static int ti_set_mcr(struct ti_port *tport, unsigned int mcr);
 static int ti_get_lsr(struct ti_port *tport);
 static int ti_get_serial_info(struct ti_port *tport,
         struct serial_struct __user *ret_arg);
-static int ti_set_serial_info(struct ti_port *tport,
+static int ti_set_serial_info(struct tty_struct *tty, struct ti_port *tport,
         struct serial_struct __user *new_arg);
 static void ti_handle_new_msr(struct ti_port *tport, __u8 msr);
 
@@ -857,8 +857,8 @@ static int ti_ioctl(struct tty_struct *tty, struct file *file,
                                 (struct serial_struct __user *)arg);
         case TIOCSSERIAL:
                 dbg("%s - (%d) TIOCSSERIAL", __func__, port->number);
-                return ti_set_serial_info(tport,
-                                        (struct serial_struct __user *)arg);
+                return ti_set_serial_info(tty, tport,
+                                (struct serial_struct __user *)arg);
         case TIOCMIWAIT:
                 dbg("%s - (%d) TIOCMIWAIT", __func__, port->number);
                 cprev = tport->tp_icount;
@@ -1211,6 +1211,7 @@ static void ti_bulk_in_callback(struct urb *urb)
         struct device *dev = &urb->dev->dev;
         int status = urb->status;
         int retval = 0;
+        struct tty_struct *tty;
 
         dbg("%s", __func__);
 
@@ -1239,20 +1240,22 @@ static void ti_bulk_in_callback(struct urb *urb)
                 return;
         }
 
-        if (port->port.tty && urb->actual_length) {
+        tty = tty_port_tty_get(&port->port);
+        if (tty && urb->actual_length) {
                 usb_serial_debug_data(debug, dev, __func__,
                         urb->actual_length, urb->transfer_buffer);
 
                 if (!tport->tp_is_open)
                         dbg("%s - port closed, dropping data", __func__);
                 else
-                        ti_recv(&urb->dev->dev, port->port.tty,
+                        ti_recv(&urb->dev->dev, tty,
                                                 urb->transfer_buffer,
                                                 urb->actual_length);
 
                 spin_lock(&tport->tp_lock);
                 tport->tp_icount.rx += urb->actual_length;
                 spin_unlock(&tport->tp_lock);
+                tty_kref_put(tty);
         }
 
 exit:
@@ -1330,7 +1333,7 @@ static void ti_send(struct ti_port *tport)
 {
         int count, result;
         struct usb_serial_port *port = tport->tp_port;
-        struct tty_struct *tty = port->port.tty;        /* FIXME */
+        struct tty_struct *tty = tty_port_tty_get(&port->port); /* FIXME */
         unsigned long flags;
 
 
@@ -1338,19 +1341,15 @@ static void ti_send(struct ti_port *tport)
 
         spin_lock_irqsave(&tport->tp_lock, flags);
 
-        if (tport->tp_write_urb_in_use) {
-                spin_unlock_irqrestore(&tport->tp_lock, flags);
-                return;
-        }
+        if (tport->tp_write_urb_in_use)
+                goto unlock;
 
         count = ti_buf_get(tport->tp_write_buf,
                                 port->write_urb->transfer_buffer,
                                 port->bulk_out_size);
 
-        if (count == 0) {
-                spin_unlock_irqrestore(&tport->tp_lock, flags);
-                return;
-        }
+        if (count == 0)
+                goto unlock;
 
         tport->tp_write_urb_in_use = 1;
 
@@ -1380,7 +1379,13 @@ static void ti_send(struct ti_port *tport)
         /* more room in the buffer for new writes, wakeup */
         if (tty)
                 tty_wakeup(tty);
+        tty_kref_put(tty);
         wake_up_interruptible(&tport->tp_write_wait);
+        return;
+unlock:
+        spin_unlock_irqrestore(&tport->tp_lock, flags);
+        tty_kref_put(tty);
+        return;
 }
 
 
@@ -1464,20 +1469,16 @@ static int ti_get_serial_info(struct ti_port *tport,
 }
 
 
-static int ti_set_serial_info(struct ti_port *tport,
+static int ti_set_serial_info(struct tty_struct *tty, struct ti_port *tport,
         struct serial_struct __user *new_arg)
 {
-        struct usb_serial_port *port = tport->tp_port;
         struct serial_struct new_serial;
 
         if (copy_from_user(&new_serial, new_arg, sizeof(new_serial)))
                 return -EFAULT;
 
         tport->tp_flags = new_serial.flags & TI_SET_SERIAL_FLAGS;
-        /* FIXME */
-        if (port->port.tty)
-                port->port.tty->low_latency =
-                        (tport->tp_flags & ASYNC_LOW_LATENCY) ? 1 : 0;
+        tty->low_latency = (tport->tp_flags & ASYNC_LOW_LATENCY) ? 1 : 0;
         tport->tp_closing_wait = new_serial.closing_wait;
 
         return 0;
@@ -1510,7 +1511,7 @@ static void ti_handle_new_msr(struct ti_port *tport, __u8 msr)
         tport->tp_msr = msr & TI_MSR_MASK;
 
         /* handle CTS flow control */
-        tty = tport->tp_port->port.tty;
+        tty = tty_port_tty_get(&tport->tp_port->port);
         if (tty && C_CRTSCTS(tty)) {
                 if (msr & TI_MSR_CTS) {
                         tty->hw_stopped = 0;
@@ -1519,6 +1520,7 @@ static void ti_handle_new_msr(struct ti_port *tport, __u8 msr)
                         tty->hw_stopped = 1;
                 }
         }
+        tty_kref_put(tty);
 }
 
 
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 4f7f9e3ae0a4..e7d4246027b2 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -214,7 +214,7 @@ static int serial_open (struct tty_struct *tty, struct file *filp)
         /* set up our port structure making the tty driver
          * remember our port object, and us it */
         tty->driver_data = port;
-        port->port.tty = tty;
+        tty_port_tty_set(&port->port, tty);
 
         if (port->port.count == 1) {
 
@@ -246,7 +246,7 @@ bailout_module_put:
 bailout_mutex_unlock:
         port->port.count = 0;
         tty->driver_data = NULL;
-        port->port.tty = NULL;
+        tty_port_tty_set(&port->port, NULL);
         mutex_unlock(&port->mutex);
 bailout_kref_put:
         usb_serial_put(serial);
@@ -276,10 +276,11 @@ static void serial_close(struct tty_struct *tty, struct file *filp)
                 port->serial->type->close(tty, port, filp);
 
         if (port->port.count == (port->console? 1 : 0)) {
-                if (port->port.tty) {
-                        if (port->port.tty->driver_data)
-                                port->port.tty->driver_data = NULL;
-                        port->port.tty = NULL;
+                struct tty_struct *tty = tty_port_tty_get(&port->port);
+                if (tty) {
+                        if (tty->driver_data)
+                                tty->driver_data = NULL;
+                        tty_port_tty_set(&port->port, NULL);
                 }
         }
 
@@ -508,11 +509,12 @@ static void usb_serial_port_work(struct work_struct *work)
         if (!port)
                 return;
 
-        tty = port->port.tty;
+        tty = tty_port_tty_get(&port->port);
         if (!tty)
                 return;
 
         tty_wakeup(tty);
+        tty_kref_put(tty);
 }
 
 static void port_release(struct device *dev)
@@ -819,6 +821,7 @@ int usb_serial_probe(struct usb_interface *interface,
                 port = kzalloc(sizeof(struct usb_serial_port), GFP_KERNEL);
                 if (!port)
                         goto probe_error;
+                tty_port_init(&port->port);
                 port->serial = serial;
                 spin_lock_init(&port->lock);
                 mutex_init(&port->mutex);
@@ -1040,8 +1043,11 @@ void usb_serial_disconnect(struct usb_interface *interface)
         for (i = 0; i < serial->num_ports; ++i) {
                 port = serial->port[i];
                 if (port) {
-                        if (port->port.tty)
-                                tty_hangup(port->port.tty);
+                        struct tty_struct *tty = tty_port_tty_get(&port->port);
+                        if (tty) {
+                                tty_hangup(tty);
+                                tty_kref_put(tty);
+                        }
                         kill_traffic(port);
                 }
         }
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index cf8924f9a2cc..a6d1c75a1c89 100644
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -499,7 +499,7 @@ static void visor_read_bulk_callback(struct urb *urb)
         int status = urb->status;
         struct tty_struct *tty;
         int result;
-        int available_room;
+        int available_room = 0;
 
         dbg("%s - port %d", __func__, port->number);
 
@@ -512,13 +512,17 @@ static void visor_read_bulk_callback(struct urb *urb)
         usb_serial_debug_data(debug, &port->dev, __func__,
                                                 urb->actual_length, data);
 
-        tty = port->port.tty;
-        if (tty && urb->actual_length) {
-                available_room = tty_buffer_request_room(tty,
+        if (urb->actual_length) {
+                tty = tty_port_tty_get(&port->port);
+                if (tty) {
+                        available_room = tty_buffer_request_room(tty,
                                                         urb->actual_length);
-                if (available_room) {
-                        tty_insert_flip_string(tty, data, available_room);
-                        tty_flip_buffer_push(tty);
+                        if (available_room) {
+                                tty_insert_flip_string(tty, data,
+                                                        available_room);
+                                tty_flip_buffer_push(tty);
+                        }
+                        tty_kref_put(tty);
                 }
                 spin_lock(&priv->lock);
                 priv->bytes_in += available_room;
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index 3a9d14384a43..11c8b97a5177 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -1481,7 +1481,7 @@ static void rx_data_softint(struct work_struct *work)
         struct whiteheat_private *info =
                 container_of(work, struct whiteheat_private, rx_work);
         struct usb_serial_port *port = info->port;
-        struct tty_struct *tty = port->port.tty;
+        struct tty_struct *tty = tty_port_tty_get(&port->port);
         struct whiteheat_urb_wrap *wrap;
         struct urb *urb;
         unsigned long flags;
@@ -1493,7 +1493,7 @@ static void rx_data_softint(struct work_struct *work)
         spin_lock_irqsave(&info->lock, flags);
         if (info->flags & THROTTLED) {
                 spin_unlock_irqrestore(&info->lock, flags);
-                return;
+                goto out;
         }
 
         list_for_each_safe(tmp, tmp2, &info->rx_urb_q) {
@@ -1513,7 +1513,7 @@ static void rx_data_softint(struct work_struct *work)
                                 spin_unlock_irqrestore(&info->lock, flags);
                                 tty_flip_buffer_push(tty);
                                 schedule_work(&info->rx_work);
-                                return;
+                                goto out;
                         }
                         tty_insert_flip_string(tty, urb->transfer_buffer, len);
                         sent += len;
@@ -1536,6 +1536,8 @@ static void rx_data_softint(struct work_struct *work)
 
         if (sent)
                 tty_flip_buffer_push(tty);
+out:
+        tty_kref_put(tty);
 }
 
 
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index f79c2040758b..0f13448c6f79 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -76,6 +76,14 @@ config FB_DDC
        select I2C
        default n
 
+config FB_BOOT_VESA_SUPPORT
+        bool
+        depends on FB
+        default n
+        ---help---
+          If true, at least one selected framebuffer driver can take advantage
+          of VESA video modes set at an early boot stage via the vga= parameter.
+
 config FB_CFB_FILLRECT
         tristate
         depends on FB
@@ -254,16 +262,24 @@ config FB_PM2
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
         help
-          This is the frame buffer device driver for the Permedia2 AGP frame
-          buffer card from ASK, aka `Graphic Blaster Exxtreme'.  There is a
-          product page at
-          <http://www.ask.com.hk/product/Permedia%202/permedia2.htm>.
+          This is the frame buffer device driver for cards based on
+          the 3D Labs Permedia, Permedia 2 and Permedia 2V chips.
+          The driver was tested on the following cards:
+                Diamond FireGL 1000 PRO AGP
+                ELSA Gloria Synergy PCI
+                Appian Jeronimo PRO (both heads) PCI
+                3DLabs Oxygen ACX aka EONtronics Picasso P2 PCI
+                Techsource Raptor GFX-8P (aka Sun PGX-32) on SPARC
+                ASK Graphic Blaster Exxtreme AGP
+
+          To compile this driver as a module, choose M here: the
+          module will be called pm2fb.
 
 config FB_PM2_FIFO_DISCONNECT
         bool "enable FIFO disconnect feature"
         depends on FB_PM2 && PCI
         help
-          Support the Permedia2 FIFO disconnect feature (see CONFIG_FB_PM2).
+          Support the Permedia2 FIFO disconnect feature.
 
 config FB_ARMCLCD
         tristate "ARM PrimeCell PL110 support"
@@ -673,6 +689,7 @@ config FB_VESA
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
+        select FB_BOOT_VESA_SUPPORT
         help
           This is the frame buffer device driver for generic VESA 2.0
           compliant graphic cards. The older VESA 1.2 cards are not supported.
@@ -681,23 +698,14 @@ config FB_VESA
 
 config FB_EFI
         bool "EFI-based Framebuffer Support"
-        depends on (FB = y) && X86
-        select FB_CFB_FILLRECT
-        select FB_CFB_COPYAREA
-        select FB_CFB_IMAGEBLIT
-        help
-          This is the EFI frame buffer device driver. If the firmware on
-          your platform is UEFI2.0, select Y to add support for
-          Graphics Output Protocol for early console messages to appear.
-
-config FB_IMAC
-        bool "Intel-based Macintosh Framebuffer Support"
         depends on (FB = y) && X86 && EFI
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
         help
-          This is the frame buffer device driver for the Intel-based Macintosh
+          This is the EFI frame buffer device driver. If the firmware on
+          your platform is EFI 1.10 or UEFI 2.0, select Y to add support for
+          using the EFI framebuffer as your console.
 
 config FB_N411
        tristate "N411 Apollo/Hecuba devkit support"
@@ -1118,6 +1126,7 @@ config FB_INTEL
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
+        select FB_BOOT_VESA_SUPPORT
         help
           This driver supports the on-board graphics built in to the Intel
           830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM chipsets.
@@ -1470,6 +1479,7 @@ config FB_SIS
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
+        select FB_BOOT_VESA_SUPPORT
         help
           This is the frame buffer device driver for the SiS 300, 315, 330
           and 340 series as well as XGI V3XT, V5, V8, Z7 graphics chipsets.
@@ -1492,6 +1502,24 @@ config FB_SIS_315
           (315/H/PRO, 55x, 650, 651, 740, 330, 661, 741, 760, 761) as well
           as XGI V3XT, V5, V8 and Z7.
 
+config FB_VIA
+       tristate "VIA UniChrome (Pro) and Chrome9 display support"
+       depends on FB && PCI
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       select FB_SOFT_CURSOR
+       select I2C_ALGOBIT
+       select I2C
+       help
+          This is the frame buffer device driver for Graphics chips of VIA
+          UniChrome (Pro) Family (CLE266,PM800/CN400,P4M800CE/P4M800Pro/
+          CN700/VN800,CX700/VX700,P4M890) and Chrome9 Family (K8M890,CN896
+          /P4M900,VX800)
+          Say Y if you have a VIA UniChrome graphics board.
+
+          To compile this driver as a module, choose M here: the
+          module will be called viafb.
 config FB_NEOMAGIC
         tristate "NeoMagic display support"
         depends on FB && PCI
@@ -1521,25 +1549,25 @@ config FB_KYRO
           module will be called kyrofb.
 
 config FB_3DFX
-        tristate "3Dfx Banshee/Voodoo3 display support"
+        tristate "3Dfx Banshee/Voodoo3/Voodoo5 display support"
         depends on FB && PCI
         select FB_CFB_IMAGEBLIT
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         help
-          This driver supports graphics boards with the 3Dfx Banshee/Voodoo3
-          chips. Say Y if you have such a graphics board.
+          This driver supports graphics boards with the 3Dfx Banshee,
+          Voodoo3 or VSA-100 (aka Voodoo4/5) chips. Say Y if you have
+          such a graphics board.
 
           To compile this driver as a module, choose M here: the
           module will be called tdfxfb.
 
 config FB_3DFX_ACCEL
-        bool "3Dfx Banshee/Voodoo3 Acceleration functions (EXPERIMENTAL)"
+        bool "3Dfx Acceleration functions (EXPERIMENTAL)"
         depends on FB_3DFX && EXPERIMENTAL
         ---help---
-        This will compile the 3Dfx Banshee/Voodoo3 frame buffer device
-        with acceleration functions.
-
+        This will compile the 3Dfx Banshee/Voodoo3/VSA-100 frame buffer
+        device driver with acceleration functions.
 
 config FB_VOODOO1
         tristate "3Dfx Voodoo Graphics (sst1) support"
@@ -1604,17 +1632,16 @@ config FB_TRIDENT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
         ---help---
-          This driver is supposed to support graphics boards with the
-          Trident CyberXXXX/Image/CyberBlade chips mostly found in laptops
+          This is the frame buffer device driver for Trident PCI/AGP chipsets.
+          Supported chipset families are TGUI 9440/96XX, 3DImage, Blade3D
+          and Blade XP.
+          There are also integrated versions of these chips called CyberXXXX,
+          CyberImage or CyberBlade. These chips are mostly found in laptops
           but also on some motherboards. For more information, read
           <file:Documentation/fb/tridentfb.txt>
 
-          Cyberblade/i1 support will be removed soon, use the cyblafb driver
-          instead.
-
           Say Y if you have such a graphics board.
 
-
           To compile this driver as a module, choose M here: the
           module will be called tridentfb.
 
@@ -1869,6 +1896,28 @@ config FB_SH_MOBILE_LCDC
         ---help---
           Frame buffer driver for the on-chip SH-Mobile LCD controller.
 
+config FB_TMIO
+        tristate "Toshiba Mobile IO FrameBuffer support"
+        depends on FB && MFD_CORE
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        ---help---
+          Frame buffer driver for the Toshiba Mobile IO integrated as found
+          on the Sharp SL-6000 series
+
+          This driver is also available as a module ( = code which can be
+          inserted and removed from the running kernel whenever you want). The
+          module will be called tmiofb. If you want to compile it as a module,
+          say M here and read <file:Documentation/kbuild/modules.txt>.
+
+          If unsure, say N.
+
+config FB_TMIO_ACCELL
+        bool "tmiofb acceleration"
+        depends on FB_TMIO
+        default y
+
 config FB_S3C2410
         tristate "S3C2410 LCD framebuffer support"
         depends on FB && ARCH_S3C2410
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index ad0330bf9be3..248bddc8d0b0 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -42,6 +42,7 @@ obj-$(CONFIG_FB_ATY)		  += aty/ macmodes.o
 obj-$(CONFIG_FB_ATY128)           += aty/ macmodes.o
 obj-$(CONFIG_FB_RADEON)           += aty/
 obj-$(CONFIG_FB_SIS)              += sis/
+obj-$(CONFIG_FB_VIA)              += via/
 obj-$(CONFIG_FB_KYRO)             += kyro/
 obj-$(CONFIG_FB_SAVAGE)           += savage/
 obj-$(CONFIG_FB_GEODE)            += geode/
@@ -97,6 +98,7 @@ obj-$(CONFIG_FB_CIRRUS)		  += cirrusfb.o
 obj-$(CONFIG_FB_ASILIANT)         += asiliantfb.o
 obj-$(CONFIG_FB_PXA)              += pxafb.o
 obj-$(CONFIG_FB_W100)             += w100fb.o
+obj-$(CONFIG_FB_TMIO)             += tmiofb.o
 obj-$(CONFIG_FB_AU1100)           += au1100fb.o
 obj-$(CONFIG_FB_AU1200)           += au1200fb.o
 obj-$(CONFIG_FB_PMAG_AA)          += pmag-aa-fb.o
@@ -124,7 +126,6 @@ obj-$(CONFIG_FB_CARMINE)          += carminefb.o
 # Platform or fallback drivers go here
 obj-$(CONFIG_FB_UVESA)            += uvesafb.o
 obj-$(CONFIG_FB_VESA)             += vesafb.o
-obj-$(CONFIG_FB_IMAC)             += imacfb.o
 obj-$(CONFIG_FB_EFI)              += efifb.o
 obj-$(CONFIG_FB_VGA16)            += vga16fb.o
 obj-$(CONFIG_FB_OF)               += offb.o
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index d38fd5217422..f8d0a57a07cb 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -372,6 +372,13 @@ static int atmel_lcdfb_check_var(struct fb_var_screeninfo *var,
         var->transp.offset = var->transp.length = 0;
         var->xoffset = var->yoffset = 0;
 
+        if (info->fix.smem_len) {
+                unsigned int smem_len = (var->xres_virtual * var->yres_virtual
+                                         * ((var->bits_per_pixel + 7) / 8));
+                if (smem_len > info->fix.smem_len)
+                        return -EINVAL;
+        }
+
         /* Saturate vertical and horizontal timings at maximum values */
         var->vsync_len = min_t(u32, var->vsync_len,
                         (ATMEL_LCDC_VPW >> ATMEL_LCDC_VPW_OFFSET) + 1);
diff --git a/drivers/video/aty/radeon_accel.c b/drivers/video/aty/radeon_accel.c
index aa95f8350242..8718f7349d6b 100644
--- a/drivers/video/aty/radeon_accel.c
+++ b/drivers/video/aty/radeon_accel.c
@@ -5,61 +5,61 @@
  * --dte
  */
 
-static void radeon_fixup_offset(struct radeonfb_info *rinfo)
+#define FLUSH_CACHE_WORKAROUND  1
+
+void radeon_fifo_update_and_wait(struct radeonfb_info *rinfo, int entries)
 {
-        u32 local_base;
-
-        /* *** Ugly workaround *** */
-        /*
-         * On some platforms, the video memory is mapped at 0 in radeon chip space
-         * (like PPCs) by the firmware. X will always move it up so that it's seen
-         * by the chip to be at the same address as the PCI BAR.
-         * That means that when switching back from X, there is a mismatch between
-         * the offsets programmed into the engine. This means that potentially,
-         * accel operations done before radeonfb has a chance to re-init the engine
-         * will have incorrect offsets, and potentially trash system memory !
-         *
-         * The correct fix is for fbcon to never call any accel op before the engine
-         * has properly been re-initialized (by a call to set_var), but this is a
-         * complex fix. This workaround in the meantime, called before every accel
-         * operation, makes sure the offsets are in sync.
-         */
+        int i;
 
-        radeon_fifo_wait (1);
-        local_base = INREG(MC_FB_LOCATION) << 16;
-        if (local_base == rinfo->fb_local_base)
-                return;
+        for (i=0; i<2000000; i++) {
+                rinfo->fifo_free = INREG(RBBM_STATUS) & 0x7f;
+                if (rinfo->fifo_free >= entries)
+                        return;
+                udelay(10);
+        }
+        printk(KERN_ERR "radeonfb: FIFO Timeout !\n");
+        /* XXX Todo: attempt to reset the engine */
+}
 
-        rinfo->fb_local_base = local_base;
+static inline void radeon_fifo_wait(struct radeonfb_info *rinfo, int entries)
+{
+        if (entries <= rinfo->fifo_free)
+                rinfo->fifo_free -= entries;
+        else
+                radeon_fifo_update_and_wait(rinfo, entries);
+}
 
-        radeon_fifo_wait (3);
-        OUTREG(DEFAULT_PITCH_OFFSET, (rinfo->pitch << 0x16) |
-                                     (rinfo->fb_local_base >> 10));
-        OUTREG(DST_PITCH_OFFSET, (rinfo->pitch << 0x16) | (rinfo->fb_local_base >> 10));
-        OUTREG(SRC_PITCH_OFFSET, (rinfo->pitch << 0x16) | (rinfo->fb_local_base >> 10));
+static inline void radeonfb_set_creg(struct radeonfb_info *rinfo, u32 reg,
+                                     u32 *cache, u32 new_val)
+{
+        if (new_val == *cache)
+                return;
+        *cache = new_val;
+        radeon_fifo_wait(rinfo, 1);
+        OUTREG(reg, new_val);
 }
 
 static void radeonfb_prim_fillrect(struct radeonfb_info *rinfo, 
                                    const struct fb_fillrect *region)
 {
-        radeon_fifo_wait(4);  
-  
-        OUTREG(DP_GUI_MASTER_CNTL,  
-                rinfo->dp_gui_master_cntl  /* contains, like GMC_DST_32BPP */
-                | GMC_BRUSH_SOLID_COLOR
-                | ROP3_P);
-        if (radeon_get_dstbpp(rinfo->depth) != DST_8BPP)
-                OUTREG(DP_BRUSH_FRGD_CLR, rinfo->pseudo_palette[region->color]);
-        else
-                OUTREG(DP_BRUSH_FRGD_CLR, region->color);
-        OUTREG(DP_WRITE_MSK, 0xffffffff);
-        OUTREG(DP_CNTL, (DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM));
-
-        radeon_fifo_wait(2);
+        radeonfb_set_creg(rinfo, DP_GUI_MASTER_CNTL, &rinfo->dp_gui_mc_cache,
+                          rinfo->dp_gui_mc_base | GMC_BRUSH_SOLID_COLOR | ROP3_P);
+        radeonfb_set_creg(rinfo, DP_CNTL, &rinfo->dp_cntl_cache,
+                          DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM);
+        radeonfb_set_creg(rinfo, DP_BRUSH_FRGD_CLR, &rinfo->dp_brush_fg_cache,
+                          region->color);
+
+        /* Ensure the dst cache is flushed and the engine idle before
+         * issuing the operation.
+         *
+         * This works around engine lockups on some cards
+         */
+#if FLUSH_CACHE_WORKAROUND
+        radeon_fifo_wait(rinfo, 2);
         OUTREG(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL);
         OUTREG(WAIT_UNTIL, (WAIT_2D_IDLECLEAN | WAIT_DMA_GUI_IDLE));
-
-        radeon_fifo_wait(2);  
+#endif
+        radeon_fifo_wait(rinfo, 2);
         OUTREG(DST_Y_X, (region->dy << 16) | region->dx);
         OUTREG(DST_WIDTH_HEIGHT, (region->width << 16) | region->height);
 }
@@ -70,15 +70,14 @@ void radeonfb_fillrect(struct fb_info *info, const struct fb_fillrect *region)
         struct fb_fillrect modded;
         int vxres, vyres;
   
-        if (info->state != FBINFO_STATE_RUNNING)
+        WARN_ON(rinfo->gfx_mode);
+        if (info->state != FBINFO_STATE_RUNNING || rinfo->gfx_mode)
                 return;
         if (info->flags & FBINFO_HWACCEL_DISABLED) {
                 cfb_fillrect(info, region);
                 return;
         }
 
-        radeon_fixup_offset(rinfo);
-
         vxres = info->var.xres_virtual;
         vyres = info->var.yres_virtual;
 
@@ -91,6 +90,10 @@ void radeonfb_fillrect(struct fb_info *info, const struct fb_fillrect *region)
         if(modded.dx + modded.width  > vxres) modded.width  = vxres - modded.dx;
         if(modded.dy + modded.height > vyres) modded.height = vyres - modded.dy;
 
+        if (info->fix.visual == FB_VISUAL_TRUECOLOR ||
+            info->fix.visual == FB_VISUAL_DIRECTCOLOR )
+                modded.color = ((u32 *) (info->pseudo_palette))[region->color];
+
         radeonfb_prim_fillrect(rinfo, &modded);
 }
 
@@ -109,22 +112,22 @@ static void radeonfb_prim_copyarea(struct radeonfb_info *rinfo,
         if ( xdir < 0 ) { sx += w-1; dx += w-1; }
         if ( ydir < 0 ) { sy += h-1; dy += h-1; }
 
-        radeon_fifo_wait(3);
-        OUTREG(DP_GUI_MASTER_CNTL,
-                rinfo->dp_gui_master_cntl /* i.e. GMC_DST_32BPP */
-                | GMC_BRUSH_NONE
-                | GMC_SRC_DSTCOLOR
-                | ROP3_S 
-                | DP_SRC_SOURCE_MEMORY );
-        OUTREG(DP_WRITE_MSK, 0xffffffff);
-        OUTREG(DP_CNTL, (xdir>=0 ? DST_X_LEFT_TO_RIGHT : 0)
-                        | (ydir>=0 ? DST_Y_TOP_TO_BOTTOM : 0));
-
-        radeon_fifo_wait(2);
+        radeonfb_set_creg(rinfo, DP_GUI_MASTER_CNTL, &rinfo->dp_gui_mc_cache,
+                          rinfo->dp_gui_mc_base |
+                          GMC_BRUSH_NONE |
+                          GMC_SRC_DATATYPE_COLOR |
+                          ROP3_S |
+                          DP_SRC_SOURCE_MEMORY);
+        radeonfb_set_creg(rinfo, DP_CNTL, &rinfo->dp_cntl_cache,
+                          (xdir>=0 ? DST_X_LEFT_TO_RIGHT : 0) |
+                          (ydir>=0 ? DST_Y_TOP_TO_BOTTOM : 0));
+
+#if FLUSH_CACHE_WORKAROUND
+        radeon_fifo_wait(rinfo, 2);
         OUTREG(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL);
         OUTREG(WAIT_UNTIL, (WAIT_2D_IDLECLEAN | WAIT_DMA_GUI_IDLE));
-
-        radeon_fifo_wait(3);
+#endif
+        radeon_fifo_wait(rinfo, 3);
         OUTREG(SRC_Y_X, (sy << 16) | sx);
         OUTREG(DST_Y_X, (dy << 16) | dx);
         OUTREG(DST_HEIGHT_WIDTH, (h << 16) | w);
@@ -143,15 +146,14 @@ void radeonfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
         modded.width  = area->width;
         modded.height = area->height;
   
-        if (info->state != FBINFO_STATE_RUNNING)
+        WARN_ON(rinfo->gfx_mode);
+        if (info->state != FBINFO_STATE_RUNNING || rinfo->gfx_mode)
                 return;
         if (info->flags & FBINFO_HWACCEL_DISABLED) {
                 cfb_copyarea(info, area);
                 return;
         }
 
-        radeon_fixup_offset(rinfo);
-
         vxres = info->var.xres_virtual;
         vyres = info->var.yres_virtual;
 
@@ -168,13 +170,112 @@ void radeonfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
         radeonfb_prim_copyarea(rinfo, &modded);
 }
 
+static void radeonfb_prim_imageblit(struct radeonfb_info *rinfo,
+                                    const struct fb_image *image,
+                                    u32 fg, u32 bg)
+{
+        unsigned int src_bytes, dwords;
+        u32 *bits;
+
+        radeonfb_set_creg(rinfo, DP_GUI_MASTER_CNTL, &rinfo->dp_gui_mc_cache,
+                          rinfo->dp_gui_mc_base |
+                          GMC_BRUSH_NONE |
+                          GMC_SRC_DATATYPE_MONO_FG_BG |
+                          ROP3_S |
+                          GMC_BYTE_ORDER_MSB_TO_LSB |
+                          DP_SRC_SOURCE_HOST_DATA);
+        radeonfb_set_creg(rinfo, DP_CNTL, &rinfo->dp_cntl_cache,
+                          DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM);
+        radeonfb_set_creg(rinfo, DP_SRC_FRGD_CLR, &rinfo->dp_src_fg_cache, fg);
+        radeonfb_set_creg(rinfo, DP_SRC_BKGD_CLR, &rinfo->dp_src_bg_cache, bg);
+
+        radeon_fifo_wait(rinfo, 1);
+        OUTREG(DST_Y_X, (image->dy << 16) | image->dx);
+
+        /* Ensure the dst cache is flushed and the engine idle before
+         * issuing the operation.
+         *
+         * This works around engine lockups on some cards
+         */
+#if FLUSH_CACHE_WORKAROUND
+        radeon_fifo_wait(rinfo, 2);
+        OUTREG(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL);
+        OUTREG(WAIT_UNTIL, (WAIT_2D_IDLECLEAN | WAIT_DMA_GUI_IDLE));
+#endif
+
+        /* X here pads width to a multiple of 32 and uses the clipper to
+         * adjust the result. Is that really necessary ? Things seem to
+         * work ok for me without that and the doco doesn't seem to imply
+         * there is such a restriction.
+         */
+        OUTREG(DST_WIDTH_HEIGHT, (image->width << 16) | image->height);
+
+        src_bytes = (((image->width * image->depth) + 7) / 8) * image->height;
+        dwords = (src_bytes + 3) / 4;
+        bits = (u32*)(image->data);
+
+        while(dwords >= 8) {
+                radeon_fifo_wait(rinfo, 8);
+#if BITS_PER_LONG == 64
+                __raw_writeq(*((u64 *)(bits)), rinfo->mmio_base + HOST_DATA0);
+                __raw_writeq(*((u64 *)(bits+2)), rinfo->mmio_base + HOST_DATA2);
+                __raw_writeq(*((u64 *)(bits+4)), rinfo->mmio_base + HOST_DATA4);
+                __raw_writeq(*((u64 *)(bits+6)), rinfo->mmio_base + HOST_DATA6);
+                bits += 8;
+#else
+                __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA0);
+                __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA1);
+                __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA2);
+                __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA3);
+                __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA4);
+                __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA5);
+                __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA6);
+                __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA7);
+#endif
+                dwords -= 8;
+        }
+        while(dwords--) {
+                radeon_fifo_wait(rinfo, 1);
+                __raw_writel(*(bits++), rinfo->mmio_base + HOST_DATA0);
+        }
+}
+
 void radeonfb_imageblit(struct fb_info *info, const struct fb_image *image)
 {
         struct radeonfb_info *rinfo = info->par;
+        u32 fg, bg;
 
-        if (info->state != FBINFO_STATE_RUNNING)
+        WARN_ON(rinfo->gfx_mode);
+        if (info->state != FBINFO_STATE_RUNNING || rinfo->gfx_mode)
+                return;
+
+        if (!image->width || !image->height)
                 return;
-        radeon_engine_idle();
+
+        /* We only do 1 bpp color expansion for now */
+        if (info->flags & FBINFO_HWACCEL_DISABLED || image->depth != 1)
+                goto fallback;
+
+        /* Fallback if running out of the screen. We may do clipping
+         * in the future */
+        if ((image->dx + image->width) > info->var.xres_virtual ||
+            (image->dy + image->height) > info->var.yres_virtual)
+                goto fallback;
+
+        if (info->fix.visual == FB_VISUAL_TRUECOLOR ||
+            info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
+                fg = ((u32*)(info->pseudo_palette))[image->fg_color];
+                bg = ((u32*)(info->pseudo_palette))[image->bg_color];
+        } else {
+                fg = image->fg_color;
+                bg = image->bg_color;
+        }
+
+        radeonfb_prim_imageblit(rinfo, image, fg, bg);
+        return;
+
+ fallback:
+        radeon_engine_idle(rinfo);
 
         cfb_imageblit(info, image);
 }
@@ -185,7 +286,8 @@ int radeonfb_sync(struct fb_info *info)
 
         if (info->state != FBINFO_STATE_RUNNING)
                 return 0;
-        radeon_engine_idle();
+
+        radeon_engine_idle(rinfo);
 
         return 0;
 }
@@ -211,9 +313,7 @@ void radeonfb_engine_reset(struct radeonfb_info *rinfo)
         host_path_cntl = INREG(HOST_PATH_CNTL);
         rbbm_soft_reset = INREG(RBBM_SOFT_RESET);
 
-        if (rinfo->family == CHIP_FAMILY_R300 ||
-            rinfo->family == CHIP_FAMILY_R350 ||
-            rinfo->family == CHIP_FAMILY_RV350) {
+        if (IS_R300_VARIANT(rinfo)) {
                 u32 tmp;
 
                 OUTREG(RBBM_SOFT_RESET, (rbbm_soft_reset |
@@ -249,9 +349,7 @@ void radeonfb_engine_reset(struct radeonfb_info *rinfo)
         INREG(HOST_PATH_CNTL);
         OUTREG(HOST_PATH_CNTL, host_path_cntl);
 
-        if (rinfo->family != CHIP_FAMILY_R300 &&
-            rinfo->family != CHIP_FAMILY_R350 &&
-            rinfo->family != CHIP_FAMILY_RV350)
+        if (!IS_R300_VARIANT(rinfo))
                 OUTREG(RBBM_SOFT_RESET, rbbm_soft_reset);
 
         OUTREG(CLOCK_CNTL_INDEX, clock_cntl_index);
@@ -265,15 +363,24 @@ void radeonfb_engine_init (struct radeonfb_info *rinfo)
         /* disable 3D engine */
         OUTREG(RB3D_CNTL, 0);
 
+        rinfo->fifo_free = 0;
         radeonfb_engine_reset(rinfo);
 
-        radeon_fifo_wait (1);
-        if ((rinfo->family != CHIP_FAMILY_R300) &&
-            (rinfo->family != CHIP_FAMILY_R350) &&
-            (rinfo->family != CHIP_FAMILY_RV350))
+        radeon_fifo_wait(rinfo, 1);
+        if (IS_R300_VARIANT(rinfo)) {
+                OUTREG(RB2D_DSTCACHE_MODE, INREG(RB2D_DSTCACHE_MODE) |
+                       RB2D_DC_AUTOFLUSH_ENABLE |
+                       RB2D_DC_DC_DISABLE_IGNORE_PE);
+        } else {
+                /* This needs to be double checked with ATI. Latest X driver
+                 * completely "forgets" to set this register on < r3xx, and
+                 * we used to just write 0 there... I'll keep the 0 and update
+                 * that when we have sorted things out on X side.
+                 */
                 OUTREG(RB2D_DSTCACHE_MODE, 0);
+        }
 
-        radeon_fifo_wait (3);
+        radeon_fifo_wait(rinfo, 3);
         /* We re-read MC_FB_LOCATION from card as it can have been
          * modified by XFree drivers (ouch !)
          */
@@ -284,41 +391,57 @@ void radeonfb_engine_init (struct radeonfb_info *rinfo)
         OUTREG(DST_PITCH_OFFSET, (rinfo->pitch << 0x16) | (rinfo->fb_local_base >> 10));
         OUTREG(SRC_PITCH_OFFSET, (rinfo->pitch << 0x16) | (rinfo->fb_local_base >> 10));
 
-        radeon_fifo_wait (1);
-#if defined(__BIG_ENDIAN)
+        radeon_fifo_wait(rinfo, 1);
+#ifdef __BIG_ENDIAN
         OUTREGP(DP_DATATYPE, HOST_BIG_ENDIAN_EN, ~HOST_BIG_ENDIAN_EN);
 #else
         OUTREGP(DP_DATATYPE, 0, ~HOST_BIG_ENDIAN_EN);
 #endif
-        radeon_fifo_wait (2);
+        radeon_fifo_wait(rinfo, 2);
         OUTREG(DEFAULT_SC_TOP_LEFT, 0);
         OUTREG(DEFAULT_SC_BOTTOM_RIGHT, (DEFAULT_SC_RIGHT_MAX |
                                          DEFAULT_SC_BOTTOM_MAX));
 
+        /* set default DP_GUI_MASTER_CNTL */
         temp = radeon_get_dstbpp(rinfo->depth);
-        rinfo->dp_gui_master_cntl = ((temp << 8) | GMC_CLR_CMP_CNTL_DIS);
+        rinfo->dp_gui_mc_base = ((temp << 8) | GMC_CLR_CMP_CNTL_DIS);
 
-        radeon_fifo_wait (1);
-        OUTREG(DP_GUI_MASTER_CNTL, (rinfo->dp_gui_master_cntl |
-                                    GMC_BRUSH_SOLID_COLOR |
-                                    GMC_SRC_DATATYPE_COLOR));
+        rinfo->dp_gui_mc_cache = rinfo->dp_gui_mc_base |
+                GMC_BRUSH_SOLID_COLOR |
+                GMC_SRC_DATATYPE_COLOR;
+        radeon_fifo_wait(rinfo, 1);
+        OUTREG(DP_GUI_MASTER_CNTL, rinfo->dp_gui_mc_cache);
 
-        radeon_fifo_wait (7);
 
         /* clear line drawing regs */
+        radeon_fifo_wait(rinfo, 2);
         OUTREG(DST_LINE_START, 0);
         OUTREG(DST_LINE_END, 0);
 
-        /* set brush color regs */
-        OUTREG(DP_BRUSH_FRGD_CLR, 0xffffffff);
-        OUTREG(DP_BRUSH_BKGD_CLR, 0x00000000);
-
-        /* set source color regs */
-        OUTREG(DP_SRC_FRGD_CLR, 0xffffffff);
-        OUTREG(DP_SRC_BKGD_CLR, 0x00000000);
+        /* set brush and source color regs */
+        rinfo->dp_brush_fg_cache = 0xffffffff;
+        rinfo->dp_brush_bg_cache = 0x00000000;
+        rinfo->dp_src_fg_cache = 0xffffffff;
+        rinfo->dp_src_bg_cache = 0x00000000;
+        radeon_fifo_wait(rinfo, 4);
+        OUTREG(DP_BRUSH_FRGD_CLR, rinfo->dp_brush_fg_cache);
+        OUTREG(DP_BRUSH_BKGD_CLR, rinfo->dp_brush_bg_cache);
+        OUTREG(DP_SRC_FRGD_CLR, rinfo->dp_src_fg_cache);
+        OUTREG(DP_SRC_BKGD_CLR, rinfo->dp_src_bg_cache);
+
+        /* Default direction */
+        rinfo->dp_cntl_cache = DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM;
+        radeon_fifo_wait(rinfo, 1);
+        OUTREG(DP_CNTL, rinfo->dp_cntl_cache);
 
         /* default write mask */
+        radeon_fifo_wait(rinfo, 1);
         OUTREG(DP_WRITE_MSK, 0xffffffff);
 
-        radeon_engine_idle ();
+        /* Default to no swapping of host data */
+        radeon_fifo_wait(rinfo, 1);
+        OUTREG(RBBM_GUICNTL, RBBM_GUICNTL_HOST_DATA_SWAP_NONE);
+
+        /* Make sure it's settled */
+        radeon_engine_idle(rinfo);
 }
diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c
index 1a056adb61c8..f343ba83f0ae 100644
--- a/drivers/video/aty/radeon_backlight.c
+++ b/drivers/video/aty/radeon_backlight.c
@@ -66,7 +66,7 @@ static int radeon_bl_update_status(struct backlight_device *bd)
                 level = bd->props.brightness;
 
         del_timer_sync(&rinfo->lvds_timer);
-        radeon_engine_idle();
+        radeon_engine_idle(rinfo);
 
         lvds_gen_cntl = INREG(LVDS_GEN_CNTL);
         if (level > 0) {
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 652273e9f5f9..9a5821c65ebf 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -852,7 +852,6 @@ static int radeonfb_pan_display (struct fb_var_screeninfo *var,
         if (rinfo->asleep)
                 return 0;
 
-        radeon_fifo_wait(2);
         OUTREG(CRTC_OFFSET, ((var->yoffset * var->xres_virtual + var->xoffset)
                              * var->bits_per_pixel / 8) & ~7);
         return 0;
@@ -882,7 +881,6 @@ static int radeonfb_ioctl (struct fb_info *info, unsigned int cmd,
                         if (rc)
                                 return rc;
 
-                        radeon_fifo_wait(2);
                         if (value & 0x01) {
                                 tmp = INREG(LVDS_GEN_CNTL);
 
@@ -940,7 +938,7 @@ int radeon_screen_blank(struct radeonfb_info *rinfo, int blank, int mode_switch)
         if (rinfo->lock_blank)
                 return 0;
 
-        radeon_engine_idle();
+        radeon_engine_idle(rinfo);
 
         val = INREG(CRTC_EXT_CNTL);
         val &= ~(CRTC_DISPLAY_DIS | CRTC_HSYNC_DIS |
@@ -1048,7 +1046,7 @@ static int radeonfb_blank (int blank, struct fb_info *info)
 
         if (rinfo->asleep)
                 return 0;
-                
+
         return radeon_screen_blank(rinfo, blank, 0);
 }
 
@@ -1074,8 +1072,6 @@ static int radeon_setcolreg (unsigned regno, unsigned red, unsigned green,
         pindex = regno;
 
         if (!rinfo->asleep) {
-                radeon_fifo_wait(9);
-
                 if (rinfo->bpp == 16) {
                         pindex = regno * 8;
 
@@ -1244,8 +1240,6 @@ static void radeon_write_pll_regs(struct radeonfb_info *rinfo, struct radeon_reg
 {
         int i;
 
-        radeon_fifo_wait(20);
-
         /* Workaround from XFree */
         if (rinfo->is_mobility) {
                 /* A temporal workaround for the occational blanking on certain laptop
@@ -1286,11 +1280,10 @@ static void radeon_write_pll_regs(struct radeonfb_info *rinfo, struct radeon_reg
         radeon_pll_errata_after_data(rinfo);
 
         /* Set PPLL ref. div */
-        if (rinfo->family == CHIP_FAMILY_R300 ||
+        if (IS_R300_VARIANT(rinfo) ||
             rinfo->family == CHIP_FAMILY_RS300 ||
-            rinfo->family == CHIP_FAMILY_R350 ||
-            rinfo->family == CHIP_FAMILY_RV350 ||
-            rinfo->family == CHIP_FAMILY_RV380 ) {
+            rinfo->family == CHIP_FAMILY_RS400 ||
+            rinfo->family == CHIP_FAMILY_RS480) {
                 if (mode->ppll_ref_div & R300_PPLL_REF_DIV_ACC_MASK) {
                         /* When restoring console mode, use saved PPLL_REF_DIV
                          * setting.
@@ -1342,7 +1335,7 @@ static void radeon_lvds_timer_func(unsigned long data)
 {
         struct radeonfb_info *rinfo = (struct radeonfb_info *)data;
 
-        radeon_engine_idle();
+        radeon_engine_idle(rinfo);
 
         OUTREG(LVDS_GEN_CNTL, rinfo->pending_lvds_gen_cntl);
 }
@@ -1360,10 +1353,11 @@ void radeon_write_mode (struct radeonfb_info *rinfo, struct radeon_regs *mode,
         if (nomodeset)
                 return;
 
+        radeon_engine_idle(rinfo);
+
         if (!regs_only)
                 radeon_screen_blank(rinfo, FB_BLANK_NORMAL, 0);
 
-        radeon_fifo_wait(31);
         for (i=0; i<10; i++)
                 OUTREG(common_regs[i].reg, common_regs[i].val);
 
@@ -1391,7 +1385,6 @@ void radeon_write_mode (struct radeonfb_info *rinfo, struct radeon_regs *mode,
         radeon_write_pll_regs(rinfo, mode);
 
         if ((primary_mon == MT_DFP) || (primary_mon == MT_LCD)) {
-                radeon_fifo_wait(10);
                 OUTREG(FP_CRTC_H_TOTAL_DISP, mode->fp_crtc_h_total_disp);
                 OUTREG(FP_CRTC_V_TOTAL_DISP, mode->fp_crtc_v_total_disp);
                 OUTREG(FP_H_SYNC_STRT_WID, mode->fp_h_sync_strt_wid);
@@ -1406,7 +1399,6 @@ void radeon_write_mode (struct radeonfb_info *rinfo, struct radeon_regs *mode,
         if (!regs_only)
                 radeon_screen_blank(rinfo, FB_BLANK_UNBLANK, 0);
 
-        radeon_fifo_wait(2);
         OUTPLL(VCLK_ECP_CNTL, mode->vclk_ecp_cntl);
         
         return;
@@ -1461,10 +1453,7 @@ static void radeon_calc_pll_regs(struct radeonfb_info *rinfo, struct radeon_regs
                 /* Not all chip revs have the same format for this register,
                  * extract the source selection
                  */
-                if (rinfo->family == CHIP_FAMILY_R200 ||
-                    rinfo->family == CHIP_FAMILY_R300 ||
-                    rinfo->family == CHIP_FAMILY_R350 ||
-                    rinfo->family == CHIP_FAMILY_RV350) {
+                if (rinfo->family == CHIP_FAMILY_R200 || IS_R300_VARIANT(rinfo)) {
                         source = (fp2_gen_cntl >> 10) & 0x3;
                         /* sourced from transform unit, check for transform unit
                          * own source
@@ -1560,7 +1549,7 @@ static int radeonfb_set_par(struct fb_info *info)
         /* We always want engine to be idle on a mode switch, even
          * if we won't actually change the mode
          */
-        radeon_engine_idle();
+        radeon_engine_idle(rinfo);
 
         hSyncStart = mode->xres + mode->right_margin;
         hSyncEnd = hSyncStart + mode->hsync_len;
@@ -1855,7 +1844,6 @@ static int radeonfb_set_par(struct fb_info *info)
         return 0;
 }
 
-
 static struct fb_ops radeonfb_ops = {
         .owner                  = THIS_MODULE,
         .fb_check_var           = radeonfb_check_var,
@@ -1879,6 +1867,7 @@ static int __devinit radeon_set_fbinfo (struct radeonfb_info *rinfo)
         info->par = rinfo;
         info->pseudo_palette = rinfo->pseudo_palette;
         info->flags = FBINFO_DEFAULT
+                    | FBINFO_HWACCEL_IMAGEBLIT
                     | FBINFO_HWACCEL_COPYAREA
                     | FBINFO_HWACCEL_FILLRECT
                     | FBINFO_HWACCEL_XPAN
@@ -2005,11 +1994,11 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo)
             (rinfo->family == CHIP_FAMILY_RS200) ||
             (rinfo->family == CHIP_FAMILY_RS300) ||
             (rinfo->family == CHIP_FAMILY_RC410) ||
+            (rinfo->family == CHIP_FAMILY_RS400) ||
             (rinfo->family == CHIP_FAMILY_RS480) ) {
           u32 tom = INREG(NB_TOM);
           tmp = ((((tom >> 16) - (tom & 0xffff) + 1) << 6) * 1024);
 
-                radeon_fifo_wait(6);
           OUTREG(MC_FB_LOCATION, tom);
           OUTREG(DISPLAY_BASE_ADDR, (tom & 0xffff) << 16);
           OUTREG(CRTC2_DISPLAY_BASE_ADDR, (tom & 0xffff) << 16);
diff --git a/drivers/video/aty/radeon_i2c.c b/drivers/video/aty/radeon_i2c.c
index 8c8fa35f1b7c..2c5567175dca 100644
--- a/drivers/video/aty/radeon_i2c.c
+++ b/drivers/video/aty/radeon_i2c.c
@@ -139,12 +139,8 @@ void radeon_delete_i2c_busses(struct radeonfb_info *rinfo)
 int radeon_probe_i2c_connector(struct radeonfb_info *rinfo, int conn,
                                u8 **out_edid)
 {
-        u32 reg = rinfo->i2c[conn-1].ddc_reg;
         u8 *edid;
 
-        OUTREG(reg, INREG(reg) &
-                        ~(VGA_DDC_DATA_OUTPUT | VGA_DDC_CLK_OUTPUT));
-
         edid = fb_ddc_read(&rinfo->i2c[conn-1].adapter);
 
         if (out_edid)
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
index 675abdafc2d8..3df5015f1d13 100644
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
@@ -2653,9 +2653,9 @@ int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
 
         if (!(info->flags & FBINFO_HWACCEL_DISABLED)) {
                 /* Make sure engine is reset */
-                radeon_engine_idle();
+                radeon_engine_idle(rinfo);
                 radeonfb_engine_reset(rinfo);
-                radeon_engine_idle();
+                radeon_engine_idle(rinfo);
         }
 
         /* Blank display and LCD */
@@ -2767,7 +2767,7 @@ int radeonfb_pci_resume(struct pci_dev *pdev)
 
                 rinfo->asleep = 0;
         } else
-                radeon_engine_idle();
+                radeon_engine_idle(rinfo);
 
         /* Restore display & engine */
         radeon_write_mode (rinfo, &rinfo->state, 1);
diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h
index ccbfffd12805..ea0b5b47acaf 100644
--- a/drivers/video/aty/radeonfb.h
+++ b/drivers/video/aty/radeonfb.h
@@ -53,6 +53,7 @@ enum radeon_family {
         CHIP_FAMILY_RV380,    /* RV370/RV380/M22/M24 */
         CHIP_FAMILY_R420,     /* R420/R423/M18 */
         CHIP_FAMILY_RC410,
+        CHIP_FAMILY_RS400,
         CHIP_FAMILY_RS480,
         CHIP_FAMILY_LAST,
 };
@@ -335,7 +336,15 @@ struct radeonfb_info {
         int                     mon2_type;
         u8                      *mon2_EDID;
 
-        u32                     dp_gui_master_cntl;
+        /* accel bits */
+        u32                     dp_gui_mc_base;
+        u32                     dp_gui_mc_cache;
+        u32                     dp_cntl_cache;
+        u32                     dp_brush_fg_cache;
+        u32                     dp_brush_bg_cache;
+        u32                     dp_src_fg_cache;
+        u32                     dp_src_bg_cache;
+        u32                     fifo_free;
 
         struct pll_info         pll;
 
@@ -347,6 +356,7 @@ struct radeonfb_info {
         int                     lock_blank;
         int                     dynclk;
         int                     no_schedule;
+        int                     gfx_mode;
         enum radeon_pm_mode     pm_mode;
         reinit_function_ptr     reinit_func;
 
@@ -391,8 +401,14 @@ static inline void _radeon_msleep(struct radeonfb_info *rinfo, unsigned long ms)
 #define OUTREG8(addr,val)       writeb(val, (rinfo->mmio_base)+addr)
 #define INREG16(addr)           readw((rinfo->mmio_base)+addr)
 #define OUTREG16(addr,val)      writew(val, (rinfo->mmio_base)+addr)
+
+#ifdef CONFIG_PPC
+#define INREG(addr)             ({ eieio(); ld_le32(rinfo->mmio_base+(addr)); })
+#define OUTREG(addr,val)        do { eieio(); st_le32(rinfo->mmio_base+(addr),(val)); } while(0)
+#else
 #define INREG(addr)             readl((rinfo->mmio_base)+addr)
 #define OUTREG(addr,val)        writel(val, (rinfo->mmio_base)+addr)
+#endif
 
 static inline void _OUTREGP(struct radeonfb_info *rinfo, u32 addr,
                        u32 val, u32 mask)
@@ -533,16 +549,25 @@ static inline u32 radeon_get_dstbpp(u16 depth)
 /*
  * 2D Engine helper routines
  */
+
+extern void radeon_fifo_update_and_wait(struct radeonfb_info *rinfo, int entries);
+
 static inline void radeon_engine_flush (struct radeonfb_info *rinfo)
 {
         int i;
 
-        /* initiate flush */
-        OUTREGP(RB2D_DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL,
+        /* Initiate flush */
+        OUTREGP(DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL,
                 ~RB2D_DC_FLUSH_ALL);
 
+        /* Ensure FIFO is empty, ie, make sure the flush commands
+         * has reached the cache
+         */
+        radeon_fifo_update_and_wait(rinfo, 64);
+
+        /* Wait for the flush to complete */
         for (i=0; i < 2000000; i++) {
-                if (!(INREG(RB2D_DSTCACHE_CTLSTAT) & RB2D_DC_BUSY))
+                if (!(INREG(DSTCACHE_CTLSTAT) & RB2D_DC_BUSY))
                         return;
                 udelay(1);
         }
@@ -550,25 +575,12 @@ static inline void radeon_engine_flush (struct radeonfb_info *rinfo)
 }
 
 
-static inline void _radeon_fifo_wait(struct radeonfb_info *rinfo, int entries)
-{
-        int i;
-
-        for (i=0; i<2000000; i++) {
-                if ((INREG(RBBM_STATUS) & 0x7f) >= entries)
-                        return;
-                udelay(1);
-        }
-        printk(KERN_ERR "radeonfb: FIFO Timeout !\n");
-}
-
-
-static inline void _radeon_engine_idle(struct radeonfb_info *rinfo)
+static inline void radeon_engine_idle(struct radeonfb_info *rinfo)
 {
         int i;
 
         /* ensure FIFO is empty before waiting for idle */
-        _radeon_fifo_wait (rinfo, 64);
+        radeon_fifo_update_and_wait (rinfo, 64);
 
         for (i=0; i<2000000; i++) {
                 if (((INREG(RBBM_STATUS) & GUI_ACTIVE)) == 0) {
@@ -581,8 +593,6 @@ static inline void _radeon_engine_idle(struct radeonfb_info *rinfo)
 }
 
 
-#define radeon_engine_idle()            _radeon_engine_idle(rinfo)
-#define radeon_fifo_wait(entries)       _radeon_fifo_wait(rinfo,entries)
 #define radeon_msleep(ms)               _radeon_msleep(rinfo,ms)
 
 
@@ -612,6 +622,7 @@ extern void radeonfb_imageblit(struct fb_info *p, const struct fb_image *image);
 extern int radeonfb_sync(struct fb_info *info);
 extern void radeonfb_engine_init (struct radeonfb_info *rinfo);
 extern void radeonfb_engine_reset(struct radeonfb_info *rinfo);
+extern void radeon_fixup_mem_offset(struct radeonfb_info *rinfo);
 
 /* Other functions */
 extern int radeon_screen_blank(struct radeonfb_info *rinfo, int blank, int mode_switch);
diff --git a/drivers/video/backlight/mbp_nvidia_bl.c b/drivers/video/backlight/mbp_nvidia_bl.c
index 385cba40ea87..06964af761c6 100644
--- a/drivers/video/backlight/mbp_nvidia_bl.c
+++ b/drivers/video/backlight/mbp_nvidia_bl.c
@@ -111,6 +111,4 @@ module_exit(mbp_exit);
 MODULE_AUTHOR("Matthew Garrett <mjg@redhat.com>");
 MODULE_DESCRIPTION("Nvidia-based Macbook Pro Backlight Driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("svnAppleInc.:pnMacBookPro3,1");
-MODULE_ALIAS("svnAppleInc.:pnMacBookPro3,2");
-MODULE_ALIAS("svnAppleInc.:pnMacBookPro4,1");
+MODULE_DEVICE_TABLE(dmi, mbp_device_table);
diff --git a/drivers/video/carminefb.c b/drivers/video/carminefb.c
index e15bb447440a..c9b191319a9a 100644
--- a/drivers/video/carminefb.c
+++ b/drivers/video/carminefb.c
@@ -535,7 +535,7 @@ static struct fb_ops carminefb_ops = {
         .fb_setcolreg   = carmine_setcolreg,
 };
 
-static int alloc_carmine_fb(void __iomem *regs, void __iomem *smem_base,
+static int __devinit alloc_carmine_fb(void __iomem *regs, void __iomem *smem_base,
                 int smem_offset, struct device *device, struct fb_info **rinfo)
 {
         int ret;
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index e729fb279645..048b139f0e50 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -327,29 +327,7 @@ static const struct {
 #endif /* CONFIG_ZORRO */
 
 struct cirrusfb_regs {
-        long freq;
-        long nom;
-        long den;
-        long div;
-        long multiplexing;
-        long mclk;
-        long divMCLK;
-
-        long HorizRes;          /* The x resolution in pixel */
-        long HorizTotal;
-        long HorizDispEnd;
-        long HorizBlankStart;
-        long HorizBlankEnd;
-        long HorizSyncStart;
-        long HorizSyncEnd;
-
-        long VertRes;           /* the physical y resolution in scanlines */
-        long VertTotal;
-        long VertDispEnd;
-        long VertSyncStart;
-        long VertSyncEnd;
-        long VertBlankStart;
-        long VertBlankEnd;
+        int multiplexing;
 };
 
 #ifdef CIRRUSFB_DEBUG
@@ -367,110 +345,13 @@ struct cirrusfb_info {
 
         struct cirrusfb_regs currentmode;
         int blank_mode;
+        u32 pseudo_palette[16];
 
-        u32     pseudo_palette[16];
-
-#ifdef CONFIG_ZORRO
-        struct zorro_dev *zdev;
-#endif
-#ifdef CONFIG_PCI
-        struct pci_dev *pdev;
-#endif
         void (*unmap)(struct fb_info *info);
 };
 
-static unsigned cirrusfb_def_mode = 1;
-static int noaccel;
-
-/*
- *    Predefined Video Modes
- */
-
-static const struct {
-        const char *name;
-        struct fb_var_screeninfo var;
-} cirrusfb_predefined[] = {
-        {
-                /* autodetect mode */
-                .name   = "Autodetect",
-        }, {
-                /* 640x480, 31.25 kHz, 60 Hz, 25 MHz PixClock */
-                .name   = "640x480",
-                .var    = {
-                        .xres           = 640,
-                        .yres           = 480,
-                        .xres_virtual   = 640,
-                        .yres_virtual   = 480,
-                        .bits_per_pixel = 8,
-                        .red            = { .length = 8 },
-                        .green          = { .length = 8 },
-                        .blue           = { .length = 8 },
-                        .width          = -1,
-                        .height         = -1,
-                        .pixclock       = 40000,
-                        .left_margin    = 48,
-                        .right_margin   = 16,
-                        .upper_margin   = 32,
-                        .lower_margin   = 8,
-                        .hsync_len      = 96,
-                        .vsync_len      = 4,
-                        .sync   = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-                        .vmode          = FB_VMODE_NONINTERLACED
-                 }
-        }, {
-                /* 800x600, 48 kHz, 76 Hz, 50 MHz PixClock */
-                .name   = "800x600",
-                .var    = {
-                        .xres           = 800,
-                        .yres           = 600,
-                        .xres_virtual   = 800,
-                        .yres_virtual   = 600,
-                        .bits_per_pixel = 8,
-                        .red            = { .length = 8 },
-                        .green          = { .length = 8 },
-                        .blue           = { .length = 8 },
-                        .width          = -1,
-                        .height         = -1,
-                        .pixclock       = 20000,
-                        .left_margin    = 128,
-                        .right_margin   = 16,
-                        .upper_margin   = 24,
-                        .lower_margin   = 2,
-                        .hsync_len      = 96,
-                        .vsync_len      = 6,
-                        .vmode          = FB_VMODE_NONINTERLACED
-                 }
-        }, {
-                /*
-                 * Modeline from XF86Config:
-                 * Mode "1024x768" 80  1024 1136 1340 1432  768 770 774 805
-                 */
-                /* 1024x768, 55.8 kHz, 70 Hz, 80 MHz PixClock */
-                .name   = "1024x768",
-                .var    = {
-                        .xres           = 1024,
-                        .yres           = 768,
-                        .xres_virtual   = 1024,
-                        .yres_virtual   = 768,
-                        .bits_per_pixel = 8,
-                        .red            = { .length = 8 },
-                        .green          = { .length = 8 },
-                        .blue           = { .length = 8 },
-                        .width          = -1,
-                        .height         = -1,
-                        .pixclock       = 12500,
-                        .left_margin    = 144,
-                        .right_margin   = 32,
-                        .upper_margin   = 30,
-                        .lower_margin   = 2,
-                        .hsync_len      = 192,
-                        .vsync_len      = 6,
-                        .vmode          = FB_VMODE_NONINTERLACED
-                }
-        }
-};
-
-#define NUM_TOTAL_MODES    ARRAY_SIZE(cirrusfb_predefined)
+static int noaccel __devinitdata;
+static char *mode_option __devinitdata = "640x480@60";
 
 /****************************************************************************/
 /**** BEGIN PROTOTYPES ******************************************************/
@@ -514,10 +395,6 @@ static struct fb_ops cirrusfb_ops = {
         .fb_imageblit   = cirrusfb_imageblit,
 };
 
-/*--- Hardware Specific Routines -------------------------------------------*/
-static int cirrusfb_decode_var(const struct fb_var_screeninfo *var,
-                                struct cirrusfb_regs *regs,
-                                struct fb_info *info);
 /*--- Internal routines ----------------------------------------------------*/
 static void init_vgachip(struct fb_info *info);
 static void switch_monitor(struct cirrusfb_info *cinfo, int on);
@@ -546,9 +423,7 @@ static void cirrusfb_RectFill(u8 __iomem *regbase, int bits_per_pixel,
                               u_short width, u_short height,
                               u_char color, u_short line_length);
 
-static void bestclock(long freq, long *best,
-                      long *nom, long *den,
-                      long *div, long maxfreq);
+static void bestclock(long freq, int *nom, int *den, int *div);
 
 #ifdef CIRRUSFB_DEBUG
 static void cirrusfb_dump(void);
@@ -584,45 +459,28 @@ static int cirrusfb_release(struct fb_info *info, int user)
 /****************************************************************************/
 /**** BEGIN Hardware specific Routines **************************************/
 
-/* Get a good MCLK value */
-static long cirrusfb_get_mclk(long freq, int bpp, long *div)
+/* Check if the MCLK is not a better clock source */
+static int cirrusfb_check_mclk(struct cirrusfb_info *cinfo, long freq)
 {
-        long mclk;
+        long mclk = vga_rseq(cinfo->regbase, CL_SEQR1F) & 0x3f;
 
-        assert(div != NULL);
-
-        /* Calculate MCLK, in case VCLK is high enough to require > 50MHz.
-         * Assume a 64-bit data path for now.  The formula is:
-         * ((B * PCLK * 2)/W) * 1.2
-         * B = bytes per pixel, PCLK = pixclock, W = data width in bytes */
-        mclk = ((bpp / 8) * freq * 2) / 4;
-        mclk = (mclk * 12) / 10;
-        if (mclk < 50000)
-                mclk = 50000;
-        DPRINTK("Use MCLK of %ld kHz\n", mclk);
-
-        /* Calculate value for SR1F.  Multiply by 2 so we can round up. */
-        mclk = ((mclk * 16) / 14318);
-        mclk = (mclk + 1) / 2;
-        DPRINTK("Set SR1F[5:0] to 0x%lx\n", mclk);
+        /* Read MCLK value */
+        mclk = (14318 * mclk) >> 3;
+        DPRINTK("Read MCLK of %ld kHz\n", mclk);
 
         /* Determine if we should use MCLK instead of VCLK, and if so, what we
-           * should divide it by to get VCLK */
-        switch (freq) {
-        case 24751 ... 25249:
-                *div = 2;
-                DPRINTK("Using VCLK = MCLK/2\n");
-                break;
-        case 49501 ... 50499:
-                *div = 1;
+         * should divide it by to get VCLK
+         */
+
+        if (abs(freq - mclk) < 250) {
                 DPRINTK("Using VCLK = MCLK\n");
-                break;
-        default:
-                *div = 0;
-                break;
+                return 1;
+        } else if (abs(freq - (mclk / 2)) < 250) {
+                DPRINTK("Using VCLK = MCLK/2\n");
+                return 2;
         }
 
-        return mclk;
+        return 0;
 }
 
 static int cirrusfb_check_var(struct fb_var_screeninfo *var,
@@ -638,7 +496,6 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var,
                 break;          /* 8 pixel per byte, only 1/4th of mem usable */
         case 8:
         case 16:
-        case 24:
         case 32:
                 break;          /* 1 pixel == 1 byte */
         default:
@@ -713,7 +570,6 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var,
                 var->blue.length = 5;
                 break;
 
-        case 24:
         case 32:
                 if (isPReP) {
                         var->red.offset = 8;
@@ -767,8 +623,6 @@ static int cirrusfb_decode_var(const struct fb_var_screeninfo *var,
         long maxclock;
         int maxclockidx = var->bits_per_pixel >> 3;
         struct cirrusfb_info *cinfo = info->par;
-        int xres, hfront, hsync, hback;
-        int yres, vfront, vsync, vback;
 
         switch (var->bits_per_pixel) {
         case 1:
@@ -782,10 +636,9 @@ static int cirrusfb_decode_var(const struct fb_var_screeninfo *var,
                 break;
 
         case 16:
-        case 24:
         case 32:
                 info->fix.line_length = var->xres_virtual * maxclockidx;
-                info->fix.visual = FB_VISUAL_DIRECTCOLOR;
+                info->fix.visual = FB_VISUAL_TRUECOLOR;
                 break;
 
         default:
@@ -827,90 +680,33 @@ static int cirrusfb_decode_var(const struct fb_var_screeninfo *var,
         switch (var->bits_per_pixel) {
         case 16:
         case 32:
-                if (regs->HorizRes <= 800)
+                if (var->xres <= 800)
                         /* Xbh has this type of clock for 32-bit */
                         freq /= 2;
                 break;
         }
 #endif
-
-        bestclock(freq, &regs->freq, &regs->nom, &regs->den, &regs->div,
-                  maxclock);
-        regs->mclk = cirrusfb_get_mclk(freq, var->bits_per_pixel,
-                                        &regs->divMCLK);
-
-        xres = var->xres;
-        hfront = var->right_margin;
-        hsync = var->hsync_len;
-        hback = var->left_margin;
-
-        yres = var->yres;
-        vfront = var->lower_margin;
-        vsync = var->vsync_len;
-        vback = var->upper_margin;
-
-        if (var->vmode & FB_VMODE_DOUBLE) {
-                yres *= 2;
-                vfront *= 2;
-                vsync *= 2;
-                vback *= 2;
-        } else if (var->vmode & FB_VMODE_INTERLACED) {
-                yres = (yres + 1) / 2;
-                vfront = (vfront + 1) / 2;
-                vsync = (vsync + 1) / 2;
-                vback = (vback + 1) / 2;
-        }
-        regs->HorizRes = xres;
-        regs->HorizTotal = (xres + hfront + hsync + hback) / 8 - 5;
-        regs->HorizDispEnd = xres / 8 - 1;
-        regs->HorizBlankStart = xres / 8;
-        /* does not count with "-5" */
-        regs->HorizBlankEnd = regs->HorizTotal + 5;
-        regs->HorizSyncStart = (xres + hfront) / 8 + 1;
-        regs->HorizSyncEnd = (xres + hfront + hsync) / 8 + 1;
-
-        regs->VertRes = yres;
-        regs->VertTotal = yres + vfront + vsync + vback - 2;
-        regs->VertDispEnd = yres - 1;
-        regs->VertBlankStart = yres;
-        regs->VertBlankEnd = regs->VertTotal;
-        regs->VertSyncStart = yres + vfront - 1;
-        regs->VertSyncEnd = yres + vfront + vsync - 1;
-
-        if (regs->VertRes >= 1024) {
-                regs->VertTotal /= 2;
-                regs->VertSyncStart /= 2;
-                regs->VertSyncEnd /= 2;
-                regs->VertDispEnd /= 2;
-        }
-        if (regs->multiplexing) {
-                regs->HorizTotal /= 2;
-                regs->HorizSyncStart /= 2;
-                regs->HorizSyncEnd /= 2;
-                regs->HorizDispEnd /= 2;
-        }
-
         return 0;
 }
 
-static void cirrusfb_set_mclk(const struct cirrusfb_info *cinfo, int val,
-                                int div)
+static void cirrusfb_set_mclk_as_source(const struct cirrusfb_info *cinfo,
+                                        int div)
 {
+        unsigned char old1f, old1e;
         assert(cinfo != NULL);
+        old1f = vga_rseq(cinfo->regbase, CL_SEQR1F) & ~0x40;
 
-        if (div == 2) {
-                /* VCLK = MCLK/2 */
-                unsigned char old = vga_rseq(cinfo->regbase, CL_SEQR1E);
-                vga_wseq(cinfo->regbase, CL_SEQR1E, old | 0x1);
-                vga_wseq(cinfo->regbase, CL_SEQR1F, 0x40 | (val & 0x3f));
-        } else if (div == 1) {
-                /* VCLK = MCLK */
-                unsigned char old = vga_rseq(cinfo->regbase, CL_SEQR1E);
-                vga_wseq(cinfo->regbase, CL_SEQR1E, old & ~0x1);
-                vga_wseq(cinfo->regbase, CL_SEQR1F, 0x40 | (val & 0x3f));
-        } else {
-                vga_wseq(cinfo->regbase, CL_SEQR1F, val & 0x3f);
+        if (div) {
+                DPRINTK("Set %s as pixclock source.\n",
+                                        (div == 2) ? "MCLK/2" : "MCLK");
+                old1f |= 0x40;
+                old1e = vga_rseq(cinfo->regbase, CL_SEQR1E) & ~0x1;
+                if (div == 2)
+                        old1e |= 1;
+
+                vga_wseq(cinfo->regbase, CL_SEQR1E, old1e);
         }
+        vga_wseq(cinfo->regbase, CL_SEQR1F, old1f);
 }
 
 /*************************************************************************
@@ -927,6 +723,10 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
         unsigned char tmp;
         int offset = 0, err;
         const struct cirrusfb_board_info_rec *bi;
+        int hdispend, hsyncstart, hsyncend, htotal;
+        int yres, vdispend, vsyncstart, vsyncend, vtotal;
+        long freq;
+        int nom, den, div;
 
         DPRINTK("ENTER\n");
         DPRINTK("Requested mode: %dx%dx%d\n",
@@ -944,76 +744,117 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
 
         bi = &cirrusfb_board_info[cinfo->btype];
 
+        hsyncstart = var->xres + var->right_margin;
+        hsyncend = hsyncstart + var->hsync_len;
+        htotal = (hsyncend + var->left_margin) / 8 - 5;
+        hdispend = var->xres / 8 - 1;
+        hsyncstart = hsyncstart / 8 + 1;
+        hsyncend = hsyncend / 8 + 1;
+
+        yres = var->yres;
+        vsyncstart = yres + var->lower_margin;
+        vsyncend = vsyncstart + var->vsync_len;
+        vtotal = vsyncend + var->upper_margin;
+        vdispend = yres - 1;
+
+        if (var->vmode & FB_VMODE_DOUBLE) {
+                yres *= 2;
+                vsyncstart *= 2;
+                vsyncend *= 2;
+                vtotal *= 2;
+        } else if (var->vmode & FB_VMODE_INTERLACED) {
+                yres = (yres + 1) / 2;
+                vsyncstart = (vsyncstart + 1) / 2;
+                vsyncend = (vsyncend + 1) / 2;
+                vtotal = (vtotal + 1) / 2;
+        }
+
+        vtotal -= 2;
+        vsyncstart -= 1;
+        vsyncend -= 1;
+
+        if (yres >= 1024) {
+                vtotal /= 2;
+                vsyncstart /= 2;
+                vsyncend /= 2;
+                vdispend /= 2;
+        }
+        if (regs.multiplexing) {
+                htotal /= 2;
+                hsyncstart /= 2;
+                hsyncend /= 2;
+                hdispend /= 2;
+        }
         /* unlock register VGA_CRTC_H_TOTAL..CRT7 */
         vga_wcrt(regbase, VGA_CRTC_V_SYNC_END, 0x20);   /* previously: 0x00) */
 
         /* if debugging is enabled, all parameters get output before writing */
-        DPRINTK("CRT0: %ld\n", regs.HorizTotal);
-        vga_wcrt(regbase, VGA_CRTC_H_TOTAL, regs.HorizTotal);
+        DPRINTK("CRT0: %d\n", htotal);
+        vga_wcrt(regbase, VGA_CRTC_H_TOTAL, htotal);
 
-        DPRINTK("CRT1: %ld\n", regs.HorizDispEnd);
-        vga_wcrt(regbase, VGA_CRTC_H_DISP, regs.HorizDispEnd);
+        DPRINTK("CRT1: %d\n", hdispend);
+        vga_wcrt(regbase, VGA_CRTC_H_DISP, hdispend);
 
-        DPRINTK("CRT2: %ld\n", regs.HorizBlankStart);
-        vga_wcrt(regbase, VGA_CRTC_H_BLANK_START, regs.HorizBlankStart);
+        DPRINTK("CRT2: %d\n", var->xres / 8);
+        vga_wcrt(regbase, VGA_CRTC_H_BLANK_START, var->xres / 8);
 
         /*  + 128: Compatible read */
-        DPRINTK("CRT3: 128+%ld\n", regs.HorizBlankEnd % 32);
+        DPRINTK("CRT3: 128+%d\n", (htotal + 5) % 32);
         vga_wcrt(regbase, VGA_CRTC_H_BLANK_END,
-                 128 + (regs.HorizBlankEnd % 32));
+                 128 + ((htotal + 5) % 32));
 
-        DPRINTK("CRT4: %ld\n", regs.HorizSyncStart);
-        vga_wcrt(regbase, VGA_CRTC_H_SYNC_START, regs.HorizSyncStart);
+        DPRINTK("CRT4: %d\n", hsyncstart);
+        vga_wcrt(regbase, VGA_CRTC_H_SYNC_START, hsyncstart);
 
-        tmp = regs.HorizSyncEnd % 32;
-        if (regs.HorizBlankEnd & 32)
+        tmp = hsyncend % 32;
+        if ((htotal + 5) & 32)
                 tmp += 128;
         DPRINTK("CRT5: %d\n", tmp);
         vga_wcrt(regbase, VGA_CRTC_H_SYNC_END, tmp);
 
-        DPRINTK("CRT6: %ld\n", regs.VertTotal & 0xff);
-        vga_wcrt(regbase, VGA_CRTC_V_TOTAL, (regs.VertTotal & 0xff));
+        DPRINTK("CRT6: %d\n", vtotal & 0xff);
+        vga_wcrt(regbase, VGA_CRTC_V_TOTAL, vtotal & 0xff);
 
         tmp = 16;               /* LineCompare bit #9 */
-        if (regs.VertTotal & 256)
+        if (vtotal & 256)
                 tmp |= 1;
-        if (regs.VertDispEnd & 256)
+        if (vdispend & 256)
                 tmp |= 2;
-        if (regs.VertSyncStart & 256)
+        if (vsyncstart & 256)
                 tmp |= 4;
-        if (regs.VertBlankStart & 256)
+        if ((vdispend + 1) & 256)
                 tmp |= 8;
-        if (regs.VertTotal & 512)
+        if (vtotal & 512)
                 tmp |= 32;
-        if (regs.VertDispEnd & 512)
+        if (vdispend & 512)
                 tmp |= 64;
-        if (regs.VertSyncStart & 512)
+        if (vsyncstart & 512)
                 tmp |= 128;
         DPRINTK("CRT7: %d\n", tmp);
         vga_wcrt(regbase, VGA_CRTC_OVERFLOW, tmp);
 
         tmp = 0x40;             /* LineCompare bit #8 */
-        if (regs.VertBlankStart & 512)
+        if ((vdispend + 1) & 512)
                 tmp |= 0x20;
         if (var->vmode & FB_VMODE_DOUBLE)
                 tmp |= 0x80;
         DPRINTK("CRT9: %d\n", tmp);
         vga_wcrt(regbase, VGA_CRTC_MAX_SCAN, tmp);
 
-        DPRINTK("CRT10: %ld\n", regs.VertSyncStart & 0xff);
-        vga_wcrt(regbase, VGA_CRTC_V_SYNC_START, regs.VertSyncStart & 0xff);
+        DPRINTK("CRT10: %d\n", vsyncstart & 0xff);
+        vga_wcrt(regbase, VGA_CRTC_V_SYNC_START, vsyncstart & 0xff);
 
-        DPRINTK("CRT11: 64+32+%ld\n", regs.VertSyncEnd % 16);
-        vga_wcrt(regbase, VGA_CRTC_V_SYNC_END, regs.VertSyncEnd % 16 + 64 + 32);
+        DPRINTK("CRT11: 64+32+%d\n", vsyncend % 16);
+        vga_wcrt(regbase, VGA_CRTC_V_SYNC_END, vsyncend % 16 + 64 + 32);
 
-        DPRINTK("CRT12: %ld\n", regs.VertDispEnd & 0xff);
-        vga_wcrt(regbase, VGA_CRTC_V_DISP_END, regs.VertDispEnd & 0xff);
+        DPRINTK("CRT12: %d\n", vdispend & 0xff);
+        vga_wcrt(regbase, VGA_CRTC_V_DISP_END, vdispend & 0xff);
 
-        DPRINTK("CRT15: %ld\n", regs.VertBlankStart & 0xff);
-        vga_wcrt(regbase, VGA_CRTC_V_BLANK_START, regs.VertBlankStart & 0xff);
+        DPRINTK("CRT15: %d\n", (vdispend + 1) & 0xff);
+        vga_wcrt(regbase, VGA_CRTC_V_BLANK_START, (vdispend + 1) & 0xff);
 
-        DPRINTK("CRT16: %ld\n", regs.VertBlankEnd & 0xff);
-        vga_wcrt(regbase, VGA_CRTC_V_BLANK_END, regs.VertBlankEnd & 0xff);
+        DPRINTK("CRT16: %d\n", vtotal & 0xff);
+        vga_wcrt(regbase, VGA_CRTC_V_BLANK_END, vtotal & 0xff);
 
         DPRINTK("CRT18: 0xff\n");
         vga_wcrt(regbase, VGA_CRTC_LINE_COMPARE, 0xff);
@@ -1021,38 +862,53 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
         tmp = 0;
         if (var->vmode & FB_VMODE_INTERLACED)
                 tmp |= 1;
-        if (regs.HorizBlankEnd & 64)
+        if ((htotal + 5) & 64)
                 tmp |= 16;
-        if (regs.HorizBlankEnd & 128)
+        if ((htotal + 5) & 128)
                 tmp |= 32;
-        if (regs.VertBlankEnd & 256)
+        if (vtotal & 256)
                 tmp |= 64;
-        if (regs.VertBlankEnd & 512)
+        if (vtotal & 512)
                 tmp |= 128;
 
         DPRINTK("CRT1a: %d\n", tmp);
         vga_wcrt(regbase, CL_CRT1A, tmp);
 
+        freq = PICOS2KHZ(var->pixclock);
+        bestclock(freq, &nom, &den, &div);
+
         /* set VCLK0 */
         /* hardware RefClock: 14.31818 MHz */
         /* formula: VClk = (OSC * N) / (D * (1+P)) */
         /* Example: VClk = (14.31818 * 91) / (23 * (1+1)) = 28.325 MHz */
 
-        vga_wseq(regbase, CL_SEQRB, regs.nom);
-        tmp = regs.den << 1;
-        if (regs.div != 0)
-                tmp |= 1;
+        if (cinfo->btype == BT_ALPINE) {
+                /* if freq is close to mclk or mclk/2 select mclk
+                 * as clock source
+                 */
+                int divMCLK = cirrusfb_check_mclk(cinfo, freq);
+                if (divMCLK)  {
+                        nom = 0;
+                        cirrusfb_set_mclk_as_source(cinfo, divMCLK);
+                }
+        }
+        if (nom) {
+                vga_wseq(regbase, CL_SEQRB, nom);
+                tmp = den << 1;
+                if (div != 0)
+                        tmp |= 1;
 
-        /* 6 bit denom; ONLY 5434!!! (bugged me 10 days) */
-        if ((cinfo->btype == BT_SD64) ||
-            (cinfo->btype == BT_ALPINE) ||
-            (cinfo->btype == BT_GD5480))
-                tmp |= 0x80;
+                /* 6 bit denom; ONLY 5434!!! (bugged me 10 days) */
+                if ((cinfo->btype == BT_SD64) ||
+                    (cinfo->btype == BT_ALPINE) ||
+                    (cinfo->btype == BT_GD5480))
+                        tmp |= 0x80;
 
-        DPRINTK("CL_SEQR1B: %ld\n", (long) tmp);
-        vga_wseq(regbase, CL_SEQR1B, tmp);
+                DPRINTK("CL_SEQR1B: %ld\n", (long) tmp);
+                vga_wseq(regbase, CL_SEQR1B, tmp);
+        }
 
-        if (regs.VertRes >= 1024)
+        if (yres >= 1024)
                 /* 1280x1024 */
                 vga_wcrt(regbase, VGA_CRTC_MODE, 0xc7);
         else
@@ -1066,7 +922,7 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
         /* don't know if it would hurt to also program this if no interlaced */
         /* mode is used, but I feel better this way.. :-) */
         if (var->vmode & FB_VMODE_INTERLACED)
-                vga_wcrt(regbase, VGA_CRTC_REGS, regs.HorizTotal / 2);
+                vga_wcrt(regbase, VGA_CRTC_REGS, htotal / 2);
         else
                 vga_wcrt(regbase, VGA_CRTC_REGS, 0x00); /* interlace control */
 
@@ -1240,7 +1096,6 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
 
                 case BT_ALPINE:
                         DPRINTK(" (for GD543x)\n");
-                        cirrusfb_set_mclk(cinfo, regs.mclk, regs.divMCLK);
                         /* We already set SRF and SR1F */
                         break;
 
@@ -1312,11 +1167,7 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
 
                 case BT_ALPINE:
                         DPRINTK(" (for GD543x)\n");
-                        if (regs.HorizRes >= 1024)
-                                vga_wseq(regbase, CL_SEQR7, 0xa7);
-                        else
-                                vga_wseq(regbase, CL_SEQR7, 0xa3);
-                        cirrusfb_set_mclk(cinfo, regs.mclk, regs.divMCLK);
+                        vga_wseq(regbase, CL_SEQR7, 0xa7);
                         break;
 
                 case BT_GD5480:
@@ -1360,7 +1211,7 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
          */
 
         else if (var->bits_per_pixel == 32) {
-                DPRINTK("cirrusfb: preparing for 24/32 bit deep display\n");
+                DPRINTK("cirrusfb: preparing for 32 bit deep display\n");
                 switch (cinfo->btype) {
                 case BT_SD64:
                         /* Extended Sequencer Mode: 256c col. mode */
@@ -1394,7 +1245,6 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
                 case BT_ALPINE:
                         DPRINTK(" (for GD543x)\n");
                         vga_wseq(regbase, CL_SEQR7, 0xa9);
-                        cirrusfb_set_mclk(cinfo, regs.mclk, regs.divMCLK);
                         break;
 
                 case BT_GD5480:
@@ -1949,8 +1799,6 @@ static void init_vgachip(struct fb_info *info)
         /* misc... */
         WHDR(cinfo, 0); /* Hidden DAC register: - */
 
-        printk(KERN_DEBUG "cirrusfb: This board has %ld bytes of DRAM memory\n",
-                info->screen_size);
         DPRINTK("EXIT\n");
         return;
 }
@@ -2122,7 +1970,7 @@ static int release_io_ports;
  * based on the DRAM bandwidth bit and DRAM bank switching bit.  This
  * works with 1MB, 2MB and 4MB configurations (which the Motorola boards
  * seem to have. */
-static unsigned int cirrusfb_get_memsize(u8 __iomem *regbase)
+static unsigned int __devinit cirrusfb_get_memsize(u8 __iomem *regbase)
 {
         unsigned long mem;
         unsigned char SRF;
@@ -2188,8 +2036,7 @@ static void get_pci_addrs(const struct pci_dev *pdev,
 
 static void cirrusfb_pci_unmap(struct fb_info *info)
 {
-        struct cirrusfb_info *cinfo = info->par;
-        struct pci_dev *pdev = cinfo->pdev;
+        struct pci_dev *pdev = to_pci_dev(info->device);
 
         iounmap(info->screen_base);
 #if 0 /* if system didn't claim this region, we would... */
@@ -2205,20 +2052,22 @@ static void cirrusfb_pci_unmap(struct fb_info *info)
 static void __devexit cirrusfb_zorro_unmap(struct fb_info *info)
 {
         struct cirrusfb_info *cinfo = info->par;
-        zorro_release_device(cinfo->zdev);
+        struct zorro_dev *zdev = to_zorro_dev(info->device);
+
+        zorro_release_device(zdev);
 
         if (cinfo->btype == BT_PICASSO4) {
                 cinfo->regbase -= 0x600000;
                 iounmap((void *)cinfo->regbase);
                 iounmap(info->screen_base);
         } else {
-                if (zorro_resource_start(cinfo->zdev) > 0x01000000)
+                if (zorro_resource_start(zdev) > 0x01000000)
                         iounmap(info->screen_base);
         }
 }
 #endif /* CONFIG_ZORRO */
 
-static int cirrusfb_set_fbinfo(struct fb_info *info)
+static int __devinit cirrusfb_set_fbinfo(struct fb_info *info)
 {
         struct cirrusfb_info *cinfo = info->par;
         struct fb_var_screeninfo *var = &info->var;
@@ -2235,7 +2084,7 @@ static int cirrusfb_set_fbinfo(struct fb_info *info)
         if (cinfo->btype == BT_GD5480) {
                 if (var->bits_per_pixel == 16)
                         info->screen_base += 1 * MB_;
-                if (var->bits_per_pixel == 24 || var->bits_per_pixel == 32)
+                if (var->bits_per_pixel == 32)
                         info->screen_base += 2 * MB_;
         }
 
@@ -2262,7 +2111,7 @@ static int cirrusfb_set_fbinfo(struct fb_info *info)
         return 0;
 }
 
-static int cirrusfb_register(struct fb_info *info)
+static int __devinit cirrusfb_register(struct fb_info *info)
 {
         struct cirrusfb_info *cinfo = info->par;
         int err;
@@ -2278,23 +2127,27 @@ static int cirrusfb_register(struct fb_info *info)
         /* sanity checks */
         assert(btype != BT_NONE);
 
+        /* set all the vital stuff */
+        cirrusfb_set_fbinfo(info);
+
         DPRINTK("cirrusfb: (RAM start set to: 0x%p)\n", info->screen_base);
 
-        /* Make pretend we've set the var so our structures are in a "good" */
-        /* state, even though we haven't written the mode to the hw yet...  */
-        info->var = cirrusfb_predefined[cirrusfb_def_mode].var;
+        err = fb_find_mode(&info->var, info, mode_option, NULL, 0, NULL, 8);
+        if (!err) {
+                DPRINTK("wrong initial video mode\n");
+                err = -EINVAL;
+                goto err_dealloc_cmap;
+        }
+
         info->var.activate = FB_ACTIVATE_NOW;
 
         err = cirrusfb_decode_var(&info->var, &cinfo->currentmode, info);
         if (err < 0) {
                 /* should never happen */
                 DPRINTK("choking on default var... umm, no good.\n");
-                goto err_unmap_cirrusfb;
+                goto err_dealloc_cmap;
         }
 
-        /* set all the vital stuff */
-        cirrusfb_set_fbinfo(info);
-
         err = register_framebuffer(info);
         if (err < 0) {
                 printk(KERN_ERR "cirrusfb: could not register "
@@ -2307,7 +2160,6 @@ static int cirrusfb_register(struct fb_info *info)
 
 err_dealloc_cmap:
         fb_dealloc_cmap(&info->cmap);
-err_unmap_cirrusfb:
         cinfo->unmap(info);
         framebuffer_release(info);
         return err;
@@ -2330,8 +2182,8 @@ static void __devexit cirrusfb_cleanup(struct fb_info *info)
 }
 
 #ifdef CONFIG_PCI
-static int cirrusfb_pci_register(struct pci_dev *pdev,
-                                  const struct pci_device_id *ent)
+static int __devinit cirrusfb_pci_register(struct pci_dev *pdev,
+                                           const struct pci_device_id *ent)
 {
         struct cirrusfb_info *cinfo;
         struct fb_info *info;
@@ -2353,7 +2205,6 @@ static int cirrusfb_pci_register(struct pci_dev *pdev,
         }
 
         cinfo = info->par;
-        cinfo->pdev = pdev;
         cinfo->btype = btype = (enum cirrus_board) ent->driver_data;
 
         DPRINTK(" Found PCI device, base address 0 is 0x%x, btype set to %d\n",
@@ -2459,8 +2310,8 @@ static struct pci_driver cirrusfb_pci_driver = {
 #endif /* CONFIG_PCI */
 
 #ifdef CONFIG_ZORRO
-static int cirrusfb_zorro_register(struct zorro_dev *z,
-                                   const struct zorro_device_id *ent)
+static int __devinit cirrusfb_zorro_register(struct zorro_dev *z,
+                                             const struct zorro_device_id *ent)
 {
         struct cirrusfb_info *cinfo;
         struct fb_info *info;
@@ -2489,7 +2340,6 @@ static int cirrusfb_zorro_register(struct zorro_dev *z,
         assert(z);
         assert(btype != BT_NONE);
 
-        cinfo->zdev = z;
         board_addr = zorro_resource_start(z);
         board_size = zorro_resource_len(z);
         info->screen_size = size;
@@ -2621,17 +2471,17 @@ static int __init cirrusfb_setup(char *options) {
                 return 0;
 
         while ((this_opt = strsep(&options, ",")) != NULL) {
-                if (!*this_opt) continue;
+                if (!*this_opt)
+                        continue;
 
                 DPRINTK("cirrusfb_setup: option '%s'\n", this_opt);
 
-                for (i = 0; i < NUM_TOTAL_MODES; i++) {
-                        sprintf(s, "mode:%s", cirrusfb_predefined[i].name);
-                        if (strcmp(this_opt, s) == 0)
-                                cirrusfb_def_mode = i;
-                }
                 if (!strcmp(this_opt, "noaccel"))
                         noaccel = 1;
+                else if (!strncmp(this_opt, "mode:", 5))
+                        mode_option = this_opt + 5;
+                else
+                        mode_option = this_opt;
         }
         return 0;
 }
@@ -2657,6 +2507,11 @@ static void __exit cirrusfb_exit(void)
 
 module_init(cirrusfb_init);
 
+module_param(mode_option, charp, 0);
+MODULE_PARM_DESC(mode_option, "Initial video mode e.g. '648x480-8@60'");
+module_param(noaccel, bool, 0);
+MODULE_PARM_DESC(noaccel, "Disable acceleration");
+
 #ifdef MODULE
 module_exit(cirrusfb_exit);
 #endif
@@ -3050,16 +2905,14 @@ static void cirrusfb_RectFill(u8 __iomem *regbase, int bits_per_pixel,
  * bestclock() - determine closest possible clock lower(?) than the
  * desired pixel clock
  **************************************************************************/
-static void bestclock(long freq, long *best, long *nom,
-                       long *den, long *div, long maxfreq)
+static void bestclock(long freq, int *nom, int *den, int *div)
 {
-        long n, h, d, f;
+        int n, d;
+        long h, diff;
 
-        assert(best != NULL);
         assert(nom != NULL);
         assert(den != NULL);
         assert(div != NULL);
-        assert(maxfreq > 0);
 
         *nom = 0;
         *den = 0;
@@ -3070,51 +2923,47 @@ static void bestclock(long freq, long *best, long *nom,
         if (freq < 8000)
                 freq = 8000;
 
-        if (freq > maxfreq)
-                freq = maxfreq;
-
-        *best = 0;
-        f = freq * 10;
+        diff = freq;
 
         for (n = 32; n < 128; n++) {
-                d = (143181 * n) / f;
+                int s = 0;
+
+                d = (14318 * n) / freq;
                 if ((d >= 7) && (d <= 63)) {
-                        if (d > 31)
-                                d = (d / 2) * 2;
-                        h = (14318 * n) / d;
-                        if (abs(h - freq) < abs(*best - freq)) {
-                                *best = h;
+                        int temp = d;
+
+                        if (temp > 31) {
+                                s = 1;
+                                temp >>= 1;
+                        }
+                        h = ((14318 * n) / temp) >> s;
+                        h = h > freq ? h - freq : freq - h;
+                        if (h < diff) {
+                                diff = h;
                                 *nom = n;
-                                if (d < 32) {
-                                        *den = d;
-                                        *div = 0;
-                                } else {
-                                        *den = d / 2;
-                                        *div = 1;
-                                }
+                                *den = temp;
+                                *div = s;
                         }
                 }
-                d = DIV_ROUND_UP(143181 * n, f);
+                d++;
                 if ((d >= 7) && (d <= 63)) {
-                        if (d > 31)
-                                d = (d / 2) * 2;
-                        h = (14318 * n) / d;
-                        if (abs(h - freq) < abs(*best - freq)) {
-                                *best = h;
+                        if (d > 31) {
+                                s = 1;
+                                d >>= 1;
+                        }
+                        h = ((14318 * n) / d) >> s;
+                        h = h > freq ? h - freq : freq - h;
+                        if (h < diff) {
+                                diff = h;
                                 *nom = n;
-                                if (d < 32) {
-                                        *den = d;
-                                        *div = 0;
-                                } else {
-                                        *den = d / 2;
-                                        *div = 1;
-                                }
+                                *den = d;
+                                *div = s;
                         }
                 }
         }
 
         DPRINTK("Best possible values for given frequency:\n");
-        DPRINTK("       best: %ld kHz  nom: %ld  den: %ld  div: %ld\n",
+        DPRINTK("       freq: %ld kHz  nom: %d  den: %d  div: %d\n",
                 freq, *nom, *den, *div);
 
         DPRINTK("EXIT\n");
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 9cbff84b787d..64b3d30027b8 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -1855,8 +1855,6 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
         struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
         struct display *p = &fb_display[vc->vc_num];
         int scroll_partial = info->flags & FBINFO_PARTIAL_PAN_OK;
-        unsigned short saved_ec;
-        int ret;
 
         if (fbcon_is_inactive(vc, info))
                 return -EINVAL;
@@ -1869,11 +1867,6 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
          *           whole screen (prevents flicker).
          */
 
-        saved_ec = vc->vc_video_erase_char;
-        vc->vc_video_erase_char = vc->vc_scrl_erase_char;
-
-        ret = 0;
-
         switch (dir) {
         case SM_UP:
                 if (count > vc->vc_rows)        /* Maximum realistic size */
@@ -1890,9 +1883,9 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
                         scr_memsetw((unsigned short *) (vc->vc_origin +
                                                         vc->vc_size_row *
                                                         (b - count)),
-                                    vc->vc_scrl_erase_char,
+                                    vc->vc_video_erase_char,
                                     vc->vc_size_row * count);
-                        ret = 1;
+                        return 1;
                         break;
 
                 case SCROLL_WRAP_MOVE:
@@ -1962,10 +1955,9 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
                         scr_memsetw((unsigned short *) (vc->vc_origin +
                                                         vc->vc_size_row *
                                                         (b - count)),
-                                    vc->vc_scrl_erase_char,
+                                    vc->vc_video_erase_char,
                                     vc->vc_size_row * count);
-                        ret = 1;
-                        break;
+                        return 1;
                 }
                 break;
 
@@ -1982,9 +1974,9 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
                         scr_memsetw((unsigned short *) (vc->vc_origin +
                                                         vc->vc_size_row *
                                                         t),
-                                    vc->vc_scrl_erase_char,
+                                    vc->vc_video_erase_char,
                                     vc->vc_size_row * count);
-                        ret = 1;
+                        return 1;
                         break;
 
                 case SCROLL_WRAP_MOVE:
@@ -2052,15 +2044,12 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
                         scr_memsetw((unsigned short *) (vc->vc_origin +
                                                         vc->vc_size_row *
                                                         t),
-                                    vc->vc_scrl_erase_char,
+                                    vc->vc_video_erase_char,
                                     vc->vc_size_row * count);
-                        ret = 1;
-                        break;
+                        return 1;
                 }
-                break;
         }
-        vc->vc_video_erase_char = saved_ec;
-        return ret;
+        return 0;
 }
 
 
@@ -2522,9 +2511,6 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
                         c = vc->vc_video_erase_char;
                         vc->vc_video_erase_char =
                             ((c & 0xfe00) >> 1) | (c & 0xff);
-                        c = vc->vc_scrl_erase_char;
-                        vc->vc_scrl_erase_char =
-                            ((c & 0xFE00) >> 1) | (c & 0xFF);
                         vc->vc_attr >>= 1;
                 }
         } else if (!vc->vc_hi_font_mask && cnt == 512) {
@@ -2555,14 +2541,9 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
                         if (vc->vc_can_do_color) {
                                 vc->vc_video_erase_char =
                                     ((c & 0xff00) << 1) | (c & 0xff);
-                                c = vc->vc_scrl_erase_char;
-                                vc->vc_scrl_erase_char =
-                                    ((c & 0xFF00) << 1) | (c & 0xFF);
                                 vc->vc_attr <<= 1;
-                        } else {
+                        } else
                                 vc->vc_video_erase_char = c & ~0x100;
-                                vc->vc_scrl_erase_char = c & ~0x100;
-                        }
                 }
 
         }
@@ -2996,8 +2977,8 @@ static void fbcon_set_all_vcs(struct fb_info *info)
                 p = &fb_display[vc->vc_num];
                 set_blitting_type(vc, info);
                 var_to_display(p, &info->var, info);
-                cols = FBCON_SWAP(p->rotate, info->var.xres, info->var.yres);
-                rows = FBCON_SWAP(p->rotate, info->var.yres, info->var.xres);
+                cols = FBCON_SWAP(ops->rotate, info->var.xres, info->var.yres);
+                rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
                 cols /= vc->vc_font.width;
                 rows /= vc->vc_font.height;
                 vc_resize(vc, cols, rows);
@@ -3592,8 +3573,8 @@ static int __init fb_console_init(void)
 
         acquire_console_sem();
         fb_register_client(&fbcon_event_notifier);
-        fbcon_device = device_create_drvdata(fb_class, NULL, MKDEV(0, 0),
-                                             NULL, "fbcon");
+        fbcon_device = device_create(fb_class, NULL, MKDEV(0, 0), NULL,
+                                     "fbcon");
 
         if (IS_ERR(fbcon_device)) {
                 printk(KERN_WARNING "Unable to create device "
diff --git a/drivers/video/console/mdacon.c b/drivers/video/console/mdacon.c
index 9901064199bd..dd3eaaad4441 100644
--- a/drivers/video/console/mdacon.c
+++ b/drivers/video/console/mdacon.c
@@ -533,7 +533,7 @@ static void mdacon_cursor(struct vc_data *c, int mode)
 
 static int mdacon_scroll(struct vc_data *c, int t, int b, int dir, int lines)
 {
-        u16 eattr = mda_convert_attr(c->vc_scrl_erase_char);
+        u16 eattr = mda_convert_attr(c->vc_video_erase_char);
 
         if (!lines)
                 return 0;
diff --git a/drivers/video/console/sticon.c b/drivers/video/console/sticon.c
index 4055dbdd1b42..491c1c1baf4c 100644
--- a/drivers/video/console/sticon.c
+++ b/drivers/video/console/sticon.c
@@ -170,12 +170,12 @@ static int sticon_scroll(struct vc_data *conp, int t, int b, int dir, int count)
     switch (dir) {
     case SM_UP:
         sti_bmove(sti, t + count, 0, t, 0, b - t - count, conp->vc_cols);
-        sti_clear(sti, b - count, 0, count, conp->vc_cols, conp->vc_scrl_erase_char);
+        sti_clear(sti, b - count, 0, count, conp->vc_cols, conp->vc_video_erase_char);
         break;
 
     case SM_DOWN:
         sti_bmove(sti, t, 0, t + count, 0, b - t - count, conp->vc_cols);
-        sti_clear(sti, t, 0, count, conp->vc_cols, conp->vc_scrl_erase_char);
+        sti_clear(sti, t, 0, count, conp->vc_cols, conp->vc_video_erase_char);
         break;
     }
 
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index bd1f57b259d9..448d209a0bf2 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -239,8 +239,7 @@ static void vgacon_restore_screen(struct vc_data *c)
 
 static int vgacon_scrolldelta(struct vc_data *c, int lines)
 {
-        int start, end, count, soff, diff;
-        void *d, *s;
+        int start, end, count, soff;
 
         if (!lines) {
                 c->vc_visible_origin = c->vc_origin;
@@ -287,29 +286,29 @@ static int vgacon_scrolldelta(struct vc_data *c, int lines)
         if (count > c->vc_rows)
                 count = c->vc_rows;
 
-        diff = c->vc_rows - count;
+        if (count) {
+                int copysize;
 
-        d = (void *) c->vc_origin;
-        s = (void *) c->vc_screenbuf;
+                int diff = c->vc_rows - count;
+                void *d = (void *) c->vc_origin;
+                void *s = (void *) c->vc_screenbuf;
 
-        while (count--) {
-                scr_memcpyw(d, vgacon_scrollback + soff, c->vc_size_row);
-                d += c->vc_size_row;
-                soff += c->vc_size_row;
+                count *= c->vc_size_row;
+                /* how much memory to end of buffer left? */
+                copysize = min(count, vgacon_scrollback_size - soff);
+                scr_memcpyw(d, vgacon_scrollback + soff, copysize);
+                d += copysize;
+                count -= copysize;
 
-                if (soff >= vgacon_scrollback_size)
-                        soff = 0;
-        }
+                if (count) {
+                        scr_memcpyw(d, vgacon_scrollback, count);
+                        d += count;
+                }
 
-        if (diff == c->vc_rows) {
+                if (diff)
+                        scr_memcpyw(d, s, diff * c->vc_size_row);
+        } else
                 vgacon_cursor(c, CM_MOVE);
-        } else {
-                while (diff--) {
-                        scr_memcpyw(d, s, c->vc_size_row);
-                        d += c->vc_size_row;
-                        s += c->vc_size_row;
-                }
-        }
 
         return 1;
 }
@@ -1350,7 +1349,7 @@ static int vgacon_scroll(struct vc_data *c, int t, int b, int dir,
                 } else
                         c->vc_origin += delta;
                 scr_memsetw((u16 *) (c->vc_origin + c->vc_screenbuf_size -
-                                     delta), c->vc_scrl_erase_char,
+                                     delta), c->vc_video_erase_char,
                             delta);
         } else {
                 if (oldo - delta < vga_vram_base) {
@@ -1363,7 +1362,7 @@ static int vgacon_scroll(struct vc_data *c, int t, int b, int dir,
                 } else
                         c->vc_origin -= delta;
                 c->vc_scr_end = c->vc_origin + c->vc_screenbuf_size;
-                scr_memsetw((u16 *) (c->vc_origin), c->vc_scrl_erase_char,
+                scr_memsetw((u16 *) (c->vc_origin), c->vc_video_erase_char,
                             delta);
         }
         c->vc_scr_end = c->vc_origin + c->vc_screenbuf_size;
diff --git a/drivers/video/display/display-sysfs.c b/drivers/video/display/display-sysfs.c
index 6ef800bdf482..4830b1bf51e5 100644
--- a/drivers/video/display/display-sysfs.c
+++ b/drivers/video/display/display-sysfs.c
@@ -153,12 +153,9 @@ struct display_device *display_device_register(struct display_driver *driver,
                 mutex_unlock(&allocated_dsp_lock);
 
                 if (!ret) {
-                        new_dev->dev = device_create_drvdata(display_class,
-                                                             parent,
-                                                             MKDEV(0,0),
-                                                             new_dev,
-                                                             "display%d",
-                                                             new_dev->idx);
+                        new_dev->dev = device_create(display_class, parent,
+                                                     MKDEV(0, 0), new_dev,
+                                                     "display%d", new_dev->idx);
                         if (!IS_ERR(new_dev->dev)) {
                                 new_dev->parent = parent;
                                 new_dev->driver = driver;
diff --git a/drivers/video/efifb.c b/drivers/video/efifb.c
index bd779ae44b1e..daf9b81878a4 100644
--- a/drivers/video/efifb.c
+++ b/drivers/video/efifb.c
@@ -12,6 +12,7 @@
 #include <linux/fb.h>
 #include <linux/platform_device.h>
 #include <linux/screen_info.h>
+#include <linux/dmi.h>
 
 #include <video/vga.h>
 
@@ -33,6 +34,105 @@ static struct fb_fix_screeninfo efifb_fix __initdata = {
         .visual                 = FB_VISUAL_TRUECOLOR,
 };
 
+enum {
+        M_I17,          /* 17-Inch iMac */
+        M_I20,          /* 20-Inch iMac */
+        M_I20_SR,       /* 20-Inch iMac (Santa Rosa) */
+        M_I24,          /* 24-Inch iMac */
+        M_MINI,         /* Mac Mini */
+        M_MB,           /* MacBook */
+        M_MB_2,         /* MacBook, 2nd rev. */
+        M_MB_3,         /* MacBook, 3rd rev. */
+        M_MB_SR,        /* MacBook, 2nd gen, (Santa Rosa) */
+        M_MBA,          /* MacBook Air */
+        M_MBP,          /* MacBook Pro */
+        M_MBP_2,        /* MacBook Pro 2nd gen */
+        M_MBP_SR,       /* MacBook Pro (Santa Rosa) */
+        M_MBP_4,        /* MacBook Pro, 4th gen */
+        M_UNKNOWN       /* placeholder */
+};
+
+static struct efifb_dmi_info {
+        char *optname;
+        unsigned long base;
+        int stride;
+        int width;
+        int height;
+} dmi_list[] = {
+        [M_I17] = { "i17", 0x80010000, 1472 * 4, 1440, 900 },
+        [M_I20] = { "i20", 0x80010000, 1728 * 4, 1680, 1050 }, /* guess */
+        [M_I20_SR] = { "imac7", 0x40010000, 1728 * 4, 1680, 1050 },
+        [M_I24] = { "i24", 0x80010000, 2048 * 4, 1920, 1200 }, /* guess */
+        [M_MINI]= { "mini", 0x80000000, 2048 * 4, 1024, 768 },
+        [M_MB] = { "macbook", 0x80000000, 2048 * 4, 1280, 800 },
+        [M_MBA] = { "mba", 0x80000000, 2048 * 4, 1280, 800 },
+        [M_MBP] = { "mbp", 0x80010000, 1472 * 4, 1440, 900 },
+        [M_MBP_2] = { "mbp2", 0, 0, 0, 0 }, /* placeholder */
+        [M_MBP_SR] = { "mbp3", 0x80030000, 2048 * 4, 1440, 900 },
+        [M_MBP_4] = { "mbp4", 0xc0060000, 2048 * 4, 1920, 1200 },
+        [M_UNKNOWN] = { NULL, 0, 0, 0, 0 }
+};
+
+static int set_system(const struct dmi_system_id *id);
+
+#define EFIFB_DMI_SYSTEM_ID(vendor, name, enumid)               \
+        { set_system, name, {                                   \
+                DMI_MATCH(DMI_BIOS_VENDOR, vendor),             \
+                DMI_MATCH(DMI_PRODUCT_NAME, name) },            \
+          &dmi_list[enumid] }
+
+static struct dmi_system_id __initdata dmi_system_table[] = {
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "iMac4,1", M_I17),
+        /* At least one of these two will be right; maybe both? */
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "iMac5,1", M_I20),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac5,1", M_I20),
+        /* At least one of these two will be right; maybe both? */
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "iMac6,1", M_I24),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac6,1", M_I24),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac7,1", M_I20_SR),
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "Macmini1,1", M_MINI),
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook1,1", M_MB),
+        /* At least one of these two will be right; maybe both? */
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook2,1", M_MB),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook2,1", M_MB),
+        /* At least one of these two will be right; maybe both? */
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook3,1", M_MB),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook3,1", M_MB),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook4,1", M_MB),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookAir1,1", M_MBA),
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro1,1", M_MBP),
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro2,1", M_MBP_2),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro2,1", M_MBP_2),
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro3,1", M_MBP_SR),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro3,1", M_MBP_SR),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro4,1", M_MBP_4),
+        {},
+};
+
+static int set_system(const struct dmi_system_id *id)
+{
+        struct efifb_dmi_info *info = id->driver_data;
+        if (info->base == 0)
+                return -ENODEV;
+
+        printk(KERN_INFO "efifb: dmi detected %s - framebuffer at %p "
+                         "(%dx%d, stride %d)\n", id->ident,
+                         (void *)info->base, info->width, info->height,
+                         info->stride);
+
+        /* Trust the bootloader over the DMI tables */
+        if (screen_info.lfb_base == 0)
+                screen_info.lfb_base = info->base;
+        if (screen_info.lfb_linelength == 0)
+                screen_info.lfb_linelength = info->stride;
+        if (screen_info.lfb_width == 0)
+                screen_info.lfb_width = info->width;
+        if (screen_info.lfb_height == 0)
+                screen_info.lfb_height = info->height;
+
+        return 0;
+}
+
 static int efifb_setcolreg(unsigned regno, unsigned red, unsigned green,
                            unsigned blue, unsigned transp,
                            struct fb_info *info)
@@ -67,6 +167,38 @@ static struct fb_ops efifb_ops = {
         .fb_imageblit   = cfb_imageblit,
 };
 
+static int __init efifb_setup(char *options)
+{
+        char *this_opt;
+        int i;
+
+        if (!options || !*options)
+                return 0;
+
+        while ((this_opt = strsep(&options, ",")) != NULL) {
+                if (!*this_opt) continue;
+
+                for (i = 0; i < M_UNKNOWN; i++) {
+                        if (!strcmp(this_opt, dmi_list[i].optname) &&
+                                        dmi_list[i].base != 0) {
+                                screen_info.lfb_base = dmi_list[i].base;
+                                screen_info.lfb_linelength = dmi_list[i].stride;
+                                screen_info.lfb_width = dmi_list[i].width;
+                                screen_info.lfb_height = dmi_list[i].height;
+                        }
+                }
+                if (!strncmp(this_opt, "base:", 5))
+                        screen_info.lfb_base = simple_strtoul(this_opt+5, NULL, 0);
+                else if (!strncmp(this_opt, "stride:", 7))
+                        screen_info.lfb_linelength = simple_strtoul(this_opt+7, NULL, 0) * 4;
+                else if (!strncmp(this_opt, "height:", 7))
+                        screen_info.lfb_height = simple_strtoul(this_opt+7, NULL, 0);
+                else if (!strncmp(this_opt, "width:", 6))
+                        screen_info.lfb_width = simple_strtoul(this_opt+6, NULL, 0);
+        }
+        return 0;
+}
+
 static int __init efifb_probe(struct platform_device *dev)
 {
         struct fb_info *info;
@@ -74,6 +206,26 @@ static int __init efifb_probe(struct platform_device *dev)
         unsigned int size_vmode;
         unsigned int size_remap;
         unsigned int size_total;
+        int request_succeeded = 0;
+
+        printk(KERN_INFO "efifb: probing for efifb\n");
+
+        if (!screen_info.lfb_depth)
+                screen_info.lfb_depth = 32;
+        if (!screen_info.pages)
+                screen_info.pages = 1;
+
+        /* just assume they're all unset if any are */
+        if (!screen_info.blue_size) {
+                screen_info.blue_size = 8;
+                screen_info.blue_pos = 0;
+                screen_info.green_size = 8;
+                screen_info.green_pos = 8;
+                screen_info.red_size = 8;
+                screen_info.red_pos = 16;
+                screen_info.rsvd_size = 8;
+                screen_info.rsvd_pos = 24;
+        }
 
         efifb_fix.smem_start = screen_info.lfb_base;
         efifb_defined.bits_per_pixel = screen_info.lfb_depth;
@@ -98,21 +250,25 @@ static int __init efifb_probe(struct platform_device *dev)
          *                 option to simply use size_total as that
          *                 wastes plenty of kernel address space. */
         size_remap  = size_vmode * 2;
-        if (size_remap < size_vmode)
-                size_remap = size_vmode;
         if (size_remap > size_total)
                 size_remap = size_total;
+        if (size_remap % PAGE_SIZE)
+                size_remap += PAGE_SIZE - (size_remap % PAGE_SIZE);
         efifb_fix.smem_len = size_remap;
 
-        if (!request_mem_region(efifb_fix.smem_start, size_total, "efifb"))
+        if (request_mem_region(efifb_fix.smem_start, size_remap, "efifb")) {
+                request_succeeded = 1;
+        } else {
                 /* We cannot make this fatal. Sometimes this comes from magic
                    spaces our resource handlers simply don't know about */
                 printk(KERN_WARNING
                        "efifb: cannot reserve video memory at 0x%lx\n",
                         efifb_fix.smem_start);
+        }
 
         info = framebuffer_alloc(sizeof(u32) * 16, &dev->dev);
         if (!info) {
+                printk(KERN_ERR "efifb: cannot allocate framebuffer\n");
                 err = -ENOMEM;
                 goto err_release_mem;
         }
@@ -125,7 +281,7 @@ static int __init efifb_probe(struct platform_device *dev)
                                 "0x%x @ 0x%lx\n",
                         efifb_fix.smem_len, efifb_fix.smem_start);
                 err = -EIO;
-                goto err_unmap;
+                goto err_release_fb;
         }
 
         printk(KERN_INFO "efifb: framebuffer at 0x%lx, mapped to 0x%p, "
@@ -178,25 +334,27 @@ static int __init efifb_probe(struct platform_device *dev)
         info->fix = efifb_fix;
         info->flags = FBINFO_FLAG_DEFAULT;
 
-        if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
-                err = -ENOMEM;
+        if ((err = fb_alloc_cmap(&info->cmap, 256, 0)) < 0) {
+                printk(KERN_ERR "efifb: cannot allocate colormap\n");
                 goto err_unmap;
         }
-        if (register_framebuffer(info) < 0) {
-                err = -EINVAL;
+        if ((err = register_framebuffer(info)) < 0) {
+                printk(KERN_ERR "efifb: cannot register framebuffer\n");
                 goto err_fb_dealoc;
         }
         printk(KERN_INFO "fb%d: %s frame buffer device\n",
-               info->node, info->fix.id);
+                info->node, info->fix.id);
         return 0;
 
 err_fb_dealoc:
         fb_dealloc_cmap(&info->cmap);
 err_unmap:
         iounmap(info->screen_base);
+err_release_fb:
         framebuffer_release(info);
 err_release_mem:
-        release_mem_region(efifb_fix.smem_start, size_total);
+        if (request_succeeded)
+                release_mem_region(efifb_fix.smem_start, size_total);
         return err;
 }
 
@@ -214,9 +372,22 @@ static struct platform_device efifb_device = {
 static int __init efifb_init(void)
 {
         int ret;
+        char *option = NULL;
 
         if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI)
                 return -ENODEV;
+        dmi_check_system(dmi_system_table);
+
+        if (fb_get_options("efifb", &option))
+                return -ENODEV;
+        efifb_setup(option);
+
+        /* We don't get linelength from UGA Draw Protocol, only from
+         * EFI Graphics Protocol.  So if it's not in DMI, and it's not
+         * passed in from the user, we really can't use the framebuffer.
+         */
+        if (!screen_info.lfb_linelength)
+                return -ENODEV;
 
         ret = platform_driver_register(&efifb_driver);
 
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 0737570030f5..217c5118ae9e 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -28,9 +28,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/console.h>
-#ifdef CONFIG_KMOD
 #include <linux/kmod.h>
-#endif
 #include <linux/err.h>
 #include <linux/device.h>
 #include <linux/efi.h>
@@ -837,13 +835,6 @@ fb_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
         return (cnt) ? cnt : err;
 }
 
-#ifdef CONFIG_KMOD
-static void try_to_load(int fb)
-{
-        request_module("fb%d", fb);
-}
-#endif /* CONFIG_KMOD */
-
 int
 fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var)
 {
@@ -1086,10 +1077,8 @@ fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                     return -EINVAL;
                 if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
                     return -EINVAL;
-#ifdef CONFIG_KMOD
                 if (!registered_fb[con2fb.framebuffer])
-                    try_to_load(con2fb.framebuffer);
-#endif /* CONFIG_KMOD */
+                    request_module("fb%d", con2fb.framebuffer);
                 if (!registered_fb[con2fb.framebuffer])
                     return -EINVAL;
                 event.info = info;
@@ -1327,10 +1316,8 @@ fb_open(struct inode *inode, struct file *file)
         if (fbidx >= FB_MAX)
                 return -ENODEV;
         lock_kernel();
-#ifdef CONFIG_KMOD
         if (!(info = registered_fb[fbidx]))
-                try_to_load(fbidx);
-#endif /* CONFIG_KMOD */
+                request_module("fb%d", fbidx);
         if (!(info = registered_fb[fbidx])) {
                 res = -ENODEV;
                 goto out;
@@ -1443,9 +1430,8 @@ register_framebuffer(struct fb_info *fb_info)
                         break;
         fb_info->node = i;
 
-        fb_info->dev = device_create_drvdata(fb_class, fb_info->device,
-                                             MKDEV(FB_MAJOR, i), NULL,
-                                             "fb%d", i);
+        fb_info->dev = device_create(fb_class, fb_info->device,
+                                     MKDEV(FB_MAJOR, i), NULL, "fb%d", i);
         if (IS_ERR(fb_info->dev)) {
                 /* Not fatal */
                 printk(KERN_WARNING "Unable to create device for framebuffer %d; errno = %ld\n", i, PTR_ERR(fb_info->dev));
diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c
index 6a0aa180c266..5c1a2c01778f 100644
--- a/drivers/video/fbmon.c
+++ b/drivers/video/fbmon.c
@@ -564,7 +564,13 @@ static void get_detailed_timing(unsigned char *block,
                 mode->sync |= FB_SYNC_VERT_HIGH_ACT;
         mode->refresh = PIXEL_CLOCK/((H_ACTIVE + H_BLANKING) *
                                      (V_ACTIVE + V_BLANKING));
-        mode->vmode = 0;
+        if (INTERLACED) {
+                mode->yres *= 2;
+                mode->upper_margin *= 2;
+                mode->lower_margin *= 2;
+                mode->vsync_len *= 2;
+                mode->vmode |= FB_VMODE_INTERLACED;
+        }
         mode->flag = FB_MODE_IS_DETAILED;
 
         DPRINTK("      %d MHz ",  PIXEL_CLOCK/1000000);
diff --git a/drivers/video/imacfb.c b/drivers/video/imacfb.c
index 9366ef2bb5f7..e69de29bb2d1 100644
--- a/drivers/video/imacfb.c
+++ b/drivers/video/imacfb.c
@@ -1,376 +0,0 @@
-/*
- * framebuffer driver for Intel Based Mac's
- *
- * (c) 2006 Edgar Hucek <gimli@dark-green.com>
- * Original imac driver written by Gerd Knorr <kraxel@goldbach.in-berlin.de>
- *
- */
-
-#include <linux/delay.h>
-#include <linux/errno.h>
-#include <linux/fb.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/ioport.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/screen_info.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/dmi.h>
-#include <linux/efi.h>
-
-#include <asm/io.h>
-
-#include <video/vga.h>
-
-typedef enum _MAC_TYPE {
-        M_I17,
-        M_I20,
-        M_MINI,
-        M_MACBOOK,
-        M_UNKNOWN
-} MAC_TYPE;
-
-/* --------------------------------------------------------------------- */
-
-static struct fb_var_screeninfo imacfb_defined __initdata = {
-        .activate               = FB_ACTIVATE_NOW,
-        .height                 = -1,
-        .width                  = -1,
-        .right_margin           = 32,
-        .upper_margin           = 16,
-        .lower_margin           = 4,
-        .vsync_len              = 4,
-        .vmode                  = FB_VMODE_NONINTERLACED,
-};
-
-static struct fb_fix_screeninfo imacfb_fix __initdata = {
-        .id                     = "IMAC VGA",
-        .type                   = FB_TYPE_PACKED_PIXELS,
-        .accel                  = FB_ACCEL_NONE,
-        .visual                 = FB_VISUAL_TRUECOLOR,
-};
-
-static int inverse;
-static int model                = M_UNKNOWN;
-static int manual_height;
-static int manual_width;
-
-static int set_system(const struct dmi_system_id *id)
-{
-        printk(KERN_INFO "imacfb: %s detected - set system to %ld\n",
-                id->ident, (long)id->driver_data);
-
-        model = (long)id->driver_data;
-
-        return 0;
-}
-
-static struct dmi_system_id __initdata dmi_system_table[] = {
-        { set_system, "iMac4,1", {
-          DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
-          DMI_MATCH(DMI_PRODUCT_NAME,"iMac4,1") }, (void*)M_I17},
-        { set_system, "MacBookPro1,1", {
-          DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
-          DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro1,1") }, (void*)M_I17},
-        { set_system, "MacBook1,1", {
-          DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
-          DMI_MATCH(DMI_PRODUCT_NAME,"MacBook1,1")}, (void *)M_MACBOOK},
-        { set_system, "Macmini1,1", {
-          DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
-          DMI_MATCH(DMI_PRODUCT_NAME,"Macmini1,1")}, (void *)M_MINI},
-        {},
-};
-
-#define DEFAULT_FB_MEM  1024*1024*16
-
-/* --------------------------------------------------------------------- */
-
-static int imacfb_setcolreg(unsigned regno, unsigned red, unsigned green,
-                            unsigned blue, unsigned transp,
-                            struct fb_info *info)
-{
-        /*
-         *  Set a single color register. The values supplied are
-         *  already rounded down to the hardware's capabilities
-         *  (according to the entries in the `var' structure). Return
-         *  != 0 for invalid regno.
-         */
-
-        if (regno >= info->cmap.len)
-                return 1;
-
-        if (regno < 16) {
-                red   >>= 8;
-                green >>= 8;
-                blue  >>= 8;
-                ((u32 *)(info->pseudo_palette))[regno] =
-                        (red   << info->var.red.offset)   |
-                        (green << info->var.green.offset) |
-                        (blue  << info->var.blue.offset);
-        }
-        return 0;
-}
-
-static struct fb_ops imacfb_ops = {
-        .owner          = THIS_MODULE,
-        .fb_setcolreg   = imacfb_setcolreg,
-        .fb_fillrect    = cfb_fillrect,
-        .fb_copyarea    = cfb_copyarea,
-        .fb_imageblit   = cfb_imageblit,
-};
-
-static int __init imacfb_setup(char *options)
-{
-        char *this_opt;
-
-        if (!options || !*options)
-                return 0;
-
-        while ((this_opt = strsep(&options, ",")) != NULL) {
-                if (!*this_opt) continue;
-
-                if (!strcmp(this_opt, "inverse"))
-                        inverse = 1;
-                else if (!strcmp(this_opt, "i17"))
-                        model = M_I17;
-                else if (!strcmp(this_opt, "i20"))
-                        model = M_I20;
-                else if (!strcmp(this_opt, "mini"))
-                        model = M_MINI;
-                else if (!strcmp(this_opt, "macbook"))
-                        model = M_MACBOOK;
-                else if (!strncmp(this_opt, "height:", 7))
-                        manual_height = simple_strtoul(this_opt+7, NULL, 0);
-                else if (!strncmp(this_opt, "width:", 6))
-                        manual_width = simple_strtoul(this_opt+6, NULL, 0);
-        }
-        return 0;
-}
-
-static int __init imacfb_probe(struct platform_device *dev)
-{
-        struct fb_info *info;
-        int err;
-        unsigned int size_vmode;
-        unsigned int size_remap;
-        unsigned int size_total;
-
-        screen_info.lfb_depth = 32;
-        screen_info.lfb_size = DEFAULT_FB_MEM / 0x10000;
-        screen_info.pages=1;
-        screen_info.blue_size = 8;
-        screen_info.blue_pos = 0;
-        screen_info.green_size = 8;
-        screen_info.green_pos = 8;
-        screen_info.red_size = 8;
-        screen_info.red_pos = 16;
-        screen_info.rsvd_size = 8;
-        screen_info.rsvd_pos = 24;
-
-        switch (model) {
-        case M_I17:
-                screen_info.lfb_width = 1440;
-                screen_info.lfb_height = 900;
-                screen_info.lfb_linelength = 1472 * 4;
-                screen_info.lfb_base = 0x80010000;
-                break;
-        case M_I20:
-                screen_info.lfb_width = 1680;
-                screen_info.lfb_height = 1050;
-                screen_info.lfb_linelength = 1728 * 4;
-                screen_info.lfb_base = 0x80010000;
-                break;
-        case M_MINI:
-                screen_info.lfb_width = 1024;
-                screen_info.lfb_height = 768;
-                screen_info.lfb_linelength = 2048 * 4;
-                screen_info.lfb_base = 0x80000000;
-                break;
-        case M_MACBOOK:
-                screen_info.lfb_width = 1280;
-                screen_info.lfb_height = 800;
-                screen_info.lfb_linelength = 2048 * 4;
-                screen_info.lfb_base = 0x80000000;
-                break;
-        }
-
-        /* if the user wants to manually specify height/width,
-           we will override the defaults */
-        /* TODO: eventually get auto-detection working */
-        if (manual_height > 0)
-                screen_info.lfb_height = manual_height;
-        if (manual_width > 0)
-                screen_info.lfb_width = manual_width;
-
-        imacfb_fix.smem_start = screen_info.lfb_base;
-        imacfb_defined.bits_per_pixel = screen_info.lfb_depth;
-        imacfb_defined.xres = screen_info.lfb_width;
-        imacfb_defined.yres = screen_info.lfb_height;
-        imacfb_fix.line_length = screen_info.lfb_linelength;
-
-        /*   size_vmode -- that is the amount of memory needed for the
-         *                 used video mode, i.e. the minimum amount of
-         *                 memory we need. */
-        size_vmode = imacfb_defined.yres * imacfb_fix.line_length;
-
-        /*   size_total -- all video memory we have. Used for
-         *                 entries, ressource allocation and bounds
-         *                 checking. */
-        size_total = screen_info.lfb_size * 65536;
-        if (size_total < size_vmode)
-                size_total = size_vmode;
-
-        /*   size_remap -- the amount of video memory we are going to
-         *                 use for imacfb.  With modern cards it is no
-         *                 option to simply use size_total as that
-         *                 wastes plenty of kernel address space. */
-        size_remap  = size_vmode * 2;
-        if (size_remap < size_vmode)
-                size_remap = size_vmode;
-        if (size_remap > size_total)
-                size_remap = size_total;
-        imacfb_fix.smem_len = size_remap;
-
-        if (!request_mem_region(imacfb_fix.smem_start, size_total, "imacfb")) {
-                printk(KERN_WARNING
-                       "imacfb: cannot reserve video memory at 0x%lx\n",
-                        imacfb_fix.smem_start);
-                /* We cannot make this fatal. Sometimes this comes from magic
-                   spaces our resource handlers simply don't know about */
-        }
-
-        info = framebuffer_alloc(sizeof(u32) * 16, &dev->dev);
-        if (!info) {
-                err = -ENOMEM;
-                goto err_release_mem;
-        }
-        info->pseudo_palette = info->par;
-        info->par = NULL;
-
-        info->screen_base = ioremap(imacfb_fix.smem_start, imacfb_fix.smem_len);
-        if (!info->screen_base) {
-                printk(KERN_ERR "imacfb: abort, cannot ioremap video memory "
-                                "0x%x @ 0x%lx\n",
-                        imacfb_fix.smem_len, imacfb_fix.smem_start);
-                err = -EIO;
-                goto err_unmap;
-        }
-
-        printk(KERN_INFO "imacfb: framebuffer at 0x%lx, mapped to 0x%p, "
-               "using %dk, total %dk\n",
-               imacfb_fix.smem_start, info->screen_base,
-               size_remap/1024, size_total/1024);
-        printk(KERN_INFO "imacfb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
-               imacfb_defined.xres, imacfb_defined.yres,
-               imacfb_defined.bits_per_pixel, imacfb_fix.line_length,
-               screen_info.pages);
-
-        imacfb_defined.xres_virtual = imacfb_defined.xres;
-        imacfb_defined.yres_virtual = imacfb_fix.smem_len /
-                                        imacfb_fix.line_length;
-        printk(KERN_INFO "imacfb: scrolling: redraw\n");
-        imacfb_defined.yres_virtual = imacfb_defined.yres;
-
-        /* some dummy values for timing to make fbset happy */
-        imacfb_defined.pixclock     = 10000000 / imacfb_defined.xres *
-                                        1000 / imacfb_defined.yres;
-        imacfb_defined.left_margin  = (imacfb_defined.xres / 8) & 0xf8;
-        imacfb_defined.hsync_len    = (imacfb_defined.xres / 8) & 0xf8;
-
-        imacfb_defined.red.offset    = screen_info.red_pos;
-        imacfb_defined.red.length    = screen_info.red_size;
-        imacfb_defined.green.offset  = screen_info.green_pos;
-        imacfb_defined.green.length  = screen_info.green_size;
-        imacfb_defined.blue.offset   = screen_info.blue_pos;
-        imacfb_defined.blue.length   = screen_info.blue_size;
-        imacfb_defined.transp.offset = screen_info.rsvd_pos;
-        imacfb_defined.transp.length = screen_info.rsvd_size;
-
-        printk(KERN_INFO "imacfb: %s: "
-               "size=%d:%d:%d:%d, shift=%d:%d:%d:%d\n",
-               "Truecolor",
-               screen_info.rsvd_size,
-               screen_info.red_size,
-               screen_info.green_size,
-               screen_info.blue_size,
-               screen_info.rsvd_pos,
-               screen_info.red_pos,
-               screen_info.green_pos,
-               screen_info.blue_pos);
-
-        imacfb_fix.ypanstep  = 0;
-        imacfb_fix.ywrapstep = 0;
-
-        /* request failure does not faze us, as vgacon probably has this
-         * region already (FIXME) */
-        request_region(0x3c0, 32, "imacfb");
-
-        info->fbops = &imacfb_ops;
-        info->var = imacfb_defined;
-        info->fix = imacfb_fix;
-        info->flags = FBINFO_FLAG_DEFAULT;
-
-        if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
-                err = -ENOMEM;
-                goto err_unmap;
-        }
-        if (register_framebuffer(info)<0) {
-                err = -EINVAL;
-                goto err_fb_dealoc;
-        }
-        printk(KERN_INFO "fb%d: %s frame buffer device\n",
-               info->node, info->fix.id);
-        return 0;
-
-err_fb_dealoc:
-        fb_dealloc_cmap(&info->cmap);
-err_unmap:
-        iounmap(info->screen_base);
-        framebuffer_release(info);
-err_release_mem:
-        release_mem_region(imacfb_fix.smem_start, size_total);
-        return err;
-}
-
-static struct platform_driver imacfb_driver = {
-        .probe  = imacfb_probe,
-        .driver = {
-                .name   = "imacfb",
-        },
-};
-
-static struct platform_device imacfb_device = {
-        .name   = "imacfb",
-};
-
-static int __init imacfb_init(void)
-{
-        int ret;
-        char *option = NULL;
-
-        if (!efi_enabled)
-                return -ENODEV;
-        if (!dmi_check_system(dmi_system_table))
-                return -ENODEV;
-        if (model == M_UNKNOWN)
-                return -ENODEV;
-
-        if (fb_get_options("imacfb", &option))
-                return -ENODEV;
-
-        imacfb_setup(option);
-        ret = platform_driver_register(&imacfb_driver);
-
-        if (!ret) {
-                ret = platform_device_register(&imacfb_device);
-                if (ret)
-                        platform_driver_unregister(&imacfb_driver);
-        }
-        return ret;
-}
-module_init(imacfb_init);
-
-MODULE_LICENSE("GPL");
diff --git a/drivers/video/intelfb/intelfb.h b/drivers/video/intelfb/intelfb.h
index 3325fbd68ab3..a50bea614804 100644
--- a/drivers/video/intelfb/intelfb.h
+++ b/drivers/video/intelfb/intelfb.h
@@ -12,9 +12,9 @@
 #endif
 
 /*** Version/name ***/
-#define INTELFB_VERSION                 "0.9.5"
+#define INTELFB_VERSION                 "0.9.6"
 #define INTELFB_MODULE_NAME             "intelfb"
-#define SUPPORTED_CHIPSETS              "830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM"
+#define SUPPORTED_CHIPSETS              "830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/945GME/965G/965GM"
 
 
 /*** Debug/feature defines ***/
@@ -58,6 +58,7 @@
 #define PCI_DEVICE_ID_INTEL_915GM       0x2592
 #define PCI_DEVICE_ID_INTEL_945G        0x2772
 #define PCI_DEVICE_ID_INTEL_945GM       0x27A2
+#define PCI_DEVICE_ID_INTEL_945GME      0x27AE
 #define PCI_DEVICE_ID_INTEL_965G        0x29A2
 #define PCI_DEVICE_ID_INTEL_965GM       0x2A02
 
@@ -160,6 +161,7 @@ enum intel_chips {
         INTEL_915GM,
         INTEL_945G,
         INTEL_945GM,
+        INTEL_945GME,
         INTEL_965G,
         INTEL_965GM,
 };
@@ -363,6 +365,7 @@ struct intelfb_info {
                         ((dinfo)->chipset == INTEL_915GM) ||    \
                         ((dinfo)->chipset == INTEL_945G) ||     \
                         ((dinfo)->chipset == INTEL_945GM) ||    \
+                        ((dinfo)->chipset == INTEL_945GME) ||   \
                         ((dinfo)->chipset == INTEL_965G) ||     \
                         ((dinfo)->chipset == INTEL_965GM))
 
diff --git a/drivers/video/intelfb/intelfb_i2c.c b/drivers/video/intelfb/intelfb_i2c.c
index fcf9fadbf572..5d896b81f4e0 100644
--- a/drivers/video/intelfb/intelfb_i2c.c
+++ b/drivers/video/intelfb/intelfb_i2c.c
@@ -171,6 +171,7 @@ void intelfb_create_i2c_busses(struct intelfb_info *dinfo)
                 /* has some LVDS + tv-out */
         case INTEL_945G:
         case INTEL_945GM:
+        case INTEL_945GME:
         case INTEL_965G:
         case INTEL_965GM:
                 /* SDVO ports have a single control bus - 2 devices */
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index e44303f9bc52..a09e23649357 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -2,7 +2,7 @@
  * intelfb
  *
  * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G/915GM/
- * 945G/945GM/965G/965GM integrated graphics chips.
+ * 945G/945GM/945GME/965G/965GM integrated graphics chips.
  *
  * Copyright © 2002, 2003 David Dawes <dawes@xfree86.org>
  *                   2004 Sylvain Meyer
@@ -102,6 +102,9 @@
  *
  *    04/2008 - Version 0.9.5
  *              Add support for 965G/965GM. (Maik Broemme <mbroemme@plusserver.de>)
+ *
+ *    08/2008 - Version 0.9.6
+ *              Add support for 945GME. (Phil Endecott <spam_from_intelfb@chezphil.org>)
  */
 
 #include <linux/module.h>
@@ -183,6 +186,7 @@ static struct pci_device_id intelfb_pci_table[] __devinitdata = {
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_915GM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_915GM },
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_945G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_945G },
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_945GM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_945GM },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_945GME, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_945GME },
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_965G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_965G },
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_965GM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_965GM },
         { 0, }
@@ -555,6 +559,7 @@ static int __devinit intelfb_pci_register(struct pci_dev *pdev,
             (ent->device == PCI_DEVICE_ID_INTEL_915GM) ||
             (ent->device == PCI_DEVICE_ID_INTEL_945G)  ||
             (ent->device == PCI_DEVICE_ID_INTEL_945GM) ||
+            (ent->device == PCI_DEVICE_ID_INTEL_945GME) ||
             (ent->device == PCI_DEVICE_ID_INTEL_965G) ||
             (ent->device == PCI_DEVICE_ID_INTEL_965GM)) {
 
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c
index 8e6d6a4db0ad..8b26b27c2db6 100644
--- a/drivers/video/intelfb/intelfbhw.c
+++ b/drivers/video/intelfb/intelfbhw.c
@@ -143,6 +143,12 @@ int intelfbhw_get_chipset(struct pci_dev *pdev, struct intelfb_info *dinfo)
                 dinfo->mobile = 1;
                 dinfo->pll_index = PLLS_I9xx;
                 return 0;
+        case PCI_DEVICE_ID_INTEL_945GME:
+                dinfo->name = "Intel(R) 945GME";
+                dinfo->chipset = INTEL_945GME;
+                dinfo->mobile = 1;
+                dinfo->pll_index = PLLS_I9xx;
+                return 0;
         case PCI_DEVICE_ID_INTEL_965G:
                 dinfo->name = "Intel(R) 965G";
                 dinfo->chipset = INTEL_965G;
@@ -186,6 +192,7 @@ int intelfbhw_get_memory(struct pci_dev *pdev, int *aperture_size,
         case PCI_DEVICE_ID_INTEL_915GM:
         case PCI_DEVICE_ID_INTEL_945G:
         case PCI_DEVICE_ID_INTEL_945GM:
+        case PCI_DEVICE_ID_INTEL_945GME:
         case PCI_DEVICE_ID_INTEL_965G:
         case PCI_DEVICE_ID_INTEL_965GM:
                 /* 915, 945 and 965 chipsets support a 256MB aperture.
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index c02136202792..8e7a275df50c 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -1453,6 +1453,13 @@ static struct board {
                 MGA_G100,
                 &vbG100,
                 "MGA-G100 (AGP)"},
+        {PCI_VENDOR_ID_MATROX,  PCI_DEVICE_ID_MATROX_G200EV_PCI,        0xFF,
+                0,                      0,
+                DEVF_G200,
+                230000,
+                MGA_G200,
+                &vbG200,
+                "MGA-G200eV (PCI)"},
         {PCI_VENDOR_ID_MATROX,  PCI_DEVICE_ID_MATROX_G200_PCI,  0xFF,
                 0,                      0,
                 DEVF_G200,
@@ -2118,6 +2125,8 @@ static struct pci_device_id matroxfb_devices[] = {
                 PCI_ANY_ID,     PCI_ANY_ID,     0, 0, 0},
         {PCI_VENDOR_ID_MATROX,  PCI_DEVICE_ID_MATROX_G100_AGP,
                 PCI_ANY_ID,     PCI_ANY_ID,     0, 0, 0},
+        {PCI_VENDOR_ID_MATROX,  PCI_DEVICE_ID_MATROX_G200EV_PCI,
+                PCI_ANY_ID,     PCI_ANY_ID,     0, 0, 0},
         {PCI_VENDOR_ID_MATROX,  PCI_DEVICE_ID_MATROX_G200_PCI,
                 PCI_ANY_ID,     PCI_ANY_ID,     0, 0, 0},
         {PCI_VENDOR_ID_MATROX,  PCI_DEVICE_ID_MATROX_G200_AGP,
diff --git a/drivers/video/metronomefb.c b/drivers/video/metronomefb.c
index afeed0611e3e..df1f757a6161 100644
--- a/drivers/video/metronomefb.c
+++ b/drivers/video/metronomefb.c
@@ -188,7 +188,7 @@ static int __devinit load_waveform(u8 *mem, size_t size, int m, int t,
                 epd_frame_table[par->dt].wfm_size = user_wfm_size;
 
         if (size != epd_frame_table[par->dt].wfm_size) {
-                dev_err(dev, "Error: unexpected size %d != %d\n", size,
+                dev_err(dev, "Error: unexpected size %Zd != %d\n", size,
                                         epd_frame_table[par->dt].wfm_size);
                 return -EINVAL;
         }
diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c
index 25172b2a2a94..bfb802d26d5a 100644
--- a/drivers/video/neofb.c
+++ b/drivers/video/neofb.c
@@ -426,11 +426,11 @@ static void vgaHWProtect(int on)
 {
         unsigned char tmp;
 
+        tmp = vga_rseq(NULL, 0x01);
         if (on) {
                 /*
                  * Turn off screen and disable sequencer.
                  */
-                tmp = vga_rseq(NULL, 0x01);
                 vga_wseq(NULL, 0x00, 0x01);             /* Synchronous Reset */
                 vga_wseq(NULL, 0x01, tmp | 0x20);       /* disable the display */
 
@@ -439,7 +439,6 @@ static void vgaHWProtect(int on)
                 /*
                  * Reenable sequencer, then turn on screen.
                  */
-                tmp = vga_rseq(NULL, 0x01);
                 vga_wseq(NULL, 0x01, tmp & ~0x20);      /* reenable display */
                 vga_wseq(NULL, 0x00, 0x03);             /* clear synchronousreset */
 
@@ -558,14 +557,12 @@ neofb_open(struct fb_info *info, int user)
 {
         struct neofb_par *par = info->par;
 
-        mutex_lock(&par->open_lock);
         if (!par->ref_count) {
                 memset(&par->state, 0, sizeof(struct vgastate));
                 par->state.flags = VGA_SAVE_MODE | VGA_SAVE_FONTS;
                 save_vga(&par->state);
         }
         par->ref_count++;
-        mutex_unlock(&par->open_lock);
 
         return 0;
 }
@@ -575,16 +572,13 @@ neofb_release(struct fb_info *info, int user)
 {
         struct neofb_par *par = info->par;
 
-        mutex_lock(&par->open_lock);
-        if (!par->ref_count) {
-                mutex_unlock(&par->open_lock);
+        if (!par->ref_count)
                 return -EINVAL;
-        }
+
         if (par->ref_count == 1) {
                 restore_vga(&par->state);
         }
         par->ref_count--;
-        mutex_unlock(&par->open_lock);
 
         return 0;
 }
@@ -648,10 +642,10 @@ neofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
         var->blue.msb_right = 0;
         var->transp.msb_right = 0;
 
+        var->transp.offset = 0;
+        var->transp.length = 0;
         switch (var->bits_per_pixel) {
         case 8:         /* PSEUDOCOLOUR, 256 */
-                var->transp.offset = 0;
-                var->transp.length = 0;
                 var->red.offset = 0;
                 var->red.length = 8;
                 var->green.offset = 0;
@@ -661,8 +655,6 @@ neofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
                 break;
 
         case 16:                /* DIRECTCOLOUR, 64k */
-                var->transp.offset = 0;
-                var->transp.length = 0;
                 var->red.offset = 11;
                 var->red.length = 5;
                 var->green.offset = 5;
@@ -672,8 +664,6 @@ neofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
                 break;
 
         case 24:                /* TRUECOLOUR, 16m */
-                var->transp.offset = 0;
-                var->transp.length = 0;
                 var->red.offset = 16;
                 var->red.length = 8;
                 var->green.offset = 8;
@@ -704,8 +694,6 @@ neofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
         if (vramlen > 4 * 1024 * 1024)
                 vramlen = 4 * 1024 * 1024;
 
-        if (var->yres_virtual < var->yres)
-                var->yres_virtual = var->yres;
         if (var->xres_virtual < var->xres)
                 var->xres_virtual = var->xres;
 
@@ -722,8 +710,6 @@ neofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
            if it was possible. We should return -EINVAL, but I disagree */
         if (var->yres_virtual < var->yres)
                 var->yres = var->yres_virtual;
-        if (var->xres_virtual < var->xres)
-                var->xres = var->xres_virtual;
         if (var->xoffset + var->xres > var->xres_virtual)
                 var->xoffset = var->xres_virtual - var->xres;
         if (var->yoffset + var->yres > var->yres_virtual)
@@ -1186,8 +1172,11 @@ static int neofb_set_par(struct fb_info *info)
         return 0;
 }
 
-static void neofb_update_start(struct fb_info *info,
-                               struct fb_var_screeninfo *var)
+/*
+ *    Pan or Wrap the Display
+ */
+static int neofb_pan_display(struct fb_var_screeninfo *var,
+                             struct fb_info *info)
 {
         struct neofb_par *par = info->par;
         struct vgastate *state = &par->state;
@@ -1216,35 +1205,7 @@ static void neofb_update_start(struct fb_info *info,
         vga_wgfx(state->vgabase, 0x0E, (((Base >> 16) & 0x0f) | (oldExtCRTDispAddr & 0xf0)));
 
         neoLock(state);
-}
-
-/*
- *    Pan or Wrap the Display
- */
-static int neofb_pan_display(struct fb_var_screeninfo *var,
-                             struct fb_info *info)
-{
-        u_int y_bottom;
-
-        y_bottom = var->yoffset;
-
-        if (!(var->vmode & FB_VMODE_YWRAP))
-                y_bottom += var->yres;
 
-        if (var->xoffset > (var->xres_virtual - var->xres))
-                return -EINVAL;
-        if (y_bottom > info->var.yres_virtual)
-                return -EINVAL;
-
-        neofb_update_start(info, var);
-
-        info->var.xoffset = var->xoffset;
-        info->var.yoffset = var->yoffset;
-
-        if (var->vmode & FB_VMODE_YWRAP)
-                info->var.vmode |= FB_VMODE_YWRAP;
-        else
-                info->var.vmode &= ~FB_VMODE_YWRAP;
         return 0;
 }
 
@@ -1992,7 +1953,6 @@ static struct fb_info *__devinit neo_alloc_fb_info(struct pci_dev *dev, const st
 
         info->fix.accel = id->driver_data;
 
-        mutex_init(&par->open_lock);
         par->pci_burst = !nopciburst;
         par->lcd_stretch = !nostretch;
         par->libretto = libretto;
diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c
index 6efcf89e7fbe..dfb72f5e4c96 100644
--- a/drivers/video/omap/dispc.c
+++ b/drivers/video/omap/dispc.c
@@ -156,7 +156,7 @@ struct resmap {
 };
 
 static struct {
-        u32             base;
+        void __iomem    *base;
 
         struct omapfb_mem_desc  mem_desc;
         struct resmap           *res_map[DISPC_MEMTYPE_NUM];
@@ -212,9 +212,9 @@ static void enable_rfbi_mode(int enable)
         dispc_write_reg(DISPC_CONTROL, l);
 
         /* Set bypass mode in RFBI module */
-        l = __raw_readl(io_p2v(RFBI_CONTROL));
+        l = __raw_readl(IO_ADDRESS(RFBI_CONTROL));
         l |= enable ? 0 : (1 << 1);
-        __raw_writel(l, io_p2v(RFBI_CONTROL));
+        __raw_writel(l, IO_ADDRESS(RFBI_CONTROL));
 }
 
 static void set_lcd_data_lines(int data_lines)
@@ -1349,14 +1349,19 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode,
 
         memset(&dispc, 0, sizeof(dispc));
 
-        dispc.base = io_p2v(DISPC_BASE);
+        dispc.base = ioremap(DISPC_BASE, SZ_1K);
+        if (!dispc.base) {
+                dev_err(fbdev->dev, "can't ioremap DISPC\n");
+                return -ENOMEM;
+        }
+
         dispc.fbdev = fbdev;
         dispc.ext_mode = ext_mode;
 
         init_completion(&dispc.frame_done);
 
         if ((r = get_dss_clocks()) < 0)
-                return r;
+                goto fail0;
 
         enable_interface_clocks(1);
         enable_lcd_clocks(1);
@@ -1414,7 +1419,7 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode,
         }
 
         /* L3 firewall setting: enable access to OCM RAM */
-        __raw_writel(0x402000b0, io_p2v(0x680050a0));
+        __raw_writel(0x402000b0, IO_ADDRESS(0x680050a0));
 
         if ((r = alloc_palette_ram()) < 0)
                 goto fail2;
@@ -1464,7 +1469,8 @@ fail1:
         enable_lcd_clocks(0);
         enable_interface_clocks(0);
         put_dss_clocks();
-
+fail0:
+        iounmap(dispc.base);
         return r;
 }
 
@@ -1481,6 +1487,7 @@ static void omap_dispc_cleanup(void)
         free_irq(INT_24XX_DSS_IRQ, dispc.fbdev);
         enable_interface_clocks(0);
         put_dss_clocks();
+        iounmap(dispc.base);
 }
 
 const struct lcd_ctrl omap2_int_ctrl = {
diff --git a/drivers/video/omap/dispc.h b/drivers/video/omap/dispc.h
index eb1512b56ce8..ef720a78f6d5 100644
--- a/drivers/video/omap/dispc.h
+++ b/drivers/video/omap/dispc.h
@@ -40,4 +40,6 @@ extern void omap_dispc_enable_digit_out(int enable);
 extern int  omap_dispc_request_irq(void (*callback)(void *data), void *data);
 extern void omap_dispc_free_irq(void);
 
+extern const struct lcd_ctrl omap2_int_ctrl;
+
 #endif
diff --git a/drivers/video/omap/lcd_h4.c b/drivers/video/omap/lcd_h4.c
index 88c19d424ef7..6ff56430341b 100644
--- a/drivers/video/omap/lcd_h4.c
+++ b/drivers/video/omap/lcd_h4.c
@@ -47,7 +47,7 @@ static unsigned long h4_panel_get_caps(struct lcd_panel *panel)
         return 0;
 }
 
-struct lcd_panel h4_panel = {
+static struct lcd_panel h4_panel = {
         .name           = "h4",
         .config         = OMAP_LCDC_PANEL_TFT,
 
@@ -91,7 +91,7 @@ static int h4_panel_resume(struct platform_device *pdev)
         return 0;
 }
 
-struct platform_driver h4_panel_driver = {
+static struct platform_driver h4_panel_driver = {
         .probe          = h4_panel_probe,
         .remove         = h4_panel_remove,
         .suspend        = h4_panel_suspend,
diff --git a/drivers/video/omap/lcd_inn1610.c b/drivers/video/omap/lcd_inn1610.c
index 6a42c6a0cd99..4c4f7ee6d733 100644
--- a/drivers/video/omap/lcd_inn1610.c
+++ b/drivers/video/omap/lcd_inn1610.c
@@ -32,43 +32,43 @@ static int innovator1610_panel_init(struct lcd_panel *panel,
 {
         int r = 0;
 
-        if (omap_request_gpio(14)) {
+        if (gpio_request(14, "lcd_en0")) {
                 pr_err(MODULE_NAME ": can't request GPIO 14\n");
                 r = -1;
                 goto exit;
         }
-        if (omap_request_gpio(15)) {
+        if (gpio_request(15, "lcd_en1")) {
                 pr_err(MODULE_NAME ": can't request GPIO 15\n");
-                omap_free_gpio(14);
+                gpio_free(14);
                 r = -1;
                 goto exit;
         }
         /* configure GPIO(14, 15) as outputs */
-        omap_set_gpio_direction(14, 0);
-        omap_set_gpio_direction(15, 0);
+        gpio_direction_output(14, 0);
+        gpio_direction_output(15, 0);
 exit:
         return r;
 }
 
 static void innovator1610_panel_cleanup(struct lcd_panel *panel)
 {
-        omap_free_gpio(15);
-        omap_free_gpio(14);
+        gpio_free(15);
+        gpio_free(14);
 }
 
 static int innovator1610_panel_enable(struct lcd_panel *panel)
 {
         /* set GPIO14 and GPIO15 high */
-        omap_set_gpio_dataout(14, 1);
-        omap_set_gpio_dataout(15, 1);
+        gpio_set_value(14, 1);
+        gpio_set_value(15, 1);
         return 0;
 }
 
 static void innovator1610_panel_disable(struct lcd_panel *panel)
 {
         /* set GPIO13, GPIO14 and GPIO15 low */
-        omap_set_gpio_dataout(14, 0);
-        omap_set_gpio_dataout(15, 0);
+        gpio_set_value(14, 0);
+        gpio_set_value(15, 0);
 }
 
 static unsigned long innovator1610_panel_get_caps(struct lcd_panel *panel)
diff --git a/drivers/video/omap/lcd_osk.c b/drivers/video/omap/lcd_osk.c
index a4a725f427a4..379c96d36da5 100644
--- a/drivers/video/omap/lcd_osk.c
+++ b/drivers/video/omap/lcd_osk.c
@@ -29,6 +29,7 @@
 
 static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
 {
+        /* gpio2 was allocated in board init */
         return 0;
 }
 
@@ -47,11 +48,8 @@ static int osk_panel_enable(struct lcd_panel *panel)
         /* Set PWL level */
         omap_writeb(0xFF, OMAP_PWL_ENABLE);
 
-        /* configure GPIO2 as output */
-        omap_set_gpio_direction(2, 0);
-
-        /* set GPIO2 high */
-        omap_set_gpio_dataout(2, 1);
+        /* set GPIO2 high (lcd power enabled) */
+        gpio_set_value(2, 1);
 
         return 0;
 }
@@ -65,7 +63,7 @@ static void osk_panel_disable(struct lcd_panel *panel)
         omap_writeb(0x00, OMAP_PWL_CLK_ENABLE);
 
         /* set GPIO2 low */
-        omap_set_gpio_dataout(2, 0);
+        gpio_set_value(2, 0);
 }
 
 static unsigned long osk_panel_get_caps(struct lcd_panel *panel)
diff --git a/drivers/video/omap/lcd_sx1.c b/drivers/video/omap/lcd_sx1.c
index caa6a896cb8b..e55de201b8ff 100644
--- a/drivers/video/omap/lcd_sx1.c
+++ b/drivers/video/omap/lcd_sx1.c
@@ -81,21 +81,21 @@ static void epson_sendbyte(int flag, unsigned char byte)
         int i, shifter = 0x80;
 
         if (!flag)
-                omap_set_gpio_dataout(_A_LCD_SSC_A0, 0);
+                gpio_set_value(_A_LCD_SSC_A0, 0);
         mdelay(2);
-        omap_set_gpio_dataout(A_LCD_SSC_RD, 1);
+        gpio_set_value(A_LCD_SSC_RD, 1);
 
-        omap_set_gpio_dataout(A_LCD_SSC_SD, flag);
+        gpio_set_value(A_LCD_SSC_SD, flag);
 
         OMAP_MCBSP_WRITE(OMAP1510_MCBSP3_BASE, PCR0, 0x2200);
         OMAP_MCBSP_WRITE(OMAP1510_MCBSP3_BASE, PCR0, 0x2202);
         for (i = 0; i < 8; i++) {
                 OMAP_MCBSP_WRITE(OMAP1510_MCBSP3_BASE, PCR0, 0x2200);
-                omap_set_gpio_dataout(A_LCD_SSC_SD, shifter & byte);
+                gpio_set_value(A_LCD_SSC_SD, shifter & byte);
                 OMAP_MCBSP_WRITE(OMAP1510_MCBSP3_BASE, PCR0, 0x2202);
                 shifter >>= 1;
         }
-        omap_set_gpio_dataout(_A_LCD_SSC_A0, 1);
+        gpio_set_value(_A_LCD_SSC_A0, 1);
 }
 
 static void init_system(void)
@@ -107,25 +107,18 @@ static void init_system(void)
 static void setup_GPIO(void)
 {
         /* new wave */
-        omap_request_gpio(A_LCD_SSC_RD);
-        omap_request_gpio(A_LCD_SSC_SD);
-        omap_request_gpio(_A_LCD_RESET);
-        omap_request_gpio(_A_LCD_SSC_CS);
-        omap_request_gpio(_A_LCD_SSC_A0);
-
-        /* set all GPIOs to output */
-        omap_set_gpio_direction(A_LCD_SSC_RD, 0);
-        omap_set_gpio_direction(A_LCD_SSC_SD, 0);
-        omap_set_gpio_direction(_A_LCD_RESET, 0);
-        omap_set_gpio_direction(_A_LCD_SSC_CS, 0);
-        omap_set_gpio_direction(_A_LCD_SSC_A0, 0);
-
-        /* set GPIO data */
-        omap_set_gpio_dataout(A_LCD_SSC_RD, 1);
-        omap_set_gpio_dataout(A_LCD_SSC_SD, 0);
-        omap_set_gpio_dataout(_A_LCD_RESET, 0);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_A0, 1);
+        gpio_request(A_LCD_SSC_RD, "lcd_ssc_rd");
+        gpio_request(A_LCD_SSC_SD, "lcd_ssc_sd");
+        gpio_request(_A_LCD_RESET, "lcd_reset");
+        gpio_request(_A_LCD_SSC_CS, "lcd_ssc_cs");
+        gpio_request(_A_LCD_SSC_A0, "lcd_ssc_a0");
+
+        /* set GPIOs to output, with initial data */
+        gpio_direction_output(A_LCD_SSC_RD, 1);
+        gpio_direction_output(A_LCD_SSC_SD, 0);
+        gpio_direction_output(_A_LCD_RESET, 0);
+        gpio_direction_output(_A_LCD_SSC_CS, 1);
+        gpio_direction_output(_A_LCD_SSC_A0, 1);
 }
 
 static void display_init(void)
@@ -139,61 +132,61 @@ static void display_init(void)
         mdelay(2);
 
         /* reset LCD */
-        omap_set_gpio_dataout(A_LCD_SSC_SD, 1);
+        gpio_set_value(A_LCD_SSC_SD, 1);
         epson_sendbyte(0, 0x25);
 
-        omap_set_gpio_dataout(_A_LCD_RESET, 0);
+        gpio_set_value(_A_LCD_RESET, 0);
         mdelay(10);
-        omap_set_gpio_dataout(_A_LCD_RESET, 1);
+        gpio_set_value(_A_LCD_RESET, 1);
 
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
         mdelay(2);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD, phase 1 */
         epson_sendbyte(0, 0xCA);
         for (i = 0; i < 10; i++)
                 epson_sendbyte(1, INIT_1[i]);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 2 */
         epson_sendbyte(0, 0xCB);
         for (i = 0; i < 125; i++)
                 epson_sendbyte(1, INIT_2[i]);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 2a */
         epson_sendbyte(0, 0xCC);
         for (i = 0; i < 14; i++)
                 epson_sendbyte(1, INIT_3[i]);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 3 */
         epson_sendbyte(0, 0xBC);
         epson_sendbyte(1, 0x08);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 4 */
         epson_sendbyte(0, 0x07);
         epson_sendbyte(1, 0x05);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 5 */
         epson_sendbyte(0, 0x94);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 6 */
         epson_sendbyte(0, 0xC6);
         epson_sendbyte(1, 0x80);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
         mdelay(100); /* used to be 1000 */
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 7 */
         epson_sendbyte(0, 0x16);
@@ -201,8 +194,8 @@ static void display_init(void)
         epson_sendbyte(1, 0x00);
         epson_sendbyte(1, 0xB1);
         epson_sendbyte(1, 0x00);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 8 */
         epson_sendbyte(0, 0x76);
@@ -210,12 +203,12 @@ static void display_init(void)
         epson_sendbyte(1, 0x00);
         epson_sendbyte(1, 0xDB);
         epson_sendbyte(1, 0x00);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 9 */
         epson_sendbyte(0, 0xAF);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
 }
 
 static int sx1_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
@@ -231,18 +224,18 @@ static void sx1_panel_disable(struct lcd_panel *panel)
 {
         printk(KERN_INFO "SX1: LCD panel disable\n");
         sx1_setmmipower(0);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
 
         epson_sendbyte(0, 0x25);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         epson_sendbyte(0, 0xAE);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
         mdelay(100);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         epson_sendbyte(0, 0x95);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
 }
 
 static int sx1_panel_enable(struct lcd_panel *panel)
diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c
index 83514f066712..6e2ea7518761 100644
--- a/drivers/video/omap/lcdc.c
+++ b/drivers/video/omap/lcdc.c
@@ -34,6 +34,8 @@
 
 #include <asm/mach-types.h>
 
+#include "lcdc.h"
+
 #define MODULE_NAME                     "lcdc"
 
 #define OMAP_LCDC_BASE                  0xfffec000
diff --git a/drivers/video/omap/lcdc.h b/drivers/video/omap/lcdc.h
index adb731e5314a..845222270db3 100644
--- a/drivers/video/omap/lcdc.h
+++ b/drivers/video/omap/lcdc.h
@@ -4,4 +4,6 @@
 int omap_lcdc_set_dma_callback(void (*callback)(void *data), void *data);
 void omap_lcdc_free_dma_callback(void);
 
+extern const struct lcd_ctrl omap1_int_ctrl;
+
 #endif
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c
index 51a138bd113c..5a5e407dc45f 100644
--- a/drivers/video/omap/omapfb_main.c
+++ b/drivers/video/omap/omapfb_main.c
@@ -31,11 +31,14 @@
 #include <mach/dma.h>
 #include <mach/omapfb.h>
 
+#include "lcdc.h"
+#include "dispc.h"
+
 #define MODULE_NAME     "omapfb"
 
 static unsigned int     def_accel;
 static unsigned long    def_vram[OMAPFB_PLANE_NUM];
-static int              def_vram_cnt;
+static unsigned int     def_vram_cnt;
 static unsigned long    def_vxres;
 static unsigned long    def_vyres;
 static unsigned int     def_rotate;
@@ -84,12 +87,10 @@ static struct caps_table_struct color_caps[] = {
  * LCD panel
  * ---------------------------------------------------------------------------
  */
-extern struct lcd_ctrl omap1_int_ctrl;
-extern struct lcd_ctrl omap2_int_ctrl;
 extern struct lcd_ctrl hwa742_ctrl;
 extern struct lcd_ctrl blizzard_ctrl;
 
-static struct lcd_ctrl *ctrls[] = {
+static const struct lcd_ctrl *ctrls[] = {
 #ifdef CONFIG_ARCH_OMAP1
         &omap1_int_ctrl,
 #else
@@ -740,7 +741,7 @@ static int omapfb_update_win(struct fb_info *fbi,
         int ret;
 
         omapfb_rqueue_lock(plane->fbdev);
-        ret = omapfb_update_window_async(fbi, win, NULL, 0);
+        ret = omapfb_update_window_async(fbi, win, NULL, NULL);
         omapfb_rqueue_unlock(plane->fbdev);
 
         return ret;
@@ -768,7 +769,7 @@ static int omapfb_update_full_screen(struct fb_info *fbi)
         win.format = 0;
 
         omapfb_rqueue_lock(fbdev);
-        r = fbdev->ctrl->update_window(fbi, &win, NULL, 0);
+        r = fbdev->ctrl->update_window(fbi, &win, NULL, NULL);
         omapfb_rqueue_unlock(fbdev);
 
         return r;
@@ -1047,7 +1048,7 @@ void omapfb_write_first_pixel(struct omapfb_device *fbdev, u16 pixval)
                 win.height = 2;
                 win.out_width = 2;
                 win.out_height = 2;
-                fbdev->ctrl->update_window(fbdev->fb_info[0], &win, NULL, 0);
+                fbdev->ctrl->update_window(fbdev->fb_info[0], &win, NULL, NULL);
         }
         omapfb_rqueue_unlock(fbdev);
 }
diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c
index 4a6f13d3facf..a13c8dcad2a8 100644
--- a/drivers/video/omap/rfbi.c
+++ b/drivers/video/omap/rfbi.c
@@ -59,7 +59,7 @@
 #define DISPC_CONTROL           0x0040
 
 static struct {
-        u32             base;
+        void __iomem    *base;
         void            (*lcdc_callback)(void *data);
         void            *lcdc_callback_data;
         unsigned long   l4_khz;
@@ -518,7 +518,11 @@ static int rfbi_init(struct omapfb_device *fbdev)
         int r;
 
         rfbi.fbdev = fbdev;
-        rfbi.base = io_p2v(RFBI_BASE);
+        rfbi.base = ioremap(RFBI_BASE, SZ_1K);
+        if (!rfbi.base) {
+                dev_err(fbdev->dev, "can't ioremap RFBI\n");
+                return -ENOMEM;
+        }
 
         if ((r = rfbi_get_clocks()) < 0)
                 return r;
@@ -566,6 +570,7 @@ static void rfbi_cleanup(void)
 {
         omap_dispc_free_irq();
         rfbi_put_clocks();
+        iounmap(rfbi.base);
 }
 
 const struct lcd_ctrl_extif omap2_ext_if = {
diff --git a/drivers/video/omap/sossi.c b/drivers/video/omap/sossi.c
index 6359353c2c67..a76946220249 100644
--- a/drivers/video/omap/sossi.c
+++ b/drivers/video/omap/sossi.c
@@ -574,7 +574,12 @@ static int sossi_init(struct omapfb_device *fbdev)
         struct clk *dpll1out_ck;
         int r;
 
-        sossi.base = (void __iomem *)IO_ADDRESS(OMAP_SOSSI_BASE);
+        sossi.base = ioremap(OMAP_SOSSI_BASE, SZ_1K);
+        if (!sossi.base) {
+                dev_err(fbdev->dev, "can't ioremap SoSSI\n");
+                return -ENOMEM;
+        }
+
         sossi.fbdev = fbdev;
         spin_lock_init(&sossi.lock);
 
@@ -665,6 +670,7 @@ static void sossi_cleanup(void)
 {
         omap_lcdc_free_dma_callback();
         clk_put(sossi.fck);
+        iounmap(sossi.base);
 }
 
 struct lcd_ctrl_extif omap1_ext_if = {
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
index b829dc7c5edf..a7b01d2724b5 100644
--- a/drivers/video/s1d13xxxfb.c
+++ b/drivers/video/s1d13xxxfb.c
@@ -50,6 +50,11 @@
 #define dbg(fmt, args...) do { } while (0)
 #endif
 
+static const int __devinitconst s1d13xxxfb_revisions[] = {
+        S1D13506_CHIP_REV,      /* Rev.4 on HP Jornada 7xx S1D13506 */
+        S1D13806_CHIP_REV,      /* Rev.7 on .. */
+};
+
 /*
  * Here we define the default struct fb_fix_screeninfo
  */
@@ -538,6 +543,7 @@ s1d13xxxfb_probe(struct platform_device *pdev)
         struct fb_info *info;
         struct s1d13xxxfb_pdata *pdata = NULL;
         int ret = 0;
+        int i;
         u8 revision;
 
         dbg("probe called: device is %p\n", pdev);
@@ -607,10 +613,19 @@ s1d13xxxfb_probe(struct platform_device *pdev)
                 goto bail;
         }
 
-        revision = s1d13xxxfb_readreg(default_par, S1DREG_REV_CODE);
-        if ((revision >> 2) != S1D_CHIP_REV) {
-                printk(KERN_INFO PFX "chip not found: %i\n", (revision >> 2));
-                ret = -ENODEV;
+        revision = s1d13xxxfb_readreg(default_par, S1DREG_REV_CODE) >> 2;
+
+        ret = -ENODEV;
+
+        for (i = 0; i < ARRAY_SIZE(s1d13xxxfb_revisions); i++) {
+                if (revision == s1d13xxxfb_revisions[i])
+                        ret = 0;
+        }
+
+        if (!ret)
+                printk(KERN_INFO PFX "chip revision %i\n", revision);
+        else {
+                printk(KERN_INFO PFX "unknown chip revision %i\n", revision);
                 goto bail;
         }
 
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c
index 4599a4385bc9..14bd3f3680b8 100644
--- a/drivers/video/tdfxfb.c
+++ b/drivers/video/tdfxfb.c
@@ -1195,57 +1195,58 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev,
                 return -ENOMEM;
 
         default_par = info->par;
+        info->fix = tdfx_fix;
 
         /* Configure the default fb_fix_screeninfo first */
         switch (pdev->device) {
         case PCI_DEVICE_ID_3DFX_BANSHEE:
-                strcpy(tdfx_fix.id, "3Dfx Banshee");
+                strcpy(info->fix.id, "3Dfx Banshee");
                 default_par->max_pixclock = BANSHEE_MAX_PIXCLOCK;
                 break;
         case PCI_DEVICE_ID_3DFX_VOODOO3:
-                strcpy(tdfx_fix.id, "3Dfx Voodoo3");
+                strcpy(info->fix.id, "3Dfx Voodoo3");
                 default_par->max_pixclock = VOODOO3_MAX_PIXCLOCK;
                 break;
         case PCI_DEVICE_ID_3DFX_VOODOO5:
-                strcpy(tdfx_fix.id, "3Dfx Voodoo5");
+                strcpy(info->fix.id, "3Dfx Voodoo5");
                 default_par->max_pixclock = VOODOO5_MAX_PIXCLOCK;
                 break;
         }
 
-        tdfx_fix.mmio_start = pci_resource_start(pdev, 0);
-        tdfx_fix.mmio_len = pci_resource_len(pdev, 0);
-        if (!request_mem_region(tdfx_fix.mmio_start, tdfx_fix.mmio_len,
+        info->fix.mmio_start = pci_resource_start(pdev, 0);
+        info->fix.mmio_len = pci_resource_len(pdev, 0);
+        if (!request_mem_region(info->fix.mmio_start, info->fix.mmio_len,
                                 "tdfx regbase")) {
                 printk(KERN_ERR "tdfxfb: Can't reserve regbase\n");
                 goto out_err;
         }
 
         default_par->regbase_virt =
-                ioremap_nocache(tdfx_fix.mmio_start, tdfx_fix.mmio_len);
+                ioremap_nocache(info->fix.mmio_start, info->fix.mmio_len);
         if (!default_par->regbase_virt) {
                 printk(KERN_ERR "fb: Can't remap %s register area.\n",
-                                tdfx_fix.id);
+                                info->fix.id);
                 goto out_err_regbase;
         }
 
-        tdfx_fix.smem_start = pci_resource_start(pdev, 1);
-        tdfx_fix.smem_len = do_lfb_size(default_par, pdev->device);
-        if (!tdfx_fix.smem_len) {
-                printk(KERN_ERR "fb: Can't count %s memory.\n", tdfx_fix.id);
+        info->fix.smem_start = pci_resource_start(pdev, 1);
+        info->fix.smem_len = do_lfb_size(default_par, pdev->device);
+        if (!info->fix.smem_len) {
+                printk(KERN_ERR "fb: Can't count %s memory.\n", info->fix.id);
                 goto out_err_regbase;
         }
 
-        if (!request_mem_region(tdfx_fix.smem_start,
+        if (!request_mem_region(info->fix.smem_start,
                                 pci_resource_len(pdev, 1), "tdfx smem")) {
                 printk(KERN_ERR "tdfxfb: Can't reserve smem\n");
                 goto out_err_regbase;
         }
 
-        info->screen_base = ioremap_nocache(tdfx_fix.smem_start,
-                                            tdfx_fix.smem_len);
+        info->screen_base = ioremap_nocache(info->fix.smem_start,
+                                            info->fix.smem_len);
         if (!info->screen_base) {
                 printk(KERN_ERR "fb: Can't remap %s framebuffer.\n",
-                                tdfx_fix.id);
+                                info->fix.id);
                 goto out_err_screenbase;
         }
 
@@ -1257,20 +1258,19 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev,
                 goto out_err_screenbase;
         }
 
-        printk(KERN_INFO "fb: %s memory = %dK\n", tdfx_fix.id,
-                        tdfx_fix.smem_len >> 10);
+        printk(KERN_INFO "fb: %s memory = %dK\n", info->fix.id,
+                        info->fix.smem_len >> 10);
 
         default_par->mtrr_handle = -1;
         if (!nomtrr)
                 default_par->mtrr_handle =
-                        mtrr_add(tdfx_fix.smem_start, tdfx_fix.smem_len,
+                        mtrr_add(info->fix.smem_start, info->fix.smem_len,
                                  MTRR_TYPE_WRCOMB, 1);
 
-        tdfx_fix.ypanstep       = nopan ? 0 : 1;
-        tdfx_fix.ywrapstep      = nowrap ? 0 : 1;
+        info->fix.ypanstep      = nopan ? 0 : 1;
+        info->fix.ywrapstep     = nowrap ? 0 : 1;
 
         info->fbops             = &tdfxfb_ops;
-        info->fix               = tdfx_fix;
         info->pseudo_palette    = default_par->palette;
         info->flags             = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
 #ifdef CONFIG_FB_3DFX_ACCEL
@@ -1323,14 +1323,14 @@ out_err_iobase:
 out_err_screenbase:
         if (info->screen_base)
                 iounmap(info->screen_base);
-        release_mem_region(tdfx_fix.smem_start, pci_resource_len(pdev, 1));
+        release_mem_region(info->fix.smem_start, pci_resource_len(pdev, 1));
 out_err_regbase:
         /*
          * Cleanup after anything that was remapped/allocated.
          */
         if (default_par->regbase_virt)
                 iounmap(default_par->regbase_virt);
-        release_mem_region(tdfx_fix.mmio_start, tdfx_fix.mmio_len);
+        release_mem_region(info->fix.mmio_start, info->fix.mmio_len);
 out_err:
         framebuffer_release(info);
         return -ENXIO;
diff --git a/drivers/video/tmiofb.c b/drivers/video/tmiofb.c
new file mode 100644
index 000000000000..2a380011e9ba
--- /dev/null
+++ b/drivers/video/tmiofb.c
@@ -0,0 +1,1050 @@
+/*
+ * Frame Buffer Device for Toshiba Mobile IO(TMIO) controller
+ *
+ * Copyright(C) 2005-2006 Chris Humbert
+ * Copyright(C) 2005 Dirk Opfer
+ * Copytight(C) 2007,2008 Dmitry Baryshkov
+ *
+ * Based on:
+ *      drivers/video/w100fb.c
+ *      code written by Sharp/Lineo for 2.4 kernels
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation;
+ *
+ * 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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/fb.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+/* Why should fb driver call console functions? because acquire_console_sem() */
+#include <linux/console.h>
+#include <linux/mfd/core.h>
+#include <linux/mfd/tmio.h>
+#include <linux/uaccess.h>
+
+/*
+ * accelerator commands
+ */
+#define TMIOFB_ACC_CSADR(x)     (0x00000000 | ((x) & 0x001ffffe))
+#define TMIOFB_ACC_CHPIX(x)     (0x01000000 | ((x) & 0x000003ff))
+#define TMIOFB_ACC_CVPIX(x)     (0x02000000 | ((x) & 0x000003ff))
+#define TMIOFB_ACC_PSADR(x)     (0x03000000 | ((x) & 0x00fffffe))
+#define TMIOFB_ACC_PHPIX(x)     (0x04000000 | ((x) & 0x000003ff))
+#define TMIOFB_ACC_PVPIX(x)     (0x05000000 | ((x) & 0x000003ff))
+#define TMIOFB_ACC_PHOFS(x)     (0x06000000 | ((x) & 0x000003ff))
+#define TMIOFB_ACC_PVOFS(x)     (0x07000000 | ((x) & 0x000003ff))
+#define TMIOFB_ACC_POADR(x)     (0x08000000 | ((x) & 0x00fffffe))
+#define TMIOFB_ACC_RSTR(x)      (0x09000000 | ((x) & 0x000000ff))
+#define TMIOFB_ACC_TCLOR(x)     (0x0A000000 | ((x) & 0x0000ffff))
+#define TMIOFB_ACC_FILL(x)      (0x0B000000 | ((x) & 0x0000ffff))
+#define TMIOFB_ACC_DSADR(x)     (0x0C000000 | ((x) & 0x00fffffe))
+#define TMIOFB_ACC_SSADR(x)     (0x0D000000 | ((x) & 0x00fffffe))
+#define TMIOFB_ACC_DHPIX(x)     (0x0E000000 | ((x) & 0x000003ff))
+#define TMIOFB_ACC_DVPIX(x)     (0x0F000000 | ((x) & 0x000003ff))
+#define TMIOFB_ACC_SHPIX(x)     (0x10000000 | ((x) & 0x000003ff))
+#define TMIOFB_ACC_SVPIX(x)     (0x11000000 | ((x) & 0x000003ff))
+#define TMIOFB_ACC_LBINI(x)     (0x12000000 | ((x) & 0x0000ffff))
+#define TMIOFB_ACC_LBK2(x)      (0x13000000 | ((x) & 0x0000ffff))
+#define TMIOFB_ACC_SHBINI(x)    (0x14000000 | ((x) & 0x0000ffff))
+#define TMIOFB_ACC_SHBK2(x)     (0x15000000 | ((x) & 0x0000ffff))
+#define TMIOFB_ACC_SVBINI(x)    (0x16000000 | ((x) & 0x0000ffff))
+#define TMIOFB_ACC_SVBK2(x)     (0x17000000 | ((x) & 0x0000ffff))
+
+#define TMIOFB_ACC_CMGO         0x20000000
+#define TMIOFB_ACC_CMGO_CEND    0x00000001
+#define TMIOFB_ACC_CMGO_INT     0x00000002
+#define TMIOFB_ACC_CMGO_CMOD    0x00000010
+#define TMIOFB_ACC_CMGO_CDVRV   0x00000020
+#define TMIOFB_ACC_CMGO_CDHRV   0x00000040
+#define TMIOFB_ACC_CMGO_RUND    0x00008000
+#define TMIOFB_ACC_SCGO         0x21000000
+#define TMIOFB_ACC_SCGO_CEND    0x00000001
+#define TMIOFB_ACC_SCGO_INT     0x00000002
+#define TMIOFB_ACC_SCGO_ROP3    0x00000004
+#define TMIOFB_ACC_SCGO_TRNS    0x00000008
+#define TMIOFB_ACC_SCGO_DVRV    0x00000010
+#define TMIOFB_ACC_SCGO_DHRV    0x00000020
+#define TMIOFB_ACC_SCGO_SVRV    0x00000040
+#define TMIOFB_ACC_SCGO_SHRV    0x00000080
+#define TMIOFB_ACC_SCGO_DSTXY   0x00008000
+#define TMIOFB_ACC_SBGO         0x22000000
+#define TMIOFB_ACC_SBGO_CEND    0x00000001
+#define TMIOFB_ACC_SBGO_INT     0x00000002
+#define TMIOFB_ACC_SBGO_DVRV    0x00000010
+#define TMIOFB_ACC_SBGO_DHRV    0x00000020
+#define TMIOFB_ACC_SBGO_SVRV    0x00000040
+#define TMIOFB_ACC_SBGO_SHRV    0x00000080
+#define TMIOFB_ACC_SBGO_SBMD    0x00000100
+#define TMIOFB_ACC_FLGO         0x23000000
+#define TMIOFB_ACC_FLGO_CEND    0x00000001
+#define TMIOFB_ACC_FLGO_INT     0x00000002
+#define TMIOFB_ACC_FLGO_ROP3    0x00000004
+#define TMIOFB_ACC_LDGO         0x24000000
+#define TMIOFB_ACC_LDGO_CEND    0x00000001
+#define TMIOFB_ACC_LDGO_INT     0x00000002
+#define TMIOFB_ACC_LDGO_ROP3    0x00000004
+#define TMIOFB_ACC_LDGO_ENDPX   0x00000008
+#define TMIOFB_ACC_LDGO_LVRV    0x00000010
+#define TMIOFB_ACC_LDGO_LHRV    0x00000020
+#define TMIOFB_ACC_LDGO_LDMOD   0x00000040
+
+/* a FIFO is always allocated, even if acceleration is not used */
+#define TMIOFB_FIFO_SIZE        512
+
+/*
+ * LCD Host Controller Configuration Register
+ *
+ * This iomem area supports only 16-bit IO.
+ */
+#define CCR_CMD                 0x04 /* Command                         */
+#define CCR_REVID               0x08 /* Revision ID                     */
+#define CCR_BASEL               0x10 /* LCD Control Reg Base Addr Low   */
+#define CCR_BASEH               0x12 /* LCD Control Reg Base Addr High  */
+#define CCR_UGCC                0x40 /* Unified Gated Clock Control     */
+#define CCR_GCC                 0x42 /* Gated Clock Control             */
+#define CCR_USC                 0x50 /* Unified Software Clear          */
+#define CCR_VRAMRTC             0x60 /* VRAM Timing Control             */
+                                /* 0x61 VRAM Refresh Control            */
+#define CCR_VRAMSAC             0x62 /* VRAM Access Control             */
+                                /* 0x63 VRAM Status                     */
+#define CCR_VRAMBC              0x64 /* VRAM Block Control              */
+
+/*
+ * LCD Control Register
+ *
+ * This iomem area supports only 16-bit IO.
+ */
+#define LCR_UIS                 0x000 /* Unified Interrupt Status       */
+#define LCR_VHPN                0x008 /* VRAM Horizontal Pixel Number   */
+#define LCR_CFSAL               0x00a /* Command FIFO Start Address Low */
+#define LCR_CFSAH               0x00c /* Command FIFO Start Address High */
+#define LCR_CFS                 0x00e /* Command FIFO Size              */
+#define LCR_CFWS                0x010 /* Command FIFO Writeable Size    */
+#define LCR_BBIE                0x012 /* BitBLT Interrupt Enable        */
+#define LCR_BBISC               0x014 /* BitBLT Interrupt Status and Clear */
+#define LCR_CCS                 0x016 /* Command Count Status           */
+#define LCR_BBES                0x018 /* BitBLT Execution Status        */
+#define LCR_CMDL                0x01c /* Command Low                    */
+#define LCR_CMDH                0x01e /* Command High                   */
+#define LCR_CFC                 0x022 /* Command FIFO Clear             */
+#define LCR_CCIFC               0x024 /* CMOS Camera IF Control         */
+#define LCR_HWT                 0x026 /* Hardware Test                  */
+#define LCR_LCDCCRC             0x100 /* LCDC Clock and Reset Control   */
+#define LCR_LCDCC               0x102 /* LCDC Control                   */
+#define LCR_LCDCOPC             0x104 /* LCDC Output Pin Control        */
+#define LCR_LCDIS               0x108 /* LCD Interrupt Status           */
+#define LCR_LCDIM               0x10a /* LCD Interrupt Mask             */
+#define LCR_LCDIE               0x10c /* LCD Interrupt Enable           */
+#define LCR_GDSAL               0x122 /* Graphics Display Start Address Low */
+#define LCR_GDSAH               0x124 /* Graphics Display Start Address High */
+#define LCR_VHPCL               0x12a /* VRAM Horizontal Pixel Count Low */
+#define LCR_VHPCH               0x12c /* VRAM Horizontal Pixel Count High */
+#define LCR_GM                  0x12e /* Graphic Mode(VRAM access enable) */
+#define LCR_HT                  0x140 /* Horizontal Total               */
+#define LCR_HDS                 0x142 /* Horizontal Display Start       */
+#define LCR_HSS                 0x144 /* H-Sync Start                   */
+#define LCR_HSE                 0x146 /* H-Sync End                     */
+#define LCR_HNP                 0x14c /* Horizontal Number of Pixels    */
+#define LCR_VT                  0x150 /* Vertical Total                 */
+#define LCR_VDS                 0x152 /* Vertical Display Start         */
+#define LCR_VSS                 0x154 /* V-Sync Start                   */
+#define LCR_VSE                 0x156 /* V-Sync End                     */
+#define LCR_CDLN                0x160 /* Current Display Line Number    */
+#define LCR_ILN                 0x162 /* Interrupt Line Number          */
+#define LCR_SP                  0x164 /* Sync Polarity                  */
+#define LCR_MISC                0x166 /* MISC(RGB565 mode)              */
+#define LCR_VIHSS               0x16a /* Video Interface H-Sync Start   */
+#define LCR_VIVS                0x16c /* Video Interface Vertical Start */
+#define LCR_VIVE                0x16e /* Video Interface Vertical End   */
+#define LCR_VIVSS               0x170 /* Video Interface V-Sync Start   */
+#define LCR_VCCIS               0x17e /* Video / CMOS Camera Interface Select */
+#define LCR_VIDWSAL             0x180 /* VI Data Write Start Address Low */
+#define LCR_VIDWSAH             0x182 /* VI Data Write Start Address High */
+#define LCR_VIDRSAL             0x184 /* VI Data Read Start Address Low */
+#define LCR_VIDRSAH             0x186 /* VI Data Read Start Address High */
+#define LCR_VIPDDST             0x188 /* VI Picture Data Display Start Timing */
+#define LCR_VIPDDET             0x186 /* VI Picture Data Display End Timing */
+#define LCR_VIE                 0x18c /* Video Interface Enable         */
+#define LCR_VCS                 0x18e /* Video/Camera Select            */
+#define LCR_VPHWC               0x194 /* Video Picture Horizontal Wait Count */
+#define LCR_VPHS                0x196 /* Video Picture Horizontal Size  */
+#define LCR_VPVWC               0x198 /* Video Picture Vertical Wait Count */
+#define LCR_VPVS                0x19a /* Video Picture Vertical Size    */
+#define LCR_PLHPIX              0x1a0 /* PLHPIX                         */
+#define LCR_XS                  0x1a2 /* XStart                         */
+#define LCR_XCKHW               0x1a4 /* XCK High Width                 */
+#define LCR_STHS                0x1a8 /* STH Start                      */
+#define LCR_VT2                 0x1aa /* Vertical Total                 */
+#define LCR_YCKSW               0x1ac /* YCK Start Wait                 */
+#define LCR_YSTS                0x1ae /* YST Start                      */
+#define LCR_PPOLS               0x1b0 /* #PPOL Start                    */
+#define LCR_PRECW               0x1b2 /* PREC Width                     */
+#define LCR_VCLKHW              0x1b4 /* VCLK High Width                */
+#define LCR_OC                  0x1b6 /* Output Control                 */
+
+static char *mode_option __devinitdata;
+
+struct tmiofb_par {
+        u32                             pseudo_palette[16];
+
+#ifdef CONFIG_FB_TMIO_ACCELL
+        wait_queue_head_t               wait_acc;
+        bool                            use_polling;
+#endif
+
+        void __iomem                    *ccr;
+        void __iomem                    *lcr;
+};
+
+/*--------------------------------------------------------------------------*/
+
+/*
+ * reasons for an interrupt:
+ *      uis     bbisc   lcdis
+ *      0100    0001    accelerator command completed
+ *      2000    0001    vsync start
+ *      2000    0002    display start
+ *      2000    0004    line number match(0x1ff mask???)
+ */
+static irqreturn_t tmiofb_irq(int irq, void *__info)
+{
+        struct fb_info *info = __info;
+        struct tmiofb_par *par = info->par;
+        unsigned int bbisc = tmio_ioread16(par->lcr + LCR_BBISC);
+
+
+        /*
+         * We were in polling mode and now we got correct irq.
+         * Switch back to IRQ-based sync of command FIFO
+         */
+        if (unlikely(par->use_polling && irq != -1)) {
+                printk(KERN_INFO "tmiofb: switching to waitq\n");
+                par->use_polling = false;
+        }
+
+        tmio_iowrite16(bbisc, par->lcr + LCR_BBISC);
+
+#ifdef CONFIG_FB_TMIO_ACCELL
+        if (bbisc & 1)
+                wake_up(&par->wait_acc);
+#endif
+
+        return IRQ_HANDLED;
+}
+
+
+/*--------------------------------------------------------------------------*/
+
+
+/*
+ * Turns off the LCD controller and LCD host controller.
+ */
+static int tmiofb_hw_stop(struct platform_device *dev)
+{
+        struct mfd_cell *cell = dev->dev.platform_data;
+        struct tmio_fb_data *data = cell->driver_data;
+        struct fb_info *info = platform_get_drvdata(dev);
+        struct tmiofb_par *par = info->par;
+
+        tmio_iowrite16(0, par->ccr + CCR_UGCC);
+        tmio_iowrite16(0, par->lcr + LCR_GM);
+        data->lcd_set_power(dev, 0);
+        tmio_iowrite16(0x0010, par->lcr + LCR_LCDCCRC);
+
+        return 0;
+}
+
+/*
+ * Initializes the LCD host controller.
+ */
+static int tmiofb_hw_init(struct platform_device *dev)
+{
+        struct mfd_cell *cell = dev->dev.platform_data;
+        struct fb_info *info = platform_get_drvdata(dev);
+        struct tmiofb_par *par = info->par;
+        const struct resource *nlcr = &cell->resources[0];
+        const struct resource *vram = &cell->resources[2];
+        unsigned long base;
+
+        if (nlcr == NULL || vram == NULL)
+                return -EINVAL;
+
+        base = nlcr->start;
+
+        tmio_iowrite16(0x003a, par->ccr + CCR_UGCC);
+        tmio_iowrite16(0x003a, par->ccr + CCR_GCC);
+        tmio_iowrite16(0x3f00, par->ccr + CCR_USC);
+
+        msleep(2); /* wait for device to settle */
+
+        tmio_iowrite16(0x0000, par->ccr + CCR_USC);
+        tmio_iowrite16(base >> 16, par->ccr + CCR_BASEH);
+        tmio_iowrite16(base, par->ccr + CCR_BASEL);
+        tmio_iowrite16(0x0002, par->ccr + CCR_CMD); /* base address enable */
+        tmio_iowrite16(0x40a8, par->ccr + CCR_VRAMRTC); /* VRAMRC, VRAMTC */
+        tmio_iowrite16(0x0018, par->ccr + CCR_VRAMSAC); /* VRAMSTS, VRAMAC */
+        tmio_iowrite16(0x0002, par->ccr + CCR_VRAMBC);
+        msleep(2); /* wait for device to settle */
+        tmio_iowrite16(0x000b, par->ccr + CCR_VRAMBC);
+
+        base = vram->start + info->screen_size;
+        tmio_iowrite16(base >> 16, par->lcr + LCR_CFSAH);
+        tmio_iowrite16(base, par->lcr + LCR_CFSAL);
+        tmio_iowrite16(TMIOFB_FIFO_SIZE - 1, par->lcr + LCR_CFS);
+        tmio_iowrite16(1, par->lcr + LCR_CFC);
+        tmio_iowrite16(1, par->lcr + LCR_BBIE);
+        tmio_iowrite16(0, par->lcr + LCR_CFWS);
+
+        return 0;
+}
+
+/*
+ * Sets the LCD controller's output resolution and pixel clock
+ */
+static void tmiofb_hw_mode(struct platform_device *dev)
+{
+        struct mfd_cell *cell = dev->dev.platform_data;
+        struct tmio_fb_data *data = cell->driver_data;
+        struct fb_info *info = platform_get_drvdata(dev);
+        struct fb_videomode *mode = info->mode;
+        struct tmiofb_par *par = info->par;
+        unsigned int i;
+
+        tmio_iowrite16(0, par->lcr + LCR_GM);
+        data->lcd_set_power(dev, 0);
+        tmio_iowrite16(0x0010, par->lcr + LCR_LCDCCRC);
+        data->lcd_mode(dev, mode);
+        data->lcd_set_power(dev, 1);
+
+        tmio_iowrite16(info->fix.line_length, par->lcr + LCR_VHPN);
+        tmio_iowrite16(0, par->lcr + LCR_GDSAH);
+        tmio_iowrite16(0, par->lcr + LCR_GDSAL);
+        tmio_iowrite16(info->fix.line_length >> 16, par->lcr + LCR_VHPCH);
+        tmio_iowrite16(info->fix.line_length, par->lcr + LCR_VHPCL);
+        tmio_iowrite16(i = 0, par->lcr + LCR_HSS);
+        tmio_iowrite16(i += mode->hsync_len, par->lcr + LCR_HSE);
+        tmio_iowrite16(i += mode->left_margin, par->lcr + LCR_HDS);
+        tmio_iowrite16(i += mode->xres + mode->right_margin, par->lcr + LCR_HT);
+        tmio_iowrite16(mode->xres, par->lcr + LCR_HNP);
+        tmio_iowrite16(i = 0, par->lcr + LCR_VSS);
+        tmio_iowrite16(i += mode->vsync_len, par->lcr + LCR_VSE);
+        tmio_iowrite16(i += mode->upper_margin, par->lcr + LCR_VDS);
+        tmio_iowrite16(i += mode->yres, par->lcr + LCR_ILN);
+        tmio_iowrite16(i += mode->lower_margin, par->lcr + LCR_VT);
+        tmio_iowrite16(3, par->lcr + LCR_MISC); /* RGB565 mode */
+        tmio_iowrite16(1, par->lcr + LCR_GM); /* VRAM enable */
+        tmio_iowrite16(0x4007, par->lcr + LCR_LCDCC);
+        tmio_iowrite16(3, par->lcr + LCR_SP);  /* sync polarity */
+
+        tmio_iowrite16(0x0010, par->lcr + LCR_LCDCCRC);
+        msleep(5); /* wait for device to settle */
+        tmio_iowrite16(0x0014, par->lcr + LCR_LCDCCRC); /* STOP_CKP */
+        msleep(5); /* wait for device to settle */
+        tmio_iowrite16(0x0015, par->lcr + LCR_LCDCCRC); /* STOP_CKP|SOFT_RESET*/
+        tmio_iowrite16(0xfffa, par->lcr + LCR_VCS);
+}
+
+/*--------------------------------------------------------------------------*/
+
+#ifdef CONFIG_FB_TMIO_ACCELL
+static int __must_check
+tmiofb_acc_wait(struct fb_info *info, unsigned int ccs)
+{
+        struct tmiofb_par *par = info->par;
+        /*
+         * This code can be called whith interrupts disabled.
+         * So instead of relaying on irq to trigger the event,
+         * poll the state till the necessary command is executed.
+         */
+        if (irqs_disabled() || par->use_polling) {
+                int i = 0;
+                while (tmio_ioread16(par->lcr + LCR_CCS) > ccs) {
+                        udelay(1);
+                        i++;
+                        if (i > 10000) {
+                                pr_err("tmiofb: timeout waiting for %d\n",
+                                                ccs);
+                                return -ETIMEDOUT;
+                        }
+                        tmiofb_irq(-1, info);
+                }
+        } else {
+                if (!wait_event_interruptible_timeout(par->wait_acc,
+                                tmio_ioread16(par->lcr + LCR_CCS) <= ccs,
+                                1000)) {
+                        pr_err("tmiofb: timeout waiting for %d\n", ccs);
+                        return -ETIMEDOUT;
+                }
+        }
+
+        return 0;
+}
+
+/*
+ * Writes an accelerator command to the accelerator's FIFO.
+ */
+static int
+tmiofb_acc_write(struct fb_info *info, const u32 *cmd, unsigned int count)
+{
+        struct tmiofb_par *par = info->par;
+        int ret;
+
+        ret = tmiofb_acc_wait(info, TMIOFB_FIFO_SIZE - count);
+        if (ret)
+                return ret;
+
+        for (; count; count--, cmd++) {
+                tmio_iowrite16(*cmd >> 16, par->lcr + LCR_CMDH);
+                tmio_iowrite16(*cmd, par->lcr + LCR_CMDL);
+        }
+
+        return ret;
+}
+
+/*
+ * Wait for the accelerator to finish its operations before writing
+ * to the framebuffer for consistent display output.
+ */
+static int tmiofb_sync(struct fb_info *fbi)
+{
+        struct tmiofb_par *par = fbi->par;
+
+        int ret;
+        int i = 0;
+
+        ret = tmiofb_acc_wait(fbi, 0);
+
+        while (tmio_ioread16(par->lcr + LCR_BBES) & 2) { /* blit active */
+                udelay(1);
+                i++ ;
+                if (i > 10000) {
+                        printk(KERN_ERR "timeout waiting for blit to end!\n");
+                        return -ETIMEDOUT;
+                }
+        }
+
+        return ret;
+}
+
+static void
+tmiofb_fillrect(struct fb_info *fbi, const struct fb_fillrect *rect)
+{
+        const u32 cmd[] = {
+                TMIOFB_ACC_DSADR((rect->dy * fbi->mode->xres + rect->dx) * 2),
+                TMIOFB_ACC_DHPIX(rect->width - 1),
+                TMIOFB_ACC_DVPIX(rect->height - 1),
+                TMIOFB_ACC_FILL(rect->color),
+                TMIOFB_ACC_FLGO,
+        };
+
+        if (fbi->state != FBINFO_STATE_RUNNING ||
+            fbi->flags & FBINFO_HWACCEL_DISABLED) {
+                cfb_fillrect(fbi, rect);
+                return;
+        }
+
+        tmiofb_acc_write(fbi, cmd, ARRAY_SIZE(cmd));
+}
+
+static void
+tmiofb_copyarea(struct fb_info *fbi, const struct fb_copyarea *area)
+{
+        const u32 cmd[] = {
+                TMIOFB_ACC_DSADR((area->dy * fbi->mode->xres + area->dx) * 2),
+                TMIOFB_ACC_DHPIX(area->width - 1),
+                TMIOFB_ACC_DVPIX(area->height - 1),
+                TMIOFB_ACC_SSADR((area->sy * fbi->mode->xres + area->sx) * 2),
+                TMIOFB_ACC_SCGO,
+        };
+
+        if (fbi->state != FBINFO_STATE_RUNNING ||
+            fbi->flags & FBINFO_HWACCEL_DISABLED) {
+                cfb_copyarea(fbi, area);
+                return;
+        }
+
+        tmiofb_acc_write(fbi, cmd, ARRAY_SIZE(cmd));
+}
+#endif
+
+static void tmiofb_clearscreen(struct fb_info *info)
+{
+        const struct fb_fillrect rect = {
+                .dx     = 0,
+                .dy     = 0,
+                .width  = info->mode->xres,
+                .height = info->mode->yres,
+                .color  = 0,
+                .rop    = ROP_COPY,
+        };
+
+        info->fbops->fb_fillrect(info, &rect);
+}
+
+static int tmiofb_vblank(struct fb_info *fbi, struct fb_vblank *vblank)
+{
+        struct tmiofb_par *par = fbi->par;
+        struct fb_videomode *mode = fbi->mode;
+        unsigned int vcount = tmio_ioread16(par->lcr + LCR_CDLN);
+        unsigned int vds = mode->vsync_len + mode->upper_margin;
+
+        vblank->vcount = vcount;
+        vblank->flags = FB_VBLANK_HAVE_VBLANK | FB_VBLANK_HAVE_VCOUNT
+                                                | FB_VBLANK_HAVE_VSYNC;
+
+        if (vcount < mode->vsync_len)
+                vblank->flags |= FB_VBLANK_VSYNCING;
+
+        if (vcount < vds || vcount > vds + mode->yres)
+                vblank->flags |= FB_VBLANK_VBLANKING;
+
+        return 0;
+}
+
+
+static int tmiofb_ioctl(struct fb_info *fbi,
+                unsigned int cmd, unsigned long arg)
+{
+        switch (cmd) {
+        case FBIOGET_VBLANK: {
+                struct fb_vblank vblank = {0};
+                void __user *argp = (void __user *) arg;
+
+                tmiofb_vblank(fbi, &vblank);
+                if (copy_to_user(argp, &vblank, sizeof vblank))
+                        return -EFAULT;
+                return 0;
+        }
+
+#ifdef CONFIG_FB_TMIO_ACCELL
+        case FBIO_TMIO_ACC_SYNC:
+                tmiofb_sync(fbi);
+                return 0;
+
+        case FBIO_TMIO_ACC_WRITE: {
+                u32 __user *argp = (void __user *) arg;
+                u32 len;
+                u32 acc[16];
+
+                if (get_user(len, argp))
+                        return -EFAULT;
+                if (len > ARRAY_SIZE(acc))
+                        return -EINVAL;
+                if (copy_from_user(acc, argp + 1, sizeof(u32) * len))
+                        return -EFAULT;
+
+                return tmiofb_acc_write(fbi, acc, len);
+        }
+#endif
+        }
+
+        return -ENOTTY;
+}
+
+/*--------------------------------------------------------------------------*/
+
+/* Select the smallest mode that allows the desired resolution to be
+ * displayed.  If desired, the x and y parameters can be rounded up to
+ * match the selected mode.
+ */
+static struct fb_videomode *
+tmiofb_find_mode(struct fb_info *info, struct fb_var_screeninfo *var)
+{
+        struct mfd_cell *cell =
+                info->device->platform_data;
+        struct tmio_fb_data *data = cell->driver_data;
+        struct fb_videomode *best = NULL;
+        int i;
+
+        for (i = 0; i < data->num_modes; i++) {
+                struct fb_videomode *mode = data->modes + i;
+
+                if (mode->xres >= var->xres && mode->yres >= var->yres
+                                && (!best || (mode->xres < best->xres
+                                           && mode->yres < best->yres)))
+                        best = mode;
+        }
+
+        return best;
+}
+
+static int tmiofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+
+        struct fb_videomode *mode;
+        struct mfd_cell *cell =
+                info->device->platform_data;
+        struct tmio_fb_data *data = cell->driver_data;
+
+        mode = tmiofb_find_mode(info, var);
+        if (!mode || var->bits_per_pixel > 16)
+                return -EINVAL;
+
+        fb_videomode_to_var(var, mode);
+
+        var->xres_virtual = mode->xres;
+        var->yres_virtual = info->screen_size / (mode->xres * 2);
+
+        if (var->yres_virtual < var->yres)
+                return -EINVAL;
+
+        var->xoffset = 0;
+        var->yoffset = 0;
+        var->bits_per_pixel = 16;
+        var->grayscale = 0;
+        var->red.offset = 11;
+        var->red.length = 5;
+        var->green.offset = 5;
+        var->green.length = 6;
+        var->blue.offset = 0;
+        var->blue.length = 5;
+        var->transp.offset = 0;
+        var->transp.length = 0;
+        var->nonstd = 0;
+        var->height = data->height; /* mm */
+        var->width = data->width; /* mm */
+        var->rotate = 0;
+        return 0;
+}
+
+static int tmiofb_set_par(struct fb_info *info)
+{
+        struct fb_var_screeninfo *var = &info->var;
+        struct fb_videomode *mode;
+
+        mode = tmiofb_find_mode(info, var);
+        if (!mode)
+                return -EINVAL;
+
+        info->mode = mode;
+        info->fix.line_length = info->mode->xres *
+                        var->bits_per_pixel / 8;
+
+        tmiofb_hw_mode(to_platform_device(info->device));
+        tmiofb_clearscreen(info);
+        return 0;
+}
+
+static int tmiofb_setcolreg(unsigned regno, unsigned red, unsigned green,
+                           unsigned blue, unsigned transp,
+                           struct fb_info *info)
+{
+        struct tmiofb_par *par = info->par;
+
+        if (regno < ARRAY_SIZE(par->pseudo_palette)) {
+                par->pseudo_palette[regno] =
+                        ((red & 0xf800)) |
+                        ((green & 0xfc00) >>  5) |
+                        ((blue & 0xf800) >> 11);
+                return 0;
+        }
+
+        return -EINVAL;
+}
+
+static int tmiofb_blank(int blank, struct fb_info *info)
+{
+        /*
+         * everything is done in lcd/bl drivers.
+         * this is purely to make sysfs happy and work.
+         */
+        return 0;
+}
+
+static struct fb_ops tmiofb_ops = {
+        .owner          = THIS_MODULE,
+
+        .fb_ioctl       = tmiofb_ioctl,
+        .fb_check_var   = tmiofb_check_var,
+        .fb_set_par     = tmiofb_set_par,
+        .fb_setcolreg   = tmiofb_setcolreg,
+        .fb_blank       = tmiofb_blank,
+        .fb_imageblit   = cfb_imageblit,
+#ifdef CONFIG_FB_TMIO_ACCELL
+        .fb_sync        = tmiofb_sync,
+        .fb_fillrect    = tmiofb_fillrect,
+        .fb_copyarea    = tmiofb_copyarea,
+#else
+        .fb_fillrect    = cfb_fillrect,
+        .fb_copyarea    = cfb_copyarea,
+#endif
+};
+
+/*--------------------------------------------------------------------------*/
+
+static int __devinit tmiofb_probe(struct platform_device *dev)
+{
+        struct mfd_cell *cell = dev->dev.platform_data;
+        struct tmio_fb_data *data = cell->driver_data;
+        struct resource *ccr = platform_get_resource(dev, IORESOURCE_MEM, 1);
+        struct resource *lcr = platform_get_resource(dev, IORESOURCE_MEM, 0);
+        struct resource *vram = platform_get_resource(dev, IORESOURCE_MEM, 2);
+        int irq = platform_get_irq(dev, 0);
+        struct fb_info *info;
+        struct tmiofb_par *par;
+        int retval;
+
+        /*
+         * This is the only way ATM to disable the fb
+         */
+        if (data == NULL) {
+                dev_err(&dev->dev, "NULL platform data!\n");
+                return -EINVAL;
+        }
+
+        info = framebuffer_alloc(sizeof(struct tmiofb_par), &dev->dev);
+
+        if (!info)
+                return -ENOMEM;
+
+        par = info->par;
+
+#ifdef CONFIG_FB_TMIO_ACCELL
+        init_waitqueue_head(&par->wait_acc);
+
+        par->use_polling = true;
+
+        info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_COPYAREA
+                        | FBINFO_HWACCEL_FILLRECT;
+#else
+        info->flags = FBINFO_DEFAULT;
+#endif
+
+        info->fbops = &tmiofb_ops;
+
+        strcpy(info->fix.id, "tmio-fb");
+        info->fix.smem_start = vram->start;
+        info->fix.smem_len = resource_size(vram);
+        info->fix.type = FB_TYPE_PACKED_PIXELS;
+        info->fix.visual = FB_VISUAL_TRUECOLOR;
+        info->fix.mmio_start = lcr->start;
+        info->fix.mmio_len = resource_size(lcr);
+        info->fix.accel = FB_ACCEL_NONE;
+        info->screen_size = info->fix.smem_len - (4 * TMIOFB_FIFO_SIZE);
+        info->pseudo_palette = par->pseudo_palette;
+
+        par->ccr = ioremap(ccr->start, resource_size(ccr));
+        if (!par->ccr) {
+                retval = -ENOMEM;
+                goto err_ioremap_ccr;
+        }
+
+        par->lcr = ioremap(info->fix.mmio_start, info->fix.mmio_len);
+        if (!par->lcr) {
+                retval = -ENOMEM;
+                goto err_ioremap_lcr;
+        }
+
+        info->screen_base = ioremap(info->fix.smem_start, info->fix.smem_len);
+        if (!info->screen_base) {
+                retval = -ENOMEM;
+                goto err_ioremap_vram;
+        }
+
+        retval = request_irq(irq, &tmiofb_irq, IRQF_DISABLED,
+                                        dev->dev.bus_id, info);
+
+        if (retval)
+                goto err_request_irq;
+
+        platform_set_drvdata(dev, info);
+
+        retval = fb_find_mode(&info->var, info, mode_option,
+                        data->modes, data->num_modes,
+                        data->modes, 16);
+        if (!retval) {
+                retval = -EINVAL;
+                goto err_find_mode;
+        }
+
+        if (cell->enable) {
+                retval = cell->enable(dev);
+                if (retval)
+                        goto err_enable;
+        }
+
+        retval = tmiofb_hw_init(dev);
+        if (retval)
+                goto err_hw_init;
+
+        fb_videomode_to_modelist(data->modes, data->num_modes,
+                                 &info->modelist);
+
+        retval = register_framebuffer(info);
+        if (retval < 0)
+                goto err_register_framebuffer;
+
+        printk(KERN_INFO "fb%d: %s frame buffer device\n",
+                                info->node, info->fix.id);
+
+        return 0;
+
+err_register_framebuffer:
+/*err_set_par:*/
+        tmiofb_hw_stop(dev);
+err_hw_init:
+        if (cell->disable)
+                cell->disable(dev);
+err_enable:
+err_find_mode:
+        platform_set_drvdata(dev, NULL);
+        free_irq(irq, info);
+err_request_irq:
+        iounmap(info->screen_base);
+err_ioremap_vram:
+        iounmap(par->lcr);
+err_ioremap_lcr:
+        iounmap(par->ccr);
+err_ioremap_ccr:
+        framebuffer_release(info);
+        return retval;
+}
+
+static int __devexit tmiofb_remove(struct platform_device *dev)
+{
+        struct mfd_cell *cell = dev->dev.platform_data;
+        struct fb_info *info = platform_get_drvdata(dev);
+        int irq = platform_get_irq(dev, 0);
+        struct tmiofb_par *par;
+
+        if (info) {
+                par = info->par;
+                unregister_framebuffer(info);
+
+                tmiofb_hw_stop(dev);
+
+                if (cell->disable)
+                        cell->disable(dev);
+
+                platform_set_drvdata(dev, NULL);
+
+                free_irq(irq, info);
+
+                iounmap(info->screen_base);
+                iounmap(par->lcr);
+                iounmap(par->ccr);
+
+                framebuffer_release(info);
+        }
+
+        return 0;
+}
+
+#ifdef DEBUG
+static void tmiofb_dump_regs(struct platform_device *dev)
+{
+        struct fb_info *info = platform_get_drvdata(dev);
+        struct tmiofb_par *par = info->par;
+
+        printk(KERN_DEBUG "lhccr:\n");
+#define CCR_PR(n)       printk(KERN_DEBUG "\t" #n " = \t%04x\n",\
+                tmio_ioread16(par->ccr + CCR_ ## n));
+        CCR_PR(CMD);
+        CCR_PR(REVID);
+        CCR_PR(BASEL);
+        CCR_PR(BASEH);
+        CCR_PR(UGCC);
+        CCR_PR(GCC);
+        CCR_PR(USC);
+        CCR_PR(VRAMRTC);
+        CCR_PR(VRAMSAC);
+        CCR_PR(VRAMBC);
+#undef CCR_PR
+
+        printk(KERN_DEBUG "lcr: \n");
+#define LCR_PR(n)       printk(KERN_DEBUG "\t" #n " = \t%04x\n",\
+                tmio_ioread16(par->lcr + LCR_ ## n));
+        LCR_PR(UIS);
+        LCR_PR(VHPN);
+        LCR_PR(CFSAL);
+        LCR_PR(CFSAH);
+        LCR_PR(CFS);
+        LCR_PR(CFWS);
+        LCR_PR(BBIE);
+        LCR_PR(BBISC);
+        LCR_PR(CCS);
+        LCR_PR(BBES);
+        LCR_PR(CMDL);
+        LCR_PR(CMDH);
+        LCR_PR(CFC);
+        LCR_PR(CCIFC);
+        LCR_PR(HWT);
+        LCR_PR(LCDCCRC);
+        LCR_PR(LCDCC);
+        LCR_PR(LCDCOPC);
+        LCR_PR(LCDIS);
+        LCR_PR(LCDIM);
+        LCR_PR(LCDIE);
+        LCR_PR(GDSAL);
+        LCR_PR(GDSAH);
+        LCR_PR(VHPCL);
+        LCR_PR(VHPCH);
+        LCR_PR(GM);
+        LCR_PR(HT);
+        LCR_PR(HDS);
+        LCR_PR(HSS);
+        LCR_PR(HSE);
+        LCR_PR(HNP);
+        LCR_PR(VT);
+        LCR_PR(VDS);
+        LCR_PR(VSS);
+        LCR_PR(VSE);
+        LCR_PR(CDLN);
+        LCR_PR(ILN);
+        LCR_PR(SP);
+        LCR_PR(MISC);
+        LCR_PR(VIHSS);
+        LCR_PR(VIVS);
+        LCR_PR(VIVE);
+        LCR_PR(VIVSS);
+        LCR_PR(VCCIS);
+        LCR_PR(VIDWSAL);
+        LCR_PR(VIDWSAH);
+        LCR_PR(VIDRSAL);
+        LCR_PR(VIDRSAH);
+        LCR_PR(VIPDDST);
+        LCR_PR(VIPDDET);
+        LCR_PR(VIE);
+        LCR_PR(VCS);
+        LCR_PR(VPHWC);
+        LCR_PR(VPHS);
+        LCR_PR(VPVWC);
+        LCR_PR(VPVS);
+        LCR_PR(PLHPIX);
+        LCR_PR(XS);
+        LCR_PR(XCKHW);
+        LCR_PR(STHS);
+        LCR_PR(VT2);
+        LCR_PR(YCKSW);
+        LCR_PR(YSTS);
+        LCR_PR(PPOLS);
+        LCR_PR(PRECW);
+        LCR_PR(VCLKHW);
+        LCR_PR(OC);
+#undef LCR_PR
+}
+#endif
+
+#ifdef CONFIG_PM
+static int tmiofb_suspend(struct platform_device *dev, pm_message_t state)
+{
+        struct fb_info *info = platform_get_drvdata(dev);
+        struct tmiofb_par *par = info->par;
+        struct mfd_cell *cell = dev->dev.platform_data;
+        int retval = 0;
+
+        acquire_console_sem();
+
+        fb_set_suspend(info, 1);
+
+        if (info->fbops->fb_sync)
+                info->fbops->fb_sync(info);
+
+
+        /*
+         * The fb should be usable even if interrupts are disabled (and they are
+         * during suspend/resume). Switch temporary to forced polling.
+         */
+        printk(KERN_INFO "tmiofb: switching to polling\n");
+        par->use_polling = true;
+        tmiofb_hw_stop(dev);
+
+        if (cell->suspend)
+                retval = cell->suspend(dev);
+
+        release_console_sem();
+
+        return retval;
+}
+
+static int tmiofb_resume(struct platform_device *dev)
+{
+        struct fb_info *info = platform_get_drvdata(dev);
+        struct mfd_cell *cell = dev->dev.platform_data;
+        int retval;
+
+        acquire_console_sem();
+
+        if (cell->resume) {
+                retval = cell->resume(dev);
+                if (retval)
+                        goto out;
+        }
+
+        tmiofb_irq(-1, info);
+
+        tmiofb_hw_init(dev);
+
+        tmiofb_hw_mode(dev);
+
+        fb_set_suspend(info, 0);
+out:
+        release_console_sem();
+        return retval;
+}
+#else
+#define tmiofb_suspend  NULL
+#define tmiofb_resume   NULL
+#endif
+
+static struct platform_driver tmiofb_driver = {
+        .driver.name    = "tmio-fb",
+        .driver.owner   = THIS_MODULE,
+        .probe          = tmiofb_probe,
+        .remove         = __devexit_p(tmiofb_remove),
+        .suspend        = tmiofb_suspend,
+        .resume         = tmiofb_resume,
+};
+
+/*--------------------------------------------------------------------------*/
+
+#ifndef MODULE
+static void __init tmiofb_setup(char *options)
+{
+        char *this_opt;
+
+        if (!options || !*options)
+                return;
+
+        while ((this_opt = strsep(&options, ",")) != NULL) {
+                if (!*this_opt)
+                        continue;
+                /*
+                 * FIXME
+                 */
+        }
+}
+#endif
+
+static int __init tmiofb_init(void)
+{
+#ifndef MODULE
+        char *option = NULL;
+
+        if (fb_get_options("tmiofb", &option))
+                return -ENODEV;
+        tmiofb_setup(option);
+#endif
+        return platform_driver_register(&tmiofb_driver);
+}
+
+static void __exit tmiofb_cleanup(void)
+{
+        platform_driver_unregister(&tmiofb_driver);
+}
+
+module_init(tmiofb_init);
+module_exit(tmiofb_cleanup);
+
+MODULE_DESCRIPTION("TMIO framebuffer driver");
+MODULE_AUTHOR("Chris Humbert, Dirk Opfer, Dmitry Baryshkov");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
index 50744229c7a9..6c2d37fdd3b9 100644
--- a/drivers/video/uvesafb.c
+++ b/drivers/video/uvesafb.c
@@ -516,10 +516,12 @@ static int __devinit uvesafb_vbe_getmodes(struct uvesafb_ktask *task,
 
                 err = uvesafb_exec(task);
                 if (err || (task->t.regs.eax & 0xffff) != 0x004f) {
-                        printk(KERN_ERR "uvesafb: Getting mode info block "
+                        printk(KERN_WARNING "uvesafb: Getting mode info block "
                                 "for mode 0x%x failed (eax=0x%x, err=%d)\n",
                                 *mode, (u32)task->t.regs.eax, err);
-                        return -EINVAL;
+                        mode++;
+                        par->vbe_modes_cnt--;
+                        continue;
                 }
 
                 mib = task->buf;
@@ -548,7 +550,10 @@ static int __devinit uvesafb_vbe_getmodes(struct uvesafb_ktask *task,
                         mib->depth = mib->bits_per_pixel;
         }
 
-        return 0;
+        if (par->vbe_modes_cnt > 0)
+                return 0;
+        else
+                return -EINVAL;
 }
 
 /*
diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c
index e31bca8a0cb2..5b2938903ac2 100644
--- a/drivers/video/vga16fb.c
+++ b/drivers/video/vga16fb.c
@@ -58,7 +58,6 @@ struct vga16fb_par {
                 unsigned char   ClockingMode;     /* Seq-Controller:01h */
         } vga_state;
         struct vgastate state;
-        struct mutex open_lock;
         unsigned int ref_count;
         int palette_blanked, vesa_blanked, mode, isVGA;
         u8 misc, pel_msk, vss, clkdiv;
@@ -286,7 +285,6 @@ static int vga16fb_open(struct fb_info *info, int user)
 {
         struct vga16fb_par *par = info->par;
 
-        mutex_lock(&par->open_lock);
         if (!par->ref_count) {
                 memset(&par->state, 0, sizeof(struct vgastate));
                 par->state.flags = VGA_SAVE_FONTS | VGA_SAVE_MODE |
@@ -294,7 +292,6 @@ static int vga16fb_open(struct fb_info *info, int user)
                 save_vga(&par->state);
         }
         par->ref_count++;
-        mutex_unlock(&par->open_lock);
 
         return 0;
 }
@@ -303,15 +300,12 @@ static int vga16fb_release(struct fb_info *info, int user)
 {
         struct vga16fb_par *par = info->par;
 
-        mutex_lock(&par->open_lock);
-        if (!par->ref_count) {
-                mutex_unlock(&par->open_lock);
+        if (!par->ref_count)
                 return -EINVAL;
-        }
+
         if (par->ref_count == 1)
                 restore_vga(&par->state);
         par->ref_count--;
-        mutex_unlock(&par->open_lock);
 
         return 0;
 }
@@ -1326,7 +1320,6 @@ static int __init vga16fb_probe(struct platform_device *dev)
         printk(KERN_INFO "vga16fb: mapped to 0x%p\n", info->screen_base);
         par = info->par;
 
-        mutex_init(&par->open_lock);
         par->isVGA = screen_info.orig_video_isVGA;
         par->palette_blanked = 0;
         par->vesa_blanked = 0;
diff --git a/drivers/video/via/Makefile b/drivers/video/via/Makefile
new file mode 100644
index 000000000000..e533b4b6aba4
--- /dev/null
+++ b/drivers/video/via/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the VIA framebuffer driver (for Linux Kernel 2.6)
+#
+
+obj-$(CONFIG_FB_VIA) += viafb.o
+
+viafb-y :=viafbdev.o hw.o iface.o  via_i2c.o dvi.o lcd.o ioctl.o accel.o via_utility.o vt1636.o global.o tblDPASetting.o viamode.o tbl1636.o
diff --git a/drivers/video/via/accel.c b/drivers/video/via/accel.c
new file mode 100644
index 000000000000..632523ff1fb7
--- /dev/null
+++ b/drivers/video/via/accel.c
@@ -0,0 +1,279 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; 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 "global.h"
+
+void viafb_init_accel(void)
+{
+        viaparinfo->fbmem_free -= CURSOR_SIZE;
+        viaparinfo->cursor_start = viaparinfo->fbmem_free;
+        viaparinfo->fbmem_used += CURSOR_SIZE;
+
+        /* Reverse 8*1024 memory space for cursor image */
+        viaparinfo->fbmem_free -= (CURSOR_SIZE + VQ_SIZE);
+        viaparinfo->VQ_start = viaparinfo->fbmem_free;
+        viaparinfo->VQ_end = viaparinfo->VQ_start + VQ_SIZE - 1;
+        viaparinfo->fbmem_used += (CURSOR_SIZE + VQ_SIZE); }
+
+void viafb_init_2d_engine(void)
+{
+        u32 dwVQStartAddr, dwVQEndAddr;
+        u32 dwVQLen, dwVQStartL, dwVQEndL, dwVQStartEndH;
+
+        /* init 2D engine regs to reset 2D engine */
+        writel(0x0, viaparinfo->io_virt + VIA_REG_GEMODE);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_SRCPOS);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_DSTPOS);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_DIMENSION);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_PATADDR);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_FGCOLOR);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_BGCOLOR);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_CLIPTL);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_CLIPBR);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_OFFSET);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_KEYCONTROL);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_SRCBASE);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_DSTBASE);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_PITCH);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_MONOPAT1);
+
+        /* Init AGP and VQ regs */
+        switch (viaparinfo->chip_info->gfx_chip_name) {
+        case UNICHROME_K8M890:
+        case UNICHROME_P4M900:
+                writel(0x00100000, viaparinfo->io_virt + VIA_REG_CR_TRANSET);
+                writel(0x680A0000, viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
+                writel(0x02000000, viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
+                break;
+
+        default:
+                writel(0x00100000, viaparinfo->io_virt + VIA_REG_TRANSET);
+                writel(0x00000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                writel(0x00333004, viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                writel(0x60000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                writel(0x61000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                writel(0x62000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                writel(0x63000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                writel(0x64000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                writel(0x7D000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
+
+                writel(0xFE020000, viaparinfo->io_virt + VIA_REG_TRANSET);
+                writel(0x00000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                break;
+        }
+        if (viaparinfo->VQ_start != 0) {
+                /* Enable VQ */
+                dwVQStartAddr = viaparinfo->VQ_start;
+                dwVQEndAddr = viaparinfo->VQ_end;
+
+                dwVQStartL = 0x50000000 | (dwVQStartAddr & 0xFFFFFF);
+                dwVQEndL = 0x51000000 | (dwVQEndAddr & 0xFFFFFF);
+                dwVQStartEndH = 0x52000000 |
+                        ((dwVQStartAddr & 0xFF000000) >> 24) |
+                        ((dwVQEndAddr & 0xFF000000) >> 16);
+                dwVQLen = 0x53000000 | (VQ_SIZE >> 3);
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_K8M890:
+                case UNICHROME_P4M900:
+                        dwVQStartL |= 0x20000000;
+                        dwVQEndL |= 0x20000000;
+                        dwVQStartEndH |= 0x20000000;
+                        dwVQLen |= 0x20000000;
+                        break;
+                default:
+                        break;
+                }
+
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_K8M890:
+                case UNICHROME_P4M900:
+                        writel(0x00100000,
+                                viaparinfo->io_virt + VIA_REG_CR_TRANSET);
+                        writel(dwVQStartEndH,
+                                viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
+                        writel(dwVQStartL,
+                                viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
+                        writel(dwVQEndL,
+                                viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
+                        writel(dwVQLen,
+                                viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
+                        writel(0x74301001,
+                                viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
+                        writel(0x00000000,
+                                viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
+                        break;
+                default:
+                        writel(0x00FE0000,
+                                viaparinfo->io_virt + VIA_REG_TRANSET);
+                        writel(0x080003FE,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x0A00027C,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x0B000260,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x0C000274,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x0D000264,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x0E000000,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x0F000020,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x1000027E,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x110002FE,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x200F0060,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+
+                        writel(0x00000006,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x40008C0F,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x44000000,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x45080C04,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x46800408,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+
+                        writel(dwVQStartEndH,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(dwVQStartL,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(dwVQEndL,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(dwVQLen,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        break;
+                }
+        } else {
+                /* Disable VQ */
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_K8M890:
+                case UNICHROME_P4M900:
+                        writel(0x00100000,
+                                viaparinfo->io_virt + VIA_REG_CR_TRANSET);
+                        writel(0x74301000,
+                                viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
+                        break;
+                default:
+                        writel(0x00FE0000,
+                                viaparinfo->io_virt + VIA_REG_TRANSET);
+                        writel(0x00000004,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x40008C0F,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x44000000,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x45080C04,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        writel(0x46800408,
+                                viaparinfo->io_virt + VIA_REG_TRANSPACE);
+                        break;
+                }
+        }
+
+        viafb_set_2d_color_depth(viaparinfo->bpp);
+
+        writel(0x0, viaparinfo->io_virt + VIA_REG_SRCBASE);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_DSTBASE);
+
+        writel(VIA_PITCH_ENABLE |
+                   (((viaparinfo->hres *
+                      viaparinfo->bpp >> 3) >> 3) | (((viaparinfo->hres *
+                                                   viaparinfo->
+                                                   bpp >> 3) >> 3) << 16)),
+                                        viaparinfo->io_virt + VIA_REG_PITCH);
+}
+
+void viafb_set_2d_color_depth(int bpp)
+{
+        u32 dwGEMode;
+
+        dwGEMode = readl(viaparinfo->io_virt + 0x04) & 0xFFFFFCFF;
+
+        switch (bpp) {
+        case 16:
+                dwGEMode |= VIA_GEM_16bpp;
+                break;
+        case 32:
+                dwGEMode |= VIA_GEM_32bpp;
+                break;
+        default:
+                dwGEMode |= VIA_GEM_8bpp;
+                break;
+        }
+
+        /* Set BPP and Pitch */
+        writel(dwGEMode, viaparinfo->io_virt + VIA_REG_GEMODE);
+}
+
+void viafb_hw_cursor_init(void)
+{
+        /* Set Cursor Image Base Address */
+        writel(viaparinfo->cursor_start,
+                viaparinfo->io_virt + VIA_REG_CURSOR_MODE);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_CURSOR_POS);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_CURSOR_ORG);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_CURSOR_BG);
+        writel(0x0, viaparinfo->io_virt + VIA_REG_CURSOR_FG);
+}
+
+void viafb_show_hw_cursor(struct fb_info *info, int Status)
+{
+        u32 temp;
+        u32 iga_path = ((struct viafb_par *)(info->par))->iga_path;
+
+        temp = readl(viaparinfo->io_virt + VIA_REG_CURSOR_MODE);
+        switch (Status) {
+        case HW_Cursor_ON:
+                temp |= 0x1;
+                break;
+        case HW_Cursor_OFF:
+                temp &= 0xFFFFFFFE;
+                break;
+        }
+        switch (iga_path) {
+        case IGA2:
+                temp |= 0x80000000;
+                break;
+        case IGA1:
+        default:
+                temp &= 0x7FFFFFFF;
+        }
+        writel(temp, viaparinfo->io_virt + VIA_REG_CURSOR_MODE);
+}
+
+int viafb_wait_engine_idle(void)
+{
+        int loop = 0;
+
+        while (!(readl(viaparinfo->io_virt + VIA_REG_STATUS) &
+                        VIA_VR_QUEUE_BUSY) && (loop++ < MAXLOOP))
+                cpu_relax();
+
+        while ((readl(viaparinfo->io_virt + VIA_REG_STATUS) &
+                    (VIA_CMD_RGTR_BUSY | VIA_2D_ENG_BUSY | VIA_3D_ENG_BUSY)) &&
+                    (loop++ < MAXLOOP))
+                cpu_relax();
+
+        return loop >= MAXLOOP;
+}
diff --git a/drivers/video/via/accel.h b/drivers/video/via/accel.h
new file mode 100644
index 000000000000..29bf854e8ccf
--- /dev/null
+++ b/drivers/video/via/accel.h
@@ -0,0 +1,169 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __ACCEL_H__
+#define __ACCEL_H__
+
+#define FB_ACCEL_VIA_UNICHROME  50
+
+/* MMIO Base Address Definition */
+#define MMIO_VGABASE                0x8000
+#define MMIO_CR_READ                (MMIO_VGABASE + 0x3D4)
+#define MMIO_CR_WRITE               (MMIO_VGABASE + 0x3D5)
+#define MMIO_SR_READ                (MMIO_VGABASE + 0x3C4)
+#define MMIO_SR_WRITE               (MMIO_VGABASE + 0x3C5)
+
+/* HW Cursor Status Define */
+#define HW_Cursor_ON    0
+#define HW_Cursor_OFF   1
+
+#define CURSOR_SIZE     (8 * 1024)
+#define VQ_SIZE         (256 * 1024)
+
+#define VIA_MMIO_BLTBASE        0x200000
+#define VIA_MMIO_BLTSIZE        0x200000
+
+/* Defines for 2D registers */
+#define VIA_REG_GECMD           0x000
+#define VIA_REG_GEMODE          0x004
+#define VIA_REG_SRCPOS          0x008
+#define VIA_REG_DSTPOS          0x00C
+/* width and height */
+#define VIA_REG_DIMENSION       0x010
+#define VIA_REG_PATADDR         0x014
+#define VIA_REG_FGCOLOR         0x018
+#define VIA_REG_BGCOLOR         0x01C
+/* top and left of clipping */
+#define VIA_REG_CLIPTL          0x020
+/* bottom and right of clipping */
+#define VIA_REG_CLIPBR          0x024
+#define VIA_REG_OFFSET          0x028
+/* color key control */
+#define VIA_REG_KEYCONTROL      0x02C
+#define VIA_REG_SRCBASE         0x030
+#define VIA_REG_DSTBASE         0x034
+/* pitch of src and dst */
+#define VIA_REG_PITCH           0x038
+#define VIA_REG_MONOPAT0        0x03C
+#define VIA_REG_MONOPAT1        0x040
+/* from 0x100 to 0x1ff */
+#define VIA_REG_COLORPAT        0x100
+
+/* VIA_REG_PITCH(0x38): Pitch Setting */
+#define VIA_PITCH_ENABLE        0x80000000
+
+/* defines for VIA HW cursor registers */
+#define VIA_REG_CURSOR_MODE     0x2D0
+#define VIA_REG_CURSOR_POS      0x2D4
+#define VIA_REG_CURSOR_ORG      0x2D8
+#define VIA_REG_CURSOR_BG       0x2DC
+#define VIA_REG_CURSOR_FG       0x2E0
+
+/* VIA_REG_GEMODE(0x04): GE mode */
+#define VIA_GEM_8bpp            0x00000000
+#define VIA_GEM_16bpp           0x00000100
+#define VIA_GEM_32bpp           0x00000300
+
+/* VIA_REG_GECMD(0x00): 2D Engine Command  */
+#define VIA_GEC_NOOP            0x00000000
+#define VIA_GEC_BLT             0x00000001
+#define VIA_GEC_LINE            0x00000005
+
+/* Rotate Command */
+#define VIA_GEC_ROT             0x00000008
+
+#define VIA_GEC_SRC_XY          0x00000000
+#define VIA_GEC_SRC_LINEAR      0x00000010
+#define VIA_GEC_DST_XY          0x00000000
+#define VIA_GEC_DST_LINRAT      0x00000020
+
+#define VIA_GEC_SRC_FB          0x00000000
+#define VIA_GEC_SRC_SYS         0x00000040
+#define VIA_GEC_DST_FB          0x00000000
+#define VIA_GEC_DST_SYS         0x00000080
+
+/* source is mono */
+#define VIA_GEC_SRC_MONO        0x00000100
+/* pattern is mono */
+#define VIA_GEC_PAT_MONO        0x00000200
+/* mono src is opaque */
+#define VIA_GEC_MSRC_OPAQUE     0x00000000
+/* mono src is transparent */
+#define VIA_GEC_MSRC_TRANS      0x00000400
+/* pattern is in frame buffer */
+#define VIA_GEC_PAT_FB          0x00000000
+/* pattern is from reg setting */
+#define VIA_GEC_PAT_REG         0x00000800
+
+#define VIA_GEC_CLIP_DISABLE    0x00000000
+#define VIA_GEC_CLIP_ENABLE     0x00001000
+
+#define VIA_GEC_FIXCOLOR_PAT    0x00002000
+
+#define VIA_GEC_INCX            0x00000000
+#define VIA_GEC_DECY            0x00004000
+#define VIA_GEC_INCY            0x00000000
+#define VIA_GEC_DECX            0x00008000
+/* mono pattern is opaque */
+#define VIA_GEC_MPAT_OPAQUE     0x00000000
+/* mono pattern is transparent */
+#define VIA_GEC_MPAT_TRANS      0x00010000
+
+#define VIA_GEC_MONO_UNPACK     0x00000000
+#define VIA_GEC_MONO_PACK       0x00020000
+#define VIA_GEC_MONO_DWORD      0x00000000
+#define VIA_GEC_MONO_WORD       0x00040000
+#define VIA_GEC_MONO_BYTE       0x00080000
+
+#define VIA_GEC_LASTPIXEL_ON    0x00000000
+#define VIA_GEC_LASTPIXEL_OFF   0x00100000
+#define VIA_GEC_X_MAJOR         0x00000000
+#define VIA_GEC_Y_MAJOR         0x00200000
+#define VIA_GEC_QUICK_START     0x00800000
+
+/* defines for VIA 3D registers */
+#define VIA_REG_STATUS          0x400
+#define VIA_REG_CR_TRANSET      0x41C
+#define VIA_REG_CR_TRANSPACE    0x420
+#define VIA_REG_TRANSET         0x43C
+#define VIA_REG_TRANSPACE       0x440
+
+/* VIA_REG_STATUS(0x400): Engine Status */
+
+/* Command Regulator is busy */
+#define VIA_CMD_RGTR_BUSY       0x00000080
+/* 2D Engine is busy */
+#define VIA_2D_ENG_BUSY         0x00000002
+/* 3D Engine is busy */
+#define VIA_3D_ENG_BUSY         0x00000001
+/* Virtual Queue is busy */
+#define VIA_VR_QUEUE_BUSY       0x00020000
+
+#define MAXLOOP                 0xFFFFFF
+
+void viafb_init_accel(void);
+void viafb_init_2d_engine(void);
+void set_2d_color_depth(int);
+void viafb_hw_cursor_init(void);
+void viafb_show_hw_cursor(struct fb_info *info, int Status); int
+viafb_wait_engine_idle(void); void viafb_set_2d_color_depth(int bpp);
+
+#endif /* __ACCEL_H__ */
diff --git a/drivers/video/via/chip.h b/drivers/video/via/chip.h
new file mode 100644
index 000000000000..dde95edc387a
--- /dev/null
+++ b/drivers/video/via/chip.h
@@ -0,0 +1,190 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+#ifndef __CHIP_H__
+#define __CHIP_H__
+
+#include "global.h"
+
+/***************************************/
+/* Definition Graphic Chip Information */
+/***************************************/
+
+#define     PCI_VIA_VENDOR_ID       0x1106
+
+/* Define VIA Graphic Chip Name */
+#define     UNICHROME_CLE266        1
+#define     UNICHROME_CLE266_DID    0x3122
+#define     CLE266_REVISION_AX      0x0A
+#define     CLE266_REVISION_CX      0x0C
+
+#define     UNICHROME_K400          2
+#define     UNICHROME_K400_DID      0x7205
+
+#define     UNICHROME_K800          3
+#define     UNICHROME_K800_DID      0x3108
+
+#define     UNICHROME_PM800         4
+#define     UNICHROME_PM800_DID     0x3118
+
+#define     UNICHROME_CN700         5
+#define     UNICHROME_CN700_DID     0x3344
+
+#define     UNICHROME_CX700         6
+#define     UNICHROME_CX700_DID     0x3157
+#define     CX700_REVISION_700      0x0
+#define     CX700_REVISION_700M     0x1
+#define     CX700_REVISION_700M2    0x2
+
+#define     UNICHROME_CN750         7
+#define     UNICHROME_CN750_DID     0x3225
+
+#define     UNICHROME_K8M890        8
+#define     UNICHROME_K8M890_DID    0x3230
+
+#define     UNICHROME_P4M890        9
+#define     UNICHROME_P4M890_DID    0x3343
+
+#define     UNICHROME_P4M900        10
+#define     UNICHROME_P4M900_DID    0x3371
+
+#define     UNICHROME_VX800         11
+#define     UNICHROME_VX800_DID     0x1122
+
+/**************************************************/
+/* Definition TMDS Trasmitter Information         */
+/**************************************************/
+
+/* Definition TMDS Trasmitter Index */
+#define     NON_TMDS_TRANSMITTER    0x00
+#define     VT1632_TMDS             0x01
+#define     INTEGRATED_TMDS         0x42
+
+/* Definition TMDS Trasmitter I2C Slave Address */
+#define     VT1632_TMDS_I2C_ADDR    0x10
+
+/**************************************************/
+/* Definition LVDS Trasmitter Information         */
+/**************************************************/
+
+/* Definition LVDS Trasmitter Index */
+#define     NON_LVDS_TRANSMITTER    0x00
+#define     VT1631_LVDS             0x01
+#define     VT1636_LVDS             0x0E
+#define     INTEGRATED_LVDS         0x41
+
+/* Definition Digital Transmitter Mode */
+#define     TX_DATA_12_BITS         0x01
+#define     TX_DATA_24_BITS         0x02
+#define     TX_DATA_DDR_MODE        0x04
+#define     TX_DATA_SDR_MODE        0x08
+
+/* Definition LVDS Trasmitter I2C Slave Address */
+#define     VT1631_LVDS_I2C_ADDR    0x70
+#define     VT3271_LVDS_I2C_ADDR    0x80
+#define     VT1636_LVDS_I2C_ADDR    0x80
+
+struct tmds_chip_information {
+        int tmds_chip_name;
+        int tmds_chip_slave_addr;
+        int dvi_panel_id;
+        int data_mode;
+        int output_interface;
+        int i2c_port;
+        int device_type;
+};
+
+struct lvds_chip_information {
+        int lvds_chip_name;
+        int lvds_chip_slave_addr;
+        int data_mode;
+        int output_interface;
+        int i2c_port;
+};
+
+struct chip_information {
+        int gfx_chip_name;
+        int gfx_chip_revision;
+        int chip_on_slot;
+        struct tmds_chip_information tmds_chip_info;
+        struct lvds_chip_information lvds_chip_info;
+        struct lvds_chip_information lvds_chip_info2;
+};
+
+struct crt_setting_information {
+        int iga_path;
+        int h_active;
+        int v_active;
+        int bpp;
+        int refresh_rate;
+};
+
+struct tmds_setting_information {
+        int iga_path;
+        int h_active;
+        int v_active;
+        int bpp;
+        int refresh_rate;
+        int get_dvi_size_method;
+        int max_pixel_clock;
+        int dvi_panel_size;
+        int dvi_panel_hres;
+        int dvi_panel_vres;
+        int native_size;
+};
+
+struct lvds_setting_information {
+        int iga_path;
+        int h_active;
+        int v_active;
+        int bpp;
+        int refresh_rate;
+        int get_lcd_size_method;
+        int lcd_panel_id;
+        int lcd_panel_size;
+        int lcd_panel_hres;
+        int lcd_panel_vres;
+        int display_method;
+        int device_lcd_dualedge;
+        int LCDDithering;
+        int lcd_mode;
+        u32 vclk;               /*panel mode clock value */
+};
+
+struct GFX_DPA_SETTING {
+        int ClkRangeIndex;
+        u8 DVP0;                /* CR96[3:0] */
+        u8 DVP0DataDri_S1;      /* SR2A[5]   */
+        u8 DVP0DataDri_S;       /* SR1B[1]   */
+        u8 DVP0ClockDri_S1;     /* SR2A[4]   */
+        u8 DVP0ClockDri_S;      /* SR1E[2]   */
+        u8 DVP1;                /* CR9B[3:0] */
+        u8 DVP1Driving;         /* SR65[3:0], Data and Clock driving */
+        u8 DFPHigh;             /* CR97[3:0] */
+        u8 DFPLow;              /* CR99[3:0] */
+
+};
+
+struct VT1636_DPA_SETTING {
+        int PanelSizeID;
+        u8 CLK_SEL_ST1;
+        u8 CLK_SEL_ST2;
+};
+#endif /* __CHIP_H__ */
diff --git a/drivers/video/via/debug.h b/drivers/video/via/debug.h
new file mode 100644
index 000000000000..86eacc2017f3
--- /dev/null
+++ b/drivers/video/via/debug.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+#ifndef __DEBUG_H__
+#define __DEBUG_H__
+
+#ifndef VIAFB_DEBUG
+#define VIAFB_DEBUG 0
+#endif
+
+#if VIAFB_DEBUG
+#define DEBUG_MSG(f, a...)   printk(f, ## a)
+#else
+#define DEBUG_MSG(f, a...)
+#endif
+
+#define VIAFB_WARN 0
+#if VIAFB_WARN
+#define WARN_MSG(f, a...)   printk(f, ## a)
+#else
+#define WARN_MSG(f, a...)
+#endif
+
+#endif /* __DEBUG_H__ */
diff --git a/drivers/video/via/dvi.c b/drivers/video/via/dvi.c
new file mode 100644
index 000000000000..d6965447ca69
--- /dev/null
+++ b/drivers/video/via/dvi.c
@@ -0,0 +1,682 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; 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 "global.h"
+
+static void tmds_register_write(int index, u8 data);
+static int tmds_register_read(int index);
+static int tmds_register_read_bytes(int index, u8 *buff, int buff_len);
+static int check_reduce_blanking_mode(int mode_index,
+        int refresh_rate);
+static int dvi_get_panel_size_from_DDCv1(void);
+static int dvi_get_panel_size_from_DDCv2(void);
+static unsigned char dvi_get_panel_info(void);
+static int viafb_dvi_query_EDID(void);
+
+static int check_tmds_chip(int device_id_subaddr, int device_id)
+{
+        if (tmds_register_read(device_id_subaddr) == device_id)
+                return OK;
+        else
+                return FAIL;
+}
+
+void viafb_init_dvi_size(void)
+{
+        DEBUG_MSG(KERN_INFO "viafb_init_dvi_size()\n");
+        DEBUG_MSG(KERN_INFO
+                "viaparinfo->tmds_setting_info->get_dvi_size_method %d\n",
+                  viaparinfo->tmds_setting_info->get_dvi_size_method);
+
+        switch (viaparinfo->tmds_setting_info->get_dvi_size_method) {
+        case GET_DVI_SIZE_BY_SYSTEM_BIOS:
+                break;
+        case GET_DVI_SZIE_BY_HW_STRAPPING:
+                break;
+        case GET_DVI_SIZE_BY_VGA_BIOS:
+        default:
+                dvi_get_panel_info();
+                break;
+        }
+        return;
+}
+
+int viafb_tmds_trasmitter_identify(void)
+{
+        unsigned char sr2a = 0, sr1e = 0, sr3e = 0;
+
+        /* Turn on ouputting pad */
+        switch (viaparinfo->chip_info->gfx_chip_name) {
+        case UNICHROME_K8M890:
+            /*=* DFP Low Pad on *=*/
+                sr2a = viafb_read_reg(VIASR, SR2A);
+                viafb_write_reg_mask(SR2A, VIASR, 0x03, BIT0 + BIT1);
+                break;
+
+        case UNICHROME_P4M900:
+        case UNICHROME_P4M890:
+                /* DFP Low Pad on */
+                sr2a = viafb_read_reg(VIASR, SR2A);
+                viafb_write_reg_mask(SR2A, VIASR, 0x03, BIT0 + BIT1);
+                /* DVP0 Pad on */
+                sr1e = viafb_read_reg(VIASR, SR1E);
+                viafb_write_reg_mask(SR1E, VIASR, 0xC0, BIT6 + BIT7);
+                break;
+
+        default:
+            /* DVP0/DVP1 Pad on */
+                sr1e = viafb_read_reg(VIASR, SR1E);
+                viafb_write_reg_mask(SR1E, VIASR, 0xF0, BIT4 +
+                        BIT5 + BIT6 + BIT7);
+            /* SR3E[1]Multi-function selection:
+            0 = Emulate I2C and DDC bus by GPIO2/3/4. */
+                sr3e = viafb_read_reg(VIASR, SR3E);
+                viafb_write_reg_mask(SR3E, VIASR, 0x0, BIT5);
+                break;
+        }
+
+        /* Check for VT1632: */
+        viaparinfo->chip_info->tmds_chip_info.tmds_chip_name = VT1632_TMDS;
+        viaparinfo->chip_info->
+                tmds_chip_info.tmds_chip_slave_addr = VT1632_TMDS_I2C_ADDR;
+        viaparinfo->chip_info->tmds_chip_info.i2c_port = I2CPORTINDEX;
+        if (check_tmds_chip(VT1632_DEVICE_ID_REG, VT1632_DEVICE_ID) != FAIL) {
+                /*
+                 * Currently only support 12bits,dual edge,add 24bits mode later
+                 */
+                tmds_register_write(0x08, 0x3b);
+
+                DEBUG_MSG(KERN_INFO "\n VT1632 TMDS ! \n");
+                DEBUG_MSG(KERN_INFO "\n %2d",
+                          viaparinfo->chip_info->tmds_chip_info.tmds_chip_name);
+                DEBUG_MSG(KERN_INFO "\n %2d",
+                          viaparinfo->chip_info->tmds_chip_info.i2c_port);
+                return OK;
+        } else {
+                viaparinfo->chip_info->tmds_chip_info.i2c_port = GPIOPORTINDEX;
+                if (check_tmds_chip(VT1632_DEVICE_ID_REG, VT1632_DEVICE_ID)
+                    != FAIL) {
+                        tmds_register_write(0x08, 0x3b);
+                        DEBUG_MSG(KERN_INFO "\n VT1632 TMDS ! \n");
+                        DEBUG_MSG(KERN_INFO "\n %2d",
+                                  viaparinfo->chip_info->
+                                  tmds_chip_info.tmds_chip_name);
+                        DEBUG_MSG(KERN_INFO "\n %2d",
+                                  viaparinfo->chip_info->
+                                  tmds_chip_info.i2c_port);
+                        return OK;
+                }
+        }
+
+        viaparinfo->chip_info->tmds_chip_info.tmds_chip_name = INTEGRATED_TMDS;
+
+        if ((viaparinfo->chip_info->gfx_chip_name == UNICHROME_CX700) &&
+            ((viafb_display_hardware_layout == HW_LAYOUT_DVI_ONLY) ||
+             (viafb_display_hardware_layout == HW_LAYOUT_LCD_DVI))) {
+                DEBUG_MSG(KERN_INFO "\n Integrated TMDS ! \n");
+                return OK;
+        }
+
+        switch (viaparinfo->chip_info->gfx_chip_name) {
+        case UNICHROME_K8M890:
+                viafb_write_reg(SR2A, VIASR, sr2a);
+                break;
+
+        case UNICHROME_P4M900:
+        case UNICHROME_P4M890:
+                viafb_write_reg(SR2A, VIASR, sr2a);
+                viafb_write_reg(SR1E, VIASR, sr1e);
+                break;
+
+        default:
+                viafb_write_reg(SR1E, VIASR, sr1e);
+                viafb_write_reg(SR3E, VIASR, sr3e);
+                break;
+        }
+
+        viaparinfo->chip_info->
+                tmds_chip_info.tmds_chip_name = NON_TMDS_TRANSMITTER;
+        viaparinfo->chip_info->tmds_chip_info.
+                tmds_chip_slave_addr = VT1632_TMDS_I2C_ADDR;
+        return FAIL;
+}
+
+static void tmds_register_write(int index, u8 data)
+{
+        viaparinfo->i2c_stuff.i2c_port =
+                viaparinfo->chip_info->tmds_chip_info.i2c_port;
+
+        viafb_i2c_writebyte(viaparinfo->chip_info->tmds_chip_info.
+                tmds_chip_slave_addr, index,
+                     data);
+}
+
+static int tmds_register_read(int index)
+{
+        u8 data;
+
+        viaparinfo->i2c_stuff.i2c_port =
+                viaparinfo->chip_info->tmds_chip_info.i2c_port;
+        viafb_i2c_readbyte((u8) viaparinfo->chip_info->
+            tmds_chip_info.tmds_chip_slave_addr,
+                        (u8) index, &data);
+        return data;
+}
+
+static int tmds_register_read_bytes(int index, u8 *buff, int buff_len)
+{
+        viaparinfo->i2c_stuff.i2c_port =
+                viaparinfo->chip_info->tmds_chip_info.i2c_port;
+        viafb_i2c_readbytes((u8) viaparinfo->chip_info->tmds_chip_info.
+                         tmds_chip_slave_addr, (u8) index, buff, buff_len);
+        return 0;
+}
+
+static int check_reduce_blanking_mode(int mode_index,
+        int refresh_rate)
+{
+        if (refresh_rate != 60)
+                return false;
+
+        switch (mode_index) {
+                /* Following modes have reduce blanking mode. */
+        case VIA_RES_1360X768:
+        case VIA_RES_1400X1050:
+        case VIA_RES_1440X900:
+        case VIA_RES_1600X900:
+        case VIA_RES_1680X1050:
+        case VIA_RES_1920X1080:
+        case VIA_RES_1920X1200:
+                break;
+
+        default:
+                DEBUG_MSG(KERN_INFO
+                          "This dvi mode %d have no reduce blanking mode!\n",
+                          mode_index);
+                return false;
+        }
+
+        return true;
+}
+
+/* DVI Set Mode */
+void viafb_dvi_set_mode(int video_index, int mode_bpp, int set_iga)
+{
+        struct VideoModeTable *videoMode = NULL;
+        struct crt_mode_table *pDviTiming;
+        unsigned long desirePixelClock, maxPixelClock;
+        int status = 0;
+        videoMode = viafb_get_modetbl_pointer(video_index);
+        pDviTiming = videoMode->crtc;
+        desirePixelClock = pDviTiming->clk / 1000000;
+        maxPixelClock = (unsigned long)viaparinfo->
+                tmds_setting_info->max_pixel_clock;
+
+        DEBUG_MSG(KERN_INFO "\nDVI_set_mode!!\n");
+
+        if ((maxPixelClock != 0) && (desirePixelClock > maxPixelClock)) {
+                /*Check if reduce-blanking mode is exist */
+                status =
+                    check_reduce_blanking_mode(video_index,
+                                               pDviTiming->refresh_rate);
+                if (status) {
+                        video_index += 100;     /*Use reduce-blanking mode */
+                        videoMode = viafb_get_modetbl_pointer(video_index);
+                        pDviTiming = videoMode->crtc;
+                        DEBUG_MSG(KERN_INFO
+                                  "DVI use reduce blanking mode %d!!\n",
+                                  video_index);
+                }
+        }
+        viafb_fill_crtc_timing(pDviTiming, video_index, mode_bpp / 8, set_iga);
+        viafb_set_output_path(DEVICE_DVI, set_iga,
+                        viaparinfo->chip_info->tmds_chip_info.output_interface);
+}
+
+/* Sense DVI Connector */
+int viafb_dvi_sense(void)
+{
+        u8 RegSR1E = 0, RegSR3E = 0, RegCR6B = 0, RegCR91 = 0,
+                RegCR93 = 0, RegCR9B = 0, data;
+        int ret = false;
+
+        DEBUG_MSG(KERN_INFO "viafb_dvi_sense!!\n");
+
+        if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266) {
+                /* DI1 Pad on */
+                RegSR1E = viafb_read_reg(VIASR, SR1E);
+                viafb_write_reg(SR1E, VIASR, RegSR1E | 0x30);
+
+                /* CR6B[0]VCK Input Selection: 1 = External clock. */
+                RegCR6B = viafb_read_reg(VIACR, CR6B);
+                viafb_write_reg(CR6B, VIACR, RegCR6B | 0x08);
+
+                /* CR91[4] VDD On [3] Data On [2] VEE On [1] Back Light Off
+                   [0] Software Control Power Sequence */
+                RegCR91 = viafb_read_reg(VIACR, CR91);
+                viafb_write_reg(CR91, VIACR, 0x1D);
+
+                /* CR93[7] DI1 Data Source Selection: 1 = DSP2.
+                   CR93[5] DI1 Clock Source: 1 = internal.
+                   CR93[4] DI1 Clock Polarity.
+                   CR93[3:1] DI1 Clock Adjust. CR93[0] DI1 enable */
+                RegCR93 = viafb_read_reg(VIACR, CR93);
+                viafb_write_reg(CR93, VIACR, 0x01);
+        } else {
+                /* DVP0/DVP1 Pad on */
+                RegSR1E = viafb_read_reg(VIASR, SR1E);
+                viafb_write_reg(SR1E, VIASR, RegSR1E | 0xF0);
+
+                /* SR3E[1]Multi-function selection:
+                   0 = Emulate I2C and DDC bus by GPIO2/3/4. */
+                RegSR3E = viafb_read_reg(VIASR, SR3E);
+                viafb_write_reg(SR3E, VIASR, RegSR3E & (~0x20));
+
+                /* CR91[4] VDD On [3] Data On [2] VEE On [1] Back Light Off
+                   [0] Software Control Power Sequence */
+                RegCR91 = viafb_read_reg(VIACR, CR91);
+                viafb_write_reg(CR91, VIACR, 0x1D);
+
+                /*CR9B[4] DVP1 Data Source Selection: 1 = From secondary
+                display.CR9B[2:0] DVP1 Clock Adjust */
+                RegCR9B = viafb_read_reg(VIACR, CR9B);
+                viafb_write_reg(CR9B, VIACR, 0x01);
+        }
+
+        data = (u8) tmds_register_read(0x09);
+        if (data & 0x04)
+                ret = true;
+
+        if (ret == false) {
+                if (viafb_dvi_query_EDID())
+                        ret = true;
+        }
+
+        /* Restore status */
+        viafb_write_reg(SR1E, VIASR, RegSR1E);
+        viafb_write_reg(CR91, VIACR, RegCR91);
+        if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266) {
+                viafb_write_reg(CR6B, VIACR, RegCR6B);
+                viafb_write_reg(CR93, VIACR, RegCR93);
+        } else {
+                viafb_write_reg(SR3E, VIASR, RegSR3E);
+                viafb_write_reg(CR9B, VIACR, RegCR9B);
+        }
+
+        return ret;
+}
+
+/* Query Flat Panel's EDID Table Version Through DVI Connector */
+static int viafb_dvi_query_EDID(void)
+{
+        u8 data0, data1;
+        int restore;
+
+        DEBUG_MSG(KERN_INFO "viafb_dvi_query_EDID!!\n");
+
+        restore = viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr;
+        viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr = 0xA0;
+
+        data0 = (u8) tmds_register_read(0x00);
+        data1 = (u8) tmds_register_read(0x01);
+        if ((data0 == 0) && (data1 == 0xFF)) {
+                viaparinfo->chip_info->
+                        tmds_chip_info.tmds_chip_slave_addr = restore;
+                return EDID_VERSION_1;  /* Found EDID1 Table */
+        }
+
+        data0 = (u8) tmds_register_read(0x00);
+        viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr = restore;
+        if (data0 == 0x20)
+                return EDID_VERSION_2;  /* Found EDID2 Table */
+        else
+                return false;
+}
+
+/*
+ *
+ * int dvi_get_panel_size_from_DDCv1(void)
+ *
+ *     - Get Panel Size Using EDID1 Table
+ *
+ * Return Type:    int
+ *
+ */
+static int dvi_get_panel_size_from_DDCv1(void)
+{
+        int i, max_h = 0, max_v = 0, tmp, restore;
+        unsigned char rData;
+        unsigned char EDID_DATA[18];
+
+        DEBUG_MSG(KERN_INFO "\n dvi_get_panel_size_from_DDCv1 \n");
+
+        restore = viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr;
+        viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr = 0xA0;
+
+        rData = tmds_register_read(0x23);
+        if (rData & 0x3C)
+                max_h = 640;
+        if (rData & 0xC0)
+                max_h = 720;
+        if (rData & 0x03)
+                max_h = 800;
+
+        rData = tmds_register_read(0x24);
+        if (rData & 0xC0)
+                max_h = 800;
+        if (rData & 0x1E)
+                max_h = 1024;
+        if (rData & 0x01)
+                max_h = 1280;
+
+        for (i = 0x25; i < 0x6D; i++) {
+                switch (i) {
+                case 0x26:
+                case 0x28:
+                case 0x2A:
+                case 0x2C:
+                case 0x2E:
+                case 0x30:
+                case 0x32:
+                case 0x34:
+                        rData = tmds_register_read(i);
+                        if (rData == 1)
+                                break;
+                        /* data = (data + 31) * 8 */
+                        tmp = (rData + 31) << 3;
+                        if (tmp > max_h)
+                                max_h = tmp;
+                        break;
+
+                case 0x36:
+                case 0x48:
+                case 0x5A:
+                case 0x6C:
+                        tmds_register_read_bytes(i, EDID_DATA, 10);
+                        if (!(EDID_DATA[0] || EDID_DATA[1])) {
+                                /* The first two byte must be zero. */
+                                if (EDID_DATA[3] == 0xFD) {
+                                        /* To get max pixel clock. */
+                                        viaparinfo->tmds_setting_info->
+                                        max_pixel_clock = EDID_DATA[9] * 10;
+                                }
+                        }
+                        break;
+
+                default:
+                        break;
+                }
+        }
+
+        switch (max_h) {
+        case 640:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_640X480;
+                break;
+        case 800:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_800X600;
+                break;
+        case 1024:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_1024X768;
+                break;
+        case 1280:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_1280X1024;
+                break;
+        case 1400:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_1400X1050;
+                break;
+        case 1440:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_1440X1050;
+                break;
+        case 1600:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_1600X1200;
+                break;
+        case 1920:
+                if (max_v == 1200) {
+                        viaparinfo->tmds_setting_info->dvi_panel_size =
+                                VIA_RES_1920X1200;
+                } else {
+                        viaparinfo->tmds_setting_info->dvi_panel_size =
+                                VIA_RES_1920X1080;
+                }
+
+                break;
+        default:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_1024X768;
+                DEBUG_MSG(KERN_INFO "Unknow panel size max resolution = %d !\
+                                         set default panel size.\n", max_h);
+                break;
+        }
+
+        DEBUG_MSG(KERN_INFO "DVI max pixelclock = %d\n",
+                  viaparinfo->tmds_setting_info->max_pixel_clock);
+        viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr = restore;
+        return viaparinfo->tmds_setting_info->dvi_panel_size;
+}
+
+/*
+ *
+ * int dvi_get_panel_size_from_DDCv2(void)
+ *
+ *     - Get Panel Size Using EDID2 Table
+ *
+ * Return Type:    int
+ *
+ */
+static int dvi_get_panel_size_from_DDCv2(void)
+{
+        int HSize = 0, restore;
+        unsigned char R_Buffer[2];
+
+        DEBUG_MSG(KERN_INFO "\n dvi_get_panel_size_from_DDCv2 \n");
+
+        restore = viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr;
+        viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr = 0xA2;
+
+        /* Horizontal: 0x76, 0x77 */
+        tmds_register_read_bytes(0x76, R_Buffer, 2);
+        HSize = R_Buffer[0];
+        HSize += R_Buffer[1] << 8;
+
+        switch (HSize) {
+        case 640:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_640X480;
+                break;
+        case 800:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_800X600;
+                break;
+        case 1024:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_1024X768;
+                break;
+        case 1280:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_1280X1024;
+                break;
+        case 1400:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_1400X1050;
+                break;
+        case 1440:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_1440X1050;
+                break;
+        case 1600:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_1600X1200;
+                break;
+        default:
+                viaparinfo->tmds_setting_info->dvi_panel_size =
+                        VIA_RES_1024X768;
+                DEBUG_MSG(KERN_INFO "Unknow panel size max resolution = %d!\
+                                        set default panel size.\n", HSize);
+                break;
+        }
+
+        viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr = restore;
+        return viaparinfo->tmds_setting_info->dvi_panel_size;
+}
+
+/*
+ *
+ * unsigned char dvi_get_panel_info(void)
+ *
+ *     - Get Panel Size
+ *
+ * Return Type:    unsigned char
+ */
+static unsigned char dvi_get_panel_info(void)
+{
+        unsigned char dvipanelsize;
+        DEBUG_MSG(KERN_INFO "dvi_get_panel_info! \n");
+
+        viafb_dvi_sense();
+        switch (viafb_dvi_query_EDID()) {
+        case 1:
+                dvi_get_panel_size_from_DDCv1();
+                break;
+        case 2:
+                dvi_get_panel_size_from_DDCv2();
+                break;
+        default:
+                break;
+        }
+
+        DEBUG_MSG(KERN_INFO "dvi panel size is %2d \n",
+                  viaparinfo->tmds_setting_info->dvi_panel_size);
+        dvipanelsize = (unsigned char)(viaparinfo->
+                tmds_setting_info->dvi_panel_size);
+        return dvipanelsize;
+}
+
+/* If Disable DVI, turn off pad */
+void viafb_dvi_disable(void)
+{
+        if (viaparinfo->chip_info->
+                tmds_chip_info.output_interface == INTERFACE_DVP0)
+                viafb_write_reg(SR1E, VIASR,
+                viafb_read_reg(VIASR, SR1E) & (~0xC0));
+
+        if (viaparinfo->chip_info->
+                tmds_chip_info.output_interface == INTERFACE_DVP1)
+                viafb_write_reg(SR1E, VIASR,
+                viafb_read_reg(VIASR, SR1E) & (~0x30));
+
+        if (viaparinfo->chip_info->
+                tmds_chip_info.output_interface == INTERFACE_DFP_HIGH)
+                viafb_write_reg(SR2A, VIASR,
+                viafb_read_reg(VIASR, SR2A) & (~0x0C));
+
+        if (viaparinfo->chip_info->
+                tmds_chip_info.output_interface == INTERFACE_DFP_LOW)
+                viafb_write_reg(SR2A, VIASR,
+                viafb_read_reg(VIASR, SR2A) & (~0x03));
+
+        if (viaparinfo->chip_info->
+                tmds_chip_info.output_interface == INTERFACE_TMDS)
+                /* Turn off TMDS power. */
+                viafb_write_reg(CRD2, VIACR,
+                viafb_read_reg(VIACR, CRD2) | 0x08);
+}
+
+/* If Enable DVI, turn off pad */
+void viafb_dvi_enable(void)
+{
+        u8 data;
+
+        if (viaparinfo->chip_info->
+                tmds_chip_info.output_interface == INTERFACE_DVP0) {
+                viafb_write_reg(SR1E, VIASR,
+                        viafb_read_reg(VIASR, SR1E) | 0xC0);
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266)
+                        tmds_register_write(0x88, 0x3b);
+                else
+                        /*clear CR91[5] to direct on display period
+                           in the secondary diplay path */
+                        viafb_write_reg(CR91, VIACR,
+                        viafb_read_reg(VIACR, CR91) & 0xDF);
+        }
+
+        if (viaparinfo->chip_info->
+                tmds_chip_info.output_interface == INTERFACE_DVP1) {
+                viafb_write_reg(SR1E, VIASR,
+                        viafb_read_reg(VIASR, SR1E) | 0x30);
+
+                /*fix dvi cann't be enabled with MB VT5718C4 - Al Zhang */
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266) {
+                        tmds_register_write(0x88, 0x3b);
+                } else {
+                        /*clear CR91[5] to direct on display period
+                          in the secondary diplay path */
+                        viafb_write_reg(CR91, VIACR,
+                        viafb_read_reg(VIACR, CR91) & 0xDF);
+                }
+
+                /*fix DVI cannot enable on EPIA-M board */
+                if (viafb_platform_epia_dvi == 1) {
+                        viafb_write_reg_mask(CR91, VIACR, 0x1f, 0x1f);
+                        viafb_write_reg_mask(CR88, VIACR, 0x00, BIT6 + BIT0);
+                        if (viafb_bus_width == 24) {
+                                if (viafb_device_lcd_dualedge == 1)
+                                        data = 0x3F;
+                                else
+                                        data = 0x37;
+                                viafb_i2c_writebyte(viaparinfo->chip_info->
+                                             tmds_chip_info.
+                                             tmds_chip_slave_addr,
+                                             0x08, data);
+                        }
+                }
+        }
+
+        if (viaparinfo->chip_info->
+                tmds_chip_info.output_interface == INTERFACE_DFP_HIGH) {
+                viafb_write_reg(SR2A, VIASR,
+                        viafb_read_reg(VIASR, SR2A) | 0x0C);
+                viafb_write_reg(CR91, VIACR,
+                        viafb_read_reg(VIACR, CR91) & 0xDF);
+        }
+
+        if (viaparinfo->chip_info->
+                tmds_chip_info.output_interface == INTERFACE_DFP_LOW) {
+                viafb_write_reg(SR2A, VIASR,
+                        viafb_read_reg(VIASR, SR2A) | 0x03);
+                viafb_write_reg(CR91, VIACR,
+                        viafb_read_reg(VIACR, CR91) & 0xDF);
+        }
+        if (viaparinfo->chip_info->
+                tmds_chip_info.output_interface == INTERFACE_TMDS) {
+                /* Turn on Display period in the panel path. */
+                viafb_write_reg_mask(CR91, VIACR, 0, BIT7);
+
+                /* Turn on TMDS power. */
+                viafb_write_reg_mask(CRD2, VIACR, 0, BIT3);
+        }
+}
+
diff --git a/drivers/video/via/dvi.h b/drivers/video/via/dvi.h
new file mode 100644
index 000000000000..e1ec37fb0dc3
--- /dev/null
+++ b/drivers/video/via/dvi.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __DVI_H__
+#define __DVI_H__
+
+/*Definition TMDS Device ID register*/
+#define     VT1632_DEVICE_ID_REG        0x02
+#define     VT1632_DEVICE_ID            0x92
+
+#define     GET_DVI_SIZE_BY_SYSTEM_BIOS     0x01
+#define     GET_DVI_SIZE_BY_VGA_BIOS        0x02
+#define     GET_DVI_SZIE_BY_HW_STRAPPING    0x03
+
+/* Definition DVI Panel ID*/
+/* Resolution: 640x480,   Channel: single, Dithering: Enable */
+#define     DVI_PANEL_ID0_640X480       0x00
+/* Resolution: 800x600,   Channel: single, Dithering: Enable */
+#define     DVI_PANEL_ID1_800x600       0x01
+/* Resolution: 1024x768,  Channel: single, Dithering: Enable */
+#define     DVI_PANEL_ID1_1024x768      0x02
+/* Resolution: 1280x768,  Channel: single, Dithering: Enable */
+#define     DVI_PANEL_ID1_1280x768      0x03
+/* Resolution: 1280x1024, Channel: dual,   Dithering: Enable */
+#define     DVI_PANEL_ID1_1280x1024     0x04
+/* Resolution: 1400x1050, Channel: dual,   Dithering: Enable */
+#define     DVI_PANEL_ID1_1400x1050     0x05
+/* Resolution: 1600x1200, Channel: dual,   Dithering: Enable */
+#define     DVI_PANEL_ID1_1600x1200     0x06
+
+/* Define the version of EDID*/
+#define     EDID_VERSION_1      1
+#define     EDID_VERSION_2      2
+
+#define     DEV_CONNECT_DVI     0x01
+#define     DEV_CONNECT_HDMI    0x02
+
+struct VideoModeTable *viafb_get_cea_mode_tbl_pointer(int Index);
+int viafb_dvi_sense(void);
+void viafb_dvi_disable(void);
+void viafb_dvi_enable(void);
+int viafb_tmds_trasmitter_identify(void);
+void viafb_init_dvi_size(void);
+void viafb_dvi_set_mode(int video_index, int mode_bpp, int set_iga);
+
+#endif /* __DVI_H__ */
diff --git a/drivers/video/via/global.c b/drivers/video/via/global.c
new file mode 100644
index 000000000000..468be2425af3
--- /dev/null
+++ b/drivers/video/via/global.c
@@ -0,0 +1,60 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; 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 "global.h"
+int viafb_platform_epia_dvi = STATE_OFF;
+int viafb_device_lcd_dualedge = STATE_OFF;
+int viafb_bus_width = 12;
+int viafb_display_hardware_layout = HW_LAYOUT_LCD_DVI;
+int viafb_memsize;
+int viafb_DeviceStatus = CRT_Device;
+int viafb_hotplug;
+int viafb_refresh = 60;
+int viafb_refresh1 = 60;
+int viafb_lcd_dsp_method = LCD_EXPANDSION;
+int viafb_lcd_mode = LCD_OPENLDI;
+int viafb_bpp = 32;
+int viafb_bpp1 = 32;
+int viafb_accel = 1;
+int viafb_CRT_ON = 1;
+int viafb_DVI_ON;
+int viafb_LCD_ON ;
+int viafb_LCD2_ON;
+int viafb_SAMM_ON;
+int viafb_dual_fb;
+int viafb_hotplug_Xres = 640;
+int viafb_hotplug_Yres = 480;
+int viafb_hotplug_bpp = 32;
+int viafb_hotplug_refresh = 60;
+unsigned int viafb_second_offset;
+int viafb_second_size;
+int viafb_primary_dev = None_Device;
+void __iomem *viafb_FB_MM;
+unsigned int viafb_second_xres = 640;
+unsigned int viafb_second_yres = 480;
+unsigned int viafb_second_virtual_xres;
+unsigned int viafb_second_virtual_yres;
+int viafb_lcd_panel_id = LCD_PANEL_ID_MAXIMUM + 1;
+struct fb_cursor viacursor;
+struct fb_info *viafbinfo;
+struct fb_info *viafbinfo1;
+struct viafb_par *viaparinfo;
+struct viafb_par *viaparinfo1;
+
diff --git a/drivers/video/via/global.h b/drivers/video/via/global.h
new file mode 100644
index 000000000000..8e5263c5b812
--- /dev/null
+++ b/drivers/video/via/global.h
@@ -0,0 +1,90 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GLOBAL_H__
+#define __GLOBAL_H__
+
+#include <linux/fb.h>
+#include <linux/delay.h>
+#include <linux/ioport.h>
+#include <linux/pci.h>
+#include <linux/io.h>
+#include <linux/uaccess.h>
+#include <linux/init.h>
+#include <linux/proc_fs.h>
+#include <linux/console.h>
+#include <linux/timer.h>
+
+#include "debug.h"
+
+#include "iface.h"
+#include "viafbdev.h"
+#include "chip.h"
+#include "debug.h"
+#include "accel.h"
+#include "share.h"
+#include "dvi.h"
+#include "viamode.h"
+#include "via_i2c.h"
+#include "hw.h"
+
+#include "lcd.h"
+#include "ioctl.h"
+#include "viamode.h"
+#include "via_utility.h"
+#include "vt1636.h"
+#include "tblDPASetting.h"
+#include "tbl1636.h"
+#include "viafbdev.h"
+
+/* External struct*/
+
+extern int viafb_platform_epia_dvi;
+extern int viafb_device_lcd_dualedge;
+extern int viafb_bus_width;
+extern int viafb_display_hardware_layout;
+extern struct offset offset_reg;
+extern struct viafb_par *viaparinfo;
+extern struct viafb_par *viaparinfo1;
+extern struct fb_info *viafbinfo;
+extern struct fb_info *viafbinfo1;
+extern int viafb_DeviceStatus;
+extern int viafb_refresh;
+extern int viafb_refresh1;
+extern int viafb_lcd_dsp_method;
+extern int viafb_lcd_mode;
+extern int viafb_bpp;
+extern int viafb_bpp1;
+
+extern int viafb_CRT_ON;
+extern int viafb_hotplug_Xres;
+extern int viafb_hotplug_Yres;
+extern int viafb_hotplug_bpp;
+extern int viafb_hotplug_refresh;
+extern int viafb_primary_dev;
+extern void __iomem *viafb_FB_MM;
+extern struct fb_cursor viacursor;
+
+extern unsigned int viafb_second_xres;
+extern unsigned int viafb_second_yres;
+extern int viafb_lcd_panel_id;
+
+#endif /* __GLOBAL_H__ */
diff --git a/drivers/video/via/hw.c b/drivers/video/via/hw.c
new file mode 100644
index 000000000000..fcd53ceb88fa
--- /dev/null
+++ b/drivers/video/via/hw.c
@@ -0,0 +1,2865 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; 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 "global.h"
+
+static const struct pci_device_id_info pciidlist[] = {
+        {PCI_VIA_VENDOR_ID, UNICHROME_CLE266_DID, UNICHROME_CLE266},
+        {PCI_VIA_VENDOR_ID, UNICHROME_PM800_DID, UNICHROME_PM800},
+        {PCI_VIA_VENDOR_ID, UNICHROME_K400_DID, UNICHROME_K400},
+        {PCI_VIA_VENDOR_ID, UNICHROME_K800_DID, UNICHROME_K800},
+        {PCI_VIA_VENDOR_ID, UNICHROME_CN700_DID, UNICHROME_CN700},
+        {PCI_VIA_VENDOR_ID, UNICHROME_P4M890_DID, UNICHROME_P4M890},
+        {PCI_VIA_VENDOR_ID, UNICHROME_K8M890_DID, UNICHROME_K8M890},
+        {PCI_VIA_VENDOR_ID, UNICHROME_CX700_DID, UNICHROME_CX700},
+        {PCI_VIA_VENDOR_ID, UNICHROME_P4M900_DID, UNICHROME_P4M900},
+        {PCI_VIA_VENDOR_ID, UNICHROME_CN750_DID, UNICHROME_CN750},
+        {PCI_VIA_VENDOR_ID, UNICHROME_VX800_DID, UNICHROME_VX800},
+        {0, 0, 0}
+};
+
+struct offset offset_reg = {
+        /* IGA1 Offset Register */
+        {IGA1_OFFSET_REG_NUM, {{CR13, 0, 7}, {CR35, 5, 7} } },
+        /* IGA2 Offset Register */
+        {IGA2_OFFSET_REG_NUM, {{CR66, 0, 7}, {CR67, 0, 1} } }
+};
+
+static struct pll_map pll_value[] = {
+        {CLK_25_175M, CLE266_PLL_25_175M, K800_PLL_25_175M, CX700_25_175M},
+        {CLK_29_581M, CLE266_PLL_29_581M, K800_PLL_29_581M, CX700_29_581M},
+        {CLK_26_880M, CLE266_PLL_26_880M, K800_PLL_26_880M, CX700_26_880M},
+        {CLK_31_490M, CLE266_PLL_31_490M, K800_PLL_31_490M, CX700_31_490M},
+        {CLK_31_500M, CLE266_PLL_31_500M, K800_PLL_31_500M, CX700_31_500M},
+        {CLK_31_728M, CLE266_PLL_31_728M, K800_PLL_31_728M, CX700_31_728M},
+        {CLK_32_668M, CLE266_PLL_32_668M, K800_PLL_32_668M, CX700_32_668M},
+        {CLK_36_000M, CLE266_PLL_36_000M, K800_PLL_36_000M, CX700_36_000M},
+        {CLK_40_000M, CLE266_PLL_40_000M, K800_PLL_40_000M, CX700_40_000M},
+        {CLK_41_291M, CLE266_PLL_41_291M, K800_PLL_41_291M, CX700_41_291M},
+        {CLK_43_163M, CLE266_PLL_43_163M, K800_PLL_43_163M, CX700_43_163M},
+        {CLK_45_250M, CLE266_PLL_45_250M, K800_PLL_45_250M, CX700_45_250M},
+        {CLK_46_000M, CLE266_PLL_46_000M, K800_PLL_46_000M, CX700_46_000M},
+        {CLK_46_996M, CLE266_PLL_46_996M, K800_PLL_46_996M, CX700_46_996M},
+        {CLK_48_000M, CLE266_PLL_48_000M, K800_PLL_48_000M, CX700_48_000M},
+        {CLK_48_875M, CLE266_PLL_48_875M, K800_PLL_48_875M, CX700_48_875M},
+        {CLK_49_500M, CLE266_PLL_49_500M, K800_PLL_49_500M, CX700_49_500M},
+        {CLK_52_406M, CLE266_PLL_52_406M, K800_PLL_52_406M, CX700_52_406M},
+        {CLK_52_977M, CLE266_PLL_52_977M, K800_PLL_52_977M, CX700_52_977M},
+        {CLK_56_250M, CLE266_PLL_56_250M, K800_PLL_56_250M, CX700_56_250M},
+        {CLK_60_466M, CLE266_PLL_60_466M, K800_PLL_60_466M, CX700_60_466M},
+        {CLK_61_500M, CLE266_PLL_61_500M, K800_PLL_61_500M, CX700_61_500M},
+        {CLK_65_000M, CLE266_PLL_65_000M, K800_PLL_65_000M, CX700_65_000M},
+        {CLK_65_178M, CLE266_PLL_65_178M, K800_PLL_65_178M, CX700_65_178M},
+        {CLK_66_750M, CLE266_PLL_66_750M, K800_PLL_66_750M, CX700_66_750M},
+        {CLK_68_179M, CLE266_PLL_68_179M, K800_PLL_68_179M, CX700_68_179M},
+        {CLK_69_924M, CLE266_PLL_69_924M, K800_PLL_69_924M, CX700_69_924M},
+        {CLK_70_159M, CLE266_PLL_70_159M, K800_PLL_70_159M, CX700_70_159M},
+        {CLK_72_000M, CLE266_PLL_72_000M, K800_PLL_72_000M, CX700_72_000M},
+        {CLK_78_750M, CLE266_PLL_78_750M, K800_PLL_78_750M, CX700_78_750M},
+        {CLK_80_136M, CLE266_PLL_80_136M, K800_PLL_80_136M, CX700_80_136M},
+        {CLK_83_375M, CLE266_PLL_83_375M, K800_PLL_83_375M, CX700_83_375M},
+        {CLK_83_950M, CLE266_PLL_83_950M, K800_PLL_83_950M, CX700_83_950M},
+        {CLK_84_750M, CLE266_PLL_84_750M, K800_PLL_84_750M, CX700_84_750M},
+        {CLK_85_860M, CLE266_PLL_85_860M, K800_PLL_85_860M, CX700_85_860M},
+        {CLK_88_750M, CLE266_PLL_88_750M, K800_PLL_88_750M, CX700_88_750M},
+        {CLK_94_500M, CLE266_PLL_94_500M, K800_PLL_94_500M, CX700_94_500M},
+        {CLK_97_750M, CLE266_PLL_97_750M, K800_PLL_97_750M, CX700_97_750M},
+        {CLK_101_000M, CLE266_PLL_101_000M, K800_PLL_101_000M,
+         CX700_101_000M},
+        {CLK_106_500M, CLE266_PLL_106_500M, K800_PLL_106_500M,
+         CX700_106_500M},
+        {CLK_108_000M, CLE266_PLL_108_000M, K800_PLL_108_000M,
+         CX700_108_000M},
+        {CLK_113_309M, CLE266_PLL_113_309M, K800_PLL_113_309M,
+         CX700_113_309M},
+        {CLK_118_840M, CLE266_PLL_118_840M, K800_PLL_118_840M,
+         CX700_118_840M},
+        {CLK_119_000M, CLE266_PLL_119_000M, K800_PLL_119_000M,
+         CX700_119_000M},
+        {CLK_121_750M, CLE266_PLL_121_750M, K800_PLL_121_750M,
+         CX700_121_750M},
+        {CLK_125_104M, CLE266_PLL_125_104M, K800_PLL_125_104M,
+         CX700_125_104M},
+        {CLK_133_308M, CLE266_PLL_133_308M, K800_PLL_133_308M,
+         CX700_133_308M},
+        {CLK_135_000M, CLE266_PLL_135_000M, K800_PLL_135_000M,
+         CX700_135_000M},
+        {CLK_136_700M, CLE266_PLL_136_700M, K800_PLL_136_700M,
+         CX700_136_700M},
+        {CLK_138_400M, CLE266_PLL_138_400M, K800_PLL_138_400M,
+         CX700_138_400M},
+        {CLK_146_760M, CLE266_PLL_146_760M, K800_PLL_146_760M,
+         CX700_146_760M},
+        {CLK_153_920M, CLE266_PLL_153_920M, K800_PLL_153_920M,
+         CX700_153_920M},
+        {CLK_156_000M, CLE266_PLL_156_000M, K800_PLL_156_000M,
+         CX700_156_000M},
+        {CLK_157_500M, CLE266_PLL_157_500M, K800_PLL_157_500M,
+         CX700_157_500M},
+        {CLK_162_000M, CLE266_PLL_162_000M, K800_PLL_162_000M,
+         CX700_162_000M},
+        {CLK_187_000M, CLE266_PLL_187_000M, K800_PLL_187_000M,
+         CX700_187_000M},
+        {CLK_193_295M, CLE266_PLL_193_295M, K800_PLL_193_295M,
+         CX700_193_295M},
+        {CLK_202_500M, CLE266_PLL_202_500M, K800_PLL_202_500M,
+         CX700_202_500M},
+        {CLK_204_000M, CLE266_PLL_204_000M, K800_PLL_204_000M,
+         CX700_204_000M},
+        {CLK_218_500M, CLE266_PLL_218_500M, K800_PLL_218_500M,
+         CX700_218_500M},
+        {CLK_234_000M, CLE266_PLL_234_000M, K800_PLL_234_000M,
+         CX700_234_000M},
+        {CLK_267_250M, CLE266_PLL_267_250M, K800_PLL_267_250M,
+         CX700_267_250M},
+        {CLK_297_500M, CLE266_PLL_297_500M, K800_PLL_297_500M,
+         CX700_297_500M},
+        {CLK_74_481M, CLE266_PLL_74_481M, K800_PLL_74_481M, CX700_74_481M},
+        {CLK_172_798M, CLE266_PLL_172_798M, K800_PLL_172_798M,
+         CX700_172_798M},
+        {CLK_122_614M, CLE266_PLL_122_614M, K800_PLL_122_614M,
+         CX700_122_614M},
+        {CLK_74_270M, CLE266_PLL_74_270M, K800_PLL_74_270M, CX700_74_270M},
+        {CLK_148_500M, CLE266_PLL_148_500M, K800_PLL_148_500M,
+         CX700_148_500M}
+};
+
+static struct fifo_depth_select display_fifo_depth_reg = {
+        /* IGA1 FIFO Depth_Select */
+        {IGA1_FIFO_DEPTH_SELECT_REG_NUM, {{SR17, 0, 7} } },
+        /* IGA2 FIFO Depth_Select */
+        {IGA2_FIFO_DEPTH_SELECT_REG_NUM,
+         {{CR68, 4, 7}, {CR94, 7, 7}, {CR95, 7, 7} } }
+};
+
+static struct fifo_threshold_select fifo_threshold_select_reg = {
+        /* IGA1 FIFO Threshold Select */
+        {IGA1_FIFO_THRESHOLD_REG_NUM, {{SR16, 0, 5}, {SR16, 7, 7} } },
+        /* IGA2 FIFO Threshold Select */
+        {IGA2_FIFO_THRESHOLD_REG_NUM, {{CR68, 0, 3}, {CR95, 4, 6} } }
+};
+
+static struct fifo_high_threshold_select fifo_high_threshold_select_reg = {
+        /* IGA1 FIFO High Threshold Select */
+        {IGA1_FIFO_HIGH_THRESHOLD_REG_NUM, {{SR18, 0, 5}, {SR18, 7, 7} } },
+        /* IGA2 FIFO High Threshold Select */
+        {IGA2_FIFO_HIGH_THRESHOLD_REG_NUM, {{CR92, 0, 3}, {CR95, 0, 2} } }
+};
+
+static struct display_queue_expire_num display_queue_expire_num_reg = {
+        /* IGA1 Display Queue Expire Num */
+        {IGA1_DISPLAY_QUEUE_EXPIRE_NUM_REG_NUM, {{SR22, 0, 4} } },
+        /* IGA2 Display Queue Expire Num */
+        {IGA2_DISPLAY_QUEUE_EXPIRE_NUM_REG_NUM, {{CR94, 0, 6} } }
+};
+
+/* Definition Fetch Count Registers*/
+static struct fetch_count fetch_count_reg = {
+        /* IGA1 Fetch Count Register */
+        {IGA1_FETCH_COUNT_REG_NUM, {{SR1C, 0, 7}, {SR1D, 0, 1} } },
+        /* IGA2 Fetch Count Register */
+        {IGA2_FETCH_COUNT_REG_NUM, {{CR65, 0, 7}, {CR67, 2, 3} } }
+};
+
+static struct iga1_crtc_timing iga1_crtc_reg = {
+        /* IGA1 Horizontal Total */
+        {IGA1_HOR_TOTAL_REG_NUM, {{CR00, 0, 7}, {CR36, 3, 3} } },
+        /* IGA1 Horizontal Addressable Video */
+        {IGA1_HOR_ADDR_REG_NUM, {{CR01, 0, 7} } },
+        /* IGA1 Horizontal Blank Start */
+        {IGA1_HOR_BLANK_START_REG_NUM, {{CR02, 0, 7} } },
+        /* IGA1 Horizontal Blank End */
+        {IGA1_HOR_BLANK_END_REG_NUM,
+         {{CR03, 0, 4}, {CR05, 7, 7}, {CR33, 5, 5} } },
+        /* IGA1 Horizontal Sync Start */
+        {IGA1_HOR_SYNC_START_REG_NUM, {{CR04, 0, 7}, {CR33, 4, 4} } },
+        /* IGA1 Horizontal Sync End */
+        {IGA1_HOR_SYNC_END_REG_NUM, {{CR05, 0, 4} } },
+        /* IGA1 Vertical Total */
+        {IGA1_VER_TOTAL_REG_NUM,
+         {{CR06, 0, 7}, {CR07, 0, 0}, {CR07, 5, 5}, {CR35, 0, 0} } },
+        /* IGA1 Vertical Addressable Video */
+        {IGA1_VER_ADDR_REG_NUM,
+         {{CR12, 0, 7}, {CR07, 1, 1}, {CR07, 6, 6}, {CR35, 2, 2} } },
+        /* IGA1 Vertical Blank Start */
+        {IGA1_VER_BLANK_START_REG_NUM,
+         {{CR15, 0, 7}, {CR07, 3, 3}, {CR09, 5, 5}, {CR35, 3, 3} } },
+        /* IGA1 Vertical Blank End */
+        {IGA1_VER_BLANK_END_REG_NUM, {{CR16, 0, 7} } },
+        /* IGA1 Vertical Sync Start */
+        {IGA1_VER_SYNC_START_REG_NUM,
+         {{CR10, 0, 7}, {CR07, 2, 2}, {CR07, 7, 7}, {CR35, 1, 1} } },
+        /* IGA1 Vertical Sync End */
+        {IGA1_VER_SYNC_END_REG_NUM, {{CR11, 0, 3} } }
+};
+
+static struct iga2_crtc_timing iga2_crtc_reg = {
+        /* IGA2 Horizontal Total */
+        {IGA2_HOR_TOTAL_REG_NUM, {{CR50, 0, 7}, {CR55, 0, 3} } },
+        /* IGA2 Horizontal Addressable Video */
+        {IGA2_HOR_ADDR_REG_NUM, {{CR51, 0, 7}, {CR55, 4, 6} } },
+        /* IGA2 Horizontal Blank Start */
+        {IGA2_HOR_BLANK_START_REG_NUM, {{CR52, 0, 7}, {CR54, 0, 2} } },
+        /* IGA2 Horizontal Blank End */
+        {IGA2_HOR_BLANK_END_REG_NUM,
+         {{CR53, 0, 7}, {CR54, 3, 5}, {CR5D, 6, 6} } },
+        /* IGA2 Horizontal Sync Start */
+        {IGA2_HOR_SYNC_START_REG_NUM,
+         {{CR56, 0, 7}, {CR54, 6, 7}, {CR5C, 7, 7}, {CR5D, 7, 7} } },
+        /* IGA2 Horizontal Sync End */
+        {IGA2_HOR_SYNC_END_REG_NUM, {{CR57, 0, 7}, {CR5C, 6, 6} } },
+        /* IGA2 Vertical Total */
+        {IGA2_VER_TOTAL_REG_NUM, {{CR58, 0, 7}, {CR5D, 0, 2} } },
+        /* IGA2 Vertical Addressable Video */
+        {IGA2_VER_ADDR_REG_NUM, {{CR59, 0, 7}, {CR5D, 3, 5} } },
+        /* IGA2 Vertical Blank Start */
+        {IGA2_VER_BLANK_START_REG_NUM, {{CR5A, 0, 7}, {CR5C, 0, 2} } },
+        /* IGA2 Vertical Blank End */
+        {IGA2_VER_BLANK_END_REG_NUM, {{CR5B, 0, 7}, {CR5C, 3, 5} } },
+        /* IGA2 Vertical Sync Start */
+        {IGA2_VER_SYNC_START_REG_NUM, {{CR5E, 0, 7}, {CR5F, 5, 7} } },
+        /* IGA2 Vertical Sync End */
+        {IGA2_VER_SYNC_END_REG_NUM, {{CR5F, 0, 4} } }
+};
+
+static struct rgbLUT palLUT_table[] = {
+        /* {R,G,B} */
+        /* Index 0x00~0x03 */
+        {0x00, 0x00, 0x00}, {0x00, 0x00, 0x2A}, {0x00, 0x2A, 0x00}, {0x00,
+                                                                     0x2A,
+                                                                     0x2A},
+        /* Index 0x04~0x07 */
+        {0x2A, 0x00, 0x00}, {0x2A, 0x00, 0x2A}, {0x2A, 0x15, 0x00}, {0x2A,
+                                                                     0x2A,
+                                                                     0x2A},
+        /* Index 0x08~0x0B */
+        {0x15, 0x15, 0x15}, {0x15, 0x15, 0x3F}, {0x15, 0x3F, 0x15}, {0x15,
+                                                                     0x3F,
+                                                                     0x3F},
+        /* Index 0x0C~0x0F */
+        {0x3F, 0x15, 0x15}, {0x3F, 0x15, 0x3F}, {0x3F, 0x3F, 0x15}, {0x3F,
+                                                                     0x3F,
+                                                                     0x3F},
+        /* Index 0x10~0x13 */
+        {0x00, 0x00, 0x00}, {0x05, 0x05, 0x05}, {0x08, 0x08, 0x08}, {0x0B,
+                                                                     0x0B,
+                                                                     0x0B},
+        /* Index 0x14~0x17 */
+        {0x0E, 0x0E, 0x0E}, {0x11, 0x11, 0x11}, {0x14, 0x14, 0x14}, {0x18,
+                                                                     0x18,
+                                                                     0x18},
+        /* Index 0x18~0x1B */
+        {0x1C, 0x1C, 0x1C}, {0x20, 0x20, 0x20}, {0x24, 0x24, 0x24}, {0x28,
+                                                                     0x28,
+                                                                     0x28},
+        /* Index 0x1C~0x1F */
+        {0x2D, 0x2D, 0x2D}, {0x32, 0x32, 0x32}, {0x38, 0x38, 0x38}, {0x3F,
+                                                                     0x3F,
+                                                                     0x3F},
+        /* Index 0x20~0x23 */
+        {0x00, 0x00, 0x3F}, {0x10, 0x00, 0x3F}, {0x1F, 0x00, 0x3F}, {0x2F,
+                                                                     0x00,
+                                                                     0x3F},
+        /* Index 0x24~0x27 */
+        {0x3F, 0x00, 0x3F}, {0x3F, 0x00, 0x2F}, {0x3F, 0x00, 0x1F}, {0x3F,
+                                                                     0x00,
+                                                                     0x10},
+        /* Index 0x28~0x2B */
+        {0x3F, 0x00, 0x00}, {0x3F, 0x10, 0x00}, {0x3F, 0x1F, 0x00}, {0x3F,
+                                                                     0x2F,
+                                                                     0x00},
+        /* Index 0x2C~0x2F */
+        {0x3F, 0x3F, 0x00}, {0x2F, 0x3F, 0x00}, {0x1F, 0x3F, 0x00}, {0x10,
+                                                                     0x3F,
+                                                                     0x00},
+        /* Index 0x30~0x33 */
+        {0x00, 0x3F, 0x00}, {0x00, 0x3F, 0x10}, {0x00, 0x3F, 0x1F}, {0x00,
+                                                                     0x3F,
+                                                                     0x2F},
+        /* Index 0x34~0x37 */
+        {0x00, 0x3F, 0x3F}, {0x00, 0x2F, 0x3F}, {0x00, 0x1F, 0x3F}, {0x00,
+                                                                     0x10,
+                                                                     0x3F},
+        /* Index 0x38~0x3B */
+        {0x1F, 0x1F, 0x3F}, {0x27, 0x1F, 0x3F}, {0x2F, 0x1F, 0x3F}, {0x37,
+                                                                     0x1F,
+                                                                     0x3F},
+        /* Index 0x3C~0x3F */
+        {0x3F, 0x1F, 0x3F}, {0x3F, 0x1F, 0x37}, {0x3F, 0x1F, 0x2F}, {0x3F,
+                                                                     0x1F,
+                                                                     0x27},
+        /* Index 0x40~0x43 */
+        {0x3F, 0x1F, 0x1F}, {0x3F, 0x27, 0x1F}, {0x3F, 0x2F, 0x1F}, {0x3F,
+                                                                     0x3F,
+                                                                     0x1F},
+        /* Index 0x44~0x47 */
+        {0x3F, 0x3F, 0x1F}, {0x37, 0x3F, 0x1F}, {0x2F, 0x3F, 0x1F}, {0x27,
+                                                                     0x3F,
+                                                                     0x1F},
+        /* Index 0x48~0x4B */
+        {0x1F, 0x3F, 0x1F}, {0x1F, 0x3F, 0x27}, {0x1F, 0x3F, 0x2F}, {0x1F,
+                                                                     0x3F,
+                                                                     0x37},
+        /* Index 0x4C~0x4F */
+        {0x1F, 0x3F, 0x3F}, {0x1F, 0x37, 0x3F}, {0x1F, 0x2F, 0x3F}, {0x1F,
+                                                                     0x27,
+                                                                     0x3F},
+        /* Index 0x50~0x53 */
+        {0x2D, 0x2D, 0x3F}, {0x31, 0x2D, 0x3F}, {0x36, 0x2D, 0x3F}, {0x3A,
+                                                                     0x2D,
+                                                                     0x3F},
+        /* Index 0x54~0x57 */
+        {0x3F, 0x2D, 0x3F}, {0x3F, 0x2D, 0x3A}, {0x3F, 0x2D, 0x36}, {0x3F,
+                                                                     0x2D,
+                                                                     0x31},
+        /* Index 0x58~0x5B */
+        {0x3F, 0x2D, 0x2D}, {0x3F, 0x31, 0x2D}, {0x3F, 0x36, 0x2D}, {0x3F,
+                                                                     0x3A,
+                                                                     0x2D},
+        /* Index 0x5C~0x5F */
+        {0x3F, 0x3F, 0x2D}, {0x3A, 0x3F, 0x2D}, {0x36, 0x3F, 0x2D}, {0x31,
+                                                                     0x3F,
+                                                                     0x2D},
+        /* Index 0x60~0x63 */
+        {0x2D, 0x3F, 0x2D}, {0x2D, 0x3F, 0x31}, {0x2D, 0x3F, 0x36}, {0x2D,
+                                                                     0x3F,
+                                                                     0x3A},
+        /* Index 0x64~0x67 */
+        {0x2D, 0x3F, 0x3F}, {0x2D, 0x3A, 0x3F}, {0x2D, 0x36, 0x3F}, {0x2D,
+                                                                     0x31,
+                                                                     0x3F},
+        /* Index 0x68~0x6B */
+        {0x00, 0x00, 0x1C}, {0x07, 0x00, 0x1C}, {0x0E, 0x00, 0x1C}, {0x15,
+                                                                     0x00,
+                                                                     0x1C},
+        /* Index 0x6C~0x6F */
+        {0x1C, 0x00, 0x1C}, {0x1C, 0x00, 0x15}, {0x1C, 0x00, 0x0E}, {0x1C,
+                                                                     0x00,
+                                                                     0x07},
+        /* Index 0x70~0x73 */
+        {0x1C, 0x00, 0x00}, {0x1C, 0x07, 0x00}, {0x1C, 0x0E, 0x00}, {0x1C,
+                                                                     0x15,
+                                                                     0x00},
+        /* Index 0x74~0x77 */
+        {0x1C, 0x1C, 0x00}, {0x15, 0x1C, 0x00}, {0x0E, 0x1C, 0x00}, {0x07,
+                                                                     0x1C,
+                                                                     0x00},
+        /* Index 0x78~0x7B */
+        {0x00, 0x1C, 0x00}, {0x00, 0x1C, 0x07}, {0x00, 0x1C, 0x0E}, {0x00,
+                                                                     0x1C,
+                                                                     0x15},
+        /* Index 0x7C~0x7F */
+        {0x00, 0x1C, 0x1C}, {0x00, 0x15, 0x1C}, {0x00, 0x0E, 0x1C}, {0x00,
+                                                                     0x07,
+                                                                     0x1C},
+        /* Index 0x80~0x83 */
+        {0x0E, 0x0E, 0x1C}, {0x11, 0x0E, 0x1C}, {0x15, 0x0E, 0x1C}, {0x18,
+                                                                     0x0E,
+                                                                     0x1C},
+        /* Index 0x84~0x87 */
+        {0x1C, 0x0E, 0x1C}, {0x1C, 0x0E, 0x18}, {0x1C, 0x0E, 0x15}, {0x1C,
+                                                                     0x0E,
+                                                                     0x11},
+        /* Index 0x88~0x8B */
+        {0x1C, 0x0E, 0x0E}, {0x1C, 0x11, 0x0E}, {0x1C, 0x15, 0x0E}, {0x1C,
+                                                                     0x18,
+                                                                     0x0E},
+        /* Index 0x8C~0x8F */
+        {0x1C, 0x1C, 0x0E}, {0x18, 0x1C, 0x0E}, {0x15, 0x1C, 0x0E}, {0x11,
+                                                                     0x1C,
+                                                                     0x0E},
+        /* Index 0x90~0x93 */
+        {0x0E, 0x1C, 0x0E}, {0x0E, 0x1C, 0x11}, {0x0E, 0x1C, 0x15}, {0x0E,
+                                                                     0x1C,
+                                                                     0x18},
+        /* Index 0x94~0x97 */
+        {0x0E, 0x1C, 0x1C}, {0x0E, 0x18, 0x1C}, {0x0E, 0x15, 0x1C}, {0x0E,
+                                                                     0x11,
+                                                                     0x1C},
+        /* Index 0x98~0x9B */
+        {0x14, 0x14, 0x1C}, {0x16, 0x14, 0x1C}, {0x18, 0x14, 0x1C}, {0x1A,
+                                                                     0x14,
+                                                                     0x1C},
+        /* Index 0x9C~0x9F */
+        {0x1C, 0x14, 0x1C}, {0x1C, 0x14, 0x1A}, {0x1C, 0x14, 0x18}, {0x1C,
+                                                                     0x14,
+                                                                     0x16},
+        /* Index 0xA0~0xA3 */
+        {0x1C, 0x14, 0x14}, {0x1C, 0x16, 0x14}, {0x1C, 0x18, 0x14}, {0x1C,
+                                                                     0x1A,
+                                                                     0x14},
+        /* Index 0xA4~0xA7 */
+        {0x1C, 0x1C, 0x14}, {0x1A, 0x1C, 0x14}, {0x18, 0x1C, 0x14}, {0x16,
+                                                                     0x1C,
+                                                                     0x14},
+        /* Index 0xA8~0xAB */
+        {0x14, 0x1C, 0x14}, {0x14, 0x1C, 0x16}, {0x14, 0x1C, 0x18}, {0x14,
+                                                                     0x1C,
+                                                                     0x1A},
+        /* Index 0xAC~0xAF */
+        {0x14, 0x1C, 0x1C}, {0x14, 0x1A, 0x1C}, {0x14, 0x18, 0x1C}, {0x14,
+                                                                     0x16,
+                                                                     0x1C},
+        /* Index 0xB0~0xB3 */
+        {0x00, 0x00, 0x10}, {0x04, 0x00, 0x10}, {0x08, 0x00, 0x10}, {0x0C,
+                                                                     0x00,
+                                                                     0x10},
+        /* Index 0xB4~0xB7 */
+        {0x10, 0x00, 0x10}, {0x10, 0x00, 0x0C}, {0x10, 0x00, 0x08}, {0x10,
+                                                                     0x00,
+                                                                     0x04},
+        /* Index 0xB8~0xBB */
+        {0x10, 0x00, 0x00}, {0x10, 0x04, 0x00}, {0x10, 0x08, 0x00}, {0x10,
+                                                                     0x0C,
+                                                                     0x00},
+        /* Index 0xBC~0xBF */
+        {0x10, 0x10, 0x00}, {0x0C, 0x10, 0x00}, {0x08, 0x10, 0x00}, {0x04,
+                                                                     0x10,
+                                                                     0x00},
+        /* Index 0xC0~0xC3 */
+        {0x00, 0x10, 0x00}, {0x00, 0x10, 0x04}, {0x00, 0x10, 0x08}, {0x00,
+                                                                     0x10,
+                                                                     0x0C},
+        /* Index 0xC4~0xC7 */
+        {0x00, 0x10, 0x10}, {0x00, 0x0C, 0x10}, {0x00, 0x08, 0x10}, {0x00,
+                                                                     0x04,
+                                                                     0x10},
+        /* Index 0xC8~0xCB */
+        {0x08, 0x08, 0x10}, {0x0A, 0x08, 0x10}, {0x0C, 0x08, 0x10}, {0x0E,
+                                                                     0x08,
+                                                                     0x10},
+        /* Index 0xCC~0xCF */
+        {0x10, 0x08, 0x10}, {0x10, 0x08, 0x0E}, {0x10, 0x08, 0x0C}, {0x10,
+                                                                     0x08,
+                                                                     0x0A},
+        /* Index 0xD0~0xD3 */
+        {0x10, 0x08, 0x08}, {0x10, 0x0A, 0x08}, {0x10, 0x0C, 0x08}, {0x10,
+                                                                     0x0E,
+                                                                     0x08},
+        /* Index 0xD4~0xD7 */
+        {0x10, 0x10, 0x08}, {0x0E, 0x10, 0x08}, {0x0C, 0x10, 0x08}, {0x0A,
+                                                                     0x10,
+                                                                     0x08},
+        /* Index 0xD8~0xDB */
+        {0x08, 0x10, 0x08}, {0x08, 0x10, 0x0A}, {0x08, 0x10, 0x0C}, {0x08,
+                                                                     0x10,
+                                                                     0x0E},
+        /* Index 0xDC~0xDF */
+        {0x08, 0x10, 0x10}, {0x08, 0x0E, 0x10}, {0x08, 0x0C, 0x10}, {0x08,
+                                                                     0x0A,
+                                                                     0x10},
+        /* Index 0xE0~0xE3 */
+        {0x0B, 0x0B, 0x10}, {0x0C, 0x0B, 0x10}, {0x0D, 0x0B, 0x10}, {0x0F,
+                                                                     0x0B,
+                                                                     0x10},
+        /* Index 0xE4~0xE7 */
+        {0x10, 0x0B, 0x10}, {0x10, 0x0B, 0x0F}, {0x10, 0x0B, 0x0D}, {0x10,
+                                                                     0x0B,
+                                                                     0x0C},
+        /* Index 0xE8~0xEB */
+        {0x10, 0x0B, 0x0B}, {0x10, 0x0C, 0x0B}, {0x10, 0x0D, 0x0B}, {0x10,
+                                                                     0x0F,
+                                                                     0x0B},
+        /* Index 0xEC~0xEF */
+        {0x10, 0x10, 0x0B}, {0x0F, 0x10, 0x0B}, {0x0D, 0x10, 0x0B}, {0x0C,
+                                                                     0x10,
+                                                                     0x0B},
+        /* Index 0xF0~0xF3 */
+        {0x0B, 0x10, 0x0B}, {0x0B, 0x10, 0x0C}, {0x0B, 0x10, 0x0D}, {0x0B,
+                                                                     0x10,
+                                                                     0x0F},
+        /* Index 0xF4~0xF7 */
+        {0x0B, 0x10, 0x10}, {0x0B, 0x0F, 0x10}, {0x0B, 0x0D, 0x10}, {0x0B,
+                                                                     0x0C,
+                                                                     0x10},
+        /* Index 0xF8~0xFB */
+        {0x00, 0x00, 0x00}, {0x00, 0x00, 0x00}, {0x00, 0x00, 0x00}, {0x00,
+                                                                     0x00,
+                                                                     0x00},
+        /* Index 0xFC~0xFF */
+        {0x00, 0x00, 0x00}, {0x00, 0x00, 0x00}, {0x00, 0x00, 0x00}, {0x00,
+                                                                     0x00,
+                                                                     0x00}
+};
+
+static void set_crt_output_path(int set_iga);
+static void dvi_patch_skew_dvp0(void);
+static void dvi_patch_skew_dvp1(void);
+static void dvi_patch_skew_dvp_low(void);
+static void set_dvi_output_path(int set_iga, int output_interface);
+static void set_lcd_output_path(int set_iga, int output_interface);
+static int search_mode_setting(int ModeInfoIndex);
+static void load_fix_bit_crtc_reg(void);
+static void init_gfx_chip_info(void);
+static void init_tmds_chip_info(void);
+static void init_lvds_chip_info(void);
+static void device_screen_off(void);
+static void device_screen_on(void);
+static void set_display_channel(void);
+static void device_off(void);
+static void device_on(void);
+static void enable_second_display_channel(void);
+static void disable_second_display_channel(void);
+static int get_fb_size_from_pci(void);
+
+void viafb_write_reg(u8 index, u16 io_port, u8 data)
+{
+        outb(index, io_port);
+        outb(data, io_port + 1);
+        /*DEBUG_MSG(KERN_INFO "\nIndex=%2d Value=%2d", index, data); */
+}
+u8 viafb_read_reg(int io_port, u8 index)
+{
+        outb(index, io_port);
+        return inb(io_port + 1);
+}
+
+void viafb_lock_crt(void)
+{
+        viafb_write_reg_mask(CR11, VIACR, BIT7, BIT7);
+}
+
+void viafb_unlock_crt(void)
+{
+        viafb_write_reg_mask(CR11, VIACR, 0, BIT7);
+        viafb_write_reg_mask(CR47, VIACR, 0, BIT0);
+}
+
+void viafb_write_reg_mask(u8 index, int io_port, u8 data, u8 mask)
+{
+        u8 tmp;
+
+        outb(index, io_port);
+        tmp = inb(io_port + 1);
+        outb((data & mask) | (tmp & (~mask)), io_port + 1);
+        /*DEBUG_MSG(KERN_INFO "\nIndex=%2d Value=%2d", index, tmp); */
+}
+
+void write_dac_reg(u8 index, u8 r, u8 g, u8 b)
+{
+        outb(index, LUT_INDEX_WRITE);
+        outb(r, LUT_DATA);
+        outb(g, LUT_DATA);
+        outb(b, LUT_DATA);
+}
+
+/*Set IGA path for each device*/
+void viafb_set_iga_path(void)
+{
+
+        if (viafb_SAMM_ON == 1) {
+                if (viafb_CRT_ON) {
+                        if (viafb_primary_dev == CRT_Device)
+                                viaparinfo->crt_setting_info->iga_path = IGA1;
+                        else
+                                viaparinfo->crt_setting_info->iga_path = IGA2;
+                }
+
+                if (viafb_DVI_ON) {
+                        if (viafb_primary_dev == DVI_Device)
+                                viaparinfo->tmds_setting_info->iga_path = IGA1;
+                        else
+                                viaparinfo->tmds_setting_info->iga_path = IGA2;
+                }
+
+                if (viafb_LCD_ON) {
+                        if (viafb_primary_dev == LCD_Device) {
+                                if (viafb_dual_fb &&
+                                        (viaparinfo->chip_info->gfx_chip_name ==
+                                        UNICHROME_CLE266)) {
+                                        viaparinfo->
+                                        lvds_setting_info->iga_path = IGA2;
+                                        viaparinfo->
+                                        crt_setting_info->iga_path = IGA1;
+                                        viaparinfo->
+                                        tmds_setting_info->iga_path = IGA1;
+                                } else
+                                        viaparinfo->
+                                        lvds_setting_info->iga_path = IGA1;
+                        } else {
+                                viaparinfo->lvds_setting_info->iga_path = IGA2;
+                        }
+                }
+                if (viafb_LCD2_ON) {
+                        if (LCD2_Device == viafb_primary_dev)
+                                viaparinfo->lvds_setting_info2->iga_path = IGA1;
+                        else
+                                viaparinfo->lvds_setting_info2->iga_path = IGA2;
+                }
+        } else {
+                viafb_SAMM_ON = 0;
+
+                if (viafb_CRT_ON && viafb_LCD_ON) {
+                        viaparinfo->crt_setting_info->iga_path = IGA1;
+                        viaparinfo->lvds_setting_info->iga_path = IGA2;
+                } else if (viafb_CRT_ON && viafb_DVI_ON) {
+                        viaparinfo->crt_setting_info->iga_path = IGA1;
+                        viaparinfo->tmds_setting_info->iga_path = IGA2;
+                } else if (viafb_LCD_ON && viafb_DVI_ON) {
+                        viaparinfo->tmds_setting_info->iga_path = IGA1;
+                        viaparinfo->lvds_setting_info->iga_path = IGA2;
+                } else if (viafb_LCD_ON && viafb_LCD2_ON) {
+                        viaparinfo->lvds_setting_info->iga_path = IGA2;
+                        viaparinfo->lvds_setting_info2->iga_path = IGA2;
+                } else if (viafb_CRT_ON) {
+                        viaparinfo->crt_setting_info->iga_path = IGA1;
+                } else if (viafb_LCD_ON) {
+                        viaparinfo->lvds_setting_info->iga_path = IGA2;
+                } else if (viafb_DVI_ON) {
+                        viaparinfo->tmds_setting_info->iga_path = IGA1;
+                }
+        }
+}
+
+void viafb_set_start_addr(void)
+{
+        unsigned long offset = 0, tmp = 0, size = 0;
+        unsigned long length;
+
+        DEBUG_MSG(KERN_INFO "viafb_set_start_addr!\n");
+        viafb_unlock_crt();
+        /* update starting address of IGA1 */
+        viafb_write_reg(CR0C, VIACR, 0x00);     /*initial starting address */
+        viafb_write_reg(CR0D, VIACR, 0x00);
+        viafb_write_reg(CR34, VIACR, 0x00);
+        viafb_write_reg_mask(CR48, VIACR, 0x00, 0x1F);
+
+        if (viafb_dual_fb) {
+                viaparinfo->iga_path = IGA1;
+                viaparinfo1->iga_path = IGA2;
+        }
+
+        if (viafb_SAMM_ON == 1) {
+                if (!viafb_dual_fb) {
+                        if (viafb_second_size)
+                                size = viafb_second_size * 1024 * 1024;
+                        else
+                                size = 8 * 1024 * 1024;
+                } else {
+
+                        size = viaparinfo1->memsize;
+                }
+                offset = viafb_second_offset;
+                DEBUG_MSG(KERN_INFO
+                          "viafb_second_size=%lx, second start_adddress=%lx\n",
+                          size, offset);
+        }
+        if (viafb_SAMM_ON == 1) {
+                offset = offset >> 3;
+
+                tmp = viafb_read_reg(VIACR, 0x62) & 0x01;
+                tmp |= (offset & 0x7F) << 1;
+                viafb_write_reg(CR62, VIACR, tmp);
+                viafb_write_reg(CR63, VIACR, ((offset & 0x7F80) >> 7));
+                viafb_write_reg(CR64, VIACR, ((offset & 0x7F8000) >> 15));
+                viafb_write_reg(CRA3, VIACR, ((offset & 0x3800000) >> 23));
+        } else {
+                /* update starting address */
+                viafb_write_reg(CR62, VIACR, 0x00);
+                viafb_write_reg(CR63, VIACR, 0x00);
+                viafb_write_reg(CR64, VIACR, 0x00);
+                viafb_write_reg(CRA3, VIACR, 0x00);
+        }
+
+        if (viafb_SAMM_ON == 1) {
+                if (viafb_accel) {
+                        if (!viafb_dual_fb)
+                                length = size - viaparinfo->fbmem_used;
+                        else
+                                length = size - viaparinfo1->fbmem_used;
+                } else
+                        length = size;
+                offset = (unsigned long)(void *)viafb_FB_MM +
+                        viafb_second_offset;
+                memset((void *)offset, 0, length);
+        }
+
+        viafb_lock_crt();
+}
+
+void viafb_set_output_path(int device, int set_iga, int output_interface)
+{
+        switch (device) {
+        case DEVICE_CRT:
+                set_crt_output_path(set_iga);
+                break;
+        case DEVICE_DVI:
+                set_dvi_output_path(set_iga, output_interface);
+                break;
+        case DEVICE_LCD:
+                set_lcd_output_path(set_iga, output_interface);
+                break;
+        }
+}
+
+static void set_crt_output_path(int set_iga)
+{
+        viafb_write_reg_mask(CR36, VIACR, 0x00, BIT4 + BIT5);
+
+        switch (set_iga) {
+        case IGA1:
+                viafb_write_reg_mask(SR16, VIASR, 0x00, BIT6);
+                break;
+        case IGA2:
+        case IGA1_IGA2:
+                viafb_write_reg_mask(CR6A, VIACR, 0xC0, BIT6 + BIT7);
+                viafb_write_reg_mask(SR16, VIASR, 0x40, BIT6);
+                if (set_iga == IGA1_IGA2)
+                        viafb_write_reg_mask(CR6B, VIACR, 0x08, BIT3);
+                break;
+        }
+}
+
+static void dvi_patch_skew_dvp0(void)
+{
+        /* Reset data driving first: */
+        viafb_write_reg_mask(SR1B, VIASR, 0, BIT1);
+        viafb_write_reg_mask(SR2A, VIASR, 0, BIT4);
+
+        switch (viaparinfo->chip_info->gfx_chip_name) {
+        case UNICHROME_P4M890:
+                {
+                        if ((viaparinfo->tmds_setting_info->h_active == 1600) &&
+                                (viaparinfo->tmds_setting_info->v_active ==
+                                1200))
+                                viafb_write_reg_mask(CR96, VIACR, 0x03,
+                                               BIT0 + BIT1 + BIT2);
+                        else
+                                viafb_write_reg_mask(CR96, VIACR, 0x07,
+                                               BIT0 + BIT1 + BIT2);
+                        break;
+                }
+
+        case UNICHROME_P4M900:
+                {
+                        viafb_write_reg_mask(CR96, VIACR, 0x07,
+                                       BIT0 + BIT1 + BIT2 + BIT3);
+                        viafb_write_reg_mask(SR1B, VIASR, 0x02, BIT1);
+                        viafb_write_reg_mask(SR2A, VIASR, 0x10, BIT4);
+                        break;
+                }
+
+        default:
+                {
+                        break;
+                }
+        }
+}
+
+static void dvi_patch_skew_dvp1(void)
+{
+        switch (viaparinfo->chip_info->gfx_chip_name) {
+        case UNICHROME_CX700:
+                {
+                        break;
+                }
+
+        default:
+                {
+                        break;
+                }
+        }
+}
+
+static void dvi_patch_skew_dvp_low(void)
+{
+        switch (viaparinfo->chip_info->gfx_chip_name) {
+        case UNICHROME_K8M890:
+                {
+                        viafb_write_reg_mask(CR99, VIACR, 0x03, BIT0 + BIT1);
+                        break;
+                }
+
+        case UNICHROME_P4M900:
+                {
+                        viafb_write_reg_mask(CR99, VIACR, 0x08,
+                                       BIT0 + BIT1 + BIT2 + BIT3);
+                        break;
+                }
+
+        case UNICHROME_P4M890:
+                {
+                        viafb_write_reg_mask(CR99, VIACR, 0x0F,
+                                       BIT0 + BIT1 + BIT2 + BIT3);
+                        break;
+                }
+
+        default:
+                {
+                        break;
+                }
+        }
+}
+
+static void set_dvi_output_path(int set_iga, int output_interface)
+{
+        switch (output_interface) {
+        case INTERFACE_DVP0:
+                viafb_write_reg_mask(CR6B, VIACR, 0x01, BIT0);
+
+                if (set_iga == IGA1) {
+                        viafb_write_reg_mask(CR96, VIACR, 0x00, BIT4);
+                        viafb_write_reg_mask(CR6C, VIACR, 0x21, BIT0 +
+                                BIT5 + BIT7);
+                } else {
+                        viafb_write_reg_mask(CR96, VIACR, 0x10, BIT4);
+                        viafb_write_reg_mask(CR6C, VIACR, 0xA1, BIT0 +
+                                BIT5 + BIT7);
+                }
+
+                viafb_write_reg_mask(SR1E, VIASR, 0xC0, BIT7 + BIT6);
+
+                dvi_patch_skew_dvp0();
+                break;
+
+        case INTERFACE_DVP1:
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266) {
+                        if (set_iga == IGA1)
+                                viafb_write_reg_mask(CR93, VIACR, 0x21,
+                                               BIT0 + BIT5 + BIT7);
+                        else
+                                viafb_write_reg_mask(CR93, VIACR, 0xA1,
+                                               BIT0 + BIT5 + BIT7);
+                } else {
+                        if (set_iga == IGA1)
+                                viafb_write_reg_mask(CR9B, VIACR, 0x00, BIT4);
+                        else
+                                viafb_write_reg_mask(CR9B, VIACR, 0x10, BIT4);
+                }
+
+                viafb_write_reg_mask(SR1E, VIASR, 0x30, BIT4 + BIT5);
+                dvi_patch_skew_dvp1();
+                break;
+        case INTERFACE_DFP_HIGH:
+                if (viaparinfo->chip_info->gfx_chip_name != UNICHROME_CLE266) {
+                        if (set_iga == IGA1) {
+                                viafb_write_reg_mask(CR96, VIACR, 0x00, BIT4);
+                                viafb_write_reg_mask(CR97, VIACR, 0x03,
+                                               BIT0 + BIT1 + BIT4);
+                        } else {
+                                viafb_write_reg_mask(CR96, VIACR, 0x10, BIT4);
+                                viafb_write_reg_mask(CR97, VIACR, 0x13,
+                                               BIT0 + BIT1 + BIT4);
+                        }
+                }
+                viafb_write_reg_mask(SR2A, VIASR, 0x0C, BIT2 + BIT3);
+                break;
+
+        case INTERFACE_DFP_LOW:
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266)
+                        break;
+
+                if (set_iga == IGA1) {
+                        viafb_write_reg_mask(CR99, VIACR, 0x00, BIT4);
+                        viafb_write_reg_mask(CR9B, VIACR, 0x00, BIT4);
+                } else {
+                        viafb_write_reg_mask(CR99, VIACR, 0x10, BIT4);
+                        viafb_write_reg_mask(CR9B, VIACR, 0x10, BIT4);
+                }
+
+                viafb_write_reg_mask(SR2A, VIASR, 0x03, BIT0 + BIT1);
+                dvi_patch_skew_dvp_low();
+                break;
+
+        case INTERFACE_TMDS:
+                if (set_iga == IGA1)
+                        viafb_write_reg_mask(CR99, VIACR, 0x00, BIT4);
+                else
+                        viafb_write_reg_mask(CR99, VIACR, 0x10, BIT4);
+                break;
+        }
+
+        if (set_iga == IGA2) {
+                enable_second_display_channel();
+                /* Disable LCD Scaling */
+                viafb_write_reg_mask(CR79, VIACR, 0x00, BIT0);
+        }
+}
+
+static void set_lcd_output_path(int set_iga, int output_interface)
+{
+        DEBUG_MSG(KERN_INFO
+                  "set_lcd_output_path, iga:%d,out_interface:%d\n",
+                  set_iga, output_interface);
+        switch (set_iga) {
+        case IGA1:
+                viafb_write_reg_mask(CR6B, VIACR, 0x00, BIT3);
+                viafb_write_reg_mask(CR6A, VIACR, 0x08, BIT3);
+
+                disable_second_display_channel();
+                break;
+
+        case IGA2:
+                viafb_write_reg_mask(CR6B, VIACR, 0x00, BIT3);
+                viafb_write_reg_mask(CR6A, VIACR, 0x08, BIT3);
+
+                enable_second_display_channel();
+                break;
+
+        case IGA1_IGA2:
+                viafb_write_reg_mask(CR6B, VIACR, 0x08, BIT3);
+                viafb_write_reg_mask(CR6A, VIACR, 0x08, BIT3);
+
+                disable_second_display_channel();
+                break;
+        }
+
+        switch (output_interface) {
+        case INTERFACE_DVP0:
+                if (set_iga == IGA1) {
+                        viafb_write_reg_mask(CR96, VIACR, 0x00, BIT4);
+                } else {
+                        viafb_write_reg(CR91, VIACR, 0x00);
+                        viafb_write_reg_mask(CR96, VIACR, 0x10, BIT4);
+                }
+                break;
+
+        case INTERFACE_DVP1:
+                if (set_iga == IGA1)
+                        viafb_write_reg_mask(CR9B, VIACR, 0x00, BIT4);
+                else {
+                        viafb_write_reg(CR91, VIACR, 0x00);
+                        viafb_write_reg_mask(CR9B, VIACR, 0x10, BIT4);
+                }
+                break;
+
+        case INTERFACE_DFP_HIGH:
+                if (set_iga == IGA1)
+                        viafb_write_reg_mask(CR97, VIACR, 0x00, BIT4);
+                else {
+                        viafb_write_reg(CR91, VIACR, 0x00);
+                        viafb_write_reg_mask(CR97, VIACR, 0x10, BIT4);
+                        viafb_write_reg_mask(CR96, VIACR, 0x10, BIT4);
+                }
+                break;
+
+        case INTERFACE_DFP_LOW:
+                if (set_iga == IGA1)
+                        viafb_write_reg_mask(CR99, VIACR, 0x00, BIT4);
+                else {
+                        viafb_write_reg(CR91, VIACR, 0x00);
+                        viafb_write_reg_mask(CR99, VIACR, 0x10, BIT4);
+                        viafb_write_reg_mask(CR9B, VIACR, 0x10, BIT4);
+                }
+
+                break;
+
+        case INTERFACE_DFP:
+                if ((UNICHROME_K8M890 == viaparinfo->chip_info->gfx_chip_name)
+                    || (UNICHROME_P4M890 ==
+                    viaparinfo->chip_info->gfx_chip_name))
+                        viafb_write_reg_mask(CR97, VIACR, 0x84,
+                                       BIT7 + BIT2 + BIT1 + BIT0);
+                if (set_iga == IGA1) {
+                        viafb_write_reg_mask(CR97, VIACR, 0x00, BIT4);
+                        viafb_write_reg_mask(CR99, VIACR, 0x00, BIT4);
+                } else {
+                        viafb_write_reg(CR91, VIACR, 0x00);
+                        viafb_write_reg_mask(CR97, VIACR, 0x10, BIT4);
+                        viafb_write_reg_mask(CR99, VIACR, 0x10, BIT4);
+                }
+                break;
+
+        case INTERFACE_LVDS0:
+        case INTERFACE_LVDS0LVDS1:
+                if (set_iga == IGA1)
+                        viafb_write_reg_mask(CR99, VIACR, 0x00, BIT4);
+                else
+                        viafb_write_reg_mask(CR99, VIACR, 0x10, BIT4);
+
+                break;
+
+        case INTERFACE_LVDS1:
+                if (set_iga == IGA1)
+                        viafb_write_reg_mask(CR97, VIACR, 0x00, BIT4);
+                else
+                        viafb_write_reg_mask(CR97, VIACR, 0x10, BIT4);
+                break;
+        }
+}
+
+/* Search Mode Index */
+static int search_mode_setting(int ModeInfoIndex)
+{
+        int i = 0;
+
+        while ((i < NUM_TOTAL_MODETABLE) &&
+                        (ModeInfoIndex != CLE266Modes[i].ModeIndex))
+                i++;
+        if (i >= NUM_TOTAL_MODETABLE)
+                i = 0;
+        return i;
+
+}
+
+struct VideoModeTable *viafb_get_modetbl_pointer(int Index)
+{
+        struct VideoModeTable *TmpTbl = NULL;
+        TmpTbl = &CLE266Modes[search_mode_setting(Index)];
+        return TmpTbl;
+}
+
+struct VideoModeTable *viafb_get_cea_mode_tbl_pointer(int Index)
+{
+        struct VideoModeTable *TmpTbl = NULL;
+        int i = 0;
+        while ((i < NUM_TOTAL_CEA_MODES) &&
+                        (Index != CEA_HDMI_Modes[i].ModeIndex))
+                i++;
+        if ((i < NUM_TOTAL_CEA_MODES))
+                TmpTbl = &CEA_HDMI_Modes[i];
+         else {
+                /*Still use general timing if don't find CEA timing */
+                i = 0;
+                while ((i < NUM_TOTAL_MODETABLE) &&
+                                (Index != CLE266Modes[i].ModeIndex))
+                       i++;
+                if (i >= NUM_TOTAL_MODETABLE)
+                        i = 0;
+                TmpTbl = &CLE266Modes[i];
+        }
+        return TmpTbl;
+}
+
+static void load_fix_bit_crtc_reg(void)
+{
+        /* always set to 1 */
+        viafb_write_reg_mask(CR03, VIACR, 0x80, BIT7);
+        /* line compare should set all bits = 1 (extend modes) */
+        viafb_write_reg(CR18, VIACR, 0xff);
+        /* line compare should set all bits = 1 (extend modes) */
+        viafb_write_reg_mask(CR07, VIACR, 0x10, BIT4);
+        /* line compare should set all bits = 1 (extend modes) */
+        viafb_write_reg_mask(CR09, VIACR, 0x40, BIT6);
+        /* line compare should set all bits = 1 (extend modes) */
+        viafb_write_reg_mask(CR35, VIACR, 0x10, BIT4);
+        /* line compare should set all bits = 1 (extend modes) */
+        viafb_write_reg_mask(CR33, VIACR, 0x06, BIT0 + BIT1 + BIT2);
+        /*viafb_write_reg_mask(CR32, VIACR, 0x01, BIT0); */
+        /* extend mode always set to e3h */
+        viafb_write_reg(CR17, VIACR, 0xe3);
+        /* extend mode always set to 0h */
+        viafb_write_reg(CR08, VIACR, 0x00);
+        /* extend mode always set to 0h */
+        viafb_write_reg(CR14, VIACR, 0x00);
+
+        /* If K8M800, enable Prefetch Mode. */
+        if ((viaparinfo->chip_info->gfx_chip_name == UNICHROME_K800)
+                || (viaparinfo->chip_info->gfx_chip_name == UNICHROME_K8M890))
+                viafb_write_reg_mask(CR33, VIACR, 0x08, BIT3);
+        if ((viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266)
+            && (viaparinfo->chip_info->gfx_chip_revision == CLE266_REVISION_AX))
+                viafb_write_reg_mask(SR1A, VIASR, 0x02, BIT1);
+
+}
+
+void viafb_load_reg(int timing_value, int viafb_load_reg_num,
+        struct io_register *reg,
+              int io_type)
+{
+        int reg_mask;
+        int bit_num = 0;
+        int data;
+        int i, j;
+        int shift_next_reg;
+        int start_index, end_index, cr_index;
+        u16 get_bit;
+
+        for (i = 0; i < viafb_load_reg_num; i++) {
+                reg_mask = 0;
+                data = 0;
+                start_index = reg[i].start_bit;
+                end_index = reg[i].end_bit;
+                cr_index = reg[i].io_addr;
+
+                shift_next_reg = bit_num;
+                for (j = start_index; j <= end_index; j++) {
+                        /*if (bit_num==8) timing_value = timing_value >>8; */
+                        reg_mask = reg_mask | (BIT0 << j);
+                        get_bit = (timing_value & (BIT0 << bit_num));
+                        data =
+                            data | ((get_bit >> shift_next_reg) << start_index);
+                        bit_num++;
+                }
+                if (io_type == VIACR)
+                        viafb_write_reg_mask(cr_index, VIACR, data, reg_mask);
+                else
+                        viafb_write_reg_mask(cr_index, VIASR, data, reg_mask);
+        }
+
+}
+
+/* Write Registers */
+void viafb_write_regx(struct io_reg RegTable[], int ItemNum)
+{
+        int i;
+        unsigned char RegTemp;
+
+        /*DEBUG_MSG(KERN_INFO "Table Size : %x!!\n",ItemNum ); */
+
+        for (i = 0; i < ItemNum; i++) {
+                outb(RegTable[i].index, RegTable[i].port);
+                RegTemp = inb(RegTable[i].port + 1);
+                RegTemp = (RegTemp & (~RegTable[i].mask)) | RegTable[i].value;
+                outb(RegTemp, RegTable[i].port + 1);
+        }
+}
+
+void viafb_load_offset_reg(int h_addr, int bpp_byte, int set_iga)
+{
+        int reg_value;
+        int viafb_load_reg_num;
+        struct io_register *reg;
+
+        switch (set_iga) {
+        case IGA1_IGA2:
+        case IGA1:
+                reg_value = IGA1_OFFSET_FORMULA(h_addr, bpp_byte);
+                viafb_load_reg_num = offset_reg.iga1_offset_reg.reg_num;
+                reg = offset_reg.iga1_offset_reg.reg;
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);
+                if (set_iga == IGA1)
+                        break;
+        case IGA2:
+                reg_value = IGA2_OFFSET_FORMULA(h_addr, bpp_byte);
+                viafb_load_reg_num = offset_reg.iga2_offset_reg.reg_num;
+                reg = offset_reg.iga2_offset_reg.reg;
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);
+                break;
+        }
+}
+
+void viafb_load_fetch_count_reg(int h_addr, int bpp_byte, int set_iga)
+{
+        int reg_value;
+        int viafb_load_reg_num;
+        struct io_register *reg = NULL;
+
+        switch (set_iga) {
+        case IGA1_IGA2:
+        case IGA1:
+                reg_value = IGA1_FETCH_COUNT_FORMULA(h_addr, bpp_byte);
+                viafb_load_reg_num = fetch_count_reg.
+                        iga1_fetch_count_reg.reg_num;
+                reg = fetch_count_reg.iga1_fetch_count_reg.reg;
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIASR);
+                if (set_iga == IGA1)
+                        break;
+        case IGA2:
+                reg_value = IGA2_FETCH_COUNT_FORMULA(h_addr, bpp_byte);
+                viafb_load_reg_num = fetch_count_reg.
+                        iga2_fetch_count_reg.reg_num;
+                reg = fetch_count_reg.iga2_fetch_count_reg.reg;
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);
+                break;
+        }
+
+}
+
+void viafb_load_FIFO_reg(int set_iga, int hor_active, int ver_active)
+{
+        int reg_value;
+        int viafb_load_reg_num;
+        struct io_register *reg = NULL;
+        int iga1_fifo_max_depth = 0, iga1_fifo_threshold =
+            0, iga1_fifo_high_threshold = 0, iga1_display_queue_expire_num = 0;
+        int iga2_fifo_max_depth = 0, iga2_fifo_threshold =
+            0, iga2_fifo_high_threshold = 0, iga2_display_queue_expire_num = 0;
+
+        if (set_iga == IGA1) {
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_K800) {
+                        iga1_fifo_max_depth = K800_IGA1_FIFO_MAX_DEPTH;
+                        iga1_fifo_threshold = K800_IGA1_FIFO_THRESHOLD;
+                        iga1_fifo_high_threshold =
+                            K800_IGA1_FIFO_HIGH_THRESHOLD;
+                        /* If resolution > 1280x1024, expire length = 64, else
+                           expire length = 128 */
+                        if ((hor_active > 1280) && (ver_active > 1024))
+                                iga1_display_queue_expire_num = 16;
+                        else
+                                iga1_display_queue_expire_num =
+                                    K800_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
+
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_PM800) {
+                        iga1_fifo_max_depth = P880_IGA1_FIFO_MAX_DEPTH;
+                        iga1_fifo_threshold = P880_IGA1_FIFO_THRESHOLD;
+                        iga1_fifo_high_threshold =
+                            P880_IGA1_FIFO_HIGH_THRESHOLD;
+                        iga1_display_queue_expire_num =
+                            P880_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
+
+                        /* If resolution > 1280x1024, expire length = 64, else
+                           expire length = 128 */
+                        if ((hor_active > 1280) && (ver_active > 1024))
+                                iga1_display_queue_expire_num = 16;
+                        else
+                                iga1_display_queue_expire_num =
+                                    P880_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CN700) {
+                        iga1_fifo_max_depth = CN700_IGA1_FIFO_MAX_DEPTH;
+                        iga1_fifo_threshold = CN700_IGA1_FIFO_THRESHOLD;
+                        iga1_fifo_high_threshold =
+                            CN700_IGA1_FIFO_HIGH_THRESHOLD;
+
+                        /* If resolution > 1280x1024, expire length = 64,
+                           else expire length = 128 */
+                        if ((hor_active > 1280) && (ver_active > 1024))
+                                iga1_display_queue_expire_num = 16;
+                        else
+                                iga1_display_queue_expire_num =
+                                    CN700_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CX700) {
+                        iga1_fifo_max_depth = CX700_IGA1_FIFO_MAX_DEPTH;
+                        iga1_fifo_threshold = CX700_IGA1_FIFO_THRESHOLD;
+                        iga1_fifo_high_threshold =
+                            CX700_IGA1_FIFO_HIGH_THRESHOLD;
+                        iga1_display_queue_expire_num =
+                            CX700_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_K8M890) {
+                        iga1_fifo_max_depth = K8M890_IGA1_FIFO_MAX_DEPTH;
+                        iga1_fifo_threshold = K8M890_IGA1_FIFO_THRESHOLD;
+                        iga1_fifo_high_threshold =
+                            K8M890_IGA1_FIFO_HIGH_THRESHOLD;
+                        iga1_display_queue_expire_num =
+                            K8M890_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_P4M890) {
+                        iga1_fifo_max_depth = P4M890_IGA1_FIFO_MAX_DEPTH;
+                        iga1_fifo_threshold = P4M890_IGA1_FIFO_THRESHOLD;
+                        iga1_fifo_high_threshold =
+                            P4M890_IGA1_FIFO_HIGH_THRESHOLD;
+                        iga1_display_queue_expire_num =
+                            P4M890_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_P4M900) {
+                        iga1_fifo_max_depth = P4M900_IGA1_FIFO_MAX_DEPTH;
+                        iga1_fifo_threshold = P4M900_IGA1_FIFO_THRESHOLD;
+                        iga1_fifo_high_threshold =
+                            P4M900_IGA1_FIFO_HIGH_THRESHOLD;
+                        iga1_display_queue_expire_num =
+                            P4M900_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_VX800) {
+                        iga1_fifo_max_depth = VX800_IGA1_FIFO_MAX_DEPTH;
+                        iga1_fifo_threshold = VX800_IGA1_FIFO_THRESHOLD;
+                        iga1_fifo_high_threshold =
+                            VX800_IGA1_FIFO_HIGH_THRESHOLD;
+                        iga1_display_queue_expire_num =
+                            VX800_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                /* Set Display FIFO Depath Select */
+                reg_value = IGA1_FIFO_DEPTH_SELECT_FORMULA(iga1_fifo_max_depth);
+                viafb_load_reg_num =
+                    display_fifo_depth_reg.iga1_fifo_depth_select_reg.reg_num;
+                reg = display_fifo_depth_reg.iga1_fifo_depth_select_reg.reg;
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIASR);
+
+                /* Set Display FIFO Threshold Select */
+                reg_value = IGA1_FIFO_THRESHOLD_FORMULA(iga1_fifo_threshold);
+                viafb_load_reg_num =
+                    fifo_threshold_select_reg.
+                    iga1_fifo_threshold_select_reg.reg_num;
+                reg =
+                    fifo_threshold_select_reg.
+                    iga1_fifo_threshold_select_reg.reg;
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIASR);
+
+                /* Set FIFO High Threshold Select */
+                reg_value =
+                    IGA1_FIFO_HIGH_THRESHOLD_FORMULA(iga1_fifo_high_threshold);
+                viafb_load_reg_num =
+                    fifo_high_threshold_select_reg.
+                    iga1_fifo_high_threshold_select_reg.reg_num;
+                reg =
+                    fifo_high_threshold_select_reg.
+                    iga1_fifo_high_threshold_select_reg.reg;
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIASR);
+
+                /* Set Display Queue Expire Num */
+                reg_value =
+                    IGA1_DISPLAY_QUEUE_EXPIRE_NUM_FORMULA
+                    (iga1_display_queue_expire_num);
+                viafb_load_reg_num =
+                    display_queue_expire_num_reg.
+                    iga1_display_queue_expire_num_reg.reg_num;
+                reg =
+                    display_queue_expire_num_reg.
+                    iga1_display_queue_expire_num_reg.reg;
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIASR);
+
+        } else {
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_K800) {
+                        iga2_fifo_max_depth = K800_IGA2_FIFO_MAX_DEPTH;
+                        iga2_fifo_threshold = K800_IGA2_FIFO_THRESHOLD;
+                        iga2_fifo_high_threshold =
+                            K800_IGA2_FIFO_HIGH_THRESHOLD;
+
+                        /* If resolution > 1280x1024, expire length = 64,
+                           else  expire length = 128 */
+                        if ((hor_active > 1280) && (ver_active > 1024))
+                                iga2_display_queue_expire_num = 16;
+                        else
+                                iga2_display_queue_expire_num =
+                                    K800_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_PM800) {
+                        iga2_fifo_max_depth = P880_IGA2_FIFO_MAX_DEPTH;
+                        iga2_fifo_threshold = P880_IGA2_FIFO_THRESHOLD;
+                        iga2_fifo_high_threshold =
+                            P880_IGA2_FIFO_HIGH_THRESHOLD;
+
+                        /* If resolution > 1280x1024, expire length = 64,
+                           else  expire length = 128 */
+                        if ((hor_active > 1280) && (ver_active > 1024))
+                                iga2_display_queue_expire_num = 16;
+                        else
+                                iga2_display_queue_expire_num =
+                                    P880_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CN700) {
+                        iga2_fifo_max_depth = CN700_IGA2_FIFO_MAX_DEPTH;
+                        iga2_fifo_threshold = CN700_IGA2_FIFO_THRESHOLD;
+                        iga2_fifo_high_threshold =
+                            CN700_IGA2_FIFO_HIGH_THRESHOLD;
+
+                        /* If resolution > 1280x1024, expire length = 64,
+                           else expire length = 128 */
+                        if ((hor_active > 1280) && (ver_active > 1024))
+                                iga2_display_queue_expire_num = 16;
+                        else
+                                iga2_display_queue_expire_num =
+                                    CN700_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CX700) {
+                        iga2_fifo_max_depth = CX700_IGA2_FIFO_MAX_DEPTH;
+                        iga2_fifo_threshold = CX700_IGA2_FIFO_THRESHOLD;
+                        iga2_fifo_high_threshold =
+                            CX700_IGA2_FIFO_HIGH_THRESHOLD;
+                        iga2_display_queue_expire_num =
+                            CX700_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_K8M890) {
+                        iga2_fifo_max_depth = K8M890_IGA2_FIFO_MAX_DEPTH;
+                        iga2_fifo_threshold = K8M890_IGA2_FIFO_THRESHOLD;
+                        iga2_fifo_high_threshold =
+                            K8M890_IGA2_FIFO_HIGH_THRESHOLD;
+                        iga2_display_queue_expire_num =
+                            K8M890_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_P4M890) {
+                        iga2_fifo_max_depth = P4M890_IGA2_FIFO_MAX_DEPTH;
+                        iga2_fifo_threshold = P4M890_IGA2_FIFO_THRESHOLD;
+                        iga2_fifo_high_threshold =
+                            P4M890_IGA2_FIFO_HIGH_THRESHOLD;
+                        iga2_display_queue_expire_num =
+                            P4M890_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_P4M900) {
+                        iga2_fifo_max_depth = P4M900_IGA2_FIFO_MAX_DEPTH;
+                        iga2_fifo_threshold = P4M900_IGA2_FIFO_THRESHOLD;
+                        iga2_fifo_high_threshold =
+                            P4M900_IGA2_FIFO_HIGH_THRESHOLD;
+                        iga2_display_queue_expire_num =
+                            P4M900_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_VX800) {
+                        iga2_fifo_max_depth = VX800_IGA2_FIFO_MAX_DEPTH;
+                        iga2_fifo_threshold = VX800_IGA2_FIFO_THRESHOLD;
+                        iga2_fifo_high_threshold =
+                            VX800_IGA2_FIFO_HIGH_THRESHOLD;
+                        iga2_display_queue_expire_num =
+                            VX800_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
+                }
+
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_K800) {
+                        /* Set Display FIFO Depath Select */
+                        reg_value =
+                            IGA2_FIFO_DEPTH_SELECT_FORMULA(iga2_fifo_max_depth)
+                            - 1;
+                        /* Patch LCD in IGA2 case */
+                        viafb_load_reg_num =
+                            display_fifo_depth_reg.
+                            iga2_fifo_depth_select_reg.reg_num;
+                        reg =
+                            display_fifo_depth_reg.
+                            iga2_fifo_depth_select_reg.reg;
+                        viafb_load_reg(reg_value,
+                                viafb_load_reg_num, reg, VIACR);
+                } else {
+
+                        /* Set Display FIFO Depath Select */
+                        reg_value =
+                            IGA2_FIFO_DEPTH_SELECT_FORMULA(iga2_fifo_max_depth);
+                        viafb_load_reg_num =
+                            display_fifo_depth_reg.
+                            iga2_fifo_depth_select_reg.reg_num;
+                        reg =
+                            display_fifo_depth_reg.
+                            iga2_fifo_depth_select_reg.reg;
+                        viafb_load_reg(reg_value,
+                                viafb_load_reg_num, reg, VIACR);
+                }
+
+                /* Set Display FIFO Threshold Select */
+                reg_value = IGA2_FIFO_THRESHOLD_FORMULA(iga2_fifo_threshold);
+                viafb_load_reg_num =
+                    fifo_threshold_select_reg.
+                    iga2_fifo_threshold_select_reg.reg_num;
+                reg =
+                    fifo_threshold_select_reg.
+                    iga2_fifo_threshold_select_reg.reg;
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);
+
+                /* Set FIFO High Threshold Select */
+                reg_value =
+                    IGA2_FIFO_HIGH_THRESHOLD_FORMULA(iga2_fifo_high_threshold);
+                viafb_load_reg_num =
+                    fifo_high_threshold_select_reg.
+                    iga2_fifo_high_threshold_select_reg.reg_num;
+                reg =
+                    fifo_high_threshold_select_reg.
+                    iga2_fifo_high_threshold_select_reg.reg;
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);
+
+                /* Set Display Queue Expire Num */
+                reg_value =
+                    IGA2_DISPLAY_QUEUE_EXPIRE_NUM_FORMULA
+                    (iga2_display_queue_expire_num);
+                viafb_load_reg_num =
+                    display_queue_expire_num_reg.
+                    iga2_display_queue_expire_num_reg.reg_num;
+                reg =
+                    display_queue_expire_num_reg.
+                    iga2_display_queue_expire_num_reg.reg;
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);
+
+        }
+
+}
+
+u32 viafb_get_clk_value(int clk)
+{
+        int i;
+
+        for (i = 0; i < NUM_TOTAL_PLL_TABLE; i++) {
+                if (clk == pll_value[i].clk) {
+                        switch (viaparinfo->chip_info->gfx_chip_name) {
+                        case UNICHROME_CLE266:
+                        case UNICHROME_K400:
+                                return pll_value[i].cle266_pll;
+
+                        case UNICHROME_K800:
+                        case UNICHROME_PM800:
+                        case UNICHROME_CN700:
+                                return pll_value[i].k800_pll;
+
+                        case UNICHROME_CX700:
+                        case UNICHROME_K8M890:
+                        case UNICHROME_P4M890:
+                        case UNICHROME_P4M900:
+                        case UNICHROME_VX800:
+                                return pll_value[i].cx700_pll;
+                        }
+                }
+        }
+
+        DEBUG_MSG(KERN_INFO "Can't find match PLL value\n\n");
+        return 0;
+}
+
+/* Set VCLK*/
+void viafb_set_vclock(u32 CLK, int set_iga)
+{
+        unsigned char RegTemp;
+
+        /* H.W. Reset : ON */
+        viafb_write_reg_mask(CR17, VIACR, 0x00, BIT7);
+
+        if ((set_iga == IGA1) || (set_iga == IGA1_IGA2)) {
+                /* Change D,N FOR VCLK */
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_CLE266:
+                case UNICHROME_K400:
+                        viafb_write_reg(SR46, VIASR, CLK / 0x100);
+                        viafb_write_reg(SR47, VIASR, CLK % 0x100);
+                        break;
+
+                case UNICHROME_K800:
+                case UNICHROME_PM800:
+                case UNICHROME_CN700:
+                case UNICHROME_CX700:
+                case UNICHROME_K8M890:
+                case UNICHROME_P4M890:
+                case UNICHROME_P4M900:
+                case UNICHROME_VX800:
+                        viafb_write_reg(SR44, VIASR, CLK / 0x10000);
+                        DEBUG_MSG(KERN_INFO "\nSR44=%x", CLK / 0x10000);
+                        viafb_write_reg(SR45, VIASR, (CLK & 0xFFFF) / 0x100);
+                        DEBUG_MSG(KERN_INFO "\nSR45=%x",
+                                  (CLK & 0xFFFF) / 0x100);
+                        viafb_write_reg(SR46, VIASR, CLK % 0x100);
+                        DEBUG_MSG(KERN_INFO "\nSR46=%x", CLK % 0x100);
+                        break;
+                }
+        }
+
+        if ((set_iga == IGA2) || (set_iga == IGA1_IGA2)) {
+                /* Change D,N FOR LCK */
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_CLE266:
+                case UNICHROME_K400:
+                        viafb_write_reg(SR44, VIASR, CLK / 0x100);
+                        viafb_write_reg(SR45, VIASR, CLK % 0x100);
+                        break;
+
+                case UNICHROME_K800:
+                case UNICHROME_PM800:
+                case UNICHROME_CN700:
+                case UNICHROME_CX700:
+                case UNICHROME_K8M890:
+                case UNICHROME_P4M890:
+                case UNICHROME_P4M900:
+                case UNICHROME_VX800:
+                        viafb_write_reg(SR4A, VIASR, CLK / 0x10000);
+                        viafb_write_reg(SR4B, VIASR, (CLK & 0xFFFF) / 0x100);
+                        viafb_write_reg(SR4C, VIASR, CLK % 0x100);
+                        break;
+                }
+        }
+
+        /* H.W. Reset : OFF */
+        viafb_write_reg_mask(CR17, VIACR, 0x80, BIT7);
+
+        /* Reset PLL */
+        if ((set_iga == IGA1) || (set_iga == IGA1_IGA2)) {
+                viafb_write_reg_mask(SR40, VIASR, 0x02, BIT1);
+                viafb_write_reg_mask(SR40, VIASR, 0x00, BIT1);
+        }
+
+        if ((set_iga == IGA2) || (set_iga == IGA1_IGA2)) {
+                viafb_write_reg_mask(SR40, VIASR, 0x01, BIT0);
+                viafb_write_reg_mask(SR40, VIASR, 0x00, BIT0);
+        }
+
+        /* Fire! */
+        RegTemp = inb(VIARMisc);
+        outb(RegTemp | (BIT2 + BIT3), VIAWMisc);
+}
+
+void viafb_load_crtc_timing(struct display_timing device_timing,
+        int set_iga)
+{
+        int i;
+        int viafb_load_reg_num = 0;
+        int reg_value = 0;
+        struct io_register *reg = NULL;
+
+        viafb_unlock_crt();
+
+        for (i = 0; i < 12; i++) {
+                if (set_iga == IGA1) {
+                        switch (i) {
+                        case H_TOTAL_INDEX:
+                                reg_value =
+                                    IGA1_HOR_TOTAL_FORMULA(device_timing.
+                                                           hor_total);
+                                viafb_load_reg_num =
+                                        iga1_crtc_reg.hor_total.reg_num;
+                                reg = iga1_crtc_reg.hor_total.reg;
+                                break;
+                        case H_ADDR_INDEX:
+                                reg_value =
+                                    IGA1_HOR_ADDR_FORMULA(device_timing.
+                                                          hor_addr);
+                                viafb_load_reg_num =
+                                        iga1_crtc_reg.hor_addr.reg_num;
+                                reg = iga1_crtc_reg.hor_addr.reg;
+                                break;
+                        case H_BLANK_START_INDEX:
+                                reg_value =
+                                    IGA1_HOR_BLANK_START_FORMULA
+                                    (device_timing.hor_blank_start);
+                                viafb_load_reg_num =
+                                    iga1_crtc_reg.hor_blank_start.reg_num;
+                                reg = iga1_crtc_reg.hor_blank_start.reg;
+                                break;
+                        case H_BLANK_END_INDEX:
+                                reg_value =
+                                    IGA1_HOR_BLANK_END_FORMULA
+                                    (device_timing.hor_blank_start,
+                                     device_timing.hor_blank_end);
+                                viafb_load_reg_num =
+                                    iga1_crtc_reg.hor_blank_end.reg_num;
+                                reg = iga1_crtc_reg.hor_blank_end.reg;
+                                break;
+                        case H_SYNC_START_INDEX:
+                                reg_value =
+                                    IGA1_HOR_SYNC_START_FORMULA
+                                    (device_timing.hor_sync_start);
+                                viafb_load_reg_num =
+                                    iga1_crtc_reg.hor_sync_start.reg_num;
+                                reg = iga1_crtc_reg.hor_sync_start.reg;
+                                break;
+                        case H_SYNC_END_INDEX:
+                                reg_value =
+                                    IGA1_HOR_SYNC_END_FORMULA
+                                    (device_timing.hor_sync_start,
+                                     device_timing.hor_sync_end);
+                                viafb_load_reg_num =
+                                    iga1_crtc_reg.hor_sync_end.reg_num;
+                                reg = iga1_crtc_reg.hor_sync_end.reg;
+                                break;
+                        case V_TOTAL_INDEX:
+                                reg_value =
+                                    IGA1_VER_TOTAL_FORMULA(device_timing.
+                                                           ver_total);
+                                viafb_load_reg_num =
+                                        iga1_crtc_reg.ver_total.reg_num;
+                                reg = iga1_crtc_reg.ver_total.reg;
+                                break;
+                        case V_ADDR_INDEX:
+                                reg_value =
+                                    IGA1_VER_ADDR_FORMULA(device_timing.
+                                                          ver_addr);
+                                viafb_load_reg_num =
+                                        iga1_crtc_reg.ver_addr.reg_num;
+                                reg = iga1_crtc_reg.ver_addr.reg;
+                                break;
+                        case V_BLANK_START_INDEX:
+                                reg_value =
+                                    IGA1_VER_BLANK_START_FORMULA
+                                    (device_timing.ver_blank_start);
+                                viafb_load_reg_num =
+                                    iga1_crtc_reg.ver_blank_start.reg_num;
+                                reg = iga1_crtc_reg.ver_blank_start.reg;
+                                break;
+                        case V_BLANK_END_INDEX:
+                                reg_value =
+                                    IGA1_VER_BLANK_END_FORMULA
+                                    (device_timing.ver_blank_start,
+                                     device_timing.ver_blank_end);
+                                viafb_load_reg_num =
+                                    iga1_crtc_reg.ver_blank_end.reg_num;
+                                reg = iga1_crtc_reg.ver_blank_end.reg;
+                                break;
+                        case V_SYNC_START_INDEX:
+                                reg_value =
+                                    IGA1_VER_SYNC_START_FORMULA
+                                    (device_timing.ver_sync_start);
+                                viafb_load_reg_num =
+                                    iga1_crtc_reg.ver_sync_start.reg_num;
+                                reg = iga1_crtc_reg.ver_sync_start.reg;
+                                break;
+                        case V_SYNC_END_INDEX:
+                                reg_value =
+                                    IGA1_VER_SYNC_END_FORMULA
+                                    (device_timing.ver_sync_start,
+                                     device_timing.ver_sync_end);
+                                viafb_load_reg_num =
+                                    iga1_crtc_reg.ver_sync_end.reg_num;
+                                reg = iga1_crtc_reg.ver_sync_end.reg;
+                                break;
+
+                        }
+                }
+
+                if (set_iga == IGA2) {
+                        switch (i) {
+                        case H_TOTAL_INDEX:
+                                reg_value =
+                                    IGA2_HOR_TOTAL_FORMULA(device_timing.
+                                                           hor_total);
+                                viafb_load_reg_num =
+                                        iga2_crtc_reg.hor_total.reg_num;
+                                reg = iga2_crtc_reg.hor_total.reg;
+                                break;
+                        case H_ADDR_INDEX:
+                                reg_value =
+                                    IGA2_HOR_ADDR_FORMULA(device_timing.
+                                                          hor_addr);
+                                viafb_load_reg_num =
+                                        iga2_crtc_reg.hor_addr.reg_num;
+                                reg = iga2_crtc_reg.hor_addr.reg;
+                                break;
+                        case H_BLANK_START_INDEX:
+                                reg_value =
+                                    IGA2_HOR_BLANK_START_FORMULA
+                                    (device_timing.hor_blank_start);
+                                viafb_load_reg_num =
+                                    iga2_crtc_reg.hor_blank_start.reg_num;
+                                reg = iga2_crtc_reg.hor_blank_start.reg;
+                                break;
+                        case H_BLANK_END_INDEX:
+                                reg_value =
+                                    IGA2_HOR_BLANK_END_FORMULA
+                                    (device_timing.hor_blank_start,
+                                     device_timing.hor_blank_end);
+                                viafb_load_reg_num =
+                                    iga2_crtc_reg.hor_blank_end.reg_num;
+                                reg = iga2_crtc_reg.hor_blank_end.reg;
+                                break;
+                        case H_SYNC_START_INDEX:
+                                reg_value =
+                                    IGA2_HOR_SYNC_START_FORMULA
+                                    (device_timing.hor_sync_start);
+                                if (UNICHROME_CN700 <=
+                                        viaparinfo->chip_info->gfx_chip_name)
+                                        viafb_load_reg_num =
+                                            iga2_crtc_reg.hor_sync_start.
+                                            reg_num;
+                                else
+                                        viafb_load_reg_num = 3;
+                                reg = iga2_crtc_reg.hor_sync_start.reg;
+                                break;
+                        case H_SYNC_END_INDEX:
+                                reg_value =
+                                    IGA2_HOR_SYNC_END_FORMULA
+                                    (device_timing.hor_sync_start,
+                                     device_timing.hor_sync_end);
+                                viafb_load_reg_num =
+                                    iga2_crtc_reg.hor_sync_end.reg_num;
+                                reg = iga2_crtc_reg.hor_sync_end.reg;
+                                break;
+                        case V_TOTAL_INDEX:
+                                reg_value =
+                                    IGA2_VER_TOTAL_FORMULA(device_timing.
+                                                           ver_total);
+                                viafb_load_reg_num =
+                                        iga2_crtc_reg.ver_total.reg_num;
+                                reg = iga2_crtc_reg.ver_total.reg;
+                                break;
+                        case V_ADDR_INDEX:
+                                reg_value =
+                                    IGA2_VER_ADDR_FORMULA(device_timing.
+                                                          ver_addr);
+                                viafb_load_reg_num =
+                                        iga2_crtc_reg.ver_addr.reg_num;
+                                reg = iga2_crtc_reg.ver_addr.reg;
+                                break;
+                        case V_BLANK_START_INDEX:
+                                reg_value =
+                                    IGA2_VER_BLANK_START_FORMULA
+                                    (device_timing.ver_blank_start);
+                                viafb_load_reg_num =
+                                    iga2_crtc_reg.ver_blank_start.reg_num;
+                                reg = iga2_crtc_reg.ver_blank_start.reg;
+                                break;
+                        case V_BLANK_END_INDEX:
+                                reg_value =
+                                    IGA2_VER_BLANK_END_FORMULA
+                                    (device_timing.ver_blank_start,
+                                     device_timing.ver_blank_end);
+                                viafb_load_reg_num =
+                                    iga2_crtc_reg.ver_blank_end.reg_num;
+                                reg = iga2_crtc_reg.ver_blank_end.reg;
+                                break;
+                        case V_SYNC_START_INDEX:
+                                reg_value =
+                                    IGA2_VER_SYNC_START_FORMULA
+                                    (device_timing.ver_sync_start);
+                                viafb_load_reg_num =
+                                    iga2_crtc_reg.ver_sync_start.reg_num;
+                                reg = iga2_crtc_reg.ver_sync_start.reg;
+                                break;
+                        case V_SYNC_END_INDEX:
+                                reg_value =
+                                    IGA2_VER_SYNC_END_FORMULA
+                                    (device_timing.ver_sync_start,
+                                     device_timing.ver_sync_end);
+                                viafb_load_reg_num =
+                                    iga2_crtc_reg.ver_sync_end.reg_num;
+                                reg = iga2_crtc_reg.ver_sync_end.reg;
+                                break;
+
+                        }
+                }
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);
+        }
+
+        viafb_lock_crt();
+}
+
+void viafb_set_color_depth(int bpp_byte, int set_iga)
+{
+        if (set_iga == IGA1) {
+                switch (bpp_byte) {
+                case MODE_8BPP:
+                        viafb_write_reg_mask(SR15, VIASR, 0x22, 0x7E);
+                        break;
+                case MODE_16BPP:
+                        viafb_write_reg_mask(SR15, VIASR, 0xB6, 0xFE);
+                        break;
+                case MODE_32BPP:
+                        viafb_write_reg_mask(SR15, VIASR, 0xAE, 0xFE);
+                        break;
+                }
+        } else {
+                switch (bpp_byte) {
+                case MODE_8BPP:
+                        viafb_write_reg_mask(CR67, VIACR, 0x00, BIT6 + BIT7);
+                        break;
+                case MODE_16BPP:
+                        viafb_write_reg_mask(CR67, VIACR, 0x40, BIT6 + BIT7);
+                        break;
+                case MODE_32BPP:
+                        viafb_write_reg_mask(CR67, VIACR, 0xC0, BIT6 + BIT7);
+                        break;
+                }
+        }
+}
+
+void viafb_fill_crtc_timing(struct crt_mode_table *crt_table,
+        int mode_index, int bpp_byte, int set_iga)
+{
+        struct VideoModeTable *video_mode;
+        struct display_timing crt_reg;
+        int i;
+        int index = 0;
+        int h_addr, v_addr;
+        u32 pll_D_N;
+
+        video_mode = &CLE266Modes[search_mode_setting(mode_index)];
+
+        for (i = 0; i < video_mode->mode_array; i++) {
+                index = i;
+
+                if (crt_table[i].refresh_rate == viaparinfo->
+                        crt_setting_info->refresh_rate)
+                        break;
+        }
+
+        crt_reg = crt_table[index].crtc;
+
+        /* Mode 640x480 has border, but LCD/DFP didn't have border. */
+        /* So we would delete border. */
+        if ((viafb_LCD_ON | viafb_DVI_ON) && (mode_index == VIA_RES_640X480)
+            && (viaparinfo->crt_setting_info->refresh_rate == 60)) {
+                /* The border is 8 pixels. */
+                crt_reg.hor_blank_start = crt_reg.hor_blank_start - 8;
+
+                /* Blanking time should add left and right borders. */
+                crt_reg.hor_blank_end = crt_reg.hor_blank_end + 16;
+        }
+
+        h_addr = crt_reg.hor_addr;
+        v_addr = crt_reg.ver_addr;
+
+        /* update polarity for CRT timing */
+        if (crt_table[index].h_sync_polarity == NEGATIVE) {
+                if (crt_table[index].v_sync_polarity == NEGATIVE)
+                        outb((inb(VIARMisc) & (~(BIT6 + BIT7))) |
+                             (BIT6 + BIT7), VIAWMisc);
+                else
+                        outb((inb(VIARMisc) & (~(BIT6 + BIT7))) | (BIT6),
+                             VIAWMisc);
+        } else {
+                if (crt_table[index].v_sync_polarity == NEGATIVE)
+                        outb((inb(VIARMisc) & (~(BIT6 + BIT7))) | (BIT7),
+                             VIAWMisc);
+                else
+                        outb((inb(VIARMisc) & (~(BIT6 + BIT7))), VIAWMisc);
+        }
+
+        if (set_iga == IGA1) {
+                viafb_unlock_crt();
+                viafb_write_reg(CR09, VIACR, 0x00);     /*initial CR09=0 */
+                viafb_write_reg_mask(CR11, VIACR, 0x00, BIT4 + BIT5 + BIT6);
+                viafb_write_reg_mask(CR17, VIACR, 0x00, BIT7);
+        }
+
+        switch (set_iga) {
+        case IGA1:
+                viafb_load_crtc_timing(crt_reg, IGA1);
+                break;
+        case IGA2:
+                viafb_load_crtc_timing(crt_reg, IGA2);
+                break;
+        }
+
+        load_fix_bit_crtc_reg();
+        viafb_lock_crt();
+        viafb_write_reg_mask(CR17, VIACR, 0x80, BIT7);
+        viafb_load_offset_reg(h_addr, bpp_byte, set_iga);
+        viafb_load_fetch_count_reg(h_addr, bpp_byte, set_iga);
+
+        /* load FIFO */
+        if ((viaparinfo->chip_info->gfx_chip_name != UNICHROME_CLE266)
+            && (viaparinfo->chip_info->gfx_chip_name != UNICHROME_K400))
+                viafb_load_FIFO_reg(set_iga, h_addr, v_addr);
+
+        /* load SR Register About Memory and Color part */
+        viafb_set_color_depth(bpp_byte, set_iga);
+
+        pll_D_N = viafb_get_clk_value(crt_table[index].clk);
+        DEBUG_MSG(KERN_INFO "PLL=%x", pll_D_N);
+        viafb_set_vclock(pll_D_N, set_iga);
+
+}
+
+void viafb_init_chip_info(void)
+{
+        init_gfx_chip_info();
+        init_tmds_chip_info();
+        init_lvds_chip_info();
+
+        viaparinfo->crt_setting_info->iga_path = IGA1;
+        viaparinfo->crt_setting_info->refresh_rate = viafb_refresh;
+
+        /*Set IGA path for each device */
+        viafb_set_iga_path();
+
+        viaparinfo->lvds_setting_info->display_method = viafb_lcd_dsp_method;
+        viaparinfo->lvds_setting_info->get_lcd_size_method =
+                GET_LCD_SIZE_BY_USER_SETTING;
+        viaparinfo->lvds_setting_info->lcd_mode = viafb_lcd_mode;
+        viaparinfo->lvds_setting_info2->display_method =
+                viaparinfo->lvds_setting_info->display_method;
+        viaparinfo->lvds_setting_info2->lcd_mode =
+                viaparinfo->lvds_setting_info->lcd_mode;
+}
+
+void viafb_update_device_setting(int hres, int vres,
+        int bpp, int vmode_refresh, int flag)
+{
+        if (flag == 0) {
+                viaparinfo->crt_setting_info->h_active = hres;
+                viaparinfo->crt_setting_info->v_active = vres;
+                viaparinfo->crt_setting_info->bpp = bpp;
+                viaparinfo->crt_setting_info->refresh_rate =
+                        vmode_refresh;
+
+                viaparinfo->tmds_setting_info->h_active = hres;
+                viaparinfo->tmds_setting_info->v_active = vres;
+                viaparinfo->tmds_setting_info->bpp = bpp;
+                viaparinfo->tmds_setting_info->refresh_rate =
+                        vmode_refresh;
+
+                viaparinfo->lvds_setting_info->h_active = hres;
+                viaparinfo->lvds_setting_info->v_active = vres;
+                viaparinfo->lvds_setting_info->bpp = bpp;
+                viaparinfo->lvds_setting_info->refresh_rate =
+                        vmode_refresh;
+                viaparinfo->lvds_setting_info2->h_active = hres;
+                viaparinfo->lvds_setting_info2->v_active = vres;
+                viaparinfo->lvds_setting_info2->bpp = bpp;
+                viaparinfo->lvds_setting_info2->refresh_rate =
+                        vmode_refresh;
+        } else {
+
+                if (viaparinfo->tmds_setting_info->iga_path == IGA2) {
+                        viaparinfo->tmds_setting_info->h_active = hres;
+                        viaparinfo->tmds_setting_info->v_active = vres;
+                        viaparinfo->tmds_setting_info->bpp = bpp;
+                        viaparinfo->tmds_setting_info->refresh_rate =
+                                vmode_refresh;
+                }
+
+                if (viaparinfo->lvds_setting_info->iga_path == IGA2) {
+                        viaparinfo->lvds_setting_info->h_active = hres;
+                        viaparinfo->lvds_setting_info->v_active = vres;
+                        viaparinfo->lvds_setting_info->bpp = bpp;
+                        viaparinfo->lvds_setting_info->refresh_rate =
+                                vmode_refresh;
+                }
+                if (IGA2 == viaparinfo->lvds_setting_info2->iga_path) {
+                        viaparinfo->lvds_setting_info2->h_active = hres;
+                        viaparinfo->lvds_setting_info2->v_active = vres;
+                        viaparinfo->lvds_setting_info2->bpp = bpp;
+                        viaparinfo->lvds_setting_info2->refresh_rate =
+                                vmode_refresh;
+                }
+        }
+}
+
+static void init_gfx_chip_info(void)
+{
+        struct pci_dev *pdev = NULL;
+        u32 i;
+        u8 tmp;
+
+        /* Indentify GFX Chip Name */
+        for (i = 0; pciidlist[i].vendor != 0; i++) {
+                pdev = pci_get_device(pciidlist[i].vendor,
+                        pciidlist[i].device, 0);
+                if (pdev)
+                        break;
+        }
+
+        if (!pciidlist[i].vendor)
+                return ;
+
+        viaparinfo->chip_info->gfx_chip_name = pciidlist[i].chip_index;
+
+        /* Check revision of CLE266 Chip */
+        if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266) {
+                /* CR4F only define in CLE266.CX chip */
+                tmp = viafb_read_reg(VIACR, CR4F);
+                viafb_write_reg(CR4F, VIACR, 0x55);
+                if (viafb_read_reg(VIACR, CR4F) != 0x55)
+                        viaparinfo->chip_info->gfx_chip_revision =
+                        CLE266_REVISION_AX;
+                else
+                        viaparinfo->chip_info->gfx_chip_revision =
+                        CLE266_REVISION_CX;
+                /* restore orignal CR4F value */
+                viafb_write_reg(CR4F, VIACR, tmp);
+        }
+
+        if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CX700) {
+                tmp = viafb_read_reg(VIASR, SR43);
+                DEBUG_MSG(KERN_INFO "SR43:%X\n", tmp);
+                if (tmp & 0x02) {
+                        viaparinfo->chip_info->gfx_chip_revision =
+                                CX700_REVISION_700M2;
+                } else if (tmp & 0x40) {
+                        viaparinfo->chip_info->gfx_chip_revision =
+                                CX700_REVISION_700M;
+                } else {
+                        viaparinfo->chip_info->gfx_chip_revision =
+                                CX700_REVISION_700;
+                }
+        }
+
+        pci_dev_put(pdev);
+}
+
+static void init_tmds_chip_info(void)
+{
+        viafb_tmds_trasmitter_identify();
+
+        if (INTERFACE_NONE == viaparinfo->chip_info->tmds_chip_info.
+                output_interface) {
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_CX700:
+                        {
+                                /* we should check support by hardware layout.*/
+                                if ((viafb_display_hardware_layout ==
+                                     HW_LAYOUT_DVI_ONLY)
+                                    || (viafb_display_hardware_layout ==
+                                        HW_LAYOUT_LCD_DVI)) {
+                                        viaparinfo->chip_info->tmds_chip_info.
+                                            output_interface = INTERFACE_TMDS;
+                                } else {
+                                        viaparinfo->chip_info->tmds_chip_info.
+                                                output_interface =
+                                                INTERFACE_NONE;
+                                }
+                                break;
+                        }
+                case UNICHROME_K8M890:
+                case UNICHROME_P4M900:
+                case UNICHROME_P4M890:
+                        /* TMDS on PCIE, we set DFPLOW as default. */
+                        viaparinfo->chip_info->tmds_chip_info.output_interface =
+                            INTERFACE_DFP_LOW;
+                        break;
+                default:
+                        {
+                                /* set DVP1 default for DVI */
+                                viaparinfo->chip_info->tmds_chip_info
+                                .output_interface = INTERFACE_DVP1;
+                        }
+                }
+        }
+
+        DEBUG_MSG(KERN_INFO "TMDS Chip = %d\n",
+                  viaparinfo->chip_info->tmds_chip_info.tmds_chip_name);
+        viaparinfo->tmds_setting_info->get_dvi_size_method =
+                GET_DVI_SIZE_BY_VGA_BIOS;
+        viafb_init_dvi_size();
+}
+
+static void init_lvds_chip_info(void)
+{
+        if (viafb_lcd_panel_id > LCD_PANEL_ID_MAXIMUM)
+                viaparinfo->lvds_setting_info->get_lcd_size_method =
+                    GET_LCD_SIZE_BY_VGA_BIOS;
+        else
+                viaparinfo->lvds_setting_info->get_lcd_size_method =
+                    GET_LCD_SIZE_BY_USER_SETTING;
+
+        viafb_lvds_trasmitter_identify();
+        viafb_init_lcd_size();
+        viafb_init_lvds_output_interface(&viaparinfo->chip_info->lvds_chip_info,
+                                   viaparinfo->lvds_setting_info);
+        if (viaparinfo->chip_info->lvds_chip_info2.lvds_chip_name) {
+                viafb_init_lvds_output_interface(&viaparinfo->chip_info->
+                        lvds_chip_info2, viaparinfo->lvds_setting_info2);
+        }
+        /*If CX700,two singel LCD, we need to reassign
+           LCD interface to different LVDS port */
+        if ((UNICHROME_CX700 == viaparinfo->chip_info->gfx_chip_name)
+            && (HW_LAYOUT_LCD1_LCD2 == viafb_display_hardware_layout)) {
+                if ((INTEGRATED_LVDS == viaparinfo->chip_info->lvds_chip_info.
+                        lvds_chip_name) && (INTEGRATED_LVDS ==
+                        viaparinfo->chip_info->
+                        lvds_chip_info2.lvds_chip_name)) {
+                        viaparinfo->chip_info->lvds_chip_info.output_interface =
+                                INTERFACE_LVDS0;
+                        viaparinfo->chip_info->lvds_chip_info2.
+                                output_interface =
+                            INTERFACE_LVDS1;
+                }
+        }
+
+        DEBUG_MSG(KERN_INFO "LVDS Chip = %d\n",
+                  viaparinfo->chip_info->lvds_chip_info.lvds_chip_name);
+        DEBUG_MSG(KERN_INFO "LVDS1 output_interface = %d\n",
+                  viaparinfo->chip_info->lvds_chip_info.output_interface);
+        DEBUG_MSG(KERN_INFO "LVDS2 output_interface = %d\n",
+                  viaparinfo->chip_info->lvds_chip_info.output_interface);
+}
+
+void viafb_init_dac(int set_iga)
+{
+        int i;
+        u8 tmp;
+
+        if (set_iga == IGA1) {
+                /* access Primary Display's LUT */
+                viafb_write_reg_mask(SR1A, VIASR, 0x00, BIT0);
+                /* turn off LCK */
+                viafb_write_reg_mask(SR1B, VIASR, 0x00, BIT7 + BIT6);
+                for (i = 0; i < 256; i++) {
+                        write_dac_reg(i, palLUT_table[i].red,
+                                      palLUT_table[i].green,
+                                      palLUT_table[i].blue);
+                }
+                /* turn on LCK */
+                viafb_write_reg_mask(SR1B, VIASR, 0xC0, BIT7 + BIT6);
+        } else {
+                tmp = viafb_read_reg(VIACR, CR6A);
+                /* access Secondary Display's LUT */
+                viafb_write_reg_mask(CR6A, VIACR, 0x40, BIT6);
+                viafb_write_reg_mask(SR1A, VIASR, 0x01, BIT0);
+                for (i = 0; i < 256; i++) {
+                        write_dac_reg(i, palLUT_table[i].red,
+                                      palLUT_table[i].green,
+                                      palLUT_table[i].blue);
+                }
+                /* set IGA1 DAC for default */
+                viafb_write_reg_mask(SR1A, VIASR, 0x00, BIT0);
+                viafb_write_reg(CR6A, VIACR, tmp);
+        }
+}
+
+static void device_screen_off(void)
+{
+        /* turn off CRT screen (IGA1) */
+        viafb_write_reg_mask(SR01, VIASR, 0x20, BIT5);
+}
+
+static void device_screen_on(void)
+{
+        /* turn on CRT screen (IGA1) */
+        viafb_write_reg_mask(SR01, VIASR, 0x00, BIT5);
+}
+
+static void set_display_channel(void)
+{
+        /*If viafb_LCD2_ON, on cx700, internal lvds's information
+        is keeped on lvds_setting_info2 */
+        if (viafb_LCD2_ON &&
+                viaparinfo->lvds_setting_info2->device_lcd_dualedge) {
+                /* For dual channel LCD: */
+                /* Set to Dual LVDS channel. */
+                viafb_write_reg_mask(CRD2, VIACR, 0x20, BIT4 + BIT5);
+        } else if (viafb_LCD_ON && viafb_DVI_ON) {
+                /* For LCD+DFP: */
+                /* Set to LVDS1 + TMDS channel. */
+                viafb_write_reg_mask(CRD2, VIACR, 0x10, BIT4 + BIT5);
+        } else if (viafb_DVI_ON) {
+                /* Set to single TMDS channel. */
+                viafb_write_reg_mask(CRD2, VIACR, 0x30, BIT4 + BIT5);
+        } else if (viafb_LCD_ON) {
+                if (viaparinfo->lvds_setting_info->device_lcd_dualedge) {
+                        /* For dual channel LCD: */
+                        /* Set to Dual LVDS channel. */
+                        viafb_write_reg_mask(CRD2, VIACR, 0x20, BIT4 + BIT5);
+                } else {
+                        /* Set to LVDS0 + LVDS1 channel. */
+                        viafb_write_reg_mask(CRD2, VIACR, 0x00, BIT4 + BIT5);
+                }
+        }
+}
+
+int viafb_setmode(int vmode_index, int hor_res, int ver_res, int video_bpp,
+        int vmode_index1, int hor_res1, int ver_res1, int video_bpp1)
+{
+        int i, j;
+        int port;
+        u8 value, index, mask;
+        struct VideoModeTable *vmode_tbl;
+        struct crt_mode_table *crt_timing;
+        struct VideoModeTable *vmode_tbl1 = NULL;
+        struct crt_mode_table *crt_timing1 = NULL;
+
+        DEBUG_MSG(KERN_INFO "Set Mode!!\n");
+        DEBUG_MSG(KERN_INFO
+                  "vmode_index=%d hor_res=%d ver_res=%d video_bpp=%d\n",
+                  vmode_index, hor_res, ver_res, video_bpp);
+
+        device_screen_off();
+        vmode_tbl = &CLE266Modes[search_mode_setting(vmode_index)];
+        crt_timing = vmode_tbl->crtc;
+
+        if (viafb_SAMM_ON == 1) {
+                vmode_tbl1 = &CLE266Modes[search_mode_setting(vmode_index1)];
+                crt_timing1 = vmode_tbl1->crtc;
+        }
+
+        inb(VIAStatus);
+        outb(0x00, VIAAR);
+
+        /* Write Common Setting for Video Mode */
+        switch (viaparinfo->chip_info->gfx_chip_name) {
+        case UNICHROME_CLE266:
+                viafb_write_regx(CLE266_ModeXregs, NUM_TOTAL_CLE266_ModeXregs);
+                break;
+
+        case UNICHROME_K400:
+                viafb_write_regx(KM400_ModeXregs, NUM_TOTAL_KM400_ModeXregs);
+                break;
+
+        case UNICHROME_K800:
+        case UNICHROME_PM800:
+                viafb_write_regx(CN400_ModeXregs, NUM_TOTAL_CN400_ModeXregs);
+                break;
+
+        case UNICHROME_CN700:
+        case UNICHROME_K8M890:
+        case UNICHROME_P4M890:
+        case UNICHROME_P4M900:
+                viafb_write_regx(CN700_ModeXregs, NUM_TOTAL_CN700_ModeXregs);
+                break;
+
+        case UNICHROME_CX700:
+                viafb_write_regx(CX700_ModeXregs, NUM_TOTAL_CX700_ModeXregs);
+
+        case UNICHROME_VX800:
+                viafb_write_regx(VX800_ModeXregs, NUM_TOTAL_VX800_ModeXregs);
+
+                break;
+        }
+
+        device_off();
+
+        /* Fill VPIT Parameters */
+        /* Write Misc Register */
+        outb(VPIT.Misc, VIAWMisc);
+
+        /* Write Sequencer */
+        for (i = 1; i <= StdSR; i++) {
+                outb(i, VIASR);
+                outb(VPIT.SR[i - 1], VIASR + 1);
+        }
+
+        viafb_set_start_addr();
+        viafb_set_iga_path();
+
+        /* Write CRTC */
+        viafb_fill_crtc_timing(crt_timing, vmode_index, video_bpp / 8, IGA1);
+
+        /* Write Graphic Controller */
+        for (i = 0; i < StdGR; i++) {
+                outb(i, VIAGR);
+                outb(VPIT.GR[i], VIAGR + 1);
+        }
+
+        /* Write Attribute Controller */
+        for (i = 0; i < StdAR; i++) {
+                inb(VIAStatus);
+                outb(i, VIAAR);
+                outb(VPIT.AR[i], VIAAR);
+        }
+
+        inb(VIAStatus);
+        outb(0x20, VIAAR);
+
+        /* Update Patch Register */
+
+        if ((viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266)
+            || (viaparinfo->chip_info->gfx_chip_name == UNICHROME_K400)) {
+                for (i = 0; i < NUM_TOTAL_PATCH_MODE; i++) {
+                        if (res_patch_table[i].mode_index == vmode_index) {
+                                for (j = 0;
+                                     j < res_patch_table[i].table_length; j++) {
+                                        index =
+                                            res_patch_table[i].
+                                            io_reg_table[j].index;
+                                        port =
+                                            res_patch_table[i].
+                                            io_reg_table[j].port;
+                                        value =
+                                            res_patch_table[i].
+                                            io_reg_table[j].value;
+                                        mask =
+                                            res_patch_table[i].
+                                            io_reg_table[j].mask;
+                                        viafb_write_reg_mask(index, port, value,
+                                                       mask);
+                                }
+                        }
+                }
+        }
+
+        if (viafb_SAMM_ON == 1) {
+                if ((viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266)
+                    || (viaparinfo->chip_info->gfx_chip_name ==
+                    UNICHROME_K400)) {
+                        for (i = 0; i < NUM_TOTAL_PATCH_MODE; i++) {
+                                if (res_patch_table[i].mode_index ==
+                                    vmode_index1) {
+                                        for (j = 0;
+                                             j <
+                                             res_patch_table[i].
+                                             table_length; j++) {
+                                                index =
+                                                    res_patch_table[i].
+                                                    io_reg_table[j].index;
+                                                port =
+                                                    res_patch_table[i].
+                                                    io_reg_table[j].port;
+                                                value =
+                                                    res_patch_table[i].
+                                                    io_reg_table[j].value;
+                                                mask =
+                                                    res_patch_table[i].
+                                                    io_reg_table[j].mask;
+                                                viafb_write_reg_mask(index,
+                                                        port, value, mask);
+                                        }
+                                }
+                        }
+                }
+        }
+
+        /* Update Refresh Rate Setting */
+
+        /* Clear On Screen */
+
+        /* CRT set mode */
+        if (viafb_CRT_ON) {
+                if (viafb_SAMM_ON && (viaparinfo->crt_setting_info->iga_path ==
+                        IGA2)) {
+                        viafb_fill_crtc_timing(crt_timing1, vmode_index1,
+                                video_bpp1 / 8,
+                                viaparinfo->crt_setting_info->iga_path);
+                } else {
+                        viafb_fill_crtc_timing(crt_timing, vmode_index,
+                                video_bpp / 8,
+                                viaparinfo->crt_setting_info->iga_path);
+                }
+
+                set_crt_output_path(viaparinfo->crt_setting_info->iga_path);
+
+                /* Patch if set_hres is not 8 alignment (1366) to viafb_setmode
+                to 8 alignment (1368),there is several pixels (2 pixels)
+                on right side of screen. */
+                if (hor_res % 8) {
+                        viafb_unlock_crt();
+                        viafb_write_reg(CR02, VIACR,
+                                viafb_read_reg(VIACR, CR02) - 1);
+                        viafb_lock_crt();
+                }
+        }
+
+        if (viafb_DVI_ON) {
+                if (viafb_SAMM_ON &&
+                        (viaparinfo->tmds_setting_info->iga_path == IGA2)) {
+                        viafb_dvi_set_mode(viafb_get_mode_index
+                                     (viaparinfo->tmds_setting_info->h_active,
+                                      viaparinfo->tmds_setting_info->
+                                      v_active, 1),
+                                     video_bpp1, viaparinfo->
+                                     tmds_setting_info->iga_path);
+                } else {
+                        viafb_dvi_set_mode(viafb_get_mode_index
+                                     (viaparinfo->tmds_setting_info->h_active,
+                                      viaparinfo->
+                                      tmds_setting_info->v_active, 0),
+                                     video_bpp, viaparinfo->
+                                     tmds_setting_info->iga_path);
+                }
+        }
+
+        if (viafb_LCD_ON) {
+                if (viafb_SAMM_ON &&
+                        (viaparinfo->lvds_setting_info->iga_path == IGA2)) {
+                        viaparinfo->lvds_setting_info->bpp = video_bpp1;
+                        viafb_lcd_set_mode(crt_timing1, viaparinfo->
+                                lvds_setting_info,
+                                     &viaparinfo->chip_info->lvds_chip_info);
+                } else {
+                        /* IGA1 doesn't have LCD scaling, so set it center. */
+                        if (viaparinfo->lvds_setting_info->iga_path == IGA1) {
+                                viaparinfo->lvds_setting_info->display_method =
+                                    LCD_CENTERING;
+                        }
+                        viaparinfo->lvds_setting_info->bpp = video_bpp;
+                        viafb_lcd_set_mode(crt_timing, viaparinfo->
+                                lvds_setting_info,
+                                     &viaparinfo->chip_info->lvds_chip_info);
+                }
+        }
+        if (viafb_LCD2_ON) {
+                if (viafb_SAMM_ON &&
+                        (viaparinfo->lvds_setting_info2->iga_path == IGA2)) {
+                        viaparinfo->lvds_setting_info2->bpp = video_bpp1;
+                        viafb_lcd_set_mode(crt_timing1, viaparinfo->
+                                lvds_setting_info2,
+                                     &viaparinfo->chip_info->lvds_chip_info2);
+                } else {
+                        /* IGA1 doesn't have LCD scaling, so set it center. */
+                        if (viaparinfo->lvds_setting_info2->iga_path == IGA1) {
+                                viaparinfo->lvds_setting_info2->display_method =
+                                    LCD_CENTERING;
+                        }
+                        viaparinfo->lvds_setting_info2->bpp = video_bpp;
+                        viafb_lcd_set_mode(crt_timing, viaparinfo->
+                                lvds_setting_info2,
+                                     &viaparinfo->chip_info->lvds_chip_info2);
+                }
+        }
+
+        if ((viaparinfo->chip_info->gfx_chip_name == UNICHROME_CX700)
+            && (viafb_LCD_ON || viafb_DVI_ON))
+                set_display_channel();
+
+        /* If set mode normally, save resolution information for hot-plug . */
+        if (!viafb_hotplug) {
+                viafb_hotplug_Xres = hor_res;
+                viafb_hotplug_Yres = ver_res;
+                viafb_hotplug_bpp = video_bpp;
+                viafb_hotplug_refresh = viafb_refresh;
+
+                if (viafb_DVI_ON)
+                        viafb_DeviceStatus = DVI_Device;
+                else
+                        viafb_DeviceStatus = CRT_Device;
+        }
+        device_on();
+
+        if (viafb_SAMM_ON == 1)
+                viafb_write_reg_mask(CR6A, VIACR, 0xC0, BIT6 + BIT7);
+
+        device_screen_on();
+        return 1;
+}
+
+int viafb_get_pixclock(int hres, int vres, int vmode_refresh)
+{
+        int i;
+
+        for (i = 0; i < NUM_TOTAL_RES_MAP_REFRESH; i++) {
+                if ((hres == res_map_refresh_tbl[i].hres)
+                    && (vres == res_map_refresh_tbl[i].vres)
+                    && (vmode_refresh == res_map_refresh_tbl[i].vmode_refresh))
+                        return res_map_refresh_tbl[i].pixclock;
+        }
+        return RES_640X480_60HZ_PIXCLOCK;
+
+}
+
+int viafb_get_refresh(int hres, int vres, u32 long_refresh)
+{
+#define REFRESH_TOLERANCE 3
+        int i, nearest = -1, diff = REFRESH_TOLERANCE;
+        for (i = 0; i < NUM_TOTAL_RES_MAP_REFRESH; i++) {
+                if ((hres == res_map_refresh_tbl[i].hres)
+                    && (vres == res_map_refresh_tbl[i].vres)
+                    && (diff > (abs(long_refresh -
+                    res_map_refresh_tbl[i].vmode_refresh)))) {
+                        diff = abs(long_refresh - res_map_refresh_tbl[i].
+                                vmode_refresh);
+                        nearest = i;
+                }
+        }
+#undef REFRESH_TOLERANCE
+        if (nearest > 0)
+                return res_map_refresh_tbl[nearest].vmode_refresh;
+        return 60;
+}
+
+static void device_off(void)
+{
+        viafb_crt_disable();
+        viafb_dvi_disable();
+        viafb_lcd_disable();
+}
+
+static void device_on(void)
+{
+        if (viafb_CRT_ON == 1)
+                viafb_crt_enable();
+        if (viafb_DVI_ON == 1)
+                viafb_dvi_enable();
+        if (viafb_LCD_ON == 1)
+                viafb_lcd_enable();
+}
+
+void viafb_crt_disable(void)
+{
+        viafb_write_reg_mask(CR36, VIACR, BIT5 + BIT4, BIT5 + BIT4);
+}
+
+void viafb_crt_enable(void)
+{
+        viafb_write_reg_mask(CR36, VIACR, 0x0, BIT5 + BIT4);
+}
+
+void viafb_get_mmio_info(unsigned long *mmio_base,
+        unsigned long *mmio_len)
+{
+        struct pci_dev *pdev = NULL;
+        u32 vendor, device;
+        u32 i;
+
+        for (i = 0; pciidlist[i].vendor != 0; i++)
+                if (viaparinfo->chip_info->gfx_chip_name ==
+                        pciidlist[i].chip_index)
+                        break;
+
+        if (!pciidlist[i].vendor)
+                return ;
+
+        vendor = pciidlist[i].vendor;
+        device = pciidlist[i].device;
+
+        pdev = pci_get_device(vendor, device, NULL);
+
+        if (!pdev) {
+                *mmio_base = 0;
+                *mmio_len = 0;
+                return ;
+        }
+
+        *mmio_base = pci_resource_start(pdev, 1);
+        *mmio_len = pci_resource_len(pdev, 1);
+
+        pci_dev_put(pdev);
+}
+
+static void enable_second_display_channel(void)
+{
+        /* to enable second display channel. */
+        viafb_write_reg_mask(CR6A, VIACR, 0x00, BIT6);
+        viafb_write_reg_mask(CR6A, VIACR, BIT7, BIT7);
+        viafb_write_reg_mask(CR6A, VIACR, BIT6, BIT6);
+}
+
+static void disable_second_display_channel(void)
+{
+        /* to disable second display channel. */
+        viafb_write_reg_mask(CR6A, VIACR, 0x00, BIT6);
+        viafb_write_reg_mask(CR6A, VIACR, 0x00, BIT7);
+        viafb_write_reg_mask(CR6A, VIACR, BIT6, BIT6);
+}
+
+void viafb_get_fb_info(unsigned int *fb_base, unsigned int *fb_len)
+{
+        struct pci_dev *pdev = NULL;
+        u32 vendor, device;
+        u32 i;
+
+        for (i = 0; pciidlist[i].vendor != 0; i++)
+                if (viaparinfo->chip_info->gfx_chip_name ==
+                        pciidlist[i].chip_index)
+                        break;
+
+        if (!pciidlist[i].vendor)
+                return ;
+
+        vendor = pciidlist[i].vendor;
+        device = pciidlist[i].device;
+
+        pdev = pci_get_device(vendor, device, NULL);
+
+        if (!pdev) {
+                *fb_base = viafb_read_reg(VIASR, SR30) << 24;
+                *fb_len = viafb_get_memsize();
+                DEBUG_MSG(KERN_INFO "Get FB info from SR30!\n");
+                DEBUG_MSG(KERN_INFO "fb_base = %08x\n", *fb_base);
+                DEBUG_MSG(KERN_INFO "fb_len = %08x\n", *fb_len);
+                return ;
+        }
+
+        *fb_base = (unsigned int)pci_resource_start(pdev, 0);
+        *fb_len = get_fb_size_from_pci();
+        DEBUG_MSG(KERN_INFO "Get FB info from PCI system!\n");
+        DEBUG_MSG(KERN_INFO "fb_base = %08x\n", *fb_base);
+        DEBUG_MSG(KERN_INFO "fb_len = %08x\n", *fb_len);
+
+        pci_dev_put(pdev);
+}
+
+static int get_fb_size_from_pci(void)
+{
+        unsigned long configid, deviceid, FBSize = 0;
+        int VideoMemSize;
+        int DeviceFound = false;
+
+        for (configid = 0x80000000; configid < 0x80010800; configid += 0x100) {
+                outl(configid, (unsigned long)0xCF8);
+                deviceid = (inl((unsigned long)0xCFC) >> 16) & 0xffff;
+
+                switch (deviceid) {
+                case CLE266:
+                case KM400:
+                        outl(configid + 0xE0, (unsigned long)0xCF8);
+                        FBSize = inl((unsigned long)0xCFC);
+                        DeviceFound = true;     /* Found device id */
+                        break;
+
+                case CN400_FUNCTION3:
+                case CN700_FUNCTION3:
+                case CX700_FUNCTION3:
+                case KM800_FUNCTION3:
+                case KM890_FUNCTION3:
+                case P4M890_FUNCTION3:
+                case P4M900_FUNCTION3:
+                case VX800_FUNCTION3:
+                        /*case CN750_FUNCTION3: */
+                        outl(configid + 0xA0, (unsigned long)0xCF8);
+                        FBSize = inl((unsigned long)0xCFC);
+                        DeviceFound = true;     /* Found device id */
+                        break;
+
+                default:
+                        break;
+                }
+
+                if (DeviceFound)
+                        break;
+        }
+
+        DEBUG_MSG(KERN_INFO "Device ID = %lx\n", deviceid);
+
+        FBSize = FBSize & 0x00007000;
+        DEBUG_MSG(KERN_INFO "FB Size = %x\n", FBSize);
+
+        if (viaparinfo->chip_info->gfx_chip_name < UNICHROME_CX700) {
+                switch (FBSize) {
+                case 0x00004000:
+                        VideoMemSize = (16 << 20);      /*16M */
+                        break;
+
+                case 0x00005000:
+                        VideoMemSize = (32 << 20);      /*32M */
+                        break;
+
+                case 0x00006000:
+                        VideoMemSize = (64 << 20);      /*64M */
+                        break;
+
+                default:
+                        VideoMemSize = (32 << 20);      /*32M */
+                        break;
+                }
+        } else {
+                switch (FBSize) {
+                case 0x00001000:
+                        VideoMemSize = (8 << 20);       /*8M */
+                        break;
+
+                case 0x00002000:
+                        VideoMemSize = (16 << 20);      /*16M */
+                        break;
+
+                case 0x00003000:
+                        VideoMemSize = (32 << 20);      /*32M */
+                        break;
+
+                case 0x00004000:
+                        VideoMemSize = (64 << 20);      /*64M */
+                        break;
+
+                case 0x00005000:
+                        VideoMemSize = (128 << 20);     /*128M */
+                        break;
+
+                case 0x00006000:
+                        VideoMemSize = (256 << 20);     /*256M */
+                        break;
+
+                default:
+                        VideoMemSize = (32 << 20);      /*32M */
+                        break;
+                }
+        }
+
+        return VideoMemSize;
+}
+
+void viafb_set_dpa_gfx(int output_interface, struct GFX_DPA_SETTING\
+                                        *p_gfx_dpa_setting)
+{
+        switch (output_interface) {
+        case INTERFACE_DVP0:
+                {
+                        /* DVP0 Clock Polarity and Adjust: */
+                        viafb_write_reg_mask(CR96, VIACR,
+                                       p_gfx_dpa_setting->DVP0, 0x0F);
+
+                        /* DVP0 Clock and Data Pads Driving: */
+                        viafb_write_reg_mask(SR1E, VIASR,
+                                       p_gfx_dpa_setting->DVP0ClockDri_S, BIT2);
+                        viafb_write_reg_mask(SR2A, VIASR,
+                                       p_gfx_dpa_setting->DVP0ClockDri_S1,
+                                       BIT4);
+                        viafb_write_reg_mask(SR1B, VIASR,
+                                       p_gfx_dpa_setting->DVP0DataDri_S, BIT1);
+                        viafb_write_reg_mask(SR2A, VIASR,
+                                       p_gfx_dpa_setting->DVP0DataDri_S1, BIT5);
+                        break;
+                }
+
+        case INTERFACE_DVP1:
+                {
+                        /* DVP1 Clock Polarity and Adjust: */
+                        viafb_write_reg_mask(CR9B, VIACR,
+                                       p_gfx_dpa_setting->DVP1, 0x0F);
+
+                        /* DVP1 Clock and Data Pads Driving: */
+                        viafb_write_reg_mask(SR65, VIASR,
+                                       p_gfx_dpa_setting->DVP1Driving, 0x0F);
+                        break;
+                }
+
+        case INTERFACE_DFP_HIGH:
+                {
+                        viafb_write_reg_mask(CR97, VIACR,
+                                       p_gfx_dpa_setting->DFPHigh, 0x0F);
+                        break;
+                }
+
+        case INTERFACE_DFP_LOW:
+                {
+                        viafb_write_reg_mask(CR99, VIACR,
+                                       p_gfx_dpa_setting->DFPLow, 0x0F);
+                        break;
+                }
+
+        case INTERFACE_DFP:
+                {
+                        viafb_write_reg_mask(CR97, VIACR,
+                                       p_gfx_dpa_setting->DFPHigh, 0x0F);
+                        viafb_write_reg_mask(CR99, VIACR,
+                                       p_gfx_dpa_setting->DFPLow, 0x0F);
+                        break;
+                }
+        }
+}
+
+void viafb_memory_pitch_patch(struct fb_info *info)
+{
+        if (info->var.xres != info->var.xres_virtual) {
+                viafb_load_offset_reg(info->var.xres_virtual,
+                                info->var.bits_per_pixel >> 3, IGA1);
+
+                if (viafb_SAMM_ON) {
+                        viafb_load_offset_reg(viafb_second_virtual_xres,
+                                viafb_bpp1 >> 3,
+                                        IGA2);
+                } else {
+                        viafb_load_offset_reg(info->var.xres_virtual,
+                                        info->var.bits_per_pixel >> 3, IGA2);
+                }
+
+        }
+}
+
+/*According var's xres, yres fill var's other timing information*/
+void viafb_fill_var_timing_info(struct fb_var_screeninfo *var, int refresh,
+                          int mode_index)
+{
+        struct VideoModeTable *vmode_tbl = NULL;
+        struct crt_mode_table *crt_timing = NULL;
+        struct display_timing crt_reg;
+        int i = 0, index = 0;
+        vmode_tbl = &CLE266Modes[search_mode_setting(mode_index)];
+        crt_timing = vmode_tbl->crtc;
+        for (i = 0; i < vmode_tbl->mode_array; i++) {
+                index = i;
+                if (crt_timing[i].refresh_rate == refresh)
+                        break;
+        }
+
+        crt_reg = crt_timing[index].crtc;
+        switch (var->bits_per_pixel) {
+        case 8:
+                var->red.offset = 0;
+                var->green.offset = 0;
+                var->blue.offset = 0;
+                var->red.length = 6;
+                var->green.length = 6;
+                var->blue.length = 6;
+                break;
+        case 16:
+                var->red.offset = 11;
+                var->green.offset = 5;
+                var->blue.offset = 0;
+                var->red.length = 5;
+                var->green.length = 6;
+                var->blue.length = 5;
+                break;
+        case 32:
+                var->red.offset = 16;
+                var->green.offset = 8;
+                var->blue.offset = 0;
+                var->red.length = 8;
+                var->green.length = 8;
+                var->blue.length = 8;
+                break;
+        default:
+                /* never happed, put here to keep consistent */
+                break;
+        }
+
+        var->pixclock = viafb_get_pixclock(var->xres, var->yres, refresh);
+        var->left_margin =
+            crt_reg.hor_total - (crt_reg.hor_sync_start + crt_reg.hor_sync_end);
+        var->right_margin = crt_reg.hor_sync_start - crt_reg.hor_addr;
+        var->hsync_len = crt_reg.hor_sync_end;
+        var->upper_margin =
+            crt_reg.ver_total - (crt_reg.ver_sync_start + crt_reg.ver_sync_end);
+        var->lower_margin = crt_reg.ver_sync_start - crt_reg.ver_addr;
+        var->vsync_len = crt_reg.ver_sync_end;
+}
diff --git a/drivers/video/via/hw.h b/drivers/video/via/hw.h
new file mode 100644
index 000000000000..6ff38fa8569a
--- /dev/null
+++ b/drivers/video/via/hw.h
@@ -0,0 +1,933 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __HW_H__
+#define __HW_H__
+
+#include "global.h"
+
+/***************************************************
+* Definition IGA1 Design Method of CRTC Registers *
+****************************************************/
+#define IGA1_HOR_TOTAL_FORMULA(x)           (((x)/8)-5)
+#define IGA1_HOR_ADDR_FORMULA(x)            (((x)/8)-1)
+#define IGA1_HOR_BLANK_START_FORMULA(x)     (((x)/8)-1)
+#define IGA1_HOR_BLANK_END_FORMULA(x, y)     (((x+y)/8)-1)
+#define IGA1_HOR_SYNC_START_FORMULA(x)      ((x)/8)
+#define IGA1_HOR_SYNC_END_FORMULA(x, y)      ((x+y)/8)
+
+#define IGA1_VER_TOTAL_FORMULA(x)           ((x)-2)
+#define IGA1_VER_ADDR_FORMULA(x)            ((x)-1)
+#define IGA1_VER_BLANK_START_FORMULA(x)     ((x)-1)
+#define IGA1_VER_BLANK_END_FORMULA(x, y)     ((x+y)-1)
+#define IGA1_VER_SYNC_START_FORMULA(x)      ((x)-1)
+#define IGA1_VER_SYNC_END_FORMULA(x, y)      ((x+y)-1)
+
+/***************************************************
+** Definition IGA2 Design Method of CRTC Registers *
+****************************************************/
+#define IGA2_HOR_TOTAL_FORMULA(x)           ((x)-1)
+#define IGA2_HOR_ADDR_FORMULA(x)            ((x)-1)
+#define IGA2_HOR_BLANK_START_FORMULA(x)     ((x)-1)
+#define IGA2_HOR_BLANK_END_FORMULA(x, y)     ((x+y)-1)
+#define IGA2_HOR_SYNC_START_FORMULA(x)      ((x)-1)
+#define IGA2_HOR_SYNC_END_FORMULA(x, y)      ((x+y)-1)
+
+#define IGA2_VER_TOTAL_FORMULA(x)           ((x)-1)
+#define IGA2_VER_ADDR_FORMULA(x)            ((x)-1)
+#define IGA2_VER_BLANK_START_FORMULA(x)     ((x)-1)
+#define IGA2_VER_BLANK_END_FORMULA(x, y)     ((x+y)-1)
+#define IGA2_VER_SYNC_START_FORMULA(x)      ((x)-1)
+#define IGA2_VER_SYNC_END_FORMULA(x, y)      ((x+y)-1)
+
+/**********************************************************/
+/* Definition IGA2 Design Method of CRTC Shadow Registers */
+/**********************************************************/
+#define IGA2_HOR_TOTAL_SHADOW_FORMULA(x)           ((x/8)-5)
+#define IGA2_HOR_BLANK_END_SHADOW_FORMULA(x, y)     (((x+y)/8)-1)
+#define IGA2_VER_TOTAL_SHADOW_FORMULA(x)           ((x)-2)
+#define IGA2_VER_ADDR_SHADOW_FORMULA(x)            ((x)-1)
+#define IGA2_VER_BLANK_START_SHADOW_FORMULA(x)     ((x)-1)
+#define IGA2_VER_BLANK_END_SHADOW_FORMULA(x, y)     ((x+y)-1)
+#define IGA2_VER_SYNC_START_SHADOW_FORMULA(x)      (x)
+#define IGA2_VER_SYNC_END_SHADOW_FORMULA(x, y)      (x+y)
+
+/* Define Register Number for IGA1 CRTC Timing */
+
+/* location: {CR00,0,7},{CR36,3,3} */
+#define IGA1_HOR_TOTAL_REG_NUM          2
+/* location: {CR01,0,7} */
+#define IGA1_HOR_ADDR_REG_NUM           1
+/* location: {CR02,0,7} */
+#define IGA1_HOR_BLANK_START_REG_NUM    1
+/* location: {CR03,0,4},{CR05,7,7},{CR33,5,5} */
+#define IGA1_HOR_BLANK_END_REG_NUM      3
+/* location: {CR04,0,7},{CR33,4,4} */
+#define IGA1_HOR_SYNC_START_REG_NUM     2
+/* location: {CR05,0,4} */
+#define IGA1_HOR_SYNC_END_REG_NUM       1
+/* location: {CR06,0,7},{CR07,0,0},{CR07,5,5},{CR35,0,0} */
+#define IGA1_VER_TOTAL_REG_NUM          4
+/* location: {CR12,0,7},{CR07,1,1},{CR07,6,6},{CR35,2,2} */
+#define IGA1_VER_ADDR_REG_NUM           4
+/* location: {CR15,0,7},{CR07,3,3},{CR09,5,5},{CR35,3,3} */
+#define IGA1_VER_BLANK_START_REG_NUM    4
+/* location: {CR16,0,7} */
+#define IGA1_VER_BLANK_END_REG_NUM      1
+/* location: {CR10,0,7},{CR07,2,2},{CR07,7,7},{CR35,1,1} */
+#define IGA1_VER_SYNC_START_REG_NUM     4
+/* location: {CR11,0,3} */
+#define IGA1_VER_SYNC_END_REG_NUM       1
+
+/* Define Register Number for IGA2 Shadow CRTC Timing */
+
+/* location: {CR6D,0,7},{CR71,3,3} */
+#define IGA2_SHADOW_HOR_TOTAL_REG_NUM       2
+/* location: {CR6E,0,7} */
+#define IGA2_SHADOW_HOR_BLANK_END_REG_NUM   1
+/* location: {CR6F,0,7},{CR71,0,2} */
+#define IGA2_SHADOW_VER_TOTAL_REG_NUM       2
+/* location: {CR70,0,7},{CR71,4,6} */
+#define IGA2_SHADOW_VER_ADDR_REG_NUM        2
+/* location: {CR72,0,7},{CR74,4,6} */
+#define IGA2_SHADOW_VER_BLANK_START_REG_NUM 2
+/* location: {CR73,0,7},{CR74,0,2} */
+#define IGA2_SHADOW_VER_BLANK_END_REG_NUM   2
+/* location: {CR75,0,7},{CR76,4,6} */
+#define IGA2_SHADOW_VER_SYNC_START_REG_NUM  2
+/* location: {CR76,0,3} */
+#define IGA2_SHADOW_VER_SYNC_END_REG_NUM    1
+
+/* Define Register Number for IGA2 CRTC Timing */
+
+/* location: {CR50,0,7},{CR55,0,3} */
+#define IGA2_HOR_TOTAL_REG_NUM          2
+/* location: {CR51,0,7},{CR55,4,6} */
+#define IGA2_HOR_ADDR_REG_NUM           2
+/* location: {CR52,0,7},{CR54,0,2} */
+#define IGA2_HOR_BLANK_START_REG_NUM    2
+/* location: CLE266: {CR53,0,7},{CR54,3,5} => CLE266's CR5D[6]
+is reserved, so it may have problem to set 1600x1200 on IGA2. */
+/*              Others: {CR53,0,7},{CR54,3,5},{CR5D,6,6} */
+#define IGA2_HOR_BLANK_END_REG_NUM      3
+/* location: {CR56,0,7},{CR54,6,7},{CR5C,7,7} */
+/* VT3314 and Later: {CR56,0,7},{CR54,6,7},{CR5C,7,7}, {CR5D,7,7} */
+#define IGA2_HOR_SYNC_START_REG_NUM     4
+
+/* location: {CR57,0,7},{CR5C,6,6} */
+#define IGA2_HOR_SYNC_END_REG_NUM       2
+/* location: {CR58,0,7},{CR5D,0,2} */
+#define IGA2_VER_TOTAL_REG_NUM          2
+/* location: {CR59,0,7},{CR5D,3,5} */
+#define IGA2_VER_ADDR_REG_NUM           2
+/* location: {CR5A,0,7},{CR5C,0,2} */
+#define IGA2_VER_BLANK_START_REG_NUM    2
+/* location: {CR5E,0,7},{CR5C,3,5} */
+#define IGA2_VER_BLANK_END_REG_NUM      2
+/* location: {CR5E,0,7},{CR5F,5,7} */
+#define IGA2_VER_SYNC_START_REG_NUM     2
+/* location: {CR5F,0,4} */
+#define IGA2_VER_SYNC_END_REG_NUM       1
+
+/* Define Offset and Fetch Count Register*/
+
+/* location: {CR13,0,7},{CR35,5,7} */
+#define IGA1_OFFSET_REG_NUM             2
+/* 8 bytes alignment. */
+#define IGA1_OFFSER_ALIGN_BYTE          8
+/* x: H resolution, y: color depth */
+#define IGA1_OFFSET_FORMULA(x, y)        ((x*y)/IGA1_OFFSER_ALIGN_BYTE)
+/* location: {SR1C,0,7},{SR1D,0,1} */
+#define IGA1_FETCH_COUNT_REG_NUM        2
+/* 16 bytes alignment. */
+#define IGA1_FETCH_COUNT_ALIGN_BYTE     16
+/* x: H resolution, y: color depth */
+#define IGA1_FETCH_COUNT_PATCH_VALUE    4
+#define IGA1_FETCH_COUNT_FORMULA(x, y)   \
+        (((x*y)/IGA1_FETCH_COUNT_ALIGN_BYTE) + IGA1_FETCH_COUNT_PATCH_VALUE)
+
+/* location: {CR66,0,7},{CR67,0,1} */
+#define IGA2_OFFSET_REG_NUM             2
+#define IGA2_OFFSET_ALIGN_BYTE          8
+/* x: H resolution, y: color depth */
+#define IGA2_OFFSET_FORMULA(x, y)        ((x*y)/IGA2_OFFSET_ALIGN_BYTE)
+/* location: {CR65,0,7},{CR67,2,3} */
+#define IGA2_FETCH_COUNT_REG_NUM        2
+#define IGA2_FETCH_COUNT_ALIGN_BYTE     16
+#define IGA2_FETCH_COUNT_PATCH_VALUE    0
+#define IGA2_FETCH_COUNT_FORMULA(x, y)   \
+        (((x*y)/IGA2_FETCH_COUNT_ALIGN_BYTE) + IGA2_FETCH_COUNT_PATCH_VALUE)
+
+/* Staring Address*/
+
+/* location: {CR0C,0,7},{CR0D,0,7},{CR34,0,7},{CR48,0,1} */
+#define IGA1_STARTING_ADDR_REG_NUM      4
+/* location: {CR62,1,7},{CR63,0,7},{CR64,0,7} */
+#define IGA2_STARTING_ADDR_REG_NUM      3
+
+/* Define Display OFFSET*/
+/* These value are by HW suggested value*/
+/* location: {SR17,0,7} */
+#define K800_IGA1_FIFO_MAX_DEPTH                384
+/* location: {SR16,0,5},{SR16,7,7} */
+#define K800_IGA1_FIFO_THRESHOLD                328
+/* location: {SR18,0,5},{SR18,7,7} */
+#define K800_IGA1_FIFO_HIGH_THRESHOLD           296
+/* location: {SR22,0,4}. (128/4) =64, K800 must be set zero, */
+                                /* because HW only 5 bits */
+#define K800_IGA1_DISPLAY_QUEUE_EXPIRE_NUM      0
+
+/* location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */
+#define K800_IGA2_FIFO_MAX_DEPTH                384
+/* location: {CR68,0,3},{CR95,4,6} */
+#define K800_IGA2_FIFO_THRESHOLD                328
+/* location: {CR92,0,3},{CR95,0,2} */
+#define K800_IGA2_FIFO_HIGH_THRESHOLD           296
+/* location: {CR94,0,6} */
+#define K800_IGA2_DISPLAY_QUEUE_EXPIRE_NUM      128
+
+/* location: {SR17,0,7} */
+#define P880_IGA1_FIFO_MAX_DEPTH                192
+/* location: {SR16,0,5},{SR16,7,7} */
+#define P880_IGA1_FIFO_THRESHOLD                128
+/* location: {SR18,0,5},{SR18,7,7} */
+#define P880_IGA1_FIFO_HIGH_THRESHOLD           64
+/* location: {SR22,0,4}. (128/4) =64, K800 must be set zero, */
+                                /* because HW only 5 bits */
+#define P880_IGA1_DISPLAY_QUEUE_EXPIRE_NUM      0
+
+/* location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */
+#define P880_IGA2_FIFO_MAX_DEPTH                96
+/* location: {CR68,0,3},{CR95,4,6} */
+#define P880_IGA2_FIFO_THRESHOLD                64
+/* location: {CR92,0,3},{CR95,0,2} */
+#define P880_IGA2_FIFO_HIGH_THRESHOLD           32
+/* location: {CR94,0,6} */
+#define P880_IGA2_DISPLAY_QUEUE_EXPIRE_NUM      128
+
+/* VT3314 chipset*/
+
+/* location: {SR17,0,7} */
+#define CN700_IGA1_FIFO_MAX_DEPTH               96
+/* location: {SR16,0,5},{SR16,7,7} */
+#define CN700_IGA1_FIFO_THRESHOLD               80
+/* location: {SR18,0,5},{SR18,7,7} */
+#define CN700_IGA1_FIFO_HIGH_THRESHOLD          64
+/* location: {SR22,0,4}. (128/4) =64, P800 must be set zero,
+                                because HW only 5 bits */
+#define CN700_IGA1_DISPLAY_QUEUE_EXPIRE_NUM     0
+/* location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */
+#define CN700_IGA2_FIFO_MAX_DEPTH               96
+/* location: {CR68,0,3},{CR95,4,6} */
+#define CN700_IGA2_FIFO_THRESHOLD               80
+/* location: {CR92,0,3},{CR95,0,2} */
+#define CN700_IGA2_FIFO_HIGH_THRESHOLD          32
+/* location: {CR94,0,6} */
+#define CN700_IGA2_DISPLAY_QUEUE_EXPIRE_NUM     128
+
+/* For VT3324, these values are suggested by HW */
+/* location: {SR17,0,7} */
+#define CX700_IGA1_FIFO_MAX_DEPTH               192
+/* location: {SR16,0,5},{SR16,7,7} */
+#define CX700_IGA1_FIFO_THRESHOLD               128
+/* location: {SR18,0,5},{SR18,7,7} */
+#define CX700_IGA1_FIFO_HIGH_THRESHOLD          128
+/* location: {SR22,0,4} */
+#define CX700_IGA1_DISPLAY_QUEUE_EXPIRE_NUM     124
+
+/* location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */
+#define CX700_IGA2_FIFO_MAX_DEPTH               96
+/* location: {CR68,0,3},{CR95,4,6} */
+#define CX700_IGA2_FIFO_THRESHOLD               64
+/* location: {CR92,0,3},{CR95,0,2} */
+#define CX700_IGA2_FIFO_HIGH_THRESHOLD          32
+/* location: {CR94,0,6} */
+#define CX700_IGA2_DISPLAY_QUEUE_EXPIRE_NUM     128
+
+/* VT3336 chipset*/
+/* location: {SR17,0,7} */
+#define K8M890_IGA1_FIFO_MAX_DEPTH               360
+/* location: {SR16,0,5},{SR16,7,7} */
+#define K8M890_IGA1_FIFO_THRESHOLD               328
+/* location: {SR18,0,5},{SR18,7,7} */
+#define K8M890_IGA1_FIFO_HIGH_THRESHOLD          296
+/* location: {SR22,0,4}. */
+#define K8M890_IGA1_DISPLAY_QUEUE_EXPIRE_NUM     124
+
+/* location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */
+#define K8M890_IGA2_FIFO_MAX_DEPTH               360
+/* location: {CR68,0,3},{CR95,4,6} */
+#define K8M890_IGA2_FIFO_THRESHOLD               328
+/* location: {CR92,0,3},{CR95,0,2} */
+#define K8M890_IGA2_FIFO_HIGH_THRESHOLD          296
+/* location: {CR94,0,6} */
+#define K8M890_IGA2_DISPLAY_QUEUE_EXPIRE_NUM     124
+
+/* VT3327 chipset*/
+/* location: {SR17,0,7} */
+#define P4M890_IGA1_FIFO_MAX_DEPTH               96
+/* location: {SR16,0,5},{SR16,7,7} */
+#define P4M890_IGA1_FIFO_THRESHOLD               76
+/* location: {SR18,0,5},{SR18,7,7} */
+#define P4M890_IGA1_FIFO_HIGH_THRESHOLD          64
+/* location: {SR22,0,4}. (32/4) =8 */
+#define P4M890_IGA1_DISPLAY_QUEUE_EXPIRE_NUM     32
+/* location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */
+#define P4M890_IGA2_FIFO_MAX_DEPTH               96
+/* location: {CR68,0,3},{CR95,4,6} */
+#define P4M890_IGA2_FIFO_THRESHOLD               76
+/* location: {CR92,0,3},{CR95,0,2} */
+#define P4M890_IGA2_FIFO_HIGH_THRESHOLD          64
+/* location: {CR94,0,6} */
+#define P4M890_IGA2_DISPLAY_QUEUE_EXPIRE_NUM     32
+
+/* VT3364 chipset*/
+/* location: {SR17,0,7} */
+#define P4M900_IGA1_FIFO_MAX_DEPTH               96
+/* location: {SR16,0,5},{SR16,7,7} */
+#define P4M900_IGA1_FIFO_THRESHOLD               76
+/* location: {SR18,0,5},{SR18,7,7} */
+#define P4M900_IGA1_FIFO_HIGH_THRESHOLD          76
+/* location: {SR22,0,4}. */
+#define P4M900_IGA1_DISPLAY_QUEUE_EXPIRE_NUM     32
+/* location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */
+#define P4M900_IGA2_FIFO_MAX_DEPTH               96
+/* location: {CR68,0,3},{CR95,4,6} */
+#define P4M900_IGA2_FIFO_THRESHOLD               76
+/* location: {CR92,0,3},{CR95,0,2} */
+#define P4M900_IGA2_FIFO_HIGH_THRESHOLD          76
+/* location: {CR94,0,6} */
+#define P4M900_IGA2_DISPLAY_QUEUE_EXPIRE_NUM     32
+
+/* For VT3353, these values are suggested by HW */
+/* location: {SR17,0,7} */
+#define VX800_IGA1_FIFO_MAX_DEPTH               192
+/* location: {SR16,0,5},{SR16,7,7} */
+#define VX800_IGA1_FIFO_THRESHOLD               152
+/* location: {SR18,0,5},{SR18,7,7} */
+#define VX800_IGA1_FIFO_HIGH_THRESHOLD          152
+/* location: {SR22,0,4} */
+#define VX800_IGA1_DISPLAY_QUEUE_EXPIRE_NUM      64
+/* location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */
+#define VX800_IGA2_FIFO_MAX_DEPTH               96
+/* location: {CR68,0,3},{CR95,4,6} */
+#define VX800_IGA2_FIFO_THRESHOLD               64
+/* location: {CR92,0,3},{CR95,0,2} */
+#define VX800_IGA2_FIFO_HIGH_THRESHOLD          32
+/* location: {CR94,0,6} */
+#define VX800_IGA2_DISPLAY_QUEUE_EXPIRE_NUM     128
+
+#define IGA1_FIFO_DEPTH_SELECT_REG_NUM          1
+#define IGA1_FIFO_THRESHOLD_REG_NUM             2
+#define IGA1_FIFO_HIGH_THRESHOLD_REG_NUM        2
+#define IGA1_DISPLAY_QUEUE_EXPIRE_NUM_REG_NUM   1
+
+#define IGA2_FIFO_DEPTH_SELECT_REG_NUM          3
+#define IGA2_FIFO_THRESHOLD_REG_NUM             2
+#define IGA2_FIFO_HIGH_THRESHOLD_REG_NUM        2
+#define IGA2_DISPLAY_QUEUE_EXPIRE_NUM_REG_NUM   1
+
+#define IGA1_FIFO_DEPTH_SELECT_FORMULA(x)                   ((x/2)-1)
+#define IGA1_FIFO_THRESHOLD_FORMULA(x)                      (x/4)
+#define IGA1_DISPLAY_QUEUE_EXPIRE_NUM_FORMULA(x)            (x/4)
+#define IGA1_FIFO_HIGH_THRESHOLD_FORMULA(x)                 (x/4)
+#define IGA2_FIFO_DEPTH_SELECT_FORMULA(x)                   (((x/2)/4)-1)
+#define IGA2_FIFO_THRESHOLD_FORMULA(x)                      (x/4)
+#define IGA2_DISPLAY_QUEUE_EXPIRE_NUM_FORMULA(x)            (x/4)
+#define IGA2_FIFO_HIGH_THRESHOLD_FORMULA(x)                 (x/4)
+
+/************************************************************************/
+/*  LCD Timing                                                          */
+/************************************************************************/
+
+/* 500 ms = 500000 us */
+#define LCD_POWER_SEQ_TD0               500000
+/* 50 ms = 50000 us */
+#define LCD_POWER_SEQ_TD1               50000
+/* 0 us */
+#define LCD_POWER_SEQ_TD2               0
+/* 210 ms = 210000 us */
+#define LCD_POWER_SEQ_TD3               210000
+/* 2^10 * (1/14.31818M) = 71.475 us (K400.revA) */
+#define CLE266_POWER_SEQ_UNIT           71
+/* 2^11 * (1/14.31818M) = 142.95 us (K400.revB) */
+#define K800_POWER_SEQ_UNIT             142
+/* 2^13 * (1/14.31818M) = 572.1 us */
+#define P880_POWER_SEQ_UNIT             572
+
+#define CLE266_POWER_SEQ_FORMULA(x)     ((x)/CLE266_POWER_SEQ_UNIT)
+#define K800_POWER_SEQ_FORMULA(x)       ((x)/K800_POWER_SEQ_UNIT)
+#define P880_POWER_SEQ_FORMULA(x)       ((x)/P880_POWER_SEQ_UNIT)
+
+/* location: {CR8B,0,7},{CR8F,0,3} */
+#define LCD_POWER_SEQ_TD0_REG_NUM       2
+/* location: {CR8C,0,7},{CR8F,4,7} */
+#define LCD_POWER_SEQ_TD1_REG_NUM       2
+/* location: {CR8D,0,7},{CR90,0,3} */
+#define LCD_POWER_SEQ_TD2_REG_NUM       2
+/* location: {CR8E,0,7},{CR90,4,7} */
+#define LCD_POWER_SEQ_TD3_REG_NUM       2
+
+/* LCD Scaling factor*/
+/* x: indicate setting horizontal size*/
+/* y: indicate panel horizontal size*/
+
+/* Horizontal scaling factor 10 bits (2^10) */
+#define CLE266_LCD_HOR_SCF_FORMULA(x, y)   (((x-1)*1024)/(y-1))
+/* Vertical scaling factor 10 bits (2^10) */
+#define CLE266_LCD_VER_SCF_FORMULA(x, y)   (((x-1)*1024)/(y-1))
+/* Horizontal scaling factor 10 bits (2^12) */
+#define K800_LCD_HOR_SCF_FORMULA(x, y)     (((x-1)*4096)/(y-1))
+/* Vertical scaling factor 10 bits (2^11) */
+#define K800_LCD_VER_SCF_FORMULA(x, y)     (((x-1)*2048)/(y-1))
+
+/* location: {CR9F,0,1},{CR77,0,7},{CR79,4,5} */
+#define LCD_HOR_SCALING_FACTOR_REG_NUM  3
+/* location: {CR79,3,3},{CR78,0,7},{CR79,6,7} */
+#define LCD_VER_SCALING_FACTOR_REG_NUM  3
+/* location: {CR77,0,7},{CR79,4,5} */
+#define LCD_HOR_SCALING_FACTOR_REG_NUM_CLE  2
+/* location: {CR78,0,7},{CR79,6,7} */
+#define LCD_VER_SCALING_FACTOR_REG_NUM_CLE  2
+
+/************************************************
+ *****     Define IGA1 Display Timing       *****
+ ************************************************/
+struct io_register {
+        u8 io_addr;
+        u8 start_bit;
+        u8 end_bit;
+};
+
+/* IGA1 Horizontal Total */
+struct iga1_hor_total {
+        int reg_num;
+        struct io_register reg[IGA1_HOR_TOTAL_REG_NUM];
+};
+
+/* IGA1 Horizontal Addressable Video */
+struct iga1_hor_addr {
+        int reg_num;
+        struct io_register reg[IGA1_HOR_ADDR_REG_NUM];
+};
+
+/* IGA1 Horizontal Blank Start */
+struct iga1_hor_blank_start {
+        int reg_num;
+        struct io_register reg[IGA1_HOR_BLANK_START_REG_NUM];
+};
+
+/* IGA1 Horizontal Blank End */
+struct iga1_hor_blank_end {
+        int reg_num;
+        struct io_register reg[IGA1_HOR_BLANK_END_REG_NUM];
+};
+
+/* IGA1 Horizontal Sync Start */
+struct iga1_hor_sync_start {
+        int reg_num;
+        struct io_register reg[IGA1_HOR_SYNC_START_REG_NUM];
+};
+
+/* IGA1 Horizontal Sync End */
+struct iga1_hor_sync_end {
+        int reg_num;
+        struct io_register reg[IGA1_HOR_SYNC_END_REG_NUM];
+};
+
+/* IGA1 Vertical Total */
+struct iga1_ver_total {
+        int reg_num;
+        struct io_register reg[IGA1_VER_TOTAL_REG_NUM];
+};
+
+/* IGA1 Vertical Addressable Video */
+struct iga1_ver_addr {
+        int reg_num;
+        struct io_register reg[IGA1_VER_ADDR_REG_NUM];
+};
+
+/* IGA1 Vertical Blank Start */
+struct iga1_ver_blank_start {
+        int reg_num;
+        struct io_register reg[IGA1_VER_BLANK_START_REG_NUM];
+};
+
+/* IGA1 Vertical Blank End */
+struct iga1_ver_blank_end {
+        int reg_num;
+        struct io_register reg[IGA1_VER_BLANK_END_REG_NUM];
+};
+
+/* IGA1 Vertical Sync Start */
+struct iga1_ver_sync_start {
+        int reg_num;
+        struct io_register reg[IGA1_VER_SYNC_START_REG_NUM];
+};
+
+/* IGA1 Vertical Sync End */
+struct iga1_ver_sync_end {
+        int reg_num;
+        struct io_register reg[IGA1_VER_SYNC_END_REG_NUM];
+};
+
+/*****************************************************
+**      Define IGA2 Shadow Display Timing         ****
+*****************************************************/
+
+/* IGA2 Shadow Horizontal Total */
+struct iga2_shadow_hor_total {
+        int reg_num;
+        struct io_register reg[IGA2_SHADOW_HOR_TOTAL_REG_NUM];
+};
+
+/* IGA2 Shadow Horizontal Blank End */
+struct iga2_shadow_hor_blank_end {
+        int reg_num;
+        struct io_register reg[IGA2_SHADOW_HOR_BLANK_END_REG_NUM];
+};
+
+/* IGA2 Shadow Vertical Total */
+struct iga2_shadow_ver_total {
+        int reg_num;
+        struct io_register reg[IGA2_SHADOW_VER_TOTAL_REG_NUM];
+};
+
+/* IGA2 Shadow Vertical Addressable Video */
+struct iga2_shadow_ver_addr {
+        int reg_num;
+        struct io_register reg[IGA2_SHADOW_VER_ADDR_REG_NUM];
+};
+
+/* IGA2 Shadow Vertical Blank Start */
+struct iga2_shadow_ver_blank_start {
+        int reg_num;
+        struct io_register reg[IGA2_SHADOW_VER_BLANK_START_REG_NUM];
+};
+
+/* IGA2 Shadow Vertical Blank End */
+struct iga2_shadow_ver_blank_end {
+        int reg_num;
+        struct io_register reg[IGA2_SHADOW_VER_BLANK_END_REG_NUM];
+};
+
+/* IGA2 Shadow Vertical Sync Start */
+struct iga2_shadow_ver_sync_start {
+        int reg_num;
+        struct io_register reg[IGA2_SHADOW_VER_SYNC_START_REG_NUM];
+};
+
+/* IGA2 Shadow Vertical Sync End */
+struct iga2_shadow_ver_sync_end {
+        int reg_num;
+        struct io_register reg[IGA2_SHADOW_VER_SYNC_END_REG_NUM];
+};
+
+/*****************************************************
+**      Define IGA2 Display Timing                ****
+******************************************************/
+
+/* IGA2 Horizontal Total */
+struct iga2_hor_total {
+        int reg_num;
+        struct io_register reg[IGA2_HOR_TOTAL_REG_NUM];
+};
+
+/* IGA2 Horizontal Addressable Video */
+struct iga2_hor_addr {
+        int reg_num;
+        struct io_register reg[IGA2_HOR_ADDR_REG_NUM];
+};
+
+/* IGA2 Horizontal Blank Start */
+struct iga2_hor_blank_start {
+        int reg_num;
+        struct io_register reg[IGA2_HOR_BLANK_START_REG_NUM];
+};
+
+/* IGA2 Horizontal Blank End */
+struct iga2_hor_blank_end {
+        int reg_num;
+        struct io_register reg[IGA2_HOR_BLANK_END_REG_NUM];
+};
+
+/* IGA2 Horizontal Sync Start */
+struct iga2_hor_sync_start {
+        int reg_num;
+        struct io_register reg[IGA2_HOR_SYNC_START_REG_NUM];
+};
+
+/* IGA2 Horizontal Sync End */
+struct iga2_hor_sync_end {
+        int reg_num;
+        struct io_register reg[IGA2_HOR_SYNC_END_REG_NUM];
+};
+
+/* IGA2 Vertical Total */
+struct iga2_ver_total {
+        int reg_num;
+        struct io_register reg[IGA2_VER_TOTAL_REG_NUM];
+};
+
+/* IGA2 Vertical Addressable Video */
+struct iga2_ver_addr {
+        int reg_num;
+        struct io_register reg[IGA2_VER_ADDR_REG_NUM];
+};
+
+/* IGA2 Vertical Blank Start */
+struct iga2_ver_blank_start {
+        int reg_num;
+        struct io_register reg[IGA2_VER_BLANK_START_REG_NUM];
+};
+
+/* IGA2 Vertical Blank End */
+struct iga2_ver_blank_end {
+        int reg_num;
+        struct io_register reg[IGA2_VER_BLANK_END_REG_NUM];
+};
+
+/* IGA2 Vertical Sync Start */
+struct iga2_ver_sync_start {
+        int reg_num;
+        struct io_register reg[IGA2_VER_SYNC_START_REG_NUM];
+};
+
+/* IGA2 Vertical Sync End */
+struct iga2_ver_sync_end {
+        int reg_num;
+        struct io_register reg[IGA2_VER_SYNC_END_REG_NUM];
+};
+
+/* IGA1 Offset Register */
+struct iga1_offset {
+        int reg_num;
+        struct io_register reg[IGA1_OFFSET_REG_NUM];
+};
+
+/* IGA2 Offset Register */
+struct iga2_offset {
+        int reg_num;
+        struct io_register reg[IGA2_OFFSET_REG_NUM];
+};
+
+struct offset {
+        struct iga1_offset iga1_offset_reg;
+        struct iga2_offset iga2_offset_reg;
+};
+
+/* IGA1 Fetch Count Register */
+struct iga1_fetch_count {
+        int reg_num;
+        struct io_register reg[IGA1_FETCH_COUNT_REG_NUM];
+};
+
+/* IGA2 Fetch Count Register */
+struct iga2_fetch_count {
+        int reg_num;
+        struct io_register reg[IGA2_FETCH_COUNT_REG_NUM];
+};
+
+struct fetch_count {
+        struct iga1_fetch_count iga1_fetch_count_reg;
+        struct iga2_fetch_count iga2_fetch_count_reg;
+};
+
+/* Starting Address Register */
+struct iga1_starting_addr {
+        int reg_num;
+        struct io_register reg[IGA1_STARTING_ADDR_REG_NUM];
+};
+
+struct iga2_starting_addr {
+        int reg_num;
+        struct io_register reg[IGA2_STARTING_ADDR_REG_NUM];
+};
+
+struct starting_addr {
+        struct iga1_starting_addr iga1_starting_addr_reg;
+        struct iga2_starting_addr iga2_starting_addr_reg;
+};
+
+/* LCD Power Sequence Timer */
+struct lcd_pwd_seq_td0 {
+        int reg_num;
+        struct io_register reg[LCD_POWER_SEQ_TD0_REG_NUM];
+};
+
+struct lcd_pwd_seq_td1 {
+        int reg_num;
+        struct io_register reg[LCD_POWER_SEQ_TD1_REG_NUM];
+};
+
+struct lcd_pwd_seq_td2 {
+        int reg_num;
+        struct io_register reg[LCD_POWER_SEQ_TD2_REG_NUM];
+};
+
+struct lcd_pwd_seq_td3 {
+        int reg_num;
+        struct io_register reg[LCD_POWER_SEQ_TD3_REG_NUM];
+};
+
+struct _lcd_pwd_seq_timer {
+        struct lcd_pwd_seq_td0 td0;
+        struct lcd_pwd_seq_td1 td1;
+        struct lcd_pwd_seq_td2 td2;
+        struct lcd_pwd_seq_td3 td3;
+};
+
+/* LCD Scaling Factor */
+struct _lcd_hor_scaling_factor {
+        int reg_num;
+        struct io_register reg[LCD_HOR_SCALING_FACTOR_REG_NUM];
+};
+
+struct _lcd_ver_scaling_factor {
+        int reg_num;
+        struct io_register reg[LCD_VER_SCALING_FACTOR_REG_NUM];
+};
+
+struct _lcd_scaling_factor {
+        struct _lcd_hor_scaling_factor lcd_hor_scaling_factor;
+        struct _lcd_ver_scaling_factor lcd_ver_scaling_factor;
+};
+
+struct pll_map {
+        u32 clk;
+        u32 cle266_pll;
+        u32 k800_pll;
+        u32 cx700_pll;
+};
+
+struct rgbLUT {
+        u8 red;
+        u8 green;
+        u8 blue;
+};
+
+struct lcd_pwd_seq_timer {
+        u16 td0;
+        u16 td1;
+        u16 td2;
+        u16 td3;
+};
+
+/* Display FIFO Relation Registers*/
+struct iga1_fifo_depth_select {
+        int reg_num;
+        struct io_register reg[IGA1_FIFO_DEPTH_SELECT_REG_NUM];
+};
+
+struct iga1_fifo_threshold_select {
+        int reg_num;
+        struct io_register reg[IGA1_FIFO_THRESHOLD_REG_NUM];
+};
+
+struct iga1_fifo_high_threshold_select {
+        int reg_num;
+        struct io_register reg[IGA1_FIFO_HIGH_THRESHOLD_REG_NUM];
+};
+
+struct iga1_display_queue_expire_num {
+        int reg_num;
+        struct io_register reg[IGA1_DISPLAY_QUEUE_EXPIRE_NUM_REG_NUM];
+};
+
+struct iga2_fifo_depth_select {
+        int reg_num;
+        struct io_register reg[IGA2_FIFO_DEPTH_SELECT_REG_NUM];
+};
+
+struct iga2_fifo_threshold_select {
+        int reg_num;
+        struct io_register reg[IGA2_FIFO_THRESHOLD_REG_NUM];
+};
+
+struct iga2_fifo_high_threshold_select {
+        int reg_num;
+        struct io_register reg[IGA2_FIFO_HIGH_THRESHOLD_REG_NUM];
+};
+
+struct iga2_display_queue_expire_num {
+        int reg_num;
+        struct io_register reg[IGA2_DISPLAY_QUEUE_EXPIRE_NUM_REG_NUM];
+};
+
+struct fifo_depth_select {
+        struct iga1_fifo_depth_select iga1_fifo_depth_select_reg;
+        struct iga2_fifo_depth_select iga2_fifo_depth_select_reg;
+};
+
+struct fifo_threshold_select {
+        struct iga1_fifo_threshold_select iga1_fifo_threshold_select_reg;
+        struct iga2_fifo_threshold_select iga2_fifo_threshold_select_reg;
+};
+
+struct fifo_high_threshold_select {
+        struct iga1_fifo_high_threshold_select
+         iga1_fifo_high_threshold_select_reg;
+        struct iga2_fifo_high_threshold_select
+         iga2_fifo_high_threshold_select_reg;
+};
+
+struct display_queue_expire_num {
+        struct iga1_display_queue_expire_num
+         iga1_display_queue_expire_num_reg;
+        struct iga2_display_queue_expire_num
+         iga2_display_queue_expire_num_reg;
+};
+
+struct iga1_crtc_timing {
+        struct iga1_hor_total hor_total;
+        struct iga1_hor_addr hor_addr;
+        struct iga1_hor_blank_start hor_blank_start;
+        struct iga1_hor_blank_end hor_blank_end;
+        struct iga1_hor_sync_start hor_sync_start;
+        struct iga1_hor_sync_end hor_sync_end;
+        struct iga1_ver_total ver_total;
+        struct iga1_ver_addr ver_addr;
+        struct iga1_ver_blank_start ver_blank_start;
+        struct iga1_ver_blank_end ver_blank_end;
+        struct iga1_ver_sync_start ver_sync_start;
+        struct iga1_ver_sync_end ver_sync_end;
+};
+
+struct iga2_shadow_crtc_timing {
+        struct iga2_shadow_hor_total hor_total_shadow;
+        struct iga2_shadow_hor_blank_end hor_blank_end_shadow;
+        struct iga2_shadow_ver_total ver_total_shadow;
+        struct iga2_shadow_ver_addr ver_addr_shadow;
+        struct iga2_shadow_ver_blank_start ver_blank_start_shadow;
+        struct iga2_shadow_ver_blank_end ver_blank_end_shadow;
+        struct iga2_shadow_ver_sync_start ver_sync_start_shadow;
+        struct iga2_shadow_ver_sync_end ver_sync_end_shadow;
+};
+
+struct iga2_crtc_timing {
+        struct iga2_hor_total hor_total;
+        struct iga2_hor_addr hor_addr;
+        struct iga2_hor_blank_start hor_blank_start;
+        struct iga2_hor_blank_end hor_blank_end;
+        struct iga2_hor_sync_start hor_sync_start;
+        struct iga2_hor_sync_end hor_sync_end;
+        struct iga2_ver_total ver_total;
+        struct iga2_ver_addr ver_addr;
+        struct iga2_ver_blank_start ver_blank_start;
+        struct iga2_ver_blank_end ver_blank_end;
+        struct iga2_ver_sync_start ver_sync_start;
+        struct iga2_ver_sync_end ver_sync_end;
+};
+
+/* device ID */
+#define CLE266              0x3123
+#define KM400               0x3205
+#define CN400_FUNCTION2     0x2259
+#define CN400_FUNCTION3     0x3259
+/* support VT3314 chipset */
+#define CN700_FUNCTION2     0x2314
+#define CN700_FUNCTION3     0x3208
+/* VT3324 chipset */
+#define CX700_FUNCTION2     0x2324
+#define CX700_FUNCTION3     0x3324
+/* VT3204 chipset*/
+#define KM800_FUNCTION3      0x3204
+/* VT3336 chipset*/
+#define KM890_FUNCTION3      0x3336
+/* VT3327 chipset*/
+#define P4M890_FUNCTION3     0x3327
+/* VT3293 chipset*/
+#define CN750_FUNCTION3     0x3208
+/* VT3364 chipset*/
+#define P4M900_FUNCTION3    0x3364
+/* VT3353 chipset*/
+#define VX800_FUNCTION3     0x3353
+
+#define NUM_TOTAL_PLL_TABLE ARRAY_SIZE(pll_value)
+
+struct IODATA {
+        u8 Index;
+        u8 Mask;
+        u8 Data;
+};
+
+struct pci_device_id_info {
+        u32 vendor;
+        u32 device;
+        u32 chip_index;
+};
+
+extern unsigned int viafb_second_virtual_xres;
+extern unsigned int viafb_second_offset;
+extern int viafb_second_size;
+extern int viafb_SAMM_ON;
+extern int viafb_dual_fb;
+extern int viafb_LCD2_ON;
+extern int viafb_LCD_ON;
+extern int viafb_DVI_ON;
+extern int viafb_accel;
+extern int viafb_hotplug;
+
+void viafb_write_reg_mask(u8 index, int io_port, u8 data, u8 mask);
+void viafb_set_output_path(int device, int set_iga,
+        int output_interface);
+void viafb_fill_crtc_timing(struct crt_mode_table *crt_table,
+                      int mode_index, int bpp_byte, int set_iga);
+
+void viafb_set_vclock(u32 CLK, int set_iga);
+void viafb_load_reg(int timing_value, int viafb_load_reg_num,
+        struct io_register *reg,
+              int io_type);
+void viafb_crt_disable(void);
+void viafb_crt_enable(void);
+void init_ad9389(void);
+/* Access I/O Function */
+void viafb_write_reg(u8 index, u16 io_port, u8 data);
+u8 viafb_read_reg(int io_port, u8 index);
+void viafb_lock_crt(void);
+void viafb_unlock_crt(void);
+void viafb_load_offset_reg(int h_addr, int bpp_byte, int set_iga);
+void viafb_load_fetch_count_reg(int h_addr, int bpp_byte, int set_iga);
+void viafb_write_regx(struct io_reg RegTable[], int ItemNum);
+struct VideoModeTable *viafb_get_modetbl_pointer(int Index);
+u32 viafb_get_clk_value(int clk);
+void viafb_load_FIFO_reg(int set_iga, int hor_active, int ver_active);
+void viafb_set_color_depth(int bpp_byte, int set_iga);
+void viafb_set_dpa_gfx(int output_interface, struct GFX_DPA_SETTING\
+                                        *p_gfx_dpa_setting);
+
+int viafb_setmode(int vmode_index, int hor_res, int ver_res,
+            int video_bpp, int vmode_index1, int hor_res1,
+            int ver_res1, int video_bpp1);
+void viafb_init_chip_info(void);
+void viafb_init_dac(int set_iga);
+int viafb_get_pixclock(int hres, int vres, int vmode_refresh);
+int viafb_get_refresh(int hres, int vres, u32 float_refresh);
+void viafb_update_device_setting(int hres, int vres, int bpp,
+                           int vmode_refresh, int flag);
+void viafb_get_mmio_info(unsigned long *mmio_base,
+        unsigned long *mmio_len);
+
+void viafb_set_iga_path(void);
+void viafb_set_start_addr(void);
+void viafb_get_fb_info(unsigned int *fb_base, unsigned int *fb_len);
+
+#endif /* __HW_H__ */
diff --git a/drivers/video/via/iface.c b/drivers/video/via/iface.c
new file mode 100644
index 000000000000..1570636c8d51
--- /dev/null
+++ b/drivers/video/via/iface.c
@@ -0,0 +1,78 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; 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 "global.h"
+
+/* Get frame buffer size from VGA BIOS */
+
+unsigned int viafb_get_memsize(void)
+{
+        unsigned int m;
+
+        /* If memory size provided by user */
+        if (viafb_memsize)
+                m = viafb_memsize * Mb;
+        else {
+                m = (unsigned int)viafb_read_reg(VIASR, SR39);
+                m = m * (4 * Mb);
+
+                if ((m < (16 * Mb)) || (m > (64 * Mb)))
+                        m = 16 * Mb;
+        }
+        DEBUG_MSG(KERN_INFO "framebuffer size = %d Mb\n", m / Mb);
+        return m;
+}
+
+/* Get Video Buffer Starting Physical Address(back door)*/
+
+unsigned long viafb_get_videobuf_addr(void)
+{
+        struct pci_dev *pdev = NULL;
+        unsigned char sys_mem;
+        unsigned char video_mem;
+        unsigned long sys_mem_size;
+        unsigned long video_mem_size;
+        /*system memory = 256 MB, video memory 64 MB */
+        unsigned long vmem_starting_adr = 0x0C000000;
+
+        pdev =
+            (struct pci_dev *)pci_get_device(VIA_K800_BRIDGE_VID,
+                                             VIA_K800_BRIDGE_DID, NULL);
+        if (pdev != NULL) {
+                pci_read_config_byte(pdev, VIA_K800_SYSTEM_MEMORY_REG,
+                                     &sys_mem);
+                pci_read_config_byte(pdev, VIA_K800_VIDEO_MEMORY_REG,
+                                     &video_mem);
+                video_mem = (video_mem & 0x70) >> 4;
+                sys_mem_size = ((unsigned long)sys_mem) << 24;
+                if (video_mem != 0)
+                        video_mem_size = (1 << (video_mem)) * 1024 * 1024;
+                else
+                        video_mem_size = 0;
+
+                vmem_starting_adr = sys_mem_size - video_mem_size;
+                pci_dev_put(pdev);
+        }
+
+        DEBUG_MSG(KERN_INFO "Video Memory Starting Address = %lx \n",
+                  vmem_starting_adr);
+        return vmem_starting_adr;
+}
diff --git a/drivers/video/via/iface.h b/drivers/video/via/iface.h
new file mode 100644
index 000000000000..790ec3e3aea2
--- /dev/null
+++ b/drivers/video/via/iface.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __IFACE_H__
+#define __IFACE_H__
+
+#define Kb  (1024)
+#define Mb  (Kb*Kb)
+
+#define VIA_K800_BRIDGE_VID         0x1106
+#define VIA_K800_BRIDGE_DID         0x3204
+
+#define VIA_K800_SYSTEM_MEMORY_REG  0x47
+#define VIA_K800_VIDEO_MEMORY_REG   0xA1
+
+extern int viafb_memsize;
+unsigned int viafb_get_memsize(void);
+unsigned long viafb_get_videobuf_addr(void);
+
+#endif /* __IFACE_H__ */
diff --git a/drivers/video/via/ioctl.c b/drivers/video/via/ioctl.c
new file mode 100644
index 000000000000..da03c074e32a
--- /dev/null
+++ b/drivers/video/via/ioctl.c
@@ -0,0 +1,112 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; 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 "global.h"
+
+int viafb_ioctl_get_viafb_info(u_long arg)
+{
+        struct viafb_ioctl_info viainfo;
+
+        viainfo.viafb_id = VIAID;
+        viainfo.vendor_id = PCI_VIA_VENDOR_ID;
+
+        switch (viaparinfo->chip_info->gfx_chip_name) {
+        case UNICHROME_CLE266:
+                viainfo.device_id = UNICHROME_CLE266_DID;
+                break;
+
+        case UNICHROME_K400:
+                viainfo.device_id = UNICHROME_K400_DID;
+                break;
+
+        case UNICHROME_K800:
+                viainfo.device_id = UNICHROME_K800_DID;
+                break;
+
+        case UNICHROME_PM800:
+                viainfo.device_id = UNICHROME_PM800_DID;
+                break;
+
+        case UNICHROME_CN700:
+                viainfo.device_id = UNICHROME_CN700_DID;
+                break;
+
+        case UNICHROME_CX700:
+                viainfo.device_id = UNICHROME_CX700_DID;
+                break;
+
+        case UNICHROME_K8M890:
+                viainfo.device_id = UNICHROME_K8M890_DID;
+                break;
+
+        case UNICHROME_P4M890:
+                viainfo.device_id = UNICHROME_P4M890_DID;
+                break;
+
+        case UNICHROME_P4M900:
+                viainfo.device_id = UNICHROME_P4M900_DID;
+                break;
+        }
+
+        viainfo.version = VERSION_MAJOR;
+        viainfo.revision = VERSION_MINOR;
+
+        if (copy_to_user((void __user *)arg, &viainfo, sizeof(viainfo)))
+                return -EFAULT;
+
+        return 0;
+}
+
+/* Hot-Plug Priority: DVI > CRT*/
+int viafb_ioctl_hotplug(int hres, int vres, int bpp)
+{
+        int DVIsense, status = 0;
+        DEBUG_MSG(KERN_INFO "viafb_ioctl_hotplug!!\n");
+
+        if (viaparinfo->chip_info->tmds_chip_info.tmds_chip_name !=
+                NON_TMDS_TRANSMITTER) {
+                DVIsense = viafb_dvi_sense();
+
+                if (DVIsense) {
+                        DEBUG_MSG(KERN_INFO "DVI Attached...\n");
+                        if (viafb_DeviceStatus != DVI_Device) {
+                                viafb_DVI_ON = 1;
+                                viafb_CRT_ON = 0;
+                                viafb_LCD_ON = 0;
+                                viafb_DeviceStatus = DVI_Device;
+                                return viafb_DeviceStatus;
+                        }
+                        status = 1;
+                } else
+                        DEBUG_MSG(KERN_INFO "DVI De-attached...\n");
+        }
+
+        if ((viafb_DeviceStatus != CRT_Device) && (status == 0)) {
+                viafb_CRT_ON = 1;
+                viafb_DVI_ON = 0;
+                viafb_LCD_ON = 0;
+
+                viafb_DeviceStatus = CRT_Device;
+                return viafb_DeviceStatus;
+        }
+
+        return 0;
+}
diff --git a/drivers/video/via/ioctl.h b/drivers/video/via/ioctl.h
new file mode 100644
index 000000000000..842fe30b9868
--- /dev/null
+++ b/drivers/video/via/ioctl.h
@@ -0,0 +1,210 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __IOCTL_H__
+#define __IOCTL_H__
+
+#ifndef __user
+#define __user
+#endif
+
+/* VIAFB IOCTL definition */
+#define VIAFB_GET_INFO_SIZE             0x56494101      /* 'VIA\01' */
+#define VIAFB_GET_INFO                  0x56494102      /* 'VIA\02' */
+#define VIAFB_HOTPLUG                   0x56494103      /* 'VIA\03' */
+#define VIAFB_SET_HOTPLUG_FLAG          0x56494104      /* 'VIA\04' */
+#define VIAFB_GET_RESOLUTION            0x56494105      /* 'VIA\05' */
+#define VIAFB_GET_SAMM_INFO             0x56494107      /* 'VIA\07' */
+#define VIAFB_TURN_ON_OUTPUT_DEVICE     0x56494108      /* 'VIA\08' */
+#define VIAFB_TURN_OFF_OUTPUT_DEVICE    0x56494109      /* 'VIA\09' */
+#define VIAFB_SET_DEVICE                0x5649410A
+#define VIAFB_GET_DEVICE                0x5649410B
+#define VIAFB_GET_DRIVER_VERSION        0x56494112      /* 'VIA\12' */
+#define VIAFB_GET_CHIP_INFO             0x56494113      /* 'VIA\13' */
+#define VIAFB_SET_DEVICE_INFO           0x56494114
+#define VIAFB_GET_DEVICE_INFO           0x56494115
+
+#define VIAFB_GET_DEVICE_SUPPORT        0x56494118
+#define VIAFB_GET_DEVICE_CONNECT        0x56494119
+#define VIAFB_GET_PANEL_SUPPORT_EXPAND  0x5649411A
+#define VIAFB_GET_DRIVER_NAME           0x56494122
+#define VIAFB_GET_DEVICE_SUPPORT_STATE  0x56494123
+#define VIAFB_GET_GAMMA_LUT             0x56494124
+#define VIAFB_SET_GAMMA_LUT             0x56494125
+#define VIAFB_GET_GAMMA_SUPPORT_STATE   0x56494126
+#define VIAFB_SET_VIDEO_DEVICE          0x56494127
+#define VIAFB_GET_VIDEO_DEVICE          0x56494128
+#define VIAFB_SET_SECOND_MODE           0x56494129
+#define VIAFB_SYNC_SURFACE              0x56494130
+#define VIAFB_GET_DRIVER_CAPS           0x56494131
+#define VIAFB_GET_IGA_SCALING_INFO      0x56494132
+#define VIAFB_GET_PANEL_MAX_SIZE        0x56494133
+#define VIAFB_GET_PANEL_MAX_POSITION    0x56494134
+#define VIAFB_SET_PANEL_SIZE            0x56494135
+#define VIAFB_SET_PANEL_POSITION        0x56494136
+#define VIAFB_GET_PANEL_POSITION        0x56494137
+#define VIAFB_GET_PANEL_SIZE            0x56494138
+
+#define None_Device 0x00
+#define CRT_Device  0x01
+#define LCD_Device  0x02
+#define DVI_Device  0x08
+#define CRT2_Device 0x10
+#define LCD2_Device 0x40
+
+#define OP_LCD_CENTERING   0x01
+#define OP_LCD_PANEL_ID    0x02
+#define OP_LCD_MODE        0x03
+
+/*SAMM operation flag*/
+#define OP_SAMM            0x80
+
+#define LCD_PANEL_ID_MAXIMUM    22
+
+#define STATE_ON            0x1
+#define STATE_OFF           0x0
+#define STATE_DEFAULT       0xFFFF
+
+#define MAX_ACTIVE_DEV_NUM  2
+
+struct device_t {
+        unsigned short crt:1;
+        unsigned short dvi:1;
+        unsigned short lcd:1;
+        unsigned short samm:1;
+        unsigned short lcd_dsp_cent:1;
+        unsigned char lcd_mode:1;
+        unsigned short epia_dvi:1;
+        unsigned short lcd_dual_edge:1;
+        unsigned short lcd2:1;
+
+        unsigned short primary_dev;
+        unsigned char lcd_panel_id;
+        unsigned short xres, yres;
+        unsigned short xres1, yres1;
+        unsigned short refresh;
+        unsigned short bpp;
+        unsigned short refresh1;
+        unsigned short bpp1;
+        unsigned short sequence;
+        unsigned short bus_width;
+};
+
+struct viafb_ioctl_info {
+        u32 viafb_id;           /* for identifying viafb */
+#define VIAID       0x56494146  /* Identify myself with 'VIAF' */
+        u16 vendor_id;
+        u16 device_id;
+        u8 version;
+        u8 revision;
+        u8 reserved[246];       /* for future use */
+};
+
+struct viafb_ioctl_mode {
+        u32 xres;
+        u32 yres;
+        u32 refresh;
+        u32 bpp;
+        u32 xres_sec;
+        u32 yres_sec;
+        u32 virtual_xres_sec;
+        u32 virtual_yres_sec;
+        u32 refresh_sec;
+        u32 bpp_sec;
+};
+struct viafb_ioctl_samm {
+        u32 samm_status;
+        u32 size_prim;
+        u32 size_sec;
+        u32 mem_base;
+        u32 offset_sec;
+};
+
+struct viafb_driver_version {
+        int iMajorNum;
+        int iKernelNum;
+        int iOSNum;
+        int iMinorNum;
+};
+
+struct viafb_ioctl_lcd_attribute {
+        unsigned int panel_id;
+        unsigned int display_center;
+        unsigned int lcd_mode;
+};
+
+struct viafb_ioctl_setting {
+        /* Enable or disable active devices */
+        unsigned short device_flag;
+        /* Indicate which device should be turn on or turn off. */
+        unsigned short device_status;
+        unsigned int reserved;
+        /* Indicate which LCD's attribute can be changed. */
+        unsigned short lcd_operation_flag;
+        /* 1: SAMM ON  0: SAMM OFF */
+        unsigned short samm_status;
+        /* horizontal resolution of first device */
+        unsigned short first_dev_hor_res;
+        /* vertical resolution of first device */
+        unsigned short first_dev_ver_res;
+        /* horizontal resolution of second device */
+        unsigned short second_dev_hor_res;
+        /* vertical resolution of second device */
+        unsigned short second_dev_ver_res;
+        /* refresh rate of first device */
+        unsigned short first_dev_refresh;
+        /* bpp of first device */
+        unsigned short first_dev_bpp;
+        /* refresh rate of second device */
+        unsigned short second_dev_refresh;
+        /* bpp of second device */
+        unsigned short second_dev_bpp;
+        /* Indicate which device are primary display device. */
+        unsigned int primary_device;
+        /* Indicate which device will show video. only valid in duoview mode */
+        unsigned int video_device_status;
+        unsigned int struct_reserved[34];
+        struct viafb_ioctl_lcd_attribute lcd_attributes;
+};
+
+struct _UTFunctionCaps {
+        unsigned int dw3DScalingState;
+        unsigned int reserved[31];
+};
+
+struct _POSITIONVALUE {
+        unsigned int dwX;
+        unsigned int dwY;
+};
+
+struct _panel_size_pos_info {
+        unsigned int device_type;
+        int x;
+        int y;
+};
+
+extern int viafb_LCD_ON;
+extern int viafb_DVI_ON;
+
+int viafb_ioctl_get_viafb_info(u_long arg);
+int viafb_ioctl_hotplug(int hres, int vres, int bpp);
+
+#endif /* __IOCTL_H__ */
diff --git a/drivers/video/via/lcd.c b/drivers/video/via/lcd.c
new file mode 100644
index 000000000000..6c7290a6a447
--- /dev/null
+++ b/drivers/video/via/lcd.c
@@ -0,0 +1,1821 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; 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 "global.h"
+#include "lcdtbl.h"
+
+static struct iga2_shadow_crtc_timing iga2_shadow_crtc_reg = {
+        /* IGA2 Shadow Horizontal Total */
+        {IGA2_SHADOW_HOR_TOTAL_REG_NUM, {{CR6D, 0, 7}, {CR71, 3, 3} } },
+        /* IGA2 Shadow Horizontal Blank End */
+        {IGA2_SHADOW_HOR_BLANK_END_REG_NUM, {{CR6E, 0, 7} } },
+        /* IGA2 Shadow Vertical Total */
+        {IGA2_SHADOW_VER_TOTAL_REG_NUM, {{CR6F, 0, 7}, {CR71, 0, 2} } },
+        /* IGA2 Shadow Vertical Addressable Video */
+        {IGA2_SHADOW_VER_ADDR_REG_NUM, {{CR70, 0, 7}, {CR71, 4, 6} } },
+        /* IGA2 Shadow Vertical Blank Start */
+        {IGA2_SHADOW_VER_BLANK_START_REG_NUM,
+         {{CR72, 0, 7}, {CR74, 4, 6} } },
+        /* IGA2 Shadow Vertical Blank End */
+        {IGA2_SHADOW_VER_BLANK_END_REG_NUM, {{CR73, 0, 7}, {CR74, 0, 2} } },
+        /* IGA2 Shadow Vertical Sync Start */
+        {IGA2_SHADOW_VER_SYNC_START_REG_NUM, {{CR75, 0, 7}, {CR76, 4, 6} } },
+        /* IGA2 Shadow Vertical Sync End */
+        {IGA2_SHADOW_VER_SYNC_END_REG_NUM, {{CR76, 0, 3} } }
+};
+
+static struct _lcd_scaling_factor lcd_scaling_factor = {
+        /* LCD Horizontal Scaling Factor Register */
+        {LCD_HOR_SCALING_FACTOR_REG_NUM,
+         {{CR9F, 0, 1}, {CR77, 0, 7}, {CR79, 4, 5} } },
+        /* LCD Vertical Scaling Factor Register */
+        {LCD_VER_SCALING_FACTOR_REG_NUM,
+         {{CR79, 3, 3}, {CR78, 0, 7}, {CR79, 6, 7} } }
+};
+static struct _lcd_scaling_factor lcd_scaling_factor_CLE = {
+        /* LCD Horizontal Scaling Factor Register */
+        {LCD_HOR_SCALING_FACTOR_REG_NUM_CLE, {{CR77, 0, 7}, {CR79, 4, 5} } },
+        /* LCD Vertical Scaling Factor Register */
+        {LCD_VER_SCALING_FACTOR_REG_NUM_CLE, {{CR78, 0, 7}, {CR79, 6, 7} } }
+};
+
+static int check_lvds_chip(int device_id_subaddr, int device_id);
+static bool lvds_identify_integratedlvds(void);
+static int fp_id_to_vindex(int panel_id);
+static int lvds_register_read(int index);
+static void load_lcd_scaling(int set_hres, int set_vres, int panel_hres,
+                      int panel_vres);
+static void load_lcd_k400_patch_tbl(int set_hres, int set_vres,
+        int panel_id);
+static void load_lcd_p880_patch_tbl(int set_hres, int set_vres,
+        int panel_id);
+static void load_lcd_patch_regs(int set_hres, int set_vres,
+        int panel_id, int set_iga);
+static void via_pitch_alignment_patch_lcd(
+        struct lvds_setting_information *plvds_setting_info,
+                                   struct lvds_chip_information
+                                   *plvds_chip_info);
+static void lcd_patch_skew_dvp0(struct lvds_setting_information
+                         *plvds_setting_info,
+                         struct lvds_chip_information *plvds_chip_info);
+static void lcd_patch_skew_dvp1(struct lvds_setting_information
+                         *plvds_setting_info,
+                         struct lvds_chip_information *plvds_chip_info);
+static void lcd_patch_skew(struct lvds_setting_information
+        *plvds_setting_info, struct lvds_chip_information *plvds_chip_info);
+
+static void integrated_lvds_disable(struct lvds_setting_information
+                             *plvds_setting_info,
+                             struct lvds_chip_information *plvds_chip_info);
+static void integrated_lvds_enable(struct lvds_setting_information
+                            *plvds_setting_info,
+                            struct lvds_chip_information *plvds_chip_info);
+static void lcd_powersequence_off(void);
+static void lcd_powersequence_on(void);
+static void fill_lcd_format(void);
+static void check_diport_of_integrated_lvds(
+        struct lvds_chip_information *plvds_chip_info,
+                                     struct lvds_setting_information
+                                     *plvds_setting_info);
+static struct display_timing lcd_centering_timging(struct display_timing
+                                            mode_crt_reg,
+                                           struct display_timing panel_crt_reg);
+static void load_crtc_shadow_timing(struct display_timing mode_timing,
+                             struct display_timing panel_timing);
+static void viafb_load_scaling_factor_for_p4m900(int set_hres,
+        int set_vres, int panel_hres, int panel_vres);
+
+static int check_lvds_chip(int device_id_subaddr, int device_id)
+{
+        if (lvds_register_read(device_id_subaddr) == device_id)
+                return OK;
+        else
+                return FAIL;
+}
+
+void viafb_init_lcd_size(void)
+{
+        DEBUG_MSG(KERN_INFO "viafb_init_lcd_size()\n");
+        DEBUG_MSG(KERN_INFO
+                "viaparinfo->lvds_setting_info->get_lcd_size_method %d\n",
+                viaparinfo->lvds_setting_info->get_lcd_size_method);
+
+        switch (viaparinfo->lvds_setting_info->get_lcd_size_method) {
+        case GET_LCD_SIZE_BY_SYSTEM_BIOS:
+                break;
+        case GET_LCD_SZIE_BY_HW_STRAPPING:
+                break;
+        case GET_LCD_SIZE_BY_VGA_BIOS:
+                DEBUG_MSG(KERN_INFO "Get LCD Size method by VGA BIOS !!\n");
+                viaparinfo->lvds_setting_info->lcd_panel_size =
+                    fp_id_to_vindex(viafb_lcd_panel_id);
+                DEBUG_MSG(KERN_INFO "LCD Panel_ID = %d\n",
+                          viaparinfo->lvds_setting_info->lcd_panel_id);
+                DEBUG_MSG(KERN_INFO "LCD Panel Size = %d\n",
+                          viaparinfo->lvds_setting_info->lcd_panel_size);
+                break;
+        case GET_LCD_SIZE_BY_USER_SETTING:
+                DEBUG_MSG(KERN_INFO "Get LCD Size method by user setting !!\n");
+                viaparinfo->lvds_setting_info->lcd_panel_size =
+                    fp_id_to_vindex(viafb_lcd_panel_id);
+                DEBUG_MSG(KERN_INFO "LCD Panel_ID = %d\n",
+                          viaparinfo->lvds_setting_info->lcd_panel_id);
+                DEBUG_MSG(KERN_INFO "LCD Panel Size = %d\n",
+                          viaparinfo->lvds_setting_info->lcd_panel_size);
+                break;
+        default:
+                DEBUG_MSG(KERN_INFO "viafb_init_lcd_size fail\n");
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID1_800X600;
+                viaparinfo->lvds_setting_info->lcd_panel_size =
+                    fp_id_to_vindex(LCD_PANEL_ID1_800X600);
+        }
+        viaparinfo->lvds_setting_info2->lcd_panel_id =
+                viaparinfo->lvds_setting_info->lcd_panel_id;
+        viaparinfo->lvds_setting_info2->lcd_panel_size =
+                viaparinfo->lvds_setting_info->lcd_panel_size;
+        viaparinfo->lvds_setting_info2->lcd_panel_hres =
+                viaparinfo->lvds_setting_info->lcd_panel_hres;
+        viaparinfo->lvds_setting_info2->lcd_panel_vres =
+                viaparinfo->lvds_setting_info->lcd_panel_vres;
+        viaparinfo->lvds_setting_info2->device_lcd_dualedge =
+            viaparinfo->lvds_setting_info->device_lcd_dualedge;
+        viaparinfo->lvds_setting_info2->LCDDithering =
+                viaparinfo->lvds_setting_info->LCDDithering;
+}
+
+static bool lvds_identify_integratedlvds(void)
+{
+        if (viafb_display_hardware_layout == HW_LAYOUT_LCD_EXTERNAL_LCD2) {
+                /* Two dual channel LCD (Internal LVDS + External LVDS): */
+                /* If we have an external LVDS, such as VT1636, we should
+                   have its chip ID already. */
+                if (viaparinfo->chip_info->lvds_chip_info.lvds_chip_name) {
+                        viaparinfo->chip_info->lvds_chip_info2.lvds_chip_name =
+                            INTEGRATED_LVDS;
+                        DEBUG_MSG(KERN_INFO "Support two dual channel LVDS!\
+                                  (Internal LVDS + External LVDS)\n");
+                } else {
+                        viaparinfo->chip_info->lvds_chip_info.lvds_chip_name =
+                            INTEGRATED_LVDS;
+                        DEBUG_MSG(KERN_INFO "Not found external LVDS,\
+                                  so can't support two dual channel LVDS!\n");
+                }
+        } else if (viafb_display_hardware_layout == HW_LAYOUT_LCD1_LCD2) {
+                /* Two single channel LCD (Internal LVDS + Internal LVDS): */
+                viaparinfo->chip_info->lvds_chip_info.lvds_chip_name =
+                INTEGRATED_LVDS;
+                viaparinfo->chip_info->lvds_chip_info2.lvds_chip_name =
+                        INTEGRATED_LVDS;
+                DEBUG_MSG(KERN_INFO "Support two single channel LVDS!\
+                          (Internal LVDS + Internal LVDS)\n");
+        } else if (viafb_display_hardware_layout != HW_LAYOUT_DVI_ONLY) {
+                /* If we have found external LVDS, just use it,
+                   otherwise, we will use internal LVDS as default. */
+                if (!viaparinfo->chip_info->lvds_chip_info.lvds_chip_name) {
+                        viaparinfo->chip_info->lvds_chip_info.lvds_chip_name =
+                            INTEGRATED_LVDS;
+                        DEBUG_MSG(KERN_INFO "Found Integrated LVDS!\n");
+                }
+        } else {
+                viaparinfo->chip_info->lvds_chip_info.lvds_chip_name =
+                        NON_LVDS_TRANSMITTER;
+                DEBUG_MSG(KERN_INFO "Do not support LVDS!\n");
+                return false;
+        }
+
+        return true;
+}
+
+int viafb_lvds_trasmitter_identify(void)
+{
+        viaparinfo->i2c_stuff.i2c_port = I2CPORTINDEX;
+        if (viafb_lvds_identify_vt1636()) {
+                viaparinfo->chip_info->lvds_chip_info.i2c_port = I2CPORTINDEX;
+                DEBUG_MSG(KERN_INFO
+                          "Found VIA VT1636 LVDS on port i2c 0x31 \n");
+        } else {
+                viaparinfo->i2c_stuff.i2c_port = GPIOPORTINDEX;
+                if (viafb_lvds_identify_vt1636()) {
+                        viaparinfo->chip_info->lvds_chip_info.i2c_port =
+                                GPIOPORTINDEX;
+                        DEBUG_MSG(KERN_INFO
+                                  "Found VIA VT1636 LVDS on port gpio 0x2c \n");
+                }
+        }
+
+        if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CX700)
+                lvds_identify_integratedlvds();
+
+        if (viaparinfo->chip_info->lvds_chip_info.lvds_chip_name)
+                return true;
+        /* Check for VT1631: */
+        viaparinfo->chip_info->lvds_chip_info.lvds_chip_name = VT1631_LVDS;
+        viaparinfo->chip_info->lvds_chip_info.lvds_chip_slave_addr =
+                VT1631_LVDS_I2C_ADDR;
+
+        if (check_lvds_chip(VT1631_DEVICE_ID_REG, VT1631_DEVICE_ID) != FAIL) {
+                DEBUG_MSG(KERN_INFO "\n VT1631 LVDS ! \n");
+                DEBUG_MSG(KERN_INFO "\n %2d",
+                          viaparinfo->chip_info->lvds_chip_info.lvds_chip_name);
+                DEBUG_MSG(KERN_INFO "\n %2d",
+                          viaparinfo->chip_info->lvds_chip_info.lvds_chip_name);
+                return OK;
+        }
+
+        viaparinfo->chip_info->lvds_chip_info.lvds_chip_name =
+                NON_LVDS_TRANSMITTER;
+        viaparinfo->chip_info->lvds_chip_info.lvds_chip_slave_addr =
+                VT1631_LVDS_I2C_ADDR;
+        return FAIL;
+}
+
+static int fp_id_to_vindex(int panel_id)
+{
+        DEBUG_MSG(KERN_INFO "fp_get_panel_id()\n");
+
+        if (panel_id > LCD_PANEL_ID_MAXIMUM)
+                viafb_lcd_panel_id = panel_id =
+                viafb_read_reg(VIACR, CR3F) & 0x0F;
+
+        switch (panel_id) {
+        case 0x0:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 640;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 480;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID0_640X480;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_640X480;
+                break;
+        case 0x1:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 800;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 600;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID1_800X600;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_800X600;
+                break;
+        case 0x2:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1024;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 768;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID2_1024X768;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_1024X768;
+                break;
+        case 0x3:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 768;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID3_1280X768;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_1280X768;
+                break;
+        case 0x4:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 1024;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID4_1280X1024;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_1280X1024;
+                break;
+        case 0x5:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1400;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 1050;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID5_1400X1050;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_1400X1050;
+                break;
+        case 0x6:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1600;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 1200;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID6_1600X1200;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_1600X1200;
+                break;
+        case 0x8:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 800;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 480;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_IDA_800X480;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_800X480;
+                break;
+        case 0x9:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1024;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 768;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID2_1024X768;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_1024X768;
+                break;
+        case 0xA:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1024;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 768;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID2_1024X768;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 0;
+                return VIA_RES_1024X768;
+                break;
+        case 0xB:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1024;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 768;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID2_1024X768;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
+                viaparinfo->lvds_setting_info->LCDDithering = 0;
+                return VIA_RES_1024X768;
+                break;
+        case 0xC:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 768;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID3_1280X768;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 0;
+                return VIA_RES_1280X768;
+                break;
+        case 0xD:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 1024;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID4_1280X1024;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
+                viaparinfo->lvds_setting_info->LCDDithering = 0;
+                return VIA_RES_1280X1024;
+                break;
+        case 0xE:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1400;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 1050;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID5_1400X1050;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
+                viaparinfo->lvds_setting_info->LCDDithering = 0;
+                return VIA_RES_1400X1050;
+                break;
+        case 0xF:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1600;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 1200;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID6_1600X1200;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
+                viaparinfo->lvds_setting_info->LCDDithering = 0;
+                return VIA_RES_1600X1200;
+                break;
+        case 0x10:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1366;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 768;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID7_1366X768;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 0;
+                return VIA_RES_1368X768;
+                break;
+        case 0x11:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1024;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 600;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID8_1024X600;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_1024X600;
+                break;
+        case 0x12:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 768;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID3_1280X768;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_1280X768;
+                break;
+        case 0x13:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 800;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID9_1280X800;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_1280X800;
+                break;
+        case 0x14:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1360;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 768;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_IDB_1360X768;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 0;
+                return VIA_RES_1360X768;
+                break;
+        case 0x15:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 768;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID3_1280X768;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
+                viaparinfo->lvds_setting_info->LCDDithering = 0;
+                return VIA_RES_1280X768;
+                break;
+        case 0x16:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 480;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 640;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_IDC_480X640;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_480X640;
+                break;
+        default:
+                viaparinfo->lvds_setting_info->lcd_panel_hres = 800;
+                viaparinfo->lvds_setting_info->lcd_panel_vres = 600;
+                viaparinfo->lvds_setting_info->lcd_panel_id =
+                        LCD_PANEL_ID1_800X600;
+                viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
+                viaparinfo->lvds_setting_info->LCDDithering = 1;
+                return VIA_RES_800X600;
+        }
+}
+
+static int lvds_register_read(int index)
+{
+        u8 data;
+
+        viaparinfo->i2c_stuff.i2c_port = GPIOPORTINDEX;
+        viafb_i2c_readbyte((u8) viaparinfo->chip_info->
+            lvds_chip_info.lvds_chip_slave_addr,
+                        (u8) index, &data);
+        return data;
+}
+
+static void load_lcd_scaling(int set_hres, int set_vres, int panel_hres,
+                      int panel_vres)
+{
+        int reg_value = 0;
+        int viafb_load_reg_num;
+        struct io_register *reg = NULL;
+
+        DEBUG_MSG(KERN_INFO "load_lcd_scaling()!!\n");
+
+        /* LCD Scaling Enable */
+        viafb_write_reg_mask(CR79, VIACR, 0x07, BIT0 + BIT1 + BIT2);
+        if (UNICHROME_P4M900 == viaparinfo->chip_info->gfx_chip_name) {
+                viafb_load_scaling_factor_for_p4m900(set_hres, set_vres,
+                                               panel_hres, panel_vres);
+                return;
+        }
+
+        /* Check if expansion for horizontal */
+        if (set_hres != panel_hres) {
+                /* Load Horizontal Scaling Factor */
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_CLE266:
+                case UNICHROME_K400:
+                        reg_value =
+                            CLE266_LCD_HOR_SCF_FORMULA(set_hres, panel_hres);
+                        viafb_load_reg_num =
+                            lcd_scaling_factor_CLE.lcd_hor_scaling_factor.
+                            reg_num;
+                        reg = lcd_scaling_factor_CLE.lcd_hor_scaling_factor.reg;
+                        viafb_load_reg(reg_value,
+                                viafb_load_reg_num, reg, VIACR);
+                        break;
+                case UNICHROME_K800:
+                case UNICHROME_PM800:
+                case UNICHROME_CN700:
+                case UNICHROME_CX700:
+                case UNICHROME_K8M890:
+                case UNICHROME_P4M890:
+                        reg_value =
+                            K800_LCD_HOR_SCF_FORMULA(set_hres, panel_hres);
+                        /* Horizontal scaling enabled */
+                        viafb_write_reg_mask(CRA2, VIACR, 0xC0, BIT7 + BIT6);
+                        viafb_load_reg_num =
+                            lcd_scaling_factor.lcd_hor_scaling_factor.reg_num;
+                        reg = lcd_scaling_factor.lcd_hor_scaling_factor.reg;
+                        viafb_load_reg(reg_value,
+                                viafb_load_reg_num, reg, VIACR);
+                        break;
+                }
+
+                DEBUG_MSG(KERN_INFO "Horizontal Scaling value = %d", reg_value);
+        } else {
+                /* Horizontal scaling disabled */
+                viafb_write_reg_mask(CRA2, VIACR, 0x00, BIT7);
+        }
+
+        /* Check if expansion for vertical */
+        if (set_vres != panel_vres) {
+                /* Load Vertical Scaling Factor */
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_CLE266:
+                case UNICHROME_K400:
+                        reg_value =
+                            CLE266_LCD_VER_SCF_FORMULA(set_vres, panel_vres);
+                        viafb_load_reg_num =
+                            lcd_scaling_factor_CLE.lcd_ver_scaling_factor.
+                            reg_num;
+                        reg = lcd_scaling_factor_CLE.lcd_ver_scaling_factor.reg;
+                        viafb_load_reg(reg_value,
+                                viafb_load_reg_num, reg, VIACR);
+                        break;
+                case UNICHROME_K800:
+                case UNICHROME_PM800:
+                case UNICHROME_CN700:
+                case UNICHROME_CX700:
+                case UNICHROME_K8M890:
+                case UNICHROME_P4M890:
+                        reg_value =
+                            K800_LCD_VER_SCF_FORMULA(set_vres, panel_vres);
+                        /* Vertical scaling enabled */
+                        viafb_write_reg_mask(CRA2, VIACR, 0x08, BIT3);
+                        viafb_load_reg_num =
+                            lcd_scaling_factor.lcd_ver_scaling_factor.reg_num;
+                        reg = lcd_scaling_factor.lcd_ver_scaling_factor.reg;
+                        viafb_load_reg(reg_value,
+                                viafb_load_reg_num, reg, VIACR);
+                        break;
+                }
+
+                DEBUG_MSG(KERN_INFO "Vertical Scaling value = %d", reg_value);
+        } else {
+                /* Vertical scaling disabled */
+                viafb_write_reg_mask(CRA2, VIACR, 0x00, BIT3);
+        }
+}
+
+static void load_lcd_k400_patch_tbl(int set_hres, int set_vres,
+        int panel_id)
+{
+        int vmode_index;
+        int reg_num = 0;
+        struct io_reg *lcd_patch_reg = NULL;
+
+        if (viaparinfo->lvds_setting_info->iga_path == IGA2)
+                vmode_index = viafb_get_mode_index(set_hres, set_vres, 1);
+        else
+                vmode_index = viafb_get_mode_index(set_hres, set_vres, 0);
+        switch (panel_id) {
+                /* LCD 800x600 */
+        case LCD_PANEL_ID1_800X600:
+                switch (vmode_index) {
+                case VIA_RES_640X400:
+                case VIA_RES_640X480:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_6X4_8X6;
+                        lcd_patch_reg = K400_LCD_RES_6X4_8X6;
+                        break;
+                case VIA_RES_720X480:
+                case VIA_RES_720X576:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_7X4_8X6;
+                        lcd_patch_reg = K400_LCD_RES_7X4_8X6;
+                        break;
+                }
+                break;
+
+                /* LCD 1024x768 */
+        case LCD_PANEL_ID2_1024X768:
+                switch (vmode_index) {
+                case VIA_RES_640X400:
+                case VIA_RES_640X480:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_6X4_10X7;
+                        lcd_patch_reg = K400_LCD_RES_6X4_10X7;
+                        break;
+                case VIA_RES_720X480:
+                case VIA_RES_720X576:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_7X4_10X7;
+                        lcd_patch_reg = K400_LCD_RES_7X4_10X7;
+                        break;
+                case VIA_RES_800X600:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_8X6_10X7;
+                        lcd_patch_reg = K400_LCD_RES_8X6_10X7;
+                        break;
+                }
+                break;
+
+                /* LCD 1280x1024 */
+        case LCD_PANEL_ID4_1280X1024:
+                switch (vmode_index) {
+                case VIA_RES_640X400:
+                case VIA_RES_640X480:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_6X4_12X10;
+                        lcd_patch_reg = K400_LCD_RES_6X4_12X10;
+                        break;
+                case VIA_RES_720X480:
+                case VIA_RES_720X576:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_7X4_12X10;
+                        lcd_patch_reg = K400_LCD_RES_7X4_12X10;
+                        break;
+                case VIA_RES_800X600:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_8X6_12X10;
+                        lcd_patch_reg = K400_LCD_RES_8X6_12X10;
+                        break;
+                case VIA_RES_1024X768:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_10X7_12X10;
+                        lcd_patch_reg = K400_LCD_RES_10X7_12X10;
+                        break;
+
+                }
+                break;
+
+                /* LCD 1400x1050 */
+        case LCD_PANEL_ID5_1400X1050:
+                switch (vmode_index) {
+                case VIA_RES_640X480:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_6X4_14X10;
+                        lcd_patch_reg = K400_LCD_RES_6X4_14X10;
+                        break;
+                case VIA_RES_800X600:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_8X6_14X10;
+                        lcd_patch_reg = K400_LCD_RES_8X6_14X10;
+                        break;
+                case VIA_RES_1024X768:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_10X7_14X10;
+                        lcd_patch_reg = K400_LCD_RES_10X7_14X10;
+                        break;
+                case VIA_RES_1280X768:
+                case VIA_RES_1280X800:
+                case VIA_RES_1280X960:
+                case VIA_RES_1280X1024:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_12X10_14X10;
+                        lcd_patch_reg = K400_LCD_RES_12X10_14X10;
+                        break;
+                }
+                break;
+
+                /* LCD 1600x1200 */
+        case LCD_PANEL_ID6_1600X1200:
+                switch (vmode_index) {
+                case VIA_RES_640X400:
+                case VIA_RES_640X480:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_6X4_16X12;
+                        lcd_patch_reg = K400_LCD_RES_6X4_16X12;
+                        break;
+                case VIA_RES_720X480:
+                case VIA_RES_720X576:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_7X4_16X12;
+                        lcd_patch_reg = K400_LCD_RES_7X4_16X12;
+                        break;
+                case VIA_RES_800X600:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_8X6_16X12;
+                        lcd_patch_reg = K400_LCD_RES_8X6_16X12;
+                        break;
+                case VIA_RES_1024X768:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_10X7_16X12;
+                        lcd_patch_reg = K400_LCD_RES_10X7_16X12;
+                        break;
+                case VIA_RES_1280X768:
+                case VIA_RES_1280X800:
+                case VIA_RES_1280X960:
+                case VIA_RES_1280X1024:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_12X10_16X12;
+                        lcd_patch_reg = K400_LCD_RES_12X10_16X12;
+                        break;
+                }
+                break;
+
+                /* LCD 1366x768 */
+        case LCD_PANEL_ID7_1366X768:
+                switch (vmode_index) {
+                case VIA_RES_640X480:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_6X4_1366X7;
+                        lcd_patch_reg = K400_LCD_RES_6X4_1366X7;
+                        break;
+                case VIA_RES_720X480:
+                case VIA_RES_720X576:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_7X4_1366X7;
+                        lcd_patch_reg = K400_LCD_RES_7X4_1366X7;
+                        break;
+                case VIA_RES_800X600:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_8X6_1366X7;
+                        lcd_patch_reg = K400_LCD_RES_8X6_1366X7;
+                        break;
+                case VIA_RES_1024X768:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_10X7_1366X7;
+                        lcd_patch_reg = K400_LCD_RES_10X7_1366X7;
+                        break;
+                case VIA_RES_1280X768:
+                case VIA_RES_1280X800:
+                case VIA_RES_1280X960:
+                case VIA_RES_1280X1024:
+                        reg_num = NUM_TOTAL_K400_LCD_RES_12X10_1366X7;
+                        lcd_patch_reg = K400_LCD_RES_12X10_1366X7;
+                        break;
+                }
+                break;
+
+                /* LCD 1360x768 */
+        case LCD_PANEL_IDB_1360X768:
+                break;
+        }
+        if (reg_num != 0) {
+                /* H.W. Reset : ON */
+                viafb_write_reg_mask(CR17, VIACR, 0x00, BIT7);
+
+                viafb_write_regx(lcd_patch_reg, reg_num);
+
+                /* H.W. Reset : OFF */
+                viafb_write_reg_mask(CR17, VIACR, 0x80, BIT7);
+
+                /* Reset PLL */
+                viafb_write_reg_mask(SR40, VIASR, 0x02, BIT1);
+                viafb_write_reg_mask(SR40, VIASR, 0x00, BIT1);
+
+                /* Fire! */
+                outb(inb(VIARMisc) | (BIT2 + BIT3), VIAWMisc);
+        }
+}
+
+static void load_lcd_p880_patch_tbl(int set_hres, int set_vres,
+        int panel_id)
+{
+        int vmode_index;
+        int reg_num = 0;
+        struct io_reg *lcd_patch_reg = NULL;
+
+        if (viaparinfo->lvds_setting_info->iga_path == IGA2)
+                vmode_index = viafb_get_mode_index(set_hres, set_vres, 1);
+        else
+                vmode_index = viafb_get_mode_index(set_hres, set_vres, 0);
+
+        switch (panel_id) {
+        case LCD_PANEL_ID5_1400X1050:
+                switch (vmode_index) {
+                case VIA_RES_640X480:
+                        reg_num = NUM_TOTAL_P880_LCD_RES_6X4_14X10;
+                        lcd_patch_reg = P880_LCD_RES_6X4_14X10;
+                        break;
+                case VIA_RES_800X600:
+                        reg_num = NUM_TOTAL_P880_LCD_RES_8X6_14X10;
+                        lcd_patch_reg = P880_LCD_RES_8X6_14X10;
+                        break;
+                }
+                break;
+        case LCD_PANEL_ID6_1600X1200:
+                switch (vmode_index) {
+                case VIA_RES_640X400:
+                case VIA_RES_640X480:
+                        reg_num = NUM_TOTAL_P880_LCD_RES_6X4_16X12;
+                        lcd_patch_reg = P880_LCD_RES_6X4_16X12;
+                        break;
+                case VIA_RES_720X480:
+                case VIA_RES_720X576:
+                        reg_num = NUM_TOTAL_P880_LCD_RES_7X4_16X12;
+                        lcd_patch_reg = P880_LCD_RES_7X4_16X12;
+                        break;
+                case VIA_RES_800X600:
+                        reg_num = NUM_TOTAL_P880_LCD_RES_8X6_16X12;
+                        lcd_patch_reg = P880_LCD_RES_8X6_16X12;
+                        break;
+                case VIA_RES_1024X768:
+                        reg_num = NUM_TOTAL_P880_LCD_RES_10X7_16X12;
+                        lcd_patch_reg = P880_LCD_RES_10X7_16X12;
+                        break;
+                case VIA_RES_1280X768:
+                case VIA_RES_1280X960:
+                case VIA_RES_1280X1024:
+                        reg_num = NUM_TOTAL_P880_LCD_RES_12X10_16X12;
+                        lcd_patch_reg = P880_LCD_RES_12X10_16X12;
+                        break;
+                }
+                break;
+
+        }
+        if (reg_num != 0) {
+                /* H.W. Reset : ON */
+                viafb_write_reg_mask(CR17, VIACR, 0x00, BIT7);
+
+                viafb_write_regx(lcd_patch_reg, reg_num);
+
+                /* H.W. Reset : OFF */
+                viafb_write_reg_mask(CR17, VIACR, 0x80, BIT7);
+
+                /* Reset PLL */
+                viafb_write_reg_mask(SR40, VIASR, 0x02, BIT1);
+                viafb_write_reg_mask(SR40, VIASR, 0x00, BIT1);
+
+                /* Fire! */
+                outb(inb(VIARMisc) | (BIT2 + BIT3), VIAWMisc);
+        }
+}
+
+static void load_lcd_patch_regs(int set_hres, int set_vres,
+        int panel_id, int set_iga)
+{
+        int vmode_index;
+
+        if (viaparinfo->lvds_setting_info->iga_path == IGA2)
+                vmode_index = viafb_get_mode_index(set_hres, set_vres, 1);
+        else
+                vmode_index = viafb_get_mode_index(set_hres, set_vres, 0);
+
+        viafb_unlock_crt();
+
+        /* Patch for simultaneous & Expansion */
+        if ((set_iga == IGA1_IGA2) &&
+                (viaparinfo->lvds_setting_info->display_method ==
+            LCD_EXPANDSION)) {
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_CLE266:
+                case UNICHROME_K400:
+                        load_lcd_k400_patch_tbl(set_hres, set_vres, panel_id);
+                        break;
+                case UNICHROME_K800:
+                        break;
+                case UNICHROME_PM800:
+                case UNICHROME_CN700:
+                case UNICHROME_CX700:
+                        load_lcd_p880_patch_tbl(set_hres, set_vres, panel_id);
+                }
+        }
+
+        viafb_lock_crt();
+}
+
+static void via_pitch_alignment_patch_lcd(
+        struct lvds_setting_information *plvds_setting_info,
+                                   struct lvds_chip_information
+                                   *plvds_chip_info)
+{
+        unsigned char cr13, cr35, cr65, cr66, cr67;
+        unsigned long dwScreenPitch = 0;
+        unsigned long dwPitch;
+
+        dwPitch = plvds_setting_info->h_active * (plvds_setting_info->bpp >> 3);
+        if (dwPitch & 0x1F) {
+                dwScreenPitch = ((dwPitch + 31) & ~31) >> 3;
+                if (plvds_setting_info->iga_path == IGA2) {
+                        if (plvds_setting_info->bpp > 8) {
+                                cr66 = (unsigned char)(dwScreenPitch & 0xFF);
+                                viafb_write_reg(CR66, VIACR, cr66);
+                                cr67 = viafb_read_reg(VIACR, CR67) & 0xFC;
+                                cr67 |=
+                                    (unsigned
+                                     char)((dwScreenPitch & 0x300) >> 8);
+                                viafb_write_reg(CR67, VIACR, cr67);
+                        }
+
+                        /* Fetch Count */
+                        cr67 = viafb_read_reg(VIACR, CR67) & 0xF3;
+                        cr67 |= (unsigned char)((dwScreenPitch & 0x600) >> 7);
+                        viafb_write_reg(CR67, VIACR, cr67);
+                        cr65 = (unsigned char)((dwScreenPitch >> 1) & 0xFF);
+                        cr65 += 2;
+                        viafb_write_reg(CR65, VIACR, cr65);
+                } else {
+                        if (plvds_setting_info->bpp > 8) {
+                                cr13 = (unsigned char)(dwScreenPitch & 0xFF);
+                                viafb_write_reg(CR13, VIACR, cr13);
+                                cr35 = viafb_read_reg(VIACR, CR35) & 0x1F;
+                                cr35 |=
+                                    (unsigned
+                                     char)((dwScreenPitch & 0x700) >> 3);
+                                viafb_write_reg(CR35, VIACR, cr35);
+                        }
+                }
+        }
+}
+static void lcd_patch_skew_dvp0(struct lvds_setting_information
+                         *plvds_setting_info,
+                         struct lvds_chip_information *plvds_chip_info)
+{
+        if (VT1636_LVDS == plvds_chip_info->lvds_chip_name) {
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_P4M900:
+                        viafb_vt1636_patch_skew_on_vt3364(plvds_setting_info,
+                                                    plvds_chip_info);
+                        break;
+                case UNICHROME_P4M890:
+                        viafb_vt1636_patch_skew_on_vt3327(plvds_setting_info,
+                                                    plvds_chip_info);
+                        break;
+                }
+        }
+}
+static void lcd_patch_skew_dvp1(struct lvds_setting_information
+                         *plvds_setting_info,
+                         struct lvds_chip_information *plvds_chip_info)
+{
+        if (VT1636_LVDS == plvds_chip_info->lvds_chip_name) {
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_CX700:
+                        viafb_vt1636_patch_skew_on_vt3324(plvds_setting_info,
+                                                    plvds_chip_info);
+                        break;
+                }
+        }
+}
+static void lcd_patch_skew(struct lvds_setting_information
+        *plvds_setting_info, struct lvds_chip_information *plvds_chip_info)
+{
+        DEBUG_MSG(KERN_INFO "lcd_patch_skew\n");
+        switch (plvds_chip_info->output_interface) {
+        case INTERFACE_DVP0:
+                lcd_patch_skew_dvp0(plvds_setting_info, plvds_chip_info);
+                break;
+        case INTERFACE_DVP1:
+                lcd_patch_skew_dvp1(plvds_setting_info, plvds_chip_info);
+                break;
+        case INTERFACE_DFP_LOW:
+                if (UNICHROME_P4M900 == viaparinfo->chip_info->gfx_chip_name) {
+                        viafb_write_reg_mask(CR99, VIACR, 0x08,
+                                       BIT0 + BIT1 + BIT2 + BIT3);
+                }
+                break;
+        }
+}
+
+/* LCD Set Mode */
+void viafb_lcd_set_mode(struct crt_mode_table *mode_crt_table,
+                  struct lvds_setting_information *plvds_setting_info,
+                  struct lvds_chip_information *plvds_chip_info)
+{
+        int video_index = plvds_setting_info->lcd_panel_size;
+        int set_iga = plvds_setting_info->iga_path;
+        int mode_bpp = plvds_setting_info->bpp;
+        int viafb_load_reg_num = 0;
+        int reg_value = 0;
+        int set_hres, set_vres;
+        int panel_hres, panel_vres;
+        u32 pll_D_N;
+        int offset;
+        struct io_register *reg = NULL;
+        struct display_timing mode_crt_reg, panel_crt_reg;
+        struct crt_mode_table *panel_crt_table = NULL;
+        struct VideoModeTable *vmode_tbl = NULL;
+
+        DEBUG_MSG(KERN_INFO "viafb_lcd_set_mode!!\n");
+        /* Get mode table */
+        mode_crt_reg = mode_crt_table->crtc;
+        /* Get panel table Pointer */
+        vmode_tbl = viafb_get_modetbl_pointer(video_index);
+        panel_crt_table = vmode_tbl->crtc;
+        panel_crt_reg = panel_crt_table->crtc;
+        DEBUG_MSG(KERN_INFO "bellow viafb_lcd_set_mode!!\n");
+        set_hres = plvds_setting_info->h_active;
+        set_vres = plvds_setting_info->v_active;
+        panel_hres = plvds_setting_info->lcd_panel_hres;
+        panel_vres = plvds_setting_info->lcd_panel_vres;
+        if (VT1636_LVDS == plvds_chip_info->lvds_chip_name)
+                viafb_init_lvds_vt1636(plvds_setting_info, plvds_chip_info);
+        plvds_setting_info->vclk = panel_crt_table->clk;
+        if (set_iga == IGA1) {
+                /* IGA1 doesn't have LCD scaling, so set it as centering. */
+                viafb_load_crtc_timing(lcd_centering_timging
+                                 (mode_crt_reg, panel_crt_reg), IGA1);
+        } else {
+                /* Expansion */
+                if ((plvds_setting_info->display_method ==
+                     LCD_EXPANDSION) & ((set_hres != panel_hres)
+                                        || (set_vres != panel_vres))) {
+                        /* expansion timing IGA2 loaded panel set timing*/
+                        viafb_load_crtc_timing(panel_crt_reg, IGA2);
+                        DEBUG_MSG(KERN_INFO "viafb_load_crtc_timing!!\n");
+                        load_lcd_scaling(set_hres, set_vres, panel_hres,
+                                         panel_vres);
+                        DEBUG_MSG(KERN_INFO "load_lcd_scaling!!\n");
+                } else {        /* Centering */
+                        /* centering timing IGA2 always loaded panel
+                           and mode releative timing */
+                        viafb_load_crtc_timing(lcd_centering_timging
+                                         (mode_crt_reg, panel_crt_reg), IGA2);
+                        viafb_write_reg_mask(CR79, VIACR, 0x00,
+                                BIT0 + BIT1 + BIT2);
+                        /* LCD scaling disabled */
+                }
+        }
+
+        if (set_iga == IGA1_IGA2) {
+                load_crtc_shadow_timing(mode_crt_reg, panel_crt_reg);
+                /* Fill shadow registers */
+
+                switch (plvds_setting_info->lcd_panel_id) {
+                case LCD_PANEL_ID0_640X480:
+                        offset = 80;
+                        break;
+                case LCD_PANEL_ID1_800X600:
+                case LCD_PANEL_IDA_800X480:
+                        offset = 110;
+                        break;
+                case LCD_PANEL_ID2_1024X768:
+                        offset = 150;
+                        break;
+                case LCD_PANEL_ID3_1280X768:
+                case LCD_PANEL_ID4_1280X1024:
+                case LCD_PANEL_ID5_1400X1050:
+                case LCD_PANEL_ID9_1280X800:
+                        offset = 190;
+                        break;
+                case LCD_PANEL_ID6_1600X1200:
+                        offset = 250;
+                        break;
+                case LCD_PANEL_ID7_1366X768:
+                case LCD_PANEL_IDB_1360X768:
+                        offset = 212;
+                        break;
+                default:
+                        offset = 140;
+                        break;
+                }
+
+                /* Offset for simultaneous */
+                reg_value = offset;
+                viafb_load_reg_num = offset_reg.iga2_offset_reg.reg_num;
+                reg = offset_reg.iga2_offset_reg.reg;
+                viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIACR);
+                DEBUG_MSG(KERN_INFO "viafb_load_reg!!\n");
+                viafb_load_fetch_count_reg(set_hres, 4, IGA2);
+                /* Fetch count for simultaneous */
+        } else {                /* SAMM */
+                /* Offset for IGA2 only */
+                viafb_load_offset_reg(set_hres, mode_bpp / 8, set_iga);
+                /* Fetch count for IGA2 only */
+                viafb_load_fetch_count_reg(set_hres, mode_bpp / 8, set_iga);
+
+                if ((viaparinfo->chip_info->gfx_chip_name != UNICHROME_CLE266)
+                    && (viaparinfo->chip_info->gfx_chip_name != UNICHROME_K400))
+                        viafb_load_FIFO_reg(set_iga, set_hres, set_vres);
+
+                viafb_set_color_depth(mode_bpp / 8, set_iga);
+        }
+
+        fill_lcd_format();
+
+        pll_D_N = viafb_get_clk_value(panel_crt_table[0].clk);
+        DEBUG_MSG(KERN_INFO "PLL=0x%x", pll_D_N);
+        viafb_set_vclock(pll_D_N, set_iga);
+
+        viafb_set_output_path(DEVICE_LCD, set_iga,
+                plvds_chip_info->output_interface);
+        lcd_patch_skew(plvds_setting_info, plvds_chip_info);
+
+        /* If K8M800, enable LCD Prefetch Mode. */
+        if ((viaparinfo->chip_info->gfx_chip_name == UNICHROME_K800)
+            || (UNICHROME_K8M890 == viaparinfo->chip_info->gfx_chip_name))
+                viafb_write_reg_mask(CR6A, VIACR, 0x01, BIT0);
+
+        load_lcd_patch_regs(set_hres, set_vres,
+                            plvds_setting_info->lcd_panel_id, set_iga);
+
+        DEBUG_MSG(KERN_INFO "load_lcd_patch_regs!!\n");
+
+        /* Patch for non 32bit alignment mode */
+        via_pitch_alignment_patch_lcd(plvds_setting_info, plvds_chip_info);
+}
+
+static void integrated_lvds_disable(struct lvds_setting_information
+                             *plvds_setting_info,
+                             struct lvds_chip_information *plvds_chip_info)
+{
+        bool turn_off_first_powersequence = false;
+        bool turn_off_second_powersequence = false;
+        if (INTERFACE_LVDS0LVDS1 == plvds_chip_info->output_interface)
+                turn_off_first_powersequence = true;
+        if (INTERFACE_LVDS0 == plvds_chip_info->output_interface)
+                turn_off_first_powersequence = true;
+        if (INTERFACE_LVDS1 == plvds_chip_info->output_interface)
+                turn_off_second_powersequence = true;
+        if (turn_off_second_powersequence) {
+                /* Use second power sequence control: */
+
+                /* Turn off power sequence. */
+                viafb_write_reg_mask(CRD4, VIACR, 0, BIT1);
+
+                /* Turn off back light. */
+                viafb_write_reg_mask(CRD3, VIACR, 0xC0, BIT6 + BIT7);
+        }
+        if (turn_off_first_powersequence) {
+                /* Use first power sequence control: */
+
+                /* Turn off power sequence. */
+                viafb_write_reg_mask(CR6A, VIACR, 0, BIT3);
+
+                /* Turn off back light. */
+                viafb_write_reg_mask(CR91, VIACR, 0xC0, BIT6 + BIT7);
+        }
+
+        /* Turn DFP High/Low Pad off. */
+        viafb_write_reg_mask(SR2A, VIASR, 0, BIT0 + BIT1 + BIT2 + BIT3);
+
+        /* Power off LVDS channel. */
+        switch (plvds_chip_info->output_interface) {
+        case INTERFACE_LVDS0:
+                {
+                        viafb_write_reg_mask(CRD2, VIACR, 0x80, BIT7);
+                        break;
+                }
+
+        case INTERFACE_LVDS1:
+                {
+                        viafb_write_reg_mask(CRD2, VIACR, 0x40, BIT6);
+                        break;
+                }
+
+        case INTERFACE_LVDS0LVDS1:
+                {
+                        viafb_write_reg_mask(CRD2, VIACR, 0xC0, BIT6 + BIT7);
+                        break;
+                }
+        }
+}
+
+static void integrated_lvds_enable(struct lvds_setting_information
+                            *plvds_setting_info,
+                            struct lvds_chip_information *plvds_chip_info)
+{
+        bool turn_on_first_powersequence = false;
+        bool turn_on_second_powersequence = false;
+
+        DEBUG_MSG(KERN_INFO "integrated_lvds_enable, out_interface:%d\n",
+                  plvds_chip_info->output_interface);
+        if (plvds_setting_info->lcd_mode == LCD_SPWG)
+                viafb_write_reg_mask(CRD2, VIACR, 0x00, BIT0 + BIT1);
+         else
+                viafb_write_reg_mask(CRD2, VIACR, 0x03, BIT0 + BIT1);
+        if (INTERFACE_LVDS0LVDS1 == plvds_chip_info->output_interface)
+                turn_on_first_powersequence = true;
+        if (INTERFACE_LVDS0 == plvds_chip_info->output_interface)
+                turn_on_first_powersequence = true;
+        if (INTERFACE_LVDS1 == plvds_chip_info->output_interface)
+                turn_on_second_powersequence = true;
+
+        if (turn_on_second_powersequence) {
+                /* Use second power sequence control: */
+
+                /* Use hardware control power sequence. */
+                viafb_write_reg_mask(CRD3, VIACR, 0, BIT0);
+
+                /* Turn on back light. */
+                viafb_write_reg_mask(CRD3, VIACR, 0, BIT6 + BIT7);
+
+                /* Turn on hardware power sequence. */
+                viafb_write_reg_mask(CRD4, VIACR, 0x02, BIT1);
+        }
+        if (turn_on_first_powersequence) {
+                /* Use first power sequence control: */
+
+                /* Use hardware control power sequence. */
+                viafb_write_reg_mask(CR91, VIACR, 0, BIT0);
+
+                /* Turn on back light. */
+                viafb_write_reg_mask(CR91, VIACR, 0, BIT6 + BIT7);
+
+                /* Turn on hardware power sequence. */
+                viafb_write_reg_mask(CR6A, VIACR, 0x08, BIT3);
+        }
+
+        /* Turn DFP High/Low pad on. */
+        viafb_write_reg_mask(SR2A, VIASR, 0x0F, BIT0 + BIT1 + BIT2 + BIT3);
+
+        /* Power on LVDS channel. */
+        switch (plvds_chip_info->output_interface) {
+        case INTERFACE_LVDS0:
+                {
+                        viafb_write_reg_mask(CRD2, VIACR, 0, BIT7);
+                        break;
+                }
+
+        case INTERFACE_LVDS1:
+                {
+                        viafb_write_reg_mask(CRD2, VIACR, 0, BIT6);
+                        break;
+                }
+
+        case INTERFACE_LVDS0LVDS1:
+                {
+                        viafb_write_reg_mask(CRD2, VIACR, 0, BIT6 + BIT7);
+                        break;
+                }
+        }
+}
+
+void viafb_lcd_disable(void)
+{
+
+        if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266) {
+                lcd_powersequence_off();
+                /* DI1 pad off */
+                viafb_write_reg_mask(SR1E, VIASR, 0x00, 0x30);
+        } else if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CX700) {
+                if (viafb_LCD2_ON
+                    && (INTEGRATED_LVDS ==
+                        viaparinfo->chip_info->lvds_chip_info2.lvds_chip_name))
+                        integrated_lvds_disable(viaparinfo->lvds_setting_info,
+                                &viaparinfo->chip_info->lvds_chip_info2);
+                if (INTEGRATED_LVDS ==
+                        viaparinfo->chip_info->lvds_chip_info.lvds_chip_name)
+                        integrated_lvds_disable(viaparinfo->lvds_setting_info,
+                                &viaparinfo->chip_info->lvds_chip_info);
+                if (VT1636_LVDS == viaparinfo->chip_info->
+                        lvds_chip_info.lvds_chip_name)
+                        viafb_disable_lvds_vt1636(viaparinfo->lvds_setting_info,
+                                &viaparinfo->chip_info->lvds_chip_info);
+        } else if (VT1636_LVDS ==
+        viaparinfo->chip_info->lvds_chip_info.lvds_chip_name) {
+                viafb_disable_lvds_vt1636(viaparinfo->lvds_setting_info,
+                                    &viaparinfo->chip_info->lvds_chip_info);
+        } else {
+                /* DFP-HL pad off          */
+                viafb_write_reg_mask(SR2A, VIASR, 0x00, 0x0F);
+                /* Backlight off           */
+                viafb_write_reg_mask(SR3D, VIASR, 0x00, 0x20);
+                /* 24 bit DI data paht off */
+                viafb_write_reg_mask(CR91, VIACR, 0x80, 0x80);
+                /* Simultaneout disabled   */
+                viafb_write_reg_mask(CR6B, VIACR, 0x00, 0x08);
+        }
+
+        /* Disable expansion bit   */
+        viafb_write_reg_mask(CR79, VIACR, 0x00, 0x01);
+        /* CRT path set to IGA1    */
+        viafb_write_reg_mask(SR16, VIASR, 0x00, 0x40);
+        /* Simultaneout disabled   */
+        viafb_write_reg_mask(CR6B, VIACR, 0x00, 0x08);
+        /* IGA2 path disabled      */
+        viafb_write_reg_mask(CR6A, VIACR, 0x00, 0x80);
+
+}
+
+void viafb_lcd_enable(void)
+{
+        if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266) {
+                /* DI1 pad on */
+                viafb_write_reg_mask(SR1E, VIASR, 0x30, 0x30);
+                lcd_powersequence_on();
+        } else if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CX700) {
+                if (viafb_LCD2_ON && (INTEGRATED_LVDS ==
+                        viaparinfo->chip_info->lvds_chip_info2.lvds_chip_name))
+                        integrated_lvds_enable(viaparinfo->lvds_setting_info2, \
+                                &viaparinfo->chip_info->lvds_chip_info2);
+                if (INTEGRATED_LVDS ==
+                        viaparinfo->chip_info->lvds_chip_info.lvds_chip_name)
+                        integrated_lvds_enable(viaparinfo->lvds_setting_info,
+                                &viaparinfo->chip_info->lvds_chip_info);
+                if (VT1636_LVDS == viaparinfo->chip_info->
+                        lvds_chip_info.lvds_chip_name)
+                        viafb_enable_lvds_vt1636(viaparinfo->
+                        lvds_setting_info, &viaparinfo->chip_info->
+                        lvds_chip_info);
+        } else if (VT1636_LVDS ==
+        viaparinfo->chip_info->lvds_chip_info.lvds_chip_name) {
+                viafb_enable_lvds_vt1636(viaparinfo->lvds_setting_info,
+                                   &viaparinfo->chip_info->lvds_chip_info);
+        } else {
+                /* DFP-HL pad on           */
+                viafb_write_reg_mask(SR2A, VIASR, 0x0F, 0x0F);
+                /* Backlight on            */
+                viafb_write_reg_mask(SR3D, VIASR, 0x20, 0x20);
+                /* 24 bit DI data paht on  */
+                viafb_write_reg_mask(CR91, VIACR, 0x00, 0x80);
+
+                /* Set data source selection bit by iga path */
+                if (viaparinfo->lvds_setting_info->iga_path == IGA1) {
+                        /* DFP-H set to IGA1       */
+                        viafb_write_reg_mask(CR97, VIACR, 0x00, 0x10);
+                        /* DFP-L set to IGA1       */
+                        viafb_write_reg_mask(CR99, VIACR, 0x00, 0x10);
+                } else {
+                        /* DFP-H set to IGA2       */
+                        viafb_write_reg_mask(CR97, VIACR, 0x10, 0x10);
+                        /* DFP-L set to IGA2       */
+                        viafb_write_reg_mask(CR99, VIACR, 0x10, 0x10);
+                }
+                /* LCD enabled             */
+                viafb_write_reg_mask(CR6A, VIACR, 0x48, 0x48);
+        }
+
+        if ((viaparinfo->lvds_setting_info->iga_path == IGA1)
+            || (viaparinfo->lvds_setting_info->iga_path == IGA1_IGA2)) {
+                /* CRT path set to IGA2    */
+                viafb_write_reg_mask(SR16, VIASR, 0x40, 0x40);
+                /* IGA2 path disabled      */
+                viafb_write_reg_mask(CR6A, VIACR, 0x00, 0x80);
+                /* IGA2 path enabled       */
+        } else {                /* IGA2 */
+                viafb_write_reg_mask(CR6A, VIACR, 0x80, 0x80);
+        }
+
+}
+
+static void lcd_powersequence_off(void)
+{
+        int i, mask, data;
+
+        /* Software control power sequence */
+        viafb_write_reg_mask(CR91, VIACR, 0x11, 0x11);
+
+        for (i = 0; i < 3; i++) {
+                mask = PowerSequenceOff[0][i];
+                data = PowerSequenceOff[1][i] & mask;
+                viafb_write_reg_mask(CR91, VIACR, (u8) data, (u8) mask);
+                udelay(PowerSequenceOff[2][i]);
+        }
+
+        /* Disable LCD */
+        viafb_write_reg_mask(CR6A, VIACR, 0x00, 0x08);
+}
+
+static void lcd_powersequence_on(void)
+{
+        int i, mask, data;
+
+        /* Software control power sequence */
+        viafb_write_reg_mask(CR91, VIACR, 0x11, 0x11);
+
+        /* Enable LCD */
+        viafb_write_reg_mask(CR6A, VIACR, 0x08, 0x08);
+
+        for (i = 0; i < 3; i++) {
+                mask = PowerSequenceOn[0][i];
+                data = PowerSequenceOn[1][i] & mask;
+                viafb_write_reg_mask(CR91, VIACR, (u8) data, (u8) mask);
+                udelay(PowerSequenceOn[2][i]);
+        }
+
+        udelay(1);
+}
+
+static void fill_lcd_format(void)
+{
+        u8 bdithering = 0, bdual = 0;
+
+        if (viaparinfo->lvds_setting_info->device_lcd_dualedge)
+                bdual = BIT4;
+        if (viaparinfo->lvds_setting_info->LCDDithering)
+                bdithering = BIT0;
+        /* Dual & Dithering */
+        viafb_write_reg_mask(CR88, VIACR, (bdithering | bdual), BIT4 + BIT0);
+}
+
+static void check_diport_of_integrated_lvds(
+        struct lvds_chip_information *plvds_chip_info,
+                                     struct lvds_setting_information
+                                     *plvds_setting_info)
+{
+        /* Determine LCD DI Port by hardware layout. */
+        switch (viafb_display_hardware_layout) {
+        case HW_LAYOUT_LCD_ONLY:
+                {
+                        if (plvds_setting_info->device_lcd_dualedge) {
+                                plvds_chip_info->output_interface =
+                                    INTERFACE_LVDS0LVDS1;
+                        } else {
+                                plvds_chip_info->output_interface =
+                                    INTERFACE_LVDS0;
+                        }
+
+                        break;
+                }
+
+        case HW_LAYOUT_DVI_ONLY:
+                {
+                        plvds_chip_info->output_interface = INTERFACE_NONE;
+                        break;
+                }
+
+        case HW_LAYOUT_LCD1_LCD2:
+        case HW_LAYOUT_LCD_EXTERNAL_LCD2:
+                {
+                        plvds_chip_info->output_interface =
+                            INTERFACE_LVDS0LVDS1;
+                        break;
+                }
+
+        case HW_LAYOUT_LCD_DVI:
+                {
+                        plvds_chip_info->output_interface = INTERFACE_LVDS1;
+                        break;
+                }
+
+        default:
+                {
+                        plvds_chip_info->output_interface = INTERFACE_LVDS1;
+                        break;
+                }
+        }
+
+        DEBUG_MSG(KERN_INFO
+                  "Display Hardware Layout: 0x%x, LCD DI Port: 0x%x\n",
+                  viafb_display_hardware_layout,
+                  plvds_chip_info->output_interface);
+}
+
+void viafb_init_lvds_output_interface(struct lvds_chip_information
+                                *plvds_chip_info,
+                                struct lvds_setting_information
+                                *plvds_setting_info)
+{
+        if (INTERFACE_NONE != plvds_chip_info->output_interface) {
+                /*Do nothing, lcd port is specified by module parameter */
+                return;
+        }
+
+        switch (plvds_chip_info->lvds_chip_name) {
+
+        case VT1636_LVDS:
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_CX700:
+                        plvds_chip_info->output_interface = INTERFACE_DVP1;
+                        break;
+                case UNICHROME_CN700:
+                        plvds_chip_info->output_interface = INTERFACE_DFP_LOW;
+                        break;
+                default:
+                        plvds_chip_info->output_interface = INTERFACE_DVP0;
+                        break;
+                }
+                break;
+
+        case INTEGRATED_LVDS:
+                check_diport_of_integrated_lvds(plvds_chip_info,
+                                                plvds_setting_info);
+                break;
+
+        default:
+                switch (viaparinfo->chip_info->gfx_chip_name) {
+                case UNICHROME_K8M890:
+                case UNICHROME_P4M900:
+                case UNICHROME_P4M890:
+                        plvds_chip_info->output_interface = INTERFACE_DFP_LOW;
+                        break;
+                default:
+                        plvds_chip_info->output_interface = INTERFACE_DFP;
+                        break;
+                }
+                break;
+        }
+}
+
+static struct display_timing lcd_centering_timging(struct display_timing
+                                            mode_crt_reg,
+                                            struct display_timing panel_crt_reg)
+{
+        struct display_timing crt_reg;
+
+        crt_reg.hor_total = panel_crt_reg.hor_total;
+        crt_reg.hor_addr = mode_crt_reg.hor_addr;
+        crt_reg.hor_blank_start =
+            (panel_crt_reg.hor_addr - mode_crt_reg.hor_addr) / 2 +
+            crt_reg.hor_addr;
+        crt_reg.hor_blank_end = panel_crt_reg.hor_blank_end;
+        crt_reg.hor_sync_start =
+            (panel_crt_reg.hor_sync_start -
+             panel_crt_reg.hor_blank_start) + crt_reg.hor_blank_start;
+        crt_reg.hor_sync_end = panel_crt_reg.hor_sync_end;
+
+        crt_reg.ver_total = panel_crt_reg.ver_total;
+        crt_reg.ver_addr = mode_crt_reg.ver_addr;
+        crt_reg.ver_blank_start =
+            (panel_crt_reg.ver_addr - mode_crt_reg.ver_addr) / 2 +
+            crt_reg.ver_addr;
+        crt_reg.ver_blank_end = panel_crt_reg.ver_blank_end;
+        crt_reg.ver_sync_start =
+            (panel_crt_reg.ver_sync_start -
+             panel_crt_reg.ver_blank_start) + crt_reg.ver_blank_start;
+        crt_reg.ver_sync_end = panel_crt_reg.ver_sync_end;
+
+        return crt_reg;
+}
+
+static void load_crtc_shadow_timing(struct display_timing mode_timing,
+                             struct display_timing panel_timing)
+{
+        struct io_register *reg = NULL;
+        int i;
+        int viafb_load_reg_Num = 0;
+        int reg_value = 0;
+
+        if (viaparinfo->lvds_setting_info->display_method == LCD_EXPANDSION) {
+                /* Expansion */
+                for (i = 12; i < 20; i++) {
+                        switch (i) {
+                        case H_TOTAL_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_HOR_TOTAL_SHADOW_FORMULA
+                                    (panel_timing.hor_total);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.hor_total_shadow.
+                                    reg_num;
+                                reg = iga2_shadow_crtc_reg.hor_total_shadow.reg;
+                                break;
+                        case H_BLANK_END_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_HOR_BLANK_END_SHADOW_FORMULA
+                                    (panel_timing.hor_blank_start,
+                                     panel_timing.hor_blank_end);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.
+                                    hor_blank_end_shadow.reg_num;
+                                reg =
+                                    iga2_shadow_crtc_reg.
+                                    hor_blank_end_shadow.reg;
+                                break;
+                        case V_TOTAL_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_VER_TOTAL_SHADOW_FORMULA
+                                    (panel_timing.ver_total);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.ver_total_shadow.
+                                    reg_num;
+                                reg = iga2_shadow_crtc_reg.ver_total_shadow.reg;
+                                break;
+                        case V_ADDR_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_VER_ADDR_SHADOW_FORMULA
+                                    (panel_timing.ver_addr);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.ver_addr_shadow.
+                                    reg_num;
+                                reg = iga2_shadow_crtc_reg.ver_addr_shadow.reg;
+                                break;
+                        case V_BLANK_SATRT_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_VER_BLANK_START_SHADOW_FORMULA
+                                    (panel_timing.ver_blank_start);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.
+                                    ver_blank_start_shadow.reg_num;
+                                reg =
+                                    iga2_shadow_crtc_reg.
+                                    ver_blank_start_shadow.reg;
+                                break;
+                        case V_BLANK_END_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_VER_BLANK_END_SHADOW_FORMULA
+                                    (panel_timing.ver_blank_start,
+                                     panel_timing.ver_blank_end);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.
+                                    ver_blank_end_shadow.reg_num;
+                                reg =
+                                    iga2_shadow_crtc_reg.
+                                    ver_blank_end_shadow.reg;
+                                break;
+                        case V_SYNC_SATRT_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_VER_SYNC_START_SHADOW_FORMULA
+                                    (panel_timing.ver_sync_start);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.
+                                    ver_sync_start_shadow.reg_num;
+                                reg =
+                                    iga2_shadow_crtc_reg.
+                                    ver_sync_start_shadow.reg;
+                                break;
+                        case V_SYNC_END_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_VER_SYNC_END_SHADOW_FORMULA
+                                    (panel_timing.ver_sync_start,
+                                     panel_timing.ver_sync_end);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.
+                                    ver_sync_end_shadow.reg_num;
+                                reg =
+                                    iga2_shadow_crtc_reg.
+                                    ver_sync_end_shadow.reg;
+                                break;
+                        }
+                        viafb_load_reg(reg_value,
+                                viafb_load_reg_Num, reg, VIACR);
+                }
+        } else {                /* Centering */
+                for (i = 12; i < 20; i++) {
+                        switch (i) {
+                        case H_TOTAL_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_HOR_TOTAL_SHADOW_FORMULA
+                                    (panel_timing.hor_total);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.hor_total_shadow.
+                                    reg_num;
+                                reg = iga2_shadow_crtc_reg.hor_total_shadow.reg;
+                                break;
+                        case H_BLANK_END_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_HOR_BLANK_END_SHADOW_FORMULA
+                                    (panel_timing.hor_blank_start,
+                                     panel_timing.hor_blank_end);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.
+                                    hor_blank_end_shadow.reg_num;
+                                reg =
+                                    iga2_shadow_crtc_reg.
+                                    hor_blank_end_shadow.reg;
+                                break;
+                        case V_TOTAL_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_VER_TOTAL_SHADOW_FORMULA
+                                    (panel_timing.ver_total);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.ver_total_shadow.
+                                    reg_num;
+                                reg = iga2_shadow_crtc_reg.ver_total_shadow.reg;
+                                break;
+                        case V_ADDR_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_VER_ADDR_SHADOW_FORMULA
+                                    (mode_timing.ver_addr);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.ver_addr_shadow.
+                                    reg_num;
+                                reg = iga2_shadow_crtc_reg.ver_addr_shadow.reg;
+                                break;
+                        case V_BLANK_SATRT_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_VER_BLANK_START_SHADOW_FORMULA
+                                    (mode_timing.ver_blank_start);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.
+                                    ver_blank_start_shadow.reg_num;
+                                reg =
+                                    iga2_shadow_crtc_reg.
+                                    ver_blank_start_shadow.reg;
+                                break;
+                        case V_BLANK_END_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_VER_BLANK_END_SHADOW_FORMULA
+                                    (panel_timing.ver_blank_start,
+                                     panel_timing.ver_blank_end);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.
+                                    ver_blank_end_shadow.reg_num;
+                                reg =
+                                    iga2_shadow_crtc_reg.
+                                    ver_blank_end_shadow.reg;
+                                break;
+                        case V_SYNC_SATRT_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_VER_SYNC_START_SHADOW_FORMULA(
+                                    (panel_timing.ver_sync_start -
+                                    panel_timing.ver_blank_start) +
+                                    (panel_timing.ver_addr -
+                                    mode_timing.ver_addr) / 2 +
+                                    mode_timing.ver_addr);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.ver_sync_start_shadow.
+                                    reg_num;
+                                reg =
+                                    iga2_shadow_crtc_reg.ver_sync_start_shadow.
+                                    reg;
+                                break;
+                        case V_SYNC_END_SHADOW_INDEX:
+                                reg_value =
+                                    IGA2_VER_SYNC_END_SHADOW_FORMULA(
+                                    (panel_timing.ver_sync_start -
+                                    panel_timing.ver_blank_start) +
+                                    (panel_timing.ver_addr -
+                                    mode_timing.ver_addr) / 2 +
+                                    mode_timing.ver_addr,
+                                    panel_timing.ver_sync_end);
+                                viafb_load_reg_Num =
+                                    iga2_shadow_crtc_reg.ver_sync_end_shadow.
+                                    reg_num;
+                                reg =
+                                    iga2_shadow_crtc_reg.ver_sync_end_shadow.
+                                    reg;
+                                break;
+                        }
+                        viafb_load_reg(reg_value,
+                                viafb_load_reg_Num, reg, VIACR);
+                }
+        }
+}
+
+bool viafb_lcd_get_mobile_state(bool *mobile)
+{
+        unsigned char *romptr, *tableptr;
+        u8 core_base;
+        unsigned char *biosptr;
+        /* Rom address */
+        u32 romaddr = 0x000C0000;
+        u16 start_pattern = 0;
+
+        biosptr = ioremap(romaddr, 0x10000);
+
+        memcpy(&start_pattern, biosptr, 2);
+        /* Compare pattern */
+        if (start_pattern == 0xAA55) {
+                /* Get the start of Table */
+                /* 0x1B means BIOS offset position */
+                romptr = biosptr + 0x1B;
+                tableptr = biosptr + *((u16 *) romptr);
+
+                /* Get the start of biosver structure */
+                /* 18 means BIOS version position. */
+                romptr = tableptr + 18;
+                romptr = biosptr + *((u16 *) romptr);
+
+                /* The offset should be 44, but the
+                   actual image is less three char. */
+                /* pRom += 44; */
+                romptr += 41;
+
+                core_base = *romptr++;
+
+                if (core_base & 0x8)
+                        *mobile = false;
+                else
+                        *mobile = true;
+                /* release memory */
+                iounmap(biosptr);
+
+                return true;
+        } else {
+                iounmap(biosptr);
+                return false;
+        }
+}
+
+static void viafb_load_scaling_factor_for_p4m900(int set_hres,
+        int set_vres, int panel_hres, int panel_vres)
+{
+        int h_scaling_factor;
+        int v_scaling_factor;
+        u8 cra2 = 0;
+        u8 cr77 = 0;
+        u8 cr78 = 0;
+        u8 cr79 = 0;
+        u8 cr9f = 0;
+        /* Check if expansion for horizontal */
+        if (set_hres < panel_hres) {
+                /* Load Horizontal Scaling Factor */
+
+                /* For VIA_K8M800 or later chipsets. */
+                h_scaling_factor =
+                    K800_LCD_HOR_SCF_FORMULA(set_hres, panel_hres);
+                /* HSCaleFactor[1:0] at CR9F[1:0] */
+                cr9f = h_scaling_factor & 0x0003;
+                /* HSCaleFactor[9:2] at CR77[7:0] */
+                cr77 = (h_scaling_factor & 0x03FC) >> 2;
+                /* HSCaleFactor[11:10] at CR79[5:4] */
+                cr79 = (h_scaling_factor & 0x0C00) >> 10;
+                cr79 <<= 4;
+
+                /* Horizontal scaling enabled */
+                cra2 = 0xC0;
+
+                DEBUG_MSG(KERN_INFO "Horizontal Scaling value = %d\n",
+                          h_scaling_factor);
+        } else {
+                /* Horizontal scaling disabled */
+                cra2 = 0x00;
+        }
+
+        /* Check if expansion for vertical */
+        if (set_vres < panel_vres) {
+                /* Load Vertical Scaling Factor */
+
+                /* For VIA_K8M800 or later chipsets. */
+                v_scaling_factor =
+                    K800_LCD_VER_SCF_FORMULA(set_vres, panel_vres);
+
+                /* Vertical scaling enabled */
+                cra2 |= 0x08;
+                /* VSCaleFactor[0] at CR79[3] */
+                cr79 |= ((v_scaling_factor & 0x0001) << 3);
+                /* VSCaleFactor[8:1] at CR78[7:0] */
+                cr78 |= (v_scaling_factor & 0x01FE) >> 1;
+                /* VSCaleFactor[10:9] at CR79[7:6] */
+                cr79 |= ((v_scaling_factor & 0x0600) >> 9) << 6;
+
+                DEBUG_MSG(KERN_INFO "Vertical Scaling value = %d\n",
+                          v_scaling_factor);
+        } else {
+                /* Vertical scaling disabled */
+                cra2 |= 0x00;
+        }
+
+        viafb_write_reg_mask(CRA2, VIACR, cra2, BIT3 + BIT6 + BIT7);
+        viafb_write_reg_mask(CR77, VIACR, cr77, 0xFF);
+        viafb_write_reg_mask(CR78, VIACR, cr78, 0xFF);
+        viafb_write_reg_mask(CR79, VIACR, cr79, 0xF8);
+        viafb_write_reg_mask(CR9F, VIACR, cr9f, BIT0 + BIT1);
+}
diff --git a/drivers/video/via/lcd.h b/drivers/video/via/lcd.h
new file mode 100644
index 000000000000..071f47cf5be1
--- /dev/null
+++ b/drivers/video/via/lcd.h
@@ -0,0 +1,94 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+#ifndef __LCD_H__
+#define __LCD_H__
+
+/*Definition TMDS Device ID register*/
+#define     VT1631_DEVICE_ID_REG        0x02
+#define     VT1631_DEVICE_ID            0x92
+
+#define     VT3271_DEVICE_ID_REG        0x02
+#define     VT3271_DEVICE_ID            0x71
+
+#define     GET_LCD_SIZE_BY_SYSTEM_BIOS     0x01
+#define     GET_LCD_SIZE_BY_VGA_BIOS        0x02
+#define     GET_LCD_SZIE_BY_HW_STRAPPING    0x03
+#define     GET_LCD_SIZE_BY_USER_SETTING    0x04
+
+/* Definition DVI Panel ID*/
+/* Resolution: 640x480,   Channel: single, Dithering: Enable */
+#define     LCD_PANEL_ID0_640X480       0x00
+/* Resolution: 800x600,   Channel: single, Dithering: Enable */
+#define     LCD_PANEL_ID1_800X600       0x01
+/* Resolution: 1024x768,  Channel: single, Dithering: Enable */
+#define     LCD_PANEL_ID2_1024X768      0x02
+/* Resolution: 1280x768,  Channel: single, Dithering: Enable */
+#define     LCD_PANEL_ID3_1280X768      0x03
+/* Resolution: 1280x1024, Channel: dual,   Dithering: Enable */
+#define     LCD_PANEL_ID4_1280X1024     0x04
+/* Resolution: 1400x1050, Channel: dual,   Dithering: Enable */
+#define     LCD_PANEL_ID5_1400X1050     0x05
+/* Resolution: 1600x1200, Channel: dual,   Dithering: Enable */
+#define     LCD_PANEL_ID6_1600X1200     0x06
+/* Resolution: 1366x768,  Channel: single, Dithering: Disable */
+#define     LCD_PANEL_ID7_1366X768      0x07
+/* Resolution: 1024x600,  Channel: single, Dithering: Enable*/
+#define     LCD_PANEL_ID8_1024X600      0x08
+/* Resolution: 1280x800,  Channel: single, Dithering: Enable*/
+#define     LCD_PANEL_ID9_1280X800      0x09
+/* Resolution: 800x480,   Channel: single, Dithering: Enable*/
+#define     LCD_PANEL_IDA_800X480       0x0A
+/* Resolution: 1360x768,   Channel: single, Dithering: Disable*/
+#define     LCD_PANEL_IDB_1360X768     0x0B
+/* Resolution: 480x640,  Channel: single, Dithering: Enable */
+#define     LCD_PANEL_IDC_480X640      0x0C
+
+
+extern int viafb_LCD2_ON;
+extern int viafb_LCD_ON;
+extern int viafb_DVI_ON;
+
+void viafb_disable_lvds_vt1636(struct lvds_setting_information
+                         *plvds_setting_info,
+                         struct lvds_chip_information *plvds_chip_info);
+void viafb_enable_lvds_vt1636(struct lvds_setting_information
+                        *plvds_setting_info,
+                        struct lvds_chip_information *plvds_chip_info);
+void viafb_lcd_disable(void);
+void viafb_lcd_enable(void);
+void viafb_init_lcd_size(void);
+void viafb_init_lvds_output_interface(struct lvds_chip_information
+                                *plvds_chip_info,
+                                struct lvds_setting_information
+                                *plvds_setting_info);
+void viafb_lcd_set_mode(struct crt_mode_table *mode_crt_table,
+                  struct lvds_setting_information *plvds_setting_info,
+                  struct lvds_chip_information *plvds_chip_info);
+int viafb_lvds_trasmitter_identify(void);
+void viafb_init_lvds_output_interface(struct lvds_chip_information
+                                *plvds_chip_info,
+                                struct lvds_setting_information
+                                *plvds_setting_info);
+bool viafb_lcd_get_mobile_state(bool *mobile);
+void viafb_load_crtc_timing(struct display_timing device_timing,
+        int set_iga);
+
+#endif /* __LCD_H__ */
diff --git a/drivers/video/via/lcdtbl.h b/drivers/video/via/lcdtbl.h
new file mode 100644
index 000000000000..6f3dd800be59
--- /dev/null
+++ b/drivers/video/via/lcdtbl.h
@@ -0,0 +1,591 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+#ifndef __LCDTBL_H__
+#define __LCDTBL_H__
+
+#include "share.h"
+
+/* CLE266 Software Power Sequence */
+/* {Mask}, {Data}, {Delay} */
+int PowerSequenceOn[3][3] =
+    { {0x10, 0x08, 0x06}, {0x10, 0x08, 0x06}, {0x19, 0x1FE, 0x01} };
+int PowerSequenceOff[3][3] =
+    { {0x06, 0x08, 0x10}, {0x00, 0x00, 0x00}, {0xD2, 0x19, 0x01} };
+
+/* ++++++ P880 ++++++ */
+/*   Panel 1600x1200   */
+struct io_reg P880_LCD_RES_6X4_16X12[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x73}, {VIACR, CR55, 0x0F, 0x08},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x73}, {VIACR, CR54, 0x38, 0x00},
+        {VIACR, CR5D, 0x40, 0x40},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x5A}, {VIACR, CR71, 0x08, 0x00},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x5E},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xD6}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR44, 0xFF, 0x7D}, {VIASR, SR45, 0xFF, 0x8C},
+        {VIASR, SR46, 0xFF, 0x02}
+
+};
+
+#define NUM_TOTAL_P880_LCD_RES_6X4_16X12 ARRAY_SIZE(P880_LCD_RES_6X4_16X12)
+
+struct io_reg P880_LCD_RES_7X4_16X12[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x67}, {VIACR, CR55, 0x0F, 0x08},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x67}, {VIACR, CR54, 0x38, 0x00},
+        {VIACR, CR5D, 0x40, 0x40},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x74}, {VIACR, CR71, 0x08, 0x00},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x78},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xF5}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR44, 0xFF, 0x78}, {VIASR, SR45, 0xFF, 0x8C},
+        {VIASR, SR46, 0xFF, 0x01}
+
+};
+
+#define NUM_TOTAL_P880_LCD_RES_7X4_16X12 ARRAY_SIZE(P880_LCD_RES_7X4_16X12)
+
+struct io_reg P880_LCD_RES_8X6_16X12[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x65}, {VIACR, CR55, 0x0F, 0x08},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x65}, {VIACR, CR54, 0x38, 0x00},
+        {VIACR, CR5D, 0x40, 0x40},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x7F}, {VIACR, CR71, 0x08, 0x00},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x83},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xE1}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR44, 0xFF, 0x6D}, {VIASR, SR45, 0xFF, 0x88},
+        {VIASR, SR46, 0xFF, 0x03}
+
+};
+
+#define NUM_TOTAL_P880_LCD_RES_8X6_16X12 ARRAY_SIZE(P880_LCD_RES_8X6_16X12)
+
+struct io_reg P880_LCD_RES_10X7_16X12[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x65}, {VIACR, CR55, 0x0F, 0x08},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x65}, {VIACR, CR54, 0x38, 0x00},
+        {VIACR, CR5D, 0x40, 0x40},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0xAB}, {VIACR, CR71, 0x08, 0x00},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0xAF},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xF0}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR44, 0xFF, 0x92}, {VIASR, SR45, 0xFF, 0x88},
+        {VIASR, SR46, 0xFF, 0x03}
+
+};
+
+#define NUM_TOTAL_P880_LCD_RES_10X7_16X12 ARRAY_SIZE(P880_LCD_RES_10X7_16X12)
+
+struct io_reg P880_LCD_RES_12X10_16X12[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x7D}, {VIACR, CR55, 0x0F, 0x08},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x7D}, {VIACR, CR54, 0x38, 0x00},
+        {VIACR, CR5D, 0x40, 0x40},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0xD0}, {VIACR, CR71, 0x08, 0x00},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0xD4},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xFA}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR44, 0xFF, 0xF6}, {VIASR, SR45, 0xFF, 0x88},
+        {VIASR, SR46, 0xFF, 0x05}
+
+};
+
+#define NUM_TOTAL_P880_LCD_RES_12X10_16X12 ARRAY_SIZE(P880_LCD_RES_12X10_16X12)
+
+/*   Panel 1400x1050   */
+struct io_reg P880_LCD_RES_6X4_14X10[] = {
+        /* 640x480                          */
+        /* IGA2 Horizontal Total            */
+        {VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x56},
+        /* IGA2 Horizontal Blank End        */
+        {VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x75},
+        {VIACR, CR5D, 0x40, 0x24},
+        /* IGA2 Horizontal Total Shadow     */
+        {VIACR, CR6D, 0xFF, 0x5F}, {VIACR, CR71, 0x08, 0x44},
+        /* IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x63},
+        /* IGA2 Offset                      */
+        {VIACR, CR66, 0xFF, 0xB4}, {VIACR, CR67, 0x03, 0x00},
+        /* VCLK                             */
+        {VIASR, SR44, 0xFF, 0xC6}, {VIASR, SR45, 0xFF, 0x8C},
+        {VIASR, SR46, 0xFF, 0x05}
+};
+
+#define NUM_TOTAL_P880_LCD_RES_6X4_14X10 ARRAY_SIZE(P880_LCD_RES_6X4_14X10)
+
+struct io_reg P880_LCD_RES_8X6_14X10[] = {
+        /* 800x600                          */
+        /* IGA2 Horizontal Total            */
+        {VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x56},
+        /* IGA2 Horizontal Blank End        */
+        {VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x75},
+        {VIACR, CR5D, 0x40, 0x24},
+        /* IGA2 Horizontal Total Shadow     */
+        {VIACR, CR6D, 0xFF, 0x7F}, {VIACR, CR71, 0x08, 0x44},
+        /* IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x83},
+        /* IGA2 Offset                      */
+        {VIACR, CR66, 0xFF, 0xBE}, {VIACR, CR67, 0x03, 0x00},
+        /* VCLK                             */
+        {VIASR, SR44, 0xFF, 0x06}, {VIASR, SR45, 0xFF, 0x8D},
+        {VIASR, SR46, 0xFF, 0x05}
+};
+
+#define NUM_TOTAL_P880_LCD_RES_8X6_14X10 ARRAY_SIZE(P880_LCD_RES_8X6_14X10)
+
+/* ++++++ K400 ++++++ */
+/*   Panel 1600x1200   */
+struct io_reg K400_LCD_RES_6X4_16X12[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x73}, {VIACR, CR55, 0x0F, 0x08},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x73}, {VIACR, CR54, 0x38, 0x00},
+        {VIACR, CR5D, 0x40, 0x40},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x5A}, {VIACR, CR71, 0x08, 0x00},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x5E},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xDA}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0xC4}, {VIASR, SR47, 0xFF, 0x7F}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_6X4_16X12 ARRAY_SIZE(K400_LCD_RES_6X4_16X12)
+
+struct io_reg K400_LCD_RES_7X4_16X12[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x67}, {VIACR, CR55, 0x0F, 0x08},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x67}, {VIACR, CR54, 0x38, 0x00},
+        {VIACR, CR5D, 0x40, 0x40},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x74}, {VIACR, CR71, 0x08, 0x00},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x78},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xF5}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0x46}, {VIASR, SR47, 0xFF, 0x3D}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_7X4_16X12 ARRAY_SIZE(K400_LCD_RES_7X4_16X12)
+
+struct io_reg K400_LCD_RES_8X6_16X12[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x65}, {VIACR, CR55, 0x0F, 0x08},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x65}, {VIACR, CR54, 0x38, 0x00},
+        {VIACR, CR5D, 0x40, 0x40},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x7F}, {VIACR, CR71, 0x08, 0x00},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x83},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xE1}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0x85}, {VIASR, SR47, 0xFF, 0x6F}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_8X6_16X12 ARRAY_SIZE(K400_LCD_RES_8X6_16X12)
+
+struct io_reg K400_LCD_RES_10X7_16X12[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x65}, {VIACR, CR55, 0x0F, 0x08},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x65}, {VIACR, CR54, 0x38, 0x00},
+        {VIACR, CR5D, 0x40, 0x40},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0xAB}, {VIACR, CR71, 0x08, 0x00},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0xAF},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xF0}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0x45}, {VIASR, SR47, 0xFF, 0x4A}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_10X7_16X12 ARRAY_SIZE(K400_LCD_RES_10X7_16X12)
+
+struct io_reg K400_LCD_RES_12X10_16X12[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x7D}, {VIACR, CR55, 0x0F, 0x08},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x7D}, {VIACR, CR54, 0x38, 0x00},
+        {VIACR, CR5D, 0x40, 0x40},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0xD0}, {VIACR, CR71, 0x08, 0x00},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0xD4},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xFA}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0x47}, {VIASR, SR47, 0xFF, 0x7C}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_12X10_16X12 ARRAY_SIZE(K400_LCD_RES_12X10_16X12)
+
+/*   Panel 1400x1050   */
+struct io_reg K400_LCD_RES_6X4_14X10[] = {
+        /* 640x400                          */
+        /* IGA2 Horizontal Total            */
+        {VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x56},
+        /* IGA2 Horizontal Blank End        */
+        {VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x75},
+        {VIACR, CR5D, 0x40, 0x24},
+        /* IGA2 Horizontal Total Shadow     */
+        {VIACR, CR6D, 0xFF, 0x5F}, {VIACR, CR71, 0x08, 0x44},
+        /* IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x63},
+        /* IGA2 Offset                      */
+        {VIACR, CR66, 0xFF, 0xB4}, {VIACR, CR67, 0x03, 0x00},
+        /* VCLK                             */
+        {VIASR, SR46, 0xFF, 0x07}, {VIASR, SR47, 0xFF, 0x19}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_6X4_14X10 ARRAY_SIZE(K400_LCD_RES_6X4_14X10)
+
+struct io_reg K400_LCD_RES_8X6_14X10[] = {
+        /* 800x600                          */
+        /* IGA2 Horizontal Total            */
+        {VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x56},
+        /* IGA2 Horizontal Blank End        */
+        {VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x75},
+        {VIACR, CR5D, 0x40, 0x24},
+        /* IGA2 Horizontal Total Shadow     */
+        {VIACR, CR6D, 0xFF, 0x7F}, {VIACR, CR71, 0x08, 0x44},
+        /* IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x83},
+        /* IGA2 Offset                      */
+        {VIACR, CR66, 0xFF, 0xBE}, {VIACR, CR67, 0x03, 0x00},
+        /* VCLK                             */
+        {VIASR, SR46, 0xFF, 0x07}, {VIASR, SR47, 0xFF, 0x21}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_8X6_14X10 ARRAY_SIZE(K400_LCD_RES_8X6_14X10)
+
+struct io_reg K400_LCD_RES_10X7_14X10[] = {
+        /* 1024x768                         */
+        /* IGA2 Horizontal Total            */
+        {VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x56},
+        /* IGA2 Horizontal Blank End        */
+        {VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x75},
+        {VIACR, CR5D, 0x40, 0x24},
+        /* IGA2 Horizontal Total Shadow     */
+        {VIACR, CR6D, 0xFF, 0xA3}, {VIACR, CR71, 0x08, 0x44},
+        /* IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0xA7},
+        /* IGA2 Offset                      */
+        {VIACR, CR66, 0xFF, 0xC3}, {VIACR, CR67, 0x03, 0x04},
+        /* VCLK                             */
+        {VIASR, SR46, 0xFF, 0x05}, {VIASR, SR47, 0xFF, 0x1E}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_10X7_14X10 ARRAY_SIZE(K400_LCD_RES_10X7_14X10)
+
+struct io_reg K400_LCD_RES_12X10_14X10[] = {
+        /* 1280x768, 1280x960, 1280x1024    */
+        /* IGA2 Horizontal Total            */
+        {VIACR, CR50, 0xFF, 0x97}, {VIACR, CR55, 0x0F, 0x56},
+        /* IGA2 Horizontal Blank End        */
+        {VIACR, CR53, 0xFF, 0x97}, {VIACR, CR54, 0x38, 0x75},
+        {VIACR, CR5D, 0x40, 0x24},
+        /* IGA2 Horizontal Total Shadow     */
+        {VIACR, CR6D, 0xFF, 0xCE}, {VIACR, CR71, 0x08, 0x44},
+        /* IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0xD2},
+        /* IGA2 Offset                      */
+        {VIACR, CR66, 0xFF, 0xC9}, {VIACR, CR67, 0x03, 0x04},
+        /* VCLK                             */
+        {VIASR, SR46, 0xFF, 0x84}, {VIASR, SR47, 0xFF, 0x79}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_12X10_14X10 ARRAY_SIZE(K400_LCD_RES_12X10_14X10)
+
+/* ++++++ K400 ++++++ */
+/*   Panel 1366x768   */
+struct io_reg K400_LCD_RES_6X4_1366X7[] = {
+        /* 640x400                          */
+        /* IGA2 Horizontal Total            */
+        {VIACR, CR50, 0xFF, 0x47}, {VIACR, CR55, 0x0F, 0x35},
+        /* IGA2 Horizontal Blank End        */
+        {VIACR, CR53, 0xFF, 0x47}, {VIACR, CR54, 0x38, 0x2B},
+        {VIACR, CR5D, 0x40, 0x13},
+        /* IGA2 Horizontal Total Shadow     */
+        {VIACR, CR6D, 0xFF, 0x60}, {VIACR, CR71, 0x08, 0x23},
+        /* IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x64},
+        /* IGA2 Offset                      */
+        {VIACR, CR66, 0xFF, 0x8C}, {VIACR, CR67, 0x03, 0x00},
+        /* VCLK                             */
+        {VIASR, SR46, 0xFF, 0x87}, {VIASR, SR47, 0xFF, 0x4C}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_6X4_1366X7 ARRAY_SIZE(K400_LCD_RES_6X4_1366X7)
+
+struct io_reg K400_LCD_RES_7X4_1366X7[] = {
+        /* IGA2 Horizontal Total            */
+        {VIACR, CR50, 0xFF, 0x3B}, {VIACR, CR55, 0x0F, 0x35},
+        /* IGA2 Horizontal Blank End        */
+        {VIACR, CR53, 0xFF, 0x3B}, {VIACR, CR54, 0x38, 0x2B},
+        {VIACR, CR5D, 0x40, 0x13},
+        /* IGA2 Horizontal Total Shadow     */
+        {VIACR, CR6D, 0xFF, 0x71}, {VIACR, CR71, 0x08, 0x23},
+        /* IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x75},
+        /* IGA2 Offset                      */
+        {VIACR, CR66, 0xFF, 0x96}, {VIACR, CR67, 0x03, 0x00},
+        /* VCLK                             */
+        {VIASR, SR46, 0xFF, 0x05}, {VIASR, SR47, 0xFF, 0x10}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_7X4_1366X7 ARRAY_SIZE(K400_LCD_RES_7X4_1366X7)
+
+struct io_reg K400_LCD_RES_8X6_1366X7[] = {
+        /* 800x600                          */
+        /* IGA2 Horizontal Total            */
+        {VIACR, CR50, 0xFF, 0x37}, {VIACR, CR55, 0x0F, 0x35},
+        /* IGA2 Horizontal Blank End        */
+        {VIACR, CR53, 0xFF, 0x37}, {VIACR, CR54, 0x38, 0x2B},
+        {VIACR, CR5D, 0x40, 0x13},
+        /* IGA2 Horizontal Total Shadow     */
+        {VIACR, CR6D, 0xFF, 0x7E}, {VIACR, CR71, 0x08, 0x23},
+        /* IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x82},
+        /* IGA2 Offset                      */
+        {VIACR, CR66, 0xFF, 0x8C}, {VIACR, CR67, 0x03, 0x00},
+        /* VCLK                             */
+        {VIASR, SR46, 0xFF, 0x84}, {VIASR, SR47, 0xFF, 0xB9}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_8X6_1366X7 ARRAY_SIZE(K400_LCD_RES_8X6_1366X7)
+
+struct io_reg K400_LCD_RES_10X7_1366X7[] = {
+        /* 1024x768                         */
+        /* IGA2 Horizontal Total            */
+        {VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x56},
+        /* IGA2 Horizontal Blank End        */
+        {VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x75},
+        {VIACR, CR5D, 0x40, 0x24},
+        /* IGA2 Horizontal Total Shadow     */
+        {VIACR, CR6D, 0xFF, 0xA3}, {VIACR, CR71, 0x08, 0x44},
+        /* IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0xA7},
+        /* IGA2 Offset                      */
+        {VIACR, CR66, 0xFF, 0xC3}, {VIACR, CR67, 0x03, 0x04},
+        /* VCLK                             */
+        {VIASR, SR46, 0xFF, 0x05}, {VIASR, SR47, 0xFF, 0x1E}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_10X7_1366X7 ARRAY_SIZE(K400_LCD_RES_10X7_1366X7)
+
+struct io_reg K400_LCD_RES_12X10_1366X7[] = {
+        /* 1280x768, 1280x960, 1280x1024    */
+        /* IGA2 Horizontal Total            */
+        {VIACR, CR50, 0xFF, 0x97}, {VIACR, CR55, 0x0F, 0x56},
+        /* IGA2 Horizontal Blank End        */
+        {VIACR, CR53, 0xFF, 0x97}, {VIACR, CR54, 0x38, 0x75},
+        {VIACR, CR5D, 0x40, 0x24},
+        /* IGA2 Horizontal Total Shadow     */
+        {VIACR, CR6D, 0xFF, 0xCE}, {VIACR, CR71, 0x08, 0x44},
+        /* IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0xD2},
+        /* IGA2 Offset                      */
+        {VIACR, CR66, 0xFF, 0xC9}, {VIACR, CR67, 0x03, 0x04},
+        /* VCLK                             */
+        {VIASR, SR46, 0xFF, 0x84}, {VIASR, SR47, 0xFF, 0x79}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_12X10_1366X7\
+                        ARRAY_SIZE(K400_LCD_RES_12X10_1366X7)
+
+/* ++++++ K400 ++++++ */
+/*   Panel 1280x1024   */
+struct io_reg K400_LCD_RES_6X4_12X10[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x46},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x74},
+        {VIACR, CR5D, 0x40, 0x1C},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x5F}, {VIACR, CR71, 0x08, 0x34},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x63},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xAA}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0x07}, {VIASR, SR47, 0xFF, 0x19}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_6X4_12X10 ARRAY_SIZE(K400_LCD_RES_6X4_12X10)
+
+struct io_reg K400_LCD_RES_7X4_12X10[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x46},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x74},
+        {VIACR, CR5D, 0x40, 0x1C},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x68}, {VIACR, CR71, 0x08, 0x34},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x6C},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xA8}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0x87}, {VIASR, SR47, 0xFF, 0xED}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_7X4_12X10 ARRAY_SIZE(K400_LCD_RES_7X4_12X10)
+
+struct io_reg K400_LCD_RES_8X6_12X10[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x46},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x74},
+        {VIACR, CR5D, 0x40, 0x1C},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x7F}, {VIACR, CR71, 0x08, 0x34},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x83},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xBE}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0x07}, {VIASR, SR47, 0xFF, 0x21}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_8X6_12X10 ARRAY_SIZE(K400_LCD_RES_8X6_12X10)
+
+struct io_reg K400_LCD_RES_10X7_12X10[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x9D}, {VIACR, CR55, 0x0F, 0x46},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x9D}, {VIACR, CR54, 0x38, 0x74},
+        {VIACR, CR5D, 0x40, 0x1C},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0xA3}, {VIACR, CR71, 0x08, 0x34},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0xA7},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0xBE}, {VIACR, CR67, 0x03, 0x04},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0x05}, {VIASR, SR47, 0xFF, 0x1E}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_10X7_12X10 ARRAY_SIZE(K400_LCD_RES_10X7_12X10)
+
+/* ++++++ K400 ++++++ */
+/*   Panel 1024x768    */
+struct io_reg K400_LCD_RES_6X4_10X7[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x47}, {VIACR, CR55, 0x0F, 0x35},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x47}, {VIACR, CR54, 0x38, 0x2B},
+        {VIACR, CR5D, 0x40, 0x13},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x60}, {VIACR, CR71, 0x08, 0x23},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x64},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0x8C}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0x87}, {VIASR, SR47, 0xFF, 0x4C}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_6X4_10X7 ARRAY_SIZE(K400_LCD_RES_6X4_10X7)
+
+struct io_reg K400_LCD_RES_7X4_10X7[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x3B}, {VIACR, CR55, 0x0F, 0x35},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x3B}, {VIACR, CR54, 0x38, 0x2B},
+        {VIACR, CR5D, 0x40, 0x13},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x71}, {VIACR, CR71, 0x08, 0x23},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x75},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0x96}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0x05}, {VIASR, SR47, 0xFF, 0x10}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_7X4_10X7 ARRAY_SIZE(K400_LCD_RES_7X4_10X7)
+
+struct io_reg K400_LCD_RES_8X6_10X7[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x37}, {VIACR, CR55, 0x0F, 0x35},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x37}, {VIACR, CR54, 0x38, 0x2B},
+        {VIACR, CR5D, 0x40, 0x13},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x7E}, {VIACR, CR71, 0x08, 0x23},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x82},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0x8C}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0x84}, {VIASR, SR47, 0xFF, 0xB9}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_8X6_10X7 ARRAY_SIZE(K400_LCD_RES_8X6_10X7)
+
+/* ++++++ K400 ++++++ */
+/*   Panel 800x600     */
+struct io_reg K400_LCD_RES_6X4_8X6[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x1A}, {VIACR, CR55, 0x0F, 0x34},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x1A}, {VIACR, CR54, 0x38, 0xE3},
+        {VIACR, CR5D, 0x40, 0x12},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x5F}, {VIACR, CR71, 0x08, 0x22},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x63},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0x6E}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0x86}, {VIASR, SR47, 0xFF, 0xB3}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_6X4_8X6 ARRAY_SIZE(K400_LCD_RES_6X4_8X6)
+
+struct io_reg K400_LCD_RES_7X4_8X6[] = {
+        /*IGA2 Horizontal Total */
+        {VIACR, CR50, 0xFF, 0x1F}, {VIACR, CR55, 0x0F, 0x34},
+        /*IGA2 Horizontal Blank End */
+        {VIACR, CR53, 0xFF, 0x1F}, {VIACR, CR54, 0x38, 0xE3},
+        {VIACR, CR5D, 0x40, 0x12},
+        /*IGA2 Horizontal Total Shadow */
+        {VIACR, CR6D, 0xFF, 0x7F}, {VIACR, CR71, 0x08, 0x22},
+        /*IGA2 Horizontal Blank End Shadow */
+        {VIACR, CR6E, 0xFF, 0x83},
+        /*IGA2 Offset */
+        {VIACR, CR66, 0xFF, 0x78}, {VIACR, CR67, 0x03, 0x00},
+         /*VCLK*/ {VIASR, SR46, 0xFF, 0xC4}, {VIASR, SR47, 0xFF, 0x59}
+};
+
+#define NUM_TOTAL_K400_LCD_RES_7X4_8X6 ARRAY_SIZE(K400_LCD_RES_7X4_8X6)
+
+#endif /* __LCDTBL_H__ */
diff --git a/drivers/video/via/share.h b/drivers/video/via/share.h
new file mode 100644
index 000000000000..2e1254da9c8c
--- /dev/null
+++ b/drivers/video/via/share.h
@@ -0,0 +1,1105 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __SHARE_H__
+#define __SHARE_H__
+
+/* Define Return Value */
+#define FAIL        -1
+#define OK          1
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+/* Define Bit Field */
+#define BIT0    0x01
+#define BIT1    0x02
+#define BIT2    0x04
+#define BIT3    0x08
+#define BIT4    0x10
+#define BIT5    0x20
+#define BIT6    0x40
+#define BIT7    0x80
+
+/* Video Memory Size */
+#define VIDEO_MEMORY_SIZE_16M    0x1000000
+
+/* Definition Mode Index
+*/
+#define     VIA_RES_640X480                     0
+#define     VIA_RES_800X600                     1
+#define     VIA_RES_1024X768                    2
+#define     VIA_RES_1152X864                    3
+#define     VIA_RES_1280X1024                   4
+#define     VIA_RES_1600X1200                   5
+#define     VIA_RES_1440X1050                   6
+#define     VIA_RES_1280X768                    7
+#define     VIA_RES_1280X960                    8
+#define     VIA_RES_1920X1440                   9
+#define     VIA_RES_848X480                     10
+#define     VIA_RES_1400X1050                   11
+#define     VIA_RES_720X480                     12
+#define     VIA_RES_720X576                     13
+#define     VIA_RES_1024X512                    14
+#define     VIA_RES_856X480                     15
+#define     VIA_RES_1024X576                    16
+#define     VIA_RES_640X400                     17
+#define     VIA_RES_1280X720                    18
+#define     VIA_RES_1920X1080                   19
+#define     VIA_RES_800X480                     20
+#define     VIA_RES_1368X768                    21
+#define     VIA_RES_1024X600                    22
+#define     VIA_RES_1280X800                    23
+#define     VIA_RES_1680X1050                   24
+#define     VIA_RES_960X600                     25
+#define     VIA_RES_1000X600                    26
+#define     VIA_RES_1088X612                    27
+#define     VIA_RES_1152X720                    28
+#define     VIA_RES_1200X720                    29
+#define     VIA_RES_1280X600                    30
+#define     VIA_RES_1360X768                    31
+#define     VIA_RES_1366X768                    32
+#define     VIA_RES_1440X900                    33
+#define     VIA_RES_1600X900                    34
+#define     VIA_RES_1600X1024                   35
+#define     VIA_RES_1792X1344                   36
+#define     VIA_RES_1856X1392                   37
+#define     VIA_RES_1920X1200                   38
+#define     VIA_RES_2048X1536                   39
+#define     VIA_RES_480X640                     40
+
+/*Reduce Blanking*/
+#define     VIA_RES_1360X768_RB                 131
+#define     VIA_RES_1440X900_RB                 133
+#define     VIA_RES_1400X1050_RB                111
+#define     VIA_RES_1600X900_RB                 134
+#define     VIA_RES_1680X1050_RB                124
+#define     VIA_RES_1920X1080_RB                119
+#define     VIA_RES_1920X1200_RB                138
+
+#define     VIA_RES_INVALID                     255
+
+/* standard VGA IO port
+*/
+#define VIARMisc    0x3CC
+#define VIAWMisc    0x3C2
+#define VIAStatus   0x3DA
+#define VIACR       0x3D4
+#define VIASR       0x3C4
+#define VIAGR       0x3CE
+#define VIAAR       0x3C0
+
+#define StdCR       0x19
+#define StdSR       0x04
+#define StdGR       0x09
+#define StdAR       0x14
+
+#define PatchCR     11
+
+/* Display path */
+#define IGA1        1
+#define IGA2        2
+#define IGA1_IGA2   3
+
+/* Define Color Depth  */
+#define MODE_8BPP       1
+#define MODE_16BPP      2
+#define MODE_32BPP      4
+
+#define GR20    0x20
+#define GR21    0x21
+#define GR22    0x22
+
+/* Sequencer Registers */
+#define SR01    0x01
+#define SR10    0x10
+#define SR12    0x12
+#define SR15    0x15
+#define SR16    0x16
+#define SR17    0x17
+#define SR18    0x18
+#define SR1B    0x1B
+#define SR1A    0x1A
+#define SR1C    0x1C
+#define SR1D    0x1D
+#define SR1E    0x1E
+#define SR1F    0x1F
+#define SR20    0x20
+#define SR21    0x21
+#define SR22    0x22
+#define SR2A    0x2A
+#define SR2D    0x2D
+#define SR2E    0x2E
+
+#define SR30    0x30
+#define SR39    0x39
+#define SR3D    0x3D
+#define SR3E    0x3E
+#define SR3F    0x3F
+#define SR40    0x40
+#define SR43    0x43
+#define SR44    0x44
+#define SR45    0x45
+#define SR46    0x46
+#define SR47    0x47
+#define SR48    0x48
+#define SR49    0x49
+#define SR4A    0x4A
+#define SR4B    0x4B
+#define SR4C    0x4C
+#define SR52    0x52
+#define SR5E    0x5E
+#define SR65    0x65
+
+/* CRT Controller Registers */
+#define CR00    0x00
+#define CR01    0x01
+#define CR02    0x02
+#define CR03    0x03
+#define CR04    0x04
+#define CR05    0x05
+#define CR06    0x06
+#define CR07    0x07
+#define CR08    0x08
+#define CR09    0x09
+#define CR0A    0x0A
+#define CR0B    0x0B
+#define CR0C    0x0C
+#define CR0D    0x0D
+#define CR0E    0x0E
+#define CR0F    0x0F
+#define CR10    0x10
+#define CR11    0x11
+#define CR12    0x12
+#define CR13    0x13
+#define CR14    0x14
+#define CR15    0x15
+#define CR16    0x16
+#define CR17    0x17
+#define CR18    0x18
+
+/* Extend CRT Controller Registers */
+#define CR30    0x30
+#define CR31    0x31
+#define CR32    0x32
+#define CR33    0x33
+#define CR34    0x34
+#define CR35    0x35
+#define CR36    0x36
+#define CR37    0x37
+#define CR38    0x38
+#define CR39    0x39
+#define CR3A    0x3A
+#define CR3B    0x3B
+#define CR3C    0x3C
+#define CR3D    0x3D
+#define CR3E    0x3E
+#define CR3F    0x3F
+#define CR40    0x40
+#define CR41    0x41
+#define CR42    0x42
+#define CR43    0x43
+#define CR44    0x44
+#define CR45    0x45
+#define CR46    0x46
+#define CR47    0x47
+#define CR48    0x48
+#define CR49    0x49
+#define CR4A    0x4A
+#define CR4B    0x4B
+#define CR4C    0x4C
+#define CR4D    0x4D
+#define CR4E    0x4E
+#define CR4F    0x4F
+#define CR50    0x50
+#define CR51    0x51
+#define CR52    0x52
+#define CR53    0x53
+#define CR54    0x54
+#define CR55    0x55
+#define CR56    0x56
+#define CR57    0x57
+#define CR58    0x58
+#define CR59    0x59
+#define CR5A    0x5A
+#define CR5B    0x5B
+#define CR5C    0x5C
+#define CR5D    0x5D
+#define CR5E    0x5E
+#define CR5F    0x5F
+#define CR60    0x60
+#define CR61    0x61
+#define CR62    0x62
+#define CR63    0x63
+#define CR64    0x64
+#define CR65    0x65
+#define CR66    0x66
+#define CR67    0x67
+#define CR68    0x68
+#define CR69    0x69
+#define CR6A    0x6A
+#define CR6B    0x6B
+#define CR6C    0x6C
+#define CR6D    0x6D
+#define CR6E    0x6E
+#define CR6F    0x6F
+#define CR70    0x70
+#define CR71    0x71
+#define CR72    0x72
+#define CR73    0x73
+#define CR74    0x74
+#define CR75    0x75
+#define CR76    0x76
+#define CR77    0x77
+#define CR78    0x78
+#define CR79    0x79
+#define CR7A    0x7A
+#define CR7B    0x7B
+#define CR7C    0x7C
+#define CR7D    0x7D
+#define CR7E    0x7E
+#define CR7F    0x7F
+#define CR80    0x80
+#define CR81    0x81
+#define CR82    0x82
+#define CR83    0x83
+#define CR84    0x84
+#define CR85    0x85
+#define CR86    0x86
+#define CR87    0x87
+#define CR88    0x88
+#define CR89    0x89
+#define CR8A    0x8A
+#define CR8B    0x8B
+#define CR8C    0x8C
+#define CR8D    0x8D
+#define CR8E    0x8E
+#define CR8F    0x8F
+#define CR90    0x90
+#define CR91    0x91
+#define CR92    0x92
+#define CR93    0x93
+#define CR94    0x94
+#define CR95    0x95
+#define CR96    0x96
+#define CR97    0x97
+#define CR98    0x98
+#define CR99    0x99
+#define CR9A    0x9A
+#define CR9B    0x9B
+#define CR9C    0x9C
+#define CR9D    0x9D
+#define CR9E    0x9E
+#define CR9F    0x9F
+#define CRA0    0xA0
+#define CRA1    0xA1
+#define CRA2    0xA2
+#define CRA3    0xA3
+#define CRD2    0xD2
+#define CRD3    0xD3
+#define CRD4    0xD4
+
+/* LUT Table*/
+#define LUT_DATA             0x3C9      /* DACDATA */
+#define LUT_INDEX_READ       0x3C7      /* DACRX */
+#define LUT_INDEX_WRITE      0x3C8      /* DACWX */
+#define DACMASK              0x3C6
+
+/* Definition Device */
+#define DEVICE_CRT  0x01
+#define DEVICE_DVI  0x03
+#define DEVICE_LCD  0x04
+
+/* Device output interface */
+#define INTERFACE_NONE          0x00
+#define INTERFACE_ANALOG_RGB    0x01
+#define INTERFACE_DVP0          0x02
+#define INTERFACE_DVP1          0x03
+#define INTERFACE_DFP_HIGH      0x04
+#define INTERFACE_DFP_LOW       0x05
+#define INTERFACE_DFP           0x06
+#define INTERFACE_LVDS0         0x07
+#define INTERFACE_LVDS1         0x08
+#define INTERFACE_LVDS0LVDS1    0x09
+#define INTERFACE_TMDS          0x0A
+
+#define HW_LAYOUT_LCD_ONLY      0x01
+#define HW_LAYOUT_DVI_ONLY      0x02
+#define HW_LAYOUT_LCD_DVI       0x03
+#define HW_LAYOUT_LCD1_LCD2     0x04
+#define HW_LAYOUT_LCD_EXTERNAL_LCD2 0x10
+
+/* Definition Refresh Rate */
+#define REFRESH_50      50
+#define REFRESH_60      60
+#define REFRESH_75      75
+#define REFRESH_85      85
+#define REFRESH_100     100
+#define REFRESH_120     120
+
+/* Definition Sync Polarity*/
+#define NEGATIVE        1
+#define POSITIVE        0
+
+/*480x640@60 Sync Polarity (GTF)
+*/
+#define M480X640_R60_HSP        NEGATIVE
+#define M480X640_R60_VSP        POSITIVE
+
+/*640x480@60 Sync Polarity (VESA Mode)
+*/
+#define M640X480_R60_HSP        NEGATIVE
+#define M640X480_R60_VSP        NEGATIVE
+
+/*640x480@75 Sync Polarity (VESA Mode)
+*/
+#define M640X480_R75_HSP        NEGATIVE
+#define M640X480_R75_VSP        NEGATIVE
+
+/*640x480@85 Sync Polarity (VESA Mode)
+*/
+#define M640X480_R85_HSP        NEGATIVE
+#define M640X480_R85_VSP        NEGATIVE
+
+/*640x480@100 Sync Polarity (GTF Mode)
+*/
+#define M640X480_R100_HSP       NEGATIVE
+#define M640X480_R100_VSP       POSITIVE
+
+/*640x480@120 Sync Polarity (GTF Mode)
+*/
+#define M640X480_R120_HSP       NEGATIVE
+#define M640X480_R120_VSP       POSITIVE
+
+/*720x480@60 Sync Polarity  (GTF Mode)
+*/
+#define M720X480_R60_HSP        NEGATIVE
+#define M720X480_R60_VSP        POSITIVE
+
+/*720x576@60 Sync Polarity  (GTF Mode)
+*/
+#define M720X576_R60_HSP        NEGATIVE
+#define M720X576_R60_VSP        POSITIVE
+
+/*800x600@60 Sync Polarity (VESA Mode)
+*/
+#define M800X600_R60_HSP        POSITIVE
+#define M800X600_R60_VSP        POSITIVE
+
+/*800x600@75 Sync Polarity (VESA Mode)
+*/
+#define M800X600_R75_HSP        POSITIVE
+#define M800X600_R75_VSP        POSITIVE
+
+/*800x600@85 Sync Polarity (VESA Mode)
+*/
+#define M800X600_R85_HSP        POSITIVE
+#define M800X600_R85_VSP        POSITIVE
+
+/*800x600@100 Sync Polarity (GTF Mode)
+*/
+#define M800X600_R100_HSP       NEGATIVE
+#define M800X600_R100_VSP       POSITIVE
+
+/*800x600@120 Sync Polarity (GTF Mode)
+*/
+#define M800X600_R120_HSP       NEGATIVE
+#define M800X600_R120_VSP       POSITIVE
+
+/*800x480@60 Sync Polarity  (CVT Mode)
+*/
+#define M800X480_R60_HSP        NEGATIVE
+#define M800X480_R60_VSP        POSITIVE
+
+/*848x480@60 Sync Polarity  (CVT Mode)
+*/
+#define M848X480_R60_HSP        NEGATIVE
+#define M848X480_R60_VSP        POSITIVE
+
+/*852x480@60 Sync Polarity  (GTF Mode)
+*/
+#define M852X480_R60_HSP        NEGATIVE
+#define M852X480_R60_VSP        POSITIVE
+
+/*1024x512@60 Sync Polarity (GTF Mode)
+*/
+#define M1024X512_R60_HSP       NEGATIVE
+#define M1024X512_R60_VSP       POSITIVE
+
+/*1024x600@60 Sync Polarity (GTF Mode)
+*/
+#define M1024X600_R60_HSP       NEGATIVE
+#define M1024X600_R60_VSP       POSITIVE
+
+/*1024x768@60 Sync Polarity (VESA Mode)
+*/
+#define M1024X768_R60_HSP       NEGATIVE
+#define M1024X768_R60_VSP       NEGATIVE
+
+/*1024x768@75 Sync Polarity (VESA Mode)
+*/
+#define M1024X768_R75_HSP       POSITIVE
+#define M1024X768_R75_VSP       POSITIVE
+
+/*1024x768@85 Sync Polarity (VESA Mode)
+*/
+#define M1024X768_R85_HSP       POSITIVE
+#define M1024X768_R85_VSP       POSITIVE
+
+/*1024x768@100 Sync Polarity (GTF Mode)
+*/
+#define M1024X768_R100_HSP      NEGATIVE
+#define M1024X768_R100_VSP      POSITIVE
+
+/*1152x864@75 Sync Polarity (VESA Mode)
+*/
+#define M1152X864_R75_HSP       POSITIVE
+#define M1152X864_R75_VSP       POSITIVE
+
+/*1280x720@60 Sync Polarity  (GTF Mode)
+*/
+#define M1280X720_R60_HSP       NEGATIVE
+#define M1280X720_R60_VSP       POSITIVE
+
+/* 1280x768@50 Sync Polarity  (GTF Mode) */
+#define M1280X768_R50_HSP       NEGATIVE
+#define M1280X768_R50_VSP       POSITIVE
+
+/*1280x768@60 Sync Polarity  (GTF Mode)
+*/
+#define M1280X768_R60_HSP       NEGATIVE
+#define M1280X768_R60_VSP       POSITIVE
+
+/*1280x800@60 Sync Polarity  (CVT Mode)
+*/
+#define M1280X800_R60_HSP       NEGATIVE
+#define M1280X800_R60_VSP       POSITIVE
+
+/*1280x960@60 Sync Polarity (VESA Mode)
+*/
+#define M1280X960_R60_HSP       POSITIVE
+#define M1280X960_R60_VSP       POSITIVE
+
+/*1280x1024@60 Sync Polarity (VESA Mode)
+*/
+#define M1280X1024_R60_HSP      POSITIVE
+#define M1280X1024_R60_VSP      POSITIVE
+
+/* 1360x768@60 Sync Polarity (CVT Mode) */
+#define M1360X768_R60_HSP       POSITIVE
+#define M1360X768_R60_VSP       POSITIVE
+
+/* 1360x768@60 Sync Polarity (CVT Reduce Blanking Mode) */
+#define M1360X768_RB_R60_HSP       POSITIVE
+#define M1360X768_RB_R60_VSP       NEGATIVE
+
+/* 1368x768@50 Sync Polarity (GTF Mode) */
+#define M1368X768_R50_HSP       NEGATIVE
+#define M1368X768_R50_VSP       POSITIVE
+
+/* 1368x768@60 Sync Polarity (VESA Mode) */
+#define M1368X768_R60_HSP       NEGATIVE
+#define M1368X768_R60_VSP       POSITIVE
+
+/*1280x1024@75 Sync Polarity (VESA Mode)
+*/
+#define M1280X1024_R75_HSP      POSITIVE
+#define M1280X1024_R75_VSP      POSITIVE
+
+/*1280x1024@85 Sync Polarity (VESA Mode)
+*/
+#define M1280X1024_R85_HSP      POSITIVE
+#define M1280X1024_R85_VSP      POSITIVE
+
+/*1440x1050@60 Sync Polarity (GTF Mode)
+*/
+#define M1440X1050_R60_HSP      NEGATIVE
+#define M1440X1050_R60_VSP      POSITIVE
+
+/*1600x1200@60 Sync Polarity (VESA Mode)
+*/
+#define M1600X1200_R60_HSP      POSITIVE
+#define M1600X1200_R60_VSP      POSITIVE
+
+/*1600x1200@75 Sync Polarity (VESA Mode)
+*/
+#define M1600X1200_R75_HSP      POSITIVE
+#define M1600X1200_R75_VSP      POSITIVE
+
+/* 1680x1050@60 Sync Polarity (CVT Mode) */
+#define M1680x1050_R60_HSP      NEGATIVE
+#define M1680x1050_R60_VSP      NEGATIVE
+
+/* 1680x1050@60 Sync Polarity (CVT Reduce Blanking Mode) */
+#define M1680x1050_RB_R60_HSP      POSITIVE
+#define M1680x1050_RB_R60_VSP      NEGATIVE
+
+/* 1680x1050@75 Sync Polarity (CVT Mode) */
+#define M1680x1050_R75_HSP      NEGATIVE
+#define M1680x1050_R75_VSP      POSITIVE
+
+/*1920x1080@60 Sync Polarity (CVT Mode)
+*/
+#define M1920X1080_R60_HSP      NEGATIVE
+#define M1920X1080_R60_VSP      POSITIVE
+
+/* 1920x1080@60 Sync Polarity (CVT Reduce Blanking Mode) */
+#define M1920X1080_RB_R60_HSP  POSITIVE
+#define M1920X1080_RB_R60_VSP  NEGATIVE
+
+/*1920x1440@60 Sync Polarity (VESA Mode)
+*/
+#define M1920X1440_R60_HSP      NEGATIVE
+#define M1920X1440_R60_VSP      POSITIVE
+
+/*1920x1440@75 Sync Polarity (VESA Mode)
+*/
+#define M1920X1440_R75_HSP      NEGATIVE
+#define M1920X1440_R75_VSP      POSITIVE
+
+#if 0
+/* 1400x1050@60 Sync Polarity (VESA Mode) */
+#define M1400X1050_R60_HSP      NEGATIVE
+#define M1400X1050_R60_VSP      NEGATIVE
+#endif
+
+/* 1400x1050@60 Sync Polarity (CVT Mode) */
+#define M1400X1050_R60_HSP      NEGATIVE
+#define M1400X1050_R60_VSP      POSITIVE
+
+/* 1400x1050@60 Sync Polarity (CVT Reduce Blanking Mode) */
+#define M1400X1050_RB_R60_HSP      POSITIVE
+#define M1400X1050_RB_R60_VSP      NEGATIVE
+
+/* 1400x1050@75 Sync Polarity (CVT Mode) */
+#define M1400X1050_R75_HSP      NEGATIVE
+#define M1400X1050_R75_VSP      POSITIVE
+
+/* 960x600@60 Sync Polarity (CVT Mode) */
+#define M960X600_R60_HSP        NEGATIVE
+#define M960X600_R60_VSP        POSITIVE
+
+/* 1000x600@60 Sync Polarity (GTF Mode) */
+#define M1000X600_R60_HSP       NEGATIVE
+#define M1000X600_R60_VSP       POSITIVE
+
+/* 1024x576@60 Sync Polarity (GTF Mode) */
+#define M1024X576_R60_HSP       NEGATIVE
+#define M1024X576_R60_VSP       POSITIVE
+
+/*1024x600@60 Sync Polarity (GTF Mode)*/
+#define M1024X600_R60_HSP       NEGATIVE
+#define M1024X600_R60_VSP       POSITIVE
+
+/* 1088x612@60 Sync Polarity (CVT Mode) */
+#define M1088X612_R60_HSP       NEGATIVE
+#define M1088X612_R60_VSP       POSITIVE
+
+/* 1152x720@60 Sync Polarity (CVT Mode) */
+#define M1152X720_R60_HSP       NEGATIVE
+#define M1152X720_R60_VSP       POSITIVE
+
+/* 1200x720@60 Sync Polarity (GTF Mode) */
+#define M1200X720_R60_HSP       NEGATIVE
+#define M1200X720_R60_VSP       POSITIVE
+
+/* 1280x600@60 Sync Polarity (GTF Mode) */
+#define M1280x600_R60_HSP       NEGATIVE
+#define M1280x600_R60_VSP       POSITIVE
+
+/* 1280x720@50 Sync Polarity  (GTF Mode) */
+#define M1280X720_R50_HSP       NEGATIVE
+#define M1280X720_R50_VSP       POSITIVE
+
+/* 1280x720@60 Sync Polarity  (CEA Mode) */
+#define M1280X720_CEA_R60_HSP       POSITIVE
+#define M1280X720_CEA_R60_VSP       POSITIVE
+
+/* 1440x900@60 Sync Polarity (CVT Mode) */
+#define M1440X900_R60_HSP       NEGATIVE
+#define M1440X900_R60_VSP       POSITIVE
+
+/* 1440x900@75 Sync Polarity (CVT Mode) */
+#define M1440X900_R75_HSP       NEGATIVE
+#define M1440X900_R75_VSP       POSITIVE
+
+/* 1440x900@60 Sync Polarity (CVT Reduce Blanking Mode) */
+#define M1440X900_RB_R60_HSP       POSITIVE
+#define M1440X900_RB_R60_VSP       NEGATIVE
+
+/* 1600x900@60 Sync Polarity (CVT Mode) */
+#define M1600X900_R60_HSP       NEGATIVE
+#define M1600X900_R60_VSP       POSITIVE
+
+/* 1600x900@60 Sync Polarity (CVT Reduce Blanking Mode) */
+#define M1600X900_RB_R60_HSP       POSITIVE
+#define M1600X900_RB_R60_VSP       NEGATIVE
+
+/* 1600x1024@60 Sync Polarity (GTF Mode) */
+#define M1600X1024_R60_HSP      NEGATIVE
+#define M1600X1024_R60_VSP      POSITIVE
+
+/* 1792x1344@60 Sync Polarity (DMT Mode) */
+#define M1792x1344_R60_HSP      NEGATIVE
+#define M1792x1344_R60_VSP      POSITIVE
+
+/* 1856x1392@60 Sync Polarity (DMT Mode) */
+#define M1856x1392_R60_HSP      NEGATIVE
+#define M1856x1392_R60_VSP      POSITIVE
+
+/* 1920x1200@60 Sync Polarity (CVT Mode) */
+#define M1920X1200_R60_HSP      NEGATIVE
+#define M1920X1200_R60_VSP      POSITIVE
+
+/* 1920x1200@60 Sync Polarity (CVT Reduce Blanking Mode) */
+#define M1920X1200_RB_R60_HSP  POSITIVE
+#define M1920X1200_RB_R60_VSP  NEGATIVE
+
+/* 1920x1080@60 Sync Polarity  (CEA Mode) */
+#define M1920X1080_CEA_R60_HSP       POSITIVE
+#define M1920X1080_CEA_R60_VSP       POSITIVE
+
+/* 2048x1536@60 Sync Polarity (CVT Mode) */
+#define M2048x1536_R60_HSP      NEGATIVE
+#define M2048x1536_R60_VSP      POSITIVE
+
+/* define PLL index: */
+#define CLK_25_175M     25175000
+#define CLK_26_880M     26880000
+#define CLK_29_581M     29581000
+#define CLK_31_490M     31490000
+#define CLK_31_500M     31500000
+#define CLK_31_728M     31728000
+#define CLK_32_668M     32688000
+#define CLK_36_000M     36000000
+#define CLK_40_000M     40000000
+#define CLK_41_291M     41291000
+#define CLK_43_163M     43163000
+#define CLK_45_250M     45250000        /* 45.46MHz */
+#define CLK_46_000M     46000000
+#define CLK_46_996M     46996000
+#define CLK_48_000M     48000000
+#define CLK_48_875M     48875000
+#define CLK_49_500M     49500000
+#define CLK_52_406M     52406000
+#define CLK_52_977M     52977000
+#define CLK_56_250M     56250000
+#define CLK_60_466M     60466000
+#define CLK_61_500M     61500000
+#define CLK_65_000M     65000000
+#define CLK_65_178M     65178000
+#define CLK_66_750M     66750000        /* 67.116MHz */
+#define CLK_68_179M     68179000
+#define CLK_69_924M     69924000
+#define CLK_70_159M     70159000
+#define CLK_72_000M     72000000
+#define CLK_74_270M     74270000
+#define CLK_78_750M     78750000
+#define CLK_80_136M     80136000
+#define CLK_83_375M     83375000
+#define CLK_83_950M     83950000
+#define CLK_84_750M     84750000        /* 84.537Mhz */
+#define CLK_85_860M     85860000
+#define CLK_88_750M     88750000
+#define CLK_94_500M     94500000
+#define CLK_97_750M     97750000
+#define CLK_101_000M    101000000
+#define CLK_106_500M    106500000
+#define CLK_108_000M    108000000
+#define CLK_113_309M    113309000
+#define CLK_118_840M    118840000
+#define CLK_119_000M    119000000
+#define CLK_121_750M    121750000       /* 121.704MHz */
+#define CLK_125_104M    125104000
+#define CLK_133_308M    133308000
+#define CLK_135_000M    135000000
+#define CLK_136_700M    136700000
+#define CLK_138_400M    138400000
+#define CLK_146_760M    146760000
+#define CLK_148_500M    148500000
+
+#define CLK_153_920M    153920000
+#define CLK_156_000M    156000000
+#define CLK_157_500M    157500000
+#define CLK_162_000M    162000000
+#define CLK_187_000M    187000000
+#define CLK_193_295M    193295000
+#define CLK_202_500M    202500000
+#define CLK_204_000M    204000000
+#define CLK_218_500M    218500000
+#define CLK_234_000M    234000000
+#define CLK_267_250M    267250000
+#define CLK_297_500M    297500000
+#define CLK_74_481M     74481000
+#define CLK_172_798M    172798000
+#define CLK_122_614M    122614000
+
+/* CLE266 PLL value
+*/
+#define CLE266_PLL_25_175M     0x0000C763
+#define CLE266_PLL_26_880M     0x0000440F
+#define CLE266_PLL_29_581M     0x00008421
+#define CLE266_PLL_31_490M     0x00004721
+#define CLE266_PLL_31_500M     0x0000C3B5
+#define CLE266_PLL_31_728M     0x0000471F
+#define CLE266_PLL_32_668M     0x0000C449
+#define CLE266_PLL_36_000M     0x0000C5E5
+#define CLE266_PLL_40_000M     0x0000C459
+#define CLE266_PLL_41_291M     0x00004417
+#define CLE266_PLL_43_163M     0x0000C579
+#define CLE266_PLL_45_250M     0x0000C57F       /* 45.46MHz */
+#define CLE266_PLL_46_000M     0x0000875A
+#define CLE266_PLL_46_996M     0x0000C4E9
+#define CLE266_PLL_48_000M     0x00001443
+#define CLE266_PLL_48_875M     0x00001D63
+#define CLE266_PLL_49_500M     0x00008653
+#define CLE266_PLL_52_406M     0x0000C475
+#define CLE266_PLL_52_977M     0x00004525
+#define CLE266_PLL_56_250M     0x000047B7
+#define CLE266_PLL_60_466M     0x0000494C
+#define CLE266_PLL_61_500M     0x00001456
+#define CLE266_PLL_65_000M     0x000086ED
+#define CLE266_PLL_65_178M     0x0000855B
+#define CLE266_PLL_66_750M     0x0000844B       /* 67.116MHz */
+#define CLE266_PLL_68_179M     0x00000413
+#define CLE266_PLL_69_924M     0x00001153
+#define CLE266_PLL_70_159M     0x00001462
+#define CLE266_PLL_72_000M     0x00001879
+#define CLE266_PLL_74_270M     0x00004853
+#define CLE266_PLL_78_750M     0x00004321
+#define CLE266_PLL_80_136M     0x0000051C
+#define CLE266_PLL_83_375M     0x0000C25D
+#define CLE266_PLL_83_950M     0x00000729
+#define CLE266_PLL_84_750M     0x00008576       /* 84.537MHz */
+#define CLE266_PLL_85_860M     0x00004754
+#define CLE266_PLL_88_750M     0x0000051F
+#define CLE266_PLL_94_500M     0x00000521
+#define CLE266_PLL_97_750M     0x00004652
+#define CLE266_PLL_101_000M    0x0000497F
+#define CLE266_PLL_106_500M    0x00008477       /* 106.491463 MHz */
+#define CLE266_PLL_108_000M    0x00008479
+#define CLE266_PLL_113_309M    0x00000C5F
+#define CLE266_PLL_118_840M    0x00004553
+#define CLE266_PLL_119_000M    0x00000D6C
+#define CLE266_PLL_121_750M    0x00004555       /* 121.704MHz */
+#define CLE266_PLL_125_104M    0x000006B5
+#define CLE266_PLL_133_308M    0x0000465F
+#define CLE266_PLL_135_000M    0x0000455E
+#define CLE266_PLL_136_700M    0x00000C73
+#define CLE266_PLL_138_400M    0x00000957
+#define CLE266_PLL_146_760M    0x00004567
+#define CLE266_PLL_148_500M    0x00000853
+#define CLE266_PLL_153_920M    0x00000856
+#define CLE266_PLL_156_000M    0x0000456D
+#define CLE266_PLL_157_500M    0x000005B7
+#define CLE266_PLL_162_000M    0x00004571
+#define CLE266_PLL_187_000M    0x00000976
+#define CLE266_PLL_193_295M    0x0000086C
+#define CLE266_PLL_202_500M    0x00000763
+#define CLE266_PLL_204_000M    0x00000764
+#define CLE266_PLL_218_500M    0x0000065C
+#define CLE266_PLL_234_000M    0x00000662
+#define CLE266_PLL_267_250M    0x00000670
+#define CLE266_PLL_297_500M    0x000005E6
+#define CLE266_PLL_74_481M     0x0000051A
+#define CLE266_PLL_172_798M    0x00004579
+#define CLE266_PLL_122_614M    0x0000073C
+
+/* K800 PLL value
+*/
+#define K800_PLL_25_175M     0x00539001
+#define K800_PLL_26_880M     0x001C8C80
+#define K800_PLL_29_581M     0x00409080
+#define K800_PLL_31_490M     0x006F9001
+#define K800_PLL_31_500M     0x008B9002
+#define K800_PLL_31_728M     0x00AF9003
+#define K800_PLL_32_668M     0x00909002
+#define K800_PLL_36_000M     0x009F9002
+#define K800_PLL_40_000M     0x00578C02
+#define K800_PLL_41_291M     0x00438C01
+#define K800_PLL_43_163M     0x00778C03
+#define K800_PLL_45_250M     0x007D8C83 /* 45.46MHz */
+#define K800_PLL_46_000M     0x00658C02
+#define K800_PLL_46_996M     0x00818C83
+#define K800_PLL_48_000M     0x00848C83
+#define K800_PLL_48_875M     0x00508C81
+#define K800_PLL_49_500M     0x00518C01
+#define K800_PLL_52_406M     0x00738C02
+#define K800_PLL_52_977M     0x00928C83
+#define K800_PLL_56_250M     0x007C8C02
+#define K800_PLL_60_466M     0x00A78C83
+#define K800_PLL_61_500M     0x00AA8C83
+#define K800_PLL_65_000M     0x006B8C01
+#define K800_PLL_65_178M     0x00B48C83
+#define K800_PLL_66_750M     0x00948C82 /* 67.116MHz */
+#define K800_PLL_68_179M     0x00708C01
+#define K800_PLL_69_924M     0x00C18C83
+#define K800_PLL_70_159M     0x00C28C83
+#define K800_PLL_72_000M     0x009F8C82
+#define K800_PLL_74_270M     0x00ce0c03
+#define K800_PLL_78_750M     0x00408801
+#define K800_PLL_80_136M     0x00428801
+#define K800_PLL_83_375M     0x005B0882
+#define K800_PLL_83_950M     0x00738803
+#define K800_PLL_84_750M     0x00748883 /* 84.477MHz */
+#define K800_PLL_85_860M     0x00768883
+#define K800_PLL_88_750M     0x007A8883
+#define K800_PLL_94_500M     0x00828803
+#define K800_PLL_97_750M     0x00878883
+#define K800_PLL_101_000M    0x008B8883
+#define K800_PLL_106_500M    0x00758882 /* 106.491463 MHz */
+#define K800_PLL_108_000M    0x00778882
+#define K800_PLL_113_309M    0x005D8881
+#define K800_PLL_118_840M    0x00A48883
+#define K800_PLL_119_000M    0x00838882
+#define K800_PLL_121_750M    0x00A88883 /* 121.704MHz */
+#define K800_PLL_125_104M    0x00688801
+#define K800_PLL_133_308M    0x005D8801
+#define K800_PLL_135_000M    0x001A4081
+#define K800_PLL_136_700M    0x00BD8883
+#define K800_PLL_138_400M    0x00728881
+#define K800_PLL_146_760M    0x00CC8883
+#define K800_PLL_148_500M    0x00ce0803
+#define K800_PLL_153_920M    0x00548482
+#define K800_PLL_156_000M    0x006B8483
+#define K800_PLL_157_500M    0x00142080
+#define K800_PLL_162_000M    0x006F8483
+#define K800_PLL_187_000M    0x00818483
+#define K800_PLL_193_295M    0x004F8481
+#define K800_PLL_202_500M    0x00538481
+#define K800_PLL_204_000M    0x008D8483
+#define K800_PLL_218_500M    0x00978483
+#define K800_PLL_234_000M    0x00608401
+#define K800_PLL_267_250M    0x006E8481
+#define K800_PLL_297_500M    0x00A48402
+#define K800_PLL_74_481M     0x007B8C81
+#define K800_PLL_172_798M    0x00778483
+#define K800_PLL_122_614M    0x00878882
+
+/* PLL for VT3324 */
+#define CX700_25_175M     0x008B1003
+#define CX700_26_719M     0x00931003
+#define CX700_26_880M     0x00941003
+#define CX700_29_581M     0x00A49003
+#define CX700_31_490M     0x00AE1003
+#define CX700_31_500M     0x00AE1003
+#define CX700_31_728M     0x00AF1003
+#define CX700_32_668M     0x00B51003
+#define CX700_36_000M     0x00C81003
+#define CX700_40_000M     0x006E0C03
+#define CX700_41_291M     0x00710C03
+#define CX700_43_163M     0x00770C03
+#define CX700_45_250M     0x007D0C03    /* 45.46MHz */
+#define CX700_46_000M     0x007F0C03
+#define CX700_46_996M     0x00818C83
+#define CX700_48_000M     0x00840C03
+#define CX700_48_875M     0x00508C81
+#define CX700_49_500M     0x00880C03
+#define CX700_52_406M     0x00730C02
+#define CX700_52_977M     0x00920C03
+#define CX700_56_250M     0x009B0C03
+#define CX700_60_466M     0x00460C00
+#define CX700_61_500M     0x00AA0C03
+#define CX700_65_000M     0x006B0C01
+#define CX700_65_178M     0x006B0C01
+#define CX700_66_750M     0x00940C02    /*67.116MHz */
+#define CX700_68_179M     0x00BC0C03
+#define CX700_69_924M     0x00C10C03
+#define CX700_70_159M     0x00C20C03
+#define CX700_72_000M     0x009F0C02
+#define CX700_74_270M     0x00CE0C03
+#define CX700_74_481M     0x00CE0C03
+#define CX700_78_750M     0x006C0803
+#define CX700_80_136M     0x006E0803
+#define CX700_83_375M     0x005B0882
+#define CX700_83_950M     0x00730803
+#define CX700_84_750M     0x00740803    /* 84.537Mhz */
+#define CX700_85_860M     0x00760803
+#define CX700_88_750M     0x00AC8885
+#define CX700_94_500M     0x00820803
+#define CX700_97_750M     0x00870803
+#define CX700_101_000M    0x008B0803
+#define CX700_106_500M    0x00750802
+#define CX700_108_000M    0x00950803
+#define CX700_113_309M    0x005D0801
+#define CX700_118_840M    0x00A40803
+#define CX700_119_000M    0x00830802
+#define CX700_121_750M    0x00420800    /* 121.704MHz */
+#define CX700_125_104M    0x00AD0803
+#define CX700_133_308M    0x00930802
+#define CX700_135_000M    0x00950802
+#define CX700_136_700M    0x00BD0803
+#define CX700_138_400M    0x00720801
+#define CX700_146_760M    0x00CC0803
+#define CX700_148_500M    0x00a40802
+#define CX700_153_920M    0x00540402
+#define CX700_156_000M    0x006B0403
+#define CX700_157_500M    0x006C0403
+#define CX700_162_000M    0x006F0403
+#define CX700_172_798M    0x00770403
+#define CX700_187_000M    0x00810403
+#define CX700_193_295M    0x00850403
+#define CX700_202_500M    0x008C0403
+#define CX700_204_000M    0x008D0403
+#define CX700_218_500M    0x00970403
+#define CX700_234_000M    0x00600401
+#define CX700_267_250M    0x00B90403
+#define CX700_297_500M    0x00CE0403
+#define CX700_122_614M    0x00870802
+
+/* Definition CRTC Timing Index */
+#define H_TOTAL_INDEX               0
+#define H_ADDR_INDEX                1
+#define H_BLANK_START_INDEX         2
+#define H_BLANK_END_INDEX           3
+#define H_SYNC_START_INDEX          4
+#define H_SYNC_END_INDEX            5
+#define V_TOTAL_INDEX               6
+#define V_ADDR_INDEX                7
+#define V_BLANK_START_INDEX         8
+#define V_BLANK_END_INDEX           9
+#define V_SYNC_START_INDEX          10
+#define V_SYNC_END_INDEX            11
+#define H_TOTAL_SHADOW_INDEX        12
+#define H_BLANK_END_SHADOW_INDEX    13
+#define V_TOTAL_SHADOW_INDEX        14
+#define V_ADDR_SHADOW_INDEX         15
+#define V_BLANK_SATRT_SHADOW_INDEX  16
+#define V_BLANK_END_SHADOW_INDEX    17
+#define V_SYNC_SATRT_SHADOW_INDEX   18
+#define V_SYNC_END_SHADOW_INDEX     19
+
+/* Definition Video Mode Pixel Clock (picoseconds)
+*/
+#define RES_480X640_60HZ_PIXCLOCK    39722
+#define RES_640X480_60HZ_PIXCLOCK    39722
+#define RES_640X480_75HZ_PIXCLOCK    31747
+#define RES_640X480_85HZ_PIXCLOCK    27777
+#define RES_640X480_100HZ_PIXCLOCK   23168
+#define RES_640X480_120HZ_PIXCLOCK   19081
+#define RES_720X480_60HZ_PIXCLOCK    37020
+#define RES_720X576_60HZ_PIXCLOCK    30611
+#define RES_800X600_60HZ_PIXCLOCK    25000
+#define RES_800X600_75HZ_PIXCLOCK    20203
+#define RES_800X600_85HZ_PIXCLOCK    17777
+#define RES_800X600_100HZ_PIXCLOCK   14667
+#define RES_800X600_120HZ_PIXCLOCK   11912
+#define RES_800X480_60HZ_PIXCLOCK    33805
+#define RES_848X480_60HZ_PIXCLOCK    31756
+#define RES_856X480_60HZ_PIXCLOCK    31518
+#define RES_1024X512_60HZ_PIXCLOCK   24218
+#define RES_1024X600_60HZ_PIXCLOCK   20460
+#define RES_1024X768_60HZ_PIXCLOCK   15385
+#define RES_1024X768_75HZ_PIXCLOCK   12699
+#define RES_1024X768_85HZ_PIXCLOCK   10582
+#define RES_1024X768_100HZ_PIXCLOCK  8825
+#define RES_1152X864_75HZ_PIXCLOCK   9259
+#define RES_1280X768_60HZ_PIXCLOCK   12480
+#define RES_1280X800_60HZ_PIXCLOCK   11994
+#define RES_1280X960_60HZ_PIXCLOCK   9259
+#define RES_1280X1024_60HZ_PIXCLOCK  9260
+#define RES_1280X1024_75HZ_PIXCLOCK  7408
+#define RES_1280X768_85HZ_PIXCLOCK   6349
+#define RES_1440X1050_60HZ_PIXCLOCK  7993
+#define RES_1600X1200_60HZ_PIXCLOCK  6172
+#define RES_1600X1200_75HZ_PIXCLOCK  4938
+#define RES_1280X720_60HZ_PIXCLOCK   13426
+#define RES_1920X1080_60HZ_PIXCLOCK  5787
+#define RES_1400X1050_60HZ_PIXCLOCK  8214
+#define RES_1400X1050_75HZ_PIXCLOCK  6410
+#define RES_1368X768_60HZ_PIXCLOCK   11647
+#define RES_960X600_60HZ_PIXCLOCK      22099
+#define RES_1000X600_60HZ_PIXCLOCK    20834
+#define RES_1024X576_60HZ_PIXCLOCK    21278
+#define RES_1088X612_60HZ_PIXCLOCK    18877
+#define RES_1152X720_60HZ_PIXCLOCK    14981
+#define RES_1200X720_60HZ_PIXCLOCK    14253
+#define RES_1280X600_60HZ_PIXCLOCK    16260
+#define RES_1280X720_50HZ_PIXCLOCK    16538
+#define RES_1280X768_50HZ_PIXCLOCK    15342
+#define RES_1366X768_50HZ_PIXCLOCK    14301
+#define RES_1366X768_60HZ_PIXCLOCK    11646
+#define RES_1360X768_60HZ_PIXCLOCK    11799
+#define RES_1440X900_60HZ_PIXCLOCK    9390
+#define RES_1440X900_75HZ_PIXCLOCK    7315
+#define RES_1600X900_60HZ_PIXCLOCK    8415
+#define RES_1600X1024_60HZ_PIXCLOCK   7315
+#define RES_1680X1050_60HZ_PIXCLOCK   6814
+#define RES_1680X1050_75HZ_PIXCLOCK   5348
+#define RES_1792X1344_60HZ_PIXCLOCK   4902
+#define RES_1856X1392_60HZ_PIXCLOCK   4577
+#define RES_1920X1200_60HZ_PIXCLOCK   5173
+#define RES_1920X1440_60HZ_PIXCLOCK   4274
+#define RES_1920X1440_75HZ_PIXCLOCK   3367
+#define RES_2048X1536_60HZ_PIXCLOCK   3742
+
+#define RES_1360X768_RB_60HZ_PIXCLOCK 13889
+#define RES_1400X1050_RB_60HZ_PIXCLOCK 9901
+#define RES_1440X900_RB_60HZ_PIXCLOCK   11268
+#define RES_1600X900_RB_60HZ_PIXCLOCK   10230
+#define RES_1680X1050_RB_60HZ_PIXCLOCK 8403
+#define RES_1920X1080_RB_60HZ_PIXCLOCK 7225
+#define RES_1920X1200_RB_60HZ_PIXCLOCK 6497
+
+/* LCD display method
+*/
+#define     LCD_EXPANDSION              0x00
+#define     LCD_CENTERING               0x01
+
+/* LCD mode
+*/
+#define     LCD_OPENLDI               0x00
+#define     LCD_SPWG                  0x01
+
+/* Define display timing
+*/
+struct display_timing {
+        u16 hor_total;
+        u16 hor_addr;
+        u16 hor_blank_start;
+        u16 hor_blank_end;
+        u16 hor_sync_start;
+        u16 hor_sync_end;
+        u16 ver_total;
+        u16 ver_addr;
+        u16 ver_blank_start;
+        u16 ver_blank_end;
+        u16 ver_sync_start;
+        u16 ver_sync_end;
+};
+
+struct crt_mode_table {
+        int refresh_rate;
+        unsigned long clk;
+        int h_sync_polarity;
+        int v_sync_polarity;
+        struct display_timing crtc;
+};
+
+struct io_reg {
+        int port;
+        u8 index;
+        u8 mask;
+        u8 value;
+};
+
+#endif /* __SHARE_H__ */
diff --git a/drivers/video/via/tbl1636.c b/drivers/video/via/tbl1636.c
new file mode 100644
index 000000000000..2d8453429d4a
--- /dev/null
+++ b/drivers/video/via/tbl1636.c
@@ -0,0 +1,71 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; 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 "global.h"
+struct IODATA COMMON_INIT_TBL_VT1636[] = {
+/*  Index, Mask, Value */
+        /* Set panel power sequence timing */
+        {0x10, 0xC0, 0x00},
+        /* T1: VDD on - Data on. Each increment is 1 ms. (50ms = 031h) */
+        {0x0B, 0xFF, 0x40},
+        /* T2: Data on - Backlight on. Each increment is 2 ms. (210ms = 068h) */
+        {0x0C, 0xFF, 0x31},
+        /* T3: Backlight off -Data off. Each increment is 2 ms. (210ms = 068h)*/
+        {0x0D, 0xFF, 0x31},
+        /* T4: Data off - VDD off. Each increment is 1 ms. (50ms = 031h) */
+        {0x0E, 0xFF, 0x68},
+        /* T5: VDD off - VDD on. Each increment is 100 ms. (500ms = 04h) */
+        {0x0F, 0xFF, 0x68},
+        /* LVDS output power up */
+        {0x09, 0xA0, 0xA0},
+        /* turn on back light */
+        {0x10, 0x33, 0x13}
+};
+
+struct IODATA DUAL_CHANNEL_ENABLE_TBL_VT1636[] = {
+/*  Index, Mask, Value */
+        {0x08, 0xF0, 0xE0}      /* Input Data Mode Select */
+};
+
+struct IODATA SINGLE_CHANNEL_ENABLE_TBL_VT1636[] = {
+/*  Index, Mask, Value */
+        {0x08, 0xF0, 0x00}      /* Input Data Mode Select */
+};
+
+struct IODATA DITHERING_ENABLE_TBL_VT1636[] = {
+/*  Index, Mask, Value */
+        {0x0A, 0x70, 0x50}
+};
+
+struct IODATA DITHERING_DISABLE_TBL_VT1636[] = {
+/*  Index, Mask, Value */
+        {0x0A, 0x70, 0x00}
+};
+
+struct IODATA VDD_ON_TBL_VT1636[] = {
+/*  Index, Mask, Value */
+        {0x10, 0x20, 0x20}
+};
+
+struct IODATA VDD_OFF_TBL_VT1636[] = {
+/*  Index, Mask, Value */
+        {0x10, 0x20, 0x00}
+};
diff --git a/drivers/video/via/tbl1636.h b/drivers/video/via/tbl1636.h
new file mode 100644
index 000000000000..d906055f1511
--- /dev/null
+++ b/drivers/video/via/tbl1636.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _TBL1636_H_
+#define _TBL1636_H_
+#include "hw.h"
+
+extern struct IODATA COMMON_INIT_TBL_VT1636[8];
+extern struct IODATA DUAL_CHANNEL_ENABLE_TBL_VT1636[1];
+extern struct IODATA SINGLE_CHANNEL_ENABLE_TBL_VT1636[1];
+extern struct IODATA DITHERING_ENABLE_TBL_VT1636[1];
+extern struct IODATA DITHERING_DISABLE_TBL_VT1636[1];
+extern struct IODATA VDD_ON_TBL_VT1636[1];
+extern struct IODATA VDD_OFF_TBL_VT1636[1];
+
+#endif /* _VIA_TBL1636_H_ */
diff --git a/drivers/video/via/tblDPASetting.c b/drivers/video/via/tblDPASetting.c
new file mode 100644
index 000000000000..0c4c8cc712f4
--- /dev/null
+++ b/drivers/video/via/tblDPASetting.c
@@ -0,0 +1,109 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; 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 "global.h"
+/* For VT3324: */
+struct VT1636_DPA_SETTING VT1636_DPA_SETTING_TBL_VT3324[] = {
+        /* Panel ID,       CLK_SEL_ST1[09],    CLK_SEL_ST2[08] */
+        {LCD_PANEL_ID0_640X480, 0x00, 0x00},    /* For 640x480   */
+        {LCD_PANEL_ID1_800X600, 0x00, 0x00},    /* For 800x600   */
+        {LCD_PANEL_ID2_1024X768, 0x00, 0x00},   /* For 1024x768  */
+        {LCD_PANEL_ID3_1280X768, 0x00, 0x00},   /* For 1280x768  */
+        {LCD_PANEL_ID4_1280X1024, 0x00, 0x00},  /* For 1280x1024 */
+        {LCD_PANEL_ID5_1400X1050, 0x00, 0x00},  /* For 1400x1050 */
+        {LCD_PANEL_ID6_1600X1200, 0x0B, 0x03}   /* For 1600x1200 */
+};
+
+struct GFX_DPA_SETTING GFX_DPA_SETTING_TBL_VT3324[] = {
+/*  ClkRange, DVP0, DVP0DataDriving,  DVP0ClockDriving, DVP1,
+                                        DVP1Driving, DFPHigh, DFPLow */
+/*  CR96, SR2A[5], SR1B[1], SR2A[4], SR1E[2], CR9B,
+                                        SR65,        CR97,    CR99   */
+        /* LCK/VCK < 30000000 will use this value */
+        {DPA_CLK_RANGE_30M, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00,
+         0x00},
+        /* 30000000 < LCK/VCK < 50000000 will use this value */
+        {DPA_CLK_RANGE_30_50M, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00,
+         0x00},
+        /* 50000000 < LCK/VCK < 70000000 will use this value */
+        {DPA_CLK_RANGE_50_70M, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
+         0x00},
+        /* 70000000 < LCK/VCK < 100000000 will use this value */
+        {DPA_CLK_RANGE_70_100M, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
+         0x00},
+        /* 100000000 < LCK/VCK < 15000000 will use this value */
+        {DPA_CLK_RANGE_100_150M, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
+         0x00},
+        /* 15000000 < LCK/VCK will use this value */
+        {DPA_CLK_RANGE_150M, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0E, 0x00,
+         0x00},
+};
+
+/* For VT3327: */
+struct VT1636_DPA_SETTING VT1636_DPA_SETTING_TBL_VT3327[] = {
+        /* Panel ID,       CLK_SEL_ST1[09],    CLK_SEL_ST2[08] */
+        {LCD_PANEL_ID0_640X480, 0x00, 0x00},    /* For 640x480   */
+        {LCD_PANEL_ID1_800X600, 0x00, 0x00},    /* For 800x600   */
+        {LCD_PANEL_ID2_1024X768, 0x00, 0x00},   /* For 1024x768  */
+        {LCD_PANEL_ID3_1280X768, 0x00, 0x00},   /* For 1280x768  */
+        {LCD_PANEL_ID4_1280X1024, 0x00, 0x00},  /* For 1280x1024 */
+        {LCD_PANEL_ID5_1400X1050, 0x00, 0x00},  /* For 1400x1050 */
+        {LCD_PANEL_ID6_1600X1200, 0x00, 0x00}   /* For 1600x1200 */
+};
+
+struct GFX_DPA_SETTING GFX_DPA_SETTING_TBL_VT3327[] = {
+/*  ClkRange,DVP0, DVP0DataDriving,  DVP0ClockDriving, DVP1,
+                                        DVP1Driving, DFPHigh,   DFPLow */
+/*   CR96, SR2A[5], SR1B[1], SR2A[4], SR1E[2], CR9B,
+                                        SR65,        CR97,      CR99   */
+/* LCK/VCK < 30000000 will use this value */
+{DPA_CLK_RANGE_30M, 0x07, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x01},
+/* 30000000 < LCK/VCK < 50000000 will use this value */
+{DPA_CLK_RANGE_30_50M, 0x07, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x01},
+/* 50000000 < LCK/VCK < 70000000 will use this value */
+{DPA_CLK_RANGE_50_70M, 0x06, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x01},
+/* 70000000 < LCK/VCK < 100000000 will use this value */
+{DPA_CLK_RANGE_70_100M, 0x03, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x08, 0x03},
+/* 100000000 < LCK/VCK < 15000000 will use this value */
+{DPA_CLK_RANGE_100_150M, 0x03, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x02},
+/* 15000000 < LCK/VCK will use this value */
+{DPA_CLK_RANGE_150M, 0x00, 0x20, 0x00, 0x10, 0x00, 0x03, 0x00, 0x0D, 0x03},
+};
+
+/* For VT3364: */
+struct GFX_DPA_SETTING GFX_DPA_SETTING_TBL_VT3364[] = {
+/*  ClkRange,DVP0, DVP0DataDriving,  DVP0ClockDriving, DVP1,
+                                        DVP1Driving, DFPHigh,   DFPLow */
+/*   CR96, SR2A[5], SR1B[1], SR2A[4], SR1E[2], CR9B,
+                                        SR65,        CR97,      CR99   */
+/* LCK/VCK < 30000000 will use this value */
+{DPA_CLK_RANGE_30M, 0x07, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x08},
+/* 30000000 < LCK/VCK < 50000000 will use this value */
+{DPA_CLK_RANGE_30_50M, 0x07, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x08},
+/* 50000000 < LCK/VCK < 70000000 will use this value */
+{DPA_CLK_RANGE_50_70M, 0x07, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x08},
+/* 70000000 < LCK/VCK < 100000000 will use this value */
+{DPA_CLK_RANGE_70_100M, 0x07, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x08},
+/* 100000000 < LCK/VCK < 15000000 will use this value */
+{DPA_CLK_RANGE_100_150M, 0x03, 0x00, 0x02, 0x00, 0x00, 0x03, 0x00, 0x00, 0x08},
+/* 15000000 < LCK/VCK will use this value */
+{DPA_CLK_RANGE_150M, 0x01, 0x00, 0x02, 0x10, 0x00, 0x03, 0x00, 0x00, 0x08},
+};
diff --git a/drivers/video/via/tblDPASetting.h b/drivers/video/via/tblDPASetting.h
new file mode 100644
index 000000000000..b065a83481d3
--- /dev/null
+++ b/drivers/video/via/tblDPASetting.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _TBLDPASETTING_H_
+#define _TBLDPASETTING_H_
+#include "global.h"
+
+#define DPA_CLK_30M       30000000
+#define DPA_CLK_50M       50000000
+#define DPA_CLK_70M       70000000
+#define DPA_CLK_100M      100000000
+#define DPA_CLK_150M      150000000
+
+enum DPA_RANGE {
+        DPA_CLK_RANGE_30M,
+        DPA_CLK_RANGE_30_50M,
+        DPA_CLK_RANGE_50_70M,
+        DPA_CLK_RANGE_70_100M,
+        DPA_CLK_RANGE_100_150M,
+        DPA_CLK_RANGE_150M
+};
+
+extern struct VT1636_DPA_SETTING VT1636_DPA_SETTING_TBL_VT3324[7];
+extern struct GFX_DPA_SETTING GFX_DPA_SETTING_TBL_VT3324[6];
+extern struct VT1636_DPA_SETTING VT1636_DPA_SETTING_TBL_VT3327[7];
+extern struct GFX_DPA_SETTING GFX_DPA_SETTING_TBL_VT3327[];
+extern struct GFX_DPA_SETTING GFX_DPA_SETTING_TBL_VT3364[6];
+
+#endif
diff --git a/drivers/video/via/via_i2c.c b/drivers/video/via/via_i2c.c
new file mode 100644
index 000000000000..0f3ed4eb236d
--- /dev/null
+++ b/drivers/video/via/via_i2c.c
@@ -0,0 +1,177 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; 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 "global.h"
+
+static void via_i2c_setscl(void *data, int state)
+{
+        u8 val;
+        struct via_i2c_stuff *via_i2c_chan = (struct via_i2c_stuff *)data;
+
+        val = viafb_read_reg(VIASR, via_i2c_chan->i2c_port) & 0xF0;
+        if (state)
+                val |= 0x20;
+        else
+                val &= ~0x20;
+        switch (via_i2c_chan->i2c_port) {
+        case I2CPORTINDEX:
+                val |= 0x01;
+                break;
+        case GPIOPORTINDEX:
+                val |= 0x80;
+                break;
+        default:
+                DEBUG_MSG("via_i2c: specify wrong i2c port.\n");
+        }
+        viafb_write_reg(via_i2c_chan->i2c_port, VIASR, val);
+}
+
+static int via_i2c_getscl(void *data)
+{
+        struct via_i2c_stuff *via_i2c_chan = (struct via_i2c_stuff *)data;
+
+        if (viafb_read_reg(VIASR, via_i2c_chan->i2c_port) & 0x08)
+                return 1;
+        return 0;
+}
+
+static int via_i2c_getsda(void *data)
+{
+        struct via_i2c_stuff *via_i2c_chan = (struct via_i2c_stuff *)data;
+
+        if (viafb_read_reg(VIASR, via_i2c_chan->i2c_port) & 0x04)
+                return 1;
+        return 0;
+}
+
+static void via_i2c_setsda(void *data, int state)
+{
+        u8 val;
+        struct via_i2c_stuff *via_i2c_chan = (struct via_i2c_stuff *)data;
+
+        val = viafb_read_reg(VIASR, via_i2c_chan->i2c_port) & 0xF0;
+        if (state)
+                val |= 0x10;
+        else
+                val &= ~0x10;
+        switch (via_i2c_chan->i2c_port) {
+        case I2CPORTINDEX:
+                val |= 0x01;
+                break;
+        case GPIOPORTINDEX:
+                val |= 0x40;
+                break;
+        default:
+                DEBUG_MSG("via_i2c: specify wrong i2c port.\n");
+        }
+        viafb_write_reg(via_i2c_chan->i2c_port, VIASR, val);
+}
+
+int viafb_i2c_readbyte(u8 slave_addr, u8 index, u8 *pdata)
+{
+        u8 mm1[] = {0x00};
+        struct i2c_msg msgs[2];
+
+        *pdata = 0;
+        msgs[0].flags = 0;
+        msgs[1].flags = I2C_M_RD;
+        msgs[0].addr = msgs[1].addr = slave_addr / 2;
+        mm1[0] = index;
+        msgs[0].len = 1; msgs[1].len = 1;
+        msgs[0].buf = mm1; msgs[1].buf = pdata;
+        i2c_transfer(&viaparinfo->i2c_stuff.adapter, msgs, 2);
+
+        return 0;
+}
+
+int viafb_i2c_writebyte(u8 slave_addr, u8 index, u8 data)
+{
+        u8 msg[2] = { index, data };
+        struct i2c_msg msgs;
+
+        msgs.flags = 0;
+        msgs.addr = slave_addr / 2;
+        msgs.len = 2;
+        msgs.buf = msg;
+        return i2c_transfer(&viaparinfo->i2c_stuff.adapter, &msgs, 1);
+}
+
+int viafb_i2c_readbytes(u8 slave_addr, u8 index, u8 *buff, int buff_len)
+{
+        u8 mm1[] = {0x00};
+        struct i2c_msg msgs[2];
+
+        msgs[0].flags = 0;
+        msgs[1].flags = I2C_M_RD;
+        msgs[0].addr = msgs[1].addr = slave_addr / 2;
+        mm1[0] = index;
+        msgs[0].len = 1; msgs[1].len = buff_len;
+        msgs[0].buf = mm1; msgs[1].buf = buff;
+        i2c_transfer(&viaparinfo->i2c_stuff.adapter, msgs, 2);
+        return 0;
+}
+
+int viafb_create_i2c_bus(void *viapar)
+{
+        int ret;
+        struct viafb_par *par = (struct viafb_par *)viapar;
+
+        strcpy(par->i2c_stuff.adapter.name, "via_i2c");
+        par->i2c_stuff.i2c_port = 0x0;
+        par->i2c_stuff.adapter.owner = THIS_MODULE;
+        par->i2c_stuff.adapter.id = 0x01FFFF;
+        par->i2c_stuff.adapter.class = 0;
+        par->i2c_stuff.adapter.algo_data = &par->i2c_stuff.algo;
+        par->i2c_stuff.adapter.dev.parent = NULL;
+        par->i2c_stuff.algo.setsda = via_i2c_setsda;
+        par->i2c_stuff.algo.setscl = via_i2c_setscl;
+        par->i2c_stuff.algo.getsda = via_i2c_getsda;
+        par->i2c_stuff.algo.getscl = via_i2c_getscl;
+        par->i2c_stuff.algo.udelay = 40;
+        par->i2c_stuff.algo.timeout = 20;
+        par->i2c_stuff.algo.data = &par->i2c_stuff;
+
+        i2c_set_adapdata(&par->i2c_stuff.adapter, &par->i2c_stuff);
+
+        /* Raise SCL and SDA */
+        par->i2c_stuff.i2c_port = I2CPORTINDEX;
+        via_i2c_setsda(&par->i2c_stuff, 1);
+        via_i2c_setscl(&par->i2c_stuff, 1);
+
+        par->i2c_stuff.i2c_port = GPIOPORTINDEX;
+        via_i2c_setsda(&par->i2c_stuff, 1);
+        via_i2c_setscl(&par->i2c_stuff, 1);
+        udelay(20);
+
+        ret = i2c_bit_add_bus(&par->i2c_stuff.adapter);
+        if (ret == 0)
+                DEBUG_MSG("I2C bus %s registered.\n",
+                par->i2c_stuff.adapter.name);
+        else
+                DEBUG_MSG("Failed to register I2C bus %s.\n",
+                        par->i2c_stuff.adapter.name);
+        return ret;
+}
+
+void viafb_delete_i2c_buss(void *par)
+{
+        i2c_del_adapter(&((struct viafb_par *)par)->i2c_stuff.adapter);
+}
diff --git a/drivers/video/via/via_i2c.h b/drivers/video/via/via_i2c.h
new file mode 100644
index 000000000000..3a13242a3152
--- /dev/null
+++ b/drivers/video/via/via_i2c.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+#ifndef __VIA_I2C_H__
+#define __VIA_I2C_H__
+
+#include <linux/i2c.h>
+#include <linux/i2c-algo-bit.h>
+
+struct via_i2c_stuff {
+        u16 i2c_port;                   /* GPIO or I2C port */
+        struct i2c_adapter adapter;
+        struct i2c_algo_bit_data algo;
+};
+
+#define I2CPORT           0x3c4
+#define I2CPORTINDEX      0x31
+#define GPIOPORT          0x3C4
+#define GPIOPORTINDEX     0x2C
+#define I2C_BUS             1
+#define GPIO_BUS            2
+#define DELAYPORT           0x3C3
+
+int viafb_i2c_readbyte(u8 slave_addr, u8 index, u8 *pdata);
+int viafb_i2c_writebyte(u8 slave_addr, u8 index, u8 data);
+int viafb_i2c_readbytes(u8 slave_addr, u8 index, u8 *buff, int buff_len);
+int viafb_create_i2c_bus(void *par);
+void viafb_delete_i2c_buss(void *par);
+#endif /* __VIA_I2C_H__ */
diff --git a/drivers/video/via/via_utility.c b/drivers/video/via/via_utility.c
new file mode 100644
index 000000000000..d53c3d54ed8e
--- /dev/null
+++ b/drivers/video/via/via_utility.c
@@ -0,0 +1,253 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; 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 "global.h"
+
+void viafb_get_device_support_state(u32 *support_state)
+{
+        *support_state = CRT_Device;
+
+        if (viaparinfo->chip_info->tmds_chip_info.tmds_chip_name == VT1632_TMDS)
+                *support_state |= DVI_Device;
+
+        if (viaparinfo->chip_info->lvds_chip_info.lvds_chip_name == VT1631_LVDS)
+                *support_state |= LCD_Device;
+}
+
+void viafb_get_device_connect_state(u32 *connect_state)
+{
+        bool mobile = false;
+
+        *connect_state = CRT_Device;
+
+        if (viafb_dvi_sense())
+                *connect_state |= DVI_Device;
+
+        viafb_lcd_get_mobile_state(&mobile);
+        if (mobile)
+                *connect_state |= LCD_Device;
+}
+
+bool viafb_lcd_get_support_expand_state(u32 xres, u32 yres)
+{
+        unsigned int support_state = 0;
+
+        switch (viafb_lcd_panel_id) {
+        case LCD_PANEL_ID0_640X480:
+                if ((xres < 640) && (yres < 480))
+                        support_state = true;
+                break;
+
+        case LCD_PANEL_ID1_800X600:
+                if ((xres < 800) && (yres < 600))
+                        support_state = true;
+                break;
+
+        case LCD_PANEL_ID2_1024X768:
+                if ((xres < 1024) && (yres < 768))
+                        support_state = true;
+                break;
+
+        case LCD_PANEL_ID3_1280X768:
+                if ((xres < 1280) && (yres < 768))
+                        support_state = true;
+                break;
+
+        case LCD_PANEL_ID4_1280X1024:
+                if ((xres < 1280) && (yres < 1024))
+                        support_state = true;
+                break;
+
+        case LCD_PANEL_ID5_1400X1050:
+                if ((xres < 1400) && (yres < 1050))
+                        support_state = true;
+                break;
+
+        case LCD_PANEL_ID6_1600X1200:
+                if ((xres < 1600) && (yres < 1200))
+                        support_state = true;
+                break;
+
+        case LCD_PANEL_ID7_1366X768:
+                if ((xres < 1366) && (yres < 768))
+                        support_state = true;
+                break;
+
+        case LCD_PANEL_ID8_1024X600:
+                if ((xres < 1024) && (yres < 600))
+                        support_state = true;
+                break;
+
+        case LCD_PANEL_ID9_1280X800:
+                if ((xres < 1280) && (yres < 800))
+                        support_state = true;
+                break;
+
+        case LCD_PANEL_IDA_800X480:
+                if ((xres < 800) && (yres < 480))
+                        support_state = true;
+                break;
+
+        case LCD_PANEL_IDB_1360X768:
+                if ((xres < 1360) && (yres < 768))
+                        support_state = true;
+                break;
+
+        case LCD_PANEL_IDC_480X640:
+                if ((xres < 480) && (yres < 640))
+                        support_state = true;
+                break;
+
+        default:
+                support_state = false;
+                break;
+        }
+
+        return support_state;
+}
+
+/*====================================================================*/
+/*                      Gamma Function Implementation*/
+/*====================================================================*/
+
+void viafb_set_gamma_table(int bpp, unsigned int *gamma_table)
+{
+        int i, sr1a;
+        int active_device_amount = 0;
+        int device_status = viafb_DeviceStatus;
+
+        for (i = 0; i < sizeof(viafb_DeviceStatus) * 8; i++) {
+                if (device_status & 1)
+                        active_device_amount++;
+                device_status >>= 1;
+        }
+
+        /* 8 bpp mode can't adjust gamma */
+        if (bpp == 8)
+                return ;
+
+        /* Enable Gamma */
+        switch (viaparinfo->chip_info->gfx_chip_name) {
+        case UNICHROME_CLE266:
+        case UNICHROME_K400:
+                viafb_write_reg_mask(SR16, VIASR, 0x80, BIT7);
+                break;
+
+        case UNICHROME_K800:
+        case UNICHROME_PM800:
+        case UNICHROME_CN700:
+        case UNICHROME_CX700:
+        case UNICHROME_K8M890:
+        case UNICHROME_P4M890:
+        case UNICHROME_P4M900:
+                viafb_write_reg_mask(CR33, VIACR, 0x80, BIT7);
+                break;
+        }
+        sr1a = (unsigned int)viafb_read_reg(VIASR, SR1A);
+        viafb_write_reg_mask(SR1A, VIASR, 0x0, BIT0);
+
+        /* Fill IGA1 Gamma Table */
+        outb(0, LUT_INDEX_WRITE);
+        for (i = 0; i < 256; i++) {
+                outb(gamma_table[i] >> 16, LUT_DATA);
+                outb(gamma_table[i] >> 8 & 0xFF, LUT_DATA);
+                outb(gamma_table[i] & 0xFF, LUT_DATA);
+        }
+
+        /* If adjust Gamma value in SAMM, fill IGA1,
+           IGA2 Gamma table simultanous. */
+        /* Switch to IGA2 Gamma Table */
+        if ((active_device_amount > 1) &&
+                !((viaparinfo->chip_info->gfx_chip_name ==
+                UNICHROME_CLE266) &&
+                (viaparinfo->chip_info->gfx_chip_revision < 15))) {
+                viafb_write_reg_mask(SR1A, VIASR, 0x01, BIT0);
+                viafb_write_reg_mask(CR6A, VIACR, 0x02, BIT1);
+
+                /* Fill IGA2 Gamma Table */
+                outb(0, LUT_INDEX_WRITE);
+                for (i = 0; i < 256; i++) {
+                        outb(gamma_table[i] >> 16, LUT_DATA);
+                        outb(gamma_table[i] >> 8 & 0xFF, LUT_DATA);
+                        outb(gamma_table[i] & 0xFF, LUT_DATA);
+                }
+        }
+        viafb_write_reg(SR1A, VIASR, sr1a);
+}
+
+void viafb_get_gamma_table(unsigned int *gamma_table)
+{
+        unsigned char color_r, color_g, color_b;
+        unsigned char sr1a = 0;
+        int i;
+
+        /* Enable Gamma */
+        switch (viaparinfo->chip_info->gfx_chip_name) {
+        case UNICHROME_CLE266:
+        case UNICHROME_K400:
+                viafb_write_reg_mask(SR16, VIASR, 0x80, BIT7);
+                break;
+
+        case UNICHROME_K800:
+        case UNICHROME_PM800:
+        case UNICHROME_CN700:
+        case UNICHROME_CX700:
+        case UNICHROME_K8M890:
+        case UNICHROME_P4M890:
+        case UNICHROME_P4M900:
+                viafb_write_reg_mask(CR33, VIACR, 0x80, BIT7);
+                break;
+        }
+        sr1a = viafb_read_reg(VIASR, SR1A);
+        viafb_write_reg_mask(SR1A, VIASR, 0x0, BIT0);
+
+        /* Reading gamma table to get color value */
+        outb(0, LUT_INDEX_READ);
+        for (i = 0; i < 256; i++) {
+                color_r = inb(LUT_DATA);
+                color_g = inb(LUT_DATA);
+                color_b = inb(LUT_DATA);
+                gamma_table[i] =
+                    ((((u32) color_r) << 16) |
+                     (((u16) color_g) << 8)) | color_b;
+        }
+        viafb_write_reg(SR1A, VIASR, sr1a);
+}
+
+void viafb_get_gamma_support_state(int bpp, unsigned int *support_state)
+{
+        if (bpp == 8)
+                *support_state = None_Device;
+        else
+                *support_state = CRT_Device | DVI_Device | LCD_Device;
+}
+
+int viafb_input_parameter_converter(int parameter_value)
+{
+        int result;
+
+        if (parameter_value >= 1 && parameter_value <= 9)
+                result = 1 << (parameter_value - 1);
+        else
+                result = 1;
+
+        return result;
+}
diff --git a/drivers/video/via/via_utility.h b/drivers/video/via/via_utility.h
new file mode 100644
index 000000000000..2fd455202ebd
--- /dev/null
+++ b/drivers/video/via/via_utility.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+#ifndef __VIAUTILITY_H__
+#define __VIAUTILITY_H__
+
+/* These functions are used to get infomation about device's state */
+void viafb_get_device_support_state(u32 *support_state);
+void viafb_get_device_connect_state(u32 *connect_state);
+bool viafb_lcd_get_support_expand_state(u32 xres, u32 yres);
+
+/* These function are used to access gamma table */
+void viafb_set_gamma_table(int bpp, unsigned int *gamma_table);
+void viafb_get_gamma_table(unsigned int *gamma_table);
+void viafb_get_gamma_support_state(int bpp, unsigned int *support_state);
+int viafb_input_parameter_converter(int parameter_value);
+
+#endif /* __VIAUTILITY_H__ */
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
new file mode 100644
index 000000000000..0132eae06f55
--- /dev/null
+++ b/drivers/video/via/viafbdev.c
@@ -0,0 +1,2571 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; 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>
+#define _MASTER_FILE
+
+#include "global.h"
+
+static int MAX_CURS = 32;
+static struct fb_var_screeninfo default_var;
+static char *viafb_name = "Via";
+static u32 pseudo_pal[17];
+
+/* video mode */
+static char *viafb_mode = "640x480";
+static char *viafb_mode1 = "640x480";
+static int viafb_resMode = VIA_RES_640X480;
+
+/* Added for specifying active devices.*/
+char *viafb_active_dev = "";
+
+/* Added for specifying video on devices.*/
+char *viafb_video_dev = "";
+
+/*Added for specify lcd output port*/
+char *viafb_lcd_port = "";
+char *viafb_dvi_port = "";
+
+static void viafb_set_device(struct device_t active_dev);
+static int apply_device_setting(struct viafb_ioctl_setting setting_info,
+                         struct fb_info *info);
+static void apply_second_mode_setting(struct fb_var_screeninfo
+        *sec_var);
+static void retrieve_device_setting(struct viafb_ioctl_setting
+        *setting_info);
+static void viafb_set_video_device(u32 video_dev_info);
+static void viafb_get_video_device(u32 *video_dev_info);
+
+/* Mode information */
+static const struct viafb_modeinfo viafb_modentry[] = {
+        {480, 640, VIA_RES_480X640, "480x640"},
+        {640, 480, VIA_RES_640X480, "640x480"},
+        {800, 480, VIA_RES_800X480, "800x480"},
+        {800, 600, VIA_RES_800X600, "800x600"},
+        {1024, 768, VIA_RES_1024X768, "1024x768"},
+        {1152, 864, VIA_RES_1152X864, "1152x864"},
+        {1280, 1024, VIA_RES_1280X1024, "1280x1024"},
+        {1600, 1200, VIA_RES_1600X1200, "1600x1200"},
+        {1440, 1050, VIA_RES_1440X1050, "1440x1050"},
+        {1280, 768, VIA_RES_1280X768, "1280x768"},
+        {1280, 800, VIA_RES_1280X800, "1280x800"},
+        {1280, 960, VIA_RES_1280X960, "1280x960"},
+        {1920, 1440, VIA_RES_1920X1440, "1920x1440"},
+        {848, 480, VIA_RES_848X480, "848x480"},
+        {1400, 1050, VIA_RES_1400X1050, "1400x1050"},
+        {720, 480, VIA_RES_720X480, "720x480"},
+        {720, 576, VIA_RES_720X576, "720x576"},
+        {1024, 512, VIA_RES_1024X512, "1024x512"},
+        {1024, 576, VIA_RES_1024X576, "1024x576"},
+        {1024, 600, VIA_RES_1024X600, "1024x600"},
+        {1280, 720, VIA_RES_1280X720, "1280x720"},
+        {1920, 1080, VIA_RES_1920X1080, "1920x1080"},
+        {1366, 768, VIA_RES_1368X768, "1368x768"},
+        {1680, 1050, VIA_RES_1680X1050, "1680x1050"},
+        {960, 600, VIA_RES_960X600, "960x600"},
+        {1000, 600, VIA_RES_1000X600, "1000x600"},
+        {1024, 576, VIA_RES_1024X576, "1024x576"},
+        {1024, 600, VIA_RES_1024X600, "1024x600"},
+        {1088, 612, VIA_RES_1088X612, "1088x612"},
+        {1152, 720, VIA_RES_1152X720, "1152x720"},
+        {1200, 720, VIA_RES_1200X720, "1200x720"},
+        {1280, 600, VIA_RES_1280X600, "1280x600"},
+        {1360, 768, VIA_RES_1360X768, "1360x768"},
+        {1440, 900, VIA_RES_1440X900, "1440x900"},
+        {1600, 900, VIA_RES_1600X900, "1600x900"},
+        {1600, 1024, VIA_RES_1600X1024, "1600x1024"},
+        {1792, 1344, VIA_RES_1792X1344, "1792x1344"},
+        {1856, 1392, VIA_RES_1856X1392, "1856x1392"},
+        {1920, 1200, VIA_RES_1920X1200, "1920x1200"},
+        {2048, 1536, VIA_RES_2048X1536, "2048x1536"},
+        {0, 0, VIA_RES_INVALID, "640x480"}
+};
+
+static struct fb_ops viafb_ops;
+
+static int viafb_update_fix(struct fb_fix_screeninfo *fix, struct fb_info *info)
+{
+        struct viafb_par *ppar;
+        ppar = info->par;
+
+        DEBUG_MSG(KERN_INFO "viafb_update_fix!\n");
+
+        fix->visual =
+            ppar->bpp == 8 ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR;
+        fix->line_length = ppar->linelength;
+
+        return 0;
+}
+
+
+static void viafb_setup_fixinfo(struct fb_fix_screeninfo *fix,
+        struct viafb_par *viaparinfo)
+{
+        memset(fix, 0, sizeof(struct fb_fix_screeninfo));
+        strcpy(fix->id, viafb_name);
+
+        fix->smem_start = viaparinfo->fbmem;
+        fix->smem_len = viaparinfo->fbmem_free;
+        fix->mmio_start = viaparinfo->mmio_base;
+        fix->mmio_len = viaparinfo->mmio_len;
+
+        fix->type = FB_TYPE_PACKED_PIXELS;
+        fix->type_aux = 0;
+
+        fix->xpanstep = fix->ywrapstep = 0;
+        fix->ypanstep = 1;
+
+        /* Just tell the accel name */
+        viafbinfo->fix.accel = FB_ACCEL_VIA_UNICHROME;
+}
+static int viafb_open(struct fb_info *info, int user)
+{
+        DEBUG_MSG(KERN_INFO "viafb_open!\n");
+        return 0;
+}
+
+static int viafb_release(struct fb_info *info, int user)
+{
+        DEBUG_MSG(KERN_INFO "viafb_release!\n");
+        return 0;
+}
+
+static void viafb_update_viafb_par(struct fb_info *info)
+{
+        struct viafb_par *ppar;
+
+        ppar = info->par;
+        ppar->bpp = info->var.bits_per_pixel;
+        ppar->linelength = ((info->var.xres_virtual + 7) & ~7) * ppar->bpp / 8;
+        ppar->hres = info->var.xres;
+        ppar->vres = info->var.yres;
+        ppar->xoffset = info->var.xoffset;
+        ppar->yoffset = info->var.yoffset;
+}
+
+static int viafb_check_var(struct fb_var_screeninfo *var,
+        struct fb_info *info)
+{
+        int vmode_index, htotal, vtotal;
+        struct viafb_par *ppar;
+        u32 long_refresh;
+        struct viafb_par *p_viafb_par;
+        ppar = info->par;
+
+
+        DEBUG_MSG(KERN_INFO "viafb_check_var!\n");
+        /* Sanity check */
+        /* HW neither support interlacte nor double-scaned mode */
+        if (var->vmode & FB_VMODE_INTERLACED || var->vmode & FB_VMODE_DOUBLE)
+                return -EINVAL;
+
+        vmode_index = viafb_get_mode_index(var->xres, var->yres, 0);
+        if (vmode_index == VIA_RES_INVALID) {
+                DEBUG_MSG(KERN_INFO
+                          "viafb: Mode %dx%dx%d not supported!!\n",
+                          var->xres, var->yres, var->bits_per_pixel);
+                return -EINVAL;
+        }
+
+        if (24 == var->bits_per_pixel)
+                var->bits_per_pixel = 32;
+
+        if (var->bits_per_pixel != 8 && var->bits_per_pixel != 16 &&
+                var->bits_per_pixel != 32)
+                return -EINVAL;
+
+        if ((var->xres_virtual * (var->bits_per_pixel >> 3)) & 0x1F)
+                /*32 pixel alignment */
+                var->xres_virtual = (var->xres_virtual + 31) & ~31;
+        if (var->xres_virtual * var->yres_virtual * var->bits_per_pixel / 8 >
+                ppar->memsize)
+                return -EINVAL;
+
+        /* Based on var passed in to calculate the refresh,
+         * because our driver use some modes special.
+         */
+        htotal = var->xres + var->left_margin +
+        var->right_margin + var->hsync_len;
+        vtotal = var->yres + var->upper_margin +
+                var->lower_margin + var->vsync_len;
+        long_refresh = 1000000000UL / var->pixclock * 1000;
+        long_refresh /= (htotal * vtotal);
+
+        viafb_refresh = viafb_get_refresh(var->xres, var->yres, long_refresh);
+
+        /* Adjust var according to our driver's own table */
+        viafb_fill_var_timing_info(var, viafb_refresh, vmode_index);
+
+        /* This is indeed a patch for VT3353 */
+        if (!info->par)
+                return -1;
+        p_viafb_par = (struct viafb_par *)info->par;
+        if (p_viafb_par->chip_info->gfx_chip_name == UNICHROME_VX800)
+                var->accel_flags = 0;
+
+        return 0;
+}
+
+static int viafb_set_par(struct fb_info *info)
+{
+        int vmode_index;
+        int vmode_index1 = 0;
+        DEBUG_MSG(KERN_INFO "viafb_set_par!\n");
+
+        viafb_update_device_setting(info->var.xres, info->var.yres,
+                              info->var.bits_per_pixel, viafb_refresh, 0);
+
+        vmode_index = viafb_get_mode_index(info->var.xres, info->var.yres, 0);
+
+        if (viafb_SAMM_ON == 1) {
+                DEBUG_MSG(KERN_INFO
+                "viafb_second_xres = %d, viafb_second_yres = %d, bpp = %d\n",
+                          viafb_second_xres, viafb_second_yres, viafb_bpp1);
+                vmode_index1 = viafb_get_mode_index(viafb_second_xres,
+                        viafb_second_yres, 1);
+                DEBUG_MSG(KERN_INFO "->viafb_SAMM_ON: index=%d\n",
+                        vmode_index1);
+
+                viafb_update_device_setting(viafb_second_xres,
+                        viafb_second_yres, viafb_bpp1, viafb_refresh1, 1);
+        }
+
+        if (vmode_index != VIA_RES_INVALID) {
+                viafb_setmode(vmode_index, info->var.xres, info->var.yres,
+                        info->var.bits_per_pixel, vmode_index1,
+                        viafb_second_xres, viafb_second_yres, viafb_bpp1);
+
+                /*We should set memory offset according virtual_x */
+                /*Fix me:put this function into viafb_setmode */
+                viafb_memory_pitch_patch(info);
+
+                /* Update ***fb_par information */
+                viafb_update_viafb_par(info);
+
+                /* Update other fixed information */
+                viafb_update_fix(&info->fix, info);
+                viafb_bpp = info->var.bits_per_pixel;
+                /* Update viafb_accel, it is necessary to our 2D accelerate */
+                viafb_accel = info->var.accel_flags;
+
+                if (viafb_accel)
+                        viafb_set_2d_color_depth(info->var.bits_per_pixel);
+        }
+
+        return 0;
+}
+
+/* Set one color register */
+static int viafb_setcolreg(unsigned regno, unsigned red, unsigned green,
+unsigned blue, unsigned transp, struct fb_info *info)
+{
+        u8 sr1a, sr1b, cr67, cr6a, rev = 0, shift = 10;
+        unsigned cmap_entries = (info->var.bits_per_pixel == 8) ? 256 : 16;
+        DEBUG_MSG(KERN_INFO "viafb_setcolreg!\n");
+        if (regno >= cmap_entries)
+                return 1;
+        if (UNICHROME_CLE266 == viaparinfo->chip_info->gfx_chip_name) {
+                /*
+                 * Read PCI bus 0,dev 0,function 0,index 0xF6 to get chip rev.
+                 */
+                outl(0x80000000 | (0xf6 & ~3), (unsigned long)0xCF8);
+                rev = (inl((unsigned long)0xCFC) >> ((0xf6 & 3) * 8)) & 0xff;
+        }
+        switch (info->var.bits_per_pixel) {
+        case 8:
+                outb(0x1A, 0x3C4);
+                sr1a = inb(0x3C5);
+                outb(0x1B, 0x3C4);
+                sr1b = inb(0x3C5);
+                outb(0x67, 0x3D4);
+                cr67 = inb(0x3D5);
+                outb(0x6A, 0x3D4);
+                cr6a = inb(0x3D5);
+
+                /* Map the 3C6/7/8/9 to the IGA2 */
+                outb(0x1A, 0x3C4);
+                outb(sr1a | 0x01, 0x3C5);
+                /* Second Display Engine colck always on */
+                outb(0x1B, 0x3C4);
+                outb(sr1b | 0x80, 0x3C5);
+                /* Second Display Color Depth 8 */
+                outb(0x67, 0x3D4);
+                outb(cr67 & 0x3F, 0x3D5);
+                outb(0x6A, 0x3D4);
+                /* Second Display Channel Reset CR6A[6]) */
+                outb(cr6a & 0xBF, 0x3D5);
+                /* Second Display Channel Enable CR6A[7] */
+                outb(cr6a | 0x80, 0x3D5);
+                /* Second Display Channel stop reset) */
+                outb(cr6a | 0x40, 0x3D5);
+
+                /* Bit mask of palette */
+                outb(0xFF, 0x3c6);
+                /* Write one register of IGA2 */
+                outb(regno, 0x3C8);
+                if (UNICHROME_CLE266 == viaparinfo->chip_info->gfx_chip_name &&
+                        rev >= 15) {
+                        shift = 8;
+                        viafb_write_reg_mask(CR6A, VIACR, BIT5, BIT5);
+                        viafb_write_reg_mask(SR15, VIASR, BIT7, BIT7);
+                } else {
+                        shift = 10;
+                        viafb_write_reg_mask(CR6A, VIACR, 0, BIT5);
+                        viafb_write_reg_mask(SR15, VIASR, 0, BIT7);
+                }
+                outb(red >> shift, 0x3C9);
+                outb(green >> shift, 0x3C9);
+                outb(blue >> shift, 0x3C9);
+
+                /* Map the 3C6/7/8/9 to the IGA1 */
+                outb(0x1A, 0x3C4);
+                outb(sr1a & 0xFE, 0x3C5);
+                /* Bit mask of palette */
+                outb(0xFF, 0x3c6);
+                /* Write one register of IGA1 */
+                outb(regno, 0x3C8);
+                outb(red >> shift, 0x3C9);
+                outb(green >> shift, 0x3C9);
+                outb(blue >> shift, 0x3C9);
+
+                outb(0x1A, 0x3C4);
+                outb(sr1a, 0x3C5);
+                outb(0x1B, 0x3C4);
+                outb(sr1b, 0x3C5);
+                outb(0x67, 0x3D4);
+                outb(cr67, 0x3D5);
+                outb(0x6A, 0x3D4);
+                outb(cr6a, 0x3D5);
+                break;
+        case 16:
+                ((u32 *) info->pseudo_palette)[regno] = (red & 0xF800) |
+                    ((green & 0xFC00) >> 5) | ((blue & 0xF800) >> 11);
+                break;
+        case 32:
+                ((u32 *) info->pseudo_palette)[regno] =
+                    ((transp & 0xFF00) << 16) |
+                    ((red & 0xFF00) << 8) |
+                    ((green & 0xFF00)) | ((blue & 0xFF00) >> 8);
+                break;
+        }
+
+        return 0;
+
+}
+
+/*CALLED BY: fb_set_cmap */
+/*           fb_set_var, pass 256 colors */
+/*CALLED BY: fb_set_cmap */
+/*           fbcon_set_palette, pass 16 colors */
+static int viafb_setcmap(struct fb_cmap *cmap, struct fb_info *info)
+{
+        u32 len = cmap->len;
+        u32 i;
+        u16 *pred = cmap->red;
+        u16 *pgreen = cmap->green;
+        u16 *pblue = cmap->blue;
+        u16 *ptransp = cmap->transp;
+        u8 sr1a, sr1b, cr67, cr6a, rev = 0, shift = 10;
+        if (len > 256)
+                return 1;
+        if (UNICHROME_CLE266 == viaparinfo->chip_info->gfx_chip_name) {
+                /*
+                 * Read PCI bus 0, dev 0, function 0, index 0xF6 to get chip
+                 * rev.
+                 */
+                outl(0x80000000 | (0xf6 & ~3), (unsigned long)0xCF8);
+                rev = (inl((unsigned long)0xCFC) >> ((0xf6 & 3) * 8)) & 0xff;
+        }
+        switch (info->var.bits_per_pixel) {
+        case 8:
+                outb(0x1A, 0x3C4);
+                sr1a = inb(0x3C5);
+                outb(0x1B, 0x3C4);
+                sr1b = inb(0x3C5);
+                outb(0x67, 0x3D4);
+                cr67 = inb(0x3D5);
+                outb(0x6A, 0x3D4);
+                cr6a = inb(0x3D5);
+                /* Map the 3C6/7/8/9 to the IGA2 */
+                outb(0x1A, 0x3C4);
+                outb(sr1a | 0x01, 0x3C5);
+                outb(0x1B, 0x3C4);
+                /* Second Display Engine colck always on */
+                outb(sr1b | 0x80, 0x3C5);
+                outb(0x67, 0x3D4);
+                /* Second Display Color Depth 8 */
+                outb(cr67 & 0x3F, 0x3D5);
+                outb(0x6A, 0x3D4);
+                /* Second Display Channel Reset CR6A[6]) */
+                outb(cr6a & 0xBF, 0x3D5);
+                /* Second Display Channel Enable CR6A[7] */
+                outb(cr6a | 0x80, 0x3D5);
+                /* Second Display Channel stop reset) */
+                outb(cr6a | 0xC0, 0x3D5);
+
+                /* Bit mask of palette */
+                outb(0xFF, 0x3c6);
+                outb(0x00, 0x3C8);
+                if (UNICHROME_CLE266 == viaparinfo->chip_info->gfx_chip_name &&
+                        rev >= 15) {
+                        shift = 8;
+                        viafb_write_reg_mask(CR6A, VIACR, BIT5, BIT5);
+                        viafb_write_reg_mask(SR15, VIASR, BIT7, BIT7);
+                } else {
+                        shift = 10;
+                        viafb_write_reg_mask(CR6A, VIACR, 0, BIT5);
+                        viafb_write_reg_mask(SR15, VIASR, 0, BIT7);
+                }
+                for (i = 0; i < len; i++) {
+                        outb((*(pred + i)) >> shift, 0x3C9);
+                        outb((*(pgreen + i)) >> shift, 0x3C9);
+                        outb((*(pblue + i)) >> shift, 0x3C9);
+                }
+
+                outb(0x1A, 0x3C4);
+                /* Map the 3C6/7/8/9 to the IGA1 */
+                outb(sr1a & 0xFE, 0x3C5);
+                /* Bit mask of palette */
+                outb(0xFF, 0x3c6);
+                outb(0x00, 0x3C8);
+                for (i = 0; i < len; i++) {
+                        outb((*(pred + i)) >> shift, 0x3C9);
+                        outb((*(pgreen + i)) >> shift, 0x3C9);
+                        outb((*(pblue + i)) >> shift, 0x3C9);
+                }
+
+                outb(0x1A, 0x3C4);
+                outb(sr1a, 0x3C5);
+                outb(0x1B, 0x3C4);
+                outb(sr1b, 0x3C5);
+                outb(0x67, 0x3D4);
+                outb(cr67, 0x3D5);
+                outb(0x6A, 0x3D4);
+                outb(cr6a, 0x3D5);
+                break;
+        case 16:
+                if (len > 17)
+                        return 0;       /* Because static u32 pseudo_pal[17]; */
+                for (i = 0; i < len; i++)
+                        ((u32 *) info->pseudo_palette)[i] =
+                            (*(pred + i) & 0xF800) |
+                            ((*(pgreen + i) & 0xFC00) >> 5) |
+                            ((*(pblue + i) & 0xF800) >> 11);
+                break;
+        case 32:
+                if (len > 17)
+                        return 0;
+                if (ptransp) {
+                        for (i = 0; i < len; i++)
+                                ((u32 *) info->pseudo_palette)[i] =
+                                    ((*(ptransp + i) & 0xFF00) << 16) |
+                                    ((*(pred + i) & 0xFF00) << 8) |
+                                    ((*(pgreen + i) & 0xFF00)) |
+                                    ((*(pblue + i) & 0xFF00) >> 8);
+                } else {
+                        for (i = 0; i < len; i++)
+                                ((u32 *) info->pseudo_palette)[i] =
+                                    0x00000000 |
+                                    ((*(pred + i) & 0xFF00) << 8) |
+                                    ((*(pgreen + i) & 0xFF00)) |
+                                    ((*(pblue + i) & 0xFF00) >> 8);
+                }
+                break;
+        }
+        return 0;
+}
+
+static int viafb_pan_display(struct fb_var_screeninfo *var,
+        struct fb_info *info)
+{
+        unsigned int offset;
+
+        DEBUG_MSG(KERN_INFO "viafb_pan_display!\n");
+
+        offset = (var->xoffset + (var->yoffset * var->xres_virtual)) *
+            var->bits_per_pixel / 16;
+
+        DEBUG_MSG(KERN_INFO "\nviafb_pan_display,offset =%d ", offset);
+
+        viafb_write_reg_mask(0x48, 0x3d4, ((offset >> 24) & 0x3), 0x3);
+        viafb_write_reg_mask(0x34, 0x3d4, ((offset >> 16) & 0xff), 0xff);
+        viafb_write_reg_mask(0x0c, 0x3d4, ((offset >> 8) & 0xff), 0xff);
+        viafb_write_reg_mask(0x0d, 0x3d4, (offset & 0xff), 0xff);
+
+        return 0;
+}
+
+static int viafb_blank(int blank_mode, struct fb_info *info)
+{
+        DEBUG_MSG(KERN_INFO "viafb_blank!\n");
+        /* clear DPMS setting */
+
+        switch (blank_mode) {
+        case FB_BLANK_UNBLANK:
+                /* Screen: On, HSync: On, VSync: On */
+                /* control CRT monitor power management */
+                viafb_write_reg_mask(CR36, VIACR, 0x00, BIT4 + BIT5);
+                break;
+        case FB_BLANK_HSYNC_SUSPEND:
+                /* Screen: Off, HSync: Off, VSync: On */
+                /* control CRT monitor power management */
+                viafb_write_reg_mask(CR36, VIACR, 0x10, BIT4 + BIT5);
+                break;
+        case FB_BLANK_VSYNC_SUSPEND:
+                /* Screen: Off, HSync: On, VSync: Off */
+                /* control CRT monitor power management */
+                viafb_write_reg_mask(CR36, VIACR, 0x20, BIT4 + BIT5);
+                break;
+        case FB_BLANK_POWERDOWN:
+                /* Screen: Off, HSync: Off, VSync: Off */
+                /* control CRT monitor power management */
+                viafb_write_reg_mask(CR36, VIACR, 0x30, BIT4 + BIT5);
+                break;
+        }
+
+        return 0;
+}
+
+static int viafb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
+{
+        struct viafb_ioctl_mode viamode;
+        struct viafb_ioctl_samm viasamm;
+        struct viafb_driver_version driver_version;
+        struct fb_var_screeninfo sec_var;
+        struct _panel_size_pos_info panel_pos_size_para;
+        u32 state_info = 0;
+        u32 viainfo_size = sizeof(struct viafb_ioctl_info);
+        u32 *viafb_gamma_table;
+        char driver_name[] = "viafb";
+
+        u32 __user *argp = (u32 __user *) arg;
+        u32 gpu32;
+        u32 video_dev_info = 0;
+        struct viafb_ioctl_setting viafb_setting = {};
+        struct device_t active_dev = {};
+
+        DEBUG_MSG(KERN_INFO "viafb_ioctl: 0x%X !!\n", cmd);
+
+        switch (cmd) {
+        case VIAFB_GET_CHIP_INFO:
+                if (copy_to_user(argp, viaparinfo->chip_info,
+                                sizeof(struct chip_information)))
+                        return -EFAULT;
+                break;
+        case VIAFB_GET_INFO_SIZE:
+                return put_user(viainfo_size, argp);
+        case VIAFB_GET_INFO:
+                return viafb_ioctl_get_viafb_info(arg);
+        case VIAFB_HOTPLUG:
+                return put_user(viafb_ioctl_hotplug(info->var.xres,
+                                              info->var.yres,
+                                              info->var.bits_per_pixel), argp);
+        case VIAFB_SET_HOTPLUG_FLAG:
+                if (copy_from_user(&gpu32, argp, sizeof(gpu32)))
+                        return -EFAULT;
+                viafb_hotplug = (gpu32) ? 1 : 0;
+                break;
+        case VIAFB_GET_RESOLUTION:
+                viamode.xres = (u32) viafb_hotplug_Xres;
+                viamode.yres = (u32) viafb_hotplug_Yres;
+                viamode.refresh = (u32) viafb_hotplug_refresh;
+                viamode.bpp = (u32) viafb_hotplug_bpp;
+                if (viafb_SAMM_ON == 1) {
+                        viamode.xres_sec = viafb_second_xres;
+                        viamode.yres_sec = viafb_second_yres;
+                        viamode.virtual_xres_sec = viafb_second_virtual_xres;
+                        viamode.virtual_yres_sec = viafb_second_virtual_yres;
+                        viamode.refresh_sec = viafb_refresh1;
+                        viamode.bpp_sec = viafb_bpp1;
+                } else {
+                        viamode.xres_sec = 0;
+                        viamode.yres_sec = 0;
+                        viamode.virtual_xres_sec = 0;
+                        viamode.virtual_yres_sec = 0;
+                        viamode.refresh_sec = 0;
+                        viamode.bpp_sec = 0;
+                }
+                if (copy_to_user(argp, &viamode, sizeof(viamode)))
+                        return -EFAULT;
+                break;
+        case VIAFB_GET_SAMM_INFO:
+                viasamm.samm_status = viafb_SAMM_ON;
+
+                if (viafb_SAMM_ON == 1) {
+                        if (viafb_dual_fb) {
+                                viasamm.size_prim = viaparinfo->fbmem_free;
+                                viasamm.size_sec = viaparinfo1->fbmem_free;
+                        } else {
+                                if (viafb_second_size) {
+                                        viasamm.size_prim =
+                                            viaparinfo->fbmem_free -
+                                            viafb_second_size * 1024 * 1024;
+                                        viasamm.size_sec =
+                                            viafb_second_size * 1024 * 1024;
+                                } else {
+                                        viasamm.size_prim =
+                                            viaparinfo->fbmem_free >> 1;
+                                        viasamm.size_sec =
+                                            (viaparinfo->fbmem_free >> 1);
+                                }
+                        }
+                        viasamm.mem_base = viaparinfo->fbmem;
+                        viasamm.offset_sec = viafb_second_offset;
+                } else {
+                        viasamm.size_prim =
+                            viaparinfo->memsize - viaparinfo->fbmem_used;
+                        viasamm.size_sec = 0;
+                        viasamm.mem_base = viaparinfo->fbmem;
+                        viasamm.offset_sec = 0;
+                }
+
+                if (copy_to_user(argp, &viasamm, sizeof(viasamm)))
+                        return -EFAULT;
+
+                break;
+        case VIAFB_TURN_ON_OUTPUT_DEVICE:
+                if (copy_from_user(&gpu32, argp, sizeof(gpu32)))
+                        return -EFAULT;
+                if (gpu32 & CRT_Device)
+                        viafb_crt_enable();
+                if (gpu32 & DVI_Device)
+                        viafb_dvi_enable();
+                if (gpu32 & LCD_Device)
+                        viafb_lcd_enable();
+                break;
+        case VIAFB_TURN_OFF_OUTPUT_DEVICE:
+                if (copy_from_user(&gpu32, argp, sizeof(gpu32)))
+                        return -EFAULT;
+                if (gpu32 & CRT_Device)
+                        viafb_crt_disable();
+                if (gpu32 & DVI_Device)
+                        viafb_dvi_disable();
+                if (gpu32 & LCD_Device)
+                        viafb_lcd_disable();
+                break;
+        case VIAFB_SET_DEVICE:
+                if (copy_from_user(&active_dev, (void *)argp,
+                        sizeof(active_dev)))
+                        return -EFAULT;
+                viafb_set_device(active_dev);
+                viafb_set_par(info);
+                break;
+        case VIAFB_GET_DEVICE:
+                active_dev.crt = viafb_CRT_ON;
+                active_dev.dvi = viafb_DVI_ON;
+                active_dev.lcd = viafb_LCD_ON;
+                active_dev.samm = viafb_SAMM_ON;
+                active_dev.primary_dev = viafb_primary_dev;
+
+                active_dev.lcd_dsp_cent = viafb_lcd_dsp_method;
+                active_dev.lcd_panel_id = viafb_lcd_panel_id;
+                active_dev.lcd_mode = viafb_lcd_mode;
+
+                active_dev.xres = viafb_hotplug_Xres;
+                active_dev.yres = viafb_hotplug_Yres;
+
+                active_dev.xres1 = viafb_second_xres;
+                active_dev.yres1 = viafb_second_yres;
+
+                active_dev.bpp = viafb_bpp;
+                active_dev.bpp1 = viafb_bpp1;
+                active_dev.refresh = viafb_refresh;
+                active_dev.refresh1 = viafb_refresh1;
+
+                active_dev.epia_dvi = viafb_platform_epia_dvi;
+                active_dev.lcd_dual_edge = viafb_device_lcd_dualedge;
+                active_dev.bus_width = viafb_bus_width;
+
+                if (copy_to_user(argp, &active_dev, sizeof(active_dev)))
+                        return -EFAULT;
+                break;
+
+        case VIAFB_GET_DRIVER_VERSION:
+                driver_version.iMajorNum = VERSION_MAJOR;
+                driver_version.iKernelNum = VERSION_KERNEL;
+                driver_version.iOSNum = VERSION_OS;
+                driver_version.iMinorNum = VERSION_MINOR;
+
+                if (copy_to_user(argp, &driver_version,
+                        sizeof(driver_version)))
+                        return -EFAULT;
+
+                break;
+
+        case VIAFB_SET_DEVICE_INFO:
+                if (copy_from_user(&viafb_setting,
+                        argp, sizeof(viafb_setting)))
+                        return -EFAULT;
+                if (apply_device_setting(viafb_setting, info) < 0)
+                        return -EINVAL;
+
+                break;
+
+        case VIAFB_SET_SECOND_MODE:
+                if (copy_from_user(&sec_var, argp, sizeof(sec_var)))
+                        return -EFAULT;
+                apply_second_mode_setting(&sec_var);
+                break;
+
+        case VIAFB_GET_DEVICE_INFO:
+
+                retrieve_device_setting(&viafb_setting);
+
+                if (copy_to_user(argp, &viafb_setting, sizeof(viafb_setting)))
+                        return -EFAULT;
+
+                break;
+
+        case VIAFB_GET_DEVICE_SUPPORT:
+                viafb_get_device_support_state(&state_info);
+                if (put_user(state_info, argp))
+                        return -EFAULT;
+                break;
+
+        case VIAFB_GET_DEVICE_CONNECT:
+                viafb_get_device_connect_state(&state_info);
+                if (put_user(state_info, argp))
+                        return -EFAULT;
+                break;
+
+        case VIAFB_GET_PANEL_SUPPORT_EXPAND:
+                state_info =
+                    viafb_lcd_get_support_expand_state(info->var.xres,
+                                                 info->var.yres);
+                if (put_user(state_info, argp))
+                        return -EFAULT;
+                break;
+
+        case VIAFB_GET_DRIVER_NAME:
+                if (copy_to_user(argp, driver_name, sizeof(driver_name)))
+                        return -EFAULT;
+                break;
+
+        case VIAFB_SET_GAMMA_LUT:
+                viafb_gamma_table = kmalloc(256 * sizeof(u32), GFP_KERNEL);
+                if (!viafb_gamma_table)
+                        return -ENOMEM;
+                if (copy_from_user(viafb_gamma_table, argp,
+                                sizeof(viafb_gamma_table))) {
+                        kfree(viafb_gamma_table);
+                        return -EFAULT;
+                }
+                viafb_set_gamma_table(viafb_bpp, viafb_gamma_table);
+                kfree(viafb_gamma_table);
+                break;
+
+        case VIAFB_GET_GAMMA_LUT:
+                viafb_gamma_table = kmalloc(256 * sizeof(u32), GFP_KERNEL);
+                if (!viafb_gamma_table)
+                        return -ENOMEM;
+                viafb_get_gamma_table(viafb_gamma_table);
+                if (copy_to_user(argp, viafb_gamma_table,
+                        sizeof(viafb_gamma_table))) {
+                        kfree(viafb_gamma_table);
+                        return -EFAULT;
+                }
+                kfree(viafb_gamma_table);
+                break;
+
+        case VIAFB_GET_GAMMA_SUPPORT_STATE:
+                viafb_get_gamma_support_state(viafb_bpp, &state_info);
+                if (put_user(state_info, argp))
+                        return -EFAULT;
+                break;
+        case VIAFB_SET_VIDEO_DEVICE:
+                get_user(video_dev_info, argp);
+                viafb_set_video_device(video_dev_info);
+                break;
+        case VIAFB_GET_VIDEO_DEVICE:
+                viafb_get_video_device(&video_dev_info);
+                if (put_user(video_dev_info, argp))
+                        return -EFAULT;
+                break;
+        case VIAFB_SYNC_SURFACE:
+                DEBUG_MSG(KERN_INFO "lobo VIAFB_SYNC_SURFACE\n");
+                break;
+        case VIAFB_GET_DRIVER_CAPS:
+                break;
+
+        case VIAFB_GET_PANEL_MAX_SIZE:
+                if (copy_from_user
+                    (&panel_pos_size_para, argp, sizeof(panel_pos_size_para)))
+                        return -EFAULT;
+                panel_pos_size_para.x = panel_pos_size_para.y = 0;
+                if (copy_to_user(argp, &panel_pos_size_para,
+                     sizeof(panel_pos_size_para)))
+                        return -EFAULT;
+                break;
+        case VIAFB_GET_PANEL_MAX_POSITION:
+                if (copy_from_user
+                    (&panel_pos_size_para, argp, sizeof(panel_pos_size_para)))
+                        return -EFAULT;
+                panel_pos_size_para.x = panel_pos_size_para.y = 0;
+                if (copy_to_user(argp, &panel_pos_size_para,
+                     sizeof(panel_pos_size_para)))
+                        return -EFAULT;
+                break;
+
+        case VIAFB_GET_PANEL_POSITION:
+                if (copy_from_user
+                    (&panel_pos_size_para, argp, sizeof(panel_pos_size_para)))
+                        return -EFAULT;
+                panel_pos_size_para.x = panel_pos_size_para.y = 0;
+                if (copy_to_user(argp, &panel_pos_size_para,
+                     sizeof(panel_pos_size_para)))
+                        return -EFAULT;
+                break;
+        case VIAFB_GET_PANEL_SIZE:
+                if (copy_from_user
+                    (&panel_pos_size_para, argp, sizeof(panel_pos_size_para)))
+                        return -EFAULT;
+                panel_pos_size_para.x = panel_pos_size_para.y = 0;
+                if (copy_to_user(argp, &panel_pos_size_para,
+                     sizeof(panel_pos_size_para)))
+                        return -EFAULT;
+                break;
+
+        case VIAFB_SET_PANEL_POSITION:
+                if (copy_from_user
+                    (&panel_pos_size_para, argp, sizeof(panel_pos_size_para)))
+                        return -EFAULT;
+                break;
+        case VIAFB_SET_PANEL_SIZE:
+                if (copy_from_user
+                    (&panel_pos_size_para, argp, sizeof(panel_pos_size_para)))
+                        return -EFAULT;
+                break;
+
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static void viafb_fillrect(struct fb_info *info,
+        const struct fb_fillrect *rect)
+{
+        u32 col = 0, rop = 0;
+        int pitch;
+
+        if (!viafb_accel)
+                return cfb_fillrect(info, rect);
+
+        if (!rect->width || !rect->height)
+                return;
+
+        switch (rect->rop) {
+        case ROP_XOR:
+                rop = 0x5A;
+                break;
+        case ROP_COPY:
+        default:
+                rop = 0xF0;
+                break;
+        }
+
+        switch (info->var.bits_per_pixel) {
+        case 8:
+                col = rect->color;
+                break;
+        case 16:
+                col = ((u32 *) (info->pseudo_palette))[rect->color];
+                break;
+        case 32:
+                col = ((u32 *) (info->pseudo_palette))[rect->color];
+                break;
+        }
+
+        /* BitBlt Source Address */
+        writel(0x0, viaparinfo->io_virt + VIA_REG_SRCPOS);
+        /* Source Base Address */
+        writel(0x0, viaparinfo->io_virt + VIA_REG_SRCBASE);
+        /* Destination Base Address */
+        writel(((unsigned long) (info->screen_base) -
+                   (unsigned long) viafb_FB_MM) >> 3,
+                   viaparinfo->io_virt + VIA_REG_DSTBASE);
+        /* Pitch */
+        pitch = (info->var.xres_virtual + 7) & ~7;
+        writel(VIA_PITCH_ENABLE |
+                   (((pitch *
+                      info->var.bits_per_pixel >> 3) >> 3) |
+                      (((pitch * info->
+                      var.bits_per_pixel >> 3) >> 3) << 16)),
+                      viaparinfo->io_virt + VIA_REG_PITCH);
+        /* BitBlt Destination Address */
+        writel(((rect->dy << 16) | rect->dx),
+                viaparinfo->io_virt + VIA_REG_DSTPOS);
+        /* Dimension: width & height */
+        writel((((rect->height - 1) << 16) | (rect->width - 1)),
+                viaparinfo->io_virt + VIA_REG_DIMENSION);
+        /* Forground color or Destination color */
+        writel(col, viaparinfo->io_virt + VIA_REG_FGCOLOR);
+        /* GE Command */
+        writel((0x01 | 0x2000 | (rop << 24)),
+                viaparinfo->io_virt + VIA_REG_GECMD);
+
+}
+
+static void viafb_copyarea(struct fb_info *info,
+        const struct fb_copyarea *area)
+{
+        u32 dy = area->dy, sy = area->sy, direction = 0x0;
+        u32 sx = area->sx, dx = area->dx, width = area->width;
+        int pitch;
+
+        DEBUG_MSG(KERN_INFO "viafb_copyarea!!\n");
+
+        if (!viafb_accel)
+                return cfb_copyarea(info, area);
+
+        if (!area->width || !area->height)
+                return;
+
+        if (sy < dy) {
+                dy += area->height - 1;
+                sy += area->height - 1;
+                direction |= 0x4000;
+        }
+
+        if (sx < dx) {
+                dx += width - 1;
+                sx += width - 1;
+                direction |= 0x8000;
+        }
+
+        /* Source Base Address */
+        writel(((unsigned long) (info->screen_base) -
+                   (unsigned long) viafb_FB_MM) >> 3,
+                   viaparinfo->io_virt + VIA_REG_SRCBASE);
+        /* Destination Base Address */
+        writel(((unsigned long) (info->screen_base) -
+                   (unsigned long) viafb_FB_MM) >> 3,
+                   viaparinfo->io_virt + VIA_REG_DSTBASE);
+        /* Pitch */
+        pitch = (info->var.xres_virtual + 7) & ~7;
+        /* VIA_PITCH_ENABLE can be omitted now. */
+        writel(VIA_PITCH_ENABLE |
+                   (((pitch *
+                      info->var.bits_per_pixel >> 3) >> 3) | (((pitch *
+                                                                info->var.
+                                                                bits_per_pixel
+                                                                >> 3) >> 3)
+                                                              << 16)),
+                                viaparinfo->io_virt + VIA_REG_PITCH);
+        /* BitBlt Source Address */
+        writel(((sy << 16) | sx), viaparinfo->io_virt + VIA_REG_SRCPOS);
+        /* BitBlt Destination Address */
+        writel(((dy << 16) | dx), viaparinfo->io_virt + VIA_REG_DSTPOS);
+        /* Dimension: width & height */
+        writel((((area->height - 1) << 16) | (area->width - 1)),
+                   viaparinfo->io_virt + VIA_REG_DIMENSION);
+        /* GE Command */
+        writel((0x01 | direction | (0xCC << 24)),
+                viaparinfo->io_virt + VIA_REG_GECMD);
+
+}
+
+static void viafb_imageblit(struct fb_info *info,
+        const struct fb_image *image)
+{
+        u32 size, bg_col = 0, fg_col = 0, *udata;
+        int i;
+        int pitch;
+
+        if (!viafb_accel)
+                return cfb_imageblit(info, image);
+
+        udata = (u32 *) image->data;
+
+        switch (info->var.bits_per_pixel) {
+        case 8:
+                bg_col = image->bg_color;
+                fg_col = image->fg_color;
+                break;
+        case 16:
+                bg_col = ((u32 *) (info->pseudo_palette))[image->bg_color];
+                fg_col = ((u32 *) (info->pseudo_palette))[image->fg_color];
+                break;
+        case 32:
+                bg_col = ((u32 *) (info->pseudo_palette))[image->bg_color];
+                fg_col = ((u32 *) (info->pseudo_palette))[image->fg_color];
+                break;
+        }
+        size = image->width * image->height;
+
+        /* Source Base Address */
+        writel(0x0, viaparinfo->io_virt + VIA_REG_SRCBASE);
+        /* Destination Base Address */
+        writel(((unsigned long) (info->screen_base) -
+                   (unsigned long) viafb_FB_MM) >> 3,
+                   viaparinfo->io_virt + VIA_REG_DSTBASE);
+        /* Pitch */
+        pitch = (info->var.xres_virtual + 7) & ~7;
+        writel(VIA_PITCH_ENABLE |
+                   (((pitch *
+                      info->var.bits_per_pixel >> 3) >> 3) | (((pitch *
+                                                                info->var.
+                                                                bits_per_pixel
+                                                                >> 3) >> 3)
+                                                              << 16)),
+                                viaparinfo->io_virt + VIA_REG_PITCH);
+        /* BitBlt Source Address */
+        writel(0x0, viaparinfo->io_virt + VIA_REG_SRCPOS);
+        /* BitBlt Destination Address */
+        writel(((image->dy << 16) | image->dx),
+                viaparinfo->io_virt + VIA_REG_DSTPOS);
+        /* Dimension: width & height */
+        writel((((image->height - 1) << 16) | (image->width - 1)),
+                   viaparinfo->io_virt + VIA_REG_DIMENSION);
+        /* fb color */
+        writel(fg_col, viaparinfo->io_virt + VIA_REG_FGCOLOR);
+        /* bg color */
+        writel(bg_col, viaparinfo->io_virt + VIA_REG_BGCOLOR);
+        /* GE Command */
+        writel(0xCC020142, viaparinfo->io_virt + VIA_REG_GECMD);
+
+        for (i = 0; i < size / 4; i++) {
+                writel(*udata, viaparinfo->io_virt + VIA_MMIO_BLTBASE);
+                udata++;
+        }
+
+}
+
+static int viafb_cursor(struct fb_info *info, struct fb_cursor *cursor)
+{
+        u8 data[CURSOR_SIZE / 8];
+        u32 data_bak[CURSOR_SIZE / 32];
+        u32 temp, xx, yy, bg_col = 0, fg_col = 0;
+        int size, i, j = 0;
+        static int hw_cursor;
+        struct viafb_par *p_viafb_par;
+
+        if (viafb_accel)
+                hw_cursor = 1;
+
+        if (!viafb_accel) {
+                if (hw_cursor) {
+                        viafb_show_hw_cursor(info, HW_Cursor_OFF);
+                        hw_cursor = 0;
+                }
+                return -ENODEV;
+        }
+
+        if ((((struct viafb_par *)(info->par))->iga_path == IGA2)
+            && (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266))
+                return -ENODEV;
+
+        /* When duoview and using lcd , use soft cursor */
+        if (viafb_LCD_ON || ((struct viafb_par *)(info->par))->duoview)
+                return -ENODEV;
+
+        viafb_show_hw_cursor(info, HW_Cursor_OFF);
+        viacursor = *cursor;
+
+        if (cursor->set & FB_CUR_SETHOT) {
+                viacursor.hot = cursor->hot;
+                temp = ((viacursor.hot.x) << 16) + viacursor.hot.y;
+                writel(temp, viaparinfo->io_virt + VIA_REG_CURSOR_ORG);
+        }
+
+        if (cursor->set & FB_CUR_SETPOS) {
+                viacursor.image.dx = cursor->image.dx;
+                viacursor.image.dy = cursor->image.dy;
+                yy = cursor->image.dy - info->var.yoffset;
+                xx = cursor->image.dx - info->var.xoffset;
+                temp = yy & 0xFFFF;
+                temp |= (xx << 16);
+                writel(temp, viaparinfo->io_virt + VIA_REG_CURSOR_POS);
+        }
+
+        if (cursor->set & FB_CUR_SETSIZE) {
+                temp = readl(viaparinfo->io_virt + VIA_REG_CURSOR_MODE);
+
+                if ((cursor->image.width <= 32)
+                    && (cursor->image.height <= 32)) {
+                        MAX_CURS = 32;
+                        temp |= 0x2;
+                } else if ((cursor->image.width <= 64)
+                           && (cursor->image.height <= 64)) {
+                        MAX_CURS = 64;
+                        temp &= 0xFFFFFFFD;
+                } else {
+                        DEBUG_MSG(KERN_INFO
+                        "The cursor image is biger than 64x64 bits...\n");
+                        return -ENXIO;
+                }
+                writel(temp, viaparinfo->io_virt + VIA_REG_CURSOR_MODE);
+
+                viacursor.image.height = cursor->image.height;
+                viacursor.image.width = cursor->image.width;
+        }
+
+        if (cursor->set & FB_CUR_SETCMAP) {
+                viacursor.image.fg_color = cursor->image.fg_color;
+                viacursor.image.bg_color = cursor->image.bg_color;
+
+                switch (info->var.bits_per_pixel) {
+                case 8:
+                case 16:
+                case 32:
+                        bg_col =
+                            (0xFF << 24) |
+                            (((info->cmap.red)[viacursor.image.bg_color] &
+                            0xFF00) << 8) |
+                            ((info->cmap.green)[viacursor.image.bg_color] &
+                            0xFF00) |
+                            (((info->cmap.blue)[viacursor.image.bg_color] &
+                            0xFF00) >> 8);
+                        fg_col =
+                            (0xFF << 24) |
+                            (((info->cmap.red)[viacursor.image.fg_color] &
+                            0xFF00) << 8) |
+                            ((info->cmap.green)[viacursor.image.fg_color] &
+                            0xFF00) |
+                            (((info->cmap.blue)[viacursor.image.fg_color] &
+                            0xFF00) >> 8);
+                        break;
+                default:
+                        return 0;
+                }
+
+                /* This is indeed a patch for VT3324/VT3353 */
+                if (!info->par)
+                        return 0;
+                p_viafb_par = (struct viafb_par *)info->par;
+
+                if ((p_viafb_par->chip_info->gfx_chip_name ==
+                        UNICHROME_CX700) ||
+                        ((p_viafb_par->chip_info->gfx_chip_name ==
+                        UNICHROME_VX800))) {
+                        bg_col =
+                            (((info->cmap.red)[viacursor.image.bg_color] &
+                            0xFFC0) << 14) |
+                            (((info->cmap.green)[viacursor.image.bg_color] &
+                            0xFFC0) << 4) |
+                            (((info->cmap.blue)[viacursor.image.bg_color] &
+                            0xFFC0) >> 6);
+                        fg_col =
+                            (((info->cmap.red)[viacursor.image.fg_color] &
+                            0xFFC0) << 14) |
+                            (((info->cmap.green)[viacursor.image.fg_color] &
+                            0xFFC0) << 4) |
+                            (((info->cmap.blue)[viacursor.image.fg_color] &
+                            0xFFC0) >> 6);
+                }
+
+                writel(bg_col, viaparinfo->io_virt + VIA_REG_CURSOR_BG);
+                writel(fg_col, viaparinfo->io_virt + VIA_REG_CURSOR_FG);
+        }
+
+        if (cursor->set & FB_CUR_SETSHAPE) {
+                size =
+                    ((viacursor.image.width + 7) >> 3) *
+                    viacursor.image.height;
+
+                if (MAX_CURS == 32) {
+                        for (i = 0; i < (CURSOR_SIZE / 32); i++) {
+                                data_bak[i] = 0x0;
+                                data_bak[i + 1] = 0xFFFFFFFF;
+                                i += 1;
+                        }
+                } else if (MAX_CURS == 64) {
+                        for (i = 0; i < (CURSOR_SIZE / 32); i++) {
+                                data_bak[i] = 0x0;
+                                data_bak[i + 1] = 0x0;
+                                data_bak[i + 2] = 0xFFFFFFFF;
+                                data_bak[i + 3] = 0xFFFFFFFF;
+                                i += 3;
+                        }
+                }
+
+                switch (viacursor.rop) {
+                case ROP_XOR:
+                        for (i = 0; i < size; i++)
+                                data[i] = viacursor.mask[i];
+                        break;
+                case ROP_COPY:
+
+                        for (i = 0; i < size; i++)
+                                data[i] = viacursor.mask[i];
+                        break;
+                default:
+                        break;
+                }
+
+                if (MAX_CURS == 32) {
+                        for (i = 0; i < size; i++) {
+                                data_bak[j] = (u32) data[i];
+                                data_bak[j + 1] = ~data_bak[j];
+                                j += 2;
+                        }
+                } else if (MAX_CURS == 64) {
+                        for (i = 0; i < size; i++) {
+                                data_bak[j] = (u32) data[i];
+                                data_bak[j + 1] = 0x0;
+                                data_bak[j + 2] = ~data_bak[j];
+                                data_bak[j + 3] = ~data_bak[j + 1];
+                                j += 4;
+                        }
+                }
+
+                memcpy(((struct viafb_par *)(info->par))->fbmem_virt +
+                       ((struct viafb_par *)(info->par))->cursor_start,
+                       data_bak, CURSOR_SIZE);
+        }
+
+        if (viacursor.enable)
+                viafb_show_hw_cursor(info, HW_Cursor_ON);
+
+        return 0;
+}
+
+static int viafb_sync(struct fb_info *info)
+{
+        if (viafb_accel)
+                viafb_wait_engine_idle();
+        return 0;
+}
+
+int viafb_get_mode_index(int hres, int vres, int flag)
+{
+        u32 i;
+        DEBUG_MSG(KERN_INFO "viafb_get_mode_index!\n");
+
+        for (i = 0; viafb_modentry[i].mode_index != VIA_RES_INVALID; i++)
+                if (viafb_modentry[i].xres == hres &&
+                        viafb_modentry[i].yres == vres)
+                        break;
+
+        viafb_resMode = viafb_modentry[i].mode_index;
+        if (flag)
+                viafb_mode1 = viafb_modentry[i].mode_res;
+        else
+                viafb_mode = viafb_modentry[i].mode_res;
+
+        return viafb_resMode;
+}
+
+static void check_available_device_to_enable(int device_id)
+{
+        int device_num = 0;
+
+        /* Initialize: */
+        viafb_CRT_ON = STATE_OFF;
+        viafb_DVI_ON = STATE_OFF;
+        viafb_LCD_ON = STATE_OFF;
+        viafb_LCD2_ON = STATE_OFF;
+        viafb_DeviceStatus = None_Device;
+
+        if ((device_id & CRT_Device) && (device_num < MAX_ACTIVE_DEV_NUM)) {
+                viafb_CRT_ON = STATE_ON;
+                device_num++;
+                viafb_DeviceStatus |= CRT_Device;
+        }
+
+        if ((device_id & DVI_Device) && (device_num < MAX_ACTIVE_DEV_NUM)) {
+                viafb_DVI_ON = STATE_ON;
+                device_num++;
+                viafb_DeviceStatus |= DVI_Device;
+        }
+
+        if ((device_id & LCD_Device) && (device_num < MAX_ACTIVE_DEV_NUM)) {
+                viafb_LCD_ON = STATE_ON;
+                device_num++;
+                viafb_DeviceStatus |= LCD_Device;
+        }
+
+        if ((device_id & LCD2_Device) && (device_num < MAX_ACTIVE_DEV_NUM)) {
+                viafb_LCD2_ON = STATE_ON;
+                device_num++;
+                viafb_DeviceStatus |= LCD2_Device;
+        }
+
+        if (viafb_DeviceStatus == None_Device) {
+                /* Use CRT as default active device: */
+                viafb_CRT_ON = STATE_ON;
+                viafb_DeviceStatus = CRT_Device;
+        }
+        DEBUG_MSG(KERN_INFO "Device Status:%x", viafb_DeviceStatus);
+}
+
+static void viafb_set_device(struct device_t active_dev)
+{
+        /* Check available device to enable: */
+        int device_id = None_Device;
+        if (active_dev.crt)
+                device_id |= CRT_Device;
+        if (active_dev.dvi)
+                device_id |= DVI_Device;
+        if (active_dev.lcd)
+                device_id |= LCD_Device;
+
+        check_available_device_to_enable(device_id);
+
+        /* Check property of LCD: */
+        if (viafb_LCD_ON) {
+                if (active_dev.lcd_dsp_cent) {
+                        viaparinfo->lvds_setting_info->display_method =
+                                viafb_lcd_dsp_method = LCD_CENTERING;
+                } else {
+                        viaparinfo->lvds_setting_info->display_method =
+                                viafb_lcd_dsp_method = LCD_EXPANDSION;
+                }
+
+                if (active_dev.lcd_mode == LCD_SPWG) {
+                        viaparinfo->lvds_setting_info->lcd_mode =
+                                viafb_lcd_mode = LCD_SPWG;
+                } else {
+                        viaparinfo->lvds_setting_info->lcd_mode =
+                                viafb_lcd_mode = LCD_OPENLDI;
+                }
+
+                if (active_dev.lcd_panel_id <= LCD_PANEL_ID_MAXIMUM) {
+                        viafb_lcd_panel_id = active_dev.lcd_panel_id;
+                        viafb_init_lcd_size();
+                }
+        }
+
+        /* Check property of mode: */
+        if (!active_dev.xres1)
+                viafb_second_xres = 640;
+        else
+                viafb_second_xres = active_dev.xres1;
+        if (!active_dev.yres1)
+                viafb_second_yres = 480;
+        else
+                viafb_second_yres = active_dev.yres1;
+        if (active_dev.bpp != 0)
+                viafb_bpp = active_dev.bpp;
+        if (active_dev.bpp1 != 0)
+                viafb_bpp1 = active_dev.bpp1;
+        if (active_dev.refresh != 0)
+                viafb_refresh = active_dev.refresh;
+        if (active_dev.refresh1 != 0)
+                viafb_refresh1 = active_dev.refresh1;
+        if ((active_dev.samm == STATE_OFF) || (active_dev.samm == STATE_ON))
+                viafb_SAMM_ON = active_dev.samm;
+        viafb_primary_dev = active_dev.primary_dev;
+
+        viafb_set_start_addr();
+        viafb_set_iga_path();
+}
+
+static void viafb_set_video_device(u32 video_dev_info)
+{
+        viaparinfo->video_on_crt = STATE_OFF;
+        viaparinfo->video_on_dvi = STATE_OFF;
+        viaparinfo->video_on_lcd = STATE_OFF;
+
+        /* Check available device to enable: */
+        if ((video_dev_info & CRT_Device) == CRT_Device)
+                viaparinfo->video_on_crt = STATE_ON;
+        else if ((video_dev_info & DVI_Device) == DVI_Device)
+                viaparinfo->video_on_dvi = STATE_ON;
+        else if ((video_dev_info & LCD_Device) == LCD_Device)
+                viaparinfo->video_on_lcd = STATE_ON;
+}
+
+static void viafb_get_video_device(u32 *video_dev_info)
+{
+        *video_dev_info = None_Device;
+        if (viaparinfo->video_on_crt == STATE_ON)
+                *video_dev_info |= CRT_Device;
+        else if (viaparinfo->video_on_dvi == STATE_ON)
+                *video_dev_info |= DVI_Device;
+        else if (viaparinfo->video_on_lcd == STATE_ON)
+                *video_dev_info |= LCD_Device;
+}
+
+static int get_primary_device(void)
+{
+        int primary_device = 0;
+        /* Rule: device on iga1 path are the primary device. */
+        if (viafb_SAMM_ON) {
+                if (viafb_CRT_ON) {
+                        if (viaparinfo->crt_setting_info->iga_path == IGA1) {
+                                DEBUG_MSG(KERN_INFO "CRT IGA Path:%d\n",
+                                        viaparinfo->
+                                        crt_setting_info->iga_path);
+                                primary_device = CRT_Device;
+                        }
+                }
+                if (viafb_DVI_ON) {
+                        if (viaparinfo->tmds_setting_info->iga_path == IGA1) {
+                                DEBUG_MSG(KERN_INFO "DVI IGA Path:%d\n",
+                                        viaparinfo->
+                                        tmds_setting_info->iga_path);
+                                primary_device = DVI_Device;
+                        }
+                }
+                if (viafb_LCD_ON) {
+                        if (viaparinfo->lvds_setting_info->iga_path == IGA1) {
+                                DEBUG_MSG(KERN_INFO "LCD IGA Path:%d\n",
+                                        viaparinfo->
+                                        lvds_setting_info->iga_path);
+                                primary_device = LCD_Device;
+                        }
+                }
+                if (viafb_LCD2_ON) {
+                        if (viaparinfo->lvds_setting_info2->iga_path == IGA1) {
+                                DEBUG_MSG(KERN_INFO "LCD2 IGA Path:%d\n",
+                                        viaparinfo->
+                                        lvds_setting_info2->iga_path);
+                                primary_device = LCD2_Device;
+                        }
+                }
+        }
+        return primary_device;
+}
+
+static u8 is_duoview(void)
+{
+        if (0 == viafb_SAMM_ON) {
+                if (viafb_LCD_ON + viafb_LCD2_ON +
+                        viafb_DVI_ON + viafb_CRT_ON == 2)
+                        return true;
+                return false;
+        } else {
+                return false;
+        }
+}
+
+static void apply_second_mode_setting(struct fb_var_screeninfo
+        *sec_var)
+{
+        u32 htotal, vtotal, long_refresh;
+
+        htotal = sec_var->xres + sec_var->left_margin +
+                sec_var->right_margin + sec_var->hsync_len;
+        vtotal = sec_var->yres + sec_var->upper_margin +
+                sec_var->lower_margin + sec_var->vsync_len;
+        if ((sec_var->xres_virtual * (sec_var->bits_per_pixel >> 3)) & 0x1F) {
+                /*Is 32 bytes alignment? */
+                /*32 pixel alignment */
+                sec_var->xres_virtual = (sec_var->xres_virtual + 31) & ~31;
+        }
+
+        htotal = sec_var->xres + sec_var->left_margin +
+                sec_var->right_margin + sec_var->hsync_len;
+        vtotal = sec_var->yres + sec_var->upper_margin +
+                sec_var->lower_margin + sec_var->vsync_len;
+        long_refresh = 1000000000UL / sec_var->pixclock * 1000;
+        long_refresh /= (htotal * vtotal);
+
+        viafb_second_xres = sec_var->xres;
+        viafb_second_yres = sec_var->yres;
+        viafb_second_virtual_xres = sec_var->xres_virtual;
+        viafb_second_virtual_yres = sec_var->yres_virtual;
+        viafb_bpp1 = sec_var->bits_per_pixel;
+        viafb_refresh1 = viafb_get_refresh(sec_var->xres, sec_var->yres,
+                long_refresh);
+}
+
+static int apply_device_setting(struct viafb_ioctl_setting setting_info,
+        struct fb_info *info)
+{
+        int need_set_mode = 0;
+        DEBUG_MSG(KERN_INFO "apply_device_setting\n");
+
+        if (setting_info.device_flag) {
+                need_set_mode = 1;
+                check_available_device_to_enable(setting_info.device_status);
+        }
+
+        /* Unlock LCD's operation according to LCD flag
+           and check if the setting value is valid. */
+        /* If the value is valid, apply the new setting value to the device. */
+        if (viafb_LCD_ON) {
+                if (setting_info.lcd_operation_flag & OP_LCD_CENTERING) {
+                        need_set_mode = 1;
+                        if (setting_info.lcd_attributes.display_center) {
+                                /* Centering */
+                                viaparinfo->lvds_setting_info->display_method =
+                                    LCD_CENTERING;
+                                viafb_lcd_dsp_method = LCD_CENTERING;
+                                viaparinfo->lvds_setting_info2->display_method =
+                                    viafb_lcd_dsp_method = LCD_CENTERING;
+                        } else {
+                                /* expandsion */
+                                viaparinfo->lvds_setting_info->display_method =
+                                    LCD_EXPANDSION;
+                                viafb_lcd_dsp_method = LCD_EXPANDSION;
+                                viaparinfo->lvds_setting_info2->display_method =
+                                    LCD_EXPANDSION;
+                                viafb_lcd_dsp_method = LCD_EXPANDSION;
+                        }
+                }
+
+                if (setting_info.lcd_operation_flag & OP_LCD_MODE) {
+                        need_set_mode = 1;
+                        if (setting_info.lcd_attributes.lcd_mode ==
+                                LCD_SPWG) {
+                                viaparinfo->lvds_setting_info->lcd_mode =
+                                        viafb_lcd_mode = LCD_SPWG;
+                        } else {
+                                viaparinfo->lvds_setting_info->lcd_mode =
+                                        viafb_lcd_mode = LCD_OPENLDI;
+                        }
+                        viaparinfo->lvds_setting_info2->lcd_mode =
+                            viaparinfo->lvds_setting_info->lcd_mode;
+                }
+
+                if (setting_info.lcd_operation_flag & OP_LCD_PANEL_ID) {
+                        need_set_mode = 1;
+                        if (setting_info.lcd_attributes.panel_id <=
+                            LCD_PANEL_ID_MAXIMUM) {
+                                viafb_lcd_panel_id =
+                                    setting_info.lcd_attributes.panel_id;
+                                viafb_init_lcd_size();
+                        }
+                }
+        }
+
+        if (0 != (setting_info.samm_status & OP_SAMM)) {
+                setting_info.samm_status =
+                    setting_info.samm_status & (~OP_SAMM);
+                if (setting_info.samm_status == 0
+                    || setting_info.samm_status == 1) {
+                        viafb_SAMM_ON = setting_info.samm_status;
+
+                        if (viafb_SAMM_ON)
+                                viafb_primary_dev = setting_info.primary_device;
+
+                        viafb_set_start_addr();
+                        viafb_set_iga_path();
+                }
+                need_set_mode = 1;
+        }
+
+        viaparinfo->duoview = is_duoview();
+
+        if (!need_set_mode) {
+                ;
+        } else {
+                viafb_set_iga_path();
+                viafb_set_par(info);
+        }
+        return true;
+}
+
+static void retrieve_device_setting(struct viafb_ioctl_setting
+        *setting_info)
+{
+
+        /* get device status */
+        if (viafb_CRT_ON == 1)
+                setting_info->device_status = CRT_Device;
+        if (viafb_DVI_ON == 1)
+                setting_info->device_status |= DVI_Device;
+        if (viafb_LCD_ON == 1)
+                setting_info->device_status |= LCD_Device;
+        if (viafb_LCD2_ON == 1)
+                setting_info->device_status |= LCD2_Device;
+        if ((viaparinfo->video_on_crt == 1) && (viafb_CRT_ON == 1)) {
+                setting_info->video_device_status =
+                        viaparinfo->crt_setting_info->iga_path;
+        } else if ((viaparinfo->video_on_dvi == 1) && (viafb_DVI_ON == 1)) {
+                setting_info->video_device_status =
+                        viaparinfo->tmds_setting_info->iga_path;
+        } else if ((viaparinfo->video_on_lcd == 1) && (viafb_LCD_ON == 1)) {
+                setting_info->video_device_status =
+                        viaparinfo->lvds_setting_info->iga_path;
+        } else {
+                setting_info->video_device_status = 0;
+        }
+
+        setting_info->samm_status = viafb_SAMM_ON;
+        setting_info->primary_device = get_primary_device();
+
+        setting_info->first_dev_bpp = viafb_bpp;
+        setting_info->second_dev_bpp = viafb_bpp1;
+
+        setting_info->first_dev_refresh = viafb_refresh;
+        setting_info->second_dev_refresh = viafb_refresh1;
+
+        setting_info->first_dev_hor_res = viafb_hotplug_Xres;
+        setting_info->first_dev_ver_res = viafb_hotplug_Yres;
+        setting_info->second_dev_hor_res = viafb_second_xres;
+        setting_info->second_dev_ver_res = viafb_second_yres;
+
+        /* Get lcd attributes */
+        setting_info->lcd_attributes.display_center = viafb_lcd_dsp_method;
+        setting_info->lcd_attributes.panel_id = viafb_lcd_panel_id;
+        setting_info->lcd_attributes.lcd_mode = viafb_lcd_mode;
+}
+
+static void parse_active_dev(void)
+{
+        viafb_CRT_ON = STATE_OFF;
+        viafb_DVI_ON = STATE_OFF;
+        viafb_LCD_ON = STATE_OFF;
+        viafb_LCD2_ON = STATE_OFF;
+        /* 1. Modify the active status of devices. */
+        /* 2. Keep the order of devices, so we can set corresponding
+           IGA path to devices in SAMM case. */
+        /*    Note: The previous of active_dev is primary device,
+           and the following is secondary device. */
+        if (!strncmp(viafb_active_dev, "CRT+DVI", 7)) {
+                /* CRT+DVI */
+                viafb_CRT_ON = STATE_ON;
+                viafb_DVI_ON = STATE_ON;
+                viafb_primary_dev = CRT_Device;
+        } else if (!strncmp(viafb_active_dev, "DVI+CRT", 7)) {
+                /* DVI+CRT */
+                viafb_CRT_ON = STATE_ON;
+                viafb_DVI_ON = STATE_ON;
+                viafb_primary_dev = DVI_Device;
+        } else if (!strncmp(viafb_active_dev, "CRT+LCD", 7)) {
+                /* CRT+LCD */
+                viafb_CRT_ON = STATE_ON;
+                viafb_LCD_ON = STATE_ON;
+                viafb_primary_dev = CRT_Device;
+        } else if (!strncmp(viafb_active_dev, "LCD+CRT", 7)) {
+                /* LCD+CRT */
+                viafb_CRT_ON = STATE_ON;
+                viafb_LCD_ON = STATE_ON;
+                viafb_primary_dev = LCD_Device;
+        } else if (!strncmp(viafb_active_dev, "DVI+LCD", 7)) {
+                /* DVI+LCD */
+                viafb_DVI_ON = STATE_ON;
+                viafb_LCD_ON = STATE_ON;
+                viafb_primary_dev = DVI_Device;
+        } else if (!strncmp(viafb_active_dev, "LCD+DVI", 7)) {
+                /* LCD+DVI */
+                viafb_DVI_ON = STATE_ON;
+                viafb_LCD_ON = STATE_ON;
+                viafb_primary_dev = LCD_Device;
+        } else if (!strncmp(viafb_active_dev, "LCD+LCD2", 8)) {
+                viafb_LCD_ON = STATE_ON;
+                viafb_LCD2_ON = STATE_ON;
+                viafb_primary_dev = LCD_Device;
+        } else if (!strncmp(viafb_active_dev, "LCD2+LCD", 8)) {
+                viafb_LCD_ON = STATE_ON;
+                viafb_LCD2_ON = STATE_ON;
+                viafb_primary_dev = LCD2_Device;
+        } else if (!strncmp(viafb_active_dev, "CRT", 3)) {
+                /* CRT only */
+                viafb_CRT_ON = STATE_ON;
+                viafb_SAMM_ON = STATE_OFF;
+        } else if (!strncmp(viafb_active_dev, "DVI", 3)) {
+                /* DVI only */
+                viafb_DVI_ON = STATE_ON;
+                viafb_SAMM_ON = STATE_OFF;
+        } else if (!strncmp(viafb_active_dev, "LCD", 3)) {
+                /* LCD only */
+                viafb_LCD_ON = STATE_ON;
+                viafb_SAMM_ON = STATE_OFF;
+        } else {
+                viafb_CRT_ON = STATE_ON;
+                viafb_SAMM_ON = STATE_OFF;
+        }
+        viaparinfo->duoview = is_duoview();
+}
+
+static void parse_video_dev(void)
+{
+        viaparinfo->video_on_crt = STATE_OFF;
+        viaparinfo->video_on_dvi = STATE_OFF;
+        viaparinfo->video_on_lcd = STATE_OFF;
+
+        if (!strncmp(viafb_video_dev, "CRT", 3)) {
+                /* Video on CRT */
+                viaparinfo->video_on_crt = STATE_ON;
+        } else if (!strncmp(viafb_video_dev, "DVI", 3)) {
+                /* Video on DVI */
+                viaparinfo->video_on_dvi = STATE_ON;
+        } else if (!strncmp(viafb_video_dev, "LCD", 3)) {
+                /* Video on LCD */
+                viaparinfo->video_on_lcd = STATE_ON;
+        }
+}
+
+static int parse_port(char *opt_str, int *output_interface)
+{
+        if (!strncmp(opt_str, "DVP0", 4))
+                *output_interface = INTERFACE_DVP0;
+        else if (!strncmp(opt_str, "DVP1", 4))
+                *output_interface = INTERFACE_DVP1;
+        else if (!strncmp(opt_str, "DFP_HIGHLOW", 11))
+                *output_interface = INTERFACE_DFP;
+        else if (!strncmp(opt_str, "DFP_HIGH", 8))
+                *output_interface = INTERFACE_DFP_HIGH;
+        else if (!strncmp(opt_str, "DFP_LOW", 7))
+                *output_interface = INTERFACE_DFP_LOW;
+        else
+                *output_interface = INTERFACE_NONE;
+        return 0;
+}
+
+static void parse_lcd_port(void)
+{
+        parse_port(viafb_lcd_port, &viaparinfo->chip_info->lvds_chip_info.
+                output_interface);
+        /*Initialize to avoid unexpected behavior */
+        viaparinfo->chip_info->lvds_chip_info2.output_interface =
+        INTERFACE_NONE;
+
+        DEBUG_MSG(KERN_INFO "parse_lcd_port: viafb_lcd_port:%s,interface:%d\n",
+                  viafb_lcd_port, viaparinfo->chip_info->lvds_chip_info.
+                  output_interface);
+}
+
+static void parse_dvi_port(void)
+{
+        parse_port(viafb_dvi_port, &viaparinfo->chip_info->tmds_chip_info.
+                output_interface);
+
+        DEBUG_MSG(KERN_INFO "parse_dvi_port: viafb_dvi_port:%s,interface:%d\n",
+                  viafb_dvi_port, viaparinfo->chip_info->tmds_chip_info.
+                  output_interface);
+}
+
+/*
+ * The proc filesystem read/write function, a simple proc implement to
+ * get/set the value of DPA  DVP0,   DVP0DataDriving,  DVP0ClockDriving, DVP1,
+ * DVP1Driving, DFPHigh, DFPLow CR96,   SR2A[5], SR1B[1], SR2A[4], SR1E[2],
+ * CR9B,    SR65,    CR97,    CR99
+ */
+static int viafb_dvp0_proc_read(char *buf, char **start, off_t offset,
+int count, int *eof, void *data)
+{
+        int len = 0;
+        u8 dvp0_data_dri = 0, dvp0_clk_dri = 0, dvp0 = 0;
+        dvp0_data_dri =
+            (viafb_read_reg(VIASR, SR2A) & BIT5) >> 4 |
+            (viafb_read_reg(VIASR, SR1B) & BIT1) >> 1;
+        dvp0_clk_dri =
+            (viafb_read_reg(VIASR, SR2A) & BIT4) >> 3 |
+            (viafb_read_reg(VIASR, SR1E) & BIT2) >> 2;
+        dvp0 = viafb_read_reg(VIACR, CR96) & 0x0f;
+        len +=
+            sprintf(buf + len, "%x %x %x\n", dvp0, dvp0_data_dri, dvp0_clk_dri);
+        *eof = 1;               /*Inform kernel end of data */
+        return len;
+}
+static int viafb_dvp0_proc_write(struct file *file,
+        const char __user *buffer, unsigned long count, void *data)
+{
+        char buf[20], *value, *pbuf;
+        u8 reg_val = 0;
+        unsigned long length, i;
+        if (count < 1)
+                return -EINVAL;
+        length = count > 20 ? 20 : count;
+        if (copy_from_user(&buf[0], buffer, length))
+                return -EFAULT;
+        buf[length - 1] = '\0'; /*Ensure end string */
+        pbuf = &buf[0];
+        for (i = 0; i < 3; i++) {
+                value = strsep(&pbuf, " ");
+                if (value != NULL) {
+                        strict_strtoul(value, 0, (unsigned long *)&reg_val);
+                        DEBUG_MSG(KERN_INFO "DVP0:reg_val[%l]=:%x\n", i,
+                                  reg_val);
+                        switch (i) {
+                        case 0:
+                                viafb_write_reg_mask(CR96, VIACR,
+                                        reg_val, 0x0f);
+                                break;
+                        case 1:
+                                viafb_write_reg_mask(SR2A, VIASR,
+                                        reg_val << 4, BIT5);
+                                viafb_write_reg_mask(SR1B, VIASR,
+                                        reg_val << 1, BIT1);
+                                break;
+                        case 2:
+                                viafb_write_reg_mask(SR2A, VIASR,
+                                        reg_val << 3, BIT4);
+                                viafb_write_reg_mask(SR1E, VIASR,
+                                        reg_val << 2, BIT2);
+                                break;
+                        default:
+                                break;
+                        }
+                } else {
+                        break;
+                }
+        }
+        return count;
+}
+static int viafb_dvp1_proc_read(char *buf, char **start, off_t offset,
+        int count, int *eof, void *data)
+{
+        int len = 0;
+        u8 dvp1 = 0, dvp1_data_dri = 0, dvp1_clk_dri = 0;
+        dvp1 = viafb_read_reg(VIACR, CR9B) & 0x0f;
+        dvp1_data_dri = (viafb_read_reg(VIASR, SR65) & 0x0c) >> 2;
+        dvp1_clk_dri = viafb_read_reg(VIASR, SR65) & 0x03;
+        len +=
+            sprintf(buf + len, "%x %x %x\n", dvp1, dvp1_data_dri, dvp1_clk_dri);
+        *eof = 1;               /*Inform kernel end of data */
+        return len;
+}
+static int viafb_dvp1_proc_write(struct file *file,
+        const char __user *buffer, unsigned long count, void *data)
+{
+        char buf[20], *value, *pbuf;
+        u8 reg_val = 0;
+        unsigned long length, i;
+        if (count < 1)
+                return -EINVAL;
+        length = count > 20 ? 20 : count;
+        if (copy_from_user(&buf[0], buffer, length))
+                return -EFAULT;
+        buf[length - 1] = '\0'; /*Ensure end string */
+        pbuf = &buf[0];
+        for (i = 0; i < 3; i++) {
+                value = strsep(&pbuf, " ");
+                if (value != NULL) {
+                        strict_strtoul(value, 0, (unsigned long *)&reg_val);
+                        switch (i) {
+                        case 0:
+                                viafb_write_reg_mask(CR9B, VIACR,
+                                        reg_val, 0x0f);
+                                break;
+                        case 1:
+                                viafb_write_reg_mask(SR65, VIASR,
+                                        reg_val << 2, 0x0c);
+                                break;
+                        case 2:
+                                viafb_write_reg_mask(SR65, VIASR,
+                                        reg_val, 0x03);
+                                break;
+                        default:
+                                break;
+                        }
+                } else {
+                        break;
+                }
+        }
+        return count;
+}
+
+static int viafb_dfph_proc_read(char *buf, char **start, off_t offset,
+        int count, int *eof, void *data)
+{
+        int len = 0;
+        u8 dfp_high = 0;
+        dfp_high = viafb_read_reg(VIACR, CR97) & 0x0f;
+        len += sprintf(buf + len, "%x\n", dfp_high);
+        *eof = 1;               /*Inform kernel end of data */
+        return len;
+}
+static int viafb_dfph_proc_write(struct file *file,
+        const char __user *buffer, unsigned long count, void *data)
+{
+        char buf[20];
+        u8 reg_val = 0;
+        unsigned long length;
+        if (count < 1)
+                return -EINVAL;
+        length = count > 20 ? 20 : count;
+        if (copy_from_user(&buf[0], buffer, length))
+                return -EFAULT;
+        buf[length - 1] = '\0'; /*Ensure end string */
+        strict_strtoul(&buf[0], 0, (unsigned long *)&reg_val);
+        viafb_write_reg_mask(CR97, VIACR, reg_val, 0x0f);
+        return count;
+}
+static int viafb_dfpl_proc_read(char *buf, char **start, off_t offset,
+        int count, int *eof, void *data)
+{
+        int len = 0;
+        u8 dfp_low = 0;
+        dfp_low = viafb_read_reg(VIACR, CR99) & 0x0f;
+        len += sprintf(buf + len, "%x\n", dfp_low);
+        *eof = 1;               /*Inform kernel end of data */
+        return len;
+}
+static int viafb_dfpl_proc_write(struct file *file,
+        const char __user *buffer, unsigned long count, void *data)
+{
+        char buf[20];
+        u8 reg_val = 0;
+        unsigned long length;
+        if (count < 1)
+                return -EINVAL;
+        length = count > 20 ? 20 : count;
+        if (copy_from_user(&buf[0], buffer, length))
+                return -EFAULT;
+        buf[length - 1] = '\0'; /*Ensure end string */
+        strict_strtoul(&buf[0], 0, (unsigned long *)&reg_val);
+        viafb_write_reg_mask(CR99, VIACR, reg_val, 0x0f);
+        return count;
+}
+static int viafb_vt1636_proc_read(char *buf, char **start,
+        off_t offset, int count, int *eof, void *data)
+{
+        int len = 0;
+        u8 vt1636_08 = 0, vt1636_09 = 0;
+        switch (viaparinfo->chip_info->lvds_chip_info.lvds_chip_name) {
+        case VT1636_LVDS:
+                vt1636_08 =
+                    viafb_gpio_i2c_read_lvds(viaparinfo->lvds_setting_info,
+                    &viaparinfo->chip_info->lvds_chip_info, 0x08) & 0x0f;
+                vt1636_09 =
+                    viafb_gpio_i2c_read_lvds(viaparinfo->lvds_setting_info,
+                    &viaparinfo->chip_info->lvds_chip_info, 0x09) & 0x1f;
+                len += sprintf(buf + len, "%x %x\n", vt1636_08, vt1636_09);
+                break;
+        default:
+                break;
+        }
+        switch (viaparinfo->chip_info->lvds_chip_info2.lvds_chip_name) {
+        case VT1636_LVDS:
+                vt1636_08 =
+                    viafb_gpio_i2c_read_lvds(viaparinfo->lvds_setting_info2,
+                        &viaparinfo->chip_info->lvds_chip_info2, 0x08) & 0x0f;
+                vt1636_09 =
+                    viafb_gpio_i2c_read_lvds(viaparinfo->lvds_setting_info2,
+                        &viaparinfo->chip_info->lvds_chip_info2, 0x09) & 0x1f;
+                len += sprintf(buf + len, " %x %x\n", vt1636_08, vt1636_09);
+                break;
+        default:
+                break;
+        }
+        *eof = 1;               /*Inform kernel end of data */
+        return len;
+}
+static int viafb_vt1636_proc_write(struct file *file,
+        const char __user *buffer, unsigned long count, void *data)
+{
+        char buf[30], *value, *pbuf;
+        struct IODATA reg_val;
+        unsigned long length, i;
+        if (count < 1)
+                return -EINVAL;
+        length = count > 30 ? 30 : count;
+        if (copy_from_user(&buf[0], buffer, length))
+                return -EFAULT;
+        buf[length - 1] = '\0'; /*Ensure end string */
+        pbuf = &buf[0];
+        switch (viaparinfo->chip_info->lvds_chip_info.lvds_chip_name) {
+        case VT1636_LVDS:
+                for (i = 0; i < 2; i++) {
+                        value = strsep(&pbuf, " ");
+                        if (value != NULL) {
+                                strict_strtoul(value, 0,
+                                        (unsigned long *)&reg_val.Data);
+                                switch (i) {
+                                case 0:
+                                        reg_val.Index = 0x08;
+                                        reg_val.Mask = 0x0f;
+                                        viafb_gpio_i2c_write_mask_lvds
+                                            (viaparinfo->lvds_setting_info,
+                                            &viaparinfo->
+                                            chip_info->lvds_chip_info,
+                                             reg_val);
+                                        break;
+                                case 1:
+                                        reg_val.Index = 0x09;
+                                        reg_val.Mask = 0x1f;
+                                        viafb_gpio_i2c_write_mask_lvds
+                                            (viaparinfo->lvds_setting_info,
+                                            &viaparinfo->
+                                            chip_info->lvds_chip_info,
+                                             reg_val);
+                                        break;
+                                default:
+                                        break;
+                                }
+                        } else {
+                                break;
+                        }
+                }
+                break;
+        default:
+                break;
+        }
+        switch (viaparinfo->chip_info->lvds_chip_info2.lvds_chip_name) {
+        case VT1636_LVDS:
+                for (i = 0; i < 2; i++) {
+                        value = strsep(&pbuf, " ");
+                        if (value != NULL) {
+                                strict_strtoul(value, 0,
+                                        (unsigned long *)&reg_val.Data);
+                                switch (i) {
+                                case 0:
+                                        reg_val.Index = 0x08;
+                                        reg_val.Mask = 0x0f;
+                                        viafb_gpio_i2c_write_mask_lvds
+                                            (viaparinfo->lvds_setting_info2,
+                                            &viaparinfo->
+                                            chip_info->lvds_chip_info2,
+                                             reg_val);
+                                        break;
+                                case 1:
+                                        reg_val.Index = 0x09;
+                                        reg_val.Mask = 0x1f;
+                                        viafb_gpio_i2c_write_mask_lvds
+                                            (viaparinfo->lvds_setting_info2,
+                                            &viaparinfo->
+                                            chip_info->lvds_chip_info2,
+                                             reg_val);
+                                        break;
+                                default:
+                                        break;
+                                }
+                        } else {
+                                break;
+                        }
+                }
+                break;
+        default:
+                break;
+        }
+        return count;
+}
+
+static void viafb_init_proc(struct proc_dir_entry *viafb_entry)
+{
+        struct proc_dir_entry *entry;
+        viafb_entry = proc_mkdir("viafb", NULL);
+        if (viafb_entry) {
+                entry = create_proc_entry("dvp0", 0, viafb_entry);
+                if (entry) {
+                        entry->owner = THIS_MODULE;
+                        entry->read_proc = viafb_dvp0_proc_read;
+                        entry->write_proc = viafb_dvp0_proc_write;
+                }
+                entry = create_proc_entry("dvp1", 0, viafb_entry);
+                if (entry) {
+                        entry->owner = THIS_MODULE;
+                        entry->read_proc = viafb_dvp1_proc_read;
+                        entry->write_proc = viafb_dvp1_proc_write;
+                }
+                entry = create_proc_entry("dfph", 0, viafb_entry);
+                if (entry) {
+                        entry->owner = THIS_MODULE;
+                        entry->read_proc = viafb_dfph_proc_read;
+                        entry->write_proc = viafb_dfph_proc_write;
+                }
+                entry = create_proc_entry("dfpl", 0, viafb_entry);
+                if (entry) {
+                        entry->owner = THIS_MODULE;
+                        entry->read_proc = viafb_dfpl_proc_read;
+                        entry->write_proc = viafb_dfpl_proc_write;
+                }
+                if (VT1636_LVDS == viaparinfo->chip_info->lvds_chip_info.
+                        lvds_chip_name || VT1636_LVDS ==
+                    viaparinfo->chip_info->lvds_chip_info2.lvds_chip_name) {
+                        entry = create_proc_entry("vt1636", 0, viafb_entry);
+                        if (entry) {
+                                entry->owner = THIS_MODULE;
+                                entry->read_proc = viafb_vt1636_proc_read;
+                                entry->write_proc = viafb_vt1636_proc_write;
+                        }
+                }
+
+        }
+}
+static void viafb_remove_proc(struct proc_dir_entry *viafb_entry)
+{
+        /* no problem if it was not registered */
+        remove_proc_entry("dvp0", viafb_entry);/* parent dir */
+        remove_proc_entry("dvp1", viafb_entry);
+        remove_proc_entry("dfph", viafb_entry);
+        remove_proc_entry("dfpl", viafb_entry);
+        remove_proc_entry("vt1636", viafb_entry);
+        remove_proc_entry("vt1625", viafb_entry);
+}
+
+static int __devinit via_pci_probe(void)
+{
+        unsigned int default_xres, default_yres;
+        char *tmpc, *tmpm;
+        char *tmpc_sec, *tmpm_sec;
+        int vmode_index;
+        u32 tmds_length, lvds_length, crt_length, chip_length, viafb_par_length;
+
+        DEBUG_MSG(KERN_INFO "VIAFB PCI Probe!!\n");
+
+        viafb_par_length = ALIGN(sizeof(struct viafb_par), BITS_PER_LONG/8);
+        tmds_length = ALIGN(sizeof(struct tmds_setting_information),
+                BITS_PER_LONG/8);
+        lvds_length = ALIGN(sizeof(struct lvds_setting_information),
+                BITS_PER_LONG/8);
+        crt_length = ALIGN(sizeof(struct lvds_setting_information),
+                BITS_PER_LONG/8);
+        chip_length = ALIGN(sizeof(struct chip_information), BITS_PER_LONG/8);
+
+        /* Allocate fb_info and ***_par here, also including some other needed
+         * variables
+        */
+        viafbinfo = framebuffer_alloc(viafb_par_length + 2 * lvds_length +
+        tmds_length + crt_length + chip_length, NULL);
+        if (!viafbinfo) {
+                printk(KERN_ERR"Could not allocate memory for viafb_info.\n");
+                return -ENODEV;
+        }
+
+        viaparinfo = (struct viafb_par *)viafbinfo->par;
+        viaparinfo->tmds_setting_info = (struct tmds_setting_information *)
+                ((unsigned long)viaparinfo + viafb_par_length);
+        viaparinfo->lvds_setting_info = (struct lvds_setting_information *)
+                ((unsigned long)viaparinfo->tmds_setting_info + tmds_length);
+        viaparinfo->lvds_setting_info2 = (struct lvds_setting_information *)
+                ((unsigned long)viaparinfo->lvds_setting_info + lvds_length);
+        viaparinfo->crt_setting_info = (struct crt_setting_information *)
+                ((unsigned long)viaparinfo->lvds_setting_info2 + lvds_length);
+        viaparinfo->chip_info = (struct chip_information *)
+                ((unsigned long)viaparinfo->crt_setting_info + crt_length);
+
+        if (viafb_dual_fb)
+                viafb_SAMM_ON = 1;
+        parse_active_dev();
+        parse_video_dev();
+        parse_lcd_port();
+        parse_dvi_port();
+
+        /* for dual-fb must viafb_SAMM_ON=1 and viafb_dual_fb=1 */
+        if (!viafb_SAMM_ON)
+                viafb_dual_fb = 0;
+
+        /* Set up I2C bus stuff */
+        viafb_create_i2c_bus(viaparinfo);
+
+        viafb_init_chip_info();
+        viafb_get_fb_info(&viaparinfo->fbmem, &viaparinfo->memsize);
+        viaparinfo->fbmem_free = viaparinfo->memsize;
+        viaparinfo->fbmem_used = 0;
+        viaparinfo->fbmem_virt = ioremap_nocache(viaparinfo->fbmem,
+                viaparinfo->memsize);
+        viafbinfo->screen_base = (char *)viaparinfo->fbmem_virt;
+
+        if (!viaparinfo->fbmem_virt) {
+                printk(KERN_INFO "ioremap failed\n");
+                return -1;
+        }
+
+        viafb_get_mmio_info(&viaparinfo->mmio_base, &viaparinfo->mmio_len);
+        viaparinfo->io_virt = ioremap_nocache(viaparinfo->mmio_base,
+                viaparinfo->mmio_len);
+
+        viafbinfo->node = 0;
+        viafbinfo->fbops = &viafb_ops;
+        viafbinfo->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
+
+        viafbinfo->pseudo_palette = pseudo_pal;
+        if (viafb_accel) {
+                viafb_init_accel();
+                viafb_init_2d_engine();
+                viafb_hw_cursor_init();
+        }
+
+        if (viafb_second_size && (viafb_second_size < 8)) {
+                viafb_second_offset = viaparinfo->fbmem_free -
+                        viafb_second_size * 1024 * 1024;
+        } else {
+                viafb_second_size = 8;
+                viafb_second_offset = viaparinfo->fbmem_free -
+                        viafb_second_size * 1024 * 1024;
+        }
+
+        viafb_FB_MM = viaparinfo->fbmem_virt;
+        tmpm = viafb_mode;
+        tmpc = strsep(&tmpm, "x");
+        strict_strtoul(tmpc, 0, (unsigned long *)&default_xres);
+        strict_strtoul(tmpm, 0, (unsigned long *)&default_yres);
+
+        vmode_index = viafb_get_mode_index(default_xres, default_yres, 0);
+        DEBUG_MSG(KERN_INFO "0->index=%d\n", vmode_index);
+
+        if (viafb_SAMM_ON == 1) {
+                if (strcmp(viafb_mode, viafb_mode1)) {
+                        tmpm_sec = viafb_mode1;
+                        tmpc_sec = strsep(&tmpm_sec, "x");
+                        strict_strtoul(tmpc_sec, 0,
+                                (unsigned long *)&viafb_second_xres);
+                        strict_strtoul(tmpm_sec, 0,
+                                (unsigned long *)&viafb_second_yres);
+                } else {
+                        viafb_second_xres = default_xres;
+                        viafb_second_yres = default_yres;
+                }
+                if (0 == viafb_second_virtual_xres) {
+                        switch (viafb_second_xres) {
+                        case 1400:
+                                viafb_second_virtual_xres = 1408;
+                                break;
+                        default:
+                                viafb_second_virtual_xres = viafb_second_xres;
+                                break;
+                        }
+                }
+                if (0 == viafb_second_virtual_yres)
+                        viafb_second_virtual_yres = viafb_second_yres;
+        }
+
+        switch (viafb_bpp) {
+        case 0 ... 8:
+                viafb_bpp = 8;
+                break;
+        case 9 ... 16:
+                viafb_bpp = 16;
+                break;
+        case 17 ... 32:
+                viafb_bpp = 32;
+                break;
+        default:
+                viafb_bpp = 8;
+        }
+        default_var.xres = default_xres;
+        default_var.yres = default_yres;
+        switch (default_xres) {
+        case 1400:
+                default_var.xres_virtual = 1408;
+                break;
+        default:
+                default_var.xres_virtual = default_xres;
+                break;
+        }
+        default_var.yres_virtual = default_yres;
+        default_var.bits_per_pixel = viafb_bpp;
+        if (default_var.bits_per_pixel == 15)
+                default_var.bits_per_pixel = 16;
+        default_var.pixclock =
+            viafb_get_pixclock(default_xres, default_yres, viafb_refresh);
+        default_var.left_margin = (default_xres >> 3) & 0xf8;
+        default_var.right_margin = 32;
+        default_var.upper_margin = 16;
+        default_var.lower_margin = 4;
+        default_var.hsync_len = default_var.left_margin;
+        default_var.vsync_len = 4;
+        default_var.accel_flags = 0;
+
+        if (viafb_accel) {
+                viafbinfo->flags |=
+                    (FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT |
+                     FBINFO_HWACCEL_IMAGEBLIT);
+                default_var.accel_flags |= FB_ACCELF_TEXT;
+        } else
+                viafbinfo->flags |= FBINFO_HWACCEL_DISABLED;
+
+        if (viafb_dual_fb) {
+                viafbinfo1 = framebuffer_alloc(viafb_par_length, NULL);
+                if (!viafbinfo1) {
+                        printk(KERN_ERR
+                        "allocate the second framebuffer struct error\n");
+                        framebuffer_release(viafbinfo);
+                        return -ENOMEM;
+                }
+                viaparinfo1 = viafbinfo1->par;
+                memcpy(viaparinfo1, viaparinfo, viafb_par_length);
+                viaparinfo1->memsize = viaparinfo->memsize -
+                        viafb_second_offset;
+                viaparinfo->memsize = viafb_second_offset;
+                viaparinfo1->fbmem_virt = viaparinfo->fbmem_virt +
+                        viafb_second_offset;
+                viaparinfo1->fbmem = viaparinfo->fbmem + viafb_second_offset;
+
+                viaparinfo1->fbmem_used = viaparinfo->fbmem_used;
+                viaparinfo1->fbmem_free = viaparinfo1->memsize -
+                        viaparinfo1->fbmem_used;
+                viaparinfo->fbmem_free = viaparinfo->memsize;
+                viaparinfo->fbmem_used = 0;
+                if (viafb_accel) {
+                        viaparinfo1->cursor_start =
+                            viaparinfo->cursor_start - viafb_second_offset;
+                        viaparinfo1->VQ_start = viaparinfo->VQ_start -
+                                viafb_second_offset;
+                        viaparinfo1->VQ_end = viaparinfo->VQ_end -
+                                viafb_second_offset;
+                }
+
+                memcpy(viafbinfo1, viafbinfo, sizeof(struct fb_info));
+                viafbinfo1->screen_base = viafbinfo->screen_base +
+                        viafb_second_offset;
+                viafbinfo1->fix.smem_start = viaparinfo1->fbmem;
+                viafbinfo1->fix.smem_len = viaparinfo1->fbmem_free;
+
+                default_var.xres = viafb_second_xres;
+                default_var.yres = viafb_second_yres;
+                default_var.xres_virtual = viafb_second_virtual_xres;
+                default_var.yres_virtual = viafb_second_virtual_yres;
+                if (viafb_bpp1 != viafb_bpp)
+                        viafb_bpp1 = viafb_bpp;
+                default_var.bits_per_pixel = viafb_bpp1;
+                default_var.pixclock =
+                    viafb_get_pixclock(viafb_second_xres, viafb_second_yres,
+                    viafb_refresh);
+                default_var.left_margin = (viafb_second_xres >> 3) & 0xf8;
+                default_var.right_margin = 32;
+                default_var.upper_margin = 16;
+                default_var.lower_margin = 4;
+                default_var.hsync_len = default_var.left_margin;
+                default_var.vsync_len = 4;
+
+                viafb_setup_fixinfo(&viafbinfo1->fix, viaparinfo1);
+                viafb_check_var(&default_var, viafbinfo1);
+                viafbinfo1->var = default_var;
+                viafb_update_viafb_par(viafbinfo);
+                viafb_update_fix(&viafbinfo1->fix, viafbinfo1);
+        }
+
+        viafb_setup_fixinfo(&viafbinfo->fix, viaparinfo);
+        viafb_check_var(&default_var, viafbinfo);
+        viafbinfo->var = default_var;
+        viafb_update_viafb_par(viafbinfo);
+        viafb_update_fix(&viafbinfo->fix, viafbinfo);
+        default_var.activate = FB_ACTIVATE_NOW;
+        fb_alloc_cmap(&viafbinfo->cmap, 256, 0);
+
+        if (viafb_dual_fb && (viafb_primary_dev == LCD_Device)
+            && (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266)) {
+                if (register_framebuffer(viafbinfo1) < 0)
+                        return -EINVAL;
+        }
+        if (register_framebuffer(viafbinfo) < 0)
+                return -EINVAL;
+
+        if (viafb_dual_fb && ((viafb_primary_dev != LCD_Device)
+                        || (viaparinfo->chip_info->gfx_chip_name !=
+                        UNICHROME_CLE266))) {
+                if (register_framebuffer(viafbinfo1) < 0)
+                        return -EINVAL;
+        }
+        DEBUG_MSG(KERN_INFO "fb%d: %s frame buffer device %dx%d-%dbpp\n",
+                  viafbinfo->node, viafbinfo->fix.id, default_var.xres,
+                  default_var.yres, default_var.bits_per_pixel);
+
+        viafb_init_proc(viaparinfo->proc_entry);
+        viafb_init_dac(IGA2);
+        return 0;
+}
+
+static void __devexit via_pci_remove(void)
+{
+        DEBUG_MSG(KERN_INFO "via_pci_remove!\n");
+        fb_dealloc_cmap(&viafbinfo->cmap);
+        unregister_framebuffer(viafbinfo);
+        if (viafb_dual_fb)
+                unregister_framebuffer(viafbinfo1);
+        iounmap((void *)viaparinfo->fbmem_virt);
+        iounmap(viaparinfo->io_virt);
+
+        viafb_delete_i2c_buss(viaparinfo);
+
+        framebuffer_release(viafbinfo);
+        if (viafb_dual_fb)
+                framebuffer_release(viafbinfo1);
+
+        viafb_remove_proc(viaparinfo->proc_entry);
+}
+
+#ifndef MODULE
+static int __init viafb_setup(char *options)
+{
+        char *this_opt;
+        DEBUG_MSG(KERN_INFO "viafb_setup!\n");
+
+        if (!options || !*options)
+                return 0;
+
+        while ((this_opt = strsep(&options, ",")) != NULL) {
+                if (!*this_opt)
+                        continue;
+
+                if (!strncmp(this_opt, "viafb_mode1=", 12))
+                        viafb_mode1 = kstrdup(this_opt + 12, GFP_KERNEL);
+                else if (!strncmp(this_opt, "viafb_mode=", 11))
+                        viafb_mode = kstrdup(this_opt + 11, GFP_KERNEL);
+                else if (!strncmp(this_opt, "viafb_bpp1=", 11))
+                        strict_strtoul(this_opt + 11, 0,
+                                (unsigned long *)&viafb_bpp1);
+                else if (!strncmp(this_opt, "viafb_bpp=", 10))
+                        strict_strtoul(this_opt + 10, 0,
+                                (unsigned long *)&viafb_bpp);
+                else if (!strncmp(this_opt, "viafb_refresh1=", 15))
+                        strict_strtoul(this_opt + 15, 0,
+                                (unsigned long *)&viafb_refresh1);
+                else if (!strncmp(this_opt, "viafb_refresh=", 14))
+                        strict_strtoul(this_opt + 14, 0,
+                                (unsigned long *)&viafb_refresh);
+                else if (!strncmp(this_opt, "viafb_lcd_dsp_method=", 21))
+                        strict_strtoul(this_opt + 21, 0,
+                                (unsigned long *)&viafb_lcd_dsp_method);
+                else if (!strncmp(this_opt, "viafb_lcd_panel_id=", 19))
+                        strict_strtoul(this_opt + 19, 0,
+                                (unsigned long *)&viafb_lcd_panel_id);
+                else if (!strncmp(this_opt, "viafb_accel=", 12))
+                        strict_strtoul(this_opt + 12, 0,
+                                (unsigned long *)&viafb_accel);
+                else if (!strncmp(this_opt, "viafb_SAMM_ON=", 14))
+                        strict_strtoul(this_opt + 14, 0,
+                                (unsigned long *)&viafb_SAMM_ON);
+                else if (!strncmp(this_opt, "viafb_active_dev=", 17))
+                        viafb_active_dev = kstrdup(this_opt + 17, GFP_KERNEL);
+                else if (!strncmp(this_opt,
+                        "viafb_display_hardware_layout=", 30))
+                        strict_strtoul(this_opt + 30, 0,
+                        (unsigned long *)&viafb_display_hardware_layout);
+                else if (!strncmp(this_opt, "viafb_second_size=", 18))
+                        strict_strtoul(this_opt + 18, 0,
+                                (unsigned long *)&viafb_second_size);
+                else if (!strncmp(this_opt,
+                        "viafb_platform_epia_dvi=", 24))
+                        strict_strtoul(this_opt + 24, 0,
+                                (unsigned long *)&viafb_platform_epia_dvi);
+                else if (!strncmp(this_opt,
+                        "viafb_device_lcd_dualedge=", 26))
+                        strict_strtoul(this_opt + 26, 0,
+                                (unsigned long *)&viafb_device_lcd_dualedge);
+                else if (!strncmp(this_opt, "viafb_bus_width=", 16))
+                        strict_strtoul(this_opt + 16, 0,
+                                (unsigned long *)&viafb_bus_width);
+                else if (!strncmp(this_opt, "viafb_lcd_mode=", 15))
+                        strict_strtoul(this_opt + 15, 0,
+                                (unsigned long *)&viafb_lcd_mode);
+                else if (!strncmp(this_opt, "viafb_video_dev=", 16))
+                        viafb_video_dev = kstrdup(this_opt + 16, GFP_KERNEL);
+                else if (!strncmp(this_opt, "viafb_lcd_port=", 15))
+                        viafb_lcd_port = kstrdup(this_opt + 15, GFP_KERNEL);
+                else if (!strncmp(this_opt, "viafb_dvi_port=", 15))
+                        viafb_dvi_port = kstrdup(this_opt + 15, GFP_KERNEL);
+        }
+        return 0;
+}
+#endif
+
+static int __init viafb_init(void)
+{
+#ifndef MODULE
+        char *option = NULL;
+        if (fb_get_options("viafb", &option))
+                return -ENODEV;
+        viafb_setup(option);
+#endif
+        printk(KERN_INFO
+       "VIA Graphics Intergration Chipset framebuffer %d.%d initializing\n",
+               VERSION_MAJOR, VERSION_MINOR);
+        return via_pci_probe();
+}
+
+static void __exit viafb_exit(void)
+{
+        DEBUG_MSG(KERN_INFO "viafb_exit!\n");
+        via_pci_remove();
+}
+
+static struct fb_ops viafb_ops = {
+        .owner = THIS_MODULE,
+        .fb_open = viafb_open,
+        .fb_release = viafb_release,
+        .fb_check_var = viafb_check_var,
+        .fb_set_par = viafb_set_par,
+        .fb_setcolreg = viafb_setcolreg,
+        .fb_pan_display = viafb_pan_display,
+        .fb_blank = viafb_blank,
+        .fb_fillrect = viafb_fillrect,
+        .fb_copyarea = viafb_copyarea,
+        .fb_imageblit = viafb_imageblit,
+        .fb_cursor = viafb_cursor,
+        .fb_ioctl = viafb_ioctl,
+        .fb_sync = viafb_sync,
+        .fb_setcmap = viafb_setcmap,
+};
+
+module_init(viafb_init);
+module_exit(viafb_exit);
+
+#ifdef MODULE
+module_param(viafb_memsize, int, 0);
+
+module_param(viafb_mode, charp, 0);
+MODULE_PARM_DESC(viafb_mode, "Set resolution (default=640x480)");
+
+module_param(viafb_mode1, charp, 0);
+MODULE_PARM_DESC(viafb_mode1, "Set resolution (default=640x480)");
+
+module_param(viafb_bpp, int, 0);
+MODULE_PARM_DESC(viafb_bpp, "Set color depth (default=32bpp)");
+
+module_param(viafb_bpp1, int, 0);
+MODULE_PARM_DESC(viafb_bpp1, "Set color depth (default=32bpp)");
+
+module_param(viafb_refresh, int, 0);
+MODULE_PARM_DESC(viafb_refresh,
+        "Set CRT viafb_refresh rate (default = 60)");
+
+module_param(viafb_refresh1, int, 0);
+MODULE_PARM_DESC(viafb_refresh1,
+        "Set CRT refresh rate (default = 60)");
+
+module_param(viafb_lcd_panel_id, int, 0);
+MODULE_PARM_DESC(viafb_lcd_panel_id,
+        "Set Flat Panel type(Default=1024x768)");
+
+module_param(viafb_lcd_dsp_method, int, 0);
+MODULE_PARM_DESC(viafb_lcd_dsp_method,
+        "Set Flat Panel display scaling method.(Default=Expandsion)");
+
+module_param(viafb_SAMM_ON, int, 0);
+MODULE_PARM_DESC(viafb_SAMM_ON,
+        "Turn on/off flag of SAMM(Default=OFF)");
+
+module_param(viafb_accel, int, 0);
+MODULE_PARM_DESC(viafb_accel,
+        "Set 2D Hardware Acceleration.(Default = OFF)");
+
+module_param(viafb_active_dev, charp, 0);
+MODULE_PARM_DESC(viafb_active_dev, "Specify active devices.");
+
+module_param(viafb_display_hardware_layout, int, 0);
+MODULE_PARM_DESC(viafb_display_hardware_layout,
+        "Display Hardware Layout (LCD Only, DVI Only...,etc)");
+
+module_param(viafb_second_size, int, 0);
+MODULE_PARM_DESC(viafb_second_size,
+        "Set secondary device memory size");
+
+module_param(viafb_dual_fb, int, 0);
+MODULE_PARM_DESC(viafb_dual_fb,
+        "Turn on/off flag of dual framebuffer devices.(Default = OFF)");
+
+module_param(viafb_platform_epia_dvi, int, 0);
+MODULE_PARM_DESC(viafb_platform_epia_dvi,
+        "Turn on/off flag of DVI devices on EPIA board.(Default = OFF)");
+
+module_param(viafb_device_lcd_dualedge, int, 0);
+MODULE_PARM_DESC(viafb_device_lcd_dualedge,
+        "Turn on/off flag of dual edge panel.(Default = OFF)");
+
+module_param(viafb_bus_width, int, 0);
+MODULE_PARM_DESC(viafb_bus_width,
+        "Set bus width of panel.(Default = 12)");
+
+module_param(viafb_lcd_mode, int, 0);
+MODULE_PARM_DESC(viafb_lcd_mode,
+        "Set Flat Panel mode(Default=OPENLDI)");
+
+module_param(viafb_video_dev, charp, 0);
+MODULE_PARM_DESC(viafb_video_dev, "Specify video devices.");
+
+module_param(viafb_lcd_port, charp, 0);
+MODULE_PARM_DESC(viafb_lcd_port, "Specify LCD output port.");
+
+module_param(viafb_dvi_port, charp, 0);
+MODULE_PARM_DESC(viafb_dvi_port, "Specify DVI output port.");
+
+MODULE_LICENSE("GPL");
+#endif
diff --git a/drivers/video/via/viafbdev.h b/drivers/video/via/viafbdev.h
new file mode 100644
index 000000000000..a4158e872878
--- /dev/null
+++ b/drivers/video/via/viafbdev.h
@@ -0,0 +1,112 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __VIAFBDEV_H__
+#define __VIAFBDEV_H__
+
+#include <linux/proc_fs.h>
+#include <linux/fb.h>
+
+#include "ioctl.h"
+#include "share.h"
+#include "chip.h"
+#include "hw.h"
+#include "via_i2c.h"
+
+#define VERSION_MAJOR       2
+#define VERSION_KERNEL      6   /* For kernel 2.6 */
+
+#define VERSION_OS          0   /* 0: for 32 bits OS, 1: for 64 bits OS */
+#define VERSION_MINOR       4
+
+struct viafb_par {
+        int bpp;
+        int hres;
+        int vres;
+        int linelength;
+        u32 xoffset;
+        u32 yoffset;
+
+        void __iomem *fbmem_virt;       /*framebuffer virtual memory address */
+        void __iomem *io_virt;  /*iospace virtual memory address */
+        unsigned int fbmem;     /*framebuffer physical memory address */
+        unsigned int memsize;   /*size of fbmem */
+        unsigned int io;        /*io space address */
+        unsigned long mmio_base;        /*mmio base address */
+        unsigned long mmio_len; /*mmio base length */
+        u32 fbmem_free;         /* Free FB memory */
+        u32 fbmem_used;         /* Use FB memory size */
+        u32 cursor_start;       /* Cursor Start Address */
+        u32 VQ_start;           /* Virtual Queue Start Address */
+        u32 VQ_end;             /* Virtual Queue End Address */
+        u32 iga_path;
+        struct proc_dir_entry *proc_entry;      /*viafb proc entry */
+        u8 duoview;             /*Is working in duoview mode? */
+
+        /* I2C stuff */
+        struct via_i2c_stuff i2c_stuff;
+
+        /* All the information will be needed to set engine */
+        struct tmds_setting_information *tmds_setting_info;
+        struct crt_setting_information *crt_setting_info;
+        struct lvds_setting_information *lvds_setting_info;
+        struct lvds_setting_information *lvds_setting_info2;
+        struct chip_information *chip_info;
+
+        /* some information related to video playing */
+        int video_on_crt;
+        int video_on_dvi;
+        int video_on_lcd;
+
+};
+struct viafb_modeinfo {
+        u32 xres;
+        u32 yres;
+        int mode_index;
+        char *mode_res;
+};
+extern unsigned int viafb_second_virtual_yres;
+extern unsigned int viafb_second_virtual_xres;
+extern unsigned int viafb_second_offset;
+extern int viafb_second_size;
+extern int viafb_SAMM_ON;
+extern int viafb_dual_fb;
+extern int viafb_LCD2_ON;
+extern int viafb_LCD_ON;
+extern int viafb_DVI_ON;
+extern int viafb_accel;
+extern int viafb_hotplug;
+extern int viafb_memsize;
+
+extern int strict_strtoul(const char *cp, unsigned int base,
+        unsigned long *res);
+
+void viafb_memory_pitch_patch(struct fb_info *info);
+void viafb_fill_var_timing_info(struct fb_var_screeninfo *var, int refresh,
+                          int mode_index);
+int viafb_get_mode_index(int hres, int vres, int flag);
+u8 viafb_gpio_i2c_read_lvds(struct lvds_setting_information
+        *plvds_setting_info, struct lvds_chip_information
+        *plvds_chip_info, u8 index);
+void viafb_gpio_i2c_write_mask_lvds(struct lvds_setting_information
+                              *plvds_setting_info, struct lvds_chip_information
+                              *plvds_chip_info, struct IODATA io_data);
+#endif /* __VIAFBDEV_H__ */
diff --git a/drivers/video/via/viamode.c b/drivers/video/via/viamode.c
new file mode 100644
index 000000000000..6dcf583a837d
--- /dev/null
+++ b/drivers/video/via/viamode.c
@@ -0,0 +1,1086 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; 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 "global.h"
+struct res_map_refresh res_map_refresh_tbl[] = {
+/*hres, vres, vclock, vmode_refresh*/
+        {480, 640, RES_480X640_60HZ_PIXCLOCK, 60},
+        {640, 480, RES_640X480_60HZ_PIXCLOCK, 60},
+        {640, 480, RES_640X480_75HZ_PIXCLOCK, 75},
+        {640, 480, RES_640X480_85HZ_PIXCLOCK, 85},
+        {640, 480, RES_640X480_100HZ_PIXCLOCK, 100},
+        {640, 480, RES_640X480_120HZ_PIXCLOCK, 120},
+        {720, 480, RES_720X480_60HZ_PIXCLOCK, 60},
+        {720, 576, RES_720X576_60HZ_PIXCLOCK, 60},
+        {800, 480, RES_800X480_60HZ_PIXCLOCK, 60},
+        {800, 600, RES_800X600_60HZ_PIXCLOCK, 60},
+        {800, 600, RES_800X600_75HZ_PIXCLOCK, 75},
+        {800, 600, RES_800X600_85HZ_PIXCLOCK, 85},
+        {800, 600, RES_800X600_100HZ_PIXCLOCK, 100},
+        {800, 600, RES_800X600_120HZ_PIXCLOCK, 120},
+        {848, 480, RES_848X480_60HZ_PIXCLOCK, 60},
+        {856, 480, RES_856X480_60HZ_PIXCLOCK, 60},
+        {1024, 512, RES_1024X512_60HZ_PIXCLOCK, 60},
+        {1024, 600, RES_1024X600_60HZ_PIXCLOCK, 60},
+        {1024, 768, RES_1024X768_60HZ_PIXCLOCK, 60},
+        {1024, 768, RES_1024X768_75HZ_PIXCLOCK, 75},
+        {1024, 768, RES_1024X768_85HZ_PIXCLOCK, 85},
+        {1024, 768, RES_1024X768_100HZ_PIXCLOCK, 100},
+/*  {1152,864, RES_1152X864_70HZ_PIXCLOCK,  70},*/
+        {1152, 864, RES_1152X864_75HZ_PIXCLOCK, 75},
+        {1280, 768, RES_1280X768_60HZ_PIXCLOCK, 60},
+        {1280, 800, RES_1280X800_60HZ_PIXCLOCK, 60},
+        {1280, 960, RES_1280X960_60HZ_PIXCLOCK, 60},
+        {1280, 1024, RES_1280X1024_60HZ_PIXCLOCK, 60},
+        {1280, 1024, RES_1280X1024_75HZ_PIXCLOCK, 75},
+        {1280, 1024, RES_1280X768_85HZ_PIXCLOCK, 85},
+        {1440, 1050, RES_1440X1050_60HZ_PIXCLOCK, 60},
+        {1600, 1200, RES_1600X1200_60HZ_PIXCLOCK, 60},
+        {1600, 1200, RES_1600X1200_75HZ_PIXCLOCK, 75},
+        {1280, 720, RES_1280X720_60HZ_PIXCLOCK, 60},
+        {1920, 1080, RES_1920X1080_60HZ_PIXCLOCK, 60},
+        {1400, 1050, RES_1400X1050_60HZ_PIXCLOCK, 60},
+        {1400, 1050, RES_1400X1050_75HZ_PIXCLOCK, 75},
+        {1368, 768, RES_1368X768_60HZ_PIXCLOCK, 60},
+        {960, 600, RES_960X600_60HZ_PIXCLOCK, 60},
+        {1000, 600, RES_1000X600_60HZ_PIXCLOCK, 60},
+        {1024, 576, RES_1024X576_60HZ_PIXCLOCK, 60},
+        {1088, 612, RES_1088X612_60HZ_PIXCLOCK, 60},
+        {1152, 720, RES_1152X720_60HZ_PIXCLOCK, 60},
+        {1200, 720, RES_1200X720_60HZ_PIXCLOCK, 60},
+        {1280, 600, RES_1280X600_60HZ_PIXCLOCK, 60},
+        {1280, 720, RES_1280X720_50HZ_PIXCLOCK, 50},
+        {1280, 768, RES_1280X768_50HZ_PIXCLOCK, 50},
+        {1360, 768, RES_1360X768_60HZ_PIXCLOCK, 60},
+        {1366, 768, RES_1366X768_50HZ_PIXCLOCK, 50},
+        {1366, 768, RES_1366X768_60HZ_PIXCLOCK, 60},
+        {1440, 900, RES_1440X900_60HZ_PIXCLOCK, 60},
+        {1440, 900, RES_1440X900_75HZ_PIXCLOCK, 75},
+        {1600, 900, RES_1600X900_60HZ_PIXCLOCK, 60},
+        {1600, 1024, RES_1600X1024_60HZ_PIXCLOCK, 60},
+        {1680, 1050, RES_1680X1050_60HZ_PIXCLOCK, 60},
+        {1680, 1050, RES_1680X1050_75HZ_PIXCLOCK, 75},
+        {1792, 1344, RES_1792X1344_60HZ_PIXCLOCK, 60},
+        {1856, 1392, RES_1856X1392_60HZ_PIXCLOCK, 60},
+        {1920, 1200, RES_1920X1200_60HZ_PIXCLOCK, 60},
+        {1920, 1440, RES_1920X1440_60HZ_PIXCLOCK, 60},
+        {1920, 1440, RES_1920X1440_75HZ_PIXCLOCK, 75},
+        {2048, 1536, RES_2048X1536_60HZ_PIXCLOCK, 60}
+};
+
+struct io_reg CN400_ModeXregs[] = { {VIASR, SR10, 0xFF, 0x01},
+{VIASR, SR15, 0x02, 0x02},
+{VIASR, SR16, 0xBF, 0x08},
+{VIASR, SR17, 0xFF, 0x1F},
+{VIASR, SR18, 0xFF, 0x4E},
+{VIASR, SR1A, 0xFB, 0x08},
+{VIASR, SR1E, 0x0F, 0x01},
+{VIASR, SR2A, 0xFF, 0x00},
+{VIACR, CR0A, 0xFF, 0x1E},      /* Cursor Start                        */
+{VIACR, CR0B, 0xFF, 0x00},      /* Cursor End                          */
+{VIACR, CR0E, 0xFF, 0x00},      /* Cursor Location High                */
+{VIACR, CR0F, 0xFF, 0x00},      /* Cursor Localtion Low                */
+{VIACR, CR32, 0xFF, 0x00},
+{VIACR, CR33, 0xFF, 0x00},
+{VIACR, CR34, 0xFF, 0x00},
+{VIACR, CR35, 0xFF, 0x00},
+{VIACR, CR36, 0x08, 0x00},
+{VIACR, CR62, 0xFF, 0x00},      /* Secondary Display Starting Address  */
+{VIACR, CR63, 0xFF, 0x00},      /* Secondary Display Starting Address  */
+{VIACR, CR64, 0xFF, 0x00},      /* Secondary Display Starting Address  */
+{VIACR, CR69, 0xFF, 0x00},
+{VIACR, CR6A, 0xFF, 0x40},
+{VIACR, CR6B, 0xFF, 0x00},
+{VIACR, CR6C, 0xFF, 0x00},
+{VIACR, CR7A, 0xFF, 0x01},      /* LCD Scaling Parameter 1             */
+{VIACR, CR7B, 0xFF, 0x02},      /* LCD Scaling Parameter 2             */
+{VIACR, CR7C, 0xFF, 0x03},      /* LCD Scaling Parameter 3             */
+{VIACR, CR7D, 0xFF, 0x04},      /* LCD Scaling Parameter 4             */
+{VIACR, CR7E, 0xFF, 0x07},      /* LCD Scaling Parameter 5             */
+{VIACR, CR7F, 0xFF, 0x0A},      /* LCD Scaling Parameter 6             */
+{VIACR, CR80, 0xFF, 0x0D},      /* LCD Scaling Parameter 7             */
+{VIACR, CR81, 0xFF, 0x13},      /* LCD Scaling Parameter 8             */
+{VIACR, CR82, 0xFF, 0x16},      /* LCD Scaling Parameter 9             */
+{VIACR, CR83, 0xFF, 0x19},      /* LCD Scaling Parameter 10            */
+{VIACR, CR84, 0xFF, 0x1C},      /* LCD Scaling Parameter 11            */
+{VIACR, CR85, 0xFF, 0x1D},      /* LCD Scaling Parameter 12            */
+{VIACR, CR86, 0xFF, 0x1E},      /* LCD Scaling Parameter 13            */
+{VIACR, CR87, 0xFF, 0x1F},      /* LCD Scaling Parameter 14            */
+{VIACR, CR88, 0xFF, 0x40},      /* LCD Panel Type                      */
+{VIACR, CR89, 0xFF, 0x00},      /* LCD Timing Control 0                */
+{VIACR, CR8A, 0xFF, 0x88},      /* LCD Timing Control 1                */
+{VIACR, CR8B, 0xFF, 0x69},      /* LCD Power Sequence Control 0        */
+{VIACR, CR8C, 0xFF, 0x57},      /* LCD Power Sequence Control 1        */
+{VIACR, CR8D, 0xFF, 0x00},      /* LCD Power Sequence Control 2        */
+{VIACR, CR8E, 0xFF, 0x7B},      /* LCD Power Sequence Control 3        */
+{VIACR, CR8F, 0xFF, 0x03},      /* LCD Power Sequence Control 4        */
+{VIACR, CR90, 0xFF, 0x30},      /* LCD Power Sequence Control 5        */
+{VIACR, CR91, 0xFF, 0xA0},      /* 24/12 bit LVDS Data off             */
+{VIACR, CR96, 0xFF, 0x00},
+{VIACR, CR97, 0xFF, 0x00},
+{VIACR, CR99, 0xFF, 0x00},
+{VIACR, CR9B, 0xFF, 0x00}
+};
+
+/* Video Mode Table for VT3314 chipset*/
+/* Common Setting for Video Mode */
+struct io_reg CN700_ModeXregs[] = { {VIASR, SR10, 0xFF, 0x01},
+{VIASR, SR15, 0x02, 0x02},
+{VIASR, SR16, 0xBF, 0x08},
+{VIASR, SR17, 0xFF, 0x1F},
+{VIASR, SR18, 0xFF, 0x4E},
+{VIASR, SR1A, 0xFB, 0x82},
+{VIASR, SR1B, 0xFF, 0xF0},
+{VIASR, SR1F, 0xFF, 0x00},
+{VIASR, SR1E, 0xFF, 0x01},
+{VIASR, SR22, 0xFF, 0x1F},
+{VIASR, SR2A, 0x0F, 0x00},
+{VIASR, SR2E, 0xFF, 0xFF},
+{VIASR, SR3F, 0xFF, 0xFF},
+{VIASR, SR40, 0xF7, 0x00},
+{VIASR, CR30, 0xFF, 0x04},
+{VIACR, CR32, 0xFF, 0x00},
+{VIACR, CR33, 0x7F, 0x00},
+{VIACR, CR34, 0xFF, 0x00},
+{VIACR, CR35, 0xFF, 0x00},
+{VIACR, CR36, 0xFF, 0x31},
+{VIACR, CR41, 0xFF, 0x80},
+{VIACR, CR42, 0xFF, 0x00},
+{VIACR, CR55, 0x80, 0x00},
+{VIACR, CR5D, 0x80, 0x00},      /*Horizontal Retrace Start bit[11] should be 0*/
+{VIACR, CR62, 0xFF, 0x00},      /* Secondary Display Starting Address */
+{VIACR, CR63, 0xFF, 0x00},      /* Secondary Display Starting Address */
+{VIACR, CR64, 0xFF, 0x00},      /* Secondary Display Starting Address */
+{VIACR, CR68, 0xFF, 0x67},      /* Default FIFO For IGA2 */
+{VIACR, CR69, 0xFF, 0x00},
+{VIACR, CR6A, 0xFD, 0x40},
+{VIACR, CR6B, 0xFF, 0x00},
+{VIACR, CR6C, 0xFF, 0x00},
+{VIACR, CR77, 0xFF, 0x00},      /* LCD scaling Factor */
+{VIACR, CR78, 0xFF, 0x00},      /* LCD scaling Factor */
+{VIACR, CR79, 0xFF, 0x00},      /* LCD scaling Factor */
+{VIACR, CR9F, 0x03, 0x00},      /* LCD scaling Factor */
+{VIACR, CR7A, 0xFF, 0x01},      /* LCD Scaling Parameter 1 */
+{VIACR, CR7B, 0xFF, 0x02},      /* LCD Scaling Parameter 2 */
+{VIACR, CR7C, 0xFF, 0x03},      /* LCD Scaling Parameter 3 */
+{VIACR, CR7D, 0xFF, 0x04},      /* LCD Scaling Parameter 4 */
+{VIACR, CR7E, 0xFF, 0x07},      /* LCD Scaling Parameter 5 */
+{VIACR, CR7F, 0xFF, 0x0A},      /* LCD Scaling Parameter 6 */
+{VIACR, CR80, 0xFF, 0x0D},      /* LCD Scaling Parameter 7 */
+{VIACR, CR81, 0xFF, 0x13},      /* LCD Scaling Parameter 8 */
+{VIACR, CR82, 0xFF, 0x16},      /* LCD Scaling Parameter 9 */
+{VIACR, CR83, 0xFF, 0x19},      /* LCD Scaling Parameter 10 */
+{VIACR, CR84, 0xFF, 0x1C},      /* LCD Scaling Parameter 11 */
+{VIACR, CR85, 0xFF, 0x1D},      /* LCD Scaling Parameter 12 */
+{VIACR, CR86, 0xFF, 0x1E},      /* LCD Scaling Parameter 13 */
+{VIACR, CR87, 0xFF, 0x1F},      /* LCD Scaling Parameter 14 */
+{VIACR, CR88, 0xFF, 0x40},      /* LCD Panel Type */
+{VIACR, CR89, 0xFF, 0x00},      /* LCD Timing Control 0 */
+{VIACR, CR8A, 0xFF, 0x88},      /* LCD Timing Control 1 */
+{VIACR, CR8B, 0xFF, 0x5D},      /* LCD Power Sequence Control 0 */
+{VIACR, CR8C, 0xFF, 0x2B},      /* LCD Power Sequence Control 1 */
+{VIACR, CR8D, 0xFF, 0x6F},      /* LCD Power Sequence Control 2 */
+{VIACR, CR8E, 0xFF, 0x2B},      /* LCD Power Sequence Control 3 */
+{VIACR, CR8F, 0xFF, 0x01},      /* LCD Power Sequence Control 4 */
+{VIACR, CR90, 0xFF, 0x01},      /* LCD Power Sequence Control 5 */
+{VIACR, CR91, 0xFF, 0xA0},      /* 24/12 bit LVDS Data off */
+{VIACR, CR96, 0xFF, 0x00},
+{VIACR, CR97, 0xFF, 0x00},
+{VIACR, CR99, 0xFF, 0x00},
+{VIACR, CR9B, 0xFF, 0x00},
+{VIACR, CR9D, 0xFF, 0x80},
+{VIACR, CR9E, 0xFF, 0x80}
+};
+
+struct io_reg KM400_ModeXregs[] = {
+        {VIASR, SR10, 0xFF, 0x01},      /* Unlock Register                 */
+        {VIASR, SR16, 0xFF, 0x08},      /* Display FIFO threshold Control  */
+        {VIASR, SR17, 0xFF, 0x1F},      /* Display FIFO Control            */
+        {VIASR, SR18, 0xFF, 0x4E},      /* GFX PREQ threshold              */
+        {VIASR, SR1A, 0xFF, 0x0a},      /* GFX PREQ threshold              */
+        {VIASR, SR1F, 0xFF, 0x00},      /* Memory Control 0                */
+        {VIASR, SR1B, 0xFF, 0xF0},      /* Power Management Control 0      */
+        {VIASR, SR1E, 0xFF, 0x01},      /* Power Management Control        */
+        {VIASR, SR20, 0xFF, 0x00},      /* Sequencer Arbiter Control 0     */
+        {VIASR, SR21, 0xFF, 0x00},      /* Sequencer Arbiter Control 1     */
+        {VIASR, SR22, 0xFF, 0x1F},      /* Display Arbiter Control 1       */
+        {VIASR, SR2A, 0xFF, 0x00},      /* Power Management Control 5      */
+        {VIASR, SR2D, 0xFF, 0xFF},      /* Power Management Control 1      */
+        {VIASR, SR2E, 0xFF, 0xFF},      /* Power Management Control 2      */
+        {VIACR, CR0A, 0xFF, 0x1E},      /* Cursor Start                    */
+        {VIACR, CR0B, 0xFF, 0x00},      /* Cursor End                      */
+        {VIACR, CR0E, 0xFF, 0x00},      /* Cursor Location High            */
+        {VIACR, CR0F, 0xFF, 0x00},      /* Cursor Localtion Low            */
+        {VIACR, CR33, 0xFF, 0x00},
+        {VIACR, CR55, 0x80, 0x00},
+        {VIACR, CR5D, 0x80, 0x00},
+        {VIACR, CR36, 0xFF, 0x01},      /* Power Mangement 3                  */
+        {VIACR, CR62, 0xFF, 0x00},      /* Secondary Display Starting Address */
+        {VIACR, CR63, 0xFF, 0x00},      /* Secondary Display Starting Address */
+        {VIACR, CR64, 0xFF, 0x00},      /* Secondary Display Starting Address */
+        {VIACR, CR68, 0xFF, 0x67},      /* Default FIFO For IGA2              */
+        {VIACR, CR6A, 0x20, 0x20},      /* Extended FIFO On                   */
+        {VIACR, CR7A, 0xFF, 0x01},      /* LCD Scaling Parameter 1            */
+        {VIACR, CR7B, 0xFF, 0x02},      /* LCD Scaling Parameter 2            */
+        {VIACR, CR7C, 0xFF, 0x03},      /* LCD Scaling Parameter 3            */
+        {VIACR, CR7D, 0xFF, 0x04},      /* LCD Scaling Parameter 4            */
+        {VIACR, CR7E, 0xFF, 0x07},      /* LCD Scaling Parameter 5            */
+        {VIACR, CR7F, 0xFF, 0x0A},      /* LCD Scaling Parameter 6            */
+        {VIACR, CR80, 0xFF, 0x0D},      /* LCD Scaling Parameter 7            */
+        {VIACR, CR81, 0xFF, 0x13},      /* LCD Scaling Parameter 8            */
+        {VIACR, CR82, 0xFF, 0x16},      /* LCD Scaling Parameter 9            */
+        {VIACR, CR83, 0xFF, 0x19},      /* LCD Scaling Parameter 10           */
+        {VIACR, CR84, 0xFF, 0x1C},      /* LCD Scaling Parameter 11           */
+        {VIACR, CR85, 0xFF, 0x1D},      /* LCD Scaling Parameter 12           */
+        {VIACR, CR86, 0xFF, 0x1E},      /* LCD Scaling Parameter 13           */
+        {VIACR, CR87, 0xFF, 0x1F},      /* LCD Scaling Parameter 14           */
+        {VIACR, CR88, 0xFF, 0x40},      /* LCD Panel Type                     */
+        {VIACR, CR89, 0xFF, 0x00},      /* LCD Timing Control 0               */
+        {VIACR, CR8A, 0xFF, 0x88},      /* LCD Timing Control 1               */
+        {VIACR, CR8B, 0xFF, 0x2D},      /* LCD Power Sequence Control 0       */
+        {VIACR, CR8C, 0xFF, 0x2D},      /* LCD Power Sequence Control 1       */
+        {VIACR, CR8D, 0xFF, 0xC8},      /* LCD Power Sequence Control 2       */
+        {VIACR, CR8E, 0xFF, 0x36},      /* LCD Power Sequence Control 3       */
+        {VIACR, CR8F, 0xFF, 0x00},      /* LCD Power Sequence Control 4       */
+        {VIACR, CR90, 0xFF, 0x10},      /* LCD Power Sequence Control 5       */
+        {VIACR, CR91, 0xFF, 0xA0},      /* 24/12 bit LVDS Data off            */
+        {VIACR, CR96, 0xFF, 0x03},      /* DVP0        ; DVP0 Clock Skew */
+        {VIACR, CR97, 0xFF, 0x03},      /* DFP high    ; DFPH Clock Skew */
+        {VIACR, CR99, 0xFF, 0x03},      /* DFP low           ; DFPL Clock Skew*/
+        {VIACR, CR9B, 0xFF, 0x07}       /* DVI on DVP1       ; DVP1 Clock Skew*/
+};
+
+/* For VT3324: Common Setting for Video Mode */
+struct io_reg CX700_ModeXregs[] = { {VIASR, SR10, 0xFF, 0x01},
+{VIASR, SR15, 0x02, 0x02},
+{VIASR, SR16, 0xBF, 0x08},
+{VIASR, SR17, 0xFF, 0x1F},
+{VIASR, SR18, 0xFF, 0x4E},
+{VIASR, SR1A, 0xFB, 0x08},
+{VIASR, SR1B, 0xFF, 0xF0},
+{VIASR, SR1E, 0xFF, 0x01},
+{VIASR, SR2A, 0xFF, 0x00},
+{VIASR, SR2D, 0xFF, 0xFF},      /* VCK and LCK PLL power on.           */
+{VIACR, CR0A, 0xFF, 0x1E},      /* Cursor Start                        */
+{VIACR, CR0B, 0xFF, 0x00},      /* Cursor End                          */
+{VIACR, CR0E, 0xFF, 0x00},      /* Cursor Location High                */
+{VIACR, CR0F, 0xFF, 0x00},      /* Cursor Localtion Low                */
+{VIACR, CR32, 0xFF, 0x00},
+{VIACR, CR33, 0xFF, 0x00},
+{VIACR, CR34, 0xFF, 0x00},
+{VIACR, CR35, 0xFF, 0x00},
+{VIACR, CR36, 0x08, 0x00},
+{VIACR, CR47, 0xC8, 0x00},      /* Clear VCK Plus. */
+{VIACR, CR62, 0xFF, 0x00},      /* Secondary Display Starting Address  */
+{VIACR, CR63, 0xFF, 0x00},      /* Secondary Display Starting Address  */
+{VIACR, CR64, 0xFF, 0x00},      /* Secondary Display Starting Address  */
+{VIACR, CRA3, 0xFF, 0x00},      /* Secondary Display Starting Address  */
+{VIACR, CR69, 0xFF, 0x00},
+{VIACR, CR6A, 0xFF, 0x40},
+{VIACR, CR6B, 0xFF, 0x00},
+{VIACR, CR6C, 0xFF, 0x00},
+{VIACR, CR7A, 0xFF, 0x01},      /* LCD Scaling Parameter 1             */
+{VIACR, CR7B, 0xFF, 0x02},      /* LCD Scaling Parameter 2             */
+{VIACR, CR7C, 0xFF, 0x03},      /* LCD Scaling Parameter 3             */
+{VIACR, CR7D, 0xFF, 0x04},      /* LCD Scaling Parameter 4             */
+{VIACR, CR7E, 0xFF, 0x07},      /* LCD Scaling Parameter 5             */
+{VIACR, CR7F, 0xFF, 0x0A},      /* LCD Scaling Parameter 6             */
+{VIACR, CR80, 0xFF, 0x0D},      /* LCD Scaling Parameter 7             */
+{VIACR, CR81, 0xFF, 0x13},      /* LCD Scaling Parameter 8             */
+{VIACR, CR82, 0xFF, 0x16},      /* LCD Scaling Parameter 9             */
+{VIACR, CR83, 0xFF, 0x19},      /* LCD Scaling Parameter 10            */
+{VIACR, CR84, 0xFF, 0x1C},      /* LCD Scaling Parameter 11            */
+{VIACR, CR85, 0xFF, 0x1D},      /* LCD Scaling Parameter 12            */
+{VIACR, CR86, 0xFF, 0x1E},      /* LCD Scaling Parameter 13            */
+{VIACR, CR87, 0xFF, 0x1F},      /* LCD Scaling Parameter 14            */
+{VIACR, CR88, 0xFF, 0x40},      /* LCD Panel Type                      */
+{VIACR, CR89, 0xFF, 0x00},      /* LCD Timing Control 0                */
+{VIACR, CR8A, 0xFF, 0x88},      /* LCD Timing Control 1                */
+{VIACR, CRD4, 0xFF, 0x81},      /* Second power sequence control       */
+{VIACR, CR8B, 0xFF, 0x5D},      /* LCD Power Sequence Control 0        */
+{VIACR, CR8C, 0xFF, 0x2B},      /* LCD Power Sequence Control 1        */
+{VIACR, CR8D, 0xFF, 0x6F},      /* LCD Power Sequence Control 2        */
+{VIACR, CR8E, 0xFF, 0x2B},      /* LCD Power Sequence Control 3        */
+{VIACR, CR8F, 0xFF, 0x01},      /* LCD Power Sequence Control 4        */
+{VIACR, CR90, 0xFF, 0x01},      /* LCD Power Sequence Control 5        */
+{VIACR, CR91, 0xFF, 0x80},      /* 24/12 bit LVDS Data off             */
+{VIACR, CR96, 0xFF, 0x00},
+{VIACR, CR97, 0xFF, 0x00},
+{VIACR, CR99, 0xFF, 0x00},
+{VIACR, CR9B, 0xFF, 0x00},
+{VIACR, CRD2, 0xFF, 0xFF}       /* TMDS/LVDS control register.         */
+};
+
+/* For VT3353: Common Setting for Video Mode */
+struct io_reg VX800_ModeXregs[] = { {VIASR, SR10, 0xFF, 0x01},
+{VIASR, SR15, 0x02, 0x02},
+{VIASR, SR16, 0xBF, 0x08},
+{VIASR, SR17, 0xFF, 0x1F},
+{VIASR, SR18, 0xFF, 0x4E},
+{VIASR, SR1A, 0xFB, 0x08},
+{VIASR, SR1B, 0xFF, 0xF0},
+{VIASR, SR1E, 0xFF, 0x01},
+{VIASR, SR2A, 0xFF, 0x00},
+{VIASR, SR2D, 0xFF, 0xFF},      /* VCK and LCK PLL power on.           */
+{VIACR, CR0A, 0xFF, 0x1E},      /* Cursor Start                        */
+{VIACR, CR0B, 0xFF, 0x00},      /* Cursor End                          */
+{VIACR, CR0E, 0xFF, 0x00},      /* Cursor Location High                */
+{VIACR, CR0F, 0xFF, 0x00},      /* Cursor Localtion Low                */
+{VIACR, CR32, 0xFF, 0x00},
+{VIACR, CR33, 0xFF, 0x00},
+{VIACR, CR34, 0xFF, 0x00},
+{VIACR, CR35, 0xFF, 0x00},
+{VIACR, CR36, 0x08, 0x00},
+{VIACR, CR47, 0xC8, 0x00},      /* Clear VCK Plus. */
+{VIACR, CR62, 0xFF, 0x00},      /* Secondary Display Starting Address  */
+{VIACR, CR63, 0xFF, 0x00},      /* Secondary Display Starting Address  */
+{VIACR, CR64, 0xFF, 0x00},      /* Secondary Display Starting Address  */
+{VIACR, CRA3, 0xFF, 0x00},      /* Secondary Display Starting Address  */
+{VIACR, CR69, 0xFF, 0x00},
+{VIACR, CR6A, 0xFF, 0x40},
+{VIACR, CR6B, 0xFF, 0x00},
+{VIACR, CR6C, 0xFF, 0x00},
+{VIACR, CR7A, 0xFF, 0x01},      /* LCD Scaling Parameter 1             */
+{VIACR, CR7B, 0xFF, 0x02},      /* LCD Scaling Parameter 2             */
+{VIACR, CR7C, 0xFF, 0x03},      /* LCD Scaling Parameter 3             */
+{VIACR, CR7D, 0xFF, 0x04},      /* LCD Scaling Parameter 4             */
+{VIACR, CR7E, 0xFF, 0x07},      /* LCD Scaling Parameter 5             */
+{VIACR, CR7F, 0xFF, 0x0A},      /* LCD Scaling Parameter 6             */
+{VIACR, CR80, 0xFF, 0x0D},      /* LCD Scaling Parameter 7             */
+{VIACR, CR81, 0xFF, 0x13},      /* LCD Scaling Parameter 8             */
+{VIACR, CR82, 0xFF, 0x16},      /* LCD Scaling Parameter 9             */
+{VIACR, CR83, 0xFF, 0x19},      /* LCD Scaling Parameter 10            */
+{VIACR, CR84, 0xFF, 0x1C},      /* LCD Scaling Parameter 11            */
+{VIACR, CR85, 0xFF, 0x1D},      /* LCD Scaling Parameter 12            */
+{VIACR, CR86, 0xFF, 0x1E},      /* LCD Scaling Parameter 13            */
+{VIACR, CR87, 0xFF, 0x1F},      /* LCD Scaling Parameter 14            */
+{VIACR, CR88, 0xFF, 0x40},      /* LCD Panel Type                      */
+{VIACR, CR89, 0xFF, 0x00},      /* LCD Timing Control 0                */
+{VIACR, CR8A, 0xFF, 0x88},      /* LCD Timing Control 1                */
+{VIACR, CRD4, 0xFF, 0x81},      /* Second power sequence control       */
+{VIACR, CR8B, 0xFF, 0x5D},      /* LCD Power Sequence Control 0        */
+{VIACR, CR8C, 0xFF, 0x2B},      /* LCD Power Sequence Control 1        */
+{VIACR, CR8D, 0xFF, 0x6F},      /* LCD Power Sequence Control 2        */
+{VIACR, CR8E, 0xFF, 0x2B},      /* LCD Power Sequence Control 3        */
+{VIACR, CR8F, 0xFF, 0x01},      /* LCD Power Sequence Control 4        */
+{VIACR, CR90, 0xFF, 0x01},      /* LCD Power Sequence Control 5        */
+{VIACR, CR91, 0xFF, 0x80},      /* 24/12 bit LVDS Data off             */
+{VIACR, CR96, 0xFF, 0x00},
+{VIACR, CR97, 0xFF, 0x00},
+{VIACR, CR99, 0xFF, 0x00},
+{VIACR, CR9B, 0xFF, 0x00},
+{VIACR, CRD2, 0xFF, 0xFF}       /* TMDS/LVDS control register.         */
+};
+
+/* Video Mode Table */
+/* Common Setting for Video Mode */
+struct io_reg CLE266_ModeXregs[] = { {VIASR, SR1E, 0xF0, 0x00},
+{VIASR, SR2A, 0x0F, 0x00},
+{VIASR, SR15, 0x02, 0x02},
+{VIASR, SR16, 0xBF, 0x08},
+{VIASR, SR17, 0xFF, 0x1F},
+{VIASR, SR18, 0xFF, 0x4E},
+{VIASR, SR1A, 0xFB, 0x08},
+
+{VIACR, CR32, 0xFF, 0x00},
+{VIACR, CR34, 0xFF, 0x00},
+{VIACR, CR35, 0xFF, 0x00},
+{VIACR, CR36, 0x08, 0x00},
+{VIACR, CR6A, 0xFF, 0x80},
+{VIACR, CR6A, 0xFF, 0xC0},
+
+{VIACR, CR55, 0x80, 0x00},
+{VIACR, CR5D, 0x80, 0x00},
+
+{VIAGR, GR20, 0xFF, 0x00},
+{VIAGR, GR21, 0xFF, 0x00},
+{VIAGR, GR22, 0xFF, 0x00},
+        /* LCD Parameters */
+{VIACR, CR7A, 0xFF, 0x01},      /* LCD Parameter 1 */
+{VIACR, CR7B, 0xFF, 0x02},      /* LCD Parameter 2 */
+{VIACR, CR7C, 0xFF, 0x03},      /* LCD Parameter 3 */
+{VIACR, CR7D, 0xFF, 0x04},      /* LCD Parameter 4 */
+{VIACR, CR7E, 0xFF, 0x07},      /* LCD Parameter 5 */
+{VIACR, CR7F, 0xFF, 0x0A},      /* LCD Parameter 6 */
+{VIACR, CR80, 0xFF, 0x0D},      /* LCD Parameter 7 */
+{VIACR, CR81, 0xFF, 0x13},      /* LCD Parameter 8 */
+{VIACR, CR82, 0xFF, 0x16},      /* LCD Parameter 9 */
+{VIACR, CR83, 0xFF, 0x19},      /* LCD Parameter 10 */
+{VIACR, CR84, 0xFF, 0x1C},      /* LCD Parameter 11 */
+{VIACR, CR85, 0xFF, 0x1D},      /* LCD Parameter 12 */
+{VIACR, CR86, 0xFF, 0x1E},      /* LCD Parameter 13 */
+{VIACR, CR87, 0xFF, 0x1F},      /* LCD Parameter 14 */
+
+};
+
+/* Mode:1024X768 */
+struct io_reg PM1024x768[] = { {VIASR, 0x16, 0xBF, 0x0C},
+{VIASR, 0x18, 0xFF, 0x4C}
+};
+
+struct patch_table res_patch_table[] = {
+        {VIA_RES_1024X768, ARRAY_SIZE(PM1024x768), PM1024x768}
+};
+
+/* struct VPITTable {
+        unsigned char  Misc;
+        unsigned char  SR[StdSR];
+        unsigned char  CR[StdCR];
+        unsigned char  GR[StdGR];
+        unsigned char  AR[StdAR];
+ };*/
+
+struct VPITTable VPIT = {
+        /* Msic */
+        0xC7,
+        /* Sequencer */
+        {0x01, 0x0F, 0x00, 0x0E},
+        /* Graphic Controller */
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0F, 0xFF},
+        /* Attribute Controller */
+        {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+         0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+         0x01, 0x00, 0x0F, 0x00}
+};
+
+/********************/
+/* Mode Table       */
+/********************/
+
+/* 480x640 */
+struct crt_mode_table CRTM480x640[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_25_175M, M480X640_R60_HSP, M480X640_R60_VSP,
+         {624, 480, 480, 144, 504, 48, 663, 640, 640, 23, 641, 3} }     /* GTF*/
+};
+
+/* 640x480*/
+struct crt_mode_table CRTM640x480[] = {
+        /*r_rate,vclk,hsp,vsp */
+        /*HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_25_175M, M640X480_R60_HSP, M640X480_R60_VSP,
+         {800, 640, 648, 144, 656, 96, 525, 480, 480, 45, 490, 2} },
+        {REFRESH_75, CLK_31_500M, M640X480_R75_HSP, M640X480_R75_VSP,
+         {840, 640, 640, 200, 656, 64, 500, 480, 480, 20, 481, 3} },
+        {REFRESH_85, CLK_36_000M, M640X480_R85_HSP, M640X480_R85_VSP,
+         {832, 640, 640, 192, 696, 56, 509, 480, 480, 29, 481, 3} },
+        {REFRESH_100, CLK_43_163M, M640X480_R100_HSP, M640X480_R100_VSP,
+         {848, 640, 640, 208, 680, 64, 509, 480, 480, 29, 481, 3} }, /*GTF*/
+            {REFRESH_120, CLK_52_406M, M640X480_R120_HSP,
+             M640X480_R120_VSP,
+             {848, 640, 640, 208, 680, 64, 515, 480, 480, 35, 481,
+              3} } /*GTF*/
+};
+
+/*720x480 (GTF)*/
+struct crt_mode_table CRTM720x480[] = {
+        /*r_rate,vclk,hsp,vsp      */
+        /*HT, HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_26_880M, M720X480_R60_HSP, M720X480_R60_VSP,
+         {896, 720, 720, 176, 736, 72, 497, 480, 480, 17, 481, 3} }
+
+};
+
+/*720x576 (GTF)*/
+struct crt_mode_table CRTM720x576[] = {
+        /*r_rate,vclk,hsp,vsp */
+        /*HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_32_668M, M720X576_R60_HSP, M720X576_R60_VSP,
+         {912, 720, 720, 192, 744, 72, 597, 576, 576, 21, 577, 3} }
+};
+
+/* 800x480 (CVT) */
+struct crt_mode_table CRTM800x480[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_29_581M, M800X480_R60_HSP, M800X480_R60_VSP,
+         {992, 800, 800, 192, 824, 72, 500, 480, 480, 20, 483, 7} }
+};
+
+/* 800x600*/
+struct crt_mode_table CRTM800x600[] = {
+        /*r_rate,vclk,hsp,vsp     */
+        /*HT,   HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_40_000M, M800X600_R60_HSP, M800X600_R60_VSP,
+         {1056, 800, 800, 256, 840, 128, 628, 600, 600, 28, 601, 4} },
+        {REFRESH_75, CLK_49_500M, M800X600_R75_HSP, M800X600_R75_VSP,
+         {1056, 800, 800, 256, 816, 80, 625, 600, 600, 25, 601, 3} },
+        {REFRESH_85, CLK_56_250M, M800X600_R85_HSP, M800X600_R85_VSP,
+         {1048, 800, 800, 248, 832, 64, 631, 600, 600, 31, 601, 3} },
+        {REFRESH_100, CLK_68_179M, M800X600_R100_HSP, M800X600_R100_VSP,
+         {1072, 800, 800, 272, 848, 88, 636, 600, 600, 36, 601, 3} },
+        {REFRESH_120, CLK_83_950M, M800X600_R120_HSP,
+                  M800X600_R120_VSP,
+                  {1088, 800, 800, 288, 856, 88, 643, 600, 600, 43, 601,
+                   3} }
+};
+
+/* 848x480 (CVT) */
+struct crt_mode_table CRTM848x480[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_31_500M, M848X480_R60_HSP, M848X480_R60_VSP,
+         {1056, 848, 848, 208, 872, 80, 500, 480, 480, 20, 483, 5} }
+};
+
+/*856x480 (GTF) convert to 852x480*/
+struct crt_mode_table CRTM852x480[] = {
+        /*r_rate,vclk,hsp,vsp     */
+        /*HT,   HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_31_728M, M852X480_R60_HSP, M852X480_R60_VSP,
+        {1064, 856, 856, 208, 872, 88, 497, 480, 480, 17, 481, 3} }
+};
+
+/*1024x512 (GTF)*/
+struct crt_mode_table CRTM1024x512[] = {
+        /*r_rate,vclk,hsp,vsp     */
+        /*HT,   HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_41_291M, M1024X512_R60_HSP, M1024X512_R60_VSP,
+         {1296, 1024, 1024, 272, 1056, 104, 531, 512, 512, 19, 513, 3} }
+
+};
+
+/* 1024x600*/
+struct crt_mode_table CRTM1024x600[] = {
+        /*r_rate,vclk,hsp,vsp */
+        /*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_48_875M, M1024X600_R60_HSP, M1024X600_R60_VSP,
+         {1312, 1024, 1024, 288, 1064, 104, 622, 600, 600, 22, 601, 3} },
+};
+
+/* 1024x768*/
+struct crt_mode_table CRTM1024x768[] = {
+        /*r_rate,vclk,hsp,vsp */
+        /*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_65_000M, M1024X768_R60_HSP, M1024X768_R60_VSP,
+        {1344, 1024, 1024, 320, 1048, 136, 806, 768, 768, 38, 771, 6} },
+        {REFRESH_75, CLK_78_750M, M1024X768_R75_HSP, M1024X768_R75_VSP,
+        {1312, 1024, 1024, 288, 1040, 96, 800, 768, 768, 32, 769, 3} },
+        {REFRESH_85, CLK_94_500M, M1024X768_R85_HSP, M1024X768_R85_VSP,
+        {1376, 1024, 1024, 352, 1072, 96, 808, 768, 768, 40, 769, 3} },
+        {REFRESH_100, CLK_113_309M, M1024X768_R100_HSP, M1024X768_R100_VSP,
+        {1392, 1024, 1024, 368, 1096, 112, 814, 768, 768, 46, 769, 3} }
+};
+
+/* 1152x864*/
+struct crt_mode_table CRTM1152x864[] = {
+        /*r_rate,vclk,hsp,vsp      */
+        /*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_75, CLK_108_000M, M1152X864_R75_HSP, M1152X864_R75_VSP,
+         {1600, 1152, 1152, 448, 1216, 128, 900, 864, 864, 36, 865, 3} }
+
+};
+
+/* 1280x720 (HDMI 720P)*/
+struct crt_mode_table CRTM1280x720[] = {
+        /*r_rate,vclk,hsp,vsp */
+        /*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE      */
+        {REFRESH_60, CLK_74_481M, M1280X720_R60_HSP, M1280X720_R60_VSP,
+         {1648, 1280, 1280, 368, 1392, 40, 750, 720, 720, 30, 725, 5} },
+        {REFRESH_50, CLK_60_466M, M1280X720_R50_HSP, M1280X720_R50_VSP,
+         {1632, 1280, 1280, 352, 1328, 128, 741, 720, 720, 21, 721, 3} }
+};
+
+/*1280x768 (GTF)*/
+struct crt_mode_table CRTM1280x768[] = {
+        /*r_rate,vclk,hsp,vsp     */
+        /*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_80_136M, M1280X768_R60_HSP, M1280X768_R60_VSP,
+         {1680, 1280, 1280, 400, 1344, 136, 795, 768, 768, 27, 769, 3} },
+        {REFRESH_50, CLK_65_178M, M1280X768_R50_HSP, M1280X768_R50_VSP,
+         {1648, 1280, 1280, 368, 1336, 128, 791, 768, 768, 23, 769, 3} }
+};
+
+/* 1280x800 (CVT) */
+struct crt_mode_table CRTM1280x800[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_83_375M, M1280X800_R60_HSP, M1280X800_R60_VSP,
+         {1680, 1280, 1280, 400, 1352, 128, 831, 800, 800, 31, 803, 6} }
+};
+
+/*1280x960*/
+struct crt_mode_table CRTM1280x960[] = {
+        /*r_rate,vclk,hsp,vsp */
+        /*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_108_000M, M1280X960_R60_HSP, M1280X960_R60_VSP,
+         {1800, 1280, 1280, 520, 1376, 112, 1000, 960, 960, 40, 961, 3} }
+};
+
+/* 1280x1024*/
+struct crt_mode_table CRTM1280x1024[] = {
+        /*r_rate,vclk,,hsp,vsp */
+        /*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_108_000M, M1280X1024_R60_HSP, M1280X1024_R60_VSP,
+         {1688, 1280, 1280, 408, 1328, 112, 1066, 1024, 1024, 42, 1025,
+          3} },
+        {REFRESH_75, CLK_135_000M, M1280X1024_R75_HSP, M1280X1024_R75_VSP,
+         {1688, 1280, 1280, 408, 1296, 144, 1066, 1024, 1024, 42, 1025,
+          3} },
+        {REFRESH_85, CLK_157_500M, M1280X1024_R85_HSP, M1280X1024_R85_VSP,
+         {1728, 1280, 1280, 448, 1344, 160, 1072, 1024, 1024, 48, 1025, 3} }
+};
+
+/* 1368x768 (GTF) */
+struct crt_mode_table CRTM1368x768[] = {
+        /* r_rate,  vclk, hsp, vsp */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_85_860M, M1368X768_R60_HSP, M1368X768_R60_VSP,
+         {1800, 1368, 1368, 432, 1440, 144, 795, 768, 768, 27, 769, 3} }
+};
+
+/*1440x1050 (GTF)*/
+struct crt_mode_table CRTM1440x1050[] = {
+        /*r_rate,vclk,hsp,vsp      */
+        /*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_125_104M, M1440X1050_R60_HSP, M1440X1050_R60_VSP,
+         {1936, 1440, 1440, 496, 1536, 152, 1077, 1040, 1040, 37, 1041, 3} }
+};
+
+/* 1600x1200*/
+struct crt_mode_table CRTM1600x1200[] = {
+        /*r_rate,vclk,hsp,vsp */
+        /*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_162_000M, M1600X1200_R60_HSP, M1600X1200_R60_VSP,
+         {2160, 1600, 1600, 560, 1664, 192, 1250, 1200, 1200, 50, 1201,
+          3} },
+        {REFRESH_75, CLK_202_500M, M1600X1200_R75_HSP, M1600X1200_R75_VSP,
+         {2160, 1600, 1600, 560, 1664, 192, 1250, 1200, 1200, 50, 1201, 3} }
+
+};
+
+/* 1680x1050 (CVT) */
+struct crt_mode_table CRTM1680x1050[] = {
+        /* r_rate,          vclk,              hsp,             vsp  */
+        /* HT,  HA,  HBS, HBE, HSS, HSE,    VT,  VA,  VBS, VBE,  VSS, VSE */
+        {REFRESH_60, CLK_146_760M, M1680x1050_R60_HSP, M1680x1050_R60_VSP,
+         {2240, 1680, 1680, 560, 1784, 176, 1089, 1050, 1050, 39, 1053,
+          6} },
+        {REFRESH_75, CLK_187_000M, M1680x1050_R75_HSP, M1680x1050_R75_VSP,
+         {2272, 1680, 1680, 592, 1800, 176, 1099, 1050, 1050, 49, 1053, 6} }
+};
+
+/* 1680x1050 (CVT Reduce Blanking) */
+struct crt_mode_table CRTM1680x1050_RB[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE,    VT,  VA,  VBS, VBE,  VSS, VSE */
+        {REFRESH_60, CLK_119_000M, M1680x1050_RB_R60_HSP,
+         M1680x1050_RB_R60_VSP,
+         {1840, 1680, 1680, 160, 1728, 32, 1080, 1050, 1050, 30, 1053, 6} }
+};
+
+/* 1920x1080 (CVT)*/
+struct crt_mode_table CRTM1920x1080[] = {
+        /*r_rate,vclk,hsp,vsp */
+        /*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_172_798M, M1920X1080_R60_HSP, M1920X1080_R60_VSP,
+         {2576, 1920, 1920, 656, 2048, 200, 1120, 1080, 1080, 40, 1083, 5} }
+};
+
+/* 1920x1080 (CVT with Reduce Blanking) */
+struct crt_mode_table CRTM1920x1080_RB[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_138_400M, M1920X1080_RB_R60_HSP,
+         M1920X1080_RB_R60_VSP,
+         {2080, 1920, 1920, 160, 1968, 32, 1111, 1080, 1080, 31, 1083, 5} }
+};
+
+/* 1920x1440*/
+struct crt_mode_table CRTM1920x1440[] = {
+        /*r_rate,vclk,hsp,vsp */
+        /*HT,  HA,   HBS,  HBE, HSS,  HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_234_000M, M1920X1440_R60_HSP, M1920X1440_R60_VSP,
+         {2600, 1920, 1920, 680, 2048, 208, 1500, 1440, 1440, 60, 1441,
+          3} },
+        {REFRESH_75, CLK_297_500M, M1920X1440_R75_HSP, M1920X1440_R75_VSP,
+         {2640, 1920, 1920, 720, 2064, 224, 1500, 1440, 1440, 60, 1441, 3} }
+};
+
+/* 1400x1050 (CVT) */
+struct crt_mode_table CRTM1400x1050[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE,  HSS, HSE,   VT,  VA,  VBS, VBE,  VSS, VSE */
+        {REFRESH_60, CLK_121_750M, M1400X1050_R60_HSP, M1400X1050_R60_VSP,
+         {1864, 1400, 1400, 464, 1488, 144, 1089, 1050, 1050, 39, 1053,
+          4} },
+        {REFRESH_75, CLK_156_000M, M1400X1050_R75_HSP, M1400X1050_R75_VSP,
+         {1896, 1400, 1400, 496, 1504, 144, 1099, 1050, 1050, 49, 1053, 4} }
+};
+
+/* 1400x1050 (CVT Reduce Blanking) */
+struct crt_mode_table CRTM1400x1050_RB[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE,  HSS, HSE,   VT,  VA,  VBS, VBE,  VSS, VSE */
+        {REFRESH_60, CLK_101_000M, M1400X1050_RB_R60_HSP,
+         M1400X1050_RB_R60_VSP,
+         {1560, 1400, 1400, 160, 1448, 32, 1080, 1050, 1050, 30, 1053, 4} }
+};
+
+/* 960x600 (CVT) */
+struct crt_mode_table CRTM960x600[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_45_250M, M960X600_R60_HSP, M960X600_R60_VSP,
+         {1216, 960, 960, 256, 992, 96, 624, 600, 600, 24, 603, 6} }
+};
+
+/* 1000x600 (GTF) */
+struct crt_mode_table CRTM1000x600[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_48_000M, M1000X600_R60_HSP, M1000X600_R60_VSP,
+         {1288, 1000, 1000, 288, 1040, 104, 622, 600, 600, 22, 601, 3} }
+};
+
+/* 1024x576 (GTF) */
+struct crt_mode_table CRTM1024x576[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_46_996M, M1024X576_R60_HSP, M1024X576_R60_VSP,
+         {1312, 1024, 1024, 288, 1064, 104, 597, 576, 576, 21, 577, 3} }
+};
+
+/* 1088x612 (CVT) */
+struct crt_mode_table CRTM1088x612[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_52_977M, M1088X612_R60_HSP, M1088X612_R60_VSP,
+         {1392, 1088, 1088, 304, 1136, 104, 636, 612, 612, 24, 615, 5} }
+};
+
+/* 1152x720 (CVT) */
+struct crt_mode_table CRTM1152x720[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_66_750M, M1152X720_R60_HSP, M1152X720_R60_VSP,
+         {1488, 1152, 1152, 336, 1208, 112, 748, 720, 720, 28, 723, 6} }
+};
+
+/* 1200x720 (GTF) */
+struct crt_mode_table CRTM1200x720[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_70_159M, M1200X720_R60_HSP, M1200X720_R60_VSP,
+         {1568, 1200, 1200, 368, 1256, 128, 746, 720, 720, 26, 721, 3} }
+};
+
+/* 1280x600 (GTF) */
+struct crt_mode_table CRTM1280x600[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE,  HSS, HSE, VT,  VA,  VBS, VBE,  VSS, VSE */
+        {REFRESH_60, CLK_61_500M, M1280x600_R60_HSP, M1280x600_R60_VSP,
+         {1648, 1280, 1280, 368, 1336, 128, 622, 600, 600, 22, 601, 3} }
+};
+
+/* 1360x768 (CVT) */
+struct crt_mode_table CRTM1360x768[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_84_750M, M1360X768_R60_HSP, M1360X768_R60_VSP,
+         {1776, 1360, 1360, 416, 1432, 136, 798, 768, 768, 30, 771, 5} }
+};
+
+/* 1360x768 (CVT Reduce Blanking) */
+struct crt_mode_table CRTM1360x768_RB[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_72_000M, M1360X768_RB_R60_HSP,
+         M1360X768_RB_R60_VSP,
+         {1520, 1360, 1360, 160, 1408, 32, 790, 768, 768, 22, 771, 5} }
+};
+
+/* 1366x768 (GTF) */
+struct crt_mode_table CRTM1366x768[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_85_860M, M1368X768_R60_HSP, M1368X768_R60_VSP,
+         {1800, 1368, 1368, 432, 1440, 144, 795, 768, 768, 27, 769, 3} },
+        {REFRESH_50, CLK_69_924M, M1368X768_R50_HSP, M1368X768_R50_VSP,
+         {1768, 1368, 1368, 400, 1424, 144, 791, 768, 768, 23, 769, 3} }
+};
+
+/* 1440x900 (CVT) */
+struct crt_mode_table CRTM1440x900[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_106_500M, M1440X900_R60_HSP, M1440X900_R60_VSP,
+         {1904, 1440, 1440, 464, 1520, 152, 934, 900, 900, 34, 903, 6} },
+        {REFRESH_75, CLK_136_700M, M1440X900_R75_HSP, M1440X900_R75_VSP,
+         {1936, 1440, 1440, 496, 1536, 152, 942, 900, 900, 42, 903, 6} }
+};
+
+/* 1440x900 (CVT Reduce Blanking) */
+struct crt_mode_table CRTM1440x900_RB[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_88_750M, M1440X900_RB_R60_HSP,
+         M1440X900_RB_R60_VSP,
+         {1600, 1440, 1440, 160, 1488, 32, 926, 900, 900, 26, 903, 6} }
+};
+
+/* 1600x900 (CVT) */
+struct crt_mode_table CRTM1600x900[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_118_840M, M1600X900_R60_HSP, M1600X900_R60_VSP,
+         {2112, 1600, 1600, 512, 1688, 168, 934, 900, 900, 34, 903, 5} }
+};
+
+/* 1600x900 (CVT Reduce Blanking) */
+struct crt_mode_table CRTM1600x900_RB[] = {
+        /* r_rate,        vclk,           hsp,        vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_97_750M, M1600X900_RB_R60_HSP,
+         M1600X900_RB_R60_VSP,
+         {1760, 1600, 1600, 160, 1648, 32, 926, 900, 900, 26, 903, 5} }
+};
+
+/* 1600x1024 (GTF) */
+struct crt_mode_table CRTM1600x1024[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE,  HSS, HSE,   VT,  VA,  VBS, VBE,  VSS, VSE */
+        {REFRESH_60, CLK_136_700M, M1600X1024_R60_HSP, M1600X1024_R60_VSP,
+         {2144, 1600, 1600, 544, 1704, 168, 1060, 1024, 1024, 36, 1025, 3} }
+};
+
+/* 1792x1344 (DMT) */
+struct crt_mode_table CRTM1792x1344[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE,  HSS, HSE,   VT,  VA,  VBS, VBE,  VSS, VSE */
+        {REFRESH_60, CLK_204_000M, M1792x1344_R60_HSP, M1792x1344_R60_VSP,
+         {2448, 1792, 1792, 656, 1920, 200, 1394, 1344, 1344, 50, 1345, 3} }
+};
+
+/* 1856x1392 (DMT) */
+struct crt_mode_table CRTM1856x1392[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE,  HSS, HSE,   VT,  VA,  VBS, VBE,  VSS, VSE */
+        {REFRESH_60, CLK_218_500M, M1856x1392_R60_HSP, M1856x1392_R60_VSP,
+         {2528, 1856, 1856, 672, 1952, 224, 1439, 1392, 1392, 47, 1393, 3} }
+};
+
+/* 1920x1200 (CVT) */
+struct crt_mode_table CRTM1920x1200[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_193_295M, M1920X1200_R60_HSP, M1920X1200_R60_VSP,
+         {2592, 1920, 1920, 672, 2056, 200, 1245, 1200, 1200, 45, 1203, 6} }
+};
+
+/* 1920x1200 (CVT with Reduce Blanking) */
+struct crt_mode_table CRTM1920x1200_RB[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
+        {REFRESH_60, CLK_153_920M, M1920X1200_RB_R60_HSP,
+         M1920X1200_RB_R60_VSP,
+         {2080, 1920, 1920, 160, 1968, 32, 1235, 1200, 1200, 35, 1203, 6} }
+};
+
+/* 2048x1536 (CVT) */
+struct crt_mode_table CRTM2048x1536[] = {
+        /* r_rate,          vclk,              hsp,             vsp   */
+        /* HT,  HA,  HBS, HBE,  HSS, HSE,   VT,  VA,  VBS, VBE,  VSS, VSE */
+        {REFRESH_60, CLK_267_250M, M2048x1536_R60_HSP, M2048x1536_R60_VSP,
+         {2800, 2048, 2048, 752, 2200, 224, 1592, 1536, 1536, 56, 1539, 4} }
+};
+
+/* Video Mode Table */
+/* struct VideoModeTable {*/
+/*  int                               ModeIndex;*/
+/*  struct crt_mode_table             *crtc;*/
+/*  int                               mode_array;*/
+/* };*/
+struct VideoModeTable CLE266Modes[] = {
+        /* Display : 480x640 (GTF) */
+        {VIA_RES_480X640, CRTM480x640, ARRAY_SIZE(CRTM480x640)},
+
+        /* Display : 640x480 */
+        {VIA_RES_640X480, CRTM640x480, ARRAY_SIZE(CRTM640x480)},
+
+        /* Display : 720x480 (GTF) */
+        {VIA_RES_720X480, CRTM720x480, ARRAY_SIZE(CRTM720x480)},
+
+        /* Display : 720x576 (GTF) */
+        {VIA_RES_720X576, CRTM720x576, ARRAY_SIZE(CRTM720x576)},
+
+        /* Display : 800x600 */
+        {VIA_RES_800X600, CRTM800x600, ARRAY_SIZE(CRTM800x600)},
+
+        /* Display : 800x480 (CVT) */
+        {VIA_RES_800X480, CRTM800x480, ARRAY_SIZE(CRTM800x480)},
+
+        /* Display : 848x480 (CVT) */
+        {VIA_RES_848X480, CRTM848x480, ARRAY_SIZE(CRTM848x480)},
+
+        /* Display : 852x480 (GTF) */
+        {VIA_RES_856X480, CRTM852x480, ARRAY_SIZE(CRTM852x480)},
+
+        /* Display : 1024x512 (GTF) */
+        {VIA_RES_1024X512, CRTM1024x512, ARRAY_SIZE(CRTM1024x512)},
+
+        /* Display : 1024x600 */
+        {VIA_RES_1024X600, CRTM1024x600, ARRAY_SIZE(CRTM1024x600)},
+
+        /* Display : 1024x576 (GTF) */
+        /*{ VIA_RES_1024X576, CRTM1024x576, ARRAY_SIZE(CRTM1024x576)}, */
+
+        /* Display : 1024x768 */
+        {VIA_RES_1024X768, CRTM1024x768, ARRAY_SIZE(CRTM1024x768)},
+
+        /* Display : 1152x864 */
+        {VIA_RES_1152X864, CRTM1152x864, ARRAY_SIZE(CRTM1152x864)},
+
+        /* Display : 1280x768 (GTF) */
+        {VIA_RES_1280X768, CRTM1280x768, ARRAY_SIZE(CRTM1280x768)},
+
+        /* Display : 960x600 (CVT) */
+        {VIA_RES_960X600, CRTM960x600, ARRAY_SIZE(CRTM960x600)},
+
+        /* Display : 1000x600 (GTF) */
+        {VIA_RES_1000X600, CRTM1000x600, ARRAY_SIZE(CRTM1000x600)},
+
+        /* Display : 1024x576 (GTF) */
+        {VIA_RES_1024X576, CRTM1024x576, ARRAY_SIZE(CRTM1024x576)},
+
+        /* Display : 1088x612 (GTF) */
+        {VIA_RES_1088X612, CRTM1088x612, ARRAY_SIZE(CRTM1088x612)},
+
+        /* Display : 1152x720 (CVT) */
+        {VIA_RES_1152X720, CRTM1152x720, ARRAY_SIZE(CRTM1152x720)},
+
+        /* Display : 1200x720 (GTF) */
+        {VIA_RES_1200X720, CRTM1200x720, ARRAY_SIZE(CRTM1200x720)},
+
+        /* Display : 1280x600 (GTF) */
+        {VIA_RES_1280X600, CRTM1280x600, ARRAY_SIZE(CRTM1280x600)},
+
+        /* Display : 1280x800 (CVT) */
+        {VIA_RES_1280X800, CRTM1280x800, ARRAY_SIZE(CRTM1280x800)},
+
+        /* Display : 1280x800 (GTF) */
+        /*{ M1280x800, CRTM1280x800, ARRAY_SIZE(CRTM1280x800)}, */
+
+        /* Display : 1280x960 */
+        {VIA_RES_1280X960, CRTM1280x960, ARRAY_SIZE(CRTM1280x960)},
+
+        /* Display : 1280x1024 */
+        {VIA_RES_1280X1024, CRTM1280x1024, ARRAY_SIZE(CRTM1280x1024)},
+
+        /* Display : 1360x768 (CVT) */
+        {VIA_RES_1360X768, CRTM1360x768, ARRAY_SIZE(CRTM1360x768)},
+
+        /* Display : 1360x768 (CVT Reduce Blanking) */
+        {VIA_RES_1360X768_RB, CRTM1360x768_RB,
+         ARRAY_SIZE(CRTM1360x768_RB)},
+
+        /* Display : 1366x768 */
+        {VIA_RES_1366X768, CRTM1366x768, ARRAY_SIZE(CRTM1366x768)},
+
+        /* Display : 1368x768 (GTF) */
+        /*{ M1368x768,CRTM1368x768,ARRAY_SIZE(CRTM1368x768)}, */
+        /* Display : 1368x768 (GTF) */
+        {VIA_RES_1368X768, CRTM1368x768, ARRAY_SIZE(CRTM1368x768)},
+
+        /* Display : 1440x900 (CVT) */
+        {VIA_RES_1440X900, CRTM1440x900, ARRAY_SIZE(CRTM1440x900)},
+
+        /* Display : 1440x900 (CVT Reduce Blanking) */
+        {VIA_RES_1440X900_RB, CRTM1440x900_RB,
+         ARRAY_SIZE(CRTM1440x900_RB)},
+
+        /* Display : 1440x1050 (GTF) */
+        {VIA_RES_1440X1050, CRTM1440x1050, ARRAY_SIZE(CRTM1440x1050)},
+
+        /* Display : 1400x1050 (CVT Reduce Blanking) */
+        {VIA_RES_1400X1050_RB, CRTM1400x1050_RB,
+         ARRAY_SIZE(CRTM1400x1050_RB)},
+
+        /* Display : 1600x900 (CVT) */
+        {VIA_RES_1600X900, CRTM1600x900, ARRAY_SIZE(CRTM1600x900)},
+
+        /* Display : 1600x900 (CVT Reduce Blanking) */
+        {VIA_RES_1600X900_RB, CRTM1600x900_RB,
+         ARRAY_SIZE(CRTM1600x900_RB)},
+
+        /* Display : 1600x1024 (GTF) */
+        {VIA_RES_1600X1024, CRTM1600x1024, ARRAY_SIZE(CRTM1600x1024)},
+
+        /* Display : 1600x1200 */
+        {VIA_RES_1600X1200, CRTM1600x1200, ARRAY_SIZE(CRTM1600x1200)},
+
+        /* Display : 1680x1050 (CVT) */
+        {VIA_RES_1680X1050, CRTM1680x1050, ARRAY_SIZE(CRTM1680x1050)},
+
+        /* Display : 1680x1050 (CVT Reduce Blanking) */
+        {VIA_RES_1680X1050_RB, CRTM1680x1050_RB,
+         ARRAY_SIZE(CRTM1680x1050_RB)},
+
+        /* Display : 1792x1344 (DMT) */
+        {VIA_RES_1792X1344, CRTM1792x1344, ARRAY_SIZE(CRTM1792x1344)},
+
+        /* Display : 1856x1392 (DMT) */
+        {VIA_RES_1856X1392, CRTM1856x1392, ARRAY_SIZE(CRTM1856x1392)},
+
+        /* Display : 1920x1440 */
+        {VIA_RES_1920X1440, CRTM1920x1440, ARRAY_SIZE(CRTM1920x1440)},
+
+        /* Display : 2048x1536 */
+        {VIA_RES_2048X1536, CRTM2048x1536, ARRAY_SIZE(CRTM2048x1536)},
+
+        /* Display : 1280x720 */
+        {VIA_RES_1280X720, CRTM1280x720, ARRAY_SIZE(CRTM1280x720)},
+
+        /* Display : 1920x1080 (CVT) */
+        {VIA_RES_1920X1080, CRTM1920x1080, ARRAY_SIZE(CRTM1920x1080)},
+
+        /* Display : 1920x1080 (CVT Reduce Blanking) */
+        {VIA_RES_1920X1080_RB, CRTM1920x1080_RB,
+         ARRAY_SIZE(CRTM1920x1080_RB)},
+
+        /* Display : 1920x1200 (CVT) */
+        {VIA_RES_1920X1200, CRTM1920x1200, ARRAY_SIZE(CRTM1920x1200)},
+
+        /* Display : 1920x1200 (CVT Reduce Blanking) */
+        {VIA_RES_1920X1200_RB, CRTM1920x1200_RB,
+         ARRAY_SIZE(CRTM1920x1200_RB)},
+
+        /* Display : 1400x1050 (CVT) */
+        {VIA_RES_1400X1050, CRTM1400x1050, ARRAY_SIZE(CRTM1400x1050)}
+};
+struct crt_mode_table CEAM1280x720[] = {
+        {REFRESH_60, CLK_74_270M, M1280X720_CEA_R60_HSP,
+         M1280X720_CEA_R60_VSP,
+         /* HT,    HA,   HBS,  HBE,  HSS, HSE,  VT,   VA,  VBS, VBE, VSS, VSE */
+         {1650, 1280, 1280, 370, 1390, 40, 750, 720, 720, 30, 725, 5} }
+};
+struct crt_mode_table CEAM1920x1080[] = {
+        {REFRESH_60, CLK_148_500M, M1920X1080_CEA_R60_HSP,
+         M1920X1080_CEA_R60_VSP,
+         /* HT,    HA,   HBS,  HBE,  HSS, HSE,  VT,  VA, VBS, VBE,  VSS, VSE */
+         {2200, 1920, 1920, 300, 2008, 44, 1125, 1080, 1080, 45, 1084, 5} }
+};
+struct VideoModeTable CEA_HDMI_Modes[] = {
+        /* Display : 1280x720 */
+        {VIA_RES_1280X720, CEAM1280x720, ARRAY_SIZE(CEAM1280x720)},
+        {VIA_RES_1920X1080, CEAM1920x1080, ARRAY_SIZE(CEAM1920x1080)}
+};
diff --git a/drivers/video/via/viamode.h b/drivers/video/via/viamode.h
new file mode 100644
index 000000000000..1a5de50a23a2
--- /dev/null
+++ b/drivers/video/via/viamode.h
@@ -0,0 +1,177 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __VIAMODE_H__
+#define __VIAMODE_H__
+
+#include "global.h"
+
+struct VPITTable {
+        unsigned char Misc;
+        unsigned char SR[StdSR];
+        unsigned char GR[StdGR];
+        unsigned char AR[StdAR];
+};
+
+struct VideoModeTable {
+        int ModeIndex;
+        struct crt_mode_table *crtc;
+        int mode_array;
+};
+
+struct patch_table {
+        int mode_index;
+        int table_length;
+        struct io_reg *io_reg_table;
+};
+
+struct res_map_refresh {
+        int hres;
+        int vres;
+        int pixclock;
+        int vmode_refresh;
+};
+
+#define NUM_TOTAL_RES_MAP_REFRESH ARRAY_SIZE(res_map_refresh_tbl)
+#define NUM_TOTAL_CEA_MODES  ARRAY_SIZE(CEA_HDMI_Modes)
+#define NUM_TOTAL_CN400_ModeXregs ARRAY_SIZE(CN400_ModeXregs)
+#define NUM_TOTAL_CN700_ModeXregs ARRAY_SIZE(CN700_ModeXregs)
+#define NUM_TOTAL_KM400_ModeXregs ARRAY_SIZE(KM400_ModeXregs)
+#define NUM_TOTAL_CX700_ModeXregs ARRAY_SIZE(CX700_ModeXregs)
+#define NUM_TOTAL_VX800_ModeXregs ARRAY_SIZE(VX800_ModeXregs)
+#define NUM_TOTAL_CLE266_ModeXregs ARRAY_SIZE(CLE266_ModeXregs)
+#define NUM_TOTAL_PATCH_MODE ARRAY_SIZE(res_patch_table)
+#define NUM_TOTAL_MODETABLE ARRAY_SIZE(CLE266Modes)
+
+/********************/
+/* Mode Table       */
+/********************/
+
+/* 480x640 */
+extern struct crt_mode_table CRTM480x640[1];
+/* 640x480*/
+extern struct crt_mode_table CRTM640x480[5];
+/*720x480 (GTF)*/
+extern struct crt_mode_table CRTM720x480[1];
+/*720x576 (GTF)*/
+extern struct crt_mode_table CRTM720x576[1];
+/* 800x480 (CVT) */
+extern struct crt_mode_table CRTM800x480[1];
+/* 800x600*/
+extern struct crt_mode_table CRTM800x600[5];
+/* 848x480 (CVT) */
+extern struct crt_mode_table CRTM848x480[1];
+/*856x480 (GTF) convert to 852x480*/
+extern struct crt_mode_table CRTM852x480[1];
+/*1024x512 (GTF)*/
+extern struct crt_mode_table CRTM1024x512[1];
+/* 1024x600*/
+extern struct crt_mode_table CRTM1024x600[1];
+/* 1024x768*/
+extern struct crt_mode_table CRTM1024x768[4];
+/* 1152x864*/
+extern struct crt_mode_table CRTM1152x864[1];
+/* 1280x720 (HDMI 720P)*/
+extern struct crt_mode_table CRTM1280x720[2];
+/*1280x768 (GTF)*/
+extern struct crt_mode_table CRTM1280x768[2];
+/* 1280x800 (CVT) */
+extern struct crt_mode_table CRTM1280x800[1];
+/*1280x960*/
+extern struct crt_mode_table CRTM1280x960[1];
+/* 1280x1024*/
+extern struct crt_mode_table CRTM1280x1024[3];
+/* 1368x768 (GTF) */
+extern struct crt_mode_table CRTM1368x768[1];
+/*1440x1050 (GTF)*/
+extern struct crt_mode_table CRTM1440x1050[1];
+/* 1600x1200*/
+extern struct crt_mode_table CRTM1600x1200[2];
+/* 1680x1050 (CVT) */
+extern struct crt_mode_table CRTM1680x1050[2];
+/* 1680x1050 (CVT Reduce Blanking) */
+extern struct crt_mode_table CRTM1680x1050_RB[1];
+/* 1920x1080 (CVT)*/
+extern struct crt_mode_table CRTM1920x1080[1];
+/* 1920x1080 (CVT with Reduce Blanking) */
+extern struct crt_mode_table CRTM1920x1080_RB[1];
+/* 1920x1440*/
+extern struct crt_mode_table CRTM1920x1440[2];
+/* 1400x1050 (CVT) */
+extern struct crt_mode_table CRTM1400x1050[2];
+/* 1400x1050 (CVT Reduce Blanking) */
+extern struct crt_mode_table CRTM1400x1050_RB[1];
+/* 960x600 (CVT) */
+extern struct crt_mode_table CRTM960x600[1];
+/* 1000x600 (GTF) */
+extern struct crt_mode_table CRTM1000x600[1];
+/* 1024x576 (GTF) */
+extern struct crt_mode_table CRTM1024x576[1];
+/* 1088x612 (CVT) */
+extern struct crt_mode_table CRTM1088x612[1];
+/* 1152x720 (CVT) */
+extern struct crt_mode_table CRTM1152x720[1];
+/* 1200x720 (GTF) */
+extern struct crt_mode_table CRTM1200x720[1];
+/* 1280x600 (GTF) */
+extern struct crt_mode_table CRTM1280x600[1];
+/* 1360x768 (CVT) */
+extern struct crt_mode_table CRTM1360x768[1];
+/* 1360x768 (CVT Reduce Blanking) */
+extern struct crt_mode_table CRTM1360x768_RB[1];
+/* 1366x768 (GTF) */
+extern struct crt_mode_table CRTM1366x768[2];
+/* 1440x900 (CVT) */
+extern struct crt_mode_table CRTM1440x900[2];
+/* 1440x900 (CVT Reduce Blanking) */
+extern struct crt_mode_table CRTM1440x900_RB[1];
+/* 1600x900 (CVT) */
+extern struct crt_mode_table CRTM1600x900[1];
+/* 1600x900 (CVT Reduce Blanking) */
+extern struct crt_mode_table CRTM1600x900_RB[1];
+/* 1600x1024 (GTF) */
+extern struct crt_mode_table CRTM1600x1024[1];
+/* 1792x1344 (DMT) */
+extern struct crt_mode_table CRTM1792x1344[1];
+/* 1856x1392 (DMT) */
+extern struct crt_mode_table CRTM1856x1392[1];
+/* 1920x1200 (CVT) */
+extern struct crt_mode_table CRTM1920x1200[1];
+/* 1920x1200 (CVT with Reduce Blanking) */
+extern struct crt_mode_table CRTM1920x1200_RB[1];
+/* 2048x1536 (CVT) */
+extern struct crt_mode_table CRTM2048x1536[1];
+extern struct VideoModeTable CLE266Modes[47];
+extern struct crt_mode_table CEAM1280x720[1];
+extern struct crt_mode_table CEAM1920x1080[1];
+extern struct VideoModeTable CEA_HDMI_Modes[2];
+
+extern struct res_map_refresh res_map_refresh_tbl[61];
+extern struct io_reg CN400_ModeXregs[52];
+extern struct io_reg CN700_ModeXregs[66];
+extern struct io_reg KM400_ModeXregs[55];
+extern struct io_reg CX700_ModeXregs[58];
+extern struct io_reg VX800_ModeXregs[58];
+extern struct io_reg CLE266_ModeXregs[32];
+extern struct io_reg PM1024x768[2];
+extern struct patch_table res_patch_table[1];
+extern struct VPITTable VPIT;
+#endif /* __VIAMODE_H__ */
diff --git a/drivers/video/via/vt1636.c b/drivers/video/via/vt1636.c
new file mode 100644
index 000000000000..322a9f993550
--- /dev/null
+++ b/drivers/video/via/vt1636.c
@@ -0,0 +1,306 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; 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 "global.h"
+
+u8 viafb_gpio_i2c_read_lvds(struct lvds_setting_information
+        *plvds_setting_info, struct lvds_chip_information *plvds_chip_info,
+        u8 index)
+{
+        u8 data;
+
+        viaparinfo->i2c_stuff.i2c_port = plvds_chip_info->i2c_port;
+        viafb_i2c_readbyte(plvds_chip_info->lvds_chip_slave_addr, index, &data);
+
+        return data;
+}
+
+void viafb_gpio_i2c_write_mask_lvds(struct lvds_setting_information
+                              *plvds_setting_info, struct lvds_chip_information
+                              *plvds_chip_info, struct IODATA io_data)
+{
+        int index, data;
+
+        viaparinfo->i2c_stuff.i2c_port = plvds_chip_info->i2c_port;
+
+        index = io_data.Index;
+        data = viafb_gpio_i2c_read_lvds(plvds_setting_info, plvds_chip_info,
+                index);
+        data = (data & (~io_data.Mask)) | io_data.Data;
+
+        viafb_i2c_writebyte(plvds_chip_info->lvds_chip_slave_addr, index, data);
+}
+
+void viafb_init_lvds_vt1636(struct lvds_setting_information
+        *plvds_setting_info, struct lvds_chip_information *plvds_chip_info)
+{
+        int reg_num, i;
+
+        /* Common settings: */
+        reg_num = ARRAY_SIZE(COMMON_INIT_TBL_VT1636);
+
+        for (i = 0; i < reg_num; i++) {
+                viafb_gpio_i2c_write_mask_lvds(plvds_setting_info,
+                                         plvds_chip_info,
+                                         COMMON_INIT_TBL_VT1636[i]);
+        }
+
+        /* Input Data Mode Select */
+        if (plvds_setting_info->device_lcd_dualedge) {
+                viafb_gpio_i2c_write_mask_lvds(plvds_setting_info,
+                                         plvds_chip_info,
+                                         DUAL_CHANNEL_ENABLE_TBL_VT1636[0]);
+        } else {
+                viafb_gpio_i2c_write_mask_lvds(plvds_setting_info,
+                                         plvds_chip_info,
+                                         SINGLE_CHANNEL_ENABLE_TBL_VT1636[0]);
+        }
+
+        if (plvds_setting_info->LCDDithering) {
+                viafb_gpio_i2c_write_mask_lvds(plvds_setting_info,
+                                         plvds_chip_info,
+                                         DITHERING_ENABLE_TBL_VT1636[0]);
+        } else {
+                viafb_gpio_i2c_write_mask_lvds(plvds_setting_info,
+                                         plvds_chip_info,
+                                         DITHERING_DISABLE_TBL_VT1636[0]);
+        }
+}
+
+void viafb_enable_lvds_vt1636(struct lvds_setting_information
+                        *plvds_setting_info,
+                        struct lvds_chip_information *plvds_chip_info)
+{
+
+        viafb_gpio_i2c_write_mask_lvds(plvds_setting_info, plvds_chip_info,
+                                 VDD_ON_TBL_VT1636[0]);
+
+        /* Pad on: */
+        switch (plvds_chip_info->output_interface) {
+        case INTERFACE_DVP0:
+                {
+                        viafb_write_reg_mask(SR1E, VIASR, 0xC0, 0xC0);
+                        break;
+                }
+
+        case INTERFACE_DVP1:
+                {
+                        viafb_write_reg_mask(SR1E, VIASR, 0x30, 0x30);
+                        break;
+                }
+
+        case INTERFACE_DFP_LOW:
+                {
+                        viafb_write_reg_mask(SR2A, VIASR, 0x03, 0x03);
+                        break;
+                }
+
+        case INTERFACE_DFP_HIGH:
+                {
+                        viafb_write_reg_mask(SR2A, VIASR, 0x03, 0x0C);
+                        break;
+                }
+
+        }
+}
+
+void viafb_disable_lvds_vt1636(struct lvds_setting_information
+                         *plvds_setting_info,
+                         struct lvds_chip_information *plvds_chip_info)
+{
+
+        viafb_gpio_i2c_write_mask_lvds(plvds_setting_info, plvds_chip_info,
+                                 VDD_OFF_TBL_VT1636[0]);
+
+        /* Pad off: */
+        switch (plvds_chip_info->output_interface) {
+        case INTERFACE_DVP0:
+                {
+                        viafb_write_reg_mask(SR1E, VIASR, 0x00, 0xC0);
+                        break;
+                }
+
+        case INTERFACE_DVP1:
+                {
+                        viafb_write_reg_mask(SR1E, VIASR, 0x00, 0x30);
+                        break;
+                }
+
+        case INTERFACE_DFP_LOW:
+                {
+                        viafb_write_reg_mask(SR2A, VIASR, 0x00, 0x03);
+                        break;
+                }
+
+        case INTERFACE_DFP_HIGH:
+                {
+                        viafb_write_reg_mask(SR2A, VIASR, 0x00, 0x0C);
+                        break;
+                }
+
+        }
+}
+
+bool viafb_lvds_identify_vt1636(void)
+{
+        u8 Buffer[2];
+
+        DEBUG_MSG(KERN_INFO "viafb_lvds_identify_vt1636.\n");
+
+        /* Sense VT1636 LVDS Transmiter */
+        viaparinfo->chip_info->lvds_chip_info.lvds_chip_slave_addr =
+        VT1636_LVDS_I2C_ADDR;
+
+        /* Check vendor ID first: */
+        viafb_i2c_readbyte((u8) viaparinfo->chip_info->lvds_chip_info.
+        lvds_chip_slave_addr,
+                    0x00, &Buffer[0]);
+        viafb_i2c_readbyte((u8) viaparinfo->chip_info->lvds_chip_info.
+                lvds_chip_slave_addr,
+                    0x01, &Buffer[1]);
+
+        if (!((Buffer[0] == 0x06) && (Buffer[1] == 0x11)))
+                return false;
+
+        /* Check Chip ID: */
+        viafb_i2c_readbyte((u8) viaparinfo->chip_info->lvds_chip_info.
+        lvds_chip_slave_addr,
+                    0x02, &Buffer[0]);
+        viafb_i2c_readbyte((u8) viaparinfo->chip_info->lvds_chip_info.
+                lvds_chip_slave_addr,
+                    0x03, &Buffer[1]);
+        if ((Buffer[0] == 0x45) && (Buffer[1] == 0x33)) {
+                viaparinfo->chip_info->lvds_chip_info.lvds_chip_name =
+                        VT1636_LVDS;
+                return true;
+        }
+
+        return false;
+}
+
+static int get_clk_range_index(u32 Clk)
+{
+        if (Clk < DPA_CLK_30M)
+                return DPA_CLK_RANGE_30M;
+        else if (Clk < DPA_CLK_50M)
+                return DPA_CLK_RANGE_30_50M;
+        else if (Clk < DPA_CLK_70M)
+                return DPA_CLK_RANGE_50_70M;
+        else if (Clk < DPA_CLK_100M)
+                return DPA_CLK_RANGE_70_100M;
+        else if (Clk < DPA_CLK_150M)
+                return DPA_CLK_RANGE_100_150M;
+        else
+                return DPA_CLK_RANGE_150M;
+}
+
+static int get_lvds_dpa_setting_index(int panel_size_id,
+                             struct VT1636_DPA_SETTING *p_vt1636_dpasetting_tbl,
+                               int tbl_size)
+{
+        int i;
+
+        for (i = 0; i < tbl_size; i++) {
+                if (panel_size_id == p_vt1636_dpasetting_tbl->PanelSizeID)
+                        return i;
+
+                p_vt1636_dpasetting_tbl++;
+        }
+
+        return 0;
+}
+
+static void set_dpa_vt1636(struct lvds_setting_information
+        *plvds_setting_info, struct lvds_chip_information *plvds_chip_info,
+                    struct VT1636_DPA_SETTING *p_vt1636_dpa_setting)
+{
+        struct IODATA io_data;
+
+        io_data.Index = 0x09;
+        io_data.Mask = 0x1F;
+        io_data.Data = p_vt1636_dpa_setting->CLK_SEL_ST1;
+        viafb_gpio_i2c_write_mask_lvds(plvds_setting_info,
+                plvds_chip_info, io_data);
+
+        io_data.Index = 0x08;
+        io_data.Mask = 0x0F;
+        io_data.Data = p_vt1636_dpa_setting->CLK_SEL_ST2;
+        viafb_gpio_i2c_write_mask_lvds(plvds_setting_info, plvds_chip_info,
+                io_data);
+}
+
+void viafb_vt1636_patch_skew_on_vt3324(
+        struct lvds_setting_information *plvds_setting_info,
+        struct lvds_chip_information *plvds_chip_info)
+{
+        int index, size;
+
+        DEBUG_MSG(KERN_INFO "viafb_vt1636_patch_skew_on_vt3324.\n");
+
+        /* Graphics DPA settings: */
+        index = get_clk_range_index(plvds_setting_info->vclk);
+        viafb_set_dpa_gfx(plvds_chip_info->output_interface,
+                    &GFX_DPA_SETTING_TBL_VT3324[index]);
+
+        /* LVDS Transmitter DPA settings: */
+        size = ARRAY_SIZE(VT1636_DPA_SETTING_TBL_VT3324);
+        index =
+            get_lvds_dpa_setting_index(plvds_setting_info->lcd_panel_id,
+                                       VT1636_DPA_SETTING_TBL_VT3324, size);
+        set_dpa_vt1636(plvds_setting_info, plvds_chip_info,
+                       &VT1636_DPA_SETTING_TBL_VT3324[index]);
+}
+
+void viafb_vt1636_patch_skew_on_vt3327(
+        struct lvds_setting_information *plvds_setting_info,
+        struct lvds_chip_information *plvds_chip_info)
+{
+        int index, size;
+
+        DEBUG_MSG(KERN_INFO "viafb_vt1636_patch_skew_on_vt3327.\n");
+
+        /* Graphics DPA settings: */
+        index = get_clk_range_index(plvds_setting_info->vclk);
+        viafb_set_dpa_gfx(plvds_chip_info->output_interface,
+                    &GFX_DPA_SETTING_TBL_VT3327[index]);
+
+        /* LVDS Transmitter DPA settings: */
+        size = ARRAY_SIZE(VT1636_DPA_SETTING_TBL_VT3327);
+        index =
+            get_lvds_dpa_setting_index(plvds_setting_info->lcd_panel_id,
+                                       VT1636_DPA_SETTING_TBL_VT3327, size);
+        set_dpa_vt1636(plvds_setting_info, plvds_chip_info,
+                       &VT1636_DPA_SETTING_TBL_VT3327[index]);
+}
+
+void viafb_vt1636_patch_skew_on_vt3364(
+        struct lvds_setting_information *plvds_setting_info,
+        struct lvds_chip_information *plvds_chip_info)
+{
+        int index;
+
+        DEBUG_MSG(KERN_INFO "viafb_vt1636_patch_skew_on_vt3364.\n");
+
+        /* Graphics DPA settings: */
+        index = get_clk_range_index(plvds_setting_info->vclk);
+        viafb_set_dpa_gfx(plvds_chip_info->output_interface,
+                    &GFX_DPA_SETTING_TBL_VT3364[index]);
+}
diff --git a/drivers/video/via/vt1636.h b/drivers/video/via/vt1636.h
new file mode 100644
index 000000000000..2a150c58c7ed
--- /dev/null
+++ b/drivers/video/via/vt1636.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+
+ * 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, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _VT1636_H_
+#define _VT1636_H_
+#include "chip.h"
+bool viafb_lvds_identify_vt1636(void);
+void viafb_init_lvds_vt1636(struct lvds_setting_information
+        *plvds_setting_info, struct lvds_chip_information *plvds_chip_info);
+void viafb_enable_lvds_vt1636(struct lvds_setting_information
+                        *plvds_setting_info,
+                        struct lvds_chip_information *plvds_chip_info);
+void viafb_disable_lvds_vt1636(struct lvds_setting_information
+                         *plvds_setting_info,
+                         struct lvds_chip_information *plvds_chip_info);
+void viafb_vt1636_patch_skew_on_vt3324(
+        struct lvds_setting_information *plvds_setting_info,
+        struct lvds_chip_information *plvds_chip_info);
+void viafb_vt1636_patch_skew_on_vt3327(
+        struct lvds_setting_information *plvds_setting_info,
+        struct lvds_chip_information *plvds_chip_info);
+void viafb_vt1636_patch_skew_on_vt3364(
+        struct lvds_setting_information *plvds_setting_info,
+        struct lvds_chip_information *plvds_chip_info);
+
+#endif
diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c
index 10211e493001..29e144f81cbe 100644
--- a/drivers/w1/masters/ds1wm.c
+++ b/drivers/w1/masters/ds1wm.c
@@ -160,8 +160,10 @@ static int ds1wm_reset(struct ds1wm_data *ds1wm_data)
          *     625 us - 60 us - 240 us - 100 ns = 324.9 us
          *
          * We'll wait a bit longer just to be sure.
+         * Was udelay(500), but if it is going to busywait the cpu that long,
+         * might as well come back later.
          */
-        udelay(500);
+        msleep(1);
 
         ds1wm_write_register(ds1wm_data, DS1WM_INT_EN,
                 DS1WM_INTEN_ERBF | DS1WM_INTEN_ETMT | DS1WM_INTEN_EPD |
@@ -274,8 +276,8 @@ static u8 ds1wm_reset_bus(void *data)
         return 0;
 }
 
-static void ds1wm_search(void *data, u8 search_type,
-                         w1_slave_found_callback slave_found)
+static void ds1wm_search(void *data, struct w1_master *master_dev,
+                        u8 search_type, w1_slave_found_callback slave_found)
 {
         struct ds1wm_data *ds1wm_data = data;
         int i;
@@ -313,7 +315,7 @@ static void ds1wm_search(void *data, u8 search_type,
         ds1wm_write_register(ds1wm_data, DS1WM_CMD, ~DS1WM_CMD_SRA);
         ds1wm_reset(ds1wm_data);
 
-        slave_found(ds1wm_data, rom_id);
+        slave_found(master_dev, rom_id);
 }
 
 /* --------------------------------------------------------------------- */
diff --git a/drivers/w1/masters/ds2490.c b/drivers/w1/masters/ds2490.c
index b63b5e044a4c..59ad6e95af8f 100644
--- a/drivers/w1/masters/ds2490.c
+++ b/drivers/w1/masters/ds2490.c
@@ -88,7 +88,7 @@
 #define COMM_DT                         0x2000
 #define COMM_SPU                        0x1000
 #define COMM_F                          0x0800
-#define COMM_NTP                        0x0400
+#define COMM_NTF                        0x0400
 #define COMM_ICP                        0x0200
 #define COMM_RST                        0x0100
 
@@ -98,11 +98,6 @@
 #define BRANCH_MAIN                     0xCC
 #define BRANCH_AUX                      0x33
 
-/*
- * Duration of the strong pull-up pulse in milliseconds.
- */
-#define PULLUP_PULSE_DURATION           750
-
 /* Status flags */
 #define ST_SPUA                         0x01  /* Strong Pull-up is active */
 #define ST_PRGA                         0x02  /* 12V programming pulse is being generated */
@@ -112,6 +107,17 @@
 #define ST_IDLE                         0x20  /* DS2490 is currently idle */
 #define ST_EPOF                         0x80
 
+/* Result Register flags */
+#define RR_DETECT                       0xA5 /* New device detected */
+#define RR_NRS                          0x01 /* Reset no presence or ... */
+#define RR_SH                           0x02 /* short on reset or set path */
+#define RR_APP                          0x04 /* alarming presence on reset */
+#define RR_VPP                          0x08 /* 12V expected not seen */
+#define RR_CMP                          0x10 /* compare error */
+#define RR_CRC                          0x20 /* CRC error detected */
+#define RR_RDP                          0x40 /* redirected page */
+#define RR_EOS                          0x80 /* end of search error */
+
 #define SPEED_NORMAL                    0x00
 #define SPEED_FLEXIBLE                  0x01
 #define SPEED_OVERDRIVE                 0x02
@@ -131,6 +137,15 @@ struct ds_device
 
         int                     ep[NUM_EP];
 
+        /* Strong PullUp
+         * 0: pullup not active, else duration in milliseconds
+         */
+        int                     spu_sleep;
+        /* spu_bit contains COMM_SPU or 0 depending on if the strong pullup
+         * should be active or not for writes.
+         */
+        u16                     spu_bit;
+
         struct w1_bus_master    master;
 };
 
@@ -164,7 +179,6 @@ MODULE_DEVICE_TABLE(usb, ds_id_table);
 static int ds_probe(struct usb_interface *, const struct usb_device_id *);
 static void ds_disconnect(struct usb_interface *);
 
-static inline void ds_dump_status(unsigned char *, unsigned char *, int);
 static int ds_send_control(struct ds_device *, u16, u16);
 static int ds_send_control_cmd(struct ds_device *, u16, u16);
 
@@ -192,7 +206,7 @@ static int ds_send_control_cmd(struct ds_device *dev, u16 value, u16 index)
 
         return err;
 }
-#if 0
+
 static int ds_send_control_mode(struct ds_device *dev, u16 value, u16 index)
 {
         int err;
@@ -207,7 +221,7 @@ static int ds_send_control_mode(struct ds_device *dev, u16 value, u16 index)
 
         return err;
 }
-#endif
+
 static int ds_send_control(struct ds_device *dev, u16 value, u16 index)
 {
         int err;
@@ -223,11 +237,6 @@ static int ds_send_control(struct ds_device *dev, u16 value, u16 index)
         return err;
 }
 
-static inline void ds_dump_status(unsigned char *buf, unsigned char *str, int off)
-{
-        printk("%45s: %8x\n", str, buf[off]);
-}
-
 static int ds_recv_status_nodump(struct ds_device *dev, struct ds_status *st,
                                  unsigned char *buf, int size)
 {
@@ -248,62 +257,81 @@ static int ds_recv_status_nodump(struct ds_device *dev, struct ds_status *st,
         return count;
 }
 
-static int ds_recv_status(struct ds_device *dev, struct ds_status *st)
+static inline void ds_print_msg(unsigned char *buf, unsigned char *str, int off)
 {
-        unsigned char buf[64];
-        int count, err = 0, i;
-
-        memcpy(st, buf, sizeof(*st));
+        printk(KERN_INFO "%45s: %8x\n", str, buf[off]);
+}
 
-        count = ds_recv_status_nodump(dev, st, buf, sizeof(buf));
-        if (count < 0)
-                return err;
+static void ds_dump_status(struct ds_device *dev, unsigned char *buf, int count)
+{
+        int i;
 
-        printk("0x%x: count=%d, status: ", dev->ep[EP_STATUS], count);
+        printk(KERN_INFO "0x%x: count=%d, status: ", dev->ep[EP_STATUS], count);
         for (i=0; i<count; ++i)
                 printk("%02x ", buf[i]);
-        printk("\n");
+        printk(KERN_INFO "\n");
 
         if (count >= 16) {
-                ds_dump_status(buf, "enable flag", 0);
-                ds_dump_status(buf, "1-wire speed", 1);
-                ds_dump_status(buf, "strong pullup duration", 2);
-                ds_dump_status(buf, "programming pulse duration", 3);
-                ds_dump_status(buf, "pulldown slew rate control", 4);
-                ds_dump_status(buf, "write-1 low time", 5);
-                ds_dump_status(buf, "data sample offset/write-0 recovery time", 6);
-                ds_dump_status(buf, "reserved (test register)", 7);
-                ds_dump_status(buf, "device status flags", 8);
-                ds_dump_status(buf, "communication command byte 1", 9);
-                ds_dump_status(buf, "communication command byte 2", 10);
-                ds_dump_status(buf, "communication command buffer status", 11);
-                ds_dump_status(buf, "1-wire data output buffer status", 12);
-                ds_dump_status(buf, "1-wire data input buffer status", 13);
-                ds_dump_status(buf, "reserved", 14);
-                ds_dump_status(buf, "reserved", 15);
+                ds_print_msg(buf, "enable flag", 0);
+                ds_print_msg(buf, "1-wire speed", 1);
+                ds_print_msg(buf, "strong pullup duration", 2);
+                ds_print_msg(buf, "programming pulse duration", 3);
+                ds_print_msg(buf, "pulldown slew rate control", 4);
+                ds_print_msg(buf, "write-1 low time", 5);
+                ds_print_msg(buf, "data sample offset/write-0 recovery time",
+                        6);
+                ds_print_msg(buf, "reserved (test register)", 7);
+                ds_print_msg(buf, "device status flags", 8);
+                ds_print_msg(buf, "communication command byte 1", 9);
+                ds_print_msg(buf, "communication command byte 2", 10);
+                ds_print_msg(buf, "communication command buffer status", 11);
+                ds_print_msg(buf, "1-wire data output buffer status", 12);
+                ds_print_msg(buf, "1-wire data input buffer status", 13);
+                ds_print_msg(buf, "reserved", 14);
+                ds_print_msg(buf, "reserved", 15);
         }
-
-        memcpy(st, buf, sizeof(*st));
-
-        if (st->status & ST_EPOF) {
-                printk(KERN_INFO "Resetting device after ST_EPOF.\n");
-                err = ds_send_control_cmd(dev, CTL_RESET_DEVICE, 0);
-                if (err)
-                        return err;
-                count = ds_recv_status_nodump(dev, st, buf, sizeof(buf));
-                if (count < 0)
-                        return err;
-        }
-#if 0
-        if (st->status & ST_IDLE) {
-                printk(KERN_INFO "Resetting pulse after ST_IDLE.\n");
-                err = ds_start_pulse(dev, PULLUP_PULSE_DURATION);
-                if (err)
-                        return err;
+        for (i = 16; i < count; ++i) {
+                if (buf[i] == RR_DETECT) {
+                        ds_print_msg(buf, "new device detect", i);
+                        continue;
+                }
+                ds_print_msg(buf, "Result Register Value: ", i);
+                if (buf[i] & RR_NRS)
+                        printk(KERN_INFO "NRS: Reset no presence or ...\n");
+                if (buf[i] & RR_SH)
+                        printk(KERN_INFO "SH: short on reset or set path\n");
+                if (buf[i] & RR_APP)
+                        printk(KERN_INFO "APP: alarming presence on reset\n");
+                if (buf[i] & RR_VPP)
+                        printk(KERN_INFO "VPP: 12V expected not seen\n");
+                if (buf[i] & RR_CMP)
+                        printk(KERN_INFO "CMP: compare error\n");
+                if (buf[i] & RR_CRC)
+                        printk(KERN_INFO "CRC: CRC error detected\n");
+                if (buf[i] & RR_RDP)
+                        printk(KERN_INFO "RDP: redirected page\n");
+                if (buf[i] & RR_EOS)
+                        printk(KERN_INFO "EOS: end of search error\n");
         }
-#endif
+}
 
-        return err;
+static void ds_reset_device(struct ds_device *dev)
+{
+        ds_send_control_cmd(dev, CTL_RESET_DEVICE, 0);
+        /* Always allow strong pullup which allow individual writes to use
+         * the strong pullup.
+         */
+        if (ds_send_control_mode(dev, MOD_PULSE_EN, PULSE_SPUE))
+                printk(KERN_ERR "ds_reset_device: "
+                        "Error allowing strong pullup\n");
+        /* Chip strong pullup time was cleared. */
+        if (dev->spu_sleep) {
+                /* lower 4 bits are 0, see ds_set_pullup */
+                u8 del = dev->spu_sleep>>4;
+                if (ds_send_control(dev, COMM_SET_DURATION | COMM_IM, del))
+                        printk(KERN_ERR "ds_reset_device: "
+                                "Error setting duration\n");
+        }
 }
 
 static int ds_recv_data(struct ds_device *dev, unsigned char *buf, int size)
@@ -311,13 +339,27 @@ static int ds_recv_data(struct ds_device *dev, unsigned char *buf, int size)
         int count, err;
         struct ds_status st;
 
+        /* Careful on size.  If size is less than what is available in
+         * the input buffer, the device fails the bulk transfer and
+         * clears the input buffer.  It could read the maximum size of
+         * the data buffer, but then do you return the first, last, or
+         * some set of the middle size bytes?  As long as the rest of
+         * the code is correct there will be size bytes waiting.  A
+         * call to ds_wait_status will wait until the device is idle
+         * and any data to be received would have been available.
+         */
         count = 0;
         err = usb_bulk_msg(dev->udev, usb_rcvbulkpipe(dev->udev, dev->ep[EP_DATA_IN]),
                                 buf, size, &count, 1000);
         if (err < 0) {
+                u8 buf[0x20];
+                int count;
+
                 printk(KERN_INFO "Clearing ep0x%x.\n", dev->ep[EP_DATA_IN]);
                 usb_clear_halt(dev->udev, usb_rcvbulkpipe(dev->udev, dev->ep[EP_DATA_IN]));
-                ds_recv_status(dev, &st);
+
+                count = ds_recv_status_nodump(dev, &st, buf, sizeof(buf));
+                ds_dump_status(dev, buf, count);
                 return err;
         }
 
@@ -341,7 +383,8 @@ static int ds_send_data(struct ds_device *dev, unsigned char *buf, int len)
         count = 0;
         err = usb_bulk_msg(dev->udev, usb_sndbulkpipe(dev->udev, dev->ep[EP_DATA_OUT]), buf, len, &count, 1000);
         if (err < 0) {
-                printk(KERN_ERR "Failed to read 1-wire data from 0x02: err=%d.\n", err);
+                printk(KERN_ERR "Failed to write 1-wire data to ep0x%x: "
+                        "err=%d.\n", dev->ep[EP_DATA_OUT], err);
                 return err;
         }
 
@@ -397,7 +440,7 @@ int ds_detect(struct ds_device *dev, struct ds_status *st)
         if (err)
                 return err;
 
-        err = ds_recv_status(dev, st);
+        err = ds_dump_status(dev, st);
 
         return err;
 }
@@ -420,33 +463,49 @@ static int ds_wait_status(struct ds_device *dev, struct ds_status *st)
                         printk("\n");
                 }
 #endif
-        } while(!(buf[0x08] & 0x20) && !(err < 0) && ++count < 100);
+        } while (!(buf[0x08] & ST_IDLE) && !(err < 0) && ++count < 100);
+
+        if (err >= 16 && st->status & ST_EPOF) {
+                printk(KERN_INFO "Resetting device after ST_EPOF.\n");
+                ds_reset_device(dev);
+                /* Always dump the device status. */
+                count = 101;
+        }
 
+        /* Dump the status for errors or if there is extended return data.
+         * The extended status includes new device detection (maybe someone
+         * can do something with it).
+         */
+        if (err > 16 || count >= 100 || err < 0)
+                ds_dump_status(dev, buf, err);
 
-        if (((err > 16) && (buf[0x10] & 0x01)) || count >= 100 || err < 0) {
-                ds_recv_status(dev, st);
+        /* Extended data isn't an error.  Well, a short is, but the dump
+         * would have already told the user that and we can't do anything
+         * about it in software anyway.
+         */
+        if (count >= 100 || err < 0)
                 return -1;
-        } else
+        else
                 return 0;
 }
 
-static int ds_reset(struct ds_device *dev, struct ds_status *st)
+static int ds_reset(struct ds_device *dev)
 {
         int err;
 
-        //err = ds_send_control(dev, COMM_1_WIRE_RESET | COMM_F | COMM_IM | COMM_SE, SPEED_FLEXIBLE);
-        err = ds_send_control(dev, 0x43, SPEED_NORMAL);
+        /* Other potentionally interesting flags for reset.
+         *
+         * COMM_NTF: Return result register feedback.  This could be used to
+         * detect some conditions such as short, alarming presence, or
+         * detect if a new device was detected.
+         *
+         * COMM_SE which allows SPEED_NORMAL, SPEED_FLEXIBLE, SPEED_OVERDRIVE:
+         * Select the data transfer rate.
+         */
+        err = ds_send_control(dev, COMM_1_WIRE_RESET | COMM_IM, SPEED_NORMAL);
         if (err)
                 return err;
 
-        ds_wait_status(dev, st);
-#if 0
-        if (st->command_buffer_status) {
-                printk(KERN_INFO "Short circuit.\n");
-                return -EIO;
-        }
-#endif
-
         return 0;
 }
 
@@ -471,60 +530,43 @@ static int ds_set_speed(struct ds_device *dev, int speed)
 }
 #endif  /*  0  */
 
-static int ds_start_pulse(struct ds_device *dev, int delay)
+static int ds_set_pullup(struct ds_device *dev, int delay)
 {
-        int err;
+        int err = 0;
         u8 del = 1 + (u8)(delay >> 4);
-        struct ds_status st;
-
-#if 0
-        err = ds_stop_pulse(dev, 10);
-        if (err)
+        /* Just storing delay would not get the trunication and roundup. */
+        int ms = del<<4;
+
+        /* Enable spu_bit if a delay is set. */
+        dev->spu_bit = delay ? COMM_SPU : 0;
+        /* If delay is zero, it has already been disabled, if the time is
+         * the same as the hardware was last programmed to, there is also
+         * nothing more to do.  Compare with the recalculated value ms
+         * rather than del or delay which can have a different value.
+         */
+        if (delay == 0 || ms == dev->spu_sleep)
                 return err;
 
-        err = ds_send_control_mode(dev, MOD_PULSE_EN, PULSE_SPUE);
-        if (err)
-                return err;
-#endif
         err = ds_send_control(dev, COMM_SET_DURATION | COMM_IM, del);
         if (err)
                 return err;
 
-        err = ds_send_control(dev, COMM_PULSE | COMM_IM | COMM_F, 0);
-        if (err)
-                return err;
-
-        mdelay(delay);
-
-        ds_wait_status(dev, &st);
+        dev->spu_sleep = ms;
 
         return err;
 }
 
 static int ds_touch_bit(struct ds_device *dev, u8 bit, u8 *tbit)
 {
-        int err, count;
+        int err;
         struct ds_status st;
-        u16 value = (COMM_BIT_IO | COMM_IM) | ((bit) ? COMM_D : 0);
-        u16 cmd;
 
-        err = ds_send_control(dev, value, 0);
+        err = ds_send_control(dev, COMM_BIT_IO | COMM_IM | (bit ? COMM_D : 0),
+                0);
         if (err)
                 return err;
 
-        count = 0;
-        do {
-                err = ds_wait_status(dev, &st);
-                if (err)
-                        return err;
-
-                cmd = st.command0 | (st.command1 << 8);
-        } while (cmd != value && ++count < 10);
-
-        if (err < 0 || count >= 10) {
-                printk(KERN_ERR "Failed to obtain status.\n");
-                return -EINVAL;
-        }
+        ds_wait_status(dev, &st);
 
         err = ds_recv_data(dev, tbit, sizeof(*tbit));
         if (err < 0)
@@ -533,12 +575,18 @@ static int ds_touch_bit(struct ds_device *dev, u8 bit, u8 *tbit)
         return 0;
 }
 
+#if 0
 static int ds_write_bit(struct ds_device *dev, u8 bit)
 {
         int err;
         struct ds_status st;
 
-        err = ds_send_control(dev, COMM_BIT_IO | COMM_IM | (bit) ? COMM_D : 0, 0);
+        /* Set COMM_ICP to write without a readback.  Note, this will
+         * produce one time slot, a down followed by an up with COMM_D
+         * only determing the timing.
+         */
+        err = ds_send_control(dev, COMM_BIT_IO | COMM_IM | COMM_ICP |
+                (bit ? COMM_D : 0), 0);
         if (err)
                 return err;
 
@@ -546,6 +594,7 @@ static int ds_write_bit(struct ds_device *dev, u8 bit)
 
         return 0;
 }
+#endif
 
 static int ds_write_byte(struct ds_device *dev, u8 byte)
 {
@@ -553,10 +602,13 @@ static int ds_write_byte(struct ds_device *dev, u8 byte)
         struct ds_status st;
         u8 rbyte;
 
-        err = ds_send_control(dev, COMM_BYTE_IO | COMM_IM | COMM_SPU, byte);
+        err = ds_send_control(dev, COMM_BYTE_IO | COMM_IM | dev->spu_bit, byte);
         if (err)
                 return err;
 
+        if (dev->spu_bit)
+                msleep(dev->spu_sleep);
+
         err = ds_wait_status(dev, &st);
         if (err)
                 return err;
@@ -565,8 +617,6 @@ static int ds_write_byte(struct ds_device *dev, u8 byte)
         if (err < 0)
                 return err;
 
-        ds_start_pulse(dev, PULLUP_PULSE_DURATION);
-
         return !(byte == rbyte);
 }
 
@@ -602,7 +652,7 @@ static int ds_read_block(struct ds_device *dev, u8 *buf, int len)
         if (err < 0)
                 return err;
 
-        err = ds_send_control(dev, COMM_BLOCK_IO | COMM_IM | COMM_SPU, len);
+        err = ds_send_control(dev, COMM_BLOCK_IO | COMM_IM, len);
         if (err)
                 return err;
 
@@ -623,20 +673,19 @@ static int ds_write_block(struct ds_device *dev, u8 *buf, int len)
         if (err < 0)
                 return err;
 
-        ds_wait_status(dev, &st);
-
-        err = ds_send_control(dev, COMM_BLOCK_IO | COMM_IM | COMM_SPU, len);
+        err = ds_send_control(dev, COMM_BLOCK_IO | COMM_IM | dev->spu_bit, len);
         if (err)
                 return err;
 
+        if (dev->spu_bit)
+                msleep(dev->spu_sleep);
+
         ds_wait_status(dev, &st);
 
         err = ds_recv_data(dev, buf, len);
         if (err < 0)
                 return err;
 
-        ds_start_pulse(dev, PULLUP_PULSE_DURATION);
-
         return !(err == len);
 }
 
@@ -728,6 +777,7 @@ static u8 ds9490r_touch_bit(void *data, u8 bit)
         return ret;
 }
 
+#if 0
 static void ds9490r_write_bit(void *data, u8 bit)
 {
         struct ds_device *dev = data;
@@ -735,13 +785,6 @@ static void ds9490r_write_bit(void *data, u8 bit)
         ds_write_bit(dev, bit);
 }
 
-static void ds9490r_write_byte(void *data, u8 byte)
-{
-        struct ds_device *dev = data;
-
-        ds_write_byte(dev, byte);
-}
-
 static u8 ds9490r_read_bit(void *data)
 {
         struct ds_device *dev = data;
@@ -754,6 +797,14 @@ static u8 ds9490r_read_bit(void *data)
 
         return bit & 1;
 }
+#endif
+
+static void ds9490r_write_byte(void *data, u8 byte)
+{
+        struct ds_device *dev = data;
+
+        ds_write_byte(dev, byte);
+}
 
 static u8 ds9490r_read_byte(void *data)
 {
@@ -790,31 +841,58 @@ static u8 ds9490r_read_block(void *data, u8 *buf, int len)
 static u8 ds9490r_reset(void *data)
 {
         struct ds_device *dev = data;
-        struct ds_status st;
         int err;
 
-        memset(&st, 0, sizeof(st));
-
-        err = ds_reset(dev, &st);
+        err = ds_reset(dev);
         if (err)
                 return 1;
 
         return 0;
 }
 
+static u8 ds9490r_set_pullup(void *data, int delay)
+{
+        struct ds_device *dev = data;
+
+        if (ds_set_pullup(dev, delay))
+                return 1;
+
+        return 0;
+}
+
 static int ds_w1_init(struct ds_device *dev)
 {
         memset(&dev->master, 0, sizeof(struct w1_bus_master));
 
+        /* Reset the device as it can be in a bad state.
+         * This is necessary because a block write will wait for data
+         * to be placed in the output buffer and block any later
+         * commands which will keep accumulating and the device will
+         * not be idle.  Another case is removing the ds2490 module
+         * while a bus search is in progress, somehow a few commands
+         * get through, but the input transfers fail leaving data in
+         * the input buffer.  This will cause the next read to fail
+         * see the note in ds_recv_data.
+         */
+        ds_reset_device(dev);
+
         dev->master.data        = dev;
         dev->master.touch_bit   = &ds9490r_touch_bit;
+        /* read_bit and write_bit in w1_bus_master are expected to set and
+         * sample the line level.  For write_bit that means it is expected to
+         * set it to that value and leave it there.  ds2490 only supports an
+         * individual time slot at the lowest level.  The requirement from
+         * pulling the bus state down to reading the state is 15us, something
+         * that isn't realistic on the USB bus anyway.
         dev->master.read_bit    = &ds9490r_read_bit;
         dev->master.write_bit   = &ds9490r_write_bit;
+        */
         dev->master.read_byte   = &ds9490r_read_byte;
         dev->master.write_byte  = &ds9490r_write_byte;
         dev->master.read_block  = &ds9490r_read_block;
         dev->master.write_block = &ds9490r_write_block;
         dev->master.reset_bus   = &ds9490r_reset;
+        dev->master.set_pullup  = &ds9490r_set_pullup;
 
         return w1_add_master_device(&dev->master);
 }
@@ -838,6 +916,8 @@ static int ds_probe(struct usb_interface *intf,
                 printk(KERN_INFO "Failed to allocate new DS9490R structure.\n");
                 return -ENOMEM;
         }
+        dev->spu_sleep = 0;
+        dev->spu_bit = 0;
         dev->udev = usb_get_dev(udev);
         if (!dev->udev) {
                 err = -ENOMEM;
diff --git a/drivers/w1/slaves/w1_ds2431.c b/drivers/w1/slaves/w1_ds2431.c
new file mode 100644
index 000000000000..2c6c0cf6a20f
--- /dev/null
+++ b/drivers/w1/slaves/w1_ds2431.c
@@ -0,0 +1,312 @@
+/*
+ * w1_ds2431.c - w1 family 2d (DS2431) driver
+ *
+ * Copyright (c) 2008 Bernhard Weirich <bernhard.weirich@riedel.net>
+ *
+ * Heavily inspired by w1_DS2433 driver from Ben Gardner <bgardner@wabtec.com>
+ *
+ * This source code is licensed under the GNU General Public License,
+ * Version 2. See the file COPYING for more details.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/device.h>
+#include <linux/types.h>
+#include <linux/delay.h>
+
+#include "../w1.h"
+#include "../w1_int.h"
+#include "../w1_family.h"
+
+#define W1_F2D_EEPROM_SIZE              128
+#define W1_F2D_PAGE_COUNT               4
+#define W1_F2D_PAGE_BITS                5
+#define W1_F2D_PAGE_SIZE                (1<<W1_F2D_PAGE_BITS)
+#define W1_F2D_PAGE_MASK                0x1F
+
+#define W1_F2D_SCRATCH_BITS  3
+#define W1_F2D_SCRATCH_SIZE  (1<<W1_F2D_SCRATCH_BITS)
+#define W1_F2D_SCRATCH_MASK  (W1_F2D_SCRATCH_SIZE-1)
+
+#define W1_F2D_READ_EEPROM      0xF0
+#define W1_F2D_WRITE_SCRATCH    0x0F
+#define W1_F2D_READ_SCRATCH     0xAA
+#define W1_F2D_COPY_SCRATCH     0x55
+
+
+#define W1_F2D_TPROG_MS         11
+
+#define W1_F2D_READ_RETRIES             10
+#define W1_F2D_READ_MAXLEN              8
+
+/*
+ * Check the file size bounds and adjusts count as needed.
+ * This would not be needed if the file size didn't reset to 0 after a write.
+ */
+static inline size_t w1_f2d_fix_count(loff_t off, size_t count, size_t size)
+{
+        if (off > size)
+                return 0;
+
+        if ((off + count) > size)
+                return size - off;
+
+        return count;
+}
+
+/*
+ * Read a block from W1 ROM two times and compares the results.
+ * If they are equal they are returned, otherwise the read
+ * is repeated W1_F2D_READ_RETRIES times.
+ *
+ * count must not exceed W1_F2D_READ_MAXLEN.
+ */
+static int w1_f2d_readblock(struct w1_slave *sl, int off, int count, char *buf)
+{
+        u8 wrbuf[3];
+        u8 cmp[W1_F2D_READ_MAXLEN];
+        int tries = W1_F2D_READ_RETRIES;
+
+        do {
+                wrbuf[0] = W1_F2D_READ_EEPROM;
+                wrbuf[1] = off & 0xff;
+                wrbuf[2] = off >> 8;
+
+                if (w1_reset_select_slave(sl))
+                        return -1;
+
+                w1_write_block(sl->master, wrbuf, 3);
+                w1_read_block(sl->master, buf, count);
+
+                if (w1_reset_select_slave(sl))
+                        return -1;
+
+                w1_write_block(sl->master, wrbuf, 3);
+                w1_read_block(sl->master, cmp, count);
+
+                if (!memcmp(cmp, buf, count))
+                        return 0;
+        } while (--tries);
+
+        dev_err(&sl->dev, "proof reading failed %d times\n",
+                        W1_F2D_READ_RETRIES);
+
+        return -1;
+}
+
+static ssize_t w1_f2d_read_bin(struct kobject *kobj,
+                               struct bin_attribute *bin_attr,
+                               char *buf, loff_t off, size_t count)
+{
+        struct w1_slave *sl = kobj_to_w1_slave(kobj);
+        int todo = count;
+
+        count = w1_f2d_fix_count(off, count, W1_F2D_EEPROM_SIZE);
+        if (count == 0)
+                return 0;
+
+        mutex_lock(&sl->master->mutex);
+
+        /* read directly from the EEPROM in chunks of W1_F2D_READ_MAXLEN */
+        while (todo > 0) {
+                int block_read;
+
+                if (todo >= W1_F2D_READ_MAXLEN)
+                        block_read = W1_F2D_READ_MAXLEN;
+                else
+                        block_read = todo;
+
+                if (w1_f2d_readblock(sl, off, block_read, buf) < 0)
+                        count = -EIO;
+
+                todo -= W1_F2D_READ_MAXLEN;
+                buf += W1_F2D_READ_MAXLEN;
+                off += W1_F2D_READ_MAXLEN;
+        }
+
+        mutex_unlock(&sl->master->mutex);
+
+        return count;
+}
+
+/*
+ * Writes to the scratchpad and reads it back for verification.
+ * Then copies the scratchpad to EEPROM.
+ * The data must be aligned at W1_F2D_SCRATCH_SIZE bytes and
+ * must be W1_F2D_SCRATCH_SIZE bytes long.
+ * The master must be locked.
+ *
+ * @param sl    The slave structure
+ * @param addr  Address for the write
+ * @param len   length must be <= (W1_F2D_PAGE_SIZE - (addr & W1_F2D_PAGE_MASK))
+ * @param data  The data to write
+ * @return      0=Success -1=failure
+ */
+static int w1_f2d_write(struct w1_slave *sl, int addr, int len, const u8 *data)
+{
+        int tries = W1_F2D_READ_RETRIES;
+        u8 wrbuf[4];
+        u8 rdbuf[W1_F2D_SCRATCH_SIZE + 3];
+        u8 es = (addr + len - 1) % W1_F2D_SCRATCH_SIZE;
+
+retry:
+
+        /* Write the data to the scratchpad */
+        if (w1_reset_select_slave(sl))
+                return -1;
+
+        wrbuf[0] = W1_F2D_WRITE_SCRATCH;
+        wrbuf[1] = addr & 0xff;
+        wrbuf[2] = addr >> 8;
+
+        w1_write_block(sl->master, wrbuf, 3);
+        w1_write_block(sl->master, data, len);
+
+        /* Read the scratchpad and verify */
+        if (w1_reset_select_slave(sl))
+                return -1;
+
+        w1_write_8(sl->master, W1_F2D_READ_SCRATCH);
+        w1_read_block(sl->master, rdbuf, len + 3);
+
+        /* Compare what was read against the data written */
+        if ((rdbuf[0] != wrbuf[1]) || (rdbuf[1] != wrbuf[2]) ||
+            (rdbuf[2] != es) || (memcmp(data, &rdbuf[3], len) != 0)) {
+
+                if (--tries)
+                        goto retry;
+
+                dev_err(&sl->dev,
+                        "could not write to eeprom, scratchpad compare failed %d times\n",
+                        W1_F2D_READ_RETRIES);
+
+                return -1;
+        }
+
+        /* Copy the scratchpad to EEPROM */
+        if (w1_reset_select_slave(sl))
+                return -1;
+
+        wrbuf[0] = W1_F2D_COPY_SCRATCH;
+        wrbuf[3] = es;
+        w1_write_block(sl->master, wrbuf, 4);
+
+        /* Sleep for tprog ms to wait for the write to complete */
+        msleep(W1_F2D_TPROG_MS);
+
+        /* Reset the bus to wake up the EEPROM  */
+        w1_reset_bus(sl->master);
+
+        return 0;
+}
+
+static ssize_t w1_f2d_write_bin(struct kobject *kobj,
+                                struct bin_attribute *bin_attr,
+                                char *buf, loff_t off, size_t count)
+{
+        struct w1_slave *sl = kobj_to_w1_slave(kobj);
+        int addr, len;
+        int copy;
+
+        count = w1_f2d_fix_count(off, count, W1_F2D_EEPROM_SIZE);
+        if (count == 0)
+                return 0;
+
+        mutex_lock(&sl->master->mutex);
+
+        /* Can only write data in blocks of the size of the scratchpad */
+        addr = off;
+        len = count;
+        while (len > 0) {
+
+                /* if len too short or addr not aligned */
+                if (len < W1_F2D_SCRATCH_SIZE || addr & W1_F2D_SCRATCH_MASK) {
+                        char tmp[W1_F2D_SCRATCH_SIZE];
+
+                        /* read the block and update the parts to be written */
+                        if (w1_f2d_readblock(sl, addr & ~W1_F2D_SCRATCH_MASK,
+                                        W1_F2D_SCRATCH_SIZE, tmp)) {
+                                count = -EIO;
+                                goto out_up;
+                        }
+
+                        /* copy at most to the boundary of the PAGE or len */
+                        copy = W1_F2D_SCRATCH_SIZE -
+                                (addr & W1_F2D_SCRATCH_MASK);
+
+                        if (copy > len)
+                                copy = len;
+
+                        memcpy(&tmp[addr & W1_F2D_SCRATCH_MASK], buf, copy);
+                        if (w1_f2d_write(sl, addr & ~W1_F2D_SCRATCH_MASK,
+                                        W1_F2D_SCRATCH_SIZE, tmp) < 0) {
+                                count = -EIO;
+                                goto out_up;
+                        }
+                } else {
+
+                        copy = W1_F2D_SCRATCH_SIZE;
+                        if (w1_f2d_write(sl, addr, copy, buf) < 0) {
+                                count = -EIO;
+                                goto out_up;
+                        }
+                }
+                buf += copy;
+                addr += copy;
+                len -= copy;
+        }
+
+out_up:
+        mutex_unlock(&sl->master->mutex);
+
+        return count;
+}
+
+static struct bin_attribute w1_f2d_bin_attr = {
+        .attr = {
+                .name = "eeprom",
+                .mode = S_IRUGO | S_IWUSR,
+        },
+        .size = W1_F2D_EEPROM_SIZE,
+        .read = w1_f2d_read_bin,
+        .write = w1_f2d_write_bin,
+};
+
+static int w1_f2d_add_slave(struct w1_slave *sl)
+{
+        return sysfs_create_bin_file(&sl->dev.kobj, &w1_f2d_bin_attr);
+}
+
+static void w1_f2d_remove_slave(struct w1_slave *sl)
+{
+        sysfs_remove_bin_file(&sl->dev.kobj, &w1_f2d_bin_attr);
+}
+
+static struct w1_family_ops w1_f2d_fops = {
+        .add_slave      = w1_f2d_add_slave,
+        .remove_slave   = w1_f2d_remove_slave,
+};
+
+static struct w1_family w1_family_2d = {
+        .fid = W1_EEPROM_DS2431,
+        .fops = &w1_f2d_fops,
+};
+
+static int __init w1_f2d_init(void)
+{
+        return w1_register_family(&w1_family_2d);
+}
+
+static void __exit w1_f2d_fini(void)
+{
+        w1_unregister_family(&w1_family_2d);
+}
+
+module_init(w1_f2d_init);
+module_exit(w1_f2d_fini);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Bernhard Weirich <bernhard.weirich@riedel.net>");
+MODULE_DESCRIPTION("w1 family 2d driver for DS2431, 1kb EEPROM");
diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
index fb28acaeed6c..2c8dff9f77da 100644
--- a/drivers/w1/slaves/w1_therm.c
+++ b/drivers/w1/slaves/w1_therm.c
@@ -37,31 +37,33 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>");
 MODULE_DESCRIPTION("Driver for 1-wire Dallas network protocol, temperature family.");
 
+/* Allow the strong pullup to be disabled, but default to enabled.
+ * If it was disabled a parasite powered device might not get the require
+ * current to do a temperature conversion.  If it is enabled parasite powered
+ * devices have a better chance of getting the current required.
+ */
+static int w1_strong_pullup = 1;
+module_param_named(strong_pullup, w1_strong_pullup, int, 0);
+
 static u8 bad_roms[][9] = {
                                 {0xaa, 0x00, 0x4b, 0x46, 0xff, 0xff, 0x0c, 0x10, 0x87},
                                 {}
                         };
 
-static ssize_t w1_therm_read_bin(struct kobject *, struct bin_attribute *,
-                                 char *, loff_t, size_t);
+static ssize_t w1_therm_read(struct device *device,
+        struct device_attribute *attr, char *buf);
 
-static struct bin_attribute w1_therm_bin_attr = {
-        .attr = {
-                .name = "w1_slave",
-                .mode = S_IRUGO,
-        },
-        .size = W1_SLAVE_DATA_SIZE,
-        .read = w1_therm_read_bin,
-};
+static struct device_attribute w1_therm_attr =
+        __ATTR(w1_slave, S_IRUGO, w1_therm_read, NULL);
 
 static int w1_therm_add_slave(struct w1_slave *sl)
 {
-        return sysfs_create_bin_file(&sl->dev.kobj, &w1_therm_bin_attr);
+        return device_create_file(&sl->dev, &w1_therm_attr);
 }
 
 static void w1_therm_remove_slave(struct w1_slave *sl)
 {
-        sysfs_remove_bin_file(&sl->dev.kobj, &w1_therm_bin_attr);
+        device_remove_file(&sl->dev, &w1_therm_attr);
 }
 
 static struct w1_family_ops w1_therm_fops = {
@@ -160,30 +162,19 @@ static int w1_therm_check_rom(u8 rom[9])
         return 0;
 }
 
-static ssize_t w1_therm_read_bin(struct kobject *kobj,
-                                 struct bin_attribute *bin_attr,
-                                 char *buf, loff_t off, size_t count)
+static ssize_t w1_therm_read(struct device *device,
+        struct device_attribute *attr, char *buf)
 {
-        struct w1_slave *sl = kobj_to_w1_slave(kobj);
+        struct w1_slave *sl = dev_to_w1_slave(device);
         struct w1_master *dev = sl->master;
         u8 rom[9], crc, verdict;
         int i, max_trying = 10;
+        ssize_t c = PAGE_SIZE;
 
-        mutex_lock(&sl->master->mutex);
+        mutex_lock(&dev->mutex);
 
-        if (off > W1_SLAVE_DATA_SIZE) {
-                count = 0;
-                goto out;
-        }
-        if (off + count > W1_SLAVE_DATA_SIZE) {
-                count = 0;
-                goto out;
-        }
-
-        memset(buf, 0, count);
         memset(rom, 0, sizeof(rom));
 
-        count = 0;
         verdict = 0;
         crc = 0;
 
@@ -192,15 +183,20 @@ static ssize_t w1_therm_read_bin(struct kobject *kobj,
                         int count = 0;
                         unsigned int tm = 750;
 
+                        /* 750ms strong pullup (or delay) after the convert */
+                        if (w1_strong_pullup)
+                                w1_next_pullup(dev, tm);
                         w1_write_8(dev, W1_CONVERT_TEMP);
-
-                        msleep(tm);
+                        if (!w1_strong_pullup)
+                                msleep(tm);
 
                         if (!w1_reset_select_slave(sl)) {
 
                                 w1_write_8(dev, W1_READ_SCRATCHPAD);
                                 if ((count = w1_read_block(dev, rom, 9)) != 9) {
-                                        dev_warn(&dev->dev, "w1_read_block() returned %d instead of 9.\n", count);
+                                        dev_warn(device, "w1_read_block() "
+                                                "returned %u instead of 9.\n",
+                                                count);
                                 }
 
                                 crc = w1_calc_crc8(rom, 8);
@@ -215,22 +211,22 @@ static ssize_t w1_therm_read_bin(struct kobject *kobj,
         }
 
         for (i = 0; i < 9; ++i)
-                count += sprintf(buf + count, "%02x ", rom[i]);
-        count += sprintf(buf + count, ": crc=%02x %s\n",
+                c -= snprintf(buf + PAGE_SIZE - c, c, "%02x ", rom[i]);
+        c -= snprintf(buf + PAGE_SIZE - c, c, ": crc=%02x %s\n",
                            crc, (verdict) ? "YES" : "NO");
         if (verdict)
                 memcpy(sl->rom, rom, sizeof(sl->rom));
         else
-                dev_warn(&dev->dev, "18S20 doesn't respond to CONVERT_TEMP.\n");
+                dev_warn(device, "18S20 doesn't respond to CONVERT_TEMP.\n");
 
         for (i = 0; i < 9; ++i)
-                count += sprintf(buf + count, "%02x ", sl->rom[i]);
+                c -= snprintf(buf + PAGE_SIZE - c, c, "%02x ", sl->rom[i]);
 
-        count += sprintf(buf + count, "t=%d\n", w1_convert_temp(rom, sl->family->fid));
-out:
+        c -= snprintf(buf + PAGE_SIZE - c, c, "t=%d\n",
+                w1_convert_temp(rom, sl->family->fid));
         mutex_unlock(&dev->mutex);
 
-        return count;
+        return PAGE_SIZE - c;
 }
 
 static int __init w1_therm_init(void)
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 7293c9b11f91..3b615d4022ee 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -46,19 +46,17 @@ MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>");
 MODULE_DESCRIPTION("Driver for 1-wire Dallas network protocol.");
 
 static int w1_timeout = 10;
-static int w1_control_timeout = 1;
 int w1_max_slave_count = 10;
 int w1_max_slave_ttl = 10;
 
 module_param_named(timeout, w1_timeout, int, 0);
-module_param_named(control_timeout, w1_control_timeout, int, 0);
 module_param_named(max_slave_count, w1_max_slave_count, int, 0);
 module_param_named(slave_ttl, w1_max_slave_ttl, int, 0);
 
 DEFINE_MUTEX(w1_mlock);
 LIST_HEAD(w1_masters);
 
-static struct task_struct *w1_control_thread;
+static int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn);
 
 static int w1_master_match(struct device *dev, struct device_driver *drv)
 {
@@ -83,10 +81,10 @@ static void w1_slave_release(struct device *dev)
 {
         struct w1_slave *sl = dev_to_w1_slave(dev);
 
-        printk("%s: Releasing %s.\n", __func__, sl->name);
+        dev_dbg(dev, "%s: Releasing %s.\n", __func__, sl->name);
 
         while (atomic_read(&sl->refcnt)) {
-                printk("Waiting for %s to become free: refcnt=%d.\n",
+                dev_dbg(dev, "Waiting for %s to become free: refcnt=%d.\n",
                                 sl->name, atomic_read(&sl->refcnt));
                 if (msleep_interruptible(1000))
                         flush_signals(current);
@@ -105,35 +103,20 @@ static ssize_t w1_slave_read_name(struct device *dev, struct device_attribute *a
         return sprintf(buf, "%s\n", sl->name);
 }
 
-static ssize_t w1_slave_read_id(struct kobject *kobj,
-                                struct bin_attribute *bin_attr,
-                                char *buf, loff_t off, size_t count)
+static ssize_t w1_slave_read_id(struct device *dev,
+        struct device_attribute *attr, char *buf)
 {
-        struct w1_slave *sl = kobj_to_w1_slave(kobj);
-
-        if (off > 8) {
-                count = 0;
-        } else {
-                if (off + count > 8)
-                        count = 8 - off;
-
-                memcpy(buf, (u8 *)&sl->reg_num, count);
-        }
+        struct w1_slave *sl = dev_to_w1_slave(dev);
+        ssize_t count = sizeof(sl->reg_num);
 
+        memcpy(buf, (u8 *)&sl->reg_num, count);
         return count;
 }
 
 static struct device_attribute w1_slave_attr_name =
         __ATTR(name, S_IRUGO, w1_slave_read_name, NULL);
-
-static struct bin_attribute w1_slave_attr_bin_id = {
-      .attr = {
-              .name = "id",
-              .mode = S_IRUGO,
-      },
-      .size = 8,
-      .read = w1_slave_read_id,
-};
+static struct device_attribute w1_slave_attr_id =
+        __ATTR(id, S_IRUGO, w1_slave_read_id, NULL);
 
 /* Default family */
 
@@ -250,11 +233,16 @@ static ssize_t w1_master_attribute_store_search(struct device * dev,
                                                 struct device_attribute *attr,
                                                 const char * buf, size_t count)
 {
+        long tmp;
         struct w1_master *md = dev_to_w1_master(dev);
 
+        if (strict_strtol(buf, 0, &tmp) == -EINVAL)
+                return -EINVAL;
+
         mutex_lock(&md->mutex);
-        md->search_count = simple_strtol(buf, NULL, 0);
+        md->search_count = tmp;
         mutex_unlock(&md->mutex);
+        wake_up_process(md->thread);
 
         return count;
 }
@@ -273,6 +261,38 @@ static ssize_t w1_master_attribute_show_search(struct device *dev,
         return count;
 }
 
+static ssize_t w1_master_attribute_store_pullup(struct device *dev,
+                                                struct device_attribute *attr,
+                                                const char *buf, size_t count)
+{
+        long tmp;
+        struct w1_master *md = dev_to_w1_master(dev);
+
+        if (strict_strtol(buf, 0, &tmp) == -EINVAL)
+                return -EINVAL;
+
+        mutex_lock(&md->mutex);
+        md->enable_pullup = tmp;
+        mutex_unlock(&md->mutex);
+        wake_up_process(md->thread);
+
+        return count;
+}
+
+static ssize_t w1_master_attribute_show_pullup(struct device *dev,
+                                               struct device_attribute *attr,
+                                               char *buf)
+{
+        struct w1_master *md = dev_to_w1_master(dev);
+        ssize_t count;
+
+        mutex_lock(&md->mutex);
+        count = sprintf(buf, "%d\n", md->enable_pullup);
+        mutex_unlock(&md->mutex);
+
+        return count;
+}
+
 static ssize_t w1_master_attribute_show_pointer(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w1_master *md = dev_to_w1_master(dev);
@@ -324,7 +344,8 @@ static ssize_t w1_master_attribute_show_slave_count(struct device *dev, struct d
         return count;
 }
 
-static ssize_t w1_master_attribute_show_slaves(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t w1_master_attribute_show_slaves(struct device *dev,
+        struct device_attribute *attr, char *buf)
 {
         struct w1_master *md = dev_to_w1_master(dev);
         int c = PAGE_SIZE;
@@ -349,6 +370,135 @@ static ssize_t w1_master_attribute_show_slaves(struct device *dev, struct device
         return PAGE_SIZE - c;
 }
 
+static ssize_t w1_master_attribute_show_add(struct device *dev,
+        struct device_attribute *attr, char *buf)
+{
+        int c = PAGE_SIZE;
+        c -= snprintf(buf+PAGE_SIZE - c, c,
+                "write device id xx-xxxxxxxxxxxx to add slave\n");
+        return PAGE_SIZE - c;
+}
+
+static int w1_atoreg_num(struct device *dev, const char *buf, size_t count,
+        struct w1_reg_num *rn)
+{
+        unsigned int family;
+        unsigned long long id;
+        int i;
+        u64 rn64_le;
+
+        /* The CRC value isn't read from the user because the sysfs directory
+         * doesn't include it and most messages from the bus search don't
+         * print it either.  It would be unreasonable for the user to then
+         * provide it.
+         */
+        const char *error_msg = "bad slave string format, expecting "
+                "ff-dddddddddddd\n";
+
+        if (buf[2] != '-') {
+                dev_err(dev, "%s", error_msg);
+                return -EINVAL;
+        }
+        i = sscanf(buf, "%02x-%012llx", &family, &id);
+        if (i != 2) {
+                dev_err(dev, "%s", error_msg);
+                return -EINVAL;
+        }
+        rn->family = family;
+        rn->id = id;
+
+        rn64_le = cpu_to_le64(*(u64 *)rn);
+        rn->crc = w1_calc_crc8((u8 *)&rn64_le, 7);
+
+#if 0
+        dev_info(dev, "With CRC device is %02x.%012llx.%02x.\n",
+                  rn->family, (unsigned long long)rn->id, rn->crc);
+#endif
+
+        return 0;
+}
+
+/* Searches the slaves in the w1_master and returns a pointer or NULL.
+ * Note: must hold the mutex
+ */
+static struct w1_slave *w1_slave_search_device(struct w1_master *dev,
+        struct w1_reg_num *rn)
+{
+        struct w1_slave *sl;
+        list_for_each_entry(sl, &dev->slist, w1_slave_entry) {
+                if (sl->reg_num.family == rn->family &&
+                                sl->reg_num.id == rn->id &&
+                                sl->reg_num.crc == rn->crc) {
+                        return sl;
+                }
+        }
+        return NULL;
+}
+
+static ssize_t w1_master_attribute_store_add(struct device *dev,
+                                                struct device_attribute *attr,
+                                                const char *buf, size_t count)
+{
+        struct w1_master *md = dev_to_w1_master(dev);
+        struct w1_reg_num rn;
+        struct w1_slave *sl;
+        ssize_t result = count;
+
+        if (w1_atoreg_num(dev, buf, count, &rn))
+                return -EINVAL;
+
+        mutex_lock(&md->mutex);
+        sl = w1_slave_search_device(md, &rn);
+        /* It would be nice to do a targeted search one the one-wire bus
+         * for the new device to see if it is out there or not.  But the
+         * current search doesn't support that.
+         */
+        if (sl) {
+                dev_info(dev, "Device %s already exists\n", sl->name);
+                result = -EINVAL;
+        } else {
+                w1_attach_slave_device(md, &rn);
+        }
+        mutex_unlock(&md->mutex);
+
+        return result;
+}
+
+static ssize_t w1_master_attribute_show_remove(struct device *dev,
+        struct device_attribute *attr, char *buf)
+{
+        int c = PAGE_SIZE;
+        c -= snprintf(buf+PAGE_SIZE - c, c,
+                "write device id xx-xxxxxxxxxxxx to remove slave\n");
+        return PAGE_SIZE - c;
+}
+
+static ssize_t w1_master_attribute_store_remove(struct device *dev,
+                                                struct device_attribute *attr,
+                                                const char *buf, size_t count)
+{
+        struct w1_master *md = dev_to_w1_master(dev);
+        struct w1_reg_num rn;
+        struct w1_slave *sl;
+        ssize_t result = count;
+
+        if (w1_atoreg_num(dev, buf, count, &rn))
+                return -EINVAL;
+
+        mutex_lock(&md->mutex);
+        sl = w1_slave_search_device(md, &rn);
+        if (sl) {
+                w1_slave_detach(sl);
+        } else {
+                dev_info(dev, "Device %02x-%012llx doesn't exists\n", rn.family,
+                        (unsigned long long)rn.id);
+                result = -EINVAL;
+        }
+        mutex_unlock(&md->mutex);
+
+        return result;
+}
+
 #define W1_MASTER_ATTR_RO(_name, _mode)                         \
         struct device_attribute w1_master_attribute_##_name =   \
                 __ATTR(w1_master_##_name, _mode,                \
@@ -368,6 +518,9 @@ static W1_MASTER_ATTR_RO(attempts, S_IRUGO);
 static W1_MASTER_ATTR_RO(timeout, S_IRUGO);
 static W1_MASTER_ATTR_RO(pointer, S_IRUGO);
 static W1_MASTER_ATTR_RW(search, S_IRUGO | S_IWUGO);
+static W1_MASTER_ATTR_RW(pullup, S_IRUGO | S_IWUGO);
+static W1_MASTER_ATTR_RW(add, S_IRUGO | S_IWUGO);
+static W1_MASTER_ATTR_RW(remove, S_IRUGO | S_IWUGO);
 
 static struct attribute *w1_master_default_attrs[] = {
         &w1_master_attribute_name.attr,
@@ -378,6 +531,9 @@ static struct attribute *w1_master_default_attrs[] = {
         &w1_master_attribute_timeout.attr,
         &w1_master_attribute_pointer.attr,
         &w1_master_attribute_search.attr,
+        &w1_master_attribute_pullup.attr,
+        &w1_master_attribute_add.attr,
+        &w1_master_attribute_remove.attr,
         NULL
 };
 
@@ -390,7 +546,7 @@ int w1_create_master_attributes(struct w1_master *master)
         return sysfs_create_group(&master->dev.kobj, &w1_master_defattr_group);
 }
 
-static void w1_destroy_master_attributes(struct w1_master *master)
+void w1_destroy_master_attributes(struct w1_master *master)
 {
         sysfs_remove_group(&master->dev.kobj, &w1_master_defattr_group);
 }
@@ -479,7 +635,7 @@ static int __w1_attach_slave_device(struct w1_slave *sl)
         }
 
         /* Create "id" entry */
-        err = sysfs_create_bin_file(&sl->dev.kobj, &w1_slave_attr_bin_id);
+        err = device_create_file(&sl->dev, &w1_slave_attr_id);
         if (err < 0) {
                 dev_err(&sl->dev,
                         "sysfs file creation for [%s] failed. err=%d\n",
@@ -501,7 +657,7 @@ static int __w1_attach_slave_device(struct w1_slave *sl)
         return 0;
 
 out_rem2:
-        sysfs_remove_bin_file(&sl->dev.kobj, &w1_slave_attr_bin_id);
+        device_remove_file(&sl->dev, &w1_slave_attr_id);
 out_rem1:
         device_remove_file(&sl->dev, &w1_slave_attr_name);
 out_unreg:
@@ -567,7 +723,7 @@ static int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn)
         return 0;
 }
 
-static void w1_slave_detach(struct w1_slave *sl)
+void w1_slave_detach(struct w1_slave *sl)
 {
         struct w1_netlink_msg msg;
 
@@ -583,7 +739,7 @@ static void w1_slave_detach(struct w1_slave *sl)
         msg.type = W1_SLAVE_REMOVE;
         w1_netlink_send(sl->master, &msg);
 
-        sysfs_remove_bin_file(&sl->dev.kobj, &w1_slave_attr_bin_id);
+        device_remove_file(&sl->dev, &w1_slave_attr_id);
         device_remove_file(&sl->dev, &w1_slave_attr_name);
         device_unregister(&sl->dev);
 
@@ -591,24 +747,6 @@ static void w1_slave_detach(struct w1_slave *sl)
         kfree(sl);
 }
 
-static struct w1_master *w1_search_master(void *data)
-{
-        struct w1_master *dev;
-        int found = 0;
-
-        mutex_lock(&w1_mlock);
-        list_for_each_entry(dev, &w1_masters, w1_master_entry) {
-                if (dev->bus_master->data == data) {
-                        found = 1;
-                        atomic_inc(&dev->refcnt);
-                        break;
-                }
-        }
-        mutex_unlock(&w1_mlock);
-
-        return (found)?dev:NULL;
-}
-
 struct w1_master *w1_search_master_id(u32 id)
 {
         struct w1_master *dev;
@@ -656,55 +794,56 @@ struct w1_slave *w1_search_slave(struct w1_reg_num *id)
         return (found)?sl:NULL;
 }
 
-void w1_reconnect_slaves(struct w1_family *f)
+void w1_reconnect_slaves(struct w1_family *f, int attach)
 {
+        struct w1_slave *sl, *sln;
         struct w1_master *dev;
 
         mutex_lock(&w1_mlock);
         list_for_each_entry(dev, &w1_masters, w1_master_entry) {
-                dev_dbg(&dev->dev, "Reconnecting slaves in %s into new family %02x.\n",
-                                dev->name, f->fid);
-                set_bit(W1_MASTER_NEED_RECONNECT, &dev->flags);
+                dev_dbg(&dev->dev, "Reconnecting slaves in device %s "
+                        "for family %02x.\n", dev->name, f->fid);
+                mutex_lock(&dev->mutex);
+                list_for_each_entry_safe(sl, sln, &dev->slist, w1_slave_entry) {
+                        /* If it is a new family, slaves with the default
+                         * family driver and are that family will be
+                         * connected.  If the family is going away, devices
+                         * matching that family are reconneced.
+                         */
+                        if ((attach && sl->family->fid == W1_FAMILY_DEFAULT
+                                && sl->reg_num.family == f->fid) ||
+                                (!attach && sl->family->fid == f->fid)) {
+                                struct w1_reg_num rn;
+
+                                memcpy(&rn, &sl->reg_num, sizeof(rn));
+                                w1_slave_detach(sl);
+
+                                w1_attach_slave_device(dev, &rn);
+                        }
+                }
+                dev_dbg(&dev->dev, "Reconnecting slaves in device %s "
+                        "has been finished.\n", dev->name);
+                mutex_unlock(&dev->mutex);
         }
         mutex_unlock(&w1_mlock);
 }
 
-static void w1_slave_found(void *data, u64 rn)
+static void w1_slave_found(struct w1_master *dev, u64 rn)
 {
-        int slave_count;
         struct w1_slave *sl;
-        struct list_head *ent;
         struct w1_reg_num *tmp;
-        struct w1_master *dev;
         u64 rn_le = cpu_to_le64(rn);
 
-        dev = w1_search_master(data);
-        if (!dev) {
-                printk(KERN_ERR "Failed to find w1 master device for data %p, "
-                       "it is impossible.\n", data);
-                return;
-        }
+        atomic_inc(&dev->refcnt);
 
         tmp = (struct w1_reg_num *) &rn;
 
-        slave_count = 0;
-        list_for_each(ent, &dev->slist) {
-
-                sl = list_entry(ent, struct w1_slave, w1_slave_entry);
-
-                if (sl->reg_num.family == tmp->family &&
-                    sl->reg_num.id == tmp->id &&
-                    sl->reg_num.crc == tmp->crc) {
-                        set_bit(W1_SLAVE_ACTIVE, (long *)&sl->flags);
-                        break;
-                }
-
-                slave_count++;
-        }
-
-        if (slave_count == dev->slave_count &&
-                rn && ((rn >> 56) & 0xff) == w1_calc_crc8((u8 *)&rn_le, 7)) {
-                w1_attach_slave_device(dev, tmp);
+        sl = w1_slave_search_device(dev, tmp);
+        if (sl) {
+                set_bit(W1_SLAVE_ACTIVE, (long *)&sl->flags);
+        } else {
+                if (rn && tmp->crc == w1_calc_crc8((u8 *)&rn_le, 7))
+                        w1_attach_slave_device(dev, tmp);
         }
 
         atomic_dec(&dev->refcnt);
@@ -779,80 +918,20 @@ void w1_search(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb
                         /* extract the direction taken & update the device number */
                         tmp64 = (triplet_ret >> 2);
                         rn |= (tmp64 << i);
+
+                        if (kthread_should_stop()) {
+                                dev_dbg(&dev->dev, "Abort w1_search\n");
+                                return;
+                        }
                 }
 
                 if ( (triplet_ret & 0x03) != 0x03 ) {
                         if ( (desc_bit == last_zero) || (last_zero < 0))
                                 last_device = 1;
                         desc_bit = last_zero;
-                        cb(dev->bus_master->data, rn);
-                }
-        }
-}
-
-static int w1_control(void *data)
-{
-        struct w1_slave *sl, *sln;
-        struct w1_master *dev, *n;
-        int have_to_wait = 0;
-
-        set_freezable();
-        while (!kthread_should_stop() || have_to_wait) {
-                have_to_wait = 0;
-
-                try_to_freeze();
-                msleep_interruptible(w1_control_timeout * 1000);
-
-                list_for_each_entry_safe(dev, n, &w1_masters, w1_master_entry) {
-                        if (!kthread_should_stop() && !dev->flags)
-                                continue;
-                        /*
-                         * Little race: we can create thread but not set the flag.
-                         * Get a chance for external process to set flag up.
-                         */
-                        if (!dev->initialized) {
-                                have_to_wait = 1;
-                                continue;
-                        }
-
-                        if (kthread_should_stop() || test_bit(W1_MASTER_NEED_EXIT, &dev->flags)) {
-                                set_bit(W1_MASTER_NEED_EXIT, &dev->flags);
-
-                                mutex_lock(&w1_mlock);
-                                list_del(&dev->w1_master_entry);
-                                mutex_unlock(&w1_mlock);
-
-                                mutex_lock(&dev->mutex);
-                                list_for_each_entry_safe(sl, sln, &dev->slist, w1_slave_entry) {
-                                        w1_slave_detach(sl);
-                                }
-                                w1_destroy_master_attributes(dev);
-                                mutex_unlock(&dev->mutex);
-                                atomic_dec(&dev->refcnt);
-                                continue;
-                        }
-
-                        if (test_bit(W1_MASTER_NEED_RECONNECT, &dev->flags)) {
-                                dev_dbg(&dev->dev, "Reconnecting slaves in device %s.\n", dev->name);
-                                mutex_lock(&dev->mutex);
-                                list_for_each_entry_safe(sl, sln, &dev->slist, w1_slave_entry) {
-                                        if (sl->family->fid == W1_FAMILY_DEFAULT) {
-                                                struct w1_reg_num rn;
-
-                                                memcpy(&rn, &sl->reg_num, sizeof(rn));
-                                                w1_slave_detach(sl);
-
-                                                w1_attach_slave_device(dev, &rn);
-                                        }
-                                }
-                                dev_dbg(&dev->dev, "Reconnecting slaves in device %s has been finished.\n", dev->name);
-                                clear_bit(W1_MASTER_NEED_RECONNECT, &dev->flags);
-                                mutex_unlock(&dev->mutex);
-                        }
+                        cb(dev, rn);
                 }
         }
-
-        return 0;
 }
 
 void w1_search_process(struct w1_master *dev, u8 search_type)
@@ -878,23 +957,29 @@ void w1_search_process(struct w1_master *dev, u8 search_type)
 int w1_process(void *data)
 {
         struct w1_master *dev = (struct w1_master *) data;
+        /* As long as w1_timeout is only set by a module parameter the sleep
+         * time can be calculated in jiffies once.
+         */
+        const unsigned long jtime = msecs_to_jiffies(w1_timeout * 1000);
+
+        while (!kthread_should_stop()) {
+                if (dev->search_count) {
+                        mutex_lock(&dev->mutex);
+                        w1_search_process(dev, W1_SEARCH);
+                        mutex_unlock(&dev->mutex);
+                }
 
-        while (!kthread_should_stop() && !test_bit(W1_MASTER_NEED_EXIT, &dev->flags)) {
                 try_to_freeze();
-                msleep_interruptible(w1_timeout * 1000);
+                __set_current_state(TASK_INTERRUPTIBLE);
 
-                if (kthread_should_stop() || test_bit(W1_MASTER_NEED_EXIT, &dev->flags))
+                if (kthread_should_stop())
                         break;
 
-                if (!dev->initialized)
-                        continue;
-
-                if (dev->search_count == 0)
-                        continue;
-
-                mutex_lock(&dev->mutex);
-                w1_search_process(dev, W1_SEARCH);
-                mutex_unlock(&dev->mutex);
+                /* Only sleep when the search is active. */
+                if (dev->search_count)
+                        schedule_timeout(jtime);
+                else
+                        schedule();
         }
 
         atomic_dec(&dev->refcnt);
@@ -932,18 +1017,13 @@ static int w1_init(void)
                 goto err_out_master_unregister;
         }
 
-        w1_control_thread = kthread_run(w1_control, NULL, "w1_control");
-        if (IS_ERR(w1_control_thread)) {
-                retval = PTR_ERR(w1_control_thread);
-                printk(KERN_ERR "Failed to create control thread. err=%d\n",
-                        retval);
-                goto err_out_slave_unregister;
-        }
-
         return 0;
 
+#if 0
+/* For undoing the slave register if there was a step after it. */
 err_out_slave_unregister:
         driver_unregister(&w1_slave_driver);
+#endif
 
 err_out_master_unregister:
         driver_unregister(&w1_master_driver);
@@ -959,13 +1039,12 @@ static void w1_fini(void)
 {
         struct w1_master *dev;
 
+        /* Set netlink removal messages and some cleanup */
         list_for_each_entry(dev, &w1_masters, w1_master_entry)
                 __w1_remove_master_device(dev);
 
         w1_fini_netlink();
 
-        kthread_stop(w1_control_thread);
-
         driver_unregister(&w1_slave_driver);
         driver_unregister(&w1_master_driver);
         bus_unregister(&w1_bus_type);
diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h
index f1df5343f4ad..cdaa6fffbfc7 100644
--- a/drivers/w1/w1.h
+++ b/drivers/w1/w1.h
@@ -46,7 +46,6 @@ struct w1_reg_num
 #include "w1_family.h"
 
 #define W1_MAXNAMELEN           32
-#define W1_SLAVE_DATA_SIZE      128
 
 #define W1_SEARCH               0xF0
 #define W1_ALARM_SEARCH         0xEC
@@ -77,7 +76,7 @@ struct w1_slave
         struct completion       released;
 };
 
-typedef void (* w1_slave_found_callback)(void *, u64);
+typedef void (*w1_slave_found_callback)(struct w1_master *, u64);
 
 
 /**
@@ -142,12 +141,18 @@ struct w1_bus_master
          */
         u8              (*reset_bus)(void *);
 
-        /** Really nice hardware can handles the different types of ROM search */
-        void            (*search)(void *, u8, w1_slave_found_callback);
-};
+        /**
+         * Put out a strong pull-up pulse of the specified duration.
+         * @return -1=Error, 0=completed
+         */
+        u8              (*set_pullup)(void *, int);
 
-#define W1_MASTER_NEED_EXIT             0
-#define W1_MASTER_NEED_RECONNECT        1
+        /** Really nice hardware can handles the different types of ROM search
+         *  w1_master* is passed to the slave found callback.
+         */
+        void            (*search)(void *, struct w1_master *,
+                u8, w1_slave_found_callback);
+};
 
 struct w1_master
 {
@@ -167,7 +172,10 @@ struct w1_master
         void                    *priv;
         int                     priv_size;
 
-        long                    flags;
+        /** 5V strong pullup enabled flag, 1 enabled, zero disabled. */
+        int                     enable_pullup;
+        /** 5V strong pullup duration in milliseconds, zero disabled. */
+        int                     pullup_duration;
 
         struct task_struct      *thread;
         struct mutex            mutex;
@@ -181,12 +189,21 @@ struct w1_master
 };
 
 int w1_create_master_attributes(struct w1_master *);
+void w1_destroy_master_attributes(struct w1_master *master);
 void w1_search(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb);
 void w1_search_devices(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb);
 struct w1_slave *w1_search_slave(struct w1_reg_num *id);
 void w1_search_process(struct w1_master *dev, u8 search_type);
 struct w1_master *w1_search_master_id(u32 id);
 
+/* Disconnect and reconnect devices in the given family.  Used for finding
+ * unclaimed devices after a family has been registered or releasing devices
+ * after a family has been unregistered.  Set attach to 1 when a new family
+ * has just been registered, to 0 when it has been unregistered.
+ */
+void w1_reconnect_slaves(struct w1_family *f, int attach);
+void w1_slave_detach(struct w1_slave *sl);
+
 u8 w1_triplet(struct w1_master *dev, int bdir);
 void w1_write_8(struct w1_master *, u8);
 int w1_reset_bus(struct w1_master *);
@@ -194,6 +211,7 @@ u8 w1_calc_crc8(u8 *, int);
 void w1_write_block(struct w1_master *, const u8 *, int);
 u8 w1_read_block(struct w1_master *, u8 *, int);
 int w1_reset_select_slave(struct w1_slave *sl);
+void w1_next_pullup(struct w1_master *, int);
 
 static inline struct w1_slave* dev_to_w1_slave(struct device *dev)
 {
diff --git a/drivers/w1/w1_family.c b/drivers/w1/w1_family.c
index a3c95bd6890a..4a099041f28a 100644
--- a/drivers/w1/w1_family.c
+++ b/drivers/w1/w1_family.c
@@ -48,12 +48,12 @@ int w1_register_family(struct w1_family *newf)
 
         if (!ret) {
                 atomic_set(&newf->refcnt, 0);
-                newf->need_exit = 0;
                 list_add_tail(&newf->family_entry, &w1_families);
         }
         spin_unlock(&w1_flock);
 
-        w1_reconnect_slaves(newf);
+        /* check default devices against the new set of drivers */
+        w1_reconnect_slaves(newf, 1);
 
         return ret;
 }
@@ -72,11 +72,11 @@ void w1_unregister_family(struct w1_family *fent)
                         break;
                 }
         }
-
-        fent->need_exit = 1;
-
         spin_unlock(&w1_flock);
 
+        /* deatch devices using this family code */
+        w1_reconnect_slaves(fent, 0);
+
         while (atomic_read(&fent->refcnt)) {
                 printk(KERN_INFO "Waiting for family %u to become free: refcnt=%d.\n",
                                 fent->fid, atomic_read(&fent->refcnt));
@@ -109,8 +109,7 @@ struct w1_family * w1_family_registered(u8 fid)
 
 static void __w1_family_put(struct w1_family *f)
 {
-        if (atomic_dec_and_test(&f->refcnt))
-                f->need_exit = 1;
+        atomic_dec(&f->refcnt);
 }
 
 void w1_family_put(struct w1_family *f)
diff --git a/drivers/w1/w1_family.h b/drivers/w1/w1_family.h
index ef1e1dafa19a..3ca1b9298f21 100644
--- a/drivers/w1/w1_family.h
+++ b/drivers/w1/w1_family.h
@@ -33,6 +33,7 @@
 #define W1_THERM_DS1822         0x22
 #define W1_EEPROM_DS2433        0x23
 #define W1_THERM_DS18B20        0x28
+#define W1_EEPROM_DS2431        0x2D
 #define W1_FAMILY_DS2760        0x30
 
 #define MAXNAMELEN              32
@@ -53,7 +54,6 @@ struct w1_family
         struct w1_family_ops    *fops;
 
         atomic_t                refcnt;
-        u8                      need_exit;
 };
 
 extern spinlock_t w1_flock;
@@ -63,6 +63,5 @@ void __w1_family_get(struct w1_family *);
 struct w1_family * w1_family_registered(u8);
 void w1_unregister_family(struct w1_family *);
 int w1_register_family(struct w1_family *);
-void w1_reconnect_slaves(struct w1_family *f);
 
 #endif /* __W1_FAMILY_H */
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
index 6840dfebe4d4..a3a54567bfba 100644
--- a/drivers/w1/w1_int.c
+++ b/drivers/w1/w1_int.c
@@ -29,7 +29,11 @@
 #include "w1_netlink.h"
 #include "w1_int.h"
 
-static u32 w1_ids = 1;
+static int w1_search_count = -1; /* Default is continual scan */
+module_param_named(search_count, w1_search_count, int, 0);
+
+static int w1_enable_pullup = 1;
+module_param_named(enable_pullup, w1_enable_pullup, int, 0);
 
 static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
                                        struct device_driver *driver,
@@ -59,8 +63,12 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
         dev->initialized        = 0;
         dev->id                 = id;
         dev->slave_ttl          = slave_ttl;
-        dev->search_count       = -1; /* continual scan */
+        dev->search_count       = w1_search_count;
+        dev->enable_pullup      = w1_enable_pullup;
 
+        /* 1 for w1_process to decrement
+         * 1 for __w1_remove_master_device to decrement
+         */
         atomic_set(&dev->refcnt, 2);
 
         INIT_LIST_HEAD(&dev->slist);
@@ -93,9 +101,10 @@ static void w1_free_dev(struct w1_master *dev)
 
 int w1_add_master_device(struct w1_bus_master *master)
 {
-        struct w1_master *dev;
+        struct w1_master *dev, *entry;
         int retval = 0;
         struct w1_netlink_msg msg;
+        int id, found;
 
         /* validate minimum functionality */
         if (!(master->touch_bit && master->reset_bus) &&
@@ -104,10 +113,50 @@ int w1_add_master_device(struct w1_bus_master *master)
                 printk(KERN_ERR "w1_add_master_device: invalid function set\n");
                 return(-EINVAL);
         }
+        /* While it would be electrically possible to make a device that
+         * generated a strong pullup in bit bang mode, only hardare that
+         * controls 1-wire time frames are even expected to support a strong
+         * pullup.  w1_io.c would need to support calling set_pullup before
+         * the last write_bit operation of a w1_write_8 which it currently
+         * doesn't.
+         */
+        if (!master->write_byte && !master->touch_bit && master->set_pullup) {
+                printk(KERN_ERR "w1_add_master_device: set_pullup requires "
+                        "write_byte or touch_bit, disabling\n");
+                master->set_pullup = NULL;
+        }
+
+        /* Lock until the device is added (or not) to w1_masters. */
+        mutex_lock(&w1_mlock);
+        /* Search for the first available id (starting at 1). */
+        id = 0;
+        do {
+                ++id;
+                found = 0;
+                list_for_each_entry(entry, &w1_masters, w1_master_entry) {
+                        if (entry->id == id) {
+                                found = 1;
+                                break;
+                        }
+                }
+        } while (found);
 
-        dev = w1_alloc_dev(w1_ids++, w1_max_slave_count, w1_max_slave_ttl, &w1_master_driver, &w1_master_device);
-        if (!dev)
+        dev = w1_alloc_dev(id, w1_max_slave_count, w1_max_slave_ttl,
+                &w1_master_driver, &w1_master_device);
+        if (!dev) {
+                mutex_unlock(&w1_mlock);
                 return -ENOMEM;
+        }
+
+        retval =  w1_create_master_attributes(dev);
+        if (retval) {
+                mutex_unlock(&w1_mlock);
+                goto err_out_free_dev;
+        }
+
+        memcpy(dev->bus_master, master, sizeof(struct w1_bus_master));
+
+        dev->initialized = 1;
 
         dev->thread = kthread_run(&w1_process, dev, "%s", dev->name);
         if (IS_ERR(dev->thread)) {
@@ -115,18 +164,10 @@ int w1_add_master_device(struct w1_bus_master *master)
                 dev_err(&dev->dev,
                          "Failed to create new kernel thread. err=%d\n",
                          retval);
-                goto err_out_free_dev;
+                mutex_unlock(&w1_mlock);
+                goto err_out_rm_attr;
         }
 
-        retval =  w1_create_master_attributes(dev);
-        if (retval)
-                goto err_out_kill_thread;
-
-        memcpy(dev->bus_master, master, sizeof(struct w1_bus_master));
-
-        dev->initialized = 1;
-
-        mutex_lock(&w1_mlock);
         list_add(&dev->w1_master_entry, &w1_masters);
         mutex_unlock(&w1_mlock);
 
@@ -137,8 +178,12 @@ int w1_add_master_device(struct w1_bus_master *master)
 
         return 0;
 
+#if 0 /* Thread cleanup code, not required currently. */
 err_out_kill_thread:
         kthread_stop(dev->thread);
+#endif
+err_out_rm_attr:
+        w1_destroy_master_attributes(dev);
 err_out_free_dev:
         w1_free_dev(dev);
 
@@ -148,10 +193,21 @@ err_out_free_dev:
 void __w1_remove_master_device(struct w1_master *dev)
 {
         struct w1_netlink_msg msg;
+        struct w1_slave *sl, *sln;
 
-        set_bit(W1_MASTER_NEED_EXIT, &dev->flags);
         kthread_stop(dev->thread);
 
+        mutex_lock(&w1_mlock);
+        list_del(&dev->w1_master_entry);
+        mutex_unlock(&w1_mlock);
+
+        mutex_lock(&dev->mutex);
+        list_for_each_entry_safe(sl, sln, &dev->slist, w1_slave_entry)
+                w1_slave_detach(sl);
+        w1_destroy_master_attributes(dev);
+        mutex_unlock(&dev->mutex);
+        atomic_dec(&dev->refcnt);
+
         while (atomic_read(&dev->refcnt)) {
                 dev_info(&dev->dev, "Waiting for %s to become free: refcnt=%d.\n",
                                 dev->name, atomic_read(&dev->refcnt));
diff --git a/drivers/w1/w1_io.c b/drivers/w1/w1_io.c
index 30b6fbf83bd4..f4f82f1f486e 100644
--- a/drivers/w1/w1_io.c
+++ b/drivers/w1/w1_io.c
@@ -93,6 +93,40 @@ static void w1_write_bit(struct w1_master *dev, int bit)
 }
 
 /**
+ * Pre-write operation, currently only supporting strong pullups.
+ * Program the hardware for a strong pullup, if one has been requested and
+ * the hardware supports it.
+ *
+ * @param dev     the master device
+ */
+static void w1_pre_write(struct w1_master *dev)
+{
+        if (dev->pullup_duration &&
+                dev->enable_pullup && dev->bus_master->set_pullup) {
+                dev->bus_master->set_pullup(dev->bus_master->data,
+                        dev->pullup_duration);
+        }
+}
+
+/**
+ * Post-write operation, currently only supporting strong pullups.
+ * If a strong pullup was requested, clear it if the hardware supports
+ * them, or execute the delay otherwise, in either case clear the request.
+ *
+ * @param dev     the master device
+ */
+static void w1_post_write(struct w1_master *dev)
+{
+        if (dev->pullup_duration) {
+                if (dev->enable_pullup && dev->bus_master->set_pullup)
+                        dev->bus_master->set_pullup(dev->bus_master->data, 0);
+                else
+                        msleep(dev->pullup_duration);
+                dev->pullup_duration = 0;
+        }
+}
+
+/**
  * Writes 8 bits.
  *
  * @param dev     the master device
@@ -102,11 +136,17 @@ void w1_write_8(struct w1_master *dev, u8 byte)
 {
         int i;
 
-        if (dev->bus_master->write_byte)
+        if (dev->bus_master->write_byte) {
+                w1_pre_write(dev);
                 dev->bus_master->write_byte(dev->bus_master->data, byte);
+        }
         else
-                for (i = 0; i < 8; ++i)
+                for (i = 0; i < 8; ++i) {
+                        if (i == 7)
+                                w1_pre_write(dev);
                         w1_touch_bit(dev, (byte >> i) & 0x1);
+                }
+        w1_post_write(dev);
 }
 EXPORT_SYMBOL_GPL(w1_write_8);
 
@@ -203,11 +243,14 @@ void w1_write_block(struct w1_master *dev, const u8 *buf, int len)
 {
         int i;
 
-        if (dev->bus_master->write_block)
+        if (dev->bus_master->write_block) {
+                w1_pre_write(dev);
                 dev->bus_master->write_block(dev->bus_master->data, buf, len);
+        }
         else
                 for (i = 0; i < len; ++i)
-                        w1_write_8(dev, buf[i]);
+                        w1_write_8(dev, buf[i]); /* calls w1_pre_write */
+        w1_post_write(dev);
 }
 EXPORT_SYMBOL_GPL(w1_write_block);
 
@@ -250,12 +293,24 @@ int w1_reset_bus(struct w1_master *dev)
                 result = dev->bus_master->reset_bus(dev->bus_master->data) & 0x1;
         else {
                 dev->bus_master->write_bit(dev->bus_master->data, 0);
+                /* minimum 480, max ? us
+                 * be nice and sleep, except 18b20 spec lists 960us maximum,
+                 * so until we can sleep with microsecond accuracy, spin.
+                 * Feel free to come up with some other way to give up the
+                 * cpu for such a short amount of time AND get it back in
+                 * the maximum amount of time.
+                 */
                 w1_delay(480);
                 dev->bus_master->write_bit(dev->bus_master->data, 1);
                 w1_delay(70);
 
                 result = dev->bus_master->read_bit(dev->bus_master->data) & 0x1;
-                w1_delay(410);
+                /* minmum 70 (above) + 410 = 480 us
+                 * There aren't any timing requirements between a reset and
+                 * the following transactions.  Sleeping is safe here.
+                 */
+                /* w1_delay(410); min required time */
+                msleep(1);
         }
 
         return result;
@@ -277,7 +332,8 @@ void w1_search_devices(struct w1_master *dev, u8 search_type, w1_slave_found_cal
 {
         dev->attempts++;
         if (dev->bus_master->search)
-                dev->bus_master->search(dev->bus_master->data, search_type, cb);
+                dev->bus_master->search(dev->bus_master->data, dev,
+                        search_type, cb);
         else
                 w1_search(dev, search_type, cb);
 }
@@ -305,3 +361,20 @@ int w1_reset_select_slave(struct w1_slave *sl)
         return 0;
 }
 EXPORT_SYMBOL_GPL(w1_reset_select_slave);
+
+/**
+ * Put out a strong pull-up of the specified duration after the next write
+ * operation.  Not all hardware supports strong pullups.  Hardware that
+ * doesn't support strong pullups will sleep for the given time after the
+ * write operation without a strong pullup.  This is a one shot request for
+ * the next write, specifying zero will clear a previous request.
+ * The w1 master lock must be held.
+ *
+ * @param delay time in milliseconds
+ * @return      0=success, anything else=error
+ */
+void w1_next_pullup(struct w1_master *dev, int delay)
+{
+        dev->pullup_duration = delay;
+}
+EXPORT_SYMBOL_GPL(w1_next_pullup);