fsnotify: add helper to get mask from connector

Use a helper to get the mask from the object (i.e. i_fsnotify_mask) to generalize code of add/remove inode/vfsmount mark. Signed-off-by: Amir Goldstein <amir73il@gmail.com> Signed-off-by: Jan Kara <jack@suse.cz>
author: Amir Goldstein <amir73il@gmail.com> 2018-06-23 10:54:50 -0400
committer: Jan Kara <jack@suse.cz> 2018-06-27 07:45:07 -0400
commit: 3ac70bfcde812b1b97d8a88a832df59941fa293f (patch)
tree: 52dad7896f274af1f4e12fc87997994387e12333 /fs/filesystems.c
parent: 36f10f55ff1d2867bfc48ed898a9cc0dc6b49dd2 (diff)
0 files changed, 0 insertions, 0 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 746411518802..08e0140920e1 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -104,6 +104,24 @@ config ACPI_SYSFS_POWER
        help
          Say N to disable power /sys interface
+config ACPI_EC_DEBUGFS
+        tristate "EC read/write access through /sys/kernel/debug/ec"
+        default n
+        help
+          Say N to disable Embedded Controller /sys/kernel/debug interface
+          Be aware that using this interface can confuse your Embedded
+          Controller in a way that a normal reboot is not enough. You then
+          have to power of your system, and remove the laptop battery for
+          some seconds.
+          An Embedded Controller typically is available on laptops and reads
+          sensor values like battery state and temperature.
+          The kernel accesses the EC through ACPI parsed code provided by BIOS
+          tables. This option allows to access the EC directly without ACPI
+          code being involved.
+          Thus this option is a debug option that helps to write ACPI drivers
+          and can be used to identify ACPI code or EC firmware bugs.
 config ACPI_PROC_EVENT
        bool "Deprecated /proc/acpi/event support"
        depends on PROC_FS
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 6ee33169e1dc..833b582d1762 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -60,6 +60,7 @@ obj-$(CONFIG_ACPI_SBS)		+= sbshc.o
 obj-$(CONFIG_ACPI_SBS)          += sbs.o
 obj-$(CONFIG_ACPI_POWER_METER)  += power_meter.o
 obj-$(CONFIG_ACPI_HED)          += hed.o
+obj-$(CONFIG_ACPI_EC_DEBUGFS)   += ec_sys.o
 # processor has its own "processor." module_param namespace
 processor-y                     := processor_driver.o processor_throttling.o
diff --git a/drivers/acpi/acpica/evxfevnt.c b/drivers/acpi/acpica/evxfevnt.c
index d97b8dce1668..18b3f1468b7d 100644
--- a/drivers/acpi/acpica/evxfevnt.c
+++ b/drivers/acpi/acpica/evxfevnt.c
@@ -70,6 +70,7 @@ acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
 acpi_status acpi_enable(void)
 {
        acpi_status status;
+        int retry;
        ACPI_FUNCTION_TRACE(acpi_enable);
@@ -98,16 +99,18 @@ acpi_status acpi_enable(void)
        /* Sanity check that transition succeeded */
-        if (acpi_hw_get_mode() != ACPI_SYS_MODE_ACPI) {
+        for (retry = 0; retry < 30000; ++retry) {
-                ACPI_ERROR((AE_INFO,
+                if (acpi_hw_get_mode() == ACPI_SYS_MODE_ACPI) {
-                            "Hardware did not enter ACPI mode"));
+                        if (retry != 0)
-                return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
+                                ACPI_WARNING((AE_INFO,
+                                "Platform took > %d00 usec to enter ACPI mode", retry));
+                        return_ACPI_STATUS(AE_OK);
+                }
+                acpi_os_stall(100);     /* 100 usec */
        }
-        ACPI_DEBUG_PRINT((ACPI_DB_INIT,
+        ACPI_ERROR((AE_INFO, "Hardware did not enter ACPI mode"));
-                          "Transition to ACPI mode successful\n"));
+        return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
-        return_ACPI_STATUS(AE_OK);
 }
 ACPI_EXPORT_SYMBOL(acpi_enable)
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 3026e3fa83ef..dc58402b0a17 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -868,9 +868,15 @@ static void acpi_battery_remove_fs(struct acpi_device *device)
 static void acpi_battery_notify(struct acpi_device *device, u32 event)
 {
        struct acpi_battery *battery = acpi_driver_data(device);
+#ifdef CONFIG_ACPI_SYSFS_POWER
+        struct device *old;
+#endif
        if (!battery)
                return;
+#ifdef CONFIG_ACPI_SYSFS_POWER
+        old = battery->bat.dev;
+#endif
        acpi_battery_update(battery);
        acpi_bus_generate_proc_event(device, event,
                                     acpi_battery_present(battery));
@@ -879,7 +885,7 @@ static void acpi_battery_notify(struct acpi_device *device, u32 event)
                                        acpi_battery_present(battery));
 #ifdef CONFIG_ACPI_SYSFS_POWER
        /* acpi_battery_update could remove power_supply object */
-        if (battery->bat.dev)
+        if (old && battery->bat.dev)
                power_supply_changed(&battery->bat);
 #endif
 }
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index 01381be05e96..2bb28b9d91c4 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -214,7 +214,7 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
        .ident = "Sony VGN-SR290J",
        .matches = {
                     DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-                     DMI_MATCH(DMI_PRODUCT_NAME, "Sony VGN-SR290J"),
+                     DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SR290J"),
                },
        },
        {
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 5f2027d782e8..1fa0aafebe2a 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -34,8 +34,6 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/delay.h>
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
 #include <linux/interrupt.h>
 #include <linux/list.h>
 #include <linux/spinlock.h>
@@ -45,10 +43,13 @@
 #include <acpi/acpi_drivers.h>
 #include <linux/dmi.h>
+#include "internal.h"
 #define ACPI_EC_CLASS                   "embedded_controller"
 #define ACPI_EC_DEVICE_NAME             "Embedded Controller"
 #define ACPI_EC_FILE_INFO               "info"
+#undef PREFIX
 #define PREFIX                          "ACPI: EC: "
 /* EC status register */
@@ -106,19 +107,8 @@ struct transaction {
        bool done;
 };
-static struct acpi_ec {
+struct acpi_ec *boot_ec, *first_ec;
-        acpi_handle handle;
+EXPORT_SYMBOL(first_ec);
-        unsigned long gpe;
-        unsigned long command_addr;
-        unsigned long data_addr;
-        unsigned long global_lock;
-        unsigned long flags;
-        struct mutex lock;
-        wait_queue_head_t wait;
-        struct list_head list;
-        struct transaction *curr;
-        spinlock_t curr_lock;
-} *boot_ec, *first_ec;
 static int EC_FLAGS_MSI; /* Out-of-spec MSI controller */
 static int EC_FLAGS_VALIDATE_ECDT; /* ASUStec ECDTs need to be validated */
@@ -679,72 +669,6 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,
 }
 /* --------------------------------------------------------------------------
-                              FS Interface (/proc)
-   -------------------------------------------------------------------------- */
-static struct proc_dir_entry *acpi_ec_dir;
-static int acpi_ec_read_info(struct seq_file *seq, void *offset)
-{
-        struct acpi_ec *ec = seq->private;
-        if (!ec)
-                goto end;
-        seq_printf(seq, "gpe:\t\t\t0x%02x\n", (u32) ec->gpe);
-        seq_printf(seq, "ports:\t\t\t0x%02x, 0x%02x\n",
-                   (unsigned)ec->command_addr, (unsigned)ec->data_addr);
-        seq_printf(seq, "use global lock:\t%s\n",
-                   ec->global_lock ? "yes" : "no");
-      end:
-        return 0;
-}
-static int acpi_ec_info_open_fs(struct inode *inode, struct file *file)
-{
-        return single_open(file, acpi_ec_read_info, PDE(inode)->data);
-}
-static const struct file_operations acpi_ec_info_ops = {
-        .open = acpi_ec_info_open_fs,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-        .owner = THIS_MODULE,
-};
-static int acpi_ec_add_fs(struct acpi_device *device)
-{
-        struct proc_dir_entry *entry = NULL;
-        if (!acpi_device_dir(device)) {
-                acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
-                                                     acpi_ec_dir);
-                if (!acpi_device_dir(device))
-                        return -ENODEV;
-        }
-        entry = proc_create_data(ACPI_EC_FILE_INFO, S_IRUGO,
-                                 acpi_device_dir(device),
-                                 &acpi_ec_info_ops, acpi_driver_data(device));
-        if (!entry)
-                return -ENODEV;
-        return 0;
-}
-static int acpi_ec_remove_fs(struct acpi_device *device)
-{
-        if (acpi_device_dir(device)) {
-                remove_proc_entry(ACPI_EC_FILE_INFO, acpi_device_dir(device));
-                remove_proc_entry(acpi_device_bid(device), acpi_ec_dir);
-                acpi_device_dir(device) = NULL;
-        }
-        return 0;
-}
-/* --------------------------------------------------------------------------
                               Driver Interface
   -------------------------------------------------------------------------- */
 static acpi_status
@@ -894,7 +818,12 @@ static int acpi_ec_add(struct acpi_device *device)
        if (!first_ec)
                first_ec = ec;
        device->driver_data = ec;
-        acpi_ec_add_fs(device);
+        WARN(!request_region(ec->data_addr, 1, "EC data"),
+             "Could not request EC data io port 0x%lx", ec->data_addr);
+        WARN(!request_region(ec->command_addr, 1, "EC cmd"),
+             "Could not request EC cmd io port 0x%lx", ec->command_addr);
        pr_info(PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx\n",
                          ec->gpe, ec->command_addr, ec->data_addr);
@@ -921,7 +850,8 @@ static int acpi_ec_remove(struct acpi_device *device, int type)
                kfree(handler);
        }
        mutex_unlock(&ec->lock);
-        acpi_ec_remove_fs(device);
+        release_region(ec->data_addr, 1);
+        release_region(ec->command_addr, 1);
        device->driver_data = NULL;
        if (ec == first_ec)
                first_ec = NULL;
@@ -1120,16 +1050,10 @@ int __init acpi_ec_init(void)
 {
        int result = 0;
-        acpi_ec_dir = proc_mkdir(ACPI_EC_CLASS, acpi_root_dir);
-        if (!acpi_ec_dir)
-                return -ENODEV;
        /* Now register the driver for the EC */
        result = acpi_bus_register_driver(&acpi_ec_driver);
-        if (result < 0) {
+        if (result < 0)
-                remove_proc_entry(ACPI_EC_CLASS, acpi_root_dir);
                return -ENODEV;
-        }
        return result;
 }
@@ -1140,9 +1064,6 @@ static void __exit acpi_ec_exit(void)
 {
        acpi_bus_unregister_driver(&acpi_ec_driver);
-        remove_proc_entry(ACPI_EC_CLASS, acpi_root_dir);
        return;
 }
 #endif  /* 0 */
diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c
new file mode 100644
index 000000000000..0e869b3f81ca
--- /dev/null
+++ b/drivers/acpi/ec_sys.c
@@ -0,0 +1,160 @@
+/*
+ * ec_sys.c
+ *
+ * Copyright (C) 2010 SUSE Products GmbH/Novell
+ * Author:
+ *      Thomas Renninger <trenn@suse.de>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2.
+ */
+#include <linux/kernel.h>
+#include <linux/acpi.h>
+#include <linux/debugfs.h>
+#include "internal.h"
+MODULE_AUTHOR("Thomas Renninger <trenn@suse.de>");
+MODULE_DESCRIPTION("ACPI EC sysfs access driver");
+MODULE_LICENSE("GPL");
+static bool write_support;
+module_param(write_support, bool, 0644);
+MODULE_PARM_DESC(write_support, "Dangerous, reboot and removal of battery may "
+                 "be needed.");
+#define EC_SPACE_SIZE 256
+struct sysdev_class acpi_ec_sysdev_class = {
+        .name = "ec",
+};
+static struct dentry *acpi_ec_debugfs_dir;
+static int acpi_ec_open_io(struct inode *i, struct file *f)
+{
+        f->private_data = i->i_private;
+        return 0;
+}
+static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
+                               size_t count, loff_t *off)
+{
+        /* Use this if support reading/writing multiple ECs exists in ec.c:
+         * struct acpi_ec *ec = ((struct seq_file *)f->private_data)->private;
+         */
+        unsigned int size = EC_SPACE_SIZE;
+        u8 *data = (u8 *) buf;
+        loff_t init_off = *off;
+        int err = 0;
+        if (*off >= size)
+                return 0;
+        if (*off + count >= size) {
+                size -= *off;
+                count = size;
+        } else
+                size = count;
+        while (size) {
+                err = ec_read(*off, &data[*off - init_off]);
+                if (err)
+                        return err;
+                *off += 1;
+                size--;
+        }
+        return count;
+}
+static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
+                                size_t count, loff_t *off)
+{
+        /* Use this if support reading/writing multiple ECs exists in ec.c:
+         * struct acpi_ec *ec = ((struct seq_file *)f->private_data)->private;
+         */
+        unsigned int size = count;
+        loff_t init_off = *off;
+        u8 *data = (u8 *) buf;
+        int err = 0;
+        if (*off >= EC_SPACE_SIZE)
+                return 0;
+        if (*off + count >= EC_SPACE_SIZE) {
+                size = EC_SPACE_SIZE - *off;
+                count = size;
+        }
+        while (size) {
+                u8 byte_write = data[*off - init_off];
+                err = ec_write(*off, byte_write);
+                if (err)
+                        return err;
+                *off += 1;
+                size--;
+        }
+        return count;
+}
+static struct file_operations acpi_ec_io_ops = {
+        .owner = THIS_MODULE,
+        .open  = acpi_ec_open_io,
+        .read  = acpi_ec_read_io,
+        .write = acpi_ec_write_io,
+};
+int acpi_ec_add_debugfs(struct acpi_ec *ec, unsigned int ec_device_count)
+{
+        struct dentry *dev_dir;
+        char name[64];
+        mode_t mode = 0400;
+        if (ec_device_count == 0) {
+                acpi_ec_debugfs_dir = debugfs_create_dir("ec", NULL);
+                if (!acpi_ec_debugfs_dir)
+                        return -ENOMEM;
+        }
+        sprintf(name, "ec%u", ec_device_count);
+        dev_dir = debugfs_create_dir(name, acpi_ec_debugfs_dir);
+        if (!dev_dir) {
+                if (ec_device_count != 0)
+                        goto error;
+                return -ENOMEM;
+        }
+        if (!debugfs_create_x32("gpe", 0444, dev_dir, (u32 *)&first_ec->gpe))
+                goto error;
+        if (!debugfs_create_bool("use_global_lock", 0444, dev_dir,
+                                 (u32 *)&first_ec->global_lock))
+                goto error;
+        if (write_support)
+                mode = 0600;
+        if (!debugfs_create_file("io", mode, dev_dir, ec, &acpi_ec_io_ops))
+                goto error;
+        return 0;
+error:
+        debugfs_remove_recursive(acpi_ec_debugfs_dir);
+        return -ENOMEM;
+}
+static int __init acpi_ec_sys_init(void)
+{
+        int err = 0;
+        if (first_ec)
+                err = acpi_ec_add_debugfs(first_ec, 0);
+        else
+                err = -ENODEV;
+        return err;
+}
+static void __exit acpi_ec_sys_exit(void)
+{
+        debugfs_remove_recursive(acpi_ec_debugfs_dir);
+}
+module_init(acpi_ec_sys_init);
+module_exit(acpi_ec_sys_exit);
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index f8f190ec066e..8ae27264a00e 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -18,6 +18,11 @@
 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 */
+#ifndef _ACPI_INTERNAL_H_
+#define _ACPI_INTERNAL_H_
+#include <linux/sysdev.h>
 #define PREFIX "ACPI: "
 int init_acpi_device_notify(void);
@@ -46,6 +51,23 @@ void acpi_early_processor_set_pdc(void);
 /* --------------------------------------------------------------------------
                                  Embedded Controller
   -------------------------------------------------------------------------- */
+struct acpi_ec {
+        acpi_handle handle;
+        unsigned long gpe;
+        unsigned long command_addr;
+        unsigned long data_addr;
+        unsigned long global_lock;
+        unsigned long flags;
+        struct mutex lock;
+        wait_queue_head_t wait;
+        struct list_head list;
+        struct transaction *curr;
+        spinlock_t curr_lock;
+        struct sys_device sysdev;
+};
+extern struct acpi_ec *first_ec;
 int acpi_ec_init(void);
 int acpi_ec_ecdt_probe(void);
 int acpi_boot_ec_enable(void);
@@ -63,3 +85,5 @@ int acpi_sleep_proc_init(void);
 #else
 static inline int acpi_sleep_proc_init(void) { return 0; }
 #endif
+#endif /* _ACPI_INTERNAL_H_ */
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 51284351418f..e9699aaed109 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -223,7 +223,7 @@ static bool processor_physically_present(acpi_handle handle)
        type = (acpi_type == ACPI_TYPE_DEVICE) ? 1 : 0;
        cpuid = acpi_get_cpuid(handle, type, acpi_id);
-        if (cpuid == -1)
+        if ((cpuid == -1) && (num_possible_cpus() > 1))
                return false;
        return true;
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index b1b385692f46..e9a8026d39f0 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -76,14 +76,19 @@ static unsigned int max_cstate __read_mostly = ACPI_PROCESSOR_MAX_POWER;
 module_param(max_cstate, uint, 0000);
 static unsigned int nocst __read_mostly;
 module_param(nocst, uint, 0000);
+static int bm_check_disable __read_mostly;
+module_param(bm_check_disable, uint, 0000);
 static unsigned int latency_factor __read_mostly = 2;
 module_param(latency_factor, uint, 0644);
+#ifdef CONFIG_ACPI_PROCFS
 static u64 us_to_pm_timer_ticks(s64 t)
 {
        return div64_u64(t * PM_TIMER_FREQUENCY, 1000000);
 }
+#endif
 /*
 * IBM ThinkPad R40e crashes mysteriously when going into C2 or C3.
 * For now disable this. Probably a bug somewhere else.
@@ -763,6 +768,9 @@ static int acpi_idle_bm_check(void)
 {
        u32 bm_status = 0;
+        if (bm_check_disable)
+                return 0;
        acpi_read_bit_register(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status);
        if (bm_status)
                acpi_write_bit_register(ACPI_BITREG_BUS_MASTER_STATUS, 1);
@@ -947,7 +955,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
        if (acpi_idle_suspend)
                return(acpi_idle_enter_c1(dev, state));
-        if (acpi_idle_bm_check()) {
+        if (!cx->bm_sts_skip && acpi_idle_bm_check()) {
                if (dev->safe_state) {
                        dev->last_state = dev->safe_state;
                        return dev->safe_state->enter(dev, dev->safe_state);
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 5b7c52e4a00f..2862c781b372 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -82,6 +82,20 @@ static int acpi_sleep_prepare(u32 acpi_state)
 static u32 acpi_target_sleep_state = ACPI_STATE_S0;
 /*
+ * The ACPI specification wants us to save NVS memory regions during hibernation
+ * and to restore them during the subsequent resume.  Windows does that also for
+ * suspend to RAM.  However, it is known that this mechanism does not work on
+ * all machines, so we allow the user to disable it with the help of the
+ * 'acpi_sleep=nonvs' kernel command line option.
+ */
+static bool nvs_nosave;
+void __init acpi_nvs_nosave(void)
+{
+        nvs_nosave = true;
+}
+/*
 * ACPI 1.0 wants us to execute _PTS before suspending devices, so we allow the
 * user to request that behavior by using the 'acpi_old_suspend_ordering'
 * kernel command line option that causes the following variable to be set.
@@ -197,8 +211,7 @@ static int acpi_suspend_begin(suspend_state_t pm_state)
        u32 acpi_state = acpi_suspend_states[pm_state];
        int error = 0;
-        error = suspend_nvs_alloc();
+        error = nvs_nosave ? 0 : suspend_nvs_alloc();
        if (error)
                return error;
@@ -388,20 +401,6 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
 #endif /* CONFIG_SUSPEND */
 #ifdef CONFIG_HIBERNATION
-/*
- * The ACPI specification wants us to save NVS memory regions during hibernation
- * and to restore them during the subsequent resume.  However, it is not certain
- * if this mechanism is going to work on all machines, so we allow the user to
- * disable this mechanism using the 'acpi_sleep=s4_nonvs' kernel command line
- * option.
- */
-static bool s4_no_nvs;
-void __init acpi_s4_no_nvs(void)
-{
-        s4_no_nvs = true;
-}
 static unsigned long s4_hardware_signature;
 static struct acpi_table_facs *facs;
 static bool nosigcheck;
@@ -415,7 +414,7 @@ static int acpi_hibernation_begin(void)
 {
        int error;
-        error = s4_no_nvs ? 0 : suspend_nvs_alloc();
+        error = nvs_nosave ? 0 : suspend_nvs_alloc();
        if (!error) {
                acpi_target_sleep_state = ACPI_STATE_S4;
                acpi_sleep_tts_switch(acpi_target_sleep_state);
@@ -510,7 +509,7 @@ static int acpi_hibernation_begin_old(void)
        error = acpi_sleep_prepare(ACPI_STATE_S4);
        if (!error) {
-                if (!s4_no_nvs)
+                if (!nvs_nosave)
                        error = suspend_nvs_alloc();
                if (!error)
                        acpi_target_sleep_state = ACPI_STATE_S4;
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index f60b2b6a0931..d31590e7011b 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -122,6 +122,31 @@ static int __init amba_init(void)
 postcore_initcall(amba_init);
+static int amba_get_enable_pclk(struct amba_device *pcdev)
+{
+        struct clk *pclk = clk_get(&pcdev->dev, "apb_pclk");
+        int ret;
+        pcdev->pclk = pclk;
+        if (IS_ERR(pclk))
+                return PTR_ERR(pclk);
+        ret = clk_enable(pclk);
+        if (ret)
+                clk_put(pclk);
+        return ret;
+}
+static void amba_put_disable_pclk(struct amba_device *pcdev)
+{
+        struct clk *pclk = pcdev->pclk;
+        clk_disable(pclk);
+        clk_put(pclk);
+}
 /*
 * These are the device model conversion veneers; they convert the
 * device model structures to our more specific structures.
@@ -130,17 +155,33 @@ static int amba_probe(struct device *dev)
 {
        struct amba_device *pcdev = to_amba_device(dev);
        struct amba_driver *pcdrv = to_amba_driver(dev->driver);
-        struct amba_id *id;
+        struct amba_id *id = amba_lookup(pcdrv->id_table, pcdev);
+        int ret;
-        id = amba_lookup(pcdrv->id_table, pcdev);
+        do {
+                ret = amba_get_enable_pclk(pcdev);
+                if (ret)
+                        break;
+                ret = pcdrv->probe(pcdev, id);
+                if (ret == 0)
+                        break;
-        return pcdrv->probe(pcdev, id);
+                amba_put_disable_pclk(pcdev);
+        } while (0);
+        return ret;
 }
 static int amba_remove(struct device *dev)
 {
+        struct amba_device *pcdev = to_amba_device(dev);
        struct amba_driver *drv = to_amba_driver(dev->driver);
-        return drv->remove(to_amba_device(dev));
+        int ret = drv->remove(pcdev);
+        amba_put_disable_pclk(pcdev);
+        return ret;
 }
 static void amba_shutdown(struct device *dev)
@@ -203,7 +244,6 @@ static void amba_device_release(struct device *dev)
 */
 int amba_device_register(struct amba_device *dev, struct resource *parent)
 {
-        u32 pid, cid;
        u32 size;
        void __iomem *tmp;
        int i, ret;
@@ -241,25 +281,35 @@ int amba_device_register(struct amba_device *dev, struct resource *parent)
                goto err_release;
        }
-        /*
+        ret = amba_get_enable_pclk(dev);
-         * Read pid and cid based on size of resource
+        if (ret == 0) {
-         * they are located at end of region
+                u32 pid, cid;
-         */
-        for (pid = 0, i = 0; i < 4; i++)
-                pid |= (readl(tmp + size - 0x20 + 4 * i) & 255) << (i * 8);
-        for (cid = 0, i = 0; i < 4; i++)
-                cid |= (readl(tmp + size - 0x10 + 4 * i) & 255) << (i * 8);
-        iounmap(tmp);
+                /*
+                 * Read pid and cid based on size of resource
+                 * they are located at end of region
+                 */
+                for (pid = 0, i = 0; i < 4; i++)
+                        pid |= (readl(tmp + size - 0x20 + 4 * i) & 255) <<
+                                (i * 8);
+                for (cid = 0, i = 0; i < 4; i++)
+                        cid |= (readl(tmp + size - 0x10 + 4 * i) & 255) <<
+                                (i * 8);
-        if (cid == 0xb105f00d)
+                amba_put_disable_pclk(dev);
-                dev->periphid = pid;
-        if (!dev->periphid) {
+                if (cid == 0xb105f00d)
-                ret = -ENODEV;
+                        dev->periphid = pid;
-                goto err_release;
+                if (!dev->periphid)
+                        ret = -ENODEV;
        }
+        iounmap(tmp);
+        if (ret)
+                goto err_release;
        ret = device_add(&dev->dev);
        if (ret)
                goto err_release;
diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig
index f1a0a00b3b07..be7461c9a87e 100644
--- a/drivers/atm/Kconfig
+++ b/drivers/atm/Kconfig
@@ -177,7 +177,7 @@ config ATM_ZATM_DEBUG
 config ATM_NICSTAR
        tristate "IDT 77201 (NICStAR) (ForeRunnerLE)"
-        depends on PCI && !64BIT && VIRT_TO_BUS
+        depends on PCI
        help
          The NICStAR chipset family is used in a large number of ATM NICs for
          25 and for 155 Mbps, including IDT cards and the Fore ForeRunnerLE
diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
index 6d44f07b69f8..46b94762125b 100644
--- a/drivers/atm/adummy.c
+++ b/drivers/atm/adummy.c
@@ -40,6 +40,42 @@ struct adummy_dev {
 static LIST_HEAD(adummy_devs);
+static ssize_t __set_signal(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf, size_t len)
+{
+        struct atm_dev *atm_dev = container_of(dev, struct atm_dev, class_dev);
+        int signal;
+        if (sscanf(buf, "%d", &signal) == 1) {
+                if (signal < ATM_PHY_SIG_LOST || signal > ATM_PHY_SIG_FOUND)
+                        signal = ATM_PHY_SIG_UNKNOWN;
+                atm_dev_signal_change(atm_dev, signal);
+                return 1;
+        }
+        return -EINVAL;
+}
+static ssize_t __show_signal(struct device *dev,
+        struct device_attribute *attr, char *buf)
+{
+        struct atm_dev *atm_dev = container_of(dev, struct atm_dev, class_dev);
+        return sprintf(buf, "%d\n", atm_dev->signal);
+}
+static DEVICE_ATTR(signal, 0644, __show_signal, __set_signal);
+static struct attribute *adummy_attrs[] = {
+        &dev_attr_signal.attr,
+        NULL
+};
+static struct attribute_group adummy_group_attrs = {
+        .name = NULL, /* We want them in dev's root folder */
+        .attrs = adummy_attrs
+};
 static int __init
 adummy_start(struct atm_dev *dev)
 {
@@ -128,6 +164,9 @@ static int __init adummy_init(void)
        adummy_dev->atm_dev = atm_dev;
        atm_dev->dev_data = adummy_dev;
+        if (sysfs_create_group(&atm_dev->class_dev.kobj, &adummy_group_attrs))
+                dev_err(&atm_dev->class_dev, "Could not register attrs for adummy\n");
        if (adummy_start(atm_dev)) {
                printk(KERN_ERR DEV_LABEL ": adummy_start() failed\n");
                err = -ENODEV;
diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
index 9d18644c897e..a33896a482e6 100644
--- a/drivers/atm/ambassador.c
+++ b/drivers/atm/ambassador.c
@@ -2371,10 +2371,8 @@ MODULE_PARM_DESC(pci_lat, "PCI latency in bus cycles");
 /********** module entry **********/
 static struct pci_device_id amb_pci_tbl[] = {
-        { PCI_VENDOR_ID_MADGE, PCI_DEVICE_ID_MADGE_AMBASSADOR, PCI_ANY_ID, PCI_ANY_ID,
+        { PCI_VDEVICE(MADGE, PCI_DEVICE_ID_MADGE_AMBASSADOR), 0 },
-          0, 0, 0 },
+        { PCI_VDEVICE(MADGE, PCI_DEVICE_ID_MADGE_AMBASSADOR_BAD), 0 },
-        { PCI_VENDOR_ID_MADGE, PCI_DEVICE_ID_MADGE_AMBASSADOR_BAD, PCI_ANY_ID, PCI_ANY_ID,
-          0, 0, 0 },
        { 0, }
 };
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index 90a5a7cac740..80f9f3659e4d 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -2269,10 +2269,8 @@ out0:
 static struct pci_device_id eni_pci_tbl[] = {
-        { PCI_VENDOR_ID_EF, PCI_DEVICE_ID_EF_ATM_FPGA, PCI_ANY_ID, PCI_ANY_ID,
+        { PCI_VDEVICE(EF, PCI_DEVICE_ID_EF_ATM_FPGA), 0 /* FPGA */ },
-          0, 0, 0 /* FPGA */ },
+        { PCI_VDEVICE(EF, PCI_DEVICE_ID_EF_ATM_ASIC), 1 /* ASIC */ },
-        { PCI_VENDOR_ID_EF, PCI_DEVICE_ID_EF_ATM_ASIC, PCI_ANY_ID, PCI_ANY_ID,
-          0, 0, 1 /* ASIC */ },
        { 0, }
 };
 MODULE_DEVICE_TABLE(pci,eni_pci_tbl);
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 6e600afd06ae..8717809787fb 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -2027,10 +2027,8 @@ static void __devexit firestream_remove_one (struct pci_dev *pdev)
 }
 static struct pci_device_id firestream_pci_tbl[] = {
-        { PCI_VENDOR_ID_FUJITSU_ME, PCI_DEVICE_ID_FUJITSU_FS50, 
+        { PCI_VDEVICE(FUJITSU_ME, PCI_DEVICE_ID_FUJITSU_FS50), FS_IS50},
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, FS_IS50},
+        { PCI_VDEVICE(FUJITSU_ME, PCI_DEVICE_ID_FUJITSU_FS155), FS_IS155},
-        { PCI_VENDOR_ID_FUJITSU_ME, PCI_DEVICE_ID_FUJITSU_FS155, 
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, FS_IS155},
        { 0, }
 };
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index da8f176c051e..b7385e077717 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -2657,7 +2657,7 @@ static int __devinit fore200e_sba_probe(struct of_device *op,
        fore200e->bus = bus;
        fore200e->bus_dev = op;
-        fore200e->irq = op->irqs[0];
+        fore200e->irq = op->archdata.irqs[0];
        fore200e->phys_base = op->resource[0].start;
        sprintf(fore200e->name, "%s-%d", bus->model_name, index);
@@ -2795,7 +2795,7 @@ static int __init fore200e_module_init(void)
        printk(FORE200E "FORE Systems 200E-series ATM driver - version " FORE200E_VERSION "\n");
 #ifdef CONFIG_SBUS
-        err = of_register_driver(&fore200e_sba_driver, &of_bus_type);
+        err = of_register_platform_driver(&fore200e_sba_driver);
        if (err)
                return err;
 #endif
@@ -2806,7 +2806,7 @@ static int __init fore200e_module_init(void)
 #ifdef CONFIG_SBUS
        if (err)
-                of_unregister_driver(&fore200e_sba_driver);
+                of_unregister_platform_driver(&fore200e_sba_driver);
 #endif
        return err;
@@ -2818,7 +2818,7 @@ static void __exit fore200e_module_cleanup(void)
        pci_unregister_driver(&fore200e_pca_driver);
 #endif
 #ifdef CONFIG_SBUS
-        of_unregister_driver(&fore200e_sba_driver);
+        of_unregister_platform_driver(&fore200e_sba_driver);
 #endif
 }
diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index 56c2e99e458f..801e8b6e9d1f 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -67,6 +67,7 @@
 #include <linux/timer.h>
 #include <linux/interrupt.h>
 #include <linux/dma-mapping.h>
+#include <linux/bitmap.h>
 #include <linux/slab.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
@@ -778,61 +779,39 @@ he_init_cs_block_rcm(struct he_dev *he_dev)
 static int __devinit
 he_init_group(struct he_dev *he_dev, int group)
 {
+        struct he_buff *heb, *next;
+        dma_addr_t mapping;
        int i;
-        /* small buffer pool */
+        he_writel(he_dev, 0x0, G0_RBPS_S + (group * 32));
-        he_dev->rbps_pool = pci_pool_create("rbps", he_dev->pci_dev,
+        he_writel(he_dev, 0x0, G0_RBPS_T + (group * 32));
-                        CONFIG_RBPS_BUFSIZE, 8, 0);
+        he_writel(he_dev, 0x0, G0_RBPS_QI + (group * 32));
-        if (he_dev->rbps_pool == NULL) {
+        he_writel(he_dev, RBP_THRESH(0x1) | RBP_QSIZE(0x0),
-                hprintk("unable to create rbps pages\n");
+                  G0_RBPS_BS + (group * 32));
+        /* bitmap table */
+        he_dev->rbpl_table = kmalloc(BITS_TO_LONGS(RBPL_TABLE_SIZE)
+                                     * sizeof(unsigned long), GFP_KERNEL);
+        if (!he_dev->rbpl_table) {
+                hprintk("unable to allocate rbpl bitmap table\n");
                return -ENOMEM;
        }
+        bitmap_zero(he_dev->rbpl_table, RBPL_TABLE_SIZE);
-        he_dev->rbps_base = pci_alloc_consistent(he_dev->pci_dev,
+        /* rbpl_virt 64-bit pointers */
-                CONFIG_RBPS_SIZE * sizeof(struct he_rbp), &he_dev->rbps_phys);
+        he_dev->rbpl_virt = kmalloc(RBPL_TABLE_SIZE
-        if (he_dev->rbps_base == NULL) {
+                                    * sizeof(struct he_buff *), GFP_KERNEL);
-                hprintk("failed to alloc rbps_base\n");
+        if (!he_dev->rbpl_virt) {
-                goto out_destroy_rbps_pool;
+                hprintk("unable to allocate rbpl virt table\n");
+                goto out_free_rbpl_table;
        }
-        memset(he_dev->rbps_base, 0, CONFIG_RBPS_SIZE * sizeof(struct he_rbp));
-        he_dev->rbps_virt = kmalloc(CONFIG_RBPS_SIZE * sizeof(struct he_virt), GFP_KERNEL);
-        if (he_dev->rbps_virt == NULL) {
-                hprintk("failed to alloc rbps_virt\n");
-                goto out_free_rbps_base;
-        }
-        for (i = 0; i < CONFIG_RBPS_SIZE; ++i) {
-                dma_addr_t dma_handle;
-                void *cpuaddr;
-                cpuaddr = pci_pool_alloc(he_dev->rbps_pool, GFP_KERNEL|GFP_DMA, &dma_handle);
-                if (cpuaddr == NULL)
-                        goto out_free_rbps_virt;
-                he_dev->rbps_virt[i].virt = cpuaddr;
-                he_dev->rbps_base[i].status = RBP_LOANED | RBP_SMALLBUF | (i << RBP_INDEX_OFF);
-                he_dev->rbps_base[i].phys = dma_handle;
-        }
-        he_dev->rbps_tail = &he_dev->rbps_base[CONFIG_RBPS_SIZE - 1];
-        he_writel(he_dev, he_dev->rbps_phys, G0_RBPS_S + (group * 32));
-        he_writel(he_dev, RBPS_MASK(he_dev->rbps_tail),
-                                                G0_RBPS_T + (group * 32));
-        he_writel(he_dev, CONFIG_RBPS_BUFSIZE/4,
-                                                G0_RBPS_BS + (group * 32));
-        he_writel(he_dev,
-                        RBP_THRESH(CONFIG_RBPS_THRESH) |
-                        RBP_QSIZE(CONFIG_RBPS_SIZE - 1) |
-                        RBP_INT_ENB,
-                                                G0_RBPS_QI + (group * 32));
        /* large buffer pool */
        he_dev->rbpl_pool = pci_pool_create("rbpl", he_dev->pci_dev,
-                        CONFIG_RBPL_BUFSIZE, 8, 0);
+                                            CONFIG_RBPL_BUFSIZE, 64, 0);
        if (he_dev->rbpl_pool == NULL) {
                hprintk("unable to create rbpl pool\n");
-                goto out_free_rbps_virt;
+                goto out_free_rbpl_virt;
        }
        he_dev->rbpl_base = pci_alloc_consistent(he_dev->pci_dev,
@@ -842,30 +821,29 @@ he_init_group(struct he_dev *he_dev, int group)
                goto out_destroy_rbpl_pool;
        }
        memset(he_dev->rbpl_base, 0, CONFIG_RBPL_SIZE * sizeof(struct he_rbp));
-        he_dev->rbpl_virt = kmalloc(CONFIG_RBPL_SIZE * sizeof(struct he_virt), GFP_KERNEL);
-        if (he_dev->rbpl_virt == NULL) {
+        INIT_LIST_HEAD(&he_dev->rbpl_outstanding);
-                hprintk("failed to alloc rbpl_virt\n");
-                goto out_free_rbpl_base;
-        }
        for (i = 0; i < CONFIG_RBPL_SIZE; ++i) {
-                dma_addr_t dma_handle;
-                void *cpuaddr;
-                cpuaddr = pci_pool_alloc(he_dev->rbpl_pool, GFP_KERNEL|GFP_DMA, &dma_handle);
+                heb = pci_pool_alloc(he_dev->rbpl_pool, GFP_KERNEL|GFP_DMA, &mapping);
-                if (cpuaddr == NULL)
+                if (!heb)
-                        goto out_free_rbpl_virt;
+                        goto out_free_rbpl;
+                heb->mapping = mapping;
+                list_add(&heb->entry, &he_dev->rbpl_outstanding);
-                he_dev->rbpl_virt[i].virt = cpuaddr;
+                set_bit(i, he_dev->rbpl_table);
-                he_dev->rbpl_base[i].status = RBP_LOANED | (i << RBP_INDEX_OFF);
+                he_dev->rbpl_virt[i] = heb;
-                he_dev->rbpl_base[i].phys = dma_handle;
+                he_dev->rbpl_hint = i + 1;
+                he_dev->rbpl_base[i].idx =  i << RBP_IDX_OFFSET;
+                he_dev->rbpl_base[i].phys = mapping + offsetof(struct he_buff, data);
        }
        he_dev->rbpl_tail = &he_dev->rbpl_base[CONFIG_RBPL_SIZE - 1];
        he_writel(he_dev, he_dev->rbpl_phys, G0_RBPL_S + (group * 32));
        he_writel(he_dev, RBPL_MASK(he_dev->rbpl_tail),
                                                G0_RBPL_T + (group * 32));
-        he_writel(he_dev, CONFIG_RBPL_BUFSIZE/4,
+        he_writel(he_dev, (CONFIG_RBPL_BUFSIZE - sizeof(struct he_buff))/4,
                                                G0_RBPL_BS + (group * 32));
        he_writel(he_dev,
                        RBP_THRESH(CONFIG_RBPL_THRESH) |
@@ -879,7 +857,7 @@ he_init_group(struct he_dev *he_dev, int group)
                CONFIG_RBRQ_SIZE * sizeof(struct he_rbrq), &he_dev->rbrq_phys);
        if (he_dev->rbrq_base == NULL) {
                hprintk("failed to allocate rbrq\n");
-                goto out_free_rbpl_virt;
+                goto out_free_rbpl;
        }
        memset(he_dev->rbrq_base, 0, CONFIG_RBRQ_SIZE * sizeof(struct he_rbrq));
@@ -920,33 +898,20 @@ out_free_rbpq_base:
        pci_free_consistent(he_dev->pci_dev, CONFIG_RBRQ_SIZE *
                        sizeof(struct he_rbrq), he_dev->rbrq_base,
                        he_dev->rbrq_phys);
-        i = CONFIG_RBPL_SIZE;
+out_free_rbpl:
-out_free_rbpl_virt:
+        list_for_each_entry_safe(heb, next, &he_dev->rbpl_outstanding, entry)
-        while (i--)
+                pci_pool_free(he_dev->rbpl_pool, heb, heb->mapping);
-                pci_pool_free(he_dev->rbpl_pool, he_dev->rbpl_virt[i].virt,
-                                he_dev->rbpl_base[i].phys);
-        kfree(he_dev->rbpl_virt);
-out_free_rbpl_base:
        pci_free_consistent(he_dev->pci_dev, CONFIG_RBPL_SIZE *
                        sizeof(struct he_rbp), he_dev->rbpl_base,
                        he_dev->rbpl_phys);
 out_destroy_rbpl_pool:
        pci_pool_destroy(he_dev->rbpl_pool);
+out_free_rbpl_virt:
+        kfree(he_dev->rbpl_virt);
+out_free_rbpl_table:
+        kfree(he_dev->rbpl_table);
-        i = CONFIG_RBPS_SIZE;
-out_free_rbps_virt:
-        while (i--)
-                pci_pool_free(he_dev->rbps_pool, he_dev->rbps_virt[i].virt,
-                                he_dev->rbps_base[i].phys);
-        kfree(he_dev->rbps_virt);
-out_free_rbps_base:
-        pci_free_consistent(he_dev->pci_dev, CONFIG_RBPS_SIZE *
-                        sizeof(struct he_rbp), he_dev->rbps_base,
-                        he_dev->rbps_phys);
-out_destroy_rbps_pool:
-        pci_pool_destroy(he_dev->rbps_pool);
        return -ENOMEM;
 }
@@ -1002,7 +967,8 @@ he_init_irq(struct he_dev *he_dev)
        he_writel(he_dev, 0x0, GRP_54_MAP);
        he_writel(he_dev, 0x0, GRP_76_MAP);
-        if (request_irq(he_dev->pci_dev->irq, he_irq_handler, IRQF_DISABLED|IRQF_SHARED, DEV_LABEL, he_dev)) {
+        if (request_irq(he_dev->pci_dev->irq,
+                        he_irq_handler, IRQF_SHARED, DEV_LABEL, he_dev)) {
                hprintk("irq %d already in use\n", he_dev->pci_dev->irq);
                return -EINVAL;
        }   
@@ -1576,9 +1542,10 @@ he_start(struct atm_dev *dev)
 static void
 he_stop(struct he_dev *he_dev)
 {
-        u16 command;
+        struct he_buff *heb, *next;
-        u32 gen_cntl_0, reg;
        struct pci_dev *pci_dev;
+        u32 gen_cntl_0, reg;
+        u16 command;
        pci_dev = he_dev->pci_dev;
@@ -1619,37 +1586,19 @@ he_stop(struct he_dev *he_dev)
                                                he_dev->hsp, he_dev->hsp_phys);
        if (he_dev->rbpl_base) {
-                int i;
+                list_for_each_entry_safe(heb, next, &he_dev->rbpl_outstanding, entry)
+                        pci_pool_free(he_dev->rbpl_pool, heb, heb->mapping);
-                for (i = 0; i < CONFIG_RBPL_SIZE; ++i) {
-                        void *cpuaddr = he_dev->rbpl_virt[i].virt;
-                        dma_addr_t dma_handle = he_dev->rbpl_base[i].phys;
-                        pci_pool_free(he_dev->rbpl_pool, cpuaddr, dma_handle);
-                }
                pci_free_consistent(he_dev->pci_dev, CONFIG_RBPL_SIZE
                        * sizeof(struct he_rbp), he_dev->rbpl_base, he_dev->rbpl_phys);
        }
+        kfree(he_dev->rbpl_virt);
+        kfree(he_dev->rbpl_table);
        if (he_dev->rbpl_pool)
                pci_pool_destroy(he_dev->rbpl_pool);
-        if (he_dev->rbps_base) {
-                int i;
-                for (i = 0; i < CONFIG_RBPS_SIZE; ++i) {
-                        void *cpuaddr = he_dev->rbps_virt[i].virt;
-                        dma_addr_t dma_handle = he_dev->rbps_base[i].phys;
-                        pci_pool_free(he_dev->rbps_pool, cpuaddr, dma_handle);
-                }
-                pci_free_consistent(he_dev->pci_dev, CONFIG_RBPS_SIZE
-                        * sizeof(struct he_rbp), he_dev->rbps_base, he_dev->rbps_phys);
-        }
-        if (he_dev->rbps_pool)
-                pci_pool_destroy(he_dev->rbps_pool);
        if (he_dev->rbrq_base)
                pci_free_consistent(he_dev->pci_dev, CONFIG_RBRQ_SIZE * sizeof(struct he_rbrq),
                                                        he_dev->rbrq_base, he_dev->rbrq_phys);
@@ -1679,13 +1628,13 @@ static struct he_tpd *
 __alloc_tpd(struct he_dev *he_dev)
 {
        struct he_tpd *tpd;
-        dma_addr_t dma_handle; 
+        dma_addr_t mapping;
-        tpd = pci_pool_alloc(he_dev->tpd_pool, GFP_ATOMIC|GFP_DMA, &dma_handle);
+        tpd = pci_pool_alloc(he_dev->tpd_pool, GFP_ATOMIC|GFP_DMA, &mapping);
        if (tpd == NULL)
                return NULL;
                        
-        tpd->status = TPD_ADDR(dma_handle);
+        tpd->status = TPD_ADDR(mapping);
        tpd->reserved = 0; 
        tpd->iovec[0].addr = 0; tpd->iovec[0].len = 0;
        tpd->iovec[1].addr = 0; tpd->iovec[1].len = 0;
@@ -1714,13 +1663,12 @@ he_service_rbrq(struct he_dev *he_dev, int group)
        struct he_rbrq *rbrq_tail = (struct he_rbrq *)
                                ((unsigned long)he_dev->rbrq_base |
                                        he_dev->hsp->group[group].rbrq_tail);
-        struct he_rbp *rbp = NULL;
        unsigned cid, lastcid = -1;
-        unsigned buf_len = 0;
        struct sk_buff *skb;
        struct atm_vcc *vcc = NULL;
        struct he_vcc *he_vcc;
-        struct he_iovec *iov;
+        struct he_buff *heb, *next;
+        int i;
        int pdus_assembled = 0;
        int updated = 0;
@@ -1740,44 +1688,35 @@ he_service_rbrq(struct he_dev *he_dev, int group)
                        RBRQ_CON_CLOSED(he_dev->rbrq_head) ? " CON_CLOSED" : "",
                        RBRQ_HBUF_ERR(he_dev->rbrq_head) ? " HBUF_ERR" : "");
-                if (RBRQ_ADDR(he_dev->rbrq_head) & RBP_SMALLBUF)
+                i = RBRQ_ADDR(he_dev->rbrq_head) >> RBP_IDX_OFFSET;
-                        rbp = &he_dev->rbps_base[RBP_INDEX(RBRQ_ADDR(he_dev->rbrq_head))];
+                heb = he_dev->rbpl_virt[i];
-                else
-                        rbp = &he_dev->rbpl_base[RBP_INDEX(RBRQ_ADDR(he_dev->rbrq_head))];
-                
-                buf_len = RBRQ_BUFLEN(he_dev->rbrq_head) * 4;
-                cid = RBRQ_CID(he_dev->rbrq_head);
+                cid = RBRQ_CID(he_dev->rbrq_head);
                if (cid != lastcid)
                        vcc = __find_vcc(he_dev, cid);
                lastcid = cid;
-                if (vcc == NULL) {
+                if (vcc == NULL || (he_vcc = HE_VCC(vcc)) == NULL) {
-                        hprintk("vcc == NULL  (cid 0x%x)\n", cid);
+                        hprintk("vcc/he_vcc == NULL  (cid 0x%x)\n", cid);
-                        if (!RBRQ_HBUF_ERR(he_dev->rbrq_head))
+                        if (!RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
-                                        rbp->status &= ~RBP_LOANED;
+                                clear_bit(i, he_dev->rbpl_table);
+                                list_del(&heb->entry);
+                                pci_pool_free(he_dev->rbpl_pool, heb, heb->mapping);
+                        }
                                        
                        goto next_rbrq_entry;
                }
-                he_vcc = HE_VCC(vcc);
-                if (he_vcc == NULL) {
-                        hprintk("he_vcc == NULL  (cid 0x%x)\n", cid);
-                        if (!RBRQ_HBUF_ERR(he_dev->rbrq_head))
-                                        rbp->status &= ~RBP_LOANED;
-                        goto next_rbrq_entry;
-                }
                if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
                        hprintk("HBUF_ERR!  (cid 0x%x)\n", cid);
                                atomic_inc(&vcc->stats->rx_drop);
                        goto return_host_buffers;
                }
-                he_vcc->iov_tail->iov_base = RBRQ_ADDR(he_dev->rbrq_head);
+                heb->len = RBRQ_BUFLEN(he_dev->rbrq_head) * 4;
-                he_vcc->iov_tail->iov_len = buf_len;
+                clear_bit(i, he_dev->rbpl_table);
-                he_vcc->pdu_len += buf_len;
+                list_move_tail(&heb->entry, &he_vcc->buffers);
-                ++he_vcc->iov_tail;
+                he_vcc->pdu_len += heb->len;
                if (RBRQ_CON_CLOSED(he_dev->rbrq_head)) {
                        lastcid = -1;
@@ -1786,12 +1725,6 @@ he_service_rbrq(struct he_dev *he_dev, int group)
                        goto return_host_buffers;
                }
-#ifdef notdef
-                if ((he_vcc->iov_tail - he_vcc->iov_head) > HE_MAXIOV) {
-                        hprintk("iovec full!  cid 0x%x\n", cid);
-                        goto return_host_buffers;
-                }
-#endif
                if (!RBRQ_END_PDU(he_dev->rbrq_head))
                        goto next_rbrq_entry;
@@ -1819,15 +1752,8 @@ he_service_rbrq(struct he_dev *he_dev, int group)
                __net_timestamp(skb);
-                for (iov = he_vcc->iov_head;
+                list_for_each_entry(heb, &he_vcc->buffers, entry)
-                                iov < he_vcc->iov_tail; ++iov) {
+                        memcpy(skb_put(skb, heb->len), &heb->data, heb->len);
-                        if (iov->iov_base & RBP_SMALLBUF)
-                                memcpy(skb_put(skb, iov->iov_len),
-                                        he_dev->rbps_virt[RBP_INDEX(iov->iov_base)].virt, iov->iov_len);
-                        else
-                                memcpy(skb_put(skb, iov->iov_len),
-                                        he_dev->rbpl_virt[RBP_INDEX(iov->iov_base)].virt, iov->iov_len);
-                }
                switch (vcc->qos.aal) {
                        case ATM_AAL0:
@@ -1867,17 +1793,9 @@ he_service_rbrq(struct he_dev *he_dev, int group)
 return_host_buffers:
                ++pdus_assembled;
-                for (iov = he_vcc->iov_head;
+                list_for_each_entry_safe(heb, next, &he_vcc->buffers, entry)
-                                iov < he_vcc->iov_tail; ++iov) {
+                        pci_pool_free(he_dev->rbpl_pool, heb, heb->mapping);
-                        if (iov->iov_base & RBP_SMALLBUF)
+                INIT_LIST_HEAD(&he_vcc->buffers);
-                                rbp = &he_dev->rbps_base[RBP_INDEX(iov->iov_base)];
-                        else
-                                rbp = &he_dev->rbpl_base[RBP_INDEX(iov->iov_base)];
-                        rbp->status &= ~RBP_LOANED;
-                }
-                he_vcc->iov_tail = he_vcc->iov_head;
                he_vcc->pdu_len = 0;
 next_rbrq_entry:
@@ -1978,59 +1896,51 @@ next_tbrq_entry:
        }
 }
 static void
 he_service_rbpl(struct he_dev *he_dev, int group)
 {
-        struct he_rbp *newtail;
+        struct he_rbp *new_tail;
        struct he_rbp *rbpl_head;
+        struct he_buff *heb;
+        dma_addr_t mapping;
+        int i;
        int moved = 0;
        rbpl_head = (struct he_rbp *) ((unsigned long)he_dev->rbpl_base |
                                        RBPL_MASK(he_readl(he_dev, G0_RBPL_S)));
        for (;;) {
-                newtail = (struct he_rbp *) ((unsigned long)he_dev->rbpl_base |
+                new_tail = (struct he_rbp *) ((unsigned long)he_dev->rbpl_base |
                                                RBPL_MASK(he_dev->rbpl_tail+1));
                /* table 3.42 -- rbpl_tail should never be set to rbpl_head */
-                if ((newtail == rbpl_head) || (newtail->status & RBP_LOANED))
+                if (new_tail == rbpl_head)
                        break;
-                newtail->status |= RBP_LOANED;
+                i = find_next_zero_bit(he_dev->rbpl_table, RBPL_TABLE_SIZE, he_dev->rbpl_hint);
-                he_dev->rbpl_tail = newtail;
+                if (i > (RBPL_TABLE_SIZE - 1)) {
-                ++moved;
+                        i = find_first_zero_bit(he_dev->rbpl_table, RBPL_TABLE_SIZE);
-        } 
+                        if (i > (RBPL_TABLE_SIZE - 1))
+                                break;
-        if (moved)
+                }
-                he_writel(he_dev, RBPL_MASK(he_dev->rbpl_tail), G0_RBPL_T);
+                he_dev->rbpl_hint = i + 1;
-}
-static void
-he_service_rbps(struct he_dev *he_dev, int group)
-{
-        struct he_rbp *newtail;
-        struct he_rbp *rbps_head;
-        int moved = 0;
-        rbps_head = (struct he_rbp *) ((unsigned long)he_dev->rbps_base |
-                                        RBPS_MASK(he_readl(he_dev, G0_RBPS_S)));
-        for (;;) {
-                newtail = (struct he_rbp *) ((unsigned long)he_dev->rbps_base |
-                                                RBPS_MASK(he_dev->rbps_tail+1));
-                /* table 3.42 -- rbps_tail should never be set to rbps_head */
+                heb = pci_pool_alloc(he_dev->rbpl_pool, GFP_ATOMIC|GFP_DMA, &mapping);
-                if ((newtail == rbps_head) || (newtail->status & RBP_LOANED))
+                if (!heb)
                        break;
+                heb->mapping = mapping;
-                newtail->status |= RBP_LOANED;
+                list_add(&heb->entry, &he_dev->rbpl_outstanding);
-                he_dev->rbps_tail = newtail;
+                he_dev->rbpl_virt[i] = heb;
+                set_bit(i, he_dev->rbpl_table);
+                new_tail->idx = i << RBP_IDX_OFFSET;
+                new_tail->phys = mapping + offsetof(struct he_buff, data);
+                he_dev->rbpl_tail = new_tail;
                ++moved;
        } 
        if (moved)
-                he_writel(he_dev, RBPS_MASK(he_dev->rbps_tail), G0_RBPS_T);
+                he_writel(he_dev, RBPL_MASK(he_dev->rbpl_tail), G0_RBPL_T);
 }
 static void
@@ -2055,10 +1965,8 @@ he_tasklet(unsigned long data)
                                HPRINTK("rbrq%d threshold\n", group);
                                /* fall through */
                        case ITYPE_RBRQ_TIMER:
-                                if (he_service_rbrq(he_dev, group)) {
+                                if (he_service_rbrq(he_dev, group))
                                        he_service_rbpl(he_dev, group);
-                                        he_service_rbps(he_dev, group);
-                                }
                                break;
                        case ITYPE_TBRQ_THRESH:
                                HPRINTK("tbrq%d threshold\n", group);
@@ -2070,7 +1978,7 @@ he_tasklet(unsigned long data)
                                he_service_rbpl(he_dev, group);
                                break;
                        case ITYPE_RBPS_THRESH:
-                                he_service_rbps(he_dev, group);
+                                /* shouldn't happen unless small buffers enabled */
                                break;
                        case ITYPE_PHY:
                                HPRINTK("phy interrupt\n");
@@ -2098,7 +2006,6 @@ he_tasklet(unsigned long data)
                                he_service_rbrq(he_dev, 0);
                                he_service_rbpl(he_dev, 0);
-                                he_service_rbps(he_dev, 0);
                                he_service_tbrq(he_dev, 0);
                                break;
                        default:
@@ -2252,7 +2159,7 @@ he_open(struct atm_vcc *vcc)
                return -ENOMEM;
        }
-        he_vcc->iov_tail = he_vcc->iov_head;
+        INIT_LIST_HEAD(&he_vcc->buffers);
        he_vcc->pdu_len = 0;
        he_vcc->rc_index = -1;
@@ -2406,8 +2313,8 @@ he_open(struct atm_vcc *vcc)
                        goto open_failed;
                }
-                rsr1 = RSR1_GROUP(0);
+                rsr1 = RSR1_GROUP(0) | RSR1_RBPL_ONLY;
-                rsr4 = RSR4_GROUP(0);
+                rsr4 = RSR4_GROUP(0) | RSR4_RBPL_ONLY;
                rsr0 = vcc->qos.rxtp.traffic_class == ATM_UBR ? 
                                (RSR0_EPD_ENABLE|RSR0_PPD_ENABLE) : 0;
@@ -2963,8 +2870,7 @@ module_param(sdh, bool, 0);
 MODULE_PARM_DESC(sdh, "use SDH framing (default 0)");
 static struct pci_device_id he_pci_tbl[] = {
-        { PCI_VENDOR_ID_FORE, PCI_DEVICE_ID_FORE_HE, PCI_ANY_ID, PCI_ANY_ID,
+        { PCI_VDEVICE(FORE, PCI_DEVICE_ID_FORE_HE), 0 },
-          0, 0, 0 },
        { 0, }
 };
diff --git a/drivers/atm/he.h b/drivers/atm/he.h
index c2983e0d4ec1..110a27d2ecfc 100644
--- a/drivers/atm/he.h
+++ b/drivers/atm/he.h
@@ -67,11 +67,6 @@
 #define CONFIG_RBPL_BUFSIZE     4096
 #define RBPL_MASK(x)            (((unsigned long)(x))&((CONFIG_RBPL_SIZE<<3)-1))
-#define CONFIG_RBPS_SIZE        1024
-#define CONFIG_RBPS_THRESH      64
-#define CONFIG_RBPS_BUFSIZE     128
-#define RBPS_MASK(x)            (((unsigned long)(x))&((CONFIG_RBPS_SIZE<<3)-1))
 /* 5.1.3 initialize connection memory */
 #define CONFIG_RSRA             0x00000
@@ -203,36 +198,37 @@ struct he_hsp {
        } group[HE_NUM_GROUPS];
 };
-/* figure 2.9 receive buffer pools */
+/*
+ * figure 2.9 receive buffer pools
+ *
+ * since a virtual address might be more than 32 bits, we store an index
+ * in the virt member of he_rbp.  NOTE: the lower six bits in the  rbrq
+ * addr member are used for buffer status further limiting us to 26 bits.
+ */
 struct he_rbp {
        volatile u32 phys;
-        volatile u32 status;
+        volatile u32 idx;       /* virt */
 };
-/* NOTE: it is suggested that virt be the virtual address of the host
+#define RBP_IDX_OFFSET 6
-   buffer.  on a 64-bit machine, this would not work.  Instead, we
-   store the real virtual address in another list, and store an index
-   (and buffer status) in the virt member.
-*/
-#define RBP_INDEX_OFF   6
+/*
-#define RBP_INDEX(x)    (((long)(x) >> RBP_INDEX_OFF) & 0xffff)
+ * the he dma engine will try to hold an extra 16 buffers in its local
-#define RBP_LOANED      0x80000000
+ * caches.  and add a couple buffers for safety.
-#define RBP_SMALLBUF    0x40000000
+ */
-struct he_virt {
+#define RBPL_TABLE_SIZE (CONFIG_RBPL_SIZE + 16 + 2)
-        void *virt;
-};
-#define RBPL_ALIGNMENT CONFIG_RBPL_SIZE
+struct he_buff {
-#define RBPS_ALIGNMENT CONFIG_RBPS_SIZE
+        struct list_head entry;
+        dma_addr_t mapping;
+        unsigned long len;
+        u8 data[];
+};
 #ifdef notyet
 struct he_group {
-        u32 rpbs_size, rpbs_qsize;
-        struct he_rbp rbps_ba;
        u32 rpbl_size, rpbl_qsize;
        struct he_rpb_entry *rbpl_ba;
 };
@@ -297,18 +293,15 @@ struct he_dev {
        struct he_rbrq *rbrq_base, *rbrq_head;
        int rbrq_peak;
+        struct he_buff **rbpl_virt;
+        unsigned long *rbpl_table;
+        unsigned long rbpl_hint;
        struct pci_pool *rbpl_pool;
        dma_addr_t rbpl_phys;
        struct he_rbp *rbpl_base, *rbpl_tail;
-        struct he_virt *rbpl_virt;
+        struct list_head rbpl_outstanding;
        int rbpl_peak;
-        struct pci_pool *rbps_pool;
-        dma_addr_t rbps_phys;
-        struct he_rbp *rbps_base, *rbps_tail;
-        struct he_virt *rbps_virt;
-        int rbps_peak;
        dma_addr_t tbrq_phys;
        struct he_tbrq *tbrq_base, *tbrq_head;
        int tbrq_peak;
@@ -321,20 +314,12 @@ struct he_dev {
        struct he_dev *next;
 };
-struct he_iovec
-{
-        u32 iov_base;
-        u32 iov_len;
-};
 #define HE_MAXIOV 20
 struct he_vcc
 {
-        struct he_iovec iov_head[HE_MAXIOV];
+        struct list_head buffers;
-        struct he_iovec *iov_tail;
        int pdu_len;
        int rc_index;
        wait_queue_head_t rx_waitq;
diff --git a/drivers/atm/idt77105.c b/drivers/atm/idt77105.c
index dab5cf5274fb..bca9cb89a118 100644
--- a/drivers/atm/idt77105.c
+++ b/drivers/atm/idt77105.c
@@ -126,7 +126,7 @@ static void idt77105_restart_timer_func(unsigned long dummy)
                istat = GET(ISTAT); /* side effect: clears all interrupt status bits */
                if (istat & IDT77105_ISTAT_GOODSIG) {
                    /* Found signal again */
-                    dev->signal = ATM_PHY_SIG_FOUND;
+                    atm_dev_signal_change(dev, ATM_PHY_SIG_FOUND);
                    printk(KERN_NOTICE "%s(itf %d): signal detected again\n",
                        dev->type,dev->number);
                    /* flush the receive FIFO */
@@ -222,7 +222,7 @@ static void idt77105_int(struct atm_dev *dev)
            /* Rx Signal Condition Change - line went up or down */
            if (istat & IDT77105_ISTAT_GOODSIG) {   /* signal detected again */
                /* This should not happen (restart timer does it) but JIC */
-                dev->signal = ATM_PHY_SIG_FOUND;
+                atm_dev_signal_change(dev, ATM_PHY_SIG_FOUND);
            } else {    /* signal lost */
                /*
                 * Disable interrupts and stop all transmission and
@@ -235,7 +235,7 @@ static void idt77105_int(struct atm_dev *dev)
                    IDT77105_MCR_DRIC|
                    IDT77105_MCR_HALTTX
                    ) & ~IDT77105_MCR_EIP, MCR);
-                dev->signal = ATM_PHY_SIG_LOST;
+                atm_dev_signal_change(dev, ATM_PHY_SIG_LOST);
                printk(KERN_NOTICE "%s(itf %d): signal lost\n",
                    dev->type,dev->number);
            }
@@ -272,8 +272,9 @@ static int idt77105_start(struct atm_dev *dev)
        memset(&PRIV(dev)->stats,0,sizeof(struct idt77105_stats));
        
        /* initialise dev->signal from Good Signal Bit */
-        dev->signal = GET(ISTAT) & IDT77105_ISTAT_GOODSIG ? ATM_PHY_SIG_FOUND :
+        atm_dev_signal_change(dev,
-          ATM_PHY_SIG_LOST;
+                GET(ISTAT) & IDT77105_ISTAT_GOODSIG ?
+                ATM_PHY_SIG_FOUND : ATM_PHY_SIG_LOST);
        if (dev->signal == ATM_PHY_SIG_LOST)
                printk(KERN_WARNING "%s(itf %d): no signal\n",dev->type,
                    dev->number);
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index 98657a6a330d..1679cbf0c584 100644
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -3364,7 +3364,7 @@ init_card(struct atm_dev *dev)
                writel(SAR_STAT_TMROF, SAR_REG_STAT);
        }
        IPRINTK("%s: Request IRQ ... ", card->name);
-        if (request_irq(pcidev->irq, idt77252_interrupt, IRQF_DISABLED|IRQF_SHARED,
+        if (request_irq(pcidev->irq, idt77252_interrupt, IRQF_SHARED,
                        card->name, card) != 0) {
                printk("%s: can't allocate IRQ.\n", card->name);
                deinit_card(card);
@@ -3779,8 +3779,7 @@ err_out_disable_pdev:
 static struct pci_device_id idt77252_pci_tbl[] =
 {
-        { PCI_VENDOR_ID_IDT, PCI_DEVICE_ID_IDT_IDT77252,
+        { PCI_VDEVICE(IDT, PCI_DEVICE_ID_IDT_IDT77252), 0 },
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
        { 0, }
 };
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index b7473a6110a7..2f3516b7f118 100644
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@ -1,5 +1,4 @@
-/******************************************************************************
+/*
- *
 * nicstar.c
 *
 * Device driver supporting CBR for IDT 77201/77211 "NICStAR" based cards.
@@ -16,12 +15,10 @@
 *
 *
 * (C) INESC 1999
- *
+ */
- *
- ******************************************************************************/
-/**** IMPORTANT INFORMATION ***************************************************
+/*
+ * IMPORTANT INFORMATION
 *
 * There are currently three types of spinlocks:
 *
@@ -31,9 +28,9 @@
 *
 * These must NEVER be grabbed in reverse order.
 *
- ******************************************************************************/
+ */
-/* Header files ***************************************************************/
+/* Header files */
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -41,6 +38,7 @@
 #include <linux/atmdev.h>
 #include <linux/atm.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/delay.h>
@@ -50,6 +48,7 @@
 #include <linux/interrupt.h>
 #include <linux/bitops.h>
 #include <linux/slab.h>
+#include <linux/idr.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
@@ -61,16 +60,11 @@
 #include "idt77105.h"
 #endif /* CONFIG_ATM_NICSTAR_USE_IDT77105 */
-#if BITS_PER_LONG != 32
+/* Additional code */
-#  error FIXME: this driver requires a 32-bit platform
-#endif
-/* Additional code ************************************************************/
 #include "nicstarmac.c"
+/* Configurable parameters */
-/* Configurable parameters ****************************************************/
 #undef PHY_LOOPBACK
 #undef TX_DEBUG
@@ -78,11 +72,10 @@
 #undef GENERAL_DEBUG
 #undef EXTRA_DEBUG
-#undef NS_USE_DESTRUCTORS /* For now keep this undefined unless you know
+#undef NS_USE_DESTRUCTORS       /* For now keep this undefined unless you know
-                             you're going to use only raw ATM */
+                                   you're going to use only raw ATM */
+/* Do not touch these */
-/* Do not touch these *********************************************************/
 #ifdef TX_DEBUG
 #define TXPRINTK(args...) printk(args)
@@ -108,2908 +101,2773 @@
 #define XPRINTK(args...)
 #endif /* EXTRA_DEBUG */
+/* Macros */
-/* Macros *********************************************************************/
 #define CMD_BUSY(card) (readl((card)->membase + STAT) & NS_STAT_CMDBZ)
 #define NS_DELAY mdelay(1)
-#define ALIGN_BUS_ADDR(addr, alignment) \
+#define PTR_DIFF(a, b)  ((u32)((unsigned long)(a) - (unsigned long)(b)))
-        ((((u32) (addr)) + (((u32) (alignment)) - 1)) & ~(((u32) (alignment)) - 1))
-#define ALIGN_ADDRESS(addr, alignment) \
-        bus_to_virt(ALIGN_BUS_ADDR(virt_to_bus(addr), alignment))
-#undef CEIL
 #ifndef ATM_SKB
 #define ATM_SKB(s) (&(s)->atm)
 #endif
+#define scq_virt_to_bus(scq, p) \
+                (scq->dma + ((unsigned long)(p) - (unsigned long)(scq)->org))
-/* Function declarations ******************************************************/
+/* Function declarations */
-static u32 ns_read_sram(ns_dev *card, u32 sram_address);
+static u32 ns_read_sram(ns_dev * card, u32 sram_address);
-static void ns_write_sram(ns_dev *card, u32 sram_address, u32 *value, int count);
+static void ns_write_sram(ns_dev * card, u32 sram_address, u32 * value,
+                          int count);
 static int __devinit ns_init_card(int i, struct pci_dev *pcidev);
-static void __devinit ns_init_card_error(ns_dev *card, int error);
+static void __devinit ns_init_card_error(ns_dev * card, int error);
-static scq_info *get_scq(int size, u32 scd);
+static scq_info *get_scq(ns_dev *card, int size, u32 scd);
-static void free_scq(scq_info *scq, struct atm_vcc *vcc);
+static void free_scq(ns_dev *card, scq_info * scq, struct atm_vcc *vcc);
 static void push_rxbufs(ns_dev *, struct sk_buff *);
 static irqreturn_t ns_irq_handler(int irq, void *dev_id);
 static int ns_open(struct atm_vcc *vcc);
 static void ns_close(struct atm_vcc *vcc);
-static void fill_tst(ns_dev *card, int n, vc_map *vc);
+static void fill_tst(ns_dev * card, int n, vc_map * vc);
 static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb);
-static int push_scqe(ns_dev *card, vc_map *vc, scq_info *scq, ns_scqe *tbd,
+static int push_scqe(ns_dev * card, vc_map * vc, scq_info * scq, ns_scqe * tbd,
-                     struct sk_buff *skb);
+                     struct sk_buff *skb);
-static void process_tsq(ns_dev *card);
+static void process_tsq(ns_dev * card);
-static void drain_scq(ns_dev *card, scq_info *scq, int pos);
+static void drain_scq(ns_dev * card, scq_info * scq, int pos);
-static void process_rsq(ns_dev *card);
+static void process_rsq(ns_dev * card);
-static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe);
+static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe);
 #ifdef NS_USE_DESTRUCTORS
 static void ns_sb_destructor(struct sk_buff *sb);
 static void ns_lb_destructor(struct sk_buff *lb);
 static void ns_hb_destructor(struct sk_buff *hb);
 #endif /* NS_USE_DESTRUCTORS */
-static void recycle_rx_buf(ns_dev *card, struct sk_buff *skb);
+static void recycle_rx_buf(ns_dev * card, struct sk_buff *skb);
-static void recycle_iovec_rx_bufs(ns_dev *card, struct iovec *iov, int count);
+static void recycle_iovec_rx_bufs(ns_dev * card, struct iovec *iov, int count);
-static void recycle_iov_buf(ns_dev *card, struct sk_buff *iovb);
+static void recycle_iov_buf(ns_dev * card, struct sk_buff *iovb);
-static void dequeue_sm_buf(ns_dev *card, struct sk_buff *sb);
+static void dequeue_sm_buf(ns_dev * card, struct sk_buff *sb);
-static void dequeue_lg_buf(ns_dev *card, struct sk_buff *lb);
+static void dequeue_lg_buf(ns_dev * card, struct sk_buff *lb);
-static int ns_proc_read(struct atm_dev *dev, loff_t *pos, char *page);
+static int ns_proc_read(struct atm_dev *dev, loff_t * pos, char *page);
-static int ns_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg);
+static int ns_ioctl(struct atm_dev *dev, unsigned int cmd, void __user * arg);
-static void which_list(ns_dev *card, struct sk_buff *skb);
+#ifdef EXTRA_DEBUG
+static void which_list(ns_dev * card, struct sk_buff *skb);
+#endif
 static void ns_poll(unsigned long arg);
 static int ns_parse_mac(char *mac, unsigned char *esi);
-static short ns_h2i(char c);
 static void ns_phy_put(struct atm_dev *dev, unsigned char value,
-                       unsigned long addr);
+                       unsigned long addr);
 static unsigned char ns_phy_get(struct atm_dev *dev, unsigned long addr);
+/* Global variables */
-/* Global variables ***********************************************************/
 static struct ns_dev *cards[NS_MAX_CARDS];
 static unsigned num_cards;
-static struct atmdev_ops atm_ops =
+static struct atmdev_ops atm_ops = {
-{
+        .open = ns_open,
-   .open        = ns_open,
+        .close = ns_close,
-   .close       = ns_close,
+        .ioctl = ns_ioctl,
-   .ioctl       = ns_ioctl,
+        .send = ns_send,
-   .send        = ns_send,
+        .phy_put = ns_phy_put,
-   .phy_put     = ns_phy_put,
+        .phy_get = ns_phy_get,
-   .phy_get     = ns_phy_get,
+        .proc_read = ns_proc_read,
-   .proc_read   = ns_proc_read,
+        .owner = THIS_MODULE,
-   .owner       = THIS_MODULE,
 };
 static struct timer_list ns_timer;
 static char *mac[NS_MAX_CARDS];
 module_param_array(mac, charp, NULL, 0);
 MODULE_LICENSE("GPL");
+/* Functions */
-/* Functions*******************************************************************/
 static int __devinit nicstar_init_one(struct pci_dev *pcidev,
                                      const struct pci_device_id *ent)
 {
-   static int index = -1;
+        static int index = -1;
-   unsigned int error;
+        unsigned int error;
-   index++;
+        index++;
-   cards[index] = NULL;
+        cards[index] = NULL;
-   error = ns_init_card(index, pcidev);
+        error = ns_init_card(index, pcidev);
-   if (error) {
+        if (error) {
-      cards[index--] = NULL;    /* don't increment index */
+                cards[index--] = NULL;  /* don't increment index */
-      goto err_out;
+                goto err_out;
-   }
+        }
-   return 0;
+        return 0;
 err_out:
-   return -ENODEV;
+        return -ENODEV;
 }
 static void __devexit nicstar_remove_one(struct pci_dev *pcidev)
 {
-   int i, j;
+        int i, j;
-   ns_dev *card = pci_get_drvdata(pcidev);
+        ns_dev *card = pci_get_drvdata(pcidev);
-   struct sk_buff *hb;
+        struct sk_buff *hb;
-   struct sk_buff *iovb;
+        struct sk_buff *iovb;
-   struct sk_buff *lb;
+        struct sk_buff *lb;
-   struct sk_buff *sb;
+        struct sk_buff *sb;
-   
-   i = card->index;
+        i = card->index;
-   if (cards[i] == NULL)
+        if (cards[i] == NULL)
-      return;
+                return;
-   if (card->atmdev->phy && card->atmdev->phy->stop)
+        if (card->atmdev->phy && card->atmdev->phy->stop)
-      card->atmdev->phy->stop(card->atmdev);
+                card->atmdev->phy->stop(card->atmdev);
-   /* Stop everything */
+        /* Stop everything */
-   writel(0x00000000, card->membase + CFG);
+        writel(0x00000000, card->membase + CFG);
-   /* De-register device */
+        /* De-register device */
-   atm_dev_deregister(card->atmdev);
+        atm_dev_deregister(card->atmdev);
-   /* Disable PCI device */
+        /* Disable PCI device */
-   pci_disable_device(pcidev);
+        pci_disable_device(pcidev);
-   
-   /* Free up resources */
+        /* Free up resources */
-   j = 0;
+        j = 0;
-   PRINTK("nicstar%d: freeing %d huge buffers.\n", i, card->hbpool.count);
+        PRINTK("nicstar%d: freeing %d huge buffers.\n", i, card->hbpool.count);
-   while ((hb = skb_dequeue(&card->hbpool.queue)) != NULL)
+        while ((hb = skb_dequeue(&card->hbpool.queue)) != NULL) {
-   {
+                dev_kfree_skb_any(hb);
-      dev_kfree_skb_any(hb);
+                j++;
-      j++;
+        }
-   }
+        PRINTK("nicstar%d: %d huge buffers freed.\n", i, j);
-   PRINTK("nicstar%d: %d huge buffers freed.\n", i, j);
+        j = 0;
-   j = 0;
+        PRINTK("nicstar%d: freeing %d iovec buffers.\n", i,
-   PRINTK("nicstar%d: freeing %d iovec buffers.\n", i, card->iovpool.count);
+               card->iovpool.count);
-   while ((iovb = skb_dequeue(&card->iovpool.queue)) != NULL)
+        while ((iovb = skb_dequeue(&card->iovpool.queue)) != NULL) {
-   {
+                dev_kfree_skb_any(iovb);
-      dev_kfree_skb_any(iovb);
+                j++;
-      j++;
+        }
-   }
+        PRINTK("nicstar%d: %d iovec buffers freed.\n", i, j);
-   PRINTK("nicstar%d: %d iovec buffers freed.\n", i, j);
+        while ((lb = skb_dequeue(&card->lbpool.queue)) != NULL)
-   while ((lb = skb_dequeue(&card->lbpool.queue)) != NULL)
+                dev_kfree_skb_any(lb);
-      dev_kfree_skb_any(lb);
+        while ((sb = skb_dequeue(&card->sbpool.queue)) != NULL)
-   while ((sb = skb_dequeue(&card->sbpool.queue)) != NULL)
+                dev_kfree_skb_any(sb);
-      dev_kfree_skb_any(sb);
+        free_scq(card, card->scq0, NULL);
-   free_scq(card->scq0, NULL);
+        for (j = 0; j < NS_FRSCD_NUM; j++) {
-   for (j = 0; j < NS_FRSCD_NUM; j++)
+                if (card->scd2vc[j] != NULL)
-   {
+                        free_scq(card, card->scd2vc[j]->scq, card->scd2vc[j]->tx_vcc);
-      if (card->scd2vc[j] != NULL)
+        }
-         free_scq(card->scd2vc[j]->scq, card->scd2vc[j]->tx_vcc);
+        idr_remove_all(&card->idr);
-   }
+        idr_destroy(&card->idr);
-   kfree(card->rsq.org);
+        pci_free_consistent(card->pcidev, NS_RSQSIZE + NS_RSQ_ALIGNMENT,
-   kfree(card->tsq.org);
+                            card->rsq.org, card->rsq.dma);
-   free_irq(card->pcidev->irq, card);
+        pci_free_consistent(card->pcidev, NS_TSQSIZE + NS_TSQ_ALIGNMENT,
-   iounmap(card->membase);
+                            card->tsq.org, card->tsq.dma);
-   kfree(card);
+        free_irq(card->pcidev->irq, card);
+        iounmap(card->membase);
+        kfree(card);
 }
+static struct pci_device_id nicstar_pci_tbl[] __devinitdata = {
+        { PCI_VDEVICE(IDT, PCI_DEVICE_ID_IDT_IDT77201), 0 },
-static struct pci_device_id nicstar_pci_tbl[] __devinitdata =
-{
-        {PCI_VENDOR_ID_IDT, PCI_DEVICE_ID_IDT_IDT77201,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {0,}                    /* terminate list */
 };
-MODULE_DEVICE_TABLE(pci, nicstar_pci_tbl);
+MODULE_DEVICE_TABLE(pci, nicstar_pci_tbl);
 static struct pci_driver nicstar_driver = {
-        .name           = "nicstar",
+        .name = "nicstar",
-        .id_table       = nicstar_pci_tbl,
+        .id_table = nicstar_pci_tbl,
-        .probe          = nicstar_init_one,
+        .probe = nicstar_init_one,
-        .remove         = __devexit_p(nicstar_remove_one),
+        .remove = __devexit_p(nicstar_remove_one),
 };
 static int __init nicstar_init(void)
 {
-   unsigned error = 0;  /* Initialized to remove compile warning */
+        unsigned error = 0;     /* Initialized to remove compile warning */
+        XPRINTK("nicstar: nicstar_init() called.\n");
-   XPRINTK("nicstar: nicstar_init() called.\n");
+        error = pci_register_driver(&nicstar_driver);
-   error = pci_register_driver(&nicstar_driver);
+        TXPRINTK("nicstar: TX debug enabled.\n");
-   
+        RXPRINTK("nicstar: RX debug enabled.\n");
-   TXPRINTK("nicstar: TX debug enabled.\n");
+        PRINTK("nicstar: General debug enabled.\n");
-   RXPRINTK("nicstar: RX debug enabled.\n");
-   PRINTK("nicstar: General debug enabled.\n");
 #ifdef PHY_LOOPBACK
-   printk("nicstar: using PHY loopback.\n");
+        printk("nicstar: using PHY loopback.\n");
 #endif /* PHY_LOOPBACK */
-   XPRINTK("nicstar: nicstar_init() returned.\n");
+        XPRINTK("nicstar: nicstar_init() returned.\n");
-   if (!error) {
-      init_timer(&ns_timer);
-      ns_timer.expires = jiffies + NS_POLL_PERIOD;
-      ns_timer.data = 0UL;
-      ns_timer.function = ns_poll;
-      add_timer(&ns_timer);
-   }
-   
-   return error;
-}
+        if (!error) {
+                init_timer(&ns_timer);
+                ns_timer.expires = jiffies + NS_POLL_PERIOD;
+                ns_timer.data = 0UL;
+                ns_timer.function = ns_poll;
+                add_timer(&ns_timer);
+        }
+        return error;
+}
 static void __exit nicstar_cleanup(void)
 {
-   XPRINTK("nicstar: nicstar_cleanup() called.\n");
+        XPRINTK("nicstar: nicstar_cleanup() called.\n");
-   del_timer(&ns_timer);
+        del_timer(&ns_timer);
-   pci_unregister_driver(&nicstar_driver);
+        pci_unregister_driver(&nicstar_driver);
-   XPRINTK("nicstar: nicstar_cleanup() returned.\n");
+        XPRINTK("nicstar: nicstar_cleanup() returned.\n");
 }
+static u32 ns_read_sram(ns_dev * card, u32 sram_address)
-static u32 ns_read_sram(ns_dev *card, u32 sram_address)
 {
-   unsigned long flags;
+        unsigned long flags;
-   u32 data;
+        u32 data;
-   sram_address <<= 2;
+        sram_address <<= 2;
-   sram_address &= 0x0007FFFC;  /* address must be dword aligned */
+        sram_address &= 0x0007FFFC;     /* address must be dword aligned */
-   sram_address |= 0x50000000;  /* SRAM read command */
+        sram_address |= 0x50000000;     /* SRAM read command */
-   spin_lock_irqsave(&card->res_lock, flags);
+        spin_lock_irqsave(&card->res_lock, flags);
-   while (CMD_BUSY(card));
+        while (CMD_BUSY(card)) ;
-   writel(sram_address, card->membase + CMD);
+        writel(sram_address, card->membase + CMD);
-   while (CMD_BUSY(card));
+        while (CMD_BUSY(card)) ;
-   data = readl(card->membase + DR0);
+        data = readl(card->membase + DR0);
-   spin_unlock_irqrestore(&card->res_lock, flags);
+        spin_unlock_irqrestore(&card->res_lock, flags);
-   return data;
+        return data;
 }
+static void ns_write_sram(ns_dev * card, u32 sram_address, u32 * value,
-   
+                          int count)
-static void ns_write_sram(ns_dev *card, u32 sram_address, u32 *value, int count)
 {
-   unsigned long flags;
+        unsigned long flags;
-   int i, c;
+        int i, c;
-   count--;     /* count range now is 0..3 instead of 1..4 */
+        count--;                /* count range now is 0..3 instead of 1..4 */
-   c = count;
+        c = count;
-   c <<= 2;     /* to use increments of 4 */
+        c <<= 2;                /* to use increments of 4 */
-   spin_lock_irqsave(&card->res_lock, flags);
+        spin_lock_irqsave(&card->res_lock, flags);
-   while (CMD_BUSY(card));
+        while (CMD_BUSY(card)) ;
-   for (i = 0; i <= c; i += 4)
+        for (i = 0; i <= c; i += 4)
-      writel(*(value++), card->membase + i);
+                writel(*(value++), card->membase + i);
-   /* Note: DR# registers are the first 4 dwords in nicstar's memspace,
+        /* Note: DR# registers are the first 4 dwords in nicstar's memspace,
-            so card->membase + DR0 == card->membase */
+           so card->membase + DR0 == card->membase */
-   sram_address <<= 2;
+        sram_address <<= 2;
-   sram_address &= 0x0007FFFC;
+        sram_address &= 0x0007FFFC;
-   sram_address |= (0x40000000 | count);
+        sram_address |= (0x40000000 | count);
-   writel(sram_address, card->membase + CMD);
+        writel(sram_address, card->membase + CMD);
-   spin_unlock_irqrestore(&card->res_lock, flags);
+        spin_unlock_irqrestore(&card->res_lock, flags);
 }
 static int __devinit ns_init_card(int i, struct pci_dev *pcidev)
 {
-   int j;
+        int j;
-   struct ns_dev *card = NULL;
+        struct ns_dev *card = NULL;
-   unsigned char pci_latency;
+        unsigned char pci_latency;
-   unsigned error;
+        unsigned error;
-   u32 data;
+        u32 data;
-   u32 u32d[4];
+        u32 u32d[4];
-   u32 ns_cfg_rctsize;
+        u32 ns_cfg_rctsize;
-   int bcount;
+        int bcount;
-   unsigned long membase;
+        unsigned long membase;
-   error = 0;
+        error = 0;
-   if (pci_enable_device(pcidev))
+        if (pci_enable_device(pcidev)) {
-   {
+                printk("nicstar%d: can't enable PCI device\n", i);
-      printk("nicstar%d: can't enable PCI device\n", i);
+                error = 2;
-      error = 2;
+                ns_init_card_error(card, error);
-      ns_init_card_error(card, error);
+                return error;
-      return error;
+        }
-   }
+        if ((pci_set_dma_mask(pcidev, DMA_BIT_MASK(32)) != 0) ||
+            (pci_set_consistent_dma_mask(pcidev, DMA_BIT_MASK(32)) != 0)) {
-   if ((card = kmalloc(sizeof(ns_dev), GFP_KERNEL)) == NULL)
+                printk(KERN_WARNING
-   {
+                       "nicstar%d: No suitable DMA available.\n", i);
-      printk("nicstar%d: can't allocate memory for device structure.\n", i);
+                error = 2;
-      error = 2;
+                ns_init_card_error(card, error);
-      ns_init_card_error(card, error);
+                return error;
-      return error;
+        }
-   }
-   cards[i] = card;
+        if ((card = kmalloc(sizeof(ns_dev), GFP_KERNEL)) == NULL) {
-   spin_lock_init(&card->int_lock);
+                printk
-   spin_lock_init(&card->res_lock);
+                    ("nicstar%d: can't allocate memory for device structure.\n",
-      
+                     i);
-   pci_set_drvdata(pcidev, card);
+                error = 2;
-   
+                ns_init_card_error(card, error);
-   card->index = i;
+                return error;
-   card->atmdev = NULL;
+        }
-   card->pcidev = pcidev;
+        cards[i] = card;
-   membase = pci_resource_start(pcidev, 1);
+        spin_lock_init(&card->int_lock);
-   card->membase = ioremap(membase, NS_IOREMAP_SIZE);
+        spin_lock_init(&card->res_lock);
-   if (!card->membase)
-   {
+        pci_set_drvdata(pcidev, card);
-      printk("nicstar%d: can't ioremap() membase.\n",i);
-      error = 3;
+        card->index = i;
-      ns_init_card_error(card, error);
+        card->atmdev = NULL;
-      return error;
+        card->pcidev = pcidev;
-   }
+        membase = pci_resource_start(pcidev, 1);
-   PRINTK("nicstar%d: membase at 0x%x.\n", i, card->membase);
+        card->membase = ioremap(membase, NS_IOREMAP_SIZE);
+        if (!card->membase) {
-   pci_set_master(pcidev);
+                printk("nicstar%d: can't ioremap() membase.\n", i);
+                error = 3;
-   if (pci_read_config_byte(pcidev, PCI_LATENCY_TIMER, &pci_latency) != 0)
+                ns_init_card_error(card, error);
-   {
+                return error;
-      printk("nicstar%d: can't read PCI latency timer.\n", i);
+        }
-      error = 6;
+        PRINTK("nicstar%d: membase at 0x%p.\n", i, card->membase);
-      ns_init_card_error(card, error);
-      return error;
+        pci_set_master(pcidev);
-   }
+        if (pci_read_config_byte(pcidev, PCI_LATENCY_TIMER, &pci_latency) != 0) {
+                printk("nicstar%d: can't read PCI latency timer.\n", i);
+                error = 6;
+                ns_init_card_error(card, error);
+                return error;
+        }
 #ifdef NS_PCI_LATENCY
-   if (pci_latency < NS_PCI_LATENCY)
+        if (pci_latency < NS_PCI_LATENCY) {
-   {
+                PRINTK("nicstar%d: setting PCI latency timer to %d.\n", i,
-      PRINTK("nicstar%d: setting PCI latency timer to %d.\n", i, NS_PCI_LATENCY);
+                       NS_PCI_LATENCY);
-      for (j = 1; j < 4; j++)
+                for (j = 1; j < 4; j++) {
-      {
+                        if (pci_write_config_byte
-         if (pci_write_config_byte(pcidev, PCI_LATENCY_TIMER, NS_PCI_LATENCY) != 0)
+                            (pcidev, PCI_LATENCY_TIMER, NS_PCI_LATENCY) != 0)
-            break;
+                                break;
-      }
+                }
-      if (j == 4)
+                if (j == 4) {
-      {
+                        printk
-         printk("nicstar%d: can't set PCI latency timer to %d.\n", i, NS_PCI_LATENCY);
+                            ("nicstar%d: can't set PCI latency timer to %d.\n",
-         error = 7;
+                             i, NS_PCI_LATENCY);
-         ns_init_card_error(card, error);
+                        error = 7;
-         return error;
+                        ns_init_card_error(card, error);
-      }
+                        return error;
-   }
+                }
+        }
 #endif /* NS_PCI_LATENCY */
-      
-   /* Clear timer overflow */
+        /* Clear timer overflow */
-   data = readl(card->membase + STAT);
+        data = readl(card->membase + STAT);
-   if (data & NS_STAT_TMROF)
+        if (data & NS_STAT_TMROF)
-      writel(NS_STAT_TMROF, card->membase + STAT);
+                writel(NS_STAT_TMROF, card->membase + STAT);
-   /* Software reset */
+        /* Software reset */
-   writel(NS_CFG_SWRST, card->membase + CFG);
+        writel(NS_CFG_SWRST, card->membase + CFG);
-   NS_DELAY;
+        NS_DELAY;
-   writel(0x00000000, card->membase + CFG);
+        writel(0x00000000, card->membase + CFG);
-   /* PHY reset */
+        /* PHY reset */
-   writel(0x00000008, card->membase + GP);
+        writel(0x00000008, card->membase + GP);
-   NS_DELAY;
+        NS_DELAY;
-   writel(0x00000001, card->membase + GP);
+        writel(0x00000001, card->membase + GP);
-   NS_DELAY;
+        NS_DELAY;
-   while (CMD_BUSY(card));
+        while (CMD_BUSY(card)) ;
-   writel(NS_CMD_WRITE_UTILITY | 0x00000100, card->membase + CMD);      /* Sync UTOPIA with SAR clock */
+        writel(NS_CMD_WRITE_UTILITY | 0x00000100, card->membase + CMD); /* Sync UTOPIA with SAR clock */
-   NS_DELAY;
+        NS_DELAY;
-      
-   /* Detect PHY type */
+        /* Detect PHY type */
-   while (CMD_BUSY(card));
+        while (CMD_BUSY(card)) ;
-   writel(NS_CMD_READ_UTILITY | 0x00000200, card->membase + CMD);
+        writel(NS_CMD_READ_UTILITY | 0x00000200, card->membase + CMD);
-   while (CMD_BUSY(card));
+        while (CMD_BUSY(card)) ;
-   data = readl(card->membase + DR0);
+        data = readl(card->membase + DR0);
-   switch(data) {
+        switch (data) {
-      case 0x00000009:
+        case 0x00000009:
-         printk("nicstar%d: PHY seems to be 25 Mbps.\n", i);
+                printk("nicstar%d: PHY seems to be 25 Mbps.\n", i);
-         card->max_pcr = ATM_25_PCR;
+                card->max_pcr = ATM_25_PCR;
-         while(CMD_BUSY(card));
+                while (CMD_BUSY(card)) ;
-         writel(0x00000008, card->membase + DR0);
+                writel(0x00000008, card->membase + DR0);
-         writel(NS_CMD_WRITE_UTILITY | 0x00000200, card->membase + CMD);
+                writel(NS_CMD_WRITE_UTILITY | 0x00000200, card->membase + CMD);
-         /* Clear an eventual pending interrupt */
+                /* Clear an eventual pending interrupt */
-         writel(NS_STAT_SFBQF, card->membase + STAT);
+                writel(NS_STAT_SFBQF, card->membase + STAT);
 #ifdef PHY_LOOPBACK
-         while(CMD_BUSY(card));
+                while (CMD_BUSY(card)) ;
-         writel(0x00000022, card->membase + DR0);
+                writel(0x00000022, card->membase + DR0);
-         writel(NS_CMD_WRITE_UTILITY | 0x00000202, card->membase + CMD);
+                writel(NS_CMD_WRITE_UTILITY | 0x00000202, card->membase + CMD);
 #endif /* PHY_LOOPBACK */
-         break;
+                break;
-      case 0x00000030:
+        case 0x00000030:
-      case 0x00000031:
+        case 0x00000031:
-         printk("nicstar%d: PHY seems to be 155 Mbps.\n", i);
+                printk("nicstar%d: PHY seems to be 155 Mbps.\n", i);
-         card->max_pcr = ATM_OC3_PCR;
+                card->max_pcr = ATM_OC3_PCR;
 #ifdef PHY_LOOPBACK
-         while(CMD_BUSY(card));
+                while (CMD_BUSY(card)) ;
-         writel(0x00000002, card->membase + DR0);
+                writel(0x00000002, card->membase + DR0);
-         writel(NS_CMD_WRITE_UTILITY | 0x00000205, card->membase + CMD);
+                writel(NS_CMD_WRITE_UTILITY | 0x00000205, card->membase + CMD);
 #endif /* PHY_LOOPBACK */
-         break;
+                break;
-      default:
+        default:
-         printk("nicstar%d: unknown PHY type (0x%08X).\n", i, data);
+                printk("nicstar%d: unknown PHY type (0x%08X).\n", i, data);
-         error = 8;
+                error = 8;
-         ns_init_card_error(card, error);
+                ns_init_card_error(card, error);
-         return error;
+                return error;
-   }
+        }
-   writel(0x00000000, card->membase + GP);
+        writel(0x00000000, card->membase + GP);
-   /* Determine SRAM size */
+        /* Determine SRAM size */
-   data = 0x76543210;
+        data = 0x76543210;
-   ns_write_sram(card, 0x1C003, &data, 1);
+        ns_write_sram(card, 0x1C003, &data, 1);
-   data = 0x89ABCDEF;
+        data = 0x89ABCDEF;
-   ns_write_sram(card, 0x14003, &data, 1);
+        ns_write_sram(card, 0x14003, &data, 1);
-   if (ns_read_sram(card, 0x14003) == 0x89ABCDEF &&
+        if (ns_read_sram(card, 0x14003) == 0x89ABCDEF &&
-       ns_read_sram(card, 0x1C003) == 0x76543210)
+            ns_read_sram(card, 0x1C003) == 0x76543210)
-       card->sram_size = 128;
+                card->sram_size = 128;
-   else
+        else
-      card->sram_size = 32;
+                card->sram_size = 32;
-   PRINTK("nicstar%d: %dK x 32bit SRAM size.\n", i, card->sram_size);
+        PRINTK("nicstar%d: %dK x 32bit SRAM size.\n", i, card->sram_size);
-   card->rct_size = NS_MAX_RCTSIZE;
+        card->rct_size = NS_MAX_RCTSIZE;
 #if (NS_MAX_RCTSIZE == 4096)
-   if (card->sram_size == 128)
+        if (card->sram_size == 128)
-      printk("nicstar%d: limiting maximum VCI. See NS_MAX_RCTSIZE in nicstar.h\n", i);
+                printk
+                    ("nicstar%d: limiting maximum VCI. See NS_MAX_RCTSIZE in nicstar.h\n",
+                     i);
 #elif (NS_MAX_RCTSIZE == 16384)
-   if (card->sram_size == 32)
+        if (card->sram_size == 32) {
-   {
+                printk
-      printk("nicstar%d: wasting memory. See NS_MAX_RCTSIZE in nicstar.h\n", i);
+                    ("nicstar%d: wasting memory. See NS_MAX_RCTSIZE in nicstar.h\n",
-      card->rct_size = 4096;
+                     i);
-   }
+                card->rct_size = 4096;
+        }
 #else
 #error NS_MAX_RCTSIZE must be either 4096 or 16384 in nicstar.c
 #endif
-   card->vpibits = NS_VPIBITS;
+        card->vpibits = NS_VPIBITS;
-   if (card->rct_size == 4096)
+        if (card->rct_size == 4096)
-      card->vcibits = 12 - NS_VPIBITS;
+                card->vcibits = 12 - NS_VPIBITS;
-   else /* card->rct_size == 16384 */
+        else                    /* card->rct_size == 16384 */
-      card->vcibits = 14 - NS_VPIBITS;
+                card->vcibits = 14 - NS_VPIBITS;
-   /* Initialize the nicstar eeprom/eprom stuff, for the MAC addr */
+        /* Initialize the nicstar eeprom/eprom stuff, for the MAC addr */
-   if (mac[i] == NULL)
+        if (mac[i] == NULL)
-      nicstar_init_eprom(card->membase);
+                nicstar_init_eprom(card->membase);
-   /* Set the VPI/VCI MSb mask to zero so we can receive OAM cells */
+        /* Set the VPI/VCI MSb mask to zero so we can receive OAM cells */
-   writel(0x00000000, card->membase + VPM);
+        writel(0x00000000, card->membase + VPM);
-      
-   /* Initialize TSQ */
+        /* Initialize TSQ */
-   card->tsq.org = kmalloc(NS_TSQSIZE + NS_TSQ_ALIGNMENT, GFP_KERNEL);
+        card->tsq.org = pci_alloc_consistent(card->pcidev,
-   if (card->tsq.org == NULL)
+                                             NS_TSQSIZE + NS_TSQ_ALIGNMENT,
-   {
+                                             &card->tsq.dma);
-      printk("nicstar%d: can't allocate TSQ.\n", i);
+        if (card->tsq.org == NULL) {
-      error = 10;
+                printk("nicstar%d: can't allocate TSQ.\n", i);
-      ns_init_card_error(card, error);
+                error = 10;
-      return error;
+                ns_init_card_error(card, error);
-   }
+                return error;
-   card->tsq.base = (ns_tsi *) ALIGN_ADDRESS(card->tsq.org, NS_TSQ_ALIGNMENT);
+        }
-   card->tsq.next = card->tsq.base;
+        card->tsq.base = PTR_ALIGN(card->tsq.org, NS_TSQ_ALIGNMENT);
-   card->tsq.last = card->tsq.base + (NS_TSQ_NUM_ENTRIES - 1);
+        card->tsq.next = card->tsq.base;
-   for (j = 0; j < NS_TSQ_NUM_ENTRIES; j++)
+        card->tsq.last = card->tsq.base + (NS_TSQ_NUM_ENTRIES - 1);
-      ns_tsi_init(card->tsq.base + j);
+        for (j = 0; j < NS_TSQ_NUM_ENTRIES; j++)
-   writel(0x00000000, card->membase + TSQH);
+                ns_tsi_init(card->tsq.base + j);
-   writel((u32) virt_to_bus(card->tsq.base), card->membase + TSQB);
+        writel(0x00000000, card->membase + TSQH);
-   PRINTK("nicstar%d: TSQ base at 0x%x  0x%x  0x%x.\n", i, (u32) card->tsq.base,
+        writel(ALIGN(card->tsq.dma, NS_TSQ_ALIGNMENT), card->membase + TSQB);
-          (u32) virt_to_bus(card->tsq.base), readl(card->membase + TSQB));
+        PRINTK("nicstar%d: TSQ base at 0x%p.\n", i, card->tsq.base);
-      
-   /* Initialize RSQ */
+        /* Initialize RSQ */
-   card->rsq.org = kmalloc(NS_RSQSIZE + NS_RSQ_ALIGNMENT, GFP_KERNEL);
+        card->rsq.org = pci_alloc_consistent(card->pcidev,
-   if (card->rsq.org == NULL)
+                                             NS_RSQSIZE + NS_RSQ_ALIGNMENT,
-   {
+                                             &card->rsq.dma);
-      printk("nicstar%d: can't allocate RSQ.\n", i);
+        if (card->rsq.org == NULL) {
-      error = 11;
+                printk("nicstar%d: can't allocate RSQ.\n", i);
-      ns_init_card_error(card, error);
+                error = 11;
-      return error;
+                ns_init_card_error(card, error);
-   }
+                return error;
-   card->rsq.base = (ns_rsqe *) ALIGN_ADDRESS(card->rsq.org, NS_RSQ_ALIGNMENT);
+        }
-   card->rsq.next = card->rsq.base;
+        card->rsq.base = PTR_ALIGN(card->rsq.org, NS_RSQ_ALIGNMENT);
-   card->rsq.last = card->rsq.base + (NS_RSQ_NUM_ENTRIES - 1);
+        card->rsq.next = card->rsq.base;
-   for (j = 0; j < NS_RSQ_NUM_ENTRIES; j++)
+        card->rsq.last = card->rsq.base + (NS_RSQ_NUM_ENTRIES - 1);
-      ns_rsqe_init(card->rsq.base + j);
+        for (j = 0; j < NS_RSQ_NUM_ENTRIES; j++)
-   writel(0x00000000, card->membase + RSQH);
+                ns_rsqe_init(card->rsq.base + j);
-   writel((u32) virt_to_bus(card->rsq.base), card->membase + RSQB);
+        writel(0x00000000, card->membase + RSQH);
-   PRINTK("nicstar%d: RSQ base at 0x%x.\n", i, (u32) card->rsq.base);
+        writel(ALIGN(card->rsq.dma, NS_RSQ_ALIGNMENT), card->membase + RSQB);
-      
+        PRINTK("nicstar%d: RSQ base at 0x%p.\n", i, card->rsq.base);
-   /* Initialize SCQ0, the only VBR SCQ used */
-   card->scq1 = NULL;
+        /* Initialize SCQ0, the only VBR SCQ used */
-   card->scq2 = NULL;
+        card->scq1 = NULL;
-   card->scq0 = get_scq(VBR_SCQSIZE, NS_VRSCD0);
+        card->scq2 = NULL;
-   if (card->scq0 == NULL)
+        card->scq0 = get_scq(card, VBR_SCQSIZE, NS_VRSCD0);
-   {
+        if (card->scq0 == NULL) {
-      printk("nicstar%d: can't get SCQ0.\n", i);
+                printk("nicstar%d: can't get SCQ0.\n", i);
-      error = 12;
+                error = 12;
-      ns_init_card_error(card, error);
+                ns_init_card_error(card, error);
-      return error;
+                return error;
-   }
+        }
-   u32d[0] = (u32) virt_to_bus(card->scq0->base);
+        u32d[0] = scq_virt_to_bus(card->scq0, card->scq0->base);
-   u32d[1] = (u32) 0x00000000;
+        u32d[1] = (u32) 0x00000000;
-   u32d[2] = (u32) 0xffffffff;
+        u32d[2] = (u32) 0xffffffff;
-   u32d[3] = (u32) 0x00000000;
+        u32d[3] = (u32) 0x00000000;
-   ns_write_sram(card, NS_VRSCD0, u32d, 4);
+        ns_write_sram(card, NS_VRSCD0, u32d, 4);
-   ns_write_sram(card, NS_VRSCD1, u32d, 4);     /* These last two won't be used */
+        ns_write_sram(card, NS_VRSCD1, u32d, 4);        /* These last two won't be used */
-   ns_write_sram(card, NS_VRSCD2, u32d, 4);     /* but are initialized, just in case... */
+        ns_write_sram(card, NS_VRSCD2, u32d, 4);        /* but are initialized, just in case... */
-   card->scq0->scd = NS_VRSCD0;
+        card->scq0->scd = NS_VRSCD0;
-   PRINTK("nicstar%d: VBR-SCQ0 base at 0x%x.\n", i, (u32) card->scq0->base);
+        PRINTK("nicstar%d: VBR-SCQ0 base at 0x%p.\n", i, card->scq0->base);
-   /* Initialize TSTs */
+        /* Initialize TSTs */
-   card->tst_addr = NS_TST0;
+        card->tst_addr = NS_TST0;
-   card->tst_free_entries = NS_TST_NUM_ENTRIES;
+        card->tst_free_entries = NS_TST_NUM_ENTRIES;
-   data = NS_TST_OPCODE_VARIABLE;
+        data = NS_TST_OPCODE_VARIABLE;
-   for (j = 0; j < NS_TST_NUM_ENTRIES; j++)
+        for (j = 0; j < NS_TST_NUM_ENTRIES; j++)
-      ns_write_sram(card, NS_TST0 + j, &data, 1);
+                ns_write_sram(card, NS_TST0 + j, &data, 1);
-   data = ns_tste_make(NS_TST_OPCODE_END, NS_TST0);
+        data = ns_tste_make(NS_TST_OPCODE_END, NS_TST0);
-   ns_write_sram(card, NS_TST0 + NS_TST_NUM_ENTRIES, &data, 1);
+        ns_write_sram(card, NS_TST0 + NS_TST_NUM_ENTRIES, &data, 1);
-   for (j = 0; j < NS_TST_NUM_ENTRIES; j++)
+        for (j = 0; j < NS_TST_NUM_ENTRIES; j++)
-      ns_write_sram(card, NS_TST1 + j, &data, 1);
+                ns_write_sram(card, NS_TST1 + j, &data, 1);
-   data = ns_tste_make(NS_TST_OPCODE_END, NS_TST1);
+        data = ns_tste_make(NS_TST_OPCODE_END, NS_TST1);
-   ns_write_sram(card, NS_TST1 + NS_TST_NUM_ENTRIES, &data, 1);
+        ns_write_sram(card, NS_TST1 + NS_TST_NUM_ENTRIES, &data, 1);
-   for (j = 0; j < NS_TST_NUM_ENTRIES; j++)
+        for (j = 0; j < NS_TST_NUM_ENTRIES; j++)
-      card->tste2vc[j] = NULL;
+                card->tste2vc[j] = NULL;
-   writel(NS_TST0 << 2, card->membase + TSTB);
+        writel(NS_TST0 << 2, card->membase + TSTB);
+        /* Initialize RCT. AAL type is set on opening the VC. */
-   /* Initialize RCT. AAL type is set on opening the VC. */
 #ifdef RCQ_SUPPORT
-   u32d[0] = NS_RCTE_RAWCELLINTEN;
+        u32d[0] = NS_RCTE_RAWCELLINTEN;
 #else
-   u32d[0] = 0x00000000;
+        u32d[0] = 0x00000000;
 #endif /* RCQ_SUPPORT */
-   u32d[1] = 0x00000000;
+        u32d[1] = 0x00000000;
-   u32d[2] = 0x00000000;
+        u32d[2] = 0x00000000;
-   u32d[3] = 0xFFFFFFFF;
+        u32d[3] = 0xFFFFFFFF;
-   for (j = 0; j < card->rct_size; j++)
+        for (j = 0; j < card->rct_size; j++)
-      ns_write_sram(card, j * 4, u32d, 4);      
+                ns_write_sram(card, j * 4, u32d, 4);
-      
-   memset(card->vcmap, 0, NS_MAX_RCTSIZE * sizeof(vc_map));
+        memset(card->vcmap, 0, NS_MAX_RCTSIZE * sizeof(vc_map));
-      
-   for (j = 0; j < NS_FRSCD_NUM; j++)
+        for (j = 0; j < NS_FRSCD_NUM; j++)
-      card->scd2vc[j] = NULL;
+                card->scd2vc[j] = NULL;
-   /* Initialize buffer levels */
+        /* Initialize buffer levels */
-   card->sbnr.min = MIN_SB;
+        card->sbnr.min = MIN_SB;
-   card->sbnr.init = NUM_SB;
+        card->sbnr.init = NUM_SB;
-   card->sbnr.max = MAX_SB;
+        card->sbnr.max = MAX_SB;
-   card->lbnr.min = MIN_LB;
+        card->lbnr.min = MIN_LB;
-   card->lbnr.init = NUM_LB;
+        card->lbnr.init = NUM_LB;
-   card->lbnr.max = MAX_LB;
+        card->lbnr.max = MAX_LB;
-   card->iovnr.min = MIN_IOVB;
+        card->iovnr.min = MIN_IOVB;
-   card->iovnr.init = NUM_IOVB;
+        card->iovnr.init = NUM_IOVB;
-   card->iovnr.max = MAX_IOVB;
+        card->iovnr.max = MAX_IOVB;
-   card->hbnr.min = MIN_HB;
+        card->hbnr.min = MIN_HB;
-   card->hbnr.init = NUM_HB;
+        card->hbnr.init = NUM_HB;
-   card->hbnr.max = MAX_HB;
+        card->hbnr.max = MAX_HB;
-   
-   card->sm_handle = 0x00000000;
+        card->sm_handle = 0x00000000;
-   card->sm_addr = 0x00000000;
+        card->sm_addr = 0x00000000;
-   card->lg_handle = 0x00000000;
+        card->lg_handle = 0x00000000;
-   card->lg_addr = 0x00000000;
+        card->lg_addr = 0x00000000;
-   
-   card->efbie = 1;     /* To prevent push_rxbufs from enabling the interrupt */
+        card->efbie = 1;        /* To prevent push_rxbufs from enabling the interrupt */
-   /* Pre-allocate some huge buffers */
+        idr_init(&card->idr);
-   skb_queue_head_init(&card->hbpool.queue);
-   card->hbpool.count = 0;
+        /* Pre-allocate some huge buffers */
-   for (j = 0; j < NUM_HB; j++)
+        skb_queue_head_init(&card->hbpool.queue);
-   {
+        card->hbpool.count = 0;
-      struct sk_buff *hb;
+        for (j = 0; j < NUM_HB; j++) {
-      hb = __dev_alloc_skb(NS_HBUFSIZE, GFP_KERNEL);
+                struct sk_buff *hb;
-      if (hb == NULL)
+                hb = __dev_alloc_skb(NS_HBUFSIZE, GFP_KERNEL);
-      {
+                if (hb == NULL) {
-         printk("nicstar%d: can't allocate %dth of %d huge buffers.\n",
+                        printk
-                i, j, NUM_HB);
+                            ("nicstar%d: can't allocate %dth of %d huge buffers.\n",
-         error = 13;
+                             i, j, NUM_HB);
-         ns_init_card_error(card, error);
+                        error = 13;
-         return error;
+                        ns_init_card_error(card, error);
-      }
+                        return error;
-      NS_SKB_CB(hb)->buf_type = BUF_NONE;
+                }
-      skb_queue_tail(&card->hbpool.queue, hb);
+                NS_PRV_BUFTYPE(hb) = BUF_NONE;
-      card->hbpool.count++;
+                skb_queue_tail(&card->hbpool.queue, hb);
-   }
+                card->hbpool.count++;
+        }
-   /* Allocate large buffers */
+        /* Allocate large buffers */
-   skb_queue_head_init(&card->lbpool.queue);
+        skb_queue_head_init(&card->lbpool.queue);
-   card->lbpool.count = 0;                      /* Not used */
+        card->lbpool.count = 0; /* Not used */
-   for (j = 0; j < NUM_LB; j++)
+        for (j = 0; j < NUM_LB; j++) {
-   {
+                struct sk_buff *lb;
-      struct sk_buff *lb;
+                lb = __dev_alloc_skb(NS_LGSKBSIZE, GFP_KERNEL);
-      lb = __dev_alloc_skb(NS_LGSKBSIZE, GFP_KERNEL);
+                if (lb == NULL) {
-      if (lb == NULL)
+                        printk
-      {
+                            ("nicstar%d: can't allocate %dth of %d large buffers.\n",
-         printk("nicstar%d: can't allocate %dth of %d large buffers.\n",
+                             i, j, NUM_LB);
-                i, j, NUM_LB);
+                        error = 14;
-         error = 14;
+                        ns_init_card_error(card, error);
-         ns_init_card_error(card, error);
+                        return error;
-         return error;
+                }
-      }
+                NS_PRV_BUFTYPE(lb) = BUF_LG;
-      NS_SKB_CB(lb)->buf_type = BUF_LG;
+                skb_queue_tail(&card->lbpool.queue, lb);
-      skb_queue_tail(&card->lbpool.queue, lb);
+                skb_reserve(lb, NS_SMBUFSIZE);
-      skb_reserve(lb, NS_SMBUFSIZE);
+                push_rxbufs(card, lb);
-      push_rxbufs(card, lb);
+                /* Due to the implementation of push_rxbufs() this is 1, not 0 */
-      /* Due to the implementation of push_rxbufs() this is 1, not 0 */
+                if (j == 1) {
-      if (j == 1)
+                        card->rcbuf = lb;
-      {
+                        card->rawcell = (struct ns_rcqe *) lb->data;
-         card->rcbuf = lb;
+                        card->rawch = NS_PRV_DMA(lb);
-         card->rawch = (u32) virt_to_bus(lb->data);
+                }
-      }
+        }
-   }
+        /* Test for strange behaviour which leads to crashes */
-   /* Test for strange behaviour which leads to crashes */
+        if ((bcount =
-   if ((bcount = ns_stat_lfbqc_get(readl(card->membase + STAT))) < card->lbnr.min)
+             ns_stat_lfbqc_get(readl(card->membase + STAT))) < card->lbnr.min) {
-   {
+                printk
-      printk("nicstar%d: Strange... Just allocated %d large buffers and lfbqc = %d.\n",
+                    ("nicstar%d: Strange... Just allocated %d large buffers and lfbqc = %d.\n",
-             i, j, bcount);
+                     i, j, bcount);
-      error = 14;
+                error = 14;
-      ns_init_card_error(card, error);
+                ns_init_card_error(card, error);
-      return error;
+                return error;
-   }
+        }
-      
+        /* Allocate small buffers */
-   /* Allocate small buffers */
+        skb_queue_head_init(&card->sbpool.queue);
-   skb_queue_head_init(&card->sbpool.queue);
+        card->sbpool.count = 0; /* Not used */
-   card->sbpool.count = 0;                      /* Not used */
+        for (j = 0; j < NUM_SB; j++) {
-   for (j = 0; j < NUM_SB; j++)
+                struct sk_buff *sb;
-   {
+                sb = __dev_alloc_skb(NS_SMSKBSIZE, GFP_KERNEL);
-      struct sk_buff *sb;
+                if (sb == NULL) {
-      sb = __dev_alloc_skb(NS_SMSKBSIZE, GFP_KERNEL);
+                        printk
-      if (sb == NULL)
+                            ("nicstar%d: can't allocate %dth of %d small buffers.\n",
-      {
+                             i, j, NUM_SB);
-         printk("nicstar%d: can't allocate %dth of %d small buffers.\n",
+                        error = 15;
-                i, j, NUM_SB);
+                        ns_init_card_error(card, error);
-         error = 15;
+                        return error;
-         ns_init_card_error(card, error);
+                }
-         return error;
+                NS_PRV_BUFTYPE(sb) = BUF_SM;
-      }
+                skb_queue_tail(&card->sbpool.queue, sb);
-      NS_SKB_CB(sb)->buf_type = BUF_SM;
+                skb_reserve(sb, NS_AAL0_HEADER);
-      skb_queue_tail(&card->sbpool.queue, sb);
+                push_rxbufs(card, sb);
-      skb_reserve(sb, NS_AAL0_HEADER);
+        }
-      push_rxbufs(card, sb);
+        /* Test for strange behaviour which leads to crashes */
-   }
+        if ((bcount =
-   /* Test for strange behaviour which leads to crashes */
+             ns_stat_sfbqc_get(readl(card->membase + STAT))) < card->sbnr.min) {
-   if ((bcount = ns_stat_sfbqc_get(readl(card->membase + STAT))) < card->sbnr.min)
+                printk
-   {
+                    ("nicstar%d: Strange... Just allocated %d small buffers and sfbqc = %d.\n",
-      printk("nicstar%d: Strange... Just allocated %d small buffers and sfbqc = %d.\n",
+                     i, j, bcount);
-             i, j, bcount);
+                error = 15;
-      error = 15;
+                ns_init_card_error(card, error);
-      ns_init_card_error(card, error);
+                return error;
-      return error;
+        }
-   }
-      
+        /* Allocate iovec buffers */
+        skb_queue_head_init(&card->iovpool.queue);
-   /* Allocate iovec buffers */
+        card->iovpool.count = 0;
-   skb_queue_head_init(&card->iovpool.queue);
+        for (j = 0; j < NUM_IOVB; j++) {
-   card->iovpool.count = 0;
+                struct sk_buff *iovb;
-   for (j = 0; j < NUM_IOVB; j++)
+                iovb = alloc_skb(NS_IOVBUFSIZE, GFP_KERNEL);
-   {
+                if (iovb == NULL) {
-      struct sk_buff *iovb;
+                        printk
-      iovb = alloc_skb(NS_IOVBUFSIZE, GFP_KERNEL);
+                            ("nicstar%d: can't allocate %dth of %d iovec buffers.\n",
-      if (iovb == NULL)
+                             i, j, NUM_IOVB);
-      {
+                        error = 16;
-         printk("nicstar%d: can't allocate %dth of %d iovec buffers.\n",
+                        ns_init_card_error(card, error);
-                i, j, NUM_IOVB);
+                        return error;
-         error = 16;
+                }
-         ns_init_card_error(card, error);
+                NS_PRV_BUFTYPE(iovb) = BUF_NONE;
-         return error;
+                skb_queue_tail(&card->iovpool.queue, iovb);
-      }
+                card->iovpool.count++;
-      NS_SKB_CB(iovb)->buf_type = BUF_NONE;
+        }
-      skb_queue_tail(&card->iovpool.queue, iovb);
-      card->iovpool.count++;
+        /* Configure NICStAR */
-   }
+        if (card->rct_size == 4096)
+                ns_cfg_rctsize = NS_CFG_RCTSIZE_4096_ENTRIES;
-   /* Configure NICStAR */
+        else                    /* (card->rct_size == 16384) */
-   if (card->rct_size == 4096)
+                ns_cfg_rctsize = NS_CFG_RCTSIZE_16384_ENTRIES;
-      ns_cfg_rctsize = NS_CFG_RCTSIZE_4096_ENTRIES;
-   else /* (card->rct_size == 16384) */
+        card->efbie = 1;
-      ns_cfg_rctsize = NS_CFG_RCTSIZE_16384_ENTRIES;
+        card->intcnt = 0;
-   card->efbie = 1;
+        if (request_irq
+            (pcidev->irq, &ns_irq_handler, IRQF_SHARED, "nicstar", card) != 0) {
-   card->intcnt = 0;
+                printk("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq);
-   if (request_irq(pcidev->irq, &ns_irq_handler, IRQF_DISABLED | IRQF_SHARED, "nicstar", card) != 0)
+                error = 9;
-   {
+                ns_init_card_error(card, error);
-      printk("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq);
+                return error;
-      error = 9;
+        }
-      ns_init_card_error(card, error);
-      return error;
+        /* Register device */
-   }
+        card->atmdev = atm_dev_register("nicstar", &atm_ops, -1, NULL);
+        if (card->atmdev == NULL) {
-   /* Register device */
+                printk("nicstar%d: can't register device.\n", i);
-   card->atmdev = atm_dev_register("nicstar", &atm_ops, -1, NULL);
+                error = 17;
-   if (card->atmdev == NULL)
+                ns_init_card_error(card, error);
-   {
+                return error;
-      printk("nicstar%d: can't register device.\n", i);
+        }
-      error = 17;
-      ns_init_card_error(card, error);
+        if (ns_parse_mac(mac[i], card->atmdev->esi)) {
-      return error;
+                nicstar_read_eprom(card->membase, NICSTAR_EPROM_MAC_ADDR_OFFSET,
-   }
+                                   card->atmdev->esi, 6);
-      
+                if (memcmp(card->atmdev->esi, "\x00\x00\x00\x00\x00\x00", 6) ==
-   if (ns_parse_mac(mac[i], card->atmdev->esi)) {
+                    0) {
-      nicstar_read_eprom(card->membase, NICSTAR_EPROM_MAC_ADDR_OFFSET,
+                        nicstar_read_eprom(card->membase,
-                         card->atmdev->esi, 6);
+                                           NICSTAR_EPROM_MAC_ADDR_OFFSET_ALT,
-      if (memcmp(card->atmdev->esi, "\x00\x00\x00\x00\x00\x00", 6) == 0) {
+                                           card->atmdev->esi, 6);
-         nicstar_read_eprom(card->membase, NICSTAR_EPROM_MAC_ADDR_OFFSET_ALT,
+                }
-                         card->atmdev->esi, 6);
+        }
-      }
-   }
+        printk("nicstar%d: MAC address %pM\n", i, card->atmdev->esi);
-   printk("nicstar%d: MAC address %pM\n", i, card->atmdev->esi);
+        card->atmdev->dev_data = card;
+        card->atmdev->ci_range.vpi_bits = card->vpibits;
-   card->atmdev->dev_data = card;
+        card->atmdev->ci_range.vci_bits = card->vcibits;
-   card->atmdev->ci_range.vpi_bits = card->vpibits;
+        card->atmdev->link_rate = card->max_pcr;
-   card->atmdev->ci_range.vci_bits = card->vcibits;
+        card->atmdev->phy = NULL;
-   card->atmdev->link_rate = card->max_pcr;
-   card->atmdev->phy = NULL;
 #ifdef CONFIG_ATM_NICSTAR_USE_SUNI
-   if (card->max_pcr == ATM_OC3_PCR)
+        if (card->max_pcr == ATM_OC3_PCR)
-      suni_init(card->atmdev);
+                suni_init(card->atmdev);
 #endif /* CONFIG_ATM_NICSTAR_USE_SUNI */
 #ifdef CONFIG_ATM_NICSTAR_USE_IDT77105
-   if (card->max_pcr == ATM_25_PCR)
+        if (card->max_pcr == ATM_25_PCR)
-      idt77105_init(card->atmdev);
+                idt77105_init(card->atmdev);
 #endif /* CONFIG_ATM_NICSTAR_USE_IDT77105 */
-   if (card->atmdev->phy && card->atmdev->phy->start)
+        if (card->atmdev->phy && card->atmdev->phy->start)
-      card->atmdev->phy->start(card->atmdev);
+                card->atmdev->phy->start(card->atmdev);
-   writel(NS_CFG_RXPATH |
-          NS_CFG_SMBUFSIZE |
-          NS_CFG_LGBUFSIZE |
-          NS_CFG_EFBIE |
-          NS_CFG_RSQSIZE |
-          NS_CFG_VPIBITS |
-          ns_cfg_rctsize |
-          NS_CFG_RXINT_NODELAY |
-          NS_CFG_RAWIE |                /* Only enabled if RCQ_SUPPORT */
-          NS_CFG_RSQAFIE |
-          NS_CFG_TXEN |
-          NS_CFG_TXIE |
-          NS_CFG_TSQFIE_OPT |           /* Only enabled if ENABLE_TSQFIE */ 
-          NS_CFG_PHYIE,
-          card->membase + CFG);
-   num_cards++;
-   return error;
-}
+        writel(NS_CFG_RXPATH | NS_CFG_SMBUFSIZE | NS_CFG_LGBUFSIZE | NS_CFG_EFBIE | NS_CFG_RSQSIZE | NS_CFG_VPIBITS | ns_cfg_rctsize | NS_CFG_RXINT_NODELAY | NS_CFG_RAWIE |    /* Only enabled if RCQ_SUPPORT */
+               NS_CFG_RSQAFIE | NS_CFG_TXEN | NS_CFG_TXIE | NS_CFG_TSQFIE_OPT | /* Only enabled if ENABLE_TSQFIE */
+               NS_CFG_PHYIE, card->membase + CFG);
+        num_cards++;
-static void __devinit ns_init_card_error(ns_dev *card, int error)
+        return error;
-{
-   if (error >= 17)
-   {
-      writel(0x00000000, card->membase + CFG);
-   }
-   if (error >= 16)
-   {
-      struct sk_buff *iovb;
-      while ((iovb = skb_dequeue(&card->iovpool.queue)) != NULL)
-         dev_kfree_skb_any(iovb);
-   }
-   if (error >= 15)
-   {
-      struct sk_buff *sb;
-      while ((sb = skb_dequeue(&card->sbpool.queue)) != NULL)
-         dev_kfree_skb_any(sb);
-      free_scq(card->scq0, NULL);
-   }
-   if (error >= 14)
-   {
-      struct sk_buff *lb;
-      while ((lb = skb_dequeue(&card->lbpool.queue)) != NULL)
-         dev_kfree_skb_any(lb);
-   }
-   if (error >= 13)
-   {
-      struct sk_buff *hb;
-      while ((hb = skb_dequeue(&card->hbpool.queue)) != NULL)
-         dev_kfree_skb_any(hb);
-   }
-   if (error >= 12)
-   {
-      kfree(card->rsq.org);
-   }
-   if (error >= 11)
-   {
-      kfree(card->tsq.org);
-   }
-   if (error >= 10)
-   {
-      free_irq(card->pcidev->irq, card);
-   }
-   if (error >= 4)
-   {
-      iounmap(card->membase);
-   }
-   if (error >= 3)
-   {
-      pci_disable_device(card->pcidev);
-      kfree(card);
-   }
 }
+static void __devinit ns_init_card_error(ns_dev * card, int error)
-static scq_info *get_scq(int size, u32 scd)
 {
-   scq_info *scq;
+        if (error >= 17) {
-   int i;
+                writel(0x00000000, card->membase + CFG);
+        }
-   if (size != VBR_SCQSIZE && size != CBR_SCQSIZE)
+        if (error >= 16) {
-      return NULL;
+                struct sk_buff *iovb;
+                while ((iovb = skb_dequeue(&card->iovpool.queue)) != NULL)
-   scq = kmalloc(sizeof(scq_info), GFP_KERNEL);
+                        dev_kfree_skb_any(iovb);
-   if (scq == NULL)
+        }
-      return NULL;
+        if (error >= 15) {
-   scq->org = kmalloc(2 * size, GFP_KERNEL);
+                struct sk_buff *sb;
-   if (scq->org == NULL)
+                while ((sb = skb_dequeue(&card->sbpool.queue)) != NULL)
-   {
+                        dev_kfree_skb_any(sb);
-      kfree(scq);
+                free_scq(card, card->scq0, NULL);
-      return NULL;
+        }
-   }
+        if (error >= 14) {
-   scq->skb = kmalloc(sizeof(struct sk_buff *) *
+                struct sk_buff *lb;
-                                          (size / NS_SCQE_SIZE), GFP_KERNEL);
+                while ((lb = skb_dequeue(&card->lbpool.queue)) != NULL)
-   if (scq->skb == NULL)
+                        dev_kfree_skb_any(lb);
-   {
+        }
-      kfree(scq->org);
+        if (error >= 13) {
-      kfree(scq);
+                struct sk_buff *hb;
-      return NULL;
+                while ((hb = skb_dequeue(&card->hbpool.queue)) != NULL)
-   }
+                        dev_kfree_skb_any(hb);
-   scq->num_entries = size / NS_SCQE_SIZE;
+        }
-   scq->base = (ns_scqe *) ALIGN_ADDRESS(scq->org, size);
+        if (error >= 12) {
-   scq->next = scq->base;
+                kfree(card->rsq.org);
-   scq->last = scq->base + (scq->num_entries - 1);
+        }
-   scq->tail = scq->last;
+        if (error >= 11) {
-   scq->scd = scd;
+                kfree(card->tsq.org);
-   scq->num_entries = size / NS_SCQE_SIZE;
+        }
-   scq->tbd_count = 0;
+        if (error >= 10) {
-   init_waitqueue_head(&scq->scqfull_waitq);
+                free_irq(card->pcidev->irq, card);
-   scq->full = 0;
+        }
-   spin_lock_init(&scq->lock);
+        if (error >= 4) {
+                iounmap(card->membase);
-   for (i = 0; i < scq->num_entries; i++)
+        }
-      scq->skb[i] = NULL;
+        if (error >= 3) {
+                pci_disable_device(card->pcidev);
-   return scq;
+                kfree(card);
+        }
 }
+static scq_info *get_scq(ns_dev *card, int size, u32 scd)
+{
+        scq_info *scq;
+        int i;
+        if (size != VBR_SCQSIZE && size != CBR_SCQSIZE)
+                return NULL;
+        scq = kmalloc(sizeof(scq_info), GFP_KERNEL);
+        if (!scq)
+                return NULL;
+        scq->org = pci_alloc_consistent(card->pcidev, 2 * size, &scq->dma);
+        if (!scq->org) {
+                kfree(scq);
+                return NULL;
+        }
+        scq->skb = kmalloc(sizeof(struct sk_buff *) *
+                           (size / NS_SCQE_SIZE), GFP_KERNEL);
+        if (!scq->skb) {
+                kfree(scq->org);
+                kfree(scq);
+                return NULL;
+        }
+        scq->num_entries = size / NS_SCQE_SIZE;
+        scq->base = PTR_ALIGN(scq->org, size);
+        scq->next = scq->base;
+        scq->last = scq->base + (scq->num_entries - 1);
+        scq->tail = scq->last;
+        scq->scd = scd;
+        scq->num_entries = size / NS_SCQE_SIZE;
+        scq->tbd_count = 0;
+        init_waitqueue_head(&scq->scqfull_waitq);
+        scq->full = 0;
+        spin_lock_init(&scq->lock);
+        for (i = 0; i < scq->num_entries; i++)
+                scq->skb[i] = NULL;
+        return scq;
+}
 /* For variable rate SCQ vcc must be NULL */
-static void free_scq(scq_info *scq, struct atm_vcc *vcc)
+static void free_scq(ns_dev *card, scq_info *scq, struct atm_vcc *vcc)
 {
-   int i;
+        int i;
-   if (scq->num_entries == VBR_SCQ_NUM_ENTRIES)
+        if (scq->num_entries == VBR_SCQ_NUM_ENTRIES)
-      for (i = 0; i < scq->num_entries; i++)
+                for (i = 0; i < scq->num_entries; i++) {
-      {
+                        if (scq->skb[i] != NULL) {
-         if (scq->skb[i] != NULL)
+                                vcc = ATM_SKB(scq->skb[i])->vcc;
-         {
+                                if (vcc->pop != NULL)
-            vcc = ATM_SKB(scq->skb[i])->vcc;
+                                        vcc->pop(vcc, scq->skb[i]);
-            if (vcc->pop != NULL)
+                                else
-               vcc->pop(vcc, scq->skb[i]);
+                                        dev_kfree_skb_any(scq->skb[i]);
-            else
+                        }
-               dev_kfree_skb_any(scq->skb[i]);
+        } else {                /* vcc must be != NULL */
-         }
-      }
+                if (vcc == NULL) {
-   else /* vcc must be != NULL */
+                        printk
-   {
+                            ("nicstar: free_scq() called with vcc == NULL for fixed rate scq.");
-      if (vcc == NULL)
+                        for (i = 0; i < scq->num_entries; i++)
-      {
+                                dev_kfree_skb_any(scq->skb[i]);
-         printk("nicstar: free_scq() called with vcc == NULL for fixed rate scq.");
+                } else
-         for (i = 0; i < scq->num_entries; i++)
+                        for (i = 0; i < scq->num_entries; i++) {
-            dev_kfree_skb_any(scq->skb[i]);
+                                if (scq->skb[i] != NULL) {
-      }
+                                        if (vcc->pop != NULL)
-      else
+                                                vcc->pop(vcc, scq->skb[i]);
-         for (i = 0; i < scq->num_entries; i++)
+                                        else
-         {
+                                                dev_kfree_skb_any(scq->skb[i]);
-            if (scq->skb[i] != NULL)
+                                }
-            {
+                        }
-               if (vcc->pop != NULL)
+        }
-                  vcc->pop(vcc, scq->skb[i]);
+        kfree(scq->skb);
-               else
+        pci_free_consistent(card->pcidev,
-                  dev_kfree_skb_any(scq->skb[i]);
+                            2 * (scq->num_entries == VBR_SCQ_NUM_ENTRIES ?
-            }
+                                 VBR_SCQSIZE : CBR_SCQSIZE),
-         }
+                            scq->org, scq->dma);
-   }
+        kfree(scq);
-   kfree(scq->skb);
-   kfree(scq->org);
-   kfree(scq);
 }
 /* The handles passed must be pointers to the sk_buff containing the small
   or large buffer(s) cast to u32. */
-static void push_rxbufs(ns_dev *card, struct sk_buff *skb)
+static void push_rxbufs(ns_dev * card, struct sk_buff *skb)
 {
-   struct ns_skb_cb *cb = NS_SKB_CB(skb);
+        struct sk_buff *handle1, *handle2;
-   u32 handle1, addr1;
+        u32 id1 = 0, id2 = 0;
-   u32 handle2, addr2;
+        u32 addr1, addr2;
-   u32 stat;
+        u32 stat;
-   unsigned long flags;
+        unsigned long flags;
-   
+        int err;
-   /* *BARF* */
-   handle2 = addr2 = 0;
+        /* *BARF* */
-   handle1 = (u32)skb;
+        handle2 = NULL;
-   addr1 = (u32)virt_to_bus(skb->data);
+        addr2 = 0;
+        handle1 = skb;
+        addr1 = pci_map_single(card->pcidev,
+                               skb->data,
+                               (NS_PRV_BUFTYPE(skb) == BUF_SM
+                                ? NS_SMSKBSIZE : NS_LGSKBSIZE),
+                               PCI_DMA_TODEVICE);
+        NS_PRV_DMA(skb) = addr1; /* save so we can unmap later */
 #ifdef GENERAL_DEBUG
-   if (!addr1)
+        if (!addr1)
-      printk("nicstar%d: push_rxbufs called with addr1 = 0.\n", card->index);
+                printk("nicstar%d: push_rxbufs called with addr1 = 0.\n",
+                       card->index);
 #endif /* GENERAL_DEBUG */
-   stat = readl(card->membase + STAT);
+        stat = readl(card->membase + STAT);
-   card->sbfqc = ns_stat_sfbqc_get(stat);
+        card->sbfqc = ns_stat_sfbqc_get(stat);
-   card->lbfqc = ns_stat_lfbqc_get(stat);
+        card->lbfqc = ns_stat_lfbqc_get(stat);
-   if (cb->buf_type == BUF_SM)
+        if (NS_PRV_BUFTYPE(skb) == BUF_SM) {
-   {
+                if (!addr2) {
-      if (!addr2)
+                        if (card->sm_addr) {
-      {
+                                addr2 = card->sm_addr;
-         if (card->sm_addr)
+                                handle2 = card->sm_handle;
-         {
+                                card->sm_addr = 0x00000000;
-            addr2 = card->sm_addr;
+                                card->sm_handle = 0x00000000;
-            handle2 = card->sm_handle;
+                        } else {        /* (!sm_addr) */
-            card->sm_addr = 0x00000000;
-            card->sm_handle = 0x00000000;
+                                card->sm_addr = addr1;
-         }
+                                card->sm_handle = handle1;
-         else /* (!sm_addr) */
+                        }
-         {
+                }
-            card->sm_addr = addr1;
+        } else {                /* buf_type == BUF_LG */
-            card->sm_handle = handle1;
-         }
+                if (!addr2) {
-      }      
+                        if (card->lg_addr) {
-   }
+                                addr2 = card->lg_addr;
-   else /* buf_type == BUF_LG */
+                                handle2 = card->lg_handle;
-   {
+                                card->lg_addr = 0x00000000;
-      if (!addr2)
+                                card->lg_handle = 0x00000000;
-      {
+                        } else {        /* (!lg_addr) */
-         if (card->lg_addr)
-         {
+                                card->lg_addr = addr1;
-            addr2 = card->lg_addr;
+                                card->lg_handle = handle1;
-            handle2 = card->lg_handle;
+                        }
-            card->lg_addr = 0x00000000;
+                }
-            card->lg_handle = 0x00000000;
+        }
-         }
-         else /* (!lg_addr) */
+        if (addr2) {
-         {
+                if (NS_PRV_BUFTYPE(skb) == BUF_SM) {
-            card->lg_addr = addr1;
+                        if (card->sbfqc >= card->sbnr.max) {
-            card->lg_handle = handle1;
+                                skb_unlink(handle1, &card->sbpool.queue);
-         }
+                                dev_kfree_skb_any(handle1);
-      }      
+                                skb_unlink(handle2, &card->sbpool.queue);
-   }
+                                dev_kfree_skb_any(handle2);
+                                return;
-   if (addr2)
+                        } else
-   {
+                                card->sbfqc += 2;
-      if (cb->buf_type == BUF_SM)
+                } else {        /* (buf_type == BUF_LG) */
-      {
-         if (card->sbfqc >= card->sbnr.max)
+                        if (card->lbfqc >= card->lbnr.max) {
-         {
+                                skb_unlink(handle1, &card->lbpool.queue);
-            skb_unlink((struct sk_buff *) handle1, &card->sbpool.queue);
+                                dev_kfree_skb_any(handle1);
-            dev_kfree_skb_any((struct sk_buff *) handle1);
+                                skb_unlink(handle2, &card->lbpool.queue);
-            skb_unlink((struct sk_buff *) handle2, &card->sbpool.queue);
+                                dev_kfree_skb_any(handle2);
-            dev_kfree_skb_any((struct sk_buff *) handle2);
+                                return;
-            return;
+                        } else
-         }
+                                card->lbfqc += 2;
-         else
+                }
-            card->sbfqc += 2;
-      }
+                do {
-      else /* (buf_type == BUF_LG) */
+                        if (!idr_pre_get(&card->idr, GFP_ATOMIC)) {
-      {
+                                printk(KERN_ERR
-         if (card->lbfqc >= card->lbnr.max)
+                                       "nicstar%d: no free memory for idr\n",
-         {
+                                       card->index);
-            skb_unlink((struct sk_buff *) handle1, &card->lbpool.queue);
+                                goto out;
-            dev_kfree_skb_any((struct sk_buff *) handle1);
+                        }
-            skb_unlink((struct sk_buff *) handle2, &card->lbpool.queue);
-            dev_kfree_skb_any((struct sk_buff *) handle2);
+                        if (!id1)
-            return;
+                                err = idr_get_new_above(&card->idr, handle1, 0, &id1);
-         }
-         else
+                        if (!id2 && err == 0)
-            card->lbfqc += 2;
+                                err = idr_get_new_above(&card->idr, handle2, 0, &id2);
-      }
+                } while (err == -EAGAIN);
-      spin_lock_irqsave(&card->res_lock, flags);
+                if (err)
-      while (CMD_BUSY(card));
+                        goto out;
-      writel(addr2, card->membase + DR3);
-      writel(handle2, card->membase + DR2);
+                spin_lock_irqsave(&card->res_lock, flags);
-      writel(addr1, card->membase + DR1);
+                while (CMD_BUSY(card)) ;
-      writel(handle1, card->membase + DR0);
+                writel(addr2, card->membase + DR3);
-      writel(NS_CMD_WRITE_FREEBUFQ | cb->buf_type, card->membase + CMD);
+                writel(id2, card->membase + DR2);
- 
+                writel(addr1, card->membase + DR1);
-      spin_unlock_irqrestore(&card->res_lock, flags);
+                writel(id1, card->membase + DR0);
+                writel(NS_CMD_WRITE_FREEBUFQ | NS_PRV_BUFTYPE(skb),
-      XPRINTK("nicstar%d: Pushing %s buffers at 0x%x and 0x%x.\n", card->index,
+                       card->membase + CMD);
-              (cb->buf_type == BUF_SM ? "small" : "large"), addr1, addr2);
+                spin_unlock_irqrestore(&card->res_lock, flags);
-   }
+                XPRINTK("nicstar%d: Pushing %s buffers at 0x%x and 0x%x.\n",
-   if (!card->efbie && card->sbfqc >= card->sbnr.min &&
+                        card->index,
-       card->lbfqc >= card->lbnr.min)
+                        (NS_PRV_BUFTYPE(skb) == BUF_SM ? "small" : "large"),
-   {
+                        addr1, addr2);
-      card->efbie = 1;
+        }
-      writel((readl(card->membase + CFG) | NS_CFG_EFBIE), card->membase + CFG);
-   }
+        if (!card->efbie && card->sbfqc >= card->sbnr.min &&
+            card->lbfqc >= card->lbnr.min) {
-   return;
+                card->efbie = 1;
+                writel((readl(card->membase + CFG) | NS_CFG_EFBIE),
+                       card->membase + CFG);
+        }
+out:
+        return;
 }
 static irqreturn_t ns_irq_handler(int irq, void *dev_id)
 {
-   u32 stat_r;
+        u32 stat_r;
-   ns_dev *card;
+        ns_dev *card;
-   struct atm_dev *dev;
+        struct atm_dev *dev;
-   unsigned long flags;
+        unsigned long flags;
-   card = (ns_dev *) dev_id;
+        card = (ns_dev *) dev_id;
-   dev = card->atmdev;
+        dev = card->atmdev;
-   card->intcnt++;
+        card->intcnt++;
-   PRINTK("nicstar%d: NICStAR generated an interrupt\n", card->index);
+        PRINTK("nicstar%d: NICStAR generated an interrupt\n", card->index);
-   spin_lock_irqsave(&card->int_lock, flags);
+        spin_lock_irqsave(&card->int_lock, flags);
-   
-   stat_r = readl(card->membase + STAT);
+        stat_r = readl(card->membase + STAT);
-   /* Transmit Status Indicator has been written to T. S. Queue */
+        /* Transmit Status Indicator has been written to T. S. Queue */
-   if (stat_r & NS_STAT_TSIF)
+        if (stat_r & NS_STAT_TSIF) {
-   {
+                TXPRINTK("nicstar%d: TSI interrupt\n", card->index);
-      TXPRINTK("nicstar%d: TSI interrupt\n", card->index);
+                process_tsq(card);
-      process_tsq(card);
+                writel(NS_STAT_TSIF, card->membase + STAT);
-      writel(NS_STAT_TSIF, card->membase + STAT);
+        }
-   }
-   
+        /* Incomplete CS-PDU has been transmitted */
-   /* Incomplete CS-PDU has been transmitted */
+        if (stat_r & NS_STAT_TXICP) {
-   if (stat_r & NS_STAT_TXICP)
+                writel(NS_STAT_TXICP, card->membase + STAT);
-   {
+                TXPRINTK("nicstar%d: Incomplete CS-PDU transmitted.\n",
-      writel(NS_STAT_TXICP, card->membase + STAT);
+                         card->index);
-      TXPRINTK("nicstar%d: Incomplete CS-PDU transmitted.\n",
+        }
-               card->index);
-   }
+        /* Transmit Status Queue 7/8 full */
-   
+        if (stat_r & NS_STAT_TSQF) {
-   /* Transmit Status Queue 7/8 full */
+                writel(NS_STAT_TSQF, card->membase + STAT);
-   if (stat_r & NS_STAT_TSQF)
+                PRINTK("nicstar%d: TSQ full.\n", card->index);
-   {
+                process_tsq(card);
-      writel(NS_STAT_TSQF, card->membase + STAT);
+        }
-      PRINTK("nicstar%d: TSQ full.\n", card->index);
-      process_tsq(card);
+        /* Timer overflow */
-   }
+        if (stat_r & NS_STAT_TMROF) {
-   
+                writel(NS_STAT_TMROF, card->membase + STAT);
-   /* Timer overflow */
+                PRINTK("nicstar%d: Timer overflow.\n", card->index);
-   if (stat_r & NS_STAT_TMROF)
+        }
-   {
-      writel(NS_STAT_TMROF, card->membase + STAT);
+        /* PHY device interrupt signal active */
-      PRINTK("nicstar%d: Timer overflow.\n", card->index);
+        if (stat_r & NS_STAT_PHYI) {
-   }
+                writel(NS_STAT_PHYI, card->membase + STAT);
-   
+                PRINTK("nicstar%d: PHY interrupt.\n", card->index);
-   /* PHY device interrupt signal active */
+                if (dev->phy && dev->phy->interrupt) {
-   if (stat_r & NS_STAT_PHYI)
+                        dev->phy->interrupt(dev);
-   {
+                }
-      writel(NS_STAT_PHYI, card->membase + STAT);
+        }
-      PRINTK("nicstar%d: PHY interrupt.\n", card->index);
-      if (dev->phy && dev->phy->interrupt) {
+        /* Small Buffer Queue is full */
-         dev->phy->interrupt(dev);
+        if (stat_r & NS_STAT_SFBQF) {
-      }
+                writel(NS_STAT_SFBQF, card->membase + STAT);
-   }
+                printk("nicstar%d: Small free buffer queue is full.\n",
+                       card->index);
-   /* Small Buffer Queue is full */
+        }
-   if (stat_r & NS_STAT_SFBQF)
-   {
+        /* Large Buffer Queue is full */
-      writel(NS_STAT_SFBQF, card->membase + STAT);
+        if (stat_r & NS_STAT_LFBQF) {
-      printk("nicstar%d: Small free buffer queue is full.\n", card->index);
+                writel(NS_STAT_LFBQF, card->membase + STAT);
-   }
+                printk("nicstar%d: Large free buffer queue is full.\n",
-   
+                       card->index);
-   /* Large Buffer Queue is full */
+        }
-   if (stat_r & NS_STAT_LFBQF)
-   {
+        /* Receive Status Queue is full */
-      writel(NS_STAT_LFBQF, card->membase + STAT);
+        if (stat_r & NS_STAT_RSQF) {
-      printk("nicstar%d: Large free buffer queue is full.\n", card->index);
+                writel(NS_STAT_RSQF, card->membase + STAT);
-   }
+                printk("nicstar%d: RSQ full.\n", card->index);
+                process_rsq(card);
-   /* Receive Status Queue is full */
+        }
-   if (stat_r & NS_STAT_RSQF)
-   {
+        /* Complete CS-PDU received */
-      writel(NS_STAT_RSQF, card->membase + STAT);
+        if (stat_r & NS_STAT_EOPDU) {
-      printk("nicstar%d: RSQ full.\n", card->index);
+                RXPRINTK("nicstar%d: End of CS-PDU received.\n", card->index);
-      process_rsq(card);
+                process_rsq(card);
-   }
+                writel(NS_STAT_EOPDU, card->membase + STAT);
+        }
-   /* Complete CS-PDU received */
-   if (stat_r & NS_STAT_EOPDU)
+        /* Raw cell received */
-   {
+        if (stat_r & NS_STAT_RAWCF) {
-      RXPRINTK("nicstar%d: End of CS-PDU received.\n", card->index);
+                writel(NS_STAT_RAWCF, card->membase + STAT);
-      process_rsq(card);
-      writel(NS_STAT_EOPDU, card->membase + STAT);
-   }
-   /* Raw cell received */
-   if (stat_r & NS_STAT_RAWCF)
-   {
-      writel(NS_STAT_RAWCF, card->membase + STAT);
 #ifndef RCQ_SUPPORT
-      printk("nicstar%d: Raw cell received and no support yet...\n",
+                printk("nicstar%d: Raw cell received and no support yet...\n",
-             card->index);
+                       card->index);
 #endif /* RCQ_SUPPORT */
-      /* NOTE: the following procedure may keep a raw cell pending until the
+                /* NOTE: the following procedure may keep a raw cell pending until the
-               next interrupt. As this preliminary support is only meant to
+                   next interrupt. As this preliminary support is only meant to
-               avoid buffer leakage, this is not an issue. */
+                   avoid buffer leakage, this is not an issue. */
-      while (readl(card->membase + RAWCT) != card->rawch)
+                while (readl(card->membase + RAWCT) != card->rawch) {
-      {
-         ns_rcqe *rawcell;
+                        if (ns_rcqe_islast(card->rawcell)) {
+                                struct sk_buff *oldbuf;
-         rawcell = (ns_rcqe *) bus_to_virt(card->rawch);
-         if (ns_rcqe_islast(rawcell))
+                                oldbuf = card->rcbuf;
-         {
+                                card->rcbuf = idr_find(&card->idr,
-            struct sk_buff *oldbuf;
+                                                       ns_rcqe_nextbufhandle(card->rawcell));
+                                card->rawch = NS_PRV_DMA(card->rcbuf);
-            oldbuf = card->rcbuf;
+                                card->rawcell = (struct ns_rcqe *)
-            card->rcbuf = (struct sk_buff *) ns_rcqe_nextbufhandle(rawcell);
+                                                card->rcbuf->data;
-            card->rawch = (u32) virt_to_bus(card->rcbuf->data);
+                                recycle_rx_buf(card, oldbuf);
-            recycle_rx_buf(card, oldbuf);
+                        } else {
-         }
+                                card->rawch += NS_RCQE_SIZE;
-         else
+                                card->rawcell++;
-            card->rawch += NS_RCQE_SIZE;
+                        }
-      }
+                }
-   }
+        }
-   /* Small buffer queue is empty */
+        /* Small buffer queue is empty */
-   if (stat_r & NS_STAT_SFBQE)
+        if (stat_r & NS_STAT_SFBQE) {
-   {
+                int i;
-      int i;
+                struct sk_buff *sb;
-      struct sk_buff *sb;
+                writel(NS_STAT_SFBQE, card->membase + STAT);
-      writel(NS_STAT_SFBQE, card->membase + STAT);
+                printk("nicstar%d: Small free buffer queue empty.\n",
-      printk("nicstar%d: Small free buffer queue empty.\n",
+                       card->index);
-             card->index);
+                for (i = 0; i < card->sbnr.min; i++) {
-      for (i = 0; i < card->sbnr.min; i++)
+                        sb = dev_alloc_skb(NS_SMSKBSIZE);
-      {
+                        if (sb == NULL) {
-         sb = dev_alloc_skb(NS_SMSKBSIZE);
+                                writel(readl(card->membase + CFG) &
-         if (sb == NULL)
+                                       ~NS_CFG_EFBIE, card->membase + CFG);
-         {
+                                card->efbie = 0;
-            writel(readl(card->membase + CFG) & ~NS_CFG_EFBIE, card->membase + CFG);
+                                break;
-            card->efbie = 0;
+                        }
-            break;
+                        NS_PRV_BUFTYPE(sb) = BUF_SM;
-         }
+                        skb_queue_tail(&card->sbpool.queue, sb);
-         NS_SKB_CB(sb)->buf_type = BUF_SM;
+                        skb_reserve(sb, NS_AAL0_HEADER);
-         skb_queue_tail(&card->sbpool.queue, sb);
+                        push_rxbufs(card, sb);
-         skb_reserve(sb, NS_AAL0_HEADER);
+                }
-         push_rxbufs(card, sb);
+                card->sbfqc = i;
-      }
+                process_rsq(card);
-      card->sbfqc = i;
+        }
-      process_rsq(card);
-   }
+        /* Large buffer queue empty */
+        if (stat_r & NS_STAT_LFBQE) {
-   /* Large buffer queue empty */
+                int i;
-   if (stat_r & NS_STAT_LFBQE)
+                struct sk_buff *lb;
-   {
-      int i;
+                writel(NS_STAT_LFBQE, card->membase + STAT);
-      struct sk_buff *lb;
+                printk("nicstar%d: Large free buffer queue empty.\n",
+                       card->index);
-      writel(NS_STAT_LFBQE, card->membase + STAT);
+                for (i = 0; i < card->lbnr.min; i++) {
-      printk("nicstar%d: Large free buffer queue empty.\n",
+                        lb = dev_alloc_skb(NS_LGSKBSIZE);
-             card->index);
+                        if (lb == NULL) {
-      for (i = 0; i < card->lbnr.min; i++)
+                                writel(readl(card->membase + CFG) &
-      {
+                                       ~NS_CFG_EFBIE, card->membase + CFG);
-         lb = dev_alloc_skb(NS_LGSKBSIZE);
+                                card->efbie = 0;
-         if (lb == NULL)
+                                break;
-         {
+                        }
-            writel(readl(card->membase + CFG) & ~NS_CFG_EFBIE, card->membase + CFG);
+                        NS_PRV_BUFTYPE(lb) = BUF_LG;
-            card->efbie = 0;
+                        skb_queue_tail(&card->lbpool.queue, lb);
-            break;
+                        skb_reserve(lb, NS_SMBUFSIZE);
-         }
+                        push_rxbufs(card, lb);
-         NS_SKB_CB(lb)->buf_type = BUF_LG;
+                }
-         skb_queue_tail(&card->lbpool.queue, lb);
+                card->lbfqc = i;
-         skb_reserve(lb, NS_SMBUFSIZE);
+                process_rsq(card);
-         push_rxbufs(card, lb);
+        }
-      }
-      card->lbfqc = i;
+        /* Receive Status Queue is 7/8 full */
-      process_rsq(card);
+        if (stat_r & NS_STAT_RSQAF) {
-   }
+                writel(NS_STAT_RSQAF, card->membase + STAT);
+                RXPRINTK("nicstar%d: RSQ almost full.\n", card->index);
-   /* Receive Status Queue is 7/8 full */
+                process_rsq(card);
-   if (stat_r & NS_STAT_RSQAF)
+        }
-   {
-      writel(NS_STAT_RSQAF, card->membase + STAT);
+        spin_unlock_irqrestore(&card->int_lock, flags);
-      RXPRINTK("nicstar%d: RSQ almost full.\n", card->index);
+        PRINTK("nicstar%d: end of interrupt service\n", card->index);
-      process_rsq(card);
+        return IRQ_HANDLED;
-   }
-   
-   spin_unlock_irqrestore(&card->int_lock, flags);
-   PRINTK("nicstar%d: end of interrupt service\n", card->index);
-   return IRQ_HANDLED;
 }
 static int ns_open(struct atm_vcc *vcc)
 {
-   ns_dev *card;
+        ns_dev *card;
-   vc_map *vc;
+        vc_map *vc;
-   unsigned long tmpl, modl;
+        unsigned long tmpl, modl;
-   int tcr, tcra;       /* target cell rate, and absolute value */
+        int tcr, tcra;          /* target cell rate, and absolute value */
-   int n = 0;           /* Number of entries in the TST. Initialized to remove
+        int n = 0;              /* Number of entries in the TST. Initialized to remove
-                           the compiler warning. */
+                                   the compiler warning. */
-   u32 u32d[4];
+        u32 u32d[4];
-   int frscdi = 0;      /* Index of the SCD. Initialized to remove the compiler
+        int frscdi = 0;         /* Index of the SCD. Initialized to remove the compiler
-                           warning. How I wish compilers were clever enough to
+                                   warning. How I wish compilers were clever enough to
-                           tell which variables can truly be used
+                                   tell which variables can truly be used
-                           uninitialized... */
+                                   uninitialized... */
-   int inuse;           /* tx or rx vc already in use by another vcc */
+        int inuse;              /* tx or rx vc already in use by another vcc */
-   short vpi = vcc->vpi;
+        short vpi = vcc->vpi;
-   int vci = vcc->vci;
+        int vci = vcc->vci;
-   card = (ns_dev *) vcc->dev->dev_data;
+        card = (ns_dev *) vcc->dev->dev_data;
-   PRINTK("nicstar%d: opening vpi.vci %d.%d \n", card->index, (int) vpi, vci);
+        PRINTK("nicstar%d: opening vpi.vci %d.%d \n", card->index, (int)vpi,
-   if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0)
+               vci);
-   {
+        if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
-      PRINTK("nicstar%d: unsupported AAL.\n", card->index);
+                PRINTK("nicstar%d: unsupported AAL.\n", card->index);
-      return -EINVAL;
+                return -EINVAL;
-   }
+        }
-   vc = &(card->vcmap[vpi << card->vcibits | vci]);
+        vc = &(card->vcmap[vpi << card->vcibits | vci]);
-   vcc->dev_data = vc;
+        vcc->dev_data = vc;
-   inuse = 0;
+        inuse = 0;
-   if (vcc->qos.txtp.traffic_class != ATM_NONE && vc->tx)
+        if (vcc->qos.txtp.traffic_class != ATM_NONE && vc->tx)
-      inuse = 1;
+                inuse = 1;
-   if (vcc->qos.rxtp.traffic_class != ATM_NONE && vc->rx)
+        if (vcc->qos.rxtp.traffic_class != ATM_NONE && vc->rx)
-      inuse += 2;
+                inuse += 2;
-   if (inuse)
+        if (inuse) {
-   {
+                printk("nicstar%d: %s vci already in use.\n", card->index,
-      printk("nicstar%d: %s vci already in use.\n", card->index,
+                       inuse == 1 ? "tx" : inuse == 2 ? "rx" : "tx and rx");
-             inuse == 1 ? "tx" : inuse == 2 ? "rx" : "tx and rx");
+                return -EINVAL;
-      return -EINVAL;
+        }
-   }
+        set_bit(ATM_VF_ADDR, &vcc->flags);
-   set_bit(ATM_VF_ADDR,&vcc->flags);
+        /* NOTE: You are not allowed to modify an open connection's QOS. To change
-   /* NOTE: You are not allowed to modify an open connection's QOS. To change
+           that, remove the ATM_VF_PARTIAL flag checking. There may be other changes
-      that, remove the ATM_VF_PARTIAL flag checking. There may be other changes
+           needed to do that. */
-      needed to do that. */
+        if (!test_bit(ATM_VF_PARTIAL, &vcc->flags)) {
-   if (!test_bit(ATM_VF_PARTIAL,&vcc->flags))
+                scq_info *scq;
-   {
-      scq_info *scq;
+                set_bit(ATM_VF_PARTIAL, &vcc->flags);
-      
+                if (vcc->qos.txtp.traffic_class == ATM_CBR) {
-      set_bit(ATM_VF_PARTIAL,&vcc->flags);
+                        /* Check requested cell rate and availability of SCD */
-      if (vcc->qos.txtp.traffic_class == ATM_CBR)
+                        if (vcc->qos.txtp.max_pcr == 0 && vcc->qos.txtp.pcr == 0
-      {
+                            && vcc->qos.txtp.min_pcr == 0) {
-         /* Check requested cell rate and availability of SCD */
+                                PRINTK
-         if (vcc->qos.txtp.max_pcr == 0 && vcc->qos.txtp.pcr == 0 &&
+                                    ("nicstar%d: trying to open a CBR vc with cell rate = 0 \n",
-             vcc->qos.txtp.min_pcr == 0)
+                                     card->index);
-         {
+                                clear_bit(ATM_VF_PARTIAL, &vcc->flags);
-            PRINTK("nicstar%d: trying to open a CBR vc with cell rate = 0 \n",
+                                clear_bit(ATM_VF_ADDR, &vcc->flags);
-                   card->index);
+                                return -EINVAL;
-            clear_bit(ATM_VF_PARTIAL,&vcc->flags);
+                        }
-            clear_bit(ATM_VF_ADDR,&vcc->flags);
-            return -EINVAL;
+                        tcr = atm_pcr_goal(&(vcc->qos.txtp));
-         }
+                        tcra = tcr >= 0 ? tcr : -tcr;
-         tcr = atm_pcr_goal(&(vcc->qos.txtp));
+                        PRINTK("nicstar%d: target cell rate = %d.\n",
-         tcra = tcr >= 0 ? tcr : -tcr;
+                               card->index, vcc->qos.txtp.max_pcr);
-      
-         PRINTK("nicstar%d: target cell rate = %d.\n", card->index,
+                        tmpl =
-                vcc->qos.txtp.max_pcr);
+                            (unsigned long)tcra *(unsigned long)
+                            NS_TST_NUM_ENTRIES;
-         tmpl = (unsigned long)tcra * (unsigned long)NS_TST_NUM_ENTRIES;
+                        modl = tmpl % card->max_pcr;
-         modl = tmpl % card->max_pcr;
+                        n = (int)(tmpl / card->max_pcr);
-         n = (int)(tmpl / card->max_pcr);
+                        if (tcr > 0) {
-         if (tcr > 0)
+                                if (modl > 0)
-         {
+                                        n++;
-            if (modl > 0) n++;
+                        } else if (tcr == 0) {
-         }
+                                if ((n =
-         else if (tcr == 0)
+                                     (card->tst_free_entries -
-         {
+                                      NS_TST_RESERVED)) <= 0) {
-            if ((n = (card->tst_free_entries - NS_TST_RESERVED)) <= 0)
+                                        PRINTK
-            {
+                                            ("nicstar%d: no CBR bandwidth free.\n",
-               PRINTK("nicstar%d: no CBR bandwidth free.\n", card->index);
+                                             card->index);
-               clear_bit(ATM_VF_PARTIAL,&vcc->flags);
+                                        clear_bit(ATM_VF_PARTIAL, &vcc->flags);
-               clear_bit(ATM_VF_ADDR,&vcc->flags);
+                                        clear_bit(ATM_VF_ADDR, &vcc->flags);
-               return -EINVAL;
+                                        return -EINVAL;
-            }
+                                }
-         }
+                        }
-         if (n == 0)
+                        if (n == 0) {
-         {
+                                printk
-            printk("nicstar%d: selected bandwidth < granularity.\n", card->index);
+                                    ("nicstar%d: selected bandwidth < granularity.\n",
-            clear_bit(ATM_VF_PARTIAL,&vcc->flags);
+                                     card->index);
-            clear_bit(ATM_VF_ADDR,&vcc->flags);
+                                clear_bit(ATM_VF_PARTIAL, &vcc->flags);
-            return -EINVAL;
+                                clear_bit(ATM_VF_ADDR, &vcc->flags);
-         }
+                                return -EINVAL;
+                        }
-         if (n > (card->tst_free_entries - NS_TST_RESERVED))
-         {
+                        if (n > (card->tst_free_entries - NS_TST_RESERVED)) {
-            PRINTK("nicstar%d: not enough free CBR bandwidth.\n", card->index);
+                                PRINTK
-            clear_bit(ATM_VF_PARTIAL,&vcc->flags);
+                                    ("nicstar%d: not enough free CBR bandwidth.\n",
-            clear_bit(ATM_VF_ADDR,&vcc->flags);
+                                     card->index);
-            return -EINVAL;
+                                clear_bit(ATM_VF_PARTIAL, &vcc->flags);
-         }
+                                clear_bit(ATM_VF_ADDR, &vcc->flags);
-         else
+                                return -EINVAL;
-            card->tst_free_entries -= n;
+                        } else
+                                card->tst_free_entries -= n;
-         XPRINTK("nicstar%d: writing %d tst entries.\n", card->index, n);
-         for (frscdi = 0; frscdi < NS_FRSCD_NUM; frscdi++)
+                        XPRINTK("nicstar%d: writing %d tst entries.\n",
-         {
+                                card->index, n);
-            if (card->scd2vc[frscdi] == NULL)
+                        for (frscdi = 0; frscdi < NS_FRSCD_NUM; frscdi++) {
-            {
+                                if (card->scd2vc[frscdi] == NULL) {
-               card->scd2vc[frscdi] = vc;
+                                        card->scd2vc[frscdi] = vc;
-               break;
+                                        break;
-            }
+                                }
-         }
+                        }
-         if (frscdi == NS_FRSCD_NUM)
+                        if (frscdi == NS_FRSCD_NUM) {
-         {
+                                PRINTK
-            PRINTK("nicstar%d: no SCD available for CBR channel.\n", card->index);
+                                    ("nicstar%d: no SCD available for CBR channel.\n",
-            card->tst_free_entries += n;
+                                     card->index);
-            clear_bit(ATM_VF_PARTIAL,&vcc->flags);
+                                card->tst_free_entries += n;
-            clear_bit(ATM_VF_ADDR,&vcc->flags);
+                                clear_bit(ATM_VF_PARTIAL, &vcc->flags);
-            return -EBUSY;
+                                clear_bit(ATM_VF_ADDR, &vcc->flags);
-         }
+                                return -EBUSY;
+                        }
-         vc->cbr_scd = NS_FRSCD + frscdi * NS_FRSCD_SIZE;
+                        vc->cbr_scd = NS_FRSCD + frscdi * NS_FRSCD_SIZE;
-         scq = get_scq(CBR_SCQSIZE, vc->cbr_scd);
-         if (scq == NULL)
+                        scq = get_scq(card, CBR_SCQSIZE, vc->cbr_scd);
-         {
+                        if (scq == NULL) {
-            PRINTK("nicstar%d: can't get fixed rate SCQ.\n", card->index);
+                                PRINTK("nicstar%d: can't get fixed rate SCQ.\n",
-            card->scd2vc[frscdi] = NULL;
+                                       card->index);
-            card->tst_free_entries += n;
+                                card->scd2vc[frscdi] = NULL;
-            clear_bit(ATM_VF_PARTIAL,&vcc->flags);
+                                card->tst_free_entries += n;
-            clear_bit(ATM_VF_ADDR,&vcc->flags);
+                                clear_bit(ATM_VF_PARTIAL, &vcc->flags);
-            return -ENOMEM;
+                                clear_bit(ATM_VF_ADDR, &vcc->flags);
-         }
+                                return -ENOMEM;
-         vc->scq = scq;
+                        }
-         u32d[0] = (u32) virt_to_bus(scq->base);
+                        vc->scq = scq;
-         u32d[1] = (u32) 0x00000000;
+                        u32d[0] = scq_virt_to_bus(scq, scq->base);
-         u32d[2] = (u32) 0xffffffff;
+                        u32d[1] = (u32) 0x00000000;
-         u32d[3] = (u32) 0x00000000;
+                        u32d[2] = (u32) 0xffffffff;
-         ns_write_sram(card, vc->cbr_scd, u32d, 4);
+                        u32d[3] = (u32) 0x00000000;
-         
+                        ns_write_sram(card, vc->cbr_scd, u32d, 4);
-         fill_tst(card, n, vc);
-      }
+                        fill_tst(card, n, vc);
-      else if (vcc->qos.txtp.traffic_class == ATM_UBR)
+                } else if (vcc->qos.txtp.traffic_class == ATM_UBR) {
-      {
+                        vc->cbr_scd = 0x00000000;
-         vc->cbr_scd = 0x00000000;
+                        vc->scq = card->scq0;
-         vc->scq = card->scq0;
+                }
-      }
-      
+                if (vcc->qos.txtp.traffic_class != ATM_NONE) {
-      if (vcc->qos.txtp.traffic_class != ATM_NONE)
+                        vc->tx = 1;
-      {
+                        vc->tx_vcc = vcc;
-         vc->tx = 1;
+                        vc->tbd_count = 0;
-         vc->tx_vcc = vcc;
+                }
-         vc->tbd_count = 0;
+                if (vcc->qos.rxtp.traffic_class != ATM_NONE) {
-      }
+                        u32 status;
-      if (vcc->qos.rxtp.traffic_class != ATM_NONE)
-      {
+                        vc->rx = 1;
-         u32 status;
+                        vc->rx_vcc = vcc;
-      
+                        vc->rx_iov = NULL;
-         vc->rx = 1;
-         vc->rx_vcc = vcc;
+                        /* Open the connection in hardware */
-         vc->rx_iov = NULL;
+                        if (vcc->qos.aal == ATM_AAL5)
+                                status = NS_RCTE_AAL5 | NS_RCTE_CONNECTOPEN;
-         /* Open the connection in hardware */
+                        else    /* vcc->qos.aal == ATM_AAL0 */
-         if (vcc->qos.aal == ATM_AAL5)
+                                status = NS_RCTE_AAL0 | NS_RCTE_CONNECTOPEN;
-            status = NS_RCTE_AAL5 | NS_RCTE_CONNECTOPEN;
-         else /* vcc->qos.aal == ATM_AAL0 */
-            status = NS_RCTE_AAL0 | NS_RCTE_CONNECTOPEN;
 #ifdef RCQ_SUPPORT
-         status |= NS_RCTE_RAWCELLINTEN;
+                        status |= NS_RCTE_RAWCELLINTEN;
 #endif /* RCQ_SUPPORT */
-         ns_write_sram(card, NS_RCT + (vpi << card->vcibits | vci) *
+                        ns_write_sram(card,
-                       NS_RCT_ENTRY_SIZE, &status, 1);
+                                      NS_RCT +
-      }
+                                      (vpi << card->vcibits | vci) *
-      
+                                      NS_RCT_ENTRY_SIZE, &status, 1);
-   }
+                }
-   
-   set_bit(ATM_VF_READY,&vcc->flags);
-   return 0;
-}
+        }
+        set_bit(ATM_VF_READY, &vcc->flags);
+        return 0;
+}
 static void ns_close(struct atm_vcc *vcc)
 {
-   vc_map *vc;
+        vc_map *vc;
-   ns_dev *card;
+        ns_dev *card;
-   u32 data;
+        u32 data;
-   int i;
+        int i;
-   
-   vc = vcc->dev_data;
+        vc = vcc->dev_data;
-   card = vcc->dev->dev_data;
+        card = vcc->dev->dev_data;
-   PRINTK("nicstar%d: closing vpi.vci %d.%d \n", card->index,
+        PRINTK("nicstar%d: closing vpi.vci %d.%d \n", card->index,
-          (int) vcc->vpi, vcc->vci);
+               (int)vcc->vpi, vcc->vci);
-   clear_bit(ATM_VF_READY,&vcc->flags);
+        clear_bit(ATM_VF_READY, &vcc->flags);
-   
-   if (vcc->qos.rxtp.traffic_class != ATM_NONE)
+        if (vcc->qos.rxtp.traffic_class != ATM_NONE) {
-   {
+                u32 addr;
-      u32 addr;
+                unsigned long flags;
-      unsigned long flags;
-      
+                addr =
-      addr = NS_RCT + (vcc->vpi << card->vcibits | vcc->vci) * NS_RCT_ENTRY_SIZE;
+                    NS_RCT +
-      spin_lock_irqsave(&card->res_lock, flags);
+                    (vcc->vpi << card->vcibits | vcc->vci) * NS_RCT_ENTRY_SIZE;
-      while(CMD_BUSY(card));
+                spin_lock_irqsave(&card->res_lock, flags);
-      writel(NS_CMD_CLOSE_CONNECTION | addr << 2, card->membase + CMD);
+                while (CMD_BUSY(card)) ;
-      spin_unlock_irqrestore(&card->res_lock, flags);
+                writel(NS_CMD_CLOSE_CONNECTION | addr << 2,
-      
+                       card->membase + CMD);
-      vc->rx = 0;
+                spin_unlock_irqrestore(&card->res_lock, flags);
-      if (vc->rx_iov != NULL)
-      {
+                vc->rx = 0;
-         struct sk_buff *iovb;
+                if (vc->rx_iov != NULL) {
-         u32 stat;
+                        struct sk_buff *iovb;
-   
+                        u32 stat;
-         stat = readl(card->membase + STAT);
-         card->sbfqc = ns_stat_sfbqc_get(stat);   
+                        stat = readl(card->membase + STAT);
-         card->lbfqc = ns_stat_lfbqc_get(stat);
+                        card->sbfqc = ns_stat_sfbqc_get(stat);
+                        card->lbfqc = ns_stat_lfbqc_get(stat);
-         PRINTK("nicstar%d: closing a VC with pending rx buffers.\n",
-                card->index);
+                        PRINTK
-         iovb = vc->rx_iov;
+                            ("nicstar%d: closing a VC with pending rx buffers.\n",
-         recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data,
+                             card->index);
-                               NS_SKB(iovb)->iovcnt);
+                        iovb = vc->rx_iov;
-         NS_SKB(iovb)->iovcnt = 0;
+                        recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
-         NS_SKB(iovb)->vcc = NULL;
+                                              NS_PRV_IOVCNT(iovb));
-         spin_lock_irqsave(&card->int_lock, flags);
+                        NS_PRV_IOVCNT(iovb) = 0;
-         recycle_iov_buf(card, iovb);
+                        spin_lock_irqsave(&card->int_lock, flags);
-         spin_unlock_irqrestore(&card->int_lock, flags);
+                        recycle_iov_buf(card, iovb);
-         vc->rx_iov = NULL;
+                        spin_unlock_irqrestore(&card->int_lock, flags);
-      }
+                        vc->rx_iov = NULL;
-   }
+                }
+        }
-   if (vcc->qos.txtp.traffic_class != ATM_NONE)
-   {
+        if (vcc->qos.txtp.traffic_class != ATM_NONE) {
-      vc->tx = 0;
+                vc->tx = 0;
-   }
+        }
-   if (vcc->qos.txtp.traffic_class == ATM_CBR)
+        if (vcc->qos.txtp.traffic_class == ATM_CBR) {
-   {
+                unsigned long flags;
-      unsigned long flags;
+                ns_scqe *scqep;
-      ns_scqe *scqep;
+                scq_info *scq;
-      scq_info *scq;
+                scq = vc->scq;
-      scq = vc->scq;
+                for (;;) {
-      for (;;)
+                        spin_lock_irqsave(&scq->lock, flags);
-      {
+                        scqep = scq->next;
-         spin_lock_irqsave(&scq->lock, flags);
+                        if (scqep == scq->base)
-         scqep = scq->next;
+                                scqep = scq->last;
-         if (scqep == scq->base)
+                        else
-            scqep = scq->last;
+                                scqep--;
-         else
+                        if (scqep == scq->tail) {
-            scqep--;
+                                spin_unlock_irqrestore(&scq->lock, flags);
-         if (scqep == scq->tail)
+                                break;
-         {
+                        }
-            spin_unlock_irqrestore(&scq->lock, flags);
+                        /* If the last entry is not a TSR, place one in the SCQ in order to
-            break;
+                           be able to completely drain it and then close. */
-         }
+                        if (!ns_scqe_is_tsr(scqep) && scq->tail != scq->next) {
-         /* If the last entry is not a TSR, place one in the SCQ in order to
+                                ns_scqe tsr;
-            be able to completely drain it and then close. */
+                                u32 scdi, scqi;
-         if (!ns_scqe_is_tsr(scqep) && scq->tail != scq->next)
+                                u32 data;
-         {
+                                int index;
-            ns_scqe tsr;
-            u32 scdi, scqi;
+                                tsr.word_1 = ns_tsr_mkword_1(NS_TSR_INTENABLE);
-            u32 data;
+                                scdi = (vc->cbr_scd - NS_FRSCD) / NS_FRSCD_SIZE;
-            int index;
+                                scqi = scq->next - scq->base;
+                                tsr.word_2 = ns_tsr_mkword_2(scdi, scqi);
-            tsr.word_1 = ns_tsr_mkword_1(NS_TSR_INTENABLE);
+                                tsr.word_3 = 0x00000000;
-            scdi = (vc->cbr_scd - NS_FRSCD) / NS_FRSCD_SIZE;
+                                tsr.word_4 = 0x00000000;
-            scqi = scq->next - scq->base;
+                                *scq->next = tsr;
-            tsr.word_2 = ns_tsr_mkword_2(scdi, scqi);
+                                index = (int)scqi;
-            tsr.word_3 = 0x00000000;
+                                scq->skb[index] = NULL;
-            tsr.word_4 = 0x00000000;
+                                if (scq->next == scq->last)
-            *scq->next = tsr;
+                                        scq->next = scq->base;
-            index = (int) scqi;
+                                else
-            scq->skb[index] = NULL;
+                                        scq->next++;
-            if (scq->next == scq->last)
+                                data = scq_virt_to_bus(scq, scq->next);
-               scq->next = scq->base;
+                                ns_write_sram(card, scq->scd, &data, 1);
-            else
+                        }
-               scq->next++;
+                        spin_unlock_irqrestore(&scq->lock, flags);
-            data = (u32) virt_to_bus(scq->next);
+                        schedule();
-            ns_write_sram(card, scq->scd, &data, 1);
+                }
-         }
-         spin_unlock_irqrestore(&scq->lock, flags);
+                /* Free all TST entries */
-         schedule();
+                data = NS_TST_OPCODE_VARIABLE;
-      }
+                for (i = 0; i < NS_TST_NUM_ENTRIES; i++) {
+                        if (card->tste2vc[i] == vc) {
-      /* Free all TST entries */
+                                ns_write_sram(card, card->tst_addr + i, &data,
-      data = NS_TST_OPCODE_VARIABLE;
+                                              1);
-      for (i = 0; i < NS_TST_NUM_ENTRIES; i++)
+                                card->tste2vc[i] = NULL;
-      {
+                                card->tst_free_entries++;
-         if (card->tste2vc[i] == vc)
+                        }
-         {
+                }
-            ns_write_sram(card, card->tst_addr + i, &data, 1);
-            card->tste2vc[i] = NULL;
+                card->scd2vc[(vc->cbr_scd - NS_FRSCD) / NS_FRSCD_SIZE] = NULL;
-            card->tst_free_entries++;
+                free_scq(card, vc->scq, vcc);
-         }
+        }
-      }
-      
+        /* remove all references to vcc before deleting it */
-      card->scd2vc[(vc->cbr_scd - NS_FRSCD) / NS_FRSCD_SIZE] = NULL;
+        if (vcc->qos.txtp.traffic_class != ATM_NONE) {
-      free_scq(vc->scq, vcc);
+                unsigned long flags;
-   }
+                scq_info *scq = card->scq0;
-   /* remove all references to vcc before deleting it */
+                spin_lock_irqsave(&scq->lock, flags);
-   if (vcc->qos.txtp.traffic_class != ATM_NONE)
-   {
+                for (i = 0; i < scq->num_entries; i++) {
-     unsigned long flags;
+                        if (scq->skb[i] && ATM_SKB(scq->skb[i])->vcc == vcc) {
-     scq_info *scq = card->scq0;
+                                ATM_SKB(scq->skb[i])->vcc = NULL;
+                                atm_return(vcc, scq->skb[i]->truesize);
-     spin_lock_irqsave(&scq->lock, flags);
+                                PRINTK
+                                    ("nicstar: deleted pending vcc mapping\n");
-     for(i = 0; i < scq->num_entries; i++) {
+                        }
-       if(scq->skb[i] && ATM_SKB(scq->skb[i])->vcc == vcc) {
+                }
-        ATM_SKB(scq->skb[i])->vcc = NULL;
-        atm_return(vcc, scq->skb[i]->truesize);
+                spin_unlock_irqrestore(&scq->lock, flags);
-        PRINTK("nicstar: deleted pending vcc mapping\n");
+        }
-       }
-     }
+        vcc->dev_data = NULL;
+        clear_bit(ATM_VF_PARTIAL, &vcc->flags);
-     spin_unlock_irqrestore(&scq->lock, flags);
+        clear_bit(ATM_VF_ADDR, &vcc->flags);
-   }
-   vcc->dev_data = NULL;
-   clear_bit(ATM_VF_PARTIAL,&vcc->flags);
-   clear_bit(ATM_VF_ADDR,&vcc->flags);
 #ifdef RX_DEBUG
-   {
+        {
-      u32 stat, cfg;
+                u32 stat, cfg;
-      stat = readl(card->membase + STAT);
+                stat = readl(card->membase + STAT);
-      cfg = readl(card->membase + CFG);
+                cfg = readl(card->membase + CFG);
-      printk("STAT = 0x%08X  CFG = 0x%08X  \n", stat, cfg);
+                printk("STAT = 0x%08X  CFG = 0x%08X  \n", stat, cfg);
-      printk("TSQ: base = 0x%08X  next = 0x%08X  last = 0x%08X  TSQT = 0x%08X \n",
+                printk
-             (u32) card->tsq.base, (u32) card->tsq.next,(u32) card->tsq.last,
+                    ("TSQ: base = 0x%p  next = 0x%p  last = 0x%p  TSQT = 0x%08X \n",
-             readl(card->membase + TSQT));
+                     card->tsq.base, card->tsq.next,
-      printk("RSQ: base = 0x%08X  next = 0x%08X  last = 0x%08X  RSQT = 0x%08X \n",
+                     card->tsq.last, readl(card->membase + TSQT));
-             (u32) card->rsq.base, (u32) card->rsq.next,(u32) card->rsq.last,
+                printk
-             readl(card->membase + RSQT));
+                    ("RSQ: base = 0x%p  next = 0x%p  last = 0x%p  RSQT = 0x%08X \n",
-      printk("Empty free buffer queue interrupt %s \n",
+                     card->rsq.base, card->rsq.next,
-             card->efbie ? "enabled" : "disabled");
+                     card->rsq.last, readl(card->membase + RSQT));
-      printk("SBCNT = %d  count = %d   LBCNT = %d count = %d \n",
+                printk("Empty free buffer queue interrupt %s \n",
-             ns_stat_sfbqc_get(stat), card->sbpool.count,
+                       card->efbie ? "enabled" : "disabled");
-             ns_stat_lfbqc_get(stat), card->lbpool.count);
+                printk("SBCNT = %d  count = %d   LBCNT = %d count = %d \n",
-      printk("hbpool.count = %d  iovpool.count = %d \n",
+                       ns_stat_sfbqc_get(stat), card->sbpool.count,
-             card->hbpool.count, card->iovpool.count);
+                       ns_stat_lfbqc_get(stat), card->lbpool.count);
-   }
+                printk("hbpool.count = %d  iovpool.count = %d \n",
+                       card->hbpool.count, card->iovpool.count);
+        }
 #endif /* RX_DEBUG */
 }
+static void fill_tst(ns_dev * card, int n, vc_map * vc)
-static void fill_tst(ns_dev *card, int n, vc_map *vc)
 {
-   u32 new_tst;
+        u32 new_tst;
-   unsigned long cl;
+        unsigned long cl;
-   int e, r;
+        int e, r;
-   u32 data;
+        u32 data;
-      
-   /* It would be very complicated to keep the two TSTs synchronized while
+        /* It would be very complicated to keep the two TSTs synchronized while
-      assuring that writes are only made to the inactive TST. So, for now I
+           assuring that writes are only made to the inactive TST. So, for now I
-      will use only one TST. If problems occur, I will change this again */
+           will use only one TST. If problems occur, I will change this again */
-   
-   new_tst = card->tst_addr;
+        new_tst = card->tst_addr;
-   /* Fill procedure */
+        /* Fill procedure */
-   for (e = 0; e < NS_TST_NUM_ENTRIES; e++)
+        for (e = 0; e < NS_TST_NUM_ENTRIES; e++) {
-   {
+                if (card->tste2vc[e] == NULL)
-      if (card->tste2vc[e] == NULL)
+                        break;
-         break;
+        }
-   }
+        if (e == NS_TST_NUM_ENTRIES) {
-   if (e == NS_TST_NUM_ENTRIES) {
+                printk("nicstar%d: No free TST entries found. \n", card->index);
-      printk("nicstar%d: No free TST entries found. \n", card->index);
+                return;
-      return;
+        }
-   }
+        r = n;
-   r = n;
+        cl = NS_TST_NUM_ENTRIES;
-   cl = NS_TST_NUM_ENTRIES;
+        data = ns_tste_make(NS_TST_OPCODE_FIXED, vc->cbr_scd);
-   data = ns_tste_make(NS_TST_OPCODE_FIXED, vc->cbr_scd);
-      
+        while (r > 0) {
-   while (r > 0)
+                if (cl >= NS_TST_NUM_ENTRIES && card->tste2vc[e] == NULL) {
-   {
+                        card->tste2vc[e] = vc;
-      if (cl >= NS_TST_NUM_ENTRIES && card->tste2vc[e] == NULL)
+                        ns_write_sram(card, new_tst + e, &data, 1);
-      {
+                        cl -= NS_TST_NUM_ENTRIES;
-         card->tste2vc[e] = vc;
+                        r--;
-         ns_write_sram(card, new_tst + e, &data, 1);
+                }
-         cl -= NS_TST_NUM_ENTRIES;
-         r--;
+                if (++e == NS_TST_NUM_ENTRIES) {
-      }
+                        e = 0;
+                }
-      if (++e == NS_TST_NUM_ENTRIES) {
+                cl += n;
-         e = 0;
+        }
-      }
-      cl += n;
+        /* End of fill procedure */
-   }
-   
+        data = ns_tste_make(NS_TST_OPCODE_END, new_tst);
-   /* End of fill procedure */
+        ns_write_sram(card, new_tst + NS_TST_NUM_ENTRIES, &data, 1);
-   
+        ns_write_sram(card, card->tst_addr + NS_TST_NUM_ENTRIES, &data, 1);
-   data = ns_tste_make(NS_TST_OPCODE_END, new_tst);
+        card->tst_addr = new_tst;
-   ns_write_sram(card, new_tst + NS_TST_NUM_ENTRIES, &data, 1);
-   ns_write_sram(card, card->tst_addr + NS_TST_NUM_ENTRIES, &data, 1);
-   card->tst_addr = new_tst;
 }
 static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
 {
-   ns_dev *card;
+        ns_dev *card;
-   vc_map *vc;
+        vc_map *vc;
-   scq_info *scq;
+        scq_info *scq;
-   unsigned long buflen;
+        unsigned long buflen;
-   ns_scqe scqe;
+        ns_scqe scqe;
-   u32 flags;           /* TBD flags, not CPU flags */
+        u32 flags;              /* TBD flags, not CPU flags */
-   
-   card = vcc->dev->dev_data;
+        card = vcc->dev->dev_data;
-   TXPRINTK("nicstar%d: ns_send() called.\n", card->index);
+        TXPRINTK("nicstar%d: ns_send() called.\n", card->index);
-   if ((vc = (vc_map *) vcc->dev_data) == NULL)
+        if ((vc = (vc_map *) vcc->dev_data) == NULL) {
-   {
+                printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
-      printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n", card->index);
+                       card->index);
-      atomic_inc(&vcc->stats->tx_err);
+                atomic_inc(&vcc->stats->tx_err);
-      dev_kfree_skb_any(skb);
+                dev_kfree_skb_any(skb);
-      return -EINVAL;
+                return -EINVAL;
-   }
+        }
-   
-   if (!vc->tx)
-   {
-      printk("nicstar%d: Trying to transmit on a non-tx VC.\n", card->index);
-      atomic_inc(&vcc->stats->tx_err);
-      dev_kfree_skb_any(skb);
-      return -EINVAL;
-   }
-   
-   if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0)
-   {
-      printk("nicstar%d: Only AAL0 and AAL5 are supported.\n", card->index);
-      atomic_inc(&vcc->stats->tx_err);
-      dev_kfree_skb_any(skb);
-      return -EINVAL;
-   }
-   
-   if (skb_shinfo(skb)->nr_frags != 0)
-   {
-      printk("nicstar%d: No scatter-gather yet.\n", card->index);
-      atomic_inc(&vcc->stats->tx_err);
-      dev_kfree_skb_any(skb);
-      return -EINVAL;
-   }
-   
-   ATM_SKB(skb)->vcc = vcc;
-   if (vcc->qos.aal == ATM_AAL5)
-   {
-      buflen = (skb->len + 47 + 8) / 48 * 48;   /* Multiple of 48 */
-      flags = NS_TBD_AAL5;
-      scqe.word_2 = cpu_to_le32((u32) virt_to_bus(skb->data));
-      scqe.word_3 = cpu_to_le32((u32) skb->len);
-      scqe.word_4 = ns_tbd_mkword_4(0, (u32) vcc->vpi, (u32) vcc->vci, 0,
-                           ATM_SKB(skb)->atm_options & ATM_ATMOPT_CLP ? 1 : 0);
-      flags |= NS_TBD_EOPDU;
-   }
-   else /* (vcc->qos.aal == ATM_AAL0) */
-   {
-      buflen = ATM_CELL_PAYLOAD;        /* i.e., 48 bytes */
-      flags = NS_TBD_AAL0;
-      scqe.word_2 = cpu_to_le32((u32) virt_to_bus(skb->data) + NS_AAL0_HEADER);
-      scqe.word_3 = cpu_to_le32(0x00000000);
-      if (*skb->data & 0x02)    /* Payload type 1 - end of pdu */
-         flags |= NS_TBD_EOPDU;
-      scqe.word_4 = cpu_to_le32(*((u32 *) skb->data) & ~NS_TBD_VC_MASK);
-      /* Force the VPI/VCI to be the same as in VCC struct */
-      scqe.word_4 |= cpu_to_le32((((u32) vcc->vpi) << NS_TBD_VPI_SHIFT |
-                                 ((u32) vcc->vci) << NS_TBD_VCI_SHIFT) &
-                                 NS_TBD_VC_MASK);
-   }
-   if (vcc->qos.txtp.traffic_class == ATM_CBR)
-   {
-      scqe.word_1 = ns_tbd_mkword_1_novbr(flags, (u32) buflen);
-      scq = ((vc_map *) vcc->dev_data)->scq;
-   }
-   else
-   {
-      scqe.word_1 = ns_tbd_mkword_1(flags, (u32) 1, (u32) 1, (u32) buflen);
-      scq = card->scq0;
-   }
-   if (push_scqe(card, vc, scq, &scqe, skb) != 0)
-   {
-      atomic_inc(&vcc->stats->tx_err);
-      dev_kfree_skb_any(skb);
-      return -EIO;
-   }
-   atomic_inc(&vcc->stats->tx);
-   return 0;
-}
+        if (!vc->tx) {
+                printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
+                       card->index);
+                atomic_inc(&vcc->stats->tx_err);
+                dev_kfree_skb_any(skb);
+                return -EINVAL;
+        }
-static int push_scqe(ns_dev *card, vc_map *vc, scq_info *scq, ns_scqe *tbd,
+        if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
-                     struct sk_buff *skb)
+                printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
-{
+                       card->index);
-   unsigned long flags;
+                atomic_inc(&vcc->stats->tx_err);
-   ns_scqe tsr;
+                dev_kfree_skb_any(skb);
-   u32 scdi, scqi;
+                return -EINVAL;
-   int scq_is_vbr;
+        }
-   u32 data;
-   int index;
-   
-   spin_lock_irqsave(&scq->lock, flags);
-   while (scq->tail == scq->next)
-   {
-      if (in_interrupt()) {
-         spin_unlock_irqrestore(&scq->lock, flags);
-         printk("nicstar%d: Error pushing TBD.\n", card->index);
-         return 1;
-      }
-      scq->full = 1;
-      spin_unlock_irqrestore(&scq->lock, flags);
-      interruptible_sleep_on_timeout(&scq->scqfull_waitq, SCQFULL_TIMEOUT);
-      spin_lock_irqsave(&scq->lock, flags);
-      if (scq->full) {
-         spin_unlock_irqrestore(&scq->lock, flags);
-         printk("nicstar%d: Timeout pushing TBD.\n", card->index);
-         return 1;
-      }
-   }
-   *scq->next = *tbd;
-   index = (int) (scq->next - scq->base);
-   scq->skb[index] = skb;
-   XPRINTK("nicstar%d: sending skb at 0x%x (pos %d).\n",
-           card->index, (u32) skb, index);
-   XPRINTK("nicstar%d: TBD written:\n0x%x\n0x%x\n0x%x\n0x%x\n at 0x%x.\n",
-           card->index, le32_to_cpu(tbd->word_1), le32_to_cpu(tbd->word_2),
-           le32_to_cpu(tbd->word_3), le32_to_cpu(tbd->word_4),
-           (u32) scq->next);
-   if (scq->next == scq->last)
-      scq->next = scq->base;
-   else
-      scq->next++;
-   vc->tbd_count++;
-   if (scq->num_entries == VBR_SCQ_NUM_ENTRIES)
-   {
-      scq->tbd_count++;
-      scq_is_vbr = 1;
-   }
-   else
-      scq_is_vbr = 0;
-   if (vc->tbd_count >= MAX_TBD_PER_VC || scq->tbd_count >= MAX_TBD_PER_SCQ)
-   {
-      int has_run = 0;
-      while (scq->tail == scq->next)
-      {
-         if (in_interrupt()) {
-            data = (u32) virt_to_bus(scq->next);
-            ns_write_sram(card, scq->scd, &data, 1);
-            spin_unlock_irqrestore(&scq->lock, flags);
-            printk("nicstar%d: Error pushing TSR.\n", card->index);
-            return 0;
-         }
-         scq->full = 1;
-         if (has_run++) break;
-         spin_unlock_irqrestore(&scq->lock, flags);
-         interruptible_sleep_on_timeout(&scq->scqfull_waitq, SCQFULL_TIMEOUT);
-         spin_lock_irqsave(&scq->lock, flags);
-      }
-      if (!scq->full)
-      {
-         tsr.word_1 = ns_tsr_mkword_1(NS_TSR_INTENABLE);
-         if (scq_is_vbr)
-            scdi = NS_TSR_SCDISVBR;
-         else
-            scdi = (vc->cbr_scd - NS_FRSCD) / NS_FRSCD_SIZE;
-         scqi = scq->next - scq->base;
-         tsr.word_2 = ns_tsr_mkword_2(scdi, scqi);
-         tsr.word_3 = 0x00000000;
-         tsr.word_4 = 0x00000000;
-         *scq->next = tsr;
-         index = (int) scqi;
-         scq->skb[index] = NULL;
-         XPRINTK("nicstar%d: TSR written:\n0x%x\n0x%x\n0x%x\n0x%x\n at 0x%x.\n",
-                 card->index, le32_to_cpu(tsr.word_1), le32_to_cpu(tsr.word_2),
-                 le32_to_cpu(tsr.word_3), le32_to_cpu(tsr.word_4),
-                 (u32) scq->next);
-         if (scq->next == scq->last)
-            scq->next = scq->base;
-         else
-            scq->next++;
-         vc->tbd_count = 0;
-         scq->tbd_count = 0;
-      }
-      else
-         PRINTK("nicstar%d: Timeout pushing TSR.\n", card->index);
-   }
-   data = (u32) virt_to_bus(scq->next);
-   ns_write_sram(card, scq->scd, &data, 1);
-   
-   spin_unlock_irqrestore(&scq->lock, flags);
-   
-   return 0;
-}
+        if (skb_shinfo(skb)->nr_frags != 0) {
+                printk("nicstar%d: No scatter-gather yet.\n", card->index);
+                atomic_inc(&vcc->stats->tx_err);
+                dev_kfree_skb_any(skb);
+                return -EINVAL;
+        }
+        ATM_SKB(skb)->vcc = vcc;
+        NS_PRV_DMA(skb) = pci_map_single(card->pcidev, skb->data,
+                                         skb->len, PCI_DMA_TODEVICE);
+        if (vcc->qos.aal == ATM_AAL5) {
+                buflen = (skb->len + 47 + 8) / 48 * 48; /* Multiple of 48 */
+                flags = NS_TBD_AAL5;
+                scqe.word_2 = cpu_to_le32(NS_PRV_DMA(skb));
+                scqe.word_3 = cpu_to_le32(skb->len);
+                scqe.word_4 =
+                    ns_tbd_mkword_4(0, (u32) vcc->vpi, (u32) vcc->vci, 0,
+                                    ATM_SKB(skb)->
+                                    atm_options & ATM_ATMOPT_CLP ? 1 : 0);
+                flags |= NS_TBD_EOPDU;
+        } else {                /* (vcc->qos.aal == ATM_AAL0) */
+                buflen = ATM_CELL_PAYLOAD;      /* i.e., 48 bytes */
+                flags = NS_TBD_AAL0;
+                scqe.word_2 = cpu_to_le32(NS_PRV_DMA(skb) + NS_AAL0_HEADER);
+                scqe.word_3 = cpu_to_le32(0x00000000);
+                if (*skb->data & 0x02)  /* Payload type 1 - end of pdu */
+                        flags |= NS_TBD_EOPDU;
+                scqe.word_4 =
+                    cpu_to_le32(*((u32 *) skb->data) & ~NS_TBD_VC_MASK);
+                /* Force the VPI/VCI to be the same as in VCC struct */
+                scqe.word_4 |=
+                    cpu_to_le32((((u32) vcc->
+                                  vpi) << NS_TBD_VPI_SHIFT | ((u32) vcc->
+                                                              vci) <<
+                                 NS_TBD_VCI_SHIFT) & NS_TBD_VC_MASK);
+        }
+        if (vcc->qos.txtp.traffic_class == ATM_CBR) {
+                scqe.word_1 = ns_tbd_mkword_1_novbr(flags, (u32) buflen);
+                scq = ((vc_map *) vcc->dev_data)->scq;
+        } else {
+                scqe.word_1 =
+                    ns_tbd_mkword_1(flags, (u32) 1, (u32) 1, (u32) buflen);
+                scq = card->scq0;
+        }
+        if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
+                atomic_inc(&vcc->stats->tx_err);
+                dev_kfree_skb_any(skb);
+                return -EIO;
+        }
+        atomic_inc(&vcc->stats->tx);
+        return 0;
+}
-static void process_tsq(ns_dev *card)
+static int push_scqe(ns_dev * card, vc_map * vc, scq_info * scq, ns_scqe * tbd,
+                     struct sk_buff *skb)
 {
-   u32 scdi;
+        unsigned long flags;
-   scq_info *scq;
+        ns_scqe tsr;
-   ns_tsi *previous = NULL, *one_ahead, *two_ahead;
+        u32 scdi, scqi;
-   int serviced_entries;   /* flag indicating at least on entry was serviced */
+        int scq_is_vbr;
-   
+        u32 data;
-   serviced_entries = 0;
+        int index;
-   
-   if (card->tsq.next == card->tsq.last)
+        spin_lock_irqsave(&scq->lock, flags);
-      one_ahead = card->tsq.base;
+        while (scq->tail == scq->next) {
-   else
+                if (in_interrupt()) {
-      one_ahead = card->tsq.next + 1;
+                        spin_unlock_irqrestore(&scq->lock, flags);
+                        printk("nicstar%d: Error pushing TBD.\n", card->index);
-   if (one_ahead == card->tsq.last)
+                        return 1;
-      two_ahead = card->tsq.base;
+                }
-   else
-      two_ahead = one_ahead + 1;
+                scq->full = 1;
-   
+                spin_unlock_irqrestore(&scq->lock, flags);
-   while (!ns_tsi_isempty(card->tsq.next) || !ns_tsi_isempty(one_ahead) ||
+                interruptible_sleep_on_timeout(&scq->scqfull_waitq,
-          !ns_tsi_isempty(two_ahead))
+                                               SCQFULL_TIMEOUT);
-          /* At most two empty, as stated in the 77201 errata */
+                spin_lock_irqsave(&scq->lock, flags);
-   {
-      serviced_entries = 1;
+                if (scq->full) {
-    
+                        spin_unlock_irqrestore(&scq->lock, flags);
-      /* Skip the one or two possible empty entries */
+                        printk("nicstar%d: Timeout pushing TBD.\n",
-      while (ns_tsi_isempty(card->tsq.next)) {
+                               card->index);
-         if (card->tsq.next == card->tsq.last)
+                        return 1;
-            card->tsq.next = card->tsq.base;
+                }
-         else
+        }
-            card->tsq.next++;
+        *scq->next = *tbd;
-      }
+        index = (int)(scq->next - scq->base);
-    
+        scq->skb[index] = skb;
-      if (!ns_tsi_tmrof(card->tsq.next))
+        XPRINTK("nicstar%d: sending skb at 0x%p (pos %d).\n",
-      {
+                card->index, skb, index);
-         scdi = ns_tsi_getscdindex(card->tsq.next);
+        XPRINTK("nicstar%d: TBD written:\n0x%x\n0x%x\n0x%x\n0x%x\n at 0x%p.\n",
-         if (scdi == NS_TSI_SCDISVBR)
+                card->index, le32_to_cpu(tbd->word_1), le32_to_cpu(tbd->word_2),
-            scq = card->scq0;
+                le32_to_cpu(tbd->word_3), le32_to_cpu(tbd->word_4),
-         else
+                scq->next);
-         {
+        if (scq->next == scq->last)
-            if (card->scd2vc[scdi] == NULL)
+                scq->next = scq->base;
-            {
+        else
-               printk("nicstar%d: could not find VC from SCD index.\n",
+                scq->next++;
-                      card->index);
-               ns_tsi_init(card->tsq.next);
+        vc->tbd_count++;
-               return;
+        if (scq->num_entries == VBR_SCQ_NUM_ENTRIES) {
-            }
+                scq->tbd_count++;
-            scq = card->scd2vc[scdi]->scq;
+                scq_is_vbr = 1;
-         }
+        } else
-         drain_scq(card, scq, ns_tsi_getscqpos(card->tsq.next));
+                scq_is_vbr = 0;
-         scq->full = 0;
-         wake_up_interruptible(&(scq->scqfull_waitq));
+        if (vc->tbd_count >= MAX_TBD_PER_VC
-      }
+            || scq->tbd_count >= MAX_TBD_PER_SCQ) {
+                int has_run = 0;
-      ns_tsi_init(card->tsq.next);
-      previous = card->tsq.next;
+                while (scq->tail == scq->next) {
-      if (card->tsq.next == card->tsq.last)
+                        if (in_interrupt()) {
-         card->tsq.next = card->tsq.base;
+                                data = scq_virt_to_bus(scq, scq->next);
-      else
+                                ns_write_sram(card, scq->scd, &data, 1);
-         card->tsq.next++;
+                                spin_unlock_irqrestore(&scq->lock, flags);
+                                printk("nicstar%d: Error pushing TSR.\n",
-      if (card->tsq.next == card->tsq.last)
+                                       card->index);
-         one_ahead = card->tsq.base;
+                                return 0;
-      else
+                        }
-         one_ahead = card->tsq.next + 1;
+                        scq->full = 1;
-      if (one_ahead == card->tsq.last)
+                        if (has_run++)
-         two_ahead = card->tsq.base;
+                                break;
-      else
+                        spin_unlock_irqrestore(&scq->lock, flags);
-         two_ahead = one_ahead + 1;
+                        interruptible_sleep_on_timeout(&scq->scqfull_waitq,
-   }
+                                                       SCQFULL_TIMEOUT);
+                        spin_lock_irqsave(&scq->lock, flags);
-   if (serviced_entries) {
+                }
-      writel((((u32) previous) - ((u32) card->tsq.base)),
-             card->membase + TSQH);
+                if (!scq->full) {
-   }
+                        tsr.word_1 = ns_tsr_mkword_1(NS_TSR_INTENABLE);
+                        if (scq_is_vbr)
+                                scdi = NS_TSR_SCDISVBR;
+                        else
+                                scdi = (vc->cbr_scd - NS_FRSCD) / NS_FRSCD_SIZE;
+                        scqi = scq->next - scq->base;
+                        tsr.word_2 = ns_tsr_mkword_2(scdi, scqi);
+                        tsr.word_3 = 0x00000000;
+                        tsr.word_4 = 0x00000000;
+                        *scq->next = tsr;
+                        index = (int)scqi;
+                        scq->skb[index] = NULL;
+                        XPRINTK
+                            ("nicstar%d: TSR written:\n0x%x\n0x%x\n0x%x\n0x%x\n at 0x%p.\n",
+                             card->index, le32_to_cpu(tsr.word_1),
+                             le32_to_cpu(tsr.word_2), le32_to_cpu(tsr.word_3),
+                             le32_to_cpu(tsr.word_4), scq->next);
+                        if (scq->next == scq->last)
+                                scq->next = scq->base;
+                        else
+                                scq->next++;
+                        vc->tbd_count = 0;
+                        scq->tbd_count = 0;
+                } else
+                        PRINTK("nicstar%d: Timeout pushing TSR.\n",
+                               card->index);
+        }
+        data = scq_virt_to_bus(scq, scq->next);
+        ns_write_sram(card, scq->scd, &data, 1);
+        spin_unlock_irqrestore(&scq->lock, flags);
+        return 0;
 }
+static void process_tsq(ns_dev * card)
-static void drain_scq(ns_dev *card, scq_info *scq, int pos)
 {
-   struct atm_vcc *vcc;
+        u32 scdi;
-   struct sk_buff *skb;
+        scq_info *scq;
-   int i;
+        ns_tsi *previous = NULL, *one_ahead, *two_ahead;
-   unsigned long flags;
+        int serviced_entries;   /* flag indicating at least on entry was serviced */
-   
-   XPRINTK("nicstar%d: drain_scq() called, scq at 0x%x, pos %d.\n",
+        serviced_entries = 0;
-           card->index, (u32) scq, pos);
-   if (pos >= scq->num_entries)
+        if (card->tsq.next == card->tsq.last)
-   {
+                one_ahead = card->tsq.base;
-      printk("nicstar%d: Bad index on drain_scq().\n", card->index);
+        else
-      return;
+                one_ahead = card->tsq.next + 1;
-   }
+        if (one_ahead == card->tsq.last)
-   spin_lock_irqsave(&scq->lock, flags);
+                two_ahead = card->tsq.base;
-   i = (int) (scq->tail - scq->base);
+        else
-   if (++i == scq->num_entries)
+                two_ahead = one_ahead + 1;
-      i = 0;
-   while (i != pos)
+        while (!ns_tsi_isempty(card->tsq.next) || !ns_tsi_isempty(one_ahead) ||
-   {
+               !ns_tsi_isempty(two_ahead))
-      skb = scq->skb[i];
+                /* At most two empty, as stated in the 77201 errata */
-      XPRINTK("nicstar%d: freeing skb at 0x%x (index %d).\n",
+        {
-              card->index, (u32) skb, i);
+                serviced_entries = 1;
-      if (skb != NULL)
-      {
+                /* Skip the one or two possible empty entries */
-         vcc = ATM_SKB(skb)->vcc;
+                while (ns_tsi_isempty(card->tsq.next)) {
-         if (vcc && vcc->pop != NULL) {
+                        if (card->tsq.next == card->tsq.last)
-            vcc->pop(vcc, skb);
+                                card->tsq.next = card->tsq.base;
-         } else {
+                        else
-            dev_kfree_skb_irq(skb);
+                                card->tsq.next++;
-         }
+                }
-         scq->skb[i] = NULL;
-      }
+                if (!ns_tsi_tmrof(card->tsq.next)) {
-      if (++i == scq->num_entries)
+                        scdi = ns_tsi_getscdindex(card->tsq.next);
-         i = 0;
+                        if (scdi == NS_TSI_SCDISVBR)
-   }
+                                scq = card->scq0;
-   scq->tail = scq->base + pos;
+                        else {
-   spin_unlock_irqrestore(&scq->lock, flags);
+                                if (card->scd2vc[scdi] == NULL) {
+                                        printk
+                                            ("nicstar%d: could not find VC from SCD index.\n",
+                                             card->index);
+                                        ns_tsi_init(card->tsq.next);
+                                        return;
+                                }
+                                scq = card->scd2vc[scdi]->scq;
+                        }
+                        drain_scq(card, scq, ns_tsi_getscqpos(card->tsq.next));
+                        scq->full = 0;
+                        wake_up_interruptible(&(scq->scqfull_waitq));
+                }
+                ns_tsi_init(card->tsq.next);
+                previous = card->tsq.next;
+                if (card->tsq.next == card->tsq.last)
+                        card->tsq.next = card->tsq.base;
+                else
+                        card->tsq.next++;
+                if (card->tsq.next == card->tsq.last)
+                        one_ahead = card->tsq.base;
+                else
+                        one_ahead = card->tsq.next + 1;
+                if (one_ahead == card->tsq.last)
+                        two_ahead = card->tsq.base;
+                else
+                        two_ahead = one_ahead + 1;
+        }
+        if (serviced_entries)
+                writel(PTR_DIFF(previous, card->tsq.base),
+                       card->membase + TSQH);
 }
+static void drain_scq(ns_dev * card, scq_info * scq, int pos)
+{
+        struct atm_vcc *vcc;
+        struct sk_buff *skb;
+        int i;
+        unsigned long flags;
+        XPRINTK("nicstar%d: drain_scq() called, scq at 0x%p, pos %d.\n",
+                card->index, scq, pos);
+        if (pos >= scq->num_entries) {
+                printk("nicstar%d: Bad index on drain_scq().\n", card->index);
+                return;
+        }
+        spin_lock_irqsave(&scq->lock, flags);
+        i = (int)(scq->tail - scq->base);
+        if (++i == scq->num_entries)
+                i = 0;
+        while (i != pos) {
+                skb = scq->skb[i];
+                XPRINTK("nicstar%d: freeing skb at 0x%p (index %d).\n",
+                        card->index, skb, i);
+                if (skb != NULL) {
+                        pci_unmap_single(card->pcidev,
+                                         NS_PRV_DMA(skb),
+                                         skb->len,
+                                         PCI_DMA_TODEVICE);
+                        vcc = ATM_SKB(skb)->vcc;
+                        if (vcc && vcc->pop != NULL) {
+                                vcc->pop(vcc, skb);
+                        } else {
+                                dev_kfree_skb_irq(skb);
+                        }
+                        scq->skb[i] = NULL;
+                }
+                if (++i == scq->num_entries)
+                        i = 0;
+        }
+        scq->tail = scq->base + pos;
+        spin_unlock_irqrestore(&scq->lock, flags);
+}
+static void process_rsq(ns_dev * card)
-static void process_rsq(ns_dev *card)
 {
-   ns_rsqe *previous;
+        ns_rsqe *previous;
-   if (!ns_rsqe_valid(card->rsq.next))
+        if (!ns_rsqe_valid(card->rsq.next))
-      return;
+                return;
-   do {
+        do {
-      dequeue_rx(card, card->rsq.next);
+                dequeue_rx(card, card->rsq.next);
-      ns_rsqe_init(card->rsq.next);
+                ns_rsqe_init(card->rsq.next);
-      previous = card->rsq.next;
+                previous = card->rsq.next;
-      if (card->rsq.next == card->rsq.last)
+                if (card->rsq.next == card->rsq.last)
-         card->rsq.next = card->rsq.base;
+                        card->rsq.next = card->rsq.base;
-      else
+                else
-         card->rsq.next++;
+                        card->rsq.next++;
-   } while (ns_rsqe_valid(card->rsq.next));
+        } while (ns_rsqe_valid(card->rsq.next));
-   writel((((u32) previous) - ((u32) card->rsq.base)),
+        writel(PTR_DIFF(previous, card->rsq.base), card->membase + RSQH);
-          card->membase + RSQH);
 }
+static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+{
+        u32 vpi, vci;
+        vc_map *vc;
+        struct sk_buff *iovb;
+        struct iovec *iov;
+        struct atm_vcc *vcc;
+        struct sk_buff *skb;
+        unsigned short aal5_len;
+        int len;
+        u32 stat;
+        u32 id;
+        stat = readl(card->membase + STAT);
+        card->sbfqc = ns_stat_sfbqc_get(stat);
+        card->lbfqc = ns_stat_lfbqc_get(stat);
+        id = le32_to_cpu(rsqe->buffer_handle);
+        skb = idr_find(&card->idr, id);
+        if (!skb) {
+                RXPRINTK(KERN_ERR
+                         "nicstar%d: idr_find() failed!\n", card->index);
+                return;
+        }
+        idr_remove(&card->idr, id);
+        pci_dma_sync_single_for_cpu(card->pcidev,
+                                    NS_PRV_DMA(skb),
+                                    (NS_PRV_BUFTYPE(skb) == BUF_SM
+                                     ? NS_SMSKBSIZE : NS_LGSKBSIZE),
+                                    PCI_DMA_FROMDEVICE);
+        pci_unmap_single(card->pcidev,
+                         NS_PRV_DMA(skb),
+                         (NS_PRV_BUFTYPE(skb) == BUF_SM
+                          ? NS_SMSKBSIZE : NS_LGSKBSIZE),
+                         PCI_DMA_FROMDEVICE);
+        vpi = ns_rsqe_vpi(rsqe);
+        vci = ns_rsqe_vci(rsqe);
+        if (vpi >= 1UL << card->vpibits || vci >= 1UL << card->vcibits) {
+                printk("nicstar%d: SDU received for out-of-range vc %d.%d.\n",
+                       card->index, vpi, vci);
+                recycle_rx_buf(card, skb);
+                return;
+        }
+        vc = &(card->vcmap[vpi << card->vcibits | vci]);
+        if (!vc->rx) {
+                RXPRINTK("nicstar%d: SDU received on non-rx vc %d.%d.\n",
+                         card->index, vpi, vci);
+                recycle_rx_buf(card, skb);
+                return;
+        }
+        vcc = vc->rx_vcc;
+        if (vcc->qos.aal == ATM_AAL0) {
+                struct sk_buff *sb;
+                unsigned char *cell;
+                int i;
+                cell = skb->data;
+                for (i = ns_rsqe_cellcount(rsqe); i; i--) {
+                        if ((sb = dev_alloc_skb(NS_SMSKBSIZE)) == NULL) {
+                                printk
+                                    ("nicstar%d: Can't allocate buffers for aal0.\n",
+                                     card->index);
+                                atomic_add(i, &vcc->stats->rx_drop);
+                                break;
+                        }
+                        if (!atm_charge(vcc, sb->truesize)) {
+                                RXPRINTK
+                                    ("nicstar%d: atm_charge() dropped aal0 packets.\n",
+                                     card->index);
+                                atomic_add(i - 1, &vcc->stats->rx_drop);        /* already increased by 1 */
+                                dev_kfree_skb_any(sb);
+                                break;
+                        }
+                        /* Rebuild the header */
+                        *((u32 *) sb->data) = le32_to_cpu(rsqe->word_1) << 4 |
+                            (ns_rsqe_clp(rsqe) ? 0x00000001 : 0x00000000);
+                        if (i == 1 && ns_rsqe_eopdu(rsqe))
+                                *((u32 *) sb->data) |= 0x00000002;
+                        skb_put(sb, NS_AAL0_HEADER);
+                        memcpy(skb_tail_pointer(sb), cell, ATM_CELL_PAYLOAD);
+                        skb_put(sb, ATM_CELL_PAYLOAD);
+                        ATM_SKB(sb)->vcc = vcc;
+                        __net_timestamp(sb);
+                        vcc->push(vcc, sb);
+                        atomic_inc(&vcc->stats->rx);
+                        cell += ATM_CELL_PAYLOAD;
+                }
+                recycle_rx_buf(card, skb);
+                return;
+        }
+        /* To reach this point, the AAL layer can only be AAL5 */
+        if ((iovb = vc->rx_iov) == NULL) {
+                iovb = skb_dequeue(&(card->iovpool.queue));
+                if (iovb == NULL) {     /* No buffers in the queue */
+                        iovb = alloc_skb(NS_IOVBUFSIZE, GFP_ATOMIC);
+                        if (iovb == NULL) {
+                                printk("nicstar%d: Out of iovec buffers.\n",
+                                       card->index);
+                                atomic_inc(&vcc->stats->rx_drop);
+                                recycle_rx_buf(card, skb);
+                                return;
+                        }
+                        NS_PRV_BUFTYPE(iovb) = BUF_NONE;
+                } else if (--card->iovpool.count < card->iovnr.min) {
+                        struct sk_buff *new_iovb;
+                        if ((new_iovb =
+                             alloc_skb(NS_IOVBUFSIZE, GFP_ATOMIC)) != NULL) {
+                                NS_PRV_BUFTYPE(iovb) = BUF_NONE;
+                                skb_queue_tail(&card->iovpool.queue, new_iovb);
+                                card->iovpool.count++;
+                        }
+                }
+                vc->rx_iov = iovb;
+                NS_PRV_IOVCNT(iovb) = 0;
+                iovb->len = 0;
+                iovb->data = iovb->head;
+                skb_reset_tail_pointer(iovb);
+                /* IMPORTANT: a pointer to the sk_buff containing the small or large
+                   buffer is stored as iovec base, NOT a pointer to the
+                   small or large buffer itself. */
+        } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
+                printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
+                atomic_inc(&vcc->stats->rx_err);
+                recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
+                                      NS_MAX_IOVECS);
+                NS_PRV_IOVCNT(iovb) = 0;
+                iovb->len = 0;
+                iovb->data = iovb->head;
+                skb_reset_tail_pointer(iovb);
+        }
+        iov = &((struct iovec *)iovb->data)[NS_PRV_IOVCNT(iovb)++];
+        iov->iov_base = (void *)skb;
+        iov->iov_len = ns_rsqe_cellcount(rsqe) * 48;
+        iovb->len += iov->iov_len;
+#ifdef EXTRA_DEBUG
+        if (NS_PRV_IOVCNT(iovb) == 1) {
+                if (NS_PRV_BUFTYPE(skb) != BUF_SM) {
+                        printk
+                            ("nicstar%d: Expected a small buffer, and this is not one.\n",
+                             card->index);
+                        which_list(card, skb);
+                        atomic_inc(&vcc->stats->rx_err);
+                        recycle_rx_buf(card, skb);
+                        vc->rx_iov = NULL;
+                        recycle_iov_buf(card, iovb);
+                        return;
+                }
+        } else {                /* NS_PRV_IOVCNT(iovb) >= 2 */
+                if (NS_PRV_BUFTYPE(skb) != BUF_LG) {
+                        printk
+                            ("nicstar%d: Expected a large buffer, and this is not one.\n",
+                             card->index);
+                        which_list(card, skb);
+                        atomic_inc(&vcc->stats->rx_err);
+                        recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
+                                              NS_PRV_IOVCNT(iovb));
+                        vc->rx_iov = NULL;
+                        recycle_iov_buf(card, iovb);
+                        return;
+                }
+        }
+#endif /* EXTRA_DEBUG */
-static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
+        if (ns_rsqe_eopdu(rsqe)) {
-{
+                /* This works correctly regardless of the endianness of the host */
-   u32 vpi, vci;
+                unsigned char *L1L2 = (unsigned char *)
-   vc_map *vc;
+                                                (skb->data + iov->iov_len - 6);
-   struct sk_buff *iovb;
+                aal5_len = L1L2[0] << 8 | L1L2[1];
-   struct iovec *iov;
+                len = (aal5_len == 0x0000) ? 0x10000 : aal5_len;
-   struct atm_vcc *vcc;
+                if (ns_rsqe_crcerr(rsqe) ||
-   struct sk_buff *skb;
+                    len + 8 > iovb->len || len + (47 + 8) < iovb->len) {
-   unsigned short aal5_len;
+                        printk("nicstar%d: AAL5 CRC error", card->index);
-   int len;
+                        if (len + 8 > iovb->len || len + (47 + 8) < iovb->len)
-   u32 stat;
+                                printk(" - PDU size mismatch.\n");
+                        else
-   stat = readl(card->membase + STAT);
+                                printk(".\n");
-   card->sbfqc = ns_stat_sfbqc_get(stat);   
+                        atomic_inc(&vcc->stats->rx_err);
-   card->lbfqc = ns_stat_lfbqc_get(stat);
+                        recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
+                                              NS_PRV_IOVCNT(iovb));
-   skb = (struct sk_buff *) le32_to_cpu(rsqe->buffer_handle);
+                        vc->rx_iov = NULL;
-   vpi = ns_rsqe_vpi(rsqe);
+                        recycle_iov_buf(card, iovb);
-   vci = ns_rsqe_vci(rsqe);
+                        return;
-   if (vpi >= 1UL << card->vpibits || vci >= 1UL << card->vcibits)
+                }
-   {
-      printk("nicstar%d: SDU received for out-of-range vc %d.%d.\n",
+                /* By this point we (hopefully) have a complete SDU without errors. */
-             card->index, vpi, vci);
-      recycle_rx_buf(card, skb);
+                if (NS_PRV_IOVCNT(iovb) == 1) { /* Just a small buffer */
-      return;
+                        /* skb points to a small buffer */
-   }
+                        if (!atm_charge(vcc, skb->truesize)) {
-   
+                                push_rxbufs(card, skb);
-   vc = &(card->vcmap[vpi << card->vcibits | vci]);
+                                atomic_inc(&vcc->stats->rx_drop);
-   if (!vc->rx)
+                        } else {
-   {
+                                skb_put(skb, len);
-      RXPRINTK("nicstar%d: SDU received on non-rx vc %d.%d.\n",
+                                dequeue_sm_buf(card, skb);
-             card->index, vpi, vci);
-      recycle_rx_buf(card, skb);
-      return;
-   }
-   vcc = vc->rx_vcc;
-   if (vcc->qos.aal == ATM_AAL0)
-   {
-      struct sk_buff *sb;
-      unsigned char *cell;
-      int i;
-      cell = skb->data;
-      for (i = ns_rsqe_cellcount(rsqe); i; i--)
-      {
-         if ((sb = dev_alloc_skb(NS_SMSKBSIZE)) == NULL)
-         {
-            printk("nicstar%d: Can't allocate buffers for aal0.\n",
-                   card->index);
-            atomic_add(i,&vcc->stats->rx_drop);
-            break;
-         }
-         if (!atm_charge(vcc, sb->truesize))
-         {
-            RXPRINTK("nicstar%d: atm_charge() dropped aal0 packets.\n",
-                     card->index);
-            atomic_add(i-1,&vcc->stats->rx_drop); /* already increased by 1 */
-            dev_kfree_skb_any(sb);
-            break;
-         }
-         /* Rebuild the header */
-         *((u32 *) sb->data) = le32_to_cpu(rsqe->word_1) << 4 |
-                               (ns_rsqe_clp(rsqe) ? 0x00000001 : 0x00000000);
-         if (i == 1 && ns_rsqe_eopdu(rsqe))
-            *((u32 *) sb->data) |= 0x00000002;
-         skb_put(sb, NS_AAL0_HEADER);
-         memcpy(skb_tail_pointer(sb), cell, ATM_CELL_PAYLOAD);
-         skb_put(sb, ATM_CELL_PAYLOAD);
-         ATM_SKB(sb)->vcc = vcc;
-         __net_timestamp(sb);
-         vcc->push(vcc, sb);
-         atomic_inc(&vcc->stats->rx);
-         cell += ATM_CELL_PAYLOAD;
-      }
-      recycle_rx_buf(card, skb);
-      return;
-   }
-   /* To reach this point, the AAL layer can only be AAL5 */
-   if ((iovb = vc->rx_iov) == NULL)
-   {
-      iovb = skb_dequeue(&(card->iovpool.queue));
-      if (iovb == NULL)         /* No buffers in the queue */
-      {
-         iovb = alloc_skb(NS_IOVBUFSIZE, GFP_ATOMIC);
-         if (iovb == NULL)
-         {
-            printk("nicstar%d: Out of iovec buffers.\n", card->index);
-            atomic_inc(&vcc->stats->rx_drop);
-            recycle_rx_buf(card, skb);
-            return;
-         }
-         NS_SKB_CB(iovb)->buf_type = BUF_NONE;
-      }
-      else
-         if (--card->iovpool.count < card->iovnr.min)
-         {
-            struct sk_buff *new_iovb;
-            if ((new_iovb = alloc_skb(NS_IOVBUFSIZE, GFP_ATOMIC)) != NULL)
-            {
-               NS_SKB_CB(iovb)->buf_type = BUF_NONE;
-               skb_queue_tail(&card->iovpool.queue, new_iovb);
-               card->iovpool.count++;
-            }
-         }
-      vc->rx_iov = iovb;
-      NS_SKB(iovb)->iovcnt = 0;
-      iovb->len = 0;
-      iovb->data = iovb->head;
-      skb_reset_tail_pointer(iovb);
-      NS_SKB(iovb)->vcc = vcc;
-      /* IMPORTANT: a pointer to the sk_buff containing the small or large
-                    buffer is stored as iovec base, NOT a pointer to the 
-                    small or large buffer itself. */
-   }
-   else if (NS_SKB(iovb)->iovcnt >= NS_MAX_IOVECS)
-   {
-      printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
-      atomic_inc(&vcc->stats->rx_err);
-      recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data, NS_MAX_IOVECS);
-      NS_SKB(iovb)->iovcnt = 0;
-      iovb->len = 0;
-      iovb->data = iovb->head;
-      skb_reset_tail_pointer(iovb);
-      NS_SKB(iovb)->vcc = vcc;
-   }
-   iov = &((struct iovec *) iovb->data)[NS_SKB(iovb)->iovcnt++];
-   iov->iov_base = (void *) skb;
-   iov->iov_len = ns_rsqe_cellcount(rsqe) * 48;
-   iovb->len += iov->iov_len;
-   if (NS_SKB(iovb)->iovcnt == 1)
-   {
-      if (NS_SKB_CB(skb)->buf_type != BUF_SM)
-      {
-         printk("nicstar%d: Expected a small buffer, and this is not one.\n",
-                card->index);
-         which_list(card, skb);
-         atomic_inc(&vcc->stats->rx_err);
-         recycle_rx_buf(card, skb);
-         vc->rx_iov = NULL;
-         recycle_iov_buf(card, iovb);
-         return;
-      }
-   }
-   else /* NS_SKB(iovb)->iovcnt >= 2 */
-   {
-      if (NS_SKB_CB(skb)->buf_type != BUF_LG)
-      {
-         printk("nicstar%d: Expected a large buffer, and this is not one.\n",
-                card->index);
-         which_list(card, skb);
-         atomic_inc(&vcc->stats->rx_err);
-         recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data,
-                               NS_SKB(iovb)->iovcnt);
-         vc->rx_iov = NULL;
-         recycle_iov_buf(card, iovb);
-         return;
-      }
-   }
-   if (ns_rsqe_eopdu(rsqe))
-   {
-      /* This works correctly regardless of the endianness of the host */
-      unsigned char *L1L2 = (unsigned char *)((u32)skb->data +
-                                              iov->iov_len - 6);
-      aal5_len = L1L2[0] << 8 | L1L2[1];
-      len = (aal5_len == 0x0000) ? 0x10000 : aal5_len;
-      if (ns_rsqe_crcerr(rsqe) ||
-          len + 8 > iovb->len || len + (47 + 8) < iovb->len)
-      {
-         printk("nicstar%d: AAL5 CRC error", card->index);
-         if (len + 8 > iovb->len || len + (47 + 8) < iovb->len)
-            printk(" - PDU size mismatch.\n");
-         else
-            printk(".\n");
-         atomic_inc(&vcc->stats->rx_err);
-         recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data,
-           NS_SKB(iovb)->iovcnt);
-         vc->rx_iov = NULL;
-         recycle_iov_buf(card, iovb);
-         return;
-      }
-      /* By this point we (hopefully) have a complete SDU without errors. */
-      if (NS_SKB(iovb)->iovcnt == 1)    /* Just a small buffer */
-      {
-         /* skb points to a small buffer */
-         if (!atm_charge(vcc, skb->truesize))
-         {
-            push_rxbufs(card, skb);
-            atomic_inc(&vcc->stats->rx_drop);
-         }
-         else
-         {
-            skb_put(skb, len);
-            dequeue_sm_buf(card, skb);
 #ifdef NS_USE_DESTRUCTORS
-            skb->destructor = ns_sb_destructor;
+                                skb->destructor = ns_sb_destructor;
 #endif /* NS_USE_DESTRUCTORS */
-            ATM_SKB(skb)->vcc = vcc;
+                                ATM_SKB(skb)->vcc = vcc;
-            __net_timestamp(skb);
+                                __net_timestamp(skb);
-            vcc->push(vcc, skb);
+                                vcc->push(vcc, skb);
-            atomic_inc(&vcc->stats->rx);
+                                atomic_inc(&vcc->stats->rx);
-         }
+                        }
-      }
+                } else if (NS_PRV_IOVCNT(iovb) == 2) {  /* One small plus one large buffer */
-      else if (NS_SKB(iovb)->iovcnt == 2)       /* One small plus one large buffer */
+                        struct sk_buff *sb;
-      {
-         struct sk_buff *sb;
+                        sb = (struct sk_buff *)(iov - 1)->iov_base;
+                        /* skb points to a large buffer */
-         sb = (struct sk_buff *) (iov - 1)->iov_base;
-         /* skb points to a large buffer */
+                        if (len <= NS_SMBUFSIZE) {
+                                if (!atm_charge(vcc, sb->truesize)) {
-         if (len <= NS_SMBUFSIZE)
+                                        push_rxbufs(card, sb);
-         {
+                                        atomic_inc(&vcc->stats->rx_drop);
-            if (!atm_charge(vcc, sb->truesize))
+                                } else {
-            {
+                                        skb_put(sb, len);
-               push_rxbufs(card, sb);
+                                        dequeue_sm_buf(card, sb);
-               atomic_inc(&vcc->stats->rx_drop);
-            }
-            else
-            {
-               skb_put(sb, len);
-               dequeue_sm_buf(card, sb);
 #ifdef NS_USE_DESTRUCTORS
-               sb->destructor = ns_sb_destructor;
+                                        sb->destructor = ns_sb_destructor;
 #endif /* NS_USE_DESTRUCTORS */
-               ATM_SKB(sb)->vcc = vcc;
+                                        ATM_SKB(sb)->vcc = vcc;
-               __net_timestamp(sb);
+                                        __net_timestamp(sb);
-               vcc->push(vcc, sb);
+                                        vcc->push(vcc, sb);
-               atomic_inc(&vcc->stats->rx);
+                                        atomic_inc(&vcc->stats->rx);
-            }
+                                }
-            push_rxbufs(card, skb);
+                                push_rxbufs(card, skb);
-         }
+                        } else {        /* len > NS_SMBUFSIZE, the usual case */
-         else                   /* len > NS_SMBUFSIZE, the usual case */
-         {
+                                if (!atm_charge(vcc, skb->truesize)) {
-            if (!atm_charge(vcc, skb->truesize))
+                                        push_rxbufs(card, skb);
-            {
+                                        atomic_inc(&vcc->stats->rx_drop);
-               push_rxbufs(card, skb);
+                                } else {
-               atomic_inc(&vcc->stats->rx_drop);
+                                        dequeue_lg_buf(card, skb);
-            }
-            else
-            {
-               dequeue_lg_buf(card, skb);
 #ifdef NS_USE_DESTRUCTORS
-               skb->destructor = ns_lb_destructor;
+                                        skb->destructor = ns_lb_destructor;
 #endif /* NS_USE_DESTRUCTORS */
-               skb_push(skb, NS_SMBUFSIZE);
+                                        skb_push(skb, NS_SMBUFSIZE);
-               skb_copy_from_linear_data(sb, skb->data, NS_SMBUFSIZE);
+                                        skb_copy_from_linear_data(sb, skb->data,
-               skb_put(skb, len - NS_SMBUFSIZE);
+                                                                  NS_SMBUFSIZE);
-               ATM_SKB(skb)->vcc = vcc;
+                                        skb_put(skb, len - NS_SMBUFSIZE);
-               __net_timestamp(skb);
+                                        ATM_SKB(skb)->vcc = vcc;
-               vcc->push(vcc, skb);
+                                        __net_timestamp(skb);
-               atomic_inc(&vcc->stats->rx);
+                                        vcc->push(vcc, skb);
-            }
+                                        atomic_inc(&vcc->stats->rx);
+                                }
-            push_rxbufs(card, sb);
+                                push_rxbufs(card, sb);
-         }
-         
+                        }
-      }
-      else                              /* Must push a huge buffer */
+                } else {        /* Must push a huge buffer */
-      {
-         struct sk_buff *hb, *sb, *lb;
+                        struct sk_buff *hb, *sb, *lb;
-         int remaining, tocopy;
+                        int remaining, tocopy;
-         int j;
+                        int j;
-         hb = skb_dequeue(&(card->hbpool.queue));
+                        hb = skb_dequeue(&(card->hbpool.queue));
-         if (hb == NULL)                /* No buffers in the queue */
+                        if (hb == NULL) {       /* No buffers in the queue */
-         {
+                                hb = dev_alloc_skb(NS_HBUFSIZE);
-            hb = dev_alloc_skb(NS_HBUFSIZE);
+                                if (hb == NULL) {
-            if (hb == NULL)
+                                        printk
-            {
+                                            ("nicstar%d: Out of huge buffers.\n",
-               printk("nicstar%d: Out of huge buffers.\n", card->index);
+                                             card->index);
-               atomic_inc(&vcc->stats->rx_drop);
+                                        atomic_inc(&vcc->stats->rx_drop);
-               recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data,
+                                        recycle_iovec_rx_bufs(card,
-                                     NS_SKB(iovb)->iovcnt);
+                                                              (struct iovec *)
-               vc->rx_iov = NULL;
+                                                              iovb->data,
-               recycle_iov_buf(card, iovb);
+                                                              NS_PRV_IOVCNT(iovb));
-               return;
+                                        vc->rx_iov = NULL;
-            }
+                                        recycle_iov_buf(card, iovb);
-            else if (card->hbpool.count < card->hbnr.min)
+                                        return;
-            {
+                                } else if (card->hbpool.count < card->hbnr.min) {
-               struct sk_buff *new_hb;
+                                        struct sk_buff *new_hb;
-               if ((new_hb = dev_alloc_skb(NS_HBUFSIZE)) != NULL)
+                                        if ((new_hb =
-               {
+                                             dev_alloc_skb(NS_HBUFSIZE)) !=
-                  skb_queue_tail(&card->hbpool.queue, new_hb);
+                                            NULL) {
-                  card->hbpool.count++;
+                                                skb_queue_tail(&card->hbpool.
-               }
+                                                               queue, new_hb);
-            }
+                                                card->hbpool.count++;
-            NS_SKB_CB(hb)->buf_type = BUF_NONE;
+                                        }
-         }
+                                }
-         else
+                                NS_PRV_BUFTYPE(hb) = BUF_NONE;
-         if (--card->hbpool.count < card->hbnr.min)
+                        } else if (--card->hbpool.count < card->hbnr.min) {
-         {
+                                struct sk_buff *new_hb;
-            struct sk_buff *new_hb;
+                                if ((new_hb =
-            if ((new_hb = dev_alloc_skb(NS_HBUFSIZE)) != NULL)
+                                     dev_alloc_skb(NS_HBUFSIZE)) != NULL) {
-            {
+                                        NS_PRV_BUFTYPE(new_hb) = BUF_NONE;
-               NS_SKB_CB(new_hb)->buf_type = BUF_NONE;
+                                        skb_queue_tail(&card->hbpool.queue,
-               skb_queue_tail(&card->hbpool.queue, new_hb);
+                                                       new_hb);
-               card->hbpool.count++;
+                                        card->hbpool.count++;
-            }
+                                }
-            if (card->hbpool.count < card->hbnr.min)
+                                if (card->hbpool.count < card->hbnr.min) {
-            {
+                                        if ((new_hb =
-               if ((new_hb = dev_alloc_skb(NS_HBUFSIZE)) != NULL)
+                                             dev_alloc_skb(NS_HBUFSIZE)) !=
-               {
+                                            NULL) {
-                  NS_SKB_CB(new_hb)->buf_type = BUF_NONE;
+                                                NS_PRV_BUFTYPE(new_hb) =
-                  skb_queue_tail(&card->hbpool.queue, new_hb);
+                                                    BUF_NONE;
-                  card->hbpool.count++;
+                                                skb_queue_tail(&card->hbpool.
-               }
+                                                               queue, new_hb);
-            }
+                                                card->hbpool.count++;
-         }
+                                        }
+                                }
-         iov = (struct iovec *) iovb->data;
+                        }
-         if (!atm_charge(vcc, hb->truesize))
+                        iov = (struct iovec *)iovb->data;
-         {
-            recycle_iovec_rx_bufs(card, iov, NS_SKB(iovb)->iovcnt);
+                        if (!atm_charge(vcc, hb->truesize)) {
-            if (card->hbpool.count < card->hbnr.max)
+                                recycle_iovec_rx_bufs(card, iov,
-            {
+                                                      NS_PRV_IOVCNT(iovb));
-               skb_queue_tail(&card->hbpool.queue, hb);
+                                if (card->hbpool.count < card->hbnr.max) {
-               card->hbpool.count++;
+                                        skb_queue_tail(&card->hbpool.queue, hb);
-            }
+                                        card->hbpool.count++;
-            else
+                                } else
-               dev_kfree_skb_any(hb);
+                                        dev_kfree_skb_any(hb);
-            atomic_inc(&vcc->stats->rx_drop);
+                                atomic_inc(&vcc->stats->rx_drop);
-         }
+                        } else {
-         else
+                                /* Copy the small buffer to the huge buffer */
-         {
+                                sb = (struct sk_buff *)iov->iov_base;
-            /* Copy the small buffer to the huge buffer */
+                                skb_copy_from_linear_data(sb, hb->data,
-            sb = (struct sk_buff *) iov->iov_base;
+                                                          iov->iov_len);
-            skb_copy_from_linear_data(sb, hb->data, iov->iov_len);
+                                skb_put(hb, iov->iov_len);
-            skb_put(hb, iov->iov_len);
+                                remaining = len - iov->iov_len;
-            remaining = len - iov->iov_len;
+                                iov++;
-            iov++;
+                                /* Free the small buffer */
-            /* Free the small buffer */
+                                push_rxbufs(card, sb);
-            push_rxbufs(card, sb);
+                                /* Copy all large buffers to the huge buffer and free them */
-            /* Copy all large buffers to the huge buffer and free them */
+                                for (j = 1; j < NS_PRV_IOVCNT(iovb); j++) {
-            for (j = 1; j < NS_SKB(iovb)->iovcnt; j++)
+                                        lb = (struct sk_buff *)iov->iov_base;
-            {
+                                        tocopy =
-               lb = (struct sk_buff *) iov->iov_base;
+                                            min_t(int, remaining, iov->iov_len);
-               tocopy = min_t(int, remaining, iov->iov_len);
+                                        skb_copy_from_linear_data(lb,
-               skb_copy_from_linear_data(lb, skb_tail_pointer(hb), tocopy);
+                                                                  skb_tail_pointer
-               skb_put(hb, tocopy);
+                                                                  (hb), tocopy);
-               iov++;
+                                        skb_put(hb, tocopy);
-               remaining -= tocopy;
+                                        iov++;
-               push_rxbufs(card, lb);
+                                        remaining -= tocopy;
-            }
+                                        push_rxbufs(card, lb);
+                                }
 #ifdef EXTRA_DEBUG
-            if (remaining != 0 || hb->len != len)
+                                if (remaining != 0 || hb->len != len)
-               printk("nicstar%d: Huge buffer len mismatch.\n", card->index);
+                                        printk
+                                            ("nicstar%d: Huge buffer len mismatch.\n",
+                                             card->index);
 #endif /* EXTRA_DEBUG */
-            ATM_SKB(hb)->vcc = vcc;
+                                ATM_SKB(hb)->vcc = vcc;
 #ifdef NS_USE_DESTRUCTORS
-            hb->destructor = ns_hb_destructor;
+                                hb->destructor = ns_hb_destructor;
 #endif /* NS_USE_DESTRUCTORS */
-            __net_timestamp(hb);
+                                __net_timestamp(hb);
-            vcc->push(vcc, hb);
+                                vcc->push(vcc, hb);
-            atomic_inc(&vcc->stats->rx);
+                                atomic_inc(&vcc->stats->rx);
-         }
+                        }
-      }
+                }
-      vc->rx_iov = NULL;
+                vc->rx_iov = NULL;
-      recycle_iov_buf(card, iovb);
+                recycle_iov_buf(card, iovb);
-   }
+        }
 }
 #ifdef NS_USE_DESTRUCTORS
 static void ns_sb_destructor(struct sk_buff *sb)
 {
-   ns_dev *card;
+        ns_dev *card;
-   u32 stat;
+        u32 stat;
-   card = (ns_dev *) ATM_SKB(sb)->vcc->dev->dev_data;
+        card = (ns_dev *) ATM_SKB(sb)->vcc->dev->dev_data;
-   stat = readl(card->membase + STAT);
+        stat = readl(card->membase + STAT);
-   card->sbfqc = ns_stat_sfbqc_get(stat);   
+        card->sbfqc = ns_stat_sfbqc_get(stat);
-   card->lbfqc = ns_stat_lfbqc_get(stat);
+        card->lbfqc = ns_stat_lfbqc_get(stat);
-   do
+        do {
-   {
+                sb = __dev_alloc_skb(NS_SMSKBSIZE, GFP_KERNEL);
-      sb = __dev_alloc_skb(NS_SMSKBSIZE, GFP_KERNEL);
+                if (sb == NULL)
-      if (sb == NULL)
+                        break;
-         break;
+                NS_PRV_BUFTYPE(sb) = BUF_SM;
-      NS_SKB_CB(sb)->buf_type = BUF_SM;
+                skb_queue_tail(&card->sbpool.queue, sb);
-      skb_queue_tail(&card->sbpool.queue, sb);
+                skb_reserve(sb, NS_AAL0_HEADER);
-      skb_reserve(sb, NS_AAL0_HEADER);
+                push_rxbufs(card, sb);
-      push_rxbufs(card, sb);
+        } while (card->sbfqc < card->sbnr.min);
-   } while (card->sbfqc < card->sbnr.min);
 }
 static void ns_lb_destructor(struct sk_buff *lb)
 {
-   ns_dev *card;
+        ns_dev *card;
-   u32 stat;
+        u32 stat;
-   card = (ns_dev *) ATM_SKB(lb)->vcc->dev->dev_data;
+        card = (ns_dev *) ATM_SKB(lb)->vcc->dev->dev_data;
-   stat = readl(card->membase + STAT);
+        stat = readl(card->membase + STAT);
-   card->sbfqc = ns_stat_sfbqc_get(stat);   
+        card->sbfqc = ns_stat_sfbqc_get(stat);
-   card->lbfqc = ns_stat_lfbqc_get(stat);
+        card->lbfqc = ns_stat_lfbqc_get(stat);
-   do
+        do {
-   {
+                lb = __dev_alloc_skb(NS_LGSKBSIZE, GFP_KERNEL);
-      lb = __dev_alloc_skb(NS_LGSKBSIZE, GFP_KERNEL);
+                if (lb == NULL)
-      if (lb == NULL)
+                        break;
-         break;
+                NS_PRV_BUFTYPE(lb) = BUF_LG;
-      NS_SKB_CB(lb)->buf_type = BUF_LG;
+                skb_queue_tail(&card->lbpool.queue, lb);
-      skb_queue_tail(&card->lbpool.queue, lb);
+                skb_reserve(lb, NS_SMBUFSIZE);
-      skb_reserve(lb, NS_SMBUFSIZE);
+                push_rxbufs(card, lb);
-      push_rxbufs(card, lb);
+        } while (card->lbfqc < card->lbnr.min);
-   } while (card->lbfqc < card->lbnr.min);
 }
 static void ns_hb_destructor(struct sk_buff *hb)
 {
-   ns_dev *card;
+        ns_dev *card;
-   card = (ns_dev *) ATM_SKB(hb)->vcc->dev->dev_data;
+        card = (ns_dev *) ATM_SKB(hb)->vcc->dev->dev_data;
-   while (card->hbpool.count < card->hbnr.init)
+        while (card->hbpool.count < card->hbnr.init) {
-   {
+                hb = __dev_alloc_skb(NS_HBUFSIZE, GFP_KERNEL);
-      hb = __dev_alloc_skb(NS_HBUFSIZE, GFP_KERNEL);
+                if (hb == NULL)
-      if (hb == NULL)
+                        break;
-         break;
+                NS_PRV_BUFTYPE(hb) = BUF_NONE;
-      NS_SKB_CB(hb)->buf_type = BUF_NONE;
+                skb_queue_tail(&card->hbpool.queue, hb);
-      skb_queue_tail(&card->hbpool.queue, hb);
+                card->hbpool.count++;
-      card->hbpool.count++;
+        }
-   }
 }
 #endif /* NS_USE_DESTRUCTORS */
+static void recycle_rx_buf(ns_dev * card, struct sk_buff *skb)
-static void recycle_rx_buf(ns_dev *card, struct sk_buff *skb)
 {
-        struct ns_skb_cb *cb = NS_SKB_CB(skb);
+        if (unlikely(NS_PRV_BUFTYPE(skb) == BUF_NONE)) {
+                printk("nicstar%d: What kind of rx buffer is this?\n",
-        if (unlikely(cb->buf_type == BUF_NONE)) {
+                       card->index);
-                printk("nicstar%d: What kind of rx buffer is this?\n", card->index);
                dev_kfree_skb_any(skb);
        } else
                push_rxbufs(card, skb);
 }
+static void recycle_iovec_rx_bufs(ns_dev * card, struct iovec *iov, int count)
-static void recycle_iovec_rx_bufs(ns_dev *card, struct iovec *iov, int count)
 {
        while (count-- > 0)
-                recycle_rx_buf(card, (struct sk_buff *) (iov++)->iov_base);
+                recycle_rx_buf(card, (struct sk_buff *)(iov++)->iov_base);
 }
+static void recycle_iov_buf(ns_dev * card, struct sk_buff *iovb)
-static void recycle_iov_buf(ns_dev *card, struct sk_buff *iovb)
 {
-   if (card->iovpool.count < card->iovnr.max)
+        if (card->iovpool.count < card->iovnr.max) {
-   {
+                skb_queue_tail(&card->iovpool.queue, iovb);
-      skb_queue_tail(&card->iovpool.queue, iovb);
+                card->iovpool.count++;
-      card->iovpool.count++;
+        } else
-   }
+                dev_kfree_skb_any(iovb);
-   else
-      dev_kfree_skb_any(iovb);
 }
+static void dequeue_sm_buf(ns_dev * card, struct sk_buff *sb)
-static void dequeue_sm_buf(ns_dev *card, struct sk_buff *sb)
 {
-   skb_unlink(sb, &card->sbpool.queue);
+        skb_unlink(sb, &card->sbpool.queue);
 #ifdef NS_USE_DESTRUCTORS
-   if (card->sbfqc < card->sbnr.min)
+        if (card->sbfqc < card->sbnr.min)
 #else
-   if (card->sbfqc < card->sbnr.init)
+        if (card->sbfqc < card->sbnr.init) {
-   {
+                struct sk_buff *new_sb;
-      struct sk_buff *new_sb;
+                if ((new_sb = dev_alloc_skb(NS_SMSKBSIZE)) != NULL) {
-      if ((new_sb = dev_alloc_skb(NS_SMSKBSIZE)) != NULL)
+                        NS_PRV_BUFTYPE(new_sb) = BUF_SM;
-      {
+                        skb_queue_tail(&card->sbpool.queue, new_sb);
-         NS_SKB_CB(new_sb)->buf_type = BUF_SM;
+                        skb_reserve(new_sb, NS_AAL0_HEADER);
-         skb_queue_tail(&card->sbpool.queue, new_sb);
+                        push_rxbufs(card, new_sb);
-         skb_reserve(new_sb, NS_AAL0_HEADER);
+                }
-         push_rxbufs(card, new_sb);
+        }
-      }
+        if (card->sbfqc < card->sbnr.init)
-   }
-   if (card->sbfqc < card->sbnr.init)
 #endif /* NS_USE_DESTRUCTORS */
-   {
+        {
-      struct sk_buff *new_sb;
+                struct sk_buff *new_sb;
-      if ((new_sb = dev_alloc_skb(NS_SMSKBSIZE)) != NULL)
+                if ((new_sb = dev_alloc_skb(NS_SMSKBSIZE)) != NULL) {
-      {
+                        NS_PRV_BUFTYPE(new_sb) = BUF_SM;
-         NS_SKB_CB(new_sb)->buf_type = BUF_SM;
+                        skb_queue_tail(&card->sbpool.queue, new_sb);
-         skb_queue_tail(&card->sbpool.queue, new_sb);
+                        skb_reserve(new_sb, NS_AAL0_HEADER);
-         skb_reserve(new_sb, NS_AAL0_HEADER);
+                        push_rxbufs(card, new_sb);
-         push_rxbufs(card, new_sb);
+                }
-      }
+        }
-   }
 }
+static void dequeue_lg_buf(ns_dev * card, struct sk_buff *lb)
-static void dequeue_lg_buf(ns_dev *card, struct sk_buff *lb)
 {
-   skb_unlink(lb, &card->lbpool.queue);
+        skb_unlink(lb, &card->lbpool.queue);
 #ifdef NS_USE_DESTRUCTORS
-   if (card->lbfqc < card->lbnr.min)
+        if (card->lbfqc < card->lbnr.min)
 #else
-   if (card->lbfqc < card->lbnr.init)
+        if (card->lbfqc < card->lbnr.init) {
-   {
+                struct sk_buff *new_lb;
-      struct sk_buff *new_lb;
+                if ((new_lb = dev_alloc_skb(NS_LGSKBSIZE)) != NULL) {
-      if ((new_lb = dev_alloc_skb(NS_LGSKBSIZE)) != NULL)
+                        NS_PRV_BUFTYPE(new_lb) = BUF_LG;
-      {
+                        skb_queue_tail(&card->lbpool.queue, new_lb);
-         NS_SKB_CB(new_lb)->buf_type = BUF_LG;
+                        skb_reserve(new_lb, NS_SMBUFSIZE);
-         skb_queue_tail(&card->lbpool.queue, new_lb);
+                        push_rxbufs(card, new_lb);
-         skb_reserve(new_lb, NS_SMBUFSIZE);
+                }
-         push_rxbufs(card, new_lb);
+        }
-      }
+        if (card->lbfqc < card->lbnr.init)
-   }
-   if (card->lbfqc < card->lbnr.init)
 #endif /* NS_USE_DESTRUCTORS */
-   {
+        {
-      struct sk_buff *new_lb;
+                struct sk_buff *new_lb;
-      if ((new_lb = dev_alloc_skb(NS_LGSKBSIZE)) != NULL)
+                if ((new_lb = dev_alloc_skb(NS_LGSKBSIZE)) != NULL) {
-      {
+                        NS_PRV_BUFTYPE(new_lb) = BUF_LG;
-         NS_SKB_CB(new_lb)->buf_type = BUF_LG;
+                        skb_queue_tail(&card->lbpool.queue, new_lb);
-         skb_queue_tail(&card->lbpool.queue, new_lb);
+                        skb_reserve(new_lb, NS_SMBUFSIZE);
-         skb_reserve(new_lb, NS_SMBUFSIZE);
+                        push_rxbufs(card, new_lb);
-         push_rxbufs(card, new_lb);
+                }
-      }
+        }
-   }
 }
+static int ns_proc_read(struct atm_dev *dev, loff_t * pos, char *page)
-static int ns_proc_read(struct atm_dev *dev, loff_t *pos, char *page)
 {
-   u32 stat;
+        u32 stat;
-   ns_dev *card;
+        ns_dev *card;
-   int left;
+        int left;
-   left = (int) *pos;
+        left = (int)*pos;
-   card = (ns_dev *) dev->dev_data;
+        card = (ns_dev *) dev->dev_data;
-   stat = readl(card->membase + STAT);
+        stat = readl(card->membase + STAT);
-   if (!left--)
+        if (!left--)
-      return sprintf(page, "Pool   count    min   init    max \n");
+                return sprintf(page, "Pool   count    min   init    max \n");
-   if (!left--)
+        if (!left--)
-      return sprintf(page, "Small  %5d  %5d  %5d  %5d \n",
+                return sprintf(page, "Small  %5d  %5d  %5d  %5d \n",
-                     ns_stat_sfbqc_get(stat), card->sbnr.min, card->sbnr.init,
+                               ns_stat_sfbqc_get(stat), card->sbnr.min,
-                     card->sbnr.max);
+                               card->sbnr.init, card->sbnr.max);
-   if (!left--)
+        if (!left--)
-      return sprintf(page, "Large  %5d  %5d  %5d  %5d \n",
+                return sprintf(page, "Large  %5d  %5d  %5d  %5d \n",
-                     ns_stat_lfbqc_get(stat), card->lbnr.min, card->lbnr.init,
+                               ns_stat_lfbqc_get(stat), card->lbnr.min,
-                     card->lbnr.max);
+                               card->lbnr.init, card->lbnr.max);
-   if (!left--)
+        if (!left--)
-      return sprintf(page, "Huge   %5d  %5d  %5d  %5d \n", card->hbpool.count,
+                return sprintf(page, "Huge   %5d  %5d  %5d  %5d \n",
-                     card->hbnr.min, card->hbnr.init, card->hbnr.max);
+                               card->hbpool.count, card->hbnr.min,
-   if (!left--)
+                               card->hbnr.init, card->hbnr.max);
-      return sprintf(page, "Iovec  %5d  %5d  %5d  %5d \n", card->iovpool.count,
+        if (!left--)
-                     card->iovnr.min, card->iovnr.init, card->iovnr.max);
+                return sprintf(page, "Iovec  %5d  %5d  %5d  %5d \n",
-   if (!left--)
+                               card->iovpool.count, card->iovnr.min,
-   {
+                               card->iovnr.init, card->iovnr.max);
-      int retval;
+        if (!left--) {
-      retval = sprintf(page, "Interrupt counter: %u \n", card->intcnt);
+                int retval;
-      card->intcnt = 0;
+                retval =
-      return retval;
+                    sprintf(page, "Interrupt counter: %u \n", card->intcnt);
-   }
+                card->intcnt = 0;
+                return retval;
+        }
 #if 0
-   /* Dump 25.6 Mbps PHY registers */
+        /* Dump 25.6 Mbps PHY registers */
-   /* Now there's a 25.6 Mbps PHY driver this code isn't needed. I left it
+        /* Now there's a 25.6 Mbps PHY driver this code isn't needed. I left it
-      here just in case it's needed for debugging. */
+           here just in case it's needed for debugging. */
-   if (card->max_pcr == ATM_25_PCR && !left--)
+        if (card->max_pcr == ATM_25_PCR && !left--) {
-   {
+                u32 phy_regs[4];
-      u32 phy_regs[4];
+                u32 i;
-      u32 i;
+                for (i = 0; i < 4; i++) {
-      for (i = 0; i < 4; i++)
+                        while (CMD_BUSY(card)) ;
-      {
+                        writel(NS_CMD_READ_UTILITY | 0x00000200 | i,
-         while (CMD_BUSY(card));
+                               card->membase + CMD);
-         writel(NS_CMD_READ_UTILITY | 0x00000200 | i, card->membase + CMD);
+                        while (CMD_BUSY(card)) ;
-         while (CMD_BUSY(card));
+                        phy_regs[i] = readl(card->membase + DR0) & 0x000000FF;
-         phy_regs[i] = readl(card->membase + DR0) & 0x000000FF;
+                }
-      }
+                return sprintf(page, "PHY regs: 0x%02X 0x%02X 0x%02X 0x%02X \n",
-      return sprintf(page, "PHY regs: 0x%02X 0x%02X 0x%02X 0x%02X \n",
+                               phy_regs[0], phy_regs[1], phy_regs[2],
-                     phy_regs[0], phy_regs[1], phy_regs[2], phy_regs[3]);
+                               phy_regs[3]);
-   }
+        }
 #endif /* 0 - Dump 25.6 Mbps PHY registers */
 #if 0
-   /* Dump TST */
+        /* Dump TST */
-   if (left-- < NS_TST_NUM_ENTRIES)
+        if (left-- < NS_TST_NUM_ENTRIES) {
-   {
+                if (card->tste2vc[left + 1] == NULL)
-      if (card->tste2vc[left + 1] == NULL)
+                        return sprintf(page, "%5d - VBR/UBR \n", left + 1);
-         return sprintf(page, "%5d - VBR/UBR \n", left + 1);
+                else
-      else
+                        return sprintf(page, "%5d - %d %d \n", left + 1,
-         return sprintf(page, "%5d - %d %d \n", left + 1,
+                                       card->tste2vc[left + 1]->tx_vcc->vpi,
-                        card->tste2vc[left + 1]->tx_vcc->vpi,
+                                       card->tste2vc[left + 1]->tx_vcc->vci);
-                        card->tste2vc[left + 1]->tx_vcc->vci);
+        }
-   }
 #endif /* 0 */
-   return 0;
+        return 0;
 }
+static int ns_ioctl(struct atm_dev *dev, unsigned int cmd, void __user * arg)
-static int ns_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
 {
-   ns_dev *card;
+        ns_dev *card;
-   pool_levels pl;
+        pool_levels pl;
-   long btype;
+        long btype;
-   unsigned long flags;
+        unsigned long flags;
-   card = dev->dev_data;
+        card = dev->dev_data;
-   switch (cmd)
+        switch (cmd) {
-   {
+        case NS_GETPSTAT:
-      case NS_GETPSTAT:
+                if (get_user
-         if (get_user(pl.buftype, &((pool_levels __user *) arg)->buftype))
+                    (pl.buftype, &((pool_levels __user *) arg)->buftype))
-            return -EFAULT;
+                        return -EFAULT;
-         switch (pl.buftype)
+                switch (pl.buftype) {
-         {
+                case NS_BUFTYPE_SMALL:
-            case NS_BUFTYPE_SMALL:
+                        pl.count =
-               pl.count = ns_stat_sfbqc_get(readl(card->membase + STAT));
+                            ns_stat_sfbqc_get(readl(card->membase + STAT));
-               pl.level.min = card->sbnr.min;
+                        pl.level.min = card->sbnr.min;
-               pl.level.init = card->sbnr.init;
+                        pl.level.init = card->sbnr.init;
-               pl.level.max = card->sbnr.max;
+                        pl.level.max = card->sbnr.max;
-               break;
+                        break;
-            case NS_BUFTYPE_LARGE:
+                case NS_BUFTYPE_LARGE:
-               pl.count = ns_stat_lfbqc_get(readl(card->membase + STAT));
+                        pl.count =
-               pl.level.min = card->lbnr.min;
+                            ns_stat_lfbqc_get(readl(card->membase + STAT));
-               pl.level.init = card->lbnr.init;
+                        pl.level.min = card->lbnr.min;
-               pl.level.max = card->lbnr.max;
+                        pl.level.init = card->lbnr.init;
-               break;
+                        pl.level.max = card->lbnr.max;
+                        break;
-            case NS_BUFTYPE_HUGE:
-               pl.count = card->hbpool.count;
+                case NS_BUFTYPE_HUGE:
-               pl.level.min = card->hbnr.min;
+                        pl.count = card->hbpool.count;
-               pl.level.init = card->hbnr.init;
+                        pl.level.min = card->hbnr.min;
-               pl.level.max = card->hbnr.max;
+                        pl.level.init = card->hbnr.init;
-               break;
+                        pl.level.max = card->hbnr.max;
+                        break;
-            case NS_BUFTYPE_IOVEC:
-               pl.count = card->iovpool.count;
+                case NS_BUFTYPE_IOVEC:
-               pl.level.min = card->iovnr.min;
+                        pl.count = card->iovpool.count;
-               pl.level.init = card->iovnr.init;
+                        pl.level.min = card->iovnr.min;
-               pl.level.max = card->iovnr.max;
+                        pl.level.init = card->iovnr.init;
-               break;
+                        pl.level.max = card->iovnr.max;
+                        break;
-            default:
-               return -ENOIOCTLCMD;
+                default:
+                        return -ENOIOCTLCMD;
-         }
-         if (!copy_to_user((pool_levels __user *) arg, &pl, sizeof(pl)))
+                }
-            return (sizeof(pl));
+                if (!copy_to_user((pool_levels __user *) arg, &pl, sizeof(pl)))
-         else
+                        return (sizeof(pl));
-            return -EFAULT;
+                else
+                        return -EFAULT;
-      case NS_SETBUFLEV:
-         if (!capable(CAP_NET_ADMIN))
+        case NS_SETBUFLEV:
-            return -EPERM;
+                if (!capable(CAP_NET_ADMIN))
-         if (copy_from_user(&pl, (pool_levels __user *) arg, sizeof(pl)))
+                        return -EPERM;
-            return -EFAULT;
+                if (copy_from_user(&pl, (pool_levels __user *) arg, sizeof(pl)))
-         if (pl.level.min >= pl.level.init || pl.level.init >= pl.level.max)
+                        return -EFAULT;
-            return -EINVAL;
+                if (pl.level.min >= pl.level.init
-         if (pl.level.min == 0)
+                    || pl.level.init >= pl.level.max)
-            return -EINVAL;
+                        return -EINVAL;
-         switch (pl.buftype)
+                if (pl.level.min == 0)
-         {
+                        return -EINVAL;
-            case NS_BUFTYPE_SMALL:
+                switch (pl.buftype) {
-               if (pl.level.max > TOP_SB)
+                case NS_BUFTYPE_SMALL:
-                  return -EINVAL;
+                        if (pl.level.max > TOP_SB)
-               card->sbnr.min = pl.level.min;
+                                return -EINVAL;
-               card->sbnr.init = pl.level.init;
+                        card->sbnr.min = pl.level.min;
-               card->sbnr.max = pl.level.max;
+                        card->sbnr.init = pl.level.init;
-               break;
+                        card->sbnr.max = pl.level.max;
+                        break;
-            case NS_BUFTYPE_LARGE:
-               if (pl.level.max > TOP_LB)
+                case NS_BUFTYPE_LARGE:
-                  return -EINVAL;
+                        if (pl.level.max > TOP_LB)
-               card->lbnr.min = pl.level.min;
+                                return -EINVAL;
-               card->lbnr.init = pl.level.init;
+                        card->lbnr.min = pl.level.min;
-               card->lbnr.max = pl.level.max;
+                        card->lbnr.init = pl.level.init;
-               break;
+                        card->lbnr.max = pl.level.max;
+                        break;
-            case NS_BUFTYPE_HUGE:
-               if (pl.level.max > TOP_HB)
+                case NS_BUFTYPE_HUGE:
-                  return -EINVAL;
+                        if (pl.level.max > TOP_HB)
-               card->hbnr.min = pl.level.min;
+                                return -EINVAL;
-               card->hbnr.init = pl.level.init;
+                        card->hbnr.min = pl.level.min;
-               card->hbnr.max = pl.level.max;
+                        card->hbnr.init = pl.level.init;
-               break;
+                        card->hbnr.max = pl.level.max;
+                        break;
-            case NS_BUFTYPE_IOVEC:
-               if (pl.level.max > TOP_IOVB)
+                case NS_BUFTYPE_IOVEC:
-                  return -EINVAL;
+                        if (pl.level.max > TOP_IOVB)
-               card->iovnr.min = pl.level.min;
+                                return -EINVAL;
-               card->iovnr.init = pl.level.init;
+                        card->iovnr.min = pl.level.min;
-               card->iovnr.max = pl.level.max;
+                        card->iovnr.init = pl.level.init;
-               break;
+                        card->iovnr.max = pl.level.max;
+                        break;
-            default:
-               return -EINVAL;
+                default:
+                        return -EINVAL;
-         }       
-         return 0;
+                }
+                return 0;
-      case NS_ADJBUFLEV:
-         if (!capable(CAP_NET_ADMIN))
+        case NS_ADJBUFLEV:
-            return -EPERM;
+                if (!capable(CAP_NET_ADMIN))
-         btype = (long) arg;    /* a long is the same size as a pointer or bigger */
+                        return -EPERM;
-         switch (btype)
+                btype = (long)arg;      /* a long is the same size as a pointer or bigger */
-         {
+                switch (btype) {
-            case NS_BUFTYPE_SMALL:
+                case NS_BUFTYPE_SMALL:
-               while (card->sbfqc < card->sbnr.init)
+                        while (card->sbfqc < card->sbnr.init) {
-               {
+                                struct sk_buff *sb;
-                  struct sk_buff *sb;
+                                sb = __dev_alloc_skb(NS_SMSKBSIZE, GFP_KERNEL);
-                  sb = __dev_alloc_skb(NS_SMSKBSIZE, GFP_KERNEL);
+                                if (sb == NULL)
-                  if (sb == NULL)
+                                        return -ENOMEM;
-                     return -ENOMEM;
+                                NS_PRV_BUFTYPE(sb) = BUF_SM;
-                  NS_SKB_CB(sb)->buf_type = BUF_SM;
+                                skb_queue_tail(&card->sbpool.queue, sb);
-                  skb_queue_tail(&card->sbpool.queue, sb);
+                                skb_reserve(sb, NS_AAL0_HEADER);
-                  skb_reserve(sb, NS_AAL0_HEADER);
+                                push_rxbufs(card, sb);
-                  push_rxbufs(card, sb);
+                        }
-               }
+                        break;
-               break;
+                case NS_BUFTYPE_LARGE:
-            case NS_BUFTYPE_LARGE:
+                        while (card->lbfqc < card->lbnr.init) {
-               while (card->lbfqc < card->lbnr.init)
+                                struct sk_buff *lb;
-               {
-                  struct sk_buff *lb;
+                                lb = __dev_alloc_skb(NS_LGSKBSIZE, GFP_KERNEL);
+                                if (lb == NULL)
-                  lb = __dev_alloc_skb(NS_LGSKBSIZE, GFP_KERNEL);
+                                        return -ENOMEM;
-                  if (lb == NULL)
+                                NS_PRV_BUFTYPE(lb) = BUF_LG;
-                     return -ENOMEM;
+                                skb_queue_tail(&card->lbpool.queue, lb);
-                  NS_SKB_CB(lb)->buf_type = BUF_LG;
+                                skb_reserve(lb, NS_SMBUFSIZE);
-                  skb_queue_tail(&card->lbpool.queue, lb);
+                                push_rxbufs(card, lb);
-                  skb_reserve(lb, NS_SMBUFSIZE);
+                        }
-                  push_rxbufs(card, lb);
+                        break;
-               }
-               break;
+                case NS_BUFTYPE_HUGE:
+                        while (card->hbpool.count > card->hbnr.init) {
-            case NS_BUFTYPE_HUGE:
+                                struct sk_buff *hb;
-               while (card->hbpool.count > card->hbnr.init)
-               {
+                                spin_lock_irqsave(&card->int_lock, flags);
-                  struct sk_buff *hb;
+                                hb = skb_dequeue(&card->hbpool.queue);
+                                card->hbpool.count--;
-                  spin_lock_irqsave(&card->int_lock, flags);
+                                spin_unlock_irqrestore(&card->int_lock, flags);
-                  hb = skb_dequeue(&card->hbpool.queue);
+                                if (hb == NULL)
-                  card->hbpool.count--;
+                                        printk
-                  spin_unlock_irqrestore(&card->int_lock, flags);
+                                            ("nicstar%d: huge buffer count inconsistent.\n",
-                  if (hb == NULL)
+                                             card->index);
-                     printk("nicstar%d: huge buffer count inconsistent.\n",
+                                else
-                            card->index);
+                                        dev_kfree_skb_any(hb);
-                  else
-                     dev_kfree_skb_any(hb);
+                        }
-                  
+                        while (card->hbpool.count < card->hbnr.init) {
-               }
+                                struct sk_buff *hb;
-               while (card->hbpool.count < card->hbnr.init)
-               {
+                                hb = __dev_alloc_skb(NS_HBUFSIZE, GFP_KERNEL);
-                  struct sk_buff *hb;
+                                if (hb == NULL)
+                                        return -ENOMEM;
-                  hb = __dev_alloc_skb(NS_HBUFSIZE, GFP_KERNEL);
+                                NS_PRV_BUFTYPE(hb) = BUF_NONE;
-                  if (hb == NULL)
+                                spin_lock_irqsave(&card->int_lock, flags);
-                     return -ENOMEM;
+                                skb_queue_tail(&card->hbpool.queue, hb);
-                  NS_SKB_CB(hb)->buf_type = BUF_NONE;
+                                card->hbpool.count++;
-                  spin_lock_irqsave(&card->int_lock, flags);
+                                spin_unlock_irqrestore(&card->int_lock, flags);
-                  skb_queue_tail(&card->hbpool.queue, hb);
+                        }
-                  card->hbpool.count++;
+                        break;
-                  spin_unlock_irqrestore(&card->int_lock, flags);
-               }
+                case NS_BUFTYPE_IOVEC:
-               break;
+                        while (card->iovpool.count > card->iovnr.init) {
+                                struct sk_buff *iovb;
-            case NS_BUFTYPE_IOVEC:
-               while (card->iovpool.count > card->iovnr.init)
+                                spin_lock_irqsave(&card->int_lock, flags);
-               {
+                                iovb = skb_dequeue(&card->iovpool.queue);
-                  struct sk_buff *iovb;
+                                card->iovpool.count--;
+                                spin_unlock_irqrestore(&card->int_lock, flags);
-                  spin_lock_irqsave(&card->int_lock, flags);
+                                if (iovb == NULL)
-                  iovb = skb_dequeue(&card->iovpool.queue);
+                                        printk
-                  card->iovpool.count--;
+                                            ("nicstar%d: iovec buffer count inconsistent.\n",
-                  spin_unlock_irqrestore(&card->int_lock, flags);
+                                             card->index);
-                  if (iovb == NULL)
+                                else
-                     printk("nicstar%d: iovec buffer count inconsistent.\n",
+                                        dev_kfree_skb_any(iovb);
-                            card->index);
-                  else
+                        }
-                     dev_kfree_skb_any(iovb);
+                        while (card->iovpool.count < card->iovnr.init) {
+                                struct sk_buff *iovb;
-               }
-               while (card->iovpool.count < card->iovnr.init)
+                                iovb = alloc_skb(NS_IOVBUFSIZE, GFP_KERNEL);
-               {
+                                if (iovb == NULL)
-                  struct sk_buff *iovb;
+                                        return -ENOMEM;
+                                NS_PRV_BUFTYPE(iovb) = BUF_NONE;
-                  iovb = alloc_skb(NS_IOVBUFSIZE, GFP_KERNEL);
+                                spin_lock_irqsave(&card->int_lock, flags);
-                  if (iovb == NULL)
+                                skb_queue_tail(&card->iovpool.queue, iovb);
-                     return -ENOMEM;
+                                card->iovpool.count++;
-                  NS_SKB_CB(iovb)->buf_type = BUF_NONE;
+                                spin_unlock_irqrestore(&card->int_lock, flags);
-                  spin_lock_irqsave(&card->int_lock, flags);
+                        }
-                  skb_queue_tail(&card->iovpool.queue, iovb);
+                        break;
-                  card->iovpool.count++;
-                  spin_unlock_irqrestore(&card->int_lock, flags);
+                default:
-               }
+                        return -EINVAL;
-               break;
+                }
-            default:
+                return 0;
-               return -EINVAL;
+        default:
-         }
+                if (dev->phy && dev->phy->ioctl) {
-         return 0;
+                        return dev->phy->ioctl(dev, cmd, arg);
+                } else {
-      default:
+                        printk("nicstar%d: %s == NULL \n", card->index,
-         if (dev->phy && dev->phy->ioctl) {
+                               dev->phy ? "dev->phy->ioctl" : "dev->phy");
-            return dev->phy->ioctl(dev, cmd, arg);
+                        return -ENOIOCTLCMD;
-         }
+                }
-         else {
+        }
-            printk("nicstar%d: %s == NULL \n", card->index,
-                   dev->phy ? "dev->phy->ioctl" : "dev->phy");
-            return -ENOIOCTLCMD;
-         }
-   }
 }
+#ifdef EXTRA_DEBUG
-static void which_list(ns_dev *card, struct sk_buff *skb)
+static void which_list(ns_dev * card, struct sk_buff *skb)
 {
-        printk("skb buf_type: 0x%08x\n", NS_SKB_CB(skb)->buf_type);
+        printk("skb buf_type: 0x%08x\n", NS_PRV_BUFTYPE(skb));
 }
+#endif /* EXTRA_DEBUG */
 static void ns_poll(unsigned long arg)
 {
-   int i;
+        int i;
-   ns_dev *card;
+        ns_dev *card;
-   unsigned long flags;
+        unsigned long flags;
-   u32 stat_r, stat_w;
+        u32 stat_r, stat_w;
-   PRINTK("nicstar: Entering ns_poll().\n");
+        PRINTK("nicstar: Entering ns_poll().\n");
-   for (i = 0; i < num_cards; i++)
+        for (i = 0; i < num_cards; i++) {
-   {
+                card = cards[i];
-      card = cards[i];
+                if (spin_is_locked(&card->int_lock)) {
-      if (spin_is_locked(&card->int_lock)) {
+                        /* Probably it isn't worth spinning */
-      /* Probably it isn't worth spinning */
+                        continue;
-         continue;
+                }
-      }
+                spin_lock_irqsave(&card->int_lock, flags);
-      spin_lock_irqsave(&card->int_lock, flags);
+                stat_w = 0;
-      stat_w = 0;
+                stat_r = readl(card->membase + STAT);
-      stat_r = readl(card->membase + STAT);
+                if (stat_r & NS_STAT_TSIF)
-      if (stat_r & NS_STAT_TSIF)
+                        stat_w |= NS_STAT_TSIF;
-         stat_w |= NS_STAT_TSIF;
+                if (stat_r & NS_STAT_EOPDU)
-      if (stat_r & NS_STAT_EOPDU)
+                        stat_w |= NS_STAT_EOPDU;
-         stat_w |= NS_STAT_EOPDU;
+                process_tsq(card);
-      process_tsq(card);
+                process_rsq(card);
-      process_rsq(card);
+                writel(stat_w, card->membase + STAT);
-      writel(stat_w, card->membase + STAT);
+                spin_unlock_irqrestore(&card->int_lock, flags);
-      spin_unlock_irqrestore(&card->int_lock, flags);
+        }
-   }
+        mod_timer(&ns_timer, jiffies + NS_POLL_PERIOD);
-   mod_timer(&ns_timer, jiffies + NS_POLL_PERIOD);
+        PRINTK("nicstar: Leaving ns_poll().\n");
-   PRINTK("nicstar: Leaving ns_poll().\n");
 }
 static int ns_parse_mac(char *mac, unsigned char *esi)
 {
-   int i, j;
+        int i, j;
-   short byte1, byte0;
+        short byte1, byte0;
-   if (mac == NULL || esi == NULL)
+        if (mac == NULL || esi == NULL)
-      return -1;
+                return -1;
-   j = 0;
+        j = 0;
-   for (i = 0; i < 6; i++)
+        for (i = 0; i < 6; i++) {
-   {
+                if ((byte1 = hex_to_bin(mac[j++])) < 0)
-      if ((byte1 = ns_h2i(mac[j++])) < 0)
+                        return -1;
-         return -1;
+                if ((byte0 = hex_to_bin(mac[j++])) < 0)
-      if ((byte0 = ns_h2i(mac[j++])) < 0)
+                        return -1;
-         return -1;
+                esi[i] = (unsigned char)(byte1 * 16 + byte0);
-      esi[i] = (unsigned char) (byte1 * 16 + byte0);
+                if (i < 5) {
-      if (i < 5)
+                        if (mac[j++] != ':')
-      {
+                                return -1;
-         if (mac[j++] != ':')
+                }
-            return -1;
+        }
-      }
+        return 0;
-   }
-   return 0;
-}
-static short ns_h2i(char c)
-{
-   if (c >= '0' && c <= '9')
-      return (short) (c - '0');
-   if (c >= 'A' && c <= 'F')
-      return (short) (c - 'A' + 10);
-   if (c >= 'a' && c <= 'f')
-      return (short) (c - 'a' + 10);
-   return -1;
 }
 static void ns_phy_put(struct atm_dev *dev, unsigned char value,
-                    unsigned long addr)
+                       unsigned long addr)
 {
-   ns_dev *card;
+        ns_dev *card;
-   unsigned long flags;
+        unsigned long flags;
-   card = dev->dev_data;
+        card = dev->dev_data;
-   spin_lock_irqsave(&card->res_lock, flags);
+        spin_lock_irqsave(&card->res_lock, flags);
-   while(CMD_BUSY(card));
+        while (CMD_BUSY(card)) ;
-   writel((unsigned long) value, card->membase + DR0);
+        writel((u32) value, card->membase + DR0);
-   writel(NS_CMD_WRITE_UTILITY | 0x00000200 | (addr & 0x000000FF),
+        writel(NS_CMD_WRITE_UTILITY | 0x00000200 | (addr & 0x000000FF),
-          card->membase + CMD);
+               card->membase + CMD);
-   spin_unlock_irqrestore(&card->res_lock, flags);
+        spin_unlock_irqrestore(&card->res_lock, flags);
 }
 static unsigned char ns_phy_get(struct atm_dev *dev, unsigned long addr)
 {
-   ns_dev *card;
+        ns_dev *card;
-   unsigned long flags;
+        unsigned long flags;
-   unsigned long data;
+        u32 data;
-   card = dev->dev_data;
+        card = dev->dev_data;
-   spin_lock_irqsave(&card->res_lock, flags);
+        spin_lock_irqsave(&card->res_lock, flags);
-   while(CMD_BUSY(card));
+        while (CMD_BUSY(card)) ;
-   writel(NS_CMD_READ_UTILITY | 0x00000200 | (addr & 0x000000FF),
+        writel(NS_CMD_READ_UTILITY | 0x00000200 | (addr & 0x000000FF),
-          card->membase + CMD);
+               card->membase + CMD);
-   while(CMD_BUSY(card));
+        while (CMD_BUSY(card)) ;
-   data = readl(card->membase + DR0) & 0x000000FF;
+        data = readl(card->membase + DR0) & 0x000000FF;
-   spin_unlock_irqrestore(&card->res_lock, flags);
+        spin_unlock_irqrestore(&card->res_lock, flags);
-   return (unsigned char) data;
+        return (unsigned char)data;
 }
 module_init(nicstar_init);
 module_exit(nicstar_cleanup);
diff --git a/drivers/atm/nicstar.h b/drivers/atm/nicstar.h
index 6010e3daa6a2..9bc27ea5088e 100644
--- a/drivers/atm/nicstar.h
+++ b/drivers/atm/nicstar.h
@@ -1,5 +1,4 @@
-/******************************************************************************
+/*
- *
 * nicstar.h
 *
 * Header file for the nicstar device driver.
@@ -8,29 +7,26 @@
 * PowerPC support by Jay Talbott (jay_talbott@mcg.mot.com) April 1999
 *
 * (C) INESC 1998
- *
+ */
- ******************************************************************************/
 #ifndef _LINUX_NICSTAR_H_
 #define _LINUX_NICSTAR_H_
+/* Includes */
-/* Includes *******************************************************************/
 #include <linux/types.h>
 #include <linux/pci.h>
+#include <linux/idr.h>
 #include <linux/uio.h>
 #include <linux/skbuff.h>
 #include <linux/atmdev.h>
 #include <linux/atm_nicstar.h>
+/* Options */
-/* Options ********************************************************************/
 #define NS_MAX_CARDS 4          /* Maximum number of NICStAR based cards
                                   controlled by the device driver. Must
-                                   be <= 5 */
+                                   be <= 5 */
 #undef RCQ_SUPPORT              /* Do not define this for now */
@@ -43,7 +39,7 @@
 #define NS_VPIBITS 2            /* 0, 1, 2, or 8 */
 #define NS_MAX_RCTSIZE 4096     /* Number of entries. 4096 or 16384.
-                                   Define 4096 only if (all) your card(s)
+                                   Define 4096 only if (all) your card(s)
                                   have 32K x 32bit SRAM, in which case
                                   setting this to 16384 will just waste a
                                   lot of memory.
@@ -51,33 +47,32 @@
                                   128K x 32bit SRAM will limit the maximum
                                   VCI. */
-/*#define NS_PCI_LATENCY 64*/   /* Must be a multiple of 32 */
+                                /*#define NS_PCI_LATENCY 64*//* Must be a multiple of 32 */
        /* Number of buffers initially allocated */
-#define NUM_SB 32       /* Must be even */
+#define NUM_SB 32               /* Must be even */
-#define NUM_LB 24       /* Must be even */
+#define NUM_LB 24               /* Must be even */
-#define NUM_HB 8        /* Pre-allocated huge buffers */
+#define NUM_HB 8                /* Pre-allocated huge buffers */
-#define NUM_IOVB 48     /* Iovec buffers */
+#define NUM_IOVB 48             /* Iovec buffers */
        /* Lower level for count of buffers */
-#define MIN_SB 8        /* Must be even */
+#define MIN_SB 8                /* Must be even */
-#define MIN_LB 8        /* Must be even */
+#define MIN_LB 8                /* Must be even */
 #define MIN_HB 6
 #define MIN_IOVB 8
        /* Upper level for count of buffers */
-#define MAX_SB 64       /* Must be even, <= 508 */
+#define MAX_SB 64               /* Must be even, <= 508 */
-#define MAX_LB 48       /* Must be even, <= 508 */
+#define MAX_LB 48               /* Must be even, <= 508 */
 #define MAX_HB 10
 #define MAX_IOVB 80
        /* These are the absolute maximum allowed for the ioctl() */
-#define TOP_SB 256      /* Must be even, <= 508 */
+#define TOP_SB 256              /* Must be even, <= 508 */
-#define TOP_LB 128      /* Must be even, <= 508 */
+#define TOP_LB 128              /* Must be even, <= 508 */
 #define TOP_HB 64
 #define TOP_IOVB 256
 #define MAX_TBD_PER_VC 1        /* Number of TBDs before a TSR */
 #define MAX_TBD_PER_SCQ 10      /* Only meaningful for variable rate SCQs */
@@ -89,15 +84,12 @@
 #define PCR_TOLERANCE (1.0001)
+/* ESI stuff */
-/* ESI stuff ******************************************************************/
 #define NICSTAR_EPROM_MAC_ADDR_OFFSET 0x6C
 #define NICSTAR_EPROM_MAC_ADDR_OFFSET_ALT 0xF6
+/* #defines */
-/* #defines *******************************************************************/
 #define NS_IOREMAP_SIZE 4096
@@ -123,22 +115,19 @@
 #define NS_SMSKBSIZE (NS_SMBUFSIZE + NS_AAL0_HEADER)
 #define NS_LGSKBSIZE (NS_SMBUFSIZE + NS_LGBUFSIZE)
+/* NICStAR structures located in host memory */
-/* NICStAR structures located in host memory **********************************/
+/*
+ * RSQ - Receive Status Queue
-/* RSQ - Receive Status Queue 
 *
 * Written by the NICStAR, read by the device driver.
 */
-typedef struct ns_rsqe
+typedef struct ns_rsqe {
-{
+        u32 word_1;
-   u32 word_1;
+        u32 buffer_handle;
-   u32 buffer_handle;
+        u32 final_aal5_crc32;
-   u32 final_aal5_crc32;
+        u32 word_4;
-   u32 word_4;
 } ns_rsqe;
 #define ns_rsqe_vpi(ns_rsqep) \
@@ -175,30 +164,27 @@ typedef struct ns_rsqe
 #define ns_rsqe_cellcount(ns_rsqep) \
        (le32_to_cpu((ns_rsqep)->word_4) & 0x000001FF)
 #define ns_rsqe_init(ns_rsqep) \
-        ((ns_rsqep)->word_4 = cpu_to_le32(0x00000000)) 
+        ((ns_rsqep)->word_4 = cpu_to_le32(0x00000000))
 #define NS_RSQ_NUM_ENTRIES (NS_RSQSIZE / 16)
 #define NS_RSQ_ALIGNMENT NS_RSQSIZE
+/*
+ * RCQ - Raw Cell Queue
-/* RCQ - Raw Cell Queue
 *
 * Written by the NICStAR, read by the device driver.
 */
-typedef struct cell_payload
+typedef struct cell_payload {
-{
+        u32 word[12];
-   u32 word[12];
 } cell_payload;
-typedef struct ns_rcqe
+typedef struct ns_rcqe {
-{
+        u32 word_1;
-   u32 word_1;
+        u32 word_2;
-   u32 word_2;
+        u32 word_3;
-   u32 word_3;
+        u32 word_4;
-   u32 word_4;
+        cell_payload payload;
-   cell_payload payload;
 } ns_rcqe;
 #define NS_RCQE_SIZE 64         /* bytes */
@@ -210,28 +196,25 @@ typedef struct ns_rcqe
 #define ns_rcqe_nextbufhandle(ns_rcqep) \
        (le32_to_cpu((ns_rcqep)->word_2))
+/*
+ * SCQ - Segmentation Channel Queue
-/* SCQ - Segmentation Channel Queue 
 *
 * Written by the device driver, read by the NICStAR.
 */
-typedef struct ns_scqe
+typedef struct ns_scqe {
-{
+        u32 word_1;
-   u32 word_1;
+        u32 word_2;
-   u32 word_2;
+        u32 word_3;
-   u32 word_3;
+        u32 word_4;
-   u32 word_4;
 } ns_scqe;
   /* NOTE: SCQ entries can be either a TBD (Transmit Buffer Descriptors)
-            or TSR (Transmit Status Requests) */
+      or TSR (Transmit Status Requests) */
 #define NS_SCQE_TYPE_TBD 0x00000000
 #define NS_SCQE_TYPE_TSR 0x80000000
 #define NS_TBD_EOPDU 0x40000000
 #define NS_TBD_AAL0  0x00000000
 #define NS_TBD_AAL34 0x04000000
@@ -253,10 +236,9 @@ typedef struct ns_scqe
 #define ns_tbd_mkword_4(gfc, vpi, vci, pt, clp) \
      (cpu_to_le32((gfc) << 28 | (vpi) << 20 | (vci) << 4 | (pt) << 1 | (clp)))
 #define NS_TSR_INTENABLE 0x20000000
-#define NS_TSR_SCDISVBR 0xFFFF          /* Use as scdi for VBR SCD */
+#define NS_TSR_SCDISVBR 0xFFFF  /* Use as scdi for VBR SCD */
 #define ns_tsr_mkword_1(flags) \
        (cpu_to_le32(NS_SCQE_TYPE_TSR | (flags)))
@@ -273,22 +255,20 @@ typedef struct ns_scqe
 #define NS_SCQE_SIZE 16
+/*
+ * TSQ - Transmit Status Queue
-/* TSQ - Transmit Status Queue
 *
 * Written by the NICStAR, read by the device driver.
 */
-typedef struct ns_tsi
+typedef struct ns_tsi {
-{
+        u32 word_1;
-   u32 word_1;
+        u32 word_2;
-   u32 word_2;
 } ns_tsi;
   /* NOTE: The first word can be a status word copied from the TSR which
-            originated the TSI, or a timer overflow indicator. In this last
+      originated the TSI, or a timer overflow indicator. In this last
-            case, the value of the first word is all zeroes. */
+      case, the value of the first word is all zeroes. */
 #define NS_TSI_EMPTY          0x80000000
 #define NS_TSI_TIMESTAMP_MASK 0x00FFFFFF
@@ -301,12 +281,10 @@ typedef struct ns_tsi
 #define ns_tsi_init(ns_tsip) \
        ((ns_tsip)->word_2 = cpu_to_le32(NS_TSI_EMPTY))
 #define NS_TSQSIZE 8192
 #define NS_TSQ_NUM_ENTRIES 1024
 #define NS_TSQ_ALIGNMENT 8192
 #define NS_TSI_SCDISVBR NS_TSR_SCDISVBR
 #define ns_tsi_tmrof(ns_tsip) \
@@ -316,26 +294,22 @@ typedef struct ns_tsi
 #define ns_tsi_getscqpos(ns_tsip) \
        (le32_to_cpu((ns_tsip)->word_1) & 0x00007FFF)
+/* NICStAR structures located in local SRAM */
+/*
-/* NICStAR structures located in local SRAM ***********************************/
+ * RCT - Receive Connection Table
-/* RCT - Receive Connection Table
 *
 * Written by both the NICStAR and the device driver.
 */
-typedef struct ns_rcte
+typedef struct ns_rcte {
-{
+        u32 word_1;
-   u32 word_1;
+        u32 buffer_handle;
-   u32 buffer_handle;
+        u32 dma_address;
-   u32 dma_address;
+        u32 aal5_crc32;
-   u32 aal5_crc32;
 } ns_rcte;
-#define NS_RCTE_BSFB            0x00200000  /* Rev. D only */
+#define NS_RCTE_BSFB            0x00200000      /* Rev. D only */
 #define NS_RCTE_NZGFC           0x00100000
 #define NS_RCTE_CONNECTOPEN     0x00080000
 #define NS_RCTE_AALMASK         0x00070000
@@ -358,25 +332,21 @@ typedef struct ns_rcte
 #define NS_RCT_ENTRY_SIZE 4     /* Number of dwords */
   /* NOTE: We could make macros to contruct the first word of the RCTE,
-            but that doesn't seem to make much sense... */
+      but that doesn't seem to make much sense... */
+/*
+ * FBD - Free Buffer Descriptor
-/* FBD - Free Buffer Descriptor
 *
 * Written by the device driver using via the command register.
 */
-typedef struct ns_fbd
+typedef struct ns_fbd {
-{
+        u32 buffer_handle;
-   u32 buffer_handle;
+        u32 dma_address;
-   u32 dma_address;
 } ns_fbd;
+/*
+ * TST - Transmit Schedule Table
-/* TST - Transmit Schedule Table
 *
 * Written by the device driver.
 */
@@ -385,40 +355,38 @@ typedef u32 ns_tste;
 #define NS_TST_OPCODE_MASK 0x60000000
-#define NS_TST_OPCODE_NULL     0x00000000 /* Insert null cell */
+#define NS_TST_OPCODE_NULL     0x00000000       /* Insert null cell */
-#define NS_TST_OPCODE_FIXED    0x20000000 /* Cell from a fixed rate channel */
+#define NS_TST_OPCODE_FIXED    0x20000000       /* Cell from a fixed rate channel */
 #define NS_TST_OPCODE_VARIABLE 0x40000000
-#define NS_TST_OPCODE_END      0x60000000 /* Jump */
+#define NS_TST_OPCODE_END      0x60000000       /* Jump */
 #define ns_tste_make(opcode, sramad) (opcode | sramad)
   /* NOTE:
      - When the opcode is FIXED, sramad specifies the SRAM address of the
-        SCD for that fixed rate channel.
+      SCD for that fixed rate channel.
      - When the opcode is END, sramad specifies the SRAM address of the
-        location of the next TST entry to read.
+      location of the next TST entry to read.
    */
+/*
+ * SCD - Segmentation Channel Descriptor
-/* SCD - Segmentation Channel Descriptor
 *
 * Written by both the device driver and the NICStAR
 */
-typedef struct ns_scd
+typedef struct ns_scd {
-{
+        u32 word_1;
-   u32 word_1;
+        u32 word_2;
-   u32 word_2;
+        u32 partial_aal5_crc;
-   u32 partial_aal5_crc;
+        u32 reserved;
-   u32 reserved;
+        ns_scqe cache_a;
-   ns_scqe cache_a;
+        ns_scqe cache_b;
-   ns_scqe cache_b;
 } ns_scd;
-#define NS_SCD_BASE_MASK_VAR 0xFFFFE000         /* Variable rate */
+#define NS_SCD_BASE_MASK_VAR 0xFFFFE000 /* Variable rate */
-#define NS_SCD_BASE_MASK_FIX 0xFFFFFC00         /* Fixed rate */
+#define NS_SCD_BASE_MASK_FIX 0xFFFFFC00 /* Fixed rate */
 #define NS_SCD_TAIL_MASK_VAR 0x00001FF0
 #define NS_SCD_TAIL_MASK_FIX 0x000003F0
 #define NS_SCD_HEAD_MASK_VAR 0x00001FF0
@@ -426,13 +394,9 @@ typedef struct ns_scd
 #define NS_SCD_XMITFOREVER   0x02000000
   /* NOTE: There are other fields in word 2 of the SCD, but as they should
-            not be needed in the device driver they are not defined here. */
+      not be needed in the device driver they are not defined here. */
-/* NICStAR local SRAM memory map **********************************************/
+/* NICStAR local SRAM memory map */
 #define NS_RCT           0x00000
 #define NS_RCT_32_END    0x03FFF
@@ -455,100 +419,93 @@ typedef struct ns_scd
 #define NS_LGFBQ         0x1FC00
 #define NS_LGFBQ_END     0x1FFFF
+/* NISCtAR operation registers */
-/* NISCtAR operation registers ************************************************/
 /* See Section 3.4 of `IDT77211 NICStAR User Manual' from www.idt.com */
-enum ns_regs
+enum ns_regs {
-{
+        DR0 = 0x00,             /* Data Register 0 R/W */
-   DR0   = 0x00,      /* Data Register 0 R/W*/
+        DR1 = 0x04,             /* Data Register 1 W */
-   DR1   = 0x04,      /* Data Register 1 W */
+        DR2 = 0x08,             /* Data Register 2 W */
-   DR2   = 0x08,      /* Data Register 2 W */
+        DR3 = 0x0C,             /* Data Register 3 W */
-   DR3   = 0x0C,      /* Data Register 3 W */
+        CMD = 0x10,             /* Command W */
-   CMD   = 0x10,      /* Command W */
+        CFG = 0x14,             /* Configuration R/W */
-   CFG   = 0x14,      /* Configuration R/W */
+        STAT = 0x18,            /* Status R/W */
-   STAT  = 0x18,      /* Status R/W */
+        RSQB = 0x1C,            /* Receive Status Queue Base W */
-   RSQB  = 0x1C,      /* Receive Status Queue Base W */
+        RSQT = 0x20,            /* Receive Status Queue Tail R */
-   RSQT  = 0x20,      /* Receive Status Queue Tail R */
+        RSQH = 0x24,            /* Receive Status Queue Head W */
-   RSQH  = 0x24,      /* Receive Status Queue Head W */
+        CDC = 0x28,             /* Cell Drop Counter R/clear */
-   CDC   = 0x28,      /* Cell Drop Counter R/clear */
+        VPEC = 0x2C,            /* VPI/VCI Lookup Error Count R/clear */
-   VPEC  = 0x2C,      /* VPI/VCI Lookup Error Count R/clear */
+        ICC = 0x30,             /* Invalid Cell Count R/clear */
-   ICC   = 0x30,      /* Invalid Cell Count R/clear */
+        RAWCT = 0x34,           /* Raw Cell Tail R */
-   RAWCT = 0x34,      /* Raw Cell Tail R */
+        TMR = 0x38,             /* Timer R */
-   TMR   = 0x38,      /* Timer R */
+        TSTB = 0x3C,            /* Transmit Schedule Table Base R/W */
-   TSTB  = 0x3C,      /* Transmit Schedule Table Base R/W */
+        TSQB = 0x40,            /* Transmit Status Queue Base W */
-   TSQB  = 0x40,      /* Transmit Status Queue Base W */
+        TSQT = 0x44,            /* Transmit Status Queue Tail R */
-   TSQT  = 0x44,      /* Transmit Status Queue Tail R */
+        TSQH = 0x48,            /* Transmit Status Queue Head W */
-   TSQH  = 0x48,      /* Transmit Status Queue Head W */
+        GP = 0x4C,              /* General Purpose R/W */
-   GP    = 0x4C,      /* General Purpose R/W */
+        VPM = 0x50              /* VPI/VCI Mask W */
-   VPM   = 0x50       /* VPI/VCI Mask W */
 };
+/* NICStAR commands issued to the CMD register */
-/* NICStAR commands issued to the CMD register ********************************/
 /* Top 4 bits are command opcode, lower 28 are parameters. */
 #define NS_CMD_NO_OPERATION         0x00000000
-        /* params always 0 */
+        /* params always 0 */
 #define NS_CMD_OPENCLOSE_CONNECTION 0x20000000
-        /* b19{1=open,0=close} b18-2{SRAM addr} */
+        /* b19{1=open,0=close} b18-2{SRAM addr} */
 #define NS_CMD_WRITE_SRAM           0x40000000
-        /* b18-2{SRAM addr} b1-0{burst size} */
+        /* b18-2{SRAM addr} b1-0{burst size} */
 #define NS_CMD_READ_SRAM            0x50000000
-        /* b18-2{SRAM addr} */
+        /* b18-2{SRAM addr} */
 #define NS_CMD_WRITE_FREEBUFQ       0x60000000
-        /* b0{large buf indicator} */
+        /* b0{large buf indicator} */
 #define NS_CMD_READ_UTILITY         0x80000000
-        /* b8{1=select UTL_CS1} b9{1=select UTL_CS0} b7-0{bus addr} */
+        /* b8{1=select UTL_CS1} b9{1=select UTL_CS0} b7-0{bus addr} */
 #define NS_CMD_WRITE_UTILITY        0x90000000
-        /* b8{1=select UTL_CS1} b9{1=select UTL_CS0} b7-0{bus addr} */
+        /* b8{1=select UTL_CS1} b9{1=select UTL_CS0} b7-0{bus addr} */
 #define NS_CMD_OPEN_CONNECTION (NS_CMD_OPENCLOSE_CONNECTION | 0x00080000)
 #define NS_CMD_CLOSE_CONNECTION NS_CMD_OPENCLOSE_CONNECTION
+/* NICStAR configuration bits */
-/* NICStAR configuration bits *************************************************/
+#define NS_CFG_SWRST          0x80000000        /* Software Reset */
-#define NS_CFG_SWRST          0x80000000    /* Software Reset */
+#define NS_CFG_RXPATH         0x20000000        /* Receive Path Enable */
-#define NS_CFG_RXPATH         0x20000000    /* Receive Path Enable */
+#define NS_CFG_SMBUFSIZE_MASK 0x18000000        /* Small Receive Buffer Size */
-#define NS_CFG_SMBUFSIZE_MASK 0x18000000    /* Small Receive Buffer Size */
+#define NS_CFG_LGBUFSIZE_MASK 0x06000000        /* Large Receive Buffer Size */
-#define NS_CFG_LGBUFSIZE_MASK 0x06000000    /* Large Receive Buffer Size */
+#define NS_CFG_EFBIE          0x01000000        /* Empty Free Buffer Queue
-#define NS_CFG_EFBIE          0x01000000    /* Empty Free Buffer Queue
+                                                   Interrupt Enable */
-                                               Interrupt Enable */
+#define NS_CFG_RSQSIZE_MASK   0x00C00000        /* Receive Status Queue Size */
-#define NS_CFG_RSQSIZE_MASK   0x00C00000    /* Receive Status Queue Size */
+#define NS_CFG_ICACCEPT       0x00200000        /* Invalid Cell Accept */
-#define NS_CFG_ICACCEPT       0x00200000    /* Invalid Cell Accept */
+#define NS_CFG_IGNOREGFC      0x00100000        /* Ignore General Flow Control */
-#define NS_CFG_IGNOREGFC      0x00100000    /* Ignore General Flow Control */
+#define NS_CFG_VPIBITS_MASK   0x000C0000        /* VPI/VCI Bits Size Select */
-#define NS_CFG_VPIBITS_MASK   0x000C0000    /* VPI/VCI Bits Size Select */
+#define NS_CFG_RCTSIZE_MASK   0x00030000        /* Receive Connection Table Size */
-#define NS_CFG_RCTSIZE_MASK   0x00030000    /* Receive Connection Table Size */
+#define NS_CFG_VCERRACCEPT    0x00008000        /* VPI/VCI Error Cell Accept */
-#define NS_CFG_VCERRACCEPT    0x00008000    /* VPI/VCI Error Cell Accept */
+#define NS_CFG_RXINT_MASK     0x00007000        /* End of Receive PDU Interrupt
-#define NS_CFG_RXINT_MASK     0x00007000    /* End of Receive PDU Interrupt
+                                                   Handling */
-                                               Handling */
+#define NS_CFG_RAWIE          0x00000800        /* Raw Cell Qu' Interrupt Enable */
-#define NS_CFG_RAWIE          0x00000800    /* Raw Cell Qu' Interrupt Enable */
+#define NS_CFG_RSQAFIE        0x00000400        /* Receive Queue Almost Full
-#define NS_CFG_RSQAFIE        0x00000400    /* Receive Queue Almost Full
+                                                   Interrupt Enable */
-                                               Interrupt Enable */
+#define NS_CFG_RXRM           0x00000200        /* Receive RM Cells */
-#define NS_CFG_RXRM           0x00000200    /* Receive RM Cells */
+#define NS_CFG_TMRROIE        0x00000080        /* Timer Roll Over Interrupt
-#define NS_CFG_TMRROIE        0x00000080    /* Timer Roll Over Interrupt
+                                                   Enable */
-                                               Enable */
+#define NS_CFG_TXEN           0x00000020        /* Transmit Operation Enable */
-#define NS_CFG_TXEN           0x00000020    /* Transmit Operation Enable */
+#define NS_CFG_TXIE           0x00000010        /* Transmit Status Interrupt
-#define NS_CFG_TXIE           0x00000010    /* Transmit Status Interrupt
+                                                   Enable */
-                                               Enable */
+#define NS_CFG_TXURIE         0x00000008        /* Transmit Under-run Interrupt
-#define NS_CFG_TXURIE         0x00000008    /* Transmit Under-run Interrupt
+                                                   Enable */
-                                               Enable */
+#define NS_CFG_UMODE          0x00000004        /* Utopia Mode (cell/byte) Select */
-#define NS_CFG_UMODE          0x00000004    /* Utopia Mode (cell/byte) Select */
+#define NS_CFG_TSQFIE         0x00000002        /* Transmit Status Queue Full
-#define NS_CFG_TSQFIE         0x00000002    /* Transmit Status Queue Full
+                                                   Interrupt Enable */
-                                               Interrupt Enable */
+#define NS_CFG_PHYIE          0x00000001        /* PHY Interrupt Enable */
-#define NS_CFG_PHYIE          0x00000001    /* PHY Interrupt Enable */
 #define NS_CFG_SMBUFSIZE_48    0x00000000
 #define NS_CFG_SMBUFSIZE_96    0x08000000
@@ -579,33 +536,29 @@ enum ns_regs
 #define NS_CFG_RXINT_624US   0x00003000
 #define NS_CFG_RXINT_899US   0x00004000
+/* NICStAR STATus bits */
-/* NICStAR STATus bits ********************************************************/
+#define NS_STAT_SFBQC_MASK 0xFF000000   /* hi 8 bits Small Buffer Queue Count */
-#define NS_STAT_SFBQC_MASK 0xFF000000   /* hi 8 bits Small Buffer Queue Count */
+#define NS_STAT_LFBQC_MASK 0x00FF0000   /* hi 8 bits Large Buffer Queue Count */
-#define NS_STAT_LFBQC_MASK 0x00FF0000   /* hi 8 bits Large Buffer Queue Count */
+#define NS_STAT_TSIF       0x00008000   /* Transmit Status Queue Indicator */
-#define NS_STAT_TSIF       0x00008000   /* Transmit Status Queue Indicator */
+#define NS_STAT_TXICP      0x00004000   /* Transmit Incomplete PDU */
-#define NS_STAT_TXICP      0x00004000   /* Transmit Incomplete PDU */
+#define NS_STAT_TSQF       0x00001000   /* Transmit Status Queue Full */
-#define NS_STAT_TSQF       0x00001000   /* Transmit Status Queue Full */
+#define NS_STAT_TMROF      0x00000800   /* Timer Overflow */
-#define NS_STAT_TMROF      0x00000800   /* Timer Overflow */
+#define NS_STAT_PHYI       0x00000400   /* PHY Device Interrupt */
-#define NS_STAT_PHYI       0x00000400   /* PHY Device Interrupt */
+#define NS_STAT_CMDBZ      0x00000200   /* Command Busy */
-#define NS_STAT_CMDBZ      0x00000200   /* Command Busy */
+#define NS_STAT_SFBQF      0x00000100   /* Small Buffer Queue Full */
-#define NS_STAT_SFBQF      0x00000100   /* Small Buffer Queue Full */
+#define NS_STAT_LFBQF      0x00000080   /* Large Buffer Queue Full */
-#define NS_STAT_LFBQF      0x00000080   /* Large Buffer Queue Full */
+#define NS_STAT_RSQF       0x00000040   /* Receive Status Queue Full */
-#define NS_STAT_RSQF       0x00000040   /* Receive Status Queue Full */
+#define NS_STAT_EOPDU      0x00000020   /* End of PDU */
-#define NS_STAT_EOPDU      0x00000020   /* End of PDU */
+#define NS_STAT_RAWCF      0x00000010   /* Raw Cell Flag */
-#define NS_STAT_RAWCF      0x00000010   /* Raw Cell Flag */
+#define NS_STAT_SFBQE      0x00000008   /* Small Buffer Queue Empty */
-#define NS_STAT_SFBQE      0x00000008   /* Small Buffer Queue Empty */
+#define NS_STAT_LFBQE      0x00000004   /* Large Buffer Queue Empty */
-#define NS_STAT_LFBQE      0x00000004   /* Large Buffer Queue Empty */
+#define NS_STAT_RSQAF      0x00000002   /* Receive Status Queue Almost Full */
-#define NS_STAT_RSQAF      0x00000002   /* Receive Status Queue Almost Full */
 #define ns_stat_sfbqc_get(stat) (((stat) & NS_STAT_SFBQC_MASK) >> 23)
 #define ns_stat_lfbqc_get(stat) (((stat) & NS_STAT_LFBQC_MASK) >> 15)
+/* #defines which depend on other #defines */
-/* #defines which depend on other #defines ************************************/
 #define NS_TST0 NS_TST_FRSCD
 #define NS_TST1 (NS_TST_FRSCD + NS_TST_NUM_ENTRIES + 1)
@@ -672,8 +625,7 @@ enum ns_regs
 #define NS_CFG_TSQFIE_OPT 0x00000000
 #endif /* ENABLE_TSQFIE */
+/* PCI stuff */
-/* PCI stuff ******************************************************************/
 #ifndef PCI_VENDOR_ID_IDT
 #define PCI_VENDOR_ID_IDT 0x111D
@@ -683,138 +635,124 @@ enum ns_regs
 #define PCI_DEVICE_ID_IDT_IDT77201 0x0001
 #endif /* PCI_DEVICE_ID_IDT_IDT77201 */
+/* Device driver structures */
+struct ns_skb_prv {
-/* Device driver structures ***************************************************/
+        u32 buf_type;           /* BUF_SM/BUF_LG/BUF_NONE */
+        u32 dma;
+        int iovcnt;
-struct ns_skb_cb {
-        u32 buf_type;                   /* BUF_SM/BUF_LG/BUF_NONE */
 };
-#define NS_SKB_CB(skb)  ((struct ns_skb_cb *)((skb)->cb))
+#define NS_PRV_BUFTYPE(skb)   \
+        (((struct ns_skb_prv *)(ATM_SKB(skb)+1))->buf_type)
-typedef struct tsq_info
+#define NS_PRV_DMA(skb) \
-{
+        (((struct ns_skb_prv *)(ATM_SKB(skb)+1))->dma)
-   void *org;
+#define NS_PRV_IOVCNT(skb) \
-   ns_tsi *base;
+        (((struct ns_skb_prv *)(ATM_SKB(skb)+1))->iovcnt)
-   ns_tsi *next;
-   ns_tsi *last;
+typedef struct tsq_info {
+        void *org;
+        dma_addr_t dma;
+        ns_tsi *base;
+        ns_tsi *next;
+        ns_tsi *last;
 } tsq_info;
+typedef struct scq_info {
-typedef struct scq_info
+        void *org;
-{
+        dma_addr_t dma;
-   void *org;
+        ns_scqe *base;
-   ns_scqe *base;
+        ns_scqe *last;
-   ns_scqe *last;
+        ns_scqe *next;
-   ns_scqe *next;
+        volatile ns_scqe *tail; /* Not related to the nicstar register */
-   volatile ns_scqe *tail;              /* Not related to the nicstar register */
+        unsigned num_entries;
-   unsigned num_entries;
+        struct sk_buff **skb;   /* Pointer to an array of pointers
-   struct sk_buff **skb;                /* Pointer to an array of pointers
+                                   to the sk_buffs used for tx */
-                                           to the sk_buffs used for tx */
+        u32 scd;                /* SRAM address of the corresponding
-   u32 scd;                             /* SRAM address of the corresponding
+                                   SCD */
-                                           SCD */
+        int tbd_count;          /* Only meaningful on variable rate */
-   int tbd_count;                       /* Only meaningful on variable rate */
+        wait_queue_head_t scqfull_waitq;
-   wait_queue_head_t scqfull_waitq;
+        volatile char full;     /* SCQ full indicator */
-   volatile char full;                  /* SCQ full indicator */
+        spinlock_t lock;        /* SCQ spinlock */
-   spinlock_t lock;                     /* SCQ spinlock */
 } scq_info;
+typedef struct rsq_info {
+        void *org;
-typedef struct rsq_info
+        dma_addr_t dma;
-{
+        ns_rsqe *base;
-   void *org;
+        ns_rsqe *next;
-   ns_rsqe *base;
+        ns_rsqe *last;
-   ns_rsqe *next;
-   ns_rsqe *last;
 } rsq_info;
+typedef struct skb_pool {
-typedef struct skb_pool
+        volatile int count;     /* number of buffers in the queue */
-{
+        struct sk_buff_head queue;
-   volatile int count;                  /* number of buffers in the queue */
-   struct sk_buff_head queue;
 } skb_pool;
 /* NOTE: for small and large buffer pools, the count is not used, as the
         actual value used for buffer management is the one read from the
         card. */
+typedef struct vc_map {
-typedef struct vc_map
+        volatile unsigned int tx:1;     /* TX vc? */
-{
+        volatile unsigned int rx:1;     /* RX vc? */
-   volatile unsigned int tx:1;                          /* TX vc? */
+        struct atm_vcc *tx_vcc, *rx_vcc;
-   volatile unsigned int rx:1;                          /* RX vc? */
+        struct sk_buff *rx_iov; /* RX iovector skb */
-   struct atm_vcc *tx_vcc, *rx_vcc;
+        scq_info *scq;          /* To keep track of the SCQ */
-   struct sk_buff *rx_iov;              /* RX iovector skb */
+        u32 cbr_scd;            /* SRAM address of the corresponding
-   scq_info *scq;                       /* To keep track of the SCQ */
+                                   SCD. 0x00000000 for UBR/VBR/ABR */
-   u32 cbr_scd;                         /* SRAM address of the corresponding
+        int tbd_count;
-                                           SCD. 0x00000000 for UBR/VBR/ABR */
-   int tbd_count;
 } vc_map;
+typedef struct ns_dev {
-struct ns_skb_data
+        int index;              /* Card ID to the device driver */
-{
+        int sram_size;          /* In k x 32bit words. 32 or 128 */
-        struct atm_vcc *vcc;
+        void __iomem *membase;  /* Card's memory base address */
-        int iovcnt;
+        unsigned long max_pcr;
-};
+        int rct_size;           /* Number of entries */
+        int vpibits;
-#define NS_SKB(skb) (((struct ns_skb_data *) (skb)->cb))
+        int vcibits;
+        struct pci_dev *pcidev;
+        struct idr idr;
-typedef struct ns_dev
+        struct atm_dev *atmdev;
-{
+        tsq_info tsq;
-   int index;                           /* Card ID to the device driver */
+        rsq_info rsq;
-   int sram_size;                       /* In k x 32bit words. 32 or 128 */
+        scq_info *scq0, *scq1, *scq2;   /* VBR SCQs */
-   void __iomem *membase;               /* Card's memory base address */
+        skb_pool sbpool;        /* Small buffers */
-   unsigned long max_pcr;
+        skb_pool lbpool;        /* Large buffers */
-   int rct_size;                        /* Number of entries */
+        skb_pool hbpool;        /* Pre-allocated huge buffers */
-   int vpibits;
+        skb_pool iovpool;       /* iovector buffers */
-   int vcibits;
+        volatile int efbie;     /* Empty free buf. queue int. enabled */
-   struct pci_dev *pcidev;
+        volatile u32 tst_addr;  /* SRAM address of the TST in use */
-   struct atm_dev *atmdev;
+        volatile int tst_free_entries;
-   tsq_info tsq;
+        vc_map vcmap[NS_MAX_RCTSIZE];
-   rsq_info rsq;
+        vc_map *tste2vc[NS_TST_NUM_ENTRIES];
-   scq_info *scq0, *scq1, *scq2;        /* VBR SCQs */
+        vc_map *scd2vc[NS_FRSCD_NUM];
-   skb_pool sbpool;                     /* Small buffers */
+        buf_nr sbnr;
-   skb_pool lbpool;                     /* Large buffers */
+        buf_nr lbnr;
-   skb_pool hbpool;                     /* Pre-allocated huge buffers */
+        buf_nr hbnr;
-   skb_pool iovpool;                    /* iovector buffers */
+        buf_nr iovnr;
-   volatile int efbie;                  /* Empty free buf. queue int. enabled */
+        int sbfqc;
-   volatile u32 tst_addr;               /* SRAM address of the TST in use */
+        int lbfqc;
-   volatile int tst_free_entries;
+        struct sk_buff *sm_handle;
-   vc_map vcmap[NS_MAX_RCTSIZE];
+        u32 sm_addr;
-   vc_map *tste2vc[NS_TST_NUM_ENTRIES];
+        struct sk_buff *lg_handle;
-   vc_map *scd2vc[NS_FRSCD_NUM];
+        u32 lg_addr;
-   buf_nr sbnr;
+        struct sk_buff *rcbuf;  /* Current raw cell buffer */
-   buf_nr lbnr;
+        struct ns_rcqe *rawcell;
-   buf_nr hbnr;
+        u32 rawch;              /* Raw cell queue head */
-   buf_nr iovnr;
+        unsigned intcnt;        /* Interrupt counter */
-   int sbfqc;
+        spinlock_t int_lock;    /* Interrupt lock */
-   int lbfqc;
+        spinlock_t res_lock;    /* Card resource lock */
-   u32 sm_handle;
-   u32 sm_addr;
-   u32 lg_handle;
-   u32 lg_addr;
-   struct sk_buff *rcbuf;               /* Current raw cell buffer */
-   u32 rawch;                           /* Raw cell queue head */
-   unsigned intcnt;                     /* Interrupt counter */
-   spinlock_t int_lock;         /* Interrupt lock */
-   spinlock_t res_lock;         /* Card resource lock */
 } ns_dev;
   /* NOTE: Each tste2vc entry relates a given TST entry to the corresponding
-            CBR vc. If the entry is not allocated, it must be NULL.
+      CBR vc. If the entry is not allocated, it must be NULL.
-            
-            There are two TSTs so the driver can modify them on the fly
+      There are two TSTs so the driver can modify them on the fly
-            without stopping the transmission.
+      without stopping the transmission.
-            
-            scd2vc allows us to find out unused fixed rate SCDs, because
-            they must have a NULL pointer here. */
+      scd2vc allows us to find out unused fixed rate SCDs, because
+      they must have a NULL pointer here. */
 #endif /* _LINUX_NICSTAR_H_ */
diff --git a/drivers/atm/nicstarmac.c b/drivers/atm/nicstarmac.c
index 842e26c45557..f594526f8c6d 100644
--- a/drivers/atm/nicstarmac.c
+++ b/drivers/atm/nicstarmac.c
@@ -13,15 +13,15 @@ typedef void __iomem *virt_addr_t;
 #define CYCLE_DELAY 5
-/* This was the original definition
+/*
+   This was the original definition
 #define osp_MicroDelay(microsec) \
    do { int _i = 4*microsec; while (--_i > 0) { __SLOW_DOWN_IO; }} while (0)
 */
 #define osp_MicroDelay(microsec) {unsigned long useconds = (microsec); \
                                  udelay((useconds));}
+/*
+ * The following tables represent the timing diagrams found in
-/* The following tables represent the timing diagrams found in
 * the Data Sheet for the Xicor X25020 EEProm.  The #defines below
 * represent the bits in the NICStAR's General Purpose register
 * that must be toggled for the corresponding actions on the EEProm
@@ -31,86 +31,80 @@ typedef void __iomem *virt_addr_t;
 /* Write Data To EEProm from SI line on rising edge of CLK */
 /* Read Data From EEProm on falling edge of CLK */
-#define CS_HIGH         0x0002          /* Chip select high */
+#define CS_HIGH         0x0002  /* Chip select high */
-#define CS_LOW          0x0000          /* Chip select low (active low)*/
+#define CS_LOW          0x0000  /* Chip select low (active low) */
-#define CLK_HIGH        0x0004          /* Clock high */
+#define CLK_HIGH        0x0004  /* Clock high */
-#define CLK_LOW         0x0000          /* Clock low  */
+#define CLK_LOW         0x0000  /* Clock low  */
-#define SI_HIGH         0x0001          /* Serial input data high */
+#define SI_HIGH         0x0001  /* Serial input data high */
-#define SI_LOW          0x0000          /* Serial input data low */
+#define SI_LOW          0x0000  /* Serial input data low */
 /* Read Status Register = 0000 0101b */
 #if 0
-static u_int32_t rdsrtab[] =
+static u_int32_t rdsrtab[] = {
-{
+        CS_HIGH | CLK_HIGH,
-    CS_HIGH | CLK_HIGH, 
+        CS_LOW | CLK_LOW,
-    CS_LOW | CLK_LOW, 
+        CLK_HIGH,               /* 0 */
-    CLK_HIGH,             /* 0 */
+        CLK_LOW,
-    CLK_LOW, 
+        CLK_HIGH,               /* 0 */
-    CLK_HIGH,             /* 0 */
+        CLK_LOW,
-    CLK_LOW, 
+        CLK_HIGH,               /* 0 */
-    CLK_HIGH,             /* 0 */
+        CLK_LOW,
-    CLK_LOW,
+        CLK_HIGH,               /* 0 */
-    CLK_HIGH,             /* 0 */
+        CLK_LOW,
-    CLK_LOW, 
+        CLK_HIGH,               /* 0 */
-    CLK_HIGH,             /* 0 */
+        CLK_LOW | SI_HIGH,
-    CLK_LOW | SI_HIGH, 
+        CLK_HIGH | SI_HIGH,     /* 1 */
-    CLK_HIGH | SI_HIGH,   /* 1 */
+        CLK_LOW | SI_LOW,
-    CLK_LOW | SI_LOW, 
+        CLK_HIGH,               /* 0 */
-    CLK_HIGH,             /* 0 */
+        CLK_LOW | SI_HIGH,
-    CLK_LOW | SI_HIGH, 
+        CLK_HIGH | SI_HIGH      /* 1 */
-    CLK_HIGH | SI_HIGH   /* 1 */
 };
-#endif  /*  0  */
+#endif /*  0  */
 /* Read from EEPROM = 0000 0011b */
-static u_int32_t readtab[] =
+static u_int32_t readtab[] = {
-{
+        /*
-    /*
+           CS_HIGH | CLK_HIGH,
-    CS_HIGH | CLK_HIGH, 
+         */
-    */
+        CS_LOW | CLK_LOW,
-    CS_LOW | CLK_LOW, 
+        CLK_HIGH,               /* 0 */
-    CLK_HIGH,             /* 0 */
+        CLK_LOW,
-    CLK_LOW, 
+        CLK_HIGH,               /* 0 */
-    CLK_HIGH,             /* 0 */
+        CLK_LOW,
-    CLK_LOW, 
+        CLK_HIGH,               /* 0 */
-    CLK_HIGH,             /* 0 */
+        CLK_LOW,
-    CLK_LOW,
+        CLK_HIGH,               /* 0 */
-    CLK_HIGH,             /* 0 */
+        CLK_LOW,
-    CLK_LOW, 
+        CLK_HIGH,               /* 0 */
-    CLK_HIGH,             /* 0 */
+        CLK_LOW,
-    CLK_LOW, 
+        CLK_HIGH,               /* 0 */
-    CLK_HIGH,             /* 0 */
+        CLK_LOW | SI_HIGH,
-    CLK_LOW | SI_HIGH, 
+        CLK_HIGH | SI_HIGH,     /* 1 */
-    CLK_HIGH | SI_HIGH,   /* 1 */
+        CLK_LOW | SI_HIGH,
-    CLK_LOW | SI_HIGH, 
+        CLK_HIGH | SI_HIGH      /* 1 */
-    CLK_HIGH | SI_HIGH    /* 1 */
 };
 /* Clock to read from/write to the eeprom */
-static u_int32_t clocktab[] =
+static u_int32_t clocktab[] = {
-{       
+        CLK_LOW,
-    CLK_LOW,
+        CLK_HIGH,
-    CLK_HIGH,
+        CLK_LOW,
-    CLK_LOW, 
+        CLK_HIGH,
-    CLK_HIGH,
+        CLK_LOW,
-    CLK_LOW,
+        CLK_HIGH,
-    CLK_HIGH,
+        CLK_LOW,
-    CLK_LOW, 
+        CLK_HIGH,
-    CLK_HIGH,
+        CLK_LOW,
-    CLK_LOW, 
+        CLK_HIGH,
-    CLK_HIGH,
+        CLK_LOW,
-    CLK_LOW, 
+        CLK_HIGH,
-    CLK_HIGH, 
+        CLK_LOW,
-    CLK_LOW, 
+        CLK_HIGH,
-    CLK_HIGH,
+        CLK_LOW,
-    CLK_LOW, 
+        CLK_HIGH,
-    CLK_HIGH,
+        CLK_LOW
-    CLK_LOW 
 };
 #define NICSTAR_REG_WRITE(bs, reg, val) \
        while ( readl(bs + STAT) & 0x0200 ) ; \
        writel((val),(base)+(reg))
@@ -124,153 +118,131 @@ static u_int32_t clocktab[] =
 * register.  
 */
 #if 0
-u_int32_t
+u_int32_t nicstar_read_eprom_status(virt_addr_t base)
-nicstar_read_eprom_status( virt_addr_t base )
 {
-   u_int32_t    val;
+        u_int32_t val;
-   u_int32_t    rbyte;
+        u_int32_t rbyte;
-   int32_t      i, j;
+        int32_t i, j;
-   /* Send read instruction */
+        /* Send read instruction */
-   val = NICSTAR_REG_READ( base, NICSTAR_REG_GENERAL_PURPOSE ) & 0xFFFFFFF0;
+        val = NICSTAR_REG_READ(base, NICSTAR_REG_GENERAL_PURPOSE) & 0xFFFFFFF0;
-   for (i=0; i<ARRAY_SIZE(rdsrtab); i++)
+        for (i = 0; i < ARRAY_SIZE(rdsrtab); i++) {
-   {
+                NICSTAR_REG_WRITE(base, NICSTAR_REG_GENERAL_PURPOSE,
-        NICSTAR_REG_WRITE( base, NICSTAR_REG_GENERAL_PURPOSE,
+                                  (val | rdsrtab[i]));
-                (val | rdsrtab[i]) );
+                osp_MicroDelay(CYCLE_DELAY);
-        osp_MicroDelay( CYCLE_DELAY );
+        }
-   }
+        /* Done sending instruction - now pull data off of bit 16, MSB first */
-   /* Done sending instruction - now pull data off of bit 16, MSB first */
+        /* Data clocked out of eeprom on falling edge of clock */
-   /* Data clocked out of eeprom on falling edge of clock */
+        rbyte = 0;
-   rbyte = 0;
+        for (i = 7, j = 0; i >= 0; i--) {
-   for (i=7, j=0; i>=0; i--)
+                NICSTAR_REG_WRITE(base, NICSTAR_REG_GENERAL_PURPOSE,
-   {
+                                  (val | clocktab[j++]));
-        NICSTAR_REG_WRITE( base, NICSTAR_REG_GENERAL_PURPOSE,
+                rbyte |= (((NICSTAR_REG_READ(base, NICSTAR_REG_GENERAL_PURPOSE)
-                (val | clocktab[j++]) );
+                            & 0x00010000) >> 16) << i);
-        rbyte |= (((NICSTAR_REG_READ( base, NICSTAR_REG_GENERAL_PURPOSE)
+                NICSTAR_REG_WRITE(base, NICSTAR_REG_GENERAL_PURPOSE,
-                        & 0x00010000) >> 16) << i);
+                                  (val | clocktab[j++]));
-        NICSTAR_REG_WRITE( base, NICSTAR_REG_GENERAL_PURPOSE,
+                osp_MicroDelay(CYCLE_DELAY);
-                (val | clocktab[j++]) );
+        }
-        osp_MicroDelay( CYCLE_DELAY );
+        NICSTAR_REG_WRITE(base, NICSTAR_REG_GENERAL_PURPOSE, 2);
-   }
+        osp_MicroDelay(CYCLE_DELAY);
-   NICSTAR_REG_WRITE( base, NICSTAR_REG_GENERAL_PURPOSE, 2 );
+        return rbyte;
-   osp_MicroDelay( CYCLE_DELAY );
-   return rbyte;
 }
-#endif  /*  0  */
+#endif /*  0  */
 /*
 * This routine will clock the Read_data function into the X2520
 * eeprom, followed by the address to read from, through the NicSTaR's General
 * Purpose register.  
 */
- 
-static u_int8_t 
+static u_int8_t read_eprom_byte(virt_addr_t base, u_int8_t offset)
-read_eprom_byte(virt_addr_t base, u_int8_t offset)
 {
-   u_int32_t val = 0;
+        u_int32_t val = 0;
-   int i,j=0;
+        int i, j = 0;
-   u_int8_t tempread = 0;
+        u_int8_t tempread = 0;
-   val = NICSTAR_REG_READ( base, NICSTAR_REG_GENERAL_PURPOSE ) & 0xFFFFFFF0;
+        val = NICSTAR_REG_READ(base, NICSTAR_REG_GENERAL_PURPOSE) & 0xFFFFFFF0;
-   /* Send READ instruction */
+        /* Send READ instruction */
-   for (i=0; i<ARRAY_SIZE(readtab); i++)
+        for (i = 0; i < ARRAY_SIZE(readtab); i++) {
-   {
+                NICSTAR_REG_WRITE(base, NICSTAR_REG_GENERAL_PURPOSE,
-        NICSTAR_REG_WRITE( base, NICSTAR_REG_GENERAL_PURPOSE,
+                                  (val | readtab[i]));
-                (val | readtab[i]) );
+                osp_MicroDelay(CYCLE_DELAY);
-        osp_MicroDelay( CYCLE_DELAY );
+        }
-   }
+        /* Next, we need to send the byte address to read from */
-   /* Next, we need to send the byte address to read from */
+        for (i = 7; i >= 0; i--) {
-   for (i=7; i>=0; i--)
+                NICSTAR_REG_WRITE(base, NICSTAR_REG_GENERAL_PURPOSE,
-   {
+                                  (val | clocktab[j++] | ((offset >> i) & 1)));
-      NICSTAR_REG_WRITE( base, NICSTAR_REG_GENERAL_PURPOSE,
+                osp_MicroDelay(CYCLE_DELAY);
-                (val | clocktab[j++] | ((offset >> i) & 1) ) );
+                NICSTAR_REG_WRITE(base, NICSTAR_REG_GENERAL_PURPOSE,
-      osp_MicroDelay(CYCLE_DELAY);
+                                  (val | clocktab[j++] | ((offset >> i) & 1)));
-      NICSTAR_REG_WRITE( base, NICSTAR_REG_GENERAL_PURPOSE,
+                osp_MicroDelay(CYCLE_DELAY);
-                (val | clocktab[j++] | ((offset >> i) & 1) ) );
+        }
-      osp_MicroDelay( CYCLE_DELAY );
-   }
+        j = 0;
-   j = 0;
+        /* Now, we can read data from the eeprom by clocking it in */
-   
+        for (i = 7; i >= 0; i--) {
-   /* Now, we can read data from the eeprom by clocking it in */
+                NICSTAR_REG_WRITE(base, NICSTAR_REG_GENERAL_PURPOSE,
-   for (i=7; i>=0; i--)
+                                  (val | clocktab[j++]));
-   {
+                osp_MicroDelay(CYCLE_DELAY);
-      NICSTAR_REG_WRITE( base, NICSTAR_REG_GENERAL_PURPOSE,
+                tempread |=
-                (val | clocktab[j++]) );
+                    (((NICSTAR_REG_READ(base, NICSTAR_REG_GENERAL_PURPOSE)
-      osp_MicroDelay( CYCLE_DELAY );
+                       & 0x00010000) >> 16) << i);
-      tempread |= (((NICSTAR_REG_READ( base, NICSTAR_REG_GENERAL_PURPOSE )
+                NICSTAR_REG_WRITE(base, NICSTAR_REG_GENERAL_PURPOSE,
-                & 0x00010000) >> 16) << i);
+                                  (val | clocktab[j++]));
-      NICSTAR_REG_WRITE( base, NICSTAR_REG_GENERAL_PURPOSE,
+                osp_MicroDelay(CYCLE_DELAY);
-                (val | clocktab[j++]) );
+        }
-      osp_MicroDelay( CYCLE_DELAY );
-   }
+        NICSTAR_REG_WRITE(base, NICSTAR_REG_GENERAL_PURPOSE, 2);
+        osp_MicroDelay(CYCLE_DELAY);
-   NICSTAR_REG_WRITE( base, NICSTAR_REG_GENERAL_PURPOSE, 2 );
+        return tempread;
-   osp_MicroDelay( CYCLE_DELAY );
-   return tempread;
 }
+static void nicstar_init_eprom(virt_addr_t base)
-static void
-nicstar_init_eprom( virt_addr_t base )
 {
-    u_int32_t val;
+        u_int32_t val;
-    /*
+        /*
-     * turn chip select off
+         * turn chip select off
-     */
+         */
-    val = NICSTAR_REG_READ(base, NICSTAR_REG_GENERAL_PURPOSE) & 0xFFFFFFF0;
+        val = NICSTAR_REG_READ(base, NICSTAR_REG_GENERAL_PURPOSE) & 0xFFFFFFF0;
-    NICSTAR_REG_WRITE(base, NICSTAR_REG_GENERAL_PURPOSE,
+        NICSTAR_REG_WRITE(base, NICSTAR_REG_GENERAL_PURPOSE,
-        (val | CS_HIGH | CLK_HIGH));
+                          (val | CS_HIGH | CLK_HIGH));
-    osp_MicroDelay( CYCLE_DELAY );
+        osp_MicroDelay(CYCLE_DELAY);
-    NICSTAR_REG_WRITE(base, NICSTAR_REG_GENERAL_PURPOSE,
+        NICSTAR_REG_WRITE(base, NICSTAR_REG_GENERAL_PURPOSE,
-        (val | CS_HIGH | CLK_LOW));
+                          (val | CS_HIGH | CLK_LOW));
-    osp_MicroDelay( CYCLE_DELAY );
+        osp_MicroDelay(CYCLE_DELAY);
-    NICSTAR_REG_WRITE(base, NICSTAR_REG_GENERAL_PURPOSE,
+        NICSTAR_REG_WRITE(base, NICSTAR_REG_GENERAL_PURPOSE,
-        (val | CS_HIGH | CLK_HIGH));
+                          (val | CS_HIGH | CLK_HIGH));
-    osp_MicroDelay( CYCLE_DELAY );
+        osp_MicroDelay(CYCLE_DELAY);
-    NICSTAR_REG_WRITE(base, NICSTAR_REG_GENERAL_PURPOSE,
+        NICSTAR_REG_WRITE(base, NICSTAR_REG_GENERAL_PURPOSE,
-        (val | CS_HIGH | CLK_LOW));
+                          (val | CS_HIGH | CLK_LOW));
-    osp_MicroDelay( CYCLE_DELAY );
+        osp_MicroDelay(CYCLE_DELAY);
 }
 /*
 * This routine will be the interface to the ReadPromByte function
 * above.
- */ 
+ */
 static void
-nicstar_read_eprom(
+nicstar_read_eprom(virt_addr_t base,
-    virt_addr_t base,
+                   u_int8_t prom_offset, u_int8_t * buffer, u_int32_t nbytes)
-    u_int8_t    prom_offset,
-    u_int8_t    *buffer,
-    u_int32_t   nbytes )
 {
-    u_int               i;
+        u_int i;
-    
-    for (i=0; i<nbytes; i++)
-    {
-        buffer[i] = read_eprom_byte( base, prom_offset );
-        ++prom_offset;
-        osp_MicroDelay( CYCLE_DELAY );
-    }
-}
-/*
+        for (i = 0; i < nbytes; i++) {
-void osp_MicroDelay(int x) {
+                buffer[i] = read_eprom_byte(base, prom_offset);
-    
+                ++prom_offset;
+                osp_MicroDelay(CYCLE_DELAY);
+        }
 }
-*/
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index ded76c4c9f4f..6174965d9a4d 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -383,7 +383,7 @@ static int process_status(struct solos_card *card, int port, struct sk_buff *skb
        /* Anything but 'Showtime' is down */
        if (strcmp(state_str, "Showtime")) {
-                card->atmdev[port]->signal = ATM_PHY_SIG_LOST;
+                atm_dev_signal_change(card->atmdev[port], ATM_PHY_SIG_LOST);
                release_vccs(card->atmdev[port]);
                dev_info(&card->dev->dev, "Port %d: %s\n", port, state_str);
                return 0;
@@ -401,7 +401,7 @@ static int process_status(struct solos_card *card, int port, struct sk_buff *skb
                 snr[0]?", SNR ":"", snr, attn[0]?", Attn ":"", attn);
        
        card->atmdev[port]->link_rate = rate_down / 424;
-        card->atmdev[port]->signal = ATM_PHY_SIG_FOUND;
+        atm_dev_signal_change(card->atmdev[port], ATM_PHY_SIG_FOUND);
        return 0;
 }
@@ -1246,7 +1246,7 @@ static int atm_init(struct solos_card *card)
                card->atmdev[i]->ci_range.vci_bits = 16;
                card->atmdev[i]->dev_data = card;
                card->atmdev[i]->phy_data = (void *)(unsigned long)i;
-                card->atmdev[i]->signal = ATM_PHY_SIG_UNKNOWN;
+                atm_dev_signal_change(card->atmdev[i], ATM_PHY_SIG_UNKNOWN);
                skb = alloc_skb(sizeof(*header), GFP_ATOMIC);
                if (!skb) {
diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
index da4b91ffa53e..41c56eae4c81 100644
--- a/drivers/atm/suni.c
+++ b/drivers/atm/suni.c
@@ -291,8 +291,9 @@ static int suni_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
 static void poll_los(struct atm_dev *dev)
 {
-        dev->signal = GET(RSOP_SIS) & SUNI_RSOP_SIS_LOSV ? ATM_PHY_SIG_LOST :
+        atm_dev_signal_change(dev,
-          ATM_PHY_SIG_FOUND;
+                GET(RSOP_SIS) & SUNI_RSOP_SIS_LOSV ?
+                ATM_PHY_SIG_LOST : ATM_PHY_SIG_FOUND);
 }
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
index 702accec89e9..4e885d2da49c 100644
--- a/drivers/atm/zatm.c
+++ b/drivers/atm/zatm.c
@@ -1637,10 +1637,8 @@ out_free:
 MODULE_LICENSE("GPL");
 static struct pci_device_id zatm_pci_tbl[] __devinitdata = {
-        { PCI_VENDOR_ID_ZEITNET, PCI_DEVICE_ID_ZEITNET_1221,
+        { PCI_VDEVICE(ZEITNET, PCI_DEVICE_ID_ZEITNET_1221), ZATM_COPPER },
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, ZATM_COPPER },
+        { PCI_VDEVICE(ZEITNET, PCI_DEVICE_ID_ZEITNET_1225), 0 },
-        { PCI_VENDOR_ID_ZEITNET, PCI_DEVICE_ID_ZEITNET_1225,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
        { 0, }
 };
 MODULE_DEVICE_TABLE(pci, zatm_pci_tbl);
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 9630fbdf4e6c..f8e72724dd4b 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -673,7 +673,7 @@ static struct kobject *get_device_parent(struct device *dev,
                 */
                if (parent == NULL)
                        parent_kobj = virtual_device_parent(dev);
-                else if (parent->class)
+                else if (parent->class && !dev->class->ns_type)
                        return &parent->kobj;
                else
                        parent_kobj = &parent->kobj;
@@ -1819,3 +1819,67 @@ void device_shutdown(void)
        spin_unlock(&devices_kset->list_lock);
        async_synchronize_full();
 }
+/*
+ * Device logging functions
+ */
+#ifdef CONFIG_PRINTK
+static int __dev_printk(const char *level, const struct device *dev,
+                        struct va_format *vaf)
+{
+        if (!dev)
+                return printk("%s(NULL device *): %pV", level, vaf);
+        return printk("%s%s %s: %pV",
+                      level, dev_driver_string(dev), dev_name(dev), vaf);
+}
+int dev_printk(const char *level, const struct device *dev,
+               const char *fmt, ...)
+{
+        struct va_format vaf;
+        va_list args;
+        int r;
+        va_start(args, fmt);
+        vaf.fmt = fmt;
+        vaf.va = &args;
+        r = __dev_printk(level, dev, &vaf);
+        va_end(args);
+        return r;
+}
+EXPORT_SYMBOL(dev_printk);
+#define define_dev_printk_level(func, kern_level)               \
+int func(const struct device *dev, const char *fmt, ...)        \
+{                                                               \
+        struct va_format vaf;                                   \
+        va_list args;                                           \
+        int r;                                                  \
+                                                                \
+        va_start(args, fmt);                                    \
+                                                                \
+        vaf.fmt = fmt;                                          \
+        vaf.va = &args;                                         \
+                                                                \
+        r = __dev_printk(kern_level, dev, &vaf);                \
+        va_end(args);                                           \
+                                                                \
+        return r;                                               \
+}                                                               \
+EXPORT_SYMBOL(func);
+define_dev_printk_level(dev_emerg, KERN_EMERG);
+define_dev_printk_level(dev_alert, KERN_ALERT);
+define_dev_printk_level(dev_crit, KERN_CRIT);
+define_dev_printk_level(dev_err, KERN_ERR);
+define_dev_printk_level(dev_warn, KERN_WARNING);
+define_dev_printk_level(dev_notice, KERN_NOTICE);
+define_dev_printk_level(_dev_info, KERN_INFO);
+#endif
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 4d99c8bdfedc..f699fabf403b 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -12,6 +12,7 @@
 #include <linux/string.h>
 #include <linux/platform_device.h>
+#include <linux/of_device.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/dma-mapping.h>
@@ -635,6 +636,12 @@ static struct device_attribute platform_dev_attrs[] = {
 static int platform_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
        struct platform_device  *pdev = to_platform_device(dev);
+        int rc;
+        /* Some devices have extra OF data and an OF-style MODALIAS */
+        rc = of_device_uevent(dev,env);
+        if (rc != -ENODEV)
+                return rc;
        add_uevent_var(env, "MODALIAS=%s%s", PLATFORM_MODULE_PREFIX,
                (pdev->id_entry) ? pdev->id_entry->name : pdev->name);
@@ -673,7 +680,11 @@ static int platform_match(struct device *dev, struct device_driver *drv)
        struct platform_device *pdev = to_platform_device(dev);
        struct platform_driver *pdrv = to_platform_driver(drv);
-        /* match against the id table first */
+        /* Attempt an OF style match first */
+        if (of_driver_match_device(dev, drv))
+                return 1;
+        /* Then try to match against the id table */
        if (pdrv->id_table)
                return platform_match_id(pdrv->id_table, pdev) != NULL;
diff --git a/drivers/base/power/Makefile b/drivers/base/power/Makefile
index 89de75325cea..cbccf9a3cee4 100644
--- a/drivers/base/power/Makefile
+++ b/drivers/base/power/Makefile
@@ -1,5 +1,5 @@
 obj-$(CONFIG_PM)        += sysfs.o
-obj-$(CONFIG_PM_SLEEP)  += main.o
+obj-$(CONFIG_PM_SLEEP)  += main.o wakeup.o
 obj-$(CONFIG_PM_RUNTIME)        += runtime.o
 obj-$(CONFIG_PM_OPS)    += generic_ops.o
 obj-$(CONFIG_PM_TRACE_RTC)      += trace.o
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 941fcb87e52a..5419a49ff135 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -59,6 +59,7 @@ void device_pm_init(struct device *dev)
 {
        dev->power.status = DPM_ON;
        init_completion(&dev->power.completion);
+        dev->power.wakeup_count = 0;
        pm_runtime_init(dev);
 }
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index b0ec0e9f27e9..b78c401ffa73 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -123,6 +123,45 @@ int pm_runtime_idle(struct device *dev)
 }
 EXPORT_SYMBOL_GPL(pm_runtime_idle);
+/**
+ * update_pm_runtime_accounting - Update the time accounting of power states
+ * @dev: Device to update the accounting for
+ *
+ * In order to be able to have time accounting of the various power states
+ * (as used by programs such as PowerTOP to show the effectiveness of runtime
+ * PM), we need to track the time spent in each state.
+ * update_pm_runtime_accounting must be called each time before the
+ * runtime_status field is updated, to account the time in the old state
+ * correctly.
+ */
+void update_pm_runtime_accounting(struct device *dev)
+{
+        unsigned long now = jiffies;
+        int delta;
+        delta = now - dev->power.accounting_timestamp;
+        if (delta < 0)
+                delta = 0;
+        dev->power.accounting_timestamp = now;
+        if (dev->power.disable_depth > 0)
+                return;
+        if (dev->power.runtime_status == RPM_SUSPENDED)
+                dev->power.suspended_jiffies += delta;
+        else
+                dev->power.active_jiffies += delta;
+}
+static void __update_runtime_status(struct device *dev, enum rpm_status status)
+{
+        update_pm_runtime_accounting(dev);
+        dev->power.runtime_status = status;
+}
 /**
 * __pm_runtime_suspend - Carry out run-time suspend of given device.
 * @dev: Device to suspend.
@@ -197,7 +236,7 @@ int __pm_runtime_suspend(struct device *dev, bool from_wq)
                goto repeat;
        }
-        dev->power.runtime_status = RPM_SUSPENDING;
+        __update_runtime_status(dev, RPM_SUSPENDING);
        dev->power.deferred_resume = false;
        if (dev->bus && dev->bus->pm && dev->bus->pm->runtime_suspend) {
@@ -228,7 +267,7 @@ int __pm_runtime_suspend(struct device *dev, bool from_wq)
        }
        if (retval) {
-                dev->power.runtime_status = RPM_ACTIVE;
+                __update_runtime_status(dev, RPM_ACTIVE);
                if (retval == -EAGAIN || retval == -EBUSY) {
                        if (dev->power.timer_expires == 0)
                                notify = true;
@@ -237,7 +276,7 @@ int __pm_runtime_suspend(struct device *dev, bool from_wq)
                        pm_runtime_cancel_pending(dev);
                }
        } else {
-                dev->power.runtime_status = RPM_SUSPENDED;
+                __update_runtime_status(dev, RPM_SUSPENDED);
                pm_runtime_deactivate_timer(dev);
                if (dev->parent) {
@@ -381,7 +420,7 @@ int __pm_runtime_resume(struct device *dev, bool from_wq)
                goto repeat;
        }
-        dev->power.runtime_status = RPM_RESUMING;
+        __update_runtime_status(dev, RPM_RESUMING);
        if (dev->bus && dev->bus->pm && dev->bus->pm->runtime_resume) {
                spin_unlock_irq(&dev->power.lock);
@@ -411,10 +450,10 @@ int __pm_runtime_resume(struct device *dev, bool from_wq)
        }
        if (retval) {
-                dev->power.runtime_status = RPM_SUSPENDED;
+                __update_runtime_status(dev, RPM_SUSPENDED);
                pm_runtime_cancel_pending(dev);
        } else {
-                dev->power.runtime_status = RPM_ACTIVE;
+                __update_runtime_status(dev, RPM_ACTIVE);
                if (parent)
                        atomic_inc(&parent->power.child_count);
        }
@@ -848,7 +887,7 @@ int __pm_runtime_set_status(struct device *dev, unsigned int status)
        }
 out_set:
-        dev->power.runtime_status = status;
+        __update_runtime_status(dev, status);
        dev->power.runtime_error = 0;
 out:
        spin_unlock_irqrestore(&dev->power.lock, flags);
@@ -1077,6 +1116,7 @@ void pm_runtime_init(struct device *dev)
        dev->power.request_pending = false;
        dev->power.request = RPM_REQ_NONE;
        dev->power.deferred_resume = false;
+        dev->power.accounting_timestamp = jiffies;
        INIT_WORK(&dev->power.work, pm_runtime_work);
        dev->power.timer_expires = 0;
diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
index a4c33bc51257..e56b4388fe61 100644
--- a/drivers/base/power/sysfs.c
+++ b/drivers/base/power/sysfs.c
@@ -6,6 +6,7 @@
 #include <linux/string.h>
 #include <linux/pm_runtime.h>
 #include <asm/atomic.h>
+#include <linux/jiffies.h>
 #include "power.h"
 /*
@@ -73,6 +74,8 @@
 *      device are known to the PM core.  However, for some devices this
 *      attribute is set to "enabled" by bus type code or device drivers and in
 *      that cases it should be safe to leave the default value.
+ *
+ *      wakeup_count - Report the number of wakeup events related to the device
 */
 static const char enabled[] = "enabled";
@@ -108,6 +111,65 @@ static ssize_t control_store(struct device * dev, struct device_attribute *attr,
 }
 static DEVICE_ATTR(control, 0644, control_show, control_store);
+static ssize_t rtpm_active_time_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        int ret;
+        spin_lock_irq(&dev->power.lock);
+        update_pm_runtime_accounting(dev);
+        ret = sprintf(buf, "%i\n", jiffies_to_msecs(dev->power.active_jiffies));
+        spin_unlock_irq(&dev->power.lock);
+        return ret;
+}
+static DEVICE_ATTR(runtime_active_time, 0444, rtpm_active_time_show, NULL);
+static ssize_t rtpm_suspended_time_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        int ret;
+        spin_lock_irq(&dev->power.lock);
+        update_pm_runtime_accounting(dev);
+        ret = sprintf(buf, "%i\n",
+                jiffies_to_msecs(dev->power.suspended_jiffies));
+        spin_unlock_irq(&dev->power.lock);
+        return ret;
+}
+static DEVICE_ATTR(runtime_suspended_time, 0444, rtpm_suspended_time_show, NULL);
+static ssize_t rtpm_status_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        const char *p;
+        if (dev->power.runtime_error) {
+                p = "error\n";
+        } else if (dev->power.disable_depth) {
+                p = "unsupported\n";
+        } else {
+                switch (dev->power.runtime_status) {
+                case RPM_SUSPENDED:
+                        p = "suspended\n";
+                        break;
+                case RPM_SUSPENDING:
+                        p = "suspending\n";
+                        break;
+                case RPM_RESUMING:
+                        p = "resuming\n";
+                        break;
+                case RPM_ACTIVE:
+                        p = "active\n";
+                        break;
+                default:
+                        return -EIO;
+                }
+        }
+        return sprintf(buf, p);
+}
+static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
 #endif
 static ssize_t
@@ -144,6 +206,16 @@ wake_store(struct device * dev, struct device_attribute *attr,
 static DEVICE_ATTR(wakeup, 0644, wake_show, wake_store);
+#ifdef CONFIG_PM_SLEEP
+static ssize_t wakeup_count_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        return sprintf(buf, "%lu\n", dev->power.wakeup_count);
+}
+static DEVICE_ATTR(wakeup_count, 0444, wakeup_count_show, NULL);
+#endif
 #ifdef CONFIG_PM_ADVANCED_DEBUG
 #ifdef CONFIG_PM_RUNTIME
@@ -172,27 +244,8 @@ static ssize_t rtpm_enabled_show(struct device *dev,
        return sprintf(buf, "enabled\n");
 }
-static ssize_t rtpm_status_show(struct device *dev,
-                                struct device_attribute *attr, char *buf)
-{
-        if (dev->power.runtime_error)
-                return sprintf(buf, "error\n");
-        switch (dev->power.runtime_status) {
-        case RPM_SUSPENDED:
-                return sprintf(buf, "suspended\n");
-        case RPM_SUSPENDING:
-                return sprintf(buf, "suspending\n");
-        case RPM_RESUMING:
-                return sprintf(buf, "resuming\n");
-        case RPM_ACTIVE:
-                return sprintf(buf, "active\n");
-        }
-        return -EIO;
-}
 static DEVICE_ATTR(runtime_usage, 0444, rtpm_usagecount_show, NULL);
 static DEVICE_ATTR(runtime_active_kids, 0444, rtpm_children_show, NULL);
-static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
 static DEVICE_ATTR(runtime_enabled, 0444, rtpm_enabled_show, NULL);
 #endif
@@ -228,14 +281,19 @@ static DEVICE_ATTR(async, 0644, async_show, async_store);
 static struct attribute * power_attrs[] = {
 #ifdef CONFIG_PM_RUNTIME
        &dev_attr_control.attr,
+        &dev_attr_runtime_status.attr,
+        &dev_attr_runtime_suspended_time.attr,
+        &dev_attr_runtime_active_time.attr,
 #endif
        &dev_attr_wakeup.attr,
+#ifdef CONFIG_PM_SLEEP
+        &dev_attr_wakeup_count.attr,
+#endif
 #ifdef CONFIG_PM_ADVANCED_DEBUG
        &dev_attr_async.attr,
 #ifdef CONFIG_PM_RUNTIME
        &dev_attr_runtime_usage.attr,
        &dev_attr_runtime_active_kids.attr,
-        &dev_attr_runtime_status.attr,
        &dev_attr_runtime_enabled.attr,
 #endif
 #endif
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
new file mode 100644
index 000000000000..eb594facfc3f
--- /dev/null
+++ b/drivers/base/power/wakeup.c
@@ -0,0 +1,247 @@
+/*
+ * drivers/base/power/wakeup.c - System wakeup events framework
+ *
+ * Copyright (c) 2010 Rafael J. Wysocki <rjw@sisk.pl>, Novell Inc.
+ *
+ * This file is released under the GPLv2.
+ */
+#include <linux/device.h>
+#include <linux/slab.h>
+#include <linux/sched.h>
+#include <linux/capability.h>
+#include <linux/suspend.h>
+#include <linux/pm.h>
+/*
+ * If set, the suspend/hibernate code will abort transitions to a sleep state
+ * if wakeup events are registered during or immediately before the transition.
+ */
+bool events_check_enabled;
+/* The counter of registered wakeup events. */
+static unsigned long event_count;
+/* A preserved old value of event_count. */
+static unsigned long saved_event_count;
+/* The counter of wakeup events being processed. */
+static unsigned long events_in_progress;
+static DEFINE_SPINLOCK(events_lock);
+static void pm_wakeup_timer_fn(unsigned long data);
+static DEFINE_TIMER(events_timer, pm_wakeup_timer_fn, 0, 0);
+static unsigned long events_timer_expires;
+/*
+ * The functions below use the observation that each wakeup event starts a
+ * period in which the system should not be suspended.  The moment this period
+ * will end depends on how the wakeup event is going to be processed after being
+ * detected and all of the possible cases can be divided into two distinct
+ * groups.
+ *
+ * First, a wakeup event may be detected by the same functional unit that will
+ * carry out the entire processing of it and possibly will pass it to user space
+ * for further processing.  In that case the functional unit that has detected
+ * the event may later "close" the "no suspend" period associated with it
+ * directly as soon as it has been dealt with.  The pair of pm_stay_awake() and
+ * pm_relax(), balanced with each other, is supposed to be used in such
+ * situations.
+ *
+ * Second, a wakeup event may be detected by one functional unit and processed
+ * by another one.  In that case the unit that has detected it cannot really
+ * "close" the "no suspend" period associated with it, unless it knows in
+ * advance what's going to happen to the event during processing.  This
+ * knowledge, however, may not be available to it, so it can simply specify time
+ * to wait before the system can be suspended and pass it as the second
+ * argument of pm_wakeup_event().
+ */
+/**
+ * pm_stay_awake - Notify the PM core that a wakeup event is being processed.
+ * @dev: Device the wakeup event is related to.
+ *
+ * Notify the PM core of a wakeup event (signaled by @dev) by incrementing the
+ * counter of wakeup events being processed.  If @dev is not NULL, the counter
+ * of wakeup events related to @dev is incremented too.
+ *
+ * Call this function after detecting of a wakeup event if pm_relax() is going
+ * to be called directly after processing the event (and possibly passing it to
+ * user space for further processing).
+ *
+ * It is safe to call this function from interrupt context.
+ */
+void pm_stay_awake(struct device *dev)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&events_lock, flags);
+        if (dev)
+                dev->power.wakeup_count++;
+        events_in_progress++;
+        spin_unlock_irqrestore(&events_lock, flags);
+}
+/**
+ * pm_relax - Notify the PM core that processing of a wakeup event has ended.
+ *
+ * Notify the PM core that a wakeup event has been processed by decrementing
+ * the counter of wakeup events being processed and incrementing the counter
+ * of registered wakeup events.
+ *
+ * Call this function for wakeup events whose processing started with calling
+ * pm_stay_awake().
+ *
+ * It is safe to call it from interrupt context.
+ */
+void pm_relax(void)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&events_lock, flags);
+        if (events_in_progress) {
+                events_in_progress--;
+                event_count++;
+        }
+        spin_unlock_irqrestore(&events_lock, flags);
+}
+/**
+ * pm_wakeup_timer_fn - Delayed finalization of a wakeup event.
+ *
+ * Decrease the counter of wakeup events being processed after it was increased
+ * by pm_wakeup_event().
+ */
+static void pm_wakeup_timer_fn(unsigned long data)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&events_lock, flags);
+        if (events_timer_expires
+            && time_before_eq(events_timer_expires, jiffies)) {
+                events_in_progress--;
+                events_timer_expires = 0;
+        }
+        spin_unlock_irqrestore(&events_lock, flags);
+}
+/**
+ * pm_wakeup_event - Notify the PM core of a wakeup event.
+ * @dev: Device the wakeup event is related to.
+ * @msec: Anticipated event processing time (in milliseconds).
+ *
+ * Notify the PM core of a wakeup event (signaled by @dev) that will take
+ * approximately @msec milliseconds to be processed by the kernel.  Increment
+ * the counter of registered wakeup events and (if @msec is nonzero) set up
+ * the wakeup events timer to execute pm_wakeup_timer_fn() in future (if the
+ * timer has not been set up already, increment the counter of wakeup events
+ * being processed).  If @dev is not NULL, the counter of wakeup events related
+ * to @dev is incremented too.
+ *
+ * It is safe to call this function from interrupt context.
+ */
+void pm_wakeup_event(struct device *dev, unsigned int msec)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&events_lock, flags);
+        event_count++;
+        if (dev)
+                dev->power.wakeup_count++;
+        if (msec) {
+                unsigned long expires;
+                expires = jiffies + msecs_to_jiffies(msec);
+                if (!expires)
+                        expires = 1;
+                if (!events_timer_expires
+                    || time_after(expires, events_timer_expires)) {
+                        if (!events_timer_expires)
+                                events_in_progress++;
+                        mod_timer(&events_timer, expires);
+                        events_timer_expires = expires;
+                }
+        }
+        spin_unlock_irqrestore(&events_lock, flags);
+}
+/**
+ * pm_check_wakeup_events - Check for new wakeup events.
+ *
+ * Compare the current number of registered wakeup events with its preserved
+ * value from the past to check if new wakeup events have been registered since
+ * the old value was stored.  Check if the current number of wakeup events being
+ * processed is zero.
+ */
+bool pm_check_wakeup_events(void)
+{
+        unsigned long flags;
+        bool ret = true;
+        spin_lock_irqsave(&events_lock, flags);
+        if (events_check_enabled) {
+                ret = (event_count == saved_event_count) && !events_in_progress;
+                events_check_enabled = ret;
+        }
+        spin_unlock_irqrestore(&events_lock, flags);
+        return ret;
+}
+/**
+ * pm_get_wakeup_count - Read the number of registered wakeup events.
+ * @count: Address to store the value at.
+ *
+ * Store the number of registered wakeup events at the address in @count.  Block
+ * if the current number of wakeup events being processed is nonzero.
+ *
+ * Return false if the wait for the number of wakeup events being processed to
+ * drop down to zero has been interrupted by a signal (and the current number
+ * of wakeup events being processed is still nonzero).  Otherwise return true.
+ */
+bool pm_get_wakeup_count(unsigned long *count)
+{
+        bool ret;
+        spin_lock_irq(&events_lock);
+        if (capable(CAP_SYS_ADMIN))
+                events_check_enabled = false;
+        while (events_in_progress && !signal_pending(current)) {
+                spin_unlock_irq(&events_lock);
+                schedule_timeout_interruptible(msecs_to_jiffies(100));
+                spin_lock_irq(&events_lock);
+        }
+        *count = event_count;
+        ret = !events_in_progress;
+        spin_unlock_irq(&events_lock);
+        return ret;
+}
+/**
+ * pm_save_wakeup_count - Save the current number of registered wakeup events.
+ * @count: Value to compare with the current number of registered wakeup events.
+ *
+ * If @count is equal to the current number of registered wakeup events and the
+ * current number of wakeup events being processed is zero, store @count as the
+ * old number of registered wakeup events to be used by pm_check_wakeup_events()
+ * and return true.  Otherwise return false.
+ */
+bool pm_save_wakeup_count(unsigned long count)
+{
+        bool ret = false;
+        spin_lock_irq(&events_lock);
+        if (count == event_count && !events_in_progress) {
+                saved_event_count = count;
+                events_check_enabled = true;
+                ret = true;
+        }
+        spin_unlock_irq(&events_lock);
+        return ret;
+}
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 51ceaee98f9f..e1e7143ca1e3 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -335,7 +335,7 @@ static void cciss_map_sg_chain_block(ctlr_info_t *h, CommandList_struct *c,
 static const char *raid_label[] = { "0", "4", "1(1+0)", "5", "5+1", "ADG",
        "UNKNOWN"
 };
-#define RAID_UNKNOWN (sizeof(raid_label) / sizeof(raid_label[0])-1)
+#define RAID_UNKNOWN (ARRAY_SIZE(raid_label)-1)
 #ifdef CONFIG_PROC_FS
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index dff48701b84d..ec1711f7c5c5 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -1087,7 +1087,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
                        } else {
                                epoch->flags = 0;
                                atomic_set(&epoch->epoch_size, 0);
-                                /* atomic_set(&epoch->active, 0); is alrady zero */
+                                /* atomic_set(&epoch->active, 0); is already zero */
                                if (rv == FE_STILL_LIVE)
                                        rv = FE_RECYCLED;
                        }
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 218d091f3c52..16c3c8613cd3 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -4,7 +4,7 @@
 * Note that you can not swap over this thing, yet. Seems to work but
 * deadlocks sometimes - you can not swap over TCP in general.
 * 
- * Copyright 1997-2000, 2008 Pavel Machek <pavel@suse.cz>
+ * Copyright 1997-2000, 2008 Pavel Machek <pavel@ucw.cz>
 * Parts copyright 2001 Steven Whitehouse <steve@chygwyn.com>
 *
 * This file is released under GPLv2 or later.
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 258bc2ae2885..23b7c48df843 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -225,16 +225,6 @@ static int virtblk_ioctl(struct block_device *bdev, fmode_t mode,
        struct gendisk *disk = bdev->bd_disk;
        struct virtio_blk *vblk = disk->private_data;
-        if (cmd == 0x56424944) { /* 'VBID' */
-                void __user *usr_data = (void __user *)data;
-                char id_str[VIRTIO_BLK_ID_BYTES];
-                int err;
-                err = virtblk_get_id(disk, id_str);
-                if (!err && copy_to_user(usr_data, id_str, VIRTIO_BLK_ID_BYTES))
-                        err = -EFAULT;
-                return err;
-        }
        /*
         * Only allow the generic SCSI ioctls if the host can support it.
         */
@@ -281,6 +271,27 @@ static int index_to_minor(int index)
        return index << PART_BITS;
 }
+static ssize_t virtblk_serial_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct gendisk *disk = dev_to_disk(dev);
+        int err;
+        /* sysfs gives us a PAGE_SIZE buffer */
+        BUILD_BUG_ON(PAGE_SIZE < VIRTIO_BLK_ID_BYTES);
+        buf[VIRTIO_BLK_ID_BYTES] = '\0';
+        err = virtblk_get_id(disk, buf);
+        if (!err)
+                return strlen(buf);
+        if (err == -EIO) /* Unsupported? Make it empty. */
+                return 0;
+        return err;
+}
+DEVICE_ATTR(serial, S_IRUGO, virtblk_serial_show, NULL);
 static int __devinit virtblk_probe(struct virtio_device *vdev)
 {
        struct virtio_blk *vblk;
@@ -366,12 +377,32 @@ static int __devinit virtblk_probe(struct virtio_device *vdev)
        vblk->disk->driverfs_dev = &vdev->dev;
        index++;
-        /* If barriers are supported, tell block layer that queue is ordered */
+        if (virtio_has_feature(vdev, VIRTIO_BLK_F_FLUSH)) {
-        if (virtio_has_feature(vdev, VIRTIO_BLK_F_FLUSH))
+                /*
+                 * If the FLUSH feature is supported we do have support for
+                 * flushing a volatile write cache on the host.  Use that
+                 * to implement write barrier support.
+                 */
                blk_queue_ordered(q, QUEUE_ORDERED_DRAIN_FLUSH,
                                  virtblk_prepare_flush);
-        else if (virtio_has_feature(vdev, VIRTIO_BLK_F_BARRIER))
+        } else if (virtio_has_feature(vdev, VIRTIO_BLK_F_BARRIER)) {
+                /*
+                 * If the BARRIER feature is supported the host expects us
+                 * to order request by tags.  This implies there is not
+                 * volatile write cache on the host, and that the host
+                 * never re-orders outstanding I/O.  This feature is not
+                 * useful for real life scenarious and deprecated.
+                 */
                blk_queue_ordered(q, QUEUE_ORDERED_TAG, NULL);
+        } else {
+                /*
+                 * If the FLUSH feature is not supported we must assume that
+                 * the host does not perform any kind of volatile write
+                 * caching. We still need to drain the queue to provider
+                 * proper barrier semantics.
+                 */
+                blk_queue_ordered(q, QUEUE_ORDERED_DRAIN, NULL);
+        }
        /* If disk is read-only in the host, the guest should obey */
        if (virtio_has_feature(vdev, VIRTIO_BLK_F_RO))
@@ -445,8 +476,15 @@ static int __devinit virtblk_probe(struct virtio_device *vdev)
        add_disk(vblk->disk);
+        err = device_create_file(disk_to_dev(vblk->disk), &dev_attr_serial);
+        if (err)
+                goto out_del_disk;
        return 0;
+out_del_disk:
+        del_gendisk(vblk->disk);
+        blk_cleanup_queue(vblk->disk->queue);
 out_put_disk:
        put_disk(vblk->disk);
 out_mempool:
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 82ed403147c0..f63ac3d1f8a4 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -48,6 +48,7 @@
 #include <xen/grant_table.h>
 #include <xen/events.h>
 #include <xen/page.h>
+#include <xen/platform_pci.h>
 #include <xen/interface/grant_table.h>
 #include <xen/interface/io/blkif.h>
@@ -737,6 +738,35 @@ static int blkfront_probe(struct xenbus_device *dev,
                }
        }
+        if (xen_hvm_domain()) {
+                char *type;
+                int len;
+                /* no unplug has been done: do not hook devices != xen vbds */
+                if (xen_platform_pci_unplug & XEN_UNPLUG_IGNORE) {
+                        int major;
+                        if (!VDEV_IS_EXTENDED(vdevice))
+                                major = BLKIF_MAJOR(vdevice);
+                        else
+                                major = XENVBD_MAJOR;
+                        if (major != XENVBD_MAJOR) {
+                                printk(KERN_INFO
+                                                "%s: HVM does not support vbd %d as xen block device\n",
+                                                __FUNCTION__, vdevice);
+                                return -ENODEV;
+                        }
+                }
+                /* do not create a PV cdrom device if we are an HVM guest */
+                type = xenbus_read(XBT_NIL, dev->nodename, "device-type", &len);
+                if (IS_ERR(type))
+                        return -ENODEV;
+                if (strncmp(type, "cdrom", 5) == 0) {
+                        kfree(type);
+                        return -ENODEV;
+                }
+                kfree(type);
+        }
        info = kzalloc(sizeof(*info), GFP_KERNEL);
        if (!info) {
                xenbus_dev_fatal(dev, -ENOMEM, "allocating info structure");
diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index 058fbccf2f52..02deef424926 100644
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -58,6 +58,18 @@ config BT_HCIUART_BCSP
          Say Y here to compile support for HCI BCSP protocol.
+config BT_HCIUART_ATH3K
+        bool "Atheros AR300x serial support"
+        depends on BT_HCIUART
+        help
+          HCIATH3K (HCI Atheros AR300x) is a serial protocol for
+          communication between host and Atheros AR300x Bluetooth devices.
+          This protocol enables AR300x chips to be enabled with
+          power management support.
+          Enable this if you have Atheros AR300x serial Bluetooth device.
+          Say Y here to compile support for HCI UART ATH3K protocol.
 config BT_HCIUART_LL
        bool "HCILL protocol support"
        depends on BT_HCIUART
diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile
index 7e5aed598121..71bdf13287c4 100644
--- a/drivers/bluetooth/Makefile
+++ b/drivers/bluetooth/Makefile
@@ -26,4 +26,5 @@ hci_uart-y				:= hci_ldisc.o
 hci_uart-$(CONFIG_BT_HCIUART_H4)        += hci_h4.o
 hci_uart-$(CONFIG_BT_HCIUART_BCSP)      += hci_bcsp.o
 hci_uart-$(CONFIG_BT_HCIUART_LL)        += hci_ll.o
+hci_uart-$(CONFIG_BT_HCIUART_ATH3K)     += hci_ath.o
 hci_uart-objs                           := $(hci_uart-y)
diff --git a/drivers/bluetooth/bcm203x.c b/drivers/bluetooth/bcm203x.c
index b0c84c19f442..8b1b643a519b 100644
--- a/drivers/bluetooth/bcm203x.c
+++ b/drivers/bluetooth/bcm203x.c
@@ -224,7 +224,7 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id
        BT_DBG("firmware data %p size %zu", firmware->data, firmware->size);
-        data->fw_data = kmalloc(firmware->size, GFP_KERNEL);
+        data->fw_data = kmemdup(firmware->data, firmware->size, GFP_KERNEL);
        if (!data->fw_data) {
                BT_ERR("Can't allocate memory for firmware image");
                release_firmware(firmware);
@@ -234,7 +234,6 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id
                return -ENOMEM;
        }
-        memcpy(data->fw_data, firmware->data, firmware->size);
        data->fw_size = firmware->size;
        data->fw_sent = 0;
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index 6f907ebed2d5..6d34f405a2f3 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -37,7 +37,7 @@
 #include <linux/wait.h>
 #include <linux/skbuff.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
diff --git a/drivers/bluetooth/bpa10x.c b/drivers/bluetooth/bpa10x.c
index d945cd12433a..751b338d904a 100644
--- a/drivers/bluetooth/bpa10x.c
+++ b/drivers/bluetooth/bpa10x.c
@@ -62,7 +62,7 @@ struct hci_vendor_hdr {
        __u8    type;
        __le16  snum;
        __le16  dlen;
-} __attribute__ ((packed));
+} __packed;
 static int bpa10x_recv(struct hci_dev *hdev, int queue, void *buf, int count)
 {
diff --git a/drivers/bluetooth/btmrvl_debugfs.c b/drivers/bluetooth/btmrvl_debugfs.c
index b50b41d97a7f..54739b08c308 100644
--- a/drivers/bluetooth/btmrvl_debugfs.c
+++ b/drivers/bluetooth/btmrvl_debugfs.c
@@ -216,7 +216,7 @@ static const struct file_operations btmrvl_gpiogap_fops = {
 static ssize_t btmrvl_hscmd_write(struct file *file, const char __user *ubuf,
                                                size_t count, loff_t *ppos)
 {
-        struct btmrvl_private *priv = (struct btmrvl_private *) file->private_data;
+        struct btmrvl_private *priv = file->private_data;
        char buf[16];
        long result, ret;
diff --git a/drivers/bluetooth/btmrvl_drv.h b/drivers/bluetooth/btmrvl_drv.h
index bed0ba630235..90bda50dc446 100644
--- a/drivers/bluetooth/btmrvl_drv.h
+++ b/drivers/bluetooth/btmrvl_drv.h
@@ -76,6 +76,7 @@ struct btmrvl_private {
        int (*hw_host_to_card) (struct btmrvl_private *priv,
                                u8 *payload, u16 nb);
        int (*hw_wakeup_firmware) (struct btmrvl_private *priv);
+        int (*hw_process_int_status) (struct btmrvl_private *priv);
        spinlock_t driver_lock;         /* spinlock used by driver */
 #ifdef CONFIG_DEBUG_FS
        void *debugfs_data;
@@ -118,13 +119,13 @@ struct btmrvl_cmd {
        __le16 ocf_ogf;
        u8 length;
        u8 data[4];
-} __attribute__ ((packed));
+} __packed;
 struct btmrvl_event {
        u8 ec;          /* event counter */
        u8 length;
        u8 data[4];
-} __attribute__ ((packed));
+} __packed;
 /* Prototype of global function */
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index ee37ef0caee2..0d32ec82e9bf 100644
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -502,14 +502,17 @@ static int btmrvl_service_main_thread(void *data)
                spin_lock_irqsave(&priv->driver_lock, flags);
                if (adapter->int_count) {
                        adapter->int_count = 0;
+                        spin_unlock_irqrestore(&priv->driver_lock, flags);
+                        priv->hw_process_int_status(priv);
                } else if (adapter->ps_state == PS_SLEEP &&
                                        !skb_queue_empty(&adapter->tx_queue)) {
                        spin_unlock_irqrestore(&priv->driver_lock, flags);
                        adapter->wakeup_tries++;
                        priv->hw_wakeup_firmware(priv);
                        continue;
+                } else {
+                        spin_unlock_irqrestore(&priv->driver_lock, flags);
                }
-                spin_unlock_irqrestore(&priv->driver_lock, flags);
                if (adapter->ps_state == PS_SLEEP)
                        continue;
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index df0773ebd9e4..dcc2a6ec23f0 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -47,6 +47,7 @@
 * module_exit function is called.
 */
 static u8 user_rmmod;
+static u8 sdio_ireg;
 static const struct btmrvl_sdio_device btmrvl_sdio_sd6888 = {
        .helper         = "sd8688_helper.bin",
@@ -83,10 +84,10 @@ static int btmrvl_sdio_read_fw_status(struct btmrvl_sdio_card *card, u16 *dat)
        *dat = 0;
        fws0 = sdio_readb(card->func, CARD_FW_STATUS0_REG, &ret);
+        if (ret)
+                return -EIO;
-        if (!ret)
+        fws1 = sdio_readb(card->func, CARD_FW_STATUS1_REG, &ret);
-                fws1 = sdio_readb(card->func, CARD_FW_STATUS1_REG, &ret);
        if (ret)
                return -EIO;
@@ -216,7 +217,7 @@ static int btmrvl_sdio_download_helper(struct btmrvl_sdio_card *card)
        tmphlprbufsz = ALIGN_SZ(BTM_UPLD_SIZE, BTSDIO_DMA_ALIGN);
-        tmphlprbuf = kmalloc(tmphlprbufsz, GFP_KERNEL);
+        tmphlprbuf = kzalloc(tmphlprbufsz, GFP_KERNEL);
        if (!tmphlprbuf) {
                BT_ERR("Unable to allocate buffer for helper."
                        " Terminating download");
@@ -224,8 +225,6 @@ static int btmrvl_sdio_download_helper(struct btmrvl_sdio_card *card)
                goto done;
        }
-        memset(tmphlprbuf, 0, tmphlprbufsz);
        helperbuf = (u8 *) ALIGN_ADDR(tmphlprbuf, BTSDIO_DMA_ALIGN);
        /* Perform helper data transfer */
@@ -318,7 +317,7 @@ static int btmrvl_sdio_download_fw_w_helper(struct btmrvl_sdio_card *card)
        BT_DBG("Downloading FW image (%d bytes)", firmwarelen);
        tmpfwbufsz = ALIGN_SZ(BTM_UPLD_SIZE, BTSDIO_DMA_ALIGN);
-        tmpfwbuf = kmalloc(tmpfwbufsz, GFP_KERNEL);
+        tmpfwbuf = kzalloc(tmpfwbufsz, GFP_KERNEL);
        if (!tmpfwbuf) {
                BT_ERR("Unable to allocate buffer for firmware."
                       " Terminating download");
@@ -326,8 +325,6 @@ static int btmrvl_sdio_download_fw_w_helper(struct btmrvl_sdio_card *card)
                goto done;
        }
-        memset(tmpfwbuf, 0, tmpfwbufsz);
        /* Ensure aligned firmware buffer */
        fwbuf = (u8 *) ALIGN_ADDR(tmpfwbuf, BTSDIO_DMA_ALIGN);
@@ -555,78 +552,79 @@ exit:
        return ret;
 }
-static int btmrvl_sdio_get_int_status(struct btmrvl_private *priv, u8 * ireg)
+static int btmrvl_sdio_process_int_status(struct btmrvl_private *priv)
 {
-        int ret;
+        ulong flags;
-        u8 sdio_ireg = 0;
+        u8 ireg;
        struct btmrvl_sdio_card *card = priv->btmrvl_dev.card;
-        *ireg = 0;
+        spin_lock_irqsave(&priv->driver_lock, flags);
+        ireg = sdio_ireg;
-        sdio_ireg = sdio_readb(card->func, HOST_INTSTATUS_REG, &ret);
+        sdio_ireg = 0;
-        if (ret) {
+        spin_unlock_irqrestore(&priv->driver_lock, flags);
-                BT_ERR("sdio_readb: read int status register failed");
-                ret = -EIO;
-                goto done;
-        }
-        if (sdio_ireg != 0) {
-                /*
-                 * DN_LD_HOST_INT_STATUS and/or UP_LD_HOST_INT_STATUS
-                 * Clear the interrupt status register and re-enable the
-                 * interrupt.
-                 */
-                BT_DBG("sdio_ireg = 0x%x", sdio_ireg);
-                sdio_writeb(card->func, ~(sdio_ireg) & (DN_LD_HOST_INT_STATUS |
-                                                        UP_LD_HOST_INT_STATUS),
-                            HOST_INTSTATUS_REG, &ret);
-                if (ret) {
-                        BT_ERR("sdio_writeb: clear int status register "
-                                "failed");
-                        ret = -EIO;
-                        goto done;
-                }
-        }
-        if (sdio_ireg & DN_LD_HOST_INT_STATUS) {
+        sdio_claim_host(card->func);
+        if (ireg & DN_LD_HOST_INT_STATUS) {
                if (priv->btmrvl_dev.tx_dnld_rdy)
                        BT_DBG("tx_done already received: "
-                                " int_status=0x%x", sdio_ireg);
+                                " int_status=0x%x", ireg);
                else
                        priv->btmrvl_dev.tx_dnld_rdy = true;
        }
-        if (sdio_ireg & UP_LD_HOST_INT_STATUS)
+        if (ireg & UP_LD_HOST_INT_STATUS)
                btmrvl_sdio_card_to_host(priv);
-        *ireg = sdio_ireg;
+        sdio_release_host(card->func);
-        ret = 0;
-done:
+        return 0;
-        return ret;
 }
 static void btmrvl_sdio_interrupt(struct sdio_func *func)
 {
        struct btmrvl_private *priv;
-        struct hci_dev *hcidev;
        struct btmrvl_sdio_card *card;
+        ulong flags;
        u8 ireg = 0;
+        int ret;
        card = sdio_get_drvdata(func);
-        if (card && card->priv) {
+        if (!card || !card->priv) {
-                priv = card->priv;
+                BT_ERR("sbi_interrupt(%p) card or priv is "
-                hcidev = priv->btmrvl_dev.hcidev;
+                                "NULL, card=%p\n", func, card);
+                return;
+        }
-                if (btmrvl_sdio_get_int_status(priv, &ireg))
+        priv = card->priv;
-                        BT_ERR("reading HOST_INT_STATUS_REG failed");
-                else
+        ireg = sdio_readb(card->func, HOST_INTSTATUS_REG, &ret);
-                        BT_DBG("HOST_INT_STATUS_REG %#x", ireg);
+        if (ret) {
+                BT_ERR("sdio_readb: read int status register failed");
+                return;
+        }
+        if (ireg != 0) {
+                /*
+                 * DN_LD_HOST_INT_STATUS and/or UP_LD_HOST_INT_STATUS
+                 * Clear the interrupt status register and re-enable the
+                 * interrupt.
+                 */
+                BT_DBG("ireg = 0x%x", ireg);
-                btmrvl_interrupt(priv);
+                sdio_writeb(card->func, ~(ireg) & (DN_LD_HOST_INT_STATUS |
+                                        UP_LD_HOST_INT_STATUS),
+                                HOST_INTSTATUS_REG, &ret);
+                if (ret) {
+                        BT_ERR("sdio_writeb: clear int status register failed");
+                        return;
+                }
        }
+        spin_lock_irqsave(&priv->driver_lock, flags);
+        sdio_ireg |= ireg;
+        spin_unlock_irqrestore(&priv->driver_lock, flags);
+        btmrvl_interrupt(priv);
 }
 static int btmrvl_sdio_register_dev(struct btmrvl_sdio_card *card)
@@ -930,6 +928,7 @@ static int btmrvl_sdio_probe(struct sdio_func *func,
        /* Initialize the interface specific function pointers */
        priv->hw_host_to_card = btmrvl_sdio_host_to_card;
        priv->hw_wakeup_firmware = btmrvl_sdio_wakeup_fw;
+        priv->hw_process_int_status = btmrvl_sdio_process_int_status;
        if (btmrvl_register_hdev(priv)) {
                BT_ERR("Register hdev failed!");
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 5d9cc53bd643..d22ce3cc611e 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -59,6 +59,9 @@ static struct usb_device_id btusb_table[] = {
        /* Generic Bluetooth USB device */
        { USB_DEVICE_INFO(0xe0, 0x01, 0x01) },
+        /* Apple iMac11,1 */
+        { USB_DEVICE(0x05ac, 0x8215) },
        /* AVM BlueFRITZ! USB v2.0 */
        { USB_DEVICE(0x057c, 0x3800) },
@@ -146,6 +149,7 @@ static struct usb_device_id blacklist_table[] = {
 #define BTUSB_BULK_RUNNING      1
 #define BTUSB_ISOC_RUNNING      2
 #define BTUSB_SUSPENDING        3
+#define BTUSB_DID_ISO_RESUME    4
 struct btusb_data {
        struct hci_dev       *hdev;
@@ -179,7 +183,6 @@ struct btusb_data {
        unsigned int sco_num;
        int isoc_altsetting;
        int suspend_count;
-        int did_iso_resume:1;
 };
 static int inc_tx(struct btusb_data *data)
@@ -807,7 +810,7 @@ static void btusb_work(struct work_struct *work)
        int err;
        if (hdev->conn_hash.sco_num > 0) {
-                if (!data->did_iso_resume) {
+                if (!test_bit(BTUSB_DID_ISO_RESUME, &data->flags)) {
                        err = usb_autopm_get_interface(data->isoc);
                        if (err < 0) {
                                clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
@@ -815,7 +818,7 @@ static void btusb_work(struct work_struct *work)
                                return;
                        }
-                        data->did_iso_resume = 1;
+                        set_bit(BTUSB_DID_ISO_RESUME, &data->flags);
                }
                if (data->isoc_altsetting != 2) {
                        clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
@@ -836,10 +839,8 @@ static void btusb_work(struct work_struct *work)
                usb_kill_anchored_urbs(&data->isoc_anchor);
                __set_isoc_interface(hdev, 0);
-                if (data->did_iso_resume) {
+                if (test_and_clear_bit(BTUSB_DID_ISO_RESUME, &data->flags))
-                        data->did_iso_resume = 0;
                        usb_autopm_put_interface(data->isoc);
-                }
        }
 }
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index ef044d55cb25..cbe9e44a42e9 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -104,7 +104,7 @@ typedef struct {
        u8 type;
        u8 zero;
        u16 len;
-} __attribute__ ((packed)) nsh_t;       /* Nokia Specific Header */
+} __packed nsh_t;       /* Nokia Specific Header */
 #define NSHL  4                         /* Nokia Specific Header Length */
diff --git a/drivers/bluetooth/hci_ath.c b/drivers/bluetooth/hci_ath.c
new file mode 100644
index 000000000000..6a160c17ea94
--- /dev/null
+++ b/drivers/bluetooth/hci_ath.c
@@ -0,0 +1,235 @@
+/*
+ *  Atheros Communication Bluetooth HCIATH3K UART protocol
+ *
+ *  HCIATH3K (HCI Atheros AR300x Protocol) is a Atheros Communication's
+ *  power management protocol extension to H4 to support AR300x Bluetooth Chip.
+ *
+ *  Copyright (c) 2009-2010 Atheros Communications Inc.
+ *
+ *  Acknowledgements:
+ *  This file is based on hci_h4.c, which was written
+ *  by Maxim Krasnyansky and Marcel Holtmann.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/tty.h>
+#include <linux/errno.h>
+#include <linux/ioctl.h>
+#include <linux/skbuff.h>
+#include <net/bluetooth/bluetooth.h>
+#include <net/bluetooth/hci_core.h>
+#include "hci_uart.h"
+struct ath_struct {
+        struct hci_uart *hu;
+        unsigned int cur_sleep;
+        struct sk_buff_head txq;
+        struct work_struct ctxtsw;
+};
+static int ath_wakeup_ar3k(struct tty_struct *tty)
+{
+        struct termios settings;
+        int status = tty->driver->ops->tiocmget(tty, NULL);
+        if (status & TIOCM_CTS)
+                return status;
+        /* Disable Automatic RTSCTS */
+        n_tty_ioctl_helper(tty, NULL, TCGETS, (unsigned long)&settings);
+        settings.c_cflag &= ~CRTSCTS;
+        n_tty_ioctl_helper(tty, NULL, TCSETS, (unsigned long)&settings);
+        /* Clear RTS first */
+        status = tty->driver->ops->tiocmget(tty, NULL);
+        tty->driver->ops->tiocmset(tty, NULL, 0x00, TIOCM_RTS);
+        mdelay(20);
+        /* Set RTS, wake up board */
+        status = tty->driver->ops->tiocmget(tty, NULL);
+        tty->driver->ops->tiocmset(tty, NULL, TIOCM_RTS, 0x00);
+        mdelay(20);
+        status = tty->driver->ops->tiocmget(tty, NULL);
+        n_tty_ioctl_helper(tty, NULL, TCGETS, (unsigned long)&settings);
+        settings.c_cflag |= CRTSCTS;
+        n_tty_ioctl_helper(tty, NULL, TCSETS, (unsigned long)&settings);
+        return status;
+}
+static void ath_hci_uart_work(struct work_struct *work)
+{
+        int status;
+        struct ath_struct *ath;
+        struct hci_uart *hu;
+        struct tty_struct *tty;
+        ath = container_of(work, struct ath_struct, ctxtsw);
+        hu = ath->hu;
+        tty = hu->tty;
+        /* verify and wake up controller */
+        if (ath->cur_sleep) {
+                status = ath_wakeup_ar3k(tty);
+                if (!(status & TIOCM_CTS))
+                        return;
+        }
+        /* Ready to send Data */
+        clear_bit(HCI_UART_SENDING, &hu->tx_state);
+        hci_uart_tx_wakeup(hu);
+}
+/* Initialize protocol */
+static int ath_open(struct hci_uart *hu)
+{
+        struct ath_struct *ath;
+        BT_DBG("hu %p", hu);
+        ath = kzalloc(sizeof(*ath), GFP_ATOMIC);
+        if (!ath)
+                return -ENOMEM;
+        skb_queue_head_init(&ath->txq);
+        hu->priv = ath;
+        ath->hu = hu;
+        INIT_WORK(&ath->ctxtsw, ath_hci_uart_work);
+        return 0;
+}
+/* Flush protocol data */
+static int ath_flush(struct hci_uart *hu)
+{
+        struct ath_struct *ath = hu->priv;
+        BT_DBG("hu %p", hu);
+        skb_queue_purge(&ath->txq);
+        return 0;
+}
+/* Close protocol */
+static int ath_close(struct hci_uart *hu)
+{
+        struct ath_struct *ath = hu->priv;
+        BT_DBG("hu %p", hu);
+        skb_queue_purge(&ath->txq);
+        cancel_work_sync(&ath->ctxtsw);
+        hu->priv = NULL;
+        kfree(ath);
+        return 0;
+}
+#define HCI_OP_ATH_SLEEP 0xFC04
+/* Enqueue frame for transmittion */
+static int ath_enqueue(struct hci_uart *hu, struct sk_buff *skb)
+{
+        struct ath_struct *ath = hu->priv;
+        if (bt_cb(skb)->pkt_type == HCI_SCODATA_PKT) {
+                kfree_skb(skb);
+                return 0;
+        }
+        /*
+         * Update power management enable flag with parameters of
+         * HCI sleep enable vendor specific HCI command.
+         */
+        if (bt_cb(skb)->pkt_type == HCI_COMMAND_PKT) {
+                struct hci_command_hdr *hdr = (void *)skb->data;
+                if (__le16_to_cpu(hdr->opcode) == HCI_OP_ATH_SLEEP)
+                        ath->cur_sleep = skb->data[HCI_COMMAND_HDR_SIZE];
+        }
+        BT_DBG("hu %p skb %p", hu, skb);
+        /* Prepend skb with frame type */
+        memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1);
+        skb_queue_tail(&ath->txq, skb);
+        set_bit(HCI_UART_SENDING, &hu->tx_state);
+        schedule_work(&ath->ctxtsw);
+        return 0;
+}
+static struct sk_buff *ath_dequeue(struct hci_uart *hu)
+{
+        struct ath_struct *ath = hu->priv;
+        return skb_dequeue(&ath->txq);
+}
+/* Recv data */
+static int ath_recv(struct hci_uart *hu, void *data, int count)
+{
+        if (hci_recv_stream_fragment(hu->hdev, data, count) < 0)
+                BT_ERR("Frame Reassembly Failed");
+        return count;
+}
+static struct hci_uart_proto athp = {
+        .id = HCI_UART_ATH3K,
+        .open = ath_open,
+        .close = ath_close,
+        .recv = ath_recv,
+        .enqueue = ath_enqueue,
+        .dequeue = ath_dequeue,
+        .flush = ath_flush,
+};
+int __init ath_init(void)
+{
+        int err = hci_uart_register_proto(&athp);
+        if (!err)
+                BT_INFO("HCIATH3K protocol initialized");
+        else
+                BT_ERR("HCIATH3K protocol registration failed");
+        return err;
+}
+int __exit ath_deinit(void)
+{
+        return hci_uart_unregister_proto(&athp);
+}
diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c
index 40aec0fb8596..9c5b2dc38e29 100644
--- a/drivers/bluetooth/hci_bcsp.c
+++ b/drivers/bluetooth/hci_bcsp.c
@@ -244,7 +244,7 @@ static struct sk_buff *bcsp_prepare_pkt(struct bcsp_struct *bcsp, u8 *data,
        if (rel) {
                hdr[0] |= 0x80 + bcsp->msgq_txseq;
                BT_DBG("Sending packet with seqno %u", bcsp->msgq_txseq);
-                bcsp->msgq_txseq = ++(bcsp->msgq_txseq) & 0x07;
+                bcsp->msgq_txseq = (bcsp->msgq_txseq + 1) & 0x07;
        }
        if (bcsp->use_crc)
@@ -739,7 +739,7 @@ static struct hci_uart_proto bcsp = {
        .flush          = bcsp_flush
 };
-int bcsp_init(void)
+int __init bcsp_init(void)
 {
        int err = hci_uart_register_proto(&bcsp);
@@ -751,7 +751,7 @@ int bcsp_init(void)
        return err;
 }
-int bcsp_deinit(void)
+int __exit bcsp_deinit(void)
 {
        return hci_uart_unregister_proto(&bcsp);
 }
diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c
index 3f038f5308a4..7b8ad93e2c36 100644
--- a/drivers/bluetooth/hci_h4.c
+++ b/drivers/bluetooth/hci_h4.c
@@ -151,107 +151,8 @@ static inline int h4_check_data_len(struct h4_struct *h4, int len)
 /* Recv data */
 static int h4_recv(struct hci_uart *hu, void *data, int count)
 {
-        struct h4_struct *h4 = hu->priv;
+        if (hci_recv_stream_fragment(hu->hdev, data, count) < 0)
-        register char *ptr;
+                BT_ERR("Frame Reassembly Failed");
-        struct hci_event_hdr *eh;
-        struct hci_acl_hdr   *ah;
-        struct hci_sco_hdr   *sh;
-        register int len, type, dlen;
-        BT_DBG("hu %p count %d rx_state %ld rx_count %ld", 
-                        hu, count, h4->rx_state, h4->rx_count);
-        ptr = data;
-        while (count) {
-                if (h4->rx_count) {
-                        len = min_t(unsigned int, h4->rx_count, count);
-                        memcpy(skb_put(h4->rx_skb, len), ptr, len);
-                        h4->rx_count -= len; count -= len; ptr += len;
-                        if (h4->rx_count)
-                                continue;
-                        switch (h4->rx_state) {
-                        case H4_W4_DATA:
-                                BT_DBG("Complete data");
-                                hci_recv_frame(h4->rx_skb);
-                                h4->rx_state = H4_W4_PACKET_TYPE;
-                                h4->rx_skb = NULL;
-                                continue;
-                        case H4_W4_EVENT_HDR:
-                                eh = hci_event_hdr(h4->rx_skb);
-                                BT_DBG("Event header: evt 0x%2.2x plen %d", eh->evt, eh->plen);
-                                h4_check_data_len(h4, eh->plen);
-                                continue;
-                        case H4_W4_ACL_HDR:
-                                ah = hci_acl_hdr(h4->rx_skb);
-                                dlen = __le16_to_cpu(ah->dlen);
-                                BT_DBG("ACL header: dlen %d", dlen);
-                                h4_check_data_len(h4, dlen);
-                                continue;
-                        case H4_W4_SCO_HDR:
-                                sh = hci_sco_hdr(h4->rx_skb);
-                                BT_DBG("SCO header: dlen %d", sh->dlen);
-                                h4_check_data_len(h4, sh->dlen);
-                                continue;
-                        }
-                }
-                /* H4_W4_PACKET_TYPE */
-                switch (*ptr) {
-                case HCI_EVENT_PKT:
-                        BT_DBG("Event packet");
-                        h4->rx_state = H4_W4_EVENT_HDR;
-                        h4->rx_count = HCI_EVENT_HDR_SIZE;
-                        type = HCI_EVENT_PKT;
-                        break;
-                case HCI_ACLDATA_PKT:
-                        BT_DBG("ACL packet");
-                        h4->rx_state = H4_W4_ACL_HDR;
-                        h4->rx_count = HCI_ACL_HDR_SIZE;
-                        type = HCI_ACLDATA_PKT;
-                        break;
-                case HCI_SCODATA_PKT:
-                        BT_DBG("SCO packet");
-                        h4->rx_state = H4_W4_SCO_HDR;
-                        h4->rx_count = HCI_SCO_HDR_SIZE;
-                        type = HCI_SCODATA_PKT;
-                        break;
-                default:
-                        BT_ERR("Unknown HCI packet type %2.2x", (__u8)*ptr);
-                        hu->hdev->stat.err_rx++;
-                        ptr++; count--;
-                        continue;
-                };
-                ptr++; count--;
-                /* Allocate packet */
-                h4->rx_skb = bt_skb_alloc(HCI_MAX_FRAME_SIZE, GFP_ATOMIC);
-                if (!h4->rx_skb) {
-                        BT_ERR("Can't allocate mem for new packet");
-                        h4->rx_state = H4_W4_PACKET_TYPE;
-                        h4->rx_count = 0;
-                        return -ENOMEM;
-                }
-                h4->rx_skb->dev = (void *) hu->hdev;
-                bt_cb(h4->rx_skb)->pkt_type = type;
-        }
        return count;
 }
@@ -272,7 +173,7 @@ static struct hci_uart_proto h4p = {
        .flush          = h4_flush,
 };
-int h4_init(void)
+int __init h4_init(void)
 {
        int err = hci_uart_register_proto(&h4p);
@@ -284,7 +185,7 @@ int h4_init(void)
        return err;
 }
-int h4_deinit(void)
+int __exit h4_deinit(void)
 {
        return hci_uart_unregister_proto(&h4p);
 }
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 76a1abb8f214..998833d93c13 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -210,7 +210,6 @@ static int hci_uart_close(struct hci_dev *hdev)
 static int hci_uart_send_frame(struct sk_buff *skb)
 {
        struct hci_dev* hdev = (struct hci_dev *) skb->dev;
-        struct tty_struct *tty;
        struct hci_uart *hu;
        if (!hdev) {
@@ -222,7 +221,6 @@ static int hci_uart_send_frame(struct sk_buff *skb)
                return -EBUSY;
        hu = (struct hci_uart *) hdev->driver_data;
-        tty = hu->tty;
        BT_DBG("%s: type %d len %d", hdev->name, bt_cb(skb)->pkt_type, skb->len);
@@ -397,6 +395,9 @@ static int hci_uart_register_dev(struct hci_uart *hu)
        if (!reset)
                set_bit(HCI_QUIRK_NO_RESET, &hdev->quirks);
+        if (test_bit(HCI_UART_RAW_DEVICE, &hu->hdev_flags))
+                set_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks);
        if (hci_register_dev(hdev) < 0) {
                BT_ERR("Can't register HCI device");
                hci_free_dev(hdev);
@@ -477,6 +478,15 @@ static int hci_uart_tty_ioctl(struct tty_struct *tty, struct file * file,
                        return hu->hdev->id;
                return -EUNATCH;
+        case HCIUARTSETFLAGS:
+                if (test_bit(HCI_UART_PROTO_SET, &hu->flags))
+                        return -EBUSY;
+                hu->hdev_flags = arg;
+                break;
+        case HCIUARTGETFLAGS:
+                return hu->hdev_flags;
        default:
                err = n_tty_ioctl_helper(tty, file, cmd, arg);
                break;
@@ -542,6 +552,9 @@ static int __init hci_uart_init(void)
 #ifdef CONFIG_BT_HCIUART_LL
        ll_init();
 #endif
+#ifdef CONFIG_BT_HCIUART_ATH3K
+        ath_init();
+#endif
        return 0;
 }
@@ -559,6 +572,9 @@ static void __exit hci_uart_exit(void)
 #ifdef CONFIG_BT_HCIUART_LL
        ll_deinit();
 #endif
+#ifdef CONFIG_BT_HCIUART_ATH3K
+        ath_deinit();
+#endif
        /* Release tty registration of line discipline */
        if ((err = tty_unregister_ldisc(N_HCI)))
diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c
index fb8445c7365e..38595e782d02 100644
--- a/drivers/bluetooth/hci_ll.c
+++ b/drivers/bluetooth/hci_ll.c
@@ -74,7 +74,7 @@ enum hcill_states_e {
 struct hcill_cmd {
        u8 cmd;
-} __attribute__((packed));
+} __packed;
 struct ll_struct {
        unsigned long rx_state;
@@ -517,7 +517,7 @@ static struct hci_uart_proto llp = {
        .flush          = ll_flush,
 };
-int ll_init(void)
+int __init ll_init(void)
 {
        int err = hci_uart_register_proto(&llp);
@@ -529,7 +529,7 @@ int ll_init(void)
        return err;
 }
-int ll_deinit(void)
+int __exit ll_deinit(void)
 {
        return hci_uart_unregister_proto(&llp);
 }
diff --git a/drivers/bluetooth/hci_uart.h b/drivers/bluetooth/hci_uart.h
index 50113db06b9f..99fb35239d1f 100644
--- a/drivers/bluetooth/hci_uart.h
+++ b/drivers/bluetooth/hci_uart.h
@@ -31,15 +31,20 @@
 #define HCIUARTSETPROTO         _IOW('U', 200, int)
 #define HCIUARTGETPROTO         _IOR('U', 201, int)
 #define HCIUARTGETDEVICE        _IOR('U', 202, int)
+#define HCIUARTSETFLAGS         _IOW('U', 203, int)
+#define HCIUARTGETFLAGS         _IOR('U', 204, int)
 /* UART protocols */
-#define HCI_UART_MAX_PROTO      5
+#define HCI_UART_MAX_PROTO      6
 #define HCI_UART_H4     0
 #define HCI_UART_BCSP   1
 #define HCI_UART_3WIRE  2
 #define HCI_UART_H4DS   3
 #define HCI_UART_LL     4
+#define HCI_UART_ATH3K  5
+#define HCI_UART_RAW_DEVICE     0
 struct hci_uart;
@@ -57,6 +62,7 @@ struct hci_uart {
        struct tty_struct       *tty;
        struct hci_dev          *hdev;
        unsigned long           flags;
+        unsigned long           hdev_flags;
        struct hci_uart_proto   *proto;
        void                    *priv;
@@ -66,7 +72,7 @@ struct hci_uart {
        spinlock_t              rx_lock;
 };
-/* HCI_UART flag bits */
+/* HCI_UART proto flag bits */
 #define HCI_UART_PROTO_SET      0
 /* TX states  */
@@ -91,3 +97,8 @@ int bcsp_deinit(void);
 int ll_init(void);
 int ll_deinit(void);
 #endif
+#ifdef CONFIG_BT_HCIUART_ATH3K
+int ath_init(void);
+int ath_deinit(void);
+#endif
diff --git a/drivers/char/agp/efficeon-agp.c b/drivers/char/agp/efficeon-agp.c
index aa109cbe0e6e..d607f53d8afc 100644
--- a/drivers/char/agp/efficeon-agp.c
+++ b/drivers/char/agp/efficeon-agp.c
@@ -372,6 +372,17 @@ static int __devinit agp_efficeon_probe(struct pci_dev *pdev,
        bridge->capndx = cap_ptr;
        /*
+        * If the device has not been properly setup, the following will catch
+        * the problem and should stop the system from crashing.
+        * 20030610 - hamish@zot.org
+        */
+        if (pci_enable_device(pdev)) {
+                printk(KERN_ERR PFX "Unable to Enable PCI device\n");
+                agp_put_bridge(bridge);
+                return -ENODEV;
+        }
+        /*
        * The following fixes the case where the BIOS has "forgotten" to
        * provide an address range for the GART.
        * 20030610 - hamish@zot.org
@@ -385,17 +396,6 @@ static int __devinit agp_efficeon_probe(struct pci_dev *pdev,
                }
        }
-        /*
-        * If the device has not been properly setup, the following will catch
-        * the problem and should stop the system from crashing.
-        * 20030610 - hamish@zot.org
-        */
-        if (pci_enable_device(pdev)) {
-                printk(KERN_ERR PFX "Unable to Enable PCI device\n");
-                agp_put_bridge(bridge);
-                return -ENODEV;
-        }
        /* Fill in the mode register */
        if (cap_ptr) {
                pci_read_config_dword(pdev,
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index d836a71bf06d..ddf5def1b0da 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -816,9 +816,9 @@ static const struct intel_driver_description {
        { PCI_DEVICE_ID_INTEL_IRONLAKE_MC2_HB, PCI_DEVICE_ID_INTEL_IRONLAKE_M_IG,
            "HD Graphics", NULL, &intel_i965_driver },
        { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_HB, PCI_DEVICE_ID_INTEL_SANDYBRIDGE_IG,
-            "Sandybridge", NULL, &intel_i965_driver },
+            "Sandybridge", NULL, &intel_gen6_driver },
        { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_HB, PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_IG,
-            "Sandybridge", NULL, &intel_i965_driver },
+            "Sandybridge", NULL, &intel_gen6_driver },
        { 0, 0, NULL, NULL, NULL }
 };
@@ -908,6 +908,17 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,
        dev_info(&pdev->dev, "Intel %s Chipset\n", intel_agp_chipsets[i].name);
        /*
+        * If the device has not been properly setup, the following will catch
+        * the problem and should stop the system from crashing.
+        * 20030610 - hamish@zot.org
+        */
+        if (pci_enable_device(pdev)) {
+                dev_err(&pdev->dev, "can't enable PCI device\n");
+                agp_put_bridge(bridge);
+                return -ENODEV;
+        }
+        /*
        * The following fixes the case where the BIOS has "forgotten" to
        * provide an address range for the GART.
        * 20030610 - hamish@zot.org
@@ -921,17 +932,6 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,
                }
        }
-        /*
-        * If the device has not been properly setup, the following will catch
-        * the problem and should stop the system from crashing.
-        * 20030610 - hamish@zot.org
-        */
-        if (pci_enable_device(pdev)) {
-                dev_err(&pdev->dev, "can't enable PCI device\n");
-                agp_put_bridge(bridge);
-                return -ENODEV;
-        }
        /* Fill in the mode register */
        if (cap_ptr) {
                pci_read_config_dword(pdev,
diff --git a/drivers/char/agp/intel-agp.h b/drivers/char/agp/intel-agp.h
index 2547465d4658..c05e3e518268 100644
--- a/drivers/char/agp/intel-agp.h
+++ b/drivers/char/agp/intel-agp.h
@@ -60,6 +60,12 @@
 #define I810_PTE_LOCAL          0x00000002
 #define I810_PTE_VALID          0x00000001
 #define I830_PTE_SYSTEM_CACHED  0x00000006
+/* GT PTE cache control fields */
+#define GEN6_PTE_UNCACHED       0x00000002
+#define GEN6_PTE_LLC            0x00000004
+#define GEN6_PTE_LLC_MLC        0x00000006
+#define GEN6_PTE_GFDT           0x00000008
 #define I810_SMRAM_MISCC        0x70
 #define I810_GFX_MEM_WIN_SIZE   0x00010000
 #define I810_GFX_MEM_WIN_32M    0x00010000
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 9344216183a4..d22ffb811bf2 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -25,6 +25,10 @@
 #define USE_PCI_DMA_API 1
 #endif
+/* Max amount of stolen space, anything above will be returned to Linux */
+int intel_max_stolen = 32 * 1024 * 1024;
+EXPORT_SYMBOL(intel_max_stolen);
 static const struct aper_size_info_fixed intel_i810_sizes[] =
 {
        {64, 16384, 4},
@@ -104,7 +108,7 @@ static int intel_agp_map_memory(struct agp_memory *mem)
        DBG("try mapping %lu pages\n", (unsigned long)mem->page_count);
        if (sg_alloc_table(&st, mem->page_count, GFP_KERNEL))
-                return -ENOMEM;
+                goto err;
        mem->sg_list = sg = st.sgl;
@@ -113,11 +117,14 @@ static int intel_agp_map_memory(struct agp_memory *mem)
        mem->num_sg = pci_map_sg(intel_private.pcidev, mem->sg_list,
                                 mem->page_count, PCI_DMA_BIDIRECTIONAL);
-        if (unlikely(!mem->num_sg)) {
+        if (unlikely(!mem->num_sg))
-                intel_agp_free_sglist(mem);
+                goto err;
-                return -ENOMEM;
-        }
        return 0;
+err:
+        sg_free_table(&st);
+        return -ENOMEM;
 }
 static void intel_agp_unmap_memory(struct agp_memory *mem)
@@ -176,7 +183,7 @@ static void intel_agp_insert_sg_entries(struct agp_memory *mem,
        if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_SANDYBRIDGE_HB ||
            agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_HB)
        {
-                cache_bits = I830_PTE_SYSTEM_CACHED;
+                cache_bits = GEN6_PTE_LLC_MLC;
        }
        for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
@@ -710,7 +717,12 @@ static void intel_i830_init_gtt_entries(void)
                        break;
                }
        }
-        if (gtt_entries > 0) {
+        if (!local && gtt_entries > intel_max_stolen) {
+                dev_info(&agp_bridge->dev->dev,
+                         "detected %dK stolen memory, trimming to %dK\n",
+                         gtt_entries / KB(1), intel_max_stolen / KB(1));
+                gtt_entries = intel_max_stolen / KB(4);
+        } else if (gtt_entries > 0) {
                dev_info(&agp_bridge->dev->dev, "detected %dK %s memory\n",
                       gtt_entries / KB(1), local ? "local" : "stolen");
                gtt_entries /= KB(4);
@@ -797,6 +809,10 @@ static int intel_i830_create_gatt_table(struct agp_bridge_data *bridge)
        /* we have to call this as early as possible after the MMIO base address is known */
        intel_i830_init_gtt_entries();
+        if (intel_private.gtt_entries == 0) {
+                iounmap(intel_private.registers);
+                return -ENOMEM;
+        }
        agp_bridge->gatt_table = NULL;
@@ -1216,17 +1232,20 @@ static int intel_i915_get_gtt_size(void)
                /* G33's GTT size defined in gmch_ctrl */
                pci_read_config_word(agp_bridge->dev, I830_GMCH_CTRL, &gmch_ctrl);
-                switch (gmch_ctrl & G33_PGETBL_SIZE_MASK) {
+                switch (gmch_ctrl & I830_GMCH_GMS_MASK) {
-                case G33_PGETBL_SIZE_1M:
+                case I830_GMCH_GMS_STOLEN_512:
+                        size = 512;
+                        break;
+                case I830_GMCH_GMS_STOLEN_1024:
                        size = 1024;
                        break;
-                case G33_PGETBL_SIZE_2M:
+                case I830_GMCH_GMS_STOLEN_8192:
-                        size = 2048;
+                        size = 8*1024;
                        break;
                default:
                        dev_info(&agp_bridge->dev->dev,
                                 "unknown page table size 0x%x, assuming 512KB\n",
-                                (gmch_ctrl & G33_PGETBL_SIZE_MASK));
+                                (gmch_ctrl & I830_GMCH_GMS_MASK));
                        size = 512;
                }
        } else {
@@ -1279,6 +1298,11 @@ static int intel_i915_create_gatt_table(struct agp_bridge_data *bridge)
        /* we have to call this as early as possible after the MMIO base address is known */
        intel_i830_init_gtt_entries();
+        if (intel_private.gtt_entries == 0) {
+                iounmap(intel_private.gtt);
+                iounmap(intel_private.registers);
+                return -ENOMEM;
+        }
        agp_bridge->gatt_table = NULL;
@@ -1306,6 +1330,16 @@ static unsigned long intel_i965_mask_memory(struct agp_bridge_data *bridge,
        return addr | bridge->driver->masks[type].mask;
 }
+static unsigned long intel_gen6_mask_memory(struct agp_bridge_data *bridge,
+                                            dma_addr_t addr, int type)
+{
+        /* Shift high bits down */
+        addr |= (addr >> 28) & 0xff;
+        /* Type checking must be done elsewhere */
+        return addr | bridge->driver->masks[type].mask;
+}
 static void intel_i965_get_gtt_range(int *gtt_offset, int *gtt_size)
 {
        u16 snb_gmch_ctl;
@@ -1387,6 +1421,11 @@ static int intel_i965_create_gatt_table(struct agp_bridge_data *bridge)
        /* we have to call this as early as possible after the MMIO base address is known */
        intel_i830_init_gtt_entries();
+        if (intel_private.gtt_entries == 0) {
+                iounmap(intel_private.gtt);
+                iounmap(intel_private.registers);
+                return -ENOMEM;
+        }
        agp_bridge->gatt_table = NULL;
@@ -1514,6 +1553,39 @@ static const struct agp_bridge_driver intel_i965_driver = {
 #endif
 };
+static const struct agp_bridge_driver intel_gen6_driver = {
+        .owner                  = THIS_MODULE,
+        .aperture_sizes         = intel_i830_sizes,
+        .size_type              = FIXED_APER_SIZE,
+        .num_aperture_sizes     = 4,
+        .needs_scratch_page     = true,
+        .configure              = intel_i9xx_configure,
+        .fetch_size             = intel_i9xx_fetch_size,
+        .cleanup                = intel_i915_cleanup,
+        .mask_memory            = intel_gen6_mask_memory,
+        .masks                  = intel_i810_masks,
+        .agp_enable             = intel_i810_agp_enable,
+        .cache_flush            = global_cache_flush,
+        .create_gatt_table      = intel_i965_create_gatt_table,
+        .free_gatt_table        = intel_i830_free_gatt_table,
+        .insert_memory          = intel_i915_insert_entries,
+        .remove_memory          = intel_i915_remove_entries,
+        .alloc_by_type          = intel_i830_alloc_by_type,
+        .free_by_type           = intel_i810_free_by_type,
+        .agp_alloc_page         = agp_generic_alloc_page,
+        .agp_alloc_pages        = agp_generic_alloc_pages,
+        .agp_destroy_page       = agp_generic_destroy_page,
+        .agp_destroy_pages      = agp_generic_destroy_pages,
+        .agp_type_to_mask_type  = intel_i830_type_to_mask_type,
+        .chipset_flush          = intel_i915_chipset_flush,
+#ifdef USE_PCI_DMA_API
+        .agp_map_page           = intel_agp_map_page,
+        .agp_unmap_page         = intel_agp_unmap_page,
+        .agp_map_memory         = intel_agp_map_memory,
+        .agp_unmap_memory       = intel_agp_unmap_memory,
+#endif
+};
 static const struct agp_bridge_driver intel_g33_driver = {
        .owner                  = THIS_MODULE,
        .aperture_sizes         = intel_i830_sizes,
diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c
index 89d871ef8c2f..91917133ae0a 100644
--- a/drivers/char/bsr.c
+++ b/drivers/char/bsr.c
@@ -23,6 +23,7 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
+#include <linux/fs.h>
 #include <linux/module.h>
 #include <linux/cdev.h>
 #include <linux/list.h>
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index 35cca4c7fb18..fa27d1676ee5 100644
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -194,7 +194,7 @@ static int __init hvc_console_setup(struct console *co, char *options)
        return 0;
 }
-static struct console hvc_con_driver = {
+static struct console hvc_console = {
        .name           = "hvc",
        .write          = hvc_console_print,
        .device         = hvc_console_device,
@@ -220,7 +220,7 @@ static struct console hvc_con_driver = {
 */
 static int __init hvc_console_init(void)
 {
-        register_console(&hvc_con_driver);
+        register_console(&hvc_console);
        return 0;
 }
 console_initcall(hvc_console_init);
@@ -276,8 +276,8 @@ int hvc_instantiate(uint32_t vtermno, int index, const struct hv_ops *ops)
         * now (setup won't fail at this point).  It's ok to just
         * call register again if previously .setup failed.
         */
-        if (index == hvc_con_driver.index)
+        if (index == hvc_console.index)
-                register_console(&hvc_con_driver);
+                register_console(&hvc_console);
        return 0;
 }
@@ -641,7 +641,7 @@ int hvc_poll(struct hvc_struct *hp)
                }
                for (i = 0; i < n; ++i) {
 #ifdef CONFIG_MAGIC_SYSRQ
-                        if (hp->index == hvc_con_driver.index) {
+                        if (hp->index == hvc_console.index) {
                                /* Handle the SysRq Hack */
                                /* XXX should support a sequence */
                                if (buf[i] == '\x0f') { /* ^O */
@@ -909,7 +909,7 @@ static void __exit hvc_exit(void)
                tty_unregister_driver(hvc_driver);
                /* return tty_struct instances allocated in hvc_init(). */
                put_tty_driver(hvc_driver);
-                unregister_console(&hvc_con_driver);
+                unregister_console(&hvc_console);
        }
 }
 module_exit(hvc_exit);
diff --git a/drivers/char/hvsi.c b/drivers/char/hvsi.c
index d4b14ff1c4c1..1f4b6de65a2d 100644
--- a/drivers/char/hvsi.c
+++ b/drivers/char/hvsi.c
@@ -1255,7 +1255,7 @@ static int __init hvsi_console_setup(struct console *console, char *options)
        return 0;
 }
-static struct console hvsi_con_driver = {
+static struct console hvsi_console = {
        .name           = "hvsi",
        .write          = hvsi_console_print,
        .device         = hvsi_console_device,
@@ -1308,7 +1308,7 @@ static int __init hvsi_console_init(void)
        }
        if (hvsi_count)
-                register_console(&hvsi_con_driver);
+                register_console(&hvsi_console);
        return 0;
 }
 console_initcall(hvsi_console_init);
diff --git a/drivers/char/hw_random/n2-drv.c b/drivers/char/hw_random/n2-drv.c
index 0f9cbf1aaf15..7a4f080f8356 100644
--- a/drivers/char/hw_random/n2-drv.c
+++ b/drivers/char/hw_random/n2-drv.c
@@ -387,7 +387,7 @@ static int n2rng_init_control(struct n2rng *np)
 static int n2rng_data_read(struct hwrng *rng, u32 *data)
 {
-        struct n2rng *np = (struct n2rng *) rng->priv;
+        struct n2rng *np = rng->priv;
        unsigned long ra = __pa(&np->test_data);
        int len;
@@ -762,12 +762,12 @@ static struct of_platform_driver n2rng_driver = {
 static int __init n2rng_init(void)
 {
-        return of_register_driver(&n2rng_driver, &of_bus_type);
+        return of_register_platform_driver(&n2rng_driver);
 }
 static void __exit n2rng_exit(void)
 {
-        of_unregister_driver(&n2rng_driver);
+        of_unregister_platform_driver(&n2rng_driver);
 }
 module_init(n2rng_init);
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
index 54109dc9240c..25be2102a60a 100644
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -1315,10 +1315,14 @@ static bool kbd_match(struct input_handler *handler, struct input_dev *dev)
        if (test_bit(EV_SND, dev->evbit))
                return true;
-        if (test_bit(EV_KEY, dev->evbit))
+        if (test_bit(EV_KEY, dev->evbit)) {
                for (i = KEY_RESERVED; i < BTN_MISC; i++)
                        if (test_bit(i, dev->keybit))
                                return true;
+                for (i = KEY_BRL_DOT1; i <= KEY_BRL_DOT10; i++)
+                        if (test_bit(i, dev->keybit))
+                                return true;
+        }
        return false;
 }
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 8d85587b6d4f..caef35a46890 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -407,8 +407,8 @@ struct entropy_store {
        struct poolinfo *poolinfo;
        __u32 *pool;
        const char *name;
-        int limit;
        struct entropy_store *pull;
+        int limit;
        /* read-write data: */
        spinlock_t lock;
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
index 4561ce2fba6d..334cf5c8c8b6 100644
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
@@ -4845,7 +4845,7 @@ static int register_test(struct slgt_info *info)
 {
        static unsigned short patterns[] =
                {0x0000, 0xffff, 0xaaaa, 0x5555, 0x6969, 0x9696};
-        static unsigned int count = sizeof(patterns)/sizeof(patterns[0]);
+        static unsigned int count = ARRAY_SIZE(patterns);
        unsigned int i;
        int rc = 0;
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index 5d64e3acb000..878ac0c2cc68 100644
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -493,7 +493,7 @@ static void __sysrq_put_key_op(int key, struct sysrq_key_op *op_p)
                sysrq_key_table[i] = op_p;
 }
-static void __handle_sysrq(int key, struct tty_struct *tty, int check_mask)
+void __handle_sysrq(int key, struct tty_struct *tty, int check_mask)
 {
        struct sysrq_key_op *op_p;
        int orig_log_level;
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index 24314a9cffe8..1030f8420137 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -623,7 +623,14 @@ static int tpm_tis_pnp_suspend(struct pnp_dev *dev, pm_message_t msg)
 static int tpm_tis_pnp_resume(struct pnp_dev *dev)
 {
-        return tpm_pm_resume(&dev->dev);
+        struct tpm_chip *chip = pnp_get_drvdata(dev);
+        int ret;
+        ret = tpm_pm_resume(&dev->dev);
+        if (!ret)
+                tpm_continue_selftest(chip);
+        return ret;
 }
 static struct pnp_device_id tpm_pnp_tbl[] __devinitdata = {
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 7cdb6ee569cd..4a9eb3044e52 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -104,6 +104,7 @@
 #include <linux/io.h>
 #include <asm/system.h>
 #include <linux/uaccess.h>
+#include <linux/kdb.h>
 #define MAX_NR_CON_DRIVER 16
@@ -187,10 +188,15 @@ static DECLARE_WORK(console_work, console_callback);
 * fg_console is the current virtual console,
 * last_console is the last used one,
 * want_console is the console we want to switch to,
+ * saved_* variants are for save/restore around kernel debugger enter/leave
 */
 int fg_console;
 int last_console;
 int want_console = -1;
+int saved_fg_console;
+int saved_last_console;
+int saved_want_console;
+int saved_vc_mode;
 /*
 * For each existing display, we have a pointer to console currently visible
@@ -3414,6 +3420,78 @@ int con_is_bound(const struct consw *csw)
 EXPORT_SYMBOL(con_is_bound);
 /**
+ * con_debug_enter - prepare the console for the kernel debugger
+ * @sw: console driver
+ *
+ * Called when the console is taken over by the kernel debugger, this
+ * function needs to save the current console state, then put the console
+ * into a state suitable for the kernel debugger.
+ *
+ * RETURNS:
+ * Zero on success, nonzero if a failure occurred when trying to prepare
+ * the console for the debugger.
+ */
+int con_debug_enter(struct vc_data *vc)
+{
+        int ret = 0;
+        saved_fg_console = fg_console;
+        saved_last_console = last_console;
+        saved_want_console = want_console;
+        saved_vc_mode = vc->vc_mode;
+        vc->vc_mode = KD_TEXT;
+        console_blanked = 0;
+        if (vc->vc_sw->con_debug_enter)
+                ret = vc->vc_sw->con_debug_enter(vc);
+#ifdef CONFIG_KGDB_KDB
+        /* Set the initial LINES variable if it is not already set */
+        if (vc->vc_rows < 999) {
+                int linecount;
+                char lns[4];
+                const char *setargs[3] = {
+                        "set",
+                        "LINES",
+                        lns,
+                };
+                if (kdbgetintenv(setargs[0], &linecount)) {
+                        snprintf(lns, 4, "%i", vc->vc_rows);
+                        kdb_set(2, setargs);
+                }
+        }
+#endif /* CONFIG_KGDB_KDB */
+        return ret;
+}
+EXPORT_SYMBOL_GPL(con_debug_enter);
+/**
+ * con_debug_leave - restore console state
+ * @sw: console driver
+ *
+ * Restore the console state to what it was before the kernel debugger
+ * was invoked.
+ *
+ * RETURNS:
+ * Zero on success, nonzero if a failure occurred when trying to restore
+ * the console.
+ */
+int con_debug_leave(void)
+{
+        struct vc_data *vc;
+        int ret = 0;
+        fg_console = saved_fg_console;
+        last_console = saved_last_console;
+        want_console = saved_want_console;
+        vc_cons[fg_console].d->vc_mode = saved_vc_mode;
+        vc = vc_cons[fg_console].d;
+        if (vc->vc_sw->con_debug_leave)
+                ret = vc->vc_sw->con_debug_leave(vc);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(con_debug_leave);
+/**
 * register_con_driver - register console driver to console layer
 * @csw: console driver
 * @first: the first console to take over, minimum value is 0
diff --git a/drivers/clocksource/cs5535-clockevt.c b/drivers/clocksource/cs5535-clockevt.c
index d7be69f13154..b7dab32ce63c 100644
--- a/drivers/clocksource/cs5535-clockevt.c
+++ b/drivers/clocksource/cs5535-clockevt.c
@@ -194,6 +194,6 @@ err_timer:
 module_init(cs5535_mfgpt_init);
-MODULE_AUTHOR("Andres Salomon <dilinger@collabora.co.uk>");
+MODULE_AUTHOR("Andres Salomon <dilinger@queued.net>");
 MODULE_DESCRIPTION("CS5535/CS5536 MFGPT clock event driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 063b2184caf5..199dcb9f0b83 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -29,6 +29,8 @@
 #include <linux/completion.h>
 #include <linux/mutex.h>
+#include <trace/events/power.h>
 #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_CORE, \
                                                "cpufreq-core", msg)
@@ -68,7 +70,7 @@ static DEFINE_PER_CPU(int, cpufreq_policy_cpu);
 static DEFINE_PER_CPU(struct rw_semaphore, cpu_policy_rwsem);
 #define lock_policy_rwsem(mode, cpu)                                    \
-int lock_policy_rwsem_##mode                                            \
+static int lock_policy_rwsem_##mode                                     \
 (int cpu)                                                               \
 {                                                                       \
        int policy_cpu = per_cpu(cpufreq_policy_cpu, cpu);              \
@@ -83,26 +85,22 @@ int lock_policy_rwsem_##mode						\
 }
 lock_policy_rwsem(read, cpu);
-EXPORT_SYMBOL_GPL(lock_policy_rwsem_read);
 lock_policy_rwsem(write, cpu);
-EXPORT_SYMBOL_GPL(lock_policy_rwsem_write);
-void unlock_policy_rwsem_read(int cpu)
+static void unlock_policy_rwsem_read(int cpu)
 {
        int policy_cpu = per_cpu(cpufreq_policy_cpu, cpu);
        BUG_ON(policy_cpu == -1);
        up_read(&per_cpu(cpu_policy_rwsem, policy_cpu));
 }
-EXPORT_SYMBOL_GPL(unlock_policy_rwsem_read);
-void unlock_policy_rwsem_write(int cpu)
+static void unlock_policy_rwsem_write(int cpu)
 {
        int policy_cpu = per_cpu(cpufreq_policy_cpu, cpu);
        BUG_ON(policy_cpu == -1);
        up_write(&per_cpu(cpu_policy_rwsem, policy_cpu));
 }
-EXPORT_SYMBOL_GPL(unlock_policy_rwsem_write);
 /* internal prototypes */
@@ -354,6 +352,9 @@ void cpufreq_notify_transition(struct cpufreq_freqs *freqs, unsigned int state)
        case CPUFREQ_POSTCHANGE:
                adjust_jiffies(CPUFREQ_POSTCHANGE, freqs);
+                dprintk("FREQ: %lu - CPU: %lu", (unsigned long)freqs->new,
+                        (unsigned long)freqs->cpu);
+                trace_power_frequency(POWER_PSTATE, freqs->new, freqs->cpu);
                srcu_notifier_call_chain(&cpufreq_transition_notifier_list,
                                CPUFREQ_POSTCHANGE, freqs);
                if (likely(policy) && likely(policy->cpu == freqs->cpu))
@@ -1077,6 +1078,7 @@ err_out_unregister:
 err_unlock_policy:
        unlock_policy_rwsem_write(cpu);
+        free_cpumask_var(policy->related_cpus);
 err_free_cpumask:
        free_cpumask_var(policy->cpus);
 err_free_policy:
@@ -1762,17 +1764,8 @@ static int __cpufreq_set_policy(struct cpufreq_policy *data,
                        dprintk("governor switch\n");
                        /* end old governor */
-                        if (data->governor) {
+                        if (data->governor)
-                                /*
-                                 * Need to release the rwsem around governor
-                                 * stop due to lock dependency between
-                                 * cancel_delayed_work_sync and the read lock
-                                 * taken in the delayed work handler.
-                                 */
-                                unlock_policy_rwsem_write(data->cpu);
                                __cpufreq_governor(data, CPUFREQ_GOV_STOP);
-                                lock_policy_rwsem_write(data->cpu);
-                        }
                        /* start new governor */
                        data->governor = policy->governor;
@@ -1883,8 +1876,7 @@ static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb,
        return NOTIFY_OK;
 }
-static struct notifier_block __refdata cpufreq_cpu_notifier =
+static struct notifier_block __refdata cpufreq_cpu_notifier = {
-{
    .notifier_call = cpufreq_cpu_callback,
 };
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index e1314212d8d4..7b5093664e49 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -459,6 +459,17 @@ static struct attribute_group dbs_attr_group_old = {
 /************************** sysfs end ************************/
+static void dbs_freq_increase(struct cpufreq_policy *p, unsigned int freq)
+{
+        if (dbs_tuners_ins.powersave_bias)
+                freq = powersave_bias_target(p, freq, CPUFREQ_RELATION_H);
+        else if (p->cur == p->max)
+                return;
+        __cpufreq_driver_target(p, freq, dbs_tuners_ins.powersave_bias ?
+                        CPUFREQ_RELATION_L : CPUFREQ_RELATION_H);
+}
 static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info)
 {
        unsigned int max_load_freq;
@@ -551,19 +562,7 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info)
        /* Check for frequency increase */
        if (max_load_freq > dbs_tuners_ins.up_threshold * policy->cur) {
-                /* if we are already at full speed then break out early */
+                dbs_freq_increase(policy, policy->max);
-                if (!dbs_tuners_ins.powersave_bias) {
-                        if (policy->cur == policy->max)
-                                return;
-                        __cpufreq_driver_target(policy, policy->max,
-                                CPUFREQ_RELATION_H);
-                } else {
-                        int freq = powersave_bias_target(policy, policy->max,
-                                        CPUFREQ_RELATION_H);
-                        __cpufreq_driver_target(policy, freq,
-                                CPUFREQ_RELATION_L);
-                }
                return;
        }
@@ -610,7 +609,9 @@ static void do_dbs_timer(struct work_struct *work)
        /* We want all CPUs to do sampling nearly on same jiffy */
        int delay = usecs_to_jiffies(dbs_tuners_ins.sampling_rate);
-        delay -= jiffies % delay;
+        if (num_online_cpus() > 1)
+                delay -= jiffies % delay;
        mutex_lock(&dbs_info->timer_mutex);
        /* Common NORMAL_SAMPLE setup */
@@ -635,7 +636,9 @@ static inline void dbs_timer_init(struct cpu_dbs_info_s *dbs_info)
 {
        /* We want all CPUs to do sampling nearly on same jiffy */
        int delay = usecs_to_jiffies(dbs_tuners_ins.sampling_rate);
-        delay -= jiffies % delay;
+        if (num_online_cpus() > 1)
+                delay -= jiffies % delay;
        dbs_info->sample_type = DBS_NORMAL_SAMPLE;
        INIT_DELAYED_WORK_DEFERRABLE(&dbs_info->work, do_dbs_timer);
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 199488576a05..dbefe15bd582 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -95,7 +95,7 @@ static void cpuidle_idle_call(void)
        /* give the governor an opportunity to reflect on the outcome */
        if (cpuidle_curr_governor->reflect)
                cpuidle_curr_governor->reflect(dev);
-        trace_power_end(0);
+        trace_power_end(smp_processor_id());
 }
 /**
diff --git a/drivers/crypto/amcc/crypto4xx_reg_def.h b/drivers/crypto/amcc/crypto4xx_reg_def.h
index 7d4edb002619..5f5fbc0716ff 100644
--- a/drivers/crypto/amcc/crypto4xx_reg_def.h
+++ b/drivers/crypto/amcc/crypto4xx_reg_def.h
@@ -113,7 +113,7 @@
 #define CRYPTO4XX_PRNG_LFSR_H                   0x00070034
 /**
- * Initilize CRYPTO ENGINE registers, and memory bases.
+ * Initialize CRYPTO ENGINE registers, and memory bases.
 */
 #define PPC4XX_PDR_POLL                         0x3ff
 #define PPC4XX_OUTPUT_THRESHOLD                 2
diff --git a/drivers/crypto/geode-aes.c b/drivers/crypto/geode-aes.c
index 09389dd2f96b..219d09cbb0d1 100644
--- a/drivers/crypto/geode-aes.c
+++ b/drivers/crypto/geode-aes.c
@@ -573,7 +573,7 @@ geode_aes_probe(struct pci_dev *dev, const struct pci_device_id *id)
 }
 static struct pci_device_id geode_aes_tbl[] = {
-        { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LX_AES, PCI_ANY_ID, PCI_ANY_ID} ,
+        { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_LX_AES), } ,
        { 0, }
 };
diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
index 16fce3aadf4d..e449ac5627a5 100644
--- a/drivers/crypto/hifn_795x.c
+++ b/drivers/crypto/hifn_795x.c
@@ -2018,7 +2018,6 @@ static void hifn_flush(struct hifn_device *dev)
 {
        unsigned long flags;
        struct crypto_async_request *async_req;
-        struct hifn_context *ctx;
        struct ablkcipher_request *req;
        struct hifn_dma *dma = (struct hifn_dma *)dev->desc_virt;
        int i;
@@ -2035,7 +2034,6 @@ static void hifn_flush(struct hifn_device *dev)
        spin_lock_irqsave(&dev->lock, flags);
        while ((async_req = crypto_dequeue_request(&dev->queue))) {
-                ctx = crypto_tfm_ctx(async_req->tfm);
                req = container_of(async_req, struct ablkcipher_request, base);
                spin_unlock_irqrestore(&dev->lock, flags);
@@ -2139,7 +2137,6 @@ static int hifn_setup_crypto_req(struct ablkcipher_request *req, u8 op,
 static int hifn_process_queue(struct hifn_device *dev)
 {
        struct crypto_async_request *async_req, *backlog;
-        struct hifn_context *ctx;
        struct ablkcipher_request *req;
        unsigned long flags;
        int err = 0;
@@ -2156,7 +2153,6 @@ static int hifn_process_queue(struct hifn_device *dev)
                if (backlog)
                        backlog->complete(backlog, -EINPROGRESS);
-                ctx = crypto_tfm_ctx(async_req->tfm);
                req = container_of(async_req, struct ablkcipher_request, base);
                err = hifn_handle_req(req);
diff --git a/drivers/crypto/mv_cesa.c b/drivers/crypto/mv_cesa.c
index e095422b58dd..7d279e578df5 100644
--- a/drivers/crypto/mv_cesa.c
+++ b/drivers/crypto/mv_cesa.c
@@ -1055,20 +1055,20 @@ static int mv_probe(struct platform_device *pdev)
        cp->queue_th = kthread_run(queue_manag, cp, "mv_crypto");
        if (IS_ERR(cp->queue_th)) {
                ret = PTR_ERR(cp->queue_th);
-                goto err_thread;
+                goto err_unmap_sram;
        }
        ret = request_irq(irq, crypto_int, IRQF_DISABLED, dev_name(&pdev->dev),
                        cp);
        if (ret)
-                goto err_unmap_sram;
+                goto err_thread;
        writel(SEC_INT_ACCEL0_DONE, cpg->reg + SEC_ACCEL_INT_MASK);
        writel(SEC_CFG_STOP_DIG_ERR, cpg->reg + SEC_ACCEL_CFG);
        ret = crypto_register_alg(&mv_aes_alg_ecb);
        if (ret)
-                goto err_reg;
+                goto err_irq;
        ret = crypto_register_alg(&mv_aes_alg_cbc);
        if (ret)
@@ -1091,9 +1091,9 @@ static int mv_probe(struct platform_device *pdev)
        return 0;
 err_unreg_ecb:
        crypto_unregister_alg(&mv_aes_alg_ecb);
-err_thread:
+err_irq:
        free_irq(irq, cp);
-err_reg:
+err_thread:
        kthread_stop(cp->queue_th);
 err_unmap_sram:
        iounmap(cp->sram);
diff --git a/drivers/crypto/n2_core.c b/drivers/crypto/n2_core.c
index 23163fda5035..26af2dd5d831 100644
--- a/drivers/crypto/n2_core.c
+++ b/drivers/crypto/n2_core.c
@@ -239,21 +239,57 @@ static inline bool n2_should_run_async(struct spu_queue *qp, int this_len)
 }
 #endif
-struct n2_base_ctx {
+struct n2_ahash_alg {
-        struct list_head                list;
+        struct list_head        entry;
+        const char              *hash_zero;
+        const u32               *hash_init;
+        u8                      hw_op_hashsz;
+        u8                      digest_size;
+        u8                      auth_type;
+        u8                      hmac_type;
+        struct ahash_alg        alg;
 };
-static void n2_base_ctx_init(struct n2_base_ctx *ctx)
+static inline struct n2_ahash_alg *n2_ahash_alg(struct crypto_tfm *tfm)
 {
-        INIT_LIST_HEAD(&ctx->list);
+        struct crypto_alg *alg = tfm->__crt_alg;
+        struct ahash_alg *ahash_alg;
+        ahash_alg = container_of(alg, struct ahash_alg, halg.base);
+        return container_of(ahash_alg, struct n2_ahash_alg, alg);
 }
-struct n2_hash_ctx {
+struct n2_hmac_alg {
-        struct n2_base_ctx              base;
+        const char              *child_alg;
+        struct n2_ahash_alg     derived;
+};
+static inline struct n2_hmac_alg *n2_hmac_alg(struct crypto_tfm *tfm)
+{
+        struct crypto_alg *alg = tfm->__crt_alg;
+        struct ahash_alg *ahash_alg;
+        ahash_alg = container_of(alg, struct ahash_alg, halg.base);
+        return container_of(ahash_alg, struct n2_hmac_alg, derived.alg);
+}
+struct n2_hash_ctx {
        struct crypto_ahash             *fallback_tfm;
 };
+#define N2_HASH_KEY_MAX                 32 /* HW limit for all HMAC requests */
+struct n2_hmac_ctx {
+        struct n2_hash_ctx              base;
+        struct crypto_shash             *child_shash;
+        int                             hash_key_len;
+        unsigned char                   hash_key[N2_HASH_KEY_MAX];
+};
 struct n2_hash_req_ctx {
        union {
                struct md5_state        md5;
@@ -261,9 +297,6 @@ struct n2_hash_req_ctx {
                struct sha256_state     sha256;
        } u;
-        unsigned char                   hash_key[64];
-        unsigned char                   keyed_zero_hash[32];
        struct ahash_request            fallback_req;
 };
@@ -356,6 +389,94 @@ static void n2_hash_cra_exit(struct crypto_tfm *tfm)
        crypto_free_ahash(ctx->fallback_tfm);
 }
+static int n2_hmac_cra_init(struct crypto_tfm *tfm)
+{
+        const char *fallback_driver_name = tfm->__crt_alg->cra_name;
+        struct crypto_ahash *ahash = __crypto_ahash_cast(tfm);
+        struct n2_hmac_ctx *ctx = crypto_ahash_ctx(ahash);
+        struct n2_hmac_alg *n2alg = n2_hmac_alg(tfm);
+        struct crypto_ahash *fallback_tfm;
+        struct crypto_shash *child_shash;
+        int err;
+        fallback_tfm = crypto_alloc_ahash(fallback_driver_name, 0,
+                                          CRYPTO_ALG_NEED_FALLBACK);
+        if (IS_ERR(fallback_tfm)) {
+                pr_warning("Fallback driver '%s' could not be loaded!\n",
+                           fallback_driver_name);
+                err = PTR_ERR(fallback_tfm);
+                goto out;
+        }
+        child_shash = crypto_alloc_shash(n2alg->child_alg, 0, 0);
+        if (IS_ERR(child_shash)) {
+                pr_warning("Child shash '%s' could not be loaded!\n",
+                           n2alg->child_alg);
+                err = PTR_ERR(child_shash);
+                goto out_free_fallback;
+        }
+        crypto_ahash_set_reqsize(ahash, (sizeof(struct n2_hash_req_ctx) +
+                                         crypto_ahash_reqsize(fallback_tfm)));
+        ctx->child_shash = child_shash;
+        ctx->base.fallback_tfm = fallback_tfm;
+        return 0;
+out_free_fallback:
+        crypto_free_ahash(fallback_tfm);
+out:
+        return err;
+}
+static void n2_hmac_cra_exit(struct crypto_tfm *tfm)
+{
+        struct crypto_ahash *ahash = __crypto_ahash_cast(tfm);
+        struct n2_hmac_ctx *ctx = crypto_ahash_ctx(ahash);
+        crypto_free_ahash(ctx->base.fallback_tfm);
+        crypto_free_shash(ctx->child_shash);
+}
+static int n2_hmac_async_setkey(struct crypto_ahash *tfm, const u8 *key,
+                                unsigned int keylen)
+{
+        struct n2_hmac_ctx *ctx = crypto_ahash_ctx(tfm);
+        struct crypto_shash *child_shash = ctx->child_shash;
+        struct crypto_ahash *fallback_tfm;
+        struct {
+                struct shash_desc shash;
+                char ctx[crypto_shash_descsize(child_shash)];
+        } desc;
+        int err, bs, ds;
+        fallback_tfm = ctx->base.fallback_tfm;
+        err = crypto_ahash_setkey(fallback_tfm, key, keylen);
+        if (err)
+                return err;
+        desc.shash.tfm = child_shash;
+        desc.shash.flags = crypto_ahash_get_flags(tfm) &
+                CRYPTO_TFM_REQ_MAY_SLEEP;
+        bs = crypto_shash_blocksize(child_shash);
+        ds = crypto_shash_digestsize(child_shash);
+        BUG_ON(ds > N2_HASH_KEY_MAX);
+        if (keylen > bs) {
+                err = crypto_shash_digest(&desc.shash, key, keylen,
+                                          ctx->hash_key);
+                if (err)
+                        return err;
+                keylen = ds;
+        } else if (keylen <= N2_HASH_KEY_MAX)
+                memcpy(ctx->hash_key, key, keylen);
+        ctx->hash_key_len = keylen;
+        return err;
+}
 static unsigned long wait_for_tail(struct spu_queue *qp)
 {
        unsigned long head, hv_ret;
@@ -385,12 +506,12 @@ static unsigned long submit_and_wait_for_tail(struct spu_queue *qp,
        return hv_ret;
 }
-static int n2_hash_async_digest(struct ahash_request *req,
+static int n2_do_async_digest(struct ahash_request *req,
-                                unsigned int auth_type, unsigned int digest_size,
+                              unsigned int auth_type, unsigned int digest_size,
-                                unsigned int result_size, void *hash_loc)
+                              unsigned int result_size, void *hash_loc,
+                              unsigned long auth_key, unsigned int auth_key_len)
 {
        struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
-        struct n2_hash_ctx *ctx = crypto_ahash_ctx(tfm);
        struct cwq_initial_entry *ent;
        struct crypto_hash_walk walk;
        struct spu_queue *qp;
@@ -403,6 +524,7 @@ static int n2_hash_async_digest(struct ahash_request *req,
         */
        if (unlikely(req->nbytes > (1 << 16))) {
                struct n2_hash_req_ctx *rctx = ahash_request_ctx(req);
+                struct n2_hash_ctx *ctx = crypto_ahash_ctx(tfm);
                ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm);
                rctx->fallback_req.base.flags =
@@ -414,8 +536,6 @@ static int n2_hash_async_digest(struct ahash_request *req,
                return crypto_ahash_digest(&rctx->fallback_req);
        }
-        n2_base_ctx_init(&ctx->base);
        nbytes = crypto_hash_walk_first(req, &walk);
        cpu = get_cpu();
@@ -430,13 +550,13 @@ static int n2_hash_async_digest(struct ahash_request *req,
         */
        ent = qp->q + qp->tail;
-        ent->control = control_word_base(nbytes, 0, 0,
+        ent->control = control_word_base(nbytes, auth_key_len, 0,
                                         auth_type, digest_size,
                                         false, true, false, false,
                                         OPCODE_INPLACE_BIT |
                                         OPCODE_AUTH_MAC);
        ent->src_addr = __pa(walk.data);
-        ent->auth_key_addr = 0UL;
+        ent->auth_key_addr = auth_key;
        ent->auth_iv_addr = __pa(hash_loc);
        ent->final_auth_state_addr = 0UL;
        ent->enc_key_addr = 0UL;
@@ -475,114 +595,55 @@ out:
        return err;
 }
-static int n2_md5_async_digest(struct ahash_request *req)
+static int n2_hash_async_digest(struct ahash_request *req)
 {
+        struct n2_ahash_alg *n2alg = n2_ahash_alg(req->base.tfm);
        struct n2_hash_req_ctx *rctx = ahash_request_ctx(req);
-        struct md5_state *m = &rctx->u.md5;
+        int ds;
+        ds = n2alg->digest_size;
        if (unlikely(req->nbytes == 0)) {
-                static const char md5_zero[MD5_DIGEST_SIZE] = {
+                memcpy(req->result, n2alg->hash_zero, ds);
-                        0xd4, 0x1d, 0x8c, 0xd9, 0x8f, 0x00, 0xb2, 0x04,
-                        0xe9, 0x80, 0x09, 0x98, 0xec, 0xf8, 0x42, 0x7e,
-                };
-                memcpy(req->result, md5_zero, MD5_DIGEST_SIZE);
                return 0;
        }
-        m->hash[0] = cpu_to_le32(0x67452301);
+        memcpy(&rctx->u, n2alg->hash_init, n2alg->hw_op_hashsz);
-        m->hash[1] = cpu_to_le32(0xefcdab89);
-        m->hash[2] = cpu_to_le32(0x98badcfe);
-        m->hash[3] = cpu_to_le32(0x10325476);
-        return n2_hash_async_digest(req, AUTH_TYPE_MD5,
+        return n2_do_async_digest(req, n2alg->auth_type,
-                                    MD5_DIGEST_SIZE, MD5_DIGEST_SIZE,
+                                  n2alg->hw_op_hashsz, ds,
-                                    m->hash);
+                                  &rctx->u, 0UL, 0);
 }
-static int n2_sha1_async_digest(struct ahash_request *req)
+static int n2_hmac_async_digest(struct ahash_request *req)
 {
+        struct n2_hmac_alg *n2alg = n2_hmac_alg(req->base.tfm);
        struct n2_hash_req_ctx *rctx = ahash_request_ctx(req);
-        struct sha1_state *s = &rctx->u.sha1;
+        struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
+        struct n2_hmac_ctx *ctx = crypto_ahash_ctx(tfm);
-        if (unlikely(req->nbytes == 0)) {
+        int ds;
-                static const char sha1_zero[SHA1_DIGEST_SIZE] = {
-                        0xda, 0x39, 0xa3, 0xee, 0x5e, 0x6b, 0x4b, 0x0d, 0x32,
-                        0x55, 0xbf, 0xef, 0x95, 0x60, 0x18, 0x90, 0xaf, 0xd8,
-                        0x07, 0x09
-                };
-                memcpy(req->result, sha1_zero, SHA1_DIGEST_SIZE);
-                return 0;
-        }
-        s->state[0] = SHA1_H0;
-        s->state[1] = SHA1_H1;
-        s->state[2] = SHA1_H2;
-        s->state[3] = SHA1_H3;
-        s->state[4] = SHA1_H4;
-        return n2_hash_async_digest(req, AUTH_TYPE_SHA1,
-                                    SHA1_DIGEST_SIZE, SHA1_DIGEST_SIZE,
-                                    s->state);
-}
-static int n2_sha256_async_digest(struct ahash_request *req)
-{
-        struct n2_hash_req_ctx *rctx = ahash_request_ctx(req);
-        struct sha256_state *s = &rctx->u.sha256;
-        if (req->nbytes == 0) {
-                static const char sha256_zero[SHA256_DIGEST_SIZE] = {
-                        0xe3, 0xb0, 0xc4, 0x42, 0x98, 0xfc, 0x1c, 0x14, 0x9a,
-                        0xfb, 0xf4, 0xc8, 0x99, 0x6f, 0xb9, 0x24, 0x27, 0xae,
-                        0x41, 0xe4, 0x64, 0x9b, 0x93, 0x4c, 0xa4, 0x95, 0x99,
-                        0x1b, 0x78, 0x52, 0xb8, 0x55
-                };
-                memcpy(req->result, sha256_zero, SHA256_DIGEST_SIZE);
-                return 0;
-        }
-        s->state[0] = SHA256_H0;
-        s->state[1] = SHA256_H1;
-        s->state[2] = SHA256_H2;
-        s->state[3] = SHA256_H3;
-        s->state[4] = SHA256_H4;
-        s->state[5] = SHA256_H5;
-        s->state[6] = SHA256_H6;
-        s->state[7] = SHA256_H7;
-        return n2_hash_async_digest(req, AUTH_TYPE_SHA256,
-                                    SHA256_DIGEST_SIZE, SHA256_DIGEST_SIZE,
-                                    s->state);
-}
-static int n2_sha224_async_digest(struct ahash_request *req)
+        ds = n2alg->derived.digest_size;
-{
+        if (unlikely(req->nbytes == 0) ||
-        struct n2_hash_req_ctx *rctx = ahash_request_ctx(req);
+            unlikely(ctx->hash_key_len > N2_HASH_KEY_MAX)) {
-        struct sha256_state *s = &rctx->u.sha256;
+                struct n2_hash_req_ctx *rctx = ahash_request_ctx(req);
+                struct n2_hash_ctx *ctx = crypto_ahash_ctx(tfm);
-        if (req->nbytes == 0) {
+                ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm);
-                static const char sha224_zero[SHA224_DIGEST_SIZE] = {
+                rctx->fallback_req.base.flags =
-                        0xd1, 0x4a, 0x02, 0x8c, 0x2a, 0x3a, 0x2b, 0xc9, 0x47,
+                        req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP;
-                        0x61, 0x02, 0xbb, 0x28, 0x82, 0x34, 0xc4, 0x15, 0xa2,
+                rctx->fallback_req.nbytes = req->nbytes;
-                        0xb0, 0x1f, 0x82, 0x8e, 0xa6, 0x2a, 0xc5, 0xb3, 0xe4,
+                rctx->fallback_req.src = req->src;
-                        0x2f
+                rctx->fallback_req.result = req->result;
-                };
-                memcpy(req->result, sha224_zero, SHA224_DIGEST_SIZE);
+                return crypto_ahash_digest(&rctx->fallback_req);
-                return 0;
        }
-        s->state[0] = SHA224_H0;
+        memcpy(&rctx->u, n2alg->derived.hash_init,
-        s->state[1] = SHA224_H1;
+               n2alg->derived.hw_op_hashsz);
-        s->state[2] = SHA224_H2;
-        s->state[3] = SHA224_H3;
-        s->state[4] = SHA224_H4;
-        s->state[5] = SHA224_H5;
-        s->state[6] = SHA224_H6;
-        s->state[7] = SHA224_H7;
-        return n2_hash_async_digest(req, AUTH_TYPE_SHA256,
+        return n2_do_async_digest(req, n2alg->derived.hmac_type,
-                                    SHA256_DIGEST_SIZE, SHA224_DIGEST_SIZE,
+                                  n2alg->derived.hw_op_hashsz, ds,
-                                    s->state);
+                                  &rctx->u,
+                                  __pa(&ctx->hash_key),
+                                  ctx->hash_key_len);
 }
 struct n2_cipher_context {
@@ -1209,35 +1270,92 @@ static LIST_HEAD(cipher_algs);
 struct n2_hash_tmpl {
        const char      *name;
-        int             (*digest)(struct ahash_request *req);
+        const char      *hash_zero;
+        const u32       *hash_init;
+        u8              hw_op_hashsz;
        u8              digest_size;
        u8              block_size;
+        u8              auth_type;
+        u8              hmac_type;
+};
+static const char md5_zero[MD5_DIGEST_SIZE] = {
+        0xd4, 0x1d, 0x8c, 0xd9, 0x8f, 0x00, 0xb2, 0x04,
+        0xe9, 0x80, 0x09, 0x98, 0xec, 0xf8, 0x42, 0x7e,
+};
+static const u32 md5_init[MD5_HASH_WORDS] = {
+        cpu_to_le32(0x67452301),
+        cpu_to_le32(0xefcdab89),
+        cpu_to_le32(0x98badcfe),
+        cpu_to_le32(0x10325476),
+};
+static const char sha1_zero[SHA1_DIGEST_SIZE] = {
+        0xda, 0x39, 0xa3, 0xee, 0x5e, 0x6b, 0x4b, 0x0d, 0x32,
+        0x55, 0xbf, 0xef, 0x95, 0x60, 0x18, 0x90, 0xaf, 0xd8,
+        0x07, 0x09
 };
+static const u32 sha1_init[SHA1_DIGEST_SIZE / 4] = {
+        SHA1_H0, SHA1_H1, SHA1_H2, SHA1_H3, SHA1_H4,
+};
+static const char sha256_zero[SHA256_DIGEST_SIZE] = {
+        0xe3, 0xb0, 0xc4, 0x42, 0x98, 0xfc, 0x1c, 0x14, 0x9a,
+        0xfb, 0xf4, 0xc8, 0x99, 0x6f, 0xb9, 0x24, 0x27, 0xae,
+        0x41, 0xe4, 0x64, 0x9b, 0x93, 0x4c, 0xa4, 0x95, 0x99,
+        0x1b, 0x78, 0x52, 0xb8, 0x55
+};
+static const u32 sha256_init[SHA256_DIGEST_SIZE / 4] = {
+        SHA256_H0, SHA256_H1, SHA256_H2, SHA256_H3,
+        SHA256_H4, SHA256_H5, SHA256_H6, SHA256_H7,
+};
+static const char sha224_zero[SHA224_DIGEST_SIZE] = {
+        0xd1, 0x4a, 0x02, 0x8c, 0x2a, 0x3a, 0x2b, 0xc9, 0x47,
+        0x61, 0x02, 0xbb, 0x28, 0x82, 0x34, 0xc4, 0x15, 0xa2,
+        0xb0, 0x1f, 0x82, 0x8e, 0xa6, 0x2a, 0xc5, 0xb3, 0xe4,
+        0x2f
+};
+static const u32 sha224_init[SHA256_DIGEST_SIZE / 4] = {
+        SHA224_H0, SHA224_H1, SHA224_H2, SHA224_H3,
+        SHA224_H4, SHA224_H5, SHA224_H6, SHA224_H7,
+};
 static const struct n2_hash_tmpl hash_tmpls[] = {
        { .name         = "md5",
-          .digest       = n2_md5_async_digest,
+          .hash_zero    = md5_zero,
+          .hash_init    = md5_init,
+          .auth_type    = AUTH_TYPE_MD5,
+          .hmac_type    = AUTH_TYPE_HMAC_MD5,
+          .hw_op_hashsz = MD5_DIGEST_SIZE,
          .digest_size  = MD5_DIGEST_SIZE,
          .block_size   = MD5_HMAC_BLOCK_SIZE },
        { .name         = "sha1",
-          .digest       = n2_sha1_async_digest,
+          .hash_zero    = sha1_zero,
+          .hash_init    = sha1_init,
+          .auth_type    = AUTH_TYPE_SHA1,
+          .hmac_type    = AUTH_TYPE_HMAC_SHA1,
+          .hw_op_hashsz = SHA1_DIGEST_SIZE,
          .digest_size  = SHA1_DIGEST_SIZE,
          .block_size   = SHA1_BLOCK_SIZE },
        { .name         = "sha256",
-          .digest       = n2_sha256_async_digest,
+          .hash_zero    = sha256_zero,
+          .hash_init    = sha256_init,
+          .auth_type    = AUTH_TYPE_SHA256,
+          .hmac_type    = AUTH_TYPE_HMAC_SHA256,
+          .hw_op_hashsz = SHA256_DIGEST_SIZE,
          .digest_size  = SHA256_DIGEST_SIZE,
          .block_size   = SHA256_BLOCK_SIZE },
        { .name         = "sha224",
-          .digest       = n2_sha224_async_digest,
+          .hash_zero    = sha224_zero,
+          .hash_init    = sha224_init,
+          .auth_type    = AUTH_TYPE_SHA256,
+          .hmac_type    = AUTH_TYPE_RESERVED,
+          .hw_op_hashsz = SHA256_DIGEST_SIZE,
          .digest_size  = SHA224_DIGEST_SIZE,
          .block_size   = SHA224_BLOCK_SIZE },
 };
 #define NUM_HASH_TMPLS ARRAY_SIZE(hash_tmpls)
-struct n2_ahash_alg {
-        struct list_head        entry;
-        struct ahash_alg        alg;
-};
 static LIST_HEAD(ahash_algs);
+static LIST_HEAD(hmac_algs);
 static int algs_registered;
@@ -1245,12 +1363,18 @@ static void __n2_unregister_algs(void)
 {
        struct n2_cipher_alg *cipher, *cipher_tmp;
        struct n2_ahash_alg *alg, *alg_tmp;
+        struct n2_hmac_alg *hmac, *hmac_tmp;
        list_for_each_entry_safe(cipher, cipher_tmp, &cipher_algs, entry) {
                crypto_unregister_alg(&cipher->alg);
                list_del(&cipher->entry);
                kfree(cipher);
        }
+        list_for_each_entry_safe(hmac, hmac_tmp, &hmac_algs, derived.entry) {
+                crypto_unregister_ahash(&hmac->derived.alg);
+                list_del(&hmac->derived.entry);
+                kfree(hmac);
+        }
        list_for_each_entry_safe(alg, alg_tmp, &ahash_algs, entry) {
                crypto_unregister_ahash(&alg->alg);
                list_del(&alg->entry);
@@ -1290,8 +1414,49 @@ static int __devinit __n2_register_one_cipher(const struct n2_cipher_tmpl *tmpl)
        list_add(&p->entry, &cipher_algs);
        err = crypto_register_alg(alg);
        if (err) {
+                pr_err("%s alg registration failed\n", alg->cra_name);
                list_del(&p->entry);
                kfree(p);
+        } else {
+                pr_info("%s alg registered\n", alg->cra_name);
+        }
+        return err;
+}
+static int __devinit __n2_register_one_hmac(struct n2_ahash_alg *n2ahash)
+{
+        struct n2_hmac_alg *p = kzalloc(sizeof(*p), GFP_KERNEL);
+        struct ahash_alg *ahash;
+        struct crypto_alg *base;
+        int err;
+        if (!p)
+                return -ENOMEM;
+        p->child_alg = n2ahash->alg.halg.base.cra_name;
+        memcpy(&p->derived, n2ahash, sizeof(struct n2_ahash_alg));
+        INIT_LIST_HEAD(&p->derived.entry);
+        ahash = &p->derived.alg;
+        ahash->digest = n2_hmac_async_digest;
+        ahash->setkey = n2_hmac_async_setkey;
+        base = &ahash->halg.base;
+        snprintf(base->cra_name, CRYPTO_MAX_ALG_NAME, "hmac(%s)", p->child_alg);
+        snprintf(base->cra_driver_name, CRYPTO_MAX_ALG_NAME, "hmac-%s-n2", p->child_alg);
+        base->cra_ctxsize = sizeof(struct n2_hmac_ctx);
+        base->cra_init = n2_hmac_cra_init;
+        base->cra_exit = n2_hmac_cra_exit;
+        list_add(&p->derived.entry, &hmac_algs);
+        err = crypto_register_ahash(ahash);
+        if (err) {
+                pr_err("%s alg registration failed\n", base->cra_name);
+                list_del(&p->derived.entry);
+                kfree(p);
+        } else {
+                pr_info("%s alg registered\n", base->cra_name);
        }
        return err;
 }
@@ -1307,12 +1472,19 @@ static int __devinit __n2_register_one_ahash(const struct n2_hash_tmpl *tmpl)
        if (!p)
                return -ENOMEM;
+        p->hash_zero = tmpl->hash_zero;
+        p->hash_init = tmpl->hash_init;
+        p->auth_type = tmpl->auth_type;
+        p->hmac_type = tmpl->hmac_type;
+        p->hw_op_hashsz = tmpl->hw_op_hashsz;
+        p->digest_size = tmpl->digest_size;
        ahash = &p->alg;
        ahash->init = n2_hash_async_init;
        ahash->update = n2_hash_async_update;
        ahash->final = n2_hash_async_final;
        ahash->finup = n2_hash_async_finup;
-        ahash->digest = tmpl->digest;
+        ahash->digest = n2_hash_async_digest;
        halg = &ahash->halg;
        halg->digestsize = tmpl->digest_size;
@@ -1331,9 +1503,14 @@ static int __devinit __n2_register_one_ahash(const struct n2_hash_tmpl *tmpl)
        list_add(&p->entry, &ahash_algs);
        err = crypto_register_ahash(ahash);
        if (err) {
+                pr_err("%s alg registration failed\n", base->cra_name);
                list_del(&p->entry);
                kfree(p);
+        } else {
+                pr_info("%s alg registered\n", base->cra_name);
        }
+        if (!err && p->hmac_type != AUTH_TYPE_RESERVED)
+                err = __n2_register_one_hmac(p);
        return err;
 }
@@ -2070,20 +2247,20 @@ static struct of_platform_driver n2_mau_driver = {
 static int __init n2_init(void)
 {
-        int err = of_register_driver(&n2_crypto_driver, &of_bus_type);
+        int err = of_register_platform_driver(&n2_crypto_driver);
        if (!err) {
-                err = of_register_driver(&n2_mau_driver, &of_bus_type);
+                err = of_register_platform_driver(&n2_mau_driver);
                if (err)
-                        of_unregister_driver(&n2_crypto_driver);
+                        of_unregister_platform_driver(&n2_crypto_driver);
        }
        return err;
 }
 static void __exit n2_exit(void)
 {
-        of_unregister_driver(&n2_mau_driver);
+        of_unregister_platform_driver(&n2_mau_driver);
-        of_unregister_driver(&n2_crypto_driver);
+        of_unregister_platform_driver(&n2_crypto_driver);
 }
 module_init(n2_init);
diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
index 8b034337793f..7d1485676886 100644
--- a/drivers/crypto/omap-sham.c
+++ b/drivers/crypto/omap-sham.c
@@ -15,7 +15,6 @@
 #define pr_fmt(fmt) "%s: " fmt, __func__
-#include <linux/version.h>
 #include <linux/err.h>
 #include <linux/device.h>
 #include <linux/module.h>
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
index 637c105f53d2..97f4af1d8a64 100644
--- a/drivers/crypto/talitos.c
+++ b/drivers/crypto/talitos.c
@@ -720,7 +720,6 @@ struct talitos_ctx {
 #define TALITOS_MDEU_MAX_CONTEXT_SIZE   TALITOS_MDEU_CONTEXT_SIZE_SHA384_SHA512
 struct talitos_ahash_req_ctx {
-        u64 count;
        u32 hw_context[TALITOS_MDEU_MAX_CONTEXT_SIZE / sizeof(u32)];
        unsigned int hw_context_size;
        u8 buf[HASH_MAX_BLOCK_SIZE];
@@ -729,6 +728,7 @@ struct talitos_ahash_req_ctx {
        unsigned int first;
        unsigned int last;
        unsigned int to_hash_later;
+        u64 nbuf;
        struct scatterlist bufsl[2];
        struct scatterlist *psrc;
 };
@@ -1183,10 +1183,14 @@ static size_t sg_copy_end_to_buffer(struct scatterlist *sgl, unsigned int nents,
                                /* Copy part of this segment */
                                ignore = skip - offset;
                                len = miter.length - ignore;
+                                if (boffset + len > buflen)
+                                        len = buflen - boffset;
                                memcpy(buf + boffset, miter.addr + ignore, len);
                        } else {
-                                /* Copy all of this segment */
+                                /* Copy all of this segment (up to buflen) */
                                len = miter.length;
+                                if (boffset + len > buflen)
+                                        len = buflen - boffset;
                                memcpy(buf + boffset, miter.addr, len);
                        }
                        boffset += len;
@@ -1609,6 +1613,7 @@ static void ahash_done(struct device *dev,
        if (!req_ctx->last && req_ctx->to_hash_later) {
                /* Position any partial block for next update/final/finup */
                memcpy(req_ctx->buf, req_ctx->bufnext, req_ctx->to_hash_later);
+                req_ctx->nbuf = req_ctx->to_hash_later;
        }
        common_nonsnoop_hash_unmap(dev, edesc, areq);
@@ -1724,7 +1729,7 @@ static int ahash_init(struct ahash_request *areq)
        struct talitos_ahash_req_ctx *req_ctx = ahash_request_ctx(areq);
        /* Initialize the context */
-        req_ctx->count = 0;
+        req_ctx->nbuf = 0;
        req_ctx->first = 1; /* first indicates h/w must init its context */
        req_ctx->swinit = 0; /* assume h/w init of context */
        req_ctx->hw_context_size =
@@ -1772,52 +1777,54 @@ static int ahash_process_req(struct ahash_request *areq, unsigned int nbytes)
                        crypto_tfm_alg_blocksize(crypto_ahash_tfm(tfm));
        unsigned int nbytes_to_hash;
        unsigned int to_hash_later;
-        unsigned int index;
+        unsigned int nsg;
        int chained;
-        index = req_ctx->count & (blocksize - 1);
+        if (!req_ctx->last && (nbytes + req_ctx->nbuf <= blocksize)) {
-        req_ctx->count += nbytes;
+                /* Buffer up to one whole block */
-        if (!req_ctx->last && (index + nbytes) < blocksize) {
-                /* Buffer the partial block */
                sg_copy_to_buffer(areq->src,
                                  sg_count(areq->src, nbytes, &chained),
-                                  req_ctx->buf + index, nbytes);
+                                  req_ctx->buf + req_ctx->nbuf, nbytes);
+                req_ctx->nbuf += nbytes;
                return 0;
        }
-        if (index) {
+        /* At least (blocksize + 1) bytes are available to hash */
-                /* partial block from previous update; chain it in. */
+        nbytes_to_hash = nbytes + req_ctx->nbuf;
-                sg_init_table(req_ctx->bufsl, (nbytes) ? 2 : 1);
+        to_hash_later = nbytes_to_hash & (blocksize - 1);
-                sg_set_buf(req_ctx->bufsl, req_ctx->buf, index);
-                if (nbytes)
+        if (req_ctx->last)
-                        scatterwalk_sg_chain(req_ctx->bufsl, 2,
+                to_hash_later = 0;
-                                             areq->src);
+        else if (to_hash_later)
+                /* There is a partial block. Hash the full block(s) now */
+                nbytes_to_hash -= to_hash_later;
+        else {
+                /* Keep one block buffered */
+                nbytes_to_hash -= blocksize;
+                to_hash_later = blocksize;
+        }
+        /* Chain in any previously buffered data */
+        if (req_ctx->nbuf) {
+                nsg = (req_ctx->nbuf < nbytes_to_hash) ? 2 : 1;
+                sg_init_table(req_ctx->bufsl, nsg);
+                sg_set_buf(req_ctx->bufsl, req_ctx->buf, req_ctx->nbuf);
+                if (nsg > 1)
+                        scatterwalk_sg_chain(req_ctx->bufsl, 2, areq->src);
                req_ctx->psrc = req_ctx->bufsl;
-        } else {
+        } else
                req_ctx->psrc = areq->src;
+        if (to_hash_later) {
+                int nents = sg_count(areq->src, nbytes, &chained);
+                sg_copy_end_to_buffer(areq->src, nents,
+                                      req_ctx->bufnext,
+                                      to_hash_later,
+                                      nbytes - to_hash_later);
        }
-        nbytes_to_hash =  index + nbytes;
+        req_ctx->to_hash_later = to_hash_later;
-        if (!req_ctx->last) {
-                to_hash_later = (nbytes_to_hash & (blocksize - 1));
-                if (to_hash_later) {
-                        int nents;
-                        /* Must copy to_hash_later bytes from the end
-                         * to bufnext (a partial block) for later.
-                         */
-                        nents = sg_count(areq->src, nbytes, &chained);
-                        sg_copy_end_to_buffer(areq->src, nents,
-                                              req_ctx->bufnext,
-                                              to_hash_later,
-                                              nbytes - to_hash_later);
-                        /* Adjust count for what will be hashed now */
-                        nbytes_to_hash -= to_hash_later;
-                }
-                req_ctx->to_hash_later = to_hash_later;
-        }
-        /* allocate extended descriptor */
+        /* Allocate extended descriptor */
        edesc = ahash_edesc_alloc(areq, nbytes_to_hash);
        if (IS_ERR(edesc))
                return PTR_ERR(edesc);
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index bd5250e8c00c..e88076022a7a 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -69,7 +69,7 @@ static struct at_desc *atc_first_queued(struct at_dma_chan *atchan)
 }
 /**
- * atc_alloc_descriptor - allocate and return an initilized descriptor
+ * atc_alloc_descriptor - allocate and return an initialized descriptor
 * @chan: the channel to allocate descriptors for
 * @gfp_flags: GFP allocation flags
 *
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index 8088b14ba5f7..f0fd6db6063c 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -10,7 +10,7 @@
 * Description:
 *   DMA engine driver for Freescale MPC8540 DMA controller, which is
 *   also fit for MPC8560, MPC8555, MPC8548, MPC8641, and etc.
- *   The support for MPC8349 DMA contorller is also added.
+ *   The support for MPC8349 DMA controller is also added.
 *
 * This driver instructs the DMA controller to issue the PCI Read Multiple
 * command for PCI read operations, instead of using the default PCI Read Line
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index aedef7941b22..70bb350de996 100644
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -39,14 +39,6 @@ config EDAC_DEBUG
          there're four debug levels (x=0,1,2,3 from low to high).
          Usually you should select 'N'.
-config EDAC_DEBUG_VERBOSE
-        bool "More verbose debugging"
-        depends on EDAC_DEBUG
-        help
-          This option makes debugging information more verbose.
-          Source file name and line number where debugging message
-          printed will be added to debugging message.
 config EDAC_DECODE_MCE
        tristate "Decode MCEs in human-readable form (only on AMD for now)"
        depends on CPU_SUP_AMD && X86_MCE
@@ -209,7 +201,7 @@ config EDAC_I5100
 config EDAC_MPC85XX
        tristate "Freescale MPC83xx / MPC85xx"
-        depends on EDAC_MM_EDAC && FSL_SOC && (PPC_83xx || MPC85xx)
+        depends on EDAC_MM_EDAC && FSL_SOC && (PPC_83xx || PPC_85xx)
        help
          Support for error detection and correction on the Freescale
          MPC8349, MPC8560, MPC8540, MPC8548
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index ac9f7985096d..670239ab7511 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -160,7 +160,7 @@ static int amd64_search_set_scrub_rate(struct pci_dev *ctl, u32 new_bw,
        return 0;
 }
-static int amd64_set_scrub_rate(struct mem_ctl_info *mci, u32 *bandwidth)
+static int amd64_set_scrub_rate(struct mem_ctl_info *mci, u32 bandwidth)
 {
        struct amd64_pvt *pvt = mci->pvt_info;
        u32 min_scrubrate = 0x0;
@@ -178,10 +178,10 @@ static int amd64_set_scrub_rate(struct mem_ctl_info *mci, u32 *bandwidth)
        default:
                amd64_printk(KERN_ERR, "Unsupported family!\n");
-                break;
+                return -EINVAL;
        }
-        return amd64_search_set_scrub_rate(pvt->misc_f3_ctl, *bandwidth,
+        return amd64_search_set_scrub_rate(pvt->misc_f3_ctl, bandwidth,
-                        min_scrubrate);
+                                           min_scrubrate);
 }
 static int amd64_get_scrub_rate(struct mem_ctl_info *mci, u32 *bw)
@@ -796,6 +796,11 @@ static int sys_addr_to_csrow(struct mem_ctl_info *mci, u64 sys_addr)
 static int get_channel_from_ecc_syndrome(struct mem_ctl_info *, u16);
+static u16 extract_syndrome(struct err_regs *err)
+{
+        return ((err->nbsh >> 15) & 0xff) | ((err->nbsl >> 16) & 0xff00);
+}
 static void amd64_cpu_display_info(struct amd64_pvt *pvt)
 {
        if (boot_cpu_data.x86 == 0x11)
@@ -888,6 +893,9 @@ static void amd64_dump_misc_regs(struct amd64_pvt *pvt)
                return;
        }
+        amd64_printk(KERN_INFO, "using %s syndromes.\n",
+                     ((pvt->syn_type == 8) ? "x8" : "x4"));
        /* Only if NOT ganged does dclr1 have valid info */
        if (!dct_ganging_enabled(pvt))
                amd64_dump_dramcfg_low(pvt->dclr1, 1);
@@ -1101,20 +1109,17 @@ static void k8_read_dram_base_limit(struct amd64_pvt *pvt, int dram)
 }
 static void k8_map_sysaddr_to_csrow(struct mem_ctl_info *mci,
-                                        struct err_regs *info,
+                                    struct err_regs *err_info, u64 sys_addr)
-                                        u64 sys_addr)
 {
        struct mem_ctl_info *src_mci;
-        unsigned short syndrome;
        int channel, csrow;
        u32 page, offset;
+        u16 syndrome;
-        /* Extract the syndrome parts and form a 16-bit syndrome */
+        syndrome = extract_syndrome(err_info);
-        syndrome  = HIGH_SYNDROME(info->nbsl) << 8;
-        syndrome |= LOW_SYNDROME(info->nbsh);
        /* CHIPKILL enabled */
-        if (info->nbcfg & K8_NBCFG_CHIPKILL) {
+        if (err_info->nbcfg & K8_NBCFG_CHIPKILL) {
                channel = get_channel_from_ecc_syndrome(mci, syndrome);
                if (channel < 0) {
                        /*
@@ -1123,8 +1128,8 @@ static void k8_map_sysaddr_to_csrow(struct mem_ctl_info *mci,
                         * as suspect.
                         */
                        amd64_mc_printk(mci, KERN_WARNING,
-                                       "unknown syndrome 0x%x - possible error "
+                                        "unknown syndrome 0x%04x - possible "
-                                       "reporting race\n", syndrome);
+                                        "error reporting race\n", syndrome);
                        edac_mc_handle_ce_no_info(mci, EDAC_MOD_STR);
                        return;
                }
@@ -1430,7 +1435,7 @@ static inline u64 f10_get_base_addr_offset(u64 sys_addr, int hi_range_sel,
        u64 chan_off;
        if (hi_range_sel) {
-                if (!(dct_sel_base_addr & 0xFFFFF800) &&
+                if (!(dct_sel_base_addr & 0xFFFF0000) &&
                   hole_valid && (sys_addr >= 0x100000000ULL))
                        chan_off = hole_off << 16;
                else
@@ -1654,13 +1659,13 @@ static int f10_translate_sysaddr_to_cs(struct amd64_pvt *pvt, u64 sys_addr,
 * (MCX_ADDR).
 */
 static void f10_map_sysaddr_to_csrow(struct mem_ctl_info *mci,
-                                     struct err_regs *info,
+                                     struct err_regs *err_info,
                                     u64 sys_addr)
 {
        struct amd64_pvt *pvt = mci->pvt_info;
        u32 page, offset;
-        unsigned short syndrome;
        int nid, csrow, chan = 0;
+        u16 syndrome;
        csrow = f10_translate_sysaddr_to_cs(pvt, sys_addr, &nid, &chan);
@@ -1671,15 +1676,14 @@ static void f10_map_sysaddr_to_csrow(struct mem_ctl_info *mci,
        error_address_to_page_and_offset(sys_addr, &page, &offset);
-        syndrome  = HIGH_SYNDROME(info->nbsl) << 8;
+        syndrome = extract_syndrome(err_info);
-        syndrome |= LOW_SYNDROME(info->nbsh);
        /*
         * We need the syndromes for channel detection only when we're
         * ganged. Otherwise @chan should already contain the channel at
         * this point.
         */
-        if (dct_ganging_enabled(pvt) && pvt->nbcfg & K8_NBCFG_CHIPKILL)
+        if (dct_ganging_enabled(pvt) && (pvt->nbcfg & K8_NBCFG_CHIPKILL))
                chan = get_channel_from_ecc_syndrome(mci, syndrome);
        if (chan >= 0)
@@ -1878,7 +1882,7 @@ static u16 x8_vectors[] = {
 };
 static int decode_syndrome(u16 syndrome, u16 *vectors, int num_vecs,
-                                 int v_dim)
+                           int v_dim)
 {
        unsigned int i, err_sym;
@@ -1955,124 +1959,23 @@ static int map_err_sym_to_channel(int err_sym, int sym_size)
 static int get_channel_from_ecc_syndrome(struct mem_ctl_info *mci, u16 syndrome)
 {
        struct amd64_pvt *pvt = mci->pvt_info;
-        u32 value = 0;
+        int err_sym = -1;
-        int err_sym = 0;
+        if (pvt->syn_type == 8)
-        if (boot_cpu_data.x86 == 0x10) {
+                err_sym = decode_syndrome(syndrome, x8_vectors,
+                                          ARRAY_SIZE(x8_vectors),
-                amd64_read_pci_cfg(pvt->misc_f3_ctl, 0x180, &value);
+                                          pvt->syn_type);
+        else if (pvt->syn_type == 4)
-                /* F3x180[EccSymbolSize]=1 => x8 symbols */
+                err_sym = decode_syndrome(syndrome, x4_vectors,
-                if (boot_cpu_data.x86_model > 7 &&
+                                          ARRAY_SIZE(x4_vectors),
-                    value & BIT(25)) {
+                                          pvt->syn_type);
-                        err_sym = decode_syndrome(syndrome, x8_vectors,
+        else {
-                                                  ARRAY_SIZE(x8_vectors), 8);
+                amd64_printk(KERN_WARNING, "%s: Illegal syndrome type: %u\n",
-                        return map_err_sym_to_channel(err_sym, 8);
+                                           __func__, pvt->syn_type);
-                }
+                return err_sym;
        }
-        err_sym = decode_syndrome(syndrome, x4_vectors, ARRAY_SIZE(x4_vectors), 4);
-        return map_err_sym_to_channel(err_sym, 4);
-}
-/*
- * Check for valid error in the NB Status High register. If so, proceed to read
- * NB Status Low, NB Address Low and NB Address High registers and store data
- * into error structure.
- *
- * Returns:
- *      - 1: if hardware regs contains valid error info
- *      - 0: if no valid error is indicated
- */
-static int amd64_get_error_info_regs(struct mem_ctl_info *mci,
-                                     struct err_regs *regs)
-{
-        struct amd64_pvt *pvt;
-        struct pci_dev *misc_f3_ctl;
-        pvt = mci->pvt_info;
-        misc_f3_ctl = pvt->misc_f3_ctl;
-        if (amd64_read_pci_cfg(misc_f3_ctl, K8_NBSH, &regs->nbsh))
-                return 0;
-        if (!(regs->nbsh & K8_NBSH_VALID_BIT))
-                return 0;
-        /* valid error, read remaining error information registers */
-        if (amd64_read_pci_cfg(misc_f3_ctl, K8_NBSL, &regs->nbsl) ||
-            amd64_read_pci_cfg(misc_f3_ctl, K8_NBEAL, &regs->nbeal) ||
-            amd64_read_pci_cfg(misc_f3_ctl, K8_NBEAH, &regs->nbeah) ||
-            amd64_read_pci_cfg(misc_f3_ctl, K8_NBCFG, &regs->nbcfg))
-                return 0;
-        return 1;
-}
-/*
- * This function is called to retrieve the error data from hardware and store it
- * in the info structure.
- *
- * Returns:
- *      - 1: if a valid error is found
- *      - 0: if no error is found
- */
-static int amd64_get_error_info(struct mem_ctl_info *mci,
-                                struct err_regs *info)
-{
-        struct amd64_pvt *pvt;
-        struct err_regs regs;
-        pvt = mci->pvt_info;
-        if (!amd64_get_error_info_regs(mci, info))
-                return 0;
-        /*
-         * Here's the problem with the K8's EDAC reporting: There are four
-         * registers which report pieces of error information. They are shared
-         * between CEs and UEs. Furthermore, contrary to what is stated in the
-         * BKDG, the overflow bit is never used! Every error always updates the
-         * reporting registers.
-         *
-         * Can you see the race condition? All four error reporting registers
-         * must be read before a new error updates them! There is no way to read
-         * all four registers atomically. The best than can be done is to detect
-         * that a race has occured and then report the error without any kind of
-         * precision.
-         *
-         * What is still positive is that errors are still reported and thus
-         * problems can still be detected - just not localized because the
-         * syndrome and address are spread out across registers.
-         *
-         * Grrrrr!!!!!  Here's hoping that AMD fixes this in some future K8 rev.
-         * UEs and CEs should have separate register sets with proper overflow
-         * bits that are used! At very least the problem can be fixed by
-         * honoring the ErrValid bit in 'nbsh' and not updating registers - just
-         * set the overflow bit - unless the current error is CE and the new
-         * error is UE which would be the only situation for overwriting the
-         * current values.
-         */
-        regs = *info;
-        /* Use info from the second read - most current */
-        if (unlikely(!amd64_get_error_info_regs(mci, info)))
-                return 0;
-        /* clear the error bits in hardware */
+        return map_err_sym_to_channel(err_sym, pvt->syn_type);
-        pci_write_bits32(pvt->misc_f3_ctl, K8_NBSH, 0, K8_NBSH_VALID_BIT);
-        /* Check for the possible race condition */
-        if ((regs.nbsh != info->nbsh) ||
-             (regs.nbsl != info->nbsl) ||
-             (regs.nbeah != info->nbeah) ||
-             (regs.nbeal != info->nbeal)) {
-                amd64_mc_printk(mci, KERN_WARNING,
-                                "hardware STATUS read access race condition "
-                                "detected!\n");
-                return 0;
-        }
-        return 1;
 }
 /*
@@ -2177,7 +2080,7 @@ static inline void __amd64_decode_bus_error(struct mem_ctl_info *mci,
         * catastrophic.
         */
        if (info->nbsh & K8_NBSH_OVERFLOW)
-                edac_mc_handle_ce_no_info(mci, EDAC_MOD_STR "Error Overflow");
+                edac_mc_handle_ce_no_info(mci, EDAC_MOD_STR " Error Overflow");
 }
 void amd64_decode_bus_error(int node_id, struct err_regs *regs)
@@ -2199,20 +2102,6 @@ void amd64_decode_bus_error(int node_id, struct err_regs *regs)
 }
 /*
- * The main polling 'check' function, called FROM the edac core to perform the
- * error checking and if an error is encountered, error processing.
- */
-static void amd64_check(struct mem_ctl_info *mci)
-{
-        struct err_regs regs;
-        if (amd64_get_error_info(mci, &regs)) {
-                struct amd64_pvt *pvt = mci->pvt_info;
-                amd_decode_nb_mce(pvt->mc_node_id, &regs, 1);
-        }
-}
-/*
 * Input:
 *      1) struct amd64_pvt which contains pvt->dram_f2_ctl pointer
 *      2) AMD Family index value
@@ -2284,6 +2173,7 @@ static void amd64_free_mc_sibling_devices(struct amd64_pvt *pvt)
 static void amd64_read_mc_registers(struct amd64_pvt *pvt)
 {
        u64 msr_val;
+        u32 tmp;
        int dram;
        /*
@@ -2349,10 +2239,22 @@ static void amd64_read_mc_registers(struct amd64_pvt *pvt)
        amd64_read_pci_cfg(pvt->dram_f2_ctl, F10_DCLR_0, &pvt->dclr0);
        amd64_read_pci_cfg(pvt->dram_f2_ctl, F10_DCHR_0, &pvt->dchr0);
-        if (!dct_ganging_enabled(pvt) && boot_cpu_data.x86 >= 0x10) {
+        if (boot_cpu_data.x86 >= 0x10) {
-                amd64_read_pci_cfg(pvt->dram_f2_ctl, F10_DCLR_1, &pvt->dclr1);
+                if (!dct_ganging_enabled(pvt)) {
-                amd64_read_pci_cfg(pvt->dram_f2_ctl, F10_DCHR_1, &pvt->dchr1);
+                        amd64_read_pci_cfg(pvt->dram_f2_ctl, F10_DCLR_1, &pvt->dclr1);
+                        amd64_read_pci_cfg(pvt->dram_f2_ctl, F10_DCHR_1, &pvt->dchr1);
+                }
+                amd64_read_pci_cfg(pvt->misc_f3_ctl, EXT_NB_MCA_CFG, &tmp);
        }
+        if (boot_cpu_data.x86 == 0x10 &&
+            boot_cpu_data.x86_model > 7 &&
+            /* F3x180[EccSymbolSize]=1 => x8 symbols */
+            tmp & BIT(25))
+                pvt->syn_type = 8;
+        else
+                pvt->syn_type = 4;
        amd64_dump_misc_regs(pvt);
 }
@@ -2739,9 +2641,6 @@ static void amd64_setup_mci_misc_attributes(struct mem_ctl_info *mci)
        mci->dev_name           = pci_name(pvt->dram_f2_ctl);
        mci->ctl_page_to_phys   = NULL;
-        /* IMPORTANT: Set the polling 'check' function in this module */
-        mci->edac_check         = amd64_check;
        /* memory scrubber interface */
        mci->set_sdram_scrub_rate = amd64_set_scrub_rate;
        mci->get_sdram_scrub_rate = amd64_get_scrub_rate;
diff --git a/drivers/edac/amd64_edac.h b/drivers/edac/amd64_edac.h
index 0d4bf5638243..613b9381e71a 100644
--- a/drivers/edac/amd64_edac.h
+++ b/drivers/edac/amd64_edac.h
@@ -244,44 +244,17 @@
 #define F10_DCTL_SEL_LOW                0x110
+#define dct_sel_baseaddr(pvt)           ((pvt->dram_ctl_select_low) & 0xFFFFF800)
-#define dct_sel_baseaddr(pvt)    \
+#define dct_sel_interleave_addr(pvt)    (((pvt->dram_ctl_select_low) >> 6) & 0x3)
-        ((pvt->dram_ctl_select_low) & 0xFFFFF800)
+#define dct_high_range_enabled(pvt)     (pvt->dram_ctl_select_low & BIT(0))
+#define dct_interleave_enabled(pvt)     (pvt->dram_ctl_select_low & BIT(2))
-#define dct_sel_interleave_addr(pvt)    \
+#define dct_ganging_enabled(pvt)        (pvt->dram_ctl_select_low & BIT(4))
-        (((pvt->dram_ctl_select_low) >> 6) & 0x3)
+#define dct_data_intlv_enabled(pvt)     (pvt->dram_ctl_select_low & BIT(5))
+#define dct_dram_enabled(pvt)           (pvt->dram_ctl_select_low & BIT(8))
-enum {
+#define dct_memory_cleared(pvt)         (pvt->dram_ctl_select_low & BIT(10))
-        F10_DCTL_SEL_LOW_DctSelHiRngEn  = BIT(0),
-        F10_DCTL_SEL_LOW_DctSelIntLvEn  = BIT(2),
-        F10_DCTL_SEL_LOW_DctGangEn      = BIT(4),
-        F10_DCTL_SEL_LOW_DctDatIntLv    = BIT(5),
-        F10_DCTL_SEL_LOW_DramEnable     = BIT(8),
-        F10_DCTL_SEL_LOW_MemCleared     = BIT(10),
-};
-#define    dct_high_range_enabled(pvt)    \
-        (pvt->dram_ctl_select_low & F10_DCTL_SEL_LOW_DctSelHiRngEn)
-#define dct_interleave_enabled(pvt)        \
-        (pvt->dram_ctl_select_low & F10_DCTL_SEL_LOW_DctSelIntLvEn)
-#define dct_ganging_enabled(pvt)        \
-        (pvt->dram_ctl_select_low & F10_DCTL_SEL_LOW_DctGangEn)
-#define dct_data_intlv_enabled(pvt)    \
-        (pvt->dram_ctl_select_low & F10_DCTL_SEL_LOW_DctDatIntLv)
-#define dct_dram_enabled(pvt)    \
-        (pvt->dram_ctl_select_low & F10_DCTL_SEL_LOW_DramEnable)
-#define dct_memory_cleared(pvt)    \
-        (pvt->dram_ctl_select_low & F10_DCTL_SEL_LOW_MemCleared)
 #define F10_DCTL_SEL_HIGH               0x114
 /*
 * Function 3 - Misc Control
 */
@@ -382,6 +355,8 @@ enum {
 #define K8_NBCAP_SECDED                 BIT(3)
 #define K8_NBCAP_DCT_DUAL               BIT(0)
+#define EXT_NB_MCA_CFG                  0x180
 /* MSRs */
 #define K8_MSR_MCGCTL_NBE               BIT(4)
@@ -471,6 +446,9 @@ struct amd64_pvt {
        u32 dram_ctl_select_high;       /* DRAM Controller Select High Reg */
        u32 online_spare;               /* On-Line spare Reg */
+        /* x4 or x8 syndromes in use */
+        u8 syn_type;
        /* temp storage for when input is received from sysfs */
        struct err_regs ctl_error_info;
diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c
index ae3f80c54198..073f5a06d238 100644
--- a/drivers/edac/e752x_edac.c
+++ b/drivers/edac/e752x_edac.c
@@ -958,7 +958,7 @@ static void e752x_check(struct mem_ctl_info *mci)
 }
 /* Program byte/sec bandwidth scrub rate to hardware */
-static int set_sdram_scrub_rate(struct mem_ctl_info *mci, u32 *new_bw)
+static int set_sdram_scrub_rate(struct mem_ctl_info *mci, u32 new_bw)
 {
        const struct scrubrate *scrubrates;
        struct e752x_pvt *pvt = (struct e752x_pvt *) mci->pvt_info;
@@ -975,7 +975,7 @@ static int set_sdram_scrub_rate(struct mem_ctl_info *mci, u32 *new_bw)
         * desired rate and program the cooresponding register value.
         */
        for (i = 0; scrubrates[i].bandwidth != SDRATE_EOT; i++)
-                if (scrubrates[i].bandwidth >= *new_bw)
+                if (scrubrates[i].bandwidth >= new_bw)
                        break;
        if (scrubrates[i].bandwidth == SDRATE_EOT)
diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h
index efca9343d26a..ce7146677e9b 100644
--- a/drivers/edac/edac_core.h
+++ b/drivers/edac/edac_core.h
@@ -49,21 +49,15 @@
 #define edac_printk(level, prefix, fmt, arg...) \
        printk(level "EDAC " prefix ": " fmt, ##arg)
-#define edac_printk_verbose(level, prefix, fmt, arg...) \
-        printk(level "EDAC " prefix ": " "in %s, line at %d: " fmt,     \
-               __FILE__, __LINE__, ##arg)
 #define edac_mc_printk(mci, level, fmt, arg...) \
        printk(level "EDAC MC%d: " fmt, mci->mc_idx, ##arg)
 #define edac_mc_chipset_printk(mci, level, prefix, fmt, arg...) \
        printk(level "EDAC " prefix " MC%d: " fmt, mci->mc_idx, ##arg)
-/* edac_device printk */
 #define edac_device_printk(ctl, level, fmt, arg...) \
        printk(level "EDAC DEVICE%d: " fmt, ctl->dev_idx, ##arg)
-/* edac_pci printk */
 #define edac_pci_printk(ctl, level, fmt, arg...) \
        printk(level "EDAC PCI%d: " fmt, ctl->pci_idx, ##arg)
@@ -76,21 +70,12 @@
 extern int edac_debug_level;
 extern const char *edac_mem_types[];
-#ifndef CONFIG_EDAC_DEBUG_VERBOSE
 #define edac_debug_printk(level, fmt, arg...)                           \
        do {                                                            \
                if (level <= edac_debug_level)                          \
                        edac_printk(KERN_DEBUG, EDAC_DEBUG,             \
                                    "%s: " fmt, __func__, ##arg);       \
        } while (0)
-#else  /* CONFIG_EDAC_DEBUG_VERBOSE */
-#define edac_debug_printk(level, fmt, arg...)                            \
-        do {                                                             \
-                if (level <= edac_debug_level)                           \
-                        edac_printk_verbose(KERN_DEBUG, EDAC_DEBUG, fmt, \
-                                            ##arg);                     \
-        } while (0)
-#endif
 #define debugf0( ... ) edac_debug_printk(0, __VA_ARGS__ )
 #define debugf1( ... ) edac_debug_printk(1, __VA_ARGS__ )
@@ -393,7 +378,7 @@ struct mem_ctl_info {
           internal representation and configures whatever else needs
           to be configured.
         */
-        int (*set_sdram_scrub_rate) (struct mem_ctl_info * mci, u32 * bw);
+        int (*set_sdram_scrub_rate) (struct mem_ctl_info * mci, u32 bw);
        /* Get the current sdram memory scrub rate from the internal
           representation and converts it to the closest matching
diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index c200c2fd43ea..8aad94d10c0c 100644
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -124,19 +124,6 @@ static const char *edac_caps[] = {
        [EDAC_S16ECD16ED] = "S16ECD16ED"
 };
-static ssize_t memctrl_int_store(void *ptr, const char *buffer, size_t count)
-{
-        int *value = (int *)ptr;
-        if (isdigit(*buffer))
-                *value = simple_strtoul(buffer, NULL, 0);
-        return count;
-}
 /* EDAC sysfs CSROW data structures and methods
 */
@@ -450,53 +437,54 @@ static ssize_t mci_reset_counters_store(struct mem_ctl_info *mci,
 /* memory scrubbing */
 static ssize_t mci_sdram_scrub_rate_store(struct mem_ctl_info *mci,
-                                        const char *data, size_t count)
+                                          const char *data, size_t count)
 {
-        u32 bandwidth = -1;
+        unsigned long bandwidth = 0;
+        int err;
-        if (mci->set_sdram_scrub_rate) {
+        if (!mci->set_sdram_scrub_rate) {
+                edac_printk(KERN_WARNING, EDAC_MC,
+                            "Memory scrub rate setting not implemented!\n");
+                return -EINVAL;
+        }
-                memctrl_int_store(&bandwidth, data, count);
+        if (strict_strtoul(data, 10, &bandwidth) < 0)
+                return -EINVAL;
-                if (!(*mci->set_sdram_scrub_rate) (mci, &bandwidth)) {
+        err = mci->set_sdram_scrub_rate(mci, (u32)bandwidth);
-                        edac_printk(KERN_DEBUG, EDAC_MC,
+        if (err) {
-                                "Scrub rate set successfully, applied: %d\n",
+                edac_printk(KERN_DEBUG, EDAC_MC,
-                                bandwidth);
+                            "Failed setting scrub rate to %lu\n", bandwidth);
-                } else {
+                return -EINVAL;
-                        /* FIXME: error codes maybe? */
+        }
-                        edac_printk(KERN_DEBUG, EDAC_MC,
+        else {
-                                "Scrub rate set FAILED, could not apply: %d\n",
+                edac_printk(KERN_DEBUG, EDAC_MC,
-                                bandwidth);
+                            "Scrub rate set to: %lu\n", bandwidth);
-                }
+                return count;
-        } else {
-                /* FIXME: produce "not implemented" ERROR for user-side. */
-                edac_printk(KERN_WARNING, EDAC_MC,
-                        "Memory scrubbing 'set'control is not implemented!\n");
        }
-        return count;
 }
 static ssize_t mci_sdram_scrub_rate_show(struct mem_ctl_info *mci, char *data)
 {
-        u32 bandwidth = -1;
+        u32 bandwidth = 0;
+        int err;
-        if (mci->get_sdram_scrub_rate) {
-                if (!(*mci->get_sdram_scrub_rate) (mci, &bandwidth)) {
+        if (!mci->get_sdram_scrub_rate) {
-                        edac_printk(KERN_DEBUG, EDAC_MC,
-                                "Scrub rate successfully, fetched: %d\n",
-                                bandwidth);
-                } else {
-                        /* FIXME: error codes maybe? */
-                        edac_printk(KERN_DEBUG, EDAC_MC,
-                                "Scrub rate fetch FAILED, got: %d\n",
-                                bandwidth);
-                }
-        } else {
-                /* FIXME: produce "not implemented" ERROR for user-side.  */
                edac_printk(KERN_WARNING, EDAC_MC,
-                        "Memory scrubbing 'get' control is not implemented\n");
+                            "Memory scrub rate reading not implemented\n");
+                return -EINVAL;
+        }
+        err = mci->get_sdram_scrub_rate(mci, &bandwidth);
+        if (err) {
+                edac_printk(KERN_DEBUG, EDAC_MC, "Error reading scrub rate\n");
+                return err;
+        }
+        else {
+                edac_printk(KERN_DEBUG, EDAC_MC,
+                            "Read scrub rate: %d\n", bandwidth);
+                return sprintf(data, "%d\n", bandwidth);
        }
-        return sprintf(data, "%d\n", bandwidth);
 }
 /* default attribute files for the MCI object */
diff --git a/drivers/edac/edac_mce_amd.c b/drivers/edac/edac_mce_amd.c
index 97e64bcdbc06..bae9351e9473 100644
--- a/drivers/edac/edac_mce_amd.c
+++ b/drivers/edac/edac_mce_amd.c
@@ -133,7 +133,7 @@ static void amd_decode_dc_mce(u64 mc0_status)
        u32 ec  = mc0_status & 0xffff;
        u32 xec = (mc0_status >> 16) & 0xf;
-        pr_emerg(" Data Cache Error");
+        pr_emerg("Data Cache Error");
        if (xec == 1 && TLB_ERROR(ec))
                pr_cont(": %s TLB multimatch.\n", LL_MSG(ec));
@@ -176,7 +176,7 @@ static void amd_decode_ic_mce(u64 mc1_status)
        u32 ec  = mc1_status & 0xffff;
        u32 xec = (mc1_status >> 16) & 0xf;
-        pr_emerg(" Instruction Cache Error");
+        pr_emerg("Instruction Cache Error");
        if (xec == 1 && TLB_ERROR(ec))
                pr_cont(": %s TLB multimatch.\n", LL_MSG(ec));
@@ -233,7 +233,7 @@ static void amd_decode_bu_mce(u64 mc2_status)
        u32 ec = mc2_status & 0xffff;
        u32 xec = (mc2_status >> 16) & 0xf;
-        pr_emerg(" Bus Unit Error");
+        pr_emerg("Bus Unit Error");
        if (xec == 0x1)
                pr_cont(" in the write data buffers.\n");
@@ -275,7 +275,7 @@ static void amd_decode_ls_mce(u64 mc3_status)
        u32 ec  = mc3_status & 0xffff;
        u32 xec = (mc3_status >> 16) & 0xf;
-        pr_emerg(" Load Store Error");
+        pr_emerg("Load Store Error");
        if (xec == 0x0) {
                u8 rrrr = (ec >> 4) & 0xf;
@@ -304,7 +304,7 @@ void amd_decode_nb_mce(int node_id, struct err_regs *regs, int handle_errors)
        if (TLB_ERROR(ec) && !report_gart_errors)
                return;
-        pr_emerg(" Northbridge Error, node %d", node_id);
+        pr_emerg("Northbridge Error, node %d", node_id);
        /*
         * F10h, revD can disable ErrCpu[3:0] so check that first and also the
@@ -342,13 +342,13 @@ static void amd_decode_fr_mce(u64 mc5_status)
 static inline void amd_decode_err_code(unsigned int ec)
 {
        if (TLB_ERROR(ec)) {
-                pr_emerg(" Transaction: %s, Cache Level %s\n",
+                pr_emerg("Transaction: %s, Cache Level %s\n",
                         TT_MSG(ec), LL_MSG(ec));
        } else if (MEM_ERROR(ec)) {
-                pr_emerg(" Transaction: %s, Type: %s, Cache Level: %s",
+                pr_emerg("Transaction: %s, Type: %s, Cache Level: %s",
                         RRRR_MSG(ec), TT_MSG(ec), LL_MSG(ec));
        } else if (BUS_ERROR(ec)) {
-                pr_emerg(" Transaction type: %s(%s), %s, Cache Level: %s, "
+                pr_emerg("Transaction type: %s(%s), %s, Cache Level: %s, "
                         "Participating Processor: %s\n",
                          RRRR_MSG(ec), II_MSG(ec), TO_MSG(ec), LL_MSG(ec),
                          PP_MSG(ec));
diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c
index ee9753cf362c..f459a6c0886b 100644
--- a/drivers/edac/i5100_edac.c
+++ b/drivers/edac/i5100_edac.c
@@ -589,14 +589,13 @@ static void i5100_refresh_scrubbing(struct work_struct *work)
 /*
 * The bandwidth is based on experimentation, feel free to refine it.
 */
-static int i5100_set_scrub_rate(struct mem_ctl_info *mci,
+static int i5100_set_scrub_rate(struct mem_ctl_info *mci, u32 bandwidth)
-                                       u32 *bandwidth)
 {
        struct i5100_priv *priv = mci->pvt_info;
        u32 dw;
        pci_read_config_dword(priv->mc, I5100_MC, &dw);
-        if (*bandwidth) {
+        if (bandwidth) {
                priv->scrub_enable = 1;
                dw |= I5100_MC_SCRBEN_MASK;
                schedule_delayed_work(&(priv->i5100_scrubbing),
@@ -610,7 +609,7 @@ static int i5100_set_scrub_rate(struct mem_ctl_info *mci,
        pci_read_config_dword(priv->mc, I5100_MC, &dw);
-        *bandwidth = 5900000 * i5100_mc_scrben(dw);
+        bandwidth = 5900000 * i5100_mc_scrben(dw);
        return 0;
 }
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
index cc9357da0e34..e0187d16dd7c 100644
--- a/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
@@ -1300,7 +1300,7 @@ int i7core_get_onedevice(struct pci_dev **prev, int devno,
                if (devno == 0)
                        return -ENODEV;
-                i7core_printk(KERN_ERR,
+                i7core_printk(KERN_INFO,
                        "Device not found: dev %02x.%d PCI ID %04x:%04x\n",
                        dev_descr->dev, dev_descr->func,
                        PCI_VENDOR_ID_INTEL, dev_descr->dev_id);
diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
index 52ca09bf4726..1052340e6802 100644
--- a/drivers/edac/mpc85xx_edac.c
+++ b/drivers/edac/mpc85xx_edac.c
@@ -336,6 +336,7 @@ static struct of_device_id mpc85xx_pci_err_of_match[] = {
        },
        {},
 };
+MODULE_DEVICE_TABLE(of, mpc85xx_pci_err_of_match);
 static struct of_platform_driver mpc85xx_pci_err_driver = {
        .probe = mpc85xx_pci_err_probe,
@@ -650,6 +651,7 @@ static struct of_device_id mpc85xx_l2_err_of_match[] = {
        { .compatible = "fsl,p2020-l2-cache-controller", },
        {},
 };
+MODULE_DEVICE_TABLE(of, mpc85xx_l2_err_of_match);
 static struct of_platform_driver mpc85xx_l2_err_driver = {
        .probe = mpc85xx_l2_err_probe,
@@ -1120,11 +1122,13 @@ static struct of_device_id mpc85xx_mc_err_of_match[] = {
        { .compatible = "fsl,mpc8555-memory-controller", },
        { .compatible = "fsl,mpc8560-memory-controller", },
        { .compatible = "fsl,mpc8568-memory-controller", },
+        { .compatible = "fsl,mpc8569-memory-controller", },
        { .compatible = "fsl,mpc8572-memory-controller", },
        { .compatible = "fsl,mpc8349-memory-controller", },
        { .compatible = "fsl,p2020-memory-controller", },
        {},
 };
+MODULE_DEVICE_TABLE(of, mpc85xx_mc_err_of_match);
 static struct of_platform_driver mpc85xx_mc_err_driver = {
        .probe = mpc85xx_mc_err_probe,
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index 1b03ba1d0834..a6c670b8ce52 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -122,8 +122,17 @@ config ISCSI_IBFT_FIND
          is necessary for iSCSI Boot Firmware Table Attributes module to work
          properly.
+config ISCSI_BOOT_SYSFS
+        tristate "iSCSI Boot Sysfs Interface"
+        default n
+        help
+          This option enables support for exposing iSCSI boot information
+          via sysfs to userspace. If you wish to export this information,
+          say Y. Otherwise, say N.
 config ISCSI_IBFT
        tristate "iSCSI Boot Firmware Table Attributes module"
+        select ISCSI_BOOT_SYSFS
        depends on ISCSI_IBFT_FIND
        default n
        help
diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile
index 1c3c17343dbe..5fe7e1662922 100644
--- a/drivers/firmware/Makefile
+++ b/drivers/firmware/Makefile
@@ -10,4 +10,5 @@ obj-$(CONFIG_DCDBAS)		+= dcdbas.o
 obj-$(CONFIG_DMIID)             += dmi-id.o
 obj-$(CONFIG_ISCSI_IBFT_FIND)   += iscsi_ibft_find.o
 obj-$(CONFIG_ISCSI_IBFT)        += iscsi_ibft.o
+obj-$(CONFIG_ISCSI_BOOT_SYSFS)  += iscsi_boot_sysfs.o
 obj-$(CONFIG_FIRMWARE_MEMMAP)   += memmap.o
diff --git a/drivers/firmware/iscsi_boot_sysfs.c b/drivers/firmware/iscsi_boot_sysfs.c
new file mode 100644
index 000000000000..df6bff7366cf
--- /dev/null
+++ b/drivers/firmware/iscsi_boot_sysfs.c
@@ -0,0 +1,481 @@
+/*
+ * Export the iSCSI boot info to userland via sysfs.
+ *
+ * Copyright (C) 2010 Red Hat, Inc.  All rights reserved.
+ * Copyright (C) 2010 Mike Christie
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License v2.0 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/module.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/capability.h>
+#include <linux/iscsi_boot_sysfs.h>
+MODULE_AUTHOR("Mike Christie <michaelc@cs.wisc.edu>");
+MODULE_DESCRIPTION("sysfs interface and helpers to export iSCSI boot information");
+MODULE_LICENSE("GPL");
+/*
+ * The kobject and attribute structures.
+ */
+struct iscsi_boot_attr {
+        struct attribute attr;
+        int type;
+        ssize_t (*show) (void *data, int type, char *buf);
+};
+/*
+ * The routine called for all sysfs attributes.
+ */
+static ssize_t iscsi_boot_show_attribute(struct kobject *kobj,
+                                         struct attribute *attr, char *buf)
+{
+        struct iscsi_boot_kobj *boot_kobj =
+                        container_of(kobj, struct iscsi_boot_kobj, kobj);
+        struct iscsi_boot_attr *boot_attr =
+                        container_of(attr, struct iscsi_boot_attr, attr);
+        ssize_t ret = -EIO;
+        char *str = buf;
+        if (!capable(CAP_SYS_ADMIN))
+                return -EACCES;
+        if (boot_kobj->show)
+                ret = boot_kobj->show(boot_kobj->data, boot_attr->type, str);
+        return ret;
+}
+static const struct sysfs_ops iscsi_boot_attr_ops = {
+        .show = iscsi_boot_show_attribute,
+};
+static void iscsi_boot_kobj_release(struct kobject *kobj)
+{
+        struct iscsi_boot_kobj *boot_kobj =
+                        container_of(kobj, struct iscsi_boot_kobj, kobj);
+        kfree(boot_kobj->data);
+        kfree(boot_kobj);
+}
+static struct kobj_type iscsi_boot_ktype = {
+        .release = iscsi_boot_kobj_release,
+        .sysfs_ops = &iscsi_boot_attr_ops,
+};
+#define iscsi_boot_rd_attr(fnname, sysfs_name, attr_type)               \
+static struct iscsi_boot_attr iscsi_boot_attr_##fnname = {      \
+        .attr   = { .name = __stringify(sysfs_name), .mode = 0444 },    \
+        .type   = attr_type,                                            \
+}
+/* Target attrs */
+iscsi_boot_rd_attr(tgt_index, index, ISCSI_BOOT_TGT_INDEX);
+iscsi_boot_rd_attr(tgt_flags, flags, ISCSI_BOOT_TGT_FLAGS);
+iscsi_boot_rd_attr(tgt_ip, ip-addr, ISCSI_BOOT_TGT_IP_ADDR);
+iscsi_boot_rd_attr(tgt_port, port, ISCSI_BOOT_TGT_PORT);
+iscsi_boot_rd_attr(tgt_lun, lun, ISCSI_BOOT_TGT_LUN);
+iscsi_boot_rd_attr(tgt_chap, chap-type, ISCSI_BOOT_TGT_CHAP_TYPE);
+iscsi_boot_rd_attr(tgt_nic, nic-assoc, ISCSI_BOOT_TGT_NIC_ASSOC);
+iscsi_boot_rd_attr(tgt_name, target-name, ISCSI_BOOT_TGT_NAME);
+iscsi_boot_rd_attr(tgt_chap_name, chap-name, ISCSI_BOOT_TGT_CHAP_NAME);
+iscsi_boot_rd_attr(tgt_chap_secret, chap-secret, ISCSI_BOOT_TGT_CHAP_SECRET);
+iscsi_boot_rd_attr(tgt_chap_rev_name, rev-chap-name,
+                   ISCSI_BOOT_TGT_REV_CHAP_NAME);
+iscsi_boot_rd_attr(tgt_chap_rev_secret, rev-chap-name-secret,
+                   ISCSI_BOOT_TGT_REV_CHAP_SECRET);
+static struct attribute *target_attrs[] = {
+        &iscsi_boot_attr_tgt_index.attr,
+        &iscsi_boot_attr_tgt_flags.attr,
+        &iscsi_boot_attr_tgt_ip.attr,
+        &iscsi_boot_attr_tgt_port.attr,
+        &iscsi_boot_attr_tgt_lun.attr,
+        &iscsi_boot_attr_tgt_chap.attr,
+        &iscsi_boot_attr_tgt_nic.attr,
+        &iscsi_boot_attr_tgt_name.attr,
+        &iscsi_boot_attr_tgt_chap_name.attr,
+        &iscsi_boot_attr_tgt_chap_secret.attr,
+        &iscsi_boot_attr_tgt_chap_rev_name.attr,
+        &iscsi_boot_attr_tgt_chap_rev_secret.attr,
+        NULL
+};
+static mode_t iscsi_boot_tgt_attr_is_visible(struct kobject *kobj,
+                                             struct attribute *attr, int i)
+{
+        struct iscsi_boot_kobj *boot_kobj =
+                        container_of(kobj, struct iscsi_boot_kobj, kobj);
+        if (attr ==  &iscsi_boot_attr_tgt_index.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_TGT_INDEX);
+        else if (attr == &iscsi_boot_attr_tgt_flags.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_TGT_FLAGS);
+        else if (attr == &iscsi_boot_attr_tgt_ip.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                              ISCSI_BOOT_TGT_IP_ADDR);
+        else if (attr == &iscsi_boot_attr_tgt_port.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                              ISCSI_BOOT_TGT_PORT);
+        else if (attr == &iscsi_boot_attr_tgt_lun.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                              ISCSI_BOOT_TGT_LUN);
+        else if (attr == &iscsi_boot_attr_tgt_chap.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_TGT_CHAP_TYPE);
+        else if (attr == &iscsi_boot_attr_tgt_nic.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_TGT_NIC_ASSOC);
+        else if (attr == &iscsi_boot_attr_tgt_name.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_TGT_NAME);
+        else if (attr == &iscsi_boot_attr_tgt_chap_name.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_TGT_CHAP_NAME);
+        else if (attr == &iscsi_boot_attr_tgt_chap_secret.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_TGT_CHAP_SECRET);
+        else if (attr == &iscsi_boot_attr_tgt_chap_rev_name.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_TGT_REV_CHAP_NAME);
+        else if (attr == &iscsi_boot_attr_tgt_chap_rev_secret.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_TGT_REV_CHAP_SECRET);
+        return 0;
+}
+static struct attribute_group iscsi_boot_target_attr_group = {
+        .attrs = target_attrs,
+        .is_visible = iscsi_boot_tgt_attr_is_visible,
+};
+/* Ethernet attrs */
+iscsi_boot_rd_attr(eth_index, index, ISCSI_BOOT_ETH_INDEX);
+iscsi_boot_rd_attr(eth_flags, flags, ISCSI_BOOT_ETH_FLAGS);
+iscsi_boot_rd_attr(eth_ip, ip-addr, ISCSI_BOOT_ETH_IP_ADDR);
+iscsi_boot_rd_attr(eth_subnet, subnet-mask, ISCSI_BOOT_ETH_SUBNET_MASK);
+iscsi_boot_rd_attr(eth_origin, origin, ISCSI_BOOT_ETH_ORIGIN);
+iscsi_boot_rd_attr(eth_gateway, gateway, ISCSI_BOOT_ETH_GATEWAY);
+iscsi_boot_rd_attr(eth_primary_dns, primary-dns, ISCSI_BOOT_ETH_PRIMARY_DNS);
+iscsi_boot_rd_attr(eth_secondary_dns, secondary-dns,
+                   ISCSI_BOOT_ETH_SECONDARY_DNS);
+iscsi_boot_rd_attr(eth_dhcp, dhcp, ISCSI_BOOT_ETH_DHCP);
+iscsi_boot_rd_attr(eth_vlan, vlan, ISCSI_BOOT_ETH_VLAN);
+iscsi_boot_rd_attr(eth_mac, mac, ISCSI_BOOT_ETH_MAC);
+iscsi_boot_rd_attr(eth_hostname, hostname, ISCSI_BOOT_ETH_HOSTNAME);
+static struct attribute *ethernet_attrs[] = {
+        &iscsi_boot_attr_eth_index.attr,
+        &iscsi_boot_attr_eth_flags.attr,
+        &iscsi_boot_attr_eth_ip.attr,
+        &iscsi_boot_attr_eth_subnet.attr,
+        &iscsi_boot_attr_eth_origin.attr,
+        &iscsi_boot_attr_eth_gateway.attr,
+        &iscsi_boot_attr_eth_primary_dns.attr,
+        &iscsi_boot_attr_eth_secondary_dns.attr,
+        &iscsi_boot_attr_eth_dhcp.attr,
+        &iscsi_boot_attr_eth_vlan.attr,
+        &iscsi_boot_attr_eth_mac.attr,
+        &iscsi_boot_attr_eth_hostname.attr,
+        NULL
+};
+static mode_t iscsi_boot_eth_attr_is_visible(struct kobject *kobj,
+                                             struct attribute *attr, int i)
+{
+        struct iscsi_boot_kobj *boot_kobj =
+                        container_of(kobj, struct iscsi_boot_kobj, kobj);
+        if (attr ==  &iscsi_boot_attr_eth_index.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_ETH_INDEX);
+        else if (attr ==  &iscsi_boot_attr_eth_flags.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_ETH_FLAGS);
+        else if (attr ==  &iscsi_boot_attr_eth_ip.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_ETH_IP_ADDR);
+        else if (attr ==  &iscsi_boot_attr_eth_subnet.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_ETH_SUBNET_MASK);
+        else if (attr ==  &iscsi_boot_attr_eth_origin.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_ETH_ORIGIN);
+        else if (attr ==  &iscsi_boot_attr_eth_gateway.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_ETH_GATEWAY);
+        else if (attr ==  &iscsi_boot_attr_eth_primary_dns.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_ETH_PRIMARY_DNS);
+        else if (attr ==  &iscsi_boot_attr_eth_secondary_dns.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_ETH_SECONDARY_DNS);
+        else if (attr ==  &iscsi_boot_attr_eth_dhcp.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_ETH_DHCP);
+        else if (attr ==  &iscsi_boot_attr_eth_vlan.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_ETH_VLAN);
+        else if (attr ==  &iscsi_boot_attr_eth_mac.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_ETH_MAC);
+        else if (attr ==  &iscsi_boot_attr_eth_hostname.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_ETH_HOSTNAME);
+        return 0;
+}
+static struct attribute_group iscsi_boot_ethernet_attr_group = {
+        .attrs = ethernet_attrs,
+        .is_visible = iscsi_boot_eth_attr_is_visible,
+};
+/* Initiator attrs */
+iscsi_boot_rd_attr(ini_index, index, ISCSI_BOOT_INI_INDEX);
+iscsi_boot_rd_attr(ini_flags, flags, ISCSI_BOOT_INI_FLAGS);
+iscsi_boot_rd_attr(ini_isns, isns-server, ISCSI_BOOT_INI_ISNS_SERVER);
+iscsi_boot_rd_attr(ini_slp, slp-server, ISCSI_BOOT_INI_SLP_SERVER);
+iscsi_boot_rd_attr(ini_primary_radius, pri-radius-server,
+                   ISCSI_BOOT_INI_PRI_RADIUS_SERVER);
+iscsi_boot_rd_attr(ini_secondary_radius, sec-radius-server,
+                   ISCSI_BOOT_INI_SEC_RADIUS_SERVER);
+iscsi_boot_rd_attr(ini_name, initiator-name, ISCSI_BOOT_INI_INITIATOR_NAME);
+static struct attribute *initiator_attrs[] = {
+        &iscsi_boot_attr_ini_index.attr,
+        &iscsi_boot_attr_ini_flags.attr,
+        &iscsi_boot_attr_ini_isns.attr,
+        &iscsi_boot_attr_ini_slp.attr,
+        &iscsi_boot_attr_ini_primary_radius.attr,
+        &iscsi_boot_attr_ini_secondary_radius.attr,
+        &iscsi_boot_attr_ini_name.attr,
+        NULL
+};
+static mode_t iscsi_boot_ini_attr_is_visible(struct kobject *kobj,
+                                             struct attribute *attr, int i)
+{
+        struct iscsi_boot_kobj *boot_kobj =
+                        container_of(kobj, struct iscsi_boot_kobj, kobj);
+        if (attr ==  &iscsi_boot_attr_ini_index.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_INI_INDEX);
+        if (attr ==  &iscsi_boot_attr_ini_flags.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_INI_FLAGS);
+        if (attr ==  &iscsi_boot_attr_ini_isns.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_INI_ISNS_SERVER);
+        if (attr ==  &iscsi_boot_attr_ini_slp.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_INI_SLP_SERVER);
+        if (attr ==  &iscsi_boot_attr_ini_primary_radius.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_INI_PRI_RADIUS_SERVER);
+        if (attr ==  &iscsi_boot_attr_ini_secondary_radius.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_INI_SEC_RADIUS_SERVER);
+        if (attr ==  &iscsi_boot_attr_ini_name.attr)
+                return boot_kobj->is_visible(boot_kobj->data,
+                                             ISCSI_BOOT_INI_INITIATOR_NAME);
+        return 0;
+}
+static struct attribute_group iscsi_boot_initiator_attr_group = {
+        .attrs = initiator_attrs,
+        .is_visible = iscsi_boot_ini_attr_is_visible,
+};
+static struct iscsi_boot_kobj *
+iscsi_boot_create_kobj(struct iscsi_boot_kset *boot_kset,
+                       struct attribute_group *attr_group,
+                       const char *name, int index, void *data,
+                       ssize_t (*show) (void *data, int type, char *buf),
+                       mode_t (*is_visible) (void *data, int type))
+{
+        struct iscsi_boot_kobj *boot_kobj;
+        boot_kobj = kzalloc(sizeof(*boot_kobj), GFP_KERNEL);
+        if (!boot_kobj)
+                return NULL;
+        INIT_LIST_HEAD(&boot_kobj->list);
+        boot_kobj->kobj.kset = boot_kset->kset;
+        if (kobject_init_and_add(&boot_kobj->kobj, &iscsi_boot_ktype,
+                                 NULL, name, index)) {
+                kfree(boot_kobj);
+                return NULL;
+        }
+        boot_kobj->data = data;
+        boot_kobj->show = show;
+        boot_kobj->is_visible = is_visible;
+        if (sysfs_create_group(&boot_kobj->kobj, attr_group)) {
+                /*
+                 * We do not want to free this because the caller
+                 * will assume that since the creation call failed
+                 * the boot kobj was not setup and the normal release
+                 * path is not being run.
+                 */
+                boot_kobj->data = NULL;
+                kobject_put(&boot_kobj->kobj);
+                return NULL;
+        }
+        boot_kobj->attr_group = attr_group;
+        kobject_uevent(&boot_kobj->kobj, KOBJ_ADD);
+        /* Nothing broke so lets add it to the list. */
+        list_add_tail(&boot_kobj->list, &boot_kset->kobj_list);
+        return boot_kobj;
+}
+static void iscsi_boot_remove_kobj(struct iscsi_boot_kobj *boot_kobj)
+{
+        list_del(&boot_kobj->list);
+        sysfs_remove_group(&boot_kobj->kobj, boot_kobj->attr_group);
+        kobject_put(&boot_kobj->kobj);
+}
+/**
+ * iscsi_boot_create_target() - create boot target sysfs dir
+ * @boot_kset: boot kset
+ * @index: the target id
+ * @data: driver specific data for target
+ * @show: attr show function
+ * @is_visible: attr visibility function
+ *
+ * Note: The boot sysfs lib will free the data passed in for the caller
+ * when all refs to the target kobject have been released.
+ */
+struct iscsi_boot_kobj *
+iscsi_boot_create_target(struct iscsi_boot_kset *boot_kset, int index,
+                         void *data,
+                         ssize_t (*show) (void *data, int type, char *buf),
+                         mode_t (*is_visible) (void *data, int type))
+{
+        return iscsi_boot_create_kobj(boot_kset, &iscsi_boot_target_attr_group,
+                                      "target%d", index, data, show, is_visible);
+}
+EXPORT_SYMBOL_GPL(iscsi_boot_create_target);
+/**
+ * iscsi_boot_create_initiator() - create boot initiator sysfs dir
+ * @boot_kset: boot kset
+ * @index: the initiator id
+ * @data: driver specific data
+ * @show: attr show function
+ * @is_visible: attr visibility function
+ *
+ * Note: The boot sysfs lib will free the data passed in for the caller
+ * when all refs to the initiator kobject have been released.
+ */
+struct iscsi_boot_kobj *
+iscsi_boot_create_initiator(struct iscsi_boot_kset *boot_kset, int index,
+                            void *data,
+                            ssize_t (*show) (void *data, int type, char *buf),
+                            mode_t (*is_visible) (void *data, int type))
+{
+        return iscsi_boot_create_kobj(boot_kset,
+                                      &iscsi_boot_initiator_attr_group,
+                                      "initiator", index, data, show,
+                                      is_visible);
+}
+EXPORT_SYMBOL_GPL(iscsi_boot_create_initiator);
+/**
+ * iscsi_boot_create_ethernet() - create boot ethernet sysfs dir
+ * @boot_kset: boot kset
+ * @index: the ethernet device id
+ * @data: driver specific data
+ * @show: attr show function
+ * @is_visible: attr visibility function
+ *
+ * Note: The boot sysfs lib will free the data passed in for the caller
+ * when all refs to the ethernet kobject have been released.
+ */
+struct iscsi_boot_kobj *
+iscsi_boot_create_ethernet(struct iscsi_boot_kset *boot_kset, int index,
+                           void *data,
+                           ssize_t (*show) (void *data, int type, char *buf),
+                           mode_t (*is_visible) (void *data, int type))
+{
+        return iscsi_boot_create_kobj(boot_kset,
+                                      &iscsi_boot_ethernet_attr_group,
+                                      "ethernet%d", index, data, show,
+                                      is_visible);
+}
+EXPORT_SYMBOL_GPL(iscsi_boot_create_ethernet);
+/**
+ * iscsi_boot_create_kset() - creates root sysfs tree
+ * @set_name: name of root dir
+ */
+struct iscsi_boot_kset *iscsi_boot_create_kset(const char *set_name)
+{
+        struct iscsi_boot_kset *boot_kset;
+        boot_kset = kzalloc(sizeof(*boot_kset), GFP_KERNEL);
+        if (!boot_kset)
+                return NULL;
+        boot_kset->kset = kset_create_and_add(set_name, NULL, firmware_kobj);
+        if (!boot_kset->kset) {
+                kfree(boot_kset);
+                return NULL;
+        }
+        INIT_LIST_HEAD(&boot_kset->kobj_list);
+        return boot_kset;
+}
+EXPORT_SYMBOL_GPL(iscsi_boot_create_kset);
+/**
+ * iscsi_boot_create_host_kset() - creates root sysfs tree for a scsi host
+ * @hostno: host number of scsi host
+ */
+struct iscsi_boot_kset *iscsi_boot_create_host_kset(unsigned int hostno)
+{
+        struct iscsi_boot_kset *boot_kset;
+        char *set_name;
+        set_name = kasprintf(GFP_KERNEL, "iscsi_boot%u", hostno);
+        if (!set_name)
+                return NULL;
+        boot_kset = iscsi_boot_create_kset(set_name);
+        kfree(set_name);
+        return boot_kset;
+}
+EXPORT_SYMBOL_GPL(iscsi_boot_create_host_kset);
+/**
+ * iscsi_boot_destroy_kset() - destroy kset and kobjects under it
+ * @boot_kset: boot kset
+ *
+ * This will remove the kset and kobjects and attrs under it.
+ */
+void iscsi_boot_destroy_kset(struct iscsi_boot_kset *boot_kset)
+{
+        struct iscsi_boot_kobj *boot_kobj, *tmp_kobj;
+        list_for_each_entry_safe(boot_kobj, tmp_kobj,
+                                 &boot_kset->kobj_list, list)
+                iscsi_boot_remove_kobj(boot_kobj);
+        kset_unregister(boot_kset->kset);
+}
+EXPORT_SYMBOL_GPL(iscsi_boot_destroy_kset);
diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
index ed2801c378de..4f04ec0410a0 100644
--- a/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2007 Red Hat, Inc.
+ *  Copyright 2007-2010 Red Hat, Inc.
 *  by Peter Jones <pjones@redhat.com>
 *  Copyright 2008 IBM, Inc.
 *  by Konrad Rzeszutek <konradr@linux.vnet.ibm.com>
@@ -19,6 +19,9 @@
 *
 * Changelog:
 *
+ *  06 Jan 2010 - Peter Jones <pjones@redhat.com>
+ *    New changelog entries are in the git log from now on.  Not here.
+ *
 *  14 Mar 2008 - Konrad Rzeszutek <ketuzsezr@darnok.org>
 *    Updated comments and copyrights. (v0.4.9)
 *
@@ -78,9 +81,11 @@
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/types.h>
+#include <linux/acpi.h>
+#include <linux/iscsi_boot_sysfs.h>
-#define IBFT_ISCSI_VERSION "0.4.9"
+#define IBFT_ISCSI_VERSION "0.5.0"
-#define IBFT_ISCSI_DATE "2008-Mar-14"
+#define IBFT_ISCSI_DATE "2010-Feb-25"
 MODULE_AUTHOR("Peter Jones <pjones@redhat.com> and \
 Konrad Rzeszutek <ketuzsezr@darnok.org>");
@@ -166,108 +171,20 @@ enum ibft_id {
 };
 /*
- * We do not support the other types, hence the usage of NULL.
- * This maps to the enum ibft_id.
- */
-static const char *ibft_id_names[] =
-        {NULL, NULL, "initiator", "ethernet%d", "target%d", NULL, NULL};
-/*
- * The text attributes names for each of the kobjects.
-*/
-enum ibft_eth_properties_enum {
-        ibft_eth_index,
-        ibft_eth_flags,
-        ibft_eth_ip_addr,
-        ibft_eth_subnet_mask,
-        ibft_eth_origin,
-        ibft_eth_gateway,
-        ibft_eth_primary_dns,
-        ibft_eth_secondary_dns,
-        ibft_eth_dhcp,
-        ibft_eth_vlan,
-        ibft_eth_mac,
-        /* ibft_eth_pci_bdf - this is replaced by link to the device itself. */
-        ibft_eth_hostname,
-        ibft_eth_end_marker,
-};
-static const char *ibft_eth_properties[] =
-        {"index", "flags", "ip-addr", "subnet-mask", "origin", "gateway",
-        "primary-dns", "secondary-dns", "dhcp", "vlan", "mac", "hostname",
-        NULL};
-enum ibft_tgt_properties_enum {
-        ibft_tgt_index,
-        ibft_tgt_flags,
-        ibft_tgt_ip_addr,
-        ibft_tgt_port,
-        ibft_tgt_lun,
-        ibft_tgt_chap_type,
-        ibft_tgt_nic_assoc,
-        ibft_tgt_name,
-        ibft_tgt_chap_name,
-        ibft_tgt_chap_secret,
-        ibft_tgt_rev_chap_name,
-        ibft_tgt_rev_chap_secret,
-        ibft_tgt_end_marker,
-};
-static const char *ibft_tgt_properties[] =
-        {"index", "flags", "ip-addr", "port", "lun", "chap-type", "nic-assoc",
-        "target-name", "chap-name", "chap-secret", "rev-chap-name",
-        "rev-chap-name-secret", NULL};
-enum ibft_initiator_properties_enum {
-        ibft_init_index,
-        ibft_init_flags,
-        ibft_init_isns_server,
-        ibft_init_slp_server,
-        ibft_init_pri_radius_server,
-        ibft_init_sec_radius_server,
-        ibft_init_initiator_name,
-        ibft_init_end_marker,
-};
-static const char *ibft_initiator_properties[] =
-        {"index", "flags", "isns-server", "slp-server", "pri-radius-server",
-        "sec-radius-server", "initiator-name", NULL};
-/*
 * The kobject and attribute structures.
 */
 struct ibft_kobject {
-        struct ibft_table_header *header;
+        struct acpi_table_ibft *header;
        union {
                struct ibft_initiator *initiator;
                struct ibft_nic *nic;
                struct ibft_tgt *tgt;
                struct ibft_hdr *hdr;
        };
-        struct kobject kobj;
-        struct list_head node;
 };
-struct ibft_attribute {
+static struct iscsi_boot_kset *boot_kset;
-        struct attribute attr;
-        ssize_t (*show) (struct  ibft_kobject *entry,
-                         struct ibft_attribute *attr, char *buf);
-        union {
-                struct ibft_initiator *initiator;
-                struct ibft_nic *nic;
-                struct ibft_tgt *tgt;
-                struct ibft_hdr *hdr;
-        };
-        struct kobject *kobj;
-        int type; /* The enum of the type. This can be any value of:
-                ibft_eth_properties_enum, ibft_tgt_properties_enum,
-                or ibft_initiator_properties_enum. */
-        struct list_head node;
-};
-static LIST_HEAD(ibft_attr_list);
-static LIST_HEAD(ibft_kobject_list);
 static const char nulls[16];
@@ -306,35 +223,27 @@ static ssize_t sprintf_string(char *str, int len, char *buf)
 static int ibft_verify_hdr(char *t, struct ibft_hdr *hdr, int id, int length)
 {
        if (hdr->id != id) {
-                printk(KERN_ERR "iBFT error: We expected the " \
+                printk(KERN_ERR "iBFT error: We expected the %s " \
                                "field header.id to have %d but " \
-                                "found %d instead!\n", id, hdr->id);
+                                "found %d instead!\n", t, id, hdr->id);
                return -ENODEV;
        }
        if (hdr->length != length) {
-                printk(KERN_ERR "iBFT error: We expected the " \
+                printk(KERN_ERR "iBFT error: We expected the %s " \
                                "field header.length to have %d but " \
-                                "found %d instead!\n", length, hdr->length);
+                                "found %d instead!\n", t, length, hdr->length);
                return -ENODEV;
        }
        return 0;
 }
-static void ibft_release(struct kobject *kobj)
-{
-        struct ibft_kobject *ibft =
-                container_of(kobj, struct ibft_kobject, kobj);
-        kfree(ibft);
-}
 /*
 *  Routines for parsing the iBFT data to be human readable.
 */
-static ssize_t ibft_attr_show_initiator(struct ibft_kobject *entry,
+static ssize_t ibft_attr_show_initiator(void *data, int type, char *buf)
-                                        struct ibft_attribute *attr,
-                                        char *buf)
 {
+        struct ibft_kobject *entry = data;
        struct ibft_initiator *initiator = entry->initiator;
        void *ibft_loc = entry->header;
        char *str = buf;
@@ -342,26 +251,26 @@ static ssize_t ibft_attr_show_initiator(struct ibft_kobject *entry,
        if (!initiator)
                return 0;
-        switch (attr->type) {
+        switch (type) {
-        case ibft_init_index:
+        case ISCSI_BOOT_INI_INDEX:
                str += sprintf(str, "%d\n", initiator->hdr.index);
                break;
-        case ibft_init_flags:
+        case ISCSI_BOOT_INI_FLAGS:
                str += sprintf(str, "%d\n", initiator->hdr.flags);
                break;
-        case ibft_init_isns_server:
+        case ISCSI_BOOT_INI_ISNS_SERVER:
                str += sprintf_ipaddr(str, initiator->isns_server);
                break;
-        case ibft_init_slp_server:
+        case ISCSI_BOOT_INI_SLP_SERVER:
                str += sprintf_ipaddr(str, initiator->slp_server);
                break;
-        case ibft_init_pri_radius_server:
+        case ISCSI_BOOT_INI_PRI_RADIUS_SERVER:
                str += sprintf_ipaddr(str, initiator->pri_radius_server);
                break;
-        case ibft_init_sec_radius_server:
+        case ISCSI_BOOT_INI_SEC_RADIUS_SERVER:
                str += sprintf_ipaddr(str, initiator->sec_radius_server);
                break;
-        case ibft_init_initiator_name:
+        case ISCSI_BOOT_INI_INITIATOR_NAME:
                str += sprintf_string(str, initiator->initiator_name_len,
                                      (char *)ibft_loc +
                                      initiator->initiator_name_off);
@@ -373,10 +282,9 @@ static ssize_t ibft_attr_show_initiator(struct ibft_kobject *entry,
        return str - buf;
 }
-static ssize_t ibft_attr_show_nic(struct ibft_kobject *entry,
+static ssize_t ibft_attr_show_nic(void *data, int type, char *buf)
-                                  struct ibft_attribute *attr,
-                                  char *buf)
 {
+        struct ibft_kobject *entry = data;
        struct ibft_nic *nic = entry->nic;
        void *ibft_loc = entry->header;
        char *str = buf;
@@ -385,42 +293,42 @@ static ssize_t ibft_attr_show_nic(struct ibft_kobject *entry,
        if (!nic)
                return 0;
-        switch (attr->type) {
+        switch (type) {
-        case ibft_eth_index:
+        case ISCSI_BOOT_ETH_INDEX:
                str += sprintf(str, "%d\n", nic->hdr.index);
                break;
-        case ibft_eth_flags:
+        case ISCSI_BOOT_ETH_FLAGS:
                str += sprintf(str, "%d\n", nic->hdr.flags);
                break;
-        case ibft_eth_ip_addr:
+        case ISCSI_BOOT_ETH_IP_ADDR:
                str += sprintf_ipaddr(str, nic->ip_addr);
                break;
-        case ibft_eth_subnet_mask:
+        case ISCSI_BOOT_ETH_SUBNET_MASK:
                val = cpu_to_be32(~((1 << (32-nic->subnet_mask_prefix))-1));
                str += sprintf(str, "%pI4", &val);
                break;
-        case ibft_eth_origin:
+        case ISCSI_BOOT_ETH_ORIGIN:
                str += sprintf(str, "%d\n", nic->origin);
                break;
-        case ibft_eth_gateway:
+        case ISCSI_BOOT_ETH_GATEWAY:
                str += sprintf_ipaddr(str, nic->gateway);
                break;
-        case ibft_eth_primary_dns:
+        case ISCSI_BOOT_ETH_PRIMARY_DNS:
                str += sprintf_ipaddr(str, nic->primary_dns);
                break;
-        case ibft_eth_secondary_dns:
+        case ISCSI_BOOT_ETH_SECONDARY_DNS:
                str += sprintf_ipaddr(str, nic->secondary_dns);
                break;
-        case ibft_eth_dhcp:
+        case ISCSI_BOOT_ETH_DHCP:
                str += sprintf_ipaddr(str, nic->dhcp);
                break;
-        case ibft_eth_vlan:
+        case ISCSI_BOOT_ETH_VLAN:
                str += sprintf(str, "%d\n", nic->vlan);
                break;
-        case ibft_eth_mac:
+        case ISCSI_BOOT_ETH_MAC:
                str += sprintf(str, "%pM\n", nic->mac);
                break;
-        case ibft_eth_hostname:
+        case ISCSI_BOOT_ETH_HOSTNAME:
                str += sprintf_string(str, nic->hostname_len,
                                      (char *)ibft_loc + nic->hostname_off);
                break;
@@ -431,10 +339,9 @@ static ssize_t ibft_attr_show_nic(struct ibft_kobject *entry,
        return str - buf;
 };
-static ssize_t ibft_attr_show_target(struct ibft_kobject *entry,
+static ssize_t ibft_attr_show_target(void *data, int type, char *buf)
-                                     struct ibft_attribute *attr,
-                                     char *buf)
 {
+        struct ibft_kobject *entry = data;
        struct ibft_tgt *tgt = entry->tgt;
        void *ibft_loc = entry->header;
        char *str = buf;
@@ -443,48 +350,48 @@ static ssize_t ibft_attr_show_target(struct ibft_kobject *entry,
        if (!tgt)
                return 0;
-        switch (attr->type) {
+        switch (type) {
-        case ibft_tgt_index:
+        case ISCSI_BOOT_TGT_INDEX:
                str += sprintf(str, "%d\n", tgt->hdr.index);
                break;
-        case ibft_tgt_flags:
+        case ISCSI_BOOT_TGT_FLAGS:
                str += sprintf(str, "%d\n", tgt->hdr.flags);
                break;
-        case ibft_tgt_ip_addr:
+        case ISCSI_BOOT_TGT_IP_ADDR:
                str += sprintf_ipaddr(str, tgt->ip_addr);
                break;
-        case ibft_tgt_port:
+        case ISCSI_BOOT_TGT_PORT:
                str += sprintf(str, "%d\n", tgt->port);
                break;
-        case ibft_tgt_lun:
+        case ISCSI_BOOT_TGT_LUN:
                for (i = 0; i < 8; i++)
                        str += sprintf(str, "%x", (u8)tgt->lun[i]);
                str += sprintf(str, "\n");
                break;
-        case ibft_tgt_nic_assoc:
+        case ISCSI_BOOT_TGT_NIC_ASSOC:
                str += sprintf(str, "%d\n", tgt->nic_assoc);
                break;
-        case ibft_tgt_chap_type:
+        case ISCSI_BOOT_TGT_CHAP_TYPE:
                str += sprintf(str, "%d\n", tgt->chap_type);
                break;
-        case ibft_tgt_name:
+        case ISCSI_BOOT_TGT_NAME:
                str += sprintf_string(str, tgt->tgt_name_len,
                                      (char *)ibft_loc + tgt->tgt_name_off);
                break;
-        case ibft_tgt_chap_name:
+        case ISCSI_BOOT_TGT_CHAP_NAME:
                str += sprintf_string(str, tgt->chap_name_len,
                                      (char *)ibft_loc + tgt->chap_name_off);
                break;
-        case ibft_tgt_chap_secret:
+        case ISCSI_BOOT_TGT_CHAP_SECRET:
                str += sprintf_string(str, tgt->chap_secret_len,
                                      (char *)ibft_loc + tgt->chap_secret_off);
                break;
-        case ibft_tgt_rev_chap_name:
+        case ISCSI_BOOT_TGT_REV_CHAP_NAME:
                str += sprintf_string(str, tgt->rev_chap_name_len,
                                      (char *)ibft_loc +
                                      tgt->rev_chap_name_off);
                break;
-        case ibft_tgt_rev_chap_secret:
+        case ISCSI_BOOT_TGT_REV_CHAP_SECRET:
                str += sprintf_string(str, tgt->rev_chap_secret_len,
                                      (char *)ibft_loc +
                                      tgt->rev_chap_secret_off);
@@ -496,52 +403,19 @@ static ssize_t ibft_attr_show_target(struct ibft_kobject *entry,
        return str - buf;
 }
-/*
- * The routine called for all sysfs attributes.
- */
-static ssize_t ibft_show_attribute(struct kobject *kobj,
-                                    struct attribute *attr,
-                                    char *buf)
-{
-        struct ibft_kobject *dev =
-                container_of(kobj, struct ibft_kobject, kobj);
-        struct ibft_attribute *ibft_attr =
-                container_of(attr, struct ibft_attribute, attr);
-        ssize_t ret = -EIO;
-        char *str = buf;
-        if (!capable(CAP_SYS_ADMIN))
-                return -EACCES;
-        if (ibft_attr->show)
-                ret = ibft_attr->show(dev, ibft_attr, str);
-        return ret;
-}
-static const struct sysfs_ops ibft_attr_ops = {
-        .show = ibft_show_attribute,
-};
-static struct kobj_type ibft_ktype = {
-        .release = ibft_release,
-        .sysfs_ops = &ibft_attr_ops,
-};
-static struct kset *ibft_kset;
 static int __init ibft_check_device(void)
 {
        int len;
        u8 *pos;
        u8 csum = 0;
-        len = ibft_addr->length;
+        len = ibft_addr->header.length;
        /* Sanity checking of iBFT. */
-        if (ibft_addr->revision != 1) {
+        if (ibft_addr->header.revision != 1) {
                printk(KERN_ERR "iBFT module supports only revision 1, " \
-                                "while this is %d.\n", ibft_addr->revision);
+                                "while this is %d.\n",
+                                ibft_addr->header.revision);
                return -ENOENT;
        }
        for (pos = (u8 *)ibft_addr; pos < (u8 *)ibft_addr + len; pos++)
@@ -556,12 +430,149 @@ static int __init ibft_check_device(void)
 }
 /*
+ * Helper routiners to check to determine if the entry is valid
+ * in the proper iBFT structure.
+ */
+static mode_t ibft_check_nic_for(void *data, int type)
+{
+        struct ibft_kobject *entry = data;
+        struct ibft_nic *nic = entry->nic;
+        mode_t rc = 0;
+        switch (type) {
+        case ISCSI_BOOT_ETH_INDEX:
+        case ISCSI_BOOT_ETH_FLAGS:
+                rc = S_IRUGO;
+                break;
+        case ISCSI_BOOT_ETH_IP_ADDR:
+                if (memcmp(nic->ip_addr, nulls, sizeof(nic->ip_addr)))
+                        rc = S_IRUGO;
+                break;
+        case ISCSI_BOOT_ETH_SUBNET_MASK:
+                if (nic->subnet_mask_prefix)
+                        rc = S_IRUGO;
+                break;
+        case ISCSI_BOOT_ETH_ORIGIN:
+                rc = S_IRUGO;
+                break;
+        case ISCSI_BOOT_ETH_GATEWAY:
+                if (memcmp(nic->gateway, nulls, sizeof(nic->gateway)))
+                        rc = S_IRUGO;
+                break;
+        case ISCSI_BOOT_ETH_PRIMARY_DNS:
+                if (memcmp(nic->primary_dns, nulls,
+                           sizeof(nic->primary_dns)))
+                        rc = S_IRUGO;
+                break;
+        case ISCSI_BOOT_ETH_SECONDARY_DNS:
+                if (memcmp(nic->secondary_dns, nulls,
+                           sizeof(nic->secondary_dns)))
+                        rc = S_IRUGO;
+                break;
+        case ISCSI_BOOT_ETH_DHCP:
+                if (memcmp(nic->dhcp, nulls, sizeof(nic->dhcp)))
+                        rc = S_IRUGO;
+                break;
+        case ISCSI_BOOT_ETH_VLAN:
+        case ISCSI_BOOT_ETH_MAC:
+                rc = S_IRUGO;
+                break;
+        case ISCSI_BOOT_ETH_HOSTNAME:
+                if (nic->hostname_off)
+                        rc = S_IRUGO;
+                break;
+        default:
+                break;
+        }
+        return rc;
+}
+static mode_t __init ibft_check_tgt_for(void *data, int type)
+{
+        struct ibft_kobject *entry = data;
+        struct ibft_tgt *tgt = entry->tgt;
+        mode_t rc = 0;
+        switch (type) {
+        case ISCSI_BOOT_TGT_INDEX:
+        case ISCSI_BOOT_TGT_FLAGS:
+        case ISCSI_BOOT_TGT_IP_ADDR:
+        case ISCSI_BOOT_TGT_PORT:
+        case ISCSI_BOOT_TGT_LUN:
+        case ISCSI_BOOT_TGT_NIC_ASSOC:
+        case ISCSI_BOOT_TGT_CHAP_TYPE:
+                rc = S_IRUGO;
+        case ISCSI_BOOT_TGT_NAME:
+                if (tgt->tgt_name_len)
+                        rc = S_IRUGO;
+                break;
+        case ISCSI_BOOT_TGT_CHAP_NAME:
+        case ISCSI_BOOT_TGT_CHAP_SECRET:
+                if (tgt->chap_name_len)
+                        rc = S_IRUGO;
+                break;
+        case ISCSI_BOOT_TGT_REV_CHAP_NAME:
+        case ISCSI_BOOT_TGT_REV_CHAP_SECRET:
+                if (tgt->rev_chap_name_len)
+                        rc = S_IRUGO;
+                break;
+        default:
+                break;
+        }
+        return rc;
+}
+static mode_t __init ibft_check_initiator_for(void *data, int type)
+{
+        struct ibft_kobject *entry = data;
+        struct ibft_initiator *init = entry->initiator;
+        mode_t rc = 0;
+        switch (type) {
+        case ISCSI_BOOT_INI_INDEX:
+        case ISCSI_BOOT_INI_FLAGS:
+                rc = S_IRUGO;
+                break;
+        case ISCSI_BOOT_INI_ISNS_SERVER:
+                if (memcmp(init->isns_server, nulls,
+                           sizeof(init->isns_server)))
+                        rc = S_IRUGO;
+                break;
+        case ISCSI_BOOT_INI_SLP_SERVER:
+                if (memcmp(init->slp_server, nulls,
+                           sizeof(init->slp_server)))
+                        rc = S_IRUGO;
+                break;
+        case ISCSI_BOOT_INI_PRI_RADIUS_SERVER:
+                if (memcmp(init->pri_radius_server, nulls,
+                           sizeof(init->pri_radius_server)))
+                        rc = S_IRUGO;
+                break;
+        case ISCSI_BOOT_INI_SEC_RADIUS_SERVER:
+                if (memcmp(init->sec_radius_server, nulls,
+                           sizeof(init->sec_radius_server)))
+                        rc = S_IRUGO;
+                break;
+        case ISCSI_BOOT_INI_INITIATOR_NAME:
+                if (init->initiator_name_len)
+                        rc = S_IRUGO;
+                break;
+        default:
+                break;
+        }
+        return rc;
+}
+/*
 * Helper function for ibft_register_kobjects.
 */
-static int __init ibft_create_kobject(struct ibft_table_header *header,
+static int __init ibft_create_kobject(struct acpi_table_ibft *header,
-                                       struct ibft_hdr *hdr,
+                                      struct ibft_hdr *hdr)
-                                       struct list_head *list)
 {
+        struct iscsi_boot_kobj *boot_kobj = NULL;
        struct ibft_kobject *ibft_kobj = NULL;
        struct ibft_nic *nic = (struct ibft_nic *)hdr;
        struct pci_dev *pci_dev;
@@ -578,14 +589,47 @@ static int __init ibft_create_kobject(struct ibft_table_header *header,
        case id_initiator:
                rc = ibft_verify_hdr("initiator", hdr, id_initiator,
                                     sizeof(*ibft_kobj->initiator));
+                if (rc)
+                        break;
+                boot_kobj = iscsi_boot_create_initiator(boot_kset, hdr->index,
+                                                ibft_kobj,
+                                                ibft_attr_show_initiator,
+                                                ibft_check_initiator_for);
+                if (!boot_kobj) {
+                        rc = -ENOMEM;
+                        goto free_ibft_obj;
+                }
                break;
        case id_nic:
                rc = ibft_verify_hdr("ethernet", hdr, id_nic,
                                     sizeof(*ibft_kobj->nic));
+                if (rc)
+                        break;
+                boot_kobj = iscsi_boot_create_ethernet(boot_kset, hdr->index,
+                                                       ibft_kobj,
+                                                       ibft_attr_show_nic,
+                                                       ibft_check_nic_for);
+                if (!boot_kobj) {
+                        rc = -ENOMEM;
+                        goto free_ibft_obj;
+                }
                break;
        case id_target:
                rc = ibft_verify_hdr("target", hdr, id_target,
                                     sizeof(*ibft_kobj->tgt));
+                if (rc)
+                        break;
+                boot_kobj = iscsi_boot_create_target(boot_kset, hdr->index,
+                                                     ibft_kobj,
+                                                     ibft_attr_show_target,
+                                                     ibft_check_tgt_for);
+                if (!boot_kobj) {
+                        rc = -ENOMEM;
+                        goto free_ibft_obj;
+                }
                break;
        case id_reserved:
        case id_control:
@@ -596,29 +640,17 @@ static int __init ibft_create_kobject(struct ibft_table_header *header,
        default:
                printk(KERN_ERR "iBFT has unknown structure type (%d). " \
                                "Report this bug to %.6s!\n", hdr->id,
-                                header->oem_id);
+                                header->header.oem_id);
                rc = 1;
                break;
        }
        if (rc) {
                /* Skip adding this kobject, but exit with non-fatal error. */
-                kfree(ibft_kobj);
+                rc = 0;
-                goto out_invalid_struct;
+                goto free_ibft_obj;
        }
-        ibft_kobj->kobj.kset = ibft_kset;
-        rc = kobject_init_and_add(&ibft_kobj->kobj, &ibft_ktype,
-                                  NULL, ibft_id_names[hdr->id], hdr->index);
-        if (rc) {
-                kfree(ibft_kobj);
-                goto out;
-        }
-        kobject_uevent(&ibft_kobj->kobj, KOBJ_ADD);
        if (hdr->id == id_nic) {
                /*
                * We don't search for the device in other domains than
@@ -629,19 +661,16 @@ static int __init ibft_create_kobject(struct ibft_table_header *header,
                pci_dev = pci_get_bus_and_slot((nic->pci_bdf & 0xff00) >> 8,
                                               (nic->pci_bdf & 0xff));
                if (pci_dev) {
-                        rc = sysfs_create_link(&ibft_kobj->kobj,
+                        rc = sysfs_create_link(&boot_kobj->kobj,
                                               &pci_dev->dev.kobj, "device");
                        pci_dev_put(pci_dev);
                }
        }
+        return 0;
-        /* Nothing broke so lets add it to the list. */
+free_ibft_obj:
-        list_add_tail(&ibft_kobj->node, list);
+        kfree(ibft_kobj);
-out:
        return rc;
-out_invalid_struct:
-        /* Unsupported structs are skipped. */
-        return 0;
 }
 /*
@@ -649,8 +678,7 @@ out_invalid_struct:
 * found add them on the passed-in list. We do not support the other
 * fields at this point, so they are skipped.
 */
-static int __init ibft_register_kobjects(struct ibft_table_header *header,
+static int __init ibft_register_kobjects(struct acpi_table_ibft *header)
-                                          struct list_head *list)
 {
        struct ibft_control *control = NULL;
        void *ptr, *end;
@@ -660,7 +688,7 @@ static int __init ibft_register_kobjects(struct ibft_table_header *header,
        control = (void *)header + sizeof(*header);
        end = (void *)control + control->hdr.length;
-        eot_offset = (void *)header + header->length - (void *)control;
+        eot_offset = (void *)header + header->header.length - (void *)control;
        rc = ibft_verify_hdr("control", (struct ibft_hdr *)control, id_control,
                             sizeof(*control));
@@ -672,10 +700,10 @@ static int __init ibft_register_kobjects(struct ibft_table_header *header,
        }
        for (ptr = &control->initiator_off; ptr < end; ptr += sizeof(u16)) {
                offset = *(u16 *)ptr;
-                if (offset && offset < header->length && offset < eot_offset) {
+                if (offset && offset < header->header.length &&
+                                                offset < eot_offset) {
                        rc = ibft_create_kobject(header,
-                                                 (void *)header + offset,
+                                                 (void *)header + offset);
-                                                 list);
                        if (rc)
                                break;
                }
@@ -684,240 +712,28 @@ static int __init ibft_register_kobjects(struct ibft_table_header *header,
        return rc;
 }
-static void ibft_unregister(struct list_head *attr_list,
+static void ibft_unregister(void)
-                             struct list_head *kobj_list)
 {
-        struct ibft_kobject *data = NULL, *n;
+        struct iscsi_boot_kobj *boot_kobj, *tmp_kobj;
-        struct ibft_attribute *attr = NULL, *m;
+        struct ibft_kobject *ibft_kobj;
-        list_for_each_entry_safe(attr, m, attr_list, node) {
+        list_for_each_entry_safe(boot_kobj, tmp_kobj,
-                sysfs_remove_file(attr->kobj, &attr->attr);
+                                 &boot_kset->kobj_list, list) {
-                list_del(&attr->node);
+                ibft_kobj = boot_kobj->data;
-                kfree(attr);
+                if (ibft_kobj->hdr->id == id_nic)
+                        sysfs_remove_link(&boot_kobj->kobj, "device");
        };
-        list_del_init(attr_list);
-        list_for_each_entry_safe(data, n, kobj_list, node) {
-                list_del(&data->node);
-                if (data->hdr->id == id_nic)
-                        sysfs_remove_link(&data->kobj, "device");
-                kobject_put(&data->kobj);
-        };
-        list_del_init(kobj_list);
 }
-static int __init ibft_create_attribute(struct ibft_kobject *kobj_data,
+static void ibft_cleanup(void)
-                                         int type,
-                                         const char *name,
-                                         ssize_t (*show)(struct ibft_kobject *,
-                                                         struct ibft_attribute*,
-                                                         char *buf),
-                                         struct list_head *list)
 {
-        struct ibft_attribute *attr = NULL;
+        ibft_unregister();
-        struct ibft_hdr *hdr = kobj_data->hdr;
+        iscsi_boot_destroy_kset(boot_kset);
-        attr = kmalloc(sizeof(*attr), GFP_KERNEL);
-        if (!attr)
-                return -ENOMEM;
-        attr->attr.name = name;
-        attr->attr.mode = S_IRUSR;
-        attr->hdr = hdr;
-        attr->show = show;
-        attr->kobj = &kobj_data->kobj;
-        attr->type = type;
-        list_add_tail(&attr->node, list);
-        return 0;
-}
-/*
- * Helper routiners to check to determine if the entry is valid
- * in the proper iBFT structure.
- */
-static int __init ibft_check_nic_for(struct ibft_nic *nic, int entry)
-{
-        int rc = 0;
-        switch (entry) {
-        case ibft_eth_index:
-        case ibft_eth_flags:
-                rc = 1;
-                break;
-        case ibft_eth_ip_addr:
-                if (memcmp(nic->ip_addr, nulls, sizeof(nic->ip_addr)))
-                        rc = 1;
-                break;
-        case ibft_eth_subnet_mask:
-                if (nic->subnet_mask_prefix)
-                        rc = 1;
-                break;
-        case ibft_eth_origin:
-                rc = 1;
-                break;
-        case ibft_eth_gateway:
-                if (memcmp(nic->gateway, nulls, sizeof(nic->gateway)))
-                        rc = 1;
-                break;
-        case ibft_eth_primary_dns:
-                if (memcmp(nic->primary_dns, nulls,
-                           sizeof(nic->primary_dns)))
-                        rc = 1;
-                break;
-        case ibft_eth_secondary_dns:
-                if (memcmp(nic->secondary_dns, nulls,
-                           sizeof(nic->secondary_dns)))
-                        rc = 1;
-                break;
-        case ibft_eth_dhcp:
-                if (memcmp(nic->dhcp, nulls, sizeof(nic->dhcp)))
-                        rc = 1;
-                break;
-        case ibft_eth_vlan:
-        case ibft_eth_mac:
-                rc = 1;
-                break;
-        case ibft_eth_hostname:
-                if (nic->hostname_off)
-                        rc = 1;
-                break;
-        default:
-                break;
-        }
-        return rc;
 }
-static int __init ibft_check_tgt_for(struct ibft_tgt *tgt, int entry)
+static void __exit ibft_exit(void)
-{
-        int rc = 0;
-        switch (entry) {
-        case ibft_tgt_index:
-        case ibft_tgt_flags:
-        case ibft_tgt_ip_addr:
-        case ibft_tgt_port:
-        case ibft_tgt_lun:
-        case ibft_tgt_nic_assoc:
-        case ibft_tgt_chap_type:
-                rc = 1;
-        case ibft_tgt_name:
-                if (tgt->tgt_name_len)
-                        rc = 1;
-                break;
-        case ibft_tgt_chap_name:
-        case ibft_tgt_chap_secret:
-                if (tgt->chap_name_len)
-                        rc = 1;
-                break;
-        case ibft_tgt_rev_chap_name:
-        case ibft_tgt_rev_chap_secret:
-                if (tgt->rev_chap_name_len)
-                        rc = 1;
-                break;
-        default:
-                break;
-        }
-        return rc;
-}
-static int __init ibft_check_initiator_for(struct ibft_initiator *init,
-                                            int entry)
-{
-        int rc = 0;
-        switch (entry) {
-        case ibft_init_index:
-        case ibft_init_flags:
-                rc = 1;
-                break;
-        case ibft_init_isns_server:
-                if (memcmp(init->isns_server, nulls,
-                           sizeof(init->isns_server)))
-                        rc = 1;
-                break;
-        case ibft_init_slp_server:
-                if (memcmp(init->slp_server, nulls,
-                           sizeof(init->slp_server)))
-                        rc = 1;
-                break;
-        case ibft_init_pri_radius_server:
-                if (memcmp(init->pri_radius_server, nulls,
-                           sizeof(init->pri_radius_server)))
-                        rc = 1;
-                break;
-        case ibft_init_sec_radius_server:
-                if (memcmp(init->sec_radius_server, nulls,
-                           sizeof(init->sec_radius_server)))
-                        rc = 1;
-                break;
-        case ibft_init_initiator_name:
-                if (init->initiator_name_len)
-                        rc = 1;
-                break;
-        default:
-                break;
-        }
-        return rc;
-}
-/*
- *  Register the attributes for all of the kobjects.
- */
-static int __init ibft_register_attributes(struct list_head *kobject_list,
-                                            struct list_head *attr_list)
 {
-        int rc = 0, i = 0;
+        ibft_cleanup();
-        struct ibft_kobject *data = NULL;
-        struct ibft_attribute *attr = NULL, *m;
-        list_for_each_entry(data, kobject_list, node) {
-                switch (data->hdr->id) {
-                case id_nic:
-                        for (i = 0; i < ibft_eth_end_marker && !rc; i++)
-                                if (ibft_check_nic_for(data->nic, i))
-                                        rc = ibft_create_attribute(data, i,
-                                                ibft_eth_properties[i],
-                                                ibft_attr_show_nic, attr_list);
-                        break;
-                case id_target:
-                        for (i = 0; i < ibft_tgt_end_marker && !rc; i++)
-                                if (ibft_check_tgt_for(data->tgt, i))
-                                        rc = ibft_create_attribute(data, i,
-                                                ibft_tgt_properties[i],
-                                                ibft_attr_show_target,
-                                                attr_list);
-                        break;
-                case id_initiator:
-                        for (i = 0; i < ibft_init_end_marker && !rc; i++)
-                                if (ibft_check_initiator_for(
-                                        data->initiator, i))
-                                        rc = ibft_create_attribute(data, i,
-                                                ibft_initiator_properties[i],
-                                                ibft_attr_show_initiator,
-                                                attr_list);
-                        break;
-                default:
-                        break;
-                }
-                if (rc)
-                        break;
-        }
-        list_for_each_entry_safe(attr, m, attr_list, node) {
-                rc = sysfs_create_file(attr->kobj, &attr->attr);
-                if (rc) {
-                        list_del(&attr->node);
-                        kfree(attr);
-                        break;
-                }
-        }
-        return rc;
 }
 /*
@@ -927,26 +743,20 @@ static int __init ibft_init(void)
 {
        int rc = 0;
-        ibft_kset = kset_create_and_add("ibft", NULL, firmware_kobj);
-        if (!ibft_kset)
-                return -ENOMEM;
        if (ibft_addr) {
                printk(KERN_INFO "iBFT detected at 0x%llx.\n",
                       (u64)isa_virt_to_bus(ibft_addr));
                rc = ibft_check_device();
                if (rc)
-                        goto out_firmware_unregister;
+                        return rc;
-                /* Scan the IBFT for data and register the kobjects. */
+                boot_kset = iscsi_boot_create_kset("ibft");
-                rc = ibft_register_kobjects(ibft_addr, &ibft_kobject_list);
+                if (!boot_kset)
-                if (rc)
+                        return -ENOMEM;
-                        goto out_free;
-                /* Register the attributes */
+                /* Scan the IBFT for data and register the kobjects. */
-                rc = ibft_register_attributes(&ibft_kobject_list,
+                rc = ibft_register_kobjects(ibft_addr);
-                                              &ibft_attr_list);
                if (rc)
                        goto out_free;
        } else
@@ -955,17 +765,9 @@ static int __init ibft_init(void)
        return 0;
 out_free:
-        ibft_unregister(&ibft_attr_list, &ibft_kobject_list);
+        ibft_cleanup();
-out_firmware_unregister:
-        kset_unregister(ibft_kset);
        return rc;
 }
-static void __exit ibft_exit(void)
-{
-        ibft_unregister(&ibft_attr_list, &ibft_kobject_list);
-        kset_unregister(ibft_kset);
-}
 module_init(ibft_init);
 module_exit(ibft_exit);
diff --git a/drivers/firmware/iscsi_ibft_find.c b/drivers/firmware/iscsi_ibft_find.c
index d6470ef36e4a..2192456dfd68 100644
--- a/drivers/firmware/iscsi_ibft_find.c
+++ b/drivers/firmware/iscsi_ibft_find.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2007 Red Hat, Inc.
+ *  Copyright 2007-2010 Red Hat, Inc.
 *  by Peter Jones <pjones@redhat.com>
 *  Copyright 2007 IBM, Inc.
 *  by Konrad Rzeszutek <konradr@linux.vnet.ibm.com>
@@ -22,6 +22,7 @@
 #include <linux/blkdev.h>
 #include <linux/ctype.h>
 #include <linux/device.h>
+#include <linux/efi.h>
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/limits.h>
@@ -30,13 +31,15 @@
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/types.h>
+#include <linux/acpi.h>
+#include <linux/iscsi_ibft.h>
 #include <asm/mmzone.h>
 /*
 * Physical location of iSCSI Boot Format Table.
 */
-struct ibft_table_header *ibft_addr;
+struct acpi_table_ibft *ibft_addr;
 EXPORT_SYMBOL_GPL(ibft_addr);
 #define IBFT_SIGN "iBFT"
@@ -46,19 +49,20 @@ EXPORT_SYMBOL_GPL(ibft_addr);
 #define VGA_MEM 0xA0000 /* VGA buffer */
 #define VGA_SIZE 0x20000 /* 128kB */
+#ifdef CONFIG_ACPI
+static int __init acpi_find_ibft(struct acpi_table_header *header)
+{
+        ibft_addr = (struct acpi_table_ibft *)header;
+        return 0;
+}
+#endif /* CONFIG_ACPI */
-/*
+static int __init find_ibft_in_mem(void)
- * Routine used to find the iSCSI Boot Format Table. The logical
- * kernel address is set in the ibft_addr global variable.
- */
-unsigned long __init find_ibft_region(unsigned long *sizep)
 {
        unsigned long pos;
        unsigned int len = 0;
        void *virt;
-        ibft_addr = NULL;
        for (pos = IBFT_START; pos < IBFT_END; pos += 16) {
                /* The table can't be inside the VGA BIOS reserved space,
                 * so skip that area */
@@ -72,14 +76,42 @@ unsigned long __init find_ibft_region(unsigned long *sizep)
                        /* if the length of the table extends past 1M,
                         * the table cannot be valid. */
                        if (pos + len <= (IBFT_END-1)) {
-                                ibft_addr = (struct ibft_table_header *)virt;
+                                ibft_addr = (struct acpi_table_ibft *)virt;
                                break;
                        }
                }
        }
+        return len;
+}
+/*
+ * Routine used to find the iSCSI Boot Format Table. The logical
+ * kernel address is set in the ibft_addr global variable.
+ */
+unsigned long __init find_ibft_region(unsigned long *sizep)
+{
+        ibft_addr = NULL;
+#ifdef CONFIG_ACPI
+        /*
+         * One spec says "IBFT", the other says "iBFT". We have to check
+         * for both.
+         */
+        if (!ibft_addr)
+                acpi_table_parse(ACPI_SIG_IBFT, acpi_find_ibft);
+        if (!ibft_addr)
+                acpi_table_parse(IBFT_SIGN, acpi_find_ibft);
+#endif /* CONFIG_ACPI */
+        /* iBFT 1.03 section 1.4.3.1 mandates that UEFI machines will
+         * only use ACPI for this */
+        if (!ibft_addr && !efi_enabled)
+                find_ibft_in_mem();
        if (ibft_addr) {
-                *sizep = PAGE_ALIGN(len);
+                *sizep = PAGE_ALIGN(ibft_addr->header.length);
-                return pos;
+                return (u64)isa_virt_to_bus(ibft_addr);
        }
        *sizep = 0;
diff --git a/drivers/gpio/cs5535-gpio.c b/drivers/gpio/cs5535-gpio.c
index f73a1555e49d..e23c06893d19 100644
--- a/drivers/gpio/cs5535-gpio.c
+++ b/drivers/gpio/cs5535-gpio.c
@@ -352,6 +352,6 @@ static void __exit cs5535_gpio_exit(void)
 module_init(cs5535_gpio_init);
 module_exit(cs5535_gpio_exit);
-MODULE_AUTHOR("Andres Salomon <dilinger@collabora.co.uk>");
+MODULE_AUTHOR("Andres Salomon <dilinger@queued.net>");
 MODULE_DESCRIPTION("AMD CS5535/CS5536 GPIO driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 3ca36542e338..6a6bd569e1f8 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -8,6 +8,7 @@
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 #include <linux/gpio.h>
+#include <linux/of_gpio.h>
 #include <linux/idr.h>
 #include <linux/slab.h>
@@ -893,10 +894,12 @@ EXPORT_SYMBOL_GPL(gpio_sysfs_set_active_low);
 void gpio_unexport(unsigned gpio)
 {
        struct gpio_desc        *desc;
-        int                     status = -EINVAL;
+        int                     status = 0;
-        if (!gpio_is_valid(gpio))
+        if (!gpio_is_valid(gpio)) {
+                status = -EINVAL;
                goto done;
+        }
        mutex_lock(&sysfs_lock);
@@ -911,7 +914,6 @@ void gpio_unexport(unsigned gpio)
                        clear_bit(FLAG_EXPORT, &desc->flags);
                        put_device(dev);
                        device_unregister(dev);
-                        status = 0;
                } else
                        status = -ENODEV;
        }
@@ -1099,16 +1101,24 @@ int gpiochip_add(struct gpio_chip *chip)
                }
        }
+        of_gpiochip_add(chip);
 unlock:
        spin_unlock_irqrestore(&gpio_lock, flags);
-        if (status == 0)
-                status = gpiochip_export(chip);
+        if (status)
+                goto fail;
+        status = gpiochip_export(chip);
+        if (status)
+                goto fail;
+        return 0;
 fail:
        /* failures here can mean systems won't boot... */
-        if (status)
+        pr_err("gpiochip_add: gpios %d..%d (%s) failed to register\n",
-                pr_err("gpiochip_add: gpios %d..%d (%s) failed to register\n",
+                chip->base, chip->base + chip->ngpio - 1,
-                        chip->base, chip->base + chip->ngpio - 1,
+                chip->label ? : "generic");
-                        chip->label ? : "generic");
        return status;
 }
 EXPORT_SYMBOL_GPL(gpiochip_add);
@@ -1127,6 +1137,8 @@ int gpiochip_remove(struct gpio_chip *chip)
        spin_lock_irqsave(&gpio_lock, flags);
+        of_gpiochip_remove(chip);
        for (id = chip->base; id < chip->base + chip->ngpio; id++) {
                if (test_bit(FLAG_REQUESTED, &gpio_desc[id].flags)) {
                        status = -EBUSY;
@@ -1147,6 +1159,38 @@ int gpiochip_remove(struct gpio_chip *chip)
 }
 EXPORT_SYMBOL_GPL(gpiochip_remove);
+/**
+ * gpiochip_find() - iterator for locating a specific gpio_chip
+ * @data: data to pass to match function
+ * @callback: Callback function to check gpio_chip
+ *
+ * Similar to bus_find_device.  It returns a reference to a gpio_chip as
+ * determined by a user supplied @match callback.  The callback should return
+ * 0 if the device doesn't match and non-zero if it does.  If the callback is
+ * non-zero, this function will return to the caller and not iterate over any
+ * more gpio_chips.
+ */
+struct gpio_chip *gpiochip_find(void *data,
+                                int (*match)(struct gpio_chip *chip, void *data))
+{
+        struct gpio_chip *chip = NULL;
+        unsigned long flags;
+        int i;
+        spin_lock_irqsave(&gpio_lock, flags);
+        for (i = 0; i < ARCH_NR_GPIOS; i++) {
+                if (!gpio_desc[i].chip)
+                        continue;
+                if (match(gpio_desc[i].chip, data)) {
+                        chip = gpio_desc[i].chip;
+                        break;
+                }
+        }
+        spin_unlock_irqrestore(&gpio_lock, flags);
+        return chip;
+}
 /* These "optional" allocation calls help prevent drivers from stomping
 * on each other, and help provide better diagnostics in debugfs.
diff --git a/drivers/gpio/pl061.c b/drivers/gpio/pl061.c
index ee568c8fcbd0..5005990f751f 100644
--- a/drivers/gpio/pl061.c
+++ b/drivers/gpio/pl061.c
@@ -232,7 +232,7 @@ static void pl061_irq_handler(unsigned irq, struct irq_desc *desc)
        desc->chip->unmask(irq);
 }
-static int __init pl061_probe(struct amba_device *dev, struct amba_id *id)
+static int pl061_probe(struct amba_device *dev, struct amba_id *id)
 {
        struct pl061_platform_data *pdata;
        struct pl061_gpio *chip;
@@ -333,7 +333,7 @@ free_mem:
        return ret;
 }
-static struct amba_id pl061_ids[] __initdata = {
+static struct amba_id pl061_ids[] = {
        {
                .id     = 0x00041061,
                .mask   = 0x000fffff,
diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c
index b8fa65b5bfca..709690995d0d 100644
--- a/drivers/gpio/xilinx_gpio.c
+++ b/drivers/gpio/xilinx_gpio.c
@@ -161,14 +161,12 @@ static void xgpio_save_regs(struct of_mm_gpio_chip *mm_gc)
 static int __devinit xgpio_of_probe(struct device_node *np)
 {
        struct xgpio_instance *chip;
-        struct of_gpio_chip *ofchip;
        int status = 0;
        const u32 *tree_info;
        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
        if (!chip)
                return -ENOMEM;
-        ofchip = &chip->mmchip.of_gc;
        /* Update GPIO state shadow register with default value */
        tree_info = of_get_property(np, "xlnx,dout-default", NULL);
@@ -182,21 +180,20 @@ static int __devinit xgpio_of_probe(struct device_node *np)
                chip->gpio_dir = *tree_info;
        /* Check device node and parent device node for device width */
-        ofchip->gc.ngpio = 32; /* By default assume full GPIO controller */
+        chip->mmchip.gc.ngpio = 32; /* By default assume full GPIO controller */
        tree_info = of_get_property(np, "xlnx,gpio-width", NULL);
        if (!tree_info)
                tree_info = of_get_property(np->parent,
                                            "xlnx,gpio-width", NULL);
        if (tree_info)
-                ofchip->gc.ngpio = *tree_info;
+                chip->mmchip.gc.ngpio = *tree_info;
        spin_lock_init(&chip->gpio_lock);
-        ofchip->gpio_cells = 2;
+        chip->mmchip.gc.direction_input = xgpio_dir_in;
-        ofchip->gc.direction_input = xgpio_dir_in;
+        chip->mmchip.gc.direction_output = xgpio_dir_out;
-        ofchip->gc.direction_output = xgpio_dir_out;
+        chip->mmchip.gc.get = xgpio_get;
-        ofchip->gc.get = xgpio_get;
+        chip->mmchip.gc.set = xgpio_set;
-        ofchip->gc.set = xgpio_set;
        chip->mmchip.save_regs = xgpio_save_regs;
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 88910e5a2c77..4cab0c6397e3 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -6,7 +6,7 @@
 #
 menuconfig DRM
        tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
-        depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG && MMU
+        depends on (AGP || AGP=n) && !EMULATED_CMPXCHG && MMU
        select I2C
        select I2C_ALGOBIT
        select SLOW_WORK
@@ -17,7 +17,7 @@ menuconfig DRM
          These modules provide support for synchronization, security, and
          DMA transfers. Please see <http://dri.sourceforge.net/> for more
          details.  You should also select and configure AGP
-          (/dev/agpgart) support.
+          (/dev/agpgart) support if it is available for your platform.
 config DRM_KMS_HELPER
        tristate
@@ -61,6 +61,7 @@ config DRM_RADEON
        select DRM_KMS_HELPER
        select DRM_TTM
        select POWER_SUPPLY
+        select HWMON
        help
          Choose this option if you have an ATI Radeon graphics card.  There
          are both PCI and AGP versions.  You don't need to choose this to
@@ -130,7 +131,7 @@ endchoice
 config DRM_MGA
        tristate "Matrox g200/g400"
-        depends on DRM
+        depends on DRM && PCI
        select FW_LOADER
        help
          Choose this option if you have a Matrox G200, G400 or G450 graphics
@@ -148,14 +149,14 @@ config DRM_SIS
 config DRM_VIA
        tristate "Via unichrome video cards"
-        depends on DRM
+        depends on DRM && PCI
        help
          Choose this option if you have a Via unichrome or compatible video
          chipset. If M is selected the module will be called via.
 config DRM_SAVAGE
        tristate "Savage video cards"
-        depends on DRM
+        depends on DRM && PCI
        help
          Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister
          chipset. If M is selected the module will be called savage.
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index abe3f446ca48..f3a23a329f4e 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -9,9 +9,10 @@ drm-y       :=	drm_auth.o drm_buffer.o drm_bufs.o drm_cache.o \
                drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
                drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
                drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
-                drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
+                drm_platform.o drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
                drm_crtc.o drm_modes.o drm_edid.o \
-                drm_info.o drm_debugfs.o drm_encoder_slave.o
+                drm_info.o drm_debugfs.o drm_encoder_slave.o \
+                drm_trace_points.o drm_global.o
 drm-$(CONFIG_COMPAT) += drm_ioc32.o
@@ -19,6 +20,8 @@ drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o drm_dp_i2c_helper.o
 obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
+CFLAGS_drm_trace_points.o := -I$(src)
 obj-$(CONFIG_DRM)       += drm.o
 obj-$(CONFIG_DRM_TTM)   += ttm/
 obj-$(CONFIG_DRM_TDFX)  += tdfx/
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index 2092e7bb788f..a5c9ce93bbcb 100644
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
@@ -39,19 +39,6 @@
 #include <asm/shmparam.h>
 #include "drmP.h"
-resource_size_t drm_get_resource_start(struct drm_device *dev, unsigned int resource)
-{
-        return pci_resource_start(dev->pdev, resource);
-}
-EXPORT_SYMBOL(drm_get_resource_start);
-resource_size_t drm_get_resource_len(struct drm_device *dev, unsigned int resource)
-{
-        return pci_resource_len(dev->pdev, resource);
-}
-EXPORT_SYMBOL(drm_get_resource_len);
 static struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
                                                  struct drm_local_map *map)
 {
@@ -189,7 +176,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
        switch (map->type) {
        case _DRM_REGISTERS:
        case _DRM_FRAME_BUFFER:
-#if !defined(__sparc__) && !defined(__alpha__) && !defined(__ia64__) && !defined(__powerpc64__) && !defined(__x86_64__)
+#if !defined(__sparc__) && !defined(__alpha__) && !defined(__ia64__) && !defined(__powerpc64__) && !defined(__x86_64__) && !defined(__arm__)
                if (map->offset + (map->size-1) < map->offset ||
                    map->offset < virt_to_phys(high_memory)) {
                        kfree(map);
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 57cea01c4ffb..4c68f76993d8 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -80,6 +80,7 @@ static struct drm_prop_enum_list drm_dithering_mode_enum_list[] =
 {
        { DRM_MODE_DITHERING_OFF, "Off" },
        { DRM_MODE_DITHERING_ON, "On" },
+        { DRM_MODE_DITHERING_AUTO, "Automatic" },
 };
 /*
@@ -1126,7 +1127,7 @@ int drm_mode_getresources(struct drm_device *dev, void *data,
                if (file_priv->master->minor->type == DRM_MINOR_CONTROL) {
                        list_for_each_entry(crtc, &dev->mode_config.crtc_list,
                                            head) {
-                                DRM_DEBUG_KMS("CRTC ID is %d\n", crtc->base.id);
+                                DRM_DEBUG_KMS("[CRTC:%d]\n", crtc->base.id);
                                if (put_user(crtc->base.id, crtc_id + copied)) {
                                        ret = -EFAULT;
                                        goto out;
@@ -1154,8 +1155,8 @@ int drm_mode_getresources(struct drm_device *dev, void *data,
                        list_for_each_entry(encoder,
                                            &dev->mode_config.encoder_list,
                                            head) {
-                                DRM_DEBUG_KMS("ENCODER ID is %d\n",
+                                DRM_DEBUG_KMS("[ENCODER:%d:%s]\n", encoder->base.id,
-                                          encoder->base.id);
+                                                drm_get_encoder_name(encoder));
                                if (put_user(encoder->base.id, encoder_id +
                                             copied)) {
                                        ret = -EFAULT;
@@ -1185,8 +1186,9 @@ int drm_mode_getresources(struct drm_device *dev, void *data,
                        list_for_each_entry(connector,
                                            &dev->mode_config.connector_list,
                                            head) {
-                                DRM_DEBUG_KMS("CONNECTOR ID is %d\n",
+                                DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
-                                          connector->base.id);
+                                        connector->base.id,
+                                        drm_get_connector_name(connector));
                                if (put_user(connector->base.id,
                                             connector_id + copied)) {
                                        ret = -EFAULT;
@@ -1209,7 +1211,7 @@ int drm_mode_getresources(struct drm_device *dev, void *data,
        }
        card_res->count_connectors = connector_count;
-        DRM_DEBUG_KMS("Counted %d %d %d\n", card_res->count_crtcs,
+        DRM_DEBUG_KMS("CRTC[%d] CONNECTORS[%d] ENCODERS[%d]\n", card_res->count_crtcs,
                  card_res->count_connectors, card_res->count_encoders);
 out:
@@ -1312,7 +1314,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
        memset(&u_mode, 0, sizeof(struct drm_mode_modeinfo));
-        DRM_DEBUG_KMS("connector id %d:\n", out_resp->connector_id);
+        DRM_DEBUG_KMS("[CONNECTOR:%d:?]\n", out_resp->connector_id);
        mutex_lock(&dev->mode_config.mutex);
@@ -1493,6 +1495,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
                goto out;
        }
        crtc = obj_to_crtc(obj);
+        DRM_DEBUG_KMS("[CRTC:%d]\n", crtc->base.id);
        if (crtc_req->mode_valid) {
                /* If we have a mode we need a framebuffer. */
@@ -1569,6 +1572,9 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
                                goto out;
                        }
                        connector = obj_to_connector(obj);
+                        DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
+                                        connector->base.id,
+                                        drm_get_connector_name(connector));
                        connector_set[i] = connector;
                }
@@ -1684,6 +1690,7 @@ int drm_mode_addfb(struct drm_device *dev,
        r->fb_id = fb->base.id;
        list_add(&fb->filp_head, &file_priv->fbs);
+        DRM_DEBUG_KMS("[FB:%d]\n", fb->base.id);
 out:
        mutex_unlock(&dev->mode_config.mutex);
@@ -2610,6 +2617,15 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
                goto out;
        crtc = obj_to_crtc(obj);
+        if (crtc->fb == NULL) {
+                /* The framebuffer is currently unbound, presumably
+                 * due to a hotplug event, that userspace has not
+                 * yet discovered.
+                 */
+                ret = -EBUSY;
+                goto out;
+        }
        if (crtc->funcs->page_flip == NULL)
                goto out;
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index 9b2a54117c91..11fe9c870d17 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -86,7 +86,8 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,
        int count = 0;
        int mode_flags = 0;
-        DRM_DEBUG_KMS("%s\n", drm_get_connector_name(connector));
+        DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", connector->base.id,
+                        drm_get_connector_name(connector));
        /* set all modes to the unverified state */
        list_for_each_entry_safe(mode, t, &connector->modes, head)
                mode->status = MODE_UNVERIFIED;
@@ -102,8 +103,8 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,
                connector->status = connector->funcs->detect(connector);
        if (connector->status == connector_status_disconnected) {
-                DRM_DEBUG_KMS("%s is disconnected\n",
+                DRM_DEBUG_KMS("[CONNECTOR:%d:%s] disconnected\n",
-                          drm_get_connector_name(connector));
+                        connector->base.id, drm_get_connector_name(connector));
                drm_mode_connector_update_edid_property(connector, NULL);
                goto prune;
        }
@@ -141,8 +142,8 @@ prune:
        drm_mode_sort(&connector->modes);
-        DRM_DEBUG_KMS("Probed modes for %s\n",
+        DRM_DEBUG_KMS("[CONNECTOR:%d:%s] probed modes :\n", connector->base.id,
-                                drm_get_connector_name(connector));
+                        drm_get_connector_name(connector));
        list_for_each_entry_safe(mode, t, &connector->modes, head) {
                mode->vrefresh = drm_mode_vrefresh(mode);
@@ -201,6 +202,17 @@ bool drm_helper_crtc_in_use(struct drm_crtc *crtc)
 }
 EXPORT_SYMBOL(drm_helper_crtc_in_use);
+static void
+drm_encoder_disable(struct drm_encoder *encoder)
+{
+        struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private;
+        if (encoder_funcs->disable)
+                (*encoder_funcs->disable)(encoder);
+        else
+                (*encoder_funcs->dpms)(encoder, DRM_MODE_DPMS_OFF);
+}
 /**
 * drm_helper_disable_unused_functions - disable unused objects
 * @dev: DRM device
@@ -215,7 +227,6 @@ void drm_helper_disable_unused_functions(struct drm_device *dev)
 {
        struct drm_encoder *encoder;
        struct drm_connector *connector;
-        struct drm_encoder_helper_funcs *encoder_funcs;
        struct drm_crtc *crtc;
        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
@@ -226,12 +237,8 @@ void drm_helper_disable_unused_functions(struct drm_device *dev)
        }
        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-                encoder_funcs = encoder->helper_private;
                if (!drm_helper_encoder_in_use(encoder)) {
-                        if (encoder_funcs->disable)
+                        drm_encoder_disable(encoder);
-                                (*encoder_funcs->disable)(encoder);
-                        else
-                                (*encoder_funcs->dpms)(encoder, DRM_MODE_DPMS_OFF);
                        /* disconnector encoder from any connector */
                        encoder->crtc = NULL;
                }
@@ -241,7 +248,10 @@ void drm_helper_disable_unused_functions(struct drm_device *dev)
                struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
                crtc->enabled = drm_helper_crtc_in_use(crtc);
                if (!crtc->enabled) {
-                        crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF);
+                        if (crtc_funcs->disable)
+                                (*crtc_funcs->disable)(crtc);
+                        else
+                                (*crtc_funcs->dpms)(crtc, DRM_MODE_DPMS_OFF);
                        crtc->fb = NULL;
                }
        }
@@ -292,11 +302,11 @@ drm_crtc_prepare_encoders(struct drm_device *dev)
                encoder_funcs = encoder->helper_private;
                /* Disable unused encoders */
                if (encoder->crtc == NULL)
-                        (*encoder_funcs->dpms)(encoder, DRM_MODE_DPMS_OFF);
+                        drm_encoder_disable(encoder);
                /* Disable encoders whose CRTC is about to change */
                if (encoder_funcs->get_crtc &&
                    encoder->crtc != (*encoder_funcs->get_crtc)(encoder))
-                        (*encoder_funcs->dpms)(encoder, DRM_MODE_DPMS_OFF);
+                        drm_encoder_disable(encoder);
        }
 }
@@ -365,6 +375,7 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
        if (!(ret = crtc_funcs->mode_fixup(crtc, mode, adjusted_mode))) {
                goto done;
        }
+        DRM_DEBUG_KMS("[CRTC:%d]\n", crtc->base.id);
        /* Prepare the encoders and CRTCs before setting the mode. */
        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
@@ -392,8 +403,9 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
                if (encoder->crtc != crtc)
                        continue;
-                DRM_DEBUG("%s: set mode %s %x\n", drm_get_encoder_name(encoder),
+                DRM_DEBUG_KMS("[ENCODER:%d:%s] set [MODE:%d:%s]\n",
-                         mode->name, mode->base.id);
+                        encoder->base.id, drm_get_encoder_name(encoder),
+                        mode->base.id, mode->name);
                encoder_funcs = encoder->helper_private;
                encoder_funcs->mode_set(encoder, mode, adjusted_mode);
        }
@@ -469,10 +481,15 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
        crtc_funcs = set->crtc->helper_private;
-        DRM_DEBUG_KMS("crtc: %p %d fb: %p connectors: %p num_connectors:"
+        if (set->fb) {
-                        " %d (x, y) (%i, %i)\n",
+                DRM_DEBUG_KMS("[CRTC:%d] [FB:%d] #connectors=%d (x y) (%i %i)\n",
-                  set->crtc, set->crtc->base.id, set->fb, set->connectors,
+                                set->crtc->base.id, set->fb->base.id,
-                  (int)set->num_connectors, set->x, set->y);
+                                (int)set->num_connectors, set->x, set->y);
+        } else {
+                DRM_DEBUG_KMS("[CRTC:%d] [NOFB] #connectors=%d (x y) (%i %i)\n",
+                                set->crtc->base.id, (int)set->num_connectors,
+                                set->x, set->y);
+        }
        dev = set->crtc->dev;
@@ -601,8 +618,14 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
                        mode_changed = true;
                        connector->encoder->crtc = new_crtc;
                }
-                DRM_DEBUG_KMS("setting connector %d crtc to %p\n",
+                if (new_crtc) {
-                          connector->base.id, new_crtc);
+                        DRM_DEBUG_KMS("[CONNECTOR:%d:%s] to [CRTC:%d]\n",
+                                connector->base.id, drm_get_connector_name(connector),
+                                new_crtc->base.id);
+                } else {
+                        DRM_DEBUG_KMS("[CONNECTOR:%d:%s] to [NOCRTC]\n",
+                                connector->base.id, drm_get_connector_name(connector));
+                }
        }
        /* mode_set_base is not a required function */
@@ -620,8 +643,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
                        if (!drm_crtc_helper_set_mode(set->crtc, set->mode,
                                                      set->x, set->y,
                                                      old_fb)) {
-                                DRM_ERROR("failed to set mode on crtc %p\n",
+                                DRM_ERROR("failed to set mode on [CRTC:%d]\n",
-                                          set->crtc);
+                                          set->crtc->base.id);
                                ret = -EINVAL;
                                goto fail;
                        }
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 4a66201edaec..90288ec7c284 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -243,47 +243,20 @@ int drm_lastclose(struct drm_device * dev)
 *
 * Initializes an array of drm_device structures, and attempts to
 * initialize all available devices, using consecutive minors, registering the
- * stubs and initializing the AGP device.
+ * stubs and initializing the device.
 *
 * Expands the \c DRIVER_PREINIT and \c DRIVER_POST_INIT macros before and
 * after the initialization for driver customization.
 */
 int drm_init(struct drm_driver *driver)
 {
-        struct pci_dev *pdev = NULL;
-        const struct pci_device_id *pid;
-        int i;
        DRM_DEBUG("\n");
        INIT_LIST_HEAD(&driver->device_list);
-        if (driver->driver_features & DRIVER_MODESET)
+        if (driver->driver_features & DRIVER_USE_PLATFORM_DEVICE)
-                return pci_register_driver(&driver->pci_driver);
+                return drm_platform_init(driver);
+        else
-        /* If not using KMS, fall back to stealth mode manual scanning. */
+                return drm_pci_init(driver);
-        for (i = 0; driver->pci_driver.id_table[i].vendor != 0; i++) {
-                pid = &driver->pci_driver.id_table[i];
-                /* Loop around setting up a DRM device for each PCI device
-                 * matching our ID and device class.  If we had the internal
-                 * function that pci_get_subsys and pci_get_class used, we'd
-                 * be able to just pass pid in instead of doing a two-stage
-                 * thing.
-                 */
-                pdev = NULL;
-                while ((pdev =
-                        pci_get_subsys(pid->vendor, pid->device, pid->subvendor,
-                                       pid->subdevice, pdev)) != NULL) {
-                        if ((pdev->class & pid->class_mask) != pid->class)
-                                continue;
-                        /* stealth mode requires a manual probe */
-                        pci_dev_get(pdev);
-                        drm_get_dev(pdev, pid, driver);
-                }
-        }
-        return 0;
 }
 EXPORT_SYMBOL(drm_init);
@@ -315,6 +288,7 @@ static int __init drm_core_init(void)
 {
        int ret = -ENOMEM;
+        drm_global_init();
        idr_init(&drm_minors_idr);
        if (register_chrdev(DRM_MAJOR, "drm", &drm_stub_fops))
@@ -362,6 +336,7 @@ static void __exit drm_core_exit(void)
        unregister_chrdev(DRM_MAJOR, "drm");
+        idr_remove_all(&drm_minors_idr);
        idr_destroy(&drm_minors_idr);
 }
@@ -506,9 +481,9 @@ long drm_ioctl(struct file *filp,
                if (ioctl->flags & DRM_UNLOCKED)
                        retcode = func(dev, kdata, file_priv);
                else {
-                        lock_kernel();
+                        mutex_lock(&drm_global_mutex);
                        retcode = func(dev, kdata, file_priv);
-                        unlock_kernel();
+                        mutex_unlock(&drm_global_mutex);
                }
                if (cmd & IOC_OUT) {
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index c1981861bbbd..dce5c4a97f8d 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -282,7 +282,7 @@ drm_do_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter)
        return block;
 carp:
-        dev_warn(&connector->dev->pdev->dev, "%s: EDID block %d invalid.\n",
+        dev_warn(connector->dev->dev, "%s: EDID block %d invalid.\n",
                 drm_get_connector_name(connector), j);
 out:
@@ -864,8 +864,8 @@ drm_mode_std(struct drm_connector *connector, struct edid *edid,
                mode = drm_cvt_mode(dev, 1366, 768, vrefresh_rate, 0, 0,
                                    false);
                mode->hdisplay = 1366;
-                mode->vsync_start = mode->vsync_start - 1;
+                mode->hsync_start = mode->hsync_start - 1;
-                mode->vsync_end = mode->vsync_end - 1;
+                mode->hsync_end = mode->hsync_end - 1;
                return mode;
        }
@@ -929,13 +929,11 @@ drm_mode_do_interlace_quirk(struct drm_display_mode *mode,
                { 1440,  576 },
                { 2880,  576 },
        };
-        static const int n_sizes =
-                sizeof(cea_interlaced)/sizeof(cea_interlaced[0]);
        if (!(pt->misc & DRM_EDID_PT_INTERLACED))
                return;
-        for (i = 0; i < n_sizes; i++) {
+        for (i = 0; i < ARRAY_SIZE(cea_interlaced); i++) {
                if ((mode->hdisplay == cea_interlaced[i].w) &&
                    (mode->vdisplay == cea_interlaced[i].h / 2)) {
                        mode->vdisplay *= 2;
@@ -1375,7 +1373,6 @@ static const struct {
        { 1920, 1440, 60, 0 },
        { 1920, 1440, 75, 0 },
 };
-static const int num_est3_modes = sizeof(est3_modes) / sizeof(est3_modes[0]);
 static int
 drm_est3_modes(struct drm_connector *connector, struct detailed_timing *timing)
@@ -1387,7 +1384,7 @@ drm_est3_modes(struct drm_connector *connector, struct detailed_timing *timing)
        for (i = 0; i < 6; i++) {
                for (j = 7; j > 0; j--) {
                        m = (i * 8) + (7 - j);
-                        if (m >= num_est3_modes)
+                        if (m >= ARRAY_SIZE(est3_modes))
                                break;
                        if (est[i] & (1 << j)) {
                                mode = drm_mode_find_dmt(connector->dev,
@@ -1626,7 +1623,7 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
                return 0;
        }
        if (!drm_edid_is_valid(edid)) {
-                dev_warn(&connector->dev->pdev->dev, "%s: EDID invalid.\n",
+                dev_warn(connector->dev->dev, "%s: EDID invalid.\n",
                         drm_get_connector_name(connector));
                return 0;
        }
diff --git a/drivers/gpu/drm/drm_encoder_slave.c b/drivers/gpu/drm/drm_encoder_slave.c
index f0184696edf3..d62c064fbaa0 100644
--- a/drivers/gpu/drm/drm_encoder_slave.c
+++ b/drivers/gpu/drm/drm_encoder_slave.c
@@ -41,6 +41,9 @@
 * &drm_encoder_slave. The @slave_funcs field will be initialized with
 * the hooks provided by the slave driver.
 *
+ * If @info->platform_data is non-NULL it will be used as the initial
+ * slave config.
+ *
 * Returns 0 on success or a negative errno on failure, in particular,
 * -ENODEV is returned when no matching driver is found.
 */
@@ -85,6 +88,10 @@ int drm_i2c_encoder_init(struct drm_device *dev,
        if (err)
                goto fail_unregister;
+        if (info->platform_data)
+                encoder->slave_funcs->set_config(&encoder->base,
+                                                 info->platform_data);
        return 0;
 fail_unregister:
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 1f2cc6b09623..de82e201d682 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -241,6 +241,80 @@ static int drm_fb_helper_parse_command_line(struct drm_fb_helper *fb_helper)
        return 0;
 }
+int drm_fb_helper_debug_enter(struct fb_info *info)
+{
+        struct drm_fb_helper *helper = info->par;
+        struct drm_crtc_helper_funcs *funcs;
+        int i;
+        if (list_empty(&kernel_fb_helper_list))
+                return false;
+        list_for_each_entry(helper, &kernel_fb_helper_list, kernel_fb_list) {
+                for (i = 0; i < helper->crtc_count; i++) {
+                        struct drm_mode_set *mode_set =
+                                &helper->crtc_info[i].mode_set;
+                        if (!mode_set->crtc->enabled)
+                                continue;
+                        funcs = mode_set->crtc->helper_private;
+                        funcs->mode_set_base_atomic(mode_set->crtc,
+                                                    mode_set->fb,
+                                                    mode_set->x,
+                                                    mode_set->y);
+                }
+        }
+        return 0;
+}
+EXPORT_SYMBOL(drm_fb_helper_debug_enter);
+/* Find the real fb for a given fb helper CRTC */
+static struct drm_framebuffer *drm_mode_config_fb(struct drm_crtc *crtc)
+{
+        struct drm_device *dev = crtc->dev;
+        struct drm_crtc *c;
+        list_for_each_entry(c, &dev->mode_config.crtc_list, head) {
+                if (crtc->base.id == c->base.id)
+                        return c->fb;
+        }
+        return NULL;
+}
+int drm_fb_helper_debug_leave(struct fb_info *info)
+{
+        struct drm_fb_helper *helper = info->par;
+        struct drm_crtc *crtc;
+        struct drm_crtc_helper_funcs *funcs;
+        struct drm_framebuffer *fb;
+        int i;
+        for (i = 0; i < helper->crtc_count; i++) {
+                struct drm_mode_set *mode_set = &helper->crtc_info[i].mode_set;
+                crtc = mode_set->crtc;
+                funcs = crtc->helper_private;
+                fb = drm_mode_config_fb(crtc);
+                if (!crtc->enabled)
+                        continue;
+                if (!fb) {
+                        DRM_ERROR("no fb to restore??\n");
+                        continue;
+                }
+                funcs->mode_set_base_atomic(mode_set->crtc, fb, crtc->x,
+                                            crtc->y);
+        }
+        return 0;
+}
+EXPORT_SYMBOL(drm_fb_helper_debug_leave);
 bool drm_fb_helper_force_kernel_mode(void)
 {
        int i = 0;
@@ -315,8 +389,9 @@ static void drm_fb_helper_on(struct fb_info *info)
        struct drm_device *dev = fb_helper->dev;
        struct drm_crtc *crtc;
        struct drm_crtc_helper_funcs *crtc_funcs;
+        struct drm_connector *connector;
        struct drm_encoder *encoder;
-        int i;
+        int i, j;
        /*
         * For each CRTC in this fb, turn the crtc on then,
@@ -332,7 +407,14 @@ static void drm_fb_helper_on(struct fb_info *info)
                crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON);
+                /* Walk the connectors & encoders on this fb turning them on */
+                for (j = 0; j < fb_helper->connector_count; j++) {
+                        connector = fb_helper->connector_info[j]->connector;
+                        connector->dpms = DRM_MODE_DPMS_ON;
+                        drm_connector_property_set_value(connector,
+                                                         dev->mode_config.dpms_property,
+                                                         DRM_MODE_DPMS_ON);
+                }
                /* Found a CRTC on this fb, now find encoders */
                list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
                        if (encoder->crtc == crtc) {
@@ -352,8 +434,9 @@ static void drm_fb_helper_off(struct fb_info *info, int dpms_mode)
        struct drm_device *dev = fb_helper->dev;
        struct drm_crtc *crtc;
        struct drm_crtc_helper_funcs *crtc_funcs;
+        struct drm_connector *connector;
        struct drm_encoder *encoder;
-        int i;
+        int i, j;
        /*
         * For each CRTC in this fb, find all associated encoders
@@ -367,6 +450,14 @@ static void drm_fb_helper_off(struct fb_info *info, int dpms_mode)
                if (!crtc->enabled)
                        continue;
+                /* Walk the connectors on this fb and mark them off */
+                for (j = 0; j < fb_helper->connector_count; j++) {
+                        connector = fb_helper->connector_info[j]->connector;
+                        connector->dpms = dpms_mode;
+                        drm_connector_property_set_value(connector,
+                                                         dev->mode_config.dpms_property,
+                                                         dpms_mode);
+                }
                /* Found a CRTC on this fb, now find encoders */
                list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
                        if (encoder->crtc == crtc) {
@@ -594,7 +685,7 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
        struct drm_framebuffer *fb = fb_helper->fb;
        int depth;
-        if (var->pixclock != 0)
+        if (var->pixclock != 0 || in_dbg_master())
                return -EINVAL;
        /* Need to resize the fb object !!! */
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index e7aace20981f..2ca8df8b6102 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -39,6 +39,9 @@
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
+/* from BKL pushdown: note that nothing else serializes idr_find() */
+DEFINE_MUTEX(drm_global_mutex);
 static int drm_open_helper(struct inode *inode, struct file *filp,
                           struct drm_device * dev);
@@ -175,8 +178,7 @@ int drm_stub_open(struct inode *inode, struct file *filp)
        DRM_DEBUG("\n");
-        /* BKL pushdown: note that nothing else serializes idr_find() */
+        mutex_lock(&drm_global_mutex);
-        lock_kernel();
        minor = idr_find(&drm_minors_idr, minor_id);
        if (!minor)
                goto out;
@@ -197,7 +199,7 @@ int drm_stub_open(struct inode *inode, struct file *filp)
        fops_put(old_fops);
 out:
-        unlock_kernel();
+        mutex_unlock(&drm_global_mutex);
        return err;
 }
@@ -472,7 +474,7 @@ int drm_release(struct inode *inode, struct file *filp)
        struct drm_device *dev = file_priv->minor->dev;
        int retcode = 0;
-        lock_kernel();
+        mutex_lock(&drm_global_mutex);
        DRM_DEBUG("open_count = %d\n", dev->open_count);
@@ -573,17 +575,14 @@ int drm_release(struct inode *inode, struct file *filp)
                if (atomic_read(&dev->ioctl_count)) {
                        DRM_ERROR("Device busy: %d\n",
                                  atomic_read(&dev->ioctl_count));
-                        spin_unlock(&dev->count_lock);
+                        retcode = -EBUSY;
-                        unlock_kernel();
+                        goto out;
-                        return -EBUSY;
                }
-                spin_unlock(&dev->count_lock);
+                retcode = drm_lastclose(dev);
-                unlock_kernel();
-                return drm_lastclose(dev);
        }
+out:
        spin_unlock(&dev->count_lock);
+        mutex_unlock(&drm_global_mutex);
-        unlock_kernel();
        return retcode;
 }
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 33dad3fa6043..4f1b86714489 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -68,8 +68,18 @@
 * We make up offsets for buffer objects so we can recognize them at
 * mmap time.
 */
+/* pgoff in mmap is an unsigned long, so we need to make sure that
+ * the faked up offset will fit
+ */
+#if BITS_PER_LONG == 64
 #define DRM_FILE_PAGE_OFFSET_START ((0xFFFFFFFFUL >> PAGE_SHIFT) + 1)
 #define DRM_FILE_PAGE_OFFSET_SIZE ((0xFFFFFFFFUL >> PAGE_SHIFT) * 16)
+#else
+#define DRM_FILE_PAGE_OFFSET_START ((0xFFFFFFFUL >> PAGE_SHIFT) + 1)
+#define DRM_FILE_PAGE_OFFSET_SIZE ((0xFFFFFFFUL >> PAGE_SHIFT) * 16)
+#endif
 /**
 * Initialize the GEM device fields
@@ -419,6 +429,7 @@ drm_gem_release(struct drm_device *dev, struct drm_file *file_private)
        idr_for_each(&file_private->object_idr,
                     &drm_gem_object_release_handle, NULL);
+        idr_remove_all(&file_private->object_idr);
        idr_destroy(&file_private->object_idr);
 }
diff --git a/drivers/gpu/drm/ttm/ttm_global.c b/drivers/gpu/drm/drm_global.c
index b17007178a36..c87dc96444de 100644
--- a/drivers/gpu/drm/ttm/ttm_global.c
+++ b/drivers/gpu/drm/drm_global.c
@@ -28,45 +28,45 @@
 * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
 */
-#include "ttm/ttm_module.h"
 #include <linux/mutex.h>
 #include <linux/slab.h>
 #include <linux/module.h>
+#include "drm_global.h"
-struct ttm_global_item {
+struct drm_global_item {
        struct mutex mutex;
        void *object;
        int refcount;
 };
-static struct ttm_global_item glob[TTM_GLOBAL_NUM];
+static struct drm_global_item glob[DRM_GLOBAL_NUM];
-void ttm_global_init(void)
+void drm_global_init(void)
 {
        int i;
-        for (i = 0; i < TTM_GLOBAL_NUM; ++i) {
+        for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
-                struct ttm_global_item *item = &glob[i];
+                struct drm_global_item *item = &glob[i];
                mutex_init(&item->mutex);
                item->object = NULL;
                item->refcount = 0;
        }
 }
-void ttm_global_release(void)
+void drm_global_release(void)
 {
        int i;
-        for (i = 0; i < TTM_GLOBAL_NUM; ++i) {
+        for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
-                struct ttm_global_item *item = &glob[i];
+                struct drm_global_item *item = &glob[i];
                BUG_ON(item->object != NULL);
                BUG_ON(item->refcount != 0);
        }
 }
-int ttm_global_item_ref(struct ttm_global_reference *ref)
+int drm_global_item_ref(struct drm_global_reference *ref)
 {
        int ret;
-        struct ttm_global_item *item = &glob[ref->global_type];
+        struct drm_global_item *item = &glob[ref->global_type];
        void *object;
        mutex_lock(&item->mutex);
@@ -93,11 +93,11 @@ out_err:
        item->object = NULL;
        return ret;
 }
-EXPORT_SYMBOL(ttm_global_item_ref);
+EXPORT_SYMBOL(drm_global_item_ref);
-void ttm_global_item_unref(struct ttm_global_reference *ref)
+void drm_global_item_unref(struct drm_global_reference *ref)
 {
-        struct ttm_global_item *item = &glob[ref->global_type];
+        struct drm_global_item *item = &glob[ref->global_type];
        mutex_lock(&item->mutex);
        BUG_ON(item->refcount == 0);
@@ -108,5 +108,5 @@ void ttm_global_item_unref(struct ttm_global_reference *ref)
        }
        mutex_unlock(&item->mutex);
 }
-EXPORT_SYMBOL(ttm_global_item_unref);
+EXPORT_SYMBOL(drm_global_item_unref);
diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
index f0f6c6b93f3a..2ef2c7827243 100644
--- a/drivers/gpu/drm/drm_info.c
+++ b/drivers/gpu/drm/drm_info.c
@@ -51,13 +51,24 @@ int drm_name_info(struct seq_file *m, void *data)
        if (!master)
                return 0;
-        if (master->unique) {
+        if (drm_core_check_feature(dev, DRIVER_USE_PLATFORM_DEVICE)) {
-                seq_printf(m, "%s %s %s\n",
+                if (master->unique) {
-                           dev->driver->pci_driver.name,
+                        seq_printf(m, "%s %s %s\n",
-                           pci_name(dev->pdev), master->unique);
+                                        dev->driver->platform_device->name,
+                                        dev_name(dev->dev), master->unique);
+                } else {
+                        seq_printf(m, "%s\n",
+                                dev->driver->platform_device->name);
+                }
        } else {
-                seq_printf(m, "%s %s\n", dev->driver->pci_driver.name,
+                if (master->unique) {
-                           pci_name(dev->pdev));
+                        seq_printf(m, "%s %s %s\n",
+                                dev->driver->pci_driver.name,
+                                dev_name(dev->dev), master->unique);
+                } else {
+                        seq_printf(m, "%s %s\n", dev->driver->pci_driver.name,
+                                dev_name(dev->dev));
+                }
        }
        return 0;
diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
index 9b9ff46c2378..7b03b197fc00 100644
--- a/drivers/gpu/drm/drm_ioctl.c
+++ b/drivers/gpu/drm/drm_ioctl.c
@@ -64,6 +64,19 @@ int drm_getunique(struct drm_device *dev, void *data,
        return 0;
 }
+static void
+drm_unset_busid(struct drm_device *dev,
+                struct drm_master *master)
+{
+        kfree(dev->devname);
+        dev->devname = NULL;
+        kfree(master->unique);
+        master->unique = NULL;
+        master->unique_len = 0;
+        master->unique_size = 0;
+}
 /**
 * Set the bus id.
 *
@@ -94,17 +107,24 @@ int drm_setunique(struct drm_device *dev, void *data,
        master->unique_len = u->unique_len;
        master->unique_size = u->unique_len + 1;
        master->unique = kmalloc(master->unique_size, GFP_KERNEL);
-        if (!master->unique)
+        if (!master->unique) {
-                return -ENOMEM;
+                ret = -ENOMEM;
-        if (copy_from_user(master->unique, u->unique, master->unique_len))
+                goto err;
-                return -EFAULT;
+        }
+        if (copy_from_user(master->unique, u->unique, master->unique_len)) {
+                ret = -EFAULT;
+                goto err;
+        }
        master->unique[master->unique_len] = '\0';
        dev->devname = kmalloc(strlen(dev->driver->pci_driver.name) +
                               strlen(master->unique) + 2, GFP_KERNEL);
-        if (!dev->devname)
+        if (!dev->devname) {
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto err;
+        }
        sprintf(dev->devname, "%s@%s", dev->driver->pci_driver.name,
                master->unique);
@@ -113,53 +133,103 @@ int drm_setunique(struct drm_device *dev, void *data,
         * busid.
         */
        ret = sscanf(master->unique, "PCI:%d:%d:%d", &bus, &slot, &func);
-        if (ret != 3)
+        if (ret != 3) {
-                return -EINVAL;
+                ret = -EINVAL;
+                goto err;
+        }
        domain = bus >> 8;
        bus &= 0xff;
        if ((domain != drm_get_pci_domain(dev)) ||
            (bus != dev->pdev->bus->number) ||
            (slot != PCI_SLOT(dev->pdev->devfn)) ||
-            (func != PCI_FUNC(dev->pdev->devfn)))
+            (func != PCI_FUNC(dev->pdev->devfn))) {
-                return -EINVAL;
+                ret = -EINVAL;
+                goto err;
+        }
        return 0;
+err:
+        drm_unset_busid(dev, master);
+        return ret;
 }
 static int drm_set_busid(struct drm_device *dev, struct drm_file *file_priv)
 {
        struct drm_master *master = file_priv->master;
-        int len;
+        int len, ret;
        if (master->unique != NULL)
-                return -EBUSY;
+                drm_unset_busid(dev, master);
-        master->unique_len = 40;
+        if (drm_core_check_feature(dev, DRIVER_USE_PLATFORM_DEVICE)) {
-        master->unique_size = master->unique_len;
+                master->unique_len = 10 + strlen(dev->platformdev->name);
-        master->unique = kmalloc(master->unique_size, GFP_KERNEL);
+                master->unique = kmalloc(master->unique_len + 1, GFP_KERNEL);
-        if (master->unique == NULL)
-                return -ENOMEM;
-        len = snprintf(master->unique, master->unique_len, "pci:%04x:%02x:%02x.%d",
-                       drm_get_pci_domain(dev),
-                       dev->pdev->bus->number,
-                       PCI_SLOT(dev->pdev->devfn),
-                       PCI_FUNC(dev->pdev->devfn));
-        if (len >= master->unique_len)
-                DRM_ERROR("buffer overflow");
-        else
-                master->unique_len = len;
-        dev->devname = kmalloc(strlen(dev->driver->pci_driver.name) +
+                if (master->unique == NULL)
-                               master->unique_len + 2, GFP_KERNEL);
+                        return -ENOMEM;
-        if (dev->devname == NULL)
-                return -ENOMEM;
-        sprintf(dev->devname, "%s@%s", dev->driver->pci_driver.name,
+                len = snprintf(master->unique, master->unique_len,
-                master->unique);
+                        "platform:%s", dev->platformdev->name);
+                if (len > master->unique_len) {
+                        DRM_ERROR("Unique buffer overflowed\n");
+                        ret = -EINVAL;
+                        goto err;
+                }
+                dev->devname =
+                        kmalloc(strlen(dev->platformdev->name) +
+                                master->unique_len + 2, GFP_KERNEL);
+                if (dev->devname == NULL) {
+                        ret = -ENOMEM;
+                        goto err;
+                }
+                sprintf(dev->devname, "%s@%s", dev->platformdev->name,
+                        master->unique);
+        } else {
+                master->unique_len = 40;
+                master->unique_size = master->unique_len;
+                master->unique = kmalloc(master->unique_size, GFP_KERNEL);
+                if (master->unique == NULL)
+                        return -ENOMEM;
+                len = snprintf(master->unique, master->unique_len,
+                        "pci:%04x:%02x:%02x.%d",
+                        drm_get_pci_domain(dev),
+                        dev->pdev->bus->number,
+                        PCI_SLOT(dev->pdev->devfn),
+                        PCI_FUNC(dev->pdev->devfn));
+                if (len >= master->unique_len) {
+                        DRM_ERROR("buffer overflow");
+                        ret = -EINVAL;
+                        goto err;
+                } else
+                        master->unique_len = len;
+                dev->devname =
+                        kmalloc(strlen(dev->driver->pci_driver.name) +
+                                master->unique_len + 2, GFP_KERNEL);
+                if (dev->devname == NULL) {
+                        ret = -ENOMEM;
+                        goto err;
+                }
+                sprintf(dev->devname, "%s@%s", dev->driver->pci_driver.name,
+                        master->unique);
+        }
        return 0;
+err:
+        drm_unset_busid(dev, master);
+        return ret;
 }
 /**
@@ -323,7 +393,9 @@ int drm_setversion(struct drm_device *dev, void *data, struct drm_file *file_pri
                        /*
                         * Version 1.1 includes tying of DRM to specific device
                         */
-                        drm_set_busid(dev, file_priv);
+                        retcode = drm_set_busid(dev, file_priv);
+                        if (retcode)
+                                goto done;
                }
        }
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index a263b7070fc6..9d3a5030b6e1 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -34,6 +34,7 @@
 */
 #include "drmP.h"
+#include "drm_trace.h"
 #include <linux/interrupt.h>    /* For task queue support */
 #include <linux/slab.h>
@@ -57,6 +58,9 @@ int drm_irq_by_busid(struct drm_device *dev, void *data,
 {
        struct drm_irq_busid *p = data;
+        if (drm_core_check_feature(dev, DRIVER_USE_PLATFORM_DEVICE))
+                return -EINVAL;
        if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
                return -EINVAL;
@@ -211,7 +215,7 @@ int drm_irq_install(struct drm_device *dev)
        if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
                return -EINVAL;
-        if (dev->pdev->irq == 0)
+        if (drm_dev_to_irq(dev) == 0)
                return -EINVAL;
        mutex_lock(&dev->struct_mutex);
@@ -229,7 +233,7 @@ int drm_irq_install(struct drm_device *dev)
        dev->irq_enabled = 1;
        mutex_unlock(&dev->struct_mutex);
-        DRM_DEBUG("irq=%d\n", dev->pdev->irq);
+        DRM_DEBUG("irq=%d\n", drm_dev_to_irq(dev));
        /* Before installing handler */
        dev->driver->irq_preinstall(dev);
@@ -302,14 +306,14 @@ int drm_irq_uninstall(struct drm_device * dev)
        if (!irq_enabled)
                return -EINVAL;
-        DRM_DEBUG("irq=%d\n", dev->pdev->irq);
+        DRM_DEBUG("irq=%d\n", drm_dev_to_irq(dev));
        if (!drm_core_check_feature(dev, DRIVER_MODESET))
                vga_client_register(dev->pdev, NULL, NULL, NULL);
        dev->driver->irq_uninstall(dev);
-        free_irq(dev->pdev->irq, dev);
+        free_irq(drm_dev_to_irq(dev), dev);
        return 0;
 }
@@ -341,7 +345,7 @@ int drm_control(struct drm_device *dev, void *data,
                if (drm_core_check_feature(dev, DRIVER_MODESET))
                        return 0;
                if (dev->if_version < DRM_IF_VERSION(1, 2) &&
-                    ctl->irq != dev->pdev->irq)
+                    ctl->irq != drm_dev_to_irq(dev))
                        return -EINVAL;
                return drm_irq_install(dev);
        case DRM_UNINST_HANDLER:
@@ -587,6 +591,7 @@ static int drm_queue_vblank_event(struct drm_device *dev, int pipe,
                return -ENOMEM;
        e->pipe = pipe;
+        e->base.pid = current->pid;
        e->event.base.type = DRM_EVENT_VBLANK;
        e->event.base.length = sizeof e->event;
        e->event.user_data = vblwait->request.signal;
@@ -614,6 +619,9 @@ static int drm_queue_vblank_event(struct drm_device *dev, int pipe,
        DRM_DEBUG("event on vblank count %d, current %d, crtc %d\n",
                  vblwait->request.sequence, seq, pipe);
+        trace_drm_vblank_event_queued(current->pid, pipe,
+                                      vblwait->request.sequence);
        e->event.sequence = vblwait->request.sequence;
        if ((seq - vblwait->request.sequence) <= (1 << 23)) {
                e->event.tv_sec = now.tv_sec;
@@ -621,6 +629,8 @@ static int drm_queue_vblank_event(struct drm_device *dev, int pipe,
                drm_vblank_put(dev, e->pipe);
                list_add_tail(&e->base.link, &e->base.file_priv->event_list);
                wake_up_interruptible(&e->base.file_priv->event_wait);
+                trace_drm_vblank_event_delivered(current->pid, pipe,
+                                                 vblwait->request.sequence);
        } else {
                list_add_tail(&e->base.link, &dev->vblank_event_list);
        }
@@ -651,7 +661,7 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
        int ret = 0;
        unsigned int flags, seq, crtc;
-        if ((!dev->pdev->irq) || (!dev->irq_enabled))
+        if ((!drm_dev_to_irq(dev)) || (!dev->irq_enabled))
                return -EINVAL;
        if (vblwait->request.type & _DRM_VBLANK_SIGNAL)
@@ -751,9 +761,13 @@ void drm_handle_vblank_events(struct drm_device *dev, int crtc)
                drm_vblank_put(dev, e->pipe);
                list_move_tail(&e->base.link, &e->base.file_priv->event_list);
                wake_up_interruptible(&e->base.file_priv->event_wait);
+                trace_drm_vblank_event_delivered(e->base.pid, e->pipe,
+                                                 e->event.sequence);
        }
        spin_unlock_irqrestore(&dev->event_lock, flags);
+        trace_drm_vblank_event(crtc, seq);
 }
 /**
diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
index 2ac074c8f5d2..da99edc50888 100644
--- a/drivers/gpu/drm/drm_mm.c
+++ b/drivers/gpu/drm/drm_mm.c
@@ -48,44 +48,14 @@
 #define MM_UNUSED_TARGET 4
-unsigned long drm_mm_tail_space(struct drm_mm *mm)
-{
-        struct list_head *tail_node;
-        struct drm_mm_node *entry;
-        tail_node = mm->ml_entry.prev;
-        entry = list_entry(tail_node, struct drm_mm_node, ml_entry);
-        if (!entry->free)
-                return 0;
-        return entry->size;
-}
-int drm_mm_remove_space_from_tail(struct drm_mm *mm, unsigned long size)
-{
-        struct list_head *tail_node;
-        struct drm_mm_node *entry;
-        tail_node = mm->ml_entry.prev;
-        entry = list_entry(tail_node, struct drm_mm_node, ml_entry);
-        if (!entry->free)
-                return -ENOMEM;
-        if (entry->size <= size)
-                return -ENOMEM;
-        entry->size -= size;
-        return 0;
-}
 static struct drm_mm_node *drm_mm_kmalloc(struct drm_mm *mm, int atomic)
 {
        struct drm_mm_node *child;
        if (atomic)
-                child = kmalloc(sizeof(*child), GFP_ATOMIC);
+                child = kzalloc(sizeof(*child), GFP_ATOMIC);
        else
-                child = kmalloc(sizeof(*child), GFP_KERNEL);
+                child = kzalloc(sizeof(*child), GFP_KERNEL);
        if (unlikely(child == NULL)) {
                spin_lock(&mm->unused_lock);
@@ -94,8 +64,8 @@ static struct drm_mm_node *drm_mm_kmalloc(struct drm_mm *mm, int atomic)
                else {
                        child =
                            list_entry(mm->unused_nodes.next,
-                                       struct drm_mm_node, fl_entry);
+                                       struct drm_mm_node, free_stack);
-                        list_del(&child->fl_entry);
+                        list_del(&child->free_stack);
                        --mm->num_unused;
                }
                spin_unlock(&mm->unused_lock);
@@ -115,7 +85,7 @@ int drm_mm_pre_get(struct drm_mm *mm)
        spin_lock(&mm->unused_lock);
        while (mm->num_unused < MM_UNUSED_TARGET) {
                spin_unlock(&mm->unused_lock);
-                node = kmalloc(sizeof(*node), GFP_KERNEL);
+                node = kzalloc(sizeof(*node), GFP_KERNEL);
                spin_lock(&mm->unused_lock);
                if (unlikely(node == NULL)) {
@@ -124,7 +94,7 @@ int drm_mm_pre_get(struct drm_mm *mm)
                        return ret;
                }
                ++mm->num_unused;
-                list_add_tail(&node->fl_entry, &mm->unused_nodes);
+                list_add_tail(&node->free_stack, &mm->unused_nodes);
        }
        spin_unlock(&mm->unused_lock);
        return 0;
@@ -146,27 +116,12 @@ static int drm_mm_create_tail_node(struct drm_mm *mm,
        child->start = start;
        child->mm = mm;
-        list_add_tail(&child->ml_entry, &mm->ml_entry);
+        list_add_tail(&child->node_list, &mm->node_list);
-        list_add_tail(&child->fl_entry, &mm->fl_entry);
+        list_add_tail(&child->free_stack, &mm->free_stack);
        return 0;
 }
-int drm_mm_add_space_to_tail(struct drm_mm *mm, unsigned long size, int atomic)
-{
-        struct list_head *tail_node;
-        struct drm_mm_node *entry;
-        tail_node = mm->ml_entry.prev;
-        entry = list_entry(tail_node, struct drm_mm_node, ml_entry);
-        if (!entry->free) {
-                return drm_mm_create_tail_node(mm, entry->start + entry->size,
-                                               size, atomic);
-        }
-        entry->size += size;
-        return 0;
-}
 static struct drm_mm_node *drm_mm_split_at_start(struct drm_mm_node *parent,
                                                 unsigned long size,
                                                 int atomic)
@@ -177,15 +132,14 @@ static struct drm_mm_node *drm_mm_split_at_start(struct drm_mm_node *parent,
        if (unlikely(child == NULL))
                return NULL;
-        INIT_LIST_HEAD(&child->fl_entry);
+        INIT_LIST_HEAD(&child->free_stack);
-        child->free = 0;
        child->size = size;
        child->start = parent->start;
        child->mm = parent->mm;
-        list_add_tail(&child->ml_entry, &parent->ml_entry);
+        list_add_tail(&child->node_list, &parent->node_list);
-        INIT_LIST_HEAD(&child->fl_entry);
+        INIT_LIST_HEAD(&child->free_stack);
        parent->size -= size;
        parent->start += size;
@@ -213,7 +167,7 @@ struct drm_mm_node *drm_mm_get_block_generic(struct drm_mm_node *node,
        }
        if (node->size == size) {
-                list_del_init(&node->fl_entry);
+                list_del_init(&node->free_stack);
                node->free = 0;
        } else {
                node = drm_mm_split_at_start(node, size, atomic);
@@ -251,7 +205,7 @@ struct drm_mm_node *drm_mm_get_block_range_generic(struct drm_mm_node *node,
        }
        if (node->size == size) {
-                list_del_init(&node->fl_entry);
+                list_del_init(&node->free_stack);
                node->free = 0;
        } else {
                node = drm_mm_split_at_start(node, size, atomic);
@@ -273,16 +227,19 @@ void drm_mm_put_block(struct drm_mm_node *cur)
 {
        struct drm_mm *mm = cur->mm;
-        struct list_head *cur_head = &cur->ml_entry;
+        struct list_head *cur_head = &cur->node_list;
-        struct list_head *root_head = &mm->ml_entry;
+        struct list_head *root_head = &mm->node_list;
        struct drm_mm_node *prev_node = NULL;
        struct drm_mm_node *next_node;
        int merged = 0;
+        BUG_ON(cur->scanned_block || cur->scanned_prev_free
+                                  || cur->scanned_next_free);
        if (cur_head->prev != root_head) {
                prev_node =
-                    list_entry(cur_head->prev, struct drm_mm_node, ml_entry);
+                    list_entry(cur_head->prev, struct drm_mm_node, node_list);
                if (prev_node->free) {
                        prev_node->size += cur->size;
                        merged = 1;
@@ -290,15 +247,15 @@ void drm_mm_put_block(struct drm_mm_node *cur)
        }
        if (cur_head->next != root_head) {
                next_node =
-                    list_entry(cur_head->next, struct drm_mm_node, ml_entry);
+                    list_entry(cur_head->next, struct drm_mm_node, node_list);
                if (next_node->free) {
                        if (merged) {
                                prev_node->size += next_node->size;
-                                list_del(&next_node->ml_entry);
+                                list_del(&next_node->node_list);
-                                list_del(&next_node->fl_entry);
+                                list_del(&next_node->free_stack);
                                spin_lock(&mm->unused_lock);
                                if (mm->num_unused < MM_UNUSED_TARGET) {
-                                        list_add(&next_node->fl_entry,
+                                        list_add(&next_node->free_stack,
                                                 &mm->unused_nodes);
                                        ++mm->num_unused;
                                } else
@@ -313,12 +270,12 @@ void drm_mm_put_block(struct drm_mm_node *cur)
        }
        if (!merged) {
                cur->free = 1;
-                list_add(&cur->fl_entry, &mm->fl_entry);
+                list_add(&cur->free_stack, &mm->free_stack);
        } else {
-                list_del(&cur->ml_entry);
+                list_del(&cur->node_list);
                spin_lock(&mm->unused_lock);
                if (mm->num_unused < MM_UNUSED_TARGET) {
-                        list_add(&cur->fl_entry, &mm->unused_nodes);
+                        list_add(&cur->free_stack, &mm->unused_nodes);
                        ++mm->num_unused;
                } else
                        kfree(cur);
@@ -328,40 +285,50 @@ void drm_mm_put_block(struct drm_mm_node *cur)
 EXPORT_SYMBOL(drm_mm_put_block);
+static int check_free_mm_node(struct drm_mm_node *entry, unsigned long size,
+                              unsigned alignment)
+{
+        unsigned wasted = 0;
+        if (entry->size < size)
+                return 0;
+        if (alignment) {
+                register unsigned tmp = entry->start % alignment;
+                if (tmp)
+                        wasted = alignment - tmp;
+        }
+        if (entry->size >= size + wasted) {
+                return 1;
+        }
+        return 0;
+}
 struct drm_mm_node *drm_mm_search_free(const struct drm_mm *mm,
                                       unsigned long size,
                                       unsigned alignment, int best_match)
 {
-        struct list_head *list;
-        const struct list_head *free_stack = &mm->fl_entry;
        struct drm_mm_node *entry;
        struct drm_mm_node *best;
        unsigned long best_size;
-        unsigned wasted;
+        BUG_ON(mm->scanned_blocks);
        best = NULL;
        best_size = ~0UL;
-        list_for_each(list, free_stack) {
+        list_for_each_entry(entry, &mm->free_stack, free_stack) {
-                entry = list_entry(list, struct drm_mm_node, fl_entry);
+                if (!check_free_mm_node(entry, size, alignment))
-                wasted = 0;
-                if (entry->size < size)
                        continue;
-                if (alignment) {
+                if (!best_match)
-                        register unsigned tmp = entry->start % alignment;
+                        return entry;
-                        if (tmp)
-                                wasted += alignment - tmp;
-                }
-                if (entry->size >= size + wasted) {
+                if (entry->size < best_size) {
-                        if (!best_match)
+                        best = entry;
-                                return entry;
+                        best_size = entry->size;
-                        if (entry->size < best_size) {
-                                best = entry;
-                                best_size = entry->size;
-                        }
                }
        }
@@ -376,43 +343,28 @@ struct drm_mm_node *drm_mm_search_free_in_range(const struct drm_mm *mm,
                                                unsigned long end,
                                                int best_match)
 {
-        struct list_head *list;
-        const struct list_head *free_stack = &mm->fl_entry;
        struct drm_mm_node *entry;
        struct drm_mm_node *best;
        unsigned long best_size;
-        unsigned wasted;
+        BUG_ON(mm->scanned_blocks);
        best = NULL;
        best_size = ~0UL;
-        list_for_each(list, free_stack) {
+        list_for_each_entry(entry, &mm->free_stack, free_stack) {
-                entry = list_entry(list, struct drm_mm_node, fl_entry);
-                wasted = 0;
-                if (entry->size < size)
-                        continue;
                if (entry->start > end || (entry->start+entry->size) < start)
                        continue;
-                if (entry->start < start)
+                if (!check_free_mm_node(entry, size, alignment))
-                        wasted += start - entry->start;
+                        continue;
-                if (alignment) {
+                if (!best_match)
-                        register unsigned tmp = (entry->start + wasted) % alignment;
+                        return entry;
-                        if (tmp)
-                                wasted += alignment - tmp;
-                }
-                if (entry->size >= size + wasted &&
+                if (entry->size < best_size) {
-                    (entry->start + wasted + size) <= end) {
+                        best = entry;
-                        if (!best_match)
+                        best_size = entry->size;
-                                return entry;
-                        if (entry->size < best_size) {
-                                best = entry;
-                                best_size = entry->size;
-                        }
                }
        }
@@ -420,9 +372,161 @@ struct drm_mm_node *drm_mm_search_free_in_range(const struct drm_mm *mm,
 }
 EXPORT_SYMBOL(drm_mm_search_free_in_range);
+/**
+ * Initializa lru scanning.
+ *
+ * This simply sets up the scanning routines with the parameters for the desired
+ * hole.
+ *
+ * Warning: As long as the scan list is non-empty, no other operations than
+ * adding/removing nodes to/from the scan list are allowed.
+ */
+void drm_mm_init_scan(struct drm_mm *mm, unsigned long size,
+                      unsigned alignment)
+{
+        mm->scan_alignment = alignment;
+        mm->scan_size = size;
+        mm->scanned_blocks = 0;
+        mm->scan_hit_start = 0;
+        mm->scan_hit_size = 0;
+}
+EXPORT_SYMBOL(drm_mm_init_scan);
+/**
+ * Add a node to the scan list that might be freed to make space for the desired
+ * hole.
+ *
+ * Returns non-zero, if a hole has been found, zero otherwise.
+ */
+int drm_mm_scan_add_block(struct drm_mm_node *node)
+{
+        struct drm_mm *mm = node->mm;
+        struct list_head *prev_free, *next_free;
+        struct drm_mm_node *prev_node, *next_node;
+        mm->scanned_blocks++;
+        prev_free = next_free = NULL;
+        BUG_ON(node->free);
+        node->scanned_block = 1;
+        node->free = 1;
+        if (node->node_list.prev != &mm->node_list) {
+                prev_node = list_entry(node->node_list.prev, struct drm_mm_node,
+                                       node_list);
+                if (prev_node->free) {
+                        list_del(&prev_node->node_list);
+                        node->start = prev_node->start;
+                        node->size += prev_node->size;
+                        prev_node->scanned_prev_free = 1;
+                        prev_free = &prev_node->free_stack;
+                }
+        }
+        if (node->node_list.next != &mm->node_list) {
+                next_node = list_entry(node->node_list.next, struct drm_mm_node,
+                                       node_list);
+                if (next_node->free) {
+                        list_del(&next_node->node_list);
+                        node->size += next_node->size;
+                        next_node->scanned_next_free = 1;
+                        next_free = &next_node->free_stack;
+                }
+        }
+        /* The free_stack list is not used for allocated objects, so these two
+         * pointers can be abused (as long as no allocations in this memory
+         * manager happens). */
+        node->free_stack.prev = prev_free;
+        node->free_stack.next = next_free;
+        if (check_free_mm_node(node, mm->scan_size, mm->scan_alignment)) {
+                mm->scan_hit_start = node->start;
+                mm->scan_hit_size = node->size;
+                return 1;
+        }
+        return 0;
+}
+EXPORT_SYMBOL(drm_mm_scan_add_block);
+/**
+ * Remove a node from the scan list.
+ *
+ * Nodes _must_ be removed in the exact same order from the scan list as they
+ * have been added, otherwise the internal state of the memory manager will be
+ * corrupted.
+ *
+ * When the scan list is empty, the selected memory nodes can be freed. An
+ * immediatly following drm_mm_search_free with best_match = 0 will then return
+ * the just freed block (because its at the top of the free_stack list).
+ *
+ * Returns one if this block should be evicted, zero otherwise. Will always
+ * return zero when no hole has been found.
+ */
+int drm_mm_scan_remove_block(struct drm_mm_node *node)
+{
+        struct drm_mm *mm = node->mm;
+        struct drm_mm_node *prev_node, *next_node;
+        mm->scanned_blocks--;
+        BUG_ON(!node->scanned_block);
+        node->scanned_block = 0;
+        node->free = 0;
+        prev_node = list_entry(node->free_stack.prev, struct drm_mm_node,
+                               free_stack);
+        next_node = list_entry(node->free_stack.next, struct drm_mm_node,
+                               free_stack);
+        if (prev_node) {
+                BUG_ON(!prev_node->scanned_prev_free);
+                prev_node->scanned_prev_free = 0;
+                list_add_tail(&prev_node->node_list, &node->node_list);
+                node->start = prev_node->start + prev_node->size;
+                node->size -= prev_node->size;
+        }
+        if (next_node) {
+                BUG_ON(!next_node->scanned_next_free);
+                next_node->scanned_next_free = 0;
+                list_add(&next_node->node_list, &node->node_list);
+                node->size -= next_node->size;
+        }
+        INIT_LIST_HEAD(&node->free_stack);
+        /* Only need to check for containement because start&size for the
+         * complete resulting free block (not just the desired part) is
+         * stored. */
+        if (node->start >= mm->scan_hit_start &&
+            node->start + node->size
+                        <= mm->scan_hit_start + mm->scan_hit_size) {
+                return 1;
+        }
+        return 0;
+}
+EXPORT_SYMBOL(drm_mm_scan_remove_block);
 int drm_mm_clean(struct drm_mm * mm)
 {
-        struct list_head *head = &mm->ml_entry;
+        struct list_head *head = &mm->node_list;
        return (head->next->next == head);
 }
@@ -430,10 +534,11 @@ EXPORT_SYMBOL(drm_mm_clean);
 int drm_mm_init(struct drm_mm * mm, unsigned long start, unsigned long size)
 {
-        INIT_LIST_HEAD(&mm->ml_entry);
+        INIT_LIST_HEAD(&mm->node_list);
-        INIT_LIST_HEAD(&mm->fl_entry);
+        INIT_LIST_HEAD(&mm->free_stack);
        INIT_LIST_HEAD(&mm->unused_nodes);
        mm->num_unused = 0;
+        mm->scanned_blocks = 0;
        spin_lock_init(&mm->unused_lock);
        return drm_mm_create_tail_node(mm, start, size, 0);
@@ -442,25 +547,25 @@ EXPORT_SYMBOL(drm_mm_init);
 void drm_mm_takedown(struct drm_mm * mm)
 {
-        struct list_head *bnode = mm->fl_entry.next;
+        struct list_head *bnode = mm->free_stack.next;
        struct drm_mm_node *entry;
        struct drm_mm_node *next;
-        entry = list_entry(bnode, struct drm_mm_node, fl_entry);
+        entry = list_entry(bnode, struct drm_mm_node, free_stack);
-        if (entry->ml_entry.next != &mm->ml_entry ||
+        if (entry->node_list.next != &mm->node_list ||
-            entry->fl_entry.next != &mm->fl_entry) {
+            entry->free_stack.next != &mm->free_stack) {
                DRM_ERROR("Memory manager not clean. Delaying takedown\n");
                return;
        }
-        list_del(&entry->fl_entry);
+        list_del(&entry->free_stack);
-        list_del(&entry->ml_entry);
+        list_del(&entry->node_list);
        kfree(entry);
        spin_lock(&mm->unused_lock);
-        list_for_each_entry_safe(entry, next, &mm->unused_nodes, fl_entry) {
+        list_for_each_entry_safe(entry, next, &mm->unused_nodes, free_stack) {
-                list_del(&entry->fl_entry);
+                list_del(&entry->free_stack);
                kfree(entry);
                --mm->num_unused;
        }
@@ -475,7 +580,7 @@ void drm_mm_debug_table(struct drm_mm *mm, const char *prefix)
        struct drm_mm_node *entry;
        int total_used = 0, total_free = 0, total = 0;
-        list_for_each_entry(entry, &mm->ml_entry, ml_entry) {
+        list_for_each_entry(entry, &mm->node_list, node_list) {
                printk(KERN_DEBUG "%s 0x%08lx-0x%08lx: %8ld: %s\n",
                        prefix, entry->start, entry->start + entry->size,
                        entry->size, entry->free ? "free" : "used");
@@ -496,7 +601,7 @@ int drm_mm_dump_table(struct seq_file *m, struct drm_mm *mm)
        struct drm_mm_node *entry;
        int total_used = 0, total_free = 0, total = 0;
-        list_for_each_entry(entry, &mm->ml_entry, ml_entry) {
+        list_for_each_entry(entry, &mm->node_list, node_list) {
                seq_printf(m, "0x%08lx-0x%08lx: 0x%08lx: %s\n", entry->start, entry->start + entry->size, entry->size, entry->free ? "free" : "used");
                total += entry->size;
                if (entry->free)
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index 2ea9ad4a8d69..e20f78b542a7 100644
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -124,4 +124,147 @@ void drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah)
 EXPORT_SYMBOL(drm_pci_free);
+#ifdef CONFIG_PCI
+/**
+ * Register.
+ *
+ * \param pdev - PCI device structure
+ * \param ent entry from the PCI ID table with device type flags
+ * \return zero on success or a negative number on failure.
+ *
+ * Attempt to gets inter module "drm" information. If we are first
+ * then register the character device and inter module information.
+ * Try and register, if we fail to register, backout previous work.
+ */
+int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
+                    struct drm_driver *driver)
+{
+        struct drm_device *dev;
+        int ret;
+        DRM_DEBUG("\n");
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+        if (!dev)
+                return -ENOMEM;
+        ret = pci_enable_device(pdev);
+        if (ret)
+                goto err_g1;
+        pci_set_master(pdev);
+        dev->pdev = pdev;
+        dev->dev = &pdev->dev;
+        dev->pci_device = pdev->device;
+        dev->pci_vendor = pdev->vendor;
+#ifdef __alpha__
+        dev->hose = pdev->sysdata;
+#endif
+        if ((ret = drm_fill_in_dev(dev, ent, driver))) {
+                printk(KERN_ERR "DRM: Fill_in_dev failed.\n");
+                goto err_g2;
+        }
+        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+                pci_set_drvdata(pdev, dev);
+                ret = drm_get_minor(dev, &dev->control, DRM_MINOR_CONTROL);
+                if (ret)
+                        goto err_g2;
+        }
+        if ((ret = drm_get_minor(dev, &dev->primary, DRM_MINOR_LEGACY)))
+                goto err_g3;
+        if (dev->driver->load) {
+                ret = dev->driver->load(dev, ent->driver_data);
+                if (ret)
+                        goto err_g4;
+        }
+        /* setup the grouping for the legacy output */
+        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+                ret = drm_mode_group_init_legacy_group(dev,
+                                                &dev->primary->mode_group);
+                if (ret)
+                        goto err_g4;
+        }
+        list_add_tail(&dev->driver_item, &driver->device_list);
+        DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n",
+                 driver->name, driver->major, driver->minor, driver->patchlevel,
+                 driver->date, pci_name(pdev), dev->primary->index);
+        return 0;
+err_g4:
+        drm_put_minor(&dev->primary);
+err_g3:
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                drm_put_minor(&dev->control);
+err_g2:
+        pci_disable_device(pdev);
+err_g1:
+        kfree(dev);
+        return ret;
+}
+EXPORT_SYMBOL(drm_get_pci_dev);
+/**
+ * PCI device initialization. Called via drm_init at module load time,
+ *
+ * \return zero on success or a negative number on failure.
+ *
+ * Initializes a drm_device structures,registering the
+ * stubs and initializing the AGP device.
+ *
+ * Expands the \c DRIVER_PREINIT and \c DRIVER_POST_INIT macros before and
+ * after the initialization for driver customization.
+ */
+int drm_pci_init(struct drm_driver *driver)
+{
+        struct pci_dev *pdev = NULL;
+        const struct pci_device_id *pid;
+        int i;
+        if (driver->driver_features & DRIVER_MODESET)
+                return pci_register_driver(&driver->pci_driver);
+        /* If not using KMS, fall back to stealth mode manual scanning. */
+        for (i = 0; driver->pci_driver.id_table[i].vendor != 0; i++) {
+                pid = &driver->pci_driver.id_table[i];
+                /* Loop around setting up a DRM device for each PCI device
+                 * matching our ID and device class.  If we had the internal
+                 * function that pci_get_subsys and pci_get_class used, we'd
+                 * be able to just pass pid in instead of doing a two-stage
+                 * thing.
+                 */
+                pdev = NULL;
+                while ((pdev =
+                        pci_get_subsys(pid->vendor, pid->device, pid->subvendor,
+                                       pid->subdevice, pdev)) != NULL) {
+                        if ((pdev->class & pid->class_mask) != pid->class)
+                                continue;
+                        /* stealth mode requires a manual probe */
+                        pci_dev_get(pdev);
+                        drm_get_pci_dev(pdev, pid, driver);
+                }
+        }
+        return 0;
+}
+#else
+int drm_pci_init(struct drm_driver *driver)
+{
+        return -1;
+}
+#endif
 /*@}*/
diff --git a/drivers/gpu/drm/drm_platform.c b/drivers/gpu/drm/drm_platform.c
new file mode 100644
index 000000000000..460e9a3afa8d
--- /dev/null
+++ b/drivers/gpu/drm/drm_platform.c
@@ -0,0 +1,122 @@
+/*
+ * Derived from drm_pci.c
+ *
+ * Copyright 2003 José Fonseca.
+ * Copyright 2003 Leif Delgass.
+ * Copyright (c) 2009, Code Aurora Forum.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+#include "drmP.h"
+/**
+ * Register.
+ *
+ * \param platdev - Platform device struture
+ * \return zero on success or a negative number on failure.
+ *
+ * Attempt to gets inter module "drm" information. If we are first
+ * then register the character device and inter module information.
+ * Try and register, if we fail to register, backout previous work.
+ */
+int drm_get_platform_dev(struct platform_device *platdev,
+                         struct drm_driver *driver)
+{
+        struct drm_device *dev;
+        int ret;
+        DRM_DEBUG("\n");
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+        if (!dev)
+                return -ENOMEM;
+        dev->platformdev = platdev;
+        dev->dev = &platdev->dev;
+        ret = drm_fill_in_dev(dev, NULL, driver);
+        if (ret) {
+                printk(KERN_ERR "DRM: Fill_in_dev failed.\n");
+                goto err_g1;
+        }
+        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+                dev_set_drvdata(&platdev->dev, dev);
+                ret = drm_get_minor(dev, &dev->control, DRM_MINOR_CONTROL);
+                if (ret)
+                        goto err_g1;
+        }
+        ret = drm_get_minor(dev, &dev->primary, DRM_MINOR_LEGACY);
+        if (ret)
+                goto err_g2;
+        if (dev->driver->load) {
+                ret = dev->driver->load(dev, 0);
+                if (ret)
+                        goto err_g3;
+        }
+        /* setup the grouping for the legacy output */
+        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+                ret = drm_mode_group_init_legacy_group(dev,
+                                &dev->primary->mode_group);
+                if (ret)
+                        goto err_g3;
+        }
+        list_add_tail(&dev->driver_item, &driver->device_list);
+        DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
+                 driver->name, driver->major, driver->minor, driver->patchlevel,
+                 driver->date, dev->primary->index);
+        return 0;
+err_g3:
+        drm_put_minor(&dev->primary);
+err_g2:
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                drm_put_minor(&dev->control);
+err_g1:
+        kfree(dev);
+        return ret;
+}
+EXPORT_SYMBOL(drm_get_platform_dev);
+/**
+ * Platform device initialization. Called via drm_init at module load time,
+ *
+ * \return zero on success or a negative number on failure.
+ *
+ * Initializes a drm_device structures,registering the
+ * stubs
+ *
+ * Expands the \c DRIVER_PREINIT and \c DRIVER_POST_INIT macros before and
+ * after the initialization for driver customization.
+ */
+int drm_platform_init(struct drm_driver *driver)
+{
+        return drm_get_platform_dev(driver->platform_device, driver);
+}
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index a0c365f2e521..d1ad57450df1 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -156,6 +156,9 @@ static void drm_master_destroy(struct kref *kref)
                master->unique_len = 0;
        }
+        kfree(dev->devname);
+        dev->devname = NULL;
        list_for_each_entry_safe(pt, next, &master->magicfree, head) {
                list_del(&pt->head);
                drm_ht_remove_item(&master->magiclist, &pt->hash_item);
@@ -224,7 +227,7 @@ int drm_dropmaster_ioctl(struct drm_device *dev, void *data,
        return 0;
 }
-static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
+int drm_fill_in_dev(struct drm_device *dev,
                           const struct pci_device_id *ent,
                           struct drm_driver *driver)
 {
@@ -245,14 +248,6 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
        idr_init(&dev->drw_idr);
-        dev->pdev = pdev;
-        dev->pci_device = pdev->device;
-        dev->pci_vendor = pdev->vendor;
-#ifdef __alpha__
-        dev->hose = pdev->sysdata;
-#endif
        if (drm_ht_create(&dev->map_hash, 12)) {
                return -ENOMEM;
        }
@@ -321,7 +316,7 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
 * create the proc init entry via proc_init(). This routines assigns
 * minor numbers to secondary heads of multi-headed cards
 */
-static int drm_get_minor(struct drm_device *dev, struct drm_minor **minor, int type)
+int drm_get_minor(struct drm_device *dev, struct drm_minor **minor, int type)
 {
        struct drm_minor *new_minor;
        int ret;
@@ -388,83 +383,6 @@ err_idr:
 }
 /**
- * Register.
- *
- * \param pdev - PCI device structure
- * \param ent entry from the PCI ID table with device type flags
- * \return zero on success or a negative number on failure.
- *
- * Attempt to gets inter module "drm" information. If we are first
- * then register the character device and inter module information.
- * Try and register, if we fail to register, backout previous work.
- */
-int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
-                struct drm_driver *driver)
-{
-        struct drm_device *dev;
-        int ret;
-        DRM_DEBUG("\n");
-        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-        if (!dev)
-                return -ENOMEM;
-        ret = pci_enable_device(pdev);
-        if (ret)
-                goto err_g1;
-        pci_set_master(pdev);
-        if ((ret = drm_fill_in_dev(dev, pdev, ent, driver))) {
-                printk(KERN_ERR "DRM: Fill_in_dev failed.\n");
-                goto err_g2;
-        }
-        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
-                pci_set_drvdata(pdev, dev);
-                ret = drm_get_minor(dev, &dev->control, DRM_MINOR_CONTROL);
-                if (ret)
-                        goto err_g2;
-        }
-        if ((ret = drm_get_minor(dev, &dev->primary, DRM_MINOR_LEGACY)))
-                goto err_g3;
-        if (dev->driver->load) {
-                ret = dev->driver->load(dev, ent->driver_data);
-                if (ret)
-                        goto err_g4;
-        }
-        /* setup the grouping for the legacy output */
-        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
-                ret = drm_mode_group_init_legacy_group(dev, &dev->primary->mode_group);
-                if (ret)
-                        goto err_g4;
-        }
-        list_add_tail(&dev->driver_item, &driver->device_list);
-        DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n",
-                 driver->name, driver->major, driver->minor, driver->patchlevel,
-                 driver->date, pci_name(pdev), dev->primary->index);
-        return 0;
-err_g4:
-        drm_put_minor(&dev->primary);
-err_g3:
-        if (drm_core_check_feature(dev, DRIVER_MODESET))
-                drm_put_minor(&dev->control);
-err_g2:
-        pci_disable_device(pdev);
-err_g1:
-        kfree(dev);
-        return ret;
-}
-EXPORT_SYMBOL(drm_get_dev);
-/**
 * Put a secondary minor number.
 *
 * \param sec_minor - structure to be released
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
index 101d381e9d86..86118a742231 100644
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
@@ -489,7 +489,8 @@ int drm_sysfs_device_add(struct drm_minor *minor)
        int err;
        char *minor_str;
-        minor->kdev.parent = &minor->dev->pdev->dev;
+        minor->kdev.parent = minor->dev->dev;
        minor->kdev.class = drm_class;
        minor->kdev.release = drm_sysfs_device_release;
        minor->kdev.devt = minor->device;
diff --git a/drivers/gpu/drm/drm_trace.h b/drivers/gpu/drm/drm_trace.h
new file mode 100644
index 000000000000..03ea964aa604
--- /dev/null
+++ b/drivers/gpu/drm/drm_trace.h
@@ -0,0 +1,66 @@
+#if !defined(_DRM_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ)
+#define _DRM_TRACE_H_
+#include <linux/stringify.h>
+#include <linux/types.h>
+#include <linux/tracepoint.h>
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM drm
+#define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
+#define TRACE_INCLUDE_FILE drm_trace
+TRACE_EVENT(drm_vblank_event,
+            TP_PROTO(int crtc, unsigned int seq),
+            TP_ARGS(crtc, seq),
+            TP_STRUCT__entry(
+                    __field(int, crtc)
+                    __field(unsigned int, seq)
+                    ),
+            TP_fast_assign(
+                    __entry->crtc = crtc;
+                    __entry->seq = seq;
+                    ),
+            TP_printk("crtc=%d, seq=%d", __entry->crtc, __entry->seq)
+);
+TRACE_EVENT(drm_vblank_event_queued,
+            TP_PROTO(pid_t pid, int crtc, unsigned int seq),
+            TP_ARGS(pid, crtc, seq),
+            TP_STRUCT__entry(
+                    __field(pid_t, pid)
+                    __field(int, crtc)
+                    __field(unsigned int, seq)
+                    ),
+            TP_fast_assign(
+                    __entry->pid = pid;
+                    __entry->crtc = crtc;
+                    __entry->seq = seq;
+                    ),
+            TP_printk("pid=%d, crtc=%d, seq=%d", __entry->pid, __entry->crtc, \
+                      __entry->seq)
+);
+TRACE_EVENT(drm_vblank_event_delivered,
+            TP_PROTO(pid_t pid, int crtc, unsigned int seq),
+            TP_ARGS(pid, crtc, seq),
+            TP_STRUCT__entry(
+                    __field(pid_t, pid)
+                    __field(int, crtc)
+                    __field(unsigned int, seq)
+                    ),
+            TP_fast_assign(
+                    __entry->pid = pid;
+                    __entry->crtc = crtc;
+                    __entry->seq = seq;
+                    ),
+            TP_printk("pid=%d, crtc=%d, seq=%d", __entry->pid, __entry->crtc, \
+                      __entry->seq)
+);
+#endif /* _DRM_TRACE_H_ */
+/* This part must be outside protection */
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH .
+#include <trace/define_trace.h>
diff --git a/drivers/gpu/drm/drm_trace_points.c b/drivers/gpu/drm/drm_trace_points.c
new file mode 100644
index 000000000000..0d0eb90864ae
--- /dev/null
+++ b/drivers/gpu/drm/drm_trace_points.c
@@ -0,0 +1,4 @@
+#include "drmP.h"
+#define CREATE_TRACE_POINTS
+#include "drm_trace.h"
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c
index c3b13fb41d0c..3778360eceea 100644
--- a/drivers/gpu/drm/drm_vm.c
+++ b/drivers/gpu/drm/drm_vm.c
@@ -61,7 +61,7 @@ static pgprot_t drm_io_prot(uint32_t map_type, struct vm_area_struct *vma)
                tmp = pgprot_writecombine(tmp);
        else
                tmp = pgprot_noncached(tmp);
-#elif defined(__sparc__)
+#elif defined(__sparc__) || defined(__arm__)
        tmp = pgprot_noncached(tmp);
 #endif
        return tmp;
@@ -601,6 +601,7 @@ int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
        }
        switch (map->type) {
+#if !defined(__arm__)
        case _DRM_AGP:
                if (drm_core_has_AGP(dev) && dev->agp->cant_use_aperture) {
                        /*
@@ -615,20 +616,31 @@ int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
                        break;
                }
                /* fall through to _DRM_FRAME_BUFFER... */
+#endif
        case _DRM_FRAME_BUFFER:
        case _DRM_REGISTERS:
                offset = dev->driver->get_reg_ofs(dev);
                vma->vm_flags |= VM_IO; /* not in core dump */
                vma->vm_page_prot = drm_io_prot(map->type, vma);
+#if !defined(__arm__)
                if (io_remap_pfn_range(vma, vma->vm_start,
                                       (map->offset + offset) >> PAGE_SHIFT,
                                       vma->vm_end - vma->vm_start,
                                       vma->vm_page_prot))
                        return -EAGAIN;
+#else
+                if (remap_pfn_range(vma, vma->vm_start,
+                                        (map->offset + offset) >> PAGE_SHIFT,
+                                        vma->vm_end - vma->vm_start,
+                                        vma->vm_page_prot))
+                        return -EAGAIN;
+#endif
                DRM_DEBUG("   Type = %d; start = 0x%lx, end = 0x%lx,"
                          " offset = 0x%llx\n",
                          map->type,
                          vma->vm_start, vma->vm_end, (unsigned long long)(map->offset + offset));
                vma->vm_ops = &drm_vm_ops;
                break;
        case _DRM_CONSISTENT:
diff --git a/drivers/gpu/drm/i2c/Makefile b/drivers/gpu/drm/i2c/Makefile
index 6d2abaf35ba2..92862563e7ee 100644
--- a/drivers/gpu/drm/i2c/Makefile
+++ b/drivers/gpu/drm/i2c/Makefile
@@ -2,3 +2,6 @@ ccflags-y := -Iinclude/drm
 ch7006-y := ch7006_drv.o ch7006_mode.o
 obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o
+sil164-y := sil164_drv.o
+obj-$(CONFIG_DRM_I2C_SIL164) += sil164.o
diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c
index 81681a07a806..833b35f44a77 100644
--- a/drivers/gpu/drm/i2c/ch7006_drv.c
+++ b/drivers/gpu/drm/i2c/ch7006_drv.c
@@ -33,7 +33,7 @@ static void ch7006_encoder_set_config(struct drm_encoder *encoder,
 {
        struct ch7006_priv *priv = to_ch7006_priv(encoder);
-        priv->params = params;
+        priv->params = *(struct ch7006_encoder_params *)params;
 }
 static void ch7006_encoder_destroy(struct drm_encoder *encoder)
@@ -114,7 +114,7 @@ static void ch7006_encoder_mode_set(struct drm_encoder *encoder,
 {
        struct i2c_client *client = drm_i2c_encoder_get_client(encoder);
        struct ch7006_priv *priv = to_ch7006_priv(encoder);
-        struct ch7006_encoder_params *params = priv->params;
+        struct ch7006_encoder_params *params = &priv->params;
        struct ch7006_state *state = &priv->state;
        uint8_t *regs = state->regs;
        struct ch7006_mode *mode = priv->mode;
@@ -428,6 +428,22 @@ static int ch7006_remove(struct i2c_client *client)
        return 0;
 }
+static int ch7006_suspend(struct i2c_client *client, pm_message_t mesg)
+{
+        ch7006_dbg(client, "\n");
+        return 0;
+}
+static int ch7006_resume(struct i2c_client *client)
+{
+        ch7006_dbg(client, "\n");
+        ch7006_write(client, 0x3d, 0x0);
+        return 0;
+}
 static int ch7006_encoder_init(struct i2c_client *client,
                               struct drm_device *dev,
                               struct drm_encoder_slave *encoder)
@@ -487,6 +503,8 @@ static struct drm_i2c_encoder_driver ch7006_driver = {
        .i2c_driver = {
                .probe = ch7006_probe,
                .remove = ch7006_remove,
+                .suspend = ch7006_suspend,
+                .resume = ch7006_resume,
                .driver = {
                        .name = "ch7006",
diff --git a/drivers/gpu/drm/i2c/ch7006_priv.h b/drivers/gpu/drm/i2c/ch7006_priv.h
index b06d3d93d8ac..1c6d2e3bd96f 100644
--- a/drivers/gpu/drm/i2c/ch7006_priv.h
+++ b/drivers/gpu/drm/i2c/ch7006_priv.h
@@ -77,7 +77,7 @@ struct ch7006_state {
 };
 struct ch7006_priv {
-        struct ch7006_encoder_params *params;
+        struct ch7006_encoder_params params;
        struct ch7006_mode *mode;
        struct ch7006_state state;
diff --git a/drivers/gpu/drm/i2c/sil164_drv.c b/drivers/gpu/drm/i2c/sil164_drv.c
new file mode 100644
index 000000000000..0b6773290c08
--- /dev/null
+++ b/drivers/gpu/drm/i2c/sil164_drv.c
@@ -0,0 +1,462 @@
+/*
+ * Copyright (C) 2010 Francisco Jerez.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+#include "drmP.h"
+#include "drm_crtc_helper.h"
+#include "drm_encoder_slave.h"
+#include "i2c/sil164.h"
+struct sil164_priv {
+        struct sil164_encoder_params config;
+        struct i2c_client *duallink_slave;
+        uint8_t saved_state[0x10];
+        uint8_t saved_slave_state[0x10];
+};
+#define to_sil164_priv(x) \
+        ((struct sil164_priv *)to_encoder_slave(x)->slave_priv)
+#define sil164_dbg(client, format, ...) do {                            \
+                if (drm_debug & DRM_UT_KMS)                             \
+                        dev_printk(KERN_DEBUG, &client->dev,            \
+                                   "%s: " format, __func__, ## __VA_ARGS__); \
+        } while (0)
+#define sil164_info(client, format, ...)                \
+        dev_info(&client->dev, format, __VA_ARGS__)
+#define sil164_err(client, format, ...)                 \
+        dev_err(&client->dev, format, __VA_ARGS__)
+#define SIL164_I2C_ADDR_MASTER                  0x38
+#define SIL164_I2C_ADDR_SLAVE                   0x39
+/* HW register definitions */
+#define SIL164_VENDOR_LO                        0x0
+#define SIL164_VENDOR_HI                        0x1
+#define SIL164_DEVICE_LO                        0x2
+#define SIL164_DEVICE_HI                        0x3
+#define SIL164_REVISION                         0x4
+#define SIL164_FREQ_MIN                         0x6
+#define SIL164_FREQ_MAX                         0x7
+#define SIL164_CONTROL0                         0x8
+#  define SIL164_CONTROL0_POWER_ON              0x01
+#  define SIL164_CONTROL0_EDGE_RISING           0x02
+#  define SIL164_CONTROL0_INPUT_24BIT           0x04
+#  define SIL164_CONTROL0_DUAL_EDGE             0x08
+#  define SIL164_CONTROL0_HSYNC_ON              0x10
+#  define SIL164_CONTROL0_VSYNC_ON              0x20
+#define SIL164_DETECT                           0x9
+#  define SIL164_DETECT_INTR_STAT               0x01
+#  define SIL164_DETECT_HOTPLUG_STAT            0x02
+#  define SIL164_DETECT_RECEIVER_STAT           0x04
+#  define SIL164_DETECT_INTR_MODE_RECEIVER      0x00
+#  define SIL164_DETECT_INTR_MODE_HOTPLUG       0x08
+#  define SIL164_DETECT_OUT_MODE_HIGH           0x00
+#  define SIL164_DETECT_OUT_MODE_INTR           0x10
+#  define SIL164_DETECT_OUT_MODE_RECEIVER       0x20
+#  define SIL164_DETECT_OUT_MODE_HOTPLUG        0x30
+#  define SIL164_DETECT_VSWING_STAT             0x80
+#define SIL164_CONTROL1                         0xa
+#  define SIL164_CONTROL1_DESKEW_ENABLE         0x10
+#  define SIL164_CONTROL1_DESKEW_INCR_SHIFT     5
+#define SIL164_GPIO                             0xb
+#define SIL164_CONTROL2                         0xc
+#  define SIL164_CONTROL2_FILTER_ENABLE         0x01
+#  define SIL164_CONTROL2_FILTER_SETTING_SHIFT  1
+#  define SIL164_CONTROL2_DUALLINK_MASTER       0x40
+#  define SIL164_CONTROL2_SYNC_CONT             0x80
+#define SIL164_DUALLINK                         0xd
+#  define SIL164_DUALLINK_ENABLE                0x10
+#  define SIL164_DUALLINK_SKEW_SHIFT            5
+#define SIL164_PLLZONE                          0xe
+#  define SIL164_PLLZONE_STAT                   0x08
+#  define SIL164_PLLZONE_FORCE_ON               0x10
+#  define SIL164_PLLZONE_FORCE_HIGH             0x20
+/* HW access functions */
+static void
+sil164_write(struct i2c_client *client, uint8_t addr, uint8_t val)
+{
+        uint8_t buf[] = {addr, val};
+        int ret;
+        ret = i2c_master_send(client, buf, ARRAY_SIZE(buf));
+        if (ret < 0)
+                sil164_err(client, "Error %d writing to subaddress 0x%x\n",
+                           ret, addr);
+}
+static uint8_t
+sil164_read(struct i2c_client *client, uint8_t addr)
+{
+        uint8_t val;
+        int ret;
+        ret = i2c_master_send(client, &addr, sizeof(addr));
+        if (ret < 0)
+                goto fail;
+        ret = i2c_master_recv(client, &val, sizeof(val));
+        if (ret < 0)
+                goto fail;
+        return val;
+fail:
+        sil164_err(client, "Error %d reading from subaddress 0x%x\n",
+                   ret, addr);
+        return 0;
+}
+static void
+sil164_save_state(struct i2c_client *client, uint8_t *state)
+{
+        int i;
+        for (i = 0x8; i <= 0xe; i++)
+                state[i] = sil164_read(client, i);
+}
+static void
+sil164_restore_state(struct i2c_client *client, uint8_t *state)
+{
+        int i;
+        for (i = 0x8; i <= 0xe; i++)
+                sil164_write(client, i, state[i]);
+}
+static void
+sil164_set_power_state(struct i2c_client *client, bool on)
+{
+        uint8_t control0 = sil164_read(client, SIL164_CONTROL0);
+        if (on)
+                control0 |= SIL164_CONTROL0_POWER_ON;
+        else
+                control0 &= ~SIL164_CONTROL0_POWER_ON;
+        sil164_write(client, SIL164_CONTROL0, control0);
+}
+static void
+sil164_init_state(struct i2c_client *client,
+                  struct sil164_encoder_params *config,
+                  bool duallink)
+{
+        sil164_write(client, SIL164_CONTROL0,
+                     SIL164_CONTROL0_HSYNC_ON |
+                     SIL164_CONTROL0_VSYNC_ON |
+                     (config->input_edge ? SIL164_CONTROL0_EDGE_RISING : 0) |
+                     (config->input_width ? SIL164_CONTROL0_INPUT_24BIT : 0) |
+                     (config->input_dual ? SIL164_CONTROL0_DUAL_EDGE : 0));
+        sil164_write(client, SIL164_DETECT,
+                     SIL164_DETECT_INTR_STAT |
+                     SIL164_DETECT_OUT_MODE_RECEIVER);
+        sil164_write(client, SIL164_CONTROL1,
+                     (config->input_skew ? SIL164_CONTROL1_DESKEW_ENABLE : 0) |
+                     (((config->input_skew + 4) & 0x7)
+                      << SIL164_CONTROL1_DESKEW_INCR_SHIFT));
+        sil164_write(client, SIL164_CONTROL2,
+                     SIL164_CONTROL2_SYNC_CONT |
+                     (config->pll_filter ? 0 : SIL164_CONTROL2_FILTER_ENABLE) |
+                     (4 << SIL164_CONTROL2_FILTER_SETTING_SHIFT));
+        sil164_write(client, SIL164_PLLZONE, 0);
+        if (duallink)
+                sil164_write(client, SIL164_DUALLINK,
+                             SIL164_DUALLINK_ENABLE |
+                             (((config->duallink_skew + 4) & 0x7)
+                              << SIL164_DUALLINK_SKEW_SHIFT));
+        else
+                sil164_write(client, SIL164_DUALLINK, 0);
+}
+/* DRM encoder functions */
+static void
+sil164_encoder_set_config(struct drm_encoder *encoder, void *params)
+{
+        struct sil164_priv *priv = to_sil164_priv(encoder);
+        priv->config = *(struct sil164_encoder_params *)params;
+}
+static void
+sil164_encoder_dpms(struct drm_encoder *encoder, int mode)
+{
+        struct sil164_priv *priv = to_sil164_priv(encoder);
+        bool on = (mode == DRM_MODE_DPMS_ON);
+        bool duallink = (on && encoder->crtc->mode.clock > 165000);
+        sil164_set_power_state(drm_i2c_encoder_get_client(encoder), on);
+        if (priv->duallink_slave)
+                sil164_set_power_state(priv->duallink_slave, duallink);
+}
+static void
+sil164_encoder_save(struct drm_encoder *encoder)
+{
+        struct sil164_priv *priv = to_sil164_priv(encoder);
+        sil164_save_state(drm_i2c_encoder_get_client(encoder),
+                          priv->saved_state);
+        if (priv->duallink_slave)
+                sil164_save_state(priv->duallink_slave,
+                                  priv->saved_slave_state);
+}
+static void
+sil164_encoder_restore(struct drm_encoder *encoder)
+{
+        struct sil164_priv *priv = to_sil164_priv(encoder);
+        sil164_restore_state(drm_i2c_encoder_get_client(encoder),
+                             priv->saved_state);
+        if (priv->duallink_slave)
+                sil164_restore_state(priv->duallink_slave,
+                                     priv->saved_slave_state);
+}
+static bool
+sil164_encoder_mode_fixup(struct drm_encoder *encoder,
+                          struct drm_display_mode *mode,
+                          struct drm_display_mode *adjusted_mode)
+{
+        return true;
+}
+static int
+sil164_encoder_mode_valid(struct drm_encoder *encoder,
+                          struct drm_display_mode *mode)
+{
+        struct sil164_priv *priv = to_sil164_priv(encoder);
+        if (mode->clock < 32000)
+                return MODE_CLOCK_LOW;
+        if (mode->clock > 330000 ||
+            (mode->clock > 165000 && !priv->duallink_slave))
+                return MODE_CLOCK_HIGH;
+        return MODE_OK;
+}
+static void
+sil164_encoder_mode_set(struct drm_encoder *encoder,
+                        struct drm_display_mode *mode,
+                        struct drm_display_mode *adjusted_mode)
+{
+        struct sil164_priv *priv = to_sil164_priv(encoder);
+        bool duallink = adjusted_mode->clock > 165000;
+        sil164_init_state(drm_i2c_encoder_get_client(encoder),
+                          &priv->config, duallink);
+        if (priv->duallink_slave)
+                sil164_init_state(priv->duallink_slave,
+                                  &priv->config, duallink);
+        sil164_encoder_dpms(encoder, DRM_MODE_DPMS_ON);
+}
+static enum drm_connector_status
+sil164_encoder_detect(struct drm_encoder *encoder,
+                      struct drm_connector *connector)
+{
+        struct i2c_client *client = drm_i2c_encoder_get_client(encoder);
+        if (sil164_read(client, SIL164_DETECT) & SIL164_DETECT_HOTPLUG_STAT)
+                return connector_status_connected;
+        else
+                return connector_status_disconnected;
+}
+static int
+sil164_encoder_get_modes(struct drm_encoder *encoder,
+                         struct drm_connector *connector)
+{
+        return 0;
+}
+static int
+sil164_encoder_create_resources(struct drm_encoder *encoder,
+                                struct drm_connector *connector)
+{
+        return 0;
+}
+static int
+sil164_encoder_set_property(struct drm_encoder *encoder,
+                            struct drm_connector *connector,
+                            struct drm_property *property,
+                            uint64_t val)
+{
+        return 0;
+}
+static void
+sil164_encoder_destroy(struct drm_encoder *encoder)
+{
+        struct sil164_priv *priv = to_sil164_priv(encoder);
+        if (priv->duallink_slave)
+                i2c_unregister_device(priv->duallink_slave);
+        kfree(priv);
+        drm_i2c_encoder_destroy(encoder);
+}
+static struct drm_encoder_slave_funcs sil164_encoder_funcs = {
+        .set_config = sil164_encoder_set_config,
+        .destroy = sil164_encoder_destroy,
+        .dpms = sil164_encoder_dpms,
+        .save = sil164_encoder_save,
+        .restore = sil164_encoder_restore,
+        .mode_fixup = sil164_encoder_mode_fixup,
+        .mode_valid = sil164_encoder_mode_valid,
+        .mode_set = sil164_encoder_mode_set,
+        .detect = sil164_encoder_detect,
+        .get_modes = sil164_encoder_get_modes,
+        .create_resources = sil164_encoder_create_resources,
+        .set_property = sil164_encoder_set_property,
+};
+/* I2C driver functions */
+static int
+sil164_probe(struct i2c_client *client, const struct i2c_device_id *id)
+{
+        int vendor = sil164_read(client, SIL164_VENDOR_HI) << 8 |
+                sil164_read(client, SIL164_VENDOR_LO);
+        int device = sil164_read(client, SIL164_DEVICE_HI) << 8 |
+                sil164_read(client, SIL164_DEVICE_LO);
+        int rev = sil164_read(client, SIL164_REVISION);
+        if (vendor != 0x1 || device != 0x6) {
+                sil164_dbg(client, "Unknown device %x:%x.%x\n",
+                           vendor, device, rev);
+                return -ENODEV;
+        }
+        sil164_info(client, "Detected device %x:%x.%x\n",
+                    vendor, device, rev);
+        return 0;
+}
+static int
+sil164_remove(struct i2c_client *client)
+{
+        return 0;
+}
+static struct i2c_client *
+sil164_detect_slave(struct i2c_client *client)
+{
+        struct i2c_adapter *adap = client->adapter;
+        struct i2c_msg msg = {
+                .addr = SIL164_I2C_ADDR_SLAVE,
+                .len = 0,
+        };
+        const struct i2c_board_info info = {
+                I2C_BOARD_INFO("sil164", SIL164_I2C_ADDR_SLAVE)
+        };
+        if (i2c_transfer(adap, &msg, 1) != 1) {
+                sil164_dbg(adap, "No dual-link slave found.");
+                return NULL;
+        }
+        return i2c_new_device(adap, &info);
+}
+static int
+sil164_encoder_init(struct i2c_client *client,
+                    struct drm_device *dev,
+                    struct drm_encoder_slave *encoder)
+{
+        struct sil164_priv *priv;
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+        encoder->slave_priv = priv;
+        encoder->slave_funcs = &sil164_encoder_funcs;
+        priv->duallink_slave = sil164_detect_slave(client);
+        return 0;
+}
+static struct i2c_device_id sil164_ids[] = {
+        { "sil164", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, sil164_ids);
+static struct drm_i2c_encoder_driver sil164_driver = {
+        .i2c_driver = {
+                .probe = sil164_probe,
+                .remove = sil164_remove,
+                .driver = {
+                        .name = "sil164",
+                },
+                .id_table = sil164_ids,
+        },
+        .encoder_init = sil164_encoder_init,
+};
+/* Module initialization */
+static int __init
+sil164_init(void)
+{
+        return drm_i2c_encoder_register(THIS_MODULE, &sil164_driver);
+}
+static void __exit
+sil164_exit(void)
+{
+        drm_i2c_encoder_unregister(&sil164_driver);
+}
+MODULE_AUTHOR("Francisco Jerez <currojerez@riseup.net>");
+MODULE_DESCRIPTION("Silicon Image sil164 TMDS transmitter driver");
+MODULE_LICENSE("GPL and additional rights");
+module_init(sil164_init);
+module_exit(sil164_exit);
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
index 997d91707ad2..0e6c131313d9 100644
--- a/drivers/gpu/drm/i810/i810_dma.c
+++ b/drivers/gpu/drm/i810/i810_dma.c
@@ -37,6 +37,7 @@
 #include <linux/interrupt.h>    /* For task queue support */
 #include <linux/delay.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/pagemap.h>
 #define I810_BUF_FREE           2
@@ -60,9 +61,8 @@ static struct drm_buf *i810_freelist_get(struct drm_device * dev)
                /* In use is already a pointer */
                used = cmpxchg(buf_priv->in_use, I810_BUF_FREE,
                               I810_BUF_CLIENT);
-                if (used == I810_BUF_FREE) {
+                if (used == I810_BUF_FREE)
                        return buf;
-                }
        }
        return NULL;
 }
@@ -71,7 +71,7 @@ static struct drm_buf *i810_freelist_get(struct drm_device * dev)
 * yet, the hardware updates in use for us once its on the ring buffer.
 */
-static int i810_freelist_put(struct drm_device * dev, struct drm_buf * buf)
+static int i810_freelist_put(struct drm_device *dev, struct drm_buf *buf)
 {
        drm_i810_buf_priv_t *buf_priv = buf->dev_private;
        int used;
@@ -121,7 +121,7 @@ static const struct file_operations i810_buffer_fops = {
        .fasync = drm_fasync,
 };
-static int i810_map_buffer(struct drm_buf * buf, struct drm_file *file_priv)
+static int i810_map_buffer(struct drm_buf *buf, struct drm_file *file_priv)
 {
        struct drm_device *dev = file_priv->minor->dev;
        drm_i810_buf_priv_t *buf_priv = buf->dev_private;
@@ -152,7 +152,7 @@ static int i810_map_buffer(struct drm_buf * buf, struct drm_file *file_priv)
        return retcode;
 }
-static int i810_unmap_buffer(struct drm_buf * buf)
+static int i810_unmap_buffer(struct drm_buf *buf)
 {
        drm_i810_buf_priv_t *buf_priv = buf->dev_private;
        int retcode = 0;
@@ -172,7 +172,7 @@ static int i810_unmap_buffer(struct drm_buf * buf)
        return retcode;
 }
-static int i810_dma_get_buffer(struct drm_device * dev, drm_i810_dma_t * d,
+static int i810_dma_get_buffer(struct drm_device *dev, drm_i810_dma_t *d,
                               struct drm_file *file_priv)
 {
        struct drm_buf *buf;
@@ -202,7 +202,7 @@ static int i810_dma_get_buffer(struct drm_device * dev, drm_i810_dma_t * d,
        return retcode;
 }
-static int i810_dma_cleanup(struct drm_device * dev)
+static int i810_dma_cleanup(struct drm_device *dev)
 {
        struct drm_device_dma *dma = dev->dma;
@@ -218,9 +218,8 @@ static int i810_dma_cleanup(struct drm_device * dev)
                drm_i810_private_t *dev_priv =
                    (drm_i810_private_t *) dev->dev_private;
-                if (dev_priv->ring.virtual_start) {
+                if (dev_priv->ring.virtual_start)
                        drm_core_ioremapfree(&dev_priv->ring.map, dev);
-                }
                if (dev_priv->hw_status_page) {
                        pci_free_consistent(dev->pdev, PAGE_SIZE,
                                            dev_priv->hw_status_page,
@@ -242,7 +241,7 @@ static int i810_dma_cleanup(struct drm_device * dev)
        return 0;
 }
-static int i810_wait_ring(struct drm_device * dev, int n)
+static int i810_wait_ring(struct drm_device *dev, int n)
 {
        drm_i810_private_t *dev_priv = dev->dev_private;
        drm_i810_ring_buffer_t *ring = &(dev_priv->ring);
@@ -271,11 +270,11 @@ static int i810_wait_ring(struct drm_device * dev, int n)
                udelay(1);
        }
-      out_wait_ring:
+out_wait_ring:
        return iters;
 }
-static void i810_kernel_lost_context(struct drm_device * dev)
+static void i810_kernel_lost_context(struct drm_device *dev)
 {
        drm_i810_private_t *dev_priv = dev->dev_private;
        drm_i810_ring_buffer_t *ring = &(dev_priv->ring);
@@ -287,7 +286,7 @@ static void i810_kernel_lost_context(struct drm_device * dev)
                ring->space += ring->Size;
 }
-static int i810_freelist_init(struct drm_device * dev, drm_i810_private_t * dev_priv)
+static int i810_freelist_init(struct drm_device *dev, drm_i810_private_t *dev_priv)
 {
        struct drm_device_dma *dma = dev->dma;
        int my_idx = 24;
@@ -322,9 +321,9 @@ static int i810_freelist_init(struct drm_device * dev, drm_i810_private_t * dev_
        return 0;
 }
-static int i810_dma_initialize(struct drm_device * dev,
+static int i810_dma_initialize(struct drm_device *dev,
-                               drm_i810_private_t * dev_priv,
+                               drm_i810_private_t *dev_priv,
-                               drm_i810_init_t * init)
+                               drm_i810_init_t *init)
 {
        struct drm_map_list *r_list;
        memset(dev_priv, 0, sizeof(drm_i810_private_t));
@@ -462,7 +461,7 @@ static int i810_dma_init(struct drm_device *dev, void *data,
 * Use 'volatile' & local var tmp to force the emitted values to be
 * identical to the verified ones.
 */
-static void i810EmitContextVerified(struct drm_device * dev,
+static void i810EmitContextVerified(struct drm_device *dev,
                                    volatile unsigned int *code)
 {
        drm_i810_private_t *dev_priv = dev->dev_private;
@@ -495,7 +494,7 @@ static void i810EmitContextVerified(struct drm_device * dev,
        ADVANCE_LP_RING();
 }
-static void i810EmitTexVerified(struct drm_device * dev, volatile unsigned int *code)
+static void i810EmitTexVerified(struct drm_device *dev, volatile unsigned int *code)
 {
        drm_i810_private_t *dev_priv = dev->dev_private;
        int i, j = 0;
@@ -528,7 +527,7 @@ static void i810EmitTexVerified(struct drm_device * dev, volatile unsigned int *
 /* Need to do some additional checking when setting the dest buffer.
 */
-static void i810EmitDestVerified(struct drm_device * dev,
+static void i810EmitDestVerified(struct drm_device *dev,
                                 volatile unsigned int *code)
 {
        drm_i810_private_t *dev_priv = dev->dev_private;
@@ -563,7 +562,7 @@ static void i810EmitDestVerified(struct drm_device * dev,
        ADVANCE_LP_RING();
 }
-static void i810EmitState(struct drm_device * dev)
+static void i810EmitState(struct drm_device *dev)
 {
        drm_i810_private_t *dev_priv = dev->dev_private;
        drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv;
@@ -594,7 +593,7 @@ static void i810EmitState(struct drm_device * dev)
 /* need to verify
 */
-static void i810_dma_dispatch_clear(struct drm_device * dev, int flags,
+static void i810_dma_dispatch_clear(struct drm_device *dev, int flags,
                                    unsigned int clear_color,
                                    unsigned int clear_zval)
 {
@@ -669,7 +668,7 @@ static void i810_dma_dispatch_clear(struct drm_device * dev, int flags,
        }
 }
-static void i810_dma_dispatch_swap(struct drm_device * dev)
+static void i810_dma_dispatch_swap(struct drm_device *dev)
 {
        drm_i810_private_t *dev_priv = dev->dev_private;
        drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv;
@@ -715,8 +714,8 @@ static void i810_dma_dispatch_swap(struct drm_device * dev)
        }
 }
-static void i810_dma_dispatch_vertex(struct drm_device * dev,
+static void i810_dma_dispatch_vertex(struct drm_device *dev,
-                                     struct drm_buf * buf, int discard, int used)
+                                     struct drm_buf *buf, int discard, int used)
 {
        drm_i810_private_t *dev_priv = dev->dev_private;
        drm_i810_buf_priv_t *buf_priv = buf->dev_private;
@@ -795,7 +794,7 @@ static void i810_dma_dispatch_vertex(struct drm_device * dev,
        }
 }
-static void i810_dma_dispatch_flip(struct drm_device * dev)
+static void i810_dma_dispatch_flip(struct drm_device *dev)
 {
        drm_i810_private_t *dev_priv = dev->dev_private;
        int pitch = dev_priv->pitch;
@@ -841,7 +840,7 @@ static void i810_dma_dispatch_flip(struct drm_device * dev)
 }
-static void i810_dma_quiescent(struct drm_device * dev)
+static void i810_dma_quiescent(struct drm_device *dev)
 {
        drm_i810_private_t *dev_priv = dev->dev_private;
        RING_LOCALS;
@@ -858,7 +857,7 @@ static void i810_dma_quiescent(struct drm_device * dev)
        i810_wait_ring(dev, dev_priv->ring.Size - 8);
 }
-static int i810_flush_queue(struct drm_device * dev)
+static int i810_flush_queue(struct drm_device *dev)
 {
        drm_i810_private_t *dev_priv = dev->dev_private;
        struct drm_device_dma *dma = dev->dma;
@@ -891,7 +890,7 @@ static int i810_flush_queue(struct drm_device * dev)
 }
 /* Must be called with the lock held */
-static void i810_reclaim_buffers(struct drm_device * dev,
+static void i810_reclaim_buffers(struct drm_device *dev,
                                 struct drm_file *file_priv)
 {
        struct drm_device_dma *dma = dev->dma;
@@ -969,9 +968,8 @@ static int i810_clear_bufs(struct drm_device *dev, void *data,
        LOCK_TEST_WITH_RETURN(dev, file_priv);
        /* GH: Someone's doing nasty things... */
-        if (!dev->dev_private) {
+        if (!dev->dev_private)
                return -EINVAL;
-        }
        i810_dma_dispatch_clear(dev, clear->flags,
                                clear->clear_color, clear->clear_depth);
@@ -1039,7 +1037,7 @@ static int i810_docopy(struct drm_device *dev, void *data,
        return 0;
 }
-static void i810_dma_dispatch_mc(struct drm_device * dev, struct drm_buf * buf, int used,
+static void i810_dma_dispatch_mc(struct drm_device *dev, struct drm_buf *buf, int used,
                                 unsigned int last_render)
 {
        drm_i810_private_t *dev_priv = dev->dev_private;
@@ -1053,9 +1051,8 @@ static void i810_dma_dispatch_mc(struct drm_device * dev, struct drm_buf * buf,
        i810_kernel_lost_context(dev);
        u = cmpxchg(buf_priv->in_use, I810_BUF_CLIENT, I810_BUF_HARDWARE);
-        if (u != I810_BUF_CLIENT) {
+        if (u != I810_BUF_CLIENT)
                DRM_DEBUG("MC found buffer that isn't mine!\n");
-        }
        if (used > 4 * 1024)
                used = 0;
@@ -1160,7 +1157,7 @@ static int i810_ov0_flip(struct drm_device *dev, void *data,
        LOCK_TEST_WITH_RETURN(dev, file_priv);
-        //Tell the overlay to update
+        /* Tell the overlay to update */
        I810_WRITE(0x30000, dev_priv->overlay_physical | 0x80000000);
        return 0;
@@ -1168,7 +1165,7 @@ static int i810_ov0_flip(struct drm_device *dev, void *data,
 /* Not sure why this isn't set all the time:
 */
-static void i810_do_init_pageflip(struct drm_device * dev)
+static void i810_do_init_pageflip(struct drm_device *dev)
 {
        drm_i810_private_t *dev_priv = dev->dev_private;
@@ -1178,7 +1175,7 @@ static void i810_do_init_pageflip(struct drm_device * dev)
        dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;
 }
-static int i810_do_cleanup_pageflip(struct drm_device * dev)
+static int i810_do_cleanup_pageflip(struct drm_device *dev)
 {
        drm_i810_private_t *dev_priv = dev->dev_private;
@@ -1218,49 +1215,61 @@ int i810_driver_load(struct drm_device *dev, unsigned long flags)
        return 0;
 }
-void i810_driver_lastclose(struct drm_device * dev)
+void i810_driver_lastclose(struct drm_device *dev)
 {
        i810_dma_cleanup(dev);
 }
-void i810_driver_preclose(struct drm_device * dev, struct drm_file *file_priv)
+void i810_driver_preclose(struct drm_device *dev, struct drm_file *file_priv)
 {
        if (dev->dev_private) {
                drm_i810_private_t *dev_priv = dev->dev_private;
-                if (dev_priv->page_flipping) {
+                if (dev_priv->page_flipping)
                        i810_do_cleanup_pageflip(dev);
-                }
        }
 }
-void i810_driver_reclaim_buffers_locked(struct drm_device * dev,
+void i810_driver_reclaim_buffers_locked(struct drm_device *dev,
                                        struct drm_file *file_priv)
 {
        i810_reclaim_buffers(dev, file_priv);
 }
-int i810_driver_dma_quiescent(struct drm_device * dev)
+int i810_driver_dma_quiescent(struct drm_device *dev)
 {
        i810_dma_quiescent(dev);
        return 0;
 }
+/*
+ * call the drm_ioctl under the big kernel lock because
+ * to lock against the i810_mmap_buffers function.
+ */
+long i810_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+        int ret;
+        lock_kernel();
+        ret = drm_ioctl(file, cmd, arg);
+        unlock_kernel();
+        return ret;
+}
 struct drm_ioctl_desc i810_ioctls[] = {
-        DRM_IOCTL_DEF(DRM_I810_INIT, i810_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
+        DRM_IOCTL_DEF(DRM_I810_INIT, i810_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I810_VERTEX, i810_dma_vertex, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I810_VERTEX, i810_dma_vertex, DRM_AUTH|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I810_CLEAR, i810_clear_bufs, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I810_CLEAR, i810_clear_bufs, DRM_AUTH|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I810_FLUSH, i810_flush_ioctl, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I810_FLUSH, i810_flush_ioctl, DRM_AUTH|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I810_GETAGE, i810_getage, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I810_GETAGE, i810_getage, DRM_AUTH|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I810_GETBUF, i810_getbuf, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I810_GETBUF, i810_getbuf, DRM_AUTH|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I810_SWAP, i810_swap_bufs, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I810_SWAP, i810_swap_bufs, DRM_AUTH|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I810_COPY, i810_copybuf, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I810_COPY, i810_copybuf, DRM_AUTH|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I810_DOCOPY, i810_docopy, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I810_DOCOPY, i810_docopy, DRM_AUTH|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I810_OV0INFO, i810_ov0_info, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I810_OV0INFO, i810_ov0_info, DRM_AUTH|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I810_FSTATUS, i810_fstatus, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I810_FSTATUS, i810_fstatus, DRM_AUTH|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I810_OV0FLIP, i810_ov0_flip, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I810_OV0FLIP, i810_ov0_flip, DRM_AUTH|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I810_MC, i810_dma_mc, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
+        DRM_IOCTL_DEF(DRM_I810_MC, i810_dma_mc, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I810_RSTATUS, i810_rstatus, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I810_RSTATUS, i810_rstatus, DRM_AUTH|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I810_FLIP, i810_flip_bufs, DRM_AUTH)
+        DRM_IOCTL_DEF(DRM_I810_FLIP, i810_flip_bufs, DRM_AUTH|DRM_UNLOCKED),
 };
 int i810_max_ioctl = DRM_ARRAY_SIZE(i810_ioctls);
@@ -1276,7 +1285,7 @@ int i810_max_ioctl = DRM_ARRAY_SIZE(i810_ioctls);
 * \returns
 * A value of 1 is always retured to indictate every i810 is AGP.
 */
-int i810_driver_device_is_agp(struct drm_device * dev)
+int i810_driver_device_is_agp(struct drm_device *dev)
 {
        return 1;
 }
diff --git a/drivers/gpu/drm/i810/i810_drv.c b/drivers/gpu/drm/i810/i810_drv.c
index c1e02752e023..b4250b2cac1f 100644
--- a/drivers/gpu/drm/i810/i810_drv.c
+++ b/drivers/gpu/drm/i810/i810_drv.c
@@ -59,7 +59,7 @@ static struct drm_driver driver = {
                 .owner = THIS_MODULE,
                 .open = drm_open,
                 .release = drm_release,
-                 .unlocked_ioctl = drm_ioctl,
+                 .unlocked_ioctl = i810_ioctl,
                 .mmap = drm_mmap,
                 .poll = drm_poll,
                 .fasync = drm_fasync,
diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
index 21e2691f28f9..c9339f481795 100644
--- a/drivers/gpu/drm/i810/i810_drv.h
+++ b/drivers/gpu/drm/i810/i810_drv.h
@@ -115,56 +115,59 @@ typedef struct drm_i810_private {
 } drm_i810_private_t;
                                /* i810_dma.c */
-extern int i810_driver_dma_quiescent(struct drm_device * dev);
+extern int i810_driver_dma_quiescent(struct drm_device *dev);
-extern void i810_driver_reclaim_buffers_locked(struct drm_device * dev,
+extern void i810_driver_reclaim_buffers_locked(struct drm_device *dev,
                                               struct drm_file *file_priv);
 extern int i810_driver_load(struct drm_device *, unsigned long flags);
-extern void i810_driver_lastclose(struct drm_device * dev);
+extern void i810_driver_lastclose(struct drm_device *dev);
-extern void i810_driver_preclose(struct drm_device * dev,
+extern void i810_driver_preclose(struct drm_device *dev,
                                 struct drm_file *file_priv);
-extern void i810_driver_reclaim_buffers_locked(struct drm_device * dev,
+extern void i810_driver_reclaim_buffers_locked(struct drm_device *dev,
                                               struct drm_file *file_priv);
-extern int i810_driver_device_is_agp(struct drm_device * dev);
+extern int i810_driver_device_is_agp(struct drm_device *dev);
+extern long i810_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
 extern struct drm_ioctl_desc i810_ioctls[];
 extern int i810_max_ioctl;
 #define I810_BASE(reg)          ((unsigned long) \
                                dev_priv->mmio_map->handle)
 #define I810_ADDR(reg)          (I810_BASE(reg) + reg)
-#define I810_DEREF(reg)         *(__volatile__ int *)I810_ADDR(reg)
+#define I810_DEREF(reg)         (*(__volatile__ int *)I810_ADDR(reg))
 #define I810_READ(reg)          I810_DEREF(reg)
-#define I810_WRITE(reg,val)     do { I810_DEREF(reg) = val; } while (0)
+#define I810_WRITE(reg, val)    do { I810_DEREF(reg) = val; } while (0)
-#define I810_DEREF16(reg)       *(__volatile__ u16 *)I810_ADDR(reg)
+#define I810_DEREF16(reg)       (*(__volatile__ u16 *)I810_ADDR(reg))
 #define I810_READ16(reg)        I810_DEREF16(reg)
-#define I810_WRITE16(reg,val)   do { I810_DEREF16(reg) = val; } while (0)
+#define I810_WRITE16(reg, val)  do { I810_DEREF16(reg) = val; } while (0)
 #define I810_VERBOSE 0
 #define RING_LOCALS     unsigned int outring, ringmask; \
-                        volatile char *virt;
+                        volatile char *virt;
-#define BEGIN_LP_RING(n) do {                                           \
+#define BEGIN_LP_RING(n) do {                                   \
-        if (I810_VERBOSE)                                               \
+        if (I810_VERBOSE)                                       \
-                DRM_DEBUG("BEGIN_LP_RING(%d)\n", n);                    \
+                DRM_DEBUG("BEGIN_LP_RING(%d)\n", n);            \
-        if (dev_priv->ring.space < n*4)                                 \
+        if (dev_priv->ring.space < n*4)                         \
-                i810_wait_ring(dev, n*4);                               \
+                i810_wait_ring(dev, n*4);                       \
-        dev_priv->ring.space -= n*4;                                    \
+        dev_priv->ring.space -= n*4;                            \
-        outring = dev_priv->ring.tail;                                  \
+        outring = dev_priv->ring.tail;                          \
-        ringmask = dev_priv->ring.tail_mask;                            \
+        ringmask = dev_priv->ring.tail_mask;                    \
-        virt = dev_priv->ring.virtual_start;                            \
+        virt = dev_priv->ring.virtual_start;                    \
 } while (0)
-#define ADVANCE_LP_RING() do {                                  \
+#define ADVANCE_LP_RING() do {                                  \
-        if (I810_VERBOSE) DRM_DEBUG("ADVANCE_LP_RING\n");       \
+        if (I810_VERBOSE)                                       \
+                DRM_DEBUG("ADVANCE_LP_RING\n");                 \
        dev_priv->ring.tail = outring;                          \
-        I810_WRITE(LP_RING + RING_TAIL, outring);               \
+        I810_WRITE(LP_RING + RING_TAIL, outring);               \
-} while(0)
+} while (0)
-#define OUT_RING(n) do {                                                \
+#define OUT_RING(n) do {                                        \
-        if (I810_VERBOSE) DRM_DEBUG("   OUT_RING %x\n", (int)(n));      \
+        if (I810_VERBOSE)                                       \
-        *(volatile unsigned int *)(virt + outring) = n;                 \
+                DRM_DEBUG("   OUT_RING %x\n", (int)(n));        \
-        outring += 4;                                                   \
+        *(volatile unsigned int *)(virt + outring) = n;         \
-        outring &= ringmask;                                            \
+        outring += 4;                                           \
+        outring &= ringmask;                                    \
 } while (0)
 #define GFX_OP_USER_INTERRUPT           ((0<<29)|(2<<23))
diff --git a/drivers/gpu/drm/i830/i830_dma.c b/drivers/gpu/drm/i830/i830_dma.c
index 65759a9a85c8..5168862c9227 100644
--- a/drivers/gpu/drm/i830/i830_dma.c
+++ b/drivers/gpu/drm/i830/i830_dma.c
@@ -36,6 +36,7 @@
 #include "i830_drm.h"
 #include "i830_drv.h"
 #include <linux/interrupt.h>    /* For task queue support */
+#include <linux/smp_lock.h>
 #include <linux/pagemap.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
@@ -62,9 +63,8 @@ static struct drm_buf *i830_freelist_get(struct drm_device * dev)
                /* In use is already a pointer */
                used = cmpxchg(buf_priv->in_use, I830_BUF_FREE,
                               I830_BUF_CLIENT);
-                if (used == I830_BUF_FREE) {
+                if (used == I830_BUF_FREE)
                        return buf;
-                }
        }
        return NULL;
 }
@@ -73,7 +73,7 @@ static struct drm_buf *i830_freelist_get(struct drm_device * dev)
 * yet, the hardware updates in use for us once its on the ring buffer.
 */
-static int i830_freelist_put(struct drm_device * dev, struct drm_buf * buf)
+static int i830_freelist_put(struct drm_device *dev, struct drm_buf *buf)
 {
        drm_i830_buf_priv_t *buf_priv = buf->dev_private;
        int used;
@@ -123,7 +123,7 @@ static const struct file_operations i830_buffer_fops = {
        .fasync = drm_fasync,
 };
-static int i830_map_buffer(struct drm_buf * buf, struct drm_file *file_priv)
+static int i830_map_buffer(struct drm_buf *buf, struct drm_file *file_priv)
 {
        struct drm_device *dev = file_priv->minor->dev;
        drm_i830_buf_priv_t *buf_priv = buf->dev_private;
@@ -156,7 +156,7 @@ static int i830_map_buffer(struct drm_buf * buf, struct drm_file *file_priv)
        return retcode;
 }
-static int i830_unmap_buffer(struct drm_buf * buf)
+static int i830_unmap_buffer(struct drm_buf *buf)
 {
        drm_i830_buf_priv_t *buf_priv = buf->dev_private;
        int retcode = 0;
@@ -176,7 +176,7 @@ static int i830_unmap_buffer(struct drm_buf * buf)
        return retcode;
 }
-static int i830_dma_get_buffer(struct drm_device * dev, drm_i830_dma_t * d,
+static int i830_dma_get_buffer(struct drm_device *dev, drm_i830_dma_t *d,
                               struct drm_file *file_priv)
 {
        struct drm_buf *buf;
@@ -206,7 +206,7 @@ static int i830_dma_get_buffer(struct drm_device * dev, drm_i830_dma_t * d,
        return retcode;
 }
-static int i830_dma_cleanup(struct drm_device * dev)
+static int i830_dma_cleanup(struct drm_device *dev)
 {
        struct drm_device_dma *dma = dev->dma;
@@ -222,9 +222,8 @@ static int i830_dma_cleanup(struct drm_device * dev)
                drm_i830_private_t *dev_priv =
                    (drm_i830_private_t *) dev->dev_private;
-                if (dev_priv->ring.virtual_start) {
+                if (dev_priv->ring.virtual_start)
                        drm_core_ioremapfree(&dev_priv->ring.map, dev);
-                }
                if (dev_priv->hw_status_page) {
                        pci_free_consistent(dev->pdev, PAGE_SIZE,
                                            dev_priv->hw_status_page,
@@ -246,7 +245,7 @@ static int i830_dma_cleanup(struct drm_device * dev)
        return 0;
 }
-int i830_wait_ring(struct drm_device * dev, int n, const char *caller)
+int i830_wait_ring(struct drm_device *dev, int n, const char *caller)
 {
        drm_i830_private_t *dev_priv = dev->dev_private;
        drm_i830_ring_buffer_t *ring = &(dev_priv->ring);
@@ -276,11 +275,11 @@ int i830_wait_ring(struct drm_device * dev, int n, const char *caller)
                dev_priv->sarea_priv->perf_boxes |= I830_BOX_WAIT;
        }
-      out_wait_ring:
+out_wait_ring:
        return iters;
 }
-static void i830_kernel_lost_context(struct drm_device * dev)
+static void i830_kernel_lost_context(struct drm_device *dev)
 {
        drm_i830_private_t *dev_priv = dev->dev_private;
        drm_i830_ring_buffer_t *ring = &(dev_priv->ring);
@@ -295,7 +294,7 @@ static void i830_kernel_lost_context(struct drm_device * dev)
                dev_priv->sarea_priv->perf_boxes |= I830_BOX_RING_EMPTY;
 }
-static int i830_freelist_init(struct drm_device * dev, drm_i830_private_t * dev_priv)
+static int i830_freelist_init(struct drm_device *dev, drm_i830_private_t *dev_priv)
 {
        struct drm_device_dma *dma = dev->dma;
        int my_idx = 36;
@@ -329,9 +328,9 @@ static int i830_freelist_init(struct drm_device * dev, drm_i830_private_t * dev_
        return 0;
 }
-static int i830_dma_initialize(struct drm_device * dev,
+static int i830_dma_initialize(struct drm_device *dev,
-                               drm_i830_private_t * dev_priv,
+                               drm_i830_private_t *dev_priv,
-                               drm_i830_init_t * init)
+                               drm_i830_init_t *init)
 {
        struct drm_map_list *r_list;
@@ -482,7 +481,7 @@ static int i830_dma_init(struct drm_device *dev, void *data,
 /* Most efficient way to verify state for the i830 is as it is
 * emitted.  Non-conformant state is silently dropped.
 */
-static void i830EmitContextVerified(struct drm_device * dev, unsigned int *code)
+static void i830EmitContextVerified(struct drm_device *dev, unsigned int *code)
 {
        drm_i830_private_t *dev_priv = dev->dev_private;
        int i, j = 0;
@@ -527,7 +526,7 @@ static void i830EmitContextVerified(struct drm_device * dev, unsigned int *code)
        ADVANCE_LP_RING();
 }
-static void i830EmitTexVerified(struct drm_device * dev, unsigned int *code)
+static void i830EmitTexVerified(struct drm_device *dev, unsigned int *code)
 {
        drm_i830_private_t *dev_priv = dev->dev_private;
        int i, j = 0;
@@ -561,7 +560,7 @@ static void i830EmitTexVerified(struct drm_device * dev, unsigned int *code)
                printk("rejected packet %x\n", code[0]);
 }
-static void i830EmitTexBlendVerified(struct drm_device * dev,
+static void i830EmitTexBlendVerified(struct drm_device *dev,
                                     unsigned int *code, unsigned int num)
 {
        drm_i830_private_t *dev_priv = dev->dev_private;
@@ -586,7 +585,7 @@ static void i830EmitTexBlendVerified(struct drm_device * dev,
        ADVANCE_LP_RING();
 }
-static void i830EmitTexPalette(struct drm_device * dev,
+static void i830EmitTexPalette(struct drm_device *dev,
                               unsigned int *palette, int number, int is_shared)
 {
        drm_i830_private_t *dev_priv = dev->dev_private;
@@ -603,9 +602,8 @@ static void i830EmitTexPalette(struct drm_device * dev,
        } else {
                OUT_RING(CMD_OP_MAP_PALETTE_LOAD | MAP_PALETTE_NUM(number));
        }
-        for (i = 0; i < 256; i++) {
+        for (i = 0; i < 256; i++)
                OUT_RING(palette[i]);
-        }
        OUT_RING(0);
        /* KW:  WHERE IS THE ADVANCE_LP_RING?  This is effectively a noop!
         */
@@ -613,7 +611,7 @@ static void i830EmitTexPalette(struct drm_device * dev,
 /* Need to do some additional checking when setting the dest buffer.
 */
-static void i830EmitDestVerified(struct drm_device * dev, unsigned int *code)
+static void i830EmitDestVerified(struct drm_device *dev, unsigned int *code)
 {
        drm_i830_private_t *dev_priv = dev->dev_private;
        unsigned int tmp;
@@ -674,7 +672,7 @@ static void i830EmitDestVerified(struct drm_device * dev, unsigned int *code)
        ADVANCE_LP_RING();
 }
-static void i830EmitStippleVerified(struct drm_device * dev, unsigned int *code)
+static void i830EmitStippleVerified(struct drm_device *dev, unsigned int *code)
 {
        drm_i830_private_t *dev_priv = dev->dev_private;
        RING_LOCALS;
@@ -685,7 +683,7 @@ static void i830EmitStippleVerified(struct drm_device * dev, unsigned int *code)
        ADVANCE_LP_RING();
 }
-static void i830EmitState(struct drm_device * dev)
+static void i830EmitState(struct drm_device *dev)
 {
        drm_i830_private_t *dev_priv = dev->dev_private;
        drm_i830_sarea_t *sarea_priv = dev_priv->sarea_priv;
@@ -788,7 +786,7 @@ static void i830EmitState(struct drm_device * dev)
 * Performance monitoring functions
 */
-static void i830_fill_box(struct drm_device * dev,
+static void i830_fill_box(struct drm_device *dev,
                          int x, int y, int w, int h, int r, int g, int b)
 {
        drm_i830_private_t *dev_priv = dev->dev_private;
@@ -816,17 +814,16 @@ static void i830_fill_box(struct drm_device * dev,
        OUT_RING((y << 16) | x);
        OUT_RING(((y + h) << 16) | (x + w));
-        if (dev_priv->current_page == 1) {
+        if (dev_priv->current_page == 1)
                OUT_RING(dev_priv->front_offset);
-        } else {
+        else
                OUT_RING(dev_priv->back_offset);
-        }
        OUT_RING(color);
        ADVANCE_LP_RING();
 }
-static void i830_cp_performance_boxes(struct drm_device * dev)
+static void i830_cp_performance_boxes(struct drm_device *dev)
 {
        drm_i830_private_t *dev_priv = dev->dev_private;
@@ -871,7 +868,7 @@ static void i830_cp_performance_boxes(struct drm_device * dev)
        dev_priv->sarea_priv->perf_boxes = 0;
 }
-static void i830_dma_dispatch_clear(struct drm_device * dev, int flags,
+static void i830_dma_dispatch_clear(struct drm_device *dev, int flags,
                                    unsigned int clear_color,
                                    unsigned int clear_zval,
                                    unsigned int clear_depthmask)
@@ -966,7 +963,7 @@ static void i830_dma_dispatch_clear(struct drm_device * dev, int flags,
        }
 }
-static void i830_dma_dispatch_swap(struct drm_device * dev)
+static void i830_dma_dispatch_swap(struct drm_device *dev)
 {
        drm_i830_private_t *dev_priv = dev->dev_private;
        drm_i830_sarea_t *sarea_priv = dev_priv->sarea_priv;
@@ -1036,7 +1033,7 @@ static void i830_dma_dispatch_swap(struct drm_device * dev)
        }
 }
-static void i830_dma_dispatch_flip(struct drm_device * dev)
+static void i830_dma_dispatch_flip(struct drm_device *dev)
 {
        drm_i830_private_t *dev_priv = dev->dev_private;
        RING_LOCALS;
@@ -1079,8 +1076,8 @@ static void i830_dma_dispatch_flip(struct drm_device * dev)
        dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;
 }
-static void i830_dma_dispatch_vertex(struct drm_device * dev,
+static void i830_dma_dispatch_vertex(struct drm_device *dev,
-                                     struct drm_buf * buf, int discard, int used)
+                                     struct drm_buf *buf, int discard, int used)
 {
        drm_i830_private_t *dev_priv = dev->dev_private;
        drm_i830_buf_priv_t *buf_priv = buf->dev_private;
@@ -1100,9 +1097,8 @@ static void i830_dma_dispatch_vertex(struct drm_device * dev,
        if (discard) {
                u = cmpxchg(buf_priv->in_use, I830_BUF_CLIENT,
                            I830_BUF_HARDWARE);
-                if (u != I830_BUF_CLIENT) {
+                if (u != I830_BUF_CLIENT)
                        DRM_DEBUG("xxxx 2\n");
-                }
        }
        if (used > 4 * 1023)
@@ -1191,7 +1187,7 @@ static void i830_dma_dispatch_vertex(struct drm_device * dev,
        }
 }
-static void i830_dma_quiescent(struct drm_device * dev)
+static void i830_dma_quiescent(struct drm_device *dev)
 {
        drm_i830_private_t *dev_priv = dev->dev_private;
        RING_LOCALS;
@@ -1208,7 +1204,7 @@ static void i830_dma_quiescent(struct drm_device * dev)
        i830_wait_ring(dev, dev_priv->ring.Size - 8, __func__);
 }
-static int i830_flush_queue(struct drm_device * dev)
+static int i830_flush_queue(struct drm_device *dev)
 {
        drm_i830_private_t *dev_priv = dev->dev_private;
        struct drm_device_dma *dma = dev->dma;
@@ -1241,7 +1237,7 @@ static int i830_flush_queue(struct drm_device * dev)
 }
 /* Must be called with the lock held */
-static void i830_reclaim_buffers(struct drm_device * dev, struct drm_file *file_priv)
+static void i830_reclaim_buffers(struct drm_device *dev, struct drm_file *file_priv)
 {
        struct drm_device_dma *dma = dev->dma;
        int i;
@@ -1316,9 +1312,8 @@ static int i830_clear_bufs(struct drm_device *dev, void *data,
        LOCK_TEST_WITH_RETURN(dev, file_priv);
        /* GH: Someone's doing nasty things... */
-        if (!dev->dev_private) {
+        if (!dev->dev_private)
                return -EINVAL;
-        }
        i830_dma_dispatch_clear(dev, clear->flags,
                                clear->clear_color,
@@ -1339,7 +1334,7 @@ static int i830_swap_bufs(struct drm_device *dev, void *data,
 /* Not sure why this isn't set all the time:
 */
-static void i830_do_init_pageflip(struct drm_device * dev)
+static void i830_do_init_pageflip(struct drm_device *dev)
 {
        drm_i830_private_t *dev_priv = dev->dev_private;
@@ -1349,7 +1344,7 @@ static void i830_do_init_pageflip(struct drm_device * dev)
        dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;
 }
-static int i830_do_cleanup_pageflip(struct drm_device * dev)
+static int i830_do_cleanup_pageflip(struct drm_device *dev)
 {
        drm_i830_private_t *dev_priv = dev->dev_private;
@@ -1490,47 +1485,59 @@ int i830_driver_load(struct drm_device *dev, unsigned long flags)
        return 0;
 }
-void i830_driver_lastclose(struct drm_device * dev)
+void i830_driver_lastclose(struct drm_device *dev)
 {
        i830_dma_cleanup(dev);
 }
-void i830_driver_preclose(struct drm_device * dev, struct drm_file *file_priv)
+void i830_driver_preclose(struct drm_device *dev, struct drm_file *file_priv)
 {
        if (dev->dev_private) {
                drm_i830_private_t *dev_priv = dev->dev_private;
-                if (dev_priv->page_flipping) {
+                if (dev_priv->page_flipping)
                        i830_do_cleanup_pageflip(dev);
-                }
        }
 }
-void i830_driver_reclaim_buffers_locked(struct drm_device * dev, struct drm_file *file_priv)
+void i830_driver_reclaim_buffers_locked(struct drm_device *dev, struct drm_file *file_priv)
 {
        i830_reclaim_buffers(dev, file_priv);
 }
-int i830_driver_dma_quiescent(struct drm_device * dev)
+int i830_driver_dma_quiescent(struct drm_device *dev)
 {
        i830_dma_quiescent(dev);
        return 0;
 }
+/*
+ * call the drm_ioctl under the big kernel lock because
+ * to lock against the i830_mmap_buffers function.
+ */
+long i830_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+        int ret;
+        lock_kernel();
+        ret = drm_ioctl(file, cmd, arg);
+        unlock_kernel();
+        return ret;
+}
 struct drm_ioctl_desc i830_ioctls[] = {
-        DRM_IOCTL_DEF(DRM_I830_INIT, i830_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
+        DRM_IOCTL_DEF(DRM_I830_INIT, i830_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I830_VERTEX, i830_dma_vertex, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I830_VERTEX, i830_dma_vertex, DRM_AUTH|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I830_CLEAR, i830_clear_bufs, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I830_CLEAR, i830_clear_bufs, DRM_AUTH|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I830_FLUSH, i830_flush_ioctl, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I830_FLUSH, i830_flush_ioctl, DRM_AUTH|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I830_GETAGE, i830_getage, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I830_GETAGE, i830_getage, DRM_AUTH|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I830_GETBUF, i830_getbuf, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I830_GETBUF, i830_getbuf, DRM_AUTH|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I830_SWAP, i830_swap_bufs, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I830_SWAP, i830_swap_bufs, DRM_AUTH|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I830_COPY, i830_copybuf, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I830_COPY, i830_copybuf, DRM_AUTH|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I830_DOCOPY, i830_docopy, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I830_DOCOPY, i830_docopy, DRM_AUTH|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I830_FLIP, i830_flip_bufs, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I830_FLIP, i830_flip_bufs, DRM_AUTH|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I830_IRQ_EMIT, i830_irq_emit, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I830_IRQ_EMIT, i830_irq_emit, DRM_AUTH|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I830_IRQ_WAIT, i830_irq_wait, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I830_IRQ_WAIT, i830_irq_wait, DRM_AUTH|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I830_GETPARAM, i830_getparam, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I830_GETPARAM, i830_getparam, DRM_AUTH|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_I830_SETPARAM, i830_setparam, DRM_AUTH)
+        DRM_IOCTL_DEF(DRM_I830_SETPARAM, i830_setparam, DRM_AUTH|DRM_UNLOCKED),
 };
 int i830_max_ioctl = DRM_ARRAY_SIZE(i830_ioctls);
@@ -1546,7 +1553,7 @@ int i830_max_ioctl = DRM_ARRAY_SIZE(i830_ioctls);
 * \returns
 * A value of 1 is always retured to indictate every i8xx is AGP.
 */
-int i830_driver_device_is_agp(struct drm_device * dev)
+int i830_driver_device_is_agp(struct drm_device *dev)
 {
        return 1;
 }
diff --git a/drivers/gpu/drm/i830/i830_drv.c b/drivers/gpu/drm/i830/i830_drv.c
index 44f990bed8f4..a5c66aa82f0c 100644
--- a/drivers/gpu/drm/i830/i830_drv.c
+++ b/drivers/gpu/drm/i830/i830_drv.c
@@ -70,7 +70,7 @@ static struct drm_driver driver = {
                 .owner = THIS_MODULE,
                 .open = drm_open,
                 .release = drm_release,
-                 .unlocked_ioctl = drm_ioctl,
+                 .unlocked_ioctl = i830_ioctl,
                 .mmap = drm_mmap,
                 .poll = drm_poll,
                 .fasync = drm_fasync,
diff --git a/drivers/gpu/drm/i830/i830_drv.h b/drivers/gpu/drm/i830/i830_drv.h
index da82afe4ded5..0df1c720560b 100644
--- a/drivers/gpu/drm/i830/i830_drv.h
+++ b/drivers/gpu/drm/i830/i830_drv.h
@@ -122,6 +122,7 @@ typedef struct drm_i830_private {
 } drm_i830_private_t;
+long i830_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
 extern struct drm_ioctl_desc i830_ioctls[];
 extern int i830_max_ioctl;
@@ -132,33 +133,33 @@ extern int i830_irq_wait(struct drm_device *dev, void *data,
                         struct drm_file *file_priv);
 extern irqreturn_t i830_driver_irq_handler(DRM_IRQ_ARGS);
-extern void i830_driver_irq_preinstall(struct drm_device * dev);
+extern void i830_driver_irq_preinstall(struct drm_device *dev);
-extern void i830_driver_irq_postinstall(struct drm_device * dev);
+extern void i830_driver_irq_postinstall(struct drm_device *dev);
-extern void i830_driver_irq_uninstall(struct drm_device * dev);
+extern void i830_driver_irq_uninstall(struct drm_device *dev);
 extern int i830_driver_load(struct drm_device *, unsigned long flags);
-extern void i830_driver_preclose(struct drm_device * dev,
+extern void i830_driver_preclose(struct drm_device *dev,
                                 struct drm_file *file_priv);
-extern void i830_driver_lastclose(struct drm_device * dev);
+extern void i830_driver_lastclose(struct drm_device *dev);
-extern void i830_driver_reclaim_buffers_locked(struct drm_device * dev,
+extern void i830_driver_reclaim_buffers_locked(struct drm_device *dev,
                                               struct drm_file *file_priv);
-extern int i830_driver_dma_quiescent(struct drm_device * dev);
+extern int i830_driver_dma_quiescent(struct drm_device *dev);
-extern int i830_driver_device_is_agp(struct drm_device * dev);
+extern int i830_driver_device_is_agp(struct drm_device *dev);
-#define I830_READ(reg)          DRM_READ32(dev_priv->mmio_map, reg)
+#define I830_READ(reg)          DRM_READ32(dev_priv->mmio_map, reg)
-#define I830_WRITE(reg,val)     DRM_WRITE32(dev_priv->mmio_map, reg, val)
+#define I830_WRITE(reg, val)    DRM_WRITE32(dev_priv->mmio_map, reg, val)
-#define I830_READ16(reg)        DRM_READ16(dev_priv->mmio_map, reg)
+#define I830_READ16(reg)        DRM_READ16(dev_priv->mmio_map, reg)
-#define I830_WRITE16(reg,val)   DRM_WRITE16(dev_priv->mmio_map, reg, val)
+#define I830_WRITE16(reg, val)  DRM_WRITE16(dev_priv->mmio_map, reg, val)
 #define I830_VERBOSE 0
 #define RING_LOCALS     unsigned int outring, ringmask, outcount; \
-                        volatile char *virt;
+                        volatile char *virt;
 #define BEGIN_LP_RING(n) do {                           \
        if (I830_VERBOSE)                               \
                printk("BEGIN_LP_RING(%d)\n", (n));     \
        if (dev_priv->ring.space < n*4)                 \
-                i830_wait_ring(dev, n*4, __func__);             \
+                i830_wait_ring(dev, n*4, __func__);     \
        outcount = 0;                                   \
        outring = dev_priv->ring.tail;                  \
        ringmask = dev_priv->ring.tail_mask;            \
@@ -166,21 +167,23 @@ extern int i830_driver_device_is_agp(struct drm_device * dev);
 } while (0)
 #define OUT_RING(n) do {                                        \
-        if (I830_VERBOSE) printk("   OUT_RING %x\n", (int)(n)); \
+        if (I830_VERBOSE)                                       \
+                printk("   OUT_RING %x\n", (int)(n));           \
        *(volatile unsigned int *)(virt + outring) = n;         \
-        outcount++;                                             \
+        outcount++;                                             \
        outring += 4;                                           \
        outring &= ringmask;                                    \
 } while (0)
-#define ADVANCE_LP_RING() do {                                          \
+#define ADVANCE_LP_RING() do {                                  \
-        if (I830_VERBOSE) printk("ADVANCE_LP_RING %x\n", outring);      \
+        if (I830_VERBOSE)                                       \
-        dev_priv->ring.tail = outring;                                  \
+                printk("ADVANCE_LP_RING %x\n", outring);        \
-        dev_priv->ring.space -= outcount * 4;                           \
+        dev_priv->ring.tail = outring;                          \
-        I830_WRITE(LP_RING + RING_TAIL, outring);                       \
+        dev_priv->ring.space -= outcount * 4;                   \
-} while(0)
+        I830_WRITE(LP_RING + RING_TAIL, outring);               \
+} while (0)
-extern int i830_wait_ring(struct drm_device * dev, int n, const char *caller);
+extern int i830_wait_ring(struct drm_device *dev, int n, const char *caller);
 #define GFX_OP_USER_INTERRUPT           ((0<<29)|(2<<23))
 #define GFX_OP_BREAKPOINT_INTERRUPT     ((0<<29)|(1<<23))
diff --git a/drivers/gpu/drm/i830/i830_irq.c b/drivers/gpu/drm/i830/i830_irq.c
index 91ec2bb497e9..d1a6b95d631d 100644
--- a/drivers/gpu/drm/i830/i830_irq.c
+++ b/drivers/gpu/drm/i830/i830_irq.c
@@ -53,7 +53,7 @@ irqreturn_t i830_driver_irq_handler(DRM_IRQ_ARGS)
        return IRQ_HANDLED;
 }
-static int i830_emit_irq(struct drm_device * dev)
+static int i830_emit_irq(struct drm_device *dev)
 {
        drm_i830_private_t *dev_priv = dev->dev_private;
        RING_LOCALS;
@@ -70,7 +70,7 @@ static int i830_emit_irq(struct drm_device * dev)
        return atomic_read(&dev_priv->irq_emitted);
 }
-static int i830_wait_irq(struct drm_device * dev, int irq_nr)
+static int i830_wait_irq(struct drm_device *dev, int irq_nr)
 {
        drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private;
        DECLARE_WAITQUEUE(entry, current);
@@ -156,7 +156,7 @@ int i830_irq_wait(struct drm_device *dev, void *data,
 /* drm_dma.h hooks
 */
-void i830_driver_irq_preinstall(struct drm_device * dev)
+void i830_driver_irq_preinstall(struct drm_device *dev)
 {
        drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private;
@@ -168,14 +168,14 @@ void i830_driver_irq_preinstall(struct drm_device * dev)
        init_waitqueue_head(&dev_priv->irq_queue);
 }
-void i830_driver_irq_postinstall(struct drm_device * dev)
+void i830_driver_irq_postinstall(struct drm_device *dev)
 {
        drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private;
        I830_WRITE16(I830REG_INT_ENABLE_R, 0x2);
 }
-void i830_driver_irq_uninstall(struct drm_device * dev)
+void i830_driver_irq_uninstall(struct drm_device *dev)
 {
        drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private;
        if (!dev_priv)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index aee83fa178f6..9214119c0154 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -605,6 +605,9 @@ static int i915_fbc_status(struct seq_file *m, void *unused)
                case FBC_NOT_TILED:
                        seq_printf(m, "scanout buffer not tiled");
                        break;
+                case FBC_MULTIPLE_PIPES:
+                        seq_printf(m, "multiple pipes are enabled");
+                        break;
                default:
                        seq_printf(m, "unknown reason");
                }
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index f00c5ae9556c..f19ffe87af3c 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -34,12 +34,15 @@
 #include "i915_drm.h"
 #include "i915_drv.h"
 #include "i915_trace.h"
+#include <linux/pci.h>
 #include <linux/vgaarb.h>
 #include <linux/acpi.h>
 #include <linux/pnp.h>
 #include <linux/vga_switcheroo.h>
 #include <linux/slab.h>
+extern int intel_max_stolen; /* from AGP driver */
 /**
 * Sets up the hardware status page for devices that need a physical address
 * in the register.
@@ -1256,7 +1259,7 @@ static void i915_setup_compression(struct drm_device *dev, int size)
                drm_mm_put_block(compressed_fb);
        }
-        if (!IS_GM45(dev)) {
+        if (!(IS_GM45(dev) || IS_IRONLAKE_M(dev))) {
                compressed_llb = drm_mm_search_free(&dev_priv->vram, 4096,
                                                    4096, 0);
                if (!compressed_llb) {
@@ -1282,8 +1285,9 @@ static void i915_setup_compression(struct drm_device *dev, int size)
        intel_disable_fbc(dev);
        dev_priv->compressed_fb = compressed_fb;
+        if (IS_IRONLAKE_M(dev))
-        if (IS_GM45(dev)) {
+                I915_WRITE(ILK_DPFC_CB_BASE, compressed_fb->start);
+        else if (IS_GM45(dev)) {
                I915_WRITE(DPFC_CB_BASE, compressed_fb->start);
        } else {
                I915_WRITE(FBC_CFB_BASE, cfb_base);
@@ -1291,7 +1295,7 @@ static void i915_setup_compression(struct drm_device *dev, int size)
                dev_priv->compressed_llb = compressed_llb;
        }
-        DRM_DEBUG("FBC base 0x%08lx, ll base 0x%08lx, size %dM\n", cfb_base,
+        DRM_DEBUG_KMS("FBC base 0x%08lx, ll base 0x%08lx, size %dM\n", cfb_base,
                  ll_base, size >> 20);
 }
@@ -1300,7 +1304,7 @@ static void i915_cleanup_compression(struct drm_device *dev)
        struct drm_i915_private *dev_priv = dev->dev_private;
        drm_mm_put_block(dev_priv->compressed_fb);
-        if (!IS_GM45(dev))
+        if (dev_priv->compressed_llb)
                drm_mm_put_block(dev_priv->compressed_llb);
 }
@@ -1354,7 +1358,7 @@ static int i915_load_modeset_init(struct drm_device *dev,
        int fb_bar = IS_I9XX(dev) ? 2 : 0;
        int ret = 0;
-        dev->mode_config.fb_base = drm_get_resource_start(dev, fb_bar) &
+        dev->mode_config.fb_base = pci_resource_start(dev->pdev, fb_bar) &
                0xff000000;
        /* Basic memrange allocator for stolen space (aka vram) */
@@ -2063,8 +2067,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
        /* Add register map (needed for suspend/resume) */
        mmio_bar = IS_I9XX(dev) ? 0 : 1;
-        base = drm_get_resource_start(dev, mmio_bar);
+        base = pci_resource_start(dev->pdev, mmio_bar);
-        size = drm_get_resource_len(dev, mmio_bar);
+        size = pci_resource_len(dev->pdev, mmio_bar);
        if (i915_get_bridge_dev(dev)) {
                ret = -EIO;
@@ -2104,6 +2108,12 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
        if (ret)
                goto out_iomapfree;
+        if (prealloc_size > intel_max_stolen) {
+                DRM_INFO("detected %dM stolen memory, trimming to %dM\n",
+                         prealloc_size >> 20, intel_max_stolen >> 20);
+                prealloc_size = intel_max_stolen;
+        }
        dev_priv->wq = create_singlethread_workqueue("i915");
        if (dev_priv->wq == NULL) {
                DRM_ERROR("Failed to create our workqueue.\n");
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 423dc90c1e20..5044f653e8ea 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -93,11 +93,11 @@ static const struct intel_device_info intel_i945gm_info = {
 };
 static const struct intel_device_info intel_i965g_info = {
-        .is_i965g = 1, .is_i9xx = 1, .has_hotplug = 1,
+        .is_broadwater = 1, .is_i965g = 1, .is_i9xx = 1, .has_hotplug = 1,
 };
 static const struct intel_device_info intel_i965gm_info = {
-        .is_i965g = 1, .is_mobile = 1, .is_i965gm = 1, .is_i9xx = 1,
+        .is_crestline = 1, .is_i965g = 1, .is_i965gm = 1, .is_i9xx = 1,
        .is_mobile = 1, .has_fbc = 1, .has_rc6 = 1,
        .has_hotplug = 1,
 };
@@ -114,7 +114,7 @@ static const struct intel_device_info intel_g45_info = {
 };
 static const struct intel_device_info intel_gm45_info = {
-        .is_i965g = 1, .is_mobile = 1, .is_g4x = 1, .is_i9xx = 1,
+        .is_i965g = 1, .is_g4x = 1, .is_i9xx = 1,
        .is_mobile = 1, .need_gfx_hws = 1, .has_fbc = 1, .has_rc6 = 1,
        .has_pipe_cxsr = 1,
        .has_hotplug = 1,
@@ -134,7 +134,7 @@ static const struct intel_device_info intel_ironlake_d_info = {
 static const struct intel_device_info intel_ironlake_m_info = {
        .is_ironlake = 1, .is_mobile = 1, .is_i965g = 1, .is_i9xx = 1,
-        .need_gfx_hws = 1, .has_rc6 = 1,
+        .need_gfx_hws = 1, .has_fbc = 1, .has_rc6 = 1,
        .has_hotplug = 1,
 };
@@ -148,33 +148,33 @@ static const struct intel_device_info intel_sandybridge_m_info = {
        .has_hotplug = 1, .is_gen6 = 1,
 };
-static const struct pci_device_id pciidlist[] = {
+static const struct pci_device_id pciidlist[] = {               /* aka */
-        INTEL_VGA_DEVICE(0x3577, &intel_i830_info),
+        INTEL_VGA_DEVICE(0x3577, &intel_i830_info),             /* I830_M */
-        INTEL_VGA_DEVICE(0x2562, &intel_845g_info),
+        INTEL_VGA_DEVICE(0x2562, &intel_845g_info),             /* 845_G */
-        INTEL_VGA_DEVICE(0x3582, &intel_i85x_info),
+        INTEL_VGA_DEVICE(0x3582, &intel_i85x_info),             /* I855_GM */
        INTEL_VGA_DEVICE(0x358e, &intel_i85x_info),
-        INTEL_VGA_DEVICE(0x2572, &intel_i865g_info),
+        INTEL_VGA_DEVICE(0x2572, &intel_i865g_info),            /* I865_G */
-        INTEL_VGA_DEVICE(0x2582, &intel_i915g_info),
+        INTEL_VGA_DEVICE(0x2582, &intel_i915g_info),            /* I915_G */
-        INTEL_VGA_DEVICE(0x258a, &intel_i915g_info),
+        INTEL_VGA_DEVICE(0x258a, &intel_i915g_info),            /* E7221_G */
-        INTEL_VGA_DEVICE(0x2592, &intel_i915gm_info),
+        INTEL_VGA_DEVICE(0x2592, &intel_i915gm_info),           /* I915_GM */
-        INTEL_VGA_DEVICE(0x2772, &intel_i945g_info),
+        INTEL_VGA_DEVICE(0x2772, &intel_i945g_info),            /* I945_G */
-        INTEL_VGA_DEVICE(0x27a2, &intel_i945gm_info),
+        INTEL_VGA_DEVICE(0x27a2, &intel_i945gm_info),           /* I945_GM */
-        INTEL_VGA_DEVICE(0x27ae, &intel_i945gm_info),
+        INTEL_VGA_DEVICE(0x27ae, &intel_i945gm_info),           /* I945_GME */
-        INTEL_VGA_DEVICE(0x2972, &intel_i965g_info),
+        INTEL_VGA_DEVICE(0x2972, &intel_i965g_info),            /* I946_GZ */
-        INTEL_VGA_DEVICE(0x2982, &intel_i965g_info),
+        INTEL_VGA_DEVICE(0x2982, &intel_i965g_info),            /* G35_G */
-        INTEL_VGA_DEVICE(0x2992, &intel_i965g_info),
+        INTEL_VGA_DEVICE(0x2992, &intel_i965g_info),            /* I965_Q */
-        INTEL_VGA_DEVICE(0x29a2, &intel_i965g_info),
+        INTEL_VGA_DEVICE(0x29a2, &intel_i965g_info),            /* I965_G */
-        INTEL_VGA_DEVICE(0x29b2, &intel_g33_info),
+        INTEL_VGA_DEVICE(0x29b2, &intel_g33_info),              /* Q35_G */
-        INTEL_VGA_DEVICE(0x29c2, &intel_g33_info),
+        INTEL_VGA_DEVICE(0x29c2, &intel_g33_info),              /* G33_G */
-        INTEL_VGA_DEVICE(0x29d2, &intel_g33_info),
+        INTEL_VGA_DEVICE(0x29d2, &intel_g33_info),              /* Q33_G */
-        INTEL_VGA_DEVICE(0x2a02, &intel_i965gm_info),
+        INTEL_VGA_DEVICE(0x2a02, &intel_i965gm_info),           /* I965_GM */
-        INTEL_VGA_DEVICE(0x2a12, &intel_i965gm_info),
+        INTEL_VGA_DEVICE(0x2a12, &intel_i965gm_info),           /* I965_GME */
-        INTEL_VGA_DEVICE(0x2a42, &intel_gm45_info),
+        INTEL_VGA_DEVICE(0x2a42, &intel_gm45_info),             /* GM45_G */
-        INTEL_VGA_DEVICE(0x2e02, &intel_g45_info),
+        INTEL_VGA_DEVICE(0x2e02, &intel_g45_info),              /* IGD_E_G */
-        INTEL_VGA_DEVICE(0x2e12, &intel_g45_info),
+        INTEL_VGA_DEVICE(0x2e12, &intel_g45_info),              /* Q45_G */
-        INTEL_VGA_DEVICE(0x2e22, &intel_g45_info),
+        INTEL_VGA_DEVICE(0x2e22, &intel_g45_info),              /* G45_G */
-        INTEL_VGA_DEVICE(0x2e32, &intel_g45_info),
+        INTEL_VGA_DEVICE(0x2e32, &intel_g45_info),              /* G41_G */
-        INTEL_VGA_DEVICE(0x2e42, &intel_g45_info),
+        INTEL_VGA_DEVICE(0x2e42, &intel_g45_info),              /* B43_G */
        INTEL_VGA_DEVICE(0xa001, &intel_pineview_info),
        INTEL_VGA_DEVICE(0xa011, &intel_pineview_info),
        INTEL_VGA_DEVICE(0x0042, &intel_ironlake_d_info),
@@ -340,7 +340,7 @@ int i965_reset(struct drm_device *dev, u8 flags)
        /*
         * Clear request list
         */
-        i915_gem_retire_requests(dev, &dev_priv->render_ring);
+        i915_gem_retire_requests(dev);
        if (need_display)
                i915_save_display(dev);
@@ -413,7 +413,7 @@ int i965_reset(struct drm_device *dev, u8 flags)
 static int __devinit
 i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
-        return drm_get_dev(pdev, ent, &driver);
+        return drm_get_pci_dev(pdev, ent, &driver);
 }
 static void
@@ -482,7 +482,7 @@ static int i915_pm_poweroff(struct device *dev)
        return i915_drm_freeze(drm_dev);
 }
-const struct dev_pm_ops i915_pm_ops = {
+static const struct dev_pm_ops i915_pm_ops = {
     .suspend = i915_pm_suspend,
     .resume = i915_pm_resume,
     .freeze = i915_pm_freeze,
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index d147ab2f5bfc..906663b9929e 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -176,7 +176,8 @@ struct drm_i915_display_funcs {
        int (*get_display_clock_speed)(struct drm_device *dev);
        int (*get_fifo_size)(struct drm_device *dev, int plane);
        void (*update_wm)(struct drm_device *dev, int planea_clock,
-                          int planeb_clock, int sr_hdisplay, int pixel_size);
+                          int planeb_clock, int sr_hdisplay, int sr_htotal,
+                          int pixel_size);
        /* clock updates for mode set */
        /* cursor updates */
        /* render clock increase/decrease */
@@ -200,6 +201,8 @@ struct intel_device_info {
        u8 need_gfx_hws : 1;
        u8 is_g4x : 1;
        u8 is_pineview : 1;
+        u8 is_broadwater : 1;
+        u8 is_crestline : 1;
        u8 is_ironlake : 1;
        u8 is_gen6 : 1;
        u8 has_fbc : 1;
@@ -215,6 +218,7 @@ enum no_fbc_reason {
        FBC_MODE_TOO_LARGE, /* mode too large for compression */
        FBC_BAD_PLANE, /* fbc not supported on plane */
        FBC_NOT_TILED, /* buffer not tiled */
+        FBC_MULTIPLE_PIPES, /* more than one pipe active */
 };
 enum intel_pch {
@@ -222,6 +226,8 @@ enum intel_pch {
        PCH_CPT,        /* Cougarpoint PCH */
 };
+#define QUIRK_PIPEA_FORCE (1<<0)
 struct intel_fbdev;
 typedef struct drm_i915_private {
@@ -285,6 +291,8 @@ typedef struct drm_i915_private {
        struct timer_list hangcheck_timer;
        int hangcheck_count;
        uint32_t last_acthd;
+        uint32_t last_instdone;
+        uint32_t last_instdone1;
        struct drm_mm vram;
@@ -337,6 +345,8 @@ typedef struct drm_i915_private {
        /* PCH chipset type */
        enum intel_pch pch_type;
+        unsigned long quirks;
        /* Register state */
        bool modeset_on_lid;
        u8 saveLBB;
@@ -542,6 +552,14 @@ typedef struct drm_i915_private {
                struct list_head fence_list;
                /**
+                 * List of objects currently pending being freed.
+                 *
+                 * These objects are no longer in use, but due to a signal
+                 * we were prevented from freeing them at the appointed time.
+                 */
+                struct list_head deferred_free_list;
+                /**
                 * We leave the user IRQ off as much as possible,
                 * but this means that requests will finish and never
                 * be retired once the system goes idle. Set a timer to
@@ -672,7 +690,7 @@ struct drm_i915_gem_object {
         *
         * Size: 4 bits for 16 fences + sign (for FENCE_REG_NONE)
         */
-        int fence_reg : 5;
+        signed int fence_reg : 5;
        /**
         * Used for checking the object doesn't appear more than once
@@ -708,7 +726,7 @@ struct drm_i915_gem_object {
         *
         * In the worst case this is 1 + 1 + 1 + 2*2 = 7. That would fit into 3
         * bits with absolutely no headroom. So use 4 bits. */
-        int pin_count : 4;
+        unsigned int pin_count : 4;
 #define DRM_I915_GEM_OBJECT_MAX_PIN_COUNT 0xf
        /** AGP memory structure for our GTT binding. */
@@ -738,7 +756,7 @@ struct drm_i915_gem_object {
        uint32_t stride;
        /** Record of address bit 17 of each page at last unbind. */
-        long *bit_17;
+        unsigned long *bit_17;
        /** AGP mapping type (AGP_USER_MEMORY or AGP_USER_CACHED_MEMORY */
        uint32_t agp_type;
@@ -950,8 +968,7 @@ uint32_t i915_get_gem_seqno(struct drm_device *dev,
 bool i915_seqno_passed(uint32_t seq1, uint32_t seq2);
 int i915_gem_object_get_fence_reg(struct drm_gem_object *obj);
 int i915_gem_object_put_fence_reg(struct drm_gem_object *obj);
-void i915_gem_retire_requests(struct drm_device *dev,
+void i915_gem_retire_requests(struct drm_device *dev);
-                 struct intel_ring_buffer *ring);
 void i915_gem_retire_work_handler(struct work_struct *work);
 void i915_gem_clflush_object(struct drm_gem_object *obj);
 int i915_gem_object_set_domain(struct drm_gem_object *obj,
@@ -981,7 +998,7 @@ void i915_gem_free_all_phys_object(struct drm_device *dev);
 int i915_gem_object_get_pages(struct drm_gem_object *obj, gfp_t gfpmask);
 void i915_gem_object_put_pages(struct drm_gem_object *obj);
 void i915_gem_release(struct drm_device * dev, struct drm_file *file_priv);
-void i915_gem_object_flush_write_domain(struct drm_gem_object *obj);
+int i915_gem_object_flush_write_domain(struct drm_gem_object *obj);
 void i915_gem_shrinker_init(void);
 void i915_gem_shrinker_exit(void);
@@ -1041,6 +1058,7 @@ extern void intel_modeset_cleanup(struct drm_device *dev);
 extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state);
 extern void i8xx_disable_fbc(struct drm_device *dev);
 extern void g4x_disable_fbc(struct drm_device *dev);
+extern void ironlake_disable_fbc(struct drm_device *dev);
 extern void intel_disable_fbc(struct drm_device *dev);
 extern void intel_enable_fbc(struct drm_crtc *crtc, unsigned long interval);
 extern bool intel_fbc_enabled(struct drm_device *dev);
@@ -1130,6 +1148,8 @@ extern int intel_trans_dp_port_sel (struct drm_crtc *crtc);
 #define IS_I945GM(dev)          (INTEL_INFO(dev)->is_i945gm)
 #define IS_I965G(dev)           (INTEL_INFO(dev)->is_i965g)
 #define IS_I965GM(dev)          (INTEL_INFO(dev)->is_i965gm)
+#define IS_BROADWATER(dev)      (INTEL_INFO(dev)->is_broadwater)
+#define IS_CRESTLINE(dev)       (INTEL_INFO(dev)->is_crestline)
 #define IS_GM45(dev)            ((dev)->pci_device == 0x2A42)
 #define IS_G4X(dev)             (INTEL_INFO(dev)->is_g4x)
 #define IS_PINEVIEW_G(dev)      ((dev)->pci_device == 0xa001)
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 074385882ccf..2a4ed7ca8b4e 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -35,7 +35,7 @@
 #include <linux/swap.h>
 #include <linux/pci.h>
-static void i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj);
+static int i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj);
 static void i915_gem_object_flush_gtt_write_domain(struct drm_gem_object *obj);
 static void i915_gem_object_flush_cpu_write_domain(struct drm_gem_object *obj);
 static int i915_gem_object_set_to_cpu_domain(struct drm_gem_object *obj,
@@ -53,6 +53,7 @@ static int i915_gem_evict_from_inactive_list(struct drm_device *dev);
 static int i915_gem_phys_pwrite(struct drm_device *dev, struct drm_gem_object *obj,
                                struct drm_i915_gem_pwrite *args,
                                struct drm_file *file_priv);
+static void i915_gem_free_object_tail(struct drm_gem_object *obj);
 static LIST_HEAD(shrink_list);
 static DEFINE_SPINLOCK(shrink_list_lock);
@@ -127,8 +128,7 @@ i915_gem_create_ioctl(struct drm_device *dev, void *data,
                return -ENOMEM;
        ret = drm_gem_handle_create(file_priv, obj, &handle);
-        drm_gem_object_handle_unreference_unlocked(obj);
+        drm_gem_object_unreference_unlocked(obj);
        if (ret)
                return ret;
@@ -496,10 +496,10 @@ fast_user_write(struct io_mapping *mapping,
        char *vaddr_atomic;
        unsigned long unwritten;
-        vaddr_atomic = io_mapping_map_atomic_wc(mapping, page_base);
+        vaddr_atomic = io_mapping_map_atomic_wc(mapping, page_base, KM_USER0);
        unwritten = __copy_from_user_inatomic_nocache(vaddr_atomic + page_offset,
                                                      user_data, length);
-        io_mapping_unmap_atomic(vaddr_atomic);
+        io_mapping_unmap_atomic(vaddr_atomic, KM_USER0);
        if (unwritten)
                return -EFAULT;
        return 0;
@@ -1709,9 +1709,9 @@ i915_get_gem_seqno(struct drm_device *dev,
 /**
 * This function clears the request list as sequence numbers are passed.
 */
-void
+static void
-i915_gem_retire_requests(struct drm_device *dev,
+i915_gem_retire_requests_ring(struct drm_device *dev,
-                struct intel_ring_buffer *ring)
+                              struct intel_ring_buffer *ring)
 {
        drm_i915_private_t *dev_priv = dev->dev_private;
        uint32_t seqno;
@@ -1751,6 +1751,30 @@ i915_gem_retire_requests(struct drm_device *dev,
 }
 void
+i915_gem_retire_requests(struct drm_device *dev)
+{
+        drm_i915_private_t *dev_priv = dev->dev_private;
+        if (!list_empty(&dev_priv->mm.deferred_free_list)) {
+            struct drm_i915_gem_object *obj_priv, *tmp;
+            /* We must be careful that during unbind() we do not
+             * accidentally infinitely recurse into retire requests.
+             * Currently:
+             *   retire -> free -> unbind -> wait -> retire_ring
+             */
+            list_for_each_entry_safe(obj_priv, tmp,
+                                     &dev_priv->mm.deferred_free_list,
+                                     list)
+                    i915_gem_free_object_tail(&obj_priv->base);
+        }
+        i915_gem_retire_requests_ring(dev, &dev_priv->render_ring);
+        if (HAS_BSD(dev))
+                i915_gem_retire_requests_ring(dev, &dev_priv->bsd_ring);
+}
+void
 i915_gem_retire_work_handler(struct work_struct *work)
 {
        drm_i915_private_t *dev_priv;
@@ -1761,10 +1785,7 @@ i915_gem_retire_work_handler(struct work_struct *work)
        dev = dev_priv->dev;
        mutex_lock(&dev->struct_mutex);
-        i915_gem_retire_requests(dev, &dev_priv->render_ring);
+        i915_gem_retire_requests(dev);
-        if (HAS_BSD(dev))
-                i915_gem_retire_requests(dev, &dev_priv->bsd_ring);
        if (!dev_priv->mm.suspended &&
                (!list_empty(&dev_priv->render_ring.request_list) ||
@@ -1832,7 +1853,7 @@ i915_do_wait_request(struct drm_device *dev, uint32_t seqno,
         * a separate wait queue to handle that.
         */
        if (ret == 0)
-                i915_gem_retire_requests(dev, ring);
+                i915_gem_retire_requests_ring(dev, ring);
        return ret;
 }
@@ -1945,11 +1966,12 @@ i915_gem_object_unbind(struct drm_gem_object *obj)
         * before we unbind.
         */
        ret = i915_gem_object_set_to_cpu_domain(obj, 1);
-        if (ret) {
+        if (ret == -ERESTARTSYS)
-                if (ret != -ERESTARTSYS)
-                        DRM_ERROR("set_domain failed: %d\n", ret);
                return ret;
-        }
+        /* Continue on if we fail due to EIO, the GPU is hung so we
+         * should be safe and we need to cleanup or else we might
+         * cause memory corruption through use-after-free.
+         */
        BUG_ON(obj_priv->active);
@@ -1985,7 +2007,7 @@ i915_gem_object_unbind(struct drm_gem_object *obj)
        trace_i915_gem_object_unbind(obj);
-        return 0;
+        return ret;
 }
 static struct drm_gem_object *
@@ -2107,10 +2129,7 @@ i915_gem_evict_something(struct drm_device *dev, int min_size)
        struct intel_ring_buffer *render_ring = &dev_priv->render_ring;
        struct intel_ring_buffer *bsd_ring = &dev_priv->bsd_ring;
        for (;;) {
-                i915_gem_retire_requests(dev, render_ring);
+                i915_gem_retire_requests(dev);
-                if (HAS_BSD(dev))
-                        i915_gem_retire_requests(dev, bsd_ring);
                /* If there's an inactive buffer available now, grab it
                 * and be done.
@@ -2241,6 +2260,7 @@ i915_gem_object_get_pages(struct drm_gem_object *obj,
                page = read_cache_page_gfp(mapping, i,
                                           GFP_HIGHUSER |
                                           __GFP_COLD |
+                                           __GFP_RECLAIMABLE |
                                           gfpmask);
                if (IS_ERR(page))
                        goto err_pages;
@@ -2582,7 +2602,10 @@ i915_gem_object_put_fence_reg(struct drm_gem_object *obj)
        if (!IS_I965G(dev)) {
                int ret;
-                i915_gem_object_flush_gpu_write_domain(obj);
+                ret = i915_gem_object_flush_gpu_write_domain(obj);
+                if (ret != 0)
+                        return ret;
                ret = i915_gem_object_wait_rendering(obj);
                if (ret != 0)
                        return ret;
@@ -2633,10 +2656,8 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment)
        if (free_space != NULL) {
                obj_priv->gtt_space = drm_mm_get_block(free_space, obj->size,
                                                       alignment);
-                if (obj_priv->gtt_space != NULL) {
+                if (obj_priv->gtt_space != NULL)
-                        obj_priv->gtt_space->private = obj;
                        obj_priv->gtt_offset = obj_priv->gtt_space->start;
-                }
        }
        if (obj_priv->gtt_space == NULL) {
                /* If the gtt is empty and we're still having trouble
@@ -2732,7 +2753,7 @@ i915_gem_clflush_object(struct drm_gem_object *obj)
 }
 /** Flushes any GPU write domain for the object if it's dirty. */
-static void
+static int
 i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj)
 {
        struct drm_device *dev = obj->dev;
@@ -2740,17 +2761,18 @@ i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj)
        struct drm_i915_gem_object *obj_priv = to_intel_bo(obj);
        if ((obj->write_domain & I915_GEM_GPU_DOMAINS) == 0)
-                return;
+                return 0;
        /* Queue the GPU write cache flushing we need. */
        old_write_domain = obj->write_domain;
        i915_gem_flush(dev, 0, obj->write_domain);
-        (void) i915_add_request(dev, NULL, obj->write_domain, obj_priv->ring);
+        if (i915_add_request(dev, NULL, obj->write_domain, obj_priv->ring) == 0)
-        BUG_ON(obj->write_domain);
+                return -ENOMEM;
        trace_i915_gem_object_change_domain(obj,
                                            obj->read_domains,
                                            old_write_domain);
+        return 0;
 }
 /** Flushes the GTT write domain for the object if it's dirty. */
@@ -2794,9 +2816,11 @@ i915_gem_object_flush_cpu_write_domain(struct drm_gem_object *obj)
                                            old_write_domain);
 }
-void
+int
 i915_gem_object_flush_write_domain(struct drm_gem_object *obj)
 {
+        int ret = 0;
        switch (obj->write_domain) {
        case I915_GEM_DOMAIN_GTT:
                i915_gem_object_flush_gtt_write_domain(obj);
@@ -2805,9 +2829,11 @@ i915_gem_object_flush_write_domain(struct drm_gem_object *obj)
                i915_gem_object_flush_cpu_write_domain(obj);
                break;
        default:
-                i915_gem_object_flush_gpu_write_domain(obj);
+                ret = i915_gem_object_flush_gpu_write_domain(obj);
                break;
        }
+        return ret;
 }
 /**
@@ -2827,7 +2853,10 @@ i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj, int write)
        if (obj_priv->gtt_space == NULL)
                return -EINVAL;
-        i915_gem_object_flush_gpu_write_domain(obj);
+        ret = i915_gem_object_flush_gpu_write_domain(obj);
+        if (ret != 0)
+                return ret;
        /* Wait on any GPU rendering and flushing to occur. */
        ret = i915_gem_object_wait_rendering(obj);
        if (ret != 0)
@@ -2877,7 +2906,9 @@ i915_gem_object_set_to_display_plane(struct drm_gem_object *obj)
        if (obj_priv->gtt_space == NULL)
                return -EINVAL;
-        i915_gem_object_flush_gpu_write_domain(obj);
+        ret = i915_gem_object_flush_gpu_write_domain(obj);
+        if (ret)
+                return ret;
        /* Wait on any GPU rendering and flushing to occur. */
        if (obj_priv->active) {
@@ -2925,7 +2956,10 @@ i915_gem_object_set_to_cpu_domain(struct drm_gem_object *obj, int write)
        uint32_t old_write_domain, old_read_domains;
        int ret;
-        i915_gem_object_flush_gpu_write_domain(obj);
+        ret = i915_gem_object_flush_gpu_write_domain(obj);
+        if (ret)
+                return ret;
        /* Wait on any GPU rendering and flushing to occur. */
        ret = i915_gem_object_wait_rendering(obj);
        if (ret != 0)
@@ -3215,7 +3249,10 @@ i915_gem_object_set_cpu_read_domain_range(struct drm_gem_object *obj,
        if (offset == 0 && size == obj->size)
                return i915_gem_object_set_to_cpu_domain(obj, 0);
-        i915_gem_object_flush_gpu_write_domain(obj);
+        ret = i915_gem_object_flush_gpu_write_domain(obj);
+        if (ret)
+                return ret;
        /* Wait on any GPU rendering and flushing to occur. */
        ret = i915_gem_object_wait_rendering(obj);
        if (ret != 0)
@@ -3450,7 +3487,8 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj,
                reloc_offset = obj_priv->gtt_offset + reloc->offset;
                reloc_page = io_mapping_map_atomic_wc(dev_priv->mm.gtt_mapping,
                                                      (reloc_offset &
-                                                       ~(PAGE_SIZE - 1)));
+                                                       ~(PAGE_SIZE - 1)),
+                                                      KM_USER0);
                reloc_entry = (uint32_t __iomem *)(reloc_page +
                                                   (reloc_offset & (PAGE_SIZE - 1)));
                reloc_val = target_obj_priv->gtt_offset + reloc->delta;
@@ -3461,7 +3499,7 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj,
                          readl(reloc_entry), reloc_val);
 #endif
                writel(reloc_val, reloc_entry);
-                io_mapping_unmap_atomic(reloc_page);
+                io_mapping_unmap_atomic(reloc_page, KM_USER0);
                /* The updated presumed offset for this entry will be
                 * copied back out to the user.
@@ -3646,6 +3684,7 @@ i915_gem_wait_for_pending_flip(struct drm_device *dev,
        return ret;
 }
 int
 i915_gem_do_execbuffer(struct drm_device *dev, void *data,
                       struct drm_file *file_priv,
@@ -3793,7 +3832,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
                                unsigned long long total_size = 0;
                                int num_fences = 0;
                                for (i = 0; i < args->buffer_count; i++) {
-                                        obj_priv = object_list[i]->driver_private;
+                                        obj_priv = to_intel_bo(object_list[i]);
                                        total_size += object_list[i]->size;
                                        num_fences +=
@@ -4311,7 +4350,6 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data,
        struct drm_i915_gem_busy *args = data;
        struct drm_gem_object *obj;
        struct drm_i915_gem_object *obj_priv;
-        drm_i915_private_t *dev_priv = dev->dev_private;
        obj = drm_gem_object_lookup(dev, file_priv, args->handle);
        if (obj == NULL) {
@@ -4326,10 +4364,7 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data,
         * actually unmasked, and our working set ends up being larger than
         * required.
         */
-        i915_gem_retire_requests(dev, &dev_priv->render_ring);
+        i915_gem_retire_requests(dev);
-        if (HAS_BSD(dev))
-                i915_gem_retire_requests(dev, &dev_priv->bsd_ring);
        obj_priv = to_intel_bo(obj);
        /* Don't count being on the flushing list against the object being
@@ -4439,20 +4474,19 @@ int i915_gem_init_object(struct drm_gem_object *obj)
        return 0;
 }
-void i915_gem_free_object(struct drm_gem_object *obj)
+static void i915_gem_free_object_tail(struct drm_gem_object *obj)
 {
        struct drm_device *dev = obj->dev;
+        drm_i915_private_t *dev_priv = dev->dev_private;
        struct drm_i915_gem_object *obj_priv = to_intel_bo(obj);
+        int ret;
-        trace_i915_gem_object_destroy(obj);
+        ret = i915_gem_object_unbind(obj);
+        if (ret == -ERESTARTSYS) {
-        while (obj_priv->pin_count > 0)
+                list_move(&obj_priv->list,
-                i915_gem_object_unpin(obj);
+                          &dev_priv->mm.deferred_free_list);
+                return;
-        if (obj_priv->phys_obj)
+        }
-                i915_gem_detach_phys_object(dev, obj);
-        i915_gem_object_unbind(obj);
        if (obj_priv->mmap_offset)
                i915_gem_free_mmap_offset(obj);
@@ -4464,6 +4498,22 @@ void i915_gem_free_object(struct drm_gem_object *obj)
        kfree(obj_priv);
 }
+void i915_gem_free_object(struct drm_gem_object *obj)
+{
+        struct drm_device *dev = obj->dev;
+        struct drm_i915_gem_object *obj_priv = to_intel_bo(obj);
+        trace_i915_gem_object_destroy(obj);
+        while (obj_priv->pin_count > 0)
+                i915_gem_object_unpin(obj);
+        if (obj_priv->phys_obj)
+                i915_gem_detach_phys_object(dev, obj);
+        i915_gem_free_object_tail(obj);
+}
 /** Unbinds all inactive objects. */
 static int
 i915_gem_evict_from_inactive_list(struct drm_device *dev)
@@ -4687,9 +4737,19 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data,
        BUG_ON(HAS_BSD(dev) && !list_empty(&dev_priv->bsd_ring.request_list));
        mutex_unlock(&dev->struct_mutex);
-        drm_irq_install(dev);
+        ret = drm_irq_install(dev);
+        if (ret)
+                goto cleanup_ringbuffer;
        return 0;
+cleanup_ringbuffer:
+        mutex_lock(&dev->struct_mutex);
+        i915_gem_cleanup_ringbuffer(dev);
+        dev_priv->mm.suspended = 1;
+        mutex_unlock(&dev->struct_mutex);
+        return ret;
 }
 int
@@ -4727,6 +4787,7 @@ i915_gem_load(struct drm_device *dev)
        INIT_LIST_HEAD(&dev_priv->mm.gpu_write_list);
        INIT_LIST_HEAD(&dev_priv->mm.inactive_list);
        INIT_LIST_HEAD(&dev_priv->mm.fence_list);
+        INIT_LIST_HEAD(&dev_priv->mm.deferred_free_list);
        INIT_LIST_HEAD(&dev_priv->render_ring.active_list);
        INIT_LIST_HEAD(&dev_priv->render_ring.request_list);
        if (HAS_BSD(dev)) {
@@ -4741,6 +4802,16 @@ i915_gem_load(struct drm_device *dev)
        list_add(&dev_priv->mm.shrink_list, &shrink_list);
        spin_unlock(&shrink_list_lock);
+        /* On GEN3 we really need to make sure the ARB C3 LP bit is set */
+        if (IS_GEN3(dev)) {
+                u32 tmp = I915_READ(MI_ARB_STATE);
+                if (!(tmp & MI_ARB_C3_LP_WRITE_ENABLE)) {
+                        /* arb state is a masked write, so set bit + bit in mask */
+                        tmp = MI_ARB_C3_LP_WRITE_ENABLE | (MI_ARB_C3_LP_WRITE_ENABLE << MI_ARB_MASK_SHIFT);
+                        I915_WRITE(MI_ARB_STATE, tmp);
+                }
+        }
        /* Old X drivers will take 0-2 for front, back, depth buffers */
        if (!drm_core_check_feature(dev, DRIVER_MODESET))
                dev_priv->fence_reg_start = 3;
@@ -4977,7 +5048,7 @@ i915_gpu_is_active(struct drm_device *dev)
 }
 static int
-i915_gem_shrink(int nr_to_scan, gfp_t gfp_mask)
+i915_gem_shrink(struct shrinker *shrink, int nr_to_scan, gfp_t gfp_mask)
 {
        drm_i915_private_t *dev_priv, *next_dev;
        struct drm_i915_gem_object *obj_priv, *next_obj;
@@ -5015,10 +5086,7 @@ rescan:
                        continue;
                spin_unlock(&shrink_list_lock);
-                i915_gem_retire_requests(dev, &dev_priv->render_ring);
+                i915_gem_retire_requests(dev);
-                if (HAS_BSD(dev))
-                        i915_gem_retire_requests(dev, &dev_priv->bsd_ring);
                list_for_each_entry_safe(obj_priv, next_obj,
                                         &dev_priv->mm.inactive_list,
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
index 4b7c49d4257d..155719e4d16f 100644
--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
+++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
@@ -333,8 +333,6 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
                        i915_gem_release_mmap(obj);
                if (ret != 0) {
-                        WARN(ret != -ERESTARTSYS,
-                             "failed to reset object for tiling switch");
                        args->tiling_mode = obj_priv->tiling_mode;
                        args->stride = obj_priv->stride;
                        goto err;
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index dba53d4b9fb3..85785a8844ed 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -171,10 +171,10 @@ void intel_enable_asle (struct drm_device *dev)
                ironlake_enable_display_irq(dev_priv, DE_GSE);
        else {
                i915_enable_pipestat(dev_priv, 1,
-                                     I915_LEGACY_BLC_EVENT_ENABLE);
+                                     PIPE_LEGACY_BLC_EVENT_ENABLE);
                if (IS_I965G(dev))
                        i915_enable_pipestat(dev_priv, 0,
-                                             I915_LEGACY_BLC_EVENT_ENABLE);
+                                             PIPE_LEGACY_BLC_EVENT_ENABLE);
        }
 }
@@ -842,7 +842,6 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
        u32 iir, new_iir;
        u32 pipea_stats, pipeb_stats;
        u32 vblank_status;
-        u32 vblank_enable;
        int vblank = 0;
        unsigned long irqflags;
        int irq_received;
@@ -856,13 +855,10 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
        iir = I915_READ(IIR);
-        if (IS_I965G(dev)) {
+        if (IS_I965G(dev))
-                vblank_status = I915_START_VBLANK_INTERRUPT_STATUS;
+                vblank_status = PIPE_START_VBLANK_INTERRUPT_STATUS;
-                vblank_enable = PIPE_START_VBLANK_INTERRUPT_ENABLE;
+        else
-        } else {
+                vblank_status = PIPE_VBLANK_INTERRUPT_STATUS;
-                vblank_status = I915_VBLANK_INTERRUPT_STATUS;
-                vblank_enable = I915_VBLANK_INTERRUPT_ENABLE;
-        }
        for (;;) {
                irq_received = iir != 0;
@@ -966,8 +962,8 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
                                intel_finish_page_flip(dev, 1);
                }
-                if ((pipea_stats & I915_LEGACY_BLC_EVENT_STATUS) ||
+                if ((pipea_stats & PIPE_LEGACY_BLC_EVENT_STATUS) ||
-                    (pipeb_stats & I915_LEGACY_BLC_EVENT_STATUS) ||
+                    (pipeb_stats & PIPE_LEGACY_BLC_EVENT_STATUS) ||
                    (iir & I915_ASLE_INTERRUPT))
                        opregion_asle_intr(dev);
@@ -1233,16 +1229,21 @@ void i915_hangcheck_elapsed(unsigned long data)
 {
        struct drm_device *dev = (struct drm_device *)data;
        drm_i915_private_t *dev_priv = dev->dev_private;
-        uint32_t acthd;
+        uint32_t acthd, instdone, instdone1;
        /* No reset support on this chip yet. */
        if (IS_GEN6(dev))
                return;
-        if (!IS_I965G(dev))
+        if (!IS_I965G(dev)) {
                acthd = I915_READ(ACTHD);
-        else
+                instdone = I915_READ(INSTDONE);
+                instdone1 = 0;
+        } else {
                acthd = I915_READ(ACTHD_I965);
+                instdone = I915_READ(INSTDONE_I965);
+                instdone1 = I915_READ(INSTDONE1);
+        }
        /* If all work is done then ACTHD clearly hasn't advanced. */
        if (list_empty(&dev_priv->render_ring.request_list) ||
@@ -1253,21 +1254,24 @@ void i915_hangcheck_elapsed(unsigned long data)
                return;
        }
-        if (dev_priv->last_acthd == acthd && dev_priv->hangcheck_count > 0) {
+        if (dev_priv->last_acthd == acthd &&
-                DRM_ERROR("Hangcheck timer elapsed... GPU hung\n");
+            dev_priv->last_instdone == instdone &&
-                i915_handle_error(dev, true);
+            dev_priv->last_instdone1 == instdone1) {
-                return;
+                if (dev_priv->hangcheck_count++ > 1) {
-        } 
+                        DRM_ERROR("Hangcheck timer elapsed... GPU hung\n");
+                        i915_handle_error(dev, true);
+                        return;
+                }
+        } else {
+                dev_priv->hangcheck_count = 0;
+                dev_priv->last_acthd = acthd;
+                dev_priv->last_instdone = instdone;
+                dev_priv->last_instdone1 = instdone1;
+        }
        /* Reset timer case chip hangs without another request being added */
        mod_timer(&dev_priv->hangcheck_timer, jiffies + DRM_I915_HANGCHECK_PERIOD);
-        if (acthd != dev_priv->last_acthd)
-                dev_priv->hangcheck_count = 0;
-        else
-                dev_priv->hangcheck_count++;
-        dev_priv->last_acthd = acthd;
 }
 /* drm_dma.h hooks
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 150400f40534..281db6e5403a 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -359,6 +359,70 @@
 #define LM_BURST_LENGTH     0x00000700
 #define LM_FIFO_WATERMARK   0x0000001F
 #define MI_ARB_STATE    0x020e4 /* 915+ only */
+#define   MI_ARB_MASK_SHIFT       16    /* shift for enable bits */
+/* Make render/texture TLB fetches lower priorty than associated data
+ *   fetches. This is not turned on by default
+ */
+#define   MI_ARB_RENDER_TLB_LOW_PRIORITY        (1 << 15)
+/* Isoch request wait on GTT enable (Display A/B/C streams).
+ * Make isoch requests stall on the TLB update. May cause
+ * display underruns (test mode only)
+ */
+#define   MI_ARB_ISOCH_WAIT_GTT                 (1 << 14)
+/* Block grant count for isoch requests when block count is
+ * set to a finite value.
+ */
+#define   MI_ARB_BLOCK_GRANT_MASK               (3 << 12)
+#define   MI_ARB_BLOCK_GRANT_8                  (0 << 12)       /* for 3 display planes */
+#define   MI_ARB_BLOCK_GRANT_4                  (1 << 12)       /* for 2 display planes */
+#define   MI_ARB_BLOCK_GRANT_2                  (2 << 12)       /* for 1 display plane */
+#define   MI_ARB_BLOCK_GRANT_0                  (3 << 12)       /* don't use */
+/* Enable render writes to complete in C2/C3/C4 power states.
+ * If this isn't enabled, render writes are prevented in low
+ * power states. That seems bad to me.
+ */
+#define   MI_ARB_C3_LP_WRITE_ENABLE             (1 << 11)
+/* This acknowledges an async flip immediately instead
+ * of waiting for 2TLB fetches.
+ */
+#define   MI_ARB_ASYNC_FLIP_ACK_IMMEDIATE       (1 << 10)
+/* Enables non-sequential data reads through arbiter
+ */
+#define   MI_ARB_DUAL_DATA_PHASE_DISABLE        (1 << 9)
+/* Disable FSB snooping of cacheable write cycles from binner/render
+ * command stream
+ */
+#define   MI_ARB_CACHE_SNOOP_DISABLE            (1 << 8)
+/* Arbiter time slice for non-isoch streams */
+#define   MI_ARB_TIME_SLICE_MASK                (7 << 5)
+#define   MI_ARB_TIME_SLICE_1                   (0 << 5)
+#define   MI_ARB_TIME_SLICE_2                   (1 << 5)
+#define   MI_ARB_TIME_SLICE_4                   (2 << 5)
+#define   MI_ARB_TIME_SLICE_6                   (3 << 5)
+#define   MI_ARB_TIME_SLICE_8                   (4 << 5)
+#define   MI_ARB_TIME_SLICE_10                  (5 << 5)
+#define   MI_ARB_TIME_SLICE_14                  (6 << 5)
+#define   MI_ARB_TIME_SLICE_16                  (7 << 5)
+/* Low priority grace period page size */
+#define   MI_ARB_LOW_PRIORITY_GRACE_4KB         (0 << 4)        /* default */
+#define   MI_ARB_LOW_PRIORITY_GRACE_8KB         (1 << 4)
+/* Disable display A/B trickle feed */
+#define   MI_ARB_DISPLAY_TRICKLE_FEED_DISABLE   (1 << 2)
+/* Set display plane priority */
+#define   MI_ARB_DISPLAY_PRIORITY_A_B           (0 << 0)        /* display A > display B */
+#define   MI_ARB_DISPLAY_PRIORITY_B_A           (1 << 0)        /* display B > display A */
 #define CACHE_MODE_0    0x02120 /* 915+ only */
 #define   CM0_MASK_SHIFT          16
 #define   CM0_IZ_OPT_DISABLE      (1<<6)
@@ -378,7 +442,7 @@
 #define GEN6_RENDER_IMR         0x20a8
 #define   GEN6_RENDER_CONTEXT_SWITCH_INTERRUPT          (1 << 8)
 #define   GEN6_RENDER_PPGTT_PAGE_FAULT                  (1 << 7)
-#define   GEN6_RENDER TIMEOUT_COUNTER_EXPIRED           (1 << 6)
+#define   GEN6_RENDER_TIMEOUT_COUNTER_EXPIRED           (1 << 6)
 #define   GEN6_RENDER_L3_PARITY_ERROR                   (1 << 5)
 #define   GEN6_RENDER_PIPE_CONTROL_NOTIFY_INTERRUPT     (1 << 4)
 #define   GEN6_RENDER_COMMAND_PARSER_MASTER_ERROR       (1 << 3)
@@ -466,6 +530,21 @@
 #define DPFC_CHICKEN            0x3224
 #define   DPFC_HT_MODIFY        (1<<31)
+/* Framebuffer compression for Ironlake */
+#define ILK_DPFC_CB_BASE        0x43200
+#define ILK_DPFC_CONTROL        0x43208
+/* The bit 28-8 is reserved */
+#define   DPFC_RESERVED         (0x1FFFFF00)
+#define ILK_DPFC_RECOMP_CTL     0x4320c
+#define ILK_DPFC_STATUS         0x43210
+#define ILK_DPFC_FENCE_YOFF     0x43218
+#define ILK_DPFC_CHICKEN        0x43224
+#define ILK_FBC_RT_BASE         0x2128
+#define   ILK_FBC_RT_VALID      (1<<0)
+#define ILK_DISPLAY_CHICKEN1    0x42000
+#define   ILK_FBCQ_DIS          (1<<22)
 /*
 * GPIO regs
 */
@@ -531,32 +610,6 @@
 #define   DPLL_FPA01_P1_POST_DIV_MASK   0x00ff0000 /* i915 */
 #define   DPLL_FPA01_P1_POST_DIV_MASK_PINEVIEW  0x00ff8000 /* Pineview */
-#define I915_FIFO_UNDERRUN_STATUS               (1UL<<31)
-#define I915_CRC_ERROR_ENABLE                   (1UL<<29)
-#define I915_CRC_DONE_ENABLE                    (1UL<<28)
-#define I915_GMBUS_EVENT_ENABLE                 (1UL<<27)
-#define I915_VSYNC_INTERRUPT_ENABLE             (1UL<<25)
-#define I915_DISPLAY_LINE_COMPARE_ENABLE        (1UL<<24)
-#define I915_DPST_EVENT_ENABLE                  (1UL<<23)
-#define I915_LEGACY_BLC_EVENT_ENABLE            (1UL<<22)
-#define I915_ODD_FIELD_INTERRUPT_ENABLE         (1UL<<21)
-#define I915_EVEN_FIELD_INTERRUPT_ENABLE        (1UL<<20)
-#define I915_START_VBLANK_INTERRUPT_ENABLE      (1UL<<18)       /* 965 or later */
-#define I915_VBLANK_INTERRUPT_ENABLE            (1UL<<17)
-#define I915_OVERLAY_UPDATED_ENABLE             (1UL<<16)
-#define I915_CRC_ERROR_INTERRUPT_STATUS         (1UL<<13)
-#define I915_CRC_DONE_INTERRUPT_STATUS          (1UL<<12)
-#define I915_GMBUS_INTERRUPT_STATUS             (1UL<<11)
-#define I915_VSYNC_INTERRUPT_STATUS             (1UL<<9)
-#define I915_DISPLAY_LINE_COMPARE_STATUS        (1UL<<8)
-#define I915_DPST_EVENT_STATUS                  (1UL<<7)
-#define I915_LEGACY_BLC_EVENT_STATUS            (1UL<<6)
-#define I915_ODD_FIELD_INTERRUPT_STATUS         (1UL<<5)
-#define I915_EVEN_FIELD_INTERRUPT_STATUS        (1UL<<4)
-#define I915_START_VBLANK_INTERRUPT_STATUS      (1UL<<2)        /* 965 or later */
-#define I915_VBLANK_INTERRUPT_STATUS            (1UL<<1)
-#define I915_OVERLAY_UPDATED_STATUS             (1UL<<0)
 #define SRX_INDEX               0x3c4
 #define SRX_DATA                0x3c5
 #define SR01                    1
@@ -2102,7 +2155,8 @@
 #define I830_FIFO_LINE_SIZE     32
 #define G4X_FIFO_SIZE           127
-#define I945_FIFO_SIZE          127 /* 945 & 965 */
+#define I965_FIFO_SIZE          512
+#define I945_FIFO_SIZE          127
 #define I915_FIFO_SIZE          95
 #define I855GM_FIFO_SIZE        127 /* In cachelines */
 #define I830_FIFO_SIZE          95
@@ -2121,6 +2175,9 @@
 #define PINEVIEW_CURSOR_DFT_WM  0
 #define PINEVIEW_CURSOR_GUARD_WM        5
+#define I965_CURSOR_FIFO        64
+#define I965_CURSOR_MAX_WM      32
+#define I965_CURSOR_DFT_WM      8
 /* define the Watermark register on Ironlake */
 #define WM0_PIPEA_ILK           0x45100
@@ -2148,6 +2205,9 @@
 #define ILK_DISPLAY_FIFO        128
 #define ILK_DISPLAY_MAXWM       64
 #define ILK_DISPLAY_DFTWM       8
+#define ILK_CURSOR_FIFO         32
+#define ILK_CURSOR_MAXWM        16
+#define ILK_CURSOR_DFTWM        8
 #define ILK_DISPLAY_SR_FIFO     512
 #define ILK_DISPLAY_MAX_SRWM    0x1ff
@@ -2446,6 +2506,10 @@
 #define  ILK_VSDPFD_FULL        (1<<21)
 #define ILK_DSPCLK_GATE         0x42020
 #define  ILK_DPARB_CLK_GATE     (1<<5)
+/* According to spec this bit 7/8/9 of 0x42020 should be set to enable FBC */
+#define   ILK_CLK_FBC           (1<<7)
+#define   ILK_DPFC_DIS1         (1<<8)
+#define   ILK_DPFC_DIS2         (1<<9)
 #define DISP_ARB_CTL    0x45000
 #define  DISP_TILE_SURFACE_SWIZZLING    (1<<13)
@@ -2805,6 +2869,7 @@
 #define PCH_PP_STATUS           0xc7200
 #define PCH_PP_CONTROL          0xc7204
+#define  PANEL_UNLOCK_REGS      (0xabcd << 16)
 #define  EDP_FORCE_VDD          (1 << 3)
 #define  EDP_BLC_ENABLE         (1 << 2)
 #define  PANEL_POWER_RESET      (1 << 1)
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index 60a5800fba6e..6e2025274db5 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -602,7 +602,9 @@ void i915_save_display(struct drm_device *dev)
        /* Only save FBC state on the platform that supports FBC */
        if (I915_HAS_FBC(dev)) {
-                if (IS_GM45(dev)) {
+                if (IS_IRONLAKE_M(dev)) {
+                        dev_priv->saveDPFC_CB_BASE = I915_READ(ILK_DPFC_CB_BASE);
+                } else if (IS_GM45(dev)) {
                        dev_priv->saveDPFC_CB_BASE = I915_READ(DPFC_CB_BASE);
                } else {
                        dev_priv->saveFBC_CFB_BASE = I915_READ(FBC_CFB_BASE);
@@ -706,7 +708,10 @@ void i915_restore_display(struct drm_device *dev)
        /* only restore FBC info on the platform that supports FBC*/
        if (I915_HAS_FBC(dev)) {
-                if (IS_GM45(dev)) {
+                if (IS_IRONLAKE_M(dev)) {
+                        ironlake_disable_fbc(dev);
+                        I915_WRITE(ILK_DPFC_CB_BASE, dev_priv->saveDPFC_CB_BASE);
+                } else if (IS_GM45(dev)) {
                        g4x_disable_fbc(dev);
                        I915_WRITE(DPFC_CB_BASE, dev_priv->saveDPFC_CB_BASE);
                } else {
diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
index fab21760dd57..fea97a21cc14 100644
--- a/drivers/gpu/drm/i915/i915_trace.h
+++ b/drivers/gpu/drm/i915/i915_trace.h
@@ -262,6 +262,42 @@ DEFINE_EVENT(i915_ring, i915_ring_wait_end,
            TP_ARGS(dev)
 );
+TRACE_EVENT(i915_flip_request,
+            TP_PROTO(int plane, struct drm_gem_object *obj),
+            TP_ARGS(plane, obj),
+            TP_STRUCT__entry(
+                    __field(int, plane)
+                    __field(struct drm_gem_object *, obj)
+                    ),
+            TP_fast_assign(
+                    __entry->plane = plane;
+                    __entry->obj = obj;
+                    ),
+            TP_printk("plane=%d, obj=%p", __entry->plane, __entry->obj)
+);
+TRACE_EVENT(i915_flip_complete,
+            TP_PROTO(int plane, struct drm_gem_object *obj),
+            TP_ARGS(plane, obj),
+            TP_STRUCT__entry(
+                    __field(int, plane)
+                    __field(struct drm_gem_object *, obj)
+                    ),
+            TP_fast_assign(
+                    __entry->plane = plane;
+                    __entry->obj = obj;
+                    ),
+            TP_printk("plane=%d, obj=%p", __entry->plane, __entry->obj)
+);
 #endif /* _I915_TRACE_H_ */
 /* This part must be outside protection */
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 68dcf36e2793..1e5e0d379fa9 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -33,6 +33,7 @@
 #include "intel_drv.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
+#include "i915_trace.h"
 #include "drm_dp_helper.h"
 #include "drm_crtc_helper.h"
@@ -42,6 +43,7 @@
 bool intel_pipe_has_type (struct drm_crtc *crtc, int type);
 static void intel_update_watermarks(struct drm_device *dev);
 static void intel_increase_pllclock(struct drm_crtc *crtc, bool schedule);
+static void intel_crtc_update_cursor(struct drm_crtc *crtc);
 typedef struct {
    /* given values */
@@ -322,6 +324,9 @@ struct intel_limit {
 #define IRONLAKE_DP_P1_MIN              1
 #define IRONLAKE_DP_P1_MAX              2
+/* FDI */
+#define IRONLAKE_FDI_FREQ               2700000 /* in kHz for mode->clock */
 static bool
 intel_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
                    int target, int refclk, intel_clock_t *best_clock);
@@ -862,8 +867,8 @@ intel_g4x_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
        intel_clock_t clock;
        int max_n;
        bool found;
-        /* approximately equals target * 0.00488 */
+        /* approximately equals target * 0.00585 */
-        int err_most = (target >> 8) + (target >> 10);
+        int err_most = (target >> 8) + (target >> 9);
        found = false;
        if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)) {
@@ -975,7 +980,10 @@ void
 intel_wait_for_vblank(struct drm_device *dev)
 {
        /* Wait for 20ms, i.e. one cycle at 50hz. */
-        msleep(20);
+        if (in_dbg_master())
+                mdelay(20); /* The kernel debugger cannot call msleep() */
+        else
+                msleep(20);
 }
 /* Parameters have changed, update FBC info */
@@ -1122,6 +1130,67 @@ static bool g4x_fbc_enabled(struct drm_device *dev)
        return I915_READ(DPFC_CONTROL) & DPFC_CTL_EN;
 }
+static void ironlake_enable_fbc(struct drm_crtc *crtc, unsigned long interval)
+{
+        struct drm_device *dev = crtc->dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_framebuffer *fb = crtc->fb;
+        struct intel_framebuffer *intel_fb = to_intel_framebuffer(fb);
+        struct drm_i915_gem_object *obj_priv = to_intel_bo(intel_fb->obj);
+        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+        int plane = (intel_crtc->plane == 0) ? DPFC_CTL_PLANEA :
+                                               DPFC_CTL_PLANEB;
+        unsigned long stall_watermark = 200;
+        u32 dpfc_ctl;
+        dev_priv->cfb_pitch = (dev_priv->cfb_pitch / 64) - 1;
+        dev_priv->cfb_fence = obj_priv->fence_reg;
+        dev_priv->cfb_plane = intel_crtc->plane;
+        dpfc_ctl = I915_READ(ILK_DPFC_CONTROL);
+        dpfc_ctl &= DPFC_RESERVED;
+        dpfc_ctl |= (plane | DPFC_CTL_LIMIT_1X);
+        if (obj_priv->tiling_mode != I915_TILING_NONE) {
+                dpfc_ctl |= (DPFC_CTL_FENCE_EN | dev_priv->cfb_fence);
+                I915_WRITE(ILK_DPFC_CHICKEN, DPFC_HT_MODIFY);
+        } else {
+                I915_WRITE(ILK_DPFC_CHICKEN, ~DPFC_HT_MODIFY);
+        }
+        I915_WRITE(ILK_DPFC_CONTROL, dpfc_ctl);
+        I915_WRITE(ILK_DPFC_RECOMP_CTL, DPFC_RECOMP_STALL_EN |
+                   (stall_watermark << DPFC_RECOMP_STALL_WM_SHIFT) |
+                   (interval << DPFC_RECOMP_TIMER_COUNT_SHIFT));
+        I915_WRITE(ILK_DPFC_FENCE_YOFF, crtc->y);
+        I915_WRITE(ILK_FBC_RT_BASE, obj_priv->gtt_offset | ILK_FBC_RT_VALID);
+        /* enable it... */
+        I915_WRITE(ILK_DPFC_CONTROL, I915_READ(ILK_DPFC_CONTROL) |
+                   DPFC_CTL_EN);
+        DRM_DEBUG_KMS("enabled fbc on plane %d\n", intel_crtc->plane);
+}
+void ironlake_disable_fbc(struct drm_device *dev)
+{
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        u32 dpfc_ctl;
+        /* Disable compression */
+        dpfc_ctl = I915_READ(ILK_DPFC_CONTROL);
+        dpfc_ctl &= ~DPFC_CTL_EN;
+        I915_WRITE(ILK_DPFC_CONTROL, dpfc_ctl);
+        intel_wait_for_vblank(dev);
+        DRM_DEBUG_KMS("disabled FBC\n");
+}
+static bool ironlake_fbc_enabled(struct drm_device *dev)
+{
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        return I915_READ(ILK_DPFC_CONTROL) & DPFC_CTL_EN;
+}
 bool intel_fbc_enabled(struct drm_device *dev)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
@@ -1180,8 +1249,12 @@ static void intel_update_fbc(struct drm_crtc *crtc,
        struct drm_framebuffer *fb = crtc->fb;
        struct intel_framebuffer *intel_fb;
        struct drm_i915_gem_object *obj_priv;
+        struct drm_crtc *tmp_crtc;
        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
        int plane = intel_crtc->plane;
+        int crtcs_enabled = 0;
+        DRM_DEBUG_KMS("\n");
        if (!i915_powersave)
                return;
@@ -1199,10 +1272,21 @@ static void intel_update_fbc(struct drm_crtc *crtc,
         * If FBC is already on, we just have to verify that we can
         * keep it that way...
         * Need to disable if:
+         *   - more than one pipe is active
         *   - changing FBC params (stride, fence, mode)
         *   - new fb is too large to fit in compressed buffer
         *   - going to an unsupported config (interlace, pixel multiply, etc.)
         */
+        list_for_each_entry(tmp_crtc, &dev->mode_config.crtc_list, head) {
+                if (tmp_crtc->enabled)
+                        crtcs_enabled++;
+        }
+        DRM_DEBUG_KMS("%d pipes active\n", crtcs_enabled);
+        if (crtcs_enabled > 1) {
+                DRM_DEBUG_KMS("more than one pipe active, disabling compression\n");
+                dev_priv->no_fbc_reason = FBC_MULTIPLE_PIPES;
+                goto out_disable;
+        }
        if (intel_fb->obj->size > dev_priv->cfb_size) {
                DRM_DEBUG_KMS("framebuffer too large, disabling "
                                "compression\n");
@@ -1233,6 +1317,10 @@ static void intel_update_fbc(struct drm_crtc *crtc,
                goto out_disable;
        }
+        /* If the kernel debugger is active, always disable compression */
+        if (in_dbg_master())
+                goto out_disable;
        if (intel_fbc_enabled(dev)) {
                /* We can re-enable it in this case, but need to update pitch */
                if ((fb->pitch > dev_priv->cfb_pitch) ||
@@ -1255,7 +1343,7 @@ out_disable:
        }
 }
-static int
+int
 intel_pin_and_fence_fb_obj(struct drm_device *dev, struct drm_gem_object *obj)
 {
        struct drm_i915_gem_object *obj_priv = to_intel_bo(obj);
@@ -1264,7 +1352,12 @@ intel_pin_and_fence_fb_obj(struct drm_device *dev, struct drm_gem_object *obj)
        switch (obj_priv->tiling_mode) {
        case I915_TILING_NONE:
-                alignment = 64 * 1024;
+                if (IS_BROADWATER(dev) || IS_CRESTLINE(dev))
+                        alignment = 128 * 1024;
+                else if (IS_I965G(dev))
+                        alignment = 4 * 1024;
+                else
+                        alignment = 64 * 1024;
                break;
        case I915_TILING_X:
                /* pin() will align the object as required by fence */
@@ -1299,6 +1392,98 @@ intel_pin_and_fence_fb_obj(struct drm_device *dev, struct drm_gem_object *obj)
        return 0;
 }
+/* Assume fb object is pinned & idle & fenced and just update base pointers */
+static int
+intel_pipe_set_base_atomic(struct drm_crtc *crtc, struct drm_framebuffer *fb,
+                           int x, int y)
+{
+        struct drm_device *dev = crtc->dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+        struct intel_framebuffer *intel_fb;
+        struct drm_i915_gem_object *obj_priv;
+        struct drm_gem_object *obj;
+        int plane = intel_crtc->plane;
+        unsigned long Start, Offset;
+        int dspbase = (plane == 0 ? DSPAADDR : DSPBADDR);
+        int dspsurf = (plane == 0 ? DSPASURF : DSPBSURF);
+        int dspstride = (plane == 0) ? DSPASTRIDE : DSPBSTRIDE;
+        int dsptileoff = (plane == 0 ? DSPATILEOFF : DSPBTILEOFF);
+        int dspcntr_reg = (plane == 0) ? DSPACNTR : DSPBCNTR;
+        u32 dspcntr;
+        switch (plane) {
+        case 0:
+        case 1:
+                break;
+        default:
+                DRM_ERROR("Can't update plane %d in SAREA\n", plane);
+                return -EINVAL;
+        }
+        intel_fb = to_intel_framebuffer(fb);
+        obj = intel_fb->obj;
+        obj_priv = to_intel_bo(obj);
+        dspcntr = I915_READ(dspcntr_reg);
+        /* Mask out pixel format bits in case we change it */
+        dspcntr &= ~DISPPLANE_PIXFORMAT_MASK;
+        switch (fb->bits_per_pixel) {
+        case 8:
+                dspcntr |= DISPPLANE_8BPP;
+                break;
+        case 16:
+                if (fb->depth == 15)
+                        dspcntr |= DISPPLANE_15_16BPP;
+                else
+                        dspcntr |= DISPPLANE_16BPP;
+                break;
+        case 24:
+        case 32:
+                dspcntr |= DISPPLANE_32BPP_NO_ALPHA;
+                break;
+        default:
+                DRM_ERROR("Unknown color depth\n");
+                return -EINVAL;
+        }
+        if (IS_I965G(dev)) {
+                if (obj_priv->tiling_mode != I915_TILING_NONE)
+                        dspcntr |= DISPPLANE_TILED;
+                else
+                        dspcntr &= ~DISPPLANE_TILED;
+        }
+        if (IS_IRONLAKE(dev))
+                /* must disable */
+                dspcntr |= DISPPLANE_TRICKLE_FEED_DISABLE;
+        I915_WRITE(dspcntr_reg, dspcntr);
+        Start = obj_priv->gtt_offset;
+        Offset = y * fb->pitch + x * (fb->bits_per_pixel / 8);
+        DRM_DEBUG("Writing base %08lX %08lX %d %d\n", Start, Offset, x, y);
+        I915_WRITE(dspstride, fb->pitch);
+        if (IS_I965G(dev)) {
+                I915_WRITE(dspbase, Offset);
+                I915_READ(dspbase);
+                I915_WRITE(dspsurf, Start);
+                I915_READ(dspsurf);
+                I915_WRITE(dsptileoff, (y << 16) | x);
+        } else {
+                I915_WRITE(dspbase, Start + Offset);
+                I915_READ(dspbase);
+        }
+        if ((IS_I965G(dev) || plane == 0))
+                intel_update_fbc(crtc, &crtc->mode);
+        intel_wait_for_vblank(dev);
+        intel_increase_pllclock(crtc, true);
+        return 0;
+}
 static int
 intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
                    struct drm_framebuffer *old_fb)
@@ -1539,6 +1724,15 @@ static void ironlake_fdi_link_train(struct drm_crtc *crtc)
        int fdi_rx_imr_reg = (pipe == 0) ? FDI_RXA_IMR : FDI_RXB_IMR;
        u32 temp, tries = 0;
+        /* Train 1: umask FDI RX Interrupt symbol_lock and bit_lock bit
+           for train result */
+        temp = I915_READ(fdi_rx_imr_reg);
+        temp &= ~FDI_RX_SYMBOL_LOCK;
+        temp &= ~FDI_RX_BIT_LOCK;
+        I915_WRITE(fdi_rx_imr_reg, temp);
+        I915_READ(fdi_rx_imr_reg);
+        udelay(150);
        /* enable CPU FDI TX and PCH FDI RX */
        temp = I915_READ(fdi_tx_reg);
        temp |= FDI_TX_ENABLE;
@@ -1556,16 +1750,7 @@ static void ironlake_fdi_link_train(struct drm_crtc *crtc)
        I915_READ(fdi_rx_reg);
        udelay(150);
-        /* Train 1: umask FDI RX Interrupt symbol_lock and bit_lock bit
+        for (tries = 0; tries < 5; tries++) {
-           for train result */
-        temp = I915_READ(fdi_rx_imr_reg);
-        temp &= ~FDI_RX_SYMBOL_LOCK;
-        temp &= ~FDI_RX_BIT_LOCK;
-        I915_WRITE(fdi_rx_imr_reg, temp);
-        I915_READ(fdi_rx_imr_reg);
-        udelay(150);
-        for (;;) {
                temp = I915_READ(fdi_rx_iir_reg);
                DRM_DEBUG_KMS("FDI_RX_IIR 0x%x\n", temp);
@@ -1575,14 +1760,9 @@ static void ironlake_fdi_link_train(struct drm_crtc *crtc)
                                   temp | FDI_RX_BIT_LOCK);
                        break;
                }
-                tries++;
-                if (tries > 5) {
-                        DRM_DEBUG_KMS("FDI train 1 fail!\n");
-                        break;
-                }
        }
+        if (tries == 5)
+                DRM_DEBUG_KMS("FDI train 1 fail!\n");
        /* Train 2 */
        temp = I915_READ(fdi_tx_reg);
@@ -1598,7 +1778,7 @@ static void ironlake_fdi_link_train(struct drm_crtc *crtc)
        tries = 0;
-        for (;;) {
+        for (tries = 0; tries < 5; tries++) {
                temp = I915_READ(fdi_rx_iir_reg);
                DRM_DEBUG_KMS("FDI_RX_IIR 0x%x\n", temp);
@@ -1608,14 +1788,9 @@ static void ironlake_fdi_link_train(struct drm_crtc *crtc)
                        DRM_DEBUG_KMS("FDI train 2 done.\n");
                        break;
                }
-                tries++;
-                if (tries > 5) {
-                        DRM_DEBUG_KMS("FDI train 2 fail!\n");
-                        break;
-                }
        }
+        if (tries == 5)
+                DRM_DEBUG_KMS("FDI train 2 fail!\n");
        DRM_DEBUG_KMS("FDI train done\n");
 }
@@ -1640,6 +1815,15 @@ static void gen6_fdi_link_train(struct drm_crtc *crtc)
        int fdi_rx_imr_reg = (pipe == 0) ? FDI_RXA_IMR : FDI_RXB_IMR;
        u32 temp, i;
+        /* Train 1: umask FDI RX Interrupt symbol_lock and bit_lock bit
+           for train result */
+        temp = I915_READ(fdi_rx_imr_reg);
+        temp &= ~FDI_RX_SYMBOL_LOCK;
+        temp &= ~FDI_RX_BIT_LOCK;
+        I915_WRITE(fdi_rx_imr_reg, temp);
+        I915_READ(fdi_rx_imr_reg);
+        udelay(150);
        /* enable CPU FDI TX and PCH FDI RX */
        temp = I915_READ(fdi_tx_reg);
        temp |= FDI_TX_ENABLE;
@@ -1665,15 +1849,6 @@ static void gen6_fdi_link_train(struct drm_crtc *crtc)
        I915_READ(fdi_rx_reg);
        udelay(150);
-        /* Train 1: umask FDI RX Interrupt symbol_lock and bit_lock bit
-           for train result */
-        temp = I915_READ(fdi_rx_imr_reg);
-        temp &= ~FDI_RX_SYMBOL_LOCK;
-        temp &= ~FDI_RX_BIT_LOCK;
-        I915_WRITE(fdi_rx_imr_reg, temp);
-        I915_READ(fdi_rx_imr_reg);
-        udelay(150);
        for (i = 0; i < 4; i++ ) {
                temp = I915_READ(fdi_tx_reg);
                temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK;
@@ -1828,7 +2003,8 @@ static void ironlake_crtc_dpms(struct drm_crtc *crtc, int mode)
                }
                /* Enable panel fitting for LVDS */
-                if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)) {
+                if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)
+                    || HAS_eDP || intel_pch_has_edp(crtc)) {
                        temp = I915_READ(pf_ctl_reg);
                        I915_WRITE(pf_ctl_reg, temp | PF_ENABLE | PF_FILTER_MED_3x3);
@@ -1923,9 +2099,12 @@ static void ironlake_crtc_dpms(struct drm_crtc *crtc, int mode)
                                reg = I915_READ(trans_dp_ctl);
                                reg &= ~TRANS_DP_PORT_SEL_MASK;
                                reg = TRANS_DP_OUTPUT_ENABLE |
-                                      TRANS_DP_ENH_FRAMING |
+                                      TRANS_DP_ENH_FRAMING;
-                                      TRANS_DP_VSYNC_ACTIVE_HIGH |
-                                      TRANS_DP_HSYNC_ACTIVE_HIGH;
+                                if (crtc->mode.flags & DRM_MODE_FLAG_PHSYNC)
+                                      reg |= TRANS_DP_HSYNC_ACTIVE_HIGH;
+                                if (crtc->mode.flags & DRM_MODE_FLAG_PVSYNC)
+                                      reg |= TRANS_DP_VSYNC_ACTIVE_HIGH;
                                switch (intel_trans_dp_port_sel(crtc)) {
                                case PCH_DP_B:
@@ -1965,6 +2144,8 @@ static void ironlake_crtc_dpms(struct drm_crtc *crtc, int mode)
                intel_crtc_load_lut(crtc);
+                intel_update_fbc(crtc, &crtc->mode);
        break;
        case DRM_MODE_DPMS_OFF:
                DRM_DEBUG_KMS("crtc %d dpms off\n", pipe);
@@ -1979,6 +2160,10 @@ static void ironlake_crtc_dpms(struct drm_crtc *crtc, int mode)
                        I915_READ(dspbase_reg);
                }
+                if (dev_priv->cfb_plane == plane &&
+                    dev_priv->display.disable_fbc)
+                        dev_priv->display.disable_fbc(dev);
                i915_disable_vga(dev);
                /* disable cpu pipe, disable after all planes disabled */
@@ -2255,6 +2440,11 @@ static void i9xx_crtc_dpms(struct drm_crtc *crtc, int mode)
                        intel_wait_for_vblank(dev);
                }
+                /* Don't disable pipe A or pipe A PLLs if needed */
+                if (pipeconf_reg == PIPEACONF &&
+                    (dev_priv->quirks & QUIRK_PIPEA_FORCE))
+                        goto skip_pipe_off;
                /* Next, disable display pipes */
                temp = I915_READ(pipeconf_reg);
                if ((temp & PIPEACONF_ENABLE) != 0) {
@@ -2270,7 +2460,7 @@ static void i9xx_crtc_dpms(struct drm_crtc *crtc, int mode)
                        I915_WRITE(dpll_reg, temp & ~DPLL_VCO_ENABLE);
                        I915_READ(dpll_reg);
                }
+        skip_pipe_off:
                /* Wait for the clocks to turn off. */
                udelay(150);
                break;
@@ -2353,11 +2543,9 @@ static bool intel_crtc_mode_fixup(struct drm_crtc *crtc,
        struct drm_device *dev = crtc->dev;
        if (HAS_PCH_SPLIT(dev)) {
                /* FDI link clock is fixed at 2.7G */
-                if (mode->clock * 3 > 27000 * 4)
+                if (mode->clock * 3 > IRONLAKE_FDI_FREQ * 4)
-                        return MODE_CLOCK_HIGH;
+                        return false;
        }
-        drm_mode_set_crtcinfo(adjusted_mode, 0);
        return true;
 }
@@ -2538,6 +2726,20 @@ static struct intel_watermark_params g4x_wm_info = {
        2,
        G4X_FIFO_LINE_SIZE,
 };
+static struct intel_watermark_params g4x_cursor_wm_info = {
+        I965_CURSOR_FIFO,
+        I965_CURSOR_MAX_WM,
+        I965_CURSOR_DFT_WM,
+        2,
+        G4X_FIFO_LINE_SIZE,
+};
+static struct intel_watermark_params i965_cursor_wm_info = {
+        I965_CURSOR_FIFO,
+        I965_CURSOR_MAX_WM,
+        I965_CURSOR_DFT_WM,
+        2,
+        I915_FIFO_LINE_SIZE,
+};
 static struct intel_watermark_params i945_wm_info = {
        I945_FIFO_SIZE,
        I915_MAX_WM,
@@ -2575,6 +2777,14 @@ static struct intel_watermark_params ironlake_display_wm_info = {
        ILK_FIFO_LINE_SIZE
 };
+static struct intel_watermark_params ironlake_cursor_wm_info = {
+        ILK_CURSOR_FIFO,
+        ILK_CURSOR_MAXWM,
+        ILK_CURSOR_DFTWM,
+        2,
+        ILK_FIFO_LINE_SIZE
+};
 static struct intel_watermark_params ironlake_display_srwm_info = {
        ILK_DISPLAY_SR_FIFO,
        ILK_DISPLAY_MAX_SRWM,
@@ -2624,7 +2834,7 @@ static unsigned long intel_calculate_wm(unsigned long clock_in_khz,
         */
        entries_required = ((clock_in_khz / 1000) * pixel_size * latency_ns) /
                1000;
-        entries_required /= wm->cacheline_size;
+        entries_required = DIV_ROUND_UP(entries_required, wm->cacheline_size);
        DRM_DEBUG_KMS("FIFO entries required for mode: %d\n", entries_required);
@@ -2635,8 +2845,14 @@ static unsigned long intel_calculate_wm(unsigned long clock_in_khz,
        /* Don't promote wm_size to unsigned... */
        if (wm_size > (long)wm->max_wm)
                wm_size = wm->max_wm;
-        if (wm_size <= 0)
+        if (wm_size <= 0) {
                wm_size = wm->default_wm;
+                DRM_ERROR("Insufficient FIFO for plane, expect flickering:"
+                          " entries required = %ld, available = %lu.\n",
+                          entries_required + wm->guard_size,
+                          wm->fifo_size);
+        }
        return wm_size;
 }
@@ -2745,11 +2961,9 @@ static int i9xx_get_fifo_size(struct drm_device *dev, int plane)
        uint32_t dsparb = I915_READ(DSPARB);
        int size;
-        if (plane == 0)
+        size = dsparb & 0x7f;
-                size = dsparb & 0x7f;
+        if (plane)
-        else
+                size = ((dsparb >> DSPARB_CSTART_SHIFT) & 0x7f) - size;
-                size = ((dsparb >> DSPARB_CSTART_SHIFT) & 0x7f) -
-                        (dsparb & 0x7f);
        DRM_DEBUG_KMS("FIFO size - (0x%08x) %s: %d\n", dsparb,
                        plane ? "B" : "A", size);
@@ -2763,11 +2977,9 @@ static int i85x_get_fifo_size(struct drm_device *dev, int plane)
        uint32_t dsparb = I915_READ(DSPARB);
        int size;
-        if (plane == 0)
+        size = dsparb & 0x1ff;
-                size = dsparb & 0x1ff;
+        if (plane)
-        else
+                size = ((dsparb >> DSPARB_BEND_SHIFT) & 0x1ff) - size;
-                size = ((dsparb >> DSPARB_BEND_SHIFT) & 0x1ff) -
-                        (dsparb & 0x1ff);
        size >>= 1; /* Convert to cachelines */
        DRM_DEBUG_KMS("FIFO size - (0x%08x) %s: %d\n", dsparb,
@@ -2808,7 +3020,8 @@ static int i830_get_fifo_size(struct drm_device *dev, int plane)
 }
 static void pineview_update_wm(struct drm_device *dev,  int planea_clock,
-                          int planeb_clock, int sr_hdisplay, int pixel_size)
+                          int planeb_clock, int sr_hdisplay, int unused,
+                          int pixel_size)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        u32 reg;
@@ -2873,7 +3086,8 @@ static void pineview_update_wm(struct drm_device *dev,  int planea_clock,
 }
 static void g4x_update_wm(struct drm_device *dev,  int planea_clock,
-                          int planeb_clock, int sr_hdisplay, int pixel_size)
+                          int planeb_clock, int sr_hdisplay, int sr_htotal,
+                          int pixel_size)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        int total_size, cacheline_size;
@@ -2897,12 +3111,12 @@ static void g4x_update_wm(struct drm_device *dev,  int planea_clock,
         */
        entries_required = ((planea_clock / 1000) * pixel_size * latency_ns) /
                1000;
-        entries_required /= G4X_FIFO_LINE_SIZE;
+        entries_required = DIV_ROUND_UP(entries_required, G4X_FIFO_LINE_SIZE);
        planea_wm = entries_required + planea_params.guard_size;
        entries_required = ((planeb_clock / 1000) * pixel_size * latency_ns) /
                1000;
-        entries_required /= G4X_FIFO_LINE_SIZE;
+        entries_required = DIV_ROUND_UP(entries_required, G4X_FIFO_LINE_SIZE);
        planeb_wm = entries_required + planeb_params.guard_size;
        cursora_wm = cursorb_wm = 16;
@@ -2916,13 +3130,24 @@ static void g4x_update_wm(struct drm_device *dev,  int planea_clock,
                static const int sr_latency_ns = 12000;
                sr_clock = planea_clock ? planea_clock : planeb_clock;
-                line_time_us = ((sr_hdisplay * 1000) / sr_clock);
+                line_time_us = ((sr_htotal * 1000) / sr_clock);
                /* Use ns/us then divide to preserve precision */
-                sr_entries = (((sr_latency_ns / line_time_us) + 1) *
+                sr_entries = (((sr_latency_ns / line_time_us) + 1000) / 1000) *
-                              pixel_size * sr_hdisplay) / 1000;
+                              pixel_size * sr_hdisplay;
-                sr_entries = roundup(sr_entries / cacheline_size, 1);
+                sr_entries = DIV_ROUND_UP(sr_entries, cacheline_size);
-                DRM_DEBUG("self-refresh entries: %d\n", sr_entries);
+                entries_required = (((sr_latency_ns / line_time_us) +
+                                     1000) / 1000) * pixel_size * 64;
+                entries_required = DIV_ROUND_UP(entries_required,
+                                           g4x_cursor_wm_info.cacheline_size);
+                cursor_sr = entries_required + g4x_cursor_wm_info.guard_size;
+                if (cursor_sr > g4x_cursor_wm_info.max_wm)
+                        cursor_sr = g4x_cursor_wm_info.max_wm;
+                DRM_DEBUG_KMS("self-refresh watermark: display plane %d "
+                              "cursor %d\n", sr_entries, cursor_sr);
                I915_WRITE(FW_BLC_SELF, FW_BLC_SELF_EN);
        } else {
                /* Turn off self refresh if both pipes are enabled */
@@ -2947,11 +3172,13 @@ static void g4x_update_wm(struct drm_device *dev,  int planea_clock,
 }
 static void i965_update_wm(struct drm_device *dev, int planea_clock,
-                           int planeb_clock, int sr_hdisplay, int pixel_size)
+                           int planeb_clock, int sr_hdisplay, int sr_htotal,
+                           int pixel_size)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        unsigned long line_time_us;
        int sr_clock, sr_entries, srwm = 1;
+        int cursor_sr = 16;
        /* Calc sr entries for one plane configs */
        if (sr_hdisplay && (!planea_clock || !planeb_clock)) {
@@ -2959,17 +3186,31 @@ static void i965_update_wm(struct drm_device *dev, int planea_clock,
                static const int sr_latency_ns = 12000;
                sr_clock = planea_clock ? planea_clock : planeb_clock;
-                line_time_us = ((sr_hdisplay * 1000) / sr_clock);
+                line_time_us = ((sr_htotal * 1000) / sr_clock);
                /* Use ns/us then divide to preserve precision */
-                sr_entries = (((sr_latency_ns / line_time_us) + 1) *
+                sr_entries = (((sr_latency_ns / line_time_us) + 1000) / 1000) *
-                              pixel_size * sr_hdisplay) / 1000;
+                              pixel_size * sr_hdisplay;
-                sr_entries = roundup(sr_entries / I915_FIFO_LINE_SIZE, 1);
+                sr_entries = DIV_ROUND_UP(sr_entries, I915_FIFO_LINE_SIZE);
                DRM_DEBUG("self-refresh entries: %d\n", sr_entries);
-                srwm = I945_FIFO_SIZE - sr_entries;
+                srwm = I965_FIFO_SIZE - sr_entries;
                if (srwm < 0)
                        srwm = 1;
-                srwm &= 0x3f;
+                srwm &= 0x1ff;
+                sr_entries = (((sr_latency_ns / line_time_us) + 1000) / 1000) *
+                             pixel_size * 64;
+                sr_entries = DIV_ROUND_UP(sr_entries,
+                                          i965_cursor_wm_info.cacheline_size);
+                cursor_sr = i965_cursor_wm_info.fifo_size -
+                            (sr_entries + i965_cursor_wm_info.guard_size);
+                if (cursor_sr > i965_cursor_wm_info.max_wm)
+                        cursor_sr = i965_cursor_wm_info.max_wm;
+                DRM_DEBUG_KMS("self-refresh watermark: display plane %d "
+                              "cursor %d\n", srwm, cursor_sr);
                if (IS_I965GM(dev))
                        I915_WRITE(FW_BLC_SELF, FW_BLC_SELF_EN);
        } else {
@@ -2986,10 +3227,13 @@ static void i965_update_wm(struct drm_device *dev, int planea_clock,
        I915_WRITE(DSPFW1, (srwm << DSPFW_SR_SHIFT) | (8 << 16) | (8 << 8) |
                   (8 << 0));
        I915_WRITE(DSPFW2, (8 << 8) | (8 << 0));
+        /* update cursor SR watermark */
+        I915_WRITE(DSPFW3, (cursor_sr << DSPFW_CURSOR_SR_SHIFT));
 }
 static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
-                           int planeb_clock, int sr_hdisplay, int pixel_size)
+                           int planeb_clock, int sr_hdisplay, int sr_htotal,
+                           int pixel_size)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        uint32_t fwater_lo;
@@ -3034,12 +3278,12 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
                static const int sr_latency_ns = 6000;
                sr_clock = planea_clock ? planea_clock : planeb_clock;
-                line_time_us = ((sr_hdisplay * 1000) / sr_clock);
+                line_time_us = ((sr_htotal * 1000) / sr_clock);
                /* Use ns/us then divide to preserve precision */
-                sr_entries = (((sr_latency_ns / line_time_us) + 1) *
+                sr_entries = (((sr_latency_ns / line_time_us) + 1000) / 1000) *
-                              pixel_size * sr_hdisplay) / 1000;
+                              pixel_size * sr_hdisplay;
-                sr_entries = roundup(sr_entries / cacheline_size, 1);
+                sr_entries = DIV_ROUND_UP(sr_entries, cacheline_size);
                DRM_DEBUG_KMS("self-refresh entries: %d\n", sr_entries);
                srwm = total_size - sr_entries;
                if (srwm < 0)
@@ -3077,7 +3321,7 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
 }
 static void i830_update_wm(struct drm_device *dev, int planea_clock, int unused,
-                           int unused2, int pixel_size)
+                           int unused2, int unused3, int pixel_size)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        uint32_t fwater_lo = I915_READ(FW_BLC) & ~0xfff;
@@ -3095,9 +3339,11 @@ static void i830_update_wm(struct drm_device *dev, int planea_clock, int unused,
 }
 #define ILK_LP0_PLANE_LATENCY           700
+#define ILK_LP0_CURSOR_LATENCY          1300
 static void ironlake_update_wm(struct drm_device *dev,  int planea_clock,
-                       int planeb_clock, int sr_hdisplay, int pixel_size)
+                       int planeb_clock, int sr_hdisplay, int sr_htotal,
+                       int pixel_size)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        int planea_wm, planeb_wm, cursora_wm, cursorb_wm;
@@ -3105,20 +3351,48 @@ static void ironlake_update_wm(struct drm_device *dev,  int planea_clock,
        unsigned long line_time_us;
        int sr_clock, entries_required;
        u32 reg_value;
+        int line_count;
+        int planea_htotal = 0, planeb_htotal = 0;
+        struct drm_crtc *crtc;
+        struct intel_crtc *intel_crtc;
+        /* Need htotal for all active display plane */
+        list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+                intel_crtc = to_intel_crtc(crtc);
+                if (crtc->enabled) {
+                        if (intel_crtc->plane == 0)
+                                planea_htotal = crtc->mode.htotal;
+                        else
+                                planeb_htotal = crtc->mode.htotal;
+                }
+        }
        /* Calculate and update the watermark for plane A */
        if (planea_clock) {
                entries_required = ((planea_clock / 1000) * pixel_size *
                                     ILK_LP0_PLANE_LATENCY) / 1000;
                entries_required = DIV_ROUND_UP(entries_required,
-                                   ironlake_display_wm_info.cacheline_size);
+                                                ironlake_display_wm_info.cacheline_size);
                planea_wm = entries_required +
                            ironlake_display_wm_info.guard_size;
                if (planea_wm > (int)ironlake_display_wm_info.max_wm)
                        planea_wm = ironlake_display_wm_info.max_wm;
-                cursora_wm = 16;
+                /* Use the large buffer method to calculate cursor watermark */
+                line_time_us = (planea_htotal * 1000) / planea_clock;
+                /* Use ns/us then divide to preserve precision */
+                line_count = (ILK_LP0_CURSOR_LATENCY / line_time_us + 1000) / 1000;
+                /* calculate the cursor watermark for cursor A */
+                entries_required = line_count * 64 * pixel_size;
+                entries_required = DIV_ROUND_UP(entries_required,
+                                                ironlake_cursor_wm_info.cacheline_size);
+                cursora_wm = entries_required + ironlake_cursor_wm_info.guard_size;
+                if (cursora_wm > ironlake_cursor_wm_info.max_wm)
+                        cursora_wm = ironlake_cursor_wm_info.max_wm;
                reg_value = I915_READ(WM0_PIPEA_ILK);
                reg_value &= ~(WM0_PIPE_PLANE_MASK | WM0_PIPE_CURSOR_MASK);
                reg_value |= (planea_wm << WM0_PIPE_PLANE_SHIFT) |
@@ -3132,14 +3406,27 @@ static void ironlake_update_wm(struct drm_device *dev,  int planea_clock,
                entries_required = ((planeb_clock / 1000) * pixel_size *
                                     ILK_LP0_PLANE_LATENCY) / 1000;
                entries_required = DIV_ROUND_UP(entries_required,
-                                   ironlake_display_wm_info.cacheline_size);
+                                                ironlake_display_wm_info.cacheline_size);
                planeb_wm = entries_required +
                            ironlake_display_wm_info.guard_size;
                if (planeb_wm > (int)ironlake_display_wm_info.max_wm)
                        planeb_wm = ironlake_display_wm_info.max_wm;
-                cursorb_wm = 16;
+                /* Use the large buffer method to calculate cursor watermark */
+                line_time_us = (planeb_htotal * 1000) / planeb_clock;
+                /* Use ns/us then divide to preserve precision */
+                line_count = (ILK_LP0_CURSOR_LATENCY / line_time_us + 1000) / 1000;
+                /* calculate the cursor watermark for cursor B */
+                entries_required = line_count * 64 * pixel_size;
+                entries_required = DIV_ROUND_UP(entries_required,
+                                                ironlake_cursor_wm_info.cacheline_size);
+                cursorb_wm = entries_required + ironlake_cursor_wm_info.guard_size;
+                if (cursorb_wm > ironlake_cursor_wm_info.max_wm)
+                        cursorb_wm = ironlake_cursor_wm_info.max_wm;
                reg_value = I915_READ(WM0_PIPEB_ILK);
                reg_value &= ~(WM0_PIPE_PLANE_MASK | WM0_PIPE_CURSOR_MASK);
                reg_value |= (planeb_wm << WM0_PIPE_PLANE_SHIFT) |
@@ -3154,12 +3441,12 @@ static void ironlake_update_wm(struct drm_device *dev,  int planea_clock,
         * display plane is used.
         */
        if (!planea_clock || !planeb_clock) {
-                int line_count;
                /* Read the self-refresh latency. The unit is 0.5us */
                int ilk_sr_latency = I915_READ(MLTR_ILK) & ILK_SRLT_MASK;
                sr_clock = planea_clock ? planea_clock : planeb_clock;
-                line_time_us = ((sr_hdisplay * 1000) / sr_clock);
+                line_time_us = ((sr_htotal * 1000) / sr_clock);
                /* Use ns/us then divide to preserve precision */
                line_count = ((ilk_sr_latency * 500) / line_time_us + 1000)
@@ -3168,14 +3455,14 @@ static void ironlake_update_wm(struct drm_device *dev,  int planea_clock,
                /* calculate the self-refresh watermark for display plane */
                entries_required = line_count * sr_hdisplay * pixel_size;
                entries_required = DIV_ROUND_UP(entries_required,
-                                   ironlake_display_srwm_info.cacheline_size);
+                                                ironlake_display_srwm_info.cacheline_size);
                sr_wm = entries_required +
                        ironlake_display_srwm_info.guard_size;
                /* calculate the self-refresh watermark for display cursor */
                entries_required = line_count * pixel_size * 64;
                entries_required = DIV_ROUND_UP(entries_required,
-                                   ironlake_cursor_srwm_info.cacheline_size);
+                                                ironlake_cursor_srwm_info.cacheline_size);
                cursor_wm = entries_required +
                            ironlake_cursor_srwm_info.guard_size;
@@ -3219,6 +3506,7 @@ static void ironlake_update_wm(struct drm_device *dev,  int planea_clock,
 *       bytes per pixel
 *   where
 *     line time = htotal / dotclock
+ *     surface width = hdisplay for normal plane and 64 for cursor
 *   and latency is assumed to be high, as above.
 *
 * The final value programmed to the register should always be rounded up,
@@ -3235,6 +3523,7 @@ static void intel_update_watermarks(struct drm_device *dev)
        int sr_hdisplay = 0;
        unsigned long planea_clock = 0, planeb_clock = 0, sr_clock = 0;
        int enabled = 0, pixel_size = 0;
+        int sr_htotal = 0;
        if (!dev_priv->display.update_wm)
                return;
@@ -3255,6 +3544,7 @@ static void intel_update_watermarks(struct drm_device *dev)
                        }
                        sr_hdisplay = crtc->mode.hdisplay;
                        sr_clock = crtc->mode.clock;
+                        sr_htotal = crtc->mode.htotal;
                        if (crtc->fb)
                                pixel_size = crtc->fb->bits_per_pixel / 8;
                        else
@@ -3266,7 +3556,7 @@ static void intel_update_watermarks(struct drm_device *dev)
                return;
        dev_priv->display.update_wm(dev, planea_clock, planeb_clock,
-                                    sr_hdisplay, pixel_size);
+                                    sr_hdisplay, sr_htotal, pixel_size);
 }
 static int intel_crtc_mode_set(struct drm_crtc *crtc,
@@ -3385,6 +3675,9 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
                return -EINVAL;
        }
+        /* Ensure that the cursor is valid for the new mode before changing... */
+        intel_crtc_update_cursor(crtc);
        if (is_lvds && dev_priv->lvds_downclock_avail) {
                has_reduced_clock = limit->find_pll(limit, crtc,
                                                            dev_priv->lvds_downclock,
@@ -3451,7 +3744,7 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
                                temp |= PIPE_8BPC;
                        else
                                temp |= PIPE_6BPC;
-                } else if (is_edp) {
+                } else if (is_edp || (is_dp && intel_pch_has_edp(crtc))) {
                        switch (dev_priv->edp_bpp/3) {
                        case 8:
                                temp |= PIPE_8BPC;
@@ -3694,6 +3987,11 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
                udelay(150);
        }
+        if (HAS_PCH_SPLIT(dev)) {
+                pipeconf &= ~PIPE_ENABLE_DITHER;
+                pipeconf &= ~PIPE_DITHER_TYPE_MASK;
+        }
        /* The LVDS pin pair needs to be on before the DPLLs are enabled.
         * This is an exception to the general rule that mode_set doesn't turn
         * things on.
@@ -3740,11 +4038,9 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
                                } else
                                        lvds |= LVDS_ENABLE_DITHER;
                        } else {
-                                if (HAS_PCH_SPLIT(dev)) {
+                                if (!HAS_PCH_SPLIT(dev)) {
-                                        pipeconf &= ~PIPE_ENABLE_DITHER;
-                                        pipeconf &= ~PIPE_DITHER_TYPE_MASK;
-                                } else
                                        lvds &= ~LVDS_ENABLE_DITHER;
+                                }
                        }
                }
                I915_WRITE(lvds_reg, lvds);
@@ -3920,6 +4216,85 @@ void intel_crtc_load_lut(struct drm_crtc *crtc)
        }
 }
+/* If no-part of the cursor is visible on the framebuffer, then the GPU may hang... */
+static void intel_crtc_update_cursor(struct drm_crtc *crtc)
+{
+        struct drm_device *dev = crtc->dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+        int pipe = intel_crtc->pipe;
+        int x = intel_crtc->cursor_x;
+        int y = intel_crtc->cursor_y;
+        uint32_t base, pos;
+        bool visible;
+        pos = 0;
+        if (crtc->fb) {
+                base = intel_crtc->cursor_addr;
+                if (x > (int) crtc->fb->width)
+                        base = 0;
+                if (y > (int) crtc->fb->height)
+                        base = 0;
+        } else
+                base = 0;
+        if (x < 0) {
+                if (x + intel_crtc->cursor_width < 0)
+                        base = 0;
+                pos |= CURSOR_POS_SIGN << CURSOR_X_SHIFT;
+                x = -x;
+        }
+        pos |= x << CURSOR_X_SHIFT;
+        if (y < 0) {
+                if (y + intel_crtc->cursor_height < 0)
+                        base = 0;
+                pos |= CURSOR_POS_SIGN << CURSOR_Y_SHIFT;
+                y = -y;
+        }
+        pos |= y << CURSOR_Y_SHIFT;
+        visible = base != 0;
+        if (!visible && !intel_crtc->cursor_visble)
+                return;
+        I915_WRITE(pipe == 0 ? CURAPOS : CURBPOS, pos);
+        if (intel_crtc->cursor_visble != visible) {
+                uint32_t cntl = I915_READ(pipe == 0 ? CURACNTR : CURBCNTR);
+                if (base) {
+                        /* Hooray for CUR*CNTR differences */
+                        if (IS_MOBILE(dev) || IS_I9XX(dev)) {
+                                cntl &= ~(CURSOR_MODE | MCURSOR_PIPE_SELECT);
+                                cntl |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE;
+                                cntl |= pipe << 28; /* Connect to correct pipe */
+                        } else {
+                                cntl &= ~(CURSOR_FORMAT_MASK);
+                                cntl |= CURSOR_ENABLE;
+                                cntl |= CURSOR_FORMAT_ARGB | CURSOR_GAMMA_ENABLE;
+                        }
+                } else {
+                        if (IS_MOBILE(dev) || IS_I9XX(dev)) {
+                                cntl &= ~(CURSOR_MODE | MCURSOR_GAMMA_ENABLE);
+                                cntl |= CURSOR_MODE_DISABLE;
+                        } else {
+                                cntl &= ~(CURSOR_ENABLE | CURSOR_GAMMA_ENABLE);
+                        }
+                }
+                I915_WRITE(pipe == 0 ? CURACNTR : CURBCNTR, cntl);
+                intel_crtc->cursor_visble = visible;
+        }
+        /* and commit changes on next vblank */
+        I915_WRITE(pipe == 0 ? CURABASE : CURBBASE, base);
+        if (visible)
+                intel_mark_busy(dev, to_intel_framebuffer(crtc->fb)->obj);
+}
 static int intel_crtc_cursor_set(struct drm_crtc *crtc,
                                 struct drm_file *file_priv,
                                 uint32_t handle,
@@ -3930,11 +4305,7 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
        struct drm_gem_object *bo;
        struct drm_i915_gem_object *obj_priv;
-        int pipe = intel_crtc->pipe;
+        uint32_t addr;
-        uint32_t control = (pipe == 0) ? CURACNTR : CURBCNTR;
-        uint32_t base = (pipe == 0) ? CURABASE : CURBBASE;
-        uint32_t temp = I915_READ(control);
-        size_t addr;
        int ret;
        DRM_DEBUG_KMS("\n");
@@ -3942,12 +4313,6 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
        /* if we want to turn off the cursor ignore width and height */
        if (!handle) {
                DRM_DEBUG_KMS("cursor off\n");
-                if (IS_MOBILE(dev) || IS_I9XX(dev)) {
-                        temp &= ~(CURSOR_MODE | MCURSOR_GAMMA_ENABLE);
-                        temp |= CURSOR_MODE_DISABLE;
-                } else {
-                        temp &= ~(CURSOR_ENABLE | CURSOR_GAMMA_ENABLE);
-                }
                addr = 0;
                bo = NULL;
                mutex_lock(&dev->struct_mutex);
@@ -3989,7 +4354,8 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
                addr = obj_priv->gtt_offset;
        } else {
-                ret = i915_gem_attach_phys_object(dev, bo, (pipe == 0) ? I915_GEM_PHYS_CURSOR_0 : I915_GEM_PHYS_CURSOR_1);
+                ret = i915_gem_attach_phys_object(dev, bo,
+                                                  (intel_crtc->pipe == 0) ? I915_GEM_PHYS_CURSOR_0 : I915_GEM_PHYS_CURSOR_1);
                if (ret) {
                        DRM_ERROR("failed to attach phys object\n");
                        goto fail_locked;
@@ -4000,21 +4366,7 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
        if (!IS_I9XX(dev))
                I915_WRITE(CURSIZE, (height << 12) | width);
-        /* Hooray for CUR*CNTR differences */
-        if (IS_MOBILE(dev) || IS_I9XX(dev)) {
-                temp &= ~(CURSOR_MODE | MCURSOR_PIPE_SELECT);
-                temp |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE;
-                temp |= (pipe << 28); /* Connect to correct pipe */
-        } else {
-                temp &= ~(CURSOR_FORMAT_MASK);
-                temp |= CURSOR_ENABLE;
-                temp |= CURSOR_FORMAT_ARGB | CURSOR_GAMMA_ENABLE;
-        }
 finish:
-        I915_WRITE(control, temp);
-        I915_WRITE(base, addr);
        if (intel_crtc->cursor_bo) {
                if (dev_priv->info->cursor_needs_physical) {
                        if (intel_crtc->cursor_bo != bo)
@@ -4028,6 +4380,10 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
        intel_crtc->cursor_addr = addr;
        intel_crtc->cursor_bo = bo;
+        intel_crtc->cursor_width = width;
+        intel_crtc->cursor_height = height;
+        intel_crtc_update_cursor(crtc);
        return 0;
 fail_unpin:
@@ -4041,34 +4397,12 @@ fail:
 static int intel_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
 {
-        struct drm_device *dev = crtc->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-        struct intel_framebuffer *intel_fb;
-        int pipe = intel_crtc->pipe;
-        uint32_t temp = 0;
-        uint32_t adder;
-        if (crtc->fb) {
-                intel_fb = to_intel_framebuffer(crtc->fb);
-                intel_mark_busy(dev, intel_fb->obj);
-        }
-        if (x < 0) {
-                temp |= CURSOR_POS_SIGN << CURSOR_X_SHIFT;
-                x = -x;
-        }
-        if (y < 0) {
-                temp |= CURSOR_POS_SIGN << CURSOR_Y_SHIFT;
-                y = -y;
-        }
-        temp |= x << CURSOR_X_SHIFT;
+        intel_crtc->cursor_x = x;
-        temp |= y << CURSOR_Y_SHIFT;
+        intel_crtc->cursor_y = y;
-        adder = intel_crtc->cursor_addr;
+        intel_crtc_update_cursor(crtc);
-        I915_WRITE((pipe == 0) ? CURAPOS : CURBPOS, temp);
-        I915_WRITE((pipe == 0) ? CURABASE : CURBBASE, adder);
        return 0;
 }
@@ -4412,7 +4746,8 @@ static void intel_increase_pllclock(struct drm_crtc *crtc, bool schedule)
                DRM_DEBUG_DRIVER("upclocking LVDS\n");
                /* Unlock panel regs */
-                I915_WRITE(PP_CONTROL, I915_READ(PP_CONTROL) | (0xabcd << 16));
+                I915_WRITE(PP_CONTROL, I915_READ(PP_CONTROL) |
+                           PANEL_UNLOCK_REGS);
                dpll &= ~DISPLAY_RATE_SELECT_FPA1;
                I915_WRITE(dpll_reg, dpll);
@@ -4455,7 +4790,8 @@ static void intel_decrease_pllclock(struct drm_crtc *crtc)
                DRM_DEBUG_DRIVER("downclocking LVDS\n");
                /* Unlock panel regs */
-                I915_WRITE(PP_CONTROL, I915_READ(PP_CONTROL) | (0xabcd << 16));
+                I915_WRITE(PP_CONTROL, I915_READ(PP_CONTROL) |
+                           PANEL_UNLOCK_REGS);
                dpll |= DISPLAY_RATE_SELECT_FPA1;
                I915_WRITE(dpll_reg, dpll);
@@ -4650,6 +4986,8 @@ static void do_intel_finish_page_flip(struct drm_device *dev,
            atomic_dec_and_test(&obj_priv->pending_flip))
                DRM_WAKEUP(&dev_priv->pending_flip_queue);
        schedule_work(&work->work);
+        trace_i915_flip_complete(intel_crtc->plane, work->pending_flip_obj);
 }
 void intel_finish_page_flip(struct drm_device *dev, int pipe)
@@ -4695,7 +5033,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
        struct drm_gem_object *obj;
        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
        struct intel_unpin_work *work;
-        unsigned long flags;
+        unsigned long flags, offset;
        int pipesrc_reg = (intel_crtc->pipe == 0) ? PIPEASRC : PIPEBSRC;
        int ret, pipesrc;
        u32 flip_mask;
@@ -4727,27 +5065,22 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
        mutex_lock(&dev->struct_mutex);
        ret = intel_pin_and_fence_fb_obj(dev, obj);
-        if (ret != 0) {
+        if (ret)
-                mutex_unlock(&dev->struct_mutex);
+                goto cleanup_work;
-                spin_lock_irqsave(&dev->event_lock, flags);
-                intel_crtc->unpin_work = NULL;
-                spin_unlock_irqrestore(&dev->event_lock, flags);
-                kfree(work);
-                DRM_DEBUG_DRIVER("flip queue: %p pin & fence failed\n",
-                                 to_intel_bo(obj));
-                return ret;
-        }
        /* Reference the objects for the scheduled work. */
        drm_gem_object_reference(work->old_fb_obj);
        drm_gem_object_reference(obj);
        crtc->fb = fb;
-        i915_gem_object_flush_write_domain(obj);
+        ret = i915_gem_object_flush_write_domain(obj);
-        drm_vblank_get(dev, intel_crtc->pipe);
+        if (ret)
+                goto cleanup_objs;
+        ret = drm_vblank_get(dev, intel_crtc->pipe);
+        if (ret)
+                goto cleanup_objs;
        obj_priv = to_intel_bo(obj);
        atomic_inc(&obj_priv->pending_flip);
        work->pending_flip_obj = obj;
@@ -4762,26 +5095,46 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
                while (I915_READ(ISR) & flip_mask)
                        ;
+        /* Offset into the new buffer for cases of shared fbs between CRTCs */
+        offset = obj_priv->gtt_offset;
+        offset += (crtc->y * fb->pitch) + (crtc->x * (fb->bits_per_pixel) / 8);
        BEGIN_LP_RING(4);
        if (IS_I965G(dev)) {
                OUT_RING(MI_DISPLAY_FLIP |
                         MI_DISPLAY_FLIP_PLANE(intel_crtc->plane));
                OUT_RING(fb->pitch);
-                OUT_RING(obj_priv->gtt_offset | obj_priv->tiling_mode);
+                OUT_RING(offset | obj_priv->tiling_mode);
                pipesrc = I915_READ(pipesrc_reg); 
                OUT_RING(pipesrc & 0x0fff0fff);
        } else {
                OUT_RING(MI_DISPLAY_FLIP_I915 |
                         MI_DISPLAY_FLIP_PLANE(intel_crtc->plane));
                OUT_RING(fb->pitch);
-                OUT_RING(obj_priv->gtt_offset);
+                OUT_RING(offset);
                OUT_RING(MI_NOOP);
        }
        ADVANCE_LP_RING();
        mutex_unlock(&dev->struct_mutex);
+        trace_i915_flip_request(intel_crtc->plane, obj);
        return 0;
+cleanup_objs:
+        drm_gem_object_unreference(work->old_fb_obj);
+        drm_gem_object_unreference(obj);
+cleanup_work:
+        mutex_unlock(&dev->struct_mutex);
+        spin_lock_irqsave(&dev->event_lock, flags);
+        intel_crtc->unpin_work = NULL;
+        spin_unlock_irqrestore(&dev->event_lock, flags);
+        kfree(work);
+        return ret;
 }
 static const struct drm_crtc_helper_funcs intel_helper_funcs = {
@@ -4789,6 +5142,7 @@ static const struct drm_crtc_helper_funcs intel_helper_funcs = {
        .mode_fixup = intel_crtc_mode_fixup,
        .mode_set = intel_crtc_mode_set,
        .mode_set_base = intel_pipe_set_base,
+        .mode_set_base_atomic = intel_pipe_set_base_atomic,
        .prepare = intel_crtc_prepare,
        .commit = intel_crtc_commit,
        .load_lut = intel_crtc_load_lut,
@@ -4907,19 +5261,26 @@ static void intel_setup_outputs(struct drm_device *dev)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        struct drm_encoder *encoder;
+        bool dpd_is_edp = false;
-        intel_crt_init(dev);
-        /* Set up integrated LVDS */
        if (IS_MOBILE(dev) && !IS_I830(dev))
                intel_lvds_init(dev);
        if (HAS_PCH_SPLIT(dev)) {
-                int found;
+                dpd_is_edp = intel_dpd_is_edp(dev);
                if (IS_MOBILE(dev) && (I915_READ(DP_A) & DP_DETECTED))
                        intel_dp_init(dev, DP_A);
+                if (dpd_is_edp && (I915_READ(PCH_DP_D) & DP_DETECTED))
+                        intel_dp_init(dev, PCH_DP_D);
+        }
+        intel_crt_init(dev);
+        if (HAS_PCH_SPLIT(dev)) {
+                int found;
                if (I915_READ(HDMIB) & PORT_DETECTED) {
                        /* PCH SDVOB multiplex with HDMIB */
                        found = intel_sdvo_init(dev, PCH_SDVOB);
@@ -4938,7 +5299,7 @@ static void intel_setup_outputs(struct drm_device *dev)
                if (I915_READ(PCH_DP_C) & DP_DETECTED)
                        intel_dp_init(dev, PCH_DP_C);
-                if (I915_READ(PCH_DP_D) & DP_DETECTED)
+                if (!dpd_is_edp && (I915_READ(PCH_DP_D) & DP_DETECTED))
                        intel_dp_init(dev, PCH_DP_D);
        } else if (SUPPORTS_DIGITAL_OUTPUTS(dev)) {
@@ -5347,6 +5708,26 @@ void intel_init_clock_gating(struct drm_device *dev)
                                        (I915_READ(DISP_ARB_CTL) |
                                                DISP_FBC_WM_DIS));
                }
+                /*
+                 * Based on the document from hardware guys the following bits
+                 * should be set unconditionally in order to enable FBC.
+                 * The bit 22 of 0x42000
+                 * The bit 22 of 0x42004
+                 * The bit 7,8,9 of 0x42020.
+                 */
+                if (IS_IRONLAKE_M(dev)) {
+                        I915_WRITE(ILK_DISPLAY_CHICKEN1,
+                                   I915_READ(ILK_DISPLAY_CHICKEN1) |
+                                   ILK_FBCQ_DIS);
+                        I915_WRITE(ILK_DISPLAY_CHICKEN2,
+                                   I915_READ(ILK_DISPLAY_CHICKEN2) |
+                                   ILK_DPARB_GATE);
+                        I915_WRITE(ILK_DSPCLK_GATE,
+                                   I915_READ(ILK_DSPCLK_GATE) |
+                                   ILK_DPFC_DIS1 |
+                                   ILK_DPFC_DIS2 |
+                                   ILK_CLK_FBC);
+                }
                return;
        } else if (IS_G4X(dev)) {
                uint32_t dspclk_gate;
@@ -5425,7 +5806,11 @@ static void intel_init_display(struct drm_device *dev)
                dev_priv->display.dpms = i9xx_crtc_dpms;
        if (I915_HAS_FBC(dev)) {
-                if (IS_GM45(dev)) {
+                if (IS_IRONLAKE_M(dev)) {
+                        dev_priv->display.fbc_enabled = ironlake_fbc_enabled;
+                        dev_priv->display.enable_fbc = ironlake_enable_fbc;
+                        dev_priv->display.disable_fbc = ironlake_disable_fbc;
+                } else if (IS_GM45(dev)) {
                        dev_priv->display.fbc_enabled = g4x_fbc_enabled;
                        dev_priv->display.enable_fbc = g4x_enable_fbc;
                        dev_priv->display.disable_fbc = g4x_disable_fbc;
@@ -5506,6 +5891,66 @@ static void intel_init_display(struct drm_device *dev)
        }
 }
+/*
+ * Some BIOSes insist on assuming the GPU's pipe A is enabled at suspend,
+ * resume, or other times.  This quirk makes sure that's the case for
+ * affected systems.
+ */
+static void quirk_pipea_force (struct drm_device *dev)
+{
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        dev_priv->quirks |= QUIRK_PIPEA_FORCE;
+        DRM_DEBUG_DRIVER("applying pipe a force quirk\n");
+}
+struct intel_quirk {
+        int device;
+        int subsystem_vendor;
+        int subsystem_device;
+        void (*hook)(struct drm_device *dev);
+};
+struct intel_quirk intel_quirks[] = {
+        /* HP Compaq 2730p needs pipe A force quirk (LP: #291555) */
+        { 0x2a42, 0x103c, 0x30eb, quirk_pipea_force },
+        /* HP Mini needs pipe A force quirk (LP: #322104) */
+        { 0x27ae,0x103c, 0x361a, quirk_pipea_force },
+        /* Thinkpad R31 needs pipe A force quirk */
+        { 0x3577, 0x1014, 0x0505, quirk_pipea_force },
+        /* Toshiba Protege R-205, S-209 needs pipe A force quirk */
+        { 0x2592, 0x1179, 0x0001, quirk_pipea_force },
+        /* ThinkPad X30 needs pipe A force quirk (LP: #304614) */
+        { 0x3577,  0x1014, 0x0513, quirk_pipea_force },
+        /* ThinkPad X40 needs pipe A force quirk */
+        /* ThinkPad T60 needs pipe A force quirk (bug #16494) */
+        { 0x2782, 0x17aa, 0x201a, quirk_pipea_force },
+        /* 855 & before need to leave pipe A & dpll A up */
+        { 0x3582, PCI_ANY_ID, PCI_ANY_ID, quirk_pipea_force },
+        { 0x2562, PCI_ANY_ID, PCI_ANY_ID, quirk_pipea_force },
+};
+static void intel_init_quirks(struct drm_device *dev)
+{
+        struct pci_dev *d = dev->pdev;
+        int i;
+        for (i = 0; i < ARRAY_SIZE(intel_quirks); i++) {
+                struct intel_quirk *q = &intel_quirks[i];
+                if (d->device == q->device &&
+                    (d->subsystem_vendor == q->subsystem_vendor ||
+                     q->subsystem_vendor == PCI_ANY_ID) &&
+                    (d->subsystem_device == q->subsystem_device ||
+                     q->subsystem_device == PCI_ANY_ID))
+                        q->hook(dev);
+        }
+}
 void intel_modeset_init(struct drm_device *dev)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
@@ -5518,6 +5963,8 @@ void intel_modeset_init(struct drm_device *dev)
        dev->mode_config.funcs = (void *)&intel_mode_funcs;
+        intel_init_quirks(dev);
        intel_init_display(dev);
        if (IS_I965G(dev)) {
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 1aac59e83bff..40be1fa65be1 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -43,6 +43,7 @@
 #define DP_LINK_CONFIGURATION_SIZE      9
 #define IS_eDP(i) ((i)->type == INTEL_OUTPUT_EDP)
+#define IS_PCH_eDP(dp_priv) ((dp_priv)->is_pch_edp)
 struct intel_dp_priv {
        uint32_t output_reg;
@@ -56,6 +57,7 @@ struct intel_dp_priv {
        struct intel_encoder *intel_encoder;
        struct i2c_adapter adapter;
        struct i2c_algo_dp_aux_data algo;
+        bool is_pch_edp;
 };
 static void
@@ -128,8 +130,9 @@ intel_dp_link_required(struct drm_device *dev,
                       struct intel_encoder *intel_encoder, int pixel_clock)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct intel_dp_priv *dp_priv = intel_encoder->dev_priv;
-        if (IS_eDP(intel_encoder))
+        if (IS_eDP(intel_encoder) || IS_PCH_eDP(dp_priv))
                return (pixel_clock * dev_priv->edp_bpp) / 8;
        else
                return pixel_clock * 3;
@@ -147,9 +150,21 @@ intel_dp_mode_valid(struct drm_connector *connector,
 {
        struct drm_encoder *encoder = intel_attached_encoder(connector);
        struct intel_encoder *intel_encoder = enc_to_intel_encoder(encoder);
+        struct intel_dp_priv *dp_priv = intel_encoder->dev_priv;
+        struct drm_device *dev = connector->dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
        int max_link_clock = intel_dp_link_clock(intel_dp_max_link_bw(intel_encoder));
        int max_lanes = intel_dp_max_lane_count(intel_encoder);
+        if ((IS_eDP(intel_encoder) || IS_PCH_eDP(dp_priv)) &&
+            dev_priv->panel_fixed_mode) {
+                if (mode->hdisplay > dev_priv->panel_fixed_mode->hdisplay)
+                        return MODE_PANEL;
+                if (mode->vdisplay > dev_priv->panel_fixed_mode->vdisplay)
+                        return MODE_PANEL;
+        }
        /* only refuse the mode on non eDP since we have seen some wierd eDP panels
           which are outside spec tolerances but somehow work by magic */
        if (!IS_eDP(intel_encoder) &&
@@ -508,11 +523,37 @@ intel_dp_mode_fixup(struct drm_encoder *encoder, struct drm_display_mode *mode,
 {
        struct intel_encoder *intel_encoder = enc_to_intel_encoder(encoder);
        struct intel_dp_priv   *dp_priv = intel_encoder->dev_priv;
+        struct drm_device *dev = encoder->dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
        int lane_count, clock;
        int max_lane_count = intel_dp_max_lane_count(intel_encoder);
        int max_clock = intel_dp_max_link_bw(intel_encoder) == DP_LINK_BW_2_7 ? 1 : 0;
        static int bws[2] = { DP_LINK_BW_1_62, DP_LINK_BW_2_7 };
+        if ((IS_eDP(intel_encoder) || IS_PCH_eDP(dp_priv)) &&
+            dev_priv->panel_fixed_mode) {
+                struct drm_display_mode *fixed_mode = dev_priv->panel_fixed_mode;
+                adjusted_mode->hdisplay = fixed_mode->hdisplay;
+                adjusted_mode->hsync_start = fixed_mode->hsync_start;
+                adjusted_mode->hsync_end = fixed_mode->hsync_end;
+                adjusted_mode->htotal = fixed_mode->htotal;
+                adjusted_mode->vdisplay = fixed_mode->vdisplay;
+                adjusted_mode->vsync_start = fixed_mode->vsync_start;
+                adjusted_mode->vsync_end = fixed_mode->vsync_end;
+                adjusted_mode->vtotal = fixed_mode->vtotal;
+                adjusted_mode->clock = fixed_mode->clock;
+                drm_mode_set_crtcinfo(adjusted_mode, CRTC_INTERLACE_HALVE_V);
+                /*
+                 * the mode->clock is used to calculate the Data&Link M/N
+                 * of the pipe. For the eDP the fixed clock should be used.
+                 */
+                mode->clock = dev_priv->panel_fixed_mode->clock;
+        }
        for (lane_count = 1; lane_count <= max_lane_count; lane_count <<= 1) {
                for (clock = 0; clock <= max_clock; clock++) {
                        int link_avail = intel_dp_max_data_rate(intel_dp_link_clock(bws[clock]), lane_count);
@@ -531,7 +572,7 @@ intel_dp_mode_fixup(struct drm_encoder *encoder, struct drm_display_mode *mode,
                }
        }
-        if (IS_eDP(intel_encoder)) {
+        if (IS_eDP(intel_encoder) || IS_PCH_eDP(dp_priv)) {
                /* okay we failed just pick the highest */
                dp_priv->lane_count = max_lane_count;
                dp_priv->link_bw = bws[max_clock];
@@ -563,14 +604,14 @@ intel_reduce_ratio(uint32_t *num, uint32_t *den)
 }
 static void
-intel_dp_compute_m_n(int bytes_per_pixel,
+intel_dp_compute_m_n(int bpp,
                     int nlanes,
                     int pixel_clock,
                     int link_clock,
                     struct intel_dp_m_n *m_n)
 {
        m_n->tu = 64;
-        m_n->gmch_m = pixel_clock * bytes_per_pixel;
+        m_n->gmch_m = (pixel_clock * bpp) >> 3;
        m_n->gmch_n = link_clock * nlanes;
        intel_reduce_ratio(&m_n->gmch_m, &m_n->gmch_n);
        m_n->link_m = pixel_clock;
@@ -578,6 +619,28 @@ intel_dp_compute_m_n(int bytes_per_pixel,
        intel_reduce_ratio(&m_n->link_m, &m_n->link_n);
 }
+bool intel_pch_has_edp(struct drm_crtc *crtc)
+{
+        struct drm_device *dev = crtc->dev;
+        struct drm_mode_config *mode_config = &dev->mode_config;
+        struct drm_encoder *encoder;
+        list_for_each_entry(encoder, &mode_config->encoder_list, head) {
+                struct intel_encoder *intel_encoder;
+                struct intel_dp_priv *dp_priv;
+                if (!encoder || encoder->crtc != crtc)
+                        continue;
+                intel_encoder = enc_to_intel_encoder(encoder);
+                dp_priv = intel_encoder->dev_priv;
+                if (intel_encoder->type == INTEL_OUTPUT_DISPLAYPORT)
+                        return dp_priv->is_pch_edp;
+        }
+        return false;
+}
 void
 intel_dp_set_m_n(struct drm_crtc *crtc, struct drm_display_mode *mode,
                 struct drm_display_mode *adjusted_mode)
@@ -587,7 +650,7 @@ intel_dp_set_m_n(struct drm_crtc *crtc, struct drm_display_mode *mode,
        struct drm_encoder *encoder;
        struct drm_i915_private *dev_priv = dev->dev_private;
        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-        int lane_count = 4;
+        int lane_count = 4, bpp = 24;
        struct intel_dp_m_n m_n;
        /*
@@ -605,6 +668,8 @@ intel_dp_set_m_n(struct drm_crtc *crtc, struct drm_display_mode *mode,
                if (intel_encoder->type == INTEL_OUTPUT_DISPLAYPORT) {
                        lane_count = dp_priv->lane_count;
+                        if (IS_PCH_eDP(dp_priv))
+                                bpp = dev_priv->edp_bpp;
                        break;
                }
        }
@@ -614,7 +679,7 @@ intel_dp_set_m_n(struct drm_crtc *crtc, struct drm_display_mode *mode,
         * the number of bytes_per_pixel post-LUT, which we always
         * set up for 8-bits of R/G/B, or 3 bytes total.
         */
-        intel_dp_compute_m_n(3, lane_count,
+        intel_dp_compute_m_n(bpp, lane_count,
                             mode->clock, adjusted_mode->clock, &m_n);
        if (HAS_PCH_SPLIT(dev)) {
@@ -717,6 +782,51 @@ intel_dp_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,
        }
 }
+static void ironlake_edp_panel_on (struct drm_device *dev)
+{
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        unsigned long timeout = jiffies + msecs_to_jiffies(5000);
+        u32 pp, pp_status;
+        pp_status = I915_READ(PCH_PP_STATUS);
+        if (pp_status & PP_ON)
+                return;
+        pp = I915_READ(PCH_PP_CONTROL);
+        pp |= PANEL_UNLOCK_REGS | POWER_TARGET_ON;
+        I915_WRITE(PCH_PP_CONTROL, pp);
+        do {
+                pp_status = I915_READ(PCH_PP_STATUS);
+        } while (((pp_status & PP_ON) == 0) && !time_after(jiffies, timeout));
+        if (time_after(jiffies, timeout))
+                DRM_DEBUG_KMS("panel on wait timed out: 0x%08x\n", pp_status);
+        pp &= ~(PANEL_UNLOCK_REGS | EDP_FORCE_VDD);
+        I915_WRITE(PCH_PP_CONTROL, pp);
+}
+static void ironlake_edp_panel_off (struct drm_device *dev)
+{
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        unsigned long timeout = jiffies + msecs_to_jiffies(5000);
+        u32 pp, pp_status;
+        pp = I915_READ(PCH_PP_CONTROL);
+        pp &= ~POWER_TARGET_ON;
+        I915_WRITE(PCH_PP_CONTROL, pp);
+        do {
+                pp_status = I915_READ(PCH_PP_STATUS);
+        } while ((pp_status & PP_ON) && !time_after(jiffies, timeout));
+        if (time_after(jiffies, timeout))
+                DRM_DEBUG_KMS("panel off wait timed out\n");
+        /* Make sure VDD is enabled so DP AUX will work */
+        pp |= EDP_FORCE_VDD;
+        I915_WRITE(PCH_PP_CONTROL, pp);
+}
 static void ironlake_edp_backlight_on (struct drm_device *dev)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
@@ -751,14 +861,18 @@ intel_dp_dpms(struct drm_encoder *encoder, int mode)
        if (mode != DRM_MODE_DPMS_ON) {
                if (dp_reg & DP_PORT_EN) {
                        intel_dp_link_down(intel_encoder, dp_priv->DP);
-                        if (IS_eDP(intel_encoder))
+                        if (IS_eDP(intel_encoder) || IS_PCH_eDP(dp_priv)) {
                                ironlake_edp_backlight_off(dev);
+                                ironlake_edp_panel_off(dev);
+                        }
                }
        } else {
                if (!(dp_reg & DP_PORT_EN)) {
                        intel_dp_link_train(intel_encoder, dp_priv->DP, dp_priv->link_configuration);
-                        if (IS_eDP(intel_encoder))
+                        if (IS_eDP(intel_encoder) || IS_PCH_eDP(dp_priv)) {
+                                ironlake_edp_panel_on(dev);
                                ironlake_edp_backlight_on(dev);
+                        }
                }
        }
        dp_priv->dpms_mode = mode;
@@ -1291,17 +1405,32 @@ static int intel_dp_get_modes(struct drm_connector *connector)
        struct intel_encoder *intel_encoder = enc_to_intel_encoder(encoder);
        struct drm_device *dev = intel_encoder->enc.dev;
        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct intel_dp_priv *dp_priv = intel_encoder->dev_priv;
        int ret;
        /* We should parse the EDID data and find out if it has an audio sink
         */
        ret = intel_ddc_get_modes(connector, intel_encoder->ddc_bus);
-        if (ret)
+        if (ret) {
+                if ((IS_eDP(intel_encoder) || IS_PCH_eDP(dp_priv)) &&
+                    !dev_priv->panel_fixed_mode) {
+                        struct drm_display_mode *newmode;
+                        list_for_each_entry(newmode, &connector->probed_modes,
+                                            head) {
+                                if (newmode->type & DRM_MODE_TYPE_PREFERRED) {
+                                        dev_priv->panel_fixed_mode =
+                                                drm_mode_duplicate(dev, newmode);
+                                        break;
+                                }
+                        }
+                }
                return ret;
+        }
        /* if eDP has no EDID, try to use fixed panel mode from VBT */
-        if (IS_eDP(intel_encoder)) {
+        if (IS_eDP(intel_encoder) || IS_PCH_eDP(dp_priv)) {
                if (dev_priv->panel_fixed_mode != NULL) {
                        struct drm_display_mode *mode;
                        mode = drm_mode_duplicate(dev, dev_priv->panel_fixed_mode);
@@ -1386,6 +1515,26 @@ intel_trans_dp_port_sel (struct drm_crtc *crtc)
        return -1;
 }
+/* check the VBT to see whether the eDP is on DP-D port */
+bool intel_dpd_is_edp(struct drm_device *dev)
+{
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct child_device_config *p_child;
+        int i;
+        if (!dev_priv->child_dev_num)
+                return false;
+        for (i = 0; i < dev_priv->child_dev_num; i++) {
+                p_child = dev_priv->child_dev + i;
+                if (p_child->dvo_port == PORT_IDPD &&
+                    p_child->device_type == DEVICE_TYPE_eDP)
+                        return true;
+        }
+        return false;
+}
 void
 intel_dp_init(struct drm_device *dev, int output_reg)
 {
@@ -1395,6 +1544,7 @@ intel_dp_init(struct drm_device *dev, int output_reg)
        struct intel_connector *intel_connector;
        struct intel_dp_priv *dp_priv;
        const char *name = NULL;
+        int type;
        intel_encoder = kcalloc(sizeof(struct intel_encoder) +
                               sizeof(struct intel_dp_priv), 1, GFP_KERNEL);
@@ -1409,18 +1559,24 @@ intel_dp_init(struct drm_device *dev, int output_reg)
        dp_priv = (struct intel_dp_priv *)(intel_encoder + 1);
+        if (HAS_PCH_SPLIT(dev) && (output_reg == PCH_DP_D))
+                if (intel_dpd_is_edp(dev))
+                        dp_priv->is_pch_edp = true;
+        if (output_reg == DP_A || IS_PCH_eDP(dp_priv)) {
+                type = DRM_MODE_CONNECTOR_eDP;
+                intel_encoder->type = INTEL_OUTPUT_EDP;
+        } else {
+                type = DRM_MODE_CONNECTOR_DisplayPort;
+                intel_encoder->type = INTEL_OUTPUT_DISPLAYPORT;
+        }
        connector = &intel_connector->base;
-        drm_connector_init(dev, connector, &intel_dp_connector_funcs,
+        drm_connector_init(dev, connector, &intel_dp_connector_funcs, type);
-                           DRM_MODE_CONNECTOR_DisplayPort);
        drm_connector_helper_add(connector, &intel_dp_connector_helper_funcs);
        connector->polled = DRM_CONNECTOR_POLL_HPD;
-        if (output_reg == DP_A)
-                intel_encoder->type = INTEL_OUTPUT_EDP;
-        else
-                intel_encoder->type = INTEL_OUTPUT_DISPLAYPORT;
        if (output_reg == DP_B || output_reg == PCH_DP_B)
                intel_encoder->clone_mask = (1 << INTEL_DP_B_CLONE_BIT);
        else if (output_reg == DP_C || output_reg == PCH_DP_C)
@@ -1479,7 +1635,7 @@ intel_dp_init(struct drm_device *dev, int output_reg)
        intel_encoder->ddc_bus = &dp_priv->adapter;
        intel_encoder->hot_plug = intel_dp_hot_plug;
-        if (output_reg == DP_A) {
+        if (output_reg == DP_A || IS_PCH_eDP(dp_priv)) {
                /* initialize panel mode from VBT if available for eDP */
                if (dev_priv->lfp_lvds_vbt_mode) {
                        dev_priv->panel_fixed_mode =
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 72206f37c4fb..b2190148703a 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -143,8 +143,6 @@ struct intel_crtc {
        struct drm_crtc base;
        enum pipe pipe;
        enum plane plane;
-        struct drm_gem_object *cursor_bo;
-        uint32_t cursor_addr;
        u8 lut_r[256], lut_g[256], lut_b[256];
        int dpms_mode;
        bool busy; /* is scanout buffer being updated frequently? */
@@ -153,6 +151,12 @@ struct intel_crtc {
        struct intel_overlay *overlay;
        struct intel_unpin_work *unpin_work;
        int fdi_lanes;
+        struct drm_gem_object *cursor_bo;
+        uint32_t cursor_addr;
+        int16_t cursor_x, cursor_y;
+        int16_t cursor_width, cursor_height;
+        bool cursor_visble;
 };
 #define to_intel_crtc(x) container_of(x, struct intel_crtc, base)
@@ -179,6 +183,8 @@ extern void intel_dp_init(struct drm_device *dev, int dp_reg);
 void
 intel_dp_set_m_n(struct drm_crtc *crtc, struct drm_display_mode *mode,
                 struct drm_display_mode *adjusted_mode);
+extern bool intel_pch_has_edp(struct drm_crtc *crtc);
+extern bool intel_dpd_is_edp(struct drm_device *dev);
 extern void intel_edp_link_config (struct intel_encoder *, int *, int *);
@@ -215,6 +221,9 @@ extern void intel_init_clock_gating(struct drm_device *dev);
 extern void ironlake_enable_drps(struct drm_device *dev);
 extern void ironlake_disable_drps(struct drm_device *dev);
+extern int intel_pin_and_fence_fb_obj(struct drm_device *dev,
+                                      struct drm_gem_object *obj);
 extern int intel_framebuffer_init(struct drm_device *dev,
                                  struct intel_framebuffer *ifb,
                                  struct drm_mode_fb_cmd *mode_cmd,
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index c3c505244e07..54acd8b534df 100644
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -61,6 +61,8 @@ static struct fb_ops intelfb_ops = {
        .fb_pan_display = drm_fb_helper_pan_display,
        .fb_blank = drm_fb_helper_blank,
        .fb_setcmap = drm_fb_helper_setcmap,
+        .fb_debug_enter = drm_fb_helper_debug_enter,
+        .fb_debug_leave = drm_fb_helper_debug_leave,
 };
 static int intelfb_create(struct intel_fbdev *ifbdev,
@@ -98,7 +100,7 @@ static int intelfb_create(struct intel_fbdev *ifbdev,
        mutex_lock(&dev->struct_mutex);
-        ret = i915_gem_object_pin(fbo, 64*1024);
+        ret = intel_pin_and_fence_fb_obj(dev, fbo);
        if (ret) {
                DRM_ERROR("failed to pin fb: %d\n", ret);
                goto out_unref;
@@ -236,7 +238,7 @@ int intel_fbdev_destroy(struct drm_device *dev,
        drm_framebuffer_cleanup(&ifb->base);
        if (ifb->obj)
-                drm_gem_object_unreference_unlocked(ifb->obj);
+                drm_gem_object_unreference(ifb->obj);
        return 0;
 }
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 83bd764b000e..197887ed1823 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -54,10 +54,11 @@ static void intel_hdmi_mode_set(struct drm_encoder *encoder,
        struct intel_hdmi_priv *hdmi_priv = intel_encoder->dev_priv;
        u32 sdvox;
-        sdvox = SDVO_ENCODING_HDMI |
+        sdvox = SDVO_ENCODING_HDMI | SDVO_BORDER_ENABLE;
-                SDVO_BORDER_ENABLE |
+        if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC)
-                SDVO_VSYNC_ACTIVE_HIGH |
+                sdvox |= SDVO_VSYNC_ACTIVE_HIGH;
-                SDVO_HSYNC_ACTIVE_HIGH;
+        if (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC)
+                sdvox |= SDVO_HSYNC_ACTIVE_HIGH;
        if (hdmi_priv->has_hdmi_sink) {
                sdvox |= SDVO_AUDIO_ENABLE;
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 31df55f0a0a7..0a2e60059fb3 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -156,31 +156,73 @@ static int intel_lvds_mode_valid(struct drm_connector *connector,
        return MODE_OK;
 }
+static void
+centre_horizontally(struct drm_display_mode *mode,
+                    int width)
+{
+        u32 border, sync_pos, blank_width, sync_width;
+        /* keep the hsync and hblank widths constant */
+        sync_width = mode->crtc_hsync_end - mode->crtc_hsync_start;
+        blank_width = mode->crtc_hblank_end - mode->crtc_hblank_start;
+        sync_pos = (blank_width - sync_width + 1) / 2;
+        border = (mode->hdisplay - width + 1) / 2;
+        border += border & 1; /* make the border even */
+        mode->crtc_hdisplay = width;
+        mode->crtc_hblank_start = width + border;
+        mode->crtc_hblank_end = mode->crtc_hblank_start + blank_width;
+        mode->crtc_hsync_start = mode->crtc_hblank_start + sync_pos;
+        mode->crtc_hsync_end = mode->crtc_hsync_start + sync_width;
+}
+static void
+centre_vertically(struct drm_display_mode *mode,
+                  int height)
+{
+        u32 border, sync_pos, blank_width, sync_width;
+        /* keep the vsync and vblank widths constant */
+        sync_width = mode->crtc_vsync_end - mode->crtc_vsync_start;
+        blank_width = mode->crtc_vblank_end - mode->crtc_vblank_start;
+        sync_pos = (blank_width - sync_width + 1) / 2;
+        border = (mode->vdisplay - height + 1) / 2;
+        mode->crtc_vdisplay = height;
+        mode->crtc_vblank_start = height + border;
+        mode->crtc_vblank_end = mode->crtc_vblank_start + blank_width;
+        mode->crtc_vsync_start = mode->crtc_vblank_start + sync_pos;
+        mode->crtc_vsync_end = mode->crtc_vsync_start + sync_width;
+}
+static inline u32 panel_fitter_scaling(u32 source, u32 target)
+{
+        /*
+         * Floating point operation is not supported. So the FACTOR
+         * is defined, which can avoid the floating point computation
+         * when calculating the panel ratio.
+         */
+#define ACCURACY 12
+#define FACTOR (1 << ACCURACY)
+        u32 ratio = source * FACTOR / target;
+        return (FACTOR * ratio + FACTOR/2) / FACTOR;
+}
 static bool intel_lvds_mode_fixup(struct drm_encoder *encoder,
                                  struct drm_display_mode *mode,
                                  struct drm_display_mode *adjusted_mode)
 {
-        /*
-         * float point operation is not supported . So the PANEL_RATIO_FACTOR
-         * is defined, which can avoid the float point computation when
-         * calculating the panel ratio.
-         */
-#define PANEL_RATIO_FACTOR 8192
        struct drm_device *dev = encoder->dev;
        struct drm_i915_private *dev_priv = dev->dev_private;
        struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
        struct drm_encoder *tmp_encoder;
        struct intel_encoder *intel_encoder = enc_to_intel_encoder(encoder);
        struct intel_lvds_priv *lvds_priv = intel_encoder->dev_priv;
-        u32 pfit_control = 0, pfit_pgm_ratios = 0;
+        u32 pfit_control = 0, pfit_pgm_ratios = 0, border = 0;
-        int left_border = 0, right_border = 0, top_border = 0;
-        int bottom_border = 0;
-        bool border = 0;
-        int panel_ratio, desired_ratio, vert_scale, horiz_scale;
-        int horiz_ratio, vert_ratio;
-        u32 hsync_width, vsync_width;
-        u32 hblank_width, vblank_width;
-        u32 hsync_pos, vsync_pos;
        /* Should never happen!! */
        if (!IS_I965G(dev) && intel_crtc->pipe == 0) {
@@ -200,27 +242,25 @@ static bool intel_lvds_mode_fixup(struct drm_encoder *encoder,
        if (dev_priv->panel_fixed_mode == NULL)
                return true;
        /*
-         * If we have timings from the BIOS for the panel, put them in
+         * We have timings from the BIOS for the panel, put them in
         * to the adjusted mode.  The CRTC will be set up for this mode,
         * with the panel scaling set up to source from the H/VDisplay
         * of the original mode.
         */
-        if (dev_priv->panel_fixed_mode != NULL) {
+        adjusted_mode->hdisplay = dev_priv->panel_fixed_mode->hdisplay;
-                adjusted_mode->hdisplay = dev_priv->panel_fixed_mode->hdisplay;
+        adjusted_mode->hsync_start =
-                adjusted_mode->hsync_start =
+                dev_priv->panel_fixed_mode->hsync_start;
-                        dev_priv->panel_fixed_mode->hsync_start;
+        adjusted_mode->hsync_end =
-                adjusted_mode->hsync_end =
+                dev_priv->panel_fixed_mode->hsync_end;
-                        dev_priv->panel_fixed_mode->hsync_end;
+        adjusted_mode->htotal = dev_priv->panel_fixed_mode->htotal;
-                adjusted_mode->htotal = dev_priv->panel_fixed_mode->htotal;
+        adjusted_mode->vdisplay = dev_priv->panel_fixed_mode->vdisplay;
-                adjusted_mode->vdisplay = dev_priv->panel_fixed_mode->vdisplay;
+        adjusted_mode->vsync_start =
-                adjusted_mode->vsync_start =
+                dev_priv->panel_fixed_mode->vsync_start;
-                        dev_priv->panel_fixed_mode->vsync_start;
+        adjusted_mode->vsync_end =
-                adjusted_mode->vsync_end =
+                dev_priv->panel_fixed_mode->vsync_end;
-                        dev_priv->panel_fixed_mode->vsync_end;
+        adjusted_mode->vtotal = dev_priv->panel_fixed_mode->vtotal;
-                adjusted_mode->vtotal = dev_priv->panel_fixed_mode->vtotal;
+        adjusted_mode->clock = dev_priv->panel_fixed_mode->clock;
-                adjusted_mode->clock = dev_priv->panel_fixed_mode->clock;
+        drm_mode_set_crtcinfo(adjusted_mode, CRTC_INTERLACE_HALVE_V);
-                drm_mode_set_crtcinfo(adjusted_mode, CRTC_INTERLACE_HALVE_V);
-        }
        /* Make sure pre-965s set dither correctly */
        if (!IS_I965G(dev)) {
@@ -230,11 +270,8 @@ static bool intel_lvds_mode_fixup(struct drm_encoder *encoder,
        /* Native modes don't need fitting */
        if (adjusted_mode->hdisplay == mode->hdisplay &&
-                        adjusted_mode->vdisplay == mode->vdisplay) {
+            adjusted_mode->vdisplay == mode->vdisplay)
-                pfit_pgm_ratios = 0;
-                border = 0;
                goto out;
-        }
        /* full screen scale for now */
        if (HAS_PCH_SPLIT(dev))
@@ -242,25 +279,9 @@ static bool intel_lvds_mode_fixup(struct drm_encoder *encoder,
        /* 965+ wants fuzzy fitting */
        if (IS_I965G(dev))
-                pfit_control |= (intel_crtc->pipe << PFIT_PIPE_SHIFT) |
+                pfit_control |= ((intel_crtc->pipe << PFIT_PIPE_SHIFT) |
-                                        PFIT_FILTER_FUZZY;
+                                 PFIT_FILTER_FUZZY);
-        hsync_width = adjusted_mode->crtc_hsync_end -
-                                        adjusted_mode->crtc_hsync_start;
-        vsync_width = adjusted_mode->crtc_vsync_end -
-                                        adjusted_mode->crtc_vsync_start;
-        hblank_width = adjusted_mode->crtc_hblank_end -
-                                        adjusted_mode->crtc_hblank_start;
-        vblank_width = adjusted_mode->crtc_vblank_end -
-                                        adjusted_mode->crtc_vblank_start;
-        /*
-         * Deal with panel fitting options. Figure out how to stretch the
-         * image based on its aspect ratio & the current panel fitting mode.
-         */
-        panel_ratio = adjusted_mode->hdisplay * PANEL_RATIO_FACTOR /
-                                adjusted_mode->vdisplay;
-        desired_ratio = mode->hdisplay * PANEL_RATIO_FACTOR /
-                                mode->vdisplay;
        /*
         * Enable automatic panel scaling for non-native modes so that they fill
         * the screen.  Should be enabled before the pipe is enabled, according
@@ -278,170 +299,63 @@ static bool intel_lvds_mode_fixup(struct drm_encoder *encoder,
                 * For centered modes, we have to calculate border widths &
                 * heights and modify the values programmed into the CRTC.
                 */
-                left_border = (adjusted_mode->hdisplay - mode->hdisplay) / 2;
+                centre_horizontally(adjusted_mode, mode->hdisplay);
-                right_border = left_border;
+                centre_vertically(adjusted_mode, mode->vdisplay);
-                if (mode->hdisplay & 1)
+                border = LVDS_BORDER_ENABLE;
-                        right_border++;
-                top_border = (adjusted_mode->vdisplay - mode->vdisplay) / 2;
-                bottom_border = top_border;
-                if (mode->vdisplay & 1)
-                        bottom_border++;
-                /* Set active & border values */
-                adjusted_mode->crtc_hdisplay = mode->hdisplay;
-                /* Keep the boder be even */
-                if (right_border & 1)
-                        right_border++;
-                /* use the border directly instead of border minuse one */
-                adjusted_mode->crtc_hblank_start = mode->hdisplay +
-                                                right_border;
-                /* keep the blank width constant */
-                adjusted_mode->crtc_hblank_end =
-                        adjusted_mode->crtc_hblank_start + hblank_width;
-                /* get the hsync pos relative to hblank start */
-                hsync_pos = (hblank_width - hsync_width) / 2;
-                /* keep the hsync pos be even */
-                if (hsync_pos & 1)
-                        hsync_pos++;
-                adjusted_mode->crtc_hsync_start =
-                                adjusted_mode->crtc_hblank_start + hsync_pos;
-                /* keep the hsync width constant */
-                adjusted_mode->crtc_hsync_end =
-                                adjusted_mode->crtc_hsync_start + hsync_width;
-                adjusted_mode->crtc_vdisplay = mode->vdisplay;
-                /* use the border instead of border minus one */
-                adjusted_mode->crtc_vblank_start = mode->vdisplay +
-                                                bottom_border;
-                /* keep the vblank width constant */
-                adjusted_mode->crtc_vblank_end =
-                                adjusted_mode->crtc_vblank_start + vblank_width;
-                /* get the vsync start postion relative to vblank start */
-                vsync_pos = (vblank_width - vsync_width) / 2;
-                adjusted_mode->crtc_vsync_start =
-                                adjusted_mode->crtc_vblank_start + vsync_pos;
-                /* keep the vsync width constant */
-                adjusted_mode->crtc_vsync_end =
-                                adjusted_mode->crtc_vsync_start + vsync_width;
-                border = 1;
                break;
        case DRM_MODE_SCALE_ASPECT:
-                /* Scale but preserve the spect ratio */
+                /* Scale but preserve the aspect ratio */
-                pfit_control |= PFIT_ENABLE;
                if (IS_I965G(dev)) {
+                        u32 scaled_width = adjusted_mode->hdisplay * mode->vdisplay;
+                        u32 scaled_height = mode->hdisplay * adjusted_mode->vdisplay;
+                        pfit_control |= PFIT_ENABLE;
                        /* 965+ is easy, it does everything in hw */
-                        if (panel_ratio > desired_ratio)
+                        if (scaled_width > scaled_height)
                                pfit_control |= PFIT_SCALING_PILLAR;
-                        else if (panel_ratio < desired_ratio)
+                        else if (scaled_width < scaled_height)
                                pfit_control |= PFIT_SCALING_LETTER;
                        else
                                pfit_control |= PFIT_SCALING_AUTO;
                } else {
+                        u32 scaled_width = adjusted_mode->hdisplay * mode->vdisplay;
+                        u32 scaled_height = mode->hdisplay * adjusted_mode->vdisplay;
                        /*
                         * For earlier chips we have to calculate the scaling
                         * ratio by hand and program it into the
                         * PFIT_PGM_RATIO register
                         */
-                        u32 horiz_bits, vert_bits, bits = 12;
+                        if (scaled_width > scaled_height) { /* pillar */
-                        horiz_ratio = mode->hdisplay * PANEL_RATIO_FACTOR/
+                                centre_horizontally(adjusted_mode, scaled_height / mode->vdisplay);
-                                                adjusted_mode->hdisplay;
-                        vert_ratio = mode->vdisplay * PANEL_RATIO_FACTOR/
+                                border = LVDS_BORDER_ENABLE;
-                                                adjusted_mode->vdisplay;
+                                if (mode->vdisplay != adjusted_mode->vdisplay) {
-                        horiz_scale = adjusted_mode->hdisplay *
+                                        u32 bits = panel_fitter_scaling(mode->vdisplay, adjusted_mode->vdisplay);
-                                        PANEL_RATIO_FACTOR / mode->hdisplay;
+                                        pfit_pgm_ratios |= (bits << PFIT_HORIZ_SCALE_SHIFT |
-                        vert_scale = adjusted_mode->vdisplay *
+                                                            bits << PFIT_VERT_SCALE_SHIFT);
-                                        PANEL_RATIO_FACTOR / mode->vdisplay;
+                                        pfit_control |= (PFIT_ENABLE |
+                                                         VERT_INTERP_BILINEAR |
-                        /* retain aspect ratio */
+                                                         HORIZ_INTERP_BILINEAR);
-                        if (panel_ratio > desired_ratio) { /* Pillar */
+                                }
-                                u32 scaled_width;
+                        } else if (scaled_width < scaled_height) { /* letter */
-                                scaled_width = mode->hdisplay * vert_scale /
+                                centre_vertically(adjusted_mode, scaled_width / mode->hdisplay);
-                                                PANEL_RATIO_FACTOR;
-                                horiz_ratio = vert_ratio;
+                                border = LVDS_BORDER_ENABLE;
-                                pfit_control |= (VERT_AUTO_SCALE |
+                                if (mode->hdisplay != adjusted_mode->hdisplay) {
-                                                 VERT_INTERP_BILINEAR |
+                                        u32 bits = panel_fitter_scaling(mode->hdisplay, adjusted_mode->hdisplay);
-                                                 HORIZ_INTERP_BILINEAR);
+                                        pfit_pgm_ratios |= (bits << PFIT_HORIZ_SCALE_SHIFT |
-                                /* Pillar will have left/right borders */
+                                                            bits << PFIT_VERT_SCALE_SHIFT);
-                                left_border = (adjusted_mode->hdisplay -
+                                        pfit_control |= (PFIT_ENABLE |
-                                                scaled_width) / 2;
+                                                         VERT_INTERP_BILINEAR |
-                                right_border = left_border;
+                                                         HORIZ_INTERP_BILINEAR);
-                                if (mode->hdisplay & 1) /* odd resolutions */
+                                }
-                                        right_border++;
+                        } else
-                                /* keep the border be even */
+                                /* Aspects match, Let hw scale both directions */
-                                if (right_border & 1)
+                                pfit_control |= (PFIT_ENABLE |
-                                        right_border++;
+                                                 VERT_AUTO_SCALE | HORIZ_AUTO_SCALE |
-                                adjusted_mode->crtc_hdisplay = scaled_width;
-                                /* use border instead of border minus one */
-                                adjusted_mode->crtc_hblank_start =
-                                        scaled_width + right_border;
-                                /* keep the hblank width constant */
-                                adjusted_mode->crtc_hblank_end =
-                                        adjusted_mode->crtc_hblank_start +
-                                                        hblank_width;
-                                /*
-                                 * get the hsync start pos relative to
-                                 * hblank start
-                                 */
-                                hsync_pos = (hblank_width - hsync_width) / 2;
-                                /* keep the hsync_pos be even */
-                                if (hsync_pos & 1)
-                                        hsync_pos++;
-                                adjusted_mode->crtc_hsync_start =
-                                        adjusted_mode->crtc_hblank_start +
-                                                        hsync_pos;
-                                /* keept hsync width constant */
-                                adjusted_mode->crtc_hsync_end =
-                                        adjusted_mode->crtc_hsync_start +
-                                                        hsync_width;
-                                border = 1;
-                        } else if (panel_ratio < desired_ratio) { /* letter */
-                                u32 scaled_height = mode->vdisplay *
-                                        horiz_scale / PANEL_RATIO_FACTOR;
-                                vert_ratio = horiz_ratio;
-                                pfit_control |= (HORIZ_AUTO_SCALE |
-                                                 VERT_INTERP_BILINEAR |
-                                                 HORIZ_INTERP_BILINEAR);
-                                /* Letterbox will have top/bottom border */
-                                top_border = (adjusted_mode->vdisplay -
-                                        scaled_height) / 2;
-                                bottom_border = top_border;
-                                if (mode->vdisplay & 1)
-                                        bottom_border++;
-                                adjusted_mode->crtc_vdisplay = scaled_height;
-                                /* use border instead of border minus one */
-                                adjusted_mode->crtc_vblank_start =
-                                        scaled_height + bottom_border;
-                                /* keep the vblank width constant */
-                                adjusted_mode->crtc_vblank_end =
-                                        adjusted_mode->crtc_vblank_start +
-                                                        vblank_width;
-                                /*
-                                 * get the vsync start pos relative to
-                                 * vblank start
-                                 */
-                                vsync_pos = (vblank_width - vsync_width) / 2;
-                                adjusted_mode->crtc_vsync_start =
-                                        adjusted_mode->crtc_vblank_start +
-                                                        vsync_pos;
-                                /* keep the vsync width constant */
-                                adjusted_mode->crtc_vsync_end =
-                                        adjusted_mode->crtc_vsync_start +
-                                                        vsync_width;
-                                border = 1;
-                        } else {
-                        /* Aspects match, Let hw scale both directions */
-                                pfit_control |= (VERT_AUTO_SCALE |
-                                                 HORIZ_AUTO_SCALE |
                                                 VERT_INTERP_BILINEAR |
                                                 HORIZ_INTERP_BILINEAR);
-                        }
-                        horiz_bits = (1 << bits) * horiz_ratio /
-                                        PANEL_RATIO_FACTOR;
-                        vert_bits = (1 << bits) * vert_ratio /
-                                        PANEL_RATIO_FACTOR;
-                        pfit_pgm_ratios =
-                                ((vert_bits << PFIT_VERT_SCALE_SHIFT) &
-                                                PFIT_VERT_SCALE_MASK) |
-                                ((horiz_bits << PFIT_HORIZ_SCALE_SHIFT) &
-                                                PFIT_HORIZ_SCALE_MASK);
                }
                break;
@@ -458,6 +372,7 @@ static bool intel_lvds_mode_fixup(struct drm_encoder *encoder,
                                         VERT_INTERP_BILINEAR |
                                         HORIZ_INTERP_BILINEAR);
                break;
        default:
                break;
        }
@@ -465,14 +380,8 @@ static bool intel_lvds_mode_fixup(struct drm_encoder *encoder,
 out:
        lvds_priv->pfit_control = pfit_control;
        lvds_priv->pfit_pgm_ratios = pfit_pgm_ratios;
-        /*
+        dev_priv->lvds_border_bits = border;
-         * When there exists the border, it means that the LVDS_BORDR
-         * should be enabled.
-         */
-        if (border)
-                dev_priv->lvds_border_bits |= LVDS_BORDER_ENABLE;
-        else
-                dev_priv->lvds_border_bits &= ~(LVDS_BORDER_ENABLE);
        /*
         * XXX: It would be nice to support lower refresh rates on the
         * panels to reduce power consumption, and perhaps match the
@@ -599,6 +508,26 @@ static int intel_lvds_get_modes(struct drm_connector *connector)
        return 0;
 }
+static int intel_no_modeset_on_lid_dmi_callback(const struct dmi_system_id *id)
+{
+        DRM_DEBUG_KMS("Skipping forced modeset for %s\n", id->ident);
+        return 1;
+}
+/* The GPU hangs up on these systems if modeset is performed on LID open */
+static const struct dmi_system_id intel_no_modeset_on_lid[] = {
+        {
+                .callback = intel_no_modeset_on_lid_dmi_callback,
+                .ident = "Toshiba Tecra A11",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "TECRA A11"),
+                },
+        },
+        { }     /* terminating entry */
+};
 /*
 * Lid events. Note the use of 'modeset_on_lid':
 *  - we set it on lid close, and reset it on open
@@ -622,6 +551,9 @@ static int intel_lid_notify(struct notifier_block *nb, unsigned long val,
         */
        if (connector)
                connector->status = connector->funcs->detect(connector);
+        /* Don't force modeset on machines where it causes a GPU lockup */
+        if (dmi_check_system(intel_no_modeset_on_lid))
+                return NOTIFY_OK;
        if (!acpi_lid_open()) {
                dev_priv->modeset_on_lid = 1;
                return NOTIFY_OK;
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index d7ad5139d17c..d39aea24eabe 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -65,7 +65,7 @@
 #define OCMD_YUV_410_PLANAR     (0xe<<10) /* also 411 */
 #define OCMD_TVSYNCFLIP_PARITY  (0x1<<9)
 #define OCMD_TVSYNCFLIP_ENABLE  (0x1<<7)
-#define OCMD_BUF_TYPE_MASK      (Ox1<<5)
+#define OCMD_BUF_TYPE_MASK      (0x1<<5)
 #define OCMD_BUF_TYPE_FRAME     (0x0<<5)
 #define OCMD_BUF_TYPE_FIELD     (0x1<<5)
 #define OCMD_TEST_MODE          (0x1<<4)
@@ -185,7 +185,8 @@ static struct overlay_registers *intel_overlay_map_regs_atomic(struct intel_over
        if (OVERLAY_NONPHYSICAL(overlay->dev)) {
                regs = io_mapping_map_atomic_wc(dev_priv->mm.gtt_mapping,
-                                overlay->reg_bo->gtt_offset);
+                                                overlay->reg_bo->gtt_offset,
+                                                KM_USER0);
                if (!regs) {
                        DRM_ERROR("failed to map overlay regs in GTT\n");
@@ -200,7 +201,7 @@ static struct overlay_registers *intel_overlay_map_regs_atomic(struct intel_over
 static void intel_overlay_unmap_regs_atomic(struct intel_overlay *overlay)
 {
        if (OVERLAY_NONPHYSICAL(overlay->dev))
-                io_mapping_unmap_atomic(overlay->virt_addr);
+                io_mapping_unmap_atomic(overlay->virt_addr, KM_USER0);
        overlay->virt_addr = NULL;
@@ -958,7 +959,7 @@ static int check_overlay_src(struct drm_device *dev,
            || rec->src_width < N_HORIZ_Y_TAPS*4)
                return -EINVAL;
-        /* check alingment constrains */
+        /* check alignment constraints */
        switch (rec->flags & I915_OVERLAY_TYPE_MASK) {
                case I915_OVERLAY_RGB:
                        /* not implemented */
@@ -990,7 +991,10 @@ static int check_overlay_src(struct drm_device *dev,
                return -EINVAL;
        /* stride checking */
-        stride_mask = 63;
+        if (IS_I830(dev) || IS_845G(dev))
+                stride_mask = 255;
+        else
+                stride_mask = 63;
        if (rec->stride_Y & stride_mask || rec->stride_UV & stride_mask)
                return -EINVAL;
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 76993ac16cc1..d9d4d51aa89e 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -392,13 +392,13 @@ static void intel_sdvo_debug_write(struct intel_encoder *intel_encoder, u8 cmd,
                DRM_LOG_KMS("%02X ", ((u8 *)args)[i]);
        for (; i < 8; i++)
                DRM_LOG_KMS("   ");
-        for (i = 0; i < sizeof(sdvo_cmd_names) / sizeof(sdvo_cmd_names[0]); i++) {
+        for (i = 0; i < ARRAY_SIZE(sdvo_cmd_names); i++) {
                if (cmd == sdvo_cmd_names[i].cmd) {
                        DRM_LOG_KMS("(%s)", sdvo_cmd_names[i].name);
                        break;
                }
        }
-        if (i == sizeof(sdvo_cmd_names)/ sizeof(sdvo_cmd_names[0]))
+        if (i == ARRAY_SIZE(sdvo_cmd_names))
                DRM_LOG_KMS("(%02X)", cmd);
        DRM_LOG_KMS("\n");
 }
@@ -1237,9 +1237,11 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder,
        /* Set the SDVO control regs. */
        if (IS_I965G(dev)) {
-                sdvox |= SDVO_BORDER_ENABLE |
+                sdvox |= SDVO_BORDER_ENABLE;
-                        SDVO_VSYNC_ACTIVE_HIGH |
+                if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC)
-                        SDVO_HSYNC_ACTIVE_HIGH;
+                        sdvox |= SDVO_VSYNC_ACTIVE_HIGH;
+                if (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC)
+                        sdvox |= SDVO_HSYNC_ACTIVE_HIGH;
        } else {
                sdvox |= I915_READ(sdvo_priv->sdvo_reg);
                switch (sdvo_priv->sdvo_reg) {
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index 6d553c29d106..cc3726a4a1cb 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -476,7 +476,7 @@ static const struct tv_mode tv_modes[] = {
                .vi_end_f1      = 20,               .vi_end_f2          = 21,
                .nbr_end        = 240,
-                .burst_ena      = 8,
+                .burst_ena      = true,
                .hburst_start   = 72,               .hburst_len         = 34,
                .vburst_start_f1 = 9,               .vburst_end_f1      = 240,
                .vburst_start_f2 = 10,              .vburst_end_f2      = 240,
@@ -896,8 +896,6 @@ static const struct tv_mode tv_modes[] = {
        },
 };
-#define NUM_TV_MODES sizeof(tv_modes) / sizeof (tv_modes[0])
 static void
 intel_tv_dpms(struct drm_encoder *encoder, int mode)
 {
@@ -1424,7 +1422,7 @@ intel_tv_get_modes(struct drm_connector *connector)
        int j, count = 0;
        u64 tmp;
-        for (j = 0; j < sizeof(input_res_table) / sizeof(input_res_table[0]);
+        for (j = 0; j < ARRAY_SIZE(input_res_table);
             j++) {
                struct input_res *input = &input_res_table[j];
                unsigned int hactive_s = input->w;
@@ -1512,7 +1510,7 @@ intel_tv_set_property(struct drm_connector *connector, struct drm_property *prop
                tv_priv->margin[TV_MARGIN_BOTTOM] = val;
                changed = true;
        } else if (property == dev->mode_config.tv_mode_property) {
-                if (val >= NUM_TV_MODES) {
+                if (val >= ARRAY_SIZE(tv_modes)) {
                        ret = -EINVAL;
                        goto out;
                }
@@ -1693,13 +1691,13 @@ intel_tv_init(struct drm_device *dev)
        connector->doublescan_allowed = false;
        /* Create TV properties then attach current values */
-        tv_format_names = kmalloc(sizeof(char *) * NUM_TV_MODES,
+        tv_format_names = kmalloc(sizeof(char *) * ARRAY_SIZE(tv_modes),
                                  GFP_KERNEL);
        if (!tv_format_names)
                goto out;
-        for (i = 0; i < NUM_TV_MODES; i++)
+        for (i = 0; i < ARRAY_SIZE(tv_modes); i++)
                tv_format_names[i] = tv_modes[i].name;
-        drm_mode_create_tv_properties(dev, NUM_TV_MODES, tv_format_names);
+        drm_mode_create_tv_properties(dev, ARRAY_SIZE(tv_modes), tv_format_names);
        drm_connector_attach_property(connector, dev->mode_config.tv_mode_property,
                                   initial_mode);
diff --git a/drivers/gpu/drm/mga/mga_dma.c b/drivers/gpu/drm/mga/mga_dma.c
index 3c917fb3a60b..08868ac3048a 100644
--- a/drivers/gpu/drm/mga/mga_dma.c
+++ b/drivers/gpu/drm/mga/mga_dma.c
@@ -52,7 +52,7 @@ static int mga_do_cleanup_dma(struct drm_device *dev, int full_cleanup);
 * Engine control
 */
-int mga_do_wait_for_idle(drm_mga_private_t * dev_priv)
+int mga_do_wait_for_idle(drm_mga_private_t *dev_priv)
 {
        u32 status = 0;
        int i;
@@ -74,7 +74,7 @@ int mga_do_wait_for_idle(drm_mga_private_t * dev_priv)
        return -EBUSY;
 }
-static int mga_do_dma_reset(drm_mga_private_t * dev_priv)
+static int mga_do_dma_reset(drm_mga_private_t *dev_priv)
 {
        drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
        drm_mga_primary_buffer_t *primary = &dev_priv->prim;
@@ -102,7 +102,7 @@ static int mga_do_dma_reset(drm_mga_private_t * dev_priv)
 * Primary DMA stream
 */
-void mga_do_dma_flush(drm_mga_private_t * dev_priv)
+void mga_do_dma_flush(drm_mga_private_t *dev_priv)
 {
        drm_mga_primary_buffer_t *primary = &dev_priv->prim;
        u32 head, tail;
@@ -142,11 +142,10 @@ void mga_do_dma_flush(drm_mga_private_t * dev_priv)
        head = MGA_READ(MGA_PRIMADDRESS);
-        if (head <= tail) {
+        if (head <= tail)
                primary->space = primary->size - primary->tail;
-        } else {
+        else
                primary->space = head - tail;
-        }
        DRM_DEBUG("   head = 0x%06lx\n", (unsigned long)(head - dev_priv->primary->offset));
        DRM_DEBUG("   tail = 0x%06lx\n", (unsigned long)(tail - dev_priv->primary->offset));
@@ -158,7 +157,7 @@ void mga_do_dma_flush(drm_mga_private_t * dev_priv)
        DRM_DEBUG("done.\n");
 }
-void mga_do_dma_wrap_start(drm_mga_private_t * dev_priv)
+void mga_do_dma_wrap_start(drm_mga_private_t *dev_priv)
 {
        drm_mga_primary_buffer_t *primary = &dev_priv->prim;
        u32 head, tail;
@@ -181,11 +180,10 @@ void mga_do_dma_wrap_start(drm_mga_private_t * dev_priv)
        head = MGA_READ(MGA_PRIMADDRESS);
-        if (head == dev_priv->primary->offset) {
+        if (head == dev_priv->primary->offset)
                primary->space = primary->size;
-        } else {
+        else
                primary->space = head - dev_priv->primary->offset;
-        }
        DRM_DEBUG("   head = 0x%06lx\n", (unsigned long)(head - dev_priv->primary->offset));
        DRM_DEBUG("   tail = 0x%06x\n", primary->tail);
@@ -199,7 +197,7 @@ void mga_do_dma_wrap_start(drm_mga_private_t * dev_priv)
        DRM_DEBUG("done.\n");
 }
-void mga_do_dma_wrap_end(drm_mga_private_t * dev_priv)
+void mga_do_dma_wrap_end(drm_mga_private_t *dev_priv)
 {
        drm_mga_primary_buffer_t *primary = &dev_priv->prim;
        drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
@@ -220,11 +218,11 @@ void mga_do_dma_wrap_end(drm_mga_private_t * dev_priv)
 * Freelist management
 */
-#define MGA_BUFFER_USED         ~0
+#define MGA_BUFFER_USED         (~0)
 #define MGA_BUFFER_FREE         0
 #if MGA_FREELIST_DEBUG
-static void mga_freelist_print(struct drm_device * dev)
+static void mga_freelist_print(struct drm_device *dev)
 {
        drm_mga_private_t *dev_priv = dev->dev_private;
        drm_mga_freelist_t *entry;
@@ -245,7 +243,7 @@ static void mga_freelist_print(struct drm_device * dev)
 }
 #endif
-static int mga_freelist_init(struct drm_device * dev, drm_mga_private_t * dev_priv)
+static int mga_freelist_init(struct drm_device *dev, drm_mga_private_t *dev_priv)
 {
        struct drm_device_dma *dma = dev->dma;
        struct drm_buf *buf;
@@ -288,7 +286,7 @@ static int mga_freelist_init(struct drm_device * dev, drm_mga_private_t * dev_pr
        return 0;
 }
-static void mga_freelist_cleanup(struct drm_device * dev)
+static void mga_freelist_cleanup(struct drm_device *dev)
 {
        drm_mga_private_t *dev_priv = dev->dev_private;
        drm_mga_freelist_t *entry;
@@ -308,7 +306,7 @@ static void mga_freelist_cleanup(struct drm_device * dev)
 #if 0
 /* FIXME: Still needed?
 */
-static void mga_freelist_reset(struct drm_device * dev)
+static void mga_freelist_reset(struct drm_device *dev)
 {
        struct drm_device_dma *dma = dev->dma;
        struct drm_buf *buf;
@@ -356,7 +354,7 @@ static struct drm_buf *mga_freelist_get(struct drm_device * dev)
        return NULL;
 }
-int mga_freelist_put(struct drm_device * dev, struct drm_buf * buf)
+int mga_freelist_put(struct drm_device *dev, struct drm_buf *buf)
 {
        drm_mga_private_t *dev_priv = dev->dev_private;
        drm_mga_buf_priv_t *buf_priv = buf->dev_private;
@@ -391,7 +389,7 @@ int mga_freelist_put(struct drm_device * dev, struct drm_buf * buf)
 * DMA initialization, cleanup
 */
-int mga_driver_load(struct drm_device * dev, unsigned long flags)
+int mga_driver_load(struct drm_device *dev, unsigned long flags)
 {
        drm_mga_private_t *dev_priv;
        int ret;
@@ -405,8 +403,8 @@ int mga_driver_load(struct drm_device * dev, unsigned long flags)
        dev_priv->usec_timeout = MGA_DEFAULT_USEC_TIMEOUT;
        dev_priv->chipset = flags;
-        dev_priv->mmio_base = drm_get_resource_start(dev, 1);
+        dev_priv->mmio_base = pci_resource_start(dev->pdev, 1);
-        dev_priv->mmio_size = drm_get_resource_len(dev, 1);
+        dev_priv->mmio_size = pci_resource_len(dev->pdev, 1);
        dev->counters += 3;
        dev->types[6] = _DRM_STAT_IRQ;
@@ -439,8 +437,8 @@ int mga_driver_load(struct drm_device * dev, unsigned long flags)
 *
 * \sa mga_do_dma_bootstrap, mga_do_pci_dma_bootstrap
 */
-static int mga_do_agp_dma_bootstrap(struct drm_device * dev,
+static int mga_do_agp_dma_bootstrap(struct drm_device *dev,
-                                    drm_mga_dma_bootstrap_t * dma_bs)
+                                    drm_mga_dma_bootstrap_t *dma_bs)
 {
        drm_mga_private_t *const dev_priv =
            (drm_mga_private_t *) dev->dev_private;
@@ -481,11 +479,10 @@ static int mga_do_agp_dma_bootstrap(struct drm_device * dev,
         */
        if (dev_priv->chipset == MGA_CARD_TYPE_G200) {
-                if (mode.mode & 0x02) {
+                if (mode.mode & 0x02)
                        MGA_WRITE(MGA_AGP_PLL, MGA_AGP2XPLL_ENABLE);
-                } else {
+                else
                        MGA_WRITE(MGA_AGP_PLL, MGA_AGP2XPLL_DISABLE);
-                }
        }
        /* Allocate and bind AGP memory. */
@@ -593,8 +590,8 @@ static int mga_do_agp_dma_bootstrap(struct drm_device * dev,
        return 0;
 }
 #else
-static int mga_do_agp_dma_bootstrap(struct drm_device * dev,
+static int mga_do_agp_dma_bootstrap(struct drm_device *dev,
-                                    drm_mga_dma_bootstrap_t * dma_bs)
+                                    drm_mga_dma_bootstrap_t *dma_bs)
 {
        return -EINVAL;
 }
@@ -614,8 +611,8 @@ static int mga_do_agp_dma_bootstrap(struct drm_device * dev,
 *
 * \sa mga_do_dma_bootstrap, mga_do_agp_dma_bootstrap
 */
-static int mga_do_pci_dma_bootstrap(struct drm_device * dev,
+static int mga_do_pci_dma_bootstrap(struct drm_device *dev,
-                                    drm_mga_dma_bootstrap_t * dma_bs)
+                                    drm_mga_dma_bootstrap_t *dma_bs)
 {
        drm_mga_private_t *const dev_priv =
            (drm_mga_private_t *) dev->dev_private;
@@ -678,9 +675,8 @@ static int mga_do_pci_dma_bootstrap(struct drm_device * dev,
                req.size = dma_bs->secondary_bin_size;
                err = drm_addbufs_pci(dev, &req);
-                if (!err) {
+                if (!err)
                        break;
-                }
        }
        if (bin_count == 0) {
@@ -704,8 +700,8 @@ static int mga_do_pci_dma_bootstrap(struct drm_device * dev,
        return 0;
 }
-static int mga_do_dma_bootstrap(struct drm_device * dev,
+static int mga_do_dma_bootstrap(struct drm_device *dev,
-                                drm_mga_dma_bootstrap_t * dma_bs)
+                                drm_mga_dma_bootstrap_t *dma_bs)
 {
        const int is_agp = (dma_bs->agp_mode != 0) && drm_device_is_agp(dev);
        int err;
@@ -737,17 +733,15 @@ static int mga_do_dma_bootstrap(struct drm_device * dev,
         * carve off portions of it for internal uses.  The remaining memory
         * is returned to user-mode to be used for AGP textures.
         */
-        if (is_agp) {
+        if (is_agp)
                err = mga_do_agp_dma_bootstrap(dev, dma_bs);
-        }
        /* If we attempted to initialize the card for AGP DMA but failed,
         * clean-up any mess that may have been created.
         */
-        if (err) {
+        if (err)
                mga_do_cleanup_dma(dev, MINIMAL_CLEANUP);
-        }
        /* Not only do we want to try and initialized PCI cards for PCI DMA,
         * but we also try to initialized AGP cards that could not be
@@ -757,9 +751,8 @@ static int mga_do_dma_bootstrap(struct drm_device * dev,
         * AGP memory, etc.
         */
-        if (!is_agp || err) {
+        if (!is_agp || err)
                err = mga_do_pci_dma_bootstrap(dev, dma_bs);
-        }
        return err;
 }
@@ -792,7 +785,7 @@ int mga_dma_bootstrap(struct drm_device *dev, void *data,
        return err;
 }
-static int mga_do_init_dma(struct drm_device * dev, drm_mga_init_t * init)
+static int mga_do_init_dma(struct drm_device *dev, drm_mga_init_t *init)
 {
        drm_mga_private_t *dev_priv;
        int ret;
@@ -800,11 +793,10 @@ static int mga_do_init_dma(struct drm_device * dev, drm_mga_init_t * init)
        dev_priv = dev->dev_private;
-        if (init->sgram) {
+        if (init->sgram)
                dev_priv->clear_cmd = MGA_DWGCTL_CLEAR | MGA_ATYPE_BLK;
-        } else {
+        else
                dev_priv->clear_cmd = MGA_DWGCTL_CLEAR | MGA_ATYPE_RSTR;
-        }
        dev_priv->maccess = init->maccess;
        dev_priv->fb_cpp = init->fb_cpp;
@@ -975,9 +967,8 @@ static int mga_do_cleanup_dma(struct drm_device *dev, int full_cleanup)
                                dev_priv->agp_handle = 0;
                        }
-                        if ((dev->agp != NULL) && dev->agp->acquired) {
+                        if ((dev->agp != NULL) && dev->agp->acquired)
                                err = drm_agp_release(dev);
-                        }
 #endif
                }
@@ -998,9 +989,8 @@ static int mga_do_cleanup_dma(struct drm_device *dev, int full_cleanup)
                memset(dev_priv->warp_pipe_phys, 0,
                       sizeof(dev_priv->warp_pipe_phys));
-                if (dev_priv->head != NULL) {
+                if (dev_priv->head != NULL)
                        mga_freelist_cleanup(dev);
-                }
        }
        return err;
@@ -1017,9 +1007,8 @@ int mga_dma_init(struct drm_device *dev, void *data,
        switch (init->func) {
        case MGA_INIT_DMA:
                err = mga_do_init_dma(dev, init);
-                if (err) {
+                if (err)
                        (void)mga_do_cleanup_dma(dev, FULL_CLEANUP);
-                }
                return err;
        case MGA_CLEANUP_DMA:
                return mga_do_cleanup_dma(dev, FULL_CLEANUP);
@@ -1047,9 +1036,8 @@ int mga_dma_flush(struct drm_device *dev, void *data,
        WRAP_WAIT_WITH_RETURN(dev_priv);
-        if (lock->flags & (_DRM_LOCK_FLUSH | _DRM_LOCK_FLUSH_ALL)) {
+        if (lock->flags & (_DRM_LOCK_FLUSH | _DRM_LOCK_FLUSH_ALL))
                mga_do_dma_flush(dev_priv);
-        }
        if (lock->flags & _DRM_LOCK_QUIESCENT) {
 #if MGA_DMA_DEBUG
@@ -1079,8 +1067,8 @@ int mga_dma_reset(struct drm_device *dev, void *data,
 * DMA buffer management
 */
-static int mga_dma_get_buffers(struct drm_device * dev,
+static int mga_dma_get_buffers(struct drm_device *dev,
-                               struct drm_file *file_priv, struct drm_dma * d)
+                               struct drm_file *file_priv, struct drm_dma *d)
 {
        struct drm_buf *buf;
        int i;
@@ -1134,9 +1122,8 @@ int mga_dma_buffers(struct drm_device *dev, void *data,
        d->granted_count = 0;
-        if (d->request_count) {
+        if (d->request_count)
                ret = mga_dma_get_buffers(dev, file_priv, d);
-        }
        return ret;
 }
@@ -1144,7 +1131,7 @@ int mga_dma_buffers(struct drm_device *dev, void *data,
 /**
 * Called just before the module is unloaded.
 */
-int mga_driver_unload(struct drm_device * dev)
+int mga_driver_unload(struct drm_device *dev)
 {
        kfree(dev->dev_private);
        dev->dev_private = NULL;
@@ -1155,12 +1142,12 @@ int mga_driver_unload(struct drm_device * dev)
 /**
 * Called when the last opener of the device is closed.
 */
-void mga_driver_lastclose(struct drm_device * dev)
+void mga_driver_lastclose(struct drm_device *dev)
 {
        mga_do_cleanup_dma(dev, FULL_CLEANUP);
 }
-int mga_driver_dma_quiescent(struct drm_device * dev)
+int mga_driver_dma_quiescent(struct drm_device *dev)
 {
        drm_mga_private_t *dev_priv = dev->dev_private;
        return mga_do_wait_for_idle(dev_priv);
diff --git a/drivers/gpu/drm/mga/mga_drv.c b/drivers/gpu/drm/mga/mga_drv.c
index ddfe16197b59..26d0d8ced80d 100644
--- a/drivers/gpu/drm/mga/mga_drv.c
+++ b/drivers/gpu/drm/mga/mga_drv.c
@@ -36,7 +36,7 @@
 #include "drm_pciids.h"
-static int mga_driver_device_is_agp(struct drm_device * dev);
+static int mga_driver_device_is_agp(struct drm_device *dev);
 static struct pci_device_id pciidlist[] = {
        mga_PCI_IDS
@@ -119,7 +119,7 @@ MODULE_LICENSE("GPL and additional rights");
 * \returns
 * If the device is a PCI G450, zero is returned.  Otherwise 2 is returned.
 */
-static int mga_driver_device_is_agp(struct drm_device * dev)
+static int mga_driver_device_is_agp(struct drm_device *dev)
 {
        const struct pci_dev *const pdev = dev->pdev;
diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
index be6c6b9b0e89..1084fa4d261b 100644
--- a/drivers/gpu/drm/mga/mga_drv.h
+++ b/drivers/gpu/drm/mga/mga_drv.h
@@ -164,59 +164,59 @@ extern int mga_dma_reset(struct drm_device *dev, void *data,
 extern int mga_dma_buffers(struct drm_device *dev, void *data,
                           struct drm_file *file_priv);
 extern int mga_driver_load(struct drm_device *dev, unsigned long flags);
-extern int mga_driver_unload(struct drm_device * dev);
+extern int mga_driver_unload(struct drm_device *dev);
-extern void mga_driver_lastclose(struct drm_device * dev);
+extern void mga_driver_lastclose(struct drm_device *dev);
-extern int mga_driver_dma_quiescent(struct drm_device * dev);
+extern int mga_driver_dma_quiescent(struct drm_device *dev);
-extern int mga_do_wait_for_idle(drm_mga_private_t * dev_priv);
+extern int mga_do_wait_for_idle(drm_mga_private_t *dev_priv);
-extern void mga_do_dma_flush(drm_mga_private_t * dev_priv);
+extern void mga_do_dma_flush(drm_mga_private_t *dev_priv);
-extern void mga_do_dma_wrap_start(drm_mga_private_t * dev_priv);
+extern void mga_do_dma_wrap_start(drm_mga_private_t *dev_priv);
-extern void mga_do_dma_wrap_end(drm_mga_private_t * dev_priv);
+extern void mga_do_dma_wrap_end(drm_mga_private_t *dev_priv);
-extern int mga_freelist_put(struct drm_device * dev, struct drm_buf * buf);
+extern int mga_freelist_put(struct drm_device *dev, struct drm_buf *buf);
                                /* mga_warp.c */
-extern int mga_warp_install_microcode(drm_mga_private_t * dev_priv);
+extern int mga_warp_install_microcode(drm_mga_private_t *dev_priv);
-extern int mga_warp_init(drm_mga_private_t * dev_priv);
+extern int mga_warp_init(drm_mga_private_t *dev_priv);
                                /* mga_irq.c */
 extern int mga_enable_vblank(struct drm_device *dev, int crtc);
 extern void mga_disable_vblank(struct drm_device *dev, int crtc);
 extern u32 mga_get_vblank_counter(struct drm_device *dev, int crtc);
-extern int mga_driver_fence_wait(struct drm_device * dev, unsigned int *sequence);
+extern int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence);
-extern int mga_driver_vblank_wait(struct drm_device * dev, unsigned int *sequence);
+extern int mga_driver_vblank_wait(struct drm_device *dev, unsigned int *sequence);
 extern irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS);
-extern void mga_driver_irq_preinstall(struct drm_device * dev);
+extern void mga_driver_irq_preinstall(struct drm_device *dev);
 extern int mga_driver_irq_postinstall(struct drm_device *dev);
-extern void mga_driver_irq_uninstall(struct drm_device * dev);
+extern void mga_driver_irq_uninstall(struct drm_device *dev);
 extern long mga_compat_ioctl(struct file *filp, unsigned int cmd,
                             unsigned long arg);
 #define mga_flush_write_combine()       DRM_WRITEMEMORYBARRIER()
 #if defined(__linux__) && defined(__alpha__)
-#define MGA_BASE( reg )         ((unsigned long)(dev_priv->mmio->handle))
+#define MGA_BASE(reg)           ((unsigned long)(dev_priv->mmio->handle))
-#define MGA_ADDR( reg )         (MGA_BASE(reg) + reg)
+#define MGA_ADDR(reg)           (MGA_BASE(reg) + reg)
-#define MGA_DEREF( reg )        *(volatile u32 *)MGA_ADDR( reg )
+#define MGA_DEREF(reg)          (*(volatile u32 *)MGA_ADDR(reg))
-#define MGA_DEREF8( reg )       *(volatile u8 *)MGA_ADDR( reg )
+#define MGA_DEREF8(reg)         (*(volatile u8 *)MGA_ADDR(reg))
-#define MGA_READ( reg )         (_MGA_READ((u32 *)MGA_ADDR(reg)))
+#define MGA_READ(reg)           (_MGA_READ((u32 *)MGA_ADDR(reg)))
-#define MGA_READ8( reg )        (_MGA_READ((u8 *)MGA_ADDR(reg)))
+#define MGA_READ8(reg)          (_MGA_READ((u8 *)MGA_ADDR(reg)))
-#define MGA_WRITE( reg, val )   do { DRM_WRITEMEMORYBARRIER(); MGA_DEREF( reg ) = val; } while (0)
+#define MGA_WRITE(reg, val)     do { DRM_WRITEMEMORYBARRIER(); MGA_DEREF(reg) = val; } while (0)
-#define MGA_WRITE8( reg, val )  do { DRM_WRITEMEMORYBARRIER(); MGA_DEREF8( reg ) = val; } while (0)
+#define MGA_WRITE8(reg, val)    do { DRM_WRITEMEMORYBARRIER(); MGA_DEREF8(reg) = val; } while (0)
-static inline u32 _MGA_READ(u32 * addr)
+static inline u32 _MGA_READ(u32 *addr)
 {
        DRM_MEMORYBARRIER();
        return *(volatile u32 *)addr;
 }
 #else
-#define MGA_READ8( reg )        DRM_READ8(dev_priv->mmio, (reg))
+#define MGA_READ8(reg)          DRM_READ8(dev_priv->mmio, (reg))
-#define MGA_READ( reg )         DRM_READ32(dev_priv->mmio, (reg))
+#define MGA_READ(reg)           DRM_READ32(dev_priv->mmio, (reg))
-#define MGA_WRITE8( reg, val )  DRM_WRITE8(dev_priv->mmio, (reg), (val))
+#define MGA_WRITE8(reg, val)    DRM_WRITE8(dev_priv->mmio, (reg), (val))
-#define MGA_WRITE( reg, val )   DRM_WRITE32(dev_priv->mmio, (reg), (val))
+#define MGA_WRITE(reg, val)     DRM_WRITE32(dev_priv->mmio, (reg), (val))
 #endif
 #define DWGREG0         0x1c00
@@ -233,40 +233,39 @@ static inline u32 _MGA_READ(u32 * addr)
 * Helper macross...
 */
-#define MGA_EMIT_STATE( dev_priv, dirty )                               \
+#define MGA_EMIT_STATE(dev_priv, dirty)                                 \
 do {                                                                    \
-        if ( (dirty) & ~MGA_UPLOAD_CLIPRECTS ) {                        \
+        if ((dirty) & ~MGA_UPLOAD_CLIPRECTS) {                          \
-                if ( dev_priv->chipset >= MGA_CARD_TYPE_G400 ) {        \
+                if (dev_priv->chipset >= MGA_CARD_TYPE_G400)            \
-                        mga_g400_emit_state( dev_priv );                \
+                        mga_g400_emit_state(dev_priv);                  \
-                } else {                                                \
+                else                                                    \
-                        mga_g200_emit_state( dev_priv );                \
+                        mga_g200_emit_state(dev_priv);                  \
-                }                                                       \
        }                                                               \
 } while (0)
-#define WRAP_TEST_WITH_RETURN( dev_priv )                               \
+#define WRAP_TEST_WITH_RETURN(dev_priv)                                 \
 do {                                                                    \
-        if ( test_bit( 0, &dev_priv->prim.wrapped ) ) {                 \
+        if (test_bit(0, &dev_priv->prim.wrapped)) {                     \
-                if ( mga_is_idle( dev_priv ) ) {                        \
+                if (mga_is_idle(dev_priv)) {                            \
-                        mga_do_dma_wrap_end( dev_priv );                \
+                        mga_do_dma_wrap_end(dev_priv);                  \
-                } else if ( dev_priv->prim.space <                      \
+                } else if (dev_priv->prim.space <                       \
-                            dev_priv->prim.high_mark ) {                \
+                           dev_priv->prim.high_mark) {                  \
-                        if ( MGA_DMA_DEBUG )                            \
+                        if (MGA_DMA_DEBUG)                              \
-                                DRM_INFO( "wrap...\n");         \
+                                DRM_INFO("wrap...\n");                  \
-                        return -EBUSY;                  \
+                        return -EBUSY;                                  \
                }                                                       \
        }                                                               \
 } while (0)
-#define WRAP_WAIT_WITH_RETURN( dev_priv )                               \
+#define WRAP_WAIT_WITH_RETURN(dev_priv)                                 \
 do {                                                                    \
-        if ( test_bit( 0, &dev_priv->prim.wrapped ) ) {                 \
+        if (test_bit(0, &dev_priv->prim.wrapped)) {                     \
-                if ( mga_do_wait_for_idle( dev_priv ) < 0 ) {           \
+                if (mga_do_wait_for_idle(dev_priv) < 0) {               \
-                        if ( MGA_DMA_DEBUG )                            \
+                        if (MGA_DMA_DEBUG)                              \
-                                DRM_INFO( "wrap...\n");         \
+                                DRM_INFO("wrap...\n");                  \
-                        return -EBUSY;                  \
+                        return -EBUSY;                                  \
                }                                                       \
-                mga_do_dma_wrap_end( dev_priv );                        \
+                mga_do_dma_wrap_end(dev_priv);                          \
        }                                                               \
 } while (0)
@@ -280,12 +279,12 @@ do {									\
 #define DMA_BLOCK_SIZE  (5 * sizeof(u32))
-#define BEGIN_DMA( n )                                                  \
+#define BEGIN_DMA(n)                                                    \
 do {                                                                    \
-        if ( MGA_VERBOSE ) {                                            \
+        if (MGA_VERBOSE) {                                              \
-                DRM_INFO( "BEGIN_DMA( %d )\n", (n) );           \
+                DRM_INFO("BEGIN_DMA(%d)\n", (n));                       \
-                DRM_INFO( "   space=0x%x req=0x%Zx\n",                  \
+                DRM_INFO("   space=0x%x req=0x%Zx\n",                   \
-                          dev_priv->prim.space, (n) * DMA_BLOCK_SIZE ); \
+                         dev_priv->prim.space, (n) * DMA_BLOCK_SIZE);   \
        }                                                               \
        prim = dev_priv->prim.start;                                    \
        write = dev_priv->prim.tail;                                    \
@@ -293,9 +292,9 @@ do {									\
 #define BEGIN_DMA_WRAP()                                                \
 do {                                                                    \
-        if ( MGA_VERBOSE ) {                                            \
+        if (MGA_VERBOSE) {                                              \
-                DRM_INFO( "BEGIN_DMA()\n" );                            \
+                DRM_INFO("BEGIN_DMA()\n");                              \
-                DRM_INFO( "   space=0x%x\n", dev_priv->prim.space );    \
+                DRM_INFO("   space=0x%x\n", dev_priv->prim.space);      \
        }                                                               \
        prim = dev_priv->prim.start;                                    \
        write = dev_priv->prim.tail;                                    \
@@ -304,72 +303,68 @@ do {									\
 #define ADVANCE_DMA()                                                   \
 do {                                                                    \
        dev_priv->prim.tail = write;                                    \
-        if ( MGA_VERBOSE ) {                                            \
+        if (MGA_VERBOSE)                                                \
-                DRM_INFO( "ADVANCE_DMA() tail=0x%05x sp=0x%x\n",        \
+                DRM_INFO("ADVANCE_DMA() tail=0x%05x sp=0x%x\n",         \
-                          write, dev_priv->prim.space );                \
+                         write, dev_priv->prim.space);                  \
-        }                                                               \
 } while (0)
 #define FLUSH_DMA()                                                     \
 do {                                                                    \
-        if ( 0 ) {                                                      \
+        if (0) {                                                        \
-                DRM_INFO( "\n" );                                       \
+                DRM_INFO("\n");                                         \
-                DRM_INFO( "   tail=0x%06x head=0x%06lx\n",              \
+                DRM_INFO("   tail=0x%06x head=0x%06lx\n",               \
-                          dev_priv->prim.tail,                          \
+                         dev_priv->prim.tail,                           \
-                          (unsigned long)(MGA_READ(MGA_PRIMADDRESS) -   \
+                         (unsigned long)(MGA_READ(MGA_PRIMADDRESS) -    \
-                                          dev_priv->primary->offset));  \
+                                         dev_priv->primary->offset));   \
        }                                                               \
-        if ( !test_bit( 0, &dev_priv->prim.wrapped ) ) {                \
+        if (!test_bit(0, &dev_priv->prim.wrapped)) {                    \
-                if ( dev_priv->prim.space <                             \
+                if (dev_priv->prim.space < dev_priv->prim.high_mark)    \
-                     dev_priv->prim.high_mark ) {                       \
+                        mga_do_dma_wrap_start(dev_priv);                \
-                        mga_do_dma_wrap_start( dev_priv );              \
+                else                                                    \
-                } else {                                                \
+                        mga_do_dma_flush(dev_priv);                     \
-                        mga_do_dma_flush( dev_priv );                   \
-                }                                                       \
        }                                                               \
 } while (0)
 /* Never use this, always use DMA_BLOCK(...) for primary DMA output.
 */
-#define DMA_WRITE( offset, val )                                        \
+#define DMA_WRITE(offset, val)                                          \
 do {                                                                    \
-        if ( MGA_VERBOSE ) {                                            \
+        if (MGA_VERBOSE)                                                \
-                DRM_INFO( "   DMA_WRITE( 0x%08x ) at 0x%04Zx\n",        \
+                DRM_INFO("   DMA_WRITE( 0x%08x ) at 0x%04Zx\n",         \
-                          (u32)(val), write + (offset) * sizeof(u32) ); \
+                         (u32)(val), write + (offset) * sizeof(u32));   \
-        }                                                               \
        *(volatile u32 *)(prim + write + (offset) * sizeof(u32)) = val; \
 } while (0)
-#define DMA_BLOCK( reg0, val0, reg1, val1, reg2, val2, reg3, val3 )     \
+#define DMA_BLOCK(reg0, val0, reg1, val1, reg2, val2, reg3, val3)       \
 do {                                                                    \
-        DMA_WRITE( 0, ((DMAREG( reg0 ) << 0) |                          \
+        DMA_WRITE(0, ((DMAREG(reg0) << 0) |                             \
-                       (DMAREG( reg1 ) << 8) |                          \
+                      (DMAREG(reg1) << 8) |                             \
-                       (DMAREG( reg2 ) << 16) |                         \
+                      (DMAREG(reg2) << 16) |                            \
-                       (DMAREG( reg3 ) << 24)) );                       \
+                      (DMAREG(reg3) << 24)));                           \
-        DMA_WRITE( 1, val0 );                                           \
+        DMA_WRITE(1, val0);                                             \
-        DMA_WRITE( 2, val1 );                                           \
+        DMA_WRITE(2, val1);                                             \
-        DMA_WRITE( 3, val2 );                                           \
+        DMA_WRITE(3, val2);                                             \
-        DMA_WRITE( 4, val3 );                                           \
+        DMA_WRITE(4, val3);                                             \
        write += DMA_BLOCK_SIZE;                                        \
 } while (0)
 /* Buffer aging via primary DMA stream head pointer.
 */
-#define SET_AGE( age, h, w )                                            \
+#define SET_AGE(age, h, w)                                              \
 do {                                                                    \
        (age)->head = h;                                                \
        (age)->wrap = w;                                                \
 } while (0)
-#define TEST_AGE( age, h, w )           ( (age)->wrap < w ||            \
+#define TEST_AGE(age, h, w)             ((age)->wrap < w ||             \
-                                          ( (age)->wrap == w &&         \
+                                         ((age)->wrap == w &&           \
-                                            (age)->head < h ) )
+                                          (age)->head < h))
-#define AGE_BUFFER( buf_priv )                                          \
+#define AGE_BUFFER(buf_priv)                                            \
 do {                                                                    \
        drm_mga_freelist_t *entry = (buf_priv)->list_entry;             \
-        if ( (buf_priv)->dispatched ) {                                 \
+        if ((buf_priv)->dispatched) {                                   \
                entry->age.head = (dev_priv->prim.tail +                \
                                   dev_priv->primary->offset);          \
                entry->age.wrap = dev_priv->sarea_priv->last_wrap;      \
@@ -681,7 +676,7 @@ do {									\
 /* Simple idle test.
 */
-static __inline__ int mga_is_idle(drm_mga_private_t * dev_priv)
+static __inline__ int mga_is_idle(drm_mga_private_t *dev_priv)
 {
        u32 status = MGA_READ(MGA_STATUS) & MGA_ENGINE_IDLE_MASK;
        return (status == MGA_ENDPRDMASTS);
diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
index daa6041a483a..2581202297e4 100644
--- a/drivers/gpu/drm/mga/mga_irq.c
+++ b/drivers/gpu/drm/mga/mga_irq.c
@@ -76,9 +76,8 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
                /* In addition to clearing the interrupt-pending bit, we
                 * have to write to MGA_PRIMEND to re-start the DMA operation.
                 */
-                if ((prim_start & ~0x03) != (prim_end & ~0x03)) {
+                if ((prim_start & ~0x03) != (prim_end & ~0x03))
                        MGA_WRITE(MGA_PRIMEND, prim_end);
-                }
                atomic_inc(&dev_priv->last_fence_retired);
                DRM_WAKEUP(&dev_priv->fence_queue);
@@ -120,7 +119,7 @@ void mga_disable_vblank(struct drm_device *dev, int crtc)
        /* MGA_WRITE(MGA_IEN, MGA_VLINEIEN | MGA_SOFTRAPEN); */
 }
-int mga_driver_fence_wait(struct drm_device * dev, unsigned int *sequence)
+int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
 {
        drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev->dev_private;
        unsigned int cur_fence;
@@ -139,7 +138,7 @@ int mga_driver_fence_wait(struct drm_device * dev, unsigned int *sequence)
        return ret;
 }
-void mga_driver_irq_preinstall(struct drm_device * dev)
+void mga_driver_irq_preinstall(struct drm_device *dev)
 {
        drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev->dev_private;
@@ -162,7 +161,7 @@ int mga_driver_irq_postinstall(struct drm_device *dev)
        return 0;
 }
-void mga_driver_irq_uninstall(struct drm_device * dev)
+void mga_driver_irq_uninstall(struct drm_device *dev)
 {
        drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev->dev_private;
        if (!dev_priv)
diff --git a/drivers/gpu/drm/mga/mga_state.c b/drivers/gpu/drm/mga/mga_state.c
index a53b848e0f17..fff82045c427 100644
--- a/drivers/gpu/drm/mga/mga_state.c
+++ b/drivers/gpu/drm/mga/mga_state.c
@@ -41,8 +41,8 @@
 * DMA hardware state programming functions
 */
-static void mga_emit_clip_rect(drm_mga_private_t * dev_priv,
+static void mga_emit_clip_rect(drm_mga_private_t *dev_priv,
-                               struct drm_clip_rect * box)
+                               struct drm_clip_rect *box)
 {
        drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
        drm_mga_context_regs_t *ctx = &sarea_priv->context_state;
@@ -66,7 +66,7 @@ static void mga_emit_clip_rect(drm_mga_private_t * dev_priv,
        ADVANCE_DMA();
 }
-static __inline__ void mga_g200_emit_context(drm_mga_private_t * dev_priv)
+static __inline__ void mga_g200_emit_context(drm_mga_private_t *dev_priv)
 {
        drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
        drm_mga_context_regs_t *ctx = &sarea_priv->context_state;
@@ -89,7 +89,7 @@ static __inline__ void mga_g200_emit_context(drm_mga_private_t * dev_priv)
        ADVANCE_DMA();
 }
-static __inline__ void mga_g400_emit_context(drm_mga_private_t * dev_priv)
+static __inline__ void mga_g400_emit_context(drm_mga_private_t *dev_priv)
 {
        drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
        drm_mga_context_regs_t *ctx = &sarea_priv->context_state;
@@ -116,7 +116,7 @@ static __inline__ void mga_g400_emit_context(drm_mga_private_t * dev_priv)
        ADVANCE_DMA();
 }
-static __inline__ void mga_g200_emit_tex0(drm_mga_private_t * dev_priv)
+static __inline__ void mga_g200_emit_tex0(drm_mga_private_t *dev_priv)
 {
        drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
        drm_mga_texture_regs_t *tex = &sarea_priv->tex_state[0];
@@ -144,7 +144,7 @@ static __inline__ void mga_g200_emit_tex0(drm_mga_private_t * dev_priv)
        ADVANCE_DMA();
 }
-static __inline__ void mga_g400_emit_tex0(drm_mga_private_t * dev_priv)
+static __inline__ void mga_g400_emit_tex0(drm_mga_private_t *dev_priv)
 {
        drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
        drm_mga_texture_regs_t *tex = &sarea_priv->tex_state[0];
@@ -184,7 +184,7 @@ static __inline__ void mga_g400_emit_tex0(drm_mga_private_t * dev_priv)
        ADVANCE_DMA();
 }
-static __inline__ void mga_g400_emit_tex1(drm_mga_private_t * dev_priv)
+static __inline__ void mga_g400_emit_tex1(drm_mga_private_t *dev_priv)
 {
        drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
        drm_mga_texture_regs_t *tex = &sarea_priv->tex_state[1];
@@ -223,7 +223,7 @@ static __inline__ void mga_g400_emit_tex1(drm_mga_private_t * dev_priv)
        ADVANCE_DMA();
 }
-static __inline__ void mga_g200_emit_pipe(drm_mga_private_t * dev_priv)
+static __inline__ void mga_g200_emit_pipe(drm_mga_private_t *dev_priv)
 {
        drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
        unsigned int pipe = sarea_priv->warp_pipe;
@@ -250,7 +250,7 @@ static __inline__ void mga_g200_emit_pipe(drm_mga_private_t * dev_priv)
        ADVANCE_DMA();
 }
-static __inline__ void mga_g400_emit_pipe(drm_mga_private_t * dev_priv)
+static __inline__ void mga_g400_emit_pipe(drm_mga_private_t *dev_priv)
 {
        drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
        unsigned int pipe = sarea_priv->warp_pipe;
@@ -327,7 +327,7 @@ static __inline__ void mga_g400_emit_pipe(drm_mga_private_t * dev_priv)
        ADVANCE_DMA();
 }
-static void mga_g200_emit_state(drm_mga_private_t * dev_priv)
+static void mga_g200_emit_state(drm_mga_private_t *dev_priv)
 {
        drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
        unsigned int dirty = sarea_priv->dirty;
@@ -348,7 +348,7 @@ static void mga_g200_emit_state(drm_mga_private_t * dev_priv)
        }
 }
-static void mga_g400_emit_state(drm_mga_private_t * dev_priv)
+static void mga_g400_emit_state(drm_mga_private_t *dev_priv)
 {
        drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
        unsigned int dirty = sarea_priv->dirty;
@@ -381,7 +381,7 @@ static void mga_g400_emit_state(drm_mga_private_t * dev_priv)
 /* Disallow all write destinations except the front and backbuffer.
 */
-static int mga_verify_context(drm_mga_private_t * dev_priv)
+static int mga_verify_context(drm_mga_private_t *dev_priv)
 {
        drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
        drm_mga_context_regs_t *ctx = &sarea_priv->context_state;
@@ -400,7 +400,7 @@ static int mga_verify_context(drm_mga_private_t * dev_priv)
 /* Disallow texture reads from PCI space.
 */
-static int mga_verify_tex(drm_mga_private_t * dev_priv, int unit)
+static int mga_verify_tex(drm_mga_private_t *dev_priv, int unit)
 {
        drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
        drm_mga_texture_regs_t *tex = &sarea_priv->tex_state[unit];
@@ -417,7 +417,7 @@ static int mga_verify_tex(drm_mga_private_t * dev_priv, int unit)
        return 0;
 }
-static int mga_verify_state(drm_mga_private_t * dev_priv)
+static int mga_verify_state(drm_mga_private_t *dev_priv)
 {
        drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
        unsigned int dirty = sarea_priv->dirty;
@@ -446,7 +446,7 @@ static int mga_verify_state(drm_mga_private_t * dev_priv)
        return (ret == 0);
 }
-static int mga_verify_iload(drm_mga_private_t * dev_priv,
+static int mga_verify_iload(drm_mga_private_t *dev_priv,
                            unsigned int dstorg, unsigned int length)
 {
        if (dstorg < dev_priv->texture_offset ||
@@ -465,7 +465,7 @@ static int mga_verify_iload(drm_mga_private_t * dev_priv,
        return 0;
 }
-static int mga_verify_blit(drm_mga_private_t * dev_priv,
+static int mga_verify_blit(drm_mga_private_t *dev_priv,
                           unsigned int srcorg, unsigned int dstorg)
 {
        if ((srcorg & 0x3) == (MGA_SRCACC_PCI | MGA_SRCMAP_SYSMEM) ||
@@ -480,7 +480,7 @@ static int mga_verify_blit(drm_mga_private_t * dev_priv,
 *
 */
-static void mga_dma_dispatch_clear(struct drm_device * dev, drm_mga_clear_t * clear)
+static void mga_dma_dispatch_clear(struct drm_device *dev, drm_mga_clear_t *clear)
 {
        drm_mga_private_t *dev_priv = dev->dev_private;
        drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
@@ -568,7 +568,7 @@ static void mga_dma_dispatch_clear(struct drm_device * dev, drm_mga_clear_t * cl
        FLUSH_DMA();
 }
-static void mga_dma_dispatch_swap(struct drm_device * dev)
+static void mga_dma_dispatch_swap(struct drm_device *dev)
 {
        drm_mga_private_t *dev_priv = dev->dev_private;
        drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
@@ -622,7 +622,7 @@ static void mga_dma_dispatch_swap(struct drm_device * dev)
        DRM_DEBUG("... done.\n");
 }
-static void mga_dma_dispatch_vertex(struct drm_device * dev, struct drm_buf * buf)
+static void mga_dma_dispatch_vertex(struct drm_device *dev, struct drm_buf *buf)
 {
        drm_mga_private_t *dev_priv = dev->dev_private;
        drm_mga_buf_priv_t *buf_priv = buf->dev_private;
@@ -669,7 +669,7 @@ static void mga_dma_dispatch_vertex(struct drm_device * dev, struct drm_buf * bu
        FLUSH_DMA();
 }
-static void mga_dma_dispatch_indices(struct drm_device * dev, struct drm_buf * buf,
+static void mga_dma_dispatch_indices(struct drm_device *dev, struct drm_buf *buf,
                                     unsigned int start, unsigned int end)
 {
        drm_mga_private_t *dev_priv = dev->dev_private;
@@ -718,7 +718,7 @@ static void mga_dma_dispatch_indices(struct drm_device * dev, struct drm_buf * b
 /* This copies a 64 byte aligned agp region to the frambuffer with a
 * standard blit, the ioctl needs to do checking.
 */
-static void mga_dma_dispatch_iload(struct drm_device * dev, struct drm_buf * buf,
+static void mga_dma_dispatch_iload(struct drm_device *dev, struct drm_buf *buf,
                                   unsigned int dstorg, unsigned int length)
 {
        drm_mga_private_t *dev_priv = dev->dev_private;
@@ -766,7 +766,7 @@ static void mga_dma_dispatch_iload(struct drm_device * dev, struct drm_buf * buf
        FLUSH_DMA();
 }
-static void mga_dma_dispatch_blit(struct drm_device * dev, drm_mga_blit_t * blit)
+static void mga_dma_dispatch_blit(struct drm_device *dev, drm_mga_blit_t *blit)
 {
        drm_mga_private_t *dev_priv = dev->dev_private;
        drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
@@ -801,9 +801,8 @@ static void mga_dma_dispatch_blit(struct drm_device * dev, drm_mga_blit_t * blit
                int w = pbox[i].x2 - pbox[i].x1 - 1;
                int start;
-                if (blit->ydir == -1) {
+                if (blit->ydir == -1)
                        srcy = blit->height - srcy - 1;
-                }
                start = srcy * blit->src_pitch + srcx;
diff --git a/drivers/gpu/drm/mga/mga_warp.c b/drivers/gpu/drm/mga/mga_warp.c
index 9aad4847afdf..f172bd5c257f 100644
--- a/drivers/gpu/drm/mga/mga_warp.c
+++ b/drivers/gpu/drm/mga/mga_warp.c
@@ -46,7 +46,7 @@ MODULE_FIRMWARE(FIRMWARE_G400);
 #define WARP_UCODE_SIZE(size)           ALIGN(size, MGA_WARP_CODE_ALIGN)
-int mga_warp_install_microcode(drm_mga_private_t * dev_priv)
+int mga_warp_install_microcode(drm_mga_private_t *dev_priv)
 {
        unsigned char *vcbase = dev_priv->warp->handle;
        unsigned long pcbase = dev_priv->warp->offset;
@@ -133,7 +133,7 @@ out:
 #define WMISC_EXPECTED          (MGA_WUCODECACHE_ENABLE | MGA_WMASTER_ENABLE)
-int mga_warp_init(drm_mga_private_t * dev_priv)
+int mga_warp_init(drm_mga_private_t *dev_priv)
 {
        u32 wmisc;
diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index 1175429da102..d2d28048efb2 100644
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/drivers/gpu/drm/nouveau/Kconfig
@@ -1,6 +1,6 @@
 config DRM_NOUVEAU
        tristate "Nouveau (nVidia) cards"
-        depends on DRM
+        depends on DRM && PCI
        select FW_LOADER
        select DRM_KMS_HELPER
        select DRM_TTM
@@ -41,4 +41,13 @@ config DRM_I2C_CH7006
          This driver is currently only useful if you're also using
          the nouveau driver.
+config DRM_I2C_SIL164
+        tristate "Silicon Image sil164 TMDS transmitter"
+        default m if DRM_NOUVEAU
+        help
+          Support for sil164 and similar single-link (or dual-link
+          when used in pairs) TMDS transmitters, used in some nVidia
+          video cards.
 endmenu
diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
index acd31ed861ef..2405d5ef0ca7 100644
--- a/drivers/gpu/drm/nouveau/Makefile
+++ b/drivers/gpu/drm/nouveau/Makefile
@@ -9,10 +9,10 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \
             nouveau_bo.o nouveau_fence.o nouveau_gem.o nouveau_ttm.o \
             nouveau_hw.o nouveau_calc.o nouveau_bios.o nouveau_i2c.o \
             nouveau_display.o nouveau_connector.o nouveau_fbcon.o \
-             nouveau_dp.o nouveau_grctx.o \
+             nouveau_dp.o \
             nv04_timer.o \
             nv04_mc.o nv40_mc.o nv50_mc.o \
-             nv04_fb.o nv10_fb.o nv40_fb.o nv50_fb.o \
+             nv04_fb.o nv10_fb.o nv30_fb.o nv40_fb.o nv50_fb.o \
             nv04_fifo.o nv10_fifo.o nv40_fifo.o nv50_fifo.o \
             nv04_graph.o nv10_graph.o nv20_graph.o \
             nv40_graph.o nv50_graph.o \
@@ -22,7 +22,7 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \
             nv50_cursor.o nv50_display.o nv50_fbcon.o \
             nv04_dac.o nv04_dfp.o nv04_tv.o nv17_tv.o nv17_tv_modes.o \
             nv04_crtc.o nv04_display.o nv04_cursor.o nv04_fbcon.o \
-             nv17_gpio.o nv50_gpio.o \
+             nv10_gpio.o nv50_gpio.o \
             nv50_calc.o
 nouveau-$(CONFIG_DRM_NOUVEAU_DEBUG) += nouveau_debugfs.o
diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c
index d4bcca8a5133..c17a055ee3e5 100644
--- a/drivers/gpu/drm/nouveau/nouveau_acpi.c
+++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c
@@ -3,6 +3,7 @@
 #include <linux/slab.h>
 #include <acpi/acpi_drivers.h>
 #include <acpi/acpi_bus.h>
+#include <acpi/video.h>
 #include "drmP.h"
 #include "drm.h"
@@ -11,6 +12,7 @@
 #include "nouveau_drv.h"
 #include "nouveau_drm.h"
 #include "nv50_display.h"
+#include "nouveau_connector.h"
 #include <linux/vga_switcheroo.h>
@@ -42,7 +44,7 @@ static const char nouveau_dsm_muid[] = {
        0xB3, 0x4D, 0x7E, 0x5F, 0xEA, 0x12, 0x9F, 0xD4,
 };
-static int nouveau_dsm(acpi_handle handle, int func, int arg, int *result)
+static int nouveau_dsm(acpi_handle handle, int func, int arg, uint32_t *result)
 {
        struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
        struct acpi_object_list input;
@@ -259,3 +261,37 @@ int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len)
 {
        return nouveau_rom_call(nouveau_dsm_priv.rom_handle, bios, offset, len);
 }
+int
+nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector)
+{
+        struct nouveau_connector *nv_connector = nouveau_connector(connector);
+        struct acpi_device *acpidev;
+        acpi_handle handle;
+        int type, ret;
+        void *edid;
+        switch (connector->connector_type) {
+        case DRM_MODE_CONNECTOR_LVDS:
+        case DRM_MODE_CONNECTOR_eDP:
+                type = ACPI_VIDEO_DISPLAY_LCD;
+                break;
+        default:
+                return -EINVAL;
+        }
+        handle = DEVICE_ACPI_HANDLE(&dev->pdev->dev);
+        if (!handle)
+                return -ENODEV;
+        ret = acpi_bus_get_device(handle, &acpidev);
+        if (ret)
+                return -ENODEV;
+        ret = acpi_video_get_edid(acpidev, type, -1, &edid);
+        if (ret < 0)
+                return ret;
+        nv_connector->edid = edid;
+        return 0;
+}
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index fc924b649195..7369b5e73649 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -28,6 +28,8 @@
 #include "nouveau_hw.h"
 #include "nouveau_encoder.h"
+#include <linux/io-mapping.h>
 /* these defines are made up */
 #define NV_CIO_CRE_44_HEADA 0x0
 #define NV_CIO_CRE_44_HEADB 0x3
@@ -203,36 +205,26 @@ struct methods {
        const bool rw;
 };
-static struct methods nv04_methods[] = {
+static struct methods shadow_methods[] = {
-        { "PROM", load_vbios_prom, false },
-        { "PRAMIN", load_vbios_pramin, true },
-        { "PCIROM", load_vbios_pci, true },
-};
-static struct methods nv50_methods[] = {
-        { "ACPI", load_vbios_acpi, true },
        { "PRAMIN", load_vbios_pramin, true },
        { "PROM", load_vbios_prom, false },
        { "PCIROM", load_vbios_pci, true },
+        { "ACPI", load_vbios_acpi, true },
 };
+#define NUM_SHADOW_METHODS ARRAY_SIZE(shadow_methods)
-#define METHODCNT 3
 static bool NVShadowVBIOS(struct drm_device *dev, uint8_t *data)
 {
-        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct methods *methods = shadow_methods;
-        struct methods *methods;
-        int i;
        int testscore = 3;
-        int scores[METHODCNT];
+        int scores[NUM_SHADOW_METHODS], i;
        if (nouveau_vbios) {
-                methods = nv04_methods;
+                for (i = 0; i < NUM_SHADOW_METHODS; i++)
-                for (i = 0; i < METHODCNT; i++)
                        if (!strcasecmp(nouveau_vbios, methods[i].desc))
                                break;
-                if (i < METHODCNT) {
+                if (i < NUM_SHADOW_METHODS) {
                        NV_INFO(dev, "Attempting to use BIOS image from %s\n",
                                methods[i].desc);
@@ -244,12 +236,7 @@ static bool NVShadowVBIOS(struct drm_device *dev, uint8_t *data)
                NV_ERROR(dev, "VBIOS source \'%s\' invalid\n", nouveau_vbios);
        }
-        if (dev_priv->card_type < NV_50)
+        for (i = 0; i < NUM_SHADOW_METHODS; i++) {
-                methods = nv04_methods;
-        else
-                methods = nv50_methods;
-        for (i = 0; i < METHODCNT; i++) {
                NV_TRACE(dev, "Attempting to load BIOS image from %s\n",
                         methods[i].desc);
                data[0] = data[1] = 0;  /* avoid reuse of previous image */
@@ -260,7 +247,7 @@ static bool NVShadowVBIOS(struct drm_device *dev, uint8_t *data)
        }
        while (--testscore > 0) {
-                for (i = 0; i < METHODCNT; i++) {
+                for (i = 0; i < NUM_SHADOW_METHODS; i++) {
                        if (scores[i] == testscore) {
                                NV_TRACE(dev, "Using BIOS image from %s\n",
                                         methods[i].desc);
@@ -935,7 +922,7 @@ init_io_restrict_prog(struct nvbios *bios, uint16_t offset,
                NV_ERROR(bios->dev,
                         "0x%04X: Config 0x%02X exceeds maximal bound 0x%02X\n",
                         offset, config, count);
-                return -EINVAL;
+                return len;
        }
        configval = ROM32(bios->data[offset + 11 + config * 4]);
@@ -1037,7 +1024,7 @@ init_io_restrict_pll(struct nvbios *bios, uint16_t offset,
                NV_ERROR(bios->dev,
                         "0x%04X: Config 0x%02X exceeds maximal bound 0x%02X\n",
                         offset, config, count);
-                return -EINVAL;
+                return len;
        }
        freq = ROM16(bios->data[offset + 12 + config * 2]);
@@ -1209,7 +1196,7 @@ init_dp_condition(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
        dpe = nouveau_bios_dp_table(dev, dcb, &dummy);
        if (!dpe) {
                NV_ERROR(dev, "0x%04X: INIT_3A: no encoder table!!\n", offset);
-                return -EINVAL;
+                return 3;
        }
        switch (cond) {
@@ -1233,12 +1220,16 @@ init_dp_condition(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
                int ret;
                auxch = nouveau_i2c_find(dev, bios->display.output->i2c_index);
-                if (!auxch)
+                if (!auxch) {
-                        return -ENODEV;
+                        NV_ERROR(dev, "0x%04X: couldn't get auxch\n", offset);
+                        return 3;
+                }
                ret = nouveau_dp_auxch(auxch, 9, 0xd, &cond, 1);
-                if (ret)
+                if (ret) {
-                        return ret;
+                        NV_ERROR(dev, "0x%04X: auxch rd fail: %d\n", offset, ret);
+                        return 3;
+                }
                if (cond & 1)
                        iexec->execute = false;
@@ -1407,7 +1398,7 @@ init_io_restrict_pll2(struct nvbios *bios, uint16_t offset,
                NV_ERROR(bios->dev,
                         "0x%04X: Config 0x%02X exceeds maximal bound 0x%02X\n",
                         offset, config, count);
-                return -EINVAL;
+                return len;
        }
        freq = ROM32(bios->data[offset + 11 + config * 4]);
@@ -1467,6 +1458,7 @@ init_i2c_byte(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
         * "mask n" and OR it with "data n" before writing it back to the device
         */
+        struct drm_device *dev = bios->dev;
        uint8_t i2c_index = bios->data[offset + 1];
        uint8_t i2c_address = bios->data[offset + 2] >> 1;
        uint8_t count = bios->data[offset + 3];
@@ -1481,9 +1473,11 @@ init_i2c_byte(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
                      "Count: 0x%02X\n",
                offset, i2c_index, i2c_address, count);
-        chan = init_i2c_device_find(bios->dev, i2c_index);
+        chan = init_i2c_device_find(dev, i2c_index);
-        if (!chan)
+        if (!chan) {
-                return -ENODEV;
+                NV_ERROR(dev, "0x%04X: i2c bus not found\n", offset);
+                return len;
+        }
        for (i = 0; i < count; i++) {
                uint8_t reg = bios->data[offset + 4 + i * 3];
@@ -1494,8 +1488,10 @@ init_i2c_byte(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
                ret = i2c_smbus_xfer(&chan->adapter, i2c_address, 0,
                                     I2C_SMBUS_READ, reg,
                                     I2C_SMBUS_BYTE_DATA, &val);
-                if (ret < 0)
+                if (ret < 0) {
-                        return ret;
+                        NV_ERROR(dev, "0x%04X: i2c rd fail: %d\n", offset, ret);
+                        return len;
+                }
                BIOSLOG(bios, "0x%04X: I2CReg: 0x%02X, Value: 0x%02X, "
                              "Mask: 0x%02X, Data: 0x%02X\n",
@@ -1509,8 +1505,10 @@ init_i2c_byte(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
                ret = i2c_smbus_xfer(&chan->adapter, i2c_address, 0,
                                     I2C_SMBUS_WRITE, reg,
                                     I2C_SMBUS_BYTE_DATA, &val);
-                if (ret < 0)
+                if (ret < 0) {
-                        return ret;
+                        NV_ERROR(dev, "0x%04X: i2c wr fail: %d\n", offset, ret);
+                        return len;
+                }
        }
        return len;
@@ -1535,6 +1533,7 @@ init_zm_i2c_byte(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
         * "DCB I2C table entry index", set the register to "data n"
         */
+        struct drm_device *dev = bios->dev;
        uint8_t i2c_index = bios->data[offset + 1];
        uint8_t i2c_address = bios->data[offset + 2] >> 1;
        uint8_t count = bios->data[offset + 3];
@@ -1549,9 +1548,11 @@ init_zm_i2c_byte(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
                      "Count: 0x%02X\n",
                offset, i2c_index, i2c_address, count);
-        chan = init_i2c_device_find(bios->dev, i2c_index);
+        chan = init_i2c_device_find(dev, i2c_index);
-        if (!chan)
+        if (!chan) {
-                return -ENODEV;
+                NV_ERROR(dev, "0x%04X: i2c bus not found\n", offset);
+                return len;
+        }
        for (i = 0; i < count; i++) {
                uint8_t reg = bios->data[offset + 4 + i * 2];
@@ -1568,8 +1569,10 @@ init_zm_i2c_byte(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
                ret = i2c_smbus_xfer(&chan->adapter, i2c_address, 0,
                                     I2C_SMBUS_WRITE, reg,
                                     I2C_SMBUS_BYTE_DATA, &val);
-                if (ret < 0)
+                if (ret < 0) {
-                        return ret;
+                        NV_ERROR(dev, "0x%04X: i2c wr fail: %d\n", offset, ret);
+                        return len;
+                }
        }
        return len;
@@ -1592,6 +1595,7 @@ init_zm_i2c(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
         * address" on the I2C bus given by "DCB I2C table entry index"
         */
+        struct drm_device *dev = bios->dev;
        uint8_t i2c_index = bios->data[offset + 1];
        uint8_t i2c_address = bios->data[offset + 2] >> 1;
        uint8_t count = bios->data[offset + 3];
@@ -1599,7 +1603,7 @@ init_zm_i2c(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
        struct nouveau_i2c_chan *chan;
        struct i2c_msg msg;
        uint8_t data[256];
-        int i;
+        int ret, i;
        if (!iexec->execute)
                return len;
@@ -1608,9 +1612,11 @@ init_zm_i2c(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
                      "Count: 0x%02X\n",
                offset, i2c_index, i2c_address, count);
-        chan = init_i2c_device_find(bios->dev, i2c_index);
+        chan = init_i2c_device_find(dev, i2c_index);
-        if (!chan)
+        if (!chan) {
-                return -ENODEV;
+                NV_ERROR(dev, "0x%04X: i2c bus not found\n", offset);
+                return len;
+        }
        for (i = 0; i < count; i++) {
                data[i] = bios->data[offset + 4 + i];
@@ -1623,8 +1629,11 @@ init_zm_i2c(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
                msg.flags = 0;
                msg.len = count;
                msg.buf = data;
-                if (i2c_transfer(&chan->adapter, &msg, 1) != 1)
+                ret = i2c_transfer(&chan->adapter, &msg, 1);
-                        return -EIO;
+                if (ret != 1) {
+                        NV_ERROR(dev, "0x%04X: i2c wr fail: %d\n", offset, ret);
+                        return len;
+                }
        }
        return len;
@@ -1648,6 +1657,7 @@ init_tmds(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
         * used -- see get_tmds_index_reg()
         */
+        struct drm_device *dev = bios->dev;
        uint8_t mlv = bios->data[offset + 1];
        uint32_t tmdsaddr = bios->data[offset + 2];
        uint8_t mask = bios->data[offset + 3];
@@ -1662,8 +1672,10 @@ init_tmds(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
                offset, mlv, tmdsaddr, mask, data);
        reg = get_tmds_index_reg(bios->dev, mlv);
-        if (!reg)
+        if (!reg) {
-                return -EINVAL;
+                NV_ERROR(dev, "0x%04X: no tmds_index_reg\n", offset);
+                return 5;
+        }
        bios_wr32(bios, reg,
                  tmdsaddr | NV_PRAMDAC_FP_TMDS_CONTROL_WRITE_DISABLE);
@@ -1693,6 +1705,7 @@ init_zm_tmds_group(struct nvbios *bios, uint16_t offset,
         * register is used -- see get_tmds_index_reg()
         */
+        struct drm_device *dev = bios->dev;
        uint8_t mlv = bios->data[offset + 1];
        uint8_t count = bios->data[offset + 2];
        int len = 3 + count * 2;
@@ -1706,8 +1719,10 @@ init_zm_tmds_group(struct nvbios *bios, uint16_t offset,
                offset, mlv, count);
        reg = get_tmds_index_reg(bios->dev, mlv);
-        if (!reg)
+        if (!reg) {
-                return -EINVAL;
+                NV_ERROR(dev, "0x%04X: no tmds_index_reg\n", offset);
+                return len;
+        }
        for (i = 0; i < count; i++) {
                uint8_t tmdsaddr = bios->data[offset + 3 + i * 2];
@@ -2054,6 +2069,323 @@ init_zm_index_io(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
        return 5;
 }
+static inline void
+bios_md32(struct nvbios *bios, uint32_t reg,
+          uint32_t mask, uint32_t val)
+{
+        bios_wr32(bios, reg, (bios_rd32(bios, reg) & ~mask) | val);
+}
+static uint32_t
+peek_fb(struct drm_device *dev, struct io_mapping *fb,
+        uint32_t off)
+{
+        uint32_t val = 0;
+        if (off < pci_resource_len(dev->pdev, 1)) {
+                uint32_t __iomem *p = io_mapping_map_atomic_wc(fb, off, KM_USER0);
+                val = ioread32(p);
+                io_mapping_unmap_atomic(p, KM_USER0);
+        }
+        return val;
+}
+static void
+poke_fb(struct drm_device *dev, struct io_mapping *fb,
+        uint32_t off, uint32_t val)
+{
+        if (off < pci_resource_len(dev->pdev, 1)) {
+                uint32_t __iomem *p = io_mapping_map_atomic_wc(fb, off, KM_USER0);
+                iowrite32(val, p);
+                wmb();
+                io_mapping_unmap_atomic(p, KM_USER0);
+        }
+}
+static inline bool
+read_back_fb(struct drm_device *dev, struct io_mapping *fb,
+             uint32_t off, uint32_t val)
+{
+        poke_fb(dev, fb, off, val);
+        return val == peek_fb(dev, fb, off);
+}
+static int
+nv04_init_compute_mem(struct nvbios *bios)
+{
+        struct drm_device *dev = bios->dev;
+        uint32_t patt = 0xdeadbeef;
+        struct io_mapping *fb;
+        int i;
+        /* Map the framebuffer aperture */
+        fb = io_mapping_create_wc(pci_resource_start(dev->pdev, 1),
+                                  pci_resource_len(dev->pdev, 1));
+        if (!fb)
+                return -ENOMEM;
+        /* Sequencer and refresh off */
+        NVWriteVgaSeq(dev, 0, 1, NVReadVgaSeq(dev, 0, 1) | 0x20);
+        bios_md32(bios, NV04_PFB_DEBUG_0, 0, NV04_PFB_DEBUG_0_REFRESH_OFF);
+        bios_md32(bios, NV04_PFB_BOOT_0, ~0,
+                  NV04_PFB_BOOT_0_RAM_AMOUNT_16MB |
+                  NV04_PFB_BOOT_0_RAM_WIDTH_128 |
+                  NV04_PFB_BOOT_0_RAM_TYPE_SGRAM_16MBIT);
+        for (i = 0; i < 4; i++)
+                poke_fb(dev, fb, 4 * i, patt);
+        poke_fb(dev, fb, 0x400000, patt + 1);
+        if (peek_fb(dev, fb, 0) == patt + 1) {
+                bios_md32(bios, NV04_PFB_BOOT_0, NV04_PFB_BOOT_0_RAM_TYPE,
+                          NV04_PFB_BOOT_0_RAM_TYPE_SDRAM_16MBIT);
+                bios_md32(bios, NV04_PFB_DEBUG_0,
+                          NV04_PFB_DEBUG_0_REFRESH_OFF, 0);
+                for (i = 0; i < 4; i++)
+                        poke_fb(dev, fb, 4 * i, patt);
+                if ((peek_fb(dev, fb, 0xc) & 0xffff) != (patt & 0xffff))
+                        bios_md32(bios, NV04_PFB_BOOT_0,
+                                  NV04_PFB_BOOT_0_RAM_WIDTH_128 |
+                                  NV04_PFB_BOOT_0_RAM_AMOUNT,
+                                  NV04_PFB_BOOT_0_RAM_AMOUNT_8MB);
+        } else if ((peek_fb(dev, fb, 0xc) & 0xffff0000) !=
+                   (patt & 0xffff0000)) {
+                bios_md32(bios, NV04_PFB_BOOT_0,
+                          NV04_PFB_BOOT_0_RAM_WIDTH_128 |
+                          NV04_PFB_BOOT_0_RAM_AMOUNT,
+                          NV04_PFB_BOOT_0_RAM_AMOUNT_4MB);
+        } else if (peek_fb(dev, fb, 0) == patt) {
+                if (read_back_fb(dev, fb, 0x800000, patt))
+                        bios_md32(bios, NV04_PFB_BOOT_0,
+                                  NV04_PFB_BOOT_0_RAM_AMOUNT,
+                                  NV04_PFB_BOOT_0_RAM_AMOUNT_8MB);
+                else
+                        bios_md32(bios, NV04_PFB_BOOT_0,
+                                  NV04_PFB_BOOT_0_RAM_AMOUNT,
+                                  NV04_PFB_BOOT_0_RAM_AMOUNT_4MB);
+                bios_md32(bios, NV04_PFB_BOOT_0, NV04_PFB_BOOT_0_RAM_TYPE,
+                          NV04_PFB_BOOT_0_RAM_TYPE_SGRAM_8MBIT);
+        } else if (!read_back_fb(dev, fb, 0x800000, patt)) {
+                bios_md32(bios, NV04_PFB_BOOT_0, NV04_PFB_BOOT_0_RAM_AMOUNT,
+                          NV04_PFB_BOOT_0_RAM_AMOUNT_8MB);
+        }
+        /* Refresh on, sequencer on */
+        bios_md32(bios, NV04_PFB_DEBUG_0, NV04_PFB_DEBUG_0_REFRESH_OFF, 0);
+        NVWriteVgaSeq(dev, 0, 1, NVReadVgaSeq(dev, 0, 1) & ~0x20);
+        io_mapping_free(fb);
+        return 0;
+}
+static const uint8_t *
+nv05_memory_config(struct nvbios *bios)
+{
+        /* Defaults for BIOSes lacking a memory config table */
+        static const uint8_t default_config_tab[][2] = {
+                { 0x24, 0x00 },
+                { 0x28, 0x00 },
+                { 0x24, 0x01 },
+                { 0x1f, 0x00 },
+                { 0x0f, 0x00 },
+                { 0x17, 0x00 },
+                { 0x06, 0x00 },
+                { 0x00, 0x00 }
+        };
+        int i = (bios_rd32(bios, NV_PEXTDEV_BOOT_0) &
+                 NV_PEXTDEV_BOOT_0_RAMCFG) >> 2;
+        if (bios->legacy.mem_init_tbl_ptr)
+                return &bios->data[bios->legacy.mem_init_tbl_ptr + 2 * i];
+        else
+                return default_config_tab[i];
+}
+static int
+nv05_init_compute_mem(struct nvbios *bios)
+{
+        struct drm_device *dev = bios->dev;
+        const uint8_t *ramcfg = nv05_memory_config(bios);
+        uint32_t patt = 0xdeadbeef;
+        struct io_mapping *fb;
+        int i, v;
+        /* Map the framebuffer aperture */
+        fb = io_mapping_create_wc(pci_resource_start(dev->pdev, 1),
+                                  pci_resource_len(dev->pdev, 1));
+        if (!fb)
+                return -ENOMEM;
+        /* Sequencer off */
+        NVWriteVgaSeq(dev, 0, 1, NVReadVgaSeq(dev, 0, 1) | 0x20);
+        if (bios_rd32(bios, NV04_PFB_BOOT_0) & NV04_PFB_BOOT_0_UMA_ENABLE)
+                goto out;
+        bios_md32(bios, NV04_PFB_DEBUG_0, NV04_PFB_DEBUG_0_REFRESH_OFF, 0);
+        /* If present load the hardcoded scrambling table */
+        if (bios->legacy.mem_init_tbl_ptr) {
+                uint32_t *scramble_tab = (uint32_t *)&bios->data[
+                        bios->legacy.mem_init_tbl_ptr + 0x10];
+                for (i = 0; i < 8; i++)
+                        bios_wr32(bios, NV04_PFB_SCRAMBLE(i),
+                                  ROM32(scramble_tab[i]));
+        }
+        /* Set memory type/width/length defaults depending on the straps */
+        bios_md32(bios, NV04_PFB_BOOT_0, 0x3f, ramcfg[0]);
+        if (ramcfg[1] & 0x80)
+                bios_md32(bios, NV04_PFB_CFG0, 0, NV04_PFB_CFG0_SCRAMBLE);
+        bios_md32(bios, NV04_PFB_CFG1, 0x700001, (ramcfg[1] & 1) << 20);
+        bios_md32(bios, NV04_PFB_CFG1, 0, 1);
+        /* Probe memory bus width */
+        for (i = 0; i < 4; i++)
+                poke_fb(dev, fb, 4 * i, patt);
+        if (peek_fb(dev, fb, 0xc) != patt)
+                bios_md32(bios, NV04_PFB_BOOT_0,
+                          NV04_PFB_BOOT_0_RAM_WIDTH_128, 0);
+        /* Probe memory length */
+        v = bios_rd32(bios, NV04_PFB_BOOT_0) & NV04_PFB_BOOT_0_RAM_AMOUNT;
+        if (v == NV04_PFB_BOOT_0_RAM_AMOUNT_32MB &&
+            (!read_back_fb(dev, fb, 0x1000000, ++patt) ||
+             !read_back_fb(dev, fb, 0, ++patt)))
+                bios_md32(bios, NV04_PFB_BOOT_0, NV04_PFB_BOOT_0_RAM_AMOUNT,
+                          NV04_PFB_BOOT_0_RAM_AMOUNT_16MB);
+        if (v == NV04_PFB_BOOT_0_RAM_AMOUNT_16MB &&
+            !read_back_fb(dev, fb, 0x800000, ++patt))
+                bios_md32(bios, NV04_PFB_BOOT_0, NV04_PFB_BOOT_0_RAM_AMOUNT,
+                          NV04_PFB_BOOT_0_RAM_AMOUNT_8MB);
+        if (!read_back_fb(dev, fb, 0x400000, ++patt))
+                bios_md32(bios, NV04_PFB_BOOT_0, NV04_PFB_BOOT_0_RAM_AMOUNT,
+                          NV04_PFB_BOOT_0_RAM_AMOUNT_4MB);
+out:
+        /* Sequencer on */
+        NVWriteVgaSeq(dev, 0, 1, NVReadVgaSeq(dev, 0, 1) & ~0x20);
+        io_mapping_free(fb);
+        return 0;
+}
+static int
+nv10_init_compute_mem(struct nvbios *bios)
+{
+        struct drm_device *dev = bios->dev;
+        struct drm_nouveau_private *dev_priv = bios->dev->dev_private;
+        const int mem_width[] = { 0x10, 0x00, 0x20 };
+        const int mem_width_count = (dev_priv->chipset >= 0x17 ? 3 : 2);
+        uint32_t patt = 0xdeadbeef;
+        struct io_mapping *fb;
+        int i, j, k;
+        /* Map the framebuffer aperture */
+        fb = io_mapping_create_wc(pci_resource_start(dev->pdev, 1),
+                                  pci_resource_len(dev->pdev, 1));
+        if (!fb)
+                return -ENOMEM;
+        bios_wr32(bios, NV10_PFB_REFCTRL, NV10_PFB_REFCTRL_VALID_1);
+        /* Probe memory bus width */
+        for (i = 0; i < mem_width_count; i++) {
+                bios_md32(bios, NV04_PFB_CFG0, 0x30, mem_width[i]);
+                for (j = 0; j < 4; j++) {
+                        for (k = 0; k < 4; k++)
+                                poke_fb(dev, fb, 0x1c, 0);
+                        poke_fb(dev, fb, 0x1c, patt);
+                        poke_fb(dev, fb, 0x3c, 0);
+                        if (peek_fb(dev, fb, 0x1c) == patt)
+                                goto mem_width_found;
+                }
+        }
+mem_width_found:
+        patt <<= 1;
+        /* Probe amount of installed memory */
+        for (i = 0; i < 4; i++) {
+                int off = bios_rd32(bios, NV04_PFB_FIFO_DATA) - 0x100000;
+                poke_fb(dev, fb, off, patt);
+                poke_fb(dev, fb, 0, 0);
+                peek_fb(dev, fb, 0);
+                peek_fb(dev, fb, 0);
+                peek_fb(dev, fb, 0);
+                peek_fb(dev, fb, 0);
+                if (peek_fb(dev, fb, off) == patt)
+                        goto amount_found;
+        }
+        /* IC missing - disable the upper half memory space. */
+        bios_md32(bios, NV04_PFB_CFG0, 0x1000, 0);
+amount_found:
+        io_mapping_free(fb);
+        return 0;
+}
+static int
+nv20_init_compute_mem(struct nvbios *bios)
+{
+        struct drm_device *dev = bios->dev;
+        struct drm_nouveau_private *dev_priv = bios->dev->dev_private;
+        uint32_t mask = (dev_priv->chipset >= 0x25 ? 0x300 : 0x900);
+        uint32_t amount, off;
+        struct io_mapping *fb;
+        /* Map the framebuffer aperture */
+        fb = io_mapping_create_wc(pci_resource_start(dev->pdev, 1),
+                                  pci_resource_len(dev->pdev, 1));
+        if (!fb)
+                return -ENOMEM;
+        bios_wr32(bios, NV10_PFB_REFCTRL, NV10_PFB_REFCTRL_VALID_1);
+        /* Allow full addressing */
+        bios_md32(bios, NV04_PFB_CFG0, 0, mask);
+        amount = bios_rd32(bios, NV04_PFB_FIFO_DATA);
+        for (off = amount; off > 0x2000000; off -= 0x2000000)
+                poke_fb(dev, fb, off - 4, off);
+        amount = bios_rd32(bios, NV04_PFB_FIFO_DATA);
+        if (amount != peek_fb(dev, fb, amount - 4))
+                /* IC missing - disable the upper half memory space. */
+                bios_md32(bios, NV04_PFB_CFG0, mask, 0);
+        io_mapping_free(fb);
+        return 0;
+}
 static int
 init_compute_mem(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
 {
@@ -2062,64 +2394,57 @@ init_compute_mem(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
         *
         * offset      (8 bit): opcode
         *
-         * This opcode is meant to set NV_PFB_CFG0 (0x100200) appropriately so
+         * This opcode is meant to set the PFB memory config registers
-         * that the hardware can correctly calculate how much VRAM it has
+         * appropriately so that we can correctly calculate how much VRAM it
-         * (and subsequently report that value in NV_PFB_CSTATUS (0x10020C))
+         * has (on nv10 and better chipsets the amount of installed VRAM is
+         * subsequently reported in NV_PFB_CSTATUS (0x10020C)).
         *
-         * The implementation of this opcode in general consists of two parts:
+         * The implementation of this opcode in general consists of several
-         * 1) determination of the memory bus width
+         * parts:
-         * 2) determination of how many of the card's RAM pads have ICs attached
         *
-         * 1) is done by a cunning combination of writes to offsets 0x1c and
+         * 1) Determination of memory type and density. Only necessary for
-         * 0x3c in the framebuffer, and seeing whether the written values are
+         *    really old chipsets, the memory type reported by the strap bits
-         * read back correctly. This then affects bits 4-7 of NV_PFB_CFG0
+         *    (0x101000) is assumed to be accurate on nv05 and newer.
         *
-         * 2) is done by a cunning combination of writes to an offset slightly
+         * 2) Determination of the memory bus width. Usually done by a cunning
-         * less than the maximum memory reported by NV_PFB_CSTATUS, then seeing
+         *    combination of writes to offsets 0x1c and 0x3c in the fb, and
-         * if the test pattern can be read back. This then affects bits 12-15 of
+         *    seeing whether the written values are read back correctly.
-         * NV_PFB_CFG0
         *
-         * In this context a "cunning combination" may include multiple reads
+         *    Only necessary on nv0x-nv1x and nv34, on the other cards we can
-         * and writes to varying locations, often alternating the test pattern
+         *    trust the straps.
-         * and 0, doubtless to make sure buffers are filled, residual charges
-         * on tracks are removed etc.
         *
-         * Unfortunately, the "cunning combination"s mentioned above, and the
+         * 3) Determination of how many of the card's RAM pads have ICs
-         * changes to the bits in NV_PFB_CFG0 differ with nearly every bios
+         *    attached, usually done by a cunning combination of writes to an
-         * trace I have.
+         *    offset slightly less than the maximum memory reported by
+         *    NV_PFB_CSTATUS, then seeing if the test pattern can be read back.
         *
-         * Therefore, we cheat and assume the value of NV_PFB_CFG0 with which
+         * This appears to be a NOP on IGPs and NV4x or newer chipsets, both io
-         * we started was correct, and use that instead
+         * logs of the VBIOS and kmmio traces of the binary driver POSTing the
+         * card show nothing being done for this opcode. Why is it still listed
+         * in the table?!
         */
        /* no iexec->execute check by design */
-        /*
-         * This appears to be a NOP on G8x chipsets, both io logs of the VBIOS
-         * and kmmio traces of the binary driver POSTing the card show nothing
-         * being done for this opcode.  why is it still listed in the table?!
-         */
        struct drm_nouveau_private *dev_priv = bios->dev->dev_private;
+        int ret;
-        if (dev_priv->card_type >= NV_40)
+        if (dev_priv->chipset >= 0x40 ||
-                return 1;
+            dev_priv->chipset == 0x1a ||
+            dev_priv->chipset == 0x1f)
-        /*
+                ret = 0;
-         * On every card I've seen, this step gets done for us earlier in
+        else if (dev_priv->chipset >= 0x20 &&
-         * the init scripts
+                 dev_priv->chipset != 0x34)
-        uint8_t crdata = bios_idxprt_rd(dev, NV_VIO_SRX, 0x01);
+                ret = nv20_init_compute_mem(bios);
-        bios_idxprt_wr(dev, NV_VIO_SRX, 0x01, crdata | 0x20);
+        else if (dev_priv->chipset >= 0x10)
-         */
+                ret = nv10_init_compute_mem(bios);
+        else if (dev_priv->chipset >= 0x5)
-        /*
+                ret = nv05_init_compute_mem(bios);
-         * This also has probably been done in the scripts, but an mmio trace of
+        else
-         * s3 resume shows nvidia doing it anyway (unlike the NV_VIO_SRX write)
+                ret = nv04_init_compute_mem(bios);
-         */
-        bios_wr32(bios, NV_PFB_REFCTRL, NV_PFB_REFCTRL_VALID_1);
-        /* write back the saved configuration value */
+        if (ret)
-        bios_wr32(bios, NV_PFB_CFG0, bios->state.saved_nv_pfb_cfg0);
+                return ret;
        return 1;
 }
@@ -2146,7 +2471,8 @@ init_reset(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
        /* no iexec->execute check by design */
        pci_nv_19 = bios_rd32(bios, NV_PBUS_PCI_NV_19);
-        bios_wr32(bios, NV_PBUS_PCI_NV_19, 0);
+        bios_wr32(bios, NV_PBUS_PCI_NV_19, pci_nv_19 & ~0xf00);
        bios_wr32(bios, reg, value1);
        udelay(10);
@@ -2182,7 +2508,7 @@ init_configure_mem(struct nvbios *bios, uint16_t offset,
        uint32_t reg, data;
        if (bios->major_version > 2)
-                return -ENODEV;
+                return 0;
        bios_idxprt_wr(bios, NV_VIO_SRX, NV_VIO_SR_CLOCK_INDEX, bios_idxprt_rd(
                       bios, NV_VIO_SRX, NV_VIO_SR_CLOCK_INDEX) | 0x20);
@@ -2195,14 +2521,14 @@ init_configure_mem(struct nvbios *bios, uint16_t offset,
             reg = ROM32(bios->data[seqtbloffs += 4])) {
                switch (reg) {
-                case NV_PFB_PRE:
+                case NV04_PFB_PRE:
-                        data = NV_PFB_PRE_CMD_PRECHARGE;
+                        data = NV04_PFB_PRE_CMD_PRECHARGE;
                        break;
-                case NV_PFB_PAD:
+                case NV04_PFB_PAD:
-                        data = NV_PFB_PAD_CKE_NORMAL;
+                        data = NV04_PFB_PAD_CKE_NORMAL;
                        break;
-                case NV_PFB_REF:
+                case NV04_PFB_REF:
-                        data = NV_PFB_REF_CMD_REFRESH;
+                        data = NV04_PFB_REF_CMD_REFRESH;
                        break;
                default:
                        data = ROM32(bios->data[meminitdata]);
@@ -2237,7 +2563,7 @@ init_configure_clk(struct nvbios *bios, uint16_t offset,
        int clock;
        if (bios->major_version > 2)
-                return -ENODEV;
+                return 0;
        clock = ROM16(bios->data[meminitoffs + 4]) * 10;
        setPLL(bios, NV_PRAMDAC_NVPLL_COEFF, clock);
@@ -2270,7 +2596,7 @@ init_configure_preinit(struct nvbios *bios, uint16_t offset,
        uint8_t cr3c = ((straps << 2) & 0xf0) | (straps & (1 << 6));
        if (bios->major_version > 2)
-                return -ENODEV;
+                return 0;
        bios_idxprt_wr(bios, NV_CIO_CRX__COLOR,
                             NV_CIO_CRE_SCRATCH4__INDEX, cr3c);
@@ -2404,7 +2730,7 @@ init_ram_condition(struct nvbios *bios, uint16_t offset,
         * offset + 1  (8 bit): mask
         * offset + 2  (8 bit): cmpval
         *
-         * Test if (NV_PFB_BOOT_0 & "mask") equals "cmpval".
+         * Test if (NV04_PFB_BOOT_0 & "mask") equals "cmpval".
         * If condition not met skip subsequent opcodes until condition is
         * inverted (INIT_NOT), or we hit INIT_RESUME
         */
@@ -2416,7 +2742,7 @@ init_ram_condition(struct nvbios *bios, uint16_t offset,
        if (!iexec->execute)
                return 3;
-        data = bios_rd32(bios, NV_PFB_BOOT_0) & mask;
+        data = bios_rd32(bios, NV04_PFB_BOOT_0) & mask;
        BIOSLOG(bios, "0x%04X: Checking if 0x%08X equals 0x%08X\n",
                offset, data, cmpval);
@@ -2810,12 +3136,13 @@ init_gpio(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
         */
        struct drm_nouveau_private *dev_priv = bios->dev->dev_private;
+        struct nouveau_gpio_engine *pgpio = &dev_priv->engine.gpio;
        const uint32_t nv50_gpio_ctl[2] = { 0xe100, 0xe28c };
        int i;
        if (dev_priv->card_type != NV_50) {
                NV_ERROR(bios->dev, "INIT_GPIO on unsupported chipset\n");
-                return -ENODEV;
+                return 1;
        }
        if (!iexec->execute)
@@ -2830,7 +3157,7 @@ init_gpio(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
                BIOSLOG(bios, "0x%04X: set gpio 0x%02x, state %d\n",
                        offset, gpio->tag, gpio->state_default);
                if (bios->execute)
-                        nv50_gpio_set(bios->dev, gpio->tag, gpio->state_default);
+                        pgpio->set(bios->dev, gpio->tag, gpio->state_default);
                /* The NVIDIA binary driver doesn't appear to actually do
                 * any of this, my VBIOS does however.
@@ -2887,10 +3214,7 @@ init_ram_restrict_zm_reg_group(struct nvbios *bios, uint16_t offset,
        uint8_t index;
        int i;
+        /* critical! to know the length of the opcode */;
-        if (!iexec->execute)
-                return len;
        if (!blocklen) {
                NV_ERROR(bios->dev,
                         "0x%04X: Zero block length - has the M table "
@@ -2898,6 +3222,9 @@ init_ram_restrict_zm_reg_group(struct nvbios *bios, uint16_t offset,
                return -EINVAL;
        }
+        if (!iexec->execute)
+                return len;
        strap_ramcfg = (bios_rd32(bios, NV_PEXTDEV_BOOT_0) >> 2) & 0xf;
        index = bios->data[bios->ram_restrict_tbl_ptr + strap_ramcfg];
@@ -3079,14 +3406,14 @@ init_auxch(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
        if (!bios->display.output) {
                NV_ERROR(dev, "INIT_AUXCH: no active output\n");
-                return -EINVAL;
+                return len;
        }
        auxch = init_i2c_device_find(dev, bios->display.output->i2c_index);
        if (!auxch) {
                NV_ERROR(dev, "INIT_AUXCH: couldn't get auxch %d\n",
                         bios->display.output->i2c_index);
-                return -ENODEV;
+                return len;
        }
        if (!iexec->execute)
@@ -3099,7 +3426,7 @@ init_auxch(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
                ret = nouveau_dp_auxch(auxch, 9, addr, &data, 1);
                if (ret) {
                        NV_ERROR(dev, "INIT_AUXCH: rd auxch fail %d\n", ret);
-                        return ret;
+                        return len;
                }
                data &= bios->data[offset + 0];
@@ -3108,7 +3435,7 @@ init_auxch(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
                ret = nouveau_dp_auxch(auxch, 8, addr, &data, 1);
                if (ret) {
                        NV_ERROR(dev, "INIT_AUXCH: wr auxch fail %d\n", ret);
-                        return ret;
+                        return len;
                }
        }
@@ -3138,14 +3465,14 @@ init_zm_auxch(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
        if (!bios->display.output) {
                NV_ERROR(dev, "INIT_ZM_AUXCH: no active output\n");
-                return -EINVAL;
+                return len;
        }
        auxch = init_i2c_device_find(dev, bios->display.output->i2c_index);
        if (!auxch) {
                NV_ERROR(dev, "INIT_ZM_AUXCH: couldn't get auxch %d\n",
                         bios->display.output->i2c_index);
-                return -ENODEV;
+                return len;
        }
        if (!iexec->execute)
@@ -3156,7 +3483,7 @@ init_zm_auxch(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
                ret = nouveau_dp_auxch(auxch, 8, addr, &bios->data[offset], 1);
                if (ret) {
                        NV_ERROR(dev, "INIT_ZM_AUXCH: wr auxch fail %d\n", ret);
-                        return ret;
+                        return len;
                }
        }
@@ -5166,10 +5493,14 @@ static int parse_bmp_structure(struct drm_device *dev, struct nvbios *bios, unsi
        bios->legacy.i2c_indices.crt = bios->data[legacy_i2c_offset];
        bios->legacy.i2c_indices.tv = bios->data[legacy_i2c_offset + 1];
        bios->legacy.i2c_indices.panel = bios->data[legacy_i2c_offset + 2];
-        bios->dcb.i2c[0].write = bios->data[legacy_i2c_offset + 4];
+        if (bios->data[legacy_i2c_offset + 4])
-        bios->dcb.i2c[0].read = bios->data[legacy_i2c_offset + 5];
+                bios->dcb.i2c[0].write = bios->data[legacy_i2c_offset + 4];
-        bios->dcb.i2c[1].write = bios->data[legacy_i2c_offset + 6];
+        if (bios->data[legacy_i2c_offset + 5])
-        bios->dcb.i2c[1].read = bios->data[legacy_i2c_offset + 7];
+                bios->dcb.i2c[0].read = bios->data[legacy_i2c_offset + 5];
+        if (bios->data[legacy_i2c_offset + 6])
+                bios->dcb.i2c[1].write = bios->data[legacy_i2c_offset + 6];
+        if (bios->data[legacy_i2c_offset + 7])
+                bios->dcb.i2c[1].read = bios->data[legacy_i2c_offset + 7];
        if (bmplength > 74) {
                bios->fmaxvco = ROM32(bmp[67]);
@@ -5604,9 +5935,12 @@ parse_dcb20_entry(struct drm_device *dev, struct dcb_table *dcb,
                        if (conf & 0x4 || conf & 0x8)
                                entry->lvdsconf.use_power_scripts = true;
                } else {
-                        mask = ~0x5;
+                        mask = ~0x7;
+                        if (conf & 0x2)
+                                entry->lvdsconf.use_acpi_for_edid = true;
                        if (conf & 0x4)
                                entry->lvdsconf.use_power_scripts = true;
+                        entry->lvdsconf.sor.link = (conf & 0x00000030) >> 4;
                }
                if (conf & mask) {
                        /*
@@ -5721,13 +6055,6 @@ parse_dcb15_entry(struct drm_device *dev, struct dcb_table *dcb,
        case OUTPUT_TV:
                entry->tvconf.has_component_output = false;
                break;
-        case OUTPUT_TMDS:
-                /*
-                 * Invent a DVI-A output, by copying the fields of the DVI-D
-                 * output; reported to work by math_b on an NV20(!).
-                 */
-                fabricate_vga_output(dcb, entry->i2c_index, entry->heads);
-                break;
        case OUTPUT_LVDS:
                if ((conn & 0x00003f00) != 0x10)
                        entry->lvdsconf.use_straps_for_mode = true;
@@ -5808,6 +6135,31 @@ void merge_like_dcb_entries(struct drm_device *dev, struct dcb_table *dcb)
        dcb->entries = newentries;
 }
+static bool
+apply_dcb_encoder_quirks(struct drm_device *dev, int idx, u32 *conn, u32 *conf)
+{
+        /* Dell Precision M6300
+         *   DCB entry 2: 02025312 00000010
+         *   DCB entry 3: 02026312 00000020
+         *
+         * Identical, except apparently a different connector on a
+         * different SOR link.  Not a clue how we're supposed to know
+         * which one is in use if it even shares an i2c line...
+         *
+         * Ignore the connector on the second SOR link to prevent
+         * nasty problems until this is sorted (assuming it's not a
+         * VBIOS bug).
+         */
+        if ((dev->pdev->device == 0x040d) &&
+            (dev->pdev->subsystem_vendor == 0x1028) &&
+            (dev->pdev->subsystem_device == 0x019b)) {
+                if (*conn == 0x02026312 && *conf == 0x00000020)
+                        return false;
+        }
+        return true;
+}
 static int
 parse_dcb_table(struct drm_device *dev, struct nvbios *bios, bool twoHeads)
 {
@@ -5941,6 +6293,9 @@ parse_dcb_table(struct drm_device *dev, struct nvbios *bios, bool twoHeads)
                if ((connection & 0x0000000f) == 0x0000000f)
                        continue;
+                if (!apply_dcb_encoder_quirks(dev, i, &connection, &config))
+                        continue;
                NV_TRACEWARN(dev, "Raw DCB entry %d: %08x %08x\n",
                             dcb->entries, connection, config);
@@ -6196,9 +6551,8 @@ nouveau_run_vbios_init(struct drm_device *dev)
        struct nvbios *bios = &dev_priv->vbios;
        int i, ret = 0;
-        NVLockVgaCrtcs(dev, false);
+        /* Reset the BIOS head to 0. */
-        if (nv_two_heads(dev))
+        bios->state.crtchead = 0;
-                NVSetOwner(dev, bios->state.crtchead);
        if (bios->major_version < 5)    /* BMP only */
                load_nv17_hw_sequencer_ucode(dev, bios);
@@ -6231,8 +6585,6 @@ nouveau_run_vbios_init(struct drm_device *dev)
                }
        }
-        NVLockVgaCrtcs(dev, true);
        return ret;
 }
@@ -6253,7 +6605,6 @@ static bool
 nouveau_bios_posted(struct drm_device *dev)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
-        bool was_locked;
        unsigned htotal;
        if (dev_priv->chipset >= NV_50) {
@@ -6263,13 +6614,12 @@ nouveau_bios_posted(struct drm_device *dev)
                return true;
        }
-        was_locked = NVLockVgaCrtcs(dev, false);
        htotal  = NVReadVgaCrtc(dev, 0, 0x06);
        htotal |= (NVReadVgaCrtc(dev, 0, 0x07) & 0x01) << 8;
        htotal |= (NVReadVgaCrtc(dev, 0, 0x07) & 0x20) << 4;
        htotal |= (NVReadVgaCrtc(dev, 0, 0x25) & 0x01) << 10;
        htotal |= (NVReadVgaCrtc(dev, 0, 0x41) & 0x01) << 11;
-        NVLockVgaCrtcs(dev, was_locked);
        return (htotal != 0);
 }
@@ -6278,8 +6628,6 @@ nouveau_bios_init(struct drm_device *dev)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct nvbios *bios = &dev_priv->vbios;
-        uint32_t saved_nv_pextdev_boot_0;
-        bool was_locked;
        int ret;
        if (!NVInitVBIOS(dev))
@@ -6299,40 +6647,27 @@ nouveau_bios_init(struct drm_device *dev)
        if (!bios->major_version)       /* we don't run version 0 bios */
                return 0;
-        /* these will need remembering across a suspend */
-        saved_nv_pextdev_boot_0 = bios_rd32(bios, NV_PEXTDEV_BOOT_0);
-        bios->state.saved_nv_pfb_cfg0 = bios_rd32(bios, NV_PFB_CFG0);
        /* init script execution disabled */
        bios->execute = false;
        /* ... unless card isn't POSTed already */
        if (!nouveau_bios_posted(dev)) {
-                NV_INFO(dev, "Adaptor not initialised\n");
+                NV_INFO(dev, "Adaptor not initialised, "
-                if (dev_priv->card_type < NV_40) {
+                        "running VBIOS init tables.\n");
-                        NV_ERROR(dev, "Unable to POST this chipset\n");
-                        return -ENODEV;
-                }
-                NV_INFO(dev, "Running VBIOS init tables\n");
                bios->execute = true;
        }
-        bios_wr32(bios, NV_PEXTDEV_BOOT_0, saved_nv_pextdev_boot_0);
        ret = nouveau_run_vbios_init(dev);
        if (ret)
                return ret;
        /* feature_byte on BMP is poor, but init always sets CR4B */
-        was_locked = NVLockVgaCrtcs(dev, false);
        if (bios->major_version < 5)
                bios->is_mobile = NVReadVgaCrtc(dev, 0, NV_CIO_CRE_4B) & 0x40;
        /* all BIT systems need p_f_m_t for digital_min_front_porch */
        if (bios->is_mobile || bios->major_version >= 5)
                ret = parse_fp_mode_table(dev, bios);
-        NVLockVgaCrtcs(dev, was_locked);
        /* allow subsequent scripts to execute */
        bios->execute = true;
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h
index adf4ec2d06c0..024458a8d060 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.h
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.h
@@ -81,6 +81,7 @@ struct dcb_connector_table_entry {
        enum dcb_connector_type type;
        uint8_t index2;
        uint8_t gpio_tag;
+        void *drm;
 };
 struct dcb_connector_table {
@@ -117,6 +118,7 @@ struct dcb_entry {
                struct {
                        struct sor_conf sor;
                        bool use_straps_for_mode;
+                        bool use_acpi_for_edid;
                        bool use_power_scripts;
                } lvdsconf;
                struct {
@@ -249,8 +251,6 @@ struct nvbios {
        struct {
                int crtchead;
-                /* these need remembering across suspend */
-                uint32_t saved_nv_pfb_cfg0;
        } state;
        struct {
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 6f3c19522377..3ca8343c15df 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -461,9 +461,9 @@ nouveau_bo_move_accel_cleanup(struct nouveau_channel *chan,
                return ret;
        ret = ttm_bo_move_accel_cleanup(&nvbo->bo, fence, NULL,
-                                        evict, no_wait_reserve, no_wait_gpu, new_mem);
+                                        evict || (nvbo->channel &&
-        if (nvbo->channel && nvbo->channel != chan)
+                                                  nvbo->channel != chan),
-                ret = nouveau_fence_wait(fence, NULL, false, false);
+                                        no_wait_reserve, no_wait_gpu, new_mem);
        nouveau_fence_unref((void *)&fence);
        return ret;
 }
@@ -711,8 +711,7 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, bool intr,
                return ret;
        /* Software copy if the card isn't up and running yet. */
-        if (dev_priv->init_state != NOUVEAU_CARD_INIT_DONE ||
+        if (!dev_priv->channel) {
-            !dev_priv->channel) {
                ret = ttm_bo_move_memcpy(bo, evict, no_wait_reserve, no_wait_gpu, new_mem);
                goto out;
        }
@@ -783,7 +782,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
                break;
        case TTM_PL_VRAM:
                mem->bus.offset = mem->mm_node->start << PAGE_SHIFT;
-                mem->bus.base = drm_get_resource_start(dev, 1);
+                mem->bus.base = pci_resource_start(dev->pdev, 1);
                mem->bus.is_iomem = true;
                break;
        default:
diff --git a/drivers/gpu/drm/nouveau/nouveau_calc.c b/drivers/gpu/drm/nouveau/nouveau_calc.c
index 88f9bc0941eb..ca85da784846 100644
--- a/drivers/gpu/drm/nouveau/nouveau_calc.c
+++ b/drivers/gpu/drm/nouveau/nouveau_calc.c
@@ -200,7 +200,7 @@ nv04_update_arb(struct drm_device *dev, int VClk, int bpp,
        struct nv_sim_state sim_data;
        int MClk = nouveau_hw_get_clock(dev, MPLL);
        int NVClk = nouveau_hw_get_clock(dev, NVPLL);
-        uint32_t cfg1 = nvReadFB(dev, NV_PFB_CFG1);
+        uint32_t cfg1 = nvReadFB(dev, NV04_PFB_CFG1);
        sim_data.pclk_khz = VClk;
        sim_data.mclk_khz = MClk;
@@ -218,7 +218,7 @@ nv04_update_arb(struct drm_device *dev, int VClk, int bpp,
                sim_data.mem_latency = 3;
                sim_data.mem_page_miss = 10;
        } else {
-                sim_data.memory_type = nvReadFB(dev, NV_PFB_CFG0) & 0x1;
+                sim_data.memory_type = nvReadFB(dev, NV04_PFB_CFG0) & 0x1;
                sim_data.memory_width = (nvReadEXTDEV(dev, NV_PEXTDEV_BOOT_0) & 0x10) ? 128 : 64;
                sim_data.mem_latency = cfg1 & 0xf;
                sim_data.mem_page_miss = ((cfg1 >> 4) & 0xf) + ((cfg1 >> 31) & 0x1);
diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c
index 1fc57ef58295..90fdcda332be 100644
--- a/drivers/gpu/drm/nouveau/nouveau_channel.c
+++ b/drivers/gpu/drm/nouveau/nouveau_channel.c
@@ -62,7 +62,8 @@ nouveau_channel_pushbuf_ctxdma_init(struct nouveau_channel *chan)
                 * VRAM.
                 */
                ret = nouveau_gpuobj_dma_new(chan, NV_CLASS_DMA_IN_MEMORY,
-                                             drm_get_resource_start(dev, 1),
+                                             pci_resource_start(dev->pdev,
+                                             1),
                                             dev_priv->fb_available_size,
                                             NV_DMA_ACCESS_RO,
                                             NV_DMA_TARGET_PCI, &pushbuf);
@@ -257,9 +258,7 @@ nouveau_channel_free(struct nouveau_channel *chan)
        nouveau_debugfs_channel_fini(chan);
        /* Give outstanding push buffers a chance to complete */
-        spin_lock_irqsave(&chan->fence.lock, flags);
        nouveau_fence_update(chan);
-        spin_unlock_irqrestore(&chan->fence.lock, flags);
        if (chan->fence.sequence != chan->fence.sequence_ack) {
                struct nouveau_fence *fence = NULL;
@@ -368,8 +367,6 @@ nouveau_ioctl_fifo_alloc(struct drm_device *dev, void *data,
        struct nouveau_channel *chan;
        int ret;
-        NOUVEAU_CHECK_INITIALISED_WITH_RETURN;
        if (dev_priv->engine.graph.accel_blocked)
                return -ENODEV;
@@ -418,7 +415,6 @@ nouveau_ioctl_fifo_free(struct drm_device *dev, void *data,
        struct drm_nouveau_channel_free *cfree = data;
        struct nouveau_channel *chan;
-        NOUVEAU_CHECK_INITIALISED_WITH_RETURN;
        NOUVEAU_GET_USER_CHANNEL_WITH_RETURN(cfree->channel, file_priv, chan);
        nouveau_channel_free(chan);
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 149ed224c3cb..734e92635e83 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -102,63 +102,15 @@ nouveau_connector_destroy(struct drm_connector *drm_connector)
        kfree(drm_connector);
 }
-static void
-nouveau_connector_ddc_prepare(struct drm_connector *connector, int *flags)
-{
-        struct drm_nouveau_private *dev_priv = connector->dev->dev_private;
-        if (dev_priv->card_type >= NV_50)
-                return;
-        *flags = 0;
-        if (NVLockVgaCrtcs(dev_priv->dev, false))
-                *flags |= 1;
-        if (nv_heads_tied(dev_priv->dev))
-                *flags |= 2;
-        if (*flags & 2)
-                NVSetOwner(dev_priv->dev, 0); /* necessary? */
-}
-static void
-nouveau_connector_ddc_finish(struct drm_connector *connector, int flags)
-{
-        struct drm_nouveau_private *dev_priv = connector->dev->dev_private;
-        if (dev_priv->card_type >= NV_50)
-                return;
-        if (flags & 2)
-                NVSetOwner(dev_priv->dev, 4);
-        if (flags & 1)
-                NVLockVgaCrtcs(dev_priv->dev, true);
-}
 static struct nouveau_i2c_chan *
 nouveau_connector_ddc_detect(struct drm_connector *connector,
                             struct nouveau_encoder **pnv_encoder)
 {
        struct drm_device *dev = connector->dev;
-        uint8_t out_buf[] = { 0x0, 0x0}, buf[2];
+        int i;
-        int ret, flags, i;
-        struct i2c_msg msgs[] = {
-                {
-                        .addr = 0x50,
-                        .flags = 0,
-                        .len = 1,
-                        .buf = out_buf,
-                },
-                {
-                        .addr = 0x50,
-                        .flags = I2C_M_RD,
-                        .len = 1,
-                        .buf = buf,
-                }
-        };
        for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
-                struct nouveau_i2c_chan *i2c = NULL;
+                struct nouveau_i2c_chan *i2c;
                struct nouveau_encoder *nv_encoder;
                struct drm_mode_object *obj;
                int id;
@@ -171,17 +123,9 @@ nouveau_connector_ddc_detect(struct drm_connector *connector,
                if (!obj)
                        continue;
                nv_encoder = nouveau_encoder(obj_to_encoder(obj));
+                i2c = nouveau_i2c_find(dev, nv_encoder->dcb->i2c_index);
-                if (nv_encoder->dcb->i2c_index < 0xf)
+                if (i2c && nouveau_probe_i2c_addr(i2c, 0x50)) {
-                        i2c = nouveau_i2c_find(dev, nv_encoder->dcb->i2c_index);
-                if (!i2c)
-                        continue;
-                nouveau_connector_ddc_prepare(connector, &flags);
-                ret = i2c_transfer(&i2c->adapter, msgs, 2);
-                nouveau_connector_ddc_finish(connector, flags);
-                if (ret == 2) {
                        *pnv_encoder = nv_encoder;
                        return i2c;
                }
@@ -234,21 +178,7 @@ nouveau_connector_detect(struct drm_connector *connector)
        struct nouveau_connector *nv_connector = nouveau_connector(connector);
        struct nouveau_encoder *nv_encoder = NULL;
        struct nouveau_i2c_chan *i2c;
-        int type, flags;
+        int type;
-        if (nv_connector->dcb->type == DCB_CONNECTOR_LVDS)
-                nv_encoder = find_encoder_by_type(connector, OUTPUT_LVDS);
-        if (nv_encoder && nv_connector->native_mode) {
-                unsigned status = connector_status_connected;
-#if defined(CONFIG_ACPI_BUTTON) || \
-        (defined(CONFIG_ACPI_BUTTON_MODULE) && defined(MODULE))
-                if (!nouveau_ignorelid && !acpi_lid_open())
-                        status = connector_status_unknown;
-#endif
-                nouveau_connector_set_encoder(connector, nv_encoder);
-                return status;
-        }
        /* Cleanup the previous EDID block. */
        if (nv_connector->edid) {
@@ -259,9 +189,7 @@ nouveau_connector_detect(struct drm_connector *connector)
        i2c = nouveau_connector_ddc_detect(connector, &nv_encoder);
        if (i2c) {
-                nouveau_connector_ddc_prepare(connector, &flags);
                nv_connector->edid = drm_get_edid(connector, &i2c->adapter);
-                nouveau_connector_ddc_finish(connector, flags);
                drm_mode_connector_update_edid_property(connector,
                                                        nv_connector->edid);
                if (!nv_connector->edid) {
@@ -321,6 +249,85 @@ detect_analog:
        return connector_status_disconnected;
 }
+static enum drm_connector_status
+nouveau_connector_detect_lvds(struct drm_connector *connector)
+{
+        struct drm_device *dev = connector->dev;
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct nouveau_connector *nv_connector = nouveau_connector(connector);
+        struct nouveau_encoder *nv_encoder = NULL;
+        enum drm_connector_status status = connector_status_disconnected;
+        /* Cleanup the previous EDID block. */
+        if (nv_connector->edid) {
+                drm_mode_connector_update_edid_property(connector, NULL);
+                kfree(nv_connector->edid);
+                nv_connector->edid = NULL;
+        }
+        nv_encoder = find_encoder_by_type(connector, OUTPUT_LVDS);
+        if (!nv_encoder)
+                return connector_status_disconnected;
+        /* Try retrieving EDID via DDC */
+        if (!dev_priv->vbios.fp_no_ddc) {
+                status = nouveau_connector_detect(connector);
+                if (status == connector_status_connected)
+                        goto out;
+        }
+        /* On some laptops (Sony, i'm looking at you) there appears to
+         * be no direct way of accessing the panel's EDID.  The only
+         * option available to us appears to be to ask ACPI for help..
+         *
+         * It's important this check's before trying straps, one of the
+         * said manufacturer's laptops are configured in such a way
+         * the nouveau decides an entry in the VBIOS FP mode table is
+         * valid - it's not (rh#613284)
+         */
+        if (nv_encoder->dcb->lvdsconf.use_acpi_for_edid) {
+                if (!nouveau_acpi_edid(dev, connector)) {
+                        status = connector_status_connected;
+                        goto out;
+                }
+        }
+        /* If no EDID found above, and the VBIOS indicates a hardcoded
+         * modeline is avalilable for the panel, set it as the panel's
+         * native mode and exit.
+         */
+        if (nouveau_bios_fp_mode(dev, NULL) && (dev_priv->vbios.fp_no_ddc ||
+            nv_encoder->dcb->lvdsconf.use_straps_for_mode)) {
+                status = connector_status_connected;
+                goto out;
+        }
+        /* Still nothing, some VBIOS images have a hardcoded EDID block
+         * stored for the panel stored in them.
+         */
+        if (!dev_priv->vbios.fp_no_ddc) {
+                struct edid *edid =
+                        (struct edid *)nouveau_bios_embedded_edid(dev);
+                if (edid) {
+                        nv_connector->edid = kmalloc(EDID_LENGTH, GFP_KERNEL);
+                        *(nv_connector->edid) = *edid;
+                        status = connector_status_connected;
+                }
+        }
+out:
+#if defined(CONFIG_ACPI_BUTTON) || \
+        (defined(CONFIG_ACPI_BUTTON_MODULE) && defined(MODULE))
+        if (status == connector_status_connected &&
+            !nouveau_ignorelid && !acpi_lid_open())
+                status = connector_status_unknown;
+#endif
+        drm_mode_connector_update_edid_property(connector, nv_connector->edid);
+        nouveau_connector_set_encoder(connector, nv_encoder);
+        return status;
+}
 static void
 nouveau_connector_force(struct drm_connector *connector)
 {
@@ -441,7 +448,8 @@ nouveau_connector_native_mode(struct drm_connector *connector)
        int high_w = 0, high_h = 0, high_v = 0;
        list_for_each_entry(mode, &nv_connector->base.probed_modes, head) {
-                if (helper->mode_valid(connector, mode) != MODE_OK)
+                if (helper->mode_valid(connector, mode) != MODE_OK ||
+                    (mode->flags & DRM_MODE_FLAG_INTERLACE))
                        continue;
                /* Use preferred mode if there is one.. */
@@ -534,21 +542,27 @@ static int
 nouveau_connector_get_modes(struct drm_connector *connector)
 {
        struct drm_device *dev = connector->dev;
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct nouveau_connector *nv_connector = nouveau_connector(connector);
        struct nouveau_encoder *nv_encoder = nv_connector->detected_encoder;
        int ret = 0;
-        /* If we're not LVDS, destroy the previous native mode, the attached
+        /* destroy the native mode, the attached monitor could have changed.
-         * monitor could have changed.
         */
-        if (nv_connector->dcb->type != DCB_CONNECTOR_LVDS &&
+        if (nv_connector->native_mode) {
-            nv_connector->native_mode) {
                drm_mode_destroy(dev, nv_connector->native_mode);
                nv_connector->native_mode = NULL;
        }
        if (nv_connector->edid)
                ret = drm_add_edid_modes(connector, nv_connector->edid);
+        else
+        if (nv_encoder->dcb->type == OUTPUT_LVDS &&
+            (nv_encoder->dcb->lvdsconf.use_straps_for_mode ||
+             dev_priv->vbios.fp_no_ddc) && nouveau_bios_fp_mode(dev, NULL)) {
+                nv_connector->native_mode = drm_mode_create(dev);
+                nouveau_bios_fp_mode(dev, nv_connector->native_mode);
+        }
        /* Find the native mode if this is a digital panel, if we didn't
         * find any modes through DDC previously add the native mode to
@@ -569,7 +583,8 @@ nouveau_connector_get_modes(struct drm_connector *connector)
                ret = get_slave_funcs(nv_encoder)->
                        get_modes(to_drm_encoder(nv_encoder), connector);
-        if (nv_encoder->dcb->type == OUTPUT_LVDS)
+        if (nv_connector->dcb->type == DCB_CONNECTOR_LVDS ||
+            nv_connector->dcb->type == DCB_CONNECTOR_eDP)
                ret += nouveau_connector_scaler_modes_add(connector);
        return ret;
@@ -643,6 +658,44 @@ nouveau_connector_best_encoder(struct drm_connector *connector)
        return NULL;
 }
+void
+nouveau_connector_set_polling(struct drm_connector *connector)
+{
+        struct drm_device *dev = connector->dev;
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct drm_crtc *crtc;
+        bool spare_crtc = false;
+        list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
+                spare_crtc |= !crtc->enabled;
+        connector->polled = 0;
+        switch (connector->connector_type) {
+        case DRM_MODE_CONNECTOR_VGA:
+        case DRM_MODE_CONNECTOR_TV:
+                if (dev_priv->card_type >= NV_50 ||
+                    (nv_gf4_disp_arch(dev) && spare_crtc))
+                        connector->polled = DRM_CONNECTOR_POLL_CONNECT;
+                break;
+        case DRM_MODE_CONNECTOR_DVII:
+        case DRM_MODE_CONNECTOR_DVID:
+        case DRM_MODE_CONNECTOR_HDMIA:
+        case DRM_MODE_CONNECTOR_DisplayPort:
+        case DRM_MODE_CONNECTOR_eDP:
+                if (dev_priv->card_type >= NV_50)
+                        connector->polled = DRM_CONNECTOR_POLL_HPD;
+                else if (connector->connector_type == DRM_MODE_CONNECTOR_DVID ||
+                         spare_crtc)
+                        connector->polled = DRM_CONNECTOR_POLL_CONNECT;
+                break;
+        default:
+                break;
+        }
+}
 static const struct drm_connector_helper_funcs
 nouveau_connector_helper_funcs = {
        .get_modes = nouveau_connector_get_modes,
@@ -662,148 +715,74 @@ nouveau_connector_funcs = {
        .force = nouveau_connector_force
 };
-static int
+static const struct drm_connector_funcs
-nouveau_connector_create_lvds(struct drm_device *dev,
+nouveau_connector_funcs_lvds = {
-                              struct drm_connector *connector)
+        .dpms = drm_helper_connector_dpms,
-{
+        .save = NULL,
-        struct nouveau_connector *nv_connector = nouveau_connector(connector);
+        .restore = NULL,
-        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        .detect = nouveau_connector_detect_lvds,
-        struct nouveau_i2c_chan *i2c = NULL;
+        .destroy = nouveau_connector_destroy,
-        struct nouveau_encoder *nv_encoder;
+        .fill_modes = drm_helper_probe_single_connector_modes,
-        struct drm_display_mode native, *mode, *temp;
+        .set_property = nouveau_connector_set_property,
-        bool dummy, if_is_24bit = false;
+        .force = nouveau_connector_force
-        int ret, flags;
+};
-        nv_encoder = find_encoder_by_type(connector, OUTPUT_LVDS);
-        if (!nv_encoder)
-                return -ENODEV;
-        ret = nouveau_bios_parse_lvds_table(dev, 0, &dummy, &if_is_24bit);
-        if (ret) {
-                NV_ERROR(dev, "Error parsing LVDS table, disabling LVDS\n");
-                return ret;
-        }
-        nv_connector->use_dithering = !if_is_24bit;
-        /* Firstly try getting EDID over DDC, if allowed and I2C channel
-         * is available.
-         */
-        if (!dev_priv->vbios.fp_no_ddc && nv_encoder->dcb->i2c_index < 0xf)
-                i2c = nouveau_i2c_find(dev, nv_encoder->dcb->i2c_index);
-        if (i2c) {
-                nouveau_connector_ddc_prepare(connector, &flags);
-                nv_connector->edid = drm_get_edid(connector, &i2c->adapter);
-                nouveau_connector_ddc_finish(connector, flags);
-        }
-        /* If no EDID found above, and the VBIOS indicates a hardcoded
-         * modeline is avalilable for the panel, set it as the panel's
-         * native mode and exit.
-         */
-        if (!nv_connector->edid && nouveau_bios_fp_mode(dev, &native) &&
-             (nv_encoder->dcb->lvdsconf.use_straps_for_mode ||
-              dev_priv->vbios.fp_no_ddc)) {
-                nv_connector->native_mode = drm_mode_duplicate(dev, &native);
-                goto out;
-        }
-        /* Still nothing, some VBIOS images have a hardcoded EDID block
-         * stored for the panel stored in them.
-         */
-        if (!nv_connector->edid && !nv_connector->native_mode &&
-            !dev_priv->vbios.fp_no_ddc) {
-                struct edid *edid =
-                        (struct edid *)nouveau_bios_embedded_edid(dev);
-                if (edid) {
-                        nv_connector->edid = kmalloc(EDID_LENGTH, GFP_KERNEL);
-                        *(nv_connector->edid) = *edid;
-                }
-        }
-        if (!nv_connector->edid)
-                goto out;
-        /* We didn't find/use a panel mode from the VBIOS, so parse the EDID
-         * block and look for the preferred mode there.
-         */
-        ret = drm_add_edid_modes(connector, nv_connector->edid);
-        if (ret == 0)
-                goto out;
-        nv_connector->detected_encoder = nv_encoder;
-        nv_connector->native_mode = nouveau_connector_native_mode(connector);
-        list_for_each_entry_safe(mode, temp, &connector->probed_modes, head)
-                drm_mode_remove(connector, mode);
-out:
-        if (!nv_connector->native_mode) {
-                NV_ERROR(dev, "LVDS present in DCB table, but couldn't "
-                              "determine its native mode.  Disabling.\n");
-                return -ENODEV;
-        }
-        drm_mode_connector_update_edid_property(connector, nv_connector->edid);
-        return 0;
-}
-int
+struct drm_connector *
-nouveau_connector_create(struct drm_device *dev,
+nouveau_connector_create(struct drm_device *dev, int index)
-                         struct dcb_connector_table_entry *dcb)
 {
+        const struct drm_connector_funcs *funcs = &nouveau_connector_funcs;
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct nouveau_connector *nv_connector = NULL;
+        struct dcb_connector_table_entry *dcb = NULL;
        struct drm_connector *connector;
-        struct drm_encoder *encoder;
+        int type, ret = 0;
-        int ret, type;
        NV_DEBUG_KMS(dev, "\n");
+        if (index >= dev_priv->vbios.dcb.connector.entries)
+                return ERR_PTR(-EINVAL);
+        dcb = &dev_priv->vbios.dcb.connector.entry[index];
+        if (dcb->drm)
+                return dcb->drm;
        switch (dcb->type) {
-        case DCB_CONNECTOR_NONE:
-                return 0;
        case DCB_CONNECTOR_VGA:
-                NV_INFO(dev, "Detected a VGA connector\n");
                type = DRM_MODE_CONNECTOR_VGA;
                break;
        case DCB_CONNECTOR_TV_0:
        case DCB_CONNECTOR_TV_1:
        case DCB_CONNECTOR_TV_3:
-                NV_INFO(dev, "Detected a TV connector\n");
                type = DRM_MODE_CONNECTOR_TV;
                break;
        case DCB_CONNECTOR_DVI_I:
-                NV_INFO(dev, "Detected a DVI-I connector\n");
                type = DRM_MODE_CONNECTOR_DVII;
                break;
        case DCB_CONNECTOR_DVI_D:
-                NV_INFO(dev, "Detected a DVI-D connector\n");
                type = DRM_MODE_CONNECTOR_DVID;
                break;
        case DCB_CONNECTOR_HDMI_0:
        case DCB_CONNECTOR_HDMI_1:
-                NV_INFO(dev, "Detected a HDMI connector\n");
                type = DRM_MODE_CONNECTOR_HDMIA;
                break;
        case DCB_CONNECTOR_LVDS:
-                NV_INFO(dev, "Detected a LVDS connector\n");
                type = DRM_MODE_CONNECTOR_LVDS;
+                funcs = &nouveau_connector_funcs_lvds;
                break;
        case DCB_CONNECTOR_DP:
-                NV_INFO(dev, "Detected a DisplayPort connector\n");
                type = DRM_MODE_CONNECTOR_DisplayPort;
                break;
        case DCB_CONNECTOR_eDP:
-                NV_INFO(dev, "Detected an eDP connector\n");
                type = DRM_MODE_CONNECTOR_eDP;
                break;
        default:
                NV_ERROR(dev, "unknown connector type: 0x%02x!!\n", dcb->type);
-                return -EINVAL;
+                return ERR_PTR(-EINVAL);
        }
        nv_connector = kzalloc(sizeof(*nv_connector), GFP_KERNEL);
        if (!nv_connector)
-                return -ENOMEM;
+                return ERR_PTR(-ENOMEM);
        nv_connector->dcb = dcb;
        connector = &nv_connector->base;
@@ -811,27 +790,21 @@ nouveau_connector_create(struct drm_device *dev,
        connector->interlace_allowed = false;
        connector->doublescan_allowed = false;
-        drm_connector_init(dev, connector, &nouveau_connector_funcs, type);
+        drm_connector_init(dev, connector, funcs, type);
        drm_connector_helper_add(connector, &nouveau_connector_helper_funcs);
-        /* attach encoders */
+        /* Check if we need dithering enabled */
-        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+        if (dcb->type == DCB_CONNECTOR_LVDS) {
-                struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
+                bool dummy, is_24bit = false;
-                if (nv_encoder->dcb->connector != dcb->index)
-                        continue;
-                if (get_slave_funcs(nv_encoder))
-                        get_slave_funcs(nv_encoder)->create_resources(encoder, connector);
-                drm_mode_connector_attach_encoder(connector, encoder);
+                ret = nouveau_bios_parse_lvds_table(dev, 0, &dummy, &is_24bit);
-        }
+                if (ret) {
+                        NV_ERROR(dev, "Error parsing LVDS table, disabling "
+                                 "LVDS\n");
+                        goto fail;
+                }
-        if (!connector->encoder_ids[0]) {
+                nv_connector->use_dithering = !is_24bit;
-                NV_WARN(dev, "  no encoders, ignoring\n");
-                drm_connector_cleanup(connector);
-                kfree(connector);
-                return 0;
        }
        /* Init DVI-I specific properties */
@@ -841,12 +814,8 @@ nouveau_connector_create(struct drm_device *dev,
                drm_connector_attach_property(connector, dev->mode_config.dvi_i_select_subconnector_property, 0);
        }
-        if (dcb->type != DCB_CONNECTOR_LVDS)
-                nv_connector->use_dithering = false;
        switch (dcb->type) {
        case DCB_CONNECTOR_VGA:
-                connector->polled = DRM_CONNECTOR_POLL_CONNECT;
                if (dev_priv->card_type >= NV_50) {
                        drm_connector_attach_property(connector,
                                        dev->mode_config.scaling_mode_property,
@@ -858,17 +827,6 @@ nouveau_connector_create(struct drm_device *dev,
        case DCB_CONNECTOR_TV_3:
                nv_connector->scaling_mode = DRM_MODE_SCALE_NONE;
                break;
-        case DCB_CONNECTOR_DP:
-        case DCB_CONNECTOR_eDP:
-        case DCB_CONNECTOR_HDMI_0:
-        case DCB_CONNECTOR_HDMI_1:
-        case DCB_CONNECTOR_DVI_I:
-        case DCB_CONNECTOR_DVI_D:
-                if (dev_priv->card_type >= NV_50)
-                        connector->polled = DRM_CONNECTOR_POLL_HPD;
-                else
-                        connector->polled = DRM_CONNECTOR_POLL_CONNECT;
-                /* fall-through */
        default:
                nv_connector->scaling_mode = DRM_MODE_SCALE_FULLSCREEN;
@@ -882,15 +840,15 @@ nouveau_connector_create(struct drm_device *dev,
                break;
        }
+        nouveau_connector_set_polling(connector);
        drm_sysfs_connector_add(connector);
+        dcb->drm = connector;
+        return dcb->drm;
-        if (dcb->type == DCB_CONNECTOR_LVDS) {
+fail:
-                ret = nouveau_connector_create_lvds(dev, connector);
+        drm_connector_cleanup(connector);
-                if (ret) {
+        kfree(connector);
-                        connector->funcs->destroy(connector);
+        return ERR_PTR(ret);
-                        return ret;
-                }
-        }
-        return 0;
 }
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.h b/drivers/gpu/drm/nouveau/nouveau_connector.h
index 4ef38abc2d9c..0d2e668ccfe5 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.h
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.h
@@ -49,7 +49,10 @@ static inline struct nouveau_connector *nouveau_connector(
        return container_of(con, struct nouveau_connector, base);
 }
-int nouveau_connector_create(struct drm_device *,
+struct drm_connector *
-                             struct dcb_connector_table_entry *);
+nouveau_connector_create(struct drm_device *, int index);
+void
+nouveau_connector_set_polling(struct drm_connector *);
 #endif /* __NOUVEAU_CONNECTOR_H__ */
diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.c b/drivers/gpu/drm/nouveau/nouveau_dma.c
index 65c441a1999f..2e3c6caa97ee 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dma.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dma.c
@@ -92,11 +92,9 @@ nouveau_dma_init(struct nouveau_channel *chan)
                return ret;
        /* Map M2MF notifier object - fbcon. */
-        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+        ret = nouveau_bo_map(chan->notifier_bo);
-                ret = nouveau_bo_map(chan->notifier_bo);
+        if (ret)
-                if (ret)
+                return ret;
-                        return ret;
-        }
        /* Insert NOPS for NOUVEAU_DMA_SKIPS */
        ret = RING_SPACE(chan, NOUVEAU_DMA_SKIPS);
diff --git a/drivers/gpu/drm/nouveau/nouveau_dp.c b/drivers/gpu/drm/nouveau/nouveau_dp.c
index deeb21c6865c..33742b11188b 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dp.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dp.c
@@ -23,8 +23,10 @@
 */
 #include "drmP.h"
 #include "nouveau_drv.h"
 #include "nouveau_i2c.h"
+#include "nouveau_connector.h"
 #include "nouveau_encoder.h"
 static int
@@ -270,13 +272,39 @@ bool
 nouveau_dp_link_train(struct drm_encoder *encoder)
 {
        struct drm_device *dev = encoder->dev;
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct nouveau_gpio_engine *pgpio = &dev_priv->engine.gpio;
        struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
-        uint8_t config[4];
+        struct nouveau_connector *nv_connector;
-        uint8_t status[3];
+        struct bit_displayport_encoder_table *dpe;
+        int dpe_headerlen;
+        uint8_t config[4], status[3];
        bool cr_done, cr_max_vs, eq_done;
        int ret = 0, i, tries, voltage;
        NV_DEBUG_KMS(dev, "link training!!\n");
+        nv_connector = nouveau_encoder_connector_get(nv_encoder);
+        if (!nv_connector)
+                return false;
+        dpe = nouveau_bios_dp_table(dev, nv_encoder->dcb, &dpe_headerlen);
+        if (!dpe) {
+                NV_ERROR(dev, "SOR-%d: no DP encoder table!\n", nv_encoder->or);
+                return false;
+        }
+        /* disable hotplug detect, this flips around on some panels during
+         * link training.
+         */
+        pgpio->irq_enable(dev, nv_connector->dcb->gpio_tag, false);
+        if (dpe->script0) {
+                NV_DEBUG_KMS(dev, "SOR-%d: running DP script 0\n", nv_encoder->or);
+                nouveau_bios_run_init_table(dev, le16_to_cpu(dpe->script0),
+                                            nv_encoder->dcb);
+        }
 train:
        cr_done = eq_done = false;
@@ -403,6 +431,15 @@ stop:
                }
        }
+        if (dpe->script1) {
+                NV_DEBUG_KMS(dev, "SOR-%d: running DP script 1\n", nv_encoder->or);
+                nouveau_bios_run_init_table(dev, le16_to_cpu(dpe->script1),
+                                            nv_encoder->dcb);
+        }
+        /* re-enable hotplug detect */
+        pgpio->irq_enable(dev, nv_connector->dcb->gpio_tag, true);
        return eq_done;
 }
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
index 273770432298..1de5eb53e016 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
@@ -35,10 +35,6 @@
 #include "drm_pciids.h"
-MODULE_PARM_DESC(ctxfw, "Use external firmware blob for grctx init (NV40)");
-int nouveau_ctxfw = 0;
-module_param_named(ctxfw, nouveau_ctxfw, int, 0400);
 MODULE_PARM_DESC(noagp, "Disable AGP");
 int nouveau_noagp;
 module_param_named(noagp, nouveau_noagp, int, 0400);
@@ -56,7 +52,7 @@ int nouveau_vram_pushbuf;
 module_param_named(vram_pushbuf, nouveau_vram_pushbuf, int, 0400);
 MODULE_PARM_DESC(vram_notify, "Force DMA notifiers to be in VRAM");
-int nouveau_vram_notify = 1;
+int nouveau_vram_notify = 0;
 module_param_named(vram_notify, nouveau_vram_notify, int, 0400);
 MODULE_PARM_DESC(duallink, "Allow dual-link TMDS (>=GeForce 8)");
@@ -132,7 +128,7 @@ static struct drm_driver driver;
 static int __devinit
 nouveau_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
-        return drm_get_dev(pdev, ent, &driver);
+        return drm_get_pci_dev(pdev, ent, &driver);
 }
 static void
@@ -155,9 +151,6 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state)
        struct drm_crtc *crtc;
        int ret, i;
-        if (!drm_core_check_feature(dev, DRIVER_MODESET))
-                return -ENODEV;
        if (pm_state.event == PM_EVENT_PRETHAW)
                return 0;
@@ -257,9 +250,6 @@ nouveau_pci_resume(struct pci_dev *pdev)
        struct drm_crtc *crtc;
        int ret, i;
-        if (!drm_core_check_feature(dev, DRIVER_MODESET))
-                return -ENODEV;
        nouveau_fbcon_save_disable_accel(dev);
        NV_INFO(dev, "We're back, enabling device...\n");
@@ -269,6 +259,13 @@ nouveau_pci_resume(struct pci_dev *pdev)
                return -1;
        pci_set_master(dev->pdev);
+        /* Make sure the AGP controller is in a consistent state */
+        if (dev_priv->gart_info.type == NOUVEAU_GART_AGP)
+                nouveau_mem_reset_agp(dev);
+        /* Make the CRTCs accessible */
+        engine->display.early_init(dev);
        NV_INFO(dev, "POSTing device...\n");
        ret = nouveau_run_vbios_init(dev);
        if (ret)
@@ -323,7 +320,6 @@ nouveau_pci_resume(struct pci_dev *pdev)
        list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
                struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
-                int ret;
                ret = nouveau_bo_pin(nv_crtc->cursor.nvbo, TTM_PL_FLAG_VRAM);
                if (!ret)
@@ -332,11 +328,7 @@ nouveau_pci_resume(struct pci_dev *pdev)
                        NV_ERROR(dev, "Could not pin/map cursor.\n");
        }
-        if (dev_priv->card_type < NV_50) {
+        engine->display.init(dev);
-                nv04_display_restore(dev);
-                NVLockVgaCrtcs(dev, false);
-        } else
-                nv50_display_init(dev);
        list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
                struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
@@ -371,7 +363,8 @@ nouveau_pci_resume(struct pci_dev *pdev)
 static struct drm_driver driver = {
        .driver_features =
                DRIVER_USE_AGP | DRIVER_PCI_DMA | DRIVER_SG |
-                DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM,
+                DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM |
+                DRIVER_MODESET,
        .load = nouveau_load,
        .firstopen = nouveau_firstopen,
        .lastclose = nouveau_lastclose,
@@ -438,16 +431,18 @@ static int __init nouveau_init(void)
                        nouveau_modeset = 1;
        }
-        if (nouveau_modeset == 1) {
+        if (!nouveau_modeset)
-                driver.driver_features |= DRIVER_MODESET;
+                return 0;
-                nouveau_register_dsm_handler();
-        }
+        nouveau_register_dsm_handler();
        return drm_init(&driver);
 }
 static void __exit nouveau_exit(void)
 {
+        if (!nouveau_modeset)
+                return;
        drm_exit(&driver);
        nouveau_unregister_dsm_handler();
 }
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index c69719106489..e15db15dca77 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -123,14 +123,6 @@ nvbo_kmap_obj_iovirtual(struct nouveau_bo *nvbo)
        return ioptr;
 }
-struct mem_block {
-        struct mem_block *next;
-        struct mem_block *prev;
-        uint64_t start;
-        uint64_t size;
-        struct drm_file *file_priv; /* NULL: free, -1: heap, other: real files */
-};
 enum nouveau_flags {
        NV_NFORCE   = 0x10000000,
        NV_NFORCE2  = 0x20000000
@@ -149,7 +141,7 @@ struct nouveau_gpuobj {
        struct list_head list;
        struct nouveau_channel *im_channel;
-        struct mem_block *im_pramin;
+        struct drm_mm_node *im_pramin;
        struct nouveau_bo *im_backing;
        uint32_t im_backing_start;
        uint32_t *im_backing_suspend;
@@ -196,7 +188,7 @@ struct nouveau_channel {
                struct list_head pending;
                uint32_t sequence;
                uint32_t sequence_ack;
-                uint32_t last_sequence_irq;
+                atomic_t last_sequence_irq;
        } fence;
        /* DMA push buffer */
@@ -206,7 +198,7 @@ struct nouveau_channel {
        /* Notifier memory */
        struct nouveau_bo *notifier_bo;
-        struct mem_block *notifier_heap;
+        struct drm_mm notifier_heap;
        /* PFIFO context */
        struct nouveau_gpuobj_ref *ramfc;
@@ -224,7 +216,7 @@ struct nouveau_channel {
        /* Objects */
        struct nouveau_gpuobj_ref *ramin; /* Private instmem */
-        struct mem_block          *ramin_heap; /* Private PRAMIN heap */
+        struct drm_mm              ramin_heap; /* Private PRAMIN heap */
        struct nouveau_gpuobj_ref *ramht; /* Hash table */
        struct list_head           ramht_refs; /* Objects referenced by RAMHT */
@@ -277,8 +269,7 @@ struct nouveau_instmem_engine {
        void    (*clear)(struct drm_device *, struct nouveau_gpuobj *);
        int     (*bind)(struct drm_device *, struct nouveau_gpuobj *);
        int     (*unbind)(struct drm_device *, struct nouveau_gpuobj *);
-        void    (*prepare_access)(struct drm_device *, bool write);
+        void    (*flush)(struct drm_device *);
-        void    (*finish_access)(struct drm_device *);
 };
 struct nouveau_mc_engine {
@@ -303,10 +294,11 @@ struct nouveau_fb_engine {
 };
 struct nouveau_fifo_engine {
-        void *priv;
        int  channels;
+        struct nouveau_gpuobj_ref *playlist[2];
+        int cur_playlist;
        int  (*init)(struct drm_device *);
        void (*takedown)(struct drm_device *);
@@ -339,10 +331,11 @@ struct nouveau_pgraph_object_class {
 struct nouveau_pgraph_engine {
        struct nouveau_pgraph_object_class *grclass;
        bool accel_blocked;
-        void *ctxprog;
-        void *ctxvals;
        int grctx_size;
+        /* NV2x/NV3x context table (0x400780) */
+        struct nouveau_gpuobj_ref *ctx_table;
        int  (*init)(struct drm_device *);
        void (*takedown)(struct drm_device *);
@@ -358,6 +351,24 @@ struct nouveau_pgraph_engine {
                                  uint32_t size, uint32_t pitch);
 };
+struct nouveau_display_engine {
+        int (*early_init)(struct drm_device *);
+        void (*late_takedown)(struct drm_device *);
+        int (*create)(struct drm_device *);
+        int (*init)(struct drm_device *);
+        void (*destroy)(struct drm_device *);
+};
+struct nouveau_gpio_engine {
+        int  (*init)(struct drm_device *);
+        void (*takedown)(struct drm_device *);
+        int  (*get)(struct drm_device *, enum dcb_gpio_tag);
+        int  (*set)(struct drm_device *, enum dcb_gpio_tag, int state);
+        void (*irq_enable)(struct drm_device *, enum dcb_gpio_tag, bool on);
+};
 struct nouveau_engine {
        struct nouveau_instmem_engine instmem;
        struct nouveau_mc_engine      mc;
@@ -365,6 +376,8 @@ struct nouveau_engine {
        struct nouveau_fb_engine      fb;
        struct nouveau_pgraph_engine  graph;
        struct nouveau_fifo_engine    fifo;
+        struct nouveau_display_engine display;
+        struct nouveau_gpio_engine    gpio;
 };
 struct nouveau_pll_vals {
@@ -500,11 +513,6 @@ enum nouveau_card_type {
 struct drm_nouveau_private {
        struct drm_device *dev;
-        enum {
-                NOUVEAU_CARD_INIT_DOWN,
-                NOUVEAU_CARD_INIT_DONE,
-                NOUVEAU_CARD_INIT_FAILED
-        } init_state;
        /* the card type, takes NV_* as values */
        enum nouveau_card_type card_type;
@@ -525,7 +533,7 @@ struct drm_nouveau_private {
        struct list_head vbl_waiting;
        struct {
-                struct ttm_global_reference mem_global_ref;
+                struct drm_global_reference mem_global_ref;
                struct ttm_bo_global_ref bo_global_ref;
                struct ttm_bo_device bdev;
                spinlock_t bo_list_lock;
@@ -533,8 +541,6 @@ struct drm_nouveau_private {
                atomic_t validate_sequence;
        } ttm;
-        struct fb_info *fbdev_info;
        int fifo_alloc_count;
        struct nouveau_channel *fifos[NOUVEAU_MAX_CHANNEL_NR];
@@ -595,11 +601,7 @@ struct drm_nouveau_private {
        struct nouveau_gpuobj *vm_vram_pt[NV50_VM_VRAM_NR];
        int vm_vram_pt_nr;
-        struct mem_block *ramin_heap;
+        struct drm_mm ramin_heap;
-        /* context table pointed to be NV_PGRAPH_CHANNEL_CTX_TABLE (0x400780) */
-        uint32_t ctx_table_size;
-        struct nouveau_gpuobj_ref *ctx_table;
        struct list_head gpuobj_list;
@@ -618,6 +620,11 @@ struct drm_nouveau_private {
        struct backlight_device *backlight;
        struct nouveau_channel *evo;
+        struct {
+                struct dcb_entry *dcb;
+                u16 script;
+                u32 pclk;
+        } evo_irq;
        struct {
                struct dentry *channel_root;
@@ -652,14 +659,6 @@ nouveau_bo_ref(struct nouveau_bo *ref, struct nouveau_bo **pnvbo)
        return 0;
 }
-#define NOUVEAU_CHECK_INITIALISED_WITH_RETURN do {            \
-        struct drm_nouveau_private *nv = dev->dev_private;    \
-        if (nv->init_state != NOUVEAU_CARD_INIT_DONE) {       \
-                NV_ERROR(dev, "called without init\n");       \
-                return -EINVAL;                               \
-        }                                                     \
-} while (0)
 #define NOUVEAU_GET_USER_CHANNEL_WITH_RETURN(id, cl, ch) do {    \
        struct drm_nouveau_private *nv = dev->dev_private;       \
        if (!nouveau_channel_owner(dev, (cl), (id))) {           \
@@ -682,7 +681,6 @@ extern int nouveau_tv_disable;
 extern char *nouveau_tv_norm;
 extern int nouveau_reg_debug;
 extern char *nouveau_vbios;
-extern int nouveau_ctxfw;
 extern int nouveau_ignorelid;
 extern int nouveau_nofbaccel;
 extern int nouveau_noaccel;
@@ -707,17 +705,10 @@ extern bool nouveau_wait_for_idle(struct drm_device *);
 extern int  nouveau_card_init(struct drm_device *);
 /* nouveau_mem.c */
-extern int  nouveau_mem_init_heap(struct mem_block **, uint64_t start,
-                                 uint64_t size);
-extern struct mem_block *nouveau_mem_alloc_block(struct mem_block *,
-                                                 uint64_t size, int align2,
-                                                 struct drm_file *, int tail);
-extern void nouveau_mem_takedown(struct mem_block **heap);
-extern void nouveau_mem_free_block(struct mem_block *);
 extern int  nouveau_mem_detect(struct drm_device *dev);
-extern void nouveau_mem_release(struct drm_file *, struct mem_block *heap);
 extern int  nouveau_mem_init(struct drm_device *);
 extern int  nouveau_mem_init_agp(struct drm_device *);
+extern int  nouveau_mem_reset_agp(struct drm_device *);
 extern void nouveau_mem_close(struct drm_device *);
 extern struct nouveau_tile_reg *nv10_mem_set_tiling(struct drm_device *dev,
                                                    uint32_t addr,
@@ -857,11 +848,13 @@ void nouveau_register_dsm_handler(void);
 void nouveau_unregister_dsm_handler(void);
 int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len);
 bool nouveau_acpi_rom_supported(struct pci_dev *pdev);
+int nouveau_acpi_edid(struct drm_device *, struct drm_connector *);
 #else
 static inline void nouveau_register_dsm_handler(void) {}
 static inline void nouveau_unregister_dsm_handler(void) {}
 static inline bool nouveau_acpi_rom_supported(struct pci_dev *pdev) { return false; }
 static inline int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len) { return -EINVAL; }
+static inline int nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector) { return -EINVAL; }
 #endif
 /* nouveau_backlight.c */
@@ -924,6 +917,10 @@ extern void nv10_fb_takedown(struct drm_device *);
 extern void nv10_fb_set_region_tiling(struct drm_device *, int, uint32_t,
                                      uint32_t, uint32_t);
+/* nv30_fb.c */
+extern int  nv30_fb_init(struct drm_device *);
+extern void nv30_fb_takedown(struct drm_device *);
 /* nv40_fb.c */
 extern int  nv40_fb_init(struct drm_device *);
 extern void nv40_fb_takedown(struct drm_device *);
@@ -1035,12 +1032,6 @@ extern int  nv50_graph_unload_context(struct drm_device *);
 extern void nv50_graph_context_switch(struct drm_device *);
 extern int  nv50_grctx_init(struct nouveau_grctx *);
-/* nouveau_grctx.c */
-extern int  nouveau_grctx_prog_load(struct drm_device *);
-extern void nouveau_grctx_vals_load(struct drm_device *,
-                                    struct nouveau_gpuobj *);
-extern void nouveau_grctx_fini(struct drm_device *);
 /* nv04_instmem.c */
 extern int  nv04_instmem_init(struct drm_device *);
 extern void nv04_instmem_takedown(struct drm_device *);
@@ -1051,8 +1042,7 @@ extern int  nv04_instmem_populate(struct drm_device *, struct nouveau_gpuobj *,
 extern void nv04_instmem_clear(struct drm_device *, struct nouveau_gpuobj *);
 extern int  nv04_instmem_bind(struct drm_device *, struct nouveau_gpuobj *);
 extern int  nv04_instmem_unbind(struct drm_device *, struct nouveau_gpuobj *);
-extern void nv04_instmem_prepare_access(struct drm_device *, bool write);
+extern void nv04_instmem_flush(struct drm_device *);
-extern void nv04_instmem_finish_access(struct drm_device *);
 /* nv50_instmem.c */
 extern int  nv50_instmem_init(struct drm_device *);
@@ -1064,8 +1054,9 @@ extern int  nv50_instmem_populate(struct drm_device *, struct nouveau_gpuobj *,
 extern void nv50_instmem_clear(struct drm_device *, struct nouveau_gpuobj *);
 extern int  nv50_instmem_bind(struct drm_device *, struct nouveau_gpuobj *);
 extern int  nv50_instmem_unbind(struct drm_device *, struct nouveau_gpuobj *);
-extern void nv50_instmem_prepare_access(struct drm_device *, bool write);
+extern void nv50_instmem_flush(struct drm_device *);
-extern void nv50_instmem_finish_access(struct drm_device *);
+extern void nv84_instmem_flush(struct drm_device *);
+extern void nv50_vm_flush(struct drm_device *, int engine);
 /* nv04_mc.c */
 extern int  nv04_mc_init(struct drm_device *);
@@ -1088,13 +1079,14 @@ extern long nouveau_compat_ioctl(struct file *file, unsigned int cmd,
                                 unsigned long arg);
 /* nv04_dac.c */
-extern int nv04_dac_create(struct drm_device *dev, struct dcb_entry *entry);
+extern int nv04_dac_create(struct drm_connector *, struct dcb_entry *);
 extern uint32_t nv17_dac_sample_load(struct drm_encoder *encoder);
 extern int nv04_dac_output_offset(struct drm_encoder *encoder);
 extern void nv04_dac_update_dacclk(struct drm_encoder *encoder, bool enable);
+extern bool nv04_dac_in_use(struct drm_encoder *encoder);
 /* nv04_dfp.c */
-extern int nv04_dfp_create(struct drm_device *dev, struct dcb_entry *entry);
+extern int nv04_dfp_create(struct drm_connector *, struct dcb_entry *);
 extern int nv04_dfp_get_bound_head(struct drm_device *dev, struct dcb_entry *dcbent);
 extern void nv04_dfp_bind_head(struct drm_device *dev, struct dcb_entry *dcbent,
                               int head, bool dl);
@@ -1103,15 +1095,17 @@ extern void nv04_dfp_update_fp_control(struct drm_encoder *encoder, int mode);
 /* nv04_tv.c */
 extern int nv04_tv_identify(struct drm_device *dev, int i2c_index);
-extern int nv04_tv_create(struct drm_device *dev, struct dcb_entry *entry);
+extern int nv04_tv_create(struct drm_connector *, struct dcb_entry *);
 /* nv17_tv.c */
-extern int nv17_tv_create(struct drm_device *dev, struct dcb_entry *entry);
+extern int nv17_tv_create(struct drm_connector *, struct dcb_entry *);
 /* nv04_display.c */
+extern int nv04_display_early_init(struct drm_device *);
+extern void nv04_display_late_takedown(struct drm_device *);
 extern int nv04_display_create(struct drm_device *);
+extern int nv04_display_init(struct drm_device *);
 extern void nv04_display_destroy(struct drm_device *);
-extern void nv04_display_restore(struct drm_device *);
 /* nv04_crtc.c */
 extern int nv04_crtc_create(struct drm_device *, int index);
@@ -1147,7 +1141,6 @@ extern int nouveau_fence_wait(void *obj, void *arg, bool lazy, bool intr);
 extern int nouveau_fence_flush(void *obj, void *arg);
 extern void nouveau_fence_unref(void **obj);
 extern void *nouveau_fence_ref(void *obj);
-extern void nouveau_fence_handler(struct drm_device *dev, int channel);
 /* nouveau_gem.c */
 extern int nouveau_gem_new(struct drm_device *, struct nouveau_channel *,
@@ -1167,13 +1160,15 @@ extern int nouveau_gem_ioctl_cpu_fini(struct drm_device *, void *,
 extern int nouveau_gem_ioctl_info(struct drm_device *, void *,
                                  struct drm_file *);
-/* nv17_gpio.c */
+/* nv10_gpio.c */
-int nv17_gpio_get(struct drm_device *dev, enum dcb_gpio_tag tag);
+int nv10_gpio_get(struct drm_device *dev, enum dcb_gpio_tag tag);
-int nv17_gpio_set(struct drm_device *dev, enum dcb_gpio_tag tag, int state);
+int nv10_gpio_set(struct drm_device *dev, enum dcb_gpio_tag tag, int state);
 /* nv50_gpio.c */
+int nv50_gpio_init(struct drm_device *dev);
 int nv50_gpio_get(struct drm_device *dev, enum dcb_gpio_tag tag);
 int nv50_gpio_set(struct drm_device *dev, enum dcb_gpio_tag tag, int state);
+void nv50_gpio_irq_enable(struct drm_device *, enum dcb_gpio_tag, bool on);
 /* nv50_calc. */
 int nv50_calc_pll(struct drm_device *, struct pll_lims *, int clk,
@@ -1220,6 +1215,14 @@ static inline void nv_wr32(struct drm_device *dev, unsigned reg, u32 val)
        iowrite32_native(val, dev_priv->mmio + reg);
 }
+static inline void nv_mask(struct drm_device *dev, u32 reg, u32 mask, u32 val)
+{
+        u32 tmp = nv_rd32(dev, reg);
+        tmp &= ~mask;
+        tmp |= val;
+        nv_wr32(dev, reg, tmp);
+}
 static inline u8 nv_rd08(struct drm_device *dev, unsigned reg)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
diff --git a/drivers/gpu/drm/nouveau/nouveau_encoder.h b/drivers/gpu/drm/nouveau/nouveau_encoder.h
index e1df8209cd0f..a1a0d48ae70c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_encoder.h
+++ b/drivers/gpu/drm/nouveau/nouveau_encoder.h
@@ -38,13 +38,15 @@ struct nouveau_encoder {
        struct dcb_entry *dcb;
        int or;
+        /* different to drm_encoder.crtc, this reflects what's
+         * actually programmed on the hw, not the proposed crtc */
+        struct drm_crtc *crtc;
        struct drm_display_mode mode;
        int last_dpms;
        struct nv04_output_reg restore;
-        void (*disconnect)(struct nouveau_encoder *encoder);
        union {
                struct {
                        int mc_unknown;
@@ -71,8 +73,8 @@ static inline struct drm_encoder *to_drm_encoder(struct nouveau_encoder *enc)
 struct nouveau_connector *
 nouveau_encoder_connector_get(struct nouveau_encoder *encoder);
-int nv50_sor_create(struct drm_device *dev, struct dcb_entry *entry);
+int nv50_sor_create(struct drm_connector *, struct dcb_entry *);
-int nv50_dac_create(struct drm_device *dev, struct dcb_entry *entry);
+int nv50_dac_create(struct drm_connector *, struct dcb_entry *);
 struct bit_displayport_encoder_table {
        uint32_t match;
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index c9a4a0d2a115..2fb2444d2322 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -333,7 +333,7 @@ nouveau_fbcon_output_poll_changed(struct drm_device *dev)
        drm_fb_helper_hotplug_event(&dev_priv->nfbdev->helper);
 }
-int
+static int
 nouveau_fbcon_destroy(struct drm_device *dev, struct nouveau_fbdev *nfbdev)
 {
        struct nouveau_framebuffer *nouveau_fb = &nfbdev->nouveau_fb;
@@ -387,7 +387,8 @@ int nouveau_fbcon_init(struct drm_device *dev)
        dev_priv->nfbdev = nfbdev;
        nfbdev->helper.funcs = &nouveau_fbcon_helper_funcs;
-        ret = drm_fb_helper_init(dev, &nfbdev->helper, 2, 4);
+        ret = drm_fb_helper_init(dev, &nfbdev->helper,
+                                 nv_two_heads(dev) ? 2 : 1, 4);
        if (ret) {
                kfree(nfbdev);
                return ret;
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
index faddf53ff9ed..6b208ffafa8d 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -67,12 +67,13 @@ nouveau_fence_update(struct nouveau_channel *chan)
        if (USE_REFCNT)
                sequence = nvchan_rd32(chan, 0x48);
        else
-                sequence = chan->fence.last_sequence_irq;
+                sequence = atomic_read(&chan->fence.last_sequence_irq);
        if (chan->fence.sequence_ack == sequence)
                return;
        chan->fence.sequence_ack = sequence;
+        spin_lock(&chan->fence.lock);
        list_for_each_safe(entry, tmp, &chan->fence.pending) {
                fence = list_entry(entry, struct nouveau_fence, entry);
@@ -84,6 +85,7 @@ nouveau_fence_update(struct nouveau_channel *chan)
                if (sequence == chan->fence.sequence_ack)
                        break;
        }
+        spin_unlock(&chan->fence.lock);
 }
 int
@@ -119,7 +121,6 @@ nouveau_fence_emit(struct nouveau_fence *fence)
 {
        struct drm_nouveau_private *dev_priv = fence->channel->dev->dev_private;
        struct nouveau_channel *chan = fence->channel;
-        unsigned long flags;
        int ret;
        ret = RING_SPACE(chan, 2);
@@ -127,9 +128,7 @@ nouveau_fence_emit(struct nouveau_fence *fence)
                return ret;
        if (unlikely(chan->fence.sequence == chan->fence.sequence_ack - 1)) {
-                spin_lock_irqsave(&chan->fence.lock, flags);
                nouveau_fence_update(chan);
-                spin_unlock_irqrestore(&chan->fence.lock, flags);
                BUG_ON(chan->fence.sequence ==
                       chan->fence.sequence_ack - 1);
@@ -138,9 +137,9 @@ nouveau_fence_emit(struct nouveau_fence *fence)
        fence->sequence = ++chan->fence.sequence;
        kref_get(&fence->refcount);
-        spin_lock_irqsave(&chan->fence.lock, flags);
+        spin_lock(&chan->fence.lock);
        list_add_tail(&fence->entry, &chan->fence.pending);
-        spin_unlock_irqrestore(&chan->fence.lock, flags);
+        spin_unlock(&chan->fence.lock);
        BEGIN_RING(chan, NvSubSw, USE_REFCNT ? 0x0050 : 0x0150, 1);
        OUT_RING(chan, fence->sequence);
@@ -173,14 +172,11 @@ nouveau_fence_signalled(void *sync_obj, void *sync_arg)
 {
        struct nouveau_fence *fence = nouveau_fence(sync_obj);
        struct nouveau_channel *chan = fence->channel;
-        unsigned long flags;
        if (fence->signalled)
                return true;
-        spin_lock_irqsave(&chan->fence.lock, flags);
        nouveau_fence_update(chan);
-        spin_unlock_irqrestore(&chan->fence.lock, flags);
        return fence->signalled;
 }
@@ -190,8 +186,6 @@ nouveau_fence_wait(void *sync_obj, void *sync_arg, bool lazy, bool intr)
        unsigned long timeout = jiffies + (3 * DRM_HZ);
        int ret = 0;
-        __set_current_state(intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);
        while (1) {
                if (nouveau_fence_signalled(sync_obj, sync_arg))
                        break;
@@ -201,6 +195,8 @@ nouveau_fence_wait(void *sync_obj, void *sync_arg, bool lazy, bool intr)
                        break;
                }
+                __set_current_state(intr ? TASK_INTERRUPTIBLE
+                        : TASK_UNINTERRUPTIBLE);
                if (lazy)
                        schedule_timeout(1);
@@ -221,27 +217,12 @@ nouveau_fence_flush(void *sync_obj, void *sync_arg)
        return 0;
 }
-void
-nouveau_fence_handler(struct drm_device *dev, int channel)
-{
-        struct drm_nouveau_private *dev_priv = dev->dev_private;
-        struct nouveau_channel *chan = NULL;
-        if (channel >= 0 && channel < dev_priv->engine.fifo.channels)
-                chan = dev_priv->fifos[channel];
-        if (chan) {
-                spin_lock_irq(&chan->fence.lock);
-                nouveau_fence_update(chan);
-                spin_unlock_irq(&chan->fence.lock);
-        }
-}
 int
 nouveau_fence_init(struct nouveau_channel *chan)
 {
        INIT_LIST_HEAD(&chan->fence.pending);
        spin_lock_init(&chan->fence.lock);
+        atomic_set(&chan->fence.last_sequence_irq, 0);
        return 0;
 }
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index 69c76cf93407..547f2c24c1e7 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -137,8 +137,6 @@ nouveau_gem_ioctl_new(struct drm_device *dev, void *data,
        uint32_t flags = 0;
        int ret = 0;
-        NOUVEAU_CHECK_INITIALISED_WITH_RETURN;
        if (unlikely(dev_priv->ttm.bdev.dev_mapping == NULL))
                dev_priv->ttm.bdev.dev_mapping = dev_priv->dev->dev_mapping;
@@ -577,10 +575,9 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
        struct drm_nouveau_gem_pushbuf_bo *bo;
        struct nouveau_channel *chan;
        struct validate_op op;
-        struct nouveau_fence *fence = 0;
+        struct nouveau_fence *fence = NULL;
        int i, j, ret = 0, do_reloc = 0;
-        NOUVEAU_CHECK_INITIALISED_WITH_RETURN;
        NOUVEAU_GET_USER_CHANNEL_WITH_RETURN(req->channel, file_priv, chan);
        req->vram_available = dev_priv->fb_aper_free;
@@ -760,8 +757,6 @@ nouveau_gem_ioctl_cpu_prep(struct drm_device *dev, void *data,
        bool no_wait = !!(req->flags & NOUVEAU_GEM_CPU_PREP_NOWAIT);
        int ret = -EINVAL;
-        NOUVEAU_CHECK_INITIALISED_WITH_RETURN;
        gem = drm_gem_object_lookup(dev, file_priv, req->handle);
        if (!gem)
                return ret;
@@ -800,8 +795,6 @@ nouveau_gem_ioctl_cpu_fini(struct drm_device *dev, void *data,
        struct nouveau_bo *nvbo;
        int ret = -EINVAL;
-        NOUVEAU_CHECK_INITIALISED_WITH_RETURN;
        gem = drm_gem_object_lookup(dev, file_priv, req->handle);
        if (!gem)
                return ret;
@@ -827,8 +820,6 @@ nouveau_gem_ioctl_info(struct drm_device *dev, void *data,
        struct drm_gem_object *gem;
        int ret;
-        NOUVEAU_CHECK_INITIALISED_WITH_RETURN;
        gem = drm_gem_object_lookup(dev, file_priv, req->handle);
        if (!gem)
                return -EINVAL;
diff --git a/drivers/gpu/drm/nouveau/nouveau_grctx.c b/drivers/gpu/drm/nouveau/nouveau_grctx.c
deleted file mode 100644
index f731c5f60536..000000000000
--- a/drivers/gpu/drm/nouveau/nouveau_grctx.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright 2009 Red Hat Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: Ben Skeggs
- */
-#include <linux/firmware.h>
-#include <linux/slab.h>
-#include "drmP.h"
-#include "nouveau_drv.h"
-struct nouveau_ctxprog {
-        uint32_t signature;
-        uint8_t  version;
-        uint16_t length;
-        uint32_t data[];
-} __attribute__ ((packed));
-struct nouveau_ctxvals {
-        uint32_t signature;
-        uint8_t  version;
-        uint32_t length;
-        struct {
-                uint32_t offset;
-                uint32_t value;
-        } data[];
-} __attribute__ ((packed));
-int
-nouveau_grctx_prog_load(struct drm_device *dev)
-{
-        struct drm_nouveau_private *dev_priv = dev->dev_private;
-        struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;
-        const int chipset = dev_priv->chipset;
-        const struct firmware *fw;
-        const struct nouveau_ctxprog *cp;
-        const struct nouveau_ctxvals *cv;
-        char name[32];
-        int ret, i;
-        if (pgraph->accel_blocked)
-                return -ENODEV;
-        if (!pgraph->ctxprog) {
-                sprintf(name, "nouveau/nv%02x.ctxprog", chipset);
-                ret = request_firmware(&fw, name, &dev->pdev->dev);
-                if (ret) {
-                        NV_ERROR(dev, "No ctxprog for NV%02x\n", chipset);
-                        return ret;
-                }
-                pgraph->ctxprog = kmemdup(fw->data, fw->size, GFP_KERNEL);
-                if (!pgraph->ctxprog) {
-                        NV_ERROR(dev, "OOM copying ctxprog\n");
-                        release_firmware(fw);
-                        return -ENOMEM;
-                }
-                cp = pgraph->ctxprog;
-                if (le32_to_cpu(cp->signature) != 0x5043564e ||
-                    cp->version != 0 ||
-                    le16_to_cpu(cp->length) != ((fw->size - 7) / 4)) {
-                        NV_ERROR(dev, "ctxprog invalid\n");
-                        release_firmware(fw);
-                        nouveau_grctx_fini(dev);
-                        return -EINVAL;
-                }
-                release_firmware(fw);
-        }
-        if (!pgraph->ctxvals) {
-                sprintf(name, "nouveau/nv%02x.ctxvals", chipset);
-                ret = request_firmware(&fw, name, &dev->pdev->dev);
-                if (ret) {
-                        NV_ERROR(dev, "No ctxvals for NV%02x\n", chipset);
-                        nouveau_grctx_fini(dev);
-                        return ret;
-                }
-                pgraph->ctxvals = kmemdup(fw->data, fw->size, GFP_KERNEL);
-                if (!pgraph->ctxvals) {
-                        NV_ERROR(dev, "OOM copying ctxvals\n");
-                        release_firmware(fw);
-                        nouveau_grctx_fini(dev);
-                        return -ENOMEM;
-                }
-                cv = (void *)pgraph->ctxvals;
-                if (le32_to_cpu(cv->signature) != 0x5643564e ||
-                    cv->version != 0 ||
-                    le32_to_cpu(cv->length) != ((fw->size - 9) / 8)) {
-                        NV_ERROR(dev, "ctxvals invalid\n");
-                        release_firmware(fw);
-                        nouveau_grctx_fini(dev);
-                        return -EINVAL;
-                }
-                release_firmware(fw);
-        }
-        cp = pgraph->ctxprog;
-        nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_INDEX, 0);
-        for (i = 0; i < le16_to_cpu(cp->length); i++)
-                nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_DATA,
-                        le32_to_cpu(cp->data[i]));
-        return 0;
-}
-void
-nouveau_grctx_fini(struct drm_device *dev)
-{
-        struct drm_nouveau_private *dev_priv = dev->dev_private;
-        struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;
-        if (pgraph->ctxprog) {
-                kfree(pgraph->ctxprog);
-                pgraph->ctxprog = NULL;
-        }
-        if (pgraph->ctxvals) {
-                kfree(pgraph->ctxprog);
-                pgraph->ctxvals = NULL;
-        }
-}
-void
-nouveau_grctx_vals_load(struct drm_device *dev, struct nouveau_gpuobj *ctx)
-{
-        struct drm_nouveau_private *dev_priv = dev->dev_private;
-        struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;
-        struct nouveau_ctxvals *cv = pgraph->ctxvals;
-        int i;
-        if (!cv)
-                return;
-        for (i = 0; i < le32_to_cpu(cv->length); i++)
-                nv_wo32(dev, ctx, le32_to_cpu(cv->data[i].offset),
-                        le32_to_cpu(cv->data[i].value));
-}
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.c b/drivers/gpu/drm/nouveau/nouveau_i2c.c
index 316a3c7e6eb4..cb0cb34440c6 100644
--- a/drivers/gpu/drm/nouveau/nouveau_i2c.c
+++ b/drivers/gpu/drm/nouveau/nouveau_i2c.c
@@ -278,3 +278,45 @@ nouveau_i2c_find(struct drm_device *dev, int index)
        return i2c->chan;
 }
+bool
+nouveau_probe_i2c_addr(struct nouveau_i2c_chan *i2c, int addr)
+{
+        uint8_t buf[] = { 0 };
+        struct i2c_msg msgs[] = {
+                {
+                        .addr = addr,
+                        .flags = 0,
+                        .len = 1,
+                        .buf = buf,
+                },
+                {
+                        .addr = addr,
+                        .flags = I2C_M_RD,
+                        .len = 1,
+                        .buf = buf,
+                }
+        };
+        return i2c_transfer(&i2c->adapter, msgs, 2) == 2;
+}
+int
+nouveau_i2c_identify(struct drm_device *dev, const char *what,
+                     struct i2c_board_info *info, int index)
+{
+        struct nouveau_i2c_chan *i2c = nouveau_i2c_find(dev, index);
+        int i;
+        NV_DEBUG(dev, "Probing %ss on I2C bus: %d\n", what, index);
+        for (i = 0; info[i].addr; i++) {
+                if (nouveau_probe_i2c_addr(i2c, info[i].addr)) {
+                        NV_INFO(dev, "Detected %s: %s\n", what, info[i].type);
+                        return i;
+                }
+        }
+        NV_DEBUG(dev, "No devices found.\n");
+        return -ENODEV;
+}
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.h b/drivers/gpu/drm/nouveau/nouveau_i2c.h
index c8eaf7a9fcbb..6dd2f8713cd1 100644
--- a/drivers/gpu/drm/nouveau/nouveau_i2c.h
+++ b/drivers/gpu/drm/nouveau/nouveau_i2c.h
@@ -45,6 +45,9 @@ struct nouveau_i2c_chan {
 int nouveau_i2c_init(struct drm_device *, struct dcb_i2c_entry *, int index);
 void nouveau_i2c_fini(struct drm_device *, struct dcb_i2c_entry *);
 struct nouveau_i2c_chan *nouveau_i2c_find(struct drm_device *, int index);
+bool nouveau_probe_i2c_addr(struct nouveau_i2c_chan *i2c, int addr);
+int nouveau_i2c_identify(struct drm_device *dev, const char *what,
+                         struct i2c_board_info *info, int index);
 int nouveau_dp_i2c_aux_ch(struct i2c_adapter *, int mode, uint8_t write_byte,
                          uint8_t *read_byte);
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
index c1fd42b0dad1..a9f36ab256b7 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
@@ -35,162 +35,6 @@
 #include "drm_sarea.h"
 #include "nouveau_drv.h"
-static struct mem_block *
-split_block(struct mem_block *p, uint64_t start, uint64_t size,
-            struct drm_file *file_priv)
-{
-        /* Maybe cut off the start of an existing block */
-        if (start > p->start) {
-                struct mem_block *newblock =
-                        kmalloc(sizeof(*newblock), GFP_KERNEL);
-                if (!newblock)
-                        goto out;
-                newblock->start = start;
-                newblock->size = p->size - (start - p->start);
-                newblock->file_priv = NULL;
-                newblock->next = p->next;
-                newblock->prev = p;
-                p->next->prev = newblock;
-                p->next = newblock;
-                p->size -= newblock->size;
-                p = newblock;
-        }
-        /* Maybe cut off the end of an existing block */
-        if (size < p->size) {
-                struct mem_block *newblock =
-                        kmalloc(sizeof(*newblock), GFP_KERNEL);
-                if (!newblock)
-                        goto out;
-                newblock->start = start + size;
-                newblock->size = p->size - size;
-                newblock->file_priv = NULL;
-                newblock->next = p->next;
-                newblock->prev = p;
-                p->next->prev = newblock;
-                p->next = newblock;
-                p->size = size;
-        }
-out:
-        /* Our block is in the middle */
-        p->file_priv = file_priv;
-        return p;
-}
-struct mem_block *
-nouveau_mem_alloc_block(struct mem_block *heap, uint64_t size,
-                        int align2, struct drm_file *file_priv, int tail)
-{
-        struct mem_block *p;
-        uint64_t mask = (1 << align2) - 1;
-        if (!heap)
-                return NULL;
-        if (tail) {
-                list_for_each_prev(p, heap) {
-                        uint64_t start = ((p->start + p->size) - size) & ~mask;
-                        if (p->file_priv == NULL && start >= p->start &&
-                            start + size <= p->start + p->size)
-                                return split_block(p, start, size, file_priv);
-                }
-        } else {
-                list_for_each(p, heap) {
-                        uint64_t start = (p->start + mask) & ~mask;
-                        if (p->file_priv == NULL &&
-                            start + size <= p->start + p->size)
-                                return split_block(p, start, size, file_priv);
-                }
-        }
-        return NULL;
-}
-void nouveau_mem_free_block(struct mem_block *p)
-{
-        p->file_priv = NULL;
-        /* Assumes a single contiguous range.  Needs a special file_priv in
-         * 'heap' to stop it being subsumed.
-         */
-        if (p->next->file_priv == NULL) {
-                struct mem_block *q = p->next;
-                p->size += q->size;
-                p->next = q->next;
-                p->next->prev = p;
-                kfree(q);
-        }
-        if (p->prev->file_priv == NULL) {
-                struct mem_block *q = p->prev;
-                q->size += p->size;
-                q->next = p->next;
-                q->next->prev = q;
-                kfree(p);
-        }
-}
-/* Initialize.  How to check for an uninitialized heap?
- */
-int nouveau_mem_init_heap(struct mem_block **heap, uint64_t start,
-                          uint64_t size)
-{
-        struct mem_block *blocks = kmalloc(sizeof(*blocks), GFP_KERNEL);
-        if (!blocks)
-                return -ENOMEM;
-        *heap = kmalloc(sizeof(**heap), GFP_KERNEL);
-        if (!*heap) {
-                kfree(blocks);
-                return -ENOMEM;
-        }
-        blocks->start = start;
-        blocks->size = size;
-        blocks->file_priv = NULL;
-        blocks->next = blocks->prev = *heap;
-        memset(*heap, 0, sizeof(**heap));
-        (*heap)->file_priv = (struct drm_file *) -1;
-        (*heap)->next = (*heap)->prev = blocks;
-        return 0;
-}
-/*
- * Free all blocks associated with the releasing file_priv
- */
-void nouveau_mem_release(struct drm_file *file_priv, struct mem_block *heap)
-{
-        struct mem_block *p;
-        if (!heap || !heap->next)
-                return;
-        list_for_each(p, heap) {
-                if (p->file_priv == file_priv)
-                        p->file_priv = NULL;
-        }
-        /* Assumes a single contiguous range.  Needs a special file_priv in
-         * 'heap' to stop it being subsumed.
-         */
-        list_for_each(p, heap) {
-                while ((p->file_priv == NULL) &&
-                                        (p->next->file_priv == NULL) &&
-                                        (p->next != heap)) {
-                        struct mem_block *q = p->next;
-                        p->size += q->size;
-                        p->next = q->next;
-                        p->next->prev = p;
-                        kfree(q);
-                }
-        }
-}
 /*
 * NV10-NV40 tiling helpers
 */
@@ -299,7 +143,6 @@ nv50_mem_vm_bind_linear(struct drm_device *dev, uint64_t virt, uint32_t size,
                phys |= 0x30;
        }
-        dev_priv->engine.instmem.prepare_access(dev, true);
        while (size) {
                unsigned offset_h = upper_32_bits(phys);
                unsigned offset_l = lower_32_bits(phys);
@@ -331,36 +174,12 @@ nv50_mem_vm_bind_linear(struct drm_device *dev, uint64_t virt, uint32_t size,
                        }
                }
        }
-        dev_priv->engine.instmem.finish_access(dev);
+        dev_priv->engine.instmem.flush(dev);
-        nv_wr32(dev, 0x100c80, 0x00050001);
-        if (!nv_wait(0x100c80, 0x00000001, 0x00000000)) {
-                NV_ERROR(dev, "timeout: (0x100c80 & 1) == 0 (2)\n");
-                NV_ERROR(dev, "0x100c80 = 0x%08x\n", nv_rd32(dev, 0x100c80));
-                return -EBUSY;
-        }
-        nv_wr32(dev, 0x100c80, 0x00000001);
-        if (!nv_wait(0x100c80, 0x00000001, 0x00000000)) {
-                NV_ERROR(dev, "timeout: (0x100c80 & 1) == 0 (2)\n");
-                NV_ERROR(dev, "0x100c80 = 0x%08x\n", nv_rd32(dev, 0x100c80));
-                return -EBUSY;
-        }
-        nv_wr32(dev, 0x100c80, 0x00040001);
-        if (!nv_wait(0x100c80, 0x00000001, 0x00000000)) {
-                NV_ERROR(dev, "timeout: (0x100c80 & 1) == 0 (2)\n");
-                NV_ERROR(dev, "0x100c80 = 0x%08x\n", nv_rd32(dev, 0x100c80));
-                return -EBUSY;
-        }
-        nv_wr32(dev, 0x100c80, 0x00060001);
-        if (!nv_wait(0x100c80, 0x00000001, 0x00000000)) {
-                NV_ERROR(dev, "timeout: (0x100c80 & 1) == 0 (2)\n");
-                NV_ERROR(dev, "0x100c80 = 0x%08x\n", nv_rd32(dev, 0x100c80));
-                return -EBUSY;
-        }
+        nv50_vm_flush(dev, 5);
+        nv50_vm_flush(dev, 0);
+        nv50_vm_flush(dev, 4);
+        nv50_vm_flush(dev, 6);
        return 0;
 }
@@ -374,7 +193,6 @@ nv50_mem_vm_unbind(struct drm_device *dev, uint64_t virt, uint32_t size)
        virt -= dev_priv->vm_vram_base;
        pages = (size >> 16) << 1;
-        dev_priv->engine.instmem.prepare_access(dev, true);
        while (pages) {
                pgt = dev_priv->vm_vram_pt[virt >> 29];
                pte = (virt & 0x1ffe0000ULL) >> 15;
@@ -388,57 +206,19 @@ nv50_mem_vm_unbind(struct drm_device *dev, uint64_t virt, uint32_t size)
                while (pte < end)
                        nv_wo32(dev, pgt, pte++, 0);
        }
-        dev_priv->engine.instmem.finish_access(dev);
+        dev_priv->engine.instmem.flush(dev);
-        nv_wr32(dev, 0x100c80, 0x00050001);
-        if (!nv_wait(0x100c80, 0x00000001, 0x00000000)) {
-                NV_ERROR(dev, "timeout: (0x100c80 & 1) == 0 (2)\n");
-                NV_ERROR(dev, "0x100c80 = 0x%08x\n", nv_rd32(dev, 0x100c80));
-                return;
-        }
-        nv_wr32(dev, 0x100c80, 0x00000001);
-        if (!nv_wait(0x100c80, 0x00000001, 0x00000000)) {
-                NV_ERROR(dev, "timeout: (0x100c80 & 1) == 0 (2)\n");
-                NV_ERROR(dev, "0x100c80 = 0x%08x\n", nv_rd32(dev, 0x100c80));
-                return;
-        }
-        nv_wr32(dev, 0x100c80, 0x00040001);
-        if (!nv_wait(0x100c80, 0x00000001, 0x00000000)) {
-                NV_ERROR(dev, "timeout: (0x100c80 & 1) == 0 (2)\n");
-                NV_ERROR(dev, "0x100c80 = 0x%08x\n", nv_rd32(dev, 0x100c80));
-                return;
-        }
-        nv_wr32(dev, 0x100c80, 0x00060001);
+        nv50_vm_flush(dev, 5);
-        if (!nv_wait(0x100c80, 0x00000001, 0x00000000)) {
+        nv50_vm_flush(dev, 0);
-                NV_ERROR(dev, "timeout: (0x100c80 & 1) == 0 (2)\n");
+        nv50_vm_flush(dev, 4);
-                NV_ERROR(dev, "0x100c80 = 0x%08x\n", nv_rd32(dev, 0x100c80));
+        nv50_vm_flush(dev, 6);
-        }
 }
 /*
 * Cleanup everything
 */
-void nouveau_mem_takedown(struct mem_block **heap)
+void
-{
+nouveau_mem_close(struct drm_device *dev)
-        struct mem_block *p;
-        if (!*heap)
-                return;
-        for (p = (*heap)->next; p != *heap;) {
-                struct mem_block *q = p;
-                p = p->next;
-                kfree(q);
-        }
-        kfree(*heap);
-        *heap = NULL;
-}
-void nouveau_mem_close(struct drm_device *dev)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
@@ -449,8 +229,7 @@ void nouveau_mem_close(struct drm_device *dev)
        nouveau_ttm_global_release(dev_priv);
-        if (drm_core_has_AGP(dev) && dev->agp &&
+        if (drm_core_has_AGP(dev) && dev->agp) {
-            drm_core_check_feature(dev, DRIVER_MODESET)) {
                struct drm_agp_mem *entry, *tempe;
                /* Remove AGP resources, but leave dev->agp
@@ -471,28 +250,29 @@ void nouveau_mem_close(struct drm_device *dev)
        }
        if (dev_priv->fb_mtrr) {
-                drm_mtrr_del(dev_priv->fb_mtrr, drm_get_resource_start(dev, 1),
+                drm_mtrr_del(dev_priv->fb_mtrr,
-                             drm_get_resource_len(dev, 1), DRM_MTRR_WC);
+                             pci_resource_start(dev->pdev, 1),
-                dev_priv->fb_mtrr = 0;
+                             pci_resource_len(dev->pdev, 1), DRM_MTRR_WC);
+                dev_priv->fb_mtrr = -1;
        }
 }
 static uint32_t
 nouveau_mem_detect_nv04(struct drm_device *dev)
 {
-        uint32_t boot0 = nv_rd32(dev, NV03_BOOT_0);
+        uint32_t boot0 = nv_rd32(dev, NV04_PFB_BOOT_0);
        if (boot0 & 0x00000100)
                return (((boot0 >> 12) & 0xf) * 2 + 2) * 1024 * 1024;
-        switch (boot0 & NV03_BOOT_0_RAM_AMOUNT) {
+        switch (boot0 & NV04_PFB_BOOT_0_RAM_AMOUNT) {
-        case NV04_BOOT_0_RAM_AMOUNT_32MB:
+        case NV04_PFB_BOOT_0_RAM_AMOUNT_32MB:
                return 32 * 1024 * 1024;
-        case NV04_BOOT_0_RAM_AMOUNT_16MB:
+        case NV04_PFB_BOOT_0_RAM_AMOUNT_16MB:
                return 16 * 1024 * 1024;
-        case NV04_BOOT_0_RAM_AMOUNT_8MB:
+        case NV04_PFB_BOOT_0_RAM_AMOUNT_8MB:
                return 8 * 1024 * 1024;
-        case NV04_BOOT_0_RAM_AMOUNT_4MB:
+        case NV04_PFB_BOOT_0_RAM_AMOUNT_4MB:
                return 4 * 1024 * 1024;
        }
@@ -536,12 +316,18 @@ nouveau_mem_detect(struct drm_device *dev)
        } else
        if (dev_priv->flags & (NV_NFORCE | NV_NFORCE2)) {
                dev_priv->vram_size = nouveau_mem_detect_nforce(dev);
+        } else
+        if (dev_priv->card_type < NV_50) {
+                dev_priv->vram_size  = nv_rd32(dev, NV04_PFB_FIFO_DATA);
+                dev_priv->vram_size &= NV10_PFB_FIFO_DATA_RAM_AMOUNT_MB_MASK;
        } else {
-                dev_priv->vram_size  = nv_rd32(dev, NV04_FIFO_DATA);
+                dev_priv->vram_size = nv_rd32(dev, NV04_PFB_FIFO_DATA);
-                dev_priv->vram_size &= NV10_FIFO_DATA_RAM_AMOUNT_MB_MASK;
+                dev_priv->vram_size |= (dev_priv->vram_size & 0xff) << 32;
-                if (dev_priv->chipset == 0xaa || dev_priv->chipset == 0xac)
+                dev_priv->vram_size &= 0xffffffff00ll;
+                if (dev_priv->chipset == 0xaa || dev_priv->chipset == 0xac) {
                        dev_priv->vram_sys_base = nv_rd32(dev, 0x100e10);
                        dev_priv->vram_sys_base <<= 12;
+                }
        }
        NV_INFO(dev, "Detected %dMiB VRAM\n", (int)(dev_priv->vram_size >> 20));
@@ -555,18 +341,36 @@ nouveau_mem_detect(struct drm_device *dev)
        return -ENOMEM;
 }
-#if __OS_HAS_AGP
+int
-static void nouveau_mem_reset_agp(struct drm_device *dev)
+nouveau_mem_reset_agp(struct drm_device *dev)
 {
-        uint32_t saved_pci_nv_1, saved_pci_nv_19, pmc_enable;
+#if __OS_HAS_AGP
+        uint32_t saved_pci_nv_1, pmc_enable;
+        int ret;
+        /* First of all, disable fast writes, otherwise if it's
+         * already enabled in the AGP bridge and we disable the card's
+         * AGP controller we might be locking ourselves out of it. */
+        if (dev->agp->acquired) {
+                struct drm_agp_info info;
+                struct drm_agp_mode mode;
+                ret = drm_agp_info(dev, &info);
+                if (ret)
+                        return ret;
+                mode.mode = info.mode & ~0x10;
+                ret = drm_agp_enable(dev, mode);
+                if (ret)
+                        return ret;
+        }
        saved_pci_nv_1 = nv_rd32(dev, NV04_PBUS_PCI_NV_1);
-        saved_pci_nv_19 = nv_rd32(dev, NV04_PBUS_PCI_NV_19);
        /* clear busmaster bit */
        nv_wr32(dev, NV04_PBUS_PCI_NV_1, saved_pci_nv_1 & ~0x4);
-        /* clear SBA and AGP bits */
+        /* disable AGP */
-        nv_wr32(dev, NV04_PBUS_PCI_NV_19, saved_pci_nv_19 & 0xfffff0ff);
+        nv_wr32(dev, NV04_PBUS_PCI_NV_19, 0);
        /* power cycle pgraph, if enabled */
        pmc_enable = nv_rd32(dev, NV03_PMC_ENABLE);
@@ -578,11 +382,12 @@ static void nouveau_mem_reset_agp(struct drm_device *dev)
        }
        /* and restore (gives effect of resetting AGP) */
-        nv_wr32(dev, NV04_PBUS_PCI_NV_19, saved_pci_nv_19);
        nv_wr32(dev, NV04_PBUS_PCI_NV_1, saved_pci_nv_1);
-}
 #endif
+        return 0;
+}
 int
 nouveau_mem_init_agp(struct drm_device *dev)
 {
@@ -592,11 +397,6 @@ nouveau_mem_init_agp(struct drm_device *dev)
        struct drm_agp_mode mode;
        int ret;
-        if (nouveau_noagp)
-                return 0;
-        nouveau_mem_reset_agp(dev);
        if (!dev->agp->acquired) {
                ret = drm_agp_acquire(dev);
                if (ret) {
@@ -633,7 +433,7 @@ nouveau_mem_init(struct drm_device *dev)
        struct ttm_bo_device *bdev = &dev_priv->ttm.bdev;
        int ret, dma_bits = 32;
-        dev_priv->fb_phys = drm_get_resource_start(dev, 1);
+        dev_priv->fb_phys = pci_resource_start(dev->pdev, 1);
        dev_priv->gart_info.type = NOUVEAU_GART_NONE;
        if (dev_priv->card_type >= NV_50 &&
@@ -665,8 +465,9 @@ nouveau_mem_init(struct drm_device *dev)
        dev_priv->fb_available_size = dev_priv->vram_size;
        dev_priv->fb_mappable_pages = dev_priv->fb_available_size;
-        if (dev_priv->fb_mappable_pages > drm_get_resource_len(dev, 1))
+        if (dev_priv->fb_mappable_pages > pci_resource_len(dev->pdev, 1))
-                dev_priv->fb_mappable_pages = drm_get_resource_len(dev, 1);
+                dev_priv->fb_mappable_pages =
+                        pci_resource_len(dev->pdev, 1);
        dev_priv->fb_mappable_pages >>= PAGE_SHIFT;
        /* remove reserved space at end of vram from available amount */
@@ -692,7 +493,8 @@ nouveau_mem_init(struct drm_device *dev)
        /* GART */
 #if !defined(__powerpc__) && !defined(__ia64__)
-        if (drm_device_is_agp(dev) && dev->agp) {
+        if (drm_device_is_agp(dev) && dev->agp && !nouveau_noagp) {
+                nouveau_mem_reset_agp(dev);
                ret = nouveau_mem_init_agp(dev);
                if (ret)
                        NV_ERROR(dev, "Error initialising AGP: %d\n", ret);
@@ -718,8 +520,8 @@ nouveau_mem_init(struct drm_device *dev)
                return ret;
        }
-        dev_priv->fb_mtrr = drm_mtrr_add(drm_get_resource_start(dev, 1),
+        dev_priv->fb_mtrr = drm_mtrr_add(pci_resource_start(dev->pdev, 1),
-                                         drm_get_resource_len(dev, 1),
+                                         pci_resource_len(dev->pdev, 1),
                                         DRM_MTRR_WC);
        return 0;
diff --git a/drivers/gpu/drm/nouveau/nouveau_notifier.c b/drivers/gpu/drm/nouveau/nouveau_notifier.c
index 9537f3e30115..3ec181ff50ce 100644
--- a/drivers/gpu/drm/nouveau/nouveau_notifier.c
+++ b/drivers/gpu/drm/nouveau/nouveau_notifier.c
@@ -55,7 +55,7 @@ nouveau_notifier_init_channel(struct nouveau_channel *chan)
        if (ret)
                goto out_err;
-        ret = nouveau_mem_init_heap(&chan->notifier_heap, 0, ntfy->bo.mem.size);
+        ret = drm_mm_init(&chan->notifier_heap, 0, ntfy->bo.mem.size);
        if (ret)
                goto out_err;
@@ -80,7 +80,7 @@ nouveau_notifier_takedown_channel(struct nouveau_channel *chan)
        nouveau_bo_unpin(chan->notifier_bo);
        mutex_unlock(&dev->struct_mutex);
        drm_gem_object_unreference_unlocked(chan->notifier_bo->gem);
-        nouveau_mem_takedown(&chan->notifier_heap);
+        drm_mm_takedown(&chan->notifier_heap);
 }
 static void
@@ -90,7 +90,7 @@ nouveau_notifier_gpuobj_dtor(struct drm_device *dev,
        NV_DEBUG(dev, "\n");
        if (gpuobj->priv)
-                nouveau_mem_free_block(gpuobj->priv);
+                drm_mm_put_block(gpuobj->priv);
 }
 int
@@ -100,18 +100,13 @@ nouveau_notifier_alloc(struct nouveau_channel *chan, uint32_t handle,
        struct drm_device *dev = chan->dev;
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct nouveau_gpuobj *nobj = NULL;
-        struct mem_block *mem;
+        struct drm_mm_node *mem;
        uint32_t offset;
        int target, ret;
-        if (!chan->notifier_heap) {
+        mem = drm_mm_search_free(&chan->notifier_heap, size, 0, 0);
-                NV_ERROR(dev, "Channel %d doesn't have a notifier heap!\n",
+        if (mem)
-                         chan->id);
+                mem = drm_mm_get_block(mem, size, 0);
-                return -EINVAL;
-        }
-        mem = nouveau_mem_alloc_block(chan->notifier_heap, size, 0,
-                                      (struct drm_file *)-2, 0);
        if (!mem) {
                NV_ERROR(dev, "Channel %d notifier block full\n", chan->id);
                return -ENOMEM;
@@ -144,17 +139,17 @@ nouveau_notifier_alloc(struct nouveau_channel *chan, uint32_t handle,
                                     mem->size, NV_DMA_ACCESS_RW, target,
                                     &nobj);
        if (ret) {
-                nouveau_mem_free_block(mem);
+                drm_mm_put_block(mem);
                NV_ERROR(dev, "Error creating notifier ctxdma: %d\n", ret);
                return ret;
        }
-        nobj->dtor   = nouveau_notifier_gpuobj_dtor;
+        nobj->dtor = nouveau_notifier_gpuobj_dtor;
-        nobj->priv   = mem;
+        nobj->priv = mem;
        ret = nouveau_gpuobj_ref_add(dev, chan, handle, nobj, NULL);
        if (ret) {
                nouveau_gpuobj_del(dev, &nobj);
-                nouveau_mem_free_block(mem);
+                drm_mm_put_block(mem);
                NV_ERROR(dev, "Error referencing notifier ctxdma: %d\n", ret);
                return ret;
        }
@@ -170,7 +165,7 @@ nouveau_notifier_offset(struct nouveau_gpuobj *nobj, uint32_t *poffset)
                return -EINVAL;
        if (poffset) {
-                struct mem_block *mem = nobj->priv;
+                struct drm_mm_node *mem = nobj->priv;
                if (*poffset >= mem->size)
                        return false;
@@ -189,7 +184,6 @@ nouveau_ioctl_notifier_alloc(struct drm_device *dev, void *data,
        struct nouveau_channel *chan;
        int ret;
-        NOUVEAU_CHECK_INITIALISED_WITH_RETURN;
        NOUVEAU_GET_USER_CHANNEL_WITH_RETURN(na->channel, file_priv, chan);
        ret = nouveau_notifier_alloc(chan, na->handle, na->size, &na->offset);
diff --git a/drivers/gpu/drm/nouveau/nouveau_object.c b/drivers/gpu/drm/nouveau/nouveau_object.c
index e7c100ba63a1..b6bcb254f4ab 100644
--- a/drivers/gpu/drm/nouveau/nouveau_object.c
+++ b/drivers/gpu/drm/nouveau/nouveau_object.c
@@ -132,7 +132,6 @@ nouveau_ramht_insert(struct drm_device *dev, struct nouveau_gpuobj_ref *ref)
                }
        }
-        instmem->prepare_access(dev, true);
        co = ho = nouveau_ramht_hash_handle(dev, chan->id, ref->handle);
        do {
                if (!nouveau_ramht_entry_valid(dev, ramht, co)) {
@@ -143,7 +142,7 @@ nouveau_ramht_insert(struct drm_device *dev, struct nouveau_gpuobj_ref *ref)
                        nv_wo32(dev, ramht, (co + 4)/4, ctx);
                        list_add_tail(&ref->list, &chan->ramht_refs);
-                        instmem->finish_access(dev);
+                        instmem->flush(dev);
                        return 0;
                }
                NV_DEBUG(dev, "collision ch%d 0x%08x: h=0x%08x\n",
@@ -153,7 +152,6 @@ nouveau_ramht_insert(struct drm_device *dev, struct nouveau_gpuobj_ref *ref)
                if (co >= dev_priv->ramht_size)
                        co = 0;
        } while (co != ho);
-        instmem->finish_access(dev);
        NV_ERROR(dev, "RAMHT space exhausted. ch=%d\n", chan->id);
        return -ENOMEM;
@@ -173,7 +171,6 @@ nouveau_ramht_remove(struct drm_device *dev, struct nouveau_gpuobj_ref *ref)
                return;
        }
-        instmem->prepare_access(dev, true);
        co = ho = nouveau_ramht_hash_handle(dev, chan->id, ref->handle);
        do {
                if (nouveau_ramht_entry_valid(dev, ramht, co) &&
@@ -186,7 +183,7 @@ nouveau_ramht_remove(struct drm_device *dev, struct nouveau_gpuobj_ref *ref)
                        nv_wo32(dev, ramht, (co + 4)/4, 0x00000000);
                        list_del(&ref->list);
-                        instmem->finish_access(dev);
+                        instmem->flush(dev);
                        return;
                }
@@ -195,7 +192,6 @@ nouveau_ramht_remove(struct drm_device *dev, struct nouveau_gpuobj_ref *ref)
                        co = 0;
        } while (co != ho);
        list_del(&ref->list);
-        instmem->finish_access(dev);
        NV_ERROR(dev, "RAMHT entry not found. ch=%d, handle=0x%08x\n",
                 chan->id, ref->handle);
@@ -209,7 +205,7 @@ nouveau_gpuobj_new(struct drm_device *dev, struct nouveau_channel *chan,
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct nouveau_engine *engine = &dev_priv->engine;
        struct nouveau_gpuobj *gpuobj;
-        struct mem_block *pramin = NULL;
+        struct drm_mm *pramin = NULL;
        int ret;
        NV_DEBUG(dev, "ch%d size=%u align=%d flags=0x%08x\n",
@@ -233,25 +229,12 @@ nouveau_gpuobj_new(struct drm_device *dev, struct nouveau_channel *chan,
         * available.
         */
        if (chan) {
-                if (chan->ramin_heap) {
+                NV_DEBUG(dev, "channel heap\n");
-                        NV_DEBUG(dev, "private heap\n");
+                pramin = &chan->ramin_heap;
-                        pramin = chan->ramin_heap;
-                } else
-                if (dev_priv->card_type < NV_50) {
-                        NV_DEBUG(dev, "global heap fallback\n");
-                        pramin = dev_priv->ramin_heap;
-                }
        } else {
                NV_DEBUG(dev, "global heap\n");
-                pramin = dev_priv->ramin_heap;
+                pramin = &dev_priv->ramin_heap;
-        }
-        if (!pramin) {
-                NV_ERROR(dev, "No PRAMIN heap!\n");
-                return -EINVAL;
-        }
-        if (!chan) {
                ret = engine->instmem.populate(dev, gpuobj, &size);
                if (ret) {
                        nouveau_gpuobj_del(dev, &gpuobj);
@@ -260,9 +243,10 @@ nouveau_gpuobj_new(struct drm_device *dev, struct nouveau_channel *chan,
        }
        /* Allocate a chunk of the PRAMIN aperture */
-        gpuobj->im_pramin = nouveau_mem_alloc_block(pramin, size,
+        gpuobj->im_pramin = drm_mm_search_free(pramin, size, align, 0);
-                                                    drm_order(align),
+        if (gpuobj->im_pramin)
-                                                    (struct drm_file *)-2, 0);
+                gpuobj->im_pramin = drm_mm_get_block(gpuobj->im_pramin, size, align);
        if (!gpuobj->im_pramin) {
                nouveau_gpuobj_del(dev, &gpuobj);
                return -ENOMEM;
@@ -279,10 +263,9 @@ nouveau_gpuobj_new(struct drm_device *dev, struct nouveau_channel *chan,
        if (gpuobj->flags & NVOBJ_FLAG_ZERO_ALLOC) {
                int i;
-                engine->instmem.prepare_access(dev, true);
                for (i = 0; i < gpuobj->im_pramin->size; i += 4)
                        nv_wo32(dev, gpuobj, i/4, 0);
-                engine->instmem.finish_access(dev);
+                engine->instmem.flush(dev);
        }
        *gpuobj_ret = gpuobj;
@@ -370,10 +353,9 @@ nouveau_gpuobj_del(struct drm_device *dev, struct nouveau_gpuobj **pgpuobj)
        }
        if (gpuobj->im_pramin && (gpuobj->flags & NVOBJ_FLAG_ZERO_FREE)) {
-                engine->instmem.prepare_access(dev, true);
                for (i = 0; i < gpuobj->im_pramin->size; i += 4)
                        nv_wo32(dev, gpuobj, i/4, 0);
-                engine->instmem.finish_access(dev);
+                engine->instmem.flush(dev);
        }
        if (gpuobj->dtor)
@@ -386,7 +368,7 @@ nouveau_gpuobj_del(struct drm_device *dev, struct nouveau_gpuobj **pgpuobj)
                if (gpuobj->flags & NVOBJ_FLAG_FAKE)
                        kfree(gpuobj->im_pramin);
                else
-                        nouveau_mem_free_block(gpuobj->im_pramin);
+                        drm_mm_put_block(gpuobj->im_pramin);
        }
        list_del(&gpuobj->list);
@@ -589,7 +571,7 @@ nouveau_gpuobj_new_fake(struct drm_device *dev, uint32_t p_offset,
        list_add_tail(&gpuobj->list, &dev_priv->gpuobj_list);
        if (p_offset != ~0) {
-                gpuobj->im_pramin = kzalloc(sizeof(struct mem_block),
+                gpuobj->im_pramin = kzalloc(sizeof(struct drm_mm_node),
                                            GFP_KERNEL);
                if (!gpuobj->im_pramin) {
                        nouveau_gpuobj_del(dev, &gpuobj);
@@ -605,10 +587,9 @@ nouveau_gpuobj_new_fake(struct drm_device *dev, uint32_t p_offset,
        }
        if (gpuobj->flags & NVOBJ_FLAG_ZERO_ALLOC) {
-                dev_priv->engine.instmem.prepare_access(dev, true);
                for (i = 0; i < gpuobj->im_pramin->size; i += 4)
                        nv_wo32(dev, gpuobj, i/4, 0);
-                dev_priv->engine.instmem.finish_access(dev);
+                dev_priv->engine.instmem.flush(dev);
        }
        if (pref) {
@@ -696,8 +677,6 @@ nouveau_gpuobj_dma_new(struct nouveau_channel *chan, int class,
                return ret;
        }
-        instmem->prepare_access(dev, true);
        if (dev_priv->card_type < NV_50) {
                uint32_t frame, adjust, pte_flags = 0;
@@ -734,7 +713,7 @@ nouveau_gpuobj_dma_new(struct nouveau_channel *chan, int class,
                nv_wo32(dev, *gpuobj, 5, flags5);
        }
-        instmem->finish_access(dev);
+        instmem->flush(dev);
        (*gpuobj)->engine = NVOBJ_ENGINE_SW;
        (*gpuobj)->class  = class;
@@ -849,7 +828,6 @@ nouveau_gpuobj_gr_new(struct nouveau_channel *chan, int class,
                return ret;
        }
-        dev_priv->engine.instmem.prepare_access(dev, true);
        if (dev_priv->card_type >= NV_50) {
                nv_wo32(dev, *gpuobj, 0, class);
                nv_wo32(dev, *gpuobj, 5, 0x00010000);
@@ -874,7 +852,7 @@ nouveau_gpuobj_gr_new(struct nouveau_channel *chan, int class,
                        }
                }
        }
-        dev_priv->engine.instmem.finish_access(dev);
+        dev_priv->engine.instmem.flush(dev);
        (*gpuobj)->engine = NVOBJ_ENGINE_GR;
        (*gpuobj)->class  = class;
@@ -920,6 +898,7 @@ nouveau_gpuobj_channel_init_pramin(struct nouveau_channel *chan)
        base = 0;
        /* PGRAPH context */
+        size += dev_priv->engine.graph.grctx_size;
        if (dev_priv->card_type == NV_50) {
                /* Various fixed table thingos */
@@ -930,12 +909,8 @@ nouveau_gpuobj_channel_init_pramin(struct nouveau_channel *chan)
                size += 0x8000;
                /* RAMFC */
                size += 0x1000;
-                /* PGRAPH context */
-                size += 0x70000;
        }
-        NV_DEBUG(dev, "ch%d PRAMIN size: 0x%08x bytes, base alloc=0x%08x\n",
-                 chan->id, size, base);
        ret = nouveau_gpuobj_new_ref(dev, NULL, NULL, 0, size, 0x1000, 0,
                                     &chan->ramin);
        if (ret) {
@@ -944,8 +919,7 @@ nouveau_gpuobj_channel_init_pramin(struct nouveau_channel *chan)
        }
        pramin = chan->ramin->gpuobj;
-        ret = nouveau_mem_init_heap(&chan->ramin_heap,
+        ret = drm_mm_init(&chan->ramin_heap, pramin->im_pramin->start + base, size);
-                                    pramin->im_pramin->start + base, size);
        if (ret) {
                NV_ERROR(dev, "Error creating PRAMIN heap: %d\n", ret);
                nouveau_gpuobj_ref_del(dev, &chan->ramin);
@@ -969,15 +943,11 @@ nouveau_gpuobj_channel_init(struct nouveau_channel *chan,
        NV_DEBUG(dev, "ch%d vram=0x%08x tt=0x%08x\n", chan->id, vram_h, tt_h);
-        /* Reserve a block of PRAMIN for the channel
+        /* Allocate a chunk of memory for per-channel object storage */
-         *XXX: maybe on <NV50 too at some point
+        ret = nouveau_gpuobj_channel_init_pramin(chan);
-         */
+        if (ret) {
-        if (0 || dev_priv->card_type == NV_50) {
+                NV_ERROR(dev, "init pramin\n");
-                ret = nouveau_gpuobj_channel_init_pramin(chan);
+                return ret;
-                if (ret) {
-                        NV_ERROR(dev, "init pramin\n");
-                        return ret;
-                }
        }
        /* NV50 VM
@@ -988,17 +958,13 @@ nouveau_gpuobj_channel_init(struct nouveau_channel *chan,
        if (dev_priv->card_type >= NV_50) {
                uint32_t vm_offset, pde;
-                instmem->prepare_access(dev, true);
                vm_offset = (dev_priv->chipset & 0xf0) == 0x50 ? 0x1400 : 0x200;
                vm_offset += chan->ramin->gpuobj->im_pramin->start;
                ret = nouveau_gpuobj_new_fake(dev, vm_offset, ~0, 0x4000,
                                                        0, &chan->vm_pd, NULL);
-                if (ret) {
+                if (ret)
-                        instmem->finish_access(dev);
                        return ret;
-                }
                for (i = 0; i < 0x4000; i += 8) {
                        nv_wo32(dev, chan->vm_pd, (i+0)/4, 0x00000000);
                        nv_wo32(dev, chan->vm_pd, (i+4)/4, 0xdeadcafe);
@@ -1008,10 +974,8 @@ nouveau_gpuobj_channel_init(struct nouveau_channel *chan,
                ret = nouveau_gpuobj_ref_add(dev, NULL, 0,
                                             dev_priv->gart_info.sg_ctxdma,
                                             &chan->vm_gart_pt);
-                if (ret) {
+                if (ret)
-                        instmem->finish_access(dev);
                        return ret;
-                }
                nv_wo32(dev, chan->vm_pd, pde++,
                            chan->vm_gart_pt->instance | 0x03);
                nv_wo32(dev, chan->vm_pd, pde++, 0x00000000);
@@ -1021,17 +985,15 @@ nouveau_gpuobj_channel_init(struct nouveau_channel *chan,
                        ret = nouveau_gpuobj_ref_add(dev, NULL, 0,
                                                     dev_priv->vm_vram_pt[i],
                                                     &chan->vm_vram_pt[i]);
-                        if (ret) {
+                        if (ret)
-                                instmem->finish_access(dev);
                                return ret;
-                        }
                        nv_wo32(dev, chan->vm_pd, pde++,
                                    chan->vm_vram_pt[i]->instance | 0x61);
                        nv_wo32(dev, chan->vm_pd, pde++, 0x00000000);
                }
-                instmem->finish_access(dev);
+                instmem->flush(dev);
        }
        /* RAMHT */
@@ -1130,8 +1092,8 @@ nouveau_gpuobj_channel_takedown(struct nouveau_channel *chan)
        for (i = 0; i < dev_priv->vm_vram_pt_nr; i++)
                nouveau_gpuobj_ref_del(dev, &chan->vm_vram_pt[i]);
-        if (chan->ramin_heap)
+        if (chan->ramin_heap.free_stack.next)
-                nouveau_mem_takedown(&chan->ramin_heap);
+                drm_mm_takedown(&chan->ramin_heap);
        if (chan->ramin)
                nouveau_gpuobj_ref_del(dev, &chan->ramin);
@@ -1164,10 +1126,8 @@ nouveau_gpuobj_suspend(struct drm_device *dev)
                        return -ENOMEM;
                }
-                dev_priv->engine.instmem.prepare_access(dev, false);
                for (i = 0; i < gpuobj->im_pramin->size / 4; i++)
                        gpuobj->im_backing_suspend[i] = nv_ro32(dev, gpuobj, i);
-                dev_priv->engine.instmem.finish_access(dev);
        }
        return 0;
@@ -1212,10 +1172,9 @@ nouveau_gpuobj_resume(struct drm_device *dev)
                if (!gpuobj->im_backing_suspend)
                        continue;
-                dev_priv->engine.instmem.prepare_access(dev, true);
                for (i = 0; i < gpuobj->im_pramin->size / 4; i++)
                        nv_wo32(dev, gpuobj, i, gpuobj->im_backing_suspend[i]);
-                dev_priv->engine.instmem.finish_access(dev);
+                dev_priv->engine.instmem.flush(dev);
        }
        nouveau_gpuobj_suspend_cleanup(dev);
@@ -1232,7 +1191,6 @@ int nouveau_ioctl_grobj_alloc(struct drm_device *dev, void *data,
        struct nouveau_channel *chan;
        int ret;
-        NOUVEAU_CHECK_INITIALISED_WITH_RETURN;
        NOUVEAU_GET_USER_CHANNEL_WITH_RETURN(init->channel, file_priv, chan);
        if (init->handle == ~0)
@@ -1283,7 +1241,6 @@ int nouveau_ioctl_gpuobj_free(struct drm_device *dev, void *data,
        struct nouveau_channel *chan;
        int ret;
-        NOUVEAU_CHECK_INITIALISED_WITH_RETURN;
        NOUVEAU_GET_USER_CHANNEL_WITH_RETURN(objfree->channel, file_priv, chan);
        ret = nouveau_gpuobj_ref_find(chan, objfree->handle, &ref);
diff --git a/drivers/gpu/drm/nouveau/nouveau_reg.h b/drivers/gpu/drm/nouveau/nouveau_reg.h
index 6ca80a3fe70d..9c1056cb8a90 100644
--- a/drivers/gpu/drm/nouveau/nouveau_reg.h
+++ b/drivers/gpu/drm/nouveau/nouveau_reg.h
@@ -1,19 +1,64 @@
+#define NV04_PFB_BOOT_0                                         0x00100000
+#       define NV04_PFB_BOOT_0_RAM_AMOUNT                       0x00000003
+#       define NV04_PFB_BOOT_0_RAM_AMOUNT_32MB                  0x00000000
+#       define NV04_PFB_BOOT_0_RAM_AMOUNT_4MB                   0x00000001
+#       define NV04_PFB_BOOT_0_RAM_AMOUNT_8MB                   0x00000002
+#       define NV04_PFB_BOOT_0_RAM_AMOUNT_16MB                  0x00000003
+#       define NV04_PFB_BOOT_0_RAM_WIDTH_128                    0x00000004
+#       define NV04_PFB_BOOT_0_RAM_TYPE                         0x00000028
+#       define NV04_PFB_BOOT_0_RAM_TYPE_SGRAM_8MBIT             0x00000000
+#       define NV04_PFB_BOOT_0_RAM_TYPE_SGRAM_16MBIT            0x00000008
+#       define NV04_PFB_BOOT_0_RAM_TYPE_SGRAM_16MBIT_4BANK      0x00000010
+#       define NV04_PFB_BOOT_0_RAM_TYPE_SDRAM_16MBIT            0x00000018
+#       define NV04_PFB_BOOT_0_RAM_TYPE_SDRAM_64MBIT            0x00000020
+#       define NV04_PFB_BOOT_0_RAM_TYPE_SDRAM_64MBITX16         0x00000028
+#       define NV04_PFB_BOOT_0_UMA_ENABLE                       0x00000100
+#       define NV04_PFB_BOOT_0_UMA_SIZE                         0x0000f000
+#define NV04_PFB_DEBUG_0                                        0x00100080
+#       define NV04_PFB_DEBUG_0_PAGE_MODE                       0x00000001
+#       define NV04_PFB_DEBUG_0_REFRESH_OFF                     0x00000010
+#       define NV04_PFB_DEBUG_0_REFRESH_COUNTX64                0x00003f00
+#       define NV04_PFB_DEBUG_0_REFRESH_SLOW_CLK                0x00004000
+#       define NV04_PFB_DEBUG_0_SAFE_MODE                       0x00008000
+#       define NV04_PFB_DEBUG_0_ALOM_ENABLE                     0x00010000
+#       define NV04_PFB_DEBUG_0_CASOE                           0x00100000
+#       define NV04_PFB_DEBUG_0_CKE_INVERT                      0x10000000
+#       define NV04_PFB_DEBUG_0_REFINC                          0x20000000
+#       define NV04_PFB_DEBUG_0_SAVE_POWER_OFF                  0x40000000
+#define NV04_PFB_CFG0                                           0x00100200
+#       define NV04_PFB_CFG0_SCRAMBLE                           0x20000000
+#define NV04_PFB_CFG1                                           0x00100204
+#define NV04_PFB_FIFO_DATA                                      0x0010020c
+#       define NV10_PFB_FIFO_DATA_RAM_AMOUNT_MB_MASK            0xfff00000
+#       define NV10_PFB_FIFO_DATA_RAM_AMOUNT_MB_SHIFT           20
+#define NV10_PFB_REFCTRL                                        0x00100210
+#       define NV10_PFB_REFCTRL_VALID_1                         (1 << 31)
+#define NV04_PFB_PAD                                            0x0010021c
+#       define NV04_PFB_PAD_CKE_NORMAL                          (1 << 0)
+#define NV10_PFB_TILE(i)                              (0x00100240 + (i*16))
+#define NV10_PFB_TILE__SIZE                                     8
+#define NV10_PFB_TLIMIT(i)                            (0x00100244 + (i*16))
+#define NV10_PFB_TSIZE(i)                             (0x00100248 + (i*16))
+#define NV10_PFB_TSTATUS(i)                           (0x0010024c + (i*16))
+#define NV04_PFB_REF                                            0x001002d0
+#       define NV04_PFB_REF_CMD_REFRESH                         (1 << 0)
+#define NV04_PFB_PRE                                            0x001002d4
+#       define NV04_PFB_PRE_CMD_PRECHARGE                       (1 << 0)
+#define NV10_PFB_CLOSE_PAGE2                                    0x0010033c
+#define NV04_PFB_SCRAMBLE(i)                         (0x00100400 + 4 * (i))
+#define NV40_PFB_TILE(i)                              (0x00100600 + (i*16))
+#define NV40_PFB_TILE__SIZE_0                                   12
+#define NV40_PFB_TILE__SIZE_1                                   15
+#define NV40_PFB_TLIMIT(i)                            (0x00100604 + (i*16))
+#define NV40_PFB_TSIZE(i)                             (0x00100608 + (i*16))
+#define NV40_PFB_TSTATUS(i)                           (0x0010060c + (i*16))
+#define NV40_PFB_UNK_800                                        0x00100800
-#define NV03_BOOT_0                                        0x00100000
+#define NV_PEXTDEV_BOOT_0                                       0x00101000
-#    define NV03_BOOT_0_RAM_AMOUNT                         0x00000003
+#define NV_PEXTDEV_BOOT_0_RAMCFG                                0x0000003c
-#    define NV03_BOOT_0_RAM_AMOUNT_8MB                     0x00000000
+#       define NV_PEXTDEV_BOOT_0_STRAP_FP_IFACE_12BIT           (8 << 12)
-#    define NV03_BOOT_0_RAM_AMOUNT_2MB                     0x00000001
+#define NV_PEXTDEV_BOOT_3                                       0x0010100c
-#    define NV03_BOOT_0_RAM_AMOUNT_4MB                     0x00000002
-#    define NV03_BOOT_0_RAM_AMOUNT_8MB_SDRAM               0x00000003
-#    define NV04_BOOT_0_RAM_AMOUNT_32MB                    0x00000000
-#    define NV04_BOOT_0_RAM_AMOUNT_4MB                     0x00000001
-#    define NV04_BOOT_0_RAM_AMOUNT_8MB                     0x00000002
-#    define NV04_BOOT_0_RAM_AMOUNT_16MB                    0x00000003
-#define NV04_FIFO_DATA                                     0x0010020c
-#    define NV10_FIFO_DATA_RAM_AMOUNT_MB_MASK              0xfff00000
-#    define NV10_FIFO_DATA_RAM_AMOUNT_MB_SHIFT             20
 #define NV_RAMIN                                           0x00700000
@@ -131,23 +176,6 @@
 #define NV04_PTIMER_TIME_1                                 0x00009410
 #define NV04_PTIMER_ALARM_0                                0x00009420
-#define NV04_PFB_CFG0                                      0x00100200
-#define NV04_PFB_CFG1                                      0x00100204
-#define NV40_PFB_020C                                      0x0010020C
-#define NV10_PFB_TILE(i)                                   (0x00100240 + (i*16))
-#define NV10_PFB_TILE__SIZE                                8
-#define NV10_PFB_TLIMIT(i)                                 (0x00100244 + (i*16))
-#define NV10_PFB_TSIZE(i)                                  (0x00100248 + (i*16))
-#define NV10_PFB_TSTATUS(i)                                (0x0010024C + (i*16))
-#define NV10_PFB_CLOSE_PAGE2                               0x0010033C
-#define NV40_PFB_TILE(i)                                   (0x00100600 + (i*16))
-#define NV40_PFB_TILE__SIZE_0                              12
-#define NV40_PFB_TILE__SIZE_1                              15
-#define NV40_PFB_TLIMIT(i)                                 (0x00100604 + (i*16))
-#define NV40_PFB_TSIZE(i)                                  (0x00100608 + (i*16))
-#define NV40_PFB_TSTATUS(i)                                (0x0010060C + (i*16))
-#define NV40_PFB_UNK_800                                        0x00100800
 #define NV04_PGRAPH_DEBUG_0                                0x00400080
 #define NV04_PGRAPH_DEBUG_1                                0x00400084
 #define NV04_PGRAPH_DEBUG_2                                0x00400088
@@ -814,6 +842,7 @@
 #define NV50_PDISPLAY_SOR_BACKLIGHT_ENABLE                           0x80000000
 #define NV50_PDISPLAY_SOR_BACKLIGHT_LEVEL                            0x00000fff
 #define NV50_SOR_DP_CTRL(i,l)            (0x0061c10c + (i) * 0x800 + (l) * 0x80)
+#define NV50_SOR_DP_CTRL_ENABLED                                     0x00000001
 #define NV50_SOR_DP_CTRL_ENHANCED_FRAME_ENABLED                      0x00004000
 #define NV50_SOR_DP_CTRL_LANE_MASK                                   0x001f0000
 #define NV50_SOR_DP_CTRL_LANE_0_ENABLED                              0x00010000
diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
index 1d6ee8b55154..491767fe4fcf 100644
--- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c
+++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
@@ -97,7 +97,6 @@ nouveau_sgdma_bind(struct ttm_backend *be, struct ttm_mem_reg *mem)
        NV_DEBUG(dev, "pg=0x%lx\n", mem->mm_node->start);
-        dev_priv->engine.instmem.prepare_access(nvbe->dev, true);
        pte = nouveau_sgdma_pte(nvbe->dev, mem->mm_node->start << PAGE_SHIFT);
        nvbe->pte_start = pte;
        for (i = 0; i < nvbe->nr_pages; i++) {
@@ -116,24 +115,11 @@ nouveau_sgdma_bind(struct ttm_backend *be, struct ttm_mem_reg *mem)
                        dma_offset += NV_CTXDMA_PAGE_SIZE;
                }
        }
-        dev_priv->engine.instmem.finish_access(nvbe->dev);
+        dev_priv->engine.instmem.flush(nvbe->dev);
        if (dev_priv->card_type == NV_50) {
-                nv_wr32(dev, 0x100c80, 0x00050001);
+                nv50_vm_flush(dev, 5); /* PGRAPH */
-                if (!nv_wait(0x100c80, 0x00000001, 0x00000000)) {
+                nv50_vm_flush(dev, 0); /* PFIFO */
-                        NV_ERROR(dev, "timeout: (0x100c80 & 1) == 0 (2)\n");
-                        NV_ERROR(dev, "0x100c80 = 0x%08x\n",
-                                                nv_rd32(dev, 0x100c80));
-                        return -EBUSY;
-                }
-                nv_wr32(dev, 0x100c80, 0x00000001);
-                if (!nv_wait(0x100c80, 0x00000001, 0x00000000)) {
-                        NV_ERROR(dev, "timeout: (0x100c80 & 1) == 0 (2)\n");
-                        NV_ERROR(dev, "0x100c80 = 0x%08x\n",
-                                                nv_rd32(dev, 0x100c80));
-                        return -EBUSY;
-                }
        }
        nvbe->bound = true;
@@ -154,7 +140,6 @@ nouveau_sgdma_unbind(struct ttm_backend *be)
        if (!nvbe->bound)
                return 0;
-        dev_priv->engine.instmem.prepare_access(nvbe->dev, true);
        pte = nvbe->pte_start;
        for (i = 0; i < nvbe->nr_pages; i++) {
                dma_addr_t dma_offset = dev_priv->gart_info.sg_dummy_bus;
@@ -170,24 +155,11 @@ nouveau_sgdma_unbind(struct ttm_backend *be)
                        dma_offset += NV_CTXDMA_PAGE_SIZE;
                }
        }
-        dev_priv->engine.instmem.finish_access(nvbe->dev);
+        dev_priv->engine.instmem.flush(nvbe->dev);
        if (dev_priv->card_type == NV_50) {
-                nv_wr32(dev, 0x100c80, 0x00050001);
+                nv50_vm_flush(dev, 5);
-                if (!nv_wait(0x100c80, 0x00000001, 0x00000000)) {
+                nv50_vm_flush(dev, 0);
-                        NV_ERROR(dev, "timeout: (0x100c80 & 1) == 0 (2)\n");
-                        NV_ERROR(dev, "0x100c80 = 0x%08x\n",
-                                                nv_rd32(dev, 0x100c80));
-                        return -EBUSY;
-                }
-                nv_wr32(dev, 0x100c80, 0x00000001);
-                if (!nv_wait(0x100c80, 0x00000001, 0x00000000)) {
-                        NV_ERROR(dev, "timeout: (0x100c80 & 1) == 0 (2)\n");
-                        NV_ERROR(dev, "0x100c80 = 0x%08x\n",
-                                                nv_rd32(dev, 0x100c80));
-                        return -EBUSY;
-                }
        }
        nvbe->bound = false;
@@ -272,7 +244,6 @@ nouveau_sgdma_init(struct drm_device *dev)
                pci_map_page(dev->pdev, dev_priv->gart_info.sg_dummy_page, 0,
                             PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
-        dev_priv->engine.instmem.prepare_access(dev, true);
        if (dev_priv->card_type < NV_50) {
                /* Maybe use NV_DMA_TARGET_AGP for PCIE? NVIDIA do this, and
                 * confirmed to work on c51.  Perhaps means NV_DMA_TARGET_PCIE
@@ -294,7 +265,7 @@ nouveau_sgdma_init(struct drm_device *dev)
                        nv_wo32(dev, gpuobj, (i+4)/4, 0);
                }
        }
-        dev_priv->engine.instmem.finish_access(dev);
+        dev_priv->engine.instmem.flush(dev);
        dev_priv->gart_info.type      = NOUVEAU_GART_SGDMA;
        dev_priv->gart_info.aper_base = 0;
@@ -325,14 +296,11 @@ nouveau_sgdma_get_page(struct drm_device *dev, uint32_t offset, uint32_t *page)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct nouveau_gpuobj *gpuobj = dev_priv->gart_info.sg_ctxdma;
-        struct nouveau_instmem_engine *instmem = &dev_priv->engine.instmem;
        int pte;
        pte = (offset >> NV_CTXDMA_PAGE_SHIFT);
        if (dev_priv->card_type < NV_50) {
-                instmem->prepare_access(dev, false);
                *page = nv_ro32(dev, gpuobj, (pte + 2)) & ~NV_CTXDMA_PAGE_MASK;
-                instmem->finish_access(dev);
                return 0;
        }
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index b02a231d6937..ee3729e7823b 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -38,6 +38,7 @@
 #include "nv50_display.h"
 static void nouveau_stub_takedown(struct drm_device *dev) {}
+static int nouveau_stub_init(struct drm_device *dev) { return 0; }
 static int nouveau_init_engine_ptrs(struct drm_device *dev)
 {
@@ -54,8 +55,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
                engine->instmem.clear           = nv04_instmem_clear;
                engine->instmem.bind            = nv04_instmem_bind;
                engine->instmem.unbind          = nv04_instmem_unbind;
-                engine->instmem.prepare_access  = nv04_instmem_prepare_access;
+                engine->instmem.flush           = nv04_instmem_flush;
-                engine->instmem.finish_access   = nv04_instmem_finish_access;
                engine->mc.init                 = nv04_mc_init;
                engine->mc.takedown             = nv04_mc_takedown;
                engine->timer.init              = nv04_timer_init;
@@ -85,6 +85,16 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
                engine->fifo.destroy_context    = nv04_fifo_destroy_context;
                engine->fifo.load_context       = nv04_fifo_load_context;
                engine->fifo.unload_context     = nv04_fifo_unload_context;
+                engine->display.early_init      = nv04_display_early_init;
+                engine->display.late_takedown   = nv04_display_late_takedown;
+                engine->display.create          = nv04_display_create;
+                engine->display.init            = nv04_display_init;
+                engine->display.destroy         = nv04_display_destroy;
+                engine->gpio.init               = nouveau_stub_init;
+                engine->gpio.takedown           = nouveau_stub_takedown;
+                engine->gpio.get                = NULL;
+                engine->gpio.set                = NULL;
+                engine->gpio.irq_enable         = NULL;
                break;
        case 0x10:
                engine->instmem.init            = nv04_instmem_init;
@@ -95,8 +105,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
                engine->instmem.clear           = nv04_instmem_clear;
                engine->instmem.bind            = nv04_instmem_bind;
                engine->instmem.unbind          = nv04_instmem_unbind;
-                engine->instmem.prepare_access  = nv04_instmem_prepare_access;
+                engine->instmem.flush           = nv04_instmem_flush;
-                engine->instmem.finish_access   = nv04_instmem_finish_access;
                engine->mc.init                 = nv04_mc_init;
                engine->mc.takedown             = nv04_mc_takedown;
                engine->timer.init              = nv04_timer_init;
@@ -128,6 +137,16 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
                engine->fifo.destroy_context    = nv10_fifo_destroy_context;
                engine->fifo.load_context       = nv10_fifo_load_context;
                engine->fifo.unload_context     = nv10_fifo_unload_context;
+                engine->display.early_init      = nv04_display_early_init;
+                engine->display.late_takedown   = nv04_display_late_takedown;
+                engine->display.create          = nv04_display_create;
+                engine->display.init            = nv04_display_init;
+                engine->display.destroy         = nv04_display_destroy;
+                engine->gpio.init               = nouveau_stub_init;
+                engine->gpio.takedown           = nouveau_stub_takedown;
+                engine->gpio.get                = nv10_gpio_get;
+                engine->gpio.set                = nv10_gpio_set;
+                engine->gpio.irq_enable         = NULL;
                break;
        case 0x20:
                engine->instmem.init            = nv04_instmem_init;
@@ -138,8 +157,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
                engine->instmem.clear           = nv04_instmem_clear;
                engine->instmem.bind            = nv04_instmem_bind;
                engine->instmem.unbind          = nv04_instmem_unbind;
-                engine->instmem.prepare_access  = nv04_instmem_prepare_access;
+                engine->instmem.flush           = nv04_instmem_flush;
-                engine->instmem.finish_access   = nv04_instmem_finish_access;
                engine->mc.init                 = nv04_mc_init;
                engine->mc.takedown             = nv04_mc_takedown;
                engine->timer.init              = nv04_timer_init;
@@ -171,6 +189,16 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
                engine->fifo.destroy_context    = nv10_fifo_destroy_context;
                engine->fifo.load_context       = nv10_fifo_load_context;
                engine->fifo.unload_context     = nv10_fifo_unload_context;
+                engine->display.early_init      = nv04_display_early_init;
+                engine->display.late_takedown   = nv04_display_late_takedown;
+                engine->display.create          = nv04_display_create;
+                engine->display.init            = nv04_display_init;
+                engine->display.destroy         = nv04_display_destroy;
+                engine->gpio.init               = nouveau_stub_init;
+                engine->gpio.takedown           = nouveau_stub_takedown;
+                engine->gpio.get                = nv10_gpio_get;
+                engine->gpio.set                = nv10_gpio_set;
+                engine->gpio.irq_enable         = NULL;
                break;
        case 0x30:
                engine->instmem.init            = nv04_instmem_init;
@@ -181,15 +209,14 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
                engine->instmem.clear           = nv04_instmem_clear;
                engine->instmem.bind            = nv04_instmem_bind;
                engine->instmem.unbind          = nv04_instmem_unbind;
-                engine->instmem.prepare_access  = nv04_instmem_prepare_access;
+                engine->instmem.flush           = nv04_instmem_flush;
-                engine->instmem.finish_access   = nv04_instmem_finish_access;
                engine->mc.init                 = nv04_mc_init;
                engine->mc.takedown             = nv04_mc_takedown;
                engine->timer.init              = nv04_timer_init;
                engine->timer.read              = nv04_timer_read;
                engine->timer.takedown          = nv04_timer_takedown;
-                engine->fb.init                 = nv10_fb_init;
+                engine->fb.init                 = nv30_fb_init;
-                engine->fb.takedown             = nv10_fb_takedown;
+                engine->fb.takedown             = nv30_fb_takedown;
                engine->fb.set_region_tiling    = nv10_fb_set_region_tiling;
                engine->graph.grclass           = nv30_graph_grclass;
                engine->graph.init              = nv30_graph_init;
@@ -214,6 +241,16 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
                engine->fifo.destroy_context    = nv10_fifo_destroy_context;
                engine->fifo.load_context       = nv10_fifo_load_context;
                engine->fifo.unload_context     = nv10_fifo_unload_context;
+                engine->display.early_init      = nv04_display_early_init;
+                engine->display.late_takedown   = nv04_display_late_takedown;
+                engine->display.create          = nv04_display_create;
+                engine->display.init            = nv04_display_init;
+                engine->display.destroy         = nv04_display_destroy;
+                engine->gpio.init               = nouveau_stub_init;
+                engine->gpio.takedown           = nouveau_stub_takedown;
+                engine->gpio.get                = nv10_gpio_get;
+                engine->gpio.set                = nv10_gpio_set;
+                engine->gpio.irq_enable         = NULL;
                break;
        case 0x40:
        case 0x60:
@@ -225,8 +262,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
                engine->instmem.clear           = nv04_instmem_clear;
                engine->instmem.bind            = nv04_instmem_bind;
                engine->instmem.unbind          = nv04_instmem_unbind;
-                engine->instmem.prepare_access  = nv04_instmem_prepare_access;
+                engine->instmem.flush           = nv04_instmem_flush;
-                engine->instmem.finish_access   = nv04_instmem_finish_access;
                engine->mc.init                 = nv40_mc_init;
                engine->mc.takedown             = nv40_mc_takedown;
                engine->timer.init              = nv04_timer_init;
@@ -258,6 +294,16 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
                engine->fifo.destroy_context    = nv40_fifo_destroy_context;
                engine->fifo.load_context       = nv40_fifo_load_context;
                engine->fifo.unload_context     = nv40_fifo_unload_context;
+                engine->display.early_init      = nv04_display_early_init;
+                engine->display.late_takedown   = nv04_display_late_takedown;
+                engine->display.create          = nv04_display_create;
+                engine->display.init            = nv04_display_init;
+                engine->display.destroy         = nv04_display_destroy;
+                engine->gpio.init               = nouveau_stub_init;
+                engine->gpio.takedown           = nouveau_stub_takedown;
+                engine->gpio.get                = nv10_gpio_get;
+                engine->gpio.set                = nv10_gpio_set;
+                engine->gpio.irq_enable         = NULL;
                break;
        case 0x50:
        case 0x80: /* gotta love NVIDIA's consistency.. */
@@ -271,8 +317,10 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
                engine->instmem.clear           = nv50_instmem_clear;
                engine->instmem.bind            = nv50_instmem_bind;
                engine->instmem.unbind          = nv50_instmem_unbind;
-                engine->instmem.prepare_access  = nv50_instmem_prepare_access;
+                if (dev_priv->chipset == 0x50)
-                engine->instmem.finish_access   = nv50_instmem_finish_access;
+                        engine->instmem.flush   = nv50_instmem_flush;
+                else
+                        engine->instmem.flush   = nv84_instmem_flush;
                engine->mc.init                 = nv50_mc_init;
                engine->mc.takedown             = nv50_mc_takedown;
                engine->timer.init              = nv04_timer_init;
@@ -300,6 +348,16 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
                engine->fifo.destroy_context    = nv50_fifo_destroy_context;
                engine->fifo.load_context       = nv50_fifo_load_context;
                engine->fifo.unload_context     = nv50_fifo_unload_context;
+                engine->display.early_init      = nv50_display_early_init;
+                engine->display.late_takedown   = nv50_display_late_takedown;
+                engine->display.create          = nv50_display_create;
+                engine->display.init            = nv50_display_init;
+                engine->display.destroy         = nv50_display_destroy;
+                engine->gpio.init               = nv50_gpio_init;
+                engine->gpio.takedown           = nouveau_stub_takedown;
+                engine->gpio.get                = nv50_gpio_get;
+                engine->gpio.set                = nv50_gpio_set;
+                engine->gpio.irq_enable         = nv50_gpio_irq_enable;
                break;
        default:
                NV_ERROR(dev, "NV%02x unsupported\n", dev_priv->chipset);
@@ -407,11 +465,6 @@ nouveau_card_init(struct drm_device *dev)
        struct nouveau_engine *engine;
        int ret;
-        NV_DEBUG(dev, "prev state = %d\n", dev_priv->init_state);
-        if (dev_priv->init_state == NOUVEAU_CARD_INIT_DONE)
-                return 0;
        vga_client_register(dev->pdev, dev, NULL, nouveau_vga_set_decode);
        vga_switcheroo_register_client(dev->pdev, nouveau_switcheroo_set_state,
                                       nouveau_switcheroo_can_switch);
@@ -421,15 +474,17 @@ nouveau_card_init(struct drm_device *dev)
        if (ret)
                goto out;
        engine = &dev_priv->engine;
-        dev_priv->init_state = NOUVEAU_CARD_INIT_FAILED;
        spin_lock_init(&dev_priv->context_switch_lock);
+        /* Make the CRTCs and I2C buses accessible */
+        ret = engine->display.early_init(dev);
+        if (ret)
+                goto out;
        /* Parse BIOS tables / Run init tables if card not POSTed */
-        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+        ret = nouveau_bios_init(dev);
-                ret = nouveau_bios_init(dev);
+        if (ret)
-                if (ret)
+                goto out_display_early;
-                        goto out;
-        }
        ret = nouveau_mem_detect(dev);
        if (ret)
@@ -461,10 +516,15 @@ nouveau_card_init(struct drm_device *dev)
        if (ret)
                goto out_gpuobj;
+        /* PGPIO */
+        ret = engine->gpio.init(dev);
+        if (ret)
+                goto out_mc;
        /* PTIMER */
        ret = engine->timer.init(dev);
        if (ret)
-                goto out_mc;
+                goto out_gpio;
        /* PFB */
        ret = engine->fb.init(dev);
@@ -485,12 +545,16 @@ nouveau_card_init(struct drm_device *dev)
                        goto out_graph;
        }
+        ret = engine->display.create(dev);
+        if (ret)
+                goto out_fifo;
        /* this call irq_preinstall, register irq handler and
         * call irq_postinstall
         */
        ret = drm_irq_install(dev);
        if (ret)
-                goto out_fifo;
+                goto out_display;
        ret = drm_vblank_init(dev, 0);
        if (ret)
@@ -504,35 +568,18 @@ nouveau_card_init(struct drm_device *dev)
                        goto out_irq;
        }
-        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
-                if (dev_priv->card_type >= NV_50)
-                        ret = nv50_display_create(dev);
-                else
-                        ret = nv04_display_create(dev);
-                if (ret)
-                        goto out_channel;
-        }
        ret = nouveau_backlight_init(dev);
        if (ret)
                NV_ERROR(dev, "Error %d registering backlight\n", ret);
-        dev_priv->init_state = NOUVEAU_CARD_INIT_DONE;
+        nouveau_fbcon_init(dev);
+        drm_kms_helper_poll_init(dev);
-        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
-                nouveau_fbcon_init(dev);
-                drm_kms_helper_poll_init(dev);
-        }
        return 0;
-out_channel:
-        if (dev_priv->channel) {
-                nouveau_channel_free(dev_priv->channel);
-                dev_priv->channel = NULL;
-        }
 out_irq:
        drm_irq_uninstall(dev);
+out_display:
+        engine->display.destroy(dev);
 out_fifo:
        if (!nouveau_noaccel)
                engine->fifo.takedown(dev);
@@ -543,6 +590,8 @@ out_fb:
        engine->fb.takedown(dev);
 out_timer:
        engine->timer.takedown(dev);
+out_gpio:
+        engine->gpio.takedown(dev);
 out_mc:
        engine->mc.takedown(dev);
 out_gpuobj:
@@ -556,6 +605,8 @@ out_gpuobj_early:
        nouveau_gpuobj_late_takedown(dev);
 out_bios:
        nouveau_bios_takedown(dev);
+out_display_early:
+        engine->display.late_takedown(dev);
 out:
        vga_client_register(dev->pdev, NULL, NULL, NULL);
        return ret;
@@ -566,45 +617,39 @@ static void nouveau_card_takedown(struct drm_device *dev)
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct nouveau_engine *engine = &dev_priv->engine;
-        NV_DEBUG(dev, "prev state = %d\n", dev_priv->init_state);
+        nouveau_backlight_exit(dev);
-        if (dev_priv->init_state != NOUVEAU_CARD_INIT_DOWN) {
-                nouveau_backlight_exit(dev);
-                if (dev_priv->channel) {
-                        nouveau_channel_free(dev_priv->channel);
-                        dev_priv->channel = NULL;
-                }
-                if (!nouveau_noaccel) {
+        if (dev_priv->channel) {
-                        engine->fifo.takedown(dev);
+                nouveau_channel_free(dev_priv->channel);
-                        engine->graph.takedown(dev);
+                dev_priv->channel = NULL;
-                }
+        }
-                engine->fb.takedown(dev);
-                engine->timer.takedown(dev);
-                engine->mc.takedown(dev);
-                mutex_lock(&dev->struct_mutex);
+        if (!nouveau_noaccel) {
-                ttm_bo_clean_mm(&dev_priv->ttm.bdev, TTM_PL_VRAM);
+                engine->fifo.takedown(dev);
-                ttm_bo_clean_mm(&dev_priv->ttm.bdev, TTM_PL_TT);
+                engine->graph.takedown(dev);
-                mutex_unlock(&dev->struct_mutex);
+        }
-                nouveau_sgdma_takedown(dev);
+        engine->fb.takedown(dev);
+        engine->timer.takedown(dev);
+        engine->gpio.takedown(dev);
+        engine->mc.takedown(dev);
+        engine->display.late_takedown(dev);
-                nouveau_gpuobj_takedown(dev);
+        mutex_lock(&dev->struct_mutex);
-                nouveau_mem_close(dev);
+        ttm_bo_clean_mm(&dev_priv->ttm.bdev, TTM_PL_VRAM);
-                engine->instmem.takedown(dev);
+        ttm_bo_clean_mm(&dev_priv->ttm.bdev, TTM_PL_TT);
+        mutex_unlock(&dev->struct_mutex);
+        nouveau_sgdma_takedown(dev);
-                if (drm_core_check_feature(dev, DRIVER_MODESET))
+        nouveau_gpuobj_takedown(dev);
-                        drm_irq_uninstall(dev);
+        nouveau_mem_close(dev);
+        engine->instmem.takedown(dev);
-                nouveau_gpuobj_late_takedown(dev);
+        drm_irq_uninstall(dev);
-                nouveau_bios_takedown(dev);
-                vga_client_register(dev->pdev, NULL, NULL, NULL);
+        nouveau_gpuobj_late_takedown(dev);
+        nouveau_bios_takedown(dev);
-                dev_priv->init_state = NOUVEAU_CARD_INIT_DOWN;
+        vga_client_register(dev->pdev, NULL, NULL, NULL);
-        }
 }
 /* here a client dies, release the stuff that was allocated for its
@@ -691,6 +736,7 @@ int nouveau_load(struct drm_device *dev, unsigned long flags)
        struct drm_nouveau_private *dev_priv;
        uint32_t reg0;
        resource_size_t mmio_start_offs;
+        int ret;
        dev_priv = kzalloc(sizeof(*dev_priv), GFP_KERNEL);
        if (!dev_priv)
@@ -699,7 +745,6 @@ int nouveau_load(struct drm_device *dev, unsigned long flags)
        dev_priv->dev = dev;
        dev_priv->flags = flags & NOUVEAU_FLAGS;
-        dev_priv->init_state = NOUVEAU_CARD_INIT_DOWN;
        NV_DEBUG(dev, "vendor: 0x%X device: 0x%X class: 0x%X\n",
                 dev->pci_vendor, dev->pci_device, dev->pdev->class);
@@ -773,11 +818,9 @@ int nouveau_load(struct drm_device *dev, unsigned long flags)
        NV_INFO(dev, "Detected an NV%2x generation card (0x%08x)\n",
                dev_priv->card_type, reg0);
-        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+        ret = nouveau_remove_conflicting_drivers(dev);
-                int ret = nouveau_remove_conflicting_drivers(dev);
+        if (ret)
-                if (ret)
+                return ret;
-                        return ret;
-        }
        /* Map PRAMIN BAR, or on older cards, the aperture withing BAR0 */
        if (dev_priv->card_type >= NV_40) {
@@ -812,46 +855,26 @@ int nouveau_load(struct drm_device *dev, unsigned long flags)
                dev_priv->flags |= NV_NFORCE2;
        /* For kernel modesetting, init card now and bring up fbcon */
-        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+        ret = nouveau_card_init(dev);
-                int ret = nouveau_card_init(dev);
+        if (ret)
-                if (ret)
+                return ret;
-                        return ret;
-        }
        return 0;
 }
-static void nouveau_close(struct drm_device *dev)
-{
-        struct drm_nouveau_private *dev_priv = dev->dev_private;
-        /* In the case of an error dev_priv may not be allocated yet */
-        if (dev_priv)
-                nouveau_card_takedown(dev);
-}
-/* KMS: we need mmio at load time, not when the first drm client opens. */
 void nouveau_lastclose(struct drm_device *dev)
 {
-        if (drm_core_check_feature(dev, DRIVER_MODESET))
-                return;
-        nouveau_close(dev);
 }
 int nouveau_unload(struct drm_device *dev)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct nouveau_engine *engine = &dev_priv->engine;
-        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+        drm_kms_helper_poll_fini(dev);
-                drm_kms_helper_poll_fini(dev);
+        nouveau_fbcon_fini(dev);
-                nouveau_fbcon_fini(dev);
+        engine->display.destroy(dev);
-                if (dev_priv->card_type >= NV_50)
+        nouveau_card_takedown(dev);
-                        nv50_display_destroy(dev);
-                else
-                        nv04_display_destroy(dev);
-                nouveau_close(dev);
-        }
        iounmap(dev_priv->mmio);
        iounmap(dev_priv->ramin);
@@ -867,8 +890,6 @@ int nouveau_ioctl_getparam(struct drm_device *dev, void *data,
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct drm_nouveau_getparam *getparam = data;
-        NOUVEAU_CHECK_INITIALISED_WITH_RETURN;
        switch (getparam->param) {
        case NOUVEAU_GETPARAM_CHIPSET_ID:
                getparam->value = dev_priv->chipset;
@@ -937,8 +958,6 @@ nouveau_ioctl_setparam(struct drm_device *dev, void *data,
 {
        struct drm_nouveau_setparam *setparam = data;
-        NOUVEAU_CHECK_INITIALISED_WITH_RETURN;
        switch (setparam->param) {
        default:
                NV_ERROR(dev, "unknown parameter %lld\n", setparam->param);
diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
index c385d50f041b..bd35f930568c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
@@ -42,13 +42,13 @@ nouveau_ttm_mmap(struct file *filp, struct vm_area_struct *vma)
 }
 static int
-nouveau_ttm_mem_global_init(struct ttm_global_reference *ref)
+nouveau_ttm_mem_global_init(struct drm_global_reference *ref)
 {
        return ttm_mem_global_init(ref->object);
 }
 static void
-nouveau_ttm_mem_global_release(struct ttm_global_reference *ref)
+nouveau_ttm_mem_global_release(struct drm_global_reference *ref)
 {
        ttm_mem_global_release(ref->object);
 }
@@ -56,16 +56,16 @@ nouveau_ttm_mem_global_release(struct ttm_global_reference *ref)
 int
 nouveau_ttm_global_init(struct drm_nouveau_private *dev_priv)
 {
-        struct ttm_global_reference *global_ref;
+        struct drm_global_reference *global_ref;
        int ret;
        global_ref = &dev_priv->ttm.mem_global_ref;
-        global_ref->global_type = TTM_GLOBAL_TTM_MEM;
+        global_ref->global_type = DRM_GLOBAL_TTM_MEM;
        global_ref->size = sizeof(struct ttm_mem_global);
        global_ref->init = &nouveau_ttm_mem_global_init;
        global_ref->release = &nouveau_ttm_mem_global_release;
-        ret = ttm_global_item_ref(global_ref);
+        ret = drm_global_item_ref(global_ref);
        if (unlikely(ret != 0)) {
                DRM_ERROR("Failed setting up TTM memory accounting\n");
                dev_priv->ttm.mem_global_ref.release = NULL;
@@ -74,15 +74,15 @@ nouveau_ttm_global_init(struct drm_nouveau_private *dev_priv)
        dev_priv->ttm.bo_global_ref.mem_glob = global_ref->object;
        global_ref = &dev_priv->ttm.bo_global_ref.ref;
-        global_ref->global_type = TTM_GLOBAL_TTM_BO;
+        global_ref->global_type = DRM_GLOBAL_TTM_BO;
        global_ref->size = sizeof(struct ttm_bo_global);
        global_ref->init = &ttm_bo_global_init;
        global_ref->release = &ttm_bo_global_release;
-        ret = ttm_global_item_ref(global_ref);
+        ret = drm_global_item_ref(global_ref);
        if (unlikely(ret != 0)) {
                DRM_ERROR("Failed setting up TTM BO subsystem\n");
-                ttm_global_item_unref(&dev_priv->ttm.mem_global_ref);
+                drm_global_item_unref(&dev_priv->ttm.mem_global_ref);
                dev_priv->ttm.mem_global_ref.release = NULL;
                return ret;
        }
@@ -96,8 +96,8 @@ nouveau_ttm_global_release(struct drm_nouveau_private *dev_priv)
        if (dev_priv->ttm.mem_global_ref.release == NULL)
                return;
-        ttm_global_item_unref(&dev_priv->ttm.bo_global_ref.ref);
+        drm_global_item_unref(&dev_priv->ttm.bo_global_ref.ref);
-        ttm_global_item_unref(&dev_priv->ttm.mem_global_ref);
+        drm_global_item_unref(&dev_priv->ttm.mem_global_ref);
        dev_priv->ttm.mem_global_ref.release = NULL;
 }
diff --git a/drivers/gpu/drm/nouveau/nv04_crtc.c b/drivers/gpu/drm/nouveau/nv04_crtc.c
index eba687f1099e..1c20c08ce67c 100644
--- a/drivers/gpu/drm/nouveau/nv04_crtc.c
+++ b/drivers/gpu/drm/nouveau/nv04_crtc.c
@@ -157,6 +157,7 @@ nv_crtc_dpms(struct drm_crtc *crtc, int mode)
 {
        struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
        struct drm_device *dev = crtc->dev;
+        struct drm_connector *connector;
        unsigned char seq1 = 0, crtc17 = 0;
        unsigned char crtc1A;
@@ -211,6 +212,10 @@ nv_crtc_dpms(struct drm_crtc *crtc, int mode)
        NVVgaSeqReset(dev, nv_crtc->index, false);
        NVWriteVgaCrtc(dev, nv_crtc->index, NV_CIO_CRE_RPC1_INDEX, crtc1A);
+        /* Update connector polling modes */
+        list_for_each_entry(connector, &dev->mode_config.connector_list, head)
+                nouveau_connector_set_polling(connector);
 }
 static bool
diff --git a/drivers/gpu/drm/nouveau/nv04_dac.c b/drivers/gpu/drm/nouveau/nv04_dac.c
index 1cb19e3acb55..ea3627041ecf 100644
--- a/drivers/gpu/drm/nouveau/nv04_dac.c
+++ b/drivers/gpu/drm/nouveau/nv04_dac.c
@@ -220,6 +220,7 @@ uint32_t nv17_dac_sample_load(struct drm_encoder *encoder)
 {
        struct drm_device *dev = encoder->dev;
        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct nouveau_gpio_engine *gpio = &dev_priv->engine.gpio;
        struct dcb_entry *dcb = nouveau_encoder(encoder)->dcb;
        uint32_t sample, testval, regoffset = nv04_dac_output_offset(encoder);
        uint32_t saved_powerctrl_2 = 0, saved_powerctrl_4 = 0, saved_routput,
@@ -251,22 +252,21 @@ uint32_t nv17_dac_sample_load(struct drm_encoder *encoder)
                nvWriteMC(dev, NV_PBUS_POWERCTRL_4, saved_powerctrl_4 & 0xffffffcf);
        }
-        saved_gpio1 = nv17_gpio_get(dev, DCB_GPIO_TVDAC1);
+        saved_gpio1 = gpio->get(dev, DCB_GPIO_TVDAC1);
-        saved_gpio0 = nv17_gpio_get(dev, DCB_GPIO_TVDAC0);
+        saved_gpio0 = gpio->get(dev, DCB_GPIO_TVDAC0);
-        nv17_gpio_set(dev, DCB_GPIO_TVDAC1, dcb->type == OUTPUT_TV);
+        gpio->set(dev, DCB_GPIO_TVDAC1, dcb->type == OUTPUT_TV);
-        nv17_gpio_set(dev, DCB_GPIO_TVDAC0, dcb->type == OUTPUT_TV);
+        gpio->set(dev, DCB_GPIO_TVDAC0, dcb->type == OUTPUT_TV);
        msleep(4);
        saved_routput = NVReadRAMDAC(dev, 0, NV_PRAMDAC_DACCLK + regoffset);
        head = (saved_routput & 0x100) >> 8;
-#if 0
-        /* if there's a spare crtc, using it will minimise flicker for the case
+        /* if there's a spare crtc, using it will minimise flicker */
-         * where the in-use crtc is in use by an off-chip tmds encoder */
+        if (!(NVReadVgaCrtc(dev, head, NV_CIO_CRE_RPC1_INDEX) & 0xC0))
-        if (xf86_config->crtc[head]->enabled && !xf86_config->crtc[head ^ 1]->enabled)
                head ^= 1;
-#endif
        /* nv driver and nv31 use 0xfffffeee, nv34 and 6600 use 0xfffffece */
        routput = (saved_routput & 0xfffffece) | head << 8;
@@ -304,8 +304,8 @@ uint32_t nv17_dac_sample_load(struct drm_encoder *encoder)
                nvWriteMC(dev, NV_PBUS_POWERCTRL_4, saved_powerctrl_4);
        nvWriteMC(dev, NV_PBUS_POWERCTRL_2, saved_powerctrl_2);
-        nv17_gpio_set(dev, DCB_GPIO_TVDAC1, saved_gpio1);
+        gpio->set(dev, DCB_GPIO_TVDAC1, saved_gpio1);
-        nv17_gpio_set(dev, DCB_GPIO_TVDAC0, saved_gpio0);
+        gpio->set(dev, DCB_GPIO_TVDAC0, saved_gpio0);
        return sample;
 }
@@ -315,9 +315,12 @@ nv17_dac_detect(struct drm_encoder *encoder, struct drm_connector *connector)
 {
        struct drm_device *dev = encoder->dev;
        struct dcb_entry *dcb = nouveau_encoder(encoder)->dcb;
-        uint32_t sample = nv17_dac_sample_load(encoder);
-        if (sample & NV_PRAMDAC_TEST_CONTROL_SENSEB_ALLHI) {
+        if (nv04_dac_in_use(encoder))
+                return connector_status_disconnected;
+        if (nv17_dac_sample_load(encoder) &
+            NV_PRAMDAC_TEST_CONTROL_SENSEB_ALLHI) {
                NV_INFO(dev, "Load detected on output %c\n",
                        '@' + ffs(dcb->or));
                return connector_status_connected;
@@ -330,6 +333,9 @@ static bool nv04_dac_mode_fixup(struct drm_encoder *encoder,
                                struct drm_display_mode *mode,
                                struct drm_display_mode *adjusted_mode)
 {
+        if (nv04_dac_in_use(encoder))
+                return false;
        return true;
 }
@@ -428,6 +434,17 @@ void nv04_dac_update_dacclk(struct drm_encoder *encoder, bool enable)
        }
 }
+/* Check if the DAC corresponding to 'encoder' is being used by
+ * someone else. */
+bool nv04_dac_in_use(struct drm_encoder *encoder)
+{
+        struct drm_nouveau_private *dev_priv = encoder->dev->dev_private;
+        struct dcb_entry *dcb = nouveau_encoder(encoder)->dcb;
+        return nv_gf4_disp_arch(encoder->dev) &&
+                (dev_priv->dac_users[ffs(dcb->or) - 1] & ~(1 << dcb->index));
+}
 static void nv04_dac_dpms(struct drm_encoder *encoder, int mode)
 {
        struct drm_device *dev = encoder->dev;
@@ -501,11 +518,13 @@ static const struct drm_encoder_funcs nv04_dac_funcs = {
        .destroy = nv04_dac_destroy,
 };
-int nv04_dac_create(struct drm_device *dev, struct dcb_entry *entry)
+int
+nv04_dac_create(struct drm_connector *connector, struct dcb_entry *entry)
 {
        const struct drm_encoder_helper_funcs *helper;
-        struct drm_encoder *encoder;
        struct nouveau_encoder *nv_encoder = NULL;
+        struct drm_device *dev = connector->dev;
+        struct drm_encoder *encoder;
        nv_encoder = kzalloc(sizeof(*nv_encoder), GFP_KERNEL);
        if (!nv_encoder)
@@ -527,5 +546,6 @@ int nv04_dac_create(struct drm_device *dev, struct dcb_entry *entry)
        encoder->possible_crtcs = entry->heads;
        encoder->possible_clones = 0;
+        drm_mode_connector_attach_encoder(connector, encoder);
        return 0;
 }
diff --git a/drivers/gpu/drm/nouveau/nv04_dfp.c b/drivers/gpu/drm/nouveau/nv04_dfp.c
index 41634d4752fe..3311f3a8c818 100644
--- a/drivers/gpu/drm/nouveau/nv04_dfp.c
+++ b/drivers/gpu/drm/nouveau/nv04_dfp.c
@@ -413,10 +413,6 @@ static void nv04_dfp_commit(struct drm_encoder *encoder)
        struct dcb_entry *dcbe = nv_encoder->dcb;
        int head = nouveau_crtc(encoder->crtc)->index;
-        NV_INFO(dev, "Output %s is running on CRTC %d using output %c\n",
-                drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base),
-                nv_crtc->index, '@' + ffs(nv_encoder->dcb->or));
        if (dcbe->type == OUTPUT_TMDS)
                run_tmds_table(dev, dcbe, head, nv_encoder->mode.clock);
        else if (dcbe->type == OUTPUT_LVDS)
@@ -584,11 +580,12 @@ static const struct drm_encoder_funcs nv04_dfp_funcs = {
        .destroy = nv04_dfp_destroy,
 };
-int nv04_dfp_create(struct drm_device *dev, struct dcb_entry *entry)
+int
+nv04_dfp_create(struct drm_connector *connector, struct dcb_entry *entry)
 {
        const struct drm_encoder_helper_funcs *helper;
-        struct drm_encoder *encoder;
        struct nouveau_encoder *nv_encoder = NULL;
+        struct drm_encoder *encoder;
        int type;
        switch (entry->type) {
@@ -613,11 +610,12 @@ int nv04_dfp_create(struct drm_device *dev, struct dcb_entry *entry)
        nv_encoder->dcb = entry;
        nv_encoder->or = ffs(entry->or) - 1;
-        drm_encoder_init(dev, encoder, &nv04_dfp_funcs, type);
+        drm_encoder_init(connector->dev, encoder, &nv04_dfp_funcs, type);
        drm_encoder_helper_add(encoder, helper);
        encoder->possible_crtcs = entry->heads;
        encoder->possible_clones = 0;
+        drm_mode_connector_attach_encoder(connector, encoder);
        return 0;
 }
diff --git a/drivers/gpu/drm/nouveau/nv04_display.c b/drivers/gpu/drm/nouveau/nv04_display.c
index c7898b4f6dfb..9e28cf772e3c 100644
--- a/drivers/gpu/drm/nouveau/nv04_display.c
+++ b/drivers/gpu/drm/nouveau/nv04_display.c
@@ -32,8 +32,6 @@
 #include "nouveau_encoder.h"
 #include "nouveau_connector.h"
-#define MULTIPLE_ENCODERS(e) (e & (e - 1))
 static void
 nv04_display_store_initial_head_owner(struct drm_device *dev)
 {
@@ -41,7 +39,7 @@ nv04_display_store_initial_head_owner(struct drm_device *dev)
        if (dev_priv->chipset != 0x11) {
                dev_priv->crtc_owner = NVReadVgaCrtc(dev, 0, NV_CIO_CRE_44);
-                goto ownerknown;
+                return;
        }
        /* reading CR44 is broken on nv11, so we attempt to infer it */
@@ -52,8 +50,6 @@ nv04_display_store_initial_head_owner(struct drm_device *dev)
                bool tvA = false;
                bool tvB = false;
-                NVLockVgaCrtcs(dev, false);
                slaved_on_B = NVReadVgaCrtc(dev, 1, NV_CIO_CRE_PIXEL_INDEX) &
                                                                        0x80;
                if (slaved_on_B)
@@ -66,8 +62,6 @@ nv04_display_store_initial_head_owner(struct drm_device *dev)
                        tvA = !(NVReadVgaCrtc(dev, 0, NV_CIO_CRE_LCD__INDEX) &
                                        MASK(NV_CIO_CRE_LCD_LCD_SELECT));
-                NVLockVgaCrtcs(dev, true);
                if (slaved_on_A && !tvA)
                        dev_priv->crtc_owner = 0x0;
                else if (slaved_on_B && !tvB)
@@ -79,14 +73,40 @@ nv04_display_store_initial_head_owner(struct drm_device *dev)
                else
                        dev_priv->crtc_owner = 0x0;
        }
+}
+int
+nv04_display_early_init(struct drm_device *dev)
+{
+        /* Make the I2C buses accessible. */
+        if (!nv_gf4_disp_arch(dev)) {
+                uint32_t pmc_enable = nv_rd32(dev, NV03_PMC_ENABLE);
+                if (!(pmc_enable & 1))
+                        nv_wr32(dev, NV03_PMC_ENABLE, pmc_enable | 1);
+        }
-ownerknown:
+        /* Unlock the VGA CRTCs. */
-        NV_INFO(dev, "Initial CRTC_OWNER is %d\n", dev_priv->crtc_owner);
+        NVLockVgaCrtcs(dev, false);
+        /* Make sure the CRTCs aren't in slaved mode. */
+        if (nv_two_heads(dev)) {
+                nv04_display_store_initial_head_owner(dev);
+                NVSetOwner(dev, 0);
+        }
+        return 0;
+}
+void
+nv04_display_late_takedown(struct drm_device *dev)
+{
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        if (nv_two_heads(dev))
+                NVSetOwner(dev, dev_priv->crtc_owner);
-        /* we need to ensure the heads are not tied henceforth, or reading any
+        NVLockVgaCrtcs(dev, true);
-         * 8 bit reg on head B will fail
-         * setting a single arbitrary head solves that */
-        NVSetOwner(dev, 0);
 }
 int
@@ -94,14 +114,13 @@ nv04_display_create(struct drm_device *dev)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct dcb_table *dcb = &dev_priv->vbios.dcb;
+        struct drm_connector *connector, *ct;
        struct drm_encoder *encoder;
        struct drm_crtc *crtc;
        int i, ret;
        NV_DEBUG_KMS(dev, "\n");
-        if (nv_two_heads(dev))
-                nv04_display_store_initial_head_owner(dev);
        nouveau_hw_save_vga_fonts(dev, 1);
        drm_mode_config_init(dev);
@@ -132,19 +151,23 @@ nv04_display_create(struct drm_device *dev)
        for (i = 0; i < dcb->entries; i++) {
                struct dcb_entry *dcbent = &dcb->entry[i];
+                connector = nouveau_connector_create(dev, dcbent->connector);
+                if (IS_ERR(connector))
+                        continue;
                switch (dcbent->type) {
                case OUTPUT_ANALOG:
-                        ret = nv04_dac_create(dev, dcbent);
+                        ret = nv04_dac_create(connector, dcbent);
                        break;
                case OUTPUT_LVDS:
                case OUTPUT_TMDS:
-                        ret = nv04_dfp_create(dev, dcbent);
+                        ret = nv04_dfp_create(connector, dcbent);
                        break;
                case OUTPUT_TV:
                        if (dcbent->location == DCB_LOC_ON_CHIP)
-                                ret = nv17_tv_create(dev, dcbent);
+                                ret = nv17_tv_create(connector, dcbent);
                        else
-                                ret = nv04_tv_create(dev, dcbent);
+                                ret = nv04_tv_create(connector, dcbent);
                        break;
                default:
                        NV_WARN(dev, "DCB type %d not known\n", dcbent->type);
@@ -155,12 +178,16 @@ nv04_display_create(struct drm_device *dev)
                        continue;
        }
-        for (i = 0; i < dcb->connector.entries; i++)
+        list_for_each_entry_safe(connector, ct,
-                nouveau_connector_create(dev, &dcb->connector.entry[i]);
+                                 &dev->mode_config.connector_list, head) {
+                if (!connector->encoder_ids[0]) {
+                        NV_WARN(dev, "%s has no encoders, removing\n",
+                                drm_get_connector_name(connector));
+                        connector->funcs->destroy(connector);
+                }
+        }
        /* Save previous state */
-        NVLockVgaCrtcs(dev, false);
        list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
                crtc->funcs->save(crtc);
@@ -191,8 +218,6 @@ nv04_display_destroy(struct drm_device *dev)
        }
        /* Restore state */
-        NVLockVgaCrtcs(dev, false);
        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
                struct drm_encoder_helper_funcs *func = encoder->helper_private;
@@ -207,15 +232,12 @@ nv04_display_destroy(struct drm_device *dev)
        nouveau_hw_save_vga_fonts(dev, 0);
 }
-void
+int
-nv04_display_restore(struct drm_device *dev)
+nv04_display_init(struct drm_device *dev)
 {
-        struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct drm_encoder *encoder;
        struct drm_crtc *crtc;
-        NVLockVgaCrtcs(dev, false);
        /* meh.. modeset apparently doesn't setup all the regs and depends
         * on pre-existing state, for now load the state of the card *before*
         * nouveau was loaded, and then do a modeset.
@@ -233,12 +255,6 @@ nv04_display_restore(struct drm_device *dev)
        list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
                crtc->funcs->restore(crtc);
-        if (nv_two_heads(dev)) {
+        return 0;
-                NV_INFO(dev, "Restoring CRTC_OWNER to %d.\n",
-                        dev_priv->crtc_owner);
-                NVSetOwner(dev, dev_priv->crtc_owner);
-        }
-        NVLockVgaCrtcs(dev, true);
 }
diff --git a/drivers/gpu/drm/nouveau/nv04_fifo.c b/drivers/gpu/drm/nouveau/nv04_fifo.c
index 66fe55983b6e..06cedd99c26a 100644
--- a/drivers/gpu/drm/nouveau/nv04_fifo.c
+++ b/drivers/gpu/drm/nouveau/nv04_fifo.c
@@ -112,6 +112,12 @@ nv04_fifo_channel_id(struct drm_device *dev)
                        NV03_PFIFO_CACHE1_PUSH1_CHID_MASK;
 }
+#ifdef __BIG_ENDIAN
+#define DMA_FETCH_ENDIANNESS NV_PFIFO_CACHE1_BIG_ENDIAN
+#else
+#define DMA_FETCH_ENDIANNESS 0
+#endif
 int
 nv04_fifo_create_context(struct nouveau_channel *chan)
 {
@@ -131,18 +137,13 @@ nv04_fifo_create_context(struct nouveau_channel *chan)
        spin_lock_irqsave(&dev_priv->context_switch_lock, flags);
        /* Setup initial state */
-        dev_priv->engine.instmem.prepare_access(dev, true);
        RAMFC_WR(DMA_PUT, chan->pushbuf_base);
        RAMFC_WR(DMA_GET, chan->pushbuf_base);
        RAMFC_WR(DMA_INSTANCE, chan->pushbuf->instance >> 4);
        RAMFC_WR(DMA_FETCH, (NV_PFIFO_CACHE1_DMA_FETCH_TRIG_128_BYTES |
                             NV_PFIFO_CACHE1_DMA_FETCH_SIZE_128_BYTES |
                             NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_8 |
-#ifdef __BIG_ENDIAN
+                             DMA_FETCH_ENDIANNESS));
-                             NV_PFIFO_CACHE1_BIG_ENDIAN |
-#endif
-                             0));
-        dev_priv->engine.instmem.finish_access(dev);
        /* enable the fifo dma operation */
        nv_wr32(dev, NV04_PFIFO_MODE,
@@ -169,8 +170,6 @@ nv04_fifo_do_load_context(struct drm_device *dev, int chid)
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        uint32_t fc = NV04_RAMFC(chid), tmp;
-        dev_priv->engine.instmem.prepare_access(dev, false);
        nv_wr32(dev, NV04_PFIFO_CACHE1_DMA_PUT, nv_ri32(dev, fc + 0));
        nv_wr32(dev, NV04_PFIFO_CACHE1_DMA_GET, nv_ri32(dev, fc + 4));
        tmp = nv_ri32(dev, fc + 8);
@@ -181,8 +180,6 @@ nv04_fifo_do_load_context(struct drm_device *dev, int chid)
        nv_wr32(dev, NV04_PFIFO_CACHE1_ENGINE, nv_ri32(dev, fc + 20));
        nv_wr32(dev, NV04_PFIFO_CACHE1_PULL1, nv_ri32(dev, fc + 24));
-        dev_priv->engine.instmem.finish_access(dev);
        nv_wr32(dev, NV03_PFIFO_CACHE1_GET, 0);
        nv_wr32(dev, NV03_PFIFO_CACHE1_PUT, 0);
 }
@@ -223,7 +220,6 @@ nv04_fifo_unload_context(struct drm_device *dev)
                return -EINVAL;
        }
-        dev_priv->engine.instmem.prepare_access(dev, true);
        RAMFC_WR(DMA_PUT, nv_rd32(dev, NV04_PFIFO_CACHE1_DMA_PUT));
        RAMFC_WR(DMA_GET, nv_rd32(dev, NV04_PFIFO_CACHE1_DMA_GET));
        tmp  = nv_rd32(dev, NV04_PFIFO_CACHE1_DMA_DCOUNT) << 16;
@@ -233,7 +229,6 @@ nv04_fifo_unload_context(struct drm_device *dev)
        RAMFC_WR(DMA_FETCH, nv_rd32(dev, NV04_PFIFO_CACHE1_DMA_FETCH));
        RAMFC_WR(ENGINE, nv_rd32(dev, NV04_PFIFO_CACHE1_ENGINE));
        RAMFC_WR(PULL1_ENGINE, nv_rd32(dev, NV04_PFIFO_CACHE1_PULL1));
-        dev_priv->engine.instmem.finish_access(dev);
        nv04_fifo_do_load_context(dev, pfifo->channels - 1);
        nv_wr32(dev, NV03_PFIFO_CACHE1_PUSH1, pfifo->channels - 1);
@@ -297,6 +292,7 @@ nv04_fifo_init(struct drm_device *dev)
        nv04_fifo_init_intr(dev);
        pfifo->enable(dev);
+        pfifo->reassign(dev, true);
        for (i = 0; i < dev_priv->engine.fifo.channels; i++) {
                if (dev_priv->fifos[i]) {
diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c
index 618355e9cdd5..c8973421b635 100644
--- a/drivers/gpu/drm/nouveau/nv04_graph.c
+++ b/drivers/gpu/drm/nouveau/nv04_graph.c
@@ -342,7 +342,7 @@ static uint32_t nv04_graph_ctx_regs[] = {
 };
 struct graph_state {
-        int nv04[ARRAY_SIZE(nv04_graph_ctx_regs)];
+        uint32_t nv04[ARRAY_SIZE(nv04_graph_ctx_regs)];
 };
 struct nouveau_channel *
@@ -527,8 +527,7 @@ static int
 nv04_graph_mthd_set_ref(struct nouveau_channel *chan, int grclass,
                        int mthd, uint32_t data)
 {
-        chan->fence.last_sequence_irq = data;
+        atomic_set(&chan->fence.last_sequence_irq, data);
-        nouveau_fence_handler(chan->dev, chan->id);
        return 0;
 }
diff --git a/drivers/gpu/drm/nouveau/nv04_instmem.c b/drivers/gpu/drm/nouveau/nv04_instmem.c
index a3b9563a6f60..4408232d33f1 100644
--- a/drivers/gpu/drm/nouveau/nv04_instmem.c
+++ b/drivers/gpu/drm/nouveau/nv04_instmem.c
@@ -49,10 +49,8 @@ nv04_instmem_determine_amount(struct drm_device *dev)
        NV_DEBUG(dev, "RAMIN size: %dKiB\n", dev_priv->ramin_rsvd_vram >> 10);
        /* Clear all of it, except the BIOS image that's in the first 64KiB */
-        dev_priv->engine.instmem.prepare_access(dev, true);
        for (i = 64 * 1024; i < dev_priv->ramin_rsvd_vram; i += 4)
                nv_wi32(dev, i, 0x00000000);
-        dev_priv->engine.instmem.finish_access(dev);
 }
 static void
@@ -106,7 +104,7 @@ int nv04_instmem_init(struct drm_device *dev)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        uint32_t offset;
-        int ret = 0;
+        int ret;
        nv04_instmem_determine_amount(dev);
        nv04_instmem_configure_fixed_tables(dev);
@@ -129,14 +127,14 @@ int nv04_instmem_init(struct drm_device *dev)
                        offset = 0x40000;
        }
-        ret = nouveau_mem_init_heap(&dev_priv->ramin_heap,
+        ret = drm_mm_init(&dev_priv->ramin_heap, offset,
-                                    offset, dev_priv->ramin_rsvd_vram - offset);
+                          dev_priv->ramin_rsvd_vram - offset);
        if (ret) {
-                dev_priv->ramin_heap = NULL;
+                NV_ERROR(dev, "Failed to init RAMIN heap: %d\n", ret);
-                NV_ERROR(dev, "Failed to init RAMIN heap\n");
+                return ret;
        }
-        return ret;
+        return 0;
 }
 void
@@ -186,12 +184,7 @@ nv04_instmem_unbind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
 }
 void
-nv04_instmem_prepare_access(struct drm_device *dev, bool write)
+nv04_instmem_flush(struct drm_device *dev)
-{
-}
-void
-nv04_instmem_finish_access(struct drm_device *dev)
 {
 }
diff --git a/drivers/gpu/drm/nouveau/nv04_mc.c b/drivers/gpu/drm/nouveau/nv04_mc.c
index 617ed1e05269..2af43a1cb2ec 100644
--- a/drivers/gpu/drm/nouveau/nv04_mc.c
+++ b/drivers/gpu/drm/nouveau/nv04_mc.c
@@ -11,6 +11,10 @@ nv04_mc_init(struct drm_device *dev)
         */
        nv_wr32(dev, NV03_PMC_ENABLE, 0xFFFFFFFF);
+        /* Disable PROM access. */
+        nv_wr32(dev, NV_PBUS_PCI_NV_20, NV_PBUS_PCI_NV_20_ROM_SHADOW_ENABLED);
        return 0;
 }
diff --git a/drivers/gpu/drm/nouveau/nv04_tv.c b/drivers/gpu/drm/nouveau/nv04_tv.c
index c4e3404337d4..94e299cef0b2 100644
--- a/drivers/gpu/drm/nouveau/nv04_tv.c
+++ b/drivers/gpu/drm/nouveau/nv04_tv.c
@@ -34,69 +34,26 @@
 #include "i2c/ch7006.h"
-static struct {
+static struct i2c_board_info nv04_tv_encoder_info[] = {
-        struct i2c_board_info board_info;
-        struct drm_encoder_funcs funcs;
-        struct drm_encoder_helper_funcs hfuncs;
-        void *params;
-} nv04_tv_encoder_info[] = {
        {
-                .board_info = { I2C_BOARD_INFO("ch7006", 0x75) },
+                I2C_BOARD_INFO("ch7006", 0x75),
-                .params = &(struct ch7006_encoder_params) {
+                .platform_data = &(struct ch7006_encoder_params) {
                        CH7006_FORMAT_RGB24m12I, CH7006_CLOCK_MASTER,
                        0, 0, 0,
                        CH7006_SYNC_SLAVE, CH7006_SYNC_SEPARATED,
                        CH7006_POUT_3_3V, CH7006_ACTIVE_HSYNC
-                },
+                }
        },
+        { }
 };
-static bool probe_i2c_addr(struct i2c_adapter *adapter, int addr)
-{
-        struct i2c_msg msg = {
-                .addr = addr,
-                .len = 0,
-        };
-        return i2c_transfer(adapter, &msg, 1) == 1;
-}
 int nv04_tv_identify(struct drm_device *dev, int i2c_index)
 {
-        struct nouveau_i2c_chan *i2c;
+        return nouveau_i2c_identify(dev, "TV encoder",
-        bool was_locked;
+                                    nv04_tv_encoder_info, i2c_index);
-        int i, ret;
-        NV_TRACE(dev, "Probing TV encoders on I2C bus: %d\n", i2c_index);
-        i2c = nouveau_i2c_find(dev, i2c_index);
-        if (!i2c)
-                return -ENODEV;
-        was_locked = NVLockVgaCrtcs(dev, false);
-        for (i = 0; i < ARRAY_SIZE(nv04_tv_encoder_info); i++) {
-                if (probe_i2c_addr(&i2c->adapter,
-                                   nv04_tv_encoder_info[i].board_info.addr)) {
-                        ret = i;
-                        break;
-                }
-        }
-        if (i < ARRAY_SIZE(nv04_tv_encoder_info)) {
-                NV_TRACE(dev, "Detected TV encoder: %s\n",
-                         nv04_tv_encoder_info[i].board_info.type);
-        } else {
-                NV_TRACE(dev, "No TV encoders found.\n");
-                i = -ENODEV;
-        }
-        NVLockVgaCrtcs(dev, was_locked);
-        return i;
 }
 #define PLLSEL_TV_CRTC1_MASK                            \
        (NV_PRAMDAC_PLL_COEFF_SELECT_TV_VSCLK1          \
         | NV_PRAMDAC_PLL_COEFF_SELECT_TV_PCLK1)
@@ -214,30 +171,32 @@ static void nv04_tv_commit(struct drm_encoder *encoder)
 static void nv04_tv_destroy(struct drm_encoder *encoder)
 {
-        struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
        to_encoder_slave(encoder)->slave_funcs->destroy(encoder);
        drm_encoder_cleanup(encoder);
-        kfree(nv_encoder);
+        kfree(encoder->helper_private);
+        kfree(nouveau_encoder(encoder));
 }
-int nv04_tv_create(struct drm_device *dev, struct dcb_entry *entry)
+static const struct drm_encoder_funcs nv04_tv_funcs = {
+        .destroy = nv04_tv_destroy,
+};
+int
+nv04_tv_create(struct drm_connector *connector, struct dcb_entry *entry)
 {
        struct nouveau_encoder *nv_encoder;
        struct drm_encoder *encoder;
-        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct drm_device *dev = connector->dev;
-        struct i2c_adapter *adap;
+        struct drm_encoder_helper_funcs *hfuncs;
-        struct drm_encoder_funcs *funcs = NULL;
+        struct drm_encoder_slave_funcs *sfuncs;
-        struct drm_encoder_helper_funcs *hfuncs = NULL;
+        struct nouveau_i2c_chan *i2c =
-        struct drm_encoder_slave_funcs *sfuncs = NULL;
+                nouveau_i2c_find(dev, entry->i2c_index);
-        int i2c_index = entry->i2c_index;
        int type, ret;
-        bool was_locked;
        /* Ensure that we can talk to this encoder */
-        type = nv04_tv_identify(dev, i2c_index);
+        type = nv04_tv_identify(dev, entry->i2c_index);
        if (type < 0)
                return type;
@@ -246,41 +205,32 @@ int nv04_tv_create(struct drm_device *dev, struct dcb_entry *entry)
        if (!nv_encoder)
                return -ENOMEM;
+        hfuncs = kzalloc(sizeof(*hfuncs), GFP_KERNEL);
+        if (!hfuncs) {
+                ret = -ENOMEM;
+                goto fail_free;
+        }
        /* Initialize the common members */
        encoder = to_drm_encoder(nv_encoder);
-        funcs = &nv04_tv_encoder_info[type].funcs;
+        drm_encoder_init(dev, encoder, &nv04_tv_funcs, DRM_MODE_ENCODER_TVDAC);
-        hfuncs = &nv04_tv_encoder_info[type].hfuncs;
-        drm_encoder_init(dev, encoder, funcs, DRM_MODE_ENCODER_TVDAC);
        drm_encoder_helper_add(encoder, hfuncs);
        encoder->possible_crtcs = entry->heads;
        encoder->possible_clones = 0;
        nv_encoder->dcb = entry;
        nv_encoder->or = ffs(entry->or) - 1;
        /* Run the slave-specific initialization */
-        adap = &dev_priv->vbios.dcb.i2c[i2c_index].chan->adapter;
+        ret = drm_i2c_encoder_init(dev, to_encoder_slave(encoder),
+                                   &i2c->adapter, &nv04_tv_encoder_info[type]);
-        was_locked = NVLockVgaCrtcs(dev, false);
-        ret = drm_i2c_encoder_init(encoder->dev, to_encoder_slave(encoder), adap,
-                                   &nv04_tv_encoder_info[type].board_info);
-        NVLockVgaCrtcs(dev, was_locked);
        if (ret < 0)
-                goto fail;
+                goto fail_cleanup;
        /* Fill the function pointers */
        sfuncs = to_encoder_slave(encoder)->slave_funcs;
-        *funcs = (struct drm_encoder_funcs) {
-                .destroy = nv04_tv_destroy,
-        };
        *hfuncs = (struct drm_encoder_helper_funcs) {
                .dpms = nv04_tv_dpms,
                .save = sfuncs->save,
@@ -292,14 +242,17 @@ int nv04_tv_create(struct drm_device *dev, struct dcb_entry *entry)
                .detect = sfuncs->detect,
        };
-        /* Set the slave encoder configuration */
+        /* Attach it to the specified connector. */
-        sfuncs->set_config(encoder, nv04_tv_encoder_info[type].params);
+        sfuncs->set_config(encoder, nv04_tv_encoder_info[type].platform_data);
+        sfuncs->create_resources(encoder, connector);
+        drm_mode_connector_attach_encoder(connector, encoder);
        return 0;
-fail:
+fail_cleanup:
        drm_encoder_cleanup(encoder);
+        kfree(hfuncs);
+fail_free:
        kfree(nv_encoder);
        return ret;
 }
diff --git a/drivers/gpu/drm/nouveau/nv10_fifo.c b/drivers/gpu/drm/nouveau/nv10_fifo.c
index 7aeabf262bc0..7a4069cf5d0b 100644
--- a/drivers/gpu/drm/nouveau/nv10_fifo.c
+++ b/drivers/gpu/drm/nouveau/nv10_fifo.c
@@ -55,7 +55,6 @@ nv10_fifo_create_context(struct nouveau_channel *chan)
        /* Fill entries that are seen filled in dumps of nvidia driver just
         * after channel's is put into DMA mode
         */
-        dev_priv->engine.instmem.prepare_access(dev, true);
        nv_wi32(dev, fc +  0, chan->pushbuf_base);
        nv_wi32(dev, fc +  4, chan->pushbuf_base);
        nv_wi32(dev, fc + 12, chan->pushbuf->instance >> 4);
@@ -66,7 +65,6 @@ nv10_fifo_create_context(struct nouveau_channel *chan)
                              NV_PFIFO_CACHE1_BIG_ENDIAN |
 #endif
                              0);
-        dev_priv->engine.instmem.finish_access(dev);
        /* enable the fifo dma operation */
        nv_wr32(dev, NV04_PFIFO_MODE,
@@ -91,8 +89,6 @@ nv10_fifo_do_load_context(struct drm_device *dev, int chid)
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        uint32_t fc = NV10_RAMFC(chid), tmp;
-        dev_priv->engine.instmem.prepare_access(dev, false);
        nv_wr32(dev, NV04_PFIFO_CACHE1_DMA_PUT, nv_ri32(dev, fc + 0));
        nv_wr32(dev, NV04_PFIFO_CACHE1_DMA_GET, nv_ri32(dev, fc + 4));
        nv_wr32(dev, NV10_PFIFO_CACHE1_REF_CNT, nv_ri32(dev, fc + 8));
@@ -117,8 +113,6 @@ nv10_fifo_do_load_context(struct drm_device *dev, int chid)
        nv_wr32(dev, NV10_PFIFO_CACHE1_DMA_SUBROUTINE, nv_ri32(dev, fc + 48));
 out:
-        dev_priv->engine.instmem.finish_access(dev);
        nv_wr32(dev, NV03_PFIFO_CACHE1_GET, 0);
        nv_wr32(dev, NV03_PFIFO_CACHE1_PUT, 0);
 }
@@ -155,8 +149,6 @@ nv10_fifo_unload_context(struct drm_device *dev)
                return 0;
        fc = NV10_RAMFC(chid);
-        dev_priv->engine.instmem.prepare_access(dev, true);
        nv_wi32(dev, fc +  0, nv_rd32(dev, NV04_PFIFO_CACHE1_DMA_PUT));
        nv_wi32(dev, fc +  4, nv_rd32(dev, NV04_PFIFO_CACHE1_DMA_GET));
        nv_wi32(dev, fc +  8, nv_rd32(dev, NV10_PFIFO_CACHE1_REF_CNT));
@@ -179,8 +171,6 @@ nv10_fifo_unload_context(struct drm_device *dev)
        nv_wi32(dev, fc + 48, nv_rd32(dev, NV04_PFIFO_CACHE1_DMA_GET));
 out:
-        dev_priv->engine.instmem.finish_access(dev);
        nv10_fifo_do_load_context(dev, pfifo->channels - 1);
        nv_wr32(dev, NV03_PFIFO_CACHE1_PUSH1, pfifo->channels - 1);
        return 0;
diff --git a/drivers/gpu/drm/nouveau/nv17_gpio.c b/drivers/gpu/drm/nouveau/nv10_gpio.c
index 2e58c331e9b7..007fc29e2f86 100644
--- a/drivers/gpu/drm/nouveau/nv17_gpio.c
+++ b/drivers/gpu/drm/nouveau/nv10_gpio.c
@@ -55,7 +55,7 @@ get_gpio_location(struct dcb_gpio_entry *ent, uint32_t *reg, uint32_t *shift,
 }
 int
-nv17_gpio_get(struct drm_device *dev, enum dcb_gpio_tag tag)
+nv10_gpio_get(struct drm_device *dev, enum dcb_gpio_tag tag)
 {
        struct dcb_gpio_entry *ent = nouveau_bios_gpio_entry(dev, tag);
        uint32_t reg, shift, mask, value;
@@ -72,7 +72,7 @@ nv17_gpio_get(struct drm_device *dev, enum dcb_gpio_tag tag)
 }
 int
-nv17_gpio_set(struct drm_device *dev, enum dcb_gpio_tag tag, int state)
+nv10_gpio_set(struct drm_device *dev, enum dcb_gpio_tag tag, int state)
 {
        struct dcb_gpio_entry *ent = nouveau_bios_gpio_entry(dev, tag);
        uint32_t reg, shift, mask, value;
diff --git a/drivers/gpu/drm/nouveau/nv17_tv.c b/drivers/gpu/drm/nouveau/nv17_tv.c
index 74c880374fb9..44fefb0c7083 100644
--- a/drivers/gpu/drm/nouveau/nv17_tv.c
+++ b/drivers/gpu/drm/nouveau/nv17_tv.c
@@ -37,6 +37,7 @@ static uint32_t nv42_tv_sample_load(struct drm_encoder *encoder)
 {
        struct drm_device *dev = encoder->dev;
        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct nouveau_gpio_engine *gpio = &dev_priv->engine.gpio;
        uint32_t testval, regoffset = nv04_dac_output_offset(encoder);
        uint32_t gpio0, gpio1, fp_htotal, fp_hsync_start, fp_hsync_end,
                fp_control, test_ctrl, dacclk, ctv_14, ctv_1c, ctv_6c;
@@ -52,8 +53,8 @@ static uint32_t nv42_tv_sample_load(struct drm_encoder *encoder)
        head = (dacclk & 0x100) >> 8;
        /* Save the previous state. */
-        gpio1 = nv17_gpio_get(dev, DCB_GPIO_TVDAC1);
+        gpio1 = gpio->get(dev, DCB_GPIO_TVDAC1);
-        gpio0 = nv17_gpio_get(dev, DCB_GPIO_TVDAC0);
+        gpio0 = gpio->get(dev, DCB_GPIO_TVDAC0);
        fp_htotal = NVReadRAMDAC(dev, head, NV_PRAMDAC_FP_HTOTAL);
        fp_hsync_start = NVReadRAMDAC(dev, head, NV_PRAMDAC_FP_HSYNC_START);
        fp_hsync_end = NVReadRAMDAC(dev, head, NV_PRAMDAC_FP_HSYNC_END);
@@ -64,8 +65,8 @@ static uint32_t nv42_tv_sample_load(struct drm_encoder *encoder)
        ctv_6c = NVReadRAMDAC(dev, head, 0x680c6c);
        /* Prepare the DAC for load detection.  */
-        nv17_gpio_set(dev, DCB_GPIO_TVDAC1, true);
+        gpio->set(dev, DCB_GPIO_TVDAC1, true);
-        nv17_gpio_set(dev, DCB_GPIO_TVDAC0, true);
+        gpio->set(dev, DCB_GPIO_TVDAC0, true);
        NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_HTOTAL, 1343);
        NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_HSYNC_START, 1047);
@@ -110,12 +111,27 @@ static uint32_t nv42_tv_sample_load(struct drm_encoder *encoder)
        NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_HSYNC_END, fp_hsync_end);
        NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_HSYNC_START, fp_hsync_start);
        NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_HTOTAL, fp_htotal);
-        nv17_gpio_set(dev, DCB_GPIO_TVDAC1, gpio1);
+        gpio->set(dev, DCB_GPIO_TVDAC1, gpio1);
-        nv17_gpio_set(dev, DCB_GPIO_TVDAC0, gpio0);
+        gpio->set(dev, DCB_GPIO_TVDAC0, gpio0);
        return sample;
 }
+static bool
+get_tv_detect_quirks(struct drm_device *dev, uint32_t *pin_mask)
+{
+        /* Zotac FX5200 */
+        if (dev->pdev->device == 0x0322 &&
+            dev->pdev->subsystem_vendor == 0x19da &&
+            (dev->pdev->subsystem_device == 0x1035 ||
+             dev->pdev->subsystem_device == 0x2035)) {
+                *pin_mask = 0xc;
+                return false;
+        }
+        return true;
+}
 static enum drm_connector_status
 nv17_tv_detect(struct drm_encoder *encoder, struct drm_connector *connector)
 {
@@ -124,12 +140,20 @@ nv17_tv_detect(struct drm_encoder *encoder, struct drm_connector *connector)
        struct drm_mode_config *conf = &dev->mode_config;
        struct nv17_tv_encoder *tv_enc = to_tv_enc(encoder);
        struct dcb_entry *dcb = tv_enc->base.dcb;
+        bool reliable = get_tv_detect_quirks(dev, &tv_enc->pin_mask);
-        if (dev_priv->chipset == 0x42 ||
+        if (nv04_dac_in_use(encoder))
-            dev_priv->chipset == 0x43)
+                return connector_status_disconnected;
-                tv_enc->pin_mask = nv42_tv_sample_load(encoder) >> 28 & 0xe;
-        else
+        if (reliable) {
-                tv_enc->pin_mask = nv17_dac_sample_load(encoder) >> 28 & 0xe;
+                if (dev_priv->chipset == 0x42 ||
+                    dev_priv->chipset == 0x43)
+                        tv_enc->pin_mask =
+                                nv42_tv_sample_load(encoder) >> 28 & 0xe;
+                else
+                        tv_enc->pin_mask =
+                                nv17_dac_sample_load(encoder) >> 28 & 0xe;
+        }
        switch (tv_enc->pin_mask) {
        case 0x2:
@@ -154,7 +178,9 @@ nv17_tv_detect(struct drm_encoder *encoder, struct drm_connector *connector)
                                         conf->tv_subconnector_property,
                                         tv_enc->subconnector);
-        if (tv_enc->subconnector) {
+        if (!reliable) {
+                return connector_status_unknown;
+        } else if (tv_enc->subconnector) {
                NV_INFO(dev, "Load detected on output %c\n",
                        '@' + ffs(dcb->or));
                return connector_status_connected;
@@ -296,6 +322,9 @@ static bool nv17_tv_mode_fixup(struct drm_encoder *encoder,
 {
        struct nv17_tv_norm_params *tv_norm = get_tv_norm(encoder);
+        if (nv04_dac_in_use(encoder))
+                return false;
        if (tv_norm->kind == CTV_ENC_MODE)
                adjusted_mode->clock = tv_norm->ctv_enc_mode.mode.clock;
        else
@@ -307,6 +336,8 @@ static bool nv17_tv_mode_fixup(struct drm_encoder *encoder,
 static void  nv17_tv_dpms(struct drm_encoder *encoder, int mode)
 {
        struct drm_device *dev = encoder->dev;
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct nouveau_gpio_engine *gpio = &dev_priv->engine.gpio;
        struct nv17_tv_state *regs = &to_tv_enc(encoder)->state;
        struct nv17_tv_norm_params *tv_norm = get_tv_norm(encoder);
@@ -331,8 +362,8 @@ static void  nv17_tv_dpms(struct drm_encoder *encoder, int mode)
        nv_load_ptv(dev, regs, 200);
-        nv17_gpio_set(dev, DCB_GPIO_TVDAC1, mode == DRM_MODE_DPMS_ON);
+        gpio->set(dev, DCB_GPIO_TVDAC1, mode == DRM_MODE_DPMS_ON);
-        nv17_gpio_set(dev, DCB_GPIO_TVDAC0, mode == DRM_MODE_DPMS_ON);
+        gpio->set(dev, DCB_GPIO_TVDAC0, mode == DRM_MODE_DPMS_ON);
        nv04_dac_update_dacclk(encoder, mode == DRM_MODE_DPMS_ON);
 }
@@ -744,8 +775,10 @@ static struct drm_encoder_funcs nv17_tv_funcs = {
        .destroy = nv17_tv_destroy,
 };
-int nv17_tv_create(struct drm_device *dev, struct dcb_entry *entry)
+int
+nv17_tv_create(struct drm_connector *connector, struct dcb_entry *entry)
 {
+        struct drm_device *dev = connector->dev;
        struct drm_encoder *encoder;
        struct nv17_tv_encoder *tv_enc = NULL;
@@ -774,5 +807,7 @@ int nv17_tv_create(struct drm_device *dev, struct dcb_entry *entry)
        encoder->possible_crtcs = entry->heads;
        encoder->possible_clones = 0;
+        nv17_tv_create_resources(encoder, connector);
+        drm_mode_connector_attach_encoder(connector, encoder);
        return 0;
 }
diff --git a/drivers/gpu/drm/nouveau/nv20_graph.c b/drivers/gpu/drm/nouveau/nv20_graph.c
index d6fc0a82f03d..17f309b36c91 100644
--- a/drivers/gpu/drm/nouveau/nv20_graph.c
+++ b/drivers/gpu/drm/nouveau/nv20_graph.c
@@ -370,68 +370,54 @@ nv20_graph_create_context(struct nouveau_channel *chan)
 {
        struct drm_device *dev = chan->dev;
        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;
        void (*ctx_init)(struct drm_device *, struct nouveau_gpuobj *);
-        unsigned int ctx_size;
        unsigned int idoffs = 0x28/4;
        int ret;
        switch (dev_priv->chipset) {
        case 0x20:
-                ctx_size = NV20_GRCTX_SIZE;
                ctx_init = nv20_graph_context_init;
                idoffs = 0;
                break;
        case 0x25:
        case 0x28:
-                ctx_size = NV25_GRCTX_SIZE;
                ctx_init = nv25_graph_context_init;
                break;
        case 0x2a:
-                ctx_size = NV2A_GRCTX_SIZE;
                ctx_init = nv2a_graph_context_init;
                idoffs = 0;
                break;
        case 0x30:
        case 0x31:
-                ctx_size = NV30_31_GRCTX_SIZE;
                ctx_init = nv30_31_graph_context_init;
                break;
        case 0x34:
-                ctx_size = NV34_GRCTX_SIZE;
                ctx_init = nv34_graph_context_init;
                break;
        case 0x35:
        case 0x36:
-                ctx_size = NV35_36_GRCTX_SIZE;
                ctx_init = nv35_36_graph_context_init;
                break;
        default:
-                ctx_size = 0;
+                BUG_ON(1);
-                ctx_init = nv35_36_graph_context_init;
-                NV_ERROR(dev, "Please contact the devs if you want your NV%x"
-                              " card to work\n", dev_priv->chipset);
-                return -ENOSYS;
-                break;
        }
-        ret = nouveau_gpuobj_new_ref(dev, chan, NULL, 0, ctx_size, 16,
+        ret = nouveau_gpuobj_new_ref(dev, chan, NULL, 0, pgraph->grctx_size,
-                                          NVOBJ_FLAG_ZERO_ALLOC,
+                                     16, NVOBJ_FLAG_ZERO_ALLOC,
-                                          &chan->ramin_grctx);
+                                     &chan->ramin_grctx);
        if (ret)
                return ret;
        /* Initialise default context values */
-        dev_priv->engine.instmem.prepare_access(dev, true);
        ctx_init(dev, chan->ramin_grctx->gpuobj);
        /* nv20: nv_wo32(dev, chan->ramin_grctx->gpuobj, 10, chan->id<<24); */
        nv_wo32(dev, chan->ramin_grctx->gpuobj, idoffs,
                                        (chan->id << 24) | 0x1); /* CTX_USER */
-        nv_wo32(dev, dev_priv->ctx_table->gpuobj, chan->id,
+        nv_wo32(dev, pgraph->ctx_table->gpuobj, chan->id,
-                        chan->ramin_grctx->instance >> 4);
+                     chan->ramin_grctx->instance >> 4);
-        dev_priv->engine.instmem.finish_access(dev);
        return 0;
 }
@@ -440,13 +426,12 @@ nv20_graph_destroy_context(struct nouveau_channel *chan)
 {
        struct drm_device *dev = chan->dev;
        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;
        if (chan->ramin_grctx)
                nouveau_gpuobj_ref_del(dev, &chan->ramin_grctx);
-        dev_priv->engine.instmem.prepare_access(dev, true);
+        nv_wo32(dev, pgraph->ctx_table->gpuobj, chan->id, 0);
-        nv_wo32(dev, dev_priv->ctx_table->gpuobj, chan->id, 0);
-        dev_priv->engine.instmem.finish_access(dev);
 }
 int
@@ -538,29 +523,44 @@ nv20_graph_set_region_tiling(struct drm_device *dev, int i, uint32_t addr,
 int
 nv20_graph_init(struct drm_device *dev)
 {
-        struct drm_nouveau_private *dev_priv =
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
-                (struct drm_nouveau_private *)dev->dev_private;
+        struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;
        uint32_t tmp, vramsz;
        int ret, i;
+        switch (dev_priv->chipset) {
+        case 0x20:
+                pgraph->grctx_size = NV20_GRCTX_SIZE;
+                break;
+        case 0x25:
+        case 0x28:
+                pgraph->grctx_size = NV25_GRCTX_SIZE;
+                break;
+        case 0x2a:
+                pgraph->grctx_size = NV2A_GRCTX_SIZE;
+                break;
+        default:
+                NV_ERROR(dev, "unknown chipset, disabling acceleration\n");
+                pgraph->accel_blocked = true;
+                return 0;
+        }
        nv_wr32(dev, NV03_PMC_ENABLE,
                nv_rd32(dev, NV03_PMC_ENABLE) & ~NV_PMC_ENABLE_PGRAPH);
        nv_wr32(dev, NV03_PMC_ENABLE,
                nv_rd32(dev, NV03_PMC_ENABLE) |  NV_PMC_ENABLE_PGRAPH);
-        if (!dev_priv->ctx_table) {
+        if (!pgraph->ctx_table) {
                /* Create Context Pointer Table */
-                dev_priv->ctx_table_size = 32 * 4;
+                ret = nouveau_gpuobj_new_ref(dev, NULL, NULL, 0, 32 * 4, 16,
-                ret = nouveau_gpuobj_new_ref(dev, NULL, NULL, 0,
-                                                  dev_priv->ctx_table_size, 16,
                                                  NVOBJ_FLAG_ZERO_ALLOC,
-                                                  &dev_priv->ctx_table);
+                                                  &pgraph->ctx_table);
                if (ret)
                        return ret;
        }
        nv_wr32(dev, NV20_PGRAPH_CHANNEL_CTX_TABLE,
-                 dev_priv->ctx_table->instance >> 4);
+                     pgraph->ctx_table->instance >> 4);
        nv20_graph_rdi(dev);
@@ -616,7 +616,7 @@ nv20_graph_init(struct drm_device *dev)
        nv_wr32(dev, NV10_PGRAPH_SURFACE, tmp);
        /* begin RAM config */
-        vramsz = drm_get_resource_len(dev, 0) - 1;
+        vramsz = pci_resource_len(dev->pdev, 0) - 1;
        nv_wr32(dev, 0x4009A4, nv_rd32(dev, NV04_PFB_CFG0));
        nv_wr32(dev, 0x4009A8, nv_rd32(dev, NV04_PFB_CFG1));
        nv_wr32(dev, NV10_PGRAPH_RDI_INDEX, 0x00EA0000);
@@ -644,34 +644,52 @@ void
 nv20_graph_takedown(struct drm_device *dev)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;
-        nouveau_gpuobj_ref_del(dev, &dev_priv->ctx_table);
+        nouveau_gpuobj_ref_del(dev, &pgraph->ctx_table);
 }
 int
 nv30_graph_init(struct drm_device *dev)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;
        int ret, i;
+        switch (dev_priv->chipset) {
+        case 0x30:
+        case 0x31:
+                pgraph->grctx_size = NV30_31_GRCTX_SIZE;
+                break;
+        case 0x34:
+                pgraph->grctx_size = NV34_GRCTX_SIZE;
+                break;
+        case 0x35:
+        case 0x36:
+                pgraph->grctx_size = NV35_36_GRCTX_SIZE;
+                break;
+        default:
+                NV_ERROR(dev, "unknown chipset, disabling acceleration\n");
+                pgraph->accel_blocked = true;
+                return 0;
+        }
        nv_wr32(dev, NV03_PMC_ENABLE,
                nv_rd32(dev, NV03_PMC_ENABLE) & ~NV_PMC_ENABLE_PGRAPH);
        nv_wr32(dev, NV03_PMC_ENABLE,
                nv_rd32(dev, NV03_PMC_ENABLE) |  NV_PMC_ENABLE_PGRAPH);
-        if (!dev_priv->ctx_table) {
+        if (!pgraph->ctx_table) {
                /* Create Context Pointer Table */
-                dev_priv->ctx_table_size = 32 * 4;
+                ret = nouveau_gpuobj_new_ref(dev, NULL, NULL, 0, 32 * 4, 16,
-                ret = nouveau_gpuobj_new_ref(dev, NULL, NULL, 0,
-                                                  dev_priv->ctx_table_size, 16,
                                                  NVOBJ_FLAG_ZERO_ALLOC,
-                                                  &dev_priv->ctx_table);
+                                                  &pgraph->ctx_table);
                if (ret)
                        return ret;
        }
        nv_wr32(dev, NV20_PGRAPH_CHANNEL_CTX_TABLE,
-                        dev_priv->ctx_table->instance >> 4);
+                     pgraph->ctx_table->instance >> 4);
        nv_wr32(dev, NV03_PGRAPH_INTR   , 0xFFFFFFFF);
        nv_wr32(dev, NV03_PGRAPH_INTR_EN, 0xFFFFFFFF);
@@ -717,7 +735,7 @@ nv30_graph_init(struct drm_device *dev)
        nv_wr32(dev, 0x0040075c             , 0x00000001);
        /* begin RAM config */
-        /* vramsz = drm_get_resource_len(dev, 0) - 1; */
+        /* vramsz = pci_resource_len(dev->pdev, 0) - 1; */
        nv_wr32(dev, 0x4009A4, nv_rd32(dev, NV04_PFB_CFG0));
        nv_wr32(dev, 0x4009A8, nv_rd32(dev, NV04_PFB_CFG1));
        if (dev_priv->chipset != 0x34) {
diff --git a/drivers/gpu/drm/nouveau/nv30_fb.c b/drivers/gpu/drm/nouveau/nv30_fb.c
new file mode 100644
index 000000000000..9d35c8b3b839
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nv30_fb.c
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2010 Francisco Jerez.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+#include "drmP.h"
+#include "drm.h"
+#include "nouveau_drv.h"
+#include "nouveau_drm.h"
+static int
+calc_ref(int b, int l, int i)
+{
+        int j, x = 0;
+        for (j = 0; j < 4; j++) {
+                int n = (b >> (8 * j) & 0xf);
+                int m = (l >> (8 * i) & 0xff) + 2 * (n & 0x8 ? n - 0x10 : n);
+                x |= (0x80 | (m & 0x1f)) << (8 * j);
+        }
+        return x;
+}
+int
+nv30_fb_init(struct drm_device *dev)
+{
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct nouveau_fb_engine *pfb = &dev_priv->engine.fb;
+        int i, j;
+        pfb->num_tiles = NV10_PFB_TILE__SIZE;
+        /* Turn all the tiling regions off. */
+        for (i = 0; i < pfb->num_tiles; i++)
+                pfb->set_region_tiling(dev, i, 0, 0, 0);
+        /* Init the memory timing regs at 0x10037c/0x1003ac */
+        if (dev_priv->chipset == 0x30 ||
+            dev_priv->chipset == 0x31 ||
+            dev_priv->chipset == 0x35) {
+                /* Related to ROP count */
+                int n = (dev_priv->chipset == 0x31 ? 2 : 4);
+                int b = (dev_priv->chipset > 0x30 ?
+                         nv_rd32(dev, 0x122c) & 0xf : 0);
+                int l = nv_rd32(dev, 0x1003d0);
+                for (i = 0; i < n; i++) {
+                        for (j = 0; j < 3; j++)
+                                nv_wr32(dev, 0x10037c + 0xc * i + 0x4 * j,
+                                        calc_ref(b, l, j));
+                        for (j = 0; j < 2; j++)
+                                nv_wr32(dev, 0x1003ac + 0x8 * i + 0x4 * j,
+                                        calc_ref(b, l, j));
+                }
+        }
+        return 0;
+}
+void
+nv30_fb_takedown(struct drm_device *dev)
+{
+}
diff --git a/drivers/gpu/drm/nouveau/nv40_fifo.c b/drivers/gpu/drm/nouveau/nv40_fifo.c
index 500ccfd3a0b8..2b67f1835c39 100644
--- a/drivers/gpu/drm/nouveau/nv40_fifo.c
+++ b/drivers/gpu/drm/nouveau/nv40_fifo.c
@@ -48,7 +48,6 @@ nv40_fifo_create_context(struct nouveau_channel *chan)
        spin_lock_irqsave(&dev_priv->context_switch_lock, flags);
-        dev_priv->engine.instmem.prepare_access(dev, true);
        nv_wi32(dev, fc +  0, chan->pushbuf_base);
        nv_wi32(dev, fc +  4, chan->pushbuf_base);
        nv_wi32(dev, fc + 12, chan->pushbuf->instance >> 4);
@@ -61,7 +60,6 @@ nv40_fifo_create_context(struct nouveau_channel *chan)
                              0x30000000 /* no idea.. */);
        nv_wi32(dev, fc + 56, chan->ramin_grctx->instance >> 4);
        nv_wi32(dev, fc + 60, 0x0001FFFF);
-        dev_priv->engine.instmem.finish_access(dev);
        /* enable the fifo dma operation */
        nv_wr32(dev, NV04_PFIFO_MODE,
@@ -89,8 +87,6 @@ nv40_fifo_do_load_context(struct drm_device *dev, int chid)
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        uint32_t fc = NV40_RAMFC(chid), tmp, tmp2;
-        dev_priv->engine.instmem.prepare_access(dev, false);
        nv_wr32(dev, NV04_PFIFO_CACHE1_DMA_PUT, nv_ri32(dev, fc + 0));
        nv_wr32(dev, NV04_PFIFO_CACHE1_DMA_GET, nv_ri32(dev, fc + 4));
        nv_wr32(dev, NV10_PFIFO_CACHE1_REF_CNT, nv_ri32(dev, fc + 8));
@@ -127,8 +123,6 @@ nv40_fifo_do_load_context(struct drm_device *dev, int chid)
        nv_wr32(dev, 0x2088, nv_ri32(dev, fc + 76));
        nv_wr32(dev, 0x3300, nv_ri32(dev, fc + 80));
-        dev_priv->engine.instmem.finish_access(dev);
        nv_wr32(dev, NV03_PFIFO_CACHE1_GET, 0);
        nv_wr32(dev, NV03_PFIFO_CACHE1_PUT, 0);
 }
@@ -166,7 +160,6 @@ nv40_fifo_unload_context(struct drm_device *dev)
                return 0;
        fc = NV40_RAMFC(chid);
-        dev_priv->engine.instmem.prepare_access(dev, true);
        nv_wi32(dev, fc + 0, nv_rd32(dev, NV04_PFIFO_CACHE1_DMA_PUT));
        nv_wi32(dev, fc + 4, nv_rd32(dev, NV04_PFIFO_CACHE1_DMA_GET));
        nv_wi32(dev, fc + 8, nv_rd32(dev, NV10_PFIFO_CACHE1_REF_CNT));
@@ -200,7 +193,6 @@ nv40_fifo_unload_context(struct drm_device *dev)
        tmp |= (nv_rd32(dev, NV04_PFIFO_CACHE1_PUT) << 16);
        nv_wi32(dev, fc + 72, tmp);
 #endif
-        dev_priv->engine.instmem.finish_access(dev);
        nv40_fifo_do_load_context(dev, pfifo->channels - 1);
        nv_wr32(dev, NV03_PFIFO_CACHE1_PUSH1,
diff --git a/drivers/gpu/drm/nouveau/nv40_graph.c b/drivers/gpu/drm/nouveau/nv40_graph.c
index 704a25d04ac9..fd7d2b501316 100644
--- a/drivers/gpu/drm/nouveau/nv40_graph.c
+++ b/drivers/gpu/drm/nouveau/nv40_graph.c
@@ -58,6 +58,7 @@ nv40_graph_create_context(struct nouveau_channel *chan)
        struct drm_device *dev = chan->dev;
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;
+        struct nouveau_grctx ctx = {};
        int ret;
        ret = nouveau_gpuobj_new_ref(dev, chan, NULL, 0, pgraph->grctx_size,
@@ -67,20 +68,13 @@ nv40_graph_create_context(struct nouveau_channel *chan)
                return ret;
        /* Initialise default context values */
-        dev_priv->engine.instmem.prepare_access(dev, true);
+        ctx.dev = chan->dev;
-        if (!pgraph->ctxprog) {
+        ctx.mode = NOUVEAU_GRCTX_VALS;
-                struct nouveau_grctx ctx = {};
+        ctx.data = chan->ramin_grctx->gpuobj;
+        nv40_grctx_init(&ctx);
-                ctx.dev = chan->dev;
-                ctx.mode = NOUVEAU_GRCTX_VALS;
-                ctx.data = chan->ramin_grctx->gpuobj;
-                nv40_grctx_init(&ctx);
-        } else {
-                nouveau_grctx_vals_load(dev, chan->ramin_grctx->gpuobj);
-        }
        nv_wo32(dev, chan->ramin_grctx->gpuobj, 0,
                     chan->ramin_grctx->gpuobj->im_pramin->start);
-        dev_priv->engine.instmem.finish_access(dev);
        return 0;
 }
@@ -238,7 +232,8 @@ nv40_graph_init(struct drm_device *dev)
        struct drm_nouveau_private *dev_priv =
                (struct drm_nouveau_private *)dev->dev_private;
        struct nouveau_fb_engine *pfb = &dev_priv->engine.fb;
-        uint32_t vramsz;
+        struct nouveau_grctx ctx = {};
+        uint32_t vramsz, *cp;
        int i, j;
        nv_wr32(dev, NV03_PMC_ENABLE, nv_rd32(dev, NV03_PMC_ENABLE) &
@@ -246,32 +241,22 @@ nv40_graph_init(struct drm_device *dev)
        nv_wr32(dev, NV03_PMC_ENABLE, nv_rd32(dev, NV03_PMC_ENABLE) |
                         NV_PMC_ENABLE_PGRAPH);
-        if (nouveau_ctxfw) {
+        cp = kmalloc(sizeof(*cp) * 256, GFP_KERNEL);
-                nouveau_grctx_prog_load(dev);
+        if (!cp)
-                dev_priv->engine.graph.grctx_size = 175 * 1024;
+                return -ENOMEM;
-        }
-        if (!dev_priv->engine.graph.ctxprog) {
+        ctx.dev = dev;
-                struct nouveau_grctx ctx = {};
+        ctx.mode = NOUVEAU_GRCTX_PROG;
-                uint32_t *cp;
+        ctx.data = cp;
+        ctx.ctxprog_max = 256;
+        nv40_grctx_init(&ctx);
+        dev_priv->engine.graph.grctx_size = ctx.ctxvals_pos * 4;
-                cp = kmalloc(sizeof(*cp) * 256, GFP_KERNEL);
+        nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_INDEX, 0);
-                if (!cp)
+        for (i = 0; i < ctx.ctxprog_len; i++)
-                        return -ENOMEM;
+                nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_DATA, cp[i]);
-                ctx.dev = dev;
+        kfree(cp);
-                ctx.mode = NOUVEAU_GRCTX_PROG;
-                ctx.data = cp;
-                ctx.ctxprog_max = 256;
-                nv40_grctx_init(&ctx);
-                dev_priv->engine.graph.grctx_size = ctx.ctxvals_pos * 4;
-                nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_INDEX, 0);
-                for (i = 0; i < ctx.ctxprog_len; i++)
-                        nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_DATA, cp[i]);
-                kfree(cp);
-        }
        /* No context present currently */
        nv_wr32(dev, NV40_PGRAPH_CTXCTL_CUR, 0x00000000);
@@ -367,7 +352,7 @@ nv40_graph_init(struct drm_device *dev)
                nv40_graph_set_region_tiling(dev, i, 0, 0, 0);
        /* begin RAM config */
-        vramsz = drm_get_resource_len(dev, 0) - 1;
+        vramsz = pci_resource_len(dev->pdev, 0) - 1;
        switch (dev_priv->chipset) {
        case 0x40:
                nv_wr32(dev, 0x4009A4, nv_rd32(dev, NV04_PFB_CFG0));
@@ -407,7 +392,6 @@ nv40_graph_init(struct drm_device *dev)
 void nv40_graph_takedown(struct drm_device *dev)
 {
-        nouveau_grctx_fini(dev);
 }
 struct nouveau_pgraph_object_class nv40_graph_grclass[] = {
diff --git a/drivers/gpu/drm/nouveau/nv40_mc.c b/drivers/gpu/drm/nouveau/nv40_mc.c
index 2a3495e848e9..e4e72c12ab6a 100644
--- a/drivers/gpu/drm/nouveau/nv40_mc.c
+++ b/drivers/gpu/drm/nouveau/nv40_mc.c
@@ -19,7 +19,7 @@ nv40_mc_init(struct drm_device *dev)
        case 0x46: /* G72 */
        case 0x4e:
        case 0x4c: /* C51_G7X */
-                tmp = nv_rd32(dev, NV40_PFB_020C);
+                tmp = nv_rd32(dev, NV04_PFB_FIFO_DATA);
                nv_wr32(dev, NV40_PMC_1700, tmp);
                nv_wr32(dev, NV40_PMC_1704, 0);
                nv_wr32(dev, NV40_PMC_1708, 0);
diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c b/drivers/gpu/drm/nouveau/nv50_crtc.c
index b4e4a3b05eae..5d11ea101666 100644
--- a/drivers/gpu/drm/nouveau/nv50_crtc.c
+++ b/drivers/gpu/drm/nouveau/nv50_crtc.c
@@ -440,47 +440,15 @@ nv50_crtc_prepare(struct drm_crtc *crtc)
 {
        struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
        struct drm_device *dev = crtc->dev;
-        struct drm_encoder *encoder;
-        uint32_t dac = 0, sor = 0;
        NV_DEBUG_KMS(dev, "index %d\n", nv_crtc->index);
-        /* Disconnect all unused encoders. */
-        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-                struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
-                if (!drm_helper_encoder_in_use(encoder))
-                        continue;
-                if (nv_encoder->dcb->type == OUTPUT_ANALOG ||
-                    nv_encoder->dcb->type == OUTPUT_TV)
-                        dac |= (1 << nv_encoder->or);
-                else
-                        sor |= (1 << nv_encoder->or);
-        }
-        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-                struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
-                if (nv_encoder->dcb->type == OUTPUT_ANALOG ||
-                    nv_encoder->dcb->type == OUTPUT_TV) {
-                        if (dac & (1 << nv_encoder->or))
-                                continue;
-                } else {
-                        if (sor & (1 << nv_encoder->or))
-                                continue;
-                }
-                nv_encoder->disconnect(nv_encoder);
-        }
        nv50_crtc_blank(nv_crtc, true);
 }
 static void
 nv50_crtc_commit(struct drm_crtc *crtc)
 {
-        struct drm_crtc *crtc2;
        struct drm_device *dev = crtc->dev;
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct nouveau_channel *evo = dev_priv->evo;
@@ -491,20 +459,14 @@ nv50_crtc_commit(struct drm_crtc *crtc)
        nv50_crtc_blank(nv_crtc, false);
-        /* Explicitly blank all unused crtc's. */
-        list_for_each_entry(crtc2, &dev->mode_config.crtc_list, head) {
-                if (!drm_helper_crtc_in_use(crtc2))
-                        nv50_crtc_blank(nouveau_crtc(crtc2), true);
-        }
        ret = RING_SPACE(evo, 2);
        if (ret) {
                NV_ERROR(dev, "no space while committing crtc\n");
                return;
        }
        BEGIN_RING(evo, 0, NV50_EVO_UPDATE, 1);
-        OUT_RING(evo, 0);
+        OUT_RING  (evo, 0);
-        FIRE_RING(evo);
+        FIRE_RING (evo);
 }
 static bool
diff --git a/drivers/gpu/drm/nouveau/nv50_dac.c b/drivers/gpu/drm/nouveau/nv50_dac.c
index 1fd9537beff6..1bc085962945 100644
--- a/drivers/gpu/drm/nouveau/nv50_dac.c
+++ b/drivers/gpu/drm/nouveau/nv50_dac.c
@@ -37,22 +37,31 @@
 #include "nv50_display.h"
 static void
-nv50_dac_disconnect(struct nouveau_encoder *nv_encoder)
+nv50_dac_disconnect(struct drm_encoder *encoder)
 {
-        struct drm_device *dev = to_drm_encoder(nv_encoder)->dev;
+        struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
+        struct drm_device *dev = encoder->dev;
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct nouveau_channel *evo = dev_priv->evo;
        int ret;
+        if (!nv_encoder->crtc)
+                return;
+        nv50_crtc_blank(nouveau_crtc(nv_encoder->crtc), true);
        NV_DEBUG_KMS(dev, "Disconnecting DAC %d\n", nv_encoder->or);
-        ret = RING_SPACE(evo, 2);
+        ret = RING_SPACE(evo, 4);
        if (ret) {
                NV_ERROR(dev, "no space while disconnecting DAC\n");
                return;
        }
        BEGIN_RING(evo, 0, NV50_EVO_DAC(nv_encoder->or, MODE_CTRL), 1);
-        OUT_RING(evo, 0);
+        OUT_RING  (evo, 0);
+        BEGIN_RING(evo, 0, NV50_EVO_UPDATE, 1);
+        OUT_RING  (evo, 0);
+        nv_encoder->crtc = NULL;
 }
 static enum drm_connector_status
@@ -213,7 +222,8 @@ nv50_dac_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,
        uint32_t mode_ctl = 0, mode_ctl2 = 0;
        int ret;
-        NV_DEBUG_KMS(dev, "or %d\n", nv_encoder->or);
+        NV_DEBUG_KMS(dev, "or %d type %d crtc %d\n",
+                     nv_encoder->or, nv_encoder->dcb->type, crtc->index);
        nv50_dac_dpms(encoder, DRM_MODE_DPMS_ON);
@@ -243,6 +253,14 @@ nv50_dac_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,
        BEGIN_RING(evo, 0, NV50_EVO_DAC(nv_encoder->or, MODE_CTRL), 2);
        OUT_RING(evo, mode_ctl);
        OUT_RING(evo, mode_ctl2);
+        nv_encoder->crtc = encoder->crtc;
+}
+static struct drm_crtc *
+nv50_dac_crtc_get(struct drm_encoder *encoder)
+{
+        return nouveau_encoder(encoder)->crtc;
 }
 static const struct drm_encoder_helper_funcs nv50_dac_helper_funcs = {
@@ -253,7 +271,9 @@ static const struct drm_encoder_helper_funcs nv50_dac_helper_funcs = {
        .prepare = nv50_dac_prepare,
        .commit = nv50_dac_commit,
        .mode_set = nv50_dac_mode_set,
-        .detect = nv50_dac_detect
+        .get_crtc = nv50_dac_crtc_get,
+        .detect = nv50_dac_detect,
+        .disable = nv50_dac_disconnect
 };
 static void
@@ -275,14 +295,11 @@ static const struct drm_encoder_funcs nv50_dac_encoder_funcs = {
 };
 int
-nv50_dac_create(struct drm_device *dev, struct dcb_entry *entry)
+nv50_dac_create(struct drm_connector *connector, struct dcb_entry *entry)
 {
        struct nouveau_encoder *nv_encoder;
        struct drm_encoder *encoder;
-        NV_DEBUG_KMS(dev, "\n");
-        NV_INFO(dev, "Detected a DAC output\n");
        nv_encoder = kzalloc(sizeof(*nv_encoder), GFP_KERNEL);
        if (!nv_encoder)
                return -ENOMEM;
@@ -291,14 +308,14 @@ nv50_dac_create(struct drm_device *dev, struct dcb_entry *entry)
        nv_encoder->dcb = entry;
        nv_encoder->or = ffs(entry->or) - 1;
-        nv_encoder->disconnect = nv50_dac_disconnect;
+        drm_encoder_init(connector->dev, encoder, &nv50_dac_encoder_funcs,
-        drm_encoder_init(dev, encoder, &nv50_dac_encoder_funcs,
                         DRM_MODE_ENCODER_DAC);
        drm_encoder_helper_add(encoder, &nv50_dac_helper_funcs);
        encoder->possible_crtcs = entry->heads;
        encoder->possible_clones = 0;
+        drm_mode_connector_attach_encoder(connector, encoder);
        return 0;
 }
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 580a5d10be93..f13ad0de9c8f 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -71,14 +71,13 @@ nv50_evo_dmaobj_new(struct nouveau_channel *evo, uint32_t class, uint32_t name,
                return ret;
        }
-        dev_priv->engine.instmem.prepare_access(dev, true);
        nv_wo32(dev, obj, 0, (tile_flags << 22) | (magic_flags << 16) | class);
        nv_wo32(dev, obj, 1, limit);
        nv_wo32(dev, obj, 2, offset);
        nv_wo32(dev, obj, 3, 0x00000000);
        nv_wo32(dev, obj, 4, 0x00000000);
        nv_wo32(dev, obj, 5, 0x00010000);
-        dev_priv->engine.instmem.finish_access(dev);
+        dev_priv->engine.instmem.flush(dev);
        return 0;
 }
@@ -110,8 +109,8 @@ nv50_evo_channel_new(struct drm_device *dev, struct nouveau_channel **pchan)
                return ret;
        }
-        ret = nouveau_mem_init_heap(&chan->ramin_heap, chan->ramin->gpuobj->
+        ret = drm_mm_init(&chan->ramin_heap,
-                                    im_pramin->start, 32768);
+                          chan->ramin->gpuobj->im_pramin->start, 32768);
        if (ret) {
                NV_ERROR(dev, "Error initialising EVO PRAMIN heap: %d\n", ret);
                nv50_evo_channel_del(pchan);
@@ -179,13 +178,25 @@ nv50_evo_channel_new(struct drm_device *dev, struct nouveau_channel **pchan)
 }
 int
+nv50_display_early_init(struct drm_device *dev)
+{
+        return 0;
+}
+void
+nv50_display_late_takedown(struct drm_device *dev)
+{
+}
+int
 nv50_display_init(struct drm_device *dev)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct nouveau_timer_engine *ptimer = &dev_priv->engine.timer;
+        struct nouveau_gpio_engine *pgpio = &dev_priv->engine.gpio;
        struct nouveau_channel *evo = dev_priv->evo;
        struct drm_connector *connector;
-        uint32_t val, ram_amount, hpd_en[2];
+        uint32_t val, ram_amount;
        uint64_t start;
        int ret, i;
@@ -366,26 +377,13 @@ nv50_display_init(struct drm_device *dev)
                                             NV50_PDISPLAY_INTR_EN_CLK_UNK40));
        /* enable hotplug interrupts */
-        hpd_en[0] = hpd_en[1] = 0;
        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
                struct nouveau_connector *conn = nouveau_connector(connector);
-                struct dcb_gpio_entry *gpio;
                if (conn->dcb->gpio_tag == 0xff)
                        continue;
-                gpio = nouveau_bios_gpio_entry(dev, conn->dcb->gpio_tag);
+                pgpio->irq_enable(dev, conn->dcb->gpio_tag, true);
-                if (!gpio)
-                        continue;
-                hpd_en[gpio->line >> 4] |= (0x00010001 << (gpio->line & 0xf));
-        }
-        nv_wr32(dev, 0xe054, 0xffffffff);
-        nv_wr32(dev, 0xe050, hpd_en[0]);
-        if (dev_priv->chipset >= 0x90) {
-                nv_wr32(dev, 0xe074, 0xffffffff);
-                nv_wr32(dev, 0xe070, hpd_en[1]);
        }
        return 0;
@@ -465,6 +463,7 @@ int nv50_display_create(struct drm_device *dev)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct dcb_table *dcb = &dev_priv->vbios.dcb;
+        struct drm_connector *connector, *ct;
        int ret, i;
        NV_DEBUG_KMS(dev, "\n");
@@ -507,14 +506,18 @@ int nv50_display_create(struct drm_device *dev)
                        continue;
                }
+                connector = nouveau_connector_create(dev, entry->connector);
+                if (IS_ERR(connector))
+                        continue;
                switch (entry->type) {
                case OUTPUT_TMDS:
                case OUTPUT_LVDS:
                case OUTPUT_DP:
-                        nv50_sor_create(dev, entry);
+                        nv50_sor_create(connector, entry);
                        break;
                case OUTPUT_ANALOG:
-                        nv50_dac_create(dev, entry);
+                        nv50_dac_create(connector, entry);
                        break;
                default:
                        NV_WARN(dev, "DCB encoder %d unknown\n", entry->type);
@@ -522,11 +525,13 @@ int nv50_display_create(struct drm_device *dev)
                }
        }
-        for (i = 0 ; i < dcb->connector.entries; i++) {
+        list_for_each_entry_safe(connector, ct,
-                if (i != 0 && dcb->connector.entry[i].index2 ==
+                                 &dev->mode_config.connector_list, head) {
-                              dcb->connector.entry[i - 1].index2)
+                if (!connector->encoder_ids[0]) {
-                        continue;
+                        NV_WARN(dev, "%s has no encoders, removing\n",
-                nouveau_connector_create(dev, &dcb->connector.entry[i]);
+                                drm_get_connector_name(connector));
+                        connector->funcs->destroy(connector);
+                }
        }
        ret = nv50_display_init(dev);
@@ -538,7 +543,8 @@ int nv50_display_create(struct drm_device *dev)
        return 0;
 }
-int nv50_display_destroy(struct drm_device *dev)
+void
+nv50_display_destroy(struct drm_device *dev)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
@@ -548,135 +554,30 @@ int nv50_display_destroy(struct drm_device *dev)
        nv50_display_disable(dev);
        nv50_evo_channel_del(&dev_priv->evo);
-        return 0;
-}
-static inline uint32_t
-nv50_display_mode_ctrl(struct drm_device *dev, bool sor, int or)
-{
-        struct drm_nouveau_private *dev_priv = dev->dev_private;
-        uint32_t mc;
-        if (sor) {
-                if (dev_priv->chipset < 0x90 ||
-                    dev_priv->chipset == 0x92 || dev_priv->chipset == 0xa0)
-                        mc = nv_rd32(dev, NV50_PDISPLAY_SOR_MODE_CTRL_P(or));
-                else
-                        mc = nv_rd32(dev, NV90_PDISPLAY_SOR_MODE_CTRL_P(or));
-        } else {
-                mc = nv_rd32(dev, NV50_PDISPLAY_DAC_MODE_CTRL_P(or));
-        }
-        return mc;
-}
-static int
-nv50_display_irq_head(struct drm_device *dev, int *phead,
-                      struct dcb_entry **pdcbent)
-{
-        struct drm_nouveau_private *dev_priv = dev->dev_private;
-        uint32_t unk30 = nv_rd32(dev, NV50_PDISPLAY_UNK30_CTRL);
-        uint32_t dac = 0, sor = 0;
-        int head, i, or = 0, type = OUTPUT_ANY;
-        /* We're assuming that head 0 *or* head 1 will be active here,
-         * and not both.  I'm not sure if the hw will even signal both
-         * ever, but it definitely shouldn't for us as we commit each
-         * CRTC separately, and submission will be blocked by the GPU
-         * until we handle each in turn.
-         */
-        NV_DEBUG_KMS(dev, "0x610030: 0x%08x\n", unk30);
-        head = ffs((unk30 >> 9) & 3) - 1;
-        if (head < 0)
-                return -EINVAL;
-        /* This assumes CRTCs are never bound to multiple encoders, which
-         * should be the case.
-         */
-        for (i = 0; i < 3 && type == OUTPUT_ANY; i++) {
-                uint32_t mc = nv50_display_mode_ctrl(dev, false, i);
-                if (!(mc & (1 << head)))
-                        continue;
-                switch ((mc >> 8) & 0xf) {
-                case 0: type = OUTPUT_ANALOG; break;
-                case 1: type = OUTPUT_TV; break;
-                default:
-                        NV_ERROR(dev, "unknown dac mode_ctrl: 0x%08x\n", dac);
-                        return -1;
-                }
-                or = i;
-        }
-        for (i = 0; i < 4 && type == OUTPUT_ANY; i++) {
-                uint32_t mc = nv50_display_mode_ctrl(dev, true, i);
-                if (!(mc & (1 << head)))
-                        continue;
-                switch ((mc >> 8) & 0xf) {
-                case 0: type = OUTPUT_LVDS; break;
-                case 1: type = OUTPUT_TMDS; break;
-                case 2: type = OUTPUT_TMDS; break;
-                case 5: type = OUTPUT_TMDS; break;
-                case 8: type = OUTPUT_DP; break;
-                case 9: type = OUTPUT_DP; break;
-                default:
-                        NV_ERROR(dev, "unknown sor mode_ctrl: 0x%08x\n", sor);
-                        return -1;
-                }
-                or = i;
-        }
-        NV_DEBUG_KMS(dev, "type %d, or %d\n", type, or);
-        if (type == OUTPUT_ANY) {
-                NV_ERROR(dev, "unknown encoder!!\n");
-                return -1;
-        }
-        for (i = 0; i < dev_priv->vbios.dcb.entries; i++) {
-                struct dcb_entry *dcbent = &dev_priv->vbios.dcb.entry[i];
-                if (dcbent->type != type)
-                        continue;
-                if (!(dcbent->or & (1 << or)))
-                        continue;
-                *phead = head;
-                *pdcbent = dcbent;
-                return 0;
-        }
-        NV_ERROR(dev, "no DCB entry for %d %d\n", dac != 0, or);
-        return 0;
 }
-static uint32_t
+static u16
-nv50_display_script_select(struct drm_device *dev, struct dcb_entry *dcbent,
+nv50_display_script_select(struct drm_device *dev, struct dcb_entry *dcb,
-                           int pxclk)
+                           u32 mc, int pxclk)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct nouveau_connector *nv_connector = NULL;
        struct drm_encoder *encoder;
        struct nvbios *bios = &dev_priv->vbios;
-        uint32_t mc, script = 0, or;
+        u32 script = 0, or;
        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
                struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
-                if (nv_encoder->dcb != dcbent)
+                if (nv_encoder->dcb != dcb)
                        continue;
                nv_connector = nouveau_encoder_connector_get(nv_encoder);
                break;
        }
-        or = ffs(dcbent->or) - 1;
+        or = ffs(dcb->or) - 1;
-        mc = nv50_display_mode_ctrl(dev, dcbent->type != OUTPUT_ANALOG, or);
+        switch (dcb->type) {
-        switch (dcbent->type) {
        case OUTPUT_LVDS:
                script = (mc >> 8) & 0xf;
                if (bios->fp_no_ddc) {
@@ -767,17 +668,88 @@ nv50_display_vblank_handler(struct drm_device *dev, uint32_t intr)
 static void
 nv50_display_unk10_handler(struct drm_device *dev)
 {
-        struct dcb_entry *dcbent;
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
-        int head, ret;
+        u32 unk30 = nv_rd32(dev, 0x610030), mc;
+        int i, crtc, or, type = OUTPUT_ANY;
-        ret = nv50_display_irq_head(dev, &head, &dcbent);
+        NV_DEBUG_KMS(dev, "0x610030: 0x%08x\n", unk30);
-        if (ret)
+        dev_priv->evo_irq.dcb = NULL;
-                goto ack;
        nv_wr32(dev, 0x619494, nv_rd32(dev, 0x619494) & ~8);
-        nouveau_bios_run_display_table(dev, dcbent, 0, -1);
+        /* Determine which CRTC we're dealing with, only 1 ever will be
+         * signalled at the same time with the current nouveau code.
+         */
+        crtc = ffs((unk30 & 0x00000060) >> 5) - 1;
+        if (crtc < 0)
+                goto ack;
+        /* Nothing needs to be done for the encoder */
+        crtc = ffs((unk30 & 0x00000180) >> 7) - 1;
+        if (crtc < 0)
+                goto ack;
+        /* Find which encoder was connected to the CRTC */
+        for (i = 0; type == OUTPUT_ANY && i < 3; i++) {
+                mc = nv_rd32(dev, NV50_PDISPLAY_DAC_MODE_CTRL_C(i));
+                NV_DEBUG_KMS(dev, "DAC-%d mc: 0x%08x\n", i, mc);
+                if (!(mc & (1 << crtc)))
+                        continue;
+                switch ((mc & 0x00000f00) >> 8) {
+                case 0: type = OUTPUT_ANALOG; break;
+                case 1: type = OUTPUT_TV; break;
+                default:
+                        NV_ERROR(dev, "invalid mc, DAC-%d: 0x%08x\n", i, mc);
+                        goto ack;
+                }
+                or = i;
+        }
+        for (i = 0; type == OUTPUT_ANY && i < 4; i++) {
+                if (dev_priv->chipset  < 0x90 ||
+                    dev_priv->chipset == 0x92 ||
+                    dev_priv->chipset == 0xa0)
+                        mc = nv_rd32(dev, NV50_PDISPLAY_SOR_MODE_CTRL_C(i));
+                else
+                        mc = nv_rd32(dev, NV90_PDISPLAY_SOR_MODE_CTRL_C(i));
+                NV_DEBUG_KMS(dev, "SOR-%d mc: 0x%08x\n", i, mc);
+                if (!(mc & (1 << crtc)))
+                        continue;
+                switch ((mc & 0x00000f00) >> 8) {
+                case 0: type = OUTPUT_LVDS; break;
+                case 1: type = OUTPUT_TMDS; break;
+                case 2: type = OUTPUT_TMDS; break;
+                case 5: type = OUTPUT_TMDS; break;
+                case 8: type = OUTPUT_DP; break;
+                case 9: type = OUTPUT_DP; break;
+                default:
+                        NV_ERROR(dev, "invalid mc, SOR-%d: 0x%08x\n", i, mc);
+                        goto ack;
+                }
+                or = i;
+        }
+        /* There was no encoder to disable */
+        if (type == OUTPUT_ANY)
+                goto ack;
+        /* Disable the encoder */
+        for (i = 0; i < dev_priv->vbios.dcb.entries; i++) {
+                struct dcb_entry *dcb = &dev_priv->vbios.dcb.entry[i];
+                if (dcb->type == type && (dcb->or & (1 << or))) {
+                        nouveau_bios_run_display_table(dev, dcb, 0, -1);
+                        dev_priv->evo_irq.dcb = dcb;
+                        goto ack;
+                }
+        }
+        NV_ERROR(dev, "no dcb for %d %d 0x%08x\n", or, type, mc);
 ack:
        nv_wr32(dev, NV50_PDISPLAY_INTR_1, NV50_PDISPLAY_INTR_1_CLK_UNK10);
        nv_wr32(dev, 0x610030, 0x80000000);
@@ -817,33 +789,103 @@ nv50_display_unk20_dp_hack(struct drm_device *dev, struct dcb_entry *dcb)
 static void
 nv50_display_unk20_handler(struct drm_device *dev)
 {
-        struct dcb_entry *dcbent;
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
-        uint32_t tmp, pclk, script;
+        u32 unk30 = nv_rd32(dev, 0x610030), tmp, pclk, script, mc;
-        int head, or, ret;
+        struct dcb_entry *dcb;
+        int i, crtc, or, type = OUTPUT_ANY;
-        ret = nv50_display_irq_head(dev, &head, &dcbent);
+        NV_DEBUG_KMS(dev, "0x610030: 0x%08x\n", unk30);
-        if (ret)
+        dcb = dev_priv->evo_irq.dcb;
+        if (dcb) {
+                nouveau_bios_run_display_table(dev, dcb, 0, -2);
+                dev_priv->evo_irq.dcb = NULL;
+        }
+        /* CRTC clock change requested? */
+        crtc = ffs((unk30 & 0x00000600) >> 9) - 1;
+        if (crtc >= 0) {
+                pclk  = nv_rd32(dev, NV50_PDISPLAY_CRTC_P(crtc, CLOCK));
+                pclk &= 0x003fffff;
+                nv50_crtc_set_clock(dev, crtc, pclk);
+                tmp = nv_rd32(dev, NV50_PDISPLAY_CRTC_CLK_CTRL2(crtc));
+                tmp &= ~0x000000f;
+                nv_wr32(dev, NV50_PDISPLAY_CRTC_CLK_CTRL2(crtc), tmp);
+        }
+        /* Nothing needs to be done for the encoder */
+        crtc = ffs((unk30 & 0x00000180) >> 7) - 1;
+        if (crtc < 0)
                goto ack;
-        or = ffs(dcbent->or) - 1;
+        pclk  = nv_rd32(dev, NV50_PDISPLAY_CRTC_P(crtc, CLOCK)) & 0x003fffff;
-        pclk = nv_rd32(dev, NV50_PDISPLAY_CRTC_P(head, CLOCK)) & 0x3fffff;
-        script = nv50_display_script_select(dev, dcbent, pclk);
-        NV_DEBUG_KMS(dev, "head %d pxclk: %dKHz\n", head, pclk);
+        /* Find which encoder is connected to the CRTC */
+        for (i = 0; type == OUTPUT_ANY && i < 3; i++) {
+                mc = nv_rd32(dev, NV50_PDISPLAY_DAC_MODE_CTRL_P(i));
+                NV_DEBUG_KMS(dev, "DAC-%d mc: 0x%08x\n", i, mc);
+                if (!(mc & (1 << crtc)))
+                        continue;
-        if (dcbent->type != OUTPUT_DP)
+                switch ((mc & 0x00000f00) >> 8) {
-                nouveau_bios_run_display_table(dev, dcbent, 0, -2);
+                case 0: type = OUTPUT_ANALOG; break;
+                case 1: type = OUTPUT_TV; break;
+                default:
+                        NV_ERROR(dev, "invalid mc, DAC-%d: 0x%08x\n", i, mc);
+                        goto ack;
+                }
-        nv50_crtc_set_clock(dev, head, pclk);
+                or = i;
+        }
-        nouveau_bios_run_display_table(dev, dcbent, script, pclk);
+        for (i = 0; type == OUTPUT_ANY && i < 4; i++) {
+                if (dev_priv->chipset  < 0x90 ||
+                    dev_priv->chipset == 0x92 ||
+                    dev_priv->chipset == 0xa0)
+                        mc = nv_rd32(dev, NV50_PDISPLAY_SOR_MODE_CTRL_P(i));
+                else
+                        mc = nv_rd32(dev, NV90_PDISPLAY_SOR_MODE_CTRL_P(i));
-        nv50_display_unk20_dp_hack(dev, dcbent);
+                NV_DEBUG_KMS(dev, "SOR-%d mc: 0x%08x\n", i, mc);
+                if (!(mc & (1 << crtc)))
+                        continue;
+                switch ((mc & 0x00000f00) >> 8) {
+                case 0: type = OUTPUT_LVDS; break;
+                case 1: type = OUTPUT_TMDS; break;
+                case 2: type = OUTPUT_TMDS; break;
+                case 5: type = OUTPUT_TMDS; break;
+                case 8: type = OUTPUT_DP; break;
+                case 9: type = OUTPUT_DP; break;
+                default:
+                        NV_ERROR(dev, "invalid mc, SOR-%d: 0x%08x\n", i, mc);
+                        goto ack;
+                }
+                or = i;
+        }
+        if (type == OUTPUT_ANY)
+                goto ack;
+        /* Enable the encoder */
+        for (i = 0; i < dev_priv->vbios.dcb.entries; i++) {
+                dcb = &dev_priv->vbios.dcb.entry[i];
+                if (dcb->type == type && (dcb->or & (1 << or)))
+                        break;
+        }
+        if (i == dev_priv->vbios.dcb.entries) {
+                NV_ERROR(dev, "no dcb for %d %d 0x%08x\n", or, type, mc);
+                goto ack;
+        }
-        tmp = nv_rd32(dev, NV50_PDISPLAY_CRTC_CLK_CTRL2(head));
+        script = nv50_display_script_select(dev, dcb, mc, pclk);
-        tmp &= ~0x000000f;
+        nouveau_bios_run_display_table(dev, dcb, script, pclk);
-        nv_wr32(dev, NV50_PDISPLAY_CRTC_CLK_CTRL2(head), tmp);
-        if (dcbent->type != OUTPUT_ANALOG) {
+        nv50_display_unk20_dp_hack(dev, dcb);
+        if (dcb->type != OUTPUT_ANALOG) {
                tmp = nv_rd32(dev, NV50_PDISPLAY_SOR_CLK_CTRL2(or));
                tmp &= ~0x00000f0f;
                if (script & 0x0100)
@@ -853,24 +895,61 @@ nv50_display_unk20_handler(struct drm_device *dev)
                nv_wr32(dev, NV50_PDISPLAY_DAC_CLK_CTRL2(or), 0);
        }
+        dev_priv->evo_irq.dcb = dcb;
+        dev_priv->evo_irq.pclk = pclk;
+        dev_priv->evo_irq.script = script;
 ack:
        nv_wr32(dev, NV50_PDISPLAY_INTR_1, NV50_PDISPLAY_INTR_1_CLK_UNK20);
        nv_wr32(dev, 0x610030, 0x80000000);
 }
+/* If programming a TMDS output on a SOR that can also be configured for
+ * DisplayPort, make sure NV50_SOR_DP_CTRL_ENABLE is forced off.
+ *
+ * It looks like the VBIOS TMDS scripts make an attempt at this, however,
+ * the VBIOS scripts on at least one board I have only switch it off on
+ * link 0, causing a blank display if the output has previously been
+ * programmed for DisplayPort.
+ */
+static void
+nv50_display_unk40_dp_set_tmds(struct drm_device *dev, struct dcb_entry *dcb)
+{
+        int or = ffs(dcb->or) - 1, link = !(dcb->dpconf.sor.link & 1);
+        struct drm_encoder *encoder;
+        u32 tmp;
+        if (dcb->type != OUTPUT_TMDS)
+                return;
+        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+                struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
+                if (nv_encoder->dcb->type == OUTPUT_DP &&
+                    nv_encoder->dcb->or & (1 << or)) {
+                        tmp  = nv_rd32(dev, NV50_SOR_DP_CTRL(or, link));
+                        tmp &= ~NV50_SOR_DP_CTRL_ENABLED;
+                        nv_wr32(dev, NV50_SOR_DP_CTRL(or, link), tmp);
+                        break;
+                }
+        }
+}
 static void
 nv50_display_unk40_handler(struct drm_device *dev)
 {
-        struct dcb_entry *dcbent;
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
-        int head, pclk, script, ret;
+        struct dcb_entry *dcb = dev_priv->evo_irq.dcb;
+        u16 script = dev_priv->evo_irq.script;
+        u32 unk30 = nv_rd32(dev, 0x610030), pclk = dev_priv->evo_irq.pclk;
-        ret = nv50_display_irq_head(dev, &head, &dcbent);
+        NV_DEBUG_KMS(dev, "0x610030: 0x%08x\n", unk30);
-        if (ret)
+        dev_priv->evo_irq.dcb = NULL;
+        if (!dcb)
                goto ack;
-        pclk = nv_rd32(dev, NV50_PDISPLAY_CRTC_P(head, CLOCK)) & 0x3fffff;
-        script = nv50_display_script_select(dev, dcbent, pclk);
-        nouveau_bios_run_display_table(dev, dcbent, script, -pclk);
+        nouveau_bios_run_display_table(dev, dcb, script, -pclk);
+        nv50_display_unk40_dp_set_tmds(dev, dcb);
 ack:
        nv_wr32(dev, NV50_PDISPLAY_INTR_1, NV50_PDISPLAY_INTR_1_CLK_UNK40);
diff --git a/drivers/gpu/drm/nouveau/nv50_display.h b/drivers/gpu/drm/nouveau/nv50_display.h
index 581d405ac014..c551f0b85ee0 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.h
+++ b/drivers/gpu/drm/nouveau/nv50_display.h
@@ -38,9 +38,11 @@
 void nv50_display_irq_handler(struct drm_device *dev);
 void nv50_display_irq_handler_bh(struct work_struct *work);
 void nv50_display_irq_hotplug_bh(struct work_struct *work);
-int nv50_display_init(struct drm_device *dev);
+int nv50_display_early_init(struct drm_device *dev);
+void nv50_display_late_takedown(struct drm_device *dev);
 int nv50_display_create(struct drm_device *dev);
-int nv50_display_destroy(struct drm_device *dev);
+int nv50_display_init(struct drm_device *dev);
+void nv50_display_destroy(struct drm_device *dev);
 int nv50_crtc_blank(struct nouveau_crtc *, bool blank);
 int nv50_crtc_set_clock(struct drm_device *, int head, int pclk);
diff --git a/drivers/gpu/drm/nouveau/nv50_fifo.c b/drivers/gpu/drm/nouveau/nv50_fifo.c
index e20c0e2474f3..fb0281ae8f90 100644
--- a/drivers/gpu/drm/nouveau/nv50_fifo.c
+++ b/drivers/gpu/drm/nouveau/nv50_fifo.c
@@ -28,41 +28,33 @@
 #include "drm.h"
 #include "nouveau_drv.h"
-struct nv50_fifo_priv {
-        struct nouveau_gpuobj_ref *thingo[2];
-        int cur_thingo;
-};
-#define IS_G80 ((dev_priv->chipset & 0xf0) == 0x50)
 static void
-nv50_fifo_init_thingo(struct drm_device *dev)
+nv50_fifo_playlist_update(struct drm_device *dev)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
-        struct nv50_fifo_priv *priv = dev_priv->engine.fifo.priv;
+        struct nouveau_fifo_engine *pfifo = &dev_priv->engine.fifo;
        struct nouveau_gpuobj_ref *cur;
        int i, nr;
        NV_DEBUG(dev, "\n");
-        cur = priv->thingo[priv->cur_thingo];
+        cur = pfifo->playlist[pfifo->cur_playlist];
-        priv->cur_thingo = !priv->cur_thingo;
+        pfifo->cur_playlist = !pfifo->cur_playlist;
        /* We never schedule channel 0 or 127 */
-        dev_priv->engine.instmem.prepare_access(dev, true);
        for (i = 1, nr = 0; i < 127; i++) {
                if (dev_priv->fifos[i] && dev_priv->fifos[i]->ramfc)
                        nv_wo32(dev, cur->gpuobj, nr++, i);
        }
-        dev_priv->engine.instmem.finish_access(dev);
+        dev_priv->engine.instmem.flush(dev);
        nv_wr32(dev, 0x32f4, cur->instance >> 12);
        nv_wr32(dev, 0x32ec, nr);
        nv_wr32(dev, 0x2500, 0x101);
 }
-static int
+static void
-nv50_fifo_channel_enable(struct drm_device *dev, int channel, bool nt)
+nv50_fifo_channel_enable(struct drm_device *dev, int channel)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct nouveau_channel *chan = dev_priv->fifos[channel];
@@ -70,37 +62,28 @@ nv50_fifo_channel_enable(struct drm_device *dev, int channel, bool nt)
        NV_DEBUG(dev, "ch%d\n", channel);
-        if (!chan->ramfc)
+        if (dev_priv->chipset == 0x50)
-                return -EINVAL;
-        if (IS_G80)
                inst = chan->ramfc->instance >> 12;
        else
                inst = chan->ramfc->instance >> 8;
-        nv_wr32(dev, NV50_PFIFO_CTX_TABLE(channel),
-                 inst | NV50_PFIFO_CTX_TABLE_CHANNEL_ENABLED);
-        if (!nt)
+        nv_wr32(dev, NV50_PFIFO_CTX_TABLE(channel), inst |
-                nv50_fifo_init_thingo(dev);
+                     NV50_PFIFO_CTX_TABLE_CHANNEL_ENABLED);
-        return 0;
 }
 static void
-nv50_fifo_channel_disable(struct drm_device *dev, int channel, bool nt)
+nv50_fifo_channel_disable(struct drm_device *dev, int channel)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        uint32_t inst;
-        NV_DEBUG(dev, "ch%d, nt=%d\n", channel, nt);
+        NV_DEBUG(dev, "ch%d\n", channel);
-        if (IS_G80)
+        if (dev_priv->chipset == 0x50)
                inst = NV50_PFIFO_CTX_TABLE_INSTANCE_MASK_G80;
        else
                inst = NV50_PFIFO_CTX_TABLE_INSTANCE_MASK_G84;
        nv_wr32(dev, NV50_PFIFO_CTX_TABLE(channel), inst);
-        if (!nt)
-                nv50_fifo_init_thingo(dev);
 }
 static void
@@ -133,12 +116,12 @@ nv50_fifo_init_context_table(struct drm_device *dev)
        for (i = 0; i < NV50_PFIFO_CTX_TABLE__SIZE; i++) {
                if (dev_priv->fifos[i])
-                        nv50_fifo_channel_enable(dev, i, true);
+                        nv50_fifo_channel_enable(dev, i);
                else
-                        nv50_fifo_channel_disable(dev, i, true);
+                        nv50_fifo_channel_disable(dev, i);
        }
-        nv50_fifo_init_thingo(dev);
+        nv50_fifo_playlist_update(dev);
 }
 static void
@@ -162,41 +145,38 @@ nv50_fifo_init_regs(struct drm_device *dev)
        nv_wr32(dev, 0x3270, 0);
        /* Enable dummy channels setup by nv50_instmem.c */
-        nv50_fifo_channel_enable(dev, 0, true);
+        nv50_fifo_channel_enable(dev, 0);
-        nv50_fifo_channel_enable(dev, 127, true);
+        nv50_fifo_channel_enable(dev, 127);
 }
 int
 nv50_fifo_init(struct drm_device *dev)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
-        struct nv50_fifo_priv *priv;
+        struct nouveau_fifo_engine *pfifo = &dev_priv->engine.fifo;
        int ret;
        NV_DEBUG(dev, "\n");
-        priv = dev_priv->engine.fifo.priv;
+        if (pfifo->playlist[0]) {
-        if (priv) {
+                pfifo->cur_playlist = !pfifo->cur_playlist;
-                priv->cur_thingo = !priv->cur_thingo;
                goto just_reset;
        }
-        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
-        if (!priv)
-                return -ENOMEM;
-        dev_priv->engine.fifo.priv = priv;
        ret = nouveau_gpuobj_new_ref(dev, NULL, NULL, 0, 128*4, 0x1000,
-                                     NVOBJ_FLAG_ZERO_ALLOC, &priv->thingo[0]);
+                                     NVOBJ_FLAG_ZERO_ALLOC,
+                                     &pfifo->playlist[0]);
        if (ret) {
-                NV_ERROR(dev, "error creating thingo0: %d\n", ret);
+                NV_ERROR(dev, "error creating playlist 0: %d\n", ret);
                return ret;
        }
        ret = nouveau_gpuobj_new_ref(dev, NULL, NULL, 0, 128*4, 0x1000,
-                                     NVOBJ_FLAG_ZERO_ALLOC, &priv->thingo[1]);
+                                     NVOBJ_FLAG_ZERO_ALLOC,
+                                     &pfifo->playlist[1]);
        if (ret) {
-                NV_ERROR(dev, "error creating thingo1: %d\n", ret);
+                nouveau_gpuobj_ref_del(dev, &pfifo->playlist[0]);
+                NV_ERROR(dev, "error creating playlist 1: %d\n", ret);
                return ret;
        }
@@ -216,18 +196,15 @@ void
 nv50_fifo_takedown(struct drm_device *dev)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
-        struct nv50_fifo_priv *priv = dev_priv->engine.fifo.priv;
+        struct nouveau_fifo_engine *pfifo = &dev_priv->engine.fifo;
        NV_DEBUG(dev, "\n");
-        if (!priv)
+        if (!pfifo->playlist[0])
                return;
-        nouveau_gpuobj_ref_del(dev, &priv->thingo[0]);
+        nouveau_gpuobj_ref_del(dev, &pfifo->playlist[0]);
-        nouveau_gpuobj_ref_del(dev, &priv->thingo[1]);
+        nouveau_gpuobj_ref_del(dev, &pfifo->playlist[1]);
-        dev_priv->engine.fifo.priv = NULL;
-        kfree(priv);
 }
 int
@@ -248,7 +225,7 @@ nv50_fifo_create_context(struct nouveau_channel *chan)
        NV_DEBUG(dev, "ch%d\n", chan->id);
-        if (IS_G80) {
+        if (dev_priv->chipset == 0x50) {
                uint32_t ramin_poffset = chan->ramin->gpuobj->im_pramin->start;
                uint32_t ramin_voffset = chan->ramin->gpuobj->im_backing_start;
@@ -281,10 +258,10 @@ nv50_fifo_create_context(struct nouveau_channel *chan)
        spin_lock_irqsave(&dev_priv->context_switch_lock, flags);
-        dev_priv->engine.instmem.prepare_access(dev, true);
        nv_wo32(dev, ramfc, 0x48/4, chan->pushbuf->instance >> 4);
-        nv_wo32(dev, ramfc, 0x80/4, (0xc << 24) | (chan->ramht->instance >> 4));
+        nv_wo32(dev, ramfc, 0x80/4, (0 << 27) /* 4KiB */ |
+                                    (4 << 24) /* SEARCH_FULL */ |
+                                    (chan->ramht->instance >> 4));
        nv_wo32(dev, ramfc, 0x44/4, 0x2101ffff);
        nv_wo32(dev, ramfc, 0x60/4, 0x7fffffff);
        nv_wo32(dev, ramfc, 0x40/4, 0x00000000);
@@ -295,7 +272,7 @@ nv50_fifo_create_context(struct nouveau_channel *chan)
                                    chan->dma.ib_base * 4);
        nv_wo32(dev, ramfc, 0x54/4, drm_order(chan->dma.ib_max + 1) << 16);
-        if (!IS_G80) {
+        if (dev_priv->chipset != 0x50) {
                nv_wo32(dev, chan->ramin->gpuobj, 0, chan->id);
                nv_wo32(dev, chan->ramin->gpuobj, 1,
                                                chan->ramfc->instance >> 8);
@@ -304,16 +281,10 @@ nv50_fifo_create_context(struct nouveau_channel *chan)
                nv_wo32(dev, ramfc, 0x98/4, chan->ramin->instance >> 12);
        }
-        dev_priv->engine.instmem.finish_access(dev);
+        dev_priv->engine.instmem.flush(dev);
-        ret = nv50_fifo_channel_enable(dev, chan->id, false);
-        if (ret) {
-                NV_ERROR(dev, "error enabling ch%d: %d\n", chan->id, ret);
-                spin_unlock_irqrestore(&dev_priv->context_switch_lock, flags);
-                nouveau_gpuobj_ref_del(dev, &chan->ramfc);
-                return ret;
-        }
+        nv50_fifo_channel_enable(dev, chan->id);
+        nv50_fifo_playlist_update(dev);
        spin_unlock_irqrestore(&dev_priv->context_switch_lock, flags);
        return 0;
 }
@@ -328,11 +299,12 @@ nv50_fifo_destroy_context(struct nouveau_channel *chan)
        /* This will ensure the channel is seen as disabled. */
        chan->ramfc = NULL;
-        nv50_fifo_channel_disable(dev, chan->id, false);
+        nv50_fifo_channel_disable(dev, chan->id);
        /* Dummy channel, also used on ch 127 */
        if (chan->id == 0)
-                nv50_fifo_channel_disable(dev, 127, false);
+                nv50_fifo_channel_disable(dev, 127);
+        nv50_fifo_playlist_update(dev);
        nouveau_gpuobj_ref_del(dev, &ramfc);
        nouveau_gpuobj_ref_del(dev, &chan->cache);
@@ -349,8 +321,6 @@ nv50_fifo_load_context(struct nouveau_channel *chan)
        NV_DEBUG(dev, "ch%d\n", chan->id);
-        dev_priv->engine.instmem.prepare_access(dev, false);
        nv_wr32(dev, 0x3330, nv_ro32(dev, ramfc, 0x00/4));
        nv_wr32(dev, 0x3334, nv_ro32(dev, ramfc, 0x04/4));
        nv_wr32(dev, 0x3240, nv_ro32(dev, ramfc, 0x08/4));
@@ -396,7 +366,7 @@ nv50_fifo_load_context(struct nouveau_channel *chan)
        nv_wr32(dev, NV03_PFIFO_CACHE1_GET, 0);
        /* guessing that all the 0x34xx regs aren't on NV50 */
-        if (!IS_G80) {
+        if (dev_priv->chipset != 0x50) {
                nv_wr32(dev, 0x340c, nv_ro32(dev, ramfc, 0x88/4));
                nv_wr32(dev, 0x3400, nv_ro32(dev, ramfc, 0x8c/4));
                nv_wr32(dev, 0x3404, nv_ro32(dev, ramfc, 0x90/4));
@@ -404,8 +374,6 @@ nv50_fifo_load_context(struct nouveau_channel *chan)
                nv_wr32(dev, 0x3410, nv_ro32(dev, ramfc, 0x98/4));
        }
-        dev_priv->engine.instmem.finish_access(dev);
        nv_wr32(dev, NV03_PFIFO_CACHE1_PUSH1, chan->id | (1<<16));
        return 0;
 }
@@ -434,8 +402,6 @@ nv50_fifo_unload_context(struct drm_device *dev)
        ramfc = chan->ramfc->gpuobj;
        cache = chan->cache->gpuobj;
-        dev_priv->engine.instmem.prepare_access(dev, true);
        nv_wo32(dev, ramfc, 0x00/4, nv_rd32(dev, 0x3330));
        nv_wo32(dev, ramfc, 0x04/4, nv_rd32(dev, 0x3334));
        nv_wo32(dev, ramfc, 0x08/4, nv_rd32(dev, 0x3240));
@@ -482,7 +448,7 @@ nv50_fifo_unload_context(struct drm_device *dev)
        }
        /* guessing that all the 0x34xx regs aren't on NV50 */
-        if (!IS_G80) {
+        if (dev_priv->chipset != 0x50) {
                nv_wo32(dev, ramfc, 0x84/4, ptr >> 1);
                nv_wo32(dev, ramfc, 0x88/4, nv_rd32(dev, 0x340c));
                nv_wo32(dev, ramfc, 0x8c/4, nv_rd32(dev, 0x3400));
@@ -491,7 +457,7 @@ nv50_fifo_unload_context(struct drm_device *dev)
                nv_wo32(dev, ramfc, 0x98/4, nv_rd32(dev, 0x3410));
        }
-        dev_priv->engine.instmem.finish_access(dev);
+        dev_priv->engine.instmem.flush(dev);
        /*XXX: probably reload ch127 (NULL) state back too */
        nv_wr32(dev, NV03_PFIFO_CACHE1_PUSH1, 127);
diff --git a/drivers/gpu/drm/nouveau/nv50_gpio.c b/drivers/gpu/drm/nouveau/nv50_gpio.c
index bb47ad737267..b2fab2bf3d61 100644
--- a/drivers/gpu/drm/nouveau/nv50_gpio.c
+++ b/drivers/gpu/drm/nouveau/nv50_gpio.c
@@ -74,3 +74,38 @@ nv50_gpio_set(struct drm_device *dev, enum dcb_gpio_tag tag, int state)
        nv_wr32(dev, r, v);
        return 0;
 }
+void
+nv50_gpio_irq_enable(struct drm_device *dev, enum dcb_gpio_tag tag, bool on)
+{
+        struct dcb_gpio_entry *gpio;
+        u32 reg, mask;
+        gpio = nouveau_bios_gpio_entry(dev, tag);
+        if (!gpio) {
+                NV_ERROR(dev, "gpio tag 0x%02x not found\n", tag);
+                return;
+        }
+        reg  = gpio->line < 16 ? 0xe050 : 0xe070;
+        mask = 0x00010001 << (gpio->line & 0xf);
+        nv_wr32(dev, reg + 4, mask);
+        nv_mask(dev, reg + 0, mask, on ? mask : 0);
+}
+int
+nv50_gpio_init(struct drm_device *dev)
+{
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        /* disable, and ack any pending gpio interrupts */
+        nv_wr32(dev, 0xe050, 0x00000000);
+        nv_wr32(dev, 0xe054, 0xffffffff);
+        if (dev_priv->chipset >= 0x90) {
+                nv_wr32(dev, 0xe070, 0x00000000);
+                nv_wr32(dev, 0xe074, 0xffffffff);
+        }
+        return 0;
+}
diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
index b203d06f601f..1413028e1580 100644
--- a/drivers/gpu/drm/nouveau/nv50_graph.c
+++ b/drivers/gpu/drm/nouveau/nv50_graph.c
@@ -30,8 +30,6 @@
 #include "nouveau_grctx.h"
-#define IS_G80 ((dev_priv->chipset & 0xf0) == 0x50)
 static void
 nv50_graph_init_reset(struct drm_device *dev)
 {
@@ -103,37 +101,33 @@ static int
 nv50_graph_init_ctxctl(struct drm_device *dev)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct nouveau_grctx ctx = {};
+        uint32_t *cp;
+        int i;
        NV_DEBUG(dev, "\n");
-        if (nouveau_ctxfw) {
+        cp = kmalloc(512 * 4, GFP_KERNEL);
-                nouveau_grctx_prog_load(dev);
+        if (!cp) {
-                dev_priv->engine.graph.grctx_size = 0x70000;
+                NV_ERROR(dev, "failed to allocate ctxprog\n");
+                dev_priv->engine.graph.accel_blocked = true;
+                return 0;
        }
-        if (!dev_priv->engine.graph.ctxprog) {
-                struct nouveau_grctx ctx = {};
+        ctx.dev = dev;
-                uint32_t *cp = kmalloc(512 * 4, GFP_KERNEL);
+        ctx.mode = NOUVEAU_GRCTX_PROG;
-                int i;
+        ctx.data = cp;
-                if (!cp) {
+        ctx.ctxprog_max = 512;
-                        NV_ERROR(dev, "Couldn't alloc ctxprog! Disabling acceleration.\n");
+        if (!nv50_grctx_init(&ctx)) {
-                        dev_priv->engine.graph.accel_blocked = true;
+                dev_priv->engine.graph.grctx_size = ctx.ctxvals_pos * 4;
-                        return 0;
-                }
+                nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_INDEX, 0);
-                ctx.dev = dev;
+                for (i = 0; i < ctx.ctxprog_len; i++)
-                ctx.mode = NOUVEAU_GRCTX_PROG;
+                        nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_DATA, cp[i]);
-                ctx.data = cp;
+        } else {
-                ctx.ctxprog_max = 512;
+                dev_priv->engine.graph.accel_blocked = true;
-                if (!nv50_grctx_init(&ctx)) {
-                        dev_priv->engine.graph.grctx_size = ctx.ctxvals_pos * 4;
-                        nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_INDEX, 0);
-                        for (i = 0; i < ctx.ctxprog_len; i++)
-                                nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_DATA, cp[i]);
-                } else {
-                        dev_priv->engine.graph.accel_blocked = true;
-                }
-                kfree(cp);
        }
+        kfree(cp);
        nv_wr32(dev, 0x400320, 4);
        nv_wr32(dev, NV40_PGRAPH_CTXCTL_CUR, 0);
@@ -164,7 +158,6 @@ void
 nv50_graph_takedown(struct drm_device *dev)
 {
        NV_DEBUG(dev, "\n");
-        nouveau_grctx_fini(dev);
 }
 void
@@ -212,8 +205,9 @@ nv50_graph_create_context(struct nouveau_channel *chan)
        struct drm_device *dev = chan->dev;
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct nouveau_gpuobj *ramin = chan->ramin->gpuobj;
-        struct nouveau_gpuobj *ctx;
+        struct nouveau_gpuobj *obj;
        struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;
+        struct nouveau_grctx ctx = {};
        int hdr, ret;
        NV_DEBUG(dev, "ch%d\n", chan->id);
@@ -223,10 +217,9 @@ nv50_graph_create_context(struct nouveau_channel *chan)
                                     NVOBJ_FLAG_ZERO_FREE, &chan->ramin_grctx);
        if (ret)
                return ret;
-        ctx = chan->ramin_grctx->gpuobj;
+        obj = chan->ramin_grctx->gpuobj;
-        hdr = IS_G80 ? 0x200 : 0x20;
+        hdr = (dev_priv->chipset == 0x50) ? 0x200 : 0x20;
-        dev_priv->engine.instmem.prepare_access(dev, true);
        nv_wo32(dev, ramin, (hdr + 0x00)/4, 0x00190002);
        nv_wo32(dev, ramin, (hdr + 0x04)/4, chan->ramin_grctx->instance +
                                           pgraph->grctx_size - 1);
@@ -234,21 +227,15 @@ nv50_graph_create_context(struct nouveau_channel *chan)
        nv_wo32(dev, ramin, (hdr + 0x0c)/4, 0);
        nv_wo32(dev, ramin, (hdr + 0x10)/4, 0);
        nv_wo32(dev, ramin, (hdr + 0x14)/4, 0x00010000);
-        dev_priv->engine.instmem.finish_access(dev);
-        dev_priv->engine.instmem.prepare_access(dev, true);
-        if (!pgraph->ctxprog) {
-                struct nouveau_grctx ctx = {};
-                ctx.dev = chan->dev;
-                ctx.mode = NOUVEAU_GRCTX_VALS;
-                ctx.data = chan->ramin_grctx->gpuobj;
-                nv50_grctx_init(&ctx);
-        } else {
-                nouveau_grctx_vals_load(dev, ctx);
-        }
-        nv_wo32(dev, ctx, 0x00000/4, chan->ramin->instance >> 12);
-        dev_priv->engine.instmem.finish_access(dev);
+        ctx.dev = chan->dev;
+        ctx.mode = NOUVEAU_GRCTX_VALS;
+        ctx.data = obj;
+        nv50_grctx_init(&ctx);
+        nv_wo32(dev, obj, 0x00000/4, chan->ramin->instance >> 12);
+        dev_priv->engine.instmem.flush(dev);
        return 0;
 }
@@ -257,17 +244,16 @@ nv50_graph_destroy_context(struct nouveau_channel *chan)
 {
        struct drm_device *dev = chan->dev;
        struct drm_nouveau_private *dev_priv = dev->dev_private;
-        int i, hdr = IS_G80 ? 0x200 : 0x20;
+        int i, hdr = (dev_priv->chipset == 0x50) ? 0x200 : 0x20;
        NV_DEBUG(dev, "ch%d\n", chan->id);
        if (!chan->ramin || !chan->ramin->gpuobj)
                return;
-        dev_priv->engine.instmem.prepare_access(dev, true);
        for (i = hdr; i < hdr + 24; i += 4)
                nv_wo32(dev, chan->ramin->gpuobj, i/4, 0);
-        dev_priv->engine.instmem.finish_access(dev);
+        dev_priv->engine.instmem.flush(dev);
        nouveau_gpuobj_ref_del(dev, &chan->ramin_grctx);
 }
diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c
index 5f21df31f3aa..37c7b48ab24a 100644
--- a/drivers/gpu/drm/nouveau/nv50_instmem.c
+++ b/drivers/gpu/drm/nouveau/nv50_instmem.c
@@ -35,8 +35,6 @@ struct nv50_instmem_priv {
        struct nouveau_gpuobj_ref *pramin_pt;
        struct nouveau_gpuobj_ref *pramin_bar;
        struct nouveau_gpuobj_ref *fb_bar;
-        bool last_access_wr;
 };
 #define NV50_INSTMEM_PAGE_SHIFT 12
@@ -147,7 +145,7 @@ nv50_instmem_init(struct drm_device *dev)
        if (ret)
                return ret;
-        if (nouveau_mem_init_heap(&chan->ramin_heap, c_base, c_size - c_base))
+        if (drm_mm_init(&chan->ramin_heap, c_base, c_size - c_base))
                return -ENOMEM;
        /* RAMFC + zero channel's PRAMIN up to start of VM pagedir */
@@ -241,7 +239,7 @@ nv50_instmem_init(struct drm_device *dev)
                return ret;
        BAR0_WI32(priv->fb_bar->gpuobj, 0x00, 0x7fc00000);
        BAR0_WI32(priv->fb_bar->gpuobj, 0x04, 0x40000000 +
-                                              drm_get_resource_len(dev, 1) - 1);
+                                              pci_resource_len(dev->pdev, 1) - 1);
        BAR0_WI32(priv->fb_bar->gpuobj, 0x08, 0x40000000);
        BAR0_WI32(priv->fb_bar->gpuobj, 0x0c, 0x00000000);
        BAR0_WI32(priv->fb_bar->gpuobj, 0x10, 0x00000000);
@@ -262,23 +260,18 @@ nv50_instmem_init(struct drm_device *dev)
        /* Assume that praying isn't enough, check that we can re-read the
         * entire fake channel back from the PRAMIN BAR */
-        dev_priv->engine.instmem.prepare_access(dev, false);
        for (i = 0; i < c_size; i += 4) {
                if (nv_rd32(dev, NV_RAMIN + i) != nv_ri32(dev, i)) {
                        NV_ERROR(dev, "Error reading back PRAMIN at 0x%08x\n",
                                                                        i);
-                        dev_priv->engine.instmem.finish_access(dev);
                        return -EINVAL;
                }
        }
-        dev_priv->engine.instmem.finish_access(dev);
        nv_wr32(dev, NV50_PUNK_BAR0_PRAMIN, save_nv001700);
        /* Global PRAMIN heap */
-        if (nouveau_mem_init_heap(&dev_priv->ramin_heap,
+        if (drm_mm_init(&dev_priv->ramin_heap, c_size, dev_priv->ramin_size - c_size)) {
-                                  c_size, dev_priv->ramin_size - c_size)) {
-                dev_priv->ramin_heap = NULL;
                NV_ERROR(dev, "Failed to init RAMIN heap\n");
        }
@@ -321,7 +314,7 @@ nv50_instmem_takedown(struct drm_device *dev)
                nouveau_gpuobj_del(dev, &chan->vm_pd);
                nouveau_gpuobj_ref_del(dev, &chan->ramfc);
                nouveau_gpuobj_ref_del(dev, &chan->ramin);
-                nouveau_mem_takedown(&chan->ramin_heap);
+                drm_mm_takedown(&chan->ramin_heap);
                dev_priv->fifos[0] = dev_priv->fifos[127] = NULL;
                kfree(chan);
@@ -436,14 +429,14 @@ nv50_instmem_bind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
        if (!gpuobj->im_backing || !gpuobj->im_pramin || gpuobj->im_bound)
                return -EINVAL;
-        NV_DEBUG(dev, "st=0x%0llx sz=0x%0llx\n",
+        NV_DEBUG(dev, "st=0x%lx sz=0x%lx\n",
                 gpuobj->im_pramin->start, gpuobj->im_pramin->size);
        pte     = (gpuobj->im_pramin->start >> 12) << 1;
        pte_end = ((gpuobj->im_pramin->size >> 12) << 1) + pte;
        vram    = gpuobj->im_backing_start;
-        NV_DEBUG(dev, "pramin=0x%llx, pte=%d, pte_end=%d\n",
+        NV_DEBUG(dev, "pramin=0x%lx, pte=%d, pte_end=%d\n",
                 gpuobj->im_pramin->start, pte, pte_end);
        NV_DEBUG(dev, "first vram page: 0x%08x\n", gpuobj->im_backing_start);
@@ -453,27 +446,15 @@ nv50_instmem_bind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
                vram |= 0x30;
        }
-        dev_priv->engine.instmem.prepare_access(dev, true);
        while (pte < pte_end) {
                nv_wo32(dev, pramin_pt, pte++, lower_32_bits(vram));
                nv_wo32(dev, pramin_pt, pte++, upper_32_bits(vram));
                vram += NV50_INSTMEM_PAGE_SIZE;
        }
-        dev_priv->engine.instmem.finish_access(dev);
+        dev_priv->engine.instmem.flush(dev);
-        nv_wr32(dev, 0x100c80, 0x00040001);
-        if (!nv_wait(0x100c80, 0x00000001, 0x00000000)) {
-                NV_ERROR(dev, "timeout: (0x100c80 & 1) == 0 (1)\n");
-                NV_ERROR(dev, "0x100c80 = 0x%08x\n", nv_rd32(dev, 0x100c80));
-                return -EBUSY;
-        }
-        nv_wr32(dev, 0x100c80, 0x00060001);
+        nv50_vm_flush(dev, 4);
-        if (!nv_wait(0x100c80, 0x00000001, 0x00000000)) {
+        nv50_vm_flush(dev, 6);
-                NV_ERROR(dev, "timeout: (0x100c80 & 1) == 0 (2)\n");
-                NV_ERROR(dev, "0x100c80 = 0x%08x\n", nv_rd32(dev, 0x100c80));
-                return -EBUSY;
-        }
        gpuobj->im_bound = 1;
        return 0;
@@ -492,36 +473,37 @@ nv50_instmem_unbind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
        pte     = (gpuobj->im_pramin->start >> 12) << 1;
        pte_end = ((gpuobj->im_pramin->size >> 12) << 1) + pte;
-        dev_priv->engine.instmem.prepare_access(dev, true);
        while (pte < pte_end) {
                nv_wo32(dev, priv->pramin_pt->gpuobj, pte++, 0x00000000);
                nv_wo32(dev, priv->pramin_pt->gpuobj, pte++, 0x00000000);
        }
-        dev_priv->engine.instmem.finish_access(dev);
+        dev_priv->engine.instmem.flush(dev);
        gpuobj->im_bound = 0;
        return 0;
 }
 void
-nv50_instmem_prepare_access(struct drm_device *dev, bool write)
+nv50_instmem_flush(struct drm_device *dev)
 {
-        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        nv_wr32(dev, 0x00330c, 0x00000001);
-        struct nv50_instmem_priv *priv = dev_priv->engine.instmem.priv;
+        if (!nv_wait(0x00330c, 0x00000002, 0x00000000))
+                NV_ERROR(dev, "PRAMIN flush timeout\n");
-        priv->last_access_wr = write;
 }
 void
-nv50_instmem_finish_access(struct drm_device *dev)
+nv84_instmem_flush(struct drm_device *dev)
 {
-        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        nv_wr32(dev, 0x070000, 0x00000001);
-        struct nv50_instmem_priv *priv = dev_priv->engine.instmem.priv;
+        if (!nv_wait(0x070000, 0x00000002, 0x00000000))
+                NV_ERROR(dev, "PRAMIN flush timeout\n");
+}
-        if (priv->last_access_wr) {
+void
-                nv_wr32(dev, 0x070000, 0x00000001);
+nv50_vm_flush(struct drm_device *dev, int engine)
-                if (!nv_wait(0x070000, 0x00000001, 0x00000000))
+{
-                        NV_ERROR(dev, "PRAMIN flush timeout\n");
+        nv_wr32(dev, 0x100c80, (engine << 16) | 1);
-        }
+        if (!nv_wait(0x100c80, 0x00000001, 0x00000000))
+                NV_ERROR(dev, "vm flush timeout: engine %d\n", engine);
 }
diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c
index 812778db76ac..bcd4cf84a7e6 100644
--- a/drivers/gpu/drm/nouveau/nv50_sor.c
+++ b/drivers/gpu/drm/nouveau/nv50_sor.c
@@ -37,52 +37,32 @@
 #include "nv50_display.h"
 static void
-nv50_sor_disconnect(struct nouveau_encoder *nv_encoder)
+nv50_sor_disconnect(struct drm_encoder *encoder)
 {
-        struct drm_device *dev = to_drm_encoder(nv_encoder)->dev;
+        struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
+        struct drm_device *dev = encoder->dev;
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct nouveau_channel *evo = dev_priv->evo;
        int ret;
+        if (!nv_encoder->crtc)
+                return;
+        nv50_crtc_blank(nouveau_crtc(nv_encoder->crtc), true);
        NV_DEBUG_KMS(dev, "Disconnecting SOR %d\n", nv_encoder->or);
-        ret = RING_SPACE(evo, 2);
+        ret = RING_SPACE(evo, 4);
        if (ret) {
                NV_ERROR(dev, "no space while disconnecting SOR\n");
                return;
        }
        BEGIN_RING(evo, 0, NV50_EVO_SOR(nv_encoder->or, MODE_CTRL), 1);
-        OUT_RING(evo, 0);
+        OUT_RING  (evo, 0);
-}
+        BEGIN_RING(evo, 0, NV50_EVO_UPDATE, 1);
+        OUT_RING  (evo, 0);
-static void
-nv50_sor_dp_link_train(struct drm_encoder *encoder)
-{
-        struct drm_device *dev = encoder->dev;
-        struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
-        struct bit_displayport_encoder_table *dpe;
-        int dpe_headerlen;
-        dpe = nouveau_bios_dp_table(dev, nv_encoder->dcb, &dpe_headerlen);
-        if (!dpe) {
-                NV_ERROR(dev, "SOR-%d: no DP encoder table!\n", nv_encoder->or);
-                return;
-        }
-        if (dpe->script0) {
+        nv_encoder->crtc = NULL;
-                NV_DEBUG_KMS(dev, "SOR-%d: running DP script 0\n", nv_encoder->or);
+        nv_encoder->last_dpms = DRM_MODE_DPMS_OFF;
-                nouveau_bios_run_init_table(dev, le16_to_cpu(dpe->script0),
-                                            nv_encoder->dcb);
-        }
-        if (!nouveau_dp_link_train(encoder))
-                NV_ERROR(dev, "SOR-%d: link training failed\n", nv_encoder->or);
-        if (dpe->script1) {
-                NV_DEBUG_KMS(dev, "SOR-%d: running DP script 1\n", nv_encoder->or);
-                nouveau_bios_run_init_table(dev, le16_to_cpu(dpe->script1),
-                                            nv_encoder->dcb);
-        }
 }
 static void
@@ -94,14 +74,16 @@ nv50_sor_dpms(struct drm_encoder *encoder, int mode)
        uint32_t val;
        int or = nv_encoder->or;
-        NV_DEBUG_KMS(dev, "or %d mode %d\n", or, mode);
+        NV_DEBUG_KMS(dev, "or %d type %d mode %d\n", or, nv_encoder->dcb->type, mode);
        nv_encoder->last_dpms = mode;
        list_for_each_entry(enc, &dev->mode_config.encoder_list, head) {
                struct nouveau_encoder *nvenc = nouveau_encoder(enc);
                if (nvenc == nv_encoder ||
-                    nvenc->disconnect != nv50_sor_disconnect ||
+                    (nvenc->dcb->type != OUTPUT_TMDS &&
+                     nvenc->dcb->type != OUTPUT_LVDS &&
+                     nvenc->dcb->type != OUTPUT_DP) ||
                    nvenc->dcb->or != nv_encoder->dcb->or)
                        continue;
@@ -133,8 +115,22 @@ nv50_sor_dpms(struct drm_encoder *encoder, int mode)
                         nv_rd32(dev, NV50_PDISPLAY_SOR_DPMS_STATE(or)));
        }
-        if (nv_encoder->dcb->type == OUTPUT_DP && mode == DRM_MODE_DPMS_ON)
+        if (nv_encoder->dcb->type == OUTPUT_DP) {
-                nv50_sor_dp_link_train(encoder);
+                struct nouveau_i2c_chan *auxch;
+                auxch = nouveau_i2c_find(dev, nv_encoder->dcb->i2c_index);
+                if (!auxch)
+                        return;
+                if (mode == DRM_MODE_DPMS_ON) {
+                        u8 status = DP_SET_POWER_D0;
+                        nouveau_dp_auxch(auxch, 8, DP_SET_POWER, &status, 1);
+                        nouveau_dp_link_train(encoder);
+                } else {
+                        u8 status = DP_SET_POWER_D3;
+                        nouveau_dp_auxch(auxch, 8, DP_SET_POWER, &status, 1);
+                }
+        }
 }
 static void
@@ -196,7 +192,8 @@ nv50_sor_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,
        uint32_t mode_ctl = 0;
        int ret;
-        NV_DEBUG_KMS(dev, "or %d\n", nv_encoder->or);
+        NV_DEBUG_KMS(dev, "or %d type %d -> crtc %d\n",
+                     nv_encoder->or, nv_encoder->dcb->type, crtc->index);
        nv50_sor_dpms(encoder, DRM_MODE_DPMS_ON);
@@ -239,6 +236,14 @@ nv50_sor_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,
        }
        BEGIN_RING(evo, 0, NV50_EVO_SOR(nv_encoder->or, MODE_CTRL), 1);
        OUT_RING(evo, mode_ctl);
+        nv_encoder->crtc = encoder->crtc;
+}
+static struct drm_crtc *
+nv50_sor_crtc_get(struct drm_encoder *encoder)
+{
+        return nouveau_encoder(encoder)->crtc;
 }
 static const struct drm_encoder_helper_funcs nv50_sor_helper_funcs = {
@@ -249,7 +254,9 @@ static const struct drm_encoder_helper_funcs nv50_sor_helper_funcs = {
        .prepare = nv50_sor_prepare,
        .commit = nv50_sor_commit,
        .mode_set = nv50_sor_mode_set,
-        .detect = NULL
+        .get_crtc = nv50_sor_crtc_get,
+        .detect = NULL,
+        .disable = nv50_sor_disconnect
 };
 static void
@@ -272,32 +279,22 @@ static const struct drm_encoder_funcs nv50_sor_encoder_funcs = {
 };
 int
-nv50_sor_create(struct drm_device *dev, struct dcb_entry *entry)
+nv50_sor_create(struct drm_connector *connector, struct dcb_entry *entry)
 {
        struct nouveau_encoder *nv_encoder = NULL;
+        struct drm_device *dev = connector->dev;
        struct drm_encoder *encoder;
-        bool dum;
        int type;
        NV_DEBUG_KMS(dev, "\n");
        switch (entry->type) {
        case OUTPUT_TMDS:
-                NV_INFO(dev, "Detected a TMDS output\n");
+        case OUTPUT_DP:
                type = DRM_MODE_ENCODER_TMDS;
                break;
        case OUTPUT_LVDS:
-                NV_INFO(dev, "Detected a LVDS output\n");
                type = DRM_MODE_ENCODER_LVDS;
-                if (nouveau_bios_parse_lvds_table(dev, 0, &dum, &dum)) {
-                        NV_ERROR(dev, "Failed parsing LVDS table\n");
-                        return -EINVAL;
-                }
-                break;
-        case OUTPUT_DP:
-                NV_INFO(dev, "Detected a DP output\n");
-                type = DRM_MODE_ENCODER_TMDS;
                break;
        default:
                return -EINVAL;
@@ -310,8 +307,7 @@ nv50_sor_create(struct drm_device *dev, struct dcb_entry *entry)
        nv_encoder->dcb = entry;
        nv_encoder->or = ffs(entry->or) - 1;
+        nv_encoder->last_dpms = DRM_MODE_DPMS_OFF;
-        nv_encoder->disconnect = nv50_sor_disconnect;
        drm_encoder_init(dev, encoder, &nv50_sor_encoder_funcs, type);
        drm_encoder_helper_add(encoder, &nv50_sor_helper_funcs);
@@ -342,5 +338,6 @@ nv50_sor_create(struct drm_device *dev, struct dcb_entry *entry)
                        nv_encoder->dp.mc_unknown = 5;
        }
+        drm_mode_connector_attach_encoder(connector, encoder);
        return 0;
 }
diff --git a/drivers/gpu/drm/nouveau/nvreg.h b/drivers/gpu/drm/nouveau/nvreg.h
index 5998c35237b0..ad64673ace1f 100644
--- a/drivers/gpu/drm/nouveau/nvreg.h
+++ b/drivers/gpu/drm/nouveau/nvreg.h
@@ -147,28 +147,6 @@
 #       define NV_VIO_GX_DONT_CARE_INDEX        0x07
 #       define NV_VIO_GX_BIT_MASK_INDEX         0x08
-#define NV_PFB_BOOT_0                   0x00100000
-#define NV_PFB_CFG0                     0x00100200
-#define NV_PFB_CFG1                     0x00100204
-#define NV_PFB_CSTATUS                  0x0010020C
-#define NV_PFB_REFCTRL                  0x00100210
-#       define NV_PFB_REFCTRL_VALID_1                   (1 << 31)
-#define NV_PFB_PAD                      0x0010021C
-#       define NV_PFB_PAD_CKE_NORMAL                    (1 << 0)
-#define NV_PFB_TILE_NV10                0x00100240
-#define NV_PFB_TILE_SIZE_NV10           0x00100244
-#define NV_PFB_REF                      0x001002D0
-#       define NV_PFB_REF_CMD_REFRESH                   (1 << 0)
-#define NV_PFB_PRE                      0x001002D4
-#       define NV_PFB_PRE_CMD_PRECHARGE                 (1 << 0)
-#define NV_PFB_CLOSE_PAGE2              0x0010033C
-#define NV_PFB_TILE_NV40                0x00100600
-#define NV_PFB_TILE_SIZE_NV40           0x00100604
-#define NV_PEXTDEV_BOOT_0               0x00101000
-#       define NV_PEXTDEV_BOOT_0_STRAP_FP_IFACE_12BIT   (8 << 12)
-#define NV_PEXTDEV_BOOT_3               0x0010100c
 #define NV_PCRTC_INTR_0                                 0x00600100
 #       define NV_PCRTC_INTR_0_VBLANK                           (1 << 0)
 #define NV_PCRTC_INTR_EN_0                              0x00600140
diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
index e671d0e74d4c..570e190710bd 100644
--- a/drivers/gpu/drm/r128/r128_cce.c
+++ b/drivers/gpu/drm/r128/r128_cce.c
@@ -44,7 +44,7 @@
 MODULE_FIRMWARE(FIRMWARE_NAME);
-static int R128_READ_PLL(struct drm_device * dev, int addr)
+static int R128_READ_PLL(struct drm_device *dev, int addr)
 {
        drm_r128_private_t *dev_priv = dev->dev_private;
@@ -53,7 +53,7 @@ static int R128_READ_PLL(struct drm_device * dev, int addr)
 }
 #if R128_FIFO_DEBUG
-static void r128_status(drm_r128_private_t * dev_priv)
+static void r128_status(drm_r128_private_t *dev_priv)
 {
        printk("GUI_STAT           = 0x%08x\n",
               (unsigned int)R128_READ(R128_GUI_STAT));
@@ -74,7 +74,7 @@ static void r128_status(drm_r128_private_t * dev_priv)
 * Engine, FIFO control
 */
-static int r128_do_pixcache_flush(drm_r128_private_t * dev_priv)
+static int r128_do_pixcache_flush(drm_r128_private_t *dev_priv)
 {
        u32 tmp;
        int i;
@@ -83,9 +83,8 @@ static int r128_do_pixcache_flush(drm_r128_private_t * dev_priv)
        R128_WRITE(R128_PC_NGUI_CTLSTAT, tmp);
        for (i = 0; i < dev_priv->usec_timeout; i++) {
-                if (!(R128_READ(R128_PC_NGUI_CTLSTAT) & R128_PC_BUSY)) {
+                if (!(R128_READ(R128_PC_NGUI_CTLSTAT) & R128_PC_BUSY))
                        return 0;
-                }
                DRM_UDELAY(1);
        }
@@ -95,7 +94,7 @@ static int r128_do_pixcache_flush(drm_r128_private_t * dev_priv)
        return -EBUSY;
 }
-static int r128_do_wait_for_fifo(drm_r128_private_t * dev_priv, int entries)
+static int r128_do_wait_for_fifo(drm_r128_private_t *dev_priv, int entries)
 {
        int i;
@@ -112,7 +111,7 @@ static int r128_do_wait_for_fifo(drm_r128_private_t * dev_priv, int entries)
        return -EBUSY;
 }
-static int r128_do_wait_for_idle(drm_r128_private_t * dev_priv)
+static int r128_do_wait_for_idle(drm_r128_private_t *dev_priv)
 {
        int i, ret;
@@ -189,7 +188,7 @@ out_release:
 * prior to a wait for idle, as it informs the engine that the command
 * stream is ending.
 */
-static void r128_do_cce_flush(drm_r128_private_t * dev_priv)
+static void r128_do_cce_flush(drm_r128_private_t *dev_priv)
 {
        u32 tmp;
@@ -199,7 +198,7 @@ static void r128_do_cce_flush(drm_r128_private_t * dev_priv)
 /* Wait for the CCE to go idle.
 */
-int r128_do_cce_idle(drm_r128_private_t * dev_priv)
+int r128_do_cce_idle(drm_r128_private_t *dev_priv)
 {
        int i;
@@ -225,7 +224,7 @@ int r128_do_cce_idle(drm_r128_private_t * dev_priv)
 /* Start the Concurrent Command Engine.
 */
-static void r128_do_cce_start(drm_r128_private_t * dev_priv)
+static void r128_do_cce_start(drm_r128_private_t *dev_priv)
 {
        r128_do_wait_for_idle(dev_priv);
@@ -242,7 +241,7 @@ static void r128_do_cce_start(drm_r128_private_t * dev_priv)
 * commands, so you must wait for the CCE command stream to complete
 * before calling this routine.
 */
-static void r128_do_cce_reset(drm_r128_private_t * dev_priv)
+static void r128_do_cce_reset(drm_r128_private_t *dev_priv)
 {
        R128_WRITE(R128_PM4_BUFFER_DL_WPTR, 0);
        R128_WRITE(R128_PM4_BUFFER_DL_RPTR, 0);
@@ -253,7 +252,7 @@ static void r128_do_cce_reset(drm_r128_private_t * dev_priv)
 * commands, so you must flush the command stream and wait for the CCE
 * to go idle before calling this routine.
 */
-static void r128_do_cce_stop(drm_r128_private_t * dev_priv)
+static void r128_do_cce_stop(drm_r128_private_t *dev_priv)
 {
        R128_WRITE(R128_PM4_MICRO_CNTL, 0);
        R128_WRITE(R128_PM4_BUFFER_CNTL,
@@ -264,7 +263,7 @@ static void r128_do_cce_stop(drm_r128_private_t * dev_priv)
 /* Reset the engine.  This will stop the CCE if it is running.
 */
-static int r128_do_engine_reset(struct drm_device * dev)
+static int r128_do_engine_reset(struct drm_device *dev)
 {
        drm_r128_private_t *dev_priv = dev->dev_private;
        u32 clock_cntl_index, mclk_cntl, gen_reset_cntl;
@@ -301,8 +300,8 @@ static int r128_do_engine_reset(struct drm_device * dev)
        return 0;
 }
-static void r128_cce_init_ring_buffer(struct drm_device * dev,
+static void r128_cce_init_ring_buffer(struct drm_device *dev,
-                                      drm_r128_private_t * dev_priv)
+                                      drm_r128_private_t *dev_priv)
 {
        u32 ring_start;
        u32 tmp;
@@ -340,7 +339,7 @@ static void r128_cce_init_ring_buffer(struct drm_device * dev,
        R128_WRITE(R128_BUS_CNTL, tmp);
 }
-static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)
+static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
 {
        drm_r128_private_t *dev_priv;
        int rc;
@@ -588,7 +587,7 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)
        return rc;
 }
-int r128_do_cleanup_cce(struct drm_device * dev)
+int r128_do_cleanup_cce(struct drm_device *dev)
 {
        /* Make sure interrupts are disabled here because the uninstall ioctl
@@ -682,9 +681,8 @@ int r128_cce_stop(struct drm_device *dev, void *data, struct drm_file *file_priv
        /* Flush any pending CCE commands.  This ensures any outstanding
         * commands are exectuted by the engine before we turn it off.
         */
-        if (stop->flush) {
+        if (stop->flush)
                r128_do_cce_flush(dev_priv);
-        }
        /* If we fail to make the engine go idle, we return an error
         * code so that the DRM ioctl wrapper can try again.
@@ -735,9 +733,8 @@ int r128_cce_idle(struct drm_device *dev, void *data, struct drm_file *file_priv
        DEV_INIT_TEST_WITH_RETURN(dev_priv);
-        if (dev_priv->cce_running) {
+        if (dev_priv->cce_running)
                r128_do_cce_flush(dev_priv);
-        }
        return r128_do_cce_idle(dev_priv);
 }
@@ -765,7 +762,7 @@ int r128_fullscreen(struct drm_device *dev, void *data, struct drm_file *file_pr
 #define R128_BUFFER_FREE        0
 #if 0
-static int r128_freelist_init(struct drm_device * dev)
+static int r128_freelist_init(struct drm_device *dev)
 {
        struct drm_device_dma *dma = dev->dma;
        drm_r128_private_t *dev_priv = dev->dev_private;
@@ -848,7 +845,7 @@ static struct drm_buf *r128_freelist_get(struct drm_device * dev)
        return NULL;
 }
-void r128_freelist_reset(struct drm_device * dev)
+void r128_freelist_reset(struct drm_device *dev)
 {
        struct drm_device_dma *dma = dev->dma;
        int i;
@@ -864,7 +861,7 @@ void r128_freelist_reset(struct drm_device * dev)
 * CCE command submission
 */
-int r128_wait_ring(drm_r128_private_t * dev_priv, int n)
+int r128_wait_ring(drm_r128_private_t *dev_priv, int n)
 {
        drm_r128_ring_buffer_t *ring = &dev_priv->ring;
        int i;
@@ -881,9 +878,9 @@ int r128_wait_ring(drm_r128_private_t * dev_priv, int n)
        return -EBUSY;
 }
-static int r128_cce_get_buffers(struct drm_device * dev,
+static int r128_cce_get_buffers(struct drm_device *dev,
                                struct drm_file *file_priv,
-                                struct drm_dma * d)
+                                struct drm_dma *d)
 {
        int i;
        struct drm_buf *buf;
@@ -933,9 +930,8 @@ int r128_cce_buffers(struct drm_device *dev, void *data, struct drm_file *file_p
        d->granted_count = 0;
-        if (d->request_count) {
+        if (d->request_count)
                ret = r128_cce_get_buffers(dev, file_priv, d);
-        }
        return ret;
 }
diff --git a/drivers/gpu/drm/r128/r128_drv.c b/drivers/gpu/drm/r128/r128_drv.c
index b806fdcc7170..1e2971f13aa1 100644
--- a/drivers/gpu/drm/r128/r128_drv.c
+++ b/drivers/gpu/drm/r128/r128_drv.c
@@ -85,7 +85,7 @@ static struct drm_driver driver = {
        .patchlevel = DRIVER_PATCHLEVEL,
 };
-int r128_driver_load(struct drm_device * dev, unsigned long flags)
+int r128_driver_load(struct drm_device *dev, unsigned long flags)
 {
        return drm_vblank_init(dev, 1);
 }
diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
index 3c60829d82e9..930c71b2fb5e 100644
--- a/drivers/gpu/drm/r128/r128_drv.h
+++ b/drivers/gpu/drm/r128/r128_drv.h
@@ -53,7 +53,7 @@
 #define DRIVER_MINOR            5
 #define DRIVER_PATCHLEVEL       0
-#define GET_RING_HEAD(dev_priv)         R128_READ( R128_PM4_BUFFER_DL_RPTR )
+#define GET_RING_HEAD(dev_priv)         R128_READ(R128_PM4_BUFFER_DL_RPTR)
 typedef struct drm_r128_freelist {
        unsigned int age;
@@ -144,23 +144,23 @@ extern int r128_engine_reset(struct drm_device *dev, void *data, struct drm_file
 extern int r128_fullscreen(struct drm_device *dev, void *data, struct drm_file *file_priv);
 extern int r128_cce_buffers(struct drm_device *dev, void *data, struct drm_file *file_priv);
-extern void r128_freelist_reset(struct drm_device * dev);
+extern void r128_freelist_reset(struct drm_device *dev);
-extern int r128_wait_ring(drm_r128_private_t * dev_priv, int n);
+extern int r128_wait_ring(drm_r128_private_t *dev_priv, int n);
-extern int r128_do_cce_idle(drm_r128_private_t * dev_priv);
+extern int r128_do_cce_idle(drm_r128_private_t *dev_priv);
-extern int r128_do_cleanup_cce(struct drm_device * dev);
+extern int r128_do_cleanup_cce(struct drm_device *dev);
 extern int r128_enable_vblank(struct drm_device *dev, int crtc);
 extern void r128_disable_vblank(struct drm_device *dev, int crtc);
 extern u32 r128_get_vblank_counter(struct drm_device *dev, int crtc);
 extern irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS);
-extern void r128_driver_irq_preinstall(struct drm_device * dev);
+extern void r128_driver_irq_preinstall(struct drm_device *dev);
 extern int r128_driver_irq_postinstall(struct drm_device *dev);
-extern void r128_driver_irq_uninstall(struct drm_device * dev);
+extern void r128_driver_irq_uninstall(struct drm_device *dev);
-extern void r128_driver_lastclose(struct drm_device * dev);
+extern void r128_driver_lastclose(struct drm_device *dev);
-extern int r128_driver_load(struct drm_device * dev, unsigned long flags);
+extern int r128_driver_load(struct drm_device *dev, unsigned long flags);
-extern void r128_driver_preclose(struct drm_device * dev,
+extern void r128_driver_preclose(struct drm_device *dev,
                                 struct drm_file *file_priv);
 extern long r128_compat_ioctl(struct file *filp, unsigned int cmd,
@@ -390,27 +390,27 @@ extern long r128_compat_ioctl(struct file *filp, unsigned int cmd,
 #define R128_PCIGART_TABLE_SIZE         32768
-#define R128_READ(reg)          DRM_READ32(  dev_priv->mmio, (reg) )
+#define R128_READ(reg)          DRM_READ32(dev_priv->mmio, (reg))
-#define R128_WRITE(reg,val)     DRM_WRITE32( dev_priv->mmio, (reg), (val) )
+#define R128_WRITE(reg, val)    DRM_WRITE32(dev_priv->mmio, (reg), (val))
-#define R128_READ8(reg)         DRM_READ8(   dev_priv->mmio, (reg) )
+#define R128_READ8(reg)         DRM_READ8(dev_priv->mmio, (reg))
-#define R128_WRITE8(reg,val)    DRM_WRITE8(  dev_priv->mmio, (reg), (val) )
+#define R128_WRITE8(reg, val)   DRM_WRITE8(dev_priv->mmio, (reg), (val))
-#define R128_WRITE_PLL(addr,val)                                        \
+#define R128_WRITE_PLL(addr, val)                                       \
 do {                                                                    \
        R128_WRITE8(R128_CLOCK_CNTL_INDEX,                              \
                    ((addr) & 0x1f) | R128_PLL_WR_EN);                  \
        R128_WRITE(R128_CLOCK_CNTL_DATA, (val));                        \
 } while (0)
-#define CCE_PACKET0( reg, n )           (R128_CCE_PACKET0 |             \
+#define CCE_PACKET0(reg, n)             (R128_CCE_PACKET0 |             \
                                         ((n) << 16) | ((reg) >> 2))
-#define CCE_PACKET1( reg0, reg1 )       (R128_CCE_PACKET1 |             \
+#define CCE_PACKET1(reg0, reg1)         (R128_CCE_PACKET1 |             \
                                         (((reg1) >> 2) << 11) | ((reg0) >> 2))
 #define CCE_PACKET2()                   (R128_CCE_PACKET2)
-#define CCE_PACKET3( pkt, n )           (R128_CCE_PACKET3 |             \
+#define CCE_PACKET3(pkt, n)             (R128_CCE_PACKET3 |             \
                                         (pkt) | ((n) << 16))
-static __inline__ void r128_update_ring_snapshot(drm_r128_private_t * dev_priv)
+static __inline__ void r128_update_ring_snapshot(drm_r128_private_t *dev_priv)
 {
        drm_r128_ring_buffer_t *ring = &dev_priv->ring;
        ring->space = (GET_RING_HEAD(dev_priv) - ring->tail) * sizeof(u32);
@@ -430,37 +430,38 @@ do {									\
        }                                                               \
 } while (0)
-#define RING_SPACE_TEST_WITH_RETURN( dev_priv )                         \
+#define RING_SPACE_TEST_WITH_RETURN(dev_priv)                           \
 do {                                                                    \
        drm_r128_ring_buffer_t *ring = &dev_priv->ring; int i;          \
-        if ( ring->space < ring->high_mark ) {                          \
+        if (ring->space < ring->high_mark) {                            \
-                for ( i = 0 ; i < dev_priv->usec_timeout ; i++ ) {      \
+                for (i = 0 ; i < dev_priv->usec_timeout ; i++) {        \
-                        r128_update_ring_snapshot( dev_priv );          \
+                        r128_update_ring_snapshot(dev_priv);            \
-                        if ( ring->space >= ring->high_mark )           \
+                        if (ring->space >= ring->high_mark)             \
                                goto __ring_space_done;                 \
-                        DRM_UDELAY(1);                          \
+                        DRM_UDELAY(1);                                  \
                }                                                       \
-                DRM_ERROR( "ring space check failed!\n" );              \
+                DRM_ERROR("ring space check failed!\n");                \
-                return -EBUSY;                          \
+                return -EBUSY;                                          \
        }                                                               \
 __ring_space_done:                                                     \
        ;                                                               \
 } while (0)
-#define VB_AGE_TEST_WITH_RETURN( dev_priv )                             \
+#define VB_AGE_TEST_WITH_RETURN(dev_priv)                               \
 do {                                                                    \
        drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;            \
-        if ( sarea_priv->last_dispatch >= R128_MAX_VB_AGE ) {           \
+        if (sarea_priv->last_dispatch >= R128_MAX_VB_AGE) {             \
-                int __ret = r128_do_cce_idle( dev_priv );               \
+                int __ret = r128_do_cce_idle(dev_priv);                 \
-                if ( __ret ) return __ret;                              \
+                if (__ret)                                              \
+                        return __ret;                                   \
                sarea_priv->last_dispatch = 0;                          \
-                r128_freelist_reset( dev );                             \
+                r128_freelist_reset(dev);                               \
        }                                                               \
 } while (0)
 #define R128_WAIT_UNTIL_PAGE_FLIPPED() do {                             \
-        OUT_RING( CCE_PACKET0( R128_WAIT_UNTIL, 0 ) );                  \
+        OUT_RING(CCE_PACKET0(R128_WAIT_UNTIL, 0));                      \
-        OUT_RING( R128_EVENT_CRTC_OFFSET );                             \
+        OUT_RING(R128_EVENT_CRTC_OFFSET);                               \
 } while (0)
 /* ================================================================
@@ -472,13 +473,12 @@ do {									\
 #define RING_LOCALS                                                     \
        int write, _nr; unsigned int tail_mask; volatile u32 *ring;
-#define BEGIN_RING( n ) do {                                            \
+#define BEGIN_RING(n) do {                                              \
-        if ( R128_VERBOSE ) {                                           \
+        if (R128_VERBOSE)                                               \
-                DRM_INFO( "BEGIN_RING( %d )\n", (n));                   \
+                DRM_INFO("BEGIN_RING(%d)\n", (n));                      \
-        }                                                               \
+        if (dev_priv->ring.space <= (n) * sizeof(u32)) {                \
-        if ( dev_priv->ring.space <= (n) * sizeof(u32) ) {              \
                COMMIT_RING();                                          \
-                r128_wait_ring( dev_priv, (n) * sizeof(u32) );          \
+                r128_wait_ring(dev_priv, (n) * sizeof(u32));            \
        }                                                               \
        _nr = n; dev_priv->ring.space -= (n) * sizeof(u32);             \
        ring = dev_priv->ring.start;                                    \
@@ -494,40 +494,36 @@ do {									\
 #define R128_BROKEN_CCE 1
 #define ADVANCE_RING() do {                                             \
-        if ( R128_VERBOSE ) {                                           \
+        if (R128_VERBOSE)                                               \
-                DRM_INFO( "ADVANCE_RING() wr=0x%06x tail=0x%06x\n",     \
+                DRM_INFO("ADVANCE_RING() wr=0x%06x tail=0x%06x\n",      \
-                          write, dev_priv->ring.tail );                 \
+                         write, dev_priv->ring.tail);                   \
-        }                                                               \
+        if (R128_BROKEN_CCE && write < 32)                              \
-        if ( R128_BROKEN_CCE && write < 32 ) {                          \
+                memcpy(dev_priv->ring.end,                              \
-                memcpy( dev_priv->ring.end,                             \
+                       dev_priv->ring.start,                            \
-                        dev_priv->ring.start,                           \
+                       write * sizeof(u32));                            \
-                        write * sizeof(u32) );                          \
+        if (((dev_priv->ring.tail + _nr) & tail_mask) != write)         \
-        }                                                               \
-        if (((dev_priv->ring.tail + _nr) & tail_mask) != write) {       \
                DRM_ERROR(                                              \
                        "ADVANCE_RING(): mismatch: nr: %x write: %x line: %d\n",        \
                        ((dev_priv->ring.tail + _nr) & tail_mask),      \
                        write, __LINE__);                               \
-        } else                                                          \
+        else                                                            \
                dev_priv->ring.tail = write;                            \
 } while (0)
 #define COMMIT_RING() do {                                              \
-        if ( R128_VERBOSE ) {                                           \
+        if (R128_VERBOSE)                                               \
-                DRM_INFO( "COMMIT_RING() tail=0x%06x\n",                \
+                DRM_INFO("COMMIT_RING() tail=0x%06x\n",                 \
-                        dev_priv->ring.tail );                          \
+                         dev_priv->ring.tail);                          \
-        }                                                               \
        DRM_MEMORYBARRIER();                                            \
-        R128_WRITE( R128_PM4_BUFFER_DL_WPTR, dev_priv->ring.tail );     \
+        R128_WRITE(R128_PM4_BUFFER_DL_WPTR, dev_priv->ring.tail);       \
-        R128_READ( R128_PM4_BUFFER_DL_WPTR );                           \
+        R128_READ(R128_PM4_BUFFER_DL_WPTR);                             \
 } while (0)
-#define OUT_RING( x ) do {                                              \
+#define OUT_RING(x) do {                                                \
-        if ( R128_VERBOSE ) {                                           \
+        if (R128_VERBOSE)                                               \
-                DRM_INFO( "   OUT_RING( 0x%08x ) at 0x%x\n",            \
+                DRM_INFO("   OUT_RING( 0x%08x ) at 0x%x\n",             \
-                           (unsigned int)(x), write );                  \
+                         (unsigned int)(x), write);                     \
-        }                                                               \
+        ring[write++] = cpu_to_le32(x);                                 \
-        ring[write++] = cpu_to_le32( x );                               \
        write &= tail_mask;                                             \
 } while (0)
diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
index 69810fb8ac49..429d5a02695f 100644
--- a/drivers/gpu/drm/r128/r128_irq.c
+++ b/drivers/gpu/drm/r128/r128_irq.c
@@ -90,7 +90,7 @@ void r128_disable_vblank(struct drm_device *dev, int crtc)
         */
 }
-void r128_driver_irq_preinstall(struct drm_device * dev)
+void r128_driver_irq_preinstall(struct drm_device *dev)
 {
        drm_r128_private_t *dev_priv = (drm_r128_private_t *) dev->dev_private;
@@ -105,7 +105,7 @@ int r128_driver_irq_postinstall(struct drm_device *dev)
        return 0;
 }
-void r128_driver_irq_uninstall(struct drm_device * dev)
+void r128_driver_irq_uninstall(struct drm_device *dev)
 {
        drm_r128_private_t *dev_priv = (drm_r128_private_t *) dev->dev_private;
        if (!dev_priv)
diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
index af2665cf4718..077af1f2f9b4 100644
--- a/drivers/gpu/drm/r128/r128_state.c
+++ b/drivers/gpu/drm/r128/r128_state.c
@@ -37,8 +37,8 @@
 * CCE hardware state programming functions
 */
-static void r128_emit_clip_rects(drm_r128_private_t * dev_priv,
+static void r128_emit_clip_rects(drm_r128_private_t *dev_priv,
-                                 struct drm_clip_rect * boxes, int count)
+                                 struct drm_clip_rect *boxes, int count)
 {
        u32 aux_sc_cntl = 0x00000000;
        RING_LOCALS;
@@ -80,7 +80,7 @@ static void r128_emit_clip_rects(drm_r128_private_t * dev_priv,
        ADVANCE_RING();
 }
-static __inline__ void r128_emit_core(drm_r128_private_t * dev_priv)
+static __inline__ void r128_emit_core(drm_r128_private_t *dev_priv)
 {
        drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
        drm_r128_context_regs_t *ctx = &sarea_priv->context_state;
@@ -95,7 +95,7 @@ static __inline__ void r128_emit_core(drm_r128_private_t * dev_priv)
        ADVANCE_RING();
 }
-static __inline__ void r128_emit_context(drm_r128_private_t * dev_priv)
+static __inline__ void r128_emit_context(drm_r128_private_t *dev_priv)
 {
        drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
        drm_r128_context_regs_t *ctx = &sarea_priv->context_state;
@@ -121,7 +121,7 @@ static __inline__ void r128_emit_context(drm_r128_private_t * dev_priv)
        ADVANCE_RING();
 }
-static __inline__ void r128_emit_setup(drm_r128_private_t * dev_priv)
+static __inline__ void r128_emit_setup(drm_r128_private_t *dev_priv)
 {
        drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
        drm_r128_context_regs_t *ctx = &sarea_priv->context_state;
@@ -137,7 +137,7 @@ static __inline__ void r128_emit_setup(drm_r128_private_t * dev_priv)
        ADVANCE_RING();
 }
-static __inline__ void r128_emit_masks(drm_r128_private_t * dev_priv)
+static __inline__ void r128_emit_masks(drm_r128_private_t *dev_priv)
 {
        drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
        drm_r128_context_regs_t *ctx = &sarea_priv->context_state;
@@ -156,7 +156,7 @@ static __inline__ void r128_emit_masks(drm_r128_private_t * dev_priv)
        ADVANCE_RING();
 }
-static __inline__ void r128_emit_window(drm_r128_private_t * dev_priv)
+static __inline__ void r128_emit_window(drm_r128_private_t *dev_priv)
 {
        drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
        drm_r128_context_regs_t *ctx = &sarea_priv->context_state;
@@ -171,7 +171,7 @@ static __inline__ void r128_emit_window(drm_r128_private_t * dev_priv)
        ADVANCE_RING();
 }
-static __inline__ void r128_emit_tex0(drm_r128_private_t * dev_priv)
+static __inline__ void r128_emit_tex0(drm_r128_private_t *dev_priv)
 {
        drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
        drm_r128_context_regs_t *ctx = &sarea_priv->context_state;
@@ -187,9 +187,8 @@ static __inline__ void r128_emit_tex0(drm_r128_private_t * dev_priv)
        OUT_RING(tex->tex_cntl);
        OUT_RING(tex->tex_combine_cntl);
        OUT_RING(ctx->tex_size_pitch_c);
-        for (i = 0; i < R128_MAX_TEXTURE_LEVELS; i++) {
+        for (i = 0; i < R128_MAX_TEXTURE_LEVELS; i++)
                OUT_RING(tex->tex_offset[i]);
-        }
        OUT_RING(CCE_PACKET0(R128_CONSTANT_COLOR_C, 1));
        OUT_RING(ctx->constant_color_c);
@@ -198,7 +197,7 @@ static __inline__ void r128_emit_tex0(drm_r128_private_t * dev_priv)
        ADVANCE_RING();
 }
-static __inline__ void r128_emit_tex1(drm_r128_private_t * dev_priv)
+static __inline__ void r128_emit_tex1(drm_r128_private_t *dev_priv)
 {
        drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
        drm_r128_texture_regs_t *tex = &sarea_priv->tex_state[1];
@@ -211,9 +210,8 @@ static __inline__ void r128_emit_tex1(drm_r128_private_t * dev_priv)
        OUT_RING(CCE_PACKET0(R128_SEC_TEX_CNTL_C, 1 + R128_MAX_TEXTURE_LEVELS));
        OUT_RING(tex->tex_cntl);
        OUT_RING(tex->tex_combine_cntl);
-        for (i = 0; i < R128_MAX_TEXTURE_LEVELS; i++) {
+        for (i = 0; i < R128_MAX_TEXTURE_LEVELS; i++)
                OUT_RING(tex->tex_offset[i]);
-        }
        OUT_RING(CCE_PACKET0(R128_SEC_TEXTURE_BORDER_COLOR_C, 0));
        OUT_RING(tex->tex_border_color);
@@ -221,7 +219,7 @@ static __inline__ void r128_emit_tex1(drm_r128_private_t * dev_priv)
        ADVANCE_RING();
 }
-static void r128_emit_state(drm_r128_private_t * dev_priv)
+static void r128_emit_state(drm_r128_private_t *dev_priv)
 {
        drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
        unsigned int dirty = sarea_priv->dirty;
@@ -274,7 +272,7 @@ static void r128_emit_state(drm_r128_private_t * dev_priv)
 * Performance monitoring functions
 */
-static void r128_clear_box(drm_r128_private_t * dev_priv,
+static void r128_clear_box(drm_r128_private_t *dev_priv,
                           int x, int y, int w, int h, int r, int g, int b)
 {
        u32 pitch, offset;
@@ -321,13 +319,12 @@ static void r128_clear_box(drm_r128_private_t * dev_priv,
        ADVANCE_RING();
 }
-static void r128_cce_performance_boxes(drm_r128_private_t * dev_priv)
+static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
 {
-        if (atomic_read(&dev_priv->idle_count) == 0) {
+        if (atomic_read(&dev_priv->idle_count) == 0)
                r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
-        } else {
+        else
                atomic_set(&dev_priv->idle_count, 0);
-        }
 }
 #endif
@@ -352,8 +349,8 @@ static void r128_print_dirty(const char *msg, unsigned int flags)
                 (flags & R128_REQUIRE_QUIESCENCE) ? "quiescence, " : "");
 }
-static void r128_cce_dispatch_clear(struct drm_device * dev,
+static void r128_cce_dispatch_clear(struct drm_device *dev,
-                                    drm_r128_clear_t * clear)
+                                    drm_r128_clear_t *clear)
 {
        drm_r128_private_t *dev_priv = dev->dev_private;
        drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
@@ -458,7 +455,7 @@ static void r128_cce_dispatch_clear(struct drm_device * dev,
        }
 }
-static void r128_cce_dispatch_swap(struct drm_device * dev)
+static void r128_cce_dispatch_swap(struct drm_device *dev)
 {
        drm_r128_private_t *dev_priv = dev->dev_private;
        drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
@@ -524,7 +521,7 @@ static void r128_cce_dispatch_swap(struct drm_device * dev)
        ADVANCE_RING();
 }
-static void r128_cce_dispatch_flip(struct drm_device * dev)
+static void r128_cce_dispatch_flip(struct drm_device *dev)
 {
        drm_r128_private_t *dev_priv = dev->dev_private;
        RING_LOCALS;
@@ -542,11 +539,10 @@ static void r128_cce_dispatch_flip(struct drm_device * dev)
        R128_WAIT_UNTIL_PAGE_FLIPPED();
        OUT_RING(CCE_PACKET0(R128_CRTC_OFFSET, 0));
-        if (dev_priv->current_page == 0) {
+        if (dev_priv->current_page == 0)
                OUT_RING(dev_priv->back_offset);
-        } else {
+        else
                OUT_RING(dev_priv->front_offset);
-        }
        ADVANCE_RING();
@@ -566,7 +562,7 @@ static void r128_cce_dispatch_flip(struct drm_device * dev)
        ADVANCE_RING();
 }
-static void r128_cce_dispatch_vertex(struct drm_device * dev, struct drm_buf * buf)
+static void r128_cce_dispatch_vertex(struct drm_device *dev, struct drm_buf *buf)
 {
        drm_r128_private_t *dev_priv = dev->dev_private;
        drm_r128_buf_priv_t *buf_priv = buf->dev_private;
@@ -585,9 +581,8 @@ static void r128_cce_dispatch_vertex(struct drm_device * dev, struct drm_buf * b
        if (buf->used) {
                buf_priv->dispatched = 1;
-                if (sarea_priv->dirty & ~R128_UPLOAD_CLIPRECTS) {
+                if (sarea_priv->dirty & ~R128_UPLOAD_CLIPRECTS)
                        r128_emit_state(dev_priv);
-                }
                do {
                        /* Emit the next set of up to three cliprects */
@@ -636,8 +631,8 @@ static void r128_cce_dispatch_vertex(struct drm_device * dev, struct drm_buf * b
        sarea_priv->nbox = 0;
 }
-static void r128_cce_dispatch_indirect(struct drm_device * dev,
+static void r128_cce_dispatch_indirect(struct drm_device *dev,
-                                       struct drm_buf * buf, int start, int end)
+                                       struct drm_buf *buf, int start, int end)
 {
        drm_r128_private_t *dev_priv = dev->dev_private;
        drm_r128_buf_priv_t *buf_priv = buf->dev_private;
@@ -691,8 +686,8 @@ static void r128_cce_dispatch_indirect(struct drm_device * dev,
        dev_priv->sarea_priv->last_dispatch++;
 }
-static void r128_cce_dispatch_indices(struct drm_device * dev,
+static void r128_cce_dispatch_indices(struct drm_device *dev,
-                                      struct drm_buf * buf,
+                                      struct drm_buf *buf,
                                      int start, int end, int count)
 {
        drm_r128_private_t *dev_priv = dev->dev_private;
@@ -713,9 +708,8 @@ static void r128_cce_dispatch_indices(struct drm_device * dev,
        if (start != end) {
                buf_priv->dispatched = 1;
-                if (sarea_priv->dirty & ~R128_UPLOAD_CLIPRECTS) {
+                if (sarea_priv->dirty & ~R128_UPLOAD_CLIPRECTS)
                        r128_emit_state(dev_priv);
-                }
                dwords = (end - start + 3) / sizeof(u32);
@@ -775,9 +769,9 @@ static void r128_cce_dispatch_indices(struct drm_device * dev,
        sarea_priv->nbox = 0;
 }
-static int r128_cce_dispatch_blit(struct drm_device * dev,
+static int r128_cce_dispatch_blit(struct drm_device *dev,
                                  struct drm_file *file_priv,
-                                  drm_r128_blit_t * blit)
+                                  drm_r128_blit_t *blit)
 {
        drm_r128_private_t *dev_priv = dev->dev_private;
        struct drm_device_dma *dma = dev->dma;
@@ -887,8 +881,8 @@ static int r128_cce_dispatch_blit(struct drm_device * dev,
 * have hardware stencil support.
 */
-static int r128_cce_dispatch_write_span(struct drm_device * dev,
+static int r128_cce_dispatch_write_span(struct drm_device *dev,
-                                        drm_r128_depth_t * depth)
+                                        drm_r128_depth_t *depth)
 {
        drm_r128_private_t *dev_priv = dev->dev_private;
        int count, x, y;
@@ -902,12 +896,10 @@ static int r128_cce_dispatch_write_span(struct drm_device * dev,
        if (count > 4096 || count <= 0)
                return -EMSGSIZE;
-        if (DRM_COPY_FROM_USER(&x, depth->x, sizeof(x))) {
+        if (DRM_COPY_FROM_USER(&x, depth->x, sizeof(x)))
                return -EFAULT;
-        }
+        if (DRM_COPY_FROM_USER(&y, depth->y, sizeof(y)))
-        if (DRM_COPY_FROM_USER(&y, depth->y, sizeof(y))) {
                return -EFAULT;
-        }
        buffer_size = depth->n * sizeof(u32);
        buffer = kmalloc(buffer_size, GFP_KERNEL);
@@ -983,8 +975,8 @@ static int r128_cce_dispatch_write_span(struct drm_device * dev,
        return 0;
 }
-static int r128_cce_dispatch_write_pixels(struct drm_device * dev,
+static int r128_cce_dispatch_write_pixels(struct drm_device *dev,
-                                          drm_r128_depth_t * depth)
+                                          drm_r128_depth_t *depth)
 {
        drm_r128_private_t *dev_priv = dev->dev_private;
        int count, *x, *y;
@@ -1001,9 +993,8 @@ static int r128_cce_dispatch_write_pixels(struct drm_device * dev,
        xbuf_size = count * sizeof(*x);
        ybuf_size = count * sizeof(*y);
        x = kmalloc(xbuf_size, GFP_KERNEL);
-        if (x == NULL) {
+        if (x == NULL)
                return -ENOMEM;
-        }
        y = kmalloc(ybuf_size, GFP_KERNEL);
        if (y == NULL) {
                kfree(x);
@@ -1105,8 +1096,8 @@ static int r128_cce_dispatch_write_pixels(struct drm_device * dev,
        return 0;
 }
-static int r128_cce_dispatch_read_span(struct drm_device * dev,
+static int r128_cce_dispatch_read_span(struct drm_device *dev,
-                                       drm_r128_depth_t * depth)
+                                       drm_r128_depth_t *depth)
 {
        drm_r128_private_t *dev_priv = dev->dev_private;
        int count, x, y;
@@ -1117,12 +1108,10 @@ static int r128_cce_dispatch_read_span(struct drm_device * dev,
        if (count > 4096 || count <= 0)
                return -EMSGSIZE;
-        if (DRM_COPY_FROM_USER(&x, depth->x, sizeof(x))) {
+        if (DRM_COPY_FROM_USER(&x, depth->x, sizeof(x)))
                return -EFAULT;
-        }
+        if (DRM_COPY_FROM_USER(&y, depth->y, sizeof(y)))
-        if (DRM_COPY_FROM_USER(&y, depth->y, sizeof(y))) {
                return -EFAULT;
-        }
        BEGIN_RING(7);
@@ -1148,8 +1137,8 @@ static int r128_cce_dispatch_read_span(struct drm_device * dev,
        return 0;
 }
-static int r128_cce_dispatch_read_pixels(struct drm_device * dev,
+static int r128_cce_dispatch_read_pixels(struct drm_device *dev,
-                                         drm_r128_depth_t * depth)
+                                         drm_r128_depth_t *depth)
 {
        drm_r128_private_t *dev_priv = dev->dev_private;
        int count, *x, *y;
@@ -1161,16 +1150,14 @@ static int r128_cce_dispatch_read_pixels(struct drm_device * dev,
        if (count > 4096 || count <= 0)
                return -EMSGSIZE;
-        if (count > dev_priv->depth_pitch) {
+        if (count > dev_priv->depth_pitch)
                count = dev_priv->depth_pitch;
-        }
        xbuf_size = count * sizeof(*x);
        ybuf_size = count * sizeof(*y);
        x = kmalloc(xbuf_size, GFP_KERNEL);
-        if (x == NULL) {
+        if (x == NULL)
                return -ENOMEM;
-        }
        y = kmalloc(ybuf_size, GFP_KERNEL);
        if (y == NULL) {
                kfree(x);
@@ -1220,7 +1207,7 @@ static int r128_cce_dispatch_read_pixels(struct drm_device * dev,
 * Polygon stipple
 */
-static void r128_cce_dispatch_stipple(struct drm_device * dev, u32 * stipple)
+static void r128_cce_dispatch_stipple(struct drm_device *dev, u32 *stipple)
 {
        drm_r128_private_t *dev_priv = dev->dev_private;
        int i;
@@ -1230,9 +1217,8 @@ static void r128_cce_dispatch_stipple(struct drm_device * dev, u32 * stipple)
        BEGIN_RING(33);
        OUT_RING(CCE_PACKET0(R128_BRUSH_DATA0, 31));
-        for (i = 0; i < 32; i++) {
+        for (i = 0; i < 32; i++)
                OUT_RING(stipple[i]);
-        }
        ADVANCE_RING();
 }
@@ -1269,7 +1255,7 @@ static int r128_cce_clear(struct drm_device *dev, void *data, struct drm_file *f
        return 0;
 }
-static int r128_do_init_pageflip(struct drm_device * dev)
+static int r128_do_init_pageflip(struct drm_device *dev)
 {
        drm_r128_private_t *dev_priv = dev->dev_private;
        DRM_DEBUG("\n");
@@ -1288,7 +1274,7 @@ static int r128_do_init_pageflip(struct drm_device * dev)
        return 0;
 }
-static int r128_do_cleanup_pageflip(struct drm_device * dev)
+static int r128_do_cleanup_pageflip(struct drm_device *dev)
 {
        drm_r128_private_t *dev_priv = dev->dev_private;
        DRM_DEBUG("\n");
@@ -1645,17 +1631,16 @@ static int r128_getparam(struct drm_device *dev, void *data, struct drm_file *fi
        return 0;
 }
-void r128_driver_preclose(struct drm_device * dev, struct drm_file *file_priv)
+void r128_driver_preclose(struct drm_device *dev, struct drm_file *file_priv)
 {
        if (dev->dev_private) {
                drm_r128_private_t *dev_priv = dev->dev_private;
-                if (dev_priv->page_flipping) {
+                if (dev_priv->page_flipping)
                        r128_do_cleanup_pageflip(dev);
-                }
        }
 }
-void r128_driver_lastclose(struct drm_device * dev)
+void r128_driver_lastclose(struct drm_device *dev)
 {
        r128_do_cleanup_cce(dev);
 }
diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile
index 84b1f2729d43..aebe00875041 100644
--- a/drivers/gpu/drm/radeon/Makefile
+++ b/drivers/gpu/drm/radeon/Makefile
@@ -69,5 +69,6 @@ radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \
 radeon-$(CONFIG_COMPAT) += radeon_ioc32.o
 radeon-$(CONFIG_VGA_SWITCHEROO) += radeon_atpx_handler.o
+radeon-$(CONFIG_ACPI) += radeon_acpi.o
 obj-$(CONFIG_DRM_RADEON)+= radeon.o
diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c
index 1d569830ed99..8e421f644a54 100644
--- a/drivers/gpu/drm/radeon/atom.c
+++ b/drivers/gpu/drm/radeon/atom.c
@@ -108,12 +108,11 @@ static uint32_t atom_iio_execute(struct atom_context *ctx, int base,
                        base++;
                        break;
                case ATOM_IIO_READ:
-                        temp = ctx->card->reg_read(ctx->card, CU16(base + 1));
+                        temp = ctx->card->ioreg_read(ctx->card, CU16(base + 1));
                        base += 3;
                        break;
                case ATOM_IIO_WRITE:
-                        (void)ctx->card->reg_read(ctx->card, CU16(base + 1));
+                        ctx->card->ioreg_write(ctx->card, CU16(base + 1), temp);
-                        ctx->card->reg_write(ctx->card, CU16(base + 1), temp);
                        base += 3;
                        break;
                case ATOM_IIO_CLEAR:
@@ -715,8 +714,8 @@ static void atom_op_jump(atom_exec_context *ctx, int *ptr, int arg)
                        cjiffies = jiffies;
                        if (time_after(cjiffies, ctx->last_jump_jiffies)) {
                                cjiffies -= ctx->last_jump_jiffies;
-                                if ((jiffies_to_msecs(cjiffies) > 1000)) {
+                                if ((jiffies_to_msecs(cjiffies) > 5000)) {
-                                        DRM_ERROR("atombios stuck in loop for more than 1sec aborting\n");
+                                        DRM_ERROR("atombios stuck in loop for more than 5secs aborting\n");
                                        ctx->abort = true;
                                }
                        } else {
diff --git a/drivers/gpu/drm/radeon/atom.h b/drivers/gpu/drm/radeon/atom.h
index cd1b64ab5ca7..a589a55b223e 100644
--- a/drivers/gpu/drm/radeon/atom.h
+++ b/drivers/gpu/drm/radeon/atom.h
@@ -113,6 +113,8 @@ struct card_info {
        struct drm_device *dev;
        void (* reg_write)(struct card_info *, uint32_t, uint32_t);   /*  filled by driver */
        uint32_t (* reg_read)(struct card_info *, uint32_t);          /*  filled by driver */
+        void (* ioreg_write)(struct card_info *, uint32_t, uint32_t);   /*  filled by driver */
+        uint32_t (* ioreg_read)(struct card_info *, uint32_t);          /*  filled by driver */
        void (* mc_write)(struct card_info *, uint32_t, uint32_t);   /*  filled by driver */
        uint32_t (* mc_read)(struct card_info *, uint32_t);          /*  filled by driver */
        void (* pll_write)(struct card_info *, uint32_t, uint32_t);   /*  filled by driver */
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index 8c2d6478a221..12ad512bd3d3 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -44,10 +44,6 @@ static void atombios_overscan_setup(struct drm_crtc *crtc,
        memset(&args, 0, sizeof(args));
-        args.usOverscanRight = 0;
-        args.usOverscanLeft = 0;
-        args.usOverscanBottom = 0;
-        args.usOverscanTop = 0;
        args.ucCRTC = radeon_crtc->crtc_id;
        switch (radeon_crtc->rmx_type) {
@@ -56,7 +52,6 @@ static void atombios_overscan_setup(struct drm_crtc *crtc,
                args.usOverscanBottom = (adjusted_mode->crtc_vdisplay - mode->crtc_vdisplay) / 2;
                args.usOverscanLeft = (adjusted_mode->crtc_hdisplay - mode->crtc_hdisplay) / 2;
                args.usOverscanRight = (adjusted_mode->crtc_hdisplay - mode->crtc_hdisplay) / 2;
-                atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
                break;
        case RMX_ASPECT:
                a1 = mode->crtc_vdisplay * adjusted_mode->crtc_hdisplay;
@@ -69,17 +64,16 @@ static void atombios_overscan_setup(struct drm_crtc *crtc,
                        args.usOverscanLeft = (adjusted_mode->crtc_vdisplay - (a1 / mode->crtc_hdisplay)) / 2;
                        args.usOverscanRight = (adjusted_mode->crtc_vdisplay - (a1 / mode->crtc_hdisplay)) / 2;
                }
-                atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
                break;
        case RMX_FULL:
        default:
-                args.usOverscanRight = 0;
+                args.usOverscanRight = radeon_crtc->h_border;
-                args.usOverscanLeft = 0;
+                args.usOverscanLeft = radeon_crtc->h_border;
-                args.usOverscanBottom = 0;
+                args.usOverscanBottom = radeon_crtc->v_border;
-                args.usOverscanTop = 0;
+                args.usOverscanTop = radeon_crtc->v_border;
-                atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
                break;
        }
+        atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
 }
 static void atombios_scaler_setup(struct drm_crtc *crtc)
@@ -282,22 +276,22 @@ atombios_set_crtc_dtd_timing(struct drm_crtc *crtc,
        u16 misc = 0;
        memset(&args, 0, sizeof(args));
-        args.usH_Size = cpu_to_le16(mode->crtc_hdisplay);
+        args.usH_Size = cpu_to_le16(mode->crtc_hdisplay - (radeon_crtc->h_border * 2));
        args.usH_Blanking_Time =
-                cpu_to_le16(mode->crtc_hblank_end - mode->crtc_hdisplay);
+                cpu_to_le16(mode->crtc_hblank_end - mode->crtc_hdisplay + (radeon_crtc->h_border * 2));
-        args.usV_Size = cpu_to_le16(mode->crtc_vdisplay);
+        args.usV_Size = cpu_to_le16(mode->crtc_vdisplay - (radeon_crtc->v_border * 2));
        args.usV_Blanking_Time =
-            cpu_to_le16(mode->crtc_vblank_end - mode->crtc_vdisplay);
+                cpu_to_le16(mode->crtc_vblank_end - mode->crtc_vdisplay + (radeon_crtc->v_border * 2));
        args.usH_SyncOffset =
-                cpu_to_le16(mode->crtc_hsync_start - mode->crtc_hdisplay);
+                cpu_to_le16(mode->crtc_hsync_start - mode->crtc_hdisplay + radeon_crtc->h_border);
        args.usH_SyncWidth =
                cpu_to_le16(mode->crtc_hsync_end - mode->crtc_hsync_start);
        args.usV_SyncOffset =
-                cpu_to_le16(mode->crtc_vsync_start - mode->crtc_vdisplay);
+                cpu_to_le16(mode->crtc_vsync_start - mode->crtc_vdisplay + radeon_crtc->v_border);
        args.usV_SyncWidth =
                cpu_to_le16(mode->crtc_vsync_end - mode->crtc_vsync_start);
-        /*args.ucH_Border = mode->hborder;*/
+        args.ucH_Border = radeon_crtc->h_border;
-        /*args.ucV_Border = mode->vborder;*/
+        args.ucV_Border = radeon_crtc->v_border;
        if (mode->flags & DRM_MODE_FLAG_NVSYNC)
                misc |= ATOM_VSYNC_POLARITY;
@@ -669,56 +663,25 @@ static void atombios_crtc_set_dcpll(struct drm_crtc *crtc)
        atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
 }
-static void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
+static void atombios_crtc_program_pll(struct drm_crtc *crtc,
+                                      int crtc_id,
+                                      int pll_id,
+                                      u32 encoder_mode,
+                                      u32 encoder_id,
+                                      u32 clock,
+                                      u32 ref_div,
+                                      u32 fb_div,
+                                      u32 frac_fb_div,
+                                      u32 post_div)
 {
-        struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
        struct drm_device *dev = crtc->dev;
        struct radeon_device *rdev = dev->dev_private;
-        struct drm_encoder *encoder = NULL;
-        struct radeon_encoder *radeon_encoder = NULL;
        u8 frev, crev;
-        int index;
+        int index = GetIndexIntoMasterTable(COMMAND, SetPixelClock);
        union set_pixel_clock args;
-        u32 pll_clock = mode->clock;
-        u32 ref_div = 0, fb_div = 0, frac_fb_div = 0, post_div = 0;
-        struct radeon_pll *pll;
-        u32 adjusted_clock;
-        int encoder_mode = 0;
        memset(&args, 0, sizeof(args));
-        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-                if (encoder->crtc == crtc) {
-                        radeon_encoder = to_radeon_encoder(encoder);
-                        encoder_mode = atombios_get_encoder_mode(encoder);
-                        break;
-                }
-        }
-        if (!radeon_encoder)
-                return;
-        switch (radeon_crtc->pll_id) {
-        case ATOM_PPLL1:
-                pll = &rdev->clock.p1pll;
-                break;
-        case ATOM_PPLL2:
-                pll = &rdev->clock.p2pll;
-                break;
-        case ATOM_DCPLL:
-        case ATOM_PPLL_INVALID:
-        default:
-                pll = &rdev->clock.dcpll;
-                break;
-        }
-        /* adjust pixel clock as needed */
-        adjusted_clock = atombios_adjust_pll(crtc, mode, pll);
-        radeon_compute_pll(pll, adjusted_clock, &pll_clock, &fb_div, &frac_fb_div,
-                           &ref_div, &post_div);
-        index = GetIndexIntoMasterTable(COMMAND, SetPixelClock);
        if (!atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev,
                                   &crev))
                return;
@@ -727,47 +690,49 @@ static void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode
        case 1:
                switch (crev) {
                case 1:
-                        args.v1.usPixelClock = cpu_to_le16(mode->clock / 10);
+                        if (clock == ATOM_DISABLE)
+                                return;
+                        args.v1.usPixelClock = cpu_to_le16(clock / 10);
                        args.v1.usRefDiv = cpu_to_le16(ref_div);
                        args.v1.usFbDiv = cpu_to_le16(fb_div);
                        args.v1.ucFracFbDiv = frac_fb_div;
                        args.v1.ucPostDiv = post_div;
-                        args.v1.ucPpll = radeon_crtc->pll_id;
+                        args.v1.ucPpll = pll_id;
-                        args.v1.ucCRTC = radeon_crtc->crtc_id;
+                        args.v1.ucCRTC = crtc_id;
                        args.v1.ucRefDivSrc = 1;
                        break;
                case 2:
-                        args.v2.usPixelClock = cpu_to_le16(mode->clock / 10);
+                        args.v2.usPixelClock = cpu_to_le16(clock / 10);
                        args.v2.usRefDiv = cpu_to_le16(ref_div);
                        args.v2.usFbDiv = cpu_to_le16(fb_div);
                        args.v2.ucFracFbDiv = frac_fb_div;
                        args.v2.ucPostDiv = post_div;
-                        args.v2.ucPpll = radeon_crtc->pll_id;
+                        args.v2.ucPpll = pll_id;
-                        args.v2.ucCRTC = radeon_crtc->crtc_id;
+                        args.v2.ucCRTC = crtc_id;
                        args.v2.ucRefDivSrc = 1;
                        break;
                case 3:
-                        args.v3.usPixelClock = cpu_to_le16(mode->clock / 10);
+                        args.v3.usPixelClock = cpu_to_le16(clock / 10);
                        args.v3.usRefDiv = cpu_to_le16(ref_div);
                        args.v3.usFbDiv = cpu_to_le16(fb_div);
                        args.v3.ucFracFbDiv = frac_fb_div;
                        args.v3.ucPostDiv = post_div;
-                        args.v3.ucPpll = radeon_crtc->pll_id;
+                        args.v3.ucPpll = pll_id;
-                        args.v3.ucMiscInfo = (radeon_crtc->pll_id << 2);
+                        args.v3.ucMiscInfo = (pll_id << 2);
-                        args.v3.ucTransmitterId = radeon_encoder->encoder_id;
+                        args.v3.ucTransmitterId = encoder_id;
                        args.v3.ucEncoderMode = encoder_mode;
                        break;
                case 5:
-                        args.v5.ucCRTC = radeon_crtc->crtc_id;
+                        args.v5.ucCRTC = crtc_id;
-                        args.v5.usPixelClock = cpu_to_le16(mode->clock / 10);
+                        args.v5.usPixelClock = cpu_to_le16(clock / 10);
                        args.v5.ucRefDiv = ref_div;
                        args.v5.usFbDiv = cpu_to_le16(fb_div);
                        args.v5.ulFbDivDecFrac = cpu_to_le32(frac_fb_div * 100000);
                        args.v5.ucPostDiv = post_div;
                        args.v5.ucMiscInfo = 0; /* HDMI depth, etc. */
-                        args.v5.ucTransmitterID = radeon_encoder->encoder_id;
+                        args.v5.ucTransmitterID = encoder_id;
                        args.v5.ucEncoderMode = encoder_mode;
-                        args.v5.ucPpll = radeon_crtc->pll_id;
+                        args.v5.ucPpll = pll_id;
                        break;
                default:
                        DRM_ERROR("Unknown table version %d %d\n", frev, crev);
@@ -782,6 +747,56 @@ static void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode
        atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
 }
+static void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
+{
+        struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
+        struct drm_device *dev = crtc->dev;
+        struct radeon_device *rdev = dev->dev_private;
+        struct drm_encoder *encoder = NULL;
+        struct radeon_encoder *radeon_encoder = NULL;
+        u32 pll_clock = mode->clock;
+        u32 ref_div = 0, fb_div = 0, frac_fb_div = 0, post_div = 0;
+        struct radeon_pll *pll;
+        u32 adjusted_clock;
+        int encoder_mode = 0;
+        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+                if (encoder->crtc == crtc) {
+                        radeon_encoder = to_radeon_encoder(encoder);
+                        encoder_mode = atombios_get_encoder_mode(encoder);
+                        break;
+                }
+        }
+        if (!radeon_encoder)
+                return;
+        switch (radeon_crtc->pll_id) {
+        case ATOM_PPLL1:
+                pll = &rdev->clock.p1pll;
+                break;
+        case ATOM_PPLL2:
+                pll = &rdev->clock.p2pll;
+                break;
+        case ATOM_DCPLL:
+        case ATOM_PPLL_INVALID:
+        default:
+                pll = &rdev->clock.dcpll;
+                break;
+        }
+        /* adjust pixel clock as needed */
+        adjusted_clock = atombios_adjust_pll(crtc, mode, pll);
+        radeon_compute_pll(pll, adjusted_clock, &pll_clock, &fb_div, &frac_fb_div,
+                           &ref_div, &post_div);
+        atombios_crtc_program_pll(crtc, radeon_crtc->crtc_id, radeon_crtc->pll_id,
+                                  encoder_mode, radeon_encoder->encoder_id, mode->clock,
+                                  ref_div, fb_div, frac_fb_div, post_div);
+}
 static int evergreen_crtc_set_base(struct drm_crtc *crtc, int x, int y,
                                   struct drm_framebuffer *old_fb)
 {
@@ -797,7 +812,7 @@ static int evergreen_crtc_set_base(struct drm_crtc *crtc, int x, int y,
        /* no fb bound */
        if (!crtc->fb) {
-                DRM_DEBUG("No FB bound\n");
+                DRM_DEBUG_KMS("No FB bound\n");
                return 0;
        }
@@ -841,6 +856,11 @@ static int evergreen_crtc_set_base(struct drm_crtc *crtc, int x, int y,
                return -EINVAL;
        }
+        if (tiling_flags & RADEON_TILING_MACRO)
+                fb_format |= EVERGREEN_GRPH_ARRAY_MODE(EVERGREEN_GRPH_ARRAY_2D_TILED_THIN1);
+        else if (tiling_flags & RADEON_TILING_MICRO)
+                fb_format |= EVERGREEN_GRPH_ARRAY_MODE(EVERGREEN_GRPH_ARRAY_1D_TILED_THIN1);
        switch (radeon_crtc->crtc_id) {
        case 0:
                WREG32(AVIVO_D1VGA_CONTROL, 0);
@@ -931,7 +951,7 @@ static int avivo_crtc_set_base(struct drm_crtc *crtc, int x, int y,
        /* no fb bound */
        if (!crtc->fb) {
-                DRM_DEBUG("No FB bound\n");
+                DRM_DEBUG_KMS("No FB bound\n");
                return 0;
        }
@@ -979,11 +999,18 @@ static int avivo_crtc_set_base(struct drm_crtc *crtc, int x, int y,
                return -EINVAL;
        }
-        if (tiling_flags & RADEON_TILING_MACRO)
+        if (rdev->family >= CHIP_R600) {
-                fb_format |= AVIVO_D1GRPH_MACRO_ADDRESS_MODE;
+                if (tiling_flags & RADEON_TILING_MACRO)
+                        fb_format |= R600_D1GRPH_ARRAY_MODE_2D_TILED_THIN1;
+                else if (tiling_flags & RADEON_TILING_MICRO)
+                        fb_format |= R600_D1GRPH_ARRAY_MODE_1D_TILED_THIN1;
+        } else {
+                if (tiling_flags & RADEON_TILING_MACRO)
+                        fb_format |= AVIVO_D1GRPH_MACRO_ADDRESS_MODE;
-        if (tiling_flags & RADEON_TILING_MICRO)
+                if (tiling_flags & RADEON_TILING_MICRO)
-                fb_format |= AVIVO_D1GRPH_TILED;
+                        fb_format |= AVIVO_D1GRPH_TILED;
+        }
        if (radeon_crtc->crtc_id == 0)
                WREG32(AVIVO_D1VGA_CONTROL, 0);
@@ -1143,10 +1170,8 @@ int atombios_crtc_mode_set(struct drm_crtc *crtc,
        atombios_crtc_set_pll(crtc, adjusted_mode);
        atombios_enable_ss(crtc);
-        if (ASIC_IS_DCE4(rdev))
+        if (ASIC_IS_AVIVO(rdev))
                atombios_set_crtc_dtd_timing(crtc, adjusted_mode);
-        else if (ASIC_IS_AVIVO(rdev))
-                atombios_crtc_set_timing(crtc, adjusted_mode);
        else {
                atombios_crtc_set_timing(crtc, adjusted_mode);
                if (radeon_crtc->crtc_id == 0)
@@ -1191,6 +1216,24 @@ static void atombios_crtc_commit(struct drm_crtc *crtc)
        atombios_lock_crtc(crtc, ATOM_DISABLE);
 }
+static void atombios_crtc_disable(struct drm_crtc *crtc)
+{
+        struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
+        atombios_crtc_dpms(crtc, DRM_MODE_DPMS_OFF);
+        switch (radeon_crtc->pll_id) {
+        case ATOM_PPLL1:
+        case ATOM_PPLL2:
+                /* disable the ppll */
+                atombios_crtc_program_pll(crtc, radeon_crtc->crtc_id, radeon_crtc->pll_id,
+                                          0, 0, ATOM_DISABLE, 0, 0, 0, 0);
+                break;
+        default:
+                break;
+        }
+        radeon_crtc->pll_id = -1;
+}
 static const struct drm_crtc_helper_funcs atombios_helper_funcs = {
        .dpms = atombios_crtc_dpms,
        .mode_fixup = atombios_crtc_mode_fixup,
@@ -1199,6 +1242,7 @@ static const struct drm_crtc_helper_funcs atombios_helper_funcs = {
        .prepare = atombios_crtc_prepare,
        .commit = atombios_crtc_commit,
        .load_lut = radeon_crtc_load_lut,
+        .disable = atombios_crtc_disable,
 };
 void radeon_atombios_init_crtc(struct drm_device *dev,
diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c
index abffb1499e22..36e0d4b545e6 100644
--- a/drivers/gpu/drm/radeon/atombios_dp.c
+++ b/drivers/gpu/drm/radeon/atombios_dp.c
@@ -296,7 +296,7 @@ static void dp_get_adjust_train(u8 link_status[DP_LINK_STATUS_SIZE],
                u8 this_v = dp_get_adjust_request_voltage(link_status, lane);
                u8 this_p = dp_get_adjust_request_pre_emphasis(link_status, lane);
-                DRM_DEBUG("requested signal parameters: lane %d voltage %s pre_emph %s\n",
+                DRM_DEBUG_KMS("requested signal parameters: lane %d voltage %s pre_emph %s\n",
                          lane,
                          voltage_names[this_v >> DP_TRAIN_VOLTAGE_SWING_SHIFT],
                          pre_emph_names[this_p >> DP_TRAIN_PRE_EMPHASIS_SHIFT]);
@@ -313,7 +313,7 @@ static void dp_get_adjust_train(u8 link_status[DP_LINK_STATUS_SIZE],
        if (p >= dp_pre_emphasis_max(v))
                p = dp_pre_emphasis_max(v) | DP_TRAIN_MAX_PRE_EMPHASIS_REACHED;
-        DRM_DEBUG("using signal parameters: voltage %s pre_emph %s\n",
+        DRM_DEBUG_KMS("using signal parameters: voltage %s pre_emph %s\n",
                  voltage_names[(v & DP_TRAIN_VOLTAGE_SWING_MASK) >> DP_TRAIN_VOLTAGE_SWING_SHIFT],
                  pre_emph_names[(p & DP_TRAIN_PRE_EMPHASIS_MASK) >> DP_TRAIN_PRE_EMPHASIS_SHIFT]);
@@ -358,7 +358,7 @@ retry:
        if (args.v1.ucReplyStatus && !args.v1.ucDataOutLen) {
                if (args.v1.ucReplyStatus == 0x20 && retry_count++ < 10)
                        goto retry;
-                DRM_DEBUG("failed to get auxch %02x%02x %02x %02x 0x%02x %02x after %d retries\n",
+                DRM_DEBUG_KMS("failed to get auxch %02x%02x %02x %02x 0x%02x %02x after %d retries\n",
                          req_bytes[1], req_bytes[0], req_bytes[2], req_bytes[3],
                          chan->rec.i2c_id, args.v1.ucReplyStatus, retry_count);
                return false;
@@ -461,10 +461,10 @@ bool radeon_dp_getdpcd(struct radeon_connector *radeon_connector)
                memcpy(dig_connector->dpcd, msg, 8);
                {
                        int i;
-                        DRM_DEBUG("DPCD: ");
+                        DRM_DEBUG_KMS("DPCD: ");
                        for (i = 0; i < 8; i++)
-                                DRM_DEBUG("%02x ", msg[i]);
+                                DRM_DEBUG_KMS("%02x ", msg[i]);
-                        DRM_DEBUG("\n");
+                        DRM_DEBUG_KMS("\n");
                }
                return true;
        }
@@ -512,7 +512,7 @@ static bool atom_dp_get_link_status(struct radeon_connector *radeon_connector,
                return false;
        }
-        DRM_DEBUG("link status %02x %02x %02x %02x %02x %02x\n",
+        DRM_DEBUG_KMS("link status %02x %02x %02x %02x %02x %02x\n",
                  link_status[0], link_status[1], link_status[2],
                  link_status[3], link_status[4], link_status[5]);
        return true;
@@ -695,7 +695,7 @@ void dp_link_train(struct drm_encoder *encoder,
        if (!clock_recovery)
                DRM_ERROR("clock recovery failed\n");
        else
-                DRM_DEBUG("clock recovery at voltage %d pre-emphasis %d\n",
+                DRM_DEBUG_KMS("clock recovery at voltage %d pre-emphasis %d\n",
                          train_set[0] & DP_TRAIN_VOLTAGE_SWING_MASK,
                          (train_set[0] & DP_TRAIN_PRE_EMPHASIS_MASK) >>
                          DP_TRAIN_PRE_EMPHASIS_SHIFT);
@@ -739,7 +739,7 @@ void dp_link_train(struct drm_encoder *encoder,
        if (!channel_eq)
                DRM_ERROR("channel eq failed\n");
        else
-                DRM_DEBUG("channel eq at voltage %d pre-emphasis %d\n",
+                DRM_DEBUG_KMS("channel eq at voltage %d pre-emphasis %d\n",
                          train_set[0] & DP_TRAIN_VOLTAGE_SWING_MASK,
                          (train_set[0] & DP_TRAIN_PRE_EMPHASIS_MASK)
                          >> DP_TRAIN_PRE_EMPHASIS_SHIFT);
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index 1caf625e472b..957d5067ad9c 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -39,6 +39,23 @@
 static void evergreen_gpu_init(struct radeon_device *rdev);
 void evergreen_fini(struct radeon_device *rdev);
+/* get temperature in millidegrees */
+u32 evergreen_get_temp(struct radeon_device *rdev)
+{
+        u32 temp = (RREG32(CG_MULT_THERMAL_STATUS) & ASIC_T_MASK) >>
+                ASIC_T_SHIFT;
+        u32 actual_temp = 0;
+        if ((temp >> 10) & 1)
+                actual_temp = 0;
+        else if ((temp >> 9) & 1)
+                actual_temp = 255;
+        else
+                actual_temp = (temp >> 1) & 0xff;
+        return actual_temp * 1000;
+}
 void evergreen_pm_misc(struct radeon_device *rdev)
 {
        int req_ps_idx = rdev->pm.requested_power_state_index;
@@ -1115,6 +1132,7 @@ static void evergreen_gpu_init(struct radeon_device *rdev)
                                                                 rdev->config.evergreen.max_backends) &
                                                                EVERGREEN_MAX_BACKENDS_MASK));
+        rdev->config.evergreen.tile_config = gb_addr_config;
        WREG32(GB_BACKEND_MAP, gb_backend_map);
        WREG32(GB_ADDR_CONFIG, gb_addr_config);
        WREG32(DMIF_ADDR_CONFIG, gb_addr_config);
@@ -1334,8 +1352,8 @@ int evergreen_mc_init(struct radeon_device *rdev)
        }
        rdev->mc.vram_width = numchan * chansize;
        /* Could aper size report 0 ? */
-        rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
+        rdev->mc.aper_base = pci_resource_start(rdev->pdev, 0);
-        rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
+        rdev->mc.aper_size = pci_resource_len(rdev->pdev, 0);
        /* Setup GPU memory space */
        /* size in MB on evergreen */
        rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE) * 1024 * 1024;
diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c
index 010963d4570f..345a75a03c96 100644
--- a/drivers/gpu/drm/radeon/evergreen_cs.c
+++ b/drivers/gpu/drm/radeon/evergreen_cs.c
@@ -333,7 +333,6 @@ static int evergreen_cs_packet_parse_vline(struct radeon_cs_parser *p)
        header = radeon_get_ib_value(p, h_idx);
        crtc_id = radeon_get_ib_value(p, h_idx + 2 + 7 + 1);
        reg = CP_PACKET0_GET_REG(header);
-        mutex_lock(&p->rdev->ddev->mode_config.mutex);
        obj = drm_mode_object_find(p->rdev->ddev, crtc_id, DRM_MODE_OBJECT_CRTC);
        if (!obj) {
                DRM_ERROR("cannot find crtc %d\n", crtc_id);
@@ -368,7 +367,6 @@ static int evergreen_cs_packet_parse_vline(struct radeon_cs_parser *p)
                }
        }
 out:
-        mutex_unlock(&p->rdev->ddev->mode_config.mutex);
        return r;
 }
diff --git a/drivers/gpu/drm/radeon/evergreen_reg.h b/drivers/gpu/drm/radeon/evergreen_reg.h
index e028c1cd9d9b..2330f3a36fd5 100644
--- a/drivers/gpu/drm/radeon/evergreen_reg.h
+++ b/drivers/gpu/drm/radeon/evergreen_reg.h
@@ -61,6 +61,11 @@
 #       define EVERGREEN_GRPH_FORMAT_8B_BGRA1010102     5
 #       define EVERGREEN_GRPH_FORMAT_RGB111110          6
 #       define EVERGREEN_GRPH_FORMAT_BGR101111          7
+#       define EVERGREEN_GRPH_ARRAY_MODE(x)             (((x) & 0x7) << 20)
+#       define EVERGREEN_GRPH_ARRAY_LINEAR_GENERAL      0
+#       define EVERGREEN_GRPH_ARRAY_LINEAR_ALIGNED      1
+#       define EVERGREEN_GRPH_ARRAY_1D_TILED_THIN1      2
+#       define EVERGREEN_GRPH_ARRAY_2D_TILED_THIN1      4
 #define EVERGREEN_GRPH_SWAP_CONTROL                     0x680c
 #       define EVERGREEN_GRPH_ENDIAN_SWAP(x)            (((x) & 0x3) << 0)
 #       define EVERGREEN_GRPH_ENDIAN_NONE               0
diff --git a/drivers/gpu/drm/radeon/evergreend.h b/drivers/gpu/drm/radeon/evergreend.h
index a1cd621780e2..9b7532dd30f7 100644
--- a/drivers/gpu/drm/radeon/evergreend.h
+++ b/drivers/gpu/drm/radeon/evergreend.h
@@ -165,6 +165,11 @@
 #define         SE_DB_BUSY                                      (1 << 30)
 #define         SE_CB_BUSY                                      (1 << 31)
+#define CG_MULT_THERMAL_STATUS                          0x740
+#define         ASIC_T(x)                               ((x) << 16)
+#define         ASIC_T_MASK                             0x7FF0000
+#define         ASIC_T_SHIFT                            16
 #define HDP_HOST_PATH_CNTL                              0x2C00
 #define HDP_NONSURFACE_BASE                             0x2C04
 #define HDP_NONSURFACE_INFO                             0x2C08
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index 3970e62eaab8..e817a0bb5eb4 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -141,7 +141,7 @@ void r100_pm_get_dynpm_state(struct radeon_device *rdev)
        /* only one clock mode per power state */
        rdev->pm.requested_clock_mode_index = 0;
-        DRM_DEBUG("Requested: e: %d m: %d p: %d\n",
+        DRM_DEBUG_DRIVER("Requested: e: %d m: %d p: %d\n",
                  rdev->pm.power_state[rdev->pm.requested_power_state_index].
                  clock_info[rdev->pm.requested_clock_mode_index].sclk,
                  rdev->pm.power_state[rdev->pm.requested_power_state_index].
@@ -276,7 +276,7 @@ void r100_pm_misc(struct radeon_device *rdev)
             rdev->pm.power_state[rdev->pm.current_power_state_index].pcie_lanes)) {
                radeon_set_pcie_lanes(rdev,
                                      ps->pcie_lanes);
-                DRM_DEBUG("Setting: p: %d\n", ps->pcie_lanes);
+                DRM_DEBUG_DRIVER("Setting: p: %d\n", ps->pcie_lanes);
        }
 }
@@ -849,7 +849,7 @@ static int r100_cp_init_microcode(struct radeon_device *rdev)
        const char *fw_name = NULL;
        int err;
-        DRM_DEBUG("\n");
+        DRM_DEBUG_KMS("\n");
        pdev = platform_device_register_simple("radeon_cp", 0, NULL, 0);
        err = IS_ERR(pdev);
@@ -1230,7 +1230,6 @@ int r100_cs_packet_parse_vline(struct radeon_cs_parser *p)
        header = radeon_get_ib_value(p, h_idx);
        crtc_id = radeon_get_ib_value(p, h_idx + 5);
        reg = CP_PACKET0_GET_REG(header);
-        mutex_lock(&p->rdev->ddev->mode_config.mutex);
        obj = drm_mode_object_find(p->rdev->ddev, crtc_id, DRM_MODE_OBJECT_CRTC);
        if (!obj) {
                DRM_ERROR("cannot find crtc %d\n", crtc_id);
@@ -1264,7 +1263,6 @@ int r100_cs_packet_parse_vline(struct radeon_cs_parser *p)
                ib[h_idx + 3] |= RADEON_ENG_DISPLAY_SELECT_CRTC1;
        }
 out:
-        mutex_unlock(&p->rdev->ddev->mode_config.mutex);
        return r;
 }
@@ -1805,6 +1803,11 @@ static int r100_packet3_check(struct radeon_cs_parser *p,
                        return r;
                break;
                /* triggers drawing using indices to vertex buffer */
+        case PACKET3_3D_CLEAR_HIZ:
+        case PACKET3_3D_CLEAR_ZMASK:
+                if (p->rdev->hyperz_filp != p->filp)
+                        return -EINVAL;
+                break;
        case PACKET3_NOP:
                break;
        default:
@@ -2297,8 +2300,8 @@ void r100_vram_init_sizes(struct radeon_device *rdev)
        u64 config_aper_size;
        /* work out accessible VRAM */
-        rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
+        rdev->mc.aper_base = pci_resource_start(rdev->pdev, 0);
-        rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
+        rdev->mc.aper_size = pci_resource_len(rdev->pdev, 0);
        rdev->mc.visible_vram_size = r100_get_accessible_vram(rdev);
        /* FIXME we don't use the second aperture yet when we could use it */
        if (rdev->mc.visible_vram_size > rdev->mc.aper_size)
@@ -2354,6 +2357,7 @@ void r100_mc_init(struct radeon_device *rdev)
        if (rdev->flags & RADEON_IS_IGP)
                base = (RREG32(RADEON_NB_TOM) & 0xffff) << 16;
        radeon_vram_location(rdev, &rdev->mc, base);
+        rdev->mc.gtt_base_align = 0;
        if (!(rdev->flags & RADEON_IS_AGP))
                radeon_gtt_location(rdev, &rdev->mc);
        radeon_update_bandwidth_info(rdev);
@@ -2365,11 +2369,10 @@ void r100_mc_init(struct radeon_device *rdev)
 */
 void r100_pll_errata_after_index(struct radeon_device *rdev)
 {
-        if (!(rdev->pll_errata & CHIP_ERRATA_PLL_DUMMYREADS)) {
+        if (rdev->pll_errata & CHIP_ERRATA_PLL_DUMMYREADS) {
-                return;
+                (void)RREG32(RADEON_CLOCK_CNTL_DATA);
+                (void)RREG32(RADEON_CRTC_GEN_CNTL);
        }
-        (void)RREG32(RADEON_CLOCK_CNTL_DATA);
-        (void)RREG32(RADEON_CRTC_GEN_CNTL);
 }
 static void r100_pll_errata_after_data(struct radeon_device *rdev)
@@ -2644,7 +2647,7 @@ int r100_set_surface_reg(struct radeon_device *rdev, int reg,
                flags |= pitch / 8;
-        DRM_DEBUG("writing surface %d %d %x %x\n", reg, flags, offset, offset+obj_size-1);
+        DRM_DEBUG_KMS("writing surface %d %d %x %x\n", reg, flags, offset, offset+obj_size-1);
        WREG32(RADEON_SURFACE0_INFO + surf_index, flags);
        WREG32(RADEON_SURFACE0_LOWER_BOUND + surf_index, offset);
        WREG32(RADEON_SURFACE0_UPPER_BOUND + surf_index, offset + obj_size - 1);
@@ -3040,7 +3043,7 @@ void r100_bandwidth_update(struct radeon_device *rdev)
                }
 #endif
-                DRM_DEBUG("GRPH_BUFFER_CNTL from to %x\n",
+                DRM_DEBUG_KMS("GRPH_BUFFER_CNTL from to %x\n",
                          /*      (unsigned int)info->SavedReg->grph_buffer_cntl, */
                          (unsigned int)RREG32(RADEON_GRPH_BUFFER_CNTL));
        }
@@ -3136,7 +3139,7 @@ void r100_bandwidth_update(struct radeon_device *rdev)
                        WREG32(RS400_DISP1_REQ_CNTL1, 0x28FBC3AC);
                }
-                DRM_DEBUG("GRPH2_BUFFER_CNTL from to %x\n",
+                DRM_DEBUG_KMS("GRPH2_BUFFER_CNTL from to %x\n",
                          (unsigned int)RREG32(RADEON_GRPH2_BUFFER_CNTL));
        }
 }
@@ -3810,6 +3813,31 @@ void r100_fini(struct radeon_device *rdev)
        rdev->bios = NULL;
 }
+/*
+ * Due to how kexec works, it can leave the hw fully initialised when it
+ * boots the new kernel. However doing our init sequence with the CP and
+ * WB stuff setup causes GPU hangs on the RN50 at least. So at startup
+ * do some quick sanity checks and restore sane values to avoid this
+ * problem.
+ */
+void r100_restore_sanity(struct radeon_device *rdev)
+{
+        u32 tmp;
+        tmp = RREG32(RADEON_CP_CSQ_CNTL);
+        if (tmp) {
+                WREG32(RADEON_CP_CSQ_CNTL, 0);
+        }
+        tmp = RREG32(RADEON_CP_RB_CNTL);
+        if (tmp) {
+                WREG32(RADEON_CP_RB_CNTL, 0);
+        }
+        tmp = RREG32(RADEON_SCRATCH_UMSK);
+        if (tmp) {
+                WREG32(RADEON_SCRATCH_UMSK, 0);
+        }
+}
 int r100_init(struct radeon_device *rdev)
 {
        int r;
@@ -3822,6 +3850,8 @@ int r100_init(struct radeon_device *rdev)
        radeon_scratch_init(rdev);
        /* Initialize surface registers */
        radeon_surface_init(rdev);
+        /* sanity check some register to avoid hangs like after kexec */
+        r100_restore_sanity(rdev);
        /* TODO: disable VGA need to use VGA request */
        /* BIOS*/
        if (!radeon_get_bios(rdev)) {
diff --git a/drivers/gpu/drm/radeon/r100d.h b/drivers/gpu/drm/radeon/r100d.h
index d016b16fa116..b121b6c678d4 100644
--- a/drivers/gpu/drm/radeon/r100d.h
+++ b/drivers/gpu/drm/radeon/r100d.h
@@ -48,10 +48,12 @@
 #define         PACKET3_3D_DRAW_IMMD            0x29
 #define         PACKET3_3D_DRAW_INDX            0x2A
 #define         PACKET3_3D_LOAD_VBPNTR          0x2F
+#define         PACKET3_3D_CLEAR_ZMASK          0x32
 #define         PACKET3_INDX_BUFFER             0x33
 #define         PACKET3_3D_DRAW_VBUF_2          0x34
 #define         PACKET3_3D_DRAW_IMMD_2          0x35
 #define         PACKET3_3D_DRAW_INDX_2          0x36
+#define         PACKET3_3D_CLEAR_HIZ            0x37
 #define         PACKET3_BITBLT_MULTI            0x9B
 #define PACKET0(reg, n) (CP_PACKET0 |                                   \
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index 7e81db5eb804..c827738ad7dd 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -481,6 +481,7 @@ void r300_mc_init(struct radeon_device *rdev)
        if (rdev->flags & RADEON_IS_IGP)
                base = (RREG32(RADEON_NB_TOM) & 0xffff) << 16;
        radeon_vram_location(rdev, &rdev->mc, base);
+        rdev->mc.gtt_base_align = 0;
        if (!(rdev->flags & RADEON_IS_AGP))
                radeon_gtt_location(rdev, &rdev->mc);
        radeon_update_bandwidth_info(rdev);
@@ -1047,14 +1048,47 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
                /* RB3D_COLOR_CHANNEL_MASK */
                track->color_channel_mask = idx_value;
                break;
-        case 0x4d1c:
+        case 0x43a4:
+                /* SC_HYPERZ_EN */
+                /* r300c emits this register - we need to disable hyperz for it
+                 * without complaining */
+                if (p->rdev->hyperz_filp != p->filp) {
+                        if (idx_value & 0x1)
+                                ib[idx] = idx_value & ~1;
+                }
+                break;
+        case 0x4f1c:
                /* ZB_BW_CNTL */
                track->zb_cb_clear = !!(idx_value & (1 << 5));
+                if (p->rdev->hyperz_filp != p->filp) {
+                        if (idx_value & (R300_HIZ_ENABLE |
+                                         R300_RD_COMP_ENABLE |
+                                         R300_WR_COMP_ENABLE |
+                                         R300_FAST_FILL_ENABLE))
+                                goto fail;
+                }
                break;
        case 0x4e04:
                /* RB3D_BLENDCNTL */
                track->blend_read_enable = !!(idx_value & (1 << 2));
                break;
+        case 0x4f28: /* ZB_DEPTHCLEARVALUE */
+                break;
+        case 0x4f30: /* ZB_MASK_OFFSET */
+        case 0x4f34: /* ZB_ZMASK_PITCH */
+        case 0x4f44: /* ZB_HIZ_OFFSET */
+        case 0x4f54: /* ZB_HIZ_PITCH */
+                if (idx_value && (p->rdev->hyperz_filp != p->filp))
+                        goto fail;
+                break;
+        case 0x4028:
+                if (idx_value && (p->rdev->hyperz_filp != p->filp))
+                        goto fail;
+                /* GB_Z_PEQ_CONFIG */
+                if (p->rdev->family >= CHIP_RV350)
+                        break;
+                goto fail;
+                break;
        case 0x4be8:
                /* valid register only on RV530 */
                if (p->rdev->family == CHIP_RV530)
@@ -1065,8 +1099,8 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
        }
        return 0;
 fail:
-        printk(KERN_ERR "Forbidden register 0x%04X in cs at %d\n",
+        printk(KERN_ERR "Forbidden register 0x%04X in cs at %d (val=%08x)\n",
-               reg, idx);
+               reg, idx, idx_value);
        return -EINVAL;
 }
@@ -1160,6 +1194,11 @@ static int r300_packet3_check(struct radeon_cs_parser *p,
                        return r;
                }
                break;
+        case PACKET3_3D_CLEAR_HIZ:
+        case PACKET3_3D_CLEAR_ZMASK:
+                if (p->rdev->hyperz_filp != p->filp)
+                        return -EINVAL;
+                break;
        case PACKET3_NOP:
                break;
        default:
@@ -1176,6 +1215,8 @@ int r300_cs_parse(struct radeon_cs_parser *p)
        int r;
        track = kzalloc(sizeof(*track), GFP_KERNEL);
+        if (track == NULL)
+                return -ENOMEM;
        r100_cs_track_clear(p->rdev, track);
        p->track = track;
        do {
@@ -1377,6 +1418,8 @@ int r300_init(struct radeon_device *rdev)
        /* Initialize surface registers */
        radeon_surface_init(rdev);
        /* TODO: disable VGA need to use VGA request */
+        /* restore some register to sane defaults */
+        r100_restore_sanity(rdev);
        /* BIOS*/
        if (!radeon_get_bios(rdev)) {
                if (ASIC_IS_AVIVO(rdev))
diff --git a/drivers/gpu/drm/radeon/r300d.h b/drivers/gpu/drm/radeon/r300d.h
index 968a33317fbf..0c036c60d9df 100644
--- a/drivers/gpu/drm/radeon/r300d.h
+++ b/drivers/gpu/drm/radeon/r300d.h
@@ -48,10 +48,12 @@
 #define         PACKET3_3D_DRAW_IMMD            0x29
 #define         PACKET3_3D_DRAW_INDX            0x2A
 #define         PACKET3_3D_LOAD_VBPNTR          0x2F
+#define         PACKET3_3D_CLEAR_ZMASK          0x32
 #define         PACKET3_INDX_BUFFER             0x33
 #define         PACKET3_3D_DRAW_VBUF_2          0x34
 #define         PACKET3_3D_DRAW_IMMD_2          0x35
 #define         PACKET3_3D_DRAW_INDX_2          0x36
+#define         PACKET3_3D_CLEAR_HIZ            0x37
 #define         PACKET3_BITBLT_MULTI            0x9B
 #define PACKET0(reg, n) (CP_PACKET0 |                                   \
diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c
index e6c89142bb4d..59f7bccc5be0 100644
--- a/drivers/gpu/drm/radeon/r420.c
+++ b/drivers/gpu/drm/radeon/r420.c
@@ -343,6 +343,8 @@ int r420_init(struct radeon_device *rdev)
        /* Initialize surface registers */
        radeon_surface_init(rdev);
        /* TODO: disable VGA need to use VGA request */
+        /* restore some register to sane defaults */
+        r100_restore_sanity(rdev);
        /* BIOS*/
        if (!radeon_get_bios(rdev)) {
                if (ASIC_IS_AVIVO(rdev))
diff --git a/drivers/gpu/drm/radeon/r500_reg.h b/drivers/gpu/drm/radeon/r500_reg.h
index 93c9a2bbccf8..6ac1f604e29b 100644
--- a/drivers/gpu/drm/radeon/r500_reg.h
+++ b/drivers/gpu/drm/radeon/r500_reg.h
@@ -386,6 +386,11 @@
 #       define AVIVO_D1GRPH_TILED                               (1 << 20)
 #       define AVIVO_D1GRPH_MACRO_ADDRESS_MODE                  (1 << 21)
+#       define R600_D1GRPH_ARRAY_MODE_LINEAR_GENERAL            (0 << 20)
+#       define R600_D1GRPH_ARRAY_MODE_LINEAR_ALIGNED            (1 << 20)
+#       define R600_D1GRPH_ARRAY_MODE_1D_TILED_THIN1            (2 << 20)
+#       define R600_D1GRPH_ARRAY_MODE_2D_TILED_THIN1            (4 << 20)
 /* The R7xx *_HIGH surface regs are backwards; the D1 regs are in the D2
 * block and vice versa.  This applies to GRPH, CUR, etc.
 */
diff --git a/drivers/gpu/drm/radeon/r520.c b/drivers/gpu/drm/radeon/r520.c
index 34330df28483..1458dee902dd 100644
--- a/drivers/gpu/drm/radeon/r520.c
+++ b/drivers/gpu/drm/radeon/r520.c
@@ -125,6 +125,7 @@ void r520_mc_init(struct radeon_device *rdev)
        r520_vram_get_type(rdev);
        r100_vram_init_sizes(rdev);
        radeon_vram_location(rdev, &rdev->mc, 0);
+        rdev->mc.gtt_base_align = 0;
        if (!(rdev->flags & RADEON_IS_AGP))
                radeon_gtt_location(rdev, &rdev->mc);
        radeon_update_bandwidth_info(rdev);
@@ -230,6 +231,8 @@ int r520_init(struct radeon_device *rdev)
        radeon_scratch_init(rdev);
        /* Initialize surface registers */
        radeon_surface_init(rdev);
+        /* restore some register to sane defaults */
+        r100_restore_sanity(rdev);
        /* TODO: disable VGA need to use VGA request */
        /* BIOS*/
        if (!radeon_get_bios(rdev)) {
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 3d6645ce2151..d0ebae9dde25 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -92,6 +92,21 @@ void r600_gpu_init(struct radeon_device *rdev);
 void r600_fini(struct radeon_device *rdev);
 void r600_irq_disable(struct radeon_device *rdev);
+/* get temperature in millidegrees */
+u32 rv6xx_get_temp(struct radeon_device *rdev)
+{
+        u32 temp = (RREG32(CG_THERMAL_STATUS) & ASIC_T_MASK) >>
+                ASIC_T_SHIFT;
+        u32 actual_temp = 0;
+        if ((temp >> 7) & 1)
+                actual_temp = 0;
+        else
+                actual_temp = (temp >> 1) & 0xff;
+        return actual_temp * 1000;
+}
 void r600_pm_get_dynpm_state(struct radeon_device *rdev)
 {
        int i;
@@ -256,7 +271,7 @@ void r600_pm_get_dynpm_state(struct radeon_device *rdev)
                }
        }
-        DRM_DEBUG("Requested: e: %d m: %d p: %d\n",
+        DRM_DEBUG_DRIVER("Requested: e: %d m: %d p: %d\n",
                  rdev->pm.power_state[rdev->pm.requested_power_state_index].
                  clock_info[rdev->pm.requested_clock_mode_index].sclk,
                  rdev->pm.power_state[rdev->pm.requested_power_state_index].
@@ -571,7 +586,7 @@ void r600_pm_misc(struct radeon_device *rdev)
                if (voltage->voltage != rdev->pm.current_vddc) {
                        radeon_atom_set_voltage(rdev, voltage->voltage);
                        rdev->pm.current_vddc = voltage->voltage;
-                        DRM_DEBUG("Setting: v: %d\n", voltage->voltage);
+                        DRM_DEBUG_DRIVER("Setting: v: %d\n", voltage->voltage);
                }
        }
 }
@@ -869,7 +884,17 @@ void r600_pcie_gart_tlb_flush(struct radeon_device *rdev)
        u32 tmp;
        /* flush hdp cache so updates hit vram */
-        WREG32(R_005480_HDP_MEM_COHERENCY_FLUSH_CNTL, 0x1);
+        if ((rdev->family >= CHIP_RV770) && (rdev->family <= CHIP_RV740)) {
+                void __iomem *ptr = (void *)rdev->gart.table.vram.ptr;
+                u32 tmp;
+                /* r7xx hw bug.  write to HDP_DEBUG1 followed by fb read
+                 * rather than write to HDP_REG_COHERENCY_FLUSH_CNTL
+                 */
+                WREG32(HDP_DEBUG1, 0);
+                tmp = readl((void __iomem *)ptr);
+        } else
+                WREG32(R_005480_HDP_MEM_COHERENCY_FLUSH_CNTL, 0x1);
        WREG32(VM_CONTEXT0_INVALIDATION_LOW_ADDR, rdev->mc.gtt_start >> 12);
        WREG32(VM_CONTEXT0_INVALIDATION_HIGH_ADDR, (rdev->mc.gtt_end - 1) >> 12);
@@ -1179,6 +1204,7 @@ void r600_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc)
                if (rdev->flags & RADEON_IS_IGP)
                        base = (RREG32(MC_VM_FB_LOCATION) & 0xFFFF) << 24;
                radeon_vram_location(rdev, &rdev->mc, base);
+                rdev->mc.gtt_base_align = 0;
                radeon_gtt_location(rdev, mc);
        }
 }
@@ -1216,8 +1242,8 @@ int r600_mc_init(struct radeon_device *rdev)
        }
        rdev->mc.vram_width = numchan * chansize;
        /* Could aper size report 0 ? */
-        rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
+        rdev->mc.aper_base = pci_resource_start(rdev->pdev, 0);
-        rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
+        rdev->mc.aper_size = pci_resource_len(rdev->pdev, 0);
        /* Setup GPU memory space */
        rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE);
        rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE);
@@ -1608,7 +1634,7 @@ void r600_gpu_init(struct radeon_device *rdev)
                                                         r600_count_pipe_bits((cc_rb_backend_disable &
                                                                               R6XX_MAX_BACKENDS_MASK) >> 16)),
                                                        (cc_rb_backend_disable >> 16));
+        rdev->config.r600.tile_config = tiling_config;
        tiling_config |= BACKEND_MAP(backend_map);
        WREG32(GB_TILING_CONFIG, tiling_config);
        WREG32(DCP_TILING_CONFIG, tiling_config & 0xffff);
@@ -3511,5 +3537,15 @@ int r600_debugfs_mc_info_init(struct radeon_device *rdev)
 */
 void r600_ioctl_wait_idle(struct radeon_device *rdev, struct radeon_bo *bo)
 {
-        WREG32(R_005480_HDP_MEM_COHERENCY_FLUSH_CNTL, 0x1);
+        /* r7xx hw bug.  write to HDP_DEBUG1 followed by fb read
+         * rather than write to HDP_REG_COHERENCY_FLUSH_CNTL
+         */
+        if ((rdev->family >= CHIP_RV770) && (rdev->family <= CHIP_RV740)) {
+                void __iomem *ptr = (void *)rdev->gart.table.vram.ptr;
+                u32 tmp;
+                WREG32(HDP_DEBUG1, 0);
+                tmp = readl((void __iomem *)ptr);
+        } else
+                WREG32(R_005480_HDP_MEM_COHERENCY_FLUSH_CNTL, 0x1);
 }
diff --git a/drivers/gpu/drm/radeon/r600_audio.c b/drivers/gpu/drm/radeon/r600_audio.c
index 2b26553c352c..b5443fe1c1d1 100644
--- a/drivers/gpu/drm/radeon/r600_audio.c
+++ b/drivers/gpu/drm/radeon/r600_audio.c
@@ -63,7 +63,8 @@ int r600_audio_bits_per_sample(struct radeon_device *rdev)
        case 0x4: return 32;
        }
-        DRM_ERROR("Unknown bits per sample 0x%x using 16 instead.\n", (int)value);
+        dev_err(rdev->dev, "Unknown bits per sample 0x%x using 16 instead\n",
+                (int)value);
        return 16;
 }
@@ -150,7 +151,8 @@ static void r600_audio_update_hdmi(unsigned long param)
                        r600_hdmi_update_audio_settings(encoder);
        }
-        if(still_going) r600_audio_schedule_polling(rdev);
+        if (still_going)
+                r600_audio_schedule_polling(rdev);
 }
 /*
@@ -158,8 +160,9 @@ static void r600_audio_update_hdmi(unsigned long param)
 */
 static void r600_audio_engine_enable(struct radeon_device *rdev, bool enable)
 {
-        DRM_INFO("%s audio support", enable ? "Enabling" : "Disabling");
+        DRM_INFO("%s audio support\n", enable ? "Enabling" : "Disabling");
        WREG32_P(R600_AUDIO_ENABLE, enable ? 0x81000000 : 0x0, ~0x81000000);
+        rdev->audio_enabled = enable;
 }
 /*
@@ -195,12 +198,14 @@ void r600_audio_enable_polling(struct drm_encoder *encoder)
        struct radeon_device *rdev = dev->dev_private;
        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
-        DRM_DEBUG("r600_audio_enable_polling: %d", radeon_encoder->audio_polling_active);
+        DRM_DEBUG("r600_audio_enable_polling: %d\n",
+                radeon_encoder->audio_polling_active);
        if (radeon_encoder->audio_polling_active)
                return;
        radeon_encoder->audio_polling_active = 1;
-        mod_timer(&rdev->audio_timer, jiffies + 1);
+        if (rdev->audio_enabled)
+                mod_timer(&rdev->audio_timer, jiffies + 1);
 }
 /*
@@ -209,7 +214,8 @@ void r600_audio_enable_polling(struct drm_encoder *encoder)
 void r600_audio_disable_polling(struct drm_encoder *encoder)
 {
        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
-        DRM_DEBUG("r600_audio_disable_polling: %d", radeon_encoder->audio_polling_active);
+        DRM_DEBUG("r600_audio_disable_polling: %d\n",
+                radeon_encoder->audio_polling_active);
        radeon_encoder->audio_polling_active = 0;
 }
@@ -236,7 +242,7 @@ void r600_audio_set_clock(struct drm_encoder *encoder, int clock)
                WREG32_P(R600_AUDIO_TIMING, 0x100, ~0x301);
                break;
        default:
-                DRM_ERROR("Unsupported encoder type 0x%02X\n",
+                dev_err(rdev->dev, "Unsupported encoder type 0x%02X\n",
                          radeon_encoder->encoder_id);
                return;
        }
@@ -266,7 +272,7 @@ void r600_audio_set_clock(struct drm_encoder *encoder, int clock)
 */
 void r600_audio_fini(struct radeon_device *rdev)
 {
-        if (!radeon_audio || !r600_audio_chipset_supported(rdev))
+        if (!rdev->audio_enabled)
                return;
        del_timer(&rdev->audio_timer);
diff --git a/drivers/gpu/drm/radeon/r600_blit.c b/drivers/gpu/drm/radeon/r600_blit.c
index f4fb88ece2bb..ca5c29f70779 100644
--- a/drivers/gpu/drm/radeon/r600_blit.c
+++ b/drivers/gpu/drm/radeon/r600_blit.c
@@ -538,9 +538,12 @@ int
 r600_prepare_blit_copy(struct drm_device *dev, struct drm_file *file_priv)
 {
        drm_radeon_private_t *dev_priv = dev->dev_private;
+        int ret;
        DRM_DEBUG("\n");
-        r600_nomm_get_vb(dev);
+        ret = r600_nomm_get_vb(dev);
+        if (ret)
+                return ret;
        dev_priv->blit_vb->file_priv = file_priv;
diff --git a/drivers/gpu/drm/radeon/r600_blit_shaders.c b/drivers/gpu/drm/radeon/r600_blit_shaders.c
index 0271b53fa2dd..e8151c1d55b2 100644
--- a/drivers/gpu/drm/radeon/r600_blit_shaders.c
+++ b/drivers/gpu/drm/radeon/r600_blit_shaders.c
@@ -39,37 +39,45 @@
 const u32 r6xx_default_state[] =
 {
-        0xc0002400,
+        0xc0002400, /* START_3D_CMDBUF */
        0x00000000,
-        0xc0012800,
+        0xc0012800, /* CONTEXT_CONTROL */
        0x80000000,
        0x80000000,
        0xc0016800,
        0x00000010,
-        0x00008000,
+        0x00008000, /* WAIT_UNTIL */
        0xc0016800,
        0x00000542,
-        0x07000003,
+        0x07000003, /* TA_CNTL_AUX */
        0xc0016800,
        0x000005c5,
-        0x00000000,
+        0x00000000, /* VC_ENHANCE */
        0xc0016800,
        0x00000363,
-        0x00000000,
+        0x00000000, /* SQ_DYN_GPR_CNTL_PS_FLUSH_REQ */
        0xc0016800,
        0x0000060c,
-        0x82000000,
+        0x82000000, /* DB_DEBUG */
        0xc0016800,
        0x0000060e,
-        0x01020204,
+        0x01020204, /* DB_WATERMARKS */
-        0xc0016f00,
-        0x00000000,
+        0xc0026f00,
-        0x00000000,
-        0xc0016f00,
-        0x00000001,
        0x00000000,
+        0x00000000, /* SQ_VTX_BASE_VTX_LOC */
+        0x00000000, /* SQ_VTX_START_INST_LOC */
        0xc0096900,
        0x0000022a,
+        0x00000000, /* SQ_ESGS_RING_ITEMSIZE */
        0x00000000,
        0x00000000,
        0x00000000,
@@ -78,515 +86,317 @@ const u32 r6xx_default_state[] =
        0x00000000,
        0x00000000,
        0x00000000,
-        0x00000000,
        0xc0016900,
        0x00000004,
-        0x00000000,
+        0x00000000, /* DB_DEPTH_INFO */
-        0xc0016900,
+        0xc0026900,
        0x0000000a,
-        0x00000000,
+        0x00000000, /* DB_STENCIL_CLEAR */
-        0xc0016900,
+        0x00000000, /* DB_DEPTH_CLEAR */
-        0x0000000b,
-        0x00000000,
-        0xc0016900,
-        0x0000010c,
-        0x00000000,
-        0xc0016900,
-        0x0000010d,
-        0x00000000,
        0xc0016900,
        0x00000200,
-        0x00000000,
+        0x00000000, /* DB_DEPTH_CONTROL */
-        0xc0016900,
+        0xc0026900,
        0x00000343,
-        0x00000060,
+        0x00000060, /* DB_RENDER_CONTROL */
-        0xc0016900,
+        0x00000040, /* DB_RENDER_OVERRIDE */
-        0x00000344,
-        0x00000040,
        0xc0016900,
        0x00000351,
-        0x0000aa00,
+        0x0000aa00, /* DB_ALPHA_TO_MASK */
-        0xc0016900,
-        0x00000104,
+        0xc00f6900,
-        0x00000000,
+        0x00000100,
-        0xc0016900,
+        0x00000800, /* VGT_MAX_VTX_INDX */
-        0x0000010e,
+        0x00000000, /* VGT_MIN_VTX_INDX */
-        0x00000000,
+        0x00000000, /* VGT_INDX_OFFSET */
-        0xc0046900,
+        0x00000000, /* VGT_MULTI_PRIM_IB_RESET_INDX */
-        0x00000105,
+        0x00000000, /* SX_ALPHA_TEST_CONTROL */
-        0x00000000,
+        0x00000000, /* CB_BLEND_RED */
-        0x00000000,
        0x00000000,
        0x00000000,
-        0xc0036900,
-        0x00000109,
        0x00000000,
+        0x00000000, /* CB_FOG_RED */
        0x00000000,
        0x00000000,
+        0x00000000, /* DB_STENCILREFMASK */
+        0x00000000, /* DB_STENCILREFMASK_BF */
+        0x00000000, /* SX_ALPHA_REF */
        0xc0046900,
        0x0000030c,
-        0x01000000,
+        0x01000000, /* CB_CLRCMP_CNTL */
        0x00000000,
        0x00000000,
        0x00000000,
        0xc0046900,
        0x00000048,
-        0x3f800000,
+        0x3f800000, /* CB_CLEAR_RED */
        0x00000000,
        0x3f800000,
        0x3f800000,
-        0xc0016900,
-        0x0000008e,
-        0x0000000f,
        0xc0016900,
        0x00000080,
-        0x00000000,
+        0x00000000, /* PA_SC_WINDOW_OFFSET */
-        0xc0016900,
+        0xc00a6900,
        0x00000083,
-        0x0000ffff,
+        0x0000ffff, /* PA_SC_CLIP_RECT_RULE */
-        0xc0016900,
+        0x00000000, /* PA_SC_CLIPRECT_0_TL */
-        0x00000084,
-        0x00000000,
-        0xc0016900,
-        0x00000085,
        0x20002000,
-        0xc0016900,
-        0x00000086,
        0x00000000,
-        0xc0016900,
-        0x00000087,
        0x20002000,
-        0xc0016900,
-        0x00000088,
        0x00000000,
-        0xc0016900,
-        0x00000089,
        0x20002000,
-        0xc0016900,
-        0x0000008a,
        0x00000000,
-        0xc0016900,
-        0x0000008b,
        0x20002000,
-        0xc0016900,
+        0x00000000, /* PA_SC_EDGERULE */
-        0x0000008c,
-        0x00000000,
+        0xc0406900,
-        0xc0016900,
        0x00000094,
-        0x80000000,
+        0x80000000, /* PA_SC_VPORT_SCISSOR_0_TL */
-        0xc0016900,
+        0x20002000, /* PA_SC_VPORT_SCISSOR_0_BR */
-        0x00000095,
+        0x80000000, /* PA_SC_VPORT_SCISSOR_1_TL */
        0x20002000,
-        0xc0026900,
-        0x000000b4,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x00000096,
        0x80000000,
-        0xc0016900,
-        0x00000097,
        0x20002000,
-        0xc0026900,
-        0x000000b6,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x00000098,
        0x80000000,
-        0xc0016900,
-        0x00000099,
        0x20002000,
-        0xc0026900,
-        0x000000b8,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x0000009a,
        0x80000000,
-        0xc0016900,
-        0x0000009b,
        0x20002000,
-        0xc0026900,
-        0x000000ba,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x0000009c,
        0x80000000,
-        0xc0016900,
-        0x0000009d,
        0x20002000,
-        0xc0026900,
-        0x000000bc,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x0000009e,
        0x80000000,
-        0xc0016900,
-        0x0000009f,
        0x20002000,
-        0xc0026900,
-        0x000000be,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x000000a0,
        0x80000000,
-        0xc0016900,
-        0x000000a1,
        0x20002000,
-        0xc0026900,
-        0x000000c0,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x000000a2,
        0x80000000,
-        0xc0016900,
-        0x000000a3,
        0x20002000,
-        0xc0026900,
-        0x000000c2,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x000000a4,
        0x80000000,
-        0xc0016900,
-        0x000000a5,
        0x20002000,
-        0xc0026900,
-        0x000000c4,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x000000a6,
        0x80000000,
-        0xc0016900,
-        0x000000a7,
        0x20002000,
-        0xc0026900,
-        0x000000c6,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x000000a8,
        0x80000000,
-        0xc0016900,
-        0x000000a9,
        0x20002000,
-        0xc0026900,
-        0x000000c8,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x000000aa,
        0x80000000,
-        0xc0016900,
-        0x000000ab,
        0x20002000,
-        0xc0026900,
-        0x000000ca,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x000000ac,
        0x80000000,
-        0xc0016900,
-        0x000000ad,
        0x20002000,
-        0xc0026900,
-        0x000000cc,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x000000ae,
        0x80000000,
-        0xc0016900,
-        0x000000af,
        0x20002000,
-        0xc0026900,
-        0x000000ce,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x000000b0,
        0x80000000,
-        0xc0016900,
-        0x000000b1,
        0x20002000,
-        0xc0026900,
+        0x00000000, /* PA_SC_VPORT_ZMIN_0 */
-        0x000000d0,
-        0x00000000,
        0x3f800000,
-        0xc0016900,
-        0x000000b2,
-        0x80000000,
-        0xc0016900,
-        0x000000b3,
-        0x20002000,
-        0xc0026900,
-        0x000000d2,
        0x00000000,
        0x3f800000,
-        0xc0016900,
-        0x00000293,
-        0x00004010,
-        0xc0016900,
-        0x00000300,
        0x00000000,
-        0xc0016900,
+        0x3f800000,
-        0x00000301,
-        0x00000000,
-        0xc0016900,
-        0x00000312,
-        0xffffffff,
-        0xc0016900,
-        0x00000307,
        0x00000000,
-        0xc0016900,
+        0x3f800000,
-        0x00000308,
        0x00000000,
-        0xc0016900,
+        0x3f800000,
-        0x00000283,
        0x00000000,
-        0xc0016900,
+        0x3f800000,
-        0x00000292,
        0x00000000,
-        0xc0066900,
+        0x3f800000,
-        0x0000010f,
        0x00000000,
+        0x3f800000,
        0x00000000,
+        0x3f800000,
        0x00000000,
+        0x3f800000,
        0x00000000,
+        0x3f800000,
        0x00000000,
+        0x3f800000,
        0x00000000,
-        0xc0016900,
+        0x3f800000,
-        0x00000206,
        0x00000000,
-        0xc0016900,
+        0x3f800000,
-        0x00000207,
        0x00000000,
-        0xc0016900,
+        0x3f800000,
-        0x00000208,
        0x00000000,
-        0xc0046900,
-        0x00000303,
        0x3f800000,
+        0xc0026900,
+        0x00000292,
+        0x00000000, /* PA_SC_MPASS_PS_CNTL */
+        0x00004010, /* PA_SC_MODE_CNTL */
+        0xc0096900,
+        0x00000300,
+        0x00000000, /* PA_SC_LINE_CNTL */
+        0x00000000, /* PA_SC_AA_CONFIG */
+        0x0000002d, /* PA_SU_VTX_CNTL */
+        0x3f800000, /* PA_CL_GB_VERT_CLIP_ADJ */
        0x3f800000,
        0x3f800000,
        0x3f800000,
-        0xc0016900,
+        0x00000000, /* PA_SC_SAMPLE_LOCS_MCTX */
-        0x00000205,
-        0x00000004,
-        0xc0016900,
-        0x00000280,
-        0x00000000,
-        0xc0016900,
-        0x00000281,
        0x00000000,
        0xc0016900,
+        0x00000312,
+        0xffffffff, /* PA_SC_AA_MASK */
+        0xc0066900,
        0x0000037e,
-        0x00000000,
+        0x00000000, /* PA_SU_POLY_OFFSET_DB_FMT_CNTL */
-        0xc0016900,
+        0x00000000, /* PA_SU_POLY_OFFSET_CLAMP */
-        0x00000382,
+        0x00000000, /* PA_SU_POLY_OFFSET_FRONT_SCALE */
-        0x00000000,
+        0x00000000, /* PA_SU_POLY_OFFSET_FRONT_OFFSET */
-        0xc0016900,
+        0x00000000, /* PA_SU_POLY_OFFSET_BACK_SCALE */
-        0x00000380,
+        0x00000000, /* PA_SU_POLY_OFFSET_BACK_OFFSET */
-        0x00000000,
-        0xc0016900,
+        0xc0046900,
-        0x00000383,
-        0x00000000,
-        0xc0016900,
-        0x00000381,
-        0x00000000,
-        0xc0016900,
-        0x00000282,
-        0x00000008,
-        0xc0016900,
-        0x00000302,
-        0x0000002d,
-        0xc0016900,
-        0x0000037f,
-        0x00000000,
-        0xc0016900,
-        0x000001b2,
-        0x00000000,
-        0xc0016900,
        0x000001b6,
-        0x00000000,
+        0x00000000, /* SPI_INPUT_Z */
-        0xc0016900,
+        0x00000000, /* SPI_FOG_CNTL */
-        0x000001b7,
+        0x00000000, /* SPI_FOG_FUNC_SCALE */
-        0x00000000,
+        0x00000000, /* SPI_FOG_FUNC_BIAS */
-        0xc0016900,
-        0x000001b8,
-        0x00000000,
-        0xc0016900,
-        0x000001b9,
-        0x00000000,
        0xc0016900,
        0x00000225,
-        0x00000000,
+        0x00000000, /* SQ_PGM_START_FS */
        0xc0016900,
        0x00000229,
-        0x00000000,
+        0x00000000, /* SQ_PGM_RESOURCES_FS */
        0xc0016900,
        0x00000237,
-        0x00000000,
+        0x00000000, /* SQ_PGM_CF_OFFSET_FS */
-        0xc0016900,
-        0x00000100,
+        0xc0026900,
-        0x00000800,
-        0xc0016900,
-        0x00000101,
-        0x00000000,
-        0xc0016900,
-        0x00000102,
-        0x00000000,
-        0xc0016900,
        0x000002a8,
-        0x00000000,
+        0x00000000, /* VGT_INSTANCE_STEP_RATE_0 */
-        0xc0016900,
+        0x00000000, /* VGT_INSTANCE_STEP_RATE_1 */
-        0x000002a9,
-        0x00000000,
+        0xc0116900,
-        0xc0016900,
+        0x00000280,
-        0x00000103,
+        0x00000000, /* PA_SU_POINT_SIZE */
-        0x00000000,
+        0x00000000, /* PA_SU_POINT_MINMAX */
-        0xc0016900,
+        0x00000008, /* PA_SU_LINE_CNTL */
-        0x00000284,
+        0x00000000, /* PA_SC_LINE_STIPPLE */
-        0x00000000,
+        0x00000000, /* VGT_OUTPUT_PATH_CNTL */
-        0xc0016900,
+        0x00000000, /* VGT_HOS_CNTL */
-        0x00000290,
+        0x00000000, /* VGT_HOS_MAX_TESS_LEVEL */
-        0x00000000,
+        0x00000000, /* VGT_HOS_MIN_TESS_LEVEL */
-        0xc0016900,
+        0x00000000, /* VGT_HOS_REUSE_DEPTH */
-        0x00000285,
+        0x00000000, /* VGT_GROUP_PRIM_TYPE */
-        0x00000000,
+        0x00000000, /* VGT_GROUP_FIRST_DECR */
-        0xc0016900,
+        0x00000000, /* VGT_GROUP_DECR */
-        0x00000286,
+        0x00000000, /* VGT_GROUP_VECT_0_CNTL */
-        0x00000000,
+        0x00000000, /* VGT_GROUP_VECT_1_CNTL */
-        0xc0016900,
+        0x00000000, /* VGT_GROUP_VECT_0_FMT_CNTL */
-        0x00000287,
+        0x00000000, /* VGT_GROUP_VECT_1_FMT_CNTL */
-        0x00000000,
+        0x00000000, /* VGT_GS_MODE */
-        0xc0016900,
-        0x00000288,
-        0x00000000,
-        0xc0016900,
-        0x00000289,
-        0x00000000,
-        0xc0016900,
-        0x0000028a,
-        0x00000000,
-        0xc0016900,
-        0x0000028b,
-        0x00000000,
-        0xc0016900,
-        0x0000028c,
-        0x00000000,
-        0xc0016900,
-        0x0000028d,
-        0x00000000,
-        0xc0016900,
-        0x0000028e,
-        0x00000000,
-        0xc0016900,
-        0x0000028f,
-        0x00000000,
        0xc0016900,
        0x000002a1,
-        0x00000000,
+        0x00000000, /* VGT_PRIMITIVEID_EN */
        0xc0016900,
        0x000002a5,
-        0x00000000,
+        0x00000000, /* VGT_MULTI_PRIM_ID_RESET_EN */
-        0xc0016900,
+        0xc0036900,
        0x000002ac,
-        0x00000000,
+        0x00000000, /* VGT_STRMOUT_EN */
-        0xc0016900,
+        0x00000000, /* VGT_REUSE_OFF */
-        0x000002ad,
+        0x00000000, /* VGT_VTX_CNT_EN */
-        0x00000000,
-        0xc0016900,
-        0x000002ae,
-        0x00000000,
        0xc0016900,
        0x000002c8,
-        0x00000000,
+        0x00000000, /* VGT_STRMOUT_BUFFER_EN */
-        0xc0016900,
-        0x00000206,
+        0xc0076900,
-        0x00000100,
-        0xc0016900,
-        0x00000204,
-        0x00010000,
-        0xc0036e00,
-        0x00000000,
-        0x00000012,
-        0x00000000,
-        0x00000000,
-        0xc0016900,
-        0x0000008f,
-        0x0000000f,
-        0xc0016900,
-        0x000001e8,
-        0x00000001,
-        0xc0016900,
        0x00000202,
-        0x00cc0000,
+        0x00cc0000, /* CB_COLOR_CONTROL */
+        0x00000210, /* DB_SHADER_CNTL */
+        0x00010000, /* PA_CL_CLIP_CNTL */
+        0x00000244, /* PA_SU_SC_MODE_CNTL */
+        0x00000100, /* PA_CL_VTE_CNTL */
+        0x00000000, /* PA_CL_VS_OUT_CNTL */
+        0x00000000, /* PA_CL_NANINF_CNTL */
+        0xc0026900,
+        0x0000008e,
+        0x0000000f, /* CB_TARGET_MASK */
+        0x0000000f, /* CB_SHADER_MASK */
        0xc0016900,
-        0x00000205,
+        0x000001e8,
-        0x00000244,
+        0x00000001, /* CB_SHADER_CONTROL */
        0xc0016900,
-        0x00000203,
+        0x00000185,
-        0x00000210,
+        0x00000000, /* SPI_VS_OUT_ID_0 */
        0xc0016900,
+        0x00000191,
+        0x00000b00, /* SPI_PS_INPUT_CNTL_0 */
+        0xc0056900,
        0x000001b1,
+        0x00000000, /* SPI_VS_OUT_CONFIG */
+        0x00000000, /* SPI_THREAD_GROUPING */
+        0x00000001, /* SPI_PS_IN_CONTROL_0 */
+        0x00000000, /* SPI_PS_IN_CONTROL_1 */
+        0x00000000, /* SPI_INTERP_CONTROL_0 */
+        0xc0036e00, /* SET_SAMPLER */
        0x00000000,
-        0xc0016900,
+        0x00000012,
-        0x00000185,
-        0x00000000,
-        0xc0016900,
-        0x000001b3,
-        0x00000001,
-        0xc0016900,
-        0x000001b4,
        0x00000000,
-        0xc0016900,
-        0x00000191,
-        0x00000b00,
-        0xc0016900,
-        0x000001b5,
        0x00000000,
 };
 const u32 r7xx_default_state[] =
 {
-        0xc0012800,
+        0xc0012800, /* CONTEXT_CONTROL */
        0x80000000,
        0x80000000,
        0xc0016800,
        0x00000010,
-        0x00008000,
+        0x00008000, /* WAIT_UNTIL */
        0xc0016800,
        0x00000542,
-        0x07000002,
+        0x07000002, /* TA_CNTL_AUX */
        0xc0016800,
        0x000005c5,
-        0x00000000,
+        0x00000000, /* VC_ENHANCE */
        0xc0016800,
        0x00000363,
-        0x00004000,
+        0x00004000, /* SQ_DYN_GPR_CNTL_PS_FLUSH_REQ */
        0xc0016800,
        0x0000060c,
-        0x00000000,
+        0x00000000, /* DB_DEBUG */
        0xc0016800,
        0x0000060e,
-        0x00420204,
+        0x00420204, /* DB_WATERMARKS */
-        0xc0016f00,
-        0x00000000,
+        0xc0026f00,
-        0x00000000,
-        0xc0016f00,
-        0x00000001,
        0x00000000,
+        0x00000000, /* SQ_VTX_BASE_VTX_LOC */
+        0x00000000, /* SQ_VTX_START_INST_LOC */
        0xc0096900,
        0x0000022a,
+        0x00000000, /* SQ_ESGS_RING_ITEMSIZE */
        0x00000000,
        0x00000000,
        0x00000000,
@@ -595,470 +405,269 @@ const u32 r7xx_default_state[] =
        0x00000000,
        0x00000000,
        0x00000000,
-        0x00000000,
        0xc0016900,
        0x00000004,
-        0x00000000,
+        0x00000000, /* DB_DEPTH_INFO */
-        0xc0016900,
+        0xc0026900,
        0x0000000a,
-        0x00000000,
+        0x00000000, /* DB_STENCIL_CLEAR */
-        0xc0016900,
+        0x00000000, /* DB_DEPTH_CLEAR */
-        0x0000000b,
-        0x00000000,
-        0xc0016900,
-        0x0000010c,
-        0x00000000,
-        0xc0016900,
-        0x0000010d,
-        0x00000000,
        0xc0016900,
        0x00000200,
-        0x00000000,
+        0x00000000, /* DB_DEPTH_CONTROL */
-        0xc0016900,
+        0xc0026900,
        0x00000343,
-        0x00000060,
+        0x00000060, /* DB_RENDER_CONTROL */
-        0xc0016900,
+        0x00000000, /* DB_RENDER_OVERRIDE */
-        0x00000344,
-        0x00000000,
        0xc0016900,
        0x00000351,
-        0x0000aa00,
+        0x0000aa00, /* DB_ALPHA_TO_MASK */
-        0xc0016900,
-        0x00000104,
+        0xc0096900,
-        0x00000000,
+        0x00000100,
-        0xc0016900,
+        0x00000800, /* VGT_MAX_VTX_INDX */
-        0x0000010e,
+        0x00000000, /* VGT_MIN_VTX_INDX */
-        0x00000000,
+        0x00000000, /* VGT_INDX_OFFSET */
-        0xc0046900,
+        0x00000000, /* VGT_MULTI_PRIM_IB_RESET_INDX */
-        0x00000105,
+        0x00000000, /* SX_ALPHA_TEST_CONTROL */
-        0x00000000,
+        0x00000000, /* CB_BLEND_RED */
        0x00000000,
        0x00000000,
        0x00000000,
+        0xc0036900,
+        0x0000010c,
+        0x00000000, /* DB_STENCILREFMASK */
+        0x00000000, /* DB_STENCILREFMASK_BF */
+        0x00000000, /* SX_ALPHA_REF */
        0xc0046900,
-        0x0000030c,
+        0x0000030c, /* CB_CLRCMP_CNTL */
        0x01000000,
        0x00000000,
        0x00000000,
        0x00000000,
-        0xc0016900,
-        0x0000008e,
-        0x0000000f,
        0xc0016900,
        0x00000080,
-        0x00000000,
+        0x00000000, /* PA_SC_WINDOW_OFFSET */
-        0xc0016900,
+        0xc00a6900,
        0x00000083,
-        0x0000ffff,
+        0x0000ffff, /* PA_SC_CLIP_RECT_RULE */
-        0xc0016900,
+        0x00000000, /* PA_SC_CLIPRECT_0_TL */
-        0x00000084,
-        0x00000000,
-        0xc0016900,
-        0x00000085,
        0x20002000,
-        0xc0016900,
-        0x00000086,
        0x00000000,
-        0xc0016900,
-        0x00000087,
        0x20002000,
-        0xc0016900,
-        0x00000088,
        0x00000000,
-        0xc0016900,
-        0x00000089,
        0x20002000,
-        0xc0016900,
-        0x0000008a,
        0x00000000,
-        0xc0016900,
-        0x0000008b,
        0x20002000,
-        0xc0016900,
+        0xaaaaaaaa, /* PA_SC_EDGERULE */
-        0x0000008c,
-        0xaaaaaaaa,
+        0xc0406900,
-        0xc0016900,
        0x00000094,
-        0x80000000,
+        0x80000000, /* PA_SC_VPORT_SCISSOR_0_TL */
-        0xc0016900,
+        0x20002000, /* PA_SC_VPORT_SCISSOR_0_BR */
-        0x00000095,
+        0x80000000, /* PA_SC_VPORT_SCISSOR_1_TL */
        0x20002000,
-        0xc0026900,
-        0x000000b4,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x00000096,
        0x80000000,
-        0xc0016900,
-        0x00000097,
        0x20002000,
-        0xc0026900,
-        0x000000b6,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x00000098,
        0x80000000,
-        0xc0016900,
-        0x00000099,
        0x20002000,
-        0xc0026900,
-        0x000000b8,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x0000009a,
        0x80000000,
-        0xc0016900,
-        0x0000009b,
        0x20002000,
-        0xc0026900,
-        0x000000ba,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x0000009c,
        0x80000000,
-        0xc0016900,
-        0x0000009d,
        0x20002000,
-        0xc0026900,
-        0x000000bc,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x0000009e,
        0x80000000,
-        0xc0016900,
-        0x0000009f,
        0x20002000,
-        0xc0026900,
-        0x000000be,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x000000a0,
        0x80000000,
-        0xc0016900,
-        0x000000a1,
        0x20002000,
-        0xc0026900,
-        0x000000c0,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x000000a2,
        0x80000000,
-        0xc0016900,
-        0x000000a3,
        0x20002000,
-        0xc0026900,
-        0x000000c2,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x000000a4,
        0x80000000,
-        0xc0016900,
-        0x000000a5,
        0x20002000,
-        0xc0026900,
-        0x000000c4,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x000000a6,
        0x80000000,
-        0xc0016900,
-        0x000000a7,
        0x20002000,
-        0xc0026900,
-        0x000000c6,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x000000a8,
        0x80000000,
-        0xc0016900,
-        0x000000a9,
        0x20002000,
-        0xc0026900,
-        0x000000c8,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x000000aa,
        0x80000000,
-        0xc0016900,
-        0x000000ab,
        0x20002000,
-        0xc0026900,
-        0x000000ca,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x000000ac,
        0x80000000,
-        0xc0016900,
-        0x000000ad,
        0x20002000,
-        0xc0026900,
-        0x000000cc,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x000000ae,
        0x80000000,
-        0xc0016900,
-        0x000000af,
        0x20002000,
-        0xc0026900,
-        0x000000ce,
-        0x00000000,
-        0x3f800000,
-        0xc0016900,
-        0x000000b0,
        0x80000000,
-        0xc0016900,
-        0x000000b1,
        0x20002000,
-        0xc0026900,
+        0x00000000, /* PA_SC_VPORT_ZMIN_0 */
-        0x000000d0,
-        0x00000000,
        0x3f800000,
-        0xc0016900,
-        0x000000b2,
-        0x80000000,
-        0xc0016900,
-        0x000000b3,
-        0x20002000,
-        0xc0026900,
-        0x000000d2,
        0x00000000,
        0x3f800000,
-        0xc0016900,
-        0x00000293,
-        0x00514000,
-        0xc0016900,
-        0x00000300,
-        0x00000000,
-        0xc0016900,
-        0x00000301,
        0x00000000,
-        0xc0016900,
+        0x3f800000,
-        0x00000312,
-        0xffffffff,
-        0xc0016900,
-        0x00000307,
        0x00000000,
-        0xc0016900,
+        0x3f800000,
-        0x00000308,
        0x00000000,
-        0xc0016900,
+        0x3f800000,
-        0x00000283,
        0x00000000,
-        0xc0016900,
+        0x3f800000,
-        0x00000292,
        0x00000000,
-        0xc0066900,
+        0x3f800000,
-        0x0000010f,
        0x00000000,
+        0x3f800000,
        0x00000000,
+        0x3f800000,
        0x00000000,
+        0x3f800000,
        0x00000000,
+        0x3f800000,
        0x00000000,
+        0x3f800000,
        0x00000000,
-        0xc0016900,
+        0x3f800000,
-        0x00000206,
        0x00000000,
-        0xc0016900,
+        0x3f800000,
-        0x00000207,
        0x00000000,
-        0xc0016900,
+        0x3f800000,
-        0x00000208,
        0x00000000,
-        0xc0046900,
-        0x00000303,
        0x3f800000,
+        0xc0026900,
+        0x00000292,
+        0x00000000, /* PA_SC_MPASS_PS_CNTL */
+        0x00514000, /* PA_SC_MODE_CNTL */
+        0xc0096900,
+        0x00000300,
+        0x00000000, /* PA_SC_LINE_CNTL */
+        0x00000000, /* PA_SC_AA_CONFIG */
+        0x0000002d, /* PA_SU_VTX_CNTL */
+        0x3f800000, /* PA_CL_GB_VERT_CLIP_ADJ */
        0x3f800000,
        0x3f800000,
        0x3f800000,
-        0xc0016900,
+        0x00000000, /* PA_SC_SAMPLE_LOCS_MCTX */
-        0x00000205,
-        0x00000004,
-        0xc0016900,
-        0x00000280,
-        0x00000000,
-        0xc0016900,
-        0x00000281,
        0x00000000,
        0xc0016900,
+        0x00000312,
+        0xffffffff, /* PA_SC_AA_MASK */
+        0xc0066900,
        0x0000037e,
-        0x00000000,
+        0x00000000, /* PA_SU_POLY_OFFSET_DB_FMT_CNTL */
-        0xc0016900,
+        0x00000000, /* PA_SU_POLY_OFFSET_CLAMP */
-        0x00000382,
+        0x00000000, /* PA_SU_POLY_OFFSET_FRONT_SCALE */
-        0x00000000,
+        0x00000000, /* PA_SU_POLY_OFFSET_FRONT_OFFSET */
-        0xc0016900,
+        0x00000000, /* PA_SU_POLY_OFFSET_BACK_SCALE */
-        0x00000380,
+        0x00000000, /* PA_SU_POLY_OFFSET_BACK_OFFSET */
-        0x00000000,
-        0xc0016900,
+        0xc0046900,
-        0x00000383,
-        0x00000000,
-        0xc0016900,
-        0x00000381,
-        0x00000000,
-        0xc0016900,
-        0x00000282,
-        0x00000008,
-        0xc0016900,
-        0x00000302,
-        0x0000002d,
-        0xc0016900,
-        0x0000037f,
-        0x00000000,
-        0xc0016900,
-        0x000001b2,
-        0x00000001,
-        0xc0016900,
        0x000001b6,
-        0x00000000,
+        0x00000000, /* SPI_INPUT_Z */
-        0xc0016900,
+        0x00000000, /* SPI_FOG_CNTL */
-        0x000001b7,
+        0x00000000, /* SPI_FOG_FUNC_SCALE */
-        0x00000000,
+        0x00000000, /* SPI_FOG_FUNC_BIAS */
-        0xc0016900,
-        0x000001b8,
-        0x00000000,
-        0xc0016900,
-        0x000001b9,
-        0x00000000,
        0xc0016900,
        0x00000225,
-        0x00000000,
+        0x00000000, /* SQ_PGM_START_FS */
        0xc0016900,
        0x00000229,
-        0x00000000,
+        0x00000000, /* SQ_PGM_RESOURCES_FS */
        0xc0016900,
        0x00000237,
-        0x00000000,
+        0x00000000, /* SQ_PGM_CF_OFFSET_FS */
-        0xc0016900,
-        0x00000100,
+        0xc0026900,
-        0x00000800,
-        0xc0016900,
-        0x00000101,
-        0x00000000,
-        0xc0016900,
-        0x00000102,
-        0x00000000,
-        0xc0016900,
        0x000002a8,
-        0x00000000,
+        0x00000000, /* VGT_INSTANCE_STEP_RATE_0 */
-        0xc0016900,
+        0x00000000, /* VGT_INSTANCE_STEP_RATE_1 */
-        0x000002a9,
-        0x00000000,
+        0xc0116900,
-        0xc0016900,
+        0x00000280,
-        0x00000103,
+        0x00000000, /* PA_SU_POINT_SIZE */
-        0x00000000,
+        0x00000000, /* PA_SU_POINT_MINMAX */
-        0xc0016900,
+        0x00000008, /* PA_SU_LINE_CNTL */
-        0x00000284,
+        0x00000000, /* PA_SC_LINE_STIPPLE */
-        0x00000000,
+        0x00000000, /* VGT_OUTPUT_PATH_CNTL */
-        0xc0016900,
+        0x00000000, /* VGT_HOS_CNTL */
-        0x00000290,
+        0x00000000, /* VGT_HOS_MAX_TESS_LEVEL */
-        0x00000000,
+        0x00000000, /* VGT_HOS_MIN_TESS_LEVEL */
-        0xc0016900,
+        0x00000000, /* VGT_HOS_REUSE_DEPTH */
-        0x00000285,
+        0x00000000, /* VGT_GROUP_PRIM_TYPE */
-        0x00000000,
+        0x00000000, /* VGT_GROUP_FIRST_DECR */
-        0xc0016900,
+        0x00000000, /* VGT_GROUP_DECR */
-        0x00000286,
+        0x00000000, /* VGT_GROUP_VECT_0_CNTL */
-        0x00000000,
+        0x00000000, /* VGT_GROUP_VECT_1_CNTL */
-        0xc0016900,
+        0x00000000, /* VGT_GROUP_VECT_0_FMT_CNTL */
-        0x00000287,
+        0x00000000, /* VGT_GROUP_VECT_1_FMT_CNTL */
-        0x00000000,
+        0x00000000, /* VGT_GS_MODE */
-        0xc0016900,
-        0x00000288,
-        0x00000000,
-        0xc0016900,
-        0x00000289,
-        0x00000000,
-        0xc0016900,
-        0x0000028a,
-        0x00000000,
-        0xc0016900,
-        0x0000028b,
-        0x00000000,
-        0xc0016900,
-        0x0000028c,
-        0x00000000,
-        0xc0016900,
-        0x0000028d,
-        0x00000000,
-        0xc0016900,
-        0x0000028e,
-        0x00000000,
-        0xc0016900,
-        0x0000028f,
-        0x00000000,
        0xc0016900,
        0x000002a1,
-        0x00000000,
+        0x00000000, /* VGT_PRIMITIVEID_EN */
        0xc0016900,
        0x000002a5,
-        0x00000000,
+        0x00000000, /* VGT_MULTI_PRIM_ID_RESET_EN */
-        0xc0016900,
+        0xc0036900,
        0x000002ac,
-        0x00000000,
+        0x00000000, /* VGT_STRMOUT_EN */
-        0xc0016900,
+        0x00000000, /* VGT_REUSE_OFF */
-        0x000002ad,
+        0x00000000, /* VGT_VTX_CNT_EN */
-        0x00000000,
-        0xc0016900,
-        0x000002ae,
-        0x00000000,
        0xc0016900,
        0x000002c8,
-        0x00000000,
+        0x00000000, /* VGT_STRMOUT_BUFFER_EN */
-        0xc0016900,
-        0x00000206,
+        0xc0076900,
-        0x00000100,
-        0xc0016900,
-        0x00000204,
-        0x00010000,
-        0xc0036e00,
-        0x00000000,
-        0x00000012,
-        0x00000000,
-        0x00000000,
-        0xc0016900,
-        0x0000008f,
-        0x0000000f,
-        0xc0016900,
-        0x000001e8,
-        0x00000001,
-        0xc0016900,
        0x00000202,
-        0x00cc0000,
+        0x00cc0000, /* CB_COLOR_CONTROL */
+        0x00000210, /* DB_SHADER_CNTL */
+        0x00010000, /* PA_CL_CLIP_CNTL */
+        0x00000244, /* PA_SU_SC_MODE_CNTL */
+        0x00000100, /* PA_CL_VTE_CNTL */
+        0x00000000, /* PA_CL_VS_OUT_CNTL */
+        0x00000000, /* PA_CL_NANINF_CNTL */
+        0xc0026900,
+        0x0000008e,
+        0x0000000f, /* CB_TARGET_MASK */
+        0x0000000f, /* CB_SHADER_MASK */
        0xc0016900,
-        0x00000205,
+        0x000001e8,
-        0x00000244,
+        0x00000001, /* CB_SHADER_CONTROL */
        0xc0016900,
-        0x00000203,
+        0x00000185,
-        0x00000210,
+        0x00000000, /* SPI_VS_OUT_ID_0 */
        0xc0016900,
+        0x00000191,
+        0x00000b00, /* SPI_PS_INPUT_CNTL_0 */
+        0xc0056900,
        0x000001b1,
+        0x00000000, /* SPI_VS_OUT_CONFIG */
+        0x00000001, /* SPI_THREAD_GROUPING */
+        0x00000001, /* SPI_PS_IN_CONTROL_0 */
+        0x00000000, /* SPI_PS_IN_CONTROL_1 */
+        0x00000000, /* SPI_INTERP_CONTROL_0 */
+        0xc0036e00, /* SET_SAMPLER */
        0x00000000,
-        0xc0016900,
+        0x00000012,
-        0x00000185,
-        0x00000000,
-        0xc0016900,
-        0x000001b3,
-        0x00000001,
-        0xc0016900,
-        0x000001b4,
        0x00000000,
-        0xc0016900,
-        0x00000191,
-        0x00000b00,
-        0xc0016900,
-        0x000001b5,
        0x00000000,
 };
diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c
index c39c1bc13016..c3ea212e0c3c 100644
--- a/drivers/gpu/drm/radeon/r600_cs.c
+++ b/drivers/gpu/drm/radeon/r600_cs.c
@@ -25,6 +25,7 @@
 *          Alex Deucher
 *          Jerome Glisse
 */
+#include <linux/kernel.h>
 #include "drmP.h"
 #include "radeon.h"
 #include "r600d.h"
@@ -166,7 +167,7 @@ static void r600_cs_track_init(struct r600_cs_track *track)
 static inline int r600_cs_track_validate_cb(struct radeon_cs_parser *p, int i)
 {
        struct r600_cs_track *track = p->track;
-        u32 bpe = 0, pitch, slice_tile_max, size, tmp, height;
+        u32 bpe = 0, pitch, slice_tile_max, size, tmp, height, pitch_align;
        volatile u32 *ib = p->ib->ptr;
        if (G_0280A0_TILE_MODE(track->cb_color_info[i])) {
@@ -180,56 +181,57 @@ static inline int r600_cs_track_validate_cb(struct radeon_cs_parser *p, int i)
                        i, track->cb_color_info[i]);
                return -EINVAL;
        }
-        pitch = (G_028060_PITCH_TILE_MAX(track->cb_color_size[i]) + 1) << 3;
+        /* pitch is the number of 8x8 tiles per row */
+        pitch = G_028060_PITCH_TILE_MAX(track->cb_color_size[i]) + 1;
        slice_tile_max = G_028060_SLICE_TILE_MAX(track->cb_color_size[i]) + 1;
-        if (!pitch) {
+        height = size / (pitch * 8 * bpe);
-                dev_warn(p->dev, "%s:%d cb pitch (%d) for %d invalid (0x%08X)\n",
-                        __func__, __LINE__, pitch, i, track->cb_color_size[i]);
-                return -EINVAL;
-        }
-        height = size / (pitch * bpe);
        if (height > 8192)
                height = 8192;
+        if (height > 7)
+                height &= ~0x7;
        switch (G_0280A0_ARRAY_MODE(track->cb_color_info[i])) {
        case V_0280A0_ARRAY_LINEAR_GENERAL:
+                /* technically height & 0x7 */
+                break;
        case V_0280A0_ARRAY_LINEAR_ALIGNED:
-                if (pitch & 0x3f) {
+                pitch_align = max((u32)64, (u32)(track->group_size / bpe)) / 8;
-                        dev_warn(p->dev, "%s:%d cb pitch (%d x %d = %d) invalid\n",
+                if (!IS_ALIGNED(pitch, pitch_align)) {
-                                __func__, __LINE__, pitch, bpe, pitch * bpe);
+                        dev_warn(p->dev, "%s:%d cb pitch (%d) invalid\n",
+                                 __func__, __LINE__, pitch);
                        return -EINVAL;
                }
-                if ((pitch * bpe) & (track->group_size - 1)) {
+                if (!IS_ALIGNED(height, 8)) {
-                        dev_warn(p->dev, "%s:%d cb pitch (%d) invalid\n",
+                        dev_warn(p->dev, "%s:%d cb height (%d) invalid\n",
-                                __func__, __LINE__, pitch);
+                                 __func__, __LINE__, height);
                        return -EINVAL;
                }
                break;
        case V_0280A0_ARRAY_1D_TILED_THIN1:
-                if ((pitch * 8 * bpe * track->nsamples) & (track->group_size - 1)) {
+                pitch_align = max((u32)8, (u32)(track->group_size / (8 * bpe * track->nsamples))) / 8;
+                if (!IS_ALIGNED(pitch, pitch_align)) {
                        dev_warn(p->dev, "%s:%d cb pitch (%d) invalid\n",
-                                __func__, __LINE__, pitch);
+                                 __func__, __LINE__, pitch);
+                        return -EINVAL;
+                }
+                if (!IS_ALIGNED(height, 8)) {
+                        dev_warn(p->dev, "%s:%d cb height (%d) invalid\n",
+                                 __func__, __LINE__, height);
                        return -EINVAL;
                }
-                height &= ~0x7;
-                if (!height)
-                        height = 8;
                break;
        case V_0280A0_ARRAY_2D_TILED_THIN1:
-                if (pitch & ((8 * track->nbanks) - 1)) {
+                pitch_align = max((u32)track->nbanks,
+                                  (u32)(((track->group_size / 8) / (bpe * track->nsamples)) * track->nbanks));
+                if (!IS_ALIGNED(pitch, pitch_align)) {
                        dev_warn(p->dev, "%s:%d cb pitch (%d) invalid\n",
                                __func__, __LINE__, pitch);
                        return -EINVAL;
                }
-                tmp = pitch * 8 * bpe * track->nsamples;
+                if (!IS_ALIGNED((height / 8), track->nbanks)) {
-                tmp = tmp / track->nbanks;
+                        dev_warn(p->dev, "%s:%d cb height (%d) invalid\n",
-                if (tmp & (track->group_size - 1)) {
+                                 __func__, __LINE__, height);
-                        dev_warn(p->dev, "%s:%d cb pitch (%d) invalid\n",
-                                __func__, __LINE__, pitch);
                        return -EINVAL;
                }
-                height &= ~((16 * track->npipes) - 1);
-                if (!height)
-                        height = 16 * track->npipes;
                break;
        default:
                dev_warn(p->dev, "%s invalid tiling %d for %d (0x%08X)\n", __func__,
@@ -238,16 +240,20 @@ static inline int r600_cs_track_validate_cb(struct radeon_cs_parser *p, int i)
                return -EINVAL;
        }
        /* check offset */
-        tmp = height * pitch;
+        tmp = height * pitch * 8 * bpe;
        if ((tmp + track->cb_color_bo_offset[i]) > radeon_bo_size(track->cb_color_bo[i])) {
-                dev_warn(p->dev, "%s offset[%d] %d to big\n", __func__, i, track->cb_color_bo_offset[i]);
+                dev_warn(p->dev, "%s offset[%d] %d too big\n", __func__, i, track->cb_color_bo_offset[i]);
+                return -EINVAL;
+        }
+        if (!IS_ALIGNED(track->cb_color_bo_offset[i], track->group_size)) {
+                dev_warn(p->dev, "%s offset[%d] %d not aligned\n", __func__, i, track->cb_color_bo_offset[i]);
                return -EINVAL;
        }
        /* limit max tile */
-        tmp = (height * pitch) >> 6;
+        tmp = (height * pitch * 8) >> 6;
        if (tmp < slice_tile_max)
                slice_tile_max = tmp;
-        tmp = S_028060_PITCH_TILE_MAX((pitch >> 3) - 1) |
+        tmp = S_028060_PITCH_TILE_MAX(pitch - 1) |
                S_028060_SLICE_TILE_MAX(slice_tile_max - 1);
        ib[track->cb_color_size_idx[i]] = tmp;
        return 0;
@@ -289,7 +295,7 @@ static int r600_cs_track_check(struct radeon_cs_parser *p)
        /* Check depth buffer */
        if (G_028800_STENCIL_ENABLE(track->db_depth_control) ||
                G_028800_Z_ENABLE(track->db_depth_control)) {
-                u32 nviews, bpe, ntiles;
+                u32 nviews, bpe, ntiles, pitch, pitch_align, height, size;
                if (track->db_bo == NULL) {
                        dev_warn(p->dev, "z/stencil with no depth buffer\n");
                        return -EINVAL;
@@ -332,6 +338,51 @@ static int r600_cs_track_check(struct radeon_cs_parser *p)
                        }
                        ib[track->db_depth_size_idx] = S_028000_SLICE_TILE_MAX(tmp - 1) | (track->db_depth_size & 0x3FF);
                } else {
+                        size = radeon_bo_size(track->db_bo);
+                        pitch = G_028000_PITCH_TILE_MAX(track->db_depth_size) + 1;
+                        height = size / (pitch * 8 * bpe);
+                        height &= ~0x7;
+                        if (!height)
+                                height = 8;
+                        switch (G_028010_ARRAY_MODE(track->db_depth_info)) {
+                        case V_028010_ARRAY_1D_TILED_THIN1:
+                                pitch_align = (max((u32)8, (u32)(track->group_size / (8 * bpe))) / 8);
+                                if (!IS_ALIGNED(pitch, pitch_align)) {
+                                        dev_warn(p->dev, "%s:%d db pitch (%d) invalid\n",
+                                                 __func__, __LINE__, pitch);
+                                        return -EINVAL;
+                                }
+                                if (!IS_ALIGNED(height, 8)) {
+                                        dev_warn(p->dev, "%s:%d db height (%d) invalid\n",
+                                                 __func__, __LINE__, height);
+                                        return -EINVAL;
+                                }
+                                break;
+                        case V_028010_ARRAY_2D_TILED_THIN1:
+                                pitch_align = max((u32)track->nbanks,
+                                                  (u32)(((track->group_size / 8) / bpe) * track->nbanks));
+                                if (!IS_ALIGNED(pitch, pitch_align)) {
+                                        dev_warn(p->dev, "%s:%d db pitch (%d) invalid\n",
+                                                 __func__, __LINE__, pitch);
+                                        return -EINVAL;
+                                }
+                                if ((height / 8) & (track->nbanks - 1)) {
+                                        dev_warn(p->dev, "%s:%d db height (%d) invalid\n",
+                                                 __func__, __LINE__, height);
+                                        return -EINVAL;
+                                }
+                                break;
+                        default:
+                                dev_warn(p->dev, "%s invalid tiling %d (0x%08X)\n", __func__,
+                                         G_028010_ARRAY_MODE(track->db_depth_info),
+                                         track->db_depth_info);
+                                return -EINVAL;
+                        }
+                        if (!IS_ALIGNED(track->db_offset, track->group_size)) {
+                                dev_warn(p->dev, "%s offset[%d] %d not aligned\n", __func__, i, track->db_offset);
+                                return -EINVAL;
+                        }
                        ntiles = G_028000_SLICE_TILE_MAX(track->db_depth_size) + 1;
                        nviews = G_028004_SLICE_MAX(track->db_depth_view) + 1;
                        tmp = ntiles * bpe * 64 * nviews;
@@ -585,7 +636,7 @@ static int r600_cs_packet_parse_vline(struct radeon_cs_parser *p)
        header = radeon_get_ib_value(p, h_idx);
        crtc_id = radeon_get_ib_value(p, h_idx + 2 + 7 + 1);
        reg = CP_PACKET0_GET_REG(header);
-        mutex_lock(&p->rdev->ddev->mode_config.mutex);
        obj = drm_mode_object_find(p->rdev->ddev, crtc_id, DRM_MODE_OBJECT_CRTC);
        if (!obj) {
                DRM_ERROR("cannot find crtc %d\n", crtc_id);
@@ -620,7 +671,6 @@ static int r600_cs_packet_parse_vline(struct radeon_cs_parser *p)
                ib[h_idx + 4] = AVIVO_D2MODE_VLINE_STATUS >> 2;
        }
 out:
-        mutex_unlock(&p->rdev->ddev->mode_config.mutex);
        return r;
 }
@@ -725,7 +775,25 @@ static inline int r600_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx
                track->db_depth_control = radeon_get_ib_value(p, idx);
                break;
        case R_028010_DB_DEPTH_INFO:
-                track->db_depth_info = radeon_get_ib_value(p, idx);
+                if (r600_cs_packet_next_is_pkt3_nop(p)) {
+                        r = r600_cs_packet_next_reloc(p, &reloc);
+                        if (r) {
+                                dev_warn(p->dev, "bad SET_CONTEXT_REG "
+                                         "0x%04X\n", reg);
+                                return -EINVAL;
+                        }
+                        track->db_depth_info = radeon_get_ib_value(p, idx);
+                        ib[idx] &= C_028010_ARRAY_MODE;
+                        track->db_depth_info &= C_028010_ARRAY_MODE;
+                        if (reloc->lobj.tiling_flags & RADEON_TILING_MACRO) {
+                                ib[idx] |= S_028010_ARRAY_MODE(V_028010_ARRAY_2D_TILED_THIN1);
+                                track->db_depth_info |= S_028010_ARRAY_MODE(V_028010_ARRAY_2D_TILED_THIN1);
+                        } else {
+                                ib[idx] |= S_028010_ARRAY_MODE(V_028010_ARRAY_1D_TILED_THIN1);
+                                track->db_depth_info |= S_028010_ARRAY_MODE(V_028010_ARRAY_1D_TILED_THIN1);
+                        }
+                } else
+                        track->db_depth_info = radeon_get_ib_value(p, idx);
                break;
        case R_028004_DB_DEPTH_VIEW:
                track->db_depth_view = radeon_get_ib_value(p, idx);
@@ -758,8 +826,25 @@ static inline int r600_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx
        case R_0280B4_CB_COLOR5_INFO:
        case R_0280B8_CB_COLOR6_INFO:
        case R_0280BC_CB_COLOR7_INFO:
-                tmp = (reg - R_0280A0_CB_COLOR0_INFO) / 4;
+                if (r600_cs_packet_next_is_pkt3_nop(p)) {
-                track->cb_color_info[tmp] = radeon_get_ib_value(p, idx);
+                        r = r600_cs_packet_next_reloc(p, &reloc);
+                        if (r) {
+                                dev_err(p->dev, "bad SET_CONTEXT_REG 0x%04X\n", reg);
+                                return -EINVAL;
+                        }
+                        tmp = (reg - R_0280A0_CB_COLOR0_INFO) / 4;
+                        track->cb_color_info[tmp] = radeon_get_ib_value(p, idx);
+                        if (reloc->lobj.tiling_flags & RADEON_TILING_MACRO) {
+                                ib[idx] |= S_0280A0_ARRAY_MODE(V_0280A0_ARRAY_2D_TILED_THIN1);
+                                track->cb_color_info[tmp] |= S_0280A0_ARRAY_MODE(V_0280A0_ARRAY_2D_TILED_THIN1);
+                        } else if (reloc->lobj.tiling_flags & RADEON_TILING_MICRO) {
+                                ib[idx] |= S_0280A0_ARRAY_MODE(V_0280A0_ARRAY_1D_TILED_THIN1);
+                                track->cb_color_info[tmp] |= S_0280A0_ARRAY_MODE(V_0280A0_ARRAY_1D_TILED_THIN1);
+                        }
+                } else {
+                        tmp = (reg - R_0280A0_CB_COLOR0_INFO) / 4;
+                        track->cb_color_info[tmp] = radeon_get_ib_value(p, idx);
+                }
                break;
        case R_028060_CB_COLOR0_SIZE:
        case R_028064_CB_COLOR1_SIZE:
@@ -947,8 +1032,9 @@ static inline unsigned minify(unsigned size, unsigned levels)
 }
 static void r600_texture_size(unsigned nfaces, unsigned blevel, unsigned nlevels,
-                                unsigned w0, unsigned h0, unsigned d0, unsigned bpe,
+                              unsigned w0, unsigned h0, unsigned d0, unsigned bpe,
-                                unsigned *l0_size, unsigned *mipmap_size)
+                              unsigned pitch_align,
+                              unsigned *l0_size, unsigned *mipmap_size)
 {
        unsigned offset, i, level, face;
        unsigned width, height, depth, rowstride, size;
@@ -961,13 +1047,13 @@ static void r600_texture_size(unsigned nfaces, unsigned blevel, unsigned nlevels
                height = minify(h0, i);
                depth = minify(d0, i);
                for(face = 0; face < nfaces; face++) {
-                        rowstride = ((width * bpe) + 255) & ~255;
+                        rowstride = ALIGN((width * bpe), pitch_align);
                        size = height * rowstride * depth;
                        offset += size;
                        offset = (offset + 0x1f) & ~0x1f;
                }
        }
-        *l0_size = (((w0 * bpe) + 255) & ~255) * h0 * d0;
+        *l0_size = ALIGN((w0 * bpe), pitch_align) * h0 * d0;
        *mipmap_size = offset;
        if (!blevel)
                *mipmap_size -= *l0_size;
@@ -986,16 +1072,23 @@ static void r600_texture_size(unsigned nfaces, unsigned blevel, unsigned nlevels
 * the texture and mipmap bo object are big enough to cover this resource.
 */
 static inline int r600_check_texture_resource(struct radeon_cs_parser *p,  u32 idx,
-                                                struct radeon_bo *texture,
+                                              struct radeon_bo *texture,
-                                                struct radeon_bo *mipmap)
+                                              struct radeon_bo *mipmap,
+                                              u32 tiling_flags)
 {
+        struct r600_cs_track *track = p->track;
        u32 nfaces, nlevels, blevel, w0, h0, d0, bpe = 0;
-        u32 word0, word1, l0_size, mipmap_size;
+        u32 word0, word1, l0_size, mipmap_size, pitch, pitch_align;
        /* on legacy kernel we don't perform advanced check */
        if (p->rdev == NULL)
                return 0;
        word0 = radeon_get_ib_value(p, idx + 0);
+        if (tiling_flags & RADEON_TILING_MACRO)
+                word0 |= S_038000_TILE_MODE(V_038000_ARRAY_2D_TILED_THIN1);
+        else if (tiling_flags & RADEON_TILING_MICRO)
+                word0 |= S_038000_TILE_MODE(V_038000_ARRAY_1D_TILED_THIN1);
        word1 = radeon_get_ib_value(p, idx + 1);
        w0 = G_038000_TEX_WIDTH(word0) + 1;
        h0 = G_038004_TEX_HEIGHT(word1) + 1;
@@ -1022,11 +1115,55 @@ static inline int r600_check_texture_resource(struct radeon_cs_parser *p,  u32 i
                         __func__, __LINE__, G_038004_DATA_FORMAT(word1));
                return -EINVAL;
        }
+        pitch = G_038000_PITCH(word0) + 1;
+        switch (G_038000_TILE_MODE(word0)) {
+        case V_038000_ARRAY_LINEAR_GENERAL:
+                pitch_align = 1;
+                /* XXX check height align */
+                break;
+        case V_038000_ARRAY_LINEAR_ALIGNED:
+                pitch_align = max((u32)64, (u32)(track->group_size / bpe)) / 8;
+                if (!IS_ALIGNED(pitch, pitch_align)) {
+                        dev_warn(p->dev, "%s:%d tex pitch (%d) invalid\n",
+                                 __func__, __LINE__, pitch);
+                        return -EINVAL;
+                }
+                /* XXX check height align */
+                break;
+        case V_038000_ARRAY_1D_TILED_THIN1:
+                pitch_align = max((u32)8, (u32)(track->group_size / (8 * bpe))) / 8;
+                if (!IS_ALIGNED(pitch, pitch_align)) {
+                        dev_warn(p->dev, "%s:%d tex pitch (%d) invalid\n",
+                                 __func__, __LINE__, pitch);
+                        return -EINVAL;
+                }
+                /* XXX check height align */
+                break;
+        case V_038000_ARRAY_2D_TILED_THIN1:
+                pitch_align = max((u32)track->nbanks,
+                                  (u32)(((track->group_size / 8) / bpe) * track->nbanks));
+                if (!IS_ALIGNED(pitch, pitch_align)) {
+                        dev_warn(p->dev, "%s:%d tex pitch (%d) invalid\n",
+                                __func__, __LINE__, pitch);
+                        return -EINVAL;
+                }
+                /* XXX check height align */
+                break;
+        default:
+                dev_warn(p->dev, "%s invalid tiling %d (0x%08X)\n", __func__,
+                         G_038000_TILE_MODE(word0), word0);
+                return -EINVAL;
+        }
+        /* XXX check offset align */
        word0 = radeon_get_ib_value(p, idx + 4);
        word1 = radeon_get_ib_value(p, idx + 5);
        blevel = G_038010_BASE_LEVEL(word0);
        nlevels = G_038014_LAST_LEVEL(word1);
-        r600_texture_size(nfaces, blevel, nlevels, w0, h0, d0, bpe, &l0_size, &mipmap_size);
+        r600_texture_size(nfaces, blevel, nlevels, w0, h0, d0, bpe,
+                          (pitch_align * bpe),
+                          &l0_size, &mipmap_size);
        /* using get ib will give us the offset into the texture bo */
        word0 = radeon_get_ib_value(p, idx + 2);
        if ((l0_size + word0) > radeon_bo_size(texture)) {
@@ -1240,6 +1377,10 @@ static int r600_packet3_check(struct radeon_cs_parser *p,
                                        return -EINVAL;
                                }
                                ib[idx+1+(i*7)+2] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff);
+                                if (reloc->lobj.tiling_flags & RADEON_TILING_MACRO)
+                                        ib[idx+1+(i*7)+0] |= S_038000_TILE_MODE(V_038000_ARRAY_2D_TILED_THIN1);
+                                else if (reloc->lobj.tiling_flags & RADEON_TILING_MICRO)
+                                        ib[idx+1+(i*7)+0] |= S_038000_TILE_MODE(V_038000_ARRAY_1D_TILED_THIN1);
                                texture = reloc->robj;
                                /* tex mip base */
                                r = r600_cs_packet_next_reloc(p, &reloc);
@@ -1250,7 +1391,7 @@ static int r600_packet3_check(struct radeon_cs_parser *p,
                                ib[idx+1+(i*7)+3] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff);
                                mipmap = reloc->robj;
                                r = r600_check_texture_resource(p,  idx+(i*7)+1,
-                                                texture, mipmap);
+                                                                texture, mipmap, reloc->lobj.tiling_flags);
                                if (r)
                                        return r;
                                break;
diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
index 26b4bc9d89a5..e6a58ed48dcf 100644
--- a/drivers/gpu/drm/radeon/r600_hdmi.c
+++ b/drivers/gpu/drm/radeon/r600_hdmi.c
@@ -435,7 +435,8 @@ static int r600_hdmi_find_free_block(struct drm_device *dev)
                }
        }
-        if (rdev->family == CHIP_RS600 || rdev->family == CHIP_RS690) {
+        if (rdev->family == CHIP_RS600 || rdev->family == CHIP_RS690 ||
+            rdev->family == CHIP_RS740) {
                return free_blocks[0] ? R600_HDMI_BLOCK1 : 0;
        } else if (rdev->family >= CHIP_R600) {
                if (free_blocks[0])
@@ -466,7 +467,8 @@ static void r600_hdmi_assign_block(struct drm_encoder *encoder)
                if (ASIC_IS_DCE32(rdev))
                        radeon_encoder->hdmi_config_offset = dig->dig_encoder ?
                                R600_HDMI_CONFIG2 : R600_HDMI_CONFIG1;
-        } else if (rdev->family >= CHIP_R600) {
+        } else if (rdev->family >= CHIP_R600 || rdev->family == CHIP_RS600 ||
+                   rdev->family == CHIP_RS690 || rdev->family == CHIP_RS740) {
                radeon_encoder->hdmi_offset = r600_hdmi_find_free_block(dev);
        }
 }
diff --git a/drivers/gpu/drm/radeon/r600d.h b/drivers/gpu/drm/radeon/r600d.h
index 59c1f8793e60..858a1920c0d7 100644
--- a/drivers/gpu/drm/radeon/r600d.h
+++ b/drivers/gpu/drm/radeon/r600d.h
@@ -239,12 +239,18 @@
 #define GRBM_SOFT_RESET                                 0x8020
 #define         SOFT_RESET_CP                                   (1<<0)
+#define CG_THERMAL_STATUS                               0x7F4
+#define         ASIC_T(x)                               ((x) << 0)
+#define         ASIC_T_MASK                             0x1FF
+#define         ASIC_T_SHIFT                            0
 #define HDP_HOST_PATH_CNTL                              0x2C00
 #define HDP_NONSURFACE_BASE                             0x2C04
 #define HDP_NONSURFACE_INFO                             0x2C08
 #define HDP_NONSURFACE_SIZE                             0x2C0C
 #define HDP_REG_COHERENCY_FLUSH_CNTL                    0x54A0
 #define HDP_TILING_CONFIG                               0x2F3C
+#define HDP_DEBUG1                                      0x2F34
 #define MC_VM_AGP_TOP                                   0x2184
 #define MC_VM_AGP_BOT                                   0x2188
@@ -1154,6 +1160,10 @@
 #define   S_038000_TILE_MODE(x)                        (((x) & 0xF) << 3)
 #define   G_038000_TILE_MODE(x)                        (((x) >> 3) & 0xF)
 #define   C_038000_TILE_MODE                           0xFFFFFF87
+#define     V_038000_ARRAY_LINEAR_GENERAL              0x00000000
+#define     V_038000_ARRAY_LINEAR_ALIGNED              0x00000001
+#define     V_038000_ARRAY_1D_TILED_THIN1              0x00000002
+#define     V_038000_ARRAY_2D_TILED_THIN1              0x00000004
 #define   S_038000_TILE_TYPE(x)                        (((x) & 0x1) << 7)
 #define   G_038000_TILE_TYPE(x)                        (((x) >> 7) & 0x1)
 #define   C_038000_TILE_TYPE                           0xFFFFFF7F
@@ -1357,6 +1367,8 @@
 #define   S_028010_ARRAY_MODE(x)                       (((x) & 0xF) << 15)
 #define   G_028010_ARRAY_MODE(x)                       (((x) >> 15) & 0xF)
 #define   C_028010_ARRAY_MODE                          0xFFF87FFF
+#define     V_028010_ARRAY_1D_TILED_THIN1              0x00000002
+#define     V_028010_ARRAY_2D_TILED_THIN1              0x00000004
 #define   S_028010_TILE_SURFACE_ENABLE(x)              (((x) & 0x1) << 25)
 #define   G_028010_TILE_SURFACE_ENABLE(x)              (((x) >> 25) & 0x1)
 #define   C_028010_TILE_SURFACE_ENABLE                 0xFDFFFFFF
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index ab61aaa887bb..3cd1c470b777 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -178,6 +178,9 @@ void radeon_combios_get_power_modes(struct radeon_device *rdev);
 void radeon_atombios_get_power_modes(struct radeon_device *rdev);
 void radeon_atom_set_voltage(struct radeon_device *rdev, u16 level);
 void rs690_pm_info(struct radeon_device *rdev);
+extern u32 rv6xx_get_temp(struct radeon_device *rdev);
+extern u32 rv770_get_temp(struct radeon_device *rdev);
+extern u32 evergreen_get_temp(struct radeon_device *rdev);
 /*
 * Fences.
@@ -232,7 +235,7 @@ struct radeon_surface_reg {
 */
 struct radeon_mman {
        struct ttm_bo_global_ref        bo_global_ref;
-        struct ttm_global_reference     mem_global_ref;
+        struct drm_global_reference     mem_global_ref;
        struct ttm_bo_device            bdev;
        bool                            mem_global_referenced;
        bool                            initialized;
@@ -351,6 +354,7 @@ struct radeon_mc {
        int                     vram_mtrr;
        bool                    vram_is_ddr;
        bool                    igp_sideport_enabled;
+        u64                     gtt_base_align;
 };
 bool radeon_combios_sideport_present(struct radeon_device *rdev);
@@ -670,6 +674,13 @@ struct radeon_pm_profile {
        int dpms_on_cm_idx;
 };
+enum radeon_int_thermal_type {
+        THERMAL_TYPE_NONE,
+        THERMAL_TYPE_RV6XX,
+        THERMAL_TYPE_RV770,
+        THERMAL_TYPE_EVERGREEN,
+};
 struct radeon_voltage {
        enum radeon_voltage_type type;
        /* gpio voltage */
@@ -765,6 +776,9 @@ struct radeon_pm {
        enum radeon_pm_profile_type profile;
        int                     profile_index;
        struct radeon_pm_profile profiles[PM_PROFILE_MAX];
+        /* internal thermal controller on rv6xx+ */
+        enum radeon_int_thermal_type int_thermal_type;
+        struct device           *int_hwmon_dev;
 };
@@ -901,6 +915,7 @@ struct r600_asic {
        unsigned                tiling_nbanks;
        unsigned                tiling_npipes;
        unsigned                tiling_group_size;
+        unsigned                tile_config;
        struct r100_gpu_lockup  lockup;
 };
@@ -925,6 +940,7 @@ struct rv770_asic {
        unsigned                tiling_nbanks;
        unsigned                tiling_npipes;
        unsigned                tiling_group_size;
+        unsigned                tile_config;
        struct r100_gpu_lockup  lockup;
 };
@@ -950,6 +966,7 @@ struct evergreen_asic {
        unsigned tiling_nbanks;
        unsigned tiling_npipes;
        unsigned tiling_group_size;
+        unsigned tile_config;
 };
 union radeon_asic_config {
@@ -1032,6 +1049,9 @@ struct radeon_device {
        uint32_t                        pcie_reg_mask;
        radeon_rreg_t                   pciep_rreg;
        radeon_wreg_t                   pciep_wreg;
+        /* io port */
+        void __iomem                    *rio_mem;
+        resource_size_t                 rio_mem_size;
        struct radeon_clock             clock;
        struct radeon_mc                mc;
        struct radeon_gart              gart;
@@ -1068,6 +1088,7 @@ struct radeon_device {
        struct mutex vram_mutex;
        /* audio stuff */
+        bool                    audio_enabled;
        struct timer_list       audio_timer;
        int                     audio_channels;
        int                     audio_rate;
@@ -1077,6 +1098,8 @@ struct radeon_device {
        bool powered_down;
        struct notifier_block acpi_nb;
+        /* only one userspace can use Hyperz features at a time */
+        struct drm_file *hyperz_filp;
 };
 int radeon_device_init(struct radeon_device *rdev,
@@ -1113,6 +1136,26 @@ static inline void r100_mm_wreg(struct radeon_device *rdev, uint32_t reg, uint32
        }
 }
+static inline u32 r100_io_rreg(struct radeon_device *rdev, u32 reg)
+{
+        if (reg < rdev->rio_mem_size)
+                return ioread32(rdev->rio_mem + reg);
+        else {
+                iowrite32(reg, rdev->rio_mem + RADEON_MM_INDEX);
+                return ioread32(rdev->rio_mem + RADEON_MM_DATA);
+        }
+}
+static inline void r100_io_wreg(struct radeon_device *rdev, u32 reg, u32 v)
+{
+        if (reg < rdev->rio_mem_size)
+                iowrite32(v, rdev->rio_mem + reg);
+        else {
+                iowrite32(reg, rdev->rio_mem + RADEON_MM_INDEX);
+                iowrite32(v, rdev->rio_mem + RADEON_MM_DATA);
+        }
+}
 /*
 * Cast helper
 */
@@ -1151,6 +1194,8 @@ static inline void r100_mm_wreg(struct radeon_device *rdev, uint32_t reg, uint32
                WREG32_PLL(reg, tmp_);                          \
        } while (0)
 #define DREG32_SYS(sqf, rdev, reg) seq_printf((sqf), #reg " : 0x%08X\n", r100_mm_rreg((rdev), (reg)))
+#define RREG32_IO(reg) r100_io_rreg(rdev, (reg))
+#define WREG32_IO(reg, v) r100_io_wreg(rdev, (reg), (v))
 /*
 * Indirect registers accessor
@@ -1414,6 +1459,13 @@ extern void r700_cp_fini(struct radeon_device *rdev);
 extern void evergreen_disable_interrupt_state(struct radeon_device *rdev);
 extern int evergreen_irq_set(struct radeon_device *rdev);
+/* radeon_acpi.c */ 
+#if defined(CONFIG_ACPI) 
+extern int radeon_acpi_init(struct radeon_device *rdev); 
+#else 
+static inline int radeon_acpi_init(struct radeon_device *rdev) { return 0; } 
+#endif 
 /* evergreen */
 struct evergreen_mc_save {
        u32 vga_control[6];
diff --git a/drivers/gpu/drm/radeon/radeon_acpi.c b/drivers/gpu/drm/radeon/radeon_acpi.c
new file mode 100644
index 000000000000..3f6636bb2d7f
--- /dev/null
+++ b/drivers/gpu/drm/radeon/radeon_acpi.c
@@ -0,0 +1,67 @@
+#include <linux/pci.h>
+#include <linux/acpi.h>
+#include <linux/slab.h>
+#include <acpi/acpi_drivers.h>
+#include <acpi/acpi_bus.h>
+#include "drmP.h"
+#include "drm.h"
+#include "drm_sarea.h"
+#include "drm_crtc_helper.h"
+#include "radeon.h"
+#include <linux/vga_switcheroo.h>
+/* Call the ATIF method
+ *
+ * Note: currently we discard the output
+ */
+static int radeon_atif_call(acpi_handle handle)
+{
+        acpi_status status;
+        union acpi_object atif_arg_elements[2];
+        struct acpi_object_list atif_arg;
+        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL};
+        atif_arg.count = 2;
+        atif_arg.pointer = &atif_arg_elements[0];
+        atif_arg_elements[0].type = ACPI_TYPE_INTEGER;
+        atif_arg_elements[0].integer.value = 0;
+        atif_arg_elements[1].type = ACPI_TYPE_INTEGER;
+        atif_arg_elements[1].integer.value = 0;
+        status = acpi_evaluate_object(handle, "ATIF", &atif_arg, &buffer);
+        /* Fail only if calling the method fails and ATIF is supported */
+        if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
+                printk(KERN_DEBUG "failed to evaluate ATIF got %s\n", acpi_format_exception(status));
+                kfree(buffer.pointer);
+                return 1;
+        }
+        kfree(buffer.pointer);
+        return 0;
+}
+/* Call all ACPI methods here */
+int radeon_acpi_init(struct radeon_device *rdev)
+{
+        acpi_handle handle;
+        int ret;
+        /* No need to proceed if we're sure that ATIF is not supported */
+        if (!ASIC_IS_AVIVO(rdev) || !rdev->bios)
+                return 0;
+        /* Get the device handle */
+        handle = DEVICE_ACPI_HANDLE(&rdev->pdev->dev);
+        /* Call the ATIF method */
+        ret = radeon_atif_call(handle);
+        if (ret)
+                return ret;
+        return 0;
+}
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
index c0bbaa64157a..a5aff755f0d2 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.h
+++ b/drivers/gpu/drm/radeon/radeon_asic.h
@@ -113,6 +113,7 @@ void r100_wb_fini(struct radeon_device *rdev);
 int r100_wb_init(struct radeon_device *rdev);
 int r100_cp_reset(struct radeon_device *rdev);
 void r100_vga_render_disable(struct radeon_device *rdev);
+void r100_restore_sanity(struct radeon_device *rdev);
 int r100_cs_track_check_pkt3_indx_buffer(struct radeon_cs_parser *p,
                                         struct radeon_cs_packet *pkt,
                                         struct radeon_bo *robj);
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
index 99bd8a9c56b3..3bc2bcdf5308 100644
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -280,6 +280,15 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev,
                }
        }
+        /* ASUS HD 3600 board lists the DVI port as HDMI */
+        if ((dev->pdev->device == 0x9598) &&
+            (dev->pdev->subsystem_vendor == 0x1043) &&
+            (dev->pdev->subsystem_device == 0x01e4)) {
+                if (*connector_type == DRM_MODE_CONNECTOR_HDMIA) {
+                        *connector_type = DRM_MODE_CONNECTOR_DVII;
+                }
+        }
        /* ASUS HD 3450 board lists the DVI port as HDMI */
        if ((dev->pdev->device == 0x95C5) &&
            (dev->pdev->subsystem_vendor == 0x1043) &&
@@ -714,7 +723,7 @@ bool radeon_get_atom_connector_info_from_supported_devices_table(struct
                }
                if (i == ATOM_DEVICE_CV_INDEX) {
-                        DRM_DEBUG("Skipping Component Video\n");
+                        DRM_DEBUG_KMS("Skipping Component Video\n");
                        continue;
                }
@@ -1023,13 +1032,17 @@ bool radeon_atombios_sideport_present(struct radeon_device *rdev)
        u8 frev, crev;
        u16 data_offset;
+        /* sideport is AMD only */
+        if (rdev->family == CHIP_RS600)
+                return false;
        if (atom_parse_data_header(mode_info->atom_context, index, NULL,
                                   &frev, &crev, &data_offset)) {
                igp_info = (union igp_info *)(mode_info->atom_context->bios +
                                      data_offset);
                switch (crev) {
                case 1:
-                        if (igp_info->info.ucMemoryType & 0xf0)
+                        if (igp_info->info.ulBootUpMemoryClock)
                                return true;
                        break;
                case 2:
@@ -1079,7 +1092,7 @@ bool radeon_atombios_get_tmds_info(struct radeon_encoder *encoder,
                            (tmds_info->asMiscInfo[i].
                             ucPLL_VoltageSwing & 0xf) << 16;
-                        DRM_DEBUG("TMDS PLL From ATOMBIOS %u %x\n",
+                        DRM_DEBUG_KMS("TMDS PLL From ATOMBIOS %u %x\n",
                                  tmds->tmds_pll[i].freq,
                                  tmds->tmds_pll[i].value);
@@ -1773,14 +1786,22 @@ void radeon_atombios_get_power_modes(struct radeon_device *rdev)
                        }
                        /* add the i2c bus for thermal/fan chip */
-                        /* no support for internal controller yet */
                        if (controller->ucType > 0) {
-                                if ((controller->ucType == ATOM_PP_THERMALCONTROLLER_RV6xx) ||
+                                if (controller->ucType == ATOM_PP_THERMALCONTROLLER_RV6xx) {
-                                    (controller->ucType == ATOM_PP_THERMALCONTROLLER_RV770) ||
+                                        DRM_INFO("Internal thermal controller %s fan control\n",
-                                    (controller->ucType == ATOM_PP_THERMALCONTROLLER_EVERGREEN)) {
+                                                 (controller->ucFanParameters &
+                                                  ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with");
+                                        rdev->pm.int_thermal_type = THERMAL_TYPE_RV6XX;
+                                } else if (controller->ucType == ATOM_PP_THERMALCONTROLLER_RV770) {
+                                        DRM_INFO("Internal thermal controller %s fan control\n",
+                                                 (controller->ucFanParameters &
+                                                  ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with");
+                                        rdev->pm.int_thermal_type = THERMAL_TYPE_RV770;
+                                } else if (controller->ucType == ATOM_PP_THERMALCONTROLLER_EVERGREEN) {
                                        DRM_INFO("Internal thermal controller %s fan control\n",
                                                 (controller->ucFanParameters &
                                                  ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with");
+                                        rdev->pm.int_thermal_type = THERMAL_TYPE_EVERGREEN;
                                } else if ((controller->ucType ==
                                            ATOM_PP_THERMALCONTROLLER_EXTERNAL_GPIO) ||
                                           (controller->ucType ==
@@ -2163,11 +2184,11 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector,
        if ((radeon_encoder->devices & ATOM_DEVICE_TV1_SUPPORT) &&
            (radeon_connector->devices & ATOM_DEVICE_TV1_SUPPORT)) {
                if (connected) {
-                        DRM_DEBUG("TV1 connected\n");
+                        DRM_DEBUG_KMS("TV1 connected\n");
                        bios_3_scratch |= ATOM_S3_TV1_ACTIVE;
                        bios_6_scratch |= ATOM_S6_ACC_REQ_TV1;
                } else {
-                        DRM_DEBUG("TV1 disconnected\n");
+                        DRM_DEBUG_KMS("TV1 disconnected\n");
                        bios_0_scratch &= ~ATOM_S0_TV1_MASK;
                        bios_3_scratch &= ~ATOM_S3_TV1_ACTIVE;
                        bios_6_scratch &= ~ATOM_S6_ACC_REQ_TV1;
@@ -2176,11 +2197,11 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector,
        if ((radeon_encoder->devices & ATOM_DEVICE_CV_SUPPORT) &&
            (radeon_connector->devices & ATOM_DEVICE_CV_SUPPORT)) {
                if (connected) {
-                        DRM_DEBUG("CV connected\n");
+                        DRM_DEBUG_KMS("CV connected\n");
                        bios_3_scratch |= ATOM_S3_CV_ACTIVE;
                        bios_6_scratch |= ATOM_S6_ACC_REQ_CV;
                } else {
-                        DRM_DEBUG("CV disconnected\n");
+                        DRM_DEBUG_KMS("CV disconnected\n");
                        bios_0_scratch &= ~ATOM_S0_CV_MASK;
                        bios_3_scratch &= ~ATOM_S3_CV_ACTIVE;
                        bios_6_scratch &= ~ATOM_S6_ACC_REQ_CV;
@@ -2189,12 +2210,12 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector,
        if ((radeon_encoder->devices & ATOM_DEVICE_LCD1_SUPPORT) &&
            (radeon_connector->devices & ATOM_DEVICE_LCD1_SUPPORT)) {
                if (connected) {
-                        DRM_DEBUG("LCD1 connected\n");
+                        DRM_DEBUG_KMS("LCD1 connected\n");
                        bios_0_scratch |= ATOM_S0_LCD1;
                        bios_3_scratch |= ATOM_S3_LCD1_ACTIVE;
                        bios_6_scratch |= ATOM_S6_ACC_REQ_LCD1;
                } else {
-                        DRM_DEBUG("LCD1 disconnected\n");
+                        DRM_DEBUG_KMS("LCD1 disconnected\n");
                        bios_0_scratch &= ~ATOM_S0_LCD1;
                        bios_3_scratch &= ~ATOM_S3_LCD1_ACTIVE;
                        bios_6_scratch &= ~ATOM_S6_ACC_REQ_LCD1;
@@ -2203,12 +2224,12 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector,
        if ((radeon_encoder->devices & ATOM_DEVICE_CRT1_SUPPORT) &&
            (radeon_connector->devices & ATOM_DEVICE_CRT1_SUPPORT)) {
                if (connected) {
-                        DRM_DEBUG("CRT1 connected\n");
+                        DRM_DEBUG_KMS("CRT1 connected\n");
                        bios_0_scratch |= ATOM_S0_CRT1_COLOR;
                        bios_3_scratch |= ATOM_S3_CRT1_ACTIVE;
                        bios_6_scratch |= ATOM_S6_ACC_REQ_CRT1;
                } else {
-                        DRM_DEBUG("CRT1 disconnected\n");
+                        DRM_DEBUG_KMS("CRT1 disconnected\n");
                        bios_0_scratch &= ~ATOM_S0_CRT1_MASK;
                        bios_3_scratch &= ~ATOM_S3_CRT1_ACTIVE;
                        bios_6_scratch &= ~ATOM_S6_ACC_REQ_CRT1;
@@ -2217,12 +2238,12 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector,
        if ((radeon_encoder->devices & ATOM_DEVICE_CRT2_SUPPORT) &&
            (radeon_connector->devices & ATOM_DEVICE_CRT2_SUPPORT)) {
                if (connected) {
-                        DRM_DEBUG("CRT2 connected\n");
+                        DRM_DEBUG_KMS("CRT2 connected\n");
                        bios_0_scratch |= ATOM_S0_CRT2_COLOR;
                        bios_3_scratch |= ATOM_S3_CRT2_ACTIVE;
                        bios_6_scratch |= ATOM_S6_ACC_REQ_CRT2;
                } else {
-                        DRM_DEBUG("CRT2 disconnected\n");
+                        DRM_DEBUG_KMS("CRT2 disconnected\n");
                        bios_0_scratch &= ~ATOM_S0_CRT2_MASK;
                        bios_3_scratch &= ~ATOM_S3_CRT2_ACTIVE;
                        bios_6_scratch &= ~ATOM_S6_ACC_REQ_CRT2;
@@ -2231,12 +2252,12 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector,
        if ((radeon_encoder->devices & ATOM_DEVICE_DFP1_SUPPORT) &&
            (radeon_connector->devices & ATOM_DEVICE_DFP1_SUPPORT)) {
                if (connected) {
-                        DRM_DEBUG("DFP1 connected\n");
+                        DRM_DEBUG_KMS("DFP1 connected\n");
                        bios_0_scratch |= ATOM_S0_DFP1;
                        bios_3_scratch |= ATOM_S3_DFP1_ACTIVE;
                        bios_6_scratch |= ATOM_S6_ACC_REQ_DFP1;
                } else {
-                        DRM_DEBUG("DFP1 disconnected\n");
+                        DRM_DEBUG_KMS("DFP1 disconnected\n");
                        bios_0_scratch &= ~ATOM_S0_DFP1;
                        bios_3_scratch &= ~ATOM_S3_DFP1_ACTIVE;
                        bios_6_scratch &= ~ATOM_S6_ACC_REQ_DFP1;
@@ -2245,12 +2266,12 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector,
        if ((radeon_encoder->devices & ATOM_DEVICE_DFP2_SUPPORT) &&
            (radeon_connector->devices & ATOM_DEVICE_DFP2_SUPPORT)) {
                if (connected) {
-                        DRM_DEBUG("DFP2 connected\n");
+                        DRM_DEBUG_KMS("DFP2 connected\n");
                        bios_0_scratch |= ATOM_S0_DFP2;
                        bios_3_scratch |= ATOM_S3_DFP2_ACTIVE;
                        bios_6_scratch |= ATOM_S6_ACC_REQ_DFP2;
                } else {
-                        DRM_DEBUG("DFP2 disconnected\n");
+                        DRM_DEBUG_KMS("DFP2 disconnected\n");
                        bios_0_scratch &= ~ATOM_S0_DFP2;
                        bios_3_scratch &= ~ATOM_S3_DFP2_ACTIVE;
                        bios_6_scratch &= ~ATOM_S6_ACC_REQ_DFP2;
@@ -2259,12 +2280,12 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector,
        if ((radeon_encoder->devices & ATOM_DEVICE_DFP3_SUPPORT) &&
            (radeon_connector->devices & ATOM_DEVICE_DFP3_SUPPORT)) {
                if (connected) {
-                        DRM_DEBUG("DFP3 connected\n");
+                        DRM_DEBUG_KMS("DFP3 connected\n");
                        bios_0_scratch |= ATOM_S0_DFP3;
                        bios_3_scratch |= ATOM_S3_DFP3_ACTIVE;
                        bios_6_scratch |= ATOM_S6_ACC_REQ_DFP3;
                } else {
-                        DRM_DEBUG("DFP3 disconnected\n");
+                        DRM_DEBUG_KMS("DFP3 disconnected\n");
                        bios_0_scratch &= ~ATOM_S0_DFP3;
                        bios_3_scratch &= ~ATOM_S3_DFP3_ACTIVE;
                        bios_6_scratch &= ~ATOM_S6_ACC_REQ_DFP3;
@@ -2273,12 +2294,12 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector,
        if ((radeon_encoder->devices & ATOM_DEVICE_DFP4_SUPPORT) &&
            (radeon_connector->devices & ATOM_DEVICE_DFP4_SUPPORT)) {
                if (connected) {
-                        DRM_DEBUG("DFP4 connected\n");
+                        DRM_DEBUG_KMS("DFP4 connected\n");
                        bios_0_scratch |= ATOM_S0_DFP4;
                        bios_3_scratch |= ATOM_S3_DFP4_ACTIVE;
                        bios_6_scratch |= ATOM_S6_ACC_REQ_DFP4;
                } else {
-                        DRM_DEBUG("DFP4 disconnected\n");
+                        DRM_DEBUG_KMS("DFP4 disconnected\n");
                        bios_0_scratch &= ~ATOM_S0_DFP4;
                        bios_3_scratch &= ~ATOM_S3_DFP4_ACTIVE;
                        bios_6_scratch &= ~ATOM_S6_ACC_REQ_DFP4;
@@ -2287,12 +2308,12 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector,
        if ((radeon_encoder->devices & ATOM_DEVICE_DFP5_SUPPORT) &&
            (radeon_connector->devices & ATOM_DEVICE_DFP5_SUPPORT)) {
                if (connected) {
-                        DRM_DEBUG("DFP5 connected\n");
+                        DRM_DEBUG_KMS("DFP5 connected\n");
                        bios_0_scratch |= ATOM_S0_DFP5;
                        bios_3_scratch |= ATOM_S3_DFP5_ACTIVE;
                        bios_6_scratch |= ATOM_S6_ACC_REQ_DFP5;
                } else {
-                        DRM_DEBUG("DFP5 disconnected\n");
+                        DRM_DEBUG_KMS("DFP5 disconnected\n");
                        bios_0_scratch &= ~ATOM_S0_DFP5;
                        bios_3_scratch &= ~ATOM_S3_DFP5_ACTIVE;
                        bios_6_scratch &= ~ATOM_S6_ACC_REQ_DFP5;
diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c
index 2c9213739999..654787ec43f4 100644
--- a/drivers/gpu/drm/radeon/radeon_bios.c
+++ b/drivers/gpu/drm/radeon/radeon_bios.c
@@ -53,7 +53,7 @@ static bool igp_read_bios_from_vram(struct radeon_device *rdev)
                        return false;
        rdev->bios = NULL;
-        vram_base = drm_get_resource_start(rdev->ddev, 0);
+        vram_base = pci_resource_start(rdev->pdev, 0);
        bios = ioremap(vram_base, size);
        if (!bios) {
                return false;
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
index d1c1d8dd93ce..5e1474cde4b4 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -693,6 +693,10 @@ bool radeon_combios_sideport_present(struct radeon_device *rdev)
        struct drm_device *dev = rdev->ddev;
        u16 igp_info;
+        /* sideport is AMD only */
+        if (rdev->family == CHIP_RS400)
+                return false;
        igp_info = combios_get_table_offset(dev, COMBIOS_INTEGRATED_SYSTEM_INFO_TABLE);
        if (igp_info) {
@@ -1205,7 +1209,7 @@ bool radeon_legacy_get_tmds_info_from_combios(struct radeon_encoder *encoder,
                                    RBIOS32(tmds_info + i * 10 + 0x08);
                                tmds->tmds_pll[i].freq =
                                    RBIOS16(tmds_info + i * 10 + 0x10);
-                                DRM_DEBUG("TMDS PLL From COMBIOS %u %x\n",
+                                DRM_DEBUG_KMS("TMDS PLL From COMBIOS %u %x\n",
                                          tmds->tmds_pll[i].freq,
                                          tmds->tmds_pll[i].value);
                        }
@@ -1223,7 +1227,7 @@ bool radeon_legacy_get_tmds_info_from_combios(struct radeon_encoder *encoder,
                                        stride += 10;
                                else
                                        stride += 6;
-                                DRM_DEBUG("TMDS PLL From COMBIOS %u %x\n",
+                                DRM_DEBUG_KMS("TMDS PLL From COMBIOS %u %x\n",
                                          tmds->tmds_pll[i].freq,
                                          tmds->tmds_pll[i].value);
                        }
@@ -2208,7 +2212,7 @@ bool radeon_get_legacy_connector_info_from_bios(struct drm_device *dev)
                uint16_t tmds_info =
                    combios_get_table_offset(dev, COMBIOS_DFP_INFO_TABLE);
                if (tmds_info) {
-                        DRM_DEBUG("Found DFP table, assuming DVI connector\n");
+                        DRM_DEBUG_KMS("Found DFP table, assuming DVI connector\n");
                        radeon_add_legacy_encoder(dev,
                                                  radeon_get_encoder_id(dev,
@@ -2234,7 +2238,7 @@ bool radeon_get_legacy_connector_info_from_bios(struct drm_device *dev)
                } else {
                        uint16_t crt_info =
                                combios_get_table_offset(dev, COMBIOS_CRT_INFO_TABLE);
-                        DRM_DEBUG("Found CRT table, assuming VGA connector\n");
+                        DRM_DEBUG_KMS("Found CRT table, assuming VGA connector\n");
                        if (crt_info) {
                                radeon_add_legacy_encoder(dev,
                                                          radeon_get_encoder_id(dev,
@@ -2251,7 +2255,7 @@ bool radeon_get_legacy_connector_info_from_bios(struct drm_device *dev)
                                                            CONNECTOR_OBJECT_ID_VGA,
                                                            &hpd);
                        } else {
-                                DRM_DEBUG("No connector info found\n");
+                                DRM_DEBUG_KMS("No connector info found\n");
                                return false;
                        }
                }
@@ -2340,7 +2344,7 @@ bool radeon_get_legacy_connector_info_from_bios(struct drm_device *dev)
                                        ddc_i2c.valid = false;
                                        break;
                                }
-                                DRM_DEBUG("LCD DDC Info Table found!\n");
+                                DRM_DEBUG_KMS("LCD DDC Info Table found!\n");
                        } else
                                ddc_i2c.valid = false;
@@ -2941,9 +2945,8 @@ static void combios_write_ram_size(struct drm_device *dev)
                if (rev < 3) {
                        mem_cntl = RBIOS32(offset + 1);
                        mem_size = RBIOS16(offset + 5);
-                        if (((rdev->flags & RADEON_FAMILY_MASK) < CHIP_R200) &&
+                        if ((rdev->family < CHIP_R200) &&
-                            ((dev->pdev->device != 0x515e)
+                            !ASIC_IS_RN50(rdev))
-                             && (dev->pdev->device != 0x5969)))
                                WREG32(RADEON_MEM_CNTL, mem_cntl);
                }
        }
@@ -2954,10 +2957,8 @@ static void combios_write_ram_size(struct drm_device *dev)
                if (offset) {
                        rev = RBIOS8(offset - 1);
                        if (rev < 1) {
-                                if (((rdev->flags & RADEON_FAMILY_MASK) <
+                                if ((rdev->family < CHIP_R200)
-                                     CHIP_R200)
+                                    && !ASIC_IS_RN50(rdev)) {
-                                    && ((dev->pdev->device != 0x515e)
-                                        && (dev->pdev->device != 0x5969))) {
                                        int ram = 0;
                                        int mem_addr_mapping = 0;
@@ -3050,6 +3051,14 @@ void radeon_combios_asic_init(struct drm_device *dev)
            rdev->pdev->subsystem_device == 0x308b)
                return;
+        /* quirk for rs4xx HP dv5000 laptop to make it resume
+         * - it hangs on resume inside the dynclk 1 table.
+         */
+        if (rdev->family == CHIP_RS480 &&
+            rdev->pdev->subsystem_vendor == 0x103c &&
+            rdev->pdev->subsystem_device == 0x30a4)
+                return;
        /* DYN CLK 1 */
        table = combios_get_table_offset(dev, COMBIOS_DYN_CLK_1_TABLE);
        if (table)
@@ -3113,14 +3122,14 @@ radeon_combios_connected_scratch_regs(struct drm_connector *connector,
        if ((radeon_encoder->devices & ATOM_DEVICE_TV1_SUPPORT) &&
            (radeon_connector->devices & ATOM_DEVICE_TV1_SUPPORT)) {
                if (connected) {
-                        DRM_DEBUG("TV1 connected\n");
+                        DRM_DEBUG_KMS("TV1 connected\n");
                        /* fix me */
                        bios_4_scratch |= RADEON_TV1_ATTACHED_SVIDEO;
                        /*save->bios_4_scratch |= RADEON_TV1_ATTACHED_COMP; */
                        bios_5_scratch |= RADEON_TV1_ON;
                        bios_5_scratch |= RADEON_ACC_REQ_TV1;
                } else {
-                        DRM_DEBUG("TV1 disconnected\n");
+                        DRM_DEBUG_KMS("TV1 disconnected\n");
                        bios_4_scratch &= ~RADEON_TV1_ATTACHED_MASK;
                        bios_5_scratch &= ~RADEON_TV1_ON;
                        bios_5_scratch &= ~RADEON_ACC_REQ_TV1;
@@ -3129,12 +3138,12 @@ radeon_combios_connected_scratch_regs(struct drm_connector *connector,
        if ((radeon_encoder->devices & ATOM_DEVICE_LCD1_SUPPORT) &&
            (radeon_connector->devices & ATOM_DEVICE_LCD1_SUPPORT)) {
                if (connected) {
-                        DRM_DEBUG("LCD1 connected\n");
+                        DRM_DEBUG_KMS("LCD1 connected\n");
                        bios_4_scratch |= RADEON_LCD1_ATTACHED;
                        bios_5_scratch |= RADEON_LCD1_ON;
                        bios_5_scratch |= RADEON_ACC_REQ_LCD1;
                } else {
-                        DRM_DEBUG("LCD1 disconnected\n");
+                        DRM_DEBUG_KMS("LCD1 disconnected\n");
                        bios_4_scratch &= ~RADEON_LCD1_ATTACHED;
                        bios_5_scratch &= ~RADEON_LCD1_ON;
                        bios_5_scratch &= ~RADEON_ACC_REQ_LCD1;
@@ -3143,12 +3152,12 @@ radeon_combios_connected_scratch_regs(struct drm_connector *connector,
        if ((radeon_encoder->devices & ATOM_DEVICE_CRT1_SUPPORT) &&
            (radeon_connector->devices & ATOM_DEVICE_CRT1_SUPPORT)) {
                if (connected) {
-                        DRM_DEBUG("CRT1 connected\n");
+                        DRM_DEBUG_KMS("CRT1 connected\n");
                        bios_4_scratch |= RADEON_CRT1_ATTACHED_COLOR;
                        bios_5_scratch |= RADEON_CRT1_ON;
                        bios_5_scratch |= RADEON_ACC_REQ_CRT1;
                } else {
-                        DRM_DEBUG("CRT1 disconnected\n");
+                        DRM_DEBUG_KMS("CRT1 disconnected\n");
                        bios_4_scratch &= ~RADEON_CRT1_ATTACHED_MASK;
                        bios_5_scratch &= ~RADEON_CRT1_ON;
                        bios_5_scratch &= ~RADEON_ACC_REQ_CRT1;
@@ -3157,12 +3166,12 @@ radeon_combios_connected_scratch_regs(struct drm_connector *connector,
        if ((radeon_encoder->devices & ATOM_DEVICE_CRT2_SUPPORT) &&
            (radeon_connector->devices & ATOM_DEVICE_CRT2_SUPPORT)) {
                if (connected) {
-                        DRM_DEBUG("CRT2 connected\n");
+                        DRM_DEBUG_KMS("CRT2 connected\n");
                        bios_4_scratch |= RADEON_CRT2_ATTACHED_COLOR;
                        bios_5_scratch |= RADEON_CRT2_ON;
                        bios_5_scratch |= RADEON_ACC_REQ_CRT2;
                } else {
-                        DRM_DEBUG("CRT2 disconnected\n");
+                        DRM_DEBUG_KMS("CRT2 disconnected\n");
                        bios_4_scratch &= ~RADEON_CRT2_ATTACHED_MASK;
                        bios_5_scratch &= ~RADEON_CRT2_ON;
                        bios_5_scratch &= ~RADEON_ACC_REQ_CRT2;
@@ -3171,12 +3180,12 @@ radeon_combios_connected_scratch_regs(struct drm_connector *connector,
        if ((radeon_encoder->devices & ATOM_DEVICE_DFP1_SUPPORT) &&
            (radeon_connector->devices & ATOM_DEVICE_DFP1_SUPPORT)) {
                if (connected) {
-                        DRM_DEBUG("DFP1 connected\n");
+                        DRM_DEBUG_KMS("DFP1 connected\n");
                        bios_4_scratch |= RADEON_DFP1_ATTACHED;
                        bios_5_scratch |= RADEON_DFP1_ON;
                        bios_5_scratch |= RADEON_ACC_REQ_DFP1;
                } else {
-                        DRM_DEBUG("DFP1 disconnected\n");
+                        DRM_DEBUG_KMS("DFP1 disconnected\n");
                        bios_4_scratch &= ~RADEON_DFP1_ATTACHED;
                        bios_5_scratch &= ~RADEON_DFP1_ON;
                        bios_5_scratch &= ~RADEON_ACC_REQ_DFP1;
@@ -3185,12 +3194,12 @@ radeon_combios_connected_scratch_regs(struct drm_connector *connector,
        if ((radeon_encoder->devices & ATOM_DEVICE_DFP2_SUPPORT) &&
            (radeon_connector->devices & ATOM_DEVICE_DFP2_SUPPORT)) {
                if (connected) {
-                        DRM_DEBUG("DFP2 connected\n");
+                        DRM_DEBUG_KMS("DFP2 connected\n");
                        bios_4_scratch |= RADEON_DFP2_ATTACHED;
                        bios_5_scratch |= RADEON_DFP2_ON;
                        bios_5_scratch |= RADEON_ACC_REQ_DFP2;
                } else {
-                        DRM_DEBUG("DFP2 disconnected\n");
+                        DRM_DEBUG_KMS("DFP2 disconnected\n");
                        bios_4_scratch &= ~RADEON_DFP2_ATTACHED;
                        bios_5_scratch &= ~RADEON_DFP2_ON;
                        bios_5_scratch &= ~RADEON_ACC_REQ_DFP2;
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 0c7ccc6961a3..2395c8600cf4 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -214,7 +214,7 @@ static struct drm_display_mode *radeon_fp_native_mode(struct drm_encoder *encode
                mode->type = DRM_MODE_TYPE_PREFERRED | DRM_MODE_TYPE_DRIVER;
                drm_mode_set_name(mode);
-                DRM_DEBUG("Adding native panel mode %s\n", mode->name);
+                DRM_DEBUG_KMS("Adding native panel mode %s\n", mode->name);
        } else if (native_mode->hdisplay != 0 &&
                   native_mode->vdisplay != 0) {
                /* mac laptops without an edid */
@@ -226,7 +226,7 @@ static struct drm_display_mode *radeon_fp_native_mode(struct drm_encoder *encode
                 */
                mode = drm_cvt_mode(dev, native_mode->hdisplay, native_mode->vdisplay, 60, true, false, false);
                mode->type = DRM_MODE_TYPE_PREFERRED | DRM_MODE_TYPE_DRIVER;
-                DRM_DEBUG("Adding cvt approximation of native panel mode %s\n", mode->name);
+                DRM_DEBUG_KMS("Adding cvt approximation of native panel mode %s\n", mode->name);
        }
        return mode;
 }
@@ -312,6 +312,20 @@ int radeon_connector_set_property(struct drm_connector *connector, struct drm_pr
                }
        }
+        if (property == rdev->mode_info.underscan_property) {
+                /* need to find digital encoder on connector */
+                encoder = radeon_find_encoder(connector, DRM_MODE_ENCODER_TMDS);
+                if (!encoder)
+                        return 0;
+                radeon_encoder = to_radeon_encoder(encoder);
+                if (radeon_encoder->underscan_type != val) {
+                        radeon_encoder->underscan_type = val;
+                        radeon_property_change_mode(&radeon_encoder->base);
+                }
+        }
        if (property == rdev->mode_info.tv_std_property) {
                encoder = radeon_find_encoder(connector, DRM_MODE_ENCODER_TVDAC);
                if (!encoder) {
@@ -522,7 +536,7 @@ static int radeon_lvds_set_property(struct drm_connector *connector,
        struct radeon_encoder *radeon_encoder;
        enum radeon_rmx_type rmx_type;
-        DRM_DEBUG("\n");
+        DRM_DEBUG_KMS("\n");
        if (property != dev->mode_config.scaling_mode_property)
                return 0;
@@ -771,30 +785,27 @@ static enum drm_connector_status radeon_dvi_detect(struct drm_connector *connect
                        } else
                                ret = connector_status_connected;
-                        /* multiple connectors on the same encoder with the same ddc line
+                        /* This gets complicated.  We have boards with VGA + HDMI with a
-                         * This tends to be HDMI and DVI on the same encoder with the
+                         * shared DDC line and we have boards with DVI-D + HDMI with a shared
-                         * same ddc line.  If the edid says HDMI, consider the HDMI port
+                         * DDC line.  The latter is more complex because with DVI<->HDMI adapters
-                         * connected and the DVI port disconnected.  If the edid doesn't
+                         * you don't really know what's connected to which port as both are digital.
-                         * say HDMI, vice versa.
                         */
                        if (radeon_connector->shared_ddc && (ret == connector_status_connected)) {
                                struct drm_device *dev = connector->dev;
+                                struct radeon_device *rdev = dev->dev_private;
                                struct drm_connector *list_connector;
                                struct radeon_connector *list_radeon_connector;
                                list_for_each_entry(list_connector, &dev->mode_config.connector_list, head) {
                                        if (connector == list_connector)
                                                continue;
                                        list_radeon_connector = to_radeon_connector(list_connector);
-                                        if (radeon_connector->devices == list_radeon_connector->devices) {
+                                        if (list_radeon_connector->shared_ddc &&
-                                                if (drm_detect_hdmi_monitor(radeon_connector->edid)) {
+                                            (list_radeon_connector->ddc_bus->rec.i2c_id ==
-                                                        if (connector->connector_type == DRM_MODE_CONNECTOR_DVID) {
+                                             radeon_connector->ddc_bus->rec.i2c_id)) {
-                                                                kfree(radeon_connector->edid);
+                                                /* cases where both connectors are digital */
-                                                                radeon_connector->edid = NULL;
+                                                if (list_connector->connector_type != DRM_MODE_CONNECTOR_VGA) {
-                                                                ret = connector_status_disconnected;
+                                                        /* hpd is our only option in this case */
-                                                        }
+                                                        if (!radeon_hpd_sense(rdev, radeon_connector->hpd.hpd)) {
-                                                } else {
-                                                        if ((connector->connector_type == DRM_MODE_CONNECTOR_HDMIA) ||
-                                                            (connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)) {
                                                                kfree(radeon_connector->edid);
                                                                radeon_connector->edid = NULL;
                                                                ret = connector_status_disconnected;
@@ -1085,6 +1096,8 @@ radeon_add_atom_connector(struct drm_device *dev,
                drm_connector_attach_property(&radeon_connector->base,
                                              rdev->mode_info.load_detect_property,
                                              1);
+                /* no HPD on analog connectors */
+                radeon_connector->hpd.hpd = RADEON_HPD_NONE;
                connector->polled = DRM_CONNECTOR_POLL_CONNECT;
                break;
        case DRM_MODE_CONNECTOR_DVIA:
@@ -1099,6 +1112,8 @@ radeon_add_atom_connector(struct drm_device *dev,
                drm_connector_attach_property(&radeon_connector->base,
                                              rdev->mode_info.load_detect_property,
                                              1);
+                /* no HPD on analog connectors */
+                radeon_connector->hpd.hpd = RADEON_HPD_NONE;
                break;
        case DRM_MODE_CONNECTOR_DVII:
        case DRM_MODE_CONNECTOR_DVID:
@@ -1119,6 +1134,10 @@ radeon_add_atom_connector(struct drm_device *dev,
                drm_connector_attach_property(&radeon_connector->base,
                                              rdev->mode_info.coherent_mode_property,
                                              1);
+                if (ASIC_IS_AVIVO(rdev))
+                        drm_connector_attach_property(&radeon_connector->base,
+                                                      rdev->mode_info.underscan_property,
+                                                      UNDERSCAN_AUTO);
                if (connector_type == DRM_MODE_CONNECTOR_DVII) {
                        radeon_connector->dac_load_detect = true;
                        drm_connector_attach_property(&radeon_connector->base,
@@ -1144,6 +1163,10 @@ radeon_add_atom_connector(struct drm_device *dev,
                drm_connector_attach_property(&radeon_connector->base,
                                              rdev->mode_info.coherent_mode_property,
                                              1);
+                if (ASIC_IS_AVIVO(rdev))
+                        drm_connector_attach_property(&radeon_connector->base,
+                                                      rdev->mode_info.underscan_property,
+                                                      UNDERSCAN_AUTO);
                subpixel_order = SubPixelHorizontalRGB;
                break;
        case DRM_MODE_CONNECTOR_DisplayPort:
@@ -1175,6 +1198,10 @@ radeon_add_atom_connector(struct drm_device *dev,
                drm_connector_attach_property(&radeon_connector->base,
                                              rdev->mode_info.coherent_mode_property,
                                              1);
+                if (ASIC_IS_AVIVO(rdev))
+                        drm_connector_attach_property(&radeon_connector->base,
+                                                      rdev->mode_info.underscan_property,
+                                                      UNDERSCAN_AUTO);
                break;
        case DRM_MODE_CONNECTOR_SVIDEO:
        case DRM_MODE_CONNECTOR_Composite:
@@ -1189,6 +1216,8 @@ radeon_add_atom_connector(struct drm_device *dev,
                        drm_connector_attach_property(&radeon_connector->base,
                                                      rdev->mode_info.tv_std_property,
                                                      radeon_atombios_get_tv_info(rdev));
+                        /* no HPD on analog connectors */
+                        radeon_connector->hpd.hpd = RADEON_HPD_NONE;
                }
                break;
        case DRM_MODE_CONNECTOR_LVDS:
@@ -1212,7 +1241,7 @@ radeon_add_atom_connector(struct drm_device *dev,
                break;
        }
-        if (hpd->hpd == RADEON_HPD_NONE) {
+        if (radeon_connector->hpd.hpd == RADEON_HPD_NONE) {
                if (i2c_bus->valid)
                        connector->polled = DRM_CONNECTOR_POLL_CONNECT;
        } else
@@ -1279,6 +1308,8 @@ radeon_add_legacy_connector(struct drm_device *dev,
                drm_connector_attach_property(&radeon_connector->base,
                                              rdev->mode_info.load_detect_property,
                                              1);
+                /* no HPD on analog connectors */
+                radeon_connector->hpd.hpd = RADEON_HPD_NONE;
                connector->polled = DRM_CONNECTOR_POLL_CONNECT;
                break;
        case DRM_MODE_CONNECTOR_DVIA:
@@ -1293,6 +1324,8 @@ radeon_add_legacy_connector(struct drm_device *dev,
                drm_connector_attach_property(&radeon_connector->base,
                                              rdev->mode_info.load_detect_property,
                                              1);
+                /* no HPD on analog connectors */
+                radeon_connector->hpd.hpd = RADEON_HPD_NONE;
                break;
        case DRM_MODE_CONNECTOR_DVII:
        case DRM_MODE_CONNECTOR_DVID:
@@ -1331,6 +1364,8 @@ radeon_add_legacy_connector(struct drm_device *dev,
                        drm_connector_attach_property(&radeon_connector->base,
                                                      rdev->mode_info.tv_std_property,
                                                      radeon_combios_get_tv_info(rdev));
+                        /* no HPD on analog connectors */
+                        radeon_connector->hpd.hpd = RADEON_HPD_NONE;
                }
                break;
        case DRM_MODE_CONNECTOR_LVDS:
@@ -1348,7 +1383,7 @@ radeon_add_legacy_connector(struct drm_device *dev,
                break;
        }
-        if (hpd->hpd == RADEON_HPD_NONE) {
+        if (radeon_connector->hpd.hpd == RADEON_HPD_NONE) {
                if (i2c_bus->valid)
                        connector->polled = DRM_CONNECTOR_POLL_CONNECT;
        } else
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
index 2f042a3c0e62..eb6b9eed7349 100644
--- a/drivers/gpu/drm/radeon/radeon_cp.c
+++ b/drivers/gpu/drm/radeon/radeon_cp.c
@@ -2120,8 +2120,8 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
        else
                dev_priv->flags |= RADEON_IS_PCI;
-        ret = drm_addmap(dev, drm_get_resource_start(dev, 2),
+        ret = drm_addmap(dev, pci_resource_start(dev->pdev, 2),
-                         drm_get_resource_len(dev, 2), _DRM_REGISTERS,
+                         pci_resource_len(dev->pdev, 2), _DRM_REGISTERS,
                         _DRM_READ_ONLY | _DRM_DRIVER, &dev_priv->mmio);
        if (ret != 0)
                return ret;
@@ -2194,9 +2194,9 @@ int radeon_driver_firstopen(struct drm_device *dev)
        dev_priv->gart_info.table_size = RADEON_PCIGART_TABLE_SIZE;
-        dev_priv->fb_aper_offset = drm_get_resource_start(dev, 0);
+        dev_priv->fb_aper_offset = pci_resource_start(dev->pdev, 0);
        ret = drm_addmap(dev, dev_priv->fb_aper_offset,
-                         drm_get_resource_len(dev, 0), _DRM_FRAME_BUFFER,
+                         pci_resource_len(dev->pdev, 0), _DRM_FRAME_BUFFER,
                         _DRM_WRITE_COMBINING, &map);
        if (ret != 0)
                return ret;
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 5f317317aba2..a64811a94519 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -226,20 +226,20 @@ void radeon_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc)
 {
        u64 size_af, size_bf;
-        size_af = 0xFFFFFFFF - mc->vram_end;
+        size_af = ((0xFFFFFFFF - mc->vram_end) + mc->gtt_base_align) & ~mc->gtt_base_align;
-        size_bf = mc->vram_start;
+        size_bf = mc->vram_start & ~mc->gtt_base_align;
        if (size_bf > size_af) {
                if (mc->gtt_size > size_bf) {
                        dev_warn(rdev->dev, "limiting GTT\n");
                        mc->gtt_size = size_bf;
                }
-                mc->gtt_start = mc->vram_start - mc->gtt_size;
+                mc->gtt_start = (mc->vram_start & ~mc->gtt_base_align) - mc->gtt_size;
        } else {
                if (mc->gtt_size > size_af) {
                        dev_warn(rdev->dev, "limiting GTT\n");
                        mc->gtt_size = size_af;
                }
-                mc->gtt_start = mc->vram_end + 1;
+                mc->gtt_start = (mc->vram_end + 1 + mc->gtt_base_align) & ~mc->gtt_base_align;
        }
        mc->gtt_end = mc->gtt_start + mc->gtt_size - 1;
        dev_info(rdev->dev, "GTT: %lluM 0x%08llX - 0x%08llX\n",
@@ -415,6 +415,22 @@ static uint32_t cail_reg_read(struct card_info *info, uint32_t reg)
        return r;
 }
+static void cail_ioreg_write(struct card_info *info, uint32_t reg, uint32_t val)
+{
+        struct radeon_device *rdev = info->dev->dev_private;
+        WREG32_IO(reg*4, val);
+}
+static uint32_t cail_ioreg_read(struct card_info *info, uint32_t reg)
+{
+        struct radeon_device *rdev = info->dev->dev_private;
+        uint32_t r;
+        r = RREG32_IO(reg*4);
+        return r;
+}
 int radeon_atombios_init(struct radeon_device *rdev)
 {
        struct card_info *atom_card_info =
@@ -427,6 +443,15 @@ int radeon_atombios_init(struct radeon_device *rdev)
        atom_card_info->dev = rdev->ddev;
        atom_card_info->reg_read = cail_reg_read;
        atom_card_info->reg_write = cail_reg_write;
+        /* needed for iio ops */
+        if (rdev->rio_mem) {
+                atom_card_info->ioreg_read = cail_ioreg_read;
+                atom_card_info->ioreg_write = cail_ioreg_write;
+        } else {
+                DRM_ERROR("Unable to find PCI I/O BAR; using MMIO for ATOM IIO\n");
+                atom_card_info->ioreg_read = cail_reg_read;
+                atom_card_info->ioreg_write = cail_reg_write;
+        }
        atom_card_info->mc_read = cail_mc_read;
        atom_card_info->mc_write = cail_mc_write;
        atom_card_info->pll_read = cail_pll_read;
@@ -573,7 +598,7 @@ int radeon_device_init(struct radeon_device *rdev,
                       struct pci_dev *pdev,
                       uint32_t flags)
 {
-        int r;
+        int r, i;
        int dma_bits;
        rdev->shutdown = false;
@@ -650,8 +675,8 @@ int radeon_device_init(struct radeon_device *rdev,
        /* Registers mapping */
        /* TODO: block userspace mapping of io register */
-        rdev->rmmio_base = drm_get_resource_start(rdev->ddev, 2);
+        rdev->rmmio_base = pci_resource_start(rdev->pdev, 2);
-        rdev->rmmio_size = drm_get_resource_len(rdev->ddev, 2);
+        rdev->rmmio_size = pci_resource_len(rdev->pdev, 2);
        rdev->rmmio = ioremap(rdev->rmmio_base, rdev->rmmio_size);
        if (rdev->rmmio == NULL) {
                return -ENOMEM;
@@ -659,6 +684,17 @@ int radeon_device_init(struct radeon_device *rdev,
        DRM_INFO("register mmio base: 0x%08X\n", (uint32_t)rdev->rmmio_base);
        DRM_INFO("register mmio size: %u\n", (unsigned)rdev->rmmio_size);
+        /* io port mapping */
+        for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
+                if (pci_resource_flags(rdev->pdev, i) & IORESOURCE_IO) {
+                        rdev->rio_mem_size = pci_resource_len(rdev->pdev, i);
+                        rdev->rio_mem = pci_iomap(rdev->pdev, i, rdev->rio_mem_size);
+                        break;
+                }
+        }
+        if (rdev->rio_mem == NULL)
+                DRM_ERROR("Unable to find PCI I/O BAR\n");
        /* if we have > 1 VGA cards, then disable the radeon VGA resources */
        /* this will fail for cards that aren't VGA class devices, just
         * ignore it */
@@ -701,6 +737,9 @@ void radeon_device_fini(struct radeon_device *rdev)
        destroy_workqueue(rdev->wq);
        vga_switcheroo_unregister_client(rdev->pdev);
        vga_client_register(rdev->pdev, NULL, NULL, NULL);
+        if (rdev->rio_mem)
+                pci_iounmap(rdev->pdev, rdev->rio_mem);
+        rdev->rio_mem = NULL;
        iounmap(rdev->rmmio);
        rdev->rmmio = NULL;
 }
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 8154cdf796e4..74dac9635d70 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -42,7 +42,7 @@ static void avivo_crtc_load_lut(struct drm_crtc *crtc)
        struct radeon_device *rdev = dev->dev_private;
        int i;
-        DRM_DEBUG("%d\n", radeon_crtc->crtc_id);
+        DRM_DEBUG_KMS("%d\n", radeon_crtc->crtc_id);
        WREG32(AVIVO_DC_LUTA_CONTROL + radeon_crtc->crtc_offset, 0);
        WREG32(AVIVO_DC_LUTA_BLACK_OFFSET_BLUE + radeon_crtc->crtc_offset, 0);
@@ -75,7 +75,7 @@ static void evergreen_crtc_load_lut(struct drm_crtc *crtc)
        struct radeon_device *rdev = dev->dev_private;
        int i;
-        DRM_DEBUG("%d\n", radeon_crtc->crtc_id);
+        DRM_DEBUG_KMS("%d\n", radeon_crtc->crtc_id);
        WREG32(EVERGREEN_DC_LUT_CONTROL + radeon_crtc->crtc_offset, 0);
        WREG32(EVERGREEN_DC_LUT_BLACK_OFFSET_BLUE + radeon_crtc->crtc_offset, 0);
@@ -469,7 +469,7 @@ static void radeon_compute_pll_legacy(struct radeon_pll *pll,
        uint32_t post_div;
        u32 pll_out_min, pll_out_max;
-        DRM_DEBUG("PLL freq %llu %u %u\n", freq, pll->min_ref_div, pll->max_ref_div);
+        DRM_DEBUG_KMS("PLL freq %llu %u %u\n", freq, pll->min_ref_div, pll->max_ref_div);
        freq = freq * 1000;
        if (pll->flags & RADEON_PLL_IS_LCD) {
@@ -558,15 +558,17 @@ static void radeon_compute_pll_legacy(struct radeon_pll *pll,
                                        current_freq = radeon_div(tmp, ref_div * post_div);
                                        if (pll->flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
-                                                error = freq - current_freq;
+                                                if (freq < current_freq)
-                                                error = error < 0 ? 0xffffffff : error;
+                                                        error = 0xffffffff;
+                                                else
+                                                        error = freq - current_freq;
                                        } else
                                                error = abs(current_freq - freq);
                                        vco_diff = abs(vco - best_vco);
                                        if ((best_vco == 0 && error < best_error) ||
                                            (best_vco != 0 &&
-                                             (error < best_error - 100 ||
+                                             ((best_error > 100 && error < best_error - 100) ||
                                              (abs(error - best_error) < 100 && vco_diff < best_vco_diff)))) {
                                                best_post_div = post_div;
                                                best_ref_div = ref_div;
@@ -803,7 +805,7 @@ done:
        *ref_div_p = ref_div;
        *post_div_p = post_div;
-        DRM_DEBUG("%u %d.%d, %d, %d\n", *dot_clock_p, *fb_div_p, *frac_fb_div_p, *ref_div_p, *post_div_p);
+        DRM_DEBUG_KMS("%u %d.%d, %d, %d\n", *dot_clock_p, *fb_div_p, *frac_fb_div_p, *ref_div_p, *post_div_p);
 }
 void radeon_compute_pll(struct radeon_pll *pll,
@@ -919,6 +921,12 @@ static struct drm_prop_enum_list radeon_tv_std_enum_list[] =
        { TV_STD_SECAM, "secam" },
 };
+static struct drm_prop_enum_list radeon_underscan_enum_list[] =
+{       { UNDERSCAN_OFF, "off" },
+        { UNDERSCAN_ON, "on" },
+        { UNDERSCAN_AUTO, "auto" },
+};
 static int radeon_modeset_create_props(struct radeon_device *rdev)
 {
        int i, sz;
@@ -972,6 +980,18 @@ static int radeon_modeset_create_props(struct radeon_device *rdev)
                                      radeon_tv_std_enum_list[i].name);
        }
+        sz = ARRAY_SIZE(radeon_underscan_enum_list);
+        rdev->mode_info.underscan_property =
+                drm_property_create(rdev->ddev,
+                                    DRM_MODE_PROP_ENUM,
+                                    "underscan", sz);
+        for (i = 0; i < sz; i++) {
+                drm_property_add_enum(rdev->mode_info.underscan_property,
+                                      i,
+                                      radeon_underscan_enum_list[i].type,
+                                      radeon_underscan_enum_list[i].name);
+        }
        return 0;
 }
@@ -1067,15 +1087,26 @@ bool radeon_crtc_scaling_mode_fixup(struct drm_crtc *crtc,
                                struct drm_display_mode *adjusted_mode)
 {
        struct drm_device *dev = crtc->dev;
+        struct radeon_device *rdev = dev->dev_private;
        struct drm_encoder *encoder;
        struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
        struct radeon_encoder *radeon_encoder;
+        struct drm_connector *connector;
+        struct radeon_connector *radeon_connector;
        bool first = true;
+        u32 src_v = 1, dst_v = 1;
+        u32 src_h = 1, dst_h = 1;
+        radeon_crtc->h_border = 0;
+        radeon_crtc->v_border = 0;
        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-                radeon_encoder = to_radeon_encoder(encoder);
                if (encoder->crtc != crtc)
                        continue;
+                radeon_encoder = to_radeon_encoder(encoder);
+                connector = radeon_get_connector_for_encoder(encoder);
+                radeon_connector = to_radeon_connector(connector);
                if (first) {
                        /* set scaling */
                        if (radeon_encoder->rmx_type == RMX_OFF)
@@ -1085,31 +1116,49 @@ bool radeon_crtc_scaling_mode_fixup(struct drm_crtc *crtc,
                                radeon_crtc->rmx_type = radeon_encoder->rmx_type;
                        else
                                radeon_crtc->rmx_type = RMX_OFF;
+                        src_v = crtc->mode.vdisplay;
+                        dst_v = radeon_crtc->native_mode.vdisplay;
+                        src_h = crtc->mode.hdisplay;
+                        dst_h = radeon_crtc->native_mode.vdisplay;
                        /* copy native mode */
                        memcpy(&radeon_crtc->native_mode,
                               &radeon_encoder->native_mode,
                                sizeof(struct drm_display_mode));
+                        /* fix up for overscan on hdmi */
+                        if (ASIC_IS_AVIVO(rdev) &&
+                            ((radeon_encoder->underscan_type == UNDERSCAN_ON) ||
+                             ((radeon_encoder->underscan_type == UNDERSCAN_AUTO) &&
+                              drm_detect_hdmi_monitor(radeon_connector->edid)))) {
+                                radeon_crtc->h_border = (mode->hdisplay >> 5) + 16;
+                                radeon_crtc->v_border = (mode->vdisplay >> 5) + 16;
+                                radeon_crtc->rmx_type = RMX_FULL;
+                                src_v = crtc->mode.vdisplay;
+                                dst_v = crtc->mode.vdisplay - (radeon_crtc->v_border * 2);
+                                src_h = crtc->mode.hdisplay;
+                                dst_h = crtc->mode.hdisplay - (radeon_crtc->h_border * 2);
+                        }
                        first = false;
                } else {
                        if (radeon_crtc->rmx_type != radeon_encoder->rmx_type) {
                                /* WARNING: Right now this can't happen but
                                 * in the future we need to check that scaling
-                                 * are consistent accross different encoder
+                                 * are consistent across different encoder
                                 * (ie all encoder can work with the same
                                 *  scaling).
                                 */
-                                DRM_ERROR("Scaling not consistent accross encoder.\n");
+                                DRM_ERROR("Scaling not consistent across encoder.\n");
                                return false;
                        }
                }
        }
        if (radeon_crtc->rmx_type != RMX_OFF) {
                fixed20_12 a, b;
-                a.full = dfixed_const(crtc->mode.vdisplay);
+                a.full = dfixed_const(src_v);
-                b.full = dfixed_const(radeon_crtc->native_mode.hdisplay);
+                b.full = dfixed_const(dst_v);
                radeon_crtc->vsc.full = dfixed_div(a, b);
-                a.full = dfixed_const(crtc->mode.hdisplay);
+                a.full = dfixed_const(src_h);
-                b.full = dfixed_const(radeon_crtc->native_mode.vdisplay);
+                b.full = dfixed_const(dst_h);
                radeon_crtc->hsc.full = dfixed_div(a, b);
        } else {
                radeon_crtc->vsc.full = dfixed_const(1);
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index e166fe4d7c30..795403b0e2cd 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -46,9 +46,10 @@
 * - 2.3.0 - add MSPOS + 3D texture + r500 VAP regs
 * - 2.4.0 - add crtc id query
 * - 2.5.0 - add get accel 2 to work around ddx breakage for evergreen
+ * - 2.6.0 - add tiling config query (r6xx+), add initial HiZ support (r300->r500)
 */
 #define KMS_DRIVER_MAJOR        2
-#define KMS_DRIVER_MINOR        5
+#define KMS_DRIVER_MINOR        6
 #define KMS_DRIVER_PATCHLEVEL   0
 int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);
 int radeon_driver_unload_kms(struct drm_device *dev);
@@ -238,7 +239,7 @@ static struct drm_driver kms_driver;
 static int __devinit
 radeon_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
-        return drm_get_dev(pdev, ent, &kms_driver);
+        return drm_get_pci_dev(pdev, ent, &kms_driver);
 }
 static void
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
index e0b30b264c28..263c8098d7dd 100644
--- a/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
@@ -205,14 +205,14 @@ void radeon_encoder_set_active_device(struct drm_encoder *encoder)
                if (connector->encoder == encoder) {
                        struct radeon_connector *radeon_connector = to_radeon_connector(connector);
                        radeon_encoder->active_device = radeon_encoder->devices & radeon_connector->devices;
-                        DRM_DEBUG("setting active device to %08x from %08x %08x for encoder %d\n",
+                        DRM_DEBUG_KMS("setting active device to %08x from %08x %08x for encoder %d\n",
                                  radeon_encoder->active_device, radeon_encoder->devices,
                                  radeon_connector->devices, encoder->encoder_type);
                }
        }
 }
-static struct drm_connector *
+struct drm_connector *
 radeon_get_connector_for_encoder(struct drm_encoder *encoder)
 {
        struct drm_device *dev = encoder->dev;
@@ -1021,7 +1021,7 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode)
        memset(&args, 0, sizeof(args));
-        DRM_DEBUG("encoder dpms %d to mode %d, devices %08x, active_devices %08x\n",
+        DRM_DEBUG_KMS("encoder dpms %d to mode %d, devices %08x, active_devices %08x\n",
                  radeon_encoder->encoder_id, mode, radeon_encoder->devices,
                  radeon_encoder->active_device);
        switch (radeon_encoder->encoder_id) {
@@ -1484,7 +1484,7 @@ radeon_atom_dac_detect(struct drm_encoder *encoder, struct drm_connector *connec
        uint32_t bios_0_scratch;
        if (!atombios_dac_load_detect(encoder, connector)) {
-                DRM_DEBUG("detect returned false \n");
+                DRM_DEBUG_KMS("detect returned false \n");
                return connector_status_unknown;
        }
@@ -1493,7 +1493,7 @@ radeon_atom_dac_detect(struct drm_encoder *encoder, struct drm_connector *connec
        else
                bios_0_scratch = RREG32(RADEON_BIOS_0_SCRATCH);
-        DRM_DEBUG("Bios 0 scratch %x %08x\n", bios_0_scratch, radeon_encoder->devices);
+        DRM_DEBUG_KMS("Bios 0 scratch %x %08x\n", bios_0_scratch, radeon_encoder->devices);
        if (radeon_connector->devices & ATOM_DEVICE_CRT1_SUPPORT) {
                if (bios_0_scratch & ATOM_S0_CRT1_MASK)
                        return connector_status_connected;
@@ -1694,6 +1694,7 @@ radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_id, uint32_t su
        radeon_encoder->encoder_id = encoder_id;
        radeon_encoder->devices = supported_device;
        radeon_encoder->rmx_type = RMX_OFF;
+        radeon_encoder->underscan_type = UNDERSCAN_OFF;
        switch (radeon_encoder->encoder_id) {
        case ENCODER_OBJECT_ID_INTERNAL_LVDS:
@@ -1707,6 +1708,8 @@ radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_id, uint32_t su
                } else {
                        drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS);
                        radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder);
+                        if (ASIC_IS_AVIVO(rdev))
+                                radeon_encoder->underscan_type = UNDERSCAN_AUTO;
                }
                drm_encoder_helper_add(encoder, &radeon_atom_dig_helper_funcs);
                break;
@@ -1736,6 +1739,8 @@ radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_id, uint32_t su
                } else {
                        drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS);
                        radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder);
+                        if (ASIC_IS_AVIVO(rdev))
+                                radeon_encoder->underscan_type = UNDERSCAN_AUTO;
                }
                drm_encoder_helper_add(encoder, &radeon_atom_dig_helper_funcs);
                break;
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index 6a70c0dc7f92..ddcd3b13f151 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -49,7 +49,7 @@ int radeon_driver_unload_kms(struct drm_device *dev)
 int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
 {
        struct radeon_device *rdev;
-        int r;
+        int r, acpi_status;
        rdev = kzalloc(sizeof(struct radeon_device), GFP_KERNEL);
        if (rdev == NULL) {
@@ -77,6 +77,12 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
                dev_err(&dev->pdev->dev, "Fatal error during GPU init\n");
                goto out;
        }
+        /* Call ACPI methods */
+        acpi_status = radeon_acpi_init(rdev);
+        if (acpi_status)
+                dev_dbg(&dev->pdev->dev, "Error during ACPI methods call\n");
        /* Again modeset_init should fail only on fatal error
         * otherwise it should provide enough functionalities
         * for shadowfb to run
@@ -128,21 +134,43 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
                for (i = 0, found = 0; i < rdev->num_crtc; i++) {
                        crtc = (struct drm_crtc *)minfo->crtcs[i];
                        if (crtc && crtc->base.id == value) {
-                                value = i;
+                                struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
+                                value = radeon_crtc->crtc_id;
                                found = 1;
                                break;
                        }
                }
                if (!found) {
-                        DRM_DEBUG("unknown crtc id %d\n", value);
+                        DRM_DEBUG_KMS("unknown crtc id %d\n", value);
                        return -EINVAL;
                }
                break;
        case RADEON_INFO_ACCEL_WORKING2:
                value = rdev->accel_working;
                break;
+        case RADEON_INFO_TILING_CONFIG:
+                if (rdev->family >= CHIP_CEDAR)
+                        value = rdev->config.evergreen.tile_config;
+                else if (rdev->family >= CHIP_RV770)
+                        value = rdev->config.rv770.tile_config;
+                else if (rdev->family >= CHIP_R600)
+                        value = rdev->config.r600.tile_config;
+                else {
+                        DRM_DEBUG_KMS("tiling config is r6xx+ only!\n");
+                        return -EINVAL;
+                }
+        case RADEON_INFO_WANT_HYPERZ:
+                mutex_lock(&dev->struct_mutex);
+                if (rdev->hyperz_filp)
+                        value = 0;
+                else {
+                        rdev->hyperz_filp = filp;
+                        value = 1;
+                }
+                mutex_unlock(&dev->struct_mutex);
+                break;
        default:
-                DRM_DEBUG("Invalid request %d\n", info->request);
+                DRM_DEBUG_KMS("Invalid request %d\n", info->request);
                return -EINVAL;
        }
        if (DRM_COPY_TO_USER(value_ptr, &value, sizeof(uint32_t))) {
@@ -180,9 +208,11 @@ void radeon_driver_postclose_kms(struct drm_device *dev,
 void radeon_driver_preclose_kms(struct drm_device *dev,
                                struct drm_file *file_priv)
 {
+        struct radeon_device *rdev = dev->dev_private;
+        if (rdev->hyperz_filp == file_priv)
+                rdev->hyperz_filp = NULL;
 }
 /*
 * VBlank related functions.
 */
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
index e1e5255396ac..989df519a1e4 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
@@ -362,10 +362,10 @@ int radeon_crtc_set_base(struct drm_crtc *crtc, int x, int y,
        uint32_t gen_cntl_reg, gen_cntl_val;
        int r;
-        DRM_DEBUG("\n");
+        DRM_DEBUG_KMS("\n");
        /* no fb bound */
        if (!crtc->fb) {
-                DRM_DEBUG("No FB bound\n");
+                DRM_DEBUG_KMS("No FB bound\n");
                return 0;
        }
@@ -528,7 +528,7 @@ static bool radeon_set_crtc_timing(struct drm_crtc *crtc, struct drm_display_mod
        uint32_t crtc_v_sync_strt_wid;
        bool is_tv = false;
-        DRM_DEBUG("\n");
+        DRM_DEBUG_KMS("\n");
        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
                if (encoder->crtc == crtc) {
                        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
@@ -757,7 +757,7 @@ static void radeon_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
                }
        }
-        DRM_DEBUG("\n");
+        DRM_DEBUG_KMS("\n");
        if (!use_bios_divs) {
                radeon_compute_pll(pll, mode->clock,
@@ -772,7 +772,7 @@ static void radeon_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
                if (!post_div->divider)
                        post_div = &post_divs[0];
-                DRM_DEBUG("dc=%u, fd=%d, rd=%d, pd=%d\n",
+                DRM_DEBUG_KMS("dc=%u, fd=%d, rd=%d, pd=%d\n",
                          (unsigned)freq,
                          feedback_div,
                          reference_div,
@@ -841,12 +841,12 @@ static void radeon_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
                               | RADEON_P2PLL_SLEEP
                               | RADEON_P2PLL_ATOMIC_UPDATE_EN));
-                DRM_DEBUG("Wrote2: 0x%08x 0x%08x 0x%08x (0x%08x)\n",
+                DRM_DEBUG_KMS("Wrote2: 0x%08x 0x%08x 0x%08x (0x%08x)\n",
                          (unsigned)pll_ref_div,
                          (unsigned)pll_fb_post_div,
                          (unsigned)htotal_cntl,
                          RREG32_PLL(RADEON_P2PLL_CNTL));
-                DRM_DEBUG("Wrote2: rd=%u, fd=%u, pd=%u\n",
+                DRM_DEBUG_KMS("Wrote2: rd=%u, fd=%u, pd=%u\n",
                          (unsigned)pll_ref_div & RADEON_P2PLL_REF_DIV_MASK,
                          (unsigned)pll_fb_post_div & RADEON_P2PLL_FB0_DIV_MASK,
                          (unsigned)((pll_fb_post_div &
@@ -947,12 +947,12 @@ static void radeon_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
                               | RADEON_PPLL_ATOMIC_UPDATE_EN
                               | RADEON_PPLL_VGA_ATOMIC_UPDATE_EN));
-                DRM_DEBUG("Wrote: 0x%08x 0x%08x 0x%08x (0x%08x)\n",
+                DRM_DEBUG_KMS("Wrote: 0x%08x 0x%08x 0x%08x (0x%08x)\n",
                          pll_ref_div,
                          pll_fb_post_div,
                          (unsigned)htotal_cntl,
                          RREG32_PLL(RADEON_PPLL_CNTL));
-                DRM_DEBUG("Wrote: rd=%d, fd=%d, pd=%d\n",
+                DRM_DEBUG_KMS("Wrote: rd=%d, fd=%d, pd=%d\n",
                          pll_ref_div & RADEON_PPLL_REF_DIV_MASK,
                          pll_fb_post_div & RADEON_PPLL_FB3_DIV_MASK,
                          (pll_fb_post_div & RADEON_PPLL_POST3_DIV_MASK) >> 16);
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
index bad77f40a9da..b8149cbc0c70 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
@@ -47,7 +47,7 @@ static void radeon_legacy_lvds_dpms(struct drm_encoder *encoder, int mode)
        uint32_t lvds_gen_cntl, lvds_pll_cntl, pixclks_cntl, disp_pwr_man;
        int panel_pwr_delay = 2000;
        bool is_mac = false;
-        DRM_DEBUG("\n");
+        DRM_DEBUG_KMS("\n");
        if (radeon_encoder->enc_priv) {
                if (rdev->is_atom_bios) {
@@ -108,6 +108,7 @@ static void radeon_legacy_lvds_dpms(struct drm_encoder *encoder, int mode)
                udelay(panel_pwr_delay * 1000);
                WREG32(RADEON_LVDS_GEN_CNTL, lvds_gen_cntl);
                WREG32_PLL(RADEON_PIXCLKS_CNTL, pixclks_cntl);
+                udelay(panel_pwr_delay * 1000);
                break;
        }
@@ -150,7 +151,7 @@ static void radeon_legacy_lvds_mode_set(struct drm_encoder *encoder,
        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
        uint32_t lvds_pll_cntl, lvds_gen_cntl, lvds_ss_gen_cntl;
-        DRM_DEBUG("\n");
+        DRM_DEBUG_KMS("\n");
        lvds_pll_cntl = RREG32(RADEON_LVDS_PLL_CNTL);
        lvds_pll_cntl &= ~RADEON_LVDS_PLL_EN;
@@ -166,7 +167,7 @@ static void radeon_legacy_lvds_mode_set(struct drm_encoder *encoder,
        } else {
                struct radeon_encoder_lvds *lvds = (struct radeon_encoder_lvds *)radeon_encoder->enc_priv;
                if (lvds) {
-                        DRM_DEBUG("bios LVDS_GEN_CNTL: 0x%x\n", lvds->lvds_gen_cntl);
+                        DRM_DEBUG_KMS("bios LVDS_GEN_CNTL: 0x%x\n", lvds->lvds_gen_cntl);
                        lvds_gen_cntl = lvds->lvds_gen_cntl;
                        lvds_ss_gen_cntl &= ~((0xf << RADEON_LVDS_PWRSEQ_DELAY1_SHIFT) |
                                              (0xf << RADEON_LVDS_PWRSEQ_DELAY2_SHIFT));
@@ -249,7 +250,7 @@ static void radeon_legacy_primary_dac_dpms(struct drm_encoder *encoder, int mode
        uint32_t dac_cntl = RREG32(RADEON_DAC_CNTL);
        uint32_t dac_macro_cntl = RREG32(RADEON_DAC_MACRO_CNTL);
-        DRM_DEBUG("\n");
+        DRM_DEBUG_KMS("\n");
        switch (mode) {
        case DRM_MODE_DPMS_ON:
@@ -314,7 +315,7 @@ static void radeon_legacy_primary_dac_mode_set(struct drm_encoder *encoder,
        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
        uint32_t disp_output_cntl, dac_cntl, dac2_cntl, dac_macro_cntl;
-        DRM_DEBUG("\n");
+        DRM_DEBUG_KMS("\n");
        if (radeon_crtc->crtc_id == 0) {
                if (rdev->family == CHIP_R200 || ASIC_IS_R300(rdev)) {
@@ -445,7 +446,7 @@ static void radeon_legacy_tmds_int_dpms(struct drm_encoder *encoder, int mode)
        struct drm_device *dev = encoder->dev;
        struct radeon_device *rdev = dev->dev_private;
        uint32_t fp_gen_cntl = RREG32(RADEON_FP_GEN_CNTL);
-        DRM_DEBUG("\n");
+        DRM_DEBUG_KMS("\n");
        switch (mode) {
        case DRM_MODE_DPMS_ON:
@@ -501,7 +502,7 @@ static void radeon_legacy_tmds_int_mode_set(struct drm_encoder *encoder,
        uint32_t tmp, tmds_pll_cntl, tmds_transmitter_cntl, fp_gen_cntl;
        int i;
-        DRM_DEBUG("\n");
+        DRM_DEBUG_KMS("\n");
        tmp = tmds_pll_cntl = RREG32(RADEON_TMDS_PLL_CNTL);
        tmp &= 0xfffff;
@@ -609,7 +610,7 @@ static void radeon_legacy_tmds_ext_dpms(struct drm_encoder *encoder, int mode)
        struct drm_device *dev = encoder->dev;
        struct radeon_device *rdev = dev->dev_private;
        uint32_t fp2_gen_cntl = RREG32(RADEON_FP2_GEN_CNTL);
-        DRM_DEBUG("\n");
+        DRM_DEBUG_KMS("\n");
        switch (mode) {
        case DRM_MODE_DPMS_ON:
@@ -665,7 +666,7 @@ static void radeon_legacy_tmds_ext_mode_set(struct drm_encoder *encoder,
        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
        uint32_t fp2_gen_cntl;
-        DRM_DEBUG("\n");
+        DRM_DEBUG_KMS("\n");
        if (rdev->is_atom_bios) {
                radeon_encoder->pixel_clock = adjusted_mode->clock;
@@ -759,7 +760,7 @@ static void radeon_legacy_tv_dac_dpms(struct drm_encoder *encoder, int mode)
        uint32_t fp2_gen_cntl = 0, crtc2_gen_cntl = 0, tv_dac_cntl = 0;
        uint32_t tv_master_cntl = 0;
        bool is_tv;
-        DRM_DEBUG("\n");
+        DRM_DEBUG_KMS("\n");
        is_tv = radeon_encoder->active_device & ATOM_DEVICE_TV_SUPPORT ? true : false;
@@ -877,7 +878,7 @@ static void radeon_legacy_tv_dac_mode_set(struct drm_encoder *encoder,
        uint32_t disp_hw_debug = 0, fp2_gen_cntl = 0, disp_tv_out_cntl = 0;
        bool is_tv = false;
-        DRM_DEBUG("\n");
+        DRM_DEBUG_KMS("\n");
        is_tv = radeon_encoder->active_device & ATOM_DEVICE_TV_SUPPORT ? true : false;
@@ -1074,10 +1075,10 @@ static bool r300_legacy_tv_detect(struct drm_encoder *encoder,
        tmp = RREG32(RADEON_TV_DAC_CNTL);
        if ((tmp & RADEON_TV_DAC_GDACDET) != 0) {
                found = true;
-                DRM_DEBUG("S-video TV connection detected\n");
+                DRM_DEBUG_KMS("S-video TV connection detected\n");
        } else if ((tmp & RADEON_TV_DAC_BDACDET) != 0) {
                found = true;
-                DRM_DEBUG("Composite TV connection detected\n");
+                DRM_DEBUG_KMS("Composite TV connection detected\n");
        }
        WREG32(RADEON_TV_DAC_CNTL, tv_dac_cntl);
@@ -1140,10 +1141,10 @@ static bool radeon_legacy_tv_detect(struct drm_encoder *encoder,
        tmp = RREG32(RADEON_TV_DAC_CNTL);
        if (tmp & RADEON_TV_DAC_GDACDET) {
                found = true;
-                DRM_DEBUG("S-video TV connection detected\n");
+                DRM_DEBUG_KMS("S-video TV connection detected\n");
        } else if ((tmp & RADEON_TV_DAC_BDACDET) != 0) {
                found = true;
-                DRM_DEBUG("Composite TV connection detected\n");
+                DRM_DEBUG_KMS("Composite TV connection detected\n");
        }
        WREG32(RADEON_TV_PRE_DAC_MUX_CNTL, tv_pre_dac_mux_cntl);
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_tv.c b/drivers/gpu/drm/radeon/radeon_legacy_tv.c
index f2ed27c8055b..c7b6cb428d09 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_tv.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_tv.c
@@ -496,7 +496,7 @@ static bool radeon_legacy_tv_init_restarts(struct drm_encoder *encoder)
        restart -= v_offset + h_offset;
-        DRM_DEBUG("compute_restarts: def = %u h = %d v = %d, p1 = %04x, p2 = %04x, restart = %d\n",
+        DRM_DEBUG_KMS("compute_restarts: def = %u h = %d v = %d, p1 = %04x, p2 = %04x, restart = %d\n",
                  const_ptr->def_restart, tv_dac->h_pos, tv_dac->v_pos, p1, p2, restart);
        tv_dac->tv.hrestart = restart % h_total;
@@ -505,7 +505,7 @@ static bool radeon_legacy_tv_init_restarts(struct drm_encoder *encoder)
        restart /= v_total;
        tv_dac->tv.frestart = restart % f_total;
-        DRM_DEBUG("compute_restart: F/H/V=%u,%u,%u\n",
+        DRM_DEBUG_KMS("compute_restart: F/H/V=%u,%u,%u\n",
                  (unsigned)tv_dac->tv.frestart,
                  (unsigned)tv_dac->tv.vrestart,
                  (unsigned)tv_dac->tv.hrestart);
@@ -523,7 +523,7 @@ static bool radeon_legacy_tv_init_restarts(struct drm_encoder *encoder)
        tv_dac->tv.timing_cntl = (tv_dac->tv.timing_cntl & ~RADEON_H_INC_MASK) |
                ((u32)h_inc << RADEON_H_INC_SHIFT);
-        DRM_DEBUG("compute_restart: h_size = %d h_inc = %d\n", tv_dac->h_size, h_inc);
+        DRM_DEBUG_KMS("compute_restart: h_size = %d h_inc = %d\n", tv_dac->h_size, h_inc);
        return h_changed;
 }
@@ -642,8 +642,8 @@ void radeon_legacy_tv_mode_set(struct drm_encoder *encoder,
        }
        flicker_removal = (tmp + 500) / 1000;
-        if (flicker_removal < 2)
+        if (flicker_removal < 3)
-                flicker_removal = 2;
+                flicker_removal = 3;
        for (i = 0; i < ARRAY_SIZE(SLOPE_limit); ++i) {
                if (flicker_removal == SLOPE_limit[i])
                        break;
diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
index 95696aa57ac8..71aea4037e90 100644
--- a/drivers/gpu/drm/radeon/radeon_mode.h
+++ b/drivers/gpu/drm/radeon/radeon_mode.h
@@ -66,6 +66,12 @@ enum radeon_tv_std {
        TV_STD_PAL_N,
 };
+enum radeon_underscan_type {
+        UNDERSCAN_OFF,
+        UNDERSCAN_ON,
+        UNDERSCAN_AUTO,
+};
 enum radeon_hpd_id {
        RADEON_HPD_1 = 0,
        RADEON_HPD_2,
@@ -226,10 +232,12 @@ struct radeon_mode_info {
        struct drm_property *coherent_mode_property;
        /* DAC enable load detect */
        struct drm_property *load_detect_property;
-        /* TV standard load detect */
+        /* TV standard */
        struct drm_property *tv_std_property;
        /* legacy TMDS PLL detect */
        struct drm_property *tmds_pll_property;
+        /* underscan */
+        struct drm_property *underscan_property;
        /* hardcoded DFP edid from BIOS */
        struct edid *bios_hardcoded_edid;
@@ -266,6 +274,8 @@ struct radeon_crtc {
        uint32_t legacy_display_base_addr;
        uint32_t legacy_cursor_offset;
        enum radeon_rmx_type rmx_type;
+        u8 h_border;
+        u8 v_border;
        fixed20_12 vsc;
        fixed20_12 hsc;
        struct drm_display_mode native_mode;
@@ -354,6 +364,7 @@ struct radeon_encoder {
        uint32_t flags;
        uint32_t pixel_clock;
        enum radeon_rmx_type rmx_type;
+        enum radeon_underscan_type underscan_type;
        struct drm_display_mode native_mode;
        void *enc_priv;
        int audio_polling_active;
@@ -392,7 +403,7 @@ struct radeon_connector {
        uint32_t connector_id;
        uint32_t devices;
        struct radeon_i2c_chan *ddc_bus;
-        /* some systems have a an hdmi and vga port with a shared ddc line */
+        /* some systems have an hdmi and vga port with a shared ddc line */
        bool shared_ddc;
        bool use_digital;
        /* we need to mind the EDID between detect
@@ -414,6 +425,9 @@ radeon_combios_get_tv_info(struct radeon_device *rdev);
 extern enum radeon_tv_std
 radeon_atombios_get_tv_info(struct radeon_device *rdev);
+extern struct drm_connector *
+radeon_get_connector_for_encoder(struct drm_encoder *encoder);
 extern void radeon_connector_hotplug(struct drm_connector *connector);
 extern bool radeon_dp_needs_link_train(struct radeon_connector *radeon_connector);
 extern int radeon_dp_mode_valid_helper(struct radeon_connector *radeon_connector,
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
index d5b9373ce06c..0afd1e62347d 100644
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -110,6 +110,7 @@ int radeon_bo_create(struct radeon_device *rdev, struct drm_gem_object *gobj,
        bo->surface_reg = -1;
        INIT_LIST_HEAD(&bo->list);
+retry:
        radeon_ttm_placement_from_domain(bo, domain);
        /* Kernel allocation are uninterruptible */
        mutex_lock(&rdev->vram_mutex);
@@ -118,10 +119,15 @@ int radeon_bo_create(struct radeon_device *rdev, struct drm_gem_object *gobj,
                        &radeon_ttm_bo_destroy);
        mutex_unlock(&rdev->vram_mutex);
        if (unlikely(r != 0)) {
-                if (r != -ERESTARTSYS)
+                if (r != -ERESTARTSYS) {
+                        if (domain == RADEON_GEM_DOMAIN_VRAM) {
+                                domain |= RADEON_GEM_DOMAIN_GTT;
+                                goto retry;
+                        }
                        dev_err(rdev->dev,
                                "object_init failed for (%lu, 0x%08X)\n",
                                size, domain);
+                }
                return r;
        }
        *bo_ptr = bo;
@@ -321,6 +327,7 @@ int radeon_bo_list_validate(struct list_head *head)
 {
        struct radeon_bo_list *lobj;
        struct radeon_bo *bo;
+        u32 domain;
        int r;
        list_for_each_entry(lobj, head, list) {
@@ -333,17 +340,19 @@ int radeon_bo_list_validate(struct list_head *head)
        list_for_each_entry(lobj, head, list) {
                bo = lobj->bo;
                if (!bo->pin_count) {
-                        if (lobj->wdomain) {
+                        domain = lobj->wdomain ? lobj->wdomain : lobj->rdomain;
-                                radeon_ttm_placement_from_domain(bo,
+                        
-                                                                lobj->wdomain);
+                retry:
-                        } else {
+                        radeon_ttm_placement_from_domain(bo, domain);
-                                radeon_ttm_placement_from_domain(bo,
-                                                                lobj->rdomain);
-                        }
                        r = ttm_bo_validate(&bo->tbo, &bo->placement,
                                                true, false, false);
-                        if (unlikely(r))
+                        if (unlikely(r)) {
+                                if (r != -ERESTARTSYS && domain == RADEON_GEM_DOMAIN_VRAM) {
+                                        domain |= RADEON_GEM_DOMAIN_GTT;
+                                        goto retry;
+                                }
                                return r;
+                        }
                }
                lobj->gpu_offset = radeon_bo_gpu_offset(bo);
                lobj->tiling_flags = bo->tiling_flags;
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 115d26b762cc..95f8b3a3c43d 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -27,6 +27,8 @@
 #include <linux/acpi.h>
 #endif
 #include <linux/power_supply.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
 #define RADEON_IDLE_LOOP_MS 100
 #define RADEON_RECLOCK_DELAY_MS 200
@@ -60,9 +62,9 @@ static int radeon_acpi_event(struct notifier_block *nb,
        if (strcmp(entry->device_class, ACPI_AC_CLASS) == 0) {
                if (power_supply_is_system_supplied() > 0)
-                        DRM_DEBUG("pm: AC\n");
+                        DRM_DEBUG_DRIVER("pm: AC\n");
                else
-                        DRM_DEBUG("pm: DC\n");
+                        DRM_DEBUG_DRIVER("pm: DC\n");
                if (rdev->pm.pm_method == PM_METHOD_PROFILE) {
                        if (rdev->pm.profile == PM_PROFILE_AUTO) {
@@ -196,7 +198,7 @@ static void radeon_set_power_state(struct radeon_device *rdev)
                        radeon_set_engine_clock(rdev, sclk);
                        radeon_pm_debug_check_in_vbl(rdev, true);
                        rdev->pm.current_sclk = sclk;
-                        DRM_DEBUG("Setting: e: %d\n", sclk);
+                        DRM_DEBUG_DRIVER("Setting: e: %d\n", sclk);
                }
                /* set memory clock */
@@ -205,7 +207,7 @@ static void radeon_set_power_state(struct radeon_device *rdev)
                        radeon_set_memory_clock(rdev, mclk);
                        radeon_pm_debug_check_in_vbl(rdev, true);
                        rdev->pm.current_mclk = mclk;
-                        DRM_DEBUG("Setting: m: %d\n", mclk);
+                        DRM_DEBUG_DRIVER("Setting: m: %d\n", mclk);
                }
                if (misc_after)
@@ -217,7 +219,7 @@ static void radeon_set_power_state(struct radeon_device *rdev)
                rdev->pm.current_power_state_index = rdev->pm.requested_power_state_index;
                rdev->pm.current_clock_mode_index = rdev->pm.requested_clock_mode_index;
        } else
-                DRM_DEBUG("pm: GUI not idle!!!\n");
+                DRM_DEBUG_DRIVER("pm: GUI not idle!!!\n");
 }
 static void radeon_pm_set_clocks(struct radeon_device *rdev)
@@ -292,27 +294,27 @@ static void radeon_pm_print_states(struct radeon_device *rdev)
        struct radeon_power_state *power_state;
        struct radeon_pm_clock_info *clock_info;
-        DRM_DEBUG("%d Power State(s)\n", rdev->pm.num_power_states);
+        DRM_DEBUG_DRIVER("%d Power State(s)\n", rdev->pm.num_power_states);
        for (i = 0; i < rdev->pm.num_power_states; i++) {
                power_state = &rdev->pm.power_state[i];
-                DRM_DEBUG("State %d: %s\n", i,
+                DRM_DEBUG_DRIVER("State %d: %s\n", i,
                        radeon_pm_state_type_name[power_state->type]);
                if (i == rdev->pm.default_power_state_index)
-                        DRM_DEBUG("\tDefault");
+                        DRM_DEBUG_DRIVER("\tDefault");
                if ((rdev->flags & RADEON_IS_PCIE) && !(rdev->flags & RADEON_IS_IGP))
-                        DRM_DEBUG("\t%d PCIE Lanes\n", power_state->pcie_lanes);
+                        DRM_DEBUG_DRIVER("\t%d PCIE Lanes\n", power_state->pcie_lanes);
                if (power_state->flags & RADEON_PM_STATE_SINGLE_DISPLAY_ONLY)
-                        DRM_DEBUG("\tSingle display only\n");
+                        DRM_DEBUG_DRIVER("\tSingle display only\n");
-                DRM_DEBUG("\t%d Clock Mode(s)\n", power_state->num_clock_modes);
+                DRM_DEBUG_DRIVER("\t%d Clock Mode(s)\n", power_state->num_clock_modes);
                for (j = 0; j < power_state->num_clock_modes; j++) {
                        clock_info = &(power_state->clock_info[j]);
                        if (rdev->flags & RADEON_IS_IGP)
-                                DRM_DEBUG("\t\t%d e: %d%s\n",
+                                DRM_DEBUG_DRIVER("\t\t%d e: %d%s\n",
                                        j,
                                        clock_info->sclk * 10,
                                        clock_info->flags & RADEON_PM_MODE_NO_DISPLAY ? "\tNo display only" : "");
                        else
-                                DRM_DEBUG("\t\t%d e: %d\tm: %d\tv: %d%s\n",
+                                DRM_DEBUG_DRIVER("\t\t%d e: %d\tm: %d\tv: %d%s\n",
                                        j,
                                        clock_info->sclk * 10,
                                        clock_info->mclk * 10,
@@ -333,6 +335,7 @@ static ssize_t radeon_get_pm_profile(struct device *dev,
        return snprintf(buf, PAGE_SIZE, "%s\n",
                        (cp == PM_PROFILE_AUTO) ? "auto" :
                        (cp == PM_PROFILE_LOW) ? "low" :
+                        (cp == PM_PROFILE_MID) ? "mid" :
                        (cp == PM_PROFILE_HIGH) ? "high" : "default");
 }
@@ -423,6 +426,82 @@ fail:
 static DEVICE_ATTR(power_profile, S_IRUGO | S_IWUSR, radeon_get_pm_profile, radeon_set_pm_profile);
 static DEVICE_ATTR(power_method, S_IRUGO | S_IWUSR, radeon_get_pm_method, radeon_set_pm_method);
+static ssize_t radeon_hwmon_show_temp(struct device *dev,
+                                      struct device_attribute *attr,
+                                      char *buf)
+{
+        struct drm_device *ddev = pci_get_drvdata(to_pci_dev(dev));
+        struct radeon_device *rdev = ddev->dev_private;
+        u32 temp;
+        switch (rdev->pm.int_thermal_type) {
+        case THERMAL_TYPE_RV6XX:
+                temp = rv6xx_get_temp(rdev);
+                break;
+        case THERMAL_TYPE_RV770:
+                temp = rv770_get_temp(rdev);
+                break;
+        case THERMAL_TYPE_EVERGREEN:
+                temp = evergreen_get_temp(rdev);
+                break;
+        default:
+                temp = 0;
+                break;
+        }
+        return snprintf(buf, PAGE_SIZE, "%d\n", temp);
+}
+static ssize_t radeon_hwmon_show_name(struct device *dev,
+                                      struct device_attribute *attr,
+                                      char *buf)
+{
+        return sprintf(buf, "radeon\n");
+}
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, radeon_hwmon_show_temp, NULL, 0);
+static SENSOR_DEVICE_ATTR(name, S_IRUGO, radeon_hwmon_show_name, NULL, 0);
+static struct attribute *hwmon_attributes[] = {
+        &sensor_dev_attr_temp1_input.dev_attr.attr,
+        &sensor_dev_attr_name.dev_attr.attr,
+        NULL
+};
+static const struct attribute_group hwmon_attrgroup = {
+        .attrs = hwmon_attributes,
+};
+static void radeon_hwmon_init(struct radeon_device *rdev)
+{
+        int err;
+        rdev->pm.int_hwmon_dev = NULL;
+        switch (rdev->pm.int_thermal_type) {
+        case THERMAL_TYPE_RV6XX:
+        case THERMAL_TYPE_RV770:
+        case THERMAL_TYPE_EVERGREEN:
+                rdev->pm.int_hwmon_dev = hwmon_device_register(rdev->dev);
+                dev_set_drvdata(rdev->pm.int_hwmon_dev, rdev->ddev);
+                err = sysfs_create_group(&rdev->pm.int_hwmon_dev->kobj,
+                                         &hwmon_attrgroup);
+                if (err)
+                        DRM_ERROR("Unable to create hwmon sysfs file: %d\n", err);
+                break;
+        default:
+                break;
+        }
+}
+static void radeon_hwmon_fini(struct radeon_device *rdev)
+{
+        if (rdev->pm.int_hwmon_dev) {
+                sysfs_remove_group(&rdev->pm.int_hwmon_dev->kobj, &hwmon_attrgroup);
+                hwmon_device_unregister(rdev->pm.int_hwmon_dev);
+        }
+}
 void radeon_pm_suspend(struct radeon_device *rdev)
 {
        bool flush_wq = false;
@@ -470,6 +549,7 @@ int radeon_pm_init(struct radeon_device *rdev)
        rdev->pm.dynpm_can_downclock = true;
        rdev->pm.current_sclk = rdev->clock.default_sclk;
        rdev->pm.current_mclk = rdev->clock.default_mclk;
+        rdev->pm.int_thermal_type = THERMAL_TYPE_NONE;
        if (rdev->bios) {
                if (rdev->is_atom_bios)
@@ -480,6 +560,8 @@ int radeon_pm_init(struct radeon_device *rdev)
                radeon_pm_init_profile(rdev);
        }
+        /* set up the internal thermal sensor if applicable */
+        radeon_hwmon_init(rdev);
        if (rdev->pm.num_power_states > 1) {
                /* where's the best place to put these? */
                ret = device_create_file(rdev->dev, &dev_attr_power_profile);
@@ -535,6 +617,7 @@ void radeon_pm_fini(struct radeon_device *rdev)
 #endif
        }
+        radeon_hwmon_fini(rdev);
        if (rdev->pm.i2c_bus)
                radeon_i2c_destroy(rdev->pm.i2c_bus);
 }
@@ -575,7 +658,7 @@ void radeon_pm_compute_clocks(struct radeon_device *rdev)
                                        radeon_pm_get_dynpm_state(rdev);
                                        radeon_pm_set_clocks(rdev);
-                                        DRM_DEBUG("radeon: dynamic power management deactivated\n");
+                                        DRM_DEBUG_DRIVER("radeon: dynamic power management deactivated\n");
                                }
                        } else if (rdev->pm.active_crtc_count == 1) {
                                /* TODO: Increase clocks if needed for current mode */
@@ -592,7 +675,7 @@ void radeon_pm_compute_clocks(struct radeon_device *rdev)
                                        rdev->pm.dynpm_state = DYNPM_STATE_ACTIVE;
                                        queue_delayed_work(rdev->wq, &rdev->pm.dynpm_idle_work,
                                                           msecs_to_jiffies(RADEON_IDLE_LOOP_MS));
-                                        DRM_DEBUG("radeon: dynamic power management activated\n");
+                                        DRM_DEBUG_DRIVER("radeon: dynamic power management activated\n");
                                }
                        } else { /* count == 0 */
                                if (rdev->pm.dynpm_state != DYNPM_STATE_MINIMUM) {
@@ -688,7 +771,7 @@ static bool radeon_pm_debug_check_in_vbl(struct radeon_device *rdev, bool finish
        bool in_vbl = radeon_pm_in_vbl(rdev);
        if (in_vbl == false)
-                DRM_DEBUG("not in vbl for pm change %08x at %s\n", stat_crtc,
+                DRM_DEBUG_DRIVER("not in vbl for pm change %08x at %s\n", stat_crtc,
                         finish ? "exit" : "entry");
        return in_vbl;
 }
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index e9918d88f5b0..84c53e41a88f 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -59,28 +59,28 @@ static struct radeon_device *radeon_get_rdev(struct ttm_bo_device *bdev)
 /*
 * Global memory.
 */
-static int radeon_ttm_mem_global_init(struct ttm_global_reference *ref)
+static int radeon_ttm_mem_global_init(struct drm_global_reference *ref)
 {
        return ttm_mem_global_init(ref->object);
 }
-static void radeon_ttm_mem_global_release(struct ttm_global_reference *ref)
+static void radeon_ttm_mem_global_release(struct drm_global_reference *ref)
 {
        ttm_mem_global_release(ref->object);
 }
 static int radeon_ttm_global_init(struct radeon_device *rdev)
 {
-        struct ttm_global_reference *global_ref;
+        struct drm_global_reference *global_ref;
        int r;
        rdev->mman.mem_global_referenced = false;
        global_ref = &rdev->mman.mem_global_ref;
-        global_ref->global_type = TTM_GLOBAL_TTM_MEM;
+        global_ref->global_type = DRM_GLOBAL_TTM_MEM;
        global_ref->size = sizeof(struct ttm_mem_global);
        global_ref->init = &radeon_ttm_mem_global_init;
        global_ref->release = &radeon_ttm_mem_global_release;
-        r = ttm_global_item_ref(global_ref);
+        r = drm_global_item_ref(global_ref);
        if (r != 0) {
                DRM_ERROR("Failed setting up TTM memory accounting "
                          "subsystem.\n");
@@ -90,14 +90,14 @@ static int radeon_ttm_global_init(struct radeon_device *rdev)
        rdev->mman.bo_global_ref.mem_glob =
                rdev->mman.mem_global_ref.object;
        global_ref = &rdev->mman.bo_global_ref.ref;
-        global_ref->global_type = TTM_GLOBAL_TTM_BO;
+        global_ref->global_type = DRM_GLOBAL_TTM_BO;
        global_ref->size = sizeof(struct ttm_bo_global);
        global_ref->init = &ttm_bo_global_init;
        global_ref->release = &ttm_bo_global_release;
-        r = ttm_global_item_ref(global_ref);
+        r = drm_global_item_ref(global_ref);
        if (r != 0) {
                DRM_ERROR("Failed setting up TTM BO subsystem.\n");
-                ttm_global_item_unref(&rdev->mman.mem_global_ref);
+                drm_global_item_unref(&rdev->mman.mem_global_ref);
                return r;
        }
@@ -108,8 +108,8 @@ static int radeon_ttm_global_init(struct radeon_device *rdev)
 static void radeon_ttm_global_fini(struct radeon_device *rdev)
 {
        if (rdev->mman.mem_global_referenced) {
-                ttm_global_item_unref(&rdev->mman.bo_global_ref.ref);
+                drm_global_item_unref(&rdev->mman.bo_global_ref.ref);
-                ttm_global_item_unref(&rdev->mman.mem_global_ref);
+                drm_global_item_unref(&rdev->mman.mem_global_ref);
                rdev->mman.mem_global_referenced = false;
        }
 }
diff --git a/drivers/gpu/drm/radeon/reg_srcs/r300 b/drivers/gpu/drm/radeon/reg_srcs/r300
index 1e97b2d129fd..b506ec1cab4b 100644
--- a/drivers/gpu/drm/radeon/reg_srcs/r300
+++ b/drivers/gpu/drm/radeon/reg_srcs/r300
@@ -187,7 +187,6 @@ r300 0x4f60
 0x4364 RS_INST_13
 0x4368 RS_INST_14
 0x436C RS_INST_15
-0x43A4 SC_HYPERZ_EN
 0x43A8 SC_EDGERULE
 0x43B0 SC_CLIP_0_A
 0x43B4 SC_CLIP_0_B
@@ -716,16 +715,4 @@ r300 0x4f60
 0x4F08 ZB_STENCILREFMASK
 0x4F14 ZB_ZTOP
 0x4F18 ZB_ZCACHE_CTLSTAT
-0x4F1C ZB_BW_CNTL
-0x4F28 ZB_DEPTHCLEARVALUE
-0x4F30 ZB_ZMASK_OFFSET
-0x4F34 ZB_ZMASK_PITCH
-0x4F38 ZB_ZMASK_WRINDEX
-0x4F3C ZB_ZMASK_DWORD
-0x4F40 ZB_ZMASK_RDINDEX
-0x4F44 ZB_HIZ_OFFSET
-0x4F48 ZB_HIZ_WRINDEX
-0x4F4C ZB_HIZ_DWORD
-0x4F50 ZB_HIZ_RDINDEX
-0x4F54 ZB_HIZ_PITCH
 0x4F58 ZB_ZPASS_DATA
diff --git a/drivers/gpu/drm/radeon/reg_srcs/r420 b/drivers/gpu/drm/radeon/reg_srcs/r420
index e958980d00f1..8c1214c2390f 100644
--- a/drivers/gpu/drm/radeon/reg_srcs/r420
+++ b/drivers/gpu/drm/radeon/reg_srcs/r420
@@ -130,6 +130,7 @@ r420 0x4f60
 0x401C GB_SELECT
 0x4020 GB_AA_CONFIG
 0x4024 GB_FIFO_SIZE
+0x4028 GB_Z_PEQ_CONFIG
 0x4100 TX_INVALTAGS
 0x4200 GA_POINT_S0
 0x4204 GA_POINT_T0
@@ -187,7 +188,6 @@ r420 0x4f60
 0x4364 RS_INST_13
 0x4368 RS_INST_14
 0x436C RS_INST_15
-0x43A4 SC_HYPERZ_EN
 0x43A8 SC_EDGERULE
 0x43B0 SC_CLIP_0_A
 0x43B4 SC_CLIP_0_B
@@ -782,16 +782,4 @@ r420 0x4f60
 0x4F08 ZB_STENCILREFMASK
 0x4F14 ZB_ZTOP
 0x4F18 ZB_ZCACHE_CTLSTAT
-0x4F1C ZB_BW_CNTL
-0x4F28 ZB_DEPTHCLEARVALUE
-0x4F30 ZB_ZMASK_OFFSET
-0x4F34 ZB_ZMASK_PITCH
-0x4F38 ZB_ZMASK_WRINDEX
-0x4F3C ZB_ZMASK_DWORD
-0x4F40 ZB_ZMASK_RDINDEX
-0x4F44 ZB_HIZ_OFFSET
-0x4F48 ZB_HIZ_WRINDEX
-0x4F4C ZB_HIZ_DWORD
-0x4F50 ZB_HIZ_RDINDEX
-0x4F54 ZB_HIZ_PITCH
 0x4F58 ZB_ZPASS_DATA
diff --git a/drivers/gpu/drm/radeon/reg_srcs/rs600 b/drivers/gpu/drm/radeon/reg_srcs/rs600
index 83e8bc0c2bb2..0828d80396f2 100644
--- a/drivers/gpu/drm/radeon/reg_srcs/rs600
+++ b/drivers/gpu/drm/radeon/reg_srcs/rs600
@@ -187,7 +187,6 @@ rs600 0x6d40
 0x4364 RS_INST_13
 0x4368 RS_INST_14
 0x436C RS_INST_15
-0x43A4 SC_HYPERZ_EN
 0x43A8 SC_EDGERULE
 0x43B0 SC_CLIP_0_A
 0x43B4 SC_CLIP_0_B
@@ -782,16 +781,4 @@ rs600 0x6d40
 0x4F08 ZB_STENCILREFMASK
 0x4F14 ZB_ZTOP
 0x4F18 ZB_ZCACHE_CTLSTAT
-0x4F1C ZB_BW_CNTL
-0x4F28 ZB_DEPTHCLEARVALUE
-0x4F30 ZB_ZMASK_OFFSET
-0x4F34 ZB_ZMASK_PITCH
-0x4F38 ZB_ZMASK_WRINDEX
-0x4F3C ZB_ZMASK_DWORD
-0x4F40 ZB_ZMASK_RDINDEX
-0x4F44 ZB_HIZ_OFFSET
-0x4F48 ZB_HIZ_WRINDEX
-0x4F4C ZB_HIZ_DWORD
-0x4F50 ZB_HIZ_RDINDEX
-0x4F54 ZB_HIZ_PITCH
 0x4F58 ZB_ZPASS_DATA
diff --git a/drivers/gpu/drm/radeon/reg_srcs/rv515 b/drivers/gpu/drm/radeon/reg_srcs/rv515
index 1e46233985eb..8293855f5f0d 100644
--- a/drivers/gpu/drm/radeon/reg_srcs/rv515
+++ b/drivers/gpu/drm/radeon/reg_srcs/rv515
@@ -235,7 +235,6 @@ rv515 0x6d40
 0x4354 RS_INST_13
 0x4358 RS_INST_14
 0x435C RS_INST_15
-0x43A4 SC_HYPERZ_EN
 0x43A8 SC_EDGERULE
 0x43B0 SC_CLIP_0_A
 0x43B4 SC_CLIP_0_B
@@ -479,17 +478,5 @@ rv515 0x6d40
 0x4F08 ZB_STENCILREFMASK
 0x4F14 ZB_ZTOP
 0x4F18 ZB_ZCACHE_CTLSTAT
-0x4F1C ZB_BW_CNTL
-0x4F28 ZB_DEPTHCLEARVALUE
-0x4F30 ZB_ZMASK_OFFSET
-0x4F34 ZB_ZMASK_PITCH
-0x4F38 ZB_ZMASK_WRINDEX
-0x4F3C ZB_ZMASK_DWORD
-0x4F40 ZB_ZMASK_RDINDEX
-0x4F44 ZB_HIZ_OFFSET
-0x4F48 ZB_HIZ_WRINDEX
-0x4F4C ZB_HIZ_DWORD
-0x4F50 ZB_HIZ_RDINDEX
-0x4F54 ZB_HIZ_PITCH
 0x4F58 ZB_ZPASS_DATA
 0x4FD4 ZB_STENCILREFMASK_BF
diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c
index 9e4240b3bf0b..ae2b76b9a388 100644
--- a/drivers/gpu/drm/radeon/rs400.c
+++ b/drivers/gpu/drm/radeon/rs400.c
@@ -55,12 +55,6 @@ void rs400_gart_adjust_size(struct radeon_device *rdev)
                rdev->mc.gtt_size = 32 * 1024 * 1024;
                return;
        }
-        if (rdev->family == CHIP_RS400 || rdev->family == CHIP_RS480) {
-                /* FIXME: RS400 & RS480 seems to have issue with GART size
-                 * if 4G of system memory (needs more testing) */
-                rdev->mc.gtt_size = 32 * 1024 * 1024;
-                DRM_ERROR("Forcing to 32M GART size (because of ASIC bug ?)\n");
-        }
 }
 void rs400_gart_tlb_flush(struct radeon_device *rdev)
@@ -263,6 +257,7 @@ void rs400_mc_init(struct radeon_device *rdev)
        r100_vram_init_sizes(rdev);
        base = (RREG32(RADEON_NB_TOM) & 0xffff) << 16;
        radeon_vram_location(rdev, &rdev->mc, base);
+        rdev->mc.gtt_base_align = rdev->mc.gtt_size - 1;
        radeon_gtt_location(rdev, &rdev->mc);
        radeon_update_bandwidth_info(rdev);
 }
@@ -480,6 +475,8 @@ int rs400_init(struct radeon_device *rdev)
        /* Initialize surface registers */
        radeon_surface_init(rdev);
        /* TODO: disable VGA need to use VGA request */
+        /* restore some register to sane defaults */
+        r100_restore_sanity(rdev);
        /* BIOS*/
        if (!radeon_get_bios(rdev)) {
                if (ASIC_IS_AVIVO(rdev))
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
index 7bb4c3e52f3b..cc05b230d7ef 100644
--- a/drivers/gpu/drm/radeon/rs600.c
+++ b/drivers/gpu/drm/radeon/rs600.c
@@ -686,8 +686,8 @@ void rs600_mc_init(struct radeon_device *rdev)
 {
        u64 base;
-        rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
+        rdev->mc.aper_base = pci_resource_start(rdev->pdev, 0);
-        rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
+        rdev->mc.aper_size = pci_resource_len(rdev->pdev, 0);
        rdev->mc.vram_is_ddr = true;
        rdev->mc.vram_width = 128;
        rdev->mc.real_vram_size = RREG32(RADEON_CONFIG_MEMSIZE);
@@ -696,8 +696,8 @@ void rs600_mc_init(struct radeon_device *rdev)
        rdev->mc.igp_sideport_enabled = radeon_atombios_sideport_present(rdev);
        base = RREG32_MC(R_000004_MC_FB_LOCATION);
        base = G_000004_MC_FB_START(base) << 16;
-        rdev->mc.igp_sideport_enabled = radeon_atombios_sideport_present(rdev);
        radeon_vram_location(rdev, &rdev->mc, base);
+        rdev->mc.gtt_base_align = 0;
        radeon_gtt_location(rdev, &rdev->mc);
        radeon_update_bandwidth_info(rdev);
 }
@@ -812,6 +812,13 @@ static int rs600_startup(struct radeon_device *rdev)
                dev_err(rdev->dev, "failled initializing IB (%d).\n", r);
                return r;
        }
+        r = r600_audio_init(rdev);
+        if (r) {
+                dev_err(rdev->dev, "failed initializing audio\n");
+                return r;
+        }
        return 0;
 }
@@ -838,6 +845,7 @@ int rs600_resume(struct radeon_device *rdev)
 int rs600_suspend(struct radeon_device *rdev)
 {
+        r600_audio_fini(rdev);
        r100_cp_disable(rdev);
        r100_wb_disable(rdev);
        rs600_irq_disable(rdev);
@@ -847,6 +855,7 @@ int rs600_suspend(struct radeon_device *rdev)
 void rs600_fini(struct radeon_device *rdev)
 {
+        r600_audio_fini(rdev);
        r100_cp_fini(rdev);
        r100_wb_fini(rdev);
        r100_ib_fini(rdev);
@@ -870,6 +879,8 @@ int rs600_init(struct radeon_device *rdev)
        radeon_scratch_init(rdev);
        /* Initialize surface registers */
        radeon_surface_init(rdev);
+        /* restore some register to sane defaults */
+        r100_restore_sanity(rdev);
        /* BIOS */
        if (!radeon_get_bios(rdev)) {
                if (ASIC_IS_AVIVO(rdev))
diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
index f4f0a61bcdce..3e3f75718be3 100644
--- a/drivers/gpu/drm/radeon/rs690.c
+++ b/drivers/gpu/drm/radeon/rs690.c
@@ -154,14 +154,15 @@ void rs690_mc_init(struct radeon_device *rdev)
        rdev->mc.vram_width = 128;
        rdev->mc.real_vram_size = RREG32(RADEON_CONFIG_MEMSIZE);
        rdev->mc.mc_vram_size = rdev->mc.real_vram_size;
-        rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
+        rdev->mc.aper_base = pci_resource_start(rdev->pdev, 0);
-        rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
+        rdev->mc.aper_size = pci_resource_len(rdev->pdev, 0);
        rdev->mc.visible_vram_size = rdev->mc.aper_size;
        base = RREG32_MC(R_000100_MCCFG_FB_LOCATION);
        base = G_000100_MC_FB_START(base) << 16;
-        rs690_pm_info(rdev);
        rdev->mc.igp_sideport_enabled = radeon_atombios_sideport_present(rdev);
+        rs690_pm_info(rdev);
        radeon_vram_location(rdev, &rdev->mc, base);
+        rdev->mc.gtt_base_align = rdev->mc.gtt_size - 1;
        radeon_gtt_location(rdev, &rdev->mc);
        radeon_update_bandwidth_info(rdev);
 }
@@ -397,7 +398,9 @@ void rs690_bandwidth_update(struct radeon_device *rdev)
        struct drm_display_mode *mode1 = NULL;
        struct rs690_watermark wm0;
        struct rs690_watermark wm1;
-        u32 tmp, d1mode_priority_a_cnt, d2mode_priority_a_cnt;
+        u32 tmp;
+        u32 d1mode_priority_a_cnt = S_006548_D1MODE_PRIORITY_A_OFF(1);
+        u32 d2mode_priority_a_cnt = S_006548_D1MODE_PRIORITY_A_OFF(1);
        fixed20_12 priority_mark02, priority_mark12, fill_rate;
        fixed20_12 a, b;
@@ -494,10 +497,6 @@ void rs690_bandwidth_update(struct radeon_device *rdev)
                        d1mode_priority_a_cnt |= S_006548_D1MODE_PRIORITY_A_ALWAYS_ON(1);
                        d2mode_priority_a_cnt |= S_006D48_D2MODE_PRIORITY_A_ALWAYS_ON(1);
                }
-                WREG32(R_006548_D1MODE_PRIORITY_A_CNT, d1mode_priority_a_cnt);
-                WREG32(R_00654C_D1MODE_PRIORITY_B_CNT, d1mode_priority_a_cnt);
-                WREG32(R_006D48_D2MODE_PRIORITY_A_CNT, d2mode_priority_a_cnt);
-                WREG32(R_006D4C_D2MODE_PRIORITY_B_CNT, d2mode_priority_a_cnt);
        } else if (mode0) {
                if (dfixed_trunc(wm0.dbpp) > 64)
                        a.full = dfixed_mul(wm0.dbpp, wm0.num_line_pair);
@@ -527,13 +526,7 @@ void rs690_bandwidth_update(struct radeon_device *rdev)
                d1mode_priority_a_cnt = dfixed_trunc(priority_mark02);
                if (rdev->disp_priority == 2)
                        d1mode_priority_a_cnt |= S_006548_D1MODE_PRIORITY_A_ALWAYS_ON(1);
-                WREG32(R_006548_D1MODE_PRIORITY_A_CNT, d1mode_priority_a_cnt);
+        } else if (mode1) {
-                WREG32(R_00654C_D1MODE_PRIORITY_B_CNT, d1mode_priority_a_cnt);
-                WREG32(R_006D48_D2MODE_PRIORITY_A_CNT,
-                        S_006D48_D2MODE_PRIORITY_A_OFF(1));
-                WREG32(R_006D4C_D2MODE_PRIORITY_B_CNT,
-                        S_006D4C_D2MODE_PRIORITY_B_OFF(1));
-        } else {
                if (dfixed_trunc(wm1.dbpp) > 64)
                        a.full = dfixed_mul(wm1.dbpp, wm1.num_line_pair);
                else
@@ -562,13 +555,12 @@ void rs690_bandwidth_update(struct radeon_device *rdev)
                d2mode_priority_a_cnt = dfixed_trunc(priority_mark12);
                if (rdev->disp_priority == 2)
                        d2mode_priority_a_cnt |= S_006D48_D2MODE_PRIORITY_A_ALWAYS_ON(1);
-                WREG32(R_006548_D1MODE_PRIORITY_A_CNT,
-                        S_006548_D1MODE_PRIORITY_A_OFF(1));
-                WREG32(R_00654C_D1MODE_PRIORITY_B_CNT,
-                        S_00654C_D1MODE_PRIORITY_B_OFF(1));
-                WREG32(R_006D48_D2MODE_PRIORITY_A_CNT, d2mode_priority_a_cnt);
-                WREG32(R_006D4C_D2MODE_PRIORITY_B_CNT, d2mode_priority_a_cnt);
        }
+        WREG32(R_006548_D1MODE_PRIORITY_A_CNT, d1mode_priority_a_cnt);
+        WREG32(R_00654C_D1MODE_PRIORITY_B_CNT, d1mode_priority_a_cnt);
+        WREG32(R_006D48_D2MODE_PRIORITY_A_CNT, d2mode_priority_a_cnt);
+        WREG32(R_006D4C_D2MODE_PRIORITY_B_CNT, d2mode_priority_a_cnt);
 }
 uint32_t rs690_mc_rreg(struct radeon_device *rdev, uint32_t reg)
@@ -640,6 +632,13 @@ static int rs690_startup(struct radeon_device *rdev)
                dev_err(rdev->dev, "failled initializing IB (%d).\n", r);
                return r;
        }
+        r = r600_audio_init(rdev);
+        if (r) {
+                dev_err(rdev->dev, "failed initializing audio\n");
+                return r;
+        }
        return 0;
 }
@@ -666,6 +665,7 @@ int rs690_resume(struct radeon_device *rdev)
 int rs690_suspend(struct radeon_device *rdev)
 {
+        r600_audio_fini(rdev);
        r100_cp_disable(rdev);
        r100_wb_disable(rdev);
        rs600_irq_disable(rdev);
@@ -675,6 +675,7 @@ int rs690_suspend(struct radeon_device *rdev)
 void rs690_fini(struct radeon_device *rdev)
 {
+        r600_audio_fini(rdev);
        r100_cp_fini(rdev);
        r100_wb_fini(rdev);
        r100_ib_fini(rdev);
@@ -698,6 +699,8 @@ int rs690_init(struct radeon_device *rdev)
        radeon_scratch_init(rdev);
        /* Initialize surface registers */
        radeon_surface_init(rdev);
+        /* restore some register to sane defaults */
+        r100_restore_sanity(rdev);
        /* TODO: disable VGA need to use VGA request */
        /* BIOS*/
        if (!radeon_get_bios(rdev)) {
diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c
index 7d9a7b0a180a..4d6e86041a9f 100644
--- a/drivers/gpu/drm/radeon/rv515.c
+++ b/drivers/gpu/drm/radeon/rv515.c
@@ -195,6 +195,7 @@ void rv515_mc_init(struct radeon_device *rdev)
        rv515_vram_get_type(rdev);
        r100_vram_init_sizes(rdev);
        radeon_vram_location(rdev, &rdev->mc, 0);
+        rdev->mc.gtt_base_align = 0;
        if (!(rdev->flags & RADEON_IS_AGP))
                radeon_gtt_location(rdev, &rdev->mc);
        radeon_update_bandwidth_info(rdev);
@@ -468,6 +469,8 @@ int rv515_init(struct radeon_device *rdev)
        /* Initialize surface registers */
        radeon_surface_init(rdev);
        /* TODO: disable VGA need to use VGA request */
+        /* restore some register to sane defaults */
+        r100_restore_sanity(rdev);
        /* BIOS*/
        if (!radeon_get_bios(rdev)) {
                if (ASIC_IS_AVIVO(rdev))
@@ -924,7 +927,9 @@ void rv515_bandwidth_avivo_update(struct radeon_device *rdev)
        struct drm_display_mode *mode1 = NULL;
        struct rv515_watermark wm0;
        struct rv515_watermark wm1;
-        u32 tmp, d1mode_priority_a_cnt, d2mode_priority_a_cnt;
+        u32 tmp;
+        u32 d1mode_priority_a_cnt = MODE_PRIORITY_OFF;
+        u32 d2mode_priority_a_cnt = MODE_PRIORITY_OFF;
        fixed20_12 priority_mark02, priority_mark12, fill_rate;
        fixed20_12 a, b;
@@ -998,10 +1003,6 @@ void rv515_bandwidth_avivo_update(struct radeon_device *rdev)
                        d1mode_priority_a_cnt |= MODE_PRIORITY_ALWAYS_ON;
                        d2mode_priority_a_cnt |= MODE_PRIORITY_ALWAYS_ON;
                }
-                WREG32(D1MODE_PRIORITY_A_CNT, d1mode_priority_a_cnt);
-                WREG32(D1MODE_PRIORITY_B_CNT, d1mode_priority_a_cnt);
-                WREG32(D2MODE_PRIORITY_A_CNT, d2mode_priority_a_cnt);
-                WREG32(D2MODE_PRIORITY_B_CNT, d2mode_priority_a_cnt);
        } else if (mode0) {
                if (dfixed_trunc(wm0.dbpp) > 64)
                        a.full = dfixed_div(wm0.dbpp, wm0.num_line_pair);
@@ -1031,11 +1032,7 @@ void rv515_bandwidth_avivo_update(struct radeon_device *rdev)
                d1mode_priority_a_cnt = dfixed_trunc(priority_mark02);
                if (rdev->disp_priority == 2)
                        d1mode_priority_a_cnt |= MODE_PRIORITY_ALWAYS_ON;
-                WREG32(D1MODE_PRIORITY_A_CNT, d1mode_priority_a_cnt);
+        } else if (mode1) {
-                WREG32(D1MODE_PRIORITY_B_CNT, d1mode_priority_a_cnt);
-                WREG32(D2MODE_PRIORITY_A_CNT, MODE_PRIORITY_OFF);
-                WREG32(D2MODE_PRIORITY_B_CNT, MODE_PRIORITY_OFF);
-        } else {
                if (dfixed_trunc(wm1.dbpp) > 64)
                        a.full = dfixed_div(wm1.dbpp, wm1.num_line_pair);
                else
@@ -1064,11 +1061,12 @@ void rv515_bandwidth_avivo_update(struct radeon_device *rdev)
                d2mode_priority_a_cnt = dfixed_trunc(priority_mark12);
                if (rdev->disp_priority == 2)
                        d2mode_priority_a_cnt |= MODE_PRIORITY_ALWAYS_ON;
-                WREG32(D1MODE_PRIORITY_A_CNT, MODE_PRIORITY_OFF);
-                WREG32(D1MODE_PRIORITY_B_CNT, MODE_PRIORITY_OFF);
-                WREG32(D2MODE_PRIORITY_A_CNT, d2mode_priority_a_cnt);
-                WREG32(D2MODE_PRIORITY_B_CNT, d2mode_priority_a_cnt);
        }
+        WREG32(D1MODE_PRIORITY_A_CNT, d1mode_priority_a_cnt);
+        WREG32(D1MODE_PRIORITY_B_CNT, d1mode_priority_a_cnt);
+        WREG32(D2MODE_PRIORITY_A_CNT, d2mode_priority_a_cnt);
+        WREG32(D2MODE_PRIORITY_B_CNT, d2mode_priority_a_cnt);
 }
 void rv515_bandwidth_update(struct radeon_device *rdev)
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index b7fd82064922..f1c796810117 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -42,6 +42,21 @@
 static void rv770_gpu_init(struct radeon_device *rdev);
 void rv770_fini(struct radeon_device *rdev);
+/* get temperature in millidegrees */
+u32 rv770_get_temp(struct radeon_device *rdev)
+{
+        u32 temp = (RREG32(CG_MULT_THERMAL_STATUS) & ASIC_T_MASK) >>
+                ASIC_T_SHIFT;
+        u32 actual_temp = 0;
+        if ((temp >> 9) & 1)
+                actual_temp = 0;
+        else
+                actual_temp = (temp >> 1) & 0xff;
+        return actual_temp * 1000;
+}
 void rv770_pm_misc(struct radeon_device *rdev)
 {
        int req_ps_idx = rdev->pm.requested_power_state_index;
@@ -189,7 +204,10 @@ static void rv770_mc_program(struct radeon_device *rdev)
                WREG32((0x2c20 + j), 0x00000000);
                WREG32((0x2c24 + j), 0x00000000);
        }
-        WREG32(HDP_REG_COHERENCY_FLUSH_CNTL, 0);
+        /* r7xx hw bug.  Read from HDP_DEBUG1 rather
+         * than writing to HDP_REG_COHERENCY_FLUSH_CNTL
+         */
+        tmp = RREG32(HDP_DEBUG1);
        rv515_mc_stop(rdev, &save);
        if (r600_mc_wait_for_idle(rdev)) {
@@ -659,8 +677,9 @@ static void rv770_gpu_init(struct radeon_device *rdev)
                                                                 r600_count_pipe_bits((cc_rb_backend_disable &
                                                                                       R7XX_MAX_BACKENDS_MASK) >> 16)),
                                                                (cc_rb_backend_disable >> 16));
-        gb_tiling_config |= BACKEND_MAP(backend_map);
+        rdev->config.rv770.tile_config = gb_tiling_config;
+        gb_tiling_config |= BACKEND_MAP(backend_map);
        WREG32(GB_TILING_CONFIG, gb_tiling_config);
        WREG32(DCP_TILING_CONFIG, (gb_tiling_config & 0xffff));
@@ -919,8 +938,8 @@ int rv770_mc_init(struct radeon_device *rdev)
        }
        rdev->mc.vram_width = numchan * chansize;
        /* Could aper size report 0 ? */
-        rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
+        rdev->mc.aper_base = pci_resource_start(rdev->pdev, 0);
-        rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
+        rdev->mc.aper_size = pci_resource_len(rdev->pdev, 0);
        /* Setup GPU memory space */
        rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE);
        rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE);
diff --git a/drivers/gpu/drm/radeon/rv770d.h b/drivers/gpu/drm/radeon/rv770d.h
index 9506f8cb99e0..b7a5a20e81dc 100644
--- a/drivers/gpu/drm/radeon/rv770d.h
+++ b/drivers/gpu/drm/radeon/rv770d.h
@@ -122,12 +122,18 @@
 #define         GUI_ACTIVE                                      (1<<31)
 #define GRBM_STATUS2                                    0x8014
+#define CG_MULT_THERMAL_STATUS                          0x740
+#define         ASIC_T(x)                               ((x) << 16)
+#define         ASIC_T_MASK                             0x3FF0000
+#define         ASIC_T_SHIFT                            16
 #define HDP_HOST_PATH_CNTL                              0x2C00
 #define HDP_NONSURFACE_BASE                             0x2C04
 #define HDP_NONSURFACE_INFO                             0x2C08
 #define HDP_NONSURFACE_SIZE                             0x2C0C
 #define HDP_REG_COHERENCY_FLUSH_CNTL                    0x54A0
 #define HDP_TILING_CONFIG                               0x2F3C
+#define HDP_DEBUG1                                      0x2F34
 #define MC_SHARED_CHMAP                                         0x2004
 #define         NOOFCHAN_SHIFT                                  12
diff --git a/drivers/gpu/drm/savage/savage_bci.c b/drivers/gpu/drm/savage/savage_bci.c
index 2d0c9ca484c5..976dc8d25280 100644
--- a/drivers/gpu/drm/savage/savage_bci.c
+++ b/drivers/gpu/drm/savage/savage_bci.c
@@ -552,7 +552,7 @@ int savage_driver_load(struct drm_device *dev, unsigned long chipset)
 /*
- * Initalize mappings. On Savage4 and SavageIX the alignment
+ * Initialize mappings. On Savage4 and SavageIX the alignment
 * and size of the aperture is not suitable for automatic MTRR setup
 * in drm_addmap. Therefore we add them manually before the maps are
 * initialized, and tear them down on last close.
@@ -573,13 +573,13 @@ int savage_driver_firstopen(struct drm_device *dev)
        dev_priv->mtrr[2].handle = -1;
        if (S3_SAVAGE3D_SERIES(dev_priv->chipset)) {
                fb_rsrc = 0;
-                fb_base = drm_get_resource_start(dev, 0);
+                fb_base = pci_resource_start(dev->pdev, 0);
                fb_size = SAVAGE_FB_SIZE_S3;
                mmio_base = fb_base + SAVAGE_FB_SIZE_S3;
                aper_rsrc = 0;
                aperture_base = fb_base + SAVAGE_APERTURE_OFFSET;
                /* this should always be true */
-                if (drm_get_resource_len(dev, 0) == 0x08000000) {
+                if (pci_resource_len(dev->pdev, 0) == 0x08000000) {
                        /* Don't make MMIO write-cobining! We need 3
                         * MTRRs. */
                        dev_priv->mtrr[0].base = fb_base;
@@ -599,18 +599,19 @@ int savage_driver_firstopen(struct drm_device *dev)
                                         dev_priv->mtrr[2].size, DRM_MTRR_WC);
                } else {
                        DRM_ERROR("strange pci_resource_len %08llx\n",
-                                  (unsigned long long)drm_get_resource_len(dev, 0));
+                                  (unsigned long long)
+                                  pci_resource_len(dev->pdev, 0));
                }
        } else if (dev_priv->chipset != S3_SUPERSAVAGE &&
                   dev_priv->chipset != S3_SAVAGE2000) {
-                mmio_base = drm_get_resource_start(dev, 0);
+                mmio_base = pci_resource_start(dev->pdev, 0);
                fb_rsrc = 1;
-                fb_base = drm_get_resource_start(dev, 1);
+                fb_base = pci_resource_start(dev->pdev, 1);
                fb_size = SAVAGE_FB_SIZE_S4;
                aper_rsrc = 1;
                aperture_base = fb_base + SAVAGE_APERTURE_OFFSET;
                /* this should always be true */
-                if (drm_get_resource_len(dev, 1) == 0x08000000) {
+                if (pci_resource_len(dev->pdev, 1) == 0x08000000) {
                        /* Can use one MTRR to cover both fb and
                         * aperture. */
                        dev_priv->mtrr[0].base = fb_base;
@@ -620,15 +621,16 @@ int savage_driver_firstopen(struct drm_device *dev)
                                         dev_priv->mtrr[0].size, DRM_MTRR_WC);
                } else {
                        DRM_ERROR("strange pci_resource_len %08llx\n",
-                                  (unsigned long long)drm_get_resource_len(dev, 1));
+                                  (unsigned long long)
+                                  pci_resource_len(dev->pdev, 1));
                }
        } else {
-                mmio_base = drm_get_resource_start(dev, 0);
+                mmio_base = pci_resource_start(dev->pdev, 0);
                fb_rsrc = 1;
-                fb_base = drm_get_resource_start(dev, 1);
+                fb_base = pci_resource_start(dev->pdev, 1);
-                fb_size = drm_get_resource_len(dev, 1);
+                fb_size = pci_resource_len(dev->pdev, 1);
                aper_rsrc = 2;
-                aperture_base = drm_get_resource_start(dev, 2);
+                aperture_base = pci_resource_start(dev->pdev, 2);
                /* Automatic MTRR setup will do the right thing. */
        }
diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
index 4fd1f067d380..776bf9e9ea1a 100644
--- a/drivers/gpu/drm/sis/sis_drv.c
+++ b/drivers/gpu/drm/sis/sis_drv.c
@@ -47,9 +47,8 @@ static int sis_driver_load(struct drm_device *dev, unsigned long chipset)
        dev->dev_private = (void *)dev_priv;
        dev_priv->chipset = chipset;
        ret = drm_sman_init(&dev_priv->sman, 2, 12, 8);
-        if (ret) {
+        if (ret)
                kfree(dev_priv);
-        }
        return ret;
 }
diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c
index af22111397d8..07d0f2979cac 100644
--- a/drivers/gpu/drm/sis/sis_mm.c
+++ b/drivers/gpu/drm/sis/sis_mm.c
@@ -78,7 +78,7 @@ static unsigned long sis_sman_mm_offset(void *private, void *ref)
 #else /* CONFIG_FB_SIS[_MODULE] */
 #define SIS_MM_ALIGN_SHIFT 4
-#define SIS_MM_ALIGN_MASK ( (1 << SIS_MM_ALIGN_SHIFT) - 1)
+#define SIS_MM_ALIGN_MASK ((1 << SIS_MM_ALIGN_SHIFT) - 1)
 #endif /* CONFIG_FB_SIS[_MODULE] */
@@ -225,9 +225,8 @@ static drm_local_map_t *sis_reg_init(struct drm_device *dev)
                map = entry->map;
                if (!map)
                        continue;
-                if (map->type == _DRM_REGISTERS) {
+                if (map->type == _DRM_REGISTERS)
                        return map;
-                }
        }
        return NULL;
 }
@@ -264,10 +263,10 @@ int sis_idle(struct drm_device *dev)
        end = jiffies + (DRM_HZ * 3);
-        for (i=0; i<4; ++i) {
+        for (i = 0; i < 4; ++i) {
                do {
                        idle_reg = SIS_READ(0x85cc);
-                } while ( !time_after_eq(jiffies, end) &&
+                } while (!time_after_eq(jiffies, end) &&
                          ((idle_reg & 0x80000000) != 0x80000000));
        }
@@ -301,7 +300,7 @@ void sis_lastclose(struct drm_device *dev)
        mutex_unlock(&dev->struct_mutex);
 }
-void sis_reclaim_buffers_locked(struct drm_device * dev,
+void sis_reclaim_buffers_locked(struct drm_device *dev,
                                struct drm_file *file_priv)
 {
        drm_sis_private_t *dev_priv = dev->dev_private;
@@ -312,9 +311,8 @@ void sis_reclaim_buffers_locked(struct drm_device * dev,
                return;
        }
-        if (dev->driver->dma_quiescent) {
+        if (dev->driver->dma_quiescent)
                dev->driver->dma_quiescent(dev);
-        }
        drm_sman_owner_cleanup(&dev_priv->sman, (unsigned long)file_priv);
        mutex_unlock(&dev->struct_mutex);
diff --git a/drivers/gpu/drm/ttm/Makefile b/drivers/gpu/drm/ttm/Makefile
index 4256e2006476..b256d4adfafe 100644
--- a/drivers/gpu/drm/ttm/Makefile
+++ b/drivers/gpu/drm/ttm/Makefile
@@ -3,7 +3,7 @@
 ccflags-y := -Iinclude/drm
 ttm-y := ttm_agp_backend.o ttm_memory.o ttm_tt.o ttm_bo.o \
-        ttm_bo_util.o ttm_bo_vm.o ttm_module.o ttm_global.o \
+        ttm_bo_util.o ttm_bo_vm.o ttm_module.o \
        ttm_object.o ttm_lock.o ttm_execbuf_util.o ttm_page_alloc.o
 obj-$(CONFIG_DRM_TTM) += ttm.o
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 555ebb12ace8..cb4cf7ef4d1e 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -476,7 +476,6 @@ static int ttm_bo_cleanup_refs(struct ttm_buffer_object *bo, bool remove_all)
                        ++put_count;
                }
                if (bo->mem.mm_node) {
-                        bo->mem.mm_node->private = NULL;
                        drm_mm_put_block(bo->mem.mm_node);
                        bo->mem.mm_node = NULL;
                }
@@ -670,7 +669,6 @@ static int ttm_bo_evict(struct ttm_buffer_object *bo, bool interruptible,
                        printk(KERN_ERR TTM_PFX "Buffer eviction failed\n");
                spin_lock(&glob->lru_lock);
                if (evict_mem.mm_node) {
-                        evict_mem.mm_node->private = NULL;
                        drm_mm_put_block(evict_mem.mm_node);
                        evict_mem.mm_node = NULL;
                }
@@ -929,8 +927,6 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,
                mem->mm_node = node;
                mem->mem_type = mem_type;
                mem->placement = cur_flags;
-                if (node)
-                        node->private = bo;
                return 0;
        }
@@ -973,7 +969,6 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,
                                                interruptible, no_wait_reserve, no_wait_gpu);
                if (ret == 0 && mem->mm_node) {
                        mem->placement = cur_flags;
-                        mem->mm_node->private = bo;
                        return 0;
                }
                if (ret == -ERESTARTSYS)
@@ -1029,7 +1024,6 @@ int ttm_bo_move_buffer(struct ttm_buffer_object *bo,
 out_unlock:
        if (ret && mem.mm_node) {
                spin_lock(&glob->lru_lock);
-                mem.mm_node->private = NULL;
                drm_mm_put_block(mem.mm_node);
                spin_unlock(&glob->lru_lock);
        }
@@ -1401,7 +1395,7 @@ static void ttm_bo_global_kobj_release(struct kobject *kobj)
        kfree(glob);
 }
-void ttm_bo_global_release(struct ttm_global_reference *ref)
+void ttm_bo_global_release(struct drm_global_reference *ref)
 {
        struct ttm_bo_global *glob = ref->object;
@@ -1410,7 +1404,7 @@ void ttm_bo_global_release(struct ttm_global_reference *ref)
 }
 EXPORT_SYMBOL(ttm_bo_global_release);
-int ttm_bo_global_init(struct ttm_global_reference *ref)
+int ttm_bo_global_init(struct drm_global_reference *ref)
 {
        struct ttm_bo_global_ref *bo_ref =
                container_of(ref, struct ttm_bo_global_ref, ref);
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index 13012a1f1486..7cffb3e04232 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -353,8 +353,6 @@ static int ttm_buffer_object_transfer(struct ttm_buffer_object *bo,
        fbo->vm_node = NULL;
        fbo->sync_obj = driver->sync_obj_ref(bo->sync_obj);
-        if (fbo->mem.mm_node)
-                fbo->mem.mm_node->private = (void *)fbo;
        kref_init(&fbo->list_kref);
        kref_init(&fbo->kref);
        fbo->destroy = &ttm_transfered_destroy;
diff --git a/drivers/gpu/drm/ttm/ttm_module.c b/drivers/gpu/drm/ttm/ttm_module.c
index 9a6edbfeaa9e..902d7cf9fb4e 100644
--- a/drivers/gpu/drm/ttm/ttm_module.c
+++ b/drivers/gpu/drm/ttm/ttm_module.c
@@ -70,8 +70,6 @@ static int __init ttm_init(void)
        if (unlikely(ret != 0))
                return ret;
-        ttm_global_init();
        atomic_set(&device_released, 0);
        ret = drm_class_device_register(&ttm_drm_class_device);
        if (unlikely(ret != 0))
@@ -81,7 +79,6 @@ static int __init ttm_init(void)
 out_no_dev_reg:
        atomic_set(&device_released, 1);
        wake_up_all(&exit_q);
-        ttm_global_release();
        return ret;
 }
@@ -95,7 +92,6 @@ static void __exit ttm_exit(void)
         */
        wait_event(exit_q, atomic_read(&device_released) == 1);
-        ttm_global_release();
 }
 module_init(ttm_init);
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
index 2f047577b1e3..ca904799f018 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
@@ -40,11 +40,13 @@
 #include <linux/slab.h>
 #include <asm/atomic.h>
-#include <asm/agp.h>
 #include "ttm/ttm_bo_driver.h"
 #include "ttm/ttm_page_alloc.h"
+#ifdef TTM_HAS_AGP
+#include <asm/agp.h>
+#endif
 #define NUM_PAGES_TO_ALLOC              (PAGE_SIZE/sizeof(struct page *))
 #define SMALL_ALLOCATION                16
@@ -104,7 +106,6 @@ struct ttm_pool_opts {
 struct ttm_pool_manager {
        struct kobject          kobj;
        struct shrinker         mm_shrink;
-        atomic_t                page_alloc_inited;
        struct ttm_pool_opts    options;
        union {
@@ -142,7 +143,7 @@ static void ttm_pool_kobj_release(struct kobject *kobj)
 {
        struct ttm_pool_manager *m =
                container_of(kobj, struct ttm_pool_manager, kobj);
-        (void)m;
+        kfree(m);
 }
 static ssize_t ttm_pool_store(struct kobject *kobj,
@@ -214,9 +215,7 @@ static struct kobj_type ttm_pool_kobj_type = {
        .default_attrs = ttm_pool_attrs,
 };
-static struct ttm_pool_manager _manager = {
+static struct ttm_pool_manager *_manager;
-        .page_alloc_inited      = ATOMIC_INIT(0)
-};
 #ifndef CONFIG_X86
 static int set_pages_array_wb(struct page **pages, int addrinarray)
@@ -271,7 +270,7 @@ static struct ttm_page_pool *ttm_get_pool(int flags,
        if (flags & TTM_PAGE_FLAG_DMA32)
                pool_index |= 0x2;
-        return &_manager.pools[pool_index];
+        return &_manager->pools[pool_index];
 }
 /* set memory back to wb and free the pages. */
@@ -387,7 +386,7 @@ static int ttm_pool_get_num_unused_pages(void)
        unsigned i;
        int total = 0;
        for (i = 0; i < NUM_POOLS; ++i)
-                total += _manager.pools[i].npages;
+                total += _manager->pools[i].npages;
        return total;
 }
@@ -395,7 +394,7 @@ static int ttm_pool_get_num_unused_pages(void)
 /**
 * Callback for mm to request pool to reduce number of page held.
 */
-static int ttm_pool_mm_shrink(int shrink_pages, gfp_t gfp_mask)
+static int ttm_pool_mm_shrink(struct shrinker *shrink, int shrink_pages, gfp_t gfp_mask)
 {
        static atomic_t start_pool = ATOMIC_INIT(0);
        unsigned i;
@@ -408,7 +407,7 @@ static int ttm_pool_mm_shrink(int shrink_pages, gfp_t gfp_mask)
                unsigned nr_free = shrink_pages;
                if (shrink_pages == 0)
                        break;
-                pool = &_manager.pools[(i + pool_offset)%NUM_POOLS];
+                pool = &_manager->pools[(i + pool_offset)%NUM_POOLS];
                shrink_pages = ttm_page_pool_free(pool, nr_free);
        }
        /* return estimated number of unused pages in pool */
@@ -576,10 +575,10 @@ static void ttm_page_pool_fill_locked(struct ttm_page_pool *pool,
        /* If allocation request is small and there is not enough
         * pages in pool we fill the pool first */
-        if (count < _manager.options.small
+        if (count < _manager->options.small
                && count > pool->npages) {
                struct list_head new_pages;
-                unsigned alloc_size = _manager.options.alloc_size;
+                unsigned alloc_size = _manager->options.alloc_size;
                /**
                 * Can't change page caching if in irqsave context. We have to
@@ -759,8 +758,8 @@ void ttm_put_pages(struct list_head *pages, unsigned page_count, int flags,
        pool->npages += page_count;
        /* Check that we don't go over the pool limit */
        page_count = 0;
-        if (pool->npages > _manager.options.max_size) {
+        if (pool->npages > _manager->options.max_size) {
-                page_count = pool->npages - _manager.options.max_size;
+                page_count = pool->npages - _manager->options.max_size;
                /* free at least NUM_PAGES_TO_ALLOC number of pages
                 * to reduce calls to set_memory_wb */
                if (page_count < NUM_PAGES_TO_ALLOC)
@@ -785,33 +784,36 @@ static void ttm_page_pool_init_locked(struct ttm_page_pool *pool, int flags,
 int ttm_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages)
 {
        int ret;
-        if (atomic_add_return(1, &_manager.page_alloc_inited) > 1)
-                return 0;
+        WARN_ON(_manager);
        printk(KERN_INFO TTM_PFX "Initializing pool allocator.\n");
-        ttm_page_pool_init_locked(&_manager.wc_pool, GFP_HIGHUSER, "wc");
+        _manager = kzalloc(sizeof(*_manager), GFP_KERNEL);
+        ttm_page_pool_init_locked(&_manager->wc_pool, GFP_HIGHUSER, "wc");
-        ttm_page_pool_init_locked(&_manager.uc_pool, GFP_HIGHUSER, "uc");
+        ttm_page_pool_init_locked(&_manager->uc_pool, GFP_HIGHUSER, "uc");
-        ttm_page_pool_init_locked(&_manager.wc_pool_dma32, GFP_USER | GFP_DMA32,
+        ttm_page_pool_init_locked(&_manager->wc_pool_dma32,
-                        "wc dma");
+                                  GFP_USER | GFP_DMA32, "wc dma");
-        ttm_page_pool_init_locked(&_manager.uc_pool_dma32, GFP_USER | GFP_DMA32,
+        ttm_page_pool_init_locked(&_manager->uc_pool_dma32,
-                        "uc dma");
+                                  GFP_USER | GFP_DMA32, "uc dma");
-        _manager.options.max_size = max_pages;
+        _manager->options.max_size = max_pages;
-        _manager.options.small = SMALL_ALLOCATION;
+        _manager->options.small = SMALL_ALLOCATION;
-        _manager.options.alloc_size = NUM_PAGES_TO_ALLOC;
+        _manager->options.alloc_size = NUM_PAGES_TO_ALLOC;
-        kobject_init(&_manager.kobj, &ttm_pool_kobj_type);
+        ret = kobject_init_and_add(&_manager->kobj, &ttm_pool_kobj_type,
-        ret = kobject_add(&_manager.kobj, &glob->kobj, "pool");
+                                   &glob->kobj, "pool");
        if (unlikely(ret != 0)) {
-                kobject_put(&_manager.kobj);
+                kobject_put(&_manager->kobj);
+                _manager = NULL;
                return ret;
        }
-        ttm_pool_mm_shrink_init(&_manager);
+        ttm_pool_mm_shrink_init(_manager);
        return 0;
 }
@@ -820,16 +822,14 @@ void ttm_page_alloc_fini()
 {
        int i;
-        if (atomic_sub_return(1, &_manager.page_alloc_inited) > 0)
-                return;
        printk(KERN_INFO TTM_PFX "Finalizing pool allocator.\n");
-        ttm_pool_mm_shrink_fini(&_manager);
+        ttm_pool_mm_shrink_fini(_manager);
        for (i = 0; i < NUM_POOLS; ++i)
-                ttm_page_pool_free(&_manager.pools[i], FREE_ALL_PAGES);
+                ttm_page_pool_free(&_manager->pools[i], FREE_ALL_PAGES);
-        kobject_put(&_manager.kobj);
+        kobject_put(&_manager->kobj);
+        _manager = NULL;
 }
 int ttm_page_alloc_debugfs(struct seq_file *m, void *data)
@@ -837,14 +837,14 @@ int ttm_page_alloc_debugfs(struct seq_file *m, void *data)
        struct ttm_page_pool *p;
        unsigned i;
        char *h[] = {"pool", "refills", "pages freed", "size"};
-        if (atomic_read(&_manager.page_alloc_inited) == 0) {
+        if (!_manager) {
                seq_printf(m, "No pool allocator running.\n");
                return 0;
        }
        seq_printf(m, "%6s %12s %13s %8s\n",
                        h[0], h[1], h[2], h[3]);
        for (i = 0; i < NUM_POOLS; ++i) {
-                p = &_manager.pools[i];
+                p = &_manager->pools[i];
                seq_printf(m, "%6s %12ld %13ld %8d\n",
                                p->name, p->nrefills,
diff --git a/drivers/gpu/drm/via/via_dma.c b/drivers/gpu/drm/via/via_dma.c
index bfb92d283260..68dda74a50ae 100644
--- a/drivers/gpu/drm/via/via_dma.c
+++ b/drivers/gpu/drm/via/via_dma.c
@@ -58,28 +58,29 @@
        *((uint32_t *)(vb)) = ((nReg) >> 2) | HALCYON_HEADER1;  \
        *((uint32_t *)(vb) + 1) = (nData);                      \
        vb = ((uint32_t *)vb) + 2;                              \
-        dev_priv->dma_low +=8;                                  \
+        dev_priv->dma_low += 8;                                 \
 }
 #define via_flush_write_combine() DRM_MEMORYBARRIER()
-#define VIA_OUT_RING_QW(w1,w2)                  \
+#define VIA_OUT_RING_QW(w1, w2) do {            \
        *vb++ = (w1);                           \
        *vb++ = (w2);                           \
-        dev_priv->dma_low += 8;
+        dev_priv->dma_low += 8;                 \
+} while (0)
-static void via_cmdbuf_start(drm_via_private_t * dev_priv);
+static void via_cmdbuf_start(drm_via_private_t *dev_priv);
-static void via_cmdbuf_pause(drm_via_private_t * dev_priv);
+static void via_cmdbuf_pause(drm_via_private_t *dev_priv);
-static void via_cmdbuf_reset(drm_via_private_t * dev_priv);
+static void via_cmdbuf_reset(drm_via_private_t *dev_priv);
-static void via_cmdbuf_rewind(drm_via_private_t * dev_priv);
+static void via_cmdbuf_rewind(drm_via_private_t *dev_priv);
-static int via_wait_idle(drm_via_private_t * dev_priv);
+static int via_wait_idle(drm_via_private_t *dev_priv);
-static void via_pad_cache(drm_via_private_t * dev_priv, int qwords);
+static void via_pad_cache(drm_via_private_t *dev_priv, int qwords);
 /*
 * Free space in command buffer.
 */
-static uint32_t via_cmdbuf_space(drm_via_private_t * dev_priv)
+static uint32_t via_cmdbuf_space(drm_via_private_t *dev_priv)
 {
        uint32_t agp_base = dev_priv->dma_offset + (uint32_t) dev_priv->agpAddr;
        uint32_t hw_addr = *(dev_priv->hw_addr_ptr) - agp_base;
@@ -93,7 +94,7 @@ static uint32_t via_cmdbuf_space(drm_via_private_t * dev_priv)
 * How much does the command regulator lag behind?
 */
-static uint32_t via_cmdbuf_lag(drm_via_private_t * dev_priv)
+static uint32_t via_cmdbuf_lag(drm_via_private_t *dev_priv)
 {
        uint32_t agp_base = dev_priv->dma_offset + (uint32_t) dev_priv->agpAddr;
        uint32_t hw_addr = *(dev_priv->hw_addr_ptr) - agp_base;
@@ -108,7 +109,7 @@ static uint32_t via_cmdbuf_lag(drm_via_private_t * dev_priv)
 */
 static inline int
-via_cmdbuf_wait(drm_via_private_t * dev_priv, unsigned int size)
+via_cmdbuf_wait(drm_via_private_t *dev_priv, unsigned int size)
 {
        uint32_t agp_base = dev_priv->dma_offset + (uint32_t) dev_priv->agpAddr;
        uint32_t cur_addr, hw_addr, next_addr;
@@ -146,14 +147,13 @@ static inline uint32_t *via_check_dma(drm_via_private_t * dev_priv,
            dev_priv->dma_high) {
                via_cmdbuf_rewind(dev_priv);
        }
-        if (via_cmdbuf_wait(dev_priv, size) != 0) {
+        if (via_cmdbuf_wait(dev_priv, size) != 0)
                return NULL;
-        }
        return (uint32_t *) (dev_priv->dma_ptr + dev_priv->dma_low);
 }
-int via_dma_cleanup(struct drm_device * dev)
+int via_dma_cleanup(struct drm_device *dev)
 {
        if (dev->dev_private) {
                drm_via_private_t *dev_priv =
@@ -171,9 +171,9 @@ int via_dma_cleanup(struct drm_device * dev)
        return 0;
 }
-static int via_initialize(struct drm_device * dev,
+static int via_initialize(struct drm_device *dev,
-                          drm_via_private_t * dev_priv,
+                          drm_via_private_t *dev_priv,
-                          drm_via_dma_init_t * init)
+                          drm_via_dma_init_t *init)
 {
        if (!dev_priv || !dev_priv->mmio) {
                DRM_ERROR("via_dma_init called before via_map_init\n");
@@ -258,7 +258,7 @@ static int via_dma_init(struct drm_device *dev, void *data, struct drm_file *fil
        return retcode;
 }
-static int via_dispatch_cmdbuffer(struct drm_device * dev, drm_via_cmdbuffer_t * cmd)
+static int via_dispatch_cmdbuffer(struct drm_device *dev, drm_via_cmdbuffer_t *cmd)
 {
        drm_via_private_t *dev_priv;
        uint32_t *vb;
@@ -271,9 +271,8 @@ static int via_dispatch_cmdbuffer(struct drm_device * dev, drm_via_cmdbuffer_t *
                return -EFAULT;
        }
-        if (cmd->size > VIA_PCI_BUF_SIZE) {
+        if (cmd->size > VIA_PCI_BUF_SIZE)
                return -ENOMEM;
-        }
        if (DRM_COPY_FROM_USER(dev_priv->pci_buf, cmd->buf, cmd->size))
                return -EFAULT;
@@ -291,9 +290,8 @@ static int via_dispatch_cmdbuffer(struct drm_device * dev, drm_via_cmdbuffer_t *
        }
        vb = via_check_dma(dev_priv, (cmd->size < 0x100) ? 0x102 : cmd->size);
-        if (vb == NULL) {
+        if (vb == NULL)
                return -EAGAIN;
-        }
        memcpy(vb, dev_priv->pci_buf, cmd->size);
@@ -311,13 +309,12 @@ static int via_dispatch_cmdbuffer(struct drm_device * dev, drm_via_cmdbuffer_t *
        return 0;
 }
-int via_driver_dma_quiescent(struct drm_device * dev)
+int via_driver_dma_quiescent(struct drm_device *dev)
 {
        drm_via_private_t *dev_priv = dev->dev_private;
-        if (!via_wait_idle(dev_priv)) {
+        if (!via_wait_idle(dev_priv))
                return -EBUSY;
-        }
        return 0;
 }
@@ -339,22 +336,17 @@ static int via_cmdbuffer(struct drm_device *dev, void *data, struct drm_file *fi
        DRM_DEBUG("buf %p size %lu\n", cmdbuf->buf, cmdbuf->size);
        ret = via_dispatch_cmdbuffer(dev, cmdbuf);
-        if (ret) {
+        return ret;
-                return ret;
-        }
-        return 0;
 }
-static int via_dispatch_pci_cmdbuffer(struct drm_device * dev,
+static int via_dispatch_pci_cmdbuffer(struct drm_device *dev,
-                                      drm_via_cmdbuffer_t * cmd)
+                                      drm_via_cmdbuffer_t *cmd)
 {
        drm_via_private_t *dev_priv = dev->dev_private;
        int ret;
-        if (cmd->size > VIA_PCI_BUF_SIZE) {
+        if (cmd->size > VIA_PCI_BUF_SIZE)
                return -ENOMEM;
-        }
        if (DRM_COPY_FROM_USER(dev_priv->pci_buf, cmd->buf, cmd->size))
                return -EFAULT;
@@ -380,19 +372,14 @@ static int via_pci_cmdbuffer(struct drm_device *dev, void *data, struct drm_file
        DRM_DEBUG("buf %p size %lu\n", cmdbuf->buf, cmdbuf->size);
        ret = via_dispatch_pci_cmdbuffer(dev, cmdbuf);
-        if (ret) {
+        return ret;
-                return ret;
-        }
-        return 0;
 }
-static inline uint32_t *via_align_buffer(drm_via_private_t * dev_priv,
+static inline uint32_t *via_align_buffer(drm_via_private_t *dev_priv,
                                         uint32_t * vb, int qw_count)
 {
-        for (; qw_count > 0; --qw_count) {
+        for (; qw_count > 0; --qw_count)
                VIA_OUT_RING_QW(HC_DUMMY, HC_DUMMY);
-        }
        return vb;
 }
@@ -401,7 +388,7 @@ static inline uint32_t *via_align_buffer(drm_via_private_t * dev_priv,
 *
 * Returns virtual pointer to ring buffer.
 */
-static inline uint32_t *via_get_dma(drm_via_private_t * dev_priv)
+static inline uint32_t *via_get_dma(drm_via_private_t *dev_priv)
 {
        return (uint32_t *) (dev_priv->dma_ptr + dev_priv->dma_low);
 }
@@ -411,18 +398,18 @@ static inline uint32_t *via_get_dma(drm_via_private_t * dev_priv)
 * modifying the pause address stored in the buffer itself. If
 * the regulator has already paused, restart it.
 */
-static int via_hook_segment(drm_via_private_t * dev_priv,
+static int via_hook_segment(drm_via_private_t *dev_priv,
                            uint32_t pause_addr_hi, uint32_t pause_addr_lo,
                            int no_pci_fire)
 {
        int paused, count;
        volatile uint32_t *paused_at = dev_priv->last_pause_ptr;
-        uint32_t reader,ptr;
+        uint32_t reader, ptr;
        uint32_t diff;
        paused = 0;
        via_flush_write_combine();
-        (void) *(volatile uint32_t *)(via_get_dma(dev_priv) -1);
+        (void) *(volatile uint32_t *)(via_get_dma(dev_priv) - 1);
        *paused_at = pause_addr_lo;
        via_flush_write_combine();
@@ -435,7 +422,7 @@ static int via_hook_segment(drm_via_private_t * dev_priv,
        dev_priv->last_pause_ptr = via_get_dma(dev_priv) - 1;
        /*
-         * If there is a possibility that the command reader will 
+         * If there is a possibility that the command reader will
         * miss the new pause address and pause on the old one,
         * In that case we need to program the new start address
         * using PCI.
@@ -443,9 +430,9 @@ static int via_hook_segment(drm_via_private_t * dev_priv,
        diff = (uint32_t) (ptr - reader) - dev_priv->dma_diff;
        count = 10000000;
-        while(diff == 0 && count--) {
+        while (diff == 0 && count--) {
                paused = (VIA_READ(0x41c) & 0x80000000);
-                if (paused) 
+                if (paused)
                        break;
                reader = *(dev_priv->hw_addr_ptr);
                diff = (uint32_t) (ptr - reader) - dev_priv->dma_diff;
@@ -477,7 +464,7 @@ static int via_hook_segment(drm_via_private_t * dev_priv,
        return paused;
 }
-static int via_wait_idle(drm_via_private_t * dev_priv)
+static int via_wait_idle(drm_via_private_t *dev_priv)
 {
        int count = 10000000;
@@ -491,9 +478,9 @@ static int via_wait_idle(drm_via_private_t * dev_priv)
        return count;
 }
-static uint32_t *via_align_cmd(drm_via_private_t * dev_priv, uint32_t cmd_type,
+static uint32_t *via_align_cmd(drm_via_private_t *dev_priv, uint32_t cmd_type,
-                               uint32_t addr, uint32_t * cmd_addr_hi,
+                               uint32_t addr, uint32_t *cmd_addr_hi,
-                               uint32_t * cmd_addr_lo, int skip_wait)
+                               uint32_t *cmd_addr_lo, int skip_wait)
 {
        uint32_t agp_base;
        uint32_t cmd_addr, addr_lo, addr_hi;
@@ -521,7 +508,7 @@ static uint32_t *via_align_cmd(drm_via_private_t * dev_priv, uint32_t cmd_type,
        return vb;
 }
-static void via_cmdbuf_start(drm_via_private_t * dev_priv)
+static void via_cmdbuf_start(drm_via_private_t *dev_priv)
 {
        uint32_t pause_addr_lo, pause_addr_hi;
        uint32_t start_addr, start_addr_lo;
@@ -580,7 +567,7 @@ static void via_cmdbuf_start(drm_via_private_t * dev_priv)
        dev_priv->dma_diff = ptr - reader;
 }
-static void via_pad_cache(drm_via_private_t * dev_priv, int qwords)
+static void via_pad_cache(drm_via_private_t *dev_priv, int qwords)
 {
        uint32_t *vb;
@@ -590,7 +577,7 @@ static void via_pad_cache(drm_via_private_t * dev_priv, int qwords)
        via_align_buffer(dev_priv, vb, qwords);
 }
-static inline void via_dummy_bitblt(drm_via_private_t * dev_priv)
+static inline void via_dummy_bitblt(drm_via_private_t *dev_priv)
 {
        uint32_t *vb = via_get_dma(dev_priv);
        SetReg2DAGP(0x0C, (0 | (0 << 16)));
@@ -598,7 +585,7 @@ static inline void via_dummy_bitblt(drm_via_private_t * dev_priv)
        SetReg2DAGP(0x0, 0x1 | 0x2000 | 0xAA000000);
 }
-static void via_cmdbuf_jump(drm_via_private_t * dev_priv)
+static void via_cmdbuf_jump(drm_via_private_t *dev_priv)
 {
        uint32_t agp_base;
        uint32_t pause_addr_lo, pause_addr_hi;
@@ -617,9 +604,8 @@ static void via_cmdbuf_jump(drm_via_private_t * dev_priv)
         */
        dev_priv->dma_low = 0;
-        if (via_cmdbuf_wait(dev_priv, CMDBUF_ALIGNMENT_SIZE) != 0) {
+        if (via_cmdbuf_wait(dev_priv, CMDBUF_ALIGNMENT_SIZE) != 0)
                DRM_ERROR("via_cmdbuf_jump failed\n");
-        }
        via_dummy_bitblt(dev_priv);
        via_dummy_bitblt(dev_priv);
@@ -657,12 +643,12 @@ static void via_cmdbuf_jump(drm_via_private_t * dev_priv)
 }
-static void via_cmdbuf_rewind(drm_via_private_t * dev_priv)
+static void via_cmdbuf_rewind(drm_via_private_t *dev_priv)
 {
        via_cmdbuf_jump(dev_priv);
 }
-static void via_cmdbuf_flush(drm_via_private_t * dev_priv, uint32_t cmd_type)
+static void via_cmdbuf_flush(drm_via_private_t *dev_priv, uint32_t cmd_type)
 {
        uint32_t pause_addr_lo, pause_addr_hi;
@@ -670,12 +656,12 @@ static void via_cmdbuf_flush(drm_via_private_t * dev_priv, uint32_t cmd_type)
        via_hook_segment(dev_priv, pause_addr_hi, pause_addr_lo, 0);
 }
-static void via_cmdbuf_pause(drm_via_private_t * dev_priv)
+static void via_cmdbuf_pause(drm_via_private_t *dev_priv)
 {
        via_cmdbuf_flush(dev_priv, HC_HAGPBpID_PAUSE);
 }
-static void via_cmdbuf_reset(drm_via_private_t * dev_priv)
+static void via_cmdbuf_reset(drm_via_private_t *dev_priv)
 {
        via_cmdbuf_flush(dev_priv, HC_HAGPBpID_STOP);
        via_wait_idle(dev_priv);
@@ -708,9 +694,8 @@ static int via_cmdbuf_size(struct drm_device *dev, void *data, struct drm_file *
        case VIA_CMDBUF_SPACE:
                while (((tmp_size = via_cmdbuf_space(dev_priv)) < d_siz->size)
                       && --count) {
-                        if (!d_siz->wait) {
+                        if (!d_siz->wait)
                                break;
-                        }
                }
                if (!count) {
                        DRM_ERROR("VIA_CMDBUF_SPACE timed out.\n");
@@ -720,9 +705,8 @@ static int via_cmdbuf_size(struct drm_device *dev, void *data, struct drm_file *
        case VIA_CMDBUF_LAG:
                while (((tmp_size = via_cmdbuf_lag(dev_priv)) > d_siz->size)
                       && --count) {
-                        if (!d_siz->wait) {
+                        if (!d_siz->wait)
                                break;
-                        }
                }
                if (!count) {
                        DRM_ERROR("VIA_CMDBUF_LAG timed out.\n");
diff --git a/drivers/gpu/drm/via/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c
index 4c54f043068e..9b5b4d9dd62c 100644
--- a/drivers/gpu/drm/via/via_dmablit.c
+++ b/drivers/gpu/drm/via/via_dmablit.c
@@ -70,7 +70,7 @@ via_unmap_blit_from_device(struct pci_dev *pdev, drm_via_sg_info_t *vsg)
                descriptor_this_page;
        dma_addr_t next = vsg->chain_start;
-        while(num_desc--) {
+        while (num_desc--) {
                if (descriptor_this_page-- == 0) {
                        cur_descriptor_page--;
                        descriptor_this_page = vsg->descriptors_per_page - 1;
@@ -174,19 +174,19 @@ via_free_sg_info(struct pci_dev *pdev, drm_via_sg_info_t *vsg)
        struct page *page;
        int i;
-        switch(vsg->state) {
+        switch (vsg->state) {
        case dr_via_device_mapped:
                via_unmap_blit_from_device(pdev, vsg);
        case dr_via_desc_pages_alloc:
-                for (i=0; i<vsg->num_desc_pages; ++i) {
+                for (i = 0; i < vsg->num_desc_pages; ++i) {
                        if (vsg->desc_pages[i] != NULL)
-                          free_page((unsigned long)vsg->desc_pages[i]);
+                                free_page((unsigned long)vsg->desc_pages[i]);
                }
                kfree(vsg->desc_pages);
        case dr_via_pages_locked:
-                for (i=0; i<vsg->num_pages; ++i) {
+                for (i = 0; i < vsg->num_pages; ++i) {
-                        if ( NULL != (page = vsg->pages[i])) {
+                        if (NULL != (page = vsg->pages[i])) {
-                                if (! PageReserved(page) && (DMA_FROM_DEVICE == vsg->direction))
+                                if (!PageReserved(page) && (DMA_FROM_DEVICE == vsg->direction))
                                        SetPageDirty(page);
                                page_cache_release(page);
                        }
@@ -232,7 +232,7 @@ via_lock_all_dma_pages(drm_via_sg_info_t *vsg,  drm_via_dmablit_t *xfer)
 {
        int ret;
        unsigned long first_pfn = VIA_PFN(xfer->mem_addr);
-        vsg->num_pages = VIA_PFN(xfer->mem_addr + (xfer->num_lines * xfer->mem_stride -1)) -
+        vsg->num_pages = VIA_PFN(xfer->mem_addr + (xfer->num_lines * xfer->mem_stride - 1)) -
                first_pfn + 1;
        if (NULL == (vsg->pages = vmalloc(sizeof(struct page *) * vsg->num_pages)))
@@ -268,7 +268,7 @@ via_alloc_desc_pages(drm_via_sg_info_t *vsg)
 {
        int i;
-        vsg->descriptors_per_page = PAGE_SIZE / sizeof( drm_via_descriptor_t);
+        vsg->descriptors_per_page = PAGE_SIZE / sizeof(drm_via_descriptor_t);
        vsg->num_desc_pages = (vsg->num_desc + vsg->descriptors_per_page - 1) /
                vsg->descriptors_per_page;
@@ -276,7 +276,7 @@ via_alloc_desc_pages(drm_via_sg_info_t *vsg)
                return -ENOMEM;
        vsg->state = dr_via_desc_pages_alloc;
-        for (i=0; i<vsg->num_desc_pages; ++i) {
+        for (i = 0; i < vsg->num_desc_pages; ++i) {
                if (NULL == (vsg->desc_pages[i] =
                             (drm_via_descriptor_t *) __get_free_page(GFP_KERNEL)))
                        return -ENOMEM;
@@ -318,21 +318,20 @@ via_dmablit_handler(struct drm_device *dev, int engine, int from_irq)
        drm_via_blitq_t *blitq = dev_priv->blit_queues + engine;
        int cur;
        int done_transfer;
-        unsigned long irqsave=0;
+        unsigned long irqsave = 0;
        uint32_t status = 0;
        DRM_DEBUG("DMA blit handler called. engine = %d, from_irq = %d, blitq = 0x%lx\n",
                  engine, from_irq, (unsigned long) blitq);
-        if (from_irq) {
+        if (from_irq)
                spin_lock(&blitq->blit_lock);
-        } else {
+        else
                spin_lock_irqsave(&blitq->blit_lock, irqsave);
-        }
        done_transfer = blitq->is_active &&
-          (( status = VIA_READ(VIA_PCI_DMA_CSR0 + engine*0x04)) & VIA_DMA_CSR_TD);
+          ((status = VIA_READ(VIA_PCI_DMA_CSR0 + engine*0x04)) & VIA_DMA_CSR_TD);
-        done_transfer = done_transfer || ( blitq->aborting && !(status & VIA_DMA_CSR_DE));
+        done_transfer = done_transfer || (blitq->aborting && !(status & VIA_DMA_CSR_DE));
        cur = blitq->cur;
        if (done_transfer) {
@@ -377,18 +376,16 @@ via_dmablit_handler(struct drm_device *dev, int engine, int from_irq)
                        if (!timer_pending(&blitq->poll_timer))
                                mod_timer(&blitq->poll_timer, jiffies + 1);
                } else {
-                        if (timer_pending(&blitq->poll_timer)) {
+                        if (timer_pending(&blitq->poll_timer))
                                del_timer(&blitq->poll_timer);
-                        }
                        via_dmablit_engine_off(dev, engine);
                }
        }
-        if (from_irq) {
+        if (from_irq)
                spin_unlock(&blitq->blit_lock);
-        } else {
+        else
                spin_unlock_irqrestore(&blitq->blit_lock, irqsave);
-        }
 }
@@ -414,10 +411,9 @@ via_dmablit_active(drm_via_blitq_t *blitq, int engine, uint32_t handle, wait_que
                ((blitq->cur_blit_handle - handle) <= (1 << 23));
        if (queue && active) {
-                slot = handle - blitq->done_blit_handle + blitq->cur -1;
+                slot = handle - blitq->done_blit_handle + blitq->cur - 1;
-                if (slot >= VIA_NUM_BLIT_SLOTS) {
+                if (slot >= VIA_NUM_BLIT_SLOTS)
                        slot -= VIA_NUM_BLIT_SLOTS;
-                }
                *queue = blitq->blit_queue + slot;
        }
@@ -506,12 +502,12 @@ via_dmablit_workqueue(struct work_struct *work)
        int cur_released;
-        DRM_DEBUG("Workqueue task called for blit engine %ld\n",(unsigned long)
+        DRM_DEBUG("Workqueue task called for blit engine %ld\n", (unsigned long)
                  (blitq - ((drm_via_private_t *)dev->dev_private)->blit_queues));
        spin_lock_irqsave(&blitq->blit_lock, irqsave);
-        while(blitq->serviced != blitq->cur) {
+        while (blitq->serviced != blitq->cur) {
                cur_released = blitq->serviced++;
@@ -545,13 +541,13 @@ via_dmablit_workqueue(struct work_struct *work)
 void
 via_init_dmablit(struct drm_device *dev)
 {
-        int i,j;
+        int i, j;
        drm_via_private_t *dev_priv = (drm_via_private_t *)dev->dev_private;
        drm_via_blitq_t *blitq;
        pci_set_master(dev->pdev);
-        for (i=0; i< VIA_NUM_BLIT_ENGINES; ++i) {
+        for (i = 0; i < VIA_NUM_BLIT_ENGINES; ++i) {
                blitq = dev_priv->blit_queues + i;
                blitq->dev = dev;
                blitq->cur_blit_handle = 0;
@@ -564,9 +560,8 @@ via_init_dmablit(struct drm_device *dev)
                blitq->is_active = 0;
                blitq->aborting = 0;
                spin_lock_init(&blitq->blit_lock);
-                for (j=0; j<VIA_NUM_BLIT_SLOTS; ++j) {
+                for (j = 0; j < VIA_NUM_BLIT_SLOTS; ++j)
                        DRM_INIT_WAITQUEUE(blitq->blit_queue + j);
-                }
                DRM_INIT_WAITQUEUE(&blitq->busy_queue);
                INIT_WORK(&blitq->wq, via_dmablit_workqueue);
                setup_timer(&blitq->poll_timer, via_dmablit_timer,
@@ -685,18 +680,17 @@ via_build_sg_info(struct drm_device *dev, drm_via_sg_info_t *vsg, drm_via_dmabli
 static int
 via_dmablit_grab_slot(drm_via_blitq_t *blitq, int engine)
 {
-        int ret=0;
+        int ret = 0;
        unsigned long irqsave;
        DRM_DEBUG("Num free is %d\n", blitq->num_free);
        spin_lock_irqsave(&blitq->blit_lock, irqsave);
-        while(blitq->num_free == 0) {
+        while (blitq->num_free == 0) {
                spin_unlock_irqrestore(&blitq->blit_lock, irqsave);
                DRM_WAIT_ON(ret, blitq->busy_queue, DRM_HZ, blitq->num_free > 0);
-                if (ret) {
+                if (ret)
                        return (-EINTR == ret) ? -EAGAIN : ret;
-                }
                spin_lock_irqsave(&blitq->blit_lock, irqsave);
        }
@@ -719,7 +713,7 @@ via_dmablit_release_slot(drm_via_blitq_t *blitq)
        spin_lock_irqsave(&blitq->blit_lock, irqsave);
        blitq->num_free++;
        spin_unlock_irqrestore(&blitq->blit_lock, irqsave);
-        DRM_WAKEUP( &blitq->busy_queue );
+        DRM_WAKEUP(&blitq->busy_queue);
 }
 /*
@@ -744,9 +738,8 @@ via_dmablit(struct drm_device *dev, drm_via_dmablit_t *xfer)
        engine = (xfer->to_fb) ? 0 : 1;
        blitq = dev_priv->blit_queues + engine;
-        if (0 != (ret = via_dmablit_grab_slot(blitq, engine))) {
+        if (0 != (ret = via_dmablit_grab_slot(blitq, engine)))
                return ret;
-        }
        if (NULL == (vsg = kmalloc(sizeof(*vsg), GFP_KERNEL))) {
                via_dmablit_release_slot(blitq);
                return -ENOMEM;
@@ -780,7 +773,7 @@ via_dmablit(struct drm_device *dev, drm_via_dmablit_t *xfer)
 */
 int
-via_dma_blit_sync( struct drm_device *dev, void *data, struct drm_file *file_priv )
+via_dma_blit_sync(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
        drm_via_blitsync_t *sync = data;
        int err;
@@ -804,7 +797,7 @@ via_dma_blit_sync( struct drm_device *dev, void *data, struct drm_file *file_pri
 */
 int
-via_dma_blit( struct drm_device *dev, void *data, struct drm_file *file_priv )
+via_dma_blit(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
        drm_via_dmablit_t *xfer = data;
        int err;
diff --git a/drivers/gpu/drm/via/via_dmablit.h b/drivers/gpu/drm/via/via_dmablit.h
index 7408a547a036..9b662a327cef 100644
--- a/drivers/gpu/drm/via/via_dmablit.h
+++ b/drivers/gpu/drm/via/via_dmablit.h
@@ -45,12 +45,12 @@ typedef struct _drm_via_sg_info {
        int num_desc;
        enum dma_data_direction direction;
        unsigned char *bounce_buffer;
-        dma_addr_t chain_start;
+        dma_addr_t chain_start;
        uint32_t free_on_sequence;
-        unsigned int descriptors_per_page;
+        unsigned int descriptors_per_page;
        int aborted;
        enum {
-                dr_via_device_mapped,
+                dr_via_device_mapped,
                dr_via_desc_pages_alloc,
                dr_via_pages_locked,
                dr_via_pages_alloc,
@@ -68,7 +68,7 @@ typedef struct _drm_via_blitq {
        unsigned num_free;
        unsigned num_outstanding;
        unsigned long end;
-        int aborting;
+        int aborting;
        int is_active;
        drm_via_sg_info_t *blits[VIA_NUM_BLIT_SLOTS];
        spinlock_t blit_lock;
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index cafcb844a223..9cf87d912325 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -107,9 +107,9 @@ enum via_family {
 #define VIA_BASE ((dev_priv->mmio))
 #define VIA_READ(reg)           DRM_READ32(VIA_BASE, reg)
-#define VIA_WRITE(reg,val)      DRM_WRITE32(VIA_BASE, reg, val)
+#define VIA_WRITE(reg, val)     DRM_WRITE32(VIA_BASE, reg, val)
 #define VIA_READ8(reg)          DRM_READ8(VIA_BASE, reg)
-#define VIA_WRITE8(reg,val)     DRM_WRITE8(VIA_BASE, reg, val)
+#define VIA_WRITE8(reg, val)    DRM_WRITE8(VIA_BASE, reg, val)
 extern struct drm_ioctl_desc via_ioctls[];
 extern int via_max_ioctl;
@@ -121,28 +121,28 @@ extern int via_agp_init(struct drm_device *dev, void *data, struct drm_file *fil
 extern int via_map_init(struct drm_device *dev, void *data, struct drm_file *file_priv);
 extern int via_decoder_futex(struct drm_device *dev, void *data, struct drm_file *file_priv);
 extern int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv);
-extern int via_dma_blit_sync( struct drm_device *dev, void *data, struct drm_file *file_priv );
+extern int via_dma_blit_sync(struct drm_device *dev, void *data, struct drm_file *file_priv);
-extern int via_dma_blit( struct drm_device *dev, void *data, struct drm_file *file_priv );
+extern int via_dma_blit(struct drm_device *dev, void *data, struct drm_file *file_priv);
 extern int via_driver_load(struct drm_device *dev, unsigned long chipset);
 extern int via_driver_unload(struct drm_device *dev);
-extern int via_init_context(struct drm_device * dev, int context);
+extern int via_init_context(struct drm_device *dev, int context);
-extern int via_final_context(struct drm_device * dev, int context);
+extern int via_final_context(struct drm_device *dev, int context);
-extern int via_do_cleanup_map(struct drm_device * dev);
+extern int via_do_cleanup_map(struct drm_device *dev);
 extern u32 via_get_vblank_counter(struct drm_device *dev, int crtc);
 extern int via_enable_vblank(struct drm_device *dev, int crtc);
 extern void via_disable_vblank(struct drm_device *dev, int crtc);
 extern irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS);
-extern void via_driver_irq_preinstall(struct drm_device * dev);
+extern void via_driver_irq_preinstall(struct drm_device *dev);
 extern int via_driver_irq_postinstall(struct drm_device *dev);
-extern void via_driver_irq_uninstall(struct drm_device * dev);
+extern void via_driver_irq_uninstall(struct drm_device *dev);
-extern int via_dma_cleanup(struct drm_device * dev);
+extern int via_dma_cleanup(struct drm_device *dev);
 extern void via_init_command_verifier(void);
-extern int via_driver_dma_quiescent(struct drm_device * dev);
+extern int via_driver_dma_quiescent(struct drm_device *dev);
 extern void via_init_futex(drm_via_private_t *dev_priv);
 extern void via_cleanup_futex(drm_via_private_t *dev_priv);
 extern void via_release_futex(drm_via_private_t *dev_priv, int context);
diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
index 34079f251cd4..d391f48ef87a 100644
--- a/drivers/gpu/drm/via/via_irq.c
+++ b/drivers/gpu/drm/via/via_irq.c
@@ -141,11 +141,10 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
                        atomic_inc(&cur_irq->irq_received);
                        DRM_WAKEUP(&cur_irq->irq_queue);
                        handled = 1;
-                        if (dev_priv->irq_map[drm_via_irq_dma0_td] == i) {
+                        if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
                                via_dmablit_handler(dev, 0, 1);
-                        } else if (dev_priv->irq_map[drm_via_irq_dma1_td] == i) {
+                        else if (dev_priv->irq_map[drm_via_irq_dma1_td] == i)
                                via_dmablit_handler(dev, 1, 1);
-                        }
                }
                cur_irq++;
        }
@@ -160,7 +159,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
                return IRQ_NONE;
 }
-static __inline__ void viadrv_acknowledge_irqs(drm_via_private_t * dev_priv)
+static __inline__ void viadrv_acknowledge_irqs(drm_via_private_t *dev_priv)
 {
        u32 status;
@@ -207,7 +206,7 @@ void via_disable_vblank(struct drm_device *dev, int crtc)
 }
 static int
-via_driver_irq_wait(struct drm_device * dev, unsigned int irq, int force_sequence,
+via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence,
                    unsigned int *sequence)
 {
        drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
@@ -260,7 +259,7 @@ via_driver_irq_wait(struct drm_device * dev, unsigned int irq, int force_sequenc
 * drm_dma.h hooks
 */
-void via_driver_irq_preinstall(struct drm_device * dev)
+void via_driver_irq_preinstall(struct drm_device *dev)
 {
        drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
        u32 status;
@@ -329,7 +328,7 @@ int via_driver_irq_postinstall(struct drm_device *dev)
        return 0;
 }
-void via_driver_irq_uninstall(struct drm_device * dev)
+void via_driver_irq_uninstall(struct drm_device *dev)
 {
        drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
        u32 status;
diff --git a/drivers/gpu/drm/via/via_map.c b/drivers/gpu/drm/via/via_map.c
index 6e6f91591639..6cca9a709f7a 100644
--- a/drivers/gpu/drm/via/via_map.c
+++ b/drivers/gpu/drm/via/via_map.c
@@ -25,7 +25,7 @@
 #include "via_drm.h"
 #include "via_drv.h"
-static int via_do_init_map(struct drm_device * dev, drm_via_init_t * init)
+static int via_do_init_map(struct drm_device *dev, drm_via_init_t *init)
 {
        drm_via_private_t *dev_priv = dev->dev_private;
@@ -68,7 +68,7 @@ static int via_do_init_map(struct drm_device * dev, drm_via_init_t * init)
        return 0;
 }
-int via_do_cleanup_map(struct drm_device * dev)
+int via_do_cleanup_map(struct drm_device *dev)
 {
        via_dma_cleanup(dev);
diff --git a/drivers/gpu/drm/via/via_mm.c b/drivers/gpu/drm/via/via_mm.c
index f694cb5ededc..6cc2dadae3ef 100644
--- a/drivers/gpu/drm/via/via_mm.c
+++ b/drivers/gpu/drm/via/via_mm.c
@@ -31,7 +31,7 @@
 #include "drm_sman.h"
 #define VIA_MM_ALIGN_SHIFT 4
-#define VIA_MM_ALIGN_MASK ( (1 << VIA_MM_ALIGN_SHIFT) - 1)
+#define VIA_MM_ALIGN_MASK ((1 << VIA_MM_ALIGN_SHIFT) - 1)
 int via_agp_init(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
@@ -172,7 +172,7 @@ int via_mem_free(struct drm_device *dev, void *data, struct drm_file *file_priv)
 }
-void via_reclaim_buffers_locked(struct drm_device * dev,
+void via_reclaim_buffers_locked(struct drm_device *dev,
                                struct drm_file *file_priv)
 {
        drm_via_private_t *dev_priv = dev->dev_private;
@@ -183,9 +183,8 @@ void via_reclaim_buffers_locked(struct drm_device * dev,
                return;
        }
-        if (dev->driver->dma_quiescent) {
+        if (dev->driver->dma_quiescent)
                dev->driver->dma_quiescent(dev);
-        }
        drm_sman_owner_cleanup(&dev_priv->sman, (unsigned long)file_priv);
        mutex_unlock(&dev->struct_mutex);
diff --git a/drivers/gpu/drm/via/via_verifier.c b/drivers/gpu/drm/via/via_verifier.c
index 46a579198747..48957b856d41 100644
--- a/drivers/gpu/drm/via/via_verifier.c
+++ b/drivers/gpu/drm/via/via_verifier.c
@@ -235,7 +235,7 @@ static hazard_t table2[256];
 static hazard_t table3[256];
 static __inline__ int
-eat_words(const uint32_t ** buf, const uint32_t * buf_end, unsigned num_words)
+eat_words(const uint32_t **buf, const uint32_t *buf_end, unsigned num_words)
 {
        if ((buf_end - *buf) >= num_words) {
                *buf += num_words;
@@ -252,7 +252,7 @@ eat_words(const uint32_t ** buf, const uint32_t * buf_end, unsigned num_words)
 static __inline__ drm_local_map_t *via_drm_lookup_agp_map(drm_via_state_t *seq,
                                                    unsigned long offset,
                                                    unsigned long size,
-                                                    struct drm_device * dev)
+                                                    struct drm_device *dev)
 {
        struct drm_map_list *r_list;
        drm_local_map_t *map = seq->map_cache;
@@ -344,7 +344,7 @@ static __inline__ int finish_current_sequence(drm_via_state_t * cur_seq)
 }
 static __inline__ int
-investigate_hazard(uint32_t cmd, hazard_t hz, drm_via_state_t * cur_seq)
+investigate_hazard(uint32_t cmd, hazard_t hz, drm_via_state_t *cur_seq)
 {
        register uint32_t tmp, *tmp_addr;
@@ -518,7 +518,7 @@ investigate_hazard(uint32_t cmd, hazard_t hz, drm_via_state_t * cur_seq)
 static __inline__ int
 via_check_prim_list(uint32_t const **buffer, const uint32_t * buf_end,
-                    drm_via_state_t * cur_seq)
+                    drm_via_state_t *cur_seq)
 {
        drm_via_private_t *dev_priv =
            (drm_via_private_t *) cur_seq->dev->dev_private;
@@ -621,8 +621,8 @@ via_check_prim_list(uint32_t const **buffer, const uint32_t * buf_end,
 }
 static __inline__ verifier_state_t
-via_check_header2(uint32_t const **buffer, const uint32_t * buf_end,
+via_check_header2(uint32_t const **buffer, const uint32_t *buf_end,
-                  drm_via_state_t * hc_state)
+                  drm_via_state_t *hc_state)
 {
        uint32_t cmd;
        int hz_mode;
@@ -706,16 +706,15 @@ via_check_header2(uint32_t const **buffer, const uint32_t * buf_end,
                        return state_error;
                }
        }
-        if (hc_state->unfinished && finish_current_sequence(hc_state)) {
+        if (hc_state->unfinished && finish_current_sequence(hc_state))
                return state_error;
-        }
        *buffer = buf;
        return state_command;
 }
 static __inline__ verifier_state_t
-via_parse_header2(drm_via_private_t * dev_priv, uint32_t const **buffer,
+via_parse_header2(drm_via_private_t *dev_priv, uint32_t const **buffer,
-                  const uint32_t * buf_end, int *fire_count)
+                  const uint32_t *buf_end, int *fire_count)
 {
        uint32_t cmd;
        const uint32_t *buf = *buffer;
@@ -833,8 +832,8 @@ via_check_header1(uint32_t const **buffer, const uint32_t * buf_end)
 }
 static __inline__ verifier_state_t
-via_parse_header1(drm_via_private_t * dev_priv, uint32_t const **buffer,
+via_parse_header1(drm_via_private_t *dev_priv, uint32_t const **buffer,
-                  const uint32_t * buf_end)
+                  const uint32_t *buf_end)
 {
        register uint32_t cmd;
        const uint32_t *buf = *buffer;
@@ -851,7 +850,7 @@ via_parse_header1(drm_via_private_t * dev_priv, uint32_t const **buffer,
 }
 static __inline__ verifier_state_t
-via_check_vheader5(uint32_t const **buffer, const uint32_t * buf_end)
+via_check_vheader5(uint32_t const **buffer, const uint32_t *buf_end)
 {
        uint32_t data;
        const uint32_t *buf = *buffer;
@@ -884,8 +883,8 @@ via_check_vheader5(uint32_t const **buffer, const uint32_t * buf_end)
 }
 static __inline__ verifier_state_t
-via_parse_vheader5(drm_via_private_t * dev_priv, uint32_t const **buffer,
+via_parse_vheader5(drm_via_private_t *dev_priv, uint32_t const **buffer,
-                   const uint32_t * buf_end)
+                   const uint32_t *buf_end)
 {
        uint32_t addr, count, i;
        const uint32_t *buf = *buffer;
@@ -893,9 +892,8 @@ via_parse_vheader5(drm_via_private_t * dev_priv, uint32_t const **buffer,
        addr = *buf++ & ~VIA_VIDEOMASK;
        i = count = *buf;
        buf += 3;
-        while (i--) {
+        while (i--)
                VIA_WRITE(addr, *buf++);
-        }
        if (count & 3)
                buf += 4 - (count & 3);
        *buffer = buf;
@@ -940,8 +938,8 @@ via_check_vheader6(uint32_t const **buffer, const uint32_t * buf_end)
 }
 static __inline__ verifier_state_t
-via_parse_vheader6(drm_via_private_t * dev_priv, uint32_t const **buffer,
+via_parse_vheader6(drm_via_private_t *dev_priv, uint32_t const **buffer,
-                   const uint32_t * buf_end)
+                   const uint32_t *buf_end)
 {
        uint32_t addr, count, i;
@@ -1037,7 +1035,7 @@ via_verify_command_stream(const uint32_t * buf, unsigned int size,
 }
 int
-via_parse_command_stream(struct drm_device * dev, const uint32_t * buf,
+via_parse_command_stream(struct drm_device *dev, const uint32_t *buf,
                         unsigned int size)
 {
@@ -1085,9 +1083,8 @@ via_parse_command_stream(struct drm_device * dev, const uint32_t * buf,
                        return -EINVAL;
                }
        }
-        if (state == state_error) {
+        if (state == state_error)
                return -EINVAL;
-        }
        return 0;
 }
@@ -1096,13 +1093,11 @@ setup_hazard_table(hz_init_t init_table[], hazard_t table[], int size)
 {
        int i;
-        for (i = 0; i < 256; ++i) {
+        for (i = 0; i < 256; ++i)
                table[i] = forbidden_command;
-        }
-        for (i = 0; i < size; ++i) {
+        for (i = 0; i < size; ++i)
                table[init_table[i].code] = init_table[i].hz;
-        }
 }
 void via_init_command_verifier(void)
diff --git a/drivers/gpu/drm/via/via_verifier.h b/drivers/gpu/drm/via/via_verifier.h
index d6f8214b69f5..26b6d361ab95 100644
--- a/drivers/gpu/drm/via/via_verifier.h
+++ b/drivers/gpu/drm/via/via_verifier.h
@@ -54,8 +54,8 @@ typedef struct {
        const uint32_t *buf_start;
 } drm_via_state_t;
-extern int via_verify_command_stream(const uint32_t * buf, unsigned int size,
+extern int via_verify_command_stream(const uint32_t *buf, unsigned int size,
-                                     struct drm_device * dev, int agp);
+                                     struct drm_device *dev, int agp);
 extern int via_parse_command_stream(struct drm_device *dev, const uint32_t *buf,
                                    unsigned int size);
diff --git a/drivers/gpu/drm/via/via_video.c b/drivers/gpu/drm/via/via_video.c
index 6efac8117c93..675d311f038f 100644
--- a/drivers/gpu/drm/via/via_video.c
+++ b/drivers/gpu/drm/via/via_video.c
@@ -29,7 +29,7 @@
 #include "via_drm.h"
 #include "via_drv.h"
-void via_init_futex(drm_via_private_t * dev_priv)
+void via_init_futex(drm_via_private_t *dev_priv)
 {
        unsigned int i;
@@ -41,11 +41,11 @@ void via_init_futex(drm_via_private_t * dev_priv)
        }
 }
-void via_cleanup_futex(drm_via_private_t * dev_priv)
+void via_cleanup_futex(drm_via_private_t *dev_priv)
 {
 }
-void via_release_futex(drm_via_private_t * dev_priv, int context)
+void via_release_futex(drm_via_private_t *dev_priv, int context)
 {
        unsigned int i;
        volatile int *lock;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index b793c8c9acb3..9dd395b90216 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -764,7 +764,7 @@ static struct drm_driver driver = {
 static int vmw_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
-        return drm_get_dev(pdev, ent, &driver);
+        return drm_get_pci_dev(pdev, ent, &driver);
 }
 static int __init vmwgfx_init(void)
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index eaad52095339..429f917b60bf 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
@@ -164,7 +164,7 @@ struct vmw_vga_topology_state {
 struct vmw_private {
        struct ttm_bo_device bdev;
        struct ttm_bo_global_ref bo_global_ref;
-        struct ttm_global_reference mem_global_ref;
+        struct drm_global_reference mem_global_ref;
        struct vmw_fifo_state fifo;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
index b0866f04ec76..870967a97c15 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
@@ -528,7 +528,7 @@ int vmw_fb_init(struct vmw_private *vmw_priv)
         * Dirty & Deferred IO
         */
        par->dirty.x1 = par->dirty.x2 = 0;
-        par->dirty.y1 = par->dirty.y1 = 0;
+        par->dirty.y1 = par->dirty.y2 = 0;
        par->dirty.active = true;
        spin_lock_init(&par->dirty.lock);
        info->fbdefio = &vmw_defio;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index f1d626112415..437ac786277a 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -972,6 +972,7 @@ int vmw_kms_update_layout_ioctl(struct drm_device *dev, void *data,
        ret = copy_from_user(rects, user_rects, rects_size);
        if (unlikely(ret != 0)) {
                DRM_ERROR("Failed to get rects.\n");
+                ret = -EFAULT;
                goto out_free;
        }
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
index 8612378b131e..5f2d5df01e5c 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
@@ -1017,7 +1017,7 @@ int vmw_gmr_id_alloc(struct vmw_private *dev_priv, uint32_t *p_id)
 }
 /*
- * Stream managment
+ * Stream management
 */
 static void vmw_stream_destroy(struct vmw_resource *res)
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c
index e3df4adfb4d8..83123287c60c 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c
@@ -44,29 +44,29 @@ int vmw_mmap(struct file *filp, struct vm_area_struct *vma)
        return ttm_bo_mmap(filp, vma, &dev_priv->bdev);
 }
-static int vmw_ttm_mem_global_init(struct ttm_global_reference *ref)
+static int vmw_ttm_mem_global_init(struct drm_global_reference *ref)
 {
        DRM_INFO("global init.\n");
        return ttm_mem_global_init(ref->object);
 }
-static void vmw_ttm_mem_global_release(struct ttm_global_reference *ref)
+static void vmw_ttm_mem_global_release(struct drm_global_reference *ref)
 {
        ttm_mem_global_release(ref->object);
 }
 int vmw_ttm_global_init(struct vmw_private *dev_priv)
 {
-        struct ttm_global_reference *global_ref;
+        struct drm_global_reference *global_ref;
        int ret;
        global_ref = &dev_priv->mem_global_ref;
-        global_ref->global_type = TTM_GLOBAL_TTM_MEM;
+        global_ref->global_type = DRM_GLOBAL_TTM_MEM;
        global_ref->size = sizeof(struct ttm_mem_global);
        global_ref->init = &vmw_ttm_mem_global_init;
        global_ref->release = &vmw_ttm_mem_global_release;
-        ret = ttm_global_item_ref(global_ref);
+        ret = drm_global_item_ref(global_ref);
        if (unlikely(ret != 0)) {
                DRM_ERROR("Failed setting up TTM memory accounting.\n");
                return ret;
@@ -75,11 +75,11 @@ int vmw_ttm_global_init(struct vmw_private *dev_priv)
        dev_priv->bo_global_ref.mem_glob =
                dev_priv->mem_global_ref.object;
        global_ref = &dev_priv->bo_global_ref.ref;
-        global_ref->global_type = TTM_GLOBAL_TTM_BO;
+        global_ref->global_type = DRM_GLOBAL_TTM_BO;
        global_ref->size = sizeof(struct ttm_bo_global);
        global_ref->init = &ttm_bo_global_init;
        global_ref->release = &ttm_bo_global_release;
-                ret = ttm_global_item_ref(global_ref);
+        ret = drm_global_item_ref(global_ref);
        if (unlikely(ret != 0)) {
                DRM_ERROR("Failed setting up TTM buffer objects.\n");
@@ -88,12 +88,12 @@ int vmw_ttm_global_init(struct vmw_private *dev_priv)
        return 0;
 out_no_bo:
-        ttm_global_item_unref(&dev_priv->mem_global_ref);
+        drm_global_item_unref(&dev_priv->mem_global_ref);
        return ret;
 }
 void vmw_ttm_global_release(struct vmw_private *dev_priv)
 {
-        ttm_global_item_unref(&dev_priv->bo_global_ref.ref);
+        drm_global_item_unref(&dev_priv->bo_global_ref.ref);
-        ttm_global_item_unref(&dev_priv->mem_global_ref);
+        drm_global_item_unref(&dev_priv->mem_global_ref);
 }
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 132278fa6240..6369ba7f96f8 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -68,6 +68,14 @@ config HID_A4TECH
        ---help---
        Support for A4 tech X5 and WOP-35 / Trust 450L mice.
+config HID_ACRUX_FF
+        tristate "ACRUX force feedback support"
+        depends on USB_HID
+        select INPUT_FF_MEMLESS
+        ---help---
+        Say Y here if you want to enable force feedback support for ACRUX
+        game controllers.
 config HID_APPLE
        tristate "Apple" if EMBEDDED
        depends on (USB_HID || BT_HIDP)
@@ -148,6 +156,12 @@ config HID_EGALAX
        ---help---
        Support for the eGalax dual-touch panel.
+config HID_ELECOM
+        tristate "ELECOM"
+        depends on BT_HIDP
+        ---help---
+        Support for the ELECOM BM084 (bluetooth mouse).
 config HID_EZKEY
        tristate "Ezkey" if EMBEDDED
        depends on USB_HID
@@ -358,6 +372,7 @@ config HID_ROCCAT
 config HID_ROCCAT_KONE
        tristate "Roccat Kone Mouse support"
        depends on USB_HID
+        select HID_ROCCAT
        ---help---
        Support for Roccat Kone mouse.
@@ -416,10 +431,11 @@ config SMARTJOYPLUS_FF
        enable force feedback support for it.
 config HID_TOPSEED
-        tristate "TopSeed Cyberlink remote control support"
+        tristate "TopSeed Cyberlink, BTC Emprex, Conceptronic remote control support"
        depends on USB_HID
        ---help---
-        Say Y if you have a TopSeed Cyberlink or BTC Emprex remote control.
+        Say Y if you have a TopSeed Cyberlink or BTC Emprex or Conceptronic
+        CLLRCMCE remote control.
 config HID_THRUSTMASTER
        tristate "ThrustMaster devices support"
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 987fa0627367..46f037f3df80 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -24,6 +24,7 @@ endif
 obj-$(CONFIG_HID_3M_PCT)        += hid-3m-pct.o
 obj-$(CONFIG_HID_A4TECH)        += hid-a4tech.o
+obj-$(CONFIG_HID_ACRUX_FF)      += hid-axff.o
 obj-$(CONFIG_HID_APPLE)         += hid-apple.o
 obj-$(CONFIG_HID_BELKIN)        += hid-belkin.o
 obj-$(CONFIG_HID_CANDO)         += hid-cando.o
@@ -32,6 +33,7 @@ obj-$(CONFIG_HID_CHICONY)	+= hid-chicony.o
 obj-$(CONFIG_HID_CYPRESS)       += hid-cypress.o
 obj-$(CONFIG_HID_DRAGONRISE)    += hid-drff.o
 obj-$(CONFIG_HID_EGALAX)        += hid-egalax.o
+obj-$(CONFIG_HID_ELECOM)        += hid-elecom.o
 obj-$(CONFIG_HID_EZKEY)         += hid-ezkey.o
 obj-$(CONFIG_HID_GYRATION)      += hid-gyration.o
 obj-$(CONFIG_HID_KENSINGTON)    += hid-kensington.o
diff --git a/drivers/hid/hid-axff.c b/drivers/hid/hid-axff.c
new file mode 100644
index 000000000000..f42ee140738a
--- /dev/null
+++ b/drivers/hid/hid-axff.c
@@ -0,0 +1,172 @@
+/*
+ * Force feedback support for ACRUX game controllers
+ *
+ * From what I have gathered, these devices are mass produced in China
+ * by several vendors. They often share the same design as the original
+ * Xbox 360 controller.
+ *
+ * 1a34:0802 "ACRUX USB GAMEPAD 8116"
+ *  - tested with a EXEQ EQ-PCU-02090 game controller.
+ *
+ * Copyright (c) 2010 Sergei Kolzun <x0r@dv-life.ru>
+ */
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include <linux/input.h>
+#include <linux/slab.h>
+#include <linux/usb.h>
+#include <linux/hid.h>
+#include "hid-ids.h"
+#include "usbhid/usbhid.h"
+struct axff_device {
+        struct hid_report *report;
+};
+static int axff_play(struct input_dev *dev, void *data, struct ff_effect *effect)
+{
+        struct hid_device *hid = input_get_drvdata(dev);
+        struct axff_device *axff = data;
+        int left, right;
+        left = effect->u.rumble.strong_magnitude;
+        right = effect->u.rumble.weak_magnitude;
+        dbg_hid("called with 0x%04x 0x%04x", left, right);
+        left = left * 0xff / 0xffff;
+        right = right * 0xff / 0xffff;
+        axff->report->field[0]->value[0] = left;
+        axff->report->field[1]->value[0] = right;
+        axff->report->field[2]->value[0] = left;
+        axff->report->field[3]->value[0] = right;
+        dbg_hid("running with 0x%02x 0x%02x", left, right);
+        usbhid_submit_report(hid, axff->report, USB_DIR_OUT);
+        return 0;
+}
+static int axff_init(struct hid_device *hid)
+{
+        struct axff_device *axff;
+        struct hid_report *report;
+        struct hid_input *hidinput = list_first_entry(&hid->inputs, struct hid_input, list);
+        struct list_head *report_list =&hid->report_enum[HID_OUTPUT_REPORT].report_list;
+        struct input_dev *dev = hidinput->input;
+        int error;
+        if (list_empty(report_list)) {
+                dev_err(&hid->dev, "no output reports found\n");
+                return -ENODEV;
+        }
+        report = list_first_entry(report_list, struct hid_report, list);
+        if (report->maxfield < 4) {
+                dev_err(&hid->dev, "no fields in the report: %d\n", report->maxfield);
+                return -ENODEV;
+        }
+        axff = kzalloc(sizeof(struct axff_device), GFP_KERNEL);
+        if (!axff)
+                return -ENOMEM;
+        set_bit(FF_RUMBLE, dev->ffbit);
+        error = input_ff_create_memless(dev, axff, axff_play);
+        if (error)
+                goto err_free_mem;
+        axff->report = report;
+        axff->report->field[0]->value[0] = 0x00;
+        axff->report->field[1]->value[0] = 0x00;
+        axff->report->field[2]->value[0] = 0x00;
+        axff->report->field[3]->value[0] = 0x00;
+        usbhid_submit_report(hid, axff->report, USB_DIR_OUT);
+        dev_info(&hid->dev, "Force Feedback for ACRUX game controllers by Sergei Kolzun<x0r@dv-life.ru>\n");
+        return 0;
+err_free_mem:
+        kfree(axff);
+        return error;
+}
+static int ax_probe(struct hid_device *hdev, const struct hid_device_id *id)
+{
+        int error;
+        dev_dbg(&hdev->dev, "ACRUX HID hardware probe...");
+        error = hid_parse(hdev);
+        if (error) {
+                dev_err(&hdev->dev, "parse failed\n");
+                return error;
+        }
+        error = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_FF);
+        if (error) {
+                dev_err(&hdev->dev, "hw start failed\n");
+                return error;
+        }
+        error = axff_init(hdev);
+        if (error) {
+                /*
+                 * Do not fail device initialization completely as device
+                 * may still be partially operable, just warn.
+                 */
+                dev_warn(&hdev->dev,
+                         "Failed to enable force feedback support, error: %d\n",
+                         error);
+        }
+        return 0;
+}
+static const struct hid_device_id ax_devices[] = {
+        { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802), },
+        { }
+};
+MODULE_DEVICE_TABLE(hid, ax_devices);
+static struct hid_driver ax_driver = {
+        .name = "acrux",
+        .id_table = ax_devices,
+        .probe = ax_probe,
+};
+static int __init ax_init(void)
+{
+        return hid_register_driver(&ax_driver);
+}
+static void __exit ax_exit(void)
+{
+        hid_unregister_driver(&ax_driver);
+}
+module_init(ax_init);
+module_exit(ax_exit);
+MODULE_AUTHOR("Sergei Kolzun");
+MODULE_DESCRIPTION("Force feedback support for ACRUX game controllers");
+MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index aa0f7dcabcd7..e635199a0cd2 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1157,6 +1157,8 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask)
        if (hdev->quirks & HID_QUIRK_HIDDEV_FORCE)
                connect_mask |= (HID_CONNECT_HIDDEV_FORCE | HID_CONNECT_HIDDEV);
+        if (hdev->quirks & HID_QUIRK_HIDINPUT_FORCE)
+                connect_mask |= HID_CONNECT_HIDINPUT_FORCE;
        if (hdev->bus != BUS_USB)
                connect_mask &= ~HID_CONNECT_HIDDEV;
        if (hid_hiddev(hdev))
@@ -1239,6 +1241,9 @@ static const struct hid_device_id hid_blacklist[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_3M, USB_DEVICE_ID_3M2256) },
        { 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) },
+#if defined(CONFIG_HID_ACRUX_FF) || defined(CONFIG_HID_ACRUX_FF_MODULE)
+        { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) },
+#endif
        { 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) },
@@ -1294,6 +1299,7 @@ static const struct hid_device_id hid_blacklist[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },
+        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },
        { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR) },
@@ -1337,6 +1343,24 @@ static const struct hid_device_id hid_blacklist[] = {
        { 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_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_10) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_11) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_12) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_13) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_14) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_15) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
        { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },
@@ -1357,10 +1381,10 @@ static const struct hid_device_id hid_blacklist[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb653) },
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },
        { HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED2, USB_DEVICE_ID_TOPSEED2_RF_COMBO) },
        { HID_USB_DEVICE(USB_VENDOR_ID_TWINHAN, USB_DEVICE_ID_TWINHAN_IR_REMOTE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },
-        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ZYDACRON, USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL) },
@@ -1568,6 +1592,7 @@ static const struct hid_device_id hid_ignore_list[] = {
        { 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_ETT, USB_DEVICE_ID_TC5UH) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC4UM) },
        { 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) },
@@ -1760,7 +1785,8 @@ int hid_add_device(struct hid_device *hdev)
        /* we need to kill them here, otherwise they will stay allocated to
         * wait for coming driver */
-        if (!(hdev->quirks & HID_QUIRK_NO_IGNORE) && hid_ignore(hdev))
+        if (!(hdev->quirks & HID_QUIRK_NO_IGNORE)
+            && (hid_ignore(hdev) || (hdev->quirks & HID_QUIRK_IGNORE)))
                return -ENODEV;
        /* XXX hack, any other cleaner solution after the driver core
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index c94026768570..850d02a7a925 100644
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -949,8 +949,8 @@ static ssize_t hid_debug_events_read(struct file *file, char __user *buffer,
        int ret = 0, len;
        DECLARE_WAITQUEUE(wait, current);
+        mutex_lock(&list->read_mutex);
        while (ret == 0) {
-                mutex_lock(&list->read_mutex);
                if (list->head == list->tail) {
                        add_wait_queue(&list->hdev->debug_wait, &wait);
                        set_current_state(TASK_INTERRUPTIBLE);
diff --git a/drivers/hid/hid-elecom.c b/drivers/hid/hid-elecom.c
new file mode 100644
index 000000000000..7a40878f46b4
--- /dev/null
+++ b/drivers/hid/hid-elecom.c
@@ -0,0 +1,57 @@
+/*
+ *  HID driver for Elecom BM084 (bluetooth mouse).
+ *  Removes a non-existing horizontal wheel from
+ *  the HID descriptor.
+ *  (This module is based on "hid-ortek".)
+ *
+ *  Copyright (c) 2010 Richard Nauber <Richard.Nauber@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 "hid-ids.h"
+static void elecom_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+                unsigned int rsize)
+{
+        if (rsize >= 48 && rdesc[46] == 0x05 && rdesc[47] == 0x0c) {
+                dev_info(&hdev->dev, "Fixing up Elecom BM084 "
+                                "report descriptor.\n");
+                rdesc[47] = 0x00;
+        }
+}
+static const struct hid_device_id elecom_devices[] = {
+        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084)},
+        { }
+};
+MODULE_DEVICE_TABLE(hid, elecom_devices);
+static struct hid_driver elecom_driver = {
+        .name = "elecom",
+        .id_table = elecom_devices,
+        .report_fixup = elecom_report_fixup
+};
+static int __init elecom_init(void)
+{
+        return hid_register_driver(&elecom_driver);
+}
+static void __exit elecom_exit(void)
+{
+        hid_unregister_driver(&elecom_driver);
+}
+module_init(elecom_init);
+module_exit(elecom_exit);
+MODULE_LICENSE("GPL");
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 6af77ed0b555..d3fc13ae094d 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -34,6 +34,8 @@
 #define USB_DEVICE_ID_ACECAD_FLAIR      0x0004
 #define USB_DEVICE_ID_ACECAD_302        0x0008
+#define USB_VENDOR_ID_ACRUX             0x1a34
 #define USB_VENDOR_ID_ADS_TECH          0x06e1
 #define USB_DEVICE_ID_ADS_TECH_RADIO_SI470X     0xa155
@@ -81,12 +83,12 @@
 #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_ANSI     0x0229
-#define USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO     0x022a
+#define USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO      0x022a
-#define USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS     0x022b
+#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_ANSI   0x022c
-#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO   0x022d
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO    0x022d
-#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS   0x022e
+#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
@@ -118,8 +120,8 @@
 #define USB_VENDOR_ID_AVERMEDIA         0x07ca
 #define USB_DEVICE_ID_AVER_FM_MR800     0xb800
-#define USB_VENDOR_ID_BELKIN           0x050d
+#define USB_VENDOR_ID_BELKIN            0x050d
-#define USB_DEVICE_ID_FLIP_KVM         0x3201
+#define USB_DEVICE_ID_FLIP_KVM          0x3201
 #define USB_VENDOR_ID_BERKSHIRE         0x0c98
 #define USB_DEVICE_ID_BERKSHIRE_PCWD    0x1140
@@ -128,12 +130,13 @@
 #define USB_DEVICE_ID_BTC_EMPREX_REMOTE 0x5578
 #define USB_VENDOR_ID_CANDO             0x2087
-#define USB_DEVICE_ID_CANDO_MULTI_TOUCH 0x0a01
+#define USB_DEVICE_ID_CANDO_MULTI_TOUCH 0x0a01
 #define USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6 0x0b03
 #define USB_VENDOR_ID_CH                0x068e
 #define USB_DEVICE_ID_CH_PRO_PEDALS     0x00f2
 #define USB_DEVICE_ID_CH_COMBATSTICK    0x00f4
+#define USB_DEVICE_ID_CH_FLIGHT_SIM_ECLIPSE_YOKE       0x0051
 #define USB_DEVICE_ID_CH_FLIGHT_SIM_YOKE        0x00ff
 #define USB_DEVICE_ID_CH_3AXIS_5BUTTON_STICK    0x00d3
@@ -174,7 +177,7 @@
 #define USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701 0x819a
 #define USB_VENDOR_ID_DELORME           0x1163
-#define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100
+#define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100
 #define USB_DEVICE_ID_DELORME_EM_LT20   0x0200
 #define USB_VENDOR_ID_DMI               0x0c0b
@@ -186,19 +189,23 @@
 #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER    0x0001
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH    0x480d
+#define USB_VENDOR_ID_ELECOM            0x056e
+#define USB_DEVICE_ID_ELECOM_BM084      0x0061
 #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_ETURBOTOUCH       0x22b9
-#define USB_DEVICE_ID_ETURBOTOUCH       0x0006
 #define USB_VENDOR_ID_ETT               0x0664
 #define USB_DEVICE_ID_TC5UH             0x0309
+#define USB_DEVICE_ID_TC4UM             0x0306
+#define USB_VENDOR_ID_ETURBOTOUCH       0x22b9
+#define USB_DEVICE_ID_ETURBOTOUCH       0x0006
-#define USB_VENDOR_ID_EZKEY             0x0518
+#define USB_VENDOR_ID_EZKEY             0x0518
 #define USB_DEVICE_ID_BTC_8193          0x0002
 #define USB_VENDOR_ID_GAMERON           0x0810
@@ -295,9 +302,16 @@
 #define USB_VENDOR_ID_KBGEAR            0x084e
 #define USB_DEVICE_ID_KBGEAR_JAMSTUDIO  0x1001
+#define USB_VENDOR_ID_KENSINGTON        0x047d
+#define USB_DEVICE_ID_KS_SLIMBLADE      0x2041
 #define USB_VENDOR_ID_KWORLD            0x1b80
 #define USB_DEVICE_ID_KWORLD_RADIO_FM700        0xd700
+#define USB_VENDOR_ID_KYE               0x0458
+#define USB_DEVICE_ID_KYE_ERGO_525V     0x0087
+#define USB_DEVICE_ID_KYE_GPEN_560      0x5003
 #define USB_VENDOR_ID_LABTEC            0x1020
 #define USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD  0x0006
@@ -317,9 +331,6 @@
 #define USB_DEVICE_ID_LD_POWERCONTROL   0x2030
 #define USB_DEVICE_ID_LD_MACHINETEST    0x2040
-#define USB_VENDOR_ID_KENSINGTON        0x047d
-#define USB_DEVICE_ID_KS_SLIMBLADE      0x2041
 #define USB_VENDOR_ID_LOGITECH          0x046d
 #define USB_DEVICE_ID_LOGITECH_RECEIVER 0xc101
 #define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST  0xc110
@@ -369,28 +380,48 @@
 #define USB_DEVICE_ID_MS_PRESENTER_8K_BT        0x0701
 #define USB_DEVICE_ID_MS_PRESENTER_8K_USB       0x0713
+#define USB_VENDOR_ID_MOJO              0x8282
+#define USB_DEVICE_ID_RETRO_ADAPTER     0x3201
 #define USB_VENDOR_ID_MONTEREY          0x0566
 #define USB_DEVICE_ID_GENIUS_KB29E      0x3004
+#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_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_NEXTWINDOW        0x1926
 #define USB_DEVICE_ID_NEXTWINDOW_TOUCHSCREEN    0x0003
-#define USB_VENDOR_ID_NTRIG                0x1b96
+#define USB_VENDOR_ID_NTRIG             0x1b96
 #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN   0x0001
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1   0x0003
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2   0x0004
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3   0x0005
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4   0x0006
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5   0x0007
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6   0x0008
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7   0x0009
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8   0x000A
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9   0x000B
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_10   0x000C
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_11   0x000D
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_12   0x000E
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_13   0x000F
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_14   0x0010
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_15   0x0011
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16   0x0012
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17   0x0013
+#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18   0x0014
 #define USB_VENDOR_ID_ONTRAK            0x0a07
 #define USB_DEVICE_ID_ONTRAK_ADU100     0x0064
@@ -406,9 +437,12 @@
 #define USB_VENDOR_ID_PETALYNX          0x18b1
 #define USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE    0x0037
-#define USB_VENDOR_ID_PHILIPS       0x0471
+#define USB_VENDOR_ID_PHILIPS           0x0471
 #define USB_DEVICE_ID_PHILIPS_IEEE802154_DONGLE 0x0617
+#define USB_VENDOR_ID_PI_ENGINEERING    0x05f3
+#define USB_DEVICE_ID_PI_ENGINEERING_VEC_USB_FOOTPEDAL  0xff
 #define USB_VENDOR_ID_PLAYDOTCOM        0x0b43
 #define USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII      0x0003
@@ -418,16 +452,16 @@
 #define USB_VENDOR_ID_PRODIGE           0x05af
 #define USB_DEVICE_ID_PRODIGE_CORDLESS  0x3062
+#define USB_VENDOR_ID_QUANTA            0x0408
+#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH      0x3000
+#define USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN   0x3001
 #define USB_VENDOR_ID_ROCCAT            0x1e7d
 #define USB_DEVICE_ID_ROCCAT_KONE       0x2ced
 #define USB_VENDOR_ID_SAITEK            0x06a3
 #define USB_DEVICE_ID_SAITEK_RUMBLEPAD  0xff17
-#define USB_VENDOR_ID_QUANTA            0x0408
-#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH      0x3000
-#define USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN   0x3001
 #define USB_VENDOR_ID_SAMSUNG           0x0419
 #define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001
 #define USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE        0x0600
@@ -451,20 +485,23 @@
 #define USB_VENDOR_ID_THRUSTMASTER      0x044f
-#define USB_VENDOR_ID_TOUCHPACK         0x1bfd
+#define USB_VENDOR_ID_TOPSEED           0x0766
-#define USB_DEVICE_ID_TOUCHPACK_RTS     0x1688
+#define USB_DEVICE_ID_TOPSEED_CYBERLINK 0x0204
+#define USB_VENDOR_ID_TOPSEED2          0x1784
+#define USB_DEVICE_ID_TOPSEED2_RF_COMBO 0x0004
 #define USB_VENDOR_ID_TOPMAX            0x0663
 #define USB_DEVICE_ID_TOPMAX_COBRAPAD   0x0103
-#define USB_VENDOR_ID_TOPSEED           0x0766
+#define USB_VENDOR_ID_TOUCHPACK         0x1bfd
-#define USB_DEVICE_ID_TOPSEED_CYBERLINK 0x0204
+#define USB_DEVICE_ID_TOUCHPACK_RTS     0x1688
 #define USB_VENDOR_ID_TURBOX            0x062a
 #define USB_DEVICE_ID_TURBOX_KEYBOARD   0x0201
-#define USB_VENDOR_ID_TWINHAN           0x6253
+#define USB_VENDOR_ID_TWINHAN           0x6253
-#define USB_DEVICE_ID_TWINHAN_IR_REMOTE 0x0100
+#define USB_DEVICE_ID_TWINHAN_IR_REMOTE 0x0100
 #define USB_VENDOR_ID_UCLOGIC           0x5543
 #define USB_DEVICE_ID_UCLOGIC_TABLET_PF1209     0x0042
@@ -479,7 +516,6 @@
 #define USB_VENDOR_ID_WACOM             0x056a
 #define USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH  0x81
-#define USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH   0xbd
 #define USB_VENDOR_ID_WISEGROUP         0x0925
 #define USB_DEVICE_ID_SMARTJOY_PLUS     0x0005
@@ -501,9 +537,4 @@
 #define USB_VENDOR_ID_ZYDACRON  0x13EC
 #define USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL   0x0006
-#define USB_VENDOR_ID_KYE               0x0458
-#define USB_DEVICE_ID_KYE_ERGO_525V     0x0087
-#define USB_DEVICE_ID_KYE_GPEN_560      0x5003
 #endif
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 7a0d2e4661a1..6c03dcc5760a 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -199,11 +199,11 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                case HID_GD_MOUSE:
                case HID_GD_POINTER:  code += 0x110; break;
                case HID_GD_JOYSTICK:
-                                      if (code <= 0xf)
+                                if (code <= 0xf)
-                                              code += BTN_JOYSTICK;
+                                        code += BTN_JOYSTICK;
-                                      else
+                                else
-                                              code += BTN_TRIGGER_HAPPY;
+                                        code += BTN_TRIGGER_HAPPY;
-                                      break;
+                                break;
                case HID_GD_GAMEPAD:  code += 0x130; break;
                default:
                        switch (field->physical) {
@@ -301,6 +301,9 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
        case HID_UP_DIGITIZER:
                switch (usage->hid & 0xff) {
+                case 0x00: /* Undefined */
+                        goto ignore;
                case 0x30: /* TipPressure */
                        if (!test_bit(BTN_TOUCH, input->keybit)) {
                                device->quirks |= HID_QUIRK_NOTOUCH;
@@ -480,7 +483,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
        case HID_UP_LOGIVENDOR:
                goto ignore;
-        
        case HID_UP_PID:
                switch (usage->hid & HID_USAGE) {
                case 0xa4: map_key_clear(BTN_DEAD);     break;
@@ -534,6 +537,9 @@ mapped:
                        input_set_abs_params(input, usage->code, a, b, (b - a) >> 8, (b - a) >> 4);
                else    input_set_abs_params(input, usage->code, a, b, 0, 0);
+                /* use a larger default input buffer for MT devices */
+                if (usage->code == ABS_MT_POSITION_X && input->hint_events_per_packet == 0)
+                        input_set_events_per_packet(input, 60);
        }
        if (usage->type == EV_ABS &&
@@ -586,9 +592,9 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
                        hat_dir = (value - usage->hat_min) * 8 / (usage->hat_max - usage->hat_min + 1) + 1;
                if (hat_dir < 0 || hat_dir > 8) hat_dir = 0;
                input_event(input, usage->type, usage->code    , hid_hat_to_axis[hat_dir].x);
-                input_event(input, usage->type, usage->code + 1, hid_hat_to_axis[hat_dir].y);
+                input_event(input, usage->type, usage->code + 1, hid_hat_to_axis[hat_dir].y);
-                return;
+                return;
-        }
+        }
        if (usage->hid == (HID_UP_DIGITIZER | 0x003c)) { /* Invert */
                *quirks = value ? (*quirks | HID_QUIRK_INVERT) : (*quirks & ~HID_QUIRK_INVERT);
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
index f10d56a15f21..319b0e57ee41 100644
--- a/drivers/hid/hid-magicmouse.c
+++ b/drivers/hid/hid-magicmouse.c
@@ -30,6 +30,21 @@ static bool emulate_scroll_wheel = true;
 module_param(emulate_scroll_wheel, bool, 0644);
 MODULE_PARM_DESC(emulate_scroll_wheel, "Emulate a scroll wheel");
+static unsigned int scroll_speed = 32;
+static int param_set_scroll_speed(const char *val, struct kernel_param *kp) {
+        unsigned long speed;
+        if (!val || strict_strtoul(val, 0, &speed) || speed > 63)
+                return -EINVAL;
+        scroll_speed = speed;
+        return 0;
+}
+module_param_call(scroll_speed, param_set_scroll_speed, param_get_uint, &scroll_speed, 0644);
+MODULE_PARM_DESC(scroll_speed, "Scroll speed, value from 0 (slow) to 63 (fast)");
+static bool scroll_acceleration = false;
+module_param(scroll_acceleration, bool, 0644);
+MODULE_PARM_DESC(scroll_acceleration, "Accelerate sequential scroll events");
 static bool report_touches = true;
 module_param(report_touches, bool, 0644);
 MODULE_PARM_DESC(report_touches, "Emit touch records (otherwise, only use them for emulation)");
@@ -50,6 +65,8 @@ MODULE_PARM_DESC(report_undeciphered, "Report undeciphered multi-touch state fie
 #define TOUCH_STATE_START 0x30
 #define TOUCH_STATE_DRAG  0x40
+#define SCROLL_ACCEL_DEFAULT 7
 /**
 * struct magicmouse_sc - Tracks Magic Mouse-specific data.
 * @input: Input device through which we report events.
@@ -78,8 +95,10 @@ struct magicmouse_sc {
        struct {
                short x;
                short y;
+                short scroll_x;
                short scroll_y;
                u8 size;
+                u8 down;
        } touches[16];
        int tracking_ids[16];
 };
@@ -141,7 +160,7 @@ static void magicmouse_emit_buttons(struct magicmouse_sc *msc, int state)
        input_report_key(msc->input, BTN_RIGHT, state & 2);
        if (state != last_state)
-                msc->scroll_accel = 0;
+                msc->scroll_accel = SCROLL_ACCEL_DEFAULT;
 }
 static void magicmouse_emit_touch(struct magicmouse_sc *msc, int raw_id, u8 *tdata)
@@ -152,6 +171,7 @@ static void magicmouse_emit_touch(struct magicmouse_sc *msc, int raw_id, u8 *tda
        int id = (misc >> 6) & 15;
        int x = x_y << 12 >> 20;
        int y = -(x_y >> 20);
+        int down = (tdata[7] & TOUCH_STATE_MASK) != TOUCH_STATE_NONE;
        /* Store tracking ID and other fields. */
        msc->tracking_ids[raw_id] = id;
@@ -160,42 +180,54 @@ static void magicmouse_emit_touch(struct magicmouse_sc *msc, int raw_id, u8 *tda
        msc->touches[id].size = misc & 63;
        /* If requested, emulate a scroll wheel by detecting small
-         * vertical touch motions along the middle of the mouse.
+         * vertical touch motions.
         */
-        if (emulate_scroll_wheel &&
+        if (emulate_scroll_wheel) {
-            middle_button_start < x && x < middle_button_stop) {
-                static const int accel_profile[] = {
-                        256, 228, 192, 160, 128, 96, 64, 32,
-                };
                unsigned long now = jiffies;
-                int step = msc->touches[id].scroll_y - y;
+                int step_x = msc->touches[id].scroll_x - x;
+                int step_y = msc->touches[id].scroll_y - y;
-                /* Reset acceleration after half a second. */
-                if (time_after(now, msc->scroll_jiffies + HZ / 2))
-                        msc->scroll_accel = 0;
                /* Calculate and apply the scroll motion. */
                switch (tdata[7] & TOUCH_STATE_MASK) {
                case TOUCH_STATE_START:
+                        msc->touches[id].scroll_x = x;
                        msc->touches[id].scroll_y = y;
-                        msc->scroll_accel = min_t(int, msc->scroll_accel + 1,
-                                                ARRAY_SIZE(accel_profile) - 1);
+                        /* Reset acceleration after half a second. */
+                        if (scroll_acceleration && time_before(now,
+                                                msc->scroll_jiffies + HZ / 2))
+                                msc->scroll_accel = max_t(int,
+                                                msc->scroll_accel - 1, 1);
+                        else
+                                msc->scroll_accel = SCROLL_ACCEL_DEFAULT;
                        break;
                case TOUCH_STATE_DRAG:
-                        step = step / accel_profile[msc->scroll_accel];
+                        step_x /= (64 - (int)scroll_speed) * msc->scroll_accel;
-                        if (step != 0) {
+                        if (step_x != 0) {
-                                msc->touches[id].scroll_y = y;
+                                msc->touches[id].scroll_x -= step_x *
+                                        (64 - scroll_speed) * msc->scroll_accel;
                                msc->scroll_jiffies = now;
-                                input_report_rel(input, REL_WHEEL, step);
+                                input_report_rel(input, REL_HWHEEL, -step_x);
+                        }
+                        step_y /= (64 - (int)scroll_speed) * msc->scroll_accel;
+                        if (step_y != 0) {
+                                msc->touches[id].scroll_y -= step_y *
+                                        (64 - scroll_speed) * msc->scroll_accel;
+                                msc->scroll_jiffies = now;
+                                input_report_rel(input, REL_WHEEL, step_y);
                        }
                        break;
                }
        }
        /* Generate the input events for this touch. */
-        if (report_touches) {
+        if (report_touches && down) {
                int orientation = (misc >> 10) - 32;
+                msc->touches[id].down = 1;
                input_report_abs(input, ABS_MT_TRACKING_ID, id);
                input_report_abs(input, ABS_MT_TOUCH_MAJOR, tdata[3]);
                input_report_abs(input, ABS_MT_TOUCH_MINOR, tdata[4]);
@@ -215,7 +247,7 @@ static int magicmouse_raw_event(struct hid_device *hdev,
 {
        struct magicmouse_sc *msc = hid_get_drvdata(hdev);
        struct input_dev *input = msc->input;
-        int x, y, ts, ii, clicks;
+        int x, y, ts, ii, clicks, last_up;
        switch (data[0]) {
        case 0x10:
@@ -235,12 +267,26 @@ static int magicmouse_raw_event(struct hid_device *hdev,
                msc->ntouches = (size - 6) / 8;
                for (ii = 0; ii < msc->ntouches; ii++)
                        magicmouse_emit_touch(msc, ii, data + ii * 8 + 6);
+                if (report_touches) {
+                        last_up = 1;
+                        for (ii = 0; ii < ARRAY_SIZE(msc->touches); ii++) {
+                                if (msc->touches[ii].down) {
+                                        last_up = 0;
+                                        msc->touches[ii].down = 0;
+                                }
+                        }
+                        if (last_up) {
+                                input_mt_sync(input);
+                        }
+                }
                /* When emulating three-button mode, it is important
                 * to have the current touch information before
                 * generating a click event.
                 */
-                x = (signed char)data[1];
+                x = (int)(((data[3] & 0x0c) << 28) | (data[1] << 22)) >> 22;
-                y = (signed char)data[2];
+                y = (int)(((data[3] & 0x30) << 26) | (data[2] << 22)) >> 22;
                clicks = data[3];
                break;
        case 0x20: /* Theoretically battery status (0-100), but I have
@@ -301,8 +347,10 @@ static void magicmouse_setup_input(struct input_dev *input, struct hid_device *h
        __set_bit(EV_REL, input->evbit);
        __set_bit(REL_X, input->relbit);
        __set_bit(REL_Y, input->relbit);
-        if (emulate_scroll_wheel)
+        if (emulate_scroll_wheel) {
                __set_bit(REL_WHEEL, input->relbit);
+                __set_bit(REL_HWHEEL, input->relbit);
+        }
        if (report_touches) {
                __set_bit(EV_ABS, input->evbit);
@@ -345,6 +393,8 @@ static int magicmouse_probe(struct hid_device *hdev,
                return -ENOMEM;
        }
+        msc->scroll_accel = SCROLL_ACCEL_DEFAULT;
        msc->quirks = id->driver_data;
        hid_set_drvdata(hdev, msc);
diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c
index b6b0caeeac58..fb69b8c4953f 100644
--- a/drivers/hid/hid-ntrig.c
+++ b/drivers/hid/hid-ntrig.c
@@ -868,6 +868,42 @@ static void ntrig_remove(struct hid_device *hdev)
 static const struct hid_device_id ntrig_devices[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN),
                .driver_data = NTRIG_DUPLICATE_USAGES },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1),
+                .driver_data = NTRIG_DUPLICATE_USAGES },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2),
+                .driver_data = NTRIG_DUPLICATE_USAGES },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3),
+                .driver_data = NTRIG_DUPLICATE_USAGES },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4),
+                .driver_data = NTRIG_DUPLICATE_USAGES },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5),
+                .driver_data = NTRIG_DUPLICATE_USAGES },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6),
+                .driver_data = NTRIG_DUPLICATE_USAGES },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7),
+                .driver_data = NTRIG_DUPLICATE_USAGES },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8),
+                .driver_data = NTRIG_DUPLICATE_USAGES },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9),
+                .driver_data = NTRIG_DUPLICATE_USAGES },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_10),
+                .driver_data = NTRIG_DUPLICATE_USAGES },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_11),
+                .driver_data = NTRIG_DUPLICATE_USAGES },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_12),
+                .driver_data = NTRIG_DUPLICATE_USAGES },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_13),
+                .driver_data = NTRIG_DUPLICATE_USAGES },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_14),
+                .driver_data = NTRIG_DUPLICATE_USAGES },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_15),
+                .driver_data = NTRIG_DUPLICATE_USAGES },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16),
+                .driver_data = NTRIG_DUPLICATE_USAGES },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17),
+                .driver_data = NTRIG_DUPLICATE_USAGES },
+        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18),
+                .driver_data = NTRIG_DUPLICATE_USAGES },
        { }
 };
 MODULE_DEVICE_TABLE(hid, ntrig_devices);
diff --git a/drivers/hid/hid-picolcd.c b/drivers/hid/hid-picolcd.c
index 7aabf65c48ef..346f0e34987e 100644
--- a/drivers/hid/hid-picolcd.c
+++ b/drivers/hid/hid-picolcd.c
@@ -127,6 +127,26 @@ static const struct fb_var_screeninfo picolcdfb_var = {
        .height         = 26,
        .bits_per_pixel = 1,
        .grayscale      = 1,
+        .red            = {
+                .offset = 0,
+                .length = 1,
+                .msb_right = 0,
+        },
+        .green          = {
+                .offset = 0,
+                .length = 1,
+                .msb_right = 0,
+        },
+        .blue           = {
+                .offset = 0,
+                .length = 1,
+                .msb_right = 0,
+        },
+        .transp         = {
+                .offset = 0,
+                .length = 0,
+                .msb_right = 0,
+        },
 };
 #endif /* CONFIG_HID_PICOLCD_FB */
@@ -188,6 +208,7 @@ struct picolcd_data {
        /* Framebuffer stuff */
        u8 fb_update_rate;
        u8 fb_bpp;
+        u8 fb_force;
        u8 *fb_vbitmap;         /* local copy of what was sent to PicoLCD */
        u8 *fb_bitmap;          /* framebuffer */
        struct fb_info *fb_info;
@@ -346,7 +367,7 @@ static int picolcd_fb_update_tile(u8 *vbitmap, const u8 *bitmap, int bpp,
                        const u8 *bdata = bitmap + tile * 256 + chip * 8 + b * 32;
                        for (i = 0; i < 64; i++) {
                                tdata[i] <<= 1;
-                                tdata[i] |= (bdata[i/8] >> (7 - i % 8)) & 0x01;
+                                tdata[i] |= (bdata[i/8] >> (i % 8)) & 0x01;
                        }
                }
        } else if (bpp == 8) {
@@ -399,13 +420,10 @@ static int picolcd_fb_reset(struct picolcd_data *data, int clear)
        if (data->fb_bitmap) {
                if (clear) {
-                        memset(data->fb_vbitmap, 0xff, PICOLCDFB_SIZE);
+                        memset(data->fb_vbitmap, 0, PICOLCDFB_SIZE);
                        memset(data->fb_bitmap, 0, PICOLCDFB_SIZE*data->fb_bpp);
-                } else {
-                        /* invert 1 byte in each tile to force resend */
-                        for (i = 0; i < PICOLCDFB_SIZE; i += 64)
-                                data->fb_vbitmap[i] = ~data->fb_vbitmap[i];
                }
+                data->fb_force = 1;
        }
        /* schedule first output of framebuffer */
@@ -421,6 +439,9 @@ static void picolcd_fb_update(struct picolcd_data *data)
        int chip, tile, n;
        unsigned long flags;
+        if (!data)
+                return;
        spin_lock_irqsave(&data->lock, flags);
        if (!(data->status & PICOLCD_READY_FB)) {
                spin_unlock_irqrestore(&data->lock, flags);
@@ -440,14 +461,18 @@ static void picolcd_fb_update(struct picolcd_data *data)
        for (chip = 0; chip < 4; chip++)
                for (tile = 0; tile < 8; tile++)
                        if (picolcd_fb_update_tile(data->fb_vbitmap,
-                                        data->fb_bitmap, data->fb_bpp, chip, tile)) {
+                                        data->fb_bitmap, data->fb_bpp, chip, tile) ||
+                                data->fb_force) {
                                n += 2;
+                                if (!data->fb_info->par)
+                                        return; /* device lost! */
                                if (n >= HID_OUTPUT_FIFO_SIZE / 2) {
                                        usbhid_wait_io(data->hdev);
                                        n = 0;
                                }
                                picolcd_fb_send_tile(data->hdev, chip, tile);
                        }
+        data->fb_force = false;
        if (n)
                usbhid_wait_io(data->hdev);
 }
@@ -511,11 +536,23 @@ static int picolcd_fb_blank(int blank, struct fb_info *info)
 static void picolcd_fb_destroy(struct fb_info *info)
 {
        struct picolcd_data *data = info->par;
+        u32 *ref_cnt = info->pseudo_palette;
+        int may_release;
        info->par = NULL;
        if (data)
                data->fb_info = NULL;
        fb_deferred_io_cleanup(info);
-        framebuffer_release(info);
+        ref_cnt--;
+        mutex_lock(&info->lock);
+        (*ref_cnt)--;
+        may_release = !ref_cnt;
+        mutex_unlock(&info->lock);
+        if (may_release) {
+                framebuffer_release(info);
+                vfree((u8 *)info->fix.smem_start);
+        }
 }
 static int picolcd_fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
@@ -526,29 +563,37 @@ static int picolcd_fb_check_var(struct fb_var_screeninfo *var, struct fb_info *i
        /* only allow 1/8 bit depth (8-bit is grayscale) */
        *var = picolcdfb_var;
        var->activate = activate;
-        if (bpp >= 8)
+        if (bpp >= 8) {
                var->bits_per_pixel = 8;
-        else
+                var->red.length     = 8;
+                var->green.length   = 8;
+                var->blue.length    = 8;
+        } else {
                var->bits_per_pixel = 1;
+                var->red.length     = 1;
+                var->green.length   = 1;
+                var->blue.length    = 1;
+        }
        return 0;
 }
 static int picolcd_set_par(struct fb_info *info)
 {
        struct picolcd_data *data = info->par;
-        u8 *o_fb, *n_fb;
+        u8 *tmp_fb, *o_fb;
+        if (!data)
+                return -ENODEV;
        if (info->var.bits_per_pixel == data->fb_bpp)
                return 0;
        /* switch between 1/8 bit depths */
        if (info->var.bits_per_pixel != 1 && info->var.bits_per_pixel != 8)
                return -EINVAL;
-        o_fb = data->fb_bitmap;
+        o_fb   = data->fb_bitmap;
-        n_fb = vmalloc(PICOLCDFB_SIZE*info->var.bits_per_pixel);
+        tmp_fb = kmalloc(PICOLCDFB_SIZE*info->var.bits_per_pixel, GFP_KERNEL);
-        if (!n_fb)
+        if (!tmp_fb)
                return -ENOMEM;
-        fb_deferred_io_cleanup(info);
        /* translate FB content to new bits-per-pixel */
        if (info->var.bits_per_pixel == 1) {
                int i, b;
@@ -558,24 +603,87 @@ static int picolcd_set_par(struct fb_info *info)
                                p <<= 1;
                                p |= o_fb[i*8+b] ? 0x01 : 0x00;
                        }
+                        tmp_fb[i] = p;
                }
+                memcpy(o_fb, tmp_fb, PICOLCDFB_SIZE);
                info->fix.visual = FB_VISUAL_MONO01;
                info->fix.line_length = PICOLCDFB_WIDTH / 8;
        } else {
                int i;
+                memcpy(tmp_fb, o_fb, PICOLCDFB_SIZE);
                for (i = 0; i < PICOLCDFB_SIZE * 8; i++)
-                        n_fb[i] = o_fb[i/8] & (0x01 << (7 - i % 8)) ? 0xff : 0x00;
+                        o_fb[i] = tmp_fb[i/8] & (0x01 << (7 - i % 8)) ? 0xff : 0x00;
-                info->fix.visual = FB_VISUAL_TRUECOLOR;
+                info->fix.visual = FB_VISUAL_DIRECTCOLOR;
                info->fix.line_length = PICOLCDFB_WIDTH;
        }
-        data->fb_bitmap   = n_fb;
+        kfree(tmp_fb);
        data->fb_bpp      = info->var.bits_per_pixel;
-        info->screen_base = (char __force __iomem *)n_fb;
+        return 0;
-        info->fix.smem_start = (unsigned long)n_fb;
+}
-        info->fix.smem_len   = PICOLCDFB_SIZE*data->fb_bpp;
-        fb_deferred_io_init(info);
+/* Do refcounting on our FB and cleanup per worker if FB is
-        vfree(o_fb);
+ * closed after unplug of our device
+ * (fb_release holds info->lock and still touches info after
+ *  we return so we can't release it immediately.
+ */
+struct picolcd_fb_cleanup_item {
+        struct fb_info *info;
+        struct picolcd_fb_cleanup_item *next;
+};
+static struct picolcd_fb_cleanup_item *fb_pending;
+DEFINE_SPINLOCK(fb_pending_lock);
+static void picolcd_fb_do_cleanup(struct work_struct *data)
+{
+        struct picolcd_fb_cleanup_item *item;
+        unsigned long flags;
+        do {
+                spin_lock_irqsave(&fb_pending_lock, flags);
+                item = fb_pending;
+                fb_pending = item ? item->next : NULL;
+                spin_unlock_irqrestore(&fb_pending_lock, flags);
+                if (item) {
+                        u8 *fb = (u8 *)item->info->fix.smem_start;
+                        /* make sure we do not race against fb core when
+                         * releasing */
+                        mutex_lock(&item->info->lock);
+                        mutex_unlock(&item->info->lock);
+                        framebuffer_release(item->info);
+                        vfree(fb);
+                }
+        } while (item);
+}
+DECLARE_WORK(picolcd_fb_cleanup, picolcd_fb_do_cleanup);
+static int picolcd_fb_open(struct fb_info *info, int u)
+{
+        u32 *ref_cnt = info->pseudo_palette;
+        ref_cnt--;
+        (*ref_cnt)++;
+        return 0;
+}
+static int picolcd_fb_release(struct fb_info *info, int u)
+{
+        u32 *ref_cnt = info->pseudo_palette;
+        ref_cnt--;
+        (*ref_cnt)++;
+        if (!*ref_cnt) {
+                unsigned long flags;
+                struct picolcd_fb_cleanup_item *item = (struct picolcd_fb_cleanup_item *)ref_cnt;
+                item--;
+                spin_lock_irqsave(&fb_pending_lock, flags);
+                item->next = fb_pending;
+                fb_pending = item;
+                spin_unlock_irqrestore(&fb_pending_lock, flags);
+                schedule_work(&picolcd_fb_cleanup);
+        }
        return 0;
 }
@@ -583,6 +691,8 @@ static int picolcd_set_par(struct fb_info *info)
 static struct fb_ops picolcdfb_ops = {
        .owner        = THIS_MODULE,
        .fb_destroy   = picolcd_fb_destroy,
+        .fb_open      = picolcd_fb_open,
+        .fb_release   = picolcd_fb_release,
        .fb_read      = fb_sys_read,
        .fb_write     = picolcd_fb_write,
        .fb_blank     = picolcd_fb_blank,
@@ -660,11 +770,12 @@ static int picolcd_init_framebuffer(struct picolcd_data *data)
 {
        struct device *dev = &data->hdev->dev;
        struct fb_info *info = NULL;
-        int error = -ENOMEM;
+        int i, error = -ENOMEM;
        u8 *fb_vbitmap = NULL;
        u8 *fb_bitmap  = NULL;
+        u32 *palette;
-        fb_bitmap = vmalloc(PICOLCDFB_SIZE*picolcdfb_var.bits_per_pixel);
+        fb_bitmap = vmalloc(PICOLCDFB_SIZE*8);
        if (fb_bitmap == NULL) {
                dev_err(dev, "can't get a free page for framebuffer\n");
                goto err_nomem;
@@ -678,18 +789,29 @@ static int picolcd_init_framebuffer(struct picolcd_data *data)
        data->fb_update_rate = PICOLCDFB_UPDATE_RATE_DEFAULT;
        data->fb_defio = picolcd_fb_defio;
-        info = framebuffer_alloc(0, dev);
+        /* The extra memory is:
+         * - struct picolcd_fb_cleanup_item
+         * - u32 for ref_count
+         * - 256*u32 for pseudo_palette
+         */
+        info = framebuffer_alloc(257 * sizeof(u32) + sizeof(struct picolcd_fb_cleanup_item), dev);
        if (info == NULL) {
                dev_err(dev, "failed to allocate a framebuffer\n");
                goto err_nomem;
        }
+        palette  = info->par + sizeof(struct picolcd_fb_cleanup_item);
+        *palette = 1;
+        palette++;
+        for (i = 0; i < 256; i++)
+                palette[i] = i > 0 && i < 16 ? 0xff : 0;
+        info->pseudo_palette = palette;
        info->fbdefio = &data->fb_defio;
        info->screen_base = (char __force __iomem *)fb_bitmap;
        info->fbops = &picolcdfb_ops;
        info->var = picolcdfb_var;
        info->fix = picolcdfb_fix;
-        info->fix.smem_len   = PICOLCDFB_SIZE;
+        info->fix.smem_len   = PICOLCDFB_SIZE*8;
        info->fix.smem_start = (unsigned long)fb_bitmap;
        info->par = data;
        info->flags = FBINFO_FLAG_DEFAULT;
@@ -707,18 +829,20 @@ static int picolcd_init_framebuffer(struct picolcd_data *data)
                dev_err(dev, "failed to create sysfs attributes\n");
                goto err_cleanup;
        }
+        fb_deferred_io_init(info);
        data->fb_info    = info;
        error = register_framebuffer(info);
        if (error) {
                dev_err(dev, "failed to register framebuffer\n");
                goto err_sysfs;
        }
-        fb_deferred_io_init(info);
        /* schedule first output of framebuffer */
+        data->fb_force = 1;
        schedule_delayed_work(&info->deferred_work, 0);
        return 0;
 err_sysfs:
+        fb_deferred_io_cleanup(info);
        device_remove_file(dev, &dev_attr_fb_update_rate);
 err_cleanup:
        data->fb_vbitmap = NULL;
@@ -737,19 +861,17 @@ static void picolcd_exit_framebuffer(struct picolcd_data *data)
 {
        struct fb_info *info = data->fb_info;
        u8 *fb_vbitmap = data->fb_vbitmap;
-        u8 *fb_bitmap  = data->fb_bitmap;
        if (!info)
                return;
+        info->par = NULL;
+        device_remove_file(&data->hdev->dev, &dev_attr_fb_update_rate);
+        unregister_framebuffer(info);
        data->fb_vbitmap = NULL;
        data->fb_bitmap  = NULL;
        data->fb_bpp     = 0;
        data->fb_info    = NULL;
-        device_remove_file(&data->hdev->dev, &dev_attr_fb_update_rate);
-        fb_deferred_io_cleanup(info);
-        unregister_framebuffer(info);
-        vfree(fb_bitmap);
        kfree(fb_vbitmap);
 }
@@ -2566,6 +2688,13 @@ static void picolcd_remove(struct hid_device *hdev)
        spin_lock_irqsave(&data->lock, flags);
        data->status |= PICOLCD_FAILED;
        spin_unlock_irqrestore(&data->lock, flags);
+#ifdef CONFIG_HID_PICOLCD_FB
+        /* short-circuit FB as early as possible in order to
+         * avoid long delays if we host console.
+         */
+        if (data->fb_info)
+                data->fb_info->par = NULL;
+#endif
        picolcd_exit_devfs(data);
        device_remove_file(&hdev->dev, &dev_attr_operation_mode);
@@ -2623,6 +2752,10 @@ static int __init picolcd_init(void)
 static void __exit picolcd_exit(void)
 {
        hid_unregister_driver(&picolcd_driver);
+#ifdef CONFIG_HID_PICOLCD_FB
+        flush_scheduled_work();
+        WARN_ON(fb_pending);
+#endif
 }
 module_init(picolcd_init);
diff --git a/drivers/hid/hid-roccat-kone.c b/drivers/hid/hid-roccat-kone.c
index 17f2dc04f883..f77695762cb5 100644
--- a/drivers/hid/hid-roccat-kone.c
+++ b/drivers/hid/hid-roccat-kone.c
@@ -22,11 +22,6 @@
 *      Is it possible to remove and reinstall the urb in raw-event- or any
 *      other handler, or to defer this action to be executed somewhere else?
 *
- * TODO implement notification mechanism for overlong macro execution
- *      If user wants to execute an overlong macro only the names of macroset
- *      and macro are given. Should userland tap hidraw or is there an
- *      additional streaming mechanism?
- *
 * TODO is it possible to overwrite group for sysfs attributes via udev?
 */
@@ -277,7 +272,7 @@ static ssize_t kone_sysfs_read_settings(struct file *fp, struct kobject *kobj,
                count = sizeof(struct kone_settings) - off;
        mutex_lock(&kone->kone_lock);
-        memcpy(buf, &kone->settings + off, count);
+        memcpy(buf, ((char const *)&kone->settings) + off, count);
        mutex_unlock(&kone->kone_lock);
        return count;
@@ -337,7 +332,7 @@ static ssize_t kone_sysfs_read_profilex(struct kobject *kobj,
                count = sizeof(struct kone_profile) - off;
        mutex_lock(&kone->kone_lock);
-        memcpy(buf, &kone->profiles[number - 1], sizeof(struct kone_profile));
+        memcpy(buf, ((char const *)&kone->profiles[number - 1]) + off, count);
        mutex_unlock(&kone->kone_lock);
        return count;
@@ -623,18 +618,6 @@ static ssize_t kone_sysfs_set_startup_profile(struct device *dev,
 }
 /*
- * This file is used by userland software to find devices that are handled by
- * this driver. This provides a consistent way for actual and older kernels
- * where this driver replaced usbhid instead of generic-usb.
- * Driver capabilities are determined by version number.
- */
-static ssize_t kone_sysfs_show_driver_version(struct device *dev,
-                struct device_attribute *attr, char *buf)
-{
-        return snprintf(buf, PAGE_SIZE, ROCCAT_KONE_DRIVER_VERSION "\n");
-}
-/*
 * Read actual dpi settings.
 * Returns raw value for further processing. Refer to enum kone_polling_rates to
 * get real value.
@@ -671,9 +654,6 @@ static DEVICE_ATTR(startup_profile, 0660,
                kone_sysfs_show_startup_profile,
                kone_sysfs_set_startup_profile);
-static DEVICE_ATTR(kone_driver_version, 0440,
-                kone_sysfs_show_driver_version, NULL);
 static struct attribute *kone_attributes[] = {
                &dev_attr_actual_dpi.attr,
                &dev_attr_actual_profile.attr,
@@ -681,7 +661,6 @@ static struct attribute *kone_attributes[] = {
                &dev_attr_firmware_version.attr,
                &dev_attr_tcu.attr,
                &dev_attr_startup_profile.attr,
-                &dev_attr_kone_driver_version.attr,
                NULL
 };
diff --git a/drivers/hid/hid-roccat-kone.h b/drivers/hid/hid-roccat-kone.h
index 003e6f81c195..130d6566ea82 100644
--- a/drivers/hid/hid-roccat-kone.h
+++ b/drivers/hid/hid-roccat-kone.h
@@ -14,8 +14,6 @@
 #include <linux/types.h>
-#define ROCCAT_KONE_DRIVER_VERSION "v0.3.1"
 #pragma pack(push)
 #pragma pack(1)
diff --git a/drivers/hid/hid-roccat.c b/drivers/hid/hid-roccat.c
index e05d48edb66f..f6e80c7ca61e 100644
--- a/drivers/hid/hid-roccat.c
+++ b/drivers/hid/hid-roccat.c
@@ -168,7 +168,7 @@ static int roccat_open(struct inode *inode, struct file *file)
                printk(KERN_EMERG "roccat device with minor %d doesn't exist\n",
                                minor);
                error = -ENODEV;
-                goto exit_unlock;
+                goto exit_err;
        }
        if (!device->open++) {
@@ -178,7 +178,7 @@ static int roccat_open(struct inode *inode, struct file *file)
                                        PM_HINT_FULLON);
                        if (error < 0) {
                                --device->open;
-                                goto exit_unlock;
+                                goto exit_err;
                        }
                }
                error = device->hid->ll_driver->open(device->hid);
@@ -187,7 +187,7 @@ static int roccat_open(struct inode *inode, struct file *file)
                                device->hid->ll_driver->power(device->hid,
                                                PM_HINT_NORMAL);
                        --device->open;
-                        goto exit_unlock;
+                        goto exit_err;
                }
        }
@@ -202,6 +202,9 @@ exit_unlock:
        mutex_unlock(&device->readers_lock);
        mutex_unlock(&devices_lock);
        return error;
+exit_err:
+        kfree(reader);
+        goto exit_unlock;
 }
 static int roccat_release(struct inode *inode, struct file *file)
diff --git a/drivers/hid/hid-roccat.h b/drivers/hid/hid-roccat.h
index d8aae0c1fa7e..09e864e9f79d 100644
--- a/drivers/hid/hid-roccat.h
+++ b/drivers/hid/hid-roccat.h
@@ -15,7 +15,7 @@
 #include <linux/hid.h>
 #include <linux/types.h>
-#if defined(CONFIG_HID_ROCCAT) || defined (CONFIG_HID_ROCCAT_MODULE)
+#if defined(CONFIG_HID_ROCCAT) || defined(CONFIG_HID_ROCCAT_MODULE)
 int roccat_connect(struct hid_device *hid);
 void roccat_disconnect(int minor);
 int roccat_report_event(int minor, u8 const *data, int len);
diff --git a/drivers/hid/hid-topseed.c b/drivers/hid/hid-topseed.c
index 2eebdcc57bcf..5771f851f856 100644
--- a/drivers/hid/hid-topseed.c
+++ b/drivers/hid/hid-topseed.c
@@ -6,6 +6,9 @@
 *
 *  Modified to also support BTC "Emprex 3009URF III Vista MCE Remote" by
 *  Wayne Thomas 2010.
+ *
+ *  Modified to support Conceptronic CLLRCMCE by
+ *  Kees Bakker 2010.
 */
 /*
@@ -34,6 +37,7 @@ static int ts_input_mapping(struct hid_device *hdev, struct hid_input *hi,
        case 0x00d: ts_map_key_clear(KEY_MEDIA);        break;
        case 0x024: ts_map_key_clear(KEY_MENU);         break;
        case 0x025: ts_map_key_clear(KEY_TV);           break;
+        case 0x027: ts_map_key_clear(KEY_MODE);         break;
        case 0x031: ts_map_key_clear(KEY_AUDIO);        break;
        case 0x032: ts_map_key_clear(KEY_TEXT);         break;
        case 0x033: ts_map_key_clear(KEY_CHANNEL);      break;
@@ -60,6 +64,7 @@ static int ts_input_mapping(struct hid_device *hdev, struct hid_input *hi,
 static const struct hid_device_id ts_devices[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) },
        { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED2, USB_DEVICE_ID_TOPSEED2_RF_COMBO) },
        { }
 };
 MODULE_DEVICE_TABLE(hid, ts_devices);
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
index 1e051f1171e4..807dcd1555a6 100644
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@ -436,7 +436,7 @@ static void wacom_remove(struct hid_device *hdev)
 static const struct hid_device_id wacom_devices[] = {
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },
-        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) },
        { }
 };
 MODULE_DEVICE_TABLE(hid, wacom_devices);
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index 3ccd47850677..47d70c523d93 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -46,7 +46,6 @@ static ssize_t hidraw_read(struct file *file, char __user *buffer, size_t count,
 {
        struct hidraw_list *list = file->private_data;
        int ret = 0, len;
-        char *report;
        DECLARE_WAITQUEUE(wait, current);
        mutex_lock(&list->read_mutex);
@@ -84,7 +83,6 @@ static ssize_t hidraw_read(struct file *file, char __user *buffer, size_t count,
                if (ret)
                        goto out;
-                report = list->buffer[list->tail].value;
                len = list->buffer[list->tail].len > count ?
                        count : list->buffer[list->tail].len;
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 1ebd3244eb85..b729c0286679 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -827,14 +827,21 @@ static int usbhid_output_raw_report(struct hid_device *hid, __u8 *buf, size_t co
                                ret++;
                }
        } else {
+                int skipped_report_id = 0;
+                if (buf[0] == 0x0) {
+                        /* Don't send the Report ID */
+                        buf++;
+                        count--;
+                        skipped_report_id = 1;
+                }
                ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
                        HID_REQ_SET_REPORT,
                        USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
                        ((report_type + 1) << 8) | *buf,
-                        interface->desc.bInterfaceNumber, buf + 1, count - 1,
+                        interface->desc.bInterfaceNumber, buf, count,
                        USB_CTRL_SET_TIMEOUT);
-                /* count also the report id */
+                /* count also the report id, if this was a numbered report. */
-                if (ret > 0)
+                if (ret > 0 && skipped_report_id)
                        ret++;
        }
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 5ff8d327f33a..2643d3147621 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -34,6 +34,7 @@ static const struct hid_blacklist {
        { 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_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH, HID_QUIRK_MULTI_INPUT },
+        { USB_VENDOR_ID_MOJO, USB_DEVICE_ID_RETRO_ADAPTER, 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 },
@@ -56,6 +57,7 @@ static const struct hid_blacklist {
        { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_COMBATSTICK, HID_QUIRK_NOGET },
+        { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FLIGHT_SIM_ECLIPSE_YOKE, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FLIGHT_SIM_YOKE, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_PRO_PEDALS, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_3AXIS_5BUTTON_STICK, HID_QUIRK_NOGET },
@@ -73,6 +75,8 @@ static const struct hid_blacklist {
        { USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
        { USB_VENDOR_ID_WISEGROUP_LTD2, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
+        { USB_VENDOR_ID_PI_ENGINEERING, USB_DEVICE_ID_PI_ENGINEERING_VEC_USB_FOOTPEDAL, HID_QUIRK_HIDINPUT_FORCE },
        { 0, 0 }
 };
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index c24d2fa3e3b6..254a003af048 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -67,7 +67,7 @@ struct hiddev_list {
        struct mutex thread_lock;
 };
-static struct hiddev *hiddev_table[HIDDEV_MINORS];
+static struct usb_driver hiddev_driver;
 /*
 * Find a report, given the report's type and ID.  The ID can be specified
@@ -265,22 +265,19 @@ static int hiddev_release(struct inode * inode, struct file * file)
 static int hiddev_open(struct inode *inode, struct file *file)
 {
        struct hiddev_list *list;
-        int res, i;
+        struct usb_interface *intf;
+        struct hiddev *hiddev;
-        /* See comment in hiddev_connect() for BKL explanation */
+        int res;
-        lock_kernel();
-        i = iminor(inode) - HIDDEV_MINOR_BASE;
-        if (i >= HIDDEV_MINORS || i < 0 || !hiddev_table[i])
+        intf = usb_find_interface(&hiddev_driver, iminor(inode));
+        if (!intf)
                return -ENODEV;
+        hiddev = usb_get_intfdata(intf);
        if (!(list = kzalloc(sizeof(struct hiddev_list), GFP_KERNEL)))
                return -ENOMEM;
        mutex_init(&list->thread_lock);
+        list->hiddev = hiddev;
-        list->hiddev = hiddev_table[i];
        file->private_data = list;
        /*
@@ -289,7 +286,7 @@ static int hiddev_open(struct inode *inode, struct file *file)
         */
        if (list->hiddev->exist) {
                if (!list->hiddev->open++) {
-                        res = usbhid_open(hiddev_table[i]->hid);
+                        res = usbhid_open(hiddev->hid);
                        if (res < 0) {
                                res = -EIO;
                                goto bail;
@@ -301,12 +298,12 @@ static int hiddev_open(struct inode *inode, struct file *file)
        }
        spin_lock_irq(&list->hiddev->list_lock);
-        list_add_tail(&list->node, &hiddev_table[i]->list);
+        list_add_tail(&list->node, &hiddev->list);
        spin_unlock_irq(&list->hiddev->list_lock);
        if (!list->hiddev->open++)
                if (list->hiddev->exist) {
-                        struct hid_device *hid = hiddev_table[i]->hid;
+                        struct hid_device *hid = hiddev->hid;
                        res = usbhid_get_power(hid);
                        if (res < 0) {
                                res = -EIO;
@@ -314,13 +311,10 @@ static int hiddev_open(struct inode *inode, struct file *file)
                        }
                        usbhid_open(hid);
                }
-        unlock_kernel();
        return 0;
 bail:
        file->private_data = NULL;
        kfree(list);
-        unlock_kernel();
        return res;
 }
@@ -894,37 +888,14 @@ int hiddev_connect(struct hid_device *hid, unsigned int force)
        hid->hiddev = hiddev;
        hiddev->hid = hid;
        hiddev->exist = 1;
+        usb_set_intfdata(usbhid->intf, usbhid);
-        /*
-         * BKL here is used to avoid race after usb_register_dev().
-         * Once the device node has been created, open() could happen on it.
-         * The code below will then fail, as hiddev_table hasn't been
-         * updated.
-         *
-         * The obvious fix -- introducing mutex to guard hiddev_table[]
-         * doesn't work, as usb_open() and usb_register_dev() both take
-         * minor_rwsem, thus we'll have ABBA deadlock.
-         *
-         * Before BKL pushdown, usb_open() had been acquiring it in right
-         * order, so _open() was safe to use it to protect from this race.
-         * Now the order is different, but AB-BA deadlock still doesn't occur
-         * as BKL is dropped on schedule() (i.e. while sleeping on
-         * minor_rwsem). Fugly.
-         */
-        lock_kernel();
        retval = usb_register_dev(usbhid->intf, &hiddev_class);
        if (retval) {
                err_hid("Not able to get a minor for this device.");
                hid->hiddev = NULL;
-                unlock_kernel();
                kfree(hiddev);
                return -1;
-        } else {
-                hid->minor = usbhid->intf->minor;
-                hiddev_table[usbhid->intf->minor - HIDDEV_MINOR_BASE] = hiddev;
        }
-        unlock_kernel();
        return 0;
 }
@@ -942,7 +913,6 @@ void hiddev_disconnect(struct hid_device *hid)
        hiddev->exist = 0;
        mutex_unlock(&hiddev->existancelock);
-        hiddev_table[hiddev->hid->minor - HIDDEV_MINOR_BASE] = NULL;
        usb_deregister_dev(usbhid->intf, &hiddev_class);
        if (hiddev->open) {
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index e19cf8eb6ccf..c57e530d07c7 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -446,6 +446,16 @@ config SENSORS_IT87
          This driver can also be built as a module.  If so, the module
          will be called it87.
+config SENSORS_JZ4740
+        tristate "Ingenic JZ4740 SoC ADC driver"
+        depends on MACH_JZ4740 && MFD_JZ4740_ADC
+        help
+          If you say yes here you get support for reading adc values from the ADCIN
+          pin on Ingenic JZ4740 SoC based boards.
+          This driver can also be build as a module. If so, the module will be
+          called jz4740-hwmon.
 config SENSORS_LM63
        tristate "National Semiconductor LM63 and LM64"
        depends on I2C
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index 2138ceb1a713..c5057745b068 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -55,6 +55,7 @@ obj-$(CONFIG_SENSORS_I5K_AMB)	+= i5k_amb.o
 obj-$(CONFIG_SENSORS_IBMAEM)    += ibmaem.o
 obj-$(CONFIG_SENSORS_IBMPEX)    += ibmpex.o
 obj-$(CONFIG_SENSORS_IT87)      += it87.o
+obj-$(CONFIG_SENSORS_JZ4740)    += jz4740-hwmon.o
 obj-$(CONFIG_SENSORS_K8TEMP)    += k8temp.o
 obj-$(CONFIG_SENSORS_K10TEMP)   += k10temp.o
 obj-$(CONFIG_SENSORS_LIS3LV02D) += lis3lv02d.o hp_accel.o
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index 2988da150ed6..05344af50734 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -53,6 +53,7 @@ struct coretemp_data {
        struct mutex update_lock;
        const char *name;
        u32 id;
+        u16 core_id;
        char valid;             /* zero until following fields are valid */
        unsigned long last_updated;     /* in jiffies */
        int temp;
@@ -75,7 +76,7 @@ static ssize_t show_name(struct device *dev, struct device_attribute
        if (attr->index == SHOW_NAME)
                ret = sprintf(buf, "%s\n", data->name);
        else    /* show label */
-                ret = sprintf(buf, "Core %d\n", data->id);
+                ret = sprintf(buf, "Core %d\n", data->core_id);
        return ret;
 }
@@ -304,6 +305,9 @@ static int __devinit coretemp_probe(struct platform_device *pdev)
        }
        data->id = pdev->id;
+#ifdef CONFIG_SMP
+        data->core_id = c->cpu_core_id;
+#endif
        data->name = "coretemp";
        mutex_init(&data->update_lock);
@@ -405,6 +409,10 @@ struct pdev_entry {
        struct list_head list;
        struct platform_device *pdev;
        unsigned int cpu;
+#ifdef CONFIG_SMP
+        u16 phys_proc_id;
+        u16 cpu_core_id;
+#endif
 };
 static LIST_HEAD(pdev_list);
@@ -415,6 +423,22 @@ static int __cpuinit coretemp_device_add(unsigned int cpu)
        int err;
        struct platform_device *pdev;
        struct pdev_entry *pdev_entry;
+#ifdef CONFIG_SMP
+        struct cpuinfo_x86 *c = &cpu_data(cpu);
+#endif
+        mutex_lock(&pdev_list_mutex);
+#ifdef CONFIG_SMP
+        /* Skip second HT entry of each core */
+        list_for_each_entry(pdev_entry, &pdev_list, list) {
+                if (c->phys_proc_id == pdev_entry->phys_proc_id &&
+                    c->cpu_core_id == pdev_entry->cpu_core_id) {
+                        err = 0;        /* Not an error */
+                        goto exit;
+                }
+        }
+#endif
        pdev = platform_device_alloc(DRVNAME, cpu);
        if (!pdev) {
@@ -438,7 +462,10 @@ static int __cpuinit coretemp_device_add(unsigned int cpu)
        pdev_entry->pdev = pdev;
        pdev_entry->cpu = cpu;
-        mutex_lock(&pdev_list_mutex);
+#ifdef CONFIG_SMP
+        pdev_entry->phys_proc_id = c->phys_proc_id;
+        pdev_entry->cpu_core_id = c->cpu_core_id;
+#endif
        list_add_tail(&pdev_entry->list, &pdev_list);
        mutex_unlock(&pdev_list_mutex);
@@ -449,6 +476,7 @@ exit_device_free:
 exit_device_put:
        platform_device_put(pdev);
 exit:
+        mutex_unlock(&pdev_list_mutex);
        return err;
 }
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index 5be09c048c5f..25763d2223b6 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -80,6 +80,13 @@ superio_inb(int reg)
        return inb(VAL);
 }
+static inline void
+superio_outb(int reg, int val)
+{
+        outb(reg, REG);
+        outb(val, VAL);
+}
 static int superio_inw(int reg)
 {
        int val;
@@ -1517,6 +1524,21 @@ static int __init it87_find(unsigned short *address,
                        sio_data->vid_value = superio_inb(IT87_SIO_VID_REG);
                reg = superio_inb(IT87_SIO_PINX2_REG);
+                /*
+                 * The IT8720F has no VIN7 pin, so VCCH should always be
+                 * routed internally to VIN7 with an internal divider.
+                 * Curiously, there still is a configuration bit to control
+                 * this, which means it can be set incorrectly. And even
+                 * more curiously, many boards out there are improperly
+                 * configured, even though the IT8720F datasheet claims
+                 * that the internal routing of VCCH to VIN7 is the default
+                 * setting. So we force the internal routing in this case.
+                 */
+                if (sio_data->type == it8720 && !(reg & (1 << 1))) {
+                        reg |= (1 << 1);
+                        superio_outb(IT87_SIO_PINX2_REG, reg);
+                        pr_notice("it87: Routing internal VCCH to in7\n");
+                }
                if (reg & (1 << 0))
                        pr_info("it87: in3 is VCC (+5V)\n");
                if (reg & (1 << 1))
diff --git a/drivers/hwmon/jz4740-hwmon.c b/drivers/hwmon/jz4740-hwmon.c
new file mode 100644
index 000000000000..1c8b3d9e2051
--- /dev/null
+++ b/drivers/hwmon/jz4740-hwmon.c
@@ -0,0 +1,230 @@
+/*
+ * Copyright (C) 2009-2010, Lars-Peter Clausen <lars@metafoo.de>
+ * JZ4740 SoC HWMON 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.
+ *
+ * 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/err.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/completion.h>
+#include <linux/mfd/core.h>
+#include <linux/hwmon.h>
+struct jz4740_hwmon {
+        struct resource *mem;
+        void __iomem *base;
+        int irq;
+        struct mfd_cell *cell;
+        struct device *hwmon;
+        struct completion read_completion;
+        struct mutex lock;
+};
+static ssize_t jz4740_hwmon_show_name(struct device *dev,
+        struct device_attribute *dev_attr, char *buf)
+{
+        return sprintf(buf, "jz4740\n");
+}
+static irqreturn_t jz4740_hwmon_irq(int irq, void *data)
+{
+        struct jz4740_hwmon *hwmon = data;
+        complete(&hwmon->read_completion);
+        return IRQ_HANDLED;
+}
+static ssize_t jz4740_hwmon_read_adcin(struct device *dev,
+        struct device_attribute *dev_attr, char *buf)
+{
+        struct jz4740_hwmon *hwmon = dev_get_drvdata(dev);
+        struct completion *completion = &hwmon->read_completion;
+        unsigned long t;
+        unsigned long val;
+        int ret;
+        mutex_lock(&hwmon->lock);
+        INIT_COMPLETION(*completion);
+        enable_irq(hwmon->irq);
+        hwmon->cell->enable(to_platform_device(dev));
+        t = wait_for_completion_interruptible_timeout(completion, HZ);
+        if (t > 0) {
+                val = readw(hwmon->base) & 0xfff;
+                val = (val * 3300) >> 12;
+                ret = sprintf(buf, "%lu\n", val);
+        } else {
+                ret = t ? t : -ETIMEDOUT;
+        }
+        hwmon->cell->disable(to_platform_device(dev));
+        disable_irq(hwmon->irq);
+        mutex_unlock(&hwmon->lock);
+        return ret;
+}
+static DEVICE_ATTR(name, S_IRUGO, jz4740_hwmon_show_name, NULL);
+static DEVICE_ATTR(in0_input, S_IRUGO, jz4740_hwmon_read_adcin, NULL);
+static struct attribute *jz4740_hwmon_attributes[] = {
+        &dev_attr_name.attr,
+        &dev_attr_in0_input.attr,
+        NULL
+};
+static const struct attribute_group jz4740_hwmon_attr_group = {
+        .attrs = jz4740_hwmon_attributes,
+};
+static int __devinit jz4740_hwmon_probe(struct platform_device *pdev)
+{
+        int ret;
+        struct jz4740_hwmon *hwmon;
+        hwmon = kmalloc(sizeof(*hwmon), GFP_KERNEL);
+        if (!hwmon) {
+                dev_err(&pdev->dev, "Failed to allocate driver structure\n");
+                return -ENOMEM;
+        }
+        hwmon->cell = pdev->dev.platform_data;
+        hwmon->irq = platform_get_irq(pdev, 0);
+        if (hwmon->irq < 0) {
+                ret = hwmon->irq;
+                dev_err(&pdev->dev, "Failed to get platform irq: %d\n", ret);
+                goto err_free;
+        }
+        hwmon->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!hwmon->mem) {
+                ret = -ENOENT;
+                dev_err(&pdev->dev, "Failed to get platform mmio resource\n");
+                goto err_free;
+        }
+        hwmon->mem = request_mem_region(hwmon->mem->start,
+                        resource_size(hwmon->mem), pdev->name);
+        if (!hwmon->mem) {
+                ret = -EBUSY;
+                dev_err(&pdev->dev, "Failed to request mmio memory region\n");
+                goto err_free;
+        }
+        hwmon->base = ioremap_nocache(hwmon->mem->start,
+                        resource_size(hwmon->mem));
+        if (!hwmon->base) {
+                ret = -EBUSY;
+                dev_err(&pdev->dev, "Failed to ioremap mmio memory\n");
+                goto err_release_mem_region;
+        }
+        init_completion(&hwmon->read_completion);
+        mutex_init(&hwmon->lock);
+        platform_set_drvdata(pdev, hwmon);
+        ret = request_irq(hwmon->irq, jz4740_hwmon_irq, 0, pdev->name, hwmon);
+        if (ret) {
+                dev_err(&pdev->dev, "Failed to request irq: %d\n", ret);
+                goto err_iounmap;
+        }
+        disable_irq(hwmon->irq);
+        ret = sysfs_create_group(&pdev->dev.kobj, &jz4740_hwmon_attr_group);
+        if (ret) {
+                dev_err(&pdev->dev, "Failed to create sysfs group: %d\n", ret);
+                goto err_free_irq;
+        }
+        hwmon->hwmon = hwmon_device_register(&pdev->dev);
+        if (IS_ERR(hwmon->hwmon)) {
+                ret = PTR_ERR(hwmon->hwmon);
+                goto err_remove_file;
+        }
+        return 0;
+err_remove_file:
+        sysfs_remove_group(&pdev->dev.kobj, &jz4740_hwmon_attr_group);
+err_free_irq:
+        free_irq(hwmon->irq, hwmon);
+err_iounmap:
+        platform_set_drvdata(pdev, NULL);
+        iounmap(hwmon->base);
+err_release_mem_region:
+        release_mem_region(hwmon->mem->start, resource_size(hwmon->mem));
+err_free:
+        kfree(hwmon);
+        return ret;
+}
+static int __devexit jz4740_hwmon_remove(struct platform_device *pdev)
+{
+        struct jz4740_hwmon *hwmon = platform_get_drvdata(pdev);
+        hwmon_device_unregister(hwmon->hwmon);
+        sysfs_remove_group(&pdev->dev.kobj, &jz4740_hwmon_attr_group);
+        free_irq(hwmon->irq, hwmon);
+        iounmap(hwmon->base);
+        release_mem_region(hwmon->mem->start, resource_size(hwmon->mem));
+        platform_set_drvdata(pdev, NULL);
+        kfree(hwmon);
+        return 0;
+}
+struct platform_driver jz4740_hwmon_driver = {
+        .probe  = jz4740_hwmon_probe,
+        .remove = __devexit_p(jz4740_hwmon_remove),
+        .driver = {
+                .name = "jz4740-hwmon",
+                .owner = THIS_MODULE,
+        },
+};
+static int __init jz4740_hwmon_init(void)
+{
+        return platform_driver_register(&jz4740_hwmon_driver);
+}
+module_init(jz4740_hwmon_init);
+static void __exit jz4740_hwmon_exit(void)
+{
+        platform_driver_unregister(&jz4740_hwmon_driver);
+}
+module_exit(jz4740_hwmon_exit);
+MODULE_DESCRIPTION("JZ4740 SoC HWMON driver");
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:jz4740-hwmon");
diff --git a/drivers/hwmon/k8temp.c b/drivers/hwmon/k8temp.c
index f26acdb11681..8bdf80d91598 100644
--- a/drivers/hwmon/k8temp.c
+++ b/drivers/hwmon/k8temp.c
@@ -180,11 +180,13 @@ static int __devinit k8temp_probe(struct pci_dev *pdev,
                }
                if ((model >= 0x69) &&
-                    !(model == 0xc1 || model == 0x6c || model == 0x7c)) {
+                    !(model == 0xc1 || model == 0x6c || model == 0x7c ||
+                      model == 0x6b || model == 0x6f || model == 0x7f)) {
                        /*
-                         * RevG desktop CPUs (i.e. no socket S1G1 parts)
+                         * RevG desktop CPUs (i.e. no socket S1G1 or
-                         * need additional offset, otherwise reported
+                         * ASB1 parts) need additional offset,
-                         * temperature is below ambient temperature
+                         * otherwise reported temperature is below
+                         * ambient temperature
                         */
                        data->temp_offset = 21000;
                }
diff --git a/drivers/hwmon/ultra45_env.c b/drivers/hwmon/ultra45_env.c
index 5da5942cf970..89643261ccdb 100644
--- a/drivers/hwmon/ultra45_env.c
+++ b/drivers/hwmon/ultra45_env.c
@@ -311,12 +311,12 @@ static struct of_platform_driver env_driver = {
 static int __init env_init(void)
 {
-        return of_register_driver(&env_driver, &of_bus_type);
+        return of_register_platform_driver(&env_driver);
 }
 static void __exit env_exit(void)
 {
-        of_unregister_driver(&env_driver);
+        of_unregister_platform_driver(&env_driver);
 }
 module_init(env_init);
diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
index b02b4533651d..e591de1bc704 100644
--- a/drivers/i2c/busses/i2c-cpm.c
+++ b/drivers/i2c/busses/i2c-cpm.c
@@ -652,6 +652,7 @@ static int __devinit cpm_i2c_probe(struct of_device *ofdev,
        cpm->adap = cpm_ops;
        i2c_set_adapdata(&cpm->adap, cpm);
        cpm->adap.dev.parent = &ofdev->dev;
+        cpm->adap.dev.of_node = of_node_get(ofdev->dev.of_node);
        result = cpm_i2c_setup(cpm);
        if (result) {
@@ -676,11 +677,6 @@ static int __devinit cpm_i2c_probe(struct of_device *ofdev,
        dev_dbg(&ofdev->dev, "hw routines for %s registered.\n",
                cpm->adap.name);
-        /*
-         * register OF I2C devices
-         */
-        of_register_i2c_devices(&cpm->adap, ofdev->dev.of_node);
        return 0;
 out_shut:
        cpm_i2c_shutdown(cpm);
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index f4b21f2bb8ed..c60081169cc3 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -655,7 +655,7 @@ static void __devinit dmi_check_onboard_device(u8 type, const char *name,
                /* & ~0x80, ignore enabled/disabled bit */
                if ((type & ~0x80) != dmi_devices[i].type)
                        continue;
-                if (strcmp(name, dmi_devices[i].name))
+                if (strcasecmp(name, dmi_devices[i].name))
                        continue;
                memset(&info, 0, sizeof(struct i2c_board_info));
@@ -704,9 +704,6 @@ static int __devinit i801_probe(struct pci_dev *dev,
 {
        unsigned char temp;
        int err, i;
-#if defined CONFIG_SENSORS_FSCHMD || defined CONFIG_SENSORS_FSCHMD_MODULE
-        const char *vendor;
-#endif
        I801_dev = dev;
        i801_features = 0;
@@ -808,8 +805,7 @@ static int __devinit i801_probe(struct pci_dev *dev,
        }
 #endif
 #if defined CONFIG_SENSORS_FSCHMD || defined CONFIG_SENSORS_FSCHMD_MODULE
-        vendor = dmi_get_system_info(DMI_BOARD_VENDOR);
+        if (dmi_name_in_vendors("FUJITSU"))
-        if (vendor && !strcmp(vendor, "FUJITSU SIEMENS"))
                dmi_walk(dmi_check_onboard_devices, &i801_adapter);
 #endif
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index bf344135647a..1168d61418c9 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -745,6 +745,7 @@ static int __devinit iic_probe(struct of_device *ofdev,
        /* Register it with i2c layer */
        adap = &dev->adap;
        adap->dev.parent = &ofdev->dev;
+        adap->dev.of_node = of_node_get(np);
        strlcpy(adap->name, "IBM IIC", sizeof(adap->name));
        i2c_set_adapdata(adap, dev);
        adap->class = I2C_CLASS_HWMON | I2C_CLASS_SPD;
@@ -760,9 +761,6 @@ static int __devinit iic_probe(struct of_device *ofdev,
        dev_info(&ofdev->dev, "using %s mode\n",
                 dev->fast_mode ? "fast (400 kHz)" : "standard (100 kHz)");
-        /* Now register all the child nodes */
-        of_register_i2c_devices(adap, np);
        return 0;
 error_cleanup:
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index df00eb1f11f9..6545d1c99b61 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -63,6 +63,7 @@ struct mpc_i2c {
        wait_queue_head_t queue;
        struct i2c_adapter adap;
        int irq;
+        u32 real_clk;
 };
 struct mpc_i2c_divider {
@@ -96,20 +97,23 @@ static irqreturn_t mpc_i2c_isr(int irq, void *dev_id)
 /* Sometimes 9th clock pulse isn't generated, and slave doesn't release
 * the bus, because it wants to send ACK.
 * Following sequence of enabling/disabling and sending start/stop generates
- * the pulse, so it's all OK.
+ * the 9 pulses, so it's all OK.
 */
 static void mpc_i2c_fixup(struct mpc_i2c *i2c)
 {
-        writeccr(i2c, 0);
+        int k;
-        udelay(30);
+        u32 delay_val = 1000000 / i2c->real_clk + 1;
-        writeccr(i2c, CCR_MEN);
-        udelay(30);
+        if (delay_val < 2)
-        writeccr(i2c, CCR_MSTA | CCR_MTX);
+                delay_val = 2;
-        udelay(30);
-        writeccr(i2c, CCR_MSTA | CCR_MTX | CCR_MEN);
+        for (k = 9; k; k--) {
-        udelay(30);
+                writeccr(i2c, 0);
-        writeccr(i2c, CCR_MEN);
+                writeccr(i2c, CCR_MSTA | CCR_MTX | CCR_MEN);
-        udelay(30);
+                udelay(delay_val);
+                writeccr(i2c, CCR_MEN);
+                udelay(delay_val << 1);
+        }
 }
 static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing)
@@ -190,15 +194,18 @@ static const struct mpc_i2c_divider mpc_i2c_dividers_52xx[] __devinitconst = {
 };
 static int __devinit mpc_i2c_get_fdr_52xx(struct device_node *node, u32 clock,
-                                          int prescaler)
+                                          int prescaler, u32 *real_clk)
 {
        const struct mpc_i2c_divider *div = NULL;
        unsigned int pvr = mfspr(SPRN_PVR);
        u32 divider;
        int i;
-        if (clock == MPC_I2C_CLOCK_LEGACY)
+        if (clock == MPC_I2C_CLOCK_LEGACY) {
+                /* see below - default fdr = 0x3f -> div = 2048 */
+                *real_clk = mpc5xxx_get_bus_frequency(node) / 2048;
                return -EINVAL;
+        }
        /* Determine divider value */
        divider = mpc5xxx_get_bus_frequency(node) / clock;
@@ -216,7 +223,8 @@ static int __devinit mpc_i2c_get_fdr_52xx(struct device_node *node, u32 clock,
                        break;
        }
-        return div ? (int)div->fdr : -EINVAL;
+        *real_clk = mpc5xxx_get_bus_frequency(node) / div->divider;
+        return (int)div->fdr;
 }
 static void __devinit mpc_i2c_setup_52xx(struct device_node *node,
@@ -231,13 +239,14 @@ static void __devinit mpc_i2c_setup_52xx(struct device_node *node,
                return;
        }
-        ret = mpc_i2c_get_fdr_52xx(node, clock, prescaler);
+        ret = mpc_i2c_get_fdr_52xx(node, clock, prescaler, &i2c->real_clk);
        fdr = (ret >= 0) ? ret : 0x3f; /* backward compatibility */
        writeb(fdr & 0xff, i2c->base + MPC_I2C_FDR);
        if (ret >= 0)
-                dev_info(i2c->dev, "clock %d Hz (fdr=%d)\n", clock, fdr);
+                dev_info(i2c->dev, "clock %u Hz (fdr=%d)\n", i2c->real_clk,
+                         fdr);
 }
 #else /* !(CONFIG_PPC_MPC52xx || CONFIG_PPC_MPC512x) */
 static void __devinit mpc_i2c_setup_52xx(struct device_node *node,
@@ -334,14 +343,17 @@ static u32 __devinit mpc_i2c_get_sec_cfg_8xxx(void)
 }
 static int __devinit mpc_i2c_get_fdr_8xxx(struct device_node *node, u32 clock,
-                                          u32 prescaler)
+                                          u32 prescaler, u32 *real_clk)
 {
        const struct mpc_i2c_divider *div = NULL;
        u32 divider;
        int i;
-        if (clock == MPC_I2C_CLOCK_LEGACY)
+        if (clock == MPC_I2C_CLOCK_LEGACY) {
+                /* see below - default fdr = 0x1031 -> div = 16 * 3072 */
+                *real_clk = fsl_get_sys_freq() / prescaler / (16 * 3072);
                return -EINVAL;
+        }
        /* Determine proper divider value */
        if (of_device_is_compatible(node, "fsl,mpc8544-i2c"))
@@ -364,6 +376,7 @@ static int __devinit mpc_i2c_get_fdr_8xxx(struct device_node *node, u32 clock,
                        break;
        }
+        *real_clk = fsl_get_sys_freq() / prescaler / div->divider;
        return div ? (int)div->fdr : -EINVAL;
 }
@@ -380,7 +393,7 @@ static void __devinit mpc_i2c_setup_8xxx(struct device_node *node,
                return;
        }
-        ret = mpc_i2c_get_fdr_8xxx(node, clock, prescaler);
+        ret = mpc_i2c_get_fdr_8xxx(node, clock, prescaler, &i2c->real_clk);
        fdr = (ret >= 0) ? ret : 0x1031; /* backward compatibility */
        writeb(fdr & 0xff, i2c->base + MPC_I2C_FDR);
@@ -388,7 +401,7 @@ static void __devinit mpc_i2c_setup_8xxx(struct device_node *node,
        if (ret >= 0)
                dev_info(i2c->dev, "clock %d Hz (dfsrr=%d fdr=%d)\n",
-                         clock, fdr >> 8, fdr & 0xff);
+                         i2c->real_clk, fdr >> 8, fdr & 0xff);
 }
 #else /* !CONFIG_FSL_SOC */
@@ -500,10 +513,14 @@ static int mpc_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
                        return -EINTR;
                }
                if (time_after(jiffies, orig_jiffies + HZ)) {
+                        u8 status = readb(i2c->base + MPC_I2C_SR);
                        dev_dbg(i2c->dev, "timeout\n");
-                        if (readb(i2c->base + MPC_I2C_SR) ==
+                        if ((status & (CSR_MCF | CSR_MBB | CSR_RXAK)) != 0) {
-                            (CSR_MCF | CSR_MBB | CSR_RXAK))
+                                writeb(status & ~CSR_MAL,
+                                       i2c->base + MPC_I2C_SR);
                                mpc_i2c_fixup(i2c);
+                        }
                        return -EIO;
                }
                schedule();
@@ -595,18 +612,26 @@ static int __devinit fsl_i2c_probe(struct of_device *op,
                        mpc_i2c_setup_8xxx(op->dev.of_node, i2c, clock, 0);
        }
+        prop = of_get_property(op->dev.of_node, "fsl,timeout", &plen);
+        if (prop && plen == sizeof(u32)) {
+                mpc_ops.timeout = *prop * HZ / 1000000;
+                if (mpc_ops.timeout < 5)
+                        mpc_ops.timeout = 5;
+        }
+        dev_info(i2c->dev, "timeout %u us\n", mpc_ops.timeout * 1000000 / HZ);
        dev_set_drvdata(&op->dev, i2c);
        i2c->adap = mpc_ops;
        i2c_set_adapdata(&i2c->adap, i2c);
        i2c->adap.dev.parent = &op->dev;
+        i2c->adap.dev.of_node = of_node_get(op->dev.of_node);
        result = i2c_add_adapter(&i2c->adap);
        if (result < 0) {
                dev_err(i2c->dev, "failed to add adapter\n");
                goto fail_add;
        }
-        of_register_i2c_devices(&i2c->adap, op->dev.of_node);
        return result;
diff --git a/drivers/i2c/busses/i2c-sibyte.c b/drivers/i2c/busses/i2c-sibyte.c
index 3d76a188e42f..0fe505d7abe9 100644
--- a/drivers/i2c/busses/i2c-sibyte.c
+++ b/drivers/i2c/busses/i2c-sibyte.c
@@ -94,7 +94,7 @@ static int smbus_xfer(struct i2c_adapter *i2c_adap, u16 addr,
                }
                break;
        default:
-                return -1;      /* XXXKW better error code? */
+                return -EOPNOTSUPP;
        }
        while (csr_in32(SMB_CSR(adap, R_SMB_STATUS)) & M_SMB_BUSY)
@@ -104,7 +104,7 @@ static int smbus_xfer(struct i2c_adapter *i2c_adap, u16 addr,
        if (error & M_SMB_ERROR) {
                /* Clear error bit by writing a 1 */
                csr_out32(M_SMB_ERROR, SMB_CSR(adap, R_SMB_STATUS));
-                return -1;      /* XXXKW better error code? */
+                return (error & M_SMB_ERROR_TYPE) ? -EIO : -ENXIO;
        }
        if (data_bytes == 1)
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 1cca2631e5b3..df937df845eb 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -30,6 +30,8 @@
 #include <linux/init.h>
 #include <linux/idr.h>
 #include <linux/mutex.h>
+#include <linux/of_i2c.h>
+#include <linux/of_device.h>
 #include <linux/completion.h>
 #include <linux/hardirq.h>
 #include <linux/irqflags.h>
@@ -70,6 +72,10 @@ static int i2c_device_match(struct device *dev, struct device_driver *drv)
        if (!client)
                return 0;
+        /* Attempt an OF style match */
+        if (of_driver_match_device(dev, drv))
+                return 1;
        driver = to_i2c_driver(drv);
        /* match on an id table if there is one */
        if (driver->id_table)
@@ -790,6 +796,9 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
        if (adap->nr < __i2c_first_dynamic_bus_num)
                i2c_scan_static_board_info(adap);
+        /* Register devices from the device tree */
+        of_i2c_register_devices(adap);
        /* Notify drivers */
        mutex_lock(&core_lock);
        dummy = bus_for_each_drv(&i2c_bus_type, NULL, adap,
@@ -1428,13 +1437,12 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver)
        if (!(adapter->class & driver->class))
                goto exit_free;
-        /* Stop here if we can't use SMBUS_QUICK */
+        /* Stop here if the bus doesn't support probing */
-        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_QUICK)) {
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_READ_BYTE)) {
                if (address_list[0] == I2C_CLIENT_END)
                        goto exit_free;
-                dev_warn(&adapter->dev, "SMBus Quick command not supported, "
+                dev_warn(&adapter->dev, "Probing not supported\n");
-                         "can't probe for chips\n");
                err = -EOPNOTSUPP;
                goto exit_free;
        }
diff --git a/drivers/ide/ide-gd.c b/drivers/ide/ide-gd.c
index c102d23d9b38..79399534782c 100644
--- a/drivers/ide/ide-gd.c
+++ b/drivers/ide/ide-gd.c
@@ -92,7 +92,7 @@ static void ide_disk_release(struct device *dev)
 /*
 * On HPA drives the capacity needs to be
- * reinitilized on resume otherwise the disk
+ * reinitialized on resume otherwise the disk
 * can not be used and a hard reset is required
 */
 static void ide_gd_resume(ide_drive_t *drive)
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 54f0fb4cd5d2..03d202b1ff27 100755
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -231,7 +231,7 @@ static int intel_idle(struct cpuidle_device *dev, struct cpuidle_state *state)
        stop_critical_timings();
 #ifndef MODULE
-        trace_power_start(POWER_CSTATE, (eax >> 4) + 1);
+        trace_power_start(POWER_CSTATE, (eax >> 4) + 1, cpu);
 #endif
        if (!need_resched()) {
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index 0b926e45afe2..a5ea1bce9689 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -215,7 +215,7 @@ static int addr4_resolve(struct sockaddr_in *src_in,
        neigh = neigh_lookup(&arp_tbl, &rt->rt_gateway, rt->idev->dev);
        if (!neigh || !(neigh->nud_state & NUD_VALID)) {
-                neigh_event_send(rt->u.dst.neighbour, NULL);
+                neigh_event_send(rt->dst.neighbour, NULL);
                ret = -ENODATA;
                if (neigh)
                        goto release;
diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c
index ebfb117ba68b..abd683ea326d 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c
@@ -1364,7 +1364,7 @@ static int pass_accept_req(struct t3cdev *tdev, struct sk_buff *skb, void *ctx)
                       __func__);
                goto reject;
        }
-        dst = &rt->u.dst;
+        dst = &rt->dst;
        l2t = t3_l2t_get(tdev, dst->neighbour, dst->neighbour->dev);
        if (!l2t) {
                printk(KERN_ERR MOD "%s - failed to allocate l2t entry!\n",
@@ -1932,7 +1932,7 @@ int iwch_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
                err = -EHOSTUNREACH;
                goto fail3;
        }
-        ep->dst = &rt->u.dst;
+        ep->dst = &rt->dst;
        /* get a l2t entry */
        ep->l2t = t3_l2t_get(ep->com.tdev, ep->dst->neighbour,
diff --git a/drivers/infiniband/hw/cxgb3/iwch_qp.c b/drivers/infiniband/hw/cxgb3/iwch_qp.c
index ae47bfd22bd5..9bbb65bba67e 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_qp.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_qp.c
@@ -816,7 +816,7 @@ static void __flush_qp(struct iwch_qp *qhp, unsigned long *flag)
        atomic_inc(&qhp->refcnt);
        spin_unlock_irqrestore(&qhp->lock, *flag);
-        /* locking heirarchy: cq lock first, then qp lock. */
+        /* locking hierarchy: cq lock first, then qp lock. */
        spin_lock_irqsave(&rchp->lock, *flag);
        spin_lock(&qhp->lock);
        cxio_flush_hw_cq(&rchp->cq);
@@ -827,7 +827,7 @@ static void __flush_qp(struct iwch_qp *qhp, unsigned long *flag)
        if (flushed)
                (*rchp->ibcq.comp_handler)(&rchp->ibcq, rchp->ibcq.cq_context);
-        /* locking heirarchy: cq lock first, then qp lock. */
+        /* locking hierarchy: cq lock first, then qp lock. */
        spin_lock_irqsave(&schp->lock, *flag);
        spin_lock(&qhp->lock);
        cxio_flush_hw_cq(&schp->cq);
diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
index 30ce0a8eca09..8c9b483a0d93 100644
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@ -969,7 +969,8 @@ static void process_mpa_reply(struct c4iw_ep *ep, struct sk_buff *skb)
                goto err;
        goto out;
 err:
-        abort_connection(ep, skb, GFP_KERNEL);
+        state_set(&ep->com, ABORTING);
+        send_abort(ep, skb, GFP_KERNEL);
 out:
        connect_reply_upcall(ep, err);
        return;
@@ -1364,7 +1365,7 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb)
                       __func__);
                goto reject;
        }
-        dst = &rt->u.dst;
+        dst = &rt->dst;
        if (dst->neighbour->dev->flags & IFF_LOOPBACK) {
                pdev = ip_dev_find(&init_net, peer_ip);
                BUG_ON(!pdev);
@@ -1372,7 +1373,7 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb)
                                    pdev, 0);
                mtu = pdev->mtu;
                tx_chan = cxgb4_port_chan(pdev);
-                smac_idx = tx_chan << 1;
+                smac_idx = (cxgb4_port_viid(pdev) & 0x7F) << 1;
                step = dev->rdev.lldi.ntxq / dev->rdev.lldi.nchan;
                txq_idx = cxgb4_port_idx(pdev) * step;
                step = dev->rdev.lldi.nrxq / dev->rdev.lldi.nchan;
@@ -1383,7 +1384,7 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb)
                                        dst->neighbour->dev, 0);
                mtu = dst_mtu(dst);
                tx_chan = cxgb4_port_chan(dst->neighbour->dev);
-                smac_idx = tx_chan << 1;
+                smac_idx = (cxgb4_port_viid(dst->neighbour->dev) & 0x7F) << 1;
                step = dev->rdev.lldi.ntxq / dev->rdev.lldi.nchan;
                txq_idx = cxgb4_port_idx(dst->neighbour->dev) * step;
                step = dev->rdev.lldi.nrxq / dev->rdev.lldi.nchan;
@@ -1938,7 +1939,7 @@ int c4iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
                err = -EHOSTUNREACH;
                goto fail3;
        }
-        ep->dst = &rt->u.dst;
+        ep->dst = &rt->dst;
        /* get a l2t entry */
        if (ep->dst->neighbour->dev->flags & IFF_LOOPBACK) {
@@ -1950,7 +1951,7 @@ int c4iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
                                        pdev, 0);
                ep->mtu = pdev->mtu;
                ep->tx_chan = cxgb4_port_chan(pdev);
-                ep->smac_idx = ep->tx_chan << 1;
+                ep->smac_idx = (cxgb4_port_viid(pdev) & 0x7F) << 1;
                step = ep->com.dev->rdev.lldi.ntxq /
                       ep->com.dev->rdev.lldi.nchan;
                ep->txq_idx = cxgb4_port_idx(pdev) * step;
@@ -1965,7 +1966,8 @@ int c4iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
                                        ep->dst->neighbour->dev, 0);
                ep->mtu = dst_mtu(ep->dst);
                ep->tx_chan = cxgb4_port_chan(ep->dst->neighbour->dev);
-                ep->smac_idx = ep->tx_chan << 1;
+                ep->smac_idx = (cxgb4_port_viid(ep->dst->neighbour->dev) &
+                                0x7F) << 1;
                step = ep->com.dev->rdev.lldi.ntxq /
                       ep->com.dev->rdev.lldi.nchan;
                ep->txq_idx = cxgb4_port_idx(ep->dst->neighbour->dev) * step;
diff --git a/drivers/infiniband/hw/cxgb4/cq.c b/drivers/infiniband/hw/cxgb4/cq.c
index 2447f5295482..fac5c6e68011 100644
--- a/drivers/infiniband/hw/cxgb4/cq.c
+++ b/drivers/infiniband/hw/cxgb4/cq.c
@@ -77,7 +77,7 @@ static int destroy_cq(struct c4iw_rdev *rdev, struct t4_cq *cq,
        kfree(cq->sw_queue);
        dma_free_coherent(&(rdev->lldi.pdev->dev),
                          cq->memsize, cq->queue,
-                          pci_unmap_addr(cq, mapping));
+                          dma_unmap_addr(cq, mapping));
        c4iw_put_cqid(rdev, cq->cqid, uctx);
        return ret;
 }
@@ -112,7 +112,7 @@ static int create_cq(struct c4iw_rdev *rdev, struct t4_cq *cq,
                ret = -ENOMEM;
                goto err3;
        }
-        pci_unmap_addr_set(cq, mapping, cq->dma_addr);
+        dma_unmap_addr_set(cq, mapping, cq->dma_addr);
        memset(cq->queue, 0, cq->memsize);
        /* build fw_ri_res_wr */
@@ -179,7 +179,7 @@ static int create_cq(struct c4iw_rdev *rdev, struct t4_cq *cq,
        return 0;
 err4:
        dma_free_coherent(&rdev->lldi.pdev->dev, cq->memsize, cq->queue,
-                          pci_unmap_addr(cq, mapping));
+                          dma_unmap_addr(cq, mapping));
 err3:
        kfree(cq->sw_queue);
 err2:
@@ -764,7 +764,7 @@ struct ib_cq *c4iw_create_cq(struct ib_device *ibdev, int entries,
        struct c4iw_create_cq_resp uresp;
        struct c4iw_ucontext *ucontext = NULL;
        int ret;
-        size_t memsize;
+        size_t memsize, hwentries;
        struct c4iw_mm_entry *mm, *mm2;
        PDBG("%s ib_dev %p entries %d\n", __func__, ibdev, entries);
@@ -788,14 +788,29 @@ struct ib_cq *c4iw_create_cq(struct ib_device *ibdev, int entries,
         * entries must be multiple of 16 for HW.
         */
        entries = roundup(entries, 16);
-        memsize = entries * sizeof *chp->cq.queue;
+        /*
+         * Make actual HW queue 2x to avoid cdix_inc overflows.
+         */
+        hwentries = entries * 2;
+        /*
+         * Make HW queue at least 64 entries so GTS updates aren't too
+         * frequent.
+         */
+        if (hwentries < 64)
+                hwentries = 64;
+        memsize = hwentries * sizeof *chp->cq.queue;
        /*
         * memsize must be a multiple of the page size if its a user cq.
         */
-        if (ucontext)
+        if (ucontext) {
                memsize = roundup(memsize, PAGE_SIZE);
-        chp->cq.size = entries;
+                hwentries = memsize / sizeof *chp->cq.queue;
+        }
+        chp->cq.size = hwentries;
        chp->cq.memsize = memsize;
        ret = create_cq(&rhp->rdev, &chp->cq,
@@ -805,7 +820,7 @@ struct ib_cq *c4iw_create_cq(struct ib_device *ibdev, int entries,
        chp->rhp = rhp;
        chp->cq.size--;                         /* status page */
-        chp->ibcq.cqe = chp->cq.size - 1;
+        chp->ibcq.cqe = entries - 2;
        spin_lock_init(&chp->lock);
        atomic_set(&chp->refcnt, 1);
        init_waitqueue_head(&chp->wait);
diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
index 277ab589b44d..d33e1a668811 100644
--- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
+++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
@@ -261,7 +261,7 @@ static inline struct c4iw_mw *to_c4iw_mw(struct ib_mw *ibmw)
 struct c4iw_fr_page_list {
        struct ib_fast_reg_page_list ibpl;
-        DECLARE_PCI_UNMAP_ADDR(mapping);
+        DEFINE_DMA_UNMAP_ADDR(mapping);
        dma_addr_t dma_addr;
        struct c4iw_dev *dev;
        int size;
diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
index 7f94da1a2437..82b5703b8947 100644
--- a/drivers/infiniband/hw/cxgb4/mem.c
+++ b/drivers/infiniband/hw/cxgb4/mem.c
@@ -764,7 +764,7 @@ struct ib_fast_reg_page_list *c4iw_alloc_fastreg_pbl(struct ib_device *device,
        if (!c4pl)
                return ERR_PTR(-ENOMEM);
-        pci_unmap_addr_set(c4pl, mapping, dma_addr);
+        dma_unmap_addr_set(c4pl, mapping, dma_addr);
        c4pl->dma_addr = dma_addr;
        c4pl->dev = dev;
        c4pl->size = size;
@@ -779,7 +779,7 @@ void c4iw_free_fastreg_pbl(struct ib_fast_reg_page_list *ibpl)
        struct c4iw_fr_page_list *c4pl = to_c4iw_fr_page_list(ibpl);
        dma_free_coherent(&c4pl->dev->rdev.lldi.pdev->dev, c4pl->size,
-                          c4pl, pci_unmap_addr(c4pl, mapping));
+                          c4pl, dma_unmap_addr(c4pl, mapping));
 }
 int c4iw_dereg_mr(struct ib_mr *ib_mr)
diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
index 0c28ed1eafa6..86b93f2ecca3 100644
--- a/drivers/infiniband/hw/cxgb4/qp.c
+++ b/drivers/infiniband/hw/cxgb4/qp.c
@@ -40,10 +40,10 @@ static int destroy_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
         */
        dma_free_coherent(&(rdev->lldi.pdev->dev),
                          wq->rq.memsize, wq->rq.queue,
-                          pci_unmap_addr(&wq->rq, mapping));
+                          dma_unmap_addr(&wq->rq, mapping));
        dma_free_coherent(&(rdev->lldi.pdev->dev),
                          wq->sq.memsize, wq->sq.queue,
-                          pci_unmap_addr(&wq->sq, mapping));
+                          dma_unmap_addr(&wq->sq, mapping));
        c4iw_rqtpool_free(rdev, wq->rq.rqt_hwaddr, wq->rq.rqt_size);
        kfree(wq->rq.sw_rq);
        kfree(wq->sq.sw_sq);
@@ -99,7 +99,7 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
        if (!wq->sq.queue)
                goto err5;
        memset(wq->sq.queue, 0, wq->sq.memsize);
-        pci_unmap_addr_set(&wq->sq, mapping, wq->sq.dma_addr);
+        dma_unmap_addr_set(&wq->sq, mapping, wq->sq.dma_addr);
        wq->rq.queue = dma_alloc_coherent(&(rdev->lldi.pdev->dev),
                                          wq->rq.memsize, &(wq->rq.dma_addr),
@@ -112,7 +112,7 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
                wq->rq.queue,
                (unsigned long long)virt_to_phys(wq->rq.queue));
        memset(wq->rq.queue, 0, wq->rq.memsize);
-        pci_unmap_addr_set(&wq->rq, mapping, wq->rq.dma_addr);
+        dma_unmap_addr_set(&wq->rq, mapping, wq->rq.dma_addr);
        wq->db = rdev->lldi.db_reg;
        wq->gts = rdev->lldi.gts_reg;
@@ -217,11 +217,11 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
 err7:
        dma_free_coherent(&(rdev->lldi.pdev->dev),
                          wq->rq.memsize, wq->rq.queue,
-                          pci_unmap_addr(&wq->rq, mapping));
+                          dma_unmap_addr(&wq->rq, mapping));
 err6:
        dma_free_coherent(&(rdev->lldi.pdev->dev),
                          wq->sq.memsize, wq->sq.queue,
-                          pci_unmap_addr(&wq->sq, mapping));
+                          dma_unmap_addr(&wq->sq, mapping));
 err5:
        c4iw_rqtpool_free(rdev, wq->rq.rqt_hwaddr, wq->rq.rqt_size);
 err4:
@@ -905,7 +905,7 @@ static void __flush_qp(struct c4iw_qp *qhp, struct c4iw_cq *rchp,
        atomic_inc(&qhp->refcnt);
        spin_unlock_irqrestore(&qhp->lock, *flag);
-        /* locking heirarchy: cq lock first, then qp lock. */
+        /* locking hierarchy: cq lock first, then qp lock. */
        spin_lock_irqsave(&rchp->lock, *flag);
        spin_lock(&qhp->lock);
        c4iw_flush_hw_cq(&rchp->cq);
@@ -916,7 +916,7 @@ static void __flush_qp(struct c4iw_qp *qhp, struct c4iw_cq *rchp,
        if (flushed)
                (*rchp->ibcq.comp_handler)(&rchp->ibcq, rchp->ibcq.cq_context);
-        /* locking heirarchy: cq lock first, then qp lock. */
+        /* locking hierarchy: cq lock first, then qp lock. */
        spin_lock_irqsave(&schp->lock, *flag);
        spin_lock(&qhp->lock);
        c4iw_flush_hw_cq(&schp->cq);
diff --git a/drivers/infiniband/hw/cxgb4/t4.h b/drivers/infiniband/hw/cxgb4/t4.h
index 1057cb96302e..9cf8d85bfcff 100644
--- a/drivers/infiniband/hw/cxgb4/t4.h
+++ b/drivers/infiniband/hw/cxgb4/t4.h
@@ -279,7 +279,7 @@ struct t4_swsqe {
 struct t4_sq {
        union t4_wr *queue;
        dma_addr_t dma_addr;
-        DECLARE_PCI_UNMAP_ADDR(mapping);
+        DEFINE_DMA_UNMAP_ADDR(mapping);
        struct t4_swsqe *sw_sq;
        struct t4_swsqe *oldest_read;
        u64 udb;
@@ -298,7 +298,7 @@ struct t4_swrqe {
 struct t4_rq {
        union  t4_recv_wr *queue;
        dma_addr_t dma_addr;
-        DECLARE_PCI_UNMAP_ADDR(mapping);
+        DEFINE_DMA_UNMAP_ADDR(mapping);
        struct t4_swrqe *sw_rq;
        u64 udb;
        size_t memsize;
@@ -429,7 +429,7 @@ static inline int t4_wq_db_enabled(struct t4_wq *wq)
 struct t4_cq {
        struct t4_cqe *queue;
        dma_addr_t dma_addr;
-        DECLARE_PCI_UNMAP_ADDR(mapping);
+        DEFINE_DMA_UNMAP_ADDR(mapping);
        struct t4_cqe *sw_queue;
        void __iomem *gts;
        struct c4iw_rdev *rdev;
diff --git a/drivers/infiniband/hw/ehca/hcp_if.h b/drivers/infiniband/hw/ehca/hcp_if.h
index 39c1c3618ec7..a46e514c367b 100644
--- a/drivers/infiniband/hw/ehca/hcp_if.h
+++ b/drivers/infiniband/hw/ehca/hcp_if.h
@@ -49,7 +49,7 @@
 #include "hipz_hw.h"
 /*
- * hipz_h_alloc_resource_eq allocates EQ resources in HW and FW, initalize
+ * hipz_h_alloc_resource_eq allocates EQ resources in HW and FW, initialize
 * resources, create the empty EQPT (ring).
 */
 u64 hipz_h_alloc_resource_eq(const struct ipz_adapter_handle adapter_handle,
diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/infiniband/hw/ipath/ipath_file_ops.c
index 9c5c66d16a23..65eb8929db22 100644
--- a/drivers/infiniband/hw/ipath/ipath_file_ops.c
+++ b/drivers/infiniband/hw/ipath/ipath_file_ops.c
@@ -2055,7 +2055,7 @@ static int ipath_close(struct inode *in, struct file *fp)
        mutex_lock(&ipath_mutex);
-        fd = (struct ipath_filedata *) fp->private_data;
+        fd = fp->private_data;
        fp->private_data = NULL;
        pd = fd->pd;
        if (!pd) {
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index 986d6f32dded..d876d0435cd4 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -1146,7 +1146,7 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi
        }
        if ((neigh == NULL) || (!(neigh->nud_state & NUD_VALID)))
-                neigh_event_send(rt->u.dst.neighbour, NULL);
+                neigh_event_send(rt->dst.neighbour, NULL);
        ip_rt_put(rt);
        return rc;
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index 5cc0a9ae5bb1..42e7aad1ec23 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -1567,6 +1567,12 @@ static int nes_netdev_set_settings(struct net_device *netdev, struct ethtool_cmd
 }
+static int nes_netdev_set_flags(struct net_device *netdev, u32 flags)
+{
+        return ethtool_op_set_flags(netdev, flags, ETH_FLAG_LRO);
+}
 static const struct ethtool_ops nes_ethtool_ops = {
        .get_link = ethtool_op_get_link,
        .get_settings = nes_netdev_get_settings,
@@ -1588,7 +1594,7 @@ static const struct ethtool_ops nes_ethtool_ops = {
        .get_tso = ethtool_op_get_tso,
        .set_tso = ethtool_op_set_tso,
        .get_flags = ethtool_op_get_flags,
-        .set_flags = ethtool_op_set_flags,
+        .set_flags = nes_netdev_set_flags,
 };
diff --git a/drivers/infiniband/hw/qib/Makefile b/drivers/infiniband/hw/qib/Makefile
index c6515a1b9a6a..f12d7bb8b39f 100644
--- a/drivers/infiniband/hw/qib/Makefile
+++ b/drivers/infiniband/hw/qib/Makefile
@@ -6,7 +6,7 @@ ib_qib-y := qib_cq.o qib_diag.o qib_dma.o qib_driver.o qib_eeprom.o \
        qib_qp.o qib_qsfp.o qib_rc.o qib_ruc.o qib_sdma.o qib_srq.o \
        qib_sysfs.o qib_twsi.o qib_tx.o qib_uc.o qib_ud.o \
        qib_user_pages.o qib_user_sdma.o qib_verbs_mcast.o qib_iba7220.o \
-        qib_sd7220.o qib_sd7220_img.o qib_iba7322.o qib_verbs.o
+        qib_sd7220.o qib_iba7322.o qib_verbs.o
 # 6120 has no fallback if no MSI interrupts, others can do INTx
 ib_qib-$(CONFIG_PCI_MSI) += qib_iba6120.o
diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
index 32d9208efcff..3593983df7ba 100644
--- a/drivers/infiniband/hw/qib/qib.h
+++ b/drivers/infiniband/hw/qib/qib.h
@@ -686,6 +686,7 @@ struct qib_devdata {
        void __iomem *piobase;
        /* mem-mapped pointer to base of user chip regs (if using WC PAT) */
        u64 __iomem *userbase;
+        void __iomem *piovl15base; /* base of VL15 buffers, if not WC */
        /*
         * points to area where PIOavail registers will be DMA'ed.
         * Has to be on a page of it's own, because the page will be
diff --git a/drivers/infiniband/hw/qib/qib_7220.h b/drivers/infiniband/hw/qib/qib_7220.h
index ea0bfd896f92..21f374aa0631 100644
--- a/drivers/infiniband/hw/qib/qib_7220.h
+++ b/drivers/infiniband/hw/qib/qib_7220.h
@@ -109,10 +109,6 @@ struct qib_chippport_specific {
 */
 int qib_sd7220_presets(struct qib_devdata *dd);
 int qib_sd7220_init(struct qib_devdata *dd);
-int qib_sd7220_prog_ld(struct qib_devdata *dd, int sdnum, u8 *img,
-                       int len, int offset);
-int qib_sd7220_prog_vfy(struct qib_devdata *dd, int sdnum, const u8 *img,
-                        int len, int offset);
 void qib_sd7220_clr_ibpar(struct qib_devdata *);
 /*
 * Below used for sdnum parameter, selecting one of the two sections
@@ -121,9 +117,6 @@ void qib_sd7220_clr_ibpar(struct qib_devdata *);
 */
 #define IB_7220_SERDES 2
-int qib_sd7220_ib_load(struct qib_devdata *dd);
-int qib_sd7220_ib_vfy(struct qib_devdata *dd);
 static inline u32 qib_read_kreg32(const struct qib_devdata *dd,
                                  const u16 regno)
 {
diff --git a/drivers/infiniband/hw/qib/qib_7322_regs.h b/drivers/infiniband/hw/qib/qib_7322_regs.h
index a97440ba924c..32dc81ff8d4a 100644
--- a/drivers/infiniband/hw/qib/qib_7322_regs.h
+++ b/drivers/infiniband/hw/qib/qib_7322_regs.h
@@ -742,15 +742,15 @@
 #define QIB_7322_HwErrMask_IBCBusFromSPCParityErrMask_1_LSB 0xF
 #define QIB_7322_HwErrMask_IBCBusFromSPCParityErrMask_1_MSB 0xF
 #define QIB_7322_HwErrMask_IBCBusFromSPCParityErrMask_1_RMASK 0x1
-#define QIB_7322_HwErrMask_statusValidNoEopMask_1_LSB 0xE
+#define QIB_7322_HwErrMask_IBCBusToSPCParityErrMask_1_LSB 0xE
-#define QIB_7322_HwErrMask_statusValidNoEopMask_1_MSB 0xE
+#define QIB_7322_HwErrMask_IBCBusToSPCParityErrMask_1_MSB 0xE
-#define QIB_7322_HwErrMask_statusValidNoEopMask_1_RMASK 0x1
+#define QIB_7322_HwErrMask_IBCBusToSPCParityErrMask_1_RMASK 0x1
 #define QIB_7322_HwErrMask_IBCBusFromSPCParityErrMask_0_LSB 0xD
 #define QIB_7322_HwErrMask_IBCBusFromSPCParityErrMask_0_MSB 0xD
 #define QIB_7322_HwErrMask_IBCBusFromSPCParityErrMask_0_RMASK 0x1
-#define QIB_7322_HwErrMask_statusValidNoEopMask_0_LSB 0xC
+#define QIB_7322_HwErrMask_statusValidNoEopMask_LSB 0xC
-#define QIB_7322_HwErrMask_statusValidNoEopMask_0_MSB 0xC
+#define QIB_7322_HwErrMask_statusValidNoEopMask_MSB 0xC
-#define QIB_7322_HwErrMask_statusValidNoEopMask_0_RMASK 0x1
+#define QIB_7322_HwErrMask_statusValidNoEopMask_RMASK 0x1
 #define QIB_7322_HwErrMask_LATriggeredMask_LSB 0xB
 #define QIB_7322_HwErrMask_LATriggeredMask_MSB 0xB
 #define QIB_7322_HwErrMask_LATriggeredMask_RMASK 0x1
@@ -796,15 +796,15 @@
 #define QIB_7322_HwErrStatus_IBCBusFromSPCParityErr_1_LSB 0xF
 #define QIB_7322_HwErrStatus_IBCBusFromSPCParityErr_1_MSB 0xF
 #define QIB_7322_HwErrStatus_IBCBusFromSPCParityErr_1_RMASK 0x1
-#define QIB_7322_HwErrStatus_statusValidNoEop_1_LSB 0xE
+#define QIB_7322_HwErrStatus_IBCBusToSPCParityErr_1_LSB 0xE
-#define QIB_7322_HwErrStatus_statusValidNoEop_1_MSB 0xE
+#define QIB_7322_HwErrStatus_IBCBusToSPCParityErr_1_MSB 0xE
-#define QIB_7322_HwErrStatus_statusValidNoEop_1_RMASK 0x1
+#define QIB_7322_HwErrStatus_IBCBusToSPCParityErr_1_RMASK 0x1
 #define QIB_7322_HwErrStatus_IBCBusFromSPCParityErr_0_LSB 0xD
 #define QIB_7322_HwErrStatus_IBCBusFromSPCParityErr_0_MSB 0xD
 #define QIB_7322_HwErrStatus_IBCBusFromSPCParityErr_0_RMASK 0x1
-#define QIB_7322_HwErrStatus_statusValidNoEop_0_LSB 0xC
+#define QIB_7322_HwErrStatus_statusValidNoEop_LSB 0xC
-#define QIB_7322_HwErrStatus_statusValidNoEop_0_MSB 0xC
+#define QIB_7322_HwErrStatus_statusValidNoEop_MSB 0xC
-#define QIB_7322_HwErrStatus_statusValidNoEop_0_RMASK 0x1
+#define QIB_7322_HwErrStatus_statusValidNoEop_RMASK 0x1
 #define QIB_7322_HwErrStatus_LATriggered_LSB 0xB
 #define QIB_7322_HwErrStatus_LATriggered_MSB 0xB
 #define QIB_7322_HwErrStatus_LATriggered_RMASK 0x1
@@ -850,15 +850,15 @@
 #define QIB_7322_HwErrClear_IBCBusFromSPCParityErrClear_1_LSB 0xF
 #define QIB_7322_HwErrClear_IBCBusFromSPCParityErrClear_1_MSB 0xF
 #define QIB_7322_HwErrClear_IBCBusFromSPCParityErrClear_1_RMASK 0x1
-#define QIB_7322_HwErrClear_IBCBusToSPCparityErrClear_1_LSB 0xE
+#define QIB_7322_HwErrClear_IBCBusToSPCParityErrClear_1_LSB 0xE
-#define QIB_7322_HwErrClear_IBCBusToSPCparityErrClear_1_MSB 0xE
+#define QIB_7322_HwErrClear_IBCBusToSPCParityErrClear_1_MSB 0xE
-#define QIB_7322_HwErrClear_IBCBusToSPCparityErrClear_1_RMASK 0x1
+#define QIB_7322_HwErrClear_IBCBusToSPCParityErrClear_1_RMASK 0x1
 #define QIB_7322_HwErrClear_IBCBusFromSPCParityErrClear_0_LSB 0xD
 #define QIB_7322_HwErrClear_IBCBusFromSPCParityErrClear_0_MSB 0xD
 #define QIB_7322_HwErrClear_IBCBusFromSPCParityErrClear_0_RMASK 0x1
-#define QIB_7322_HwErrClear_IBCBusToSPCparityErrClear_0_LSB 0xC
+#define QIB_7322_HwErrClear_statusValidNoEopClear_LSB 0xC
-#define QIB_7322_HwErrClear_IBCBusToSPCparityErrClear_0_MSB 0xC
+#define QIB_7322_HwErrClear_statusValidNoEopClear_MSB 0xC
-#define QIB_7322_HwErrClear_IBCBusToSPCparityErrClear_0_RMASK 0x1
+#define QIB_7322_HwErrClear_statusValidNoEopClear_RMASK 0x1
 #define QIB_7322_HwErrClear_LATriggeredClear_LSB 0xB
 #define QIB_7322_HwErrClear_LATriggeredClear_MSB 0xB
 #define QIB_7322_HwErrClear_LATriggeredClear_RMASK 0x1
@@ -880,15 +880,15 @@
 #define QIB_7322_HwDiagCtrl_ForceIBCBusFromSPCParityErr_1_LSB 0xF
 #define QIB_7322_HwDiagCtrl_ForceIBCBusFromSPCParityErr_1_MSB 0xF
 #define QIB_7322_HwDiagCtrl_ForceIBCBusFromSPCParityErr_1_RMASK 0x1
-#define QIB_7322_HwDiagCtrl_ForcestatusValidNoEop_1_LSB 0xE
+#define QIB_7322_HwDiagCtrl_ForceIBCBusToSPCParityErr_1_LSB 0xE
-#define QIB_7322_HwDiagCtrl_ForcestatusValidNoEop_1_MSB 0xE
+#define QIB_7322_HwDiagCtrl_ForceIBCBusToSPCParityErr_1_MSB 0xE
-#define QIB_7322_HwDiagCtrl_ForcestatusValidNoEop_1_RMASK 0x1
+#define QIB_7322_HwDiagCtrl_ForceIBCBusToSPCParityErr_1_RMASK 0x1
 #define QIB_7322_HwDiagCtrl_ForceIBCBusFromSPCParityErr_0_LSB 0xD
 #define QIB_7322_HwDiagCtrl_ForceIBCBusFromSPCParityErr_0_MSB 0xD
 #define QIB_7322_HwDiagCtrl_ForceIBCBusFromSPCParityErr_0_RMASK 0x1
-#define QIB_7322_HwDiagCtrl_ForcestatusValidNoEop_0_LSB 0xC
+#define QIB_7322_HwDiagCtrl_ForceIBCBusToSPCParityErr_0_LSB 0xC
-#define QIB_7322_HwDiagCtrl_ForcestatusValidNoEop_0_MSB 0xC
+#define QIB_7322_HwDiagCtrl_ForceIBCBusToSPCParityErr_0_MSB 0xC
-#define QIB_7322_HwDiagCtrl_ForcestatusValidNoEop_0_RMASK 0x1
+#define QIB_7322_HwDiagCtrl_ForceIBCBusToSPCParityErr_0_RMASK 0x1
 #define QIB_7322_EXTStatus_OFFS 0xC0
 #define QIB_7322_EXTStatus_DEF 0x000000000000X000
diff --git a/drivers/infiniband/hw/qib/qib_diag.c b/drivers/infiniband/hw/qib/qib_diag.c
index ca98dd523752..05dcf0d9a7d3 100644
--- a/drivers/infiniband/hw/qib/qib_diag.c
+++ b/drivers/infiniband/hw/qib/qib_diag.c
@@ -233,6 +233,7 @@ static u32 __iomem *qib_remap_ioaddr32(struct qib_devdata *dd, u32 offset,
        u32 __iomem *krb32 = (u32 __iomem *)dd->kregbase;
        u32 __iomem *map = NULL;
        u32 cnt = 0;
+        u32 tot4k, offs4k;
        /* First, simplest case, offset is within the first map. */
        kreglen = (dd->kregend - dd->kregbase) * sizeof(u64);
@@ -250,7 +251,8 @@ static u32 __iomem *qib_remap_ioaddr32(struct qib_devdata *dd, u32 offset,
        if (dd->userbase) {
                /* If user regs mapped, they are after send, so set limit. */
                u32 ulim = (dd->cfgctxts * dd->ureg_align) + dd->uregbase;
-                snd_lim = dd->uregbase;
+                if (!dd->piovl15base)
+                        snd_lim = dd->uregbase;
                krb32 = (u32 __iomem *)dd->userbase;
                if (offset >= dd->uregbase && offset < ulim) {
                        map = krb32 + (offset - dd->uregbase) / sizeof(u32);
@@ -277,14 +279,14 @@ static u32 __iomem *qib_remap_ioaddr32(struct qib_devdata *dd, u32 offset,
        /* If 4k buffers exist, account for them by bumping
         * appropriate limit.
         */
+        tot4k = dd->piobcnt4k * dd->align4k;
+        offs4k = dd->piobufbase >> 32;
        if (dd->piobcnt4k) {
-                u32 tot4k = dd->piobcnt4k * dd->align4k;
-                u32 offs4k = dd->piobufbase >> 32;
                if (snd_bottom > offs4k)
                        snd_bottom = offs4k;
                else {
                        /* 4k above 2k. Bump snd_lim, if needed*/
-                        if (!dd->userbase)
+                        if (!dd->userbase || dd->piovl15base)
                                snd_lim = offs4k + tot4k;
                }
        }
@@ -298,6 +300,15 @@ static u32 __iomem *qib_remap_ioaddr32(struct qib_devdata *dd, u32 offset,
                cnt = snd_lim - offset;
        }
+        if (!map && offs4k && dd->piovl15base) {
+                snd_lim = offs4k + tot4k + 2 * dd->align4k;
+                if (offset >= (offs4k + tot4k) && offset < snd_lim) {
+                        map = (u32 __iomem *)dd->piovl15base +
+                                ((offset - (offs4k + tot4k)) / sizeof(u32));
+                        cnt = snd_lim - offset;
+                }
+        }
 mapped:
        if (cntp)
                *cntp = cnt;
diff --git a/drivers/infiniband/hw/qib/qib_iba6120.c b/drivers/infiniband/hw/qib/qib_iba6120.c
index 1eadadc13da8..a5e29dbb9537 100644
--- a/drivers/infiniband/hw/qib/qib_iba6120.c
+++ b/drivers/infiniband/hw/qib/qib_iba6120.c
@@ -1355,8 +1355,7 @@ static int qib_6120_bringup_serdes(struct qib_pportdata *ppd)
        hwstat = qib_read_kreg64(dd, kr_hwerrstatus);
        if (hwstat) {
                /* should just have PLL, clear all set, in an case */
-                if (hwstat & ~QLOGIC_IB_HWE_SERDESPLLFAILED)
+                qib_write_kreg(dd, kr_hwerrclear, hwstat);
-                        qib_write_kreg(dd, kr_hwerrclear, hwstat);
                qib_write_kreg(dd, kr_errclear, ERR_MASK(HardwareErr));
        }
diff --git a/drivers/infiniband/hw/qib/qib_iba7322.c b/drivers/infiniband/hw/qib/qib_iba7322.c
index 503992d9c5ce..5eedf83e2c3b 100644
--- a/drivers/infiniband/hw/qib/qib_iba7322.c
+++ b/drivers/infiniband/hw/qib/qib_iba7322.c
@@ -543,7 +543,7 @@ struct vendor_txdds_ent {
 static void write_tx_serdes_param(struct qib_pportdata *, struct txdds_ent *);
 #define TXDDS_TABLE_SZ 16 /* number of entries per speed in onchip table */
-#define TXDDS_EXTRA_SZ 11 /* number of extra tx settings entries */
+#define TXDDS_EXTRA_SZ 13 /* number of extra tx settings entries */
 #define SERDES_CHANS 4 /* yes, it's obvious, but one less magic number */
 #define H1_FORCE_VAL 8
@@ -1100,9 +1100,9 @@ static const struct qib_hwerror_msgs qib_7322_hwerror_msgs[] = {
        HWE_AUTO_P(SDmaMemReadErr, 1),
        HWE_AUTO_P(SDmaMemReadErr, 0),
        HWE_AUTO_P(IBCBusFromSPCParityErr, 1),
+        HWE_AUTO_P(IBCBusToSPCParityErr, 1),
        HWE_AUTO_P(IBCBusFromSPCParityErr, 0),
-        HWE_AUTO_P(statusValidNoEop, 1),
+        HWE_AUTO(statusValidNoEop),
-        HWE_AUTO_P(statusValidNoEop, 0),
        HWE_AUTO(LATriggered),
        { .mask = 0 }
 };
@@ -4763,6 +4763,8 @@ static void qib_7322_mini_pcs_reset(struct qib_pportdata *ppd)
                SYM_MASK(IBPCSConfig_0, tx_rx_reset);
        val = qib_read_kreg_port(ppd, krp_ib_pcsconfig);
+        qib_write_kreg(dd, kr_hwerrmask,
+                       dd->cspec->hwerrmask & ~HWE_MASK(statusValidNoEop));
        qib_write_kreg_port(ppd, krp_ibcctrl_a,
                            ppd->cpspec->ibcctrl_a &
                            ~SYM_MASK(IBCCtrlA_0, IBLinkEn));
@@ -4772,6 +4774,9 @@ static void qib_7322_mini_pcs_reset(struct qib_pportdata *ppd)
        qib_write_kreg_port(ppd, krp_ib_pcsconfig, val & ~reset_bits);
        qib_write_kreg_port(ppd, krp_ibcctrl_a, ppd->cpspec->ibcctrl_a);
        qib_write_kreg(dd, kr_scratch, 0ULL);
+        qib_write_kreg(dd, kr_hwerrclear,
+                       SYM_MASK(HwErrClear, statusValidNoEopClear));
+        qib_write_kreg(dd, kr_hwerrmask, dd->cspec->hwerrmask);
 }
 /*
@@ -5624,6 +5629,8 @@ static void set_no_qsfp_atten(struct qib_devdata *dd, int change)
                        if (ppd->port != port || !ppd->link_speed_supported)
                                continue;
                        ppd->cpspec->no_eep = val;
+                        if (seth1)
+                                ppd->cpspec->h1_val = h1;
                        /* now change the IBC and serdes, overriding generic */
                        init_txdds_table(ppd, 1);
                        any++;
@@ -6064,9 +6071,9 @@ static int qib_init_7322_variables(struct qib_devdata *dd)
                 * the "cable info" setup here.  Can be overridden
                 * in adapter-specific routines.
                 */
-                if (!(ppd->dd->flags & QIB_HAS_QSFP)) {
+                if (!(dd->flags & QIB_HAS_QSFP)) {
-                        if (!IS_QMH(ppd->dd) && !IS_QME(ppd->dd))
+                        if (!IS_QMH(dd) && !IS_QME(dd))
-                                qib_devinfo(ppd->dd->pcidev, "IB%u:%u: "
+                                qib_devinfo(dd->pcidev, "IB%u:%u: "
                                            "Unknown mezzanine card type\n",
                                            dd->unit, ppd->port);
                        cp->h1_val = IS_QMH(dd) ? H1_FORCE_QMH : H1_FORCE_QME;
@@ -6119,9 +6126,25 @@ static int qib_init_7322_variables(struct qib_devdata *dd)
        qib_set_ctxtcnt(dd);
        if (qib_wc_pat) {
-                ret = init_chip_wc_pat(dd, NUM_VL15_BUFS * dd->align4k);
+                resource_size_t vl15off;
+                /*
+                 * We do not set WC on the VL15 buffers to avoid
+                 * a rare problem with unaligned writes from
+                 * interrupt-flushed store buffers, so we need
+                 * to map those separately here.  We can't solve
+                 * this for the rarely used mtrr case.
+                 */
+                ret = init_chip_wc_pat(dd, 0);
                if (ret)
                        goto bail;
+                /* vl15 buffers start just after the 4k buffers */
+                vl15off = dd->physaddr + (dd->piobufbase >> 32) +
+                        dd->piobcnt4k * dd->align4k;
+                dd->piovl15base = ioremap_nocache(vl15off,
+                                                  NUM_VL15_BUFS * dd->align4k);
+                if (!dd->piovl15base)
+                        goto bail;
        }
        qib_7322_set_baseaddrs(dd); /* set chip access pointers now */
@@ -6932,6 +6955,8 @@ static const struct txdds_ent txdds_extra_sdr[TXDDS_EXTRA_SZ] = {
        {  0, 0, 0, 11 },       /* QME7342 backplane settings */
        {  0, 0, 0, 11 },       /* QME7342 backplane settings */
        {  0, 0, 0, 11 },       /* QME7342 backplane settings */
+        {  0, 0, 0,  3 },       /* QMH7342 backplane settings */
+        {  0, 0, 0,  4 },       /* QMH7342 backplane settings */
 };
 static const struct txdds_ent txdds_extra_ddr[TXDDS_EXTRA_SZ] = {
@@ -6947,6 +6972,8 @@ static const struct txdds_ent txdds_extra_ddr[TXDDS_EXTRA_SZ] = {
        {  0, 0, 0, 13 },       /* QME7342 backplane settings */
        {  0, 0, 0, 13 },       /* QME7342 backplane settings */
        {  0, 0, 0, 13 },       /* QME7342 backplane settings */
+        {  0, 0, 0,  9 },       /* QMH7342 backplane settings */
+        {  0, 0, 0, 10 },       /* QMH7342 backplane settings */
 };
 static const struct txdds_ent txdds_extra_qdr[TXDDS_EXTRA_SZ] = {
@@ -6962,6 +6989,8 @@ static const struct txdds_ent txdds_extra_qdr[TXDDS_EXTRA_SZ] = {
        {  0, 1, 12,  6 },      /* QME7342 backplane setting */
        {  0, 1, 12,  7 },      /* QME7342 backplane setting */
        {  0, 1, 12,  8 },      /* QME7342 backplane setting */
+        {  0, 1,  0, 10 },      /* QMH7342 backplane settings */
+        {  0, 1,  0, 12 },      /* QMH7342 backplane settings */
 };
 static const struct txdds_ent *get_atten_table(const struct txdds_ent *txdds,
diff --git a/drivers/infiniband/hw/qib/qib_init.c b/drivers/infiniband/hw/qib/qib_init.c
index 9b40f345ac3f..a873dd596e81 100644
--- a/drivers/infiniband/hw/qib/qib_init.c
+++ b/drivers/infiniband/hw/qib/qib_init.c
@@ -1059,7 +1059,7 @@ static int __init qlogic_ib_init(void)
                goto bail_dev;
        }
-        qib_cq_wq = create_workqueue("qib_cq");
+        qib_cq_wq = create_singlethread_workqueue("qib_cq");
        if (!qib_cq_wq) {
                ret = -ENOMEM;
                goto bail_wq;
@@ -1289,8 +1289,18 @@ static int __devinit qib_init_one(struct pci_dev *pdev,
        if (qib_mini_init || initfail || ret) {
                qib_stop_timers(dd);
+                flush_scheduled_work();
                for (pidx = 0; pidx < dd->num_pports; ++pidx)
                        dd->f_quiet_serdes(dd->pport + pidx);
+                if (qib_mini_init)
+                        goto bail;
+                if (!j) {
+                        (void) qibfs_remove(dd);
+                        qib_device_remove(dd);
+                }
+                if (!ret)
+                        qib_unregister_ib_device(dd);
+                qib_postinit_cleanup(dd);
                if (initfail)
                        ret = initfail;
                goto bail;
@@ -1472,6 +1482,9 @@ int qib_setup_eagerbufs(struct qib_ctxtdata *rcd)
                dma_addr_t pa = rcd->rcvegrbuf_phys[chunk];
                unsigned i;
+                /* clear for security and sanity on each use */
+                memset(rcd->rcvegrbuf[chunk], 0, size);
                for (i = 0; e < egrcnt && i < egrperchunk; e++, i++) {
                        dd->f_put_tid(dd, e + egroff +
                                          (u64 __iomem *)
@@ -1499,6 +1512,12 @@ bail:
        return -ENOMEM;
 }
+/*
+ * Note: Changes to this routine should be mirrored
+ * for the diagnostics routine qib_remap_ioaddr32().
+ * There is also related code for VL15 buffers in qib_init_7322_variables().
+ * The teardown code that unmaps is in qib_pcie_ddcleanup()
+ */
 int init_chip_wc_pat(struct qib_devdata *dd, u32 vl15buflen)
 {
        u64 __iomem *qib_kregbase = NULL;
diff --git a/drivers/infiniband/hw/qib/qib_pcie.c b/drivers/infiniband/hw/qib/qib_pcie.c
index c926bf4541df..7fa6e5592630 100644
--- a/drivers/infiniband/hw/qib/qib_pcie.c
+++ b/drivers/infiniband/hw/qib/qib_pcie.c
@@ -179,6 +179,8 @@ void qib_pcie_ddcleanup(struct qib_devdata *dd)
                iounmap(dd->piobase);
        if (dd->userbase)
                iounmap(dd->userbase);
+        if (dd->piovl15base)
+                iounmap(dd->piovl15base);
        pci_disable_device(dd->pcidev);
        pci_release_regions(dd->pcidev);
diff --git a/drivers/infiniband/hw/qib/qib_sd7220.c b/drivers/infiniband/hw/qib/qib_sd7220.c
index 0aeed0e74cb6..e9f9f8bc3204 100644
--- a/drivers/infiniband/hw/qib/qib_sd7220.c
+++ b/drivers/infiniband/hw/qib/qib_sd7220.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2006, 2007, 2008, 2009 QLogic Corporation. All rights reserved.
+ * Copyright (c) 2006, 2007, 2008, 2009, 2010 QLogic Corporation.
+ * All rights reserved.
 * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
 *
 * This software is available to you under a choice of one of two
@@ -37,10 +38,14 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
+#include <linux/firmware.h>
 #include "qib.h"
 #include "qib_7220.h"
+#define SD7220_FW_NAME "qlogic/sd7220.fw"
+MODULE_FIRMWARE(SD7220_FW_NAME);
 /*
 * Same as in qib_iba7220.c, but just the registers needed here.
 * Could move whole set to qib_7220.h, but decided better to keep
@@ -102,6 +107,10 @@ static int qib_internal_presets(struct qib_devdata *dd);
 /* Tweak the register (CMUCTRL5) that contains the TRIMSELF controls */
 static int qib_sd_trimself(struct qib_devdata *dd, int val);
 static int epb_access(struct qib_devdata *dd, int sdnum, int claim);
+static int qib_sd7220_ib_load(struct qib_devdata *dd,
+                              const struct firmware *fw);
+static int qib_sd7220_ib_vfy(struct qib_devdata *dd,
+                             const struct firmware *fw);
 /*
 * Below keeps track of whether the "once per power-on" initialization has
@@ -110,10 +119,13 @@ static int epb_access(struct qib_devdata *dd, int sdnum, int claim);
 * state of the reset "pin", is no longer valid. Instead, we check for the
 * actual uC code having been loaded.
 */
-static int qib_ibsd_ucode_loaded(struct qib_pportdata *ppd)
+static int qib_ibsd_ucode_loaded(struct qib_pportdata *ppd,
+                                 const struct firmware *fw)
 {
        struct qib_devdata *dd = ppd->dd;
-        if (!dd->cspec->serdes_first_init_done && (qib_sd7220_ib_vfy(dd) > 0))
+        if (!dd->cspec->serdes_first_init_done &&
+            qib_sd7220_ib_vfy(dd, fw) > 0)
                dd->cspec->serdes_first_init_done = 1;
        return dd->cspec->serdes_first_init_done;
 }
@@ -377,6 +389,7 @@ static void qib_sd_trimdone_monitor(struct qib_devdata *dd,
 */
 int qib_sd7220_init(struct qib_devdata *dd)
 {
+        const struct firmware *fw;
        int ret = 1; /* default to failure */
        int first_reset, was_reset;
@@ -387,8 +400,15 @@ int qib_sd7220_init(struct qib_devdata *dd)
                qib_ibsd_reset(dd, 1);
                qib_sd_trimdone_monitor(dd, "Driver-reload");
        }
+        ret = request_firmware(&fw, SD7220_FW_NAME, &dd->pcidev->dev);
+        if (ret) {
+                qib_dev_err(dd, "Failed to load IB SERDES image\n");
+                goto done;
+        }
        /* Substitute our deduced value for was_reset */
-        ret = qib_ibsd_ucode_loaded(dd->pport);
+        ret = qib_ibsd_ucode_loaded(dd->pport, fw);
        if (ret < 0)
                goto bail;
@@ -437,13 +457,13 @@ int qib_sd7220_init(struct qib_devdata *dd)
                int vfy;
                int trim_done;
-                ret = qib_sd7220_ib_load(dd);
+                ret = qib_sd7220_ib_load(dd, fw);
                if (ret < 0) {
                        qib_dev_err(dd, "Failed to load IB SERDES image\n");
                        goto bail;
                } else {
                        /* Loaded image, try to verify */
-                        vfy = qib_sd7220_ib_vfy(dd);
+                        vfy = qib_sd7220_ib_vfy(dd, fw);
                        if (vfy != ret) {
                                qib_dev_err(dd, "SERDES PRAM VFY failed\n");
                                goto bail;
@@ -506,6 +526,8 @@ bail:
 done:
        /* start relock timer regardless, but start at 1 second */
        set_7220_relock_poll(dd, -1);
+        release_firmware(fw);
        return ret;
 }
@@ -829,8 +851,8 @@ static int qib_sd7220_ram_xfer(struct qib_devdata *dd, int sdnum, u32 loc,
 #define PROG_CHUNK 64
-int qib_sd7220_prog_ld(struct qib_devdata *dd, int sdnum,
+static int qib_sd7220_prog_ld(struct qib_devdata *dd, int sdnum,
-                       u8 *img, int len, int offset)
+                              const u8 *img, int len, int offset)
 {
        int cnt, sofar, req;
@@ -840,7 +862,7 @@ int qib_sd7220_prog_ld(struct qib_devdata *dd, int sdnum,
                if (req > PROG_CHUNK)
                        req = PROG_CHUNK;
                cnt = qib_sd7220_ram_xfer(dd, sdnum, offset + sofar,
-                                          img + sofar, req, 0);
+                                          (u8 *)img + sofar, req, 0);
                if (cnt < req) {
                        sofar = -1;
                        break;
@@ -853,8 +875,8 @@ int qib_sd7220_prog_ld(struct qib_devdata *dd, int sdnum,
 #define VFY_CHUNK 64
 #define SD_PRAM_ERROR_LIMIT 42
-int qib_sd7220_prog_vfy(struct qib_devdata *dd, int sdnum,
+static int qib_sd7220_prog_vfy(struct qib_devdata *dd, int sdnum,
-                        const u8 *img, int len, int offset)
+                               const u8 *img, int len, int offset)
 {
        int cnt, sofar, req, idx, errors;
        unsigned char readback[VFY_CHUNK];
@@ -881,6 +903,18 @@ int qib_sd7220_prog_vfy(struct qib_devdata *dd, int sdnum,
        return errors ? -errors : sofar;
 }
+static int
+qib_sd7220_ib_load(struct qib_devdata *dd, const struct firmware *fw)
+{
+        return qib_sd7220_prog_ld(dd, IB_7220_SERDES, fw->data, fw->size, 0);
+}
+static int
+qib_sd7220_ib_vfy(struct qib_devdata *dd, const struct firmware *fw)
+{
+        return qib_sd7220_prog_vfy(dd, IB_7220_SERDES, fw->data, fw->size, 0);
+}
 /*
 * IRQ not set up at this point in init, so we poll.
 */
diff --git a/drivers/infiniband/hw/qib/qib_sd7220_img.c b/drivers/infiniband/hw/qib/qib_sd7220_img.c
deleted file mode 100644
index a1118fbd2370..000000000000
--- a/drivers/infiniband/hw/qib/qib_sd7220_img.c
+++ /dev/null
@@ -1,1081 +0,0 @@
-/*
- * Copyright (c) 2007, 2008 QLogic Corporation. 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
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-/*
- * This file contains the memory image from the vendor, to be copied into
- * the IB SERDES of the IBA7220 during initialization.
- * The file also includes the two functions which use this image.
- */
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include "qib.h"
-#include "qib_7220.h"
-static unsigned char qib_sd7220_ib_img[] = {
-/*0000*/0x02, 0x0A, 0x29, 0x02, 0x0A, 0x87, 0xE5, 0xE6,
-        0x30, 0xE6, 0x04, 0x7F, 0x01, 0x80, 0x02, 0x7F,
-/*0010*/0x00, 0xE5, 0xE2, 0x30, 0xE4, 0x04, 0x7E, 0x01,
-        0x80, 0x02, 0x7E, 0x00, 0xEE, 0x5F, 0x60, 0x08,
-/*0020*/0x53, 0xF9, 0xF7, 0xE4, 0xF5, 0xFE, 0x80, 0x08,
-        0x7F, 0x0A, 0x12, 0x17, 0x31, 0x12, 0x0E, 0xA2,
-/*0030*/0x75, 0xFC, 0x08, 0xE4, 0xF5, 0xFD, 0xE5, 0xE7,
-        0x20, 0xE7, 0x03, 0x43, 0xF9, 0x08, 0x22, 0x00,
-/*0040*/0x01, 0x20, 0x11, 0x00, 0x04, 0x20, 0x00, 0x75,
-        0x51, 0x01, 0xE4, 0xF5, 0x52, 0xF5, 0x53, 0xF5,
-/*0050*/0x52, 0xF5, 0x7E, 0x7F, 0x04, 0x02, 0x04, 0x38,
-        0xC2, 0x36, 0x05, 0x52, 0xE5, 0x52, 0xD3, 0x94,
-/*0060*/0x0C, 0x40, 0x05, 0x75, 0x52, 0x01, 0xD2, 0x36,
-        0x90, 0x07, 0x0C, 0x74, 0x07, 0xF0, 0xA3, 0x74,
-/*0070*/0xFF, 0xF0, 0xE4, 0xF5, 0x0C, 0xA3, 0xF0, 0x90,
-        0x07, 0x14, 0xF0, 0xA3, 0xF0, 0x75, 0x0B, 0x20,
-/*0080*/0xF5, 0x09, 0xE4, 0xF5, 0x08, 0xE5, 0x08, 0xD3,
-        0x94, 0x30, 0x40, 0x03, 0x02, 0x04, 0x04, 0x12,
-/*0090*/0x00, 0x06, 0x15, 0x0B, 0xE5, 0x08, 0x70, 0x04,
-        0x7F, 0x01, 0x80, 0x02, 0x7F, 0x00, 0xE5, 0x09,
-/*00A0*/0x70, 0x04, 0x7E, 0x01, 0x80, 0x02, 0x7E, 0x00,
-        0xEE, 0x5F, 0x60, 0x05, 0x12, 0x18, 0x71, 0xD2,
-/*00B0*/0x35, 0x53, 0xE1, 0xF7, 0xE5, 0x08, 0x45, 0x09,
-        0xFF, 0xE5, 0x0B, 0x25, 0xE0, 0x25, 0xE0, 0x24,
-/*00C0*/0x83, 0xF5, 0x82, 0xE4, 0x34, 0x07, 0xF5, 0x83,
-        0xEF, 0xF0, 0x85, 0xE2, 0x20, 0xE5, 0x52, 0xD3,
-/*00D0*/0x94, 0x01, 0x40, 0x0D, 0x12, 0x19, 0xF3, 0xE0,
-        0x54, 0xA0, 0x64, 0x40, 0x70, 0x03, 0x02, 0x03,
-/*00E0*/0xFB, 0x53, 0xF9, 0xF8, 0x90, 0x94, 0x70, 0xE4,
-        0xF0, 0xE0, 0xF5, 0x10, 0xAF, 0x09, 0x12, 0x1E,
-/*00F0*/0xB3, 0xAF, 0x08, 0xEF, 0x44, 0x08, 0xF5, 0x82,
-        0x75, 0x83, 0x80, 0xE0, 0xF5, 0x29, 0xEF, 0x44,
-/*0100*/0x07, 0x12, 0x1A, 0x3C, 0xF5, 0x22, 0x54, 0x40,
-        0xD3, 0x94, 0x00, 0x40, 0x1E, 0xE5, 0x29, 0x54,
-/*0110*/0xF0, 0x70, 0x21, 0x12, 0x19, 0xF3, 0xE0, 0x44,
-        0x80, 0xF0, 0xE5, 0x22, 0x54, 0x30, 0x65, 0x08,
-/*0120*/0x70, 0x09, 0x12, 0x19, 0xF3, 0xE0, 0x54, 0xBF,
-        0xF0, 0x80, 0x09, 0x12, 0x19, 0xF3, 0x74, 0x40,
-/*0130*/0xF0, 0x02, 0x03, 0xFB, 0x12, 0x1A, 0x12, 0x75,
-        0x83, 0xAE, 0x74, 0xFF, 0xF0, 0xAF, 0x08, 0x7E,
-/*0140*/0x00, 0xEF, 0x44, 0x07, 0xF5, 0x82, 0xE0, 0xFD,
-        0xE5, 0x0B, 0x25, 0xE0, 0x25, 0xE0, 0x24, 0x81,
-/*0150*/0xF5, 0x82, 0xE4, 0x34, 0x07, 0xF5, 0x83, 0xED,
-        0xF0, 0x90, 0x07, 0x0E, 0xE0, 0x04, 0xF0, 0xEF,
-/*0160*/0x44, 0x07, 0xF5, 0x82, 0x75, 0x83, 0x98, 0xE0,
-        0xF5, 0x28, 0x12, 0x1A, 0x23, 0x40, 0x0C, 0x12,
-/*0170*/0x19, 0xF3, 0xE0, 0x44, 0x01, 0x12, 0x1A, 0x32,
-        0x02, 0x03, 0xF6, 0xAF, 0x08, 0x7E, 0x00, 0x74,
-/*0180*/0x80, 0xCD, 0xEF, 0xCD, 0x8D, 0x82, 0xF5, 0x83,
-        0xE0, 0x30, 0xE0, 0x0A, 0x12, 0x19, 0xF3, 0xE0,
-/*0190*/0x44, 0x20, 0xF0, 0x02, 0x03, 0xFB, 0x12, 0x19,
-        0xF3, 0xE0, 0x54, 0xDF, 0xF0, 0xEE, 0x44, 0xAE,
-/*01A0*/0x12, 0x1A, 0x43, 0x30, 0xE4, 0x03, 0x02, 0x03,
-        0xFB, 0x74, 0x9E, 0x12, 0x1A, 0x05, 0x20, 0xE0,
-/*01B0*/0x03, 0x02, 0x03, 0xFB, 0x8F, 0x82, 0x8E, 0x83,
-        0xE0, 0x20, 0xE0, 0x03, 0x02, 0x03, 0xFB, 0x12,
-/*01C0*/0x19, 0xF3, 0xE0, 0x44, 0x10, 0xF0, 0xE5, 0xE3,
-        0x20, 0xE7, 0x08, 0xE5, 0x08, 0x12, 0x1A, 0x3A,
-/*01D0*/0x44, 0x04, 0xF0, 0xAF, 0x08, 0x7E, 0x00, 0xEF,
-        0x12, 0x1A, 0x3A, 0x20, 0xE2, 0x34, 0x12, 0x19,
-/*01E0*/0xF3, 0xE0, 0x44, 0x08, 0xF0, 0xE5, 0xE4, 0x30,
-        0xE6, 0x04, 0x7D, 0x01, 0x80, 0x02, 0x7D, 0x00,
-/*01F0*/0xE5, 0x7E, 0xC3, 0x94, 0x04, 0x50, 0x04, 0x7C,
-        0x01, 0x80, 0x02, 0x7C, 0x00, 0xEC, 0x4D, 0x60,
-/*0200*/0x05, 0xC2, 0x35, 0x02, 0x03, 0xFB, 0xEE, 0x44,
-        0xD2, 0x12, 0x1A, 0x43, 0x44, 0x40, 0xF0, 0x02,
-/*0210*/0x03, 0xFB, 0x12, 0x19, 0xF3, 0xE0, 0x54, 0xF7,
-        0xF0, 0x12, 0x1A, 0x12, 0x75, 0x83, 0xD2, 0xE0,
-/*0220*/0x54, 0xBF, 0xF0, 0x90, 0x07, 0x14, 0xE0, 0x04,
-        0xF0, 0xE5, 0x7E, 0x70, 0x03, 0x75, 0x7E, 0x01,
-/*0230*/0xAF, 0x08, 0x7E, 0x00, 0x12, 0x1A, 0x23, 0x40,
-        0x12, 0x12, 0x19, 0xF3, 0xE0, 0x44, 0x01, 0x12,
-/*0240*/0x19, 0xF2, 0xE0, 0x54, 0x02, 0x12, 0x1A, 0x32,
-        0x02, 0x03, 0xFB, 0x12, 0x19, 0xF3, 0xE0, 0x44,
-/*0250*/0x02, 0x12, 0x19, 0xF2, 0xE0, 0x54, 0xFE, 0xF0,
-        0xC2, 0x35, 0xEE, 0x44, 0x8A, 0x8F, 0x82, 0xF5,
-/*0260*/0x83, 0xE0, 0xF5, 0x17, 0x54, 0x8F, 0x44, 0x40,
-        0xF0, 0x74, 0x90, 0xFC, 0xE5, 0x08, 0x44, 0x07,
-/*0270*/0xFD, 0xF5, 0x82, 0x8C, 0x83, 0xE0, 0x54, 0x3F,
-        0x90, 0x07, 0x02, 0xF0, 0xE0, 0x54, 0xC0, 0x8D,
-/*0280*/0x82, 0x8C, 0x83, 0xF0, 0x74, 0x92, 0x12, 0x1A,
-        0x05, 0x90, 0x07, 0x03, 0x12, 0x1A, 0x19, 0x74,
-/*0290*/0x82, 0x12, 0x1A, 0x05, 0x90, 0x07, 0x04, 0x12,
-        0x1A, 0x19, 0x74, 0xB4, 0x12, 0x1A, 0x05, 0x90,
-/*02A0*/0x07, 0x05, 0x12, 0x1A, 0x19, 0x74, 0x94, 0xFE,
-        0xE5, 0x08, 0x44, 0x06, 0x12, 0x1A, 0x0A, 0xF5,
-/*02B0*/0x10, 0x30, 0xE0, 0x04, 0xD2, 0x37, 0x80, 0x02,
-        0xC2, 0x37, 0xE5, 0x10, 0x54, 0x7F, 0x8F, 0x82,
-/*02C0*/0x8E, 0x83, 0xF0, 0x30, 0x44, 0x30, 0x12, 0x1A,
-        0x03, 0x54, 0x80, 0xD3, 0x94, 0x00, 0x40, 0x04,
-/*02D0*/0xD2, 0x39, 0x80, 0x02, 0xC2, 0x39, 0x8F, 0x82,
-        0x8E, 0x83, 0xE0, 0x44, 0x80, 0xF0, 0x12, 0x1A,
-/*02E0*/0x03, 0x54, 0x40, 0xD3, 0x94, 0x00, 0x40, 0x04,
-        0xD2, 0x3A, 0x80, 0x02, 0xC2, 0x3A, 0x8F, 0x82,
-/*02F0*/0x8E, 0x83, 0xE0, 0x44, 0x40, 0xF0, 0x74, 0x92,
-        0xFE, 0xE5, 0x08, 0x44, 0x06, 0x12, 0x1A, 0x0A,
-/*0300*/0x30, 0xE7, 0x04, 0xD2, 0x38, 0x80, 0x02, 0xC2,
-        0x38, 0x8F, 0x82, 0x8E, 0x83, 0xE0, 0x54, 0x7F,
-/*0310*/0xF0, 0x12, 0x1E, 0x46, 0xE4, 0xF5, 0x0A, 0x20,
-        0x03, 0x02, 0x80, 0x03, 0x30, 0x43, 0x03, 0x12,
-/*0320*/0x19, 0x95, 0x20, 0x02, 0x02, 0x80, 0x03, 0x30,
-        0x42, 0x03, 0x12, 0x0C, 0x8F, 0x30, 0x30, 0x06,
-/*0330*/0x12, 0x19, 0x95, 0x12, 0x0C, 0x8F, 0x12, 0x0D,
-        0x47, 0x12, 0x19, 0xF3, 0xE0, 0x54, 0xFB, 0xF0,
-/*0340*/0xE5, 0x0A, 0xC3, 0x94, 0x01, 0x40, 0x46, 0x43,
-        0xE1, 0x08, 0x12, 0x19, 0xF3, 0xE0, 0x44, 0x04,
-/*0350*/0xF0, 0xE5, 0xE4, 0x20, 0xE7, 0x2A, 0x12, 0x1A,
-        0x12, 0x75, 0x83, 0xD2, 0xE0, 0x54, 0x08, 0xD3,
-/*0360*/0x94, 0x00, 0x40, 0x04, 0x7F, 0x01, 0x80, 0x02,
-        0x7F, 0x00, 0xE5, 0x0A, 0xC3, 0x94, 0x01, 0x40,
-/*0370*/0x04, 0x7E, 0x01, 0x80, 0x02, 0x7E, 0x00, 0xEF,
-        0x5E, 0x60, 0x05, 0x12, 0x1D, 0xD7, 0x80, 0x17,
-/*0380*/0x12, 0x1A, 0x12, 0x75, 0x83, 0xD2, 0xE0, 0x44,
-        0x08, 0xF0, 0x02, 0x03, 0xFB, 0x12, 0x1A, 0x12,
-/*0390*/0x75, 0x83, 0xD2, 0xE0, 0x54, 0xF7, 0xF0, 0x12,
-        0x1E, 0x46, 0x7F, 0x08, 0x12, 0x17, 0x31, 0x74,
-/*03A0*/0x8E, 0xFE, 0x12, 0x1A, 0x12, 0x8E, 0x83, 0xE0,
-        0xF5, 0x10, 0x54, 0xFE, 0xF0, 0xE5, 0x10, 0x44,
-/*03B0*/0x01, 0xFF, 0xE5, 0x08, 0xFD, 0xED, 0x44, 0x07,
-        0xF5, 0x82, 0xEF, 0xF0, 0xE5, 0x10, 0x54, 0xFE,
-/*03C0*/0xFF, 0xED, 0x44, 0x07, 0xF5, 0x82, 0xEF, 0x12,
-        0x1A, 0x11, 0x75, 0x83, 0x86, 0xE0, 0x44, 0x10,
-/*03D0*/0x12, 0x1A, 0x11, 0xE0, 0x44, 0x10, 0xF0, 0x12,
-        0x19, 0xF3, 0xE0, 0x54, 0xFD, 0x44, 0x01, 0xFF,
-/*03E0*/0x12, 0x19, 0xF3, 0xEF, 0x12, 0x1A, 0x32, 0x30,
-        0x32, 0x0C, 0xE5, 0x08, 0x44, 0x08, 0xF5, 0x82,
-/*03F0*/0x75, 0x83, 0x82, 0x74, 0x05, 0xF0, 0xAF, 0x0B,
-        0x12, 0x18, 0xD7, 0x74, 0x10, 0x25, 0x08, 0xF5,
-/*0400*/0x08, 0x02, 0x00, 0x85, 0x05, 0x09, 0xE5, 0x09,
-        0xD3, 0x94, 0x07, 0x50, 0x03, 0x02, 0x00, 0x82,
-/*0410*/0xE5, 0x7E, 0xD3, 0x94, 0x00, 0x40, 0x04, 0x7F,
-        0x01, 0x80, 0x02, 0x7F, 0x00, 0xE5, 0x7E, 0xC3,
-/*0420*/0x94, 0xFA, 0x50, 0x04, 0x7E, 0x01, 0x80, 0x02,
-        0x7E, 0x00, 0xEE, 0x5F, 0x60, 0x02, 0x05, 0x7E,
-/*0430*/0x30, 0x35, 0x0B, 0x43, 0xE1, 0x01, 0x7F, 0x09,
-        0x12, 0x17, 0x31, 0x02, 0x00, 0x58, 0x53, 0xE1,
-/*0440*/0xFE, 0x02, 0x00, 0x58, 0x8E, 0x6A, 0x8F, 0x6B,
-        0x8C, 0x6C, 0x8D, 0x6D, 0x75, 0x6E, 0x01, 0x75,
-/*0450*/0x6F, 0x01, 0x75, 0x70, 0x01, 0xE4, 0xF5, 0x73,
-        0xF5, 0x74, 0xF5, 0x75, 0x90, 0x07, 0x2F, 0xF0,
-/*0460*/0xF5, 0x3C, 0xF5, 0x3E, 0xF5, 0x46, 0xF5, 0x47,
-        0xF5, 0x3D, 0xF5, 0x3F, 0xF5, 0x6F, 0xE5, 0x6F,
-/*0470*/0x70, 0x0F, 0xE5, 0x6B, 0x45, 0x6A, 0x12, 0x07,
-        0x2A, 0x75, 0x83, 0x80, 0x74, 0x3A, 0xF0, 0x80,
-/*0480*/0x09, 0x12, 0x07, 0x2A, 0x75, 0x83, 0x80, 0x74,
-        0x1A, 0xF0, 0xE4, 0xF5, 0x6E, 0xC3, 0x74, 0x3F,
-/*0490*/0x95, 0x6E, 0xFF, 0x12, 0x08, 0x65, 0x75, 0x83,
-        0x82, 0xEF, 0xF0, 0x12, 0x1A, 0x4D, 0x12, 0x08,
-/*04A0*/0xC6, 0xE5, 0x33, 0xF0, 0x12, 0x08, 0xFA, 0x12,
-        0x08, 0xB1, 0x40, 0xE1, 0xE5, 0x6F, 0x70, 0x0B,
-/*04B0*/0x12, 0x07, 0x2A, 0x75, 0x83, 0x80, 0x74, 0x36,
-        0xF0, 0x80, 0x09, 0x12, 0x07, 0x2A, 0x75, 0x83,
-/*04C0*/0x80, 0x74, 0x16, 0xF0, 0x75, 0x6E, 0x01, 0x12,
-        0x07, 0x2A, 0x75, 0x83, 0xB4, 0xE5, 0x6E, 0xF0,
-/*04D0*/0x12, 0x1A, 0x4D, 0x74, 0x3F, 0x25, 0x6E, 0xF5,
-        0x82, 0xE4, 0x34, 0x00, 0xF5, 0x83, 0xE5, 0x33,
-/*04E0*/0xF0, 0x74, 0xBF, 0x25, 0x6E, 0xF5, 0x82, 0xE4,
-        0x34, 0x00, 0x12, 0x08, 0xB1, 0x40, 0xD8, 0xE4,
-/*04F0*/0xF5, 0x70, 0xF5, 0x46, 0xF5, 0x47, 0xF5, 0x6E,
-        0x12, 0x08, 0xFA, 0xF5, 0x83, 0xE0, 0xFE, 0x12,
-/*0500*/0x08, 0xC6, 0xE0, 0x7C, 0x00, 0x24, 0x00, 0xFF,
-        0xEC, 0x3E, 0xFE, 0xAD, 0x3B, 0xD3, 0xEF, 0x9D,
-/*0510*/0xEE, 0x9C, 0x50, 0x04, 0x7B, 0x01, 0x80, 0x02,
-        0x7B, 0x00, 0xE5, 0x70, 0x70, 0x04, 0x7A, 0x01,
-/*0520*/0x80, 0x02, 0x7A, 0x00, 0xEB, 0x5A, 0x60, 0x06,
-        0x85, 0x6E, 0x46, 0x75, 0x70, 0x01, 0xD3, 0xEF,
-/*0530*/0x9D, 0xEE, 0x9C, 0x50, 0x04, 0x7F, 0x01, 0x80,
-        0x02, 0x7F, 0x00, 0xE5, 0x70, 0xB4, 0x01, 0x04,
-/*0540*/0x7E, 0x01, 0x80, 0x02, 0x7E, 0x00, 0xEF, 0x5E,
-        0x60, 0x03, 0x85, 0x6E, 0x47, 0x05, 0x6E, 0xE5,
-/*0550*/0x6E, 0x64, 0x7F, 0x70, 0xA3, 0xE5, 0x46, 0x60,
-        0x05, 0xE5, 0x47, 0xB4, 0x7E, 0x03, 0x85, 0x46,
-/*0560*/0x47, 0xE5, 0x6F, 0x70, 0x08, 0x85, 0x46, 0x76,
-        0x85, 0x47, 0x77, 0x80, 0x0E, 0xC3, 0x74, 0x7F,
-/*0570*/0x95, 0x46, 0xF5, 0x78, 0xC3, 0x74, 0x7F, 0x95,
-        0x47, 0xF5, 0x79, 0xE5, 0x6F, 0x70, 0x37, 0xE5,
-/*0580*/0x46, 0x65, 0x47, 0x70, 0x0C, 0x75, 0x73, 0x01,
-        0x75, 0x74, 0x01, 0xF5, 0x3C, 0xF5, 0x3D, 0x80,
-/*0590*/0x35, 0xE4, 0xF5, 0x4E, 0xC3, 0xE5, 0x47, 0x95,
-        0x46, 0xF5, 0x3C, 0xC3, 0x13, 0xF5, 0x71, 0x25,
-/*05A0*/0x46, 0xF5, 0x72, 0xC3, 0x94, 0x3F, 0x40, 0x05,
-        0xE4, 0xF5, 0x3D, 0x80, 0x40, 0xC3, 0x74, 0x3F,
-/*05B0*/0x95, 0x72, 0xF5, 0x3D, 0x80, 0x37, 0xE5, 0x46,
-        0x65, 0x47, 0x70, 0x0F, 0x75, 0x73, 0x01, 0x75,
-/*05C0*/0x75, 0x01, 0xF5, 0x3E, 0xF5, 0x3F, 0x75, 0x4E,
-        0x01, 0x80, 0x22, 0xE4, 0xF5, 0x4E, 0xC3, 0xE5,
-/*05D0*/0x47, 0x95, 0x46, 0xF5, 0x3E, 0xC3, 0x13, 0xF5,
-        0x71, 0x25, 0x46, 0xF5, 0x72, 0xD3, 0x94, 0x3F,
-/*05E0*/0x50, 0x05, 0xE4, 0xF5, 0x3F, 0x80, 0x06, 0xE5,
-        0x72, 0x24, 0xC1, 0xF5, 0x3F, 0x05, 0x6F, 0xE5,
-/*05F0*/0x6F, 0xC3, 0x94, 0x02, 0x50, 0x03, 0x02, 0x04,
-        0x6E, 0xE5, 0x6D, 0x45, 0x6C, 0x70, 0x02, 0x80,
-/*0600*/0x04, 0xE5, 0x74, 0x45, 0x75, 0x90, 0x07, 0x2F,
-        0xF0, 0x7F, 0x01, 0xE5, 0x3E, 0x60, 0x04, 0xE5,
-/*0610*/0x3C, 0x70, 0x14, 0xE4, 0xF5, 0x3C, 0xF5, 0x3D,
-        0xF5, 0x3E, 0xF5, 0x3F, 0x12, 0x08, 0xD2, 0x70,
-/*0620*/0x04, 0xF0, 0x02, 0x06, 0xA4, 0x80, 0x7A, 0xE5,
-        0x3C, 0xC3, 0x95, 0x3E, 0x40, 0x07, 0xE5, 0x3C,
-/*0630*/0x95, 0x3E, 0xFF, 0x80, 0x06, 0xC3, 0xE5, 0x3E,
-        0x95, 0x3C, 0xFF, 0xE5, 0x76, 0xD3, 0x95, 0x79,
-/*0640*/0x40, 0x05, 0x85, 0x76, 0x7A, 0x80, 0x03, 0x85,
-        0x79, 0x7A, 0xE5, 0x77, 0xC3, 0x95, 0x78, 0x50,
-/*0650*/0x05, 0x85, 0x77, 0x7B, 0x80, 0x03, 0x85, 0x78,
-        0x7B, 0xE5, 0x7B, 0xD3, 0x95, 0x7A, 0x40, 0x30,
-/*0660*/0xE5, 0x7B, 0x95, 0x7A, 0xF5, 0x3C, 0xF5, 0x3E,
-        0xC3, 0xE5, 0x7B, 0x95, 0x7A, 0x90, 0x07, 0x19,
-/*0670*/0xF0, 0xE5, 0x3C, 0xC3, 0x13, 0xF5, 0x71, 0x25,
-        0x7A, 0xF5, 0x72, 0xC3, 0x94, 0x3F, 0x40, 0x05,
-/*0680*/0xE4, 0xF5, 0x3D, 0x80, 0x1F, 0xC3, 0x74, 0x3F,
-        0x95, 0x72, 0xF5, 0x3D, 0xF5, 0x3F, 0x80, 0x14,
-/*0690*/0xE4, 0xF5, 0x3C, 0xF5, 0x3E, 0x90, 0x07, 0x19,
-        0xF0, 0x12, 0x08, 0xD2, 0x70, 0x03, 0xF0, 0x80,
-/*06A0*/0x03, 0x74, 0x01, 0xF0, 0x12, 0x08, 0x65, 0x75,
-        0x83, 0xD0, 0xE0, 0x54, 0x0F, 0xFE, 0xAD, 0x3C,
-/*06B0*/0x70, 0x02, 0x7E, 0x07, 0xBE, 0x0F, 0x02, 0x7E,
-        0x80, 0xEE, 0xFB, 0xEF, 0xD3, 0x9B, 0x74, 0x80,
-/*06C0*/0xF8, 0x98, 0x40, 0x1F, 0xE4, 0xF5, 0x3C, 0xF5,
-        0x3E, 0x12, 0x08, 0xD2, 0x70, 0x03, 0xF0, 0x80,
-/*06D0*/0x12, 0x74, 0x01, 0xF0, 0xE5, 0x08, 0xFB, 0xEB,
-        0x44, 0x07, 0xF5, 0x82, 0x75, 0x83, 0xD2, 0xE0,
-/*06E0*/0x44, 0x10, 0xF0, 0xE5, 0x08, 0xFB, 0xEB, 0x44,
-        0x09, 0xF5, 0x82, 0x75, 0x83, 0x9E, 0xED, 0xF0,
-/*06F0*/0xEB, 0x44, 0x07, 0xF5, 0x82, 0x75, 0x83, 0xCA,
-        0xED, 0xF0, 0x12, 0x08, 0x65, 0x75, 0x83, 0xCC,
-/*0700*/0xEF, 0xF0, 0x22, 0xE5, 0x08, 0x44, 0x07, 0xF5,
-        0x82, 0x75, 0x83, 0xBC, 0xE0, 0x54, 0xF0, 0xF0,
-/*0710*/0xE5, 0x08, 0x44, 0x07, 0xF5, 0x82, 0x75, 0x83,
-        0xBE, 0xE0, 0x54, 0xF0, 0xF0, 0xE5, 0x08, 0x44,
-/*0720*/0x07, 0xF5, 0x82, 0x75, 0x83, 0xC0, 0xE0, 0x54,
-        0xF0, 0xF0, 0xE5, 0x08, 0x44, 0x07, 0xF5, 0x82,
-/*0730*/0x22, 0xF0, 0x90, 0x07, 0x28, 0xE0, 0xFE, 0xA3,
-        0xE0, 0xF5, 0x82, 0x8E, 0x83, 0x22, 0x85, 0x42,
-/*0740*/0x42, 0x85, 0x41, 0x41, 0x85, 0x40, 0x40, 0x74,
-        0xC0, 0x2F, 0xF5, 0x82, 0x74, 0x02, 0x3E, 0xF5,
-/*0750*/0x83, 0xE5, 0x42, 0xF0, 0x74, 0xE0, 0x2F, 0xF5,
-        0x82, 0x74, 0x02, 0x3E, 0xF5, 0x83, 0x22, 0xE5,
-/*0760*/0x42, 0x29, 0xFD, 0xE4, 0x33, 0xFC, 0xE5, 0x3C,
-        0xC3, 0x9D, 0xEC, 0x64, 0x80, 0xF8, 0x74, 0x80,
-/*0770*/0x98, 0x22, 0xF5, 0x83, 0xE0, 0x90, 0x07, 0x22,
-        0x54, 0x1F, 0xFD, 0xE0, 0xFA, 0xA3, 0xE0, 0xF5,
-/*0780*/0x82, 0x8A, 0x83, 0xED, 0xF0, 0x22, 0x90, 0x07,
-        0x22, 0xE0, 0xFC, 0xA3, 0xE0, 0xF5, 0x82, 0x8C,
-/*0790*/0x83, 0x22, 0x90, 0x07, 0x24, 0xFF, 0xED, 0x44,
-        0x07, 0xCF, 0xF0, 0xA3, 0xEF, 0xF0, 0x22, 0x85,
-/*07A0*/0x38, 0x38, 0x85, 0x39, 0x39, 0x85, 0x3A, 0x3A,
-        0x74, 0xC0, 0x2F, 0xF5, 0x82, 0x74, 0x02, 0x3E,
-/*07B0*/0xF5, 0x83, 0x22, 0x90, 0x07, 0x26, 0xFF, 0xED,
-        0x44, 0x07, 0xCF, 0xF0, 0xA3, 0xEF, 0xF0, 0x22,
-/*07C0*/0xF0, 0x74, 0xA0, 0x2F, 0xF5, 0x82, 0x74, 0x02,
-        0x3E, 0xF5, 0x83, 0x22, 0x74, 0xC0, 0x25, 0x11,
-/*07D0*/0xF5, 0x82, 0xE4, 0x34, 0x01, 0xF5, 0x83, 0x22,
-        0x74, 0x00, 0x25, 0x11, 0xF5, 0x82, 0xE4, 0x34,
-/*07E0*/0x02, 0xF5, 0x83, 0x22, 0x74, 0x60, 0x25, 0x11,
-        0xF5, 0x82, 0xE4, 0x34, 0x03, 0xF5, 0x83, 0x22,
-/*07F0*/0x74, 0x80, 0x25, 0x11, 0xF5, 0x82, 0xE4, 0x34,
-        0x03, 0xF5, 0x83, 0x22, 0x74, 0xE0, 0x25, 0x11,
-/*0800*/0xF5, 0x82, 0xE4, 0x34, 0x03, 0xF5, 0x83, 0x22,
-        0x74, 0x40, 0x25, 0x11, 0xF5, 0x82, 0xE4, 0x34,
-/*0810*/0x06, 0xF5, 0x83, 0x22, 0x74, 0x80, 0x2F, 0xF5,
-        0x82, 0x74, 0x02, 0x3E, 0xF5, 0x83, 0x22, 0xAF,
-/*0820*/0x08, 0x7E, 0x00, 0xEF, 0x44, 0x07, 0xF5, 0x82,
-        0x22, 0xF5, 0x83, 0xE5, 0x82, 0x44, 0x07, 0xF5,
-/*0830*/0x82, 0xE5, 0x40, 0xF0, 0x22, 0x74, 0x40, 0x25,
-        0x11, 0xF5, 0x82, 0xE4, 0x34, 0x02, 0xF5, 0x83,
-/*0840*/0x22, 0x74, 0xC0, 0x25, 0x11, 0xF5, 0x82, 0xE4,
-        0x34, 0x03, 0xF5, 0x83, 0x22, 0x74, 0x00, 0x25,
-/*0850*/0x11, 0xF5, 0x82, 0xE4, 0x34, 0x06, 0xF5, 0x83,
-        0x22, 0x74, 0x20, 0x25, 0x11, 0xF5, 0x82, 0xE4,
-/*0860*/0x34, 0x06, 0xF5, 0x83, 0x22, 0xE5, 0x08, 0xFD,
-        0xED, 0x44, 0x07, 0xF5, 0x82, 0x22, 0xE5, 0x41,
-/*0870*/0xF0, 0xE5, 0x65, 0x64, 0x01, 0x45, 0x64, 0x22,
-        0x7E, 0x00, 0xFB, 0x7A, 0x00, 0xFD, 0x7C, 0x00,
-/*0880*/0x22, 0x74, 0x20, 0x25, 0x11, 0xF5, 0x82, 0xE4,
-        0x34, 0x02, 0x22, 0x74, 0xA0, 0x25, 0x11, 0xF5,
-/*0890*/0x82, 0xE4, 0x34, 0x03, 0x22, 0x85, 0x3E, 0x42,
-        0x85, 0x3F, 0x41, 0x8F, 0x40, 0x22, 0x85, 0x3C,
-/*08A0*/0x42, 0x85, 0x3D, 0x41, 0x8F, 0x40, 0x22, 0x75,
-        0x45, 0x3F, 0x90, 0x07, 0x20, 0xE4, 0xF0, 0xA3,
-/*08B0*/0x22, 0xF5, 0x83, 0xE5, 0x32, 0xF0, 0x05, 0x6E,
-        0xE5, 0x6E, 0xC3, 0x94, 0x40, 0x22, 0xF0, 0xE5,
-/*08C0*/0x08, 0x44, 0x06, 0xF5, 0x82, 0x22, 0x74, 0x00,
-        0x25, 0x6E, 0xF5, 0x82, 0xE4, 0x34, 0x00, 0xF5,
-/*08D0*/0x83, 0x22, 0xE5, 0x6D, 0x45, 0x6C, 0x90, 0x07,
-        0x2F, 0x22, 0xE4, 0xF9, 0xE5, 0x3C, 0xD3, 0x95,
-/*08E0*/0x3E, 0x22, 0x74, 0x80, 0x2E, 0xF5, 0x82, 0xE4,
-        0x34, 0x02, 0xF5, 0x83, 0xE0, 0x22, 0x74, 0xA0,
-/*08F0*/0x2E, 0xF5, 0x82, 0xE4, 0x34, 0x02, 0xF5, 0x83,
-        0xE0, 0x22, 0x74, 0x80, 0x25, 0x6E, 0xF5, 0x82,
-/*0900*/0xE4, 0x34, 0x00, 0x22, 0x25, 0x42, 0xFD, 0xE4,
-        0x33, 0xFC, 0x22, 0x85, 0x42, 0x42, 0x85, 0x41,
-/*0910*/0x41, 0x85, 0x40, 0x40, 0x22, 0xED, 0x4C, 0x60,
-        0x03, 0x02, 0x09, 0xE5, 0xEF, 0x4E, 0x70, 0x37,
-/*0920*/0x90, 0x07, 0x26, 0x12, 0x07, 0x89, 0xE0, 0xFD,
-        0x12, 0x07, 0xCC, 0xED, 0xF0, 0x90, 0x07, 0x28,
-/*0930*/0x12, 0x07, 0x89, 0xE0, 0xFD, 0x12, 0x07, 0xD8,
-        0xED, 0xF0, 0x12, 0x07, 0x86, 0xE0, 0x54, 0x1F,
-/*0940*/0xFD, 0x12, 0x08, 0x81, 0xF5, 0x83, 0xED, 0xF0,
-        0x90, 0x07, 0x24, 0x12, 0x07, 0x89, 0xE0, 0x54,
-/*0950*/0x1F, 0xFD, 0x12, 0x08, 0x35, 0xED, 0xF0, 0xEF,
-        0x64, 0x04, 0x4E, 0x70, 0x37, 0x90, 0x07, 0x26,
-/*0960*/0x12, 0x07, 0x89, 0xE0, 0xFD, 0x12, 0x07, 0xE4,
-        0xED, 0xF0, 0x90, 0x07, 0x28, 0x12, 0x07, 0x89,
-/*0970*/0xE0, 0xFD, 0x12, 0x07, 0xF0, 0xED, 0xF0, 0x12,
-        0x07, 0x86, 0xE0, 0x54, 0x1F, 0xFD, 0x12, 0x08,
-/*0980*/0x8B, 0xF5, 0x83, 0xED, 0xF0, 0x90, 0x07, 0x24,
-        0x12, 0x07, 0x89, 0xE0, 0x54, 0x1F, 0xFD, 0x12,
-/*0990*/0x08, 0x41, 0xED, 0xF0, 0xEF, 0x64, 0x01, 0x4E,
-        0x70, 0x04, 0x7D, 0x01, 0x80, 0x02, 0x7D, 0x00,
-/*09A0*/0xEF, 0x64, 0x02, 0x4E, 0x70, 0x04, 0x7F, 0x01,
-        0x80, 0x02, 0x7F, 0x00, 0xEF, 0x4D, 0x60, 0x78,
-/*09B0*/0x90, 0x07, 0x26, 0x12, 0x07, 0x35, 0xE0, 0xFF,
-        0x12, 0x07, 0xFC, 0xEF, 0x12, 0x07, 0x31, 0xE0,
-/*09C0*/0xFF, 0x12, 0x08, 0x08, 0xEF, 0xF0, 0x90, 0x07,
-        0x22, 0x12, 0x07, 0x35, 0xE0, 0x54, 0x1F, 0xFF,
-/*09D0*/0x12, 0x08, 0x4D, 0xEF, 0xF0, 0x90, 0x07, 0x24,
-        0x12, 0x07, 0x35, 0xE0, 0x54, 0x1F, 0xFF, 0x12,
-/*09E0*/0x08, 0x59, 0xEF, 0xF0, 0x22, 0x12, 0x07, 0xCC,
-        0xE4, 0xF0, 0x12, 0x07, 0xD8, 0xE4, 0xF0, 0x12,
-/*09F0*/0x08, 0x81, 0xF5, 0x83, 0xE4, 0xF0, 0x12, 0x08,
-        0x35, 0x74, 0x14, 0xF0, 0x12, 0x07, 0xE4, 0xE4,
-/*0A00*/0xF0, 0x12, 0x07, 0xF0, 0xE4, 0xF0, 0x12, 0x08,
-        0x8B, 0xF5, 0x83, 0xE4, 0xF0, 0x12, 0x08, 0x41,
-/*0A10*/0x74, 0x14, 0xF0, 0x12, 0x07, 0xFC, 0xE4, 0xF0,
-        0x12, 0x08, 0x08, 0xE4, 0xF0, 0x12, 0x08, 0x4D,
-/*0A20*/0xE4, 0xF0, 0x12, 0x08, 0x59, 0x74, 0x14, 0xF0,
-        0x22, 0x53, 0xF9, 0xF7, 0x75, 0xFC, 0x10, 0xE4,
-/*0A30*/0xF5, 0xFD, 0x75, 0xFE, 0x30, 0xF5, 0xFF, 0xE5,
-        0xE7, 0x20, 0xE7, 0x03, 0x43, 0xF9, 0x08, 0xE5,
-/*0A40*/0xE6, 0x20, 0xE7, 0x0B, 0x78, 0xFF, 0xE4, 0xF6,
-        0xD8, 0xFD, 0x53, 0xE6, 0xFE, 0x80, 0x09, 0x78,
-/*0A50*/0x08, 0xE4, 0xF6, 0xD8, 0xFD, 0x53, 0xE6, 0xFE,
-        0x75, 0x81, 0x80, 0xE4, 0xF5, 0xA8, 0xD2, 0xA8,
-/*0A60*/0xC2, 0xA9, 0xD2, 0xAF, 0xE5, 0xE2, 0x20, 0xE5,
-        0x05, 0x20, 0xE6, 0x02, 0x80, 0x03, 0x43, 0xE1,
-/*0A70*/0x02, 0xE5, 0xE2, 0x20, 0xE0, 0x0E, 0x90, 0x00,
-        0x00, 0x7F, 0x00, 0x7E, 0x08, 0xE4, 0xF0, 0xA3,
-/*0A80*/0xDF, 0xFC, 0xDE, 0xFA, 0x02, 0x0A, 0xDB, 0x43,
-        0xFA, 0x01, 0xC0, 0xE0, 0xC0, 0xF0, 0xC0, 0x83,
-/*0A90*/0xC0, 0x82, 0xC0, 0xD0, 0x12, 0x1C, 0xE7, 0xD0,
-        0xD0, 0xD0, 0x82, 0xD0, 0x83, 0xD0, 0xF0, 0xD0,
-/*0AA0*/0xE0, 0x53, 0xFA, 0xFE, 0x32, 0x02, 0x1B, 0x55,
-        0xE4, 0x93, 0xA3, 0xF8, 0xE4, 0x93, 0xA3, 0xF6,
-/*0AB0*/0x08, 0xDF, 0xF9, 0x80, 0x29, 0xE4, 0x93, 0xA3,
-        0xF8, 0x54, 0x07, 0x24, 0x0C, 0xC8, 0xC3, 0x33,
-/*0AC0*/0xC4, 0x54, 0x0F, 0x44, 0x20, 0xC8, 0x83, 0x40,
-        0x04, 0xF4, 0x56, 0x80, 0x01, 0x46, 0xF6, 0xDF,
-/*0AD0*/0xE4, 0x80, 0x0B, 0x01, 0x02, 0x04, 0x08, 0x10,
-        0x20, 0x40, 0x80, 0x90, 0x00, 0x3F, 0xE4, 0x7E,
-/*0AE0*/0x01, 0x93, 0x60, 0xC1, 0xA3, 0xFF, 0x54, 0x3F,
-        0x30, 0xE5, 0x09, 0x54, 0x1F, 0xFE, 0xE4, 0x93,
-/*0AF0*/0xA3, 0x60, 0x01, 0x0E, 0xCF, 0x54, 0xC0, 0x25,
-        0xE0, 0x60, 0xAD, 0x40, 0xB8, 0x80, 0xFE, 0x8C,
-/*0B00*/0x64, 0x8D, 0x65, 0x8A, 0x66, 0x8B, 0x67, 0xE4,
-        0xF5, 0x69, 0xEF, 0x4E, 0x70, 0x03, 0x02, 0x1D,
-/*0B10*/0x55, 0xE4, 0xF5, 0x68, 0xE5, 0x67, 0x45, 0x66,
-        0x70, 0x32, 0x12, 0x07, 0x2A, 0x75, 0x83, 0x90,
-/*0B20*/0xE4, 0x12, 0x07, 0x29, 0x75, 0x83, 0xC2, 0xE4,
-        0x12, 0x07, 0x29, 0x75, 0x83, 0xC4, 0xE4, 0x12,
-/*0B30*/0x08, 0x70, 0x70, 0x29, 0x12, 0x07, 0x2A, 0x75,
-        0x83, 0x92, 0xE4, 0x12, 0x07, 0x29, 0x75, 0x83,
-/*0B40*/0xC6, 0xE4, 0x12, 0x07, 0x29, 0x75, 0x83, 0xC8,
-        0xE4, 0xF0, 0x80, 0x11, 0x90, 0x07, 0x26, 0x12,
-/*0B50*/0x07, 0x35, 0xE4, 0x12, 0x08, 0x70, 0x70, 0x05,
-        0x12, 0x07, 0x32, 0xE4, 0xF0, 0x12, 0x1D, 0x55,
-/*0B60*/0x12, 0x1E, 0xBF, 0xE5, 0x67, 0x45, 0x66, 0x70,
-        0x33, 0x12, 0x07, 0x2A, 0x75, 0x83, 0x90, 0xE5,
-/*0B70*/0x41, 0x12, 0x07, 0x29, 0x75, 0x83, 0xC2, 0xE5,
-        0x41, 0x12, 0x07, 0x29, 0x75, 0x83, 0xC4, 0x12,
-/*0B80*/0x08, 0x6E, 0x70, 0x29, 0x12, 0x07, 0x2A, 0x75,
-        0x83, 0x92, 0xE5, 0x40, 0x12, 0x07, 0x29, 0x75,
-/*0B90*/0x83, 0xC6, 0xE5, 0x40, 0x12, 0x07, 0x29, 0x75,
-        0x83, 0xC8, 0x80, 0x0E, 0x90, 0x07, 0x26, 0x12,
-/*0BA0*/0x07, 0x35, 0x12, 0x08, 0x6E, 0x70, 0x06, 0x12,
-        0x07, 0x32, 0xE5, 0x40, 0xF0, 0xAF, 0x69, 0x7E,
-/*0BB0*/0x00, 0xAD, 0x67, 0xAC, 0x66, 0x12, 0x04, 0x44,
-        0x12, 0x07, 0x2A, 0x75, 0x83, 0xCA, 0xE0, 0xD3,
-/*0BC0*/0x94, 0x00, 0x50, 0x0C, 0x05, 0x68, 0xE5, 0x68,
-        0xC3, 0x94, 0x05, 0x50, 0x03, 0x02, 0x0B, 0x14,
-/*0BD0*/0x22, 0x8C, 0x60, 0x8D, 0x61, 0x12, 0x08, 0xDA,
-        0x74, 0x20, 0x40, 0x0D, 0x2F, 0xF5, 0x82, 0x74,
-/*0BE0*/0x03, 0x3E, 0xF5, 0x83, 0xE5, 0x3E, 0xF0, 0x80,
-        0x0B, 0x2F, 0xF5, 0x82, 0x74, 0x03, 0x3E, 0xF5,
-/*0BF0*/0x83, 0xE5, 0x3C, 0xF0, 0xE5, 0x3C, 0xD3, 0x95,
-        0x3E, 0x40, 0x3C, 0xE5, 0x61, 0x45, 0x60, 0x70,
-/*0C00*/0x10, 0xE9, 0x12, 0x09, 0x04, 0xE5, 0x3E, 0x12,
-        0x07, 0x68, 0x40, 0x3B, 0x12, 0x08, 0x95, 0x80,
-/*0C10*/0x18, 0xE5, 0x3E, 0xC3, 0x95, 0x38, 0x40, 0x1D,
-        0x85, 0x3E, 0x38, 0xE5, 0x3E, 0x60, 0x05, 0x85,
-/*0C20*/0x3F, 0x39, 0x80, 0x03, 0x85, 0x39, 0x39, 0x8F,
-        0x3A, 0x12, 0x08, 0x14, 0xE5, 0x3E, 0x12, 0x07,
-/*0C30*/0xC0, 0xE5, 0x3F, 0xF0, 0x22, 0x80, 0x43, 0xE5,
-        0x61, 0x45, 0x60, 0x70, 0x19, 0x12, 0x07, 0x5F,
-/*0C40*/0x40, 0x05, 0x12, 0x08, 0x9E, 0x80, 0x27, 0x12,
-        0x09, 0x0B, 0x12, 0x08, 0x14, 0xE5, 0x42, 0x12,
-/*0C50*/0x07, 0xC0, 0xE5, 0x41, 0xF0, 0x22, 0xE5, 0x3C,
-        0xC3, 0x95, 0x38, 0x40, 0x1D, 0x85, 0x3C, 0x38,
-/*0C60*/0xE5, 0x3C, 0x60, 0x05, 0x85, 0x3D, 0x39, 0x80,
-        0x03, 0x85, 0x39, 0x39, 0x8F, 0x3A, 0x12, 0x08,
-/*0C70*/0x14, 0xE5, 0x3C, 0x12, 0x07, 0xC0, 0xE5, 0x3D,
-        0xF0, 0x22, 0x85, 0x38, 0x38, 0x85, 0x39, 0x39,
-/*0C80*/0x85, 0x3A, 0x3A, 0x12, 0x08, 0x14, 0xE5, 0x38,
-        0x12, 0x07, 0xC0, 0xE5, 0x39, 0xF0, 0x22, 0x7F,
-/*0C90*/0x06, 0x12, 0x17, 0x31, 0x12, 0x1D, 0x23, 0x12,
-        0x0E, 0x04, 0x12, 0x0E, 0x33, 0xE0, 0x44, 0x0A,
-/*0CA0*/0xF0, 0x74, 0x8E, 0xFE, 0x12, 0x0E, 0x04, 0x12,
-        0x0E, 0x0B, 0xEF, 0xF0, 0xE5, 0x28, 0x30, 0xE5,
-/*0CB0*/0x03, 0xD3, 0x80, 0x01, 0xC3, 0x40, 0x05, 0x75,
-        0x14, 0x20, 0x80, 0x03, 0x75, 0x14, 0x08, 0x12,
-/*0CC0*/0x0E, 0x04, 0x75, 0x83, 0x8A, 0xE5, 0x14, 0xF0,
-        0xB4, 0xFF, 0x05, 0x75, 0x12, 0x80, 0x80, 0x06,
-/*0CD0*/0xE5, 0x14, 0xC3, 0x13, 0xF5, 0x12, 0xE4, 0xF5,
-        0x16, 0xF5, 0x7F, 0x12, 0x19, 0x36, 0x12, 0x13,
-/*0CE0*/0xA3, 0xE5, 0x0A, 0xC3, 0x94, 0x01, 0x50, 0x09,
-        0x05, 0x16, 0xE5, 0x16, 0xC3, 0x94, 0x14, 0x40,
-/*0CF0*/0xEA, 0xE5, 0xE4, 0x20, 0xE7, 0x28, 0x12, 0x0E,
-        0x04, 0x75, 0x83, 0xD2, 0xE0, 0x54, 0x08, 0xD3,
-/*0D00*/0x94, 0x00, 0x40, 0x04, 0x7F, 0x01, 0x80, 0x02,
-        0x7F, 0x00, 0xE5, 0x0A, 0xC3, 0x94, 0x01, 0x40,
-/*0D10*/0x04, 0x7E, 0x01, 0x80, 0x02, 0x7E, 0x00, 0xEF,
-        0x5E, 0x60, 0x03, 0x12, 0x1D, 0xD7, 0xE5, 0x7F,
-/*0D20*/0xC3, 0x94, 0x11, 0x40, 0x14, 0x12, 0x0E, 0x04,
-        0x75, 0x83, 0xD2, 0xE0, 0x44, 0x80, 0xF0, 0xE5,
-/*0D30*/0xE4, 0x20, 0xE7, 0x0F, 0x12, 0x1D, 0xD7, 0x80,
-        0x0A, 0x12, 0x0E, 0x04, 0x75, 0x83, 0xD2, 0xE0,
-/*0D40*/0x54, 0x7F, 0xF0, 0x12, 0x1D, 0x23, 0x22, 0x74,
-        0x8A, 0x85, 0x08, 0x82, 0xF5, 0x83, 0xE5, 0x17,
-/*0D50*/0xF0, 0x12, 0x0E, 0x3A, 0xE4, 0xF0, 0x90, 0x07,
-        0x02, 0xE0, 0x12, 0x0E, 0x17, 0x75, 0x83, 0x90,
-/*0D60*/0xEF, 0xF0, 0x74, 0x92, 0xFE, 0xE5, 0x08, 0x44,
-        0x07, 0xFF, 0xF5, 0x82, 0x8E, 0x83, 0xE0, 0x54,
-/*0D70*/0xC0, 0xFD, 0x90, 0x07, 0x03, 0xE0, 0x54, 0x3F,
-        0x4D, 0x8F, 0x82, 0x8E, 0x83, 0xF0, 0x90, 0x07,
-/*0D80*/0x04, 0xE0, 0x12, 0x0E, 0x17, 0x75, 0x83, 0x82,
-        0xEF, 0xF0, 0x90, 0x07, 0x05, 0xE0, 0xFF, 0xED,
-/*0D90*/0x44, 0x07, 0xF5, 0x82, 0x75, 0x83, 0xB4, 0xEF,
-        0x12, 0x0E, 0x03, 0x75, 0x83, 0x80, 0xE0, 0x54,
-/*0DA0*/0xBF, 0xF0, 0x30, 0x37, 0x0A, 0x12, 0x0E, 0x91,
-        0x75, 0x83, 0x94, 0xE0, 0x44, 0x80, 0xF0, 0x30,
-/*0DB0*/0x38, 0x0A, 0x12, 0x0E, 0x91, 0x75, 0x83, 0x92,
-        0xE0, 0x44, 0x80, 0xF0, 0xE5, 0x28, 0x30, 0xE4,
-/*0DC0*/0x1A, 0x20, 0x39, 0x0A, 0x12, 0x0E, 0x04, 0x75,
-        0x83, 0x88, 0xE0, 0x54, 0x7F, 0xF0, 0x20, 0x3A,
-/*0DD0*/0x0A, 0x12, 0x0E, 0x04, 0x75, 0x83, 0x88, 0xE0,
-        0x54, 0xBF, 0xF0, 0x74, 0x8C, 0xFE, 0x12, 0x0E,
-/*0DE0*/0x04, 0x8E, 0x83, 0xE0, 0x54, 0x0F, 0x12, 0x0E,
-        0x03, 0x75, 0x83, 0x86, 0xE0, 0x54, 0xBF, 0xF0,
-/*0DF0*/0xE5, 0x08, 0x44, 0x06, 0x12, 0x0D, 0xFD, 0x75,
-        0x83, 0x8A, 0xE4, 0xF0, 0x22, 0xF5, 0x82, 0x75,
-/*0E00*/0x83, 0x82, 0xE4, 0xF0, 0xE5, 0x08, 0x44, 0x07,
-        0xF5, 0x82, 0x22, 0x8E, 0x83, 0xE0, 0xF5, 0x10,
-/*0E10*/0x54, 0xFE, 0xF0, 0xE5, 0x10, 0x44, 0x01, 0xFF,
-        0xE5, 0x08, 0xFD, 0xED, 0x44, 0x07, 0xF5, 0x82,
-/*0E20*/0x22, 0xE5, 0x15, 0xC4, 0x54, 0x07, 0xFF, 0xE5,
-        0x08, 0xFD, 0xED, 0x44, 0x08, 0xF5, 0x82, 0x75,
-/*0E30*/0x83, 0x82, 0x22, 0x75, 0x83, 0x80, 0xE0, 0x44,
-        0x40, 0xF0, 0xE5, 0x08, 0x44, 0x08, 0xF5, 0x82,
-/*0E40*/0x75, 0x83, 0x8A, 0x22, 0xE5, 0x16, 0x25, 0xE0,
-        0x25, 0xE0, 0x24, 0xAF, 0xF5, 0x82, 0xE4, 0x34,
-/*0E50*/0x1A, 0xF5, 0x83, 0xE4, 0x93, 0xF5, 0x0D, 0x22,
-        0x43, 0xE1, 0x10, 0x43, 0xE1, 0x80, 0x53, 0xE1,
-/*0E60*/0xFD, 0x85, 0xE1, 0x10, 0x22, 0xE5, 0x16, 0x25,
-        0xE0, 0x25, 0xE0, 0x24, 0xB2, 0xF5, 0x82, 0xE4,
-/*0E70*/0x34, 0x1A, 0xF5, 0x83, 0xE4, 0x93, 0x22, 0x85,
-        0x55, 0x82, 0x85, 0x54, 0x83, 0xE5, 0x15, 0xF0,
-/*0E80*/0x22, 0xE5, 0xE2, 0x54, 0x20, 0xD3, 0x94, 0x00,
-        0x22, 0xE5, 0xE2, 0x54, 0x40, 0xD3, 0x94, 0x00,
-/*0E90*/0x22, 0xE5, 0x08, 0x44, 0x06, 0xF5, 0x82, 0x22,
-        0xFD, 0xE5, 0x08, 0xFB, 0xEB, 0x44, 0x07, 0xF5,
-/*0EA0*/0x82, 0x22, 0x53, 0xF9, 0xF7, 0x75, 0xFE, 0x30,
-        0x22, 0xEF, 0x4E, 0x70, 0x26, 0x12, 0x07, 0xCC,
-/*0EB0*/0xE0, 0xFD, 0x90, 0x07, 0x26, 0x12, 0x07, 0x7B,
-        0x12, 0x07, 0xD8, 0xE0, 0xFD, 0x90, 0x07, 0x28,
-/*0EC0*/0x12, 0x07, 0x7B, 0x12, 0x08, 0x81, 0x12, 0x07,
-        0x72, 0x12, 0x08, 0x35, 0xE0, 0x90, 0x07, 0x24,
-/*0ED0*/0x12, 0x07, 0x78, 0xEF, 0x64, 0x04, 0x4E, 0x70,
-        0x29, 0x12, 0x07, 0xE4, 0xE0, 0xFD, 0x90, 0x07,
-/*0EE0*/0x26, 0x12, 0x07, 0x7B, 0x12, 0x07, 0xF0, 0xE0,
-        0xFD, 0x90, 0x07, 0x28, 0x12, 0x07, 0x7B, 0x12,
-/*0EF0*/0x08, 0x8B, 0x12, 0x07, 0x72, 0x12, 0x08, 0x41,
-        0xE0, 0x54, 0x1F, 0xFD, 0x90, 0x07, 0x24, 0x12,
-/*0F00*/0x07, 0x7B, 0xEF, 0x64, 0x01, 0x4E, 0x70, 0x04,
-        0x7D, 0x01, 0x80, 0x02, 0x7D, 0x00, 0xEF, 0x64,
-/*0F10*/0x02, 0x4E, 0x70, 0x04, 0x7F, 0x01, 0x80, 0x02,
-        0x7F, 0x00, 0xEF, 0x4D, 0x60, 0x35, 0x12, 0x07,
-/*0F20*/0xFC, 0xE0, 0xFF, 0x90, 0x07, 0x26, 0x12, 0x07,
-        0x89, 0xEF, 0xF0, 0x12, 0x08, 0x08, 0xE0, 0xFF,
-/*0F30*/0x90, 0x07, 0x28, 0x12, 0x07, 0x89, 0xEF, 0xF0,
-        0x12, 0x08, 0x4D, 0xE0, 0x54, 0x1F, 0xFF, 0x12,
-/*0F40*/0x07, 0x86, 0xEF, 0xF0, 0x12, 0x08, 0x59, 0xE0,
-        0x54, 0x1F, 0xFF, 0x90, 0x07, 0x24, 0x12, 0x07,
-/*0F50*/0x89, 0xEF, 0xF0, 0x22, 0xE4, 0xF5, 0x53, 0x12,
-        0x0E, 0x81, 0x40, 0x04, 0x7F, 0x01, 0x80, 0x02,
-/*0F60*/0x7F, 0x00, 0x12, 0x0E, 0x89, 0x40, 0x04, 0x7E,
-        0x01, 0x80, 0x02, 0x7E, 0x00, 0xEE, 0x4F, 0x70,
-/*0F70*/0x03, 0x02, 0x0F, 0xF6, 0x85, 0xE1, 0x10, 0x43,
-        0xE1, 0x02, 0x53, 0xE1, 0x0F, 0x85, 0xE1, 0x10,
-/*0F80*/0xE4, 0xF5, 0x51, 0xE5, 0xE3, 0x54, 0x3F, 0xF5,
-        0x52, 0x12, 0x0E, 0x89, 0x40, 0x1D, 0xAD, 0x52,
-/*0F90*/0xAF, 0x51, 0x12, 0x11, 0x18, 0xEF, 0x60, 0x08,
-        0x85, 0xE1, 0x10, 0x43, 0xE1, 0x40, 0x80, 0x0B,
-/*0FA0*/0x53, 0xE1, 0xBF, 0x12, 0x0E, 0x58, 0x12, 0x00,
-        0x06, 0x80, 0xFB, 0xE5, 0xE3, 0x54, 0x3F, 0xF5,
-/*0FB0*/0x51, 0xE5, 0xE4, 0x54, 0x3F, 0xF5, 0x52, 0x12,
-        0x0E, 0x81, 0x40, 0x1D, 0xAD, 0x52, 0xAF, 0x51,
-/*0FC0*/0x12, 0x11, 0x18, 0xEF, 0x60, 0x08, 0x85, 0xE1,
-        0x10, 0x43, 0xE1, 0x20, 0x80, 0x0B, 0x53, 0xE1,
-/*0FD0*/0xDF, 0x12, 0x0E, 0x58, 0x12, 0x00, 0x06, 0x80,
-        0xFB, 0x12, 0x0E, 0x81, 0x40, 0x04, 0x7F, 0x01,
-/*0FE0*/0x80, 0x02, 0x7F, 0x00, 0x12, 0x0E, 0x89, 0x40,
-        0x04, 0x7E, 0x01, 0x80, 0x02, 0x7E, 0x00, 0xEE,
-/*0FF0*/0x4F, 0x60, 0x03, 0x12, 0x0E, 0x5B, 0x22, 0x12,
-        0x0E, 0x21, 0xEF, 0xF0, 0x12, 0x10, 0x91, 0x22,
-/*1000*/0x02, 0x11, 0x00, 0x02, 0x10, 0x40, 0x02, 0x10,
-        0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/*1010*/0x01, 0x20, 0x01, 0x20, 0xE4, 0xF5, 0x57, 0x12,
-        0x16, 0xBD, 0x12, 0x16, 0x44, 0xE4, 0x12, 0x10,
-/*1020*/0x56, 0x12, 0x14, 0xB7, 0x90, 0x07, 0x26, 0x12,
-        0x07, 0x35, 0xE4, 0x12, 0x07, 0x31, 0xE4, 0xF0,
-/*1030*/0x12, 0x10, 0x56, 0x12, 0x14, 0xB7, 0x90, 0x07,
-        0x26, 0x12, 0x07, 0x35, 0xE5, 0x41, 0x12, 0x07,
-/*1040*/0x31, 0xE5, 0x40, 0xF0, 0xAF, 0x57, 0x7E, 0x00,
-        0xAD, 0x56, 0x7C, 0x00, 0x12, 0x04, 0x44, 0xAF,
-/*1050*/0x56, 0x7E, 0x00, 0x02, 0x11, 0xEE, 0xFF, 0x90,
-        0x07, 0x20, 0xA3, 0xE0, 0xFD, 0xE4, 0xF5, 0x56,
-/*1060*/0xF5, 0x40, 0xFE, 0xFC, 0xAB, 0x56, 0xFA, 0x12,
-        0x11, 0x51, 0x7F, 0x0F, 0x7D, 0x18, 0xE4, 0xF5,
-/*1070*/0x56, 0xF5, 0x40, 0xFE, 0xFC, 0xAB, 0x56, 0xFA,
-        0x12, 0x15, 0x41, 0xAF, 0x56, 0x7E, 0x00, 0x12,
-/*1080*/0x1A, 0xFF, 0xE4, 0xFF, 0xF5, 0x56, 0x7D, 0x1F,
-        0xF5, 0x40, 0xFE, 0xFC, 0xAB, 0x56, 0xFA, 0x22,
-/*1090*/0x22, 0xE4, 0xF5, 0x55, 0xE5, 0x08, 0xFD, 0x74,
-        0xA0, 0xF5, 0x56, 0xED, 0x44, 0x07, 0xF5, 0x57,
-/*10A0*/0xE5, 0x28, 0x30, 0xE5, 0x03, 0xD3, 0x80, 0x01,
-        0xC3, 0x40, 0x05, 0x7F, 0x28, 0xEF, 0x80, 0x04,
-/*10B0*/0x7F, 0x14, 0xEF, 0xC3, 0x13, 0xF5, 0x54, 0xE4,
-        0xF9, 0x12, 0x0E, 0x18, 0x75, 0x83, 0x8E, 0xE0,
-/*10C0*/0xF5, 0x10, 0xCE, 0xEF, 0xCE, 0xEE, 0xD3, 0x94,
-        0x00, 0x40, 0x26, 0xE5, 0x10, 0x54, 0xFE, 0x12,
-/*10D0*/0x0E, 0x98, 0x75, 0x83, 0x8E, 0xED, 0xF0, 0xE5,
-        0x10, 0x44, 0x01, 0xFD, 0xEB, 0x44, 0x07, 0xF5,
-/*10E0*/0x82, 0xED, 0xF0, 0x85, 0x57, 0x82, 0x85, 0x56,
-        0x83, 0xE0, 0x30, 0xE3, 0x01, 0x09, 0x1E, 0x80,
-/*10F0*/0xD4, 0xC2, 0x34, 0xE9, 0xC3, 0x95, 0x54, 0x40,
-        0x02, 0xD2, 0x34, 0x22, 0x02, 0x00, 0x06, 0x22,
-/*1100*/0x30, 0x30, 0x11, 0x90, 0x10, 0x00, 0xE4, 0x93,
-        0xF5, 0x10, 0x90, 0x10, 0x10, 0xE4, 0x93, 0xF5,
-/*1110*/0x10, 0x12, 0x10, 0x90, 0x12, 0x11, 0x50, 0x22,
-        0xE4, 0xFC, 0xC3, 0xED, 0x9F, 0xFA, 0xEF, 0xF5,
-/*1120*/0x83, 0x75, 0x82, 0x00, 0x79, 0xFF, 0xE4, 0x93,
-        0xCC, 0x6C, 0xCC, 0xA3, 0xD9, 0xF8, 0xDA, 0xF6,
-/*1130*/0xE5, 0xE2, 0x30, 0xE4, 0x02, 0x8C, 0xE5, 0xED,
-        0x24, 0xFF, 0xFF, 0xEF, 0x75, 0x82, 0xFF, 0xF5,
-/*1140*/0x83, 0xE4, 0x93, 0x6C, 0x70, 0x03, 0x7F, 0x01,
-        0x22, 0x7F, 0x00, 0x22, 0x22, 0x11, 0x00, 0x00,
-/*1150*/0x22, 0x8E, 0x58, 0x8F, 0x59, 0x8C, 0x5A, 0x8D,
-        0x5B, 0x8A, 0x5C, 0x8B, 0x5D, 0x75, 0x5E, 0x01,
-/*1160*/0xE4, 0xF5, 0x5F, 0xF5, 0x60, 0xF5, 0x62, 0x12,
-        0x07, 0x2A, 0x75, 0x83, 0xD0, 0xE0, 0xFF, 0xC4,
-/*1170*/0x54, 0x0F, 0xF5, 0x61, 0x12, 0x1E, 0xA5, 0x85,
-        0x59, 0x5E, 0xD3, 0xE5, 0x5E, 0x95, 0x5B, 0xE5,
-/*1180*/0x5A, 0x12, 0x07, 0x6B, 0x50, 0x4B, 0x12, 0x07,
-        0x03, 0x75, 0x83, 0xBC, 0xE0, 0x45, 0x5E, 0x12,
-/*1190*/0x07, 0x29, 0x75, 0x83, 0xBE, 0xE0, 0x45, 0x5E,
-        0x12, 0x07, 0x29, 0x75, 0x83, 0xC0, 0xE0, 0x45,
-/*11A0*/0x5E, 0xF0, 0xAF, 0x5F, 0xE5, 0x60, 0x12, 0x08,
-        0x78, 0x12, 0x0A, 0xFF, 0xAF, 0x62, 0x7E, 0x00,
-/*11B0*/0xAD, 0x5D, 0xAC, 0x5C, 0x12, 0x04, 0x44, 0xE5,
-        0x61, 0xAF, 0x5E, 0x7E, 0x00, 0xB4, 0x03, 0x05,
-/*11C0*/0x12, 0x1E, 0x21, 0x80, 0x07, 0xAD, 0x5D, 0xAC,
-        0x5C, 0x12, 0x13, 0x17, 0x05, 0x5E, 0x02, 0x11,
-/*11D0*/0x7A, 0x12, 0x07, 0x03, 0x75, 0x83, 0xBC, 0xE0,
-        0x45, 0x40, 0x12, 0x07, 0x29, 0x75, 0x83, 0xBE,
-/*11E0*/0xE0, 0x45, 0x40, 0x12, 0x07, 0x29, 0x75, 0x83,
-        0xC0, 0xE0, 0x45, 0x40, 0xF0, 0x22, 0x8E, 0x58,
-/*11F0*/0x8F, 0x59, 0x75, 0x5A, 0x01, 0x79, 0x01, 0x75,
-        0x5B, 0x01, 0xE4, 0xFB, 0x12, 0x07, 0x2A, 0x75,
-/*1200*/0x83, 0xAE, 0xE0, 0x54, 0x1A, 0xFF, 0x12, 0x08,
-        0x65, 0xE0, 0xC4, 0x13, 0x54, 0x07, 0xFE, 0xEF,
-/*1210*/0x70, 0x0C, 0xEE, 0x65, 0x35, 0x70, 0x07, 0x90,
-        0x07, 0x2F, 0xE0, 0xB4, 0x01, 0x0D, 0xAF, 0x35,
-/*1220*/0x7E, 0x00, 0x12, 0x0E, 0xA9, 0xCF, 0xEB, 0xCF,
-        0x02, 0x1E, 0x60, 0xE5, 0x59, 0x64, 0x02, 0x45,
-/*1230*/0x58, 0x70, 0x04, 0x7F, 0x01, 0x80, 0x02, 0x7F,
-        0x00, 0xE5, 0x59, 0x45, 0x58, 0x70, 0x04, 0x7E,
-/*1240*/0x01, 0x80, 0x02, 0x7E, 0x00, 0xEE, 0x4F, 0x60,
-        0x23, 0x85, 0x41, 0x49, 0x85, 0x40, 0x4B, 0xE5,
-/*1250*/0x59, 0x45, 0x58, 0x70, 0x2C, 0xAF, 0x5A, 0xFE,
-        0xCD, 0xE9, 0xCD, 0xFC, 0xAB, 0x59, 0xAA, 0x58,
-/*1260*/0x12, 0x0A, 0xFF, 0xAF, 0x5B, 0x7E, 0x00, 0x12,
-        0x1E, 0x60, 0x80, 0x15, 0xAF, 0x5B, 0x7E, 0x00,
-/*1270*/0x12, 0x1E, 0x60, 0x90, 0x07, 0x26, 0x12, 0x07,
-        0x35, 0xE5, 0x49, 0x12, 0x07, 0x31, 0xE5, 0x4B,
-/*1280*/0xF0, 0xE4, 0xFD, 0xAF, 0x35, 0xFE, 0xFC, 0x12,
-        0x09, 0x15, 0x22, 0x8C, 0x64, 0x8D, 0x65, 0x12,
-/*1290*/0x08, 0xDA, 0x40, 0x3C, 0xE5, 0x65, 0x45, 0x64,
-        0x70, 0x10, 0x12, 0x09, 0x04, 0xC3, 0xE5, 0x3E,
-/*12A0*/0x12, 0x07, 0x69, 0x40, 0x3B, 0x12, 0x08, 0x95,
-        0x80, 0x18, 0xE5, 0x3E, 0xC3, 0x95, 0x38, 0x40,
-/*12B0*/0x1D, 0x85, 0x3E, 0x38, 0xE5, 0x3E, 0x60, 0x05,
-        0x85, 0x3F, 0x39, 0x80, 0x03, 0x85, 0x39, 0x39,
-/*12C0*/0x8F, 0x3A, 0x12, 0x07, 0xA8, 0xE5, 0x3E, 0x12,
-        0x07, 0x53, 0xE5, 0x3F, 0xF0, 0x22, 0x80, 0x3B,
-/*12D0*/0xE5, 0x65, 0x45, 0x64, 0x70, 0x11, 0x12, 0x07,
-        0x5F, 0x40, 0x05, 0x12, 0x08, 0x9E, 0x80, 0x1F,
-/*12E0*/0x12, 0x07, 0x3E, 0xE5, 0x41, 0xF0, 0x22, 0xE5,
-        0x3C, 0xC3, 0x95, 0x38, 0x40, 0x1D, 0x85, 0x3C,
-/*12F0*/0x38, 0xE5, 0x3C, 0x60, 0x05, 0x85, 0x3D, 0x39,
-        0x80, 0x03, 0x85, 0x39, 0x39, 0x8F, 0x3A, 0x12,
-/*1300*/0x07, 0xA8, 0xE5, 0x3C, 0x12, 0x07, 0x53, 0xE5,
-        0x3D, 0xF0, 0x22, 0x12, 0x07, 0x9F, 0xE5, 0x38,
-/*1310*/0x12, 0x07, 0x53, 0xE5, 0x39, 0xF0, 0x22, 0x8C,
-        0x63, 0x8D, 0x64, 0x12, 0x08, 0xDA, 0x40, 0x3C,
-/*1320*/0xE5, 0x64, 0x45, 0x63, 0x70, 0x10, 0x12, 0x09,
-        0x04, 0xC3, 0xE5, 0x3E, 0x12, 0x07, 0x69, 0x40,
-/*1330*/0x3B, 0x12, 0x08, 0x95, 0x80, 0x18, 0xE5, 0x3E,
-        0xC3, 0x95, 0x38, 0x40, 0x1D, 0x85, 0x3E, 0x38,
-/*1340*/0xE5, 0x3E, 0x60, 0x05, 0x85, 0x3F, 0x39, 0x80,
-        0x03, 0x85, 0x39, 0x39, 0x8F, 0x3A, 0x12, 0x07,
-/*1350*/0xA8, 0xE5, 0x3E, 0x12, 0x07, 0x53, 0xE5, 0x3F,
-        0xF0, 0x22, 0x80, 0x3B, 0xE5, 0x64, 0x45, 0x63,
-/*1360*/0x70, 0x11, 0x12, 0x07, 0x5F, 0x40, 0x05, 0x12,
-        0x08, 0x9E, 0x80, 0x1F, 0x12, 0x07, 0x3E, 0xE5,
-/*1370*/0x41, 0xF0, 0x22, 0xE5, 0x3C, 0xC3, 0x95, 0x38,
-        0x40, 0x1D, 0x85, 0x3C, 0x38, 0xE5, 0x3C, 0x60,
-/*1380*/0x05, 0x85, 0x3D, 0x39, 0x80, 0x03, 0x85, 0x39,
-        0x39, 0x8F, 0x3A, 0x12, 0x07, 0xA8, 0xE5, 0x3C,
-/*1390*/0x12, 0x07, 0x53, 0xE5, 0x3D, 0xF0, 0x22, 0x12,
-        0x07, 0x9F, 0xE5, 0x38, 0x12, 0x07, 0x53, 0xE5,
-/*13A0*/0x39, 0xF0, 0x22, 0xE5, 0x0D, 0xFE, 0xE5, 0x08,
-        0x8E, 0x54, 0x44, 0x05, 0xF5, 0x55, 0x75, 0x15,
-/*13B0*/0x0F, 0xF5, 0x82, 0x12, 0x0E, 0x7A, 0x12, 0x17,
-        0xA3, 0x20, 0x31, 0x05, 0x75, 0x15, 0x03, 0x80,
-/*13C0*/0x03, 0x75, 0x15, 0x0B, 0xE5, 0x0A, 0xC3, 0x94,
-        0x01, 0x50, 0x38, 0x12, 0x14, 0x20, 0x20, 0x31,
-/*13D0*/0x06, 0x05, 0x15, 0x05, 0x15, 0x80, 0x04, 0x15,
-        0x15, 0x15, 0x15, 0xE5, 0x0A, 0xC3, 0x94, 0x01,
-/*13E0*/0x50, 0x21, 0x12, 0x14, 0x20, 0x20, 0x31, 0x04,
-        0x05, 0x15, 0x80, 0x02, 0x15, 0x15, 0xE5, 0x0A,
-/*13F0*/0xC3, 0x94, 0x01, 0x50, 0x0E, 0x12, 0x0E, 0x77,
-        0x12, 0x17, 0xA3, 0x20, 0x31, 0x05, 0x05, 0x15,
-/*1400*/0x12, 0x0E, 0x77, 0xE5, 0x15, 0xB4, 0x08, 0x04,
-        0x7F, 0x01, 0x80, 0x02, 0x7F, 0x00, 0xE5, 0x15,
-/*1410*/0xB4, 0x07, 0x04, 0x7E, 0x01, 0x80, 0x02, 0x7E,
-        0x00, 0xEE, 0x4F, 0x60, 0x02, 0x05, 0x7F, 0x22,
-/*1420*/0x85, 0x55, 0x82, 0x85, 0x54, 0x83, 0xE5, 0x15,
-        0xF0, 0x12, 0x17, 0xA3, 0x22, 0x12, 0x07, 0x2A,
-/*1430*/0x75, 0x83, 0xAE, 0x74, 0xFF, 0x12, 0x07, 0x29,
-        0xE0, 0x54, 0x1A, 0xF5, 0x34, 0xE0, 0xC4, 0x13,
-/*1440*/0x54, 0x07, 0xF5, 0x35, 0x24, 0xFE, 0x60, 0x24,
-        0x24, 0xFE, 0x60, 0x3C, 0x24, 0x04, 0x70, 0x63,
-/*1450*/0x75, 0x31, 0x2D, 0xE5, 0x08, 0xFD, 0x74, 0xB6,
-        0x12, 0x07, 0x92, 0x74, 0xBC, 0x90, 0x07, 0x22,
-/*1460*/0x12, 0x07, 0x95, 0x74, 0x90, 0x12, 0x07, 0xB3,
-        0x74, 0x92, 0x80, 0x3C, 0x75, 0x31, 0x3A, 0xE5,
-/*1470*/0x08, 0xFD, 0x74, 0xBA, 0x12, 0x07, 0x92, 0x74,
-        0xC0, 0x90, 0x07, 0x22, 0x12, 0x07, 0xB6, 0x74,
-/*1480*/0xC4, 0x12, 0x07, 0xB3, 0x74, 0xC8, 0x80, 0x20,
-        0x75, 0x31, 0x35, 0xE5, 0x08, 0xFD, 0x74, 0xB8,
-/*1490*/0x12, 0x07, 0x92, 0x74, 0xBE, 0xFF, 0xED, 0x44,
-        0x07, 0x90, 0x07, 0x22, 0xCF, 0xF0, 0xA3, 0xEF,
-/*14A0*/0xF0, 0x74, 0xC2, 0x12, 0x07, 0xB3, 0x74, 0xC6,
-        0xFF, 0xED, 0x44, 0x07, 0xA3, 0xCF, 0xF0, 0xA3,
-/*14B0*/0xEF, 0xF0, 0x22, 0x75, 0x34, 0x01, 0x22, 0x8E,
-        0x58, 0x8F, 0x59, 0x8C, 0x5A, 0x8D, 0x5B, 0x8A,
-/*14C0*/0x5C, 0x8B, 0x5D, 0x75, 0x5E, 0x01, 0xE4, 0xF5,
-        0x5F, 0x12, 0x1E, 0xA5, 0x85, 0x59, 0x5E, 0xD3,
-/*14D0*/0xE5, 0x5E, 0x95, 0x5B, 0xE5, 0x5A, 0x12, 0x07,
-        0x6B, 0x50, 0x57, 0xE5, 0x5D, 0x45, 0x5C, 0x70,
-/*14E0*/0x30, 0x12, 0x07, 0x2A, 0x75, 0x83, 0x92, 0xE5,
-        0x5E, 0x12, 0x07, 0x29, 0x75, 0x83, 0xC6, 0xE5,
-/*14F0*/0x5E, 0x12, 0x07, 0x29, 0x75, 0x83, 0xC8, 0xE5,
-        0x5E, 0x12, 0x07, 0x29, 0x75, 0x83, 0x90, 0xE5,
-/*1500*/0x5E, 0x12, 0x07, 0x29, 0x75, 0x83, 0xC2, 0xE5,
-        0x5E, 0x12, 0x07, 0x29, 0x75, 0x83, 0xC4, 0x80,
-/*1510*/0x03, 0x12, 0x07, 0x32, 0xE5, 0x5E, 0xF0, 0xAF,
-        0x5F, 0x7E, 0x00, 0xAD, 0x5D, 0xAC, 0x5C, 0x12,
-/*1520*/0x04, 0x44, 0xAF, 0x5E, 0x7E, 0x00, 0xAD, 0x5D,
-        0xAC, 0x5C, 0x12, 0x0B, 0xD1, 0x05, 0x5E, 0x02,
-/*1530*/0x14, 0xCF, 0xAB, 0x5D, 0xAA, 0x5C, 0xAD, 0x5B,
-        0xAC, 0x5A, 0xAF, 0x59, 0xAE, 0x58, 0x02, 0x1B,
-/*1540*/0xFB, 0x8C, 0x5C, 0x8D, 0x5D, 0x8A, 0x5E, 0x8B,
-        0x5F, 0x75, 0x60, 0x01, 0xE4, 0xF5, 0x61, 0xF5,
-/*1550*/0x62, 0xF5, 0x63, 0x12, 0x1E, 0xA5, 0x8F, 0x60,
-        0xD3, 0xE5, 0x60, 0x95, 0x5D, 0xE5, 0x5C, 0x12,
-/*1560*/0x07, 0x6B, 0x50, 0x61, 0xE5, 0x5F, 0x45, 0x5E,
-        0x70, 0x27, 0x12, 0x07, 0x2A, 0x75, 0x83, 0xB6,
-/*1570*/0xE5, 0x60, 0x12, 0x07, 0x29, 0x75, 0x83, 0xB8,
-        0xE5, 0x60, 0x12, 0x07, 0x29, 0x75, 0x83, 0xBA,
-/*1580*/0xE5, 0x60, 0xF0, 0xAF, 0x61, 0x7E, 0x00, 0xE5,
-        0x62, 0x12, 0x08, 0x7A, 0x12, 0x0A, 0xFF, 0x80,
-/*1590*/0x19, 0x90, 0x07, 0x24, 0x12, 0x07, 0x35, 0xE5,
-        0x60, 0x12, 0x07, 0x29, 0x75, 0x83, 0x8E, 0xE4,
-/*15A0*/0x12, 0x07, 0x29, 0x74, 0x01, 0x12, 0x07, 0x29,
-        0xE4, 0xF0, 0xAF, 0x63, 0x7E, 0x00, 0xAD, 0x5F,
-/*15B0*/0xAC, 0x5E, 0x12, 0x04, 0x44, 0xAF, 0x60, 0x7E,
-        0x00, 0xAD, 0x5F, 0xAC, 0x5E, 0x12, 0x12, 0x8B,
-/*15C0*/0x05, 0x60, 0x02, 0x15, 0x58, 0x22, 0x90, 0x11,
-        0x4D, 0xE4, 0x93, 0x90, 0x07, 0x2E, 0xF0, 0x12,
-/*15D0*/0x08, 0x1F, 0x75, 0x83, 0xAE, 0xE0, 0x54, 0x1A,
-        0xF5, 0x34, 0x70, 0x67, 0xEF, 0x44, 0x07, 0xF5,
-/*15E0*/0x82, 0x75, 0x83, 0xCE, 0xE0, 0xFF, 0x13, 0x13,
-        0x13, 0x54, 0x07, 0xF5, 0x36, 0x54, 0x0F, 0xD3,
-/*15F0*/0x94, 0x00, 0x40, 0x06, 0x12, 0x14, 0x2D, 0x12,
-        0x1B, 0xA9, 0xE5, 0x36, 0x54, 0x0F, 0x24, 0xFE,
-/*1600*/0x60, 0x0C, 0x14, 0x60, 0x0C, 0x14, 0x60, 0x19,
-        0x24, 0x03, 0x70, 0x37, 0x80, 0x10, 0x02, 0x1E,
-/*1610*/0x91, 0x12, 0x1E, 0x91, 0x12, 0x07, 0x2A, 0x75,
-        0x83, 0xCE, 0xE0, 0x54, 0xEF, 0xF0, 0x02, 0x1D,
-/*1620*/0xAE, 0x12, 0x10, 0x14, 0xE4, 0xF5, 0x55, 0x12,
-        0x1D, 0x85, 0x05, 0x55, 0xE5, 0x55, 0xC3, 0x94,
-/*1630*/0x05, 0x40, 0xF4, 0x12, 0x07, 0x2A, 0x75, 0x83,
-        0xCE, 0xE0, 0x54, 0xC7, 0x12, 0x07, 0x29, 0xE0,
-/*1640*/0x44, 0x08, 0xF0, 0x22, 0xE4, 0xF5, 0x58, 0xF5,
-        0x59, 0xAF, 0x08, 0xEF, 0x44, 0x07, 0xF5, 0x82,
-/*1650*/0x75, 0x83, 0xD0, 0xE0, 0xFD, 0xC4, 0x54, 0x0F,
-        0xF5, 0x5A, 0xEF, 0x44, 0x07, 0xF5, 0x82, 0x75,
-/*1660*/0x83, 0x80, 0x74, 0x01, 0xF0, 0x12, 0x08, 0x21,
-        0x75, 0x83, 0x82, 0xE5, 0x45, 0xF0, 0xEF, 0x44,
-/*1670*/0x07, 0xF5, 0x82, 0x75, 0x83, 0x8A, 0x74, 0xFF,
-        0xF0, 0x12, 0x1A, 0x4D, 0x12, 0x07, 0x2A, 0x75,
-/*1680*/0x83, 0xBC, 0xE0, 0x54, 0xEF, 0x12, 0x07, 0x29,
-        0x75, 0x83, 0xBE, 0xE0, 0x54, 0xEF, 0x12, 0x07,
-/*1690*/0x29, 0x75, 0x83, 0xC0, 0xE0, 0x54, 0xEF, 0x12,
-        0x07, 0x29, 0x75, 0x83, 0xBC, 0xE0, 0x44, 0x10,
-/*16A0*/0x12, 0x07, 0x29, 0x75, 0x83, 0xBE, 0xE0, 0x44,
-        0x10, 0x12, 0x07, 0x29, 0x75, 0x83, 0xC0, 0xE0,
-/*16B0*/0x44, 0x10, 0xF0, 0xAF, 0x58, 0xE5, 0x59, 0x12,
-        0x08, 0x78, 0x02, 0x0A, 0xFF, 0xE4, 0xF5, 0x58,
-/*16C0*/0x7D, 0x01, 0xF5, 0x59, 0xAF, 0x35, 0xFE, 0xFC,
-        0x12, 0x09, 0x15, 0x12, 0x07, 0x2A, 0x75, 0x83,
-/*16D0*/0xB6, 0x74, 0x10, 0x12, 0x07, 0x29, 0x75, 0x83,
-        0xB8, 0x74, 0x10, 0x12, 0x07, 0x29, 0x75, 0x83,
-/*16E0*/0xBA, 0x74, 0x10, 0x12, 0x07, 0x29, 0x75, 0x83,
-        0xBC, 0x74, 0x10, 0x12, 0x07, 0x29, 0x75, 0x83,
-/*16F0*/0xBE, 0x74, 0x10, 0x12, 0x07, 0x29, 0x75, 0x83,
-        0xC0, 0x74, 0x10, 0x12, 0x07, 0x29, 0x75, 0x83,
-/*1700*/0x90, 0xE4, 0x12, 0x07, 0x29, 0x75, 0x83, 0xC2,
-        0xE4, 0x12, 0x07, 0x29, 0x75, 0x83, 0xC4, 0xE4,
-/*1710*/0x12, 0x07, 0x29, 0x75, 0x83, 0x92, 0xE4, 0x12,
-        0x07, 0x29, 0x75, 0x83, 0xC6, 0xE4, 0x12, 0x07,
-/*1720*/0x29, 0x75, 0x83, 0xC8, 0xE4, 0xF0, 0xAF, 0x58,
-        0xFE, 0xE5, 0x59, 0x12, 0x08, 0x7A, 0x02, 0x0A,
-/*1730*/0xFF, 0xE5, 0xE2, 0x30, 0xE4, 0x6C, 0xE5, 0xE7,
-        0x54, 0xC0, 0x64, 0x40, 0x70, 0x64, 0xE5, 0x09,
-/*1740*/0xC4, 0x54, 0x30, 0xFE, 0xE5, 0x08, 0x25, 0xE0,
-        0x25, 0xE0, 0x54, 0xC0, 0x4E, 0xFE, 0xEF, 0x54,
-/*1750*/0x3F, 0x4E, 0xFD, 0xE5, 0x2B, 0xAE, 0x2A, 0x78,
-        0x02, 0xC3, 0x33, 0xCE, 0x33, 0xCE, 0xD8, 0xF9,
-/*1760*/0xF5, 0x82, 0x8E, 0x83, 0xED, 0xF0, 0xE5, 0x2B,
-        0xAE, 0x2A, 0x78, 0x02, 0xC3, 0x33, 0xCE, 0x33,
-/*1770*/0xCE, 0xD8, 0xF9, 0xFF, 0xF5, 0x82, 0x8E, 0x83,
-        0xA3, 0xE5, 0xFE, 0xF0, 0x8F, 0x82, 0x8E, 0x83,
-/*1780*/0xA3, 0xA3, 0xE5, 0xFD, 0xF0, 0x8F, 0x82, 0x8E,
-        0x83, 0xA3, 0xA3, 0xA3, 0xE5, 0xFC, 0xF0, 0xC3,
-/*1790*/0xE5, 0x2B, 0x94, 0xFA, 0xE5, 0x2A, 0x94, 0x00,
-        0x50, 0x08, 0x05, 0x2B, 0xE5, 0x2B, 0x70, 0x02,
-/*17A0*/0x05, 0x2A, 0x22, 0xE4, 0xFF, 0xE4, 0xF5, 0x58,
-        0xF5, 0x56, 0xF5, 0x57, 0x74, 0x82, 0xFC, 0x12,
-/*17B0*/0x0E, 0x04, 0x8C, 0x83, 0xE0, 0xF5, 0x10, 0x54,
-        0x7F, 0xF0, 0xE5, 0x10, 0x44, 0x80, 0x12, 0x0E,
-/*17C0*/0x98, 0xED, 0xF0, 0x7E, 0x0A, 0x12, 0x0E, 0x04,
-        0x75, 0x83, 0xA0, 0xE0, 0x20, 0xE0, 0x26, 0xDE,
-/*17D0*/0xF4, 0x05, 0x57, 0xE5, 0x57, 0x70, 0x02, 0x05,
-        0x56, 0xE5, 0x14, 0x24, 0x01, 0xFD, 0xE4, 0x33,
-/*17E0*/0xFC, 0xD3, 0xE5, 0x57, 0x9D, 0xE5, 0x56, 0x9C,
-        0x40, 0xD9, 0xE5, 0x0A, 0x94, 0x20, 0x50, 0x02,
-/*17F0*/0x05, 0x0A, 0x43, 0xE1, 0x08, 0xC2, 0x31, 0x12,
-        0x0E, 0x04, 0x75, 0x83, 0xA6, 0xE0, 0x55, 0x12,
-/*1800*/0x65, 0x12, 0x70, 0x03, 0xD2, 0x31, 0x22, 0xC2,
-        0x31, 0x22, 0x90, 0x07, 0x26, 0xE0, 0xFA, 0xA3,
-/*1810*/0xE0, 0xF5, 0x82, 0x8A, 0x83, 0xE0, 0xF5, 0x41,
-        0xE5, 0x39, 0xC3, 0x95, 0x41, 0x40, 0x26, 0xE5,
-/*1820*/0x39, 0x95, 0x41, 0xC3, 0x9F, 0xEE, 0x12, 0x07,
-        0x6B, 0x40, 0x04, 0x7C, 0x01, 0x80, 0x02, 0x7C,
-/*1830*/0x00, 0xE5, 0x41, 0x64, 0x3F, 0x60, 0x04, 0x7B,
-        0x01, 0x80, 0x02, 0x7B, 0x00, 0xEC, 0x5B, 0x60,
-/*1840*/0x29, 0x05, 0x41, 0x80, 0x28, 0xC3, 0xE5, 0x41,
-        0x95, 0x39, 0xC3, 0x9F, 0xEE, 0x12, 0x07, 0x6B,
-/*1850*/0x40, 0x04, 0x7F, 0x01, 0x80, 0x02, 0x7F, 0x00,
-        0xE5, 0x41, 0x60, 0x04, 0x7E, 0x01, 0x80, 0x02,
-/*1860*/0x7E, 0x00, 0xEF, 0x5E, 0x60, 0x04, 0x15, 0x41,
-        0x80, 0x03, 0x85, 0x39, 0x41, 0x85, 0x3A, 0x40,
-/*1870*/0x22, 0xE5, 0xE2, 0x30, 0xE4, 0x60, 0xE5, 0xE1,
-        0x30, 0xE2, 0x5B, 0xE5, 0x09, 0x70, 0x04, 0x7F,
-/*1880*/0x01, 0x80, 0x02, 0x7F, 0x00, 0xE5, 0x08, 0x70,
-        0x04, 0x7E, 0x01, 0x80, 0x02, 0x7E, 0x00, 0xEE,
-/*1890*/0x5F, 0x60, 0x43, 0x53, 0xF9, 0xF8, 0xE5, 0xE2,
-        0x30, 0xE4, 0x3B, 0xE5, 0xE1, 0x30, 0xE2, 0x2E,
-/*18A0*/0x43, 0xFA, 0x02, 0x53, 0xFA, 0xFB, 0xE4, 0xF5,
-        0x10, 0x90, 0x94, 0x70, 0xE5, 0x10, 0xF0, 0xE5,
-/*18B0*/0xE1, 0x30, 0xE2, 0xE7, 0x90, 0x94, 0x70, 0xE0,
-        0x65, 0x10, 0x60, 0x03, 0x43, 0xFA, 0x04, 0x05,
-/*18C0*/0x10, 0x90, 0x94, 0x70, 0xE5, 0x10, 0xF0, 0x70,
-        0xE6, 0x12, 0x00, 0x06, 0x80, 0xE1, 0x53, 0xFA,
-/*18D0*/0xFD, 0x53, 0xFA, 0xFB, 0x80, 0xC0, 0x22, 0x8F,
-        0x54, 0x12, 0x00, 0x06, 0xE5, 0xE1, 0x30, 0xE0,
-/*18E0*/0x04, 0x7F, 0x01, 0x80, 0x02, 0x7F, 0x00, 0xE5,
-        0x7E, 0xD3, 0x94, 0x05, 0x40, 0x04, 0x7E, 0x01,
-/*18F0*/0x80, 0x02, 0x7E, 0x00, 0xEE, 0x4F, 0x60, 0x3D,
-        0x85, 0x54, 0x11, 0xE5, 0xE2, 0x20, 0xE1, 0x32,
-/*1900*/0x74, 0xCE, 0x12, 0x1A, 0x05, 0x30, 0xE7, 0x04,
-        0x7D, 0x01, 0x80, 0x02, 0x7D, 0x00, 0x8F, 0x82,
-/*1910*/0x8E, 0x83, 0xE0, 0x30, 0xE6, 0x04, 0x7F, 0x01,
-        0x80, 0x02, 0x7F, 0x00, 0xEF, 0x5D, 0x70, 0x15,
-/*1920*/0x12, 0x15, 0xC6, 0x74, 0xCE, 0x12, 0x1A, 0x05,
-        0x30, 0xE6, 0x07, 0xE0, 0x44, 0x80, 0xF0, 0x43,
-/*1930*/0xF9, 0x80, 0x12, 0x18, 0x71, 0x22, 0x12, 0x0E,
-        0x44, 0xE5, 0x16, 0x25, 0xE0, 0x25, 0xE0, 0x24,
-/*1940*/0xB0, 0xF5, 0x82, 0xE4, 0x34, 0x1A, 0xF5, 0x83,
-        0xE4, 0x93, 0xF5, 0x0F, 0xE5, 0x16, 0x25, 0xE0,
-/*1950*/0x25, 0xE0, 0x24, 0xB1, 0xF5, 0x82, 0xE4, 0x34,
-        0x1A, 0xF5, 0x83, 0xE4, 0x93, 0xF5, 0x0E, 0x12,
-/*1960*/0x0E, 0x65, 0xF5, 0x10, 0xE5, 0x0F, 0x54, 0xF0,
-        0x12, 0x0E, 0x17, 0x75, 0x83, 0x8C, 0xEF, 0xF0,
-/*1970*/0xE5, 0x0F, 0x30, 0xE0, 0x0C, 0x12, 0x0E, 0x04,
-        0x75, 0x83, 0x86, 0xE0, 0x44, 0x40, 0xF0, 0x80,
-/*1980*/0x0A, 0x12, 0x0E, 0x04, 0x75, 0x83, 0x86, 0xE0,
-        0x54, 0xBF, 0xF0, 0x12, 0x0E, 0x91, 0x75, 0x83,
-/*1990*/0x82, 0xE5, 0x0E, 0xF0, 0x22, 0x7F, 0x05, 0x12,
-        0x17, 0x31, 0x12, 0x0E, 0x04, 0x12, 0x0E, 0x33,
-/*19A0*/0x74, 0x02, 0xF0, 0x74, 0x8E, 0xFE, 0x12, 0x0E,
-        0x04, 0x12, 0x0E, 0x0B, 0xEF, 0xF0, 0x75, 0x15,
-/*19B0*/0x70, 0x12, 0x0F, 0xF7, 0x20, 0x34, 0x05, 0x75,
-        0x15, 0x10, 0x80, 0x03, 0x75, 0x15, 0x50, 0x12,
-/*19C0*/0x0F, 0xF7, 0x20, 0x34, 0x04, 0x74, 0x10, 0x80,
-        0x02, 0x74, 0xF0, 0x25, 0x15, 0xF5, 0x15, 0x12,
-/*19D0*/0x0E, 0x21, 0xEF, 0xF0, 0x12, 0x10, 0x91, 0x20,
-        0x34, 0x17, 0xE5, 0x15, 0x64, 0x30, 0x60, 0x0C,
-/*19E0*/0x74, 0x10, 0x25, 0x15, 0xF5, 0x15, 0xB4, 0x80,
-        0x03, 0xE4, 0xF5, 0x15, 0x12, 0x0E, 0x21, 0xEF,
-/*19F0*/0xF0, 0x22, 0xF0, 0xE5, 0x0B, 0x25, 0xE0, 0x25,
-        0xE0, 0x24, 0x82, 0xF5, 0x82, 0xE4, 0x34, 0x07,
-/*1A00*/0xF5, 0x83, 0x22, 0x74, 0x88, 0xFE, 0xE5, 0x08,
-        0x44, 0x07, 0xFF, 0xF5, 0x82, 0x8E, 0x83, 0xE0,
-/*1A10*/0x22, 0xF0, 0xE5, 0x08, 0x44, 0x07, 0xF5, 0x82,
-        0x22, 0xF0, 0xE0, 0x54, 0xC0, 0x8F, 0x82, 0x8E,
-/*1A20*/0x83, 0xF0, 0x22, 0xEF, 0x44, 0x07, 0xF5, 0x82,
-        0x75, 0x83, 0x86, 0xE0, 0x54, 0x10, 0xD3, 0x94,
-/*1A30*/0x00, 0x22, 0xF0, 0x90, 0x07, 0x15, 0xE0, 0x04,
-        0xF0, 0x22, 0x44, 0x06, 0xF5, 0x82, 0x75, 0x83,
-/*1A40*/0x9E, 0xE0, 0x22, 0xFE, 0xEF, 0x44, 0x07, 0xF5,
-        0x82, 0x8E, 0x83, 0xE0, 0x22, 0xE4, 0x90, 0x07,
-/*1A50*/0x2A, 0xF0, 0xA3, 0xF0, 0x12, 0x07, 0x2A, 0x75,
-        0x83, 0x82, 0xE0, 0x54, 0x7F, 0x12, 0x07, 0x29,
-/*1A60*/0xE0, 0x44, 0x80, 0xF0, 0x12, 0x10, 0xFC, 0x12,
-        0x08, 0x1F, 0x75, 0x83, 0xA0, 0xE0, 0x20, 0xE0,
-/*1A70*/0x1A, 0x90, 0x07, 0x2B, 0xE0, 0x04, 0xF0, 0x70,
-        0x06, 0x90, 0x07, 0x2A, 0xE0, 0x04, 0xF0, 0x90,
-/*1A80*/0x07, 0x2A, 0xE0, 0xB4, 0x10, 0xE1, 0xA3, 0xE0,
-        0xB4, 0x00, 0xDC, 0xEE, 0x44, 0xA6, 0xFC, 0xEF,
-/*1A90*/0x44, 0x07, 0xF5, 0x82, 0x8C, 0x83, 0xE0, 0xF5,
-        0x32, 0xEE, 0x44, 0xA8, 0xFE, 0xEF, 0x44, 0x07,
-/*1AA0*/0xF5, 0x82, 0x8E, 0x83, 0xE0, 0xF5, 0x33, 0x22,
-        0x01, 0x20, 0x11, 0x00, 0x04, 0x20, 0x00, 0x90,
-/*1AB0*/0x00, 0x20, 0x0F, 0x92, 0x00, 0x21, 0x0F, 0x94,
-        0x00, 0x22, 0x0F, 0x96, 0x00, 0x23, 0x0F, 0x98,
-/*1AC0*/0x00, 0x24, 0x0F, 0x9A, 0x00, 0x25, 0x0F, 0x9C,
-        0x00, 0x26, 0x0F, 0x9E, 0x00, 0x27, 0x0F, 0xA0,
-/*1AD0*/0x01, 0x20, 0x01, 0xA2, 0x01, 0x21, 0x01, 0xA4,
-        0x01, 0x22, 0x01, 0xA6, 0x01, 0x23, 0x01, 0xA8,
-/*1AE0*/0x01, 0x24, 0x01, 0xAA, 0x01, 0x25, 0x01, 0xAC,
-        0x01, 0x26, 0x01, 0xAE, 0x01, 0x27, 0x01, 0xB0,
-/*1AF0*/0x01, 0x28, 0x01, 0xB4, 0x00, 0x28, 0x0F, 0xB6,
-        0x40, 0x28, 0x0F, 0xB8, 0x61, 0x28, 0x01, 0xCB,
-/*1B00*/0xEF, 0xCB, 0xCA, 0xEE, 0xCA, 0x7F, 0x01, 0xE4,
-        0xFD, 0xEB, 0x4A, 0x70, 0x24, 0xE5, 0x08, 0xF5,
-/*1B10*/0x82, 0x74, 0xB6, 0x12, 0x08, 0x29, 0xE5, 0x08,
-        0xF5, 0x82, 0x74, 0xB8, 0x12, 0x08, 0x29, 0xE5,
-/*1B20*/0x08, 0xF5, 0x82, 0x74, 0xBA, 0x12, 0x08, 0x29,
-        0x7E, 0x00, 0x7C, 0x00, 0x12, 0x0A, 0xFF, 0x80,
-/*1B30*/0x12, 0x90, 0x07, 0x26, 0x12, 0x07, 0x35, 0xE5,
-        0x41, 0xF0, 0x90, 0x07, 0x24, 0x12, 0x07, 0x35,
-/*1B40*/0xE5, 0x40, 0xF0, 0x12, 0x07, 0x2A, 0x75, 0x83,
-        0x8E, 0xE4, 0x12, 0x07, 0x29, 0x74, 0x01, 0x12,
-/*1B50*/0x07, 0x29, 0xE4, 0xF0, 0x22, 0xE4, 0xF5, 0x26,
-        0xF5, 0x27, 0x53, 0xE1, 0xFE, 0xF5, 0x2A, 0x75,
-/*1B60*/0x2B, 0x01, 0xF5, 0x08, 0x7F, 0x01, 0x12, 0x17,
-        0x31, 0x30, 0x30, 0x1C, 0x90, 0x1A, 0xA9, 0xE4,
-/*1B70*/0x93, 0xF5, 0x10, 0x90, 0x1F, 0xF9, 0xE4, 0x93,
-        0xF5, 0x10, 0x90, 0x00, 0x41, 0xE4, 0x93, 0xF5,
-/*1B80*/0x10, 0x90, 0x1E, 0xCA, 0xE4, 0x93, 0xF5, 0x10,
-        0x7F, 0x02, 0x12, 0x17, 0x31, 0x12, 0x0F, 0x54,
-/*1B90*/0x7F, 0x03, 0x12, 0x17, 0x31, 0x12, 0x00, 0x06,
-        0xE5, 0xE2, 0x30, 0xE7, 0x09, 0x12, 0x10, 0x00,
-/*1BA0*/0x30, 0x30, 0x03, 0x12, 0x11, 0x00, 0x02, 0x00,
-        0x47, 0x12, 0x08, 0x1F, 0x75, 0x83, 0xD0, 0xE0,
-/*1BB0*/0xC4, 0x54, 0x0F, 0xFD, 0x75, 0x43, 0x01, 0x75,
-        0x44, 0xFF, 0x12, 0x08, 0xAA, 0x74, 0x04, 0xF0,
-/*1BC0*/0x75, 0x3B, 0x01, 0xED, 0x14, 0x60, 0x0C, 0x14,
-        0x60, 0x0B, 0x14, 0x60, 0x0F, 0x24, 0x03, 0x70,
-/*1BD0*/0x0B, 0x80, 0x09, 0x80, 0x00, 0x12, 0x08, 0xA7,
-        0x04, 0xF0, 0x80, 0x06, 0x12, 0x08, 0xA7, 0x74,
-/*1BE0*/0x04, 0xF0, 0xEE, 0x44, 0x82, 0xFE, 0xEF, 0x44,
-        0x07, 0xF5, 0x82, 0x8E, 0x83, 0xE5, 0x45, 0x12,
-/*1BF0*/0x08, 0xBE, 0x75, 0x83, 0x82, 0xE5, 0x31, 0xF0,
-        0x02, 0x11, 0x4C, 0x8E, 0x60, 0x8F, 0x61, 0x12,
-/*1C00*/0x1E, 0xA5, 0xE4, 0xFF, 0xCE, 0xED, 0xCE, 0xEE,
-        0xD3, 0x95, 0x61, 0xE5, 0x60, 0x12, 0x07, 0x6B,
-/*1C10*/0x40, 0x39, 0x74, 0x20, 0x2E, 0xF5, 0x82, 0xE4,
-        0x34, 0x03, 0xF5, 0x83, 0xE0, 0x70, 0x03, 0xFF,
-/*1C20*/0x80, 0x26, 0x12, 0x08, 0xE2, 0xFD, 0xC3, 0x9F,
-        0x40, 0x1E, 0xCF, 0xED, 0xCF, 0xEB, 0x4A, 0x70,
-/*1C30*/0x0B, 0x8D, 0x42, 0x12, 0x08, 0xEE, 0xF5, 0x41,
-        0x8E, 0x40, 0x80, 0x0C, 0x12, 0x08, 0xE2, 0xF5,
-/*1C40*/0x38, 0x12, 0x08, 0xEE, 0xF5, 0x39, 0x8E, 0x3A,
-        0x1E, 0x80, 0xBC, 0x22, 0x75, 0x58, 0x01, 0xE5,
-/*1C50*/0x35, 0x70, 0x0C, 0x12, 0x07, 0xCC, 0xE0, 0xF5,
-        0x4A, 0x12, 0x07, 0xD8, 0xE0, 0xF5, 0x4C, 0xE5,
-/*1C60*/0x35, 0xB4, 0x04, 0x0C, 0x12, 0x07, 0xE4, 0xE0,
-        0xF5, 0x4A, 0x12, 0x07, 0xF0, 0xE0, 0xF5, 0x4C,
-/*1C70*/0xE5, 0x35, 0xB4, 0x01, 0x04, 0x7F, 0x01, 0x80,
-        0x02, 0x7F, 0x00, 0xE5, 0x35, 0xB4, 0x02, 0x04,
-/*1C80*/0x7E, 0x01, 0x80, 0x02, 0x7E, 0x00, 0xEE, 0x4F,
-        0x60, 0x0C, 0x12, 0x07, 0xFC, 0xE0, 0xF5, 0x4A,
-/*1C90*/0x12, 0x08, 0x08, 0xE0, 0xF5, 0x4C, 0x85, 0x41,
-        0x49, 0x85, 0x40, 0x4B, 0x22, 0x75, 0x5B, 0x01,
-/*1CA0*/0x90, 0x07, 0x24, 0x12, 0x07, 0x35, 0xE0, 0x54,
-        0x1F, 0xFF, 0xD3, 0x94, 0x02, 0x50, 0x04, 0x8F,
-/*1CB0*/0x58, 0x80, 0x05, 0xEF, 0x24, 0xFE, 0xF5, 0x58,
-        0xEF, 0xC3, 0x94, 0x18, 0x40, 0x05, 0x75, 0x59,
-/*1CC0*/0x18, 0x80, 0x04, 0xEF, 0x04, 0xF5, 0x59, 0x85,
-        0x43, 0x5A, 0xAF, 0x58, 0x7E, 0x00, 0xAD, 0x59,
-/*1CD0*/0x7C, 0x00, 0xAB, 0x5B, 0x7A, 0x00, 0x12, 0x15,
-        0x41, 0xAF, 0x5A, 0x7E, 0x00, 0x12, 0x18, 0x0A,
-/*1CE0*/0xAF, 0x5B, 0x7E, 0x00, 0x02, 0x1A, 0xFF, 0xE5,
-        0xE2, 0x30, 0xE7, 0x0E, 0x12, 0x10, 0x03, 0xC2,
-/*1CF0*/0x30, 0x30, 0x30, 0x03, 0x12, 0x10, 0xFF, 0x20,
-        0x33, 0x28, 0xE5, 0xE7, 0x30, 0xE7, 0x05, 0x12,
-/*1D00*/0x0E, 0xA2, 0x80, 0x0D, 0xE5, 0xFE, 0xC3, 0x94,
-        0x20, 0x50, 0x06, 0x12, 0x0E, 0xA2, 0x43, 0xF9,
-/*1D10*/0x08, 0xE5, 0xF2, 0x30, 0xE7, 0x03, 0x53, 0xF9,
-        0x7F, 0xE5, 0xF1, 0x54, 0x70, 0xD3, 0x94, 0x00,
-/*1D20*/0x50, 0xD8, 0x22, 0x12, 0x0E, 0x04, 0x75, 0x83,
-        0x80, 0xE4, 0xF0, 0xE5, 0x08, 0x44, 0x07, 0x12,
-/*1D30*/0x0D, 0xFD, 0x75, 0x83, 0x84, 0x12, 0x0E, 0x02,
-        0x75, 0x83, 0x86, 0x12, 0x0E, 0x02, 0x75, 0x83,
-/*1D40*/0x8C, 0xE0, 0x54, 0xF3, 0x12, 0x0E, 0x03, 0x75,
-        0x83, 0x8E, 0x12, 0x0E, 0x02, 0x75, 0x83, 0x94,
-/*1D50*/0xE0, 0x54, 0xFB, 0xF0, 0x22, 0x12, 0x07, 0x2A,
-        0x75, 0x83, 0x8E, 0xE4, 0x12, 0x07, 0x29, 0x74,
-/*1D60*/0x01, 0x12, 0x07, 0x29, 0xE4, 0x12, 0x08, 0xBE,
-        0x75, 0x83, 0x8C, 0xE0, 0x44, 0x20, 0x12, 0x08,
-/*1D70*/0xBE, 0xE0, 0x54, 0xDF, 0xF0, 0x74, 0x84, 0x85,
-        0x08, 0x82, 0xF5, 0x83, 0xE0, 0x54, 0x7F, 0xF0,
-/*1D80*/0xE0, 0x44, 0x80, 0xF0, 0x22, 0x75, 0x56, 0x01,
-        0xE4, 0xFD, 0xF5, 0x57, 0xAF, 0x35, 0xFE, 0xFC,
-/*1D90*/0x12, 0x09, 0x15, 0x12, 0x1C, 0x9D, 0x12, 0x1E,
-        0x7A, 0x12, 0x1C, 0x4C, 0xAF, 0x57, 0x7E, 0x00,
-/*1DA0*/0xAD, 0x56, 0x7C, 0x00, 0x12, 0x04, 0x44, 0xAF,
-        0x56, 0x7E, 0x00, 0x02, 0x11, 0xEE, 0x75, 0x56,
-/*1DB0*/0x01, 0xE4, 0xFD, 0xF5, 0x57, 0xAF, 0x35, 0xFE,
-        0xFC, 0x12, 0x09, 0x15, 0x12, 0x1C, 0x9D, 0x12,
-/*1DC0*/0x1E, 0x7A, 0x12, 0x1C, 0x4C, 0xAF, 0x57, 0x7E,
-        0x00, 0xAD, 0x56, 0x7C, 0x00, 0x12, 0x04, 0x44,
-/*1DD0*/0xAF, 0x56, 0x7E, 0x00, 0x02, 0x11, 0xEE, 0xE4,
-        0xF5, 0x16, 0x12, 0x0E, 0x44, 0xFE, 0xE5, 0x08,
-/*1DE0*/0x44, 0x05, 0xFF, 0x12, 0x0E, 0x65, 0x8F, 0x82,
-        0x8E, 0x83, 0xF0, 0x05, 0x16, 0xE5, 0x16, 0xC3,
-/*1DF0*/0x94, 0x14, 0x40, 0xE6, 0xE5, 0x08, 0x12, 0x0E,
-        0x2B, 0xE4, 0xF0, 0x22, 0xE4, 0xF5, 0x58, 0xF5,
-/*1E00*/0x59, 0xF5, 0x5A, 0xFF, 0xFE, 0xAD, 0x58, 0xFC,
-        0x12, 0x09, 0x15, 0x7F, 0x04, 0x7E, 0x00, 0xAD,
-/*1E10*/0x58, 0x7C, 0x00, 0x12, 0x09, 0x15, 0x7F, 0x02,
-        0x7E, 0x00, 0xAD, 0x58, 0x7C, 0x00, 0x02, 0x09,
-/*1E20*/0x15, 0xE5, 0x3C, 0x25, 0x3E, 0xFC, 0xE5, 0x42,
-        0x24, 0x00, 0xFB, 0xE4, 0x33, 0xFA, 0xEC, 0xC3,
-/*1E30*/0x9B, 0xEA, 0x12, 0x07, 0x6B, 0x40, 0x0B, 0x8C,
-        0x42, 0xE5, 0x3D, 0x25, 0x3F, 0xF5, 0x41, 0x8F,
-/*1E40*/0x40, 0x22, 0x12, 0x09, 0x0B, 0x22, 0x74, 0x84,
-        0xF5, 0x18, 0x85, 0x08, 0x19, 0x85, 0x19, 0x82,
-/*1E50*/0x85, 0x18, 0x83, 0xE0, 0x54, 0x7F, 0xF0, 0xE0,
-        0x44, 0x80, 0xF0, 0xE0, 0x44, 0x80, 0xF0, 0x22,
-/*1E60*/0xEF, 0x4E, 0x70, 0x0B, 0x12, 0x07, 0x2A, 0x75,
-        0x83, 0xD2, 0xE0, 0x54, 0xDF, 0xF0, 0x22, 0x12,
-/*1E70*/0x07, 0x2A, 0x75, 0x83, 0xD2, 0xE0, 0x44, 0x20,
-        0xF0, 0x22, 0x75, 0x58, 0x01, 0x90, 0x07, 0x26,
-/*1E80*/0x12, 0x07, 0x35, 0xE0, 0x54, 0x3F, 0xF5, 0x41,
-        0x12, 0x07, 0x32, 0xE0, 0x54, 0x3F, 0xF5, 0x40,
-/*1E90*/0x22, 0x75, 0x56, 0x02, 0xE4, 0xF5, 0x57, 0x12,
-        0x1D, 0xFC, 0xAF, 0x57, 0x7E, 0x00, 0xAD, 0x56,
-/*1EA0*/0x7C, 0x00, 0x02, 0x04, 0x44, 0xE4, 0xF5, 0x42,
-        0xF5, 0x41, 0xF5, 0x40, 0xF5, 0x38, 0xF5, 0x39,
-/*1EB0*/0xF5, 0x3A, 0x22, 0xEF, 0x54, 0x07, 0xFF, 0xE5,
-        0xF9, 0x54, 0xF8, 0x4F, 0xF5, 0xF9, 0x22, 0x7F,
-/*1EC0*/0x01, 0xE4, 0xFE, 0x0F, 0x0E, 0xBE, 0xFF, 0xFB,
-        0x22, 0x01, 0x20, 0x00, 0x01, 0x04, 0x20, 0x00,
-/*1ED0*/0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/*1EE0*/0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/*1EF0*/0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/*1F00*/0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/*1F10*/0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/*1F20*/0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/*1F30*/0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/*1F40*/0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/*1F50*/0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/*1F60*/0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/*1F70*/0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/*1F80*/0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/*1F90*/0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/*1FA0*/0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/*1FB0*/0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/*1FC0*/0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/*1FD0*/0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/*1FE0*/0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/*1FF0*/0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x01, 0x20, 0x11, 0x00, 0x04, 0x20, 0x00, 0x81
-};
-int qib_sd7220_ib_load(struct qib_devdata *dd)
-{
-        return qib_sd7220_prog_ld(dd, IB_7220_SERDES, qib_sd7220_ib_img,
-                sizeof(qib_sd7220_ib_img), 0);
-}
-int qib_sd7220_ib_vfy(struct qib_devdata *dd)
-{
-        return qib_sd7220_prog_vfy(dd, IB_7220_SERDES, qib_sd7220_ib_img,
-                sizeof(qib_sd7220_ib_img), 0);
-}
diff --git a/drivers/infiniband/hw/qib/qib_tx.c b/drivers/infiniband/hw/qib/qib_tx.c
index f7eb1ddff5f3..af30232b6831 100644
--- a/drivers/infiniband/hw/qib/qib_tx.c
+++ b/drivers/infiniband/hw/qib/qib_tx.c
@@ -340,9 +340,13 @@ rescan:
                if (i < dd->piobcnt2k)
                        buf = (u32 __iomem *)(dd->pio2kbase +
                                i * dd->palign);
-                else
+                else if (i < dd->piobcnt2k + dd->piobcnt4k || !dd->piovl15base)
                        buf = (u32 __iomem *)(dd->pio4kbase +
                                (i - dd->piobcnt2k) * dd->align4k);
+                else
+                        buf = (u32 __iomem *)(dd->piovl15base +
+                                (i - (dd->piobcnt2k + dd->piobcnt4k)) *
+                                dd->align4k);
                if (pbufnum)
                        *pbufnum = i;
                dd->upd_pio_shadow = 0;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
index 40e858492f90..1a1657c82edd 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
@@ -147,6 +147,11 @@ static void ipoib_get_ethtool_stats(struct net_device *dev,
        data[index++] = priv->lro.lro_mgr.stats.no_desc;
 }
+static int ipoib_set_flags(struct net_device *dev, u32 flags)
+{
+        return ethtool_op_set_flags(dev, flags, ETH_FLAG_LRO);
+}
 static const struct ethtool_ops ipoib_ethtool_ops = {
        .get_drvinfo            = ipoib_get_drvinfo,
        .get_rx_csum            = ipoib_get_rx_csum,
@@ -154,7 +159,7 @@ static const struct ethtool_ops ipoib_ethtool_ops = {
        .get_coalesce           = ipoib_get_coalesce,
        .set_coalesce           = ipoib_set_coalesce,
        .get_flags              = ethtool_op_get_flags,
-        .set_flags              = ethtool_op_set_flags,
+        .set_flags              = ipoib_set_flags,
        .get_strings            = ipoib_get_strings,
        .get_sset_count         = ipoib_get_sset_count,
        .get_ethtool_stats      = ipoib_get_ethtool_stats,
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index df3eb8c9fd96..b4b22576f12a 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -1163,7 +1163,7 @@ static ssize_t create_child(struct device *dev,
        return ret ? ret : count;
 }
-static DEVICE_ATTR(create_child, S_IWUGO, NULL, create_child);
+static DEVICE_ATTR(create_child, S_IWUSR, NULL, create_child);
 static ssize_t delete_child(struct device *dev,
                            struct device_attribute *attr,
@@ -1183,7 +1183,7 @@ static ssize_t delete_child(struct device *dev,
        return ret ? ret : count;
 }
-static DEVICE_ATTR(delete_child, S_IWUGO, NULL, delete_child);
+static DEVICE_ATTR(delete_child, S_IWUSR, NULL, delete_child);
 int ipoib_add_pkey_attr(struct net_device *dev)
 {
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 2ee6c7a68bdc..054edf346e0b 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -10,7 +10,8 @@
 #define EVDEV_MINOR_BASE        64
 #define EVDEV_MINORS            32
-#define EVDEV_BUFFER_SIZE       64
+#define EVDEV_MIN_BUFFER_SIZE   64U
+#define EVDEV_BUF_PACKETS       8
 #include <linux/poll.h>
 #include <linux/sched.h>
@@ -23,7 +24,6 @@
 #include "input-compat.h"
 struct evdev {
-        int exist;
        int open;
        int minor;
        struct input_handle handle;
@@ -33,16 +33,18 @@ struct evdev {
        spinlock_t client_lock; /* protects client_list */
        struct mutex mutex;
        struct device dev;
+        bool exist;
 };
 struct evdev_client {
-        struct input_event buffer[EVDEV_BUFFER_SIZE];
        int head;
        int tail;
        spinlock_t buffer_lock; /* protects access to buffer, head and tail */
        struct fasync_struct *fasync;
        struct evdev *evdev;
        struct list_head node;
+        int bufsize;
+        struct input_event buffer[];
 };
 static struct evdev *evdev_table[EVDEV_MINORS];
@@ -52,11 +54,15 @@ static void evdev_pass_event(struct evdev_client *client,
                             struct input_event *event)
 {
        /*
-         * Interrupts are disabled, just acquire the lock
+         * Interrupts are disabled, just acquire the lock.
+         * Make sure we don't leave with the client buffer
+         * "empty" by having client->head == client->tail.
         */
        spin_lock(&client->buffer_lock);
-        client->buffer[client->head++] = *event;
+        do {
-        client->head &= EVDEV_BUFFER_SIZE - 1;
+                client->buffer[client->head++] = *event;
+                client->head &= client->bufsize - 1;
+        } while (client->head == client->tail);
        spin_unlock(&client->buffer_lock);
        if (event->type == EV_SYN)
@@ -242,11 +248,21 @@ static int evdev_release(struct inode *inode, struct file *file)
        return 0;
 }
+static unsigned int evdev_compute_buffer_size(struct input_dev *dev)
+{
+        unsigned int n_events =
+                max(dev->hint_events_per_packet * EVDEV_BUF_PACKETS,
+                    EVDEV_MIN_BUFFER_SIZE);
+        return roundup_pow_of_two(n_events);
+}
 static int evdev_open(struct inode *inode, struct file *file)
 {
        struct evdev *evdev;
        struct evdev_client *client;
        int i = iminor(inode) - EVDEV_MINOR_BASE;
+        unsigned int bufsize;
        int error;
        if (i >= EVDEV_MINORS)
@@ -263,12 +279,17 @@ static int evdev_open(struct inode *inode, struct file *file)
        if (!evdev)
                return -ENODEV;
-        client = kzalloc(sizeof(struct evdev_client), GFP_KERNEL);
+        bufsize = evdev_compute_buffer_size(evdev->handle.dev);
+        client = kzalloc(sizeof(struct evdev_client) +
+                                bufsize * sizeof(struct input_event),
+                         GFP_KERNEL);
        if (!client) {
                error = -ENOMEM;
                goto err_put_evdev;
        }
+        client->bufsize = bufsize;
        spin_lock_init(&client->buffer_lock);
        client->evdev = evdev;
        evdev_attach_client(evdev, client);
@@ -334,7 +355,7 @@ static int evdev_fetch_next_event(struct evdev_client *client,
        have_event = client->head != client->tail;
        if (have_event) {
                *event = client->buffer[client->tail++];
-                client->tail &= EVDEV_BUFFER_SIZE - 1;
+                client->tail &= client->bufsize - 1;
        }
        spin_unlock_irq(&client->buffer_lock);
@@ -382,10 +403,15 @@ static unsigned int evdev_poll(struct file *file, poll_table *wait)
 {
        struct evdev_client *client = file->private_data;
        struct evdev *evdev = client->evdev;
+        unsigned int mask;
        poll_wait(file, &evdev->wait, wait);
-        return ((client->head == client->tail) ? 0 : (POLLIN | POLLRDNORM)) |
-                (evdev->exist ? 0 : (POLLHUP | POLLERR));
+        mask = evdev->exist ? POLLOUT | POLLWRNORM : POLLHUP | POLLERR;
+        if (client->head != client->tail)
+                mask |= POLLIN | POLLRDNORM;
+        return mask;
 }
 #ifdef CONFIG_COMPAT
@@ -665,6 +691,10 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd,
                                                                  sizeof(struct input_absinfo))))
                                        return -EFAULT;
+                                /* We can't change number of reserved MT slots */
+                                if (t == ABS_MT_SLOT)
+                                        return -EINVAL;
                                /*
                                 * Take event lock to ensure that we are not
                                 * changing device parameters in the middle
@@ -768,7 +798,7 @@ static void evdev_remove_chrdev(struct evdev *evdev)
 static void evdev_mark_dead(struct evdev *evdev)
 {
        mutex_lock(&evdev->mutex);
-        evdev->exist = 0;
+        evdev->exist = false;
        mutex_unlock(&evdev->mutex);
 }
@@ -817,7 +847,7 @@ static int evdev_connect(struct input_handler *handler, struct input_dev *dev,
        init_waitqueue_head(&evdev->wait);
        dev_set_name(&evdev->dev, "event%d", minor);
-        evdev->exist = 1;
+        evdev->exist = true;
        evdev->minor = minor;
        evdev->handle.dev = input_get_device(dev);
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 9c79bd56b51a..e1243b4b32a5 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -33,25 +33,6 @@ MODULE_LICENSE("GPL");
 #define INPUT_DEVICES   256
-/*
- * EV_ABS events which should not be cached are listed here.
- */
-static unsigned int input_abs_bypass_init_data[] __initdata = {
-        ABS_MT_TOUCH_MAJOR,
-        ABS_MT_TOUCH_MINOR,
-        ABS_MT_WIDTH_MAJOR,
-        ABS_MT_WIDTH_MINOR,
-        ABS_MT_ORIENTATION,
-        ABS_MT_POSITION_X,
-        ABS_MT_POSITION_Y,
-        ABS_MT_TOOL_TYPE,
-        ABS_MT_BLOB_ID,
-        ABS_MT_TRACKING_ID,
-        ABS_MT_PRESSURE,
-        0
-};
-static unsigned long input_abs_bypass[BITS_TO_LONGS(ABS_CNT)];
 static LIST_HEAD(input_dev_list);
 static LIST_HEAD(input_handler_list);
@@ -181,6 +162,56 @@ static void input_stop_autorepeat(struct input_dev *dev)
 #define INPUT_PASS_TO_DEVICE    2
 #define INPUT_PASS_TO_ALL       (INPUT_PASS_TO_HANDLERS | INPUT_PASS_TO_DEVICE)
+static int input_handle_abs_event(struct input_dev *dev,
+                                  unsigned int code, int *pval)
+{
+        bool is_mt_event;
+        int *pold;
+        if (code == ABS_MT_SLOT) {
+                /*
+                 * "Stage" the event; we'll flush it later, when we
+                 * get actiual touch data.
+                 */
+                if (*pval >= 0 && *pval < dev->mtsize)
+                        dev->slot = *pval;
+                return INPUT_IGNORE_EVENT;
+        }
+        is_mt_event = code >= ABS_MT_FIRST && code <= ABS_MT_LAST;
+        if (!is_mt_event) {
+                pold = &dev->abs[code];
+        } else if (dev->mt) {
+                struct input_mt_slot *mtslot = &dev->mt[dev->slot];
+                pold = &mtslot->abs[code - ABS_MT_FIRST];
+        } else {
+                /*
+                 * Bypass filtering for multitouch events when
+                 * not employing slots.
+                 */
+                pold = NULL;
+        }
+        if (pold) {
+                *pval = input_defuzz_abs_event(*pval, *pold,
+                                                dev->absfuzz[code]);
+                if (*pold == *pval)
+                        return INPUT_IGNORE_EVENT;
+                *pold = *pval;
+        }
+        /* Flush pending "slot" event */
+        if (is_mt_event && dev->slot != dev->abs[ABS_MT_SLOT]) {
+                dev->abs[ABS_MT_SLOT] = dev->slot;
+                input_pass_event(dev, EV_ABS, ABS_MT_SLOT, dev->slot);
+        }
+        return INPUT_PASS_TO_HANDLERS;
+}
 static void input_handle_event(struct input_dev *dev,
                               unsigned int type, unsigned int code, int value)
 {
@@ -196,12 +227,12 @@ static void input_handle_event(struct input_dev *dev,
                case SYN_REPORT:
                        if (!dev->sync) {
-                                dev->sync = 1;
+                                dev->sync = true;
                                disposition = INPUT_PASS_TO_HANDLERS;
                        }
                        break;
                case SYN_MT_REPORT:
-                        dev->sync = 0;
+                        dev->sync = false;
                        disposition = INPUT_PASS_TO_HANDLERS;
                        break;
                }
@@ -233,21 +264,9 @@ static void input_handle_event(struct input_dev *dev,
                break;
        case EV_ABS:
-                if (is_event_supported(code, dev->absbit, ABS_MAX)) {
+                if (is_event_supported(code, dev->absbit, ABS_MAX))
+                        disposition = input_handle_abs_event(dev, code, &value);
-                        if (test_bit(code, input_abs_bypass)) {
-                                disposition = INPUT_PASS_TO_HANDLERS;
-                                break;
-                        }
-                        value = input_defuzz_abs_event(value,
-                                        dev->abs[code], dev->absfuzz[code]);
-                        if (dev->abs[code] != value) {
-                                dev->abs[code] = value;
-                                disposition = INPUT_PASS_TO_HANDLERS;
-                        }
-                }
                break;
        case EV_REL:
@@ -298,7 +317,7 @@ static void input_handle_event(struct input_dev *dev,
        }
        if (disposition != INPUT_IGNORE_EVENT && type != EV_SYN)
-                dev->sync = 0;
+                dev->sync = false;
        if ((disposition & INPUT_PASS_TO_DEVICE) && dev->event)
                dev->event(dev, type, code, value);
@@ -528,12 +547,30 @@ void input_close_device(struct input_handle *handle)
 EXPORT_SYMBOL(input_close_device);
 /*
+ * Simulate keyup events for all keys that are marked as pressed.
+ * The function must be called with dev->event_lock held.
+ */
+static void input_dev_release_keys(struct input_dev *dev)
+{
+        int code;
+        if (is_event_supported(EV_KEY, dev->evbit, EV_MAX)) {
+                for (code = 0; code <= KEY_MAX; code++) {
+                        if (is_event_supported(code, dev->keybit, KEY_MAX) &&
+                            __test_and_clear_bit(code, dev->key)) {
+                                input_pass_event(dev, EV_KEY, code, 0);
+                        }
+                }
+                input_pass_event(dev, EV_SYN, SYN_REPORT, 1);
+        }
+}
+/*
 * Prepare device for unregistering
 */
 static void input_disconnect_device(struct input_dev *dev)
 {
        struct input_handle *handle;
-        int code;
        /*
         * Mark device as going away. Note that we take dev->mutex here
@@ -552,15 +589,7 @@ static void input_disconnect_device(struct input_dev *dev)
         * generate events even after we done here but they will not
         * reach any handlers.
         */
-        if (is_event_supported(EV_KEY, dev->evbit, EV_MAX)) {
+        input_dev_release_keys(dev);
-                for (code = 0; code <= KEY_MAX; code++) {
-                        if (is_event_supported(code, dev->keybit, KEY_MAX) &&
-                            __test_and_clear_bit(code, dev->key)) {
-                                input_pass_event(dev, EV_KEY, code, 0);
-                        }
-                }
-                input_pass_event(dev, EV_SYN, SYN_REPORT, 1);
-        }
        list_for_each_entry(handle, &dev->h_list, d_node)
                handle->open = 0;
@@ -684,7 +713,7 @@ int input_set_keycode(struct input_dev *dev,
                      unsigned int scancode, unsigned int keycode)
 {
        unsigned long flags;
-        int old_keycode;
+        unsigned int old_keycode;
        int retval;
        if (keycode > KEY_MAX)
@@ -1278,6 +1307,7 @@ static void input_dev_release(struct device *device)
        struct input_dev *dev = to_input_dev(device);
        input_ff_destroy(dev);
+        input_mt_destroy_slots(dev);
        kfree(dev);
        module_put(THIS_MODULE);
@@ -1433,6 +1463,15 @@ static int input_dev_resume(struct device *dev)
        mutex_lock(&input_dev->mutex);
        input_dev_reset(input_dev, true);
+        /*
+         * Keys that have been pressed at suspend time are unlikely
+         * to be still pressed when we resume.
+         */
+        spin_lock_irq(&input_dev->event_lock);
+        input_dev_release_keys(input_dev);
+        spin_unlock_irq(&input_dev->event_lock);
        mutex_unlock(&input_dev->mutex);
        return 0;
@@ -1518,6 +1557,45 @@ void input_free_device(struct input_dev *dev)
 EXPORT_SYMBOL(input_free_device);
 /**
+ * input_mt_create_slots() - create MT input slots
+ * @dev: input device supporting MT events and finger tracking
+ * @num_slots: number of slots used by the device
+ *
+ * This function allocates all necessary memory for MT slot handling
+ * in the input device, and adds ABS_MT_SLOT to the device capabilities.
+ */
+int input_mt_create_slots(struct input_dev *dev, unsigned int num_slots)
+{
+        if (!num_slots)
+                return 0;
+        dev->mt = kcalloc(num_slots, sizeof(struct input_mt_slot), GFP_KERNEL);
+        if (!dev->mt)
+                return -ENOMEM;
+        dev->mtsize = num_slots;
+        input_set_abs_params(dev, ABS_MT_SLOT, 0, num_slots - 1, 0, 0);
+        return 0;
+}
+EXPORT_SYMBOL(input_mt_create_slots);
+/**
+ * input_mt_destroy_slots() - frees the MT slots of the input device
+ * @dev: input device with allocated MT slots
+ *
+ * This function is only needed in error path as the input core will
+ * automatically free the MT slots when the device is destroyed.
+ */
+void input_mt_destroy_slots(struct input_dev *dev)
+{
+        kfree(dev->mt);
+        dev->mt = NULL;
+        dev->mtsize = 0;
+}
+EXPORT_SYMBOL(input_mt_destroy_slots);
+/**
 * input_set_capability - mark device as capable of a certain event
 * @dev: device that is capable of emitting or accepting event
 * @type: type of the event (EV_KEY, EV_REL, etc...)
@@ -1926,20 +2004,10 @@ static const struct file_operations input_fops = {
        .open = input_open_file,
 };
-static void __init input_init_abs_bypass(void)
-{
-        const unsigned int *p;
-        for (p = input_abs_bypass_init_data; *p; p++)
-                input_abs_bypass[BIT_WORD(*p)] |= BIT_MASK(*p);
-}
 static int __init input_init(void)
 {
        int err;
-        input_init_abs_bypass();
        err = class_register(&input_class);
        if (err) {
                printk(KERN_ERR "input: unable to register input_dev class\n");
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 34157bb97ed6..63834585c283 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -37,7 +37,6 @@ MODULE_LICENSE("GPL");
 #define JOYDEV_BUFFER_SIZE      64
 struct joydev {
-        int exist;
        int open;
        int minor;
        struct input_handle handle;
@@ -46,6 +45,7 @@ struct joydev {
        spinlock_t client_lock; /* protects client_list */
        struct mutex mutex;
        struct device dev;
+        bool exist;
        struct js_corr corr[ABS_CNT];
        struct JS_DATA_SAVE_TYPE glue;
@@ -760,7 +760,7 @@ static void joydev_remove_chrdev(struct joydev *joydev)
 static void joydev_mark_dead(struct joydev *joydev)
 {
        mutex_lock(&joydev->mutex);
-        joydev->exist = 0;
+        joydev->exist = false;
        mutex_unlock(&joydev->mutex);
 }
@@ -817,10 +817,9 @@ static int joydev_connect(struct input_handler *handler, struct input_dev *dev,
        init_waitqueue_head(&joydev->wait);
        dev_set_name(&joydev->dev, "js%d", minor);
-        joydev->exist = 1;
+        joydev->exist = true;
        joydev->minor = minor;
-        joydev->exist = 1;
        joydev->handle.dev = input_get_device(dev);
        joydev->handle.name = dev_name(&joydev->dev);
        joydev->handle.handler = handler;
diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c
index fbd62abb66f9..0ffaf2c77a19 100644
--- a/drivers/input/joystick/gamecon.c
+++ b/drivers/input/joystick/gamecon.c
@@ -89,7 +89,6 @@ struct gc_pad {
 struct gc {
        struct pardevice *pd;
        struct gc_pad pads[GC_MAX_DEVICES];
-        struct input_dev *dev[GC_MAX_DEVICES];
        struct timer_list timer;
        int pad_count[GC_MAX];
        int used;
@@ -387,7 +386,7 @@ static void gc_nes_process_packet(struct gc *gc)
        for (i = 0; i < GC_MAX_DEVICES; i++) {
                pad = &gc->pads[i];
-                dev = gc->dev[i];
+                dev = pad->dev;
                s = gc_status_bit[i];
                switch (pad->type) {
@@ -579,7 +578,7 @@ static void gc_psx_command(struct gc *gc, int b, unsigned char *data)
                read = parport_read_status(port) ^ 0x80;
                for (j = 0; j < GC_MAX_DEVICES; j++) {
-                        struct gc_pad *pad = &gc->pads[i];
+                        struct gc_pad *pad = &gc->pads[j];
                        if (pad->type == GC_PSX || pad->type == GC_DDR)
                                data[j] |= (read & gc_status_bit[j]) ? (1 << i) : 0;
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index c1087ce4cef9..269a846f3694 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -9,6 +9,7 @@
 *               2005 Dominic Cerquetti <binary1230@yahoo.com>
 *               2006 Adam Buchbinder <adam.buchbinder@gmail.com>
 *               2007 Jan Kratochvil <honza@jikos.cz>
+ *               2010 Christoph Fritz <chf.fritz@googlemail.com>
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
@@ -88,6 +89,9 @@
   but we map them to axes when possible to simplify things */
 #define MAP_DPAD_TO_BUTTONS             (1 << 0)
 #define MAP_TRIGGERS_TO_BUTTONS         (1 << 1)
+#define MAP_STICKS_TO_NULL              (1 << 2)
+#define DANCEPAD_MAP_CONFIG     (MAP_DPAD_TO_BUTTONS |                  \
+                                MAP_TRIGGERS_TO_BUTTONS | MAP_STICKS_TO_NULL)
 #define XTYPE_XBOX        0
 #define XTYPE_XBOX360     1
@@ -102,6 +106,10 @@ static int triggers_to_buttons;
 module_param(triggers_to_buttons, bool, S_IRUGO);
 MODULE_PARM_DESC(triggers_to_buttons, "Map triggers to buttons rather than axes for unknown pads");
+static int sticks_to_null;
+module_param(sticks_to_null, bool, S_IRUGO);
+MODULE_PARM_DESC(sticks_to_null, "Do not map sticks at all for unknown pads");
 static const struct xpad_device {
        u16 idVendor;
        u16 idProduct;
@@ -114,7 +122,7 @@ static const struct xpad_device {
        { 0x045e, 0x0285, "Microsoft X-Box pad (Japan)", 0, XTYPE_XBOX },
        { 0x045e, 0x0287, "Microsoft Xbox Controller S", 0, XTYPE_XBOX },
        { 0x045e, 0x0719, "Xbox 360 Wireless Receiver", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W },
-        { 0x0c12, 0x8809, "RedOctane Xbox Dance Pad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
+        { 0x0c12, 0x8809, "RedOctane Xbox Dance Pad", DANCEPAD_MAP_CONFIG, XTYPE_XBOX },
        { 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX },
        { 0x046d, 0xc242, "Logitech Chillstream Controller", 0, XTYPE_XBOX360 },
        { 0x046d, 0xca84, "Logitech Xbox Cordless Controller", 0, XTYPE_XBOX },
@@ -151,6 +159,7 @@ static const struct xpad_device {
        { 0x045e, 0x028e, "Microsoft X-Box 360 pad", 0, XTYPE_XBOX360 },
        { 0x1bad, 0x0003, "Harmonix Rock Band Drumkit", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
        { 0x0f0d, 0x0016, "Hori Real Arcade Pro.EX", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
+        { 0x0f0d, 0x000d, "Hori Fighting Stick EX2", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
        { 0xffff, 0xffff, "Chinese-made Xbox Controller", 0, XTYPE_XBOX },
        { 0x0000, 0x0000, "Generic X-Box pad", 0, XTYPE_UNKNOWN }
 };
@@ -158,7 +167,7 @@ static const struct xpad_device {
 /* buttons shared with xbox and xbox360 */
 static const signed short xpad_common_btn[] = {
        BTN_A, BTN_B, BTN_X, BTN_Y,                     /* "analog" buttons */
-        BTN_START, BTN_BACK, BTN_THUMBL, BTN_THUMBR,    /* start/back/sticks */
+        BTN_START, BTN_SELECT, BTN_THUMBL, BTN_THUMBR,  /* start/back/sticks */
        -1                                              /* terminating entry */
 };
@@ -168,10 +177,10 @@ static const signed short xpad_btn[] = {
        -1                      /* terminating entry */
 };
-/* used when dpad is mapped to nuttons */
+/* used when dpad is mapped to buttons */
 static const signed short xpad_btn_pad[] = {
-        BTN_LEFT, BTN_RIGHT,            /* d-pad left, right */
+        BTN_TRIGGER_HAPPY1, BTN_TRIGGER_HAPPY2,         /* d-pad left, right */
-        BTN_0, BTN_1,                   /* d-pad up, down (XXX names??) */
+        BTN_TRIGGER_HAPPY3, BTN_TRIGGER_HAPPY4,         /* d-pad up, down */
        -1                              /* terminating entry */
 };
@@ -279,17 +288,19 @@ static void xpad_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char *d
 {
        struct input_dev *dev = xpad->dev;
-        /* left stick */
+        if (!(xpad->mapping & MAP_STICKS_TO_NULL)) {
-        input_report_abs(dev, ABS_X,
+                /* left stick */
-                         (__s16) le16_to_cpup((__le16 *)(data + 12)));
+                input_report_abs(dev, ABS_X,
-        input_report_abs(dev, ABS_Y,
+                                 (__s16) le16_to_cpup((__le16 *)(data + 12)));
-                         ~(__s16) le16_to_cpup((__le16 *)(data + 14)));
+                input_report_abs(dev, ABS_Y,
+                                 ~(__s16) le16_to_cpup((__le16 *)(data + 14)));
-        /* right stick */
-        input_report_abs(dev, ABS_RX,
+                /* right stick */
-                         (__s16) le16_to_cpup((__le16 *)(data + 16)));
+                input_report_abs(dev, ABS_RX,
-        input_report_abs(dev, ABS_RY,
+                                 (__s16) le16_to_cpup((__le16 *)(data + 16)));
-                         ~(__s16) le16_to_cpup((__le16 *)(data + 18)));
+                input_report_abs(dev, ABS_RY,
+                                 ~(__s16) le16_to_cpup((__le16 *)(data + 18)));
+        }
        /* triggers left/right */
        if (xpad->mapping & MAP_TRIGGERS_TO_BUTTONS) {
@@ -302,10 +313,11 @@ static void xpad_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char *d
        /* digital pad */
        if (xpad->mapping & MAP_DPAD_TO_BUTTONS) {
-                input_report_key(dev, BTN_LEFT,  data[2] & 0x04);
+                /* dpad as buttons (left, right, up, down) */
-                input_report_key(dev, BTN_RIGHT, data[2] & 0x08);
+                input_report_key(dev, BTN_TRIGGER_HAPPY1, data[2] & 0x04);
-                input_report_key(dev, BTN_0,     data[2] & 0x01); /* up */
+                input_report_key(dev, BTN_TRIGGER_HAPPY2, data[2] & 0x08);
-                input_report_key(dev, BTN_1,     data[2] & 0x02); /* down */
+                input_report_key(dev, BTN_TRIGGER_HAPPY3, data[2] & 0x01);
+                input_report_key(dev, BTN_TRIGGER_HAPPY4, data[2] & 0x02);
        } else {
                input_report_abs(dev, ABS_HAT0X,
                                 !!(data[2] & 0x08) - !!(data[2] & 0x04));
@@ -315,7 +327,7 @@ static void xpad_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char *d
        /* start/back buttons and stick press left/right */
        input_report_key(dev, BTN_START,  data[2] & 0x10);
-        input_report_key(dev, BTN_BACK,   data[2] & 0x20);
+        input_report_key(dev, BTN_SELECT, data[2] & 0x20);
        input_report_key(dev, BTN_THUMBL, data[2] & 0x40);
        input_report_key(dev, BTN_THUMBR, data[2] & 0x80);
@@ -349,11 +361,11 @@ static void xpad360_process_packet(struct usb_xpad *xpad,
        /* digital pad */
        if (xpad->mapping & MAP_DPAD_TO_BUTTONS) {
-                /* dpad as buttons (right, left, down, up) */
+                /* dpad as buttons (left, right, up, down) */
-                input_report_key(dev, BTN_LEFT, data[2] & 0x04);
+                input_report_key(dev, BTN_TRIGGER_HAPPY1, data[2] & 0x04);
-                input_report_key(dev, BTN_RIGHT, data[2] & 0x08);
+                input_report_key(dev, BTN_TRIGGER_HAPPY2, data[2] & 0x08);
-                input_report_key(dev, BTN_0, data[2] & 0x01);   /* up */
+                input_report_key(dev, BTN_TRIGGER_HAPPY3, data[2] & 0x01);
-                input_report_key(dev, BTN_1, data[2] & 0x02);   /* down */
+                input_report_key(dev, BTN_TRIGGER_HAPPY4, data[2] & 0x02);
        } else {
                input_report_abs(dev, ABS_HAT0X,
                                 !!(data[2] & 0x08) - !!(data[2] & 0x04));
@@ -363,7 +375,7 @@ static void xpad360_process_packet(struct usb_xpad *xpad,
        /* start/back buttons */
        input_report_key(dev, BTN_START,  data[2] & 0x10);
-        input_report_key(dev, BTN_BACK,   data[2] & 0x20);
+        input_report_key(dev, BTN_SELECT, data[2] & 0x20);
        /* stick press left/right */
        input_report_key(dev, BTN_THUMBL, data[2] & 0x40);
@@ -378,17 +390,19 @@ static void xpad360_process_packet(struct usb_xpad *xpad,
        input_report_key(dev, BTN_TR,   data[3] & 0x02);
        input_report_key(dev, BTN_MODE, data[3] & 0x04);
-        /* left stick */
+        if (!(xpad->mapping & MAP_STICKS_TO_NULL)) {
-        input_report_abs(dev, ABS_X,
+                /* left stick */
-                         (__s16) le16_to_cpup((__le16 *)(data + 6)));
+                input_report_abs(dev, ABS_X,
-        input_report_abs(dev, ABS_Y,
+                                 (__s16) le16_to_cpup((__le16 *)(data + 6)));
-                         ~(__s16) le16_to_cpup((__le16 *)(data + 8)));
+                input_report_abs(dev, ABS_Y,
+                                 ~(__s16) le16_to_cpup((__le16 *)(data + 8)));
-        /* right stick */
-        input_report_abs(dev, ABS_RX,
+                /* right stick */
-                         (__s16) le16_to_cpup((__le16 *)(data + 10)));
+                input_report_abs(dev, ABS_RX,
-        input_report_abs(dev, ABS_RY,
+                                 (__s16) le16_to_cpup((__le16 *)(data + 10)));
-                         ~(__s16) le16_to_cpup((__le16 *)(data + 12)));
+                input_report_abs(dev, ABS_RY,
+                                 ~(__s16) le16_to_cpup((__le16 *)(data + 12)));
+        }
        /* triggers left/right */
        if (xpad->mapping & MAP_TRIGGERS_TO_BUTTONS) {
@@ -814,6 +828,8 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
                        xpad->mapping |= MAP_DPAD_TO_BUTTONS;
                if (triggers_to_buttons)
                        xpad->mapping |= MAP_TRIGGERS_TO_BUTTONS;
+                if (sticks_to_null)
+                        xpad->mapping |= MAP_STICKS_TO_NULL;
        }
        xpad->dev = input_dev;
@@ -830,16 +846,20 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
        input_dev->open = xpad_open;
        input_dev->close = xpad_close;
-        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY);
+        if (!(xpad->mapping & MAP_STICKS_TO_NULL)) {
+                input_dev->evbit[0] |= BIT_MASK(EV_ABS);
+                /* set up axes */
+                for (i = 0; xpad_abs[i] >= 0; i++)
+                        xpad_set_up_abs(input_dev, xpad_abs[i]);
+        }
-        /* set up standard buttons and axes */
+        /* set up standard buttons */
        for (i = 0; xpad_common_btn[i] >= 0; i++)
                __set_bit(xpad_common_btn[i], input_dev->keybit);
-        for (i = 0; xpad_abs[i] >= 0; i++)
+        /* set up model-specific ones */
-                xpad_set_up_abs(input_dev, xpad_abs[i]);
-        /* Now set up model-specific ones */
        if (xpad->xtype == XTYPE_XBOX360 || xpad->xtype == XTYPE_XBOX360W) {
                for (i = 0; xpad360_btn[i] >= 0; i++)
                        __set_bit(xpad360_btn[i], input_dev->keybit);
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 0f9a4785d798..b171f63fe4d7 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -69,11 +69,11 @@ config KEYBOARD_ATARI
          module will be called atakbd.
 config KEYBOARD_ATKBD
-        tristate "AT keyboard" if EMBEDDED || !X86 || X86_MRST
+        tristate "AT keyboard" if EMBEDDED || !X86
        default y
        select SERIO
        select SERIO_LIBPS2
-        select SERIO_I8042 if X86 && !X86_MRST
+        select SERIO_I8042 if X86
        select SERIO_GSCPS2 if GSC
        help
          Say Y here if you want to use a standard AT or PS/2 keyboard. Usually
@@ -124,7 +124,7 @@ config KEYBOARD_ATKBD_RDI_KEYCODES
          right-hand column will be interpreted as the key shown in the
          left-hand column.
-config QT2160
+config KEYBOARD_QT2160
        tristate "Atmel AT42QT2160 Touch Sensor Chip"
        depends on I2C && EXPERIMENTAL
        help
@@ -297,6 +297,18 @@ config KEYBOARD_MAX7359
          To compile this driver as a module, choose M here: the
          module will be called max7359_keypad.
+config KEYBOARD_MCS
+        tristate "MELFAS MCS Touchkey"
+        depends on I2C
+        help
+          Say Y here if you have the MELFAS MCS5000/5080 touchkey controller
+          chip in your system.
+          If unsure, say N.
+          To compile this driver as a module, choose M here: the
+          module will be called mcs_touchkey.
 config KEYBOARD_IMX
        tristate "IMX keypad support"
        depends on ARCH_MXC
@@ -342,6 +354,15 @@ config KEYBOARD_PXA930_ROTARY
          To compile this driver as a module, choose M here: the
          module will be called pxa930_rotary.
+config KEYBOARD_SAMSUNG
+        tristate "Samsung keypad support"
+        depends on SAMSUNG_DEV_KEYPAD
+        help
+          Say Y here if you want to use the Samsung keypad.
+          To compile this driver as a module, choose M here: the
+          module will be called samsung-keypad.
 config KEYBOARD_STOWAWAY
        tristate "Stowaway keyboard"
        select SERIO
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
index 4596d0c6f922..1a66d5f1ca8b 100644
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -26,12 +26,14 @@ obj-$(CONFIG_KEYBOARD_LOCOMO)		+= locomokbd.o
 obj-$(CONFIG_KEYBOARD_MAPLE)            += maple_keyb.o
 obj-$(CONFIG_KEYBOARD_MATRIX)           += matrix_keypad.o
 obj-$(CONFIG_KEYBOARD_MAX7359)          += max7359_keypad.o
+obj-$(CONFIG_KEYBOARD_MCS)              += mcs_touchkey.o
 obj-$(CONFIG_KEYBOARD_NEWTON)           += newtonkbd.o
 obj-$(CONFIG_KEYBOARD_OMAP)             += omap-keypad.o
 obj-$(CONFIG_KEYBOARD_OPENCORES)        += opencores-kbd.o
 obj-$(CONFIG_KEYBOARD_PXA27x)           += pxa27x_keypad.o
 obj-$(CONFIG_KEYBOARD_PXA930_ROTARY)    += pxa930_rotary.o
 obj-$(CONFIG_KEYBOARD_QT2160)           += qt2160.o
+obj-$(CONFIG_KEYBOARD_SAMSUNG)          += samsung-keypad.o
 obj-$(CONFIG_KEYBOARD_SH_KEYSC)         += sh_keysc.o
 obj-$(CONFIG_KEYBOARD_STOWAWAY)         += stowaway.o
 obj-$(CONFIG_KEYBOARD_SUNKBD)           += sunkbd.o
diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c
index 744600eff222..d6918cb966c0 100644
--- a/drivers/input/keyboard/adp5588-keys.c
+++ b/drivers/input/keyboard/adp5588-keys.c
@@ -19,6 +19,7 @@
 #include <linux/platform_device.h>
 #include <linux/input.h>
 #include <linux/i2c.h>
+#include <linux/gpio.h>
 #include <linux/slab.h>
 #include <linux/i2c/adp5588.h>
@@ -54,6 +55,10 @@
 #define KEYP_MAX_EVENT          10
+#define MAXGPIO                 18
+#define ADP_BANK(offs)          ((offs) >> 3)
+#define ADP_BIT(offs)           (1u << ((offs) & 0x7))
 /*
 * Early pre 4.0 Silicon required to delay readout by at least 25ms,
 * since the Event Counter Register updated 25ms after the interrupt
@@ -67,6 +72,16 @@ struct adp5588_kpad {
        struct delayed_work work;
        unsigned long delay;
        unsigned short keycode[ADP5588_KEYMAPSIZE];
+        const struct adp5588_gpi_map *gpimap;
+        unsigned short gpimapsize;
+#ifdef CONFIG_GPIOLIB
+        unsigned char gpiomap[MAXGPIO];
+        bool export_gpio;
+        struct gpio_chip gc;
+        struct mutex gpio_lock; /* Protect cached dir, dat_out */
+        u8 dat_out[3];
+        u8 dir[3];
+#endif
 };
 static int adp5588_read(struct i2c_client *client, u8 reg)
@@ -84,12 +99,222 @@ static int adp5588_write(struct i2c_client *client, u8 reg, u8 val)
        return i2c_smbus_write_byte_data(client, reg, val);
 }
+#ifdef CONFIG_GPIOLIB
+static int adp5588_gpio_get_value(struct gpio_chip *chip, unsigned off)
+{
+        struct adp5588_kpad *kpad = container_of(chip, struct adp5588_kpad, gc);
+        unsigned int bank = ADP_BANK(kpad->gpiomap[off]);
+        unsigned int bit = ADP_BIT(kpad->gpiomap[off]);
+        return !!(adp5588_read(kpad->client, GPIO_DAT_STAT1 + bank) & bit);
+}
+static void adp5588_gpio_set_value(struct gpio_chip *chip,
+                                   unsigned off, int val)
+{
+        struct adp5588_kpad *kpad = container_of(chip, struct adp5588_kpad, gc);
+        unsigned int bank = ADP_BANK(kpad->gpiomap[off]);
+        unsigned int bit = ADP_BIT(kpad->gpiomap[off]);
+        mutex_lock(&kpad->gpio_lock);
+        if (val)
+                kpad->dat_out[bank] |= bit;
+        else
+                kpad->dat_out[bank] &= ~bit;
+        adp5588_write(kpad->client, GPIO_DAT_OUT1 + bank,
+                           kpad->dat_out[bank]);
+        mutex_unlock(&kpad->gpio_lock);
+}
+static int adp5588_gpio_direction_input(struct gpio_chip *chip, unsigned off)
+{
+        struct adp5588_kpad *kpad = container_of(chip, struct adp5588_kpad, gc);
+        unsigned int bank = ADP_BANK(kpad->gpiomap[off]);
+        unsigned int bit = ADP_BIT(kpad->gpiomap[off]);
+        int ret;
+        mutex_lock(&kpad->gpio_lock);
+        kpad->dir[bank] &= ~bit;
+        ret = adp5588_write(kpad->client, GPIO_DIR1 + bank, kpad->dir[bank]);
+        mutex_unlock(&kpad->gpio_lock);
+        return ret;
+}
+static int adp5588_gpio_direction_output(struct gpio_chip *chip,
+                                         unsigned off, int val)
+{
+        struct adp5588_kpad *kpad = container_of(chip, struct adp5588_kpad, gc);
+        unsigned int bank = ADP_BANK(kpad->gpiomap[off]);
+        unsigned int bit = ADP_BIT(kpad->gpiomap[off]);
+        int ret;
+        mutex_lock(&kpad->gpio_lock);
+        kpad->dir[bank] |= bit;
+        if (val)
+                kpad->dat_out[bank] |= bit;
+        else
+                kpad->dat_out[bank] &= ~bit;
+        ret = adp5588_write(kpad->client, GPIO_DAT_OUT1 + bank,
+                                 kpad->dat_out[bank]);
+        ret |= adp5588_write(kpad->client, GPIO_DIR1 + bank,
+                                 kpad->dir[bank]);
+        mutex_unlock(&kpad->gpio_lock);
+        return ret;
+}
+static int __devinit adp5588_build_gpiomap(struct adp5588_kpad *kpad,
+                                const struct adp5588_kpad_platform_data *pdata)
+{
+        bool pin_used[MAXGPIO];
+        int n_unused = 0;
+        int i;
+        memset(pin_used, 0, sizeof(pin_used));
+        for (i = 0; i < pdata->rows; i++)
+                pin_used[i] = true;
+        for (i = 0; i < pdata->cols; i++)
+                pin_used[i + GPI_PIN_COL_BASE - GPI_PIN_BASE] = true;
+        for (i = 0; i < kpad->gpimapsize; i++)
+                pin_used[kpad->gpimap[i].pin - GPI_PIN_BASE] = true;
+        for (i = 0; i < MAXGPIO; i++)
+                if (!pin_used[i])
+                        kpad->gpiomap[n_unused++] = i;
+        return n_unused;
+}
+static int __devinit adp5588_gpio_add(struct adp5588_kpad *kpad)
+{
+        struct device *dev = &kpad->client->dev;
+        const struct adp5588_kpad_platform_data *pdata = dev->platform_data;
+        const struct adp5588_gpio_platform_data *gpio_data = pdata->gpio_data;
+        int i, error;
+        if (!gpio_data)
+                return 0;
+        kpad->gc.ngpio = adp5588_build_gpiomap(kpad, pdata);
+        if (kpad->gc.ngpio == 0) {
+                dev_info(dev, "No unused gpios left to export\n");
+                return 0;
+        }
+        kpad->export_gpio = true;
+        kpad->gc.direction_input = adp5588_gpio_direction_input;
+        kpad->gc.direction_output = adp5588_gpio_direction_output;
+        kpad->gc.get = adp5588_gpio_get_value;
+        kpad->gc.set = adp5588_gpio_set_value;
+        kpad->gc.can_sleep = 1;
+        kpad->gc.base = gpio_data->gpio_start;
+        kpad->gc.label = kpad->client->name;
+        kpad->gc.owner = THIS_MODULE;
+        mutex_init(&kpad->gpio_lock);
+        error = gpiochip_add(&kpad->gc);
+        if (error) {
+                dev_err(dev, "gpiochip_add failed, err: %d\n", error);
+                return error;
+        }
+        for (i = 0; i <= ADP_BANK(MAXGPIO); i++) {
+                kpad->dat_out[i] = adp5588_read(kpad->client,
+                                                GPIO_DAT_OUT1 + i);
+                kpad->dir[i] = adp5588_read(kpad->client, GPIO_DIR1 + i);
+        }
+        if (gpio_data->setup) {
+                error = gpio_data->setup(kpad->client,
+                                         kpad->gc.base, kpad->gc.ngpio,
+                                         gpio_data->context);
+                if (error)
+                        dev_warn(dev, "setup failed, %d\n", error);
+        }
+        return 0;
+}
+static void __devexit adp5588_gpio_remove(struct adp5588_kpad *kpad)
+{
+        struct device *dev = &kpad->client->dev;
+        const struct adp5588_kpad_platform_data *pdata = dev->platform_data;
+        const struct adp5588_gpio_platform_data *gpio_data = pdata->gpio_data;
+        int error;
+        if (!kpad->export_gpio)
+                return;
+        if (gpio_data->teardown) {
+                error = gpio_data->teardown(kpad->client,
+                                            kpad->gc.base, kpad->gc.ngpio,
+                                            gpio_data->context);
+                if (error)
+                        dev_warn(dev, "teardown failed %d\n", error);
+        }
+        error = gpiochip_remove(&kpad->gc);
+        if (error)
+                dev_warn(dev, "gpiochip_remove failed %d\n", error);
+}
+#else
+static inline int adp5588_gpio_add(struct adp5588_kpad *kpad)
+{
+        return 0;
+}
+static inline void adp5588_gpio_remove(struct adp5588_kpad *kpad)
+{
+}
+#endif
+static void adp5588_report_events(struct adp5588_kpad *kpad, int ev_cnt)
+{
+        int i, j;
+        for (i = 0; i < ev_cnt; i++) {
+                int key = adp5588_read(kpad->client, Key_EVENTA + i);
+                int key_val = key & KEY_EV_MASK;
+                if (key_val >= GPI_PIN_BASE && key_val <= GPI_PIN_END) {
+                        for (j = 0; j < kpad->gpimapsize; j++) {
+                                if (key_val == kpad->gpimap[j].pin) {
+                                        input_report_switch(kpad->input,
+                                                        kpad->gpimap[j].sw_evt,
+                                                        key & KEY_EV_PRESSED);
+                                        break;
+                                }
+                        }
+                } else {
+                        input_report_key(kpad->input,
+                                         kpad->keycode[key_val - 1],
+                                         key & KEY_EV_PRESSED);
+                }
+        }
+}
 static void adp5588_work(struct work_struct *work)
 {
        struct adp5588_kpad *kpad = container_of(work,
                                                struct adp5588_kpad, work.work);
        struct i2c_client *client = kpad->client;
-        int i, key, status, ev_cnt;
+        int status, ev_cnt;
        status = adp5588_read(client, INT_STAT);
@@ -99,12 +324,7 @@ static void adp5588_work(struct work_struct *work)
        if (status & KE_INT) {
                ev_cnt = adp5588_read(client, KEY_LCK_EC_STAT) & KEC;
                if (ev_cnt) {
-                        for (i = 0; i < ev_cnt; i++) {
+                        adp5588_report_events(kpad, ev_cnt);
-                                key = adp5588_read(client, Key_EVENTA + i);
-                                input_report_key(kpad->input,
-                                        kpad->keycode[(key & KEY_EV_MASK) - 1],
-                                        key & KEY_EV_PRESSED);
-                        }
                        input_sync(kpad->input);
                }
        }
@@ -128,8 +348,10 @@ static irqreturn_t adp5588_irq(int irq, void *handle)
 static int __devinit adp5588_setup(struct i2c_client *client)
 {
-        struct adp5588_kpad_platform_data *pdata = client->dev.platform_data;
+        const struct adp5588_kpad_platform_data *pdata = client->dev.platform_data;
+        const struct adp5588_gpio_platform_data *gpio_data = pdata->gpio_data;
        int i, ret;
+        unsigned char evt_mode1 = 0, evt_mode2 = 0, evt_mode3 = 0;
        ret = adp5588_write(client, KP_GPIO1, KP_SEL(pdata->rows));
        ret |= adp5588_write(client, KP_GPIO2, KP_SEL(pdata->cols) & 0xFF);
@@ -144,6 +366,32 @@ static int __devinit adp5588_setup(struct i2c_client *client)
        for (i = 0; i < KEYP_MAX_EVENT; i++)
                ret |= adp5588_read(client, Key_EVENTA);
+        for (i = 0; i < pdata->gpimapsize; i++) {
+                unsigned short pin = pdata->gpimap[i].pin;
+                if (pin <= GPI_PIN_ROW_END) {
+                        evt_mode1 |= (1 << (pin - GPI_PIN_ROW_BASE));
+                } else {
+                        evt_mode2 |= ((1 << (pin - GPI_PIN_COL_BASE)) & 0xFF);
+                        evt_mode3 |= ((1 << (pin - GPI_PIN_COL_BASE)) >> 8);
+                }
+        }
+        if (pdata->gpimapsize) {
+                ret |= adp5588_write(client, GPI_EM1, evt_mode1);
+                ret |= adp5588_write(client, GPI_EM2, evt_mode2);
+                ret |= adp5588_write(client, GPI_EM3, evt_mode3);
+        }
+        if (gpio_data) {
+                for (i = 0; i <= ADP_BANK(MAXGPIO); i++) {
+                        int pull_mask = gpio_data->pullup_dis_mask;
+                        ret |= adp5588_write(client, GPIO_PULL1 + i,
+                                (pull_mask >> (8 * i)) & 0xFF);
+                }
+        }
        ret |= adp5588_write(client, INT_STAT, CMP2_INT | CMP1_INT |
                                        OVR_FLOW_INT | K_LCK_INT |
                                        GPI_INT | KE_INT); /* Status is W1C */
@@ -158,11 +406,49 @@ static int __devinit adp5588_setup(struct i2c_client *client)
        return 0;
 }
+static void __devinit adp5588_report_switch_state(struct adp5588_kpad *kpad)
+{
+        int gpi_stat1 = adp5588_read(kpad->client, GPIO_DAT_STAT1);
+        int gpi_stat2 = adp5588_read(kpad->client, GPIO_DAT_STAT2);
+        int gpi_stat3 = adp5588_read(kpad->client, GPIO_DAT_STAT3);
+        int gpi_stat_tmp, pin_loc;
+        int i;
+        for (i = 0; i < kpad->gpimapsize; i++) {
+                unsigned short pin = kpad->gpimap[i].pin;
+                if (pin <= GPI_PIN_ROW_END) {
+                        gpi_stat_tmp = gpi_stat1;
+                        pin_loc = pin - GPI_PIN_ROW_BASE;
+                } else if ((pin - GPI_PIN_COL_BASE) < 8) {
+                        gpi_stat_tmp = gpi_stat2;
+                        pin_loc = pin - GPI_PIN_COL_BASE;
+                } else {
+                        gpi_stat_tmp = gpi_stat3;
+                        pin_loc = pin - GPI_PIN_COL_BASE - 8;
+                }
+                if (gpi_stat_tmp < 0) {
+                        dev_err(&kpad->client->dev,
+                                "Can't read GPIO_DAT_STAT switch %d default to OFF\n",
+                                pin);
+                        gpi_stat_tmp = 0;
+                }
+                input_report_switch(kpad->input,
+                                    kpad->gpimap[i].sw_evt,
+                                    !(gpi_stat_tmp & (1 << pin_loc)));
+        }
+        input_sync(kpad->input);
+}
 static int __devinit adp5588_probe(struct i2c_client *client,
                                        const struct i2c_device_id *id)
 {
        struct adp5588_kpad *kpad;
-        struct adp5588_kpad_platform_data *pdata = client->dev.platform_data;
+        const struct adp5588_kpad_platform_data *pdata = client->dev.platform_data;
        struct input_dev *input;
        unsigned int revid;
        int ret, i;
@@ -189,6 +475,37 @@ static int __devinit adp5588_probe(struct i2c_client *client,
                return -EINVAL;
        }
+        if (!pdata->gpimap && pdata->gpimapsize) {
+                dev_err(&client->dev, "invalid gpimap from pdata\n");
+                return -EINVAL;
+        }
+        if (pdata->gpimapsize > ADP5588_GPIMAPSIZE_MAX) {
+                dev_err(&client->dev, "invalid gpimapsize\n");
+                return -EINVAL;
+        }
+        for (i = 0; i < pdata->gpimapsize; i++) {
+                unsigned short pin = pdata->gpimap[i].pin;
+                if (pin < GPI_PIN_BASE || pin > GPI_PIN_END) {
+                        dev_err(&client->dev, "invalid gpi pin data\n");
+                        return -EINVAL;
+                }
+                if (pin <= GPI_PIN_ROW_END) {
+                        if (pin - GPI_PIN_ROW_BASE + 1 <= pdata->rows) {
+                                dev_err(&client->dev, "invalid gpi row data\n");
+                                return -EINVAL;
+                        }
+                } else {
+                        if (pin - GPI_PIN_COL_BASE + 1 <= pdata->cols) {
+                                dev_err(&client->dev, "invalid gpi col data\n");
+                                return -EINVAL;
+                        }
+                }
+        }
        if (!client->irq) {
                dev_err(&client->dev, "no IRQ?\n");
                return -EINVAL;
@@ -233,6 +550,9 @@ static int __devinit adp5588_probe(struct i2c_client *client,
        memcpy(kpad->keycode, pdata->keymap,
                pdata->keymapsize * input->keycodesize);
+        kpad->gpimap = pdata->gpimap;
+        kpad->gpimapsize = pdata->gpimapsize;
        /* setup input device */
        __set_bit(EV_KEY, input->evbit);
@@ -243,6 +563,11 @@ static int __devinit adp5588_probe(struct i2c_client *client,
                __set_bit(kpad->keycode[i] & KEY_MAX, input->keybit);
        __clear_bit(KEY_RESERVED, input->keybit);
+        if (kpad->gpimapsize)
+                __set_bit(EV_SW, input->evbit);
+        for (i = 0; i < kpad->gpimapsize; i++)
+                __set_bit(kpad->gpimap[i].sw_evt, input->swbit);
        error = input_register_device(input);
        if (error) {
                dev_err(&client->dev, "unable to register input device\n");
@@ -261,6 +586,13 @@ static int __devinit adp5588_probe(struct i2c_client *client,
        if (error)
                goto err_free_irq;
+        if (kpad->gpimapsize)
+                adp5588_report_switch_state(kpad);
+        error = adp5588_gpio_add(kpad);
+        if (error)
+                goto err_free_irq;
        device_init_wakeup(&client->dev, 1);
        i2c_set_clientdata(client, kpad);
@@ -287,6 +619,7 @@ static int __devexit adp5588_remove(struct i2c_client *client)
        free_irq(client->irq, kpad);
        cancel_delayed_work_sync(&kpad->work);
        input_unregister_device(kpad->input);
+        adp5588_gpio_remove(kpad);
        kfree(kpad);
        return 0;
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index b8213fd13c3f..a9fd147f2ba7 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -31,6 +31,7 @@ struct gpio_button_data {
        struct input_dev *input;
        struct timer_list timer;
        struct work_struct work;
+        int timer_debounce;     /* in msecs */
        bool disabled;
 };
@@ -109,7 +110,7 @@ static void gpio_keys_disable_button(struct gpio_button_data *bdata)
                 * Disable IRQ and possible debouncing timer.
                 */
                disable_irq(gpio_to_irq(bdata->button->gpio));
-                if (bdata->button->debounce_interval)
+                if (bdata->timer_debounce)
                        del_timer_sync(&bdata->timer);
                bdata->disabled = true;
@@ -347,9 +348,9 @@ static irqreturn_t gpio_keys_isr(int irq, void *dev_id)
        BUG_ON(irq != gpio_to_irq(button->gpio));
-        if (button->debounce_interval)
+        if (bdata->timer_debounce)
                mod_timer(&bdata->timer,
-                        jiffies + msecs_to_jiffies(button->debounce_interval));
+                        jiffies + msecs_to_jiffies(bdata->timer_debounce));
        else
                schedule_work(&bdata->work);
@@ -383,6 +384,14 @@ static int __devinit gpio_keys_setup_key(struct platform_device *pdev,
                goto fail3;
        }
+        if (button->debounce_interval) {
+                error = gpio_set_debounce(button->gpio,
+                                          button->debounce_interval * 1000);
+                /* use timer if gpiolib doesn't provide debounce */
+                if (error < 0)
+                        bdata->timer_debounce = button->debounce_interval;
+        }
        irq = gpio_to_irq(button->gpio);
        if (irq < 0) {
                error = irq;
@@ -498,7 +507,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
 fail2:
        while (--i >= 0) {
                free_irq(gpio_to_irq(pdata->buttons[i].gpio), &ddata->data[i]);
-                if (pdata->buttons[i].debounce_interval)
+                if (ddata->data[i].timer_debounce)
                        del_timer_sync(&ddata->data[i].timer);
                cancel_work_sync(&ddata->data[i].work);
                gpio_free(pdata->buttons[i].gpio);
@@ -526,7 +535,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, &ddata->data[i]);
-                if (pdata->buttons[i].debounce_interval)
+                if (ddata->data[i].timer_debounce)
                        del_timer_sync(&ddata->data[i].timer);
                cancel_work_sync(&ddata->data[i].work);
                gpio_free(pdata->buttons[i].gpio);
diff --git a/drivers/input/keyboard/lm8323.c b/drivers/input/keyboard/lm8323.c
index 40b032f0e32c..f7c2a166576b 100644
--- a/drivers/input/keyboard/lm8323.c
+++ b/drivers/input/keyboard/lm8323.c
@@ -642,6 +642,7 @@ static int __devinit lm8323_probe(struct i2c_client *client,
        struct lm8323_platform_data *pdata = client->dev.platform_data;
        struct input_dev *idev;
        struct lm8323_chip *lm;
+        int pwm;
        int i, err;
        unsigned long tmo;
        u8 data[2];
@@ -710,8 +711,9 @@ static int __devinit lm8323_probe(struct i2c_client *client,
                goto fail1;
        }
-        for (i = 0; i < LM8323_NUM_PWMS; i++) {
+        for (pwm = 0; pwm < LM8323_NUM_PWMS; pwm++) {
-                err = init_pwm(lm, i + 1, &client->dev, pdata->pwm_names[i]);
+                err = init_pwm(lm, pwm + 1, &client->dev,
+                               pdata->pwm_names[pwm]);
                if (err < 0)
                        goto fail2;
        }
@@ -764,9 +766,9 @@ fail4:
 fail3:
        device_remove_file(&client->dev, &dev_attr_disable_kp);
 fail2:
-        while (--i >= 0)
+        while (--pwm >= 0)
-                if (lm->pwm[i].enabled)
+                if (lm->pwm[pwm].enabled)
-                        led_classdev_unregister(&lm->pwm[i].cdev);
+                        led_classdev_unregister(&lm->pwm[pwm].cdev);
 fail1:
        input_free_device(idev);
        kfree(lm);
diff --git a/drivers/input/keyboard/matrix_keypad.c b/drivers/input/keyboard/matrix_keypad.c
index b443e088fd3c..b02e4268e18f 100644
--- a/drivers/input/keyboard/matrix_keypad.c
+++ b/drivers/input/keyboard/matrix_keypad.c
@@ -37,6 +37,7 @@ struct matrix_keypad {
        spinlock_t lock;
        bool scan_pending;
        bool stopped;
+        bool gpio_all_disabled;
 };
 /*
@@ -87,8 +88,12 @@ static void enable_row_irqs(struct matrix_keypad *keypad)
        const struct matrix_keypad_platform_data *pdata = keypad->pdata;
        int i;
-        for (i = 0; i < pdata->num_row_gpios; i++)
+        if (pdata->clustered_irq > 0)
-                enable_irq(gpio_to_irq(pdata->row_gpios[i]));
+                enable_irq(pdata->clustered_irq);
+        else {
+                for (i = 0; i < pdata->num_row_gpios; i++)
+                        enable_irq(gpio_to_irq(pdata->row_gpios[i]));
+        }
 }
 static void disable_row_irqs(struct matrix_keypad *keypad)
@@ -96,8 +101,12 @@ static void disable_row_irqs(struct matrix_keypad *keypad)
        const struct matrix_keypad_platform_data *pdata = keypad->pdata;
        int i;
-        for (i = 0; i < pdata->num_row_gpios; i++)
+        if (pdata->clustered_irq > 0)
-                disable_irq_nosync(gpio_to_irq(pdata->row_gpios[i]));
+                disable_irq_nosync(pdata->clustered_irq);
+        else {
+                for (i = 0; i < pdata->num_row_gpios; i++)
+                        disable_irq_nosync(gpio_to_irq(pdata->row_gpios[i]));
+        }
 }
 /*
@@ -216,45 +225,69 @@ static void matrix_keypad_stop(struct input_dev *dev)
 }
 #ifdef CONFIG_PM
-static int matrix_keypad_suspend(struct device *dev)
+static void matrix_keypad_enable_wakeup(struct matrix_keypad *keypad)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct matrix_keypad *keypad = platform_get_drvdata(pdev);
        const struct matrix_keypad_platform_data *pdata = keypad->pdata;
+        unsigned int gpio;
        int i;
-        matrix_keypad_stop(keypad->input_dev);
+        if (pdata->clustered_irq > 0) {
+                if (enable_irq_wake(pdata->clustered_irq) == 0)
+                        keypad->gpio_all_disabled = true;
+        } else {
-        if (device_may_wakeup(&pdev->dev)) {
                for (i = 0; i < pdata->num_row_gpios; i++) {
                        if (!test_bit(i, keypad->disabled_gpios)) {
-                                unsigned int gpio = pdata->row_gpios[i];
+                                gpio = pdata->row_gpios[i];
                                if (enable_irq_wake(gpio_to_irq(gpio)) == 0)
                                        __set_bit(i, keypad->disabled_gpios);
                        }
                }
        }
-        return 0;
 }
-static int matrix_keypad_resume(struct device *dev)
+static void matrix_keypad_disable_wakeup(struct matrix_keypad *keypad)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct matrix_keypad *keypad = platform_get_drvdata(pdev);
        const struct matrix_keypad_platform_data *pdata = keypad->pdata;
+        unsigned int gpio;
        int i;
-        if (device_may_wakeup(&pdev->dev)) {
+        if (pdata->clustered_irq > 0) {
+                if (keypad->gpio_all_disabled) {
+                        disable_irq_wake(pdata->clustered_irq);
+                        keypad->gpio_all_disabled = false;
+                }
+        } else {
                for (i = 0; i < pdata->num_row_gpios; i++) {
                        if (test_and_clear_bit(i, keypad->disabled_gpios)) {
-                                unsigned int gpio = pdata->row_gpios[i];
+                                gpio = pdata->row_gpios[i];
                                disable_irq_wake(gpio_to_irq(gpio));
                        }
                }
        }
+}
+static int matrix_keypad_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct matrix_keypad *keypad = platform_get_drvdata(pdev);
+        matrix_keypad_stop(keypad->input_dev);
+        if (device_may_wakeup(&pdev->dev))
+                matrix_keypad_enable_wakeup(keypad);
+        return 0;
+}
+static int matrix_keypad_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct matrix_keypad *keypad = platform_get_drvdata(pdev);
+        if (device_may_wakeup(&pdev->dev))
+                matrix_keypad_disable_wakeup(keypad);
        matrix_keypad_start(keypad->input_dev);
@@ -296,17 +329,31 @@ static int __devinit init_matrix_gpio(struct platform_device *pdev,
                gpio_direction_input(pdata->row_gpios[i]);
        }
-        for (i = 0; i < pdata->num_row_gpios; i++) {
+        if (pdata->clustered_irq > 0) {
-                err = request_irq(gpio_to_irq(pdata->row_gpios[i]),
+                err = request_irq(pdata->clustered_irq,
                                matrix_keypad_interrupt,
-                                IRQF_DISABLED |
+                                pdata->clustered_irq_flags,
-                                IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
                                "matrix-keypad", keypad);
                if (err) {
                        dev_err(&pdev->dev,
-                                "Unable to acquire interrupt for GPIO line %i\n",
+                                "Unable to acquire clustered interrupt\n");
-                                pdata->row_gpios[i]);
+                        goto err_free_rows;
-                        goto err_free_irqs;
+                }
+        } else {
+                for (i = 0; i < pdata->num_row_gpios; i++) {
+                        err = request_irq(gpio_to_irq(pdata->row_gpios[i]),
+                                        matrix_keypad_interrupt,
+                                        IRQF_DISABLED |
+                                        IRQF_TRIGGER_RISING |
+                                        IRQF_TRIGGER_FALLING,
+                                        "matrix-keypad", keypad);
+                        if (err) {
+                                dev_err(&pdev->dev,
+                                        "Unable to acquire interrupt "
+                                        "for GPIO line %i\n",
+                                        pdata->row_gpios[i]);
+                                goto err_free_irqs;
+                        }
                }
        }
@@ -418,11 +465,16 @@ static int __devexit matrix_keypad_remove(struct platform_device *pdev)
        device_init_wakeup(&pdev->dev, 0);
-        for (i = 0; i < pdata->num_row_gpios; i++) {
+        if (pdata->clustered_irq > 0) {
-                free_irq(gpio_to_irq(pdata->row_gpios[i]), keypad);
+                free_irq(pdata->clustered_irq, keypad);
-                gpio_free(pdata->row_gpios[i]);
+        } else {
+                for (i = 0; i < pdata->num_row_gpios; i++)
+                        free_irq(gpio_to_irq(pdata->row_gpios[i]), keypad);
        }
+        for (i = 0; i < pdata->num_row_gpios; i++)
+                gpio_free(pdata->row_gpios[i]);
        for (i = 0; i < pdata->num_col_gpios; i++)
                gpio_free(pdata->col_gpios[i]);
diff --git a/drivers/input/keyboard/mcs_touchkey.c b/drivers/input/keyboard/mcs_touchkey.c
new file mode 100644
index 000000000000..63b849d7e90b
--- /dev/null
+++ b/drivers/input/keyboard/mcs_touchkey.c
@@ -0,0 +1,239 @@
+/*
+ * mcs_touchkey.c - Touchkey driver for MELFAS MCS5000/5080 controller
+ *
+ * Copyright (C) 2010 Samsung Electronics Co.Ltd
+ * Author: HeungJun Kim <riverful.kim@samsung.com>
+ * Author: Joonyoung Shim <jy0922.shim@samsung.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/init.h>
+#include <linux/i2c.h>
+#include <linux/i2c/mcs.h>
+#include <linux/interrupt.h>
+#include <linux/input.h>
+#include <linux/irq.h>
+#include <linux/slab.h>
+/* MCS5000 Touchkey */
+#define MCS5000_TOUCHKEY_STATUS         0x04
+#define MCS5000_TOUCHKEY_STATUS_PRESS   7
+#define MCS5000_TOUCHKEY_FW             0x0a
+#define MCS5000_TOUCHKEY_BASE_VAL       0x61
+/* MCS5080 Touchkey */
+#define MCS5080_TOUCHKEY_STATUS         0x00
+#define MCS5080_TOUCHKEY_STATUS_PRESS   3
+#define MCS5080_TOUCHKEY_FW             0x01
+#define MCS5080_TOUCHKEY_BASE_VAL       0x1
+enum mcs_touchkey_type {
+        MCS5000_TOUCHKEY,
+        MCS5080_TOUCHKEY,
+};
+struct mcs_touchkey_chip {
+        unsigned int status_reg;
+        unsigned int pressbit;
+        unsigned int press_invert;
+        unsigned int baseval;
+};
+struct mcs_touchkey_data {
+        struct i2c_client *client;
+        struct input_dev *input_dev;
+        struct mcs_touchkey_chip chip;
+        unsigned int key_code;
+        unsigned int key_val;
+        unsigned short keycodes[];
+};
+static irqreturn_t mcs_touchkey_interrupt(int irq, void *dev_id)
+{
+        struct mcs_touchkey_data *data = dev_id;
+        struct mcs_touchkey_chip *chip = &data->chip;
+        struct i2c_client *client = data->client;
+        struct input_dev *input = data->input_dev;
+        unsigned int key_val;
+        unsigned int pressed;
+        int val;
+        val = i2c_smbus_read_byte_data(client, chip->status_reg);
+        if (val < 0) {
+                dev_err(&client->dev, "i2c read error [%d]\n", val);
+                goto out;
+        }
+        pressed = (val & (1 << chip->pressbit)) >> chip->pressbit;
+        if (chip->press_invert)
+                pressed ^= chip->press_invert;
+        /* key_val is 0 when released, so we should use key_val of press. */
+        if (pressed) {
+                key_val = val & (0xff >> (8 - chip->pressbit));
+                if (!key_val)
+                        goto out;
+                key_val -= chip->baseval;
+                data->key_code = data->keycodes[key_val];
+                data->key_val = key_val;
+        }
+        input_event(input, EV_MSC, MSC_SCAN, data->key_val);
+        input_report_key(input, data->key_code, pressed);
+        input_sync(input);
+        dev_dbg(&client->dev, "key %d %d %s\n", data->key_val, data->key_code,
+                pressed ? "pressed" : "released");
+ out:
+        return IRQ_HANDLED;
+}
+static int __devinit mcs_touchkey_probe(struct i2c_client *client,
+                const struct i2c_device_id *id)
+{
+        const struct mcs_platform_data *pdata;
+        struct mcs_touchkey_data *data;
+        struct input_dev *input_dev;
+        unsigned int fw_reg;
+        int fw_ver;
+        int error;
+        int i;
+        pdata = client->dev.platform_data;
+        if (!pdata) {
+                dev_err(&client->dev, "no platform data defined\n");
+                return -EINVAL;
+        }
+        data = kzalloc(sizeof(struct mcs_touchkey_data) +
+                        sizeof(data->keycodes[0]) * (pdata->key_maxval + 1),
+                        GFP_KERNEL);
+        input_dev = input_allocate_device();
+        if (!data || !input_dev) {
+                dev_err(&client->dev, "Failed to allocate memory\n");
+                error = -ENOMEM;
+                goto err_free_mem;
+        }
+        data->client = client;
+        data->input_dev = input_dev;
+        if (id->driver_data == MCS5000_TOUCHKEY) {
+                data->chip.status_reg = MCS5000_TOUCHKEY_STATUS;
+                data->chip.pressbit = MCS5000_TOUCHKEY_STATUS_PRESS;
+                data->chip.baseval = MCS5000_TOUCHKEY_BASE_VAL;
+                fw_reg = MCS5000_TOUCHKEY_FW;
+        } else {
+                data->chip.status_reg = MCS5080_TOUCHKEY_STATUS;
+                data->chip.pressbit = MCS5080_TOUCHKEY_STATUS_PRESS;
+                data->chip.press_invert = 1;
+                data->chip.baseval = MCS5080_TOUCHKEY_BASE_VAL;
+                fw_reg = MCS5080_TOUCHKEY_FW;
+        }
+        fw_ver = i2c_smbus_read_byte_data(client, fw_reg);
+        if (fw_ver < 0) {
+                error = fw_ver;
+                dev_err(&client->dev, "i2c read error[%d]\n", error);
+                goto err_free_mem;
+        }
+        dev_info(&client->dev, "Firmware version: %d\n", fw_ver);
+        input_dev->name = "MELPAS MCS Touchkey";
+        input_dev->id.bustype = BUS_I2C;
+        input_dev->dev.parent = &client->dev;
+        input_dev->evbit[0] = BIT_MASK(EV_KEY);
+        if (!pdata->no_autorepeat)
+                input_dev->evbit[0] |= BIT_MASK(EV_REP);
+        input_dev->keycode = data->keycodes;
+        input_dev->keycodesize = sizeof(data->keycodes[0]);
+        input_dev->keycodemax = pdata->key_maxval + 1;
+        for (i = 0; i < pdata->keymap_size; i++) {
+                unsigned int val = MCS_KEY_VAL(pdata->keymap[i]);
+                unsigned int code = MCS_KEY_CODE(pdata->keymap[i]);
+                data->keycodes[val] = code;
+                __set_bit(code, input_dev->keybit);
+        }
+        input_set_capability(input_dev, EV_MSC, MSC_SCAN);
+        input_set_drvdata(input_dev, data);
+        if (pdata->cfg_pin)
+                pdata->cfg_pin();
+        error = request_threaded_irq(client->irq, NULL, mcs_touchkey_interrupt,
+                        IRQF_TRIGGER_FALLING, client->dev.driver->name, data);
+        if (error) {
+                dev_err(&client->dev, "Failed to register interrupt\n");
+                goto err_free_mem;
+        }
+        error = input_register_device(input_dev);
+        if (error)
+                goto err_free_irq;
+        i2c_set_clientdata(client, data);
+        return 0;
+err_free_irq:
+        free_irq(client->irq, data);
+err_free_mem:
+        input_free_device(input_dev);
+        kfree(data);
+        return error;
+}
+static int __devexit mcs_touchkey_remove(struct i2c_client *client)
+{
+        struct mcs_touchkey_data *data = i2c_get_clientdata(client);
+        free_irq(client->irq, data);
+        input_unregister_device(data->input_dev);
+        kfree(data);
+        return 0;
+}
+static const struct i2c_device_id mcs_touchkey_id[] = {
+        { "mcs5000_touchkey", MCS5000_TOUCHKEY },
+        { "mcs5080_touchkey", MCS5080_TOUCHKEY },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, mcs_touchkey_id);
+static struct i2c_driver mcs_touchkey_driver = {
+        .driver = {
+                .name   = "mcs_touchkey",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = mcs_touchkey_probe,
+        .remove         = __devexit_p(mcs_touchkey_remove),
+        .id_table       = mcs_touchkey_id,
+};
+static int __init mcs_touchkey_init(void)
+{
+        return i2c_add_driver(&mcs_touchkey_driver);
+}
+static void __exit mcs_touchkey_exit(void)
+{
+        i2c_del_driver(&mcs_touchkey_driver);
+}
+module_init(mcs_touchkey_init);
+module_exit(mcs_touchkey_exit);
+/* Module information */
+MODULE_AUTHOR("Joonyoung Shim <jy0922.shim@samsung.com>");
+MODULE_AUTHOR("HeungJun Kim <riverful.kim@samsung.com>");
+MODULE_DESCRIPTION("Touchkey driver for MELFAS MCS5000/5080 controller");
+MODULE_LICENSE("GPL");
diff --git a/drivers/input/keyboard/samsung-keypad.c b/drivers/input/keyboard/samsung-keypad.c
new file mode 100644
index 000000000000..f689f49e3109
--- /dev/null
+++ b/drivers/input/keyboard/samsung-keypad.c
@@ -0,0 +1,491 @@
+/*
+ * Samsung keypad driver
+ *
+ * Copyright (C) 2010 Samsung Electronics Co.Ltd
+ * Author: Joonyoung Shim <jy0922.shim@samsung.com>
+ * Author: Donghwa Lee <dh09.lee@samsung.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/clk.h>
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/init.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/sched.h>
+#include <plat/keypad.h>
+#define SAMSUNG_KEYIFCON                        0x00
+#define SAMSUNG_KEYIFSTSCLR                     0x04
+#define SAMSUNG_KEYIFCOL                        0x08
+#define SAMSUNG_KEYIFROW                        0x0c
+#define SAMSUNG_KEYIFFC                         0x10
+/* SAMSUNG_KEYIFCON */
+#define SAMSUNG_KEYIFCON_INT_F_EN               (1 << 0)
+#define SAMSUNG_KEYIFCON_INT_R_EN               (1 << 1)
+#define SAMSUNG_KEYIFCON_DF_EN                  (1 << 2)
+#define SAMSUNG_KEYIFCON_FC_EN                  (1 << 3)
+#define SAMSUNG_KEYIFCON_WAKEUPEN               (1 << 4)
+/* SAMSUNG_KEYIFSTSCLR */
+#define SAMSUNG_KEYIFSTSCLR_P_INT_MASK          (0xff << 0)
+#define SAMSUNG_KEYIFSTSCLR_R_INT_MASK          (0xff << 8)
+#define SAMSUNG_KEYIFSTSCLR_R_INT_OFFSET        8
+#define S5PV210_KEYIFSTSCLR_P_INT_MASK          (0x3fff << 0)
+#define S5PV210_KEYIFSTSCLR_R_INT_MASK          (0x3fff << 16)
+#define S5PV210_KEYIFSTSCLR_R_INT_OFFSET        16
+/* SAMSUNG_KEYIFCOL */
+#define SAMSUNG_KEYIFCOL_MASK                   (0xff << 0)
+#define S5PV210_KEYIFCOLEN_MASK                 (0xff << 8)
+/* SAMSUNG_KEYIFROW */
+#define SAMSUNG_KEYIFROW_MASK                   (0xff << 0)
+#define S5PV210_KEYIFROW_MASK                   (0x3fff << 0)
+/* SAMSUNG_KEYIFFC */
+#define SAMSUNG_KEYIFFC_MASK                    (0x3ff << 0)
+enum samsung_keypad_type {
+        KEYPAD_TYPE_SAMSUNG,
+        KEYPAD_TYPE_S5PV210,
+};
+struct samsung_keypad {
+        struct input_dev *input_dev;
+        struct clk *clk;
+        void __iomem *base;
+        wait_queue_head_t wait;
+        bool stopped;
+        int irq;
+        unsigned int row_shift;
+        unsigned int rows;
+        unsigned int cols;
+        unsigned int row_state[SAMSUNG_MAX_COLS];
+        unsigned short keycodes[];
+};
+static int samsung_keypad_is_s5pv210(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        enum samsung_keypad_type type =
+                platform_get_device_id(pdev)->driver_data;
+        return type == KEYPAD_TYPE_S5PV210;
+}
+static void samsung_keypad_scan(struct samsung_keypad *keypad,
+                                unsigned int *row_state)
+{
+        struct device *dev = keypad->input_dev->dev.parent;
+        unsigned int col;
+        unsigned int val;
+        for (col = 0; col < keypad->cols; col++) {
+                if (samsung_keypad_is_s5pv210(dev)) {
+                        val = S5PV210_KEYIFCOLEN_MASK;
+                        val &= ~(1 << col) << 8;
+                } else {
+                        val = SAMSUNG_KEYIFCOL_MASK;
+                        val &= ~(1 << col);
+                }
+                writel(val, keypad->base + SAMSUNG_KEYIFCOL);
+                mdelay(1);
+                val = readl(keypad->base + SAMSUNG_KEYIFROW);
+                row_state[col] = ~val & ((1 << keypad->rows) - 1);
+        }
+        /* KEYIFCOL reg clear */
+        writel(0, keypad->base + SAMSUNG_KEYIFCOL);
+}
+static bool samsung_keypad_report(struct samsung_keypad *keypad,
+                                  unsigned int *row_state)
+{
+        struct input_dev *input_dev = keypad->input_dev;
+        unsigned int changed;
+        unsigned int pressed;
+        unsigned int key_down = 0;
+        unsigned int val;
+        unsigned int col, row;
+        for (col = 0; col < keypad->cols; col++) {
+                changed = row_state[col] ^ keypad->row_state[col];
+                key_down |= row_state[col];
+                if (!changed)
+                        continue;
+                for (row = 0; row < keypad->rows; row++) {
+                        if (!(changed & (1 << row)))
+                                continue;
+                        pressed = row_state[col] & (1 << row);
+                        dev_dbg(&keypad->input_dev->dev,
+                                "key %s, row: %d, col: %d\n",
+                                pressed ? "pressed" : "released", row, col);
+                        val = MATRIX_SCAN_CODE(row, col, keypad->row_shift);
+                        input_event(input_dev, EV_MSC, MSC_SCAN, val);
+                        input_report_key(input_dev,
+                                        keypad->keycodes[val], pressed);
+                }
+                input_sync(keypad->input_dev);
+        }
+        memcpy(keypad->row_state, row_state, sizeof(keypad->row_state));
+        return key_down;
+}
+static irqreturn_t samsung_keypad_irq(int irq, void *dev_id)
+{
+        struct samsung_keypad *keypad = dev_id;
+        unsigned int row_state[SAMSUNG_MAX_COLS];
+        unsigned int val;
+        bool key_down;
+        do {
+                val = readl(keypad->base + SAMSUNG_KEYIFSTSCLR);
+                /* Clear interrupt. */
+                writel(~0x0, keypad->base + SAMSUNG_KEYIFSTSCLR);
+                samsung_keypad_scan(keypad, row_state);
+                key_down = samsung_keypad_report(keypad, row_state);
+                if (key_down)
+                        wait_event_timeout(keypad->wait, keypad->stopped,
+                                           msecs_to_jiffies(50));
+        } while (key_down && !keypad->stopped);
+        return IRQ_HANDLED;
+}
+static void samsung_keypad_start(struct samsung_keypad *keypad)
+{
+        unsigned int val;
+        /* Tell IRQ thread that it may poll the device. */
+        keypad->stopped = false;
+        clk_enable(keypad->clk);
+        /* Enable interrupt bits. */
+        val = readl(keypad->base + SAMSUNG_KEYIFCON);
+        val |= SAMSUNG_KEYIFCON_INT_F_EN | SAMSUNG_KEYIFCON_INT_R_EN;
+        writel(val, keypad->base + SAMSUNG_KEYIFCON);
+        /* KEYIFCOL reg clear. */
+        writel(0, keypad->base + SAMSUNG_KEYIFCOL);
+}
+static void samsung_keypad_stop(struct samsung_keypad *keypad)
+{
+        unsigned int val;
+        /* Signal IRQ thread to stop polling and disable the handler. */
+        keypad->stopped = true;
+        wake_up(&keypad->wait);
+        disable_irq(keypad->irq);
+        /* Clear interrupt. */
+        writel(~0x0, keypad->base + SAMSUNG_KEYIFSTSCLR);
+        /* Disable interrupt bits. */
+        val = readl(keypad->base + SAMSUNG_KEYIFCON);
+        val &= ~(SAMSUNG_KEYIFCON_INT_F_EN | SAMSUNG_KEYIFCON_INT_R_EN);
+        writel(val, keypad->base + SAMSUNG_KEYIFCON);
+        clk_disable(keypad->clk);
+        /*
+         * Now that chip should not generate interrupts we can safely
+         * re-enable the handler.
+         */
+        enable_irq(keypad->irq);
+}
+static int samsung_keypad_open(struct input_dev *input_dev)
+{
+        struct samsung_keypad *keypad = input_get_drvdata(input_dev);
+        samsung_keypad_start(keypad);
+        return 0;
+}
+static void samsung_keypad_close(struct input_dev *input_dev)
+{
+        struct samsung_keypad *keypad = input_get_drvdata(input_dev);
+        samsung_keypad_stop(keypad);
+}
+static int __devinit samsung_keypad_probe(struct platform_device *pdev)
+{
+        const struct samsung_keypad_platdata *pdata;
+        const struct matrix_keymap_data *keymap_data;
+        struct samsung_keypad *keypad;
+        struct resource *res;
+        struct input_dev *input_dev;
+        unsigned int row_shift;
+        unsigned int keymap_size;
+        int error;
+        pdata = pdev->dev.platform_data;
+        if (!pdata) {
+                dev_err(&pdev->dev, "no platform data defined\n");
+                return -EINVAL;
+        }
+        keymap_data = pdata->keymap_data;
+        if (!keymap_data) {
+                dev_err(&pdev->dev, "no keymap data defined\n");
+                return -EINVAL;
+        }
+        if (!pdata->rows || pdata->rows > SAMSUNG_MAX_ROWS)
+                return -EINVAL;
+        if (!pdata->cols || pdata->cols > SAMSUNG_MAX_COLS)
+                return -EINVAL;
+        /* initialize the gpio */
+        if (pdata->cfg_gpio)
+                pdata->cfg_gpio(pdata->rows, pdata->cols);
+        row_shift = get_count_order(pdata->cols);
+        keymap_size = (pdata->rows << row_shift) * sizeof(keypad->keycodes[0]);
+        keypad = kzalloc(sizeof(*keypad) + keymap_size, GFP_KERNEL);
+        input_dev = input_allocate_device();
+        if (!keypad || !input_dev) {
+                error = -ENOMEM;
+                goto err_free_mem;
+        }
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                error = -ENODEV;
+                goto err_free_mem;
+        }
+        keypad->base = ioremap(res->start, resource_size(res));
+        if (!keypad->base) {
+                error = -EBUSY;
+                goto err_free_mem;
+        }
+        keypad->clk = clk_get(&pdev->dev, "keypad");
+        if (IS_ERR(keypad->clk)) {
+                dev_err(&pdev->dev, "failed to get keypad clk\n");
+                error = PTR_ERR(keypad->clk);
+                goto err_unmap_base;
+        }
+        keypad->input_dev = input_dev;
+        keypad->row_shift = row_shift;
+        keypad->rows = pdata->rows;
+        keypad->cols = pdata->cols;
+        init_waitqueue_head(&keypad->wait);
+        input_dev->name = pdev->name;
+        input_dev->id.bustype = BUS_HOST;
+        input_dev->dev.parent = &pdev->dev;
+        input_set_drvdata(input_dev, keypad);
+        input_dev->open = samsung_keypad_open;
+        input_dev->close = samsung_keypad_close;
+        input_dev->evbit[0] = BIT_MASK(EV_KEY);
+        if (!pdata->no_autorepeat)
+                input_dev->evbit[0] |= BIT_MASK(EV_REP);
+        input_set_capability(input_dev, EV_MSC, MSC_SCAN);
+        input_dev->keycode = keypad->keycodes;
+        input_dev->keycodesize = sizeof(keypad->keycodes[0]);
+        input_dev->keycodemax = pdata->rows << row_shift;
+        matrix_keypad_build_keymap(keymap_data, row_shift,
+                        input_dev->keycode, input_dev->keybit);
+        keypad->irq = platform_get_irq(pdev, 0);
+        if (keypad->irq < 0) {
+                error = keypad->irq;
+                goto err_put_clk;
+        }
+        error = request_threaded_irq(keypad->irq, NULL, samsung_keypad_irq,
+                        IRQF_ONESHOT, dev_name(&pdev->dev), keypad);
+        if (error) {
+                dev_err(&pdev->dev, "failed to register keypad interrupt\n");
+                goto err_put_clk;
+        }
+        error = input_register_device(keypad->input_dev);
+        if (error)
+                goto err_free_irq;
+        device_init_wakeup(&pdev->dev, pdata->wakeup);
+        platform_set_drvdata(pdev, keypad);
+        return 0;
+err_free_irq:
+        free_irq(keypad->irq, keypad);
+err_put_clk:
+        clk_put(keypad->clk);
+err_unmap_base:
+        iounmap(keypad->base);
+err_free_mem:
+        input_free_device(input_dev);
+        kfree(keypad);
+        return error;
+}
+static int __devexit samsung_keypad_remove(struct platform_device *pdev)
+{
+        struct samsung_keypad *keypad = platform_get_drvdata(pdev);
+        device_init_wakeup(&pdev->dev, 0);
+        platform_set_drvdata(pdev, NULL);
+        input_unregister_device(keypad->input_dev);
+        /*
+         * It is safe to free IRQ after unregistering device because
+         * samsung_keypad_close will shut off interrupts.
+         */
+        free_irq(keypad->irq, keypad);
+        clk_put(keypad->clk);
+        iounmap(keypad->base);
+        kfree(keypad);
+        return 0;
+}
+#ifdef CONFIG_PM
+static void samsung_keypad_toggle_wakeup(struct samsung_keypad *keypad,
+                                         bool enable)
+{
+        struct device *dev = keypad->input_dev->dev.parent;
+        unsigned int val;
+        clk_enable(keypad->clk);
+        val = readl(keypad->base + SAMSUNG_KEYIFCON);
+        if (enable) {
+                val |= SAMSUNG_KEYIFCON_WAKEUPEN;
+                if (device_may_wakeup(dev))
+                        enable_irq_wake(keypad->irq);
+        } else {
+                val &= ~SAMSUNG_KEYIFCON_WAKEUPEN;
+                if (device_may_wakeup(dev))
+                        disable_irq_wake(keypad->irq);
+        }
+        writel(val, keypad->base + SAMSUNG_KEYIFCON);
+        clk_disable(keypad->clk);
+}
+static int samsung_keypad_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct samsung_keypad *keypad = platform_get_drvdata(pdev);
+        struct input_dev *input_dev = keypad->input_dev;
+        mutex_lock(&input_dev->mutex);
+        if (input_dev->users)
+                samsung_keypad_stop(keypad);
+        samsung_keypad_toggle_wakeup(keypad, true);
+        mutex_unlock(&input_dev->mutex);
+        return 0;
+}
+static int samsung_keypad_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct samsung_keypad *keypad = platform_get_drvdata(pdev);
+        struct input_dev *input_dev = keypad->input_dev;
+        mutex_lock(&input_dev->mutex);
+        samsung_keypad_toggle_wakeup(keypad, false);
+        if (input_dev->users)
+                samsung_keypad_start(keypad);
+        mutex_unlock(&input_dev->mutex);
+        return 0;
+}
+static const struct dev_pm_ops samsung_keypad_pm_ops = {
+        .suspend        = samsung_keypad_suspend,
+        .resume         = samsung_keypad_resume,
+};
+#endif
+static struct platform_device_id samsung_keypad_driver_ids[] = {
+        {
+                .name           = "samsung-keypad",
+                .driver_data    = KEYPAD_TYPE_SAMSUNG,
+        }, {
+                .name           = "s5pv210-keypad",
+                .driver_data    = KEYPAD_TYPE_S5PV210,
+        },
+        { },
+};
+MODULE_DEVICE_TABLE(platform, samsung_keypad_driver_ids);
+static struct platform_driver samsung_keypad_driver = {
+        .probe          = samsung_keypad_probe,
+        .remove         = __devexit_p(samsung_keypad_remove),
+        .driver         = {
+                .name   = "samsung-keypad",
+                .owner  = THIS_MODULE,
+#ifdef CONFIG_PM
+                .pm     = &samsung_keypad_pm_ops,
+#endif
+        },
+        .id_table       = samsung_keypad_driver_ids,
+};
+static int __init samsung_keypad_init(void)
+{
+        return platform_driver_register(&samsung_keypad_driver);
+}
+module_init(samsung_keypad_init);
+static void __exit samsung_keypad_exit(void)
+{
+        platform_driver_unregister(&samsung_keypad_driver);
+}
+module_exit(samsung_keypad_exit);
+MODULE_DESCRIPTION("Samsung keypad driver");
+MODULE_AUTHOR("Joonyoung Shim <jy0922.shim@samsung.com>");
+MODULE_AUTHOR("Donghwa Lee <dh09.lee@samsung.com>");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:samsung-keypad");
diff --git a/drivers/input/keyboard/twl4030_keypad.c b/drivers/input/keyboard/twl4030_keypad.c
index 7aa59e07b689..fb16b5e5ea13 100644
--- a/drivers/input/keyboard/twl4030_keypad.c
+++ b/drivers/input/keyboard/twl4030_keypad.c
@@ -51,8 +51,12 @@
 */
 #define TWL4030_MAX_ROWS        8       /* TWL4030 hard limit */
 #define TWL4030_MAX_COLS        8
-#define TWL4030_ROW_SHIFT       3
+/*
-#define TWL4030_KEYMAP_SIZE     (TWL4030_MAX_ROWS * TWL4030_MAX_COLS)
+ * Note that we add space for an extra column so that we can handle
+ * row lines connected to the gnd (see twl4030_col_xlate()).
+ */
+#define TWL4030_ROW_SHIFT       4
+#define TWL4030_KEYMAP_SIZE     (TWL4030_MAX_ROWS << TWL4030_ROW_SHIFT)
 struct twl4030_keypad {
        unsigned short  keymap[TWL4030_KEYMAP_SIZE];
@@ -182,7 +186,7 @@ static int twl4030_read_kp_matrix_state(struct twl4030_keypad *kp, u16 *state)
        return ret;
 }
-static int twl4030_is_in_ghost_state(struct twl4030_keypad *kp, u16 *key_state)
+static bool twl4030_is_in_ghost_state(struct twl4030_keypad *kp, u16 *key_state)
 {
        int i;
        u16 check = 0;
@@ -191,12 +195,12 @@ static int twl4030_is_in_ghost_state(struct twl4030_keypad *kp, u16 *key_state)
                u16 col = key_state[i];
                if ((col & check) && hweight16(col) > 1)
-                        return 1;
+                        return true;
                check |= col;
        }
-        return 0;
+        return false;
 }
 static void twl4030_kp_scan(struct twl4030_keypad *kp, bool release_all)
@@ -225,7 +229,8 @@ static void twl4030_kp_scan(struct twl4030_keypad *kp, bool release_all)
                if (!changed)
                        continue;
-                for (col = 0; col < kp->n_cols; col++) {
+                /* Extra column handles "all gnd" rows */
+                for (col = 0; col < kp->n_cols + 1; col++) {
                        int code;
                        if (!(changed & (1 << col)))
diff --git a/drivers/input/keyboard/w90p910_keypad.c b/drivers/input/keyboard/w90p910_keypad.c
index 4ef764cc493c..ee2bf6bcf291 100644
--- a/drivers/input/keyboard/w90p910_keypad.c
+++ b/drivers/input/keyboard/w90p910_keypad.c
@@ -258,7 +258,7 @@ static struct platform_driver w90p910_keypad_driver = {
        .probe          = w90p910_keypad_probe,
        .remove         = __devexit_p(w90p910_keypad_remove),
        .driver         = {
-                .name   = "nuc900-keypad",
+                .name   = "nuc900-kpi",
                .owner  = THIS_MODULE,
        },
 };
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index c44b9eafc556..b49e23379723 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -327,6 +327,17 @@ config INPUT_PCF8574
          To compile this driver as a module, choose M here: the
          module will be called pcf8574_keypad.
+config INPUT_PWM_BEEPER
+        tristate "PWM beeper support"
+        depends on HAVE_PWM
+        help
+          Say Y here to get support for PWM based beeper devices.
+          If unsure, say N.
+          To compile this driver as a module, choose M here: the module will be
+          called pwm-beeper.
 config INPUT_GPIO_ROTARY_ENCODER
        tristate "Rotary encoders connected to GPIO pins"
        depends on GPIOLIB && GENERIC_GPIO
@@ -390,4 +401,41 @@ config INPUT_PCAP
          To compile this driver as a module, choose M here: the
          module will be called pcap_keys.
+config INPUT_ADXL34X
+        tristate "Analog Devices ADXL34x Three-Axis Digital Accelerometer"
+        default n
+        help
+          Say Y here if you have a Accelerometer interface using the
+          ADXL345/6 controller, and your board-specific initialization
+          code includes that in its table of devices.
+          This driver can use either I2C or SPI communication to the
+          ADXL345/6 controller.  Select the appropriate method for
+          your system.
+          If unsure, say N (but it's safe to say "Y").
+          To compile this driver as a module, choose M here: the
+          module will be called adxl34x.
+config INPUT_ADXL34X_I2C
+        tristate "support I2C bus connection"
+        depends on INPUT_ADXL34X && I2C
+        default y
+        help
+          Say Y here if you have ADXL345/6 hooked to an I2C bus.
+          To compile this driver as a module, choose M here: the
+          module will be called adxl34x-i2c.
+config INPUT_ADXL34X_SPI
+        tristate "support SPI bus connection"
+        depends on INPUT_ADXL34X && SPI
+        default y
+        help
+          Say Y here if you have ADXL345/6 hooked to a SPI bus.
+          To compile this driver as a module, choose M here: the
+          module will be called adxl34x-spi.
 endif
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index 71fe57d8023f..19ccca78fa76 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -8,6 +8,9 @@ obj-$(CONFIG_INPUT_88PM860X_ONKEY)	+= 88pm860x_onkey.o
 obj-$(CONFIG_INPUT_AD714X)              += ad714x.o
 obj-$(CONFIG_INPUT_AD714X_I2C)          += ad714x-i2c.o
 obj-$(CONFIG_INPUT_AD714X_SPI)          += ad714x-spi.o
+obj-$(CONFIG_INPUT_ADXL34X)             += adxl34x.o
+obj-$(CONFIG_INPUT_ADXL34X_I2C)         += adxl34x-i2c.o
+obj-$(CONFIG_INPUT_ADXL34X_SPI)         += adxl34x-spi.o
 obj-$(CONFIG_INPUT_APANEL)              += apanel.o
 obj-$(CONFIG_INPUT_ATI_REMOTE)          += ati_remote.o
 obj-$(CONFIG_INPUT_ATI_REMOTE2)         += ati_remote2.o
@@ -26,6 +29,7 @@ obj-$(CONFIG_INPUT_PCF50633_PMU)	+= pcf50633-input.o
 obj-$(CONFIG_INPUT_PCF8574)             += pcf8574_keypad.o
 obj-$(CONFIG_INPUT_PCSPKR)              += pcspkr.o
 obj-$(CONFIG_INPUT_POWERMATE)           += powermate.o
+obj-$(CONFIG_INPUT_PWM_BEEPER)          += pwm-beeper.o
 obj-$(CONFIG_INPUT_RB532_BUTTON)        += rb532_button.o
 obj-$(CONFIG_INPUT_GPIO_ROTARY_ENCODER) += rotary_encoder.o
 obj-$(CONFIG_INPUT_SGI_BTNS)            += sgi_btns.o
diff --git a/drivers/input/misc/ad714x.c b/drivers/input/misc/ad714x.c
index 0fe27baf5e72..c431d09e401a 100644
--- a/drivers/input/misc/ad714x.c
+++ b/drivers/input/misc/ad714x.c
@@ -1118,7 +1118,7 @@ struct ad714x_chip *ad714x_probe(struct device *dev, u16 bus_type, int irq,
        if (error)
                goto err_free_mem;
-        /* initilize and request sw/hw resources */
+        /* initialize and request sw/hw resources */
        ad714x_hw_init(ad714x);
        mutex_init(&ad714x->mutex);
diff --git a/drivers/input/misc/adxl34x-i2c.c b/drivers/input/misc/adxl34x-i2c.c
new file mode 100644
index 000000000000..0779724af7e7
--- /dev/null
+++ b/drivers/input/misc/adxl34x-i2c.c
@@ -0,0 +1,163 @@
+/*
+ * ADLX345/346 Three-Axis Digital Accelerometers (I2C Interface)
+ *
+ * Enter bugs at http://blackfin.uclinux.org/
+ *
+ * Copyright (C) 2009 Michael Hennerich, Analog Devices Inc.
+ * Licensed under the GPL-2 or later.
+ */
+#include <linux/input.h>        /* BUS_I2C */
+#include <linux/i2c.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include "adxl34x.h"
+static int adxl34x_smbus_read(struct device *dev, unsigned char reg)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        return i2c_smbus_read_byte_data(client, reg);
+}
+static int adxl34x_smbus_write(struct device *dev,
+                               unsigned char reg, unsigned char val)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        return i2c_smbus_write_byte_data(client, reg, val);
+}
+static int adxl34x_smbus_read_block(struct device *dev,
+                                    unsigned char reg, int count,
+                                    void *buf)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        return i2c_smbus_read_i2c_block_data(client, reg, count, buf);
+}
+static int adxl34x_i2c_read_block(struct device *dev,
+                                  unsigned char reg, int count,
+                                  void *buf)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        int ret;
+        ret = i2c_master_send(client, &reg, 1);
+        if (ret < 0)
+                return ret;
+        ret = i2c_master_recv(client, buf, count);
+        if (ret < 0)
+                return ret;
+        if (ret != count)
+                return -EIO;
+        return 0;
+}
+static const struct adxl34x_bus_ops adxl34x_smbus_bops = {
+        .bustype        = BUS_I2C,
+        .write          = adxl34x_smbus_write,
+        .read           = adxl34x_smbus_read,
+        .read_block     = adxl34x_smbus_read_block,
+};
+static const struct adxl34x_bus_ops adxl34x_i2c_bops = {
+        .bustype        = BUS_I2C,
+        .write          = adxl34x_smbus_write,
+        .read           = adxl34x_smbus_read,
+        .read_block     = adxl34x_i2c_read_block,
+};
+static int __devinit adxl34x_i2c_probe(struct i2c_client *client,
+                                       const struct i2c_device_id *id)
+{
+        struct adxl34x *ac;
+        int error;
+        error = i2c_check_functionality(client->adapter,
+                        I2C_FUNC_SMBUS_BYTE_DATA);
+        if (!error) {
+                dev_err(&client->dev, "SMBUS Byte Data not Supported\n");
+                return -EIO;
+        }
+        ac = adxl34x_probe(&client->dev, client->irq, false,
+                           i2c_check_functionality(client->adapter,
+                                                   I2C_FUNC_SMBUS_READ_I2C_BLOCK) ?
+                                &adxl34x_smbus_bops : &adxl34x_i2c_bops);
+        if (IS_ERR(ac))
+                return PTR_ERR(ac);
+        i2c_set_clientdata(client, ac);
+        return 0;
+}
+static int __devexit adxl34x_i2c_remove(struct i2c_client *client)
+{
+        struct adxl34x *ac = i2c_get_clientdata(client);
+        return adxl34x_remove(ac);
+}
+#ifdef CONFIG_PM
+static int adxl34x_i2c_suspend(struct i2c_client *client, pm_message_t message)
+{
+        struct adxl34x *ac = i2c_get_clientdata(client);
+        adxl34x_suspend(ac);
+        return 0;
+}
+static int adxl34x_i2c_resume(struct i2c_client *client)
+{
+        struct adxl34x *ac = i2c_get_clientdata(client);
+        adxl34x_resume(ac);
+        return 0;
+}
+#else
+# define adxl34x_i2c_suspend NULL
+# define adxl34x_i2c_resume  NULL
+#endif
+static const struct i2c_device_id adxl34x_id[] = {
+        { "adxl34x", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, adxl34x_id);
+static struct i2c_driver adxl34x_driver = {
+        .driver = {
+                .name = "adxl34x",
+                .owner = THIS_MODULE,
+        },
+        .probe    = adxl34x_i2c_probe,
+        .remove   = __devexit_p(adxl34x_i2c_remove),
+        .suspend  = adxl34x_i2c_suspend,
+        .resume   = adxl34x_i2c_resume,
+        .id_table = adxl34x_id,
+};
+static int __init adxl34x_i2c_init(void)
+{
+        return i2c_add_driver(&adxl34x_driver);
+}
+module_init(adxl34x_i2c_init);
+static void __exit adxl34x_i2c_exit(void)
+{
+        i2c_del_driver(&adxl34x_driver);
+}
+module_exit(adxl34x_i2c_exit);
+MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
+MODULE_DESCRIPTION("ADXL345/346 Three-Axis Digital Accelerometer I2C Bus Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/input/misc/adxl34x-spi.c b/drivers/input/misc/adxl34x-spi.c
new file mode 100644
index 000000000000..782de9e89828
--- /dev/null
+++ b/drivers/input/misc/adxl34x-spi.c
@@ -0,0 +1,145 @@
+/*
+ * ADLX345/346 Three-Axis Digital Accelerometers (SPI Interface)
+ *
+ * Enter bugs at http://blackfin.uclinux.org/
+ *
+ * Copyright (C) 2009 Michael Hennerich, Analog Devices Inc.
+ * Licensed under the GPL-2 or later.
+ */
+#include <linux/input.h>        /* BUS_SPI */
+#include <linux/module.h>
+#include <linux/spi/spi.h>
+#include <linux/types.h>
+#include "adxl34x.h"
+#define MAX_SPI_FREQ_HZ         5000000
+#define MAX_FREQ_NO_FIFODELAY   1500000
+#define ADXL34X_CMD_MULTB       (1 << 6)
+#define ADXL34X_CMD_READ        (1 << 7)
+#define ADXL34X_WRITECMD(reg)   (reg & 0x3F)
+#define ADXL34X_READCMD(reg)    (ADXL34X_CMD_READ | (reg & 0x3F))
+#define ADXL34X_READMB_CMD(reg) (ADXL34X_CMD_READ | ADXL34X_CMD_MULTB \
+                                        | (reg & 0x3F))
+static int adxl34x_spi_read(struct device *dev, unsigned char reg)
+{
+        struct spi_device *spi = to_spi_device(dev);
+        unsigned char cmd;
+        cmd = ADXL34X_READCMD(reg);
+        return spi_w8r8(spi, cmd);
+}
+static int adxl34x_spi_write(struct device *dev,
+                             unsigned char reg, unsigned char val)
+{
+        struct spi_device *spi = to_spi_device(dev);
+        unsigned char buf[2];
+        buf[0] = ADXL34X_WRITECMD(reg);
+        buf[1] = val;
+        return spi_write(spi, buf, sizeof(buf));
+}
+static int adxl34x_spi_read_block(struct device *dev,
+                                  unsigned char reg, int count,
+                                  void *buf)
+{
+        struct spi_device *spi = to_spi_device(dev);
+        ssize_t status;
+        reg = ADXL34X_READMB_CMD(reg);
+        status = spi_write_then_read(spi, &reg, 1, buf, count);
+        return (status < 0) ? status : 0;
+}
+static const struct adxl34x_bus_ops adx134x_spi_bops = {
+        .bustype        = BUS_SPI,
+        .write          = adxl34x_spi_write,
+        .read           = adxl34x_spi_read,
+        .read_block     = adxl34x_spi_read_block,
+};
+static int __devinit adxl34x_spi_probe(struct spi_device *spi)
+{
+        struct adxl34x *ac;
+        /* don't exceed max specified SPI CLK frequency */
+        if (spi->max_speed_hz > MAX_SPI_FREQ_HZ) {
+                dev_err(&spi->dev, "SPI CLK %d Hz too fast\n", spi->max_speed_hz);
+                return -EINVAL;
+        }
+        ac = adxl34x_probe(&spi->dev, spi->irq,
+                           spi->max_speed_hz > MAX_FREQ_NO_FIFODELAY,
+                           &adx134x_spi_bops);
+        if (IS_ERR(ac))
+                return PTR_ERR(ac);
+        spi_set_drvdata(spi, ac);
+        return 0;
+}
+static int __devexit adxl34x_spi_remove(struct spi_device *spi)
+{
+        struct adxl34x *ac = dev_get_drvdata(&spi->dev);
+        return adxl34x_remove(ac);
+}
+#ifdef CONFIG_PM
+static int adxl34x_spi_suspend(struct spi_device *spi, pm_message_t message)
+{
+        struct adxl34x *ac = dev_get_drvdata(&spi->dev);
+        adxl34x_suspend(ac);
+        return 0;
+}
+static int adxl34x_spi_resume(struct spi_device *spi)
+{
+        struct adxl34x *ac = dev_get_drvdata(&spi->dev);
+        adxl34x_resume(ac);
+        return 0;
+}
+#else
+# define adxl34x_spi_suspend NULL
+# define adxl34x_spi_resume  NULL
+#endif
+static struct spi_driver adxl34x_driver = {
+        .driver = {
+                .name = "adxl34x",
+                .bus = &spi_bus_type,
+                .owner = THIS_MODULE,
+        },
+        .probe   = adxl34x_spi_probe,
+        .remove  = __devexit_p(adxl34x_spi_remove),
+        .suspend = adxl34x_spi_suspend,
+        .resume  = adxl34x_spi_resume,
+};
+static int __init adxl34x_spi_init(void)
+{
+        return spi_register_driver(&adxl34x_driver);
+}
+module_init(adxl34x_spi_init);
+static void __exit adxl34x_spi_exit(void)
+{
+        spi_unregister_driver(&adxl34x_driver);
+}
+module_exit(adxl34x_spi_exit);
+MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
+MODULE_DESCRIPTION("ADXL345/346 Three-Axis Digital Accelerometer SPI Bus Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/input/misc/adxl34x.c b/drivers/input/misc/adxl34x.c
new file mode 100644
index 000000000000..e2ca01708080
--- /dev/null
+++ b/drivers/input/misc/adxl34x.c
@@ -0,0 +1,915 @@
+/*
+ * ADXL345/346 Three-Axis Digital Accelerometers
+ *
+ * Enter bugs at http://blackfin.uclinux.org/
+ *
+ * Copyright (C) 2009 Michael Hennerich, Analog Devices Inc.
+ * Licensed under the GPL-2 or later.
+ */
+#include <linux/device.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/slab.h>
+#include <linux/workqueue.h>
+#include <linux/input/adxl34x.h>
+#include "adxl34x.h"
+/* ADXL345/6 Register Map */
+#define DEVID           0x00    /* R   Device ID */
+#define THRESH_TAP      0x1D    /* R/W Tap threshold */
+#define OFSX            0x1E    /* R/W X-axis offset */
+#define OFSY            0x1F    /* R/W Y-axis offset */
+#define OFSZ            0x20    /* R/W Z-axis offset */
+#define DUR             0x21    /* R/W Tap duration */
+#define LATENT          0x22    /* R/W Tap latency */
+#define WINDOW          0x23    /* R/W Tap window */
+#define THRESH_ACT      0x24    /* R/W Activity threshold */
+#define THRESH_INACT    0x25    /* R/W Inactivity threshold */
+#define TIME_INACT      0x26    /* R/W Inactivity time */
+#define ACT_INACT_CTL   0x27    /* R/W Axis enable control for activity and */
+                                /* inactivity detection */
+#define THRESH_FF       0x28    /* R/W Free-fall threshold */
+#define TIME_FF         0x29    /* R/W Free-fall time */
+#define TAP_AXES        0x2A    /* R/W Axis control for tap/double tap */
+#define ACT_TAP_STATUS  0x2B    /* R   Source of tap/double tap */
+#define BW_RATE         0x2C    /* R/W Data rate and power mode control */
+#define POWER_CTL       0x2D    /* R/W Power saving features control */
+#define INT_ENABLE      0x2E    /* R/W Interrupt enable control */
+#define INT_MAP         0x2F    /* R/W Interrupt mapping control */
+#define INT_SOURCE      0x30    /* R   Source of interrupts */
+#define DATA_FORMAT     0x31    /* R/W Data format control */
+#define DATAX0          0x32    /* R   X-Axis Data 0 */
+#define DATAX1          0x33    /* R   X-Axis Data 1 */
+#define DATAY0          0x34    /* R   Y-Axis Data 0 */
+#define DATAY1          0x35    /* R   Y-Axis Data 1 */
+#define DATAZ0          0x36    /* R   Z-Axis Data 0 */
+#define DATAZ1          0x37    /* R   Z-Axis Data 1 */
+#define FIFO_CTL        0x38    /* R/W FIFO control */
+#define FIFO_STATUS     0x39    /* R   FIFO status */
+#define TAP_SIGN        0x3A    /* R   Sign and source for tap/double tap */
+/* Orientation ADXL346 only */
+#define ORIENT_CONF     0x3B    /* R/W Orientation configuration */
+#define ORIENT          0x3C    /* R   Orientation status */
+/* DEVIDs */
+#define ID_ADXL345      0xE5
+#define ID_ADXL346      0xE6
+/* INT_ENABLE/INT_MAP/INT_SOURCE Bits */
+#define DATA_READY      (1 << 7)
+#define SINGLE_TAP      (1 << 6)
+#define DOUBLE_TAP      (1 << 5)
+#define ACTIVITY        (1 << 4)
+#define INACTIVITY      (1 << 3)
+#define FREE_FALL       (1 << 2)
+#define WATERMARK       (1 << 1)
+#define OVERRUN         (1 << 0)
+/* ACT_INACT_CONTROL Bits */
+#define ACT_ACDC        (1 << 7)
+#define ACT_X_EN        (1 << 6)
+#define ACT_Y_EN        (1 << 5)
+#define ACT_Z_EN        (1 << 4)
+#define INACT_ACDC      (1 << 3)
+#define INACT_X_EN      (1 << 2)
+#define INACT_Y_EN      (1 << 1)
+#define INACT_Z_EN      (1 << 0)
+/* TAP_AXES Bits */
+#define SUPPRESS        (1 << 3)
+#define TAP_X_EN        (1 << 2)
+#define TAP_Y_EN        (1 << 1)
+#define TAP_Z_EN        (1 << 0)
+/* ACT_TAP_STATUS Bits */
+#define ACT_X_SRC       (1 << 6)
+#define ACT_Y_SRC       (1 << 5)
+#define ACT_Z_SRC       (1 << 4)
+#define ASLEEP          (1 << 3)
+#define TAP_X_SRC       (1 << 2)
+#define TAP_Y_SRC       (1 << 1)
+#define TAP_Z_SRC       (1 << 0)
+/* BW_RATE Bits */
+#define LOW_POWER       (1 << 4)
+#define RATE(x)         ((x) & 0xF)
+/* POWER_CTL Bits */
+#define PCTL_LINK       (1 << 5)
+#define PCTL_AUTO_SLEEP (1 << 4)
+#define PCTL_MEASURE    (1 << 3)
+#define PCTL_SLEEP      (1 << 2)
+#define PCTL_WAKEUP(x)  ((x) & 0x3)
+/* DATA_FORMAT Bits */
+#define SELF_TEST       (1 << 7)
+#define SPI             (1 << 6)
+#define INT_INVERT      (1 << 5)
+#define FULL_RES        (1 << 3)
+#define JUSTIFY         (1 << 2)
+#define RANGE(x)        ((x) & 0x3)
+#define RANGE_PM_2g     0
+#define RANGE_PM_4g     1
+#define RANGE_PM_8g     2
+#define RANGE_PM_16g    3
+/*
+ * Maximum value our axis may get in full res mode for the input device
+ * (signed 13 bits)
+ */
+#define ADXL_FULLRES_MAX_VAL 4096
+/*
+ * Maximum value our axis may get in fixed res mode for the input device
+ * (signed 10 bits)
+ */
+#define ADXL_FIXEDRES_MAX_VAL 512
+/* FIFO_CTL Bits */
+#define FIFO_MODE(x)    (((x) & 0x3) << 6)
+#define FIFO_BYPASS     0
+#define FIFO_FIFO       1
+#define FIFO_STREAM     2
+#define FIFO_TRIGGER    3
+#define TRIGGER         (1 << 5)
+#define SAMPLES(x)      ((x) & 0x1F)
+/* FIFO_STATUS Bits */
+#define FIFO_TRIG       (1 << 7)
+#define ENTRIES(x)      ((x) & 0x3F)
+/* TAP_SIGN Bits ADXL346 only */
+#define XSIGN           (1 << 6)
+#define YSIGN           (1 << 5)
+#define ZSIGN           (1 << 4)
+#define XTAP            (1 << 3)
+#define YTAP            (1 << 2)
+#define ZTAP            (1 << 1)
+/* ORIENT_CONF ADXL346 only */
+#define ORIENT_DEADZONE(x)      (((x) & 0x7) << 4)
+#define ORIENT_DIVISOR(x)       ((x) & 0x7)
+/* ORIENT ADXL346 only */
+#define ADXL346_2D_VALID                (1 << 6)
+#define ADXL346_2D_ORIENT(x)            (((x) & 0x3) >> 4)
+#define ADXL346_3D_VALID                (1 << 3)
+#define ADXL346_3D_ORIENT(x)            ((x) & 0x7)
+#define ADXL346_2D_PORTRAIT_POS         0       /* +X */
+#define ADXL346_2D_PORTRAIT_NEG         1       /* -X */
+#define ADXL346_2D_LANDSCAPE_POS        2       /* +Y */
+#define ADXL346_2D_LANDSCAPE_NEG        3       /* -Y */
+#define ADXL346_3D_FRONT                3       /* +X */
+#define ADXL346_3D_BACK                 4       /* -X */
+#define ADXL346_3D_RIGHT                2       /* +Y */
+#define ADXL346_3D_LEFT                 5       /* -Y */
+#define ADXL346_3D_TOP                  1       /* +Z */
+#define ADXL346_3D_BOTTOM               6       /* -Z */
+#undef ADXL_DEBUG
+#define ADXL_X_AXIS                     0
+#define ADXL_Y_AXIS                     1
+#define ADXL_Z_AXIS                     2
+#define AC_READ(ac, reg)        ((ac)->bops->read((ac)->dev, reg))
+#define AC_WRITE(ac, reg, val)  ((ac)->bops->write((ac)->dev, reg, val))
+struct axis_triple {
+        int x;
+        int y;
+        int z;
+};
+struct adxl34x {
+        struct device *dev;
+        struct input_dev *input;
+        struct mutex mutex;     /* reentrant protection for struct */
+        struct adxl34x_platform_data pdata;
+        struct axis_triple swcal;
+        struct axis_triple hwcal;
+        struct axis_triple saved;
+        char phys[32];
+        unsigned orient2d_saved;
+        unsigned orient3d_saved;
+        bool disabled;  /* P: mutex */
+        bool opened;    /* P: mutex */
+        bool suspended; /* P: mutex */
+        bool fifo_delay;
+        int irq;
+        unsigned model;
+        unsigned int_mask;
+        const struct adxl34x_bus_ops *bops;
+};
+static const struct adxl34x_platform_data adxl34x_default_init = {
+        .tap_threshold = 35,
+        .tap_duration = 3,
+        .tap_latency = 20,
+        .tap_window = 20,
+        .tap_axis_control = ADXL_TAP_X_EN | ADXL_TAP_Y_EN | ADXL_TAP_Z_EN,
+        .act_axis_control = 0xFF,
+        .activity_threshold = 6,
+        .inactivity_threshold = 4,
+        .inactivity_time = 3,
+        .free_fall_threshold = 8,
+        .free_fall_time = 0x20,
+        .data_rate = 8,
+        .data_range = ADXL_FULL_RES,
+        .ev_type = EV_ABS,
+        .ev_code_x = ABS_X,     /* EV_REL */
+        .ev_code_y = ABS_Y,     /* EV_REL */
+        .ev_code_z = ABS_Z,     /* EV_REL */
+        .ev_code_tap = {BTN_TOUCH, BTN_TOUCH, BTN_TOUCH}, /* EV_KEY {x,y,z} */
+        .power_mode = ADXL_AUTO_SLEEP | ADXL_LINK,
+        .fifo_mode = FIFO_STREAM,
+        .watermark = 0,
+};
+static void adxl34x_get_triple(struct adxl34x *ac, struct axis_triple *axis)
+{
+        short buf[3];
+        ac->bops->read_block(ac->dev, DATAX0, DATAZ1 - DATAX0 + 1, buf);
+        mutex_lock(&ac->mutex);
+        ac->saved.x = (s16) le16_to_cpu(buf[0]);
+        axis->x = ac->saved.x;
+        ac->saved.y = (s16) le16_to_cpu(buf[1]);
+        axis->y = ac->saved.y;
+        ac->saved.z = (s16) le16_to_cpu(buf[2]);
+        axis->z = ac->saved.z;
+        mutex_unlock(&ac->mutex);
+}
+static void adxl34x_service_ev_fifo(struct adxl34x *ac)
+{
+        struct adxl34x_platform_data *pdata = &ac->pdata;
+        struct axis_triple axis;
+        adxl34x_get_triple(ac, &axis);
+        input_event(ac->input, pdata->ev_type, pdata->ev_code_x,
+                    axis.x - ac->swcal.x);
+        input_event(ac->input, pdata->ev_type, pdata->ev_code_y,
+                    axis.y - ac->swcal.y);
+        input_event(ac->input, pdata->ev_type, pdata->ev_code_z,
+                    axis.z - ac->swcal.z);
+}
+static void adxl34x_report_key_single(struct input_dev *input, int key)
+{
+        input_report_key(input, key, true);
+        input_sync(input);
+        input_report_key(input, key, false);
+}
+static void adxl34x_send_key_events(struct adxl34x *ac,
+                struct adxl34x_platform_data *pdata, int status, int press)
+{
+        int i;
+        for (i = ADXL_X_AXIS; i <= ADXL_Z_AXIS; i++) {
+                if (status & (1 << (ADXL_Z_AXIS - i)))
+                        input_report_key(ac->input,
+                                         pdata->ev_code_tap[i], press);
+        }
+}
+static void adxl34x_do_tap(struct adxl34x *ac,
+                struct adxl34x_platform_data *pdata, int status)
+{
+        adxl34x_send_key_events(ac, pdata, status, true);
+        input_sync(ac->input);
+        adxl34x_send_key_events(ac, pdata, status, false);
+}
+static irqreturn_t adxl34x_irq(int irq, void *handle)
+{
+        struct adxl34x *ac = handle;
+        struct adxl34x_platform_data *pdata = &ac->pdata;
+        int int_stat, tap_stat, samples, orient, orient_code;
+        /*
+         * ACT_TAP_STATUS should be read before clearing the interrupt
+         * Avoid reading ACT_TAP_STATUS in case TAP detection is disabled
+         */
+        if (pdata->tap_axis_control & (TAP_X_EN | TAP_Y_EN | TAP_Z_EN))
+                tap_stat = AC_READ(ac, ACT_TAP_STATUS);
+        else
+                tap_stat = 0;
+        int_stat = AC_READ(ac, INT_SOURCE);
+        if (int_stat & FREE_FALL)
+                adxl34x_report_key_single(ac->input, pdata->ev_code_ff);
+        if (int_stat & OVERRUN)
+                dev_dbg(ac->dev, "OVERRUN\n");
+        if (int_stat & (SINGLE_TAP | DOUBLE_TAP)) {
+                adxl34x_do_tap(ac, pdata, tap_stat);
+                if (int_stat & DOUBLE_TAP)
+                        adxl34x_do_tap(ac, pdata, tap_stat);
+        }
+        if (pdata->ev_code_act_inactivity) {
+                if (int_stat & ACTIVITY)
+                        input_report_key(ac->input,
+                                         pdata->ev_code_act_inactivity, 1);
+                if (int_stat & INACTIVITY)
+                        input_report_key(ac->input,
+                                         pdata->ev_code_act_inactivity, 0);
+        }
+        /*
+         * ORIENTATION SENSING ADXL346 only
+         */
+        if (pdata->orientation_enable) {
+                orient = AC_READ(ac, ORIENT);
+                if ((pdata->orientation_enable & ADXL_EN_ORIENTATION_2D) &&
+                    (orient & ADXL346_2D_VALID)) {
+                        orient_code = ADXL346_2D_ORIENT(orient);
+                        /* Report orientation only when it changes */
+                        if (ac->orient2d_saved != orient_code) {
+                                ac->orient2d_saved = orient_code;
+                                adxl34x_report_key_single(ac->input,
+                                        pdata->ev_codes_orient_2d[orient_code]);
+                        }
+                }
+                if ((pdata->orientation_enable & ADXL_EN_ORIENTATION_3D) &&
+                    (orient & ADXL346_3D_VALID)) {
+                        orient_code = ADXL346_3D_ORIENT(orient) - 1;
+                        /* Report orientation only when it changes */
+                        if (ac->orient3d_saved != orient_code) {
+                                ac->orient3d_saved = orient_code;
+                                adxl34x_report_key_single(ac->input,
+                                        pdata->ev_codes_orient_3d[orient_code]);
+                        }
+                }
+        }
+        if (int_stat & (DATA_READY | WATERMARK)) {
+                if (pdata->fifo_mode)
+                        samples = ENTRIES(AC_READ(ac, FIFO_STATUS)) + 1;
+                else
+                        samples = 1;
+                for (; samples > 0; samples--) {
+                        adxl34x_service_ev_fifo(ac);
+                        /*
+                         * To ensure that the FIFO has
+                         * completely popped, there must be at least 5 us between
+                         * the end of reading the data registers, signified by the
+                         * transition to register 0x38 from 0x37 or the CS pin
+                         * going high, and the start of new reads of the FIFO or
+                         * reading the FIFO_STATUS register. For SPI operation at
+                         * 1.5 MHz or lower, the register addressing portion of the
+                         * transmission is sufficient delay to ensure the FIFO has
+                         * completely popped. It is necessary for SPI operation
+                         * greater than 1.5 MHz to de-assert the CS pin to ensure a
+                         * total of 5 us, which is at most 3.4 us at 5 MHz
+                         * operation.
+                         */
+                        if (ac->fifo_delay && (samples > 1))
+                                udelay(3);
+                }
+        }
+        input_sync(ac->input);
+        return IRQ_HANDLED;
+}
+static void __adxl34x_disable(struct adxl34x *ac)
+{
+        /*
+         * A '0' places the ADXL34x into standby mode
+         * with minimum power consumption.
+         */
+        AC_WRITE(ac, POWER_CTL, 0);
+}
+static void __adxl34x_enable(struct adxl34x *ac)
+{
+        AC_WRITE(ac, POWER_CTL, ac->pdata.power_mode | PCTL_MEASURE);
+}
+void adxl34x_suspend(struct adxl34x *ac)
+{
+        mutex_lock(&ac->mutex);
+        if (!ac->suspended && !ac->disabled && ac->opened)
+                __adxl34x_disable(ac);
+        ac->suspended = true;
+        mutex_unlock(&ac->mutex);
+}
+EXPORT_SYMBOL_GPL(adxl34x_suspend);
+void adxl34x_resume(struct adxl34x *ac)
+{
+        mutex_lock(&ac->mutex);
+        if (ac->suspended && !ac->disabled && ac->opened)
+                __adxl34x_enable(ac);
+        ac->suspended = false;
+        mutex_unlock(&ac->mutex);
+}
+EXPORT_SYMBOL_GPL(adxl34x_resume);
+static ssize_t adxl34x_disable_show(struct device *dev,
+                                    struct device_attribute *attr, char *buf)
+{
+        struct adxl34x *ac = dev_get_drvdata(dev);
+        return sprintf(buf, "%u\n", ac->disabled);
+}
+static ssize_t adxl34x_disable_store(struct device *dev,
+                                     struct device_attribute *attr,
+                                     const char *buf, size_t count)
+{
+        struct adxl34x *ac = dev_get_drvdata(dev);
+        unsigned long val;
+        int error;
+        error = strict_strtoul(buf, 10, &val);
+        if (error)
+                return error;
+        mutex_lock(&ac->mutex);
+        if (!ac->suspended && ac->opened) {
+                if (val) {
+                        if (!ac->disabled)
+                                __adxl34x_disable(ac);
+                } else {
+                        if (ac->disabled)
+                                __adxl34x_enable(ac);
+                }
+        }
+        ac->disabled = !!val;
+        mutex_unlock(&ac->mutex);
+        return count;
+}
+static DEVICE_ATTR(disable, 0664, adxl34x_disable_show, adxl34x_disable_store);
+static ssize_t adxl34x_calibrate_show(struct device *dev,
+                                      struct device_attribute *attr, char *buf)
+{
+        struct adxl34x *ac = dev_get_drvdata(dev);
+        ssize_t count;
+        mutex_lock(&ac->mutex);
+        count = sprintf(buf, "%d,%d,%d\n",
+                        ac->hwcal.x * 4 + ac->swcal.x,
+                        ac->hwcal.y * 4 + ac->swcal.y,
+                        ac->hwcal.z * 4 + ac->swcal.z);
+        mutex_unlock(&ac->mutex);
+        return count;
+}
+static ssize_t adxl34x_calibrate_store(struct device *dev,
+                                       struct device_attribute *attr,
+                                       const char *buf, size_t count)
+{
+        struct adxl34x *ac = dev_get_drvdata(dev);
+        /*
+         * Hardware offset calibration has a resolution of 15.6 mg/LSB.
+         * We use HW calibration and handle the remaining bits in SW. (4mg/LSB)
+         */
+        mutex_lock(&ac->mutex);
+        ac->hwcal.x -= (ac->saved.x / 4);
+        ac->swcal.x = ac->saved.x % 4;
+        ac->hwcal.y -= (ac->saved.y / 4);
+        ac->swcal.y = ac->saved.y % 4;
+        ac->hwcal.z -= (ac->saved.z / 4);
+        ac->swcal.z = ac->saved.z % 4;
+        AC_WRITE(ac, OFSX, (s8) ac->hwcal.x);
+        AC_WRITE(ac, OFSY, (s8) ac->hwcal.y);
+        AC_WRITE(ac, OFSZ, (s8) ac->hwcal.z);
+        mutex_unlock(&ac->mutex);
+        return count;
+}
+static DEVICE_ATTR(calibrate, 0664,
+                   adxl34x_calibrate_show, adxl34x_calibrate_store);
+static ssize_t adxl34x_rate_show(struct device *dev,
+                                 struct device_attribute *attr, char *buf)
+{
+        struct adxl34x *ac = dev_get_drvdata(dev);
+        return sprintf(buf, "%u\n", RATE(ac->pdata.data_rate));
+}
+static ssize_t adxl34x_rate_store(struct device *dev,
+                                  struct device_attribute *attr,
+                                  const char *buf, size_t count)
+{
+        struct adxl34x *ac = dev_get_drvdata(dev);
+        unsigned long val;
+        int error;
+        error = strict_strtoul(buf, 10, &val);
+        if (error)
+                return error;
+        mutex_lock(&ac->mutex);
+        ac->pdata.data_rate = RATE(val);
+        AC_WRITE(ac, BW_RATE,
+                 ac->pdata.data_rate |
+                        (ac->pdata.low_power_mode ? LOW_POWER : 0));
+        mutex_unlock(&ac->mutex);
+        return count;
+}
+static DEVICE_ATTR(rate, 0664, adxl34x_rate_show, adxl34x_rate_store);
+static ssize_t adxl34x_autosleep_show(struct device *dev,
+                                 struct device_attribute *attr, char *buf)
+{
+        struct adxl34x *ac = dev_get_drvdata(dev);
+        return sprintf(buf, "%u\n",
+                ac->pdata.power_mode & (PCTL_AUTO_SLEEP | PCTL_LINK) ? 1 : 0);
+}
+static ssize_t adxl34x_autosleep_store(struct device *dev,
+                                  struct device_attribute *attr,
+                                  const char *buf, size_t count)
+{
+        struct adxl34x *ac = dev_get_drvdata(dev);
+        unsigned long val;
+        int error;
+        error = strict_strtoul(buf, 10, &val);
+        if (error)
+                return error;
+        mutex_lock(&ac->mutex);
+        if (val)
+                ac->pdata.power_mode |= (PCTL_AUTO_SLEEP | PCTL_LINK);
+        else
+                ac->pdata.power_mode &= ~(PCTL_AUTO_SLEEP | PCTL_LINK);
+        if (!ac->disabled && !ac->suspended && ac->opened)
+                AC_WRITE(ac, POWER_CTL, ac->pdata.power_mode | PCTL_MEASURE);
+        mutex_unlock(&ac->mutex);
+        return count;
+}
+static DEVICE_ATTR(autosleep, 0664,
+                   adxl34x_autosleep_show, adxl34x_autosleep_store);
+static ssize_t adxl34x_position_show(struct device *dev,
+                                 struct device_attribute *attr, char *buf)
+{
+        struct adxl34x *ac = dev_get_drvdata(dev);
+        ssize_t count;
+        mutex_lock(&ac->mutex);
+        count = sprintf(buf, "(%d, %d, %d)\n",
+                        ac->saved.x, ac->saved.y, ac->saved.z);
+        mutex_unlock(&ac->mutex);
+        return count;
+}
+static DEVICE_ATTR(position, S_IRUGO, adxl34x_position_show, NULL);
+#ifdef ADXL_DEBUG
+static ssize_t adxl34x_write_store(struct device *dev,
+                                   struct device_attribute *attr,
+                                   const char *buf, size_t count)
+{
+        struct adxl34x *ac = dev_get_drvdata(dev);
+        unsigned long val;
+        int error;
+        /*
+         * This allows basic ADXL register write access for debug purposes.
+         */
+        error = strict_strtoul(buf, 16, &val);
+        if (error)
+                return error;
+        mutex_lock(&ac->mutex);
+        AC_WRITE(ac, val >> 8, val & 0xFF);
+        mutex_unlock(&ac->mutex);
+        return count;
+}
+static DEVICE_ATTR(write, 0664, NULL, adxl34x_write_store);
+#endif
+static struct attribute *adxl34x_attributes[] = {
+        &dev_attr_disable.attr,
+        &dev_attr_calibrate.attr,
+        &dev_attr_rate.attr,
+        &dev_attr_autosleep.attr,
+        &dev_attr_position.attr,
+#ifdef ADXL_DEBUG
+        &dev_attr_write.attr,
+#endif
+        NULL
+};
+static const struct attribute_group adxl34x_attr_group = {
+        .attrs = adxl34x_attributes,
+};
+static int adxl34x_input_open(struct input_dev *input)
+{
+        struct adxl34x *ac = input_get_drvdata(input);
+        mutex_lock(&ac->mutex);
+        if (!ac->suspended && !ac->disabled)
+                __adxl34x_enable(ac);
+        ac->opened = true;
+        mutex_unlock(&ac->mutex);
+        return 0;
+}
+static void adxl34x_input_close(struct input_dev *input)
+{
+        struct adxl34x *ac = input_get_drvdata(input);
+        mutex_lock(&ac->mutex);
+        if (!ac->suspended && !ac->disabled)
+                __adxl34x_disable(ac);
+        ac->opened = false;
+        mutex_unlock(&ac->mutex);
+}
+struct adxl34x *adxl34x_probe(struct device *dev, int irq,
+                              bool fifo_delay_default,
+                              const struct adxl34x_bus_ops *bops)
+{
+        struct adxl34x *ac;
+        struct input_dev *input_dev;
+        const struct adxl34x_platform_data *pdata;
+        int err, range, i;
+        unsigned char revid;
+        if (!irq) {
+                dev_err(dev, "no IRQ?\n");
+                err = -ENODEV;
+                goto err_out;
+        }
+        ac = kzalloc(sizeof(*ac), GFP_KERNEL);
+        input_dev = input_allocate_device();
+        if (!ac || !input_dev) {
+                err = -ENOMEM;
+                goto err_free_mem;
+        }
+        ac->fifo_delay = fifo_delay_default;
+        pdata = dev->platform_data;
+        if (!pdata) {
+                dev_dbg(dev,
+                        "No platfrom data: Using default initialization\n");
+                pdata = &adxl34x_default_init;
+        }
+        ac->pdata = *pdata;
+        pdata = &ac->pdata;
+        ac->input = input_dev;
+        ac->disabled = true;
+        ac->dev = dev;
+        ac->irq = irq;
+        ac->bops = bops;
+        mutex_init(&ac->mutex);
+        input_dev->name = "ADXL34x accelerometer";
+        revid = ac->bops->read(dev, DEVID);
+        switch (revid) {
+        case ID_ADXL345:
+                ac->model = 345;
+                break;
+        case ID_ADXL346:
+                ac->model = 346;
+                break;
+        default:
+                dev_err(dev, "Failed to probe %s\n", input_dev->name);
+                err = -ENODEV;
+                goto err_free_mem;
+        }
+        snprintf(ac->phys, sizeof(ac->phys), "%s/input0", dev_name(dev));
+        input_dev->phys = ac->phys;
+        input_dev->dev.parent = dev;
+        input_dev->id.product = ac->model;
+        input_dev->id.bustype = bops->bustype;
+        input_dev->open = adxl34x_input_open;
+        input_dev->close = adxl34x_input_close;
+        input_set_drvdata(input_dev, ac);
+        __set_bit(ac->pdata.ev_type, input_dev->evbit);
+        if (ac->pdata.ev_type == EV_REL) {
+                __set_bit(REL_X, input_dev->relbit);
+                __set_bit(REL_Y, input_dev->relbit);
+                __set_bit(REL_Z, input_dev->relbit);
+        } else {
+                /* EV_ABS */
+                __set_bit(ABS_X, input_dev->absbit);
+                __set_bit(ABS_Y, input_dev->absbit);
+                __set_bit(ABS_Z, input_dev->absbit);
+                if (pdata->data_range & FULL_RES)
+                        range = ADXL_FULLRES_MAX_VAL;   /* Signed 13-bit */
+                else
+                        range = ADXL_FIXEDRES_MAX_VAL;  /* Signed 10-bit */
+                input_set_abs_params(input_dev, ABS_X, -range, range, 3, 3);
+                input_set_abs_params(input_dev, ABS_Y, -range, range, 3, 3);
+                input_set_abs_params(input_dev, ABS_Z, -range, range, 3, 3);
+        }
+        __set_bit(EV_KEY, input_dev->evbit);
+        __set_bit(pdata->ev_code_tap[ADXL_X_AXIS], input_dev->keybit);
+        __set_bit(pdata->ev_code_tap[ADXL_Y_AXIS], input_dev->keybit);
+        __set_bit(pdata->ev_code_tap[ADXL_Z_AXIS], input_dev->keybit);
+        if (pdata->ev_code_ff) {
+                ac->int_mask = FREE_FALL;
+                __set_bit(pdata->ev_code_ff, input_dev->keybit);
+        }
+        if (pdata->ev_code_act_inactivity)
+                __set_bit(pdata->ev_code_act_inactivity, input_dev->keybit);
+        ac->int_mask |= ACTIVITY | INACTIVITY;
+        if (pdata->watermark) {
+                ac->int_mask |= WATERMARK;
+                if (!FIFO_MODE(pdata->fifo_mode))
+                        ac->pdata.fifo_mode |= FIFO_STREAM;
+        } else {
+                ac->int_mask |= DATA_READY;
+        }
+        if (pdata->tap_axis_control & (TAP_X_EN | TAP_Y_EN | TAP_Z_EN))
+                ac->int_mask |= SINGLE_TAP | DOUBLE_TAP;
+        if (FIFO_MODE(pdata->fifo_mode) == FIFO_BYPASS)
+                ac->fifo_delay = false;
+        ac->bops->write(dev, POWER_CTL, 0);
+        err = request_threaded_irq(ac->irq, NULL, adxl34x_irq,
+                                   IRQF_TRIGGER_HIGH | IRQF_ONESHOT,
+                                   dev_name(dev), ac);
+        if (err) {
+                dev_err(dev, "irq %d busy?\n", ac->irq);
+                goto err_free_mem;
+        }
+        err = sysfs_create_group(&dev->kobj, &adxl34x_attr_group);
+        if (err)
+                goto err_free_irq;
+        err = input_register_device(input_dev);
+        if (err)
+                goto err_remove_attr;
+        AC_WRITE(ac, THRESH_TAP, pdata->tap_threshold);
+        AC_WRITE(ac, OFSX, pdata->x_axis_offset);
+        ac->hwcal.x = pdata->x_axis_offset;
+        AC_WRITE(ac, OFSY, pdata->y_axis_offset);
+        ac->hwcal.y = pdata->y_axis_offset;
+        AC_WRITE(ac, OFSZ, pdata->z_axis_offset);
+        ac->hwcal.z = pdata->z_axis_offset;
+        AC_WRITE(ac, THRESH_TAP, pdata->tap_threshold);
+        AC_WRITE(ac, DUR, pdata->tap_duration);
+        AC_WRITE(ac, LATENT, pdata->tap_latency);
+        AC_WRITE(ac, WINDOW, pdata->tap_window);
+        AC_WRITE(ac, THRESH_ACT, pdata->activity_threshold);
+        AC_WRITE(ac, THRESH_INACT, pdata->inactivity_threshold);
+        AC_WRITE(ac, TIME_INACT, pdata->inactivity_time);
+        AC_WRITE(ac, THRESH_FF, pdata->free_fall_threshold);
+        AC_WRITE(ac, TIME_FF, pdata->free_fall_time);
+        AC_WRITE(ac, TAP_AXES, pdata->tap_axis_control);
+        AC_WRITE(ac, ACT_INACT_CTL, pdata->act_axis_control);
+        AC_WRITE(ac, BW_RATE, RATE(ac->pdata.data_rate) |
+                 (pdata->low_power_mode ? LOW_POWER : 0));
+        AC_WRITE(ac, DATA_FORMAT, pdata->data_range);
+        AC_WRITE(ac, FIFO_CTL, FIFO_MODE(pdata->fifo_mode) |
+                        SAMPLES(pdata->watermark));
+        if (pdata->use_int2) {
+                /* Map all INTs to INT2 */
+                AC_WRITE(ac, INT_MAP, ac->int_mask | OVERRUN);
+        } else {
+                /* Map all INTs to INT1 */
+                AC_WRITE(ac, INT_MAP, 0);
+        }
+        if (ac->model == 346 && ac->pdata.orientation_enable) {
+                AC_WRITE(ac, ORIENT_CONF,
+                        ORIENT_DEADZONE(ac->pdata.deadzone_angle) |
+                        ORIENT_DIVISOR(ac->pdata.divisor_length));
+                ac->orient2d_saved = 1234;
+                ac->orient3d_saved = 1234;
+                if (pdata->orientation_enable & ADXL_EN_ORIENTATION_3D)
+                        for (i = 0; i < ARRAY_SIZE(pdata->ev_codes_orient_3d); i++)
+                                __set_bit(pdata->ev_codes_orient_3d[i],
+                                          input_dev->keybit);
+                if (pdata->orientation_enable & ADXL_EN_ORIENTATION_2D)
+                        for (i = 0; i < ARRAY_SIZE(pdata->ev_codes_orient_2d); i++)
+                                __set_bit(pdata->ev_codes_orient_2d[i],
+                                          input_dev->keybit);
+        } else {
+                ac->pdata.orientation_enable = 0;
+        }
+        AC_WRITE(ac, INT_ENABLE, ac->int_mask | OVERRUN);
+        ac->pdata.power_mode &= (PCTL_AUTO_SLEEP | PCTL_LINK);
+        return ac;
+ err_remove_attr:
+        sysfs_remove_group(&dev->kobj, &adxl34x_attr_group);
+ err_free_irq:
+        free_irq(ac->irq, ac);
+ err_free_mem:
+        input_free_device(input_dev);
+        kfree(ac);
+ err_out:
+        return ERR_PTR(err);
+}
+EXPORT_SYMBOL_GPL(adxl34x_probe);
+int adxl34x_remove(struct adxl34x *ac)
+{
+        sysfs_remove_group(&ac->dev->kobj, &adxl34x_attr_group);
+        free_irq(ac->irq, ac);
+        input_unregister_device(ac->input);
+        dev_dbg(ac->dev, "unregistered accelerometer\n");
+        kfree(ac);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(adxl34x_remove);
+MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
+MODULE_DESCRIPTION("ADXL345/346 Three-Axis Digital Accelerometer Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/input/misc/adxl34x.h b/drivers/input/misc/adxl34x.h
new file mode 100644
index 000000000000..bbbc80fda164
--- /dev/null
+++ b/drivers/input/misc/adxl34x.h
@@ -0,0 +1,30 @@
+/*
+ * ADXL345/346 Three-Axis Digital Accelerometers (I2C/SPI Interface)
+ *
+ * Enter bugs at http://blackfin.uclinux.org/
+ *
+ * Copyright (C) 2009 Michael Hennerich, Analog Devices Inc.
+ * Licensed under the GPL-2 or later.
+ */
+#ifndef _ADXL34X_H_
+#define _ADXL34X_H_
+struct device;
+struct adxl34x;
+struct adxl34x_bus_ops {
+        u16 bustype;
+        int (*read)(struct device *, unsigned char);
+        int (*read_block)(struct device *, unsigned char, int, void *);
+        int (*write)(struct device *, unsigned char, unsigned char);
+};
+void adxl34x_suspend(struct adxl34x *ac);
+void adxl34x_resume(struct adxl34x *ac);
+struct adxl34x *adxl34x_probe(struct device *dev, int irq,
+                              bool fifo_delay_default,
+                              const struct adxl34x_bus_ops *bops);
+int adxl34x_remove(struct adxl34x *ac);
+#endif
diff --git a/drivers/input/misc/atlas_btns.c b/drivers/input/misc/atlas_btns.c
index dfaa9a045ed8..601f7372f9c4 100644
--- a/drivers/input/misc/atlas_btns.c
+++ b/drivers/input/misc/atlas_btns.c
@@ -21,6 +21,8 @@
 *
 */
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -60,12 +62,11 @@ static acpi_status acpi_atlas_button_handler(u32 function,
                input_report_key(input_dev, atlas_keymap[code], key_down);
                input_sync(input_dev);
-                status = 0;
+                status = AE_OK;
        } else {
-                printk(KERN_WARNING "atlas: shrugged on unexpected function"
+                pr_warn("shrugged on unexpected function: function=%x,address=%lx,value=%x\n",
-                        ":function=%x,address=%lx,value=%x\n",
                        function, (unsigned long)address, (u32)*value);
-                status = -EINVAL;
+                status = AE_BAD_PARAMETER;
        }
        return status;
@@ -79,7 +80,7 @@ static int atlas_acpi_button_add(struct acpi_device *device)
        input_dev = input_allocate_device();
        if (!input_dev) {
-                printk(KERN_ERR "atlas: unable to allocate input device\n");
+                pr_err("unable to allocate input device\n");
                return -ENOMEM;
        }
@@ -102,7 +103,7 @@ static int atlas_acpi_button_add(struct acpi_device *device)
        err = input_register_device(input_dev);
        if (err) {
-                printk(KERN_ERR "atlas: couldn't register input device\n");
+                pr_err("couldn't register input device\n");
                input_free_device(input_dev);
                return err;
        }
@@ -112,12 +113,12 @@ static int atlas_acpi_button_add(struct acpi_device *device)
                                0x81, &acpi_atlas_button_handler,
                                &acpi_atlas_button_setup, device);
        if (ACPI_FAILURE(status)) {
-                printk(KERN_ERR "Atlas: Error installing addr spc handler\n");
+                pr_err("error installing addr spc handler\n");
                input_unregister_device(input_dev);
-                status = -EINVAL;
+                err = -EINVAL;
        }
-        return status;
+        return err;
 }
 static int atlas_acpi_button_remove(struct acpi_device *device, int type)
@@ -126,14 +127,12 @@ static int atlas_acpi_button_remove(struct acpi_device *device, int type)
        status = acpi_remove_address_space_handler(device->handle,
                                0x81, &acpi_atlas_button_handler);
-        if (ACPI_FAILURE(status)) {
+        if (ACPI_FAILURE(status))
-                printk(KERN_ERR "Atlas: Error removing addr spc handler\n");
+                pr_err("error removing addr spc handler\n");
-                status = -EINVAL;
-        }
        input_unregister_device(input_dev);
-        return status;
+        return 0;
 }
 static const struct acpi_device_id atlas_device_ids[] = {
@@ -145,6 +144,7 @@ MODULE_DEVICE_TABLE(acpi, atlas_device_ids);
 static struct acpi_driver atlas_acpi_driver = {
        .name   = ACPI_ATLAS_NAME,
        .class  = ACPI_ATLAS_CLASS,
+        .owner  = THIS_MODULE,
        .ids    = atlas_device_ids,
        .ops    = {
                .add    = atlas_acpi_button_add,
@@ -154,18 +154,10 @@ static struct acpi_driver atlas_acpi_driver = {
 static int __init atlas_acpi_init(void)
 {
-        int result;
        if (acpi_disabled)
                return -ENODEV;
-        result = acpi_bus_register_driver(&atlas_acpi_driver);
+        return acpi_bus_register_driver(&atlas_acpi_driver);
-        if (result < 0) {
-                printk(KERN_ERR "Atlas ACPI: Unable to register driver\n");
-                return -ENODEV;
-        }
-        return 0;
 }
 static void __exit atlas_acpi_exit(void)
diff --git a/drivers/input/misc/pwm-beeper.c b/drivers/input/misc/pwm-beeper.c
new file mode 100644
index 000000000000..57c294f07198
--- /dev/null
+++ b/drivers/input/misc/pwm-beeper.c
@@ -0,0 +1,199 @@
+/*
+ *  Copyright (C) 2010, Lars-Peter Clausen <lars@metafoo.de>
+ *  PWM beeper 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.
+ *
+ *  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/input.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/pwm.h>
+#include <linux/slab.h>
+struct pwm_beeper {
+        struct input_dev *input;
+        struct pwm_device *pwm;
+        unsigned long period;
+};
+#define HZ_TO_NANOSECONDS(x) (1000000000UL/(x))
+static int pwm_beeper_event(struct input_dev *input,
+                            unsigned int type, unsigned int code, int value)
+{
+        int ret = 0;
+        struct pwm_beeper *beeper = input_get_drvdata(input);
+        unsigned long period;
+        if (type != EV_SND || value < 0)
+                return -EINVAL;
+        switch (code) {
+        case SND_BELL:
+                value = value ? 1000 : 0;
+                break;
+        case SND_TONE:
+                break;
+        default:
+                return -EINVAL;
+        }
+        if (value == 0) {
+                pwm_config(beeper->pwm, 0, 0);
+                pwm_disable(beeper->pwm);
+        } else {
+                period = HZ_TO_NANOSECONDS(value);
+                ret = pwm_config(beeper->pwm, period / 2, period);
+                if (ret)
+                        return ret;
+                ret = pwm_enable(beeper->pwm);
+                if (ret)
+                        return ret;
+                beeper->period = period;
+        }
+        return 0;
+}
+static int __devinit pwm_beeper_probe(struct platform_device *pdev)
+{
+        unsigned long pwm_id = (unsigned long)pdev->dev.platform_data;
+        struct pwm_beeper *beeper;
+        int error;
+        beeper = kzalloc(sizeof(*beeper), GFP_KERNEL);
+        if (!beeper)
+                return -ENOMEM;
+        beeper->pwm = pwm_request(pwm_id, "pwm beeper");
+        if (IS_ERR(beeper->pwm)) {
+                error = PTR_ERR(beeper->pwm);
+                dev_err(&pdev->dev, "Failed to request pwm device: %d\n", error);
+                goto err_free;
+        }
+        beeper->input = input_allocate_device();
+        if (!beeper->input) {
+                dev_err(&pdev->dev, "Failed to allocate input device\n");
+                error = -ENOMEM;
+                goto err_pwm_free;
+        }
+        beeper->input->dev.parent = &pdev->dev;
+        beeper->input->name = "pwm-beeper";
+        beeper->input->phys = "pwm/input0";
+        beeper->input->id.bustype = BUS_HOST;
+        beeper->input->id.vendor = 0x001f;
+        beeper->input->id.product = 0x0001;
+        beeper->input->id.version = 0x0100;
+        beeper->input->evbit[0] = BIT(EV_SND);
+        beeper->input->sndbit[0] = BIT(SND_TONE) | BIT(SND_BELL);
+        beeper->input->event = pwm_beeper_event;
+        input_set_drvdata(beeper->input, beeper);
+        error = input_register_device(beeper->input);
+        if (error) {
+                dev_err(&pdev->dev, "Failed to register input device: %d\n", error);
+                goto err_input_free;
+        }
+        platform_set_drvdata(pdev, beeper);
+        return 0;
+err_input_free:
+        input_free_device(beeper->input);
+err_pwm_free:
+        pwm_free(beeper->pwm);
+err_free:
+        kfree(beeper);
+        return error;
+}
+static int __devexit pwm_beeper_remove(struct platform_device *pdev)
+{
+        struct pwm_beeper *beeper = platform_get_drvdata(pdev);
+        platform_set_drvdata(pdev, NULL);
+        input_unregister_device(beeper->input);
+        pwm_disable(beeper->pwm);
+        pwm_free(beeper->pwm);
+        kfree(beeper);
+        return 0;
+}
+#ifdef CONFIG_PM
+static int pwm_beeper_suspend(struct device *dev)
+{
+        struct pwm_beeper *beeper = dev_get_drvdata(dev);
+        if (beeper->period)
+                pwm_disable(beeper->pwm);
+        return 0;
+}
+static int pwm_beeper_resume(struct device *dev)
+{
+        struct pwm_beeper *beeper = dev_get_drvdata(dev);
+        if (beeper->period) {
+                pwm_config(beeper->pwm, beeper->period / 2, beeper->period);
+                pwm_enable(beeper->pwm);
+        }
+        return 0;
+}
+static SIMPLE_DEV_PM_OPS(pwm_beeper_pm_ops,
+                         pwm_beeper_suspend, pwm_beeper_resume);
+#define PWM_BEEPER_PM_OPS (&pwm_beeper_pm_ops)
+#else
+#define PWM_BEEPER_PM_OPS NULL
+#endif
+static struct platform_driver pwm_beeper_driver = {
+        .probe  = pwm_beeper_probe,
+        .remove = __devexit_p(pwm_beeper_remove),
+        .driver = {
+                .name   = "pwm-beeper",
+                .owner  = THIS_MODULE,
+                .pm     = PWM_BEEPER_PM_OPS,
+        },
+};
+static int __init pwm_beeper_init(void)
+{
+        return platform_driver_register(&pwm_beeper_driver);
+}
+module_init(pwm_beeper_init);
+static void __exit pwm_beeper_exit(void)
+{
+        platform_driver_unregister(&pwm_beeper_driver);
+}
+module_exit(pwm_beeper_exit);
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_DESCRIPTION("PWM beeper driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pwm-beeper");
diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c
index 1dacae4b43f0..f3bb92e9755f 100644
--- a/drivers/input/misc/sparcspkr.c
+++ b/drivers/input/misc/sparcspkr.c
@@ -353,14 +353,12 @@ static struct of_platform_driver grover_beep_driver = {
 static int __init sparcspkr_init(void)
 {
-        int err = of_register_driver(&bbc_beep_driver,
+        int err = of_register_platform_driver(&bbc_beep_driver);
-                                     &of_platform_bus_type);
        if (!err) {
-                err = of_register_driver(&grover_beep_driver,
+                err = of_register_platform_driver(&grover_beep_driver);
-                                         &of_platform_bus_type);
                if (err)
-                        of_unregister_driver(&bbc_beep_driver);
+                        of_unregister_platform_driver(&bbc_beep_driver);
        }
        return err;
@@ -368,8 +366,8 @@ static int __init sparcspkr_init(void)
 static void __exit sparcspkr_exit(void)
 {
-        of_unregister_driver(&bbc_beep_driver);
+        of_unregister_platform_driver(&bbc_beep_driver);
-        of_unregister_driver(&grover_beep_driver);
+        of_unregister_platform_driver(&grover_beep_driver);
 }
 module_init(sparcspkr_init);
diff --git a/drivers/input/misc/twl4030-pwrbutton.c b/drivers/input/misc/twl4030-pwrbutton.c
index e9069b87fde2..f16972bddca4 100644
--- a/drivers/input/misc/twl4030-pwrbutton.c
+++ b/drivers/input/misc/twl4030-pwrbutton.c
@@ -52,7 +52,7 @@ static irqreturn_t powerbutton_irq(int irq, void *_pwr)
        return IRQ_HANDLED;
 }
-static int __devinit twl4030_pwrbutton_probe(struct platform_device *pdev)
+static int __init twl4030_pwrbutton_probe(struct platform_device *pdev)
 {
        struct input_dev *pwr;
        int irq = platform_get_irq(pdev, 0);
@@ -95,7 +95,7 @@ free_input_dev:
        return err;
 }
-static int __devexit twl4030_pwrbutton_remove(struct platform_device *pdev)
+static int __exit twl4030_pwrbutton_remove(struct platform_device *pdev)
 {
        struct input_dev *pwr = platform_get_drvdata(pdev);
        int irq = platform_get_irq(pdev, 0);
@@ -106,9 +106,8 @@ static int __devexit twl4030_pwrbutton_remove(struct platform_device *pdev)
        return 0;
 }
-struct platform_driver twl4030_pwrbutton_driver = {
+static struct platform_driver twl4030_pwrbutton_driver = {
-        .probe          = twl4030_pwrbutton_probe,
+        .remove         = __exit_p(twl4030_pwrbutton_remove),
-        .remove         = __devexit_p(twl4030_pwrbutton_remove),
        .driver         = {
                .name   = "twl4030_pwrbutton",
                .owner  = THIS_MODULE,
@@ -117,7 +116,8 @@ struct platform_driver twl4030_pwrbutton_driver = {
 static int __init twl4030_pwrbutton_init(void)
 {
-        return platform_driver_register(&twl4030_pwrbutton_driver);
+        return platform_driver_probe(&twl4030_pwrbutton_driver,
+                        twl4030_pwrbutton_probe);
 }
 module_init(twl4030_pwrbutton_init);
diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c
index 4dac8b79fcd4..12501de0c5cd 100644
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
@@ -1347,7 +1347,7 @@ static int __init wb_module_init(void)
        err = map_bios();
        if (err)
-                return err;
+                goto err_free_keymap;
        err = platform_driver_register(&wistron_driver);
        if (err)
@@ -1371,6 +1371,8 @@ static int __init wb_module_init(void)
        platform_driver_unregister(&wistron_driver);
 err_unmap_bios:
        unmap_bios();
+ err_free_keymap:
+        kfree(keymap);
        return err;
 }
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index eeb58c1cac16..c714ca2407f8 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -17,7 +17,7 @@ config MOUSE_PS2
        default y
        select SERIO
        select SERIO_LIBPS2
-        select SERIO_I8042 if X86 && !X86_MRST
+        select SERIO_I8042 if X86
        select SERIO_GSCPS2 if GSC
        help
          Say Y here if you have a PS/2 mouse connected to your system. This
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
index 6dedded27222..ea67c49146a3 100644
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c
@@ -312,6 +312,8 @@ static void setup_events_to_report(struct input_dev *input_dev,
        __set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit);
        __set_bit(BTN_TOOL_QUADTAP, input_dev->keybit);
        __set_bit(BTN_LEFT, input_dev->keybit);
+        input_set_events_per_packet(input_dev, 60);
 }
 /* report button data as logical button state */
@@ -580,23 +582,30 @@ exit:
 */
 static int bcm5974_start_traffic(struct bcm5974 *dev)
 {
-        if (bcm5974_wellspring_mode(dev, true)) {
+        int error;
+        error = bcm5974_wellspring_mode(dev, true);
+        if (error) {
                dprintk(1, "bcm5974: mode switch failed\n");
-                goto error;
+                goto err_out;
        }
-        if (usb_submit_urb(dev->bt_urb, GFP_KERNEL))
+        error = usb_submit_urb(dev->bt_urb, GFP_KERNEL);
-                goto error;
+        if (error)
+                goto err_reset_mode;
-        if (usb_submit_urb(dev->tp_urb, GFP_KERNEL))
+        error = usb_submit_urb(dev->tp_urb, GFP_KERNEL);
+        if (error)
                goto err_kill_bt;
        return 0;
 err_kill_bt:
        usb_kill_urb(dev->bt_urb);
-error:
+err_reset_mode:
-        return -EIO;
+        bcm5974_wellspring_mode(dev, false);
+err_out:
+        return error;
 }
 static void bcm5974_pause_traffic(struct bcm5974 *dev)
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 40cea334ad13..8c324403b9f2 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -141,8 +141,13 @@ static int synaptics_capability(struct psmouse *psmouse)
        priv->capabilities = (cap[0] << 16) | (cap[1] << 8) | cap[2];
        priv->ext_cap = priv->ext_cap_0c = 0;
-        if (!SYN_CAP_VALID(priv->capabilities))
+        /*
+         * Older firmwares had submodel ID fixed to 0x47
+         */
+        if (SYN_ID_FULL(priv->identity) < 0x705 &&
+            SYN_CAP_SUBMODEL_ID(priv->capabilities) != 0x47) {
                return -1;
+        }
        /*
         * Unless capExtended is set the rest of the flags should be ignored
@@ -206,6 +211,7 @@ static int synaptics_resolution(struct psmouse *psmouse)
        unsigned char max[3];
        if (SYN_ID_MAJOR(priv->identity) < 4)
+                return 0;
        if (synaptics_send_cmd(psmouse, SYN_QUE_RESOLUTION, res) == 0) {
                if (res[0] != 0 && (res[1] & 0x80) && res[2] != 0) {
@@ -496,7 +502,9 @@ static void synaptics_process_packet(struct psmouse *psmouse)
        }
        input_report_abs(dev, ABS_PRESSURE, hw.z);
-        input_report_abs(dev, ABS_TOOL_WIDTH, finger_width);
+        if (SYN_CAP_PALMDETECT(priv->capabilities))
+                input_report_abs(dev, ABS_TOOL_WIDTH, finger_width);
        input_report_key(dev, BTN_TOOL_FINGER, num_fingers == 1);
        input_report_key(dev, BTN_LEFT, hw.left);
        input_report_key(dev, BTN_RIGHT, hw.right);
@@ -596,7 +604,9 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv)
        input_set_abs_params(dev, ABS_Y,
                             YMIN_NOMINAL, priv->y_max ?: YMAX_NOMINAL, 0, 0);
        input_set_abs_params(dev, ABS_PRESSURE, 0, 255, 0, 0);
-        __set_bit(ABS_TOOL_WIDTH, dev->absbit);
+        if (SYN_CAP_PALMDETECT(priv->capabilities))
+                input_set_abs_params(dev, ABS_TOOL_WIDTH, 0, 15, 0, 0);
        __set_bit(EV_KEY, dev->evbit);
        __set_bit(BTN_TOUCH, dev->keybit);
diff --git a/drivers/input/mouse/synaptics.h b/drivers/input/mouse/synaptics.h
index 7d4d5e12c0df..b6aa7d20d8a3 100644
--- a/drivers/input/mouse/synaptics.h
+++ b/drivers/input/mouse/synaptics.h
@@ -47,7 +47,7 @@
 #define SYN_CAP_FOUR_BUTTON(c)          ((c) & (1 << 3))
 #define SYN_CAP_MULTIFINGER(c)          ((c) & (1 << 1))
 #define SYN_CAP_PALMDETECT(c)           ((c) & (1 << 0))
-#define SYN_CAP_VALID(c)                ((((c) & 0x00ff00) >> 8) == 0x47)
+#define SYN_CAP_SUBMODEL_ID(c)          (((c) & 0x00ff00) >> 8)
 #define SYN_EXT_CAP_REQUESTS(c)         (((c) & 0x700000) >> 20)
 #define SYN_CAP_MULTI_BUTTON_NO(ec)     (((ec) & 0x00f000) >> 12)
 #define SYN_CAP_PRODUCT_ID(ec)          (((ec) & 0xff0000) >> 16)
@@ -66,6 +66,7 @@
 #define SYN_ID_MODEL(i)                 (((i) >> 4) & 0x0f)
 #define SYN_ID_MAJOR(i)                 ((i) & 0x0f)
 #define SYN_ID_MINOR(i)                 (((i) >> 16) & 0xff)
+#define SYN_ID_FULL(i)                  ((SYN_ID_MAJOR(i) << 8) | SYN_ID_MINOR(i))
 #define SYN_ID_IS_SYNAPTICS(i)          ((((i) >> 8) & 0xff) == 0x47)
 /* synaptics special commands */
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index f34b22bce4ff..d8f68f77007b 100644
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@ -57,7 +57,6 @@ struct mousedev_hw_data {
 };
 struct mousedev {
-        int exist;
        int open;
        int minor;
        struct input_handle handle;
@@ -66,6 +65,7 @@ struct mousedev {
        spinlock_t client_lock; /* protects client_list */
        struct mutex mutex;
        struct device dev;
+        bool exist;
        struct list_head mixdev_node;
        int mixdev_open;
@@ -765,10 +765,15 @@ static unsigned int mousedev_poll(struct file *file, poll_table *wait)
 {
        struct mousedev_client *client = file->private_data;
        struct mousedev *mousedev = client->mousedev;
+        unsigned int mask;
        poll_wait(file, &mousedev->wait, wait);
-        return ((client->ready || client->buffer) ? (POLLIN | POLLRDNORM) : 0) |
-                (mousedev->exist ? 0 : (POLLHUP | POLLERR));
+        mask = mousedev->exist ? POLLOUT | POLLWRNORM : POLLHUP | POLLERR;
+        if (client->ready || client->buffer)
+                mask |= POLLIN | POLLRDNORM;
+        return mask;
 }
 static const struct file_operations mousedev_fops = {
@@ -802,7 +807,7 @@ static void mousedev_remove_chrdev(struct mousedev *mousedev)
 static void mousedev_mark_dead(struct mousedev *mousedev)
 {
        mutex_lock(&mousedev->mutex);
-        mousedev->exist = 0;
+        mousedev->exist = false;
        mutex_unlock(&mousedev->mutex);
 }
@@ -862,7 +867,7 @@ static struct mousedev *mousedev_create(struct input_dev *dev,
                dev_set_name(&mousedev->dev, "mouse%d", minor);
        mousedev->minor = minor;
-        mousedev->exist = 1;
+        mousedev->exist = true;
        mousedev->handle.dev = input_get_device(dev);
        mousedev->handle.name = dev_name(&mousedev->dev);
        mousedev->handle.handler = handler;
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 256b9e9394dc..3bfe8fafc6ad 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -22,7 +22,7 @@ config SERIO_I8042
        tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86
        default y
        depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \
-                   (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN && !X86_MRST
+                   (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN
        help
          i8042 is the chip over which the standard AT keyboard and PS/2
          mouse are connected to the computer. If you use these devices,
diff --git a/drivers/input/serio/i8042-io.h b/drivers/input/serio/i8042-io.h
index 847f4aad7ed5..5d48bb66aa73 100644
--- a/drivers/input/serio/i8042-io.h
+++ b/drivers/input/serio/i8042-io.h
@@ -27,6 +27,11 @@
 #include <asm/irq.h>
 #elif defined(CONFIG_SH_CAYMAN)
 #include <asm/irq.h>
+#elif defined(CONFIG_PPC)
+extern int of_i8042_kbd_irq;
+extern int of_i8042_aux_irq;
+# define I8042_KBD_IRQ  of_i8042_kbd_irq
+# define I8042_AUX_IRQ  of_i8042_aux_irq
 #else
 # define I8042_KBD_IRQ  1
 # define I8042_AUX_IRQ  12
diff --git a/drivers/input/serio/i8042-ppcio.h b/drivers/input/serio/i8042-ppcio.h
index 2906e1b60c04..f708c75d16f1 100644
--- a/drivers/input/serio/i8042-ppcio.h
+++ b/drivers/input/serio/i8042-ppcio.h
@@ -52,81 +52,6 @@ static inline void i8042_platform_exit(void)
 {
 }
-#elif defined(CONFIG_SPRUCE)
-#define I8042_KBD_IRQ 22
-#define I8042_AUX_IRQ 21
-#define I8042_KBD_PHYS_DESC "spruceps2/serio0"
-#define I8042_AUX_PHYS_DESC "spruceps2/serio1"
-#define I8042_MUX_PHYS_DESC "spruceps2/serio%d"
-#define I8042_COMMAND_REG 0xff810000
-#define I8042_DATA_REG 0xff810001
-static inline int i8042_read_data(void)
-{
-        unsigned long kbd_data;
-        __raw_writel(0x00000088, 0xff500008);
-        eieio();
-        __raw_writel(0x03000000, 0xff50000c);
-        eieio();
-        asm volatile("lis     7,0xff88        \n\
-                      lswi    6,7,0x8         \n\
-                      mr      %0,6"
-                      : "=r" (kbd_data) :: "6", "7");
-        __raw_writel(0x00000000, 0xff50000c);
-        eieio();
-        return (unsigned char)(kbd_data >> 24);
-}
-static inline int i8042_read_status(void)
-{
-        unsigned long kbd_status;
-        __raw_writel(0x00000088, 0xff500008);
-        eieio();
-        __raw_writel(0x03000000, 0xff50000c);
-        eieio();
-        asm volatile("lis     7,0xff88        \n\
-                      ori     7,7,0x8         \n\
-                      lswi    6,7,0x8         \n\
-                      mr      %0,6"
-                      : "=r" (kbd_status) :: "6", "7");
-        __raw_writel(0x00000000, 0xff50000c);
-        eieio();
-        return (unsigned char)(kbd_status >> 24);
-}
-static inline void i8042_write_data(int val)
-{
-        *((unsigned char *)0xff810000) = (char)val;
-}
-static inline void i8042_write_command(int val)
-{
-        *((unsigned char *)0xff810001) = (char)val;
-}
-static inline int i8042_platform_init(void)
-{
-        i8042_reset = 1;
-        return 0;
-}
-static inline void i8042_platform_exit(void)
-{
-}
 #else
 #include "i8042-io.h"
diff --git a/drivers/input/serio/i8042-sparcio.h b/drivers/input/serio/i8042-sparcio.h
index 04e32f2d1241..cb2a24b94746 100644
--- a/drivers/input/serio/i8042-sparcio.h
+++ b/drivers/input/serio/i8042-sparcio.h
@@ -58,9 +58,9 @@ static int __devinit sparc_i8042_probe(struct of_device *op, const struct of_dev
                if (!strcmp(dp->name, OBP_PS2KBD_NAME1) ||
                    !strcmp(dp->name, OBP_PS2KBD_NAME2)) {
                        struct of_device *kbd = of_find_device_by_node(dp);
-                        unsigned int irq = kbd->irqs[0];
+                        unsigned int irq = kbd->archdata.irqs[0];
                        if (irq == 0xffffffff)
-                                irq = op->irqs[0];
+                                irq = op->archdata.irqs[0];
                        i8042_kbd_irq = irq;
                        kbd_iobase = of_ioremap(&kbd->resource[0],
                                                0, 8, "kbd");
@@ -68,9 +68,9 @@ static int __devinit sparc_i8042_probe(struct of_device *op, const struct of_dev
                } else if (!strcmp(dp->name, OBP_PS2MS_NAME1) ||
                           !strcmp(dp->name, OBP_PS2MS_NAME2)) {
                        struct of_device *ms = of_find_device_by_node(dp);
-                        unsigned int irq = ms->irqs[0];
+                        unsigned int irq = ms->archdata.irqs[0];
                        if (irq == 0xffffffff)
-                                irq = op->irqs[0];
+                                irq = op->archdata.irqs[0];
                        i8042_aux_irq = irq;
                }
@@ -116,8 +116,7 @@ static int __init i8042_platform_init(void)
                if (!kbd_iobase)
                        return -ENODEV;
        } else {
-                int err = of_register_driver(&sparc_i8042_driver,
+                int err = of_register_platform_driver(&sparc_i8042_driver);
-                                             &of_bus_type);
                if (err)
                        return err;
@@ -141,7 +140,7 @@ static inline void i8042_platform_exit(void)
        struct device_node *root = of_find_node_by_path("/");
        if (strcmp(root->name, "SUNW,JavaStation-1"))
-                of_unregister_driver(&sparc_i8042_driver);
+                of_unregister_platform_driver(&sparc_i8042_driver);
 }
 #else /* !CONFIG_PCI */
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 6168469ad1a6..ed7ad7416b24 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -7,6 +7,10 @@
 * the Free Software Foundation.
 */
+#ifdef CONFIG_X86
+#include <asm/x86_init.h>
+#endif
 /*
 * Names.
 */
@@ -166,6 +170,13 @@ static const struct dmi_system_id __initconst i8042_dmi_noloop_table[] = {
                },
        },
        {
+                /* Gigabyte Spring Peak - defines wrong chassis type */
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Spring Peak"),
+                },
+        },
+        {
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
                        DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv9700"),
@@ -840,6 +851,12 @@ static int __init i8042_platform_init(void)
 {
        int retval;
+#ifdef CONFIG_X86
+        /* Just return if pre-detection shows no i8042 controller exist */
+        if (!x86_platform.i8042_detect())
+                return -ENODEV;
+#endif
 /*
 * On ix86 platforms touching the i8042 data register region can do really
 * bad things. Because of this the region is always reserved on ix86 boxes.
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 6440a8f55686..258b98b9d7c2 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -861,9 +861,6 @@ static int i8042_controller_selftest(void)
        unsigned char param;
        int i = 0;
-        if (!i8042_reset)
-                return 0;
        /*
         * We try this 5 times; on some really fragile systems this does not
         * take the first time...
@@ -1020,7 +1017,8 @@ static void i8042_controller_reset(void)
 * Reset the controller if requested.
 */
-        i8042_controller_selftest();
+        if (i8042_reset)
+                i8042_controller_selftest();
 /*
 * Restore the original control register setting.
@@ -1094,23 +1092,11 @@ static void i8042_dritek_enable(void)
 #ifdef CONFIG_PM
 /*
- * Here we try to restore the original BIOS settings to avoid
- * upsetting it.
- */
-static int i8042_pm_reset(struct device *dev)
-{
-        i8042_controller_reset();
-        return 0;
-}
-/*
 * Here we try to reset everything back to a state we had
 * before suspending.
 */
-static int i8042_pm_restore(struct device *dev)
+static int i8042_controller_resume(bool force_reset)
 {
        int error;
@@ -1118,9 +1104,11 @@ static int i8042_pm_restore(struct device *dev)
        if (error)
                return error;
-        error = i8042_controller_selftest();
+        if (i8042_reset || force_reset) {
-        if (error)
+                error = i8042_controller_selftest();
-                return error;
+                if (error)
+                        return error;
+        }
 /*
 * Restore original CTR value and disable all ports
@@ -1162,6 +1150,28 @@ static int i8042_pm_restore(struct device *dev)
        return 0;
 }
+/*
+ * Here we try to restore the original BIOS settings to avoid
+ * upsetting it.
+ */
+static int i8042_pm_reset(struct device *dev)
+{
+        i8042_controller_reset();
+        return 0;
+}
+static int i8042_pm_resume(struct device *dev)
+{
+        /*
+         * On resume from S2R we always try to reset the controller
+         * to bring it in a sane state. (In case of S2D we expect
+         * BIOS to reset the controller for us.)
+         */
+        return i8042_controller_resume(true);
+}
 static int i8042_pm_thaw(struct device *dev)
 {
        i8042_interrupt(0, NULL);
@@ -1169,9 +1179,14 @@ static int i8042_pm_thaw(struct device *dev)
        return 0;
 }
+static int i8042_pm_restore(struct device *dev)
+{
+        return i8042_controller_resume(false);
+}
 static const struct dev_pm_ops i8042_pm_ops = {
        .suspend        = i8042_pm_reset,
-        .resume         = i8042_pm_restore,
+        .resume         = i8042_pm_resume,
        .thaw           = i8042_pm_thaw,
        .poweroff       = i8042_pm_reset,
        .restore        = i8042_pm_restore,
@@ -1389,9 +1404,11 @@ static int __init i8042_probe(struct platform_device *dev)
        i8042_platform_device = dev;
-        error = i8042_controller_selftest();
+        if (i8042_reset) {
-        if (error)
+                error = i8042_controller_selftest();
-                return error;
+                if (error)
+                        return error;
+        }
        error = i8042_controller_init();
        if (error)
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index 415f6306105d..ce0b4608dad9 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -158,6 +158,39 @@ static int wacom_ptu_irq(struct wacom_wac *wacom)
        return 1;
 }
+static int wacom_dtu_irq(struct wacom_wac *wacom)
+{
+        struct wacom_features *features = &wacom->features;
+        char *data = wacom->data;
+        struct input_dev *input = wacom->input;
+        int prox = data[1] & 0x20, pressure;
+        dbg("wacom_dtu_irq: received report #%d", data[0]);
+        if (prox) {
+                /* Going into proximity select tool */
+                wacom->tool[0] = (data[1] & 0x0c) ? BTN_TOOL_RUBBER : BTN_TOOL_PEN;
+                if (wacom->tool[0] == BTN_TOOL_PEN)
+                        wacom->id[0] = STYLUS_DEVICE_ID;
+                else
+                        wacom->id[0] = ERASER_DEVICE_ID;
+        }
+        input_report_key(input, BTN_STYLUS, data[1] & 0x02);
+        input_report_key(input, BTN_STYLUS2, data[1] & 0x10);
+        input_report_abs(input, ABS_X, le16_to_cpup((__le16 *)&data[2]));
+        input_report_abs(input, ABS_Y, le16_to_cpup((__le16 *)&data[4]));
+        pressure = ((data[7] & 0x01) << 8) | data[6];
+        if (pressure < 0)
+                pressure = features->pressure_max + pressure + 1;
+        input_report_abs(input, ABS_PRESSURE, pressure);
+        input_report_key(input, BTN_TOUCH, data[1] & 0x05);
+        if (!prox) /* out-prox */
+                wacom->id[0] = 0;
+        input_report_key(input, wacom->tool[0], prox);
+        input_report_abs(input, ABS_MISC, wacom->id[0]);
+        return 1;
+}
 static int wacom_graphire_irq(struct wacom_wac *wacom)
 {
        struct wacom_features *features = &wacom->features;
@@ -845,6 +878,10 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len)
                sync = wacom_ptu_irq(wacom_wac);
                break;
+        case DTU:
+                sync = wacom_dtu_irq(wacom_wac);
+                break;
        case INTUOS:
        case INTUOS3S:
        case INTUOS3:
@@ -1030,6 +1067,7 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,
        case PL:
        case PTU:
+        case DTU:
                __set_bit(BTN_TOOL_PEN, input_dev->keybit);
                __set_bit(BTN_STYLUS, input_dev->keybit);
                __set_bit(BTN_STYLUS2, input_dev->keybit);
@@ -1155,6 +1193,10 @@ static const struct wacom_features wacom_features_0xC6 =
        { "Wacom Cintiq 12WX",    WACOM_PKGLEN_INTUOS,    53020, 33440, 1023, 63, WACOM_BEE };
 static const struct wacom_features wacom_features_0xC7 =
        { "Wacom DTU1931",        WACOM_PKGLEN_GRAPHIRE,  37832, 30305,  511,  0, PL };
+static const struct wacom_features wacom_features_0xCE =
+        { "Wacom DTU2231",        WACOM_PKGLEN_GRAPHIRE,  47864, 27011,  511,  0, DTU };
+static const struct wacom_features wacom_features_0xF0 =
+        { "Wacom DTU1631",        WACOM_PKGLEN_GRAPHIRE,  34623, 19553,  511,  0, DTU };
 static const struct wacom_features wacom_features_0xCC =
        { "Wacom Cintiq 21UX2",   WACOM_PKGLEN_INTUOS,    87200, 65600, 2047, 63, WACOM_21UX2 };
 static const struct wacom_features wacom_features_0x90 =
@@ -1234,6 +1276,8 @@ const struct usb_device_id wacom_ids[] = {
        { USB_DEVICE_WACOM(0xC5) },
        { USB_DEVICE_WACOM(0xC6) },
        { USB_DEVICE_WACOM(0xC7) },
+        { USB_DEVICE_WACOM(0xCE) },
+        { USB_DEVICE_WACOM(0xF0) },
        { USB_DEVICE_WACOM(0xCC) },
        { USB_DEVICE_WACOM(0x90) },
        { USB_DEVICE_WACOM(0x93) },
diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h
index 854b92092dfc..99e1a54cd305 100644
--- a/drivers/input/tablet/wacom_wac.h
+++ b/drivers/input/tablet/wacom_wac.h
@@ -43,6 +43,7 @@ enum {
        WACOM_G4,
        PTU,
        PL,
+        DTU,
        INTUOS,
        INTUOS3S,
        INTUOS3,
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 3b9d5e2105d7..61f35184f76c 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -55,37 +55,36 @@ config TOUCHSCREEN_AD7877
          To compile this driver as a module, choose M here: the
          module will be called ad7877.
-config TOUCHSCREEN_AD7879_I2C
+config TOUCHSCREEN_AD7879
-        tristate "AD7879 based touchscreens: AD7879-1 I2C Interface"
+        tristate "Analog Devices AD7879-1/AD7889-1 touchscreen interface"
-        depends on I2C
-        select TOUCHSCREEN_AD7879
        help
-          Say Y here if you have a touchscreen interface using the
+          Say Y here if you want to support a touchscreen interface using
-          AD7879-1/AD7889-1 controller, and your board-specific
+          the AD7879-1/AD7889-1 controller.
-          initialization code includes that in its table of I2C devices.
-          If unsure, say N (but it's safe to say "Y").
+          You should select a bus connection too.
          To compile this driver as a module, choose M here: the
          module will be called ad7879.
+config TOUCHSCREEN_AD7879_I2C
+        tristate "support I2C bus connection"
+        depends on TOUCHSCREEN_AD7879 && I2C
+        help
+          Say Y here if you have AD7879-1/AD7889-1 hooked to an I2C bus.
+          To compile this driver as a module, choose M here: the
+          module will be called ad7879-i2c.
 config TOUCHSCREEN_AD7879_SPI
-        tristate "AD7879 based touchscreens: AD7879 SPI Interface"
+        tristate "support SPI bus connection"
-        depends on SPI_MASTER && TOUCHSCREEN_AD7879_I2C = n
+        depends on TOUCHSCREEN_AD7879 && SPI_MASTER
-        select TOUCHSCREEN_AD7879
        help
-          Say Y here if you have a touchscreen interface using the
+          Say Y here if you have AD7879-1/AD7889-1 hooked to a SPI bus.
-          AD7879/AD7889 controller, and your board-specific initialization
-          code includes that in its table of SPI devices.
          If unsure, say N (but it's safe to say "Y").
          To compile this driver as a module, choose M here: the
-          module will be called ad7879.
+          module will be called ad7879-spi.
-config TOUCHSCREEN_AD7879
-        tristate
-        default n
 config TOUCHSCREEN_BITSY
        tristate "Compaq iPAQ H3600 (Bitsy) touchscreen"
@@ -99,6 +98,20 @@ config TOUCHSCREEN_BITSY
          To compile this driver as a module, choose M here: the
          module will be called h3600_ts_input.
+config TOUCHSCREEN_CY8CTMG110
+        tristate "cy8ctmg110 touchscreen"
+        depends on I2C
+        depends on GPIOLIB
+        help
+          Say Y here if you have a cy8ctmg110 capacitive touchscreen on
+          an AAVA device.
+          If unsure, say N.
+          To compile this driver as a module, choose M here: the
+          module will be called cy8ctmg110_ts.
 config TOUCHSCREEN_DA9034
        tristate "Touchscreen support for Dialog Semiconductor DA9034"
        depends on PMIC_DA903X
@@ -292,6 +305,18 @@ config TOUCHSCREEN_PENMOUNT
          To compile this driver as a module, choose M here: the
          module will be called penmount.
+config TOUCHSCREEN_QT602240
+        tristate "QT602240 I2C Touchscreen"
+        depends on I2C
+        help
+          Say Y here if you have the AT42QT602240/ATMXT224 I2C touchscreen
+          connected to your system.
+          If unsure, say N.
+          To compile this driver as a module, choose M here: the
+          module will be called qt602240_ts.
 config TOUCHSCREEN_MIGOR
        tristate "Renesas MIGO-R touchscreen"
        depends on SH_MIGOR && I2C
@@ -540,9 +565,9 @@ config TOUCHSCREEN_USB_ZYTRONIC
        bool "Zytronic controller" if EMBEDDED
        depends on TOUCHSCREEN_USB_COMPOSITE
-config TOUCHSCREEN_USB_ETT_TC5UH
+config TOUCHSCREEN_USB_ETT_TC45USB
        default y
-        bool "ET&T TC5UH touchscreen controler support" if EMBEDDED
+        bool "ET&T USB series TC4UM/TC5UH touchscreen controler support" if EMBEDDED
        depends on TOUCHSCREEN_USB_COMPOSITE
 config TOUCHSCREEN_USB_NEXIO
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index 497964a7a214..bd6f30b4ff70 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -9,9 +9,13 @@ wm97xx-ts-y := wm97xx-core.o
 obj-$(CONFIG_TOUCHSCREEN_88PM860X)      += 88pm860x-ts.o
 obj-$(CONFIG_TOUCHSCREEN_AD7877)        += ad7877.o
 obj-$(CONFIG_TOUCHSCREEN_AD7879)        += ad7879.o
+obj-$(CONFIG_TOUCHSCREEN_AD7879_I2C)    += ad7879-i2c.o
+obj-$(CONFIG_TOUCHSCREEN_AD7879_SPI)    += ad7879-spi.o
 obj-$(CONFIG_TOUCHSCREEN_ADS7846)       += ads7846.o
 obj-$(CONFIG_TOUCHSCREEN_ATMEL_TSADCC)  += atmel_tsadcc.o
 obj-$(CONFIG_TOUCHSCREEN_BITSY)         += h3600_ts_input.o
+obj-$(CONFIG_TOUCHSCREEN_CY8CTMG110)    += cy8ctmg110_ts.o
+obj-$(CONFIG_TOUCHSCREEN_DA9034)        += da9034-ts.o
 obj-$(CONFIG_TOUCHSCREEN_DYNAPRO)       += dynapro.o
 obj-$(CONFIG_TOUCHSCREEN_HAMPSHIRE)     += hampshire.o
 obj-$(CONFIG_TOUCHSCREEN_GUNZE)         += gunze.o
@@ -30,6 +34,7 @@ obj-$(CONFIG_TOUCHSCREEN_HTCPEN)	+= htcpen.o
 obj-$(CONFIG_TOUCHSCREEN_USB_COMPOSITE) += usbtouchscreen.o
 obj-$(CONFIG_TOUCHSCREEN_PCAP)          += pcap_ts.o
 obj-$(CONFIG_TOUCHSCREEN_PENMOUNT)      += penmount.o
+obj-$(CONFIG_TOUCHSCREEN_QT602240)      += qt602240_ts.o
 obj-$(CONFIG_TOUCHSCREEN_S3C2410)       += s3c2410_ts.o
 obj-$(CONFIG_TOUCHSCREEN_TOUCHIT213)    += touchit213.o
 obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT)    += touchright.o
@@ -38,7 +43,6 @@ obj-$(CONFIG_TOUCHSCREEN_TSC2007)	+= tsc2007.o
 obj-$(CONFIG_TOUCHSCREEN_UCB1400)       += ucb1400_ts.o
 obj-$(CONFIG_TOUCHSCREEN_WACOM_W8001)   += wacom_w8001.o
 obj-$(CONFIG_TOUCHSCREEN_WM97XX)        += wm97xx-ts.o
-obj-$(CONFIG_TOUCHSCREEN_DA9034)        += da9034-ts.o
 wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9705)  += wm9705.o
 wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9712)  += wm9712.o
 wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9713)  += wm9713.o
diff --git a/drivers/input/touchscreen/ad7879-i2c.c b/drivers/input/touchscreen/ad7879-i2c.c
new file mode 100644
index 000000000000..d82a38ee9a3e
--- /dev/null
+++ b/drivers/input/touchscreen/ad7879-i2c.c
@@ -0,0 +1,143 @@
+/*
+ * AD7879-1/AD7889-1 touchscreen (I2C bus)
+ *
+ * Copyright (C) 2008-2010 Michael Hennerich, Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+#include <linux/input.h>        /* BUS_I2C */
+#include <linux/i2c.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include "ad7879.h"
+#define AD7879_DEVID            0x79    /* AD7879-1/AD7889-1 */
+#ifdef CONFIG_PM
+static int ad7879_i2c_suspend(struct i2c_client *client, pm_message_t message)
+{
+        struct ad7879 *ts = i2c_get_clientdata(client);
+        ad7879_suspend(ts);
+        return 0;
+}
+static int ad7879_i2c_resume(struct i2c_client *client)
+{
+        struct ad7879 *ts = i2c_get_clientdata(client);
+        ad7879_resume(ts);
+        return 0;
+}
+#else
+# define ad7879_i2c_suspend NULL
+# define ad7879_i2c_resume  NULL
+#endif
+/* All registers are word-sized.
+ * AD7879 uses a high-byte first convention.
+ */
+static int ad7879_i2c_read(struct device *dev, u8 reg)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        return swab16(i2c_smbus_read_word_data(client, reg));
+}
+static int ad7879_i2c_multi_read(struct device *dev,
+                                 u8 first_reg, u8 count, u16 *buf)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        u8 idx;
+        i2c_smbus_read_i2c_block_data(client, first_reg, count * 2, (u8 *)buf);
+        for (idx = 0; idx < count; ++idx)
+                buf[idx] = swab16(buf[idx]);
+        return 0;
+}
+static int ad7879_i2c_write(struct device *dev, u8 reg, u16 val)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        return i2c_smbus_write_word_data(client, reg, swab16(val));
+}
+static const struct ad7879_bus_ops ad7879_i2c_bus_ops = {
+        .bustype        = BUS_I2C,
+        .read           = ad7879_i2c_read,
+        .multi_read     = ad7879_i2c_multi_read,
+        .write          = ad7879_i2c_write,
+};
+static int __devinit ad7879_i2c_probe(struct i2c_client *client,
+                                      const struct i2c_device_id *id)
+{
+        struct ad7879 *ts;
+        if (!i2c_check_functionality(client->adapter,
+                                     I2C_FUNC_SMBUS_WORD_DATA)) {
+                dev_err(&client->dev, "SMBUS Word Data not Supported\n");
+                return -EIO;
+        }
+        ts = ad7879_probe(&client->dev, AD7879_DEVID, client->irq,
+                          &ad7879_i2c_bus_ops);
+        if (IS_ERR(ts))
+                return PTR_ERR(ts);
+        i2c_set_clientdata(client, ts);
+        return 0;
+}
+static int __devexit ad7879_i2c_remove(struct i2c_client *client)
+{
+        struct ad7879 *ts = i2c_get_clientdata(client);
+        ad7879_remove(ts);
+        return 0;
+}
+static const struct i2c_device_id ad7879_id[] = {
+        { "ad7879", 0 },
+        { "ad7889", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, ad7879_id);
+static struct i2c_driver ad7879_i2c_driver = {
+        .driver = {
+                .name   = "ad7879",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = ad7879_i2c_probe,
+        .remove         = __devexit_p(ad7879_i2c_remove),
+        .suspend        = ad7879_i2c_suspend,
+        .resume         = ad7879_i2c_resume,
+        .id_table       = ad7879_id,
+};
+static int __init ad7879_i2c_init(void)
+{
+        return i2c_add_driver(&ad7879_i2c_driver);
+}
+module_init(ad7879_i2c_init);
+static void __exit ad7879_i2c_exit(void)
+{
+        i2c_del_driver(&ad7879_i2c_driver);
+}
+module_exit(ad7879_i2c_exit);
+MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
+MODULE_DESCRIPTION("AD7879(-1) touchscreen I2C bus driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("i2c:ad7879");
diff --git a/drivers/input/touchscreen/ad7879-spi.c b/drivers/input/touchscreen/ad7879-spi.c
new file mode 100644
index 000000000000..59c6e68c4325
--- /dev/null
+++ b/drivers/input/touchscreen/ad7879-spi.c
@@ -0,0 +1,198 @@
+/*
+ * AD7879/AD7889 touchscreen (SPI bus)
+ *
+ * Copyright (C) 2008-2010 Michael Hennerich, Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+#include <linux/input.h>        /* BUS_SPI */
+#include <linux/spi/spi.h>
+#include "ad7879.h"
+#define AD7879_DEVID            0x7A    /* AD7879/AD7889 */
+#define MAX_SPI_FREQ_HZ      5000000
+#define AD7879_CMD_MAGIC     0xE000
+#define AD7879_CMD_READ      (1 << 10)
+#define AD7879_CMD(reg)      (AD7879_CMD_MAGIC | ((reg) & 0xF))
+#define AD7879_WRITECMD(reg) (AD7879_CMD(reg))
+#define AD7879_READCMD(reg)  (AD7879_CMD(reg) | AD7879_CMD_READ)
+#ifdef CONFIG_PM
+static int ad7879_spi_suspend(struct spi_device *spi, pm_message_t message)
+{
+        struct ad7879 *ts = spi_get_drvdata(spi);
+        ad7879_suspend(ts);
+        return 0;
+}
+static int ad7879_spi_resume(struct spi_device *spi)
+{
+        struct ad7879 *ts = spi_get_drvdata(spi);
+        ad7879_resume(ts);
+        return 0;
+}
+#else
+# define ad7879_spi_suspend NULL
+# define ad7879_spi_resume  NULL
+#endif
+/*
+ * ad7879_read/write are only used for initial setup and for sysfs controls.
+ * The main traffic is done in ad7879_collect().
+ */
+static int ad7879_spi_xfer(struct spi_device *spi,
+                           u16 cmd, u8 count, u16 *tx_buf, u16 *rx_buf)
+{
+        struct spi_message msg;
+        struct spi_transfer *xfers;
+        void *spi_data;
+        u16 *command;
+        u16 *_rx_buf = _rx_buf; /* shut gcc up */
+        u8 idx;
+        int ret;
+        xfers = spi_data = kzalloc(sizeof(*xfers) * (count + 2), GFP_KERNEL);
+        if (!spi_data)
+                return -ENOMEM;
+        spi_message_init(&msg);
+        command = spi_data;
+        command[0] = cmd;
+        if (count == 1) {
+                /* ad7879_spi_{read,write} gave us buf on stack */
+                command[1] = *tx_buf;
+                tx_buf = &command[1];
+                _rx_buf = rx_buf;
+                rx_buf = &command[2];
+        }
+        ++xfers;
+        xfers[0].tx_buf = command;
+        xfers[0].len = 2;
+        spi_message_add_tail(&xfers[0], &msg);
+        ++xfers;
+        for (idx = 0; idx < count; ++idx) {
+                if (rx_buf)
+                        xfers[idx].rx_buf = &rx_buf[idx];
+                if (tx_buf)
+                        xfers[idx].tx_buf = &tx_buf[idx];
+                xfers[idx].len = 2;
+                spi_message_add_tail(&xfers[idx], &msg);
+        }
+        ret = spi_sync(spi, &msg);
+        if (count == 1)
+                _rx_buf[0] = command[2];
+        kfree(spi_data);
+        return ret;
+}
+static int ad7879_spi_multi_read(struct device *dev,
+                                 u8 first_reg, u8 count, u16 *buf)
+{
+        struct spi_device *spi = to_spi_device(dev);
+        return ad7879_spi_xfer(spi, AD7879_READCMD(first_reg), count, NULL, buf);
+}
+static int ad7879_spi_read(struct device *dev, u8 reg)
+{
+        struct spi_device *spi = to_spi_device(dev);
+        u16 ret, dummy;
+        return ad7879_spi_xfer(spi, AD7879_READCMD(reg), 1, &dummy, &ret) ? : ret;
+}
+static int ad7879_spi_write(struct device *dev, u8 reg, u16 val)
+{
+        struct spi_device *spi = to_spi_device(dev);
+        u16 dummy;
+        return ad7879_spi_xfer(spi, AD7879_WRITECMD(reg), 1, &val, &dummy);
+}
+static const struct ad7879_bus_ops ad7879_spi_bus_ops = {
+        .bustype        = BUS_SPI,
+        .read           = ad7879_spi_read,
+        .multi_read     = ad7879_spi_multi_read,
+        .write          = ad7879_spi_write,
+};
+static int __devinit ad7879_spi_probe(struct spi_device *spi)
+{
+        struct ad7879 *ts;
+        int err;
+        /* don't exceed max specified SPI CLK frequency */
+        if (spi->max_speed_hz > MAX_SPI_FREQ_HZ) {
+                dev_err(&spi->dev, "SPI CLK %d Hz?\n", spi->max_speed_hz);
+                return -EINVAL;
+        }
+        spi->bits_per_word = 16;
+        err = spi_setup(spi);
+        if (err) {
+                dev_dbg(&spi->dev, "spi master doesn't support 16 bits/word\n");
+                return err;
+        }
+        ts = ad7879_probe(&spi->dev, AD7879_DEVID, spi->irq, &ad7879_spi_bus_ops);
+        if (IS_ERR(ts))
+                return PTR_ERR(ts);
+        spi_set_drvdata(spi, ts);
+        return 0;
+}
+static int __devexit ad7879_spi_remove(struct spi_device *spi)
+{
+        struct ad7879 *ts = spi_get_drvdata(spi);
+        ad7879_remove(ts);
+        spi_set_drvdata(spi, NULL);
+        return 0;
+}
+static struct spi_driver ad7879_spi_driver = {
+        .driver = {
+                .name   = "ad7879",
+                .bus    = &spi_bus_type,
+                .owner  = THIS_MODULE,
+        },
+        .probe          = ad7879_spi_probe,
+        .remove         = __devexit_p(ad7879_spi_remove),
+        .suspend        = ad7879_spi_suspend,
+        .resume         = ad7879_spi_resume,
+};
+static int __init ad7879_spi_init(void)
+{
+        return spi_register_driver(&ad7879_spi_driver);
+}
+module_init(ad7879_spi_init);
+static void __exit ad7879_spi_exit(void)
+{
+        spi_unregister_driver(&ad7879_spi_driver);
+}
+module_exit(ad7879_spi_exit);
+MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
+MODULE_DESCRIPTION("AD7879(-1) touchscreen SPI bus driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("spi:ad7879");
diff --git a/drivers/input/touchscreen/ad7879.c b/drivers/input/touchscreen/ad7879.c
index 4b32fb4704cd..ba6f0bd1e762 100644
--- a/drivers/input/touchscreen/ad7879.c
+++ b/drivers/input/touchscreen/ad7879.c
@@ -1,25 +1,9 @@
 /*
- * Copyright (C) 2008-2009 Michael Hennerich, Analog Devices Inc.
+ * AD7879/AD7889 based touchscreen and GPIO driver
 *
- * Description: AD7879/AD7889 based touchscreen, and GPIO driver
+ * Copyright (C) 2008-2010 Michael Hennerich, Analog Devices Inc.
- *              (I2C/SPI Interface)
 *
- * Bugs:        Enter bugs at http://blackfin.uclinux.org/
+ * Licensed under the GPL-2 or later.
- *
- * 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, see the file COPYING, or write
- * to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 *
 * History:
 * Copyright (c) 2005 David Brownell
@@ -44,12 +28,12 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/slab.h>
-#include <linux/workqueue.h>
 #include <linux/spi/spi.h>
 #include <linux/i2c.h>
 #include <linux/gpio.h>
 #include <linux/spi/ad7879.h>
+#include "ad7879.h"
 #define AD7879_REG_ZEROS                0
 #define AD7879_REG_CTRL1                1
@@ -120,30 +104,19 @@ enum {
 #define MAX_12BIT                       ((1<<12)-1)
 #define TS_PEN_UP_TIMEOUT               msecs_to_jiffies(50)
-#if defined(CONFIG_TOUCHSCREEN_AD7879_SPI) || defined(CONFIG_TOUCHSCREEN_AD7879_SPI_MODULE)
-#define AD7879_DEVID            0x7A
-typedef struct spi_device       bus_device;
-#elif defined(CONFIG_TOUCHSCREEN_AD7879_I2C) || defined(CONFIG_TOUCHSCREEN_AD7879_I2C_MODULE)
-#define AD7879_DEVID            0x79
-typedef struct i2c_client       bus_device;
-#endif
 struct ad7879 {
-        bus_device              *bus;
+        const struct ad7879_bus_ops *bops;
+        struct device           *dev;
        struct input_dev        *input;
-        struct work_struct      work;
        struct timer_list       timer;
 #ifdef CONFIG_GPIOLIB
        struct gpio_chip        gc;
-#endif
        struct mutex            mutex;
-        unsigned                disabled:1;     /* P: mutex */
-#if defined(CONFIG_TOUCHSCREEN_AD7879_SPI) || defined(CONFIG_TOUCHSCREEN_AD7879_SPI_MODULE)
-        struct spi_message      msg;
-        struct spi_transfer     xfer[AD7879_NR_SENSE + 1];
-        u16                     cmd;
 #endif
+        unsigned int            irq;
+        bool                    disabled;       /* P: input->mutex */
+        bool                    suspended;      /* P: input->mutex */
        u16                     conversion_data[AD7879_NR_SENSE];
        char                    phys[32];
        u8                      first_conversion_delay;
@@ -158,11 +131,22 @@ struct ad7879 {
        u16                     cmd_crtl3;
 };
-static int ad7879_read(bus_device *, u8);
+static int ad7879_read(struct ad7879 *ts, u8 reg)
-static int ad7879_write(bus_device *, u8, u16);
+{
-static void ad7879_collect(struct ad7879 *);
+        return ts->bops->read(ts->dev, reg);
+}
+static int ad7879_multi_read(struct ad7879 *ts, u8 first_reg, u8 count, u16 *buf)
+{
+        return ts->bops->multi_read(ts->dev, first_reg, count, buf);
+}
-static void ad7879_report(struct ad7879 *ts)
+static int ad7879_write(struct ad7879 *ts, u8 reg, u16 val)
+{
+        return ts->bops->write(ts->dev, reg, val);
+}
+static int ad7879_report(struct ad7879 *ts)
 {
        struct input_dev *input_dev = ts->input;
        unsigned Rt;
@@ -175,12 +159,14 @@ static void ad7879_report(struct ad7879 *ts)
        /*
         * The samples processed here are already preprocessed by the AD7879.
-         * The preprocessing function consists of a median and an averaging filter.
+         * The preprocessing function consists of a median and an averaging
-         * The combination of these two techniques provides a robust solution,
+         * filter.  The combination of these two techniques provides a robust
-         * discarding the spurious noise in the signal and keeping only the data of interest.
+         * solution, discarding the spurious noise in the signal and keeping
-         * The size of both filters is programmable. (dev.platform_data, see linux/spi/ad7879.h)
+         * only the data of interest.  The size of both filters is
-         * Other user-programmable conversion controls include variable acquisition time,
+         * programmable. (dev.platform_data, see linux/spi/ad7879.h) Other
-         * and first conversion delay. Up to 16 averages can be taken per conversion.
+         * user-programmable conversion controls include variable acquisition
+         * time, and first conversion delay. Up to 16 averages can be taken
+         * per conversion.
         */
        if (likely(x && z1)) {
@@ -189,21 +175,17 @@ static void ad7879_report(struct ad7879 *ts)
                Rt /= z1;
                Rt = (Rt + 2047) >> 12;
+                if (!timer_pending(&ts->timer))
+                        input_report_key(input_dev, BTN_TOUCH, 1);
                input_report_abs(input_dev, ABS_X, x);
                input_report_abs(input_dev, ABS_Y, y);
                input_report_abs(input_dev, ABS_PRESSURE, Rt);
                input_sync(input_dev);
+                return 0;
        }
-}
-static void ad7879_work(struct work_struct *work)
-{
-        struct ad7879 *ts = container_of(work, struct ad7879, work);
-        /* use keventd context to read the result registers */
+        return -EINVAL;
-        ad7879_collect(ts);
-        ad7879_report(ts);
-        mod_timer(&ts->timer, jiffies + TS_PEN_UP_TIMEOUT);
 }
 static void ad7879_ts_event_release(struct ad7879 *ts)
@@ -211,6 +193,7 @@ static void ad7879_ts_event_release(struct ad7879 *ts)
        struct input_dev *input_dev = ts->input;
        input_report_abs(input_dev, ABS_PRESSURE, 0);
+        input_report_key(input_dev, BTN_TOUCH, 0);
        input_sync(input_dev);
 }
@@ -225,56 +208,98 @@ static irqreturn_t ad7879_irq(int irq, void *handle)
 {
        struct ad7879 *ts = handle;
-        /* The repeated conversion sequencer controlled by TMR kicked off too fast.
+        ad7879_multi_read(ts, AD7879_REG_XPLUS, AD7879_NR_SENSE, ts->conversion_data);
-         * We ignore the last and process the sample sequence currently in the queue.
-         * It can't be older than 9.4ms
-         */
-        if (!work_pending(&ts->work))
+        if (!ad7879_report(ts))
-                schedule_work(&ts->work);
+                mod_timer(&ts->timer, jiffies + TS_PEN_UP_TIMEOUT);
        return IRQ_HANDLED;
 }
-static void ad7879_setup(struct ad7879 *ts)
+static void __ad7879_enable(struct ad7879 *ts)
 {
-        ad7879_write(ts->bus, AD7879_REG_CTRL2, ts->cmd_crtl2);
+        ad7879_write(ts, AD7879_REG_CTRL2, ts->cmd_crtl2);
-        ad7879_write(ts->bus, AD7879_REG_CTRL3, ts->cmd_crtl3);
+        ad7879_write(ts, AD7879_REG_CTRL3, ts->cmd_crtl3);
-        ad7879_write(ts->bus, AD7879_REG_CTRL1, ts->cmd_crtl1);
+        ad7879_write(ts, AD7879_REG_CTRL1, ts->cmd_crtl1);
+        enable_irq(ts->irq);
 }
-static void ad7879_disable(struct ad7879 *ts)
+static void __ad7879_disable(struct ad7879 *ts)
 {
-        mutex_lock(&ts->mutex);
+        disable_irq(ts->irq);
+        if (del_timer_sync(&ts->timer))
+                ad7879_ts_event_release(ts);
+        ad7879_write(ts, AD7879_REG_CTRL2, AD7879_PM(AD7879_PM_SHUTDOWN));
+}
-        if (!ts->disabled) {
-                ts->disabled = 1;
+static int ad7879_open(struct input_dev *input)
-                disable_irq(ts->bus->irq);
+{
+        struct ad7879 *ts = input_get_drvdata(input);
-                cancel_work_sync(&ts->work);
+        /* protected by input->mutex */
+        if (!ts->disabled && !ts->suspended)
+                __ad7879_enable(ts);
-                if (del_timer_sync(&ts->timer))
+        return 0;
-                        ad7879_ts_event_release(ts);
+}
-                ad7879_write(ts->bus, AD7879_REG_CTRL2,
+static void ad7879_close(struct input_dev* input)
-                             AD7879_PM(AD7879_PM_SHUTDOWN));
+{
-        }
+        struct ad7879 *ts = input_get_drvdata(input);
-        mutex_unlock(&ts->mutex);
+        /* protected by input->mutex */
+        if (!ts->disabled && !ts->suspended)
+                __ad7879_disable(ts);
 }
-static void ad7879_enable(struct ad7879 *ts)
+void ad7879_suspend(struct ad7879 *ts)
 {
-        mutex_lock(&ts->mutex);
+        mutex_lock(&ts->input->mutex);
+        if (!ts->suspended && !ts->disabled && ts->input->users)
+                __ad7879_disable(ts);
+        ts->suspended = true;
-        if (ts->disabled) {
+        mutex_unlock(&ts->input->mutex);
-                ad7879_setup(ts);
+}
-                ts->disabled = 0;
+EXPORT_SYMBOL(ad7879_suspend);
-                enable_irq(ts->bus->irq);
+void ad7879_resume(struct ad7879 *ts)
+{
+        mutex_lock(&ts->input->mutex);
+        if (ts->suspended && !ts->disabled && ts->input->users)
+                __ad7879_enable(ts);
+        ts->suspended = false;
+        mutex_unlock(&ts->input->mutex);
+}
+EXPORT_SYMBOL(ad7879_resume);
+static void ad7879_toggle(struct ad7879 *ts, bool disable)
+{
+        mutex_lock(&ts->input->mutex);
+        if (!ts->suspended && ts->input->users != 0) {
+                if (disable) {
+                        if (ts->disabled)
+                                __ad7879_enable(ts);
+                } else {
+                        if (!ts->disabled)
+                                __ad7879_disable(ts);
+                }
        }
-        mutex_unlock(&ts->mutex);
+        ts->disabled = disable;
+        mutex_unlock(&ts->input->mutex);
 }
 static ssize_t ad7879_disable_show(struct device *dev,
@@ -297,10 +322,7 @@ static ssize_t ad7879_disable_store(struct device *dev,
        if (error)
                return error;
-        if (val)
+        ad7879_toggle(ts, val);
-                ad7879_disable(ts);
-        else
-                ad7879_enable(ts);
        return count;
 }
@@ -325,7 +347,7 @@ static int ad7879_gpio_direction_input(struct gpio_chip *chip,
        mutex_lock(&ts->mutex);
        ts->cmd_crtl2 |= AD7879_GPIO_EN | AD7879_GPIODIR | AD7879_GPIOPOL;
-        err = ad7879_write(ts->bus, AD7879_REG_CTRL2, ts->cmd_crtl2);
+        err = ad7879_write(ts, AD7879_REG_CTRL2, ts->cmd_crtl2);
        mutex_unlock(&ts->mutex);
        return err;
@@ -345,7 +367,7 @@ static int ad7879_gpio_direction_output(struct gpio_chip *chip,
        else
                ts->cmd_crtl2 &= ~AD7879_GPIO_DATA;
-        err = ad7879_write(ts->bus, AD7879_REG_CTRL2, ts->cmd_crtl2);
+        err = ad7879_write(ts, AD7879_REG_CTRL2, ts->cmd_crtl2);
        mutex_unlock(&ts->mutex);
        return err;
@@ -357,7 +379,7 @@ static int ad7879_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
        u16 val;
        mutex_lock(&ts->mutex);
-        val = ad7879_read(ts->bus, AD7879_REG_CTRL2);
+        val = ad7879_read(ts, AD7879_REG_CTRL2);
        mutex_unlock(&ts->mutex);
        return !!(val & AD7879_GPIO_DATA);
@@ -374,16 +396,17 @@ static void ad7879_gpio_set_value(struct gpio_chip *chip,
        else
                ts->cmd_crtl2 &= ~AD7879_GPIO_DATA;
-        ad7879_write(ts->bus, AD7879_REG_CTRL2, ts->cmd_crtl2);
+        ad7879_write(ts, AD7879_REG_CTRL2, ts->cmd_crtl2);
        mutex_unlock(&ts->mutex);
 }
-static int __devinit ad7879_gpio_add(struct device *dev)
+static int ad7879_gpio_add(struct ad7879 *ts,
+                           const struct ad7879_platform_data *pdata)
 {
-        struct ad7879 *ts = dev_get_drvdata(dev);
-        struct ad7879_platform_data *pdata = dev->platform_data;
        int ret = 0;
+        mutex_init(&ts->mutex);
        if (pdata->gpio_export) {
                ts->gc.direction_input = ad7879_gpio_direction_input;
                ts->gc.direction_output = ad7879_gpio_direction_output;
@@ -394,72 +417,75 @@ static int __devinit ad7879_gpio_add(struct device *dev)
                ts->gc.ngpio = 1;
                ts->gc.label = "AD7879-GPIO";
                ts->gc.owner = THIS_MODULE;
-                ts->gc.dev = dev;
+                ts->gc.dev = ts->dev;
                ret = gpiochip_add(&ts->gc);
                if (ret)
-                        dev_err(dev, "failed to register gpio %d\n",
+                        dev_err(ts->dev, "failed to register gpio %d\n",
                                ts->gc.base);
        }
        return ret;
 }
-/*
+static void ad7879_gpio_remove(struct ad7879 *ts)
- * We mark ad7879_gpio_remove inline so there is a chance the code
- * gets discarded when not needed. We can't do __devinit/__devexit
- * markup since it is used in both probe and remove methods.
- */
-static inline void ad7879_gpio_remove(struct device *dev)
 {
-        struct ad7879 *ts = dev_get_drvdata(dev);
+        const struct ad7879_platform_data *pdata = ts->dev->platform_data;
-        struct ad7879_platform_data *pdata = dev->platform_data;
        int ret;
        if (pdata->gpio_export) {
                ret = gpiochip_remove(&ts->gc);
                if (ret)
-                        dev_err(dev, "failed to remove gpio %d\n",
+                        dev_err(ts->dev, "failed to remove gpio %d\n",
                                ts->gc.base);
        }
 }
 #else
-static inline int ad7879_gpio_add(struct device *dev)
+static inline int ad7879_gpio_add(struct ad7879 *ts,
+                                  const struct ad7879_platform_data *pdata)
 {
        return 0;
 }
-static inline void ad7879_gpio_remove(struct device *dev)
+static inline void ad7879_gpio_remove(struct ad7879 *ts)
 {
 }
 #endif
-static int __devinit ad7879_construct(bus_device *bus, struct ad7879 *ts)
+struct ad7879 *ad7879_probe(struct device *dev, u8 devid, unsigned int irq,
+                            const struct ad7879_bus_ops *bops)
 {
+        struct ad7879_platform_data *pdata = dev->platform_data;
+        struct ad7879 *ts;
        struct input_dev *input_dev;
-        struct ad7879_platform_data *pdata = bus->dev.platform_data;
        int err;
        u16 revid;
-        if (!bus->irq) {
+        if (!irq) {
-                dev_err(&bus->dev, "no IRQ?\n");
+                dev_err(dev, "no IRQ?\n");
-                return -ENODEV;
+                err = -EINVAL;
+                goto err_out;
        }
        if (!pdata) {
-                dev_err(&bus->dev, "no platform data?\n");
+                dev_err(dev, "no platform data?\n");
-                return -ENODEV;
+                err = -EINVAL;
+                goto err_out;
        }
+        ts = kzalloc(sizeof(*ts), GFP_KERNEL);
        input_dev = input_allocate_device();
-        if (!input_dev)
+        if (!ts || !input_dev) {
-                return -ENOMEM;
+                err = -ENOMEM;
+                goto err_free_mem;
+        }
+        ts->bops = bops;
+        ts->dev = dev;
        ts->input = input_dev;
+        ts->irq = irq;
        setup_timer(&ts->timer, ad7879_timer, (unsigned long) ts);
-        INIT_WORK(&ts->work, ad7879_work);
-        mutex_init(&ts->mutex);
        ts->x_plate_ohms = pdata->x_plate_ohms ? : 400;
        ts->pressure_max = pdata->pressure_max ? : ~0;
@@ -470,17 +496,26 @@ static int __devinit ad7879_construct(bus_device *bus, struct ad7879 *ts)
        ts->pen_down_acc_interval = pdata->pen_down_acc_interval;
        ts->median = pdata->median;
-        snprintf(ts->phys, sizeof(ts->phys), "%s/input0", dev_name(&bus->dev));
+        snprintf(ts->phys, sizeof(ts->phys), "%s/input0", dev_name(dev));
        input_dev->name = "AD7879 Touchscreen";
        input_dev->phys = ts->phys;
-        input_dev->dev.parent = &bus->dev;
+        input_dev->dev.parent = dev;
+        input_dev->id.bustype = bops->bustype;
+        input_dev->open = ad7879_open;
+        input_dev->close = ad7879_close;
+        input_set_drvdata(input_dev, ts);
        __set_bit(EV_ABS, input_dev->evbit);
        __set_bit(ABS_X, input_dev->absbit);
        __set_bit(ABS_Y, input_dev->absbit);
        __set_bit(ABS_PRESSURE, input_dev->absbit);
+        __set_bit(EV_KEY, input_dev->evbit);
+        __set_bit(BTN_TOUCH, input_dev->keybit);
        input_set_abs_params(input_dev, ABS_X,
                        pdata->x_min ? : 0,
                        pdata->x_max ? : MAX_12BIT,
@@ -492,17 +527,18 @@ static int __devinit ad7879_construct(bus_device *bus, struct ad7879 *ts)
        input_set_abs_params(input_dev, ABS_PRESSURE,
                        pdata->pressure_min, pdata->pressure_max, 0, 0);
-        err = ad7879_write(bus, AD7879_REG_CTRL2, AD7879_RESET);
+        err = ad7879_write(ts, AD7879_REG_CTRL2, AD7879_RESET);
        if (err < 0) {
-                dev_err(&bus->dev, "Failed to write %s\n", input_dev->name);
+                dev_err(dev, "Failed to write %s\n", input_dev->name);
                goto err_free_mem;
        }
-        revid = ad7879_read(bus, AD7879_REG_REVID);
+        revid = ad7879_read(ts, AD7879_REG_REVID);
+        input_dev->id.product = (revid & 0xff);
-        if ((revid & 0xFF) != AD7879_DEVID) {
+        input_dev->id.version = revid >> 8;
-                dev_err(&bus->dev, "Failed to probe %s\n", input_dev->name);
+        if (input_dev->id.product != devid) {
+                dev_err(dev, "Failed to probe %s (%x vs %x)\n",
+                        input_dev->name, devid, revid);
                err = -ENODEV;
                goto err_free_mem;
        }
@@ -524,21 +560,21 @@ static int __devinit ad7879_construct(bus_device *bus, struct ad7879 *ts)
                        AD7879_ACQ(ts->acquisition_time) |
                        AD7879_TMR(ts->pen_down_acc_interval);
-        ad7879_setup(ts);
+        err = request_threaded_irq(ts->irq, NULL, ad7879_irq,
+                                   IRQF_TRIGGER_FALLING,
-        err = request_irq(bus->irq, ad7879_irq,
+                                   dev_name(dev), ts);
-                          IRQF_TRIGGER_FALLING, bus->dev.driver->name, ts);
        if (err) {
-                dev_err(&bus->dev, "irq %d busy?\n", bus->irq);
+                dev_err(dev, "irq %d busy?\n", ts->irq);
                goto err_free_mem;
        }
-        err = sysfs_create_group(&bus->dev.kobj, &ad7879_attr_group);
+        __ad7879_disable(ts);
+        err = sysfs_create_group(&dev->kobj, &ad7879_attr_group);
        if (err)
                goto err_free_irq;
-        err = ad7879_gpio_add(&bus->dev);
+        err = ad7879_gpio_add(ts, pdata);
        if (err)
                goto err_remove_attr;
@@ -546,321 +582,32 @@ static int __devinit ad7879_construct(bus_device *bus, struct ad7879 *ts)
        if (err)
                goto err_remove_gpio;
-        dev_info(&bus->dev, "Rev.%d touchscreen, irq %d\n",
+        return ts;
-                 revid >> 8, bus->irq);
-        return 0;
 err_remove_gpio:
-        ad7879_gpio_remove(&bus->dev);
+        ad7879_gpio_remove(ts);
 err_remove_attr:
-        sysfs_remove_group(&bus->dev.kobj, &ad7879_attr_group);
+        sysfs_remove_group(&dev->kobj, &ad7879_attr_group);
 err_free_irq:
-        free_irq(bus->irq, ts);
+        free_irq(ts->irq, ts);
 err_free_mem:
        input_free_device(input_dev);
-        return err;
-}
-static int __devexit ad7879_destroy(bus_device *bus, struct ad7879 *ts)
-{
-        ad7879_gpio_remove(&bus->dev);
-        ad7879_disable(ts);
-        sysfs_remove_group(&ts->bus->dev.kobj, &ad7879_attr_group);
-        free_irq(ts->bus->irq, ts);
-        input_unregister_device(ts->input);
-        dev_dbg(&bus->dev, "unregistered touchscreen\n");
-        return 0;
-}
-#ifdef CONFIG_PM
-static int ad7879_suspend(bus_device *bus, pm_message_t message)
-{
-        struct ad7879 *ts = dev_get_drvdata(&bus->dev);
-        ad7879_disable(ts);
-        return 0;
-}
-static int ad7879_resume(bus_device *bus)
-{
-        struct ad7879 *ts = dev_get_drvdata(&bus->dev);
-        ad7879_enable(ts);
-        return 0;
-}
-#else
-#define ad7879_suspend NULL
-#define ad7879_resume  NULL
-#endif
-#if defined(CONFIG_TOUCHSCREEN_AD7879_SPI) || defined(CONFIG_TOUCHSCREEN_AD7879_SPI_MODULE)
-#define MAX_SPI_FREQ_HZ         5000000
-#define AD7879_CMD_MAGIC        0xE000
-#define AD7879_CMD_READ         (1 << 10)
-#define AD7879_WRITECMD(reg)    (AD7879_CMD_MAGIC | (reg & 0xF))
-#define AD7879_READCMD(reg)     (AD7879_CMD_MAGIC | AD7879_CMD_READ | (reg & 0xF))
-struct ser_req {
-        u16                     command;
-        u16                     data;
-        struct spi_message      msg;
-        struct spi_transfer     xfer[2];
-};
-/*
- * ad7879_read/write are only used for initial setup and for sysfs controls.
- * The main traffic is done in ad7879_collect().
- */
-static int ad7879_read(struct spi_device *spi, u8 reg)
-{
-        struct ser_req *req;
-        int status, ret;
-        req = kzalloc(sizeof *req, GFP_KERNEL);
-        if (!req)
-                return -ENOMEM;
-        spi_message_init(&req->msg);
-        req->command = (u16) AD7879_READCMD(reg);
-        req->xfer[0].tx_buf = &req->command;
-        req->xfer[0].len = 2;
-        req->xfer[1].rx_buf = &req->data;
-        req->xfer[1].len = 2;
-        spi_message_add_tail(&req->xfer[0], &req->msg);
-        spi_message_add_tail(&req->xfer[1], &req->msg);
-        status = spi_sync(spi, &req->msg);
-        ret = status ? : req->data;
-        kfree(req);
-        return ret;
-}
-static int ad7879_write(struct spi_device *spi, u8 reg, u16 val)
-{
-        struct ser_req *req;
-        int status;
-        req = kzalloc(sizeof *req, GFP_KERNEL);
-        if (!req)
-                return -ENOMEM;
-        spi_message_init(&req->msg);
-        req->command = (u16) AD7879_WRITECMD(reg);
-        req->xfer[0].tx_buf = &req->command;
-        req->xfer[0].len = 2;
-        req->data = val;
-        req->xfer[1].tx_buf = &req->data;
-        req->xfer[1].len = 2;
-        spi_message_add_tail(&req->xfer[0], &req->msg);
-        spi_message_add_tail(&req->xfer[1], &req->msg);
-        status = spi_sync(spi, &req->msg);
-        kfree(req);
-        return status;
-}
-static void ad7879_collect(struct ad7879 *ts)
-{
-        int status = spi_sync(ts->bus, &ts->msg);
-        if (status)
-                dev_err(&ts->bus->dev, "spi_sync --> %d\n", status);
-}
-static void ad7879_setup_ts_def_msg(struct ad7879 *ts)
-{
-        struct spi_message *m;
-        int i;
-        ts->cmd = (u16) AD7879_READCMD(AD7879_REG_XPLUS);
-        m = &ts->msg;
-        spi_message_init(m);
-        ts->xfer[0].tx_buf = &ts->cmd;
-        ts->xfer[0].len = 2;
-        spi_message_add_tail(&ts->xfer[0], m);
-        for (i = 0; i < AD7879_NR_SENSE; i++) {
-                ts->xfer[i + 1].rx_buf = &ts->conversion_data[i];
-                ts->xfer[i + 1].len = 2;
-                spi_message_add_tail(&ts->xfer[i + 1], m);
-        }
-}
-static int __devinit ad7879_probe(struct spi_device *spi)
-{
-        struct ad7879 *ts;
-        int error;
-        /* don't exceed max specified SPI CLK frequency */
-        if (spi->max_speed_hz > MAX_SPI_FREQ_HZ) {
-                dev_err(&spi->dev, "SPI CLK %d Hz?\n", spi->max_speed_hz);
-                return -EINVAL;
-        }
-        ts = kzalloc(sizeof(struct ad7879), GFP_KERNEL);
-        if (!ts)
-                return -ENOMEM;
-        dev_set_drvdata(&spi->dev, ts);
-        ts->bus = spi;
-        ad7879_setup_ts_def_msg(ts);
-        error = ad7879_construct(spi, ts);
-        if (error) {
-                dev_set_drvdata(&spi->dev, NULL);
-                kfree(ts);
-        }
-        return error;
-}
-static int __devexit ad7879_remove(struct spi_device *spi)
-{
-        struct ad7879 *ts = dev_get_drvdata(&spi->dev);
-        ad7879_destroy(spi, ts);
-        dev_set_drvdata(&spi->dev, NULL);
        kfree(ts);
+err_out:
-        return 0;
+        return ERR_PTR(err);
 }
+EXPORT_SYMBOL(ad7879_probe);
-static struct spi_driver ad7879_driver = {
+void ad7879_remove(struct ad7879 *ts)
-        .driver = {
-                .name   = "ad7879",
-                .bus    = &spi_bus_type,
-                .owner  = THIS_MODULE,
-        },
-        .probe          = ad7879_probe,
-        .remove         = __devexit_p(ad7879_remove),
-        .suspend        = ad7879_suspend,
-        .resume         = ad7879_resume,
-};
-static int __init ad7879_init(void)
-{
-        return spi_register_driver(&ad7879_driver);
-}
-module_init(ad7879_init);
-static void __exit ad7879_exit(void)
-{
-        spi_unregister_driver(&ad7879_driver);
-}
-module_exit(ad7879_exit);
-#elif defined(CONFIG_TOUCHSCREEN_AD7879_I2C) || defined(CONFIG_TOUCHSCREEN_AD7879_I2C_MODULE)
-/* All registers are word-sized.
- * AD7879 uses a high-byte first convention.
- */
-static int ad7879_read(struct i2c_client *client, u8 reg)
 {
-        return swab16(i2c_smbus_read_word_data(client, reg));
+        ad7879_gpio_remove(ts);
-}
+        sysfs_remove_group(&ts->dev->kobj, &ad7879_attr_group);
+        free_irq(ts->irq, ts);
-static int ad7879_write(struct i2c_client *client, u8 reg, u16 val)
+        input_unregister_device(ts->input);
-{
-        return i2c_smbus_write_word_data(client, reg, swab16(val));
-}
-static void ad7879_collect(struct ad7879 *ts)
-{
-        int i;
-        for (i = 0; i < AD7879_NR_SENSE; i++)
-                ts->conversion_data[i] = ad7879_read(ts->bus,
-                                                     AD7879_REG_XPLUS + i);
-}
-static int __devinit ad7879_probe(struct i2c_client *client,
-                                        const struct i2c_device_id *id)
-{
-        struct ad7879 *ts;
-        int error;
-        if (!i2c_check_functionality(client->adapter,
-                                        I2C_FUNC_SMBUS_WORD_DATA)) {
-                dev_err(&client->dev, "SMBUS Word Data not Supported\n");
-                return -EIO;
-        }
-        ts = kzalloc(sizeof(struct ad7879), GFP_KERNEL);
-        if (!ts)
-                return -ENOMEM;
-        i2c_set_clientdata(client, ts);
-        ts->bus = client;
-        error = ad7879_construct(client, ts);
-        if (error)
-                kfree(ts);
-        return error;
-}
-static int __devexit ad7879_remove(struct i2c_client *client)
-{
-        struct ad7879 *ts = dev_get_drvdata(&client->dev);
-        ad7879_destroy(client, ts);
        kfree(ts);
-        return 0;
-}
-static const struct i2c_device_id ad7879_id[] = {
-        { "ad7879", 0 },
-        { "ad7889", 0 },
-        { }
-};
-MODULE_DEVICE_TABLE(i2c, ad7879_id);
-static struct i2c_driver ad7879_driver = {
-        .driver = {
-                .name   = "ad7879",
-                .owner  = THIS_MODULE,
-        },
-        .probe          = ad7879_probe,
-        .remove         = __devexit_p(ad7879_remove),
-        .suspend        = ad7879_suspend,
-        .resume         = ad7879_resume,
-        .id_table       = ad7879_id,
-};
-static int __init ad7879_init(void)
-{
-        return i2c_add_driver(&ad7879_driver);
-}
-module_init(ad7879_init);
-static void __exit ad7879_exit(void)
-{
-        i2c_del_driver(&ad7879_driver);
 }
-module_exit(ad7879_exit);
+EXPORT_SYMBOL(ad7879_remove);
-#endif
 MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
 MODULE_DESCRIPTION("AD7879(-1) touchscreen Driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("spi:ad7879");
diff --git a/drivers/input/touchscreen/ad7879.h b/drivers/input/touchscreen/ad7879.h
new file mode 100644
index 000000000000..6b45a27236c7
--- /dev/null
+++ b/drivers/input/touchscreen/ad7879.h
@@ -0,0 +1,30 @@
+/*
+ * AD7879/AD7889 touchscreen (bus interfaces)
+ *
+ * Copyright (C) 2008-2010 Michael Hennerich, Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+#ifndef _AD7879_H_
+#define _AD7879_H_
+#include <linux/types.h>
+struct ad7879;
+struct device;
+struct ad7879_bus_ops {
+        u16 bustype;
+        int (*read)(struct device *dev, u8 reg);
+        int (*multi_read)(struct device *dev, u8 first_reg, u8 count, u16 *buf);
+        int (*write)(struct device *dev, u8 reg, u16 val);
+};
+void ad7879_suspend(struct ad7879 *);
+void ad7879_resume(struct ad7879 *);
+struct ad7879 *ad7879_probe(struct device *dev, u8 devid, unsigned irq,
+                            const struct ad7879_bus_ops *bops);
+void ad7879_remove(struct ad7879 *);
+#endif
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index a9fdf55c0238..16031933a8f6 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -68,6 +68,8 @@ struct ts_event {
        u16     y;
        u16     z1, z2;
        int     ignore;
+        u8      x_buf[3];
+        u8      y_buf[3];
 };
 /*
@@ -79,6 +81,8 @@ struct ads7846_packet {
        u8                      read_x, read_y, read_z1, read_z2, pwrdown;
        u16                     dummy;          /* for the pwrdown read */
        struct ts_event         tc;
+        /* for ads7845 with mpc5121 psc spi we use 3-byte buffers */
+        u8                      read_x_cmd[3], read_y_cmd[3], pwrdown_cmd[3];
 };
 struct ads7846 {
@@ -207,6 +211,14 @@ struct ser_req {
        struct spi_transfer     xfer[6];
 };
+struct ads7845_ser_req {
+        u8                      command[3];
+        u8                      pwrdown[3];
+        u8                      sample[3];
+        struct spi_message      msg;
+        struct spi_transfer     xfer[2];
+};
 static void ads7846_enable(struct ads7846 *ts);
 static void ads7846_disable(struct ads7846 *ts);
@@ -287,6 +299,41 @@ static int ads7846_read12_ser(struct device *dev, unsigned command)
        return status;
 }
+static int ads7845_read12_ser(struct device *dev, unsigned command)
+{
+        struct spi_device       *spi = to_spi_device(dev);
+        struct ads7846          *ts = dev_get_drvdata(dev);
+        struct ads7845_ser_req  *req = kzalloc(sizeof *req, GFP_KERNEL);
+        int                     status;
+        if (!req)
+                return -ENOMEM;
+        spi_message_init(&req->msg);
+        req->command[0] = (u8) command;
+        req->xfer[0].tx_buf = req->command;
+        req->xfer[0].rx_buf = req->sample;
+        req->xfer[0].len = 3;
+        spi_message_add_tail(&req->xfer[0], &req->msg);
+        ts->irq_disabled = 1;
+        disable_irq(spi->irq);
+        status = spi_sync(spi, &req->msg);
+        ts->irq_disabled = 0;
+        enable_irq(spi->irq);
+        if (status == 0) {
+                /* BE12 value, then padding */
+                status = be16_to_cpu(*((u16 *)&req->sample[1]));
+                status = status >> 3;
+                status &= 0x0fff;
+        }
+        kfree(req);
+        return status;
+}
 #if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE)
 #define SHOW(name, var, adjust) static ssize_t \
@@ -540,10 +587,17 @@ static void ads7846_rx(void *ads)
        /* ads7846_rx_val() did in-place conversion (including byteswap) from
         * on-the-wire format as part of debouncing to get stable readings.
         */
-        x = packet->tc.x;
+        if (ts->model == 7845) {
-        y = packet->tc.y;
+                x = *(u16 *)packet->tc.x_buf;
-        z1 = packet->tc.z1;
+                y = *(u16 *)packet->tc.y_buf;
-        z2 = packet->tc.z2;
+                z1 = 0;
+                z2 = 0;
+        } else {
+                x = packet->tc.x;
+                y = packet->tc.y;
+                z1 = packet->tc.z1;
+                z2 = packet->tc.z2;
+        }
        /* range filtering */
        if (x == MAX_12BIT)
@@ -551,6 +605,12 @@ static void ads7846_rx(void *ads)
        if (ts->model == 7843) {
                Rt = ts->pressure_max / 2;
+        } else if (ts->model == 7845) {
+                if (get_pendown_state(ts))
+                        Rt = ts->pressure_max / 2;
+                else
+                        Rt = 0;
+                dev_vdbg(&ts->spi->dev, "x/y: %d/%d, PD %d\n", x, y, Rt);
        } else if (likely(x && z1)) {
                /* compute touch pressure resistance using equation #2 */
                Rt = z2;
@@ -671,10 +731,14 @@ static void ads7846_rx_val(void *ads)
        m = &ts->msg[ts->msg_idx];
        t = list_entry(m->transfers.prev, struct spi_transfer, transfer_list);
-        /* adjust:  on-wire is a must-ignore bit, a BE12 value, then padding;
+        if (ts->model == 7845) {
-         * built from two 8 bit values written msb-first.
+                val = be16_to_cpup((__be16 *)&(((char*)t->rx_buf)[1])) >> 3;
-         */
+        } else {
-        val = be16_to_cpup((__be16 *)t->rx_buf) >> 3;
+                /* adjust:  on-wire is a must-ignore bit, a BE12 value, then
+                 * padding; built from two 8 bit values written msb-first.
+                 */
+                val = be16_to_cpup((__be16 *)t->rx_buf) >> 3;
+        }
        action = ts->filter(ts->filter_data, ts->msg_idx, &val);
        switch (action) {
@@ -878,14 +942,15 @@ 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 *ts;
-        struct ads7846_packet           *packet;
+        struct ads7846_packet *packet;
-        struct input_dev                *input_dev;
+        struct input_dev *input_dev;
-        struct ads7846_platform_data    *pdata = spi->dev.platform_data;
+        const struct ads7846_platform_data *pdata = spi->dev.platform_data;
-        struct spi_message              *m;
+        struct spi_message *m;
-        struct spi_transfer             *x;
+        struct spi_transfer *x;
-        int                             vref;
+        unsigned long irq_flags;
-        int                             err;
+        int vref;
+        int err;
        if (!spi->irq) {
                dev_dbg(&spi->dev, "no IRQ?\n");
@@ -1008,16 +1073,26 @@ static int __devinit ads7846_probe(struct spi_device *spi)
        spi_message_init(m);
-        /* y- still on; turn on only y+ (and ADC) */
+        if (ts->model == 7845) {
-        packet->read_y = READ_Y(vref);
+                packet->read_y_cmd[0] = READ_Y(vref);
-        x->tx_buf = &packet->read_y;
+                packet->read_y_cmd[1] = 0;
-        x->len = 1;
+                packet->read_y_cmd[2] = 0;
-        spi_message_add_tail(x, m);
+                x->tx_buf = &packet->read_y_cmd[0];
+                x->rx_buf = &packet->tc.y_buf[0];
+                x->len = 3;
+                spi_message_add_tail(x, m);
+        } else {
+                /* y- still on; turn on only y+ (and ADC) */
+                packet->read_y = READ_Y(vref);
+                x->tx_buf = &packet->read_y;
+                x->len = 1;
+                spi_message_add_tail(x, m);
-        x++;
+                x++;
-        x->rx_buf = &packet->tc.y;
+                x->rx_buf = &packet->tc.y;
-        x->len = 2;
+                x->len = 2;
-        spi_message_add_tail(x, m);
+                spi_message_add_tail(x, m);
+        }
        /* the first sample after switching drivers can be low quality;
         * optionally discard it, using a second one after the signals
@@ -1043,17 +1118,28 @@ static int __devinit ads7846_probe(struct spi_device *spi)
        m++;
        spi_message_init(m);
-        /* turn y- off, x+ on, then leave in lowpower */
+        if (ts->model == 7845) {
-        x++;
+                x++;
-        packet->read_x = READ_X(vref);
+                packet->read_x_cmd[0] = READ_X(vref);
-        x->tx_buf = &packet->read_x;
+                packet->read_x_cmd[1] = 0;
-        x->len = 1;
+                packet->read_x_cmd[2] = 0;
-        spi_message_add_tail(x, m);
+                x->tx_buf = &packet->read_x_cmd[0];
+                x->rx_buf = &packet->tc.x_buf[0];
+                x->len = 3;
+                spi_message_add_tail(x, m);
+        } else {
+                /* turn y- off, x+ on, then leave in lowpower */
+                x++;
+                packet->read_x = READ_X(vref);
+                x->tx_buf = &packet->read_x;
+                x->len = 1;
+                spi_message_add_tail(x, m);
-        x++;
+                x++;
-        x->rx_buf = &packet->tc.x;
+                x->rx_buf = &packet->tc.x;
-        x->len = 2;
+                x->len = 2;
-        spi_message_add_tail(x, m);
+                spi_message_add_tail(x, m);
+        }
        /* ... maybe discard first sample ... */
        if (pdata->settle_delay_usecs) {
@@ -1144,15 +1230,25 @@ static int __devinit ads7846_probe(struct spi_device *spi)
        m++;
        spi_message_init(m);
-        x++;
+        if (ts->model == 7845) {
-        packet->pwrdown = PWRDOWN;
+                x++;
-        x->tx_buf = &packet->pwrdown;
+                packet->pwrdown_cmd[0] = PWRDOWN;
-        x->len = 1;
+                packet->pwrdown_cmd[1] = 0;
-        spi_message_add_tail(x, m);
+                packet->pwrdown_cmd[2] = 0;
+                x->tx_buf = &packet->pwrdown_cmd[0];
+                x->len = 3;
+        } else {
+                x++;
+                packet->pwrdown = PWRDOWN;
+                x->tx_buf = &packet->pwrdown;
+                x->len = 1;
+                spi_message_add_tail(x, m);
+                x++;
+                x->rx_buf = &packet->dummy;
+                x->len = 2;
+        }
-        x++;
-        x->rx_buf = &packet->dummy;
-        x->len = 2;
        CS_CHANGE(*x);
        spi_message_add_tail(x, m);
@@ -1174,17 +1270,22 @@ static int __devinit ads7846_probe(struct spi_device *spi)
                goto err_put_regulator;
        }
-        if (request_irq(spi->irq, ads7846_irq, IRQF_TRIGGER_FALLING,
+        irq_flags = pdata->irq_flags ? : IRQF_TRIGGER_FALLING;
-                        spi->dev.driver->name, ts)) {
+        err = request_irq(spi->irq, ads7846_irq, irq_flags,
+                          spi->dev.driver->name, ts);
+        if (err && !pdata->irq_flags) {
                dev_info(&spi->dev,
                        "trying pin change workaround on irq %d\n", spi->irq);
                err = request_irq(spi->irq, ads7846_irq,
                                  IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
                                  spi->dev.driver->name, ts);
-                if (err) {
+        }
-                        dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq);
-                        goto err_disable_regulator;
+        if (err) {
-                }
+                dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq);
+                goto err_disable_regulator;
        }
        err = ads784x_hwmon_register(spi, ts);
@@ -1196,8 +1297,11 @@ static int __devinit ads7846_probe(struct spi_device *spi)
        /* take a first sample, leaving nPENIRQ active and vREF off; avoid
         * the touchscreen, in case it's not connected.
         */
-        (void) ads7846_read12_ser(&spi->dev,
+        if (ts->model == 7845)
-                          READ_12BIT_SER(vaux) | ADS_PD10_ALL_ON);
+                ads7845_read12_ser(&spi->dev, PWRDOWN);
+        else
+                (void) ads7846_read12_ser(&spi->dev,
+                                READ_12BIT_SER(vaux) | ADS_PD10_ALL_ON);
        err = sysfs_create_group(&spi->dev.kobj, &ads784x_attr_group);
        if (err)
diff --git a/drivers/input/touchscreen/cy8ctmg110_ts.c b/drivers/input/touchscreen/cy8ctmg110_ts.c
new file mode 100644
index 000000000000..4eb7df0b7f87
--- /dev/null
+++ b/drivers/input/touchscreen/cy8ctmg110_ts.c
@@ -0,0 +1,363 @@
+/*
+ * Driver for cypress touch screen controller
+ *
+ * Copyright (c) 2009 Aava Mobile
+ *
+ * Some cleanups by Alan Cox <alan@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/input.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/i2c.h>
+#include <linux/gpio.h>
+#include <linux/input/cy8ctmg110_pdata.h>
+#define CY8CTMG110_DRIVER_NAME      "cy8ctmg110"
+/* Touch coordinates */
+#define CY8CTMG110_X_MIN                0
+#define CY8CTMG110_Y_MIN                0
+#define CY8CTMG110_X_MAX                759
+#define CY8CTMG110_Y_MAX                465
+/* cy8ctmg110 register definitions */
+#define CY8CTMG110_TOUCH_WAKEUP_TIME    0
+#define CY8CTMG110_TOUCH_SLEEP_TIME     2
+#define CY8CTMG110_TOUCH_X1             3
+#define CY8CTMG110_TOUCH_Y1             5
+#define CY8CTMG110_TOUCH_X2             7
+#define CY8CTMG110_TOUCH_Y2             9
+#define CY8CTMG110_FINGERS              11
+#define CY8CTMG110_GESTURE              12
+#define CY8CTMG110_REG_MAX              13
+/*
+ * The touch driver structure.
+ */
+struct cy8ctmg110 {
+        struct input_dev *input;
+        char phys[32];
+        struct i2c_client *client;
+        int reset_pin;
+        int irq_pin;
+};
+/*
+ * cy8ctmg110_power is the routine that is called when touch hardware
+ * will powered off or on.
+ */
+static void cy8ctmg110_power(struct cy8ctmg110 *ts, bool poweron)
+{
+        if (ts->reset_pin)
+                gpio_direction_output(ts->reset_pin, 1 - poweron);
+}
+static int cy8ctmg110_write_regs(struct cy8ctmg110 *tsc, unsigned char reg,
+                unsigned char len, unsigned char *value)
+{
+        struct i2c_client *client = tsc->client;
+        unsigned int ret;
+        unsigned char i2c_data[6];
+        BUG_ON(len > 5);
+        i2c_data[0] = reg;
+        memcpy(i2c_data + 1, value, len);
+        ret = i2c_master_send(client, i2c_data, len + 1);
+        if (ret != 1) {
+                dev_err(&client->dev, "i2c write data cmd failed\n");
+                return ret;
+        }
+        return 0;
+}
+static int cy8ctmg110_read_regs(struct cy8ctmg110 *tsc,
+                unsigned char *data, unsigned char len, unsigned char cmd)
+{
+        struct i2c_client *client = tsc->client;
+        unsigned int ret;
+        struct i2c_msg msg[2] = {
+                /* first write slave position to i2c devices */
+                { client->addr, 0, 1, &cmd },
+                /* Second read data from position */
+                { client->addr, I2C_M_RD, len, data }
+        };
+        ret = i2c_transfer(client->adapter, msg, 2);
+        if (ret < 0)
+                return ret;
+        return 0;
+}
+static int cy8ctmg110_touch_pos(struct cy8ctmg110 *tsc)
+{
+        struct input_dev *input = tsc->input;
+        unsigned char reg_p[CY8CTMG110_REG_MAX];
+        int x, y;
+        memset(reg_p, 0, CY8CTMG110_REG_MAX);
+        /* Reading coordinates */
+        if (cy8ctmg110_read_regs(tsc, reg_p, 9, CY8CTMG110_TOUCH_X1) != 0)
+                return -EIO;
+        y = reg_p[2] << 8 | reg_p[3];
+        x = reg_p[0] << 8 | reg_p[1];
+        /* Number of touch */
+        if (reg_p[8] == 0) {
+                input_report_key(input, BTN_TOUCH, 0);
+        } else  {
+                input_report_key(input, BTN_TOUCH, 1);
+                input_report_abs(input, ABS_X, x);
+                input_report_abs(input, ABS_Y, y);
+        }
+        input_sync(input);
+        return 0;
+}
+static int cy8ctmg110_set_sleepmode(struct cy8ctmg110 *ts, bool sleep)
+{
+        unsigned char reg_p[3];
+        if (sleep) {
+                reg_p[0] = 0x00;
+                reg_p[1] = 0xff;
+                reg_p[2] = 5;
+        } else {
+                reg_p[0] = 0x10;
+                reg_p[1] = 0xff;
+                reg_p[2] = 0;
+        }
+        return cy8ctmg110_write_regs(ts, CY8CTMG110_TOUCH_WAKEUP_TIME, 3, reg_p);
+}
+static irqreturn_t cy8ctmg110_irq_thread(int irq, void *dev_id)
+{
+        struct cy8ctmg110 *tsc = dev_id;
+        cy8ctmg110_touch_pos(tsc);
+        return IRQ_HANDLED;
+}
+static int __devinit cy8ctmg110_probe(struct i2c_client *client,
+                                        const struct i2c_device_id *id)
+{
+        const struct cy8ctmg110_pdata *pdata = client->dev.platform_data;
+        struct cy8ctmg110 *ts;
+        struct input_dev *input_dev;
+        int err;
+        /* No pdata no way forward */
+        if (pdata == NULL) {
+                dev_err(&client->dev, "no pdata\n");
+                return -ENODEV;
+        }
+        if (!i2c_check_functionality(client->adapter,
+                                        I2C_FUNC_SMBUS_READ_WORD_DATA))
+                return -EIO;
+        ts = kzalloc(sizeof(struct cy8ctmg110), GFP_KERNEL);
+        input_dev = input_allocate_device();
+        if (!ts || !input_dev) {
+                err = -ENOMEM;
+                goto err_free_mem;
+        }
+        ts->client = client;
+        ts->input = input_dev;
+        snprintf(ts->phys, sizeof(ts->phys),
+                 "%s/input0", dev_name(&client->dev));
+        input_dev->name = CY8CTMG110_DRIVER_NAME " Touchscreen";
+        input_dev->phys = ts->phys;
+        input_dev->id.bustype = BUS_I2C;
+        input_dev->dev.parent = &client->dev;
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
+        input_set_abs_params(input_dev, ABS_X,
+                        CY8CTMG110_X_MIN, CY8CTMG110_X_MAX, 0, 0);
+        input_set_abs_params(input_dev, ABS_Y,
+                        CY8CTMG110_Y_MIN, CY8CTMG110_Y_MAX, 0, 0);
+        if (ts->reset_pin) {
+                err = gpio_request(ts->reset_pin, NULL);
+                if (err) {
+                        dev_err(&client->dev,
+                                "Unable to request GPIO pin %d.\n",
+                                ts->reset_pin);
+                        goto err_free_mem;
+                }
+        }
+        cy8ctmg110_power(ts, true);
+        cy8ctmg110_set_sleepmode(ts, false);
+        err = gpio_request(ts->irq_pin, "touch_irq_key");
+        if (err < 0) {
+                dev_err(&client->dev,
+                        "Failed to request GPIO %d, error %d\n",
+                        ts->irq_pin, err);
+                goto err_shutoff_device;
+        }
+        err = gpio_direction_input(ts->irq_pin);
+        if (err < 0) {
+                dev_err(&client->dev,
+                        "Failed to configure input direction for GPIO %d, error %d\n",
+                        ts->irq_pin, err);
+                goto err_free_irq_gpio;
+        }
+        client->irq = gpio_to_irq(ts->irq_pin);
+        if (client->irq < 0) {
+                err = client->irq;
+                dev_err(&client->dev,
+                        "Unable to get irq number for GPIO %d, error %d\n",
+                        ts->irq_pin, err);
+                goto err_free_irq_gpio;
+        }
+        err = request_threaded_irq(client->irq, NULL, cy8ctmg110_irq_thread,
+                                   IRQF_TRIGGER_RISING, "touch_reset_key", ts);
+        if (err < 0) {
+                dev_err(&client->dev,
+                        "irq %d busy? error %d\n", client->irq, err);
+                goto err_free_irq_gpio;
+        }
+        err = input_register_device(input_dev);
+        if (err)
+                goto err_free_irq;
+        i2c_set_clientdata(client, ts);
+        device_init_wakeup(&client->dev, 1);
+        return 0;
+err_free_irq:
+        free_irq(client->irq, ts);
+err_free_irq_gpio:
+        gpio_free(ts->irq_pin);
+err_shutoff_device:
+        cy8ctmg110_set_sleepmode(ts, true);
+        cy8ctmg110_power(ts, false);
+        if (ts->reset_pin)
+                gpio_free(ts->reset_pin);
+err_free_mem:
+        input_free_device(input_dev);
+        kfree(ts);
+        return err;
+}
+#ifdef CONFIG_PM
+static int cy8ctmg110_suspend(struct i2c_client *client, pm_message_t mesg)
+{
+        struct cy8ctmg110 *ts = i2c_get_clientdata(client);
+        if (device_may_wakeup(&client->dev))
+                enable_irq_wake(client->irq);
+        else {
+                cy8ctmg110_set_sleepmode(ts, true);
+                cy8ctmg110_power(ts, false);
+        }
+        return 0;
+}
+static int cy8ctmg110_resume(struct i2c_client *client)
+{
+        struct cy8ctmg110 *ts = i2c_get_clientdata(client);
+        if (device_may_wakeup(&client->dev))
+                disable_irq_wake(client->irq);
+        else {
+                cy8ctmg110_power(ts, true);
+                cy8ctmg110_set_sleepmode(ts, false);
+        }
+        return 0;
+}
+#endif
+static int __devexit cy8ctmg110_remove(struct i2c_client *client)
+{
+        struct cy8ctmg110 *ts = i2c_get_clientdata(client);
+        cy8ctmg110_set_sleepmode(ts, true);
+        cy8ctmg110_power(ts, false);
+        free_irq(client->irq, ts);
+        input_unregister_device(ts->input);
+        gpio_free(ts->irq_pin);
+        if (ts->reset_pin)
+                gpio_free(ts->reset_pin);
+        kfree(ts);
+        return 0;
+}
+static struct i2c_device_id cy8ctmg110_idtable[] = {
+        { CY8CTMG110_DRIVER_NAME, 1 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, cy8ctmg110_idtable);
+static struct i2c_driver cy8ctmg110_driver = {
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = CY8CTMG110_DRIVER_NAME,
+        },
+        .id_table       = cy8ctmg110_idtable,
+        .probe          = cy8ctmg110_probe,
+        .remove         = __devexit_p(cy8ctmg110_remove),
+#ifdef CONFIG_PM
+        .suspend        = cy8ctmg110_suspend,
+        .resume         = cy8ctmg110_resume,
+#endif
+};
+static int __init cy8ctmg110_init(void)
+{
+        return i2c_add_driver(&cy8ctmg110_driver);
+}
+static void __exit cy8ctmg110_exit(void)
+{
+        i2c_del_driver(&cy8ctmg110_driver);
+}
+module_init(cy8ctmg110_init);
+module_exit(cy8ctmg110_exit);
+MODULE_AUTHOR("Samuli Konttila <samuli.konttila@aavamobile.com>");
+MODULE_DESCRIPTION("cy8ctmg110 TouchScreen Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/input/touchscreen/mcs5000_ts.c b/drivers/input/touchscreen/mcs5000_ts.c
index 1fb0c2f06a44..6ee9940aaf5b 100644
--- a/drivers/input/touchscreen/mcs5000_ts.c
+++ b/drivers/input/touchscreen/mcs5000_ts.c
@@ -16,7 +16,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
-#include <linux/i2c/mcs5000_ts.h>
+#include <linux/i2c/mcs.h>
 #include <linux/interrupt.h>
 #include <linux/input.h>
 #include <linux/irq.h>
@@ -105,7 +105,7 @@ enum mcs5000_ts_read_offset {
 struct mcs5000_ts_data {
        struct i2c_client *client;
        struct input_dev *input_dev;
-        const struct mcs5000_ts_platform_data *platform_data;
+        const struct mcs_platform_data *platform_data;
 };
 static irqreturn_t mcs5000_ts_interrupt(int irq, void *dev_id)
@@ -164,7 +164,7 @@ static irqreturn_t mcs5000_ts_interrupt(int irq, void *dev_id)
 static void mcs5000_ts_phys_init(struct mcs5000_ts_data *data)
 {
-        const struct mcs5000_ts_platform_data *platform_data =
+        const struct mcs_platform_data *platform_data =
                data->platform_data;
        struct i2c_client *client = data->client;
diff --git a/drivers/input/touchscreen/qt602240_ts.c b/drivers/input/touchscreen/qt602240_ts.c
new file mode 100644
index 000000000000..66b26ad3032a
--- /dev/null
+++ b/drivers/input/touchscreen/qt602240_ts.c
@@ -0,0 +1,1401 @@
+/*
+ * AT42QT602240/ATMXT224 Touchscreen driver
+ *
+ * Copyright (C) 2010 Samsung Electronics Co.Ltd
+ * Author: Joonyoung Shim <jy0922.shim@samsung.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/init.h>
+#include <linux/delay.h>
+#include <linux/firmware.h>
+#include <linux/i2c.h>
+#include <linux/i2c/qt602240_ts.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/slab.h>
+/* Version */
+#define QT602240_VER_20                 20
+#define QT602240_VER_21                 21
+#define QT602240_VER_22                 22
+/* Slave addresses */
+#define QT602240_APP_LOW                0x4a
+#define QT602240_APP_HIGH               0x4b
+#define QT602240_BOOT_LOW               0x24
+#define QT602240_BOOT_HIGH              0x25
+/* Firmware */
+#define QT602240_FW_NAME                "qt602240.fw"
+/* Registers */
+#define QT602240_FAMILY_ID              0x00
+#define QT602240_VARIANT_ID             0x01
+#define QT602240_VERSION                0x02
+#define QT602240_BUILD                  0x03
+#define QT602240_MATRIX_X_SIZE          0x04
+#define QT602240_MATRIX_Y_SIZE          0x05
+#define QT602240_OBJECT_NUM             0x06
+#define QT602240_OBJECT_START           0x07
+#define QT602240_OBJECT_SIZE            6
+/* Object types */
+#define QT602240_DEBUG_DIAGNOSTIC       37
+#define QT602240_GEN_MESSAGE            5
+#define QT602240_GEN_COMMAND            6
+#define QT602240_GEN_POWER              7
+#define QT602240_GEN_ACQUIRE            8
+#define QT602240_TOUCH_MULTI            9
+#define QT602240_TOUCH_KEYARRAY         15
+#define QT602240_TOUCH_PROXIMITY        23
+#define QT602240_PROCI_GRIPFACE         20
+#define QT602240_PROCG_NOISE            22
+#define QT602240_PROCI_ONETOUCH         24
+#define QT602240_PROCI_TWOTOUCH         27
+#define QT602240_SPT_COMMSCONFIG        18      /* firmware ver 21 over */
+#define QT602240_SPT_GPIOPWM            19
+#define QT602240_SPT_SELFTEST           25
+#define QT602240_SPT_CTECONFIG          28
+#define QT602240_SPT_USERDATA           38      /* firmware ver 21 over */
+/* QT602240_GEN_COMMAND field */
+#define QT602240_COMMAND_RESET          0
+#define QT602240_COMMAND_BACKUPNV       1
+#define QT602240_COMMAND_CALIBRATE      2
+#define QT602240_COMMAND_REPORTALL      3
+#define QT602240_COMMAND_DIAGNOSTIC     5
+/* QT602240_GEN_POWER field */
+#define QT602240_POWER_IDLEACQINT       0
+#define QT602240_POWER_ACTVACQINT       1
+#define QT602240_POWER_ACTV2IDLETO      2
+/* QT602240_GEN_ACQUIRE field */
+#define QT602240_ACQUIRE_CHRGTIME       0
+#define QT602240_ACQUIRE_TCHDRIFT       2
+#define QT602240_ACQUIRE_DRIFTST        3
+#define QT602240_ACQUIRE_TCHAUTOCAL     4
+#define QT602240_ACQUIRE_SYNC           5
+#define QT602240_ACQUIRE_ATCHCALST      6
+#define QT602240_ACQUIRE_ATCHCALSTHR    7
+/* QT602240_TOUCH_MULTI field */
+#define QT602240_TOUCH_CTRL             0
+#define QT602240_TOUCH_XORIGIN          1
+#define QT602240_TOUCH_YORIGIN          2
+#define QT602240_TOUCH_XSIZE            3
+#define QT602240_TOUCH_YSIZE            4
+#define QT602240_TOUCH_BLEN             6
+#define QT602240_TOUCH_TCHTHR           7
+#define QT602240_TOUCH_TCHDI            8
+#define QT602240_TOUCH_ORIENT           9
+#define QT602240_TOUCH_MOVHYSTI         11
+#define QT602240_TOUCH_MOVHYSTN         12
+#define QT602240_TOUCH_NUMTOUCH         14
+#define QT602240_TOUCH_MRGHYST          15
+#define QT602240_TOUCH_MRGTHR           16
+#define QT602240_TOUCH_AMPHYST          17
+#define QT602240_TOUCH_XRANGE_LSB       18
+#define QT602240_TOUCH_XRANGE_MSB       19
+#define QT602240_TOUCH_YRANGE_LSB       20
+#define QT602240_TOUCH_YRANGE_MSB       21
+#define QT602240_TOUCH_XLOCLIP          22
+#define QT602240_TOUCH_XHICLIP          23
+#define QT602240_TOUCH_YLOCLIP          24
+#define QT602240_TOUCH_YHICLIP          25
+#define QT602240_TOUCH_XEDGECTRL        26
+#define QT602240_TOUCH_XEDGEDIST        27
+#define QT602240_TOUCH_YEDGECTRL        28
+#define QT602240_TOUCH_YEDGEDIST        29
+#define QT602240_TOUCH_JUMPLIMIT        30      /* firmware ver 22 over */
+/* QT602240_PROCI_GRIPFACE field */
+#define QT602240_GRIPFACE_CTRL          0
+#define QT602240_GRIPFACE_XLOGRIP       1
+#define QT602240_GRIPFACE_XHIGRIP       2
+#define QT602240_GRIPFACE_YLOGRIP       3
+#define QT602240_GRIPFACE_YHIGRIP       4
+#define QT602240_GRIPFACE_MAXTCHS       5
+#define QT602240_GRIPFACE_SZTHR1        7
+#define QT602240_GRIPFACE_SZTHR2        8
+#define QT602240_GRIPFACE_SHPTHR1       9
+#define QT602240_GRIPFACE_SHPTHR2       10
+#define QT602240_GRIPFACE_SUPEXTTO      11
+/* QT602240_PROCI_NOISE field */
+#define QT602240_NOISE_CTRL             0
+#define QT602240_NOISE_OUTFLEN          1
+#define QT602240_NOISE_GCAFUL_LSB       3
+#define QT602240_NOISE_GCAFUL_MSB       4
+#define QT602240_NOISE_GCAFLL_LSB       5
+#define QT602240_NOISE_GCAFLL_MSB       6
+#define QT602240_NOISE_ACTVGCAFVALID    7
+#define QT602240_NOISE_NOISETHR         8
+#define QT602240_NOISE_FREQHOPSCALE     10
+#define QT602240_NOISE_FREQ0            11
+#define QT602240_NOISE_FREQ1            12
+#define QT602240_NOISE_FREQ2            13
+#define QT602240_NOISE_FREQ3            14
+#define QT602240_NOISE_FREQ4            15
+#define QT602240_NOISE_IDLEGCAFVALID    16
+/* QT602240_SPT_COMMSCONFIG */
+#define QT602240_COMMS_CTRL             0
+#define QT602240_COMMS_CMD              1
+/* QT602240_SPT_CTECONFIG field */
+#define QT602240_CTE_CTRL               0
+#define QT602240_CTE_CMD                1
+#define QT602240_CTE_MODE               2
+#define QT602240_CTE_IDLEGCAFDEPTH      3
+#define QT602240_CTE_ACTVGCAFDEPTH      4
+#define QT602240_CTE_VOLTAGE            5       /* firmware ver 21 over */
+#define QT602240_VOLTAGE_DEFAULT        2700000
+#define QT602240_VOLTAGE_STEP           10000
+/* Define for QT602240_GEN_COMMAND */
+#define QT602240_BOOT_VALUE             0xa5
+#define QT602240_BACKUP_VALUE           0x55
+#define QT602240_BACKUP_TIME            25      /* msec */
+#define QT602240_RESET_TIME             65      /* msec */
+#define QT602240_FWRESET_TIME           175     /* msec */
+/* Command to unlock bootloader */
+#define QT602240_UNLOCK_CMD_MSB         0xaa
+#define QT602240_UNLOCK_CMD_LSB         0xdc
+/* Bootloader mode status */
+#define QT602240_WAITING_BOOTLOAD_CMD   0xc0    /* valid 7 6 bit only */
+#define QT602240_WAITING_FRAME_DATA     0x80    /* valid 7 6 bit only */
+#define QT602240_FRAME_CRC_CHECK        0x02
+#define QT602240_FRAME_CRC_FAIL         0x03
+#define QT602240_FRAME_CRC_PASS         0x04
+#define QT602240_APP_CRC_FAIL           0x40    /* valid 7 8 bit only */
+#define QT602240_BOOT_STATUS_MASK       0x3f
+/* Touch status */
+#define QT602240_SUPPRESS               (1 << 1)
+#define QT602240_AMP                    (1 << 2)
+#define QT602240_VECTOR                 (1 << 3)
+#define QT602240_MOVE                   (1 << 4)
+#define QT602240_RELEASE                (1 << 5)
+#define QT602240_PRESS                  (1 << 6)
+#define QT602240_DETECT                 (1 << 7)
+/* Touchscreen absolute values */
+#define QT602240_MAX_XC                 0x3ff
+#define QT602240_MAX_YC                 0x3ff
+#define QT602240_MAX_AREA               0xff
+#define QT602240_MAX_FINGER             10
+/* Initial register values recommended from chip vendor */
+static const u8 init_vals_ver_20[] = {
+        /* QT602240_GEN_COMMAND(6) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        /* QT602240_GEN_POWER(7) */
+        0x20, 0xff, 0x32,
+        /* QT602240_GEN_ACQUIRE(8) */
+        0x08, 0x05, 0x05, 0x00, 0x00, 0x00, 0x05, 0x14,
+        /* QT602240_TOUCH_MULTI(9) */
+        0x00, 0x00, 0x00, 0x11, 0x0a, 0x00, 0x00, 0x00, 0x02, 0x00,
+        0x00, 0x01, 0x01, 0x0e, 0x0a, 0x0a, 0x0a, 0x0a, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x64,
+        /* QT602240_TOUCH_KEYARRAY(15) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00,
+        /* QT602240_SPT_GPIOPWM(19) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00,
+        /* QT602240_PROCI_GRIPFACE(20) */
+        0x00, 0x64, 0x64, 0x64, 0x64, 0x00, 0x00, 0x1e, 0x14, 0x04,
+        0x1e, 0x00,
+        /* QT602240_PROCG_NOISE(22) */
+        0x05, 0x00, 0x00, 0x19, 0x00, 0xe7, 0xff, 0x04, 0x32, 0x00,
+        0x01, 0x0a, 0x0f, 0x14, 0x00, 0x00, 0xe8,
+        /* QT602240_TOUCH_PROXIMITY(23) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00,
+        /* QT602240_PROCI_ONETOUCH(24) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        /* QT602240_SPT_SELFTEST(25) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,
+        /* QT602240_PROCI_TWOTOUCH(27) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        /* QT602240_SPT_CTECONFIG(28) */
+        0x00, 0x00, 0x00, 0x04, 0x08,
+};
+static const u8 init_vals_ver_21[] = {
+        /* QT602240_GEN_COMMAND(6) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        /* QT602240_GEN_POWER(7) */
+        0x20, 0xff, 0x32,
+        /* QT602240_GEN_ACQUIRE(8) */
+        0x0a, 0x00, 0x05, 0x00, 0x00, 0x00, 0x09, 0x23,
+        /* QT602240_TOUCH_MULTI(9) */
+        0x00, 0x00, 0x00, 0x13, 0x0b, 0x00, 0x00, 0x00, 0x02, 0x00,
+        0x00, 0x01, 0x01, 0x0e, 0x0a, 0x0a, 0x0a, 0x0a, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        /* QT602240_TOUCH_KEYARRAY(15) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00,
+        /* QT602240_SPT_GPIOPWM(19) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        /* QT602240_PROCI_GRIPFACE(20) */
+        0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x28, 0x04,
+        0x0f, 0x0a,
+        /* QT602240_PROCG_NOISE(22) */
+        0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x23, 0x00,
+        0x00, 0x05, 0x0f, 0x19, 0x23, 0x2d, 0x03,
+        /* QT602240_TOUCH_PROXIMITY(23) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00,
+        /* QT602240_PROCI_ONETOUCH(24) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        /* QT602240_SPT_SELFTEST(25) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,
+        /* QT602240_PROCI_TWOTOUCH(27) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        /* QT602240_SPT_CTECONFIG(28) */
+        0x00, 0x00, 0x00, 0x08, 0x10, 0x00,
+};
+static const u8 init_vals_ver_22[] = {
+        /* QT602240_GEN_COMMAND(6) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        /* QT602240_GEN_POWER(7) */
+        0x20, 0xff, 0x32,
+        /* QT602240_GEN_ACQUIRE(8) */
+        0x0a, 0x00, 0x05, 0x00, 0x00, 0x00, 0x09, 0x23,
+        /* QT602240_TOUCH_MULTI(9) */
+        0x00, 0x00, 0x00, 0x13, 0x0b, 0x00, 0x00, 0x00, 0x02, 0x00,
+        0x00, 0x01, 0x01, 0x0e, 0x0a, 0x0a, 0x0a, 0x0a, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00,
+        /* QT602240_TOUCH_KEYARRAY(15) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00,
+        /* QT602240_SPT_GPIOPWM(19) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        /* QT602240_PROCI_GRIPFACE(20) */
+        0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x28, 0x04,
+        0x0f, 0x0a,
+        /* QT602240_PROCG_NOISE(22) */
+        0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x23, 0x00,
+        0x00, 0x05, 0x0f, 0x19, 0x23, 0x2d, 0x03,
+        /* QT602240_TOUCH_PROXIMITY(23) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00,
+        /* QT602240_PROCI_ONETOUCH(24) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        /* QT602240_SPT_SELFTEST(25) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,
+        /* QT602240_PROCI_TWOTOUCH(27) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        /* QT602240_SPT_CTECONFIG(28) */
+        0x00, 0x00, 0x00, 0x08, 0x10, 0x00,
+};
+struct qt602240_info {
+        u8 family_id;
+        u8 variant_id;
+        u8 version;
+        u8 build;
+        u8 matrix_xsize;
+        u8 matrix_ysize;
+        u8 object_num;
+};
+struct qt602240_object {
+        u8 type;
+        u16 start_address;
+        u8 size;
+        u8 instances;
+        u8 num_report_ids;
+        /* to map object and message */
+        u8 max_reportid;
+};
+struct qt602240_message {
+        u8 reportid;
+        u8 message[7];
+        u8 checksum;
+};
+struct qt602240_finger {
+        int status;
+        int x;
+        int y;
+        int area;
+};
+/* Each client has this additional data */
+struct qt602240_data {
+        struct i2c_client *client;
+        struct input_dev *input_dev;
+        const struct qt602240_platform_data *pdata;
+        struct qt602240_object *object_table;
+        struct qt602240_info info;
+        struct qt602240_finger finger[QT602240_MAX_FINGER];
+        unsigned int irq;
+};
+static bool qt602240_object_readable(unsigned int type)
+{
+        switch (type) {
+        case QT602240_GEN_MESSAGE:
+        case QT602240_GEN_COMMAND:
+        case QT602240_GEN_POWER:
+        case QT602240_GEN_ACQUIRE:
+        case QT602240_TOUCH_MULTI:
+        case QT602240_TOUCH_KEYARRAY:
+        case QT602240_TOUCH_PROXIMITY:
+        case QT602240_PROCI_GRIPFACE:
+        case QT602240_PROCG_NOISE:
+        case QT602240_PROCI_ONETOUCH:
+        case QT602240_PROCI_TWOTOUCH:
+        case QT602240_SPT_COMMSCONFIG:
+        case QT602240_SPT_GPIOPWM:
+        case QT602240_SPT_SELFTEST:
+        case QT602240_SPT_CTECONFIG:
+        case QT602240_SPT_USERDATA:
+                return true;
+        default:
+                return false;
+        }
+}
+static bool qt602240_object_writable(unsigned int type)
+{
+        switch (type) {
+        case QT602240_GEN_COMMAND:
+        case QT602240_GEN_POWER:
+        case QT602240_GEN_ACQUIRE:
+        case QT602240_TOUCH_MULTI:
+        case QT602240_TOUCH_KEYARRAY:
+        case QT602240_TOUCH_PROXIMITY:
+        case QT602240_PROCI_GRIPFACE:
+        case QT602240_PROCG_NOISE:
+        case QT602240_PROCI_ONETOUCH:
+        case QT602240_PROCI_TWOTOUCH:
+        case QT602240_SPT_GPIOPWM:
+        case QT602240_SPT_SELFTEST:
+        case QT602240_SPT_CTECONFIG:
+                return true;
+        default:
+                return false;
+        }
+}
+static void qt602240_dump_message(struct device *dev,
+                                  struct qt602240_message *message)
+{
+        dev_dbg(dev, "reportid:\t0x%x\n", message->reportid);
+        dev_dbg(dev, "message1:\t0x%x\n", message->message[0]);
+        dev_dbg(dev, "message2:\t0x%x\n", message->message[1]);
+        dev_dbg(dev, "message3:\t0x%x\n", message->message[2]);
+        dev_dbg(dev, "message4:\t0x%x\n", message->message[3]);
+        dev_dbg(dev, "message5:\t0x%x\n", message->message[4]);
+        dev_dbg(dev, "message6:\t0x%x\n", message->message[5]);
+        dev_dbg(dev, "message7:\t0x%x\n", message->message[6]);
+        dev_dbg(dev, "checksum:\t0x%x\n", message->checksum);
+}
+static int qt602240_check_bootloader(struct i2c_client *client,
+                                     unsigned int state)
+{
+        u8 val;
+recheck:
+        if (i2c_master_recv(client, &val, 1) != 1) {
+                dev_err(&client->dev, "%s: i2c recv failed\n", __func__);
+                return -EIO;
+        }
+        switch (state) {
+        case QT602240_WAITING_BOOTLOAD_CMD:
+        case QT602240_WAITING_FRAME_DATA:
+                val &= ~QT602240_BOOT_STATUS_MASK;
+                break;
+        case QT602240_FRAME_CRC_PASS:
+                if (val == QT602240_FRAME_CRC_CHECK)
+                        goto recheck;
+                break;
+        default:
+                return -EINVAL;
+        }
+        if (val != state) {
+                dev_err(&client->dev, "Unvalid bootloader mode state\n");
+                return -EINVAL;
+        }
+        return 0;
+}
+static int qt602240_unlock_bootloader(struct i2c_client *client)
+{
+        u8 buf[2];
+        buf[0] = QT602240_UNLOCK_CMD_LSB;
+        buf[1] = QT602240_UNLOCK_CMD_MSB;
+        if (i2c_master_send(client, buf, 2) != 2) {
+                dev_err(&client->dev, "%s: i2c send failed\n", __func__);
+                return -EIO;
+        }
+        return 0;
+}
+static int qt602240_fw_write(struct i2c_client *client,
+                             const u8 *data, unsigned int frame_size)
+{
+        if (i2c_master_send(client, data, frame_size) != frame_size) {
+                dev_err(&client->dev, "%s: i2c send failed\n", __func__);
+                return -EIO;
+        }
+        return 0;
+}
+static int __qt602240_read_reg(struct i2c_client *client,
+                               u16 reg, u16 len, void *val)
+{
+        struct i2c_msg xfer[2];
+        u8 buf[2];
+        buf[0] = reg & 0xff;
+        buf[1] = (reg >> 8) & 0xff;
+        /* Write register */
+        xfer[0].addr = client->addr;
+        xfer[0].flags = 0;
+        xfer[0].len = 2;
+        xfer[0].buf = buf;
+        /* Read data */
+        xfer[1].addr = client->addr;
+        xfer[1].flags = I2C_M_RD;
+        xfer[1].len = len;
+        xfer[1].buf = val;
+        if (i2c_transfer(client->adapter, xfer, 2) != 2) {
+                dev_err(&client->dev, "%s: i2c transfer failed\n", __func__);
+                return -EIO;
+        }
+        return 0;
+}
+static int qt602240_read_reg(struct i2c_client *client, u16 reg, u8 *val)
+{
+        return __qt602240_read_reg(client, reg, 1, val);
+}
+static int qt602240_write_reg(struct i2c_client *client, u16 reg, u8 val)
+{
+        u8 buf[3];
+        buf[0] = reg & 0xff;
+        buf[1] = (reg >> 8) & 0xff;
+        buf[2] = val;
+        if (i2c_master_send(client, buf, 3) != 3) {
+                dev_err(&client->dev, "%s: i2c send failed\n", __func__);
+                return -EIO;
+        }
+        return 0;
+}
+static int qt602240_read_object_table(struct i2c_client *client,
+                                      u16 reg, u8 *object_buf)
+{
+        return __qt602240_read_reg(client, reg, QT602240_OBJECT_SIZE,
+                                   object_buf);
+}
+static struct qt602240_object *
+qt602240_get_object(struct qt602240_data *data, u8 type)
+{
+        struct qt602240_object *object;
+        int i;
+        for (i = 0; i < data->info.object_num; i++) {
+                object = data->object_table + i;
+                if (object->type == type)
+                        return object;
+        }
+        dev_err(&data->client->dev, "Invalid object type\n");
+        return NULL;
+}
+static int qt602240_read_message(struct qt602240_data *data,
+                                 struct qt602240_message *message)
+{
+        struct qt602240_object *object;
+        u16 reg;
+        object = qt602240_get_object(data, QT602240_GEN_MESSAGE);
+        if (!object)
+                return -EINVAL;
+        reg = object->start_address;
+        return __qt602240_read_reg(data->client, reg,
+                        sizeof(struct qt602240_message), message);
+}
+static int qt602240_read_object(struct qt602240_data *data,
+                                u8 type, u8 offset, u8 *val)
+{
+        struct qt602240_object *object;
+        u16 reg;
+        object = qt602240_get_object(data, type);
+        if (!object)
+                return -EINVAL;
+        reg = object->start_address;
+        return __qt602240_read_reg(data->client, reg + offset, 1, val);
+}
+static int qt602240_write_object(struct qt602240_data *data,
+                                 u8 type, u8 offset, u8 val)
+{
+        struct qt602240_object *object;
+        u16 reg;
+        object = qt602240_get_object(data, type);
+        if (!object)
+                return -EINVAL;
+        reg = object->start_address;
+        return qt602240_write_reg(data->client, reg + offset, val);
+}
+static void qt602240_input_report(struct qt602240_data *data, int single_id)
+{
+        struct qt602240_finger *finger = data->finger;
+        struct input_dev *input_dev = data->input_dev;
+        int status = finger[single_id].status;
+        int finger_num = 0;
+        int id;
+        for (id = 0; id < QT602240_MAX_FINGER; id++) {
+                if (!finger[id].status)
+                        continue;
+                input_report_abs(input_dev, ABS_MT_TOUCH_MAJOR,
+                                finger[id].status != QT602240_RELEASE ?
+                                finger[id].area : 0);
+                input_report_abs(input_dev, ABS_MT_POSITION_X,
+                                finger[id].x);
+                input_report_abs(input_dev, ABS_MT_POSITION_Y,
+                                finger[id].y);
+                input_mt_sync(input_dev);
+                if (finger[id].status == QT602240_RELEASE)
+                        finger[id].status = 0;
+                else
+                        finger_num++;
+        }
+        input_report_key(input_dev, BTN_TOUCH, finger_num > 0);
+        if (status != QT602240_RELEASE) {
+                input_report_abs(input_dev, ABS_X, finger[single_id].x);
+                input_report_abs(input_dev, ABS_Y, finger[single_id].y);
+        }
+        input_sync(input_dev);
+}
+static void qt602240_input_touchevent(struct qt602240_data *data,
+                                      struct qt602240_message *message, int id)
+{
+        struct qt602240_finger *finger = data->finger;
+        struct device *dev = &data->client->dev;
+        u8 status = message->message[0];
+        int x;
+        int y;
+        int area;
+        /* Check the touch is present on the screen */
+        if (!(status & QT602240_DETECT)) {
+                if (status & QT602240_RELEASE) {
+                        dev_dbg(dev, "[%d] released\n", id);
+                        finger[id].status = QT602240_RELEASE;
+                        qt602240_input_report(data, id);
+                }
+                return;
+        }
+        /* Check only AMP detection */
+        if (!(status & (QT602240_PRESS | QT602240_MOVE)))
+                return;
+        x = (message->message[1] << 2) | ((message->message[3] & ~0x3f) >> 6);
+        y = (message->message[2] << 2) | ((message->message[3] & ~0xf3) >> 2);
+        area = message->message[4];
+        dev_dbg(dev, "[%d] %s x: %d, y: %d, area: %d\n", id,
+                status & QT602240_MOVE ? "moved" : "pressed",
+                x, y, area);
+        finger[id].status = status & QT602240_MOVE ?
+                                QT602240_MOVE : QT602240_PRESS;
+        finger[id].x = x;
+        finger[id].y = y;
+        finger[id].area = area;
+        qt602240_input_report(data, id);
+}
+static irqreturn_t qt602240_interrupt(int irq, void *dev_id)
+{
+        struct qt602240_data *data = dev_id;
+        struct qt602240_message message;
+        struct qt602240_object *object;
+        struct device *dev = &data->client->dev;
+        int id;
+        u8 reportid;
+        u8 max_reportid;
+        u8 min_reportid;
+        do {
+                if (qt602240_read_message(data, &message)) {
+                        dev_err(dev, "Failed to read message\n");
+                        goto end;
+                }
+                reportid = message.reportid;
+                /* whether reportid is thing of QT602240_TOUCH_MULTI */
+                object = qt602240_get_object(data, QT602240_TOUCH_MULTI);
+                if (!object)
+                        goto end;
+                max_reportid = object->max_reportid;
+                min_reportid = max_reportid - object->num_report_ids + 1;
+                id = reportid - min_reportid;
+                if (reportid >= min_reportid && reportid <= max_reportid)
+                        qt602240_input_touchevent(data, &message, id);
+                else
+                        qt602240_dump_message(dev, &message);
+        } while (reportid != 0xff);
+end:
+        return IRQ_HANDLED;
+}
+static int qt602240_check_reg_init(struct qt602240_data *data)
+{
+        struct qt602240_object *object;
+        struct device *dev = &data->client->dev;
+        int index = 0;
+        int i, j;
+        u8 version = data->info.version;
+        u8 *init_vals;
+        switch (version) {
+        case QT602240_VER_20:
+                init_vals = (u8 *)init_vals_ver_20;
+                break;
+        case QT602240_VER_21:
+                init_vals = (u8 *)init_vals_ver_21;
+                break;
+        case QT602240_VER_22:
+                init_vals = (u8 *)init_vals_ver_22;
+                break;
+        default:
+                dev_err(dev, "Firmware version %d doesn't support\n", version);
+                return -EINVAL;
+        }
+        for (i = 0; i < data->info.object_num; i++) {
+                object = data->object_table + i;
+                if (!qt602240_object_writable(object->type))
+                        continue;
+                for (j = 0; j < object->size + 1; j++)
+                        qt602240_write_object(data, object->type, j,
+                                        init_vals[index + j]);
+                index += object->size + 1;
+        }
+        return 0;
+}
+static int qt602240_check_matrix_size(struct qt602240_data *data)
+{
+        const struct qt602240_platform_data *pdata = data->pdata;
+        struct device *dev = &data->client->dev;
+        int mode = -1;
+        int error;
+        u8 val;
+        dev_dbg(dev, "Number of X lines: %d\n", pdata->x_line);
+        dev_dbg(dev, "Number of Y lines: %d\n", pdata->y_line);
+        switch (pdata->x_line) {
+        case 0 ... 15:
+                if (pdata->y_line <= 14)
+                        mode = 0;
+                break;
+        case 16:
+                if (pdata->y_line <= 12)
+                        mode = 1;
+                if (pdata->y_line == 13 || pdata->y_line == 14)
+                        mode = 0;
+                break;
+        case 17:
+                if (pdata->y_line <= 11)
+                        mode = 2;
+                if (pdata->y_line == 12 || pdata->y_line == 13)
+                        mode = 1;
+                break;
+        case 18:
+                if (pdata->y_line <= 10)
+                        mode = 3;
+                if (pdata->y_line == 11 || pdata->y_line == 12)
+                        mode = 2;
+                break;
+        case 19:
+                if (pdata->y_line <= 9)
+                        mode = 4;
+                if (pdata->y_line == 10 || pdata->y_line == 11)
+                        mode = 3;
+                break;
+        case 20:
+                mode = 4;
+        }
+        if (mode < 0) {
+                dev_err(dev, "Invalid X/Y lines\n");
+                return -EINVAL;
+        }
+        error = qt602240_read_object(data, QT602240_SPT_CTECONFIG,
+                                QT602240_CTE_MODE, &val);
+        if (error)
+                return error;
+        if (mode == val)
+                return 0;
+        /* Change the CTE configuration */
+        qt602240_write_object(data, QT602240_SPT_CTECONFIG,
+                        QT602240_CTE_CTRL, 1);
+        qt602240_write_object(data, QT602240_SPT_CTECONFIG,
+                        QT602240_CTE_MODE, mode);
+        qt602240_write_object(data, QT602240_SPT_CTECONFIG,
+                        QT602240_CTE_CTRL, 0);
+        return 0;
+}
+static int qt602240_make_highchg(struct qt602240_data *data)
+{
+        struct device *dev = &data->client->dev;
+        int count = 10;
+        int error;
+        u8 val;
+        /* Read dummy message to make high CHG pin */
+        do {
+                error = qt602240_read_object(data, QT602240_GEN_MESSAGE, 0, &val);
+                if (error)
+                        return error;
+        } while ((val != 0xff) && --count);
+        if (!count) {
+                dev_err(dev, "CHG pin isn't cleared\n");
+                return -EBUSY;
+        }
+        return 0;
+}
+static void qt602240_handle_pdata(struct qt602240_data *data)
+{
+        const struct qt602240_platform_data *pdata = data->pdata;
+        u8 voltage;
+        /* Set touchscreen lines */
+        qt602240_write_object(data, QT602240_TOUCH_MULTI, QT602240_TOUCH_XSIZE,
+                        pdata->x_line);
+        qt602240_write_object(data, QT602240_TOUCH_MULTI, QT602240_TOUCH_YSIZE,
+                        pdata->y_line);
+        /* Set touchscreen orient */
+        qt602240_write_object(data, QT602240_TOUCH_MULTI, QT602240_TOUCH_ORIENT,
+                        pdata->orient);
+        /* Set touchscreen burst length */
+        qt602240_write_object(data, QT602240_TOUCH_MULTI,
+                        QT602240_TOUCH_BLEN, pdata->blen);
+        /* Set touchscreen threshold */
+        qt602240_write_object(data, QT602240_TOUCH_MULTI,
+                        QT602240_TOUCH_TCHTHR, pdata->threshold);
+        /* Set touchscreen resolution */
+        qt602240_write_object(data, QT602240_TOUCH_MULTI,
+                        QT602240_TOUCH_XRANGE_LSB, (pdata->x_size - 1) & 0xff);
+        qt602240_write_object(data, QT602240_TOUCH_MULTI,
+                        QT602240_TOUCH_XRANGE_MSB, (pdata->x_size - 1) >> 8);
+        qt602240_write_object(data, QT602240_TOUCH_MULTI,
+                        QT602240_TOUCH_YRANGE_LSB, (pdata->y_size - 1) & 0xff);
+        qt602240_write_object(data, QT602240_TOUCH_MULTI,
+                        QT602240_TOUCH_YRANGE_MSB, (pdata->y_size - 1) >> 8);
+        /* Set touchscreen voltage */
+        if (data->info.version >= QT602240_VER_21 && pdata->voltage) {
+                if (pdata->voltage < QT602240_VOLTAGE_DEFAULT) {
+                        voltage = (QT602240_VOLTAGE_DEFAULT - pdata->voltage) /
+                                QT602240_VOLTAGE_STEP;
+                        voltage = 0xff - voltage + 1;
+                } else
+                        voltage = (pdata->voltage - QT602240_VOLTAGE_DEFAULT) /
+                                QT602240_VOLTAGE_STEP;
+                qt602240_write_object(data, QT602240_SPT_CTECONFIG,
+                                QT602240_CTE_VOLTAGE, voltage);
+        }
+}
+static int qt602240_get_info(struct qt602240_data *data)
+{
+        struct i2c_client *client = data->client;
+        struct qt602240_info *info = &data->info;
+        int error;
+        u8 val;
+        error = qt602240_read_reg(client, QT602240_FAMILY_ID, &val);
+        if (error)
+                return error;
+        info->family_id = val;
+        error = qt602240_read_reg(client, QT602240_VARIANT_ID, &val);
+        if (error)
+                return error;
+        info->variant_id = val;
+        error = qt602240_read_reg(client, QT602240_VERSION, &val);
+        if (error)
+                return error;
+        info->version = val;
+        error = qt602240_read_reg(client, QT602240_BUILD, &val);
+        if (error)
+                return error;
+        info->build = val;
+        error = qt602240_read_reg(client, QT602240_OBJECT_NUM, &val);
+        if (error)
+                return error;
+        info->object_num = val;
+        return 0;
+}
+static int qt602240_get_object_table(struct qt602240_data *data)
+{
+        int error;
+        int i;
+        u16 reg;
+        u8 reportid = 0;
+        u8 buf[QT602240_OBJECT_SIZE];
+        for (i = 0; i < data->info.object_num; i++) {
+                struct qt602240_object *object = data->object_table + i;
+                reg = QT602240_OBJECT_START + QT602240_OBJECT_SIZE * i;
+                error = qt602240_read_object_table(data->client, reg, buf);
+                if (error)
+                        return error;
+                object->type = buf[0];
+                object->start_address = (buf[2] << 8) | buf[1];
+                object->size = buf[3];
+                object->instances = buf[4];
+                object->num_report_ids = buf[5];
+                if (object->num_report_ids) {
+                        reportid += object->num_report_ids *
+                                        (object->instances + 1);
+                        object->max_reportid = reportid;
+                }
+        }
+        return 0;
+}
+static int qt602240_initialize(struct qt602240_data *data)
+{
+        struct i2c_client *client = data->client;
+        struct qt602240_info *info = &data->info;
+        int error;
+        u8 val;
+        error = qt602240_get_info(data);
+        if (error)
+                return error;
+        data->object_table = kcalloc(info->object_num,
+                                     sizeof(struct qt602240_data),
+                                     GFP_KERNEL);
+        if (!data->object_table) {
+                dev_err(&client->dev, "Failed to allocate memory\n");
+                return -ENOMEM;
+        }
+        /* Get object table information */
+        error = qt602240_get_object_table(data);
+        if (error)
+                return error;
+        /* Check register init values */
+        error = qt602240_check_reg_init(data);
+        if (error)
+                return error;
+        /* Check X/Y matrix size */
+        error = qt602240_check_matrix_size(data);
+        if (error)
+                return error;
+        error = qt602240_make_highchg(data);
+        if (error)
+                return error;
+        qt602240_handle_pdata(data);
+        /* Backup to memory */
+        qt602240_write_object(data, QT602240_GEN_COMMAND,
+                        QT602240_COMMAND_BACKUPNV,
+                        QT602240_BACKUP_VALUE);
+        msleep(QT602240_BACKUP_TIME);
+        /* Soft reset */
+        qt602240_write_object(data, QT602240_GEN_COMMAND,
+                        QT602240_COMMAND_RESET, 1);
+        msleep(QT602240_RESET_TIME);
+        /* Update matrix size at info struct */
+        error = qt602240_read_reg(client, QT602240_MATRIX_X_SIZE, &val);
+        if (error)
+                return error;
+        info->matrix_xsize = val;
+        error = qt602240_read_reg(client, QT602240_MATRIX_Y_SIZE, &val);
+        if (error)
+                return error;
+        info->matrix_ysize = val;
+        dev_info(&client->dev,
+                        "Family ID: %d Variant ID: %d Version: %d Build: %d\n",
+                        info->family_id, info->variant_id, info->version,
+                        info->build);
+        dev_info(&client->dev,
+                        "Matrix X Size: %d Matrix Y Size: %d Object Num: %d\n",
+                        info->matrix_xsize, info->matrix_ysize,
+                        info->object_num);
+        return 0;
+}
+static ssize_t qt602240_object_show(struct device *dev,
+                                    struct device_attribute *attr, char *buf)
+{
+        struct qt602240_data *data = dev_get_drvdata(dev);
+        struct qt602240_object *object;
+        int count = 0;
+        int i, j;
+        int error;
+        u8 val;
+        for (i = 0; i < data->info.object_num; i++) {
+                object = data->object_table + i;
+                count += sprintf(buf + count,
+                                "Object Table Element %d(Type %d)\n",
+                                i + 1, object->type);
+                if (!qt602240_object_readable(object->type)) {
+                        count += sprintf(buf + count, "\n");
+                        continue;
+                }
+                for (j = 0; j < object->size + 1; j++) {
+                        error = qt602240_read_object(data,
+                                                object->type, j, &val);
+                        if (error)
+                                return error;
+                        count += sprintf(buf + count,
+                                        "  Byte %d: 0x%x (%d)\n", j, val, val);
+                }
+                count += sprintf(buf + count, "\n");
+        }
+        return count;
+}
+static int qt602240_load_fw(struct device *dev, const char *fn)
+{
+        struct qt602240_data *data = dev_get_drvdata(dev);
+        struct i2c_client *client = data->client;
+        const struct firmware *fw = NULL;
+        unsigned int frame_size;
+        unsigned int pos = 0;
+        int ret;
+        ret = request_firmware(&fw, fn, dev);
+        if (ret) {
+                dev_err(dev, "Unable to open firmware %s\n", fn);
+                return ret;
+        }
+        /* Change to the bootloader mode */
+        qt602240_write_object(data, QT602240_GEN_COMMAND,
+                        QT602240_COMMAND_RESET, QT602240_BOOT_VALUE);
+        msleep(QT602240_RESET_TIME);
+        /* Change to slave address of bootloader */
+        if (client->addr == QT602240_APP_LOW)
+                client->addr = QT602240_BOOT_LOW;
+        else
+                client->addr = QT602240_BOOT_HIGH;
+        ret = qt602240_check_bootloader(client, QT602240_WAITING_BOOTLOAD_CMD);
+        if (ret)
+                goto out;
+        /* Unlock bootloader */
+        qt602240_unlock_bootloader(client);
+        while (pos < fw->size) {
+                ret = qt602240_check_bootloader(client,
+                                                QT602240_WAITING_FRAME_DATA);
+                if (ret)
+                        goto out;
+                frame_size = ((*(fw->data + pos) << 8) | *(fw->data + pos + 1));
+                /* We should add 2 at frame size as the the firmware data is not
+                 * included the CRC bytes.
+                 */
+                frame_size += 2;
+                /* Write one frame to device */
+                qt602240_fw_write(client, fw->data + pos, frame_size);
+                ret = qt602240_check_bootloader(client,
+                                                QT602240_FRAME_CRC_PASS);
+                if (ret)
+                        goto out;
+                pos += frame_size;
+                dev_dbg(dev, "Updated %d bytes / %zd bytes\n", pos, fw->size);
+        }
+out:
+        release_firmware(fw);
+        /* Change to slave address of application */
+        if (client->addr == QT602240_BOOT_LOW)
+                client->addr = QT602240_APP_LOW;
+        else
+                client->addr = QT602240_APP_HIGH;
+        return ret;
+}
+static ssize_t qt602240_update_fw_store(struct device *dev,
+                                        struct device_attribute *attr,
+                                        const char *buf, size_t count)
+{
+        struct qt602240_data *data = dev_get_drvdata(dev);
+        unsigned int version;
+        int error;
+        if (sscanf(buf, "%u", &version) != 1) {
+                dev_err(dev, "Invalid values\n");
+                return -EINVAL;
+        }
+        if (data->info.version < QT602240_VER_21 || version < QT602240_VER_21) {
+                dev_err(dev, "FW update supported starting with version 21\n");
+                return -EINVAL;
+        }
+        disable_irq(data->irq);
+        error = qt602240_load_fw(dev, QT602240_FW_NAME);
+        if (error) {
+                dev_err(dev, "The firmware update failed(%d)\n", error);
+                count = error;
+        } else {
+                dev_dbg(dev, "The firmware update succeeded\n");
+                /* Wait for reset */
+                msleep(QT602240_FWRESET_TIME);
+                kfree(data->object_table);
+                data->object_table = NULL;
+                qt602240_initialize(data);
+        }
+        enable_irq(data->irq);
+        return count;
+}
+static DEVICE_ATTR(object, 0444, qt602240_object_show, NULL);
+static DEVICE_ATTR(update_fw, 0664, NULL, qt602240_update_fw_store);
+static struct attribute *qt602240_attrs[] = {
+        &dev_attr_object.attr,
+        &dev_attr_update_fw.attr,
+        NULL
+};
+static const struct attribute_group qt602240_attr_group = {
+        .attrs = qt602240_attrs,
+};
+static void qt602240_start(struct qt602240_data *data)
+{
+        /* Touch enable */
+        qt602240_write_object(data,
+                        QT602240_TOUCH_MULTI, QT602240_TOUCH_CTRL, 0x83);
+}
+static void qt602240_stop(struct qt602240_data *data)
+{
+        /* Touch disable */
+        qt602240_write_object(data,
+                        QT602240_TOUCH_MULTI, QT602240_TOUCH_CTRL, 0);
+}
+static int qt602240_input_open(struct input_dev *dev)
+{
+        struct qt602240_data *data = input_get_drvdata(dev);
+        qt602240_start(data);
+        return 0;
+}
+static void qt602240_input_close(struct input_dev *dev)
+{
+        struct qt602240_data *data = input_get_drvdata(dev);
+        qt602240_stop(data);
+}
+static int __devinit qt602240_probe(struct i2c_client *client,
+                const struct i2c_device_id *id)
+{
+        struct qt602240_data *data;
+        struct input_dev *input_dev;
+        int error;
+        if (!client->dev.platform_data)
+                return -EINVAL;
+        data = kzalloc(sizeof(struct qt602240_data), GFP_KERNEL);
+        input_dev = input_allocate_device();
+        if (!data || !input_dev) {
+                dev_err(&client->dev, "Failed to allocate memory\n");
+                error = -ENOMEM;
+                goto err_free_mem;
+        }
+        input_dev->name = "AT42QT602240/ATMXT224 Touchscreen";
+        input_dev->id.bustype = BUS_I2C;
+        input_dev->dev.parent = &client->dev;
+        input_dev->open = qt602240_input_open;
+        input_dev->close = qt602240_input_close;
+        __set_bit(EV_ABS, input_dev->evbit);
+        __set_bit(EV_KEY, input_dev->evbit);
+        __set_bit(BTN_TOUCH, input_dev->keybit);
+        /* For single touch */
+        input_set_abs_params(input_dev, ABS_X,
+                             0, QT602240_MAX_XC, 0, 0);
+        input_set_abs_params(input_dev, ABS_Y,
+                             0, QT602240_MAX_YC, 0, 0);
+        /* For multi touch */
+        input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR,
+                             0, QT602240_MAX_AREA, 0, 0);
+        input_set_abs_params(input_dev, ABS_MT_POSITION_X,
+                             0, QT602240_MAX_XC, 0, 0);
+        input_set_abs_params(input_dev, ABS_MT_POSITION_Y,
+                             0, QT602240_MAX_YC, 0, 0);
+        input_set_drvdata(input_dev, data);
+        data->client = client;
+        data->input_dev = input_dev;
+        data->pdata = client->dev.platform_data;
+        data->irq = client->irq;
+        i2c_set_clientdata(client, data);
+        error = qt602240_initialize(data);
+        if (error)
+                goto err_free_object;
+        error = request_threaded_irq(client->irq, NULL, qt602240_interrupt,
+                        IRQF_TRIGGER_FALLING, client->dev.driver->name, data);
+        if (error) {
+                dev_err(&client->dev, "Failed to register interrupt\n");
+                goto err_free_object;
+        }
+        error = input_register_device(input_dev);
+        if (error)
+                goto err_free_irq;
+        error = sysfs_create_group(&client->dev.kobj, &qt602240_attr_group);
+        if (error)
+                goto err_unregister_device;
+        return 0;
+err_unregister_device:
+        input_unregister_device(input_dev);
+        input_dev = NULL;
+err_free_irq:
+        free_irq(client->irq, data);
+err_free_object:
+        kfree(data->object_table);
+err_free_mem:
+        input_free_device(input_dev);
+        kfree(data);
+        return error;
+}
+static int __devexit qt602240_remove(struct i2c_client *client)
+{
+        struct qt602240_data *data = i2c_get_clientdata(client);
+        sysfs_remove_group(&client->dev.kobj, &qt602240_attr_group);
+        free_irq(data->irq, data);
+        input_unregister_device(data->input_dev);
+        kfree(data->object_table);
+        kfree(data);
+        return 0;
+}
+#ifdef CONFIG_PM
+static int qt602240_suspend(struct i2c_client *client, pm_message_t mesg)
+{
+        struct qt602240_data *data = i2c_get_clientdata(client);
+        struct input_dev *input_dev = data->input_dev;
+        mutex_lock(&input_dev->mutex);
+        if (input_dev->users)
+                qt602240_stop(data);
+        mutex_unlock(&input_dev->mutex);
+        return 0;
+}
+static int qt602240_resume(struct i2c_client *client)
+{
+        struct qt602240_data *data = i2c_get_clientdata(client);
+        struct input_dev *input_dev = data->input_dev;
+        /* Soft reset */
+        qt602240_write_object(data, QT602240_GEN_COMMAND,
+                        QT602240_COMMAND_RESET, 1);
+        msleep(QT602240_RESET_TIME);
+        mutex_lock(&input_dev->mutex);
+        if (input_dev->users)
+                qt602240_start(data);
+        mutex_unlock(&input_dev->mutex);
+        return 0;
+}
+#else
+#define qt602240_suspend        NULL
+#define qt602240_resume         NULL
+#endif
+static const struct i2c_device_id qt602240_id[] = {
+        { "qt602240_ts", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, qt602240_id);
+static struct i2c_driver qt602240_driver = {
+        .driver = {
+                .name   = "qt602240_ts",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = qt602240_probe,
+        .remove         = __devexit_p(qt602240_remove),
+        .suspend        = qt602240_suspend,
+        .resume         = qt602240_resume,
+        .id_table       = qt602240_id,
+};
+static int __init qt602240_init(void)
+{
+        return i2c_add_driver(&qt602240_driver);
+}
+static void __exit qt602240_exit(void)
+{
+        i2c_del_driver(&qt602240_driver);
+}
+module_init(qt602240_init);
+module_exit(qt602240_exit);
+/* Module information */
+MODULE_AUTHOR("Joonyoung Shim <jy0922.shim@samsung.com>");
+MODULE_DESCRIPTION("AT42QT602240/ATMXT224 Touchscreen driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/input/touchscreen/tps6507x-ts.c b/drivers/input/touchscreen/tps6507x-ts.c
index 5b70a1419b4d..a644d18c04dc 100644
--- a/drivers/input/touchscreen/tps6507x-ts.c
+++ b/drivers/input/touchscreen/tps6507x-ts.c
@@ -355,9 +355,6 @@ static int __devexit tps6507x_ts_remove(struct platform_device *pdev)
        struct tps6507x_ts *tsc = tps6507x_dev->ts;
        struct input_dev *input_dev = tsc->input_dev;
-        if (!tsc)
-                return 0;
        cancel_delayed_work_sync(&tsc->work);
        destroy_workqueue(tsc->wq);
diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index 567d57215c28..f45f80f6d336 100644
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
@@ -95,6 +95,7 @@ struct usbtouch_device_info {
        int  (*get_pkt_len) (unsigned char *pkt, int len);
        int  (*read_data)   (struct usbtouch_usb *usbtouch, unsigned char *pkt);
+        int  (*alloc)       (struct usbtouch_usb *usbtouch);
        int  (*init)        (struct usbtouch_usb *usbtouch);
        void (*exit)        (struct usbtouch_usb *usbtouch);
 };
@@ -135,7 +136,7 @@ enum {
        DEVTYPE_JASTEC,
        DEVTYPE_E2I,
        DEVTYPE_ZYTRONIC,
-        DEVTYPE_TC5UH,
+        DEVTYPE_TC45USB,
        DEVTYPE_NEXIO,
 };
@@ -222,8 +223,11 @@ static const struct usb_device_id usbtouch_devices[] = {
        {USB_DEVICE(0x14c8, 0x0003), .driver_info = DEVTYPE_ZYTRONIC},
 #endif
-#ifdef CONFIG_TOUCHSCREEN_USB_ETT_TC5UH
+#ifdef CONFIG_TOUCHSCREEN_USB_ETT_TC45USB
-        {USB_DEVICE(0x0664, 0x0309), .driver_info = DEVTYPE_TC5UH},
+        /* TC5UH */
+        {USB_DEVICE(0x0664, 0x0309), .driver_info = DEVTYPE_TC45USB},
+        /* TC4UM */
+        {USB_DEVICE(0x0664, 0x0306), .driver_info = DEVTYPE_TC45USB},
 #endif
 #ifdef CONFIG_TOUCHSCREEN_USB_NEXIO
@@ -507,7 +511,7 @@ static int dmc_tsc10_init(struct usbtouch_usb *usbtouch)
        int ret = -ENOMEM;
        unsigned char *buf;
-        buf = kmalloc(2, GFP_KERNEL);
+        buf = kmalloc(2, GFP_NOIO);
        if (!buf)
                goto err_nobuf;
        /* reset */
@@ -574,10 +578,10 @@ static int irtouch_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
 #endif
 /*****************************************************************************
- * ET&T TC5UH part
+ * ET&T TC5UH/TC4UM part
 */
-#ifdef CONFIG_TOUCHSCREEN_USB_ETT_TC5UH
+#ifdef CONFIG_TOUCHSCREEN_USB_ETT_TC45USB
-static int tc5uh_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
+static int tc45usb_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
 {
        dev->x = ((pkt[2] & 0x0F) << 8) | pkt[1];
        dev->y = ((pkt[4] & 0x0F) << 8) | pkt[3];
@@ -732,11 +736,43 @@ static void nexio_ack_complete(struct urb *urb)
 {
 }
+static int nexio_alloc(struct usbtouch_usb *usbtouch)
+{
+        struct nexio_priv *priv;
+        int ret = -ENOMEM;
+        usbtouch->priv = kmalloc(sizeof(struct nexio_priv), GFP_KERNEL);
+        if (!usbtouch->priv)
+                goto out_buf;
+        priv = usbtouch->priv;
+        priv->ack_buf = kmemdup(nexio_ack_pkt, sizeof(nexio_ack_pkt),
+                                GFP_KERNEL);
+        if (!priv->ack_buf)
+                goto err_priv;
+        priv->ack = usb_alloc_urb(0, GFP_KERNEL);
+        if (!priv->ack) {
+                dbg("%s - usb_alloc_urb failed: usbtouch->ack", __func__);
+                goto err_ack_buf;
+        }
+        return 0;
+err_ack_buf:
+        kfree(priv->ack_buf);
+err_priv:
+        kfree(priv);
+out_buf:
+        return ret;
+}
 static int nexio_init(struct usbtouch_usb *usbtouch)
 {
        struct usb_device *dev = interface_to_usbdev(usbtouch->interface);
        struct usb_host_interface *interface = usbtouch->interface->cur_altsetting;
-        struct nexio_priv *priv;
+        struct nexio_priv *priv = usbtouch->priv;
        int ret = -ENOMEM;
        int actual_len, i;
        unsigned char *buf;
@@ -755,7 +791,7 @@ static int nexio_init(struct usbtouch_usb *usbtouch)
        if (!input_ep || !output_ep)
                return -ENXIO;
-        buf = kmalloc(NEXIO_BUFSIZE, GFP_KERNEL);
+        buf = kmalloc(NEXIO_BUFSIZE, GFP_NOIO);
        if (!buf)
                goto out_buf;
@@ -787,11 +823,11 @@ static int nexio_init(struct usbtouch_usb *usbtouch)
                switch (buf[0]) {
                case 0x83:      /* firmware version */
                        if (!firmware_ver)
-                                firmware_ver = kstrdup(&buf[2], GFP_KERNEL);
+                                firmware_ver = kstrdup(&buf[2], GFP_NOIO);
                        break;
                case 0x84:      /* device name */
                        if (!device_name)
-                                device_name = kstrdup(&buf[2], GFP_KERNEL);
+                                device_name = kstrdup(&buf[2], GFP_NOIO);
                        break;
                }
        }
@@ -802,36 +838,11 @@ static int nexio_init(struct usbtouch_usb *usbtouch)
        kfree(firmware_ver);
        kfree(device_name);
-        /* prepare ACK URB */
-        ret = -ENOMEM;
-        usbtouch->priv = kmalloc(sizeof(struct nexio_priv), GFP_KERNEL);
-        if (!usbtouch->priv)
-                goto out_buf;
-        priv = usbtouch->priv;
-        priv->ack_buf = kmemdup(nexio_ack_pkt, sizeof(nexio_ack_pkt),
-                                GFP_KERNEL);
-        if (!priv->ack_buf)
-                goto err_priv;
-        priv->ack = usb_alloc_urb(0, GFP_KERNEL);
-        if (!priv->ack) {
-                dbg("%s - usb_alloc_urb failed: usbtouch->ack", __func__);
-                goto err_ack_buf;
-        }
        usb_fill_bulk_urb(priv->ack, dev, usb_sndbulkpipe(dev, output_ep),
                          priv->ack_buf, sizeof(nexio_ack_pkt),
                          nexio_ack_complete, usbtouch);
        ret = 0;
-        goto out_buf;
-err_ack_buf:
-        kfree(priv->ack_buf);
-err_priv:
-        kfree(priv);
 out_buf:
        kfree(buf);
        return ret;
@@ -849,29 +860,32 @@ static void nexio_exit(struct usbtouch_usb *usbtouch)
 static int nexio_read_data(struct usbtouch_usb *usbtouch, unsigned char *pkt)
 {
-        int x, y, begin_x, begin_y, end_x, end_y, w, h, ret;
        struct nexio_touch_packet *packet = (void *) pkt;
        struct nexio_priv *priv = usbtouch->priv;
+        unsigned int data_len = be16_to_cpu(packet->data_len);
+        unsigned int x_len = be16_to_cpu(packet->x_len);
+        unsigned int y_len = be16_to_cpu(packet->y_len);
+        int x, y, begin_x, begin_y, end_x, end_y, w, h, ret;
        /* got touch data? */
        if ((pkt[0] & 0xe0) != 0xe0)
                return 0;
-        if (be16_to_cpu(packet->data_len) > 0xff)
+        if (data_len > 0xff)
-                packet->data_len = cpu_to_be16(be16_to_cpu(packet->data_len) - 0x100);
+                data_len -= 0x100;
-        if (be16_to_cpu(packet->x_len) > 0xff)
+        if (x_len > 0xff)
-                packet->x_len = cpu_to_be16(be16_to_cpu(packet->x_len) - 0x80);
+                x_len -= 0x80;
        /* send ACK */
        ret = usb_submit_urb(priv->ack, GFP_ATOMIC);
        if (!usbtouch->type->max_xc) {
-                usbtouch->type->max_xc = 2 * be16_to_cpu(packet->x_len);
+                usbtouch->type->max_xc = 2 * x_len;
-                input_set_abs_params(usbtouch->input, ABS_X, 0,
+                input_set_abs_params(usbtouch->input, ABS_X,
-                                     2 * be16_to_cpu(packet->x_len), 0, 0);
+                                     0, usbtouch->type->max_xc, 0, 0);
-                usbtouch->type->max_yc = 2 * be16_to_cpu(packet->y_len);
+                usbtouch->type->max_yc = 2 * y_len;
-                input_set_abs_params(usbtouch->input, ABS_Y, 0,
+                input_set_abs_params(usbtouch->input, ABS_Y,
-                                     2 * be16_to_cpu(packet->y_len), 0, 0);
+                                     0, usbtouch->type->max_yc, 0, 0);
        }
        /*
         * The device reports state of IR sensors on X and Y axes.
@@ -881,22 +895,21 @@ static int nexio_read_data(struct usbtouch_usb *usbtouch, unsigned char *pkt)
         * it's disabled (and untested) here as there's no X driver for that.
         */
        begin_x = end_x = begin_y = end_y = -1;
-        for (x = 0; x < be16_to_cpu(packet->x_len); x++) {
+        for (x = 0; x < x_len; x++) {
                if (begin_x == -1 && packet->data[x] > NEXIO_THRESHOLD) {
                        begin_x = x;
                        continue;
                }
                if (end_x == -1 && begin_x != -1 && packet->data[x] < NEXIO_THRESHOLD) {
                        end_x = x - 1;
-                        for (y = be16_to_cpu(packet->x_len);
+                        for (y = x_len; y < data_len; y++) {
-                             y < be16_to_cpu(packet->data_len); y++) {
                                if (begin_y == -1 && packet->data[y] > NEXIO_THRESHOLD) {
-                                        begin_y = y - be16_to_cpu(packet->x_len);
+                                        begin_y = y - x_len;
                                        continue;
                                }
                                if (end_y == -1 &&
                                    begin_y != -1 && packet->data[y] < NEXIO_THRESHOLD) {
-                                        end_y = y - 1 - be16_to_cpu(packet->x_len);
+                                        end_y = y - 1 - x_len;
                                        w = end_x - begin_x;
                                        h = end_y - begin_y;
 #if 0
@@ -1104,14 +1117,14 @@ static struct usbtouch_device_info usbtouch_dev_info[] = {
        },
 #endif
-#ifdef CONFIG_TOUCHSCREEN_USB_ETT_TC5UH
+#ifdef CONFIG_TOUCHSCREEN_USB_ETT_TC45USB
-        [DEVTYPE_TC5UH] = {
+        [DEVTYPE_TC45USB] = {
                .min_xc         = 0x0,
                .max_xc         = 0x0fff,
                .min_yc         = 0x0,
                .max_yc         = 0x0fff,
                .rept_size      = 5,
-                .read_data      = tc5uh_read_data,
+                .read_data      = tc45usb_read_data,
        },
 #endif
@@ -1120,6 +1133,7 @@ static struct usbtouch_device_info usbtouch_dev_info[] = {
                .rept_size      = 1024,
                .irq_always     = true,
                .read_data      = nexio_read_data,
+                .alloc          = nexio_alloc,
                .init           = nexio_init,
                .exit           = nexio_exit,
        },
@@ -1263,6 +1277,7 @@ static void usbtouch_irq(struct urb *urb)
        usbtouch->type->process_pkt(usbtouch, usbtouch->data, urb->actual_length);
 exit:
+        usb_mark_last_busy(interface_to_usbdev(usbtouch->interface));
        retval = usb_submit_urb(urb, GFP_ATOMIC);
        if (retval)
                err("%s - usb_submit_urb failed with result: %d",
@@ -1272,25 +1287,89 @@ exit:
 static int usbtouch_open(struct input_dev *input)
 {
        struct usbtouch_usb *usbtouch = input_get_drvdata(input);
+        int r;
        usbtouch->irq->dev = interface_to_usbdev(usbtouch->interface);
+        r = usb_autopm_get_interface(usbtouch->interface) ? -EIO : 0;
+        if (r < 0)
+                goto out;
        if (!usbtouch->type->irq_always) {
-                if (usb_submit_urb(usbtouch->irq, GFP_KERNEL))
+                if (usb_submit_urb(usbtouch->irq, GFP_KERNEL)) {
-                  return -EIO;
+                        r = -EIO;
+                        goto out_put;
+                }
        }
-        return 0;
+        usbtouch->interface->needs_remote_wakeup = 1;
+out_put:
+        usb_autopm_put_interface(usbtouch->interface);
+out:
+        return r;
 }
 static void usbtouch_close(struct input_dev *input)
 {
        struct usbtouch_usb *usbtouch = input_get_drvdata(input);
+        int r;
        if (!usbtouch->type->irq_always)
                usb_kill_urb(usbtouch->irq);
+        r = usb_autopm_get_interface(usbtouch->interface);
+        usbtouch->interface->needs_remote_wakeup = 0;
+        if (!r)
+                usb_autopm_put_interface(usbtouch->interface);
 }
+static int usbtouch_suspend
+(struct usb_interface *intf, pm_message_t message)
+{
+        struct usbtouch_usb *usbtouch = usb_get_intfdata(intf);
+        usb_kill_urb(usbtouch->irq);
+        return 0;
+}
+static int usbtouch_resume(struct usb_interface *intf)
+{
+        struct usbtouch_usb *usbtouch = usb_get_intfdata(intf);
+        struct input_dev *input = usbtouch->input;
+        int result = 0;
+        mutex_lock(&input->mutex);
+        if (input->users || usbtouch->type->irq_always)
+                result = usb_submit_urb(usbtouch->irq, GFP_NOIO);
+        mutex_unlock(&input->mutex);
+        return result;
+}
+static int usbtouch_reset_resume(struct usb_interface *intf)
+{
+        struct usbtouch_usb *usbtouch = usb_get_intfdata(intf);
+        struct input_dev *input = usbtouch->input;
+        int err = 0;
+        /* reinit the device */
+        if (usbtouch->type->init) {
+                err = usbtouch->type->init(usbtouch);
+                if (err) {
+                        dbg("%s - type->init() failed, err: %d",
+                            __func__, err);
+                        return err;
+                }
+        }
+        /* restart IO if needed */
+        mutex_lock(&input->mutex);
+        if (input->users)
+                err = usb_submit_urb(usbtouch->irq, GFP_NOIO);
+        mutex_unlock(&input->mutex);
+        return err;
+}
 static void usbtouch_free_buffers(struct usb_device *udev,
                                  struct usbtouch_usb *usbtouch)
@@ -1411,12 +1490,21 @@ static int usbtouch_probe(struct usb_interface *intf,
        usbtouch->irq->transfer_dma = usbtouch->data_dma;
        usbtouch->irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
-        /* device specific init */
+        /* device specific allocations */
+        if (type->alloc) {
+                err = type->alloc(usbtouch);
+                if (err) {
+                        dbg("%s - type->alloc() failed, err: %d", __func__, err);
+                        goto out_free_urb;
+                }
+        }
+        /* device specific initialisation*/
        if (type->init) {
                err = type->init(usbtouch);
                if (err) {
                        dbg("%s - type->init() failed, err: %d", __func__, err);
-                        goto out_free_urb;
+                        goto out_do_exit;
                }
        }
@@ -1429,8 +1517,11 @@ static int usbtouch_probe(struct usb_interface *intf,
        usb_set_intfdata(intf, usbtouch);
        if (usbtouch->type->irq_always) {
+                /* this can't fail */
+                usb_autopm_get_interface(intf);
                err = usb_submit_urb(usbtouch->irq, GFP_KERNEL);
                if (err) {
+                        usb_autopm_put_interface(intf);
                        err("%s - usb_submit_urb failed with result: %d",
                            __func__, err);
                        goto out_unregister_input;
@@ -1481,7 +1572,11 @@ static struct usb_driver usbtouch_driver = {
        .name           = "usbtouchscreen",
        .probe          = usbtouch_probe,
        .disconnect     = usbtouch_disconnect,
+        .suspend        = usbtouch_suspend,
+        .resume         = usbtouch_resume,
+        .reset_resume   = usbtouch_reset_resume,
        .id_table       = usbtouch_devices,
+        .supports_autosuspend = 1,
 };
 static int __init usbtouch_init(void)
diff --git a/drivers/input/touchscreen/w90p910_ts.c b/drivers/input/touchscreen/w90p910_ts.c
index cc18265be1a8..7a45d68c3516 100644
--- a/drivers/input/touchscreen/w90p910_ts.c
+++ b/drivers/input/touchscreen/w90p910_ts.c
@@ -233,7 +233,7 @@ static int __devinit w90x900ts_probe(struct platform_device *pdev)
        w90p910_ts->state = TS_IDLE;
        spin_lock_init(&w90p910_ts->lock);
        setup_timer(&w90p910_ts->timer, w90p910_check_pen_up,
-                    (unsigned long)&w90p910_ts);
+                    (unsigned long)w90p910_ts);
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!res) {
diff --git a/drivers/input/xen-kbdfront.c b/drivers/input/xen-kbdfront.c
index e14081675bb2..ebb11907d402 100644
--- a/drivers/input/xen-kbdfront.c
+++ b/drivers/input/xen-kbdfront.c
@@ -339,7 +339,7 @@ static struct xenbus_driver xenkbd_driver = {
 static int __init xenkbd_init(void)
 {
-        if (!xen_domain())
+        if (!xen_pv_domain())
                return -ENODEV;
        /* Nothing to do if running in dom0. */
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index 0cabe31f26df..f80a7c48a35f 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -20,7 +20,6 @@
 #include <linux/signal.h>
 #include <linux/mutex.h>
 #include <linux/mm.h>
-#include <linux/smp_lock.h>
 #include <linux/timer.h>
 #include <linux/wait.h>
 #include <linux/tty.h>
@@ -50,6 +49,7 @@ MODULE_LICENSE("GPL");
 /* -------- driver information -------------------------------------- */
+static DEFINE_MUTEX(capi_mutex);
 static struct class *capi_class;
 static int capi_major = 68;             /* allocated */
@@ -691,7 +691,7 @@ unlock_out:
 static ssize_t
 capi_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
 {
-        struct capidev *cdev = (struct capidev *)file->private_data;
+        struct capidev *cdev = file->private_data;
        struct sk_buff *skb;
        size_t copied;
        int err;
@@ -726,7 +726,7 @@ capi_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
 static ssize_t
 capi_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
 {
-        struct capidev *cdev = (struct capidev *)file->private_data;
+        struct capidev *cdev = file->private_data;
        struct sk_buff *skb;
        u16 mlen;
@@ -773,7 +773,7 @@ capi_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos
 static unsigned int
 capi_poll(struct file *file, poll_table * wait)
 {
-        struct capidev *cdev = (struct capidev *)file->private_data;
+        struct capidev *cdev = file->private_data;
        unsigned int mask = 0;
        if (!cdev->ap.applid)
@@ -985,9 +985,9 @@ capi_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
        int ret;
-        lock_kernel();
+        mutex_lock(&capi_mutex);
        ret = capi_ioctl(file, cmd, arg);
-        unlock_kernel();
+        mutex_unlock(&capi_mutex);
        return ret;
 }
diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c
index bf55ed5f38e3..2978bdaa6b88 100644
--- a/drivers/isdn/capi/capidrv.c
+++ b/drivers/isdn/capi/capidrv.c
@@ -1450,12 +1450,9 @@ static void handle_dtrace_data(capidrv_contr *card,
        }
        for (p = data, end = data+len; p < end; p++) {
-                u8 w;
                PUTBYTE_TO_STATUS(card, ' ');
-                w = (*p >> 4) & 0xf;
+                PUTBYTE_TO_STATUS(card, hex_asc_hi(*p));
-                PUTBYTE_TO_STATUS(card, (w < 10) ? '0'+w : 'A'-10+w);
+                PUTBYTE_TO_STATUS(card, hex_asc_lo(*p));
-                w = *p & 0xf;
-                PUTBYTE_TO_STATUS(card, (w < 10) ? '0'+w : 'A'-10+w);
        }
        PUTBYTE_TO_STATUS(card, '\n');
diff --git a/drivers/isdn/divert/divert_procfs.c b/drivers/isdn/divert/divert_procfs.c
index c53e2417e7d4..33ec9e467772 100644
--- a/drivers/isdn/divert/divert_procfs.c
+++ b/drivers/isdn/divert/divert_procfs.c
@@ -20,7 +20,7 @@
 #include <linux/sched.h>
 #include <linux/isdnif.h>
 #include <net/net_namespace.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include "isdn_divert.h"
@@ -28,6 +28,7 @@
 /* Variables for interface queue */
 /*********************************/
 ulong if_used = 0;              /* number of interface users */
+static DEFINE_MUTEX(isdn_divert_mutex);
 static struct divert_info *divert_info_head = NULL;     /* head of queue */
 static struct divert_info *divert_info_tail = NULL;     /* pointer to last entry */
 static DEFINE_SPINLOCK(divert_info_lock);/* lock for queue */
@@ -261,9 +262,9 @@ static long isdn_divert_ioctl(struct file *file, uint cmd, ulong arg)
 {
        long ret;
-        lock_kernel();
+        mutex_lock(&isdn_divert_mutex);
        ret = isdn_divert_ioctl_unlocked(file, cmd, arg);
-        unlock_kernel();
+        mutex_unlock(&isdn_divert_mutex);
        return ret;
 }
diff --git a/drivers/isdn/gigaset/Kconfig b/drivers/isdn/gigaset/Kconfig
index dcefedc7044a..b18a92c32184 100644
--- a/drivers/isdn/gigaset/Kconfig
+++ b/drivers/isdn/gigaset/Kconfig
@@ -17,8 +17,7 @@ menuconfig ISDN_DRV_GIGASET
 if ISDN_DRV_GIGASET
 config GIGASET_CAPI
-        bool "Gigaset CAPI support (EXPERIMENTAL)"
+        bool "Gigaset CAPI support"
-        depends on EXPERIMENTAL
        depends on ISDN_CAPI='y'||(ISDN_CAPI='m'&&ISDN_DRV_GIGASET='m')
        default ISDN_I4L='n'
        help
@@ -27,6 +26,7 @@ config GIGASET_CAPI
          subsystem you'll have to enable the capidrv glue driver.
          (select ISDN_CAPI_CAPIDRV.)
          Say N to build the old native ISDN4Linux variant.
+          If unsure, say Y.
 config GIGASET_I4L
        bool
diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
index 47a5ffec55a3..0ded3640b926 100644
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
@@ -1188,24 +1188,6 @@ static void write_iso_tasklet(unsigned long data)
                                        break;
                                }
                        }
-#ifdef CONFIG_GIGASET_DEBUG
-                        /* check assumption on remaining frames */
-                        for (; i < BAS_NUMFRAMES; i++) {
-                                ifd = &urb->iso_frame_desc[i];
-                                if (ifd->status != -EINPROGRESS
-                                    || ifd->actual_length != 0) {
-                                        dev_warn(cs->dev,
-                                             "isochronous write: frame %d: %s, "
-                                             "%d of %d bytes sent\n",
-                                             i, get_usb_statmsg(ifd->status),
-                                             ifd->actual_length, ifd->length);
-                                        offset = (ifd->offset +
-                                                  ifd->actual_length)
-                                                 % BAS_OUTBUFSIZE;
-                                        break;
-                                }
-                        }
-#endif
                        break;
                case -EPIPE:                    /* stall - probably underrun */
                        dev_err(cs->dev, "isochronous write stalled\n");
@@ -1913,65 +1895,41 @@ static int start_cbsend(struct cardstate *cs)
 * USB transmission is started if necessary.
 * parameters:
 *      cs              controller state structure
- *      buf             command string to send
+ *      cb              command buffer structure
- *      len             number of bytes to send (max. IF_WRITEBUF)
- *      wake_tasklet    tasklet to run when transmission is completed
- *                      (NULL if none)
 * return value:
 *      number of bytes queued on success
 *      error code < 0 on error
 */
-static int gigaset_write_cmd(struct cardstate *cs,
+static int gigaset_write_cmd(struct cardstate *cs, struct cmdbuf_t *cb)
-                             const unsigned char *buf, int len,
-                             struct tasklet_struct *wake_tasklet)
 {
-        struct cmdbuf_t *cb;
        unsigned long flags;
        int rc;
        gigaset_dbg_buffer(cs->mstate != MS_LOCKED ?
                             DEBUG_TRANSCMD : DEBUG_LOCKCMD,
-                           "CMD Transmit", len, buf);
+                           "CMD Transmit", cb->len, cb->buf);
-        if (len <= 0) {
-                /* nothing to do */
-                rc = 0;
-                goto notqueued;
-        }
        /* translate "+++" escape sequence sent as a single separate command
         * into "close AT channel" command for error recovery
         * The next command will reopen the AT channel automatically.
         */
-        if (len == 3 && !memcmp(buf, "+++", 3)) {
+        if (cb->len == 3 && !memcmp(cb->buf, "+++", 3)) {
+                kfree(cb);
                rc = req_submit(cs->bcs, HD_CLOSE_ATCHANNEL, 0, BAS_TIMEOUT);
-                goto notqueued;
+                if (cb->wake_tasklet)
+                        tasklet_schedule(cb->wake_tasklet);
+                return rc < 0 ? rc : cb->len;
        }
-        if (len > IF_WRITEBUF)
-                len = IF_WRITEBUF;
-        cb = kmalloc(sizeof(struct cmdbuf_t) + len, GFP_ATOMIC);
-        if (!cb) {
-                dev_err(cs->dev, "%s: out of memory\n", __func__);
-                rc = -ENOMEM;
-                goto notqueued;
-        }
-        memcpy(cb->buf, buf, len);
-        cb->len = len;
-        cb->offset = 0;
-        cb->next = NULL;
-        cb->wake_tasklet = wake_tasklet;
        spin_lock_irqsave(&cs->cmdlock, flags);
        cb->prev = cs->lastcmdbuf;
        if (cs->lastcmdbuf)
                cs->lastcmdbuf->next = cb;
        else {
                cs->cmdbuf = cb;
-                cs->curlen = len;
+                cs->curlen = cb->len;
        }
-        cs->cmdbytes += len;
+        cs->cmdbytes += cb->len;
        cs->lastcmdbuf = cb;
        spin_unlock_irqrestore(&cs->cmdlock, flags);
@@ -1988,12 +1946,7 @@ static int gigaset_write_cmd(struct cardstate *cs,
        }
        rc = start_cbsend(cs);
        spin_unlock_irqrestore(&cs->lock, flags);
-        return rc < 0 ? rc : len;
+        return rc < 0 ? rc : cb->len;
-notqueued:                      /* request handled without queuing */
-        if (wake_tasklet)
-                tasklet_schedule(wake_tasklet);
-        return rc;
 }
 /* gigaset_write_room
diff --git a/drivers/isdn/gigaset/capi.c b/drivers/isdn/gigaset/capi.c
index 6fbe8999c419..e5ea344a551a 100644
--- a/drivers/isdn/gigaset/capi.c
+++ b/drivers/isdn/gigaset/capi.c
@@ -45,6 +45,7 @@
 #define CAPI_FACILITY_LI        0x0005
 #define CAPI_SUPPSVC_GETSUPPORTED       0x0000
+#define CAPI_SUPPSVC_LISTEN             0x0001
 /* missing from capiutil.h */
 #define CAPIMSG_PLCI_PART(m)    CAPIMSG_U8(m, 9)
@@ -270,9 +271,13 @@ static inline void dump_rawmsg(enum debuglevel level, const char *tag,
        kfree(dbgline);
        if (CAPIMSG_COMMAND(data) == CAPI_DATA_B3 &&
            (CAPIMSG_SUBCOMMAND(data) == CAPI_REQ ||
-             CAPIMSG_SUBCOMMAND(data) == CAPI_IND) &&
+             CAPIMSG_SUBCOMMAND(data) == CAPI_IND)) {
-            CAPIMSG_DATALEN(data) > 0) {
                l = CAPIMSG_DATALEN(data);
+                gig_dbg(level, "   DataLength=%d", l);
+                if (l <= 0 || !(gigaset_debuglevel & DEBUG_LLDATA))
+                        return;
+                if (l > 64)
+                        l = 64; /* arbitrary limit */
                dbgline = kmalloc(3*l, GFP_ATOMIC);
                if (!dbgline)
                        return;
@@ -378,13 +383,13 @@ void gigaset_skb_sent(struct bc_state *bcs, struct sk_buff *dskb)
        ++bcs->trans_up;
        if (!ap) {
-                dev_err(cs->dev, "%s: no application\n", __func__);
+                gig_dbg(DEBUG_MCMD, "%s: application gone", __func__);
                return;
        }
        /* don't send further B3 messages if disconnected */
        if (bcs->apconnstate < APCONN_ACTIVE) {
-                gig_dbg(DEBUG_LLDATA, "disconnected, discarding ack");
+                gig_dbg(DEBUG_MCMD, "%s: disconnected", __func__);
                return;
        }
@@ -422,13 +427,14 @@ void gigaset_skb_rcvd(struct bc_state *bcs, struct sk_buff *skb)
        bcs->trans_down++;
        if (!ap) {
-                dev_err(cs->dev, "%s: no application\n", __func__);
+                gig_dbg(DEBUG_MCMD, "%s: application gone", __func__);
+                dev_kfree_skb_any(skb);
                return;
        }
        /* don't send further B3 messages if disconnected */
        if (bcs->apconnstate < APCONN_ACTIVE) {
-                gig_dbg(DEBUG_LLDATA, "disconnected, discarding data");
+                gig_dbg(DEBUG_MCMD, "%s: disconnected", __func__);
                dev_kfree_skb_any(skb);
                return;
        }
@@ -454,7 +460,7 @@ void gigaset_skb_rcvd(struct bc_state *bcs, struct sk_buff *skb)
        /* Data64 parameter not present */
        /* emit message */
-        dump_rawmsg(DEBUG_LLDATA, "DATA_B3_IND", skb->data);
+        dump_rawmsg(DEBUG_MCMD, __func__, skb->data);
        capi_ctr_handle_message(&iif->ctr, ap->id, skb);
 }
 EXPORT_SYMBOL_GPL(gigaset_skb_rcvd);
@@ -747,7 +753,7 @@ void gigaset_isdn_connD(struct bc_state *bcs)
        ap = bcs->ap;
        if (!ap) {
                spin_unlock_irqrestore(&bcs->aplock, flags);
-                dev_err(cs->dev, "%s: no application\n", __func__);
+                gig_dbg(DEBUG_CMD, "%s: application gone", __func__);
                return;
        }
        if (bcs->apconnstate == APCONN_NONE) {
@@ -843,7 +849,7 @@ void gigaset_isdn_connB(struct bc_state *bcs)
        ap = bcs->ap;
        if (!ap) {
                spin_unlock_irqrestore(&bcs->aplock, flags);
-                dev_err(cs->dev, "%s: no application\n", __func__);
+                gig_dbg(DEBUG_CMD, "%s: application gone", __func__);
                return;
        }
        if (!bcs->apconnstate) {
@@ -901,13 +907,12 @@ void gigaset_isdn_connB(struct bc_state *bcs)
 */
 void gigaset_isdn_hupB(struct bc_state *bcs)
 {
-        struct cardstate *cs = bcs->cs;
        struct gigaset_capi_appl *ap = bcs->ap;
        /* ToDo: assure order of DISCONNECT_B3_IND and DISCONNECT_IND ? */
        if (!ap) {
-                dev_err(cs->dev, "%s: no application\n", __func__);
+                gig_dbg(DEBUG_CMD, "%s: application gone", __func__);
                return;
        }
@@ -978,6 +983,9 @@ static void gigaset_register_appl(struct capi_ctr *ctr, u16 appl,
        struct cardstate *cs = ctr->driverdata;
        struct gigaset_capi_appl *ap;
+        gig_dbg(DEBUG_CMD, "%s [%u] l3cnt=%u blkcnt=%u blklen=%u",
+                __func__, appl, rp->level3cnt, rp->datablkcnt, rp->datablklen);
        list_for_each_entry(ap, &iif->appls, ctrlist)
                if (ap->id == appl) {
                        dev_notice(cs->dev,
@@ -1062,6 +1070,8 @@ static void gigaset_release_appl(struct capi_ctr *ctr, u16 appl)
        struct gigaset_capi_appl *ap, *tmp;
        unsigned ch;
+        gig_dbg(DEBUG_CMD, "%s [%u]", __func__, appl);
        list_for_each_entry_safe(ap, tmp, &iif->appls, ctrlist)
                if (ap->id == appl) {
                        /* remove from any channels */
@@ -1142,7 +1152,7 @@ static void do_facility_req(struct gigaset_capi_ctr *iif,
        case CAPI_FACILITY_SUPPSVC:
                /* decode Function parameter */
                pparam = cmsg->FacilityRequestParameter;
-                if (pparam == NULL || *pparam < 2) {
+                if (pparam == NULL || pparam[0] < 2) {
                        dev_notice(cs->dev, "%s: %s missing\n", "FACILITY_REQ",
                                   "Facility Request Parameter");
                        send_conf(iif, ap, skb, CapiIllMessageParmCoding);
@@ -1159,8 +1169,32 @@ static void do_facility_req(struct gigaset_capi_ctr *iif,
                        /* Supported Services: none */
                        capimsg_setu32(confparam, 6, 0);
                        break;
+                case CAPI_SUPPSVC_LISTEN:
+                        if (pparam[0] < 7 || pparam[3] < 4) {
+                                dev_notice(cs->dev, "%s: %s missing\n",
+                                           "FACILITY_REQ", "Notification Mask");
+                                send_conf(iif, ap, skb,
+                                          CapiIllMessageParmCoding);
+                                return;
+                        }
+                        if (CAPIMSG_U32(pparam, 4) != 0) {
+                                dev_notice(cs->dev,
+        "%s: unsupported supplementary service notification mask 0x%x\n",
+                                   "FACILITY_REQ", CAPIMSG_U32(pparam, 4));
+                                info = CapiFacilitySpecificFunctionNotSupported;
+                                confparam[3] = 2;       /* length */
+                                capimsg_setu16(confparam, 4,
+                                        CapiSupplementaryServiceNotSupported);
+                        }
+                        info = CapiSuccess;
+                        confparam[3] = 2;       /* length */
+                        capimsg_setu16(confparam, 4, CapiSuccess);
+                        break;
                /* ToDo: add supported services */
                default:
+                        dev_notice(cs->dev,
+                "%s: unsupported supplementary service function 0x%04x\n",
+                                   "FACILITY_REQ", function);
                        info = CapiFacilitySpecificFunctionNotSupported;
                        /* Supplementary Service specific parameter */
                        confparam[3] = 2;       /* length */
@@ -1951,11 +1985,7 @@ static void do_data_b3_req(struct gigaset_capi_ctr *iif,
        u16 handle = CAPIMSG_HANDLE_REQ(skb->data);
        /* frequent message, avoid _cmsg overhead */
-        dump_rawmsg(DEBUG_LLDATA, "DATA_B3_REQ", skb->data);
+        dump_rawmsg(DEBUG_MCMD, __func__, skb->data);
-        gig_dbg(DEBUG_LLDATA,
-                "Receiving data from LL (ch: %d, flg: %x, sz: %d|%d)",
-                channel, flags, msglen, datalen);
        /* check parameters */
        if (channel == 0 || channel > cs->channels || ncci != 1) {
@@ -2064,7 +2094,7 @@ static void do_data_b3_resp(struct gigaset_capi_ctr *iif,
                            struct gigaset_capi_appl *ap,
                            struct sk_buff *skb)
 {
-        dump_rawmsg(DEBUG_LLDATA, __func__, skb->data);
+        dump_rawmsg(DEBUG_MCMD, __func__, skb->data);
        dev_kfree_skb_any(skb);
 }
diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
index 5d4befb81057..3ca561eccd9f 100644
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
@@ -791,8 +791,6 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
        spin_unlock_irqrestore(&cs->lock, flags);
        setup_timer(&cs->timer, timer_tick, (unsigned long) cs);
        cs->timer.expires = jiffies + msecs_to_jiffies(GIG_TICK);
-        /* FIXME: can jiffies increase too much until the timer is added?
-         * Same problem(?) with mod_timer() in timer_tick(). */
        add_timer(&cs->timer);
        gig_dbg(DEBUG_INIT, "cs initialized");
diff --git a/drivers/isdn/gigaset/ev-layer.c b/drivers/isdn/gigaset/ev-layer.c
index ceaef9a04a42..a14187605f5e 100644
--- a/drivers/isdn/gigaset/ev-layer.c
+++ b/drivers/isdn/gigaset/ev-layer.c
@@ -35,53 +35,40 @@
 #define RT_RING         2
 #define RT_NUMBER       3
 #define RT_STRING       4
-#define RT_HEX          5
 #define RT_ZCAU         6
 /* Possible ASCII responses */
 #define RSP_OK          0
-#define RSP_BUSY        1
+#define RSP_ERROR       1
-#define RSP_CONNECT     2
 #define RSP_ZGCI        3
 #define RSP_RING        4
-#define RSP_ZAOC        5
+#define RSP_ZVLS        5
-#define RSP_ZCSTR       6
+#define RSP_ZCAU        6
-#define RSP_ZCFGT       7
-#define RSP_ZCFG        8
+/* responses with values to store in at_state */
-#define RSP_ZCCR        9
+/* - numeric */
-#define RSP_EMPTY       10
-#define RSP_ZLOG        11
-#define RSP_ZCAU        12
-#define RSP_ZMWI        13
-#define RSP_ZABINFO     14
-#define RSP_ZSMLSTCHG   15
 #define RSP_VAR         100
 #define RSP_ZSAU        (RSP_VAR + VAR_ZSAU)
 #define RSP_ZDLE        (RSP_VAR + VAR_ZDLE)
-#define RSP_ZVLS        (RSP_VAR + VAR_ZVLS)
 #define RSP_ZCTP        (RSP_VAR + VAR_ZCTP)
+/* - string */
 #define RSP_STR         (RSP_VAR + VAR_NUM)
 #define RSP_NMBR        (RSP_STR + STR_NMBR)
 #define RSP_ZCPN        (RSP_STR + STR_ZCPN)
 #define RSP_ZCON        (RSP_STR + STR_ZCON)
 #define RSP_ZBC         (RSP_STR + STR_ZBC)
 #define RSP_ZHLC        (RSP_STR + STR_ZHLC)
-#define RSP_ERROR       -1      /* ERROR              */
 #define RSP_WRONG_CID   -2      /* unknown cid in cmd */
-#define RSP_UNKNOWN     -4      /* unknown response   */
-#define RSP_FAIL        -5      /* internal error     */
 #define RSP_INVAL       -6      /* invalid response   */
+#define RSP_NODEV       -9      /* device not connected */
 #define RSP_NONE        -19
 #define RSP_STRING      -20
 #define RSP_NULL        -21
-#define RSP_RETRYFAIL   -22
-#define RSP_RETRY       -23
-#define RSP_SKIP        -24
 #define RSP_INIT        -27
 #define RSP_ANY         -26
 #define RSP_LAST        -28
-#define RSP_NODEV       -9
 /* actions for process_response */
 #define ACT_NOTHING             0
@@ -259,13 +246,6 @@ struct reply_t gigaset_tab_nocid[] =
 /* misc. */
 {RSP_ERROR,      -1,  -1, -1,                    -1, -1, {ACT_ERROR} },
-{RSP_ZCFGT,      -1,  -1, -1,                    -1, -1, {ACT_DEBUG} },
-{RSP_ZCFG,       -1,  -1, -1,                    -1, -1, {ACT_DEBUG} },
-{RSP_ZLOG,       -1,  -1, -1,                    -1, -1, {ACT_DEBUG} },
-{RSP_ZMWI,       -1,  -1, -1,                    -1, -1, {ACT_DEBUG} },
-{RSP_ZABINFO,    -1,  -1, -1,                    -1, -1, {ACT_DEBUG} },
-{RSP_ZSMLSTCHG,  -1,  -1, -1,                    -1, -1, {ACT_DEBUG} },
 {RSP_ZCAU,       -1,  -1, -1,                    -1, -1, {ACT_ZCAU} },
 {RSP_NONE,       -1,  -1, -1,                    -1, -1, {ACT_DEBUG} },
 {RSP_ANY,        -1,  -1, -1,                    -1, -1, {ACT_WARN} },
@@ -361,10 +341,6 @@ struct reply_t gigaset_tab_cid[] =
 /* misc. */
 {RSP_ZCON,       -1,  -1, -1,                    -1, -1, {ACT_DEBUG} },
-{RSP_ZCCR,       -1,  -1, -1,                    -1, -1, {ACT_DEBUG} },
-{RSP_ZAOC,       -1,  -1, -1,                    -1, -1, {ACT_DEBUG} },
-{RSP_ZCSTR,      -1,  -1, -1,                    -1, -1, {ACT_DEBUG} },
 {RSP_ZCAU,       -1,  -1, -1,                    -1, -1, {ACT_ZCAU} },
 {RSP_NONE,       -1,  -1, -1,                    -1, -1, {ACT_DEBUG} },
 {RSP_ANY,        -1,  -1, -1,                    -1, -1, {ACT_WARN} },
@@ -387,20 +363,11 @@ static const struct resp_type_t {
        {"ZVLS",        RSP_ZVLS,       RT_NUMBER},
        {"ZCTP",        RSP_ZCTP,       RT_NUMBER},
        {"ZDLE",        RSP_ZDLE,       RT_NUMBER},
-        {"ZCFGT",       RSP_ZCFGT,      RT_NUMBER},
-        {"ZCCR",        RSP_ZCCR,       RT_NUMBER},
-        {"ZMWI",        RSP_ZMWI,       RT_NUMBER},
        {"ZHLC",        RSP_ZHLC,       RT_STRING},
        {"ZBC",         RSP_ZBC,        RT_STRING},
        {"NMBR",        RSP_NMBR,       RT_STRING},
        {"ZCPN",        RSP_ZCPN,       RT_STRING},
        {"ZCON",        RSP_ZCON,       RT_STRING},
-        {"ZAOC",        RSP_ZAOC,       RT_STRING},
-        {"ZCSTR",       RSP_ZCSTR,      RT_STRING},
-        {"ZCFG",        RSP_ZCFG,       RT_HEX},
-        {"ZLOG",        RSP_ZLOG,       RT_NOTHING},
-        {"ZABINFO",     RSP_ZABINFO,    RT_NOTHING},
-        {"ZSMLSTCHG",   RSP_ZSMLSTCHG,  RT_NOTHING},
        {NULL,          0,              0}
 };
@@ -418,64 +385,18 @@ static const struct zsau_resp_t {
        {NULL,                          ZSAU_UNKNOWN}
 };
-/*
- * Get integer from char-pointer
- */
-static int isdn_getnum(char *p)
-{
-        int v = -1;
-        gig_dbg(DEBUG_EVENT, "string: %s", p);
-        while (*p >= '0' && *p <= '9')
-                v = ((v < 0) ? 0 : (v * 10)) + (int) ((*p++) - '0');
-        if (*p)
-                v = -1; /* invalid Character */
-        return v;
-}
-/*
- * Get integer from char-pointer
- */
-static int isdn_gethex(char *p)
-{
-        int v = 0;
-        int c;
-        gig_dbg(DEBUG_EVENT, "string: %s", p);
-        if (!*p)
-                return -1;
-        do {
-                if (v > (INT_MAX - 15) / 16)
-                        return -1;
-                c = *p;
-                if (c >= '0' && c <= '9')
-                        c -= '0';
-                else if (c >= 'a' && c <= 'f')
-                        c -= 'a' - 10;
-                else if (c >= 'A' && c <= 'F')
-                        c -= 'A' - 10;
-                else
-                        return -1;
-                v = v * 16 + c;
-        } while (*++p);
-        return v;
-}
 /* retrieve CID from parsed response
 * returns 0 if no CID, -1 if invalid CID, or CID value 1..65535
 */
 static int cid_of_response(char *s)
 {
-        int cid;
+        unsigned long cid;
+        int rc;
        if (s[-1] != ';')
                return 0;       /* no CID separator */
-        cid = isdn_getnum(s);
+        rc = strict_strtoul(s, 10, &cid);
-        if (cid < 0)
+        if (rc)
                return 0;       /* CID not numeric */
        if (cid < 1 || cid > 65535)
                return -1;      /* CID out of range */
@@ -588,10 +509,10 @@ void gigaset_handle_modem_response(struct cardstate *cs)
                                        break;
                        if (!rt->response) {
-                                event->type = RSP_UNKNOWN;
+                                event->type = RSP_NONE;
-                                dev_warn(cs->dev,
+                                gig_dbg(DEBUG_EVENT,
-                                         "unknown modem response: %s\n",
+                                        "unknown modem response: '%s'\n",
-                                         argv[curarg]);
+                                        argv[curarg]);
                                break;
                        }
@@ -645,27 +566,27 @@ void gigaset_handle_modem_response(struct cardstate *cs)
                case RT_ZCAU:
                        event->parameter = -1;
                        if (curarg + 1 < params) {
-                                i = isdn_gethex(argv[curarg]);
+                                unsigned long type, value;
-                                j = isdn_gethex(argv[curarg + 1]);
-                                if (i >= 0 && i < 256 && j >= 0 && j < 256)
+                                i = strict_strtoul(argv[curarg++], 16, &type);
-                                        event->parameter = (unsigned) i << 8
+                                j = strict_strtoul(argv[curarg++], 16, &value);
-                                                           | j;
-                                curarg += 2;
+                                if (i == 0 && type < 256 &&
+                                    j == 0 && value < 256)
+                                        event->parameter = (type << 8) | value;
                        } else
                                curarg = params - 1;
                        break;
                case RT_NUMBER:
-                case RT_HEX:
+                        event->parameter = -1;
                        if (curarg < params) {
-                                if (param_type == RT_HEX)
+                                unsigned long res;
-                                        event->parameter =
+                                int rc;
-                                                isdn_gethex(argv[curarg]);
-                                else
+                                rc = strict_strtoul(argv[curarg++], 10, &res);
-                                        event->parameter =
+                                if (rc == 0)
-                                                isdn_getnum(argv[curarg]);
+                                        event->parameter = res;
-                                ++curarg;
+                        }
-                        } else
-                                event->parameter = -1;
                        gig_dbg(DEBUG_EVENT, "parameter==%d", event->parameter);
                        break;
                }
@@ -797,48 +718,27 @@ static void schedule_init(struct cardstate *cs, int state)
 static void send_command(struct cardstate *cs, const char *cmd, int cid,
                         int dle, gfp_t kmallocflags)
 {
-        size_t cmdlen, buflen;
+        struct cmdbuf_t *cb;
-        char *cmdpos, *cmdbuf, *cmdtail;
+        size_t buflen;
-        cmdlen = strlen(cmd);
+        buflen = strlen(cmd) + 12; /* DLE ( A T 1 2 3 4 5 <cmd> DLE ) \0 */
-        buflen = 11 + cmdlen;
+        cb = kmalloc(sizeof(struct cmdbuf_t) + buflen, kmallocflags);
-        if (unlikely(buflen <= cmdlen)) {
+        if (!cb) {
-                dev_err(cs->dev, "integer overflow in buflen\n");
+                dev_err(cs->dev, "%s: out of memory\n", __func__);
                return;
        }
+        if (cid > 0 && cid <= 65535)
-        cmdbuf = kmalloc(buflen, kmallocflags);
+                cb->len = snprintf(cb->buf, buflen,
-        if (unlikely(!cmdbuf)) {
+                                  dle ? "\020(AT%d%s\020)" : "AT%d%s",
-                dev_err(cs->dev, "out of memory\n");
+                                  cid, cmd);
-                return;
+        else
-        }
+                cb->len = snprintf(cb->buf, buflen,
+                                  dle ? "\020(AT%s\020)" : "AT%s",
-        cmdpos = cmdbuf + 9;
+                                  cmd);
-        cmdtail = cmdpos + cmdlen;
+        cb->offset = 0;
-        memcpy(cmdpos, cmd, cmdlen);
+        cb->next = NULL;
+        cb->wake_tasklet = NULL;
-        if (cid > 0 && cid <= 65535) {
+        cs->ops->write_cmd(cs, cb);
-                do {
-                        *--cmdpos = '0' + cid % 10;
-                        cid /= 10;
-                        ++cmdlen;
-                } while (cid);
-        }
-        cmdlen += 2;
-        *--cmdpos = 'T';
-        *--cmdpos = 'A';
-        if (dle) {
-                cmdlen += 4;
-                *--cmdpos = '(';
-                *--cmdpos = 0x10;
-                *cmdtail++ = 0x10;
-                *cmdtail++ = ')';
-        }
-        cs->ops->write_cmd(cs, cmdpos, cmdlen, NULL);
-        kfree(cmdbuf);
 }
 static struct at_state_t *at_state_from_cid(struct cardstate *cs, int cid)
@@ -1240,8 +1140,22 @@ static void do_action(int action, struct cardstate *cs,
                break;
        case ACT_HUPMODEM:
                /* send "+++" (hangup in unimodem mode) */
-                if (cs->connected)
+                if (cs->connected) {
-                        cs->ops->write_cmd(cs, "+++", 3, NULL);
+                        struct cmdbuf_t *cb;
+                        cb = kmalloc(sizeof(struct cmdbuf_t) + 3, GFP_ATOMIC);
+                        if (!cb) {
+                                dev_err(cs->dev, "%s: out of memory\n",
+                                        __func__);
+                                return;
+                        }
+                        memcpy(cb->buf, "+++", 3);
+                        cb->len = 3;
+                        cb->offset = 0;
+                        cb->next = NULL;
+                        cb->wake_tasklet = NULL;
+                        cs->ops->write_cmd(cs, cb);
+                }
                break;
        case ACT_RING:
                /* get fresh AT state structure for new CID */
@@ -1855,19 +1769,13 @@ static void process_command_flags(struct cardstate *cs)
                                gig_dbg(DEBUG_EVENT, "Scheduling PC_CIDMODE");
                                cs->commands_pending = 1;
                                return;
-#ifdef GIG_MAYINITONDIAL
                        case M_UNKNOWN:
                                schedule_init(cs, MS_INIT);
                                return;
-#endif
                        }
                        bcs->at_state.pending_commands &= ~PC_CID;
                        cs->curchannel = bcs->channel;
-#ifdef GIG_RETRYCID
                        cs->retry_count = 2;
-#else
-                        cs->retry_count = 1;
-#endif
                        schedule_sequence(cs, &cs->at_state, SEQ_CID);
                        return;
                }
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
index 8738b0821fc9..a69512fb1195 100644
--- a/drivers/isdn/gigaset/gigaset.h
+++ b/drivers/isdn/gigaset/gigaset.h
@@ -46,13 +46,6 @@
 #define RBUFSIZE 8192
-/* compile time options */
-#define GIG_MAJOR 0
-#define GIG_MAYINITONDIAL
-#define GIG_RETRYCID
-#define GIG_X75
 #define GIG_TICK 100            /* in milliseconds */
 /* timeout values (unit: 1 sec) */
@@ -193,9 +186,8 @@ void gigaset_dbg_buffer(enum debuglevel level, const unsigned char *msg,
 /* variables in struct at_state_t */
 #define VAR_ZSAU        0
 #define VAR_ZDLE        1
-#define VAR_ZVLS        2
+#define VAR_ZCTP        2
-#define VAR_ZCTP        3
+#define VAR_NUM         3
-#define VAR_NUM         4
 #define STR_NMBR        0
 #define STR_ZCPN        1
@@ -574,9 +566,7 @@ struct bas_bc_state {
 struct gigaset_ops {
        /* Called from ev-layer.c/interface.c for sending AT commands to the
           device */
-        int (*write_cmd)(struct cardstate *cs,
+        int (*write_cmd)(struct cardstate *cs, struct cmdbuf_t *cb);
-                         const unsigned char *buf, int len,
-                         struct tasklet_struct *wake_tasklet);
        /* Called from interface.c for additional device control */
        int (*write_room)(struct cardstate *cs);
diff --git a/drivers/isdn/gigaset/i4l.c b/drivers/isdn/gigaset/i4l.c
index f01c3c2e2e46..34bca37d65b9 100644
--- a/drivers/isdn/gigaset/i4l.c
+++ b/drivers/isdn/gigaset/i4l.c
@@ -419,6 +419,8 @@ oom:
        dev_err(bcs->cs->dev, "out of memory\n");
        for (i = 0; i < AT_NUM; ++i)
                kfree(commands[i]);
+        kfree(commands);
+        gigaset_free_channel(bcs);
        return -ENOMEM;
 }
@@ -643,9 +645,7 @@ int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid)
        iif->maxbufsize = MAX_BUF_SIZE;
        iif->features = ISDN_FEATURE_L2_TRANS |
                ISDN_FEATURE_L2_HDLC |
-#ifdef GIG_X75
                ISDN_FEATURE_L2_X75I |
-#endif
                ISDN_FEATURE_L3_TRANS |
                ISDN_FEATURE_P_EURO;
        iif->hl_hdrlen = HW_HDR_LEN;            /* Area for storing ack */
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
index c9f28dd40d5c..bb710d16a526 100644
--- a/drivers/isdn/gigaset/interface.c
+++ b/drivers/isdn/gigaset/interface.c
@@ -339,7 +339,8 @@ static int if_tiocmset(struct tty_struct *tty, struct file *file,
 static int if_write(struct tty_struct *tty, const unsigned char *buf, int count)
 {
        struct cardstate *cs;
-        int retval = -ENODEV;
+        struct cmdbuf_t *cb;
+        int retval;
        cs = (struct cardstate *) tty->driver_data;
        if (!cs) {
@@ -355,18 +356,39 @@ static int if_write(struct tty_struct *tty, const unsigned char *buf, int count)
        if (!cs->connected) {
                gig_dbg(DEBUG_IF, "not connected");
                retval = -ENODEV;
-        } else if (!cs->open_count)
+                goto done;
+        }
+        if (!cs->open_count) {
                dev_warn(cs->dev, "%s: device not opened\n", __func__);
-        else if (cs->mstate != MS_LOCKED) {
+                retval = -ENODEV;
+                goto done;
+        }
+        if (cs->mstate != MS_LOCKED) {
                dev_warn(cs->dev, "can't write to unlocked device\n");
                retval = -EBUSY;
-        } else {
+                goto done;
-                retval = cs->ops->write_cmd(cs, buf, count,
+        }
-                                            &cs->if_wake_tasklet);
+        if (count <= 0) {
+                /* nothing to do */
+                retval = 0;
+                goto done;
        }
-        mutex_unlock(&cs->mutex);
+        cb = kmalloc(sizeof(struct cmdbuf_t) + count, GFP_KERNEL);
+        if (!cb) {
+                dev_err(cs->dev, "%s: out of memory\n", __func__);
+                retval = -ENOMEM;
+                goto done;
+        }
+        memcpy(cb->buf, buf, count);
+        cb->len = count;
+        cb->offset = 0;
+        cb->next = NULL;
+        cb->wake_tasklet = &cs->if_wake_tasklet;
+        retval = cs->ops->write_cmd(cs, cb);
+done:
+        mutex_unlock(&cs->mutex);
        return retval;
 }
@@ -655,7 +677,6 @@ void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
                goto enomem;
        tty->magic =            TTY_DRIVER_MAGIC,
-        tty->major =            GIG_MAJOR,
        tty->type =             TTY_DRIVER_TYPE_SERIAL,
        tty->subtype =          SERIAL_TYPE_NORMAL,
        tty->flags =            TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
index e96c0586886c..d151dcbf770d 100644
--- a/drivers/isdn/gigaset/ser-gigaset.c
+++ b/drivers/isdn/gigaset/ser-gigaset.c
@@ -241,30 +241,13 @@ static void flush_send_queue(struct cardstate *cs)
 * return value:
 *      number of bytes queued, or error code < 0
 */
-static int gigaset_write_cmd(struct cardstate *cs, const unsigned char *buf,
+static int gigaset_write_cmd(struct cardstate *cs, struct cmdbuf_t *cb)
-                             int len, struct tasklet_struct *wake_tasklet)
 {
-        struct cmdbuf_t *cb;
        unsigned long flags;
        gigaset_dbg_buffer(cs->mstate != MS_LOCKED ?
                                DEBUG_TRANSCMD : DEBUG_LOCKCMD,
-                           "CMD Transmit", len, buf);
+                           "CMD Transmit", cb->len, cb->buf);
-        if (len <= 0)
-                return 0;
-        cb = kmalloc(sizeof(struct cmdbuf_t) + len, GFP_ATOMIC);
-        if (!cb) {
-                dev_err(cs->dev, "%s: out of memory!\n", __func__);
-                return -ENOMEM;
-        }
-        memcpy(cb->buf, buf, len);
-        cb->len = len;
-        cb->offset = 0;
-        cb->next = NULL;
-        cb->wake_tasklet = wake_tasklet;
        spin_lock_irqsave(&cs->cmdlock, flags);
        cb->prev = cs->lastcmdbuf;
@@ -272,9 +255,9 @@ static int gigaset_write_cmd(struct cardstate *cs, const unsigned char *buf,
                cs->lastcmdbuf->next = cb;
        else {
                cs->cmdbuf = cb;
-                cs->curlen = len;
+                cs->curlen = cb->len;
        }
-        cs->cmdbytes += len;
+        cs->cmdbytes += cb->len;
        cs->lastcmdbuf = cb;
        spin_unlock_irqrestore(&cs->cmdlock, flags);
@@ -282,7 +265,7 @@ static int gigaset_write_cmd(struct cardstate *cs, const unsigned char *buf,
        if (cs->connected)
                tasklet_schedule(&cs->write_tasklet);
        spin_unlock_irqrestore(&cs->lock, flags);
-        return len;
+        return cb->len;
 }
 /*
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
index 76dbb20f3065..4a66338f4e7d 100644
--- a/drivers/isdn/gigaset/usb-gigaset.c
+++ b/drivers/isdn/gigaset/usb-gigaset.c
@@ -39,7 +39,8 @@ MODULE_PARM_DESC(cidmode, "Call-ID mode");
 #define GIGASET_MODULENAME "usb_gigaset"
 #define GIGASET_DEVNAME    "ttyGU"
-#define IF_WRITEBUF 2000        /* arbitrary limit */
+/* length limit according to Siemens 3070usb-protokoll.doc ch. 2.1 */
+#define IF_WRITEBUF 264
 /* Values for the Gigaset M105 Data */
 #define USB_M105_VENDOR_ID      0x0681
@@ -493,29 +494,13 @@ static int send_cb(struct cardstate *cs, struct cmdbuf_t *cb)
 }
 /* Send command to device. */
-static int gigaset_write_cmd(struct cardstate *cs, const unsigned char *buf,
+static int gigaset_write_cmd(struct cardstate *cs, struct cmdbuf_t *cb)
-                             int len, struct tasklet_struct *wake_tasklet)
 {
-        struct cmdbuf_t *cb;
        unsigned long flags;
        gigaset_dbg_buffer(cs->mstate != MS_LOCKED ?
                             DEBUG_TRANSCMD : DEBUG_LOCKCMD,
-                           "CMD Transmit", len, buf);
+                           "CMD Transmit", cb->len, cb->buf);
-        if (len <= 0)
-                return 0;
-        cb = kmalloc(sizeof(struct cmdbuf_t) + len, GFP_ATOMIC);
-        if (!cb) {
-                dev_err(cs->dev, "%s: out of memory\n", __func__);
-                return -ENOMEM;
-        }
-        memcpy(cb->buf, buf, len);
-        cb->len = len;
-        cb->offset = 0;
-        cb->next = NULL;
-        cb->wake_tasklet = wake_tasklet;
        spin_lock_irqsave(&cs->cmdlock, flags);
        cb->prev = cs->lastcmdbuf;
@@ -523,9 +508,9 @@ static int gigaset_write_cmd(struct cardstate *cs, const unsigned char *buf,
                cs->lastcmdbuf->next = cb;
        else {
                cs->cmdbuf = cb;
-                cs->curlen = len;
+                cs->curlen = cb->len;
        }
-        cs->cmdbytes += len;
+        cs->cmdbytes += cb->len;
        cs->lastcmdbuf = cb;
        spin_unlock_irqrestore(&cs->cmdlock, flags);
@@ -533,7 +518,7 @@ static int gigaset_write_cmd(struct cardstate *cs, const unsigned char *buf,
        if (cs->connected)
                tasklet_schedule(&cs->write_tasklet);
        spin_unlock_irqrestore(&cs->lock, flags);
-        return len;
+        return cb->len;
 }
 static int gigaset_write_room(struct cardstate *cs)
diff --git a/drivers/isdn/hardware/eicon/divamnt.c b/drivers/isdn/hardware/eicon/divamnt.c
index 1e85f743214e..f1d464f1e107 100644
--- a/drivers/isdn/hardware/eicon/divamnt.c
+++ b/drivers/isdn/hardware/eicon/divamnt.c
@@ -14,7 +14,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/poll.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <asm/uaccess.h>
 #include "platform.h"
@@ -22,6 +22,7 @@
 #include "divasync.h"
 #include "debug_if.h"
+static DEFINE_MUTEX(maint_mutex);
 static char *main_revision = "$Revision: 1.32.6.10 $";
 static int major;
@@ -130,7 +131,7 @@ static int maint_open(struct inode *ino, struct file *filep)
 {
        int ret;
-        lock_kernel();
+        mutex_lock(&maint_mutex);
        /* only one open is allowed, so we test
           it atomically */
        if (test_and_set_bit(0, &opened))
@@ -139,7 +140,7 @@ static int maint_open(struct inode *ino, struct file *filep)
                filep->private_data = NULL;
                ret = nonseekable_open(ino, filep);
        }
-        unlock_kernel();
+        mutex_unlock(&maint_mutex);
        return ret;
 }
diff --git a/drivers/isdn/hardware/eicon/divasi.c b/drivers/isdn/hardware/eicon/divasi.c
index f577719ab3fa..42d3b8346034 100644
--- a/drivers/isdn/hardware/eicon/divasi.c
+++ b/drivers/isdn/hardware/eicon/divasi.c
@@ -18,7 +18,6 @@
 #include <linux/proc_fs.h>
 #include <linux/skbuff.h>
 #include <linux/seq_file.h>
-#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 #include "platform.h"
@@ -402,7 +401,6 @@ static unsigned int um_idi_poll(struct file *file, poll_table * wait)
 static int um_idi_open(struct inode *inode, struct file *file)
 {
-        cycle_kernel_lock();
        return (0);
 }
diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c
index fbbcb27fb681..ed9c55506797 100644
--- a/drivers/isdn/hardware/eicon/divasmain.c
+++ b/drivers/isdn/hardware/eicon/divasmain.c
@@ -21,7 +21,6 @@
 #include <linux/list.h>
 #include <linux/poll.h>
 #include <linux/kmod.h>
-#include <linux/smp_lock.h>
 #include "platform.h"
 #undef ID_MASK
@@ -113,41 +112,40 @@ typedef struct _diva_os_thread_dpc {
  This table should be sorted by PCI device ID
  */
 static struct pci_device_id divas_pci_tbl[] = {
-/* Diva Server BRI-2M PCI 0xE010 */
+        /* Diva Server BRI-2M PCI 0xE010 */
-        {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_MAESTRA,
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRA),
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_MAESTRA_PCI},
+                CARDTYPE_MAESTRA_PCI },
-/* Diva Server 4BRI-8M PCI 0xE012 */
+        /* Diva Server 4BRI-8M PCI 0xE012 */
-        {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_MAESTRAQ,
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRAQ),
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_Q_8M_PCI},
+                CARDTYPE_DIVASRV_Q_8M_PCI },
-/* Diva Server 4BRI-8M 2.0 PCI 0xE013 */
+        /* Diva Server 4BRI-8M 2.0 PCI 0xE013 */
-        {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_MAESTRAQ_U,
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRAQ_U),
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_Q_8M_V2_PCI},
+                CARDTYPE_DIVASRV_Q_8M_V2_PCI },
-/* Diva Server PRI-30M PCI 0xE014 */
+        /* Diva Server PRI-30M PCI 0xE014 */
-        {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_MAESTRAP,
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRAP),
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_P_30M_PCI},
+                CARDTYPE_DIVASRV_P_30M_PCI },
-/* Diva Server PRI 2.0 adapter 0xE015 */
+        /* Diva Server PRI 2.0 adapter 0xE015 */
-        {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_MAESTRAP_2,
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRAP_2),
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_P_30M_V2_PCI},
+                CARDTYPE_DIVASRV_P_30M_V2_PCI },
-/* Diva Server Voice 4BRI-8M PCI 0xE016 */
+        /* Diva Server Voice 4BRI-8M PCI 0xE016 */
-        {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_4BRI_VOIP,
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_4BRI_VOIP),
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_VOICE_Q_8M_PCI},
+                CARDTYPE_DIVASRV_VOICE_Q_8M_PCI },
-/* Diva Server Voice 4BRI-8M 2.0 PCI 0xE017 */
+        /* Diva Server Voice 4BRI-8M 2.0 PCI 0xE017 */
-        {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_4BRI_2_VOIP,
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_4BRI_2_VOIP),
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_VOICE_Q_8M_V2_PCI},
+                CARDTYPE_DIVASRV_VOICE_Q_8M_V2_PCI },
-/* Diva Server BRI-2M 2.0 PCI 0xE018 */
+        /* Diva Server BRI-2M 2.0 PCI 0xE018 */
-        {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_BRI2M_2,
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_BRI2M_2),
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_B_2M_V2_PCI},
+                CARDTYPE_DIVASRV_B_2M_V2_PCI },
-/* Diva Server Voice PRI 2.0 PCI 0xE019 */
+        /* Diva Server Voice PRI 2.0 PCI 0xE019 */
-        {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_MAESTRAP_2_VOIP,
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRAP_2_VOIP),
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                CARDTYPE_DIVASRV_VOICE_P_30M_V2_PCI },
-         CARDTYPE_DIVASRV_VOICE_P_30M_V2_PCI},
+        /* Diva Server 2FX 0xE01A */
-/* Diva Server 2FX 0xE01A */
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_2F),
-        {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_2F,
+                CARDTYPE_DIVASRV_B_2F_PCI },
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_B_2F_PCI},
+        /* Diva Server Voice BRI-2M 2.0 PCI 0xE01B */
-/* Diva Server Voice BRI-2M 2.0 PCI 0xE01B */
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_BRI2M_2_VOIP),
-        {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_BRI2M_2_VOIP,
+                CARDTYPE_DIVASRV_VOICE_B_2M_V2_PCI },
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_VOICE_B_2M_V2_PCI},
+        { 0, }                  /* 0 terminated list. */
-        {0,}                    /* 0 terminated list. */
 };
 MODULE_DEVICE_TABLE(pci, divas_pci_tbl);
@@ -581,7 +579,6 @@ xdi_copy_from_user(void *os_handle, void *dst, const void __user *src, int lengt
 */
 static int divas_open(struct inode *inode, struct file *file)
 {
-        cycle_kernel_lock();
        return (0);
 }
diff --git a/drivers/isdn/hardware/mISDN/avmfritz.c b/drivers/isdn/hardware/mISDN/avmfritz.c
index d4215369bb59..472a2af79446 100644
--- a/drivers/isdn/hardware/mISDN/avmfritz.c
+++ b/drivers/isdn/hardware/mISDN/avmfritz.c
@@ -1116,7 +1116,7 @@ fritz_remove_pci(struct pci_dev *pdev)
                release_card(card);
        else
                if (debug)
-                        pr_info("%s: drvdata allready removed\n", __func__);
+                        pr_info("%s: drvdata already removed\n", __func__);
 }
 static struct pci_device_id fcpci_ids[] __devinitdata = {
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index 095ed76ebe80..4e3780d78ac7 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -4268,7 +4268,7 @@ init_card(struct hfc_multi *hc)
                goto error;
        /*
         * Finally enable IRQ output
-         * this is only allowed, if an IRQ routine is allready
+         * this is only allowed, if an IRQ routine is already
         * established for this HFC, so don't do that earlier
         */
        spin_lock_irqsave(&hc->lock, flags);
@@ -5212,7 +5212,7 @@ static void __devexit hfc_remove_pci(struct pci_dev *pdev)
                spin_unlock_irqrestore(&HFClock, flags);
        }  else {
                if (debug)
-                        printk(KERN_DEBUG "%s: drvdata allready removed\n",
+                        printk(KERN_DEBUG "%s: drvdata already removed\n",
                            __func__);
        }
 }
@@ -5354,12 +5354,9 @@ static struct pci_device_id hfmultipci_ids[] __devinitdata = {
        { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFCE1, PCI_VENDOR_ID_CCD,
                PCI_SUBDEVICE_ID_CCD_JHSE1, 0, 0, H(25)}, /* Junghanns E1 */
-        { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC4S, PCI_ANY_ID, PCI_ANY_ID,
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_HFC4S), 0 },
-                0, 0, 0},
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_HFC8S), 0 },
-        { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC8S, PCI_ANY_ID, PCI_ANY_ID,
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_HFCE1), 0 },
-                0, 0, 0},
-        { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFCE1, PCI_ANY_ID, PCI_ANY_ID,
-                0, 0, 0},
        {0, }
 };
 #undef H
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
index 5940a2c12074..15d323b8be60 100644
--- a/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -1773,7 +1773,7 @@ init_card(struct hfc_pci *hc)
                inithfcpci(hc);
                /*
                 * Finally enable IRQ output
-                 * this is only allowed, if an IRQ routine is allready
+                 * this is only allowed, if an IRQ routine is already
                 * established for this HFC, so don't do that earlier
                 */
                enable_hwirq(hc);
@@ -2188,52 +2188,52 @@ static const struct _hfc_map hfc_map[] =
 static struct pci_device_id hfc_ids[] =
 {
-        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_2BD0,
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_2BD0),
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[0]},
+                (unsigned long) &hfc_map[0] },
-        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B000,
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B000),
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[1]},
+                (unsigned long) &hfc_map[1] },
-        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B006,
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B006),
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[2]},
+                (unsigned long) &hfc_map[2] },
-        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B007,
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B007),
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[3]},
+                (unsigned long) &hfc_map[3] },
-        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B008,
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B008),
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[4]},
+                (unsigned long) &hfc_map[4] },
-        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B009,
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B009),
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[5]},
+                (unsigned long) &hfc_map[5] },
-        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00A,
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B00A),
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[6]},
+                (unsigned long) &hfc_map[6] },
-        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00B,
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B00B),
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[7]},
+                (unsigned long) &hfc_map[7] },
-        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00C,
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B00C),
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[8]},
+                (unsigned long) &hfc_map[8] },
-        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B100,
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B100),
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[9]},
+                (unsigned long) &hfc_map[9] },
-        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B700,
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B700),
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[10]},
+                (unsigned long) &hfc_map[10] },
-        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B701,
+        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B701),
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[11]},
+                (unsigned long) &hfc_map[11] },
-        {PCI_VENDOR_ID_ABOCOM, PCI_DEVICE_ID_ABOCOM_2BD1,
+        { PCI_VDEVICE(ABOCOM, PCI_DEVICE_ID_ABOCOM_2BD1),
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[12]},
+                (unsigned long) &hfc_map[12] },
-        {PCI_VENDOR_ID_ASUSTEK, PCI_DEVICE_ID_ASUSTEK_0675,
+        { PCI_VDEVICE(ASUSTEK, PCI_DEVICE_ID_ASUSTEK_0675),
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[13]},
+                (unsigned long) &hfc_map[13] },
-        {PCI_VENDOR_ID_BERKOM, PCI_DEVICE_ID_BERKOM_T_CONCEPT,
+        { PCI_VDEVICE(BERKOM, PCI_DEVICE_ID_BERKOM_T_CONCEPT),
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[14]},
+                (unsigned long) &hfc_map[14] },
-        {PCI_VENDOR_ID_BERKOM, PCI_DEVICE_ID_BERKOM_A1T,
+        { PCI_VDEVICE(BERKOM, PCI_DEVICE_ID_BERKOM_A1T),
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[15]},
+                (unsigned long) &hfc_map[15] },
-        {PCI_VENDOR_ID_ANIGMA, PCI_DEVICE_ID_ANIGMA_MC145575,
+        { PCI_VDEVICE(ANIGMA, PCI_DEVICE_ID_ANIGMA_MC145575),
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[16]},
+                (unsigned long) &hfc_map[16] },
-        {PCI_VENDOR_ID_ZOLTRIX, PCI_DEVICE_ID_ZOLTRIX_2BD0,
+        { PCI_VDEVICE(ZOLTRIX, PCI_DEVICE_ID_ZOLTRIX_2BD0),
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[17]},
+                (unsigned long) &hfc_map[17] },
-        {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_E,
+        { PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_E),
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[18]},
+                (unsigned long) &hfc_map[18] },
-        {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_E,
+        { PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_E),
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[19]},
+                (unsigned long) &hfc_map[19] },
-        {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_A,
+        { PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_A),
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[20]},
+                (unsigned long) &hfc_map[20] },
-        {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_A,
+        { PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_A),
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[21]},
+                (unsigned long) &hfc_map[21] },
-        {PCI_VENDOR_ID_SITECOM, PCI_DEVICE_ID_SITECOM_DC105V2,
+        { PCI_VDEVICE(SITECOM, PCI_DEVICE_ID_SITECOM_DC105V2),
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[22]},
+                (unsigned long) &hfc_map[22] },
        {},
 };
diff --git a/drivers/isdn/hardware/mISDN/mISDNinfineon.c b/drivers/isdn/hardware/mISDN/mISDNinfineon.c
index f5b3d2b26a08..d2dd61d65d51 100644
--- a/drivers/isdn/hardware/mISDN/mISDNinfineon.c
+++ b/drivers/isdn/hardware/mISDN/mISDNinfineon.c
@@ -125,36 +125,25 @@ struct inf_hw {
 #define PCI_SUB_ID_SEDLBAUER            0x01
 static struct pci_device_id infineon_ids[] __devinitdata = {
-        { PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20,
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_DIVA20), INF_DIVA20 },
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_DIVA20},
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_DIVA20_U), INF_DIVA20U },
-        { PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20_U,
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_DIVA201), INF_DIVA201 },
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_DIVA20U},
+        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_DIVA202), INF_DIVA202 },
-        { PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA201,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_DIVA201},
-        { PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA202,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_DIVA202},
        { PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_100,
          PCI_SUBVENDOR_SEDLBAUER_PCI, PCI_SUB_ID_SEDLBAUER, 0, 0,
-          INF_SPEEDWIN},
+          INF_SPEEDWIN },
        { PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_100,
-          PCI_SUBVENDOR_HST_SAPHIR3, PCI_SUB_ID_SEDLBAUER, 0, 0, INF_SAPHIR3},
+          PCI_SUBVENDOR_HST_SAPHIR3, PCI_SUB_ID_SEDLBAUER, 0, 0, INF_SAPHIR3 },
-        { PCI_VENDOR_ID_ELSA, PCI_DEVICE_ID_ELSA_MICROLINK,
+        { PCI_VDEVICE(ELSA, PCI_DEVICE_ID_ELSA_MICROLINK), INF_QS1000 },
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_QS1000},
+        { PCI_VDEVICE(ELSA, PCI_DEVICE_ID_ELSA_QS3000), INF_QS3000 },
-        { PCI_VENDOR_ID_ELSA, PCI_DEVICE_ID_ELSA_QS3000,
+        { PCI_VDEVICE(SATSAGEM, PCI_DEVICE_ID_SATSAGEM_NICCY), INF_NICCY },
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_QS3000},
-        { PCI_VENDOR_ID_SATSAGEM, PCI_DEVICE_ID_SATSAGEM_NICCY,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_NICCY},
        { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
          PCI_VENDOR_ID_BERKOM, PCI_DEVICE_ID_BERKOM_SCITEL_QUADRO, 0, 0,
-          INF_SCT_1},
+          INF_SCT_1 },
-        { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_R685,
+        { PCI_VDEVICE(PLX, PCI_DEVICE_ID_PLX_R685), INF_GAZEL_R685 },
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_GAZEL_R685},
+        { PCI_VDEVICE(PLX, PCI_DEVICE_ID_PLX_R753), INF_GAZEL_R753 },
-        { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_R753,
+        { PCI_VDEVICE(PLX, PCI_DEVICE_ID_PLX_DJINN_ITOO), INF_GAZEL_R753 },
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_GAZEL_R753},
+        { PCI_VDEVICE(PLX, PCI_DEVICE_ID_PLX_OLITEC), INF_GAZEL_R753 },
-        { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_DJINN_ITOO,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_GAZEL_R753},
-        { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_OLITEC,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_GAZEL_R753},
        { }
 };
 MODULE_DEVICE_TABLE(pci, infineon_ids);
@@ -1150,7 +1139,7 @@ inf_remove(struct pci_dev *pdev)
        if (card)
                release_card(card);
        else
-                pr_debug("%s: drvdata allready removed\n", __func__);
+                pr_debug("%s: drvdata already removed\n", __func__);
 }
 static struct pci_driver infineon_driver = {
diff --git a/drivers/isdn/hardware/mISDN/speedfax.c b/drivers/isdn/hardware/mISDN/speedfax.c
index d097a4e40e2b..9e07246bb9e7 100644
--- a/drivers/isdn/hardware/mISDN/speedfax.c
+++ b/drivers/isdn/hardware/mISDN/speedfax.c
@@ -484,7 +484,7 @@ sfax_remove_pci(struct pci_dev *pdev)
        if (card)
                release_card(card);
        else
-                pr_debug("%s: drvdata allready removed\n", __func__);
+                pr_debug("%s: drvdata already removed\n", __func__);
 }
 static struct pci_device_id sfaxpci_ids[] __devinitdata = {
diff --git a/drivers/isdn/hardware/mISDN/w6692.c b/drivers/isdn/hardware/mISDN/w6692.c
index 31f9d71fb22f..9e84870b971c 100644
--- a/drivers/isdn/hardware/mISDN/w6692.c
+++ b/drivers/isdn/hardware/mISDN/w6692.c
@@ -1402,7 +1402,7 @@ w6692_remove_pci(struct pci_dev *pdev)
                release_card(card);
        else
                if (debug)
-                        pr_notice("%s: drvdata allready removed\n", __func__);
+                        pr_notice("%s: drvdata already removed\n", __func__);
 }
 static struct pci_device_id w6692_ids[] = {
diff --git a/drivers/isdn/hisax/callc.c b/drivers/isdn/hisax/callc.c
index f58ded8f403f..f150330b5a23 100644
--- a/drivers/isdn/hisax/callc.c
+++ b/drivers/isdn/hisax/callc.c
@@ -1172,7 +1172,7 @@ CallcFreeChan(struct IsdnCardState *csta)
                        kfree(csta->channel[i].b_st);
                        csta->channel[i].b_st = NULL;
                } else
-                        printk(KERN_WARNING "CallcFreeChan b_st ch%d allready freed\n", i);
+                        printk(KERN_WARNING "CallcFreeChan b_st ch%d already freed\n", i);
                if (i || test_bit(FLG_TWO_DCHAN, &csta->HW_Flags)) {
                        release_d_st(csta->channel + i);
                } else
diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c
index 544cf4b1cce3..6f9afcd5ca4e 100644
--- a/drivers/isdn/hisax/config.c
+++ b/drivers/isdn/hisax/config.c
@@ -1909,68 +1909,68 @@ static void EChannel_proc_rcv(struct hisax_d_if *d_if)
 static struct pci_device_id hisax_pci_tbl[] __devinitdata = {
 #ifdef CONFIG_HISAX_FRITZPCI
-        {PCI_VENDOR_ID_AVM,      PCI_DEVICE_ID_AVM_A1,           PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(AVM,      PCI_DEVICE_ID_AVM_A1)                    },
 #endif
 #ifdef CONFIG_HISAX_DIEHLDIVA
-        {PCI_VENDOR_ID_EICON,    PCI_DEVICE_ID_EICON_DIVA20,     PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(EICON,    PCI_DEVICE_ID_EICON_DIVA20)              },
-        {PCI_VENDOR_ID_EICON,    PCI_DEVICE_ID_EICON_DIVA20_U,   PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(EICON,    PCI_DEVICE_ID_EICON_DIVA20_U)    },
-        {PCI_VENDOR_ID_EICON,    PCI_DEVICE_ID_EICON_DIVA201,    PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(EICON,    PCI_DEVICE_ID_EICON_DIVA201)             },
-//#########################################################################################     
+/*##########################################################################*/
-        {PCI_VENDOR_ID_EICON,    PCI_DEVICE_ID_EICON_DIVA202,    PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(EICON,    PCI_DEVICE_ID_EICON_DIVA202)             },
-//#########################################################################################     
+/*##########################################################################*/
 #endif
 #ifdef CONFIG_HISAX_ELSA
-        {PCI_VENDOR_ID_ELSA,     PCI_DEVICE_ID_ELSA_MICROLINK,   PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(ELSA,     PCI_DEVICE_ID_ELSA_MICROLINK)    },
-        {PCI_VENDOR_ID_ELSA,     PCI_DEVICE_ID_ELSA_QS3000,      PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(ELSA,     PCI_DEVICE_ID_ELSA_QS3000)               },
 #endif
 #ifdef CONFIG_HISAX_GAZEL
-        {PCI_VENDOR_ID_PLX,      PCI_DEVICE_ID_PLX_R685,         PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(PLX,      PCI_DEVICE_ID_PLX_R685)                  },
-        {PCI_VENDOR_ID_PLX,      PCI_DEVICE_ID_PLX_R753,         PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(PLX,      PCI_DEVICE_ID_PLX_R753)                  },
-        {PCI_VENDOR_ID_PLX,      PCI_DEVICE_ID_PLX_DJINN_ITOO,   PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(PLX,      PCI_DEVICE_ID_PLX_DJINN_ITOO)    },
-        {PCI_VENDOR_ID_PLX,      PCI_DEVICE_ID_PLX_OLITEC,       PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(PLX,      PCI_DEVICE_ID_PLX_OLITEC)                },
 #endif
 #ifdef CONFIG_HISAX_SCT_QUADRO
-        {PCI_VENDOR_ID_PLX,      PCI_DEVICE_ID_PLX_9050,         PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(PLX,      PCI_DEVICE_ID_PLX_9050)                  },
 #endif
 #ifdef CONFIG_HISAX_NICCY
-        {PCI_VENDOR_ID_SATSAGEM, PCI_DEVICE_ID_SATSAGEM_NICCY,   PCI_ANY_ID,PCI_ANY_ID},
+        {PCI_VDEVICE(SATSAGEM, PCI_DEVICE_ID_SATSAGEM_NICCY)    },
 #endif
 #ifdef CONFIG_HISAX_SEDLBAUER
-        {PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_100,     PCI_ANY_ID,PCI_ANY_ID},
+        {PCI_VDEVICE(TIGERJET, PCI_DEVICE_ID_TIGERJET_100)              },
 #endif
 #if defined(CONFIG_HISAX_NETJET) || defined(CONFIG_HISAX_NETJET_U)
-        {PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_300,     PCI_ANY_ID,PCI_ANY_ID},
+        {PCI_VDEVICE(TIGERJET, PCI_DEVICE_ID_TIGERJET_300)              },
 #endif
 #if defined(CONFIG_HISAX_TELESPCI) || defined(CONFIG_HISAX_SCT_QUADRO)
-        {PCI_VENDOR_ID_ZORAN,    PCI_DEVICE_ID_ZORAN_36120,      PCI_ANY_ID,PCI_ANY_ID},
+        {PCI_VDEVICE(ZORAN,    PCI_DEVICE_ID_ZORAN_36120)               },
 #endif
 #ifdef CONFIG_HISAX_W6692
-        {PCI_VENDOR_ID_DYNALINK, PCI_DEVICE_ID_DYNALINK_IS64PH,  PCI_ANY_ID,PCI_ANY_ID},
+        {PCI_VDEVICE(DYNALINK, PCI_DEVICE_ID_DYNALINK_IS64PH)   },
-        {PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND2_6692,    PCI_ANY_ID,PCI_ANY_ID},
+        {PCI_VDEVICE(WINBOND2, PCI_DEVICE_ID_WINBOND2_6692)             },
 #endif
 #ifdef CONFIG_HISAX_HFC_PCI
-        {PCI_VENDOR_ID_CCD,      PCI_DEVICE_ID_CCD_2BD0,         PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(CCD,      PCI_DEVICE_ID_CCD_2BD0)                  },
-        {PCI_VENDOR_ID_CCD,      PCI_DEVICE_ID_CCD_B000,         PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(CCD,      PCI_DEVICE_ID_CCD_B000)                  },
-        {PCI_VENDOR_ID_CCD,      PCI_DEVICE_ID_CCD_B006,         PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(CCD,      PCI_DEVICE_ID_CCD_B006)                  },
-        {PCI_VENDOR_ID_CCD,      PCI_DEVICE_ID_CCD_B007,         PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(CCD,      PCI_DEVICE_ID_CCD_B007)                  },
-        {PCI_VENDOR_ID_CCD,      PCI_DEVICE_ID_CCD_B008,         PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(CCD,      PCI_DEVICE_ID_CCD_B008)                  },
-        {PCI_VENDOR_ID_CCD,      PCI_DEVICE_ID_CCD_B009,         PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(CCD,      PCI_DEVICE_ID_CCD_B009)                  },
-        {PCI_VENDOR_ID_CCD,      PCI_DEVICE_ID_CCD_B00A,         PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(CCD,      PCI_DEVICE_ID_CCD_B00A)                  },
-        {PCI_VENDOR_ID_CCD,      PCI_DEVICE_ID_CCD_B00B,         PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(CCD,      PCI_DEVICE_ID_CCD_B00B)                  },
-        {PCI_VENDOR_ID_CCD,      PCI_DEVICE_ID_CCD_B00C,         PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(CCD,      PCI_DEVICE_ID_CCD_B00C)                  },
-        {PCI_VENDOR_ID_CCD,      PCI_DEVICE_ID_CCD_B100,         PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(CCD,      PCI_DEVICE_ID_CCD_B100)                  },
-        {PCI_VENDOR_ID_CCD,      PCI_DEVICE_ID_CCD_B700,         PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(CCD,      PCI_DEVICE_ID_CCD_B700)                  },
-        {PCI_VENDOR_ID_CCD,      PCI_DEVICE_ID_CCD_B701,         PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(CCD,      PCI_DEVICE_ID_CCD_B701)                  },
-        {PCI_VENDOR_ID_ABOCOM,   PCI_DEVICE_ID_ABOCOM_2BD1,      PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(ABOCOM,   PCI_DEVICE_ID_ABOCOM_2BD1)               },
-        {PCI_VENDOR_ID_ASUSTEK,  PCI_DEVICE_ID_ASUSTEK_0675,     PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(ASUSTEK,  PCI_DEVICE_ID_ASUSTEK_0675)              },
-        {PCI_VENDOR_ID_BERKOM,   PCI_DEVICE_ID_BERKOM_T_CONCEPT, PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(BERKOM,   PCI_DEVICE_ID_BERKOM_T_CONCEPT)  },
-        {PCI_VENDOR_ID_BERKOM,   PCI_DEVICE_ID_BERKOM_A1T,       PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(BERKOM,   PCI_DEVICE_ID_BERKOM_A1T)                },
-        {PCI_VENDOR_ID_ANIGMA,   PCI_DEVICE_ID_ANIGMA_MC145575,  PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(ANIGMA,   PCI_DEVICE_ID_ANIGMA_MC145575)   },
-        {PCI_VENDOR_ID_ZOLTRIX,  PCI_DEVICE_ID_ZOLTRIX_2BD0,     PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(ZOLTRIX,  PCI_DEVICE_ID_ZOLTRIX_2BD0)              },
-        {PCI_VENDOR_ID_DIGI,     PCI_DEVICE_ID_DIGI_DF_M_IOM2_E, PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(DIGI,     PCI_DEVICE_ID_DIGI_DF_M_IOM2_E)  },
-        {PCI_VENDOR_ID_DIGI,     PCI_DEVICE_ID_DIGI_DF_M_E,      PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(DIGI,     PCI_DEVICE_ID_DIGI_DF_M_E)               },
-        {PCI_VENDOR_ID_DIGI,     PCI_DEVICE_ID_DIGI_DF_M_IOM2_A, PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(DIGI,     PCI_DEVICE_ID_DIGI_DF_M_IOM2_A)  },
-        {PCI_VENDOR_ID_DIGI,     PCI_DEVICE_ID_DIGI_DF_M_A,      PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VDEVICE(DIGI,     PCI_DEVICE_ID_DIGI_DF_M_A)               },
 #endif
        { }                             /* Terminating entry */
 };
diff --git a/drivers/isdn/hisax/q931.c b/drivers/isdn/hisax/q931.c
index 8b853d58e820..c0771f98fa11 100644
--- a/drivers/isdn/hisax/q931.c
+++ b/drivers/isdn/hisax/q931.c
@@ -1152,20 +1152,11 @@ QuickHex(char *txt, u_char * p, int cnt)
 {
        register int i;
        register char *t = txt;
-        register u_char w;
        for (i = 0; i < cnt; i++) {
                *t++ = ' ';
-                w = (p[i] >> 4) & 0x0f;
+                *t++ = hex_asc_hi(p[i]);
-                if (w < 10)
+                *t++ = hex_asc_lo(p[i]);
-                        *t++ = '0' + w;
-                else
-                        *t++ = 'A' - 10 + w;
-                w = p[i] & 0x0f;
-                if (w < 10)
-                        *t++ = '0' + w;
-                else
-                        *t++ = 'A' - 10 + w;
        }
        *t++ = 0;
        return (t - txt);
diff --git a/drivers/isdn/hisax/tei.c b/drivers/isdn/hisax/tei.c
index f4cb178b0666..842f9c9e875d 100644
--- a/drivers/isdn/hisax/tei.c
+++ b/drivers/isdn/hisax/tei.c
@@ -130,7 +130,7 @@ tei_id_request(struct FsmInst *fi, int event, void *arg)
        if (st->l2.tei != -1) {
                st->ma.tei_m.printdebug(&st->ma.tei_m,
-                        "assign request for allready asigned tei %d",
+                        "assign request for already asigned tei %d",
                        st->l2.tei);
                return;
        }
diff --git a/drivers/isdn/hysdn/hysdn_procconf.c b/drivers/isdn/hysdn/hysdn_procconf.c
index 80966462d6dc..96b3e39c3356 100644
--- a/drivers/isdn/hysdn/hysdn_procconf.c
+++ b/drivers/isdn/hysdn/hysdn_procconf.c
@@ -17,11 +17,12 @@
 #include <linux/proc_fs.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <net/net_namespace.h>
 #include "hysdn_defs.h"
+static DEFINE_MUTEX(hysdn_conf_mutex);
 static char *hysdn_procconf_revision = "$Revision: 1.8.6.4 $";
 #define INFO_OUT_LEN 80         /* length of info line including lf */
@@ -234,7 +235,7 @@ hysdn_conf_open(struct inode *ino, struct file *filep)
        char *cp, *tmp;
        /* now search the addressed card */
-        lock_kernel();
+        mutex_lock(&hysdn_conf_mutex);
        card = card_root;
        while (card) {
                pd = card->procconf;
@@ -243,7 +244,7 @@ hysdn_conf_open(struct inode *ino, struct file *filep)
                card = card->next;      /* search next entry */
        }
        if (!card) {
-                unlock_kernel();
+                mutex_unlock(&hysdn_conf_mutex);
                return (-ENODEV);       /* device is unknown/invalid */
        }
        if (card->debug_flags & (LOG_PROC_OPEN | LOG_PROC_ALL))
@@ -255,7 +256,7 @@ hysdn_conf_open(struct inode *ino, struct file *filep)
                /* write only access -> write boot file or conf line */
                if (!(cnf = kmalloc(sizeof(struct conf_writedata), GFP_KERNEL))) {
-                        unlock_kernel();
+                        mutex_unlock(&hysdn_conf_mutex);
                        return (-EFAULT);
                }
                cnf->card = card;
@@ -267,7 +268,7 @@ hysdn_conf_open(struct inode *ino, struct file *filep)
                /* read access -> output card info data */
                if (!(tmp = kmalloc(INFO_OUT_LEN * 2 + 2, GFP_KERNEL))) {
-                        unlock_kernel();
+                        mutex_unlock(&hysdn_conf_mutex);
                        return (-EFAULT);       /* out of memory */
                }
                filep->private_data = tmp;      /* start of string */
@@ -301,10 +302,10 @@ hysdn_conf_open(struct inode *ino, struct file *filep)
                *cp++ = '\n';
                *cp = 0;        /* end of string */
        } else {                /* simultaneous read/write access forbidden ! */
-                unlock_kernel();
+                mutex_unlock(&hysdn_conf_mutex);
                return (-EPERM);        /* no permission this time */
        }
-        unlock_kernel();
+        mutex_unlock(&hysdn_conf_mutex);
        return nonseekable_open(ino, filep);
 }                               /* hysdn_conf_open */
@@ -319,7 +320,7 @@ hysdn_conf_close(struct inode *ino, struct file *filep)
        int retval = 0;
        struct proc_dir_entry *pd;
-        lock_kernel();
+        mutex_lock(&hysdn_conf_mutex);
        /* search the addressed card */
        card = card_root;
        while (card) {
@@ -329,7 +330,7 @@ hysdn_conf_close(struct inode *ino, struct file *filep)
                card = card->next;      /* search next entry */
        }
        if (!card) {
-                unlock_kernel();
+                mutex_unlock(&hysdn_conf_mutex);
                return (-ENODEV);       /* device is unknown/invalid */
        }
        if (card->debug_flags & (LOG_PROC_OPEN | LOG_PROC_ALL))
@@ -352,7 +353,7 @@ hysdn_conf_close(struct inode *ino, struct file *filep)
                kfree(filep->private_data);     /* release memory */
        }
-        unlock_kernel();
+        mutex_unlock(&hysdn_conf_mutex);
        return (retval);
 }                               /* hysdn_conf_close */
diff --git a/drivers/isdn/hysdn/hysdn_proclog.c b/drivers/isdn/hysdn/hysdn_proclog.c
index e83f6fda32fe..2ee93d04b2dd 100644
--- a/drivers/isdn/hysdn/hysdn_proclog.c
+++ b/drivers/isdn/hysdn/hysdn_proclog.c
@@ -15,13 +15,15 @@
 #include <linux/proc_fs.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
+#include <linux/kernel.h>
 #include "hysdn_defs.h"
 /* the proc subdir for the interface is defined in the procconf module */
 extern struct proc_dir_entry *hysdn_proc_entry;
+static DEFINE_MUTEX(hysdn_log_mutex);
 static void put_log_buffer(hysdn_card * card, char *cp);
 /*************************************************/
@@ -154,10 +156,9 @@ static ssize_t
 hysdn_log_write(struct file *file, const char __user *buf, size_t count, loff_t * off)
 {
        unsigned long u = 0;
-        int found = 0;
+        int rc;
-        unsigned char *cp, valbuf[128];
+        unsigned char valbuf[128];
-        long base = 10;
+        hysdn_card *card = file->private_data;
-        hysdn_card *card = (hysdn_card *) file->private_data;
        if (count > (sizeof(valbuf) - 1))
                count = sizeof(valbuf) - 1;     /* limit length */
@@ -165,32 +166,10 @@ hysdn_log_write(struct file *file, const char __user *buf, size_t count, loff_t
                return (-EFAULT);       /* copy failed */
        valbuf[count] = 0;      /* terminating 0 */
-        cp = valbuf;
-        if ((count > 2) && (valbuf[0] == '0') && (valbuf[1] == 'x')) {
-                cp += 2;        /* pointer after hex modifier */
-                base = 16;
-        }
-        /* scan the input for debug flags */
-        while (*cp) {
-                if ((*cp >= '0') && (*cp <= '9')) {
-                        found = 1;
-                        u *= base;      /* adjust to next digit */
-                        u += *cp++ - '0';
-                        continue;
-                }
-                if (base != 16)
-                        break;  /* end of number */
-                if ((*cp >= 'a') && (*cp <= 'f')) {
-                        found = 1;
-                        u *= base;      /* adjust to next digit */
-                        u += *cp++ - 'a' + 10;
-                        continue;
-                }
-                break;          /* terminated */
-        }
-        if (found) {
+        rc = strict_strtoul(valbuf, 0, &u);
+        if (rc == 0) {
                card->debug_flags = u;  /* remember debug flags */
                hysdn_addlog(card, "debug set to 0x%lx", card->debug_flags);
        }
@@ -251,7 +230,7 @@ hysdn_log_open(struct inode *ino, struct file *filep)
        struct procdata *pd = NULL;
        unsigned long flags;
-        lock_kernel();
+        mutex_lock(&hysdn_log_mutex);
        card = card_root;
        while (card) {
                pd = card->proclog;
@@ -260,7 +239,7 @@ hysdn_log_open(struct inode *ino, struct file *filep)
                card = card->next;      /* search next entry */
        }
        if (!card) {
-                unlock_kernel();
+                mutex_unlock(&hysdn_log_mutex);
                return (-ENODEV);       /* device is unknown/invalid */
        }
        filep->private_data = card;     /* remember our own card */
@@ -278,10 +257,10 @@ hysdn_log_open(struct inode *ino, struct file *filep)
                        filep->private_data = &pd->log_head;
                spin_unlock_irqrestore(&card->hysdn_lock, flags);
        } else {                /* simultaneous read/write access forbidden ! */
-                unlock_kernel();
+                mutex_unlock(&hysdn_log_mutex);
                return (-EPERM);        /* no permission this time */
        }
-        unlock_kernel();
+        mutex_unlock(&hysdn_log_mutex);
        return nonseekable_open(ino, filep);
 }                               /* hysdn_log_open */
@@ -300,7 +279,7 @@ hysdn_log_close(struct inode *ino, struct file *filep)
        hysdn_card *card;
        int retval = 0;
-        lock_kernel();
+        mutex_lock(&hysdn_log_mutex);
        if ((filep->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_WRITE) {
                /* write only access -> write debug level written */
                retval = 0;     /* success */
@@ -339,7 +318,7 @@ hysdn_log_close(struct inode *ino, struct file *filep)
                                        kfree(inf);
                                }
        }                       /* read access */
-        unlock_kernel();
+        mutex_unlock(&hysdn_log_mutex);
        return (retval);
 }                               /* hysdn_log_close */
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index a44cdb492ea9..15632bd2f643 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -17,7 +17,7 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/isdn.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include "isdn_common.h"
 #include "isdn_tty.h"
 #include "isdn_net.h"
@@ -42,6 +42,7 @@ MODULE_LICENSE("GPL");
 isdn_dev *dev;
+static DEFINE_MUTEX(isdn_mutex);
 static char *isdn_revision = "$Revision: 1.1.2.3 $";
 extern char *isdn_net_revision;
@@ -1070,7 +1071,7 @@ isdn_read(struct file *file, char __user *buf, size_t count, loff_t * off)
        int retval;
        char *p;
-        lock_kernel();
+        mutex_lock(&isdn_mutex);
        if (minor == ISDN_MINOR_STATUS) {
                if (!file->private_data) {
                        if (file->f_flags & O_NONBLOCK) {
@@ -1163,7 +1164,7 @@ isdn_read(struct file *file, char __user *buf, size_t count, loff_t * off)
 #endif
        retval = -ENODEV;
 out:
-        unlock_kernel();
+        mutex_unlock(&isdn_mutex);
        return retval;
 }
@@ -1180,7 +1181,7 @@ isdn_write(struct file *file, const char __user *buf, size_t count, loff_t * off
        if (!dev->drivers)
                return -ENODEV;
-        lock_kernel();
+        mutex_lock(&isdn_mutex);
        if (minor <= ISDN_MINOR_BMAX) {
                printk(KERN_WARNING "isdn_write minor %d obsolete!\n", minor);
                drvidx = isdn_minor2drv(minor);
@@ -1225,7 +1226,7 @@ isdn_write(struct file *file, const char __user *buf, size_t count, loff_t * off
 #endif
        retval = -ENODEV;
 out:
-        unlock_kernel();
+        mutex_unlock(&isdn_mutex);
        return retval;
 }
@@ -1236,7 +1237,7 @@ isdn_poll(struct file *file, poll_table * wait)
        unsigned int minor = iminor(file->f_path.dentry->d_inode);
        int drvidx = isdn_minor2drv(minor - ISDN_MINOR_CTRL);
-        lock_kernel();
+        mutex_lock(&isdn_mutex);
        if (minor == ISDN_MINOR_STATUS) {
                poll_wait(file, &(dev->info_waitq), wait);
                /* mask = POLLOUT | POLLWRNORM; */
@@ -1266,7 +1267,7 @@ isdn_poll(struct file *file, poll_table * wait)
 #endif
        mask = POLLERR;
 out:
-        unlock_kernel();
+        mutex_unlock(&isdn_mutex);
        return mask;
 }
@@ -1727,9 +1728,9 @@ isdn_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
        int ret;
-        lock_kernel();
+        mutex_lock(&isdn_mutex);
        ret = isdn_ioctl(file, cmd, arg);
-        unlock_kernel();
+        mutex_unlock(&isdn_mutex);
        return ret;
 }
@@ -1745,7 +1746,7 @@ isdn_open(struct inode *ino, struct file *filep)
        int chidx;
        int retval = -ENODEV;
-        lock_kernel();
+        mutex_lock(&isdn_mutex);
        if (minor == ISDN_MINOR_STATUS) {
                infostruct *p;
@@ -1796,7 +1797,7 @@ isdn_open(struct inode *ino, struct file *filep)
 #endif
 out:
        nonseekable_open(ino, filep);
-        unlock_kernel();
+        mutex_unlock(&isdn_mutex);
        return retval;
 }
@@ -1805,7 +1806,7 @@ isdn_close(struct inode *ino, struct file *filep)
 {
        uint minor = iminor(ino);
-        lock_kernel();
+        mutex_lock(&isdn_mutex);
        if (minor == ISDN_MINOR_STATUS) {
                infostruct *p = dev->infochain;
                infostruct *q = NULL;
@@ -1839,7 +1840,7 @@ isdn_close(struct inode *ino, struct file *filep)
 #endif
 out:
-        unlock_kernel();
+        mutex_unlock(&isdn_mutex);
        return 0;
 }
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index 8c85d1e88cc6..26d44c3ca1d8 100644
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -2924,16 +2924,17 @@ isdn_net_getcfg(isdn_net_ioctl_cfg * cfg)
                cfg->dialtimeout = lp->dialtimeout >= 0 ? lp->dialtimeout / HZ : -1;
                cfg->dialwait = lp->dialwait / HZ;
                if (lp->slave) {
-                        if (strlen(lp->slave->name) > 8)
+                        if (strlen(lp->slave->name) >= 10)
                                strcpy(cfg->slave, "too-long");
                        else
                                strcpy(cfg->slave, lp->slave->name);
                } else
                        cfg->slave[0] = '\0';
                if (lp->master) {
-                        if (strlen(lp->master->name) > 8)
+                        if (strlen(lp->master->name) >= 10)
                                strcpy(cfg->master, "too-long");
-                        strcpy(cfg->master, lp->master->name);
+                        else
+                                strcpy(cfg->master, lp->master->name);
                } else
                        cfg->master[0] = '\0';
                return 0;
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index f37b8f68d0aa..fe824e0cbb25 100644
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -449,14 +449,9 @@ static int get_filter(void __user *arg, struct sock_filter **p)
        /* uprog.len is unsigned short, so no overflow here */
        len = uprog.len * sizeof(struct sock_filter);
-        code = kmalloc(len, GFP_KERNEL);
+        code = memdup_user(uprog.filter, len);
-        if (code == NULL)
+        if (IS_ERR(code))
-                return -ENOMEM;
+                return PTR_ERR(code);
-        if (copy_from_user(code, uprog.filter, len)) {
-                kfree(code);
-                return -EFAULT;
-        }
        err = sk_chk_filter(code, uprog.len);
        if (err) {
@@ -482,7 +477,7 @@ isdn_ppp_ioctl(int min, struct file *file, unsigned int cmd, unsigned long arg)
        struct isdn_ppp_comp_data data;
        void __user *argp = (void __user *)arg;
-        is = (struct ippp_struct *) file->private_data;
+        is = file->private_data;
        lp = is->lp;
        if (is->debug & 0x1)
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index fc8454d2eea5..51dc60da333b 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -2636,12 +2636,6 @@ isdn_tty_modem_result(int code, modem_info * info)
                if ((info->flags & ISDN_ASYNC_CLOSING) || (!info->tty)) {
                        return;
                }
-#ifdef CONFIG_ISDN_AUDIO
-                if ( !info->vonline )
-                        tty_ldisc_flush(info->tty);
-#else
-                tty_ldisc_flush(info->tty);
-#endif
                if ((info->flags & ISDN_ASYNC_CHECK_CD) &&
                    (!((info->flags & ISDN_ASYNC_CALLOUT_ACTIVE) &&
                       (info->flags & ISDN_ASYNC_CALLOUT_NOHUP)))) {
diff --git a/drivers/isdn/mISDN/tei.c b/drivers/isdn/mISDN/tei.c
index 34e898fe2f4f..1b85d9d27496 100644
--- a/drivers/isdn/mISDN/tei.c
+++ b/drivers/isdn/mISDN/tei.c
@@ -457,7 +457,7 @@ tei_id_request(struct FsmInst *fi, int event, void *arg)
        if (tm->l2->tei != GROUP_TEI) {
                tm->tei_m.printdebug(&tm->tei_m,
-                        "assign request for allready assigned tei %d",
+                        "assign request for already assigned tei %d",
                        tm->l2->tei);
                return;
        }
diff --git a/drivers/isdn/mISDN/timerdev.c b/drivers/isdn/mISDN/timerdev.c
index 81048b8ed8ad..de43c8c70ad0 100644
--- a/drivers/isdn/mISDN/timerdev.c
+++ b/drivers/isdn/mISDN/timerdev.c
@@ -24,9 +24,10 @@
 #include <linux/miscdevice.h>
 #include <linux/module.h>
 #include <linux/mISDNif.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include "core.h"
+static DEFINE_MUTEX(mISDN_mutex);
 static u_int    *debug;
@@ -224,7 +225,7 @@ mISDN_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
        if (*debug & DEBUG_TIMER)
                printk(KERN_DEBUG "%s(%p, %x, %lx)\n", __func__,
                    filep, cmd, arg);
-        lock_kernel();
+        mutex_lock(&mISDN_mutex);
        switch (cmd) {
        case IMADDTIMER:
                if (get_user(tout, (int __user *)arg)) {
@@ -256,7 +257,7 @@ mISDN_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
        default:
                ret = -EINVAL;
        }
-        unlock_kernel();
+        mutex_unlock(&mISDN_mutex);
        return ret;
 }
diff --git a/drivers/isdn/pcbit/drv.c b/drivers/isdn/pcbit/drv.c
index 123c1d6c43b4..1507d2e83fbb 100644
--- a/drivers/isdn/pcbit/drv.c
+++ b/drivers/isdn/pcbit/drv.c
@@ -411,14 +411,10 @@ static int pcbit_writecmd(const u_char __user *buf, int len, int driver, int cha
                        return -EINVAL;
                }
-                cbuf = kmalloc(len, GFP_KERNEL);
+                cbuf = memdup_user(buf, len);
-                if (!cbuf)
+                if (IS_ERR(cbuf))
-                        return -ENOMEM;
+                        return PTR_ERR(cbuf);
-                if (copy_from_user(cbuf, buf, len)) {
-                        kfree(cbuf);
-                        return -EFAULT;
-                }
                memcpy_toio(dev->sh_mem, cbuf, len);
                kfree(cbuf);
                return len;
diff --git a/drivers/isdn/sc/ioctl.c b/drivers/isdn/sc/ioctl.c
index 1081091bbfaf..43c5dc3516e5 100644
--- a/drivers/isdn/sc/ioctl.c
+++ b/drivers/isdn/sc/ioctl.c
@@ -215,19 +215,13 @@ int sc_ioctl(int card, scs_ioctl *data)
                pr_debug("%s: DCBIOSETSPID: ioctl received\n",
                                sc_adapter[card]->devicename);
-                spid = kmalloc(SCIOC_SPIDSIZE, GFP_KERNEL);
-                if(!spid) {
-                        kfree(rcvmsg);
-                        return -ENOMEM;
-                }
                /*
                 * Get the spid from user space
                 */
-                if (copy_from_user(spid, data->dataptr, SCIOC_SPIDSIZE)) {
+                spid = memdup_user(data->dataptr, SCIOC_SPIDSIZE);
+                if (IS_ERR(spid)) {
                        kfree(rcvmsg);
-                        kfree(spid);
+                        return PTR_ERR(spid);
-                        return -EFAULT;
                }
                pr_debug("%s: SCIOCSETSPID: setting channel %d spid to %s\n", 
@@ -296,18 +290,13 @@ int sc_ioctl(int card, scs_ioctl *data)
                pr_debug("%s: SCIOSETDN: ioctl received\n",
                                sc_adapter[card]->devicename);
-                dn = kmalloc(SCIOC_DNSIZE, GFP_KERNEL);
-                if (!dn) {
-                        kfree(rcvmsg);
-                        return -ENOMEM;
-                }
                /*
                 * Get the spid from user space
                 */
-                if (copy_from_user(dn, data->dataptr, SCIOC_DNSIZE)) {
+                dn = memdup_user(data->dataptr, SCIOC_DNSIZE);
+                if (IS_ERR(dn)) {
                        kfree(rcvmsg);
-                        kfree(dn);
+                        return PTR_ERR(dn);
-                        return -EFAULT;
                }
                pr_debug("%s: SCIOCSETDN: setting channel %d dn to %s\n", 
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 81bf25e67ce1..e4112622e5a2 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -302,6 +302,15 @@ config LEDS_MC13783
          This option enable support for on-chip LED drivers found
          on Freescale Semiconductor MC13783 PMIC.
+config LEDS_NS2
+        tristate "LED support for Network Space v2 GPIO LEDs"
+        depends on MACH_NETSPACE_V2 || MACH_INETSPACE_V2 || MACH_NETSPACE_MAX_V2
+        default y
+        help
+          This option enable support for the dual-GPIO LED found on the
+          Network Space v2 board (and parents). This include Internet Space v2,
+          Network Space (Max) v2 and d2 Network v2 boards.
 config LEDS_TRIGGERS
        bool "LED Trigger support"
        help
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index 2493de499374..7d6b95831f8e 100644
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -37,6 +37,7 @@ obj-$(CONFIG_LEDS_LT3593)		+= leds-lt3593.o
 obj-$(CONFIG_LEDS_ADP5520)              += leds-adp5520.o
 obj-$(CONFIG_LEDS_DELL_NETBOOKS)        += dell-led.o
 obj-$(CONFIG_LEDS_MC13783)              += leds-mc13783.o
+obj-$(CONFIG_LEDS_NS2)                  += leds-ns2.o
 # LED SPI Drivers
 obj-$(CONFIG_LEDS_DAC124S085)           += leds-dac124s085.o
diff --git a/drivers/leds/leds-ns2.c b/drivers/leds/leds-ns2.c
new file mode 100644
index 000000000000..74dce4ba0262
--- /dev/null
+++ b/drivers/leds/leds-ns2.c
@@ -0,0 +1,338 @@
+/*
+ * leds-ns2.c - Driver for the Network Space v2 (and parents) dual-GPIO LED
+ *
+ * Copyright (C) 2010 LaCie
+ *
+ * Author: Simon Guinot <sguinot@lacie.com>
+ *
+ * Based on leds-gpio.c by Raphael Assenat <raph@8d.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
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/gpio.h>
+#include <linux/leds.h>
+#include <mach/leds-ns2.h>
+/*
+ * The Network Space v2 dual-GPIO LED is wired to a CPLD and can blink in
+ * relation with the SATA activity. This capability is exposed through the
+ * "sata" sysfs attribute.
+ *
+ * The following array detail the different LED registers and the combination
+ * of their possible values:
+ *
+ *  cmd_led   |  slow_led  | /SATA active | LED state
+ *            |            |              |
+ *     1      |     0      |      x       |  off
+ *     -      |     1      |      x       |  on
+ *     0      |     0      |      1       |  on
+ *     0      |     0      |      0       |  blink (rate 300ms)
+ */
+enum ns2_led_modes {
+        NS_V2_LED_OFF,
+        NS_V2_LED_ON,
+        NS_V2_LED_SATA,
+};
+struct ns2_led_mode_value {
+        enum ns2_led_modes      mode;
+        int                     cmd_level;
+        int                     slow_level;
+};
+static struct ns2_led_mode_value ns2_led_modval[] = {
+        { NS_V2_LED_OFF , 1, 0 },
+        { NS_V2_LED_ON  , 0, 1 },
+        { NS_V2_LED_ON  , 1, 1 },
+        { NS_V2_LED_SATA, 0, 0 },
+};
+struct ns2_led_data {
+        struct led_classdev     cdev;
+        unsigned                cmd;
+        unsigned                slow;
+        unsigned char           sata; /* True when SATA mode active. */
+        rwlock_t                rw_lock; /* Lock GPIOs. */
+};
+static int ns2_led_get_mode(struct ns2_led_data *led_dat,
+                            enum ns2_led_modes *mode)
+{
+        int i;
+        int ret = -EINVAL;
+        int cmd_level;
+        int slow_level;
+        read_lock(&led_dat->rw_lock);
+        cmd_level = gpio_get_value(led_dat->cmd);
+        slow_level = gpio_get_value(led_dat->slow);
+        for (i = 0; i < ARRAY_SIZE(ns2_led_modval); i++) {
+                if (cmd_level == ns2_led_modval[i].cmd_level &&
+                    slow_level == ns2_led_modval[i].slow_level) {
+                        *mode = ns2_led_modval[i].mode;
+                        ret = 0;
+                        break;
+                }
+        }
+        read_unlock(&led_dat->rw_lock);
+        return ret;
+}
+static void ns2_led_set_mode(struct ns2_led_data *led_dat,
+                             enum ns2_led_modes mode)
+{
+        int i;
+        write_lock(&led_dat->rw_lock);
+        for (i = 0; i < ARRAY_SIZE(ns2_led_modval); i++) {
+                if (mode == ns2_led_modval[i].mode) {
+                        gpio_set_value(led_dat->cmd,
+                                       ns2_led_modval[i].cmd_level);
+                        gpio_set_value(led_dat->slow,
+                                       ns2_led_modval[i].slow_level);
+                }
+        }
+        write_unlock(&led_dat->rw_lock);
+}
+static void ns2_led_set(struct led_classdev *led_cdev,
+                        enum led_brightness value)
+{
+        struct ns2_led_data *led_dat =
+                container_of(led_cdev, struct ns2_led_data, cdev);
+        enum ns2_led_modes mode;
+        if (value == LED_OFF)
+                mode = NS_V2_LED_OFF;
+        else if (led_dat->sata)
+                mode = NS_V2_LED_SATA;
+        else
+                mode = NS_V2_LED_ON;
+        ns2_led_set_mode(led_dat, mode);
+}
+static ssize_t ns2_led_sata_store(struct device *dev,
+                                  struct device_attribute *attr,
+                                  const char *buff, size_t count)
+{
+        int ret;
+        unsigned long enable;
+        enum ns2_led_modes mode;
+        struct ns2_led_data *led_dat = dev_get_drvdata(dev);
+        ret = strict_strtoul(buff, 10, &enable);
+        if (ret < 0)
+                return ret;
+        enable = !!enable;
+        if (led_dat->sata == enable)
+                return count;
+        ret = ns2_led_get_mode(led_dat, &mode);
+        if (ret < 0)
+                return ret;
+        if (enable && mode == NS_V2_LED_ON)
+                ns2_led_set_mode(led_dat, NS_V2_LED_SATA);
+        if (!enable && mode == NS_V2_LED_SATA)
+                ns2_led_set_mode(led_dat, NS_V2_LED_ON);
+        led_dat->sata = enable;
+        return count;
+}
+static ssize_t ns2_led_sata_show(struct device *dev,
+                                 struct device_attribute *attr, char *buf)
+{
+        struct ns2_led_data *led_dat = dev_get_drvdata(dev);
+        return sprintf(buf, "%d\n", led_dat->sata);
+}
+static DEVICE_ATTR(sata, 0644, ns2_led_sata_show, ns2_led_sata_store);
+static int __devinit
+create_ns2_led(struct platform_device *pdev, struct ns2_led_data *led_dat,
+               const struct ns2_led *template)
+{
+        int ret;
+        enum ns2_led_modes mode;
+        ret = gpio_request(template->cmd, template->name);
+        if (ret == 0) {
+                ret = gpio_direction_output(template->cmd,
+                                            gpio_get_value(template->cmd));
+                if (ret)
+                        gpio_free(template->cmd);
+        }
+        if (ret) {
+                dev_err(&pdev->dev, "%s: failed to setup command GPIO\n",
+                        template->name);
+        }
+        ret = gpio_request(template->slow, template->name);
+        if (ret == 0) {
+                ret = gpio_direction_output(template->slow,
+                                            gpio_get_value(template->slow));
+                if (ret)
+                        gpio_free(template->slow);
+        }
+        if (ret) {
+                dev_err(&pdev->dev, "%s: failed to setup slow GPIO\n",
+                        template->name);
+                goto err_free_cmd;
+        }
+        rwlock_init(&led_dat->rw_lock);
+        led_dat->cdev.name = template->name;
+        led_dat->cdev.default_trigger = template->default_trigger;
+        led_dat->cdev.blink_set = NULL;
+        led_dat->cdev.brightness_set = ns2_led_set;
+        led_dat->cdev.flags |= LED_CORE_SUSPENDRESUME;
+        led_dat->cmd = template->cmd;
+        led_dat->slow = template->slow;
+        ret = ns2_led_get_mode(led_dat, &mode);
+        if (ret < 0)
+                goto err_free_slow;
+        /* Set LED initial state. */
+        led_dat->sata = (mode == NS_V2_LED_SATA) ? 1 : 0;
+        led_dat->cdev.brightness =
+                (mode == NS_V2_LED_OFF) ? LED_OFF : LED_FULL;
+        ret = led_classdev_register(&pdev->dev, &led_dat->cdev);
+        if (ret < 0)
+                goto err_free_slow;
+        dev_set_drvdata(led_dat->cdev.dev, led_dat);
+        ret = device_create_file(led_dat->cdev.dev, &dev_attr_sata);
+        if (ret < 0)
+                goto err_free_cdev;
+        return 0;
+err_free_cdev:
+        led_classdev_unregister(&led_dat->cdev);
+err_free_slow:
+        gpio_free(led_dat->slow);
+err_free_cmd:
+        gpio_free(led_dat->cmd);
+        return ret;
+}
+static void __devexit delete_ns2_led(struct ns2_led_data *led_dat)
+{
+        device_remove_file(led_dat->cdev.dev, &dev_attr_sata);
+        led_classdev_unregister(&led_dat->cdev);
+        gpio_free(led_dat->cmd);
+        gpio_free(led_dat->slow);
+}
+static int __devinit ns2_led_probe(struct platform_device *pdev)
+{
+        struct ns2_led_platform_data *pdata = pdev->dev.platform_data;
+        struct ns2_led_data *leds_data;
+        int i;
+        int ret;
+        if (!pdata)
+                return -EINVAL;
+        leds_data = kzalloc(sizeof(struct ns2_led_data) *
+                            pdata->num_leds, GFP_KERNEL);
+        if (!leds_data)
+                return -ENOMEM;
+        for (i = 0; i < pdata->num_leds; i++) {
+                ret = create_ns2_led(pdev, &leds_data[i], &pdata->leds[i]);
+                if (ret < 0)
+                        goto err;
+        }
+        platform_set_drvdata(pdev, leds_data);
+        return 0;
+err:
+        for (i = i - 1; i >= 0; i--)
+                delete_ns2_led(&leds_data[i]);
+        kfree(leds_data);
+        return ret;
+}
+static int __devexit ns2_led_remove(struct platform_device *pdev)
+{
+        int i;
+        struct ns2_led_platform_data *pdata = pdev->dev.platform_data;
+        struct ns2_led_data *leds_data;
+        leds_data = platform_get_drvdata(pdev);
+        for (i = 0; i < pdata->num_leds; i++)
+                delete_ns2_led(&leds_data[i]);
+        kfree(leds_data);
+        platform_set_drvdata(pdev, NULL);
+        return 0;
+}
+static struct platform_driver ns2_led_driver = {
+        .probe          = ns2_led_probe,
+        .remove         = __devexit_p(ns2_led_remove),
+        .driver         = {
+                .name   = "leds-ns2",
+                .owner  = THIS_MODULE,
+        },
+};
+MODULE_ALIAS("platform:leds-ns2");
+static int __init ns2_led_init(void)
+{
+        return platform_driver_register(&ns2_led_driver);
+}
+static void __exit ns2_led_exit(void)
+{
+        platform_driver_unregister(&ns2_led_driver);
+}
+module_init(ns2_led_init);
+module_exit(ns2_led_exit);
+MODULE_AUTHOR("Simon Guinot <sguinot@lacie.com>");
+MODULE_DESCRIPTION("Network Space v2 LED driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/macintosh/macio_sysfs.c b/drivers/macintosh/macio_sysfs.c
index 6999ce59fd10..6024038a5b9d 100644
--- a/drivers/macintosh/macio_sysfs.c
+++ b/drivers/macintosh/macio_sysfs.c
@@ -41,10 +41,7 @@ compatible_show (struct device *dev, struct device_attribute *attr, char *buf)
 static ssize_t modalias_show (struct device *dev, struct device_attribute *attr,
                              char *buf)
 {
-        struct of_device *ofdev = to_of_device(dev);
+        int len = of_device_get_modalias(dev, buf, PAGE_SIZE - 2);
-        int len;
-        len = of_device_get_modalias(ofdev, buf, PAGE_SIZE - 2);
        buf[len] = '\n';
        buf[len+1] = 0;
diff --git a/drivers/media/IR/Kconfig b/drivers/media/IR/Kconfig
index d22a8ec523fc..999a8250b3ce 100644
--- a/drivers/media/IR/Kconfig
+++ b/drivers/media/IR/Kconfig
@@ -8,6 +8,17 @@ config VIDEO_IR
        depends on IR_CORE
        default IR_CORE
+config LIRC
+        tristate
+        default y
+        ---help---
+           Enable this option to build the Linux Infrared Remote
+           Control (LIRC) core device interface driver. The LIRC
+           interface passes raw IR to and from userspace, where the
+           LIRC daemon handles protocol decoding for IR reception ann
+           encoding for IR transmitting (aka "blasting").
 source "drivers/media/IR/keymaps/Kconfig"
 config IR_NEC_DECODER
@@ -33,6 +44,7 @@ config IR_RC5_DECODER
 config IR_RC6_DECODER
        tristate "Enable IR raw decoder for the RC6 protocol"
        depends on IR_CORE
+        select BITREVERSE
        default y
        ---help---
@@ -42,6 +54,7 @@ config IR_RC6_DECODER
 config IR_JVC_DECODER
        tristate "Enable IR raw decoder for the JVC protocol"
        depends on IR_CORE
+        select BITREVERSE
        default y
        ---help---
@@ -57,6 +70,16 @@ config IR_SONY_DECODER
           Enable this option if you have an infrared remote control which
           uses the Sony protocol, and you need software decoding support.
+config IR_LIRC_CODEC
+        tristate "Enable IR to LIRC bridge"
+        depends on IR_CORE
+        depends on LIRC
+        default y
+        ---help---
+           Enable this option to pass raw IR to and from userspace via
+           the LIRC interface.
 config IR_IMON
        tristate "SoundGraph iMON Receiver and Display"
        depends on USB_ARCH_HAS_HCD
@@ -68,3 +91,15 @@ config IR_IMON
           To compile this driver as a module, choose M here: the
           module will be called imon.
+config IR_MCEUSB
+        tristate "Windows Media Center Ed. eHome Infrared Transceiver"
+        depends on USB_ARCH_HAS_HCD
+        depends on IR_CORE
+        select USB
+        ---help---
+           Say Y here if you want to use a Windows Media Center Edition
+           eHome Infrared Transceiver.
+           To compile this driver as a module, choose M here: the
+           module will be called mceusb.
diff --git a/drivers/media/IR/Makefile b/drivers/media/IR/Makefile
index b998fcced2e4..2ae4f3abfdbd 100644
--- a/drivers/media/IR/Makefile
+++ b/drivers/media/IR/Makefile
@@ -5,11 +5,14 @@ obj-y += keymaps/
 obj-$(CONFIG_IR_CORE) += ir-core.o
 obj-$(CONFIG_VIDEO_IR) += ir-common.o
+obj-$(CONFIG_LIRC) += lirc_dev.o
 obj-$(CONFIG_IR_NEC_DECODER) += ir-nec-decoder.o
 obj-$(CONFIG_IR_RC5_DECODER) += ir-rc5-decoder.o
 obj-$(CONFIG_IR_RC6_DECODER) += ir-rc6-decoder.o
 obj-$(CONFIG_IR_JVC_DECODER) += ir-jvc-decoder.o
 obj-$(CONFIG_IR_SONY_DECODER) += ir-sony-decoder.o
+obj-$(CONFIG_IR_LIRC_CODEC) += ir-lirc-codec.o
 # stand-alone IR receivers/transmitters
 obj-$(CONFIG_IR_IMON) += imon.o
+obj-$(CONFIG_IR_MCEUSB) += mceusb.o
diff --git a/drivers/media/IR/imon.c b/drivers/media/IR/imon.c
index 4bbd45f4284c..65c125e44e96 100644
--- a/drivers/media/IR/imon.c
+++ b/drivers/media/IR/imon.c
@@ -407,7 +407,7 @@ static int display_close(struct inode *inode, struct file *file)
        struct imon_context *ictx = NULL;
        int retval = 0;
-        ictx = (struct imon_context *)file->private_data;
+        ictx = file->private_data;
        if (!ictx) {
                err("%s: no context for device", __func__);
@@ -812,7 +812,7 @@ static ssize_t vfd_write(struct file *file, const char *buf,
        const unsigned char vfd_packet6[] = {
                0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF };
-        ictx = (struct imon_context *)file->private_data;
+        ictx = file->private_data;
        if (!ictx) {
                err("%s: no context for device", __func__);
                return -ENODEV;
@@ -896,7 +896,7 @@ static ssize_t lcd_write(struct file *file, const char *buf,
        int retval = 0;
        struct imon_context *ictx;
-        ictx = (struct imon_context *)file->private_data;
+        ictx = file->private_data;
        if (!ictx) {
                err("%s: no context for device", __func__);
                return -ENODEV;
@@ -1943,7 +1943,7 @@ static struct imon_context *imon_init_intf0(struct usb_interface *intf)
        return ictx;
 urb_submit_failed:
-        input_unregister_device(ictx->idev);
+        ir_input_unregister(ictx->idev);
        input_free_device(ictx->idev);
 idev_setup_failed:
 find_endpoint_failed:
@@ -2067,6 +2067,7 @@ static void imon_get_ffdc_type(struct imon_context *ictx)
                detected_display_type = IMON_DISPLAY_TYPE_VFD;
                break;
        /* iMON LCD, MCE IR */
+        case 0x9e:
        case 0x9f:
                dev_info(ictx->dev, "0xffdc iMON LCD, MCE IR");
                detected_display_type = IMON_DISPLAY_TYPE_LCD;
@@ -2306,7 +2307,7 @@ static void __devexit imon_disconnect(struct usb_interface *interface)
        if (ifnum == 0) {
                ictx->dev_present_intf0 = false;
                usb_kill_urb(ictx->rx_urb_intf0);
-                input_unregister_device(ictx->idev);
+                ir_input_unregister(ictx->idev);
                if (ictx->display_supported) {
                        if (ictx->display_type == IMON_DISPLAY_TYPE_LCD)
                                usb_deregister_dev(interface, &imon_lcd_class);
diff --git a/drivers/media/IR/ir-core-priv.h b/drivers/media/IR/ir-core-priv.h
index 9a5e65a471a5..babd52061bc3 100644
--- a/drivers/media/IR/ir-core-priv.h
+++ b/drivers/media/IR/ir-core-priv.h
@@ -22,17 +22,62 @@
 struct ir_raw_handler {
        struct list_head list;
+        u64 protocols; /* which are handled by this handler */
        int (*decode)(struct input_dev *input_dev, struct ir_raw_event event);
+        /* These two should only be used by the lirc decoder */
        int (*raw_register)(struct input_dev *input_dev);
        int (*raw_unregister)(struct input_dev *input_dev);
 };
 struct ir_raw_event_ctrl {
+        struct list_head                list;           /* to keep track of raw clients */
        struct work_struct              rx_work;        /* for the rx decoding workqueue */
        struct kfifo                    kfifo;          /* fifo for the pulse/space durations */
        ktime_t                         last_event;     /* when last event occurred */
        enum raw_event_type             last_type;      /* last event type */
        struct input_dev                *input_dev;     /* pointer to the parent input_dev */
+        u64                             enabled_protocols; /* enabled raw protocol decoders */
+        /* raw decoder state follows */
+        struct ir_raw_event prev_ev;
+        struct nec_dec {
+                int state;
+                unsigned count;
+                u32 bits;
+        } nec;
+        struct rc5_dec {
+                int state;
+                u32 bits;
+                unsigned count;
+                unsigned wanted_bits;
+        } rc5;
+        struct rc6_dec {
+                int state;
+                u8 header;
+                u32 body;
+                bool toggle;
+                unsigned count;
+                unsigned wanted_bits;
+        } rc6;
+        struct sony_dec {
+                int state;
+                u32 bits;
+                unsigned count;
+        } sony;
+        struct jvc_dec {
+                int state;
+                u16 bits;
+                u16 old_bits;
+                unsigned count;
+                bool first;
+                bool toggle;
+        } jvc;
+        struct lirc_codec {
+                struct ir_input_dev *ir_dev;
+                struct lirc_driver *drv;
+                int lircdata;
+        } lirc;
 };
 /* macros for IR decoders */
@@ -74,6 +119,7 @@ void ir_unregister_class(struct input_dev *input_dev);
 /*
 * Routines from ir-raw-event.c to be used internally and by decoders
 */
+u64 ir_raw_get_allowed_protocols(void);
 int ir_raw_event_register(struct input_dev *input_dev);
 void ir_raw_event_unregister(struct input_dev *input_dev);
 int ir_raw_handler_register(struct ir_raw_handler *ir_raw_handler);
@@ -123,4 +169,12 @@ void ir_raw_init(void);
 #define load_sony_decode()      0
 #endif
+/* from ir-lirc-codec.c */
+#ifdef CONFIG_IR_LIRC_CODEC_MODULE
+#define load_lirc_codec()       request_module("ir-lirc-codec")
+#else
+#define load_lirc_codec()       0
+#endif
 #endif /* _IR_RAW_EVENT */
diff --git a/drivers/media/IR/ir-jvc-decoder.c b/drivers/media/IR/ir-jvc-decoder.c
index 0b804944cbb0..8894d8b36048 100644
--- a/drivers/media/IR/ir-jvc-decoder.c
+++ b/drivers/media/IR/ir-jvc-decoder.c
@@ -25,10 +25,6 @@
 #define JVC_TRAILER_PULSE       (1  * JVC_UNIT)
 #define JVC_TRAILER_SPACE       (35 * JVC_UNIT)
-/* Used to register jvc_decoder clients */
-static LIST_HEAD(decoder_list);
-DEFINE_SPINLOCK(decoder_lock);
 enum jvc_state {
        STATE_INACTIVE,
        STATE_HEADER_SPACE,
@@ -38,87 +34,6 @@ enum jvc_state {
        STATE_TRAILER_SPACE,
 };
-struct decoder_data {
-        struct list_head        list;
-        struct ir_input_dev     *ir_dev;
-        int                     enabled:1;
-        /* State machine control */
-        enum jvc_state          state;
-        u16                     jvc_bits;
-        u16                     jvc_old_bits;
-        unsigned                count;
-        bool                    first;
-        bool                    toggle;
-};
-/**
- * get_decoder_data()   - gets decoder data
- * @input_dev:  input device
- *
- * Returns the struct decoder_data that corresponds to a device
- */
-static struct decoder_data *get_decoder_data(struct  ir_input_dev *ir_dev)
-{
-        struct decoder_data *data = NULL;
-        spin_lock(&decoder_lock);
-        list_for_each_entry(data, &decoder_list, list) {
-                if (data->ir_dev == ir_dev)
-                        break;
-        }
-        spin_unlock(&decoder_lock);
-        return data;
-}
-static ssize_t store_enabled(struct device *d,
-                             struct device_attribute *mattr,
-                             const char *buf,
-                             size_t len)
-{
-        unsigned long value;
-        struct ir_input_dev *ir_dev = dev_get_drvdata(d);
-        struct decoder_data *data = get_decoder_data(ir_dev);
-        if (!data)
-                return -EINVAL;
-        if (strict_strtoul(buf, 10, &value) || value > 1)
-                return -EINVAL;
-        data->enabled = value;
-        return len;
-}
-static ssize_t show_enabled(struct device *d,
-                             struct device_attribute *mattr, char *buf)
-{
-        struct ir_input_dev *ir_dev = dev_get_drvdata(d);
-        struct decoder_data *data = get_decoder_data(ir_dev);
-        if (!data)
-                return -EINVAL;
-        if (data->enabled)
-                return sprintf(buf, "1\n");
-        else
-        return sprintf(buf, "0\n");
-}
-static DEVICE_ATTR(enabled, S_IRUGO | S_IWUSR, show_enabled, store_enabled);
-static struct attribute *decoder_attributes[] = {
-        &dev_attr_enabled.attr,
-        NULL
-};
-static struct attribute_group decoder_attribute_group = {
-        .name   = "jvc_decoder",
-        .attrs  = decoder_attributes,
-};
 /**
 * ir_jvc_decode() - Decode one JVC pulse or space
 * @input_dev:  the struct input_dev descriptor of the device
@@ -128,14 +43,10 @@ static struct attribute_group decoder_attribute_group = {
 */
 static int ir_jvc_decode(struct input_dev *input_dev, struct ir_raw_event ev)
 {
-        struct decoder_data *data;
        struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
+        struct jvc_dec *data = &ir_dev->raw->jvc;
-        data = get_decoder_data(ir_dev);
+        if (!(ir_dev->raw->enabled_protocols & IR_TYPE_JVC))
-        if (!data)
-                return -EINVAL;
-        if (!data->enabled)
                return 0;
        if (IS_RESET(ev)) {
@@ -188,9 +99,9 @@ static int ir_jvc_decode(struct input_dev *input_dev, struct ir_raw_event ev)
                if (ev.pulse)
                        break;
-                data->jvc_bits <<= 1;
+                data->bits <<= 1;
                if (eq_margin(ev.duration, JVC_BIT_1_SPACE, JVC_UNIT / 2)) {
-                        data->jvc_bits |= 1;
+                        data->bits |= 1;
                        decrease_duration(&ev, JVC_BIT_1_SPACE);
                } else if (eq_margin(ev.duration, JVC_BIT_0_SPACE, JVC_UNIT / 2))
                        decrease_duration(&ev, JVC_BIT_0_SPACE);
@@ -223,13 +134,13 @@ static int ir_jvc_decode(struct input_dev *input_dev, struct ir_raw_event ev)
                if (data->first) {
                        u32 scancode;
-                        scancode = (bitrev8((data->jvc_bits >> 8) & 0xff) << 8) |
+                        scancode = (bitrev8((data->bits >> 8) & 0xff) << 8) |
-                                   (bitrev8((data->jvc_bits >> 0) & 0xff) << 0);
+                                   (bitrev8((data->bits >> 0) & 0xff) << 0);
                        IR_dprintk(1, "JVC scancode 0x%04x\n", scancode);
                        ir_keydown(input_dev, scancode, data->toggle);
                        data->first = false;
-                        data->jvc_old_bits = data->jvc_bits;
+                        data->old_bits = data->bits;
-                } else if (data->jvc_bits == data->jvc_old_bits) {
+                } else if (data->bits == data->old_bits) {
                        IR_dprintk(1, "JVC repeat\n");
                        ir_repeat(input_dev);
                } else {
@@ -249,54 +160,9 @@ out:
        return -EINVAL;
 }
-static int ir_jvc_register(struct input_dev *input_dev)
-{
-        struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
-        struct decoder_data *data;
-        int rc;
-        rc = sysfs_create_group(&ir_dev->dev.kobj, &decoder_attribute_group);
-        if (rc < 0)
-                return rc;
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
-        if (!data) {
-                sysfs_remove_group(&ir_dev->dev.kobj, &decoder_attribute_group);
-                return -ENOMEM;
-        }
-        data->ir_dev = ir_dev;
-        data->enabled = 1;
-        spin_lock(&decoder_lock);
-        list_add_tail(&data->list, &decoder_list);
-        spin_unlock(&decoder_lock);
-        return 0;
-}
-static int ir_jvc_unregister(struct input_dev *input_dev)
-{
-        struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
-        static struct decoder_data *data;
-        data = get_decoder_data(ir_dev);
-        if (!data)
-                return 0;
-        sysfs_remove_group(&ir_dev->dev.kobj, &decoder_attribute_group);
-        spin_lock(&decoder_lock);
-        list_del(&data->list);
-        spin_unlock(&decoder_lock);
-        return 0;
-}
 static struct ir_raw_handler jvc_handler = {
+        .protocols      = IR_TYPE_JVC,
        .decode         = ir_jvc_decode,
-        .raw_register   = ir_jvc_register,
-        .raw_unregister = ir_jvc_unregister,
 };
 static int __init ir_jvc_decode_init(void)
diff --git a/drivers/media/IR/ir-keytable.c b/drivers/media/IR/ir-keytable.c
index 94a8577e72eb..15a0f192d413 100644
--- a/drivers/media/IR/ir-keytable.c
+++ b/drivers/media/IR/ir-keytable.c
@@ -497,8 +497,9 @@ int __ir_input_register(struct input_dev *input_dev,
                                goto out_event;
                }
-        IR_dprintk(1, "Registered input device on %s for %s remote.\n",
+        IR_dprintk(1, "Registered input device on %s for %s remote%s.\n",
-                   driver_name, rc_tab->name);
+                   driver_name, rc_tab->name,
+                   ir_dev->props->driver_type == RC_DRIVER_IR_RAW ? " in raw mode" : "");
        return 0;
diff --git a/drivers/media/IR/ir-lirc-codec.c b/drivers/media/IR/ir-lirc-codec.c
new file mode 100644
index 000000000000..3ba482d96c4b
--- /dev/null
+++ b/drivers/media/IR/ir-lirc-codec.c
@@ -0,0 +1,278 @@
+/* ir-lirc-codec.c - ir-core to classic lirc interface bridge
+ *
+ * Copyright (C) 2010 by Jarod Wilson <jarod@redhat.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 version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+#include <linux/sched.h>
+#include <linux/wait.h>
+#include <media/lirc.h>
+#include <media/lirc_dev.h>
+#include <media/ir-core.h>
+#include "ir-core-priv.h"
+#define LIRCBUF_SIZE 256
+/**
+ * ir_lirc_decode() - Send raw IR data to lirc_dev to be relayed to the
+ *                    lircd userspace daemon for decoding.
+ * @input_dev:  the struct input_dev descriptor of the device
+ * @duration:   the struct ir_raw_event descriptor of the pulse/space
+ *
+ * This function returns -EINVAL if the lirc interfaces aren't wired up.
+ */
+static int ir_lirc_decode(struct input_dev *input_dev, struct ir_raw_event ev)
+{
+        struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
+        if (!(ir_dev->raw->enabled_protocols & IR_TYPE_LIRC))
+                return 0;
+        if (!ir_dev->raw->lirc.drv || !ir_dev->raw->lirc.drv->rbuf)
+                return -EINVAL;
+        IR_dprintk(2, "LIRC data transfer started (%uus %s)\n",
+                   TO_US(ev.duration), TO_STR(ev.pulse));
+        ir_dev->raw->lirc.lircdata += ev.duration / 1000;
+        if (ev.pulse)
+                ir_dev->raw->lirc.lircdata |= PULSE_BIT;
+        lirc_buffer_write(ir_dev->raw->lirc.drv->rbuf,
+                          (unsigned char *) &ir_dev->raw->lirc.lircdata);
+        wake_up(&ir_dev->raw->lirc.drv->rbuf->wait_poll);
+        ir_dev->raw->lirc.lircdata = 0;
+        return 0;
+}
+static ssize_t ir_lirc_transmit_ir(struct file *file, const char *buf,
+                                   size_t n, loff_t *ppos)
+{
+        struct lirc_codec *lirc;
+        struct ir_input_dev *ir_dev;
+        int *txbuf; /* buffer with values to transmit */
+        int ret = 0, count;
+        lirc = lirc_get_pdata(file);
+        if (!lirc)
+                return -EFAULT;
+        if (n % sizeof(int))
+                return -EINVAL;
+        count = n / sizeof(int);
+        if (count > LIRCBUF_SIZE || count % 2 == 0)
+                return -EINVAL;
+        txbuf = memdup_user(buf, n);
+        if (IS_ERR(txbuf))
+                return PTR_ERR(txbuf);
+        ir_dev = lirc->ir_dev;
+        if (!ir_dev) {
+                ret = -EFAULT;
+                goto out;
+        }
+        if (ir_dev->props && ir_dev->props->tx_ir)
+                ret = ir_dev->props->tx_ir(ir_dev->props->priv, txbuf, (u32)n);
+out:
+        kfree(txbuf);
+        return ret;
+}
+static long ir_lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
+{
+        struct lirc_codec *lirc;
+        struct ir_input_dev *ir_dev;
+        int ret = 0;
+        void *drv_data;
+        unsigned long val;
+        lirc = lirc_get_pdata(filep);
+        if (!lirc)
+                return -EFAULT;
+        ir_dev = lirc->ir_dev;
+        if (!ir_dev || !ir_dev->props || !ir_dev->props->priv)
+                return -EFAULT;
+        drv_data = ir_dev->props->priv;
+        switch (cmd) {
+        case LIRC_SET_TRANSMITTER_MASK:
+                ret = get_user(val, (unsigned long *)arg);
+                if (ret)
+                        return ret;
+                if (ir_dev->props && ir_dev->props->s_tx_mask)
+                        ret = ir_dev->props->s_tx_mask(drv_data, (u32)val);
+                else
+                        return -EINVAL;
+                break;
+        case LIRC_SET_SEND_CARRIER:
+                ret = get_user(val, (unsigned long *)arg);
+                if (ret)
+                        return ret;
+                if (ir_dev->props && ir_dev->props->s_tx_carrier)
+                        ir_dev->props->s_tx_carrier(drv_data, (u32)val);
+                else
+                        return -EINVAL;
+                break;
+        case LIRC_GET_SEND_MODE:
+                val = LIRC_CAN_SEND_PULSE & LIRC_CAN_SEND_MASK;
+                ret = put_user(val, (unsigned long *)arg);
+                break;
+        case LIRC_SET_SEND_MODE:
+                ret = get_user(val, (unsigned long *)arg);
+                if (ret)
+                        return ret;
+                if (val != (LIRC_MODE_PULSE & LIRC_CAN_SEND_MASK))
+                        return -EINVAL;
+                break;
+        default:
+                return lirc_dev_fop_ioctl(filep, cmd, arg);
+        }
+        return ret;
+}
+static int ir_lirc_open(void *data)
+{
+        return 0;
+}
+static void ir_lirc_close(void *data)
+{
+        return;
+}
+static struct file_operations lirc_fops = {
+        .owner          = THIS_MODULE,
+        .write          = ir_lirc_transmit_ir,
+        .unlocked_ioctl = ir_lirc_ioctl,
+        .read           = lirc_dev_fop_read,
+        .poll           = lirc_dev_fop_poll,
+        .open           = lirc_dev_fop_open,
+        .release        = lirc_dev_fop_close,
+};
+static int ir_lirc_register(struct input_dev *input_dev)
+{
+        struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
+        struct lirc_driver *drv;
+        struct lirc_buffer *rbuf;
+        int rc = -ENOMEM;
+        unsigned long features;
+        drv = kzalloc(sizeof(struct lirc_driver), GFP_KERNEL);
+        if (!drv)
+                return rc;
+        rbuf = kzalloc(sizeof(struct lirc_buffer), GFP_KERNEL);
+        if (!rbuf)
+                goto rbuf_alloc_failed;
+        rc = lirc_buffer_init(rbuf, sizeof(int), LIRCBUF_SIZE);
+        if (rc)
+                goto rbuf_init_failed;
+        features = LIRC_CAN_REC_MODE2;
+        if (ir_dev->props->tx_ir) {
+                features |= LIRC_CAN_SEND_PULSE;
+                if (ir_dev->props->s_tx_mask)
+                        features |= LIRC_CAN_SET_TRANSMITTER_MASK;
+                if (ir_dev->props->s_tx_carrier)
+                        features |= LIRC_CAN_SET_SEND_CARRIER;
+        }
+        snprintf(drv->name, sizeof(drv->name), "ir-lirc-codec (%s)",
+                 ir_dev->driver_name);
+        drv->minor = -1;
+        drv->features = features;
+        drv->data = &ir_dev->raw->lirc;
+        drv->rbuf = rbuf;
+        drv->set_use_inc = &ir_lirc_open;
+        drv->set_use_dec = &ir_lirc_close;
+        drv->code_length = sizeof(struct ir_raw_event) * 8;
+        drv->fops = &lirc_fops;
+        drv->dev = &ir_dev->dev;
+        drv->owner = THIS_MODULE;
+        drv->minor = lirc_register_driver(drv);
+        if (drv->minor < 0) {
+                rc = -ENODEV;
+                goto lirc_register_failed;
+        }
+        ir_dev->raw->lirc.drv = drv;
+        ir_dev->raw->lirc.ir_dev = ir_dev;
+        ir_dev->raw->lirc.lircdata = PULSE_MASK;
+        return 0;
+lirc_register_failed:
+rbuf_init_failed:
+        kfree(rbuf);
+rbuf_alloc_failed:
+        kfree(drv);
+        return rc;
+}
+static int ir_lirc_unregister(struct input_dev *input_dev)
+{
+        struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
+        struct lirc_codec *lirc = &ir_dev->raw->lirc;
+        lirc_unregister_driver(lirc->drv->minor);
+        lirc_buffer_free(lirc->drv->rbuf);
+        kfree(lirc->drv);
+        return 0;
+}
+static struct ir_raw_handler lirc_handler = {
+        .protocols      = IR_TYPE_LIRC,
+        .decode         = ir_lirc_decode,
+        .raw_register   = ir_lirc_register,
+        .raw_unregister = ir_lirc_unregister,
+};
+static int __init ir_lirc_codec_init(void)
+{
+        ir_raw_handler_register(&lirc_handler);
+        printk(KERN_INFO "IR LIRC bridge handler initialized\n");
+        return 0;
+}
+static void __exit ir_lirc_codec_exit(void)
+{
+        ir_raw_handler_unregister(&lirc_handler);
+}
+module_init(ir_lirc_codec_init);
+module_exit(ir_lirc_codec_exit);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Jarod Wilson <jarod@redhat.com>");
+MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com)");
+MODULE_DESCRIPTION("LIRC IR handler bridge");
diff --git a/drivers/media/IR/ir-nec-decoder.c b/drivers/media/IR/ir-nec-decoder.c
index ba79233112ef..52e0f378ae3d 100644
--- a/drivers/media/IR/ir-nec-decoder.c
+++ b/drivers/media/IR/ir-nec-decoder.c
@@ -27,10 +27,6 @@
 #define NEC_TRAILER_PULSE       (1  * NEC_UNIT)
 #define NEC_TRAILER_SPACE       (10 * NEC_UNIT) /* even longer in reality */
-/* Used to register nec_decoder clients */
-static LIST_HEAD(decoder_list);
-static DEFINE_SPINLOCK(decoder_lock);
 enum nec_state {
        STATE_INACTIVE,
        STATE_HEADER_SPACE,
@@ -40,84 +36,6 @@ enum nec_state {
        STATE_TRAILER_SPACE,
 };
-struct decoder_data {
-        struct list_head        list;
-        struct ir_input_dev     *ir_dev;
-        int                     enabled:1;
-        /* State machine control */
-        enum nec_state          state;
-        u32                     nec_bits;
-        unsigned                count;
-};
-/**
- * get_decoder_data()   - gets decoder data
- * @input_dev:  input device
- *
- * Returns the struct decoder_data that corresponds to a device
- */
-static struct decoder_data *get_decoder_data(struct  ir_input_dev *ir_dev)
-{
-        struct decoder_data *data = NULL;
-        spin_lock(&decoder_lock);
-        list_for_each_entry(data, &decoder_list, list) {
-                if (data->ir_dev == ir_dev)
-                        break;
-        }
-        spin_unlock(&decoder_lock);
-        return data;
-}
-static ssize_t store_enabled(struct device *d,
-                             struct device_attribute *mattr,
-                             const char *buf,
-                             size_t len)
-{
-        unsigned long value;
-        struct ir_input_dev *ir_dev = dev_get_drvdata(d);
-        struct decoder_data *data = get_decoder_data(ir_dev);
-        if (!data)
-                return -EINVAL;
-        if (strict_strtoul(buf, 10, &value) || value > 1)
-                return -EINVAL;
-        data->enabled = value;
-        return len;
-}
-static ssize_t show_enabled(struct device *d,
-                             struct device_attribute *mattr, char *buf)
-{
-        struct ir_input_dev *ir_dev = dev_get_drvdata(d);
-        struct decoder_data *data = get_decoder_data(ir_dev);
-        if (!data)
-                return -EINVAL;
-        if (data->enabled)
-                return sprintf(buf, "1\n");
-        else
-        return sprintf(buf, "0\n");
-}
-static DEVICE_ATTR(enabled, S_IRUGO | S_IWUSR, show_enabled, store_enabled);
-static struct attribute *decoder_attributes[] = {
-        &dev_attr_enabled.attr,
-        NULL
-};
-static struct attribute_group decoder_attribute_group = {
-        .name   = "nec_decoder",
-        .attrs  = decoder_attributes,
-};
 /**
 * ir_nec_decode() - Decode one NEC pulse or space
 * @input_dev:  the struct input_dev descriptor of the device
@@ -127,16 +45,12 @@ static struct attribute_group decoder_attribute_group = {
 */
 static int ir_nec_decode(struct input_dev *input_dev, struct ir_raw_event ev)
 {
-        struct decoder_data *data;
        struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
+        struct nec_dec *data = &ir_dev->raw->nec;
        u32 scancode;
        u8 address, not_address, command, not_command;
-        data = get_decoder_data(ir_dev);
+        if (!(ir_dev->raw->enabled_protocols & IR_TYPE_NEC))
-        if (!data)
-                return -EINVAL;
-        if (!data->enabled)
                return 0;
        if (IS_RESET(ev)) {
@@ -191,9 +105,9 @@ static int ir_nec_decode(struct input_dev *input_dev, struct ir_raw_event ev)
                if (ev.pulse)
                        break;
-                data->nec_bits <<= 1;
+                data->bits <<= 1;
                if (eq_margin(ev.duration, NEC_BIT_1_SPACE, NEC_UNIT / 2))
-                        data->nec_bits |= 1;
+                        data->bits |= 1;
                else if (!eq_margin(ev.duration, NEC_BIT_0_SPACE, NEC_UNIT / 2))
                        break;
                data->count++;
@@ -222,14 +136,14 @@ static int ir_nec_decode(struct input_dev *input_dev, struct ir_raw_event ev)
                if (!geq_margin(ev.duration, NEC_TRAILER_SPACE, NEC_UNIT / 2))
                        break;
-                address     = bitrev8((data->nec_bits >> 24) & 0xff);
+                address     = bitrev8((data->bits >> 24) & 0xff);
-                not_address = bitrev8((data->nec_bits >> 16) & 0xff);
+                not_address = bitrev8((data->bits >> 16) & 0xff);
-                command     = bitrev8((data->nec_bits >>  8) & 0xff);
+                command     = bitrev8((data->bits >>  8) & 0xff);
-                not_command = bitrev8((data->nec_bits >>  0) & 0xff);
+                not_command = bitrev8((data->bits >>  0) & 0xff);
                if ((command ^ not_command) != 0xff) {
                        IR_dprintk(1, "NEC checksum error: received 0x%08x\n",
-                                   data->nec_bits);
+                                   data->bits);
                        break;
                }
@@ -256,54 +170,9 @@ static int ir_nec_decode(struct input_dev *input_dev, struct ir_raw_event ev)
        return -EINVAL;
 }
-static int ir_nec_register(struct input_dev *input_dev)
-{
-        struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
-        struct decoder_data *data;
-        int rc;
-        rc = sysfs_create_group(&ir_dev->dev.kobj, &decoder_attribute_group);
-        if (rc < 0)
-                return rc;
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
-        if (!data) {
-                sysfs_remove_group(&ir_dev->dev.kobj, &decoder_attribute_group);
-                return -ENOMEM;
-        }
-        data->ir_dev = ir_dev;
-        data->enabled = 1;
-        spin_lock(&decoder_lock);
-        list_add_tail(&data->list, &decoder_list);
-        spin_unlock(&decoder_lock);
-        return 0;
-}
-static int ir_nec_unregister(struct input_dev *input_dev)
-{
-        struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
-        static struct decoder_data *data;
-        data = get_decoder_data(ir_dev);
-        if (!data)
-                return 0;
-        sysfs_remove_group(&ir_dev->dev.kobj, &decoder_attribute_group);
-        spin_lock(&decoder_lock);
-        list_del(&data->list);
-        spin_unlock(&decoder_lock);
-        return 0;
-}
 static struct ir_raw_handler nec_handler = {
+        .protocols      = IR_TYPE_NEC,
        .decode         = ir_nec_decode,
-        .raw_register   = ir_nec_register,
-        .raw_unregister = ir_nec_unregister,
 };
 static int __init ir_nec_decode_init(void)
diff --git a/drivers/media/IR/ir-raw-event.c b/drivers/media/IR/ir-raw-event.c
index ea68a3f2effa..6f192ef31db1 100644
--- a/drivers/media/IR/ir-raw-event.c
+++ b/drivers/media/IR/ir-raw-event.c
@@ -20,35 +20,13 @@
 /* Define the max number of pulse/space transitions to buffer */
 #define MAX_IR_EVENT_SIZE      512
+/* Used to keep track of IR raw clients, protected by ir_raw_handler_lock */
+static LIST_HEAD(ir_raw_client_list);
 /* Used to handle IR raw handler extensions */
-static LIST_HEAD(ir_raw_handler_list);
 static DEFINE_SPINLOCK(ir_raw_handler_lock);
+static LIST_HEAD(ir_raw_handler_list);
-/**
+static u64 available_protocols;
- * RUN_DECODER()        - runs an operation on all IR decoders
- * @ops:        IR raw handler operation to be called
- * @arg:        arguments to be passed to the callback
- *
- * Calls ir_raw_handler::ops for all registered IR handlers. It prevents
- * new decode addition/removal while running, by locking ir_raw_handler_lock
- * mutex. If an error occurs, it stops the ops. Otherwise, it returns a sum
- * of the return codes.
- */
-#define RUN_DECODER(ops, ...) ({                                            \
-        struct ir_raw_handler           *_ir_raw_handler;                   \
-        int _sumrc = 0, _rc;                                                \
-        spin_lock(&ir_raw_handler_lock);                                    \
-        list_for_each_entry(_ir_raw_handler, &ir_raw_handler_list, list) {  \
-                if (_ir_raw_handler->ops) {                                 \
-                        _rc = _ir_raw_handler->ops(__VA_ARGS__);            \
-                        if (_rc < 0)                                        \
-                                break;                                      \
-                        _sumrc += _rc;                                      \
-                }                                                           \
-        }                                                                   \
-        spin_unlock(&ir_raw_handler_lock);                                  \
-        _sumrc;                                                             \
-})
 #ifdef MODULE
 /* Used to load the decoders */
@@ -58,57 +36,17 @@ static struct work_struct wq_load;
 static void ir_raw_event_work(struct work_struct *work)
 {
        struct ir_raw_event ev;
+        struct ir_raw_handler *handler;
        struct ir_raw_event_ctrl *raw =
                container_of(work, struct ir_raw_event_ctrl, rx_work);
-        while (kfifo_out(&raw->kfifo, &ev, sizeof(ev)) == sizeof(ev))
+        while (kfifo_out(&raw->kfifo, &ev, sizeof(ev)) == sizeof(ev)) {
-                RUN_DECODER(decode, raw->input_dev, ev);
+                spin_lock(&ir_raw_handler_lock);
-}
+                list_for_each_entry(handler, &ir_raw_handler_list, list)
+                        handler->decode(raw->input_dev, ev);
-int ir_raw_event_register(struct input_dev *input_dev)
+                spin_unlock(&ir_raw_handler_lock);
-{
+                raw->prev_ev = ev;
-        struct ir_input_dev *ir = input_get_drvdata(input_dev);
-        int rc;
-        ir->raw = kzalloc(sizeof(*ir->raw), GFP_KERNEL);
-        if (!ir->raw)
-                return -ENOMEM;
-        ir->raw->input_dev = input_dev;
-        INIT_WORK(&ir->raw->rx_work, ir_raw_event_work);
-        rc = kfifo_alloc(&ir->raw->kfifo, sizeof(s64) * MAX_IR_EVENT_SIZE,
-                         GFP_KERNEL);
-        if (rc < 0) {
-                kfree(ir->raw);
-                ir->raw = NULL;
-                return rc;
-        }
-        rc = RUN_DECODER(raw_register, input_dev);
-        if (rc < 0) {
-                kfifo_free(&ir->raw->kfifo);
-                kfree(ir->raw);
-                ir->raw = NULL;
-                return rc;
        }
-        return rc;
-}
-void ir_raw_event_unregister(struct input_dev *input_dev)
-{
-        struct ir_input_dev *ir = input_get_drvdata(input_dev);
-        if (!ir->raw)
-                return;
-        cancel_work_sync(&ir->raw->rx_work);
-        RUN_DECODER(raw_unregister, input_dev);
-        kfifo_free(&ir->raw->kfifo);
-        kfree(ir->raw);
-        ir->raw = NULL;
 }
 /**
@@ -204,23 +142,103 @@ void ir_raw_event_handle(struct input_dev *input_dev)
 }
 EXPORT_SYMBOL_GPL(ir_raw_event_handle);
+/* used internally by the sysfs interface */
+u64
+ir_raw_get_allowed_protocols()
+{
+        u64 protocols;
+        spin_lock(&ir_raw_handler_lock);
+        protocols = available_protocols;
+        spin_unlock(&ir_raw_handler_lock);
+        return protocols;
+}
+/*
+ * Used to (un)register raw event clients
+ */
+int ir_raw_event_register(struct input_dev *input_dev)
+{
+        struct ir_input_dev *ir = input_get_drvdata(input_dev);
+        int rc;
+        struct ir_raw_handler *handler;
+        ir->raw = kzalloc(sizeof(*ir->raw), GFP_KERNEL);
+        if (!ir->raw)
+                return -ENOMEM;
+        ir->raw->input_dev = input_dev;
+        INIT_WORK(&ir->raw->rx_work, ir_raw_event_work);
+        ir->raw->enabled_protocols = ~0;
+        rc = kfifo_alloc(&ir->raw->kfifo, sizeof(s64) * MAX_IR_EVENT_SIZE,
+                         GFP_KERNEL);
+        if (rc < 0) {
+                kfree(ir->raw);
+                ir->raw = NULL;
+                return rc;
+        }
+        spin_lock(&ir_raw_handler_lock);
+        list_add_tail(&ir->raw->list, &ir_raw_client_list);
+        list_for_each_entry(handler, &ir_raw_handler_list, list)
+                if (handler->raw_register)
+                        handler->raw_register(ir->raw->input_dev);
+        spin_unlock(&ir_raw_handler_lock);
+        return 0;
+}
+void ir_raw_event_unregister(struct input_dev *input_dev)
+{
+        struct ir_input_dev *ir = input_get_drvdata(input_dev);
+        struct ir_raw_handler *handler;
+        if (!ir->raw)
+                return;
+        cancel_work_sync(&ir->raw->rx_work);
+        spin_lock(&ir_raw_handler_lock);
+        list_del(&ir->raw->list);
+        list_for_each_entry(handler, &ir_raw_handler_list, list)
+                if (handler->raw_unregister)
+                        handler->raw_unregister(ir->raw->input_dev);
+        spin_unlock(&ir_raw_handler_lock);
+        kfifo_free(&ir->raw->kfifo);
+        kfree(ir->raw);
+        ir->raw = NULL;
+}
 /*
 * Extension interface - used to register the IR decoders
 */
 int ir_raw_handler_register(struct ir_raw_handler *ir_raw_handler)
 {
+        struct ir_raw_event_ctrl *raw;
        spin_lock(&ir_raw_handler_lock);
        list_add_tail(&ir_raw_handler->list, &ir_raw_handler_list);
+        if (ir_raw_handler->raw_register)
+                list_for_each_entry(raw, &ir_raw_client_list, list)
+                        ir_raw_handler->raw_register(raw->input_dev);
+        available_protocols |= ir_raw_handler->protocols;
        spin_unlock(&ir_raw_handler_lock);
        return 0;
 }
 EXPORT_SYMBOL(ir_raw_handler_register);
 void ir_raw_handler_unregister(struct ir_raw_handler *ir_raw_handler)
 {
+        struct ir_raw_event_ctrl *raw;
        spin_lock(&ir_raw_handler_lock);
        list_del(&ir_raw_handler->list);
+        if (ir_raw_handler->raw_unregister)
+                list_for_each_entry(raw, &ir_raw_client_list, list)
+                        ir_raw_handler->raw_unregister(raw->input_dev);
+        available_protocols &= ~ir_raw_handler->protocols;
        spin_unlock(&ir_raw_handler_lock);
 }
 EXPORT_SYMBOL(ir_raw_handler_unregister);
@@ -235,6 +253,7 @@ static void init_decoders(struct work_struct *work)
        load_rc6_decode();
        load_jvc_decode();
        load_sony_decode();
+        load_lirc_codec();
        /* If needed, we may later add some init code. In this case,
           it is needed to change the CONFIG_MODULE test at ir-core.h
diff --git a/drivers/media/IR/ir-rc5-decoder.c b/drivers/media/IR/ir-rc5-decoder.c
index 23cdb1b1a3bc..df4770d978ad 100644
--- a/drivers/media/IR/ir-rc5-decoder.c
+++ b/drivers/media/IR/ir-rc5-decoder.c
@@ -30,10 +30,6 @@
 #define RC5_BIT_END             (1 * RC5_UNIT)
 #define RC5X_SPACE              (4 * RC5_UNIT)
-/* Used to register rc5_decoder clients */
-static LIST_HEAD(decoder_list);
-static DEFINE_SPINLOCK(decoder_lock);
 enum rc5_state {
        STATE_INACTIVE,
        STATE_BIT_START,
@@ -42,87 +38,6 @@ enum rc5_state {
        STATE_FINISHED,
 };
-struct decoder_data {
-        struct list_head        list;
-        struct ir_input_dev     *ir_dev;
-        int                     enabled:1;
-        /* State machine control */
-        enum rc5_state          state;
-        u32                     rc5_bits;
-        struct ir_raw_event     prev_ev;
-        unsigned                count;
-        unsigned                wanted_bits;
-};
-/**
- * get_decoder_data()   - gets decoder data
- * @input_dev:  input device
- *
- * Returns the struct decoder_data that corresponds to a device
- */
-static struct decoder_data *get_decoder_data(struct  ir_input_dev *ir_dev)
-{
-        struct decoder_data *data = NULL;
-        spin_lock(&decoder_lock);
-        list_for_each_entry(data, &decoder_list, list) {
-                if (data->ir_dev == ir_dev)
-                        break;
-        }
-        spin_unlock(&decoder_lock);
-        return data;
-}
-static ssize_t store_enabled(struct device *d,
-                             struct device_attribute *mattr,
-                             const char *buf,
-                             size_t len)
-{
-        unsigned long value;
-        struct ir_input_dev *ir_dev = dev_get_drvdata(d);
-        struct decoder_data *data = get_decoder_data(ir_dev);
-        if (!data)
-                return -EINVAL;
-        if (strict_strtoul(buf, 10, &value) || value > 1)
-                return -EINVAL;
-        data->enabled = value;
-        return len;
-}
-static ssize_t show_enabled(struct device *d,
-                             struct device_attribute *mattr, char *buf)
-{
-        struct ir_input_dev *ir_dev = dev_get_drvdata(d);
-        struct decoder_data *data = get_decoder_data(ir_dev);
-        if (!data)
-                return -EINVAL;
-        if (data->enabled)
-                return sprintf(buf, "1\n");
-        else
-        return sprintf(buf, "0\n");
-}
-static DEVICE_ATTR(enabled, S_IRUGO | S_IWUSR, show_enabled, store_enabled);
-static struct attribute *decoder_attributes[] = {
-        &dev_attr_enabled.attr,
-        NULL
-};
-static struct attribute_group decoder_attribute_group = {
-        .name   = "rc5_decoder",
-        .attrs  = decoder_attributes,
-};
 /**
 * ir_rc5_decode() - Decode one RC-5 pulse or space
 * @input_dev:  the struct input_dev descriptor of the device
@@ -132,17 +47,13 @@ static struct attribute_group decoder_attribute_group = {
 */
 static int ir_rc5_decode(struct input_dev *input_dev, struct ir_raw_event ev)
 {
-        struct decoder_data *data;
        struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
+        struct rc5_dec *data = &ir_dev->raw->rc5;
        u8 toggle;
        u32 scancode;
-        data = get_decoder_data(ir_dev);
+        if (!(ir_dev->raw->enabled_protocols & IR_TYPE_RC5))
-        if (!data)
+                return 0;
-                return -EINVAL;
-        if (!data->enabled)
-                return 0;
        if (IS_RESET(ev)) {
                data->state = STATE_INACTIVE;
@@ -176,16 +87,15 @@ again:
                if (!eq_margin(ev.duration, RC5_BIT_START, RC5_UNIT / 2))
                        break;
-                data->rc5_bits <<= 1;
+                data->bits <<= 1;
                if (!ev.pulse)
-                        data->rc5_bits |= 1;
+                        data->bits |= 1;
                data->count++;
-                data->prev_ev = ev;
                data->state = STATE_BIT_END;
                return 0;
        case STATE_BIT_END:
-                if (!is_transition(&ev, &data->prev_ev))
+                if (!is_transition(&ev, &ir_dev->raw->prev_ev))
                        break;
                if (data->count == data->wanted_bits)
@@ -217,11 +127,11 @@ again:
                if (data->wanted_bits == RC5X_NBITS) {
                        /* RC5X */
                        u8 xdata, command, system;
-                        xdata    = (data->rc5_bits & 0x0003F) >> 0;
+                        xdata    = (data->bits & 0x0003F) >> 0;
-                        command  = (data->rc5_bits & 0x00FC0) >> 6;
+                        command  = (data->bits & 0x00FC0) >> 6;
-                        system   = (data->rc5_bits & 0x1F000) >> 12;
+                        system   = (data->bits & 0x1F000) >> 12;
-                        toggle   = (data->rc5_bits & 0x20000) ? 1 : 0;
+                        toggle   = (data->bits & 0x20000) ? 1 : 0;
-                        command += (data->rc5_bits & 0x01000) ? 0 : 0x40;
+                        command += (data->bits & 0x01000) ? 0 : 0x40;
                        scancode = system << 16 | command << 8 | xdata;
                        IR_dprintk(1, "RC5X scancode 0x%06x (toggle: %u)\n",
@@ -230,10 +140,10 @@ again:
                } else {
                        /* RC5 */
                        u8 command, system;
-                        command  = (data->rc5_bits & 0x0003F) >> 0;
+                        command  = (data->bits & 0x0003F) >> 0;
-                        system   = (data->rc5_bits & 0x007C0) >> 6;
+                        system   = (data->bits & 0x007C0) >> 6;
-                        toggle   = (data->rc5_bits & 0x00800) ? 1 : 0;
+                        toggle   = (data->bits & 0x00800) ? 1 : 0;
-                        command += (data->rc5_bits & 0x01000) ? 0 : 0x40;
+                        command += (data->bits & 0x01000) ? 0 : 0x40;
                        scancode = system << 8 | command;
                        IR_dprintk(1, "RC5 scancode 0x%04x (toggle: %u)\n",
@@ -252,54 +162,9 @@ out:
        return -EINVAL;
 }
-static int ir_rc5_register(struct input_dev *input_dev)
-{
-        struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
-        struct decoder_data *data;
-        int rc;
-        rc = sysfs_create_group(&ir_dev->dev.kobj, &decoder_attribute_group);
-        if (rc < 0)
-                return rc;
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
-        if (!data) {
-                sysfs_remove_group(&ir_dev->dev.kobj, &decoder_attribute_group);
-                return -ENOMEM;
-        }
-        data->ir_dev = ir_dev;
-        data->enabled = 1;
-        spin_lock(&decoder_lock);
-        list_add_tail(&data->list, &decoder_list);
-        spin_unlock(&decoder_lock);
-        return 0;
-}
-static int ir_rc5_unregister(struct input_dev *input_dev)
-{
-        struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
-        static struct decoder_data *data;
-        data = get_decoder_data(ir_dev);
-        if (!data)
-                return 0;
-        sysfs_remove_group(&ir_dev->dev.kobj, &decoder_attribute_group);
-        spin_lock(&decoder_lock);
-        list_del(&data->list);
-        spin_unlock(&decoder_lock);
-        return 0;
-}
 static struct ir_raw_handler rc5_handler = {
+        .protocols      = IR_TYPE_RC5,
        .decode         = ir_rc5_decode,
-        .raw_register   = ir_rc5_register,
-        .raw_unregister = ir_rc5_unregister,
 };
 static int __init ir_rc5_decode_init(void)
diff --git a/drivers/media/IR/ir-rc6-decoder.c b/drivers/media/IR/ir-rc6-decoder.c
index 2bf479f4f1bc..f1624b8279bc 100644
--- a/drivers/media/IR/ir-rc6-decoder.c
+++ b/drivers/media/IR/ir-rc6-decoder.c
@@ -36,10 +36,6 @@
 #define RC6_STARTBIT_MASK       0x08    /* for the header bits */
 #define RC6_6A_MCE_TOGGLE_MASK  0x8000  /* for the body bits */
-/* Used to register rc6_decoder clients */
-static LIST_HEAD(decoder_list);
-static DEFINE_SPINLOCK(decoder_lock);
 enum rc6_mode {
        RC6_MODE_0,
        RC6_MODE_6A,
@@ -58,89 +54,8 @@ enum rc6_state {
        STATE_FINISHED,
 };
-struct decoder_data {
+static enum rc6_mode rc6_mode(struct rc6_dec *data)
-        struct list_head        list;
-        struct ir_input_dev     *ir_dev;
-        int                     enabled:1;
-        /* State machine control */
-        enum rc6_state          state;
-        u8                      header;
-        u32                     body;
-        struct ir_raw_event     prev_ev;
-        bool                    toggle;
-        unsigned                count;
-        unsigned                wanted_bits;
-};
-/**
- * get_decoder_data()   - gets decoder data
- * @input_dev:  input device
- *
- * Returns the struct decoder_data that corresponds to a device
- */
-static struct decoder_data *get_decoder_data(struct  ir_input_dev *ir_dev)
-{
-        struct decoder_data *data = NULL;
-        spin_lock(&decoder_lock);
-        list_for_each_entry(data, &decoder_list, list) {
-                if (data->ir_dev == ir_dev)
-                        break;
-        }
-        spin_unlock(&decoder_lock);
-        return data;
-}
-static ssize_t store_enabled(struct device *d,
-                             struct device_attribute *mattr,
-                             const char *buf,
-                             size_t len)
 {
-        unsigned long value;
-        struct ir_input_dev *ir_dev = dev_get_drvdata(d);
-        struct decoder_data *data = get_decoder_data(ir_dev);
-        if (!data)
-                return -EINVAL;
-        if (strict_strtoul(buf, 10, &value) || value > 1)
-                return -EINVAL;
-        data->enabled = value;
-        return len;
-}
-static ssize_t show_enabled(struct device *d,
-                             struct device_attribute *mattr, char *buf)
-{
-        struct ir_input_dev *ir_dev = dev_get_drvdata(d);
-        struct decoder_data *data = get_decoder_data(ir_dev);
-        if (!data)
-                return -EINVAL;
-        if (data->enabled)
-                return sprintf(buf, "1\n");
-        else
-        return sprintf(buf, "0\n");
-}
-static DEVICE_ATTR(enabled, S_IRUGO | S_IWUSR, show_enabled, store_enabled);
-static struct attribute *decoder_attributes[] = {
-        &dev_attr_enabled.attr,
-        NULL
-};
-static struct attribute_group decoder_attribute_group = {
-        .name   = "rc6_decoder",
-        .attrs  = decoder_attributes,
-};
-static enum rc6_mode rc6_mode(struct decoder_data *data) {
        switch (data->header & RC6_MODE_MASK) {
        case 0:
                return RC6_MODE_0;
@@ -162,16 +77,12 @@ static enum rc6_mode rc6_mode(struct decoder_data *data) {
 */
 static int ir_rc6_decode(struct input_dev *input_dev, struct ir_raw_event ev)
 {
-        struct decoder_data *data;
        struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
+        struct rc6_dec *data = &ir_dev->raw->rc6;
        u32 scancode;
        u8 toggle;
-        data = get_decoder_data(ir_dev);
+        if (!(ir_dev->raw->enabled_protocols & IR_TYPE_RC6))
-        if (!data)
-                return -EINVAL;
-        if (!data->enabled)
                return 0;
        if (IS_RESET(ev)) {
@@ -223,12 +134,11 @@ again:
                if (ev.pulse)
                        data->header |= 1;
                data->count++;
-                data->prev_ev = ev;
                data->state = STATE_HEADER_BIT_END;
                return 0;
        case STATE_HEADER_BIT_END:
-                if (!is_transition(&ev, &data->prev_ev))
+                if (!is_transition(&ev, &ir_dev->raw->prev_ev))
                        break;
                if (data->count == RC6_HEADER_NBITS)
@@ -244,12 +154,11 @@ again:
                        break;
                data->toggle = ev.pulse;
-                data->prev_ev = ev;
                data->state = STATE_TOGGLE_END;
                return 0;
        case STATE_TOGGLE_END:
-                if (!is_transition(&ev, &data->prev_ev) ||
+                if (!is_transition(&ev, &ir_dev->raw->prev_ev) ||
                    !geq_margin(ev.duration, RC6_TOGGLE_END, RC6_UNIT / 2))
                        break;
@@ -259,7 +168,6 @@ again:
                }
                data->state = STATE_BODY_BIT_START;
-                data->prev_ev = ev;
                decrease_duration(&ev, RC6_TOGGLE_END);
                data->count = 0;
@@ -291,13 +199,11 @@ again:
                if (ev.pulse)
                        data->body |= 1;
                data->count++;
-                data->prev_ev = ev;
                data->state = STATE_BODY_BIT_END;
                return 0;
        case STATE_BODY_BIT_END:
-                if (!is_transition(&ev, &data->prev_ev))
+                if (!is_transition(&ev, &ir_dev->raw->prev_ev))
                        break;
                if (data->count == data->wanted_bits)
@@ -348,54 +254,9 @@ out:
        return -EINVAL;
 }
-static int ir_rc6_register(struct input_dev *input_dev)
-{
-        struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
-        struct decoder_data *data;
-        int rc;
-        rc = sysfs_create_group(&ir_dev->dev.kobj, &decoder_attribute_group);
-        if (rc < 0)
-                return rc;
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
-        if (!data) {
-                sysfs_remove_group(&ir_dev->dev.kobj, &decoder_attribute_group);
-                return -ENOMEM;
-        }
-        data->ir_dev = ir_dev;
-        data->enabled = 1;
-        spin_lock(&decoder_lock);
-        list_add_tail(&data->list, &decoder_list);
-        spin_unlock(&decoder_lock);
-        return 0;
-}
-static int ir_rc6_unregister(struct input_dev *input_dev)
-{
-        struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
-        static struct decoder_data *data;
-        data = get_decoder_data(ir_dev);
-        if (!data)
-                return 0;
-        sysfs_remove_group(&ir_dev->dev.kobj, &decoder_attribute_group);
-        spin_lock(&decoder_lock);
-        list_del(&data->list);
-        spin_unlock(&decoder_lock);
-        return 0;
-}
 static struct ir_raw_handler rc6_handler = {
+        .protocols      = IR_TYPE_RC6,
        .decode         = ir_rc6_decode,
-        .raw_register   = ir_rc6_register,
-        .raw_unregister = ir_rc6_unregister,
 };
 static int __init ir_rc6_decode_init(void)
diff --git a/drivers/media/IR/ir-sony-decoder.c b/drivers/media/IR/ir-sony-decoder.c
index 9f440c5c060d..b9074f07c7a0 100644
--- a/drivers/media/IR/ir-sony-decoder.c
+++ b/drivers/media/IR/ir-sony-decoder.c
@@ -23,10 +23,6 @@
 #define SONY_BIT_SPACE          (1 * SONY_UNIT)
 #define SONY_TRAILER_SPACE      (10 * SONY_UNIT) /* minimum */
-/* Used to register sony_decoder clients */
-static LIST_HEAD(decoder_list);
-static DEFINE_SPINLOCK(decoder_lock);
 enum sony_state {
        STATE_INACTIVE,
        STATE_HEADER_SPACE,
@@ -35,84 +31,6 @@ enum sony_state {
        STATE_FINISHED,
 };
-struct decoder_data {
-        struct list_head        list;
-        struct ir_input_dev     *ir_dev;
-        int                     enabled:1;
-        /* State machine control */
-        enum sony_state         state;
-        u32                     sony_bits;
-        unsigned                count;
-};
-/**
- * get_decoder_data()   - gets decoder data
- * @input_dev:  input device
- *
- * Returns the struct decoder_data that corresponds to a device
- */
-static struct decoder_data *get_decoder_data(struct  ir_input_dev *ir_dev)
-{
-        struct decoder_data *data = NULL;
-        spin_lock(&decoder_lock);
-        list_for_each_entry(data, &decoder_list, list) {
-                if (data->ir_dev == ir_dev)
-                        break;
-        }
-        spin_unlock(&decoder_lock);
-        return data;
-}
-static ssize_t store_enabled(struct device *d,
-                             struct device_attribute *mattr,
-                             const char *buf,
-                             size_t len)
-{
-        unsigned long value;
-        struct ir_input_dev *ir_dev = dev_get_drvdata(d);
-        struct decoder_data *data = get_decoder_data(ir_dev);
-        if (!data)
-                return -EINVAL;
-        if (strict_strtoul(buf, 10, &value) || value > 1)
-                return -EINVAL;
-        data->enabled = value;
-        return len;
-}
-static ssize_t show_enabled(struct device *d,
-                             struct device_attribute *mattr, char *buf)
-{
-        struct ir_input_dev *ir_dev = dev_get_drvdata(d);
-        struct decoder_data *data = get_decoder_data(ir_dev);
-        if (!data)
-                return -EINVAL;
-        if (data->enabled)
-                return sprintf(buf, "1\n");
-        else
-        return sprintf(buf, "0\n");
-}
-static DEVICE_ATTR(enabled, S_IRUGO | S_IWUSR, show_enabled, store_enabled);
-static struct attribute *decoder_attributes[] = {
-        &dev_attr_enabled.attr,
-        NULL
-};
-static struct attribute_group decoder_attribute_group = {
-        .name   = "sony_decoder",
-        .attrs  = decoder_attributes,
-};
 /**
 * ir_sony_decode() - Decode one Sony pulse or space
 * @input_dev:  the struct input_dev descriptor of the device
@@ -122,16 +40,12 @@ static struct attribute_group decoder_attribute_group = {
 */
 static int ir_sony_decode(struct input_dev *input_dev, struct ir_raw_event ev)
 {
-        struct decoder_data *data;
        struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
+        struct sony_dec *data = &ir_dev->raw->sony;
        u32 scancode;
        u8 device, subdevice, function;
-        data = get_decoder_data(ir_dev);
+        if (!(ir_dev->raw->enabled_protocols & IR_TYPE_SONY))
-        if (!data)
-                return -EINVAL;
-        if (!data->enabled)
                return 0;
        if (IS_RESET(ev)) {
@@ -172,9 +86,9 @@ static int ir_sony_decode(struct input_dev *input_dev, struct ir_raw_event ev)
                if (!ev.pulse)
                        break;
-                data->sony_bits <<= 1;
+                data->bits <<= 1;
                if (eq_margin(ev.duration, SONY_BIT_1_PULSE, SONY_UNIT / 2))
-                        data->sony_bits |= 1;
+                        data->bits |= 1;
                else if (!eq_margin(ev.duration, SONY_BIT_0_PULSE, SONY_UNIT / 2))
                        break;
@@ -208,19 +122,19 @@ static int ir_sony_decode(struct input_dev *input_dev, struct ir_raw_event ev)
                switch (data->count) {
                case 12:
-                        device    = bitrev8((data->sony_bits <<  3) & 0xF8);
+                        device    = bitrev8((data->bits <<  3) & 0xF8);
                        subdevice = 0;
-                        function  = bitrev8((data->sony_bits >>  4) & 0xFE);
+                        function  = bitrev8((data->bits >>  4) & 0xFE);
                        break;
                case 15:
-                        device    = bitrev8((data->sony_bits >>  0) & 0xFF);
+                        device    = bitrev8((data->bits >>  0) & 0xFF);
                        subdevice = 0;
-                        function  = bitrev8((data->sony_bits >>  7) & 0xFD);
+                        function  = bitrev8((data->bits >>  7) & 0xFD);
                        break;
                case 20:
-                        device    = bitrev8((data->sony_bits >>  5) & 0xF8);
+                        device    = bitrev8((data->bits >>  5) & 0xF8);
-                        subdevice = bitrev8((data->sony_bits >>  0) & 0xFF);
+                        subdevice = bitrev8((data->bits >>  0) & 0xFF);
-                        function  = bitrev8((data->sony_bits >> 12) & 0xFE);
+                        function  = bitrev8((data->bits >> 12) & 0xFE);
                        break;
                default:
                        IR_dprintk(1, "Sony invalid bitcount %u\n", data->count);
@@ -241,54 +155,9 @@ out:
        return -EINVAL;
 }
-static int ir_sony_register(struct input_dev *input_dev)
-{
-        struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
-        struct decoder_data *data;
-        int rc;
-        rc = sysfs_create_group(&ir_dev->dev.kobj, &decoder_attribute_group);
-        if (rc < 0)
-                return rc;
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
-        if (!data) {
-                sysfs_remove_group(&ir_dev->dev.kobj, &decoder_attribute_group);
-                return -ENOMEM;
-        }
-        data->ir_dev = ir_dev;
-        data->enabled = 1;
-        spin_lock(&decoder_lock);
-        list_add_tail(&data->list, &decoder_list);
-        spin_unlock(&decoder_lock);
-        return 0;
-}
-static int ir_sony_unregister(struct input_dev *input_dev)
-{
-        struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
-        static struct decoder_data *data;
-        data = get_decoder_data(ir_dev);
-        if (!data)
-                return 0;
-        sysfs_remove_group(&ir_dev->dev.kobj, &decoder_attribute_group);
-        spin_lock(&decoder_lock);
-        list_del(&data->list);
-        spin_unlock(&decoder_lock);
-        return 0;
-}
 static struct ir_raw_handler sony_handler = {
+        .protocols      = IR_TYPE_SONY,
        .decode         = ir_sony_decode,
-        .raw_register   = ir_sony_register,
-        .raw_unregister = ir_sony_unregister,
 };
 static int __init ir_sony_decode_init(void)
diff --git a/drivers/media/IR/ir-sysfs.c b/drivers/media/IR/ir-sysfs.c
index 2098dd1488e0..6273047e915b 100644
--- a/drivers/media/IR/ir-sysfs.c
+++ b/drivers/media/IR/ir-sysfs.c
@@ -33,125 +33,172 @@ static struct class ir_input_class = {
        .devnode        = ir_devnode,
 };
+static struct {
+        u64     type;
+        char    *name;
+} proto_names[] = {
+        { IR_TYPE_UNKNOWN,      "unknown"       },
+        { IR_TYPE_RC5,          "rc-5"          },
+        { IR_TYPE_NEC,          "nec"           },
+        { IR_TYPE_RC6,          "rc-6"          },
+        { IR_TYPE_JVC,          "jvc"           },
+        { IR_TYPE_SONY,         "sony"          },
+        { IR_TYPE_LIRC,         "lirc"          },
+};
+#define PROTO_NONE      "none"
 /**
- * show_protocol() - shows the current IR protocol
+ * show_protocols() - shows the current IR protocol(s)
 * @d:          the device descriptor
 * @mattr:      the device attribute struct (unused)
 * @buf:        a pointer to the output buffer
 *
- * This routine is a callback routine for input read the IR protocol type.
+ * This routine is a callback routine for input read the IR protocol type(s).
- * it is trigged by reading /sys/class/rc/rc?/current_protocol.
+ * it is trigged by reading /sys/class/rc/rc?/protocols.
- * It returns the protocol name, as understood by the driver.
+ * It returns the protocol names of supported protocols.
+ * Enabled protocols are printed in brackets.
 */
-static ssize_t show_protocol(struct device *d,
+static ssize_t show_protocols(struct device *d,
-                             struct device_attribute *mattr, char *buf)
+                              struct device_attribute *mattr, char *buf)
 {
-        char *s;
        struct ir_input_dev *ir_dev = dev_get_drvdata(d);
-        u64 ir_type = ir_dev->rc_tab.ir_type;
+        u64 allowed, enabled;
+        char *tmp = buf;
-        IR_dprintk(1, "Current protocol is %lld\n", (long long)ir_type);
+        int i;
-        /* FIXME: doesn't support multiple protocols at the same time */
+        if (ir_dev->props->driver_type == RC_DRIVER_SCANCODE) {
-        if (ir_type == IR_TYPE_UNKNOWN)
+                enabled = ir_dev->rc_tab.ir_type;
-                s = "Unknown";
+                allowed = ir_dev->props->allowed_protos;
-        else if (ir_type == IR_TYPE_RC5)
+        } else {
-                s = "rc-5";
+                enabled = ir_dev->raw->enabled_protocols;
-        else if (ir_type == IR_TYPE_NEC)
+                allowed = ir_raw_get_allowed_protocols();
-                s = "nec";
+        }
-        else if (ir_type == IR_TYPE_RC6)
-                s = "rc6";
+        IR_dprintk(1, "allowed - 0x%llx, enabled - 0x%llx\n",
-        else if (ir_type == IR_TYPE_JVC)
+                   (long long)allowed,
-                s = "jvc";
+                   (long long)enabled);
-        else if (ir_type == IR_TYPE_SONY)
-                s = "sony";
-        else
-                s = "other";
-        return sprintf(buf, "%s\n", s);
+        for (i = 0; i < ARRAY_SIZE(proto_names); i++) {
+                if (allowed & enabled & proto_names[i].type)
+                        tmp += sprintf(tmp, "[%s] ", proto_names[i].name);
+                else if (allowed & proto_names[i].type)
+                        tmp += sprintf(tmp, "%s ", proto_names[i].name);
+        }
+        if (tmp != buf)
+                tmp--;
+        *tmp = '\n';
+        return tmp + 1 - buf;
 }
 /**
- * store_protocol() - shows the current IR protocol
+ * store_protocols() - changes the current IR protocol(s)
 * @d:          the device descriptor
 * @mattr:      the device attribute struct (unused)
 * @buf:        a pointer to the input buffer
 * @len:        length of the input buffer
 *
 * This routine is a callback routine for changing the IR protocol type.
- * it is trigged by reading /sys/class/rc/rc?/current_protocol.
+ * It is trigged by writing to /sys/class/rc/rc?/protocols.
- * It changes the IR the protocol name, if the IR type is recognized
+ * Writing "+proto" will add a protocol to the list of enabled protocols.
- * by the driver.
+ * Writing "-proto" will remove a protocol from the list of enabled protocols.
- * If an unknown protocol name is used, returns -EINVAL.
+ * Writing "proto" will enable only "proto".
+ * Writing "none" will disable all protocols.
+ * Returns -EINVAL if an invalid protocol combination or unknown protocol name
+ * is used, otherwise @len.
 */
-static ssize_t store_protocol(struct device *d,
+static ssize_t store_protocols(struct device *d,
-                              struct device_attribute *mattr,
+                               struct device_attribute *mattr,
-                              const char *data,
+                               const char *data,
-                              size_t len)
+                               size_t len)
 {
        struct ir_input_dev *ir_dev = dev_get_drvdata(d);
-        u64 ir_type = 0;
+        bool enable, disable;
-        int rc = -EINVAL;
+        const char *tmp;
+        u64 type;
+        u64 mask;
+        int rc, i, count = 0;
        unsigned long flags;
-        char *buf;
+        if (ir_dev->props->driver_type == RC_DRIVER_SCANCODE)
-        while ((buf = strsep((char **) &data, " \n")) != NULL) {
+                type = ir_dev->rc_tab.ir_type;
-                if (!strcasecmp(buf, "rc-5") || !strcasecmp(buf, "rc5"))
+        else
-                        ir_type |= IR_TYPE_RC5;
+                type = ir_dev->raw->enabled_protocols;
-                if (!strcasecmp(buf, "nec"))
-                        ir_type |= IR_TYPE_NEC;
+        while ((tmp = strsep((char **) &data, " \n")) != NULL) {
-                if (!strcasecmp(buf, "jvc"))
+                if (!*tmp)
-                        ir_type |= IR_TYPE_JVC;
+                        break;
-                if (!strcasecmp(buf, "sony"))
-                        ir_type |= IR_TYPE_SONY;
+                if (*tmp == '+') {
+                        enable = true;
+                        disable = false;
+                        tmp++;
+                } else if (*tmp == '-') {
+                        enable = false;
+                        disable = true;
+                        tmp++;
+                } else {
+                        enable = false;
+                        disable = false;
+                }
+                if (!enable && !disable && !strncasecmp(tmp, PROTO_NONE, sizeof(PROTO_NONE))) {
+                        tmp += sizeof(PROTO_NONE);
+                        mask = 0;
+                        count++;
+                } else {
+                        for (i = 0; i < ARRAY_SIZE(proto_names); i++) {
+                                if (!strncasecmp(tmp, proto_names[i].name, strlen(proto_names[i].name))) {
+                                        tmp += strlen(proto_names[i].name);
+                                        mask = proto_names[i].type;
+                                        break;
+                                }
+                        }
+                        if (i == ARRAY_SIZE(proto_names)) {
+                                IR_dprintk(1, "Unknown protocol: '%s'\n", tmp);
+                                return -EINVAL;
+                        }
+                        count++;
+                }
+                if (enable)
+                        type |= mask;
+                else if (disable)
+                        type &= ~mask;
+                else
+                        type = mask;
        }
-        if (!ir_type) {
+        if (!count) {
-                IR_dprintk(1, "Unknown protocol\n");
+                IR_dprintk(1, "Protocol not specified\n");
                return -EINVAL;
        }
-        if (ir_dev->props && ir_dev->props->change_protocol)
+        if (ir_dev->props && ir_dev->props->change_protocol) {
                rc = ir_dev->props->change_protocol(ir_dev->props->priv,
-                                                    ir_type);
+                                                    type);
+                if (rc < 0) {
-        if (rc < 0) {
+                        IR_dprintk(1, "Error setting protocols to 0x%llx\n",
-                IR_dprintk(1, "Error setting protocol to %lld\n",
+                                   (long long)type);
-                           (long long)ir_type);
+                        return -EINVAL;
-                return -EINVAL;
+                }
        }
-        spin_lock_irqsave(&ir_dev->rc_tab.lock, flags);
+        if (ir_dev->props->driver_type == RC_DRIVER_SCANCODE) {
-        ir_dev->rc_tab.ir_type = ir_type;
+                spin_lock_irqsave(&ir_dev->rc_tab.lock, flags);
-        spin_unlock_irqrestore(&ir_dev->rc_tab.lock, flags);
+                ir_dev->rc_tab.ir_type = type;
+                spin_unlock_irqrestore(&ir_dev->rc_tab.lock, flags);
+        } else {
+                ir_dev->raw->enabled_protocols = type;
+        }
-        IR_dprintk(1, "Current protocol(s) is(are) %lld\n",
+        IR_dprintk(1, "Current protocol(s): 0x%llx\n",
-                   (long long)ir_type);
+                   (long long)type);
        return len;
 }
-static ssize_t show_supported_protocols(struct device *d,
-                             struct device_attribute *mattr, char *buf)
-{
-        char *orgbuf = buf;
-        struct ir_input_dev *ir_dev = dev_get_drvdata(d);
-        /* FIXME: doesn't support multiple protocols at the same time */
-        if (ir_dev->props->allowed_protos == IR_TYPE_UNKNOWN)
-                buf += sprintf(buf, "unknown ");
-        if (ir_dev->props->allowed_protos & IR_TYPE_RC5)
-                buf += sprintf(buf, "rc-5 ");
-        if (ir_dev->props->allowed_protos & IR_TYPE_NEC)
-                buf += sprintf(buf, "nec ");
-        if (buf == orgbuf)
-                buf += sprintf(buf, "other ");
-        buf += sprintf(buf - 1, "\n");
-        return buf - orgbuf;
-}
 #define ADD_HOTPLUG_VAR(fmt, val...)                                    \
        do {                                                            \
                int err = add_uevent_var(env, fmt, val);                \
@@ -159,7 +206,7 @@ static ssize_t show_supported_protocols(struct device *d,
                        return err;                                     \
        } while (0)
-static int ir_dev_uevent(struct device *device, struct kobj_uevent_env *env)
+static int rc_dev_uevent(struct device *device, struct kobj_uevent_env *env)
 {
        struct ir_input_dev *ir_dev = dev_get_drvdata(device);
@@ -174,34 +221,26 @@ static int ir_dev_uevent(struct device *device, struct kobj_uevent_env *env)
 /*
 * Static device attribute struct with the sysfs attributes for IR's
 */
-static DEVICE_ATTR(protocol, S_IRUGO | S_IWUSR,
+static DEVICE_ATTR(protocols, S_IRUGO | S_IWUSR,
-                   show_protocol, store_protocol);
+                   show_protocols, store_protocols);
-static DEVICE_ATTR(supported_protocols, S_IRUGO | S_IWUSR,
+static struct attribute *rc_dev_attrs[] = {
-                   show_supported_protocols, NULL);
+        &dev_attr_protocols.attr,
-static struct attribute *ir_hw_dev_attrs[] = {
-        &dev_attr_protocol.attr,
-        &dev_attr_supported_protocols.attr,
        NULL,
 };
-static struct attribute_group ir_hw_dev_attr_grp = {
+static struct attribute_group rc_dev_attr_grp = {
-        .attrs  = ir_hw_dev_attrs,
+        .attrs  = rc_dev_attrs,
 };
-static const struct attribute_group *ir_hw_dev_attr_groups[] = {
+static const struct attribute_group *rc_dev_attr_groups[] = {
-        &ir_hw_dev_attr_grp,
+        &rc_dev_attr_grp,
        NULL
 };
 static struct device_type rc_dev_type = {
-        .groups         = ir_hw_dev_attr_groups,
+        .groups         = rc_dev_attr_groups,
-        .uevent         = ir_dev_uevent,
+        .uevent         = rc_dev_uevent,
-};
-static struct device_type ir_raw_dev_type = {
-        .uevent         = ir_dev_uevent,
 };
 /**
@@ -221,11 +260,7 @@ int ir_register_class(struct input_dev *input_dev)
        if (unlikely(devno < 0))
                return devno;
-        if (ir_dev->props) {
+        ir_dev->dev.type = &rc_dev_type;
-                if (ir_dev->props->driver_type == RC_DRIVER_SCANCODE)
-                        ir_dev->dev.type = &rc_dev_type;
-        } else
-                ir_dev->dev.type = &ir_raw_dev_type;
        ir_dev->dev.class = &ir_input_class;
        ir_dev->dev.parent = input_dev->dev.parent;
diff --git a/drivers/media/IR/keymaps/Makefile b/drivers/media/IR/keymaps/Makefile
index aea649fbcf5a..cbee06243b51 100644
--- a/drivers/media/IR/keymaps/Makefile
+++ b/drivers/media/IR/keymaps/Makefile
@@ -14,6 +14,8 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
                        rc-budget-ci-old.o \
                        rc-cinergy-1400.o \
                        rc-cinergy.o \
+                        rc-dib0700-nec.o \
+                        rc-dib0700-rc5.o \
                        rc-dm1105-nec.o \
                        rc-dntv-live-dvb-t.o \
                        rc-dntv-live-dvbt-pro.o \
@@ -37,6 +39,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
                        rc-kaiomy.o \
                        rc-kworld-315u.o \
                        rc-kworld-plus-tv-analog.o \
+                        rc-lirc.o \
                        rc-manli.o \
                        rc-msi-tvanywhere.o \
                        rc-msi-tvanywhere-plus.o \
@@ -57,6 +60,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
                        rc-pv951.o \
                        rc-rc5-hauppauge-new.o \
                        rc-rc5-tv.o \
+                        rc-rc6-mce.o \
                        rc-real-audio-220-32-keys.o \
                        rc-tbs-nec.o \
                        rc-terratec-cinergy-xs.o \
diff --git a/drivers/media/IR/keymaps/rc-dib0700-nec.c b/drivers/media/IR/keymaps/rc-dib0700-nec.c
new file mode 100644
index 000000000000..ae1832038fbe
--- /dev/null
+++ b/drivers/media/IR/keymaps/rc-dib0700-nec.c
@@ -0,0 +1,124 @@
+/* rc-dvb0700-big.c - Keytable for devices in dvb0700
+ *
+ * Copyright (c) 2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
+ *
+ * TODO: This table is a real mess, as it merges RC codes from several
+ * devices into a big table. It also has both RC-5 and NEC codes inside.
+ * It should be broken into small tables, and the protocols should properly
+ * be indentificated.
+ *
+ * The table were imported from dib0700_devices.c.
+ *
+ * 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 <media/rc-map.h>
+static struct ir_scancode dib0700_nec_table[] = {
+        /* Key codes for the Pixelview SBTVD remote */
+        { 0x8613, KEY_MUTE },
+        { 0x8612, KEY_POWER },
+        { 0x8601, KEY_1 },
+        { 0x8602, KEY_2 },
+        { 0x8603, KEY_3 },
+        { 0x8604, KEY_4 },
+        { 0x8605, KEY_5 },
+        { 0x8606, KEY_6 },
+        { 0x8607, KEY_7 },
+        { 0x8608, KEY_8 },
+        { 0x8609, KEY_9 },
+        { 0x8600, KEY_0 },
+        { 0x860d, KEY_CHANNELUP },
+        { 0x8619, KEY_CHANNELDOWN },
+        { 0x8610, KEY_VOLUMEUP },
+        { 0x860c, KEY_VOLUMEDOWN },
+        { 0x860a, KEY_CAMERA },
+        { 0x860b, KEY_ZOOM },
+        { 0x861b, KEY_BACKSPACE },
+        { 0x8615, KEY_ENTER },
+        { 0x861d, KEY_UP },
+        { 0x861e, KEY_DOWN },
+        { 0x860e, KEY_LEFT },
+        { 0x860f, KEY_RIGHT },
+        { 0x8618, KEY_RECORD },
+        { 0x861a, KEY_STOP },
+        /* Key codes for the EvolutePC TVWay+ remote */
+        { 0x7a00, KEY_MENU },
+        { 0x7a01, KEY_RECORD },
+        { 0x7a02, KEY_PLAY },
+        { 0x7a03, KEY_STOP },
+        { 0x7a10, KEY_CHANNELUP },
+        { 0x7a11, KEY_CHANNELDOWN },
+        { 0x7a12, KEY_VOLUMEUP },
+        { 0x7a13, KEY_VOLUMEDOWN },
+        { 0x7a40, KEY_POWER },
+        { 0x7a41, KEY_MUTE },
+        /* Key codes for the Elgato EyeTV Diversity silver remote */
+        { 0x4501, KEY_POWER },
+        { 0x4502, KEY_MUTE },
+        { 0x4503, KEY_1 },
+        { 0x4504, KEY_2 },
+        { 0x4505, KEY_3 },
+        { 0x4506, KEY_4 },
+        { 0x4507, KEY_5 },
+        { 0x4508, KEY_6 },
+        { 0x4509, KEY_7 },
+        { 0x450a, KEY_8 },
+        { 0x450b, KEY_9 },
+        { 0x450c, KEY_LAST },
+        { 0x450d, KEY_0 },
+        { 0x450e, KEY_ENTER },
+        { 0x450f, KEY_RED },
+        { 0x4510, KEY_CHANNELUP },
+        { 0x4511, KEY_GREEN },
+        { 0x4512, KEY_VOLUMEDOWN },
+        { 0x4513, KEY_OK },
+        { 0x4514, KEY_VOLUMEUP },
+        { 0x4515, KEY_YELLOW },
+        { 0x4516, KEY_CHANNELDOWN },
+        { 0x4517, KEY_BLUE },
+        { 0x4518, KEY_LEFT }, /* Skip backwards */
+        { 0x4519, KEY_PLAYPAUSE },
+        { 0x451a, KEY_RIGHT }, /* Skip forward */
+        { 0x451b, KEY_REWIND },
+        { 0x451c, KEY_L }, /* Live */
+        { 0x451d, KEY_FASTFORWARD },
+        { 0x451e, KEY_STOP }, /* 'Reveal' for Teletext */
+        { 0x451f, KEY_MENU }, /* KEY_TEXT for Teletext */
+        { 0x4540, KEY_RECORD }, /* Font 'Size' for Teletext */
+        { 0x4541, KEY_SCREEN }, /*  Full screen toggle, 'Hold' for Teletext */
+        { 0x4542, KEY_SELECT }, /* Select video input, 'Select' for Teletext */
+};
+static struct rc_keymap dib0700_nec_map = {
+        .map = {
+                .scan    = dib0700_nec_table,
+                .size    = ARRAY_SIZE(dib0700_nec_table),
+                .ir_type = IR_TYPE_NEC,
+                .name    = RC_MAP_DIB0700_NEC_TABLE,
+        }
+};
+static int __init init_rc_map(void)
+{
+        return ir_register_map(&dib0700_nec_map);
+}
+static void __exit exit_rc_map(void)
+{
+        ir_unregister_map(&dib0700_nec_map);
+}
+module_init(init_rc_map)
+module_exit(exit_rc_map)
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
diff --git a/drivers/media/IR/keymaps/rc-dib0700-rc5.c b/drivers/media/IR/keymaps/rc-dib0700-rc5.c
new file mode 100644
index 000000000000..4a4797cfd77d
--- /dev/null
+++ b/drivers/media/IR/keymaps/rc-dib0700-rc5.c
@@ -0,0 +1,235 @@
+/* rc-dvb0700-big.c - Keytable for devices in dvb0700
+ *
+ * Copyright (c) 2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
+ *
+ * TODO: This table is a real mess, as it merges RC codes from several
+ * devices into a big table. It also has both RC-5 and NEC codes inside.
+ * It should be broken into small tables, and the protocols should properly
+ * be indentificated.
+ *
+ * The table were imported from dib0700_devices.c.
+ *
+ * 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 <media/rc-map.h>
+static struct ir_scancode dib0700_rc5_table[] = {
+        /* Key codes for the tiny Pinnacle remote*/
+        { 0x0700, KEY_MUTE },
+        { 0x0701, KEY_MENU }, /* Pinnacle logo */
+        { 0x0739, KEY_POWER },
+        { 0x0703, KEY_VOLUMEUP },
+        { 0x0709, KEY_VOLUMEDOWN },
+        { 0x0706, KEY_CHANNELUP },
+        { 0x070c, KEY_CHANNELDOWN },
+        { 0x070f, KEY_1 },
+        { 0x0715, KEY_2 },
+        { 0x0710, KEY_3 },
+        { 0x0718, KEY_4 },
+        { 0x071b, KEY_5 },
+        { 0x071e, KEY_6 },
+        { 0x0711, KEY_7 },
+        { 0x0721, KEY_8 },
+        { 0x0712, KEY_9 },
+        { 0x0727, KEY_0 },
+        { 0x0724, KEY_SCREEN }, /* 'Square' key */
+        { 0x072a, KEY_TEXT },   /* 'T' key */
+        { 0x072d, KEY_REWIND },
+        { 0x0730, KEY_PLAY },
+        { 0x0733, KEY_FASTFORWARD },
+        { 0x0736, KEY_RECORD },
+        { 0x073c, KEY_STOP },
+        { 0x073f, KEY_CANCEL }, /* '?' key */
+        /* Key codes for the Terratec Cinergy DT XS Diversity, similar to cinergyT2.c */
+        { 0xeb01, KEY_POWER },
+        { 0xeb02, KEY_1 },
+        { 0xeb03, KEY_2 },
+        { 0xeb04, KEY_3 },
+        { 0xeb05, KEY_4 },
+        { 0xeb06, KEY_5 },
+        { 0xeb07, KEY_6 },
+        { 0xeb08, KEY_7 },
+        { 0xeb09, KEY_8 },
+        { 0xeb0a, KEY_9 },
+        { 0xeb0b, KEY_VIDEO },
+        { 0xeb0c, KEY_0 },
+        { 0xeb0d, KEY_REFRESH },
+        { 0xeb0f, KEY_EPG },
+        { 0xeb10, KEY_UP },
+        { 0xeb11, KEY_LEFT },
+        { 0xeb12, KEY_OK },
+        { 0xeb13, KEY_RIGHT },
+        { 0xeb14, KEY_DOWN },
+        { 0xeb16, KEY_INFO },
+        { 0xeb17, KEY_RED },
+        { 0xeb18, KEY_GREEN },
+        { 0xeb19, KEY_YELLOW },
+        { 0xeb1a, KEY_BLUE },
+        { 0xeb1b, KEY_CHANNELUP },
+        { 0xeb1c, KEY_VOLUMEUP },
+        { 0xeb1d, KEY_MUTE },
+        { 0xeb1e, KEY_VOLUMEDOWN },
+        { 0xeb1f, KEY_CHANNELDOWN },
+        { 0xeb40, KEY_PAUSE },
+        { 0xeb41, KEY_HOME },
+        { 0xeb42, KEY_MENU }, /* DVD Menu */
+        { 0xeb43, KEY_SUBTITLE },
+        { 0xeb44, KEY_TEXT }, /* Teletext */
+        { 0xeb45, KEY_DELETE },
+        { 0xeb46, KEY_TV },
+        { 0xeb47, KEY_DVD },
+        { 0xeb48, KEY_STOP },
+        { 0xeb49, KEY_VIDEO },
+        { 0xeb4a, KEY_AUDIO }, /* Music */
+        { 0xeb4b, KEY_SCREEN }, /* Pic */
+        { 0xeb4c, KEY_PLAY },
+        { 0xeb4d, KEY_BACK },
+        { 0xeb4e, KEY_REWIND },
+        { 0xeb4f, KEY_FASTFORWARD },
+        { 0xeb54, KEY_PREVIOUS },
+        { 0xeb58, KEY_RECORD },
+        { 0xeb5c, KEY_NEXT },
+        /* Key codes for the Haupauge WinTV Nova-TD, copied from nova-t-usb2.c (Nova-T USB2) */
+        { 0x1e00, KEY_0 },
+        { 0x1e01, KEY_1 },
+        { 0x1e02, KEY_2 },
+        { 0x1e03, KEY_3 },
+        { 0x1e04, KEY_4 },
+        { 0x1e05, KEY_5 },
+        { 0x1e06, KEY_6 },
+        { 0x1e07, KEY_7 },
+        { 0x1e08, KEY_8 },
+        { 0x1e09, KEY_9 },
+        { 0x1e0a, KEY_KPASTERISK },
+        { 0x1e0b, KEY_RED },
+        { 0x1e0c, KEY_RADIO },
+        { 0x1e0d, KEY_MENU },
+        { 0x1e0e, KEY_GRAVE }, /* # */
+        { 0x1e0f, KEY_MUTE },
+        { 0x1e10, KEY_VOLUMEUP },
+        { 0x1e11, KEY_VOLUMEDOWN },
+        { 0x1e12, KEY_CHANNEL },
+        { 0x1e14, KEY_UP },
+        { 0x1e15, KEY_DOWN },
+        { 0x1e16, KEY_LEFT },
+        { 0x1e17, KEY_RIGHT },
+        { 0x1e18, KEY_VIDEO },
+        { 0x1e19, KEY_AUDIO },
+        { 0x1e1a, KEY_MEDIA },
+        { 0x1e1b, KEY_EPG },
+        { 0x1e1c, KEY_TV },
+        { 0x1e1e, KEY_NEXT },
+        { 0x1e1f, KEY_BACK },
+        { 0x1e20, KEY_CHANNELUP },
+        { 0x1e21, KEY_CHANNELDOWN },
+        { 0x1e24, KEY_LAST }, /* Skip backwards */
+        { 0x1e25, KEY_OK },
+        { 0x1e29, KEY_BLUE},
+        { 0x1e2e, KEY_GREEN },
+        { 0x1e30, KEY_PAUSE },
+        { 0x1e32, KEY_REWIND },
+        { 0x1e34, KEY_FASTFORWARD },
+        { 0x1e35, KEY_PLAY },
+        { 0x1e36, KEY_STOP },
+        { 0x1e37, KEY_RECORD },
+        { 0x1e38, KEY_YELLOW },
+        { 0x1e3b, KEY_GOTO },
+        { 0x1e3d, KEY_POWER },
+        /* Key codes for the Leadtek Winfast DTV Dongle */
+        { 0x0042, KEY_POWER },
+        { 0x077c, KEY_TUNER },
+        { 0x0f4e, KEY_PRINT }, /* PREVIEW */
+        { 0x0840, KEY_SCREEN }, /* full screen toggle*/
+        { 0x0f71, KEY_DOT }, /* frequency */
+        { 0x0743, KEY_0 },
+        { 0x0c41, KEY_1 },
+        { 0x0443, KEY_2 },
+        { 0x0b7f, KEY_3 },
+        { 0x0e41, KEY_4 },
+        { 0x0643, KEY_5 },
+        { 0x097f, KEY_6 },
+        { 0x0d7e, KEY_7 },
+        { 0x057c, KEY_8 },
+        { 0x0a40, KEY_9 },
+        { 0x0e4e, KEY_CLEAR },
+        { 0x047c, KEY_CHANNEL }, /* show channel number */
+        { 0x0f41, KEY_LAST }, /* recall */
+        { 0x0342, KEY_MUTE },
+        { 0x064c, KEY_RESERVED }, /* PIP button*/
+        { 0x0172, KEY_SHUFFLE }, /* SNAPSHOT */
+        { 0x0c4e, KEY_PLAYPAUSE }, /* TIMESHIFT */
+        { 0x0b70, KEY_RECORD },
+        { 0x037d, KEY_VOLUMEUP },
+        { 0x017d, KEY_VOLUMEDOWN },
+        { 0x0242, KEY_CHANNELUP },
+        { 0x007d, KEY_CHANNELDOWN },
+        /* Key codes for Nova-TD "credit card" remote control. */
+        { 0x1d00, KEY_0 },
+        { 0x1d01, KEY_1 },
+        { 0x1d02, KEY_2 },
+        { 0x1d03, KEY_3 },
+        { 0x1d04, KEY_4 },
+        { 0x1d05, KEY_5 },
+        { 0x1d06, KEY_6 },
+        { 0x1d07, KEY_7 },
+        { 0x1d08, KEY_8 },
+        { 0x1d09, KEY_9 },
+        { 0x1d0a, KEY_TEXT },
+        { 0x1d0d, KEY_MENU },
+        { 0x1d0f, KEY_MUTE },
+        { 0x1d10, KEY_VOLUMEUP },
+        { 0x1d11, KEY_VOLUMEDOWN },
+        { 0x1d12, KEY_CHANNEL },
+        { 0x1d14, KEY_UP },
+        { 0x1d15, KEY_DOWN },
+        { 0x1d16, KEY_LEFT },
+        { 0x1d17, KEY_RIGHT },
+        { 0x1d1c, KEY_TV },
+        { 0x1d1e, KEY_NEXT },
+        { 0x1d1f, KEY_BACK },
+        { 0x1d20, KEY_CHANNELUP },
+        { 0x1d21, KEY_CHANNELDOWN },
+        { 0x1d24, KEY_LAST },
+        { 0x1d25, KEY_OK },
+        { 0x1d30, KEY_PAUSE },
+        { 0x1d32, KEY_REWIND },
+        { 0x1d34, KEY_FASTFORWARD },
+        { 0x1d35, KEY_PLAY },
+        { 0x1d36, KEY_STOP },
+        { 0x1d37, KEY_RECORD },
+        { 0x1d3b, KEY_GOTO },
+        { 0x1d3d, KEY_POWER },
+};
+static struct rc_keymap dib0700_rc5_map = {
+        .map = {
+                .scan    = dib0700_rc5_table,
+                .size    = ARRAY_SIZE(dib0700_rc5_table),
+                .ir_type = IR_TYPE_RC5,
+                .name    = RC_MAP_DIB0700_RC5_TABLE,
+        }
+};
+static int __init init_rc_map(void)
+{
+        return ir_register_map(&dib0700_rc5_map);
+}
+static void __exit exit_rc_map(void)
+{
+        ir_unregister_map(&dib0700_rc5_map);
+}
+module_init(init_rc_map)
+module_exit(exit_rc_map)
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
diff --git a/drivers/media/IR/keymaps/rc-lirc.c b/drivers/media/IR/keymaps/rc-lirc.c
new file mode 100644
index 000000000000..43fcf9035082
--- /dev/null
+++ b/drivers/media/IR/keymaps/rc-lirc.c
@@ -0,0 +1,41 @@
+/* rc-lirc.c - Empty dummy keytable, for use when its preferred to pass
+ * all raw IR data to the lirc userspace decoder.
+ *
+ * Copyright (c) 2010 by Jarod Wilson <jarod@redhat.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 <media/ir-core.h>
+static struct ir_scancode lirc[] = {
+        { },
+};
+static struct rc_keymap lirc_map = {
+        .map = {
+                .scan    = lirc,
+                .size    = ARRAY_SIZE(lirc),
+                .ir_type = IR_TYPE_LIRC,
+                .name    = RC_MAP_LIRC,
+        }
+};
+static int __init init_rc_map_lirc(void)
+{
+        return ir_register_map(&lirc_map);
+}
+static void __exit exit_rc_map_lirc(void)
+{
+        ir_unregister_map(&lirc_map);
+}
+module_init(init_rc_map_lirc)
+module_exit(exit_rc_map_lirc)
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Jarod Wilson <jarod@redhat.com>");
diff --git a/drivers/media/IR/keymaps/rc-rc6-mce.c b/drivers/media/IR/keymaps/rc-rc6-mce.c
new file mode 100644
index 000000000000..c6726a8039be
--- /dev/null
+++ b/drivers/media/IR/keymaps/rc-rc6-mce.c
@@ -0,0 +1,105 @@
+/* rc-rc6-mce.c - Keytable for Windows Media Center RC-6 remotes for use
+ * with the Media Center Edition eHome Infrared Transceiver.
+ *
+ * Copyright (c) 2010 by Jarod Wilson <jarod@redhat.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 <media/rc-map.h>
+static struct ir_scancode rc6_mce[] = {
+        { 0x800f0415, KEY_REWIND },
+        { 0x800f0414, KEY_FASTFORWARD },
+        { 0x800f041b, KEY_PREVIOUS },
+        { 0x800f041a, KEY_NEXT },
+        { 0x800f0416, KEY_PLAY },
+        { 0x800f0418, KEY_PAUSE },
+        { 0x800f0419, KEY_STOP },
+        { 0x800f0417, KEY_RECORD },
+        { 0x800f041e, KEY_UP },
+        { 0x800f041f, KEY_DOWN },
+        { 0x800f0420, KEY_LEFT },
+        { 0x800f0421, KEY_RIGHT },
+        { 0x800f040b, KEY_ENTER },
+        { 0x800f0422, KEY_OK },
+        { 0x800f0423, KEY_EXIT },
+        { 0x800f040a, KEY_DELETE },
+        { 0x800f040e, KEY_MUTE },
+        { 0x800f0410, KEY_VOLUMEUP },
+        { 0x800f0411, KEY_VOLUMEDOWN },
+        { 0x800f0412, KEY_CHANNELUP },
+        { 0x800f0413, KEY_CHANNELDOWN },
+        { 0x800f0401, KEY_NUMERIC_1 },
+        { 0x800f0402, KEY_NUMERIC_2 },
+        { 0x800f0403, KEY_NUMERIC_3 },
+        { 0x800f0404, KEY_NUMERIC_4 },
+        { 0x800f0405, KEY_NUMERIC_5 },
+        { 0x800f0406, KEY_NUMERIC_6 },
+        { 0x800f0407, KEY_NUMERIC_7 },
+        { 0x800f0408, KEY_NUMERIC_8 },
+        { 0x800f0409, KEY_NUMERIC_9 },
+        { 0x800f0400, KEY_NUMERIC_0 },
+        { 0x800f041d, KEY_NUMERIC_STAR },
+        { 0x800f041c, KEY_NUMERIC_POUND },
+        { 0x800f0446, KEY_TV },
+        { 0x800f0447, KEY_AUDIO }, /* My Music */
+        { 0x800f0448, KEY_PVR }, /* RecordedTV */
+        { 0x800f0449, KEY_CAMERA },
+        { 0x800f044a, KEY_VIDEO },
+        { 0x800f0424, KEY_DVD },
+        { 0x800f0425, KEY_TUNER }, /* LiveTV */
+        { 0x800f0450, KEY_RADIO },
+        { 0x800f044c, KEY_LANGUAGE },
+        { 0x800f0427, KEY_ZOOM }, /* Aspect */
+        { 0x800f045b, KEY_RED },
+        { 0x800f045c, KEY_GREEN },
+        { 0x800f045d, KEY_YELLOW },
+        { 0x800f045e, KEY_BLUE },
+        { 0x800f040f, KEY_INFO },
+        { 0x800f0426, KEY_EPG }, /* Guide */
+        { 0x800f045a, KEY_SUBTITLE }, /* Caption/Teletext */
+        { 0x800f044d, KEY_TITLE },
+        { 0x800f040c, KEY_POWER },
+        { 0x800f040d, KEY_PROG1 }, /* Windows MCE button */
+};
+static struct rc_keymap rc6_mce_map = {
+        .map = {
+                .scan    = rc6_mce,
+                .size    = ARRAY_SIZE(rc6_mce),
+                .ir_type = IR_TYPE_RC6,
+                .name    = RC_MAP_RC6_MCE,
+        }
+};
+static int __init init_rc_map_rc6_mce(void)
+{
+        return ir_register_map(&rc6_mce_map);
+}
+static void __exit exit_rc_map_rc6_mce(void)
+{
+        ir_unregister_map(&rc6_mce_map);
+}
+module_init(init_rc_map_rc6_mce)
+module_exit(exit_rc_map_rc6_mce)
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Jarod Wilson <jarod@redhat.com>");
diff --git a/drivers/media/IR/lirc_dev.c b/drivers/media/IR/lirc_dev.c
new file mode 100644
index 000000000000..899891bec352
--- /dev/null
+++ b/drivers/media/IR/lirc_dev.c
@@ -0,0 +1,764 @@
+/*
+ * LIRC base driver
+ *
+ * by Artur Lipowski <alipowski@interia.pl>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/errno.h>
+#include <linux/ioctl.h>
+#include <linux/fs.h>
+#include <linux/poll.h>
+#include <linux/completion.h>
+#include <linux/errno.h>
+#include <linux/mutex.h>
+#include <linux/wait.h>
+#include <linux/unistd.h>
+#include <linux/kthread.h>
+#include <linux/bitops.h>
+#include <linux/device.h>
+#include <linux/cdev.h>
+#include <media/lirc.h>
+#include <media/lirc_dev.h>
+static int debug;
+#define IRCTL_DEV_NAME  "BaseRemoteCtl"
+#define NOPLUG          -1
+#define LOGHEAD         "lirc_dev (%s[%d]): "
+static dev_t lirc_base_dev;
+struct irctl {
+        struct lirc_driver d;
+        int attached;
+        int open;
+        struct mutex irctl_lock;
+        struct lirc_buffer *buf;
+        unsigned int chunk_size;
+        struct task_struct *task;
+        long jiffies_to_wait;
+        struct cdev cdev;
+};
+static DEFINE_MUTEX(lirc_dev_lock);
+static struct irctl *irctls[MAX_IRCTL_DEVICES];
+/* Only used for sysfs but defined to void otherwise */
+static struct class *lirc_class;
+/*  helper function
+ *  initializes the irctl structure
+ */
+static void init_irctl(struct irctl *ir)
+{
+        dev_dbg(ir->d.dev, LOGHEAD "initializing irctl\n",
+                ir->d.name, ir->d.minor);
+        mutex_init(&ir->irctl_lock);
+        ir->d.minor = NOPLUG;
+}
+static void cleanup(struct irctl *ir)
+{
+        dev_dbg(ir->d.dev, LOGHEAD "cleaning up\n", ir->d.name, ir->d.minor);
+        device_destroy(lirc_class, MKDEV(MAJOR(lirc_base_dev), ir->d.minor));
+        if (ir->buf != ir->d.rbuf) {
+                lirc_buffer_free(ir->buf);
+                kfree(ir->buf);
+        }
+        ir->buf = NULL;
+}
+/*  helper function
+ *  reads key codes from driver and puts them into buffer
+ *  returns 0 on success
+ */
+static int add_to_buf(struct irctl *ir)
+{
+        if (ir->d.add_to_buf) {
+                int res = -ENODATA;
+                int got_data = 0;
+                /*
+                 * service the device as long as it is returning
+                 * data and we have space
+                 */
+get_data:
+                res = ir->d.add_to_buf(ir->d.data, ir->buf);
+                if (res == 0) {
+                        got_data++;
+                        goto get_data;
+                }
+                if (res == -ENODEV)
+                        kthread_stop(ir->task);
+                return got_data ? 0 : res;
+        }
+        return 0;
+}
+/* main function of the polling thread
+ */
+static int lirc_thread(void *irctl)
+{
+        struct irctl *ir = irctl;
+        dev_dbg(ir->d.dev, LOGHEAD "poll thread started\n",
+                ir->d.name, ir->d.minor);
+        do {
+                if (ir->open) {
+                        if (ir->jiffies_to_wait) {
+                                set_current_state(TASK_INTERRUPTIBLE);
+                                schedule_timeout(ir->jiffies_to_wait);
+                        }
+                        if (kthread_should_stop())
+                                break;
+                        if (!add_to_buf(ir))
+                                wake_up_interruptible(&ir->buf->wait_poll);
+                } else {
+                        set_current_state(TASK_INTERRUPTIBLE);
+                        schedule();
+                }
+        } while (!kthread_should_stop());
+        dev_dbg(ir->d.dev, LOGHEAD "poll thread ended\n",
+                ir->d.name, ir->d.minor);
+        return 0;
+}
+static struct file_operations fops = {
+        .owner          = THIS_MODULE,
+        .read           = lirc_dev_fop_read,
+        .write          = lirc_dev_fop_write,
+        .poll           = lirc_dev_fop_poll,
+        .unlocked_ioctl = lirc_dev_fop_ioctl,
+        .open           = lirc_dev_fop_open,
+        .release        = lirc_dev_fop_close,
+};
+static int lirc_cdev_add(struct irctl *ir)
+{
+        int retval;
+        struct lirc_driver *d = &ir->d;
+        if (d->fops) {
+                cdev_init(&ir->cdev, d->fops);
+                ir->cdev.owner = d->owner;
+        } else {
+                cdev_init(&ir->cdev, &fops);
+                ir->cdev.owner = THIS_MODULE;
+        }
+        kobject_set_name(&ir->cdev.kobj, "lirc%d", d->minor);
+        retval = cdev_add(&ir->cdev, MKDEV(MAJOR(lirc_base_dev), d->minor), 1);
+        if (retval)
+                kobject_put(&ir->cdev.kobj);
+        return retval;
+}
+int lirc_register_driver(struct lirc_driver *d)
+{
+        struct irctl *ir;
+        int minor;
+        int bytes_in_key;
+        unsigned int chunk_size;
+        unsigned int buffer_size;
+        int err;
+        if (!d) {
+                printk(KERN_ERR "lirc_dev: lirc_register_driver: "
+                       "driver pointer must be not NULL!\n");
+                err = -EBADRQC;
+                goto out;
+        }
+        if (MAX_IRCTL_DEVICES <= d->minor) {
+                dev_err(d->dev, "lirc_dev: lirc_register_driver: "
+                        "\"minor\" must be between 0 and %d (%d)!\n",
+                        MAX_IRCTL_DEVICES-1, d->minor);
+                err = -EBADRQC;
+                goto out;
+        }
+        if (1 > d->code_length || (BUFLEN * 8) < d->code_length) {
+                dev_err(d->dev, "lirc_dev: lirc_register_driver: "
+                        "code length in bits for minor (%d) "
+                        "must be less than %d!\n",
+                        d->minor, BUFLEN * 8);
+                err = -EBADRQC;
+                goto out;
+        }
+        dev_dbg(d->dev, "lirc_dev: lirc_register_driver: sample_rate: %d\n",
+                d->sample_rate);
+        if (d->sample_rate) {
+                if (2 > d->sample_rate || HZ < d->sample_rate) {
+                        dev_err(d->dev, "lirc_dev: lirc_register_driver: "
+                                "sample_rate must be between 2 and %d!\n", HZ);
+                        err = -EBADRQC;
+                        goto out;
+                }
+                if (!d->add_to_buf) {
+                        dev_err(d->dev, "lirc_dev: lirc_register_driver: "
+                                "add_to_buf cannot be NULL when "
+                                "sample_rate is set\n");
+                        err = -EBADRQC;
+                        goto out;
+                }
+        } else if (!(d->fops && d->fops->read) && !d->rbuf) {
+                dev_err(d->dev, "lirc_dev: lirc_register_driver: "
+                        "fops->read and rbuf cannot all be NULL!\n");
+                err = -EBADRQC;
+                goto out;
+        } else if (!d->rbuf) {
+                if (!(d->fops && d->fops->read && d->fops->poll &&
+                      d->fops->unlocked_ioctl)) {
+                        dev_err(d->dev, "lirc_dev: lirc_register_driver: "
+                                "neither read, poll nor unlocked_ioctl can be NULL!\n");
+                        err = -EBADRQC;
+                        goto out;
+                }
+        }
+        mutex_lock(&lirc_dev_lock);
+        minor = d->minor;
+        if (minor < 0) {
+                /* find first free slot for driver */
+                for (minor = 0; minor < MAX_IRCTL_DEVICES; minor++)
+                        if (!irctls[minor])
+                                break;
+                if (MAX_IRCTL_DEVICES == minor) {
+                        dev_err(d->dev, "lirc_dev: lirc_register_driver: "
+                                "no free slots for drivers!\n");
+                        err = -ENOMEM;
+                        goto out_lock;
+                }
+        } else if (irctls[minor]) {
+                dev_err(d->dev, "lirc_dev: lirc_register_driver: "
+                        "minor (%d) just registered!\n", minor);
+                err = -EBUSY;
+                goto out_lock;
+        }
+        ir = kzalloc(sizeof(struct irctl), GFP_KERNEL);
+        if (!ir) {
+                err = -ENOMEM;
+                goto out_lock;
+        }
+        init_irctl(ir);
+        irctls[minor] = ir;
+        d->minor = minor;
+        if (d->sample_rate) {
+                ir->jiffies_to_wait = HZ / d->sample_rate;
+        } else {
+                /* it means - wait for external event in task queue */
+                ir->jiffies_to_wait = 0;
+        }
+        /* some safety check 8-) */
+        d->name[sizeof(d->name)-1] = '\0';
+        bytes_in_key = BITS_TO_LONGS(d->code_length) +
+                        (d->code_length % 8 ? 1 : 0);
+        buffer_size = d->buffer_size ? d->buffer_size : BUFLEN / bytes_in_key;
+        chunk_size  = d->chunk_size  ? d->chunk_size  : bytes_in_key;
+        if (d->rbuf) {
+                ir->buf = d->rbuf;
+        } else {
+                ir->buf = kmalloc(sizeof(struct lirc_buffer), GFP_KERNEL);
+                if (!ir->buf) {
+                        err = -ENOMEM;
+                        goto out_lock;
+                }
+                err = lirc_buffer_init(ir->buf, chunk_size, buffer_size);
+                if (err) {
+                        kfree(ir->buf);
+                        goto out_lock;
+                }
+        }
+        ir->chunk_size = ir->buf->chunk_size;
+        if (d->features == 0)
+                d->features = LIRC_CAN_REC_LIRCCODE;
+        ir->d = *d;
+        ir->d.minor = minor;
+        device_create(lirc_class, ir->d.dev,
+                      MKDEV(MAJOR(lirc_base_dev), ir->d.minor), NULL,
+                      "lirc%u", ir->d.minor);
+        if (d->sample_rate) {
+                /* try to fire up polling thread */
+                ir->task = kthread_run(lirc_thread, (void *)ir, "lirc_dev");
+                if (IS_ERR(ir->task)) {
+                        dev_err(d->dev, "lirc_dev: lirc_register_driver: "
+                                "cannot run poll thread for minor = %d\n",
+                                d->minor);
+                        err = -ECHILD;
+                        goto out_sysfs;
+                }
+        }
+        err = lirc_cdev_add(ir);
+        if (err)
+                goto out_sysfs;
+        ir->attached = 1;
+        mutex_unlock(&lirc_dev_lock);
+        dev_info(ir->d.dev, "lirc_dev: driver %s registered at minor = %d\n",
+                 ir->d.name, ir->d.minor);
+        return minor;
+out_sysfs:
+        device_destroy(lirc_class, MKDEV(MAJOR(lirc_base_dev), ir->d.minor));
+out_lock:
+        mutex_unlock(&lirc_dev_lock);
+out:
+        return err;
+}
+EXPORT_SYMBOL(lirc_register_driver);
+int lirc_unregister_driver(int minor)
+{
+        struct irctl *ir;
+        if (minor < 0 || minor >= MAX_IRCTL_DEVICES) {
+                printk(KERN_ERR "lirc_dev: lirc_unregister_driver: "
+                       "\"minor (%d)\" must be between 0 and %d!\n",
+                       minor, MAX_IRCTL_DEVICES-1);
+                return -EBADRQC;
+        }
+        ir = irctls[minor];
+        mutex_lock(&lirc_dev_lock);
+        if (ir->d.minor != minor) {
+                printk(KERN_ERR "lirc_dev: lirc_unregister_driver: "
+                       "minor (%d) device not registered!", minor);
+                mutex_unlock(&lirc_dev_lock);
+                return -ENOENT;
+        }
+        /* end up polling thread */
+        if (ir->task)
+                kthread_stop(ir->task);
+        dev_dbg(ir->d.dev, "lirc_dev: driver %s unregistered from minor = %d\n",
+                ir->d.name, ir->d.minor);
+        ir->attached = 0;
+        if (ir->open) {
+                dev_dbg(ir->d.dev, LOGHEAD "releasing opened driver\n",
+                        ir->d.name, ir->d.minor);
+                wake_up_interruptible(&ir->buf->wait_poll);
+                mutex_lock(&ir->irctl_lock);
+                ir->d.set_use_dec(ir->d.data);
+                module_put(ir->d.owner);
+                mutex_unlock(&ir->irctl_lock);
+                cdev_del(&ir->cdev);
+        } else {
+                cleanup(ir);
+                cdev_del(&ir->cdev);
+                kfree(ir);
+                irctls[minor] = NULL;
+        }
+        mutex_unlock(&lirc_dev_lock);
+        return 0;
+}
+EXPORT_SYMBOL(lirc_unregister_driver);
+int lirc_dev_fop_open(struct inode *inode, struct file *file)
+{
+        struct irctl *ir;
+        int retval = 0;
+        if (iminor(inode) >= MAX_IRCTL_DEVICES) {
+                printk(KERN_WARNING "lirc_dev [%d]: open result = -ENODEV\n",
+                       iminor(inode));
+                return -ENODEV;
+        }
+        if (mutex_lock_interruptible(&lirc_dev_lock))
+                return -ERESTARTSYS;
+        ir = irctls[iminor(inode)];
+        if (!ir) {
+                retval = -ENODEV;
+                goto error;
+        }
+        file->private_data = ir;
+        dev_dbg(ir->d.dev, LOGHEAD "open called\n", ir->d.name, ir->d.minor);
+        if (ir->d.minor == NOPLUG) {
+                retval = -ENODEV;
+                goto error;
+        }
+        if (ir->open) {
+                retval = -EBUSY;
+                goto error;
+        }
+        if (try_module_get(ir->d.owner)) {
+                ++ir->open;
+                retval = ir->d.set_use_inc(ir->d.data);
+                if (retval) {
+                        module_put(ir->d.owner);
+                        --ir->open;
+                } else {
+                        lirc_buffer_clear(ir->buf);
+                }
+                if (ir->task)
+                        wake_up_process(ir->task);
+        }
+error:
+        if (ir)
+                dev_dbg(ir->d.dev, LOGHEAD "open result = %d\n",
+                        ir->d.name, ir->d.minor, retval);
+        mutex_unlock(&lirc_dev_lock);
+        return retval;
+}
+EXPORT_SYMBOL(lirc_dev_fop_open);
+int lirc_dev_fop_close(struct inode *inode, struct file *file)
+{
+        struct irctl *ir = irctls[iminor(inode)];
+        dev_dbg(ir->d.dev, LOGHEAD "close called\n", ir->d.name, ir->d.minor);
+        WARN_ON(mutex_lock_killable(&lirc_dev_lock));
+        --ir->open;
+        if (ir->attached) {
+                ir->d.set_use_dec(ir->d.data);
+                module_put(ir->d.owner);
+        } else {
+                cleanup(ir);
+                irctls[ir->d.minor] = NULL;
+                kfree(ir);
+        }
+        mutex_unlock(&lirc_dev_lock);
+        return 0;
+}
+EXPORT_SYMBOL(lirc_dev_fop_close);
+unsigned int lirc_dev_fop_poll(struct file *file, poll_table *wait)
+{
+        struct irctl *ir = irctls[iminor(file->f_dentry->d_inode)];
+        unsigned int ret;
+        dev_dbg(ir->d.dev, LOGHEAD "poll called\n", ir->d.name, ir->d.minor);
+        if (!ir->attached) {
+                mutex_unlock(&ir->irctl_lock);
+                return POLLERR;
+        }
+        poll_wait(file, &ir->buf->wait_poll, wait);
+        if (ir->buf)
+                if (lirc_buffer_empty(ir->buf))
+                        ret = 0;
+                else
+                        ret = POLLIN | POLLRDNORM;
+        else
+                ret = POLLERR;
+        dev_dbg(ir->d.dev, LOGHEAD "poll result = %d\n",
+                ir->d.name, ir->d.minor, ret);
+        return ret;
+}
+EXPORT_SYMBOL(lirc_dev_fop_poll);
+long lirc_dev_fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+        unsigned long mode;
+        int result = 0;
+        struct irctl *ir = file->private_data;
+        dev_dbg(ir->d.dev, LOGHEAD "ioctl called (0x%x)\n",
+                ir->d.name, ir->d.minor, cmd);
+        if (ir->d.minor == NOPLUG || !ir->attached) {
+                dev_dbg(ir->d.dev, LOGHEAD "ioctl result = -ENODEV\n",
+                        ir->d.name, ir->d.minor);
+                return -ENODEV;
+        }
+        mutex_lock(&ir->irctl_lock);
+        switch (cmd) {
+        case LIRC_GET_FEATURES:
+                result = put_user(ir->d.features, (unsigned long *)arg);
+                break;
+        case LIRC_GET_REC_MODE:
+                if (!(ir->d.features & LIRC_CAN_REC_MASK)) {
+                        result = -ENOSYS;
+                        break;
+                }
+                result = put_user(LIRC_REC2MODE
+                                  (ir->d.features & LIRC_CAN_REC_MASK),
+                                  (unsigned long *)arg);
+                break;
+        case LIRC_SET_REC_MODE:
+                if (!(ir->d.features & LIRC_CAN_REC_MASK)) {
+                        result = -ENOSYS;
+                        break;
+                }
+                result = get_user(mode, (unsigned long *)arg);
+                if (!result && !(LIRC_MODE2REC(mode) & ir->d.features))
+                        result = -EINVAL;
+                /*
+                 * FIXME: We should actually set the mode somehow but
+                 * for now, lirc_serial doesn't support mode changing either
+                 */
+                break;
+        case LIRC_GET_LENGTH:
+                result = put_user(ir->d.code_length, (unsigned long *)arg);
+                break;
+        case LIRC_GET_MIN_TIMEOUT:
+                if (!(ir->d.features & LIRC_CAN_SET_REC_TIMEOUT) ||
+                    ir->d.min_timeout == 0) {
+                        result = -ENOSYS;
+                        break;
+                }
+                result = put_user(ir->d.min_timeout, (unsigned long *)arg);
+                break;
+        case LIRC_GET_MAX_TIMEOUT:
+                if (!(ir->d.features & LIRC_CAN_SET_REC_TIMEOUT) ||
+                    ir->d.max_timeout == 0) {
+                        result = -ENOSYS;
+                        break;
+                }
+                result = put_user(ir->d.max_timeout, (unsigned long *)arg);
+                break;
+        default:
+                result = -EINVAL;
+        }
+        dev_dbg(ir->d.dev, LOGHEAD "ioctl result = %d\n",
+                ir->d.name, ir->d.minor, result);
+        mutex_unlock(&ir->irctl_lock);
+        return result;
+}
+EXPORT_SYMBOL(lirc_dev_fop_ioctl);
+ssize_t lirc_dev_fop_read(struct file *file,
+                          char *buffer,
+                          size_t length,
+                          loff_t *ppos)
+{
+        struct irctl *ir = irctls[iminor(file->f_dentry->d_inode)];
+        unsigned char buf[ir->chunk_size];
+        int ret = 0, written = 0;
+        DECLARE_WAITQUEUE(wait, current);
+        dev_dbg(ir->d.dev, LOGHEAD "read called\n", ir->d.name, ir->d.minor);
+        if (mutex_lock_interruptible(&ir->irctl_lock))
+                return -ERESTARTSYS;
+        if (!ir->attached) {
+                mutex_unlock(&ir->irctl_lock);
+                return -ENODEV;
+        }
+        if (length % ir->chunk_size) {
+                dev_dbg(ir->d.dev, LOGHEAD "read result = -EINVAL\n",
+                        ir->d.name, ir->d.minor);
+                mutex_unlock(&ir->irctl_lock);
+                return -EINVAL;
+        }
+        /*
+         * we add ourselves to the task queue before buffer check
+         * to avoid losing scan code (in case when queue is awaken somewhere
+         * between while condition checking and scheduling)
+         */
+        add_wait_queue(&ir->buf->wait_poll, &wait);
+        set_current_state(TASK_INTERRUPTIBLE);
+        /*
+         * while we didn't provide 'length' bytes, device is opened in blocking
+         * mode and 'copy_to_user' is happy, wait for data.
+         */
+        while (written < length && ret == 0) {
+                if (lirc_buffer_empty(ir->buf)) {
+                        /* According to the read(2) man page, 'written' can be
+                         * returned as less than 'length', instead of blocking
+                         * again, returning -EWOULDBLOCK, or returning
+                         * -ERESTARTSYS */
+                        if (written)
+                                break;
+                        if (file->f_flags & O_NONBLOCK) {
+                                ret = -EWOULDBLOCK;
+                                break;
+                        }
+                        if (signal_pending(current)) {
+                                ret = -ERESTARTSYS;
+                                break;
+                        }
+                        mutex_unlock(&ir->irctl_lock);
+                        schedule();
+                        set_current_state(TASK_INTERRUPTIBLE);
+                        if (mutex_lock_interruptible(&ir->irctl_lock)) {
+                                ret = -ERESTARTSYS;
+                                remove_wait_queue(&ir->buf->wait_poll, &wait);
+                                set_current_state(TASK_RUNNING);
+                                goto out_unlocked;
+                        }
+                        if (!ir->attached) {
+                                ret = -ENODEV;
+                                break;
+                        }
+                } else {
+                        lirc_buffer_read(ir->buf, buf);
+                        ret = copy_to_user((void *)buffer+written, buf,
+                                           ir->buf->chunk_size);
+                        written += ir->buf->chunk_size;
+                }
+        }
+        remove_wait_queue(&ir->buf->wait_poll, &wait);
+        set_current_state(TASK_RUNNING);
+        mutex_unlock(&ir->irctl_lock);
+out_unlocked:
+        dev_dbg(ir->d.dev, LOGHEAD "read result = %s (%d)\n",
+                ir->d.name, ir->d.minor, ret ? "-EFAULT" : "OK", ret);
+        return ret ? ret : written;
+}
+EXPORT_SYMBOL(lirc_dev_fop_read);
+void *lirc_get_pdata(struct file *file)
+{
+        void *data = NULL;
+        if (file && file->f_dentry && file->f_dentry->d_inode &&
+            file->f_dentry->d_inode->i_rdev) {
+                struct irctl *ir;
+                ir = irctls[iminor(file->f_dentry->d_inode)];
+                data = ir->d.data;
+        }
+        return data;
+}
+EXPORT_SYMBOL(lirc_get_pdata);
+ssize_t lirc_dev_fop_write(struct file *file, const char *buffer,
+                           size_t length, loff_t *ppos)
+{
+        struct irctl *ir = irctls[iminor(file->f_dentry->d_inode)];
+        dev_dbg(ir->d.dev, LOGHEAD "write called\n", ir->d.name, ir->d.minor);
+        if (!ir->attached)
+                return -ENODEV;
+        return -EINVAL;
+}
+EXPORT_SYMBOL(lirc_dev_fop_write);
+static int __init lirc_dev_init(void)
+{
+        int retval;
+        lirc_class = class_create(THIS_MODULE, "lirc");
+        if (IS_ERR(lirc_class)) {
+                retval = PTR_ERR(lirc_class);
+                printk(KERN_ERR "lirc_dev: class_create failed\n");
+                goto error;
+        }
+        retval = alloc_chrdev_region(&lirc_base_dev, 0, MAX_IRCTL_DEVICES,
+                                     IRCTL_DEV_NAME);
+        if (retval) {
+                class_destroy(lirc_class);
+                printk(KERN_ERR "lirc_dev: alloc_chrdev_region failed\n");
+                goto error;
+        }
+        printk(KERN_INFO "lirc_dev: IR Remote Control driver registered, "
+               "major %d \n", MAJOR(lirc_base_dev));
+error:
+        return retval;
+}
+static void __exit lirc_dev_exit(void)
+{
+        class_destroy(lirc_class);
+        unregister_chrdev_region(lirc_base_dev, MAX_IRCTL_DEVICES);
+        printk(KERN_INFO "lirc_dev: module unloaded\n");
+}
+module_init(lirc_dev_init);
+module_exit(lirc_dev_exit);
+MODULE_DESCRIPTION("LIRC base driver module");
+MODULE_AUTHOR("Artur Lipowski");
+MODULE_LICENSE("GPL");
+module_param(debug, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "Enable debugging messages");
diff --git a/drivers/media/IR/mceusb.c b/drivers/media/IR/mceusb.c
new file mode 100644
index 000000000000..78bf7f77a1a0
--- /dev/null
+++ b/drivers/media/IR/mceusb.c
@@ -0,0 +1,1143 @@
+/*
+ * Driver for USB Windows Media Center Ed. eHome Infrared Transceivers
+ *
+ * Copyright (c) 2010 by Jarod Wilson <jarod@redhat.com>
+ *
+ * Based on the original lirc_mceusb and lirc_mceusb2 drivers, by Dan
+ * Conti, Martin Blatter and Daniel Melander, the latter of which was
+ * in turn also based on the lirc_atiusb driver by Paul Miller. The
+ * two mce drivers were merged into one by Jarod Wilson, with transmit
+ * support for the 1st-gen device added primarily by Patrick Calhoun,
+ * with a bit of tweaks by Jarod. Debugging improvements and proper
+ * support for what appears to be 3rd-gen hardware added by Jarod.
+ * Initial port from lirc driver to ir-core drivery by Jarod, based
+ * partially on a port to an earlier proposed IR infrastructure by
+ * Jon Smirl, which included enhancements and simplifications to the
+ * incoming IR buffer parsing routines.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+#include <linux/device.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/usb.h>
+#include <linux/input.h>
+#include <media/ir-core.h>
+#include <media/ir-common.h>
+#define DRIVER_VERSION  "1.91"
+#define DRIVER_AUTHOR   "Jarod Wilson <jarod@wilsonet.com>"
+#define DRIVER_DESC     "Windows Media Center Ed. eHome Infrared Transceiver " \
+                        "device driver"
+#define DRIVER_NAME     "mceusb"
+#define USB_BUFLEN      32      /* USB reception buffer length */
+#define USB_CTRL_MSG_SZ 2       /* Size of usb ctrl msg on gen1 hw */
+#define MCE_G1_INIT_MSGS 40     /* Init messages on gen1 hw to throw out */
+/* MCE constants */
+#define MCE_CMDBUF_SIZE 384 /* MCE Command buffer length */
+#define MCE_TIME_UNIT   50 /* Approx 50us resolution */
+#define MCE_CODE_LENGTH 5 /* Normal length of packet (with header) */
+#define MCE_PACKET_SIZE 4 /* Normal length of packet (without header) */
+#define MCE_PACKET_HEADER 0x84 /* Actual header format is 0x80 + num_bytes */
+#define MCE_CONTROL_HEADER 0x9F /* MCE status header */
+#define MCE_TX_HEADER_LENGTH 3 /* # of bytes in the initializing tx header */
+#define MCE_MAX_CHANNELS 2 /* Two transmitters, hardware dependent? */
+#define MCE_DEFAULT_TX_MASK 0x03 /* Val opts: TX1=0x01, TX2=0x02, ALL=0x03 */
+#define MCE_PULSE_BIT   0x80 /* Pulse bit, MSB set == PULSE else SPACE */
+#define MCE_PULSE_MASK  0x7F /* Pulse mask */
+#define MCE_MAX_PULSE_LENGTH 0x7F /* Longest transmittable pulse symbol */
+#define MCE_PACKET_LENGTH_MASK  0x1F /* Packet length mask */
+/* module parameters */
+#ifdef CONFIG_USB_DEBUG
+static int debug = 1;
+#else
+static int debug;
+#endif
+/* general constants */
+#define SEND_FLAG_IN_PROGRESS   1
+#define SEND_FLAG_COMPLETE      2
+#define RECV_FLAG_IN_PROGRESS   3
+#define RECV_FLAG_COMPLETE      4
+#define MCEUSB_RX               1
+#define MCEUSB_TX               2
+#define VENDOR_PHILIPS          0x0471
+#define VENDOR_SMK              0x0609
+#define VENDOR_TATUNG           0x1460
+#define VENDOR_GATEWAY          0x107b
+#define VENDOR_SHUTTLE          0x1308
+#define VENDOR_SHUTTLE2         0x051c
+#define VENDOR_MITSUMI          0x03ee
+#define VENDOR_TOPSEED          0x1784
+#define VENDOR_RICAVISION       0x179d
+#define VENDOR_ITRON            0x195d
+#define VENDOR_FIC              0x1509
+#define VENDOR_LG               0x043e
+#define VENDOR_MICROSOFT        0x045e
+#define VENDOR_FORMOSA          0x147a
+#define VENDOR_FINTEK           0x1934
+#define VENDOR_PINNACLE         0x2304
+#define VENDOR_ECS              0x1019
+#define VENDOR_WISTRON          0x0fb8
+#define VENDOR_COMPRO           0x185b
+#define VENDOR_NORTHSTAR        0x04eb
+#define VENDOR_REALTEK          0x0bda
+#define VENDOR_TIVO             0x105a
+static struct usb_device_id mceusb_dev_table[] = {
+        /* Original Microsoft MCE IR Transceiver (often HP-branded) */
+        { USB_DEVICE(VENDOR_MICROSOFT, 0x006d) },
+        /* Philips Infrared Transceiver - Sahara branded */
+        { USB_DEVICE(VENDOR_PHILIPS, 0x0608) },
+        /* Philips Infrared Transceiver - HP branded */
+        { USB_DEVICE(VENDOR_PHILIPS, 0x060c) },
+        /* Philips SRM5100 */
+        { USB_DEVICE(VENDOR_PHILIPS, 0x060d) },
+        /* Philips Infrared Transceiver - Omaura */
+        { USB_DEVICE(VENDOR_PHILIPS, 0x060f) },
+        /* Philips Infrared Transceiver - Spinel plus */
+        { USB_DEVICE(VENDOR_PHILIPS, 0x0613) },
+        /* Philips eHome Infrared Transceiver */
+        { USB_DEVICE(VENDOR_PHILIPS, 0x0815) },
+        /* Realtek MCE IR Receiver */
+        { USB_DEVICE(VENDOR_REALTEK, 0x0161) },
+        /* SMK/Toshiba G83C0004D410 */
+        { USB_DEVICE(VENDOR_SMK, 0x031d) },
+        /* SMK eHome Infrared Transceiver (Sony VAIO) */
+        { USB_DEVICE(VENDOR_SMK, 0x0322) },
+        /* bundled with Hauppauge PVR-150 */
+        { USB_DEVICE(VENDOR_SMK, 0x0334) },
+        /* SMK eHome Infrared Transceiver */
+        { USB_DEVICE(VENDOR_SMK, 0x0338) },
+        /* Tatung eHome Infrared Transceiver */
+        { USB_DEVICE(VENDOR_TATUNG, 0x9150) },
+        /* Shuttle eHome Infrared Transceiver */
+        { USB_DEVICE(VENDOR_SHUTTLE, 0xc001) },
+        /* Shuttle eHome Infrared Transceiver */
+        { USB_DEVICE(VENDOR_SHUTTLE2, 0xc001) },
+        /* Gateway eHome Infrared Transceiver */
+        { USB_DEVICE(VENDOR_GATEWAY, 0x3009) },
+        /* Mitsumi */
+        { USB_DEVICE(VENDOR_MITSUMI, 0x2501) },
+        /* Topseed eHome Infrared Transceiver */
+        { USB_DEVICE(VENDOR_TOPSEED, 0x0001) },
+        /* Topseed HP eHome Infrared Transceiver */
+        { USB_DEVICE(VENDOR_TOPSEED, 0x0006) },
+        /* Topseed eHome Infrared Transceiver */
+        { USB_DEVICE(VENDOR_TOPSEED, 0x0007) },
+        /* Topseed eHome Infrared Transceiver */
+        { USB_DEVICE(VENDOR_TOPSEED, 0x0008) },
+        /* Topseed eHome Infrared Transceiver */
+        { USB_DEVICE(VENDOR_TOPSEED, 0x000a) },
+        /* Topseed eHome Infrared Transceiver */
+        { USB_DEVICE(VENDOR_TOPSEED, 0x0011) },
+        /* Ricavision internal Infrared Transceiver */
+        { USB_DEVICE(VENDOR_RICAVISION, 0x0010) },
+        /* Itron ione Libra Q-11 */
+        { USB_DEVICE(VENDOR_ITRON, 0x7002) },
+        /* FIC eHome Infrared Transceiver */
+        { USB_DEVICE(VENDOR_FIC, 0x9242) },
+        /* LG eHome Infrared Transceiver */
+        { USB_DEVICE(VENDOR_LG, 0x9803) },
+        /* Microsoft MCE Infrared Transceiver */
+        { USB_DEVICE(VENDOR_MICROSOFT, 0x00a0) },
+        /* Formosa eHome Infrared Transceiver */
+        { USB_DEVICE(VENDOR_FORMOSA, 0xe015) },
+        /* Formosa21 / eHome Infrared Receiver */
+        { USB_DEVICE(VENDOR_FORMOSA, 0xe016) },
+        /* Formosa aim / Trust MCE Infrared Receiver */
+        { USB_DEVICE(VENDOR_FORMOSA, 0xe017) },
+        /* Formosa Industrial Computing / Beanbag Emulation Device */
+        { USB_DEVICE(VENDOR_FORMOSA, 0xe018) },
+        /* Formosa21 / eHome Infrared Receiver */
+        { USB_DEVICE(VENDOR_FORMOSA, 0xe03a) },
+        /* Formosa Industrial Computing AIM IR605/A */
+        { USB_DEVICE(VENDOR_FORMOSA, 0xe03c) },
+        /* Formosa Industrial Computing */
+        { USB_DEVICE(VENDOR_FORMOSA, 0xe03e) },
+        /* Fintek eHome Infrared Transceiver */
+        { USB_DEVICE(VENDOR_FINTEK, 0x0602) },
+        /* Fintek eHome Infrared Transceiver (in the AOpen MP45) */
+        { USB_DEVICE(VENDOR_FINTEK, 0x0702) },
+        /* Pinnacle Remote Kit */
+        { USB_DEVICE(VENDOR_PINNACLE, 0x0225) },
+        /* Elitegroup Computer Systems IR */
+        { USB_DEVICE(VENDOR_ECS, 0x0f38) },
+        /* Wistron Corp. eHome Infrared Receiver */
+        { USB_DEVICE(VENDOR_WISTRON, 0x0002) },
+        /* Compro K100 */
+        { USB_DEVICE(VENDOR_COMPRO, 0x3020) },
+        /* Compro K100 v2 */
+        { USB_DEVICE(VENDOR_COMPRO, 0x3082) },
+        /* Northstar Systems, Inc. eHome Infrared Transceiver */
+        { USB_DEVICE(VENDOR_NORTHSTAR, 0xe004) },
+        /* TiVo PC IR Receiver */
+        { USB_DEVICE(VENDOR_TIVO, 0x2000) },
+        /* Terminating entry */
+        { }
+};
+static struct usb_device_id gen3_list[] = {
+        { USB_DEVICE(VENDOR_PINNACLE, 0x0225) },
+        { USB_DEVICE(VENDOR_TOPSEED, 0x0008) },
+        {}
+};
+static struct usb_device_id microsoft_gen1_list[] = {
+        { USB_DEVICE(VENDOR_MICROSOFT, 0x006d) },
+        {}
+};
+static struct usb_device_id std_tx_mask_list[] = {
+        { USB_DEVICE(VENDOR_MICROSOFT, 0x006d) },
+        { USB_DEVICE(VENDOR_PHILIPS, 0x060c) },
+        { USB_DEVICE(VENDOR_SMK, 0x031d) },
+        { USB_DEVICE(VENDOR_SMK, 0x0322) },
+        { USB_DEVICE(VENDOR_SMK, 0x0334) },
+        { USB_DEVICE(VENDOR_TOPSEED, 0x0001) },
+        { USB_DEVICE(VENDOR_TOPSEED, 0x0006) },
+        { USB_DEVICE(VENDOR_TOPSEED, 0x0007) },
+        { USB_DEVICE(VENDOR_TOPSEED, 0x0008) },
+        { USB_DEVICE(VENDOR_TOPSEED, 0x000a) },
+        { USB_DEVICE(VENDOR_TOPSEED, 0x0011) },
+        { USB_DEVICE(VENDOR_PINNACLE, 0x0225) },
+        {}
+};
+/* data structure for each usb transceiver */
+struct mceusb_dev {
+        /* ir-core bits */
+        struct ir_input_dev *irdev;
+        struct ir_dev_props *props;
+        struct ir_raw_event rawir;
+        /* core device bits */
+        struct device *dev;
+        struct input_dev *idev;
+        /* usb */
+        struct usb_device *usbdev;
+        struct urb *urb_in;
+        struct usb_endpoint_descriptor *usb_ep_in;
+        struct usb_endpoint_descriptor *usb_ep_out;
+        /* buffers and dma */
+        unsigned char *buf_in;
+        unsigned int len_in;
+        u8 cmd;         /* MCE command type */
+        u8 rem;         /* Remaining IR data bytes in packet */
+        dma_addr_t dma_in;
+        dma_addr_t dma_out;
+        struct {
+                u32 connected:1;
+                u32 tx_mask_inverted:1;
+                u32 microsoft_gen1:1;
+                u32 reserved:29;
+        } flags;
+        /* transmit support */
+        int send_flags;
+        u32 carrier;
+        unsigned char tx_mask;
+        char name[128];
+        char phys[64];
+};
+/*
+ * MCE Device Command Strings
+ * Device command responses vary from device to device...
+ * - DEVICE_RESET resets the hardware to its default state
+ * - GET_REVISION fetches the hardware/software revision, common
+ *   replies are ff 0b 45 ff 1b 08 and ff 0b 50 ff 1b 42
+ * - GET_CARRIER_FREQ gets the carrier mode and frequency of the
+ *   device, with replies in the form of 9f 06 MM FF, where MM is 0-3,
+ *   meaning clk of 10000000, 2500000, 625000 or 156250, and FF is
+ *   ((clk / frequency) - 1)
+ * - GET_RX_TIMEOUT fetches the receiver timeout in units of 50us,
+ *   response in the form of 9f 0c msb lsb
+ * - GET_TX_BITMASK fetches the transmitter bitmask, replies in
+ *   the form of 9f 08 bm, where bm is the bitmask
+ * - GET_RX_SENSOR fetches the RX sensor setting -- long-range
+ *   general use one or short-range learning one, in the form of
+ *   9f 14 ss, where ss is either 01 for long-range or 02 for short
+ * - SET_CARRIER_FREQ sets a new carrier mode and frequency
+ * - SET_TX_BITMASK sets the transmitter bitmask
+ * - SET_RX_TIMEOUT sets the receiver timeout
+ * - SET_RX_SENSOR sets which receiver sensor to use
+ */
+static char DEVICE_RESET[]      = {0x00, 0xff, 0xaa};
+static char GET_REVISION[]      = {0xff, 0x0b};
+static char GET_UNKNOWN[]       = {0xff, 0x18};
+static char GET_UNKNOWN2[]      = {0x9f, 0x05};
+static char GET_CARRIER_FREQ[]  = {0x9f, 0x07};
+static char GET_RX_TIMEOUT[]    = {0x9f, 0x0d};
+static char GET_TX_BITMASK[]    = {0x9f, 0x13};
+static char GET_RX_SENSOR[]     = {0x9f, 0x15};
+/* sub in desired values in lower byte or bytes for full command */
+/* FIXME: make use of these for transmit.
+static char SET_CARRIER_FREQ[]  = {0x9f, 0x06, 0x00, 0x00};
+static char SET_TX_BITMASK[]    = {0x9f, 0x08, 0x00};
+static char SET_RX_TIMEOUT[]    = {0x9f, 0x0c, 0x00, 0x00};
+static char SET_RX_SENSOR[]     = {0x9f, 0x14, 0x00};
+*/
+static void mceusb_dev_printdata(struct mceusb_dev *ir, char *buf,
+                                 int len, bool out)
+{
+        char codes[USB_BUFLEN * 3 + 1];
+        char inout[9];
+        int i;
+        u8 cmd, subcmd, data1, data2;
+        struct device *dev = ir->dev;
+        int idx = 0;
+        /* skip meaningless 0xb1 0x60 header bytes on orig receiver */
+        if (ir->flags.microsoft_gen1 && !out)
+                idx = 2;
+        if (len <= idx)
+                return;
+        for (i = 0; i < len && i < USB_BUFLEN; i++)
+                snprintf(codes + i * 3, 4, "%02x ", buf[i] & 0xFF);
+        dev_info(dev, "%sx data: %s (length=%d)\n",
+                 (out ? "t" : "r"), codes, len);
+        if (out)
+                strcpy(inout, "Request\0");
+        else
+                strcpy(inout, "Got\0");
+        cmd    = buf[idx] & 0xff;
+        subcmd = buf[idx + 1] & 0xff;
+        data1  = buf[idx + 2] & 0xff;
+        data2  = buf[idx + 3] & 0xff;
+        switch (cmd) {
+        case 0x00:
+                if (subcmd == 0xff && data1 == 0xaa)
+                        dev_info(dev, "Device reset requested\n");
+                else
+                        dev_info(dev, "Unknown command 0x%02x 0x%02x\n",
+                                 cmd, subcmd);
+                break;
+        case 0xff:
+                switch (subcmd) {
+                case 0x0b:
+                        if (len == 2)
+                                dev_info(dev, "Get hw/sw rev?\n");
+                        else
+                                dev_info(dev, "hw/sw rev 0x%02x 0x%02x "
+                                         "0x%02x 0x%02x\n", data1, data2,
+                                         buf[idx + 4], buf[idx + 5]);
+                        break;
+                case 0xaa:
+                        dev_info(dev, "Device reset requested\n");
+                        break;
+                case 0xfe:
+                        dev_info(dev, "Previous command not supported\n");
+                        break;
+                case 0x18:
+                case 0x1b:
+                default:
+                        dev_info(dev, "Unknown command 0x%02x 0x%02x\n",
+                                 cmd, subcmd);
+                        break;
+                }
+                break;
+        case 0x9f:
+                switch (subcmd) {
+                case 0x03:
+                        dev_info(dev, "Ping\n");
+                        break;
+                case 0x04:
+                        dev_info(dev, "Resp to 9f 05 of 0x%02x 0x%02x\n",
+                                 data1, data2);
+                        break;
+                case 0x06:
+                        dev_info(dev, "%s carrier mode and freq of "
+                                 "0x%02x 0x%02x\n", inout, data1, data2);
+                        break;
+                case 0x07:
+                        dev_info(dev, "Get carrier mode and freq\n");
+                        break;
+                case 0x08:
+                        dev_info(dev, "%s transmit blaster mask of 0x%02x\n",
+                                 inout, data1);
+                        break;
+                case 0x0c:
+                        /* value is in units of 50us, so x*50/100 or x/2 ms */
+                        dev_info(dev, "%s receive timeout of %d ms\n",
+                                 inout, ((data1 << 8) | data2) / 2);
+                        break;
+                case 0x0d:
+                        dev_info(dev, "Get receive timeout\n");
+                        break;
+                case 0x13:
+                        dev_info(dev, "Get transmit blaster mask\n");
+                        break;
+                case 0x14:
+                        dev_info(dev, "%s %s-range receive sensor in use\n",
+                                 inout, data1 == 0x02 ? "short" : "long");
+                        break;
+                case 0x15:
+                        if (len == 2)
+                                dev_info(dev, "Get receive sensor\n");
+                        else
+                                dev_info(dev, "Received pulse count is %d\n",
+                                         ((data1 << 8) | data2));
+                        break;
+                case 0xfe:
+                        dev_info(dev, "Error! Hardware is likely wedged...\n");
+                        break;
+                case 0x05:
+                case 0x09:
+                case 0x0f:
+                default:
+                        dev_info(dev, "Unknown command 0x%02x 0x%02x\n",
+                                 cmd, subcmd);
+                        break;
+                }
+                break;
+        default:
+                break;
+        }
+}
+static void usb_async_callback(struct urb *urb, struct pt_regs *regs)
+{
+        struct mceusb_dev *ir;
+        int len;
+        if (!urb)
+                return;
+        ir = urb->context;
+        if (ir) {
+                len = urb->actual_length;
+                dev_dbg(ir->dev, "callback called (status=%d len=%d)\n",
+                        urb->status, len);
+                if (debug)
+                        mceusb_dev_printdata(ir, urb->transfer_buffer,
+                                             len, true);
+        }
+}
+/* request incoming or send outgoing usb packet - used to initialize remote */
+static void mce_request_packet(struct mceusb_dev *ir,
+                               struct usb_endpoint_descriptor *ep,
+                               unsigned char *data, int size, int urb_type)
+{
+        int res;
+        struct urb *async_urb;
+        struct device *dev = ir->dev;
+        unsigned char *async_buf;
+        if (urb_type == MCEUSB_TX) {
+                async_urb = usb_alloc_urb(0, GFP_KERNEL);
+                if (unlikely(!async_urb)) {
+                        dev_err(dev, "Error, couldn't allocate urb!\n");
+                        return;
+                }
+                async_buf = kzalloc(size, GFP_KERNEL);
+                if (!async_buf) {
+                        dev_err(dev, "Error, couldn't allocate buf!\n");
+                        usb_free_urb(async_urb);
+                        return;
+                }
+                /* outbound data */
+                usb_fill_int_urb(async_urb, ir->usbdev,
+                        usb_sndintpipe(ir->usbdev, ep->bEndpointAddress),
+                        async_buf, size, (usb_complete_t) usb_async_callback,
+                        ir, ep->bInterval);
+                memcpy(async_buf, data, size);
+        } else if (urb_type == MCEUSB_RX) {
+                /* standard request */
+                async_urb = ir->urb_in;
+                ir->send_flags = RECV_FLAG_IN_PROGRESS;
+        } else {
+                dev_err(dev, "Error! Unknown urb type %d\n", urb_type);
+                return;
+        }
+        dev_dbg(dev, "receive request called (size=%#x)\n", size);
+        async_urb->transfer_buffer_length = size;
+        async_urb->dev = ir->usbdev;
+        res = usb_submit_urb(async_urb, GFP_ATOMIC);
+        if (res) {
+                dev_dbg(dev, "receive request FAILED! (res=%d)\n", res);
+                return;
+        }
+        dev_dbg(dev, "receive request complete (res=%d)\n", res);
+}
+static void mce_async_out(struct mceusb_dev *ir, unsigned char *data, int size)
+{
+        mce_request_packet(ir, ir->usb_ep_out, data, size, MCEUSB_TX);
+}
+static void mce_sync_in(struct mceusb_dev *ir, unsigned char *data, int size)
+{
+        mce_request_packet(ir, ir->usb_ep_in, data, size, MCEUSB_RX);
+}
+/* Send data out the IR blaster port(s) */
+static int mceusb_tx_ir(void *priv, int *txbuf, u32 n)
+{
+        struct mceusb_dev *ir = priv;
+        int i, ret = 0;
+        int count, cmdcount = 0;
+        unsigned char *cmdbuf; /* MCE command buffer */
+        long signal_duration = 0; /* Singnal length in us */
+        struct timeval start_time, end_time;
+        do_gettimeofday(&start_time);
+        count = n / sizeof(int);
+        cmdbuf = kzalloc(sizeof(int) * MCE_CMDBUF_SIZE, GFP_KERNEL);
+        if (!cmdbuf)
+                return -ENOMEM;
+        /* MCE tx init header */
+        cmdbuf[cmdcount++] = MCE_CONTROL_HEADER;
+        cmdbuf[cmdcount++] = 0x08;
+        cmdbuf[cmdcount++] = ir->tx_mask;
+        /* Generate mce packet data */
+        for (i = 0; (i < count) && (cmdcount < MCE_CMDBUF_SIZE); i++) {
+                signal_duration += txbuf[i];
+                txbuf[i] = txbuf[i] / MCE_TIME_UNIT;
+                do { /* loop to support long pulses/spaces > 127*50us=6.35ms */
+                        /* Insert mce packet header every 4th entry */
+                        if ((cmdcount < MCE_CMDBUF_SIZE) &&
+                            (cmdcount - MCE_TX_HEADER_LENGTH) %
+                             MCE_CODE_LENGTH == 0)
+                                cmdbuf[cmdcount++] = MCE_PACKET_HEADER;
+                        /* Insert mce packet data */
+                        if (cmdcount < MCE_CMDBUF_SIZE)
+                                cmdbuf[cmdcount++] =
+                                        (txbuf[i] < MCE_PULSE_BIT ?
+                                         txbuf[i] : MCE_MAX_PULSE_LENGTH) |
+                                         (i & 1 ? 0x00 : MCE_PULSE_BIT);
+                        else {
+                                ret = -EINVAL;
+                                goto out;
+                        }
+                } while ((txbuf[i] > MCE_MAX_PULSE_LENGTH) &&
+                         (txbuf[i] -= MCE_MAX_PULSE_LENGTH));
+        }
+        /* Fix packet length in last header */
+        cmdbuf[cmdcount - (cmdcount - MCE_TX_HEADER_LENGTH) % MCE_CODE_LENGTH] =
+                0x80 + (cmdcount - MCE_TX_HEADER_LENGTH) % MCE_CODE_LENGTH - 1;
+        /* Check if we have room for the empty packet at the end */
+        if (cmdcount >= MCE_CMDBUF_SIZE) {
+                ret = -EINVAL;
+                goto out;
+        }
+        /* All mce commands end with an empty packet (0x80) */
+        cmdbuf[cmdcount++] = 0x80;
+        /* Transmit the command to the mce device */
+        mce_async_out(ir, cmdbuf, cmdcount);
+        /*
+         * The lircd gap calculation expects the write function to
+         * wait the time it takes for the ircommand to be sent before
+         * it returns.
+         */
+        do_gettimeofday(&end_time);
+        signal_duration -= (end_time.tv_usec - start_time.tv_usec) +
+                           (end_time.tv_sec - start_time.tv_sec) * 1000000;
+        /* delay with the closest number of ticks */
+        set_current_state(TASK_INTERRUPTIBLE);
+        schedule_timeout(usecs_to_jiffies(signal_duration));
+out:
+        kfree(cmdbuf);
+        return ret ? ret : n;
+}
+/* Sets active IR outputs -- mce devices typically (all?) have two */
+static int mceusb_set_tx_mask(void *priv, u32 mask)
+{
+        struct mceusb_dev *ir = priv;
+        if (ir->flags.tx_mask_inverted)
+                ir->tx_mask = (mask != 0x03 ? mask ^ 0x03 : mask) << 1;
+        else
+                ir->tx_mask = mask;
+        return 0;
+}
+/* Sets the send carrier frequency and mode */
+static int mceusb_set_tx_carrier(void *priv, u32 carrier)
+{
+        struct mceusb_dev *ir = priv;
+        int clk = 10000000;
+        int prescaler = 0, divisor = 0;
+        unsigned char cmdbuf[4] = { 0x9f, 0x06, 0x00, 0x00 };
+        /* Carrier has changed */
+        if (ir->carrier != carrier) {
+                if (carrier == 0) {
+                        ir->carrier = carrier;
+                        cmdbuf[2] = 0x01;
+                        cmdbuf[3] = 0x80;
+                        dev_dbg(ir->dev, "%s: disabling carrier "
+                                "modulation\n", __func__);
+                        mce_async_out(ir, cmdbuf, sizeof(cmdbuf));
+                        return carrier;
+                }
+                for (prescaler = 0; prescaler < 4; ++prescaler) {
+                        divisor = (clk >> (2 * prescaler)) / carrier;
+                        if (divisor <= 0xFF) {
+                                ir->carrier = carrier;
+                                cmdbuf[2] = prescaler;
+                                cmdbuf[3] = divisor;
+                                dev_dbg(ir->dev, "%s: requesting %u HZ "
+                                        "carrier\n", __func__, carrier);
+                                /* Transmit new carrier to mce device */
+                                mce_async_out(ir, cmdbuf, sizeof(cmdbuf));
+                                return carrier;
+                        }
+                }
+                return -EINVAL;
+        }
+        return carrier;
+}
+static void mceusb_process_ir_data(struct mceusb_dev *ir, int buf_len)
+{
+        struct ir_raw_event rawir = { .pulse = false, .duration = 0 };
+        int i, start_index = 0;
+        u8 hdr = MCE_CONTROL_HEADER;
+        /* skip meaningless 0xb1 0x60 header bytes on orig receiver */
+        if (ir->flags.microsoft_gen1)
+                start_index = 2;
+        for (i = start_index; i < buf_len;) {
+                if (ir->rem == 0) {
+                        /* decode mce packets of the form (84),AA,BB,CC,DD */
+                        /* IR data packets can span USB messages - rem */
+                        hdr = ir->buf_in[i];
+                        ir->rem = (hdr & MCE_PACKET_LENGTH_MASK);
+                        ir->cmd = (hdr & ~MCE_PACKET_LENGTH_MASK);
+                        dev_dbg(ir->dev, "New data. rem: 0x%02x, cmd: 0x%02x\n",
+                                ir->rem, ir->cmd);
+                        i++;
+                }
+                /* don't process MCE commands */
+                if (hdr == MCE_CONTROL_HEADER || hdr == 0xff) {
+                        ir->rem = 0;
+                        return;
+                }
+                for (; (ir->rem > 0) && (i < buf_len); i++) {
+                        ir->rem--;
+                        rawir.pulse = ((ir->buf_in[i] & MCE_PULSE_BIT) != 0);
+                        rawir.duration = (ir->buf_in[i] & MCE_PULSE_MASK)
+                                         * MCE_TIME_UNIT * 1000;
+                        if ((ir->buf_in[i] & MCE_PULSE_MASK) == 0x7f) {
+                                if (ir->rawir.pulse == rawir.pulse)
+                                        ir->rawir.duration += rawir.duration;
+                                else {
+                                        ir->rawir.duration = rawir.duration;
+                                        ir->rawir.pulse = rawir.pulse;
+                                }
+                                continue;
+                        }
+                        rawir.duration += ir->rawir.duration;
+                        ir->rawir.duration = 0;
+                        ir->rawir.pulse = rawir.pulse;
+                        dev_dbg(ir->dev, "Storing %s with duration %d\n",
+                                rawir.pulse ? "pulse" : "space",
+                                rawir.duration);
+                        ir_raw_event_store(ir->idev, &rawir);
+                }
+                if (ir->buf_in[i] == 0x80 || ir->buf_in[i] == 0x9f)
+                        ir->rem = 0;
+                dev_dbg(ir->dev, "calling ir_raw_event_handle\n");
+                ir_raw_event_handle(ir->idev);
+        }
+}
+static void mceusb_dev_recv(struct urb *urb, struct pt_regs *regs)
+{
+        struct mceusb_dev *ir;
+        int buf_len;
+        if (!urb)
+                return;
+        ir = urb->context;
+        if (!ir) {
+                usb_unlink_urb(urb);
+                return;
+        }
+        buf_len = urb->actual_length;
+        if (debug)
+                mceusb_dev_printdata(ir, urb->transfer_buffer, buf_len, false);
+        if (ir->send_flags == RECV_FLAG_IN_PROGRESS) {
+                ir->send_flags = SEND_FLAG_COMPLETE;
+                dev_dbg(&ir->irdev->dev, "setup answer received %d bytes\n",
+                        buf_len);
+        }
+        switch (urb->status) {
+        /* success */
+        case 0:
+                mceusb_process_ir_data(ir, buf_len);
+                break;
+        case -ECONNRESET:
+        case -ENOENT:
+        case -ESHUTDOWN:
+                usb_unlink_urb(urb);
+                return;
+        case -EPIPE:
+        default:
+                break;
+        }
+        usb_submit_urb(urb, GFP_ATOMIC);
+}
+static void mceusb_gen1_init(struct mceusb_dev *ir)
+{
+        int ret;
+        int maxp = ir->len_in;
+        struct device *dev = ir->dev;
+        char *data;
+        data = kzalloc(USB_CTRL_MSG_SZ, GFP_KERNEL);
+        if (!data) {
+                dev_err(dev, "%s: memory allocation failed!\n", __func__);
+                return;
+        }
+        /*
+         * This is a strange one. Windows issues a set address to the device
+         * on the receive control pipe and expect a certain value pair back
+         */
+        ret = usb_control_msg(ir->usbdev, usb_rcvctrlpipe(ir->usbdev, 0),
+                              USB_REQ_SET_ADDRESS, USB_TYPE_VENDOR, 0, 0,
+                              data, USB_CTRL_MSG_SZ, HZ * 3);
+        dev_dbg(dev, "%s - ret = %d\n", __func__, ret);
+        dev_dbg(dev, "%s - data[0] = %d, data[1] = %d\n",
+                __func__, data[0], data[1]);
+        /* set feature: bit rate 38400 bps */
+        ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0),
+                              USB_REQ_SET_FEATURE, USB_TYPE_VENDOR,
+                              0xc04e, 0x0000, NULL, 0, HZ * 3);
+        dev_dbg(dev, "%s - ret = %d\n", __func__, ret);
+        /* bRequest 4: set char length to 8 bits */
+        ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0),
+                              4, USB_TYPE_VENDOR,
+                              0x0808, 0x0000, NULL, 0, HZ * 3);
+        dev_dbg(dev, "%s - retB = %d\n", __func__, ret);
+        /* bRequest 2: set handshaking to use DTR/DSR */
+        ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0),
+                              2, USB_TYPE_VENDOR,
+                              0x0000, 0x0100, NULL, 0, HZ * 3);
+        dev_dbg(dev, "%s - retC = %d\n", __func__, ret);
+        /* device reset */
+        mce_async_out(ir, DEVICE_RESET, sizeof(DEVICE_RESET));
+        mce_sync_in(ir, NULL, maxp);
+        /* get hw/sw revision? */
+        mce_async_out(ir, GET_REVISION, sizeof(GET_REVISION));
+        mce_sync_in(ir, NULL, maxp);
+        kfree(data);
+};
+static void mceusb_gen2_init(struct mceusb_dev *ir)
+{
+        int maxp = ir->len_in;
+        /* device reset */
+        mce_async_out(ir, DEVICE_RESET, sizeof(DEVICE_RESET));
+        mce_sync_in(ir, NULL, maxp);
+        /* get hw/sw revision? */
+        mce_async_out(ir, GET_REVISION, sizeof(GET_REVISION));
+        mce_sync_in(ir, NULL, maxp);
+        /* unknown what the next two actually return... */
+        mce_async_out(ir, GET_UNKNOWN, sizeof(GET_UNKNOWN));
+        mce_sync_in(ir, NULL, maxp);
+        mce_async_out(ir, GET_UNKNOWN2, sizeof(GET_UNKNOWN2));
+        mce_sync_in(ir, NULL, maxp);
+}
+static void mceusb_get_parameters(struct mceusb_dev *ir)
+{
+        int maxp = ir->len_in;
+        /* get the carrier and frequency */
+        mce_async_out(ir, GET_CARRIER_FREQ, sizeof(GET_CARRIER_FREQ));
+        mce_sync_in(ir, NULL, maxp);
+        /* get the transmitter bitmask */
+        mce_async_out(ir, GET_TX_BITMASK, sizeof(GET_TX_BITMASK));
+        mce_sync_in(ir, NULL, maxp);
+        /* get receiver timeout value */
+        mce_async_out(ir, GET_RX_TIMEOUT, sizeof(GET_RX_TIMEOUT));
+        mce_sync_in(ir, NULL, maxp);
+        /* get receiver sensor setting */
+        mce_async_out(ir, GET_RX_SENSOR, sizeof(GET_RX_SENSOR));
+        mce_sync_in(ir, NULL, maxp);
+}
+static struct input_dev *mceusb_init_input_dev(struct mceusb_dev *ir)
+{
+        struct input_dev *idev;
+        struct ir_dev_props *props;
+        struct ir_input_dev *irdev;
+        struct device *dev = ir->dev;
+        int ret = -ENODEV;
+        idev = input_allocate_device();
+        if (!idev) {
+                dev_err(dev, "remote input dev allocation failed\n");
+                goto idev_alloc_failed;
+        }
+        ret = -ENOMEM;
+        props = kzalloc(sizeof(struct ir_dev_props), GFP_KERNEL);
+        if (!props) {
+                dev_err(dev, "remote ir dev props allocation failed\n");
+                goto props_alloc_failed;
+        }
+        irdev = kzalloc(sizeof(struct ir_input_dev), GFP_KERNEL);
+        if (!irdev) {
+                dev_err(dev, "remote ir input dev allocation failed\n");
+                goto ir_dev_alloc_failed;
+        }
+        snprintf(ir->name, sizeof(ir->name), "Media Center Ed. eHome "
+                 "Infrared Remote Transceiver (%04x:%04x)",
+                 le16_to_cpu(ir->usbdev->descriptor.idVendor),
+                 le16_to_cpu(ir->usbdev->descriptor.idProduct));
+        idev->name = ir->name;
+        usb_make_path(ir->usbdev, ir->phys, sizeof(ir->phys));
+        strlcat(ir->phys, "/input0", sizeof(ir->phys));
+        idev->phys = ir->phys;
+        props->priv = ir;
+        props->driver_type = RC_DRIVER_IR_RAW;
+        props->allowed_protos = IR_TYPE_ALL;
+        props->s_tx_mask = mceusb_set_tx_mask;
+        props->s_tx_carrier = mceusb_set_tx_carrier;
+        props->tx_ir = mceusb_tx_ir;
+        ir->props = props;
+        ir->irdev = irdev;
+        input_set_drvdata(idev, irdev);
+        ret = ir_input_register(idev, RC_MAP_RC6_MCE, props, DRIVER_NAME);
+        if (ret < 0) {
+                dev_err(dev, "remote input device register failed\n");
+                goto irdev_failed;
+        }
+        return idev;
+irdev_failed:
+        kfree(irdev);
+ir_dev_alloc_failed:
+        kfree(props);
+props_alloc_failed:
+        input_free_device(idev);
+idev_alloc_failed:
+        return NULL;
+}
+static int __devinit mceusb_dev_probe(struct usb_interface *intf,
+                                      const struct usb_device_id *id)
+{
+        struct usb_device *dev = interface_to_usbdev(intf);
+        struct usb_host_interface *idesc;
+        struct usb_endpoint_descriptor *ep = NULL;
+        struct usb_endpoint_descriptor *ep_in = NULL;
+        struct usb_endpoint_descriptor *ep_out = NULL;
+        struct usb_host_config *config;
+        struct mceusb_dev *ir = NULL;
+        int pipe, maxp, i;
+        char buf[63], name[128] = "";
+        bool is_gen3;
+        bool is_microsoft_gen1;
+        bool tx_mask_inverted;
+        dev_dbg(&intf->dev, ": %s called\n", __func__);
+        config = dev->actconfig;
+        idesc  = intf->cur_altsetting;
+        is_gen3 = usb_match_id(intf, gen3_list) ? 1 : 0;
+        is_microsoft_gen1 = usb_match_id(intf, microsoft_gen1_list) ? 1 : 0;
+        tx_mask_inverted = usb_match_id(intf, std_tx_mask_list) ? 0 : 1;
+        /* step through the endpoints to find first bulk in and out endpoint */
+        for (i = 0; i < idesc->desc.bNumEndpoints; ++i) {
+                ep = &idesc->endpoint[i].desc;
+                if ((ep_in == NULL)
+                        && ((ep->bEndpointAddress & USB_ENDPOINT_DIR_MASK)
+                            == USB_DIR_IN)
+                        && (((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
+                            == USB_ENDPOINT_XFER_BULK)
+                        || ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
+                            == USB_ENDPOINT_XFER_INT))) {
+                        ep_in = ep;
+                        ep_in->bmAttributes = USB_ENDPOINT_XFER_INT;
+                        ep_in->bInterval = 1;
+                        dev_dbg(&intf->dev, ": acceptable inbound endpoint "
+                                "found\n");
+                }
+                if ((ep_out == NULL)
+                        && ((ep->bEndpointAddress & USB_ENDPOINT_DIR_MASK)
+                            == USB_DIR_OUT)
+                        && (((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
+                            == USB_ENDPOINT_XFER_BULK)
+                        || ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
+                            == USB_ENDPOINT_XFER_INT))) {
+                        ep_out = ep;
+                        ep_out->bmAttributes = USB_ENDPOINT_XFER_INT;
+                        ep_out->bInterval = 1;
+                        dev_dbg(&intf->dev, ": acceptable outbound endpoint "
+                                "found\n");
+                }
+        }
+        if (ep_in == NULL) {
+                dev_dbg(&intf->dev, ": inbound and/or endpoint not found\n");
+                return -ENODEV;
+        }
+        pipe = usb_rcvintpipe(dev, ep_in->bEndpointAddress);
+        maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));
+        ir = kzalloc(sizeof(struct mceusb_dev), GFP_KERNEL);
+        if (!ir)
+                goto mem_alloc_fail;
+        ir->buf_in = usb_alloc_coherent(dev, maxp, GFP_ATOMIC, &ir->dma_in);
+        if (!ir->buf_in)
+                goto buf_in_alloc_fail;
+        ir->urb_in = usb_alloc_urb(0, GFP_KERNEL);
+        if (!ir->urb_in)
+                goto urb_in_alloc_fail;
+        ir->usbdev = dev;
+        ir->dev = &intf->dev;
+        ir->len_in = maxp;
+        ir->flags.microsoft_gen1 = is_microsoft_gen1;
+        ir->flags.tx_mask_inverted = tx_mask_inverted;
+        /* Saving usb interface data for use by the transmitter routine */
+        ir->usb_ep_in = ep_in;
+        ir->usb_ep_out = ep_out;
+        if (dev->descriptor.iManufacturer
+            && usb_string(dev, dev->descriptor.iManufacturer,
+                          buf, sizeof(buf)) > 0)
+                strlcpy(name, buf, sizeof(name));
+        if (dev->descriptor.iProduct
+            && usb_string(dev, dev->descriptor.iProduct,
+                          buf, sizeof(buf)) > 0)
+                snprintf(name + strlen(name), sizeof(name) - strlen(name),
+                         " %s", buf);
+        ir->idev = mceusb_init_input_dev(ir);
+        if (!ir->idev)
+                goto input_dev_fail;
+        /* flush buffers on the device */
+        mce_sync_in(ir, NULL, maxp);
+        mce_sync_in(ir, NULL, maxp);
+        /* wire up inbound data handler */
+        usb_fill_int_urb(ir->urb_in, dev, pipe, ir->buf_in,
+                maxp, (usb_complete_t) mceusb_dev_recv, ir, ep_in->bInterval);
+        ir->urb_in->transfer_dma = ir->dma_in;
+        ir->urb_in->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
+        /* initialize device */
+        if (ir->flags.microsoft_gen1)
+                mceusb_gen1_init(ir);
+        else if (!is_gen3)
+                mceusb_gen2_init(ir);
+        mceusb_get_parameters(ir);
+        mceusb_set_tx_mask(ir, MCE_DEFAULT_TX_MASK);
+        usb_set_intfdata(intf, ir);
+        dev_info(&intf->dev, "Registered %s on usb%d:%d\n", name,
+                 dev->bus->busnum, dev->devnum);
+        return 0;
+        /* Error-handling path */
+input_dev_fail:
+        usb_free_urb(ir->urb_in);
+urb_in_alloc_fail:
+        usb_free_coherent(dev, maxp, ir->buf_in, ir->dma_in);
+buf_in_alloc_fail:
+        kfree(ir);
+mem_alloc_fail:
+        dev_err(&intf->dev, "%s: device setup failed!\n", __func__);
+        return -ENOMEM;
+}
+static void __devexit mceusb_dev_disconnect(struct usb_interface *intf)
+{
+        struct usb_device *dev = interface_to_usbdev(intf);
+        struct mceusb_dev *ir = usb_get_intfdata(intf);
+        usb_set_intfdata(intf, NULL);
+        if (!ir)
+                return;
+        ir->usbdev = NULL;
+        ir_input_unregister(ir->idev);
+        usb_kill_urb(ir->urb_in);
+        usb_free_urb(ir->urb_in);
+        usb_free_coherent(dev, ir->len_in, ir->buf_in, ir->dma_in);
+        kfree(ir);
+}
+static int mceusb_dev_suspend(struct usb_interface *intf, pm_message_t message)
+{
+        struct mceusb_dev *ir = usb_get_intfdata(intf);
+        dev_info(ir->dev, "suspend\n");
+        usb_kill_urb(ir->urb_in);
+        return 0;
+}
+static int mceusb_dev_resume(struct usb_interface *intf)
+{
+        struct mceusb_dev *ir = usb_get_intfdata(intf);
+        dev_info(ir->dev, "resume\n");
+        if (usb_submit_urb(ir->urb_in, GFP_ATOMIC))
+                return -EIO;
+        return 0;
+}
+static struct usb_driver mceusb_dev_driver = {
+        .name =         DRIVER_NAME,
+        .probe =        mceusb_dev_probe,
+        .disconnect =   mceusb_dev_disconnect,
+        .suspend =      mceusb_dev_suspend,
+        .resume =       mceusb_dev_resume,
+        .reset_resume = mceusb_dev_resume,
+        .id_table =     mceusb_dev_table
+};
+static int __init mceusb_dev_init(void)
+{
+        int ret;
+        ret = usb_register(&mceusb_dev_driver);
+        if (ret < 0)
+                printk(KERN_ERR DRIVER_NAME
+                       ": usb register failed, result = %d\n", ret);
+        return ret;
+}
+static void __exit mceusb_dev_exit(void)
+{
+        usb_deregister(&mceusb_dev_driver);
+}
+module_init(mceusb_dev_init);
+module_exit(mceusb_dev_exit);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_LICENSE("GPL");
+MODULE_DEVICE_TABLE(usb, mceusb_dev_table);
+module_param(debug, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "Debug enabled or not");
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index 7364b9642d00..4da2a54cb8bd 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -57,7 +57,7 @@ void saa7146_dma_free(struct saa7146_dev *dev,struct videobuf_queue *q,
        BUG_ON(in_interrupt());
        videobuf_waiton(&buf->vb,0,0);
-        videobuf_dma_unmap(q, dma);
+        videobuf_dma_unmap(q->dev, dma);
        videobuf_dma_free(dma);
        buf->vb.state = VIDEOBUF_NEEDS_INIT;
 }
diff --git a/drivers/media/common/saa7146_vbi.c b/drivers/media/common/saa7146_vbi.c
index 74e2b56ecb5b..8224c301d050 100644
--- a/drivers/media/common/saa7146_vbi.c
+++ b/drivers/media/common/saa7146_vbi.c
@@ -375,7 +375,7 @@ static void vbi_init(struct saa7146_dev *dev, struct saa7146_vv *vv)
 static int vbi_open(struct saa7146_dev *dev, struct file *file)
 {
-        struct saa7146_fh *fh = (struct saa7146_fh *)file->private_data;
+        struct saa7146_fh *fh = file->private_data;
        u32 arbtr_ctrl  = saa7146_read(dev, PCI_BT_V1);
        int ret = 0;
@@ -437,7 +437,7 @@ static int vbi_open(struct saa7146_dev *dev, struct file *file)
 static void vbi_close(struct saa7146_dev *dev, struct file *file)
 {
-        struct saa7146_fh *fh = (struct saa7146_fh *)file->private_data;
+        struct saa7146_fh *fh = file->private_data;
        struct saa7146_vv *vv = dev->vv_data;
        DEB_VBI(("dev:%p, fh:%p\n",dev,fh));
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index b8b2c551a1e2..a212a91a30f0 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -1370,7 +1370,7 @@ static void video_init(struct saa7146_dev *dev, struct saa7146_vv *vv)
 static int video_open(struct saa7146_dev *dev, struct file *file)
 {
-        struct saa7146_fh *fh = (struct saa7146_fh *)file->private_data;
+        struct saa7146_fh *fh = file->private_data;
        struct saa7146_format *sfmt;
        fh->video_fmt.width = 384;
@@ -1394,7 +1394,7 @@ static int video_open(struct saa7146_dev *dev, struct file *file)
 static void video_close(struct saa7146_dev *dev, struct file *file)
 {
-        struct saa7146_fh *fh = (struct saa7146_fh *)file->private_data;
+        struct saa7146_fh *fh = file->private_data;
        struct saa7146_vv *vv = dev->vv_data;
        struct videobuf_queue *q = &fh->video_q;
        int err;
diff --git a/drivers/media/common/tuners/tda18271-fe.c b/drivers/media/common/tuners/tda18271-fe.c
index b2e15456d5f3..7955e49a3440 100644
--- a/drivers/media/common/tuners/tda18271-fe.c
+++ b/drivers/media/common/tuners/tda18271-fe.c
@@ -1249,7 +1249,7 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
                                     struct tda18271_config *cfg)
 {
        struct tda18271_priv *priv = NULL;
-        int instance;
+        int instance, ret;
        mutex_lock(&tda18271_list_mutex);
@@ -1268,10 +1268,12 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
                priv->cal_initialized = false;
                mutex_init(&priv->lock);
-                if (tda_fail(tda18271_get_id(fe)))
+                ret = tda18271_get_id(fe);
+                if (tda_fail(ret))
                        goto fail;
-                if (tda_fail(tda18271_assign_map_layout(fe)))
+                ret = tda18271_assign_map_layout(fe);
+                if (tda_fail(ret))
                        goto fail;
                mutex_lock(&priv->lock);
diff --git a/drivers/media/common/tuners/tuner-simple.c b/drivers/media/common/tuners/tuner-simple.c
index 8abbcc5fcf95..f8ee29e6059c 100644
--- a/drivers/media/common/tuners/tuner-simple.c
+++ b/drivers/media/common/tuners/tuner-simple.c
@@ -524,6 +524,7 @@ static int simple_radio_bandswitch(struct dvb_frontend *fe, u8 *buffer)
                buffer[3] = 0x39;
                break;
        case TUNER_PHILIPS_FQ1216LME_MK3:
+        case TUNER_PHILIPS_FQ1236_MK5:
                tuner_err("This tuner doesn't have FM\n");
                /* Set the low band for sanity, since it covers 88-108 MHz */
                buffer[3] = 0x01;
@@ -545,14 +546,11 @@ static int simple_set_tv_freq(struct dvb_frontend *fe,
        struct tuner_simple_priv *priv = fe->tuner_priv;
        u8 config, cb;
        u16 div;
-        struct tunertype *tun;
        u8 buffer[4];
        int rc, IFPCoff, i;
        enum param_type desired_type;
        struct tuner_params *t_params;
-        tun = priv->tun;
        /* IFPCoff = Video Intermediate Frequency - Vif:
                940  =16*58.75  NTSC/J (Japan)
                732  =16*45.75  M/N STD
diff --git a/drivers/media/common/tuners/tuner-types.c b/drivers/media/common/tuners/tuner-types.c
index d9aaaca620c9..58a513bcd747 100644
--- a/drivers/media/common/tuners/tuner-types.c
+++ b/drivers/media/common/tuners/tuner-types.c
@@ -1353,6 +1353,17 @@ static struct tuner_params tuner_sony_btf_pxn01z_params[] = {
        },
 };
+/* ------------ TUNER_PHILIPS_FQ1236_MK5 - Philips NTSC ------------ */
+static struct tuner_params tuner_philips_fq1236_mk5_params[] = {
+        {
+                .type   = TUNER_PARAM_TYPE_NTSC,
+                .ranges = tuner_fm1236_mk3_ntsc_ranges,
+                .count  = ARRAY_SIZE(tuner_fm1236_mk3_ntsc_ranges),
+                .has_tda9887 = 1, /* TDA9885, no FM radio */
+        },
+};
 /* --------------------------------------------------------------------- */
 struct tunertype tuners[] = {
@@ -1826,6 +1837,11 @@ struct tunertype tuners[] = {
                .params = tuner_sony_btf_pxn01z_params,
                .count  = ARRAY_SIZE(tuner_sony_btf_pxn01z_params),
        },
+        [TUNER_PHILIPS_FQ1236_MK5] = { /* NTSC, TDA9885, no FM radio */
+                .name   = "Philips FQ1236 MK5",
+                .params = tuner_philips_fq1236_mk5_params,
+                .count  = ARRAY_SIZE(tuner_philips_fq1236_mk5_params),
+        },
 };
 EXPORT_SYMBOL(tuners);
diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c
index 432003dded7c..d2b2c12a5561 100644
--- a/drivers/media/common/tuners/xc5000.c
+++ b/drivers/media/common/tuners/xc5000.c
@@ -217,6 +217,7 @@ static int xc_send_i2c_data(struct xc5000_priv *priv, u8 *buf, int len)
        return XC_RESULT_SUCCESS;
 }
+#if 0
 /* This routine is never used because the only time we read data from the
   i2c bus is when we read registers, and we want that to be an atomic i2c
   transaction in case we are on a multi-master bus */
@@ -231,6 +232,27 @@ static int xc_read_i2c_data(struct xc5000_priv *priv, u8 *buf, int len)
        }
        return 0;
 }
+#endif
+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->i2c_props.addr,
+                        .flags = 0, .buf = &buf[0], .len = 2 },
+                { .addr = priv->i2c_props.addr,
+                        .flags = I2C_M_RD, .buf = &bval[0], .len = 2 },
+        };
+        if (i2c_transfer(priv->i2c_props.adap, msg, 2) != 2) {
+                printk(KERN_WARNING "xc5000: I2C read failed\n");
+                return -EREMOTEIO;
+        }
+        *val = (bval[0] << 8) | bval[1];
+        return XC_RESULT_SUCCESS;
+}
 static void xc_wait(int wait_ms)
 {
@@ -275,20 +297,14 @@ static int xc_write_reg(struct xc5000_priv *priv, u16 regAddr, u16 i2cData)
        if (result == XC_RESULT_SUCCESS) {
                /* wait for busy flag to clear */
                while ((WatchDogTimer > 0) && (result == XC_RESULT_SUCCESS)) {
-                        buf[0] = 0;
+                        result = xc5000_readreg(priv, XREG_BUSY, (u16 *)buf);
-                        buf[1] = XREG_BUSY;
-                        result = xc_send_i2c_data(priv, buf, 2);
                        if (result == XC_RESULT_SUCCESS) {
-                                result = xc_read_i2c_data(priv, buf, 2);
+                                if ((buf[0] == 0) && (buf[1] == 0)) {
-                                if (result == XC_RESULT_SUCCESS) {
+                                        /* busy flag cleared */
-                                        if ((buf[0] == 0) && (buf[1] == 0)) {
-                                                /* busy flag cleared */
                                        break;
-                                        } else {
+                                } else {
-                                                xc_wait(5); /* wait 5 ms */
+                                        xc_wait(5); /* wait 5 ms */
-                                                WatchDogTimer--;
+                                        WatchDogTimer--;
-                                        }
                                }
                        }
                }
@@ -526,25 +542,6 @@ static int xc_tune_channel(struct xc5000_priv *priv, u32 freq_hz, int mode)
        return found;
 }
-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->i2c_props.addr,
-                        .flags = 0, .buf = &buf[0], .len = 2 },
-                { .addr = priv->i2c_props.addr,
-                        .flags = I2C_M_RD, .buf = &bval[0], .len = 2 },
-        };
-        if (i2c_transfer(priv->i2c_props.adap, msg, 2) != 2) {
-                printk(KERN_WARNING "xc5000: I2C read failed\n");
-                return -EREMOTEIO;
-        }
-        *val = (bval[0] << 8) | bval[1];
-        return XC_RESULT_SUCCESS;
-}
 static int xc5000_fwupload(struct dvb_frontend *fe)
 {
diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c
index 770243c720d2..cf8705162845 100644
--- a/drivers/media/dvb/bt8xx/dst_ca.c
+++ b/drivers/media/dvb/bt8xx/dst_ca.c
@@ -565,7 +565,7 @@ static long dst_ca_ioctl(struct file *file, unsigned int cmd, unsigned long ioct
        int result = 0;
        lock_kernel();
-        dvbdev = (struct dvb_device *)file->private_data;
+        dvbdev = file->private_data;
        state = (struct dst_state *)dvbdev->priv;
        p_ca_message = kmalloc(sizeof (struct ca_msg), GFP_KERNEL);
        p_ca_slot_info = kmalloc(sizeof (struct ca_slot_info), GFP_KERNEL);
diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c
index 425862ffb285..0042306ea11b 100644
--- a/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/drivers/media/dvb/dvb-core/dmxdev.c
@@ -207,7 +207,7 @@ static int dvb_dvr_release(struct inode *inode, struct file *file)
        }
        /* TODO */
        dvbdev->users--;
-        if(dvbdev->users==-1 && dmxdev->exit==1) {
+        if (dvbdev->users == 1 && dmxdev->exit == 1) {
                fops_put(file->f_op);
                file->f_op = NULL;
                mutex_unlock(&dmxdev->mutex);
diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
index ef259a0718ac..cb97e6b85432 100644
--- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
@@ -1318,8 +1318,11 @@ static ssize_t dvb_ca_en50221_io_write(struct file *file,
                fragbuf[0] = connection_id;
                fragbuf[1] = ((fragpos + fraglen) < count) ? 0x80 : 0x00;
-                if ((status = copy_from_user(fragbuf + 2, buf + fragpos, fraglen)) != 0)
+                status = copy_from_user(fragbuf + 2, buf + fragpos, fraglen);
+                if (status) {
+                        status = -EFAULT;
                        goto exit;
+                }
                timeout = jiffies + HZ / 2;
                written = 0;
@@ -1494,8 +1497,11 @@ static ssize_t dvb_ca_en50221_io_read(struct file *file, char __user * buf,
        hdr[0] = slot;
        hdr[1] = connection_id;
-        if ((status = copy_to_user(buf, hdr, 2)) != 0)
+        status = copy_to_user(buf, hdr, 2);
+        if (status) {
+                status = -EFAULT;
                goto exit;
+        }
        status = pktlen;
 exit:
diff --git a/drivers/media/dvb/dvb-core/dvb_demux.c b/drivers/media/dvb/dvb-core/dvb_demux.c
index 977ddba3e235..4a88a3e4db2b 100644
--- a/drivers/media/dvb/dvb-core/dvb_demux.c
+++ b/drivers/media/dvb/dvb-core/dvb_demux.c
@@ -1130,13 +1130,9 @@ static int dvbdmx_write(struct dmx_demux *demux, const char __user *buf, size_t
        if ((!demux->frontend) || (demux->frontend->source != DMX_MEMORY_FE))
                return -EINVAL;
-        p = kmalloc(count, GFP_USER);
+        p = memdup_user(buf, count);
-        if (!p)
+        if (IS_ERR(p))
-                return -ENOMEM;
+                return PTR_ERR(p);
-        if (copy_from_user(p, buf, count)) {
-                kfree(p);
-                return -EFAULT;
-        }
        if (mutex_lock_interruptible(&dvbdemux->mutex)) {
                kfree(p);
                return -ERESTARTSYS;
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 44ae89ecef94..4d45b7d6b3fb 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -465,7 +465,7 @@ static void dvb_frontend_swzigzag(struct dvb_frontend *fe)
        if ((fepriv->state & FESTATE_SEARCHING_FAST) || (fepriv->state & FESTATE_RETUNE)) {
                fepriv->delay = fepriv->min_delay;
-                /* peform a tune */
+                /* perform a tune */
                retval = dvb_frontend_swzigzag_autotune(fe,
                                                        fepriv->check_wrapped);
                if (retval < 0) {
@@ -791,7 +791,7 @@ static int dvb_frontend_start(struct dvb_frontend *fe)
        return 0;
 }
-static void dvb_frontend_get_frequeny_limits(struct dvb_frontend *fe,
+static void dvb_frontend_get_frequency_limits(struct dvb_frontend *fe,
                                        u32 *freq_min, u32 *freq_max)
 {
        *freq_min = max(fe->ops.info.frequency_min, fe->ops.tuner_ops.info.frequency_min);
@@ -815,7 +815,7 @@ static int dvb_frontend_check_parameters(struct dvb_frontend *fe,
        u32 freq_max;
        /* range check: frequency */
-        dvb_frontend_get_frequeny_limits(fe, &freq_min, &freq_max);
+        dvb_frontend_get_frequency_limits(fe, &freq_min, &freq_max);
        if ((freq_min && parms->frequency < freq_min) ||
            (freq_max && parms->frequency > freq_max)) {
                printk(KERN_WARNING "DVB: adapter %i frontend %i frequency %u out of range (%u..%u)\n",
@@ -1627,7 +1627,7 @@ static int dvb_frontend_ioctl_legacy(struct file *file,
        case FE_GET_INFO: {
                struct dvb_frontend_info* info = parg;
                memcpy(info, &fe->ops.info, sizeof(struct dvb_frontend_info));
-                dvb_frontend_get_frequeny_limits(fe, &info->frequency_min, &info->frequency_max);
+                dvb_frontend_get_frequency_limits(fe, &info->frequency_min, &info->frequency_max);
                /* Force the CAN_INVERSION_AUTO bit on. If the frontend doesn't
                 * do it, it is done for it. */
@@ -1726,7 +1726,7 @@ static int dvb_frontend_ioctl_legacy(struct file *file,
                         * (stv0299 for instance) take longer than 8msec to
                         * respond to a set_voltage command.  Those switches
                         * need custom routines to switch properly.  For all
-                         * other frontends, the following shoule work ok.
+                         * other frontends, the following should work ok.
                         * Dish network legacy switches (as used by Dish500)
                         * are controlled by sending 9-bit command words
                         * spaced 8msec apart.
diff --git a/drivers/media/dvb/dvb-usb/a800.c b/drivers/media/dvb/dvb-usb/a800.c
index b6cbb1dfc5f1..a5c363727133 100644
--- a/drivers/media/dvb/dvb-usb/a800.c
+++ b/drivers/media/dvb/dvb-usb/a800.c
@@ -37,7 +37,7 @@ static int a800_identify_state(struct usb_device *udev, struct dvb_usb_device_pr
        return 0;
 }
-static struct dvb_usb_rc_key ir_codes_a800_table[] = {
+static struct ir_scancode ir_codes_a800_table[] = {
        { 0x0201, KEY_PROG1 },       /* SOURCE */
        { 0x0200, KEY_POWER },       /* POWER */
        { 0x0205, KEY_1 },           /* 1 */
@@ -146,10 +146,12 @@ static struct dvb_usb_device_properties a800_properties = {
        .power_ctrl       = a800_power_ctrl,
        .identify_state   = a800_identify_state,
-        .rc_interval      = DEFAULT_RC_INTERVAL,
+        .rc.legacy = {
-        .rc_key_map       = ir_codes_a800_table,
+                .rc_interval      = DEFAULT_RC_INTERVAL,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_a800_table),
+                .rc_key_map       = ir_codes_a800_table,
-        .rc_query         = a800_rc_query,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_a800_table),
+                .rc_query         = a800_rc_query,
+        },
        .i2c_algo         = &dibusb_i2c_algo,
diff --git a/drivers/media/dvb/dvb-usb/af9005-remote.c b/drivers/media/dvb/dvb-usb/af9005-remote.c
index b41fa873b04d..696207fe37ec 100644
--- a/drivers/media/dvb/dvb-usb/af9005-remote.c
+++ b/drivers/media/dvb/dvb-usb/af9005-remote.c
@@ -33,7 +33,7 @@ MODULE_PARM_DESC(debug,
 #define deb_decode(args...)   dprintk(dvb_usb_af9005_remote_debug,0x01,args)
-struct dvb_usb_rc_key ir_codes_af9005_table[] = {
+struct ir_scancode ir_codes_af9005_table[] = {
        {0x01b7, KEY_POWER},
        {0x01a7, KEY_VOLUMEUP},
@@ -133,7 +133,7 @@ int af9005_rc_decode(struct dvb_usb_device *d, u8 * data, int len, u32 * event,
                        for (i = 0; i < ir_codes_af9005_table_size; i++) {
                                if (rc5_custom(&ir_codes_af9005_table[i]) == cust
                                    && rc5_data(&ir_codes_af9005_table[i]) == dat) {
-                                        *event = ir_codes_af9005_table[i].event;
+                                        *event = ir_codes_af9005_table[i].keycode;
                                        *state = REMOTE_KEY_PRESSED;
                                        deb_decode
                                            ("key pressed, event %x\n", *event);
diff --git a/drivers/media/dvb/dvb-usb/af9005.c b/drivers/media/dvb/dvb-usb/af9005.c
index cfd6107d5349..8ecba8848bcf 100644
--- a/drivers/media/dvb/dvb-usb/af9005.c
+++ b/drivers/media/dvb/dvb-usb/af9005.c
@@ -54,50 +54,6 @@ struct af9005_device_state {
        int led_state;
 };
-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;
-        if (wbuf == NULL || wlen == 0)
-                return -EINVAL;
-        if ((ret = mutex_lock_interruptible(&d->usb_mutex)))
-                return ret;
-        deb_xfer(">>> ");
-        debug_dump(wbuf, wlen, deb_xfer);
-        ret = usb_bulk_msg(d->udev, usb_sndbulkpipe(d->udev,
-                                                    2), wbuf, wlen,
-                           &actlen, 2000);
-        if (ret)
-                err("bulk message failed: %d (%d/%d)", ret, wlen, actlen);
-        else
-                ret = actlen != wlen ? -1 : 0;
-        /* an answer is expected, and no error before */
-        if (!ret && rbuf && rlen) {
-                if (delay_ms)
-                        msleep(delay_ms);
-                ret = usb_bulk_msg(d->udev, usb_rcvbulkpipe(d->udev,
-                                                            0x01), rbuf,
-                                   rlen, &actlen, 2000);
-                if (ret)
-                        err("recv bulk message failed: %d", ret);
-                else {
-                        deb_xfer("<<< ");
-                        debug_dump(rbuf, actlen, deb_xfer);
-                }
-        }
-        mutex_unlock(&d->usb_mutex);
-        return ret;
-}
 static int af9005_generic_read_write(struct dvb_usb_device *d, u16 reg,
                              int readwrite, int type, u8 * values, int len)
 {
@@ -146,7 +102,7 @@ static int af9005_generic_read_write(struct dvb_usb_device *d, u16 reg,
                obuf[8] = values[0];
        obuf[7] = command;
-        ret = af9005_usb_generic_rw(d, obuf, 16, ibuf, 17, 0);
+        ret = dvb_usb_generic_rw(d, obuf, 16, ibuf, 17, 0);
        if (ret)
                return ret;
@@ -534,7 +490,7 @@ int af9005_send_command(struct dvb_usb_device *d, u8 command, u8 * wbuf,
        buf[6] = wlen;
        for (i = 0; i < wlen; i++)
                buf[7 + i] = wbuf[i];
-        ret = af9005_usb_generic_rw(d, buf, wlen + 7, ibuf, rlen + 7, 0);
+        ret = dvb_usb_generic_rw(d, buf, wlen + 7, ibuf, rlen + 7, 0);
        if (ret)
                return ret;
        if (ibuf[2] != 0x27) {
@@ -581,7 +537,7 @@ int af9005_read_eeprom(struct dvb_usb_device *d, u8 address, u8 * values,
        obuf[6] = len;
        obuf[7] = address;
-        ret = af9005_usb_generic_rw(d, obuf, 16, ibuf, 14, 0);
+        ret = dvb_usb_generic_rw(d, obuf, 16, ibuf, 14, 0);
        if (ret)
                return ret;
        if (ibuf[2] != 0x2b) {
@@ -882,7 +838,7 @@ static int af9005_rc_query(struct dvb_usb_device *d, u32 * event, int *state)
        obuf[2] = 0x40;         /* read remote */
        obuf[3] = 1;            /* rest of packet length */
        obuf[4] = st->sequence++;       /* sequence number */
-        ret = af9005_usb_generic_rw(d, obuf, 5, ibuf, 256, 0);
+        ret = dvb_usb_generic_rw(d, obuf, 5, ibuf, 256, 0);
        if (ret) {
                err("rc query failed");
                return ret;
@@ -1069,10 +1025,15 @@ static struct dvb_usb_device_properties af9005_properties = {
        .i2c_algo = &af9005_i2c_algo,
-        .rc_interval = 200,
+        .rc.legacy = {
-        .rc_key_map = NULL,
+                .rc_interval = 200,
-        .rc_key_map_size = 0,
+                .rc_key_map = NULL,
-        .rc_query = af9005_rc_query,
+                .rc_key_map_size = 0,
+                .rc_query = af9005_rc_query,
+        },
+        .generic_bulk_ctrl_endpoint          = 2,
+        .generic_bulk_ctrl_endpoint_response = 1,
        .num_device_descs = 3,
        .devices = {
@@ -1113,10 +1074,10 @@ static int __init af9005_usb_module_init(void)
        rc_keys_size = symbol_request(ir_codes_af9005_table_size);
        if (rc_decode == NULL || rc_keys == NULL || rc_keys_size == NULL) {
                err("af9005_rc_decode function not found, disabling remote");
-                af9005_properties.rc_query = NULL;
+                af9005_properties.rc.legacy.rc_query = NULL;
        } else {
-                af9005_properties.rc_key_map = rc_keys;
+                af9005_properties.rc.legacy.rc_key_map = rc_keys;
-                af9005_properties.rc_key_map_size = *rc_keys_size;
+                af9005_properties.rc.legacy.rc_key_map_size = *rc_keys_size;
        }
        return 0;
diff --git a/drivers/media/dvb/dvb-usb/af9005.h b/drivers/media/dvb/dvb-usb/af9005.h
index 088e7083a39b..3c1fbd1c5d60 100644
--- a/drivers/media/dvb/dvb-usb/af9005.h
+++ b/drivers/media/dvb/dvb-usb/af9005.h
@@ -3490,7 +3490,7 @@ extern u8 regmask[8];
 /* remote control decoder */
 extern int af9005_rc_decode(struct dvb_usb_device *d, u8 * data, int len,
                            u32 * event, int *state);
-extern struct dvb_usb_rc_key ir_codes_af9005_table[];
+extern struct ir_scancode ir_codes_af9005_table[];
 extern int ir_codes_af9005_table_size;
 #endif
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index 66c7c3ea7990..ea1ed3b4592a 100644
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -735,7 +735,7 @@ error:
 struct af9015_setup {
        unsigned int id;
-        struct dvb_usb_rc_key *rc_key_map;
+        struct ir_scancode *rc_key_map;
        unsigned int rc_key_map_size;
        u8 *ir_table;
        unsigned int ir_table_size;
@@ -847,8 +847,8 @@ static void af9015_set_remote_config(struct usb_device *udev,
        }
        if (table) {
-                props->rc_key_map = table->rc_key_map;
+                props->rc.legacy.rc_key_map = table->rc_key_map;
-                props->rc_key_map_size = table->rc_key_map_size;
+                props->rc.legacy.rc_key_map_size = table->rc_key_map_size;
                af9015_config.ir_table = table->ir_table;
                af9015_config.ir_table_size = table->ir_table_size;
        }
@@ -878,8 +878,8 @@ static int af9015_read_config(struct usb_device *udev)
        deb_info("%s: IR mode:%d\n", __func__, val);
        for (i = 0; i < af9015_properties_count; i++) {
                if (val == AF9015_IR_MODE_DISABLED) {
-                        af9015_properties[i].rc_key_map = NULL;
+                        af9015_properties[i].rc.legacy.rc_key_map = NULL;
-                        af9015_properties[i].rc_key_map_size  = 0;
+                        af9015_properties[i].rc.legacy.rc_key_map_size  = 0;
                } else
                        af9015_set_remote_config(udev, &af9015_properties[i]);
        }
@@ -1063,7 +1063,7 @@ 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;
+        struct ir_scancode *keymap = d->props.rc.legacy.rc_key_map;
        int i, ret;
        memset(buf, 0, sizeof(buf));
@@ -1075,10 +1075,10 @@ static int af9015_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
        *event = 0;
        *state = REMOTE_NO_KEY_PRESSED;
-        for (i = 0; i < d->props.rc_key_map_size; i++) {
+        for (i = 0; i < d->props.rc.legacy.rc_key_map_size; i++) {
                if (!buf[1] && rc5_custom(&keymap[i]) == buf[0] &&
                    rc5_data(&keymap[i]) == buf[2]) {
-                        *event = keymap[i].event;
+                        *event = keymap[i].keycode;
                        *state = REMOTE_KEY_PRESSED;
                        break;
                }
@@ -1299,6 +1299,7 @@ static struct usb_device_id af9015_usb_table[] = {
        {USB_DEVICE(USB_VID_LEADTEK,   USB_PID_WINFAST_DTV2000DS)},
 /* 30 */{USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_KWORLD_UB383_T)},
        {USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_KWORLD_395U_4)},
+        {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A815M)},
        {0},
 };
 MODULE_DEVICE_TABLE(usb, af9015_usb_table);
@@ -1353,8 +1354,10 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                .identify_state = af9015_identify_state,
-                .rc_query         = af9015_rc_query,
+                .rc.legacy = {
-                .rc_interval      = 150,
+                        .rc_query         = af9015_rc_query,
+                        .rc_interval      = 150,
+                },
                .i2c_algo = &af9015_i2c_algo,
@@ -1460,8 +1463,10 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                .identify_state = af9015_identify_state,
-                .rc_query         = af9015_rc_query,
+                .rc.legacy = {
-                .rc_interval      = 150,
+                        .rc_query         = af9015_rc_query,
+                        .rc_interval      = 150,
+                },
                .i2c_algo = &af9015_i2c_algo,
@@ -1567,12 +1572,14 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                .identify_state = af9015_identify_state,
-                .rc_query         = af9015_rc_query,
+                .rc.legacy = {
-                .rc_interval      = 150,
+                        .rc_query         = af9015_rc_query,
+                        .rc_interval      = 150,
+                },
                .i2c_algo = &af9015_i2c_algo,
-                .num_device_descs = 8, /* max 9 */
+                .num_device_descs = 9, /* max 9 */
                .devices = {
                        {
                                .name = "AverMedia AVerTV Volar GPS 805 (A805)",
@@ -1617,6 +1624,11 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                                .cold_ids = {&af9015_usb_table[30], NULL},
                                .warm_ids = {NULL},
                        },
+                        {
+                                .name = "AverMedia AVerTV Volar M (A815Mac)",
+                                .cold_ids = {&af9015_usb_table[32], NULL},
+                                .warm_ids = {NULL},
+                        },
                }
        },
 };
diff --git a/drivers/media/dvb/dvb-usb/af9015.h b/drivers/media/dvb/dvb-usb/af9015.h
index 63b2a4907b7e..c8e9349742ee 100644
--- a/drivers/media/dvb/dvb-usb/af9015.h
+++ b/drivers/media/dvb/dvb-usb/af9015.h
@@ -123,7 +123,7 @@ enum af9015_remote {
 /* LeadTek - Y04G0051 */
 /* Leadtek WinFast DTV Dongle Gold */
-static struct dvb_usb_rc_key ir_codes_af9015_table_leadtek[] = {
+static struct ir_scancode ir_codes_af9015_table_leadtek[] = {
        { 0x001e, KEY_1 },
        { 0x001f, KEY_2 },
        { 0x0020, KEY_3 },
@@ -227,7 +227,7 @@ static u8 af9015_ir_table_leadtek[] = {
 };
 /* TwinHan AzureWave AD-TU700(704J) */
-static struct dvb_usb_rc_key ir_codes_af9015_table_twinhan[] = {
+static struct ir_scancode ir_codes_af9015_table_twinhan[] = {
        { 0x053f, KEY_POWER },
        { 0x0019, KEY_FAVORITES },    /* Favorite List */
        { 0x0004, KEY_TEXT },         /* Teletext */
@@ -338,7 +338,7 @@ static u8 af9015_ir_table_twinhan[] = {
 };
 /* A-Link DTU(m) */
-static struct dvb_usb_rc_key ir_codes_af9015_table_a_link[] = {
+static struct ir_scancode ir_codes_af9015_table_a_link[] = {
        { 0x001e, KEY_1 },
        { 0x001f, KEY_2 },
        { 0x0020, KEY_3 },
@@ -381,7 +381,7 @@ static u8 af9015_ir_table_a_link[] = {
 };
 /* MSI DIGIVOX mini II V3.0 */
-static struct dvb_usb_rc_key ir_codes_af9015_table_msi[] = {
+static struct ir_scancode ir_codes_af9015_table_msi[] = {
        { 0x001e, KEY_1 },
        { 0x001f, KEY_2 },
        { 0x0020, KEY_3 },
@@ -424,7 +424,7 @@ static u8 af9015_ir_table_msi[] = {
 };
 /* MYGICTV U718 */
-static struct dvb_usb_rc_key ir_codes_af9015_table_mygictv[] = {
+static struct ir_scancode ir_codes_af9015_table_mygictv[] = {
        { 0x003d, KEY_SWITCHVIDEOMODE },
                                          /* TV / AV */
        { 0x0545, KEY_POWER },
@@ -550,7 +550,7 @@ static u8 af9015_ir_table_kworld[] = {
 };
 /* AverMedia Volar X */
-static struct dvb_usb_rc_key ir_codes_af9015_table_avermedia[] = {
+static struct ir_scancode ir_codes_af9015_table_avermedia[] = {
        { 0x053d, KEY_PROG1 },       /* SOURCE */
        { 0x0512, KEY_POWER },       /* POWER */
        { 0x051e, KEY_1 },           /* 1 */
@@ -656,7 +656,7 @@ static u8 af9015_ir_table_avermedia_ks[] = {
 };
 /* Digittrade DVB-T USB Stick */
-static struct dvb_usb_rc_key ir_codes_af9015_table_digittrade[] = {
+static struct ir_scancode ir_codes_af9015_table_digittrade[] = {
        { 0x010f, KEY_LAST },   /* RETURN */
        { 0x0517, KEY_TEXT },   /* TELETEXT */
        { 0x0108, KEY_EPG },    /* EPG */
@@ -719,7 +719,7 @@ static u8 af9015_ir_table_digittrade[] = {
 };
 /* TREKSTOR DVB-T USB Stick */
-static struct dvb_usb_rc_key ir_codes_af9015_table_trekstor[] = {
+static struct ir_scancode ir_codes_af9015_table_trekstor[] = {
        { 0x0704, KEY_AGAIN },          /* Home */
        { 0x0705, KEY_MUTE },           /* Mute */
        { 0x0706, KEY_UP },                     /* Up */
@@ -782,7 +782,7 @@ static u8 af9015_ir_table_trekstor[] = {
 };
 /* MSI DIGIVOX mini III */
-static struct dvb_usb_rc_key ir_codes_af9015_table_msi_digivox_iii[] = {
+static struct ir_scancode ir_codes_af9015_table_msi_digivox_iii[] = {
        { 0x0713, KEY_POWER },       /* [red power button] */
        { 0x073b, KEY_VIDEO },       /* Source */
        { 0x073e, KEY_ZOOM },        /* Zoom */
diff --git a/drivers/media/dvb/dvb-usb/anysee.c b/drivers/media/dvb/dvb-usb/anysee.c
index faca1ad88a67..4685259e1614 100644
--- a/drivers/media/dvb/dvb-usb/anysee.c
+++ b/drivers/media/dvb/dvb-usb/anysee.c
@@ -377,7 +377,7 @@ static int anysee_tuner_attach(struct dvb_usb_adapter *adap)
 static int anysee_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 {
        u8 buf[] = {CMD_GET_IR_CODE};
-        struct dvb_usb_rc_key *keymap = d->props.rc_key_map;
+        struct ir_scancode *keymap = d->props.rc.legacy.rc_key_map;
        u8 ircode[2];
        int i, ret;
@@ -388,10 +388,10 @@ static int anysee_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
        *event = 0;
        *state = REMOTE_NO_KEY_PRESSED;
-        for (i = 0; i < d->props.rc_key_map_size; i++) {
+        for (i = 0; i < d->props.rc.legacy.rc_key_map_size; i++) {
                if (rc5_custom(&keymap[i]) == ircode[0] &&
                    rc5_data(&keymap[i]) == ircode[1]) {
-                        *event = keymap[i].event;
+                        *event = keymap[i].keycode;
                        *state = REMOTE_KEY_PRESSED;
                        return 0;
                }
@@ -399,7 +399,7 @@ static int anysee_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
        return 0;
 }
-static struct dvb_usb_rc_key ir_codes_anysee_table[] = {
+static struct ir_scancode ir_codes_anysee_table[] = {
        { 0x0100, KEY_0 },
        { 0x0101, KEY_1 },
        { 0x0102, KEY_2 },
@@ -463,6 +463,11 @@ static int anysee_probe(struct usb_interface *intf,
        if (intf->num_altsetting < 1)
                return -ENODEV;
+        /*
+         * Anysee is always warm (its USB-bridge, Cypress FX2, uploads
+         * firmware from eeprom).  If dvb_usb_device_init() succeeds that
+         * means d is a valid pointer.
+         */
        ret = dvb_usb_device_init(intf, &anysee_properties, THIS_MODULE, &d,
                adapter_nr);
        if (ret)
@@ -479,10 +484,7 @@ static int anysee_probe(struct usb_interface *intf,
        if (ret)
                return ret;
-        if (d)
+        return anysee_init(d);
-                ret = anysee_init(d);
-        return ret;
 }
 static struct usb_device_id anysee_table[] = {
@@ -518,10 +520,12 @@ static struct dvb_usb_device_properties anysee_properties = {
                }
        },
-        .rc_key_map       = ir_codes_anysee_table,
+        .rc.legacy = {
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_anysee_table),
+                .rc_key_map       = ir_codes_anysee_table,
-        .rc_query         = anysee_rc_query,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_anysee_table),
-        .rc_interval      = 200,  /* windows driver uses 500ms */
+                .rc_query         = anysee_rc_query,
+                .rc_interval      = 200,  /* windows driver uses 500ms */
+        },
        .i2c_algo         = &anysee_i2c_algo,
diff --git a/drivers/media/dvb/dvb-usb/az6027.c b/drivers/media/dvb/dvb-usb/az6027.c
index 6681ac1c56e3..62c58288469f 100644
--- a/drivers/media/dvb/dvb-usb/az6027.c
+++ b/drivers/media/dvb/dvb-usb/az6027.c
@@ -386,7 +386,7 @@ static int az6027_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
 }
 /* keys for the enclosed remote control */
-static struct dvb_usb_rc_key ir_codes_az6027_table[] = {
+static struct ir_scancode ir_codes_az6027_table[] = {
        { 0x01, KEY_1 },
        { 0x02, KEY_2 },
 };
@@ -1125,10 +1125,13 @@ static struct dvb_usb_device_properties az6027_properties = {
        .power_ctrl       = az6027_power_ctrl,
        .read_mac_address = az6027_read_mac_addr,
 */
-        .rc_key_map       = ir_codes_az6027_table,
+        .rc.legacy = {
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_az6027_table),
+                .rc_key_map       = ir_codes_az6027_table,
-        .rc_interval      = 400,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_az6027_table),
-        .rc_query         = az6027_rc_query,
+                .rc_interval      = 400,
+                .rc_query         = az6027_rc_query,
+        },
        .i2c_algo         = &az6027_i2c_algo,
        .num_device_descs = 5,
diff --git a/drivers/media/dvb/dvb-usb/cinergyT2-core.c b/drivers/media/dvb/dvb-usb/cinergyT2-core.c
index 5a9c14bdc980..4f5aa83fc1fc 100644
--- a/drivers/media/dvb/dvb-usb/cinergyT2-core.c
+++ b/drivers/media/dvb/dvb-usb/cinergyT2-core.c
@@ -84,7 +84,7 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
        return 0;
 }
-static struct dvb_usb_rc_key ir_codes_cinergyt2_table[] = {
+static struct ir_scancode ir_codes_cinergyt2_table[] = {
        { 0x0401, KEY_POWER },
        { 0x0402, KEY_1 },
        { 0x0403, KEY_2 },
@@ -217,10 +217,12 @@ static struct dvb_usb_device_properties cinergyt2_properties = {
        .power_ctrl       = cinergyt2_power_ctrl,
-        .rc_interval      = 50,
+        .rc.legacy = {
-        .rc_key_map       = ir_codes_cinergyt2_table,
+                .rc_interval      = 50,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_cinergyt2_table),
+                .rc_key_map       = ir_codes_cinergyt2_table,
-        .rc_query         = cinergyt2_rc_query,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_cinergyt2_table),
+                .rc_query         = cinergyt2_rc_query,
+        },
        .generic_bulk_ctrl_endpoint = 1,
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index 11e9e85dac86..cd9f362c37b2 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -385,7 +385,7 @@ static int cxusb_d680_dmb_streaming_ctrl(
 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;
+        struct ir_scancode *keymap = d->props.rc.legacy.rc_key_map;
        u8 ircode[4];
        int i;
@@ -394,10 +394,10 @@ static int cxusb_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
        *event = 0;
        *state = REMOTE_NO_KEY_PRESSED;
-        for (i = 0; i < d->props.rc_key_map_size; i++) {
+        for (i = 0; i < d->props.rc.legacy.rc_key_map_size; i++) {
                if (rc5_custom(&keymap[i]) == ircode[2] &&
                    rc5_data(&keymap[i]) == ircode[3]) {
-                        *event = keymap[i].event;
+                        *event = keymap[i].keycode;
                        *state = REMOTE_KEY_PRESSED;
                        return 0;
@@ -410,7 +410,7 @@ static int cxusb_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 static int cxusb_bluebird2_rc_query(struct dvb_usb_device *d, u32 *event,
                                    int *state)
 {
-        struct dvb_usb_rc_key *keymap = d->props.rc_key_map;
+        struct ir_scancode *keymap = d->props.rc.legacy.rc_key_map;
        u8 ircode[4];
        int i;
        struct i2c_msg msg = { .addr = 0x6b, .flags = I2C_M_RD,
@@ -422,10 +422,10 @@ static int cxusb_bluebird2_rc_query(struct dvb_usb_device *d, u32 *event,
        if (cxusb_i2c_xfer(&d->i2c_adap, &msg, 1) != 1)
                return 0;
-        for (i = 0; i < d->props.rc_key_map_size; i++) {
+        for (i = 0; i < d->props.rc.legacy.rc_key_map_size; i++) {
                if (rc5_custom(&keymap[i]) == ircode[1] &&
                    rc5_data(&keymap[i]) == ircode[2]) {
-                        *event = keymap[i].event;
+                        *event = keymap[i].keycode;
                        *state = REMOTE_KEY_PRESSED;
                        return 0;
@@ -438,7 +438,7 @@ static int cxusb_bluebird2_rc_query(struct dvb_usb_device *d, u32 *event,
 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;
+        struct ir_scancode *keymap = d->props.rc.legacy.rc_key_map;
        u8 ircode[2];
        int i;
@@ -448,10 +448,10 @@ static int cxusb_d680_dmb_rc_query(struct dvb_usb_device *d, u32 *event,
        if (cxusb_ctrl_msg(d, 0x10, NULL, 0, ircode, 2) < 0)
                return 0;
-        for (i = 0; i < d->props.rc_key_map_size; i++) {
+        for (i = 0; i < d->props.rc.legacy.rc_key_map_size; i++) {
                if (rc5_custom(&keymap[i]) == ircode[0] &&
                    rc5_data(&keymap[i]) == ircode[1]) {
-                        *event = keymap[i].event;
+                        *event = keymap[i].keycode;
                        *state = REMOTE_KEY_PRESSED;
                        return 0;
@@ -461,7 +461,7 @@ static int cxusb_d680_dmb_rc_query(struct dvb_usb_device *d, u32 *event,
        return 0;
 }
-static struct dvb_usb_rc_key ir_codes_dvico_mce_table[] = {
+static struct ir_scancode ir_codes_dvico_mce_table[] = {
        { 0xfe02, KEY_TV },
        { 0xfe0e, KEY_MP3 },
        { 0xfe1a, KEY_DVD },
@@ -509,7 +509,7 @@ static struct dvb_usb_rc_key ir_codes_dvico_mce_table[] = {
        { 0xfe4e, KEY_POWER },
 };
-static struct dvb_usb_rc_key ir_codes_dvico_portable_table[] = {
+static struct ir_scancode ir_codes_dvico_portable_table[] = {
        { 0xfc02, KEY_SETUP },       /* Profile */
        { 0xfc43, KEY_POWER2 },
        { 0xfc06, KEY_EPG },
@@ -548,7 +548,7 @@ static struct dvb_usb_rc_key ir_codes_dvico_portable_table[] = {
        { 0xfc00, KEY_UNKNOWN },    /* HD */
 };
-static struct dvb_usb_rc_key ir_codes_d680_dmb_table[] = {
+static struct ir_scancode ir_codes_d680_dmb_table[] = {
        { 0x0038, KEY_UNKNOWN },        /* TV/AV */
        { 0x080c, KEY_ZOOM },
        { 0x0800, KEY_0 },
@@ -923,7 +923,7 @@ static int cxusb_dualdig4_frontend_attach(struct dvb_usb_adapter *adap)
                return -EIO;
        /* try to determine if there is no IR decoder on the I2C bus */
-        for (i = 0; adap->dev->props.rc_key_map != NULL && i < 5; i++) {
+        for (i = 0; adap->dev->props.rc.legacy.rc_key_map != NULL && i < 5; i++) {
                msleep(20);
                if (cxusb_i2c_xfer(&adap->dev->i2c_adap, &msg, 1) != 1)
                        goto no_IR;
@@ -931,7 +931,7 @@ static int cxusb_dualdig4_frontend_attach(struct dvb_usb_adapter *adap)
                        continue;
                if (ircode[2] + ircode[3] != 0xff) {
 no_IR:
-                        adap->dev->props.rc_key_map = NULL;
+                        adap->dev->props.rc.legacy.rc_key_map = NULL;
                        info("No IR receiver detected on this device.");
                        break;
                }
@@ -1451,10 +1451,12 @@ static struct dvb_usb_device_properties cxusb_bluebird_lgh064f_properties = {
        .i2c_algo         = &cxusb_i2c_algo,
-        .rc_interval      = 100,
+        .rc.legacy = {
-        .rc_key_map       = ir_codes_dvico_portable_table,
+                .rc_interval      = 100,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_portable_table),
+                .rc_key_map       = ir_codes_dvico_portable_table,
-        .rc_query         = cxusb_rc_query,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_portable_table),
+                .rc_query         = cxusb_rc_query,
+        },
        .generic_bulk_ctrl_endpoint = 0x01,
@@ -1502,10 +1504,12 @@ static struct dvb_usb_device_properties cxusb_bluebird_dee1601_properties = {
        .i2c_algo         = &cxusb_i2c_algo,
-        .rc_interval      = 150,
+        .rc.legacy = {
-        .rc_key_map       = ir_codes_dvico_mce_table,
+                .rc_interval      = 150,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_mce_table),
+                .rc_key_map       = ir_codes_dvico_mce_table,
-        .rc_query         = cxusb_rc_query,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_mce_table),
+                .rc_query         = cxusb_rc_query,
+        },
        .generic_bulk_ctrl_endpoint = 0x01,
@@ -1561,10 +1565,12 @@ static struct dvb_usb_device_properties cxusb_bluebird_lgz201_properties = {
        .i2c_algo         = &cxusb_i2c_algo,
-        .rc_interval      = 100,
+        .rc.legacy = {
-        .rc_key_map       = ir_codes_dvico_portable_table,
+                .rc_interval      = 100,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_portable_table),
+                .rc_key_map       = ir_codes_dvico_portable_table,
-        .rc_query         = cxusb_rc_query,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_portable_table),
+                .rc_query         = cxusb_rc_query,
+        },
        .generic_bulk_ctrl_endpoint = 0x01,
        .num_device_descs = 1,
@@ -1611,10 +1617,12 @@ static struct dvb_usb_device_properties cxusb_bluebird_dtt7579_properties = {
        .i2c_algo         = &cxusb_i2c_algo,
-        .rc_interval      = 100,
+        .rc.legacy = {
-        .rc_key_map       = ir_codes_dvico_portable_table,
+                .rc_interval      = 100,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_portable_table),
+                .rc_key_map       = ir_codes_dvico_portable_table,
-        .rc_query         = cxusb_rc_query,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_portable_table),
+                .rc_query         = cxusb_rc_query,
+        },
        .generic_bulk_ctrl_endpoint = 0x01,
@@ -1660,10 +1668,12 @@ static struct dvb_usb_device_properties cxusb_bluebird_dualdig4_properties = {
        .generic_bulk_ctrl_endpoint = 0x01,
-        .rc_interval      = 100,
+        .rc.legacy = {
-        .rc_key_map       = ir_codes_dvico_mce_table,
+                .rc_interval      = 100,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_mce_table),
+                .rc_key_map       = ir_codes_dvico_mce_table,
-        .rc_query         = cxusb_bluebird2_rc_query,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_mce_table),
+                .rc_query         = cxusb_bluebird2_rc_query,
+        },
        .num_device_descs = 1,
        .devices = {
@@ -1708,10 +1718,12 @@ static struct dvb_usb_device_properties cxusb_bluebird_nano2_properties = {
        .generic_bulk_ctrl_endpoint = 0x01,
-        .rc_interval      = 100,
+        .rc.legacy = {
-        .rc_key_map       = ir_codes_dvico_portable_table,
+                .rc_interval      = 100,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_portable_table),
+                .rc_key_map       = ir_codes_dvico_portable_table,
-        .rc_query         = cxusb_bluebird2_rc_query,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_portable_table),
+                .rc_query         = cxusb_bluebird2_rc_query,
+        },
        .num_device_descs = 1,
        .devices = {
@@ -1758,10 +1770,12 @@ static struct dvb_usb_device_properties cxusb_bluebird_nano2_needsfirmware_prope
        .generic_bulk_ctrl_endpoint = 0x01,
-        .rc_interval      = 100,
+        .rc.legacy = {
-        .rc_key_map       = ir_codes_dvico_portable_table,
+                .rc_interval      = 100,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_portable_table),
+                .rc_key_map       = ir_codes_dvico_portable_table,
-        .rc_query         = cxusb_rc_query,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_portable_table),
+                .rc_query         = cxusb_rc_query,
+        },
        .num_device_descs = 1,
        .devices = {
@@ -1849,10 +1863,12 @@ struct dvb_usb_device_properties cxusb_bluebird_dualdig4_rev2_properties = {
        .generic_bulk_ctrl_endpoint = 0x01,
-        .rc_interval      = 100,
+        .rc.legacy = {
-        .rc_key_map       = ir_codes_dvico_mce_table,
+                .rc_interval      = 100,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_mce_table),
+                .rc_key_map       = ir_codes_dvico_mce_table,
-        .rc_query         = cxusb_rc_query,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_mce_table),
+                .rc_query         = cxusb_rc_query,
+        },
        .num_device_descs = 1,
        .devices = {
@@ -1897,10 +1913,12 @@ static struct dvb_usb_device_properties cxusb_d680_dmb_properties = {
        .generic_bulk_ctrl_endpoint = 0x01,
-        .rc_interval      = 100,
+        .rc.legacy = {
-        .rc_key_map       = ir_codes_d680_dmb_table,
+                .rc_interval      = 100,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_d680_dmb_table),
+                .rc_key_map       = ir_codes_d680_dmb_table,
-        .rc_query         = cxusb_d680_dmb_rc_query,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_d680_dmb_table),
+                .rc_query         = cxusb_d680_dmb_rc_query,
+        },
        .num_device_descs = 1,
        .devices = {
@@ -1946,10 +1964,12 @@ static struct dvb_usb_device_properties cxusb_mygica_d689_properties = {
        .generic_bulk_ctrl_endpoint = 0x01,
-        .rc_interval      = 100,
+        .rc.legacy = {
-        .rc_key_map       = ir_codes_d680_dmb_table,
+                .rc_interval      = 100,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_d680_dmb_table),
+                .rc_key_map       = ir_codes_d680_dmb_table,
-        .rc_query         = cxusb_d680_dmb_rc_query,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_d680_dmb_table),
+                .rc_query         = cxusb_d680_dmb_rc_query,
+        },
        .num_device_descs = 1,
        .devices = {
diff --git a/drivers/media/dvb/dvb-usb/dib0700.h b/drivers/media/dvb/dvb-usb/dib0700.h
index 83fc24a6c31a..c2c9d236ec7e 100644
--- a/drivers/media/dvb/dvb-usb/dib0700.h
+++ b/drivers/media/dvb/dvb-usb/dib0700.h
@@ -60,6 +60,7 @@ extern int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff);
 extern struct i2c_algorithm dib0700_i2c_algo;
 extern int dib0700_identify_state(struct usb_device *udev, struct dvb_usb_device_properties *props,
                        struct dvb_usb_device_description **desc, int *cold);
+extern int dib0700_change_protocol(void *priv, u64 ir_type);
 extern int dib0700_device_count;
 extern int dvb_usb_dib0700_ir_proto;
diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c
index 4f961d2d1817..fe818348b8a3 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_core.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_core.c
@@ -13,10 +13,6 @@ int dvb_usb_dib0700_debug;
 module_param_named(debug,dvb_usb_dib0700_debug, int, 0644);
 MODULE_PARM_DESC(debug, "set debugging level (1=info,2=fw,4=fwdata,8=data (or-able))." DVB_USB_DEBUG_STATUS);
-int dvb_usb_dib0700_ir_proto = 1;
-module_param(dvb_usb_dib0700_ir_proto, int, 0644);
-MODULE_PARM_DESC(dvb_usb_dib0700_ir_proto, "set ir protocol (0=NEC, 1=RC5 (default), 2=RC6).");
 static int nb_packet_buffer_size = 21;
 module_param(nb_packet_buffer_size, int, 0644);
 MODULE_PARM_DESC(nb_packet_buffer_size,
@@ -53,7 +49,7 @@ static int dib0700_ctrl_wr(struct dvb_usb_device *d, u8 *tx, u8 txlen)
        int status;
        deb_data(">>> ");
-        debug_dump(tx,txlen,deb_data);
+        debug_dump(tx, txlen, deb_data);
        status = usb_control_msg(d->udev, usb_sndctrlpipe(d->udev,0),
                tx[0], USB_TYPE_VENDOR | USB_DIR_OUT, 0, 0, tx, txlen,
@@ -98,7 +94,7 @@ int dib0700_ctrl_rd(struct dvb_usb_device *d, u8 *tx, u8 txlen, u8 *rx, u8 rxlen
                deb_info("ep 0 read error (status = %d)\n",status);
        deb_data("<<< ");
-        debug_dump(rx,rxlen,deb_data);
+        debug_dump(rx, rxlen, deb_data);
        return status; /* length in case of success */
 }
@@ -106,28 +102,29 @@ int dib0700_ctrl_rd(struct dvb_usb_device *d, u8 *tx, u8 txlen, u8 *rx, u8 rxlen
 int dib0700_set_gpio(struct dvb_usb_device *d, enum dib07x0_gpios gpio, u8 gpio_dir, u8 gpio_val)
 {
        u8 buf[3] = { REQUEST_SET_GPIO, gpio, ((gpio_dir & 0x01) << 7) | ((gpio_val & 0x01) << 6) };
-        return dib0700_ctrl_wr(d,buf,3);
+        return dib0700_ctrl_wr(d, buf, sizeof(buf));
 }
 static int dib0700_set_usb_xfer_len(struct dvb_usb_device *d, u16 nb_ts_packets)
 {
-    struct dib0700_state *st = d->priv;
+        struct dib0700_state *st = d->priv;
-    u8 b[3];
+        u8 b[3];
-    int ret;
+        int ret;
-    if (st->fw_version >= 0x10201) {
+        if (st->fw_version >= 0x10201) {
-        b[0] = REQUEST_SET_USB_XFER_LEN;
+                b[0] = REQUEST_SET_USB_XFER_LEN;
-        b[1] = (nb_ts_packets >> 8)&0xff;
+                b[1] = (nb_ts_packets >> 8) & 0xff;
-        b[2] = nb_ts_packets & 0xff;
+                b[2] = nb_ts_packets & 0xff;
-        deb_info("set the USB xfer len to %i Ts packet\n", nb_ts_packets);
+                deb_info("set the USB xfer len to %i Ts packet\n", nb_ts_packets);
-        ret = dib0700_ctrl_wr(d, b, 3);
+                ret = dib0700_ctrl_wr(d, b, sizeof(b));
-    } else {
+        } else {
-        deb_info("this firmware does not allow to change the USB xfer len\n");
+                deb_info("this firmware does not allow to change the USB xfer len\n");
-        ret = -EIO;
+                ret = -EIO;
-    }
+        }
-    return ret;
+        return ret;
 }
 /*
@@ -178,7 +175,8 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg,
                        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);
+                        index = ((gen_mode << 6) & 0xC0) |
+                                ((bus_mode << 4) & 0x30);
                        result = usb_control_msg(d->udev,
                                                 usb_rcvctrlpipe(d->udev, 0),
@@ -198,11 +196,12 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg,
                } else {
                        /* Write request */
                        buf[0] = REQUEST_NEW_I2C_WRITE;
-                        buf[1] = (msg[i].addr << 1);
+                        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);
+                        buf[3] = ((gen_mode << 6) & 0xC0) |
+                                 ((bus_mode << 4) & 0x30);
                        /* The Actual i2c payload */
                        memcpy(&buf[4], msg[i].buf, msg[i].len);
@@ -240,7 +239,7 @@ static int dib0700_i2c_xfer_legacy(struct i2c_adapter *adap,
        for (i = 0; i < num; i++) {
                /* fill in the address */
-                buf[1] = (msg[i].addr << 1);
+                buf[1] = msg[i].addr << 1;
                /* fill the buffer */
                memcpy(&buf[2], msg[i].buf, msg[i].len);
@@ -368,7 +367,8 @@ int dib0700_download_firmware(struct usb_device *udev, const struct firmware *fw
        u8 buf[260];
        while ((ret = dvb_usb_get_hexline(fw, &hx, &pos)) > 0) {
-                deb_fwdata("writing to address 0x%08x (buffer: 0x%02x %02x)\n",hx.addr, hx.len, hx.chk);
+                deb_fwdata("writing to address 0x%08x (buffer: 0x%02x %02x)\n",
+                                hx.addr, hx.len, hx.chk);
                buf[0] = hx.len;
                buf[1] = (hx.addr >> 8) & 0xff;
@@ -408,16 +408,16 @@ int dib0700_download_firmware(struct usb_device *udev, const struct firmware *fw
                                  REQUEST_GET_VERSION,
                                  USB_TYPE_VENDOR | USB_DIR_IN, 0, 0,
                                  b, sizeof(b), USB_CTRL_GET_TIMEOUT);
-        fw_version = (b[8] << 24)  | (b[9] << 16)  | (b[10] << 8) | b[11];
+        fw_version = (b[8] << 24) | (b[9] << 16) | (b[10] << 8) | b[11];
        /* set the buffer size - DVB-USB is allocating URB buffers
         * only after the firwmare download was successful */
        for (i = 0; i < dib0700_device_count; i++) {
                for (adap_num = 0; adap_num < dib0700_devices[i].num_adapters;
                                adap_num++) {
-                        if (fw_version >= 0x10201)
+                        if (fw_version >= 0x10201) {
                                dib0700_devices[i].adapter[adap_num].stream.u.bulk.buffersize = 188*nb_packet_buffer_size;
-                        else {
+                        } else {
                                /* for fw version older than 1.20.1,
                                 * the buffersize has to be n times 512 */
                                dib0700_devices[i].adapter[adap_num].stream.u.bulk.buffersize = ((188*nb_packet_buffer_size+188/2)/512)*512;
@@ -453,7 +453,7 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
        if (st->disable_streaming_master_mode == 1)
                b[2] = 0x00;
        else
-                b[2] = (0x01 << 4); /* Master mode */
+                b[2] = 0x01 << 4; /* Master mode */
        b[3] = 0x00;
@@ -466,11 +466,44 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
        b[2] |= st->channel_state;
-        deb_info("data for streaming: %x %x\n",b[1],b[2]);
+        deb_info("data for streaming: %x %x\n", b[1], b[2]);
        return dib0700_ctrl_wr(adap->dev, b, 4);
 }
+int dib0700_change_protocol(void *priv, u64 ir_type)
+{
+        struct dvb_usb_device *d = priv;
+        struct dib0700_state *st = d->priv;
+        u8 rc_setup[3] = { REQUEST_SET_RC, 0, 0 };
+        int new_proto, ret;
+        /* Set the IR mode */
+        if (ir_type == IR_TYPE_RC5)
+                new_proto = 1;
+        else if (ir_type == IR_TYPE_NEC)
+                new_proto = 0;
+        else if (ir_type == IR_TYPE_RC6) {
+                if (st->fw_version < 0x10200)
+                        return -EINVAL;
+                new_proto = 2;
+        } else
+                return -EINVAL;
+        rc_setup[1] = new_proto;
+        ret = dib0700_ctrl_wr(d, rc_setup, sizeof(rc_setup));
+        if (ret < 0) {
+                err("ir protocol setup failed");
+                return ret;
+        }
+        d->props.rc.core.protocol = ir_type;
+        return ret;
+}
 /* Number of keypresses to ignore before start repeating */
 #define RC_REPEAT_DELAY_V1_20 10
@@ -478,7 +511,13 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
 struct dib0700_rc_response {
        u8 report_id;
        u8 data_state;
-        u16 system;
+        union {
+                u16 system16;
+                struct {
+                        u8 system;
+                        u8 not_system;
+                };
+        };
        u8 data;
        u8 not_data;
 };
@@ -487,14 +526,10 @@ struct dib0700_rc_response {
 static void dib0700_rc_urb_completion(struct urb *purb)
 {
        struct dvb_usb_device *d = purb->context;
-        struct dvb_usb_rc_key *keymap;
        struct dib0700_state *st;
-        struct dib0700_rc_response poll_reply;
+        struct dib0700_rc_response *poll_reply;
-        u8 *buf;
+        u32 uninitialized_var(keycode);
-        int found = 0;
+        u8 toggle;
-        u32 event;
-        int state;
-        int i;
        deb_info("%s()\n", __func__);
        if (d == NULL)
@@ -506,9 +541,8 @@ static void dib0700_rc_urb_completion(struct urb *purb)
                return;
        }
-        keymap = d->props.rc_key_map;
        st = d->priv;
-        buf = (u8 *)purb->transfer_buffer;
+        poll_reply = purb->transfer_buffer;
        if (purb->status < 0) {
                deb_info("discontinuing polling\n");
@@ -521,104 +555,52 @@ static void dib0700_rc_urb_completion(struct urb *purb)
                goto resubmit;
        }
-        /* Set initial results in case we exit the function early */
+        deb_data("IR ID = %02X state = %02X System = %02X %02X Cmd = %02X %02X (len %d)\n",
-        event = 0;
+                 poll_reply->report_id, poll_reply->data_state,
-        state = REMOTE_NO_KEY_PRESSED;
+                 poll_reply->system, poll_reply->not_system,
+                 poll_reply->data, poll_reply->not_data,
-        deb_data("IR raw %02X %02X %02X %02X %02X %02X (len %d)\n", buf[0],
+                 purb->actual_length);
-                 buf[1], buf[2], buf[3], buf[4], buf[5], purb->actual_length);
-        switch (dvb_usb_dib0700_ir_proto) {
+        switch (d->props.rc.core.protocol) {
-        case 0:
+        case IR_TYPE_NEC:
-                /* NEC Protocol */
+                toggle = 0;
-                poll_reply.report_id  = 0;
-                poll_reply.data_state = 1;
-                poll_reply.system     = buf[2];
-                poll_reply.data       = buf[4];
-                poll_reply.not_data   = buf[5];
                /* NEC protocol sends repeat code as 0 0 0 FF */
-                if ((poll_reply.system == 0x00) && (poll_reply.data == 0x00)
+                if ((poll_reply->system == 0x00) && (poll_reply->data == 0x00)
-                    && (poll_reply.not_data == 0xff)) {
+                    && (poll_reply->not_data == 0xff)) {
-                        poll_reply.data_state = 2;
+                        poll_reply->data_state = 2;
                        break;
                }
+                if ((poll_reply->system ^ poll_reply->not_system) != 0xff) {
+                        deb_data("NEC extended protocol\n");
+                        /* NEC extended code - 24 bits */
+                        keycode = poll_reply->system16 << 8 | poll_reply->data;
+                } else {
+                        deb_data("NEC normal protocol\n");
+                        /* normal NEC code - 16 bits */
+                        keycode = poll_reply->system << 8 | poll_reply->data;
+                }
                break;
        default:
+                deb_data("RC5 protocol\n");
                /* RC5 Protocol */
-                poll_reply.report_id  = buf[0];
+                toggle = poll_reply->report_id;
-                poll_reply.data_state = buf[1];
+                keycode = poll_reply->system16 << 8 | poll_reply->data;
-                poll_reply.system     = (buf[2] << 8) | buf[3];
-                poll_reply.data       = buf[4];
-                poll_reply.not_data   = buf[5];
                break;
        }
-        if ((poll_reply.data + poll_reply.not_data) != 0xff) {
+        if ((poll_reply->data + poll_reply->not_data) != 0xff) {
                /* Key failed integrity check */
                err("key failed integrity check: %04x %02x %02x",
-                    poll_reply.system,
+                    poll_reply->system,
-                    poll_reply.data, poll_reply.not_data);
+                    poll_reply->data, poll_reply->not_data);
-                goto resubmit;
-        }
-        deb_data("rid=%02x ds=%02x sm=%04x d=%02x nd=%02x\n",
-                 poll_reply.report_id, poll_reply.data_state,
-                 poll_reply.system, poll_reply.data, poll_reply.not_data);
-        /* Find the key in the map */
-        for (i = 0; i < d->props.rc_key_map_size; i++) {
-                if (rc5_custom(&keymap[i]) == (poll_reply.system & 0xff) &&
-                    rc5_data(&keymap[i]) == poll_reply.data) {
-                        event = keymap[i].event;
-                        found = 1;
-                        break;
-                }
-        }
-        if (found == 0) {
-                err("Unknown remote controller key: %04x %02x %02x",
-                    poll_reply.system, poll_reply.data, poll_reply.not_data);
-                d->last_event = 0;
                goto resubmit;
        }
-        if (poll_reply.data_state == 1) {
+        ir_keydown(d->rc_input_dev, keycode, toggle);
-                /* New key hit */
-                st->rc_counter = 0;
-                event = keymap[i].event;
-                state = REMOTE_KEY_PRESSED;
-                d->last_event = keymap[i].event;
-        } else if (poll_reply.data_state == 2) {
-                /* Key repeated */
-                st->rc_counter++;
-                /* prevents unwanted double hits */
-                if (st->rc_counter > RC_REPEAT_DELAY_V1_20) {
-                        event = d->last_event;
-                        state = REMOTE_KEY_PRESSED;
-                        st->rc_counter = RC_REPEAT_DELAY_V1_20;
-                }
-        } else {
-                err("Unknown data state [%d]", poll_reply.data_state);
-        }
-        switch (state) {
-        case REMOTE_NO_KEY_PRESSED:
-                break;
-        case REMOTE_KEY_PRESSED:
-                deb_info("key pressed\n");
-                d->last_event = event;
-        case REMOTE_KEY_REPEAT:
-                deb_info("key repeated\n");
-                input_event(d->rc_input_dev, EV_KEY, event, 1);
-                input_sync(d->rc_input_dev);
-                input_event(d->rc_input_dev, EV_KEY, d->last_event, 0);
-                input_sync(d->rc_input_dev);
-                break;
-        default:
-                break;
-        }
 resubmit:
        /* Clean the buffer before we requeue */
@@ -631,21 +613,10 @@ resubmit:
 int dib0700_rc_setup(struct dvb_usb_device *d)
 {
        struct dib0700_state *st = d->priv;
-        u8 rc_setup[3] = {REQUEST_SET_RC, dvb_usb_dib0700_ir_proto, 0};
        struct urb *purb;
        int ret;
-        int i;
-        if (d->props.rc_key_map == NULL)
-                return 0;
-        /* Set the IR mode */
-        i = dib0700_ctrl_wr(d, rc_setup, 3);
-        if (i<0) {
-                err("ir protocol setup failed");
-                return -1;
-        }
+        /* Poll-based. Don't initialize bulk mode */
        if (st->fw_version < 0x10200)
                return 0;
@@ -653,14 +624,14 @@ int dib0700_rc_setup(struct dvb_usb_device *d)
        purb = usb_alloc_urb(0, GFP_KERNEL);
        if (purb == NULL) {
                err("rc usb alloc urb failed\n");
-                return -1;
+                return -ENOMEM;
        }
        purb->transfer_buffer = kzalloc(RC_MSG_SIZE_V1_20, GFP_KERNEL);
        if (purb->transfer_buffer == NULL) {
                err("rc kzalloc failed\n");
                usb_free_urb(purb);
-                return -1;
+                return -ENOMEM;
        }
        purb->status = -EINPROGRESS;
@@ -669,12 +640,10 @@ int dib0700_rc_setup(struct dvb_usb_device *d)
                          dib0700_rc_urb_completion, d);
        ret = usb_submit_urb(purb, GFP_ATOMIC);
-        if (ret != 0) {
+        if (ret)
                err("rc submit urb failed\n");
-                return -1;
-        }
-        return 0;
+        return ret;
 }
 static int dib0700_probe(struct usb_interface *intf,
@@ -698,6 +667,15 @@ static int dib0700_probe(struct usb_interface *intf,
                        st->fw_version = fw_version;
                        st->nb_packet_buffer_size = (u32)nb_packet_buffer_size;
+                        /* Disable polling mode on newer firmwares */
+                        if (st->fw_version >= 0x10200)
+                                dev->props.rc.core.bulk_mode = true;
+                        else
+                                dev->props.rc.core.bulk_mode = false;
+                        /* Need a higher delay, to avoid wrong repeat */
+                        dev->rc_input_dev->rep[REP_DELAY] = 500;
                        dib0700_rc_setup(dev);
                        return 0;
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index 800800a9649e..f634d2e784b2 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -473,16 +473,19 @@ static u8 rc_request[] = { REQUEST_POLL_RC, 0 };
 /* Number of keypresses to ignore before start repeating */
 #define RC_REPEAT_DELAY 6
-static int dib0700_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+/*
+ * This function is used only when firmware is < 1.20 version. Newer
+ * firmwares use bulk mode, with functions implemented at dib0700_core,
+ * at dib0700_rc_urb_completion()
+ */
+static int dib0700_rc_query_old_firmware(struct dvb_usb_device *d)
 {
        u8 key[4];
+        u32 keycode;
+        u8 toggle;
        int i;
-        struct dvb_usb_rc_key *keymap = d->props.rc_key_map;
        struct dib0700_state *st = d->priv;
-        *event = 0;
-        *state = REMOTE_NO_KEY_PRESSED;
        if (st->fw_version >= 0x10200) {
                /* For 1.20 firmware , We need to keep the RC polling
                   callback so we can reuse the input device setup in
@@ -491,348 +494,45 @@ static int dib0700_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
                return 0;
        }
-        i=dib0700_ctrl_rd(d,rc_request,2,key,4);
+        i = dib0700_ctrl_rd(d, rc_request, 2, key, 4);
-        if (i<=0) {
+        if (i <= 0) {
                err("RC Query Failed");
                return -1;
        }
        /* losing half of KEY_0 events from Philipps rc5 remotes.. */
-        if (key[0]==0 && key[1]==0 && key[2]==0 && key[3]==0) return 0;
+        if (key[0] == 0 && key[1] == 0 && key[2] == 0 && key[3] == 0)
+                return 0;
        /* info("%d: %2X %2X %2X %2X",dvb_usb_dib0700_ir_proto,(int)key[3-2],(int)key[3-3],(int)key[3-1],(int)key[3]);  */
        dib0700_rc_setup(d); /* reset ir sensor data to prevent false events */
-        switch (dvb_usb_dib0700_ir_proto) {
+        d->last_event = 0;
-        case 0: {
+        switch (d->props.rc.core.protocol) {
+        case IR_TYPE_NEC:
                /* NEC protocol sends repeat code as 0 0 0 FF */
                if ((key[3-2] == 0x00) && (key[3-3] == 0x00) &&
-                    (key[3] == 0xFF)) {
+                    (key[3] == 0xff))
-                        st->rc_counter++;
+                        keycode = d->last_event;
-                        if (st->rc_counter > RC_REPEAT_DELAY) {
+                else {
-                                *event = d->last_event;
+                        keycode = key[3-2] << 8 | key[3-3];
-                                *state = REMOTE_KEY_PRESSED;
+                        d->last_event = keycode;
-                                st->rc_counter = RC_REPEAT_DELAY;
-                        }
-                        return 0;
-                }
-                for (i=0;i<d->props.rc_key_map_size; i++) {
-                        if (rc5_custom(&keymap[i]) == key[3-2] &&
-                            rc5_data(&keymap[i]) == key[3-3]) {
-                                st->rc_counter = 0;
-                                *event = keymap[i].event;
-                                *state = REMOTE_KEY_PRESSED;
-                                d->last_event = keymap[i].event;
-                                return 0;
-                        }
                }
+                ir_keydown(d->rc_input_dev, keycode, 0);
                break;
-        }
+        default:
-        default: {
                /* RC-5 protocol changes toggle bit on new keypress */
-                for (i = 0; i < d->props.rc_key_map_size; i++) {
+                keycode = key[3-2] << 8 | key[3-3];
-                        if (rc5_custom(&keymap[i]) == key[3-2] &&
+                toggle = key[3-1];
-                            rc5_data(&keymap[i]) == key[3-3]) {
+                ir_keydown(d->rc_input_dev, keycode, toggle);
-                                if (d->last_event == keymap[i].event &&
-                                        key[3-1] == st->rc_toggle) {
-                                        st->rc_counter++;
-                                        /* prevents unwanted double hits */
-                                        if (st->rc_counter > RC_REPEAT_DELAY) {
-                                                *event = d->last_event;
-                                                *state = REMOTE_KEY_PRESSED;
-                                                st->rc_counter = RC_REPEAT_DELAY;
-                                        }
-                                        return 0;
-                                }
-                                st->rc_counter = 0;
-                                *event = keymap[i].event;
-                                *state = REMOTE_KEY_PRESSED;
-                                st->rc_toggle = key[3-1];
-                                d->last_event = keymap[i].event;
-                                return 0;
-                        }
-                }
                break;
        }
-        }
-        err("Unknown remote controller key: %2X %2X %2X %2X", (int) key[3-2], (int) key[3-3], (int) key[3-1], (int) key[3]);
-        d->last_event = 0;
        return 0;
 }
-static struct dvb_usb_rc_key ir_codes_dib0700_table[] = {
-        /* Key codes for the tiny Pinnacle remote*/
-        { 0x0700, KEY_MUTE },
-        { 0x0701, KEY_MENU }, /* Pinnacle logo */
-        { 0x0739, KEY_POWER },
-        { 0x0703, KEY_VOLUMEUP },
-        { 0x0709, KEY_VOLUMEDOWN },
-        { 0x0706, KEY_CHANNELUP },
-        { 0x070c, KEY_CHANNELDOWN },
-        { 0x070f, KEY_1 },
-        { 0x0715, KEY_2 },
-        { 0x0710, KEY_3 },
-        { 0x0718, KEY_4 },
-        { 0x071b, KEY_5 },
-        { 0x071e, KEY_6 },
-        { 0x0711, KEY_7 },
-        { 0x0721, KEY_8 },
-        { 0x0712, KEY_9 },
-        { 0x0727, KEY_0 },
-        { 0x0724, KEY_SCREEN }, /* 'Square' key */
-        { 0x072a, KEY_TEXT },   /* 'T' key */
-        { 0x072d, KEY_REWIND },
-        { 0x0730, KEY_PLAY },
-        { 0x0733, KEY_FASTFORWARD },
-        { 0x0736, KEY_RECORD },
-        { 0x073c, KEY_STOP },
-        { 0x073f, KEY_CANCEL }, /* '?' key */
-        /* Key codes for the Terratec Cinergy DT XS Diversity, similar to cinergyT2.c */
-        { 0xeb01, KEY_POWER },
-        { 0xeb02, KEY_1 },
-        { 0xeb03, KEY_2 },
-        { 0xeb04, KEY_3 },
-        { 0xeb05, KEY_4 },
-        { 0xeb06, KEY_5 },
-        { 0xeb07, KEY_6 },
-        { 0xeb08, KEY_7 },
-        { 0xeb09, KEY_8 },
-        { 0xeb0a, KEY_9 },
-        { 0xeb0b, KEY_VIDEO },
-        { 0xeb0c, KEY_0 },
-        { 0xeb0d, KEY_REFRESH },
-        { 0xeb0f, KEY_EPG },
-        { 0xeb10, KEY_UP },
-        { 0xeb11, KEY_LEFT },
-        { 0xeb12, KEY_OK },
-        { 0xeb13, KEY_RIGHT },
-        { 0xeb14, KEY_DOWN },
-        { 0xeb16, KEY_INFO },
-        { 0xeb17, KEY_RED },
-        { 0xeb18, KEY_GREEN },
-        { 0xeb19, KEY_YELLOW },
-        { 0xeb1a, KEY_BLUE },
-        { 0xeb1b, KEY_CHANNELUP },
-        { 0xeb1c, KEY_VOLUMEUP },
-        { 0xeb1d, KEY_MUTE },
-        { 0xeb1e, KEY_VOLUMEDOWN },
-        { 0xeb1f, KEY_CHANNELDOWN },
-        { 0xeb40, KEY_PAUSE },
-        { 0xeb41, KEY_HOME },
-        { 0xeb42, KEY_MENU }, /* DVD Menu */
-        { 0xeb43, KEY_SUBTITLE },
-        { 0xeb44, KEY_TEXT }, /* Teletext */
-        { 0xeb45, KEY_DELETE },
-        { 0xeb46, KEY_TV },
-        { 0xeb47, KEY_DVD },
-        { 0xeb48, KEY_STOP },
-        { 0xeb49, KEY_VIDEO },
-        { 0xeb4a, KEY_AUDIO }, /* Music */
-        { 0xeb4b, KEY_SCREEN }, /* Pic */
-        { 0xeb4c, KEY_PLAY },
-        { 0xeb4d, KEY_BACK },
-        { 0xeb4e, KEY_REWIND },
-        { 0xeb4f, KEY_FASTFORWARD },
-        { 0xeb54, KEY_PREVIOUS },
-        { 0xeb58, KEY_RECORD },
-        { 0xeb5c, KEY_NEXT },
-        /* Key codes for the Haupauge WinTV Nova-TD, copied from nova-t-usb2.c (Nova-T USB2) */
-        { 0x1e00, KEY_0 },
-        { 0x1e01, KEY_1 },
-        { 0x1e02, KEY_2 },
-        { 0x1e03, KEY_3 },
-        { 0x1e04, KEY_4 },
-        { 0x1e05, KEY_5 },
-        { 0x1e06, KEY_6 },
-        { 0x1e07, KEY_7 },
-        { 0x1e08, KEY_8 },
-        { 0x1e09, KEY_9 },
-        { 0x1e0a, KEY_KPASTERISK },
-        { 0x1e0b, KEY_RED },
-        { 0x1e0c, KEY_RADIO },
-        { 0x1e0d, KEY_MENU },
-        { 0x1e0e, KEY_GRAVE }, /* # */
-        { 0x1e0f, KEY_MUTE },
-        { 0x1e10, KEY_VOLUMEUP },
-        { 0x1e11, KEY_VOLUMEDOWN },
-        { 0x1e12, KEY_CHANNEL },
-        { 0x1e14, KEY_UP },
-        { 0x1e15, KEY_DOWN },
-        { 0x1e16, KEY_LEFT },
-        { 0x1e17, KEY_RIGHT },
-        { 0x1e18, KEY_VIDEO },
-        { 0x1e19, KEY_AUDIO },
-        { 0x1e1a, KEY_MEDIA },
-        { 0x1e1b, KEY_EPG },
-        { 0x1e1c, KEY_TV },
-        { 0x1e1e, KEY_NEXT },
-        { 0x1e1f, KEY_BACK },
-        { 0x1e20, KEY_CHANNELUP },
-        { 0x1e21, KEY_CHANNELDOWN },
-        { 0x1e24, KEY_LAST }, /* Skip backwards */
-        { 0x1e25, KEY_OK },
-        { 0x1e29, KEY_BLUE},
-        { 0x1e2e, KEY_GREEN },
-        { 0x1e30, KEY_PAUSE },
-        { 0x1e32, KEY_REWIND },
-        { 0x1e34, KEY_FASTFORWARD },
-        { 0x1e35, KEY_PLAY },
-        { 0x1e36, KEY_STOP },
-        { 0x1e37, KEY_RECORD },
-        { 0x1e38, KEY_YELLOW },
-        { 0x1e3b, KEY_GOTO },
-        { 0x1e3d, KEY_POWER },
-        /* Key codes for the Leadtek Winfast DTV Dongle */
-        { 0x0042, KEY_POWER },
-        { 0x077c, KEY_TUNER },
-        { 0x0f4e, KEY_PRINT }, /* PREVIEW */
-        { 0x0840, KEY_SCREEN }, /* full screen toggle*/
-        { 0x0f71, KEY_DOT }, /* frequency */
-        { 0x0743, KEY_0 },
-        { 0x0c41, KEY_1 },
-        { 0x0443, KEY_2 },
-        { 0x0b7f, KEY_3 },
-        { 0x0e41, KEY_4 },
-        { 0x0643, KEY_5 },
-        { 0x097f, KEY_6 },
-        { 0x0d7e, KEY_7 },
-        { 0x057c, KEY_8 },
-        { 0x0a40, KEY_9 },
-        { 0x0e4e, KEY_CLEAR },
-        { 0x047c, KEY_CHANNEL }, /* show channel number */
-        { 0x0f41, KEY_LAST }, /* recall */
-        { 0x0342, KEY_MUTE },
-        { 0x064c, KEY_RESERVED }, /* PIP button*/
-        { 0x0172, KEY_SHUFFLE }, /* SNAPSHOT */
-        { 0x0c4e, KEY_PLAYPAUSE }, /* TIMESHIFT */
-        { 0x0b70, KEY_RECORD },
-        { 0x037d, KEY_VOLUMEUP },
-        { 0x017d, KEY_VOLUMEDOWN },
-        { 0x0242, KEY_CHANNELUP },
-        { 0x007d, KEY_CHANNELDOWN },
-        /* Key codes for Nova-TD "credit card" remote control. */
-        { 0x1d00, KEY_0 },
-        { 0x1d01, KEY_1 },
-        { 0x1d02, KEY_2 },
-        { 0x1d03, KEY_3 },
-        { 0x1d04, KEY_4 },
-        { 0x1d05, KEY_5 },
-        { 0x1d06, KEY_6 },
-        { 0x1d07, KEY_7 },
-        { 0x1d08, KEY_8 },
-        { 0x1d09, KEY_9 },
-        { 0x1d0a, KEY_TEXT },
-        { 0x1d0d, KEY_MENU },
-        { 0x1d0f, KEY_MUTE },
-        { 0x1d10, KEY_VOLUMEUP },
-        { 0x1d11, KEY_VOLUMEDOWN },
-        { 0x1d12, KEY_CHANNEL },
-        { 0x1d14, KEY_UP },
-        { 0x1d15, KEY_DOWN },
-        { 0x1d16, KEY_LEFT },
-        { 0x1d17, KEY_RIGHT },
-        { 0x1d1c, KEY_TV },
-        { 0x1d1e, KEY_NEXT },
-        { 0x1d1f, KEY_BACK },
-        { 0x1d20, KEY_CHANNELUP },
-        { 0x1d21, KEY_CHANNELDOWN },
-        { 0x1d24, KEY_LAST },
-        { 0x1d25, KEY_OK },
-        { 0x1d30, KEY_PAUSE },
-        { 0x1d32, KEY_REWIND },
-        { 0x1d34, KEY_FASTFORWARD },
-        { 0x1d35, KEY_PLAY },
-        { 0x1d36, KEY_STOP },
-        { 0x1d37, KEY_RECORD },
-        { 0x1d3b, KEY_GOTO },
-        { 0x1d3d, KEY_POWER },
-        /* Key codes for the Pixelview SBTVD remote (proto NEC) */
-        { 0x8613, KEY_MUTE },
-        { 0x8612, KEY_POWER },
-        { 0x8601, KEY_1 },
-        { 0x8602, KEY_2 },
-        { 0x8603, KEY_3 },
-        { 0x8604, KEY_4 },
-        { 0x8605, KEY_5 },
-        { 0x8606, KEY_6 },
-        { 0x8607, KEY_7 },
-        { 0x8608, KEY_8 },
-        { 0x8609, KEY_9 },
-        { 0x8600, KEY_0 },
-        { 0x860d, KEY_CHANNELUP },
-        { 0x8619, KEY_CHANNELDOWN },
-        { 0x8610, KEY_VOLUMEUP },
-        { 0x860c, KEY_VOLUMEDOWN },
-        { 0x860a, KEY_CAMERA },
-        { 0x860b, KEY_ZOOM },
-        { 0x861b, KEY_BACKSPACE },
-        { 0x8615, KEY_ENTER },
-        { 0x861d, KEY_UP },
-        { 0x861e, KEY_DOWN },
-        { 0x860e, KEY_LEFT },
-        { 0x860f, KEY_RIGHT },
-        { 0x8618, KEY_RECORD },
-        { 0x861a, KEY_STOP },
-        /* Key codes for the EvolutePC TVWay+ remote (proto NEC) */
-        { 0x7a00, KEY_MENU },
-        { 0x7a01, KEY_RECORD },
-        { 0x7a02, KEY_PLAY },
-        { 0x7a03, KEY_STOP },
-        { 0x7a10, KEY_CHANNELUP },
-        { 0x7a11, KEY_CHANNELDOWN },
-        { 0x7a12, KEY_VOLUMEUP },
-        { 0x7a13, KEY_VOLUMEDOWN },
-        { 0x7a40, KEY_POWER },
-        { 0x7a41, KEY_MUTE },
-        /* Key codes for the Elgato EyeTV Diversity silver remote,
-           set dvb_usb_dib0700_ir_proto=0 */
-        { 0x4501, KEY_POWER },
-        { 0x4502, KEY_MUTE },
-        { 0x4503, KEY_1 },
-        { 0x4504, KEY_2 },
-        { 0x4505, KEY_3 },
-        { 0x4506, KEY_4 },
-        { 0x4507, KEY_5 },
-        { 0x4508, KEY_6 },
-        { 0x4509, KEY_7 },
-        { 0x450a, KEY_8 },
-        { 0x450b, KEY_9 },
-        { 0x450c, KEY_LAST },
-        { 0x450d, KEY_0 },
-        { 0x450e, KEY_ENTER },
-        { 0x450f, KEY_RED },
-        { 0x4510, KEY_CHANNELUP },
-        { 0x4511, KEY_GREEN },
-        { 0x4512, KEY_VOLUMEDOWN },
-        { 0x4513, KEY_OK },
-        { 0x4514, KEY_VOLUMEUP },
-        { 0x4515, KEY_YELLOW },
-        { 0x4516, KEY_CHANNELDOWN },
-        { 0x4517, KEY_BLUE },
-        { 0x4518, KEY_LEFT }, /* Skip backwards */
-        { 0x4519, KEY_PLAYPAUSE },
-        { 0x451a, KEY_RIGHT }, /* Skip forward */
-        { 0x451b, KEY_REWIND },
-        { 0x451c, KEY_L }, /* Live */
-        { 0x451d, KEY_FASTFORWARD },
-        { 0x451e, KEY_STOP }, /* 'Reveal' for Teletext */
-        { 0x451f, KEY_MENU }, /* KEY_TEXT for Teletext */
-        { 0x4540, KEY_RECORD }, /* Font 'Size' for Teletext */
-        { 0x4541, KEY_SCREEN }, /*  Full screen toggle, 'Hold' for Teletext */
-        { 0x4542, KEY_SELECT }, /* Select video input, 'Select' for Teletext */
-};
 /* STK7700P: Hauppauge Nova-T Stick, AVerMedia Volar */
 static struct dibx000_agc_config stk7700p_7000m_mt2060_agc_config = {
        BAND_UHF | BAND_VHF,
@@ -2168,10 +1868,17 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                        }
                },
-                .rc_interval      = DEFAULT_RC_INTERVAL,
+                .rc.core = {
-                .rc_key_map       = ir_codes_dib0700_table,
+                        .rc_interval      = DEFAULT_RC_INTERVAL,
-                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dib0700_table),
+                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
-                .rc_query         = dib0700_rc_query
+                        .rc_query         = dib0700_rc_query_old_firmware,
+                        .rc_props = {
+                                .allowed_protos = IR_TYPE_RC5 |
+                                                  IR_TYPE_RC6 |
+                                                  IR_TYPE_NEC,
+                                .change_protocol = dib0700_change_protocol,
+                        },
+                },
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
                .num_adapters = 2,
@@ -2197,10 +1904,17 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                        },
                },
-                .rc_interval      = DEFAULT_RC_INTERVAL,
+                .rc.core = {
-                .rc_key_map       = ir_codes_dib0700_table,
+                        .rc_interval      = DEFAULT_RC_INTERVAL,
-                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dib0700_table),
+                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
-                .rc_query         = dib0700_rc_query
+                        .rc_query         = dib0700_rc_query_old_firmware,
+                        .rc_props = {
+                                .allowed_protos = IR_TYPE_RC5 |
+                                                  IR_TYPE_RC6 |
+                                                  IR_TYPE_NEC,
+                                .change_protocol = dib0700_change_protocol,
+                        },
+                },
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
                .num_adapters = 2,
@@ -2251,11 +1965,17 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                },
-                .rc_interval      = DEFAULT_RC_INTERVAL,
+                .rc.core = {
-                .rc_key_map       = ir_codes_dib0700_table,
+                        .rc_interval      = DEFAULT_RC_INTERVAL,
-                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dib0700_table),
+                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
-                .rc_query         = dib0700_rc_query
+                        .rc_query         = dib0700_rc_query_old_firmware,
+                        .rc_props = {
+                                .allowed_protos = IR_TYPE_RC5 |
+                                                  IR_TYPE_RC6 |
+                                                  IR_TYPE_NEC,
+                                .change_protocol = dib0700_change_protocol,
+                        },
+                },
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
                .num_adapters = 1,
@@ -2288,10 +2008,18 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                        }
                },
-                .rc_interval      = DEFAULT_RC_INTERVAL,
+                .rc.core = {
-                .rc_key_map       = ir_codes_dib0700_table,
+                        .rc_interval      = DEFAULT_RC_INTERVAL,
-                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dib0700_table),
+                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
-                .rc_query         = dib0700_rc_query
+                        .module_name      = "dib0700",
+                        .rc_query         = dib0700_rc_query_old_firmware,
+                        .rc_props = {
+                                .allowed_protos = IR_TYPE_RC5 |
+                                                  IR_TYPE_RC6 |
+                                                  IR_TYPE_NEC,
+                                .change_protocol = dib0700_change_protocol,
+                        },
+                },
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
                .num_adapters = 1,
@@ -2358,11 +2086,18 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                        },
                },
-                .rc_interval      = DEFAULT_RC_INTERVAL,
+                .rc.core = {
-                .rc_key_map       = ir_codes_dib0700_table,
+                        .rc_interval      = DEFAULT_RC_INTERVAL,
-                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dib0700_table),
+                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
-                .rc_query         = dib0700_rc_query
+                        .module_name      = "dib0700",
+                        .rc_query         = dib0700_rc_query_old_firmware,
+                        .rc_props = {
+                                .allowed_protos = IR_TYPE_RC5 |
+                                                  IR_TYPE_RC6 |
+                                                  IR_TYPE_NEC,
+                                .change_protocol = dib0700_change_protocol,
+                        },
+                },
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
                .num_adapters = 1,
@@ -2397,11 +2132,18 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                        },
                },
-                .rc_interval      = DEFAULT_RC_INTERVAL,
+                .rc.core = {
-                .rc_key_map       = ir_codes_dib0700_table,
+                        .rc_interval      = DEFAULT_RC_INTERVAL,
-                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dib0700_table),
+                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
-                .rc_query         = dib0700_rc_query
+                        .module_name      = "dib0700",
+                        .rc_query         = dib0700_rc_query_old_firmware,
+                        .rc_props = {
+                                .allowed_protos = IR_TYPE_RC5 |
+                                                  IR_TYPE_RC6 |
+                                                  IR_TYPE_NEC,
+                                .change_protocol = dib0700_change_protocol,
+                        },
+                },
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
                .num_adapters = 2,
@@ -2431,7 +2173,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                        }
                },
-                .num_device_descs = 7,
+                .num_device_descs = 6,
                .devices = {
                        {   "DiBcom STK7070PD reference design",
                                { &dib0700_usb_id_table[17], NULL },
@@ -2458,15 +2200,69 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                                { &dib0700_usb_id_table[44], NULL },
                                { NULL },
                        },
+                },
+                .rc.core = {
+                        .rc_interval      = DEFAULT_RC_INTERVAL,
+                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
+                        .module_name      = "dib0700",
+                        .rc_query         = dib0700_rc_query_old_firmware,
+                        .rc_props = {
+                                .allowed_protos = IR_TYPE_RC5 |
+                                                  IR_TYPE_RC6 |
+                                                  IR_TYPE_NEC,
+                                .change_protocol = dib0700_change_protocol,
+                        },
+                },
+        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
+                .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       = stk70x0p_pid_filter,
+                                .pid_filter_ctrl  = stk70x0p_pid_filter_ctrl,
+                                .frontend_attach  = stk7070pd_frontend_attach0,
+                                .tuner_attach     = dib7070p_tuner_attach,
+                                DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
+                                .size_of_priv     = sizeof(struct dib0700_adapter_state),
+                        }, {
+                                .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
+                                .pid_filter_count = 32,
+                                .pid_filter       = stk70x0p_pid_filter,
+                                .pid_filter_ctrl  = stk70x0p_pid_filter_ctrl,
+                                .frontend_attach  = stk7070pd_frontend_attach1,
+                                .tuner_attach     = dib7070p_tuner_attach,
+                                DIB0700_DEFAULT_STREAMING_CONFIG(0x03),
+                                .size_of_priv     = sizeof(struct dib0700_adapter_state),
+                        }
+                },
+                .num_device_descs = 1,
+                .devices = {
                        {   "Elgato EyeTV Diversity",
                                { &dib0700_usb_id_table[68], NULL },
                                { NULL },
                        },
                },
-                .rc_interval      = DEFAULT_RC_INTERVAL,
-                .rc_key_map       = ir_codes_dib0700_table,
+                .rc.core = {
-                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dib0700_table),
+                        .rc_interval      = DEFAULT_RC_INTERVAL,
-                .rc_query         = dib0700_rc_query
+                        .rc_codes         = RC_MAP_DIB0700_NEC_TABLE,
+                        .module_name      = "dib0700",
+                        .rc_query         = dib0700_rc_query_old_firmware,
+                        .rc_props = {
+                                .allowed_protos = IR_TYPE_RC5 |
+                                                  IR_TYPE_RC6 |
+                                                  IR_TYPE_NEC,
+                                .change_protocol = dib0700_change_protocol,
+                        },
+                },
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
                .num_adapters = 1,
@@ -2525,10 +2321,19 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                                { NULL },
                        },
                },
-                .rc_interval      = DEFAULT_RC_INTERVAL,
-                .rc_key_map       = ir_codes_dib0700_table,
+                .rc.core = {
-                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dib0700_table),
+                        .rc_interval      = DEFAULT_RC_INTERVAL,
-                .rc_query         = dib0700_rc_query
+                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
+                        .module_name      = "dib0700",
+                        .rc_query         = dib0700_rc_query_old_firmware,
+                        .rc_props = {
+                                .allowed_protos = IR_TYPE_RC5 |
+                                                  IR_TYPE_RC6 |
+                                                  IR_TYPE_NEC,
+                                .change_protocol = dib0700_change_protocol,
+                        },
+                },
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
                .num_adapters = 1,
                .adapter = {
@@ -2554,10 +2359,19 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                                { NULL },
                        },
                },
-                .rc_interval      = DEFAULT_RC_INTERVAL,
-                .rc_key_map       = ir_codes_dib0700_table,
+                .rc.core = {
-                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dib0700_table),
+                        .rc_interval      = DEFAULT_RC_INTERVAL,
-                .rc_query         = dib0700_rc_query
+                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
+                        .module_name      = "dib0700",
+                        .rc_query         = dib0700_rc_query_old_firmware,
+                        .rc_props = {
+                                .allowed_protos = IR_TYPE_RC5 |
+                                                  IR_TYPE_RC6 |
+                                                  IR_TYPE_NEC,
+                                .change_protocol = dib0700_change_protocol,
+                        },
+                },
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
                .num_adapters = 1,
                .adapter = {
@@ -2615,10 +2429,19 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                                { NULL },
                        },
                },
-                .rc_interval      = DEFAULT_RC_INTERVAL,
-                .rc_key_map       = ir_codes_dib0700_table,
+                .rc.core = {
-                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dib0700_table),
+                        .rc_interval      = DEFAULT_RC_INTERVAL,
-                .rc_query         = dib0700_rc_query
+                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
+                        .module_name      = "dib0700",
+                        .rc_query         = dib0700_rc_query_old_firmware,
+                        .rc_props = {
+                                .allowed_protos = IR_TYPE_RC5 |
+                                                  IR_TYPE_RC6 |
+                                                  IR_TYPE_NEC,
+                                .change_protocol = dib0700_change_protocol,
+                        },
+                },
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
                .num_adapters = 1,
                .adapter = {
@@ -2653,11 +2476,18 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                        },
                },
-                .rc_interval      = DEFAULT_RC_INTERVAL,
+                .rc.core = {
-                .rc_key_map       = ir_codes_dib0700_table,
+                        .rc_interval      = DEFAULT_RC_INTERVAL,
-                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dib0700_table),
+                        .rc_codes         = RC_MAP_DIB0700_NEC_TABLE,
-                .rc_query         = dib0700_rc_query
+                        .module_name      = "dib0700",
+                        .rc_query         = dib0700_rc_query_old_firmware,
+                        .rc_props = {
+                                .allowed_protos = IR_TYPE_RC5 |
+                                                  IR_TYPE_RC6 |
+                                                  IR_TYPE_NEC,
+                                .change_protocol = dib0700_change_protocol,
+                        },
+                },
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
                .num_adapters = 2,
                .adapter = {
@@ -2697,10 +2527,18 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                        },
                },
-                .rc_interval      = DEFAULT_RC_INTERVAL,
+                .rc.core = {
-                .rc_key_map       = ir_codes_dib0700_table,
+                        .rc_interval      = DEFAULT_RC_INTERVAL,
-                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dib0700_table),
+                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
-                .rc_query         = dib0700_rc_query
+                        .module_name      = "dib0700",
+                        .rc_query         = dib0700_rc_query_old_firmware,
+                        .rc_props = {
+                                .allowed_protos = IR_TYPE_RC5 |
+                                                  IR_TYPE_RC6 |
+                                                  IR_TYPE_NEC,
+                                .change_protocol = dib0700_change_protocol,
+                        },
+                },
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
                .num_adapters = 1,
                .adapter = {
@@ -2728,10 +2566,18 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                        },
                },
-                .rc_interval      = DEFAULT_RC_INTERVAL,
+                .rc.core = {
-                .rc_key_map       = ir_codes_dib0700_table,
+                        .rc_interval      = DEFAULT_RC_INTERVAL,
-                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dib0700_table),
+                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
-                .rc_query         = dib0700_rc_query
+                        .module_name      = "dib0700",
+                        .rc_query         = dib0700_rc_query_old_firmware,
+                        .rc_props = {
+                                .allowed_protos = IR_TYPE_RC5 |
+                                                  IR_TYPE_RC6 |
+                                                  IR_TYPE_NEC,
+                                .change_protocol = dib0700_change_protocol,
+                        },
+                },
        },
 };
diff --git a/drivers/media/dvb/dvb-usb/dibusb-common.c b/drivers/media/dvb/dvb-usb/dibusb-common.c
index bc08bc0b723c..ba991aa21aff 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-common.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-common.c
@@ -327,7 +327,7 @@ EXPORT_SYMBOL(dibusb_dib3000mc_tuner_attach);
 /*
 * common remote control stuff
 */
-struct dvb_usb_rc_key ir_codes_dibusb_table[] = {
+struct ir_scancode ir_codes_dibusb_table[] = {
        /* Key codes for the little Artec T1/Twinhan/HAMA/ remote. */
        { 0x0016, KEY_POWER },
        { 0x0010, KEY_MUTE },
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mb.c b/drivers/media/dvb/dvb-usb/dibusb-mb.c
index eb2e6f050fbe..8e3c0d2cce16 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-mb.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mb.c
@@ -211,10 +211,12 @@ static struct dvb_usb_device_properties dibusb1_1_properties = {
        .power_ctrl       = dibusb_power_ctrl,
-        .rc_interval      = DEFAULT_RC_INTERVAL,
+        .rc.legacy = {
-        .rc_key_map       = ir_codes_dibusb_table,
+                .rc_interval      = DEFAULT_RC_INTERVAL,
-        .rc_key_map_size  = 111, /* wow, that is ugly ... I want to load it to the driver dynamically */
+                .rc_key_map       = ir_codes_dibusb_table,
-        .rc_query         = dibusb_rc_query,
+                .rc_key_map_size  = 111, /* wow, that is ugly ... I want to load it to the driver dynamically */
+                .rc_query         = dibusb_rc_query,
+        },
        .i2c_algo         = &dibusb_i2c_algo,
@@ -295,10 +297,12 @@ static struct dvb_usb_device_properties dibusb1_1_an2235_properties = {
        },
        .power_ctrl       = dibusb_power_ctrl,
-        .rc_interval      = DEFAULT_RC_INTERVAL,
+        .rc.legacy = {
-        .rc_key_map       = ir_codes_dibusb_table,
+                .rc_interval      = DEFAULT_RC_INTERVAL,
-        .rc_key_map_size  = 111, /* wow, that is ugly ... I want to load it to the driver dynamically */
+                .rc_key_map       = ir_codes_dibusb_table,
-        .rc_query         = dibusb_rc_query,
+                .rc_key_map_size  = 111, /* wow, that is ugly ... I want to load it to the driver dynamically */
+                .rc_query         = dibusb_rc_query,
+        },
        .i2c_algo         = &dibusb_i2c_algo,
@@ -359,10 +363,12 @@ static struct dvb_usb_device_properties dibusb2_0b_properties = {
        },
        .power_ctrl       = dibusb2_0_power_ctrl,
-        .rc_interval      = DEFAULT_RC_INTERVAL,
+        .rc.legacy = {
-        .rc_key_map       = ir_codes_dibusb_table,
+                .rc_interval      = DEFAULT_RC_INTERVAL,
-        .rc_key_map_size  = 111, /* wow, that is ugly ... I want to load it to the driver dynamically */
+                .rc_key_map       = ir_codes_dibusb_table,
-        .rc_query         = dibusb_rc_query,
+                .rc_key_map_size  = 111, /* wow, that is ugly ... I want to load it to the driver dynamically */
+                .rc_query         = dibusb_rc_query,
+        },
        .i2c_algo         = &dibusb_i2c_algo,
@@ -416,10 +422,12 @@ static struct dvb_usb_device_properties artec_t1_usb2_properties = {
        },
        .power_ctrl       = dibusb2_0_power_ctrl,
-        .rc_interval      = DEFAULT_RC_INTERVAL,
+        .rc.legacy = {
-        .rc_key_map       = ir_codes_dibusb_table,
+                .rc_interval      = DEFAULT_RC_INTERVAL,
-        .rc_key_map_size  = 111, /* wow, that is ugly ... I want to load it to the driver dynamically */
+                .rc_key_map       = ir_codes_dibusb_table,
-        .rc_query         = dibusb_rc_query,
+                .rc_key_map_size  = 111, /* wow, that is ugly ... I want to load it to the driver dynamically */
+                .rc_query         = dibusb_rc_query,
+        },
        .i2c_algo         = &dibusb_i2c_algo,
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mc.c b/drivers/media/dvb/dvb-usb/dibusb-mc.c
index 588308eb6638..1cbc41cb4e8f 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-mc.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mc.c
@@ -81,10 +81,12 @@ static struct dvb_usb_device_properties dibusb_mc_properties = {
        },
        .power_ctrl       = dibusb2_0_power_ctrl,
-        .rc_interval      = DEFAULT_RC_INTERVAL,
+        .rc.legacy = {
-        .rc_key_map       = ir_codes_dibusb_table,
+                .rc_interval      = DEFAULT_RC_INTERVAL,
-        .rc_key_map_size  = 111, /* FIXME */
+                .rc_key_map       = ir_codes_dibusb_table,
-        .rc_query         = dibusb_rc_query,
+                .rc_key_map_size  = 111, /* FIXME */
+                .rc_query         = dibusb_rc_query,
+        },
        .i2c_algo         = &dibusb_i2c_algo,
diff --git a/drivers/media/dvb/dvb-usb/dibusb.h b/drivers/media/dvb/dvb-usb/dibusb.h
index 3d50ac59088f..61a6bf389472 100644
--- a/drivers/media/dvb/dvb-usb/dibusb.h
+++ b/drivers/media/dvb/dvb-usb/dibusb.h
@@ -124,7 +124,7 @@ extern int dibusb2_0_power_ctrl(struct dvb_usb_device *, int);
 #define DEFAULT_RC_INTERVAL 150
 //#define DEFAULT_RC_INTERVAL 100000
-extern struct dvb_usb_rc_key ir_codes_dibusb_table[];
+extern struct ir_scancode ir_codes_dibusb_table[];
 extern int dibusb_rc_query(struct dvb_usb_device *, u32 *, int *);
 extern int dibusb_read_eeprom_byte(struct dvb_usb_device *, u8, u8 *);
diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c
index e826077094fa..13d006bb19db 100644
--- a/drivers/media/dvb/dvb-usb/digitv.c
+++ b/drivers/media/dvb/dvb-usb/digitv.c
@@ -161,7 +161,7 @@ static int digitv_tuner_attach(struct dvb_usb_adapter *adap)
        return 0;
 }
-static struct dvb_usb_rc_key ir_codes_digitv_table[] = {
+static struct ir_scancode ir_codes_digitv_table[] = {
        { 0x5f55, KEY_0 },
        { 0x6f55, KEY_1 },
        { 0x9f55, KEY_2 },
@@ -237,10 +237,10 @@ static int digitv_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
        /* if something is inside the buffer, simulate key press */
        if (key[1] != 0)
        {
-                  for (i = 0; i < d->props.rc_key_map_size; i++) {
+                  for (i = 0; i < d->props.rc.legacy.rc_key_map_size; i++) {
-                        if (rc5_custom(&d->props.rc_key_map[i]) == key[1] &&
+                        if (rc5_custom(&d->props.rc.legacy.rc_key_map[i]) == key[1] &&
-                            rc5_data(&d->props.rc_key_map[i]) == key[2]) {
+                            rc5_data(&d->props.rc.legacy.rc_key_map[i]) == key[2]) {
-                                *event = d->props.rc_key_map[i].event;
+                                *event = d->props.rc.legacy.rc_key_map[i].keycode;
                                *state = REMOTE_KEY_PRESSED;
                                return 0;
                        }
@@ -310,10 +310,12 @@ static struct dvb_usb_device_properties digitv_properties = {
        },
        .identify_state   = digitv_identify_state,
-        .rc_interval      = 1000,
+        .rc.legacy = {
-        .rc_key_map       = ir_codes_digitv_table,
+                .rc_interval      = 1000,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_digitv_table),
+                .rc_key_map       = ir_codes_digitv_table,
-        .rc_query         = digitv_rc_query,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_digitv_table),
+                .rc_query         = digitv_rc_query,
+        },
        .i2c_algo         = &digitv_i2c_algo,
diff --git a/drivers/media/dvb/dvb-usb/dtt200u.c b/drivers/media/dvb/dvb-usb/dtt200u.c
index f57e59044d4d..ca495e07f35c 100644
--- a/drivers/media/dvb/dvb-usb/dtt200u.c
+++ b/drivers/media/dvb/dvb-usb/dtt200u.c
@@ -57,7 +57,7 @@ static int dtt200u_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid,
 /* remote control */
 /* key list for the tiny remote control (Yakumo, don't know about the others) */
-static struct dvb_usb_rc_key ir_codes_dtt200u_table[] = {
+static struct ir_scancode ir_codes_dtt200u_table[] = {
        { 0x8001, KEY_MUTE },
        { 0x8002, KEY_CHANNELDOWN },
        { 0x8003, KEY_VOLUMEDOWN },
@@ -161,10 +161,12 @@ static struct dvb_usb_device_properties dtt200u_properties = {
        },
        .power_ctrl      = dtt200u_power_ctrl,
-        .rc_interval     = 300,
+        .rc.legacy = {
-        .rc_key_map      = ir_codes_dtt200u_table,
+                .rc_interval     = 300,
-        .rc_key_map_size = ARRAY_SIZE(ir_codes_dtt200u_table),
+                .rc_key_map      = ir_codes_dtt200u_table,
-        .rc_query        = dtt200u_rc_query,
+                .rc_key_map_size = ARRAY_SIZE(ir_codes_dtt200u_table),
+                .rc_query        = dtt200u_rc_query,
+        },
        .generic_bulk_ctrl_endpoint = 0x01,
@@ -206,10 +208,12 @@ static struct dvb_usb_device_properties wt220u_properties = {
        },
        .power_ctrl      = dtt200u_power_ctrl,
-        .rc_interval     = 300,
+        .rc.legacy = {
-        .rc_key_map      = ir_codes_dtt200u_table,
+                .rc_interval     = 300,
-        .rc_key_map_size = ARRAY_SIZE(ir_codes_dtt200u_table),
+                .rc_key_map      = ir_codes_dtt200u_table,
-        .rc_query        = dtt200u_rc_query,
+                .rc_key_map_size = ARRAY_SIZE(ir_codes_dtt200u_table),
+                .rc_query        = dtt200u_rc_query,
+        },
        .generic_bulk_ctrl_endpoint = 0x01,
@@ -251,10 +255,12 @@ static struct dvb_usb_device_properties wt220u_fc_properties = {
        },
        .power_ctrl      = dtt200u_power_ctrl,
-        .rc_interval     = 300,
+        .rc.legacy = {
-        .rc_key_map      = ir_codes_dtt200u_table,
+                .rc_interval     = 300,
-        .rc_key_map_size = ARRAY_SIZE(ir_codes_dtt200u_table),
+                .rc_key_map      = ir_codes_dtt200u_table,
-        .rc_query        = dtt200u_rc_query,
+                .rc_key_map_size = ARRAY_SIZE(ir_codes_dtt200u_table),
+                .rc_query        = dtt200u_rc_query,
+        },
        .generic_bulk_ctrl_endpoint = 0x01,
@@ -296,10 +302,12 @@ static struct dvb_usb_device_properties wt220u_zl0353_properties = {
        },
        .power_ctrl      = dtt200u_power_ctrl,
-        .rc_interval     = 300,
+        .rc.legacy = {
-        .rc_key_map      = ir_codes_dtt200u_table,
+                .rc_interval     = 300,
-        .rc_key_map_size = ARRAY_SIZE(ir_codes_dtt200u_table),
+                .rc_key_map      = ir_codes_dtt200u_table,
-        .rc_query        = dtt200u_rc_query,
+                .rc_key_map_size = ARRAY_SIZE(ir_codes_dtt200u_table),
+                .rc_query        = dtt200u_rc_query,
+        },
        .generic_bulk_ctrl_endpoint = 0x01,
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index b4afe6f8ed19..1a774d58d664 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -197,6 +197,7 @@
 #define USB_PID_AVERMEDIA_A310                          0xa310
 #define USB_PID_AVERMEDIA_A850                          0x850a
 #define USB_PID_AVERMEDIA_A805                          0xa805
+#define USB_PID_AVERMEDIA_A815M                         0x815a
 #define USB_PID_TECHNOTREND_CONNECT_S2400               0x3006
 #define USB_PID_TECHNOTREND_CONNECT_CT3650              0x300d
 #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY        0x005a
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-init.c b/drivers/media/dvb/dvb-usb/dvb-usb-init.c
index 5d91f70d2d2d..2e3ea0fa28e0 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-init.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-init.c
@@ -15,7 +15,7 @@
 /* debug */
 int dvb_usb_debug;
-module_param_named(debug,dvb_usb_debug, int, 0644);
+module_param_named(debug, dvb_usb_debug, int, 0644);
 MODULE_PARM_DESC(debug, "set debugging level (1=info,xfer=2,pll=4,ts=8,err=16,rc=32,fw=64,mem=128,uxfer=256  (or-able))." DVB_USB_DEBUG_STATUS);
 int dvb_usb_disable_rc_polling;
@@ -29,7 +29,7 @@ MODULE_PARM_DESC(force_pid_filter_usage, "force all dvb-usb-devices to use a PID
 static int dvb_usb_adapter_init(struct dvb_usb_device *d, short *adapter_nrs)
 {
        struct dvb_usb_adapter *adap;
-        int ret,n;
+        int ret, n;
        for (n = 0; n < d->props.num_adapters; n++) {
                adap = &d->adapter[n];
@@ -38,7 +38,7 @@ static int dvb_usb_adapter_init(struct dvb_usb_device *d, short *adapter_nrs)
                memcpy(&adap->props, &d->props.adapter[n], sizeof(struct dvb_usb_adapter_properties));
-/* speed - when running at FULL speed we need a HW PID filter */
+                /* speed - when running at FULL speed we need a HW PID filter */
                if (d->udev->speed == USB_SPEED_FULL && !(adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER)) {
                        err("This USB2.0 device cannot be run on a USB1.1 port. (it lacks a hardware PID filter)");
                        return -ENODEV;
@@ -46,7 +46,7 @@ static int dvb_usb_adapter_init(struct dvb_usb_device *d, short *adapter_nrs)
                if ((d->udev->speed == USB_SPEED_FULL && adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER) ||
                        (adap->props.caps & DVB_USB_ADAP_NEED_PID_FILTERING)) {
-                        info("will use the device's hardware PID filter (table count: %d).",adap->props.pid_filter_count);
+                        info("will use the device's hardware PID filter (table count: %d).", adap->props.pid_filter_count);
                        adap->pid_filtering  = 1;
                        adap->max_feed_count = adap->props.pid_filter_count;
                } else {
@@ -64,9 +64,9 @@ static int dvb_usb_adapter_init(struct dvb_usb_device *d, short *adapter_nrs)
                }
                if (adap->props.size_of_priv > 0) {
-                        adap->priv = kzalloc(adap->props.size_of_priv,GFP_KERNEL);
+                        adap->priv = kzalloc(adap->props.size_of_priv, GFP_KERNEL);
                        if (adap->priv == NULL) {
-                                err("no memory for priv for adapter %d.",n);
+                                err("no memory for priv for adapter %d.", n);
                                return -ENOMEM;
                        }
                }
@@ -86,8 +86,8 @@ static int dvb_usb_adapter_init(struct dvb_usb_device *d, short *adapter_nrs)
         * sometimes a timeout occures, this helps
         */
        if (d->props.generic_bulk_ctrl_endpoint != 0) {
-                usb_clear_halt(d->udev,usb_sndbulkpipe(d->udev,d->props.generic_bulk_ctrl_endpoint));
+                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.generic_bulk_ctrl_endpoint));
        }
        return 0;
@@ -96,6 +96,7 @@ static int dvb_usb_adapter_init(struct dvb_usb_device *d, short *adapter_nrs)
 static int dvb_usb_adapter_exit(struct dvb_usb_device *d)
 {
        int n;
        for (n = 0; n < d->num_adapters_initialized; n++) {
                dvb_usb_adapter_frontend_exit(&d->adapter[n]);
                dvb_usb_adapter_dvb_exit(&d->adapter[n]);
@@ -111,11 +112,11 @@ static int dvb_usb_adapter_exit(struct dvb_usb_device *d)
 /* general initialization functions */
 static int dvb_usb_exit(struct dvb_usb_device *d)
 {
-        deb_info("state before exiting everything: %x\n",d->state);
+        deb_info("state before exiting everything: %x\n", d->state);
        dvb_usb_remote_exit(d);
        dvb_usb_adapter_exit(d);
        dvb_usb_i2c_exit(d);
-        deb_info("state should be zero now: %x\n",d->state);
+        deb_info("state should be zero now: %x\n", d->state);
        d->state = DVB_USB_STATE_INIT;
        kfree(d->priv);
        kfree(d);
@@ -132,14 +133,14 @@ static int dvb_usb_init(struct dvb_usb_device *d, short *adapter_nums)
        d->state = DVB_USB_STATE_INIT;
        if (d->props.size_of_priv > 0) {
-                d->priv = kzalloc(d->props.size_of_priv,GFP_KERNEL);
+                d->priv = kzalloc(d->props.size_of_priv, GFP_KERNEL);
                if (d->priv == NULL) {
                        err("no memory for priv in 'struct dvb_usb_device'");
                        return -ENOMEM;
                }
        }
-/* check the capabilities and set appropriate variables */
+        /* check the capabilities and set appropriate variables */
        dvb_usb_device_power_ctrl(d, 1);
        if ((ret = dvb_usb_i2c_init(d)) ||
@@ -157,16 +158,17 @@ static int dvb_usb_init(struct dvb_usb_device *d, short *adapter_nums)
 }
 /* determine the name and the state of the just found USB device */
-static struct dvb_usb_device_description * dvb_usb_find_device(struct usb_device *udev,struct dvb_usb_device_properties *props, int *cold)
+static struct dvb_usb_device_description *dvb_usb_find_device(struct usb_device *udev, struct dvb_usb_device_properties *props, int *cold)
 {
-        int i,j;
+        int i, j;
        struct dvb_usb_device_description *desc = NULL;
        *cold = -1;
        for (i = 0; i < props->num_device_descs; i++) {
                for (j = 0; j < DVB_USB_ID_MAX_NUM && props->devices[i].cold_ids[j] != NULL; j++) {
-                        deb_info("check for cold %x %x\n",props->devices[i].cold_ids[j]->idVendor, props->devices[i].cold_ids[j]->idProduct);
+                        deb_info("check for cold %x %x\n", props->devices[i].cold_ids[j]->idVendor, props->devices[i].cold_ids[j]->idProduct);
                        if (props->devices[i].cold_ids[j]->idVendor  == le16_to_cpu(udev->descriptor.idVendor) &&
                                props->devices[i].cold_ids[j]->idProduct == le16_to_cpu(udev->descriptor.idProduct)) {
                                *cold = 1;
@@ -179,7 +181,7 @@ static struct dvb_usb_device_description * dvb_usb_find_device(struct usb_device
                        break;
                for (j = 0; j < DVB_USB_ID_MAX_NUM && props->devices[i].warm_ids[j] != NULL; j++) {
-                        deb_info("check for warm %x %x\n",props->devices[i].warm_ids[j]->idVendor, props->devices[i].warm_ids[j]->idProduct);
+                        deb_info("check for warm %x %x\n", props->devices[i].warm_ids[j]->idVendor, props->devices[i].warm_ids[j]->idProduct);
                        if (props->devices[i].warm_ids[j]->idVendor == le16_to_cpu(udev->descriptor.idVendor) &&
                                props->devices[i].warm_ids[j]->idProduct == le16_to_cpu(udev->descriptor.idProduct)) {
                                *cold = 0;
@@ -190,7 +192,7 @@ static struct dvb_usb_device_description * dvb_usb_find_device(struct usb_device
        }
        if (desc != NULL && props->identify_state != NULL)
-                props->identify_state(udev,props,&desc,cold);
+                props->identify_state(udev, props, &desc, cold);
        return desc;
 }
@@ -202,7 +204,7 @@ int dvb_usb_device_power_ctrl(struct dvb_usb_device *d, int onoff)
        else
                d->powered--;
-        if (d->powered == 0 || (onoff && d->powered == 1)) { // when switching from 1 to 0 or from 0 to 1
+        if (d->powered == 0 || (onoff && d->powered == 1)) { /* when switching from 1 to 0 or from 0 to 1 */
                deb_info("power control: %d\n", onoff);
                if (d->props.power_ctrl)
                        return d->props.power_ctrl(d, onoff);
@@ -222,32 +224,32 @@ int dvb_usb_device_init(struct usb_interface *intf,
        struct dvb_usb_device *d = NULL;
        struct dvb_usb_device_description *desc = NULL;
-        int ret = -ENOMEM,cold=0;
+        int ret = -ENOMEM, cold = 0;
        if (du != NULL)
                *du = NULL;
-        if ((desc = dvb_usb_find_device(udev,props,&cold)) == NULL) {
+        if ((desc = dvb_usb_find_device(udev, props, &cold)) == NULL) {
                deb_err("something went very wrong, device was not found in current device list - let's see what comes next.\n");
                return -ENODEV;
        }
        if (cold) {
-                info("found a '%s' in cold state, will try to load a firmware",desc->name);
+                info("found a '%s' in cold state, will try to load a firmware", desc->name);
-                ret = dvb_usb_download_firmware(udev,props);
+                ret = dvb_usb_download_firmware(udev, props);
                if (!props->no_reconnect || ret != 0)
                        return ret;
        }
-        info("found a '%s' in warm state.",desc->name);
+        info("found a '%s' in warm state.", desc->name);
-                d = kzalloc(sizeof(struct dvb_usb_device),GFP_KERNEL);
+        d = kzalloc(sizeof(struct dvb_usb_device), GFP_KERNEL);
        if (d == NULL) {
                err("no memory for 'struct dvb_usb_device'");
                return -ENOMEM;
        }
        d->udev = udev;
-        memcpy(&d->props,props,sizeof(struct dvb_usb_device_properties));
+        memcpy(&d->props, props, sizeof(struct dvb_usb_device_properties));
        d->desc = desc;
        d->owner = owner;
@@ -259,9 +261,9 @@ int dvb_usb_device_init(struct usb_interface *intf,
        ret = dvb_usb_init(d, adapter_nums);
        if (ret == 0)
-                info("%s successfully initialized and connected.",desc->name);
+                info("%s successfully initialized and connected.", desc->name);
        else
-                info("%s error while loading driver (%d)",desc->name,ret);
+                info("%s error while loading driver (%d)", desc->name, ret);
        return ret;
 }
 EXPORT_SYMBOL(dvb_usb_device_init);
@@ -271,12 +273,12 @@ void dvb_usb_device_exit(struct usb_interface *intf)
        struct dvb_usb_device *d = usb_get_intfdata(intf);
        const char *name = "generic DVB-USB module";
-        usb_set_intfdata(intf,NULL);
+        usb_set_intfdata(intf, NULL);
        if (d != NULL && d->desc != NULL) {
                name = d->desc->name;
                dvb_usb_exit(d);
        }
-        info("%s successfully deinitialized and disconnected.",name);
+        info("%s successfully deinitialized and disconnected.", name);
 }
 EXPORT_SYMBOL(dvb_usb_device_exit);
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
index 852fe89539cf..b579fed3ab3f 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
@@ -8,29 +8,29 @@
 #include "dvb-usb-common.h"
 #include <linux/usb/input.h>
-static int dvb_usb_getkeycode(struct input_dev *dev,
+static int legacy_dvb_usb_getkeycode(struct input_dev *dev,
                                unsigned int scancode, unsigned int *keycode)
 {
        struct dvb_usb_device *d = input_get_drvdata(dev);
-        struct dvb_usb_rc_key *keymap = d->props.rc_key_map;
+        struct ir_scancode *keymap = d->props.rc.legacy.rc_key_map;
        int i;
        /* See if we can match the raw key code. */
-        for (i = 0; i < d->props.rc_key_map_size; i++)
+        for (i = 0; i < d->props.rc.legacy.rc_key_map_size; i++)
-                if (keymap[i].scan == scancode) {
+                if (keymap[i].scancode == scancode) {
-                        *keycode = keymap[i].event;
+                        *keycode = keymap[i].keycode;
                        return 0;
                }
        /*
         * If is there extra space, returns KEY_RESERVED,
-         * otherwise, input core won't let dvb_usb_setkeycode
+         * otherwise, input core won't let legacy_dvb_usb_setkeycode
         * to work
         */
-        for (i = 0; i < d->props.rc_key_map_size; i++)
+        for (i = 0; i < d->props.rc.legacy.rc_key_map_size; i++)
-                if (keymap[i].event == KEY_RESERVED ||
+                if (keymap[i].keycode == KEY_RESERVED ||
-                    keymap[i].event == KEY_UNKNOWN) {
+                    keymap[i].keycode == KEY_UNKNOWN) {
                        *keycode = KEY_RESERVED;
                        return 0;
                }
@@ -38,27 +38,27 @@ static int dvb_usb_getkeycode(struct input_dev *dev,
        return -EINVAL;
 }
-static int dvb_usb_setkeycode(struct input_dev *dev,
+static int legacy_dvb_usb_setkeycode(struct input_dev *dev,
                                unsigned int scancode, unsigned int keycode)
 {
        struct dvb_usb_device *d = input_get_drvdata(dev);
-        struct dvb_usb_rc_key *keymap = d->props.rc_key_map;
+        struct ir_scancode *keymap = d->props.rc.legacy.rc_key_map;
        int i;
        /* Search if it is replacing an existing keycode */
-        for (i = 0; i < d->props.rc_key_map_size; i++)
+        for (i = 0; i < d->props.rc.legacy.rc_key_map_size; i++)
-                if (keymap[i].scan == scancode) {
+                if (keymap[i].scancode == scancode) {
-                        keymap[i].event = keycode;
+                        keymap[i].keycode = keycode;
                        return 0;
                }
        /* Search if is there a clean entry. If so, use it */
-        for (i = 0; i < d->props.rc_key_map_size; i++)
+        for (i = 0; i < d->props.rc.legacy.rc_key_map_size; i++)
-                if (keymap[i].event == KEY_RESERVED ||
+                if (keymap[i].keycode == KEY_RESERVED ||
-                    keymap[i].event == KEY_UNKNOWN) {
+                    keymap[i].keycode == KEY_UNKNOWN) {
-                        keymap[i].scan = scancode;
+                        keymap[i].scancode = scancode;
-                        keymap[i].event = keycode;
+                        keymap[i].keycode = keycode;
                        return 0;
                }
@@ -78,7 +78,7 @@ static int dvb_usb_setkeycode(struct input_dev *dev,
 *
 * TODO: Fix the repeat rate of the input device.
 */
-static void dvb_usb_read_remote_control(struct work_struct *work)
+static void legacy_dvb_usb_read_remote_control(struct work_struct *work)
 {
        struct dvb_usb_device *d =
                container_of(work, struct dvb_usb_device, rc_query_work.work);
@@ -92,7 +92,7 @@ static void dvb_usb_read_remote_control(struct work_struct *work)
        if (dvb_usb_disable_rc_polling)
                return;
-        if (d->props.rc_query(d,&event,&state)) {
+        if (d->props.rc.legacy.rc_query(d,&event,&state)) {
                err("error while querying for an remote control event.");
                goto schedule;
        }
@@ -151,18 +151,117 @@ static void dvb_usb_read_remote_control(struct work_struct *work)
 */
 schedule:
-        schedule_delayed_work(&d->rc_query_work,msecs_to_jiffies(d->props.rc_interval));
+        schedule_delayed_work(&d->rc_query_work,msecs_to_jiffies(d->props.rc.legacy.rc_interval));
+}
+static int legacy_dvb_usb_remote_init(struct dvb_usb_device *d,
+                                      struct input_dev *input_dev)
+{
+        int i, err, rc_interval;
+        input_dev->getkeycode = legacy_dvb_usb_getkeycode;
+        input_dev->setkeycode = legacy_dvb_usb_setkeycode;
+        /* set the bits for the keys */
+        deb_rc("key map size: %d\n", d->props.rc.legacy.rc_key_map_size);
+        for (i = 0; i < d->props.rc.legacy.rc_key_map_size; i++) {
+                deb_rc("setting bit for event %d item %d\n",
+                        d->props.rc.legacy.rc_key_map[i].keycode, i);
+                set_bit(d->props.rc.legacy.rc_key_map[i].keycode, input_dev->keybit);
+        }
+        /* setting these two values to non-zero, we have to manage key repeats */
+        input_dev->rep[REP_PERIOD] = d->props.rc.legacy.rc_interval;
+        input_dev->rep[REP_DELAY]  = d->props.rc.legacy.rc_interval + 150;
+        input_set_drvdata(input_dev, d);
+        err = input_register_device(input_dev);
+        if (err)
+                input_free_device(input_dev);
+        rc_interval = d->props.rc.legacy.rc_interval;
+        INIT_DELAYED_WORK(&d->rc_query_work, legacy_dvb_usb_read_remote_control);
+        info("schedule remote query interval to %d msecs.", rc_interval);
+        schedule_delayed_work(&d->rc_query_work,
+                              msecs_to_jiffies(rc_interval));
+        d->state |= DVB_USB_STATE_REMOTE;
+        return err;
+}
+/* Remote-control poll function - called every dib->rc_query_interval ms to see
+ * whether the remote control has received anything.
+ *
+ * TODO: Fix the repeat rate of the input device.
+ */
+static void dvb_usb_read_remote_control(struct work_struct *work)
+{
+        struct dvb_usb_device *d =
+                container_of(work, struct dvb_usb_device, rc_query_work.work);
+        int err;
+        /* TODO: need a lock here.  We can simply skip checking for the remote control
+           if we're busy. */
+        /* when the parameter has been set to 1 via sysfs while the
+         * driver was running, or when bulk mode is enabled after IR init
+         */
+        if (dvb_usb_disable_rc_polling || d->props.rc.core.bulk_mode)
+                return;
+        err = d->props.rc.core.rc_query(d);
+        if (err)
+                err("error %d while querying for an remote control event.", err);
+        schedule_delayed_work(&d->rc_query_work,
+                              msecs_to_jiffies(d->props.rc.core.rc_interval));
+}
+static int rc_core_dvb_usb_remote_init(struct dvb_usb_device *d,
+                                       struct input_dev *input_dev)
+{
+        int err, rc_interval;
+        d->props.rc.core.rc_props.priv = d;
+        err = ir_input_register(input_dev,
+                                 d->props.rc.core.rc_codes,
+                                 &d->props.rc.core.rc_props,
+                                 d->props.rc.core.module_name);
+        if (err < 0)
+                return err;
+        if (!d->props.rc.core.rc_query || d->props.rc.core.bulk_mode)
+                return 0;
+        /* Polling mode - initialize a work queue for handling it */
+        INIT_DELAYED_WORK(&d->rc_query_work, dvb_usb_read_remote_control);
+        rc_interval = d->props.rc.core.rc_interval;
+        info("schedule remote query interval to %d msecs.", rc_interval);
+        schedule_delayed_work(&d->rc_query_work,
+                              msecs_to_jiffies(rc_interval));
+        return 0;
 }
 int dvb_usb_remote_init(struct dvb_usb_device *d)
 {
        struct input_dev *input_dev;
-        int i;
        int err;
-        if (d->props.rc_key_map == NULL ||
+        if (dvb_usb_disable_rc_polling)
-                d->props.rc_query == NULL ||
+                return 0;
-                dvb_usb_disable_rc_polling)
+        if (d->props.rc.legacy.rc_key_map && d->props.rc.legacy.rc_query)
+                d->props.rc.mode = DVB_RC_LEGACY;
+        else if (d->props.rc.core.rc_codes)
+                d->props.rc.mode = DVB_RC_CORE;
+        else
                return 0;
        usb_make_path(d->udev, d->rc_phys, sizeof(d->rc_phys));
@@ -177,39 +276,19 @@ int dvb_usb_remote_init(struct dvb_usb_device *d)
        input_dev->phys = d->rc_phys;
        usb_to_input_id(d->udev, &input_dev->id);
        input_dev->dev.parent = &d->udev->dev;
-        input_dev->getkeycode = dvb_usb_getkeycode;
-        input_dev->setkeycode = dvb_usb_setkeycode;
-        /* set the bits for the keys */
-        deb_rc("key map size: %d\n", d->props.rc_key_map_size);
-        for (i = 0; i < d->props.rc_key_map_size; i++) {
-                deb_rc("setting bit for event %d item %d\n",
-                        d->props.rc_key_map[i].event, i);
-                set_bit(d->props.rc_key_map[i].event, input_dev->keybit);
-        }
        /* Start the remote-control polling. */
-        if (d->props.rc_interval < 40)
+        if (d->props.rc.legacy.rc_interval < 40)
-                d->props.rc_interval = 100; /* default */
+                d->props.rc.legacy.rc_interval = 100; /* default */
-        /* setting these two values to non-zero, we have to manage key repeats */
-        input_dev->rep[REP_PERIOD] = d->props.rc_interval;
-        input_dev->rep[REP_DELAY]  = d->props.rc_interval + 150;
-        input_set_drvdata(input_dev, d);
-        err = input_register_device(input_dev);
-        if (err) {
-                input_free_device(input_dev);
-                return err;
-        }
        d->rc_input_dev = input_dev;
-        INIT_DELAYED_WORK(&d->rc_query_work, dvb_usb_read_remote_control);
+        if (d->props.rc.mode == DVB_RC_LEGACY)
+                err = legacy_dvb_usb_remote_init(d, input_dev);
-        info("schedule remote query interval to %d msecs.", d->props.rc_interval);
+        else
-        schedule_delayed_work(&d->rc_query_work,msecs_to_jiffies(d->props.rc_interval));
+                err = rc_core_dvb_usb_remote_init(d, input_dev);
+        if (err)
+                return err;
        d->state |= DVB_USB_STATE_REMOTE;
@@ -221,7 +300,10 @@ int dvb_usb_remote_exit(struct dvb_usb_device *d)
        if (d->state & DVB_USB_STATE_REMOTE) {
                cancel_rearming_delayed_work(&d->rc_query_work);
                flush_scheduled_work();
-                input_unregister_device(d->rc_input_dev);
+                if (d->props.rc.mode == DVB_RC_LEGACY)
+                        input_unregister_device(d->rc_input_dev);
+                else
+                        ir_input_unregister(d->rc_input_dev);
        }
        d->state &= ~DVB_USB_STATE_REMOTE;
        return 0;
@@ -234,7 +316,7 @@ int dvb_usb_nec_rc_key_to_event(struct dvb_usb_device *d,
                u8 keybuf[5], u32 *event, int *state)
 {
        int i;
-        struct dvb_usb_rc_key *keymap = d->props.rc_key_map;
+        struct ir_scancode *keymap = d->props.rc.legacy.rc_key_map;
        *event = 0;
        *state = REMOTE_NO_KEY_PRESSED;
        switch (keybuf[0]) {
@@ -247,10 +329,10 @@ int dvb_usb_nec_rc_key_to_event(struct dvb_usb_device *d,
                                break;
                        }
                        /* See if we can match the raw key code. */
-                        for (i = 0; i < d->props.rc_key_map_size; i++)
+                        for (i = 0; i < d->props.rc.legacy.rc_key_map_size; i++)
                                if (rc5_custom(&keymap[i]) == keybuf[1] &&
                                        rc5_data(&keymap[i]) == keybuf[3]) {
-                                        *event = keymap[i].event;
+                                        *event = keymap[i].keycode;
                                        *state = REMOTE_KEY_PRESSED;
                                        return 0;
                                }
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h b/drivers/media/dvb/dvb-usb/dvb-usb.h
index 4a9f676087bf..34f7b3ba8cc7 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb.h
@@ -14,6 +14,7 @@
 #include <linux/usb.h>
 #include <linux/firmware.h>
 #include <linux/mutex.h>
+#include <media/ir-core.h>
 #include "dvb_frontend.h"
 #include "dvb_demux.h"
@@ -74,30 +75,19 @@ struct dvb_usb_device_description {
        struct usb_device_id *warm_ids[DVB_USB_ID_MAX_NUM];
 };
-/**
+static inline u8 rc5_custom(struct ir_scancode *key)
- * struct dvb_usb_rc_key - a remote control key and its input-event
- * @custom: the vendor/custom part of the key
- * @data: the actual key part
- * @event: the input event assigned to key identified by custom and data
- */
-struct dvb_usb_rc_key {
-        u16 scan;
-        u32 event;
-};
-static inline u8 rc5_custom(struct dvb_usb_rc_key *key)
 {
-        return (key->scan >> 8) & 0xff;
+        return (key->scancode >> 8) & 0xff;
 }
-static inline u8 rc5_data(struct dvb_usb_rc_key *key)
+static inline u8 rc5_data(struct ir_scancode *key)
 {
-        return key->scan & 0xff;
+        return key->scancode & 0xff;
 }
-static inline u8 rc5_scan(struct dvb_usb_rc_key *key)
+static inline u8 rc5_scan(struct ir_scancode *key)
 {
-        return key->scan & 0xffff;
+        return key->scancode & 0xffff;
 }
 struct dvb_usb_device;
@@ -168,6 +158,55 @@ struct dvb_usb_adapter_properties {
 };
 /**
+ * struct dvb_rc_legacy - old properties of remote controller
+ * @rc_key_map: a hard-wired array of struct ir_scancode (NULL to disable
+ *  remote control handling).
+ * @rc_key_map_size: number of items in @rc_key_map.
+ * @rc_query: called to query an event event.
+ * @rc_interval: time in ms between two queries.
+ */
+struct dvb_rc_legacy {
+/* remote control properties */
+#define REMOTE_NO_KEY_PRESSED      0x00
+#define REMOTE_KEY_PRESSED         0x01
+#define REMOTE_KEY_REPEAT          0x02
+        struct ir_scancode  *rc_key_map;
+        int rc_key_map_size;
+        int (*rc_query) (struct dvb_usb_device *, u32 *, int *);
+        int rc_interval;
+};
+/**
+ * struct dvb_rc properties of remote controller, using rc-core
+ * @rc_codes: name of rc codes table
+ * @protocol: type of protocol(s) currently used by the driver
+ * @rc_query: called to query an event event.
+ * @rc_interval: time in ms between two queries.
+ * @rc_props: remote controller properties
+ * @bulk_mode: device supports bulk mode for RC (disable polling mode)
+ */
+struct dvb_rc {
+        char *rc_codes;
+        u64 protocol;
+        char *module_name;
+        int (*rc_query) (struct dvb_usb_device *d);
+        int rc_interval;
+        struct ir_dev_props rc_props;
+        bool bulk_mode;                         /* uses bulk mode */
+};
+/**
+ * enum dvb_usb_mode - Specifies if it is using a legacy driver or a new one
+ *                     based on rc-core
+ * This is initialized/used only inside dvb-usb-remote.c.
+ * It shouldn't be set by the drivers.
+ */
+enum dvb_usb_mode {
+        DVB_RC_LEGACY,
+        DVB_RC_CORE,
+};
+/**
 * struct dvb_usb_device_properties - properties of a dvb-usb-device
 * @usb_ctrl: which USB device-side controller is in use. Needed for firmware
 *  download.
@@ -185,11 +224,7 @@ struct dvb_usb_adapter_properties {
 * @identify_state: called to determine the state (cold or warm), when it
 *  is not distinguishable by the USB IDs.
 *
- * @rc_key_map: a hard-wired array of struct dvb_usb_rc_key (NULL to disable
+ * @rc: remote controller properties
- *  remote control handling).
- * @rc_key_map_size: number of items in @rc_key_map.
- * @rc_query: called to query an event event.
- * @rc_interval: time in ms between two queries.
 *
 * @i2c_algo: i2c_algorithm if the device has I2CoverUSB.
 *
@@ -233,14 +268,11 @@ struct dvb_usb_device_properties {
        int (*identify_state)   (struct usb_device *, struct dvb_usb_device_properties *,
                        struct dvb_usb_device_description **, int *);
-/* remote control properties */
+        struct {
-#define REMOTE_NO_KEY_PRESSED      0x00
+                enum dvb_usb_mode mode; /* Drivers shouldn't touch on it */
-#define REMOTE_KEY_PRESSED         0x01
+                struct dvb_rc_legacy legacy;
-#define REMOTE_KEY_REPEAT          0x02
+                struct dvb_rc core;
-        struct dvb_usb_rc_key  *rc_key_map;
+        } rc;
-        int rc_key_map_size;
-        int (*rc_query) (struct dvb_usb_device *, u32 *, int *);
-        int rc_interval;
        struct i2c_algorithm *i2c_algo;
diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c
index e8fb85380672..774df88dc6e3 100644
--- a/drivers/media/dvb/dvb-usb/dw2102.c
+++ b/drivers/media/dvb/dvb-usb/dw2102.c
@@ -74,7 +74,7 @@
                "on firmware-problems."
 struct ir_codes_dvb_usb_table_table {
-        struct dvb_usb_rc_key *rc_keys;
+        struct ir_scancode *rc_keys;
        int rc_keys_size;
 };
@@ -948,7 +948,7 @@ static int dw3101_tuner_attach(struct dvb_usb_adapter *adap)
        return 0;
 }
-static struct dvb_usb_rc_key ir_codes_dw210x_table[] = {
+static struct ir_scancode ir_codes_dw210x_table[] = {
        { 0xf80a, KEY_Q },              /*power*/
        { 0xf80c, KEY_M },              /*mute*/
        { 0xf811, KEY_1 },
@@ -982,7 +982,7 @@ static struct dvb_usb_rc_key ir_codes_dw210x_table[] = {
        { 0xf81b, KEY_B },              /*recall*/
 };
-static struct dvb_usb_rc_key ir_codes_tevii_table[] = {
+static struct ir_scancode ir_codes_tevii_table[] = {
        { 0xf80a, KEY_POWER },
        { 0xf80c, KEY_MUTE },
        { 0xf811, KEY_1 },
@@ -1032,7 +1032,7 @@ static struct dvb_usb_rc_key ir_codes_tevii_table[] = {
        { 0xf858, KEY_SWITCHVIDEOMODE },
 };
-static struct dvb_usb_rc_key ir_codes_tbs_table[] = {
+static struct ir_scancode ir_codes_tbs_table[] = {
        { 0xf884, KEY_POWER },
        { 0xf894, KEY_MUTE },
        { 0xf887, KEY_1 },
@@ -1075,8 +1075,8 @@ static struct ir_codes_dvb_usb_table_table keys_tables[] = {
 static int dw2102_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 {
-        struct dvb_usb_rc_key *keymap = d->props.rc_key_map;
+        struct ir_scancode *keymap = d->props.rc.legacy.rc_key_map;
-        int keymap_size = d->props.rc_key_map_size;
+        int keymap_size = d->props.rc.legacy.rc_key_map_size;
        u8 key[2];
        struct i2c_msg msg = {
                .addr = DW2102_RC_QUERY,
@@ -1096,7 +1096,7 @@ static int dw2102_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
                for (i = 0; i < keymap_size ; i++) {
                        if (rc5_data(&keymap[i]) == msg.buf[0]) {
                                *state = REMOTE_KEY_PRESSED;
-                                *event = keymap[i].event;
+                                *event = keymap[i].keycode;
                                break;
                        }
@@ -1185,13 +1185,13 @@ static int dw2102_load_firmware(struct usb_device *dev,
                /* init registers */
                switch (dev->descriptor.idProduct) {
                case USB_PID_PROF_1100:
-                        s6x0_properties.rc_key_map = ir_codes_tbs_table;
+                        s6x0_properties.rc.legacy.rc_key_map = ir_codes_tbs_table;
-                        s6x0_properties.rc_key_map_size =
+                        s6x0_properties.rc.legacy.rc_key_map_size =
                                        ARRAY_SIZE(ir_codes_tbs_table);
                        break;
                case USB_PID_TEVII_S650:
-                        dw2104_properties.rc_key_map = ir_codes_tevii_table;
+                        dw2104_properties.rc.legacy.rc_key_map = ir_codes_tevii_table;
-                        dw2104_properties.rc_key_map_size =
+                        dw2104_properties.rc.legacy.rc_key_map_size =
                                        ARRAY_SIZE(ir_codes_tevii_table);
                case USB_PID_DW2104:
                        reset = 1;
@@ -1255,10 +1255,13 @@ static struct dvb_usb_device_properties dw2102_properties = {
        .no_reconnect = 1,
        .i2c_algo = &dw2102_serit_i2c_algo,
-        .rc_key_map = ir_codes_dw210x_table,
-        .rc_key_map_size = ARRAY_SIZE(ir_codes_dw210x_table),
+        .rc.legacy = {
-        .rc_interval = 150,
+                .rc_key_map = ir_codes_dw210x_table,
-        .rc_query = dw2102_rc_query,
+                .rc_key_map_size = ARRAY_SIZE(ir_codes_dw210x_table),
+                .rc_interval = 150,
+                .rc_query = dw2102_rc_query,
+        },
        .generic_bulk_ctrl_endpoint = 0x81,
        /* parameter for the MPEG2-data transfer */
@@ -1306,10 +1309,12 @@ static struct dvb_usb_device_properties dw2104_properties = {
        .no_reconnect = 1,
        .i2c_algo = &dw2104_i2c_algo,
-        .rc_key_map = ir_codes_dw210x_table,
+        .rc.legacy = {
-        .rc_key_map_size = ARRAY_SIZE(ir_codes_dw210x_table),
+                .rc_key_map = ir_codes_dw210x_table,
-        .rc_interval = 150,
+                .rc_key_map_size = ARRAY_SIZE(ir_codes_dw210x_table),
-        .rc_query = dw2102_rc_query,
+                .rc_interval = 150,
+                .rc_query = dw2102_rc_query,
+        },
        .generic_bulk_ctrl_endpoint = 0x81,
        /* parameter for the MPEG2-data transfer */
@@ -1353,10 +1358,12 @@ static struct dvb_usb_device_properties dw3101_properties = {
        .no_reconnect = 1,
        .i2c_algo = &dw3101_i2c_algo,
-        .rc_key_map = ir_codes_dw210x_table,
+        .rc.legacy = {
-        .rc_key_map_size = ARRAY_SIZE(ir_codes_dw210x_table),
+                .rc_key_map = ir_codes_dw210x_table,
-        .rc_interval = 150,
+                .rc_key_map_size = ARRAY_SIZE(ir_codes_dw210x_table),
-        .rc_query = dw2102_rc_query,
+                .rc_interval = 150,
+                .rc_query = dw2102_rc_query,
+        },
        .generic_bulk_ctrl_endpoint = 0x81,
        /* parameter for the MPEG2-data transfer */
@@ -1396,10 +1403,12 @@ static struct dvb_usb_device_properties s6x0_properties = {
        .no_reconnect = 1,
        .i2c_algo = &s6x0_i2c_algo,
-        .rc_key_map = ir_codes_tevii_table,
+        .rc.legacy = {
-        .rc_key_map_size = ARRAY_SIZE(ir_codes_tevii_table),
+                .rc_key_map = ir_codes_tevii_table,
-        .rc_interval = 150,
+                .rc_key_map_size = ARRAY_SIZE(ir_codes_tevii_table),
-        .rc_query = dw2102_rc_query,
+                .rc_interval = 150,
+                .rc_query = dw2102_rc_query,
+        },
        .generic_bulk_ctrl_endpoint = 0x81,
        .num_adapters = 1,
@@ -1459,8 +1468,8 @@ static int dw2102_probe(struct usb_interface *intf,
        /* fill only different fields */
        p7500->firmware = "dvb-usb-p7500.fw";
        p7500->devices[0] = d7500;
-        p7500->rc_key_map = ir_codes_tbs_table;
+        p7500->rc.legacy.rc_key_map = ir_codes_tbs_table;
-        p7500->rc_key_map_size = ARRAY_SIZE(ir_codes_tbs_table);
+        p7500->rc.legacy.rc_key_map_size = ARRAY_SIZE(ir_codes_tbs_table);
        p7500->adapter->frontend_attach = prof_7500_frontend_attach;
        if (0 == dvb_usb_device_init(intf, &dw2102_properties,
diff --git a/drivers/media/dvb/dvb-usb/gp8psk-fe.c b/drivers/media/dvb/dvb-usb/gp8psk-fe.c
index 7a7f1b2b681c..dbdb5347b2a8 100644
--- a/drivers/media/dvb/dvb-usb/gp8psk-fe.c
+++ b/drivers/media/dvb/dvb-usb/gp8psk-fe.c
@@ -349,7 +349,7 @@ static struct dvb_frontend_ops gp8psk_fe_ops = {
                         * FE_CAN_QAM_16 is for compatibility
                         * (Myth incorrectly detects Turbo-QPSK as plain QAM-16)
                         */
-                        FE_CAN_QPSK | FE_CAN_QAM_16
+                        FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_TURBO_FEC
        },
        .release = gp8psk_fe_release,
diff --git a/drivers/media/dvb/dvb-usb/m920x.c b/drivers/media/dvb/dvb-usb/m920x.c
index c211fef45fc3..bdef1a18b664 100644
--- a/drivers/media/dvb/dvb-usb/m920x.c
+++ b/drivers/media/dvb/dvb-usb/m920x.c
@@ -69,7 +69,7 @@ static int m920x_init(struct dvb_usb_device *d, struct m920x_inits *rc_seq)
        int adap_enabled[M9206_MAX_ADAPTERS] = { 0 };
        /* Remote controller init. */
-        if (d->props.rc_query) {
+        if (d->props.rc.legacy.rc_query) {
                deb("Initialising remote control\n");
                while (rc_seq->address) {
                        if ((ret = m920x_write(d->udev, M9206_CORE,
@@ -142,9 +142,9 @@ static int m920x_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
        if ((ret = m920x_read(d->udev, M9206_CORE, 0x0, M9206_RC_KEY, rc_state + 1, 1)) != 0)
                goto unlock;
-        for (i = 0; i < d->props.rc_key_map_size; i++)
+        for (i = 0; i < d->props.rc.legacy.rc_key_map_size; i++)
-                if (rc5_data(&d->props.rc_key_map[i]) == rc_state[1]) {
+                if (rc5_data(&d->props.rc.legacy.rc_key_map[i]) == rc_state[1]) {
-                        *event = d->props.rc_key_map[i].event;
+                        *event = d->props.rc.legacy.rc_key_map[i].keycode;
                        switch(rc_state[0]) {
                        case 0x80:
@@ -589,7 +589,7 @@ static struct m920x_inits pinnacle310e_init[] = {
 };
 /* ir keymaps */
-static struct dvb_usb_rc_key ir_codes_megasky_table [] = {
+static struct ir_scancode ir_codes_megasky_table[] = {
        { 0x0012, KEY_POWER },
        { 0x001e, KEY_CYCLEWINDOWS }, /* min/max */
        { 0x0002, KEY_CHANNELUP },
@@ -608,7 +608,7 @@ static struct dvb_usb_rc_key ir_codes_megasky_table [] = {
        { 0x000e, KEY_COFFEE }, /* "MTS" */
 };
-static struct dvb_usb_rc_key ir_codes_tvwalkertwin_table [] = {
+static struct ir_scancode ir_codes_tvwalkertwin_table[] = {
        { 0x0001, KEY_ZOOM }, /* Full Screen */
        { 0x0002, KEY_CAMERA }, /* snapshot */
        { 0x0003, KEY_MUTE },
@@ -628,7 +628,7 @@ static struct dvb_usb_rc_key ir_codes_tvwalkertwin_table [] = {
        { 0x001e, KEY_VOLUMEUP },
 };
-static struct dvb_usb_rc_key ir_codes_pinnacle310e_table[] = {
+static struct ir_scancode ir_codes_pinnacle310e_table[] = {
        { 0x16, KEY_POWER },
        { 0x17, KEY_FAVORITES },
        { 0x0f, KEY_TEXT },
@@ -784,10 +784,12 @@ static struct dvb_usb_device_properties megasky_properties = {
        .firmware = "dvb-usb-megasky-02.fw",
        .download_firmware = m920x_firmware_download,
-        .rc_interval      = 100,
+        .rc.legacy = {
-        .rc_key_map       = ir_codes_megasky_table,
+                .rc_interval      = 100,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_megasky_table),
+                .rc_key_map       = ir_codes_megasky_table,
-        .rc_query         = m920x_rc_query,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_megasky_table),
+                .rc_query         = m920x_rc_query,
+        },
        .size_of_priv     = sizeof(struct m920x_state),
@@ -885,10 +887,12 @@ static struct dvb_usb_device_properties tvwalkertwin_properties = {
        .firmware = "dvb-usb-tvwalkert.fw",
        .download_firmware = m920x_firmware_download,
-        .rc_interval      = 100,
+        .rc.legacy = {
-        .rc_key_map       = ir_codes_tvwalkertwin_table,
+                .rc_interval      = 100,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_tvwalkertwin_table),
+                .rc_key_map       = ir_codes_tvwalkertwin_table,
-        .rc_query         = m920x_rc_query,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_tvwalkertwin_table),
+                .rc_query         = m920x_rc_query,
+        },
        .size_of_priv     = sizeof(struct m920x_state),
@@ -992,10 +996,12 @@ static struct dvb_usb_device_properties pinnacle_pctv310e_properties = {
        .usb_ctrl = DEVICE_SPECIFIC,
        .download_firmware = NULL,
-        .rc_interval      = 100,
+        .rc.legacy = {
-        .rc_key_map       = ir_codes_pinnacle310e_table,
+                .rc_interval      = 100,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_pinnacle310e_table),
+                .rc_key_map       = ir_codes_pinnacle310e_table,
-        .rc_query         = m920x_rc_query,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_pinnacle310e_table),
+                .rc_query         = m920x_rc_query,
+        },
        .size_of_priv     = sizeof(struct m920x_state),
diff --git a/drivers/media/dvb/dvb-usb/nova-t-usb2.c b/drivers/media/dvb/dvb-usb/nova-t-usb2.c
index d195a587cc65..181f36a12e2a 100644
--- a/drivers/media/dvb/dvb-usb/nova-t-usb2.c
+++ b/drivers/media/dvb/dvb-usb/nova-t-usb2.c
@@ -21,7 +21,7 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 #define deb_ee(args...) dprintk(debug,0x02,args)
 /* Hauppauge NOVA-T USB2 keys */
-static struct dvb_usb_rc_key ir_codes_haupp_table [] = {
+static struct ir_scancode ir_codes_haupp_table[] = {
        { 0x1e00, KEY_0 },
        { 0x1e01, KEY_1 },
        { 0x1e02, KEY_2 },
@@ -98,7 +98,7 @@ static int nova_t_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
                                        deb_rc("c: %x, d: %x\n", rc5_data(&ir_codes_haupp_table[i]),
                                                                 rc5_custom(&ir_codes_haupp_table[i]));
-                                        *event = ir_codes_haupp_table[i].event;
+                                        *event = ir_codes_haupp_table[i].keycode;
                                        *state = REMOTE_KEY_PRESSED;
                                        if (st->old_toggle == toggle) {
                                                if (st->last_repeat_count++ < 2)
@@ -195,10 +195,12 @@ static struct dvb_usb_device_properties nova_t_properties = {
        .power_ctrl       = dibusb2_0_power_ctrl,
        .read_mac_address = nova_t_read_mac_address,
-        .rc_interval      = 100,
+        .rc.legacy = {
-        .rc_key_map       = ir_codes_haupp_table,
+                .rc_interval      = 100,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_haupp_table),
+                .rc_key_map       = ir_codes_haupp_table,
-        .rc_query         = nova_t_rc_query,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_haupp_table),
+                .rc_query         = nova_t_rc_query,
+        },
        .i2c_algo         = &dibusb_i2c_algo,
diff --git a/drivers/media/dvb/dvb-usb/opera1.c b/drivers/media/dvb/dvb-usb/opera1.c
index dfb81ff1d9a7..6b22ec64ab0c 100644
--- a/drivers/media/dvb/dvb-usb/opera1.c
+++ b/drivers/media/dvb/dvb-usb/opera1.c
@@ -331,7 +331,7 @@ static int opera1_pid_filter_control(struct dvb_usb_adapter *adap, int onoff)
        return 0;
 }
-static struct dvb_usb_rc_key ir_codes_opera1_table[] = {
+static struct ir_scancode ir_codes_opera1_table[] = {
        {0x5fa0, KEY_1},
        {0x51af, KEY_2},
        {0x5da2, KEY_3},
@@ -407,9 +407,9 @@ static int opera1_rc_query(struct dvb_usb_device *dev, u32 * event, int *state)
                for (i = 0; i < ARRAY_SIZE(ir_codes_opera1_table); i++) {
                        if (rc5_scan(&ir_codes_opera1_table[i]) == (send_key & 0xffff)) {
                                *state = REMOTE_KEY_PRESSED;
-                                *event = ir_codes_opera1_table[i].event;
+                                *event = ir_codes_opera1_table[i].keycode;
                                opst->last_key_pressed =
-                                        ir_codes_opera1_table[i].event;
+                                        ir_codes_opera1_table[i].keycode;
                                break;
                        }
                        opst->last_key_pressed = 0;
@@ -498,10 +498,12 @@ static struct dvb_usb_device_properties opera1_properties = {
        .power_ctrl = opera1_power_ctrl,
        .i2c_algo = &opera1_i2c_algo,
-        .rc_key_map = ir_codes_opera1_table,
+        .rc.legacy = {
-        .rc_key_map_size = ARRAY_SIZE(ir_codes_opera1_table),
+                .rc_key_map = ir_codes_opera1_table,
-        .rc_interval = 200,
+                .rc_key_map_size = ARRAY_SIZE(ir_codes_opera1_table),
-        .rc_query = opera1_rc_query,
+                .rc_interval = 200,
+                .rc_query = opera1_rc_query,
+        },
        .read_mac_address = opera1_read_mac_address,
        .generic_bulk_ctrl_endpoint = 0x00,
        /* parameter for the MPEG2-data transfer */
diff --git a/drivers/media/dvb/dvb-usb/vp702x.c b/drivers/media/dvb/dvb-usb/vp702x.c
index 4d332451653b..5c9f3275aaa0 100644
--- a/drivers/media/dvb/dvb-usb/vp702x.c
+++ b/drivers/media/dvb/dvb-usb/vp702x.c
@@ -174,7 +174,7 @@ static int vp702x_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
 }
 /* keys for the enclosed remote control */
-static struct dvb_usb_rc_key ir_codes_vp702x_table[] = {
+static struct ir_scancode ir_codes_vp702x_table[] = {
        { 0x0001, KEY_1 },
        { 0x0002, KEY_2 },
 };
@@ -200,7 +200,7 @@ static int vp702x_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
        for (i = 0; i < ARRAY_SIZE(ir_codes_vp702x_table); i++)
                if (rc5_custom(&ir_codes_vp702x_table[i]) == key[1]) {
                        *state = REMOTE_KEY_PRESSED;
-                        *event = ir_codes_vp702x_table[i].event;
+                        *event = ir_codes_vp702x_table[i].keycode;
                        break;
                }
        return 0;
@@ -283,10 +283,12 @@ static struct dvb_usb_device_properties vp702x_properties = {
        },
        .read_mac_address = vp702x_read_mac_addr,
-        .rc_key_map       = ir_codes_vp702x_table,
+        .rc.legacy = {
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_vp702x_table),
+                .rc_key_map       = ir_codes_vp702x_table,
-        .rc_interval      = 400,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_vp702x_table),
-        .rc_query         = vp702x_rc_query,
+                .rc_interval      = 400,
+                .rc_query         = vp702x_rc_query,
+        },
        .num_device_descs = 1,
        .devices = {
diff --git a/drivers/media/dvb/dvb-usb/vp7045.c b/drivers/media/dvb/dvb-usb/vp7045.c
index 036893fa4480..f13791ca5994 100644
--- a/drivers/media/dvb/dvb-usb/vp7045.c
+++ b/drivers/media/dvb/dvb-usb/vp7045.c
@@ -99,7 +99,7 @@ static int vp7045_power_ctrl(struct dvb_usb_device *d, int onoff)
 /* The keymapping struct. Somehow this should be loaded to the driver, but
 * currently it is hardcoded. */
-static struct dvb_usb_rc_key ir_codes_vp7045_table[] = {
+static struct ir_scancode ir_codes_vp7045_table[] = {
        { 0x0016, KEY_POWER },
        { 0x0010, KEY_MUTE },
        { 0x0003, KEY_1 },
@@ -168,7 +168,7 @@ static int vp7045_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
        for (i = 0; i < ARRAY_SIZE(ir_codes_vp7045_table); i++)
                if (rc5_data(&ir_codes_vp7045_table[i]) == key) {
                        *state = REMOTE_KEY_PRESSED;
-                        *event = ir_codes_vp7045_table[i].event;
+                        *event = ir_codes_vp7045_table[i].keycode;
                        break;
                }
        return 0;
@@ -259,10 +259,12 @@ static struct dvb_usb_device_properties vp7045_properties = {
        .power_ctrl       = vp7045_power_ctrl,
        .read_mac_address = vp7045_read_mac_addr,
-        .rc_interval      = 400,
+        .rc.legacy = {
-        .rc_key_map       = ir_codes_vp7045_table,
+                .rc_interval      = 400,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_vp7045_table),
+                .rc_key_map       = ir_codes_vp7045_table,
-        .rc_query         = vp7045_rc_query,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_vp7045_table),
+                .rc_query         = vp7045_rc_query,
+        },
        .num_device_descs = 2,
        .devices = {
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index cd7f9b7cbffa..51d578a758a7 100644
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -584,6 +584,7 @@ config DVB_LGS8GL5
 config DVB_LGS8GXX
        tristate "Legend Silicon LGS8913/LGS8GL5/LGS8GXX DMB-TH demodulator"
        depends on DVB_CORE && I2C
+        select FW_LOADER
        default m if DVB_FE_CUSTOMISE
        help
          A DMB-TH tuner module. Say Y when you want to support this frontend.
diff --git a/drivers/media/dvb/frontends/af9013.c b/drivers/media/dvb/frontends/af9013.c
index 12e018b4107d..dac917f7bb7f 100644
--- a/drivers/media/dvb/frontends/af9013.c
+++ b/drivers/media/dvb/frontends/af9013.c
@@ -1,5 +1,5 @@
 /*
- * DVB USB Linux driver for Afatech AF9015 DVB-T USB2.0 receiver
+ * Afatech AF9013 demodulator driver
 *
 * Copyright (C) 2007 Antti Palosaari <crope@iki.fi>
 *
@@ -761,6 +761,10 @@ static int af9013_set_frontend(struct dvb_frontend *fe,
        state->frequency = params->frequency;
+        /* program tuner */
+        if (fe->ops.tuner_ops.set_params)
+                fe->ops.tuner_ops.set_params(fe, params);
        /* program CFOE coefficients */
        ret = af9013_set_coeff(state, params->u.ofdm.bandwidth);
        if (ret)
@@ -791,10 +795,6 @@ static int af9013_set_frontend(struct dvb_frontend *fe,
        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)
@@ -1184,45 +1184,49 @@ static int af9013_read_status(struct dvb_frontend *fe, fe_status_t *status)
        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;
+                *status |= FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI |
+                        FE_HAS_SYNC | FE_HAS_LOCK;
-        if (!(*status & FE_HAS_SIGNAL)) {
+        if (!*status) {
-                /* AGC lock */
+                /* TPS lock */
-                ret = af9013_read_reg_bits(state, 0xd1a0, 6, 1, &tmp);
+                ret = af9013_read_reg_bits(state, 0xd330, 3, 1, &tmp);
                if (ret)
                        goto error;
                if (tmp)
-                        *status |= FE_HAS_SIGNAL;
+                        *status |= FE_HAS_SIGNAL | FE_HAS_CARRIER |
+                                FE_HAS_VITERBI;
        }
-        if (!(*status & FE_HAS_CARRIER)) {
+        if (!*status) {
                /* CFO lock */
                ret = af9013_read_reg_bits(state, 0xd333, 7, 1, &tmp);
                if (ret)
                        goto error;
                if (tmp)
-                        *status |= FE_HAS_CARRIER;
+                        *status |= FE_HAS_SIGNAL | FE_HAS_CARRIER;
        }
-        if (!(*status & FE_HAS_CARRIER)) {
+        if (!*status) {
                /* SFOE lock */
                ret = af9013_read_reg_bits(state, 0xd334, 6, 1, &tmp);
                if (ret)
                        goto error;
                if (tmp)
-                        *status |= FE_HAS_CARRIER;
+                        *status |= FE_HAS_SIGNAL | FE_HAS_CARRIER;
+        }
+        if (!*status) {
+                /* AGC lock */
+                ret = af9013_read_reg_bits(state, 0xd1a0, 6, 1, &tmp);
+                if (ret)
+                        goto error;
+                if (tmp)
+                        *status |= FE_HAS_SIGNAL;
        }
        ret = af9013_update_statistics(fe);
@@ -1574,7 +1578,7 @@ struct dvb_frontend *af9013_attach(const struct af9013_config *config,
 {
        int ret;
        struct af9013_state *state = NULL;
-        u8 buf[3], i;
+        u8 buf[4], i;
        /* allocate memory for the internal state */
        state = kzalloc(sizeof(struct af9013_state), GFP_KERNEL);
@@ -1607,12 +1611,12 @@ struct dvb_frontend *af9013_attach(const struct af9013_config *config,
        }
        /* firmware version */
-        for (i = 0; i < 3; i++) {
+        for (i = 0; i < 4; 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]);
+        info("firmware version:%d.%d.%d.%d", buf[0], buf[1], buf[2], buf[3]);
        /* settings for mp2if */
        if (state->config.output_mode == AF9013_OUTPUT_MODE_USB) {
diff --git a/drivers/media/dvb/frontends/af9013.h b/drivers/media/dvb/frontends/af9013.h
index e90fa92b1c1d..72c71bb5d117 100644
--- a/drivers/media/dvb/frontends/af9013.h
+++ b/drivers/media/dvb/frontends/af9013.h
@@ -1,5 +1,5 @@
 /*
- * DVB USB Linux driver for Afatech AF9015 DVB-T USB2.0 receiver
+ * Afatech AF9013 demodulator driver
 *
 * Copyright (C) 2007 Antti Palosaari <crope@iki.fi>
 *
diff --git a/drivers/media/dvb/frontends/af9013_priv.h b/drivers/media/dvb/frontends/af9013_priv.h
index 163e251d0b73..0fd42b7e248e 100644
--- a/drivers/media/dvb/frontends/af9013_priv.h
+++ b/drivers/media/dvb/frontends/af9013_priv.h
@@ -1,5 +1,5 @@
 /*
- * DVB USB Linux driver for Afatech AF9015 DVB-T USB2.0 receiver
+ * Afatech AF9013 demodulator driver
 *
 * Copyright (C) 2007 Antti Palosaari <crope@iki.fi>
 *
@@ -132,6 +132,8 @@ static struct regdesc ofsm_init[] = {
        { 0xd740, 2, 1, 0x00 },
        { 0xd740, 3, 1, 0x01 },
        { 0xd3c1, 4, 1, 0x01 },
+        { 0x9124, 0, 8, 0x58 },
+        { 0x9125, 0, 2, 0x02 },
        { 0xd3a2, 0, 8, 0x00 },
        { 0xd3a3, 0, 8, 0x04 },
        { 0xd305, 0, 8, 0x32 },
@@ -143,7 +145,7 @@ static struct regdesc ofsm_init[] = {
        { 0x911b, 0, 1, 0x01 },
        { 0x9bce, 0, 4, 0x02 },
        { 0x9116, 0, 1, 0x01 },
-        { 0x9bd1, 0, 1, 0x01 },
+        { 0x9122, 0, 8, 0xd0 },
        { 0xd2e0, 0, 8, 0xd0 },
        { 0xd2e9, 0, 4, 0x0d },
        { 0xd38c, 0, 8, 0xfc },
@@ -165,7 +167,6 @@ static struct regdesc ofsm_init[] = {
        { 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 },
@@ -179,6 +180,7 @@ static struct regdesc ofsm_init[] = {
        { 0xd0f0, 0, 7, 0x1a },
        { 0xd0f1, 4, 1, 0x01 },
        { 0xd0f2, 0, 8, 0x0c },
+        { 0xd101, 5, 3, 0x06 },
        { 0xd103, 0, 4, 0x08 },
        { 0xd0f8, 0, 7, 0x20 },
        { 0xd111, 5, 1, 0x00 },
diff --git a/drivers/media/dvb/frontends/dib3000mb.c b/drivers/media/dvb/frontends/dib3000mb.c
index ad4c8cfd8090..e80c59796368 100644
--- a/drivers/media/dvb/frontends/dib3000mb.c
+++ b/drivers/media/dvb/frontends/dib3000mb.c
@@ -38,11 +38,10 @@
 #define DRIVER_DESC "DiBcom 3000M-B DVB-T demodulator"
 #define DRIVER_AUTHOR "Patrick Boettcher, patrick.boettcher@desy.de"
-#ifdef CONFIG_DVB_DIBCOM_DEBUG
 static int debug;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "set debugging level (1=info,2=xfer,4=setfe,8=getfe (|-able)).");
-#endif
 #define deb_info(args...) dprintk(0x01,args)
 #define deb_i2c(args...)  dprintk(0x02,args)
 #define deb_srch(args...) dprintk(0x04,args)
@@ -51,12 +50,6 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info,2=xfer,4=setfe,8=getfe (|-a
 #define deb_setf(args...) dprintk(0x04,args)
 #define deb_getf(args...) dprintk(0x08,args)
-#ifdef CONFIG_DVB_DIBCOM_DEBUG
-static int debug;
-module_param(debug, int, 0644);
-MODULE_PARM_DESC(debug, "set debugging level (1=info,2=i2c,4=srch (|-able)).");
-#endif
 static int dib3000_read_reg(struct dib3000_state *state, u16 reg)
 {
        u8 wb[] = { ((reg >> 8) | 0x80) & 0xff, reg & 0xff };
diff --git a/drivers/media/dvb/frontends/dib3000mb_priv.h b/drivers/media/dvb/frontends/dib3000mb_priv.h
index 1a12747fdc91..16c526591f36 100644
--- a/drivers/media/dvb/frontends/dib3000mb_priv.h
+++ b/drivers/media/dvb/frontends/dib3000mb_priv.h
@@ -37,12 +37,8 @@
 /* debug */
-#ifdef CONFIG_DVB_DIBCOM_DEBUG
 #define dprintk(level,args...) \
    do { if ((debug & level)) { printk(args); } } while (0)
-#else
-#define dprintk(args...) do { } while (0)
-#endif
 /* mask for enabling a specific pid for the pid_filter */
 #define DIB3000_ACTIVATE_PID_FILTERING  (0x2000)
diff --git a/drivers/media/dvb/frontends/dib3000mc.c b/drivers/media/dvb/frontends/dib3000mc.c
index afad252abf41..088e7fadbe3d 100644
--- a/drivers/media/dvb/frontends/dib3000mc.c
+++ b/drivers/media/dvb/frontends/dib3000mc.c
@@ -822,7 +822,7 @@ int dib3000mc_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 defa
        dmcst = kzalloc(sizeof(struct dib3000mc_state), GFP_KERNEL);
        if (dmcst == NULL)
-                return -ENODEV;
+                return -ENOMEM;
        dmcst->i2c_adap = i2c;
diff --git a/drivers/media/dvb/frontends/lgdt3305.c b/drivers/media/dvb/frontends/lgdt3305.c
index d69c775f8645..3272881cb112 100644
--- a/drivers/media/dvb/frontends/lgdt3305.c
+++ b/drivers/media/dvb/frontends/lgdt3305.c
@@ -1,7 +1,9 @@
 /*
- *    Support for LGDT3305 - VSB/QAM
+ *    Support for LG Electronics LGDT3304 and LGDT3305 - VSB/QAM
 *
- *    Copyright (C) 2008, 2009 Michael Krufky <mkrufky@linuxtv.org>
+ *    Copyright (C) 2008, 2009, 2010 Michael Krufky <mkrufky@linuxtv.org>
+ *
+ *    LGDT3304 support by Jarod Wilson <jarod@redhat.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
@@ -65,6 +67,8 @@ struct lgdt3305_state {
 /* ------------------------------------------------------------------------ */
+/* FIXME: verify & document the LGDT3304 registers */
 #define LGDT3305_GEN_CTRL_1                   0x0000
 #define LGDT3305_GEN_CTRL_2                   0x0001
 #define LGDT3305_GEN_CTRL_3                   0x0002
@@ -358,7 +362,12 @@ static int lgdt3305_rfagc_loop(struct lgdt3305_state *state,
        case QAM_256:
                agcdelay = 0x046b;
                rfbw     = 0x8889;
-                ifbw     = 0x8888;
+                /* FIXME: investigate optimal ifbw & rfbw values for the
+                 *        DT3304 and re-write this switch..case block */
+                if (state->cfg->demod_chip == LGDT3304)
+                        ifbw = 0x6666;
+                else /* (state->cfg->demod_chip == LGDT3305) */
+                        ifbw = 0x8888;
                break;
        default:
                return -EINVAL;
@@ -410,8 +419,18 @@ static int lgdt3305_agc_setup(struct lgdt3305_state *state,
        lg_dbg("lockdten = %d, acqen = %d\n", lockdten, acqen);
        /* control agc function */
-        lgdt3305_write_reg(state, LGDT3305_AGC_CTRL_4, 0xe1 | lockdten << 1);
+        switch (state->cfg->demod_chip) {
-        lgdt3305_set_reg_bit(state, LGDT3305_AGC_CTRL_1, 2, acqen);
+        case LGDT3304:
+                lgdt3305_write_reg(state, 0x0314, 0xe1 | lockdten << 1);
+                lgdt3305_set_reg_bit(state, 0x030e, 2, acqen);
+                break;
+        case LGDT3305:
+                lgdt3305_write_reg(state, LGDT3305_AGC_CTRL_4, 0xe1 | lockdten << 1);
+                lgdt3305_set_reg_bit(state, LGDT3305_AGC_CTRL_1, 2, acqen);
+                break;
+        default:
+                return -EINVAL;
+        }
        return lgdt3305_rfagc_loop(state, param);
 }
@@ -577,61 +596,79 @@ static int lgdt3305_init(struct dvb_frontend *fe)
        struct lgdt3305_state *state = fe->demodulator_priv;
        int ret;
+        static struct lgdt3305_reg lgdt3304_init_data[] = {
+                { .reg = LGDT3305_GEN_CTRL_1,           .val = 0x03, },
+                { .reg = 0x000d,                        .val = 0x02, },
+                { .reg = 0x000e,                        .val = 0x02, },
+                { .reg = LGDT3305_DGTL_AGC_REF_1,       .val = 0x32, },
+                { .reg = LGDT3305_DGTL_AGC_REF_2,       .val = 0xc4, },
+                { .reg = LGDT3305_CR_CTR_FREQ_1,        .val = 0x00, },
+                { .reg = LGDT3305_CR_CTR_FREQ_2,        .val = 0x00, },
+                { .reg = LGDT3305_CR_CTR_FREQ_3,        .val = 0x00, },
+                { .reg = LGDT3305_CR_CTR_FREQ_4,        .val = 0x00, },
+                { .reg = LGDT3305_CR_CTRL_7,            .val = 0xf9, },
+                { .reg = 0x0112,                        .val = 0x17, },
+                { .reg = 0x0113,                        .val = 0x15, },
+                { .reg = 0x0114,                        .val = 0x18, },
+                { .reg = 0x0115,                        .val = 0xff, },
+                { .reg = 0x0116,                        .val = 0x3c, },
+                { .reg = 0x0214,                        .val = 0x67, },
+                { .reg = 0x0424,                        .val = 0x8d, },
+                { .reg = 0x0427,                        .val = 0x12, },
+                { .reg = 0x0428,                        .val = 0x4f, },
+                { .reg = LGDT3305_IFBW_1,               .val = 0x80, },
+                { .reg = LGDT3305_IFBW_2,               .val = 0x00, },
+                { .reg = 0x030a,                        .val = 0x08, },
+                { .reg = 0x030b,                        .val = 0x9b, },
+                { .reg = 0x030d,                        .val = 0x00, },
+                { .reg = 0x030e,                        .val = 0x1c, },
+                { .reg = 0x0314,                        .val = 0xe1, },
+                { .reg = 0x000d,                        .val = 0x82, },
+                { .reg = LGDT3305_TP_CTRL_1,            .val = 0x5b, },
+                { .reg = LGDT3305_TP_CTRL_1,            .val = 0x5b, },
+        };
        static struct lgdt3305_reg lgdt3305_init_data[] = {
-                { .reg = LGDT3305_GEN_CTRL_1,
+                { .reg = LGDT3305_GEN_CTRL_1,           .val = 0x03, },
-                  .val = 0x03, },
+                { .reg = LGDT3305_GEN_CTRL_2,           .val = 0xb0, },
-                { .reg = LGDT3305_GEN_CTRL_2,
+                { .reg = LGDT3305_GEN_CTRL_3,           .val = 0x01, },
-                  .val = 0xb0, },
+                { .reg = LGDT3305_GEN_CONTROL,          .val = 0x6f, },
-                { .reg = LGDT3305_GEN_CTRL_3,
+                { .reg = LGDT3305_GEN_CTRL_4,           .val = 0x03, },
-                  .val = 0x01, },
+                { .reg = LGDT3305_DGTL_AGC_REF_1,       .val = 0x32, },
-                { .reg = LGDT3305_GEN_CONTROL,
+                { .reg = LGDT3305_DGTL_AGC_REF_2,       .val = 0xc4, },
-                  .val = 0x6f, },
+                { .reg = LGDT3305_CR_CTR_FREQ_1,        .val = 0x00, },
-                { .reg = LGDT3305_GEN_CTRL_4,
+                { .reg = LGDT3305_CR_CTR_FREQ_2,        .val = 0x00, },
-                  .val = 0x03, },
+                { .reg = LGDT3305_CR_CTR_FREQ_3,        .val = 0x00, },
-                { .reg = LGDT3305_DGTL_AGC_REF_1,
+                { .reg = LGDT3305_CR_CTR_FREQ_4,        .val = 0x00, },
-                  .val = 0x32, },
+                { .reg = LGDT3305_CR_CTRL_7,            .val = 0x79, },
-                { .reg = LGDT3305_DGTL_AGC_REF_2,
+                { .reg = LGDT3305_AGC_POWER_REF_1,      .val = 0x32, },
-                  .val = 0xc4, },
+                { .reg = LGDT3305_AGC_POWER_REF_2,      .val = 0xc4, },
-                { .reg = LGDT3305_CR_CTR_FREQ_1,
+                { .reg = LGDT3305_AGC_DELAY_PT_1,       .val = 0x0d, },
-                  .val = 0x00, },
+                { .reg = LGDT3305_AGC_DELAY_PT_2,       .val = 0x30, },
-                { .reg = LGDT3305_CR_CTR_FREQ_2,
+                { .reg = LGDT3305_RFAGC_LOOP_FLTR_BW_1, .val = 0x80, },
-                  .val = 0x00, },
+                { .reg = LGDT3305_RFAGC_LOOP_FLTR_BW_2, .val = 0x00, },
-                { .reg = LGDT3305_CR_CTR_FREQ_3,
+                { .reg = LGDT3305_IFBW_1,               .val = 0x80, },
-                  .val = 0x00, },
+                { .reg = LGDT3305_IFBW_2,               .val = 0x00, },
-                { .reg = LGDT3305_CR_CTR_FREQ_4,
+                { .reg = LGDT3305_AGC_CTRL_1,           .val = 0x30, },
-                  .val = 0x00, },
+                { .reg = LGDT3305_AGC_CTRL_4,           .val = 0x61, },
-                { .reg = LGDT3305_CR_CTRL_7,
+                { .reg = LGDT3305_FEC_BLOCK_CTRL,       .val = 0xff, },
-                  .val = 0x79, },
+                { .reg = LGDT3305_TP_CTRL_1,            .val = 0x1b, },
-                { .reg = LGDT3305_AGC_POWER_REF_1,
-                  .val = 0x32, },
-                { .reg = LGDT3305_AGC_POWER_REF_2,
-                  .val = 0xc4, },
-                { .reg = LGDT3305_AGC_DELAY_PT_1,
-                  .val = 0x0d, },
-                { .reg = LGDT3305_AGC_DELAY_PT_2,
-                  .val = 0x30, },
-                { .reg = LGDT3305_RFAGC_LOOP_FLTR_BW_1,
-                  .val = 0x80, },
-                { .reg = LGDT3305_RFAGC_LOOP_FLTR_BW_2,
-                  .val = 0x00, },
-                { .reg = LGDT3305_IFBW_1,
-                  .val = 0x80, },
-                { .reg = LGDT3305_IFBW_2,
-                  .val = 0x00, },
-                { .reg = LGDT3305_AGC_CTRL_1,
-                  .val = 0x30, },
-                { .reg = LGDT3305_AGC_CTRL_4,
-                  .val = 0x61, },
-                { .reg = LGDT3305_FEC_BLOCK_CTRL,
-                  .val = 0xff, },
-                { .reg = LGDT3305_TP_CTRL_1,
-                  .val = 0x1b, },
        };
        lg_dbg("\n");
-        ret = lgdt3305_write_regs(state, lgdt3305_init_data,
+        switch (state->cfg->demod_chip) {
-                                  ARRAY_SIZE(lgdt3305_init_data));
+        case LGDT3304:
+                ret = lgdt3305_write_regs(state, lgdt3304_init_data,
+                                          ARRAY_SIZE(lgdt3304_init_data));
+                break;
+        case LGDT3305:
+                ret = lgdt3305_write_regs(state, lgdt3305_init_data,
+                                          ARRAY_SIZE(lgdt3305_init_data));
+                break;
+        default:
+                ret = -EINVAL;
+        }
        if (lg_fail(ret))
                goto fail;
@@ -640,6 +677,76 @@ fail:
        return ret;
 }
+static int lgdt3304_set_parameters(struct dvb_frontend *fe,
+                                   struct dvb_frontend_parameters *param)
+{
+        struct lgdt3305_state *state = fe->demodulator_priv;
+        int ret;
+        lg_dbg("(%d, %d)\n", param->frequency, param->u.vsb.modulation);
+        if (fe->ops.tuner_ops.set_params) {
+                ret = fe->ops.tuner_ops.set_params(fe, param);
+                if (fe->ops.i2c_gate_ctrl)
+                        fe->ops.i2c_gate_ctrl(fe, 0);
+                if (lg_fail(ret))
+                        goto fail;
+                state->current_frequency = param->frequency;
+        }
+        ret = lgdt3305_set_modulation(state, param);
+        if (lg_fail(ret))
+                goto fail;
+        ret = lgdt3305_passband_digital_agc(state, param);
+        if (lg_fail(ret))
+                goto fail;
+        ret = lgdt3305_agc_setup(state, param);
+        if (lg_fail(ret))
+                goto fail;
+        /* reg 0x030d is 3304-only... seen in vsb and qam usbsnoops... */
+        switch (param->u.vsb.modulation) {
+        case VSB_8:
+                lgdt3305_write_reg(state, 0x030d, 0x00);
+                lgdt3305_write_reg(state, LGDT3305_CR_CTR_FREQ_1, 0x4f);
+                lgdt3305_write_reg(state, LGDT3305_CR_CTR_FREQ_2, 0x0c);
+                lgdt3305_write_reg(state, LGDT3305_CR_CTR_FREQ_3, 0xac);
+                lgdt3305_write_reg(state, LGDT3305_CR_CTR_FREQ_4, 0xba);
+                break;
+        case QAM_64:
+        case QAM_256:
+                lgdt3305_write_reg(state, 0x030d, 0x14);
+                ret = lgdt3305_set_if(state, param);
+                if (lg_fail(ret))
+                        goto fail;
+                break;
+        default:
+                return -EINVAL;
+        }
+        ret = lgdt3305_spectral_inversion(state, param,
+                                          state->cfg->spectral_inversion
+                                          ? 1 : 0);
+        if (lg_fail(ret))
+                goto fail;
+        state->current_modulation = param->u.vsb.modulation;
+        ret = lgdt3305_mpeg_mode(state, state->cfg->mpeg_mode);
+        if (lg_fail(ret))
+                goto fail;
+        /* lgdt3305_mpeg_mode_polarity calls lgdt3305_soft_reset */
+        ret = lgdt3305_mpeg_mode_polarity(state,
+                                          state->cfg->tpclk_edge,
+                                          state->cfg->tpvalid_polarity);
+fail:
+        return ret;
+}
 static int lgdt3305_set_parameters(struct dvb_frontend *fe,
                                   struct dvb_frontend_parameters *param)
 {
@@ -848,6 +955,10 @@ static int lgdt3305_read_status(struct dvb_frontend *fe, fe_status_t *status)
        switch (state->current_modulation) {
        case QAM_256:
        case QAM_64:
+                /* signal bit is unreliable on the DT3304 in QAM mode */
+                if (((LGDT3304 == state->cfg->demod_chip)) && (cr_lock))
+                        *status |= FE_HAS_SIGNAL;
                ret = lgdt3305_read_fec_lock_status(state, &fec_lock);
                if (lg_fail(ret))
                        goto fail;
@@ -993,6 +1104,7 @@ static void lgdt3305_release(struct dvb_frontend *fe)
        kfree(state);
 }
+static struct dvb_frontend_ops lgdt3304_ops;
 static struct dvb_frontend_ops lgdt3305_ops;
 struct dvb_frontend *lgdt3305_attach(const struct lgdt3305_config *config,
@@ -1013,11 +1125,21 @@ struct dvb_frontend *lgdt3305_attach(const struct lgdt3305_config *config,
        state->cfg = config;
        state->i2c_adap = i2c_adap;
-        memcpy(&state->frontend.ops, &lgdt3305_ops,
+        switch (config->demod_chip) {
-               sizeof(struct dvb_frontend_ops));
+        case LGDT3304:
+                memcpy(&state->frontend.ops, &lgdt3304_ops,
+                       sizeof(struct dvb_frontend_ops));
+                break;
+        case LGDT3305:
+                memcpy(&state->frontend.ops, &lgdt3305_ops,
+                       sizeof(struct dvb_frontend_ops));
+                break;
+        default:
+                goto fail;
+        }
        state->frontend.demodulator_priv = state;
-        /* verify that we're talking to a lg dt3305 */
+        /* verify that we're talking to a lg dt3304/5 */
        ret = lgdt3305_read_reg(state, LGDT3305_GEN_CTRL_2, &val);
        if ((lg_fail(ret)) | (val == 0))
                goto fail;
@@ -1036,12 +1158,35 @@ struct dvb_frontend *lgdt3305_attach(const struct lgdt3305_config *config,
        return &state->frontend;
 fail:
-        lg_warn("unable to detect LGDT3305 hardware\n");
+        lg_warn("unable to detect %s hardware\n",
+                config->demod_chip ? "LGDT3304" : "LGDT3305");
        kfree(state);
        return NULL;
 }
 EXPORT_SYMBOL(lgdt3305_attach);
+static struct dvb_frontend_ops lgdt3304_ops = {
+        .info = {
+                .name = "LG Electronics LGDT3304 VSB/QAM Frontend",
+                .type               = FE_ATSC,
+                .frequency_min      = 54000000,
+                .frequency_max      = 858000000,
+                .frequency_stepsize = 62500,
+                .caps = FE_CAN_QAM_64 | FE_CAN_QAM_256 | FE_CAN_8VSB
+        },
+        .i2c_gate_ctrl        = lgdt3305_i2c_gate_ctrl,
+        .init                 = lgdt3305_init,
+        .set_frontend         = lgdt3304_set_parameters,
+        .get_frontend         = lgdt3305_get_frontend,
+        .get_tune_settings    = lgdt3305_get_tune_settings,
+        .read_status          = lgdt3305_read_status,
+        .read_ber             = lgdt3305_read_ber,
+        .read_signal_strength = lgdt3305_read_signal_strength,
+        .read_snr             = lgdt3305_read_snr,
+        .read_ucblocks        = lgdt3305_read_ucblocks,
+        .release              = lgdt3305_release,
+};
 static struct dvb_frontend_ops lgdt3305_ops = {
        .info = {
                .name = "LG Electronics LGDT3305 VSB/QAM Frontend",
@@ -1065,10 +1210,10 @@ static struct dvb_frontend_ops lgdt3305_ops = {
        .release              = lgdt3305_release,
 };
-MODULE_DESCRIPTION("LG Electronics LGDT3305 ATSC/QAM-B Demodulator Driver");
+MODULE_DESCRIPTION("LG Electronics LGDT3304/5 ATSC/QAM-B Demodulator Driver");
 MODULE_AUTHOR("Michael Krufky <mkrufky@linuxtv.org>");
 MODULE_LICENSE("GPL");
-MODULE_VERSION("0.1");
+MODULE_VERSION("0.2");
 /*
 * Local variables:
diff --git a/drivers/media/dvb/frontends/lgdt3305.h b/drivers/media/dvb/frontends/lgdt3305.h
index 9cb11c9cae53..02172eca4d47 100644
--- a/drivers/media/dvb/frontends/lgdt3305.h
+++ b/drivers/media/dvb/frontends/lgdt3305.h
@@ -1,7 +1,7 @@
 /*
- *    Support for LGDT3305 - VSB/QAM
+ *    Support for LG Electronics LGDT3304 and LGDT3305 - VSB/QAM
 *
- *    Copyright (C) 2008, 2009 Michael Krufky <mkrufky@linuxtv.org>
+ *    Copyright (C) 2008, 2009, 2010 Michael Krufky <mkrufky@linuxtv.org>
 *
 *    This program is free software; you can redistribute it and/or modify
 *    it under the terms of the GNU General Public License as published by
@@ -41,6 +41,11 @@ enum lgdt3305_tp_valid_polarity {
        LGDT3305_TP_VALID_HIGH = 1,
 };
+enum lgdt_demod_chip_type {
+        LGDT3305 = 0,
+        LGDT3304 = 1,
+};
 struct lgdt3305_config {
        u8 i2c_addr;
@@ -65,6 +70,7 @@ struct lgdt3305_config {
        enum lgdt3305_mpeg_mode mpeg_mode;
        enum lgdt3305_tp_clock_edge tpclk_edge;
        enum lgdt3305_tp_valid_polarity tpvalid_polarity;
+        enum lgdt_demod_chip_type demod_chip;
 };
 #if defined(CONFIG_DVB_LGDT3305) || (defined(CONFIG_DVB_LGDT3305_MODULE) && \
diff --git a/drivers/media/dvb/frontends/lgs8gxx.c b/drivers/media/dvb/frontends/lgs8gxx.c
index dee53960e7e8..5ea28ae2ba8f 100644
--- a/drivers/media/dvb/frontends/lgs8gxx.c
+++ b/drivers/media/dvb/frontends/lgs8gxx.c
@@ -24,6 +24,7 @@
 */
 #include <asm/div64.h>
+#include <linux/firmware.h>
 #include "dvb_frontend.h"
@@ -46,42 +47,6 @@ module_param(fake_signal_str, int, 0644);
 MODULE_PARM_DESC(fake_signal_str, "fake signal strength for LGS8913."
 "Signal strength calculation is slow.(default:on).");
-static const u8 lgs8g75_initdat[] = {
-        0x01, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-        0x00, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-        0xE4, 0xF5, 0xA8, 0xF5, 0xB8, 0xF5, 0x88, 0xF5,
-        0x89, 0xF5, 0x87, 0x75, 0xD0, 0x00, 0x11, 0x50,
-        0x11, 0x50, 0xF4, 0xF5, 0x80, 0xF5, 0x90, 0xF5,
-        0xA0, 0xF5, 0xB0, 0x75, 0x81, 0x30, 0x80, 0x01,
-        0x32, 0x90, 0x80, 0x12, 0x74, 0xFF, 0xF0, 0x90,
-        0x80, 0x13, 0x74, 0x1F, 0xF0, 0x90, 0x80, 0x23,
-        0x74, 0x01, 0xF0, 0x90, 0x80, 0x22, 0xF0, 0x90,
-        0x00, 0x48, 0x74, 0x00, 0xF0, 0x90, 0x80, 0x4D,
-        0x74, 0x05, 0xF0, 0x90, 0x80, 0x09, 0xE0, 0x60,
-        0x21, 0x12, 0x00, 0xDD, 0x14, 0x60, 0x1B, 0x12,
-        0x00, 0xDD, 0x14, 0x60, 0x15, 0x12, 0x00, 0xDD,
-        0x14, 0x60, 0x0F, 0x12, 0x00, 0xDD, 0x14, 0x60,
-        0x09, 0x12, 0x00, 0xDD, 0x14, 0x60, 0x03, 0x12,
-        0x00, 0xDD, 0x90, 0x80, 0x42, 0xE0, 0x60, 0x0B,
-        0x14, 0x60, 0x0C, 0x14, 0x60, 0x0D, 0x14, 0x60,
-        0x0E, 0x01, 0xB3, 0x74, 0x04, 0x01, 0xB9, 0x74,
-        0x05, 0x01, 0xB9, 0x74, 0x07, 0x01, 0xB9, 0x74,
-        0x0A, 0xC0, 0xE0, 0x74, 0xC8, 0x12, 0x00, 0xE2,
-        0xD0, 0xE0, 0x14, 0x70, 0xF4, 0x90, 0x80, 0x09,
-        0xE0, 0x70, 0xAE, 0x12, 0x00, 0xF6, 0x12, 0x00,
-        0xFE, 0x90, 0x00, 0x48, 0xE0, 0x04, 0xF0, 0x90,
-        0x80, 0x4E, 0xF0, 0x01, 0x73, 0x90, 0x80, 0x08,
-        0xF0, 0x22, 0xF8, 0x7A, 0x0C, 0x79, 0xFD, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD9,
-        0xF6, 0xDA, 0xF2, 0xD8, 0xEE, 0x22, 0x90, 0x80,
-        0x65, 0xE0, 0x54, 0xFD, 0xF0, 0x22, 0x90, 0x80,
-        0x65, 0xE0, 0x44, 0xC2, 0xF0, 0x22
-};
 /* LGS8GXX internal helper functions */
 static int lgs8gxx_write_reg(struct lgs8gxx_state *priv, u8 reg, u8 data)
@@ -627,9 +592,14 @@ static int lgs8913_init(struct lgs8gxx_state *priv)
 static int lgs8g75_init_data(struct lgs8gxx_state *priv)
 {
-        const u8 *p = lgs8g75_initdat;
+        const struct firmware *fw;
+        int rc;
        int i;
+        rc = request_firmware(&fw, "lgs8g75.fw", &priv->i2c->dev);
+        if (rc)
+                return rc;
        lgs8gxx_write_reg(priv, 0xC6, 0x40);
        lgs8gxx_write_reg(priv, 0x3D, 0x04);
@@ -640,16 +610,16 @@ static int lgs8g75_init_data(struct lgs8gxx_state *priv)
        lgs8gxx_write_reg(priv, 0x3B, 0x00);
        lgs8gxx_write_reg(priv, 0x38, 0x00);
-        for (i = 0; i < sizeof(lgs8g75_initdat); i++) {
+        for (i = 0; i < fw->size; i++) {
                lgs8gxx_write_reg(priv, 0x38, 0x00);
                lgs8gxx_write_reg(priv, 0x3A, (u8)(i&0xff));
                lgs8gxx_write_reg(priv, 0x3B, (u8)(i>>8));
-                lgs8gxx_write_reg(priv, 0x3C, *p);
+                lgs8gxx_write_reg(priv, 0x3C, fw->data[i]);
-                p++;
        }
        lgs8gxx_write_reg(priv, 0x38, 0x00);
+        release_firmware(fw);
        return 0;
 }
diff --git a/drivers/media/dvb/frontends/mb86a16.c b/drivers/media/dvb/frontends/mb86a16.c
index 599d1aa519a3..33b63235b86e 100644
--- a/drivers/media/dvb/frontends/mb86a16.c
+++ b/drivers/media/dvb/frontends/mb86a16.c
@@ -1833,7 +1833,6 @@ static struct dvb_frontend_ops mb86a16_ops = {
        .get_frontend_algo              = mb86a16_frontend_algo,
        .search                         = mb86a16_search,
-        .read_status                    = mb86a16_read_status,
        .init                           = mb86a16_init,
        .sleep                          = mb86a16_sleep,
        .read_status                    = mb86a16_read_status,
diff --git a/drivers/media/dvb/frontends/tda10048.c b/drivers/media/dvb/frontends/tda10048.c
index 4e2a7c8b2f62..93f6a75c238e 100644
--- a/drivers/media/dvb/frontends/tda10048.c
+++ b/drivers/media/dvb/frontends/tda10048.c
@@ -25,6 +25,7 @@
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
+#include <linux/math64.h>
 #include <asm/div64.h>
 #include "dvb_frontend.h"
 #include "dvb_math.h"
@@ -49,8 +50,8 @@
 #define TDA10048_CONF_C4_1         0x1E
 #define TDA10048_CONF_C4_2         0x1F
 #define TDA10048_CODE_IN_RAM       0x20
-#define TDA10048_CHANNEL_INFO_1_R  0x22
+#define TDA10048_CHANNEL_INFO1_R   0x22
-#define TDA10048_CHANNEL_INFO_2_R  0x23
+#define TDA10048_CHANNEL_INFO2_R   0x23
 #define TDA10048_CHANNEL_INFO1     0x24
 #define TDA10048_CHANNEL_INFO2     0x25
 #define TDA10048_TIME_ERROR_R      0x26
@@ -63,8 +64,8 @@
 #define TDA10048_IT_STAT           0x32
 #define TDA10048_DSP_AD_LSB        0x3C
 #define TDA10048_DSP_AD_MSB        0x3D
-#define TDA10048_DSP_REF_LSB       0x3E
+#define TDA10048_DSP_REG_LSB       0x3E
-#define TDA10048_DSP_REF_MSB       0x3F
+#define TDA10048_DSP_REG_MSB       0x3F
 #define TDA10048_CONF_TRISTATE1    0x44
 #define TDA10048_CONF_TRISTATE2    0x45
 #define TDA10048_CONF_POLARITY     0x46
@@ -112,7 +113,7 @@
 #define TDA10048_FREE_REG_1        0xB2
 #define TDA10048_FREE_REG_2        0xB3
 #define TDA10048_CONF_C3_1         0xC0
-#define TDA10048_CYBER_CTRL        0xC2
+#define TDA10048_CVBER_CTRL        0xC2
 #define TDA10048_CBER_NMAX_LSB     0xC4
 #define TDA10048_CBER_NMAX_MSB     0xC5
 #define TDA10048_CBER_LSB          0xC6
@@ -120,7 +121,7 @@
 #define TDA10048_VBER_LSB          0xC8
 #define TDA10048_VBER_MID          0xC9
 #define TDA10048_VBER_MSB          0xCA
-#define TDA10048_CYBER_LUT         0xCC
+#define TDA10048_CVBER_LUT         0xCC
 #define TDA10048_UNCOR_CTRL        0xCD
 #define TDA10048_UNCOR_CPT_LSB     0xCE
 #define TDA10048_UNCOR_CPT_MSB     0xCF
@@ -183,7 +184,7 @@ static struct init_tab {
        { TDA10048_AGC_IF_MAX, 0xff },
        { TDA10048_AGC_THRESHOLD_MSB, 0x00 },
        { TDA10048_AGC_THRESHOLD_LSB, 0x70 },
-        { TDA10048_CYBER_CTRL, 0x38 },
+        { TDA10048_CVBER_CTRL, 0x38 },
        { TDA10048_AGC_GAINS, 0x12 },
        { TDA10048_CONF_XO, 0x00 },
        { TDA10048_CONF_TS1, 0x07 },
@@ -688,7 +689,7 @@ static int tda10048_get_tps(struct tda10048_state *state,
                p->guard_interval =  GUARD_INTERVAL_1_4;
                break;
        }
-        switch (val & 0x02) {
+        switch (val & 0x03) {
        case 0:
                p->transmission_mode = TRANSMISSION_MODE_2K;
                break;
@@ -765,6 +766,8 @@ static int tda10048_set_frontend(struct dvb_frontend *fe,
        /* Enable demod TPS auto detection and begin acquisition */
        tda10048_writereg(state, TDA10048_AUTO, 0x57);
+        /* trigger cber and vber acquisition */
+        tda10048_writereg(state, TDA10048_CVBER_CTRL, 0x3B);
        return 0;
 }
@@ -830,12 +833,27 @@ static int tda10048_read_status(struct dvb_frontend *fe, fe_status_t *status)
 static int tda10048_read_ber(struct dvb_frontend *fe, u32 *ber)
 {
        struct tda10048_state *state = fe->demodulator_priv;
+        static u32 cber_current;
+        u32 cber_nmax;
+        u64 cber_tmp;
        dprintk(1, "%s()\n", __func__);
-        /* TODO: A reset may be required here */
+        /* update cber on interrupt */
-        *ber = tda10048_readreg(state, TDA10048_CBER_MSB) << 8 |
+        if (tda10048_readreg(state, TDA10048_SOFT_IT_C3) & 0x01) {
-                tda10048_readreg(state, TDA10048_CBER_LSB);
+                cber_tmp = tda10048_readreg(state, TDA10048_CBER_MSB) << 8 |
+                        tda10048_readreg(state, TDA10048_CBER_LSB);
+                cber_nmax = tda10048_readreg(state, TDA10048_CBER_NMAX_MSB) << 8 |
+                        tda10048_readreg(state, TDA10048_CBER_NMAX_LSB);
+                cber_tmp *= 100000000;
+                cber_tmp *= 2;
+                cber_tmp = div_u64(cber_tmp, (cber_nmax * 32) + 1);
+                cber_current = (u32)cber_tmp;
+                /* retrigger cber acquisition */
+                tda10048_writereg(state, TDA10048_CVBER_CTRL, 0x39);
+        }
+        /* actual cber is (*ber)/1e8 */
+        *ber = cber_current;
        return 0;
 }
@@ -1015,6 +1033,9 @@ static int tda10048_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
        *ucblocks = tda10048_readreg(state, TDA10048_UNCOR_CPT_MSB) << 8 |
                tda10048_readreg(state, TDA10048_UNCOR_CPT_LSB);
+        /* clear the uncorrected TS packets counter when saturated */
+        if (*ucblocks == 0xFFFF)
+                tda10048_writereg(state, TDA10048_UNCOR_CTRL, 0x80);
        return 0;
 }
diff --git a/drivers/media/dvb/mantis/Kconfig b/drivers/media/dvb/mantis/Kconfig
index f7b72a32adf3..decdeda840d0 100644
--- a/drivers/media/dvb/mantis/Kconfig
+++ b/drivers/media/dvb/mantis/Kconfig
@@ -10,9 +10,15 @@ config MANTIS_CORE
 config DVB_MANTIS
        tristate "MANTIS based cards"
        depends on MANTIS_CORE && DVB_CORE && PCI && I2C
-        select DVB_MB86A16
+        select DVB_MB86A16 if !DVB_FE_CUSTOMISE
-        select DVB_ZL10353
+        select DVB_ZL10353 if !DVB_FE_CUSTOMISE
-        select DVB_STV0299
+        select DVB_STV0299 if !DVB_FE_CUSTOMISE
+        select DVB_LNBP21 if !DVB_FE_CUSTOMISE
+        select DVB_STB0899 if !DVB_FE_CUSTOMISE
+        select DVB_STB6100 if !DVB_FE_CUSTOMISE
+        select DVB_TDA665x if !DVB_FE_CUSTOMISE
+        select DVB_TDA10021 if !DVB_FE_CUSTOMISE
+        select DVB_TDA10023 if !DVB_FE_CUSTOMISE
        select DVB_PLL
        help
          Support for PCI cards based on the Mantis PCI bridge.
@@ -23,7 +29,7 @@ config DVB_MANTIS
 config DVB_HOPPER
        tristate "HOPPER based cards"
        depends on MANTIS_CORE && DVB_CORE && PCI && I2C
-        select DVB_ZL10353
+        select DVB_ZL10353 if !DVB_FE_CUSTOMISE
        select DVB_PLL
        help
          Support for PCI cards based on the Hopper  PCI bridge.
diff --git a/drivers/media/dvb/mantis/mantis_input.c b/drivers/media/dvb/mantis/mantis_input.c
index 3d4e4663220c..a99489b8418b 100644
--- a/drivers/media/dvb/mantis/mantis_input.c
+++ b/drivers/media/dvb/mantis/mantis_input.c
@@ -19,7 +19,7 @@
 */
 #include <linux/input.h>
-#include <media/ir-common.h>
+#include <media/ir-core.h>
 #include <linux/pci.h>
 #include "dmxdev.h"
@@ -104,7 +104,6 @@ EXPORT_SYMBOL_GPL(ir_mantis);
 int mantis_input_init(struct mantis_pci *mantis)
 {
        struct input_dev *rc;
-        struct ir_input_state rc_state;
        char name[80], dev[80];
        int err;
@@ -120,8 +119,6 @@ int mantis_input_init(struct mantis_pci *mantis)
        rc->name = name;
        rc->phys = dev;
-        ir_input_init(rc, &rc_state, IR_TYPE_OTHER);
        rc->id.bustype  = BUS_PCI;
        rc->id.vendor   = mantis->vendor_id;
        rc->id.product  = mantis->device_id;
diff --git a/drivers/media/dvb/siano/sms-cards.c b/drivers/media/dvb/siano/sms-cards.c
index cff77e2eb557..25b43e587fa6 100644
--- a/drivers/media/dvb/siano/sms-cards.c
+++ b/drivers/media/dvb/siano/sms-cards.c
@@ -64,9 +64,11 @@ static struct sms_board sms_boards[] = {
                .type   = SMS_NOVA_B0,
                .fw[DEVICE_MODE_ISDBT_BDA] = "sms1xxx-hcw-55xxx-isdbt-02.fw",
                .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-02.fw",
+                .rc_codes = RC_MAP_RC5_HAUPPAUGE_NEW,
                .board_cfg.leds_power = 26,
                .board_cfg.led0 = 27,
                .board_cfg.led1 = 28,
+                .board_cfg.ir = 9,
                .led_power = 26,
                .led_lo    = 27,
                .led_hi    = 28,
diff --git a/drivers/media/dvb/siano/sms-cards.h b/drivers/media/dvb/siano/sms-cards.h
index 8f19fc000b46..d8cdf756f7cf 100644
--- a/drivers/media/dvb/siano/sms-cards.h
+++ b/drivers/media/dvb/siano/sms-cards.h
@@ -75,7 +75,7 @@ struct sms_board {
        enum sms_device_type_st type;
        char *name, *fw[DEVICE_MODE_MAX];
        struct sms_board_gpio_cfg board_cfg;
-        enum ir_kb_type ir_kb_type;
+        char *rc_codes;                         /* Name of IR codes table */
        /* gpios */
        int led_power, led_hi, led_lo, lna_ctrl, rf_switch;
diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c
index 0c87a3c3899a..7f2c94a15ab1 100644
--- a/drivers/media/dvb/siano/smscoreapi.c
+++ b/drivers/media/dvb/siano/smscoreapi.c
@@ -116,9 +116,7 @@ static struct smscore_registry_entry_t *smscore_find_registry(char *devpath)
                        return entry;
                }
        }
-        entry = (struct smscore_registry_entry_t *)
+        entry = kmalloc(sizeof(struct smscore_registry_entry_t), GFP_KERNEL);
-                        kmalloc(sizeof(struct smscore_registry_entry_t),
-                                GFP_KERNEL);
        if (entry) {
                entry->mode = default_mode;
                strcpy(entry->devpath, devpath);
@@ -1297,7 +1295,7 @@ int smsclient_sendrequest(struct smscore_client_t *client,
 EXPORT_SYMBOL_GPL(smsclient_sendrequest);
-/* old GPIO managments implementation */
+/* old GPIO managements implementation */
 int smscore_configure_gpio(struct smscore_device_t *coredev, u32 pin,
                           struct smscore_config_gpio *pinconfig)
 {
diff --git a/drivers/media/dvb/siano/smsir.c b/drivers/media/dvb/siano/smsir.c
index a56eac76e0f0..d0e4639ee9db 100644
--- a/drivers/media/dvb/siano/smsir.c
+++ b/drivers/media/dvb/siano/smsir.c
@@ -4,6 +4,11 @@
 MDTV receiver kernel modules.
 Copyright (C) 2006-2009, Uri Shkolnik
+ Copyright (c) 2010 - Mauro Carvalho Chehab
+        - Ported the driver to use rc-core
+        - IR raw event decoding is now done at rc-core
+        - Code almost re-written
 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
@@ -27,226 +32,28 @@
 #include "smsir.h"
 #include "sms-cards.h"
-/* In order to add new IR remote control -
+#define MODULE_NAME "smsmdtv"
- * 1) Add it to the <enum ir_kb_type> @ smsir,h,
- * 2) Add its map to keyboard_layout_maps below
- * 3) Set your board (sms-cards sub-module) to use it
- */
-static struct keyboard_layout_map_t keyboard_layout_maps[] = {
-                [SMS_IR_KB_DEFAULT_TV] = {
-                        .ir_protocol = IR_RC5,
-                        .rc5_kbd_address = KEYBOARD_ADDRESS_TV1,
-                        .keyboard_layout_map = {
-                                        KEY_0, KEY_1, KEY_2,
-                                        KEY_3, KEY_4, KEY_5,
-                                        KEY_6, KEY_7, KEY_8,
-                                        KEY_9, 0, 0, KEY_POWER,
-                                        KEY_MUTE, 0, 0,
-                                        KEY_VOLUMEUP, KEY_VOLUMEDOWN,
-                                        KEY_BRIGHTNESSUP,
-                                        KEY_BRIGHTNESSDOWN, KEY_CHANNELUP,
-                                        KEY_CHANNELDOWN,
-                                        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, 0, 0, 0, 0, 0, 0
-                        }
-                },
-                [SMS_IR_KB_HCW_SILVER] = {
-                        .ir_protocol = IR_RC5,
-                        .rc5_kbd_address = KEYBOARD_ADDRESS_LIGHTING1,
-                        .keyboard_layout_map = {
-                                        KEY_0, KEY_1, KEY_2,
-                                        KEY_3, KEY_4, KEY_5,
-                                        KEY_6, KEY_7, KEY_8,
-                                        KEY_9, KEY_TEXT, KEY_RED,
-                                        KEY_RADIO, KEY_MENU,
-                                        KEY_SUBTITLE,
-                                        KEY_MUTE, KEY_VOLUMEUP,
-                                        KEY_VOLUMEDOWN, KEY_PREVIOUS, 0,
-                                        KEY_UP, KEY_DOWN, KEY_LEFT,
-                                        KEY_RIGHT, KEY_VIDEO, KEY_AUDIO,
-                                        KEY_MHP, KEY_EPG, KEY_TV,
-                                        0, KEY_NEXTSONG, KEY_EXIT,
-                                        KEY_CHANNELUP,  KEY_CHANNELDOWN,
-                                        KEY_CHANNEL, 0,
-                                        KEY_PREVIOUSSONG, KEY_ENTER,
-                                        KEY_SLEEP, 0, 0, KEY_BLUE,
-                                        0, 0, 0, 0, KEY_GREEN, 0,
-                                        KEY_PAUSE, 0, KEY_REWIND,
-                                        0, KEY_FASTFORWARD, KEY_PLAY,
-                                        KEY_STOP, KEY_RECORD,
-                                        KEY_YELLOW, 0, 0, KEY_SELECT,
-                                        KEY_ZOOM, KEY_POWER, 0, 0
-                        }
-                },
-                { } /* Terminating entry */
-};
-static u32 ir_pos;
-static u32 ir_word;
-static u32 ir_toggle;
-#define RC5_PUSH_BIT(dst, bit, pos)     \
-        { dst <<= 1; dst |= bit; pos++; }
-static void sms_ir_rc5_event(struct smscore_device_t *coredev,
-                                u32 toggle, u32 addr, u32 cmd)
-{
-        bool toggle_changed;
-        u16 keycode;
-        sms_log("IR RC5 word: address %d, command %d, toggle %d",
-                                addr, cmd, toggle);
-        toggle_changed = ir_toggle != toggle;
-        /* keep toggle */
-        ir_toggle = toggle;
-        if (addr !=
-                keyboard_layout_maps[coredev->ir.ir_kb_type].rc5_kbd_address)
-                return; /* Check for valid address */
-        keycode =
-                keyboard_layout_maps
-                [coredev->ir.ir_kb_type].keyboard_layout_map[cmd];
-        if (!toggle_changed &&
+void sms_ir_event(struct smscore_device_t *coredev, const char *buf, int len)
-                        (keycode != KEY_VOLUMEUP && keycode != KEY_VOLUMEDOWN))
-                return; /* accept only repeated volume, reject other keys */
-        sms_log("kernel input keycode (from ir) %d", keycode);
-        input_report_key(coredev->ir.input_dev, keycode, 1);
-        input_sync(coredev->ir.input_dev);
-}
-/* decode raw bit pattern to RC5 code */
-/* taken from ir-functions.c */
-static u32 ir_rc5_decode(unsigned int code)
 {
-/*      unsigned int org_code = code;*/
-        unsigned int pair;
-        unsigned int rc5 = 0;
        int i;
+        const s32 *samples = (const void *)buf;
-        for (i = 0; i < 14; ++i) {
+        for (i = 0; i < len >> 2; i++) {
-                pair = code & 0x3;
+                struct ir_raw_event ev;
-                code >>= 2;
-                rc5 <<= 1;
-                switch (pair) {
-                case 0:
-                case 2:
-                        break;
-                case 1:
-                        rc5 |= 1;
-                        break;
-                case 3:
-/*      dprintk(1, "ir-common: ir_rc5_decode(%x) bad code\n", org_code);*/
-                        sms_log("bad code");
-                        return 0;
-                }
-        }
-/*
-        dprintk(1, "ir-common: code=%x, rc5=%x, start=%x,
-                toggle=%x, address=%x, "
-                "instr=%x\n", rc5, org_code, RC5_START(rc5),
-                RC5_TOGGLE(rc5), RC5_ADDR(rc5), RC5_INSTR(rc5));
-*/
-        return rc5;
-}
-static void sms_rc5_parse_word(struct smscore_device_t *coredev)
-{
-        #define RC5_START(x)    (((x)>>12)&3)
-        #define RC5_TOGGLE(x)   (((x)>>11)&1)
-        #define RC5_ADDR(x)     (((x)>>6)&0x1F)
-        #define RC5_INSTR(x)    ((x)&0x3F)
-        int i, j;
-        u32 rc5_word = 0;
-        /* Reverse the IR word direction */
-        for (i = 0 ; i < 28 ; i++)
-                RC5_PUSH_BIT(rc5_word, (ir_word>>i)&1, j)
-        rc5_word = ir_rc5_decode(rc5_word);
-        /* sms_log("temp = 0x%x, rc5_code = 0x%x", ir_word, rc5_word); */
-        sms_ir_rc5_event(coredev,
-                                RC5_TOGGLE(rc5_word),
-                                RC5_ADDR(rc5_word),
-                                RC5_INSTR(rc5_word));
-}
-static void sms_rc5_accumulate_bits(struct smscore_device_t *coredev,
-                s32 ir_sample)
-{
-        #define RC5_TIME_GRANULARITY    200
-        #define RC5_DEF_BIT_TIME                889
-        #define RC5_MAX_SAME_BIT_CONT   4
-        #define RC5_WORD_LEN                    27 /* 28 bit */
-        u32 i, j;
-        s32 delta_time;
-        u32 time = (ir_sample > 0) ? ir_sample : (0-ir_sample);
-        u32 level = (ir_sample < 0) ? 0 : 1;
-        for (i = RC5_MAX_SAME_BIT_CONT; i > 0; i--) {
-                delta_time = time - (i*RC5_DEF_BIT_TIME) + RC5_TIME_GRANULARITY;
-                if (delta_time < 0)
-                        continue; /* not so many consecutive bits */
-                if (delta_time > (2 * RC5_TIME_GRANULARITY)) {
-                        /* timeout */
-                        if (ir_pos == (RC5_WORD_LEN-1))
-                                /* complete last bit */
-                                RC5_PUSH_BIT(ir_word, level, ir_pos)
-                        if (ir_pos == RC5_WORD_LEN)
-                                sms_rc5_parse_word(coredev);
-                        else if (ir_pos) /* timeout within a word */
-                                sms_log("IR error parsing a word");
-                        ir_pos = 0;
+                ev.duration = abs(samples[i]) * 1000; /* Convert to ns */
-                        ir_word = 0;
+                ev.pulse = (samples[i] > 0) ? false : true;
-                        /* sms_log("timeout %d", time); */
-                        break;
-                }
-                /* The time is within the range of this number of bits */
-                for (j = 0 ; j < i ; j++)
-                        RC5_PUSH_BIT(ir_word, level, ir_pos)
-                break;
+                ir_raw_event_store(coredev->ir.input_dev, &ev);
        }
-}
+        ir_raw_event_handle(coredev->ir.input_dev);
-void sms_ir_event(struct smscore_device_t *coredev, const char *buf, int len)
-{
-        #define IR_DATA_RECEIVE_MAX_LEN 520 /* 128*4 + 4 + 4 */
-        u32 i;
-        enum ir_protocol ir_protocol =
-                        keyboard_layout_maps[coredev->ir.ir_kb_type]
-                                             .ir_protocol;
-        s32 *samples;
-        int count = len>>2;
-        samples = (s32 *)buf;
-/*      sms_log("IR buffer received, length = %d", count);*/
-        for (i = 0; i < count; i++)
-                if (ir_protocol == IR_RC5)
-                        sms_rc5_accumulate_bits(coredev, samples[i]);
-        /*  IR_RCMM not implemented */
 }
 int sms_ir_init(struct smscore_device_t *coredev)
 {
        struct input_dev *input_dev;
+        int board_id = smscore_get_board_id(coredev);
        sms_log("Allocating input device");
        input_dev = input_allocate_device();
@@ -256,33 +63,38 @@ int sms_ir_init(struct smscore_device_t *coredev)
        }
        coredev->ir.input_dev = input_dev;
-        coredev->ir.ir_kb_type =
-                sms_get_board(smscore_get_board_id(coredev))->ir_kb_type;
-        coredev->ir.keyboard_layout_map =
-                keyboard_layout_maps[coredev->ir.ir_kb_type].
-                                keyboard_layout_map;
-        sms_log("IR remote keyboard type is %d", coredev->ir.ir_kb_type);
        coredev->ir.controller = 0;     /* Todo: vega/nova SPI number */
        coredev->ir.timeout = IR_DEFAULT_TIMEOUT;
        sms_log("IR port %d, timeout %d ms",
                        coredev->ir.controller, coredev->ir.timeout);
-        snprintf(coredev->ir.name,
+        snprintf(coredev->ir.name, sizeof(coredev->ir.name),
-                                IR_DEV_NAME_MAX_LEN,
+                 "SMS IR (%s)", sms_get_board(board_id)->name);
-                                "SMS IR w/kbd type %d",
-                                coredev->ir.ir_kb_type);
+        strlcpy(coredev->ir.phys, coredev->devpath, sizeof(coredev->ir.phys));
+        strlcat(coredev->ir.phys, "/ir0", sizeof(coredev->ir.phys));
        input_dev->name = coredev->ir.name;
-        input_dev->phys = coredev->ir.name;
+        input_dev->phys = coredev->ir.phys;
        input_dev->dev.parent = coredev->device;
-        /* Key press events only */
+#if 0
-        input_dev->evbit[0] = BIT_MASK(EV_KEY);
+        /* TODO: properly initialize the parameters bellow */
-        input_dev->keybit[BIT_WORD(BTN_0)] = BIT_MASK(BTN_0);
+        input_dev->id.bustype = BUS_USB;
+        input_dev->id.version = 1;
+        input_dev->id.vendor = le16_to_cpu(dev->udev->descriptor.idVendor);
+        input_dev->id.product = le16_to_cpu(dev->udev->descriptor.idProduct);
+#endif
+        coredev->ir.props.priv = coredev;
+        coredev->ir.props.driver_type = RC_DRIVER_IR_RAW;
+        coredev->ir.props.allowed_protos = IR_TYPE_ALL;
        sms_log("Input device (IR) %s is set for key events", input_dev->name);
-        if (input_register_device(input_dev)) {
+        if (ir_input_register(input_dev, sms_get_board(board_id)->rc_codes,
+                              &coredev->ir.props, MODULE_NAME)) {
                sms_err("Failed to register device");
                input_free_device(input_dev);
                return -EACCES;
@@ -294,8 +106,7 @@ int sms_ir_init(struct smscore_device_t *coredev)
 void sms_ir_exit(struct smscore_device_t *coredev)
 {
        if (coredev->ir.input_dev)
-                input_unregister_device(coredev->ir.input_dev);
+                ir_input_unregister(coredev->ir.input_dev);
        sms_log("");
 }
diff --git a/drivers/media/dvb/siano/smsir.h b/drivers/media/dvb/siano/smsir.h
index b7d703e2d338..926e247523bd 100644
--- a/drivers/media/dvb/siano/smsir.h
+++ b/drivers/media/dvb/siano/smsir.h
@@ -4,6 +4,11 @@ Siano Mobile Silicon, Inc.
 MDTV receiver kernel modules.
 Copyright (C) 2006-2009, Uri Shkolnik
+ Copyright (c) 2010 - Mauro Carvalho Chehab
+        - Ported the driver to use rc-core
+        - IR raw event decoding is now done at rc-core
+        - Code almost re-written
 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
@@ -23,63 +28,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define __SMS_IR_H__
 #include <linux/input.h>
+#include <media/ir-core.h>
-#define IR_DEV_NAME_MAX_LEN             23 /* "SMS IR kbd type nn\0" */
-#define IR_KEYBOARD_LAYOUT_SIZE 64
 #define IR_DEFAULT_TIMEOUT              100
-enum ir_kb_type {
-        SMS_IR_KB_DEFAULT_TV,
-        SMS_IR_KB_HCW_SILVER
-};
-enum rc5_keyboard_address {
-        KEYBOARD_ADDRESS_TV1 = 0,
-        KEYBOARD_ADDRESS_TV2 = 1,
-        KEYBOARD_ADDRESS_TELETEXT = 2,
-        KEYBOARD_ADDRESS_VIDEO = 3,
-        KEYBOARD_ADDRESS_LV1 = 4,
-        KEYBOARD_ADDRESS_VCR1 = 5,
-        KEYBOARD_ADDRESS_VCR2 = 6,
-        KEYBOARD_ADDRESS_EXPERIMENTAL = 7,
-        KEYBOARD_ADDRESS_SAT1 = 8,
-        KEYBOARD_ADDRESS_CAMERA = 9,
-        KEYBOARD_ADDRESS_SAT2 = 10,
-        KEYBOARD_ADDRESS_CDV = 12,
-        KEYBOARD_ADDRESS_CAMCORDER = 13,
-        KEYBOARD_ADDRESS_PRE_AMP = 16,
-        KEYBOARD_ADDRESS_TUNER = 17,
-        KEYBOARD_ADDRESS_RECORDER1 = 18,
-        KEYBOARD_ADDRESS_PRE_AMP1 = 19,
-        KEYBOARD_ADDRESS_CD_PLAYER = 20,
-        KEYBOARD_ADDRESS_PHONO = 21,
-        KEYBOARD_ADDRESS_SATA = 22,
-        KEYBOARD_ADDRESS_RECORDER2 = 23,
-        KEYBOARD_ADDRESS_CDR = 26,
-        KEYBOARD_ADDRESS_LIGHTING = 29,
-        KEYBOARD_ADDRESS_LIGHTING1 = 30, /* KEYBOARD_ADDRESS_HCW_SILVER */
-        KEYBOARD_ADDRESS_PHONE = 31,
-        KEYBOARD_ADDRESS_NOT_RC5 = 0xFFFF
-};
-enum ir_protocol {
-        IR_RC5,
-        IR_RCMM
-};
-struct keyboard_layout_map_t {
-        enum ir_protocol ir_protocol;
-        enum rc5_keyboard_address rc5_kbd_address;
-        u16 keyboard_layout_map[IR_KEYBOARD_LAYOUT_SIZE];
-};
 struct smscore_device_t;
 struct ir_t {
        struct input_dev *input_dev;
-        enum ir_kb_type ir_kb_type;
+        char name[40];
-        char name[IR_DEV_NAME_MAX_LEN+1];
+        char phys[32];
-        u16 *keyboard_layout_map;
+        char *rc_codes;
+        u64 protocol;
+        struct ir_dev_props props;
        u32 timeout;
        u32 controller;
 };
diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c
index a9c27fb69ba7..50d4338610e0 100644
--- a/drivers/media/dvb/siano/smsusb.c
+++ b/drivers/media/dvb/siano/smsusb.c
@@ -352,8 +352,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id)
        params.num_buffers = MAX_BUFFERS;
        params.sendrequest_handler = smsusb_sendrequest;
        params.context = dev;
-        snprintf(params.devpath, sizeof(params.devpath),
+        usb_make_path(dev->udev, params.devpath, sizeof(params.devpath));
-                 "usb\\%d-%s", dev->udev->bus->busnum, dev->udev->devpath);
        /* register in smscore */
        rc = smscore_register_device(&params, &dev->coredev);
diff --git a/drivers/media/radio/si470x/radio-si470x-common.c b/drivers/media/radio/si470x/radio-si470x-common.c
index 47075fc71f11..9927a595b426 100644
--- a/drivers/media/radio/si470x/radio-si470x-common.c
+++ b/drivers/media/radio/si470x/radio-si470x-common.c
@@ -748,7 +748,7 @@ static int si470x_vidioc_s_tuner(struct file *file, void *priv,
                struct v4l2_tuner *tuner)
 {
        struct si470x_device *radio = video_drvdata(file);
-        int retval = -EINVAL;
+        int retval = 0;
        /* safety checks */
        retval = si470x_disconnect_check(radio);
diff --git a/drivers/media/radio/si4713-i2c.c b/drivers/media/radio/si4713-i2c.c
index ab63dd5b25c4..fc7f4b794649 100644
--- a/drivers/media/radio/si4713-i2c.c
+++ b/drivers/media/radio/si4713-i2c.c
@@ -1009,8 +1009,10 @@ static int si4713_write_econtrol_string(struct si4713_device *sdev,
                        goto exit;
                }
                rval = copy_from_user(ps_name, control->string, len);
-                if (rval < 0)
+                if (rval) {
+                        rval = -EFAULT;
                        goto exit;
+                }
                ps_name[len] = '\0';
                if (strlen(ps_name) % vqc.step) {
@@ -1031,8 +1033,10 @@ static int si4713_write_econtrol_string(struct si4713_device *sdev,
                        goto exit;
                }
                rval = copy_from_user(radio_text, control->string, len);
-                if (rval < 0)
+                if (rval) {
+                        rval = -EFAULT;
                        goto exit;
+                }
                radio_text[len] = '\0';
                if (strlen(radio_text) % vqc.step) {
@@ -1367,6 +1371,8 @@ static int si4713_read_econtrol_string(struct si4713_device *sdev,
                }
                rval = copy_to_user(control->string, sdev->rds_info.ps_name,
                                        strlen(sdev->rds_info.ps_name) + 1);
+                if (rval)
+                        rval = -EFAULT;
                break;
        case V4L2_CID_RDS_TX_RADIO_TEXT:
@@ -1377,6 +1383,8 @@ static int si4713_read_econtrol_string(struct si4713_device *sdev,
                }
                rval = copy_to_user(control->string, sdev->rds_info.radio_text,
                                        strlen(sdev->rds_info.radio_text) + 1);
+                if (rval)
+                        rval = -EFAULT;
                break;
        default:
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index bdbc9d305419..2e15903b976d 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -517,19 +517,6 @@ config VIDEO_UPD64083
 endmenu # encoder / decoder chips
-config DISPLAY_DAVINCI_DM646X_EVM
-        tristate "DM646x EVM Video Display"
-        depends on VIDEO_DEV && MACH_DAVINCI_DM6467_EVM
-        select VIDEOBUF_DMA_CONTIG
-        select VIDEO_DAVINCI_VPIF
-        select VIDEO_ADV7343
-        select VIDEO_THS7303
-        help
-          Support for DM6467 based display device.
-          To compile this driver as a module, choose M here: the
-          module will be called vpif_display.
 config VIDEO_SH_VOU
        tristate "SuperH VOU video output driver"
        depends on VIDEO_DEV && ARCH_SHMOBILE
@@ -537,29 +524,22 @@ config VIDEO_SH_VOU
        help
          Support for the Video Output Unit (VOU) on SuperH SoCs.
-config CAPTURE_DAVINCI_DM646X_EVM
+config VIDEO_VIU
-        tristate "DM646x EVM Video Capture"
+        tristate "Freescale VIU Video Driver"
-        depends on VIDEO_DEV && MACH_DAVINCI_DM6467_EVM
+        depends on VIDEO_V4L2 && PPC_MPC512x
        select VIDEOBUF_DMA_CONTIG
-        select VIDEO_DAVINCI_VPIF
+        default y
-        help
+        ---help---
-          Support for DM6467 based capture device.
+          Support for Freescale VIU video driver. This device captures
+          video data, or overlays video on DIU frame buffer.
-          To compile this driver as a module, choose M here: the
-          module will be called vpif_capture.
-config VIDEO_DAVINCI_VPIF
-        tristate "DaVinci VPIF Driver"
-        depends on DISPLAY_DAVINCI_DM646X_EVM
-        help
-          Support for DaVinci VPIF Driver.
-          To compile this driver as a module, choose M here: the
+          Say Y here if you want to enable VIU device on MPC5121e Rev2+.
-          module will be called vpif.
+          In doubt, say N.
 config VIDEO_VIVI
        tristate "Virtual Video Driver"
-        depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64 && FONTS
+        depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64
+        depends on (FRAMEBUFFER_CONSOLE || STI_CONSOLE) && FONTS
        select FONT_8x16
        select VIDEOBUF_VMALLOC
        default n
@@ -570,66 +550,7 @@ config VIDEO_VIVI
          Say Y here if you want to test video apps or debug V4L devices.
          In doubt, say N.
-config VIDEO_VPSS_SYSTEM
+source "drivers/media/video/davinci/Kconfig"
-        tristate "VPSS System module driver"
-        depends on ARCH_DAVINCI
-        help
-          Support for vpss system module for video driver
-config VIDEO_VPFE_CAPTURE
-        tristate "VPFE Video Capture Driver"
-        depends on VIDEO_V4L2 && ARCH_DAVINCI
-        select VIDEOBUF_DMA_CONTIG
-        help
-          Support for DMXXXX VPFE based frame grabber. This is the
-          common V4L2 module for following DMXXX SoCs from Texas
-          Instruments:- DM6446 & DM355.
-          To compile this driver as a module, choose M here: the
-          module will be called vpfe-capture.
-config VIDEO_DM6446_CCDC
-        tristate "DM6446 CCDC HW module"
-        depends on ARCH_DAVINCI_DM644x && VIDEO_VPFE_CAPTURE
-        select VIDEO_VPSS_SYSTEM
-        default y
-        help
-           Enables DaVinci CCD hw module. DaVinci CCDC hw interfaces
-           with decoder modules such as TVP5146 over BT656 or
-           sensor module such as MT9T001 over a raw interface. This
-           module configures the interface and CCDC/ISIF to do
-           video frame capture from slave decoders.
-           To compile this driver as a module, choose M here: the
-           module will be called vpfe.
-config VIDEO_DM355_CCDC
-        tristate "DM355 CCDC HW module"
-        depends on ARCH_DAVINCI_DM355 && VIDEO_VPFE_CAPTURE
-        select VIDEO_VPSS_SYSTEM
-        default y
-        help
-           Enables DM355 CCD hw module. DM355 CCDC hw interfaces
-           with decoder modules such as TVP5146 over BT656 or
-           sensor module such as MT9T001 over a raw interface. This
-           module configures the interface and CCDC/ISIF to do
-           video frame capture from a slave decoders
-           To compile this driver as a module, choose M here: the
-           module will be called vpfe.
-config VIDEO_ISIF
-        tristate "ISIF HW module"
-        depends on ARCH_DAVINCI_DM365 && VIDEO_VPFE_CAPTURE
-        select VIDEO_VPSS_SYSTEM
-        default y
-        help
-           Enables ISIF hw module. This is the hardware module for
-           configuring ISIF in VPFE to capture Raw Bayer RGB data  from
-           a image sensor or YUV data from a YUV source.
-           To compile this driver as a module, choose M here: the
-           module will be called vpfe.
 source "drivers/media/video/omap/Kconfig"
@@ -955,6 +876,12 @@ config VIDEO_PXA27x
        ---help---
          This is a v4l2 driver for the PXA27x Quick Capture Interface
+config VIDEO_SH_MOBILE_CSI2
+        tristate "SuperH Mobile MIPI CSI-2 Interface driver"
+        depends on VIDEO_DEV && SOC_CAMERA && HAVE_CLK
+        ---help---
+          This is a v4l2 driver for the SuperH MIPI CSI-2 Interface
 config VIDEO_SH_MOBILE_CEU
        tristate "SuperH Mobile CEU Interface driver"
        depends on VIDEO_DEV && SOC_CAMERA && HAS_DMA && HAVE_CLK
@@ -969,6 +896,19 @@ config VIDEO_OMAP2
        ---help---
          This is a v4l2 driver for the TI OMAP2 camera capture interface
+config VIDEO_MX2_HOSTSUPPORT
+        bool
+config VIDEO_MX2
+        tristate "i.MX27/i.MX25 Camera Sensor Interface driver"
+        depends on VIDEO_DEV && SOC_CAMERA && (MACH_MX27 || ARCH_MX25)
+        select VIDEOBUF_DMA_CONTIG
+        select VIDEO_MX2_HOSTSUPPORT
+        ---help---
+          This is a v4l2 driver for the i.MX27 and the i.MX25 Camera Sensor
+          Interface
 #
 # USB Multimedia device configuration
 #
@@ -1000,61 +940,6 @@ source "drivers/media/video/usbvideo/Kconfig"
 source "drivers/media/video/et61x251/Kconfig"
-config VIDEO_OVCAMCHIP
-        tristate "OmniVision Camera Chip support (DEPRECATED)"
-        depends on I2C && VIDEO_V4L1
-        default n
-        ---help---
-          This driver is DEPRECATED please use the gspca ov519 module
-          instead. Note that for the ov511 / ov518 support of the gspca module
-          you need atleast version 0.6.0 of libv4l and for the w9968cf
-          atleast version 0.6.3 of libv4l.
-          Support for the OmniVision OV6xxx and OV7xxx series of camera chips.
-          This driver is intended to be used with the ov511 and w9968cf USB
-          camera drivers.
-          To compile this driver as a module, choose M here: the
-          module will be called ovcamchip.
-config USB_W9968CF
-        tristate "USB W996[87]CF JPEG Dual Mode Camera support (DEPRECATED)"
-        depends on VIDEO_V4L1 && I2C && VIDEO_OVCAMCHIP
-        default n
-        ---help---
-          This driver is DEPRECATED please use the gspca ov519 module
-          instead. Note that for the w9968cf support of the gspca module
-          you need atleast version 0.6.3 of libv4l.
-          Say Y here if you want support for cameras based on OV681 or
-          Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips.
-          This driver has an optional plugin, which is distributed as a
-          separate module only (released under GPL). It allows to use higher
-          resolutions and framerates, but cannot be included in the official
-          Linux kernel for performance purposes.
-          See <file:Documentation/video4linux/w9968cf.txt> for more info.
-          To compile this driver as a module, choose M here: the
-          module will be called w9968cf.
-config USB_OV511
-        tristate "USB OV511 Camera support (DEPRECATED)"
-        depends on VIDEO_V4L1
-        default n
-        ---help---
-          This driver is DEPRECATED please use the gspca ov519 module
-          instead. Note that for the ov511 / ov518 support of the gspca module
-          you need atleast version 0.6.0 of libv4l.
-          Say Y here if you want to connect this type of camera to your
-          computer's USB port. See <file:Documentation/video4linux/ov511.txt>
-          for more information and for a list of supported cameras.
-          To compile this driver as a module, choose M here: the
-          module will be called ov511.
 config USB_SE401
        tristate "USB SE401 Camera support"
        depends on VIDEO_V4L1
@@ -1068,25 +953,6 @@ config USB_SE401
 source "drivers/media/video/sn9c102/Kconfig"
-config USB_STV680
-        tristate "USB STV680 (Pencam) Camera support (DEPRECATED)"
-        depends on VIDEO_V4L1
-        default n
-        ---help---
-          This driver is DEPRECATED please use the gspca stv0680 module
-          instead. Note that for the gspca stv0680 module you need
-          atleast version 0.6.3 of libv4l.
-          Say Y here if you want to connect this type of camera to your
-          computer's USB port. This includes the Pencam line of cameras.
-          See <file:Documentation/video4linux/stv680.txt> for more information
-          and for a list of supported cameras.
-          To compile this driver as a module, choose M here: the
-          module will be called stv680.
-source "drivers/media/video/zc0301/Kconfig"
 source "drivers/media/video/pwc/Kconfig"
 config USB_ZR364XX
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index cc93859d3164..1051ecc602e7 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -105,7 +105,6 @@ obj-$(CONFIG_VIDEO_TLG2300) += tlg2300/
 obj-$(CONFIG_VIDEO_CX231XX) += cx231xx/
 obj-$(CONFIG_VIDEO_USBVISION) += usbvision/
 obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/
-obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip/
 obj-$(CONFIG_VIDEO_CPIA2) += cpia2/
 obj-$(CONFIG_VIDEO_MXB) += mxb.o
 obj-$(CONFIG_VIDEO_HEXIUM_ORION) += hexium_orion.o
@@ -127,17 +126,13 @@ obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o
 obj-$(CONFIG_VIDEO_CAFE_CCIC) += cafe_ccic.o
 obj-$(CONFIG_USB_DABUSB)        += dabusb.o
-obj-$(CONFIG_USB_OV511)         += ov511.o
 obj-$(CONFIG_USB_SE401)         += se401.o
-obj-$(CONFIG_USB_STV680)        += stv680.o
-obj-$(CONFIG_USB_W9968CF)       += w9968cf.o
 obj-$(CONFIG_USB_ZR364XX)       += zr364xx.o
 obj-$(CONFIG_USB_STKWEBCAM)     += stkwebcam.o
 obj-$(CONFIG_USB_SN9C102)       += sn9c102/
 obj-$(CONFIG_USB_ET61X251)      += et61x251/
 obj-$(CONFIG_USB_PWC)           += pwc/
-obj-$(CONFIG_USB_ZC0301)        += zc0301/
 obj-$(CONFIG_USB_GSPCA)         += gspca/
 obj-$(CONFIG_VIDEO_HDPVR)       += hdpvr/
@@ -151,6 +146,7 @@ obj-$(CONFIG_USB_S2255)		+= s2255drv.o
 obj-$(CONFIG_VIDEO_IVTV) += ivtv/
 obj-$(CONFIG_VIDEO_CX18) += cx18/
+obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o
 obj-$(CONFIG_VIDEO_VIVI) += vivi.o
 obj-$(CONFIG_VIDEO_MEM2MEM_TESTDEV) += mem2mem_testdev.o
 obj-$(CONFIG_VIDEO_CX23885) += cx23885/
@@ -162,8 +158,10 @@ obj-$(CONFIG_SOC_CAMERA)		+= soc_camera.o soc_mediabus.o
 obj-$(CONFIG_SOC_CAMERA_PLATFORM)       += soc_camera_platform.o
 # soc-camera host drivers have to be linked after camera drivers
 obj-$(CONFIG_VIDEO_MX1)                 += mx1_camera.o
+obj-$(CONFIG_VIDEO_MX2)                 += mx2_camera.o
 obj-$(CONFIG_VIDEO_MX3)                 += mx3_camera.o
 obj-$(CONFIG_VIDEO_PXA27x)              += pxa_camera.o
+obj-$(CONFIG_VIDEO_SH_MOBILE_CSI2)      += sh_mobile_csi2.o
 obj-$(CONFIG_VIDEO_SH_MOBILE_CEU)       += sh_mobile_ceu_camera.o
 obj-$(CONFIG_ARCH_DAVINCI)              += davinci/
@@ -177,7 +175,7 @@ obj-$(CONFIG_VIDEO_SAA7164)     += saa7164/
 obj-$(CONFIG_VIDEO_IR_I2C)  += ir-kbd-i2c.o
-obj-$(CONFIG_ARCH_DAVINCI)      += davinci/
+obj-y   += davinci/
 obj-$(CONFIG_ARCH_OMAP) += omap/
diff --git a/drivers/media/video/ak881x.c b/drivers/media/video/ak881x.c
index 1573392f74bd..b388654d48cd 100644
--- a/drivers/media/video/ak881x.c
+++ b/drivers/media/video/ak881x.c
@@ -126,7 +126,7 @@ static int ak881x_try_g_mbus_fmt(struct v4l2_subdev *sd,
        v4l_bound_align_image(&mf->width, 0, 720, 2,
                              &mf->height, 0, ak881x->lines, 1, 0);
        mf->field       = V4L2_FIELD_INTERLACED;
-        mf->code        = V4L2_MBUS_FMT_YUYV8_2X8_LE;
+        mf->code        = V4L2_MBUS_FMT_YUYV8_2X8;
        mf->colorspace  = V4L2_COLORSPACE_SMPTE170M;
        return 0;
@@ -136,7 +136,7 @@ static int ak881x_s_mbus_fmt(struct v4l2_subdev *sd,
                             struct v4l2_mbus_framefmt *mf)
 {
        if (mf->field != V4L2_FIELD_INTERLACED ||
-            mf->code != V4L2_MBUS_FMT_YUYV8_2X8_LE)
+            mf->code != V4L2_MBUS_FMT_YUYV8_2X8)
                return -EINVAL;
        return ak881x_try_g_mbus_fmt(sd, mf);
@@ -148,7 +148,7 @@ static int ak881x_enum_mbus_fmt(struct v4l2_subdev *sd, unsigned int index,
        if (index)
                return -EINVAL;
-        *code = V4L2_MBUS_FMT_YUYV8_2X8_LE;
+        *code = V4L2_MBUS_FMT_YUYV8_2X8;
        return 0;
 }
diff --git a/drivers/media/video/au0828/Makefile b/drivers/media/video/au0828/Makefile
index 4d2623158188..5c7f2f7d9805 100644
--- a/drivers/media/video/au0828/Makefile
+++ b/drivers/media/video/au0828/Makefile
@@ -1,4 +1,4 @@
-au0828-objs     := au0828-core.o au0828-i2c.o au0828-cards.o au0828-dvb.o au0828-video.o
+au0828-objs     := au0828-core.o au0828-i2c.o au0828-cards.o au0828-dvb.o au0828-video.o au0828-vbi.o
 obj-$(CONFIG_VIDEO_AU0828) += au0828.o
diff --git a/drivers/media/video/au0828/au0828-vbi.c b/drivers/media/video/au0828/au0828-vbi.c
new file mode 100644
index 000000000000..63f593070ee8
--- /dev/null
+++ b/drivers/media/video/au0828/au0828-vbi.c
@@ -0,0 +1,138 @@
+/*
+   au0828-vbi.c - VBI driver for au0828
+   Copyright (C) 2010 Devin Heitmueller <dheitmueller@kernellabs.com>
+   This work was sponsored by GetWellNetwork Inc.
+   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., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include "au0828.h"
+static unsigned int vbibufs = 5;
+module_param(vbibufs, int, 0644);
+MODULE_PARM_DESC(vbibufs, "number of vbi buffers, range 2-32");
+/* ------------------------------------------------------------------ */
+static void
+free_buffer(struct videobuf_queue *vq, struct au0828_buffer *buf)
+{
+        struct au0828_fh     *fh  = vq->priv_data;
+        struct au0828_dev    *dev = fh->dev;
+        unsigned long flags = 0;
+        if (in_interrupt())
+                BUG();
+        /* We used to wait for the buffer to finish here, but this didn't work
+           because, as we were keeping the state as VIDEOBUF_QUEUED,
+           videobuf_queue_cancel marked it as finished for us.
+           (Also, it could wedge forever if the hardware was misconfigured.)
+           This should be safe; by the time we get here, the buffer isn't
+           queued anymore. If we ever start marking the buffers as
+           VIDEOBUF_ACTIVE, it won't be, though.
+        */
+        spin_lock_irqsave(&dev->slock, flags);
+        if (dev->isoc_ctl.vbi_buf == buf)
+                dev->isoc_ctl.vbi_buf = NULL;
+        spin_unlock_irqrestore(&dev->slock, flags);
+        videobuf_vmalloc_free(&buf->vb);
+        buf->vb.state = VIDEOBUF_NEEDS_INIT;
+}
+static int
+vbi_setup(struct videobuf_queue *q, unsigned int *count, unsigned int *size)
+{
+        struct au0828_fh     *fh  = q->priv_data;
+        struct au0828_dev    *dev = fh->dev;
+        *size = dev->vbi_width * dev->vbi_height * 2;
+        if (0 == *count)
+                *count = vbibufs;
+        if (*count < 2)
+                *count = 2;
+        if (*count > 32)
+                *count = 32;
+        return 0;
+}
+static int
+vbi_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
+            enum v4l2_field field)
+{
+        struct au0828_fh     *fh  = q->priv_data;
+        struct au0828_dev    *dev = fh->dev;
+        struct au0828_buffer *buf = container_of(vb, struct au0828_buffer, vb);
+        int                  rc = 0;
+        buf->vb.size = dev->vbi_width * dev->vbi_height * 2;
+        if (0 != buf->vb.baddr  &&  buf->vb.bsize < buf->vb.size)
+                return -EINVAL;
+        buf->vb.width  = dev->vbi_width;
+        buf->vb.height = dev->vbi_height;
+        buf->vb.field  = field;
+        if (VIDEOBUF_NEEDS_INIT == buf->vb.state) {
+                rc = videobuf_iolock(q, &buf->vb, NULL);
+                if (rc < 0)
+                        goto fail;
+        }
+        buf->vb.state = VIDEOBUF_PREPARED;
+        return 0;
+fail:
+        free_buffer(q, buf);
+        return rc;
+}
+static void
+vbi_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
+{
+        struct au0828_buffer    *buf     = container_of(vb,
+                                                        struct au0828_buffer,
+                                                        vb);
+        struct au0828_fh        *fh      = vq->priv_data;
+        struct au0828_dev       *dev     = fh->dev;
+        struct au0828_dmaqueue  *vbiq    = &dev->vbiq;
+        buf->vb.state = VIDEOBUF_QUEUED;
+        list_add_tail(&buf->vb.queue, &vbiq->active);
+}
+static void vbi_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
+{
+        struct au0828_buffer *buf = container_of(vb, struct au0828_buffer, vb);
+        free_buffer(q, buf);
+}
+struct videobuf_queue_ops au0828_vbi_qops = {
+        .buf_setup    = vbi_setup,
+        .buf_prepare  = vbi_prepare,
+        .buf_queue    = vbi_queue,
+        .buf_release  = vbi_release,
+};
diff --git a/drivers/media/video/au0828/au0828-video.c b/drivers/media/video/au0828/au0828-video.c
index 52f25aabb6dc..7989a7ba7c40 100644
--- a/drivers/media/video/au0828/au0828-video.c
+++ b/drivers/media/video/au0828/au0828-video.c
@@ -314,6 +314,23 @@ static inline void buffer_filled(struct au0828_dev *dev,
        wake_up(&buf->vb.done);
 }
+static inline void vbi_buffer_filled(struct au0828_dev *dev,
+                                     struct au0828_dmaqueue *dma_q,
+                                     struct au0828_buffer *buf)
+{
+        /* Advice that buffer was filled */
+        au0828_isocdbg("[%p/%d] wakeup\n", buf, buf->vb.i);
+        buf->vb.state = VIDEOBUF_DONE;
+        buf->vb.field_count++;
+        do_gettimeofday(&buf->vb.ts);
+        dev->isoc_ctl.vbi_buf = NULL;
+        list_del(&buf->vb.queue);
+        wake_up(&buf->vb.done);
+}
 /*
 * Identify the buffer header type and properly handles
 */
@@ -327,6 +344,9 @@ static void au0828_copy_video(struct au0828_dev *dev,
        int  linesdone, currlinedone, offset, lencopy, remain;
        int bytesperline = dev->width << 1; /* Assumes 16-bit depth @@@@ */
+        if (len == 0)
+                return;
        if (dma_q->pos + len > buf->vb.size)
                len = buf->vb.size - dma_q->pos;
@@ -414,17 +434,98 @@ static inline void get_next_buf(struct au0828_dmaqueue *dma_q,
        return;
 }
+static void au0828_copy_vbi(struct au0828_dev *dev,
+                              struct au0828_dmaqueue  *dma_q,
+                              struct au0828_buffer *buf,
+                              unsigned char *p,
+                              unsigned char *outp, unsigned long len)
+{
+        unsigned char *startwrite, *startread;
+        int bytesperline;
+        int i, j = 0;
+        if (dev == NULL) {
+                au0828_isocdbg("dev is null\n");
+                return;
+        }
+        if (dma_q == NULL) {
+                au0828_isocdbg("dma_q is null\n");
+                return;
+        }
+        if (buf == NULL)
+                return;
+        if (p == NULL) {
+                au0828_isocdbg("p is null\n");
+                return;
+        }
+        if (outp == NULL) {
+                au0828_isocdbg("outp is null\n");
+                return;
+        }
+        bytesperline = dev->vbi_width;
+        if (dma_q->pos + len > buf->vb.size)
+                len = buf->vb.size - dma_q->pos;
+        startread = p;
+        startwrite = outp + (dma_q->pos / 2);
+        /* Make sure the bottom field populates the second half of the frame */
+        if (buf->top_field == 0)
+                startwrite += bytesperline * dev->vbi_height;
+        for (i = 0; i < len; i += 2)
+                startwrite[j++] = startread[i+1];
+        dma_q->pos += len;
+}
+/*
+ * video-buf generic routine to get the next available VBI buffer
+ */
+static inline void vbi_get_next_buf(struct au0828_dmaqueue *dma_q,
+                                    struct au0828_buffer **buf)
+{
+        struct au0828_dev *dev = container_of(dma_q, struct au0828_dev, vbiq);
+        char *outp;
+        if (list_empty(&dma_q->active)) {
+                au0828_isocdbg("No active queue to serve\n");
+                dev->isoc_ctl.vbi_buf = NULL;
+                *buf = NULL;
+                return;
+        }
+        /* Get the next buffer */
+        *buf = list_entry(dma_q->active.next, struct au0828_buffer, vb.queue);
+        /* Cleans up buffer - Usefull for testing for frame/URB loss */
+        outp = videobuf_to_vmalloc(&(*buf)->vb);
+        memset(outp, 0x00, (*buf)->vb.size);
+        dev->isoc_ctl.vbi_buf = *buf;
+        return;
+}
 /*
 * Controls the isoc copy of each urb packet
 */
 static inline int au0828_isoc_copy(struct au0828_dev *dev, struct urb *urb)
 {
        struct au0828_buffer    *buf;
+        struct au0828_buffer    *vbi_buf;
        struct au0828_dmaqueue  *dma_q = urb->context;
+        struct au0828_dmaqueue  *vbi_dma_q = &dev->vbiq;
        unsigned char *outp = NULL;
+        unsigned char *vbioutp = NULL;
        int i, len = 0, rc = 1;
        unsigned char *p;
        unsigned char fbyte;
+        unsigned int vbi_field_size;
+        unsigned int remain, lencopy;
        if (!dev)
                return 0;
@@ -443,6 +544,10 @@ static inline int au0828_isoc_copy(struct au0828_dev *dev, struct urb *urb)
        if (buf != NULL)
                outp = videobuf_to_vmalloc(&buf->vb);
+        vbi_buf = dev->isoc_ctl.vbi_buf;
+        if (vbi_buf != NULL)
+                vbioutp = videobuf_to_vmalloc(&vbi_buf->vb);
        for (i = 0; i < urb->number_of_packets; i++) {
                int status = urb->iso_frame_desc[i].status;
@@ -472,6 +577,19 @@ static inline int au0828_isoc_copy(struct au0828_dev *dev, struct urb *urb)
                        au0828_isocdbg("Video frame %s\n",
                                       (fbyte & 0x40) ? "odd" : "even");
                        if (!(fbyte & 0x40)) {
+                                /* VBI */
+                                if (vbi_buf != NULL)
+                                        vbi_buffer_filled(dev,
+                                                          vbi_dma_q,
+                                                          vbi_buf);
+                                vbi_get_next_buf(vbi_dma_q, &vbi_buf);
+                                if (vbi_buf == NULL)
+                                        vbioutp = NULL;
+                                else
+                                        vbioutp = videobuf_to_vmalloc(
+                                                &vbi_buf->vb);
+                                /* Video */
                                if (buf != NULL)
                                        buffer_filled(dev, dma_q, buf);
                                get_next_buf(dma_q, &buf);
@@ -488,9 +606,36 @@ static inline int au0828_isoc_copy(struct au0828_dev *dev, struct urb *urb)
                                        buf->top_field = 0;
                        }
+                        if (vbi_buf != NULL) {
+                                if (fbyte & 0x40)
+                                        vbi_buf->top_field = 1;
+                                else
+                                        vbi_buf->top_field = 0;
+                        }
+                        dev->vbi_read = 0;
+                        vbi_dma_q->pos = 0;
                        dma_q->pos = 0;
                }
-                if (buf != NULL)
+                vbi_field_size = dev->vbi_width * dev->vbi_height * 2;
+                if (dev->vbi_read < vbi_field_size) {
+                        remain  = vbi_field_size - dev->vbi_read;
+                        if (len < remain)
+                                lencopy = len;
+                        else
+                                lencopy = remain;
+                        if (vbi_buf != NULL)
+                                au0828_copy_vbi(dev, vbi_dma_q, vbi_buf, p,
+                                                vbioutp, len);
+                        len -= lencopy;
+                        p += lencopy;
+                        dev->vbi_read += lencopy;
+                }
+                if (dev->vbi_read >= vbi_field_size && buf != NULL)
                        au0828_copy_video(dev, dma_q, buf, p, outp, len);
        }
        return rc;
@@ -642,7 +787,7 @@ int au0828_analog_stream_enable(struct au0828_dev *d)
        au0828_writereg(d, 0x114, 0xa0);
        au0828_writereg(d, 0x115, 0x05);
        /* set y position */
-        au0828_writereg(d, 0x112, 0x02);
+        au0828_writereg(d, 0x112, 0x00);
        au0828_writereg(d, 0x113, 0x00);
        au0828_writereg(d, 0x116, 0xf2);
        au0828_writereg(d, 0x117, 0x00);
@@ -703,47 +848,83 @@ void au0828_analog_unregister(struct au0828_dev *dev)
 /* Usage lock check functions */
-static int res_get(struct au0828_fh *fh)
+static int res_get(struct au0828_fh *fh, unsigned int bit)
 {
-        struct au0828_dev *dev = fh->dev;
+        struct au0828_dev    *dev = fh->dev;
-        int              rc   = 0;
-        /* This instance already has stream_on */
+        if (fh->resources & bit)
-        if (fh->stream_on)
+                /* have it already allocated */
-                return rc;
+                return 1;
-        if (dev->stream_on)
+        /* is it free? */
-                return -EBUSY;
+        mutex_lock(&dev->lock);
+        if (dev->resources & bit) {
+                /* no, someone else uses it */
+                mutex_unlock(&dev->lock);
+                return 0;
+        }
+        /* it's free, grab it */
+        fh->resources  |= bit;
+        dev->resources |= bit;
+        dprintk(1, "res: get %d\n", bit);
+        mutex_unlock(&dev->lock);
+        return 1;
+}
-        dev->stream_on = 1;
+static int res_check(struct au0828_fh *fh, unsigned int bit)
-        fh->stream_on  = 1;
+{
-        return rc;
+        return fh->resources & bit;
 }
-static int res_check(struct au0828_fh *fh)
+static int res_locked(struct au0828_dev *dev, unsigned int bit)
 {
-        return fh->stream_on;
+        return dev->resources & bit;
 }
-static void res_free(struct au0828_fh *fh)
+static void res_free(struct au0828_fh *fh, unsigned int bits)
 {
-        struct au0828_dev *dev = fh->dev;
+        struct au0828_dev    *dev = fh->dev;
-        fh->stream_on = 0;
+        BUG_ON((fh->resources & bits) != bits);
-        dev->stream_on = 0;
+        mutex_lock(&dev->lock);
+        fh->resources  &= ~bits;
+        dev->resources &= ~bits;
+        dprintk(1, "res: put %d\n", bits);
+        mutex_unlock(&dev->lock);
+}
+static int get_ressource(struct au0828_fh *fh)
+{
+        switch (fh->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+                return AU0828_RESOURCE_VIDEO;
+        case V4L2_BUF_TYPE_VBI_CAPTURE:
+                return AU0828_RESOURCE_VBI;
+        default:
+                BUG();
+                return 0;
+        }
 }
 static int au0828_v4l2_open(struct file *filp)
 {
        int ret = 0;
+        struct video_device *vdev = video_devdata(filp);
        struct au0828_dev *dev = video_drvdata(filp);
        struct au0828_fh *fh;
-        int type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        int type;
-#ifdef VBI_IS_WORKING
+        switch (vdev->vfl_type) {
-        if (video_devdata(filp)->vfl_type == VFL_TYPE_GRABBER)
+        case VFL_TYPE_GRABBER:
+                type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                break;
+        case VFL_TYPE_VBI:
                type = V4L2_BUF_TYPE_VBI_CAPTURE;
-#endif
+                break;
+        default:
+                return -EINVAL;
+        }
        fh = kzalloc(sizeof(struct au0828_fh), GFP_KERNEL);
        if (NULL == fh) {
@@ -781,10 +962,21 @@ static int au0828_v4l2_open(struct file *filp)
        dev->users++;
        videobuf_queue_vmalloc_init(&fh->vb_vidq, &au0828_video_qops,
-                                    NULL, &dev->slock, fh->type,
+                                    NULL, &dev->slock,
+                                    V4L2_BUF_TYPE_VIDEO_CAPTURE,
                                    V4L2_FIELD_INTERLACED,
                                    sizeof(struct au0828_buffer), fh);
+        /* VBI Setup */
+        dev->vbi_width = 720;
+        dev->vbi_height = 1;
+        videobuf_queue_vmalloc_init(&fh->vb_vbiq, &au0828_vbi_qops,
+                                    NULL, &dev->slock,
+                                    V4L2_BUF_TYPE_VBI_CAPTURE,
+                                    V4L2_FIELD_SEQ_TB,
+                                    sizeof(struct au0828_buffer), fh);
        return ret;
 }
@@ -794,17 +986,19 @@ static int au0828_v4l2_close(struct file *filp)
        struct au0828_fh *fh = filp->private_data;
        struct au0828_dev *dev = fh->dev;
-        mutex_lock(&dev->lock);
+        if (res_check(fh, AU0828_RESOURCE_VIDEO)) {
-        if (res_check(fh))
-                res_free(fh);
-        if (dev->users == 1) {
                videobuf_stop(&fh->vb_vidq);
-                videobuf_mmap_free(&fh->vb_vidq);
+                res_free(fh, AU0828_RESOURCE_VIDEO);
+        }
+        if (res_check(fh, AU0828_RESOURCE_VBI)) {
+                videobuf_stop(&fh->vb_vbiq);
+                res_free(fh, AU0828_RESOURCE_VBI);
+        }
+        if (dev->users == 1) {
                if (dev->dev_state & DEV_DISCONNECTED) {
                        au0828_analog_unregister(dev);
-                        mutex_unlock(&dev->lock);
                        kfree(dev);
                        return 0;
                }
@@ -823,10 +1017,11 @@ static int au0828_v4l2_close(struct file *filp)
                        printk(KERN_INFO "Au0828 can't set alternate to 0!\n");
        }
+        videobuf_mmap_free(&fh->vb_vidq);
+        videobuf_mmap_free(&fh->vb_vbiq);
        kfree(fh);
        dev->users--;
        wake_up_interruptible_nr(&dev->open, 1);
-        mutex_unlock(&dev->lock);
        return 0;
 }
@@ -842,16 +1037,21 @@ static ssize_t au0828_v4l2_read(struct file *filp, char __user *buf,
                return rc;
        if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
-                mutex_lock(&dev->lock);
+                if (res_locked(dev, AU0828_RESOURCE_VIDEO))
-                rc = res_get(fh);
+                        return -EBUSY;
-                mutex_unlock(&dev->lock);
-                if (unlikely(rc < 0))
-                        return rc;
                return videobuf_read_stream(&fh->vb_vidq, buf, count, pos, 0,
                                        filp->f_flags & O_NONBLOCK);
        }
+        if (fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
+                if (!res_get(fh, AU0828_RESOURCE_VBI))
+                        return -EBUSY;
+                return videobuf_read_stream(&fh->vb_vbiq, buf, count, pos, 0,
+                                            filp->f_flags & O_NONBLOCK);
+        }
        return 0;
 }
@@ -865,17 +1065,17 @@ static unsigned int au0828_v4l2_poll(struct file *filp, poll_table *wait)
        if (rc < 0)
                return rc;
-        mutex_lock(&dev->lock);
+        if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
-        rc = res_get(fh);
+                if (!res_get(fh, AU0828_RESOURCE_VIDEO))
-        mutex_unlock(&dev->lock);
+                        return POLLERR;
+                return videobuf_poll_stream(filp, &fh->vb_vidq, wait);
-        if (unlikely(rc < 0))
+        } else if (fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
-                return POLLERR;
+                if (!res_get(fh, AU0828_RESOURCE_VBI))
+                        return POLLERR;
-        if (V4L2_BUF_TYPE_VIDEO_CAPTURE != fh->type)
+                return videobuf_poll_stream(filp, &fh->vb_vbiq, wait);
+        } else {
                return POLLERR;
+        }
-        return videobuf_poll_stream(filp, &fh->vb_vidq, wait);
 }
 static int au0828_v4l2_mmap(struct file *filp, struct vm_area_struct *vma)
@@ -888,14 +1088,10 @@ static int au0828_v4l2_mmap(struct file *filp, struct vm_area_struct *vma)
        if (rc < 0)
                return rc;
-        mutex_lock(&dev->lock);
+        if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
-        rc = res_get(fh);
+                rc = videobuf_mmap_mapper(&fh->vb_vidq, vma);
-        mutex_unlock(&dev->lock);
+        else if (fh->type == V4L2_BUF_TYPE_VBI_CAPTURE)
+                rc = videobuf_mmap_mapper(&fh->vb_vbiq, vma);
-        if (unlikely(rc < 0))
-                return rc;
-        rc = videobuf_mmap_mapper(&fh->vb_vidq, vma);
        return rc;
 }
@@ -911,14 +1107,6 @@ static int au0828_set_format(struct au0828_dev *dev, unsigned int cmd,
        maxwidth = 720;
        maxheight = 480;
-#ifdef VBI_IS_WORKING
-        if (format->type == V4L2_BUF_TYPE_SLICED_VBI_CAPTURE) {
-                dprintk(1, "VBI format set: to be supported!\n");
-                return 0;
-        }
-        if (format->type == V4L2_BUF_TYPE_VBI_CAPTURE)
-                return 0;
-#endif
        if (format->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                return -EINVAL;
@@ -999,9 +1187,7 @@ static int vidioc_querycap(struct file *file, void  *priv,
        /*set the device capabilities */
        cap->capabilities = V4L2_CAP_VIDEO_CAPTURE |
-#ifdef VBI_IS_WORKING
                V4L2_CAP_VBI_CAPTURE |
-#endif
                V4L2_CAP_AUDIO |
                V4L2_CAP_READWRITE |
                V4L2_CAP_STREAMING |
@@ -1056,20 +1242,21 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
        struct au0828_dev *dev = fh->dev;
        int rc;
+        rc = check_dev(dev);
+        if (rc < 0)
+                return rc;
+        mutex_lock(&dev->lock);
        if (videobuf_queue_is_busy(&fh->vb_vidq)) {
                printk(KERN_INFO "%s queue busy\n", __func__);
                rc = -EBUSY;
                goto out;
        }
-        if (dev->stream_on && !fh->stream_on) {
+        rc = au0828_set_format(dev, VIDIOC_S_FMT, f);
-                printk(KERN_INFO "%s device in use by another fh\n", __func__);
-                rc = -EBUSY;
-                goto out;
-        }
-        return au0828_set_format(dev, VIDIOC_S_FMT, f);
 out:
+        mutex_unlock(&dev->lock);
        return rc;
 }
@@ -1300,6 +1487,29 @@ static int vidioc_s_frequency(struct file *file, void *priv,
        return 0;
 }
+/* RAW VBI ioctls */
+static int vidioc_g_fmt_vbi_cap(struct file *file, void *priv,
+                                struct v4l2_format *format)
+{
+        struct au0828_fh      *fh  = priv;
+        struct au0828_dev     *dev = fh->dev;
+        format->fmt.vbi.samples_per_line = dev->vbi_width;
+        format->fmt.vbi.sample_format = V4L2_PIX_FMT_GREY;
+        format->fmt.vbi.offset = 0;
+        format->fmt.vbi.flags = 0;
+        format->fmt.vbi.sampling_rate = 6750000 * 4 / 2;
+        format->fmt.vbi.count[0] = dev->vbi_height;
+        format->fmt.vbi.count[1] = dev->vbi_height;
+        format->fmt.vbi.start[0] = 21;
+        format->fmt.vbi.start[1] = 284;
+        return 0;
+}
 static int vidioc_g_chip_ident(struct file *file, void *priv,
               struct v4l2_dbg_chip_ident *chip)
 {
@@ -1345,25 +1555,32 @@ static int vidioc_cropcap(struct file *file, void *priv,
 static int vidioc_streamon(struct file *file, void *priv,
                           enum v4l2_buf_type type)
 {
-        struct au0828_fh *fh = priv;
+        struct au0828_fh      *fh  = priv;
-        struct au0828_dev *dev = fh->dev;
+        struct au0828_dev     *dev = fh->dev;
-        int rc;
+        int                   rc = -EINVAL;
        rc = check_dev(dev);
        if (rc < 0)
                return rc;
+        if (unlikely(type != fh->type))
+                return -EINVAL;
+        dprintk(1, "vidioc_streamon fh=%p t=%d fh->res=%d dev->res=%d\n",
+                fh, type, fh->resources, dev->resources);
+        if (unlikely(!res_get(fh, get_ressource(fh))))
+                return -EBUSY;
        if (type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
                au0828_analog_stream_enable(dev);
                v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_stream, 1);
        }
-        mutex_lock(&dev->lock);
+        if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
-        rc = res_get(fh);
-        if (likely(rc >= 0))
                rc = videobuf_streamon(&fh->vb_vidq);
-        mutex_unlock(&dev->lock);
+        else if (fh->type == V4L2_BUF_TYPE_VBI_CAPTURE)
+                rc = videobuf_streamon(&fh->vb_vbiq);
        return rc;
 }
@@ -1371,38 +1588,42 @@ static int vidioc_streamon(struct file *file, void *priv,
 static int vidioc_streamoff(struct file *file, void *priv,
                            enum v4l2_buf_type type)
 {
-        struct au0828_fh *fh = priv;
+        struct au0828_fh      *fh  = priv;
-        struct au0828_dev *dev = fh->dev;
+        struct au0828_dev     *dev = fh->dev;
-        int i;
+        int                   rc;
-        int ret;
+        int                   i;
-        int rc;
        rc = check_dev(dev);
        if (rc < 0)
                return rc;
-        if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+        if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&
+            fh->type != V4L2_BUF_TYPE_VBI_CAPTURE)
                return -EINVAL;
        if (type != fh->type)
                return -EINVAL;
-        if (type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+        dprintk(1, "vidioc_streamoff fh=%p t=%d fh->res=%d dev->res=%d\n",
+                fh, type, fh->resources, dev->resources);
+        if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
                v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_stream, 0);
-                ret = au0828_stream_interrupt(dev);
+                rc = au0828_stream_interrupt(dev);
-                if (ret != 0)
+                if (rc != 0)
-                        return ret;
+                        return rc;
-        }
-        for (i = 0; i < AU0828_MAX_INPUT; i++) {
+                for (i = 0; i < AU0828_MAX_INPUT; i++) {
-                if (AUVI_INPUT(i).audio_setup == NULL)
+                        if (AUVI_INPUT(i).audio_setup == NULL)
-                        continue;
+                                continue;
-                (AUVI_INPUT(i).audio_setup)(dev, 0);
+                        (AUVI_INPUT(i).audio_setup)(dev, 0);
-        }
+                }
-        mutex_lock(&dev->lock);
+                videobuf_streamoff(&fh->vb_vidq);
-        videobuf_streamoff(&fh->vb_vidq);
+                res_free(fh, AU0828_RESOURCE_VIDEO);
-        res_free(fh);
+        } else if (fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
-        mutex_unlock(&dev->lock);
+                videobuf_streamoff(&fh->vb_vbiq);
+                res_free(fh, AU0828_RESOURCE_VBI);
+        }
        return 0;
 }
@@ -1527,19 +1748,11 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
        .vidioc_g_fmt_vid_cap       = vidioc_g_fmt_vid_cap,
        .vidioc_try_fmt_vid_cap     = vidioc_try_fmt_vid_cap,
        .vidioc_s_fmt_vid_cap       = vidioc_s_fmt_vid_cap,
-#ifdef VBI_IS_WORKING
        .vidioc_g_fmt_vbi_cap       = vidioc_g_fmt_vbi_cap,
-        .vidioc_try_fmt_vbi_cap     = vidioc_s_fmt_vbi_cap,
+        .vidioc_s_fmt_vbi_cap       = vidioc_g_fmt_vbi_cap,
-        .vidioc_s_fmt_vbi_cap       = vidioc_s_fmt_vbi_cap,
-#endif
        .vidioc_g_audio             = vidioc_g_audio,
        .vidioc_s_audio             = vidioc_s_audio,
        .vidioc_cropcap             = vidioc_cropcap,
-#ifdef VBI_IS_WORKING
-        .vidioc_g_fmt_sliced_vbi_cap   = vidioc_g_fmt_sliced_vbi_cap,
-        .vidioc_try_fmt_sliced_vbi_cap = vidioc_try_set_sliced_vbi_cap,
-        .vidioc_s_fmt_sliced_vbi_cap   = vidioc_try_set_sliced_vbi_cap,
-#endif
        .vidioc_reqbufs             = vidioc_reqbufs,
        .vidioc_querybuf            = vidioc_querybuf,
        .vidioc_qbuf                = vidioc_qbuf,
@@ -1621,8 +1834,11 @@ int au0828_analog_register(struct au0828_dev *dev,
        spin_lock_init(&dev->slock);
        mutex_init(&dev->lock);
+        /* init video dma queues */
        INIT_LIST_HEAD(&dev->vidq.active);
        INIT_LIST_HEAD(&dev->vidq.queued);
+        INIT_LIST_HEAD(&dev->vbiq.active);
+        INIT_LIST_HEAD(&dev->vbiq.queued);
        dev->width = NTSC_STD_W;
        dev->height = NTSC_STD_H;
@@ -1638,26 +1854,23 @@ int au0828_analog_register(struct au0828_dev *dev,
                return -ENOMEM;
        }
-#ifdef VBI_IS_WORKING
+        /* allocate the VBI struct */
        dev->vbi_dev = video_device_alloc();
        if (NULL == dev->vbi_dev) {
                dprintk(1, "Can't allocate vbi_device.\n");
                kfree(dev->vdev);
                return -ENOMEM;
        }
-#endif
        /* Fill the video capture device struct */
        *dev->vdev = au0828_video_template;
        dev->vdev->parent = &dev->usbdev->dev;
        strcpy(dev->vdev->name, "au0828a video");
-#ifdef VBI_IS_WORKING
        /* Setup the VBI device */
        *dev->vbi_dev = au0828_video_template;
        dev->vbi_dev->parent = &dev->usbdev->dev;
        strcpy(dev->vbi_dev->name, "au0828a vbi");
-#endif
        /* Register the v4l2 device */
        video_set_drvdata(dev->vdev, dev);
@@ -1669,7 +1882,6 @@ int au0828_analog_register(struct au0828_dev *dev,
                return -ENODEV;
        }
-#ifdef VBI_IS_WORKING
        /* Register the vbi device */
        video_set_drvdata(dev->vbi_dev, dev);
        retval = video_register_device(dev->vbi_dev, VFL_TYPE_VBI, -1);
@@ -1680,7 +1892,6 @@ int au0828_analog_register(struct au0828_dev *dev,
                video_device_release(dev->vdev);
                return -ENODEV;
        }
-#endif
        dprintk(1, "%s completed!\n", __func__);
diff --git a/drivers/media/video/au0828/au0828.h b/drivers/media/video/au0828/au0828.h
index 207f32dec6a6..9905bc4f5f59 100644
--- a/drivers/media/video/au0828/au0828.h
+++ b/drivers/media/video/au0828/au0828.h
@@ -60,6 +60,10 @@
 #define AU0828_MAX_INPUT        4
+/* au0828 resource types (used for res_get/res_lock etc */
+#define AU0828_RESOURCE_VIDEO 0x01
+#define AU0828_RESOURCE_VBI   0x02
 enum au0828_itype {
        AU0828_VMUX_UNDEFINED = 0,
        AU0828_VMUX_COMPOSITE,
@@ -115,8 +119,10 @@ enum au0828_dev_state {
 struct au0828_fh {
        struct au0828_dev *dev;
-        unsigned int  stream_on:1;      /* Locks streams */
+        unsigned int  resources;
        struct videobuf_queue        vb_vidq;
+        struct videobuf_queue        vb_vbiq;
        enum v4l2_buf_type           type;
 };
@@ -145,7 +151,8 @@ struct au0828_usb_isoc_ctl {
        int                             tmp_buf_len;
                /* Stores already requested buffers */
-        struct au0828_buffer            *buf;
+        struct au0828_buffer            *buf;
+        struct au0828_buffer            *vbi_buf;
                /* Stores the number of received fields */
        int                             nfields;
@@ -194,11 +201,14 @@ struct au0828_dev {
        /* Analog */
        struct v4l2_device v4l2_dev;
        int users;
-        unsigned int stream_on:1;       /* Locks streams */
+        unsigned int resources; /* resources in use */
        struct video_device *vdev;
        struct video_device *vbi_dev;
        int width;
        int height;
+        int vbi_width;
+        int vbi_height;
+        u32 vbi_read;
        u32 field_size;
        u32 frame_size;
        u32 bytesperline;
@@ -219,6 +229,7 @@ struct au0828_dev {
        /* Isoc control struct */
        struct au0828_dmaqueue vidq;
+        struct au0828_dmaqueue vbiq;
        struct au0828_usb_isoc_ctl isoc_ctl;
        spinlock_t slock;
@@ -278,6 +289,9 @@ void au0828_analog_unregister(struct au0828_dev *dev);
 extern int au0828_dvb_register(struct au0828_dev *dev);
 extern void au0828_dvb_unregister(struct au0828_dev *dev);
+/* au0828-vbi.c */
+extern struct videobuf_queue_ops au0828_vbi_qops;
 #define dprintk(level, fmt, arg...)\
        do { if (au0828_debug & level)\
                printk(KERN_DEBUG DRIVER_NAME "/0: " fmt, ## arg);\
diff --git a/drivers/media/video/bt8xx/bttv-risc.c b/drivers/media/video/bt8xx/bttv-risc.c
index c24b1c100e13..0fa9f39f37a3 100644
--- a/drivers/media/video/bt8xx/bttv-risc.c
+++ b/drivers/media/video/bt8xx/bttv-risc.c
@@ -583,7 +583,7 @@ bttv_dma_free(struct videobuf_queue *q,struct bttv *btv, struct bttv_buffer *buf
        BUG_ON(in_interrupt());
        videobuf_waiton(&buf->vb,0,0);
-        videobuf_dma_unmap(q, dma);
+        videobuf_dma_unmap(q->dev, dma);
        videobuf_dma_free(dma);
        btcx_riscmem_free(btv->c.pci,&buf->bottom);
        btcx_riscmem_free(btv->c.pci,&buf->top);
diff --git a/drivers/media/video/cpia_usb.c b/drivers/media/video/cpia_usb.c
index ef1f89399983..58d193ff591c 100644
--- a/drivers/media/video/cpia_usb.c
+++ b/drivers/media/video/cpia_usb.c
@@ -584,7 +584,6 @@ static void cpia_disconnect(struct usb_interface *intf)
 {
        struct cam_data *cam = usb_get_intfdata(intf);
        struct usb_cpia *ucpia;
-        struct usb_device *udev;
        usb_set_intfdata(intf, NULL);
        if (!cam)
@@ -606,8 +605,6 @@ static void cpia_disconnect(struct usb_interface *intf)
        if (waitqueue_active(&ucpia->wq_stream))
                wake_up_interruptible(&ucpia->wq_stream);
-        udev = interface_to_usbdev(intf);
        ucpia->curbuff = ucpia->workbuff = NULL;
        vfree(ucpia->buffers[2]);
diff --git a/drivers/media/video/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c
index 20eaf38ba959..d6792405f8d3 100644
--- a/drivers/media/video/cx18/cx18-ioctl.c
+++ b/drivers/media/video/cx18/cx18-ioctl.c
@@ -1081,7 +1081,7 @@ long cx18_v4l2_ioctl(struct file *filp, unsigned int cmd,
                    unsigned long arg)
 {
        struct video_device *vfd = video_devdata(filp);
-        struct cx18_open_id *id = (struct cx18_open_id *)filp->private_data;
+        struct cx18_open_id *id = filp->private_data;
        struct cx18 *cx = id->cx;
        long res;
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index d639186f645d..2014daedee8b 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -408,10 +408,18 @@ struct cx23885_subid cx23885_subids[] = {
                .card      = CX23885_BOARD_HAUPPAUGE_HVR1275,
        }, {
                .subvendor = 0x0070,
+                .subdevice = 0x221d,
+                .card      = CX23885_BOARD_HAUPPAUGE_HVR1275,
+        }, {
+                .subvendor = 0x0070,
                .subdevice = 0x2251,
                .card      = CX23885_BOARD_HAUPPAUGE_HVR1255,
        }, {
                .subvendor = 0x0070,
+                .subdevice = 0x2259,
+                .card      = CX23885_BOARD_HAUPPAUGE_HVR1255,
+        }, {
+                .subvendor = 0x0070,
                .subdevice = 0x2291,
                .card      = CX23885_BOARD_HAUPPAUGE_HVR1210,
        }, {
@@ -419,6 +427,38 @@ struct cx23885_subid cx23885_subids[] = {
                .subdevice = 0x2295,
                .card      = CX23885_BOARD_HAUPPAUGE_HVR1210,
        }, {
+                .subvendor = 0x0070,
+                .subdevice = 0x2299,
+                .card      = CX23885_BOARD_HAUPPAUGE_HVR1210,
+        }, {
+                .subvendor = 0x0070,
+                .subdevice = 0x229d,
+                .card      = CX23885_BOARD_HAUPPAUGE_HVR1210, /* HVR1215 */
+        }, {
+                .subvendor = 0x0070,
+                .subdevice = 0x22f0,
+                .card      = CX23885_BOARD_HAUPPAUGE_HVR1210,
+        }, {
+                .subvendor = 0x0070,
+                .subdevice = 0x22f1,
+                .card      = CX23885_BOARD_HAUPPAUGE_HVR1255,
+        }, {
+                .subvendor = 0x0070,
+                .subdevice = 0x22f2,
+                .card      = CX23885_BOARD_HAUPPAUGE_HVR1275,
+        }, {
+                .subvendor = 0x0070,
+                .subdevice = 0x22f3,
+                .card      = CX23885_BOARD_HAUPPAUGE_HVR1210, /* HVR1215 */
+        }, {
+                .subvendor = 0x0070,
+                .subdevice = 0x22f4,
+                .card      = CX23885_BOARD_HAUPPAUGE_HVR1210,
+        }, {
+                .subvendor = 0x0070,
+                .subdevice = 0x22f5,
+                .card      = CX23885_BOARD_HAUPPAUGE_HVR1210, /* HVR1215 */
+        }, {
                .subvendor = 0x14f1,
                .subdevice = 0x8651,
                .card      = CX23885_BOARD_MYGICA_X8506,
diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index 0dde57e96d30..ff76f64edac1 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -1142,7 +1142,7 @@ void cx23885_free_buffer(struct videobuf_queue *q, struct cx23885_buffer *buf)
        BUG_ON(in_interrupt());
        videobuf_waiton(&buf->vb, 0, 0);
-        videobuf_dma_unmap(q, dma);
+        videobuf_dma_unmap(q->dev, dma);
        videobuf_dma_free(dma);
        btcx_riscmem_free(to_pci_dev(q->dev), &buf->risc);
        buf->vb.state = VIDEOBUF_NEEDS_INIT;
@@ -1953,8 +1953,12 @@ static int __devinit cx23885_initdev(struct pci_dev *pci_dev,
                goto fail_irq;
        }
-        err = request_irq(pci_dev->irq, cx23885_irq,
+        if (!pci_enable_msi(pci_dev))
-                          IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
+                err = request_irq(pci_dev->irq, cx23885_irq,
+                                  IRQF_DISABLED, dev->name, dev);
+        else
+                err = request_irq(pci_dev->irq, cx23885_irq,
+                                  IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
        if (err < 0) {
                printk(KERN_ERR "%s: can't get IRQ %d\n",
                       dev->name, pci_dev->irq);
@@ -2000,6 +2004,7 @@ static void __devexit cx23885_finidev(struct pci_dev *pci_dev)
        /* unregister stuff */
        free_irq(pci_dev->irq, dev);
+        pci_disable_msi(pci_dev);
        cx23885_dev_unregister(dev);
        v4l2_device_unregister(v4l2_dev);
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index 0a199d774d9b..3d70af283881 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -991,7 +991,7 @@ static int dvb_register(struct cx23885_tsport *port)
        ret = videobuf_dvb_register_bus(&port->frontends, THIS_MODULE, port,
                                        &dev->pci->dev, adapter_nr, 0,
                                        cx23885_dvb_fe_ioctl_override);
-        if (!ret)
+        if (ret)
                return ret;
        /* init CI & MAC */
diff --git a/drivers/media/video/cx23885/cx23885-input.c b/drivers/media/video/cx23885/cx23885-input.c
index 5de6ba98f7a8..d0b1613ede2f 100644
--- a/drivers/media/video/cx23885/cx23885-input.c
+++ b/drivers/media/video/cx23885/cx23885-input.c
@@ -37,161 +37,55 @@
 #include <linux/input.h>
 #include <linux/slab.h>
-#include <media/ir-common.h>
+#include <media/ir-core.h>
 #include <media/v4l2-subdev.h>
 #include "cx23885.h"
-#define RC5_BITS                14
-#define RC5_HALF_BITS           (2*RC5_BITS)
-#define RC5_HALF_BITS_MASK      ((1 << RC5_HALF_BITS) - 1)
-#define RC5_START_BITS_NORMAL   0x3 /* Command range  0 -  63 */
-#define RC5_START_BITS_EXTENDED 0x2 /* Command range 64 - 127 */
-#define RC5_EXTENDED_COMMAND_OFFSET     64
 #define MODULE_NAME "cx23885"
-static inline unsigned int rc5_command(u32 rc5_baseband)
+static void convert_measurement(u32 x, struct ir_raw_event *y)
 {
-        return RC5_INSTR(rc5_baseband) +
+        if (x == V4L2_SUBDEV_IR_PULSE_RX_SEQ_END) {
-                ((RC5_START(rc5_baseband) == RC5_START_BITS_EXTENDED)
+                y->pulse = false;
-                        ? RC5_EXTENDED_COMMAND_OFFSET : 0);
+                y->duration = V4L2_SUBDEV_IR_PULSE_MAX_WIDTH_NS;
-}
-static void cx23885_input_process_raw_rc5(struct cx23885_dev *dev)
-{
-        struct card_ir *ir_input = dev->ir_input;
-        unsigned int code, command;
-        u32 rc5;
-        /* Ignore codes that are too short to be valid RC-5 */
-        if (ir_input->last_bit < (RC5_HALF_BITS - 1))
-                return;
-        /* The library has the manchester coding backwards; XOR to adapt. */
-        code = (ir_input->code & RC5_HALF_BITS_MASK) ^ RC5_HALF_BITS_MASK;
-        rc5 = ir_rc5_decode(code);
-        switch (RC5_START(rc5)) {
-        case RC5_START_BITS_NORMAL:
-                break;
-        case RC5_START_BITS_EXTENDED:
-                /* Don't allow if the remote only emits standard commands */
-                if (ir_input->start == RC5_START_BITS_NORMAL)
-                        return;
-                break;
-        default:
                return;
        }
-        if (ir_input->addr != RC5_ADDR(rc5))
+        y->pulse = (x & V4L2_SUBDEV_IR_PULSE_LEVEL_MASK) ? true : false;
-                return;
+        y->duration = x & V4L2_SUBDEV_IR_PULSE_MAX_WIDTH_NS;
-        /* Don't generate a keypress for RC-5 auto-repeated keypresses */
-        command = rc5_command(rc5);
-        if (RC5_TOGGLE(rc5) != RC5_TOGGLE(ir_input->last_rc5) ||
-            command != rc5_command(ir_input->last_rc5) ||
-            /* Catch T == 0, CMD == 0 (e.g. '0') as first keypress after init */
-            RC5_START(ir_input->last_rc5) == 0) {
-                /* This keypress is differnet: not an auto repeat */
-                ir_input_nokey(ir_input->dev, &ir_input->ir);
-                ir_input_keydown(ir_input->dev, &ir_input->ir, command);
-        }
-        ir_input->last_rc5 = rc5;
-        /* Schedule when we should do the key up event: ir_input_nokey() */
-        mod_timer(&ir_input->timer_keyup,
-                  jiffies + msecs_to_jiffies(ir_input->rc5_key_timeout));
 }
-static void cx23885_input_next_pulse_width_rc5(struct cx23885_dev *dev,
+static void cx23885_input_process_measurements(struct cx23885_dev *dev,
-                                               u32 ns_pulse)
+                                               bool overrun)
 {
-        const int rc5_quarterbit_ns = 444444; /* 32 cycles/36 kHz/2 = 444 us */
+        struct cx23885_kernel_ir *kernel_ir = dev->kernel_ir;
-        struct card_ir *ir_input = dev->ir_input;
+        struct ir_raw_event kernel_ir_event;
-        int i, level, quarterbits, halfbits;
-        if (!ir_input->active) {
-                ir_input->active = 1;
-                /* assume an initial space that we may not detect or measure */
-                ir_input->code = 0;
-                ir_input->last_bit = 0;
-        }
-        if (ns_pulse == V4L2_SUBDEV_IR_PULSE_RX_SEQ_END) {
+        u32 sd_ir_data[64];
-                ir_input->last_bit++; /* Account for the final space */
+        ssize_t num;
-                ir_input->active = 0;
-                cx23885_input_process_raw_rc5(dev);
-                return;
-        }
-        level = (ns_pulse & V4L2_SUBDEV_IR_PULSE_LEVEL_MASK) ? 1 : 0;
-        /* Skip any leading space to sync to the start bit */
-        if (ir_input->last_bit == 0 && level == 0)
-                return;
-        /*
-         * With valid RC-5 we can get up to two consecutive half-bits in a
-         * single pulse measurment.  Experiments have shown that the duration
-         * of a half-bit can vary.  Make sure we always end up with an even
-         * number of quarter bits at the same level (mark or space).
-         */
-        ns_pulse &= V4L2_SUBDEV_IR_PULSE_MAX_WIDTH_NS;
-        quarterbits = ns_pulse / rc5_quarterbit_ns;
-        if (quarterbits & 1)
-                quarterbits++;
-        halfbits = quarterbits / 2;
-        for (i = 0; i < halfbits; i++) {
-                ir_input->last_bit++;
-                ir_input->code |= (level << ir_input->last_bit);
-                if (ir_input->last_bit >= RC5_HALF_BITS-1) {
-                        ir_input->active = 0;
-                        cx23885_input_process_raw_rc5(dev);
-                        /*
-                         * If level is 1, a leading mark is invalid for RC5.
-                         * If level is 0, we scan past extra intial space.
-                         * Either way we don't want to reactivate collecting
-                         * marks or spaces here with any left over half-bits.
-                         */
-                        break;
-                }
-        }
-}
-static void cx23885_input_process_pulse_widths_rc5(struct cx23885_dev *dev,
-                                                   bool add_eom)
-{
-        struct card_ir *ir_input = dev->ir_input;
-        struct ir_input_state *ir_input_state = &ir_input->ir;
-        u32 ns_pulse[RC5_HALF_BITS+1];
-        ssize_t num = 0;
        int count, i;
+        bool handle = false;
        do {
-                v4l2_subdev_call(dev->sd_ir, ir, rx_read, (u8 *) ns_pulse,
+                num = 0;
-                                 sizeof(ns_pulse), &num);
+                v4l2_subdev_call(dev->sd_ir, ir, rx_read, (u8 *) sd_ir_data,
+                                 sizeof(sd_ir_data), &num);
                count = num / sizeof(u32);
-                /* Append an end of Rx seq, if the caller requested */
+                for (i = 0; i < count; i++) {
-                if (add_eom && count < ARRAY_SIZE(ns_pulse)) {
+                        convert_measurement(sd_ir_data[i], &kernel_ir_event);
-                        ns_pulse[count] = V4L2_SUBDEV_IR_PULSE_RX_SEQ_END;
+                        ir_raw_event_store(kernel_ir->inp_dev,
-                        count++;
+                                           &kernel_ir_event);
+                        handle = true;
                }
-                /* Just drain the Rx FIFO, if we're called, but not RC-5 */
-                if (ir_input_state->ir_type != IR_TYPE_RC5)
-                        continue;
-                for (i = 0; i < count; i++)
-                        cx23885_input_next_pulse_width_rc5(dev, ns_pulse[i]);
        } while (num != 0);
+        if (overrun)
+                ir_raw_event_reset(kernel_ir->inp_dev);
+        else if (handle)
+                ir_raw_event_handle(kernel_ir->inp_dev);
 }
 void cx23885_input_rx_work_handler(struct cx23885_dev *dev, u32 events)
@@ -230,7 +124,7 @@ void cx23885_input_rx_work_handler(struct cx23885_dev *dev, u32 events)
        }
        if (data_available)
-                cx23885_input_process_pulse_widths_rc5(dev, overrun);
+                cx23885_input_process_measurements(dev, overrun);
        if (overrun) {
                /* If there was a FIFO overrun, clear & restart the device */
@@ -241,34 +135,15 @@ void cx23885_input_rx_work_handler(struct cx23885_dev *dev, u32 events)
        }
 }
-static void cx23885_input_ir_start(struct cx23885_dev *dev)
+static int cx23885_input_ir_start(struct cx23885_dev *dev)
 {
-        struct card_ir *ir_input = dev->ir_input;
-        struct ir_input_state *ir_input_state = &ir_input->ir;
        struct v4l2_subdev_ir_parameters params;
        if (dev->sd_ir == NULL)
-                return;
+                return -ENODEV;
        atomic_set(&dev->ir_input_stopping, 0);
-        /* keyup timer set up, if needed */
-        switch (dev->board) {
-        case CX23885_BOARD_HAUPPAUGE_HVR1850:
-        case CX23885_BOARD_HAUPPAUGE_HVR1290:
-                setup_timer(&ir_input->timer_keyup,
-                            ir_rc5_timer_keyup, /* Not actually RC-5 specific */
-                            (unsigned long) ir_input);
-                if (ir_input_state->ir_type == IR_TYPE_RC5) {
-                        /*
-                         * RC-5 repeats a held key every
-                         * 64 bits * (2 * 32/36000) sec/bit = 113.778 ms
-                         */
-                        ir_input->rc5_key_timeout = 115;
-                }
-                break;
-        }
        v4l2_subdev_call(dev->sd_ir, ir, rx_g_parameters, &params);
        switch (dev->board) {
        case CX23885_BOARD_HAUPPAUGE_HVR1850:
@@ -299,11 +174,21 @@ static void cx23885_input_ir_start(struct cx23885_dev *dev)
                break;
        }
        v4l2_subdev_call(dev->sd_ir, ir, rx_s_parameters, &params);
+        return 0;
+}
+static int cx23885_input_ir_open(void *priv)
+{
+        struct cx23885_kernel_ir *kernel_ir = priv;
+        if (kernel_ir->cx == NULL)
+                return -ENODEV;
+        return cx23885_input_ir_start(kernel_ir->cx);
 }
 static void cx23885_input_ir_stop(struct cx23885_dev *dev)
 {
-        struct card_ir *ir_input = dev->ir_input;
        struct v4l2_subdev_ir_parameters params;
        if (dev->sd_ir == NULL)
@@ -327,21 +212,26 @@ static void cx23885_input_ir_stop(struct cx23885_dev *dev)
        }
        flush_scheduled_work();
+}
-        switch (dev->board) {
+static void cx23885_input_ir_close(void *priv)
-        case CX23885_BOARD_HAUPPAUGE_HVR1850:
+{
-        case CX23885_BOARD_HAUPPAUGE_HVR1290:
+        struct cx23885_kernel_ir *kernel_ir = priv;
-                del_timer_sync(&ir_input->timer_keyup);
-                break;
+        if (kernel_ir->cx != NULL)
-        }
+                cx23885_input_ir_stop(kernel_ir->cx);
 }
 int cx23885_input_init(struct cx23885_dev *dev)
 {
-        struct card_ir *ir;
+        struct cx23885_kernel_ir *kernel_ir;
-        struct input_dev *input_dev;
+        struct input_dev *inp_dev;
-        char *ir_codes = NULL;
+        struct ir_dev_props *props;
-        int ir_type, ir_addr, ir_start;
+        char *rc_map;
+        enum rc_driver_type driver_type;
+        unsigned long allowed_protos;
        int ret;
        /*
@@ -354,53 +244,59 @@ int cx23885_input_init(struct cx23885_dev *dev)
        switch (dev->board) {
        case CX23885_BOARD_HAUPPAUGE_HVR1850:
        case CX23885_BOARD_HAUPPAUGE_HVR1290:
-                /* Parameters for the grey Hauppauge remote for the HVR-1850 */
+                /* Integrated CX23888 IR controller */
-                ir_codes = RC_MAP_HAUPPAUGE_NEW;
+                driver_type = RC_DRIVER_IR_RAW;
-                ir_type = IR_TYPE_RC5;
+                allowed_protos = IR_TYPE_ALL;
-                ir_addr = 0x1e; /* RC-5 system bits emitted by the remote */
+                /* The grey Hauppauge RC-5 remote */
-                ir_start = RC5_START_BITS_NORMAL; /* A basic RC-5 remote */
+                rc_map = RC_MAP_RC5_HAUPPAUGE_NEW;
                break;
-        }
+        default:
-        if (ir_codes == NULL)
                return -ENODEV;
-        ir = kzalloc(sizeof(*ir), GFP_KERNEL);
-        input_dev = input_allocate_device();
-        if (!ir || !input_dev) {
-                ret = -ENOMEM;
-                goto err_out_free;
        }
-        ir->dev = input_dev;
+        /* cx23885 board instance kernel IR state */
-        ir->addr = ir_addr;
+        kernel_ir = kzalloc(sizeof(struct cx23885_kernel_ir), GFP_KERNEL);
-        ir->start = ir_start;
+        if (kernel_ir == NULL)
+                return -ENOMEM;
-        /* init input device */
+        kernel_ir->cx = dev;
-        snprintf(ir->name, sizeof(ir->name), "cx23885 IR (%s)",
+        kernel_ir->name = kasprintf(GFP_KERNEL, "cx23885 IR (%s)",
-                 cx23885_boards[dev->board].name);
+                                    cx23885_boards[dev->board].name);
-        snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0", pci_name(dev->pci));
+        kernel_ir->phys = kasprintf(GFP_KERNEL, "pci-%s/ir0",
+                                    pci_name(dev->pci));
-        ret = ir_input_init(input_dev, &ir->ir, ir_type);
+        /* input device */
-        if (ret < 0)
+        inp_dev = input_allocate_device();
+        if (inp_dev == NULL) {
+                ret = -ENOMEM;
                goto err_out_free;
+        }
-        input_dev->name = ir->name;
+        kernel_ir->inp_dev = inp_dev;
-        input_dev->phys = ir->phys;
+        inp_dev->name = kernel_ir->name;
-        input_dev->id.bustype = BUS_PCI;
+        inp_dev->phys = kernel_ir->phys;
-        input_dev->id.version = 1;
+        inp_dev->id.bustype = BUS_PCI;
+        inp_dev->id.version = 1;
        if (dev->pci->subsystem_vendor) {
-                input_dev->id.vendor  = dev->pci->subsystem_vendor;
+                inp_dev->id.vendor  = dev->pci->subsystem_vendor;
-                input_dev->id.product = dev->pci->subsystem_device;
+                inp_dev->id.product = dev->pci->subsystem_device;
        } else {
-                input_dev->id.vendor  = dev->pci->vendor;
+                inp_dev->id.vendor  = dev->pci->vendor;
-                input_dev->id.product = dev->pci->device;
+                inp_dev->id.product = dev->pci->device;
        }
-        input_dev->dev.parent = &dev->pci->dev;
+        inp_dev->dev.parent = &dev->pci->dev;
-        dev->ir_input = ir;
+        /* kernel ir device properties */
-        cx23885_input_ir_start(dev);
+        props = &kernel_ir->props;
+        props->driver_type = driver_type;
-        ret = ir_input_register(ir->dev, ir_codes, NULL, MODULE_NAME);
+        props->allowed_protos = allowed_protos;
+        props->priv = kernel_ir;
+        props->open = cx23885_input_ir_open;
+        props->close = cx23885_input_ir_close;
+        /* Go */
+        dev->kernel_ir = kernel_ir;
+        ret = ir_input_register(inp_dev, rc_map, props, MODULE_NAME);
        if (ret)
                goto err_out_stop;
@@ -408,9 +304,12 @@ int cx23885_input_init(struct cx23885_dev *dev)
 err_out_stop:
        cx23885_input_ir_stop(dev);
-        dev->ir_input = NULL;
+        dev->kernel_ir = NULL;
+        /* TODO: double check clean-up of kernel_ir->inp_dev */
 err_out_free:
-        kfree(ir);
+        kfree(kernel_ir->phys);
+        kfree(kernel_ir->name);
+        kfree(kernel_ir);
        return ret;
 }
@@ -419,9 +318,11 @@ void cx23885_input_fini(struct cx23885_dev *dev)
        /* Always stop the IR hardware from generating interrupts */
        cx23885_input_ir_stop(dev);
-        if (dev->ir_input == NULL)
+        if (dev->kernel_ir == NULL)
                return;
-        ir_input_unregister(dev->ir_input->dev);
+        ir_input_unregister(dev->kernel_ir->inp_dev);
-        kfree(dev->ir_input);
+        kfree(dev->kernel_ir->phys);
-        dev->ir_input = NULL;
+        kfree(dev->kernel_ir->name);
+        kfree(dev->kernel_ir);
+        dev->kernel_ir = NULL;
 }
diff --git a/drivers/media/video/cx23885/cx23885-ir.c b/drivers/media/video/cx23885/cx23885-ir.c
index 9a677eb080af..6ceabd4fba07 100644
--- a/drivers/media/video/cx23885/cx23885-ir.c
+++ b/drivers/media/video/cx23885/cx23885-ir.c
@@ -53,7 +53,7 @@ void cx23885_ir_rx_work_handler(struct work_struct *work)
        if (events == 0)
                return;
-        if (dev->ir_input)
+        if (dev->kernel_ir)
                cx23885_input_rx_work_handler(dev, events);
 }
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index 8d6a55e54ee7..a33f2b71467b 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -30,6 +30,7 @@
 #include <media/tveeprom.h>
 #include <media/videobuf-dma-sg.h>
 #include <media/videobuf-dvb.h>
+#include <media/ir-core.h>
 #include "btcx-risc.h"
 #include "cx23885-reg.h"
@@ -304,6 +305,15 @@ struct cx23885_tsport {
        void                       *port_priv;
 };
+struct cx23885_kernel_ir {
+        struct cx23885_dev      *cx;
+        char                    *name;
+        char                    *phys;
+        struct input_dev        *inp_dev;
+        struct ir_dev_props     props;
+};
 struct cx23885_dev {
        atomic_t                   refcount;
        struct v4l2_device         v4l2_dev;
@@ -363,7 +373,7 @@ struct cx23885_dev {
        struct work_struct         ir_tx_work;
        unsigned long              ir_tx_notifications;
-        struct card_ir             *ir_input;
+        struct cx23885_kernel_ir   *kernel_ir;
        atomic_t                   ir_input_stopping;
        /* V4l */
diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
index 33082c96745e..4f383cdf5296 100644
--- a/drivers/media/video/cx88/cx88-alsa.c
+++ b/drivers/media/video/cx88/cx88-alsa.c
@@ -54,6 +54,12 @@
        Data type declarations - Can be moded to a header file later
 ****************************************************************************/
+struct cx88_audio_buffer {
+        unsigned int               bpl;
+        struct btcx_riscmem        risc;
+        struct videobuf_dmabuf     dma;
+};
 struct cx88_audio_dev {
        struct cx88_core           *core;
        struct cx88_dmaqueue       q;
@@ -75,7 +81,7 @@ struct cx88_audio_dev {
        struct videobuf_dmabuf     *dma_risc;
-        struct cx88_buffer         *buf;
+        struct cx88_audio_buffer   *buf;
        struct snd_pcm_substream   *substream;
 };
@@ -123,7 +129,7 @@ MODULE_PARM_DESC(debug,"enable debug messages");
 static int _cx88_start_audio_dma(snd_cx88_card_t *chip)
 {
-        struct cx88_buffer   *buf = chip->buf;
+        struct cx88_audio_buffer *buf = chip->buf;
        struct cx88_core *core=chip->core;
        struct sram_channel *audio_ch = &cx88_sram_channels[SRAM_CH25];
@@ -283,7 +289,7 @@ static int dsp_buffer_free(snd_cx88_card_t *chip)
        BUG_ON(!chip->dma_size);
        dprintk(2,"Freeing buffer\n");
-        videobuf_sg_dma_unmap(&chip->pci->dev, chip->dma_risc);
+        videobuf_dma_unmap(&chip->pci->dev, chip->dma_risc);
        videobuf_dma_free(chip->dma_risc);
        btcx_riscmem_free(chip->pci,&chip->buf->risc);
        kfree(chip->buf);
@@ -376,7 +382,7 @@ static int snd_cx88_hw_params(struct snd_pcm_substream * substream,
        snd_cx88_card_t *chip = snd_pcm_substream_chip(substream);
        struct videobuf_dmabuf *dma;
-        struct cx88_buffer *buf;
+        struct cx88_audio_buffer *buf;
        int ret;
        if (substream->runtime->dma_area) {
@@ -391,30 +397,25 @@ static int snd_cx88_hw_params(struct snd_pcm_substream * substream,
        BUG_ON(!chip->dma_size);
        BUG_ON(chip->num_periods & (chip->num_periods-1));
-        buf = videobuf_sg_alloc(sizeof(*buf));
+        buf = kzalloc(sizeof(*buf), GFP_KERNEL);
        if (NULL == buf)
                return -ENOMEM;
-        buf->vb.memory = V4L2_MEMORY_MMAP;
+        buf->bpl = chip->period_size;
-        buf->vb.field  = V4L2_FIELD_NONE;
-        buf->vb.width  = chip->period_size;
-        buf->bpl       = chip->period_size;
-        buf->vb.height = chip->num_periods;
-        buf->vb.size   = chip->dma_size;
-        dma = videobuf_to_dma(&buf->vb);
+        dma = &buf->dma;
        videobuf_dma_init(dma);
        ret = videobuf_dma_init_kernel(dma, PCI_DMA_FROMDEVICE,
-                        (PAGE_ALIGN(buf->vb.size) >> PAGE_SHIFT));
+                        (PAGE_ALIGN(chip->dma_size) >> PAGE_SHIFT));
        if (ret < 0)
                goto error;
-        ret = videobuf_sg_dma_map(&chip->pci->dev, dma);
+        ret = videobuf_dma_map(&chip->pci->dev, dma);
        if (ret < 0)
                goto error;
        ret = cx88_risc_databuffer(chip->pci, &buf->risc, dma->sglist,
-                                   buf->vb.width, buf->vb.height, 1);
+                                   chip->period_size, chip->num_periods, 1);
        if (ret < 0)
                goto error;
@@ -422,12 +423,10 @@ static int snd_cx88_hw_params(struct snd_pcm_substream * substream,
        buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP|RISC_IRQ1|RISC_CNT_INC);
        buf->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
-        buf->vb.state = VIDEOBUF_PREPARED;
        chip->buf = buf;
        chip->dma_risc = dma;
-        substream->runtime->dma_area = chip->dma_risc->vmalloc;
+        substream->runtime->dma_area = chip->dma_risc->vaddr;
        substream->runtime->dma_bytes = chip->dma_size;
        substream->runtime->dma_addr = 0;
        return 0;
@@ -740,7 +739,7 @@ static int __devinit snd_cx88_create(struct snd_card *card,
        pci_set_master(pci);
-        chip = (snd_cx88_card_t *) card->private_data;
+        chip = card->private_data;
        core = cx88_core_get(pci);
        if (NULL == core) {
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 2918a6e38fe8..e8416b76da67 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -45,6 +45,10 @@ static unsigned int latency = UNSET;
 module_param(latency,int,0444);
 MODULE_PARM_DESC(latency,"pci latency timer");
+static int disable_ir;
+module_param(disable_ir, int, 0444);
+MODULE_PARM_DESC(latency, "Disable IR support");
 #define info_printk(core, fmt, arg...) \
        printk(KERN_INFO "%s: " fmt, core->name , ## arg)
@@ -3498,7 +3502,10 @@ struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr)
        }
        cx88_card_setup(core);
-        cx88_ir_init(core, pci);
+        if (!disable_ir) {
+                cx88_i2c_init_ir(core);
+                cx88_ir_init(core, pci);
+        }
        return core;
 }
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index 8b21457111b1..85eb266fb351 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -218,7 +218,7 @@ cx88_free_buffer(struct videobuf_queue *q, struct cx88_buffer *buf)
        BUG_ON(in_interrupt());
        videobuf_waiton(&buf->vb,0,0);
-        videobuf_dma_unmap(q, dma);
+        videobuf_dma_unmap(q->dev, dma);
        videobuf_dma_free(dma);
        btcx_riscmem_free(to_pci_dev(q->dev), &buf->risc);
        buf->vb.state = VIDEOBUF_NEEDS_INIT;
diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index fb39f1184558..375ad53f7961 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
@@ -181,6 +181,11 @@ int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci)
        } else
                printk("%s: i2c register FAILED\n", core->name);
+        return core->i2c_rc;
+}
+void cx88_i2c_init_ir(struct cx88_core *core)
+{
        /* Instantiate the IR receiver device, if present */
        if (0 == core->i2c_rc) {
                struct i2c_board_info info;
@@ -207,7 +212,6 @@ int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci)
                        }
                }
        }
-        return core->i2c_rc;
 }
 /* ----------------------------------------------------------------------- */
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index e185289e446c..eccc5e49a350 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -30,6 +30,7 @@
 #include <linux/module.h>
 #include "cx88.h"
+#include <media/ir-core.h>
 #include <media/ir-common.h>
 #define MODULE_NAME "cx88xx"
@@ -39,8 +40,8 @@
 struct cx88_IR {
        struct cx88_core *core;
        struct input_dev *input;
-        struct ir_input_state ir;
        struct ir_dev_props props;
+        u64 ir_type;
        int users;
@@ -51,7 +52,6 @@ struct cx88_IR {
        u32 sampling;
        u32 samples[16];
        int scount;
-        unsigned long release;
        /* poll external decoder */
        int polling;
@@ -125,29 +125,21 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
                data = (data << 4) | ((gpio_key & 0xf0) >> 4);
-                ir_input_keydown(ir->input, &ir->ir, data);
+                ir_keydown(ir->input, data, 0);
-                ir_input_nokey(ir->input, &ir->ir);
        } else if (ir->mask_keydown) {
                /* bit set on keydown */
-                if (gpio & ir->mask_keydown) {
+                if (gpio & ir->mask_keydown)
-                        ir_input_keydown(ir->input, &ir->ir, data);
+                        ir_keydown(ir->input, data, 0);
-                } else {
-                        ir_input_nokey(ir->input, &ir->ir);
-                }
        } else if (ir->mask_keyup) {
                /* bit cleared on keydown */
-                if (0 == (gpio & ir->mask_keyup)) {
+                if (0 == (gpio & ir->mask_keyup))
-                        ir_input_keydown(ir->input, &ir->ir, data);
+                        ir_keydown(ir->input, data, 0);
-                } else {
-                        ir_input_nokey(ir->input, &ir->ir);
-                }
        } else {
                /* can't distinguish keydown/up :-/ */
-                ir_input_keydown(ir->input, &ir->ir, data);
+                ir_keydown(ir->input, data, 0);
-                ir_input_nokey(ir->input, &ir->ir);
        }
 }
@@ -439,9 +431,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
        snprintf(ir->name, sizeof(ir->name), "cx88 IR (%s)", core->board.name);
        snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0", pci_name(pci));
-        err = ir_input_init(input_dev, &ir->ir, ir_type);
+        ir->ir_type = ir_type;
-        if (err < 0)
-                goto err_out_free;
        input_dev->name = ir->name;
        input_dev->phys = ir->phys;
@@ -516,8 +506,6 @@ void cx88_ir_irq(struct cx88_core *core)
        }
        if (!ir->scount) {
                /* nothing to sample */
-                if (ir->ir.keypressed && time_after(jiffies, ir->release))
-                        ir_input_nokey(ir->input, &ir->ir);
                return;
        }
@@ -553,7 +541,7 @@ void cx88_ir_irq(struct cx88_core *core)
                if (ircode == 0) { /* key still pressed */
                        ir_dprintk("pulse distance decoded repeat code\n");
-                        ir->release = jiffies + msecs_to_jiffies(120);
+                        ir_repeat(ir->input);
                        break;
                }
@@ -567,10 +555,8 @@ void cx88_ir_irq(struct cx88_core *core)
                        break;
                }
-                ir_dprintk("Key Code: %x\n", (ircode >> 16) & 0x7f);
+                ir_dprintk("Key Code: %x\n", (ircode >> 16) & 0xff);
+                ir_keydown(ir->input, (ircode >> 16) & 0xff, 0);
-                ir_input_keydown(ir->input, &ir->ir, (ircode >> 16) & 0x7f);
-                ir->release = jiffies + msecs_to_jiffies(120);
                break;
        case CX88_BOARD_HAUPPAUGE:
        case CX88_BOARD_HAUPPAUGE_DVB_T1:
@@ -606,16 +592,16 @@ void cx88_ir_irq(struct cx88_core *core)
                if ( dev != 0x1e && dev != 0x1f )
                        /* not a hauppauge remote */
                        break;
-                ir_input_keydown(ir->input, &ir->ir, code);
+                ir_keydown(ir->input, code, toggle);
-                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);
                if ((ircode & 0xfffff000) != 0x3000)
                        break;
-                ir_input_keydown(ir->input, &ir->ir, ircode & 0x3f);
+                /* Note: bit 0x800 being the toggle is assumed, not checked
-                ir->release = jiffies + msecs_to_jiffies(120);
+                   with real hardware  */
+                ir_keydown(ir->input, ircode & 0x3f, ircode & 0x0800 ? 1 : 0);
                break;
        }
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index bdb03d336536..33d161a11725 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -636,6 +636,7 @@ extern struct videobuf_queue_ops cx8800_vbi_qops;
 /* cx88-i2c.c                                                  */
 extern int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci);
+extern void cx88_i2c_init_ir(struct cx88_core *core);
 /* ----------------------------------------------------------- */
diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c
index 0f505086774c..5b176bd7afdb 100644
--- a/drivers/media/video/dabusb.c
+++ b/drivers/media/video/dabusb.c
@@ -706,16 +706,11 @@ static long dabusb_ioctl (struct file *file, unsigned int cmd, unsigned long arg
        switch (cmd) {
        case IOCTL_DAB_BULK:
-                pbulk = kmalloc(sizeof (bulk_transfer_t), GFP_KERNEL);
+                pbulk = memdup_user((void __user *)arg,
+                                    sizeof(bulk_transfer_t));
-                if (!pbulk) {
+                if (IS_ERR(pbulk)) {
-                        ret = -ENOMEM;
+                        ret = PTR_ERR(pbulk);
-                        break;
-                }
-                if (copy_from_user (pbulk, (void __user *) arg, sizeof (bulk_transfer_t))) {
-                        ret = -EFAULT;
-                        kfree (pbulk);
                        break;
                }
diff --git a/drivers/media/video/davinci/Kconfig b/drivers/media/video/davinci/Kconfig
new file mode 100644
index 000000000000..6b1954035649
--- /dev/null
+++ b/drivers/media/video/davinci/Kconfig
@@ -0,0 +1,93 @@
+config DISPLAY_DAVINCI_DM646X_EVM
+        tristate "DM646x EVM Video Display"
+        depends on VIDEO_DEV && MACH_DAVINCI_DM6467_EVM
+        select VIDEOBUF_DMA_CONTIG
+        select VIDEO_DAVINCI_VPIF
+        select VIDEO_ADV7343
+        select VIDEO_THS7303
+        help
+          Support for DM6467 based display device.
+          To compile this driver as a module, choose M here: the
+          module will be called vpif_display.
+config CAPTURE_DAVINCI_DM646X_EVM
+        tristate "DM646x EVM Video Capture"
+        depends on VIDEO_DEV && MACH_DAVINCI_DM6467_EVM
+        select VIDEOBUF_DMA_CONTIG
+        select VIDEO_DAVINCI_VPIF
+        help
+          Support for DM6467 based capture device.
+          To compile this driver as a module, choose M here: the
+          module will be called vpif_capture.
+config VIDEO_DAVINCI_VPIF
+        tristate "DaVinci VPIF Driver"
+        depends on DISPLAY_DAVINCI_DM646X_EVM
+        help
+          Support for DaVinci VPIF Driver.
+          To compile this driver as a module, choose M here: the
+          module will be called vpif.
+config VIDEO_VPSS_SYSTEM
+        tristate "VPSS System module driver"
+        depends on ARCH_DAVINCI
+        help
+          Support for vpss system module for video driver
+config VIDEO_VPFE_CAPTURE
+        tristate "VPFE Video Capture Driver"
+        depends on VIDEO_V4L2 && (ARCH_DAVINCI || ARCH_OMAP3)
+        select VIDEOBUF_DMA_CONTIG
+        help
+          Support for DMx/AMx VPFE based frame grabber. This is the
+          common V4L2 module for following DMx/AMx SoCs from Texas
+          Instruments:- DM6446, DM365, DM355 & AM3517/05.
+          To compile this driver as a module, choose M here: the
+          module will be called vpfe-capture.
+config VIDEO_DM6446_CCDC
+        tristate "DM6446 CCDC HW module"
+        depends on VIDEO_VPFE_CAPTURE
+        select VIDEO_VPSS_SYSTEM
+        default y
+        help
+           Enables DaVinci CCD hw module. DaVinci CCDC hw interfaces
+           with decoder modules such as TVP5146 over BT656 or
+           sensor module such as MT9T001 over a raw interface. This
+           module configures the interface and CCDC/ISIF to do
+           video frame capture from slave decoders.
+           To compile this driver as a module, choose M here: the
+           module will be called vpfe.
+config VIDEO_DM355_CCDC
+        tristate "DM355 CCDC HW module"
+        depends on ARCH_DAVINCI_DM355 && VIDEO_VPFE_CAPTURE
+        select VIDEO_VPSS_SYSTEM
+        default y
+        help
+           Enables DM355 CCD hw module. DM355 CCDC hw interfaces
+           with decoder modules such as TVP5146 over BT656 or
+           sensor module such as MT9T001 over a raw interface. This
+           module configures the interface and CCDC/ISIF to do
+           video frame capture from a slave decoders
+           To compile this driver as a module, choose M here: the
+           module will be called vpfe.
+config VIDEO_ISIF
+        tristate "ISIF HW module"
+        depends on ARCH_DAVINCI_DM365 && VIDEO_VPFE_CAPTURE
+        select VIDEO_VPSS_SYSTEM
+        default y
+        help
+           Enables ISIF hw module. This is the hardware module for
+           configuring ISIF in VPFE to capture Raw Bayer RGB data  from
+           a image sensor or YUV data from a YUV source.
+           To compile this driver as a module, choose M here: the
+           module will be called vpfe.
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 3a4fd8514511..ffbe544e30f4 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -158,6 +158,22 @@ static struct em28xx_reg_seq evga_indtube_digital[] = {
        { -1,                   -1,     -1,             -1},
 };
+/*
+ * KWorld PlusTV 340U and UB435-Q (ATSC) GPIOs map:
+ * EM_GPIO_0 - currently unknown
+ * EM_GPIO_1 - LED disable/enable (1 = off, 0 = on)
+ * EM_GPIO_2 - currently unknown
+ * EM_GPIO_3 - currently unknown
+ * EM_GPIO_4 - TDA18271HD/C1 tuner (1 = active, 0 = in reset)
+ * EM_GPIO_5 - LGDT3304 ATSC/QAM demod (1 = active, 0 = in reset)
+ * EM_GPIO_6 - currently unknown
+ * EM_GPIO_7 - currently unknown
+ */
+static struct em28xx_reg_seq kworld_a340_digital[] = {
+        {EM28XX_R08_GPIO,       0x6d,           ~EM_GPIO_4,     10},
+        { -1,                   -1,             -1,             -1},
+};
 /* Pinnacle Hybrid Pro eb1a:2881 */
 static struct em28xx_reg_seq pinnacle_hybrid_pro_analog[] = {
        {EM28XX_R08_GPIO,       0xfd,   ~EM_GPIO_4,     10},
@@ -1667,6 +1683,16 @@ struct em28xx_board em28xx_boards[] = {
                .tuner_gpio    = reddo_dvb_c_usb_box,
                .has_dvb       = 1,
        },
+        /* 1b80:a340 - Empia EM2870, NXP TDA18271HD and LG DT3304, sold
+         * initially as the KWorld PlusTV 340U, then as the UB435-Q.
+         * Early variants have a TDA18271HD/C1, later ones a TDA18271HD/C2 */
+        [EM2870_BOARD_KWORLD_A340] = {
+                .name       = "KWorld PlusTV 340U or UB435-Q (ATSC)",
+                .tuner_type = TUNER_ABSENT,     /* Digital-only TDA18271HD */
+                .has_dvb    = 1,
+                .dvb_gpio   = kworld_a340_digital,
+                .tuner_gpio = default_tuner_gpio,
+        },
 };
 const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards);
@@ -1788,6 +1814,8 @@ struct usb_device_id em28xx_id_table[] = {
                        .driver_info = EM2820_BOARD_IODATA_GVMVP_SZ },
        { USB_DEVICE(0xeb1a, 0x50a6),
                        .driver_info = EM2860_BOARD_GADMEI_UTV330 },
+        { USB_DEVICE(0x1b80, 0xa340),
+                        .driver_info = EM2870_BOARD_KWORLD_A340 },
        { },
 };
 MODULE_DEVICE_TABLE(usb, em28xx_id_table);
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index cf1d8c3655fc..3ac8d3025fea 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -30,11 +30,13 @@
 #include "tuner-simple.h"
 #include "lgdt330x.h"
+#include "lgdt3305.h"
 #include "zl10353.h"
 #include "s5h1409.h"
 #include "mt352.h"
 #include "mt352_priv.h" /* FIXME */
 #include "tda1002x.h"
+#include "tda18271.h"
 MODULE_DESCRIPTION("driver for em28xx based DVB cards");
 MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@infradead.org>");
@@ -231,6 +233,18 @@ static struct lgdt330x_config em2880_lgdt3303_dev = {
        .demod_chip = LGDT3303,
 };
+static struct lgdt3305_config em2870_lgdt3304_dev = {
+        .i2c_addr           = 0x0e,
+        .demod_chip         = LGDT3304,
+        .spectral_inversion = 1,
+        .deny_i2c_rptr      = 1,
+        .mpeg_mode          = LGDT3305_MPEG_PARALLEL,
+        .tpclk_edge         = LGDT3305_TPCLK_FALLING_EDGE,
+        .tpvalid_polarity   = LGDT3305_TP_VALID_HIGH,
+        .vsb_if_khz         = 3250,
+        .qam_if_khz         = 4000,
+};
 static struct zl10353_config em28xx_zl10353_with_xc3028 = {
        .demod_address = (0x1e >> 1),
        .no_tuner = 1,
@@ -247,6 +261,17 @@ static struct s5h1409_config em28xx_s5h1409_with_xc3028 = {
        .mpeg_timing   = S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK
 };
+static struct tda18271_std_map kworld_a340_std_map = {
+        .atsc_6   = { .if_freq = 3250, .agc_mode = 3, .std = 0,
+                      .if_lvl = 1, .rfagc_top = 0x37, },
+        .qam_6    = { .if_freq = 4000, .agc_mode = 3, .std = 1,
+                      .if_lvl = 1, .rfagc_top = 0x37, },
+};
+static struct tda18271_config kworld_a340_config = {
+        .std_map           = &kworld_a340_std_map,
+};
 static struct zl10353_config em28xx_zl10353_xc3028_no_i2c_gate = {
        .demod_address = (0x1e >> 1),
        .no_tuner = 1,
@@ -572,6 +597,14 @@ static int dvb_init(struct em28xx *dev)
                        }
                }
                break;
+        case EM2870_BOARD_KWORLD_A340:
+                dvb->frontend = dvb_attach(lgdt3305_attach,
+                                           &em2870_lgdt3304_dev,
+                                           &dev->i2c_adap);
+                if (dvb->frontend != NULL)
+                        dvb_attach(tda18271_attach, dvb->frontend, 0x60,
+                                   &dev->i2c_adap, &kworld_a340_config);
+                break;
        default:
                em28xx_errdev("/2: The frontend of your DVB/ATSC card"
                                " isn't supported yet\n");
diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c
index 5c3fd9411b1f..6759cd5570dd 100644
--- a/drivers/media/video/em28xx/em28xx-input.c
+++ b/drivers/media/video/em28xx/em28xx-input.c
@@ -65,17 +65,14 @@ struct em28xx_ir_poll_result {
 struct em28xx_IR {
        struct em28xx *dev;
        struct input_dev *input;
-        struct ir_input_state ir;
        char name[32];
        char phys[32];
        /* poll external decoder */
        int polling;
        struct delayed_work work;
-        unsigned int last_toggle:1;
        unsigned int full_code:1;
        unsigned int last_readcount;
-        unsigned int repeat_interval;
        int  (*get_key)(struct em28xx_IR *, struct em28xx_ir_poll_result *);
@@ -291,67 +288,39 @@ static int em2874_polling_getkey(struct em28xx_IR *ir,
 static void em28xx_ir_handle_key(struct em28xx_IR *ir)
 {
        int result;
-        int do_sendkey = 0;
        struct em28xx_ir_poll_result poll_result;
        /* read the registers containing the IR status */
        result = ir->get_key(ir, &poll_result);
-        if (result < 0) {
+        if (unlikely(result < 0)) {
                dprintk("ir->get_key() failed %d\n", result);
                return;
        }
-        dprintk("ir->get_key result tb=%02x rc=%02x lr=%02x data=%02x%02x\n",
+        if (unlikely(poll_result.read_count != ir->last_readcount)) {
-                poll_result.toggle_bit, poll_result.read_count,
+                dprintk("%s: toggle: %d, count: %d, key 0x%02x%02x\n", __func__,
-                ir->last_readcount, poll_result.rc_address,
+                        poll_result.toggle_bit, poll_result.read_count,
-                poll_result.rc_data[0]);
+                        poll_result.rc_address, poll_result.rc_data[0]);
-        if (ir->dev->chip_id == CHIP_ID_EM2874) {
-                /* The em2874 clears the readcount field every time the
-                   register is read.  The em2860/2880 datasheet says that it
-                   is supposed to clear the readcount, but it doesn't.  So with
-                   the em2874, we are looking for a non-zero read count as
-                   opposed to a readcount that is incrementing */
-                ir->last_readcount = 0;
-        }
-        if (poll_result.read_count == 0) {
-                /* The button has not been pressed since the last read */
-        } else if (ir->last_toggle != poll_result.toggle_bit) {
-                /* A button has been pressed */
-                dprintk("button has been pressed\n");
-                ir->last_toggle = poll_result.toggle_bit;
-                ir->repeat_interval = 0;
-                do_sendkey = 1;
-        } else if (poll_result.toggle_bit == ir->last_toggle &&
-                   poll_result.read_count > 0 &&
-                   poll_result.read_count != ir->last_readcount) {
-                /* The button is still being held down */
-                dprintk("button being held down\n");
-                /* Debouncer for first keypress */
-                if (ir->repeat_interval++ > 9) {
-                        /* Start repeating after 1 second */
-                        do_sendkey = 1;
-                }
-        }
-        if (do_sendkey) {
-                dprintk("sending keypress\n");
                if (ir->full_code)
-                        ir_input_keydown(ir->input, &ir->ir,
+                        ir_keydown(ir->input,
-                                         poll_result.rc_address << 8 |
+                                   poll_result.rc_address << 8 |
-                                         poll_result.rc_data[0]);
+                                   poll_result.rc_data[0],
+                                   poll_result.toggle_bit);
                else
-                        ir_input_keydown(ir->input, &ir->ir,
+                        ir_keydown(ir->input,
-                                         poll_result.rc_data[0]);
+                                   poll_result.rc_data[0],
+                                   poll_result.toggle_bit);
-                ir_input_nokey(ir->input, &ir->ir);
+                if (ir->dev->chip_id == CHIP_ID_EM2874)
+                        /* The em2874 clears the readcount field every time the
+                           register is read.  The em2860/2880 datasheet says that it
+                           is supposed to clear the readcount, but it doesn't.  So with
+                           the em2874, we are looking for a non-zero read count as
+                           opposed to a readcount that is incrementing */
+                        ir->last_readcount = 0;
+                else
+                        ir->last_readcount = poll_result.read_count;
        }
-        ir->last_readcount = poll_result.read_count;
-        return;
 }
 static void em28xx_ir_work(struct work_struct *work)
@@ -466,11 +435,6 @@ int em28xx_ir_init(struct em28xx *dev)
        usb_make_path(dev->udev, ir->phys, sizeof(ir->phys));
        strlcat(ir->phys, "/input0", sizeof(ir->phys));
-        /* Set IR protocol */
-        err = ir_input_init(input_dev, &ir->ir, IR_TYPE_OTHER);
-        if (err < 0)
-                goto err_out_free;
        input_dev->name = ir->name;
        input_dev->phys = ir->phys;
        input_dev->id.bustype = BUS_USB;
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 20090e34173a..7b9ec6e493e4 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -654,12 +654,12 @@ static inline int em28xx_isoc_copy_vbi(struct em28xx *dev, struct urb *urb)
                }
                if (buf != NULL && dev->capture_type == 2) {
-                        if (len > 4 && p[0] == 0x88 && p[1] == 0x88 &&
+                        if (len >= 4 && p[0] == 0x88 && p[1] == 0x88 &&
                            p[2] == 0x88 && p[3] == 0x88) {
                                p += 4;
                                len -= 4;
                        }
-                        if (len > 4 && p[0] == 0x22 && p[1] == 0x5a) {
+                        if (len >= 4 && p[0] == 0x22 && p[1] == 0x5a) {
                                em28xx_isocdbg("Video frame %d, len=%i, %s\n",
                                               p[2], len, (p[2] & 1) ?
                                               "odd" : "even");
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index b252d1b1b2a7..1c61a6b65d28 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -32,6 +32,7 @@
 #include <linux/i2c.h>
 #include <linux/mutex.h>
 #include <media/ir-kbd-i2c.h>
+#include <media/ir-core.h>
 #if defined(CONFIG_VIDEO_EM28XX_DVB) || defined(CONFIG_VIDEO_EM28XX_DVB_MODULE)
 #include <media/videobuf-dvb.h>
 #endif
@@ -113,6 +114,7 @@
 #define EM2870_BOARD_REDDO_DVB_C_USB_BOX          73
 #define EM2800_BOARD_VC211A                       74
 #define EM2882_BOARD_DIKOM_DK300                  75
+#define EM2870_BOARD_KWORLD_A340                  76
 /* Limits minimum and default number of buffers */
 #define EM28XX_MIN_BUF 4
diff --git a/drivers/media/video/fsl-viu.c b/drivers/media/video/fsl-viu.c
new file mode 100644
index 000000000000..8f1c94f7e00c
--- /dev/null
+++ b/drivers/media/video/fsl-viu.c
@@ -0,0 +1,1632 @@
+/*
+ * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ *  Freescale VIU video driver
+ *
+ *  Authors: Hongjun Chen <hong-jun.chen@freescale.com>
+ *           Porting to 2.6.35 by DENX Software Engineering,
+ *           Anatolij Gustschin <agust@denx.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.
+ *
+ */
+#include <linux/module.h>
+#include <linux/clk.h>
+#include <linux/kernel.h>
+#include <linux/i2c.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/of_platform.h>
+#include <linux/version.h>
+#include <media/v4l2-common.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-ioctl.h>
+#include <media/videobuf-dma-contig.h>
+#define DRV_NAME                "fsl_viu"
+#define VIU_MAJOR_VERSION       0
+#define VIU_MINOR_VERSION       5
+#define VIU_RELEASE             0
+#define VIU_VERSION             KERNEL_VERSION(VIU_MAJOR_VERSION, \
+                                               VIU_MINOR_VERSION, \
+                                               VIU_RELEASE)
+#define BUFFER_TIMEOUT          msecs_to_jiffies(500)  /* 0.5 seconds */
+#define VIU_VID_MEM_LIMIT       4       /* Video memory limit, in Mb */
+/* I2C address of video decoder chip is 0x4A */
+#define VIU_VIDEO_DECODER_ADDR  0x25
+/* supported controls */
+static struct v4l2_queryctrl viu_qctrl[] = {
+        {
+                .id            = V4L2_CID_BRIGHTNESS,
+                .type          = V4L2_CTRL_TYPE_INTEGER,
+                .name          = "Brightness",
+                .minimum       = 0,
+                .maximum       = 255,
+                .step          = 1,
+                .default_value = 127,
+                .flags         = 0,
+        }, {
+                .id            = V4L2_CID_CONTRAST,
+                .type          = V4L2_CTRL_TYPE_INTEGER,
+                .name          = "Contrast",
+                .minimum       = 0,
+                .maximum       = 255,
+                .step          = 0x1,
+                .default_value = 0x10,
+                .flags         = 0,
+        }, {
+                .id            = V4L2_CID_SATURATION,
+                .type          = V4L2_CTRL_TYPE_INTEGER,
+                .name          = "Saturation",
+                .minimum       = 0,
+                .maximum       = 255,
+                .step          = 0x1,
+                .default_value = 127,
+                .flags         = 0,
+        }, {
+                .id            = V4L2_CID_HUE,
+                .type          = V4L2_CTRL_TYPE_INTEGER,
+                .name          = "Hue",
+                .minimum       = -128,
+                .maximum       = 127,
+                .step          = 0x1,
+                .default_value = 0,
+                .flags         = 0,
+        }
+};
+static int qctl_regs[ARRAY_SIZE(viu_qctrl)];
+static int info_level;
+#define dprintk(level, fmt, arg...)                                     \
+        do {                                                            \
+                if (level <= info_level)                                \
+                        printk(KERN_DEBUG "viu: " fmt , ## arg);        \
+        } while (0)
+/*
+ * Basic structures
+ */
+struct viu_fmt {
+        char  name[32];
+        u32   fourcc;           /* v4l2 format id */
+        u32   pixelformat;
+        int   depth;
+};
+static struct viu_fmt formats[] = {
+        {
+                .name           = "RGB-16 (5/B-6/G-5/R)",
+                .fourcc         = V4L2_PIX_FMT_RGB565,
+                .pixelformat    = V4L2_PIX_FMT_RGB565,
+                .depth          = 16,
+        }, {
+                .name           = "RGB-32 (A-R-G-B)",
+                .fourcc         = V4L2_PIX_FMT_RGB32,
+                .pixelformat    = V4L2_PIX_FMT_RGB32,
+                .depth          = 32,
+        }
+};
+struct viu_dev;
+struct viu_buf;
+/* buffer for one video frame */
+struct viu_buf {
+        /* common v4l buffer stuff -- must be first */
+        struct videobuf_buffer vb;
+        struct viu_fmt *fmt;
+};
+struct viu_dmaqueue {
+        struct viu_dev          *dev;
+        struct list_head        active;
+        struct list_head        queued;
+        struct timer_list       timeout;
+};
+struct viu_status {
+        u32 field_irq;
+        u32 vsync_irq;
+        u32 hsync_irq;
+        u32 vstart_irq;
+        u32 dma_end_irq;
+        u32 error_irq;
+};
+struct viu_reg {
+        u32 status_cfg;
+        u32 luminance;
+        u32 chroma_r;
+        u32 chroma_g;
+        u32 chroma_b;
+        u32 field_base_addr;
+        u32 dma_inc;
+        u32 picture_count;
+        u32 req_alarm;
+        u32 alpha;
+} __attribute__ ((packed));
+struct viu_dev {
+        struct v4l2_device      v4l2_dev;
+        struct mutex            lock;
+        spinlock_t              slock;
+        int                     users;
+        struct device           *dev;
+        /* various device info */
+        struct video_device     *vdev;
+        struct viu_dmaqueue     vidq;
+        enum v4l2_field         capfield;
+        int                     field;
+        int                     first;
+        int                     dma_done;
+        /* Hardware register area */
+        struct viu_reg          *vr;
+        /* Interrupt vector */
+        int                     irq;
+        struct viu_status       irqs;
+        /* video overlay */
+        struct v4l2_framebuffer ovbuf;
+        struct viu_fmt          *ovfmt;
+        unsigned int            ovenable;
+        enum v4l2_field         ovfield;
+        /* crop */
+        struct v4l2_rect        crop_current;
+        /* clock pointer */
+        struct clk              *clk;
+        /* decoder */
+        struct v4l2_subdev      *decoder;
+};
+struct viu_fh {
+        struct viu_dev          *dev;
+        /* video capture */
+        struct videobuf_queue   vb_vidq;
+        spinlock_t              vbq_lock; /* spinlock for the videobuf queue */
+        /* video overlay */
+        struct v4l2_window      win;
+        struct v4l2_clip        clips[1];
+        /* video capture */
+        struct viu_fmt          *fmt;
+        int                     width, height, sizeimage;
+        enum v4l2_buf_type      type;
+};
+static struct viu_reg reg_val;
+/*
+ * Macro definitions of VIU registers
+ */
+/* STATUS_CONFIG register */
+enum status_config {
+        SOFT_RST                = 1 << 0,
+        ERR_MASK                = 0x0f << 4,    /* Error code mask */
+        ERR_NO                  = 0x00,         /* No error */
+        ERR_DMA_V               = 0x01 << 4,    /* DMA in vertical active */
+        ERR_DMA_VB              = 0x02 << 4,    /* DMA in vertical blanking */
+        ERR_LINE_TOO_LONG       = 0x04 << 4,    /* Line too long */
+        ERR_TOO_MANG_LINES      = 0x05 << 4,    /* Too many lines in field */
+        ERR_LINE_TOO_SHORT      = 0x06 << 4,    /* Line too short */
+        ERR_NOT_ENOUGH_LINE     = 0x07 << 4,    /* Not enough lines in field */
+        ERR_FIFO_OVERFLOW       = 0x08 << 4,    /* FIFO overflow */
+        ERR_FIFO_UNDERFLOW      = 0x09 << 4,    /* FIFO underflow */
+        ERR_1bit_ECC            = 0x0a << 4,    /* One bit ECC error */
+        ERR_MORE_ECC            = 0x0b << 4,    /* Two/more bits ECC error */
+        INT_FIELD_EN            = 0x01 << 8,    /* Enable field interrupt */
+        INT_VSYNC_EN            = 0x01 << 9,    /* Enable vsync interrupt */
+        INT_HSYNC_EN            = 0x01 << 10,   /* Enable hsync interrupt */
+        INT_VSTART_EN           = 0x01 << 11,   /* Enable vstart interrupt */
+        INT_DMA_END_EN          = 0x01 << 12,   /* Enable DMA end interrupt */
+        INT_ERROR_EN            = 0x01 << 13,   /* Enable error interrupt */
+        INT_ECC_EN              = 0x01 << 14,   /* Enable ECC interrupt */
+        INT_FIELD_STATUS        = 0x01 << 16,   /* field interrupt status */
+        INT_VSYNC_STATUS        = 0x01 << 17,   /* vsync interrupt status */
+        INT_HSYNC_STATUS        = 0x01 << 18,   /* hsync interrupt status */
+        INT_VSTART_STATUS       = 0x01 << 19,   /* vstart interrupt status */
+        INT_DMA_END_STATUS      = 0x01 << 20,   /* DMA end interrupt status */
+        INT_ERROR_STATUS        = 0x01 << 21,   /* error interrupt status */
+        DMA_ACT                 = 0x01 << 27,   /* Enable DMA transfer */
+        FIELD_NO                = 0x01 << 28,   /* Field number */
+        DITHER_ON               = 0x01 << 29,   /* Dithering is on */
+        ROUND_ON                = 0x01 << 30,   /* Round is on */
+        MODE_32BIT              = 0x01 << 31,   /* Data in RGBa888,
+                                                 * 0 in RGB565
+                                                 */
+};
+#define norm_maxw()     720
+#define norm_maxh()     576
+#define INT_ALL_STATUS  (INT_FIELD_STATUS | INT_VSYNC_STATUS | \
+                         INT_HSYNC_STATUS | INT_VSTART_STATUS | \
+                         INT_DMA_END_STATUS | INT_ERROR_STATUS)
+#define NUM_FORMATS     ARRAY_SIZE(formats)
+static irqreturn_t viu_intr(int irq, void *dev_id);
+struct viu_fmt *format_by_fourcc(int fourcc)
+{
+        int i;
+        for (i = 0; i < NUM_FORMATS; i++) {
+                if (formats[i].pixelformat == fourcc)
+                        return formats + i;
+        }
+        dprintk(0, "unknown pixelformat:'%4.4s'\n", (char *)&fourcc);
+        return NULL;
+}
+void viu_start_dma(struct viu_dev *dev)
+{
+        struct viu_reg *vr = dev->vr;
+        dev->field = 0;
+        /* Enable DMA operation */
+        out_be32(&vr->status_cfg, SOFT_RST);
+        out_be32(&vr->status_cfg, INT_FIELD_EN);
+}
+void viu_stop_dma(struct viu_dev *dev)
+{
+        struct viu_reg *vr = dev->vr;
+        int cnt = 100;
+        u32 status_cfg;
+        out_be32(&vr->status_cfg, 0);
+        /* Clear pending interrupts */
+        status_cfg = in_be32(&vr->status_cfg);
+        if (status_cfg & 0x3f0000)
+                out_be32(&vr->status_cfg, status_cfg & 0x3f0000);
+        if (status_cfg & DMA_ACT) {
+                do {
+                        status_cfg = in_be32(&vr->status_cfg);
+                        if (status_cfg & INT_DMA_END_STATUS)
+                                break;
+                } while (cnt--);
+                if (cnt < 0) {
+                        /* timed out, issue soft reset */
+                        out_be32(&vr->status_cfg, SOFT_RST);
+                        out_be32(&vr->status_cfg, 0);
+                } else {
+                        /* clear DMA_END and other pending irqs */
+                        out_be32(&vr->status_cfg, status_cfg & 0x3f0000);
+                }
+        }
+        dev->field = 0;
+}
+static int restart_video_queue(struct viu_dmaqueue *vidq)
+{
+        struct viu_buf *buf, *prev;
+        dprintk(1, "%s vidq=0x%08lx\n", __func__, (unsigned long)vidq);
+        if (!list_empty(&vidq->active)) {
+                buf = list_entry(vidq->active.next, struct viu_buf, vb.queue);
+                dprintk(2, "restart_queue [%p/%d]: restart dma\n",
+                        buf, buf->vb.i);
+                viu_stop_dma(vidq->dev);
+                /* cancel all outstanding capture requests */
+                list_for_each_entry_safe(buf, prev, &vidq->active, vb.queue) {
+                        list_del(&buf->vb.queue);
+                        buf->vb.state = VIDEOBUF_ERROR;
+                        wake_up(&buf->vb.done);
+                }
+                mod_timer(&vidq->timeout, jiffies+BUFFER_TIMEOUT);
+                return 0;
+        }
+        prev = NULL;
+        for (;;) {
+                if (list_empty(&vidq->queued))
+                        return 0;
+                buf = list_entry(vidq->queued.next, struct viu_buf, vb.queue);
+                if (prev == NULL) {
+                        list_del(&buf->vb.queue);
+                        list_add_tail(&buf->vb.queue, &vidq->active);
+                        dprintk(1, "Restarting video dma\n");
+                        viu_stop_dma(vidq->dev);
+                        viu_start_dma(vidq->dev);
+                        buf->vb.state = VIDEOBUF_ACTIVE;
+                        mod_timer(&vidq->timeout, jiffies+BUFFER_TIMEOUT);
+                        dprintk(2, "[%p/%d] restart_queue - first active\n",
+                                buf, buf->vb.i);
+                } else if (prev->vb.width  == buf->vb.width  &&
+                           prev->vb.height == buf->vb.height &&
+                           prev->fmt       == buf->fmt) {
+                        list_del(&buf->vb.queue);
+                        list_add_tail(&buf->vb.queue, &vidq->active);
+                        buf->vb.state = VIDEOBUF_ACTIVE;
+                        dprintk(2, "[%p/%d] restart_queue - move to active\n",
+                                buf, buf->vb.i);
+                } else {
+                        return 0;
+                }
+                prev = buf;
+        }
+}
+static void viu_vid_timeout(unsigned long data)
+{
+        struct viu_dev *dev = (struct viu_dev *)data;
+        struct viu_buf *buf;
+        struct viu_dmaqueue *vidq = &dev->vidq;
+        while (!list_empty(&vidq->active)) {
+                buf = list_entry(vidq->active.next, struct viu_buf, vb.queue);
+                list_del(&buf->vb.queue);
+                buf->vb.state = VIDEOBUF_ERROR;
+                wake_up(&buf->vb.done);
+                dprintk(1, "viu/0: [%p/%d] timeout\n", buf, buf->vb.i);
+        }
+        restart_video_queue(vidq);
+}
+/*
+ * Videobuf operations
+ */
+static int buffer_setup(struct videobuf_queue *vq, unsigned int *count,
+                        unsigned int *size)
+{
+        struct viu_fh *fh = vq->priv_data;
+        *size = fh->width * fh->height * fh->fmt->depth >> 3;
+        if (*count == 0)
+                *count = 32;
+        while (*size * *count > VIU_VID_MEM_LIMIT * 1024 * 1024)
+                (*count)--;
+        dprintk(1, "%s, count=%d, size=%d\n", __func__, *count, *size);
+        return 0;
+}
+static void free_buffer(struct videobuf_queue *vq, struct viu_buf *buf)
+{
+        struct videobuf_buffer *vb = &buf->vb;
+        void *vaddr = NULL;
+        BUG_ON(in_interrupt());
+        videobuf_waiton(&buf->vb, 0, 0);
+        if (vq->int_ops && vq->int_ops->vaddr)
+                vaddr = vq->int_ops->vaddr(vb);
+        if (vaddr)
+                videobuf_dma_contig_free(vq, &buf->vb);
+        buf->vb.state = VIDEOBUF_NEEDS_INIT;
+}
+inline int buffer_activate(struct viu_dev *dev, struct viu_buf *buf)
+{
+        struct viu_reg *vr = dev->vr;
+        int bpp;
+        /* setup the DMA base address */
+        reg_val.field_base_addr = videobuf_to_dma_contig(&buf->vb);
+        dprintk(1, "buffer_activate [%p/%d]: dma addr 0x%lx\n",
+                buf, buf->vb.i, (unsigned long)reg_val.field_base_addr);
+        /* interlace is on by default, set horizontal DMA increment */
+        reg_val.status_cfg = 0;
+        bpp = buf->fmt->depth >> 3;
+        switch (bpp) {
+        case 2:
+                reg_val.status_cfg &= ~MODE_32BIT;
+                reg_val.dma_inc = buf->vb.width * 2;
+                break;
+        case 4:
+                reg_val.status_cfg |= MODE_32BIT;
+                reg_val.dma_inc = buf->vb.width * 4;
+                break;
+        default:
+                dprintk(0, "doesn't support color depth(%d)\n",
+                        bpp * 8);
+                return -EINVAL;
+        }
+        /* setup picture_count register */
+        reg_val.picture_count = (buf->vb.height / 2) << 16 |
+                                buf->vb.width;
+        reg_val.status_cfg |= DMA_ACT | INT_DMA_END_EN | INT_FIELD_EN;
+        buf->vb.state = VIDEOBUF_ACTIVE;
+        dev->capfield = buf->vb.field;
+        /* reset dma increment if needed */
+        if (!V4L2_FIELD_HAS_BOTH(buf->vb.field))
+                reg_val.dma_inc = 0;
+        out_be32(&vr->dma_inc, reg_val.dma_inc);
+        out_be32(&vr->picture_count, reg_val.picture_count);
+        out_be32(&vr->field_base_addr, reg_val.field_base_addr);
+        mod_timer(&dev->vidq.timeout, jiffies + BUFFER_TIMEOUT);
+        return 0;
+}
+static int buffer_prepare(struct videobuf_queue *vq,
+                          struct videobuf_buffer *vb,
+                          enum v4l2_field field)
+{
+        struct viu_fh  *fh  = vq->priv_data;
+        struct viu_buf *buf = container_of(vb, struct viu_buf, vb);
+        int rc;
+        BUG_ON(fh->fmt == NULL);
+        if (fh->width  < 48 || fh->width  > norm_maxw() ||
+            fh->height < 32 || fh->height > norm_maxh())
+                return -EINVAL;
+        buf->vb.size = (fh->width * fh->height * fh->fmt->depth) >> 3;
+        if (buf->vb.baddr != 0 && buf->vb.bsize < buf->vb.size)
+                return -EINVAL;
+        if (buf->fmt       != fh->fmt    ||
+            buf->vb.width  != fh->width  ||
+            buf->vb.height != fh->height ||
+            buf->vb.field  != field) {
+                buf->fmt       = fh->fmt;
+                buf->vb.width  = fh->width;
+                buf->vb.height = fh->height;
+                buf->vb.field  = field;
+        }
+        if (buf->vb.state == VIDEOBUF_NEEDS_INIT) {
+                rc = videobuf_iolock(vq, &buf->vb, NULL);
+                if (rc != 0)
+                        goto fail;
+                buf->vb.width  = fh->width;
+                buf->vb.height = fh->height;
+                buf->vb.field  = field;
+                buf->fmt       = fh->fmt;
+        }
+        buf->vb.state = VIDEOBUF_PREPARED;
+        return 0;
+fail:
+        free_buffer(vq, buf);
+        return rc;
+}
+static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
+{
+        struct viu_buf       *buf     = container_of(vb, struct viu_buf, vb);
+        struct viu_fh        *fh      = vq->priv_data;
+        struct viu_dev       *dev     = fh->dev;
+        struct viu_dmaqueue  *vidq    = &dev->vidq;
+        struct viu_buf       *prev;
+        if (!list_empty(&vidq->queued)) {
+                dprintk(1, "adding vb queue=0x%08lx\n",
+                                (unsigned long)&buf->vb.queue);
+                dprintk(1, "vidq pointer 0x%p, queued 0x%p\n",
+                                vidq, &vidq->queued);
+                dprintk(1, "dev %p, queued: self %p, next %p, head %p\n",
+                        dev, &vidq->queued, vidq->queued.next,
+                        vidq->queued.prev);
+                list_add_tail(&buf->vb.queue, &vidq->queued);
+                buf->vb.state = VIDEOBUF_QUEUED;
+                dprintk(2, "[%p/%d] buffer_queue - append to queued\n",
+                        buf, buf->vb.i);
+        } else if (list_empty(&vidq->active)) {
+                dprintk(1, "adding vb active=0x%08lx\n",
+                                (unsigned long)&buf->vb.queue);
+                list_add_tail(&buf->vb.queue, &vidq->active);
+                buf->vb.state = VIDEOBUF_ACTIVE;
+                mod_timer(&vidq->timeout, jiffies+BUFFER_TIMEOUT);
+                dprintk(2, "[%p/%d] buffer_queue - first active\n",
+                        buf, buf->vb.i);
+                buffer_activate(dev, buf);
+        } else {
+                dprintk(1, "adding vb queue2=0x%08lx\n",
+                                (unsigned long)&buf->vb.queue);
+                prev = list_entry(vidq->active.prev, struct viu_buf, vb.queue);
+                if (prev->vb.width  == buf->vb.width  &&
+                    prev->vb.height == buf->vb.height &&
+                    prev->fmt       == buf->fmt) {
+                        list_add_tail(&buf->vb.queue, &vidq->active);
+                        buf->vb.state = VIDEOBUF_ACTIVE;
+                        dprintk(2, "[%p/%d] buffer_queue - append to active\n",
+                                buf, buf->vb.i);
+                } else {
+                        list_add_tail(&buf->vb.queue, &vidq->queued);
+                        buf->vb.state = VIDEOBUF_QUEUED;
+                        dprintk(2, "[%p/%d] buffer_queue - first queued\n",
+                                buf, buf->vb.i);
+                }
+        }
+}
+static void buffer_release(struct videobuf_queue *vq,
+                                struct videobuf_buffer *vb)
+{
+        struct viu_buf *buf  = container_of(vb, struct viu_buf, vb);
+        struct viu_fh  *fh   = vq->priv_data;
+        struct viu_dev *dev  = (struct viu_dev *)fh->dev;
+        viu_stop_dma(dev);
+        free_buffer(vq, buf);
+}
+static struct videobuf_queue_ops viu_video_qops = {
+        .buf_setup      = buffer_setup,
+        .buf_prepare    = buffer_prepare,
+        .buf_queue      = buffer_queue,
+        .buf_release    = buffer_release,
+};
+/*
+ * IOCTL vidioc handling
+ */
+static int vidioc_querycap(struct file *file, void *priv,
+                           struct v4l2_capability *cap)
+{
+        strcpy(cap->driver, "viu");
+        strcpy(cap->card, "viu");
+        cap->version = VIU_VERSION;
+        cap->capabilities =     V4L2_CAP_VIDEO_CAPTURE |
+                                V4L2_CAP_STREAMING     |
+                                V4L2_CAP_VIDEO_OVERLAY |
+                                V4L2_CAP_READWRITE;
+        return 0;
+}
+static int vidioc_enum_fmt(struct file *file, void  *priv,
+                                        struct v4l2_fmtdesc *f)
+{
+        int index = f->index;
+        if (f->index > NUM_FORMATS)
+                return -EINVAL;
+        strlcpy(f->description, formats[index].name, sizeof(f->description));
+        f->pixelformat = formats[index].fourcc;
+        return 0;
+}
+static int vidioc_g_fmt_cap(struct file *file, void *priv,
+                                        struct v4l2_format *f)
+{
+        struct viu_fh *fh = priv;
+        f->fmt.pix.width        = fh->width;
+        f->fmt.pix.height       = fh->height;
+        f->fmt.pix.field        = fh->vb_vidq.field;
+        f->fmt.pix.pixelformat  = fh->fmt->pixelformat;
+        f->fmt.pix.bytesperline =
+                        (f->fmt.pix.width * fh->fmt->depth) >> 3;
+        f->fmt.pix.sizeimage    = fh->sizeimage;
+        return 0;
+}
+static int vidioc_try_fmt_cap(struct file *file, void *priv,
+                                        struct v4l2_format *f)
+{
+        struct viu_fmt *fmt;
+        enum v4l2_field field;
+        unsigned int maxw, maxh;
+        fmt = format_by_fourcc(f->fmt.pix.pixelformat);
+        if (!fmt) {
+                dprintk(1, "Fourcc format (0x%08x) invalid.",
+                        f->fmt.pix.pixelformat);
+                return -EINVAL;
+        }
+        field = f->fmt.pix.field;
+        if (field == V4L2_FIELD_ANY) {
+                field = V4L2_FIELD_INTERLACED;
+        } else if (field != V4L2_FIELD_INTERLACED) {
+                dprintk(1, "Field type invalid.\n");
+                return -EINVAL;
+        }
+        maxw  = norm_maxw();
+        maxh  = norm_maxh();
+        f->fmt.pix.field = field;
+        if (f->fmt.pix.height < 32)
+                f->fmt.pix.height = 32;
+        if (f->fmt.pix.height > maxh)
+                f->fmt.pix.height = maxh;
+        if (f->fmt.pix.width < 48)
+                f->fmt.pix.width = 48;
+        if (f->fmt.pix.width > maxw)
+                f->fmt.pix.width = maxw;
+        f->fmt.pix.width &= ~0x03;
+        f->fmt.pix.bytesperline =
+                (f->fmt.pix.width * fmt->depth) >> 3;
+        return 0;
+}
+static int vidioc_s_fmt_cap(struct file *file, void *priv,
+                                        struct v4l2_format *f)
+{
+        struct viu_fh *fh = priv;
+        int ret;
+        ret = vidioc_try_fmt_cap(file, fh, f);
+        if (ret < 0)
+                return ret;
+        fh->fmt           = format_by_fourcc(f->fmt.pix.pixelformat);
+        fh->width         = f->fmt.pix.width;
+        fh->height        = f->fmt.pix.height;
+        fh->sizeimage     = f->fmt.pix.sizeimage;
+        fh->vb_vidq.field = f->fmt.pix.field;
+        fh->type          = f->type;
+        dprintk(1, "set to pixelformat '%4.6s'\n", (char *)&fh->fmt->name);
+        return 0;
+}
+static int vidioc_g_fmt_overlay(struct file *file, void *priv,
+                                        struct v4l2_format *f)
+{
+        struct viu_fh *fh = priv;
+        f->fmt.win = fh->win;
+        return 0;
+}
+static int verify_preview(struct viu_dev *dev, struct v4l2_window *win)
+{
+        enum v4l2_field field;
+        int maxw, maxh;
+        if (dev->ovbuf.base == NULL)
+                return -EINVAL;
+        if (dev->ovfmt == NULL)
+                return -EINVAL;
+        if (win->w.width < 48 || win->w.height < 32)
+                return -EINVAL;
+        field = win->field;
+        maxw  = dev->crop_current.width;
+        maxh  = dev->crop_current.height;
+        if (field == V4L2_FIELD_ANY) {
+                field = (win->w.height > maxh/2)
+                        ? V4L2_FIELD_INTERLACED
+                        : V4L2_FIELD_TOP;
+        }
+        switch (field) {
+        case V4L2_FIELD_TOP:
+        case V4L2_FIELD_BOTTOM:
+                maxh = maxh / 2;
+                break;
+        case V4L2_FIELD_INTERLACED:
+                break;
+        default:
+                return -EINVAL;
+        }
+        win->field = field;
+        if (win->w.width > maxw)
+                win->w.width = maxw;
+        if (win->w.height > maxh)
+                win->w.height = maxh;
+        return 0;
+}
+inline void viu_activate_overlay(struct viu_reg *viu_reg)
+{
+        struct viu_reg *vr = viu_reg;
+        out_be32(&vr->field_base_addr, reg_val.field_base_addr);
+        out_be32(&vr->dma_inc, reg_val.dma_inc);
+        out_be32(&vr->picture_count, reg_val.picture_count);
+}
+static int viu_start_preview(struct viu_dev *dev, struct viu_fh *fh)
+{
+        int bpp;
+        dprintk(1, "%s %dx%d %s\n", __func__,
+                fh->win.w.width, fh->win.w.height, dev->ovfmt->name);
+        reg_val.status_cfg = 0;
+        /* setup window */
+        reg_val.picture_count = (fh->win.w.height / 2) << 16 |
+                                fh->win.w.width;
+        /* setup color depth and dma increment */
+        bpp = dev->ovfmt->depth / 8;
+        switch (bpp) {
+        case 2:
+                reg_val.status_cfg &= ~MODE_32BIT;
+                reg_val.dma_inc = fh->win.w.width * 2;
+                break;
+        case 4:
+                reg_val.status_cfg |= MODE_32BIT;
+                reg_val.dma_inc = fh->win.w.width * 4;
+                break;
+        default:
+                dprintk(0, "device doesn't support color depth(%d)\n",
+                        bpp * 8);
+                return -EINVAL;
+        }
+        dev->ovfield = fh->win.field;
+        if (!V4L2_FIELD_HAS_BOTH(dev->ovfield))
+                reg_val.dma_inc = 0;
+        reg_val.status_cfg |= DMA_ACT | INT_DMA_END_EN | INT_FIELD_EN;
+        /* setup the base address of the overlay buffer */
+        reg_val.field_base_addr = (u32)dev->ovbuf.base;
+        dev->ovenable = 1;
+        viu_activate_overlay(dev->vr);
+        /* start dma */
+        viu_start_dma(dev);
+        return 0;
+}
+static int vidioc_s_fmt_overlay(struct file *file, void *priv,
+                                        struct v4l2_format *f)
+{
+        struct viu_fh  *fh  = priv;
+        struct viu_dev *dev = (struct viu_dev *)fh->dev;
+        unsigned long  flags;
+        int err;
+        err = verify_preview(dev, &f->fmt.win);
+        if (err)
+                return err;
+        mutex_lock(&dev->lock);
+        fh->win = f->fmt.win;
+        spin_lock_irqsave(&dev->slock, flags);
+        viu_start_preview(dev, fh);
+        spin_unlock_irqrestore(&dev->slock, flags);
+        mutex_unlock(&dev->lock);
+        return 0;
+}
+static int vidioc_try_fmt_overlay(struct file *file, void *priv,
+                                        struct v4l2_format *f)
+{
+        return 0;
+}
+int vidioc_g_fbuf(struct file *file, void *priv, struct v4l2_framebuffer *arg)
+{
+        struct viu_fh  *fh = priv;
+        struct viu_dev *dev = fh->dev;
+        struct v4l2_framebuffer *fb = arg;
+        *fb = dev->ovbuf;
+        fb->capability = V4L2_FBUF_CAP_LIST_CLIPPING;
+        return 0;
+}
+int vidioc_s_fbuf(struct file *file, void *priv, struct v4l2_framebuffer *arg)
+{
+        struct viu_fh  *fh = priv;
+        struct viu_dev *dev = fh->dev;
+        struct v4l2_framebuffer *fb = arg;
+        struct viu_fmt *fmt;
+        if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RAWIO))
+                return -EPERM;
+        /* check args */
+        fmt = format_by_fourcc(fb->fmt.pixelformat);
+        if (fmt == NULL)
+                return -EINVAL;
+        /* ok, accept it */
+        dev->ovbuf = *fb;
+        dev->ovfmt = fmt;
+        if (dev->ovbuf.fmt.bytesperline == 0) {
+                dev->ovbuf.fmt.bytesperline =
+                        dev->ovbuf.fmt.width * fmt->depth / 8;
+        }
+        return 0;
+}
+static int vidioc_reqbufs(struct file *file, void *priv,
+                                struct v4l2_requestbuffers *p)
+{
+        struct viu_fh *fh = priv;
+        return videobuf_reqbufs(&fh->vb_vidq, p);
+}
+static int vidioc_querybuf(struct file *file, void *priv,
+                                        struct v4l2_buffer *p)
+{
+        struct viu_fh *fh = priv;
+        return videobuf_querybuf(&fh->vb_vidq, p);
+}
+static int vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *p)
+{
+        struct viu_fh *fh = priv;
+        return videobuf_qbuf(&fh->vb_vidq, p);
+}
+static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p)
+{
+        struct viu_fh *fh = priv;
+        return videobuf_dqbuf(&fh->vb_vidq, p,
+                                file->f_flags & O_NONBLOCK);
+}
+static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+        struct viu_fh *fh = priv;
+        if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
+        if (fh->type != i)
+                return -EINVAL;
+        return videobuf_streamon(&fh->vb_vidq);
+}
+static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
+{
+        struct viu_fh  *fh = priv;
+        if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
+        if (fh->type != i)
+                return -EINVAL;
+        return videobuf_streamoff(&fh->vb_vidq);
+}
+#define decoder_call(viu, o, f, args...) \
+        v4l2_subdev_call(viu->decoder, o, f, ##args)
+static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *id)
+{
+        struct viu_fh *fh = priv;
+        decoder_call(fh->dev, core, s_std, *id);
+        return 0;
+}
+/* only one input in this driver */
+static int vidioc_enum_input(struct file *file, void *priv,
+                                        struct v4l2_input *inp)
+{
+        struct viu_fh *fh = priv;
+        if (inp->index != 0)
+                return -EINVAL;
+        inp->type = V4L2_INPUT_TYPE_CAMERA;
+        inp->std = fh->dev->vdev->tvnorms;
+        strcpy(inp->name, "Camera");
+        return 0;
+}
+static int vidioc_g_input(struct file *file, void *priv, unsigned int *i)
+{
+        *i = 0;
+        return 0;
+}
+static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
+{
+        struct viu_fh *fh = priv;
+        if (i > 1)
+                return -EINVAL;
+        decoder_call(fh->dev, video, s_routing, i, 0, 0);
+        return 0;
+}
+/* Controls */
+static int vidioc_queryctrl(struct file *file, void *priv,
+                                struct v4l2_queryctrl *qc)
+{
+        int i;
+        for (i = 0; i < ARRAY_SIZE(viu_qctrl); i++) {
+                if (qc->id && qc->id == viu_qctrl[i].id) {
+                        memcpy(qc, &(viu_qctrl[i]), sizeof(*qc));
+                        return 0;
+                }
+        }
+        return -EINVAL;
+}
+static int vidioc_g_ctrl(struct file *file, void *priv,
+                                struct v4l2_control *ctrl)
+{
+        int i;
+        for (i = 0; i < ARRAY_SIZE(viu_qctrl); i++) {
+                if (ctrl->id == viu_qctrl[i].id) {
+                        ctrl->value = qctl_regs[i];
+                        return 0;
+                }
+        }
+        return -EINVAL;
+}
+static int vidioc_s_ctrl(struct file *file, void *priv,
+                                struct v4l2_control *ctrl)
+{
+        int i;
+        for (i = 0; i < ARRAY_SIZE(viu_qctrl); i++) {
+                if (ctrl->id == viu_qctrl[i].id) {
+                        if (ctrl->value < viu_qctrl[i].minimum
+                                || ctrl->value > viu_qctrl[i].maximum)
+                                        return -ERANGE;
+                        qctl_regs[i] = ctrl->value;
+                        return 0;
+                }
+        }
+        return -EINVAL;
+}
+inline void viu_activate_next_buf(struct viu_dev *dev,
+                                struct viu_dmaqueue *viuq)
+{
+        struct viu_dmaqueue *vidq = viuq;
+        struct viu_buf *buf;
+        /* launch another DMA operation for an active/queued buffer */
+        if (!list_empty(&vidq->active)) {
+                buf = list_entry(vidq->active.next, struct viu_buf,
+                                        vb.queue);
+                dprintk(1, "start another queued buffer: 0x%p\n", buf);
+                buffer_activate(dev, buf);
+        } else if (!list_empty(&vidq->queued)) {
+                buf = list_entry(vidq->queued.next, struct viu_buf,
+                                        vb.queue);
+                list_del(&buf->vb.queue);
+                dprintk(1, "start another queued buffer: 0x%p\n", buf);
+                list_add_tail(&buf->vb.queue, &vidq->active);
+                buf->vb.state = VIDEOBUF_ACTIVE;
+                buffer_activate(dev, buf);
+        }
+}
+inline void viu_default_settings(struct viu_reg *viu_reg)
+{
+        struct viu_reg *vr = viu_reg;
+        out_be32(&vr->luminance, 0x9512A254);
+        out_be32(&vr->chroma_r, 0x03310000);
+        out_be32(&vr->chroma_g, 0x06600F38);
+        out_be32(&vr->chroma_b, 0x00000409);
+        out_be32(&vr->alpha, 0x000000ff);
+        out_be32(&vr->req_alarm, 0x00000090);
+        dprintk(1, "status reg: 0x%08x, field base: 0x%08x\n",
+                in_be32(&vr->status_cfg), in_be32(&vr->field_base_addr));
+}
+static void viu_overlay_intr(struct viu_dev *dev, u32 status)
+{
+        struct viu_reg *vr = dev->vr;
+        if (status & INT_DMA_END_STATUS)
+                dev->dma_done = 1;
+        if (status & INT_FIELD_STATUS) {
+                if (dev->dma_done) {
+                        u32 addr = reg_val.field_base_addr;
+                        dev->dma_done = 0;
+                        if (status & FIELD_NO)
+                                addr += reg_val.dma_inc;
+                        out_be32(&vr->field_base_addr, addr);
+                        out_be32(&vr->dma_inc, reg_val.dma_inc);
+                        out_be32(&vr->status_cfg,
+                                 (status & 0xffc0ffff) |
+                                 (status & INT_ALL_STATUS) |
+                                 reg_val.status_cfg);
+                } else if (status & INT_VSYNC_STATUS) {
+                        out_be32(&vr->status_cfg,
+                                 (status & 0xffc0ffff) |
+                                 (status & INT_ALL_STATUS) |
+                                 reg_val.status_cfg);
+                }
+        }
+}
+static void viu_capture_intr(struct viu_dev *dev, u32 status)
+{
+        struct viu_dmaqueue *vidq = &dev->vidq;
+        struct viu_reg *vr = dev->vr;
+        struct viu_buf *buf;
+        int field_num;
+        int need_two;
+        int dma_done = 0;
+        field_num = status & FIELD_NO;
+        need_two = V4L2_FIELD_HAS_BOTH(dev->capfield);
+        if (status & INT_DMA_END_STATUS) {
+                dma_done = 1;
+                if (((field_num == 0) && (dev->field == 0)) ||
+                    (field_num && (dev->field == 1)))
+                        dev->field++;
+        }
+        if (status & INT_FIELD_STATUS) {
+                dprintk(1, "irq: field %d, done %d\n",
+                        !!field_num, dma_done);
+                if (unlikely(dev->first)) {
+                        if (field_num == 0) {
+                                dev->first = 0;
+                                dprintk(1, "activate first buf\n");
+                                viu_activate_next_buf(dev, vidq);
+                        } else
+                                dprintk(1, "wait field 0\n");
+                        return;
+                }
+                /* setup buffer address for next dma operation */
+                if (!list_empty(&vidq->active)) {
+                        u32 addr = reg_val.field_base_addr;
+                        if (field_num && need_two) {
+                                addr += reg_val.dma_inc;
+                                dprintk(1, "field 1, 0x%lx, dev field %d\n",
+                                        (unsigned long)addr, dev->field);
+                        }
+                        out_be32(&vr->field_base_addr, addr);
+                        out_be32(&vr->dma_inc, reg_val.dma_inc);
+                        out_be32(&vr->status_cfg,
+                                 (status & 0xffc0ffff) |
+                                 (status & INT_ALL_STATUS) |
+                                 reg_val.status_cfg);
+                        return;
+                }
+        }
+        if (dma_done && field_num && (dev->field == 2)) {
+                dev->field = 0;
+                buf = list_entry(vidq->active.next,
+                                 struct viu_buf, vb.queue);
+                dprintk(1, "viu/0: [%p/%d] 0x%lx/0x%lx: dma complete\n",
+                        buf, buf->vb.i,
+                        (unsigned long)videobuf_to_dma_contig(&buf->vb),
+                        (unsigned long)in_be32(&vr->field_base_addr));
+                if (waitqueue_active(&buf->vb.done)) {
+                        list_del(&buf->vb.queue);
+                        do_gettimeofday(&buf->vb.ts);
+                        buf->vb.state = VIDEOBUF_DONE;
+                        buf->vb.field_count++;
+                        wake_up(&buf->vb.done);
+                }
+                /* activate next dma buffer */
+                viu_activate_next_buf(dev, vidq);
+        }
+}
+static irqreturn_t viu_intr(int irq, void *dev_id)
+{
+        struct viu_dev *dev  = (struct viu_dev *)dev_id;
+        struct viu_reg *vr = dev->vr;
+        u32 status;
+        u32 error;
+        status = in_be32(&vr->status_cfg);
author	Amir Goldstein <amir73il@gmail.com>	2018-06-23 10:54:50 -0400
committer	Jan Kara <jack@suse.cz>	2018-06-27 07:45:07 -0400
commit	3ac70bfcde812b1b97d8a88a832df59941fa293f (patch)
tree	52dad7896f274af1f4e12fc87997994387e12333 /fs/filesystems.c
parent	36f10f55ff1d2867bfc48ed898a9cc0dc6b49dd2 (diff)