181 files changed, 4161 insertions, 1507 deletions
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index ba9afeaa23ac..25d3aaebc10d 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -100,24 +100,7 @@ static const struct file_operations acpi_ac_fops = {
        .release = single_release,
 };
 #endif
-static int get_ac_property(struct power_supply *psy,
-                           enum power_supply_property psp,
-                           union power_supply_propval *val)
-{
-        struct acpi_ac *ac = to_acpi_ac(psy);
-        switch (psp) {
-        case POWER_SUPPLY_PROP_ONLINE:
-                val->intval = ac->state;
-                break;
-        default:
-                return -EINVAL;
-        }
-        return 0;
-}
-static enum power_supply_property ac_props[] = {
-        POWER_SUPPLY_PROP_ONLINE,
-};
 /* --------------------------------------------------------------------------
                               AC Adapter Management
   -------------------------------------------------------------------------- */
@@ -140,6 +123,35 @@ static int acpi_ac_get_state(struct acpi_ac *ac)
        return 0;
 }
+/* --------------------------------------------------------------------------
+                            sysfs I/F
+   -------------------------------------------------------------------------- */
+static int get_ac_property(struct power_supply *psy,
+                           enum power_supply_property psp,
+                           union power_supply_propval *val)
+{
+        struct acpi_ac *ac = to_acpi_ac(psy);
+        if (!ac)
+                return -ENODEV;
+        if (acpi_ac_get_state(ac))
+                return -ENODEV;
+        switch (psp) {
+        case POWER_SUPPLY_PROP_ONLINE:
+                val->intval = ac->state;
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+static enum power_supply_property ac_props[] = {
+        POWER_SUPPLY_PROP_ONLINE,
+};
 #ifdef CONFIG_ACPI_PROCFS_POWER
 /* --------------------------------------------------------------------------
                              FS Interface (/proc)
diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
index 1211c03149e8..5850d320404c 100644
--- a/drivers/acpi/apei/erst.c
+++ b/drivers/acpi/apei/erst.c
@@ -86,7 +86,7 @@ static struct erst_erange {
 * It is used to provide exclusive accessing for ERST Error Log
 * Address Range too.
 */
-static DEFINE_SPINLOCK(erst_lock);
+static DEFINE_RAW_SPINLOCK(erst_lock);
 static inline int erst_errno(int command_status)
 {
@@ -421,9 +421,9 @@ ssize_t erst_get_record_count(void)
        if (erst_disable)
                return -ENODEV;
-        spin_lock_irqsave(&erst_lock, flags);
+        raw_spin_lock_irqsave(&erst_lock, flags);
        count = __erst_get_record_count();
-        spin_unlock_irqrestore(&erst_lock, flags);
+        raw_spin_unlock_irqrestore(&erst_lock, flags);
        return count;
 }
@@ -456,9 +456,9 @@ int erst_get_next_record_id(u64 *record_id)
        if (erst_disable)
                return -ENODEV;
-        spin_lock_irqsave(&erst_lock, flags);
+        raw_spin_lock_irqsave(&erst_lock, flags);
        rc = __erst_get_next_record_id(record_id);
-        spin_unlock_irqrestore(&erst_lock, flags);
+        raw_spin_unlock_irqrestore(&erst_lock, flags);
        return rc;
 }
@@ -624,17 +624,17 @@ int erst_write(const struct cper_record_header *record)
                return -EINVAL;
        if (erst_erange.attr & ERST_RANGE_NVRAM) {
-                if (!spin_trylock_irqsave(&erst_lock, flags))
+                if (!raw_spin_trylock_irqsave(&erst_lock, flags))
                        return -EBUSY;
                rc = __erst_write_to_nvram(record);
-                spin_unlock_irqrestore(&erst_lock, flags);
+                raw_spin_unlock_irqrestore(&erst_lock, flags);
                return rc;
        }
        if (record->record_length > erst_erange.size)
                return -EINVAL;
-        if (!spin_trylock_irqsave(&erst_lock, flags))
+        if (!raw_spin_trylock_irqsave(&erst_lock, flags))
                return -EBUSY;
        memcpy(erst_erange.vaddr, record, record->record_length);
        rcd_erange = erst_erange.vaddr;
@@ -642,7 +642,7 @@ int erst_write(const struct cper_record_header *record)
        memcpy(&rcd_erange->persistence_information, "ER", 2);
        rc = __erst_write_to_storage(0);
-        spin_unlock_irqrestore(&erst_lock, flags);
+        raw_spin_unlock_irqrestore(&erst_lock, flags);
        return rc;
 }
@@ -696,9 +696,9 @@ ssize_t erst_read(u64 record_id, struct cper_record_header *record,
        if (erst_disable)
                return -ENODEV;
-        spin_lock_irqsave(&erst_lock, flags);
+        raw_spin_lock_irqsave(&erst_lock, flags);
        len = __erst_read(record_id, record, buflen);
-        spin_unlock_irqrestore(&erst_lock, flags);
+        raw_spin_unlock_irqrestore(&erst_lock, flags);
        return len;
 }
 EXPORT_SYMBOL_GPL(erst_read);
@@ -719,20 +719,20 @@ ssize_t erst_read_next(struct cper_record_header *record, size_t buflen)
        if (erst_disable)
                return -ENODEV;
-        spin_lock_irqsave(&erst_lock, flags);
+        raw_spin_lock_irqsave(&erst_lock, flags);
        rc = __erst_get_next_record_id(&record_id);
        if (rc) {
-                spin_unlock_irqrestore(&erst_lock, flags);
+                raw_spin_unlock_irqrestore(&erst_lock, flags);
                return rc;
        }
        /* no more record */
        if (record_id == APEI_ERST_INVALID_RECORD_ID) {
-                spin_unlock_irqrestore(&erst_lock, flags);
+                raw_spin_unlock_irqrestore(&erst_lock, flags);
                return 0;
        }
        len = __erst_read(record_id, record, buflen);
-        spin_unlock_irqrestore(&erst_lock, flags);
+        raw_spin_unlock_irqrestore(&erst_lock, flags);
        return len;
 }
@@ -746,12 +746,12 @@ int erst_clear(u64 record_id)
        if (erst_disable)
                return -ENODEV;
-        spin_lock_irqsave(&erst_lock, flags);
+        raw_spin_lock_irqsave(&erst_lock, flags);
        if (erst_erange.attr & ERST_RANGE_NVRAM)
                rc = __erst_clear_from_nvram(record_id);
        else
                rc = __erst_clear_from_storage(record_id);
-        spin_unlock_irqrestore(&erst_lock, flags);
+        raw_spin_unlock_irqrestore(&erst_lock, flags);
        return rc;
 }
diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
index 1a3508a7fe03..daa7bc63f1d4 100644
--- a/drivers/acpi/apei/hest.c
+++ b/drivers/acpi/apei/hest.c
@@ -46,9 +46,9 @@ EXPORT_SYMBOL_GPL(hest_disable);
 /* HEST table parsing */
-static struct acpi_table_hest *hest_tab;
+static struct acpi_table_hest *__read_mostly hest_tab;
-static int hest_esrc_len_tab[ACPI_HEST_TYPE_RESERVED] = {
+static const int hest_esrc_len_tab[ACPI_HEST_TYPE_RESERVED] = {
        [ACPI_HEST_TYPE_IA32_CHECK] = -1,       /* need further calculation */
        [ACPI_HEST_TYPE_IA32_CORRECTED_CHECK] = -1,
        [ACPI_HEST_TYPE_IA32_NMI] = sizeof(struct acpi_hest_ia_nmi),
@@ -126,7 +126,7 @@ struct ghes_arr {
        unsigned int count;
 };
-static int hest_parse_ghes_count(struct acpi_hest_header *hest_hdr, void *data)
+static int __init hest_parse_ghes_count(struct acpi_hest_header *hest_hdr, void *data)
 {
        int *count = data;
@@ -135,7 +135,7 @@ static int hest_parse_ghes_count(struct acpi_hest_header *hest_hdr, void *data)
        return 0;
 }
-static int hest_parse_ghes(struct acpi_hest_header *hest_hdr, void *data)
+static int __init hest_parse_ghes(struct acpi_hest_header *hest_hdr, void *data)
 {
        struct platform_device *ghes_dev;
        struct ghes_arr *ghes_arr = data;
@@ -165,7 +165,7 @@ err:
        return rc;
 }
-static int hest_ghes_dev_register(unsigned int ghes_count)
+static int __init hest_ghes_dev_register(unsigned int ghes_count)
 {
        int rc, i;
        struct ghes_arr ghes_arr;
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 95649d373071..9fb9d5ac939d 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -130,6 +130,8 @@ struct acpi_battery {
        unsigned long flags;
 };
+static int acpi_battery_update(struct acpi_battery *battery);
 #define to_acpi_battery(x) container_of(x, struct acpi_battery, bat);
 inline int acpi_battery_present(struct acpi_battery *battery)
@@ -184,6 +186,9 @@ static int acpi_battery_get_property(struct power_supply *psy,
        int ret = 0;
        struct acpi_battery *battery = to_acpi_battery(psy);
+        if (acpi_battery_update(battery))
+                return -ENODEV;
        if (acpi_battery_present(battery)) {
                /* run battery update only if it is present */
                acpi_battery_get_state(battery);
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 372ff80b7b0c..302b31ed31f1 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -934,6 +934,9 @@ static struct dmi_system_id __initdata ec_dmi_table[] = {
        ec_flag_msi, "MSI hardware", {
        DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-Star")}, NULL},
        {
+        ec_flag_msi, "MSI hardware", {
+        DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-STAR")}, NULL},
+        {
        ec_validate_ecdt, "ASUS hardware", {
        DMI_MATCH(DMI_BIOS_VENDOR, "ASUS") }, NULL},
        {},
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 966feddf6b1b..055d7b701fff 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -110,9 +110,6 @@ struct acpi_ioremap {
 static LIST_HEAD(acpi_ioremaps);
 static DEFINE_SPINLOCK(acpi_ioremap_lock);
-#define OSI_STRING_LENGTH_MAX 64        /* arbitrary */
-static char osi_setup_string[OSI_STRING_LENGTH_MAX];
 static void __init acpi_osi_setup_late(void);
 /*
@@ -152,8 +149,7 @@ static struct osi_linux {
        unsigned int    enable:1;
        unsigned int    dmi:1;
        unsigned int    cmdline:1;
-        unsigned int    known:1;
+} osi_linux = {0, 0, 0};
-} osi_linux = { 0, 0, 0, 0};
 static u32 acpi_osi_handler(acpi_string interface, u32 supported)
 {
@@ -1055,13 +1051,53 @@ static int __init acpi_os_name_setup(char *str)
 __setup("acpi_os_name=", acpi_os_name_setup);
+#define OSI_STRING_LENGTH_MAX 64        /* arbitrary */
+#define OSI_STRING_ENTRIES_MAX 16       /* arbitrary */
+struct osi_setup_entry {
+        char string[OSI_STRING_LENGTH_MAX];
+        bool enable;
+};
+static struct osi_setup_entry __initdata osi_setup_entries[OSI_STRING_ENTRIES_MAX];
+void __init acpi_osi_setup(char *str)
+{
+        struct osi_setup_entry *osi;
+        bool enable = true;
+        int i;
+        if (!acpi_gbl_create_osi_method)
+                return;
+        if (str == NULL || *str == '\0') {
+                printk(KERN_INFO PREFIX "_OSI method disabled\n");
+                acpi_gbl_create_osi_method = FALSE;
+                return;
+        }
+        if (*str == '!') {
+                str++;
+                enable = false;
+        }
+        for (i = 0; i < OSI_STRING_ENTRIES_MAX; i++) {
+                osi = &osi_setup_entries[i];
+                if (!strcmp(osi->string, str)) {
+                        osi->enable = enable;
+                        break;
+                } else if (osi->string[0] == '\0') {
+                        osi->enable = enable;
+                        strncpy(osi->string, str, OSI_STRING_LENGTH_MAX);
+                        break;
+                }
+        }
+}
 static void __init set_osi_linux(unsigned int enable)
 {
-        if (osi_linux.enable != enable) {
+        if (osi_linux.enable != enable)
                osi_linux.enable = enable;
-                printk(KERN_NOTICE PREFIX "%sed _OSI(Linux)\n",
-                        enable ? "Add": "Delet");
-        }
        if (osi_linux.enable)
                acpi_osi_setup("Linux");
@@ -1073,7 +1109,8 @@ static void __init set_osi_linux(unsigned int enable)
 static void __init acpi_cmdline_osi_linux(unsigned int enable)
 {
-        osi_linux.cmdline = 1;  /* cmdline set the default */
+        osi_linux.cmdline = 1;  /* cmdline set the default and override DMI */
+        osi_linux.dmi = 0;
        set_osi_linux(enable);
        return;
@@ -1081,15 +1118,12 @@ static void __init acpi_cmdline_osi_linux(unsigned int enable)
 void __init acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d)
 {
-        osi_linux.dmi = 1;      /* DMI knows that this box asks OSI(Linux) */
        printk(KERN_NOTICE PREFIX "DMI detected: %s\n", d->ident);
        if (enable == -1)
                return;
-        osi_linux.known = 1;    /* DMI knows which OSI(Linux) default needed */
+        osi_linux.dmi = 1;      /* DMI knows that this box asks OSI(Linux) */
        set_osi_linux(enable);
        return;
@@ -1104,37 +1138,44 @@ void __init acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d)
 */
 static void __init acpi_osi_setup_late(void)
 {
-        char *str = osi_setup_string;
+        struct osi_setup_entry *osi;
+        char *str;
+        int i;
+        acpi_status status;
-        if (*str == '\0')
+        for (i = 0; i < OSI_STRING_ENTRIES_MAX; i++) {
-                return;
+                osi = &osi_setup_entries[i];
+                str = osi->string;
-        if (!strcmp("!Linux", str)) {
+                if (*str == '\0')
-                acpi_cmdline_osi_linux(0);      /* !enable */
+                        break;
-        } else if (*str == '!') {
+                if (osi->enable) {
-                if (acpi_remove_interface(++str) == AE_OK)
+                        status = acpi_install_interface(str);
-                        printk(KERN_INFO PREFIX "Deleted _OSI(%s)\n", str);
-        } else if (!strcmp("Linux", str)) {
+                        if (ACPI_SUCCESS(status))
-                acpi_cmdline_osi_linux(1);      /* enable */
+                                printk(KERN_INFO PREFIX "Added _OSI(%s)\n", str);
-        } else {
+                } else {
-                if (acpi_install_interface(str) == AE_OK)
+                        status = acpi_remove_interface(str);
-                        printk(KERN_INFO PREFIX "Added _OSI(%s)\n", str);
+                        if (ACPI_SUCCESS(status))
+                                printk(KERN_INFO PREFIX "Deleted _OSI(%s)\n", str);
+                }
        }
 }
-int __init acpi_osi_setup(char *str)
+static int __init osi_setup(char *str)
 {
-        if (str == NULL || *str == '\0') {
+        if (str && !strcmp("Linux", str))
-                printk(KERN_INFO PREFIX "_OSI method disabled\n");
+                acpi_cmdline_osi_linux(1);
-                acpi_gbl_create_osi_method = FALSE;
+        else if (str && !strcmp("!Linux", str))
-        } else {
+                acpi_cmdline_osi_linux(0);
-                strncpy(osi_setup_string, str, OSI_STRING_LENGTH_MAX);
+        else
-        }
+                acpi_osi_setup(str);
        return 1;
 }
-__setup("acpi_osi=", acpi_osi_setup);
+__setup("acpi_osi=", osi_setup);
 /* enable serialization to combat AE_ALREADY_EXISTS errors */
 static int __init acpi_serialize_setup(char *str)
@@ -1530,7 +1571,7 @@ acpi_status __init acpi_os_initialize(void)
        return AE_OK;
 }
-acpi_status acpi_os_initialize1(void)
+acpi_status __init acpi_os_initialize1(void)
 {
        kacpid_wq = create_workqueue("kacpid");
        kacpi_notify_wq = create_workqueue("kacpi_notify");
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 67dedeed144c..4c9c2fb5d98f 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -213,11 +213,13 @@ static int acpi_power_on(acpi_handle handle)
                                  resource->name));
        } else {
                result = __acpi_power_on(resource);
+                if (result)
+                        resource->ref_count--;
        }
        mutex_unlock(&resource->resource_lock);
-        return 0;
+        return result;
 }
 static int acpi_power_off_device(acpi_handle handle)
@@ -465,10 +467,12 @@ int acpi_power_transition(struct acpi_device *device, int state)
        struct acpi_handle_list *tl = NULL;     /* Target Resources */
        int i = 0;
        if (!device || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3))
                return -EINVAL;
+        if (device->power.state == state)
+                return 0;
        if ((device->power.state < ACPI_STATE_D0)
            || (device->power.state > ACPI_STATE_D3))
                return -ENODEV;
@@ -488,10 +492,6 @@ int acpi_power_transition(struct acpi_device *device, int state)
                        goto end;
        }
-        if (device->power.state == state) {
-                goto end;
-        }
        /*
         * Then we dereference all power resources used in the current list.
         */
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c
index fde49b9b1d99..79cb65332894 100644
--- a/drivers/acpi/processor_thermal.c
+++ b/drivers/acpi/processor_thermal.c
@@ -156,15 +156,6 @@ static int cpufreq_set_cur_state(unsigned int cpu, int state)
        return 0;
 }
-static int acpi_thermal_cpufreq_increase(unsigned int cpu)
-{
-        return -ENODEV;
-}
-static int acpi_thermal_cpufreq_decrease(unsigned int cpu)
-{
-        return -ENODEV;
-}
 #endif
 int acpi_processor_get_limit_info(struct acpi_processor *pr)
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 721d93b3ceee..febb153b5a68 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -27,8 +27,6 @@
 static u8 sleep_states[ACPI_S_STATE_COUNT];
-static u32 acpi_target_sleep_state = ACPI_STATE_S0;
 static void acpi_sleep_tts_switch(u32 acpi_state)
 {
        union acpi_object in_arg = { ACPI_TYPE_INTEGER };
@@ -81,6 +79,8 @@ static int acpi_sleep_prepare(u32 acpi_state)
 }
 #ifdef CONFIG_ACPI_SLEEP
+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
@@ -427,6 +427,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
                DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB1Z1E"),
                },
        },
+        {
+        .callback = init_nvs_nosave,
+        .ident = "Sony Vaio VGN-NW130D",
+        .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "VGN-NW130D"),
+                },
+        },
        {},
 };
 #endif /* CONFIG_SUSPEND */
diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
index 46b94762125b..f9b983ae6877 100644
--- a/drivers/atm/adummy.c
+++ b/drivers/atm/adummy.c
@@ -154,7 +154,7 @@ static int __init adummy_init(void)
                err = -ENOMEM;
                goto out;
        }
-        atm_dev = atm_dev_register(DEV_LABEL, &adummy_ops, -1, NULL);
+        atm_dev = atm_dev_register(DEV_LABEL, NULL, &adummy_ops, -1, NULL);
        if (!atm_dev) {
                printk(KERN_ERR DEV_LABEL ": atm_dev_register() failed\n");
                err = -ENODEV;
diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
index a33896a482e6..ffe9b655292e 100644
--- a/drivers/atm/ambassador.c
+++ b/drivers/atm/ambassador.c
@@ -2244,7 +2244,8 @@ static int __devinit amb_probe(struct pci_dev *pci_dev, const struct pci_device_
                goto out_reset;
        }
-        dev->atm_dev = atm_dev_register (DEV_LABEL, &amb_ops, -1, NULL);
+        dev->atm_dev = atm_dev_register (DEV_LABEL, &pci_dev->dev, &amb_ops, -1,
+                                         NULL);
        if (!dev->atm_dev) {
                PRINTD (DBG_ERR, "failed to register Madge ATM adapter");
                err = -EINVAL;
diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
index b9101818b47b..2b464b631f22 100644
--- a/drivers/atm/atmtcp.c
+++ b/drivers/atm/atmtcp.c
@@ -366,7 +366,7 @@ static int atmtcp_create(int itf,int persist,struct atm_dev **result)
        if (!dev_data)
                return -ENOMEM;
-        dev = atm_dev_register(DEV_LABEL,&atmtcp_v_dev_ops,itf,NULL);
+        dev = atm_dev_register(DEV_LABEL,NULL,&atmtcp_v_dev_ops,itf,NULL);
        if (!dev) {
                kfree(dev_data);
                return itf == -1 ? -ENOMEM : -EBUSY;
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index 97c5898cd76e..c495fae74200 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -2244,7 +2244,7 @@ static int __devinit eni_init_one(struct pci_dev *pci_dev,
                    &zeroes);
                if (!cpu_zeroes) goto out1;
        }
-        dev = atm_dev_register(DEV_LABEL,&ops,-1,NULL);
+        dev = atm_dev_register(DEV_LABEL, &pci_dev->dev, &ops, -1, NULL);
        if (!dev) goto out2;
        pci_set_drvdata(pci_dev, dev);
        eni_dev->pci_dev = pci_dev;
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 5d86bb803e94..7d912baf01d4 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -1911,7 +1911,7 @@ static int __devinit firestream_init_one (struct pci_dev *pci_dev,
                    fs_dev, sizeof (struct fs_dev));
        if (!fs_dev)
                goto err_out;
-        atm_dev = atm_dev_register("fs", &ops, -1, NULL);
+        atm_dev = atm_dev_register("fs", &pci_dev->dev, &ops, -1, NULL);
        if (!atm_dev)
                goto err_out_free_fs_dev;
  
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index c8fc69c85a06..962c309b40c0 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -2567,14 +2567,14 @@ release:
 static int __devinit
-fore200e_register(struct fore200e* fore200e)
+fore200e_register(struct fore200e* fore200e, struct device *parent)
 {
    struct atm_dev* atm_dev;
    DPRINTK(2, "device %s being registered\n", fore200e->name);
-    atm_dev = atm_dev_register(fore200e->bus->proc_name, &fore200e_ops, -1,
+    atm_dev = atm_dev_register(fore200e->bus->proc_name, parent, &fore200e_ops,
-      NULL); 
+                               -1, NULL);
    if (atm_dev == NULL) {
        printk(FORE200E "unable to register device %s\n", fore200e->name);
        return -ENODEV;
@@ -2594,9 +2594,9 @@ fore200e_register(struct fore200e* fore200e)
 static int __devinit
-fore200e_init(struct fore200e* fore200e)
+fore200e_init(struct fore200e* fore200e, struct device *parent)
 {
-    if (fore200e_register(fore200e) < 0)
+    if (fore200e_register(fore200e, parent) < 0)
        return -ENODEV;
    
    if (fore200e->bus->configure(fore200e) < 0)
@@ -2662,7 +2662,7 @@ static int __devinit fore200e_sba_probe(struct platform_device *op,
        sprintf(fore200e->name, "%s-%d", bus->model_name, index);
-        err = fore200e_init(fore200e);
+        err = fore200e_init(fore200e, &op->dev);
        if (err < 0) {
                fore200e_shutdown(fore200e);
                kfree(fore200e);
@@ -2740,7 +2740,7 @@ fore200e_pca_detect(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent
    sprintf(fore200e->name, "%s-%d", bus->model_name, index);
-    err = fore200e_init(fore200e);
+    err = fore200e_init(fore200e, &pci_dev->dev);
    if (err < 0) {
        fore200e_shutdown(fore200e);
        goto out_free;
diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index 801e8b6e9d1f..6cf59bf281dc 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -366,7 +366,7 @@ he_init_one(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent)
                goto init_one_failure;
        }
-        atm_dev = atm_dev_register(DEV_LABEL, &he_ops, -1, NULL);
+        atm_dev = atm_dev_register(DEV_LABEL, &pci_dev->dev, &he_ops, -1, NULL);
        if (!atm_dev) {
                err = -ENODEV;
                goto init_one_failure;
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
index a95790452a68..24761e1d6642 100644
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
@@ -2733,7 +2733,8 @@ static int __devinit hrz_probe(struct pci_dev *pci_dev, const struct pci_device_
        PRINTD(DBG_INFO, "found Madge ATM adapter (hrz) at: IO %x, IRQ %u, MEM %p",
               iobase, irq, membase);
-        dev->atm_dev = atm_dev_register(DEV_LABEL, &hrz_ops, -1, NULL);
+        dev->atm_dev = atm_dev_register(DEV_LABEL, &pci_dev->dev, &hrz_ops, -1,
+                                        NULL);
        if (!(dev->atm_dev)) {
                PRINTD(DBG_ERR, "failed to register Madge ATM adapter");
                err = -EINVAL;
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index bce57328ddde..bfb7feee0400 100644
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -3698,7 +3698,8 @@ idt77252_init_one(struct pci_dev *pcidev, const struct pci_device_id *id)
                goto err_out_iounmap;
        }
-        dev = atm_dev_register("idt77252", &idt77252_ops, -1, NULL);
+        dev = atm_dev_register("idt77252", &pcidev->dev, &idt77252_ops, -1,
+                               NULL);
        if (!dev) {
                printk("%s: can't register atm device\n", card->name);
                err = -EIO;
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index 9309d4724e13..729254053758 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -3172,7 +3172,7 @@ static int __devinit ia_init_one(struct pci_dev *pdev,
                ret = -ENODEV;
                goto err_out_free_iadev;
        }
-        dev = atm_dev_register(DEV_LABEL, &ops, -1, NULL);
+        dev = atm_dev_register(DEV_LABEL, &pdev->dev, &ops, -1, NULL);
        if (!dev) {
                ret = -ENOMEM;
                goto err_out_disable_dev;
diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index cbe15a86c669..a395c9aab146 100644
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -2591,7 +2591,7 @@ static int __devinit lanai_init_one(struct pci_dev *pci,
                return -ENOMEM;
        }
-        atmdev = atm_dev_register(DEV_LABEL, &ops, -1, NULL);
+        atmdev = atm_dev_register(DEV_LABEL, &pci->dev, &ops, -1, NULL);
        if (atmdev == NULL) {
                printk(KERN_ERR DEV_LABEL
                    ": couldn't register atm device!\n");
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index 2f3516b7f118..6b313ee9231b 100644
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@ -771,7 +771,8 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev)
        }
        /* Register device */
-        card->atmdev = atm_dev_register("nicstar", &atm_ops, -1, NULL);
+        card->atmdev = atm_dev_register("nicstar", &card->pcidev->dev, &atm_ops,
+                                        -1, NULL);
        if (card->atmdev == NULL) {
                printk("nicstar%d: can't register device.\n", i);
                error = 17;
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index 2e08c996fd30..73fb1c4f4cd4 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -166,7 +166,7 @@ static irqreturn_t solos_irq(int irq, void *dev_id);
 static struct atm_vcc* find_vcc(struct atm_dev *dev, short vpi, int vci);
 static int list_vccs(int vci);
 static void release_vccs(struct atm_dev *dev);
-static int atm_init(struct solos_card *);
+static int atm_init(struct solos_card *, struct device *);
 static void atm_remove(struct solos_card *);
 static int send_command(struct solos_card *card, int dev, const char *buf, size_t size);
 static void solos_bh(unsigned long);
@@ -1210,7 +1210,7 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
        if (db_firmware_upgrade)
                flash_upgrade(card, 3);
-        err = atm_init(card);
+        err = atm_init(card, &dev->dev);
        if (err)
                goto out_free_irq;
@@ -1233,7 +1233,7 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
        return err;
 }
-static int atm_init(struct solos_card *card)
+static int atm_init(struct solos_card *card, struct device *parent)
 {
        int i;
@@ -1244,7 +1244,7 @@ static int atm_init(struct solos_card *card)
                skb_queue_head_init(&card->tx_queue[i]);
                skb_queue_head_init(&card->cli_queue[i]);
-                card->atmdev[i] = atm_dev_register("solos-pci", &fpga_ops, -1, NULL);
+                card->atmdev[i] = atm_dev_register("solos-pci", parent, &fpga_ops, -1, NULL);
                if (!card->atmdev[i]) {
                        dev_err(&card->dev->dev, "Could not register ATM device %d\n", i);
                        atm_remove(card);
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
index 4e885d2da49c..624917902b65 100644
--- a/drivers/atm/zatm.c
+++ b/drivers/atm/zatm.c
@@ -1597,7 +1597,7 @@ static int __devinit zatm_init_one(struct pci_dev *pci_dev,
                goto out;
        }
-        dev = atm_dev_register(DEV_LABEL, &ops, -1, NULL);
+        dev = atm_dev_register(DEV_LABEL, &pci_dev->dev, &ops, -1, NULL);
        if (!dev)
                goto out_free;
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 4f9e22f29138..657873e4328d 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -72,7 +72,7 @@ struct blk_shadow {
 static DEFINE_MUTEX(blkfront_mutex);
 static const struct block_device_operations xlvbd_block_fops;
-#define BLK_RING_SIZE __RING_SIZE((struct blkif_sring *)0, PAGE_SIZE)
+#define BLK_RING_SIZE __CONST_RING_SIZE(blkif, PAGE_SIZE)
 /*
 * We have one of these per vbd, whether ide, scsi or 'other'.  They
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index 128cae4e8629..949ed09c6361 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -35,6 +35,10 @@
 static struct usb_device_id ath3k_table[] = {
        /* Atheros AR3011 */
        { USB_DEVICE(0x0CF3, 0x3000) },
+        /* Atheros AR3011 with sflash firmware*/
+        { USB_DEVICE(0x0CF3, 0x3002) },
        { }     /* Terminating entry */
 };
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index ab3894f742c3..1da773f899a2 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -99,6 +99,9 @@ static struct usb_device_id blacklist_table[] = {
        /* Broadcom BCM2033 without firmware */
        { USB_DEVICE(0x0a5c, 0x2033), .driver_info = BTUSB_IGNORE },
+        /* Atheros 3011 with sflash firmware */
+        { USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE },
        /* Broadcom BCM2035 */
        { USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU },
        { USB_DEVICE(0x0a5c, 0x200a), .driver_info = BTUSB_WRONG_SCO_MTU },
@@ -239,7 +242,8 @@ static void btusb_intr_complete(struct urb *urb)
        err = usb_submit_urb(urb, GFP_ATOMIC);
        if (err < 0) {
-                BT_ERR("%s urb %p failed to resubmit (%d)",
+                if (err != -EPERM)
+                        BT_ERR("%s urb %p failed to resubmit (%d)",
                                                hdev->name, urb, -err);
                usb_unanchor_urb(urb);
        }
@@ -323,7 +327,8 @@ static void btusb_bulk_complete(struct urb *urb)
        err = usb_submit_urb(urb, GFP_ATOMIC);
        if (err < 0) {
-                BT_ERR("%s urb %p failed to resubmit (%d)",
+                if (err != -EPERM)
+                        BT_ERR("%s urb %p failed to resubmit (%d)",
                                                hdev->name, urb, -err);
                usb_unanchor_urb(urb);
        }
@@ -412,7 +417,8 @@ static void btusb_isoc_complete(struct urb *urb)
        err = usb_submit_urb(urb, GFP_ATOMIC);
        if (err < 0) {
-                BT_ERR("%s urb %p failed to resubmit (%d)",
+                if (err != -EPERM)
+                        BT_ERR("%s urb %p failed to resubmit (%d)",
                                                hdev->name, urb, -err);
                usb_unanchor_urb(urb);
        }
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 9272c38dd3c6..16a2847b7cdb 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -812,8 +812,10 @@ static int intel_fake_agp_fetch_size(void)
 static void i830_cleanup(void)
 {
-        kunmap(intel_private.i8xx_page);
+        if (intel_private.i8xx_flush_page) {
-        intel_private.i8xx_flush_page = NULL;
+                kunmap(intel_private.i8xx_flush_page);
+                intel_private.i8xx_flush_page = NULL;
+        }
        __free_page(intel_private.i8xx_page);
        intel_private.i8xx_page = NULL;
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index e16c3fa8d2e3..05117f1ad867 100644
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -36,6 +36,7 @@
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Evgeniy Polyakov <zbr@ioremap.net>");
 MODULE_DESCRIPTION("Generic userspace <-> kernelspace connector.");
+MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_CONNECTOR);
 static struct cn_dev cdev;
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index a8a84f4587f2..64b21f5cd740 100644
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -1,8 +1,8 @@
 ifeq ($(CONFIG_DMADEVICES_DEBUG),y)
-        EXTRA_CFLAGS    += -DDEBUG
+        ccflags-y       += -DDEBUG
 endif
 ifeq ($(CONFIG_DMADEVICES_VDEBUG),y)
-        EXTRA_CFLAGS    += -DVERBOSE_DEBUG
+        ccflags-y       += -DVERBOSE_DEBUG
 endif
 obj-$(CONFIG_DMA_ENGINE) += dmaengine.o
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index a0f3e6a06e06..ea0ee81cff53 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -722,7 +722,7 @@ atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
                        desc->lli.daddr = mem;
                        desc->lli.ctrla = ctrla
                                        | ATC_DST_WIDTH(mem_width)
-                                        | len >> mem_width;
+                                        | len >> reg_width;
                        desc->lli.ctrlb = ctrlb;
                        if (!first) {
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index 286c3ac6bdcc..e5e172d21692 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -50,9 +50,11 @@ static void dma_init(struct fsldma_chan *chan)
                 * EIE - Error interrupt enable
                 * EOSIE - End of segments interrupt enable (basic mode)
                 * EOLNIE - End of links interrupt enable
+                 * BWC - Bandwidth sharing among channels
                 */
-                DMA_OUT(chan, &chan->regs->mr, FSL_DMA_MR_EIE
+                DMA_OUT(chan, &chan->regs->mr, FSL_DMA_MR_BWC
-                                | FSL_DMA_MR_EOLNIE | FSL_DMA_MR_EOSIE, 32);
+                                | FSL_DMA_MR_EIE | FSL_DMA_MR_EOLNIE
+                                | FSL_DMA_MR_EOSIE, 32);
                break;
        case FSL_DMA_IP_83XX:
                /* Set the channel to below modes:
diff --git a/drivers/dma/fsldma.h b/drivers/dma/fsldma.h
index cb4d6ff51597..ba9f403c0fbe 100644
--- a/drivers/dma/fsldma.h
+++ b/drivers/dma/fsldma.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Freescale Semiconductor, Inc. All rights reserved.
+ * Copyright (C) 2007-2010 Freescale Semiconductor, Inc. All rights reserved.
 *
 * Author:
 *   Zhang Wei <wei.zhang@freescale.com>, Jul 2007
@@ -36,6 +36,13 @@
 #define FSL_DMA_MR_DAHE         0x00002000
 #define FSL_DMA_MR_SAHE         0x00001000
+/*
+ * Bandwidth/pause control determines how many bytes a given
+ * channel is allowed to transfer before the DMA engine pauses
+ * the current channel and switches to the next channel
+ */
+#define FSL_DMA_MR_BWC         0x08000000
 /* Special MR definition for MPC8349 */
 #define FSL_DMA_MR_EOTIE        0x00000080
 #define FSL_DMA_MR_PRC_RM       0x00000800
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index f629e4961af5..e53d438142bb 100644
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -379,7 +379,7 @@ static int __init imxdma_probe(struct platform_device *pdev)
        return 0;
 err_init:
-        while (i-- >= 0) {
+        while (--i >= 0) {
                struct imxdma_channel *imxdmac = &imxdma->channel[i];
                imx_dma_free(imxdmac->imxdma_channel);
        }
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 01166a9c3241..d5a5d4d9c19b 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -907,7 +907,7 @@ static struct dma_async_tx_descriptor *sdma_prep_slave_sg(
                struct sdma_buffer_descriptor *bd = &sdmac->bd[i];
                int param;
-                bd->buffer_addr = sgl->dma_address;
+                bd->buffer_addr = sg->dma_address;
                count = sg->length;
@@ -1367,7 +1367,7 @@ static int __init sdma_module_init(void)
 {
        return platform_driver_probe(&sdma_driver, sdma_probe);
 }
-subsys_initcall(sdma_module_init);
+module_init(sdma_module_init);
 MODULE_AUTHOR("Sascha Hauer, Pengutronix <s.hauer@pengutronix.de>");
 MODULE_DESCRIPTION("i.MX SDMA driver");
diff --git a/drivers/dma/intel_mid_dma.c b/drivers/dma/intel_mid_dma.c
index 338bc4eed1f3..3109bd94bc4f 100644
--- a/drivers/dma/intel_mid_dma.c
+++ b/drivers/dma/intel_mid_dma.c
@@ -1075,7 +1075,6 @@ static int mid_setup_dma(struct pci_dev *pdev)
        if (NULL == dma->dma_pool) {
                pr_err("ERR_MDMA:pci_pool_create failed\n");
                err = -ENOMEM;
-                kfree(dma);
                goto err_dma_pool;
        }
@@ -1186,7 +1185,6 @@ err_engine:
        free_irq(pdev->irq, dma);
 err_irq:
        pci_pool_destroy(dma->dma_pool);
-        kfree(dma);
 err_dma_pool:
        pr_err("ERR_MDMA:setup_dma failed: %d\n", err);
        return err;
@@ -1413,7 +1411,7 @@ static const struct dev_pm_ops intel_mid_dma_pm = {
        .runtime_idle = dma_runtime_idle,
 };
-static struct pci_driver intel_mid_dma_pci = {
+static struct pci_driver intel_mid_dma_pci_driver = {
        .name           =       "Intel MID DMA",
        .id_table       =       intel_mid_dma_ids,
        .probe          =       intel_mid_dma_probe,
@@ -1431,13 +1429,13 @@ static int __init intel_mid_dma_init(void)
 {
        pr_debug("INFO_MDMA: LNW DMA Driver Version %s\n",
                        INTEL_MID_DMA_DRIVER_VERSION);
-        return pci_register_driver(&intel_mid_dma_pci);
+        return pci_register_driver(&intel_mid_dma_pci_driver);
 }
 fs_initcall(intel_mid_dma_init);
 static void __exit intel_mid_dma_exit(void)
 {
-        pci_unregister_driver(&intel_mid_dma_pci);
+        pci_unregister_driver(&intel_mid_dma_pci_driver);
 }
 module_exit(intel_mid_dma_exit);
diff --git a/drivers/dma/ioat/Makefile b/drivers/dma/ioat/Makefile
index 8997d3fb9051..0ff7270af25b 100644
--- a/drivers/dma/ioat/Makefile
+++ b/drivers/dma/ioat/Makefile
@@ -1,2 +1,2 @@
 obj-$(CONFIG_INTEL_IOATDMA) += ioatdma.o
-ioatdma-objs := pci.o dma.o dma_v2.o dma_v3.o dca.o
+ioatdma-y := pci.o dma.o dma_v2.o dma_v3.o dca.o
diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c
index 92b679024fed..c064c89420d0 100644
--- a/drivers/dma/pch_dma.c
+++ b/drivers/dma/pch_dma.c
@@ -259,11 +259,6 @@ static void pdc_dostart(struct pch_dma_chan *pd_chan, struct pch_dma_desc* desc)
                return;
        }
-        channel_writel(pd_chan, DEV_ADDR, desc->regs.dev_addr);
-        channel_writel(pd_chan, MEM_ADDR, desc->regs.mem_addr);
-        channel_writel(pd_chan, SIZE, desc->regs.size);
-        channel_writel(pd_chan, NEXT, desc->regs.next);
        dev_dbg(chan2dev(&pd_chan->chan), "chan %d -> dev_addr: %x\n",
                pd_chan->chan.chan_id, desc->regs.dev_addr);
        dev_dbg(chan2dev(&pd_chan->chan), "chan %d -> mem_addr: %x\n",
@@ -273,10 +268,16 @@ static void pdc_dostart(struct pch_dma_chan *pd_chan, struct pch_dma_desc* desc)
        dev_dbg(chan2dev(&pd_chan->chan), "chan %d -> next: %x\n",
                pd_chan->chan.chan_id, desc->regs.next);
-        if (list_empty(&desc->tx_list))
+        if (list_empty(&desc->tx_list)) {
+                channel_writel(pd_chan, DEV_ADDR, desc->regs.dev_addr);
+                channel_writel(pd_chan, MEM_ADDR, desc->regs.mem_addr);
+                channel_writel(pd_chan, SIZE, desc->regs.size);
+                channel_writel(pd_chan, NEXT, desc->regs.next);
                pdc_set_mode(&pd_chan->chan, DMA_CTL0_ONESHOT);
-        else
+        } else {
+                channel_writel(pd_chan, NEXT, desc->txd.phys);
                pdc_set_mode(&pd_chan->chan, DMA_CTL0_SG);
+        }
        val = dma_readl(pd, CTL2);
        val |= 1 << (DMA_CTL2_START_SHIFT_BITS + pd_chan->chan.chan_id);
diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c
index 0d58a4a4487f..cef584533ee8 100644
--- a/drivers/dma/ppc4xx/adma.c
+++ b/drivers/dma/ppc4xx/adma.c
@@ -4449,9 +4449,8 @@ static int __devinit ppc440spe_adma_probe(struct platform_device *ofdev,
        if (!request_mem_region(res.start, resource_size(&res),
                                dev_driver_string(&ofdev->dev))) {
-                dev_err(&ofdev->dev, "failed to request memory region "
+                dev_err(&ofdev->dev, "failed to request memory region %pR\n",
-                        "(0x%016llx-0x%016llx)\n",
+                        &res);
-                        (u64)res.start, (u64)res.end);
                initcode = PPC_ADMA_INIT_MEMREG;
                ret = -EBUSY;
                goto out;
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 8521401bbd75..eca9ba193e94 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -1572,7 +1572,7 @@ static int f10_match_to_this_node(struct amd64_pvt *pvt, int dram_range,
        debugf1("   HoleOffset=0x%x  HoleValid=0x%x IntlvSel=0x%x\n",
                        hole_off, hole_valid, intlv_sel);
-        if (intlv_en ||
+        if (intlv_en &&
            (intlv_sel != ((sys_addr >> 12) & intlv_en)))
                return -EINVAL;
diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h
index d7ca43a828bd..251440cd50a3 100644
--- a/drivers/edac/edac_core.h
+++ b/drivers/edac/edac_core.h
@@ -41,10 +41,10 @@
 #define MC_PROC_NAME_MAX_LEN    7
 #if PAGE_SHIFT < 20
-#define PAGES_TO_MiB( pages )   ( ( pages ) >> ( 20 - PAGE_SHIFT ) )
+#define PAGES_TO_MiB(pages)     ((pages) >> (20 - PAGE_SHIFT))
-#define MiB_TO_PAGES(mb)        ((mb) >> (20 - PAGE_SHIFT))
+#define MiB_TO_PAGES(mb)        ((mb) << (20 - PAGE_SHIFT))
 #else                           /* PAGE_SHIFT > 20 */
-#define PAGES_TO_MiB( pages )   ( ( pages ) << ( PAGE_SHIFT - 20 ) )
+#define PAGES_TO_MiB(pages)     ((pages) << (PAGE_SHIFT - 20))
 #define MiB_TO_PAGES(mb)        ((mb) >> (PAGE_SHIFT - 20))
 #endif
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index ba6586a69ccc..795ea69c4d8f 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -586,14 +586,16 @@ struct mem_ctl_info *edac_mc_del_mc(struct device *dev)
                return NULL;
        }
-        /* marking MCI offline */
-        mci->op_state = OP_OFFLINE;
        del_mc_from_global_list(mci);
        mutex_unlock(&mem_ctls_mutex);
-        /* flush workq processes and remove sysfs */
+        /* flush workq processes */
        edac_mc_workq_teardown(mci);
+        /* marking MCI offline */
+        mci->op_state = OP_OFFLINE;
+        /* remove from sysfs */
        edac_remove_sysfs_mci_device(mci);
        edac_printk(KERN_INFO, EDAC_MC,
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index 84eb607d6c03..e3c8b60bd86b 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -242,6 +242,7 @@ static inline struct fw_ohci *fw_ohci(struct fw_card *card)
 static char ohci_driver_name[] = KBUILD_MODNAME;
+#define PCI_DEVICE_ID_AGERE_FW643       0x5901
 #define PCI_DEVICE_ID_JMICRON_JMB38X_FW 0x2380
 #define PCI_DEVICE_ID_TI_TSB12LV22      0x8009
@@ -253,18 +254,34 @@ static char ohci_driver_name[] = KBUILD_MODNAME;
 /* In case of multiple matches in ohci_quirks[], only the first one is used. */
 static const struct {
-        unsigned short vendor, device, flags;
+        unsigned short vendor, device, revision, flags;
 } ohci_quirks[] = {
-        {PCI_VENDOR_ID_TI,      PCI_DEVICE_ID_TI_TSB12LV22, QUIRK_CYCLE_TIMER |
+        {PCI_VENDOR_ID_AL, PCI_ANY_ID, PCI_ANY_ID,
-                                                            QUIRK_RESET_PACKET |
+                QUIRK_CYCLE_TIMER},
-                                                            QUIRK_NO_1394A},
-        {PCI_VENDOR_ID_TI,      PCI_ANY_ID,     QUIRK_RESET_PACKET},
+        {PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_FW, PCI_ANY_ID,
-        {PCI_VENDOR_ID_AL,      PCI_ANY_ID,     QUIRK_CYCLE_TIMER},
+                QUIRK_BE_HEADERS},
-        {PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB38X_FW, QUIRK_NO_MSI},
-        {PCI_VENDOR_ID_NEC,     PCI_ANY_ID,     QUIRK_CYCLE_TIMER},
+        {PCI_VENDOR_ID_ATT, PCI_DEVICE_ID_AGERE_FW643, 6,
-        {PCI_VENDOR_ID_VIA,     PCI_ANY_ID,     QUIRK_CYCLE_TIMER},
+                QUIRK_NO_MSI},
-        {PCI_VENDOR_ID_RICOH,   PCI_ANY_ID,     QUIRK_CYCLE_TIMER},
-        {PCI_VENDOR_ID_APPLE,   PCI_DEVICE_ID_APPLE_UNI_N_FW, QUIRK_BE_HEADERS},
+        {PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB38X_FW, PCI_ANY_ID,
+                QUIRK_NO_MSI},
+        {PCI_VENDOR_ID_NEC, PCI_ANY_ID, PCI_ANY_ID,
+                QUIRK_CYCLE_TIMER},
+        {PCI_VENDOR_ID_RICOH, PCI_ANY_ID, PCI_ANY_ID,
+                QUIRK_CYCLE_TIMER},
+        {PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_TSB12LV22, PCI_ANY_ID,
+                QUIRK_CYCLE_TIMER | QUIRK_RESET_PACKET | QUIRK_NO_1394A},
+        {PCI_VENDOR_ID_TI, PCI_ANY_ID, PCI_ANY_ID,
+                QUIRK_RESET_PACKET},
+        {PCI_VENDOR_ID_VIA, PCI_ANY_ID, PCI_ANY_ID,
+                QUIRK_CYCLE_TIMER | QUIRK_NO_MSI},
 };
 /* This overrides anything that was found in ohci_quirks[]. */
@@ -2927,9 +2944,11 @@ static int __devinit pci_probe(struct pci_dev *dev,
        }
        for (i = 0; i < ARRAY_SIZE(ohci_quirks); i++)
-                if (ohci_quirks[i].vendor == dev->vendor &&
+                if ((ohci_quirks[i].vendor == dev->vendor) &&
-                    (ohci_quirks[i].device == dev->device ||
+                    (ohci_quirks[i].device == (unsigned short)PCI_ANY_ID ||
-                     ohci_quirks[i].device == (unsigned short)PCI_ANY_ID)) {
+                     ohci_quirks[i].device == dev->device) &&
+                    (ohci_quirks[i].revision == (unsigned short)PCI_ANY_ID ||
+                     ohci_quirks[i].revision >= dev->revision)) {
                        ohci->quirks = ohci_quirks[i].flags;
                        break;
                }
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 3143ac795eb0..082495bb08a7 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -230,11 +230,11 @@ config GPIO_STMPE
          This enables support for the GPIOs found on the STMPE I/O
          Expanders.
-config GPIO_TC35892
+config GPIO_TC3589X
-        bool "TC35892 GPIOs"
+        bool "TC3589X GPIOs"
-        depends on MFD_TC35892
+        depends on MFD_TC3589X
        help
-          This enables support for the GPIOs found on the TC35892
+          This enables support for the GPIOs found on the TC3589X
          I/O Expander.
 config GPIO_TWL4030
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index bdf3ddec0652..39bfd7a37650 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -24,7 +24,7 @@ obj-$(CONFIG_GPIO_PCF857X)	+= pcf857x.o
 obj-$(CONFIG_GPIO_PCH)          += pch_gpio.o
 obj-$(CONFIG_GPIO_PL061)        += pl061.o
 obj-$(CONFIG_GPIO_STMPE)        += stmpe-gpio.o
-obj-$(CONFIG_GPIO_TC35892)      += tc35892-gpio.o
+obj-$(CONFIG_GPIO_TC3589X)      += tc3589x-gpio.o
 obj-$(CONFIG_GPIO_TIMBERDALE)   += timbgpio.o
 obj-$(CONFIG_GPIO_TWL4030)      += twl4030-gpio.o
 obj-$(CONFIG_GPIO_UCB1400)      += ucb1400_gpio.o
diff --git a/drivers/gpio/tc35892-gpio.c b/drivers/gpio/tc35892-gpio.c
deleted file mode 100644
index 7e10c935a047..000000000000
--- a/drivers/gpio/tc35892-gpio.c
+++ /dev/null
@@ -1,389 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * License Terms: GNU General Public License, version 2
- * Author: Hanumath Prasad <hanumath.prasad@stericsson.com> for ST-Ericsson
- * Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson
- */
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
-#include <linux/gpio.h>
-#include <linux/irq.h>
-#include <linux/interrupt.h>
-#include <linux/mfd/tc35892.h>
-/*
- * These registers are modified under the irq bus lock and cached to avoid
- * unnecessary writes in bus_sync_unlock.
- */
-enum { REG_IBE, REG_IEV, REG_IS, REG_IE };
-#define CACHE_NR_REGS   4
-#define CACHE_NR_BANKS  3
-struct tc35892_gpio {
-        struct gpio_chip chip;
-        struct tc35892 *tc35892;
-        struct device *dev;
-        struct mutex irq_lock;
-        int irq_base;
-        /* Caches of interrupt control registers for bus_lock */
-        u8 regs[CACHE_NR_REGS][CACHE_NR_BANKS];
-        u8 oldregs[CACHE_NR_REGS][CACHE_NR_BANKS];
-};
-static inline struct tc35892_gpio *to_tc35892_gpio(struct gpio_chip *chip)
-{
-        return container_of(chip, struct tc35892_gpio, chip);
-}
-static int tc35892_gpio_get(struct gpio_chip *chip, unsigned offset)
-{
-        struct tc35892_gpio *tc35892_gpio = to_tc35892_gpio(chip);
-        struct tc35892 *tc35892 = tc35892_gpio->tc35892;
-        u8 reg = TC35892_GPIODATA0 + (offset / 8) * 2;
-        u8 mask = 1 << (offset % 8);
-        int ret;
-        ret = tc35892_reg_read(tc35892, reg);
-        if (ret < 0)
-                return ret;
-        return ret & mask;
-}
-static void tc35892_gpio_set(struct gpio_chip *chip, unsigned offset, int val)
-{
-        struct tc35892_gpio *tc35892_gpio = to_tc35892_gpio(chip);
-        struct tc35892 *tc35892 = tc35892_gpio->tc35892;
-        u8 reg = TC35892_GPIODATA0 + (offset / 8) * 2;
-        unsigned pos = offset % 8;
-        u8 data[] = {!!val << pos, 1 << pos};
-        tc35892_block_write(tc35892, reg, ARRAY_SIZE(data), data);
-}
-static int tc35892_gpio_direction_output(struct gpio_chip *chip,
-                                         unsigned offset, int val)
-{
-        struct tc35892_gpio *tc35892_gpio = to_tc35892_gpio(chip);
-        struct tc35892 *tc35892 = tc35892_gpio->tc35892;
-        u8 reg = TC35892_GPIODIR0 + offset / 8;
-        unsigned pos = offset % 8;
-        tc35892_gpio_set(chip, offset, val);
-        return tc35892_set_bits(tc35892, reg, 1 << pos, 1 << pos);
-}
-static int tc35892_gpio_direction_input(struct gpio_chip *chip,
-                                        unsigned offset)
-{
-        struct tc35892_gpio *tc35892_gpio = to_tc35892_gpio(chip);
-        struct tc35892 *tc35892 = tc35892_gpio->tc35892;
-        u8 reg = TC35892_GPIODIR0 + offset / 8;
-        unsigned pos = offset % 8;
-        return tc35892_set_bits(tc35892, reg, 1 << pos, 0);
-}
-static int tc35892_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
-{
-        struct tc35892_gpio *tc35892_gpio = to_tc35892_gpio(chip);
-        return tc35892_gpio->irq_base + offset;
-}
-static struct gpio_chip template_chip = {
-        .label                  = "tc35892",
-        .owner                  = THIS_MODULE,
-        .direction_input        = tc35892_gpio_direction_input,
-        .get                    = tc35892_gpio_get,
-        .direction_output       = tc35892_gpio_direction_output,
-        .set                    = tc35892_gpio_set,
-        .to_irq                 = tc35892_gpio_to_irq,
-        .can_sleep              = 1,
-};
-static int tc35892_gpio_irq_set_type(unsigned int irq, unsigned int type)
-{
-        struct tc35892_gpio *tc35892_gpio = get_irq_chip_data(irq);
-        int offset = irq - tc35892_gpio->irq_base;
-        int regoffset = offset / 8;
-        int mask = 1 << (offset % 8);
-        if (type == IRQ_TYPE_EDGE_BOTH) {
-                tc35892_gpio->regs[REG_IBE][regoffset] |= mask;
-                return 0;
-        }
-        tc35892_gpio->regs[REG_IBE][regoffset] &= ~mask;
-        if (type == IRQ_TYPE_LEVEL_LOW || type == IRQ_TYPE_LEVEL_HIGH)
-                tc35892_gpio->regs[REG_IS][regoffset] |= mask;
-        else
-                tc35892_gpio->regs[REG_IS][regoffset] &= ~mask;
-        if (type == IRQ_TYPE_EDGE_RISING || type == IRQ_TYPE_LEVEL_HIGH)
-                tc35892_gpio->regs[REG_IEV][regoffset] |= mask;
-        else
-                tc35892_gpio->regs[REG_IEV][regoffset] &= ~mask;
-        return 0;
-}
-static void tc35892_gpio_irq_lock(unsigned int irq)
-{
-        struct tc35892_gpio *tc35892_gpio = get_irq_chip_data(irq);
-        mutex_lock(&tc35892_gpio->irq_lock);
-}
-static void tc35892_gpio_irq_sync_unlock(unsigned int irq)
-{
-        struct tc35892_gpio *tc35892_gpio = get_irq_chip_data(irq);
-        struct tc35892 *tc35892 = tc35892_gpio->tc35892;
-        static const u8 regmap[] = {
-                [REG_IBE]       = TC35892_GPIOIBE0,
-                [REG_IEV]       = TC35892_GPIOIEV0,
-                [REG_IS]        = TC35892_GPIOIS0,
-                [REG_IE]        = TC35892_GPIOIE0,
-        };
-        int i, j;
-        for (i = 0; i < CACHE_NR_REGS; i++) {
-                for (j = 0; j < CACHE_NR_BANKS; j++) {
-                        u8 old = tc35892_gpio->oldregs[i][j];
-                        u8 new = tc35892_gpio->regs[i][j];
-                        if (new == old)
-                                continue;
-                        tc35892_gpio->oldregs[i][j] = new;
-                        tc35892_reg_write(tc35892, regmap[i] + j * 8, new);
-                }
-        }
-        mutex_unlock(&tc35892_gpio->irq_lock);
-}
-static void tc35892_gpio_irq_mask(unsigned int irq)
-{
-        struct tc35892_gpio *tc35892_gpio = get_irq_chip_data(irq);
-        int offset = irq - tc35892_gpio->irq_base;
-        int regoffset = offset / 8;
-        int mask = 1 << (offset % 8);
-        tc35892_gpio->regs[REG_IE][regoffset] &= ~mask;
-}
-static void tc35892_gpio_irq_unmask(unsigned int irq)
-{
-        struct tc35892_gpio *tc35892_gpio = get_irq_chip_data(irq);
-        int offset = irq - tc35892_gpio->irq_base;
-        int regoffset = offset / 8;
-        int mask = 1 << (offset % 8);
-        tc35892_gpio->regs[REG_IE][regoffset] |= mask;
-}
-static struct irq_chip tc35892_gpio_irq_chip = {
-        .name                   = "tc35892-gpio",
-        .bus_lock               = tc35892_gpio_irq_lock,
-        .bus_sync_unlock        = tc35892_gpio_irq_sync_unlock,
-        .mask                   = tc35892_gpio_irq_mask,
-        .unmask                 = tc35892_gpio_irq_unmask,
-        .set_type               = tc35892_gpio_irq_set_type,
-};
-static irqreturn_t tc35892_gpio_irq(int irq, void *dev)
-{
-        struct tc35892_gpio *tc35892_gpio = dev;
-        struct tc35892 *tc35892 = tc35892_gpio->tc35892;
-        u8 status[CACHE_NR_BANKS];
-        int ret;
-        int i;
-        ret = tc35892_block_read(tc35892, TC35892_GPIOMIS0,
-                                 ARRAY_SIZE(status), status);
-        if (ret < 0)
-                return IRQ_NONE;
-        for (i = 0; i < ARRAY_SIZE(status); i++) {
-                unsigned int stat = status[i];
-                if (!stat)
-                        continue;
-                while (stat) {
-                        int bit = __ffs(stat);
-                        int line = i * 8 + bit;
-                        handle_nested_irq(tc35892_gpio->irq_base + line);
-                        stat &= ~(1 << bit);
-                }
-                tc35892_reg_write(tc35892, TC35892_GPIOIC0 + i, status[i]);
-        }
-        return IRQ_HANDLED;
-}
-static int tc35892_gpio_irq_init(struct tc35892_gpio *tc35892_gpio)
-{
-        int base = tc35892_gpio->irq_base;
-        int irq;
-        for (irq = base; irq < base + tc35892_gpio->chip.ngpio; irq++) {
-                set_irq_chip_data(irq, tc35892_gpio);
-                set_irq_chip_and_handler(irq, &tc35892_gpio_irq_chip,
-                                         handle_simple_irq);
-                set_irq_nested_thread(irq, 1);
-#ifdef CONFIG_ARM
-                set_irq_flags(irq, IRQF_VALID);
-#else
-                set_irq_noprobe(irq);
-#endif
-        }
-        return 0;
-}
-static void tc35892_gpio_irq_remove(struct tc35892_gpio *tc35892_gpio)
-{
-        int base = tc35892_gpio->irq_base;
-        int irq;
-        for (irq = base; irq < base + tc35892_gpio->chip.ngpio; irq++) {
-#ifdef CONFIG_ARM
-                set_irq_flags(irq, 0);
-#endif
-                set_irq_chip_and_handler(irq, NULL, NULL);
-                set_irq_chip_data(irq, NULL);
-        }
-}
-static int __devinit tc35892_gpio_probe(struct platform_device *pdev)
-{
-        struct tc35892 *tc35892 = dev_get_drvdata(pdev->dev.parent);
-        struct tc35892_gpio_platform_data *pdata;
-        struct tc35892_gpio *tc35892_gpio;
-        int ret;
-        int irq;
-        pdata = tc35892->pdata->gpio;
-        if (!pdata)
-                return -ENODEV;
-        irq = platform_get_irq(pdev, 0);
-        if (irq < 0)
-                return irq;
-        tc35892_gpio = kzalloc(sizeof(struct tc35892_gpio), GFP_KERNEL);
-        if (!tc35892_gpio)
-                return -ENOMEM;
-        mutex_init(&tc35892_gpio->irq_lock);
-        tc35892_gpio->dev = &pdev->dev;
-        tc35892_gpio->tc35892 = tc35892;
-        tc35892_gpio->chip = template_chip;
-        tc35892_gpio->chip.ngpio = tc35892->num_gpio;
-        tc35892_gpio->chip.dev = &pdev->dev;
-        tc35892_gpio->chip.base = pdata->gpio_base;
-        tc35892_gpio->irq_base = tc35892->irq_base + TC35892_INT_GPIO(0);
-        /* Bring the GPIO module out of reset */
-        ret = tc35892_set_bits(tc35892, TC35892_RSTCTRL,
-                               TC35892_RSTCTRL_GPIRST, 0);
-        if (ret < 0)
-                goto out_free;
-        ret = tc35892_gpio_irq_init(tc35892_gpio);
-        if (ret)
-                goto out_free;
-        ret = request_threaded_irq(irq, NULL, tc35892_gpio_irq, IRQF_ONESHOT,
-                                   "tc35892-gpio", tc35892_gpio);
-        if (ret) {
-                dev_err(&pdev->dev, "unable to get irq: %d\n", ret);
-                goto out_removeirq;
-        }
-        ret = gpiochip_add(&tc35892_gpio->chip);
-        if (ret) {
-                dev_err(&pdev->dev, "unable to add gpiochip: %d\n", ret);
-                goto out_freeirq;
-        }
-        if (pdata->setup)
-                pdata->setup(tc35892, tc35892_gpio->chip.base);
-        platform_set_drvdata(pdev, tc35892_gpio);
-        return 0;
-out_freeirq:
-        free_irq(irq, tc35892_gpio);
-out_removeirq:
-        tc35892_gpio_irq_remove(tc35892_gpio);
-out_free:
-        kfree(tc35892_gpio);
-        return ret;
-}
-static int __devexit tc35892_gpio_remove(struct platform_device *pdev)
-{
-        struct tc35892_gpio *tc35892_gpio = platform_get_drvdata(pdev);
-        struct tc35892 *tc35892 = tc35892_gpio->tc35892;
-        struct tc35892_gpio_platform_data *pdata = tc35892->pdata->gpio;
-        int irq = platform_get_irq(pdev, 0);
-        int ret;
-        if (pdata->remove)
-                pdata->remove(tc35892, tc35892_gpio->chip.base);
-        ret = gpiochip_remove(&tc35892_gpio->chip);
-        if (ret < 0) {
-                dev_err(tc35892_gpio->dev,
-                        "unable to remove gpiochip: %d\n", ret);
-                return ret;
-        }
-        free_irq(irq, tc35892_gpio);
-        tc35892_gpio_irq_remove(tc35892_gpio);
-        platform_set_drvdata(pdev, NULL);
-        kfree(tc35892_gpio);
-        return 0;
-}
-static struct platform_driver tc35892_gpio_driver = {
-        .driver.name    = "tc35892-gpio",
-        .driver.owner   = THIS_MODULE,
-        .probe          = tc35892_gpio_probe,
-        .remove         = __devexit_p(tc35892_gpio_remove),
-};
-static int __init tc35892_gpio_init(void)
-{
-        return platform_driver_register(&tc35892_gpio_driver);
-}
-subsys_initcall(tc35892_gpio_init);
-static void __exit tc35892_gpio_exit(void)
-{
-        platform_driver_unregister(&tc35892_gpio_driver);
-}
-module_exit(tc35892_gpio_exit);
-MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION("TC35892 GPIO driver");
-MODULE_AUTHOR("Hanumath Prasad, Rabin Vincent");
diff --git a/drivers/gpio/tc3589x-gpio.c b/drivers/gpio/tc3589x-gpio.c
new file mode 100644
index 000000000000..180d584454fb
--- /dev/null
+++ b/drivers/gpio/tc3589x-gpio.c
@@ -0,0 +1,389 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2010
+ *
+ * License Terms: GNU General Public License, version 2
+ * Author: Hanumath Prasad <hanumath.prasad@stericsson.com> for ST-Ericsson
+ * Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson
+ */
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/gpio.h>
+#include <linux/irq.h>
+#include <linux/interrupt.h>
+#include <linux/mfd/tc3589x.h>
+/*
+ * These registers are modified under the irq bus lock and cached to avoid
+ * unnecessary writes in bus_sync_unlock.
+ */
+enum { REG_IBE, REG_IEV, REG_IS, REG_IE };
+#define CACHE_NR_REGS   4
+#define CACHE_NR_BANKS  3
+struct tc3589x_gpio {
+        struct gpio_chip chip;
+        struct tc3589x *tc3589x;
+        struct device *dev;
+        struct mutex irq_lock;
+        int irq_base;
+        /* Caches of interrupt control registers for bus_lock */
+        u8 regs[CACHE_NR_REGS][CACHE_NR_BANKS];
+        u8 oldregs[CACHE_NR_REGS][CACHE_NR_BANKS];
+};
+static inline struct tc3589x_gpio *to_tc3589x_gpio(struct gpio_chip *chip)
+{
+        return container_of(chip, struct tc3589x_gpio, chip);
+}
+static int tc3589x_gpio_get(struct gpio_chip *chip, unsigned offset)
+{
+        struct tc3589x_gpio *tc3589x_gpio = to_tc3589x_gpio(chip);
+        struct tc3589x *tc3589x = tc3589x_gpio->tc3589x;
+        u8 reg = TC3589x_GPIODATA0 + (offset / 8) * 2;
+        u8 mask = 1 << (offset % 8);
+        int ret;
+        ret = tc3589x_reg_read(tc3589x, reg);
+        if (ret < 0)
+                return ret;
+        return ret & mask;
+}
+static void tc3589x_gpio_set(struct gpio_chip *chip, unsigned offset, int val)
+{
+        struct tc3589x_gpio *tc3589x_gpio = to_tc3589x_gpio(chip);
+        struct tc3589x *tc3589x = tc3589x_gpio->tc3589x;
+        u8 reg = TC3589x_GPIODATA0 + (offset / 8) * 2;
+        unsigned pos = offset % 8;
+        u8 data[] = {!!val << pos, 1 << pos};
+        tc3589x_block_write(tc3589x, reg, ARRAY_SIZE(data), data);
+}
+static int tc3589x_gpio_direction_output(struct gpio_chip *chip,
+                                         unsigned offset, int val)
+{
+        struct tc3589x_gpio *tc3589x_gpio = to_tc3589x_gpio(chip);
+        struct tc3589x *tc3589x = tc3589x_gpio->tc3589x;
+        u8 reg = TC3589x_GPIODIR0 + offset / 8;
+        unsigned pos = offset % 8;
+        tc3589x_gpio_set(chip, offset, val);
+        return tc3589x_set_bits(tc3589x, reg, 1 << pos, 1 << pos);
+}
+static int tc3589x_gpio_direction_input(struct gpio_chip *chip,
+                                        unsigned offset)
+{
+        struct tc3589x_gpio *tc3589x_gpio = to_tc3589x_gpio(chip);
+        struct tc3589x *tc3589x = tc3589x_gpio->tc3589x;
+        u8 reg = TC3589x_GPIODIR0 + offset / 8;
+        unsigned pos = offset % 8;
+        return tc3589x_set_bits(tc3589x, reg, 1 << pos, 0);
+}
+static int tc3589x_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
+{
+        struct tc3589x_gpio *tc3589x_gpio = to_tc3589x_gpio(chip);
+        return tc3589x_gpio->irq_base + offset;
+}
+static struct gpio_chip template_chip = {
+        .label                  = "tc3589x",
+        .owner                  = THIS_MODULE,
+        .direction_input        = tc3589x_gpio_direction_input,
+        .get                    = tc3589x_gpio_get,
+        .direction_output       = tc3589x_gpio_direction_output,
+        .set                    = tc3589x_gpio_set,
+        .to_irq                 = tc3589x_gpio_to_irq,
+        .can_sleep              = 1,
+};
+static int tc3589x_gpio_irq_set_type(unsigned int irq, unsigned int type)
+{
+        struct tc3589x_gpio *tc3589x_gpio = get_irq_chip_data(irq);
+        int offset = irq - tc3589x_gpio->irq_base;
+        int regoffset = offset / 8;
+        int mask = 1 << (offset % 8);
+        if (type == IRQ_TYPE_EDGE_BOTH) {
+                tc3589x_gpio->regs[REG_IBE][regoffset] |= mask;
+                return 0;
+        }
+        tc3589x_gpio->regs[REG_IBE][regoffset] &= ~mask;
+        if (type == IRQ_TYPE_LEVEL_LOW || type == IRQ_TYPE_LEVEL_HIGH)
+                tc3589x_gpio->regs[REG_IS][regoffset] |= mask;
+        else
+                tc3589x_gpio->regs[REG_IS][regoffset] &= ~mask;
+        if (type == IRQ_TYPE_EDGE_RISING || type == IRQ_TYPE_LEVEL_HIGH)
+                tc3589x_gpio->regs[REG_IEV][regoffset] |= mask;
+        else
+                tc3589x_gpio->regs[REG_IEV][regoffset] &= ~mask;
+        return 0;
+}
+static void tc3589x_gpio_irq_lock(unsigned int irq)
+{
+        struct tc3589x_gpio *tc3589x_gpio = get_irq_chip_data(irq);
+        mutex_lock(&tc3589x_gpio->irq_lock);
+}
+static void tc3589x_gpio_irq_sync_unlock(unsigned int irq)
+{
+        struct tc3589x_gpio *tc3589x_gpio = get_irq_chip_data(irq);
+        struct tc3589x *tc3589x = tc3589x_gpio->tc3589x;
+        static const u8 regmap[] = {
+                [REG_IBE]       = TC3589x_GPIOIBE0,
+                [REG_IEV]       = TC3589x_GPIOIEV0,
+                [REG_IS]        = TC3589x_GPIOIS0,
+                [REG_IE]        = TC3589x_GPIOIE0,
+        };
+        int i, j;
+        for (i = 0; i < CACHE_NR_REGS; i++) {
+                for (j = 0; j < CACHE_NR_BANKS; j++) {
+                        u8 old = tc3589x_gpio->oldregs[i][j];
+                        u8 new = tc3589x_gpio->regs[i][j];
+                        if (new == old)
+                                continue;
+                        tc3589x_gpio->oldregs[i][j] = new;
+                        tc3589x_reg_write(tc3589x, regmap[i] + j * 8, new);
+                }
+        }
+        mutex_unlock(&tc3589x_gpio->irq_lock);
+}
+static void tc3589x_gpio_irq_mask(unsigned int irq)
+{
+        struct tc3589x_gpio *tc3589x_gpio = get_irq_chip_data(irq);
+        int offset = irq - tc3589x_gpio->irq_base;
+        int regoffset = offset / 8;
+        int mask = 1 << (offset % 8);
+        tc3589x_gpio->regs[REG_IE][regoffset] &= ~mask;
+}
+static void tc3589x_gpio_irq_unmask(unsigned int irq)
+{
+        struct tc3589x_gpio *tc3589x_gpio = get_irq_chip_data(irq);
+        int offset = irq - tc3589x_gpio->irq_base;
+        int regoffset = offset / 8;
+        int mask = 1 << (offset % 8);
+        tc3589x_gpio->regs[REG_IE][regoffset] |= mask;
+}
+static struct irq_chip tc3589x_gpio_irq_chip = {
+        .name                   = "tc3589x-gpio",
+        .bus_lock               = tc3589x_gpio_irq_lock,
+        .bus_sync_unlock        = tc3589x_gpio_irq_sync_unlock,
+        .mask                   = tc3589x_gpio_irq_mask,
+        .unmask                 = tc3589x_gpio_irq_unmask,
+        .set_type               = tc3589x_gpio_irq_set_type,
+};
+static irqreturn_t tc3589x_gpio_irq(int irq, void *dev)
+{
+        struct tc3589x_gpio *tc3589x_gpio = dev;
+        struct tc3589x *tc3589x = tc3589x_gpio->tc3589x;
+        u8 status[CACHE_NR_BANKS];
+        int ret;
+        int i;
+        ret = tc3589x_block_read(tc3589x, TC3589x_GPIOMIS0,
+                                 ARRAY_SIZE(status), status);
+        if (ret < 0)
+                return IRQ_NONE;
+        for (i = 0; i < ARRAY_SIZE(status); i++) {
+                unsigned int stat = status[i];
+                if (!stat)
+                        continue;
+                while (stat) {
+                        int bit = __ffs(stat);
+                        int line = i * 8 + bit;
+                        handle_nested_irq(tc3589x_gpio->irq_base + line);
+                        stat &= ~(1 << bit);
+                }
+                tc3589x_reg_write(tc3589x, TC3589x_GPIOIC0 + i, status[i]);
+        }
+        return IRQ_HANDLED;
+}
+static int tc3589x_gpio_irq_init(struct tc3589x_gpio *tc3589x_gpio)
+{
+        int base = tc3589x_gpio->irq_base;
+        int irq;
+        for (irq = base; irq < base + tc3589x_gpio->chip.ngpio; irq++) {
+                set_irq_chip_data(irq, tc3589x_gpio);
+                set_irq_chip_and_handler(irq, &tc3589x_gpio_irq_chip,
+                                         handle_simple_irq);
+                set_irq_nested_thread(irq, 1);
+#ifdef CONFIG_ARM
+                set_irq_flags(irq, IRQF_VALID);
+#else
+                set_irq_noprobe(irq);
+#endif
+        }
+        return 0;
+}
+static void tc3589x_gpio_irq_remove(struct tc3589x_gpio *tc3589x_gpio)
+{
+        int base = tc3589x_gpio->irq_base;
+        int irq;
+        for (irq = base; irq < base + tc3589x_gpio->chip.ngpio; irq++) {
+#ifdef CONFIG_ARM
+                set_irq_flags(irq, 0);
+#endif
+                set_irq_chip_and_handler(irq, NULL, NULL);
+                set_irq_chip_data(irq, NULL);
+        }
+}
+static int __devinit tc3589x_gpio_probe(struct platform_device *pdev)
+{
+        struct tc3589x *tc3589x = dev_get_drvdata(pdev->dev.parent);
+        struct tc3589x_gpio_platform_data *pdata;
+        struct tc3589x_gpio *tc3589x_gpio;
+        int ret;
+        int irq;
+        pdata = tc3589x->pdata->gpio;
+        if (!pdata)
+                return -ENODEV;
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0)
+                return irq;
+        tc3589x_gpio = kzalloc(sizeof(struct tc3589x_gpio), GFP_KERNEL);
+        if (!tc3589x_gpio)
+                return -ENOMEM;
+        mutex_init(&tc3589x_gpio->irq_lock);
+        tc3589x_gpio->dev = &pdev->dev;
+        tc3589x_gpio->tc3589x = tc3589x;
+        tc3589x_gpio->chip = template_chip;
+        tc3589x_gpio->chip.ngpio = tc3589x->num_gpio;
+        tc3589x_gpio->chip.dev = &pdev->dev;
+        tc3589x_gpio->chip.base = pdata->gpio_base;
+        tc3589x_gpio->irq_base = tc3589x->irq_base + TC3589x_INT_GPIO(0);
+        /* Bring the GPIO module out of reset */
+        ret = tc3589x_set_bits(tc3589x, TC3589x_RSTCTRL,
+                               TC3589x_RSTCTRL_GPIRST, 0);
+        if (ret < 0)
+                goto out_free;
+        ret = tc3589x_gpio_irq_init(tc3589x_gpio);
+        if (ret)
+                goto out_free;
+        ret = request_threaded_irq(irq, NULL, tc3589x_gpio_irq, IRQF_ONESHOT,
+                                   "tc3589x-gpio", tc3589x_gpio);
+        if (ret) {
+                dev_err(&pdev->dev, "unable to get irq: %d\n", ret);
+                goto out_removeirq;
+        }
+        ret = gpiochip_add(&tc3589x_gpio->chip);
+        if (ret) {
+                dev_err(&pdev->dev, "unable to add gpiochip: %d\n", ret);
+                goto out_freeirq;
+        }
+        if (pdata->setup)
+                pdata->setup(tc3589x, tc3589x_gpio->chip.base);
+        platform_set_drvdata(pdev, tc3589x_gpio);
+        return 0;
+out_freeirq:
+        free_irq(irq, tc3589x_gpio);
+out_removeirq:
+        tc3589x_gpio_irq_remove(tc3589x_gpio);
+out_free:
+        kfree(tc3589x_gpio);
+        return ret;
+}
+static int __devexit tc3589x_gpio_remove(struct platform_device *pdev)
+{
+        struct tc3589x_gpio *tc3589x_gpio = platform_get_drvdata(pdev);
+        struct tc3589x *tc3589x = tc3589x_gpio->tc3589x;
+        struct tc3589x_gpio_platform_data *pdata = tc3589x->pdata->gpio;
+        int irq = platform_get_irq(pdev, 0);
+        int ret;
+        if (pdata->remove)
+                pdata->remove(tc3589x, tc3589x_gpio->chip.base);
+        ret = gpiochip_remove(&tc3589x_gpio->chip);
+        if (ret < 0) {
+                dev_err(tc3589x_gpio->dev,
+                        "unable to remove gpiochip: %d\n", ret);
+                return ret;
+        }
+        free_irq(irq, tc3589x_gpio);
+        tc3589x_gpio_irq_remove(tc3589x_gpio);
+        platform_set_drvdata(pdev, NULL);
+        kfree(tc3589x_gpio);
+        return 0;
+}
+static struct platform_driver tc3589x_gpio_driver = {
+        .driver.name    = "tc3589x-gpio",
+        .driver.owner   = THIS_MODULE,
+        .probe          = tc3589x_gpio_probe,
+        .remove         = __devexit_p(tc3589x_gpio_remove),
+};
+static int __init tc3589x_gpio_init(void)
+{
+        return platform_driver_register(&tc3589x_gpio_driver);
+}
+subsys_initcall(tc3589x_gpio_init);
+static void __exit tc3589x_gpio_exit(void)
+{
+        platform_driver_unregister(&tc3589x_gpio_driver);
+}
+module_exit(tc3589x_gpio_exit);
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("TC3589x GPIO driver");
+MODULE_AUTHOR("Hanumath Prasad, Rabin Vincent");
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 6985cb1da72c..2baa6708e44c 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -156,12 +156,12 @@ static struct drm_conn_prop_enum_list drm_connector_enum_list[] =
        { DRM_MODE_CONNECTOR_SVIDEO, "SVIDEO", 0 },
        { DRM_MODE_CONNECTOR_LVDS, "LVDS", 0 },
        { DRM_MODE_CONNECTOR_Component, "Component", 0 },
-        { DRM_MODE_CONNECTOR_9PinDIN, "9-pin DIN", 0 },
+        { DRM_MODE_CONNECTOR_9PinDIN, "DIN", 0 },
-        { DRM_MODE_CONNECTOR_DisplayPort, "DisplayPort", 0 },
+        { DRM_MODE_CONNECTOR_DisplayPort, "DP", 0 },
-        { DRM_MODE_CONNECTOR_HDMIA, "HDMI Type A", 0 },
+        { DRM_MODE_CONNECTOR_HDMIA, "HDMI-A", 0 },
-        { DRM_MODE_CONNECTOR_HDMIB, "HDMI Type B", 0 },
+        { DRM_MODE_CONNECTOR_HDMIB, "HDMI-B", 0 },
        { DRM_MODE_CONNECTOR_TV, "TV", 0 },
-        { DRM_MODE_CONNECTOR_eDP, "Embedded DisplayPort", 0 },
+        { DRM_MODE_CONNECTOR_eDP, "eDP", 0 },
 };
 static struct drm_prop_enum_list drm_encoder_enum_list[] =
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index 7ca59359fee2..bede10a03407 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -241,7 +241,7 @@ void drm_helper_disable_unused_functions(struct drm_device *dev)
        }
        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-                if (!drm_helper_encoder_in_use(encoder)) {
+                if (encoder->crtc && !drm_helper_encoder_in_use(encoder)) {
                        drm_encoder_disable(encoder);
                        /* disconnector encoder from any connector */
                        encoder->crtc = NULL;
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 9d3a5030b6e1..16d5155edad1 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -585,10 +585,13 @@ static int drm_queue_vblank_event(struct drm_device *dev, int pipe,
        struct timeval now;
        unsigned long flags;
        unsigned int seq;
+        int ret;
        e = kzalloc(sizeof *e, GFP_KERNEL);
-        if (e == NULL)
+        if (e == NULL) {
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto err_put;
+        }
        e->pipe = pipe;
        e->base.pid = current->pid;
@@ -603,9 +606,8 @@ static int drm_queue_vblank_event(struct drm_device *dev, int pipe,
        spin_lock_irqsave(&dev->event_lock, flags);
        if (file_priv->event_space < sizeof e->event) {
-                spin_unlock_irqrestore(&dev->event_lock, flags);
+                ret = -EBUSY;
-                kfree(e);
+                goto err_unlock;
-                return -ENOMEM;
        }
        file_priv->event_space -= sizeof e->event;
@@ -626,7 +628,7 @@ static int drm_queue_vblank_event(struct drm_device *dev, int pipe,
        if ((seq - vblwait->request.sequence) <= (1 << 23)) {
                e->event.tv_sec = now.tv_sec;
                e->event.tv_usec = now.tv_usec;
-                drm_vblank_put(dev, e->pipe);
+                drm_vblank_put(dev, 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,
@@ -638,6 +640,13 @@ static int drm_queue_vblank_event(struct drm_device *dev, int pipe,
        spin_unlock_irqrestore(&dev->event_lock, flags);
        return 0;
+err_unlock:
+        spin_unlock_irqrestore(&dev->event_lock, flags);
+        kfree(e);
+err_put:
+        drm_vblank_put(dev, pipe);
+        return ret;
 }
 /**
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 7a26f4dd21ae..e6800819bca8 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -767,6 +767,9 @@ static int i915_getparam(struct drm_device *dev, void *data,
        case I915_PARAM_HAS_BLT:
                value = HAS_BLT(dev);
                break;
+        case I915_PARAM_HAS_COHERENT_RINGS:
+                value = 1;
+                break;
        default:
                DRM_DEBUG_DRIVER("Unknown parameter %d\n",
                                 param->param);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 5e54821af996..275ec6ed43ae 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -4374,10 +4374,20 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data,
                 * use this buffer rather sooner than later, so issuing the required
                 * flush earlier is beneficial.
                 */
-                if (obj->write_domain & I915_GEM_GPU_DOMAINS)
+                if (obj->write_domain & I915_GEM_GPU_DOMAINS) {
                        i915_gem_flush_ring(dev, file_priv,
                                            obj_priv->ring,
                                            0, obj->write_domain);
+                } else if (obj_priv->ring->outstanding_lazy_request) {
+                        /* This ring is not being cleared by active usage,
+                         * so emit a request to do so.
+                         */
+                        u32 seqno = i915_add_request(dev,
+                                                     NULL, NULL,
+                                                     obj_priv->ring);
+                        if (seqno == 0)
+                                ret = -ENOMEM;
+                }
                /* Update the active list for the hardware's current position.
                 * Otherwise this only updates on a delayed timer or when irqs
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 25ed911a3112..878fc766a12c 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -3033,6 +3033,7 @@
 #define  TRANS_DP_10BPC         (1<<9)
 #define  TRANS_DP_6BPC          (2<<9)
 #define  TRANS_DP_12BPC         (3<<9)
+#define  TRANS_DP_BPC_MASK      (3<<9)
 #define  TRANS_DP_VSYNC_ACTIVE_HIGH     (1<<4)
 #define  TRANS_DP_VSYNC_ACTIVE_LOW      0
 #define  TRANS_DP_HSYNC_ACTIVE_HIGH     (1<<3)
diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/intel_acpi.c
index 65c88f9ba12c..2cb8e0b9f1ee 100644
--- a/drivers/gpu/drm/i915/intel_acpi.c
+++ b/drivers/gpu/drm/i915/intel_acpi.c
@@ -190,37 +190,6 @@ out:
        kfree(output.pointer);
 }
-static int intel_dsm_switchto(enum vga_switcheroo_client_id id)
-{
-        return 0;
-}
-static int intel_dsm_power_state(enum vga_switcheroo_client_id id,
-                                 enum vga_switcheroo_state state)
-{
-        return 0;
-}
-static int intel_dsm_init(void)
-{
-        return 0;
-}
-static int intel_dsm_get_client_id(struct pci_dev *pdev)
-{
-        if (intel_dsm_priv.dhandle == DEVICE_ACPI_HANDLE(&pdev->dev))
-                return VGA_SWITCHEROO_IGD;
-        else
-                return VGA_SWITCHEROO_DIS;
-}
-static struct vga_switcheroo_handler intel_dsm_handler = {
-        .switchto = intel_dsm_switchto,
-        .power_state = intel_dsm_power_state,
-        .init = intel_dsm_init,
-        .get_client_id = intel_dsm_get_client_id,
-};
 static bool intel_dsm_pci_probe(struct pci_dev *pdev)
 {
        acpi_handle dhandle, intel_handle;
@@ -276,11 +245,8 @@ void intel_register_dsm_handler(void)
 {
        if (!intel_dsm_detect())
                return;
-        vga_switcheroo_register_handler(&intel_dsm_handler);
 }
 void intel_unregister_dsm_handler(void)
 {
-        vga_switcheroo_unregister_handler();
 }
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 255b52ee0091..d9b7092439ef 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2120,9 +2120,11 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
                reg = TRANS_DP_CTL(pipe);
                temp = I915_READ(reg);
                temp &= ~(TRANS_DP_PORT_SEL_MASK |
-                          TRANS_DP_SYNC_MASK);
+                          TRANS_DP_SYNC_MASK |
+                          TRANS_DP_BPC_MASK);
                temp |= (TRANS_DP_OUTPUT_ENABLE |
                         TRANS_DP_ENH_FRAMING);
+                temp |= TRANS_DP_8BPC;
                if (crtc->mode.flags & DRM_MODE_FLAG_PHSYNC)
                        temp |= TRANS_DP_HSYNC_ACTIVE_HIGH;
@@ -2712,27 +2714,19 @@ fdi_reduce_ratio(u32 *num, u32 *den)
        }
 }
-#define DATA_N 0x800000
-#define LINK_N 0x80000
 static void
 ironlake_compute_m_n(int bits_per_pixel, int nlanes, int pixel_clock,
                     int link_clock, struct fdi_m_n *m_n)
 {
-        u64 temp;
        m_n->tu = 64; /* default size */
-        temp = (u64) DATA_N * pixel_clock;
+        /* BUG_ON(pixel_clock > INT_MAX / 36); */
-        temp = div_u64(temp, link_clock);
+        m_n->gmch_m = bits_per_pixel * pixel_clock;
-        m_n->gmch_m = div_u64(temp * bits_per_pixel, nlanes);
+        m_n->gmch_n = link_clock * nlanes * 8;
-        m_n->gmch_m >>= 3; /* convert to bytes_per_pixel */
-        m_n->gmch_n = DATA_N;
        fdi_reduce_ratio(&m_n->gmch_m, &m_n->gmch_n);
-        temp = (u64) LINK_N * pixel_clock;
+        m_n->link_m = pixel_clock;
-        m_n->link_m = div_u64(temp, link_clock);
+        m_n->link_n = link_clock;
-        m_n->link_n = LINK_N;
        fdi_reduce_ratio(&m_n->link_m, &m_n->link_n);
 }
@@ -3716,6 +3710,7 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
        /* FDI link */
        if (HAS_PCH_SPLIT(dev)) {
+                int pixel_multiplier = intel_mode_get_pixel_multiplier(adjusted_mode);
                int lane = 0, link_bw, bpp;
                /* CPU eDP doesn't require FDI link, so just set DP M/N
                   according to current link config */
@@ -3799,6 +3794,8 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
                intel_crtc->fdi_lanes = lane;
+                if (pixel_multiplier > 1)
+                        link_bw *= pixel_multiplier;
                ironlake_compute_m_n(bpp, lane, target_clock, link_bw, &m_n);
        }
@@ -5236,6 +5233,55 @@ static const struct drm_crtc_funcs intel_crtc_funcs = {
        .page_flip = intel_crtc_page_flip,
 };
+static void intel_sanitize_modesetting(struct drm_device *dev,
+                                       int pipe, int plane)
+{
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        u32 reg, val;
+        if (HAS_PCH_SPLIT(dev))
+                return;
+        /* Who knows what state these registers were left in by the BIOS or
+         * grub?
+         *
+         * If we leave the registers in a conflicting state (e.g. with the
+         * display plane reading from the other pipe than the one we intend
+         * to use) then when we attempt to teardown the active mode, we will
+         * not disable the pipes and planes in the correct order -- leaving
+         * a plane reading from a disabled pipe and possibly leading to
+         * undefined behaviour.
+         */
+        reg = DSPCNTR(plane);
+        val = I915_READ(reg);
+        if ((val & DISPLAY_PLANE_ENABLE) == 0)
+                return;
+        if (!!(val & DISPPLANE_SEL_PIPE_MASK) == pipe)
+                return;
+        /* This display plane is active and attached to the other CPU pipe. */
+        pipe = !pipe;
+        /* Disable the plane and wait for it to stop reading from the pipe. */
+        I915_WRITE(reg, val & ~DISPLAY_PLANE_ENABLE);
+        intel_flush_display_plane(dev, plane);
+        if (IS_GEN2(dev))
+                intel_wait_for_vblank(dev, pipe);
+        if (pipe == 0 && (dev_priv->quirks & QUIRK_PIPEA_FORCE))
+                return;
+        /* Switch off the pipe. */
+        reg = PIPECONF(pipe);
+        val = I915_READ(reg);
+        if (val & PIPECONF_ENABLE) {
+                I915_WRITE(reg, val & ~PIPECONF_ENABLE);
+                intel_wait_for_pipe_off(dev, pipe);
+        }
+}
 static void intel_crtc_init(struct drm_device *dev, int pipe)
 {
@@ -5287,6 +5333,8 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
        setup_timer(&intel_crtc->idle_timer, intel_crtc_idle_timer,
                    (unsigned long)intel_crtc);
+        intel_sanitize_modesetting(dev, intel_crtc->pipe, intel_crtc->plane);
 }
 int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 300f64b4238b..df648cb4c296 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1376,6 +1376,9 @@ intel_dp_link_down(struct intel_dp *intel_dp)
        struct drm_i915_private *dev_priv = dev->dev_private;
        uint32_t DP = intel_dp->DP;
+        if ((I915_READ(intel_dp->output_reg) & DP_PORT_EN) == 0)
+                return;
        DRM_DEBUG_KMS("\n");
        if (is_edp(intel_dp)) {
@@ -1398,6 +1401,28 @@ intel_dp_link_down(struct intel_dp *intel_dp)
        if (is_edp(intel_dp))
                DP |= DP_LINK_TRAIN_OFF;
+        if (!HAS_PCH_CPT(dev) &&
+            I915_READ(intel_dp->output_reg) & DP_PIPEB_SELECT) {
+                struct intel_crtc *intel_crtc = to_intel_crtc(intel_dp->base.base.crtc);
+                /* Hardware workaround: leaving our transcoder select
+                 * set to transcoder B while it's off will prevent the
+                 * corresponding HDMI output on transcoder A.
+                 *
+                 * Combine this with another hardware workaround:
+                 * transcoder select bit can only be cleared while the
+                 * port is enabled.
+                 */
+                DP &= ~DP_PIPEB_SELECT;
+                I915_WRITE(intel_dp->output_reg, DP);
+                /* Changes to enable or select take place the vblank
+                 * after being written.
+                 */
+                intel_wait_for_vblank(intel_dp->base.base.dev,
+                                      intel_crtc->pipe);
+        }
        I915_WRITE(intel_dp->output_reg, DP & ~DP_PORT_EN);
        POSTING_READ(intel_dp->output_reg);
 }
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index f79327fc6653..25bcedf386fd 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -68,7 +68,7 @@ static struct intel_lvds *intel_attached_lvds(struct drm_connector *connector)
 /**
 * Sets the power state for the panel.
 */
-static void intel_lvds_set_power(struct intel_lvds *intel_lvds, bool on)
+static void intel_lvds_enable(struct intel_lvds *intel_lvds)
 {
        struct drm_device *dev = intel_lvds->base.base.dev;
        struct drm_i915_private *dev_priv = dev->dev_private;
@@ -82,26 +82,61 @@ static void intel_lvds_set_power(struct intel_lvds *intel_lvds, bool on)
                lvds_reg = LVDS;
        }
-        if (on) {
+        I915_WRITE(lvds_reg, I915_READ(lvds_reg) | LVDS_PORT_EN);
-                I915_WRITE(lvds_reg, I915_READ(lvds_reg) | LVDS_PORT_EN);
-                I915_WRITE(ctl_reg, I915_READ(ctl_reg) | POWER_TARGET_ON);
-                intel_panel_set_backlight(dev, dev_priv->backlight_level);
-        } else {
-                dev_priv->backlight_level = intel_panel_get_backlight(dev);
-                intel_panel_set_backlight(dev, 0);
-                I915_WRITE(ctl_reg, I915_READ(ctl_reg) & ~POWER_TARGET_ON);
-                if (intel_lvds->pfit_control) {
+        if (intel_lvds->pfit_dirty) {
-                        if (wait_for((I915_READ(PP_STATUS) & PP_ON) == 0, 1000))
+                /*
-                                DRM_ERROR("timed out waiting for panel to power off\n");
+                 * Enable automatic panel scaling so that non-native modes
-                        I915_WRITE(PFIT_CONTROL, 0);
+                 * fill the screen.  The panel fitter should only be
-                        intel_lvds->pfit_control = 0;
+                 * adjusted whilst the pipe is disabled, according to
+                 * register description and PRM.
+                 */
+                DRM_DEBUG_KMS("applying panel-fitter: %x, %x\n",
+                              intel_lvds->pfit_control,
+                              intel_lvds->pfit_pgm_ratios);
+                if (wait_for((I915_READ(PP_STATUS) & PP_ON) == 0, 1000)) {
+                        DRM_ERROR("timed out waiting for panel to power off\n");
+                } else {
+                        I915_WRITE(PFIT_PGM_RATIOS, intel_lvds->pfit_pgm_ratios);
+                        I915_WRITE(PFIT_CONTROL, intel_lvds->pfit_control);
                        intel_lvds->pfit_dirty = false;
                }
+        }
+        I915_WRITE(ctl_reg, I915_READ(ctl_reg) | POWER_TARGET_ON);
+        POSTING_READ(lvds_reg);
+        intel_panel_set_backlight(dev, dev_priv->backlight_level);
+}
-                I915_WRITE(lvds_reg, I915_READ(lvds_reg) & ~LVDS_PORT_EN);
+static void intel_lvds_disable(struct intel_lvds *intel_lvds)
+{
+        struct drm_device *dev = intel_lvds->base.base.dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        u32 ctl_reg, lvds_reg;
+        if (HAS_PCH_SPLIT(dev)) {
+                ctl_reg = PCH_PP_CONTROL;
+                lvds_reg = PCH_LVDS;
+        } else {
+                ctl_reg = PP_CONTROL;
+                lvds_reg = LVDS;
+        }
+        dev_priv->backlight_level = intel_panel_get_backlight(dev);
+        intel_panel_set_backlight(dev, 0);
+        I915_WRITE(ctl_reg, I915_READ(ctl_reg) & ~POWER_TARGET_ON);
+        if (intel_lvds->pfit_control) {
+                if (wait_for((I915_READ(PP_STATUS) & PP_ON) == 0, 1000))
+                        DRM_ERROR("timed out waiting for panel to power off\n");
+                I915_WRITE(PFIT_CONTROL, 0);
+                intel_lvds->pfit_dirty = true;
        }
+        I915_WRITE(lvds_reg, I915_READ(lvds_reg) & ~LVDS_PORT_EN);
        POSTING_READ(lvds_reg);
 }
@@ -110,9 +145,9 @@ static void intel_lvds_dpms(struct drm_encoder *encoder, int mode)
        struct intel_lvds *intel_lvds = to_intel_lvds(encoder);
        if (mode == DRM_MODE_DPMS_ON)
-                intel_lvds_set_power(intel_lvds, true);
+                intel_lvds_enable(intel_lvds);
        else
-                intel_lvds_set_power(intel_lvds, false);
+                intel_lvds_disable(intel_lvds);
        /* XXX: We never power down the LVDS pairs. */
 }
@@ -411,43 +446,18 @@ static void intel_lvds_commit(struct drm_encoder *encoder)
        /* Always do a full power on as we do not know what state
         * we were left in.
         */
-        intel_lvds_set_power(intel_lvds, true);
+        intel_lvds_enable(intel_lvds);
 }
 static void intel_lvds_mode_set(struct drm_encoder *encoder,
                                struct drm_display_mode *mode,
                                struct drm_display_mode *adjusted_mode)
 {
-        struct drm_device *dev = encoder->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_lvds *intel_lvds = to_intel_lvds(encoder);
        /*
         * The LVDS pin pair will already have been turned on in the
         * intel_crtc_mode_set since it has a large impact on the DPLL
         * settings.
         */
-        if (HAS_PCH_SPLIT(dev))
-                return;
-        if (!intel_lvds->pfit_dirty)
-                return;
-        /*
-         * Enable automatic panel scaling so that non-native modes fill the
-         * screen.  Should be enabled before the pipe is enabled, according to
-         * register description and PRM.
-         */
-        DRM_DEBUG_KMS("applying panel-fitter: %x, %x\n",
-                      intel_lvds->pfit_control,
-                      intel_lvds->pfit_pgm_ratios);
-        if (wait_for((I915_READ(PP_STATUS) & PP_ON) == 0, 1000))
-                DRM_ERROR("timed out waiting for panel to power off\n");
-        I915_WRITE(PFIT_PGM_RATIOS, intel_lvds->pfit_pgm_ratios);
-        I915_WRITE(PFIT_CONTROL, intel_lvds->pfit_control);
-        intel_lvds->pfit_dirty = false;
 }
 /**
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index b83306f9244b..89a65be8a3f3 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -156,23 +156,25 @@ static int init_ring_common(struct drm_device *dev,
        /* G45 ring initialization fails to reset head to zero */
        if (head != 0) {
-                DRM_ERROR("%s head not reset to zero "
+                DRM_DEBUG_KMS("%s head not reset to zero "
-                                "ctl %08x head %08x tail %08x start %08x\n",
+                              "ctl %08x head %08x tail %08x start %08x\n",
-                                ring->name,
+                              ring->name,
-                                I915_READ_CTL(ring),
+                              I915_READ_CTL(ring),
-                                I915_READ_HEAD(ring),
+                              I915_READ_HEAD(ring),
-                                I915_READ_TAIL(ring),
+                              I915_READ_TAIL(ring),
-                                I915_READ_START(ring));
+                              I915_READ_START(ring));
                I915_WRITE_HEAD(ring, 0);
-                DRM_ERROR("%s head forced to zero "
+                if (I915_READ_HEAD(ring) & HEAD_ADDR) {
-                                "ctl %08x head %08x tail %08x start %08x\n",
+                        DRM_ERROR("failed to set %s head to zero "
-                                ring->name,
+                                  "ctl %08x head %08x tail %08x start %08x\n",
-                                I915_READ_CTL(ring),
+                                  ring->name,
-                                I915_READ_HEAD(ring),
+                                  I915_READ_CTL(ring),
-                                I915_READ_TAIL(ring),
+                                  I915_READ_HEAD(ring),
-                                I915_READ_START(ring));
+                                  I915_READ_TAIL(ring),
+                                  I915_READ_START(ring));
+                }
        }
        I915_WRITE_CTL(ring,
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index a3552594ccc4..4d7a2e1bdb90 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -878,12 +878,15 @@ void r600_pcie_gart_tlb_flush(struct radeon_device *rdev)
        u32 tmp;
        /* flush hdp cache so updates hit vram */
-        if ((rdev->family >= CHIP_RV770) && (rdev->family <= CHIP_RV740)) {
+        if ((rdev->family >= CHIP_RV770) && (rdev->family <= CHIP_RV740) &&
+            !(rdev->flags & RADEON_IS_AGP)) {
                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
+                 * This seems to cause problems on some AGP cards. Just use the old
+                 * method for them.
                 */
                WREG32(HDP_DEBUG1, 0);
                tmp = readl((void __iomem *)ptr);
@@ -1195,8 +1198,10 @@ void r600_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc)
                                mc->vram_end, mc->real_vram_size >> 20);
        } else {
                u64 base = 0;
-                if (rdev->flags & RADEON_IS_IGP)
+                if (rdev->flags & RADEON_IS_IGP) {
-                        base = (RREG32(MC_VM_FB_LOCATION) & 0xFFFF) << 24;
+                        base = RREG32(MC_VM_FB_LOCATION) & 0xFFFF;
+                        base <<= 24;
+                }
                radeon_vram_location(rdev, &rdev->mc, base);
                rdev->mc.gtt_base_align = 0;
                radeon_gtt_location(rdev, mc);
@@ -3483,10 +3488,12 @@ int r600_debugfs_mc_info_init(struct radeon_device *rdev)
 void r600_ioctl_wait_idle(struct radeon_device *rdev, struct radeon_bo *bo)
 {
        /* r7xx hw bug.  write to HDP_DEBUG1 followed by fb read
-         * rather than write to HDP_REG_COHERENCY_FLUSH_CNTL
+         * rather than write to HDP_REG_COHERENCY_FLUSH_CNTL.
+         * This seems to cause problems on some AGP cards. Just use the old
+         * method for them.
         */
        if ((rdev->family >= CHIP_RV770) && (rdev->family <= CHIP_RV740) &&
-            rdev->vram_scratch.ptr) {
+            rdev->vram_scratch.ptr && !(rdev->flags & RADEON_IS_AGP)) {
                void __iomem *ptr = (void *)rdev->vram_scratch.ptr;
                u32 tmp;
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index d8ac1849180d..e12e79326cb1 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -286,7 +286,7 @@ void radeon_vram_location(struct radeon_device *rdev, struct radeon_mc *mc, u64
                mc->mc_vram_size = mc->aper_size;
        }
        mc->vram_end = mc->vram_start + mc->mc_vram_size - 1;
-        dev_info(rdev->dev, "VRAM: %lluM 0x%08llX - 0x%08llX (%lluM used)\n",
+        dev_info(rdev->dev, "VRAM: %lluM 0x%016llX - 0x%016llX (%lluM used)\n",
                        mc->mc_vram_size >> 20, mc->vram_start,
                        mc->vram_end, mc->real_vram_size >> 20);
 }
@@ -323,7 +323,7 @@ void radeon_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc)
                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",
+        dev_info(rdev->dev, "GTT: %lluM 0x%016llX - 0x%016llX\n",
                        mc->gtt_size >> 20, mc->gtt_start, mc->gtt_end);
 }
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
index 1d067743fee0..a598d0049aa5 100644
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -69,7 +69,7 @@ void radeon_ttm_placement_from_domain(struct radeon_bo *rbo, u32 domain)
        u32 c = 0;
        rbo->placement.fpfn = 0;
-        rbo->placement.lpfn = rbo->rdev->mc.active_vram_size >> PAGE_SHIFT;
+        rbo->placement.lpfn = 0;
        rbo->placement.placement = rbo->placements;
        rbo->placement.busy_placement = rbo->placements;
        if (domain & RADEON_GEM_DOMAIN_VRAM)
@@ -91,7 +91,8 @@ int radeon_bo_create(struct radeon_device *rdev, struct drm_gem_object *gobj,
 {
        struct radeon_bo *bo;
        enum ttm_bo_type type;
-        int page_align = roundup(byte_align, PAGE_SIZE) >> PAGE_SHIFT;
+        unsigned long page_align = roundup(byte_align, PAGE_SIZE) >> PAGE_SHIFT;
+        unsigned long max_size = 0;
        int r;
        if (unlikely(rdev->mman.bdev.dev_mapping == NULL)) {
@@ -104,6 +105,14 @@ int radeon_bo_create(struct radeon_device *rdev, struct drm_gem_object *gobj,
        }
        *bo_ptr = NULL;
+        /* maximun bo size is the minimun btw visible vram and gtt size */
+        max_size = min(rdev->mc.visible_vram_size, rdev->mc.gtt_size);
+        if ((page_align << PAGE_SHIFT) >= max_size) {
+                printk(KERN_WARNING "%s:%d alloc size %ldM bigger than %ldMb limit\n",
+                        __func__, __LINE__, page_align  >> (20 - PAGE_SHIFT), max_size >> 20);
+                return -ENOMEM;
+        }
 retry:
        bo = kzalloc(sizeof(struct radeon_bo), GFP_KERNEL);
        if (bo == NULL)
diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c
index 4bf969c0a32b..be0fdd58aa29 100644
--- a/drivers/hwmon/adm1026.c
+++ b/drivers/hwmon/adm1026.c
@@ -916,27 +916,27 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
        int nr = sensor_attr->index;
        struct i2c_client *client = to_i2c_client(dev);
        struct adm1026_data *data = i2c_get_clientdata(client);
-        int val, orig_div, new_div, shift;
+        int val, orig_div, new_div;
        val = simple_strtol(buf, NULL, 10);
        new_div = DIV_TO_REG(val);
-        if (new_div == 0) {
-                return -EINVAL;
-        }
        mutex_lock(&data->update_lock);
        orig_div = data->fan_div[nr];
        data->fan_div[nr] = DIV_FROM_REG(new_div);
        if (nr < 4) { /* 0 <= nr < 4 */
-                shift = 2 * nr;
                adm1026_write_value(client, ADM1026_REG_FAN_DIV_0_3,
-                        ((DIV_TO_REG(orig_div) & (~(0x03 << shift))) |
+                                    (DIV_TO_REG(data->fan_div[0]) << 0) |
-                        (new_div << shift)));
+                                    (DIV_TO_REG(data->fan_div[1]) << 2) |
+                                    (DIV_TO_REG(data->fan_div[2]) << 4) |
+                                    (DIV_TO_REG(data->fan_div[3]) << 6));
        } else { /* 3 < nr < 8 */
-                shift = 2 * (nr - 4);
                adm1026_write_value(client, ADM1026_REG_FAN_DIV_4_7,
-                        ((DIV_TO_REG(orig_div) & (~(0x03 << (2 * shift)))) |
+                                    (DIV_TO_REG(data->fan_div[4]) << 0) |
-                        (new_div << shift)));
+                                    (DIV_TO_REG(data->fan_div[5]) << 2) |
+                                    (DIV_TO_REG(data->fan_div[6]) << 4) |
+                                    (DIV_TO_REG(data->fan_div[7]) << 6));
        }
        if (data->fan_div[nr] != orig_div) {
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index 14a5d981be7d..a428a9264195 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -187,6 +187,7 @@ static const u8 IT87_REG_FANX_MIN[]	= { 0x1b, 0x1c, 0x1d, 0x85, 0x87 };
 #define IT87_REG_FAN_MAIN_CTRL 0x13
 #define IT87_REG_FAN_CTL       0x14
 #define IT87_REG_PWM(nr)       (0x15 + (nr))
+#define IT87_REG_PWM_DUTY(nr)  (0x63 + (nr) * 8)
 #define IT87_REG_VIN(nr)       (0x20 + (nr))
 #define IT87_REG_TEMP(nr)      (0x29 + (nr))
@@ -251,12 +252,16 @@ struct it87_data {
        u8 fan_main_ctrl;       /* Register value */
        u8 fan_ctl;             /* Register value */
-        /* The following 3 arrays correspond to the same registers. The
+        /* The following 3 arrays correspond to the same registers up to
-         * meaning of bits 6-0 depends on the value of bit 7, and we want
+         * the IT8720F. The meaning of bits 6-0 depends on the value of bit
-         * to preserve settings on mode changes, so we have to track all
+         * 7, and we want to preserve settings on mode changes, so we have
-         * values separately. */
+         * to track all values separately.
+         * Starting with the IT8721F, the manual PWM duty cycles are stored
+         * in separate registers (8-bit values), so the separate tracking
+         * is no longer needed, but it is still done to keep the driver
+         * simple. */
        u8 pwm_ctrl[3];         /* Register value */
-        u8 pwm_duty[3];         /* Manual PWM value set by user (bit 6-0) */
+        u8 pwm_duty[3];         /* Manual PWM value set by user */
        u8 pwm_temp_map[3];     /* PWM to temp. chan. mapping (bits 1-0) */
        /* Automatic fan speed control registers */
@@ -832,7 +837,9 @@ static ssize_t set_pwm_enable(struct device *dev,
                                 data->fan_main_ctrl);
        } else {
                if (val == 1)                           /* Manual mode */
-                        data->pwm_ctrl[nr] = data->pwm_duty[nr];
+                        data->pwm_ctrl[nr] = data->type == it8721 ?
+                                             data->pwm_temp_map[nr] :
+                                             data->pwm_duty[nr];
                else                                    /* Automatic mode */
                        data->pwm_ctrl[nr] = 0x80 | data->pwm_temp_map[nr];
                it87_write_value(data, IT87_REG_PWM(nr), data->pwm_ctrl[nr]);
@@ -858,12 +865,25 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
                return -EINVAL;
        mutex_lock(&data->update_lock);
-        data->pwm_duty[nr] = pwm_to_reg(data, val);
+        if (data->type == it8721) {
-        /* If we are in manual mode, write the duty cycle immediately;
+                /* If we are in automatic mode, the PWM duty cycle register
-         * otherwise, just store it for later use. */
+                 * is read-only so we can't write the value */
-        if (!(data->pwm_ctrl[nr] & 0x80)) {
+                if (data->pwm_ctrl[nr] & 0x80) {
-                data->pwm_ctrl[nr] = data->pwm_duty[nr];
+                        mutex_unlock(&data->update_lock);
-                it87_write_value(data, IT87_REG_PWM(nr), data->pwm_ctrl[nr]);
+                        return -EBUSY;
+                }
+                data->pwm_duty[nr] = pwm_to_reg(data, val);
+                it87_write_value(data, IT87_REG_PWM_DUTY(nr),
+                                 data->pwm_duty[nr]);
+        } else {
+                data->pwm_duty[nr] = pwm_to_reg(data, val);
+                /* If we are in manual mode, write the duty cycle immediately;
+                 * otherwise, just store it for later use. */
+                if (!(data->pwm_ctrl[nr] & 0x80)) {
+                        data->pwm_ctrl[nr] = data->pwm_duty[nr];
+                        it87_write_value(data, IT87_REG_PWM(nr),
+                                         data->pwm_ctrl[nr]);
+                }
        }
        mutex_unlock(&data->update_lock);
        return count;
@@ -1958,7 +1978,10 @@ static void __devinit it87_init_device(struct platform_device *pdev)
         *   channels to use when later setting to automatic mode later.
         *   Use a 1:1 mapping by default (we are clueless.)
         * In both cases, the value can (and should) be changed by the user
-         * prior to switching to a different mode. */
+         * prior to switching to a different mode.
+         * Note that this is no longer needed for the IT8721F and later, as
+         * these have separate registers for the temperature mapping and the
+         * manual duty cycle. */
        for (i = 0; i < 3; i++) {
                data->pwm_temp_map[i] = i;
                data->pwm_duty[i] = 0x7f;       /* Full speed */
@@ -2034,10 +2057,16 @@ static void __devinit it87_init_device(struct platform_device *pdev)
 static void it87_update_pwm_ctrl(struct it87_data *data, int nr)
 {
        data->pwm_ctrl[nr] = it87_read_value(data, IT87_REG_PWM(nr));
-        if (data->pwm_ctrl[nr] & 0x80)  /* Automatic mode */
+        if (data->type == it8721) {
                data->pwm_temp_map[nr] = data->pwm_ctrl[nr] & 0x03;
-        else                            /* Manual mode */
+                data->pwm_duty[nr] = it87_read_value(data,
-                data->pwm_duty[nr] = data->pwm_ctrl[nr] & 0x7f;
+                                                     IT87_REG_PWM_DUTY(nr));
+        } else {
+                if (data->pwm_ctrl[nr] & 0x80)  /* Automatic mode */
+                        data->pwm_temp_map[nr] = data->pwm_ctrl[nr] & 0x03;
+                else                            /* Manual mode */
+                        data->pwm_duty[nr] = data->pwm_ctrl[nr] & 0x7f;
+        }
        if (has_old_autopwm(data)) {
                int i;
diff --git a/drivers/hwmon/ltc4215.c b/drivers/hwmon/ltc4215.c
index 00d975eb5b83..c7e6d8e81656 100644
--- a/drivers/hwmon/ltc4215.c
+++ b/drivers/hwmon/ltc4215.c
@@ -205,7 +205,6 @@ LTC4215_ALARM(curr1_max_alarm,	(1 << 2),	LTC4215_STATUS);
 /* Power (virtual) */
 LTC4215_POWER(power1_input);
-LTC4215_ALARM(power1_alarm,     (1 << 3),       LTC4215_STATUS);
 /* Input Voltage */
 LTC4215_VOLTAGE(in1_input,                      LTC4215_ADIN);
@@ -214,6 +213,7 @@ LTC4215_ALARM(in1_min_alarm,	(1 << 1),	LTC4215_STATUS);
 /* Output Voltage */
 LTC4215_VOLTAGE(in2_input,                      LTC4215_SOURCE);
+LTC4215_ALARM(in2_min_alarm,    (1 << 3),       LTC4215_STATUS);
 /* Finally, construct an array of pointers to members of the above objects,
 * as required for sysfs_create_group()
@@ -223,13 +223,13 @@ static struct attribute *ltc4215_attributes[] = {
        &sensor_dev_attr_curr1_max_alarm.dev_attr.attr,
        &sensor_dev_attr_power1_input.dev_attr.attr,
-        &sensor_dev_attr_power1_alarm.dev_attr.attr,
        &sensor_dev_attr_in1_input.dev_attr.attr,
        &sensor_dev_attr_in1_max_alarm.dev_attr.attr,
        &sensor_dev_attr_in1_min_alarm.dev_attr.attr,
        &sensor_dev_attr_in2_input.dev_attr.attr,
+        &sensor_dev_attr_in2_min_alarm.dev_attr.attr,
        NULL,
 };
diff --git a/drivers/i2c/busses/i2c-intel-mid.c b/drivers/i2c/busses/i2c-intel-mid.c
index 80f70d3a744d..c71492782bbd 100644
--- a/drivers/i2c/busses/i2c-intel-mid.c
+++ b/drivers/i2c/busses/i2c-intel-mid.c
@@ -999,7 +999,7 @@ static int __devinit intel_mid_i2c_probe(struct pci_dev *dev,
        /* Initialize struct members */
        snprintf(mrst->adap.name, sizeof(mrst->adap.name),
-                "MRST/Medfield I2C at %lx", start);
+                "Intel MID I2C at %lx", start);
        mrst->adap.owner = THIS_MODULE;
        mrst->adap.algo = &intel_mid_i2c_algorithm;
        mrst->adap.dev.parent = &dev->dev;
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 41665d2f9f93..c131d58bcb50 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -273,8 +273,6 @@ static int intel_idle_probe(void)
        pr_debug(PREFIX "MWAIT substates: 0x%x\n", mwait_substates);
-        if (boot_cpu_has(X86_FEATURE_ARAT))     /* Always Reliable APIC Timer */
-                lapic_timer_reliable_states = 0xFFFFFFFF;
        if (boot_cpu_data.x86 != 6)     /* family 6 */
                return -ENODEV;
@@ -286,8 +284,6 @@ static int intel_idle_probe(void)
        case 0x1F:      /* Core i7 and i5 Processor - Nehalem */
        case 0x2E:      /* Nehalem-EX Xeon */
        case 0x2F:      /* Westmere-EX Xeon */
-                lapic_timer_reliable_states = (1 << 1);  /* C1 */
        case 0x25:      /* Westmere */
        case 0x2C:      /* Westmere */
                cpuidle_state_table = nehalem_cstates;
@@ -295,7 +291,6 @@ static int intel_idle_probe(void)
        case 0x1C:      /* 28 - Atom Processor */
        case 0x26:      /* 38 - Lincroft Atom Processor */
-                lapic_timer_reliable_states = (1 << 1); /* C1 */
                cpuidle_state_table = atom_cstates;
                break;
@@ -303,10 +298,6 @@ static int intel_idle_probe(void)
        case 0x2D:      /* SNB Xeon */
                cpuidle_state_table = snb_cstates;
                break;
-#ifdef FUTURE_USE
-        case 0x17:      /* 23 - Core 2 Duo */
-                lapic_timer_reliable_states = (1 << 2) | (1 << 1); /* C2, C1 */
-#endif
        default:
                pr_debug(PREFIX "does not run on family %d model %d\n",
@@ -314,6 +305,9 @@ static int intel_idle_probe(void)
                return -ENODEV;
        }
+        if (boot_cpu_has(X86_FEATURE_ARAT))     /* Always Reliable APIC Timer */
+                lapic_timer_reliable_states = 0xFFFFFFFF;
        pr_debug(PREFIX "v" INTEL_IDLE_VERSION
                " model 0x%X\n", boot_cpu_data.x86_model);
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index b342248aec05..c42699285f8e 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -893,68 +893,81 @@ out:
        return ret ? ret : in_len;
 }
+static int copy_wc_to_user(void __user *dest, struct ib_wc *wc)
+{
+        struct ib_uverbs_wc tmp;
+        tmp.wr_id               = wc->wr_id;
+        tmp.status              = wc->status;
+        tmp.opcode              = wc->opcode;
+        tmp.vendor_err          = wc->vendor_err;
+        tmp.byte_len            = wc->byte_len;
+        tmp.ex.imm_data         = (__u32 __force) wc->ex.imm_data;
+        tmp.qp_num              = wc->qp->qp_num;
+        tmp.src_qp              = wc->src_qp;
+        tmp.wc_flags            = wc->wc_flags;
+        tmp.pkey_index          = wc->pkey_index;
+        tmp.slid                = wc->slid;
+        tmp.sl                  = wc->sl;
+        tmp.dlid_path_bits      = wc->dlid_path_bits;
+        tmp.port_num            = wc->port_num;
+        tmp.reserved            = 0;
+        if (copy_to_user(dest, &tmp, sizeof tmp))
+                return -EFAULT;
+        return 0;
+}
 ssize_t ib_uverbs_poll_cq(struct ib_uverbs_file *file,
                          const char __user *buf, int in_len,
                          int out_len)
 {
        struct ib_uverbs_poll_cq       cmd;
-        struct ib_uverbs_poll_cq_resp *resp;
+        struct ib_uverbs_poll_cq_resp  resp;
+        u8 __user                     *header_ptr;
+        u8 __user                     *data_ptr;
        struct ib_cq                  *cq;
-        struct ib_wc                  *wc;
+        struct ib_wc                   wc;
-        int                            ret = 0;
+        int                            ret;
-        int                            i;
-        int                            rsize;
        if (copy_from_user(&cmd, buf, sizeof cmd))
                return -EFAULT;
-        wc = kmalloc(cmd.ne * sizeof *wc, GFP_KERNEL);
-        if (!wc)
-                return -ENOMEM;
-        rsize = sizeof *resp + cmd.ne * sizeof(struct ib_uverbs_wc);
-        resp = kmalloc(rsize, GFP_KERNEL);
-        if (!resp) {
-                ret = -ENOMEM;
-                goto out_wc;
-        }
        cq = idr_read_cq(cmd.cq_handle, file->ucontext, 0);
-        if (!cq) {
+        if (!cq)
-                ret = -EINVAL;
+                return -EINVAL;
-                goto out;
-        }
-        resp->count = ib_poll_cq(cq, cmd.ne, wc);
+        /* we copy a struct ib_uverbs_poll_cq_resp to user space */
+        header_ptr = (void __user *)(unsigned long) cmd.response;
+        data_ptr = header_ptr + sizeof resp;
-        put_cq_read(cq);
+        memset(&resp, 0, sizeof resp);
+        while (resp.count < cmd.ne) {
+                ret = ib_poll_cq(cq, 1, &wc);
+                if (ret < 0)
+                        goto out_put;
+                if (!ret)
+                        break;
+                ret = copy_wc_to_user(data_ptr, &wc);
+                if (ret)
+                        goto out_put;
-        for (i = 0; i < resp->count; i++) {
+                data_ptr += sizeof(struct ib_uverbs_wc);
-                resp->wc[i].wr_id          = wc[i].wr_id;
+                ++resp.count;
-                resp->wc[i].status         = wc[i].status;
-                resp->wc[i].opcode         = wc[i].opcode;
-                resp->wc[i].vendor_err     = wc[i].vendor_err;
-                resp->wc[i].byte_len       = wc[i].byte_len;
-                resp->wc[i].ex.imm_data    = (__u32 __force) wc[i].ex.imm_data;
-                resp->wc[i].qp_num         = wc[i].qp->qp_num;
-                resp->wc[i].src_qp         = wc[i].src_qp;
-                resp->wc[i].wc_flags       = wc[i].wc_flags;
-                resp->wc[i].pkey_index     = wc[i].pkey_index;
-                resp->wc[i].slid           = wc[i].slid;
-                resp->wc[i].sl             = wc[i].sl;
-                resp->wc[i].dlid_path_bits = wc[i].dlid_path_bits;
-                resp->wc[i].port_num       = wc[i].port_num;
        }
-        if (copy_to_user((void __user *) (unsigned long) cmd.response, resp, rsize))
+        if (copy_to_user(header_ptr, &resp, sizeof resp)) {
                ret = -EFAULT;
+                goto out_put;
+        }
-out:
+        ret = in_len;
-        kfree(resp);
-out_wc:
+out_put:
-        kfree(wc);
+        put_cq_read(cq);
-        return ret ? ret : in_len;
+        return ret;
 }
 ssize_t ib_uverbs_req_notify_cq(struct ib_uverbs_file *file,
diff --git a/drivers/input/joystick/turbografx.c b/drivers/input/joystick/turbografx.c
index d53b9e900234..27b6a3ce18ca 100644
--- a/drivers/input/joystick/turbografx.c
+++ b/drivers/input/joystick/turbografx.c
@@ -245,6 +245,7 @@ static struct tgfx __init *tgfx_probe(int parport, int *n_buttons, int n_devs)
                goto err_free_tgfx;
        }
+        parport_put_port(pp);
        return tgfx;
 err_free_dev:
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index b8c51b9781db..c76bd3183beb 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -179,6 +179,22 @@ config KEYBOARD_GPIO
          To compile this driver as a module, choose M here: the
          module will be called gpio_keys.
+config KEYBOARD_GPIO_POLLED
+        tristate "Polled GPIO buttons"
+        depends on GENERIC_GPIO
+        select INPUT_POLLDEV
+        help
+          This driver implements support for buttons connected
+          to GPIO pins that are not capable of generating interrupts.
+          Say Y here if your device has buttons connected
+          directly to such GPIO pins.  Your board-specific
+          setup logic must also provide a platform device,
+          with configuration data saying which GPIOs are used.
+          To compile this driver as a module, choose M here: the
+          module will be called gpio_keys_polled.
 config KEYBOARD_TCA6416
        tristate "TCA6416 Keypad Support"
        depends on I2C
@@ -443,6 +459,16 @@ config KEYBOARD_OMAP4
          To compile this driver as a module, choose M here: the
          module will be called omap4-keypad.
+config KEYBOARD_TC3589X
+        tristate "TC3589X Keypad support"
+        depends on MFD_TC3589X
+        help
+          Say Y here if you want to use the keypad controller on
+          TC35892/3 I/O expander.
+          To compile this driver as a module, choose M here: the
+          module will be called tc3589x-keypad.
 config KEYBOARD_TNETV107X
        tristate "TI TNETV107X keypad support"
        depends on ARCH_DAVINCI_TNETV107X
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
index a34452e8ebe2..2aa6ce248b71 100644
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -14,6 +14,7 @@ obj-$(CONFIG_KEYBOARD_BFIN)		+= bf54x-keys.o
 obj-$(CONFIG_KEYBOARD_DAVINCI)          += davinci_keyscan.o
 obj-$(CONFIG_KEYBOARD_EP93XX)           += ep93xx_keypad.o
 obj-$(CONFIG_KEYBOARD_GPIO)             += gpio_keys.o
+obj-$(CONFIG_KEYBOARD_GPIO_POLLED)      += gpio_keys_polled.o
 obj-$(CONFIG_KEYBOARD_TCA6416)          += tca6416-keypad.o
 obj-$(CONFIG_KEYBOARD_HIL)              += hil_kbd.o
 obj-$(CONFIG_KEYBOARD_HIL_OLD)          += hilkbd.o
@@ -40,6 +41,7 @@ obj-$(CONFIG_KEYBOARD_SH_KEYSC)		+= sh_keysc.o
 obj-$(CONFIG_KEYBOARD_STMPE)            += stmpe-keypad.o
 obj-$(CONFIG_KEYBOARD_STOWAWAY)         += stowaway.o
 obj-$(CONFIG_KEYBOARD_SUNKBD)           += sunkbd.o
+obj-$(CONFIG_KEYBOARD_TC3589X)          += tc3589x-keypad.o
 obj-$(CONFIG_KEYBOARD_TNETV107X)        += tnetv107x-keypad.o
 obj-$(CONFIG_KEYBOARD_TWL4030)          += twl4030_keypad.o
 obj-$(CONFIG_KEYBOARD_XTKBD)            += xtkbd.o
diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c
new file mode 100644
index 000000000000..4c17aff20657
--- /dev/null
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@ -0,0 +1,261 @@
+/*
+ *  Driver for buttons on GPIO lines not capable of generating interrupts
+ *
+ *  Copyright (C) 2007-2010 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2010 Nuno Goncalves <nunojpg@gmail.com>
+ *
+ *  This file was based on: /drivers/input/misc/cobalt_btns.c
+ *      Copyright (C) 2007 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *
+ *  also was based on: /drivers/input/keyboard/gpio_keys.c
+ *      Copyright 2005 Phil Blundell
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/input.h>
+#include <linux/input-polldev.h>
+#include <linux/ioport.h>
+#include <linux/platform_device.h>
+#include <linux/gpio.h>
+#include <linux/gpio_keys.h>
+#define DRV_NAME        "gpio-keys-polled"
+struct gpio_keys_button_data {
+        int last_state;
+        int count;
+        int threshold;
+        int can_sleep;
+};
+struct gpio_keys_polled_dev {
+        struct input_polled_dev *poll_dev;
+        struct device *dev;
+        struct gpio_keys_platform_data *pdata;
+        struct gpio_keys_button_data data[0];
+};
+static void gpio_keys_polled_check_state(struct input_dev *input,
+                                         struct gpio_keys_button *button,
+                                         struct gpio_keys_button_data *bdata)
+{
+        int state;
+        if (bdata->can_sleep)
+                state = !!gpio_get_value_cansleep(button->gpio);
+        else
+                state = !!gpio_get_value(button->gpio);
+        if (state != bdata->last_state) {
+                unsigned int type = button->type ?: EV_KEY;
+                input_event(input, type, button->code,
+                            !!(state ^ button->active_low));
+                input_sync(input);
+                bdata->count = 0;
+                bdata->last_state = state;
+        }
+}
+static void gpio_keys_polled_poll(struct input_polled_dev *dev)
+{
+        struct gpio_keys_polled_dev *bdev = dev->private;
+        struct gpio_keys_platform_data *pdata = bdev->pdata;
+        struct input_dev *input = dev->input;
+        int i;
+        for (i = 0; i < bdev->pdata->nbuttons; i++) {
+                struct gpio_keys_button_data *bdata = &bdev->data[i];
+                if (bdata->count < bdata->threshold)
+                        bdata->count++;
+                else
+                        gpio_keys_polled_check_state(input, &pdata->buttons[i],
+                                                     bdata);
+        }
+}
+static void gpio_keys_polled_open(struct input_polled_dev *dev)
+{
+        struct gpio_keys_polled_dev *bdev = dev->private;
+        struct gpio_keys_platform_data *pdata = bdev->pdata;
+        if (pdata->enable)
+                pdata->enable(bdev->dev);
+}
+static void gpio_keys_polled_close(struct input_polled_dev *dev)
+{
+        struct gpio_keys_polled_dev *bdev = dev->private;
+        struct gpio_keys_platform_data *pdata = bdev->pdata;
+        if (pdata->disable)
+                pdata->disable(bdev->dev);
+}
+static int __devinit gpio_keys_polled_probe(struct platform_device *pdev)
+{
+        struct gpio_keys_platform_data *pdata = pdev->dev.platform_data;
+        struct device *dev = &pdev->dev;
+        struct gpio_keys_polled_dev *bdev;
+        struct input_polled_dev *poll_dev;
+        struct input_dev *input;
+        int error;
+        int i;
+        if (!pdata || !pdata->poll_interval)
+                return -EINVAL;
+        bdev = kzalloc(sizeof(struct gpio_keys_polled_dev) +
+                       pdata->nbuttons * sizeof(struct gpio_keys_button_data),
+                       GFP_KERNEL);
+        if (!bdev) {
+                dev_err(dev, "no memory for private data\n");
+                return -ENOMEM;
+        }
+        poll_dev = input_allocate_polled_device();
+        if (!poll_dev) {
+                dev_err(dev, "no memory for polled device\n");
+                error = -ENOMEM;
+                goto err_free_bdev;
+        }
+        poll_dev->private = bdev;
+        poll_dev->poll = gpio_keys_polled_poll;
+        poll_dev->poll_interval = pdata->poll_interval;
+        poll_dev->open = gpio_keys_polled_open;
+        poll_dev->close = gpio_keys_polled_close;
+        input = poll_dev->input;
+        input->evbit[0] = BIT(EV_KEY);
+        input->name = pdev->name;
+        input->phys = DRV_NAME"/input0";
+        input->dev.parent = &pdev->dev;
+        input->id.bustype = BUS_HOST;
+        input->id.vendor = 0x0001;
+        input->id.product = 0x0001;
+        input->id.version = 0x0100;
+        for (i = 0; i < pdata->nbuttons; i++) {
+                struct gpio_keys_button *button = &pdata->buttons[i];
+                struct gpio_keys_button_data *bdata = &bdev->data[i];
+                unsigned int gpio = button->gpio;
+                unsigned int type = button->type ?: EV_KEY;
+                if (button->wakeup) {
+                        dev_err(dev, DRV_NAME " does not support wakeup\n");
+                        error = -EINVAL;
+                        goto err_free_gpio;
+                }
+                error = gpio_request(gpio,
+                                     button->desc ? button->desc : DRV_NAME);
+                if (error) {
+                        dev_err(dev, "unable to claim gpio %u, err=%d\n",
+                                gpio, error);
+                        goto err_free_gpio;
+                }
+                error = gpio_direction_input(gpio);
+                if (error) {
+                        dev_err(dev,
+                                "unable to set direction on gpio %u, err=%d\n",
+                                gpio, error);
+                        goto err_free_gpio;
+                }
+                bdata->can_sleep = gpio_cansleep(gpio);
+                bdata->last_state = -1;
+                bdata->threshold = DIV_ROUND_UP(button->debounce_interval,
+                                                pdata->poll_interval);
+                input_set_capability(input, type, button->code);
+        }
+        bdev->poll_dev = poll_dev;
+        bdev->dev = dev;
+        bdev->pdata = pdata;
+        platform_set_drvdata(pdev, bdev);
+        error = input_register_polled_device(poll_dev);
+        if (error) {
+                dev_err(dev, "unable to register polled device, err=%d\n",
+                        error);
+                goto err_free_gpio;
+        }
+        /* report initial state of the buttons */
+        for (i = 0; i < pdata->nbuttons; i++)
+                gpio_keys_polled_check_state(input, &pdata->buttons[i],
+                                         &bdev->data[i]);
+        return 0;
+err_free_gpio:
+        while (--i >= 0)
+                gpio_free(pdata->buttons[i].gpio);
+        input_free_polled_device(poll_dev);
+err_free_bdev:
+        kfree(bdev);
+        platform_set_drvdata(pdev, NULL);
+        return error;
+}
+static int __devexit gpio_keys_polled_remove(struct platform_device *pdev)
+{
+        struct gpio_keys_polled_dev *bdev = platform_get_drvdata(pdev);
+        struct gpio_keys_platform_data *pdata = bdev->pdata;
+        int i;
+        input_unregister_polled_device(bdev->poll_dev);
+        for (i = 0; i < pdata->nbuttons; i++)
+                gpio_free(pdata->buttons[i].gpio);
+        input_free_polled_device(bdev->poll_dev);
+        kfree(bdev);
+        platform_set_drvdata(pdev, NULL);
+        return 0;
+}
+static struct platform_driver gpio_keys_polled_driver = {
+        .probe  = gpio_keys_polled_probe,
+        .remove = __devexit_p(gpio_keys_polled_remove),
+        .driver = {
+                .name   = DRV_NAME,
+                .owner  = THIS_MODULE,
+        },
+};
+static int __init gpio_keys_polled_init(void)
+{
+        return platform_driver_register(&gpio_keys_polled_driver);
+}
+static void __exit gpio_keys_polled_exit(void)
+{
+        platform_driver_unregister(&gpio_keys_polled_driver);
+}
+module_init(gpio_keys_polled_init);
+module_exit(gpio_keys_polled_exit);
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_DESCRIPTION("Polled GPIO Buttons driver");
+MODULE_ALIAS("platform:" DRV_NAME);
diff --git a/drivers/input/keyboard/tc3589x-keypad.c b/drivers/input/keyboard/tc3589x-keypad.c
new file mode 100644
index 000000000000..69dc0cb20a00
--- /dev/null
+++ b/drivers/input/keyboard/tc3589x-keypad.c
@@ -0,0 +1,472 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2010
+ *
+ * Author: Jayeeta Banerjee <jayeeta.banerjee@stericsson.com>
+ * Author: Sundar Iyer <sundar.iyer@stericsson.com>
+ *
+ * License Terms: GNU General Public License, version 2
+ *
+ * TC35893 MFD Keypad Controller driver
+ */
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/input.h>
+#include <linux/platform_device.h>
+#include <linux/input/matrix_keypad.h>
+#include <linux/i2c.h>
+#include <linux/slab.h>
+#include <linux/mfd/tc3589x.h>
+/* Maximum supported keypad matrix row/columns size */
+#define TC3589x_MAX_KPROW               8
+#define TC3589x_MAX_KPCOL               12
+/* keypad related Constants */
+#define TC3589x_MAX_DEBOUNCE_SETTLE     0xFF
+#define DEDICATED_KEY_VAL               0xFF
+/* Pull up/down masks */
+#define TC3589x_NO_PULL_MASK            0x0
+#define TC3589x_PULL_DOWN_MASK          0x1
+#define TC3589x_PULL_UP_MASK            0x2
+#define TC3589x_PULLUP_ALL_MASK         0xAA
+#define TC3589x_IO_PULL_VAL(index, mask)        ((mask)<<((index)%4)*2))
+/* Bit masks for IOCFG register */
+#define IOCFG_BALLCFG           0x01
+#define IOCFG_IG                0x08
+#define KP_EVCODE_COL_MASK      0x0F
+#define KP_EVCODE_ROW_MASK      0x70
+#define KP_RELEASE_EVT_MASK     0x80
+#define KP_ROW_SHIFT            4
+#define KP_NO_VALID_KEY_MASK    0x7F
+/* bit masks for RESTCTRL register */
+#define TC3589x_KBDRST          0x2
+#define TC3589x_IRQRST          0x10
+#define TC3589x_RESET_ALL       0x1B
+/* KBDMFS register bit mask */
+#define TC3589x_KBDMFS_EN       0x1
+/* CLKEN register bitmask */
+#define KPD_CLK_EN              0x1
+/* RSTINTCLR register bit mask */
+#define IRQ_CLEAR               0x1
+/* bit masks for keyboard interrupts*/
+#define TC3589x_EVT_LOSS_INT    0x8
+#define TC3589x_EVT_INT         0x4
+#define TC3589x_KBD_LOSS_INT    0x2
+#define TC3589x_KBD_INT         0x1
+/* bit masks for keyboard interrupt clear*/
+#define TC3589x_EVT_INT_CLR     0x2
+#define TC3589x_KBD_INT_CLR     0x1
+#define TC3589x_KBD_KEYMAP_SIZE     64
+/**
+ * struct tc_keypad - data structure used by keypad driver
+ * @input:      pointer to input device object
+ * @board:      keypad platform device
+ * @krow:       number of rows
+ * @kcol:       number of coloumns
+ * @keymap:     matrix scan code table for keycodes
+ */
+struct tc_keypad {
+        struct tc3589x *tc3589x;
+        struct input_dev *input;
+        const struct tc3589x_keypad_platform_data *board;
+        unsigned int krow;
+        unsigned int kcol;
+        unsigned short keymap[TC3589x_KBD_KEYMAP_SIZE];
+        bool keypad_stopped;
+};
+static int __devinit tc3589x_keypad_init_key_hardware(struct tc_keypad *keypad)
+{
+        int ret;
+        struct tc3589x *tc3589x = keypad->tc3589x;
+        u8 settle_time = keypad->board->settle_time;
+        u8 dbounce_period = keypad->board->debounce_period;
+        u8 rows = keypad->board->krow & 0xf;    /* mask out the nibble */
+        u8 column = keypad->board->kcol & 0xf;  /* mask out the nibble */
+        /* validate platform configurations */
+        if (keypad->board->kcol > TC3589x_MAX_KPCOL ||
+            keypad->board->krow > TC3589x_MAX_KPROW ||
+            keypad->board->debounce_period > TC3589x_MAX_DEBOUNCE_SETTLE ||
+            keypad->board->settle_time > TC3589x_MAX_DEBOUNCE_SETTLE)
+                return -EINVAL;
+        /* configure KBDSIZE 4 LSbits for cols and 4 MSbits for rows */
+        ret = tc3589x_reg_write(tc3589x, TC3589x_KBDSIZE,
+                        (rows << KP_ROW_SHIFT) | column);
+        if (ret < 0)
+                return ret;
+        /* configure dedicated key config, no dedicated key selected */
+        ret = tc3589x_reg_write(tc3589x, TC3589x_KBCFG_LSB, DEDICATED_KEY_VAL);
+        if (ret < 0)
+                return ret;
+        ret = tc3589x_reg_write(tc3589x, TC3589x_KBCFG_MSB, DEDICATED_KEY_VAL);
+        if (ret < 0)
+                return ret;
+        /* Configure settle time */
+        ret = tc3589x_reg_write(tc3589x, TC3589x_KBDSETTLE_REG, settle_time);
+        if (ret < 0)
+                return ret;
+        /* Configure debounce time */
+        ret = tc3589x_reg_write(tc3589x, TC3589x_KBDBOUNCE, dbounce_period);
+        if (ret < 0)
+                return ret;
+        /* Start of initialise keypad GPIOs */
+        ret = tc3589x_set_bits(tc3589x, TC3589x_IOCFG, 0x0, IOCFG_IG);
+        if (ret < 0)
+                return ret;
+        /* Configure pull-up resistors for all row GPIOs */
+        ret = tc3589x_reg_write(tc3589x, TC3589x_IOPULLCFG0_LSB,
+                                        TC3589x_PULLUP_ALL_MASK);
+        if (ret < 0)
+                return ret;
+        ret = tc3589x_reg_write(tc3589x, TC3589x_IOPULLCFG0_MSB,
+                                        TC3589x_PULLUP_ALL_MASK);
+        if (ret < 0)
+                return ret;
+        /* Configure pull-up resistors for all column GPIOs */
+        ret = tc3589x_reg_write(tc3589x, TC3589x_IOPULLCFG1_LSB,
+                        TC3589x_PULLUP_ALL_MASK);
+        if (ret < 0)
+                return ret;
+        ret = tc3589x_reg_write(tc3589x, TC3589x_IOPULLCFG1_MSB,
+                        TC3589x_PULLUP_ALL_MASK);
+        if (ret < 0)
+                return ret;
+        ret = tc3589x_reg_write(tc3589x, TC3589x_IOPULLCFG2_LSB,
+                        TC3589x_PULLUP_ALL_MASK);
+        return ret;
+}
+#define TC35893_DATA_REGS               4
+#define TC35893_KEYCODE_FIFO_EMPTY      0x7f
+#define TC35893_KEYCODE_FIFO_CLEAR      0xff
+#define TC35893_KEYPAD_ROW_SHIFT        0x3
+static irqreturn_t tc3589x_keypad_irq(int irq, void *dev)
+{
+        struct tc_keypad *keypad = dev;
+        struct tc3589x *tc3589x = keypad->tc3589x;
+        u8 i, row_index, col_index, kbd_code, up;
+        u8 code;
+        for (i = 0; i < TC35893_DATA_REGS * 2; i++) {
+                kbd_code = tc3589x_reg_read(tc3589x, TC3589x_EVTCODE_FIFO);
+                /* loop till fifo is empty and no more keys are pressed */
+                if (kbd_code == TC35893_KEYCODE_FIFO_EMPTY ||
+                                kbd_code == TC35893_KEYCODE_FIFO_CLEAR)
+                        continue;
+                /* valid key is found */
+                col_index = kbd_code & KP_EVCODE_COL_MASK;
+                row_index = (kbd_code & KP_EVCODE_ROW_MASK) >> KP_ROW_SHIFT;
+                code = MATRIX_SCAN_CODE(row_index, col_index,
+                                                TC35893_KEYPAD_ROW_SHIFT);
+                up = kbd_code & KP_RELEASE_EVT_MASK;
+                input_event(keypad->input, EV_MSC, MSC_SCAN, code);
+                input_report_key(keypad->input, keypad->keymap[code], !up);
+                input_sync(keypad->input);
+        }
+        /* clear IRQ */
+        tc3589x_set_bits(tc3589x, TC3589x_KBDIC,
+                        0x0, TC3589x_EVT_INT_CLR | TC3589x_KBD_INT_CLR);
+        /* enable IRQ */
+        tc3589x_set_bits(tc3589x, TC3589x_KBDMSK,
+                        0x0, TC3589x_EVT_LOSS_INT | TC3589x_EVT_INT);
+        return IRQ_HANDLED;
+}
+static int tc3589x_keypad_enable(struct tc_keypad *keypad)
+{
+        struct tc3589x *tc3589x = keypad->tc3589x;
+        int ret;
+        /* pull the keypad module out of reset */
+        ret = tc3589x_set_bits(tc3589x, TC3589x_RSTCTRL, TC3589x_KBDRST, 0x0);
+        if (ret < 0)
+                return ret;
+        /* configure KBDMFS */
+        ret = tc3589x_set_bits(tc3589x, TC3589x_KBDMFS, 0x0, TC3589x_KBDMFS_EN);
+        if (ret < 0)
+                return ret;
+        /* enable the keypad clock */
+        ret = tc3589x_set_bits(tc3589x, TC3589x_CLKEN, 0x0, KPD_CLK_EN);
+        if (ret < 0)
+                return ret;
+        /* clear pending IRQs */
+        ret =  tc3589x_set_bits(tc3589x, TC3589x_RSTINTCLR, 0x0, 0x1);
+        if (ret < 0)
+                return ret;
+        /* enable the IRQs */
+        ret = tc3589x_set_bits(tc3589x, TC3589x_KBDMSK, 0x0,
+                                        TC3589x_EVT_LOSS_INT | TC3589x_EVT_INT);
+        if (ret < 0)
+                return ret;
+        keypad->keypad_stopped = false;
+        return ret;
+}
+static int tc3589x_keypad_disable(struct tc_keypad *keypad)
+{
+        struct tc3589x *tc3589x = keypad->tc3589x;
+        int ret;
+        /* clear IRQ */
+        ret = tc3589x_set_bits(tc3589x, TC3589x_KBDIC,
+                        0x0, TC3589x_EVT_INT_CLR | TC3589x_KBD_INT_CLR);
+        if (ret < 0)
+                return ret;
+        /* disable all interrupts */
+        ret = tc3589x_set_bits(tc3589x, TC3589x_KBDMSK,
+                        ~(TC3589x_EVT_LOSS_INT | TC3589x_EVT_INT), 0x0);
+        if (ret < 0)
+                return ret;
+        /* disable the keypad module */
+        ret = tc3589x_set_bits(tc3589x, TC3589x_CLKEN, 0x1, 0x0);
+        if (ret < 0)
+                return ret;
+        /* put the keypad module into reset */
+        ret = tc3589x_set_bits(tc3589x, TC3589x_RSTCTRL, TC3589x_KBDRST, 0x1);
+        keypad->keypad_stopped = true;
+        return ret;
+}
+static int tc3589x_keypad_open(struct input_dev *input)
+{
+        int error;
+        struct tc_keypad *keypad = input_get_drvdata(input);
+        /* enable the keypad module */
+        error = tc3589x_keypad_enable(keypad);
+        if (error < 0) {
+                dev_err(&input->dev, "failed to enable keypad module\n");
+                return error;
+        }
+        error = tc3589x_keypad_init_key_hardware(keypad);
+        if (error < 0) {
+                dev_err(&input->dev, "failed to configure keypad module\n");
+                return error;
+        }
+        return 0;
+}
+static void tc3589x_keypad_close(struct input_dev *input)
+{
+        struct tc_keypad *keypad = input_get_drvdata(input);
+        /* disable the keypad module */
+        tc3589x_keypad_disable(keypad);
+}
+static int __devinit tc3589x_keypad_probe(struct platform_device *pdev)
+{
+        struct tc3589x *tc3589x = dev_get_drvdata(pdev->dev.parent);
+        struct tc_keypad *keypad;
+        struct input_dev *input;
+        const struct tc3589x_keypad_platform_data *plat;
+        int error, irq;
+        plat = tc3589x->pdata->keypad;
+        if (!plat) {
+                dev_err(&pdev->dev, "invalid keypad platform data\n");
+                return -EINVAL;
+        }
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0)
+                return irq;
+        keypad = kzalloc(sizeof(struct tc_keypad), GFP_KERNEL);
+        input = input_allocate_device();
+        if (!keypad || !input) {
+                dev_err(&pdev->dev, "failed to allocate keypad memory\n");
+                error = -ENOMEM;
+                goto err_free_mem;
+        }
+        keypad->board = plat;
+        keypad->input = input;
+        keypad->tc3589x = tc3589x;
+        input->id.bustype = BUS_I2C;
+        input->name = pdev->name;
+        input->dev.parent = &pdev->dev;
+        input->keycode = keypad->keymap;
+        input->keycodesize = sizeof(keypad->keymap[0]);
+        input->keycodemax = ARRAY_SIZE(keypad->keymap);
+        input->open = tc3589x_keypad_open;
+        input->close = tc3589x_keypad_close;
+        input_set_drvdata(input, keypad);
+        input_set_capability(input, EV_MSC, MSC_SCAN);
+        __set_bit(EV_KEY, input->evbit);
+        if (!plat->no_autorepeat)
+                __set_bit(EV_REP, input->evbit);
+        matrix_keypad_build_keymap(plat->keymap_data, 0x3,
+                        input->keycode, input->keybit);
+        error = request_threaded_irq(irq, NULL,
+                        tc3589x_keypad_irq, plat->irqtype,
+                        "tc3589x-keypad", keypad);
+        if (error < 0) {
+                dev_err(&pdev->dev,
+                                "Could not allocate irq %d,error %d\n",
+                                irq, error);
+                goto err_free_mem;
+        }
+        error = input_register_device(input);
+        if (error) {
+                dev_err(&pdev->dev, "Could not register input device\n");
+                goto err_free_irq;
+        }
+        /* let platform decide if keypad is a wakeup source or not */
+        device_init_wakeup(&pdev->dev, plat->enable_wakeup);
+        device_set_wakeup_capable(&pdev->dev, plat->enable_wakeup);
+        platform_set_drvdata(pdev, keypad);
+        return 0;
+err_free_irq:
+        free_irq(irq, keypad);
+err_free_mem:
+        input_free_device(input);
+        kfree(keypad);
+        return error;
+}
+static int __devexit tc3589x_keypad_remove(struct platform_device *pdev)
+{
+        struct tc_keypad *keypad = platform_get_drvdata(pdev);
+        int irq = platform_get_irq(pdev, 0);
+        if (!keypad->keypad_stopped)
+                tc3589x_keypad_disable(keypad);
+        free_irq(irq, keypad);
+        input_unregister_device(keypad->input);
+        kfree(keypad);
+        return 0;
+}
+#ifdef CONFIG_PM
+static int tc3589x_keypad_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct tc_keypad *keypad = platform_get_drvdata(pdev);
+        int irq = platform_get_irq(pdev, 0);
+        /* keypad is already off; we do nothing */
+        if (keypad->keypad_stopped)
+                return 0;
+        /* if device is not a wakeup source, disable it for powersave */
+        if (!device_may_wakeup(&pdev->dev))
+                tc3589x_keypad_disable(keypad);
+        else
+                enable_irq_wake(irq);
+        return 0;
+}
+static int tc3589x_keypad_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct tc_keypad *keypad = platform_get_drvdata(pdev);
+        int irq = platform_get_irq(pdev, 0);
+        if (!keypad->keypad_stopped)
+                return 0;
+        /* enable the device to resume normal operations */
+        if (!device_may_wakeup(&pdev->dev))
+                tc3589x_keypad_enable(keypad);
+        else
+                disable_irq_wake(irq);
+        return 0;
+}
+static const SIMPLE_DEV_PM_OPS(tc3589x_keypad_dev_pm_ops,
+                               tc3589x_keypad_suspend, tc3589x_keypad_resume);
+#endif
+static struct platform_driver tc3589x_keypad_driver = {
+        .driver.name  = "tc3589x-keypad",
+        .driver.owner = THIS_MODULE,
+#ifdef CONFIG_PM
+        .driver.pm = &tc3589x_keypad_dev_pm_ops,
+#endif
+        .probe = tc3589x_keypad_probe,
+        .remove = __devexit_p(tc3589x_keypad_remove),
+};
+static int __init tc3589x_keypad_init(void)
+{
+        return platform_driver_register(&tc3589x_keypad_driver);
+}
+module_init(tc3589x_keypad_init);
+static void __exit tc3589x_keypad_exit(void)
+{
+        return platform_driver_unregister(&tc3589x_keypad_driver);
+}
+module_exit(tc3589x_keypad_exit);
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Jayeeta Banerjee/Sundar Iyer");
+MODULE_DESCRIPTION("TC35893 Keypad Driver");
+MODULE_ALIAS("platform:tc3589x-keypad")
diff --git a/drivers/input/mouse/synaptics.h b/drivers/input/mouse/synaptics.h
index 613a3652f98f..0aefaa885871 100644
--- a/drivers/input/mouse/synaptics.h
+++ b/drivers/input/mouse/synaptics.h
@@ -51,7 +51,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)
-#define SYN_CAP_CLICKPAD(ex0c)          ((ex0c) & 0x100100)
+#define SYN_CAP_CLICKPAD(ex0c)          ((ex0c) & 0x100000) /* 1-button ClickPad */
+#define SYN_CAP_CLICKPAD2BTN(ex0c)      ((ex0c) & 0x000100) /* 2-button ClickPad */
 #define SYN_CAP_MAX_DIMENSIONS(ex0c)    ((ex0c) & 0x020000)
 /* synaptics modes query bits */
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index b3252ef1e279..4852b440960a 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -1436,6 +1436,12 @@ static struct wacom_features wacom_features_0xD2 =
        { "Wacom Bamboo Craft",   WACOM_PKGLEN_BBFUN,     14720,  9200, 1023, 63, BAMBOO_PT };
 static struct wacom_features wacom_features_0xD3 =
        { "Wacom Bamboo 2FG 6x8", WACOM_PKGLEN_BBFUN,     21648, 13530, 1023, 63, BAMBOO_PT };
+static struct wacom_features wacom_features_0xD8 =
+        { "Wacom Bamboo Comic 2FG", WACOM_PKGLEN_BBFUN,   21648, 13530, 1023, 63, BAMBOO_PT };
+static struct wacom_features wacom_features_0xDA =
+        { "Wacom Bamboo 2FG 4x5 SE", WACOM_PKGLEN_BBFUN,  14720,  9200, 1023, 63, BAMBOO_PT };
+static struct wacom_features wacom_features_0xDB =
+        { "Wacom Bamboo 2FG 6x8 SE", WACOM_PKGLEN_BBFUN,  21648, 13530, 1023, 63, BAMBOO_PT };
 #define USB_DEVICE_WACOM(prod)                                  \
        USB_DEVICE(USB_VENDOR_ID_WACOM, prod),                  \
@@ -1504,6 +1510,9 @@ const struct usb_device_id wacom_ids[] = {
        { USB_DEVICE_WACOM(0xD1) },
        { USB_DEVICE_WACOM(0xD2) },
        { USB_DEVICE_WACOM(0xD3) },
+        { USB_DEVICE_WACOM(0xD8) },
+        { USB_DEVICE_WACOM(0xDA) },
+        { USB_DEVICE_WACOM(0xDB) },
        { USB_DEVICE_WACOM(0xF0) },
        { USB_DEVICE_WACOM(0xCC) },
        { USB_DEVICE_WACOM(0x90) },
diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index f45f80f6d336..73fd6642b681 100644
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
@@ -178,6 +178,7 @@ static const struct usb_device_id usbtouch_devices[] = {
 #ifdef CONFIG_TOUCHSCREEN_USB_ITM
        {USB_DEVICE(0x0403, 0xf9e9), .driver_info = DEVTYPE_ITM},
+        {USB_DEVICE(0x16e3, 0xf9e9), .driver_info = DEVTYPE_ITM},
 #endif
 #ifdef CONFIG_TOUCHSCREEN_USB_ETURBO
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 84c46a161927..e71c5fa527f5 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -371,10 +371,15 @@ static void md_end_flush(struct bio *bio, int err)
        bio_put(bio);
 }
-static void submit_flushes(mddev_t *mddev)
+static void md_submit_flush_data(struct work_struct *ws);
+static void submit_flushes(struct work_struct *ws)
 {
+        mddev_t *mddev = container_of(ws, mddev_t, flush_work);
        mdk_rdev_t *rdev;
+        INIT_WORK(&mddev->flush_work, md_submit_flush_data);
+        atomic_set(&mddev->flush_pending, 1);
        rcu_read_lock();
        list_for_each_entry_rcu(rdev, &mddev->disks, same_set)
                if (rdev->raid_disk >= 0 &&
@@ -397,6 +402,8 @@ static void submit_flushes(mddev_t *mddev)
                        rdev_dec_pending(rdev, mddev);
                }
        rcu_read_unlock();
+        if (atomic_dec_and_test(&mddev->flush_pending))
+                queue_work(md_wq, &mddev->flush_work);
 }
 static void md_submit_flush_data(struct work_struct *ws)
@@ -404,8 +411,6 @@ static void md_submit_flush_data(struct work_struct *ws)
        mddev_t *mddev = container_of(ws, mddev_t, flush_work);
        struct bio *bio = mddev->flush_bio;
-        atomic_set(&mddev->flush_pending, 1);
        if (bio->bi_size == 0)
                /* an empty barrier - all done */
                bio_endio(bio, 0);
@@ -414,10 +419,9 @@ static void md_submit_flush_data(struct work_struct *ws)
                if (mddev->pers->make_request(mddev, bio))
                        generic_make_request(bio);
        }
-        if (atomic_dec_and_test(&mddev->flush_pending)) {
-                mddev->flush_bio = NULL;
+        mddev->flush_bio = NULL;
-                wake_up(&mddev->sb_wait);
+        wake_up(&mddev->sb_wait);
-        }
 }
 void md_flush_request(mddev_t *mddev, struct bio *bio)
@@ -429,13 +433,8 @@ void md_flush_request(mddev_t *mddev, struct bio *bio)
        mddev->flush_bio = bio;
        spin_unlock_irq(&mddev->write_lock);
-        atomic_set(&mddev->flush_pending, 1);
+        INIT_WORK(&mddev->flush_work, submit_flushes);
-        INIT_WORK(&mddev->flush_work, md_submit_flush_data);
+        queue_work(md_wq, &mddev->flush_work);
-        submit_flushes(mddev);
-        if (atomic_dec_and_test(&mddev->flush_pending))
-                queue_work(md_wq, &mddev->flush_work);
 }
 EXPORT_SYMBOL(md_flush_request);
@@ -5160,7 +5159,7 @@ static int add_new_disk(mddev_t * mddev, mdu_disk_info_t *info)
                                PTR_ERR(rdev));
                        return PTR_ERR(rdev);
                }
-                /* set save_raid_disk if appropriate */
+                /* set saved_raid_disk if appropriate */
                if (!mddev->persistent) {
                        if (info->state & (1<<MD_DISK_SYNC)  &&
                            info->raid_disk < mddev->raid_disks)
@@ -5170,7 +5169,10 @@ static int add_new_disk(mddev_t * mddev, mdu_disk_info_t *info)
                } else
                        super_types[mddev->major_version].
                                validate_super(mddev, rdev);
-                rdev->saved_raid_disk = rdev->raid_disk;
+                if (test_bit(In_sync, &rdev->flags))
+                        rdev->saved_raid_disk = rdev->raid_disk;
+                else
+                        rdev->saved_raid_disk = -1;
                clear_bit(In_sync, &rdev->flags); /* just to be sure */
                if (info->state & (1<<MD_DISK_WRITEMOSTLY))
@@ -6042,9 +6044,8 @@ static int md_thread(void * arg)
                         || kthread_should_stop(),
                         thread->timeout);
-                clear_bit(THREAD_WAKEUP, &thread->flags);
+                if (test_and_clear_bit(THREAD_WAKEUP, &thread->flags))
+                        thread->run(thread->mddev);
-                thread->run(thread->mddev);
        }
        return 0;
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index c67aa54694ae..0641674827f0 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -2397,13 +2397,13 @@ static int run(mddev_t *mddev)
        return 0;
 out_free_conf:
+        md_unregister_thread(mddev->thread);
        if (conf->r10bio_pool)
                mempool_destroy(conf->r10bio_pool);
        safe_put_page(conf->tmppage);
        kfree(conf->mirrors);
        kfree(conf);
        mddev->private = NULL;
-        md_unregister_thread(mddev->thread);
 out:
        return -EIO;
 }
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 3a1493b8b5e5..e8e704f52746 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -218,12 +218,12 @@ config MFD_STMPE
                Keypad: stmpe-keypad
                Touchscreen: stmpe-ts
-config MFD_TC35892
+config MFD_TC3589X
-        bool "Support Toshiba TC35892"
+        bool "Support Toshiba TC35892 and variants"
        depends on I2C=y && GENERIC_HARDIRQS
        select MFD_CORE
        help
-          Support for the Toshiba TC35892 I/O Expander.
+          Support for the Toshiba TC35892 and variants I/O Expander.
          This driver provides common support for accessing the device,
          additional drivers must be enabled in order to use the
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index f54b3659abbb..e590d1e44cf0 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -16,7 +16,7 @@ obj-$(CONFIG_MFD_DAVINCI_VOICECODEC)	+= davinci_voicecodec.o
 obj-$(CONFIG_MFD_DM355EVM_MSP)  += dm355evm_msp.o
 obj-$(CONFIG_MFD_STMPE)         += stmpe.o
-obj-$(CONFIG_MFD_TC35892)       += tc35892.o
+obj-$(CONFIG_MFD_TC3589X)       += tc3589x.o
 obj-$(CONFIG_MFD_T7L66XB)       += t7l66xb.o tmio_core.o
 obj-$(CONFIG_MFD_TC6387XB)      += tc6387xb.o tmio_core.o
 obj-$(CONFIG_MFD_TC6393XB)      += tc6393xb.o tmio_core.o
diff --git a/drivers/mfd/tc35892.c b/drivers/mfd/tc35892.c
deleted file mode 100644
index e619e2a55997..000000000000
--- a/drivers/mfd/tc35892.c
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * License Terms: GNU General Public License, version 2
- * Author: Hanumath Prasad <hanumath.prasad@stericsson.com> for ST-Ericsson
- * Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson
- */
-#include <linux/module.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/slab.h>
-#include <linux/i2c.h>
-#include <linux/mfd/core.h>
-#include <linux/mfd/tc35892.h>
-/**
- * tc35892_reg_read() - read a single TC35892 register
- * @tc35892:    Device to read from
- * @reg:        Register to read
- */
-int tc35892_reg_read(struct tc35892 *tc35892, u8 reg)
-{
-        int ret;
-        ret = i2c_smbus_read_byte_data(tc35892->i2c, reg);
-        if (ret < 0)
-                dev_err(tc35892->dev, "failed to read reg %#x: %d\n",
-                        reg, ret);
-        return ret;
-}
-EXPORT_SYMBOL_GPL(tc35892_reg_read);
-/**
- * tc35892_reg_read() - write a single TC35892 register
- * @tc35892:    Device to write to
- * @reg:        Register to read
- * @data:       Value to write
- */
-int tc35892_reg_write(struct tc35892 *tc35892, u8 reg, u8 data)
-{
-        int ret;
-        ret = i2c_smbus_write_byte_data(tc35892->i2c, reg, data);
-        if (ret < 0)
-                dev_err(tc35892->dev, "failed to write reg %#x: %d\n",
-                        reg, ret);
-        return ret;
-}
-EXPORT_SYMBOL_GPL(tc35892_reg_write);
-/**
- * tc35892_block_read() - read multiple TC35892 registers
- * @tc35892:    Device to read from
- * @reg:        First register
- * @length:     Number of registers
- * @values:     Buffer to write to
- */
-int tc35892_block_read(struct tc35892 *tc35892, u8 reg, u8 length, u8 *values)
-{
-        int ret;
-        ret = i2c_smbus_read_i2c_block_data(tc35892->i2c, reg, length, values);
-        if (ret < 0)
-                dev_err(tc35892->dev, "failed to read regs %#x: %d\n",
-                        reg, ret);
-        return ret;
-}
-EXPORT_SYMBOL_GPL(tc35892_block_read);
-/**
- * tc35892_block_write() - write multiple TC35892 registers
- * @tc35892:    Device to write to
- * @reg:        First register
- * @length:     Number of registers
- * @values:     Values to write
- */
-int tc35892_block_write(struct tc35892 *tc35892, u8 reg, u8 length,
-                        const u8 *values)
-{
-        int ret;
-        ret = i2c_smbus_write_i2c_block_data(tc35892->i2c, reg, length,
-                                             values);
-        if (ret < 0)
-                dev_err(tc35892->dev, "failed to write regs %#x: %d\n",
-                        reg, ret);
-        return ret;
-}
-EXPORT_SYMBOL_GPL(tc35892_block_write);
-/**
- * tc35892_set_bits() - set the value of a bitfield in a TC35892 register
- * @tc35892:    Device to write to
- * @reg:        Register to write
- * @mask:       Mask of bits to set
- * @values:     Value to set
- */
-int tc35892_set_bits(struct tc35892 *tc35892, u8 reg, u8 mask, u8 val)
-{
-        int ret;
-        mutex_lock(&tc35892->lock);
-        ret = tc35892_reg_read(tc35892, reg);
-        if (ret < 0)
-                goto out;
-        ret &= ~mask;
-        ret |= val;
-        ret = tc35892_reg_write(tc35892, reg, ret);
-out:
-        mutex_unlock(&tc35892->lock);
-        return ret;
-}
-EXPORT_SYMBOL_GPL(tc35892_set_bits);
-static struct resource gpio_resources[] = {
-        {
-                .start  = TC35892_INT_GPIIRQ,
-                .end    = TC35892_INT_GPIIRQ,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-static struct mfd_cell tc35892_devs[] = {
-        {
-                .name           = "tc35892-gpio",
-                .num_resources  = ARRAY_SIZE(gpio_resources),
-                .resources      = &gpio_resources[0],
-        },
-};
-static irqreturn_t tc35892_irq(int irq, void *data)
-{
-        struct tc35892 *tc35892 = data;
-        int status;
-        status = tc35892_reg_read(tc35892, TC35892_IRQST);
-        if (status < 0)
-                return IRQ_NONE;
-        while (status) {
-                int bit = __ffs(status);
-                handle_nested_irq(tc35892->irq_base + bit);
-                status &= ~(1 << bit);
-        }
-        /*
-         * A dummy read or write (to any register) appears to be necessary to
-         * have the last interrupt clear (for example, GPIO IC write) take
-         * effect.
-         */
-        tc35892_reg_read(tc35892, TC35892_IRQST);
-        return IRQ_HANDLED;
-}
-static void tc35892_irq_dummy(unsigned int irq)
-{
-        /* No mask/unmask at this level */
-}
-static struct irq_chip tc35892_irq_chip = {
-        .name   = "tc35892",
-        .mask   = tc35892_irq_dummy,
-        .unmask = tc35892_irq_dummy,
-};
-static int tc35892_irq_init(struct tc35892 *tc35892)
-{
-        int base = tc35892->irq_base;
-        int irq;
-        for (irq = base; irq < base + TC35892_NR_INTERNAL_IRQS; irq++) {
-                set_irq_chip_data(irq, tc35892);
-                set_irq_chip_and_handler(irq, &tc35892_irq_chip,
-                                         handle_edge_irq);
-                set_irq_nested_thread(irq, 1);
-#ifdef CONFIG_ARM
-                set_irq_flags(irq, IRQF_VALID);
-#else
-                set_irq_noprobe(irq);
-#endif
-        }
-        return 0;
-}
-static void tc35892_irq_remove(struct tc35892 *tc35892)
-{
-        int base = tc35892->irq_base;
-        int irq;
-        for (irq = base; irq < base + TC35892_NR_INTERNAL_IRQS; irq++) {
-#ifdef CONFIG_ARM
-                set_irq_flags(irq, 0);
-#endif
-                set_irq_chip_and_handler(irq, NULL, NULL);
-                set_irq_chip_data(irq, NULL);
-        }
-}
-static int tc35892_chip_init(struct tc35892 *tc35892)
-{
-        int manf, ver, ret;
-        manf = tc35892_reg_read(tc35892, TC35892_MANFCODE);
-        if (manf < 0)
-                return manf;
-        ver = tc35892_reg_read(tc35892, TC35892_VERSION);
-        if (ver < 0)
-                return ver;
-        if (manf != TC35892_MANFCODE_MAGIC) {
-                dev_err(tc35892->dev, "unknown manufacturer: %#x\n", manf);
-                return -EINVAL;
-        }
-        dev_info(tc35892->dev, "manufacturer: %#x, version: %#x\n", manf, ver);
-        /* Put everything except the IRQ module into reset */
-        ret = tc35892_reg_write(tc35892, TC35892_RSTCTRL,
-                                TC35892_RSTCTRL_TIMRST
-                                | TC35892_RSTCTRL_ROTRST
-                                | TC35892_RSTCTRL_KBDRST
-                                | TC35892_RSTCTRL_GPIRST);
-        if (ret < 0)
-                return ret;
-        /* Clear the reset interrupt. */
-        return tc35892_reg_write(tc35892, TC35892_RSTINTCLR, 0x1);
-}
-static int __devinit tc35892_probe(struct i2c_client *i2c,
-                                   const struct i2c_device_id *id)
-{
-        struct tc35892_platform_data *pdata = i2c->dev.platform_data;
-        struct tc35892 *tc35892;
-        int ret;
-        if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_BYTE_DATA
-                                     | I2C_FUNC_SMBUS_I2C_BLOCK))
-                return -EIO;
-        tc35892 = kzalloc(sizeof(struct tc35892), GFP_KERNEL);
-        if (!tc35892)
-                return -ENOMEM;
-        mutex_init(&tc35892->lock);
-        tc35892->dev = &i2c->dev;
-        tc35892->i2c = i2c;
-        tc35892->pdata = pdata;
-        tc35892->irq_base = pdata->irq_base;
-        tc35892->num_gpio = id->driver_data;
-        i2c_set_clientdata(i2c, tc35892);
-        ret = tc35892_chip_init(tc35892);
-        if (ret)
-                goto out_free;
-        ret = tc35892_irq_init(tc35892);
-        if (ret)
-                goto out_free;
-        ret = request_threaded_irq(tc35892->i2c->irq, NULL, tc35892_irq,
-                                   IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
-                                   "tc35892", tc35892);
-        if (ret) {
-                dev_err(tc35892->dev, "failed to request IRQ: %d\n", ret);
-                goto out_removeirq;
-        }
-        ret = mfd_add_devices(tc35892->dev, -1, tc35892_devs,
-                              ARRAY_SIZE(tc35892_devs), NULL,
-                              tc35892->irq_base);
-        if (ret) {
-                dev_err(tc35892->dev, "failed to add children\n");
-                goto out_freeirq;
-        }
-        return 0;
-out_freeirq:
-        free_irq(tc35892->i2c->irq, tc35892);
-out_removeirq:
-        tc35892_irq_remove(tc35892);
-out_free:
-        kfree(tc35892);
-        return ret;
-}
-static int __devexit tc35892_remove(struct i2c_client *client)
-{
-        struct tc35892 *tc35892 = i2c_get_clientdata(client);
-        mfd_remove_devices(tc35892->dev);
-        free_irq(tc35892->i2c->irq, tc35892);
-        tc35892_irq_remove(tc35892);
-        kfree(tc35892);
-        return 0;
-}
-static const struct i2c_device_id tc35892_id[] = {
-        { "tc35892", 24 },
-        { }
-};
-MODULE_DEVICE_TABLE(i2c, tc35892_id);
-static struct i2c_driver tc35892_driver = {
-        .driver.name    = "tc35892",
-        .driver.owner   = THIS_MODULE,
-        .probe          = tc35892_probe,
-        .remove         = __devexit_p(tc35892_remove),
-        .id_table       = tc35892_id,
-};
-static int __init tc35892_init(void)
-{
-        return i2c_add_driver(&tc35892_driver);
-}
-subsys_initcall(tc35892_init);
-static void __exit tc35892_exit(void)
-{
-        i2c_del_driver(&tc35892_driver);
-}
-module_exit(tc35892_exit);
-MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION("TC35892 MFD core driver");
-MODULE_AUTHOR("Hanumath Prasad, Rabin Vincent");
diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c
new file mode 100644
index 000000000000..729dbeed2ce0
--- /dev/null
+++ b/drivers/mfd/tc3589x.c
@@ -0,0 +1,422 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2010
+ *
+ * License Terms: GNU General Public License, version 2
+ * Author: Hanumath Prasad <hanumath.prasad@stericsson.com> for ST-Ericsson
+ * Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson
+ */
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/mfd/core.h>
+#include <linux/mfd/tc3589x.h>
+#define TC3589x_CLKMODE_MODCTL_SLEEP            0x0
+#define TC3589x_CLKMODE_MODCTL_OPERATION        (1 << 0)
+/**
+ * tc3589x_reg_read() - read a single TC3589x register
+ * @tc3589x:    Device to read from
+ * @reg:        Register to read
+ */
+int tc3589x_reg_read(struct tc3589x *tc3589x, u8 reg)
+{
+        int ret;
+        ret = i2c_smbus_read_byte_data(tc3589x->i2c, reg);
+        if (ret < 0)
+                dev_err(tc3589x->dev, "failed to read reg %#x: %d\n",
+                        reg, ret);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(tc3589x_reg_read);
+/**
+ * tc3589x_reg_read() - write a single TC3589x register
+ * @tc3589x:    Device to write to
+ * @reg:        Register to read
+ * @data:       Value to write
+ */
+int tc3589x_reg_write(struct tc3589x *tc3589x, u8 reg, u8 data)
+{
+        int ret;
+        ret = i2c_smbus_write_byte_data(tc3589x->i2c, reg, data);
+        if (ret < 0)
+                dev_err(tc3589x->dev, "failed to write reg %#x: %d\n",
+                        reg, ret);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(tc3589x_reg_write);
+/**
+ * tc3589x_block_read() - read multiple TC3589x registers
+ * @tc3589x:    Device to read from
+ * @reg:        First register
+ * @length:     Number of registers
+ * @values:     Buffer to write to
+ */
+int tc3589x_block_read(struct tc3589x *tc3589x, u8 reg, u8 length, u8 *values)
+{
+        int ret;
+        ret = i2c_smbus_read_i2c_block_data(tc3589x->i2c, reg, length, values);
+        if (ret < 0)
+                dev_err(tc3589x->dev, "failed to read regs %#x: %d\n",
+                        reg, ret);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(tc3589x_block_read);
+/**
+ * tc3589x_block_write() - write multiple TC3589x registers
+ * @tc3589x:    Device to write to
+ * @reg:        First register
+ * @length:     Number of registers
+ * @values:     Values to write
+ */
+int tc3589x_block_write(struct tc3589x *tc3589x, u8 reg, u8 length,
+                        const u8 *values)
+{
+        int ret;
+        ret = i2c_smbus_write_i2c_block_data(tc3589x->i2c, reg, length,
+                                             values);
+        if (ret < 0)
+                dev_err(tc3589x->dev, "failed to write regs %#x: %d\n",
+                        reg, ret);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(tc3589x_block_write);
+/**
+ * tc3589x_set_bits() - set the value of a bitfield in a TC3589x register
+ * @tc3589x:    Device to write to
+ * @reg:        Register to write
+ * @mask:       Mask of bits to set
+ * @values:     Value to set
+ */
+int tc3589x_set_bits(struct tc3589x *tc3589x, u8 reg, u8 mask, u8 val)
+{
+        int ret;
+        mutex_lock(&tc3589x->lock);
+        ret = tc3589x_reg_read(tc3589x, reg);
+        if (ret < 0)
+                goto out;
+        ret &= ~mask;
+        ret |= val;
+        ret = tc3589x_reg_write(tc3589x, reg, ret);
+out:
+        mutex_unlock(&tc3589x->lock);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(tc3589x_set_bits);
+static struct resource gpio_resources[] = {
+        {
+                .start  = TC3589x_INT_GPIIRQ,
+                .end    = TC3589x_INT_GPIIRQ,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+static struct resource keypad_resources[] = {
+        {
+                .start  = TC3589x_INT_KBDIRQ,
+                .end    = TC3589x_INT_KBDIRQ,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+static struct mfd_cell tc3589x_dev_gpio[] = {
+        {
+                .name           = "tc3589x-gpio",
+                .num_resources  = ARRAY_SIZE(gpio_resources),
+                .resources      = &gpio_resources[0],
+        },
+};
+static struct mfd_cell tc3589x_dev_keypad[] = {
+        {
+                .name           = "tc3589x-keypad",
+                .num_resources  = ARRAY_SIZE(keypad_resources),
+                .resources      = &keypad_resources[0],
+        },
+};
+static irqreturn_t tc3589x_irq(int irq, void *data)
+{
+        struct tc3589x *tc3589x = data;
+        int status;
+again:
+        status = tc3589x_reg_read(tc3589x, TC3589x_IRQST);
+        if (status < 0)
+                return IRQ_NONE;
+        while (status) {
+                int bit = __ffs(status);
+                handle_nested_irq(tc3589x->irq_base + bit);
+                status &= ~(1 << bit);
+        }
+        /*
+         * A dummy read or write (to any register) appears to be necessary to
+         * have the last interrupt clear (for example, GPIO IC write) take
+         * effect. In such a case, recheck for any interrupt which is still
+         * pending.
+         */
+        status = tc3589x_reg_read(tc3589x, TC3589x_IRQST);
+        if (status)
+                goto again;
+        return IRQ_HANDLED;
+}
+static int tc3589x_irq_init(struct tc3589x *tc3589x)
+{
+        int base = tc3589x->irq_base;
+        int irq;
+        for (irq = base; irq < base + TC3589x_NR_INTERNAL_IRQS; irq++) {
+                set_irq_chip_data(irq, tc3589x);
+                set_irq_chip_and_handler(irq, &dummy_irq_chip,
+                                         handle_edge_irq);
+                set_irq_nested_thread(irq, 1);
+#ifdef CONFIG_ARM
+                set_irq_flags(irq, IRQF_VALID);
+#else
+                set_irq_noprobe(irq);
+#endif
+        }
+        return 0;
+}
+static void tc3589x_irq_remove(struct tc3589x *tc3589x)
+{
+        int base = tc3589x->irq_base;
+        int irq;
+        for (irq = base; irq < base + TC3589x_NR_INTERNAL_IRQS; irq++) {
+#ifdef CONFIG_ARM
+                set_irq_flags(irq, 0);
+#endif
+                set_irq_chip_and_handler(irq, NULL, NULL);
+                set_irq_chip_data(irq, NULL);
+        }
+}
+static int tc3589x_chip_init(struct tc3589x *tc3589x)
+{
+        int manf, ver, ret;
+        manf = tc3589x_reg_read(tc3589x, TC3589x_MANFCODE);
+        if (manf < 0)
+                return manf;
+        ver = tc3589x_reg_read(tc3589x, TC3589x_VERSION);
+        if (ver < 0)
+                return ver;
+        if (manf != TC3589x_MANFCODE_MAGIC) {
+                dev_err(tc3589x->dev, "unknown manufacturer: %#x\n", manf);
+                return -EINVAL;
+        }
+        dev_info(tc3589x->dev, "manufacturer: %#x, version: %#x\n", manf, ver);
+        /*
+         * Put everything except the IRQ module into reset;
+         * also spare the GPIO module for any pin initialization
+         * done during pre-kernel boot
+         */
+        ret = tc3589x_reg_write(tc3589x, TC3589x_RSTCTRL,
+                                TC3589x_RSTCTRL_TIMRST
+                                | TC3589x_RSTCTRL_ROTRST
+                                | TC3589x_RSTCTRL_KBDRST);
+        if (ret < 0)
+                return ret;
+        /* Clear the reset interrupt. */
+        return tc3589x_reg_write(tc3589x, TC3589x_RSTINTCLR, 0x1);
+}
+static int __devinit tc3589x_device_init(struct tc3589x *tc3589x)
+{
+        int ret = 0;
+        unsigned int blocks = tc3589x->pdata->block;
+        if (blocks & TC3589x_BLOCK_GPIO) {
+                ret = mfd_add_devices(tc3589x->dev, -1, tc3589x_dev_gpio,
+                                ARRAY_SIZE(tc3589x_dev_gpio), NULL,
+                                tc3589x->irq_base);
+                if (ret) {
+                        dev_err(tc3589x->dev, "failed to add gpio child\n");
+                        return ret;
+                }
+                dev_info(tc3589x->dev, "added gpio block\n");
+        }
+        if (blocks & TC3589x_BLOCK_KEYPAD) {
+                ret = mfd_add_devices(tc3589x->dev, -1, tc3589x_dev_keypad,
+                                ARRAY_SIZE(tc3589x_dev_keypad), NULL,
+                                tc3589x->irq_base);
+                if (ret) {
+                        dev_err(tc3589x->dev, "failed to keypad child\n");
+                        return ret;
+                }
+                dev_info(tc3589x->dev, "added keypad block\n");
+        }
+        return ret;
+}
+static int __devinit tc3589x_probe(struct i2c_client *i2c,
+                                   const struct i2c_device_id *id)
+{
+        struct tc3589x_platform_data *pdata = i2c->dev.platform_data;
+        struct tc3589x *tc3589x;
+        int ret;
+        if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_BYTE_DATA
+                                     | I2C_FUNC_SMBUS_I2C_BLOCK))
+                return -EIO;
+        tc3589x = kzalloc(sizeof(struct tc3589x), GFP_KERNEL);
+        if (!tc3589x)
+                return -ENOMEM;
+        mutex_init(&tc3589x->lock);
+        tc3589x->dev = &i2c->dev;
+        tc3589x->i2c = i2c;
+        tc3589x->pdata = pdata;
+        tc3589x->irq_base = pdata->irq_base;
+        tc3589x->num_gpio = id->driver_data;
+        i2c_set_clientdata(i2c, tc3589x);
+        ret = tc3589x_chip_init(tc3589x);
+        if (ret)
+                goto out_free;
+        ret = tc3589x_irq_init(tc3589x);
+        if (ret)
+                goto out_free;
+        ret = request_threaded_irq(tc3589x->i2c->irq, NULL, tc3589x_irq,
+                                   IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+                                   "tc3589x", tc3589x);
+        if (ret) {
+                dev_err(tc3589x->dev, "failed to request IRQ: %d\n", ret);
+                goto out_removeirq;
+        }
+        ret = tc3589x_device_init(tc3589x);
+        if (ret) {
+                dev_err(tc3589x->dev, "failed to add child devices\n");
+                goto out_freeirq;
+        }
+        return 0;
+out_freeirq:
+        free_irq(tc3589x->i2c->irq, tc3589x);
+out_removeirq:
+        tc3589x_irq_remove(tc3589x);
+out_free:
+        kfree(tc3589x);
+        return ret;
+}
+static int __devexit tc3589x_remove(struct i2c_client *client)
+{
+        struct tc3589x *tc3589x = i2c_get_clientdata(client);
+        mfd_remove_devices(tc3589x->dev);
+        free_irq(tc3589x->i2c->irq, tc3589x);
+        tc3589x_irq_remove(tc3589x);
+        kfree(tc3589x);
+        return 0;
+}
+static int tc3589x_suspend(struct device *dev)
+{
+        struct tc3589x *tc3589x = dev_get_drvdata(dev);
+        struct i2c_client *client = tc3589x->i2c;
+        int ret = 0;
+        /* put the system to sleep mode */
+        if (!device_may_wakeup(&client->dev))
+                ret = tc3589x_reg_write(tc3589x, TC3589x_CLKMODE,
+                                TC3589x_CLKMODE_MODCTL_SLEEP);
+        return ret;
+}
+static int tc3589x_resume(struct device *dev)
+{
+        struct tc3589x *tc3589x = dev_get_drvdata(dev);
+        struct i2c_client *client = tc3589x->i2c;
+        int ret = 0;
+        /* enable the system into operation */
+        if (!device_may_wakeup(&client->dev))
+                ret = tc3589x_reg_write(tc3589x, TC3589x_CLKMODE,
+                                TC3589x_CLKMODE_MODCTL_OPERATION);
+        return ret;
+}
+static const SIMPLE_DEV_PM_OPS(tc3589x_dev_pm_ops, tc3589x_suspend,
+                                                tc3589x_resume);
+static const struct i2c_device_id tc3589x_id[] = {
+        { "tc3589x", 24 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, tc3589x_id);
+static struct i2c_driver tc3589x_driver = {
+        .driver.name    = "tc3589x",
+        .driver.owner   = THIS_MODULE,
+#ifdef CONFIG_PM
+        .driver.pm      = &tc3589x_dev_pm_ops,
+#endif
+        .probe          = tc3589x_probe,
+        .remove         = __devexit_p(tc3589x_remove),
+        .id_table       = tc3589x_id,
+};
+static int __init tc3589x_init(void)
+{
+        return i2c_add_driver(&tc3589x_driver);
+}
+subsys_initcall(tc3589x_init);
+static void __exit tc3589x_exit(void)
+{
+        i2c_del_driver(&tc3589x_driver);
+}
+module_exit(tc3589x_exit);
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("TC3589x MFD core driver");
+MODULE_AUTHOR("Hanumath Prasad, Rabin Vincent");
diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c
index dd90880048cf..d8ae634d347e 100644
--- a/drivers/mtd/maps/pxa2xx-flash.c
+++ b/drivers/mtd/maps/pxa2xx-flash.c
@@ -51,7 +51,7 @@ struct pxa2xx_flash_info {
 static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };
-static int __init pxa2xx_flash_probe(struct platform_device *pdev)
+static int __devinit pxa2xx_flash_probe(struct platform_device *pdev)
 {
        struct flash_platform_data *flash = pdev->dev.platform_data;
        struct pxa2xx_flash_info *info;
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index cd41c58b5bbd..15682ec8530e 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -7,7 +7,6 @@
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
 */
-#define CONFIG_MTD_NAND_OMAP_HWECC
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index c6e86315b3f8..2e2b76258ab4 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -381,11 +381,11 @@ static void b44_set_flow_ctrl(struct b44 *bp, u32 local, u32 remote)
        __b44_set_flow_ctrl(bp, pause_enab);
 }
-#ifdef SSB_DRIVER_MIPS
+#ifdef CONFIG_BCM47XX
-extern char *nvram_get(char *name);
+#include <asm/mach-bcm47xx/nvram.h>
 static void b44_wap54g10_workaround(struct b44 *bp)
 {
-        const char *str;
+        char buf[20];
        u32 val;
        int err;
@@ -394,10 +394,9 @@ static void b44_wap54g10_workaround(struct b44 *bp)
         * see https://dev.openwrt.org/ticket/146
         * check and reset bit "isolate"
         */
-        str = nvram_get("boardnum");
+        if (nvram_getenv("boardnum", buf, sizeof(buf)) < 0)
-        if (!str)
                return;
-        if (simple_strtoul(str, NULL, 0) == 2) {
+        if (simple_strtoul(buf, NULL, 0) == 2) {
                err = __b44_readphy(bp, 0, MII_BMCR, &val);
                if (err)
                        goto error;
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index 36eca1ce75d4..e4465d222a7d 100644
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
@@ -1235,7 +1235,7 @@ int be_cmd_multicast_set(struct be_adapter *adapter, u32 if_id,
                i = 0;
                netdev_for_each_mc_addr(ha, netdev)
-                        memcpy(req->mac[i].byte, ha->addr, ETH_ALEN);
+                        memcpy(req->mac[i++].byte, ha->addr, ETH_ALEN);
        } else {
                req->promiscuous = 1;
        }
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
index 863e73a85fbe..d255428122fc 100644
--- a/drivers/net/bnx2x/bnx2x.h
+++ b/drivers/net/bnx2x/bnx2x.h
@@ -20,8 +20,8 @@
 * (you will need to reboot afterwards) */
 /* #define BNX2X_STOP_ON_ERROR */
-#define DRV_MODULE_VERSION      "1.60.00-4"
+#define DRV_MODULE_VERSION      "1.60.01-0"
-#define DRV_MODULE_RELDATE      "2010/11/01"
+#define DRV_MODULE_RELDATE      "2010/11/12"
 #define BNX2X_BC_VER            0x040200
 #define BNX2X_MULTI_QUEUE
diff --git a/drivers/net/bnx2x/bnx2x_cmn.c b/drivers/net/bnx2x/bnx2x_cmn.c
index 94d5f59d5a6f..0af361e4e3d1 100644
--- a/drivers/net/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/bnx2x/bnx2x_cmn.c
@@ -1782,15 +1782,15 @@ exit_lbl:
 }
 #endif
-static inline void bnx2x_set_pbd_gso_e2(struct sk_buff *skb,
+static inline void bnx2x_set_pbd_gso_e2(struct sk_buff *skb, u32 *parsing_data,
-                                     struct eth_tx_parse_bd_e2 *pbd,
+                                        u32 xmit_type)
-                                     u32 xmit_type)
 {
-        pbd->parsing_data |= cpu_to_le16(skb_shinfo(skb)->gso_size) <<
+        *parsing_data |= (skb_shinfo(skb)->gso_size <<
-                ETH_TX_PARSE_BD_E2_LSO_MSS_SHIFT;
+                              ETH_TX_PARSE_BD_E2_LSO_MSS_SHIFT) &
+                              ETH_TX_PARSE_BD_E2_LSO_MSS;
        if ((xmit_type & XMIT_GSO_V6) &&
            (ipv6_hdr(skb)->nexthdr == NEXTHDR_IPV6))
-                pbd->parsing_data |= ETH_TX_PARSE_BD_E2_IPV6_WITH_EXT_HDR;
+                *parsing_data |= ETH_TX_PARSE_BD_E2_IPV6_WITH_EXT_HDR;
 }
 /**
@@ -1835,15 +1835,15 @@ static inline void bnx2x_set_pbd_gso(struct sk_buff *skb,
 * @return header len
 */
 static inline  u8 bnx2x_set_pbd_csum_e2(struct bnx2x *bp, struct sk_buff *skb,
-        struct eth_tx_parse_bd_e2 *pbd,
+        u32 *parsing_data, u32 xmit_type)
-        u32 xmit_type)
 {
-        pbd->parsing_data |= cpu_to_le16(tcp_hdrlen(skb)/4) <<
+        *parsing_data |= ((tcp_hdrlen(skb)/4) <<
-                ETH_TX_PARSE_BD_E2_TCP_HDR_LENGTH_DW_SHIFT;
+                ETH_TX_PARSE_BD_E2_TCP_HDR_LENGTH_DW_SHIFT) &
+                ETH_TX_PARSE_BD_E2_TCP_HDR_LENGTH_DW;
-        pbd->parsing_data |= cpu_to_le16(((unsigned char *)tcp_hdr(skb) -
+        *parsing_data |= ((((u8 *)tcp_hdr(skb) - skb->data) / 2) <<
-                                          skb->data) / 2) <<
+                ETH_TX_PARSE_BD_E2_TCP_HDR_START_OFFSET_W_SHIFT) &
-                ETH_TX_PARSE_BD_E2_TCP_HDR_START_OFFSET_W_SHIFT;
+                ETH_TX_PARSE_BD_E2_TCP_HDR_START_OFFSET_W;
        return skb_transport_header(skb) + tcp_hdrlen(skb) - skb->data;
 }
@@ -1912,6 +1912,7 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
        struct eth_tx_bd *tx_data_bd, *total_pkt_bd = NULL;
        struct eth_tx_parse_bd_e1x *pbd_e1x = NULL;
        struct eth_tx_parse_bd_e2 *pbd_e2 = NULL;
+        u32 pbd_e2_parsing_data = 0;
        u16 pkt_prod, bd_prod;
        int nbd, fp_index;
        dma_addr_t mapping;
@@ -2033,8 +2034,9 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
                memset(pbd_e2, 0, sizeof(struct eth_tx_parse_bd_e2));
                /* Set PBD in checksum offload case */
                if (xmit_type & XMIT_CSUM)
-                        hlen = bnx2x_set_pbd_csum_e2(bp,
+                        hlen = bnx2x_set_pbd_csum_e2(bp, skb,
-                                                     skb, pbd_e2, xmit_type);
+                                                     &pbd_e2_parsing_data,
+                                                     xmit_type);
        } else {
                pbd_e1x = &fp->tx_desc_ring[bd_prod].parse_bd_e1x;
                memset(pbd_e1x, 0, sizeof(struct eth_tx_parse_bd_e1x));
@@ -2076,10 +2078,18 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
                        bd_prod = bnx2x_tx_split(bp, fp, tx_buf, &tx_start_bd,
                                                 hlen, bd_prod, ++nbd);
                if (CHIP_IS_E2(bp))
-                        bnx2x_set_pbd_gso_e2(skb, pbd_e2, xmit_type);
+                        bnx2x_set_pbd_gso_e2(skb, &pbd_e2_parsing_data,
+                                             xmit_type);
                else
                        bnx2x_set_pbd_gso(skb, pbd_e1x, xmit_type);
        }
+        /* Set the PBD's parsing_data field if not zero
+         * (for the chips newer than 57711).
+         */
+        if (pbd_e2_parsing_data)
+                pbd_e2->parsing_data = cpu_to_le32(pbd_e2_parsing_data);
        tx_data_bd = (struct eth_tx_bd *)tx_start_bd;
        /* Handle fragmented skb */
diff --git a/drivers/net/bnx2x/bnx2x_init_ops.h b/drivers/net/bnx2x/bnx2x_init_ops.h
index a306b0e46b61..66df29fcf751 100644
--- a/drivers/net/bnx2x/bnx2x_init_ops.h
+++ b/drivers/net/bnx2x/bnx2x_init_ops.h
@@ -838,7 +838,7 @@ static void bnx2x_qm_init_ptr_table(struct bnx2x *bp, int qm_cid_count,
 /****************************************************************************
 * SRC initializations
 ****************************************************************************/
+#ifdef BCM_CNIC
 /* called during init func stage */
 static void bnx2x_src_init_t2(struct bnx2x *bp, struct src_ent *t2,
                              dma_addr_t t2_mapping, int src_cid_count)
@@ -862,5 +862,5 @@ static void bnx2x_src_init_t2(struct bnx2x *bp, struct src_ent *t2,
                    U64_HI((u64)t2_mapping +
                           (src_cid_count-1) * sizeof(struct src_ent)));
 }
+#endif
 #endif /* BNX2X_INIT_OPS_H */
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 71a169740d05..d0ea760ce419 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -171,7 +171,7 @@ MODULE_PARM_DESC(resend_igmp, "Number of IGMP membership reports to send on link
 /*----------------------------- Global variables ----------------------------*/
 #ifdef CONFIG_NET_POLL_CONTROLLER
-cpumask_var_t netpoll_block_tx;
+atomic_t netpoll_block_tx = ATOMIC_INIT(0);
 #endif
 static const char * const version =
@@ -1576,7 +1576,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
        /* If this is the first slave, then we need to set the master's hardware
         * address to be the same as the slave's. */
-        if (bond->slave_cnt == 0)
+        if (is_zero_ether_addr(bond->dev->dev_addr))
                memcpy(bond->dev->dev_addr, slave_dev->dev_addr,
                       slave_dev->addr_len);
@@ -5299,13 +5299,6 @@ static int __init bonding_init(void)
        if (res)
                goto out;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-        if (!alloc_cpumask_var(&netpoll_block_tx, GFP_KERNEL)) {
-                res = -ENOMEM;
-                goto out;
-        }
-#endif
        res = register_pernet_subsys(&bond_net_ops);
        if (res)
                goto out;
@@ -5334,9 +5327,6 @@ err:
        rtnl_link_unregister(&bond_link_ops);
 err_link:
        unregister_pernet_subsys(&bond_net_ops);
-#ifdef CONFIG_NET_POLL_CONTROLLER
-        free_cpumask_var(netpoll_block_tx);
-#endif
        goto out;
 }
@@ -5353,7 +5343,10 @@ static void __exit bonding_exit(void)
        unregister_pernet_subsys(&bond_net_ops);
 #ifdef CONFIG_NET_POLL_CONTROLLER
-        free_cpumask_var(netpoll_block_tx);
+        /*
+         * Make sure we don't have an imbalance on our netpoll blocking
+         */
+        WARN_ON(atomic_read(&netpoll_block_tx));
 #endif
 }
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 4eedb12df6ca..c2f081352a03 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -119,26 +119,22 @@
 #ifdef CONFIG_NET_POLL_CONTROLLER
-extern cpumask_var_t netpoll_block_tx;
+extern atomic_t netpoll_block_tx;
 static inline void block_netpoll_tx(void)
 {
-        preempt_disable();
+        atomic_inc(&netpoll_block_tx);
-        BUG_ON(cpumask_test_and_set_cpu(smp_processor_id(),
-                                        netpoll_block_tx));
 }
 static inline void unblock_netpoll_tx(void)
 {
-        BUG_ON(!cpumask_test_and_clear_cpu(smp_processor_id(),
+        atomic_dec(&netpoll_block_tx);
-                                           netpoll_block_tx));
-        preempt_enable();
 }
 static inline int is_netpoll_tx_blocked(struct net_device *dev)
 {
        if (unlikely(dev->priv_flags & IFF_IN_NETPOLL))
-                return cpumask_test_cpu(smp_processor_id(), netpoll_block_tx);
+                return atomic_read(&netpoll_block_tx);
        return 0;
 }
 #else
diff --git a/drivers/net/caif/caif_shm_u5500.c b/drivers/net/caif/caif_shm_u5500.c
index 1cd90da86f13..5f771ab712c4 100644
--- a/drivers/net/caif/caif_shm_u5500.c
+++ b/drivers/net/caif/caif_shm_u5500.c
@@ -5,13 +5,13 @@
 * License terms: GNU General Public License (GPL) version 2
 */
-#define pr_fmt(fmt) KBUILD_MODNAME ":" __func__ "():" fmt
+#define pr_fmt(fmt) KBUILD_MODNAME ":" fmt
 #include <linux/version.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
-#include <mach/mbox.h>
+#include <mach/mbox-db5500.h>
 #include <net/caif/caif_shm.h>
 MODULE_LICENSE("GPL");
diff --git a/drivers/net/caif/caif_shmcore.c b/drivers/net/caif/caif_shmcore.c
index 19f9c0656667..80511167f35b 100644
--- a/drivers/net/caif/caif_shmcore.c
+++ b/drivers/net/caif/caif_shmcore.c
@@ -6,7 +6,7 @@
 * License terms: GNU General Public License (GPL) version 2
 */
-#define pr_fmt(fmt) KBUILD_MODNAME ":" __func__ "():" fmt
+#define pr_fmt(fmt) KBUILD_MODNAME ":" fmt
 #include <linux/spinlock.h>
 #include <linux/sched.h>
diff --git a/drivers/net/cxgb4/t4_hw.c b/drivers/net/cxgb4/t4_hw.c
index bb813d94aea8..e97521c801ea 100644
--- a/drivers/net/cxgb4/t4_hw.c
+++ b/drivers/net/cxgb4/t4_hw.c
@@ -2408,7 +2408,7 @@ int t4_alloc_mac_filt(struct adapter *adap, unsigned int mbox,
                if (index < NEXACT_MAC)
                        ret++;
                else if (hash)
-                        *hash |= (1 << hash_mac_addr(addr[i]));
+                        *hash |= (1ULL << hash_mac_addr(addr[i]));
        }
        return ret;
 }
diff --git a/drivers/net/cxgb4vf/cxgb4vf_main.c b/drivers/net/cxgb4vf/cxgb4vf_main.c
index d887a76cd39d..6bf464afa90e 100644
--- a/drivers/net/cxgb4vf/cxgb4vf_main.c
+++ b/drivers/net/cxgb4vf/cxgb4vf_main.c
@@ -2269,6 +2269,7 @@ static void __devinit cfg_queues(struct adapter *adapter)
 {
        struct sge *s = &adapter->sge;
        int q10g, n10g, qidx, pidx, qs;
+        size_t iqe_size;
        /*
         * We should not be called till we know how many Queue Sets we can
@@ -2313,6 +2314,13 @@ static void __devinit cfg_queues(struct adapter *adapter)
        s->ethqsets = qidx;
        /*
+         * The Ingress Queue Entry Size for our various Response Queues needs
+         * to be big enough to accommodate the largest message we can receive
+         * from the chip/firmware; which is 64 bytes ...
+         */
+        iqe_size = 64;
+        /*
         * Set up default Queue Set parameters ...  Start off with the
         * shortest interrupt holdoff timer.
         */
@@ -2320,7 +2328,7 @@ static void __devinit cfg_queues(struct adapter *adapter)
                struct sge_eth_rxq *rxq = &s->ethrxq[qs];
                struct sge_eth_txq *txq = &s->ethtxq[qs];
-                init_rspq(&rxq->rspq, 0, 0, 1024, L1_CACHE_BYTES);
+                init_rspq(&rxq->rspq, 0, 0, 1024, iqe_size);
                rxq->fl.size = 72;
                txq->q.size = 1024;
        }
@@ -2329,8 +2337,7 @@ static void __devinit cfg_queues(struct adapter *adapter)
         * The firmware event queue is used for link state changes and
         * notifications of TX DMA completions.
         */
-        init_rspq(&s->fw_evtq, SGE_TIMER_RSTRT_CNTR, 0, 512,
+        init_rspq(&s->fw_evtq, SGE_TIMER_RSTRT_CNTR, 0, 512, iqe_size);
-                  L1_CACHE_BYTES);
        /*
         * The forwarded interrupt queue is used when we're in MSI interrupt
@@ -2346,7 +2353,7 @@ static void __devinit cfg_queues(struct adapter *adapter)
         * any time ...
         */
        init_rspq(&s->intrq, SGE_TIMER_RSTRT_CNTR, 0, MSIX_ENTRIES + 1,
-                  L1_CACHE_BYTES);
+                  iqe_size);
 }
 /*
diff --git a/drivers/net/ehea/ehea_ethtool.c b/drivers/net/ehea/ehea_ethtool.c
index 75b099ce49c9..1f37ee6b2a26 100644
--- a/drivers/net/ehea/ehea_ethtool.c
+++ b/drivers/net/ehea/ehea_ethtool.c
@@ -261,6 +261,13 @@ static void ehea_get_ethtool_stats(struct net_device *dev,
 }
+static int ehea_set_flags(struct net_device *dev, u32 data)
+{
+        return ethtool_op_set_flags(dev, data, ETH_FLAG_LRO
+                                        | ETH_FLAG_TXVLAN
+                                        | ETH_FLAG_RXVLAN);
+}
 const struct ethtool_ops ehea_ethtool_ops = {
        .get_settings = ehea_get_settings,
        .get_drvinfo = ehea_get_drvinfo,
@@ -273,6 +280,8 @@ const struct ethtool_ops ehea_ethtool_ops = {
        .get_ethtool_stats = ehea_get_ethtool_stats,
        .get_rx_csum = ehea_get_rx_csum,
        .set_settings = ehea_set_settings,
+        .get_flags = ethtool_op_get_flags,
+        .set_flags = ehea_set_flags,
        .nway_reset = ehea_nway_reset,          /* Restart autonegotiation */
 };
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index 3d0af08483a1..b95f087cd5a9 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -683,7 +683,7 @@ static void ehea_proc_skb(struct ehea_port_res *pr, struct ehea_cqe *cqe,
        int vlan_extracted = ((cqe->status & EHEA_CQE_VLAN_TAG_XTRACT) &&
                              pr->port->vgrp);
-        if (use_lro) {
+        if (skb->dev->features & NETIF_F_LRO) {
                if (vlan_extracted)
                        lro_vlan_hwaccel_receive_skb(&pr->lro_mgr, skb,
                                                     pr->port->vgrp,
@@ -787,7 +787,7 @@ static int ehea_proc_rwqes(struct net_device *dev,
                }
                cqe = ehea_poll_rq1(qp, &wqe_index);
        }
-        if (use_lro)
+        if (dev->features & NETIF_F_LRO)
                lro_flush_all(&pr->lro_mgr);
        pr->rx_packets += processed;
@@ -3278,6 +3278,9 @@ struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter,
                      | NETIF_F_LLTX;
        dev->watchdog_timeo = EHEA_WATCH_DOG_TIMEOUT;
+        if (use_lro)
+                dev->features |= NETIF_F_LRO;
        INIT_WORK(&port->reset_task, ehea_reset_port);
        ret = register_netdev(dev);
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index a466ef91dd43..aa28b270c045 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -1962,7 +1962,8 @@ static void enic_poll_controller(struct net_device *netdev)
        case VNIC_DEV_INTR_MODE_MSIX:
                for (i = 0; i < enic->rq_count; i++) {
                        intr = enic_msix_rq_intr(enic, i);
-                        enic_isr_msix_rq(enic->msix_entry[intr].vector, enic);
+                        enic_isr_msix_rq(enic->msix_entry[intr].vector,
+                                &enic->napi[i]);
                }
                intr = enic_msix_wq_intr(enic, i);
                enic_isr_msix_wq(enic->msix_entry[intr].vector, enic);
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index ab9f675c5b8b..fe337bd121aa 100644
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -104,6 +104,8 @@ static void ri_tasklet(unsigned long dev)
                        rcu_read_unlock();
                        dev_kfree_skb(skb);
                        stats->tx_dropped++;
+                        if (skb_queue_len(&dp->tq) != 0)
+                                goto resched;
                        break;
                }
                rcu_read_unlock();
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index fbad4d819608..eee0b298bd36 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -4771,6 +4771,9 @@ void ixgbe_clear_interrupt_scheme(struct ixgbe_adapter *adapter)
                adapter->rx_ring[i] = NULL;
        }
+        adapter->num_tx_queues = 0;
+        adapter->num_rx_queues = 0;
        ixgbe_free_q_vectors(adapter);
        ixgbe_reset_interrupt_capability(adapter);
 }
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index cb3d13e4e074..35fda5ac8120 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -64,7 +64,7 @@ config BCM63XX_PHY
 config ICPLUS_PHY
        tristate "Drivers for ICPlus PHYs"
        ---help---
-          Currently supports the IP175C PHY.
+          Currently supports the IP175C and IP1001 PHYs.
 config REALTEK_PHY
        tristate "Drivers for Realtek PHYs"
diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c
index c1d2d251fe8b..9a09e24c30bc 100644
--- a/drivers/net/phy/icplus.c
+++ b/drivers/net/phy/icplus.c
@@ -30,7 +30,7 @@
 #include <asm/irq.h>
 #include <asm/uaccess.h>
-MODULE_DESCRIPTION("ICPlus IP175C PHY driver");
+MODULE_DESCRIPTION("ICPlus IP175C/IC1001 PHY drivers");
 MODULE_AUTHOR("Michael Barkowski");
 MODULE_LICENSE("GPL");
@@ -89,6 +89,33 @@ static int ip175c_config_init(struct phy_device *phydev)
        return 0;
 }
+static int ip1001_config_init(struct phy_device *phydev)
+{
+        int err, value;
+        /* Software Reset PHY */
+        value = phy_read(phydev, MII_BMCR);
+        value |= BMCR_RESET;
+        err = phy_write(phydev, MII_BMCR, value);
+        if (err < 0)
+                return err;
+        do {
+                value = phy_read(phydev, MII_BMCR);
+        } while (value & BMCR_RESET);
+        /* Additional delay (2ns) used to adjust RX clock phase
+         * at GMII/ RGMII interface */
+        value = phy_read(phydev, 16);
+        value |= 0x3;
+        err = phy_write(phydev, 16, value);
+        if (err < 0)
+                return err;
+        return err;
+}
 static int ip175c_read_status(struct phy_device *phydev)
 {
        if (phydev->addr == 4) /* WAN port */
@@ -121,21 +148,43 @@ static struct phy_driver ip175c_driver = {
        .driver         = { .owner = THIS_MODULE,},
 };
-static int __init ip175c_init(void)
+static struct phy_driver ip1001_driver = {
+        .phy_id         = 0x02430d90,
+        .name           = "ICPlus IP1001",
+        .phy_id_mask    = 0x0ffffff0,
+        .features       = PHY_GBIT_FEATURES | SUPPORTED_Pause |
+                          SUPPORTED_Asym_Pause,
+        .config_init    = &ip1001_config_init,
+        .config_aneg    = &genphy_config_aneg,
+        .read_status    = &genphy_read_status,
+        .suspend        = genphy_suspend,
+        .resume         = genphy_resume,
+        .driver         = { .owner = THIS_MODULE,},
+};
+static int __init icplus_init(void)
 {
+        int ret = 0;
+        ret = phy_driver_register(&ip1001_driver);
+        if (ret < 0)
+                return -ENODEV;
        return phy_driver_register(&ip175c_driver);
 }
-static void __exit ip175c_exit(void)
+static void __exit icplus_exit(void)
 {
+        phy_driver_unregister(&ip1001_driver);
        phy_driver_unregister(&ip175c_driver);
 }
-module_init(ip175c_init);
+module_init(icplus_init);
-module_exit(ip175c_exit);
+module_exit(icplus_exit);
 static struct mdio_device_id __maybe_unused icplus_tbl[] = {
        { 0x02430d80, 0x0ffffff0 },
+        { 0x02430d90, 0x0ffffff0 },
        { }
 };
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index d72fb0519a2a..78c0e3c9b2b5 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -948,7 +948,7 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb)
 abort:
        kfree_skb(skb);
-        return 0;
+        return 1;
 }
 /************************************************************************
diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h
index 22821398fc63..9787dff90d3f 100644
--- a/drivers/net/qlge/qlge.h
+++ b/drivers/net/qlge/qlge.h
@@ -2083,6 +2083,7 @@ struct ql_adapter {
        u32 mailbox_in;
        u32 mailbox_out;
        struct mbox_params idc_mbc;
+        struct mutex    mpi_mutex;
        int tx_ring_size;
        int rx_ring_size;
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 528eaef5308f..2555b1d34f34 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -4629,6 +4629,7 @@ static int __devinit ql_init_device(struct pci_dev *pdev,
        INIT_DELAYED_WORK(&qdev->mpi_idc_work, ql_mpi_idc_work);
        INIT_DELAYED_WORK(&qdev->mpi_core_to_log, ql_mpi_core_to_log);
        init_completion(&qdev->ide_completion);
+        mutex_init(&qdev->mpi_mutex);
        if (!cards_found) {
                dev_info(&pdev->dev, "%s\n", DRV_STRING);
diff --git a/drivers/net/qlge/qlge_mpi.c b/drivers/net/qlge/qlge_mpi.c
index 0e7c7c7ee164..a2e919bcb3c6 100644
--- a/drivers/net/qlge/qlge_mpi.c
+++ b/drivers/net/qlge/qlge_mpi.c
@@ -534,6 +534,7 @@ static int ql_mailbox_command(struct ql_adapter *qdev, struct mbox_params *mbcp)
        int status;
        unsigned long count;
+        mutex_lock(&qdev->mpi_mutex);
        /* Begin polled mode for MPI */
        ql_write32(qdev, INTR_MASK, (INTR_MASK_PI << 16));
@@ -603,6 +604,7 @@ done:
 end:
        /* End polled mode for MPI */
        ql_write32(qdev, INTR_MASK, (INTR_MASK_PI << 16) | INTR_MASK_PI);
+        mutex_unlock(&qdev->mpi_mutex);
        return status;
 }
@@ -1099,9 +1101,7 @@ int ql_wait_fifo_empty(struct ql_adapter *qdev)
 static int ql_set_port_cfg(struct ql_adapter *qdev)
 {
        int status;
-        rtnl_lock();
        status = ql_mb_set_port_cfg(qdev);
-        rtnl_unlock();
        if (status)
                return status;
        status = ql_idc_wait(qdev);
@@ -1122,9 +1122,7 @@ void ql_mpi_port_cfg_work(struct work_struct *work)
            container_of(work, struct ql_adapter, mpi_port_cfg_work.work);
        int status;
-        rtnl_lock();
        status = ql_mb_get_port_cfg(qdev);
-        rtnl_unlock();
        if (status) {
                netif_err(qdev, drv, qdev->ndev,
                          "Bug: Failed to get port config data.\n");
@@ -1167,7 +1165,6 @@ void ql_mpi_idc_work(struct work_struct *work)
        u32 aen;
        int timeout;
-        rtnl_lock();
        aen = mbcp->mbox_out[1] >> 16;
        timeout = (mbcp->mbox_out[1] >> 8) & 0xf;
@@ -1231,7 +1228,6 @@ void ql_mpi_idc_work(struct work_struct *work)
                }
                break;
        }
-        rtnl_unlock();
 }
 void ql_mpi_work(struct work_struct *work)
@@ -1242,7 +1238,7 @@ void ql_mpi_work(struct work_struct *work)
        struct mbox_params *mbcp = &mbc;
        int err = 0;
-        rtnl_lock();
+        mutex_lock(&qdev->mpi_mutex);
        /* Begin polled mode for MPI */
        ql_write32(qdev, INTR_MASK, (INTR_MASK_PI << 16));
@@ -1259,7 +1255,7 @@ void ql_mpi_work(struct work_struct *work)
        /* End polled mode for MPI */
        ql_write32(qdev, INTR_MASK, (INTR_MASK_PI << 16) | INTR_MASK_PI);
-        rtnl_unlock();
+        mutex_unlock(&qdev->mpi_mutex);
        ql_enable_completion_interrupt(qdev, 0);
 }
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 7d33ef4bcb4a..53b13deade95 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -744,26 +744,36 @@ static void rtl8169_xmii_reset_enable(void __iomem *ioaddr)
        mdio_write(ioaddr, MII_BMCR, val & 0xffff);
 }
-static void rtl8169_check_link_status(struct net_device *dev,
+static void __rtl8169_check_link_status(struct net_device *dev,
                                      struct rtl8169_private *tp,
-                                      void __iomem *ioaddr)
+                                      void __iomem *ioaddr,
+                                      bool pm)
 {
        unsigned long flags;
        spin_lock_irqsave(&tp->lock, flags);
        if (tp->link_ok(ioaddr)) {
                /* This is to cancel a scheduled suspend if there's one. */
-                pm_request_resume(&tp->pci_dev->dev);
+                if (pm)
+                        pm_request_resume(&tp->pci_dev->dev);
                netif_carrier_on(dev);
                netif_info(tp, ifup, dev, "link up\n");
        } else {
                netif_carrier_off(dev);
                netif_info(tp, ifdown, dev, "link down\n");
-                pm_schedule_suspend(&tp->pci_dev->dev, 100);
+                if (pm)
+                        pm_schedule_suspend(&tp->pci_dev->dev, 100);
        }
        spin_unlock_irqrestore(&tp->lock, flags);
 }
+static void rtl8169_check_link_status(struct net_device *dev,
+                                      struct rtl8169_private *tp,
+                                      void __iomem *ioaddr)
+{
+        __rtl8169_check_link_status(dev, tp, ioaddr, false);
+}
 #define WAKE_ANY (WAKE_PHY | WAKE_MAGIC | WAKE_UCAST | WAKE_BCAST | WAKE_MCAST)
 static u32 __rtl8169_get_wol(struct rtl8169_private *tp)
@@ -4600,7 +4610,7 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
                }
                if (status & LinkChg)
-                        rtl8169_check_link_status(dev, tp, ioaddr);
+                        __rtl8169_check_link_status(dev, tp, ioaddr, true);
                /* We need to see the lastest version of tp->intr_mask to
                 * avoid ignoring an MSI interrupt and having to wait for
@@ -4890,11 +4900,7 @@ static int rtl8169_runtime_idle(struct device *device)
        struct net_device *dev = pci_get_drvdata(pdev);
        struct rtl8169_private *tp = netdev_priv(dev);
-        if (!tp->TxDescArray)
+        return tp->TxDescArray ? -EBUSY : 0;
-                return 0;
-        rtl8169_check_link_status(dev, tp, tp->mmio_addr);
-        return -EBUSY;
 }
 static const struct dev_pm_ops rtl8169_pm_ops = {
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index 05df20e47976..fb83cdd94643 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -197,7 +197,9 @@ MODULE_PARM_DESC(debug, "Bitmapped debugging message enable value");
 static void efx_remove_channels(struct efx_nic *efx);
 static void efx_remove_port(struct efx_nic *efx);
+static void efx_init_napi(struct efx_nic *efx);
 static void efx_fini_napi(struct efx_nic *efx);
+static void efx_fini_napi_channel(struct efx_channel *channel);
 static void efx_fini_struct(struct efx_nic *efx);
 static void efx_start_all(struct efx_nic *efx);
 static void efx_stop_all(struct efx_nic *efx);
@@ -335,8 +337,10 @@ void efx_process_channel_now(struct efx_channel *channel)
        /* Disable interrupts and wait for ISRs to complete */
        efx_nic_disable_interrupts(efx);
-        if (efx->legacy_irq)
+        if (efx->legacy_irq) {
                synchronize_irq(efx->legacy_irq);
+                efx->legacy_irq_enabled = false;
+        }
        if (channel->irq)
                synchronize_irq(channel->irq);
@@ -351,6 +355,8 @@ void efx_process_channel_now(struct efx_channel *channel)
        efx_channel_processed(channel);
        napi_enable(&channel->napi_str);
+        if (efx->legacy_irq)
+                efx->legacy_irq_enabled = true;
        efx_nic_enable_interrupts(efx);
 }
@@ -426,6 +432,7 @@ efx_alloc_channel(struct efx_nic *efx, int i, struct efx_channel *old_channel)
                *channel = *old_channel;
+                channel->napi_dev = NULL;
                memset(&channel->eventq, 0, sizeof(channel->eventq));
                rx_queue = &channel->rx_queue;
@@ -736,9 +743,13 @@ efx_realloc_channels(struct efx_nic *efx, u32 rxq_entries, u32 txq_entries)
        if (rc)
                goto rollback;
+        efx_init_napi(efx);
        /* Destroy old channels */
-        for (i = 0; i < efx->n_channels; i++)
+        for (i = 0; i < efx->n_channels; i++) {
+                efx_fini_napi_channel(other_channel[i]);
                efx_remove_channel(other_channel[i]);
+        }
 out:
        /* Free unused channel structures */
        for (i = 0; i < efx->n_channels; i++)
@@ -1400,6 +1411,8 @@ static void efx_start_all(struct efx_nic *efx)
                efx_start_channel(channel);
        }
+        if (efx->legacy_irq)
+                efx->legacy_irq_enabled = true;
        efx_nic_enable_interrupts(efx);
        /* Switch to event based MCDI completions after enabling interrupts.
@@ -1460,8 +1473,10 @@ static void efx_stop_all(struct efx_nic *efx)
        /* Disable interrupts and wait for ISR to complete */
        efx_nic_disable_interrupts(efx);
-        if (efx->legacy_irq)
+        if (efx->legacy_irq) {
                synchronize_irq(efx->legacy_irq);
+                efx->legacy_irq_enabled = false;
+        }
        efx_for_each_channel(channel, efx) {
                if (channel->irq)
                        synchronize_irq(channel->irq);
@@ -1593,7 +1608,7 @@ static int efx_ioctl(struct net_device *net_dev, struct ifreq *ifr, int cmd)
 *
 **************************************************************************/
-static int efx_init_napi(struct efx_nic *efx)
+static void efx_init_napi(struct efx_nic *efx)
 {
        struct efx_channel *channel;
@@ -1602,18 +1617,21 @@ static int efx_init_napi(struct efx_nic *efx)
                netif_napi_add(channel->napi_dev, &channel->napi_str,
                               efx_poll, napi_weight);
        }
-        return 0;
+}
+static void efx_fini_napi_channel(struct efx_channel *channel)
+{
+        if (channel->napi_dev)
+                netif_napi_del(&channel->napi_str);
+        channel->napi_dev = NULL;
 }
 static void efx_fini_napi(struct efx_nic *efx)
 {
        struct efx_channel *channel;
-        efx_for_each_channel(channel, efx) {
+        efx_for_each_channel(channel, efx)
-                if (channel->napi_dev)
+                efx_fini_napi_channel(channel);
-                        netif_napi_del(&channel->napi_str);
-                channel->napi_dev = NULL;
-        }
 }
 /**************************************************************************
@@ -2335,9 +2353,7 @@ static int efx_pci_probe_main(struct efx_nic *efx)
        if (rc)
                goto fail1;
-        rc = efx_init_napi(efx);
+        efx_init_napi(efx);
-        if (rc)
-                goto fail2;
        rc = efx->type->init(efx);
        if (rc) {
@@ -2368,7 +2384,6 @@ static int efx_pci_probe_main(struct efx_nic *efx)
        efx->type->fini(efx);
 fail3:
        efx_fini_napi(efx);
- fail2:
        efx_remove_all(efx);
 fail1:
        return rc;
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h
index 0a7e26d73b52..b137c889152b 100644
--- a/drivers/net/sfc/net_driver.h
+++ b/drivers/net/sfc/net_driver.h
@@ -621,6 +621,7 @@ struct efx_filter_state;
 * @pci_dev: The PCI device
 * @type: Controller type attributes
 * @legacy_irq: IRQ number
+ * @legacy_irq_enabled: Are IRQs enabled on NIC (INT_EN_KER register)?
 * @workqueue: Workqueue for port reconfigures and the HW monitor.
 *      Work items do not hold and must not acquire RTNL.
 * @workqueue_name: Name of workqueue
@@ -709,6 +710,7 @@ struct efx_nic {
        struct pci_dev *pci_dev;
        const struct efx_nic_type *type;
        int legacy_irq;
+        bool legacy_irq_enabled;
        struct workqueue_struct *workqueue;
        char workqueue_name[16];
        struct work_struct reset_work;
diff --git a/drivers/net/sfc/nic.c b/drivers/net/sfc/nic.c
index 41c36b9a4244..67cb0c96838c 100644
--- a/drivers/net/sfc/nic.c
+++ b/drivers/net/sfc/nic.c
@@ -1418,6 +1418,12 @@ static irqreturn_t efx_legacy_interrupt(int irq, void *dev_id)
        u32 queues;
        int syserr;
+        /* Could this be ours?  If interrupts are disabled then the
+         * channel state may not be valid.
+         */
+        if (!efx->legacy_irq_enabled)
+                return result;
        /* Read the ISR which also ACKs the interrupts */
        efx_readd(efx, &reg, FR_BZ_INT_ISR0);
        queues = EFX_EXTRACT_DWORD(reg, 0, 31);
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c
index 06bc6034ce81..2114837809e7 100644
--- a/drivers/net/stmmac/stmmac_main.c
+++ b/drivers/net/stmmac/stmmac_main.c
@@ -1509,6 +1509,8 @@ static int stmmac_probe(struct net_device *dev)
                pr_warning("\tno valid MAC address;"
                        "please, use ifconfig or nwhwconfig!\n");
+        spin_lock_init(&priv->lock);
        ret = register_netdev(dev);
        if (ret) {
                pr_err("%s: ERROR %i registering the device\n",
@@ -1520,8 +1522,6 @@ static int stmmac_probe(struct net_device *dev)
            dev->name, (dev->features & NETIF_F_SG) ? "on" : "off",
            (dev->features & NETIF_F_HW_CSUM) ? "on" : "off");
-        spin_lock_init(&priv->lock);
        return ret;
 }
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index a9f7d5d1a269..7064e035757a 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -688,9 +688,6 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb,
        DMFE_DBUG(0, "dmfe_start_xmit", 0);
-        /* Resource flag check */
-        netif_stop_queue(dev);
        /* Too large packet check */
        if (skb->len > MAX_PACKET_SIZE) {
                pr_err("big packet = %d\n", (u16)skb->len);
@@ -698,6 +695,9 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb,
                return NETDEV_TX_OK;
        }
+        /* Resource flag check */
+        netif_stop_queue(dev);
        spin_lock_irqsave(&db->lock, flags);
        /* No Tx resource check, it never happen nromally */
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 62e9e8dc8190..812edf85d6d3 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -958,10 +958,6 @@ static void packetizeRx(struct hso_net *odev, unsigned char *ip_pkt,
                                /* Packet is complete. Inject into stack. */
                                /* We have IP packet here */
                                odev->skb_rx_buf->protocol = cpu_to_be16(ETH_P_IP);
-                                /* don't check it */
-                                odev->skb_rx_buf->ip_summed =
-                                        CHECKSUM_UNNECESSARY;
                                skb_reset_mac_header(odev->skb_rx_buf);
                                /* Ship it off to the kernel */
diff --git a/drivers/net/wan/hd64572.c b/drivers/net/wan/hd64572.c
index ea476cbd38b5..e305274f83fb 100644
--- a/drivers/net/wan/hd64572.c
+++ b/drivers/net/wan/hd64572.c
@@ -293,6 +293,7 @@ static inline void sca_tx_done(port_t *port)
        struct net_device *dev = port->netdev;
        card_t* card = port->card;
        u8 stat;
+        unsigned count = 0;
        spin_lock(&port->lock);
@@ -316,10 +317,12 @@ static inline void sca_tx_done(port_t *port)
                        dev->stats.tx_bytes += readw(&desc->len);
                }
                writeb(0, &desc->stat); /* Free descriptor */
+                count++;
                port->txlast = (port->txlast + 1) % card->tx_ring_buffers;
        }
-        netif_wake_queue(dev);
+        if (count)
+                netif_wake_queue(dev);
        spin_unlock(&port->lock);
 }
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index 8251946842e6..42ed923cdb1a 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -1917,7 +1917,8 @@ ath5k_beacon_send(struct ath5k_softc *sc)
                sc->bmisscount = 0;
        }
-        if (sc->opmode == NL80211_IFTYPE_AP && sc->num_ap_vifs > 1) {
+        if ((sc->opmode == NL80211_IFTYPE_AP && sc->num_ap_vifs > 1) ||
+                        sc->opmode == NL80211_IFTYPE_MESH_POINT) {
                u64 tsf = ath5k_hw_get_tsf64(ah);
                u32 tsftu = TSF_TO_TU(tsf);
                int slot = ((tsftu % sc->bintval) * ATH_BCBUF) / sc->bintval;
@@ -1949,8 +1950,9 @@ ath5k_beacon_send(struct ath5k_softc *sc)
                /* NB: hw still stops DMA, so proceed */
        }
-        /* refresh the beacon for AP mode */
+        /* refresh the beacon for AP or MESH mode */
-        if (sc->opmode == NL80211_IFTYPE_AP)
+        if (sc->opmode == NL80211_IFTYPE_AP ||
+                        sc->opmode == NL80211_IFTYPE_MESH_POINT)
                ath5k_beacon_update(sc->hw, vif);
        ath5k_hw_set_txdp(ah, sc->bhalq, bf->daddr);
@@ -2851,7 +2853,8 @@ static int ath5k_add_interface(struct ieee80211_hw *hw,
        /* Assign the vap/adhoc to a beacon xmit slot. */
        if ((avf->opmode == NL80211_IFTYPE_AP) ||
-            (avf->opmode == NL80211_IFTYPE_ADHOC)) {
+            (avf->opmode == NL80211_IFTYPE_ADHOC) ||
+            (avf->opmode == NL80211_IFTYPE_MESH_POINT)) {
                int slot;
                WARN_ON(list_empty(&sc->bcbuf));
@@ -2870,7 +2873,7 @@ static int ath5k_add_interface(struct ieee80211_hw *hw,
                sc->bslot[avf->bslot] = vif;
                if (avf->opmode == NL80211_IFTYPE_AP)
                        sc->num_ap_vifs++;
-                else
+                else if (avf->opmode == NL80211_IFTYPE_ADHOC)
                        sc->num_adhoc_vifs++;
        }
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index c4182359bee4..a7b82f0085d2 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@ -55,6 +55,8 @@
 #define SUB_NUM_CTL_MODES_AT_5G_40 2    /* excluding HT40, EXT-OFDM */
 #define SUB_NUM_CTL_MODES_AT_2G_40 3    /* excluding HT40, EXT-OFDM, EXT-CCK */
+#define CTL(_tpower, _flag) ((_tpower) | ((_flag) << 6))
 static const struct ar9300_eeprom ar9300_default = {
        .eepromVersion = 2,
        .templateVersion = 2,
@@ -290,20 +292,21 @@ static const struct ar9300_eeprom ar9300_default = {
                }
         },
        .ctlPowerData_2G = {
-                 { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
-                 { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
-                 { { {60, 1}, {60, 0}, {60, 0}, {60, 1} } },
+                 { { CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 1) } },
-                 { { {60, 1}, {60, 0}, {0, 0}, {0, 0} } },
+                 { { CTL(60, 1), CTL(60, 0), CTL(0, 0), CTL(0, 0) } },
-                 { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
-                 { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
-                 { { {60, 0}, {60, 1}, {60, 1}, {60, 0} } },
+                 { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 0) } },
-                 { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
-                 { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
-                 { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                 { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
-                 { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
+                 { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 1) } },
+                 { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 1) } },
         },
        .modalHeader5G = {
                /* 4 idle,t1,t2,b (4 bits per setting) */
@@ -568,56 +571,56 @@ static const struct ar9300_eeprom ar9300_default = {
        .ctlPowerData_5G = {
                {
                        {
-                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                                CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
-                                {60, 1}, {60, 1}, {60, 1}, {60, 0},
+                                CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
                        }
                },
                {
                        {
-                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                                CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
-                                {60, 1}, {60, 1}, {60, 1}, {60, 0},
+                                CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
                        }
                },
                {
                        {
-                                {60, 0}, {60, 1}, {60, 0}, {60, 1},
+                                CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 1),
-                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                                CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
                        }
                },
                {
                        {
-                                {60, 0}, {60, 1}, {60, 1}, {60, 0},
+                                CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 0),
-                                {60, 1}, {60, 0}, {60, 0}, {60, 0},
+                                CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0),
                        }
                },
                {
                        {
-                                {60, 1}, {60, 1}, {60, 1}, {60, 0},
+                                CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
-                                {60, 0}, {60, 0}, {60, 0}, {60, 0},
+                                CTL(60, 0), CTL(60, 0), CTL(60, 0), CTL(60, 0),
                        }
                },
                {
                        {
-                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                                CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
-                                {60, 1}, {60, 0}, {60, 0}, {60, 0},
+                                CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0),
                        }
                },
                {
                        {
-                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                                CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
-                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                                CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
                        }
                },
                {
                        {
-                                {60, 1}, {60, 1}, {60, 0}, {60, 1},
+                                CTL(60, 1), CTL(60, 1), CTL(60, 0), CTL(60, 1),
-                                {60, 1}, {60, 1}, {60, 1}, {60, 0},
+                                CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
                        }
                },
                {
                        {
-                                {60, 1}, {60, 0}, {60, 1}, {60, 1},
+                                CTL(60, 1), CTL(60, 0), CTL(60, 1), CTL(60, 1),
-                                {60, 1}, {60, 1}, {60, 0}, {60, 1},
+                                CTL(60, 1), CTL(60, 1), CTL(60, 0), CTL(60, 1),
                        }
                },
         }
@@ -1827,9 +1830,9 @@ static u16 ar9003_hw_get_direct_edge_power(struct ar9300_eeprom *eep,
        struct cal_ctl_data_5g *ctl_5g = eep->ctlPowerData_5G;
        if (is2GHz)
-                return ctl_2g[idx].ctlEdges[edge].tPower;
+                return CTL_EDGE_TPOWER(ctl_2g[idx].ctlEdges[edge]);
        else
-                return ctl_5g[idx].ctlEdges[edge].tPower;
+                return CTL_EDGE_TPOWER(ctl_5g[idx].ctlEdges[edge]);
 }
 static u16 ar9003_hw_get_indirect_edge_power(struct ar9300_eeprom *eep,
@@ -1847,12 +1850,12 @@ static u16 ar9003_hw_get_indirect_edge_power(struct ar9300_eeprom *eep,
        if (is2GHz) {
                if (ath9k_hw_fbin2freq(ctl_freqbin[edge - 1], 1) < freq &&
-                    ctl_2g[idx].ctlEdges[edge - 1].flag)
+                    CTL_EDGE_FLAGS(ctl_2g[idx].ctlEdges[edge - 1]))
-                        return ctl_2g[idx].ctlEdges[edge - 1].tPower;
+                        return CTL_EDGE_TPOWER(ctl_2g[idx].ctlEdges[edge - 1]);
        } else {
                if (ath9k_hw_fbin2freq(ctl_freqbin[edge - 1], 0) < freq &&
-                    ctl_5g[idx].ctlEdges[edge - 1].flag)
+                    CTL_EDGE_FLAGS(ctl_5g[idx].ctlEdges[edge - 1]))
-                        return ctl_5g[idx].ctlEdges[edge - 1].tPower;
+                        return CTL_EDGE_TPOWER(ctl_5g[idx].ctlEdges[edge - 1]);
        }
        return AR9300_MAX_RATE_POWER;
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
index 3c533bb983c7..655b3033396c 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
@@ -261,17 +261,12 @@ struct cal_tgt_pow_ht {
        u8 tPow2x[14];
 } __packed;
-struct cal_ctl_edge_pwr {
-        u8 tPower:6,
-           flag:2;
-} __packed;
 struct cal_ctl_data_2g {
-        struct cal_ctl_edge_pwr ctlEdges[AR9300_NUM_BAND_EDGES_2G];
+        u8 ctlEdges[AR9300_NUM_BAND_EDGES_2G];
 } __packed;
 struct cal_ctl_data_5g {
-        struct cal_ctl_edge_pwr ctlEdges[AR9300_NUM_BAND_EDGES_5G];
+        u8 ctlEdges[AR9300_NUM_BAND_EDGES_5G];
 } __packed;
 struct ar9300_eeprom {
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 170d44a35ccb..0963071e8f90 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -21,6 +21,7 @@
 #include <linux/device.h>
 #include <linux/leds.h>
 #include <linux/completion.h>
+#include <linux/pm_qos_params.h>
 #include "debug.h"
 #include "common.h"
@@ -328,7 +329,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp);
 struct ath_txq *ath_txq_setup(struct ath_softc *sc, int qtype, int subtype);
 void ath_tx_cleanupq(struct ath_softc *sc, struct ath_txq *txq);
 int ath_tx_setup(struct ath_softc *sc, int haltype);
-void ath_drain_all_txq(struct ath_softc *sc, bool retry_tx);
+bool ath_drain_all_txq(struct ath_softc *sc, bool retry_tx);
 void ath_draintxq(struct ath_softc *sc,
                     struct ath_txq *txq, bool retry_tx);
 void ath_tx_node_init(struct ath_softc *sc, struct ath_node *an);
@@ -646,6 +647,8 @@ struct ath_softc {
        struct ath_descdma txsdma;
        struct ath_ant_comb ant_comb;
+        struct pm_qos_request_list pm_qos_req;
 };
 struct ath_wiphy {
@@ -675,7 +678,6 @@ static inline void ath_read_cachesize(struct ath_common *common, int *csz)
 }
 extern struct ieee80211_ops ath9k_ops;
-extern struct pm_qos_request_list ath9k_pm_qos_req;
 extern int modparam_nohwcrypt;
 extern int led_blink;
diff --git a/drivers/net/wireless/ath/ath9k/eeprom.c b/drivers/net/wireless/ath/ath9k/eeprom.c
index 1266333f586d..2bbf94d0191e 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom.c
@@ -240,16 +240,16 @@ u16 ath9k_hw_get_max_edge_power(u16 freq, struct cal_ctl_edges *pRdEdgesPower,
        for (i = 0; (i < num_band_edges) &&
                     (pRdEdgesPower[i].bChannel != AR5416_BCHAN_UNUSED); i++) {
                if (freq == ath9k_hw_fbin2freq(pRdEdgesPower[i].bChannel, is2GHz)) {
-                        twiceMaxEdgePower = pRdEdgesPower[i].tPower;
+                        twiceMaxEdgePower = CTL_EDGE_TPOWER(pRdEdgesPower[i].ctl);
                        break;
                } else if ((i > 0) &&
                           (freq < ath9k_hw_fbin2freq(pRdEdgesPower[i].bChannel,
                                                      is2GHz))) {
                        if (ath9k_hw_fbin2freq(pRdEdgesPower[i - 1].bChannel,
                                               is2GHz) < freq &&
-                            pRdEdgesPower[i - 1].flag) {
+                            CTL_EDGE_FLAGS(pRdEdgesPower[i - 1].ctl)) {
                                twiceMaxEdgePower =
-                                        pRdEdgesPower[i - 1].tPower;
+                                        CTL_EDGE_TPOWER(pRdEdgesPower[i - 1].ctl);
                        }
                        break;
                }
diff --git a/drivers/net/wireless/ath/ath9k/eeprom.h b/drivers/net/wireless/ath/ath9k/eeprom.h
index dacb45e1b906..dd59f09441a3 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom.h
+++ b/drivers/net/wireless/ath/ath9k/eeprom.h
@@ -233,6 +233,18 @@
 #define AR9287_CHECKSUM_LOCATION (AR9287_EEP_START_LOC + 1)
+#define CTL_EDGE_TPOWER(_ctl) ((_ctl) & 0x3f)
+#define CTL_EDGE_FLAGS(_ctl) (((_ctl) >> 6) & 0x03)
+#define LNA_CTL_BUF_MODE        BIT(0)
+#define LNA_CTL_ISEL_LO         BIT(1)
+#define LNA_CTL_ISEL_HI         BIT(2)
+#define LNA_CTL_BUF_IN          BIT(3)
+#define LNA_CTL_FEM_BAND        BIT(4)
+#define LNA_CTL_LOCAL_BIAS      BIT(5)
+#define LNA_CTL_FORCE_XPA       BIT(6)
+#define LNA_CTL_USE_ANT1        BIT(7)
 enum eeprom_param {
        EEP_NFTHRESH_5,
        EEP_NFTHRESH_2,
@@ -378,10 +390,7 @@ struct modal_eep_header {
        u8 xatten2Margin[AR5416_MAX_CHAINS];
        u8 ob_ch1;
        u8 db_ch1;
-        u8 useAnt1:1,
+        u8 lna_ctl;
-            force_xpaon:1,
-            local_bias:1,
-            femBandSelectUsed:1, xlnabufin:1, xlnaisel:2, xlnabufmode:1;
        u8 miscBits;
        u16 xpaBiasLvlFreq[3];
        u8 futureModal[6];
@@ -535,18 +544,10 @@ struct cal_target_power_ht {
        u8 tPow2x[8];
 } __packed;
-#ifdef __BIG_ENDIAN_BITFIELD
-struct cal_ctl_edges {
-        u8 bChannel;
-        u8 flag:2, tPower:6;
-} __packed;
-#else
 struct cal_ctl_edges {
        u8 bChannel;
-        u8 tPower:6, flag:2;
+        u8 ctl;
 } __packed;
-#endif
 struct cal_data_op_loop_ar9287 {
        u8 pwrPdg[2][5];
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_def.c b/drivers/net/wireless/ath/ath9k/eeprom_def.c
index 76b4d65472dd..a3ccb1b9638d 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_def.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c
@@ -451,9 +451,10 @@ static void ath9k_hw_def_set_board_values(struct ath_hw *ah,
                ath9k_hw_analog_shift_rmw(ah, AR_AN_TOP2,
                                          AR_AN_TOP2_LOCALBIAS,
                                          AR_AN_TOP2_LOCALBIAS_S,
-                                          pModal->local_bias);
+                                          !!(pModal->lna_ctl &
+                                             LNA_CTL_LOCAL_BIAS));
                REG_RMW_FIELD(ah, AR_PHY_XPA_CFG, AR_PHY_FORCE_XPA_CFG,
-                              pModal->force_xpaon);
+                              !!(pModal->lna_ctl & LNA_CTL_FORCE_XPA));
        }
        REG_RMW_FIELD(ah, AR_PHY_SETTLING, AR_PHY_SETTLING_SWITCH,
@@ -1062,15 +1063,19 @@ static void ath9k_hw_set_def_power_per_rate_table(struct ath_hw *ah,
        case 1:
                break;
        case 2:
-                scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN;
+                if (scaledPower > REDUCE_SCALED_POWER_BY_TWO_CHAIN)
+                        scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN;
+                else
+                        scaledPower = 0;
                break;
        case 3:
-                scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN;
+                if (scaledPower > REDUCE_SCALED_POWER_BY_THREE_CHAIN)
+                        scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN;
+                else
+                        scaledPower = 0;
                break;
        }
-        scaledPower = max((u16)0, scaledPower);
        if (IS_CHAN_2GHZ(chan)) {
                numCtlModes = ARRAY_SIZE(ctlModesFor11g) -
                        SUB_NUM_CTL_MODES_AT_2G_40;
@@ -1428,9 +1433,9 @@ static u8 ath9k_hw_def_get_num_ant_config(struct ath_hw *ah,
        num_ant_config = 1;
-        if (pBase->version >= 0x0E0D)
+        if (pBase->version >= 0x0E0D &&
-                if (pModal->useAnt1)
+            (pModal->lna_ctl & LNA_CTL_USE_ANT1))
-                        num_ant_config += 1;
+                num_ant_config += 1;
        return num_ant_config;
 }
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
index dfb6560dab92..0de3c3d3c245 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -1024,6 +1024,13 @@ static int ath9k_hif_usb_suspend(struct usb_interface *interface,
        struct hif_device_usb *hif_dev =
                (struct hif_device_usb *) usb_get_intfdata(interface);
+        /*
+         * The device has to be set to FULLSLEEP mode in case no
+         * interface is up.
+         */
+        if (!(hif_dev->flags & HIF_USB_START))
+                ath9k_htc_suspend(hif_dev->htc_handle);
        ath9k_hif_usb_dealloc_urbs(hif_dev);
        return 0;
diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h
index 75ecf6a30d25..c3b561daa6c1 100644
--- a/drivers/net/wireless/ath/ath9k/htc.h
+++ b/drivers/net/wireless/ath/ath9k/htc.h
@@ -455,6 +455,8 @@ u32 ath9k_htc_calcrxfilter(struct ath9k_htc_priv *priv);
 void ath9k_htc_ps_wakeup(struct ath9k_htc_priv *priv);
 void ath9k_htc_ps_restore(struct ath9k_htc_priv *priv);
 void ath9k_ps_work(struct work_struct *work);
+bool ath9k_htc_setpower(struct ath9k_htc_priv *priv,
+                        enum ath9k_power_mode mode);
 void ath9k_start_rfkill_poll(struct ath9k_htc_priv *priv);
 void ath9k_init_leds(struct ath9k_htc_priv *priv);
@@ -464,6 +466,7 @@ int ath9k_htc_probe_device(struct htc_target *htc_handle, struct device *dev,
                           u16 devid, char *product);
 void ath9k_htc_disconnect_device(struct htc_target *htc_handle, bool hotunplug);
 #ifdef CONFIG_PM
+void ath9k_htc_suspend(struct htc_target *htc_handle);
 int ath9k_htc_resume(struct htc_target *htc_handle);
 #endif
 #ifdef CONFIG_ATH9K_HTC_DEBUGFS
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index 7c8a38d04561..8776f49ffd41 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -891,6 +891,12 @@ void ath9k_htc_disconnect_device(struct htc_target *htc_handle, bool hotunplug)
 }
 #ifdef CONFIG_PM
+void ath9k_htc_suspend(struct htc_target *htc_handle)
+{
+        ath9k_htc_setpower(htc_handle->drv_priv, ATH9K_PM_FULL_SLEEP);
+}
 int ath9k_htc_resume(struct htc_target *htc_handle)
 {
        int ret;
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index 9a3be8da755d..51977caca47f 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -63,8 +63,8 @@ static enum htc_phymode ath9k_htc_get_curmode(struct ath9k_htc_priv *priv,
        return mode;
 }
-static bool ath9k_htc_setpower(struct ath9k_htc_priv *priv,
+bool ath9k_htc_setpower(struct ath9k_htc_priv *priv,
-                               enum ath9k_power_mode mode)
+                        enum ath9k_power_mode mode)
 {
        bool ret;
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 6ebc68bca91f..c7fbe25cc128 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -2044,7 +2044,8 @@ u32 ath9k_hw_gpio_get(struct ath_hw *ah, u32 gpio)
                val = REG_READ(ah, AR7010_GPIO_IN);
                return (MS(val, AR7010_GPIO_IN_VAL) & AR_GPIO_BIT(gpio)) == 0;
        } else if (AR_SREV_9300_20_OR_LATER(ah))
-                return MS_REG_READ(AR9300, gpio) != 0;
+                return (MS(REG_READ(ah, AR_GPIO_IN), AR9300_GPIO_IN_VAL) &
+                        AR_GPIO_BIT(gpio)) != 0;
        else if (AR_SREV_9271(ah))
                return MS_REG_READ(AR9271, gpio) != 0;
        else if (AR_SREV_9287_11_OR_LATER(ah))
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 92bc5c5f4876..14b8ab386daf 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -15,7 +15,6 @@
 */
 #include <linux/slab.h>
-#include <linux/pm_qos_params.h>
 #include "ath9k.h"
@@ -180,8 +179,6 @@ static const struct ath_ops ath9k_common_ops = {
        .write = ath9k_iowrite32,
 };
-struct pm_qos_request_list ath9k_pm_qos_req;
 /**************************/
 /*     Initialization     */
 /**************************/
@@ -664,6 +661,8 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
                hw->flags |= IEEE80211_HW_MFP_CAPABLE;
        hw->wiphy->interface_modes =
+                BIT(NL80211_IFTYPE_P2P_GO) |
+                BIT(NL80211_IFTYPE_P2P_CLIENT) |
                BIT(NL80211_IFTYPE_AP) |
                BIT(NL80211_IFTYPE_WDS) |
                BIT(NL80211_IFTYPE_STATION) |
@@ -759,7 +758,7 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid,
        ath_init_leds(sc);
        ath_start_rfkill_poll(sc);
-        pm_qos_add_request(&ath9k_pm_qos_req, PM_QOS_CPU_DMA_LATENCY,
+        pm_qos_add_request(&sc->pm_qos_req, PM_QOS_CPU_DMA_LATENCY,
                           PM_QOS_DEFAULT_VALUE);
        return 0;
@@ -830,7 +829,7 @@ void ath9k_deinit_device(struct ath_softc *sc)
        }
        ieee80211_unregister_hw(hw);
-        pm_qos_remove_request(&ath9k_pm_qos_req);
+        pm_qos_remove_request(&sc->pm_qos_req);
        ath_rx_cleanup(sc);
        ath_tx_cleanup(sc);
        ath9k_deinit_softc(sc);
diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c
index 8c13479b17cd..c996963ab339 100644
--- a/drivers/net/wireless/ath/ath9k/mac.c
+++ b/drivers/net/wireless/ath/ath9k/mac.c
@@ -703,8 +703,7 @@ int ath9k_hw_rxprocdesc(struct ath_hw *ah, struct ath_desc *ds,
                        rs->rs_phyerr = phyerr;
                } else if (ads.ds_rxstatus8 & AR_DecryptCRCErr)
                        rs->rs_status |= ATH9K_RXERR_DECRYPT;
-                else if ((ads.ds_rxstatus8 & AR_MichaelErr) &&
+                else if (ads.ds_rxstatus8 & AR_MichaelErr)
-                         rs->rs_keyix != ATH9K_RXKEYIX_INVALID)
                        rs->rs_status |= ATH9K_RXERR_MIC;
                else if (ads.ds_rxstatus8 & AR_KeyMiss)
                        rs->rs_status |= ATH9K_RXERR_DECRYPT;
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 25d3ef4c338e..c0c3464d3a86 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -15,7 +15,6 @@
 */
 #include <linux/nl80211.h>
-#include <linux/pm_qos_params.h>
 #include "ath9k.h"
 #include "btcoex.h"
@@ -245,11 +244,12 @@ int ath_set_channel(struct ath_softc *sc, struct ieee80211_hw *hw,
         * the relevant bits of the h/w.
         */
        ath9k_hw_set_interrupts(ah, 0);
-        ath_drain_all_txq(sc, false);
+        stopped = ath_drain_all_txq(sc, false);
        spin_lock_bh(&sc->rx.pcu_lock);
-        stopped = ath_stoprecv(sc);
+        if (!ath_stoprecv(sc))
+                stopped = false;
        /* XXX: do not flush receive queue here. We don't want
         * to flush data frames already in queue because of
@@ -1244,7 +1244,7 @@ static int ath9k_start(struct ieee80211_hw *hw)
                        ath9k_btcoex_timer_resume(sc);
        }
-        pm_qos_update_request(&ath9k_pm_qos_req, 55);
+        pm_qos_update_request(&sc->pm_qos_req, 55);
 mutex_unlock:
        mutex_unlock(&sc->mutex);
@@ -1423,7 +1423,7 @@ static void ath9k_stop(struct ieee80211_hw *hw)
        sc->sc_flags |= SC_OP_INVALID;
-        pm_qos_update_request(&ath9k_pm_qos_req, PM_QOS_DEFAULT_VALUE);
+        pm_qos_update_request(&sc->pm_qos_req, PM_QOS_DEFAULT_VALUE);
        mutex_unlock(&sc->mutex);
@@ -1520,7 +1520,6 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw,
        struct ath_softc *sc = aphy->sc;
        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
        struct ath_vif *avp = (void *)vif->drv_priv;
-        int i;
        ath_print(common, ATH_DBG_CONFIG, "Detach Interface\n");
@@ -1534,21 +1533,24 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw,
        if ((sc->sc_ah->opmode == NL80211_IFTYPE_AP) ||
            (sc->sc_ah->opmode == NL80211_IFTYPE_ADHOC) ||
            (sc->sc_ah->opmode == NL80211_IFTYPE_MESH_POINT)) {
+                /* Disable SWBA interrupt */
+                sc->sc_ah->imask &= ~ATH9K_INT_SWBA;
                ath9k_ps_wakeup(sc);
+                ath9k_hw_set_interrupts(sc->sc_ah, sc->sc_ah->imask);
                ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq);
                ath9k_ps_restore(sc);
+                tasklet_kill(&sc->bcon_tasklet);
        }
        ath_beacon_return(sc, avp);
        sc->sc_flags &= ~SC_OP_BEACONS;
-        for (i = 0; i < ARRAY_SIZE(sc->beacon.bslot); i++) {
+        if (sc->nbcnvifs) {
-                if (sc->beacon.bslot[i] == vif) {
+                /* Re-enable SWBA interrupt */
-                        printk(KERN_DEBUG "%s: vif had allocated beacon "
+                sc->sc_ah->imask |= ATH9K_INT_SWBA;
-                               "slot\n", __func__);
+                ath9k_ps_wakeup(sc);
-                        sc->beacon.bslot[i] = NULL;
+                ath9k_hw_set_interrupts(sc->sc_ah, sc->sc_ah->imask);
-                        sc->beacon.bslot_aphy[i] = NULL;
+                ath9k_ps_restore(sc);
-                }
        }
        sc->nvifs--;
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index 1a62e351ec77..fdc2ec52b42f 100644
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -838,6 +838,10 @@ static bool ath9k_rx_accept(struct ath_common *common,
                            struct ath_rx_status *rx_stats,
                            bool *decrypt_error)
 {
+#define is_mc_or_valid_tkip_keyix ((is_mc ||                    \
+                (rx_stats->rs_keyix != ATH9K_RXKEYIX_INVALID && \
+                test_bit(rx_stats->rs_keyix, common->tkip_keymap))))
        struct ath_hw *ah = common->ah;
        __le16 fc;
        u8 rx_status_len = ah->caps.rx_status_len;
@@ -879,15 +883,18 @@ static bool ath9k_rx_accept(struct ath_common *common,
                if (rx_stats->rs_status & ATH9K_RXERR_DECRYPT) {
                        *decrypt_error = true;
                } else if (rx_stats->rs_status & ATH9K_RXERR_MIC) {
+                        bool is_mc;
                        /*
                         * The MIC error bit is only valid if the frame
                         * is not a control frame or fragment, and it was
                         * decrypted using a valid TKIP key.
                         */
+                        is_mc = !!is_multicast_ether_addr(hdr->addr1);
                        if (!ieee80211_is_ctl(fc) &&
                            !ieee80211_has_morefrags(fc) &&
                            !(le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG) &&
-                            test_bit(rx_stats->rs_keyix, common->tkip_keymap))
+                            is_mc_or_valid_tkip_keyix)
                                rxs->flag |= RX_FLAG_MMIC_ERROR;
                        else
                                rx_stats->rs_status &= ~ATH9K_RXERR_MIC;
diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h
index dddf579aacf1..2c6a22fbb0f0 100644
--- a/drivers/net/wireless/ath/ath9k/reg.h
+++ b/drivers/net/wireless/ath/ath9k/reg.h
@@ -984,11 +984,13 @@ enum {
 #define AR9287_GPIO_IN_VAL_S                     11
 #define AR9271_GPIO_IN_VAL                       0xFFFF0000
 #define AR9271_GPIO_IN_VAL_S                     16
-#define AR9300_GPIO_IN_VAL                       0x0001FFFF
-#define AR9300_GPIO_IN_VAL_S                     0
 #define AR7010_GPIO_IN_VAL                       0x0000FFFF
 #define AR7010_GPIO_IN_VAL_S                     0
+#define AR_GPIO_IN                               0x404c
+#define AR9300_GPIO_IN_VAL                       0x0001FFFF
+#define AR9300_GPIO_IN_VAL_S                     0
 #define AR_GPIO_OE_OUT                           (AR_SREV_9300_20_OR_LATER(ah) ? 0x4050 : 0x404c)
 #define AR_GPIO_OE_OUT_DRV                       0x3
 #define AR_GPIO_OE_OUT_DRV_NO                    0x0
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index f2ade2402ce2..aff04789f794 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -1120,7 +1120,7 @@ void ath_draintxq(struct ath_softc *sc, struct ath_txq *txq, bool retry_tx)
        }
 }
-void ath_drain_all_txq(struct ath_softc *sc, bool retry_tx)
+bool ath_drain_all_txq(struct ath_softc *sc, bool retry_tx)
 {
        struct ath_hw *ah = sc->sc_ah;
        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
@@ -1128,7 +1128,7 @@ void ath_drain_all_txq(struct ath_softc *sc, bool retry_tx)
        int i, npend = 0;
        if (sc->sc_flags & SC_OP_INVALID)
-                return;
+                return true;
        /* Stop beacon queue */
        ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq);
@@ -1142,25 +1142,15 @@ void ath_drain_all_txq(struct ath_softc *sc, bool retry_tx)
                }
        }
-        if (npend) {
+        if (npend)
-                int r;
+                ath_print(common, ATH_DBG_FATAL, "Failed to stop TX DMA!\n");
-                ath_print(common, ATH_DBG_FATAL,
-                          "Failed to stop TX DMA. Resetting hardware!\n");
-                spin_lock_bh(&sc->sc_resetlock);
-                r = ath9k_hw_reset(ah, sc->sc_ah->curchan, ah->caldata, false);
-                if (r)
-                        ath_print(common, ATH_DBG_FATAL,
-                                  "Unable to reset hardware; reset status %d\n",
-                                  r);
-                spin_unlock_bh(&sc->sc_resetlock);
-        }
        for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
                if (ATH_TXQ_SETUP(sc, i))
                        ath_draintxq(sc, &sc->tx.txq[i], retry_tx);
        }
+        return !npend;
 }
 void ath_tx_cleanupq(struct ath_softc *sc, struct ath_txq *txq)
diff --git a/drivers/net/wireless/ath/carl9170/fw.c b/drivers/net/wireless/ath/carl9170/fw.c
index ae6c006bbc56..546b4e4ec5ea 100644
--- a/drivers/net/wireless/ath/carl9170/fw.c
+++ b/drivers/net/wireless/ath/carl9170/fw.c
@@ -291,7 +291,8 @@ static int carl9170_fw(struct ar9170 *ar, const __u8 *data, size_t len)
                if (SUPP(CARL9170FW_WLANTX_CAB)) {
                        ar->hw->wiphy->interface_modes |=
-                                BIT(NL80211_IFTYPE_AP);
+                                BIT(NL80211_IFTYPE_AP) |
+                                BIT(NL80211_IFTYPE_P2P_GO);
                }
        }
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index a314c2c2bfbe..dc7b30b170d0 100644
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -1631,7 +1631,8 @@ void *carl9170_alloc(size_t priv_size)
         * supports these modes. The code which will add the
         * additional interface_modes is in fw.c.
         */
-        hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
+        hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
+                                     BIT(NL80211_IFTYPE_P2P_CLIENT);
        hw->flags |= IEEE80211_HW_RX_INCLUDES_FCS |
                     IEEE80211_HW_REPORTS_TX_ACK_STATUS |
diff --git a/drivers/net/wireless/ath/carl9170/tx.c b/drivers/net/wireless/ath/carl9170/tx.c
index b575c865142d..7e6506a77bbb 100644
--- a/drivers/net/wireless/ath/carl9170/tx.c
+++ b/drivers/net/wireless/ath/carl9170/tx.c
@@ -810,7 +810,7 @@ static int carl9170_tx_prepare(struct ar9170 *ar, struct sk_buff *skb)
        mac_tmp = cpu_to_le16(AR9170_TX_MAC_HW_DURATION |
                              AR9170_TX_MAC_BACKOFF);
-        mac_tmp |= cpu_to_le16((hw_queue << AR9170_TX_MAC_QOS_S) &&
+        mac_tmp |= cpu_to_le16((hw_queue << AR9170_TX_MAC_QOS_S) &
                               AR9170_TX_MAC_QOS);
        no_ack = !!(info->flags & IEEE80211_TX_CTL_NO_ACK);
diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c
index e5685dc317a8..b4de0ca10feb 100644
--- a/drivers/net/wireless/libertas/if_sdio.c
+++ b/drivers/net/wireless/libertas/if_sdio.c
@@ -1170,7 +1170,6 @@ static void if_sdio_remove(struct sdio_func *func)
        lbs_deb_sdio("call remove card\n");
        lbs_stop_card(card->priv);
        lbs_remove_card(card->priv);
-        card->priv->surpriseremoved = 1;
        flush_workqueue(card->workqueue);
        destroy_workqueue(card->workqueue);
diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c
index 79bcb4e5d2ca..ecd4d04b2c3c 100644
--- a/drivers/net/wireless/libertas/if_spi.c
+++ b/drivers/net/wireless/libertas/if_spi.c
@@ -1055,7 +1055,6 @@ static int __devexit libertas_spi_remove(struct spi_device *spi)
        lbs_stop_card(priv);
        lbs_remove_card(priv); /* will call free_netdev */
-        priv->surpriseremoved = 1;
        free_irq(spi->irq, card);
        if_spi_terminate_spi_thread(card);
        if (card->pdata->teardown)
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 46b88b118c99..fcd1bbfc632d 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -915,8 +915,6 @@ void lbs_remove_card(struct lbs_private *priv)
        lbs_free_adapter(priv);
        lbs_cfg_free(priv);
-        priv->dev = NULL;
        free_netdev(dev);
        lbs_deb_leave(LBS_DEB_MAIN);
diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c
index e8e2d0f4763d..f3d396e7544b 100644
--- a/drivers/net/wireless/orinoco/main.c
+++ b/drivers/net/wireless/orinoco/main.c
@@ -1392,10 +1392,9 @@ static void orinoco_process_scan_results(struct work_struct *work)
                                orinoco_add_hostscan_results(priv, buf, len);
                        kfree(buf);
-                } else if (priv->scan_request) {
+                } else {
                        /* Either abort or complete the scan */
-                        cfg80211_scan_done(priv->scan_request, (len < 0));
+                        orinoco_scan_done(priv, (len < 0));
-                        priv->scan_request = NULL;
                }
                spin_lock_irqsave(&priv->scan_lock, flags);
@@ -1684,6 +1683,8 @@ static int __orinoco_down(struct orinoco_private *priv)
                hermes_write_regn(hw, EVACK, 0xffff);
        }
+        orinoco_scan_done(priv, true);
        /* firmware will have to reassociate */
        netif_carrier_off(dev);
        priv->last_linkstatus = 0xffff;
@@ -1762,10 +1763,7 @@ void orinoco_reset(struct work_struct *work)
        orinoco_unlock(priv, &flags);
        /* Scanning support: Notify scan cancellation */
-        if (priv->scan_request) {
+        orinoco_scan_done(priv, true);
-                cfg80211_scan_done(priv->scan_request, 1);
-                priv->scan_request = NULL;
-        }
        if (priv->hard_reset) {
                err = (*priv->hard_reset)(priv);
@@ -1813,6 +1811,12 @@ static int __orinoco_commit(struct orinoco_private *priv)
        struct net_device *dev = priv->ndev;
        int err = 0;
+        /* If we've called commit, we are reconfiguring or bringing the
+         * interface up. Maintaining countermeasures across this would
+         * be confusing, so note that we've disabled them. The port will
+         * be enabled later in orinoco_commit or __orinoco_up. */
+        priv->tkip_cm_active = 0;
        err = orinoco_hw_program_rids(priv);
        /* FIXME: what about netif_tx_lock */
diff --git a/drivers/net/wireless/orinoco/orinoco_cs.c b/drivers/net/wireless/orinoco/orinoco_cs.c
index 71b3d68b9403..32954c4b243a 100644
--- a/drivers/net/wireless/orinoco/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco/orinoco_cs.c
@@ -151,20 +151,20 @@ orinoco_cs_config(struct pcmcia_device *link)
                goto failed;
        }
-        ret = pcmcia_request_irq(link, orinoco_interrupt);
-        if (ret)
-                goto failed;
-        /* We initialize the hermes structure before completing PCMCIA
-         * configuration just in case the interrupt handler gets
-         * called. */
        mem = ioport_map(link->resource[0]->start,
                        resource_size(link->resource[0]));
        if (!mem)
                goto failed;
+        /* We initialize the hermes structure before completing PCMCIA
+         * configuration just in case the interrupt handler gets
+         * called. */
        hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING);
+        ret = pcmcia_request_irq(link, orinoco_interrupt);
+        if (ret)
+                goto failed;
        ret = pcmcia_enable_device(link);
        if (ret)
                goto failed;
diff --git a/drivers/net/wireless/orinoco/scan.c b/drivers/net/wireless/orinoco/scan.c
index 4300d9db7d8c..86cb54c842e7 100644
--- a/drivers/net/wireless/orinoco/scan.c
+++ b/drivers/net/wireless/orinoco/scan.c
@@ -229,3 +229,11 @@ void orinoco_add_hostscan_results(struct orinoco_private *priv,
                priv->scan_request = NULL;
        }
 }
+void orinoco_scan_done(struct orinoco_private *priv, bool abort)
+{
+        if (priv->scan_request) {
+                cfg80211_scan_done(priv->scan_request, abort);
+                priv->scan_request = NULL;
+        }
+}
diff --git a/drivers/net/wireless/orinoco/scan.h b/drivers/net/wireless/orinoco/scan.h
index 2dc4e046dbdb..27281fb0a6dc 100644
--- a/drivers/net/wireless/orinoco/scan.h
+++ b/drivers/net/wireless/orinoco/scan.h
@@ -16,5 +16,6 @@ void orinoco_add_extscan_result(struct orinoco_private *priv,
 void orinoco_add_hostscan_results(struct orinoco_private *dev,
                                  unsigned char *buf,
                                  size_t len);
+void orinoco_scan_done(struct orinoco_private *priv, bool abort);
 #endif /* _ORINOCO_SCAN_H_ */
diff --git a/drivers/net/wireless/orinoco/spectrum_cs.c b/drivers/net/wireless/orinoco/spectrum_cs.c
index fb859a5ad2eb..db34c282e59b 100644
--- a/drivers/net/wireless/orinoco/spectrum_cs.c
+++ b/drivers/net/wireless/orinoco/spectrum_cs.c
@@ -214,21 +214,21 @@ spectrum_cs_config(struct pcmcia_device *link)
                goto failed;
        }
-        ret = pcmcia_request_irq(link, orinoco_interrupt);
-        if (ret)
-                goto failed;
-        /* We initialize the hermes structure before completing PCMCIA
-         * configuration just in case the interrupt handler gets
-         * called. */
        mem = ioport_map(link->resource[0]->start,
                        resource_size(link->resource[0]));
        if (!mem)
                goto failed;
+        /* We initialize the hermes structure before completing PCMCIA
+         * configuration just in case the interrupt handler gets
+         * called. */
        hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING);
        hw->eeprom_pda = true;
+        ret = pcmcia_request_irq(link, orinoco_interrupt);
+        if (ret)
+                goto failed;
        ret = pcmcia_enable_device(link);
        if (ret)
                goto failed;
diff --git a/drivers/net/wireless/orinoco/wext.c b/drivers/net/wireless/orinoco/wext.c
index 93505f93bf97..e5afabee60d1 100644
--- a/drivers/net/wireless/orinoco/wext.c
+++ b/drivers/net/wireless/orinoco/wext.c
@@ -911,10 +911,10 @@ static int orinoco_ioctl_set_auth(struct net_device *dev,
                 */
                if (param->value) {
                        priv->tkip_cm_active = 1;
-                        ret = hermes_enable_port(hw, 0);
+                        ret = hermes_disable_port(hw, 0);
                } else {
                        priv->tkip_cm_active = 0;
-                        ret = hermes_disable_port(hw, 0);
+                        ret = hermes_enable_port(hw, 0);
                }
                break;
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 458bb57914a3..cdbeec9f83ea 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -66,8 +66,8 @@ struct netfront_cb {
 #define GRANT_INVALID_REF       0
-#define NET_TX_RING_SIZE __RING_SIZE((struct xen_netif_tx_sring *)0, PAGE_SIZE)
+#define NET_TX_RING_SIZE __CONST_RING_SIZE(xen_netif_tx, PAGE_SIZE)
-#define NET_RX_RING_SIZE __RING_SIZE((struct xen_netif_rx_sring *)0, PAGE_SIZE)
+#define NET_RX_RING_SIZE __CONST_RING_SIZE(xen_netif_rx, PAGE_SIZE)
 #define TX_MAX_TARGET min_t(int, NET_RX_RING_SIZE, 256)
 struct netfront_info {
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index c80a7a6e7698..de886f3dfd39 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -215,7 +215,8 @@ config PCMCIA_PXA2XX
        depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \
                    || MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA \
                    || ARCOM_PCMCIA || ARCH_PXA_ESERIES || MACH_STARGATE2 \
-                    || MACH_VPAC270 || MACH_BALLOON3)
+                    || MACH_VPAC270 || MACH_BALLOON3 || MACH_COLIBRI \
+                    || MACH_COLIBRI320)
        select PCMCIA_SOC_COMMON
        help
          Say Y here to include support for the PXA2xx PCMCIA controller
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index 8d9386a22eb3..9a44a90dcf7a 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -70,6 +70,8 @@ pxa2xx-obj-$(CONFIG_MACH_E740)			+= pxa2xx_e740.o
 pxa2xx-obj-$(CONFIG_MACH_STARGATE2)             += pxa2xx_stargate2.o
 pxa2xx-obj-$(CONFIG_MACH_VPAC270)               += pxa2xx_vpac270.o
 pxa2xx-obj-$(CONFIG_MACH_BALLOON3)              += pxa2xx_balloon3.o
+pxa2xx-obj-$(CONFIG_MACH_COLIBRI)               += pxa2xx_colibri.o
+pxa2xx-obj-$(CONFIG_MACH_COLIBRI320)            += pxa2xx_colibri.o
 obj-$(CONFIG_PCMCIA_PXA2XX)                     += pxa2xx_base.o $(pxa2xx-obj-y)
diff --git a/drivers/pcmcia/pxa2xx_balloon3.c b/drivers/pcmcia/pxa2xx_balloon3.c
index dbbdd0063202..453c54c97612 100644
--- a/drivers/pcmcia/pxa2xx_balloon3.c
+++ b/drivers/pcmcia/pxa2xx_balloon3.c
@@ -39,12 +39,10 @@ static struct pcmcia_irqs irqs[] = {
 static int balloon3_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 {
        uint16_t ver;
-        int ret;
-        static void __iomem *fpga_ver;
        ver = __raw_readw(BALLOON3_FPGA_VER);
-        if (ver > 0x0201)
+        if (ver < 0x4f08)
-                pr_warn("The FPGA code, version 0x%04x, is newer than rel-0.3. "
+                pr_warn("The FPGA code, version 0x%04x, is too old. "
                        "PCMCIA/CF support might be broken in this version!",
                        ver);
@@ -97,8 +95,9 @@ static void balloon3_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
 static int balloon3_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
                                       const socket_state_t *state)
 {
-        __raw_writew((state->flags & SS_RESET) ? BALLOON3_CF_RESET : 0,
+        __raw_writew(BALLOON3_CF_RESET, BALLOON3_CF_CONTROL_REG |
-                        BALLOON3_CF_CONTROL_REG);
+                        ((state->flags & SS_RESET) ?
+                        BALLOON3_FPGA_SETnCLR : 0));
        return 0;
 }
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index ae07b4db8a6e..3755e7c8c715 100644
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -26,6 +26,7 @@
 #include <linux/platform_device.h>
 #include <mach/hardware.h>
+#include <mach/smemc.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>
@@ -116,37 +117,49 @@ static inline u_int pxa2xx_pcmcia_cmd_time(u_int mem_clk_10khz,
 static int pxa2xx_pcmcia_set_mcmem( int sock, int speed, int clock )
 {
-        MCMEM(sock) = ((pxa2xx_mcxx_setup(speed, clock)
+        uint32_t val;
+        val = ((pxa2xx_mcxx_setup(speed, clock)
                & MCXX_SETUP_MASK) << MCXX_SETUP_SHIFT)
                | ((pxa2xx_mcxx_asst(speed, clock)
                & MCXX_ASST_MASK) << MCXX_ASST_SHIFT)
                | ((pxa2xx_mcxx_hold(speed, clock)
                & MCXX_HOLD_MASK) << MCXX_HOLD_SHIFT);
+        __raw_writel(val, MCMEM(sock));
        return 0;
 }
 static int pxa2xx_pcmcia_set_mcio( int sock, int speed, int clock )
 {
-        MCIO(sock) = ((pxa2xx_mcxx_setup(speed, clock)
+        uint32_t val;
+        val = ((pxa2xx_mcxx_setup(speed, clock)
                & MCXX_SETUP_MASK) << MCXX_SETUP_SHIFT)
                | ((pxa2xx_mcxx_asst(speed, clock)
                & MCXX_ASST_MASK) << MCXX_ASST_SHIFT)
                | ((pxa2xx_mcxx_hold(speed, clock)
                & MCXX_HOLD_MASK) << MCXX_HOLD_SHIFT);
+        __raw_writel(val, MCIO(sock));
        return 0;
 }
 static int pxa2xx_pcmcia_set_mcatt( int sock, int speed, int clock )
 {
-        MCATT(sock) = ((pxa2xx_mcxx_setup(speed, clock)
+        uint32_t val;
+        val = ((pxa2xx_mcxx_setup(speed, clock)
                & MCXX_SETUP_MASK) << MCXX_SETUP_SHIFT)
                | ((pxa2xx_mcxx_asst(speed, clock)
                & MCXX_ASST_MASK) << MCXX_ASST_SHIFT)
                | ((pxa2xx_mcxx_hold(speed, clock)
                & MCXX_HOLD_MASK) << MCXX_HOLD_SHIFT);
+        __raw_writel(val, MCATT(sock));
        return 0;
 }
@@ -166,8 +179,8 @@ static int pxa2xx_pcmcia_set_mcxx(struct soc_pcmcia_socket *skt, unsigned int cl
 static int pxa2xx_pcmcia_set_timing(struct soc_pcmcia_socket *skt)
 {
-        unsigned int clk = get_memclk_frequency_10khz();
+        unsigned long clk = clk_get_rate(skt->clk);
-        return pxa2xx_pcmcia_set_mcxx(skt, clk);
+        return pxa2xx_pcmcia_set_mcxx(skt, clk / 10000);
 }
 #ifdef CONFIG_CPU_FREQ
@@ -205,19 +218,18 @@ pxa2xx_pcmcia_frequency_change(struct soc_pcmcia_socket *skt,
 static void pxa2xx_configure_sockets(struct device *dev)
 {
        struct pcmcia_low_level *ops = dev->platform_data;
        /*
         * We have at least one socket, so set MECR:CIT
         * (Card Is There)
         */
-        MECR |= MECR_CIT;
+        uint32_t mecr = MECR_CIT;
        /* Set MECR:NOS (Number Of Sockets) */
        if ((ops->first + ops->nr) > 1 ||
            machine_is_viper() || machine_is_arcom_zeus())
-                MECR |= MECR_NOS;
+                mecr |= MECR_NOS;
-        else
-                MECR &= ~MECR_NOS;
+        __raw_writel(mecr, MECR);
 }
 static const char *skt_names[] = {
@@ -270,24 +282,41 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev)
        struct pcmcia_low_level *ops;
        struct skt_dev_info *sinfo;
        struct soc_pcmcia_socket *skt;
+        struct clk *clk;
        ops = (struct pcmcia_low_level *)dev->dev.platform_data;
-        if (!ops)
+        if (!ops) {
+                ret = -ENODEV;
+                goto err0;
+        }
+        if (cpu_is_pxa320() && ops->nr > 1) {
+                dev_err(&dev->dev, "pxa320 supports only one pcmcia slot");
+                ret = -EINVAL;
+                goto err0;
+        }
+        clk = clk_get(&dev->dev, NULL);
+        if (!clk)
                return -ENODEV;
        pxa2xx_drv_pcmcia_ops(ops);
        sinfo = kzalloc(SKT_DEV_INFO_SIZE(ops->nr), GFP_KERNEL);
-        if (!sinfo)
+        if (!sinfo) {
+                clk_put(clk);
                return -ENOMEM;
+        }
        sinfo->nskt = ops->nr;
+        sinfo->clk = clk;
        /* Initialize processor specific parameters */
        for (i = 0; i < ops->nr; i++) {
                skt = &sinfo->skt[i];
                skt->nr = ops->first + i;
+                skt->clk = clk;
                skt->ops = ops;
                skt->socket.owner = ops->owner;
                skt->socket.dev.parent = &dev->dev;
@@ -295,18 +324,26 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev)
                ret = pxa2xx_drv_pcmcia_add_one(skt);
                if (ret)
-                        break;
+                        goto err1;
        }
        if (ret) {
                while (--i >= 0)
                        soc_pcmcia_remove_one(&sinfo->skt[i]);
                kfree(sinfo);
+                clk_put(clk);
        } else {
                pxa2xx_configure_sockets(&dev->dev);
                dev_set_drvdata(&dev->dev, sinfo);
        }
+        return 0;
+err1:
+        while (--i >= 0)
+                soc_pcmcia_remove_one(&sinfo->skt[i]);
+        kfree(sinfo);
+err0:
        return ret;
 }
@@ -320,6 +357,7 @@ static int pxa2xx_drv_pcmcia_remove(struct platform_device *dev)
        for (i = 0; i < sinfo->nskt; i++)
                soc_pcmcia_remove_one(&sinfo->skt[i]);
+        clk_put(sinfo->clk);
        kfree(sinfo);
        return 0;
 }
diff --git a/drivers/pcmcia/pxa2xx_colibri.c b/drivers/pcmcia/pxa2xx_colibri.c
new file mode 100644
index 000000000000..c3f72192af66
--- /dev/null
+++ b/drivers/pcmcia/pxa2xx_colibri.c
@@ -0,0 +1,229 @@
+/*
+ * linux/drivers/pcmcia/pxa2xx_colibri.c
+ *
+ * Driver for Toradex Colibri PXA270 CF socket
+ *
+ * Copyright (C) 2010 Marek Vasut <marek.vasut@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/gpio.h>
+#include <asm/mach-types.h>
+#include "soc_common.h"
+#define COLIBRI270_RESET_GPIO   53
+#define COLIBRI270_PPEN_GPIO    107
+#define COLIBRI270_BVD1_GPIO    83
+#define COLIBRI270_BVD2_GPIO    82
+#define COLIBRI270_DETECT_GPIO  84
+#define COLIBRI270_READY_GPIO   1
+#define COLIBRI320_RESET_GPIO   77
+#define COLIBRI320_PPEN_GPIO    57
+#define COLIBRI320_BVD1_GPIO    53
+#define COLIBRI320_BVD2_GPIO    79
+#define COLIBRI320_DETECT_GPIO  81
+#define COLIBRI320_READY_GPIO   29
+static struct {
+        int     reset_gpio;
+        int     ppen_gpio;
+        int     bvd1_gpio;
+        int     bvd2_gpio;
+        int     detect_gpio;
+        int     ready_gpio;
+} colibri_pcmcia_gpio;
+static struct pcmcia_irqs colibri_irqs[] = {
+        {
+                .sock = 0,
+                .str  = "PCMCIA CD"
+        },
+};
+static int colibri_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
+{
+        int ret;
+        ret = gpio_request(colibri_pcmcia_gpio.detect_gpio, "DETECT");
+        if (ret)
+                goto err1;
+        ret = gpio_direction_input(colibri_pcmcia_gpio.detect_gpio);
+        if (ret)
+                goto err2;
+        ret = gpio_request(colibri_pcmcia_gpio.ready_gpio, "READY");
+        if (ret)
+                goto err2;
+        ret = gpio_direction_input(colibri_pcmcia_gpio.ready_gpio);
+        if (ret)
+                goto err3;
+        ret = gpio_request(colibri_pcmcia_gpio.bvd1_gpio, "BVD1");
+        if (ret)
+                goto err3;
+        ret = gpio_direction_input(colibri_pcmcia_gpio.bvd1_gpio);
+        if (ret)
+                goto err4;
+        ret = gpio_request(colibri_pcmcia_gpio.bvd2_gpio, "BVD2");
+        if (ret)
+                goto err4;
+        ret = gpio_direction_input(colibri_pcmcia_gpio.bvd2_gpio);
+        if (ret)
+                goto err5;
+        ret = gpio_request(colibri_pcmcia_gpio.ppen_gpio, "PPEN");
+        if (ret)
+                goto err5;
+        ret = gpio_direction_output(colibri_pcmcia_gpio.ppen_gpio, 0);
+        if (ret)
+                goto err6;
+        ret = gpio_request(colibri_pcmcia_gpio.reset_gpio, "RESET");
+        if (ret)
+                goto err6;
+        ret = gpio_direction_output(colibri_pcmcia_gpio.reset_gpio, 1);
+        if (ret)
+                goto err7;
+        colibri_irqs[0].irq = gpio_to_irq(colibri_pcmcia_gpio.detect_gpio);
+        skt->socket.pci_irq = gpio_to_irq(colibri_pcmcia_gpio.ready_gpio);
+        return soc_pcmcia_request_irqs(skt, colibri_irqs,
+                                        ARRAY_SIZE(colibri_irqs));
+err7:
+        gpio_free(colibri_pcmcia_gpio.detect_gpio);
+err6:
+        gpio_free(colibri_pcmcia_gpio.ready_gpio);
+err5:
+        gpio_free(colibri_pcmcia_gpio.bvd1_gpio);
+err4:
+        gpio_free(colibri_pcmcia_gpio.bvd2_gpio);
+err3:
+        gpio_free(colibri_pcmcia_gpio.reset_gpio);
+err2:
+        gpio_free(colibri_pcmcia_gpio.ppen_gpio);
+err1:
+        return ret;
+}
+static void colibri_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
+{
+        gpio_free(colibri_pcmcia_gpio.detect_gpio);
+        gpio_free(colibri_pcmcia_gpio.ready_gpio);
+        gpio_free(colibri_pcmcia_gpio.bvd1_gpio);
+        gpio_free(colibri_pcmcia_gpio.bvd2_gpio);
+        gpio_free(colibri_pcmcia_gpio.reset_gpio);
+        gpio_free(colibri_pcmcia_gpio.ppen_gpio);
+}
+static void colibri_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
+                                        struct pcmcia_state *state)
+{
+        state->detect = !!gpio_get_value(colibri_pcmcia_gpio.detect_gpio);
+        state->ready  = !!gpio_get_value(colibri_pcmcia_gpio.ready_gpio);
+        state->bvd1   = !!gpio_get_value(colibri_pcmcia_gpio.bvd1_gpio);
+        state->bvd2   = !!gpio_get_value(colibri_pcmcia_gpio.bvd2_gpio);
+        state->wrprot = 0;
+        state->vs_3v  = 1;
+        state->vs_Xv  = 0;
+}
+static int
+colibri_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
+                                const socket_state_t *state)
+{
+        gpio_set_value(colibri_pcmcia_gpio.ppen_gpio,
+                        !(state->Vcc == 33 && state->Vpp < 50));
+        gpio_set_value(colibri_pcmcia_gpio.reset_gpio, state->flags & SS_RESET);
+        return 0;
+}
+static void colibri_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
+{
+}
+static void colibri_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
+{
+}
+static struct pcmcia_low_level colibri_pcmcia_ops = {
+        .owner                  = THIS_MODULE,
+        .first                  = 0,
+        .nr                     = 1,
+        .hw_init                = colibri_pcmcia_hw_init,
+        .hw_shutdown            = colibri_pcmcia_hw_shutdown,
+        .socket_state           = colibri_pcmcia_socket_state,
+        .configure_socket       = colibri_pcmcia_configure_socket,
+        .socket_init            = colibri_pcmcia_socket_init,
+        .socket_suspend         = colibri_pcmcia_socket_suspend,
+};
+static struct platform_device *colibri_pcmcia_device;
+static int __init colibri_pcmcia_init(void)
+{
+        int ret;
+        colibri_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);
+        if (!colibri_pcmcia_device)
+                return -ENOMEM;
+        /* Colibri PXA270 */
+        if (machine_is_colibri()) {
+                colibri_pcmcia_gpio.reset_gpio  = COLIBRI270_RESET_GPIO;
+                colibri_pcmcia_gpio.ppen_gpio   = COLIBRI270_PPEN_GPIO;
+                colibri_pcmcia_gpio.bvd1_gpio   = COLIBRI270_BVD1_GPIO;
+                colibri_pcmcia_gpio.bvd2_gpio   = COLIBRI270_BVD2_GPIO;
+                colibri_pcmcia_gpio.detect_gpio = COLIBRI270_DETECT_GPIO;
+                colibri_pcmcia_gpio.ready_gpio  = COLIBRI270_READY_GPIO;
+        /* Colibri PXA320 */
+        } else if (machine_is_colibri320()) {
+                colibri_pcmcia_gpio.reset_gpio  = COLIBRI320_RESET_GPIO;
+                colibri_pcmcia_gpio.ppen_gpio   = COLIBRI320_PPEN_GPIO;
+                colibri_pcmcia_gpio.bvd1_gpio   = COLIBRI320_BVD1_GPIO;
+                colibri_pcmcia_gpio.bvd2_gpio   = COLIBRI320_BVD2_GPIO;
+                colibri_pcmcia_gpio.detect_gpio = COLIBRI320_DETECT_GPIO;
+                colibri_pcmcia_gpio.ready_gpio  = COLIBRI320_READY_GPIO;
+        }
+        ret = platform_device_add_data(colibri_pcmcia_device,
+                &colibri_pcmcia_ops, sizeof(colibri_pcmcia_ops));
+        if (!ret)
+                ret = platform_device_add(colibri_pcmcia_device);
+        if (ret)
+                platform_device_put(colibri_pcmcia_device);
+        return ret;
+}
+static void __exit colibri_pcmcia_exit(void)
+{
+        platform_device_unregister(colibri_pcmcia_device);
+}
+module_init(colibri_pcmcia_init);
+module_exit(colibri_pcmcia_exit);
+MODULE_AUTHOR("Marek Vasut <marek.vasut@gmail.com>");
+MODULE_DESCRIPTION("PCMCIA support for Toradex Colibri PXA270/PXA320");
+MODULE_ALIAS("platform:pxa2xx-pcmcia");
+MODULE_LICENSE("GPL");
diff --git a/drivers/pcmcia/soc_common.h b/drivers/pcmcia/soc_common.h
index bbcd5385a221..9daa73615c8b 100644
--- a/drivers/pcmcia/soc_common.h
+++ b/drivers/pcmcia/soc_common.h
@@ -10,6 +10,7 @@
 #define _ASM_ARCH_PCMCIA
 /* include the world */
+#include <linux/clk.h>
 #include <linux/cpufreq.h>
 #include <pcmcia/ss.h>
 #include <pcmcia/cistpl.h>
@@ -29,6 +30,7 @@ struct soc_pcmcia_socket {
         * Info from low level handler
         */
        unsigned int            nr;
+        struct clk              *clk;
        /*
         * Core PCMCIA state
@@ -56,6 +58,7 @@ struct soc_pcmcia_socket {
 struct skt_dev_info {
        int nskt;
+        struct clk *clk;
        struct soc_pcmcia_socket skt[0];
 };
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 2d73dfcecdbb..57313f4658bc 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -180,7 +180,7 @@ struct pnp_protocol pnpacpi_protocol = {
 };
 EXPORT_SYMBOL(pnpacpi_protocol);
-static char *pnpacpi_get_id(struct acpi_device *device)
+static char *__init pnpacpi_get_id(struct acpi_device *device)
 {
        struct acpi_hardware_id *id;
diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c
index 51237fbb1bbb..6d20b0454a1d 100644
--- a/drivers/regulator/tps6586x-regulator.c
+++ b/drivers/regulator/tps6586x-regulator.c
@@ -231,8 +231,7 @@ static int tps6586x_dvm_voltages[] = {
 };
 #define TPS6586X_REGULATOR(_id, vdata, _ops, vreg, shift, nbits,        \
-                           ereg0, ebit0, ereg1, ebit1, goreg, gobit)    \
+                           ereg0, ebit0, ereg1, ebit1)                  \
-{                                                                       \
        .desc   = {                                                     \
                .name   = "REG-" #_id,                                  \
                .ops    = &tps6586x_regulator_##_ops,                   \
@@ -248,18 +247,26 @@ static int tps6586x_dvm_voltages[] = {
        .enable_bit[0]  = (ebit0),                                      \
        .enable_reg[1]  = TPS6586X_SUPPLY##ereg1,                       \
        .enable_bit[1]  = (ebit1),                                      \
-        .voltages       = tps6586x_##vdata##_voltages,                  \
+        .voltages       = tps6586x_##vdata##_voltages,
-}
+#define TPS6586X_REGULATOR_DVM_GOREG(goreg, gobit)                      \
+        .go_reg = TPS6586X_##goreg,                                     \
+        .go_bit = (gobit),
 #define TPS6586X_LDO(_id, vdata, vreg, shift, nbits,                    \
                     ereg0, ebit0, ereg1, ebit1)                        \
+{                                                                       \
        TPS6586X_REGULATOR(_id, vdata, ldo_ops, vreg, shift, nbits,     \
-                           ereg0, ebit0, ereg1, ebit1, 0, 0)
+                           ereg0, ebit0, ereg1, ebit1)                  \
+}
 #define TPS6586X_DVM(_id, vdata, vreg, shift, nbits,                    \
                     ereg0, ebit0, ereg1, ebit1, goreg, gobit)          \
+{                                                                       \
        TPS6586X_REGULATOR(_id, vdata, dvm_ops, vreg, shift, nbits,     \
-                           ereg0, ebit0, ereg1, ebit1, goreg, gobit)
+                           ereg0, ebit0, ereg1, ebit1)                  \
+        TPS6586X_REGULATOR_DVM_GOREG(goreg, gobit)                      \
+}
 static struct tps6586x_regulator tps6586x_regulator[] = {
        TPS6586X_LDO(LDO_0, ldo, SUPPLYV1, 5, 3, ENC, 0, END, 0),
@@ -267,11 +274,11 @@ static struct tps6586x_regulator tps6586x_regulator[] = {
        TPS6586X_LDO(LDO_5, ldo, SUPPLYV6, 0, 3, ENE, 6, ENE, 6),
        TPS6586X_LDO(LDO_6, ldo, SUPPLYV3, 0, 3, ENC, 4, END, 4),
        TPS6586X_LDO(LDO_7, ldo, SUPPLYV3, 3, 3, ENC, 5, END, 5),
-        TPS6586X_LDO(LDO_8, ldo, SUPPLYV1, 5, 3, ENC, 6, END, 6),
+        TPS6586X_LDO(LDO_8, ldo, SUPPLYV2, 5, 3, ENC, 6, END, 6),
        TPS6586X_LDO(LDO_9, ldo, SUPPLYV6, 3, 3, ENE, 7, ENE, 7),
-        TPS6586X_LDO(LDO_RTC, ldo, SUPPLYV4, 3, 3, ENE, 7, ENE, 7),
+        TPS6586X_LDO(LDO_RTC, ldo, SUPPLYV4, 3, 3, V4, 7, V4, 7),
        TPS6586X_LDO(LDO_1, dvm, SUPPLYV1, 0, 5, ENC, 1, END, 1),
-        TPS6586X_LDO(SM_2, sm2, SUPPLYV2, 0, 5, ENC, 1, END, 1),
+        TPS6586X_LDO(SM_2, sm2, SUPPLYV2, 0, 5, ENC, 7, END, 7),
        TPS6586X_DVM(LDO_2, dvm, LDO2BV1, 0, 5, ENA, 3, ENB, 3, VCC2, 6),
        TPS6586X_DVM(LDO_4, ldo4, LDO4V1, 0, 5, ENC, 3, END, 3, VCC1, 6),
@@ -290,6 +297,10 @@ static inline int tps6586x_regulator_preinit(struct device *parent,
        uint8_t val1, val2;
        int ret;
+        if (ri->enable_reg[0] == ri->enable_reg[1] &&
+            ri->enable_bit[0] == ri->enable_bit[1])
+                        return 0;
        ret = tps6586x_read(parent, ri->enable_reg[0], &val1);
        if (ret)
                return ret;
@@ -298,14 +309,14 @@ static inline int tps6586x_regulator_preinit(struct device *parent,
        if (ret)
                return ret;
-        if (!(val2 & ri->enable_bit[1]))
+        if (!(val2 & (1 << ri->enable_bit[1])))
                return 0;
        /*
         * The regulator is on, but it's enabled with the bit we don't
         * want to use, so we switch the enable bits
         */
-        if (!(val1 & ri->enable_bit[0])) {
+        if (!(val1 & (1 << ri->enable_bit[0]))) {
                ret = tps6586x_set_bits(parent, ri->enable_reg[0],
                                        1 << ri->enable_bit[0]);
                if (ret)
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index d37c7331f244..0bcd5806bd9a 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -156,6 +156,8 @@ static int zfcp_erp_required_act(int want, struct zfcp_adapter *adapter,
                if (!(a_status & ZFCP_STATUS_COMMON_RUNNING) ||
                      a_status & ZFCP_STATUS_COMMON_ERP_FAILED)
                        return 0;
+                if (p_status & ZFCP_STATUS_COMMON_NOESC)
+                        return need;
                if (!(a_status & ZFCP_STATUS_COMMON_UNBLOCKED))
                        need = ZFCP_ERP_ACTION_REOPEN_ADAPTER;
                /* fall through */
@@ -188,6 +190,9 @@ static struct zfcp_erp_action *zfcp_erp_setup_act(int need, u32 act_status,
                atomic_set_mask(ZFCP_STATUS_COMMON_ERP_INUSE,
                                &zfcp_sdev->status);
                erp_action = &zfcp_sdev->erp_action;
+                memset(erp_action, 0, sizeof(struct zfcp_erp_action));
+                erp_action->port = port;
+                erp_action->sdev = sdev;
                if (!(atomic_read(&zfcp_sdev->status) &
                      ZFCP_STATUS_COMMON_RUNNING))
                        act_status |= ZFCP_STATUS_ERP_CLOSE_ONLY;
@@ -200,6 +205,8 @@ static struct zfcp_erp_action *zfcp_erp_setup_act(int need, u32 act_status,
                zfcp_erp_action_dismiss_port(port);
                atomic_set_mask(ZFCP_STATUS_COMMON_ERP_INUSE, &port->status);
                erp_action = &port->erp_action;
+                memset(erp_action, 0, sizeof(struct zfcp_erp_action));
+                erp_action->port = port;
                if (!(atomic_read(&port->status) & ZFCP_STATUS_COMMON_RUNNING))
                        act_status |= ZFCP_STATUS_ERP_CLOSE_ONLY;
                break;
@@ -209,6 +216,7 @@ static struct zfcp_erp_action *zfcp_erp_setup_act(int need, u32 act_status,
                zfcp_erp_action_dismiss_adapter(adapter);
                atomic_set_mask(ZFCP_STATUS_COMMON_ERP_INUSE, &adapter->status);
                erp_action = &adapter->erp_action;
+                memset(erp_action, 0, sizeof(struct zfcp_erp_action));
                if (!(atomic_read(&adapter->status) &
                      ZFCP_STATUS_COMMON_RUNNING))
                        act_status |= ZFCP_STATUS_ERP_CLOSE_ONLY;
@@ -218,10 +226,7 @@ static struct zfcp_erp_action *zfcp_erp_setup_act(int need, u32 act_status,
                return NULL;
        }
-        memset(erp_action, 0, sizeof(struct zfcp_erp_action));
        erp_action->adapter = adapter;
-        erp_action->port = port;
-        erp_action->sdev = sdev;
        erp_action->action = need;
        erp_action->status = act_status;
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index be0317457147..2eb7dd56ab80 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -851,7 +851,7 @@ struct zfcp_fsf_req *zfcp_fsf_abort_fcp_cmnd(struct scsi_cmnd *scmnd)
        zfcp_qdio_set_sbale_last(qdio, &req->qdio_req);
-        req->data = zfcp_sdev;
+        req->data = sdev;
        req->handler = zfcp_fsf_abort_fcp_command_handler;
        req->qtcb->header.lun_handle = zfcp_sdev->lun_handle;
        req->qtcb->header.port_handle = zfcp_sdev->port->handle;
@@ -2069,8 +2069,6 @@ static void zfcp_fsf_fcp_cmnd_handler(struct zfcp_fsf_req *req)
        struct fcp_resp_with_ext *fcp_rsp;
        unsigned long flags;
-        zfcp_fsf_fcp_handler_common(req);
        read_lock_irqsave(&req->adapter->abort_lock, flags);
        scpnt = req->data;
@@ -2079,6 +2077,8 @@ static void zfcp_fsf_fcp_cmnd_handler(struct zfcp_fsf_req *req)
                return;
        }
+        zfcp_fsf_fcp_handler_common(req);
        if (unlikely(req->status & ZFCP_STATUS_FSFREQ_ERROR)) {
                set_host_byte(scpnt, DID_TRANSPORT_DISRUPTED);
                goto skip_fsfstatus;
@@ -2170,12 +2170,13 @@ int zfcp_fsf_fcp_cmnd(struct scsi_cmnd *scsi_cmnd)
        struct zfcp_adapter *adapter = zfcp_sdev->port->adapter;
        struct zfcp_qdio *qdio = adapter->qdio;
        struct fsf_qtcb_bottom_io *io;
+        unsigned long flags;
        if (unlikely(!(atomic_read(&zfcp_sdev->status) &
                       ZFCP_STATUS_COMMON_UNBLOCKED)))
                return -EBUSY;
-        spin_lock(&qdio->req_q_lock);
+        spin_lock_irqsave(&qdio->req_q_lock, flags);
        if (atomic_read(&qdio->req_q_free) <= 0) {
                atomic_inc(&qdio->req_q_full);
                goto out;
@@ -2239,7 +2240,7 @@ failed_scsi_cmnd:
        zfcp_fsf_req_free(req);
        scsi_cmnd->host_scribble = NULL;
 out:
-        spin_unlock(&qdio->req_q_lock);
+        spin_unlock_irqrestore(&qdio->req_q_lock, flags);
        return retval;
 }
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 6bd2dbc4c316..63529ed801eb 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -76,8 +76,8 @@ static void zfcp_scsi_command_fail(struct scsi_cmnd *scpnt, int result)
        scpnt->scsi_done(scpnt);
 }
-static int zfcp_scsi_queuecommand_lck(struct scsi_cmnd *scpnt,
+static
-                                  void (*done) (struct scsi_cmnd *))
+int zfcp_scsi_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scpnt)
 {
        struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(scpnt->device);
        struct zfcp_adapter *adapter = zfcp_sdev->port->adapter;
@@ -87,7 +87,6 @@ static int zfcp_scsi_queuecommand_lck(struct scsi_cmnd *scpnt,
        /* reset the status for this request */
        scpnt->result = 0;
        scpnt->host_scribble = NULL;
-        scpnt->scsi_done = done;
        scsi_result = fc_remote_port_chkready(rport);
        if (unlikely(scsi_result)) {
@@ -127,8 +126,6 @@ static int zfcp_scsi_queuecommand_lck(struct scsi_cmnd *scpnt,
        return ret;
 }
-static DEF_SCSI_QCMD(zfcp_scsi_queuecommand)
 static int zfcp_scsi_slave_alloc(struct scsi_device *sdev)
 {
        struct fc_rport *rport = starget_to_rport(scsi_target(sdev));
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index b2fb2b2a6e70..a6dea08664fc 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -90,11 +90,7 @@ static const struct pci_device_id hpsa_pci_device_id[] = {
        {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3252},
        {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3253},
        {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3254},
-#define PCI_DEVICE_ID_HP_CISSF 0x333f
+        {PCI_VENDOR_ID_HP,     PCI_ANY_ID,      PCI_ANY_ID, PCI_ANY_ID,
-        {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x333F},
-        {PCI_VENDOR_ID_HP,     PCI_ANY_ID,             PCI_ANY_ID, PCI_ANY_ID,
-                PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
-        {PCI_VENDOR_ID_COMPAQ,     PCI_ANY_ID,             PCI_ANY_ID, PCI_ANY_ID,
                PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
        {0,}
 };
@@ -113,8 +109,6 @@ static struct board_type products[] = {
        {0x3249103C, "Smart Array P812", &SA5_access},
        {0x324a103C, "Smart Array P712m", &SA5_access},
        {0x324b103C, "Smart Array P711m", &SA5_access},
-        {0x3233103C, "StorageWorks P1210m", &SA5_access},
-        {0x333F103C, "StorageWorks P1210m", &SA5_access},
        {0x3250103C, "Smart Array", &SA5_access},
        {0x3250113C, "Smart Array", &SA5_access},
        {0x3250123C, "Smart Array", &SA5_access},
diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c
index 0433ea6f27c9..b37c8a3c1bb0 100644
--- a/drivers/scsi/osd/osd_initiator.c
+++ b/drivers/scsi/osd/osd_initiator.c
@@ -951,8 +951,8 @@ static int _osd_req_finalize_cdb_cont(struct osd_request *or, const u8 *cap_key)
        /* create a bio for continuation segment */
        bio = bio_map_kern(req_q, or->cdb_cont.buff, or->cdb_cont.total_bytes,
                           GFP_KERNEL);
-        if (unlikely(!bio))
+        if (IS_ERR(bio))
-                return -ENOMEM;
+                return PTR_ERR(bio);
        bio->bi_rw |= REQ_WRITE;
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index 5e76a624cb08..300d59f389da 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -62,6 +62,7 @@
 static unsigned int pmcraid_debug_log;
 static unsigned int pmcraid_disable_aen;
 static unsigned int pmcraid_log_level = IOASC_LOG_LEVEL_MUST;
+static unsigned int pmcraid_enable_msix;
 /*
 * Data structures to support multiple adapters by the LLD.
@@ -4691,7 +4692,8 @@ pmcraid_register_interrupt_handler(struct pmcraid_instance *pinstance)
        int rc;
        struct pci_dev *pdev = pinstance->pdev;
-        if (pci_find_capability(pdev, PCI_CAP_ID_MSIX)) {
+        if ((pmcraid_enable_msix) &&
+                (pci_find_capability(pdev, PCI_CAP_ID_MSIX))) {
                int num_hrrq = PMCRAID_NUM_MSIX_VECTORS;
                struct msix_entry entries[PMCRAID_NUM_MSIX_VECTORS];
                int i;
diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
index 1134279604e8..4db210d93947 100644
--- a/drivers/scsi/pmcraid.h
+++ b/drivers/scsi/pmcraid.h
@@ -42,7 +42,7 @@
 */
 #define PMCRAID_DRIVER_NAME             "PMC MaxRAID"
 #define PMCRAID_DEVFILE                 "pmcsas"
-#define PMCRAID_DRIVER_VERSION          "2.0.3"
+#define PMCRAID_DRIVER_VERSION          "1.0.3"
 #define PMCRAID_DRIVER_DATE             __DATE__
 #define PMCRAID_FW_VERSION_1            0x002
@@ -333,11 +333,9 @@ struct pmcraid_config_table_entry {
        __u8  lun[PMCRAID_LUN_LEN];
 } __attribute__((packed, aligned(4)));
-/* extended configuration table sizes are of 64 bytes in size */
+/* extended configuration table sizes are also of 32 bytes in size */
-#define PMCRAID_CFGTE_EXT_SIZE  32
 struct pmcraid_config_table_entry_ext {
        struct pmcraid_config_table_entry cfgte;
-        __u8  cfgte_ext[PMCRAID_CFGTE_EXT_SIZE];
 };
 /* resource types (config_table_entry.resource_type values) */
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 3a22effced5f..9ce539d4557e 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -2409,7 +2409,6 @@ struct qla_hw_data {
                uint32_t        enable_target_reset     :1;
                uint32_t        enable_lip_full_login   :1;
                uint32_t        enable_led_scheme       :1;
-                uint32_t        inta_enabled            :1;
                uint32_t        msi_enabled             :1;
                uint32_t        msix_enabled            :1;
                uint32_t        disable_serdes          :1;
diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index 5f94430b42f0..4c1ba6263eb3 100644
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -1061,6 +1061,7 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,
                fcp_cmnd->additional_cdb_len |= 2;
        int_to_scsilun(sp->cmd->device->lun, &fcp_cmnd->lun);
+        host_to_fcp_swap((uint8_t *)&fcp_cmnd->lun, sizeof(fcp_cmnd->lun));
        memcpy(fcp_cmnd->cdb, cmd->cmnd, cmd->cmd_len);
        cmd_pkt->fcp_cmnd_dseg_len = cpu_to_le16(fcp_cmnd_len);
        cmd_pkt->fcp_cmnd_dseg_address[0] = cpu_to_le32(
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 1f06ddd9bdd1..7f77898486a9 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -2491,14 +2491,15 @@ skip_msix:
 skip_msi:
        ret = request_irq(ha->pdev->irq, ha->isp_ops->intr_handler,
-            IRQF_SHARED, QLA2XXX_DRIVER_NAME, rsp);
+            ha->flags.msi_enabled ? 0 : IRQF_SHARED,
+            QLA2XXX_DRIVER_NAME, rsp);
        if (ret) {
                qla_printk(KERN_WARNING, ha,
                    "Failed to reserve interrupt %d already in use.\n",
                    ha->pdev->irq);
                goto fail;
        }
-        ha->flags.inta_enabled = 1;
 clear_risc_ints:
        /*
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 8d9edfb39803..ae2acacc0003 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -2749,6 +2749,7 @@ sufficient_dsds:
                        goto queuing_error_fcp_cmnd;
                int_to_scsilun(sp->cmd->device->lun, &cmd_pkt->lun);
+                host_to_fcp_swap((uint8_t *)&cmd_pkt->lun, sizeof(cmd_pkt->lun));
                /* build FCP_CMND IU */
                memset(ctx->fcp_cmnd, 0, sizeof(struct fcp_cmnd));
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 1644eabaafeb..2c0876c81a3f 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -829,7 +829,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
 {
        scsi_qla_host_t *vha = shost_priv(cmd->device->host);
        srb_t *sp;
-        int ret;
+        int ret = SUCCESS;
        unsigned int id, lun;
        unsigned long flags;
        int wait = 0;
@@ -2064,6 +2064,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                ha->init_cb_size = sizeof(struct mid_init_cb_81xx);
                ha->gid_list_info_size = 8;
                ha->optrom_size = OPTROM_SIZE_82XX;
+                ha->nvram_npiv_size = QLA_MAX_VPORTS_QLA25XX;
                ha->isp_ops = &qla82xx_isp_ops;
                ha->flash_conf_off = FARX_ACCESS_FLASH_CONF;
                ha->flash_data_off = FARX_ACCESS_FLASH_DATA;
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index 8edbccb3232d..cf0075a2d0c2 100644
--- a/drivers/scsi/qla2xxx/qla_version.h
+++ b/drivers/scsi/qla2xxx/qla_version.h
@@ -7,9 +7,9 @@
 /*
 * Driver version
 */
-#define QLA2XXX_VERSION      "8.03.04-k0"
+#define QLA2XXX_VERSION      "8.03.05-k0"
 #define QLA_DRIVER_MAJOR_VER    8
 #define QLA_DRIVER_MINOR_VER    3
-#define QLA_DRIVER_PATCH_VER    4
+#define QLA_DRIVER_PATCH_VER    5
 #define QLA_DRIVER_BETA_VER     0
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 824b8fc03ce5..30ac116186f5 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -615,7 +615,7 @@ static int scsi_try_bus_device_reset(struct scsi_cmnd *scmd)
        return rtn;
 }
-static int __scsi_try_to_abort_cmd(struct scsi_cmnd *scmd)
+static int scsi_try_to_abort_cmd(struct scsi_cmnd *scmd)
 {
        if (!scmd->device->host->hostt->eh_abort_handler)
                return FAILED;
@@ -623,31 +623,9 @@ static int __scsi_try_to_abort_cmd(struct scsi_cmnd *scmd)
        return scmd->device->host->hostt->eh_abort_handler(scmd);
 }
-/**
- * scsi_try_to_abort_cmd - Ask host to abort a running command.
- * @scmd:       SCSI cmd to abort from Lower Level.
- *
- * Notes:
- *    This function will not return until the user's completion function
- *    has been called.  there is no timeout on this operation.  if the
- *    author of the low-level driver wishes this operation to be timed,
- *    they can provide this facility themselves.  helper functions in
- *    scsi_error.c can be supplied to make this easier to do.
- */
-static int scsi_try_to_abort_cmd(struct scsi_cmnd *scmd)
-{
-        /*
-         * scsi_done was called just after the command timed out and before
-         * we had a chance to process it. (db)
-         */
-        if (scmd->serial_number == 0)
-                return SUCCESS;
-        return __scsi_try_to_abort_cmd(scmd);
-}
 static void scsi_abort_eh_cmnd(struct scsi_cmnd *scmd)
 {
-        if (__scsi_try_to_abort_cmd(scmd) != SUCCESS)
+        if (scsi_try_to_abort_cmd(scmd) != SUCCESS)
                if (scsi_try_bus_device_reset(scmd) != SUCCESS)
                        if (scsi_try_target_reset(scmd) != SUCCESS)
                                if (scsi_try_bus_reset(scmd) != SUCCESS)
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index eafeeda6e194..5b6bbaea59fe 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1403,11 +1403,6 @@ static void scsi_softirq_done(struct request *rq)
        INIT_LIST_HEAD(&cmd->eh_entry);
-        /*
-         * Set the serial numbers back to zero
-         */
-        cmd->serial_number = 0;
        atomic_inc(&cmd->device->iodone_cnt);
        if (cmd->result)
                atomic_inc(&cmd->device->ioerr_cnt);
diff --git a/drivers/serial/kgdboc.c b/drivers/serial/kgdboc.c
index 3374618300af..25a8bc565f40 100644
--- a/drivers/serial/kgdboc.c
+++ b/drivers/serial/kgdboc.c
@@ -90,7 +90,8 @@ static DECLARE_WORK(kgdboc_restore_input_work, kgdboc_restore_input_helper);
 static void kgdboc_restore_input(void)
 {
-        schedule_work(&kgdboc_restore_input_work);
+        if (likely(system_state == SYSTEM_RUNNING))
+                schedule_work(&kgdboc_restore_input_work);
 }
 static int kgdboc_register_kbd(char **cptr)
diff --git a/drivers/spi/dw_spi.c b/drivers/spi/dw_spi.c
index 90439314cf67..0838c79861e4 100644
--- a/drivers/spi/dw_spi.c
+++ b/drivers/spi/dw_spi.c
@@ -413,6 +413,11 @@ static void poll_transfer(struct dw_spi *dws)
 {
        while (dws->write(dws))
                dws->read(dws);
+        /*
+         * There is a possibility that the last word of a transaction
+         * will be lost if data is not ready. Re-read to solve this issue.
+         */
+        dws->read(dws);
        transfer_complete(dws);
 }
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 67eb3770868f..5a7c8f1d76c6 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -41,6 +41,7 @@ config USB_ARCH_HAS_OHCI
        default y if MFD_TC6393XB
        default y if ARCH_W90X900
        default y if ARCH_DAVINCI_DA8XX
+        default y if ARCH_CNS3XXX
        # PPC:
        default y if STB03xxx
        default y if PPC_MPC52xx
@@ -66,6 +67,7 @@ config USB_ARCH_HAS_EHCI
        default y if ARCH_AT91SAM9G45
        default y if ARCH_MXC
        default y if ARCH_OMAP3
+        default y if ARCH_CNS3XXX
        default PCI
 # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
index 05bf5a27b5b0..989e16e4ab5c 100644
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -951,7 +951,9 @@ static int usbatm_atm_init(struct usbatm_data *instance)
         * condition: callbacks we register can be executed at once, before we have
         * initialized the struct atm_dev.  To protect against this, all callbacks
         * abort if atm_dev->dev_data is NULL. */
-        atm_dev = atm_dev_register(instance->driver_name, &usbatm_atm_devops, -1, NULL);
+        atm_dev = atm_dev_register(instance->driver_name,
+                                   &instance->usb_intf->dev, &usbatm_atm_devops,
+                                   -1, NULL);
        if (!atm_dev) {
                usb_err(instance, "%s: failed to register ATM device!\n", __func__);
                return -1;
@@ -966,14 +968,6 @@ static int usbatm_atm_init(struct usbatm_data *instance)
        /* temp init ATM device, set to 128kbit */
        atm_dev->link_rate = 128 * 1000 / 424;
-        ret = sysfs_create_link(&atm_dev->class_dev.kobj,
-                                &instance->usb_intf->dev.kobj, "device");
-        if (ret) {
-                atm_err(instance, "%s: sysfs_create_link failed: %d\n",
-                                        __func__, ret);
-                goto fail_sysfs;
-        }
        if (instance->driver->atm_start && ((ret = instance->driver->atm_start(instance, atm_dev)) < 0)) {
                atm_err(instance, "%s: atm_start failed: %d!\n", __func__, ret);
                goto fail;
@@ -992,8 +986,6 @@ static int usbatm_atm_init(struct usbatm_data *instance)
        return 0;
 fail:
-        sysfs_remove_link(&atm_dev->class_dev.kobj, "device");
- fail_sysfs:
        instance->atm_dev = NULL;
        atm_dev_deregister(atm_dev); /* usbatm_atm_dev_close will eventually be called */
        return ret;
@@ -1329,7 +1321,6 @@ void usbatm_usb_disconnect(struct usb_interface *intf)
        /* ATM finalize */
        if (instance->atm_dev) {
-                sysfs_remove_link(&instance->atm_dev->class_dev.kobj, "device");
                atm_dev_deregister(instance->atm_dev);
                instance->atm_dev = NULL;
        }
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 6f4f8e6a40c7..f8970d151d2a 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -147,6 +147,14 @@ config USB_W90X900_EHCI
        ---help---
                Enables support for the W90X900 USB controller
+config USB_CNS3XXX_EHCI
+        bool "Cavium CNS3XXX EHCI Module"
+        depends on USB_EHCI_HCD && ARCH_CNS3XXX
+        ---help---
+          Enable support for the CNS3XXX SOC's on-chip EHCI controller.
+          It is needed for high-speed (480Mbit/sec) USB 2.0 device
+          support.
 config USB_OXU210HP_HCD
        tristate "OXU210HP HCD support"
        depends on USB
@@ -286,6 +294,13 @@ config USB_OHCI_HCD_SSB
          If unsure, say N.
+config USB_CNS3XXX_OHCI
+        bool "Cavium CNS3XXX OHCI Module"
+        depends on USB_OHCI_HCD && ARCH_CNS3XXX
+        ---help---
+          Enable support for the CNS3XXX SOC's on-chip OHCI controller.
+          It is needed for low-speed USB 1.0 device support.
 config USB_OHCI_BIG_ENDIAN_DESC
        bool
        depends on USB_OHCI_HCD
diff --git a/drivers/usb/host/ehci-cns3xxx.c b/drivers/usb/host/ehci-cns3xxx.c
new file mode 100644
index 000000000000..708a05b5d258
--- /dev/null
+++ b/drivers/usb/host/ehci-cns3xxx.c
@@ -0,0 +1,171 @@
+/*
+ * Copyright 2008 Cavium Networks
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, Version 2, as
+ * published by the Free Software Foundation.
+ */
+#include <linux/platform_device.h>
+#include <linux/atomic.h>
+#include <mach/cns3xxx.h>
+#include <mach/pm.h>
+static int cns3xxx_ehci_init(struct usb_hcd *hcd)
+{
+        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
+        int retval;
+        /*
+         * EHCI and OHCI share the same clock and power,
+         * resetting twice would cause the 1st controller been reset.
+         * Therefore only do power up  at the first up device, and
+         * power down at the last down device.
+         *
+         * Set USB AHB INCR length to 16
+         */
+        if (atomic_inc_return(&usb_pwr_ref) == 1) {
+                cns3xxx_pwr_power_up(1 << PM_PLL_HM_PD_CTRL_REG_OFFSET_PLL_USB);
+                cns3xxx_pwr_clk_en(1 << PM_CLK_GATE_REG_OFFSET_USB_HOST);
+                cns3xxx_pwr_soft_rst(1 << PM_SOFT_RST_REG_OFFST_USB_HOST);
+                __raw_writel((__raw_readl(MISC_CHIP_CONFIG_REG) | (0X2 << 24)),
+                        MISC_CHIP_CONFIG_REG);
+        }
+        ehci->caps = hcd->regs;
+        ehci->regs = hcd->regs
+                + HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase));
+        ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
+        hcd->has_tt = 0;
+        ehci_reset(ehci);
+        retval = ehci_init(hcd);
+        if (retval)
+                return retval;
+        ehci_port_power(ehci, 0);
+        return retval;
+}
+static const struct hc_driver cns3xxx_ehci_hc_driver = {
+        .description            = hcd_name,
+        .product_desc           = "CNS3XXX EHCI Host Controller",
+        .hcd_priv_size          = sizeof(struct ehci_hcd),
+        .irq                    = ehci_irq,
+        .flags                  = HCD_MEMORY | HCD_USB2,
+        .reset                  = cns3xxx_ehci_init,
+        .start                  = ehci_run,
+        .stop                   = ehci_stop,
+        .shutdown               = ehci_shutdown,
+        .urb_enqueue            = ehci_urb_enqueue,
+        .urb_dequeue            = ehci_urb_dequeue,
+        .endpoint_disable       = ehci_endpoint_disable,
+        .endpoint_reset         = ehci_endpoint_reset,
+        .get_frame_number       = ehci_get_frame,
+        .hub_status_data        = ehci_hub_status_data,
+        .hub_control            = ehci_hub_control,
+#ifdef CONFIG_PM
+        .bus_suspend            = ehci_bus_suspend,
+        .bus_resume             = ehci_bus_resume,
+#endif
+        .relinquish_port        = ehci_relinquish_port,
+        .port_handed_over       = ehci_port_handed_over,
+        .clear_tt_buffer_complete       = ehci_clear_tt_buffer_complete,
+};
+static int cns3xxx_ehci_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct usb_hcd *hcd;
+        const struct hc_driver *driver = &cns3xxx_ehci_hc_driver;
+        struct resource *res;
+        int irq;
+        int retval;
+        if (usb_disabled())
+                return -ENODEV;
+        res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+        if (!res) {
+                dev_err(dev, "Found HC with no IRQ.\n");
+                return -ENODEV;
+        }
+        irq = res->start;
+        hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
+        if (!hcd)
+                return -ENOMEM;
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                dev_err(dev, "Found HC with no register addr.\n");
+                retval = -ENODEV;
+                goto err1;
+        }
+        hcd->rsrc_start = res->start;
+        hcd->rsrc_len = res->end - res->start + 1;
+        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
+                                driver->description)) {
+                dev_dbg(dev, "controller already in use\n");
+                retval = -EBUSY;
+                goto err1;
+        }
+        hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
+        if (hcd->regs == NULL) {
+                dev_dbg(dev, "error mapping memory\n");
+                retval = -EFAULT;
+                goto err2;
+        }
+        retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
+        if (retval == 0)
+                return retval;
+        iounmap(hcd->regs);
+err2:
+        release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+err1:
+        usb_put_hcd(hcd);
+        return retval;
+}
+static int cns3xxx_ehci_remove(struct platform_device *pdev)
+{
+        struct usb_hcd *hcd = platform_get_drvdata(pdev);
+        usb_remove_hcd(hcd);
+        iounmap(hcd->regs);
+        release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+        /*
+         * EHCI and OHCI share the same clock and power,
+         * resetting twice would cause the 1st controller been reset.
+         * Therefore only do power up  at the first up device, and
+         * power down at the last down device.
+         */
+        if (atomic_dec_return(&usb_pwr_ref) == 0)
+                cns3xxx_pwr_clk_dis(1 << PM_CLK_GATE_REG_OFFSET_USB_HOST);
+        usb_put_hcd(hcd);
+        platform_set_drvdata(pdev, NULL);
+        return 0;
+}
+MODULE_ALIAS("platform:cns3xxx-ehci");
+static struct platform_driver cns3xxx_ehci_driver = {
+        .probe = cns3xxx_ehci_probe,
+        .remove = cns3xxx_ehci_remove,
+        .driver = {
+                .name = "cns3xxx-ehci",
+        },
+};
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index e9062806d4a2..d0c8f7c03e05 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1216,6 +1216,11 @@ MODULE_LICENSE ("GPL");
 #define PLATFORM_DRIVER         ehci_octeon_driver
 #endif
+#ifdef CONFIG_USB_CNS3XXX_EHCI
+#include "ehci-cns3xxx.c"
+#define PLATFORM_DRIVER         cns3xxx_ehci_driver
+#endif
 #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
    !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \
    !defined(XILINX_OF_PLATFORM_DRIVER)
diff --git a/drivers/usb/host/ohci-cns3xxx.c b/drivers/usb/host/ohci-cns3xxx.c
new file mode 100644
index 000000000000..f05ef87e934c
--- /dev/null
+++ b/drivers/usb/host/ohci-cns3xxx.c
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2008 Cavium Networks
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, Version 2, as
+ * published by the Free Software Foundation.
+ */
+#include <linux/platform_device.h>
+#include <linux/atomic.h>
+#include <mach/cns3xxx.h>
+#include <mach/pm.h>
+static int __devinit
+cns3xxx_ohci_start(struct usb_hcd *hcd)
+{
+        struct ohci_hcd *ohci = hcd_to_ohci(hcd);
+        int ret;
+        /*
+         * EHCI and OHCI share the same clock and power,
+         * resetting twice would cause the 1st controller been reset.
+         * Therefore only do power up  at the first up device, and
+         * power down at the last down device.
+         *
+         * Set USB AHB INCR length to 16
+         */
+        if (atomic_inc_return(&usb_pwr_ref) == 1) {
+                cns3xxx_pwr_power_up(1 << PM_PLL_HM_PD_CTRL_REG_OFFSET_PLL_USB);
+                cns3xxx_pwr_clk_en(1 << PM_CLK_GATE_REG_OFFSET_USB_HOST);
+                cns3xxx_pwr_soft_rst(1 << PM_SOFT_RST_REG_OFFST_USB_HOST);
+                __raw_writel((__raw_readl(MISC_CHIP_CONFIG_REG) | (0X2 << 24)),
+                        MISC_CHIP_CONFIG_REG);
+        }
+        ret = ohci_init(ohci);
+        if (ret < 0)
+                return ret;
+        ohci->num_ports = 1;
+        ret = ohci_run(ohci);
+        if (ret < 0) {
+                err("can't start %s", hcd->self.bus_name);
+                ohci_stop(hcd);
+                return ret;
+        }
+        return 0;
+}
+static const struct hc_driver cns3xxx_ohci_hc_driver = {
+        .description            = hcd_name,
+        .product_desc           = "CNS3XXX OHCI Host controller",
+        .hcd_priv_size          = sizeof(struct ohci_hcd),
+        .irq                    = ohci_irq,
+        .flags                  = HCD_USB11 | HCD_MEMORY,
+        .start                  = cns3xxx_ohci_start,
+        .stop                   = ohci_stop,
+        .shutdown               = ohci_shutdown,
+        .urb_enqueue            = ohci_urb_enqueue,
+        .urb_dequeue            = ohci_urb_dequeue,
+        .endpoint_disable       = ohci_endpoint_disable,
+        .get_frame_number       = ohci_get_frame,
+        .hub_status_data        = ohci_hub_status_data,
+        .hub_control            = ohci_hub_control,
+#ifdef CONFIG_PM
+        .bus_suspend            = ohci_bus_suspend,
+        .bus_resume             = ohci_bus_resume,
+#endif
+        .start_port_reset       = ohci_start_port_reset,
+};
+static int cns3xxx_ohci_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct usb_hcd *hcd;
+        const struct hc_driver *driver = &cns3xxx_ohci_hc_driver;
+        struct resource *res;
+        int irq;
+        int retval;
+        if (usb_disabled())
+                return -ENODEV;
+        res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+        if (!res) {
+                dev_err(dev, "Found HC with no IRQ.\n");
+                return -ENODEV;
+        }
+        irq = res->start;
+        hcd = usb_create_hcd(driver, dev, dev_name(dev));
+        if (!hcd)
+                return -ENOMEM;
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                dev_err(dev, "Found HC with no register addr.\n");
+                retval = -ENODEV;
+                goto err1;
+        }
+        hcd->rsrc_start = res->start;
+        hcd->rsrc_len = res->end - res->start + 1;
+        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
+                        driver->description)) {
+                dev_dbg(dev, "controller already in use\n");
+                retval = -EBUSY;
+                goto err1;
+        }
+        hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
+        if (!hcd->regs) {
+                dev_dbg(dev, "error mapping memory\n");
+                retval = -EFAULT;
+                goto err2;
+        }
+        ohci_hcd_init(hcd_to_ohci(hcd));
+        retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
+        if (retval == 0)
+                return retval;
+        iounmap(hcd->regs);
+err2:
+        release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+err1:
+        usb_put_hcd(hcd);
+        return retval;
+}
+static int cns3xxx_ohci_remove(struct platform_device *pdev)
+{
+        struct usb_hcd *hcd = platform_get_drvdata(pdev);
+        usb_remove_hcd(hcd);
+        iounmap(hcd->regs);
+        release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+        /*
+         * EHCI and OHCI share the same clock and power,
+         * resetting twice would cause the 1st controller been reset.
+         * Therefore only do power up  at the first up device, and
+         * power down at the last down device.
+         */
+        if (atomic_dec_return(&usb_pwr_ref) == 0)
+                cns3xxx_pwr_clk_dis(1 << PM_CLK_GATE_REG_OFFSET_USB_HOST);
+        usb_put_hcd(hcd);
+        platform_set_drvdata(pdev, NULL);
+        return 0;
+}
+MODULE_ALIAS("platform:cns3xxx-ohci");
+static struct platform_driver ohci_hcd_cns3xxx_driver = {
+        .probe = cns3xxx_ohci_probe,
+        .remove = cns3xxx_ohci_remove,
+        .driver = {
+                .name = "cns3xxx-ohci",
+        },
+};
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 5179acb7aa2f..5cb6731ba443 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -1111,6 +1111,11 @@ MODULE_LICENSE ("GPL");
 #define PLATFORM_DRIVER         ohci_octeon_driver
 #endif
+#ifdef CONFIG_USB_CNS3XXX_OHCI
+#include "ohci-cns3xxx.c"
+#define PLATFORM_DRIVER         ohci_hcd_cns3xxx_driver
+#endif
 #if     !defined(PCI_DRIVER) &&         \
        !defined(PLATFORM_DRIVER) &&    \
        !defined(OMAP1_PLATFORM_DRIVER) &&      \
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 94701ff3a23a..159c77a5746f 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -884,6 +884,7 @@ static int log_write(void __user *log_base,
        int r;
        if (!write_length)
                return 0;
+        write_length += write_address % VHOST_PAGE_SIZE;
        write_address /= VHOST_PAGE_SIZE;
        for (;;) {
                u64 base = (u64)(unsigned long)log_base;
@@ -897,7 +898,7 @@ static int log_write(void __user *log_base,
                if (write_length <= VHOST_PAGE_SIZE)
                        break;
                write_length -= VHOST_PAGE_SIZE;
-                write_address += VHOST_PAGE_SIZE;
+                write_address += 1;
        }
        return r;
 }
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 27c1fb4b1e0d..ab77297fbed2 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1850,6 +1850,16 @@ config FB_PXA_PARAMETERS
          <file:Documentation/fb/pxafb.txt> describes the available parameters.
+config PXA3XX_GCU
+        tristate "PXA3xx 2D graphics accelerator driver"
+        depends on FB_PXA
+        help
+          Kernelspace driver for the 2D graphics controller unit (GCU)
+          found on PXA3xx processors. There is a counterpart driver in the
+          DirectFB suite, see http://www.directfb.org/
+          If you compile this as a module, it will be called pxa3xx_gcu.
 config FB_MBX
        tristate "2700G LCD framebuffer support"
        depends on FB && ARCH_PXA
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 485e8ed1318c..9260a898f343 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -100,6 +100,7 @@ obj-$(CONFIG_FB_CIRRUS)		  += cirrusfb.o
 obj-$(CONFIG_FB_ASILIANT)         += asiliantfb.o
 obj-$(CONFIG_FB_PXA)              += pxafb.o
 obj-$(CONFIG_FB_PXA168)           += pxa168fb.o
+obj-$(CONFIG_PXA3XX_GCU)          += pxa3xx-gcu.o
 obj-$(CONFIG_FB_W100)             += w100fb.o
 obj-$(CONFIG_FB_TMIO)             += tmiofb.o
 obj-$(CONFIG_FB_AU1100)           += au1100fb.o
diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index 0a4dbdc1693a..de450c1fb869 100644
--- a/drivers/video/modedb.c
+++ b/drivers/video/modedb.c
@@ -855,6 +855,7 @@ const struct fb_videomode *fb_find_nearest_mode(const struct fb_videomode *mode,
                        abs(cmode->yres - mode->yres);
                if (diff > d) {
                        diff = d;
+                        diff_refresh = abs(cmode->refresh - mode->refresh);
                        best = cmode;
                } else if (diff == d) {
                        d = abs(cmode->refresh - mode->refresh);
diff --git a/drivers/video/pxa3xx-gcu.c b/drivers/video/pxa3xx-gcu.c
new file mode 100644
index 000000000000..b81168df253d
--- /dev/null
+++ b/drivers/video/pxa3xx-gcu.c
@@ -0,0 +1,772 @@
+/*
+ *  pxa3xx-gc.c - Linux kernel module for PXA3xx graphics controllers
+ *
+ *  This driver needs a DirectFB counterpart in user space, communication
+ *  is handled via mmap()ed memory areas and an ioctl.
+ *
+ *  Copyright (c) 2009 Daniel Mack <daniel@caiaq.de>
+ *  Copyright (c) 2009 Janine Kropp <nin@directfb.org>
+ *  Copyright (c) 2009 Denis Oliver Kropp <dok@directfb.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/*
+ * WARNING: This controller is attached to System Bus 2 of the PXA which
+ * needs its arbiter to be enabled explictly (CKENB & 1<<9).
+ * There is currently no way to do this from Linux, so you need to teach
+ * your bootloader for now.
+ */
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
+#include <linux/miscdevice.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/uaccess.h>
+#include <linux/ioctl.h>
+#include <linux/delay.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <linux/clk.h>
+#include <linux/fs.h>
+#include <linux/io.h>
+#include "pxa3xx-gcu.h"
+#define DRV_NAME        "pxa3xx-gcu"
+#define MISCDEV_MINOR   197
+#define REG_GCCR        0x00
+#define GCCR_SYNC_CLR   (1 << 9)
+#define GCCR_BP_RST     (1 << 8)
+#define GCCR_ABORT      (1 << 6)
+#define GCCR_STOP       (1 << 4)
+#define REG_GCISCR      0x04
+#define REG_GCIECR      0x08
+#define REG_GCRBBR      0x20
+#define REG_GCRBLR      0x24
+#define REG_GCRBHR      0x28
+#define REG_GCRBTR      0x2C
+#define REG_GCRBEXHR    0x30
+#define IE_EOB          (1 << 0)
+#define IE_EEOB         (1 << 5)
+#define IE_ALL          0xff
+#define SHARED_SIZE     PAGE_ALIGN(sizeof(struct pxa3xx_gcu_shared))
+/* #define PXA3XX_GCU_DEBUG */
+/* #define PXA3XX_GCU_DEBUG_TIMER */
+#ifdef PXA3XX_GCU_DEBUG
+#define QDUMP(msg)                                      \
+        do {                                            \
+                QPRINT(priv, KERN_DEBUG, msg);          \
+        } while (0)
+#else
+#define QDUMP(msg)      do {} while (0)
+#endif
+#define QERROR(msg)                                     \
+        do {                                            \
+                QPRINT(priv, KERN_ERR, msg);            \
+        } while (0)
+struct pxa3xx_gcu_batch {
+        struct pxa3xx_gcu_batch *next;
+        u32                     *ptr;
+        dma_addr_t               phys;
+        unsigned long            length;
+};
+struct pxa3xx_gcu_priv {
+        void __iomem             *mmio_base;
+        struct clk               *clk;
+        struct pxa3xx_gcu_shared *shared;
+        dma_addr_t                shared_phys;
+        struct resource          *resource_mem;
+        struct miscdevice         misc_dev;
+        struct file_operations    misc_fops;
+        wait_queue_head_t         wait_idle;
+        wait_queue_head_t         wait_free;
+        spinlock_t                spinlock;
+        struct timeval            base_time;
+        struct pxa3xx_gcu_batch *free;
+        struct pxa3xx_gcu_batch *ready;
+        struct pxa3xx_gcu_batch *ready_last;
+        struct pxa3xx_gcu_batch *running;
+};
+static inline unsigned long
+gc_readl(struct pxa3xx_gcu_priv *priv, unsigned int off)
+{
+        return __raw_readl(priv->mmio_base + off);
+}
+static inline void
+gc_writel(struct pxa3xx_gcu_priv *priv, unsigned int off, unsigned long val)
+{
+        __raw_writel(val, priv->mmio_base + off);
+}
+#define QPRINT(priv, level, msg)                                        \
+        do {                                                            \
+                struct timeval tv;                                      \
+                struct pxa3xx_gcu_shared *shared = priv->shared;        \
+                u32 base = gc_readl(priv, REG_GCRBBR);                  \
+                                                                        \
+                do_gettimeofday(&tv);                                   \
+                                                                        \
+                printk(level "%ld.%03ld.%03ld - %-17s: %-21s (%s, "     \
+                        "STATUS "                                       \
+                        "0x%02lx, B 0x%08lx [%ld], E %5ld, H %5ld, "    \
+                        "T %5ld)\n",                                    \
+                        tv.tv_sec - priv->base_time.tv_sec,             \
+                        tv.tv_usec / 1000, tv.tv_usec % 1000,           \
+                        __func__, msg,                                  \
+                        shared->hw_running ? "running" : "   idle",     \
+                        gc_readl(priv, REG_GCISCR),                     \
+                        gc_readl(priv, REG_GCRBBR),                     \
+                        gc_readl(priv, REG_GCRBLR),                     \
+                        (gc_readl(priv, REG_GCRBEXHR) - base) / 4,      \
+                        (gc_readl(priv, REG_GCRBHR) - base) / 4,        \
+                        (gc_readl(priv, REG_GCRBTR) - base) / 4);       \
+        } while (0)
+static void
+pxa3xx_gcu_reset(struct pxa3xx_gcu_priv *priv)
+{
+        QDUMP("RESET");
+        /* disable interrupts */
+        gc_writel(priv, REG_GCIECR, 0);
+        /* reset hardware */
+        gc_writel(priv, REG_GCCR, GCCR_ABORT);
+        gc_writel(priv, REG_GCCR, 0);
+        memset(priv->shared, 0, SHARED_SIZE);
+        priv->shared->buffer_phys = priv->shared_phys;
+        priv->shared->magic = PXA3XX_GCU_SHARED_MAGIC;
+        do_gettimeofday(&priv->base_time);
+        /* set up the ring buffer pointers */
+        gc_writel(priv, REG_GCRBLR, 0);
+        gc_writel(priv, REG_GCRBBR, priv->shared_phys);
+        gc_writel(priv, REG_GCRBTR, priv->shared_phys);
+        /* enable all IRQs except EOB */
+        gc_writel(priv, REG_GCIECR, IE_ALL & ~IE_EOB);
+}
+static void
+dump_whole_state(struct pxa3xx_gcu_priv *priv)
+{
+        struct pxa3xx_gcu_shared *sh = priv->shared;
+        u32 base = gc_readl(priv, REG_GCRBBR);
+        QDUMP("DUMP");
+        printk(KERN_DEBUG "== PXA3XX-GCU DUMP ==\n"
+                "%s, STATUS 0x%02lx, B 0x%08lx [%ld], E %5ld, H %5ld, T %5ld\n",
+                sh->hw_running ? "running" : "idle   ",
+                gc_readl(priv, REG_GCISCR),
+                gc_readl(priv, REG_GCRBBR),
+                gc_readl(priv, REG_GCRBLR),
+                (gc_readl(priv, REG_GCRBEXHR) - base) / 4,
+                (gc_readl(priv, REG_GCRBHR) - base) / 4,
+                (gc_readl(priv, REG_GCRBTR) - base) / 4);
+}
+static void
+flush_running(struct pxa3xx_gcu_priv *priv)
+{
+        struct pxa3xx_gcu_batch *running = priv->running;
+        struct pxa3xx_gcu_batch *next;
+        while (running) {
+                next = running->next;
+                running->next = priv->free;
+                priv->free = running;
+                running = next;
+        }
+        priv->running = NULL;
+}
+static void
+run_ready(struct pxa3xx_gcu_priv *priv)
+{
+        unsigned int num = 0;
+        struct pxa3xx_gcu_shared *shared = priv->shared;
+        struct pxa3xx_gcu_batch *ready = priv->ready;
+        QDUMP("Start");
+        BUG_ON(!ready);
+        shared->buffer[num++] = 0x05000000;
+        while (ready) {
+                shared->buffer[num++] = 0x00000001;
+                shared->buffer[num++] = ready->phys;
+                ready = ready->next;
+        }
+        shared->buffer[num++] = 0x05000000;
+        priv->running = priv->ready;
+        priv->ready = priv->ready_last = NULL;
+        gc_writel(priv, REG_GCRBLR, 0);
+        shared->hw_running = 1;
+        /* ring base address */
+        gc_writel(priv, REG_GCRBBR, shared->buffer_phys);
+        /* ring tail address */
+        gc_writel(priv, REG_GCRBTR, shared->buffer_phys + num * 4);
+        /* ring length */
+        gc_writel(priv, REG_GCRBLR, ((num + 63) & ~63) * 4);
+}
+static irqreturn_t
+pxa3xx_gcu_handle_irq(int irq, void *ctx)
+{
+        struct pxa3xx_gcu_priv *priv = ctx;
+        struct pxa3xx_gcu_shared *shared = priv->shared;
+        u32 status = gc_readl(priv, REG_GCISCR) & IE_ALL;
+        QDUMP("-Interrupt");
+        if (!status)
+                return IRQ_NONE;
+        spin_lock(&priv->spinlock);
+        shared->num_interrupts++;
+        if (status & IE_EEOB) {
+                QDUMP(" [EEOB]");
+                flush_running(priv);
+                wake_up_all(&priv->wait_free);
+                if (priv->ready) {
+                        run_ready(priv);
+                } else {
+                        /* There is no more data prepared by the userspace.
+                         * Set hw_running = 0 and wait for the next userspace
+                         * kick-off */
+                        shared->num_idle++;
+                        shared->hw_running = 0;
+                        QDUMP(" '-> Idle.");
+                        /* set ring buffer length to zero */
+                        gc_writel(priv, REG_GCRBLR, 0);
+                        wake_up_all(&priv->wait_idle);
+                }
+                shared->num_done++;
+        } else {
+                QERROR(" [???]");
+                dump_whole_state(priv);
+        }
+        /* Clear the interrupt */
+        gc_writel(priv, REG_GCISCR, status);
+        spin_unlock(&priv->spinlock);
+        return IRQ_HANDLED;
+}
+static int
+pxa3xx_gcu_wait_idle(struct pxa3xx_gcu_priv *priv)
+{
+        int ret = 0;
+        QDUMP("Waiting for idle...");
+        /* Does not need to be atomic. There's a lock in user space,
+         * but anyhow, this is just for statistics. */
+        priv->shared->num_wait_idle++;
+        while (priv->shared->hw_running) {
+                int num = priv->shared->num_interrupts;
+                u32 rbexhr = gc_readl(priv, REG_GCRBEXHR);
+                ret = wait_event_interruptible_timeout(priv->wait_idle,
+                                        !priv->shared->hw_running, HZ*4);
+                if (ret < 0)
+                        break;
+                if (ret > 0)
+                        continue;
+                if (gc_readl(priv, REG_GCRBEXHR) == rbexhr &&
+                    priv->shared->num_interrupts == num) {
+                        QERROR("TIMEOUT");
+                        ret = -ETIMEDOUT;
+                        break;
+                }
+        }
+        QDUMP("done");
+        return ret;
+}
+static int
+pxa3xx_gcu_wait_free(struct pxa3xx_gcu_priv *priv)
+{
+        int ret = 0;
+        QDUMP("Waiting for free...");
+        /* Does not need to be atomic. There's a lock in user space,
+         * but anyhow, this is just for statistics. */
+        priv->shared->num_wait_free++;
+        while (!priv->free) {
+                u32 rbexhr = gc_readl(priv, REG_GCRBEXHR);
+                ret = wait_event_interruptible_timeout(priv->wait_free,
+                                                       priv->free, HZ*4);
+                if (ret < 0)
+                        break;
+                if (ret > 0)
+                        continue;
+                if (gc_readl(priv, REG_GCRBEXHR) == rbexhr) {
+                        QERROR("TIMEOUT");
+                        ret = -ETIMEDOUT;
+                        break;
+                }
+        }
+        QDUMP("done");
+        return ret;
+}
+/* Misc device layer */
+static ssize_t
+pxa3xx_gcu_misc_write(struct file *filp, const char *buff,
+                      size_t count, loff_t *offp)
+{
+        int ret;
+        unsigned long flags;
+        struct pxa3xx_gcu_batch *buffer;
+        struct pxa3xx_gcu_priv *priv =
+                container_of(filp->f_op, struct pxa3xx_gcu_priv, misc_fops);
+        int words = count / 4;
+        /* Does not need to be atomic. There's a lock in user space,
+         * but anyhow, this is just for statistics. */
+        priv->shared->num_writes++;
+        priv->shared->num_words += words;
+        /* Last word reserved for batch buffer end command */
+        if (words >= PXA3XX_GCU_BATCH_WORDS)
+                return -E2BIG;
+        /* Wait for a free buffer */
+        if (!priv->free) {
+                ret = pxa3xx_gcu_wait_free(priv);
+                if (ret < 0)
+                        return ret;
+        }
+        /*
+         * Get buffer from free list
+         */
+        spin_lock_irqsave(&priv->spinlock, flags);
+        buffer = priv->free;
+        priv->free = buffer->next;
+        spin_unlock_irqrestore(&priv->spinlock, flags);
+        /* Copy data from user into buffer */
+        ret = copy_from_user(buffer->ptr, buff, words * 4);
+        if (ret) {
+                spin_lock_irqsave(&priv->spinlock, flags);
+                buffer->next = priv->free;
+                priv->free = buffer;
+                spin_unlock_irqrestore(&priv->spinlock, flags);
+                return ret;
+        }
+        buffer->length = words;
+        /* Append batch buffer end command */
+        buffer->ptr[words] = 0x01000000;
+        /*
+         * Add buffer to ready list
+         */
+        spin_lock_irqsave(&priv->spinlock, flags);
+        buffer->next = NULL;
+        if (priv->ready) {
+                BUG_ON(priv->ready_last == NULL);
+                priv->ready_last->next = buffer;
+        } else
+                priv->ready = buffer;
+        priv->ready_last = buffer;
+        if (!priv->shared->hw_running)
+                run_ready(priv);
+        spin_unlock_irqrestore(&priv->spinlock, flags);
+        return words * 4;
+}
+static long
+pxa3xx_gcu_misc_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+{
+        unsigned long flags;
+        struct pxa3xx_gcu_priv *priv =
+                container_of(filp->f_op, struct pxa3xx_gcu_priv, misc_fops);
+        switch (cmd) {
+        case PXA3XX_GCU_IOCTL_RESET:
+                spin_lock_irqsave(&priv->spinlock, flags);
+                pxa3xx_gcu_reset(priv);
+                spin_unlock_irqrestore(&priv->spinlock, flags);
+                return 0;
+        case PXA3XX_GCU_IOCTL_WAIT_IDLE:
+                return pxa3xx_gcu_wait_idle(priv);
+        }
+        return -ENOSYS;
+}
+static int
+pxa3xx_gcu_misc_mmap(struct file *filp, struct vm_area_struct *vma)
+{
+        unsigned int size = vma->vm_end - vma->vm_start;
+        struct pxa3xx_gcu_priv *priv =
+                container_of(filp->f_op, struct pxa3xx_gcu_priv, misc_fops);
+        switch (vma->vm_pgoff) {
+        case 0:
+                /* hand out the shared data area */
+                if (size != SHARED_SIZE)
+                        return -EINVAL;
+                return dma_mmap_coherent(NULL, vma,
+                        priv->shared, priv->shared_phys, size);
+        case SHARED_SIZE >> PAGE_SHIFT:
+                /* hand out the MMIO base for direct register access
+                 * from userspace */
+                if (size != resource_size(priv->resource_mem))
+                        return -EINVAL;
+                vma->vm_flags |= VM_IO;
+                vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+                return io_remap_pfn_range(vma, vma->vm_start,
+                                priv->resource_mem->start >> PAGE_SHIFT,
+                                size, vma->vm_page_prot);
+        }
+        return -EINVAL;
+}
+#ifdef PXA3XX_GCU_DEBUG_TIMER
+static struct timer_list pxa3xx_gcu_debug_timer;
+static void pxa3xx_gcu_debug_timedout(unsigned long ptr)
+{
+        struct pxa3xx_gcu_priv *priv = (struct pxa3xx_gcu_priv *) ptr;
+        QERROR("Timer DUMP");
+        /* init the timer structure */
+        init_timer(&pxa3xx_gcu_debug_timer);
+        pxa3xx_gcu_debug_timer.function = pxa3xx_gcu_debug_timedout;
+        pxa3xx_gcu_debug_timer.data = ptr;
+        pxa3xx_gcu_debug_timer.expires = jiffies + 5*HZ; /* one second */
+        add_timer(&pxa3xx_gcu_debug_timer);
+}
+static void pxa3xx_gcu_init_debug_timer(void)
+{
+        pxa3xx_gcu_debug_timedout((unsigned long) &pxa3xx_gcu_debug_timer);
+}
+#else
+static inline void pxa3xx_gcu_init_debug_timer(void) {}
+#endif
+static int
+add_buffer(struct platform_device *dev,
+           struct pxa3xx_gcu_priv *priv)
+{
+        struct pxa3xx_gcu_batch *buffer;
+        buffer = kzalloc(sizeof(struct pxa3xx_gcu_batch), GFP_KERNEL);
+        if (!buffer)
+                return -ENOMEM;
+        buffer->ptr = dma_alloc_coherent(&dev->dev, PXA3XX_GCU_BATCH_WORDS * 4,
+                                         &buffer->phys, GFP_KERNEL);
+        if (!buffer->ptr) {
+                kfree(buffer);
+                return -ENOMEM;
+        }
+        buffer->next = priv->free;
+        priv->free = buffer;
+        return 0;
+}
+static void
+free_buffers(struct platform_device *dev,
+             struct pxa3xx_gcu_priv *priv)
+{
+        struct pxa3xx_gcu_batch *next, *buffer = priv->free;
+        while (buffer) {
+                next = buffer->next;
+                dma_free_coherent(&dev->dev, PXA3XX_GCU_BATCH_WORDS * 4,
+                                  buffer->ptr, buffer->phys);
+                kfree(buffer);
+                buffer = next;
+        }
+        priv->free = NULL;
+}
+static int __devinit
+pxa3xx_gcu_probe(struct platform_device *dev)
+{
+        int i, ret, irq;
+        struct resource *r;
+        struct pxa3xx_gcu_priv *priv;
+        priv = kzalloc(sizeof(struct pxa3xx_gcu_priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+        for (i = 0; i < 8; i++) {
+                ret = add_buffer(dev, priv);
+                if (ret) {
+                        dev_err(&dev->dev, "failed to allocate DMA memory\n");
+                        goto err_free_priv;
+                }
+        }
+        init_waitqueue_head(&priv->wait_idle);
+        init_waitqueue_head(&priv->wait_free);
+        spin_lock_init(&priv->spinlock);
+        /* we allocate the misc device structure as part of our own allocation,
+         * so we can get a pointer to our priv structure later on with
+         * container_of(). This isn't really necessary as we have a fixed minor
+         * number anyway, but this is to avoid statics. */
+        priv->misc_fops.owner   = THIS_MODULE;
+        priv->misc_fops.write   = pxa3xx_gcu_misc_write;
+        priv->misc_fops.unlocked_ioctl = pxa3xx_gcu_misc_ioctl;
+        priv->misc_fops.mmap    = pxa3xx_gcu_misc_mmap;
+        priv->misc_dev.minor    = MISCDEV_MINOR,
+        priv->misc_dev.name     = DRV_NAME,
+        priv->misc_dev.fops     = &priv->misc_fops,
+        /* register misc device */
+        ret = misc_register(&priv->misc_dev);
+        if (ret < 0) {
+                dev_err(&dev->dev, "misc_register() for minor %d failed\n",
+                        MISCDEV_MINOR);
+                goto err_free_priv;
+        }
+        /* handle IO resources */
+        r = platform_get_resource(dev, IORESOURCE_MEM, 0);
+        if (r == NULL) {
+                dev_err(&dev->dev, "no I/O memory resource defined\n");
+                ret = -ENODEV;
+                goto err_misc_deregister;
+        }
+        if (!request_mem_region(r->start, resource_size(r), dev->name)) {
+                dev_err(&dev->dev, "failed to request I/O memory\n");
+                ret = -EBUSY;
+                goto err_misc_deregister;
+        }
+        priv->mmio_base = ioremap_nocache(r->start, resource_size(r));
+        if (!priv->mmio_base) {
+                dev_err(&dev->dev, "failed to map I/O memory\n");
+                ret = -EBUSY;
+                goto err_free_mem_region;
+        }
+        /* allocate dma memory */
+        priv->shared = dma_alloc_coherent(&dev->dev, SHARED_SIZE,
+                                          &priv->shared_phys, GFP_KERNEL);
+        if (!priv->shared) {
+                dev_err(&dev->dev, "failed to allocate DMA memory\n");
+                ret = -ENOMEM;
+                goto err_free_io;
+        }
+        /* enable the clock */
+        priv->clk = clk_get(&dev->dev, NULL);
+        if (IS_ERR(priv->clk)) {
+                dev_err(&dev->dev, "failed to get clock\n");
+                ret = -ENODEV;
+                goto err_free_dma;
+        }
+        ret = clk_enable(priv->clk);
+        if (ret < 0) {
+                dev_err(&dev->dev, "failed to enable clock\n");
+                goto err_put_clk;
+        }
+        /* request the IRQ */
+        irq = platform_get_irq(dev, 0);
+        if (irq < 0) {
+                dev_err(&dev->dev, "no IRQ defined\n");
+                ret = -ENODEV;
+                goto err_put_clk;
+        }
+        ret = request_irq(irq, pxa3xx_gcu_handle_irq,
+                          IRQF_DISABLED, DRV_NAME, priv);
+        if (ret) {
+                dev_err(&dev->dev, "request_irq failed\n");
+                ret = -EBUSY;
+                goto err_put_clk;
+        }
+        platform_set_drvdata(dev, priv);
+        priv->resource_mem = r;
+        pxa3xx_gcu_reset(priv);
+        pxa3xx_gcu_init_debug_timer();
+        dev_info(&dev->dev, "registered @0x%p, DMA 0x%p (%d bytes), IRQ %d\n",
+                        (void *) r->start, (void *) priv->shared_phys,
+                        SHARED_SIZE, irq);
+        return 0;
+err_put_clk:
+        clk_disable(priv->clk);
+        clk_put(priv->clk);
+err_free_dma:
+        dma_free_coherent(&dev->dev, SHARED_SIZE,
+                        priv->shared, priv->shared_phys);
+err_free_io:
+        iounmap(priv->mmio_base);
+err_free_mem_region:
+        release_mem_region(r->start, resource_size(r));
+err_misc_deregister:
+        misc_deregister(&priv->misc_dev);
+err_free_priv:
+        platform_set_drvdata(dev, NULL);
+        free_buffers(dev, priv);
+        kfree(priv);
+        return ret;
+}
+static int __devexit
+pxa3xx_gcu_remove(struct platform_device *dev)
+{
+        struct pxa3xx_gcu_priv *priv = platform_get_drvdata(dev);
+        struct resource *r = priv->resource_mem;
+        pxa3xx_gcu_wait_idle(priv);
+        misc_deregister(&priv->misc_dev);
+        dma_free_coherent(&dev->dev, SHARED_SIZE,
+                        priv->shared, priv->shared_phys);
+        iounmap(priv->mmio_base);
+        release_mem_region(r->start, resource_size(r));
+        platform_set_drvdata(dev, NULL);
+        clk_disable(priv->clk);
+        free_buffers(dev, priv);
+        kfree(priv);
+        return 0;
+}
+static struct platform_driver pxa3xx_gcu_driver = {
+        .probe    = pxa3xx_gcu_probe,
+        .remove  = __devexit_p(pxa3xx_gcu_remove),
+        .driver  = {
+                .owner  = THIS_MODULE,
+                .name   = DRV_NAME,
+        },
+};
+static int __init
+pxa3xx_gcu_init(void)
+{
+        return platform_driver_register(&pxa3xx_gcu_driver);
+}
+static void __exit
+pxa3xx_gcu_exit(void)
+{
+        platform_driver_unregister(&pxa3xx_gcu_driver);
+}
+module_init(pxa3xx_gcu_init);
+module_exit(pxa3xx_gcu_exit);
+MODULE_DESCRIPTION("PXA3xx graphics controller unit driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_MISCDEV(MISCDEV_MINOR);
+MODULE_AUTHOR("Janine Kropp <nin@directfb.org>, "
+                "Denis Oliver Kropp <dok@directfb.org>, "
+                "Daniel Mack <daniel@caiaq.de>");
diff --git a/drivers/video/pxa3xx-gcu.h b/drivers/video/pxa3xx-gcu.h
new file mode 100644
index 000000000000..0428ed03dc49
--- /dev/null
+++ b/drivers/video/pxa3xx-gcu.h
@@ -0,0 +1,38 @@
+#ifndef __PXA3XX_GCU_H__
+#define __PXA3XX_GCU_H__
+#include <linux/types.h>
+/* Number of 32bit words in display list (ring buffer). */
+#define PXA3XX_GCU_BUFFER_WORDS  ((256 * 1024 - 256) / 4)
+/* To be increased when breaking the ABI */
+#define PXA3XX_GCU_SHARED_MAGIC  0x30000001
+#define PXA3XX_GCU_BATCH_WORDS   8192
+struct pxa3xx_gcu_shared {
+        u32            buffer[PXA3XX_GCU_BUFFER_WORDS];
+        bool           hw_running;
+        unsigned long  buffer_phys;
+        unsigned int   num_words;
+        unsigned int   num_writes;
+        unsigned int   num_done;
+        unsigned int   num_interrupts;
+        unsigned int   num_wait_idle;
+        unsigned int   num_wait_free;
+        unsigned int   num_idle;
+        u32            magic;
+};
+/* Initialization and synchronization.
+ * Hardware is started upon write(). */
+#define PXA3XX_GCU_IOCTL_RESET          _IO('G', 0)
+#define PXA3XX_GCU_IOCTL_WAIT_IDLE      _IO('G', 2)
+#endif /* __PXA3XX_GCU_H__ */