369 files changed, 4343 insertions, 1566 deletions

diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c
index a43fa1a57d57..1502c50273b5 100644
--- a/drivers/acpi/acpi_pad.c
+++ b/drivers/acpi/acpi_pad.c
@@ -36,6 +36,7 @@
 #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"
 #define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80
 static DEFINE_MUTEX(isolated_cpus_lock);
+static DEFINE_MUTEX(round_robin_lock);
 
 static unsigned long power_saving_mwait_eax;
 
@@ -107,7 +108,7 @@ static void round_robin_cpu(unsigned int tsk_index)
         if (!alloc_cpumask_var(&tmp, GFP_KERNEL))
                 return;
 
-        mutex_lock(&isolated_cpus_lock);
+        mutex_lock(&round_robin_lock);
         cpumask_clear(tmp);
         for_each_cpu(cpu, pad_busy_cpus)
                 cpumask_or(tmp, tmp, topology_thread_cpumask(cpu));
@@ -116,7 +117,7 @@ static void round_robin_cpu(unsigned int tsk_index)
         if (cpumask_empty(tmp))
                 cpumask_andnot(tmp, cpu_online_mask, pad_busy_cpus);
         if (cpumask_empty(tmp)) {
-                mutex_unlock(&isolated_cpus_lock);
+                mutex_unlock(&round_robin_lock);
                 return;
         }
         for_each_cpu(cpu, tmp) {
@@ -131,7 +132,7 @@ static void round_robin_cpu(unsigned int tsk_index)
         tsk_in_cpu[tsk_index] = preferred_cpu;
         cpumask_set_cpu(preferred_cpu, pad_busy_cpus);
         cpu_weight[preferred_cpu]++;
-        mutex_unlock(&isolated_cpus_lock);
+        mutex_unlock(&round_robin_lock);
 
         set_cpus_allowed_ptr(current, cpumask_of(preferred_cpu));
 }
diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
index 5577762daee1..6686b1eaf13e 100644
--- a/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
@@ -243,7 +243,7 @@ static int pre_map_gar_callback(struct apei_exec_context *ctx,
         u8 ins = entry->instruction;
 
         if (ctx->ins_table[ins].flags & APEI_EXEC_INS_ACCESS_REGISTER)
-                return acpi_os_map_generic_address(&entry->register_region);
+                return apei_map_generic_address(&entry->register_region);
 
         return 0;
 }
@@ -276,7 +276,7 @@ static int post_unmap_gar_callback(struct apei_exec_context *ctx,
         u8 ins = entry->instruction;
 
         if (ctx->ins_table[ins].flags & APEI_EXEC_INS_ACCESS_REGISTER)
-                acpi_os_unmap_generic_address(&entry->register_region);
+                apei_unmap_generic_address(&entry->register_region);
 
         return 0;
 }
@@ -606,6 +606,19 @@ static int apei_check_gar(struct acpi_generic_address *reg, u64 *paddr,
         return 0;
 }
 
+int apei_map_generic_address(struct acpi_generic_address *reg)
+{
+        int rc;
+        u32 access_bit_width;
+        u64 address;
+
+        rc = apei_check_gar(reg, &address, &access_bit_width);
+        if (rc)
+                return rc;
+        return acpi_os_map_generic_address(reg);
+}
+EXPORT_SYMBOL_GPL(apei_map_generic_address);
+
 /* read GAR in interrupt (including NMI) or process context */
 int apei_read(u64 *val, struct acpi_generic_address *reg)
 {
diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
index cca240a33038..f220d642136e 100644
--- a/drivers/acpi/apei/apei-internal.h
+++ b/drivers/acpi/apei/apei-internal.h
@@ -7,6 +7,8 @@
 #define APEI_INTERNAL_H
 
 #include <linux/cper.h>
+#include <linux/acpi.h>
+#include <linux/acpi_io.h>
 
 struct apei_exec_context;
 
@@ -68,6 +70,13 @@ static inline int apei_exec_run_optional(struct apei_exec_context *ctx, u8 actio
 /* IP has been set in instruction function */
 #define APEI_EXEC_SET_IP        1
 
+int apei_map_generic_address(struct acpi_generic_address *reg);
+
+static inline void apei_unmap_generic_address(struct acpi_generic_address *reg)
+{
+        acpi_os_unmap_generic_address(reg);
+}
+
 int apei_read(u64 *val, struct acpi_generic_address *reg);
 int apei_write(u64 val, struct acpi_generic_address *reg);
 
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 9b3cac0abecc..1599566ed1fe 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -301,7 +301,7 @@ static struct ghes *ghes_new(struct acpi_hest_generic *generic)
         if (!ghes)
                 return ERR_PTR(-ENOMEM);
         ghes->generic = generic;
-        rc = acpi_os_map_generic_address(&generic->error_status_address);
+        rc = apei_map_generic_address(&generic->error_status_address);
         if (rc)
                 goto err_free;
         error_block_length = generic->error_block_length;
@@ -321,7 +321,7 @@ static struct ghes *ghes_new(struct acpi_hest_generic *generic)
         return ghes;
 
 err_unmap:
-        acpi_os_unmap_generic_address(&generic->error_status_address);
+        apei_unmap_generic_address(&generic->error_status_address);
 err_free:
         kfree(ghes);
         return ERR_PTR(rc);
@@ -330,7 +330,7 @@ err_free:
 static void ghes_fini(struct ghes *ghes)
 {
         kfree(ghes->estatus);
-        acpi_os_unmap_generic_address(&ghes->generic->error_status_address);
+        apei_unmap_generic_address(&ghes->generic->error_status_address);
 }
 
 enum {
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index f3decb30223f..47a8caa89dbe 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -224,6 +224,7 @@ static void lapic_timer_state_broadcast(struct acpi_processor *pr,
 /*
  * Suspend / resume control
  */
+static int acpi_idle_suspend;
 static u32 saved_bm_rld;
 
 static void acpi_idle_bm_rld_save(void)
@@ -242,13 +243,21 @@ static void acpi_idle_bm_rld_restore(void)
 
 int acpi_processor_suspend(struct acpi_device * device, pm_message_t state)
 {
+        if (acpi_idle_suspend == 1)
+                return 0;
+
         acpi_idle_bm_rld_save();
+        acpi_idle_suspend = 1;
         return 0;
 }
 
 int acpi_processor_resume(struct acpi_device * device)
 {
+        if (acpi_idle_suspend == 0)
+                return 0;
+
         acpi_idle_bm_rld_restore();
+        acpi_idle_suspend = 0;
         return 0;
 }
 
@@ -754,6 +763,12 @@ static int acpi_idle_enter_c1(struct cpuidle_device *dev,
 
         local_irq_disable();
 
+        if (acpi_idle_suspend) {
+                local_irq_enable();
+                cpu_relax();
+                return -EBUSY;
+        }
+
         lapic_timer_state_broadcast(pr, cx, 1);
         kt1 = ktime_get_real();
         acpi_idle_do_entry(cx);
@@ -823,6 +838,12 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
 
         local_irq_disable();
 
+        if (acpi_idle_suspend) {
+                local_irq_enable();
+                cpu_relax();
+                return -EBUSY;
+        }
+
         if (cx->entry_method != ACPI_CSTATE_FFH) {
                 current_thread_info()->status &= ~TS_POLLING;
                 /*
@@ -907,14 +928,21 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
                                                 drv, drv->safe_state_index);
                 } else {
                         local_irq_disable();
-                        acpi_safe_halt();
+                        if (!acpi_idle_suspend)
+                                acpi_safe_halt();
                         local_irq_enable();
-                        return -EINVAL;
+                        return -EBUSY;
                 }
         }
 
         local_irq_disable();
 
+        if (acpi_idle_suspend) {
+                local_irq_enable();
+                cpu_relax();
+                return -EBUSY;
+        }
+
         if (cx->entry_method != ACPI_CSTATE_FFH) {
                 current_thread_info()->status &= ~TS_POLLING;
                 /*
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index 9f66181c814e..240a24400976 100644
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -173,7 +173,7 @@ static int param_set_trace_state(const char *val, struct kernel_param *kp)
 {
         int result = 0;
 
-        if (!strncmp(val, "enable", strlen("enable") - 1)) {
+        if (!strncmp(val, "enable", strlen("enable"))) {
                 result = acpi_debug_trace(trace_method_name, trace_debug_level,
                                           trace_debug_layer, 0);
                 if (result)
@@ -181,7 +181,7 @@ static int param_set_trace_state(const char *val, struct kernel_param *kp)
                 goto exit;
         }
 
-        if (!strncmp(val, "disable", strlen("disable") - 1)) {
+        if (!strncmp(val, "disable", strlen("disable"))) {
                 int name = 0;
                 result = acpi_debug_trace((char *)&name, trace_debug_level,
                                           trace_debug_layer, 0);
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index a576575617d7..1e0a9e17c31d 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -558,6 +558,8 @@ acpi_video_bus_DOS(struct acpi_video_bus *video, int bios_flag, int lcd_flag)
         union acpi_object arg0 = { ACPI_TYPE_INTEGER };
         struct acpi_object_list args = { 1, &arg0 };
 
+        if (!video->cap._DOS)
+                return 0;
 
         if (bios_flag < 0 || bios_flag > 3 || lcd_flag < 0 || lcd_flag > 1)
                 return -EINVAL;
diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
index 3239517f4d90..ac6a5beb28f3 100644
--- a/drivers/ata/pata_arasan_cf.c
+++ b/drivers/ata/pata_arasan_cf.c
@@ -4,7 +4,7 @@
  * Arasan Compact Flash host controller source file
  *
  * Copyright (C) 2011 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
@@ -959,7 +959,7 @@ static struct platform_driver arasan_cf_driver = {
 
 module_platform_driver(arasan_cf_driver);
 
-MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>");
+MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>");
 MODULE_DESCRIPTION("Arasan ATA Compact Flash driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:" DRIVER_NAME);
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 9a1e9704d782..6cd2c6ca9b0d 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -100,7 +100,7 @@ static void driver_deferred_probe_add(struct device *dev)
         mutex_lock(&deferred_probe_mutex);
         if (list_empty(&dev->p->deferred_probe)) {
                 dev_dbg(dev, "Added to deferred list\n");
-                list_add(&dev->p->deferred_probe, &deferred_probe_pending_list);
+                list_add_tail(&dev->p->deferred_probe, &deferred_probe_pending_list);
         }
         mutex_unlock(&deferred_probe_mutex);
 }
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index e0fb5b0435a3..9cb845e49334 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -1031,7 +1031,7 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
         dpm_wait_for_children(dev, async);
 
         if (async_error)
-                return 0;
+                goto Complete;
 
         pm_runtime_get_noresume(dev);
         if (pm_runtime_barrier(dev) && device_may_wakeup(dev))
@@ -1040,7 +1040,7 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
         if (pm_wakeup_pending()) {
                 pm_runtime_put_sync(dev);
                 async_error = -EBUSY;
-                return 0;
+                goto Complete;
         }
 
         device_lock(dev);
@@ -1097,6 +1097,8 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
         }
 
         device_unlock(dev);
+
+ Complete:
         complete_all(&dev->power.completion);
 
         if (error) {
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 0bcda488f11c..c89aa01fb1de 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -246,11 +246,11 @@ struct regmap *regmap_init(struct device *dev,
                 map->lock = regmap_lock_mutex;
                 map->unlock = regmap_unlock_mutex;
         }
-        map->format.buf_size = (config->reg_bits + config->val_bits) / 8;
         map->format.reg_bytes = DIV_ROUND_UP(config->reg_bits, 8);
         map->format.pad_bytes = config->pad_bits / 8;
         map->format.val_bytes = DIV_ROUND_UP(config->val_bits, 8);
-        map->format.buf_size += map->format.pad_bytes;
+        map->format.buf_size = DIV_ROUND_UP(config->reg_bits +
+                        config->val_bits + config->pad_bits, 8);
         map->reg_shift = config->pad_bits % 8;
         if (config->reg_stride)
                 map->reg_stride = config->reg_stride;
@@ -368,7 +368,7 @@ struct regmap *regmap_init(struct device *dev,
 
         ret = regcache_init(map, config);
         if (ret < 0)
-                goto err_free_workbuf;
+                goto err_debugfs;
 
         /* Add a devres resource for dev_get_regmap() */
         m = devres_alloc(dev_get_regmap_release, sizeof(*m), GFP_KERNEL);
@@ -383,7 +383,8 @@ struct regmap *regmap_init(struct device *dev,
 
 err_cache:
         regcache_exit(map);
-err_free_workbuf:
+err_debugfs:
+        regmap_debugfs_exit(map);
         kfree(map->work_buf);
 err_map:
         kfree(map);
@@ -471,6 +472,7 @@ int regmap_reinit_cache(struct regmap *map, const struct regmap_config *config)
 
         return ret;
 }
+EXPORT_SYMBOL_GPL(regmap_reinit_cache);
 
 /**
  * regmap_exit(): Free a previously allocated register map
diff --git a/drivers/bcma/driver_chipcommon_pmu.c b/drivers/bcma/driver_chipcommon_pmu.c
index a058842f14fd..61ce4054b3c3 100644
--- a/drivers/bcma/driver_chipcommon_pmu.c
+++ b/drivers/bcma/driver_chipcommon_pmu.c
@@ -139,7 +139,9 @@ void bcma_pmu_workarounds(struct bcma_drv_cc *cc)
                 bcma_chipco_chipctl_maskset(cc, 0, ~0, 0x7);
                 break;
         case 0x4331:
-                /* BCM4331 workaround is SPROM-related, we put it in sprom.c */
+        case 43431:
+                /* Ext PA lines must be enabled for tx on BCM4331 */
+                bcma_chipco_bcm4331_ext_pa_lines_ctl(cc, true);
                 break;
         case 43224:
                 if (bus->chipinfo.rev == 0) {
diff --git a/drivers/bcma/driver_pci.c b/drivers/bcma/driver_pci.c
index 9a96f14c8f47..c32ebd537abe 100644
--- a/drivers/bcma/driver_pci.c
+++ b/drivers/bcma/driver_pci.c
@@ -232,17 +232,19 @@ void __devinit bcma_core_pci_init(struct bcma_drv_pci *pc)
 int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc, struct bcma_device *core,
                           bool enable)
 {
-        struct pci_dev *pdev = pc->core->bus->host_pci;
+        struct pci_dev *pdev;
         u32 coremask, tmp;
         int err = 0;
 
-        if (core->bus->hosttype != BCMA_HOSTTYPE_PCI) {
+        if (!pc || core->bus->hosttype != BCMA_HOSTTYPE_PCI) {
                 /* This bcma device is not on a PCI host-bus. So the IRQs are
                  * not routed through the PCI core.
                  * So we must not enable routing through the PCI core. */
                 goto out;
         }
 
+        pdev = pc->core->bus->host_pci;
+
         err = pci_read_config_dword(pdev, BCMA_PCI_IRQMASK, &tmp);
         if (err)
                 goto out;
diff --git a/drivers/bcma/sprom.c b/drivers/bcma/sprom.c
index c7f93359acb0..f16f42d36071 100644
--- a/drivers/bcma/sprom.c
+++ b/drivers/bcma/sprom.c
@@ -579,13 +579,13 @@ int bcma_sprom_get(struct bcma_bus *bus)
         if (!sprom)
                 return -ENOMEM;
 
-        if (bus->chipinfo.id == 0x4331)
+        if (bus->chipinfo.id == 0x4331 || bus->chipinfo.id == 43431)
                 bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, false);
 
         pr_debug("SPROM offset 0x%x\n", offset);
         bcma_sprom_read(bus, offset, sprom);
 
-        if (bus->chipinfo.id == 0x4331)
+        if (bus->chipinfo.id == 0x4331 || bus->chipinfo.id == 43431)
                 bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, true);
 
         err = bcma_sprom_valid(sprom);
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index ad591bd240ec..10308cd8a7ed 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -63,6 +63,7 @@ static struct usb_device_id ath3k_table[] = {
 
         /* Atheros AR3011 with sflash firmware*/
         { USB_DEVICE(0x0CF3, 0x3002) },
+        { USB_DEVICE(0x0CF3, 0xE019) },
         { USB_DEVICE(0x13d3, 0x3304) },
         { USB_DEVICE(0x0930, 0x0215) },
         { USB_DEVICE(0x0489, 0xE03D) },
@@ -77,6 +78,7 @@ static struct usb_device_id ath3k_table[] = {
         { USB_DEVICE(0x04CA, 0x3005) },
         { USB_DEVICE(0x13d3, 0x3362) },
         { USB_DEVICE(0x0CF3, 0xE004) },
+        { USB_DEVICE(0x0930, 0x0219) },
 
         /* Atheros AR5BBU12 with sflash firmware */
         { USB_DEVICE(0x0489, 0xE02C) },
@@ -101,6 +103,7 @@ static struct usb_device_id ath3k_blist_tbl[] = {
         { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
 
         /* Atheros AR5BBU22 with sflash firmware */
         { USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 },
diff --git a/drivers/bluetooth/btmrvl_drv.h b/drivers/bluetooth/btmrvl_drv.h
index 94f2d65131c4..27068d149380 100644
--- a/drivers/bluetooth/btmrvl_drv.h
+++ b/drivers/bluetooth/btmrvl_drv.h
@@ -136,7 +136,7 @@ int btmrvl_remove_card(struct btmrvl_private *priv);
 
 void btmrvl_interrupt(struct btmrvl_private *priv);
 
-void btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb);
+bool btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb);
 int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb);
 
 int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd);
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index 681ca9d18e12..dc304def8400 100644
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -44,23 +44,33 @@ void btmrvl_interrupt(struct btmrvl_private *priv)
 }
 EXPORT_SYMBOL_GPL(btmrvl_interrupt);
 
-void btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb)
+bool btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb)
 {
         struct hci_event_hdr *hdr = (void *) skb->data;
         struct hci_ev_cmd_complete *ec;
-        u16 opcode, ocf;
+        u16 opcode, ocf, ogf;
 
         if (hdr->evt == HCI_EV_CMD_COMPLETE) {
                 ec = (void *) (skb->data + HCI_EVENT_HDR_SIZE);
                 opcode = __le16_to_cpu(ec->opcode);
                 ocf = hci_opcode_ocf(opcode);
+                ogf = hci_opcode_ogf(opcode);
+
                 if (ocf == BT_CMD_MODULE_CFG_REQ &&
                                         priv->btmrvl_dev.sendcmdflag) {
                         priv->btmrvl_dev.sendcmdflag = false;
                         priv->adapter->cmd_complete = true;
                         wake_up_interruptible(&priv->adapter->cmd_wait_q);
                 }
+
+                if (ogf == OGF) {
+                        BT_DBG("vendor event skipped: ogf 0x%4.4x", ogf);
+                        kfree_skb(skb);
+                        return false;
+                }
         }
+
+        return true;
 }
 EXPORT_SYMBOL_GPL(btmrvl_check_evtpkt);
 
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index a853244e7fd7..0cd61d9f07cd 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -562,10 +562,12 @@ static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv)
                 skb_put(skb, buf_len);
                 skb_pull(skb, SDIO_HEADER_LEN);
 
-                if (type == HCI_EVENT_PKT)
-                        btmrvl_check_evtpkt(priv, skb);
+                if (type == HCI_EVENT_PKT) {
+                        if (btmrvl_check_evtpkt(priv, skb))
+                                hci_recv_frame(skb);
+                } else
+                        hci_recv_frame(skb);
 
-                hci_recv_frame(skb);
                 hdev->stat.byte_rx += buf_len;
                 break;
 
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index c9463af8e564..83ebb241bfcc 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -125,6 +125,7 @@ static struct usb_device_id blacklist_table[] = {
 
         /* Atheros 3011 with sflash firmware */
         { USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE },
+        { USB_DEVICE(0x0cf3, 0xe019), .driver_info = BTUSB_IGNORE },
         { USB_DEVICE(0x13d3, 0x3304), .driver_info = BTUSB_IGNORE },
         { USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE },
         { USB_DEVICE(0x0489, 0xe03d), .driver_info = BTUSB_IGNORE },
@@ -139,6 +140,7 @@ static struct usb_device_id blacklist_table[] = {
         { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
 
         /* Atheros AR5BBU12 with sflash firmware */
         { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
diff --git a/drivers/char/hw_random/atmel-rng.c b/drivers/char/hw_random/atmel-rng.c
index f518b99f53f5..731c9046cf7b 100644
--- a/drivers/char/hw_random/atmel-rng.c
+++ b/drivers/char/hw_random/atmel-rng.c
@@ -34,8 +34,15 @@ static int atmel_trng_read(struct hwrng *rng, void *buf, size_t max,
         u32 *data = buf;
 
         /* data ready? */
-        if (readl(trng->base + TRNG_ODATA) & 1) {
+        if (readl(trng->base + TRNG_ISR) & 1) {
                 *data = readl(trng->base + TRNG_ODATA);
+                /*
+                  ensure data ready is only set again AFTER the next data
+                  word is ready in case it got set between checking ISR
+                  and reading ODATA, so we don't risk re-reading the
+                  same word
+                */
+                readl(trng->base + TRNG_ISR);
                 return 4;
         } else
                 return 0;
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 687b00d67c8a..dcbe05616090 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -850,18 +850,21 @@ static void clk_change_rate(struct clk *clk)
 {
         struct clk *child;
         unsigned long old_rate;
+        unsigned long best_parent_rate = 0;
         struct hlist_node *tmp;
 
         old_rate = clk->rate;
 
+        if (clk->parent)
+                best_parent_rate = clk->parent->rate;
+
         if (clk->ops->set_rate)
-                clk->ops->set_rate(clk->hw, clk->new_rate, clk->parent->rate);
+                clk->ops->set_rate(clk->hw, clk->new_rate, best_parent_rate);
 
         if (clk->ops->recalc_rate)
-                clk->rate = clk->ops->recalc_rate(clk->hw,
-                                clk->parent->rate);
+                clk->rate = clk->ops->recalc_rate(clk->hw, best_parent_rate);
         else
-                clk->rate = clk->parent->rate;
+                clk->rate = best_parent_rate;
 
         if (clk->notifier_count && old_rate != clk->rate)
                 __clk_notify(clk, POST_RATE_CHANGE, old_rate, clk->rate);
@@ -999,7 +1002,7 @@ static struct clk *__clk_init_parent(struct clk *clk)
 
         if (!clk->parents)
                 clk->parents =
-                        kmalloc((sizeof(struct clk*) * clk->num_parents),
+                        kzalloc((sizeof(struct clk*) * clk->num_parents),
                                         GFP_KERNEL);
 
         if (!clk->parents)
@@ -1065,9 +1068,13 @@ static int __clk_set_parent(struct clk *clk, struct clk *parent)
         old_parent = clk->parent;
 
         /* find index of new parent clock using cached parent ptrs */
-        for (i = 0; i < clk->num_parents; i++)
-                if (clk->parents[i] == parent)
-                        break;
+        if (clk->parents)
+                for (i = 0; i < clk->num_parents; i++)
+                        if (clk->parents[i] == parent)
+                                break;
+        else
+                clk->parents = kzalloc((sizeof(struct clk*) * clk->num_parents),
+                                                                GFP_KERNEL);
 
         /*
          * find index of new parent clock using string name comparison
@@ -1076,7 +1083,8 @@ static int __clk_set_parent(struct clk *clk, struct clk *parent)
         if (i == clk->num_parents)
                 for (i = 0; i < clk->num_parents; i++)
                         if (!strcmp(clk->parent_names[i], parent->name)) {
-                                clk->parents[i] = __clk_lookup(parent->name);
+                                if (clk->parents)
+                                        clk->parents[i] = __clk_lookup(parent->name);
                                 break;
                         }
 
diff --git a/drivers/clk/mxs/clk-imx23.c b/drivers/clk/mxs/clk-imx23.c
index f7be225f544c..db2391c054ee 100644
--- a/drivers/clk/mxs/clk-imx23.c
+++ b/drivers/clk/mxs/clk-imx23.c
@@ -71,7 +71,7 @@ static void __init clk_misc_init(void)
         __mxs_setl(30 << BP_FRAC_IOFRAC, FRAC);
 }
 
-static struct clk_lookup uart_lookups[] __initdata = {
+static struct clk_lookup uart_lookups[] = {
         { .dev_id = "duart", },
         { .dev_id = "mxs-auart.0", },
         { .dev_id = "mxs-auart.1", },
@@ -80,31 +80,31 @@ static struct clk_lookup uart_lookups[] __initdata = {
         { .dev_id = "80070000.serial", },
 };
 
-static struct clk_lookup hbus_lookups[] __initdata = {
+static struct clk_lookup hbus_lookups[] = {
         { .dev_id = "imx23-dma-apbh", },
         { .dev_id = "80004000.dma-apbh", },
 };
 
-static struct clk_lookup xbus_lookups[] __initdata = {
+static struct clk_lookup xbus_lookups[] = {
         { .dev_id = "duart", .con_id = "apb_pclk"},
         { .dev_id = "80070000.serial", .con_id = "apb_pclk"},
         { .dev_id = "imx23-dma-apbx", },
         { .dev_id = "80024000.dma-apbx", },
 };
 
-static struct clk_lookup ssp_lookups[] __initdata = {
+static struct clk_lookup ssp_lookups[] = {
         { .dev_id = "imx23-mmc.0", },
         { .dev_id = "imx23-mmc.1", },
         { .dev_id = "80010000.ssp", },
         { .dev_id = "80034000.ssp", },
 };
 
-static struct clk_lookup lcdif_lookups[] __initdata = {
+static struct clk_lookup lcdif_lookups[] = {
         { .dev_id = "imx23-fb", },
         { .dev_id = "80030000.lcdif", },
 };
 
-static struct clk_lookup gpmi_lookups[] __initdata = {
+static struct clk_lookup gpmi_lookups[] = {
         { .dev_id = "imx23-gpmi-nand", },
         { .dev_id = "8000c000.gpmi", },
 };
diff --git a/drivers/clk/mxs/clk-imx28.c b/drivers/clk/mxs/clk-imx28.c
index 2826a2606a29..7fad6c8c13d2 100644
--- a/drivers/clk/mxs/clk-imx28.c
+++ b/drivers/clk/mxs/clk-imx28.c
@@ -120,7 +120,7 @@ static void __init clk_misc_init(void)
         writel_relaxed(val, FRAC0);
 }
 
-static struct clk_lookup uart_lookups[] __initdata = {
+static struct clk_lookup uart_lookups[] = {
         { .dev_id = "duart", },
         { .dev_id = "mxs-auart.0", },
         { .dev_id = "mxs-auart.1", },
@@ -135,71 +135,71 @@ static struct clk_lookup uart_lookups[] __initdata = {
         { .dev_id = "80074000.serial", },
 };
 
-static struct clk_lookup hbus_lookups[] __initdata = {
+static struct clk_lookup hbus_lookups[] = {
         { .dev_id = "imx28-dma-apbh", },
         { .dev_id = "80004000.dma-apbh", },
 };
 
-static struct clk_lookup xbus_lookups[] __initdata = {
+static struct clk_lookup xbus_lookups[] = {
         { .dev_id = "duart", .con_id = "apb_pclk"},
         { .dev_id = "80074000.serial", .con_id = "apb_pclk"},
         { .dev_id = "imx28-dma-apbx", },
         { .dev_id = "80024000.dma-apbx", },
 };
 
-static struct clk_lookup ssp0_lookups[] __initdata = {
+static struct clk_lookup ssp0_lookups[] = {
         { .dev_id = "imx28-mmc.0", },
         { .dev_id = "80010000.ssp", },
 };
 
-static struct clk_lookup ssp1_lookups[] __initdata = {
+static struct clk_lookup ssp1_lookups[] = {
         { .dev_id = "imx28-mmc.1", },
         { .dev_id = "80012000.ssp", },
 };
 
-static struct clk_lookup ssp2_lookups[] __initdata = {
+static struct clk_lookup ssp2_lookups[] = {
         { .dev_id = "imx28-mmc.2", },
         { .dev_id = "80014000.ssp", },
 };
 
-static struct clk_lookup ssp3_lookups[] __initdata = {
+static struct clk_lookup ssp3_lookups[] = {
         { .dev_id = "imx28-mmc.3", },
         { .dev_id = "80016000.ssp", },
 };
 
-static struct clk_lookup lcdif_lookups[] __initdata = {
+static struct clk_lookup lcdif_lookups[] = {
         { .dev_id = "imx28-fb", },
         { .dev_id = "80030000.lcdif", },
 };
 
-static struct clk_lookup gpmi_lookups[] __initdata = {
+static struct clk_lookup gpmi_lookups[] = {
         { .dev_id = "imx28-gpmi-nand", },
         { .dev_id = "8000c000.gpmi", },
 };
 
-static struct clk_lookup fec_lookups[] __initdata = {
+static struct clk_lookup fec_lookups[] = {
         { .dev_id = "imx28-fec.0", },
         { .dev_id = "imx28-fec.1", },
         { .dev_id = "800f0000.ethernet", },
         { .dev_id = "800f4000.ethernet", },
 };
 
-static struct clk_lookup can0_lookups[] __initdata = {
+static struct clk_lookup can0_lookups[] = {
         { .dev_id = "flexcan.0", },
         { .dev_id = "80032000.can", },
 };
 
-static struct clk_lookup can1_lookups[] __initdata = {
+static struct clk_lookup can1_lookups[] = {
         { .dev_id = "flexcan.1", },
         { .dev_id = "80034000.can", },
 };
 
-static struct clk_lookup saif0_lookups[] __initdata = {
+static struct clk_lookup saif0_lookups[] = {
         { .dev_id = "mxs-saif.0", },
         { .dev_id = "80042000.saif", },
 };
 
-static struct clk_lookup saif1_lookups[] __initdata = {
+static struct clk_lookup saif1_lookups[] = {
         { .dev_id = "mxs-saif.1", },
         { .dev_id = "80046000.saif", },
 };
@@ -245,8 +245,8 @@ int __init mx28_clocks_init(void)
         clks[pll2] = mxs_clk_pll("pll2", "ref_xtal", PLL2CTRL0, 23, 50000000);
         clks[ref_cpu] = mxs_clk_ref("ref_cpu", "pll0", FRAC0, 0);
         clks[ref_emi] = mxs_clk_ref("ref_emi", "pll0", FRAC0, 1);
-        clks[ref_io0] = mxs_clk_ref("ref_io0", "pll0", FRAC0, 2);
-        clks[ref_io1] = mxs_clk_ref("ref_io1", "pll0", FRAC0, 3);
+        clks[ref_io1] = mxs_clk_ref("ref_io1", "pll0", FRAC0, 2);
+        clks[ref_io0] = mxs_clk_ref("ref_io0", "pll0", FRAC0, 3);
         clks[ref_pix] = mxs_clk_ref("ref_pix", "pll0", FRAC1, 0);
         clks[ref_hsadc] = mxs_clk_ref("ref_hsadc", "pll0", FRAC1, 1);
         clks[ref_gpmi] = mxs_clk_ref("ref_gpmi", "pll0", FRAC1, 2);
diff --git a/drivers/clk/spear/clk-aux-synth.c b/drivers/clk/spear/clk-aux-synth.c
index af34074e702b..6756e7c3bc07 100644
--- a/drivers/clk/spear/clk-aux-synth.c
+++ b/drivers/clk/spear/clk-aux-synth.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/clk/spear/clk-frac-synth.c b/drivers/clk/spear/clk-frac-synth.c
index 4dbdb3fe18e0..958aa3ad1d60 100644
--- a/drivers/clk/spear/clk-frac-synth.c
+++ b/drivers/clk/spear/clk-frac-synth.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/clk/spear/clk-gpt-synth.c b/drivers/clk/spear/clk-gpt-synth.c
index b471c9762a97..1afc18c4effc 100644
--- a/drivers/clk/spear/clk-gpt-synth.c
+++ b/drivers/clk/spear/clk-gpt-synth.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/clk/spear/clk-vco-pll.c b/drivers/clk/spear/clk-vco-pll.c
index dcd4bdf4b0d9..5f1b6badeb15 100644
--- a/drivers/clk/spear/clk-vco-pll.c
+++ b/drivers/clk/spear/clk-vco-pll.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/clk/spear/clk.c b/drivers/clk/spear/clk.c
index 376d4e5ff326..7cd63788d546 100644
--- a/drivers/clk/spear/clk.c
+++ b/drivers/clk/spear/clk.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/clk/spear/clk.h b/drivers/clk/spear/clk.h
index 3321c46a071c..931737677dfa 100644
--- a/drivers/clk/spear/clk.h
+++ b/drivers/clk/spear/clk.h
@@ -2,7 +2,7 @@
  * Clock framework definitions for SPEAr platform
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/clk/spear/spear1310_clock.c b/drivers/clk/spear/spear1310_clock.c
index 42b68df9aeef..8f05652d53e6 100644
--- a/drivers/clk/spear/spear1310_clock.c
+++ b/drivers/clk/spear/spear1310_clock.c
@@ -4,7 +4,7 @@
  * SPEAr1310 machine clock framework source file
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/clk/spear/spear1340_clock.c b/drivers/clk/spear/spear1340_clock.c
index f130919d5bf8..e3ea72162236 100644
--- a/drivers/clk/spear/spear1340_clock.c
+++ b/drivers/clk/spear/spear1340_clock.c
@@ -4,7 +4,7 @@
  * SPEAr1340 machine clock framework source file
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/clk/spear/spear3xx_clock.c b/drivers/clk/spear/spear3xx_clock.c
index 440bb3e4c971..01dd6daff2a1 100644
--- a/drivers/clk/spear/spear3xx_clock.c
+++ b/drivers/clk/spear/spear3xx_clock.c
@@ -2,7 +2,7 @@
  * SPEAr3xx machines clock framework source file
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/clk/spear/spear6xx_clock.c b/drivers/clk/spear/spear6xx_clock.c
index f9a20b382304..61026ae564ab 100644
--- a/drivers/clk/spear/spear6xx_clock.c
+++ b/drivers/clk/spear/spear6xx_clock.c
@@ -2,7 +2,7 @@
  * SPEAr6xx machines clock framework source file
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
@@ -298,7 +298,7 @@ void __init spear6xx_clk_init(void)
 
         clk = clk_register_gate(NULL, "gmac_clk", "ahb_clk", 0, PERIP1_CLK_ENB,
                         GMAC_CLK_ENB, 0, &_lock);
-        clk_register_clkdev(clk, NULL, "gmac");
+        clk_register_clkdev(clk, NULL, "e0800000.ethernet");
 
         clk = clk_register_gate(NULL, "i2c_clk", "ahb_clk", 0, PERIP1_CLK_ENB,
                         I2C_CLK_ENB, 0, &_lock);
diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c
index 32fe9ef5cc5c..98b06baafcc6 100644
--- a/drivers/clocksource/sh_cmt.c
+++ b/drivers/clocksource/sh_cmt.c
@@ -48,13 +48,13 @@ struct sh_cmt_priv {
         unsigned long next_match_value;
         unsigned long max_match_value;
         unsigned long rate;
-        spinlock_t lock;
+        raw_spinlock_t lock;
         struct clock_event_device ced;
         struct clocksource cs;
         unsigned long total_cycles;
 };
 
-static DEFINE_SPINLOCK(sh_cmt_lock);
+static DEFINE_RAW_SPINLOCK(sh_cmt_lock);
 
 #define CMSTR -1 /* shared register */
 #define CMCSR 0 /* channel register */
@@ -139,7 +139,7 @@ static void sh_cmt_start_stop_ch(struct sh_cmt_priv *p, int start)
         unsigned long flags, value;
 
         /* start stop register shared by multiple timer channels */
-        spin_lock_irqsave(&sh_cmt_lock, flags);
+        raw_spin_lock_irqsave(&sh_cmt_lock, flags);
         value = sh_cmt_read(p, CMSTR);
 
         if (start)
@@ -148,7 +148,7 @@ static void sh_cmt_start_stop_ch(struct sh_cmt_priv *p, int start)
                 value &= ~(1 << cfg->timer_bit);
 
         sh_cmt_write(p, CMSTR, value);
-        spin_unlock_irqrestore(&sh_cmt_lock, flags);
+        raw_spin_unlock_irqrestore(&sh_cmt_lock, flags);
 }
 
 static int sh_cmt_enable(struct sh_cmt_priv *p, unsigned long *rate)
@@ -328,9 +328,9 @@ static void sh_cmt_set_next(struct sh_cmt_priv *p, unsigned long delta)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&p->lock, flags);
+        raw_spin_lock_irqsave(&p->lock, flags);
         __sh_cmt_set_next(p, delta);
-        spin_unlock_irqrestore(&p->lock, flags);
+        raw_spin_unlock_irqrestore(&p->lock, flags);
 }
 
 static irqreturn_t sh_cmt_interrupt(int irq, void *dev_id)
@@ -385,7 +385,7 @@ static int sh_cmt_start(struct sh_cmt_priv *p, unsigned long flag)
         int ret = 0;
         unsigned long flags;
 
-        spin_lock_irqsave(&p->lock, flags);
+        raw_spin_lock_irqsave(&p->lock, flags);
 
         if (!(p->flags & (FLAG_CLOCKEVENT | FLAG_CLOCKSOURCE)))
                 ret = sh_cmt_enable(p, &p->rate);
@@ -398,7 +398,7 @@ static int sh_cmt_start(struct sh_cmt_priv *p, unsigned long flag)
         if ((flag == FLAG_CLOCKSOURCE) && (!(p->flags & FLAG_CLOCKEVENT)))
                 __sh_cmt_set_next(p, p->max_match_value);
  out:
-        spin_unlock_irqrestore(&p->lock, flags);
+        raw_spin_unlock_irqrestore(&p->lock, flags);
 
         return ret;
 }
@@ -408,7 +408,7 @@ static void sh_cmt_stop(struct sh_cmt_priv *p, unsigned long flag)
         unsigned long flags;
         unsigned long f;
 
-        spin_lock_irqsave(&p->lock, flags);
+        raw_spin_lock_irqsave(&p->lock, flags);
 
         f = p->flags & (FLAG_CLOCKEVENT | FLAG_CLOCKSOURCE);
         p->flags &= ~flag;
@@ -420,7 +420,7 @@ static void sh_cmt_stop(struct sh_cmt_priv *p, unsigned long flag)
         if ((flag == FLAG_CLOCKEVENT) && (p->flags & FLAG_CLOCKSOURCE))
                 __sh_cmt_set_next(p, p->max_match_value);
 
-        spin_unlock_irqrestore(&p->lock, flags);
+        raw_spin_unlock_irqrestore(&p->lock, flags);
 }
 
 static struct sh_cmt_priv *cs_to_sh_cmt(struct clocksource *cs)
@@ -435,13 +435,13 @@ static cycle_t sh_cmt_clocksource_read(struct clocksource *cs)
         unsigned long value;
         int has_wrapped;
 
-        spin_lock_irqsave(&p->lock, flags);
+        raw_spin_lock_irqsave(&p->lock, flags);
         value = p->total_cycles;
         raw = sh_cmt_get_counter(p, &has_wrapped);
 
         if (unlikely(has_wrapped))
                 raw += p->match_value + 1;
-        spin_unlock_irqrestore(&p->lock, flags);
+        raw_spin_unlock_irqrestore(&p->lock, flags);
 
         return value + raw;
 }
@@ -591,7 +591,7 @@ static int sh_cmt_register(struct sh_cmt_priv *p, char *name,
                 p->max_match_value = (1 << p->width) - 1;
 
         p->match_value = p->max_match_value;
-        spin_lock_init(&p->lock);
+        raw_spin_lock_init(&p->lock);
 
         if (clockevent_rating)
                 sh_cmt_register_clockevent(p, name, clockevent_rating);
diff --git a/drivers/clocksource/sh_mtu2.c b/drivers/clocksource/sh_mtu2.c
index a2172f690418..d9b76ca64a61 100644
--- a/drivers/clocksource/sh_mtu2.c
+++ b/drivers/clocksource/sh_mtu2.c
@@ -43,7 +43,7 @@ struct sh_mtu2_priv {
         struct clock_event_device ced;
 };
 
-static DEFINE_SPINLOCK(sh_mtu2_lock);
+static DEFINE_RAW_SPINLOCK(sh_mtu2_lock);
 
 #define TSTR -1 /* shared register */
 #define TCR  0 /* channel register */
@@ -107,7 +107,7 @@ static void sh_mtu2_start_stop_ch(struct sh_mtu2_priv *p, int start)
         unsigned long flags, value;
 
         /* start stop register shared by multiple timer channels */
-        spin_lock_irqsave(&sh_mtu2_lock, flags);
+        raw_spin_lock_irqsave(&sh_mtu2_lock, flags);
         value = sh_mtu2_read(p, TSTR);
 
         if (start)
@@ -116,7 +116,7 @@ static void sh_mtu2_start_stop_ch(struct sh_mtu2_priv *p, int start)
                 value &= ~(1 << cfg->timer_bit);
 
         sh_mtu2_write(p, TSTR, value);
-        spin_unlock_irqrestore(&sh_mtu2_lock, flags);
+        raw_spin_unlock_irqrestore(&sh_mtu2_lock, flags);
 }
 
 static int sh_mtu2_enable(struct sh_mtu2_priv *p)
diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c
index 97f54b634be4..c1b51d49d106 100644
--- a/drivers/clocksource/sh_tmu.c
+++ b/drivers/clocksource/sh_tmu.c
@@ -45,7 +45,7 @@ struct sh_tmu_priv {
         struct clocksource cs;
 };
 
-static DEFINE_SPINLOCK(sh_tmu_lock);
+static DEFINE_RAW_SPINLOCK(sh_tmu_lock);
 
 #define TSTR -1 /* shared register */
 #define TCOR  0 /* channel register */
@@ -95,7 +95,7 @@ static void sh_tmu_start_stop_ch(struct sh_tmu_priv *p, int start)
         unsigned long flags, value;
 
         /* start stop register shared by multiple timer channels */
-        spin_lock_irqsave(&sh_tmu_lock, flags);
+        raw_spin_lock_irqsave(&sh_tmu_lock, flags);
         value = sh_tmu_read(p, TSTR);
 
         if (start)
@@ -104,7 +104,7 @@ static void sh_tmu_start_stop_ch(struct sh_tmu_priv *p, int start)
                 value &= ~(1 << cfg->timer_bit);
 
         sh_tmu_write(p, TSTR, value);
-        spin_unlock_irqrestore(&sh_tmu_lock, flags);
+        raw_spin_unlock_irqrestore(&sh_tmu_lock, flags);
 }
 
 static int sh_tmu_enable(struct sh_tmu_priv *p)
@@ -245,12 +245,7 @@ static void sh_tmu_clock_event_start(struct sh_tmu_priv *p, int periodic)
 
         sh_tmu_enable(p);
 
-        /* TODO: calculate good shift from rate and counter bit width */
-
-        ced->shift = 32;
-        ced->mult = div_sc(p->rate, NSEC_PER_SEC, ced->shift);
-        ced->max_delta_ns = clockevent_delta2ns(0xffffffff, ced);
-        ced->min_delta_ns = 5000;
+        clockevents_config(ced, p->rate);
 
         if (periodic) {
                 p->periodic = (p->rate + HZ/2) / HZ;
@@ -323,7 +318,8 @@ static void sh_tmu_register_clockevent(struct sh_tmu_priv *p,
         ced->set_mode = sh_tmu_clock_event_mode;
 
         dev_info(&p->pdev->dev, "used for clock events\n");
-        clockevents_register_device(ced);
+
+        clockevents_config_and_register(ced, 1, 0x300, 0xffffffff);
 
         ret = setup_irq(p->irqaction.irq, &p->irqaction);
         if (ret) {
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index e23dc82d43ac..721296157577 100644
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -1626,4 +1626,4 @@ module_exit(dw_exit);
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("Synopsys DesignWare DMA Controller driver");
 MODULE_AUTHOR("Haavard Skinnemoen (Atmel)");
-MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>");
+MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>");
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index fb4f4990f5eb..1dc2a4ad0026 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -815,8 +815,6 @@ static int sdma_request_channel(struct sdma_channel *sdmac)
 
         init_completion(&sdmac->done);
 
-        sdmac->buf_tail = 0;
-
         return 0;
 out:
 
@@ -927,6 +925,8 @@ static struct dma_async_tx_descriptor *sdma_prep_slave_sg(
 
         sdmac->flags = 0;
 
+        sdmac->buf_tail = 0;
+
         dev_dbg(sdma->dev, "setting up %d entries for channel %d.\n",
                         sg_len, channel);
 
@@ -1027,6 +1027,8 @@ static struct dma_async_tx_descriptor *sdma_prep_dma_cyclic(
 
         sdmac->status = DMA_IN_PROGRESS;
 
+        sdmac->buf_tail = 0;
+
         sdmac->flags |= IMX_DMA_SG_LOOP;
         sdmac->direction = direction;
         ret = sdma_load_context(sdmac);
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index cbcc28e79be6..e4feba6b03c0 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -392,6 +392,8 @@ struct pl330_req {
         struct pl330_reqcfg *cfg;
         /* Pointer to first xfer in the request. */
         struct pl330_xfer *x;
+        /* Hook to attach to DMAC's list of reqs with due callback */
+        struct list_head rqd;
 };
 
 /*
@@ -461,8 +463,6 @@ struct _pl330_req {
         /* Number of bytes taken to setup MC for the req */
         u32 mc_len;
         struct pl330_req *r;
-        /* Hook to attach to DMAC's list of reqs with due callback */
-        struct list_head rqd;
 };
 
 /* ToBeDone for tasklet */
@@ -1683,7 +1683,7 @@ static void pl330_dotask(unsigned long data)
 /* Returns 1 if state was updated, 0 otherwise */
 static int pl330_update(const struct pl330_info *pi)
 {
-        struct _pl330_req *rqdone;
+        struct pl330_req *rqdone, *tmp;
         struct pl330_dmac *pl330;
         unsigned long flags;
         void __iomem *regs;
@@ -1750,7 +1750,10 @@ static int pl330_update(const struct pl330_info *pi)
                         if (active == -1) /* Aborted */
                                 continue;
 
-                        rqdone = &thrd->req[active];
+                        /* Detach the req */
+                        rqdone = thrd->req[active].r;
+                        thrd->req[active].r = NULL;
+
                         mark_free(thrd, active);
 
                         /* Get going again ASAP */
@@ -1762,20 +1765,11 @@ static int pl330_update(const struct pl330_info *pi)
         }
 
         /* Now that we are in no hurry, do the callbacks */
-        while (!list_empty(&pl330->req_done)) {
-                struct pl330_req *r;
-
-                rqdone = container_of(pl330->req_done.next,
-                                        struct _pl330_req, rqd);
-
-                list_del_init(&rqdone->rqd);
-
-                /* Detach the req */
-                r = rqdone->r;
-                rqdone->r = NULL;
+        list_for_each_entry_safe(rqdone, tmp, &pl330->req_done, rqd) {
+                list_del(&rqdone->rqd);
 
                 spin_unlock_irqrestore(&pl330->lock, flags);
-                _callback(r, PL330_ERR_NONE);
+                _callback(rqdone, PL330_ERR_NONE);
                 spin_lock_irqsave(&pl330->lock, flags);
         }
 
@@ -2321,7 +2315,7 @@ static void pl330_tasklet(unsigned long data)
         /* Pick up ripe tomatoes */
         list_for_each_entry_safe(desc, _dt, &pch->work_list, node)
                 if (desc->status == DONE) {
-                        if (pch->cyclic)
+                        if (!pch->cyclic)
                                 dma_cookie_complete(&desc->txd);
                         list_move_tail(&desc->node, &list);
                 }
@@ -2539,7 +2533,7 @@ static inline void _init_desc(struct dma_pl330_desc *desc)
 }
 
 /* Returns the number of descriptors added to the DMAC pool */
-int add_desc(struct dma_pl330_dmac *pdmac, gfp_t flg, int count)
+static int add_desc(struct dma_pl330_dmac *pdmac, gfp_t flg, int count)
 {
         struct dma_pl330_desc *desc;
         unsigned long flags;
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 10f375032e96..de5ba86e8b89 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -164,7 +164,7 @@ void *edac_align_ptr(void **p, unsigned size, int n_elems)
         else
                 return (char *)ptr;
 
-        r = size % align;
+        r = (unsigned long)p % align;
 
         if (r == 0)
                 return (char *)ptr;
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
index d27778f65a5d..a499c7ed820a 100644
--- a/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
@@ -1814,12 +1814,6 @@ static int i7core_mce_check_error(struct notifier_block *nb, unsigned long val,
         if (mce->bank != 8)
                 return NOTIFY_DONE;
 
-#ifdef CONFIG_SMP
-        /* Only handle if it is the right mc controller */
-        if (mce->socketid != pvt->i7core_dev->socket)
-                return NOTIFY_DONE;
-#endif
-
         smp_rmb();
         if ((pvt->mce_out + 1) % MCE_LOG_LEN == pvt->mce_in) {
                 smp_wmb();
@@ -2116,8 +2110,6 @@ static void i7core_unregister_mci(struct i7core_dev *i7core_dev)
         if (pvt->enable_scrub)
                 disable_sdram_scrub_setting(mci);
 
-        mce_unregister_decode_chain(&i7_mce_dec);
-
         /* Disable EDAC polling */
         i7core_pci_ctl_release(pvt);
 
@@ -2222,8 +2214,6 @@ static int i7core_register_mci(struct i7core_dev *i7core_dev)
         /* DCLK for scrub rate setting */
         pvt->dclk_freq = get_dclk_freq();
 
-        mce_register_decode_chain(&i7_mce_dec);
-
         return 0;
 
 fail0:
@@ -2367,8 +2357,10 @@ static int __init i7core_init(void)
 
         pci_rc = pci_register_driver(&i7core_driver);
 
-        if (pci_rc >= 0)
+        if (pci_rc >= 0) {
+                mce_register_decode_chain(&i7_mce_dec);
                 return 0;
+        }
 
         i7core_printk(KERN_ERR, "Failed to register device with error %d.\n",
                       pci_rc);
@@ -2384,6 +2376,7 @@ static void __exit i7core_exit(void)
 {
         debugf2("MC: " __FILE__ ": %s()\n", __func__);
         pci_unregister_driver(&i7core_driver);
+        mce_unregister_decode_chain(&i7_mce_dec);
 }
 
 module_init(i7core_init);
diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
index 4c402353ba98..0e374625f6f8 100644
--- a/drivers/edac/mpc85xx_edac.c
+++ b/drivers/edac/mpc85xx_edac.c
@@ -980,7 +980,8 @@ static int __devinit mpc85xx_mc_err_probe(struct platform_device *op)
         layers[1].type = EDAC_MC_LAYER_CHANNEL;
         layers[1].size = 1;
         layers[1].is_virt_csrow = false;
-        mci = edac_mc_alloc(edac_mc_idx, ARRAY_SIZE(layers), sizeof(*pdata));
+        mci = edac_mc_alloc(edac_mc_idx, ARRAY_SIZE(layers), layers,
+                            sizeof(*pdata));
         if (!mci) {
                 devres_release_group(&op->dev, mpc85xx_mc_err_probe);
                 return -ENOMEM;
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index 4adaf4b7da99..36ad17e79d61 100644
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -555,7 +555,7 @@ static int get_dimm_config(struct mem_ctl_info *mci)
                 pvt->is_close_pg = false;
         }
 
-        pci_read_config_dword(pvt->pci_ta, RANK_CFG_A, &reg);
+        pci_read_config_dword(pvt->pci_ddrio, RANK_CFG_A, &reg);
         if (IS_RDIMM_ENABLED(reg)) {
                 /* FIXME: Can also be LRDIMM */
                 debugf0("Memory is registered\n");
@@ -1604,8 +1604,6 @@ static void sbridge_unregister_mci(struct sbridge_dev *sbridge_dev)
         debugf0("MC: " __FILE__ ": %s(): mci = %p, dev = %p\n",
                 __func__, mci, &sbridge_dev->pdev[0]->dev);
 
-        mce_unregister_decode_chain(&sbridge_mce_dec);
-
         /* Remove MC sysfs nodes */
         edac_mc_del_mc(mci->dev);
 
@@ -1682,7 +1680,6 @@ static int sbridge_register_mci(struct sbridge_dev *sbridge_dev)
                 goto fail0;
         }
 
-        mce_register_decode_chain(&sbridge_mce_dec);
         return 0;
 
 fail0:
@@ -1811,8 +1808,10 @@ static int __init sbridge_init(void)
 
         pci_rc = pci_register_driver(&sbridge_driver);
 
-        if (pci_rc >= 0)
+        if (pci_rc >= 0) {
+                mce_register_decode_chain(&sbridge_mce_dec);
                 return 0;
+        }
 
         sbridge_printk(KERN_ERR, "Failed to register device with error %d.\n",
                       pci_rc);
@@ -1828,6 +1827,7 @@ static void __exit sbridge_exit(void)
 {
         debugf2("MC: " __FILE__ ": %s()\n", __func__);
         pci_unregister_driver(&sbridge_driver);
+        mce_unregister_decode_chain(&sbridge_mce_dec);
 }
 
 module_init(sbridge_init);
diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c
index 23416e443765..a4ed30bd9a41 100644
--- a/drivers/extcon/extcon-max8997.c
+++ b/drivers/extcon/extcon-max8997.c
@@ -116,8 +116,8 @@ const char *max8997_extcon_cable[] = {
         [5] = "Charge-downstream",
         [6] = "MHL",
         [7] = "Dock-desk",
-        [7] = "Dock-card",
-        [8] = "JIG",
+        [8] = "Dock-card",
+        [9] = "JIG",
 
         NULL,
 };
@@ -514,6 +514,7 @@ static int __devexit max8997_muic_remove(struct platform_device *pdev)
 
         extcon_dev_unregister(info->edev);
 
+        kfree(info->edev);
         kfree(info);
 
         return 0;
diff --git a/drivers/extcon/extcon_class.c b/drivers/extcon/extcon_class.c
index 99f7227834e3..f6419f9db76c 100644
--- a/drivers/extcon/extcon_class.c
+++ b/drivers/extcon/extcon_class.c
@@ -762,7 +762,7 @@ int extcon_dev_register(struct extcon_dev *edev, struct device *dev)
 #if defined(CONFIG_ANDROID)
         if (switch_class)
                 ret = class_compat_create_link(switch_class, edev->dev,
-                                               dev);
+                                               NULL);
 #endif /* CONFIG_ANDROID */
 
         spin_lock_init(&edev->lock);
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index eb92fe257a39..5873e481e5d2 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -610,7 +610,7 @@ static bool
 drm_monitor_supports_rb(struct edid *edid)
 {
         if (edid->revision >= 4) {
-                bool ret;
+                bool ret = false;
                 drm_for_each_detailed_block((u8 *)edid, is_rb, &ret);
                 return ret;
         }
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index b1fe0edda955..ed3224c37423 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -412,7 +412,6 @@ static void gen6_queue_rps_work(struct drm_i915_private *dev_priv,
          */
 
         spin_lock_irqsave(&dev_priv->rps_lock, flags);
-        WARN(dev_priv->pm_iir & pm_iir, "Missed a PM interrupt\n");
         dev_priv->pm_iir |= pm_iir;
         I915_WRITE(GEN6_PMIMR, dev_priv->pm_iir);
         POSTING_READ(GEN6_PMIMR);
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index 0ede02a99d91..a748e5cabe14 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -740,8 +740,11 @@ static void i915_restore_display(struct drm_device *dev)
         if (HAS_PCH_SPLIT(dev)) {
                 I915_WRITE(BLC_PWM_PCH_CTL1, dev_priv->saveBLC_PWM_CTL);
                 I915_WRITE(BLC_PWM_PCH_CTL2, dev_priv->saveBLC_PWM_CTL2);
-                I915_WRITE(BLC_PWM_CPU_CTL, dev_priv->saveBLC_CPU_PWM_CTL);
+                /* NOTE: BLC_PWM_CPU_CTL must be written after BLC_PWM_CPU_CTL2;
+                 * otherwise we get blank eDP screen after S3 on some machines
+                 */
                 I915_WRITE(BLC_PWM_CPU_CTL2, dev_priv->saveBLC_CPU_PWM_CTL2);
+                I915_WRITE(BLC_PWM_CPU_CTL, dev_priv->saveBLC_CPU_PWM_CTL);
                 I915_WRITE(PCH_PP_ON_DELAYS, dev_priv->savePP_ON_DELAYS);
                 I915_WRITE(PCH_PP_OFF_DELAYS, dev_priv->savePP_OFF_DELAYS);
                 I915_WRITE(PCH_PP_DIVISOR, dev_priv->savePP_DIVISOR);
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index e0aa064def31..a8538ac0299d 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6558,7 +6558,7 @@ static void intel_setup_outputs(struct drm_device *dev)
                 if (I915_READ(HDMIC) & PORT_DETECTED)
                         intel_hdmi_init(dev, HDMIC);
 
-                if (I915_READ(HDMID) & PORT_DETECTED)
+                if (!dpd_is_edp && I915_READ(HDMID) & PORT_DETECTED)
                         intel_hdmi_init(dev, HDMID);
 
                 if (I915_READ(PCH_DP_C) & DP_DETECTED)
@@ -6921,19 +6921,6 @@ static void i915_disable_vga(struct drm_device *dev)
         POSTING_READ(vga_reg);
 }
 
-static void ivb_pch_pwm_override(struct drm_device *dev)
-{
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
-        /*
-         * IVB has CPU eDP backlight regs too, set things up to let the
-         * PCH regs control the backlight
-         */
-        I915_WRITE(BLC_PWM_CPU_CTL2, PWM_ENABLE);
-        I915_WRITE(BLC_PWM_CPU_CTL, 0);
-        I915_WRITE(BLC_PWM_PCH_CTL1, PWM_ENABLE | (1<<30));
-}
-
 void intel_modeset_init_hw(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
@@ -6950,9 +6937,6 @@ void intel_modeset_init_hw(struct drm_device *dev)
                 gen6_enable_rps(dev_priv);
                 gen6_update_ring_freq(dev_priv);
         }
-
-        if (IS_IVYBRIDGE(dev))
-                ivb_pch_pwm_override(dev);
 }
 
 void intel_modeset_init(struct drm_device *dev)
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 296cfc201a81..c0449324143c 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -32,6 +32,7 @@
 #include "drm.h"
 #include "drm_crtc.h"
 #include "drm_crtc_helper.h"
+#include "drm_edid.h"
 #include "intel_drv.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
@@ -67,6 +68,8 @@ struct intel_dp {
         struct drm_display_mode *panel_fixed_mode;  /* for eDP */
         struct delayed_work panel_vdd_work;
         bool want_panel_vdd;
+        struct edid *edid; /* cached EDID for eDP */
+        int edid_mode_count;
 };
 
 /**
@@ -371,7 +374,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
         int recv_bytes;
         uint32_t status;
         uint32_t aux_clock_divider;
-        int try, precharge = 5;
+        int try, precharge;
 
         intel_dp_check_edp(intel_dp);
         /* The clock divider is based off the hrawclk,
@@ -391,6 +394,11 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
         else
                 aux_clock_divider = intel_hrawclk(dev) / 2;
 
+        if (IS_GEN6(dev))
+                precharge = 3;
+        else
+                precharge = 5;
+
         /* Try to wait for any previous AUX channel activity */
         for (try = 0; try < 3; try++) {
                 status = I915_READ(ch_ctl);
@@ -1973,6 +1981,8 @@ intel_dp_probe_oui(struct intel_dp *intel_dp)
         if (!(intel_dp->dpcd[DP_DOWN_STREAM_PORT_COUNT] & DP_OUI_SUPPORT))
                 return;
 
+        ironlake_edp_panel_vdd_on(intel_dp);
+
         if (intel_dp_aux_native_read_retry(intel_dp, DP_SINK_OUI, buf, 3))
                 DRM_DEBUG_KMS("Sink OUI: %02hx%02hx%02hx\n",
                               buf[0], buf[1], buf[2]);
@@ -1980,6 +1990,8 @@ intel_dp_probe_oui(struct intel_dp *intel_dp)
         if (intel_dp_aux_native_read_retry(intel_dp, DP_BRANCH_OUI, buf, 3))
                 DRM_DEBUG_KMS("Branch OUI: %02hx%02hx%02hx\n",
                               buf[0], buf[1], buf[2]);
+
+        ironlake_edp_panel_vdd_off(intel_dp, false);
 }
 
 static bool
@@ -2116,10 +2128,22 @@ intel_dp_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter)
 {
         struct intel_dp *intel_dp = intel_attached_dp(connector);
         struct edid     *edid;
+        int size;
+
+        if (is_edp(intel_dp)) {
+                if (!intel_dp->edid)
+                        return NULL;
+
+                size = (intel_dp->edid->extensions + 1) * EDID_LENGTH;
+                edid = kmalloc(size, GFP_KERNEL);
+                if (!edid)
+                        return NULL;
+
+                memcpy(edid, intel_dp->edid, size);
+                return edid;
+        }
 
-        ironlake_edp_panel_vdd_on(intel_dp);
         edid = drm_get_edid(connector, adapter);
-        ironlake_edp_panel_vdd_off(intel_dp, false);
         return edid;
 }
 
@@ -2129,9 +2153,17 @@ intel_dp_get_edid_modes(struct drm_connector *connector, struct i2c_adapter *ada
         struct intel_dp *intel_dp = intel_attached_dp(connector);
         int     ret;
 
-        ironlake_edp_panel_vdd_on(intel_dp);
+        if (is_edp(intel_dp)) {
+                drm_mode_connector_update_edid_property(connector,
+                                                        intel_dp->edid);
+                ret = drm_add_edid_modes(connector, intel_dp->edid);
+                drm_edid_to_eld(connector,
+                                intel_dp->edid);
+                connector->display_info.raw_edid = NULL;
+                return intel_dp->edid_mode_count;
+        }
+
         ret = intel_ddc_get_modes(connector, adapter);
-        ironlake_edp_panel_vdd_off(intel_dp, false);
         return ret;
 }
 
@@ -2321,6 +2353,7 @@ static void intel_dp_encoder_destroy(struct drm_encoder *encoder)
         i2c_del_adapter(&intel_dp->adapter);
         drm_encoder_cleanup(encoder);
         if (is_edp(intel_dp)) {
+                kfree(intel_dp->edid);
                 cancel_delayed_work_sync(&intel_dp->panel_vdd_work);
                 ironlake_panel_vdd_off_sync(intel_dp);
         }
@@ -2504,11 +2537,14 @@ intel_dp_init(struct drm_device *dev, int output_reg)
                         break;
         }
 
+        intel_dp_i2c_init(intel_dp, intel_connector, name);
+
         /* Cache some DPCD data in the eDP case */
         if (is_edp(intel_dp)) {
                 bool ret;
                 struct edp_power_seq    cur, vbt;
                 u32 pp_on, pp_off, pp_div;
+                struct edid *edid;
 
                 pp_on = I915_READ(PCH_PP_ON_DELAYS);
                 pp_off = I915_READ(PCH_PP_OFF_DELAYS);
@@ -2576,9 +2612,19 @@ intel_dp_init(struct drm_device *dev, int output_reg)
                         intel_dp_destroy(&intel_connector->base);
                         return;
                 }
-        }
 
-        intel_dp_i2c_init(intel_dp, intel_connector, name);
+                ironlake_edp_panel_vdd_on(intel_dp);
+                edid = drm_get_edid(connector, &intel_dp->adapter);
+                if (edid) {
+                        drm_mode_connector_update_edid_property(connector,
+                                                                edid);
+                        intel_dp->edid_mode_count =
+                                drm_add_edid_modes(connector, edid);
+                        drm_edid_to_eld(connector, edid);
+                        intel_dp->edid = edid;
+                }
+                ironlake_edp_panel_vdd_off(intel_dp, false);
+        }
 
         intel_encoder->hot_plug = intel_dp_hot_plug;
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index 153b9a15469b..1074bc5dd418 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -467,7 +467,7 @@ int nouveau_fbcon_init(struct drm_device *dev)
         nfbdev->helper.funcs = &nouveau_fbcon_helper_funcs;
 
         ret = drm_fb_helper_init(dev, &nfbdev->helper,
-                                 nv_two_heads(dev) ? 2 : 1, 4);
+                                 dev->mode_config.num_crtc, 4);
         if (ret) {
                 kfree(nfbdev);
                 return ret;
diff --git a/drivers/gpu/drm/nouveau/nouveau_prime.c b/drivers/gpu/drm/nouveau/nouveau_prime.c
index a89240e5fb29..a25cf2cb931f 100644
--- a/drivers/gpu/drm/nouveau/nouveau_prime.c
+++ b/drivers/gpu/drm/nouveau/nouveau_prime.c
@@ -1,3 +1,26 @@
+/*
+ * Copyright 2011 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Dave Airlie
+ */
 
 #include "drmP.h"
 #include "drm.h"
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index 01d77d1554f4..3904d7964a4b 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -1149,7 +1149,9 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc,
         }
 
         if (tiling_flags & RADEON_TILING_MACRO) {
-                if (rdev->family >= CHIP_CAYMAN)
+                if (rdev->family >= CHIP_TAHITI)
+                        tmp = rdev->config.si.tile_config;
+                else if (rdev->family >= CHIP_CAYMAN)
                         tmp = rdev->config.cayman.tile_config;
                 else
                         tmp = rdev->config.evergreen.tile_config;
@@ -1177,6 +1179,12 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc,
         } else if (tiling_flags & RADEON_TILING_MICRO)
                 fb_format |= EVERGREEN_GRPH_ARRAY_MODE(EVERGREEN_GRPH_ARRAY_1D_TILED_THIN1);
 
+        if ((rdev->family == CHIP_TAHITI) ||
+            (rdev->family == CHIP_PITCAIRN))
+                fb_format |= SI_GRPH_PIPE_CONFIG(SI_ADDR_SURF_P8_32x32_8x16);
+        else if (rdev->family == CHIP_VERDE)
+                fb_format |= SI_GRPH_PIPE_CONFIG(SI_ADDR_SURF_P4_8x16);
+
         switch (radeon_crtc->crtc_id) {
         case 0:
                 WREG32(AVIVO_D1VGA_CONTROL, 0);
diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c
index e7b1ec5ae8c6..486ccdf4aacd 100644
--- a/drivers/gpu/drm/radeon/atombios_encoders.c
+++ b/drivers/gpu/drm/radeon/atombios_encoders.c
@@ -1926,7 +1926,9 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder,
 
         if (atombios_get_encoder_mode(encoder) == ATOM_ENCODER_MODE_HDMI) {
                 r600_hdmi_enable(encoder);
-                if (ASIC_IS_DCE4(rdev))
+                if (ASIC_IS_DCE6(rdev))
+                        ; /* TODO (use pointers instead of if-s?) */
+                else if (ASIC_IS_DCE4(rdev))
                         evergreen_hdmi_setmode(encoder, adjusted_mode);
                 else
                         r600_hdmi_setmode(encoder, adjusted_mode);
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index 01550d05e273..7fb3d2e0434c 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -1932,6 +1932,9 @@ static void evergreen_gpu_init(struct radeon_device *rdev)
         smx_dc_ctl0 |= NUMBER_OF_SETS(rdev->config.evergreen.sx_num_of_sets);
         WREG32(SMX_DC_CTL0, smx_dc_ctl0);
 
+        if (rdev->family <= CHIP_SUMO2)
+                WREG32(SMX_SAR_CTL0, 0x00010000);
+
         WREG32(SX_EXPORT_BUFFER_SIZES, (COLOR_BUFFER_SIZE((rdev->config.evergreen.sx_max_export_size / 4) - 1) |
                                         POSITION_BUFFER_SIZE((rdev->config.evergreen.sx_max_export_pos_size / 4) - 1) |
                                         SMX_BUFFER_SIZE((rdev->config.evergreen.sx_max_export_smx_size / 4) - 1)));
diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c
index 4e7dd2b4843d..c16554122ccd 100644
--- a/drivers/gpu/drm/radeon/evergreen_cs.c
+++ b/drivers/gpu/drm/radeon/evergreen_cs.c
@@ -52,6 +52,7 @@ struct evergreen_cs_track {
         u32                     cb_color_view[12];
         u32                     cb_color_pitch[12];
         u32                     cb_color_slice[12];
+        u32                     cb_color_slice_idx[12];
         u32                     cb_color_attrib[12];
         u32                     cb_color_cmask_slice[8];/* unused */
         u32                     cb_color_fmask_slice[8];/* unused */
@@ -127,12 +128,14 @@ static void evergreen_cs_track_init(struct evergreen_cs_track *track)
                 track->cb_color_info[i] = 0;
                 track->cb_color_view[i] = 0xFFFFFFFF;
                 track->cb_color_pitch[i] = 0;
-                track->cb_color_slice[i] = 0;
+                track->cb_color_slice[i] = 0xfffffff;
+                track->cb_color_slice_idx[i] = 0;
         }
         track->cb_target_mask = 0xFFFFFFFF;
         track->cb_shader_mask = 0xFFFFFFFF;
         track->cb_dirty = true;
 
+        track->db_depth_slice = 0xffffffff;
         track->db_depth_view = 0xFFFFC000;
         track->db_depth_size = 0xFFFFFFFF;
         track->db_depth_control = 0xFFFFFFFF;
@@ -250,10 +253,9 @@ static int evergreen_surface_check_2d(struct radeon_cs_parser *p,
 {
         struct evergreen_cs_track *track = p->track;
         unsigned palign, halign, tileb, slice_pt;
+        unsigned mtile_pr, mtile_ps, mtileb;
 
         tileb = 64 * surf->bpe * surf->nsamples;
-        palign = track->group_size / (8 * surf->bpe * surf->nsamples);
-        palign = MAX(8, palign);
         slice_pt = 1;
         if (tileb > surf->tsplit) {
                 slice_pt = tileb / surf->tsplit;
@@ -262,7 +264,10 @@ static int evergreen_surface_check_2d(struct radeon_cs_parser *p,
         /* macro tile width & height */
         palign = (8 * surf->bankw * track->npipes) * surf->mtilea;
         halign = (8 * surf->bankh * surf->nbanks) / surf->mtilea;
-        surf->layer_size = surf->nbx * surf->nby * surf->bpe * slice_pt;
+        mtileb = (palign / 8) * (halign / 8) * tileb;;
+        mtile_pr = surf->nbx / palign;
+        mtile_ps = (mtile_pr * surf->nby) / halign;
+        surf->layer_size = mtile_ps * mtileb * slice_pt;
         surf->base_align = (palign / 8) * (halign / 8) * tileb;
         surf->palign = palign;
         surf->halign = halign;
@@ -434,6 +439,39 @@ static int evergreen_cs_track_validate_cb(struct radeon_cs_parser *p, unsigned i
 
         offset += surf.layer_size * mslice;
         if (offset > radeon_bo_size(track->cb_color_bo[id])) {
+                /* old ddx are broken they allocate bo with w*h*bpp but
+                 * program slice with ALIGN(h, 8), catch this and patch
+                 * command stream.
+                 */
+                if (!surf.mode) {
+                        volatile u32 *ib = p->ib.ptr;
+                        unsigned long tmp, nby, bsize, size, min = 0;
+
+                        /* find the height the ddx wants */
+                        if (surf.nby > 8) {
+                                min = surf.nby - 8;
+                        }
+                        bsize = radeon_bo_size(track->cb_color_bo[id]);
+                        tmp = track->cb_color_bo_offset[id] << 8;
+                        for (nby = surf.nby; nby > min; nby--) {
+                                size = nby * surf.nbx * surf.bpe * surf.nsamples;
+                                if ((tmp + size * mslice) <= bsize) {
+                                        break;
+                                }
+                        }
+                        if (nby > min) {
+                                surf.nby = nby;
+                                slice = ((nby * surf.nbx) / 64) - 1;
+                                if (!evergreen_surface_check(p, &surf, "cb")) {
+                                        /* check if this one works */
+                                        tmp += surf.layer_size * mslice;
+                                        if (tmp <= bsize) {
+                                                ib[track->cb_color_slice_idx[id]] = slice;
+                                                goto old_ddx_ok;
+                                        }
+                                }
+                        }
+                }
                 dev_warn(p->dev, "%s:%d cb[%d] bo too small (layer size %d, "
                          "offset %d, max layer %d, bo size %ld, slice %d)\n",
                          __func__, __LINE__, id, surf.layer_size,
@@ -446,6 +484,7 @@ static int evergreen_cs_track_validate_cb(struct radeon_cs_parser *p, unsigned i
                         surf.tsplit, surf.mtilea);
                 return -EINVAL;
         }
+old_ddx_ok:
 
         return 0;
 }
@@ -1532,6 +1571,7 @@ static int evergreen_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)
         case CB_COLOR7_SLICE:
                 tmp = (reg - CB_COLOR0_SLICE) / 0x3c;
                 track->cb_color_slice[tmp] = radeon_get_ib_value(p, idx);
+                track->cb_color_slice_idx[tmp] = idx;
                 track->cb_dirty = true;
                 break;
         case CB_COLOR8_SLICE:
@@ -1540,6 +1580,7 @@ static int evergreen_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)
         case CB_COLOR11_SLICE:
                 tmp = ((reg - CB_COLOR8_SLICE) / 0x1c) + 8;
                 track->cb_color_slice[tmp] = radeon_get_ib_value(p, idx);
+                track->cb_color_slice_idx[tmp] = idx;
                 track->cb_dirty = true;
                 break;
         case CB_COLOR0_ATTRIB:
diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c
index a51f880985f8..65c54160028b 100644
--- a/drivers/gpu/drm/radeon/evergreen_hdmi.c
+++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c
@@ -156,9 +156,6 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode
         struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
         uint32_t offset;
 
-        if (ASIC_IS_DCE5(rdev))
-                return;
-
         /* Silent, r600_hdmi_enable will raise WARN for us */
         if (!dig->afmt->enabled)
                 return;
diff --git a/drivers/gpu/drm/radeon/evergreend.h b/drivers/gpu/drm/radeon/evergreend.h
index 2773039b4902..b50b15c70498 100644
--- a/drivers/gpu/drm/radeon/evergreend.h
+++ b/drivers/gpu/drm/radeon/evergreend.h
@@ -503,6 +503,7 @@
 #define SCRATCH_UMSK                                    0x8540
 #define SCRATCH_ADDR                                    0x8544
 
+#define SMX_SAR_CTL0                                    0xA008
 #define SMX_DC_CTL0                                     0xA020
 #define         USE_HASH_FUNCTION                               (1 << 0)
 #define         NUMBER_OF_SETS(x)                               ((x) << 1)
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index 3186522a4458..b7bf18e40215 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -1303,6 +1303,10 @@ static int cayman_startup(struct radeon_device *rdev)
         if (r)
                 return r;
 
+        r = r600_audio_init(rdev);
+        if (r)
+                return r;
+
         return 0;
 }
 
@@ -1329,6 +1333,7 @@ int cayman_resume(struct radeon_device *rdev)
 
 int cayman_suspend(struct radeon_device *rdev)
 {
+        r600_audio_fini(rdev);
         /* FIXME: we should wait for ring to be empty */
         radeon_ib_pool_suspend(rdev);
         radeon_vm_manager_suspend(rdev);
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index f30dc95f83b1..bff627293812 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -1839,6 +1839,7 @@ void r600_gpu_init(struct radeon_device *rdev)
         WREG32(PA_CL_ENHANCE, (CLIP_VTX_REORDER_ENA |
                                NUM_CLIP_SEQ(3)));
         WREG32(PA_SC_ENHANCE, FORCE_EOV_MAX_CLK_CNT(4095));
+        WREG32(VC_ENHANCE, 0);
 }
 
 
diff --git a/drivers/gpu/drm/radeon/r600_audio.c b/drivers/gpu/drm/radeon/r600_audio.c
index 7479a5c503e4..79b55916cf90 100644
--- a/drivers/gpu/drm/radeon/r600_audio.c
+++ b/drivers/gpu/drm/radeon/r600_audio.c
@@ -57,7 +57,7 @@ static bool radeon_dig_encoder(struct drm_encoder *encoder)
  */
 static int r600_audio_chipset_supported(struct radeon_device *rdev)
 {
-        return (rdev->family >= CHIP_R600 && !ASIC_IS_DCE5(rdev))
+        return (rdev->family >= CHIP_R600 && !ASIC_IS_DCE6(rdev))
                 || rdev->family == CHIP_RS600
                 || rdev->family == CHIP_RS690
                 || rdev->family == CHIP_RS740;
diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c
index 0133f5f09bd6..ca87f7afaf23 100644
--- a/drivers/gpu/drm/radeon/r600_cs.c
+++ b/drivers/gpu/drm/radeon/r600_cs.c
@@ -2079,6 +2079,48 @@ static int r600_packet3_check(struct radeon_cs_parser *p,
                         return -EINVAL;
                 }
                 break;
+        case PACKET3_STRMOUT_BASE_UPDATE:
+                if (p->family < CHIP_RV770) {
+                        DRM_ERROR("STRMOUT_BASE_UPDATE only supported on 7xx\n");
+                        return -EINVAL;
+                }
+                if (pkt->count != 1) {
+                        DRM_ERROR("bad STRMOUT_BASE_UPDATE packet count\n");
+                        return -EINVAL;
+                }
+                if (idx_value > 3) {
+                        DRM_ERROR("bad STRMOUT_BASE_UPDATE index\n");
+                        return -EINVAL;
+                }
+                {
+                        u64 offset;
+
+                        r = r600_cs_packet_next_reloc(p, &reloc);
+                        if (r) {
+                                DRM_ERROR("bad STRMOUT_BASE_UPDATE reloc\n");
+                                return -EINVAL;
+                        }
+
+                        if (reloc->robj != track->vgt_strmout_bo[idx_value]) {
+                                DRM_ERROR("bad STRMOUT_BASE_UPDATE, bo does not match\n");
+                                return -EINVAL;
+                        }
+
+                        offset = radeon_get_ib_value(p, idx+1) << 8;
+                        if (offset != track->vgt_strmout_bo_offset[idx_value]) {
+                                DRM_ERROR("bad STRMOUT_BASE_UPDATE, bo offset does not match: 0x%llx, 0x%x\n",
+                                          offset, track->vgt_strmout_bo_offset[idx_value]);
+                                return -EINVAL;
+                        }
+
+                        if ((offset + 4) > radeon_bo_size(reloc->robj)) {
+                                DRM_ERROR("bad STRMOUT_BASE_UPDATE bo too small: 0x%llx, 0x%lx\n",
+                                          offset + 4, radeon_bo_size(reloc->robj));
+                                return -EINVAL;
+                        }
+                        ib[idx+1] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff);
+                }
+                break;
         case PACKET3_SURFACE_BASE_UPDATE:
                 if (p->family >= CHIP_RV770 || p->family == CHIP_R600) {
                         DRM_ERROR("bad SURFACE_BASE_UPDATE\n");
diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
index 969c27529dfe..82a0a4c919c0 100644
--- a/drivers/gpu/drm/radeon/r600_hdmi.c
+++ b/drivers/gpu/drm/radeon/r600_hdmi.c
@@ -322,9 +322,6 @@ void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mod
         struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
         uint32_t offset;
 
-        if (ASIC_IS_DCE5(rdev))
-                return;
-
         /* Silent, r600_hdmi_enable will raise WARN for us */
         if (!dig->afmt->enabled)
                 return;
@@ -483,7 +480,7 @@ void r600_hdmi_enable(struct drm_encoder *encoder)
         uint32_t offset;
         u32 hdmi;
 
-        if (ASIC_IS_DCE5(rdev))
+        if (ASIC_IS_DCE6(rdev))
                 return;
 
         /* Silent, r600_hdmi_enable will raise WARN for us */
@@ -543,7 +540,7 @@ void r600_hdmi_disable(struct drm_encoder *encoder)
         struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
         uint32_t offset;
 
-        if (ASIC_IS_DCE5(rdev))
+        if (ASIC_IS_DCE6(rdev))
                 return;
 
         /* Called for ATOM_ENCODER_MODE_HDMI only */
diff --git a/drivers/gpu/drm/radeon/r600d.h b/drivers/gpu/drm/radeon/r600d.h
index a0dbf1fe6a40..025fd5b6c08c 100644
--- a/drivers/gpu/drm/radeon/r600d.h
+++ b/drivers/gpu/drm/radeon/r600d.h
@@ -485,6 +485,7 @@
 #define         TC_L2_SIZE(x)                                   ((x)<<5)
 #define         L2_DISABLE_LATE_HIT                             (1<<9)
 
+#define VC_ENHANCE                                      0x9714
 
 #define VGT_CACHE_INVALIDATION                          0x88C4
 #define         CACHE_INVALIDATION(x)                           ((x)<<0)
@@ -1163,6 +1164,7 @@
 #define PACKET3_SET_CTL_CONST                           0x6F
 #define         PACKET3_SET_CTL_CONST_OFFSET                    0x0003cff0
 #define         PACKET3_SET_CTL_CONST_END                       0x0003e200
+#define PACKET3_STRMOUT_BASE_UPDATE                     0x72 /* r7xx */
 #define PACKET3_SURFACE_BASE_UPDATE                     0x73
 
 
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index f0bb2b543b13..2c4d53fd20c5 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -57,9 +57,11 @@
  *   2.13.0 - virtual memory support, streamout
  *   2.14.0 - add evergreen tiling informations
  *   2.15.0 - add max_pipes query
+ *   2.16.0 - fix evergreen 2D tiled surface calculation
+ *   2.17.0 - add STRMOUT_BASE_UPDATE for r7xx
  */
 #define KMS_DRIVER_MAJOR        2
-#define KMS_DRIVER_MINOR        15
+#define KMS_DRIVER_MINOR        17
 #define KMS_DRIVER_PATCHLEVEL   0
 int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);
 int radeon_driver_unload_kms(struct drm_device *dev);
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 08825548ee69..5b37e283ec38 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -801,9 +801,13 @@ static void radeon_dynpm_idle_work_handler(struct work_struct *work)
                 int i;
 
                 for (i = 0; i < RADEON_NUM_RINGS; ++i) {
-                        not_processed += radeon_fence_count_emitted(rdev, i);
-                        if (not_processed >= 3)
-                                break;
+                        struct radeon_ring *ring = &rdev->ring[i];
+
+                        if (ring->ready) {
+                                not_processed += radeon_fence_count_emitted(rdev, i);
+                                if (not_processed >= 3)
+                                        break;
+                        }
                 }
 
                 if (not_processed >= 3) { /* should upclock */
diff --git a/drivers/gpu/drm/radeon/radeon_prime.c b/drivers/gpu/drm/radeon/radeon_prime.c
index 8ddab4c76710..6bef46ace831 100644
--- a/drivers/gpu/drm/radeon/radeon_prime.c
+++ b/drivers/gpu/drm/radeon/radeon_prime.c
@@ -169,11 +169,17 @@ struct dma_buf *radeon_gem_prime_export(struct drm_device *dev,
         struct radeon_bo *bo = gem_to_radeon_bo(obj);
         int ret = 0;
 
+        ret = radeon_bo_reserve(bo, false);
+        if (unlikely(ret != 0))
+                return ERR_PTR(ret);
+
         /* pin buffer into GTT */
         ret = radeon_bo_pin(bo, RADEON_GEM_DOMAIN_GTT, NULL);
-        if (ret)
+        if (ret) {
+                radeon_bo_unreserve(bo);
                 return ERR_PTR(ret);
-
+        }
+        radeon_bo_unreserve(bo);
         return dma_buf_export(bo, &radeon_dmabuf_ops, obj->size, flags);
 }
 
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index 4ad0281fdc37..b4f51c569c36 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -616,6 +616,9 @@ static void rv770_gpu_init(struct radeon_device *rdev)
                                        ACK_FLUSH_CTL(3) |
                                        SYNC_FLUSH_CTL));
 
+        if (rdev->family != CHIP_RV770)
+                WREG32(SMX_SAR_CTL0, 0x00003f3f);
+
         db_debug3 = RREG32(DB_DEBUG3);
         db_debug3 &= ~DB_CLK_OFF_DELAY(0x1f);
         switch (rdev->family) {
@@ -792,7 +795,7 @@ static void rv770_gpu_init(struct radeon_device *rdev)
 
         WREG32(PA_CL_ENHANCE, (CLIP_VTX_REORDER_ENA |
                                           NUM_CLIP_SEQ(3)));
-
+        WREG32(VC_ENHANCE, 0);
 }
 
 void r700_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc)
diff --git a/drivers/gpu/drm/radeon/rv770d.h b/drivers/gpu/drm/radeon/rv770d.h
index fdc089896011..b0adfc595d75 100644
--- a/drivers/gpu/drm/radeon/rv770d.h
+++ b/drivers/gpu/drm/radeon/rv770d.h
@@ -211,6 +211,7 @@
 #define SCRATCH_UMSK                                    0x8540
 #define SCRATCH_ADDR                                    0x8544
 
+#define SMX_SAR_CTL0                                    0xA008
 #define SMX_DC_CTL0                                     0xA020
 #define         USE_HASH_FUNCTION                               (1 << 0)
 #define         CACHE_DEPTH(x)                                  ((x) << 1)
@@ -310,6 +311,8 @@
 #define TCP_CNTL                                        0x9610
 #define TCP_CHAN_STEER                                  0x9614
 
+#define VC_ENHANCE                                      0x9714
+
 #define VGT_CACHE_INVALIDATION                          0x88C4
 #define         CACHE_INVALIDATION(x)                           ((x)<<0)
 #define                 VC_ONLY                                         0
diff --git a/drivers/gpu/drm/radeon/si_reg.h b/drivers/gpu/drm/radeon/si_reg.h
index eda938a7cb6e..501f9d431d57 100644
--- a/drivers/gpu/drm/radeon/si_reg.h
+++ b/drivers/gpu/drm/radeon/si_reg.h
@@ -30,4 +30,76 @@
 #define SI_DC_GPIO_HPD_EN                        0x65b8
 #define SI_DC_GPIO_HPD_Y                         0x65bc
 
+#define SI_GRPH_CONTROL                          0x6804
+#       define SI_GRPH_DEPTH(x)                  (((x) & 0x3) << 0)
+#       define SI_GRPH_DEPTH_8BPP                0
+#       define SI_GRPH_DEPTH_16BPP               1
+#       define SI_GRPH_DEPTH_32BPP               2
+#       define SI_GRPH_NUM_BANKS(x)              (((x) & 0x3) << 2)
+#       define SI_ADDR_SURF_2_BANK               0
+#       define SI_ADDR_SURF_4_BANK               1
+#       define SI_ADDR_SURF_8_BANK               2
+#       define SI_ADDR_SURF_16_BANK              3
+#       define SI_GRPH_Z(x)                      (((x) & 0x3) << 4)
+#       define SI_GRPH_BANK_WIDTH(x)             (((x) & 0x3) << 6)
+#       define SI_ADDR_SURF_BANK_WIDTH_1         0
+#       define SI_ADDR_SURF_BANK_WIDTH_2         1
+#       define SI_ADDR_SURF_BANK_WIDTH_4         2
+#       define SI_ADDR_SURF_BANK_WIDTH_8         3
+#       define SI_GRPH_FORMAT(x)                 (((x) & 0x7) << 8)
+/* 8 BPP */
+#       define SI_GRPH_FORMAT_INDEXED            0
+/* 16 BPP */
+#       define SI_GRPH_FORMAT_ARGB1555           0
+#       define SI_GRPH_FORMAT_ARGB565            1
+#       define SI_GRPH_FORMAT_ARGB4444           2
+#       define SI_GRPH_FORMAT_AI88               3
+#       define SI_GRPH_FORMAT_MONO16             4
+#       define SI_GRPH_FORMAT_BGRA5551           5
+/* 32 BPP */
+#       define SI_GRPH_FORMAT_ARGB8888           0
+#       define SI_GRPH_FORMAT_ARGB2101010        1
+#       define SI_GRPH_FORMAT_32BPP_DIG          2
+#       define SI_GRPH_FORMAT_8B_ARGB2101010     3
+#       define SI_GRPH_FORMAT_BGRA1010102        4
+#       define SI_GRPH_FORMAT_8B_BGRA1010102     5
+#       define SI_GRPH_FORMAT_RGB111110          6
+#       define SI_GRPH_FORMAT_BGR101111          7
+#       define SI_GRPH_BANK_HEIGHT(x)            (((x) & 0x3) << 11)
+#       define SI_ADDR_SURF_BANK_HEIGHT_1        0
+#       define SI_ADDR_SURF_BANK_HEIGHT_2        1
+#       define SI_ADDR_SURF_BANK_HEIGHT_4        2
+#       define SI_ADDR_SURF_BANK_HEIGHT_8        3
+#       define SI_GRPH_TILE_SPLIT(x)             (((x) & 0x7) << 13)
+#       define SI_ADDR_SURF_TILE_SPLIT_64B       0
+#       define SI_ADDR_SURF_TILE_SPLIT_128B      1
+#       define SI_ADDR_SURF_TILE_SPLIT_256B      2
+#       define SI_ADDR_SURF_TILE_SPLIT_512B      3
+#       define SI_ADDR_SURF_TILE_SPLIT_1KB       4
+#       define SI_ADDR_SURF_TILE_SPLIT_2KB       5
+#       define SI_ADDR_SURF_TILE_SPLIT_4KB       6
+#       define SI_GRPH_MACRO_TILE_ASPECT(x)      (((x) & 0x3) << 18)
+#       define SI_ADDR_SURF_MACRO_TILE_ASPECT_1  0
+#       define SI_ADDR_SURF_MACRO_TILE_ASPECT_2  1
+#       define SI_ADDR_SURF_MACRO_TILE_ASPECT_4  2
+#       define SI_ADDR_SURF_MACRO_TILE_ASPECT_8  3
+#       define SI_GRPH_ARRAY_MODE(x)             (((x) & 0x7) << 20)
+#       define SI_GRPH_ARRAY_LINEAR_GENERAL      0
+#       define SI_GRPH_ARRAY_LINEAR_ALIGNED      1
+#       define SI_GRPH_ARRAY_1D_TILED_THIN1      2
+#       define SI_GRPH_ARRAY_2D_TILED_THIN1      4
+#       define SI_GRPH_PIPE_CONFIG(x)            (((x) & 0x1f) << 24)
+#       define SI_ADDR_SURF_P2                   0
+#       define SI_ADDR_SURF_P4_8x16              4
+#       define SI_ADDR_SURF_P4_16x16             5
+#       define SI_ADDR_SURF_P4_16x32             6
+#       define SI_ADDR_SURF_P4_32x32             7
+#       define SI_ADDR_SURF_P8_16x16_8x16        8
+#       define SI_ADDR_SURF_P8_16x32_8x16        9
+#       define SI_ADDR_SURF_P8_32x32_8x16        10
+#       define SI_ADDR_SURF_P8_16x32_16x16       11
+#       define SI_ADDR_SURF_P8_32x32_16x16       12
+#       define SI_ADDR_SURF_P8_32x32_16x32       13
+#       define SI_ADDR_SURF_P8_32x64_32x32       14
+
 #endif
diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
index 30d98d14b5c5..dd14cd1a0033 100644
--- a/drivers/gpu/drm/sis/sis_drv.c
+++ b/drivers/gpu/drm/sis/sis_drv.c
@@ -47,9 +47,9 @@ static int sis_driver_load(struct drm_device *dev, unsigned long chipset)
         if (dev_priv == NULL)
                 return -ENOMEM;
 
+        idr_init(&dev_priv->object_idr);
         dev->dev_private = (void *)dev_priv;
         dev_priv->chipset = chipset;
-        idr_init(&dev->object_name_idr);
 
         return 0;
 }
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index b67cfcaa661f..36f4b28c1b90 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1204,6 +1204,7 @@ int ttm_bo_init(struct ttm_bo_device *bdev,
                         (*destroy)(bo);
                 else
                         kfree(bo);
+                ttm_mem_global_free(mem_glob, acc_size);
                 return -EINVAL;
         }
         bo->destroy = destroy;
@@ -1307,22 +1308,14 @@ int ttm_bo_create(struct ttm_bo_device *bdev,
                         struct ttm_buffer_object **p_bo)
 {
         struct ttm_buffer_object *bo;
-        struct ttm_mem_global *mem_glob = bdev->glob->mem_glob;
         size_t acc_size;
         int ret;
 
-        acc_size = ttm_bo_acc_size(bdev, size, sizeof(struct ttm_buffer_object));
-        ret = ttm_mem_global_alloc(mem_glob, acc_size, false, false);
-        if (unlikely(ret != 0))
-                return ret;
-
         bo = kzalloc(sizeof(*bo), GFP_KERNEL);
-
-        if (unlikely(bo == NULL)) {
-                ttm_mem_global_free(mem_glob, acc_size);
+        if (unlikely(bo == NULL))
                 return -ENOMEM;
-        }
 
+        acc_size = ttm_bo_acc_size(bdev, size, sizeof(struct ttm_buffer_object));
         ret = ttm_bo_init(bdev, bo, size, type, placement, page_alignment,
                                 buffer_start, interruptible,
                           persistent_swap_storage, acc_size, NULL, NULL);
diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c
index 4d02c46a9420..6e52069894b3 100644
--- a/drivers/gpu/drm/udl/udl_drv.c
+++ b/drivers/gpu/drm/udl/udl_drv.c
@@ -13,8 +13,21 @@
 
 static struct drm_driver driver;
 
+/*
+ * There are many DisplayLink-based graphics products, all with unique PIDs.
+ * So we match on DisplayLink's VID + Vendor-Defined Interface Class (0xff)
+ * We also require a match on SubClass (0x00) and Protocol (0x00),
+ * which is compatible with all known USB 2.0 era graphics chips and firmware,
+ * but allows DisplayLink to increment those for any future incompatible chips
+ */
 static struct usb_device_id id_table[] = {
-        {.idVendor = 0x17e9, .match_flags = USB_DEVICE_ID_MATCH_VENDOR,},
+        {.idVendor = 0x17e9, .bInterfaceClass = 0xff,
+         .bInterfaceSubClass = 0x00,
+         .bInterfaceProtocol = 0x00,
+         .match_flags = USB_DEVICE_ID_MATCH_VENDOR |
+                        USB_DEVICE_ID_MATCH_INT_CLASS |
+                        USB_DEVICE_ID_MATCH_INT_SUBCLASS |
+                        USB_DEVICE_ID_MATCH_INT_PROTOCOL,},
         {},
 };
 MODULE_DEVICE_TABLE(usb, id_table);
diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c
index a8d5f09428c7..4c2d836a0893 100644
--- a/drivers/gpu/drm/udl/udl_main.c
+++ b/drivers/gpu/drm/udl/udl_main.c
@@ -61,7 +61,7 @@ static int udl_parse_vendor_descriptor(struct drm_device *dev,
                         u8 length;
                         u16 key;
 
-                        key = *((u16 *) desc);
+                        key = le16_to_cpu(*((u16 *) desc));
                         desc += sizeof(u16);
                         length = *desc;
                         desc++;
diff --git a/drivers/gpu/drm/via/via_map.c b/drivers/gpu/drm/via/via_map.c
index 1f182254e81e..c126182ac07e 100644
--- a/drivers/gpu/drm/via/via_map.c
+++ b/drivers/gpu/drm/via/via_map.c
@@ -100,12 +100,11 @@ int via_driver_load(struct drm_device *dev, unsigned long chipset)
         if (dev_priv == NULL)
                 return -ENOMEM;
 
+        idr_init(&dev_priv->object_idr);
         dev->dev_private = (void *)dev_priv;
 
         dev_priv->chipset = chipset;
 
-        idr_init(&dev->object_name_idr);
-
         pci_set_master(dev->pdev);
 
         ret = drm_vblank_init(dev, 1);
diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
index 38f9534ac513..5b3c7d135dc9 100644
--- a/drivers/gpu/vga/vga_switcheroo.c
+++ b/drivers/gpu/vga/vga_switcheroo.c
@@ -190,6 +190,19 @@ find_active_client(struct list_head *head)
         return NULL;
 }
 
+int vga_switcheroo_get_client_state(struct pci_dev *pdev)
+{
+        struct vga_switcheroo_client *client;
+
+        client = find_client_from_pci(&vgasr_priv.clients, pdev);
+        if (!client)
+                return VGA_SWITCHEROO_NOT_FOUND;
+        if (!vgasr_priv.active)
+                return VGA_SWITCHEROO_INIT;
+        return client->pwr_state;
+}
+EXPORT_SYMBOL(vga_switcheroo_get_client_state);
+
 void vga_switcheroo_unregister_client(struct pci_dev *pdev)
 {
         struct vga_switcheroo_client *client;
@@ -291,8 +304,6 @@ static int vga_switchto_stage1(struct vga_switcheroo_client *new_client)
                 vga_switchon(new_client);
 
         vga_set_default_device(new_client->pdev);
-        set_audio_state(new_client->id, VGA_SWITCHEROO_ON);
-
         return 0;
 }
 
@@ -308,6 +319,8 @@ static int vga_switchto_stage2(struct vga_switcheroo_client *new_client)
 
         active->active = false;
 
+        set_audio_state(active->id, VGA_SWITCHEROO_OFF);
+
         if (new_client->fb_info) {
                 struct fb_event event;
                 event.info = new_client->fb_info;
@@ -321,11 +334,11 @@ static int vga_switchto_stage2(struct vga_switcheroo_client *new_client)
         if (new_client->ops->reprobe)
                 new_client->ops->reprobe(new_client->pdev);
 
-        set_audio_state(active->id, VGA_SWITCHEROO_OFF);
-
         if (active->pwr_state == VGA_SWITCHEROO_ON)
                 vga_switchoff(active);
 
+        set_audio_state(new_client->id, VGA_SWITCHEROO_ON);
+
         new_client->active = true;
         return 0;
 }
@@ -371,8 +384,9 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf,
         /* pwr off the device not in use */
         if (strncmp(usercmd, "OFF", 3) == 0) {
                 list_for_each_entry(client, &vgasr_priv.clients, list) {
-                        if (client->active)
+                        if (client->active || client_is_audio(client))
                                 continue;
+                        set_audio_state(client->id, VGA_SWITCHEROO_OFF);
                         if (client->pwr_state == VGA_SWITCHEROO_ON)
                                 vga_switchoff(client);
                 }
@@ -381,10 +395,11 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf,
         /* pwr on the device not in use */
         if (strncmp(usercmd, "ON", 2) == 0) {
                 list_for_each_entry(client, &vgasr_priv.clients, list) {
-                        if (client->active)
+                        if (client->active || client_is_audio(client))
                                 continue;
                         if (client->pwr_state == VGA_SWITCHEROO_OFF)
                                 vga_switchon(client);
+                        set_audio_state(client->id, VGA_SWITCHEROO_ON);
                 }
                 goto out;
         }
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 034c80a10f1f..bef04c192768 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -1,20 +1,11 @@
 #
 # HID driver configuration
 #
-menuconfig HID_SUPPORT
-        bool "HID Devices"
-        depends on INPUT
-        default y
-        ---help---
-          Say Y here to get to see options for various computer-human interface
-          device drivers. This option alone does not add any kernel code.
-
-          If you say N, all options in this submenu will be skipped and disabled.
-
-if HID_SUPPORT
+menu "HID support"
+     depends on INPUT
 
 config HID
-        tristate "Generic HID support"
+        tristate "HID bus support"
         depends on INPUT
         default y
         ---help---
@@ -23,14 +14,17 @@ config HID
           most commonly used to refer to the USB-HID specification, but other
           devices (such as, but not strictly limited to, Bluetooth) are
           designed using HID specification (this involves certain keyboards,
-          mice, tablets, etc). This option compiles into kernel the generic
-          HID layer code (parser, usages, etc.), which can then be used by
-          transport-specific HID implementation (like USB or Bluetooth).
+          mice, tablets, etc). This option adds the HID bus to the kernel,
+          together with generic HID layer code. The HID devices are added and
+          removed from the HID bus by the transport-layer drivers, such as
+          usbhid (USB_HID) and hidp (BT_HIDP).
 
           For docs and specs, see http://www.usb.org/developers/hidpage/
 
           If unsure, say Y.
 
+if HID
+
 config HID_BATTERY_STRENGTH
         bool "Battery level reporting for HID devices"
         depends on HID && POWER_SUPPLY && HID = POWER_SUPPLY
@@ -59,23 +53,22 @@ config HIDRAW
 
         If unsure, say Y.
 
-source "drivers/hid/usbhid/Kconfig"
-
-menu "Special HID drivers"
-        depends on HID
-
 config HID_GENERIC
         tristate "Generic HID driver"
         depends on HID
-        default y
+        default HID
         ---help---
-        Support for generic HID devices.
+        Support for generic devices on the HID bus. This includes most
+        keyboards and mice, joysticks, tablets and digitizers.
 
         To compile this driver as a module, choose M here: the module
         will be called hid-generic.
 
         If unsure, say Y.
 
+menu "Special HID drivers"
+        depends on HID
+
 config HID_A4TECH
         tristate "A4 tech mice" if EXPERT
         depends on USB_HID
@@ -662,4 +655,8 @@ config HID_ZYDACRON
 
 endmenu
 
-endif # HID_SUPPORT
+endif # HID
+
+source "drivers/hid/usbhid/Kconfig"
+
+endmenu
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 8e3a6b261477..6ac0286b5375 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1880,6 +1880,7 @@ static const struct hid_device_id hid_ignore_list[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_LCM)},
         { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_LCM2)},
         { HID_USB_DEVICE(USB_VENDOR_ID_AVERMEDIA, USB_DEVICE_ID_AVER_FM_MR800) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_AXENTIA, USB_DEVICE_ID_AXENTIA_FM_RADIO) },
         { HID_USB_DEVICE(USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD) },
         { HID_USB_DEVICE(USB_VENDOR_ID_CIDC, 0x0103) },
         { HID_USB_DEVICE(USB_VENDOR_ID_CYGNAL, USB_DEVICE_ID_CYGNAL_RADIO_SI470X) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 9373f535dfe9..d1cdd2d28409 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -160,6 +160,9 @@
 #define USB_VENDOR_ID_AVERMEDIA         0x07ca
 #define USB_DEVICE_ID_AVER_FM_MR800     0xb800
 
+#define USB_VENDOR_ID_AXENTIA           0x12cf
+#define USB_DEVICE_ID_AXENTIA_FM_RADIO  0x7111
+
 #define USB_VENDOR_ID_BAANTO            0x2453
 #define USB_DEVICE_ID_BAANTO_MT_190W2   0x0100
 
diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
index 5e8a7ed42344..0f9c146fc00d 100644
--- a/drivers/hid/hid-logitech-dj.c
+++ b/drivers/hid/hid-logitech-dj.c
@@ -436,27 +436,37 @@ static int logi_dj_recv_send_report(struct dj_receiver_dev *djrcv_dev,
 
 static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev)
 {
-        struct dj_report dj_report;
+        struct dj_report *dj_report;
+        int retval;
 
-        memset(&dj_report, 0, sizeof(dj_report));
-        dj_report.report_id = REPORT_ID_DJ_SHORT;
-        dj_report.device_index = 0xFF;
-        dj_report.report_type = REPORT_TYPE_CMD_GET_PAIRED_DEVICES;
-        return logi_dj_recv_send_report(djrcv_dev, &dj_report);
+        dj_report = kzalloc(sizeof(dj_report), GFP_KERNEL);
+        if (!dj_report)
+                return -ENOMEM;
+        dj_report->report_id = REPORT_ID_DJ_SHORT;
+        dj_report->device_index = 0xFF;
+        dj_report->report_type = REPORT_TYPE_CMD_GET_PAIRED_DEVICES;
+        retval = logi_dj_recv_send_report(djrcv_dev, dj_report);
+        kfree(dj_report);
+        return retval;
 }
 
 static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev,
                                           unsigned timeout)
 {
-        struct dj_report dj_report;
+        struct dj_report *dj_report;
+        int retval;
 
-        memset(&dj_report, 0, sizeof(dj_report));
-        dj_report.report_id = REPORT_ID_DJ_SHORT;
-        dj_report.device_index = 0xFF;
-        dj_report.report_type = REPORT_TYPE_CMD_SWITCH;
-        dj_report.report_params[CMD_SWITCH_PARAM_DEVBITFIELD] = 0x3F;
-        dj_report.report_params[CMD_SWITCH_PARAM_TIMEOUT_SECONDS] = (u8)timeout;
-        return logi_dj_recv_send_report(djrcv_dev, &dj_report);
+        dj_report = kzalloc(sizeof(dj_report), GFP_KERNEL);
+        if (!dj_report)
+                return -ENOMEM;
+        dj_report->report_id = REPORT_ID_DJ_SHORT;
+        dj_report->device_index = 0xFF;
+        dj_report->report_type = REPORT_TYPE_CMD_SWITCH;
+        dj_report->report_params[CMD_SWITCH_PARAM_DEVBITFIELD] = 0x3F;
+        dj_report->report_params[CMD_SWITCH_PARAM_TIMEOUT_SECONDS] = (u8)timeout;
+        retval = logi_dj_recv_send_report(djrcv_dev, dj_report);
+        kfree(dj_report);
+        return retval;
 }
 
 
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
index 7cf3ffe4b7bc..40ac6654f1d1 100644
--- a/drivers/hid/hid-magicmouse.c
+++ b/drivers/hid/hid-magicmouse.c
@@ -426,8 +426,10 @@ static void magicmouse_setup_input(struct input_dev *input, struct hid_device *h
                 __set_bit(EV_ABS, input->evbit);
 
                 input_set_abs_params(input, ABS_MT_TRACKING_ID, 0, 15, 0, 0);
-                input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0, 255, 4, 0);
-                input_set_abs_params(input, ABS_MT_TOUCH_MINOR, 0, 255, 4, 0);
+                input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0, 255 << 2,
+                                     4, 0);
+                input_set_abs_params(input, ABS_MT_TOUCH_MINOR, 0, 255 << 2,
+                                     4, 0);
                 input_set_abs_params(input, ABS_MT_ORIENTATION, -31, 32, 1, 0);
 
                 /* Note: Touch Y position from the device is inverted relative
diff --git a/drivers/hid/usbhid/Kconfig b/drivers/hid/usbhid/Kconfig
index 0f20fd17cf06..0108c5991a04 100644
--- a/drivers/hid/usbhid/Kconfig
+++ b/drivers/hid/usbhid/Kconfig
@@ -1,13 +1,13 @@
-comment "USB Input Devices"
+menu "USB HID support"
         depends on USB
 
 config USB_HID
-        tristate "USB Human Interface Device (full HID) support"
+        tristate "USB HID transport layer"
         default y
         depends on USB && INPUT
         select HID
         ---help---
-          Say Y here if you want full HID support to connect USB keyboards,
+          Say Y here if you want to connect USB keyboards,
           mice, joysticks, graphic tablets, or any other HID based devices
           to your computer via USB, as well as Uninterruptible Power Supply
           (UPS) and monitor control devices.
@@ -81,4 +81,4 @@ config USB_MOUSE
 
 endmenu
 
-
+endmenu
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index f082e48ab113..2cde9ecf7731 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -8,7 +8,7 @@
  *
  * Based on hdaps.c driver:
  * Copyright (C) 2005 Robert Love <rml@novell.com>
- * Copyright (C) 2005 Jesper Juhl <jesper.juhl@gmail.com>
+ * Copyright (C) 2005 Jesper Juhl <jj@chaosbits.net>
  *
  * Fan control based on smcFanControl:
  * Copyright (C) 2006 Hendrik Holtmann <holtmann@mac.com>
@@ -215,7 +215,7 @@ static int read_smc(u8 cmd, const char *key, u8 *buffer, u8 len)
         int i;
 
         if (send_command(cmd) || send_argument(key)) {
-                pr_warn("%s: read arg fail\n", key);
+                pr_warn("%.4s: read arg fail\n", key);
                 return -EIO;
         }
 
@@ -223,7 +223,7 @@ static int read_smc(u8 cmd, const char *key, u8 *buffer, u8 len)
 
         for (i = 0; i < len; i++) {
                 if (__wait_status(0x05)) {
-                        pr_warn("%s: read data fail\n", key);
+                        pr_warn("%.4s: read data fail\n", key);
                         return -EIO;
                 }
                 buffer[i] = inb(APPLESMC_DATA_PORT);
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index b9d512331ed4..637c51c11b44 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -191,6 +191,24 @@ static ssize_t show_temp(struct device *dev,
         return tdata->valid ? sprintf(buf, "%d\n", tdata->temp) : -EAGAIN;
 }
 
+struct tjmax {
+        char const *id;
+        int tjmax;
+};
+
+static struct tjmax __cpuinitconst tjmax_table[] = {
+        { "CPU D410", 100000 },
+        { "CPU D425", 100000 },
+        { "CPU D510", 100000 },
+        { "CPU D525", 100000 },
+        { "CPU N450", 100000 },
+        { "CPU N455", 100000 },
+        { "CPU N470", 100000 },
+        { "CPU N475", 100000 },
+        { "CPU  230", 100000 },
+        { "CPU  330", 125000 },
+};
+
 static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id,
                                   struct device *dev)
 {
@@ -202,6 +220,13 @@ static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id,
         int err;
         u32 eax, edx;
         struct pci_dev *host_bridge;
+        int i;
+
+        /* explicit tjmax table entries override heuristics */
+        for (i = 0; i < ARRAY_SIZE(tjmax_table); i++) {
+                if (strstr(c->x86_model_id, tjmax_table[i].id))
+                        return tjmax_table[i].tjmax;
+        }
 
         /* Early chips have no MSR for TjMax */
 
@@ -210,7 +235,8 @@ static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id,
 
         /* Atom CPUs */
 
-        if (c->x86_model == 0x1c) {
+        if (c->x86_model == 0x1c || c->x86_model == 0x26
+            || c->x86_model == 0x27) {
                 usemsr_ee = 0;
 
                 host_bridge = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0));
@@ -223,6 +249,9 @@ static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id,
                         tjmax = 90000;
 
                 pci_dev_put(host_bridge);
+        } else if (c->x86_model == 0x36) {
+                usemsr_ee = 0;
+                tjmax = 100000;
         }
 
         if (c->x86_model > 0xe && usemsr_ee) {
@@ -664,7 +693,7 @@ static void __cpuinit get_core_online(unsigned int cpu)
          * sensors. We check this bit only, all the early CPUs
          * without thermal sensors will be filtered out.
          */
-        if (!cpu_has(c, X86_FEATURE_DTS))
+        if (!cpu_has(c, X86_FEATURE_DTHERM))
                 return;
 
         if (!pdev) {
@@ -765,14 +794,14 @@ static struct notifier_block coretemp_cpu_notifier __refdata = {
 };
 
 static const struct x86_cpu_id coretemp_ids[] = {
-        { X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_DTS },
+        { X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_DTHERM },
         {}
 };
 MODULE_DEVICE_TABLE(x86cpu, coretemp_ids);
 
 static int __init coretemp_init(void)
 {
-        int i, err = -ENODEV;
+        int i, err;
 
         /*
          * CPUID.06H.EAX[0] indicates whether the CPU has thermal
diff --git a/drivers/hwmon/emc2103.c b/drivers/hwmon/emc2103.c
index 9691f664c76e..e7d234b59312 100644
--- a/drivers/hwmon/emc2103.c
+++ b/drivers/hwmon/emc2103.c
@@ -451,11 +451,15 @@ static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *da,
                 data->fan_rpm_control = true;
                 break;
         default:
-                mutex_unlock(&data->update_lock);
-                return -EINVAL;
+                count = -EINVAL;
+                goto err;
         }
 
-        read_u8_from_i2c(client, REG_FAN_CONF1, &conf_reg);
+        result = read_u8_from_i2c(client, REG_FAN_CONF1, &conf_reg);
+        if (result) {
+                count = result;
+                goto err;
+        }
 
         if (data->fan_rpm_control)
                 conf_reg |= 0x80;
@@ -463,7 +467,7 @@ static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *da,
                 conf_reg &= ~0x80;
 
         i2c_smbus_write_byte_data(client, REG_FAN_CONF1, conf_reg);
-
+err:
         mutex_unlock(&data->update_lock);
         return count;
 }
diff --git a/drivers/hwmon/jc42.c b/drivers/hwmon/jc42.c
index a9bfd6736d9a..e72ba5d2a824 100644
--- a/drivers/hwmon/jc42.c
+++ b/drivers/hwmon/jc42.c
@@ -590,6 +590,6 @@ abort:
 
 module_i2c_driver(jc42_driver);
 
-MODULE_AUTHOR("Guenter Roeck <guenter.roeck@ericsson.com>");
+MODULE_AUTHOR("Guenter Roeck <linux@roeck-us.net>");
 MODULE_DESCRIPTION("JC42 driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/hwmon/lineage-pem.c b/drivers/hwmon/lineage-pem.c
index d264937c7f5e..bd75d2415432 100644
--- a/drivers/hwmon/lineage-pem.c
+++ b/drivers/hwmon/lineage-pem.c
@@ -567,6 +567,6 @@ static struct i2c_driver pem_driver = {
 
 module_i2c_driver(pem_driver);
 
-MODULE_AUTHOR("Guenter Roeck <guenter.roeck@ericsson.com>");
+MODULE_AUTHOR("Guenter Roeck <linux@roeck-us.net>");
 MODULE_DESCRIPTION("Lineage CPL PEM hardware monitoring driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/hwmon/ltc4261.c b/drivers/hwmon/ltc4261.c
index 069b7d34d8f9..77476a575c4e 100644
--- a/drivers/hwmon/ltc4261.c
+++ b/drivers/hwmon/ltc4261.c
@@ -292,6 +292,6 @@ static struct i2c_driver ltc4261_driver = {
 
 module_i2c_driver(ltc4261_driver);
 
-MODULE_AUTHOR("Guenter Roeck <guenter.roeck@ericsson.com>");
+MODULE_AUTHOR("Guenter Roeck <linux@roeck-us.net>");
 MODULE_DESCRIPTION("LTC4261 driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/hwmon/max16065.c b/drivers/hwmon/max16065.c
index 822261be84dd..019427d7a5fd 100644
--- a/drivers/hwmon/max16065.c
+++ b/drivers/hwmon/max16065.c
@@ -692,6 +692,6 @@ static struct i2c_driver max16065_driver = {
 
 module_i2c_driver(max16065_driver);
 
-MODULE_AUTHOR("Guenter Roeck <guenter.roeck@ericsson.com>");
+MODULE_AUTHOR("Guenter Roeck <linux@roeck-us.net>");
 MODULE_DESCRIPTION("MAX16065 driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c
index 8716066a2f2b..bcb507b0cfd4 100644
--- a/drivers/ide/icside.c
+++ b/drivers/ide/icside.c
@@ -236,7 +236,7 @@ static const struct ide_port_ops icside_v6_no_dma_port_ops = {
  */
 static void icside_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
 {
-        unsigned long cycle_time;
+        unsigned long cycle_time = 0;
         int use_dma_info = 0;
         const u8 xfer_mode = drive->dma_mode;
 
@@ -271,9 +271,9 @@ static void icside_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
 
         ide_set_drivedata(drive, (void *)cycle_time);
 
-        printk("%s: %s selected (peak %dMB/s)\n", drive->name,
-                ide_xfer_verbose(xfer_mode),
-                2000 / (unsigned long)ide_get_drivedata(drive));
+        printk(KERN_INFO "%s: %s selected (peak %luMB/s)\n",
+               drive->name, ide_xfer_verbose(xfer_mode),
+               2000 / (cycle_time ? cycle_time : (unsigned long) -1));
 }
 
 static const struct ide_port_ops icside_v6_port_ops = {
@@ -375,8 +375,6 @@ static const struct ide_dma_ops icside_v6_dma_ops = {
         .dma_test_irq           = icside_dma_test_irq,
         .dma_lost_irq           = ide_dma_lost_irq,
 };
-#else
-#define icside_v6_dma_ops NULL
 #endif
 
 static int icside_dma_off_init(ide_hwif_t *hwif, const struct ide_port_info *d)
@@ -456,7 +454,6 @@ err_free:
 static const struct ide_port_info icside_v6_port_info __initdata = {
         .init_dma               = icside_dma_off_init,
         .port_ops               = &icside_v6_no_dma_port_ops,
-        .dma_ops                = &icside_v6_dma_ops,
         .host_flags             = IDE_HFLAG_SERIALIZE | IDE_HFLAG_MMIO,
         .mwdma_mask             = ATA_MWDMA2,
         .swdma_mask             = ATA_SWDMA2,
@@ -518,11 +515,13 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
 
         ecard_set_drvdata(ec, state);
 
+#ifdef CONFIG_BLK_DEV_IDEDMA_ICS
         if (ec->dma != NO_DMA && !request_dma(ec->dma, DRV_NAME)) {
                 d.init_dma = icside_dma_init;
                 d.port_ops = &icside_v6_port_ops;
-        } else
-                d.dma_ops = NULL;
+                d.dma_ops  = &icside_v6_dma_ops;
+        }
+#endif
 
         ret = ide_host_register(host, &d, hws);
         if (ret)
diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c
index 28e344ea514c..f1e922e2479a 100644
--- a/drivers/ide/ide-cs.c
+++ b/drivers/ide/ide-cs.c
@@ -167,7 +167,8 @@ static int pcmcia_check_one_config(struct pcmcia_device *pdev, void *priv_data)
 {
         int *is_kme = priv_data;
 
-        if (!(pdev->resource[0]->flags & IO_DATA_PATH_WIDTH_8)) {
+        if ((pdev->resource[0]->flags & IO_DATA_PATH_WIDTH)
+            != IO_DATA_PATH_WIDTH_8) {
                 pdev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
                 pdev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
         }
diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
index 56eecefcec75..2ec93da41e2c 100644
--- a/drivers/iio/Kconfig
+++ b/drivers/iio/Kconfig
@@ -8,8 +8,7 @@ menuconfig IIO
         help
           The industrial I/O subsystem provides a unified framework for
           drivers for many different types of embedded sensors using a
-          number of different physical interfaces (i2c, spi, etc). See
-          Documentation/iio for more information.
+          number of different physical interfaces (i2c, spi, etc).
 
 if IIO
 
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index 1ddd8861c71b..4f947e4377ef 100644
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -661,7 +661,6 @@ static int iio_device_register_sysfs(struct iio_dev *indio_dev)
          * New channel registration method - relies on the fact a group does
          * not need to be initialized if it is name is NULL.
          */
-        INIT_LIST_HEAD(&indio_dev->channel_attr_list);
         if (indio_dev->channels)
                 for (i = 0; i < indio_dev->num_channels; i++) {
                         ret = iio_device_add_channel_sysfs(indio_dev,
@@ -725,12 +724,16 @@ static void iio_device_unregister_sysfs(struct iio_dev *indio_dev)
 static void iio_dev_release(struct device *device)
 {
         struct iio_dev *indio_dev = dev_to_iio_dev(device);
-        cdev_del(&indio_dev->chrdev);
+        if (indio_dev->chrdev.dev)
+                cdev_del(&indio_dev->chrdev);
         if (indio_dev->modes & INDIO_BUFFER_TRIGGERED)
                 iio_device_unregister_trigger_consumer(indio_dev);
         iio_device_unregister_eventset(indio_dev);
         iio_device_unregister_sysfs(indio_dev);
         iio_device_unregister_debugfs(indio_dev);
+
+        ida_simple_remove(&iio_ida, indio_dev->id);
+        kfree(indio_dev);
 }
 
 static struct device_type iio_dev_type = {
@@ -761,6 +764,7 @@ struct iio_dev *iio_device_alloc(int sizeof_priv)
                 dev_set_drvdata(&dev->dev, (void *)dev);
                 mutex_init(&dev->mlock);
                 mutex_init(&dev->info_exist_lock);
+                INIT_LIST_HEAD(&dev->channel_attr_list);
 
                 dev->id = ida_simple_get(&iio_ida, 0, 0, GFP_KERNEL);
                 if (dev->id < 0) {
@@ -778,10 +782,8 @@ EXPORT_SYMBOL(iio_device_alloc);
 
 void iio_device_free(struct iio_dev *dev)
 {
-        if (dev) {
-                ida_simple_remove(&iio_ida, dev->id);
-                kfree(dev);
-        }
+        if (dev)
+                put_device(&dev->dev);
 }
 EXPORT_SYMBOL(iio_device_free);
 
@@ -902,7 +904,7 @@ void iio_device_unregister(struct iio_dev *indio_dev)
         mutex_lock(&indio_dev->info_exist_lock);
         indio_dev->info = NULL;
         mutex_unlock(&indio_dev->info_exist_lock);
-        device_unregister(&indio_dev->dev);
+        device_del(&indio_dev->dev);
 }
 EXPORT_SYMBOL(iio_device_unregister);
 subsys_initcall(iio_init);
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 55d5642eb10a..2e826f9702c6 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -1184,7 +1184,7 @@ static void cma_set_req_event_data(struct rdma_cm_event *event,
 
 static int cma_check_req_qp_type(struct rdma_cm_id *id, struct ib_cm_event *ib_event)
 {
-        return (((ib_event->event == IB_CM_REQ_RECEIVED) ||
+        return (((ib_event->event == IB_CM_REQ_RECEIVED) &&
                  (ib_event->param.req_rcvd.qp_type == id->qp_type)) ||
                 ((ib_event->event == IB_CM_SIDR_REQ_RECEIVED) &&
                  (id->qp_type == IB_QPT_UD)) ||
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma.h b/drivers/infiniband/hw/ocrdma/ocrdma.h
index 037f5cea85bd..48970af23679 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma.h
+++ b/drivers/infiniband/hw/ocrdma/ocrdma.h
@@ -61,6 +61,7 @@ struct ocrdma_dev_attr {
         u32 max_inline_data;
         int max_send_sge;
         int max_recv_sge;
+        int max_srq_sge;
         int max_mr;
         u64 max_mr_size;
         u32 max_num_mr_pbl;
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index 9343a1522977..71942af4fce9 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -990,8 +990,6 @@ static void ocrdma_get_attr(struct ocrdma_dev *dev,
                               struct ocrdma_dev_attr *attr,
                               struct ocrdma_mbx_query_config *rsp)
 {
-        int max_q_mem;
-
         attr->max_pd =
             (rsp->max_pd_ca_ack_delay & OCRDMA_MBX_QUERY_CFG_MAX_PD_MASK) >>
             OCRDMA_MBX_QUERY_CFG_MAX_PD_SHIFT;
@@ -1004,6 +1002,9 @@ static void ocrdma_get_attr(struct ocrdma_dev *dev,
         attr->max_recv_sge = (rsp->max_write_send_sge &
                               OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_MASK) >>
             OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_SHIFT;
+        attr->max_srq_sge = (rsp->max_srq_rqe_sge &
+                              OCRDMA_MBX_QUERY_CFG_MAX_SRQ_SGE_MASK) >>
+            OCRDMA_MBX_QUERY_CFG_MAX_SRQ_SGE_OFFSET;
         attr->max_ord_per_qp = (rsp->max_ird_ord_per_qp &
                                 OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_MASK) >>
             OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_SHIFT;
@@ -1037,18 +1038,15 @@ static void ocrdma_get_attr(struct ocrdma_dev *dev,
         attr->max_inline_data =
             attr->wqe_size - (sizeof(struct ocrdma_hdr_wqe) +
                               sizeof(struct ocrdma_sge));
-        max_q_mem = OCRDMA_Q_PAGE_BASE_SIZE << (OCRDMA_MAX_Q_PAGE_SIZE_CNT - 1);
-        /* hw can queue one less then the configured size,
-         * so publish less by one to stack.
-         */
         if (dev->nic_info.dev_family == OCRDMA_GEN2_FAMILY) {
-                dev->attr.max_wqe = max_q_mem / dev->attr.wqe_size;
                 attr->ird = 1;
                 attr->ird_page_size = OCRDMA_MIN_Q_PAGE_SIZE;
                 attr->num_ird_pages = MAX_OCRDMA_IRD_PAGES;
-        } else
-                dev->attr.max_wqe = (max_q_mem / dev->attr.wqe_size) - 1;
-        dev->attr.max_rqe = (max_q_mem / dev->attr.rqe_size) - 1;
+        }
+        dev->attr.max_wqe = rsp->max_wqes_rqes_per_q >>
+                 OCRDMA_MBX_QUERY_CFG_MAX_WQES_PER_WQ_OFFSET;
+        dev->attr.max_rqe = rsp->max_wqes_rqes_per_q &
+                OCRDMA_MBX_QUERY_CFG_MAX_RQES_PER_RQ_MASK;
 }
 
 static int ocrdma_check_fw_config(struct ocrdma_dev *dev,
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
index 04fef3de6d75..b050e629e9c3 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
@@ -97,13 +97,11 @@ static void ocrdma_build_sgid_mac(union ib_gid *sgid, unsigned char *mac_addr,
         sgid->raw[15] = mac_addr[5];
 }
 
-static void ocrdma_add_sgid(struct ocrdma_dev *dev, unsigned char *mac_addr,
+static bool ocrdma_add_sgid(struct ocrdma_dev *dev, unsigned char *mac_addr,
                             bool is_vlan, u16 vlan_id)
 {
         int i;
-        bool found = false;
         union ib_gid new_sgid;
-        int free_idx = OCRDMA_MAX_SGID;
         unsigned long flags;
 
         memset(&ocrdma_zero_sgid, 0, sizeof(union ib_gid));
@@ -115,23 +113,19 @@ static void ocrdma_add_sgid(struct ocrdma_dev *dev, unsigned char *mac_addr,
                 if (!memcmp(&dev->sgid_tbl[i], &ocrdma_zero_sgid,
                             sizeof(union ib_gid))) {
                         /* found free entry */
-                        if (!found) {
-                                free_idx = i;
-                                found = true;
-                                break;
-                        }
+                        memcpy(&dev->sgid_tbl[i], &new_sgid,
+                               sizeof(union ib_gid));
+                        spin_unlock_irqrestore(&dev->sgid_lock, flags);
+                        return true;
                 } else if (!memcmp(&dev->sgid_tbl[i], &new_sgid,
                                    sizeof(union ib_gid))) {
                         /* entry already present, no addition is required. */
                         spin_unlock_irqrestore(&dev->sgid_lock, flags);
-                        return;
+                        return false;
                 }
         }
-        /* if entry doesn't exist and if table has some space, add entry */
-        if (found)
-                memcpy(&dev->sgid_tbl[free_idx], &new_sgid,
-                       sizeof(union ib_gid));
         spin_unlock_irqrestore(&dev->sgid_lock, flags);
+        return false;
 }
 
 static bool ocrdma_del_sgid(struct ocrdma_dev *dev, unsigned char *mac_addr,
@@ -167,7 +161,8 @@ static void ocrdma_add_default_sgid(struct ocrdma_dev *dev)
         ocrdma_get_guid(dev, &sgid->raw[8]);
 }
 
-static int ocrdma_build_sgid_tbl(struct ocrdma_dev *dev)
+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
+static void ocrdma_add_vlan_sgids(struct ocrdma_dev *dev)
 {
         struct net_device *netdev, *tmp;
         u16 vlan_id;
@@ -175,8 +170,6 @@ static int ocrdma_build_sgid_tbl(struct ocrdma_dev *dev)
 
         netdev = dev->nic_info.netdev;
 
-        ocrdma_add_default_sgid(dev);
-
         rcu_read_lock();
         for_each_netdev_rcu(&init_net, tmp) {
                 if (netdev == tmp || vlan_dev_real_dev(tmp) == netdev) {
@@ -194,10 +187,23 @@ static int ocrdma_build_sgid_tbl(struct ocrdma_dev *dev)
                 }
         }
         rcu_read_unlock();
+}
+#else
+static void ocrdma_add_vlan_sgids(struct ocrdma_dev *dev)
+{
+
+}
+#endif /* VLAN */
+
+static int ocrdma_build_sgid_tbl(struct ocrdma_dev *dev)
+{
+        ocrdma_add_default_sgid(dev);
+        ocrdma_add_vlan_sgids(dev);
         return 0;
 }
 
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) || \
+defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 
 static int ocrdma_inet6addr_event(struct notifier_block *notifier,
                                   unsigned long event, void *ptr)
@@ -208,6 +214,7 @@ static int ocrdma_inet6addr_event(struct notifier_block *notifier,
         struct ib_event gid_event;
         struct ocrdma_dev *dev;
         bool found = false;
+        bool updated = false;
         bool is_vlan = false;
         u16 vid = 0;
 
@@ -233,23 +240,21 @@ static int ocrdma_inet6addr_event(struct notifier_block *notifier,
         mutex_lock(&dev->dev_lock);
         switch (event) {
         case NETDEV_UP:
-                ocrdma_add_sgid(dev, netdev->dev_addr, is_vlan, vid);
+                updated = ocrdma_add_sgid(dev, netdev->dev_addr, is_vlan, vid);
                 break;
         case NETDEV_DOWN:
-                found = ocrdma_del_sgid(dev, netdev->dev_addr, is_vlan, vid);
-                if (found) {
-                        /* found the matching entry, notify
-                         * the consumers about it
-                         */
-                        gid_event.device = &dev->ibdev;
-                        gid_event.element.port_num = 1;
-                        gid_event.event = IB_EVENT_GID_CHANGE;
-                        ib_dispatch_event(&gid_event);
-                }
+                updated = ocrdma_del_sgid(dev, netdev->dev_addr, is_vlan, vid);
                 break;
         default:
                 break;
         }
+        if (updated) {
+                /* GID table updated, notify the consumers about it */
+                gid_event.device = &dev->ibdev;
+                gid_event.element.port_num = 1;
+                gid_event.event = IB_EVENT_GID_CHANGE;
+                ib_dispatch_event(&gid_event);
+        }
         mutex_unlock(&dev->dev_lock);
         return NOTIFY_OK;
 }
@@ -258,7 +263,7 @@ static struct notifier_block ocrdma_inet6addr_notifier = {
         .notifier_call = ocrdma_inet6addr_event
 };
 
-#endif /* IPV6 */
+#endif /* IPV6 and VLAN */
 
 static enum rdma_link_layer ocrdma_link_layer(struct ib_device *device,
                                               u8 port_num)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_sli.h b/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
index 7fd80cc0f037..c75cbdfa87e7 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
@@ -418,6 +418,9 @@ enum {
 
         OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_SHIFT         = 0,
         OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_MASK          = 0xFFFF,
+        OCRDMA_MBX_QUERY_CFG_MAX_WRITE_SGE_SHIFT        = 16,
+        OCRDMA_MBX_QUERY_CFG_MAX_WRITE_SGE_MASK         = 0xFFFF <<
+                                OCRDMA_MBX_QUERY_CFG_MAX_WRITE_SGE_SHIFT,
 
         OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_SHIFT       = 0,
         OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_MASK        = 0xFFFF,
@@ -458,7 +461,7 @@ enum {
                                 OCRDMA_MBX_QUERY_CFG_MAX_WQES_PER_WQ_OFFSET,
         OCRDMA_MBX_QUERY_CFG_MAX_RQES_PER_RQ_OFFSET     = 0,
         OCRDMA_MBX_QUERY_CFG_MAX_RQES_PER_RQ_MASK       = 0xFFFF <<
-                                OCRDMA_MBX_QUERY_CFG_MAX_WQES_PER_WQ_OFFSET,
+                                OCRDMA_MBX_QUERY_CFG_MAX_RQES_PER_RQ_OFFSET,
 
         OCRDMA_MBX_QUERY_CFG_MAX_CQ_OFFSET              = 16,
         OCRDMA_MBX_QUERY_CFG_MAX_CQ_MASK                = 0xFFFF <<
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index d16d172b6b6b..2e2e7aecc990 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -53,7 +53,7 @@ int ocrdma_query_gid(struct ib_device *ibdev, u8 port,
 
         dev = get_ocrdma_dev(ibdev);
         memset(sgid, 0, sizeof(*sgid));
-        if (index > OCRDMA_MAX_SGID)
+        if (index >= OCRDMA_MAX_SGID)
                 return -EINVAL;
 
         memcpy(sgid, &dev->sgid_tbl[index], sizeof(*sgid));
@@ -83,8 +83,8 @@ int ocrdma_query_device(struct ib_device *ibdev, struct ib_device_attr *attr)
                                         IB_DEVICE_SHUTDOWN_PORT |
                                         IB_DEVICE_SYS_IMAGE_GUID |
                                         IB_DEVICE_LOCAL_DMA_LKEY;
-        attr->max_sge = dev->attr.max_send_sge;
-        attr->max_sge_rd = dev->attr.max_send_sge;
+        attr->max_sge = min(dev->attr.max_send_sge, dev->attr.max_srq_sge);
+        attr->max_sge_rd = 0;
         attr->max_cq = dev->attr.max_cq;
         attr->max_cqe = dev->attr.max_cqe;
         attr->max_mr = dev->attr.max_mr;
@@ -97,7 +97,7 @@ int ocrdma_query_device(struct ib_device *ibdev, struct ib_device_attr *attr)
             min(dev->attr.max_ord_per_qp, dev->attr.max_ird_per_qp);
         attr->max_qp_init_rd_atom = dev->attr.max_ord_per_qp;
         attr->max_srq = (dev->attr.max_qp - 1);
-        attr->max_srq_sge = attr->max_sge;
+        attr->max_srq_sge = attr->max_srq_sge;
         attr->max_srq_wr = dev->attr.max_rqe;
         attr->local_ca_ack_delay = dev->attr.local_ca_ack_delay;
         attr->max_fast_reg_page_list_len = 0;
@@ -2301,8 +2301,10 @@ static bool ocrdma_poll_err_rcqe(struct ocrdma_qp *qp, struct ocrdma_cqe *cqe,
                         *stop = true;
                         expand = false;
                 }
-        } else
+        } else {
+                *polled = true;
                 expand = ocrdma_update_err_rcqe(ibwc, cqe, qp, status);
+        }
         return expand;
 }
 
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 04cb8c88d74b..12b2b55c519e 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -379,7 +379,7 @@ config LEDS_NETXBIG
 
 config LEDS_ASIC3
         bool "LED support for the HTC ASIC3"
-        depends on LEDS_CLASS
+        depends on LEDS_CLASS=y
         depends on MFD_ASIC3
         default y
         help
@@ -390,7 +390,7 @@ config LEDS_ASIC3
 
 config LEDS_RENESAS_TPU
         bool "LED support for Renesas TPU"
-        depends on LEDS_CLASS && HAVE_CLK && GENERIC_GPIO
+        depends on LEDS_CLASS=y && HAVE_CLK && GENERIC_GPIO
         help
           This option enables build of the LED TPU platform driver,
           suitable to drive any TPU channel on newer Renesas SoCs.
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index 8ee92c81aec2..e663e6f413e9 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -29,7 +29,7 @@ static void led_update_brightness(struct led_classdev *led_cdev)
                 led_cdev->brightness = led_cdev->brightness_get(led_cdev);
 }
 
-static ssize_t led_brightness_show(struct device *dev, 
+static ssize_t led_brightness_show(struct device *dev,
                 struct device_attribute *attr, char *buf)
 {
         struct led_classdev *led_cdev = dev_get_drvdata(dev);
diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
index d6860043f6f9..d65353d8d3fc 100644
--- a/drivers/leds/led-core.c
+++ b/drivers/leds/led-core.c
@@ -44,13 +44,6 @@ static void led_set_software_blink(struct led_classdev *led_cdev,
         if (!led_cdev->blink_brightness)
                 led_cdev->blink_brightness = led_cdev->max_brightness;
 
-        if (led_get_trigger_data(led_cdev) &&
-            delay_on == led_cdev->blink_delay_on &&
-            delay_off == led_cdev->blink_delay_off)
-                return;
-
-        led_stop_software_blink(led_cdev);
-
         led_cdev->blink_delay_on = delay_on;
         led_cdev->blink_delay_off = delay_off;
 
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index 7d42c11c8684..0cdbd742974a 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -198,7 +198,6 @@ static int fops_open(struct file *file)
         struct saa7146_dev *dev = video_drvdata(file);
         struct saa7146_fh *fh = NULL;
         int result = 0;
-        enum v4l2_buf_type type;
 
         DEB_EE("file:%p, dev:%s\n", file, video_device_node_name(vdev));
 
@@ -207,10 +206,6 @@ static int fops_open(struct file *file)
 
         DEB_D("using: %p\n", dev);
 
-        type = vdev->vfl_type == VFL_TYPE_GRABBER
-             ? V4L2_BUF_TYPE_VIDEO_CAPTURE
-             : V4L2_BUF_TYPE_VBI_CAPTURE;
-
         /* check if an extension is registered */
         if( NULL == dev->ext ) {
                 DEB_S("no extension registered for this device\n");
diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c
index 98ecaf0900d6..3180f5b2a6a6 100644
--- a/drivers/media/dvb/frontends/cx24110.c
+++ b/drivers/media/dvb/frontends/cx24110.c
@@ -516,9 +516,9 @@ static int cx24110_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
         if(cx24110_readreg(state,0x10)&0x40) {
                 /* the RS error counter has finished one counting window */
                 cx24110_writereg(state,0x10,0x60); /* select the byer reg */
-                cx24110_readreg(state, 0x12) |
+                (void)(cx24110_readreg(state, 0x12) |
                         (cx24110_readreg(state, 0x13) << 8) |
-                        (cx24110_readreg(state, 0x14) << 16);
+                        (cx24110_readreg(state, 0x14) << 16));
                 cx24110_writereg(state,0x10,0x70); /* select the bler reg */
                 state->lastbler=cx24110_readreg(state,0x12)|
                         (cx24110_readreg(state,0x13)<<8)|
diff --git a/drivers/media/dvb/frontends/cxd2820r_c.c b/drivers/media/dvb/frontends/cxd2820r_c.c
index 945404991529..ed3b0ba624de 100644
--- a/drivers/media/dvb/frontends/cxd2820r_c.c
+++ b/drivers/media/dvb/frontends/cxd2820r_c.c
@@ -121,7 +121,7 @@ int cxd2820r_get_frontend_c(struct dvb_frontend *fe)
         if (ret)
                 goto error;
 
-        switch ((buf[0] >> 0) & 0x03) {
+        switch ((buf[0] >> 0) & 0x07) {
         case 0:
                 c->modulation = QAM_16;
                 break;
diff --git a/drivers/media/dvb/frontends/lg2160.c b/drivers/media/dvb/frontends/lg2160.c
index a3ab1a5b6597..cc11260e99df 100644
--- a/drivers/media/dvb/frontends/lg2160.c
+++ b/drivers/media/dvb/frontends/lg2160.c
@@ -126,7 +126,7 @@ static int lg216x_write_regs(struct lg216x_state *state,
 
         lg_reg("writing %d registers...\n", len);
 
-        for (i = 0; i < len - 1; i++) {
+        for (i = 0; i < len; i++) {
                 ret = lg216x_write_reg(state, regs[i].reg, regs[i].val);
                 if (lg_fail(ret))
                         return ret;
diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c
index 63c004a25e0b..664e460f247b 100644
--- a/drivers/media/dvb/siano/smsusb.c
+++ b/drivers/media/dvb/siano/smsusb.c
@@ -544,6 +544,8 @@ static const struct usb_device_id smsusb_id_table[] __devinitconst = {
                 .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
         { USB_DEVICE(0x2040, 0xc0a0),
                 .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
+        { USB_DEVICE(0x2040, 0xf5a0),
+                .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
         { } /* Terminating entry */
         };
 
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index 740a3d5520c7..b415211d0c4b 100644
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -157,7 +157,7 @@ static int __devinit maxiradio_probe(struct pci_dev *pdev, const struct pci_devi
                 goto err_out_free_region;
 
         dev->io = pci_resource_start(pdev, 0);
-        if (snd_tea575x_init(&dev->tea)) {
+        if (snd_tea575x_init(&dev->tea, THIS_MODULE)) {
                 printk(KERN_ERR "radio-maxiradio: Unable to detect TEA575x tuner\n");
                 goto err_out_free_region;
         }
diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c
index 52b8011f1b23..4efcbec74c52 100644
--- a/drivers/media/radio/radio-sf16fmr2.c
+++ b/drivers/media/radio/radio-sf16fmr2.c
@@ -238,7 +238,7 @@ static int __devinit fmr2_probe(struct fmr2 *fmr2, struct device *pdev, int io)
         snprintf(fmr2->tea.bus_info, sizeof(fmr2->tea.bus_info), "%s:%s",
                         fmr2->is_fmd2 ? "PnP" : "ISA", dev_name(pdev));
 
-        if (snd_tea575x_init(&fmr2->tea)) {
+        if (snd_tea575x_init(&fmr2->tea, THIS_MODULE)) {
                 printk(KERN_ERR "radio-sf16fmr2: Unable to detect TEA575x tuner\n");
                 release_region(fmr2->io, 2);
                 return -ENODEV;
diff --git a/drivers/media/radio/si470x/radio-si470x-usb.c b/drivers/media/radio/si470x/radio-si470x-usb.c
index e9f638761296..f412f7ab270b 100644
--- a/drivers/media/radio/si470x/radio-si470x-usb.c
+++ b/drivers/media/radio/si470x/radio-si470x-usb.c
@@ -51,6 +51,8 @@ static struct usb_device_id si470x_usb_driver_id_table[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(0x1b80, 0xd700, USB_CLASS_HID, 0, 0) },
         /* Sanei Electric, Inc. FM USB Radio (sold as DealExtreme.com PCear) */
         { USB_DEVICE_AND_INTERFACE_INFO(0x10c5, 0x819a, USB_CLASS_HID, 0, 0) },
+        /* Axentia ALERT FM USB Receiver */
+        { USB_DEVICE_AND_INTERFACE_INFO(0x12cf, 0x7111, USB_CLASS_HID, 0, 0) },
         /* Terminating entry */
         { }
 };
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index ff2933ab705f..856ab962cd63 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -371,7 +371,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 2, 0, 0, 0 },
                 .gpiomute       = 10,
-                .needs_tvaudio  = 1,
                 .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
         },
@@ -384,7 +383,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 0, 1, 2, 3 },
                 .gpiomute       = 4,
-                .needs_tvaudio  = 1,
                 .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
         },
@@ -398,7 +396,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomux        = { 4, 0, 2, 3 },
                 .gpiomute       = 1,
                 .no_msp34xx     = 1,
-                .needs_tvaudio  = 1,
                 .tuner_type     = TUNER_PHILIPS_NTSC,
                 .tuner_addr     = ADDR_UNSET,
                 .pll            = PLL_28,
@@ -414,7 +411,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0,
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 0 },
-                .needs_tvaudio  = 0,
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
         },
@@ -427,7 +423,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 0),
                 .gpiomux        = { 0, 1, 0, 1 },
                 .gpiomute       = 3,
-                .needs_tvaudio  = 1,
                 .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
         },
@@ -440,7 +435,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0x0f,
                 .gpiomux        = { 0x0c, 0x04, 0x08, 0x04 },
                 /*                0x04 for some cards ?? */
-                .needs_tvaudio  = 1,
                 .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .audio_mode_gpio= avermedia_tvphone_audio,
@@ -454,7 +448,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0,
                 .muxsel         = MUXSEL(2, 3, 1, 0, 0),
                 .gpiomux        = { 0 },
-                .needs_tvaudio  = 1,
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
         },
@@ -469,7 +462,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 0, 0xc00, 0x800, 0x400 },
                 .gpiomute       = 0xc00,
-                .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
@@ -482,7 +474,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 3,
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 1, 1, 2, 3 },
-                .needs_tvaudio  = 0,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_TEMIC_PAL,
                 .tuner_addr     = ADDR_UNSET,
@@ -496,7 +487,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 0, 1, 1),
                 .gpiomux        = { 0, 1, 2, 3 },
                 .gpiomute       = 4,
-                .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
@@ -510,7 +500,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 0x20001,0x10001, 0, 0 },
                 .gpiomute       = 10,
-                .needs_tvaudio  = 1,
                 .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
         },
@@ -524,7 +513,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 15,
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 13, 14, 11, 7 },
-                .needs_tvaudio  = 1,
                 .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
         },
@@ -536,7 +524,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 15,
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 13, 14, 11, 7 },
-                .needs_tvaudio  = 1,
                 .msp34xx_alt    = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL,
@@ -553,7 +540,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 0, 2, 1, 3 }, /* old: {0, 1, 2, 3, 4} */
                 .gpiomute       = 4,
-                .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
@@ -567,7 +553,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 0, 0, 1, 0 },
                 .gpiomute       = 10,
-                .needs_tvaudio  = 1,
                 .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
         },
@@ -583,7 +568,6 @@ struct tvcard bttv_tvcards[] = {
                 /* 2003-10-20 by "Anton A. Arapov" <arapov@mail.ru> */
                 .gpiomux        = { 0x001e00, 0, 0x018000, 0x014000 },
                 .gpiomute       = 0x002000,
-                .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
@@ -597,7 +581,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1, 0),
                 .gpiomux        = { 0x4fa007,0xcfa007,0xcfa007,0xcfa007 },
                 .gpiomute       = 0xcfa007,
-                .needs_tvaudio  = 1,
                 .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .volume_gpio    = winview_volume,
@@ -611,7 +594,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0,
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 1, 0, 0, 0 },
-                .needs_tvaudio  = 1,
                 .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
         },
@@ -660,7 +642,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 0, 1, 0x800, 0x400 },
                 .gpiomute       = 0xc00,
-                .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
@@ -691,7 +672,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = {0x400, 0x400, 0x400, 0x400 },
                 .gpiomute       = 0xc00,
-                .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
@@ -706,7 +686,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 0x20000, 0x30000, 0x10000, 0 },
                 .gpiomute       = 0x40000,
-                .needs_tvaudio  = 0,
                 .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
                 .audio_mode_gpio= terratv_audio,
@@ -720,7 +699,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 0, 1, 1),
                 .gpiomux        = { 0, 1, 2, 3 },
                 .gpiomute       = 4,
-                .needs_tvaudio  = 1,
                 .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
         },
@@ -748,7 +726,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 0x20000, 0x30000, 0x10000, 0x00000 },
                 .gpiomute       = 0x40000,
-                .needs_tvaudio  = 0,
                 .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
                 .audio_mode_gpio= terratv_audio,
@@ -793,7 +770,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0,
                 .muxsel         = MUXSEL(2, 3, 1, 0, 0),
                 .gpiomux        = { 0 },
-                .needs_tvaudio  = 1,
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
                 .muxsel_hook    = PXC200_muxsel,
@@ -834,7 +810,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0,
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 0 },
-                .needs_tvaudio  = 0,
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
         },
@@ -847,7 +822,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 0x500, 0, 0x300, 0x900 },
                 .gpiomute       = 0x900,
-                .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
@@ -874,7 +848,6 @@ struct tvcard bttv_tvcards[] = {
                 Note: There exists another variant "Winfast 2000" with tv stereo !?
                 Note: eeprom only contains FF and pci subsystem id 107d:6606
                 */
-                .needs_tvaudio  = 0,
                 .pll            = PLL_28,
                 .has_radio      = 1,
                 .tuner_type     = TUNER_PHILIPS_PAL, /* default for now, gpio reads BFFF06 for Pal bg+dk */
@@ -934,7 +907,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 0),
                 .gpiomux        = { 0x551400, 0x551200, 0, 0 },
                 .gpiomute       = 0x551c00,
-                .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL_I,
                 .tuner_addr     = ADDR_UNSET,
@@ -949,7 +921,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 2, 0xd0001, 0, 0 },
                 .gpiomute       = 1,
-                .needs_tvaudio  = 0,
                 .pll            = PLL_28,
                 .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
@@ -966,7 +937,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomux        = { 4, 0, 2, 3 },
                 .gpiomute       = 1,
                 .no_msp34xx     = 1,
-                .needs_tvaudio  = 1,
                 .tuner_type     = TUNER_PHILIPS_NTSC,
                 .tuner_addr     = ADDR_UNSET,
                 .pll            = PLL_28,
@@ -980,7 +950,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 15,
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 13, 4, 11, 7 },
-                .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
@@ -995,7 +964,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0,
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 0, 0, 0, 0},
-                .needs_tvaudio  = 1,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL_I,
@@ -1066,7 +1034,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 0x20000, 0x30000, 0x10000, 0 },
                 .gpiomute       = 0x40000,
-                .needs_tvaudio  = 1,
                 .no_msp34xx     = 1,
                 .pll            = PLL_35,
                 .tuner_type     = TUNER_PHILIPS_PAL_I,
@@ -1084,7 +1051,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = {2,0,0,0 },
                 .gpiomute       = 1,
-                .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
@@ -1163,7 +1129,6 @@ struct tvcard bttv_tvcards[] = {
                                 MUX2 (mask 0x30000):
                                         0,2,3= from MSP34xx
                                         1= FM stereo Radio from Tuner */
-                .needs_tvaudio  = 0,
                 .pll            = PLL_28,
                 .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
@@ -1179,7 +1144,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 0, 0, 0x10, 8 },
                 .gpiomute       = 4,
-                .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
@@ -1218,7 +1182,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 0),
                 .gpiomux        = { 2, 0, 0, 0 },
                 .gpiomute       = 10,
-                .needs_tvaudio  = 0,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_TEMIC_PAL,
                 .tuner_addr     = ADDR_UNSET,
@@ -1250,7 +1213,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0,
                 .muxsel         = MUXSEL(3, 1),
                 .gpiomux        = { 0 },
-                .needs_tvaudio  = 0,
                 .no_msp34xx     = 1,
                 .pll            = PLL_35,
                 .tuner_type     = TUNER_ABSENT,
@@ -1266,7 +1228,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 0x400, 0x400, 0x400, 0x400 },
                 .gpiomute       = 0x800,
-                .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_TEMIC_4036FY5_NTSC,
                 .tuner_addr     = ADDR_UNSET,
@@ -1312,7 +1273,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 2),
                 .gpiomux        = { },
                 .no_msp34xx     = 1,
-                .needs_tvaudio  = 0,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
@@ -1329,7 +1289,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 0),
                 .gpiomux        = { 1, 0, 4, 4 },
                 .gpiomute       = 9,
-                .needs_tvaudio  = 0,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
@@ -1379,7 +1338,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomute       = 0x1800,
                 .audio_mode_gpio= fv2000s_audio,
                 .no_msp34xx     = 1,
-                .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
@@ -1393,7 +1351,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 0x500, 0x500, 0x300, 0x900 },
                 .gpiomute       = 0x900,
-                .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
@@ -1477,7 +1434,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 0, 0, 11, 7 }, /* TV and Radio with same GPIO ! */
                 .gpiomute       = 13,
-                .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_LG_PAL_I_FM,
                 .tuner_addr     = ADDR_UNSET,
@@ -1514,7 +1470,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 0x01, 0x00, 0x03, 0x03 },
                 .gpiomute       = 0x09,
-                .needs_tvaudio  = 1,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL,
@@ -1540,7 +1495,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0,
                 .muxsel         = MUXSEL(2, 3, 1, 0, 0),
                 .gpiomux        = { 0 },
-                .needs_tvaudio  = 0,
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
         },
@@ -1567,7 +1521,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 1, 1),
                 .gpiomux        = { 0, 1, 2, 2 },
                 .gpiomute       = 4,
-                .needs_tvaudio  = 0,
                 .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
                 .pll            = PLL_28,
@@ -1597,7 +1550,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0,
                 .muxsel         = MUXSEL(2, 3, 1, 0),
                 .gpiomux        = { 0 },
-                .needs_tvaudio  = 0,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_ABSENT,
@@ -1619,7 +1571,6 @@ struct tvcard bttv_tvcards[] = {
                                                 * btwincap uses 0x80000/0x80003
                                                 */
                 .gpiomute       = 4,
-                .needs_tvaudio  = 0,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL,
@@ -1655,7 +1606,6 @@ struct tvcard bttv_tvcards[] = {
                 /* .audio_inputs= 1, */
                 .svhs           = 2,
                 .muxsel         = MUXSEL(2, 0, 1, 1),
-                .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
@@ -1875,7 +1825,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 0, 1, 2, 3},
                 .gpiomute       = 4,
-                .needs_tvaudio  = 1,
                 .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
                 .pll            = PLL_28,
@@ -1902,7 +1851,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0,
                 .muxsel         = MUXSEL(2, 3),
                 .gpiomux        = { 0 },
-                .needs_tvaudio  = 0,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_ABSENT,
@@ -1920,7 +1868,6 @@ struct tvcard bttv_tvcards[] = {
                 /*                  Tuner, Radio, external, internal, off,  on */
                 .gpiomux        = { 0x08,  0x0f,  0x0a,     0x08 },
                 .gpiomute       = 0x0f,
-                .needs_tvaudio  = 0,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_NTSC,
@@ -1936,7 +1883,6 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x00,
                 .muxsel         = MUXSEL(2, 3, 1, 1),
-                .needs_tvaudio  = 1,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL,
@@ -2034,7 +1980,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0,
                 .muxsel         = MUXSEL(2, 3, 1, 0),
                 .gpiomux        = { 0 },
-                .needs_tvaudio  = 0,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_ABSENT,
@@ -2049,7 +1994,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0x00,
                 .muxsel         = MUXSEL(2, 3, 1, 0),
                 .gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
-                .needs_tvaudio  = 0,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
@@ -2062,7 +2006,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0x00,
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
-                .needs_tvaudio  = 0,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
@@ -2079,7 +2022,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 2, 2, 2, 3, 3, 3, 3, 1, 0),
                 .muxsel_hook    = phytec_muxsel,
                 .gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
-                .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
@@ -2094,7 +2036,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 2, 2, 2, 3, 3, 3, 3, 1, 1),
                 .muxsel_hook    = phytec_muxsel,
                 .gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
-                .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
@@ -2118,7 +2059,6 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
                 .svhs           = NO_SVHS,   /* card has no svhs */
-                .needs_tvaudio  = 0,
                 .no_msp34xx     = 1,
                 .no_tda7432     = 1,
                 .gpiomask       = 0x00,
@@ -2168,7 +2108,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 3,
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 1, 1, 1, 1 },
-                .needs_tvaudio  = 1,
                 .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
                 .pll            = PLL_35,
@@ -2210,7 +2149,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 0),
                 .no_msp34xx     = 1,
                 .no_tda7432     = 1,
-                .needs_tvaudio  = 0,
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
         },
@@ -2222,7 +2160,6 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
                 .svhs           = 2,
-                .needs_tvaudio  = 0,
                 .gpiomask       = 0x68,
                 .muxsel         = MUXSEL(2, 3, 1),
                 .gpiomux        = { 0x68, 0x68, 0x61, 0x61 },
@@ -2241,7 +2178,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 0, 1, 2, 2 },
                 .gpiomute       = 3,
-                .needs_tvaudio  = 0,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
@@ -2265,7 +2201,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 2, 2, 2),
                 .gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
                 .pll            = PLL_28,
-                .needs_tvaudio  = 0,
                 .muxsel_hook    = picolo_tetra_muxsel,/*Required as it doesn't follow the classic input selection policy*/
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
@@ -2358,7 +2293,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 2, 0, 0, 0 },
                 .gpiomute       = 10,
-                .needs_tvaudio  = 0,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
@@ -2405,7 +2339,6 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .gpiomask       = 0x008007,
                 .gpiomux        = { 0, 0x000001,0,0 },
-                .needs_tvaudio  = 1,
                 .has_radio      = 1,
         },
         [BTTV_BOARD_TIBET_CS16] = {
@@ -2518,7 +2451,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 0x001e00, 0, 0x018000, 0x014000 },
                 .gpiomute       = 0x002000,
-                .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_YMEC_TVF66T5_B_DFF,
                 .tuner_addr     = 0xc1 >>1,
@@ -2534,7 +2466,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 0, 1, 2, 2 },
                 .gpiomute       = 3,
-                .needs_tvaudio  = 0,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_TENA_9533_DI,
                 .tuner_addr     = ADDR_UNSET,
@@ -2615,7 +2546,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 2, 0, 0, 0 },
                 .gpiomute       = 1,
-                .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_NTSC,
                 .tuner_addr     = ADDR_UNSET,
@@ -2714,7 +2644,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 0x20001,0x10001, 0, 0 },
                 .gpiomute       = 10,
-                .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL_I,
                 .tuner_addr     = ADDR_UNSET,
@@ -2746,7 +2675,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 0, 1, 2, 2 }, /* CONTVFMi */
                 .gpiomute       = 3, /* CONTVFMi */
-                .needs_tvaudio  = 0,
                 .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3, /* TCL MK3 */
                 .tuner_addr     = ADDR_UNSET,
                 .pll            = PLL_28,
@@ -2785,7 +2713,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0x00,
                 .muxsel         = MUXSEL(0, 2, 3, 1),
                 .gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
-                .needs_tvaudio  = 0,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
@@ -2799,7 +2726,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0x00,
                 .muxsel         = MUXSEL(2, 3, 1),
                 .gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
-                .needs_tvaudio  = 0,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
@@ -2813,7 +2739,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0x00,
                 .muxsel         = MUXSEL(3, 2, 1),
                 .gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
-                .needs_tvaudio  = 0,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
@@ -2877,7 +2802,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0,
                 .muxsel         = MUXSEL(2, 3),
                 .gpiomux        = { 0 },
-                .needs_tvaudio  = 0,
                 .no_msp34xx     = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_ABSENT,
@@ -3649,7 +3573,7 @@ void __devinit bttv_init_tuner(struct bttv *btv)
                 struct tuner_setup tun_setup;
 
                 /* Load tuner module before issuing tuner config call! */
-                if (bttv_tvcards[btv->c.type].has_radio)
+                if (btv->has_radio)
                         v4l2_i2c_new_subdev(&btv->c.v4l2_dev,
                                 &btv->c.i2c_adap, "tuner",
                                 0, v4l2_i2c_tuner_addrs(ADDRS_RADIO));
@@ -3664,7 +3588,7 @@ void __devinit bttv_init_tuner(struct bttv *btv)
                 tun_setup.type = btv->tuner_type;
                 tun_setup.addr = addr;
 
-                if (bttv_tvcards[btv->c.type].has_radio)
+                if (btv->has_radio)
                         tun_setup.mode_mask |= T_RADIO;
 
                 bttv_call_all(btv, tuner, s_type_addr, &tun_setup);
@@ -3724,6 +3648,10 @@ static void __devinit hauppauge_eeprom(struct bttv *btv)
                         bttv_tvcards[BTTV_BOARD_HAUPPAUGE_IMPACTVCB].name);
                 btv->c.type = BTTV_BOARD_HAUPPAUGE_IMPACTVCB;
         }
+
+        /* The 61334 needs the msp3410 to do the radio demod to get sound */
+        if (tv.model == 61334)
+                btv->radio_uses_msp_demodulator = 1;
 }
 
 static int terratec_active_radio_upgrade(struct bttv *btv)
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index a9cfb0f4be48..ff7a589d8e0f 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -1218,6 +1218,11 @@ audio_mux(struct bttv *btv, int input, int mute)
                    For now this is sufficient. */
                 switch (input) {
                 case TVAUDIO_INPUT_RADIO:
+                        /* Some boards need the msp do to the radio demod */
+                        if (btv->radio_uses_msp_demodulator) {
+                                in = MSP_INPUT_DEFAULT;
+                                break;
+                        }
                         in = MSP_INPUT(MSP_IN_SCART2, MSP_IN_TUNER1,
                                     MSP_DSP_IN_SCART, MSP_DSP_IN_SCART);
                         break;
diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h
index c5171619ac79..acfe2f3b92d9 100644
--- a/drivers/media/video/bt8xx/bttv.h
+++ b/drivers/media/video/bt8xx/bttv.h
@@ -236,7 +236,6 @@ struct tvcard {
         /* i2c audio flags */
         unsigned int no_msp34xx:1;
         unsigned int no_tda7432:1;
-        unsigned int needs_tvaudio:1;
         unsigned int msp34xx_alt:1;
         /* Note: currently no card definition needs to mark the presence
            of a RDS saa6588 chip. If this is ever needed, then add a new
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h
index db943a8d580d..70fd4f23f605 100644
--- a/drivers/media/video/bt8xx/bttvp.h
+++ b/drivers/media/video/bt8xx/bttvp.h
@@ -440,6 +440,7 @@ struct bttv {
         /* radio data/state */
         int has_radio;
         int radio_user;
+        int radio_uses_msp_demodulator;
 
         /* miro/pinnacle + Aimslab VHX
            philips matchbox (tea5757 radio tuner) support */
diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c
index 2520219f01ba..5b75a64b199b 100644
--- a/drivers/media/video/bw-qcam.c
+++ b/drivers/media/video/bw-qcam.c
@@ -607,8 +607,9 @@ static long qc_capture(struct qcam *q, char __user *buf, unsigned long len)
                                 }
                                 o = i * pixels_per_line + pixels_read + k;
                                 if (o < len) {
+                                        u8 ch = invert - buffer[k];
                                         got++;
-                                        put_user((invert - buffer[k]) << shift, buf + o);
+                                        put_user(ch << shift, buf + o);
                                 }
                         }
                         pixels_read += bytes;
@@ -648,8 +649,8 @@ static int qcam_querycap(struct file *file, void  *priv,
         struct qcam *qcam = video_drvdata(file);
 
         strlcpy(vcap->driver, qcam->v4l2_dev.name, sizeof(vcap->driver));
-        strlcpy(vcap->card, "B&W Quickcam", sizeof(vcap->card));
-        strlcpy(vcap->bus_info, "parport", sizeof(vcap->bus_info));
+        strlcpy(vcap->card, "Connectix B&W Quickcam", sizeof(vcap->card));
+        strlcpy(vcap->bus_info, qcam->pport->name, sizeof(vcap->bus_info));
         vcap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE;
         vcap->capabilities = vcap->device_caps | V4L2_CAP_DEVICE_CAPS;
         return 0;
@@ -688,8 +689,8 @@ static int qcam_g_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f
         pix->height = qcam->height / qcam->transfer_scale;
         pix->pixelformat = (qcam->bpp == 4) ? V4L2_PIX_FMT_Y4 : V4L2_PIX_FMT_Y6;
         pix->field = V4L2_FIELD_NONE;
-        pix->bytesperline = qcam->width;
-        pix->sizeimage = qcam->width * qcam->height;
+        pix->bytesperline = pix->width;
+        pix->sizeimage = pix->width * pix->height;
         /* Just a guess */
         pix->colorspace = V4L2_COLORSPACE_SRGB;
         return 0;
@@ -757,7 +758,7 @@ static int qcam_enum_fmt_vid_cap(struct file *file, void *fh, struct v4l2_fmtdes
                   "4-Bit Monochrome", V4L2_PIX_FMT_Y4,
                   { 0, 0, 0, 0 }
                 },
-                { 0, 0, 0,
+                { 1, 0, 0,
                   "6-Bit Monochrome", V4L2_PIX_FMT_Y6,
                   { 0, 0, 0, 0 }
                 },
@@ -772,6 +773,25 @@ static int qcam_enum_fmt_vid_cap(struct file *file, void *fh, struct v4l2_fmtdes
         return 0;
 }
 
+static int qcam_enum_framesizes(struct file *file, void *fh,
+                                         struct v4l2_frmsizeenum *fsize)
+{
+        static const struct v4l2_frmsize_discrete sizes[] = {
+                {  80,  60 },
+                { 160, 120 },
+                { 320, 240 },
+        };
+
+        if (fsize->index > 2)
+                return -EINVAL;
+        if (fsize->pixel_format != V4L2_PIX_FMT_Y4 &&
+            fsize->pixel_format != V4L2_PIX_FMT_Y6)
+                return -EINVAL;
+        fsize->type = V4L2_FRMSIZE_TYPE_DISCRETE;
+        fsize->discrete = sizes[fsize->index];
+        return 0;
+}
+
 static ssize_t qcam_read(struct file *file, char __user *buf,
                 size_t count, loff_t *ppos)
 {
@@ -795,6 +815,11 @@ static ssize_t qcam_read(struct file *file, char __user *buf,
         return len;
 }
 
+static unsigned int qcam_poll(struct file *filp, poll_table *wait)
+{
+        return v4l2_ctrl_poll(filp, wait) | POLLIN | POLLRDNORM;
+}
+
 static int qcam_s_ctrl(struct v4l2_ctrl *ctrl)
 {
         struct qcam *qcam =
@@ -828,7 +853,7 @@ static const struct v4l2_file_operations qcam_fops = {
         .owner          = THIS_MODULE,
         .open           = v4l2_fh_open,
         .release        = v4l2_fh_release,
-        .poll           = v4l2_ctrl_poll,
+        .poll           = qcam_poll,
         .unlocked_ioctl = video_ioctl2,
         .read           = qcam_read,
 };
@@ -839,6 +864,7 @@ static const struct v4l2_ioctl_ops qcam_ioctl_ops = {
         .vidioc_s_input                     = qcam_s_input,
         .vidioc_enum_input                  = qcam_enum_input,
         .vidioc_enum_fmt_vid_cap            = qcam_enum_fmt_vid_cap,
+        .vidioc_enum_framesizes             = qcam_enum_framesizes,
         .vidioc_g_fmt_vid_cap               = qcam_g_fmt_vid_cap,
         .vidioc_s_fmt_vid_cap               = qcam_s_fmt_vid_cap,
         .vidioc_try_fmt_vid_cap             = qcam_try_fmt_vid_cap,
@@ -864,9 +890,9 @@ static struct qcam *qcam_init(struct parport *port)
                 return NULL;
 
         v4l2_dev = &qcam->v4l2_dev;
-        strlcpy(v4l2_dev->name, "bw-qcam", sizeof(v4l2_dev->name));
+        snprintf(v4l2_dev->name, sizeof(v4l2_dev->name), "bw-qcam%d", num_cams);
 
-        if (v4l2_device_register(NULL, v4l2_dev) < 0) {
+        if (v4l2_device_register(port->dev, v4l2_dev) < 0) {
                 v4l2_err(v4l2_dev, "Could not register v4l2_device\n");
                 kfree(qcam);
                 return NULL;
@@ -886,7 +912,7 @@ static struct qcam *qcam_init(struct parport *port)
                 return NULL;
         }
         qcam->pport = port;
-        qcam->pdev = parport_register_device(port, "bw-qcam", NULL, NULL,
+        qcam->pdev = parport_register_device(port, v4l2_dev->name, NULL, NULL,
                         NULL, 0, NULL);
         if (qcam->pdev == NULL) {
                 v4l2_err(v4l2_dev, "couldn't register for %s.\n", port->name);
@@ -975,6 +1001,7 @@ static int init_bwqcam(struct parport *port)
                 return -ENODEV;
         }
         qc_calibrate(qcam);
+        v4l2_ctrl_handler_setup(&qcam->hdl);
 
         parport_release(qcam->pdev);
 
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index b55d57cc1a1c..7e5ffd6f5178 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -838,10 +838,10 @@ static int cx18_setup_pci(struct cx18 *cx, struct pci_dev *pci_dev,
         }
 
         CX18_DEBUG_INFO("cx%d (rev %d) at %02x:%02x.%x, "
-                   "irq: %d, latency: %d, memory: 0x%lx\n",
+                   "irq: %d, latency: %d, memory: 0x%llx\n",
                    cx->pci_dev->device, cx->card_rev, pci_dev->bus->number,
                    PCI_SLOT(pci_dev->devfn), PCI_FUNC(pci_dev->devfn),
-                   cx->pci_dev->irq, pci_latency, (unsigned long)cx->base_addr);
+                   cx->pci_dev->irq, pci_latency, (u64)cx->base_addr);
 
         return 0;
 }
@@ -938,7 +938,7 @@ static int __devinit cx18_probe(struct pci_dev *pci_dev,
         if (retval)
                 goto err;
 
-        CX18_DEBUG_INFO("base addr: 0x%08x\n", cx->base_addr);
+        CX18_DEBUG_INFO("base addr: 0x%llx\n", (u64)cx->base_addr);
 
         /* PCI Device Setup */
         retval = cx18_setup_pci(cx, pci_dev, pci_id);
@@ -946,8 +946,8 @@ static int __devinit cx18_probe(struct pci_dev *pci_dev,
                 goto free_workqueues;
 
         /* map io memory */
-        CX18_DEBUG_INFO("attempting ioremap at 0x%08x len 0x%08x\n",
-                   cx->base_addr + CX18_MEM_OFFSET, CX18_MEM_SIZE);
+        CX18_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n",
+                   (u64)cx->base_addr + CX18_MEM_OFFSET, CX18_MEM_SIZE);
         cx->enc_mem = ioremap_nocache(cx->base_addr + CX18_MEM_OFFSET,
                                        CX18_MEM_SIZE);
         if (!cx->enc_mem) {
diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
index 7a37e0ee136f..2767c64df0c8 100644
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -622,7 +622,7 @@ struct cx18 {
                                    unique ID. Starts at 1, so 0 can be used as
                                    uninitialized value in the stream->id. */
 
-        u32 base_addr;
+        resource_size_t base_addr;
 
         u8 card_rev;
         void __iomem *enc_mem, *reg_mem;
diff --git a/drivers/media/video/cx18/cx18-firmware.c b/drivers/media/video/cx18/cx18-firmware.c
index 1b3fb502e6be..b85c292a849a 100644
--- a/drivers/media/video/cx18/cx18-firmware.c
+++ b/drivers/media/video/cx18/cx18-firmware.c
@@ -164,8 +164,13 @@ static int load_apu_fw_direct(const char *fn, u8 __iomem *dst, struct cx18 *cx,
 
         apu_version = (vers[0] << 24) | (vers[4] << 16) | vers[32];
         while (offset + sizeof(seghdr) < fw->size) {
-                /* TODO: byteswapping */
-                memcpy(&seghdr, src + offset / 4, sizeof(seghdr));
+                const u32 *shptr = src + offset / 4;
+
+                seghdr.sync1 = le32_to_cpu(shptr[0]);
+                seghdr.sync2 = le32_to_cpu(shptr[1]);
+                seghdr.addr = le32_to_cpu(shptr[2]);
+                seghdr.size = le32_to_cpu(shptr[3]);
+
                 offset += sizeof(seghdr);
                 if (seghdr.sync1 != APU_ROM_SYNC1 ||
                     seghdr.sync2 != APU_ROM_SYNC2) {
diff --git a/drivers/media/video/cx18/cx18-mailbox.c b/drivers/media/video/cx18/cx18-mailbox.c
index ed8118390b02..eabf00c6351b 100644
--- a/drivers/media/video/cx18/cx18-mailbox.c
+++ b/drivers/media/video/cx18/cx18-mailbox.c
@@ -434,6 +434,7 @@ static int epu_dma_done_irq(struct cx18 *cx, struct cx18_in_work_order *order)
 {
         u32 handle, mdl_ack_offset, mdl_ack_count;
         struct cx18_mailbox *mb;
+        int i;
 
         mb = &order->mb;
         handle = mb->args[0];
@@ -447,8 +448,9 @@ static int epu_dma_done_irq(struct cx18 *cx, struct cx18_in_work_order *order)
                 return -1;
         }
 
-        cx18_memcpy_fromio(cx, order->mdl_ack, cx->enc_mem + mdl_ack_offset,
-                           sizeof(struct cx18_mdl_ack) * mdl_ack_count);
+        for (i = 0; i < sizeof(struct cx18_mdl_ack) * mdl_ack_count; i += sizeof(u32))
+                ((u32 *)order->mdl_ack)[i / sizeof(u32)] =
+                        cx18_readl(cx, cx->enc_mem + mdl_ack_offset + i);
 
         if ((order->flags & CX18_F_EWO_MB_STALE) == 0)
                 mb_ack_irq(cx, order);
@@ -538,6 +540,7 @@ void cx18_api_epu_cmd_irq(struct cx18 *cx, int rpu)
         struct cx18_mailbox *order_mb;
         struct cx18_in_work_order *order;
         int submit;
+        int i;
 
         switch (rpu) {
         case CPU:
@@ -562,10 +565,12 @@ void cx18_api_epu_cmd_irq(struct cx18 *cx, int rpu)
         order_mb = &order->mb;
 
         /* mb->cmd and mb->args[0] through mb->args[2] */
-        cx18_memcpy_fromio(cx, &order_mb->cmd, &mb->cmd, 4 * sizeof(u32));
+        for (i = 0; i < 4; i++)
+                (&order_mb->cmd)[i] = cx18_readl(cx, &mb->cmd + i);
+
         /* mb->request and mb->ack.  N.B. we want to read mb->ack last */
-        cx18_memcpy_fromio(cx, &order_mb->request, &mb->request,
-                           2 * sizeof(u32));
+        for (i = 0; i < 2; i++)
+                (&order_mb->request)[i] = cx18_readl(cx, &mb->request + i);
 
         if (order_mb->request == order_mb->ack) {
                 CX18_DEBUG_WARN("Possibly falling behind: %s self-ack'ed our "
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index e46446a449c0..ed7b2aa1ed83 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -471,7 +471,7 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)
         dprintk(1,"Loading firmware ...\n");
         dataptr = (u32*)firmware->data;
         for (i = 0; i < (firmware->size >> 2); i++) {
-                value = *dataptr;
+                value = le32_to_cpu(*dataptr);
                 checksum += ~value;
                 memory_write(dev->core, i, value);
                 dataptr++;
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 20a7e24de6fb..92da7c28b6f0 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -974,6 +974,7 @@ struct em28xx_board em28xx_boards[] = {
         [EM2884_BOARD_CINERGY_HTC_STICK] = {
                 .name         = "Terratec Cinergy HTC Stick",
                 .has_dvb      = 1,
+                .ir_codes     = RC_MAP_NEC_TERRATEC_CINERGY_XS,
 #if 0
                 .tuner_type   = TUNER_PHILIPS_TDA8290,
                 .tuner_addr   = 0x41,
diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c
index fce5f7680c99..5e30c4f3f248 100644
--- a/drivers/media/video/em28xx/em28xx-input.c
+++ b/drivers/media/video/em28xx/em28xx-input.c
@@ -527,6 +527,8 @@ static int em28xx_ir_init(struct em28xx *dev)
 
         if (dev->board.ir_codes == NULL) {
                 /* No remote control support */
+                em28xx_warn("Remote control support is not available for "
+                                "this card.\n");
                 return 0;
         }
 
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 137166d73945..31721eadc597 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -1653,7 +1653,7 @@ static int vidioc_streamoff(struct file *file, void *priv,
                                 enum v4l2_buf_type buf_type)
 {
         struct gspca_dev *gspca_dev = video_drvdata(file);
-        int ret;
+        int i, ret;
 
         if (buf_type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                 return -EINVAL;
@@ -1678,6 +1678,8 @@ static int vidioc_streamoff(struct file *file, void *priv,
         wake_up_interruptible(&gspca_dev->wq);
 
         /* empty the transfer queues */
+        for (i = 0; i < gspca_dev->nframes; i++)
+                gspca_dev->frame[i].v4l2_buf.flags &= ~BUF_ALL_FLAGS;
         atomic_set(&gspca_dev->fr_q, 0);
         atomic_set(&gspca_dev->fr_i, 0);
         gspca_dev->fr_o = 0;
diff --git a/drivers/media/video/gspca/ov534.c b/drivers/media/video/gspca/ov534.c
index b5acb1e4b4e7..80c81dd6d68b 100644
--- a/drivers/media/video/gspca/ov534.c
+++ b/drivers/media/video/gspca/ov534.c
@@ -96,7 +96,7 @@ static void setbrightness(struct gspca_dev *gspca_dev);
 static void setcontrast(struct gspca_dev *gspca_dev);
 static void setgain(struct gspca_dev *gspca_dev);
 static void setexposure(struct gspca_dev *gspca_dev);
-static int sd_setagc(struct gspca_dev *gspca_dev, __s32 val);
+static void setagc(struct gspca_dev *gspca_dev);
 static void setawb(struct gspca_dev *gspca_dev);
 static void setaec(struct gspca_dev *gspca_dev);
 static void setsharpness(struct gspca_dev *gspca_dev);
@@ -189,7 +189,7 @@ static const struct ctrl sd_ctrls[] = {
                         .step    = 1,
                         .default_value = 1,
                 },
-                .set = sd_setagc
+                .set_control = setagc
         },
 [AWB] = {
                 {
@@ -851,6 +851,7 @@ static int sccb_check_status(struct gspca_dev *gspca_dev)
         int i;
 
         for (i = 0; i < 5; i++) {
+                msleep(10);
                 data = ov534_reg_read(gspca_dev, OV534_REG_STATUS);
 
                 switch (data) {
@@ -1242,10 +1243,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
 
         cam->ctrls = sd->ctrls;
 
-        /* the auto white balance control works only when auto gain is set */
-        if (sd_ctrls[AGC].qctrl.default_value == 0)
-                gspca_dev->ctrl_inac |= (1 << AWB);
-
         cam->cam_mode = ov772x_mode;
         cam->nmodes = ARRAY_SIZE(ov772x_mode);
 
@@ -1486,29 +1483,6 @@ scan_next:
         } while (remaining_len > 0);
 }
 
-static int sd_setagc(struct gspca_dev *gspca_dev, __s32 val)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        sd->ctrls[AGC].val = val;
-
-        /* the auto white balance control works only
-         * when auto gain is set */
-        if (val) {
-                gspca_dev->ctrl_inac &= ~(1 << AWB);
-        } else {
-                gspca_dev->ctrl_inac |= (1 << AWB);
-                if (sd->ctrls[AWB].val) {
-                        sd->ctrls[AWB].val = 0;
-                        if (gspca_dev->streaming)
-                                setawb(gspca_dev);
-                }
-        }
-        if (gspca_dev->streaming)
-                setagc(gspca_dev);
-        return gspca_dev->usb_err;
-}
-
 static int sd_querymenu(struct gspca_dev *gspca_dev,
                 struct v4l2_querymenu *menu)
 {
diff --git a/drivers/media/video/gspca/ov534_9.c b/drivers/media/video/gspca/ov534_9.c
index b5797308a39b..1fd41f0d2e95 100644
--- a/drivers/media/video/gspca/ov534_9.c
+++ b/drivers/media/video/gspca/ov534_9.c
@@ -1008,6 +1008,7 @@ static int sccb_check_status(struct gspca_dev *gspca_dev)
         int i;
 
         for (i = 0; i < 5; i++) {
+                msleep(10);
                 data = reg_r(gspca_dev, OV534_REG_STATUS);
 
                 switch (data) {
diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c
index 2cb7d95f7be7..115da169f32a 100644
--- a/drivers/media/video/gspca/pac7311.c
+++ b/drivers/media/video/gspca/pac7311.c
@@ -418,7 +418,7 @@ static int sd_init_controls(struct gspca_dev *gspca_dev)
         struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
 
         gspca_dev->vdev.ctrl_handler = hdl;
-        v4l2_ctrl_handler_init(hdl, 4);
+        v4l2_ctrl_handler_init(hdl, 5);
 
         sd->contrast = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
                                         V4L2_CID_CONTRAST, 0, 15, 1, 7);
diff --git a/drivers/media/video/gspca/sn9c20x.c b/drivers/media/video/gspca/sn9c20x.c
index ad098202d7f0..6c31e46a1fd2 100644
--- a/drivers/media/video/gspca/sn9c20x.c
+++ b/drivers/media/video/gspca/sn9c20x.c
@@ -1761,7 +1761,6 @@ static int sd_init_controls(struct gspca_dev *gspca_dev)
                         V4L2_CID_SATURATION, 0, 255, 1, 127);
         sd->hue = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
                         V4L2_CID_HUE, -180, 180, 1, 0);
-        v4l2_ctrl_cluster(4, &sd->brightness);
 
         sd->gamma = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
                         V4L2_CID_GAMMA, 0, 255, 1, 0x10);
@@ -1770,7 +1769,6 @@ static int sd_init_controls(struct gspca_dev *gspca_dev)
                         V4L2_CID_BLUE_BALANCE, 0, 127, 1, 0x28);
         sd->red = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
                         V4L2_CID_RED_BALANCE, 0, 127, 1, 0x28);
-        v4l2_ctrl_cluster(2, &sd->blue);
 
         if (sd->sensor != SENSOR_OV9655 && sd->sensor != SENSOR_SOI968 &&
             sd->sensor != SENSOR_OV7670 && sd->sensor != SENSOR_MT9M001 &&
@@ -1779,7 +1777,6 @@ static int sd_init_controls(struct gspca_dev *gspca_dev)
                         V4L2_CID_HFLIP, 0, 1, 1, 0);
                 sd->vflip = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
                         V4L2_CID_VFLIP, 0, 1, 1, 0);
-                v4l2_ctrl_cluster(2, &sd->hflip);
         }
 
         if (sd->sensor != SENSOR_SOI968 && sd->sensor != SENSOR_MT9VPRB &&
@@ -1794,6 +1791,20 @@ static int sd_init_controls(struct gspca_dev *gspca_dev)
                         V4L2_CID_GAIN, 0, 28, 1, 0);
                 sd->autogain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
                         V4L2_CID_AUTOGAIN, 0, 1, 1, 1);
+        }
+
+        sd->jpegqual = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
+                        V4L2_CID_JPEG_COMPRESSION_QUALITY, 50, 90, 1, 80);
+        if (hdl->error) {
+                pr_err("Could not initialize controls\n");
+                return hdl->error;
+        }
+
+        v4l2_ctrl_cluster(4, &sd->brightness);
+        v4l2_ctrl_cluster(2, &sd->blue);
+        if (sd->hflip)
+                v4l2_ctrl_cluster(2, &sd->hflip);
+        if (sd->autogain) {
                 if (sd->sensor == SENSOR_SOI968)
                         /* this sensor doesn't have the exposure control and
                            autogain is clustered with gain instead. This works
@@ -1803,13 +1814,6 @@ static int sd_init_controls(struct gspca_dev *gspca_dev)
                         /* Otherwise autogain is clustered with exposure. */
                         v4l2_ctrl_auto_cluster(2, &sd->autogain, 0, false);
         }
-
-        sd->jpegqual = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
-                        V4L2_CID_JPEG_COMPRESSION_QUALITY, 50, 90, 1, 80);
-        if (hdl->error) {
-                pr_err("Could not initialize controls\n");
-                return hdl->error;
-        }
         return 0;
 }
 
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index 4d1696d1a7f4..f38faa9b37c3 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -3120,7 +3120,7 @@ static const struct sd_desc sd_desc = {
                         | (SENSOR_ ## sensor << 8) \
                         | (flags)
 static const struct usb_device_id device_table[] = {
-        {USB_DEVICE(0x0458, 0x7025), BS(SN9C120, MI0360)},
+        {USB_DEVICE(0x0458, 0x7025), BSF(SN9C120, MI0360B, F_PDN_INV)},
         {USB_DEVICE(0x0458, 0x702e), BS(SN9C120, OV7660)},
         {USB_DEVICE(0x045e, 0x00f5), BSF(SN9C105, OV7660, F_PDN_INV)},
         {USB_DEVICE(0x045e, 0x00f7), BSF(SN9C105, OV7660, F_PDN_INV)},
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 057929e165ab..5462ce2f60ea 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -866,10 +866,10 @@ static int ivtv_setup_pci(struct ivtv *itv, struct pci_dev *pdev,
         pci_write_config_dword(pdev, 0x40, 0xffff);
 
         IVTV_DEBUG_INFO("%d (rev %d) at %02x:%02x.%x, "
-                   "irq: %d, latency: %d, memory: 0x%lx\n",
+                   "irq: %d, latency: %d, memory: 0x%llx\n",
                    pdev->device, pdev->revision, pdev->bus->number,
                    PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn),
-                   pdev->irq, pci_latency, (unsigned long)itv->base_addr);
+                   pdev->irq, pci_latency, (u64)itv->base_addr);
 
         return 0;
 }
@@ -1007,7 +1007,7 @@ static int __devinit ivtv_probe(struct pci_dev *pdev,
         itv->cxhdl.priv = itv;
         itv->cxhdl.func = ivtv_api_func;
 
-        IVTV_DEBUG_INFO("base addr: 0x%08x\n", itv->base_addr);
+        IVTV_DEBUG_INFO("base addr: 0x%llx\n", (u64)itv->base_addr);
 
         /* PCI Device Setup */
         retval = ivtv_setup_pci(itv, pdev, pci_id);
@@ -1017,8 +1017,8 @@ static int __devinit ivtv_probe(struct pci_dev *pdev,
                 goto free_mem;
 
         /* map io memory */
-        IVTV_DEBUG_INFO("attempting ioremap at 0x%08x len 0x%08x\n",
-                   itv->base_addr + IVTV_ENCODER_OFFSET, IVTV_ENCODER_SIZE);
+        IVTV_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n",
+                   (u64)itv->base_addr + IVTV_ENCODER_OFFSET, IVTV_ENCODER_SIZE);
         itv->enc_mem = ioremap_nocache(itv->base_addr + IVTV_ENCODER_OFFSET,
                                        IVTV_ENCODER_SIZE);
         if (!itv->enc_mem) {
@@ -1034,8 +1034,8 @@ static int __devinit ivtv_probe(struct pci_dev *pdev,
         }
 
         if (itv->has_cx23415) {
-                IVTV_DEBUG_INFO("attempting ioremap at 0x%08x len 0x%08x\n",
-                                itv->base_addr + IVTV_DECODER_OFFSET, IVTV_DECODER_SIZE);
+                IVTV_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n",
+                                (u64)itv->base_addr + IVTV_DECODER_OFFSET, IVTV_DECODER_SIZE);
                 itv->dec_mem = ioremap_nocache(itv->base_addr + IVTV_DECODER_OFFSET,
                                 IVTV_DECODER_SIZE);
                 if (!itv->dec_mem) {
@@ -1056,8 +1056,8 @@ static int __devinit ivtv_probe(struct pci_dev *pdev,
         }
 
         /* map registers memory */
-        IVTV_DEBUG_INFO("attempting ioremap at 0x%08x len 0x%08x\n",
-                   itv->base_addr + IVTV_REG_OFFSET, IVTV_REG_SIZE);
+        IVTV_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n",
+                   (u64)itv->base_addr + IVTV_REG_OFFSET, IVTV_REG_SIZE);
         itv->reg_mem =
             ioremap_nocache(itv->base_addr + IVTV_REG_OFFSET, IVTV_REG_SIZE);
         if (!itv->reg_mem) {
diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h
index 2e220028aad2..a7e00f8938f8 100644
--- a/drivers/media/video/ivtv/ivtv-driver.h
+++ b/drivers/media/video/ivtv/ivtv-driver.h
@@ -622,7 +622,7 @@ struct ivtv {
         struct v4l2_subdev *sd_video;   /* controlling video decoder subdev */
         struct v4l2_subdev *sd_audio;   /* controlling audio subdev */
         struct v4l2_subdev *sd_muxer;   /* controlling audio muxer subdev */
-        u32 base_addr;                  /* PCI resource base address */
+        resource_size_t base_addr;      /* PCI resource base address */
         volatile void __iomem *enc_mem; /* pointer to mapped encoder memory */
         volatile void __iomem *dec_mem; /* pointer to mapped decoder memory */
         volatile void __iomem *reg_mem; /* pointer to mapped registers */
diff --git a/drivers/media/video/mem2mem_testdev.c b/drivers/media/video/mem2mem_testdev.c
index d2dec585e61b..3945556f5733 100644
--- a/drivers/media/video/mem2mem_testdev.c
+++ b/drivers/media/video/mem2mem_testdev.c
@@ -110,22 +110,6 @@ enum {
         V4L2_M2M_DST = 1,
 };
 
-/* Source and destination queue data */
-static struct m2mtest_q_data q_data[2];
-
-static struct m2mtest_q_data *get_q_data(enum v4l2_buf_type type)
-{
-        switch (type) {
-        case V4L2_BUF_TYPE_VIDEO_OUTPUT:
-                return &q_data[V4L2_M2M_SRC];
-        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-                return &q_data[V4L2_M2M_DST];
-        default:
-                BUG();
-        }
-        return NULL;
-}
-
 #define V4L2_CID_TRANS_TIME_MSEC        V4L2_CID_PRIVATE_BASE
 #define V4L2_CID_TRANS_NUM_BUFS         (V4L2_CID_PRIVATE_BASE + 1)
 
@@ -198,8 +182,26 @@ struct m2mtest_ctx {
         int                     aborting;
 
         struct v4l2_m2m_ctx     *m2m_ctx;
+
+        /* Source and destination queue data */
+        struct m2mtest_q_data   q_data[2];
 };
 
+static struct m2mtest_q_data *get_q_data(struct m2mtest_ctx *ctx,
+                                         enum v4l2_buf_type type)
+{
+        switch (type) {
+        case V4L2_BUF_TYPE_VIDEO_OUTPUT:
+                return &ctx->q_data[V4L2_M2M_SRC];
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+                return &ctx->q_data[V4L2_M2M_DST];
+        default:
+                BUG();
+        }
+        return NULL;
+}
+
+
 static struct v4l2_queryctrl *get_ctrl(int id)
 {
         int i;
@@ -223,7 +225,7 @@ static int device_process(struct m2mtest_ctx *ctx,
         int tile_w, bytes_left;
         int width, height, bytesperline;
 
-        q_data = get_q_data(V4L2_BUF_TYPE_VIDEO_OUTPUT);
+        q_data = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
 
         width   = q_data->width;
         height  = q_data->height;
@@ -436,7 +438,7 @@ static int vidioc_g_fmt(struct m2mtest_ctx *ctx, struct v4l2_format *f)
         if (!vq)
                 return -EINVAL;
 
-        q_data = get_q_data(f->type);
+        q_data = get_q_data(ctx, f->type);
 
         f->fmt.pix.width        = q_data->width;
         f->fmt.pix.height       = q_data->height;
@@ -535,7 +537,7 @@ static int vidioc_s_fmt(struct m2mtest_ctx *ctx, struct v4l2_format *f)
         if (!vq)
                 return -EINVAL;
 
-        q_data = get_q_data(f->type);
+        q_data = get_q_data(ctx, f->type);
         if (!q_data)
                 return -EINVAL;
 
@@ -747,7 +749,7 @@ static int m2mtest_queue_setup(struct vb2_queue *vq,
         struct m2mtest_q_data *q_data;
         unsigned int size, count = *nbuffers;
 
-        q_data = get_q_data(vq->type);
+        q_data = get_q_data(ctx, vq->type);
 
         size = q_data->width * q_data->height * q_data->fmt->depth >> 3;
 
@@ -775,7 +777,7 @@ static int m2mtest_buf_prepare(struct vb2_buffer *vb)
 
         dprintk(ctx->dev, "type: %d\n", vb->vb2_queue->type);
 
-        q_data = get_q_data(vb->vb2_queue->type);
+        q_data = get_q_data(ctx, vb->vb2_queue->type);
 
         if (vb2_plane_size(vb, 0) < q_data->sizeimage) {
                 dprintk(ctx->dev, "%s data will not fit into plane (%lu < %lu)\n",
@@ -860,6 +862,9 @@ static int m2mtest_open(struct file *file)
         ctx->transtime = MEM2MEM_DEF_TRANSTIME;
         ctx->num_processed = 0;
 
+        ctx->q_data[V4L2_M2M_SRC].fmt = &formats[0];
+        ctx->q_data[V4L2_M2M_DST].fmt = &formats[0];
+
         ctx->m2m_ctx = v4l2_m2m_ctx_init(dev->m2m_dev, ctx, &queue_init);
 
         if (IS_ERR(ctx->m2m_ctx)) {
@@ -986,9 +991,6 @@ static int m2mtest_probe(struct platform_device *pdev)
                 goto err_m2m;
         }
 
-        q_data[V4L2_M2M_SRC].fmt = &formats[0];
-        q_data[V4L2_M2M_DST].fmt = &formats[0];
-
         return 0;
 
         v4l2_m2m_release(dev->m2m_dev);
diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c
index ded26b7286fa..41f9a254b245 100644
--- a/drivers/media/video/mx2_camera.c
+++ b/drivers/media/video/mx2_camera.c
@@ -345,19 +345,6 @@ static struct mx2_fmt_cfg mx27_emma_prp_table[] = {
                                         PRP_INTR_CH2OVF,
                 }
         },
-        {
-                .in_fmt         = V4L2_MBUS_FMT_UYVY8_2X8,
-                .out_fmt        = V4L2_PIX_FMT_YUV420,
-                .cfg            = {
-                        .channel        = 2,
-                        .in_fmt         = PRP_CNTL_DATA_IN_YUV422,
-                        .out_fmt        = PRP_CNTL_CH2_OUT_YUV420,
-                        .src_pixel      = 0x22000888, /* YUV422 (YUYV) */
-                        .irq_flags      = PRP_INTR_RDERR | PRP_INTR_CH2WERR |
-                                        PRP_INTR_CH2FC | PRP_INTR_LBOVF |
-                                        PRP_INTR_CH2OVF,
-                }
-        },
 };
 
 static struct mx2_fmt_cfg *mx27_emma_prp_get_format(
@@ -984,7 +971,6 @@ static int mx2_camera_set_bus_param(struct soc_camera_device *icd)
         struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
         struct mx2_camera_dev *pcdev = ici->priv;
         struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};
-        const struct soc_camera_format_xlate *xlate;
         unsigned long common_flags;
         int ret;
         int bytesperline;
@@ -1029,31 +1015,14 @@ static int mx2_camera_set_bus_param(struct soc_camera_device *icd)
                 return ret;
         }
 
-        xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);
-        if (!xlate) {
-                dev_warn(icd->parent, "Format %x not found\n", pixfmt);
-                return -EINVAL;
-        }
-
-        if (xlate->code == V4L2_MBUS_FMT_YUYV8_2X8) {
-                csicr1 |= CSICR1_PACK_DIR;
-                csicr1 &= ~CSICR1_SWAP16_EN;
-                dev_dbg(icd->parent, "already yuyv format, don't convert\n");
-        } else if (xlate->code == V4L2_MBUS_FMT_UYVY8_2X8) {
-                csicr1 &= ~CSICR1_PACK_DIR;
-                csicr1 |= CSICR1_SWAP16_EN;
-                dev_dbg(icd->parent, "convert uyvy mbus format into yuyv\n");
-        } else {
-                dev_warn(icd->parent, "mbus format not supported\n");
-                return -EINVAL;
-        }
-
         if (common_flags & V4L2_MBUS_PCLK_SAMPLE_RISING)
                 csicr1 |= CSICR1_REDGE;
         if (common_flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH)
                 csicr1 |= CSICR1_SOF_POL;
         if (common_flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH)
                 csicr1 |= CSICR1_HSYNC_POL;
+        if (pcdev->platform_flags & MX2_CAMERA_SWAP16)
+                csicr1 |= CSICR1_SWAP16_EN;
         if (pcdev->platform_flags & MX2_CAMERA_EXT_VSYNC)
                 csicr1 |= CSICR1_EXT_VSYNC;
         if (pcdev->platform_flags & MX2_CAMERA_CCIR)
@@ -1064,6 +1033,8 @@ static int mx2_camera_set_bus_param(struct soc_camera_device *icd)
                 csicr1 |= CSICR1_GCLK_MODE;
         if (pcdev->platform_flags & MX2_CAMERA_INV_DATA)
                 csicr1 |= CSICR1_INV_DATA;
+        if (pcdev->platform_flags & MX2_CAMERA_PACK_DIR_MSB)
+                csicr1 |= CSICR1_PACK_DIR;
 
         pcdev->csicr1 = csicr1;
 
@@ -1138,8 +1109,7 @@ static int mx2_camera_get_formats(struct soc_camera_device *icd,
                 return 0;
         }
 
-        if (code == V4L2_MBUS_FMT_YUYV8_2X8 ||
-            code == V4L2_MBUS_FMT_UYVY8_2X8) {
+        if (code == V4L2_MBUS_FMT_YUYV8_2X8) {
                 formats++;
                 if (xlate) {
                         /*
@@ -1155,18 +1125,6 @@ static int mx2_camera_get_formats(struct soc_camera_device *icd,
                 }
         }
 
-        if (code == V4L2_MBUS_FMT_UYVY8_2X8) {
-                formats++;
-                if (xlate) {
-                        xlate->host_fmt =
-                                soc_mbus_get_fmtdesc(V4L2_MBUS_FMT_YUYV8_2X8);
-                        xlate->code     = code;
-                        dev_dbg(dev, "Providing host format %s for sensor code %d\n",
-                                xlate->host_fmt->name, code);
-                        xlate++;
-                }
-        }
-
         /* Generic pass-trough */
         formats++;
         if (xlate) {
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c
index af2d9086d7e8..c370c2d87c17 100644
--- a/drivers/media/video/pms.c
+++ b/drivers/media/video/pms.c
@@ -29,6 +29,7 @@
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/mutex.h>
+#include <linux/slab.h>
 #include <linux/uaccess.h>
 #include <linux/isa.h>
 #include <asm/io.h>
diff --git a/drivers/media/video/s5p-fimc/fimc-core.c b/drivers/media/video/s5p-fimc/fimc-core.c
index fedcd561ba27..92fc5a20fb76 100644
--- a/drivers/media/video/s5p-fimc/fimc-core.c
+++ b/drivers/media/video/s5p-fimc/fimc-core.c
@@ -615,7 +615,7 @@ int fimc_ctrls_create(struct fimc_ctx *ctx)
         ctx->effect.type = FIMC_REG_CIIMGEFF_FIN_BYPASS;
 
         if (!handler->error) {
-                v4l2_ctrl_cluster(3, &ctrls->colorfx);
+                v4l2_ctrl_cluster(2, &ctrls->colorfx);
                 ctrls->ready = true;
         }
 
diff --git a/drivers/media/video/s5p-mfc/regs-mfc.h b/drivers/media/video/s5p-mfc/regs-mfc.h
index 053a8a872fd7..a19bece41ba9 100644
--- a/drivers/media/video/s5p-mfc/regs-mfc.h
+++ b/drivers/media/video/s5p-mfc/regs-mfc.h
@@ -164,10 +164,15 @@
                                                                 decoded pic */
 #define S5P_FIMV_SI_DISPLAY_Y_ADR       0x2010 /* luma addr of displayed pic */
 #define S5P_FIMV_SI_DISPLAY_C_ADR       0x2014 /* chroma addrof displayed pic */
+
 #define S5P_FIMV_SI_CONSUMED_BYTES      0x2018 /* Consumed number of bytes to
                                                         decode a frame */
 #define S5P_FIMV_SI_DISPLAY_STATUS      0x201c /* status of decoded picture */
 
+#define S5P_FIMV_SI_DECODE_Y_ADR        0x2024 /* luma addr of decoded pic */
+#define S5P_FIMV_SI_DECODE_C_ADR        0x2028 /* chroma addrof decoded pic */
+#define S5P_FIMV_SI_DECODE_STATUS       0x202c /* status of decoded picture */
+
 #define S5P_FIMV_SI_CH0_SB_ST_ADR       0x2044 /* start addr of stream buf */
 #define S5P_FIMV_SI_CH0_SB_FRM_SIZE     0x2048 /* size of stream buf */
 #define S5P_FIMV_SI_CH0_DESC_ADR        0x204c /* addr of descriptor buf */
diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_dec.c b/drivers/media/video/s5p-mfc/s5p_mfc_dec.c
index c25ec022d267..4dd32fc8fd82 100644
--- a/drivers/media/video/s5p-mfc/s5p_mfc_dec.c
+++ b/drivers/media/video/s5p-mfc/s5p_mfc_dec.c
@@ -627,13 +627,13 @@ static int s5p_mfc_dec_s_ctrl(struct v4l2_ctrl *ctrl)
 
         switch (ctrl->id) {
         case V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY:
-                ctx->loop_filter_mpeg4 = ctrl->val;
+                ctx->display_delay = ctrl->val;
                 break;
         case V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY_ENABLE:
                 ctx->display_delay_enable = ctrl->val;
                 break;
         case V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER:
-                ctx->display_delay = ctrl->val;
+                ctx->loop_filter_mpeg4 = ctrl->val;
                 break;
         case V4L2_CID_MPEG_VIDEO_DECODER_SLICE_INTERFACE:
                 ctx->slice_interface = ctrl->val;
diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_enc.c b/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
index acedb2004be3..03d83340e7fb 100644
--- a/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
@@ -243,12 +243,6 @@ static struct mfc_control controls[] = {
                 .minimum = V4L2_MPEG_VIDEO_H264_LEVEL_1_0,
                 .maximum = V4L2_MPEG_VIDEO_H264_LEVEL_4_0,
                 .default_value = V4L2_MPEG_VIDEO_H264_LEVEL_1_0,
-                .menu_skip_mask = ~(
-                                (1 << V4L2_MPEG_VIDEO_H264_LEVEL_4_1) |
-                                (1 << V4L2_MPEG_VIDEO_H264_LEVEL_4_2) |
-                                (1 << V4L2_MPEG_VIDEO_H264_LEVEL_5_0) |
-                                (1 << V4L2_MPEG_VIDEO_H264_LEVEL_5_1)
-                                ),
         },
         {
                 .id = V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL,
@@ -494,7 +488,7 @@ static struct mfc_control controls[] = {
                 .type = V4L2_CTRL_TYPE_MENU,
                 .minimum = V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_UNSPECIFIED,
                 .maximum = V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_EXTENDED,
-                .default_value = 0,
+                .default_value = V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_UNSPECIFIED,
                 .menu_skip_mask = 0,
         },
         {
@@ -534,7 +528,7 @@ static struct mfc_control controls[] = {
                 .type = V4L2_CTRL_TYPE_MENU,
                 .minimum = V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE,
                 .maximum = V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_SIMPLE,
-                .default_value = 0,
+                .default_value = V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE,
                 .menu_skip_mask = 0,
         },
         {
@@ -907,6 +901,8 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f)
                         mfc_err("failed to try output format\n");
                         return -EINVAL;
                 }
+                v4l_bound_align_image(&pix_fmt_mp->width, 8, 1920, 1,
+                        &pix_fmt_mp->height, 4, 1080, 1, 0);
         } else {
                 mfc_err("invalid buf type\n");
                 return -EINVAL;
diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_opr.h b/drivers/media/video/s5p-mfc/s5p_mfc_opr.h
index db83836e6a9f..5932d1c782c5 100644
--- a/drivers/media/video/s5p-mfc/s5p_mfc_opr.h
+++ b/drivers/media/video/s5p-mfc/s5p_mfc_opr.h
@@ -57,10 +57,12 @@ void s5p_mfc_cleanup_queue(struct list_head *lh, struct vb2_queue *vq);
                                         S5P_FIMV_SI_DISPLAY_Y_ADR) << \
                                         MFC_OFFSET_SHIFT)
 #define s5p_mfc_get_dec_y_adr()         (readl(dev->regs_base + \
-                                        S5P_FIMV_SI_DISPLAY_Y_ADR) << \
+                                        S5P_FIMV_SI_DECODE_Y_ADR) << \
                                         MFC_OFFSET_SHIFT)
 #define s5p_mfc_get_dspl_status()       readl(dev->regs_base + \
                                                 S5P_FIMV_SI_DISPLAY_STATUS)
+#define s5p_mfc_get_dec_status()        readl(dev->regs_base + \
+                                                S5P_FIMV_SI_DECODE_STATUS)
 #define s5p_mfc_get_frame_type()        (readl(dev->regs_base + \
                                                 S5P_FIMV_DECODE_FRAME_TYPE) \
                                         & S5P_FIMV_DECODE_FRAME_MASK)
diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_shm.h b/drivers/media/video/s5p-mfc/s5p_mfc_shm.h
index 764eac6bcc4c..cf962a466276 100644
--- a/drivers/media/video/s5p-mfc/s5p_mfc_shm.h
+++ b/drivers/media/video/s5p-mfc/s5p_mfc_shm.h
@@ -13,8 +13,7 @@
 #ifndef S5P_MFC_SHM_H_
 #define S5P_MFC_SHM_H_
 
-enum MFC_SHM_OFS
-{
+enum MFC_SHM_OFS {
         EXTENEDED_DECODE_STATUS = 0x00, /* D */
         SET_FRAME_TAG           = 0x04, /* D */
         GET_FRAME_TAG_TOP       = 0x08, /* D */
diff --git a/drivers/media/video/smiapp/Kconfig b/drivers/media/video/smiapp/Kconfig
index f7b35ff443bf..fb99ff18be07 100644
--- a/drivers/media/video/smiapp/Kconfig
+++ b/drivers/media/video/smiapp/Kconfig
@@ -1,6 +1,6 @@
 config VIDEO_SMIAPP
         tristate "SMIA++/SMIA sensor support"
-        depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+        depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && HAVE_CLK
         select VIDEO_SMIAPP_PLL
         ---help---
           This is a generic driver for SMIA++/SMIA camera modules.
diff --git a/drivers/media/video/smiapp/smiapp-core.c b/drivers/media/video/smiapp/smiapp-core.c
index f518026cb67b..e8c93c89265a 100644
--- a/drivers/media/video/smiapp/smiapp-core.c
+++ b/drivers/media/video/smiapp/smiapp-core.c
@@ -32,6 +32,7 @@
 #include <linux/gpio.h>
 #include <linux/module.h>
 #include <linux/regulator/consumer.h>
+#include <linux/slab.h>
 #include <linux/v4l2-mediabus.h>
 #include <media/v4l2-device.h>
 
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 3e050e12153b..1ad5ab6ce5cf 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -1178,7 +1178,7 @@ static int tuner_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt)
                 return 0;
         if (vt->type == t->mode && analog_ops->get_afc)
                 vt->afc = analog_ops->get_afc(&t->fe);
-        if (t->mode != V4L2_TUNER_RADIO) {
+        if (vt->type != V4L2_TUNER_RADIO) {
                 vt->capability |= V4L2_TUNER_CAP_NORM;
                 vt->rangelow = tv_range[0] * 16;
                 vt->rangehigh = tv_range[1] * 16;
diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
index 5ccbd4629f9c..83dbb2ddff10 100644
--- a/drivers/media/video/v4l2-dev.c
+++ b/drivers/media/video/v4l2-dev.c
@@ -656,7 +656,7 @@ static void determine_valid_ioctls(struct video_device *vdev)
         SET_VALID_IOCTL(ops, VIDIOC_TRY_ENCODER_CMD, vidioc_try_encoder_cmd);
         SET_VALID_IOCTL(ops, VIDIOC_DECODER_CMD, vidioc_decoder_cmd);
         SET_VALID_IOCTL(ops, VIDIOC_TRY_DECODER_CMD, vidioc_try_decoder_cmd);
-        if (ops->vidioc_g_parm || vdev->current_norm)
+        if (ops->vidioc_g_parm || vdev->vfl_type == VFL_TYPE_GRABBER)
                 set_bit(_IOC_NR(VIDIOC_G_PARM), valid_ioctls);
         SET_VALID_IOCTL(ops, VIDIOC_S_PARM, vidioc_s_parm);
         SET_VALID_IOCTL(ops, VIDIOC_G_TUNER, vidioc_g_tuner);
@@ -679,6 +679,8 @@ static void determine_valid_ioctls(struct video_device *vdev)
         SET_VALID_IOCTL(ops, VIDIOC_QUERY_DV_PRESET, vidioc_query_dv_preset);
         SET_VALID_IOCTL(ops, VIDIOC_S_DV_TIMINGS, vidioc_s_dv_timings);
         SET_VALID_IOCTL(ops, VIDIOC_G_DV_TIMINGS, vidioc_g_dv_timings);
+        SET_VALID_IOCTL(ops, VIDIOC_ENUM_DV_TIMINGS, vidioc_enum_dv_timings);
+        SET_VALID_IOCTL(ops, VIDIOC_QUERY_DV_TIMINGS, vidioc_query_dv_timings);
         /* yes, really vidioc_subscribe_event */
         SET_VALID_IOCTL(ops, VIDIOC_DQEVENT, vidioc_subscribe_event);
         SET_VALID_IOCTL(ops, VIDIOC_SUBSCRIBE_EVENT, vidioc_subscribe_event);
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index 91be4e871f43..d7fa8962d8b3 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -1680,6 +1680,7 @@ static long __video_do_ioctl(struct file *file,
                                 break;
 
                         ret = 0;
+                        p->parm.capture.readbuffers = 2;
                         if (ops->vidioc_g_std)
                                 ret = ops->vidioc_g_std(file, fh, &std);
                         if (ret == 0)
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index 4d7391ec8001..aae1720b2f2d 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -2561,7 +2561,7 @@ static int vino_acquire_input(struct vino_channel_settings *vcs)
         } else if (vino_drvdata->decoder
                    && (vino_drvdata->decoder_owner == VINO_NO_CHANNEL)) {
                 int input;
-                int data_norm;
+                int data_norm = 0;
                 v4l2_std_id norm;
 
                 input = VINO_INPUT_COMPOSITE;
@@ -2651,7 +2651,7 @@ static int vino_set_input(struct vino_channel_settings *vcs, int input)
                 }
 
                 if (vino_drvdata->decoder_owner == vcs->channel) {
-                        int data_norm;
+                        int data_norm = 0;
                         v4l2_std_id norm;
 
                         ret = decoder_call(video, s_routing,
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 0960d7f0d394..08c10240e70f 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -1149,10 +1149,14 @@ static ssize_t
 vivi_read(struct file *file, char __user *data, size_t count, loff_t *ppos)
 {
         struct vivi_dev *dev = video_drvdata(file);
+        int err;
 
         dprintk(dev, 1, "read called\n");
-        return vb2_read(&dev->vb_vidq, data, count, ppos,
+        mutex_lock(&dev->mutex);
+        err = vb2_read(&dev->vb_vidq, data, count, ppos,
                        file->f_flags & O_NONBLOCK);
+        mutex_unlock(&dev->mutex);
+        return err;
 }
 
 static unsigned int
diff --git a/drivers/mfd/stmpe-i2c.c b/drivers/mfd/stmpe-i2c.c
index 373f423b1181..947a06a1845f 100644
--- a/drivers/mfd/stmpe-i2c.c
+++ b/drivers/mfd/stmpe-i2c.c
@@ -6,7 +6,7 @@
  *
  * License Terms: GNU General Public License, version 2
  * Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson
- * Author: Viresh Kumar <viresh.kumar@st.com> for ST Microelectronics
+ * Author: Viresh Kumar <viresh.linux@gmail.com> for ST Microelectronics
  */
 
 #include <linux/i2c.h>
diff --git a/drivers/mfd/stmpe-spi.c b/drivers/mfd/stmpe-spi.c
index afd459013ecb..9edfe864cc05 100644
--- a/drivers/mfd/stmpe-spi.c
+++ b/drivers/mfd/stmpe-spi.c
@@ -4,7 +4,7 @@
  * Copyright (C) ST Microelectronics SA 2011
  *
  * License Terms: GNU General Public License, version 2
- * Author: Viresh Kumar <viresh.kumar@st.com> for ST Microelectronics
+ * Author: Viresh Kumar <viresh.linux@gmail.com> for ST Microelectronics
  */
 
 #include <linux/spi/spi.h>
@@ -146,4 +146,4 @@ module_exit(stmpe_exit);
 
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("STMPE MFD SPI Interface Driver");
-MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>");
+MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>");
diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c
index 93936f1b75eb..23f5463d4cae 100644
--- a/drivers/misc/mei/interrupt.c
+++ b/drivers/misc/mei/interrupt.c
@@ -835,7 +835,7 @@ static int _mei_irq_thread_read(struct mei_device *dev,	s32 *slots,
                         struct mei_cl *cl,
                         struct mei_io_list *cmpl_list)
 {
-        if ((*slots * sizeof(u32)) >= (sizeof(struct mei_msg_hdr) +
+        if ((*slots * sizeof(u32)) < (sizeof(struct mei_msg_hdr) +
                         sizeof(struct hbm_flow_control))) {
                 /* return the cancel routine */
                 list_del(&cb_pos->cb_list);
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index c70333228337..7de13891e49e 100644
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -982,7 +982,7 @@ static int __devinit mei_probe(struct pci_dev *pdev,
                 err = request_threaded_irq(pdev->irq,
                         NULL,
                         mei_interrupt_thread_handler,
-                        0, mei_driver_name, dev);
+                        IRQF_ONESHOT, mei_driver_name, dev);
         else
                 err = request_threaded_irq(pdev->irq,
                         mei_interrupt_quick_handler,
@@ -992,7 +992,7 @@ static int __devinit mei_probe(struct pci_dev *pdev,
         if (err) {
                 dev_err(&pdev->dev, "request_threaded_irq failure. irq = %d\n",
                        pdev->irq);
-                goto unmap_memory;
+                goto disable_msi;
         }
         INIT_DELAYED_WORK(&dev->timer_work, mei_timer);
         if (mei_hw_init(dev)) {
@@ -1023,8 +1023,8 @@ release_irq:
         mei_disable_interrupts(dev);
         flush_scheduled_work();
         free_irq(pdev->irq, dev);
+disable_msi:
         pci_disable_msi(pdev);
-unmap_memory:
         pci_iounmap(pdev, dev->mem_addr);
 free_device:
         kfree(dev);
@@ -1101,6 +1101,8 @@ static void __devexit mei_remove(struct pci_dev *pdev)
 
         pci_release_regions(pdev);
         pci_disable_device(pdev);
+
+        misc_deregister(&mei_misc_device);
 }
 #ifdef CONFIG_PM
 static int mei_pci_suspend(struct device *device)
@@ -1216,7 +1218,6 @@ module_init(mei_init_module);
  */
 static void __exit mei_exit_module(void)
 {
-        misc_deregister(&mei_misc_device);
         pci_unregister_driver(&mei_driver);
 
         pr_debug("unloaded successfully.\n");
diff --git a/drivers/misc/mei/wd.c b/drivers/misc/mei/wd.c
index 6be5605707b4..e2ec0505eb5c 100644
--- a/drivers/misc/mei/wd.c
+++ b/drivers/misc/mei/wd.c
@@ -341,7 +341,7 @@ static const struct watchdog_ops wd_ops = {
 };
 static const struct watchdog_info wd_info = {
                 .identity = INTEL_AMT_WATCHDOG_ID,
-                .options = WDIOF_KEEPALIVEPING,
+                .options = WDIOF_KEEPALIVEPING | WDIOF_ALARMONLY,
 };
 
 static struct watchdog_device amt_wd_dev = {
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index dd2d374dcc7a..276d21ce6bc1 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -554,7 +554,6 @@ static u32 mmc_sd_num_wr_blocks(struct mmc_card *card)
         struct mmc_request mrq = {NULL};
         struct mmc_command cmd = {0};
         struct mmc_data data = {0};
-        unsigned int timeout_us;
 
         struct scatterlist sg;
 
@@ -574,23 +573,12 @@ static u32 mmc_sd_num_wr_blocks(struct mmc_card *card)
         cmd.arg = 0;
         cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_ADTC;
 
-        data.timeout_ns = card->csd.tacc_ns * 100;
-        data.timeout_clks = card->csd.tacc_clks * 100;
-
-        timeout_us = data.timeout_ns / 1000;
-        timeout_us += data.timeout_clks * 1000 /
-                (card->host->ios.clock / 1000);
-
-        if (timeout_us > 100000) {
-                data.timeout_ns = 100000000;
-                data.timeout_clks = 0;
-        }
-
         data.blksz = 4;
         data.blocks = 1;
         data.flags = MMC_DATA_READ;
         data.sg = &sg;
         data.sg_len = 1;
+        mmc_set_data_timeout(&data, card);
 
         mrq.cmd = &cmd;
         mrq.data = &data;
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 2d4a4b746750..258b203397aa 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1326,7 +1326,7 @@ static int mmc_suspend(struct mmc_host *host)
                 if (!err)
                         mmc_card_set_sleep(host->card);
         } else if (!mmc_host_is_spi(host))
-                mmc_deselect_cards(host);
+                err = mmc_deselect_cards(host);
         host->card->state &= ~(MMC_STATE_HIGHSPEED | MMC_STATE_HIGHSPEED_200);
         mmc_release_host(host);
 
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index c272c6868ecf..b2b43f624b9e 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -1075,16 +1075,18 @@ static void mmc_sd_detect(struct mmc_host *host)
  */
 static int mmc_sd_suspend(struct mmc_host *host)
 {
+        int err = 0;
+
         BUG_ON(!host);
         BUG_ON(!host->card);
 
         mmc_claim_host(host);
         if (!mmc_host_is_spi(host))
-                mmc_deselect_cards(host);
+                err = mmc_deselect_cards(host);
         host->card->state &= ~MMC_STATE_HIGHSPEED;
         mmc_release_host(host);
 
-        return 0;
+        return err;
 }
 
 /*
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 13d0e95380ab..41c5fd8848f4 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -218,6 +218,12 @@ static int sdio_enable_wide(struct mmc_card *card)
         if (ret)
                 return ret;
 
+        if ((ctrl & SDIO_BUS_WIDTH_MASK) == SDIO_BUS_WIDTH_RESERVED)
+                pr_warning("%s: SDIO_CCCR_IF is invalid: 0x%02x\n",
+                           mmc_hostname(card->host), ctrl);
+
+        /* set as 4-bit bus width */
+        ctrl &= ~SDIO_BUS_WIDTH_MASK;
         ctrl |= SDIO_BUS_WIDTH_4BIT;
 
         ret = mmc_io_rw_direct(card, 1, 0, SDIO_CCCR_IF, ctrl, NULL);
diff --git a/drivers/mmc/host/atmel-mci-regs.h b/drivers/mmc/host/atmel-mci-regs.h
index 787aba1682bb..ab56f7db5315 100644
--- a/drivers/mmc/host/atmel-mci-regs.h
+++ b/drivers/mmc/host/atmel-mci-regs.h
@@ -140,4 +140,18 @@
 #define atmci_writel(port,reg,value)                    \
         __raw_writel((value), (port)->regs + reg)
 
+/*
+ * Fix sconfig's burst size according to atmel MCI. We need to convert them as:
+ * 1 -> 0, 4 -> 1, 8 -> 2, 16 -> 3.
+ *
+ * This can be done by finding most significant bit set.
+ */
+static inline unsigned int atmci_convert_chksize(unsigned int maxburst)
+{
+        if (maxburst > 1)
+                return fls(maxburst) - 2;
+        else
+                return 0;
+}
+
 #endif /* __DRIVERS_MMC_ATMEL_MCI_H__ */
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 420aca642b14..f2c115e06438 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -910,6 +910,7 @@ atmci_prepare_data_dma(struct atmel_mci *host, struct mmc_data *data)
         enum dma_data_direction         direction;
         enum dma_transfer_direction     slave_dirn;
         unsigned int                    sglen;
+        u32                             maxburst;
         u32 iflags;
 
         data->error = -EINPROGRESS;
@@ -943,17 +944,18 @@ atmci_prepare_data_dma(struct atmel_mci *host, struct mmc_data *data)
         if (!chan)
                 return -ENODEV;
 
-        if (host->caps.has_dma)
-                atmci_writel(host, ATMCI_DMA, ATMCI_DMA_CHKSIZE(3) | ATMCI_DMAEN);
-
         if (data->flags & MMC_DATA_READ) {
                 direction = DMA_FROM_DEVICE;
                 host->dma_conf.direction = slave_dirn = DMA_DEV_TO_MEM;
+                maxburst = atmci_convert_chksize(host->dma_conf.src_maxburst);
         } else {
                 direction = DMA_TO_DEVICE;
                 host->dma_conf.direction = slave_dirn = DMA_MEM_TO_DEV;
+                maxburst = atmci_convert_chksize(host->dma_conf.dst_maxburst);
         }
 
+        atmci_writel(host, ATMCI_DMA, ATMCI_DMA_CHKSIZE(maxburst) | ATMCI_DMAEN);
+
         sglen = dma_map_sg(chan->device->dev, data->sg,
                         data->sg_len, direction);
 
@@ -2314,6 +2316,8 @@ static int __init atmci_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, host);
 
+        setup_timer(&host->timer, atmci_timeout_timer, (unsigned long)host);
+
         /* We need at least one slot to succeed */
         nr_slots = 0;
         ret = -ENODEV;
@@ -2352,8 +2356,6 @@ static int __init atmci_probe(struct platform_device *pdev)
                 }
         }
 
-        setup_timer(&host->timer, atmci_timeout_timer, (unsigned long)host);
-
         dev_info(&pdev->dev,
                         "Atmel MCI controller at 0x%08lx irq %d, %u slots\n",
                         host->mapbase, irq, nr_slots);
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 9bbf45f8c538..1ca5e72ceb65 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -418,6 +418,8 @@ static int dw_mci_idmac_init(struct dw_mci *host)
         p->des3 = host->sg_dma;
         p->des0 = IDMAC_DES0_ER;
 
+        mci_writel(host, BMOD, SDMMC_IDMAC_SWRESET);
+
         /* Mask out interrupts - get Tx & Rx complete only */
         mci_writel(host, IDINTEN, SDMMC_IDMAC_INT_NI | SDMMC_IDMAC_INT_RI |
                    SDMMC_IDMAC_INT_TI);
@@ -615,14 +617,15 @@ static void dw_mci_setup_bus(struct dw_mci_slot *slot)
         u32 div;
 
         if (slot->clock != host->current_speed) {
-                if (host->bus_hz % slot->clock)
+                div = host->bus_hz / slot->clock;
+                if (host->bus_hz % slot->clock && host->bus_hz > slot->clock)
                         /*
                          * move the + 1 after the divide to prevent
                          * over-clocking the card.
                          */
-                        div = ((host->bus_hz / slot->clock) >> 1) + 1;
-                else
-                        div = (host->bus_hz  / slot->clock) >> 1;
+                        div += 1;
+
+                div = (host->bus_hz != slot->clock) ? DIV_ROUND_UP(div, 2) : 0;
 
                 dev_info(&slot->mmc->class_dev,
                          "Bus speed (slot %d) = %dHz (slot req %dHz, actual %dHZ"
@@ -939,8 +942,8 @@ static void dw_mci_command_complete(struct dw_mci *host, struct mmc_command *cmd
                         mdelay(20);
 
                 if (cmd->data) {
-                        host->data = NULL;
                         dw_mci_stop_dma(host);
+                        host->data = NULL;
                 }
         }
 }
@@ -1623,7 +1626,6 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id)
         if (pending & (SDMMC_IDMAC_INT_TI | SDMMC_IDMAC_INT_RI)) {
                 mci_writel(host, IDSTS, SDMMC_IDMAC_INT_TI | SDMMC_IDMAC_INT_RI);
                 mci_writel(host, IDSTS, SDMMC_IDMAC_INT_NI);
-                set_bit(EVENT_DATA_COMPLETE, &host->pending_events);
                 host->dma_ops->complete(host);
         }
 #endif
@@ -1725,7 +1727,8 @@ static void dw_mci_work_routine_card(struct work_struct *work)
 
 #ifdef CONFIG_MMC_DW_IDMAC
                                 ctrl = mci_readl(host, BMOD);
-                                ctrl |= 0x01; /* Software reset of DMA */
+                                /* Software reset of DMA */
+                                ctrl |= SDMMC_IDMAC_SWRESET;
                                 mci_writel(host, BMOD, ctrl);
 #endif
 
@@ -1950,10 +1953,6 @@ int dw_mci_probe(struct dw_mci *host)
         spin_lock_init(&host->lock);
         INIT_LIST_HEAD(&host->queue);
 
-
-        host->dma_ops = host->pdata->dma_ops;
-        dw_mci_init_dma(host);
-
         /*
          * Get the host data width - this assumes that HCON has been set with
          * the correct values.
@@ -1981,10 +1980,11 @@ int dw_mci_probe(struct dw_mci *host)
         }
 
         /* Reset all blocks */
-        if (!mci_wait_reset(&host->dev, host)) {
-                ret = -ENODEV;
-                goto err_dmaunmap;
-        }
+        if (!mci_wait_reset(&host->dev, host))
+                return -ENODEV;
+
+        host->dma_ops = host->pdata->dma_ops;
+        dw_mci_init_dma(host);
 
         /* Clear the interrupts for the host controller */
         mci_writel(host, RINTSTS, 0xFFFFFFFF);
@@ -2170,14 +2170,14 @@ int dw_mci_resume(struct dw_mci *host)
         if (host->vmmc)
                 regulator_enable(host->vmmc);
 
-        if (host->dma_ops->init)
-                host->dma_ops->init(host);
-
         if (!mci_wait_reset(&host->dev, host)) {
                 ret = -ENODEV;
                 return ret;
         }
 
+        if (host->dma_ops->init)
+                host->dma_ops->init(host);
+
         /* Restore the old value at FIFOTH register */
         mci_writel(host, FIFOTH, host->fifoth_val);
 
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index f0fcce40cd8d..50ff19a62368 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1216,12 +1216,7 @@ static void mmci_dt_populate_generic_pdata(struct device_node *np,
         int bus_width = 0;
 
         pdata->gpio_wp = of_get_named_gpio(np, "wp-gpios", 0);
-        if (!pdata->gpio_wp)
-                pdata->gpio_wp = -1;
-
         pdata->gpio_cd = of_get_named_gpio(np, "cd-gpios", 0);
-        if (!pdata->gpio_cd)
-                pdata->gpio_cd = -1;
 
         if (of_get_property(np, "cd-inverted", NULL))
                 pdata->cd_invert = true;
@@ -1276,6 +1271,12 @@ static int __devinit mmci_probe(struct amba_device *dev,
                 return -EINVAL;
         }
 
+        if (!plat) {
+                plat = devm_kzalloc(&dev->dev, sizeof(*plat), GFP_KERNEL);
+                if (!plat)
+                        return -ENOMEM;
+        }
+
         if (np)
                 mmci_dt_populate_generic_pdata(np, plat);
 
@@ -1424,6 +1425,10 @@ static int __devinit mmci_probe(struct amba_device *dev,
         writel(0, host->base + MMCIMASK1);
         writel(0xfff, host->base + MMCICLEAR);
 
+        if (plat->gpio_cd == -EPROBE_DEFER) {
+                ret = -EPROBE_DEFER;
+                goto err_gpio_cd;
+        }
         if (gpio_is_valid(plat->gpio_cd)) {
                 ret = gpio_request(plat->gpio_cd, DRIVER_NAME " (cd)");
                 if (ret == 0)
@@ -1447,6 +1452,10 @@ static int __devinit mmci_probe(struct amba_device *dev,
                 if (ret >= 0)
                         host->gpio_cd_irq = gpio_to_irq(plat->gpio_cd);
         }
+        if (plat->gpio_wp == -EPROBE_DEFER) {
+                ret = -EPROBE_DEFER;
+                goto err_gpio_wp;
+        }
         if (gpio_is_valid(plat->gpio_wp)) {
                 ret = gpio_request(plat->gpio_wp, DRIVER_NAME " (wp)");
                 if (ret == 0)
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index 34a90266ab11..277161d279b8 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -894,8 +894,8 @@ static struct platform_driver mxs_mmc_driver = {
                 .owner  = THIS_MODULE,
 #ifdef CONFIG_PM
                 .pm     = &mxs_mmc_pm_ops,
-                .of_match_table = mxs_mmc_dt_ids,
 #endif
+                .of_match_table = mxs_mmc_dt_ids,
         },
 };
 
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 552196c764d4..3e8dcf8d2e05 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -1300,7 +1300,7 @@ static const struct mmc_host_ops mmc_omap_ops = {
         .set_ios        = mmc_omap_set_ios,
 };
 
-static int __init mmc_omap_new_slot(struct mmc_omap_host *host, int id)
+static int __devinit mmc_omap_new_slot(struct mmc_omap_host *host, int id)
 {
         struct mmc_omap_slot *slot = NULL;
         struct mmc_host *mmc;
@@ -1485,24 +1485,26 @@ static int __devinit mmc_omap_probe(struct platform_device *pdev)
         }
 
         host->nr_slots = pdata->nr_slots;
+        host->reg_shift = (cpu_is_omap7xx() ? 1 : 2);
+
+        host->mmc_omap_wq = alloc_workqueue("mmc_omap", 0, 0);
+        if (!host->mmc_omap_wq)
+                goto err_plat_cleanup;
+
         for (i = 0; i < pdata->nr_slots; i++) {
                 ret = mmc_omap_new_slot(host, i);
                 if (ret < 0) {
                         while (--i >= 0)
                                 mmc_omap_remove_slot(host->slots[i]);
 
-                        goto err_plat_cleanup;
+                        goto err_destroy_wq;
                 }
         }
 
-        host->reg_shift = (cpu_is_omap7xx() ? 1 : 2);
-
-        host->mmc_omap_wq = alloc_workqueue("mmc_omap", 0, 0);
-        if (!host->mmc_omap_wq)
-                goto err_plat_cleanup;
-
         return 0;
 
+err_destroy_wq:
+        destroy_workqueue(host->mmc_omap_wq);
 err_plat_cleanup:
         if (pdata->cleanup)
                 pdata->cleanup(&pdev->dev);
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 9a7a60aeb19e..389a3eedfc24 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -85,7 +85,6 @@
 #define BRR_ENABLE              (1 << 5)
 #define DTO_ENABLE              (1 << 20)
 #define INIT_STREAM             (1 << 1)
-#define ACEN_ACMD12             (1 << 2)
 #define DP_SELECT               (1 << 21)
 #define DDIR                    (1 << 4)
 #define DMA_EN                  0x1
@@ -117,7 +116,6 @@
 #define OMAP_MMC_MAX_CLOCK      52000000
 #define DRIVER_NAME             "omap_hsmmc"
 
-#define AUTO_CMD12              (1 << 0)        /* Auto CMD12 support */
 /*
  * One controller can have multiple slots, like on some omap boards using
  * omap.c controller driver. Luckily this is not currently done on any known
@@ -177,7 +175,6 @@ struct omap_hsmmc_host {
         int                     reqs_blocked;
         int                     use_reg;
         int                     req_in_progress;
-        unsigned int            flags;
         struct omap_hsmmc_next  next_data;
 
         struct  omap_mmc_platform_data  *pdata;
@@ -773,8 +770,6 @@ omap_hsmmc_start_command(struct omap_hsmmc_host *host, struct mmc_command *cmd,
                 cmdtype = 0x3;
 
         cmdreg = (cmd->opcode << 24) | (resptype << 16) | (cmdtype << 22);
-        if ((host->flags & AUTO_CMD12) && mmc_op_multi(cmd->opcode))
-                cmdreg |= ACEN_ACMD12;
 
         if (data) {
                 cmdreg |= DP_SELECT | MSBS | BCE;
@@ -847,14 +842,11 @@ omap_hsmmc_xfer_done(struct omap_hsmmc_host *host, struct mmc_data *data)
         else
                 data->bytes_xfered = 0;
 
-        if (data->stop && ((!(host->flags & AUTO_CMD12)) || data->error)) {
-                omap_hsmmc_start_command(host, data->stop, NULL);
-        } else {
-                if (data->stop)
-                        data->stop->resp[0] = OMAP_HSMMC_READ(host->base,
-                                                        RSP76);
+        if (!data->stop) {
                 omap_hsmmc_request_done(host, data->mrq);
+                return;
         }
+        omap_hsmmc_start_command(host, data->stop, NULL);
 }
 
 /*
@@ -1859,7 +1851,6 @@ static int __devinit omap_hsmmc_probe(struct platform_device *pdev)
         host->mapbase   = res->start + pdata->reg_offset;
         host->base      = ioremap(host->mapbase, SZ_4K);
         host->power_mode = MMC_POWER_OFF;
-        host->flags     = AUTO_CMD12;
         host->next_data.cookie = 1;
 
         platform_set_drvdata(pdev, host);
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index 55a164fcaa15..a50c205ea208 100644
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -404,7 +404,7 @@ static void sdhci_s3c_setup_card_detect_gpio(struct sdhci_s3c *sc)
                 if (sc->ext_cd_irq &&
                     request_threaded_irq(sc->ext_cd_irq, NULL,
                                          sdhci_s3c_gpio_card_detect_thread,
-                                         IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+                                         IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
                                          dev_name(dev), sc) == 0) {
                         int status = gpio_get_value(sc->ext_cd_gpio);
                         if (pdata->ext_cd_gpio_invert)
diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c
index 1fe32dfa7cd4..423da8194cd8 100644
--- a/drivers/mmc/host/sdhci-spear.c
+++ b/drivers/mmc/host/sdhci-spear.c
@@ -4,7 +4,7 @@
  * Support of SDHCI platform devices for spear soc family
  *
  * Copyright (C) 2010 ST Microelectronics
- * Viresh Kumar<viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * Inspired by sdhci-pltfm.c
  *
@@ -289,5 +289,5 @@ static struct platform_driver sdhci_driver = {
 module_platform_driver(sdhci_driver);
 
 MODULE_DESCRIPTION("SPEAr Secure Digital Host Controller Interface driver");
-MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>");
+MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index e626732aff77..f4b8b4db3a9a 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -680,8 +680,8 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd)
         }
 
         if (count >= 0xF) {
-                pr_warning("%s: Too large timeout 0x%x requested for CMD%d!\n",
-                           mmc_hostname(host->mmc), count, cmd->opcode);
+                DBG("%s: Too large timeout 0x%x requested for CMD%d!\n",
+                    mmc_hostname(host->mmc), count, cmd->opcode);
                 count = 0xE;
         }
 
diff --git a/drivers/mtd/mtdoops.c b/drivers/mtd/mtdoops.c
index ae36d7e1e913..551e316e4454 100644
--- a/drivers/mtd/mtdoops.c
+++ b/drivers/mtd/mtdoops.c
@@ -304,32 +304,17 @@ static void find_next_position(struct mtdoops_context *cxt)
 }
 
 static void mtdoops_do_dump(struct kmsg_dumper *dumper,
-                enum kmsg_dump_reason reason, const char *s1, unsigned long l1,
-                const char *s2, unsigned long l2)
+                            enum kmsg_dump_reason reason)
 {
         struct mtdoops_context *cxt = container_of(dumper,
                         struct mtdoops_context, dump);
-        unsigned long s1_start, s2_start;
-        unsigned long l1_cpy, l2_cpy;
-        char *dst;
-
-        if (reason != KMSG_DUMP_OOPS &&
-            reason != KMSG_DUMP_PANIC)
-                return;
 
         /* Only dump oopses if dump_oops is set */
         if (reason == KMSG_DUMP_OOPS && !dump_oops)
                 return;
 
-        dst = cxt->oops_buf + MTDOOPS_HEADER_SIZE; /* Skip the header */
-        l2_cpy = min(l2, record_size - MTDOOPS_HEADER_SIZE);
-        l1_cpy = min(l1, record_size - MTDOOPS_HEADER_SIZE - l2_cpy);
-
-        s2_start = l2 - l2_cpy;
-        s1_start = l1 - l1_cpy;
-
-        memcpy(dst, s1 + s1_start, l1_cpy);
-        memcpy(dst + l1_cpy, s2 + s2_start, l2_cpy);
+        kmsg_dump_get_buffer(dumper, true, cxt->oops_buf + MTDOOPS_HEADER_SIZE,
+                             record_size - MTDOOPS_HEADER_SIZE, NULL);
 
         /* Panics must be written immediately */
         if (reason != KMSG_DUMP_OOPS)
@@ -375,6 +360,7 @@ static void mtdoops_notify_add(struct mtd_info *mtd)
                 return;
         }
 
+        cxt->dump.max_reason = KMSG_DUMP_OOPS;
         cxt->dump.dump = mtdoops_do_dump;
         err = kmsg_dump_register(&cxt->dump);
         if (err) {
diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
index 09d4f8d9d592..7c1380305219 100644
--- a/drivers/mtd/ubi/debug.c
+++ b/drivers/mtd/ubi/debug.c
@@ -264,7 +264,7 @@ static struct dentry *dfs_rootdir;
  */
 int ubi_debugfs_init(void)
 {
-        if (!IS_ENABLED(DEBUG_FS))
+        if (!IS_ENABLED(CONFIG_DEBUG_FS))
                 return 0;
 
         dfs_rootdir = debugfs_create_dir("ubi", NULL);
@@ -284,7 +284,7 @@ int ubi_debugfs_init(void)
  */
 void ubi_debugfs_exit(void)
 {
-        if (IS_ENABLED(DEBUG_FS))
+        if (IS_ENABLED(CONFIG_DEBUG_FS))
                 debugfs_remove(dfs_rootdir);
 }
 
@@ -407,7 +407,7 @@ int ubi_debugfs_init_dev(struct ubi_device *ubi)
         struct dentry *dent;
         struct ubi_debug_info *d = ubi->dbg;
 
-        if (!IS_ENABLED(DEBUG_FS))
+        if (!IS_ENABLED(CONFIG_DEBUG_FS))
                 return 0;
 
         n = snprintf(d->dfs_dir_name, UBI_DFS_DIR_LEN + 1, UBI_DFS_DIR_NAME,
@@ -477,6 +477,6 @@ out:
  */
 void ubi_debugfs_exit_dev(struct ubi_device *ubi)
 {
-        if (IS_ENABLED(DEBUG_FS))
+        if (IS_ENABLED(CONFIG_DEBUG_FS))
                 debugfs_remove_recursive(ubi->dbg->dfs_dir);
 }
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 2ee8cf9e8a3b..b9c2ae62166d 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -76,6 +76,7 @@
 #include <net/route.h>
 #include <net/net_namespace.h>
 #include <net/netns/generic.h>
+#include <net/pkt_sched.h>
 #include "bonding.h"
 #include "bond_3ad.h"
 #include "bond_alb.h"
@@ -381,8 +382,6 @@ struct vlan_entry *bond_next_vlan(struct bonding *bond, struct vlan_entry *curr)
         return next;
 }
 
-#define bond_queue_mapping(skb) (*(u16 *)((skb)->cb))
-
 /**
  * bond_dev_queue_xmit - Prepare skb for xmit.
  *
@@ -395,7 +394,9 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb,
 {
         skb->dev = slave_dev;
 
-        skb->queue_mapping = bond_queue_mapping(skb);
+        BUILD_BUG_ON(sizeof(skb->queue_mapping) !=
+                     sizeof(qdisc_skb_cb(skb)->bond_queue_mapping));
+        skb->queue_mapping = qdisc_skb_cb(skb)->bond_queue_mapping;
 
         if (unlikely(netpoll_tx_running(slave_dev)))
                 bond_netpoll_send_skb(bond_get_slave_by_dev(bond, slave_dev), skb);
@@ -4171,7 +4172,7 @@ static u16 bond_select_queue(struct net_device *dev, struct sk_buff *skb)
         /*
          * Save the original txq to restore before passing to the driver
          */
-        bond_queue_mapping(skb) = skb->queue_mapping;
+        qdisc_skb_cb(skb)->bond_queue_mapping = skb->queue_mapping;
 
         if (unlikely(txq >= dev->real_num_tx_queues)) {
                 do {
diff --git a/drivers/net/bonding/bond_procfs.c b/drivers/net/bonding/bond_procfs.c
index ad284baafe87..3cea38d37344 100644
--- a/drivers/net/bonding/bond_procfs.c
+++ b/drivers/net/bonding/bond_procfs.c
@@ -150,14 +150,25 @@ static void bond_info_show_master(struct seq_file *seq)
         }
 }
 
+static const char *bond_slave_link_status(s8 link)
+{
+        static const char * const status[] = {
+                [BOND_LINK_UP] = "up",
+                [BOND_LINK_FAIL] = "going down",
+                [BOND_LINK_DOWN] = "down",
+                [BOND_LINK_BACK] = "going back",
+        };
+
+        return status[link];
+}
+
 static void bond_info_show_slave(struct seq_file *seq,
                                  const struct slave *slave)
 {
         struct bonding *bond = seq->private;
 
         seq_printf(seq, "\nSlave Interface: %s\n", slave->dev->name);
-        seq_printf(seq, "MII Status: %s\n",
-                   (slave->link == BOND_LINK_UP) ?  "up" : "down");
+        seq_printf(seq, "MII Status: %s\n", bond_slave_link_status(slave->link));
         if (slave->speed == SPEED_UNKNOWN)
                 seq_printf(seq, "Speed: %s\n", "Unknown");
         else
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index aef42f045320..485bedb8278c 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -1082,8 +1082,12 @@ static ssize_t bonding_store_primary(struct device *d,
                 }
         }
 
-        pr_info("%s: Unable to set %.*s as primary slave.\n",
-                bond->dev->name, (int)strlen(buf) - 1, buf);
+        strncpy(bond->params.primary, ifname, IFNAMSIZ);
+        bond->params.primary[IFNAMSIZ - 1] = 0;
+
+        pr_info("%s: Recording %s as primary, "
+                "but it has not been enslaved to %s yet.\n",
+                bond->dev->name, ifname, bond->dev->name);
 out:
         write_unlock_bh(&bond->curr_slave_lock);
         read_unlock(&bond->lock);
diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
index 1520814c77c7..4a27adb7ae67 100644
--- a/drivers/net/caif/caif_hsi.c
+++ b/drivers/net/caif/caif_hsi.c
@@ -693,8 +693,6 @@ static void cfhsi_rx_done(struct cfhsi *cfhsi)
                          */
                         memcpy(rx_buf, (u8 *)piggy_desc,
                                         CFHSI_DESC_SHORT_SZ);
-                        /* Mark no embedded frame here */
-                        piggy_desc->offset = 0;
                         if (desc_pld_len == -EPROTO)
                                 goto out_of_sync;
                 }
@@ -737,6 +735,8 @@ static void cfhsi_rx_done(struct cfhsi *cfhsi)
                         /* Extract any payload in piggyback descriptor. */
                         if (cfhsi_rx_desc(piggy_desc, cfhsi) < 0)
                                 goto out_of_sync;
+                        /* Mark no embedded frame after extracting it */
+                        piggy_desc->offset = 0;
                 }
         }
 
@@ -1178,6 +1178,7 @@ int cfhsi_probe(struct platform_device *pdev)
                 dev_err(&ndev->dev, "%s: Registration error: %d.\n",
                         __func__, res);
                 free_netdev(ndev);
+                return -ENODEV;
         }
         /* Add CAIF HSI device to list. */
         spin_lock(&cfhsi_list_lock);
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c
index 536bda072a16..86cd532c78f9 100644
--- a/drivers/net/can/c_can/c_can.c
+++ b/drivers/net/can/c_can/c_can.c
@@ -590,8 +590,8 @@ static void c_can_chip_config(struct net_device *dev)
         priv->write_reg(priv, &priv->regs->control,
                         CONTROL_ENABLE_AR);
 
-        if (priv->can.ctrlmode & (CAN_CTRLMODE_LISTENONLY &
-                                        CAN_CTRLMODE_LOOPBACK)) {
+        if ((priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY) &&
+            (priv->can.ctrlmode & CAN_CTRLMODE_LOOPBACK)) {
                 /* loopback + silent mode : useful for hot self-test */
                 priv->write_reg(priv, &priv->regs->control, CONTROL_EIE |
                                 CONTROL_SIE | CONTROL_IE | CONTROL_TEST);
@@ -686,7 +686,7 @@ static int c_can_get_berr_counter(const struct net_device *dev,
  *
  * We iterate from priv->tx_echo to priv->tx_next and check if the
  * packet has been transmitted, echo it back to the CAN framework.
- * If we discover a not yet transmitted package, stop looking for more.
+ * If we discover a not yet transmitted packet, stop looking for more.
  */
 static void c_can_do_tx(struct net_device *dev)
 {
@@ -698,7 +698,7 @@ static void c_can_do_tx(struct net_device *dev)
         for (/* nix */; (priv->tx_next - priv->tx_echo) > 0; priv->tx_echo++) {
                 msg_obj_no = get_tx_echo_msg_obj(priv);
                 val = c_can_read_reg32(priv, &priv->regs->txrqst1);
-                if (!(val & (1 << msg_obj_no))) {
+                if (!(val & (1 << (msg_obj_no - 1)))) {
                         can_get_echo_skb(dev,
                                         msg_obj_no - C_CAN_MSG_OBJ_TX_FIRST);
                         stats->tx_bytes += priv->read_reg(priv,
@@ -706,6 +706,8 @@ static void c_can_do_tx(struct net_device *dev)
                                         & IF_MCONT_DLC_MASK;
                         stats->tx_packets++;
                         c_can_inval_msg_object(dev, 0, msg_obj_no);
+                } else {
+                        break;
                 }
         }
 
@@ -950,7 +952,7 @@ static int c_can_poll(struct napi_struct *napi, int quota)
         struct net_device *dev = napi->dev;
         struct c_can_priv *priv = netdev_priv(dev);
 
-        irqstatus = priv->read_reg(priv, &priv->regs->interrupt);
+        irqstatus = priv->irqstatus;
         if (!irqstatus)
                 goto end;
 
@@ -1028,12 +1030,11 @@ end:
 
 static irqreturn_t c_can_isr(int irq, void *dev_id)
 {
-        u16 irqstatus;
         struct net_device *dev = (struct net_device *)dev_id;
         struct c_can_priv *priv = netdev_priv(dev);
 
-        irqstatus = priv->read_reg(priv, &priv->regs->interrupt);
-        if (!irqstatus)
+        priv->irqstatus = priv->read_reg(priv, &priv->regs->interrupt);
+        if (!priv->irqstatus)
                 return IRQ_NONE;
 
         /* disable all interrupts and schedule the NAPI */
@@ -1063,10 +1064,11 @@ static int c_can_open(struct net_device *dev)
                 goto exit_irq_fail;
         }
 
+        napi_enable(&priv->napi);
+
         /* start the c_can controller */
         c_can_start(dev);
 
-        napi_enable(&priv->napi);
         netif_start_queue(dev);
 
         return 0;
diff --git a/drivers/net/can/c_can/c_can.h b/drivers/net/can/c_can/c_can.h
index 9b7fbef3d09a..5f32d34af507 100644
--- a/drivers/net/can/c_can/c_can.h
+++ b/drivers/net/can/c_can/c_can.h
@@ -76,6 +76,7 @@ struct c_can_priv {
         unsigned int tx_next;
         unsigned int tx_echo;
         void *priv;             /* for board-specific data */
+        u16 irqstatus;
 };
 
 struct net_device *alloc_c_can_dev(void);
diff --git a/drivers/net/can/cc770/cc770_platform.c b/drivers/net/can/cc770/cc770_platform.c
index 53115eee8075..688371cda37a 100644
--- a/drivers/net/can/cc770/cc770_platform.c
+++ b/drivers/net/can/cc770/cc770_platform.c
@@ -154,7 +154,7 @@ static int __devinit cc770_get_platform_data(struct platform_device *pdev,
         struct cc770_platform_data *pdata = pdev->dev.platform_data;
 
         priv->can.clock.freq = pdata->osc_freq;
-        if (priv->cpu_interface | CPUIF_DSC)
+        if (priv->cpu_interface & CPUIF_DSC)
                 priv->can.clock.freq /= 2;
         priv->clkout = pdata->cor;
         priv->bus_config = pdata->bcr;
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 38c0690df5c8..81d474102378 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -939,12 +939,12 @@ static int __devinit flexcan_probe(struct platform_device *pdev)
                 return PTR_ERR(pinctrl);
 
         if (pdev->dev.of_node) {
-                const u32 *clock_freq_p;
+                const __be32 *clock_freq_p;
 
                 clock_freq_p = of_get_property(pdev->dev.of_node,
                                                 "clock-frequency", NULL);
                 if (clock_freq_p)
-                        clock_freq = *clock_freq_p;
+                        clock_freq = be32_to_cpup(clock_freq_p);
         }
 
         if (!clock_freq) {
diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
index 442d91a2747b..bab0158f1cc3 100644
--- a/drivers/net/dummy.c
+++ b/drivers/net/dummy.c
@@ -187,8 +187,10 @@ static int __init dummy_init_module(void)
         rtnl_lock();
         err = __rtnl_link_register(&dummy_link_ops);
 
-        for (i = 0; i < numdummies && !err; i++)
+        for (i = 0; i < numdummies && !err; i++) {
                 err = dummy_init_one();
+                cond_resched();
+        }
         if (err < 0)
                 __rtnl_link_unregister(&dummy_link_ops);
         rtnl_unlock();
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index e30e2a2f354c..7de824184979 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -747,21 +747,6 @@ struct bnx2x_fastpath {
 
 #define ETH_RX_ERROR_FALGS              ETH_FAST_PATH_RX_CQE_PHY_DECODE_ERR_FLG
 
-#define BNX2X_IP_CSUM_ERR(cqe) \
-                        (!((cqe)->fast_path_cqe.status_flags & \
-                           ETH_FAST_PATH_RX_CQE_IP_XSUM_NO_VALIDATION_FLG) && \
-                         ((cqe)->fast_path_cqe.type_error_flags & \
-                          ETH_FAST_PATH_RX_CQE_IP_BAD_XSUM_FLG))
-
-#define BNX2X_L4_CSUM_ERR(cqe) \
-                        (!((cqe)->fast_path_cqe.status_flags & \
-                           ETH_FAST_PATH_RX_CQE_L4_XSUM_NO_VALIDATION_FLG) && \
-                         ((cqe)->fast_path_cqe.type_error_flags & \
-                          ETH_FAST_PATH_RX_CQE_L4_BAD_XSUM_FLG))
-
-#define BNX2X_RX_CSUM_OK(cqe) \
-                        (!(BNX2X_L4_CSUM_ERR(cqe) || BNX2X_IP_CSUM_ERR(cqe)))
-
 #define BNX2X_PRS_FLAG_OVERETH_IPV4(flags) \
                                 (((le16_to_cpu(flags) & \
                                    PARSING_FLAGS_OVER_ETHERNET_PROTOCOL) >> \
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index ad0743bf4bde..8098eea9704d 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -190,7 +190,7 @@ int bnx2x_tx_int(struct bnx2x *bp, struct bnx2x_fp_txdata *txdata)
 
                 if ((netif_tx_queue_stopped(txq)) &&
                     (bp->state == BNX2X_STATE_OPEN) &&
-                    (bnx2x_tx_avail(bp, txdata) >= MAX_SKB_FRAGS + 3))
+                    (bnx2x_tx_avail(bp, txdata) >= MAX_SKB_FRAGS + 4))
                         netif_tx_wake_queue(txq);
 
                 __netif_tx_unlock(txq);
@@ -617,6 +617,25 @@ static int bnx2x_alloc_rx_data(struct bnx2x *bp,
         return 0;
 }
 
+static void bnx2x_csum_validate(struct sk_buff *skb, union eth_rx_cqe *cqe,
+                                struct bnx2x_fastpath *fp)
+{
+        /* Do nothing if no IP/L4 csum validation was done */
+
+        if (cqe->fast_path_cqe.status_flags &
+            (ETH_FAST_PATH_RX_CQE_IP_XSUM_NO_VALIDATION_FLG |
+             ETH_FAST_PATH_RX_CQE_L4_XSUM_NO_VALIDATION_FLG))
+                return;
+
+        /* If both IP/L4 validation were done, check if an error was found. */
+
+        if (cqe->fast_path_cqe.type_error_flags &
+            (ETH_FAST_PATH_RX_CQE_IP_BAD_XSUM_FLG |
+             ETH_FAST_PATH_RX_CQE_L4_BAD_XSUM_FLG))
+                fp->eth_q_stats.hw_csum_err++;
+        else
+                skb->ip_summed = CHECKSUM_UNNECESSARY;
+}
 
 int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
 {
@@ -806,13 +825,9 @@ reuse_rx:
 
                 skb_checksum_none_assert(skb);
 
-                if (bp->dev->features & NETIF_F_RXCSUM) {
+                if (bp->dev->features & NETIF_F_RXCSUM)
+                        bnx2x_csum_validate(skb, cqe, fp);
 
-                        if (likely(BNX2X_RX_CSUM_OK(cqe)))
-                                skb->ip_summed = CHECKSUM_UNNECESSARY;
-                        else
-                                fp->eth_q_stats.hw_csum_err++;
-                }
 
                 skb_record_rx_queue(skb, fp->rx_queue);
 
@@ -2501,8 +2516,6 @@ int bnx2x_poll(struct napi_struct *napi, int budget)
 /* we split the first BD into headers and data BDs
  * to ease the pain of our fellow microcode engineers
  * we use one mapping for both BDs
- * So far this has only been observed to happen
- * in Other Operating Systems(TM)
  */
 static noinline u16 bnx2x_tx_split(struct bnx2x *bp,
                                    struct bnx2x_fp_txdata *txdata,
@@ -3156,7 +3169,7 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         txdata->tx_bd_prod += nbd;
 
-        if (unlikely(bnx2x_tx_avail(bp, txdata) < MAX_SKB_FRAGS + 3)) {
+        if (unlikely(bnx2x_tx_avail(bp, txdata) < MAX_SKB_FRAGS + 4)) {
                 netif_tx_stop_queue(txq);
 
                 /* paired memory barrier is in bnx2x_tx_int(), we have to keep
@@ -3165,7 +3178,7 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 smp_mb();
 
                 fp->eth_q_stats.driver_xoff++;
-                if (bnx2x_tx_avail(bp, txdata) >= MAX_SKB_FRAGS + 3)
+                if (bnx2x_tx_avail(bp, txdata) >= MAX_SKB_FRAGS + 4)
                         netif_tx_wake_queue(txq);
         }
         txdata->tx_pkt++;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index a3fb7215cd89..6e7d5c0843b4 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@ -40,6 +40,7 @@
 #define I2C_BSC0                        0
 #define I2C_BSC1                        1
 #define I2C_WA_RETRY_CNT                3
+#define I2C_WA_PWR_ITER                 (I2C_WA_RETRY_CNT - 1)
 #define MCPR_IMC_COMMAND_READ_OP        1
 #define MCPR_IMC_COMMAND_WRITE_OP       2
 
@@ -7659,6 +7660,28 @@ static int bnx2x_8726_read_sfp_module_eeprom(struct bnx2x_phy *phy,
         return -EINVAL;
 }
 
+static void bnx2x_warpcore_power_module(struct link_params *params,
+                                        struct bnx2x_phy *phy,
+                                        u8 power)
+{
+        u32 pin_cfg;
+        struct bnx2x *bp = params->bp;
+
+        pin_cfg = (REG_RD(bp, params->shmem_base +
+                          offsetof(struct shmem_region,
+                        dev_info.port_hw_config[params->port].e3_sfp_ctrl)) &
+                        PORT_HW_CFG_E3_PWR_DIS_MASK) >>
+                        PORT_HW_CFG_E3_PWR_DIS_SHIFT;
+
+        if (pin_cfg == PIN_CFG_NA)
+                return;
+        DP(NETIF_MSG_LINK, "Setting SFP+ module power to %d using pin cfg %d\n",
+                       power, pin_cfg);
+        /* Low ==> corresponding SFP+ module is powered
+         * high ==> the SFP+ module is powered down
+         */
+        bnx2x_set_cfg_pin(bp, pin_cfg, power ^ 1);
+}
 static int bnx2x_warpcore_read_sfp_module_eeprom(struct bnx2x_phy *phy,
                                                  struct link_params *params,
                                                  u16 addr, u8 byte_cnt,
@@ -7678,6 +7701,12 @@ static int bnx2x_warpcore_read_sfp_module_eeprom(struct bnx2x_phy *phy,
         /* 4 byte aligned address */
         addr32 = addr & (~0x3);
         do {
+                if (cnt == I2C_WA_PWR_ITER) {
+                        bnx2x_warpcore_power_module(params, phy, 0);
+                        /* Note that 100us are not enough here */
+                        usleep_range(1000,1000);
+                        bnx2x_warpcore_power_module(params, phy, 1);
+                }
                 rc = bnx2x_bsc_read(params, phy, 0xa0, addr32, 0, byte_cnt,
                                     data_array);
         } while ((rc != 0) && (++cnt < I2C_WA_RETRY_CNT));
@@ -8200,29 +8229,6 @@ static void bnx2x_set_sfp_module_fault_led(struct link_params *params,
                 bnx2x_set_e1e2_module_fault_led(params, gpio_mode);
 }
 
-static void bnx2x_warpcore_power_module(struct link_params *params,
-                                        struct bnx2x_phy *phy,
-                                        u8 power)
-{
-        u32 pin_cfg;
-        struct bnx2x *bp = params->bp;
-
-        pin_cfg = (REG_RD(bp, params->shmem_base +
-                          offsetof(struct shmem_region,
-                        dev_info.port_hw_config[params->port].e3_sfp_ctrl)) &
-                        PORT_HW_CFG_E3_PWR_DIS_MASK) >>
-                        PORT_HW_CFG_E3_PWR_DIS_SHIFT;
-
-        if (pin_cfg == PIN_CFG_NA)
-                return;
-        DP(NETIF_MSG_LINK, "Setting SFP+ module power to %d using pin cfg %d\n",
-                       power, pin_cfg);
-        /* Low ==> corresponding SFP+ module is powered
-         * high ==> the SFP+ module is powered down
-         */
-        bnx2x_set_cfg_pin(bp, pin_cfg, power ^ 1);
-}
-
 static void bnx2x_warpcore_hw_reset(struct bnx2x_phy *phy,
                                     struct link_params *params)
 {
@@ -9748,7 +9754,7 @@ static int bnx2x_848x3_config_init(struct bnx2x_phy *phy,
 
         msleep(1);
 
-        if (!(CHIP_IS_E1(bp)))
+        if (!(CHIP_IS_E1x(bp)))
                 port = BP_PATH(bp);
         else
                 port = params->port;
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index edeeb516807a..e47ff8be1d7b 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -14275,7 +14275,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                 }
         }
 
-        if (tg3_flag(tp, 5755_PLUS))
+        if (tg3_flag(tp, 5755_PLUS) ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
                 tg3_flag_set(tp, SHORT_DMA_BUG);
 
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719)
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index 8d06ea381741..921c2082af4c 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -122,15 +122,15 @@ static int be_mcc_compl_process(struct be_adapter *adapter,
                         goto done;
 
                 if (compl_status == MCC_STATUS_UNAUTHORIZED_REQUEST) {
-                        dev_warn(&adapter->pdev->dev, "This domain(VM) is not "
-                                "permitted to execute this cmd (opcode %d)\n",
-                                opcode);
+                        dev_warn(&adapter->pdev->dev,
+                                 "opcode %d-%d is not permitted\n",
+                                 opcode, subsystem);
                 } else {
                         extd_status = (compl->status >> CQE_STATUS_EXTD_SHIFT) &
                                         CQE_STATUS_EXTD_MASK;
-                        dev_err(&adapter->pdev->dev, "Cmd (opcode %d) failed:"
-                                "status %d, extd-status %d\n",
-                                opcode, compl_status, extd_status);
+                        dev_err(&adapter->pdev->dev,
+                                "opcode %d-%d failed:status %d-%d\n",
+                                opcode, subsystem, compl_status, extd_status);
                 }
         }
 done:
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.h b/drivers/net/ethernet/emulex/benet/be_cmds.h
index 9625bf420c16..b3f3fc3d1323 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.h
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.h
@@ -1566,7 +1566,7 @@ struct be_hw_stats_v1 {
         u32 rsvd0[BE_TXP_SW_SZ];
         struct be_erx_stats_v1 erx;
         struct be_pmem_stats pmem;
-        u32 rsvd1[3];
+        u32 rsvd1[18];
 };
 
 struct be_cmd_req_get_stats_v1 {
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 08efd308d78a..501dfa9c88ec 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -736,6 +736,8 @@ static netdev_tx_t be_xmit(struct sk_buff *skb,
 
         copied = make_tx_wrbs(adapter, txq, skb, wrb_cnt, dummy_wrb);
         if (copied) {
+                int gso_segs = skb_shinfo(skb)->gso_segs;
+
                 /* record the sent skb in the sent_skb table */
                 BUG_ON(txo->sent_skb_list[start]);
                 txo->sent_skb_list[start] = skb;
@@ -753,8 +755,7 @@ static netdev_tx_t be_xmit(struct sk_buff *skb,
 
                 be_txq_notify(adapter, txq->id, wrb_cnt);
 
-                be_tx_stats_update(txo, wrb_cnt, copied,
-                                skb_shinfo(skb)->gso_segs, stopped);
+                be_tx_stats_update(txo, wrb_cnt, copied, gso_segs, stopped);
         } else {
                 txq->head = start;
                 dev_kfree_skb_any(skb);
@@ -3236,7 +3237,7 @@ static void be_netdev_init(struct net_device *netdev)
 
         netdev->flags |= IFF_MULTICAST;
 
-        netif_set_gso_max_size(netdev, 65535);
+        netif_set_gso_max_size(netdev, 65535 - ETH_HLEN);
 
         netdev->netdev_ops = &be_netdev_ops;
 
diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig
index 79b07ec6726f..0cafe4fe9406 100644
--- a/drivers/net/ethernet/intel/Kconfig
+++ b/drivers/net/ethernet/intel/Kconfig
@@ -122,8 +122,10 @@ config IGB_DCA
 
 config IGB_PTP
         bool "PTP Hardware Clock (PHC)"
-        default y
-        depends on IGB && PTP_1588_CLOCK
+        default n
+        depends on IGB && EXPERIMENTAL
+        select PPS
+        select PTP_1588_CLOCK
         ---help---
           Say Y here if you want to use PTP Hardware Clock (PHC) in the
           driver.  Only the basic clock operations have been implemented.
@@ -223,7 +225,9 @@ config IXGBE_DCB
 config IXGBE_PTP
         bool "PTP Clock Support"
         default n
-        depends on IXGBE && PTP_1588_CLOCK
+        depends on IXGBE && EXPERIMENTAL
+        select PPS
+        select PTP_1588_CLOCK
         ---help---
           Say Y here if you want support for 1588 Timestamping with a
           PHC device, using the PTP 1588 Clock support. This is
diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
index d863075df7a4..905e2147d918 100644
--- a/drivers/net/ethernet/intel/e1000e/ethtool.c
+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c
@@ -258,7 +258,8 @@ static int e1000_set_settings(struct net_device *netdev,
          * When SoL/IDER sessions are active, autoneg/speed/duplex
          * cannot be changed
          */
-        if (hw->phy.ops.check_reset_block(hw)) {
+        if (hw->phy.ops.check_reset_block &&
+            hw->phy.ops.check_reset_block(hw)) {
                 e_err("Cannot change link characteristics when SoL/IDER is active.\n");
                 return -EINVAL;
         }
@@ -1615,7 +1616,8 @@ static int e1000_loopback_test(struct e1000_adapter *adapter, u64 *data)
          * PHY loopback cannot be performed if SoL/IDER
          * sessions are active
          */
-        if (hw->phy.ops.check_reset_block(hw)) {
+        if (hw->phy.ops.check_reset_block &&
+            hw->phy.ops.check_reset_block(hw)) {
                 e_err("Cannot do PHY loopback test when SoL/IDER is active.\n");
                 *data = 0;
                 goto out;
diff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c
index 026e8b3ab52e..a13439928488 100644
--- a/drivers/net/ethernet/intel/e1000e/mac.c
+++ b/drivers/net/ethernet/intel/e1000e/mac.c
@@ -709,7 +709,7 @@ s32 e1000e_setup_link_generic(struct e1000_hw *hw)
          * In the case of the phy reset being blocked, we already have a link.
          * We do not need to set it up again.
          */
-        if (hw->phy.ops.check_reset_block(hw))
+        if (hw->phy.ops.check_reset_block && hw->phy.ops.check_reset_block(hw))
                 return 0;
 
         /*
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index a4b0435b00dc..31d37a2b5ba8 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -6237,7 +6237,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
                 adapter->hw.phy.ms_type = e1000_ms_hw_default;
         }
 
-        if (hw->phy.ops.check_reset_block(hw))
+        if (hw->phy.ops.check_reset_block && hw->phy.ops.check_reset_block(hw))
                 e_info("PHY reset is blocked due to SOL/IDER session.\n");
 
         /* Set initial default active device features */
@@ -6404,7 +6404,7 @@ err_register:
         if (!(adapter->flags & FLAG_HAS_AMT))
                 e1000e_release_hw_control(adapter);
 err_eeprom:
-        if (!hw->phy.ops.check_reset_block(hw))
+        if (hw->phy.ops.check_reset_block && !hw->phy.ops.check_reset_block(hw))
                 e1000_phy_hw_reset(&adapter->hw);
 err_hw_init:
         kfree(adapter->tx_ring);
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
index 0334d013bc3c..b860d4f7ea2a 100644
--- a/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/drivers/net/ethernet/intel/e1000e/phy.c
@@ -2155,9 +2155,11 @@ s32 e1000e_phy_hw_reset_generic(struct e1000_hw *hw)
         s32 ret_val;
         u32 ctrl;
 
-        ret_val = phy->ops.check_reset_block(hw);
-        if (ret_val)
-                return 0;
+        if (phy->ops.check_reset_block) {
+                ret_val = phy->ops.check_reset_block(hw);
+                if (ret_val)
+                        return 0;
+        }
 
         ret_val = phy->ops.acquire(hw);
         if (ret_val)
diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c
index e65083958421..5e84eaac48c1 100644
--- a/drivers/net/ethernet/intel/igb/e1000_82575.c
+++ b/drivers/net/ethernet/intel/igb/e1000_82575.c
@@ -206,8 +206,6 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
                 mac->rar_entry_count = E1000_RAR_ENTRIES_82580;
                 break;
         case e1000_i350:
-        case e1000_i210:
-        case e1000_i211:
                 mac->rar_entry_count = E1000_RAR_ENTRIES_I350;
                 break;
         default:
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
index 3ef3c5284e52..7af291e236bf 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
@@ -196,7 +196,7 @@ enum ixgbe_ring_state_t {
         __IXGBE_HANG_CHECK_ARMED,
         __IXGBE_RX_RSC_ENABLED,
         __IXGBE_RX_CSUM_UDP_ZERO_ERR,
-        __IXGBE_RX_FCOE_BUFSZ,
+        __IXGBE_RX_FCOE,
 };
 
 #define check_for_tx_hang(ring) \
@@ -290,7 +290,7 @@ struct ixgbe_ring_feature {
 #if defined(IXGBE_FCOE) && (PAGE_SIZE < 8192)
 static inline unsigned int ixgbe_rx_pg_order(struct ixgbe_ring *ring)
 {
-        return test_bit(__IXGBE_RX_FCOE_BUFSZ, &ring->state) ? 1 : 0;
+        return test_bit(__IXGBE_RX_FCOE, &ring->state) ? 1 : 0;
 }
 #else
 #define ixgbe_rx_pg_order(_ring) 0
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
index af1a5314b494..c377706e81a8 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
@@ -634,7 +634,7 @@ static int ixgbe_alloc_q_vector(struct ixgbe_adapter *adapter,
                         f = &adapter->ring_feature[RING_F_FCOE];
                         if ((rxr_idx >= f->mask) &&
                             (rxr_idx < f->mask + f->indices))
-                                set_bit(__IXGBE_RX_FCOE_BUFSZ, &ring->state);
+                                set_bit(__IXGBE_RX_FCOE, &ring->state);
                 }
 
 #endif /* IXGBE_FCOE */
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index bf20457ea23a..18ca3bcadf0c 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -1058,17 +1058,17 @@ static inline void ixgbe_rx_hash(struct ixgbe_ring *ring,
 #ifdef IXGBE_FCOE
 /**
  * ixgbe_rx_is_fcoe - check the rx desc for incoming pkt type
- * @adapter: address of board private structure
+ * @ring: structure containing ring specific data
  * @rx_desc: advanced rx descriptor
  *
  * Returns : true if it is FCoE pkt
  */
-static inline bool ixgbe_rx_is_fcoe(struct ixgbe_adapter *adapter,
+static inline bool ixgbe_rx_is_fcoe(struct ixgbe_ring *ring,
                                     union ixgbe_adv_rx_desc *rx_desc)
 {
         __le16 pkt_info = rx_desc->wb.lower.lo_dword.hs_rss.pkt_info;
 
-        return (adapter->flags & IXGBE_FLAG_FCOE_ENABLED) &&
+        return test_bit(__IXGBE_RX_FCOE, &ring->state) &&
                ((pkt_info & cpu_to_le16(IXGBE_RXDADV_PKTTYPE_ETQF_MASK)) ==
                 (cpu_to_le16(IXGBE_ETQF_FILTER_FCOE <<
                              IXGBE_RXDADV_PKTTYPE_ETQF_SHIFT)));
@@ -1148,7 +1148,7 @@ static bool ixgbe_alloc_mapped_page(struct ixgbe_ring *rx_ring,
 
         /* alloc new page for storage */
         if (likely(!page)) {
-                page = alloc_pages(GFP_ATOMIC | __GFP_COLD,
+                page = alloc_pages(GFP_ATOMIC | __GFP_COLD | __GFP_COMP,
                                    ixgbe_rx_pg_order(rx_ring));
                 if (unlikely(!page)) {
                         rx_ring->rx_stats.alloc_rx_page_failed++;
@@ -1390,6 +1390,8 @@ static void ixgbe_process_skb_fields(struct ixgbe_ring *rx_ring,
                                      union ixgbe_adv_rx_desc *rx_desc,
                                      struct sk_buff *skb)
 {
+        struct net_device *dev = rx_ring->netdev;
+
         ixgbe_update_rsc_stats(rx_ring, skb);
 
         ixgbe_rx_hash(rx_ring, rx_desc, skb);
@@ -1401,14 +1403,15 @@ static void ixgbe_process_skb_fields(struct ixgbe_ring *rx_ring,
                 ixgbe_ptp_rx_hwtstamp(rx_ring->q_vector, skb);
 #endif
 
-        if (ixgbe_test_staterr(rx_desc, IXGBE_RXD_STAT_VP)) {
+        if ((dev->features & NETIF_F_HW_VLAN_RX) &&
+            ixgbe_test_staterr(rx_desc, IXGBE_RXD_STAT_VP)) {
                 u16 vid = le16_to_cpu(rx_desc->wb.upper.vlan);
                 __vlan_hwaccel_put_tag(skb, vid);
         }
 
         skb_record_rx_queue(skb, rx_ring->queue_index);
 
-        skb->protocol = eth_type_trans(skb, rx_ring->netdev);
+        skb->protocol = eth_type_trans(skb, dev);
 }
 
 static void ixgbe_rx_skb(struct ixgbe_q_vector *q_vector,
@@ -1546,6 +1549,12 @@ static bool ixgbe_cleanup_headers(struct ixgbe_ring *rx_ring,
                 skb->truesize -= ixgbe_rx_bufsz(rx_ring);
         }
 
+#ifdef IXGBE_FCOE
+        /* do not attempt to pad FCoE Frames as this will disrupt DDP */
+        if (ixgbe_rx_is_fcoe(rx_ring, rx_desc))
+                return false;
+
+#endif
         /* if skb_pad returns an error the skb was freed */
         if (unlikely(skb->len < 60)) {
                 int pad_len = 60 - skb->len;
@@ -1772,7 +1781,7 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
 
 #ifdef IXGBE_FCOE
                 /* if ddp, not passing to ULD unless for FCP_RSP or error */
-                if (ixgbe_rx_is_fcoe(adapter, rx_desc)) {
+                if (ixgbe_rx_is_fcoe(rx_ring, rx_desc)) {
                         ddp_bytes = ixgbe_fcoe_ddp(adapter, rx_desc, skb);
                         if (!ddp_bytes) {
                                 dev_kfree_skb_any(skb);
@@ -3607,10 +3616,6 @@ static void ixgbe_configure_dcb(struct ixgbe_adapter *adapter)
         if (hw->mac.type == ixgbe_mac_82598EB)
                 netif_set_gso_max_size(adapter->netdev, 32768);
 
-
-        /* Enable VLAN tag insert/strip */
-        adapter->netdev->features |= NETIF_F_HW_VLAN_RX;
-
         hw->mac.ops.set_vfta(&adapter->hw, 0, 0, true);
 
 #ifdef IXGBE_FCOE
@@ -6701,11 +6706,6 @@ static netdev_features_t ixgbe_fix_features(struct net_device *netdev,
 {
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
 
-#ifdef CONFIG_DCB
-        if (adapter->flags & IXGBE_FLAG_DCB_ENABLED)
-                features &= ~NETIF_F_HW_VLAN_RX;
-#endif
-
         /* return error if RXHASH is being enabled when RSS is not supported */
         if (!(adapter->flags & IXGBE_FLAG_RSS_ENABLED))
                 features &= ~NETIF_F_RXHASH;
@@ -6718,7 +6718,6 @@ static netdev_features_t ixgbe_fix_features(struct net_device *netdev,
         if (!(adapter->flags2 & IXGBE_FLAG2_RSC_CAPABLE))
                 features &= ~NETIF_F_LRO;
 
-
         return features;
 }
 
@@ -6766,6 +6765,11 @@ static int ixgbe_set_features(struct net_device *netdev,
                 need_reset = true;
         }
 
+        if (features & NETIF_F_HW_VLAN_RX)
+                ixgbe_vlan_strip_enable(adapter);
+        else
+                ixgbe_vlan_strip_disable(adapter);
+
         if (changed & NETIF_F_RXALL)
                 need_reset = true;
 
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
index ddc6a4d19302..dcebd128becf 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
@@ -708,6 +708,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
 {
         struct ixgbe_hw *hw = &adapter->hw;
         u32 incval = 0;
+        u32 timinca = 0;
         u32 shift = 0;
         u32 cycle_speed;
         unsigned long flags;
@@ -730,8 +731,16 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
                 break;
         }
 
-        /* Bail if the cycle speed didn't change */
-        if (adapter->cycle_speed == cycle_speed)
+        /*
+         * grab the current TIMINCA value from the register so that it can be
+         * double checked. If the register value has been cleared, it must be
+         * reset to the correct value for generating a cyclecounter. If
+         * TIMINCA is zero, the SYSTIME registers do not increment at all.
+         */
+        timinca = IXGBE_READ_REG(hw, IXGBE_TIMINCA);
+
+        /* Bail if the cycle speed didn't change and TIMINCA is non-zero */
+        if (adapter->cycle_speed == cycle_speed && timinca)
                 return;
 
         /* disable the SDP clock out */
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 04d901d0ff63..f0f06b2bc28b 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -436,7 +436,9 @@ struct mv643xx_eth_private {
         /*
          * Hardware-specific parameters.
          */
+#if defined(CONFIG_HAVE_CLK)
         struct clk *clk;
+#endif
         unsigned int t_clk;
 };
 
@@ -2895,17 +2897,17 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
         mp->dev = dev;
 
         /*
-         * Get the clk rate, if there is one, otherwise use the default.
+         * Start with a default rate, and if there is a clock, allow
+         * it to override the default.
          */
+        mp->t_clk = 133000000;
+#if defined(CONFIG_HAVE_CLK)
         mp->clk = clk_get(&pdev->dev, (pdev->id ? "1" : "0"));
         if (!IS_ERR(mp->clk)) {
                 clk_prepare_enable(mp->clk);
                 mp->t_clk = clk_get_rate(mp->clk);
-        } else {
-                mp->t_clk = 133000000;
-                printk(KERN_WARNING "Unable to get clock");
         }
-
+#endif
         set_params(mp, pd);
         netif_set_real_num_tx_queues(dev, mp->txq_count);
         netif_set_real_num_rx_queues(dev, mp->rxq_count);
@@ -2995,10 +2997,13 @@ static int mv643xx_eth_remove(struct platform_device *pdev)
                 phy_detach(mp->phy);
         cancel_work_sync(&mp->tx_timeout_task);
 
+#if defined(CONFIG_HAVE_CLK)
         if (!IS_ERR(mp->clk)) {
                 clk_disable_unprepare(mp->clk);
                 clk_put(mp->clk);
         }
+#endif
+
         free_netdev(mp->dev);
 
         platform_set_drvdata(pdev, NULL);
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index cace36f2ab92..28a54451a3e5 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -4381,10 +4381,12 @@ static int sky2_set_features(struct net_device *dev, netdev_features_t features)
         struct sky2_port *sky2 = netdev_priv(dev);
         netdev_features_t changed = dev->features ^ features;
 
-        if (changed & NETIF_F_RXCSUM) {
-                bool on = features & NETIF_F_RXCSUM;
-                sky2_write32(sky2->hw, Q_ADDR(rxqaddr[sky2->port], Q_CSR),
-                             on ? BMU_ENA_RX_CHKSUM : BMU_DIS_RX_CHKSUM);
+        if ((changed & NETIF_F_RXCSUM) &&
+            !(sky2->hw->flags & SKY2_HW_NEW_LE)) {
+                sky2_write32(sky2->hw,
+                             Q_ADDR(rxqaddr[sky2->port], Q_CSR),
+                             (features & NETIF_F_RXCSUM)
+                             ? BMU_ENA_RX_CHKSUM : BMU_DIS_RX_CHKSUM);
         }
 
         if (changed & NETIF_F_RXHASH)
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 926d8aac941c..073b85b45fc5 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -929,15 +929,20 @@ void mlx4_en_free_resources(struct mlx4_en_priv *priv)
                 if (priv->rx_cq[i].buf)
                         mlx4_en_destroy_cq(priv, &priv->rx_cq[i]);
         }
+
+        if (priv->base_tx_qpn) {
+                mlx4_qp_release_range(priv->mdev->dev, priv->base_tx_qpn, priv->tx_ring_num);
+                priv->base_tx_qpn = 0;
+        }
 }
 
 int mlx4_en_alloc_resources(struct mlx4_en_priv *priv)
 {
         struct mlx4_en_port_profile *prof = priv->prof;
         int i;
-        int base_tx_qpn, err;
+        int err;
 
-        err = mlx4_qp_reserve_range(priv->mdev->dev, priv->tx_ring_num, 256, &base_tx_qpn);
+        err = mlx4_qp_reserve_range(priv->mdev->dev, priv->tx_ring_num, 256, &priv->base_tx_qpn);
         if (err) {
                 en_err(priv, "failed reserving range for TX rings\n");
                 return err;
@@ -949,7 +954,7 @@ int mlx4_en_alloc_resources(struct mlx4_en_priv *priv)
                                       prof->tx_ring_size, i, TX))
                         goto err;
 
-                if (mlx4_en_create_tx_ring(priv, &priv->tx_ring[i], base_tx_qpn + i,
+                if (mlx4_en_create_tx_ring(priv, &priv->tx_ring[i], priv->base_tx_qpn + i,
                                            prof->tx_ring_size, TXBB_SIZE))
                         goto err;
         }
@@ -969,7 +974,6 @@ int mlx4_en_alloc_resources(struct mlx4_en_priv *priv)
 
 err:
         en_err(priv, "Failed to allocate NIC resources\n");
-        mlx4_qp_release_range(priv->mdev->dev, base_tx_qpn, priv->tx_ring_num);
         return -ENOMEM;
 }
 
@@ -1204,9 +1208,11 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
         en_warn(priv, "Using %d RX rings\n", prof->rx_ring_num);
 
         /* Configure port */
+        mlx4_en_calc_rx_buf(dev);
         err = mlx4_SET_PORT_general(mdev->dev, priv->port,
-                                    MLX4_EN_MIN_MTU,
-                                    0, 0, 0, 0);
+                                    priv->rx_skb_size + ETH_FCS_LEN,
+                                    prof->tx_pause, prof->tx_ppp,
+                                    prof->rx_pause, prof->rx_ppp);
         if (err) {
                 en_err(priv, "Failed setting port general configurations "
                        "for port %d, with error %d\n", priv->port, err);
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index ee6f4fe00837..a0313de122de 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -1975,6 +1975,8 @@ slave_start:
         if (err == -EBUSY && (dev->flags & MLX4_FLAG_MSI_X) &&
             !mlx4_is_mfunc(dev)) {
                 dev->flags &= ~MLX4_FLAG_MSI_X;
+                dev->caps.num_comp_vectors = 1;
+                dev->caps.comp_pool        = 0;
                 pci_disable_msix(pdev);
                 err = mlx4_setup_hca(dev);
         }
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
index 6ae350921b1a..225c20d47900 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
@@ -495,6 +495,7 @@ struct mlx4_en_priv {
         int vids[128];
         bool wol;
         struct device *ddev;
+        int base_tx_qpn;
 
 #ifdef CONFIG_MLX4_EN_DCB
         struct ieee_ets ets;
diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c
index 8d2666fcffd7..083d6715335c 100644
--- a/drivers/net/ethernet/nxp/lpc_eth.c
+++ b/drivers/net/ethernet/nxp/lpc_eth.c
@@ -946,16 +946,16 @@ static void __lpc_handle_xmit(struct net_device *ndev)
                         /* Update stats */
                         ndev->stats.tx_packets++;
                         ndev->stats.tx_bytes += skb->len;
-
-                        /* Free buffer */
-                        dev_kfree_skb_irq(skb);
                 }
+                dev_kfree_skb_irq(skb);
 
                 txcidx = readl(LPC_ENET_TXCONSUMEINDEX(pldat->net_base));
         }
 
-        if (netif_queue_stopped(ndev))
-                netif_wake_queue(ndev);
+        if (pldat->num_used_tx_buffs <= ENET_TX_DESC/2) {
+                if (netif_queue_stopped(ndev))
+                        netif_wake_queue(ndev);
+        }
 }
 
 static int __lpc_handle_recv(struct net_device *ndev, int budget)
@@ -1320,6 +1320,7 @@ static const struct net_device_ops lpc_netdev_ops = {
         .ndo_set_rx_mode        = lpc_eth_set_multicast_list,
         .ndo_do_ioctl           = lpc_eth_ioctl,
         .ndo_set_mac_address    = lpc_set_mac_address,
+        .ndo_change_mtu         = eth_change_mtu,
 };
 
 static int lpc_eth_drv_probe(struct platform_device *pdev)
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 46e77a2c5121..ad98f4d7919d 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -479,7 +479,7 @@ qlcnic_init_pci_info(struct qlcnic_adapter *adapter)
 
         for (i = 0; i < QLCNIC_MAX_PCI_FUNC; i++) {
                 pfn = pci_info[i].id;
-                if (pfn > QLCNIC_MAX_PCI_FUNC) {
+                if (pfn >= QLCNIC_MAX_PCI_FUNC) {
                         ret = QL_STATUS_INVALID_PARAM;
                         goto err_eswitch;
                 }
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 9757ce3543a0..d7a04e091101 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -3894,6 +3894,7 @@ static void rtl_init_rxcfg(struct rtl8169_private *tp)
         case RTL_GIGA_MAC_VER_22:
         case RTL_GIGA_MAC_VER_23:
         case RTL_GIGA_MAC_VER_24:
+        case RTL_GIGA_MAC_VER_34:
                 RTL_W32(RxConfig, RX128_INT_EN | RX_MULTI_EN | RX_DMA_BURST);
                 break;
         default:
@@ -5889,11 +5890,7 @@ static void rtl_slow_event_work(struct rtl8169_private *tp)
         if (status & LinkChg)
                 __rtl8169_check_link_status(dev, tp, tp->mmio_addr, true);
 
-        napi_disable(&tp->napi);
-        rtl_irq_disable(tp);
-
-        napi_enable(&tp->napi);
-        napi_schedule(&tp->napi);
+        rtl_irq_enable_all(tp);
 }
 
 static void rtl_task(struct work_struct *work)
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 667169b82526..79bf09b41971 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -1011,7 +1011,7 @@ static int sh_eth_txfree(struct net_device *ndev)
 }
 
 /* Packet receive function */
-static int sh_eth_rx(struct net_device *ndev)
+static int sh_eth_rx(struct net_device *ndev, u32 intr_status)
 {
         struct sh_eth_private *mdp = netdev_priv(ndev);
         struct sh_eth_rxdesc *rxdesc;
@@ -1102,9 +1102,11 @@ static int sh_eth_rx(struct net_device *ndev)
         /* Restart Rx engine if stopped. */
         /* If we don't need to check status, don't. -KDU */
         if (!(sh_eth_read(ndev, EDRRR) & EDRRR_R)) {
-                /* fix the values for the next receiving */
-                mdp->cur_rx = mdp->dirty_rx = (sh_eth_read(ndev, RDFAR) -
-                                               sh_eth_read(ndev, RDLAR)) >> 4;
+                /* fix the values for the next receiving if RDE is set */
+                if (intr_status & EESR_RDE)
+                        mdp->cur_rx = mdp->dirty_rx =
+                                (sh_eth_read(ndev, RDFAR) -
+                                 sh_eth_read(ndev, RDLAR)) >> 4;
                 sh_eth_write(ndev, EDRRR_R, EDRRR);
         }
 
@@ -1273,7 +1275,7 @@ static irqreturn_t sh_eth_interrupt(int irq, void *netdev)
                         EESR_RTSF | /* short frame recv */
                         EESR_PRE  | /* PHY-LSI recv error */
                         EESR_CERF)){ /* recv frame CRC error */
-                sh_eth_rx(ndev);
+                sh_eth_rx(ndev, intr_status);
         }
 
         /* Tx Check */
diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
index 036428348faa..9f448279e12a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -13,7 +13,7 @@ config STMMAC_ETH
 if STMMAC_ETH
 
 config STMMAC_PLATFORM
-        tristate "STMMAC platform bus support"
+        bool "STMMAC Platform bus support"
         depends on STMMAC_ETH
         default y
         ---help---
@@ -26,7 +26,7 @@ config STMMAC_PLATFORM
           If unsure, say N.
 
 config STMMAC_PCI
-        tristate "STMMAC support on PCI bus (EXPERIMENTAL)"
+        bool "STMMAC PCI bus support (EXPERIMENTAL)"
         depends on STMMAC_ETH && PCI && EXPERIMENTAL
         ---help---
           This is to select the Synopsys DWMAC available on PCI devices,
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index 6b5d060ee9de..dc20c56efc9d 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@ -26,6 +26,7 @@
 #include <linux/clk.h>
 #include <linux/stmmac.h>
 #include <linux/phy.h>
+#include <linux/pci.h>
 #include "common.h"
 #ifdef CONFIG_STMMAC_TIMER
 #include "stmmac_timer.h"
@@ -95,7 +96,6 @@ extern int stmmac_mdio_register(struct net_device *ndev);
 extern void stmmac_set_ethtool_ops(struct net_device *netdev);
 extern const struct stmmac_desc_ops enh_desc_ops;
 extern const struct stmmac_desc_ops ndesc_ops;
-
 int stmmac_freeze(struct net_device *ndev);
 int stmmac_restore(struct net_device *ndev);
 int stmmac_resume(struct net_device *ndev);
@@ -109,7 +109,7 @@ struct stmmac_priv *stmmac_dvr_probe(struct device *device,
 static inline int stmmac_clk_enable(struct stmmac_priv *priv)
 {
         if (!IS_ERR(priv->stmmac_clk))
-                return clk_enable(priv->stmmac_clk);
+                return clk_prepare_enable(priv->stmmac_clk);
 
         return 0;
 }
@@ -119,7 +119,7 @@ static inline void stmmac_clk_disable(struct stmmac_priv *priv)
         if (IS_ERR(priv->stmmac_clk))
                 return;
 
-        clk_disable(priv->stmmac_clk);
+        clk_disable_unprepare(priv->stmmac_clk);
 }
 static inline int stmmac_clk_get(struct stmmac_priv *priv)
 {
@@ -143,3 +143,60 @@ static inline int stmmac_clk_get(struct stmmac_priv *priv)
         return 0;
 }
 #endif /* CONFIG_HAVE_CLK */
+
+
+#ifdef CONFIG_STMMAC_PLATFORM
+extern struct platform_driver stmmac_pltfr_driver;
+static inline int stmmac_register_platform(void)
+{
+        int err;
+
+        err = platform_driver_register(&stmmac_pltfr_driver);
+        if (err)
+                pr_err("stmmac: failed to register the platform driver\n");
+
+        return err;
+}
+static inline void stmmac_unregister_platform(void)
+{
+        platform_driver_register(&stmmac_pltfr_driver);
+}
+#else
+static inline int stmmac_register_platform(void)
+{
+        pr_debug("stmmac: do not register the platf driver\n");
+
+        return -EINVAL;
+}
+static inline void stmmac_unregister_platform(void)
+{
+}
+#endif /* CONFIG_STMMAC_PLATFORM */
+
+#ifdef CONFIG_STMMAC_PCI
+extern struct pci_driver stmmac_pci_driver;
+static inline int stmmac_register_pci(void)
+{
+        int err;
+
+        err = pci_register_driver(&stmmac_pci_driver);
+        if (err)
+                pr_err("stmmac: failed to register the PCI driver\n");
+
+        return err;
+}
+static inline void stmmac_unregister_pci(void)
+{
+        pci_unregister_driver(&stmmac_pci_driver);
+}
+#else
+static inline int stmmac_register_pci(void)
+{
+        pr_debug("stmmac: do not register the PCI driver\n");
+
+        return -EINVAL;
+}
+static inline void stmmac_unregister_pci(void)
+{
+}
+#endif /* CONFIG_STMMAC_PCI */
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 70966330f44e..51b3b68528ee 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -833,8 +833,9 @@ static u32 stmmac_get_synopsys_id(struct stmmac_priv *priv)
 
 /**
  * stmmac_selec_desc_mode
- * @dev : device pointer
- * Description: select the Enhanced/Alternate or Normal descriptors */
+ * @priv : private structure
+ * Description: select the Enhanced/Alternate or Normal descriptors
+ */
 static void stmmac_selec_desc_mode(struct stmmac_priv *priv)
 {
         if (priv->plat->enh_desc) {
@@ -1861,6 +1862,8 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
 /**
  * stmmac_dvr_probe
  * @device: device pointer
+ * @plat_dat: platform data pointer
+ * @addr: iobase memory address
  * Description: this is the main probe function used to
  * call the alloc_etherdev, allocate the priv structure.
  */
@@ -2090,6 +2093,34 @@ int stmmac_restore(struct net_device *ndev)
 }
 #endif /* CONFIG_PM */
 
+/* Driver can be configured w/ and w/ both PCI and Platf drivers
+ * depending on the configuration selected.
+ */
+static int __init stmmac_init(void)
+{
+        int err_plt = 0;
+        int err_pci = 0;
+
+        err_plt = stmmac_register_platform();
+        err_pci = stmmac_register_pci();
+
+        if ((err_pci) && (err_plt)) {
+                pr_err("stmmac: driver registration failed\n");
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static void __exit stmmac_exit(void)
+{
+        stmmac_unregister_platform();
+        stmmac_unregister_pci();
+}
+
+module_init(stmmac_init);
+module_exit(stmmac_exit);
+
 #ifndef MODULE
 static int __init stmmac_cmdline_opt(char *str)
 {
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index 58fab5303e9c..cf826e6b6aa1 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -179,7 +179,7 @@ static DEFINE_PCI_DEVICE_TABLE(stmmac_id_table) = {
 
 MODULE_DEVICE_TABLE(pci, stmmac_id_table);
 
-static struct pci_driver stmmac_driver = {
+struct pci_driver stmmac_pci_driver = {
         .name = STMMAC_RESOURCE_NAME,
         .id_table = stmmac_id_table,
         .probe = stmmac_pci_probe,
@@ -190,33 +190,6 @@ static struct pci_driver stmmac_driver = {
 #endif
 };
 
-/**
- * stmmac_init_module - Entry point for the driver
- * Description: This function is the entry point for the driver.
- */
-static int __init stmmac_init_module(void)
-{
-        int ret;
-
-        ret = pci_register_driver(&stmmac_driver);
-        if (ret < 0)
-                pr_err("%s: ERROR: driver registration failed\n", __func__);
-
-        return ret;
-}
-
-/**
- * stmmac_cleanup_module - Cleanup routine for the driver
- * Description: This function is the cleanup routine for the driver.
- */
-static void __exit stmmac_cleanup_module(void)
-{
-        pci_unregister_driver(&stmmac_driver);
-}
-
-module_init(stmmac_init_module);
-module_exit(stmmac_cleanup_module);
-
 MODULE_DESCRIPTION("STMMAC 10/100/1000 Ethernet PCI driver");
 MODULE_AUTHOR("Rayagond Kokatanur <rayagond.kokatanur@vayavyalabs.com>");
 MODULE_AUTHOR("Giuseppe Cavallaro <peppe.cavallaro@st.com>");
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 3dd8f0803808..680d2b8dfe27 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -255,7 +255,7 @@ static const struct of_device_id stmmac_dt_ids[] = {
 };
 MODULE_DEVICE_TABLE(of, stmmac_dt_ids);
 
-static struct platform_driver stmmac_driver = {
+struct platform_driver stmmac_pltfr_driver = {
         .probe = stmmac_pltfr_probe,
         .remove = stmmac_pltfr_remove,
         .driver = {
@@ -266,8 +266,6 @@ static struct platform_driver stmmac_driver = {
                    },
 };
 
-module_platform_driver(stmmac_driver);
-
 MODULE_DESCRIPTION("STMMAC 10/100/1000 Ethernet PLATFORM driver");
 MODULE_AUTHOR("Giuseppe Cavallaro <peppe.cavallaro@st.com>");
 MODULE_LICENSE("GPL");
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index 703c8cce2a2c..8c726b7004d3 100644
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -3598,7 +3598,6 @@ static int release_tx_packet(struct niu *np, struct tx_ring_info *rp, int idx)
 static void niu_tx_work(struct niu *np, struct tx_ring_info *rp)
 {
         struct netdev_queue *txq;
-        unsigned int tx_bytes;
         u16 pkt_cnt, tmp;
         int cons, index;
         u64 cs;
@@ -3621,18 +3620,12 @@ static void niu_tx_work(struct niu *np, struct tx_ring_info *rp)
         netif_printk(np, tx_done, KERN_DEBUG, np->dev,
                      "%s() pkt_cnt[%u] cons[%d]\n", __func__, pkt_cnt, cons);
 
-        tx_bytes = 0;
-        tmp = pkt_cnt;
-        while (tmp--) {
-                tx_bytes += rp->tx_buffs[cons].skb->len;
+        while (pkt_cnt--)
                 cons = release_tx_packet(np, rp, cons);
-        }
 
         rp->cons = cons;
         smp_mb();
 
-        netdev_tx_completed_queue(txq, pkt_cnt, tx_bytes);
-
 out:
         if (unlikely(netif_tx_queue_stopped(txq) &&
                      (niu_tx_avail(rp) > NIU_TX_WAKEUP_THRESH(rp)))) {
@@ -4333,7 +4326,6 @@ static void niu_free_channels(struct niu *np)
                         struct tx_ring_info *rp = &np->tx_rings[i];
 
                         niu_free_tx_ring_info(np, rp);
-                        netdev_tx_reset_queue(netdev_get_tx_queue(np->dev, i));
                 }
                 kfree(np->tx_rings);
                 np->tx_rings = NULL;
@@ -6739,8 +6731,6 @@ static netdev_tx_t niu_start_xmit(struct sk_buff *skb,
                 prod = NEXT_TX(rp, prod);
         }
 
-        netdev_tx_sent_queue(txq, skb->len);
-
         if (prod < rp->prod)
                 rp->wrap_bit ^= TX_RING_KICK_WRAP;
         rp->prod = prod;
diff --git a/drivers/net/ethernet/tile/Kconfig b/drivers/net/ethernet/tile/Kconfig
index 2d9218f86bca..098b1c42b393 100644
--- a/drivers/net/ethernet/tile/Kconfig
+++ b/drivers/net/ethernet/tile/Kconfig
@@ -7,6 +7,8 @@ config TILE_NET
         depends on TILE
         default y
         select CRC32
+        select TILE_GXIO_MPIPE if TILEGX
+        select HIGH_RES_TIMERS if TILEGX
         ---help---
           This is a standard Linux network device driver for the
           on-chip Tilera Gigabit Ethernet and XAUI interfaces.
diff --git a/drivers/net/ethernet/tile/Makefile b/drivers/net/ethernet/tile/Makefile
index f634f142cab4..0ef9eefd3211 100644
--- a/drivers/net/ethernet/tile/Makefile
+++ b/drivers/net/ethernet/tile/Makefile
@@ -4,7 +4,7 @@
 
 obj-$(CONFIG_TILE_NET) += tile_net.o
 ifdef CONFIG_TILEGX
-tile_net-objs := tilegx.o mpipe.o iorpc_mpipe.o dma_queue.o
+tile_net-y := tilegx.o
 else
-tile_net-objs := tilepro.o
+tile_net-y := tilepro.o
 endif
diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c
new file mode 100644
index 000000000000..83b4b388ad49
--- /dev/null
+++ b/drivers/net/ethernet/tile/tilegx.c
@@ -0,0 +1,1898 @@
+/*
+ * Copyright 2012 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/moduleparam.h>
+#include <linux/sched.h>
+#include <linux/kernel.h>      /* printk() */
+#include <linux/slab.h>        /* kmalloc() */
+#include <linux/errno.h>       /* error codes */
+#include <linux/types.h>       /* size_t */
+#include <linux/interrupt.h>
+#include <linux/in.h>
+#include <linux/irq.h>
+#include <linux/netdevice.h>   /* struct device, and other headers */
+#include <linux/etherdevice.h> /* eth_type_trans */
+#include <linux/skbuff.h>
+#include <linux/ioctl.h>
+#include <linux/cdev.h>
+#include <linux/hugetlb.h>
+#include <linux/in6.h>
+#include <linux/timer.h>
+#include <linux/hrtimer.h>
+#include <linux/ktime.h>
+#include <linux/io.h>
+#include <linux/ctype.h>
+#include <linux/ip.h>
+#include <linux/tcp.h>
+
+#include <asm/checksum.h>
+#include <asm/homecache.h>
+#include <gxio/mpipe.h>
+#include <arch/sim.h>
+
+/* Default transmit lockup timeout period, in jiffies. */
+#define TILE_NET_TIMEOUT (5 * HZ)
+
+/* The maximum number of distinct channels (idesc.channel is 5 bits). */
+#define TILE_NET_CHANNELS 32
+
+/* Maximum number of idescs to handle per "poll". */
+#define TILE_NET_BATCH 128
+
+/* Maximum number of packets to handle per "poll". */
+#define TILE_NET_WEIGHT 64
+
+/* Number of entries in each iqueue. */
+#define IQUEUE_ENTRIES 512
+
+/* Number of entries in each equeue. */
+#define EQUEUE_ENTRIES 2048
+
+/* Total header bytes per equeue slot.  Must be big enough for 2 bytes
+ * of NET_IP_ALIGN alignment, plus 14 bytes (?) of L2 header, plus up to
+ * 60 bytes of actual TCP header.  We round up to align to cache lines.
+ */
+#define HEADER_BYTES 128
+
+/* Maximum completions per cpu per device (must be a power of two).
+ * ISSUE: What is the right number here?  If this is too small, then
+ * egress might block waiting for free space in a completions array.
+ * ISSUE: At the least, allocate these only for initialized echannels.
+ */
+#define TILE_NET_MAX_COMPS 64
+
+#define MAX_FRAGS (MAX_SKB_FRAGS + 1)
+
+/* Size of completions data to allocate.
+ * ISSUE: Probably more than needed since we don't use all the channels.
+ */
+#define COMPS_SIZE (TILE_NET_CHANNELS * sizeof(struct tile_net_comps))
+
+/* Size of NotifRing data to allocate. */
+#define NOTIF_RING_SIZE (IQUEUE_ENTRIES * sizeof(gxio_mpipe_idesc_t))
+
+/* Timeout to wake the per-device TX timer after we stop the queue.
+ * We don't want the timeout too short (adds overhead, and might end
+ * up causing stop/wake/stop/wake cycles) or too long (affects performance).
+ * For the 10 Gb NIC, 30 usec means roughly 30+ 1500-byte packets.
+ */
+#define TX_TIMER_DELAY_USEC 30
+
+/* Timeout to wake the per-cpu egress timer to free completions. */
+#define EGRESS_TIMER_DELAY_USEC 1000
+
+MODULE_AUTHOR("Tilera Corporation");
+MODULE_LICENSE("GPL");
+
+/* A "packet fragment" (a chunk of memory). */
+struct frag {
+        void *buf;
+        size_t length;
+};
+
+/* A single completion. */
+struct tile_net_comp {
+        /* The "complete_count" when the completion will be complete. */
+        s64 when;
+        /* The buffer to be freed when the completion is complete. */
+        struct sk_buff *skb;
+};
+
+/* The completions for a given cpu and echannel. */
+struct tile_net_comps {
+        /* The completions. */
+        struct tile_net_comp comp_queue[TILE_NET_MAX_COMPS];
+        /* The number of completions used. */
+        unsigned long comp_next;
+        /* The number of completions freed. */
+        unsigned long comp_last;
+};
+
+/* The transmit wake timer for a given cpu and echannel. */
+struct tile_net_tx_wake {
+        struct hrtimer timer;
+        struct net_device *dev;
+};
+
+/* Info for a specific cpu. */
+struct tile_net_info {
+        /* The NAPI struct. */
+        struct napi_struct napi;
+        /* Packet queue. */
+        gxio_mpipe_iqueue_t iqueue;
+        /* Our cpu. */
+        int my_cpu;
+        /* True if iqueue is valid. */
+        bool has_iqueue;
+        /* NAPI flags. */
+        bool napi_added;
+        bool napi_enabled;
+        /* Number of small sk_buffs which must still be provided. */
+        unsigned int num_needed_small_buffers;
+        /* Number of large sk_buffs which must still be provided. */
+        unsigned int num_needed_large_buffers;
+        /* A timer for handling egress completions. */
+        struct hrtimer egress_timer;
+        /* True if "egress_timer" is scheduled. */
+        bool egress_timer_scheduled;
+        /* Comps for each egress channel. */
+        struct tile_net_comps *comps_for_echannel[TILE_NET_CHANNELS];
+        /* Transmit wake timer for each egress channel. */
+        struct tile_net_tx_wake tx_wake[TILE_NET_CHANNELS];
+};
+
+/* Info for egress on a particular egress channel. */
+struct tile_net_egress {
+        /* The "equeue". */
+        gxio_mpipe_equeue_t *equeue;
+        /* The headers for TSO. */
+        unsigned char *headers;
+};
+
+/* Info for a specific device. */
+struct tile_net_priv {
+        /* Our network device. */
+        struct net_device *dev;
+        /* The primary link. */
+        gxio_mpipe_link_t link;
+        /* The primary channel, if open, else -1. */
+        int channel;
+        /* The "loopify" egress link, if needed. */
+        gxio_mpipe_link_t loopify_link;
+        /* The "loopify" egress channel, if open, else -1. */
+        int loopify_channel;
+        /* The egress channel (channel or loopify_channel). */
+        int echannel;
+        /* Total stats. */
+        struct net_device_stats stats;
+};
+
+/* Egress info, indexed by "priv->echannel" (lazily created as needed). */
+static struct tile_net_egress egress_for_echannel[TILE_NET_CHANNELS];
+
+/* Devices currently associated with each channel.
+ * NOTE: The array entry can become NULL after ifconfig down, but
+ * we do not free the underlying net_device structures, so it is
+ * safe to use a pointer after reading it from this array.
+ */
+static struct net_device *tile_net_devs_for_channel[TILE_NET_CHANNELS];
+
+/* A mutex for "tile_net_devs_for_channel". */
+static DEFINE_MUTEX(tile_net_devs_for_channel_mutex);
+
+/* The per-cpu info. */
+static DEFINE_PER_CPU(struct tile_net_info, per_cpu_info);
+
+/* The "context" for all devices. */
+static gxio_mpipe_context_t context;
+
+/* Buffer sizes and mpipe enum codes for buffer stacks.
+ * See arch/tile/include/gxio/mpipe.h for the set of possible values.
+ */
+#define BUFFER_SIZE_SMALL_ENUM GXIO_MPIPE_BUFFER_SIZE_128
+#define BUFFER_SIZE_SMALL 128
+#define BUFFER_SIZE_LARGE_ENUM GXIO_MPIPE_BUFFER_SIZE_1664
+#define BUFFER_SIZE_LARGE 1664
+
+/* The small/large "buffer stacks". */
+static int small_buffer_stack = -1;
+static int large_buffer_stack = -1;
+
+/* Amount of memory allocated for each buffer stack. */
+static size_t buffer_stack_size;
+
+/* The actual memory allocated for the buffer stacks. */
+static void *small_buffer_stack_va;
+static void *large_buffer_stack_va;
+
+/* The buckets. */
+static int first_bucket = -1;
+static int num_buckets = 1;
+
+/* The ingress irq. */
+static int ingress_irq = -1;
+
+/* Text value of tile_net.cpus if passed as a module parameter. */
+static char *network_cpus_string;
+
+/* The actual cpus in "network_cpus". */
+static struct cpumask network_cpus_map;
+
+/* If "loopify=LINK" was specified, this is "LINK". */
+static char *loopify_link_name;
+
+/* If "tile_net.custom" was specified, this is non-NULL. */
+static char *custom_str;
+
+/* The "tile_net.cpus" argument specifies the cpus that are dedicated
+ * to handle ingress packets.
+ *
+ * The parameter should be in the form "tile_net.cpus=m-n[,x-y]", where
+ * m, n, x, y are integer numbers that represent the cpus that can be
+ * neither a dedicated cpu nor a dataplane cpu.
+ */
+static bool network_cpus_init(void)
+{
+        char buf[1024];
+        int rc;
+
+        if (network_cpus_string == NULL)
+                return false;
+
+        rc = cpulist_parse_crop(network_cpus_string, &network_cpus_map);
+        if (rc != 0) {
+                pr_warn("tile_net.cpus=%s: malformed cpu list\n",
+                        network_cpus_string);
+                return false;
+        }
+
+        /* Remove dedicated cpus. */
+        cpumask_and(&network_cpus_map, &network_cpus_map, cpu_possible_mask);
+
+        if (cpumask_empty(&network_cpus_map)) {
+                pr_warn("Ignoring empty tile_net.cpus='%s'.\n",
+                        network_cpus_string);
+                return false;
+        }
+
+        cpulist_scnprintf(buf, sizeof(buf), &network_cpus_map);
+        pr_info("Linux network CPUs: %s\n", buf);
+        return true;
+}
+
+module_param_named(cpus, network_cpus_string, charp, 0444);
+MODULE_PARM_DESC(cpus, "cpulist of cores that handle network interrupts");
+
+/* The "tile_net.loopify=LINK" argument causes the named device to
+ * actually use "loop0" for ingress, and "loop1" for egress.  This
+ * allows an app to sit between the actual link and linux, passing
+ * (some) packets along to linux, and forwarding (some) packets sent
+ * out by linux.
+ */
+module_param_named(loopify, loopify_link_name, charp, 0444);
+MODULE_PARM_DESC(loopify, "name the device to use loop0/1 for ingress/egress");
+
+/* The "tile_net.custom" argument causes us to ignore the "conventional"
+ * classifier metadata, in particular, the "l2_offset".
+ */
+module_param_named(custom, custom_str, charp, 0444);
+MODULE_PARM_DESC(custom, "indicates a (heavily) customized classifier");
+
+/* Atomically update a statistics field.
+ * Note that on TILE-Gx, this operation is fire-and-forget on the
+ * issuing core (single-cycle dispatch) and takes only a few cycles
+ * longer than a regular store when the request reaches the home cache.
+ * No expensive bus management overhead is required.
+ */
+static void tile_net_stats_add(unsigned long value, unsigned long *field)
+{
+        BUILD_BUG_ON(sizeof(atomic_long_t) != sizeof(unsigned long));
+        atomic_long_add(value, (atomic_long_t *)field);
+}
+
+/* Allocate and push a buffer. */
+static bool tile_net_provide_buffer(bool small)
+{
+        int stack = small ? small_buffer_stack : large_buffer_stack;
+        const unsigned long buffer_alignment = 128;
+        struct sk_buff *skb;
+        int len;
+
+        len = sizeof(struct sk_buff **) + buffer_alignment;
+        len += (small ? BUFFER_SIZE_SMALL : BUFFER_SIZE_LARGE);
+        skb = dev_alloc_skb(len);
+        if (skb == NULL)
+                return false;
+
+        /* Make room for a back-pointer to 'skb' and guarantee alignment. */
+        skb_reserve(skb, sizeof(struct sk_buff **));
+        skb_reserve(skb, -(long)skb->data & (buffer_alignment - 1));
+
+        /* Save a back-pointer to 'skb'. */
+        *(struct sk_buff **)(skb->data - sizeof(struct sk_buff **)) = skb;
+
+        /* Make sure "skb" and the back-pointer have been flushed. */
+        wmb();
+
+        gxio_mpipe_push_buffer(&context, stack,
+                               (void *)va_to_tile_io_addr(skb->data));
+
+        return true;
+}
+
+/* Convert a raw mpipe buffer to its matching skb pointer. */
+static struct sk_buff *mpipe_buf_to_skb(void *va)
+{
+        /* Acquire the associated "skb". */
+        struct sk_buff **skb_ptr = va - sizeof(*skb_ptr);
+        struct sk_buff *skb = *skb_ptr;
+
+        /* Paranoia. */
+        if (skb->data != va) {
+                /* Panic here since there's a reasonable chance
+                 * that corrupt buffers means generic memory
+                 * corruption, with unpredictable system effects.
+                 */
+                panic("Corrupt linux buffer! va=%p, skb=%p, skb->data=%p",
+                      va, skb, skb->data);
+        }
+
+        return skb;
+}
+
+static void tile_net_pop_all_buffers(int stack)
+{
+        for (;;) {
+                tile_io_addr_t addr =
+                        (tile_io_addr_t)gxio_mpipe_pop_buffer(&context, stack);
+                if (addr == 0)
+                        break;
+                dev_kfree_skb_irq(mpipe_buf_to_skb(tile_io_addr_to_va(addr)));
+        }
+}
+
+/* Provide linux buffers to mPIPE. */
+static void tile_net_provide_needed_buffers(void)
+{
+        struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
+
+        while (info->num_needed_small_buffers != 0) {
+                if (!tile_net_provide_buffer(true))
+                        goto oops;
+                info->num_needed_small_buffers--;
+        }
+
+        while (info->num_needed_large_buffers != 0) {
+                if (!tile_net_provide_buffer(false))
+                        goto oops;
+                info->num_needed_large_buffers--;
+        }
+
+        return;
+
+oops:
+        /* Add a description to the page allocation failure dump. */
+        pr_notice("Tile %d still needs some buffers\n", info->my_cpu);
+}
+
+static inline bool filter_packet(struct net_device *dev, void *buf)
+{
+        /* Filter packets received before we're up. */
+        if (dev == NULL || !(dev->flags & IFF_UP))
+                return true;
+
+        /* Filter out packets that aren't for us. */
+        if (!(dev->flags & IFF_PROMISC) &&
+            !is_multicast_ether_addr(buf) &&
+            compare_ether_addr(dev->dev_addr, buf) != 0)
+                return true;
+
+        return false;
+}
+
+static void tile_net_receive_skb(struct net_device *dev, struct sk_buff *skb,
+                                 gxio_mpipe_idesc_t *idesc, unsigned long len)
+{
+        struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
+        struct tile_net_priv *priv = netdev_priv(dev);
+
+        /* Encode the actual packet length. */
+        skb_put(skb, len);
+
+        skb->protocol = eth_type_trans(skb, dev);
+
+        /* Acknowledge "good" hardware checksums. */
+        if (idesc->cs && idesc->csum_seed_val == 0xFFFF)
+                skb->ip_summed = CHECKSUM_UNNECESSARY;
+
+        netif_receive_skb(skb);
+
+        /* Update stats. */
+        tile_net_stats_add(1, &priv->stats.rx_packets);
+        tile_net_stats_add(len, &priv->stats.rx_bytes);
+
+        /* Need a new buffer. */
+        if (idesc->size == BUFFER_SIZE_SMALL_ENUM)
+                info->num_needed_small_buffers++;
+        else
+                info->num_needed_large_buffers++;
+}
+
+/* Handle a packet.  Return true if "processed", false if "filtered". */
+static bool tile_net_handle_packet(gxio_mpipe_idesc_t *idesc)
+{
+        struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
+        struct net_device *dev = tile_net_devs_for_channel[idesc->channel];
+        uint8_t l2_offset;
+        void *va;
+        void *buf;
+        unsigned long len;
+        bool filter;
+
+        /* Drop packets for which no buffer was available.
+         * NOTE: This happens under heavy load.
+         */
+        if (idesc->be) {
+                struct tile_net_priv *priv = netdev_priv(dev);
+                tile_net_stats_add(1, &priv->stats.rx_dropped);
+                gxio_mpipe_iqueue_consume(&info->iqueue, idesc);
+                if (net_ratelimit())
+                        pr_info("Dropping packet (insufficient buffers).\n");
+                return false;
+        }
+
+        /* Get the "l2_offset", if allowed. */
+        l2_offset = custom_str ? 0 : gxio_mpipe_idesc_get_l2_offset(idesc);
+
+        /* Get the raw buffer VA (includes "headroom"). */
+        va = tile_io_addr_to_va((unsigned long)(long)idesc->va);
+
+        /* Get the actual packet start/length. */
+        buf = va + l2_offset;
+        len = idesc->l2_size - l2_offset;
+
+        /* Point "va" at the raw buffer. */
+        va -= NET_IP_ALIGN;
+
+        filter = filter_packet(dev, buf);
+        if (filter) {
+                gxio_mpipe_iqueue_drop(&info->iqueue, idesc);
+        } else {
+                struct sk_buff *skb = mpipe_buf_to_skb(va);
+
+                /* Skip headroom, and any custom header. */
+                skb_reserve(skb, NET_IP_ALIGN + l2_offset);
+
+                tile_net_receive_skb(dev, skb, idesc, len);
+        }
+
+        gxio_mpipe_iqueue_consume(&info->iqueue, idesc);
+        return !filter;
+}
+
+/* Handle some packets for the current CPU.
+ *
+ * This function handles up to TILE_NET_BATCH idescs per call.
+ *
+ * ISSUE: Since we do not provide new buffers until this function is
+ * complete, we must initially provide enough buffers for each network
+ * cpu to fill its iqueue and also its batched idescs.
+ *
+ * ISSUE: The "rotting packet" race condition occurs if a packet
+ * arrives after the queue appears to be empty, and before the
+ * hypervisor interrupt is re-enabled.
+ */
+static int tile_net_poll(struct napi_struct *napi, int budget)
+{
+        struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
+        unsigned int work = 0;
+        gxio_mpipe_idesc_t *idesc;
+        int i, n;
+
+        /* Process packets. */
+        while ((n = gxio_mpipe_iqueue_try_peek(&info->iqueue, &idesc)) > 0) {
+                for (i = 0; i < n; i++) {
+                        if (i == TILE_NET_BATCH)
+                                goto done;
+                        if (tile_net_handle_packet(idesc + i)) {
+                                if (++work >= budget)
+                                        goto done;
+                        }
+                }
+        }
+
+        /* There are no packets left. */
+        napi_complete(&info->napi);
+
+        /* Re-enable hypervisor interrupts. */
+        gxio_mpipe_enable_notif_ring_interrupt(&context, info->iqueue.ring);
+
+        /* HACK: Avoid the "rotting packet" problem. */
+        if (gxio_mpipe_iqueue_try_peek(&info->iqueue, &idesc) > 0)
+                napi_schedule(&info->napi);
+
+        /* ISSUE: Handle completions? */
+
+done:
+        tile_net_provide_needed_buffers();
+
+        return work;
+}
+
+/* Handle an ingress interrupt on the current cpu. */
+static irqreturn_t tile_net_handle_ingress_irq(int irq, void *unused)
+{
+        struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
+        napi_schedule(&info->napi);
+        return IRQ_HANDLED;
+}
+
+/* Free some completions.  This must be called with interrupts blocked. */
+static int tile_net_free_comps(gxio_mpipe_equeue_t *equeue,
+                                struct tile_net_comps *comps,
+                                int limit, bool force_update)
+{
+        int n = 0;
+        while (comps->comp_last < comps->comp_next) {
+                unsigned int cid = comps->comp_last % TILE_NET_MAX_COMPS;
+                struct tile_net_comp *comp = &comps->comp_queue[cid];
+                if (!gxio_mpipe_equeue_is_complete(equeue, comp->when,
+                                                   force_update || n == 0))
+                        break;
+                dev_kfree_skb_irq(comp->skb);
+                comps->comp_last++;
+                if (++n == limit)
+                        break;
+        }
+        return n;
+}
+
+/* Add a completion.  This must be called with interrupts blocked.
+ * tile_net_equeue_try_reserve() will have ensured a free completion entry.
+ */
+static void add_comp(gxio_mpipe_equeue_t *equeue,
+                     struct tile_net_comps *comps,
+                     uint64_t when, struct sk_buff *skb)
+{
+        int cid = comps->comp_next % TILE_NET_MAX_COMPS;
+        comps->comp_queue[cid].when = when;
+        comps->comp_queue[cid].skb = skb;
+        comps->comp_next++;
+}
+
+static void tile_net_schedule_tx_wake_timer(struct net_device *dev)
+{
+        struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
+        struct tile_net_priv *priv = netdev_priv(dev);
+
+        hrtimer_start(&info->tx_wake[priv->echannel].timer,
+                      ktime_set(0, TX_TIMER_DELAY_USEC * 1000UL),
+                      HRTIMER_MODE_REL_PINNED);
+}
+
+static enum hrtimer_restart tile_net_handle_tx_wake_timer(struct hrtimer *t)
+{
+        struct tile_net_tx_wake *tx_wake =
+                container_of(t, struct tile_net_tx_wake, timer);
+        netif_wake_subqueue(tx_wake->dev, smp_processor_id());
+        return HRTIMER_NORESTART;
+}
+
+/* Make sure the egress timer is scheduled. */
+static void tile_net_schedule_egress_timer(void)
+{
+        struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
+
+        if (!info->egress_timer_scheduled) {
+                hrtimer_start(&info->egress_timer,
+                              ktime_set(0, EGRESS_TIMER_DELAY_USEC * 1000UL),
+                              HRTIMER_MODE_REL_PINNED);
+                info->egress_timer_scheduled = true;
+        }
+}
+
+/* The "function" for "info->egress_timer".
+ *
+ * This timer will reschedule itself as long as there are any pending
+ * completions expected for this tile.
+ */
+static enum hrtimer_restart tile_net_handle_egress_timer(struct hrtimer *t)
+{
+        struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
+        unsigned long irqflags;
+        bool pending = false;
+        int i;
+
+        local_irq_save(irqflags);
+
+        /* The timer is no longer scheduled. */
+        info->egress_timer_scheduled = false;
+
+        /* Free all possible comps for this tile. */
+        for (i = 0; i < TILE_NET_CHANNELS; i++) {
+                struct tile_net_egress *egress = &egress_for_echannel[i];
+                struct tile_net_comps *comps = info->comps_for_echannel[i];
+                if (comps->comp_last >= comps->comp_next)
+                        continue;
+                tile_net_free_comps(egress->equeue, comps, -1, true);
+                pending = pending || (comps->comp_last < comps->comp_next);
+        }
+
+        /* Reschedule timer if needed. */
+        if (pending)
+                tile_net_schedule_egress_timer();
+
+        local_irq_restore(irqflags);
+
+        return HRTIMER_NORESTART;
+}
+
+/* Helper function for "tile_net_update()".
+ * "dev" (i.e. arg) is the device being brought up or down,
+ * or NULL if all devices are now down.
+ */
+static void tile_net_update_cpu(void *arg)
+{
+        struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
+        struct net_device *dev = arg;
+
+        if (!info->has_iqueue)
+                return;
+
+        if (dev != NULL) {
+                if (!info->napi_added) {
+                        netif_napi_add(dev, &info->napi,
+                                       tile_net_poll, TILE_NET_WEIGHT);
+                        info->napi_added = true;
+                }
+                if (!info->napi_enabled) {
+                        napi_enable(&info->napi);
+                        info->napi_enabled = true;
+                }
+                enable_percpu_irq(ingress_irq, 0);
+        } else {
+                disable_percpu_irq(ingress_irq);
+                if (info->napi_enabled) {
+                        napi_disable(&info->napi);
+                        info->napi_enabled = false;
+                }
+                /* FIXME: Drain the iqueue. */
+        }
+}
+
+/* Helper function for tile_net_open() and tile_net_stop().
+ * Always called under tile_net_devs_for_channel_mutex.
+ */
+static int tile_net_update(struct net_device *dev)
+{
+        static gxio_mpipe_rules_t rules;  /* too big to fit on the stack */
+        bool saw_channel = false;
+        int channel;
+        int rc;
+        int cpu;
+
+        gxio_mpipe_rules_init(&rules, &context);
+
+        for (channel = 0; channel < TILE_NET_CHANNELS; channel++) {
+                if (tile_net_devs_for_channel[channel] == NULL)
+                        continue;
+                if (!saw_channel) {
+                        saw_channel = true;
+                        gxio_mpipe_rules_begin(&rules, first_bucket,
+                                               num_buckets, NULL);
+                        gxio_mpipe_rules_set_headroom(&rules, NET_IP_ALIGN);
+                }
+                gxio_mpipe_rules_add_channel(&rules, channel);
+        }
+
+        /* NOTE: This can fail if there is no classifier.
+         * ISSUE: Can anything else cause it to fail?
+         */
+        rc = gxio_mpipe_rules_commit(&rules);
+        if (rc != 0) {
+                netdev_warn(dev, "gxio_mpipe_rules_commit failed: %d\n", rc);
+                return -EIO;
+        }
+
+        /* Update all cpus, sequentially (to protect "netif_napi_add()"). */
+        for_each_online_cpu(cpu)
+                smp_call_function_single(cpu, tile_net_update_cpu,
+                                         (saw_channel ? dev : NULL), 1);
+
+        /* HACK: Allow packets to flow in the simulator. */
+        if (saw_channel)
+                sim_enable_mpipe_links(0, -1);
+
+        return 0;
+}
+
+/* Allocate and initialize mpipe buffer stacks, and register them in
+ * the mPIPE TLBs, for both small and large packet sizes.
+ * This routine supports tile_net_init_mpipe(), below.
+ */
+static int init_buffer_stacks(struct net_device *dev, int num_buffers)
+{
+        pte_t hash_pte = pte_set_home((pte_t) { 0 }, PAGE_HOME_HASH);
+        int rc;
+
+        /* Compute stack bytes; we round up to 64KB and then use
+         * alloc_pages() so we get the required 64KB alignment as well.
+         */
+        buffer_stack_size =
+                ALIGN(gxio_mpipe_calc_buffer_stack_bytes(num_buffers),
+                      64 * 1024);
+
+        /* Allocate two buffer stack indices. */
+        rc = gxio_mpipe_alloc_buffer_stacks(&context, 2, 0, 0);
+        if (rc < 0) {
+                netdev_err(dev, "gxio_mpipe_alloc_buffer_stacks failed: %d\n",
+                           rc);
+                return rc;
+        }
+        small_buffer_stack = rc;
+        large_buffer_stack = rc + 1;
+
+        /* Allocate the small memory stack. */
+        small_buffer_stack_va =
+                alloc_pages_exact(buffer_stack_size, GFP_KERNEL);
+        if (small_buffer_stack_va == NULL) {
+                netdev_err(dev,
+                           "Could not alloc %zd bytes for buffer stacks\n",
+                           buffer_stack_size);
+                return -ENOMEM;
+        }
+        rc = gxio_mpipe_init_buffer_stack(&context, small_buffer_stack,
+                                          BUFFER_SIZE_SMALL_ENUM,
+                                          small_buffer_stack_va,
+                                          buffer_stack_size, 0);
+        if (rc != 0) {
+                netdev_err(dev, "gxio_mpipe_init_buffer_stack: %d\n", rc);
+                return rc;
+        }
+        rc = gxio_mpipe_register_client_memory(&context, small_buffer_stack,
+                                               hash_pte, 0);
+        if (rc != 0) {
+                netdev_err(dev,
+                           "gxio_mpipe_register_buffer_memory failed: %d\n",
+                           rc);
+                return rc;
+        }
+
+        /* Allocate the large buffer stack. */
+        large_buffer_stack_va =
+                alloc_pages_exact(buffer_stack_size, GFP_KERNEL);
+        if (large_buffer_stack_va == NULL) {
+                netdev_err(dev,
+                           "Could not alloc %zd bytes for buffer stacks\n",
+                           buffer_stack_size);
+                return -ENOMEM;
+        }
+        rc = gxio_mpipe_init_buffer_stack(&context, large_buffer_stack,
+                                          BUFFER_SIZE_LARGE_ENUM,
+                                          large_buffer_stack_va,
+                                          buffer_stack_size, 0);
+        if (rc != 0) {
+                netdev_err(dev, "gxio_mpipe_init_buffer_stack failed: %d\n",
+                           rc);
+                return rc;
+        }
+        rc = gxio_mpipe_register_client_memory(&context, large_buffer_stack,
+                                               hash_pte, 0);
+        if (rc != 0) {
+                netdev_err(dev,
+                           "gxio_mpipe_register_buffer_memory failed: %d\n",
+                           rc);
+                return rc;
+        }
+
+        return 0;
+}
+
+/* Allocate per-cpu resources (memory for completions and idescs).
+ * This routine supports tile_net_init_mpipe(), below.
+ */
+static int alloc_percpu_mpipe_resources(struct net_device *dev,
+                                        int cpu, int ring)
+{
+        struct tile_net_info *info = &per_cpu(per_cpu_info, cpu);
+        int order, i, rc;
+        struct page *page;
+        void *addr;
+
+        /* Allocate the "comps". */
+        order = get_order(COMPS_SIZE);
+        page = homecache_alloc_pages(GFP_KERNEL, order, cpu);
+        if (page == NULL) {
+                netdev_err(dev, "Failed to alloc %zd bytes comps memory\n",
+                           COMPS_SIZE);
+                return -ENOMEM;
+        }
+        addr = pfn_to_kaddr(page_to_pfn(page));
+        memset(addr, 0, COMPS_SIZE);
+        for (i = 0; i < TILE_NET_CHANNELS; i++)
+                info->comps_for_echannel[i] =
+                        addr + i * sizeof(struct tile_net_comps);
+
+        /* If this is a network cpu, create an iqueue. */
+        if (cpu_isset(cpu, network_cpus_map)) {
+                order = get_order(NOTIF_RING_SIZE);
+                page = homecache_alloc_pages(GFP_KERNEL, order, cpu);
+                if (page == NULL) {
+                        netdev_err(dev,
+                                   "Failed to alloc %zd bytes iqueue memory\n",
+                                   NOTIF_RING_SIZE);
+                        return -ENOMEM;
+                }
+                addr = pfn_to_kaddr(page_to_pfn(page));
+                rc = gxio_mpipe_iqueue_init(&info->iqueue, &context, ring++,
+                                            addr, NOTIF_RING_SIZE, 0);
+                if (rc < 0) {
+                        netdev_err(dev,
+                                   "gxio_mpipe_iqueue_init failed: %d\n", rc);
+                        return rc;
+                }
+                info->has_iqueue = true;
+        }
+
+        return ring;
+}
+
+/* Initialize NotifGroup and buckets.
+ * This routine supports tile_net_init_mpipe(), below.
+ */
+static int init_notif_group_and_buckets(struct net_device *dev,
+                                        int ring, int network_cpus_count)
+{
+        int group, rc;
+
+        /* Allocate one NotifGroup. */
+        rc = gxio_mpipe_alloc_notif_groups(&context, 1, 0, 0);
+        if (rc < 0) {
+                netdev_err(dev, "gxio_mpipe_alloc_notif_groups failed: %d\n",
+                           rc);
+                return rc;
+        }
+        group = rc;
+
+        /* Initialize global num_buckets value. */
+        if (network_cpus_count > 4)
+                num_buckets = 256;
+        else if (network_cpus_count > 1)
+                num_buckets = 16;
+
+        /* Allocate some buckets, and set global first_bucket value. */
+        rc = gxio_mpipe_alloc_buckets(&context, num_buckets, 0, 0);
+        if (rc < 0) {
+                netdev_err(dev, "gxio_mpipe_alloc_buckets failed: %d\n", rc);
+                return rc;
+        }
+        first_bucket = rc;
+
+        /* Init group and buckets. */
+        rc = gxio_mpipe_init_notif_group_and_buckets(
+                &context, group, ring, network_cpus_count,
+                first_bucket, num_buckets,
+                GXIO_MPIPE_BUCKET_STICKY_FLOW_LOCALITY);
+        if (rc != 0) {
+                netdev_err(
+                        dev,
+                        "gxio_mpipe_init_notif_group_and_buckets failed: %d\n",
+                        rc);
+                return rc;
+        }
+
+        return 0;
+}
+
+/* Create an irq and register it, then activate the irq and request
+ * interrupts on all cores.  Note that "ingress_irq" being initialized
+ * is how we know not to call tile_net_init_mpipe() again.
+ * This routine supports tile_net_init_mpipe(), below.
+ */
+static int tile_net_setup_interrupts(struct net_device *dev)
+{
+        int cpu, rc;
+
+        rc = create_irq();
+        if (rc < 0) {
+                netdev_err(dev, "create_irq failed: %d\n", rc);
+                return rc;
+        }
+        ingress_irq = rc;
+        tile_irq_activate(ingress_irq, TILE_IRQ_PERCPU);
+        rc = request_irq(ingress_irq, tile_net_handle_ingress_irq,
+                         0, NULL, NULL);
+        if (rc != 0) {
+                netdev_err(dev, "request_irq failed: %d\n", rc);
+                destroy_irq(ingress_irq);
+                ingress_irq = -1;
+                return rc;
+        }
+
+        for_each_online_cpu(cpu) {
+                struct tile_net_info *info = &per_cpu(per_cpu_info, cpu);
+                if (info->has_iqueue) {
+                        gxio_mpipe_request_notif_ring_interrupt(
+                                &context, cpu_x(cpu), cpu_y(cpu),
+                                1, ingress_irq, info->iqueue.ring);
+                }
+        }
+
+        return 0;
+}
+
+/* Undo any state set up partially by a failed call to tile_net_init_mpipe. */
+static void tile_net_init_mpipe_fail(void)
+{
+        int cpu;
+
+        /* Do cleanups that require the mpipe context first. */
+        if (small_buffer_stack >= 0)
+                tile_net_pop_all_buffers(small_buffer_stack);
+        if (large_buffer_stack >= 0)
+                tile_net_pop_all_buffers(large_buffer_stack);
+
+        /* Destroy mpipe context so the hardware no longer owns any memory. */
+        gxio_mpipe_destroy(&context);
+
+        for_each_online_cpu(cpu) {
+                struct tile_net_info *info = &per_cpu(per_cpu_info, cpu);
+                free_pages((unsigned long)(info->comps_for_echannel[0]),
+                           get_order(COMPS_SIZE));
+                info->comps_for_echannel[0] = NULL;
+                free_pages((unsigned long)(info->iqueue.idescs),
+                           get_order(NOTIF_RING_SIZE));
+                info->iqueue.idescs = NULL;
+        }
+
+        if (small_buffer_stack_va)
+                free_pages_exact(small_buffer_stack_va, buffer_stack_size);
+        if (large_buffer_stack_va)
+                free_pages_exact(large_buffer_stack_va, buffer_stack_size);
+
+        small_buffer_stack_va = NULL;
+        large_buffer_stack_va = NULL;
+        large_buffer_stack = -1;
+        small_buffer_stack = -1;
+        first_bucket = -1;
+}
+
+/* The first time any tilegx network device is opened, we initialize
+ * the global mpipe state.  If this step fails, we fail to open the
+ * device, but if it succeeds, we never need to do it again, and since
+ * tile_net can't be unloaded, we never undo it.
+ *
+ * Note that some resources in this path (buffer stack indices,
+ * bindings from init_buffer_stack, etc.) are hypervisor resources
+ * that are freed implicitly by gxio_mpipe_destroy().
+ */
+static int tile_net_init_mpipe(struct net_device *dev)
+{
+        int i, num_buffers, rc;
+        int cpu;
+        int first_ring, ring;
+        int network_cpus_count = cpus_weight(network_cpus_map);
+
+        if (!hash_default) {
+                netdev_err(dev, "Networking requires hash_default!\n");
+                return -EIO;
+        }
+
+        rc = gxio_mpipe_init(&context, 0);
+        if (rc != 0) {
+                netdev_err(dev, "gxio_mpipe_init failed: %d\n", rc);
+                return -EIO;
+        }
+
+        /* Set up the buffer stacks. */
+        num_buffers =
+                network_cpus_count * (IQUEUE_ENTRIES + TILE_NET_BATCH);
+        rc = init_buffer_stacks(dev, num_buffers);
+        if (rc != 0)
+                goto fail;
+
+        /* Provide initial buffers. */
+        rc = -ENOMEM;
+        for (i = 0; i < num_buffers; i++) {
+                if (!tile_net_provide_buffer(true)) {
+                        netdev_err(dev, "Cannot allocate initial sk_bufs!\n");
+                        goto fail;
+                }
+        }
+        for (i = 0; i < num_buffers; i++) {
+                if (!tile_net_provide_buffer(false)) {
+                        netdev_err(dev, "Cannot allocate initial sk_bufs!\n");
+                        goto fail;
+                }
+        }
+
+        /* Allocate one NotifRing for each network cpu. */
+        rc = gxio_mpipe_alloc_notif_rings(&context, network_cpus_count, 0, 0);
+        if (rc < 0) {
+                netdev_err(dev, "gxio_mpipe_alloc_notif_rings failed %d\n",
+                           rc);
+                goto fail;
+        }
+
+        /* Init NotifRings per-cpu. */
+        first_ring = rc;
+        ring = first_ring;
+        for_each_online_cpu(cpu) {
+                rc = alloc_percpu_mpipe_resources(dev, cpu, ring);
+                if (rc < 0)
+                        goto fail;
+                ring = rc;
+        }
+
+        /* Initialize NotifGroup and buckets. */
+        rc = init_notif_group_and_buckets(dev, first_ring, network_cpus_count);
+        if (rc != 0)
+                goto fail;
+
+        /* Create and enable interrupts. */
+        rc = tile_net_setup_interrupts(dev);
+        if (rc != 0)
+                goto fail;
+
+        return 0;
+
+fail:
+        tile_net_init_mpipe_fail();
+        return rc;
+}
+
+/* Create persistent egress info for a given egress channel.
+ * Note that this may be shared between, say, "gbe0" and "xgbe0".
+ * ISSUE: Defer header allocation until TSO is actually needed?
+ */
+static int tile_net_init_egress(struct net_device *dev, int echannel)
+{
+        struct page *headers_page, *edescs_page, *equeue_page;
+        gxio_mpipe_edesc_t *edescs;
+        gxio_mpipe_equeue_t *equeue;
+        unsigned char *headers;
+        int headers_order, edescs_order, equeue_order;
+        size_t edescs_size;
+        int edma;
+        int rc = -ENOMEM;
+
+        /* Only initialize once. */
+        if (egress_for_echannel[echannel].equeue != NULL)
+                return 0;
+
+        /* Allocate memory for the "headers". */
+        headers_order = get_order(EQUEUE_ENTRIES * HEADER_BYTES);
+        headers_page = alloc_pages(GFP_KERNEL, headers_order);
+        if (headers_page == NULL) {
+                netdev_warn(dev,
+                            "Could not alloc %zd bytes for TSO headers.\n",
+                            PAGE_SIZE << headers_order);
+                goto fail;
+        }
+        headers = pfn_to_kaddr(page_to_pfn(headers_page));
+
+        /* Allocate memory for the "edescs". */
+        edescs_size = EQUEUE_ENTRIES * sizeof(*edescs);
+        edescs_order = get_order(edescs_size);
+        edescs_page = alloc_pages(GFP_KERNEL, edescs_order);
+        if (edescs_page == NULL) {
+                netdev_warn(dev,
+                            "Could not alloc %zd bytes for eDMA ring.\n",
+                            edescs_size);
+                goto fail_headers;
+        }
+        edescs = pfn_to_kaddr(page_to_pfn(edescs_page));
+
+        /* Allocate memory for the "equeue". */
+        equeue_order = get_order(sizeof(*equeue));
+        equeue_page = alloc_pages(GFP_KERNEL, equeue_order);
+        if (equeue_page == NULL) {
+                netdev_warn(dev,
+                            "Could not alloc %zd bytes for equeue info.\n",
+                            PAGE_SIZE << equeue_order);
+                goto fail_edescs;
+        }
+        equeue = pfn_to_kaddr(page_to_pfn(equeue_page));
+
+        /* Allocate an edma ring.  Note that in practice this can't
+         * fail, which is good, because we will leak an edma ring if so.
+         */
+        rc = gxio_mpipe_alloc_edma_rings(&context, 1, 0, 0);
+        if (rc < 0) {
+                netdev_warn(dev, "gxio_mpipe_alloc_edma_rings failed: %d\n",
+                            rc);
+                goto fail_equeue;
+        }
+        edma = rc;
+
+        /* Initialize the equeue. */
+        rc = gxio_mpipe_equeue_init(equeue, &context, edma, echannel,
+                                    edescs, edescs_size, 0);
+        if (rc != 0) {
+                netdev_err(dev, "gxio_mpipe_equeue_init failed: %d\n", rc);
+                goto fail_equeue;
+        }
+
+        /* Done. */
+        egress_for_echannel[echannel].equeue = equeue;
+        egress_for_echannel[echannel].headers = headers;
+        return 0;
+
+fail_equeue:
+        __free_pages(equeue_page, equeue_order);
+
+fail_edescs:
+        __free_pages(edescs_page, edescs_order);
+
+fail_headers:
+        __free_pages(headers_page, headers_order);
+
+fail:
+        return rc;
+}
+
+/* Return channel number for a newly-opened link. */
+static int tile_net_link_open(struct net_device *dev, gxio_mpipe_link_t *link,
+                              const char *link_name)
+{
+        int rc = gxio_mpipe_link_open(link, &context, link_name, 0);
+        if (rc < 0) {
+                netdev_err(dev, "Failed to open '%s'\n", link_name);
+                return rc;
+        }
+        rc = gxio_mpipe_link_channel(link);
+        if (rc < 0 || rc >= TILE_NET_CHANNELS) {
+                netdev_err(dev, "gxio_mpipe_link_channel bad value: %d\n", rc);
+                gxio_mpipe_link_close(link);
+                return -EINVAL;
+        }
+        return rc;
+}
+
+/* Help the kernel activate the given network interface. */
+static int tile_net_open(struct net_device *dev)
+{
+        struct tile_net_priv *priv = netdev_priv(dev);
+        int cpu, rc;
+
+        mutex_lock(&tile_net_devs_for_channel_mutex);
+
+        /* Do one-time initialization the first time any device is opened. */
+        if (ingress_irq < 0) {
+                rc = tile_net_init_mpipe(dev);
+                if (rc != 0)
+                        goto fail;
+        }
+
+        /* Determine if this is the "loopify" device. */
+        if (unlikely((loopify_link_name != NULL) &&
+                     !strcmp(dev->name, loopify_link_name))) {
+                rc = tile_net_link_open(dev, &priv->link, "loop0");
+                if (rc < 0)
+                        goto fail;
+                priv->channel = rc;
+                rc = tile_net_link_open(dev, &priv->loopify_link, "loop1");
+                if (rc < 0)
+                        goto fail;
+                priv->loopify_channel = rc;
+                priv->echannel = rc;
+        } else {
+                rc = tile_net_link_open(dev, &priv->link, dev->name);
+                if (rc < 0)
+                        goto fail;
+                priv->channel = rc;
+                priv->echannel = rc;
+        }
+
+        /* Initialize egress info (if needed).  Once ever, per echannel. */
+        rc = tile_net_init_egress(dev, priv->echannel);
+        if (rc != 0)
+                goto fail;
+
+        tile_net_devs_for_channel[priv->channel] = dev;
+
+        rc = tile_net_update(dev);
+        if (rc != 0)
+                goto fail;
+
+        mutex_unlock(&tile_net_devs_for_channel_mutex);
+
+        /* Initialize the transmit wake timer for this device for each cpu. */
+        for_each_online_cpu(cpu) {
+                struct tile_net_info *info = &per_cpu(per_cpu_info, cpu);
+                struct tile_net_tx_wake *tx_wake =
+                        &info->tx_wake[priv->echannel];
+
+                hrtimer_init(&tx_wake->timer, CLOCK_MONOTONIC,
+                             HRTIMER_MODE_REL);
+                tx_wake->timer.function = tile_net_handle_tx_wake_timer;
+                tx_wake->dev = dev;
+        }
+
+        for_each_online_cpu(cpu)
+                netif_start_subqueue(dev, cpu);
+        netif_carrier_on(dev);
+        return 0;
+
+fail:
+        if (priv->loopify_channel >= 0) {
+                if (gxio_mpipe_link_close(&priv->loopify_link) != 0)
+                        netdev_warn(dev, "Failed to close loopify link!\n");
+                priv->loopify_channel = -1;
+        }
+        if (priv->channel >= 0) {
+                if (gxio_mpipe_link_close(&priv->link) != 0)
+                        netdev_warn(dev, "Failed to close link!\n");
+                priv->channel = -1;
+        }
+        priv->echannel = -1;
+        tile_net_devs_for_channel[priv->channel] = NULL;
+        mutex_unlock(&tile_net_devs_for_channel_mutex);
+
+        /* Don't return raw gxio error codes to generic Linux. */
+        return (rc > -512) ? rc : -EIO;
+}
+
+/* Help the kernel deactivate the given network interface. */
+static int tile_net_stop(struct net_device *dev)
+{
+        struct tile_net_priv *priv = netdev_priv(dev);
+        int cpu;
+
+        for_each_online_cpu(cpu) {
+                struct tile_net_info *info = &per_cpu(per_cpu_info, cpu);
+                struct tile_net_tx_wake *tx_wake =
+                        &info->tx_wake[priv->echannel];
+
+                hrtimer_cancel(&tx_wake->timer);
+                netif_stop_subqueue(dev, cpu);
+        }
+
+        mutex_lock(&tile_net_devs_for_channel_mutex);
+        tile_net_devs_for_channel[priv->channel] = NULL;
+        (void)tile_net_update(dev);
+        if (priv->loopify_channel >= 0) {
+                if (gxio_mpipe_link_close(&priv->loopify_link) != 0)
+                        netdev_warn(dev, "Failed to close loopify link!\n");
+                priv->loopify_channel = -1;
+        }
+        if (priv->channel >= 0) {
+                if (gxio_mpipe_link_close(&priv->link) != 0)
+                        netdev_warn(dev, "Failed to close link!\n");
+                priv->channel = -1;
+        }
+        priv->echannel = -1;
+        mutex_unlock(&tile_net_devs_for_channel_mutex);
+
+        return 0;
+}
+
+/* Determine the VA for a fragment. */
+static inline void *tile_net_frag_buf(skb_frag_t *f)
+{
+        unsigned long pfn = page_to_pfn(skb_frag_page(f));
+        return pfn_to_kaddr(pfn) + f->page_offset;
+}
+
+/* Acquire a completion entry and an egress slot, or if we can't,
+ * stop the queue and schedule the tx_wake timer.
+ */
+static s64 tile_net_equeue_try_reserve(struct net_device *dev,
+                                       struct tile_net_comps *comps,
+                                       gxio_mpipe_equeue_t *equeue,
+                                       int num_edescs)
+{
+        /* Try to acquire a completion entry. */
+        if (comps->comp_next - comps->comp_last < TILE_NET_MAX_COMPS - 1 ||
+            tile_net_free_comps(equeue, comps, 32, false) != 0) {
+
+                /* Try to acquire an egress slot. */
+                s64 slot = gxio_mpipe_equeue_try_reserve(equeue, num_edescs);
+                if (slot >= 0)
+                        return slot;
+
+                /* Freeing some completions gives the equeue time to drain. */
+                tile_net_free_comps(equeue, comps, TILE_NET_MAX_COMPS, false);
+
+                slot = gxio_mpipe_equeue_try_reserve(equeue, num_edescs);
+                if (slot >= 0)
+                        return slot;
+        }
+
+        /* Still nothing; give up and stop the queue for a short while. */
+        netif_stop_subqueue(dev, smp_processor_id());
+        tile_net_schedule_tx_wake_timer(dev);
+        return -1;
+}
+
+/* Determine how many edesc's are needed for TSO.
+ *
+ * Sometimes, if "sendfile()" requires copying, we will be called with
+ * "data" containing the header and payload, with "frags" being empty.
+ * Sometimes, for example when using NFS over TCP, a single segment can
+ * span 3 fragments.  This requires special care.
+ */
+static int tso_count_edescs(struct sk_buff *skb)
+{
+        struct skb_shared_info *sh = skb_shinfo(skb);
+        unsigned int data_len = skb->data_len;
+        unsigned int p_len = sh->gso_size;
+        long f_id = -1;    /* id of the current fragment */
+        long f_size = -1;  /* size of the current fragment */
+        long f_used = -1;  /* bytes used from the current fragment */
+        long n;            /* size of the current piece of payload */
+        int num_edescs = 0;
+        int segment;
+
+        for (segment = 0; segment < sh->gso_segs; segment++) {
+
+                unsigned int p_used = 0;
+
+                /* One edesc for header and for each piece of the payload. */
+                for (num_edescs++; p_used < p_len; num_edescs++) {
+
+                        /* Advance as needed. */
+                        while (f_used >= f_size) {
+                                f_id++;
+                                f_size = sh->frags[f_id].size;
+                                f_used = 0;
+                        }
+
+                        /* Use bytes from the current fragment. */
+                        n = p_len - p_used;
+                        if (n > f_size - f_used)
+                                n = f_size - f_used;
+                        f_used += n;
+                        p_used += n;
+                }
+
+                /* The last segment may be less than gso_size. */
+                data_len -= p_len;
+                if (data_len < p_len)
+                        p_len = data_len;
+        }
+
+        return num_edescs;
+}
+
+/* Prepare modified copies of the skbuff headers.
+ * FIXME: add support for IPv6.
+ */
+static void tso_headers_prepare(struct sk_buff *skb, unsigned char *headers,
+                                s64 slot)
+{
+        struct skb_shared_info *sh = skb_shinfo(skb);
+        struct iphdr *ih;
+        struct tcphdr *th;
+        unsigned int data_len = skb->data_len;
+        unsigned char *data = skb->data;
+        unsigned int ih_off, th_off, sh_len, p_len;
+        unsigned int isum_seed, tsum_seed, id, seq;
+        long f_id = -1;    /* id of the current fragment */
+        long f_size = -1;  /* size of the current fragment */
+        long f_used = -1;  /* bytes used from the current fragment */
+        long n;            /* size of the current piece of payload */
+        int segment;
+
+        /* Locate original headers and compute various lengths. */
+        ih = ip_hdr(skb);
+        th = tcp_hdr(skb);
+        ih_off = skb_network_offset(skb);
+        th_off = skb_transport_offset(skb);
+        sh_len = th_off + tcp_hdrlen(skb);
+        p_len = sh->gso_size;
+
+        /* Set up seed values for IP and TCP csum and initialize id and seq. */
+        isum_seed = ((0xFFFF - ih->check) +
+                     (0xFFFF - ih->tot_len) +
+                     (0xFFFF - ih->id));
+        tsum_seed = th->check + (0xFFFF ^ htons(skb->len));
+        id = ntohs(ih->id);
+        seq = ntohl(th->seq);
+
+        /* Prepare all the headers. */
+        for (segment = 0; segment < sh->gso_segs; segment++) {
+                unsigned char *buf;
+                unsigned int p_used = 0;
+
+                /* Copy to the header memory for this segment. */
+                buf = headers + (slot % EQUEUE_ENTRIES) * HEADER_BYTES +
+                        NET_IP_ALIGN;
+                memcpy(buf, data, sh_len);
+
+                /* Update copied ip header. */
+                ih = (struct iphdr *)(buf + ih_off);
+                ih->tot_len = htons(sh_len + p_len - ih_off);
+                ih->id = htons(id);
+                ih->check = csum_long(isum_seed + ih->tot_len +
+                                      ih->id) ^ 0xffff;
+
+                /* Update copied tcp header. */
+                th = (struct tcphdr *)(buf + th_off);
+                th->seq = htonl(seq);
+                th->check = csum_long(tsum_seed + htons(sh_len + p_len));
+                if (segment != sh->gso_segs - 1) {
+                        th->fin = 0;
+                        th->psh = 0;
+                }
+
+                /* Skip past the header. */
+                slot++;
+
+                /* Skip past the payload. */
+                while (p_used < p_len) {
+
+                        /* Advance as needed. */
+                        while (f_used >= f_size) {
+                                f_id++;
+                                f_size = sh->frags[f_id].size;
+                                f_used = 0;
+                        }
+
+                        /* Use bytes from the current fragment. */
+                        n = p_len - p_used;
+                        if (n > f_size - f_used)
+                                n = f_size - f_used;
+                        f_used += n;
+                        p_used += n;
+
+                        slot++;
+                }
+
+                id++;
+                seq += p_len;
+
+                /* The last segment may be less than gso_size. */
+                data_len -= p_len;
+                if (data_len < p_len)
+                        p_len = data_len;
+        }
+
+        /* Flush the headers so they are ready for hardware DMA. */
+        wmb();
+}
+
+/* Pass all the data to mpipe for egress. */
+static void tso_egress(struct net_device *dev, gxio_mpipe_equeue_t *equeue,
+                       struct sk_buff *skb, unsigned char *headers, s64 slot)
+{
+        struct tile_net_priv *priv = netdev_priv(dev);
+        struct skb_shared_info *sh = skb_shinfo(skb);
+        unsigned int data_len = skb->data_len;
+        unsigned int p_len = sh->gso_size;
+        gxio_mpipe_edesc_t edesc_head = { { 0 } };
+        gxio_mpipe_edesc_t edesc_body = { { 0 } };
+        long f_id = -1;    /* id of the current fragment */
+        long f_size = -1;  /* size of the current fragment */
+        long f_used = -1;  /* bytes used from the current fragment */
+        long n;            /* size of the current piece of payload */
+        unsigned long tx_packets = 0, tx_bytes = 0;
+        unsigned int csum_start, sh_len;
+        int segment;
+
+        /* Prepare to egress the headers: set up header edesc. */
+        csum_start = skb_checksum_start_offset(skb);
+        sh_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
+        edesc_head.csum = 1;
+        edesc_head.csum_start = csum_start;
+        edesc_head.csum_dest = csum_start + skb->csum_offset;
+        edesc_head.xfer_size = sh_len;
+
+        /* This is only used to specify the TLB. */
+        edesc_head.stack_idx = large_buffer_stack;
+        edesc_body.stack_idx = large_buffer_stack;
+
+        /* Egress all the edescs. */
+        for (segment = 0; segment < sh->gso_segs; segment++) {
+                void *va;
+                unsigned char *buf;
+                unsigned int p_used = 0;
+
+                /* Egress the header. */
+                buf = headers + (slot % EQUEUE_ENTRIES) * HEADER_BYTES +
+                        NET_IP_ALIGN;
+                edesc_head.va = va_to_tile_io_addr(buf);
+                gxio_mpipe_equeue_put_at(equeue, edesc_head, slot);
+                slot++;
+
+                /* Egress the payload. */
+                while (p_used < p_len) {
+
+                        /* Advance as needed. */
+                        while (f_used >= f_size) {
+                                f_id++;
+                                f_size = sh->frags[f_id].size;
+                                f_used = 0;
+                        }
+
+                        va = tile_net_frag_buf(&sh->frags[f_id]) + f_used;
+
+                        /* Use bytes from the current fragment. */
+                        n = p_len - p_used;
+                        if (n > f_size - f_used)
+                                n = f_size - f_used;
+                        f_used += n;
+                        p_used += n;
+
+                        /* Egress a piece of the payload. */
+                        edesc_body.va = va_to_tile_io_addr(va);
+                        edesc_body.xfer_size = n;
+                        edesc_body.bound = !(p_used < p_len);
+                        gxio_mpipe_equeue_put_at(equeue, edesc_body, slot);
+                        slot++;
+                }
+
+                tx_packets++;
+                tx_bytes += sh_len + p_len;
+
+                /* The last segment may be less than gso_size. */
+                data_len -= p_len;
+                if (data_len < p_len)
+                        p_len = data_len;
+        }
+
+        /* Update stats. */
+        tile_net_stats_add(tx_packets, &priv->stats.tx_packets);
+        tile_net_stats_add(tx_bytes, &priv->stats.tx_bytes);
+}
+
+/* Do "TSO" handling for egress.
+ *
+ * Normally drivers set NETIF_F_TSO only to support hardware TSO;
+ * otherwise the stack uses scatter-gather to implement GSO in software.
+ * On our testing, enabling GSO support (via NETIF_F_SG) drops network
+ * performance down to around 7.5 Gbps on the 10G interfaces, although
+ * also dropping cpu utilization way down, to under 8%.  But
+ * implementing "TSO" in the driver brings performance back up to line
+ * rate, while dropping cpu usage even further, to less than 4%.  In
+ * practice, profiling of GSO shows that skb_segment() is what causes
+ * the performance overheads; we benefit in the driver from using
+ * preallocated memory to duplicate the TCP/IP headers.
+ */
+static int tile_net_tx_tso(struct sk_buff *skb, struct net_device *dev)
+{
+        struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
+        struct tile_net_priv *priv = netdev_priv(dev);
+        int channel = priv->echannel;
+        struct tile_net_egress *egress = &egress_for_echannel[channel];
+        struct tile_net_comps *comps = info->comps_for_echannel[channel];
+        gxio_mpipe_equeue_t *equeue = egress->equeue;
+        unsigned long irqflags;
+        int num_edescs;
+        s64 slot;
+
+        /* Determine how many mpipe edesc's are needed. */
+        num_edescs = tso_count_edescs(skb);
+
+        local_irq_save(irqflags);
+
+        /* Try to acquire a completion entry and an egress slot. */
+        slot = tile_net_equeue_try_reserve(dev, comps, equeue, num_edescs);
+        if (slot < 0) {
+                local_irq_restore(irqflags);
+                return NETDEV_TX_BUSY;
+        }
+
+        /* Set up copies of header data properly. */
+        tso_headers_prepare(skb, egress->headers, slot);
+
+        /* Actually pass the data to the network hardware. */
+        tso_egress(dev, equeue, skb, egress->headers, slot);
+
+        /* Add a completion record. */
+        add_comp(equeue, comps, slot + num_edescs - 1, skb);
+
+        local_irq_restore(irqflags);
+
+        /* Make sure the egress timer is scheduled. */
+        tile_net_schedule_egress_timer();
+
+        return NETDEV_TX_OK;
+}
+
+/* Analyze the body and frags for a transmit request. */
+static unsigned int tile_net_tx_frags(struct frag *frags,
+                                       struct sk_buff *skb,
+                                       void *b_data, unsigned int b_len)
+{
+        unsigned int i, n = 0;
+
+        struct skb_shared_info *sh = skb_shinfo(skb);
+
+        if (b_len != 0) {
+                frags[n].buf = b_data;
+                frags[n++].length = b_len;
+        }
+
+        for (i = 0; i < sh->nr_frags; i++) {
+                skb_frag_t *f = &sh->frags[i];
+                frags[n].buf = tile_net_frag_buf(f);
+                frags[n++].length = skb_frag_size(f);
+        }
+
+        return n;
+}
+
+/* Help the kernel transmit a packet. */
+static int tile_net_tx(struct sk_buff *skb, struct net_device *dev)
+{
+        struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
+        struct tile_net_priv *priv = netdev_priv(dev);
+        struct tile_net_egress *egress = &egress_for_echannel[priv->echannel];
+        gxio_mpipe_equeue_t *equeue = egress->equeue;
+        struct tile_net_comps *comps =
+                info->comps_for_echannel[priv->echannel];
+        unsigned int len = skb->len;
+        unsigned char *data = skb->data;
+        unsigned int num_edescs;
+        struct frag frags[MAX_FRAGS];
+        gxio_mpipe_edesc_t edescs[MAX_FRAGS];
+        unsigned long irqflags;
+        gxio_mpipe_edesc_t edesc = { { 0 } };
+        unsigned int i;
+        s64 slot;
+
+        if (skb_is_gso(skb))
+                return tile_net_tx_tso(skb, dev);
+
+        num_edescs = tile_net_tx_frags(frags, skb, data, skb_headlen(skb));
+
+        /* This is only used to specify the TLB. */
+        edesc.stack_idx = large_buffer_stack;
+
+        /* Prepare the edescs. */
+        for (i = 0; i < num_edescs; i++) {
+                edesc.xfer_size = frags[i].length;
+                edesc.va = va_to_tile_io_addr(frags[i].buf);
+                edescs[i] = edesc;
+        }
+
+        /* Mark the final edesc. */
+        edescs[num_edescs - 1].bound = 1;
+
+        /* Add checksum info to the initial edesc, if needed. */
+        if (skb->ip_summed == CHECKSUM_PARTIAL) {
+                unsigned int csum_start = skb_checksum_start_offset(skb);
+                edescs[0].csum = 1;
+                edescs[0].csum_start = csum_start;
+                edescs[0].csum_dest = csum_start + skb->csum_offset;
+        }
+
+        local_irq_save(irqflags);
+
+        /* Try to acquire a completion entry and an egress slot. */
+        slot = tile_net_equeue_try_reserve(dev, comps, equeue, num_edescs);
+        if (slot < 0) {
+                local_irq_restore(irqflags);
+                return NETDEV_TX_BUSY;
+        }
+
+        for (i = 0; i < num_edescs; i++)
+                gxio_mpipe_equeue_put_at(equeue, edescs[i], slot++);
+
+        /* Add a completion record. */
+        add_comp(equeue, comps, slot - 1, skb);
+
+        /* NOTE: Use ETH_ZLEN for short packets (e.g. 42 < 60). */
+        tile_net_stats_add(1, &priv->stats.tx_packets);
+        tile_net_stats_add(max_t(unsigned int, len, ETH_ZLEN),
+                           &priv->stats.tx_bytes);
+
+        local_irq_restore(irqflags);
+
+        /* Make sure the egress timer is scheduled. */
+        tile_net_schedule_egress_timer();
+
+        return NETDEV_TX_OK;
+}
+
+/* Return subqueue id on this core (one per core). */
+static u16 tile_net_select_queue(struct net_device *dev, struct sk_buff *skb)
+{
+        return smp_processor_id();
+}
+
+/* Deal with a transmit timeout. */
+static void tile_net_tx_timeout(struct net_device *dev)
+{
+        int cpu;
+
+        for_each_online_cpu(cpu)
+                netif_wake_subqueue(dev, cpu);
+}
+
+/* Ioctl commands. */
+static int tile_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+{
+        return -EOPNOTSUPP;
+}
+
+/* Get system network statistics for device. */
+static struct net_device_stats *tile_net_get_stats(struct net_device *dev)
+{
+        struct tile_net_priv *priv = netdev_priv(dev);
+        return &priv->stats;
+}
+
+/* Change the MTU. */
+static int tile_net_change_mtu(struct net_device *dev, int new_mtu)
+{
+        if ((new_mtu < 68) || (new_mtu > 1500))
+                return -EINVAL;
+        dev->mtu = new_mtu;
+        return 0;
+}
+
+/* Change the Ethernet address of the NIC.
+ *
+ * The hypervisor driver does not support changing MAC address.  However,
+ * the hardware does not do anything with the MAC address, so the address
+ * which gets used on outgoing packets, and which is accepted on incoming
+ * packets, is completely up to us.
+ *
+ * Returns 0 on success, negative on failure.
+ */
+static int tile_net_set_mac_address(struct net_device *dev, void *p)
+{
+        struct sockaddr *addr = p;
+
+        if (!is_valid_ether_addr(addr->sa_data))
+                return -EINVAL;
+        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
+        return 0;
+}
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/* Polling 'interrupt' - used by things like netconsole to send skbs
+ * without having to re-enable interrupts. It's not called while
+ * the interrupt routine is executing.
+ */
+static void tile_net_netpoll(struct net_device *dev)
+{
+        disable_percpu_irq(ingress_irq);
+        tile_net_handle_ingress_irq(ingress_irq, NULL);
+        enable_percpu_irq(ingress_irq, 0);
+}
+#endif
+
+static const struct net_device_ops tile_net_ops = {
+        .ndo_open = tile_net_open,
+        .ndo_stop = tile_net_stop,
+        .ndo_start_xmit = tile_net_tx,
+        .ndo_select_queue = tile_net_select_queue,
+        .ndo_do_ioctl = tile_net_ioctl,
+        .ndo_get_stats = tile_net_get_stats,
+        .ndo_change_mtu = tile_net_change_mtu,
+        .ndo_tx_timeout = tile_net_tx_timeout,
+        .ndo_set_mac_address = tile_net_set_mac_address,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        .ndo_poll_controller = tile_net_netpoll,
+#endif
+};
+
+/* The setup function.
+ *
+ * This uses ether_setup() to assign various fields in dev, including
+ * setting IFF_BROADCAST and IFF_MULTICAST, then sets some extra fields.
+ */
+static void tile_net_setup(struct net_device *dev)
+{
+        ether_setup(dev);
+        dev->netdev_ops = &tile_net_ops;
+        dev->watchdog_timeo = TILE_NET_TIMEOUT;
+        dev->features |= NETIF_F_LLTX;
+        dev->features |= NETIF_F_HW_CSUM;
+        dev->features |= NETIF_F_SG;
+        dev->features |= NETIF_F_TSO;
+        dev->mtu = 1500;
+}
+
+/* Allocate the device structure, register the device, and obtain the
+ * MAC address from the hypervisor.
+ */
+static void tile_net_dev_init(const char *name, const uint8_t *mac)
+{
+        int ret;
+        int i;
+        int nz_addr = 0;
+        struct net_device *dev;
+        struct tile_net_priv *priv;
+
+        /* HACK: Ignore "loop" links. */
+        if (strncmp(name, "loop", 4) == 0)
+                return;
+
+        /* Allocate the device structure.  Normally, "name" is a
+         * template, instantiated by register_netdev(), but not for us.
+         */
+        dev = alloc_netdev_mqs(sizeof(*priv), name, tile_net_setup,
+                               NR_CPUS, 1);
+        if (!dev) {
+                pr_err("alloc_netdev_mqs(%s) failed\n", name);
+                return;
+        }
+
+        /* Initialize "priv". */
+        priv = netdev_priv(dev);
+        memset(priv, 0, sizeof(*priv));
+        priv->dev = dev;
+        priv->channel = -1;
+        priv->loopify_channel = -1;
+        priv->echannel = -1;
+
+        /* Get the MAC address and set it in the device struct; this must
+         * be done before the device is opened.  If the MAC is all zeroes,
+         * we use a random address, since we're probably on the simulator.
+         */
+        for (i = 0; i < 6; i++)
+                nz_addr |= mac[i];
+
+        if (nz_addr) {
+                memcpy(dev->dev_addr, mac, 6);
+                dev->addr_len = 6;
+        } else {
+                random_ether_addr(dev->dev_addr);
+        }
+
+        /* Register the network device. */
+        ret = register_netdev(dev);
+        if (ret) {
+                netdev_err(dev, "register_netdev failed %d\n", ret);
+                free_netdev(dev);
+                return;
+        }
+}
+
+/* Per-cpu module initialization. */
+static void tile_net_init_module_percpu(void *unused)
+{
+        struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
+        int my_cpu = smp_processor_id();
+
+        info->has_iqueue = false;
+
+        info->my_cpu = my_cpu;
+
+        /* Initialize the egress timer. */
+        hrtimer_init(&info->egress_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
+        info->egress_timer.function = tile_net_handle_egress_timer;
+}
+
+/* Module initialization. */
+static int __init tile_net_init_module(void)
+{
+        int i;
+        char name[GXIO_MPIPE_LINK_NAME_LEN];
+        uint8_t mac[6];
+
+        pr_info("Tilera Network Driver\n");
+
+        mutex_init(&tile_net_devs_for_channel_mutex);
+
+        /* Initialize each CPU. */
+        on_each_cpu(tile_net_init_module_percpu, NULL, 1);
+
+        /* Find out what devices we have, and initialize them. */
+        for (i = 0; gxio_mpipe_link_enumerate_mac(i, name, mac) >= 0; i++)
+                tile_net_dev_init(name, mac);
+
+        if (!network_cpus_init())
+                network_cpus_map = *cpu_online_mask;
+
+        return 0;
+}
+
+module_init(tile_net_init_module);
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index 4ffcd57b011b..2857ab078aac 100644
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -478,6 +478,7 @@ struct netvsc_device {
         u32 nvsp_version;
 
         atomic_t num_outstanding_sends;
+        wait_queue_head_t wait_drain;
         bool start_remove;
         bool destroy;
         /*
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index 8b919471472f..0c569831db5a 100644
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -42,6 +42,7 @@ static struct netvsc_device *alloc_net_device(struct hv_device *device)
         if (!net_device)
                 return NULL;
 
+        init_waitqueue_head(&net_device->wait_drain);
         net_device->start_remove = false;
         net_device->destroy = false;
         net_device->dev = device;
@@ -387,12 +388,8 @@ int netvsc_device_remove(struct hv_device *device)
         spin_unlock_irqrestore(&device->channel->inbound_lock, flags);
 
         /* Wait for all send completions */
-        while (atomic_read(&net_device->num_outstanding_sends)) {
-                dev_info(&device->device,
-                        "waiting for %d requests to complete...\n",
-                        atomic_read(&net_device->num_outstanding_sends));
-                udelay(100);
-        }
+        wait_event(net_device->wait_drain,
+                   atomic_read(&net_device->num_outstanding_sends) == 0);
 
         netvsc_disconnect_vsp(net_device);
 
@@ -486,6 +483,9 @@ static void netvsc_send_completion(struct hv_device *device,
                 num_outstanding_sends =
                         atomic_dec_return(&net_device->num_outstanding_sends);
 
+                if (net_device->destroy && num_outstanding_sends == 0)
+                        wake_up(&net_device->wait_drain);
+
                 if (netif_queue_stopped(ndev) && !net_device->start_remove &&
                         (hv_ringbuf_avail_percent(&device->channel->outbound)
                         > RING_AVAIL_PERCENT_HIWATER ||
diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c
index 5ac46f5226f3..47f8e8939266 100644
--- a/drivers/net/phy/icplus.c
+++ b/drivers/net/phy/icplus.c
@@ -41,6 +41,8 @@ MODULE_LICENSE("GPL");
 #define IP1001_APS_ON                   11      /* IP1001 APS Mode  bit */
 #define IP101A_G_APS_ON                 2       /* IP101A/G APS Mode bit */
 #define IP101A_G_IRQ_CONF_STATUS        0x11    /* Conf Info IRQ & Status Reg */
+#define IP101A_G_IRQ_PIN_USED           (1<<15) /* INTR pin used */
+#define IP101A_G_IRQ_DEFAULT            IP101A_G_IRQ_PIN_USED
 
 static int ip175c_config_init(struct phy_device *phydev)
 {
@@ -136,6 +138,11 @@ static int ip1001_config_init(struct phy_device *phydev)
         if (c < 0)
                 return c;
 
+        /* INTR pin used: speed/link/duplex will cause an interrupt */
+        c = phy_write(phydev, IP101A_G_IRQ_CONF_STATUS, IP101A_G_IRQ_DEFAULT);
+        if (c < 0)
+                return c;
+
         if (phydev->interface == PHY_INTERFACE_MODE_RGMII) {
                 /* Additional delay (2ns) used to adjust RX clock phase
                  * at RGMII interface */
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 683ef1ce5519..5061608f408c 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -96,7 +96,7 @@ static int of_mdio_bus_match(struct device *dev, void *mdio_bus_np)
 }
 /**
  * of_mdio_find_bus - Given an mii_bus node, find the mii_bus.
- * @mdio_np: Pointer to the mii_bus.
+ * @mdio_bus_np: Pointer to the mii_bus.
  *
  * Returns a pointer to the mii_bus, or NULL if none found.
  *
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 590f902deb6b..9d6c80c8a0cf 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -161,7 +161,7 @@ static struct phy_driver ks8051_driver = {
 static struct phy_driver ks8001_driver = {
         .phy_id         = PHY_ID_KS8001,
         .name           = "Micrel KS8001 or KS8721",
-        .phy_id_mask    = 0x00fffff0,
+        .phy_id_mask    = 0x00ffffff,
         .features       = (PHY_BASIC_FEATURES | SUPPORTED_Pause),
         .flags          = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
         .config_init    = kszphy_config_init,
@@ -174,7 +174,7 @@ static struct phy_driver ks8001_driver = {
 
 static struct phy_driver ksz9021_driver = {
         .phy_id         = PHY_ID_KSZ9021,
-        .phy_id_mask    = 0x000fff10,
+        .phy_id_mask    = 0x000ffffe,
         .name           = "Micrel KSZ9021 Gigabit PHY",
         .features       = (PHY_GBIT_FEATURES | SUPPORTED_Pause
                                 | SUPPORTED_Asym_Pause),
@@ -240,8 +240,8 @@ MODULE_AUTHOR("David J. Choi");
 MODULE_LICENSE("GPL");
 
 static struct mdio_device_id __maybe_unused micrel_tbl[] = {
-        { PHY_ID_KSZ9021, 0x000fff10 },
-        { PHY_ID_KS8001, 0x00fffff0 },
+        { PHY_ID_KSZ9021, 0x000ffffe },
+        { PHY_ID_KS8001, 0x00ffffff },
         { PHY_ID_KS8737, 0x00fffff0 },
         { PHY_ID_KS8041, 0x00fffff0 },
         { PHY_ID_KS8051, 0x00fffff0 },
diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c
index 964031e3da87..a28a983d465e 100644
--- a/drivers/net/usb/ipheth.c
+++ b/drivers/net/usb/ipheth.c
@@ -59,6 +59,7 @@
 #define USB_PRODUCT_IPHONE_3G   0x1292
 #define USB_PRODUCT_IPHONE_3GS  0x1294
 #define USB_PRODUCT_IPHONE_4    0x1297
+#define USB_PRODUCT_IPAD 0x129a
 #define USB_PRODUCT_IPHONE_4_VZW 0x129c
 #define USB_PRODUCT_IPHONE_4S   0x12a0
 
@@ -101,6 +102,10 @@ static struct usb_device_id ipheth_table[] = {
                 IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
                 IPHETH_USBINTF_PROTO) },
         { USB_DEVICE_AND_INTERFACE_INFO(
+                USB_VENDOR_APPLE, USB_PRODUCT_IPAD,
+                IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
+                IPHETH_USBINTF_PROTO) },
+        { USB_DEVICE_AND_INTERFACE_INFO(
                 USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4_VZW,
                 IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
                 IPHETH_USBINTF_PROTO) },
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 3b206786b5e7..3767a1225860 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -257,29 +257,6 @@ err:
         return rv;
 }
 
-/* Gobi devices uses identical class/protocol codes for all interfaces regardless
- * of function. Some of these are CDC ACM like and have the exact same endpoints
- * we are looking for. This leaves two possible strategies for identifying the
- * correct interface:
- *   a) hardcoding interface number, or
- *   b) use the fact that the wwan interface is the only one lacking additional
- *      (CDC functional) descriptors
- *
- * Let's see if we can get away with the generic b) solution.
- */
-static int qmi_wwan_bind_gobi(struct usbnet *dev, struct usb_interface *intf)
-{
-        int rv = -EINVAL;
-
-        /* ignore any interface with additional descriptors */
-        if (intf->cur_altsetting->extralen)
-                goto err;
-
-        rv = qmi_wwan_bind_shared(dev, intf);
-err:
-        return rv;
-}
-
 static void qmi_wwan_unbind_shared(struct usbnet *dev, struct usb_interface *intf)
 {
         struct usb_driver *subdriver = (void *)dev->data[0];
@@ -347,15 +324,15 @@ static const struct driver_info	qmi_wwan_shared = {
         .manage_power   = qmi_wwan_manage_power,
 };
 
-static const struct driver_info qmi_wwan_gobi = {
-        .description    = "Qualcomm Gobi wwan/QMI device",
+static const struct driver_info qmi_wwan_force_int0 = {
+        .description    = "Qualcomm WWAN/QMI device",
         .flags          = FLAG_WWAN,
-        .bind           = qmi_wwan_bind_gobi,
+        .bind           = qmi_wwan_bind_shared,
         .unbind         = qmi_wwan_unbind_shared,
         .manage_power   = qmi_wwan_manage_power,
+        .data           = BIT(0), /* interface whitelist bitmap */
 };
 
-/* ZTE suck at making USB descriptors */
 static const struct driver_info qmi_wwan_force_int1 = {
         .description    = "Qualcomm WWAN/QMI device",
         .flags          = FLAG_WWAN,
@@ -365,6 +342,15 @@ static const struct driver_info	qmi_wwan_force_int1 = {
         .data           = BIT(1), /* interface whitelist bitmap */
 };
 
+static const struct driver_info qmi_wwan_force_int3 = {
+        .description    = "Qualcomm WWAN/QMI device",
+        .flags          = FLAG_WWAN,
+        .bind           = qmi_wwan_bind_shared,
+        .unbind         = qmi_wwan_unbind_shared,
+        .manage_power   = qmi_wwan_manage_power,
+        .data           = BIT(3), /* interface whitelist bitmap */
+};
+
 static const struct driver_info qmi_wwan_force_int4 = {
         .description    = "Qualcomm WWAN/QMI device",
         .flags          = FLAG_WWAN,
@@ -390,16 +376,23 @@ static const struct driver_info	qmi_wwan_force_int4 = {
 static const struct driver_info qmi_wwan_sierra = {
         .description    = "Sierra Wireless wwan/QMI device",
         .flags          = FLAG_WWAN,
-        .bind           = qmi_wwan_bind_gobi,
+        .bind           = qmi_wwan_bind_shared,
         .unbind         = qmi_wwan_unbind_shared,
         .manage_power   = qmi_wwan_manage_power,
         .data           = BIT(8) | BIT(19), /* interface whitelist bitmap */
 };
 
 #define HUAWEI_VENDOR_ID        0x12D1
+
+/* Gobi 1000 QMI/wwan interface number is 3 according to qcserial */
+#define QMI_GOBI1K_DEVICE(vend, prod) \
+        USB_DEVICE(vend, prod), \
+        .driver_info = (unsigned long)&qmi_wwan_force_int3
+
+/* Gobi 2000 and Gobi 3000 QMI/wwan interface number is 0 according to qcserial */
 #define QMI_GOBI_DEVICE(vend, prod) \
         USB_DEVICE(vend, prod), \
-        .driver_info = (unsigned long)&qmi_wwan_gobi
+        .driver_info = (unsigned long)&qmi_wwan_force_int0
 
 static const struct usb_device_id products[] = {
         {       /* Huawei E392, E398 and possibly others sharing both device id and more... */
@@ -510,20 +503,24 @@ static const struct usb_device_id products[] = {
                 .bInterfaceProtocol = 0xff,
                 .driver_info        = (unsigned long)&qmi_wwan_sierra,
         },
-        {QMI_GOBI_DEVICE(0x05c6, 0x9212)},      /* Acer Gobi Modem Device */
-        {QMI_GOBI_DEVICE(0x03f0, 0x1f1d)},      /* HP un2400 Gobi Modem Device */
-        {QMI_GOBI_DEVICE(0x03f0, 0x371d)},      /* HP un2430 Mobile Broadband Module */
-        {QMI_GOBI_DEVICE(0x04da, 0x250d)},      /* Panasonic Gobi Modem device */
-        {QMI_GOBI_DEVICE(0x413c, 0x8172)},      /* Dell Gobi Modem device */
-        {QMI_GOBI_DEVICE(0x1410, 0xa001)},      /* Novatel Gobi Modem device */
-        {QMI_GOBI_DEVICE(0x0b05, 0x1776)},      /* Asus Gobi Modem device */
-        {QMI_GOBI_DEVICE(0x19d2, 0xfff3)},      /* ONDA Gobi Modem device */
-        {QMI_GOBI_DEVICE(0x05c6, 0x9001)},      /* Generic Gobi Modem device */
-        {QMI_GOBI_DEVICE(0x05c6, 0x9002)},      /* Generic Gobi Modem device */
-        {QMI_GOBI_DEVICE(0x05c6, 0x9202)},      /* Generic Gobi Modem device */
-        {QMI_GOBI_DEVICE(0x05c6, 0x9203)},      /* Generic Gobi Modem device */
-        {QMI_GOBI_DEVICE(0x05c6, 0x9222)},      /* Generic Gobi Modem device */
-        {QMI_GOBI_DEVICE(0x05c6, 0x9009)},      /* Generic Gobi Modem device */
+
+        /* Gobi 1000 devices */
+        {QMI_GOBI1K_DEVICE(0x05c6, 0x9212)},    /* Acer Gobi Modem Device */
+        {QMI_GOBI1K_DEVICE(0x03f0, 0x1f1d)},    /* HP un2400 Gobi Modem Device */
+        {QMI_GOBI1K_DEVICE(0x03f0, 0x371d)},    /* HP un2430 Mobile Broadband Module */
+        {QMI_GOBI1K_DEVICE(0x04da, 0x250d)},    /* Panasonic Gobi Modem device */
+        {QMI_GOBI1K_DEVICE(0x413c, 0x8172)},    /* Dell Gobi Modem device */
+        {QMI_GOBI1K_DEVICE(0x1410, 0xa001)},    /* Novatel Gobi Modem device */
+        {QMI_GOBI1K_DEVICE(0x0b05, 0x1776)},    /* Asus Gobi Modem device */
+        {QMI_GOBI1K_DEVICE(0x19d2, 0xfff3)},    /* ONDA Gobi Modem device */
+        {QMI_GOBI1K_DEVICE(0x05c6, 0x9001)},    /* Generic Gobi Modem device */
+        {QMI_GOBI1K_DEVICE(0x05c6, 0x9002)},    /* Generic Gobi Modem device */
+        {QMI_GOBI1K_DEVICE(0x05c6, 0x9202)},    /* Generic Gobi Modem device */
+        {QMI_GOBI1K_DEVICE(0x05c6, 0x9203)},    /* Generic Gobi Modem device */
+        {QMI_GOBI1K_DEVICE(0x05c6, 0x9222)},    /* Generic Gobi Modem device */
+        {QMI_GOBI1K_DEVICE(0x05c6, 0x9009)},    /* Generic Gobi Modem device */
+
+        /* Gobi 2000 and 3000 devices */
         {QMI_GOBI_DEVICE(0x413c, 0x8186)},      /* Dell Gobi 2000 Modem device (N0218, VU936) */
         {QMI_GOBI_DEVICE(0x05c6, 0x920b)},      /* Generic Gobi 2000 Modem device */
         {QMI_GOBI_DEVICE(0x05c6, 0x9225)},      /* Sony Gobi 2000 Modem device (N0279, VU730) */
diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
index 3faef5670d1f..d75d1f56becf 100644
--- a/drivers/net/usb/sierra_net.c
+++ b/drivers/net/usb/sierra_net.c
@@ -946,7 +946,7 @@ struct sk_buff *sierra_net_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
 }
 
 static const u8 sierra_net_ifnum_list[] = { 7, 10, 11 };
-static const struct sierra_net_info_data sierra_net_info_data_68A3 = {
+static const struct sierra_net_info_data sierra_net_info_data_direct_ip = {
         .rx_urb_size = 8 * 1024,
         .whitelist = {
                 .infolen = ARRAY_SIZE(sierra_net_ifnum_list),
@@ -954,7 +954,7 @@ static const struct sierra_net_info_data sierra_net_info_data_68A3 = {
         }
 };
 
-static const struct driver_info sierra_net_info_68A3 = {
+static const struct driver_info sierra_net_info_direct_ip = {
         .description = "Sierra Wireless USB-to-WWAN Modem",
         .flags = FLAG_WWAN | FLAG_SEND_ZLP,
         .bind = sierra_net_bind,
@@ -962,12 +962,18 @@ static const struct driver_info sierra_net_info_68A3 = {
         .status = sierra_net_status,
         .rx_fixup = sierra_net_rx_fixup,
         .tx_fixup = sierra_net_tx_fixup,
-        .data = (unsigned long)&sierra_net_info_data_68A3,
+        .data = (unsigned long)&sierra_net_info_data_direct_ip,
 };
 
 static const struct usb_device_id products[] = {
         {USB_DEVICE(0x1199, 0x68A3), /* Sierra Wireless USB-to-WWAN modem */
-        .driver_info = (unsigned long) &sierra_net_info_68A3},
+        .driver_info = (unsigned long) &sierra_net_info_direct_ip},
+        {USB_DEVICE(0x0F3D, 0x68A3), /* AT&T Direct IP modem */
+        .driver_info = (unsigned long) &sierra_net_info_direct_ip},
+        {USB_DEVICE(0x1199, 0x68AA), /* Sierra Wireless Direct IP LTE modem */
+        .driver_info = (unsigned long) &sierra_net_info_direct_ip},
+        {USB_DEVICE(0x0F3D, 0x68AA), /* AT&T Direct IP LTE modem */
+        .driver_info = (unsigned long) &sierra_net_info_direct_ip},
 
         {}, /* last item */
 };
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 9f58330f1312..aba769d77459 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -796,11 +796,13 @@ int usbnet_open (struct net_device *net)
         if (info->manage_power) {
                 retval = info->manage_power(dev, 1);
                 if (retval < 0)
-                        goto done;
+                        goto done_manage_power_error;
                 usb_autopm_put_interface(dev->intf);
         }
         return retval;
 
+done_manage_power_error:
+        clear_bit(EVENT_DEV_OPEN, &dev->flags);
 done:
         usb_autopm_put_interface(dev->intf);
 done_nopm:
@@ -876,9 +878,9 @@ void usbnet_get_drvinfo (struct net_device *net, struct ethtool_drvinfo *info)
 {
         struct usbnet *dev = netdev_priv(net);
 
-        strncpy (info->driver, dev->driver_name, sizeof info->driver);
-        strncpy (info->version, DRIVER_VERSION, sizeof info->version);
-        strncpy (info->fw_version, dev->driver_info->description,
+        strlcpy (info->driver, dev->driver_name, sizeof info->driver);
+        strlcpy (info->version, DRIVER_VERSION, sizeof info->version);
+        strlcpy (info->fw_version, dev->driver_info->description,
                 sizeof info->fw_version);
         usb_make_path (dev->udev, info->bus_info, sizeof info->bus_info);
 }
@@ -1202,6 +1204,21 @@ deferred:
 }
 EXPORT_SYMBOL_GPL(usbnet_start_xmit);
 
+static void rx_alloc_submit(struct usbnet *dev, gfp_t flags)
+{
+        struct urb      *urb;
+        int             i;
+
+        /* don't refill the queue all at once */
+        for (i = 0; i < 10 && dev->rxq.qlen < RX_QLEN(dev); i++) {
+                urb = usb_alloc_urb(0, flags);
+                if (urb != NULL) {
+                        if (rx_submit(dev, urb, flags) == -ENOLINK)
+                                return;
+                }
+        }
+}
+
 /*-------------------------------------------------------------------------*/
 
 // tasklet (work deferred from completions, in_irq) or timer
@@ -1241,26 +1258,14 @@ static void usbnet_bh (unsigned long param)
                    !timer_pending (&dev->delay) &&
                    !test_bit (EVENT_RX_HALT, &dev->flags)) {
                 int     temp = dev->rxq.qlen;
-                int     qlen = RX_QLEN (dev);
-
-                if (temp < qlen) {
-                        struct urb      *urb;
-                        int             i;
-
-                        // don't refill the queue all at once
-                        for (i = 0; i < 10 && dev->rxq.qlen < qlen; i++) {
-                                urb = usb_alloc_urb (0, GFP_ATOMIC);
-                                if (urb != NULL) {
-                                        if (rx_submit (dev, urb, GFP_ATOMIC) ==
-                                            -ENOLINK)
-                                                return;
-                                }
-                        }
+
+                if (temp < RX_QLEN(dev)) {
+                        rx_alloc_submit(dev, GFP_ATOMIC);
                         if (temp != dev->rxq.qlen)
                                 netif_dbg(dev, link, dev->net,
                                           "rxqlen %d --> %d\n",
                                           temp, dev->rxq.qlen);
-                        if (dev->rxq.qlen < qlen)
+                        if (dev->rxq.qlen < RX_QLEN(dev))
                                 tasklet_schedule (&dev->bh);
                 }
                 if (dev->txq.qlen < TX_QLEN (dev))
@@ -1513,6 +1518,7 @@ int usbnet_suspend (struct usb_interface *intf, pm_message_t message)
                 spin_lock_irq(&dev->txq.lock);
                 /* don't autosuspend while transmitting */
                 if (dev->txq.qlen && PMSG_IS_AUTO(message)) {
+                        dev->suspend_count--;
                         spin_unlock_irq(&dev->txq.lock);
                         return -EBUSY;
                 } else {
@@ -1569,6 +1575,13 @@ int usbnet_resume (struct usb_interface *intf)
                 spin_unlock_irq(&dev->txq.lock);
 
                 if (test_bit(EVENT_DEV_OPEN, &dev->flags)) {
+                        /* handle remote wakeup ASAP */
+                        if (!dev->wait &&
+                                netif_device_present(dev->net) &&
+                                !timer_pending(&dev->delay) &&
+                                !test_bit(EVENT_RX_HALT, &dev->flags))
+                                        rx_alloc_submit(dev, GFP_KERNEL);
+
                         if (!(dev->txq.qlen >= TX_QLEN(dev)))
                                 netif_tx_wake_all_queues(dev->net);
                         tasklet_schedule (&dev->bh);
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 5214b1eceb95..f18149ae2588 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -42,7 +42,8 @@ module_param(gso, bool, 0444);
 #define VIRTNET_DRIVER_VERSION "1.0.0"
 
 struct virtnet_stats {
-        struct u64_stats_sync syncp;
+        struct u64_stats_sync tx_syncp;
+        struct u64_stats_sync rx_syncp;
         u64 tx_bytes;
         u64 tx_packets;
 
@@ -300,10 +301,10 @@ static void receive_buf(struct net_device *dev, void *buf, unsigned int len)
 
         hdr = skb_vnet_hdr(skb);
 
-        u64_stats_update_begin(&stats->syncp);
+        u64_stats_update_begin(&stats->rx_syncp);
         stats->rx_bytes += skb->len;
         stats->rx_packets++;
-        u64_stats_update_end(&stats->syncp);
+        u64_stats_update_end(&stats->rx_syncp);
 
         if (hdr->hdr.flags & VIRTIO_NET_HDR_F_NEEDS_CSUM) {
                 pr_debug("Needs csum!\n");
@@ -565,10 +566,10 @@ static unsigned int free_old_xmit_skbs(struct virtnet_info *vi)
         while ((skb = virtqueue_get_buf(vi->svq, &len)) != NULL) {
                 pr_debug("Sent skb %p\n", skb);
 
-                u64_stats_update_begin(&stats->syncp);
+                u64_stats_update_begin(&stats->tx_syncp);
                 stats->tx_bytes += skb->len;
                 stats->tx_packets++;
-                u64_stats_update_end(&stats->syncp);
+                u64_stats_update_end(&stats->tx_syncp);
 
                 tot_sgs += skb_vnet_hdr(skb)->num_sg;
                 dev_kfree_skb_any(skb);
@@ -703,12 +704,16 @@ static struct rtnl_link_stats64 *virtnet_stats(struct net_device *dev,
                 u64 tpackets, tbytes, rpackets, rbytes;
 
                 do {
-                        start = u64_stats_fetch_begin(&stats->syncp);
+                        start = u64_stats_fetch_begin(&stats->tx_syncp);
                         tpackets = stats->tx_packets;
                         tbytes   = stats->tx_bytes;
+                } while (u64_stats_fetch_retry(&stats->tx_syncp, start));
+
+                do {
+                        start = u64_stats_fetch_begin(&stats->rx_syncp);
                         rpackets = stats->rx_packets;
                         rbytes   = stats->rx_bytes;
-                } while (u64_stats_fetch_retry(&stats->syncp, start));
+                } while (u64_stats_fetch_retry(&stats->rx_syncp, start));
 
                 tot->rx_packets += rpackets;
                 tot->tx_packets += tpackets;
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 520a4b2eb9cc..a747c632597a 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -7233,8 +7233,8 @@ static int airo_get_aplist(struct net_device *dev,
                 }
         } else {
                 dwrq->flags = 1; /* Should be define'd */
-                memcpy(extra + sizeof(struct sockaddr)*i,
-                       &qual,  sizeof(struct iw_quality)*i);
+                memcpy(extra + sizeof(struct sockaddr) * i, qual,
+                       sizeof(struct iw_quality) * i);
         }
         dwrq->length = i;
 
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index fbaa30930076..44ad6fe0278f 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -1045,11 +1045,11 @@ ath5k_drain_tx_buffs(struct ath5k_hw *ah)
 
                                 ath5k_txbuf_free_skb(ah, bf);
 
-                                spin_lock_bh(&ah->txbuflock);
+                                spin_lock(&ah->txbuflock);
                                 list_move_tail(&bf->list, &ah->txbuf);
                                 ah->txbuf_len++;
                                 txq->txq_len--;
-                                spin_unlock_bh(&ah->txbuflock);
+                                spin_unlock(&ah->txbuflock);
                         }
                         txq->link = NULL;
                         txq->txq_poll_mark = false;
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index a277cf6f339d..4866550ddd96 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -214,6 +214,7 @@ struct ath_frame_info {
         enum ath9k_key_type keytype;
         u8 keyix;
         u8 retries;
+        u8 rtscts_rate;
 };
 
 struct ath_buf_state {
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index 2b8f61c210e1..abbd6effd60d 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -1496,6 +1496,7 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,
                         priv->num_sta_assoc_vif++ : priv->num_sta_assoc_vif--;
 
                 if (priv->ah->opmode == NL80211_IFTYPE_STATION) {
+                        ath9k_htc_choose_set_bssid(priv);
                         if (bss_conf->assoc && (priv->num_sta_assoc_vif == 1))
                                 ath9k_htc_start_ani(priv);
                         else if (priv->num_sta_assoc_vif == 0)
@@ -1503,13 +1504,11 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,
                 }
         }
 
-        if (changed & BSS_CHANGED_BSSID) {
+        if (changed & BSS_CHANGED_IBSS) {
                 if (priv->ah->opmode == NL80211_IFTYPE_ADHOC) {
                         common->curaid = bss_conf->aid;
                         memcpy(common->curbssid, bss_conf->bssid, ETH_ALEN);
                         ath9k_htc_set_bssid(priv);
-                } else if (priv->ah->opmode == NL80211_IFTYPE_STATION) {
-                        ath9k_htc_choose_set_bssid(priv);
                 }
         }
 
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 7db1890448f2..1c68e564f503 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -784,13 +784,25 @@ static void ath9k_hw_init_qos(struct ath_hw *ah)
 
 u32 ar9003_get_pll_sqsum_dvc(struct ath_hw *ah)
 {
+        struct ath_common *common = ath9k_hw_common(ah);
+        int i = 0;
+
         REG_CLR_BIT(ah, PLL3, PLL3_DO_MEAS_MASK);
         udelay(100);
         REG_SET_BIT(ah, PLL3, PLL3_DO_MEAS_MASK);
 
-        while ((REG_READ(ah, PLL4) & PLL4_MEAS_DONE) == 0)
+        while ((REG_READ(ah, PLL4) & PLL4_MEAS_DONE) == 0) {
+
                 udelay(100);
 
+                if (WARN_ON_ONCE(i >= 100)) {
+                        ath_err(common, "PLL4 meaurement not done\n");
+                        break;
+                }
+
+                i++;
+        }
+
         return (REG_READ(ah, PLL3) & SQSUM_DVC_MASK) >> 3;
 }
 EXPORT_SYMBOL(ar9003_get_pll_sqsum_dvc);
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 4de4473776ac..dac1a2709e3c 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -971,6 +971,15 @@ void ath_hw_pll_work(struct work_struct *work)
                                             hw_pll_work.work);
         u32 pll_sqsum;
 
+        /*
+         * ensure that the PLL WAR is executed only
+         * after the STA is associated (or) if the
+         * beaconing had started in interfaces that
+         * uses beacons.
+         */
+        if (!(sc->sc_flags & SC_OP_BEACONS))
+                return;
+
         if (AR_SREV_9485(sc->sc_ah)) {
 
                 ath9k_ps_wakeup(sc);
@@ -1443,15 +1452,6 @@ static int ath9k_add_interface(struct ieee80211_hw *hw,
                 }
         }
 
-        if ((ah->opmode == NL80211_IFTYPE_ADHOC) ||
-            ((vif->type == NL80211_IFTYPE_ADHOC) &&
-             sc->nvifs > 0)) {
-                ath_err(common, "Cannot create ADHOC interface when other"
-                        " interfaces already exist.\n");
-                ret = -EINVAL;
-                goto out;
-        }
-
         ath_dbg(common, CONFIG, "Attach a VIF of type: %d\n", vif->type);
 
         sc->nvifs++;
@@ -1476,15 +1476,6 @@ static int ath9k_change_interface(struct ieee80211_hw *hw,
         mutex_lock(&sc->mutex);
         ath9k_ps_wakeup(sc);
 
-        /* See if new interface type is valid. */
-        if ((new_type == NL80211_IFTYPE_ADHOC) &&
-            (sc->nvifs > 1)) {
-                ath_err(common, "When using ADHOC, it must be the only"
-                        " interface.\n");
-                ret = -EINVAL;
-                goto out;
-        }
-
         if (ath9k_uses_beacons(new_type) &&
             !ath9k_uses_beacons(vif->type)) {
                 if (sc->nbcnvifs >= ATH_BCBUF) {
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index d59dd01d6cde..4d571394c7a8 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -938,6 +938,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf,
         struct ieee80211_tx_rate *rates;
         const struct ieee80211_rate *rate;
         struct ieee80211_hdr *hdr;
+        struct ath_frame_info *fi = get_frame_info(bf->bf_mpdu);
         int i;
         u8 rix = 0;
 
@@ -948,18 +949,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf,
 
         /* set dur_update_en for l-sig computation except for PS-Poll frames */
         info->dur_update = !ieee80211_is_pspoll(hdr->frame_control);
-
-        /*
-         * We check if Short Preamble is needed for the CTS rate by
-         * checking the BSS's global flag.
-         * But for the rate series, IEEE80211_TX_RC_USE_SHORT_PREAMBLE is used.
-         */
-        rate = ieee80211_get_rts_cts_rate(sc->hw, tx_info);
-        info->rtscts_rate = rate->hw_value;
-
-        if (tx_info->control.vif &&
-            tx_info->control.vif->bss_conf.use_short_preamble)
-                info->rtscts_rate |= rate->hw_value_short;
+        info->rtscts_rate = fi->rtscts_rate;
 
         for (i = 0; i < 4; i++) {
                 bool is_40, is_sgi, is_sp;
@@ -1001,13 +991,13 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf,
                 }
 
                 /* legacy rates */
+                rate = &sc->sbands[tx_info->band].bitrates[rates[i].idx];
                 if ((tx_info->band == IEEE80211_BAND_2GHZ) &&
                     !(rate->flags & IEEE80211_RATE_ERP_G))
                         phy = WLAN_RC_PHY_CCK;
                 else
                         phy = WLAN_RC_PHY_OFDM;
 
-                rate = &sc->sbands[tx_info->band].bitrates[rates[i].idx];
                 info->rates[i].Rate = rate->hw_value;
                 if (rate->hw_value_short) {
                         if (rates[i].flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE)
@@ -1776,10 +1766,22 @@ static void setup_frame_info(struct ieee80211_hw *hw, struct sk_buff *skb,
         struct ieee80211_sta *sta = tx_info->control.sta;
         struct ieee80211_key_conf *hw_key = tx_info->control.hw_key;
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+        const struct ieee80211_rate *rate;
         struct ath_frame_info *fi = get_frame_info(skb);
         struct ath_node *an = NULL;
         enum ath9k_key_type keytype;
+        bool short_preamble = false;
+
+        /*
+         * We check if Short Preamble is needed for the CTS rate by
+         * checking the BSS's global flag.
+         * But for the rate series, IEEE80211_TX_RC_USE_SHORT_PREAMBLE is used.
+         */
+        if (tx_info->control.vif &&
+            tx_info->control.vif->bss_conf.use_short_preamble)
+                short_preamble = true;
 
+        rate = ieee80211_get_rts_cts_rate(hw, tx_info);
         keytype = ath9k_cmn_get_hw_crypto_keytype(skb);
 
         if (sta)
@@ -1794,6 +1796,9 @@ static void setup_frame_info(struct ieee80211_hw *hw, struct sk_buff *skb,
                 fi->keyix = ATH9K_TXKEYIX_INVALID;
         fi->keytype = keytype;
         fi->framelen = framelen;
+        fi->rtscts_rate = rate->hw_value;
+        if (short_preamble)
+                fi->rtscts_rate |= rate->hw_value_short;
 }
 
 u8 ath_txchainmask_reduction(struct ath_softc *sc, u8 chainmask, u32 rate)
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index 67c13af6f206..c06b6cb5c91e 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -877,6 +877,10 @@ struct b43_wl {
          * from the mac80211 subsystem. */
         u16 mac80211_initially_registered_queues;
 
+        /* Set this if we call ieee80211_register_hw() and check if we call
+         * ieee80211_unregister_hw(). */
+        bool hw_registred;
+
         /* We can only have one operating interface (802.11 core)
          * at a time. General information about this interface follows.
          */
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 5a39b226b2e3..1b988f26bdf1 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -2437,6 +2437,7 @@ start_ieee80211:
         err = ieee80211_register_hw(wl->hw);
         if (err)
                 goto err_one_core_detach;
+        wl->hw_registred = true;
         b43_leds_register(wl->current_dev);
         goto out;
 
@@ -3766,7 +3767,7 @@ static int b43_switch_band(struct b43_wl *wl, struct ieee80211_channel *chan)
         if (prev_status >= B43_STAT_STARTED) {
                 err = b43_wireless_core_start(up_dev);
                 if (err) {
-                        b43err(wl, "Fatal: Coult not start device for "
+                        b43err(wl, "Fatal: Could not start device for "
                                "selected %s-GHz band\n",
                                band_to_string(chan->band));
                         b43_wireless_core_exit(up_dev);
@@ -5299,6 +5300,7 @@ static struct b43_wl *b43_wireless_init(struct b43_bus_dev *dev)
 
         hw->queues = modparam_qos ? B43_QOS_QUEUE_NUM : 1;
         wl->mac80211_initially_registered_queues = hw->queues;
+        wl->hw_registred = false;
         hw->max_rates = 2;
         SET_IEEE80211_DEV(hw, dev->dev);
         if (is_valid_ether_addr(sprom->et1mac))
@@ -5370,12 +5372,15 @@ static void b43_bcma_remove(struct bcma_device *core)
          * as the ieee80211 unreg will destroy the workqueue. */
         cancel_work_sync(&wldev->restart_work);
 
-        /* Restore the queues count before unregistering, because firmware detect
-         * might have modified it. Restoring is important, so the networking
-         * stack can properly free resources. */
-        wl->hw->queues = wl->mac80211_initially_registered_queues;
-        b43_leds_stop(wldev);
-        ieee80211_unregister_hw(wl->hw);
+        B43_WARN_ON(!wl);
+        if (wl->current_dev == wldev && wl->hw_registred) {
+                /* Restore the queues count before unregistering, because firmware detect
+                 * might have modified it. Restoring is important, so the networking
+                 * stack can properly free resources. */
+                wl->hw->queues = wl->mac80211_initially_registered_queues;
+                b43_leds_stop(wldev);
+                ieee80211_unregister_hw(wl->hw);
+        }
 
         b43_one_core_detach(wldev->dev);
 
@@ -5446,7 +5451,7 @@ static void b43_ssb_remove(struct ssb_device *sdev)
         cancel_work_sync(&wldev->restart_work);
 
         B43_WARN_ON(!wl);
-        if (wl->current_dev == wldev) {
+        if (wl->current_dev == wldev && wl->hw_registred) {
                 /* Restore the queues count before unregistering, because firmware detect
                  * might have modified it. Restoring is important, so the networking
                  * stack can properly free resources. */
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index cd9c9bc186d9..eae691e2f7dd 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -2633,7 +2633,7 @@ static int b43legacy_switch_phymode(struct b43legacy_wl *wl,
         if (prev_status >= B43legacy_STAT_STARTED) {
                 err = b43legacy_wireless_core_start(up_dev);
                 if (err) {
-                        b43legacyerr(wl, "Fatal: Coult not start device for "
+                        b43legacyerr(wl, "Fatal: Could not start device for "
                                "newly selected %s-PHY mode\n",
                                phymode_to_string(new_mode));
                         b43legacy_wireless_core_exit(up_dev);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index e2480d196276..8e7e6928c936 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -89,9 +89,9 @@ int brcmf_sdio_intr_register(struct brcmf_sdio_dev *sdiodev)
         data |= 1 << SDIO_FUNC_1 | 1 << SDIO_FUNC_2 | 1;
         brcmf_sdio_regwb(sdiodev, SDIO_CCCR_IENx, data, &ret);
 
-        /* redirect, configure ane enable io for interrupt signal */
+        /* redirect, configure and enable io for interrupt signal */
         data = SDIO_SEPINT_MASK | SDIO_SEPINT_OE;
-        if (sdiodev->irq_flags | IRQF_TRIGGER_HIGH)
+        if (sdiodev->irq_flags & IRQF_TRIGGER_HIGH)
                 data |= SDIO_SEPINT_ACT_HI;
         brcmf_sdio_regwb(sdiodev, SDIO_CCCR_BRCM_SEPINT, data, &ret);
 
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index 9cfae0c08707..95aa8e1683ec 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -1903,14 +1903,6 @@ static void ipw2100_down(struct ipw2100_priv *priv)
         netif_stop_queue(priv->net_dev);
 }
 
-/* Called by register_netdev() */
-static int ipw2100_net_init(struct net_device *dev)
-{
-        struct ipw2100_priv *priv = libipw_priv(dev);
-
-        return ipw2100_up(priv, 1);
-}
-
 static int ipw2100_wdev_init(struct net_device *dev)
 {
         struct ipw2100_priv *priv = libipw_priv(dev);
@@ -6087,7 +6079,6 @@ static const struct net_device_ops ipw2100_netdev_ops = {
         .ndo_stop               = ipw2100_close,
         .ndo_start_xmit         = libipw_xmit,
         .ndo_change_mtu         = libipw_change_mtu,
-        .ndo_init               = ipw2100_net_init,
         .ndo_tx_timeout         = ipw2100_tx_timeout,
         .ndo_set_mac_address    = ipw2100_set_address,
         .ndo_validate_addr      = eth_validate_addr,
@@ -6329,6 +6320,10 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
         printk(KERN_INFO DRV_NAME
                ": Detected Intel PRO/Wireless 2100 Network Connection\n");
 
+        err = ipw2100_up(priv, 1);
+        if (err)
+                goto fail;
+
         err = ipw2100_wdev_init(dev);
         if (err)
                 goto fail;
@@ -6338,12 +6333,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
          * network device we would call ipw2100_up.  This introduced a race
          * condition with newer hotplug configurations (network was coming
          * up and making calls before the device was initialized).
-         *
-         * If we called ipw2100_up before we registered the device, then the
-         * device name wasn't registered.  So, we instead use the net_dev->init
-         * member to call a function that then just turns and calls ipw2100_up.
-         * net_dev->init is called after name allocation but before the
-         * notifier chain is called */
+         */
         err = register_netdev(dev);
         if (err) {
                 printk(KERN_WARNING DRV_NAME
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index 19f7ee84ae89..e5e8ada4aaf6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -35,17 +35,20 @@
 #define IWL6000_UCODE_API_MAX 6
 #define IWL6050_UCODE_API_MAX 5
 #define IWL6000G2_UCODE_API_MAX 6
+#define IWL6035_UCODE_API_MAX 6
 
 /* Oldest version we won't warn about */
 #define IWL6000_UCODE_API_OK 4
 #define IWL6000G2_UCODE_API_OK 5
 #define IWL6050_UCODE_API_OK 5
 #define IWL6000G2B_UCODE_API_OK 6
+#define IWL6035_UCODE_API_OK 6
 
 /* Lowest firmware API version supported */
 #define IWL6000_UCODE_API_MIN 4
 #define IWL6050_UCODE_API_MIN 4
-#define IWL6000G2_UCODE_API_MIN 4
+#define IWL6000G2_UCODE_API_MIN 5
+#define IWL6035_UCODE_API_MIN 6
 
 /* EEPROM versions */
 #define EEPROM_6000_TX_POWER_VERSION    (4)
@@ -227,9 +230,25 @@ const struct iwl_cfg iwl6030_2bg_cfg = {
         IWL_DEVICE_6030,
 };
 
+#define IWL_DEVICE_6035                                         \
+        .fw_name_pre = IWL6030_FW_PRE,                          \
+        .ucode_api_max = IWL6035_UCODE_API_MAX,                 \
+        .ucode_api_ok = IWL6035_UCODE_API_OK,                   \
+        .ucode_api_min = IWL6035_UCODE_API_MIN,                 \
+        .device_family = IWL_DEVICE_FAMILY_6030,                \
+        .max_inst_size = IWL60_RTC_INST_SIZE,                   \
+        .max_data_size = IWL60_RTC_DATA_SIZE,                   \
+        .eeprom_ver = EEPROM_6030_EEPROM_VERSION,               \
+        .eeprom_calib_ver = EEPROM_6030_TX_POWER_VERSION,       \
+        .base_params = &iwl6000_g2_base_params,                 \
+        .bt_params = &iwl6000_bt_params,                        \
+        .need_temp_offset_calib = true,                         \
+        .led_mode = IWL_LED_RF_STATE,                           \
+        .adv_pm = true
+
 const struct iwl_cfg iwl6035_2agn_cfg = {
         .name = "Intel(R) Centrino(R) Advanced-N 6235 AGN",
-        IWL_DEVICE_6030,
+        IWL_DEVICE_6035,
         .ht_params = &iwl6000_ht_params,
 };
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
index aea07aab3c9e..eb6a8eaf42fc 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
@@ -1267,7 +1267,7 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv,
                 key_flags |= STA_KEY_MULTICAST_MSK;
 
         sta_cmd.key.key_flags = key_flags;
-        sta_cmd.key.key_offset = WEP_INVALID_OFFSET;
+        sta_cmd.key.key_offset = keyconf->hw_key_idx;
         sta_cmd.sta.modify_mask = STA_MODIFY_KEY_MASK;
         sta_cmd.mode = STA_CONTROL_MODIFY_MSK;
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
index e7c157e5ebeb..7f97dec8534d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
@@ -2239,6 +2239,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
         return count;
 }
 
+#ifdef CONFIG_IWLWIFI_DEBUG
 static ssize_t iwl_dbgfs_log_event_read(struct file *file,
                                          char __user *user_buf,
                                          size_t count, loff_t *ppos)
@@ -2276,6 +2277,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
 
         return count;
 }
+#endif
 
 static ssize_t iwl_dbgfs_calib_disabled_read(struct file *file,
                                          char __user *user_buf,
@@ -2345,7 +2347,9 @@ DEBUGFS_READ_FILE_OPS(bt_traffic);
 DEBUGFS_READ_WRITE_FILE_OPS(protection_mode);
 DEBUGFS_READ_FILE_OPS(reply_tx_error);
 DEBUGFS_WRITE_FILE_OPS(echo_test);
+#ifdef CONFIG_IWLWIFI_DEBUG
 DEBUGFS_READ_WRITE_FILE_OPS(log_event);
+#endif
 DEBUGFS_READ_WRITE_FILE_OPS(calib_disabled);
 
 /*
@@ -2405,7 +2409,9 @@ int iwl_dbgfs_register(struct iwl_priv *priv, const char *name)
         DEBUGFS_ADD_FILE(rxon_flags, dir_debug, S_IWUSR);
         DEBUGFS_ADD_FILE(rxon_filter_flags, dir_debug, S_IWUSR);
         DEBUGFS_ADD_FILE(echo_test, dir_debug, S_IWUSR);
+#ifdef CONFIG_IWLWIFI_DEBUG
         DEBUGFS_ADD_FILE(log_event, dir_debug, S_IWUSR | S_IRUSR);
+#endif
 
         if (iwl_advanced_bt_coexist(priv))
                 DEBUGFS_ADD_FILE(bt_traffic, dir_debug, S_IRUSR);
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index d742900969ea..fac67a526a30 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -861,13 +861,18 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
 
         /* We have our copies now, allow OS release its copies */
         release_firmware(ucode_raw);
-        complete(&drv->request_firmware_complete);
 
         drv->op_mode = iwl_dvm_ops.start(drv->trans, drv->cfg, &drv->fw);
 
         if (!drv->op_mode)
-                goto out_free_fw;
+                goto out_unbind;
 
+        /*
+         * Complete the firmware request last so that
+         * a driver unbind (stop) doesn't run while we
+         * are doing the start() above.
+         */
+        complete(&drv->request_firmware_complete);
         return;
 
  try_again:
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
index 50c58911e718..b8e2b223ac36 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
@@ -568,28 +568,28 @@ static int iwl_find_otp_image(struct iwl_trans *trans,
  * iwl_get_max_txpower_avg - get the highest tx power from all chains.
  *     find the highest tx power from all chains for the channel
  */
-static s8 iwl_get_max_txpower_avg(const struct iwl_cfg *cfg,
+static s8 iwl_get_max_txpower_avg(struct iwl_priv *priv,
                 struct iwl_eeprom_enhanced_txpwr *enhanced_txpower,
                 int element, s8 *max_txpower_in_half_dbm)
 {
         s8 max_txpower_avg = 0; /* (dBm) */
 
         /* Take the highest tx power from any valid chains */
-        if ((cfg->valid_tx_ant & ANT_A) &&
+        if ((priv->hw_params.valid_tx_ant & ANT_A) &&
             (enhanced_txpower[element].chain_a_max > max_txpower_avg))
                 max_txpower_avg = enhanced_txpower[element].chain_a_max;
-        if ((cfg->valid_tx_ant & ANT_B) &&
+        if ((priv->hw_params.valid_tx_ant & ANT_B) &&
             (enhanced_txpower[element].chain_b_max > max_txpower_avg))
                 max_txpower_avg = enhanced_txpower[element].chain_b_max;
-        if ((cfg->valid_tx_ant & ANT_C) &&
+        if ((priv->hw_params.valid_tx_ant & ANT_C) &&
             (enhanced_txpower[element].chain_c_max > max_txpower_avg))
                 max_txpower_avg = enhanced_txpower[element].chain_c_max;
-        if (((cfg->valid_tx_ant == ANT_AB) |
-            (cfg->valid_tx_ant == ANT_BC) |
-            (cfg->valid_tx_ant == ANT_AC)) &&
+        if (((priv->hw_params.valid_tx_ant == ANT_AB) |
+            (priv->hw_params.valid_tx_ant == ANT_BC) |
+            (priv->hw_params.valid_tx_ant == ANT_AC)) &&
             (enhanced_txpower[element].mimo2_max > max_txpower_avg))
                 max_txpower_avg =  enhanced_txpower[element].mimo2_max;
-        if ((cfg->valid_tx_ant == ANT_ABC) &&
+        if ((priv->hw_params.valid_tx_ant == ANT_ABC) &&
             (enhanced_txpower[element].mimo3_max > max_txpower_avg))
                 max_txpower_avg = enhanced_txpower[element].mimo3_max;
 
@@ -691,7 +691,7 @@ static void iwl_eeprom_enhanced_txpower(struct iwl_priv *priv)
                                  ((txp->delta_20_in_40 & 0xf0) >> 4),
                                  (txp->delta_20_in_40 & 0x0f));
 
-                max_txp_avg = iwl_get_max_txpower_avg(priv->cfg, txp_array, idx,
+                max_txp_avg = iwl_get_max_txpower_avg(priv, txp_array, idx,
                                                       &max_txp_avg_halfdbm);
 
                 /*
diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
index ab2f4d7500a4..3ee23134c02b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c
+++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
@@ -199,6 +199,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
                             WIPHY_FLAG_DISABLE_BEACON_HINTS |
                             WIPHY_FLAG_IBSS_RSN;
 
+#ifdef CONFIG_PM_SLEEP
         if (priv->fw->img[IWL_UCODE_WOWLAN].sec[0].len &&
             priv->trans->ops->wowlan_suspend &&
             device_can_wakeup(priv->trans->dev)) {
@@ -217,6 +218,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
                 hw->wiphy->wowlan.pattern_max_len =
                                         IWLAGN_WOWLAN_MAX_PATTERN_LEN;
         }
+#endif
 
         if (iwlwifi_mod_params.power_save)
                 hw->wiphy->flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT;
@@ -249,6 +251,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
         ret = ieee80211_register_hw(priv->hw);
         if (ret) {
                 IWL_ERR(priv, "Failed to register hw (error %d)\n", ret);
+                iwl_leds_exit(priv);
                 return ret;
         }
         priv->mac80211_registered = 1;
diff --git a/drivers/net/wireless/iwlwifi/iwl-prph.h b/drivers/net/wireless/iwlwifi/iwl-prph.h
index 3b1069290fa9..dfd54662e3e6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-prph.h
+++ b/drivers/net/wireless/iwlwifi/iwl-prph.h
@@ -224,6 +224,7 @@
 #define SCD_TXFACT              (SCD_BASE + 0x10)
 #define SCD_ACTIVE              (SCD_BASE + 0x14)
 #define SCD_QUEUECHAIN_SEL      (SCD_BASE + 0xe8)
+#define SCD_CHAINEXT_EN         (SCD_BASE + 0x244)
 #define SCD_AGGR_SEL            (SCD_BASE + 0x248)
 #define SCD_INTERRUPT_MASK      (SCD_BASE + 0x108)
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
index ec6fb395b84d..79c6b91417f9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
@@ -1058,6 +1058,11 @@ static void iwl_tx_start(struct iwl_trans *trans)
         iwl_write_prph(trans, SCD_DRAM_BASE_ADDR,
                        trans_pcie->scd_bc_tbls.dma >> 10);
 
+        /* The chain extension of the SCD doesn't work well. This feature is
+         * enabled by default by the HW, so we need to disable it manually.
+         */
+        iwl_write_prph(trans, SCD_CHAINEXT_EN, 0);
+
         /* Enable DMA channel */
         for (chan = 0; chan < FH_TCSR_CHNL_NUM ; chan++)
                 iwl_write_direct32(trans, FH_TCSR_CHNL_TX_CONFIG_REG(chan),
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index fb787df01666..a0b7cfd34685 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -1555,6 +1555,7 @@ static int hwsim_tx_info_frame_received_nl(struct sk_buff *skb_2,
                         hdr = (struct ieee80211_hdr *) skb->data;
                         mac80211_hwsim_monitor_ack(data2->hw, hdr->addr2);
                 }
+                txi->flags |= IEEE80211_TX_STAT_ACK;
         }
         ieee80211_tx_status_irqsafe(data2->hw, skb);
         return 0;
@@ -1721,6 +1722,24 @@ static void hwsim_exit_netlink(void)
                        "unregister family %i\n", ret);
 }
 
+static const struct ieee80211_iface_limit hwsim_if_limits[] = {
+        { .max = 1, .types = BIT(NL80211_IFTYPE_ADHOC) },
+        { .max = 2048,  .types = BIT(NL80211_IFTYPE_STATION) |
+                                 BIT(NL80211_IFTYPE_P2P_CLIENT) |
+#ifdef CONFIG_MAC80211_MESH
+                                 BIT(NL80211_IFTYPE_MESH_POINT) |
+#endif
+                                 BIT(NL80211_IFTYPE_AP) |
+                                 BIT(NL80211_IFTYPE_P2P_GO) },
+};
+
+static const struct ieee80211_iface_combination hwsim_if_comb = {
+        .limits = hwsim_if_limits,
+        .n_limits = ARRAY_SIZE(hwsim_if_limits),
+        .max_interfaces = 2048,
+        .num_different_channels = 1,
+};
+
 static int __init init_mac80211_hwsim(void)
 {
         int i, err = 0;
@@ -1782,6 +1801,9 @@ static int __init init_mac80211_hwsim(void)
                 hw->wiphy->n_addresses = 2;
                 hw->wiphy->addresses = data->addresses;
 
+                hw->wiphy->iface_combinations = &hwsim_if_comb;
+                hw->wiphy->n_iface_combinations = 1;
+
                 if (fake_hw_scan) {
                         hw->wiphy->max_scan_ssids = 255;
                         hw->wiphy->max_scan_ie_len = IEEE80211_MAX_DATA_LEN;
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 87671446e24b..ce61b6fae1c9 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -948,6 +948,19 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,
                 bss_cfg->ssid.ssid_len = params->ssid_len;
         }
 
+        switch (params->hidden_ssid) {
+        case NL80211_HIDDEN_SSID_NOT_IN_USE:
+                bss_cfg->bcast_ssid_ctl = 1;
+                break;
+        case NL80211_HIDDEN_SSID_ZERO_LEN:
+                bss_cfg->bcast_ssid_ctl = 0;
+                break;
+        case NL80211_HIDDEN_SSID_ZERO_CONTENTS:
+                /* firmware doesn't support this type of hidden SSID */
+        default:
+                return -EINVAL;
+        }
+
         if (mwifiex_set_secure_params(priv, bss_cfg, params)) {
                 kfree(bss_cfg);
                 wiphy_err(wiphy, "Failed to parse secuirty parameters!\n");
@@ -1471,7 +1484,7 @@ struct net_device *mwifiex_add_virtual_intf(struct wiphy *wiphy,
         struct wireless_dev *wdev;
 
         if (!adapter)
-                return NULL;
+                return ERR_PTR(-EFAULT);
 
         switch (type) {
         case NL80211_IFTYPE_UNSPECIFIED:
@@ -1481,12 +1494,12 @@ struct net_device *mwifiex_add_virtual_intf(struct wiphy *wiphy,
                 if (priv->bss_mode) {
                         wiphy_err(wiphy,
                                   "cannot create multiple sta/adhoc ifaces\n");
-                        return NULL;
+                        return ERR_PTR(-EINVAL);
                 }
 
                 wdev = kzalloc(sizeof(struct wireless_dev), GFP_KERNEL);
                 if (!wdev)
-                        return NULL;
+                        return ERR_PTR(-ENOMEM);
 
                 wdev->wiphy = wiphy;
                 priv->wdev = wdev;
@@ -1509,12 +1522,12 @@ struct net_device *mwifiex_add_virtual_intf(struct wiphy *wiphy,
 
                 if (priv->bss_mode) {
                         wiphy_err(wiphy, "Can't create multiple AP interfaces");
-                        return NULL;
+                        return ERR_PTR(-EINVAL);
                 }
 
                 wdev = kzalloc(sizeof(struct wireless_dev), GFP_KERNEL);
                 if (!wdev)
-                        return NULL;
+                        return ERR_PTR(-ENOMEM);
 
                 priv->wdev = wdev;
                 wdev->wiphy = wiphy;
@@ -1531,14 +1544,15 @@ struct net_device *mwifiex_add_virtual_intf(struct wiphy *wiphy,
                 break;
         default:
                 wiphy_err(wiphy, "type not supported\n");
-                return NULL;
+                return ERR_PTR(-EINVAL);
         }
 
         dev = alloc_netdev_mq(sizeof(struct mwifiex_private *), name,
                               ether_setup, 1);
         if (!dev) {
                 wiphy_err(wiphy, "no memory available for netdevice\n");
-                goto error;
+                priv->bss_mode = NL80211_IFTYPE_UNSPECIFIED;
+                return ERR_PTR(-ENOMEM);
         }
 
         mwifiex_init_priv_params(priv, dev);
@@ -1569,7 +1583,9 @@ struct net_device *mwifiex_add_virtual_intf(struct wiphy *wiphy,
         /* Register network device */
         if (register_netdevice(dev)) {
                 wiphy_err(wiphy, "cannot register virtual network device\n");
-                goto error;
+                free_netdev(dev);
+                priv->bss_mode = NL80211_IFTYPE_UNSPECIFIED;
+                return ERR_PTR(-EFAULT);
         }
 
         sema_init(&priv->async_sem, 1);
@@ -1581,12 +1597,6 @@ struct net_device *mwifiex_add_virtual_intf(struct wiphy *wiphy,
         mwifiex_dev_debugfs_init(priv);
 #endif
         return dev;
-error:
-        if (dev && (dev->reg_state == NETREG_UNREGISTERED))
-                free_netdev(dev);
-        priv->bss_mode = NL80211_IFTYPE_UNSPECIFIED;
-
-        return NULL;
 }
 EXPORT_SYMBOL_GPL(mwifiex_add_virtual_intf);
 
diff --git a/drivers/net/wireless/mwifiex/fw.h b/drivers/net/wireless/mwifiex/fw.h
index 9f674bbebe65..561452a5c818 100644
--- a/drivers/net/wireless/mwifiex/fw.h
+++ b/drivers/net/wireless/mwifiex/fw.h
@@ -122,6 +122,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {
 #define TLV_TYPE_CHANNELBANDLIST    (PROPRIETARY_TLV_BASE_ID + 42)
 #define TLV_TYPE_UAP_BEACON_PERIOD  (PROPRIETARY_TLV_BASE_ID + 44)
 #define TLV_TYPE_UAP_DTIM_PERIOD    (PROPRIETARY_TLV_BASE_ID + 45)
+#define TLV_TYPE_UAP_BCAST_SSID     (PROPRIETARY_TLV_BASE_ID + 48)
 #define TLV_TYPE_UAP_RTS_THRESHOLD  (PROPRIETARY_TLV_BASE_ID + 51)
 #define TLV_TYPE_UAP_WPA_PASSPHRASE (PROPRIETARY_TLV_BASE_ID + 60)
 #define TLV_TYPE_UAP_ENCRY_PROTOCOL (PROPRIETARY_TLV_BASE_ID + 64)
@@ -1209,6 +1210,11 @@ struct host_cmd_tlv_ssid {
         u8 ssid[0];
 } __packed;
 
+struct host_cmd_tlv_bcast_ssid {
+        struct host_cmd_tlv tlv;
+        u8 bcast_ctl;
+} __packed;
+
 struct host_cmd_tlv_beacon_period {
         struct host_cmd_tlv tlv;
         __le16 period;
diff --git a/drivers/net/wireless/mwifiex/txrx.c b/drivers/net/wireless/mwifiex/txrx.c
index e2faec4db108..cecb27283196 100644
--- a/drivers/net/wireless/mwifiex/txrx.c
+++ b/drivers/net/wireless/mwifiex/txrx.c
@@ -161,15 +161,11 @@ int mwifiex_write_data_complete(struct mwifiex_adapter *adapter,
                 goto done;
 
         for (i = 0; i < adapter->priv_num; i++) {
-
                 tpriv = adapter->priv[i];
 
-                if ((GET_BSS_ROLE(tpriv) == MWIFIEX_BSS_ROLE_STA) &&
-                    (tpriv->media_connected)) {
-                        if (netif_queue_stopped(tpriv->netdev))
-                                mwifiex_wake_up_net_dev_queue(tpriv->netdev,
-                                                              adapter);
-                }
+                if (tpriv->media_connected &&
+                    netif_queue_stopped(tpriv->netdev))
+                        mwifiex_wake_up_net_dev_queue(tpriv->netdev, adapter);
         }
 done:
         dev_kfree_skb_any(skb);
diff --git a/drivers/net/wireless/mwifiex/uap_cmd.c b/drivers/net/wireless/mwifiex/uap_cmd.c
index 76dfbc42a732..89f9a2a45de3 100644
--- a/drivers/net/wireless/mwifiex/uap_cmd.c
+++ b/drivers/net/wireless/mwifiex/uap_cmd.c
@@ -27,6 +27,17 @@ int mwifiex_set_secure_params(struct mwifiex_private *priv,
                               struct cfg80211_ap_settings *params) {
         int i;
 
+        if (!params->privacy) {
+                bss_config->protocol = PROTOCOL_NO_SECURITY;
+                bss_config->key_mgmt = KEY_MGMT_NONE;
+                bss_config->wpa_cfg.length = 0;
+                priv->sec_info.wep_enabled = 0;
+                priv->sec_info.wpa_enabled = 0;
+                priv->sec_info.wpa2_enabled = 0;
+
+                return 0;
+        }
+
         switch (params->auth_type) {
         case NL80211_AUTHTYPE_OPEN_SYSTEM:
                 bss_config->auth_mode = WLAN_AUTH_OPEN;
@@ -132,6 +143,7 @@ mwifiex_uap_bss_param_prepare(u8 *tlv, void *cmd_buf, u16 *param_size)
         struct host_cmd_tlv_dtim_period *dtim_period;
         struct host_cmd_tlv_beacon_period *beacon_period;
         struct host_cmd_tlv_ssid *ssid;
+        struct host_cmd_tlv_bcast_ssid *bcast_ssid;
         struct host_cmd_tlv_channel_band *chan_band;
         struct host_cmd_tlv_frag_threshold *frag_threshold;
         struct host_cmd_tlv_rts_threshold *rts_threshold;
@@ -153,6 +165,14 @@ mwifiex_uap_bss_param_prepare(u8 *tlv, void *cmd_buf, u16 *param_size)
                 cmd_size += sizeof(struct host_cmd_tlv) +
                             bss_cfg->ssid.ssid_len;
                 tlv += sizeof(struct host_cmd_tlv) + bss_cfg->ssid.ssid_len;
+
+                bcast_ssid = (struct host_cmd_tlv_bcast_ssid *)tlv;
+                bcast_ssid->tlv.type = cpu_to_le16(TLV_TYPE_UAP_BCAST_SSID);
+                bcast_ssid->tlv.len =
+                                cpu_to_le16(sizeof(bcast_ssid->bcast_ctl));
+                bcast_ssid->bcast_ctl = bss_cfg->bcast_ssid_ctl;
+                cmd_size += sizeof(struct host_cmd_tlv_bcast_ssid);
+                tlv += sizeof(struct host_cmd_tlv_bcast_ssid);
         }
         if (bss_cfg->channel && bss_cfg->channel <= MAX_CHANNEL_BAND_BG) {
                 chan_band = (struct host_cmd_tlv_channel_band *)tlv;
@@ -416,6 +436,7 @@ int mwifiex_uap_set_channel(struct mwifiex_private *priv, int channel)
         if (!bss_cfg)
                 return -ENOMEM;
 
+        mwifiex_set_sys_config_invalid_data(bss_cfg);
         bss_cfg->band_cfg = BAND_CONFIG_MANUAL;
         bss_cfg->channel = channel;
 
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index 2e9e6af21362..dfcd02ab6cae 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -2110,7 +2110,7 @@ resize_buf:
         while (check_bssid_list_item(bssid, bssid_len, buf, len)) {
                 if (rndis_bss_info_update(usbdev, bssid) && match_bssid &&
                     matched) {
-                        if (!ether_addr_equal(bssid->mac, match_bssid))
+                        if (ether_addr_equal(bssid->mac, match_bssid))
                                 *matched = true;
                 }
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index ca36cccaba31..8f754025b06e 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -396,8 +396,7 @@ struct rt2x00_intf {
          * for hardware which doesn't support hardware
          * sequence counting.
          */
-        spinlock_t seqlock;
-        u16 seqno;
+        atomic_t seqno;
 };
 
 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index b49773ef72f2..dd24b2663b5e 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -277,7 +277,6 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw,
         else
                 rt2x00dev->intf_sta_count++;
 
-        spin_lock_init(&intf->seqlock);
         mutex_init(&intf->beacon_skb_mutex);
         intf->beacon = entry;
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index 4c662eccf53c..2fd830103415 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -207,6 +207,7 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
         struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
         struct rt2x00_intf *intf = vif_to_intf(tx_info->control.vif);
+        u16 seqno;
 
         if (!(tx_info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ))
                 return;
@@ -238,15 +239,13 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
          * sequence counting per-frame, since those will override the
          * sequence counter given by mac80211.
          */
-        spin_lock(&intf->seqlock);
-
         if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
-                intf->seqno += 0x10;
-        hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
-        hdr->seq_ctrl |= cpu_to_le16(intf->seqno);
-
-        spin_unlock(&intf->seqlock);
+                seqno = atomic_add_return(0x10, &intf->seqno);
+        else
+                seqno = atomic_read(&intf->seqno);
 
+        hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
+        hdr->seq_ctrl |= cpu_to_le16(seqno);
 }
 
 static void rt2x00queue_create_tx_descriptor_plcp(struct rt2x00_dev *rt2x00dev,
diff --git a/drivers/net/wireless/rtl818x/rtl8187/leds.c b/drivers/net/wireless/rtl818x/rtl8187/leds.c
index 2e0de2f5f0f9..c2d5b495c179 100644
--- a/drivers/net/wireless/rtl818x/rtl8187/leds.c
+++ b/drivers/net/wireless/rtl818x/rtl8187/leds.c
@@ -117,7 +117,7 @@ static void rtl8187_led_brightness_set(struct led_classdev *led_dev,
                         radio_on = true;
                 } else if (radio_on) {
                         radio_on = false;
-                        cancel_delayed_work_sync(&priv->led_on);
+                        cancel_delayed_work(&priv->led_on);
                         ieee80211_queue_delayed_work(hw, &priv->led_off, 0);
                 }
         } else if (radio_on) {
diff --git a/drivers/net/wireless/ti/wl1251/acx.c b/drivers/net/wireless/ti/wl1251/acx.c
index ad87a1ac6462..db6430c1a084 100644
--- a/drivers/net/wireless/ti/wl1251/acx.c
+++ b/drivers/net/wireless/ti/wl1251/acx.c
@@ -869,7 +869,7 @@ int wl1251_acx_tsf_info(struct wl1251 *wl, u64 *mactime)
         }
 
         *mactime = tsf_info->current_tsf_lsb |
-                (tsf_info->current_tsf_msb << 31);
+                ((u64)tsf_info->current_tsf_msb << 32);
 
 out:
         kfree(tsf_info);
diff --git a/drivers/net/wireless/ti/wl1251/event.c b/drivers/net/wireless/ti/wl1251/event.c
index 9f15ccaf8f05..5ec50a476a69 100644
--- a/drivers/net/wireless/ti/wl1251/event.c
+++ b/drivers/net/wireless/ti/wl1251/event.c
@@ -76,8 +76,7 @@ static int wl1251_event_process(struct wl1251 *wl, struct event_mailbox *mbox)
                 }
         }
 
-        if (vector & SYNCHRONIZATION_TIMEOUT_EVENT_ID &&
-            wl->station_mode != STATION_ACTIVE_MODE) {
+        if (vector & SYNCHRONIZATION_TIMEOUT_EVENT_ID) {
                 wl1251_debug(DEBUG_EVENT, "SYNCHRONIZATION_TIMEOUT_EVENT");
 
                 /* indicate to the stack, that beacons have been lost */
diff --git a/drivers/net/wireless/ti/wl1251/spi.c b/drivers/net/wireless/ti/wl1251/spi.c
index 87f6305bda2c..567660cd2fcd 100644
--- a/drivers/net/wireless/ti/wl1251/spi.c
+++ b/drivers/net/wireless/ti/wl1251/spi.c
@@ -73,6 +73,8 @@ static void wl1251_spi_reset(struct wl1251 *wl)
         spi_sync(wl_to_spi(wl), &m);
 
         wl1251_dump(DEBUG_SPI, "spi reset -> ", cmd, WSPI_INIT_CMD_LEN);
+
+        kfree(cmd);
 }
 
 static void wl1251_spi_wake(struct wl1251 *wl)
@@ -127,6 +129,8 @@ static void wl1251_spi_wake(struct wl1251 *wl)
         spi_sync(wl_to_spi(wl), &m);
 
         wl1251_dump(DEBUG_SPI, "spi init -> ", cmd, WSPI_INIT_CMD_LEN);
+
+        kfree(cmd);
 }
 
 static void wl1251_spi_reset_wake(struct wl1251 *wl)
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 2027afe405fe..30899901aef5 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1935,14 +1935,14 @@ static int __devexit xennet_remove(struct xenbus_device *dev)
 
         dev_dbg(&dev->dev, "%s\n", dev->nodename);
 
-        unregister_netdev(info->netdev);
-
         xennet_disconnect_backend(info);
 
-        del_timer_sync(&info->rx_refill_timer);
-
         xennet_sysfs_delif(info->netdev);
 
+        unregister_netdev(info->netdev);
+
+        del_timer_sync(&info->rx_refill_timer);
+
         free_percpu(info->stats);
 
         free_netdev(info->netdev);
diff --git a/drivers/oprofile/oprofile_perf.c b/drivers/oprofile/oprofile_perf.c
index da14432806c6..efc4b7f308cf 100644
--- a/drivers/oprofile/oprofile_perf.c
+++ b/drivers/oprofile/oprofile_perf.c
@@ -25,7 +25,7 @@ static int oprofile_perf_enabled;
 static DEFINE_MUTEX(oprofile_perf_mutex);
 
 static struct op_counter_config *counter_config;
-static struct perf_event **perf_events[nr_cpumask_bits];
+static struct perf_event **perf_events[NR_CPUS];
 static int num_counters;
 
 /*
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 447e83472c01..77cb54a65cde 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1744,6 +1744,11 @@ int pci_prepare_to_sleep(struct pci_dev *dev)
         if (target_state == PCI_POWER_ERROR)
                 return -EIO;
 
+        /* Some devices mustn't be in D3 during system sleep */
+        if (target_state == PCI_D3hot &&
+                        (dev->dev_flags & PCI_DEV_FLAGS_NO_D3_DURING_SLEEP))
+                return 0;
+
         pci_enable_wake(dev, target_state, device_may_wakeup(&dev->dev));
 
         error = pci_set_power_state(dev, target_state);
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 2a7521677541..194b243a2817 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -2929,6 +2929,32 @@ static void __devinit disable_igfx_irq(struct pci_dev *dev)
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0102, disable_igfx_irq);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
 
+/*
+ * The Intel 6 Series/C200 Series chipset's EHCI controllers on many
+ * ASUS motherboards will cause memory corruption or a system crash
+ * if they are in D3 while the system is put into S3 sleep.
+ */
+static void __devinit asus_ehci_no_d3(struct pci_dev *dev)
+{
+        const char *sys_info;
+        static const char good_Asus_board[] = "P8Z68-V";
+
+        if (dev->dev_flags & PCI_DEV_FLAGS_NO_D3_DURING_SLEEP)
+                return;
+        if (dev->subsystem_vendor != PCI_VENDOR_ID_ASUSTEK)
+                return;
+        sys_info = dmi_get_system_info(DMI_BOARD_NAME);
+        if (sys_info && memcmp(sys_info, good_Asus_board,
+                        sizeof(good_Asus_board) - 1) == 0)
+                return;
+
+        dev_info(&dev->dev, "broken D3 during system sleep on ASUS\n");
+        dev->dev_flags |= PCI_DEV_FLAGS_NO_D3_DURING_SLEEP;
+        device_set_wakeup_capable(&dev->dev, false);
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1c26, asus_ehci_no_d3);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1c2d, asus_ehci_no_d3);
+
 static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f,
                           struct pci_fixup *end)
 {
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index c3b331b74fa0..0cc053af70bd 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -61,7 +61,7 @@ static LIST_HEAD(pinctrl_maps);
         list_for_each_entry(_maps_node_, &pinctrl_maps, node) \
                 for (_i_ = 0, _map_ = &_maps_node_->maps[_i_]; \
                         _i_ < _maps_node_->num_maps; \
-                        i++, _map_ = &_maps_node_->maps[_i_])
+                        _i_++, _map_ = &_maps_node_->maps[_i_])
 
 /**
  * pinctrl_provide_dummies() - indicate if pinctrl provides dummy state support
diff --git a/drivers/pinctrl/pinctrl-imx.c b/drivers/pinctrl/pinctrl-imx.c
index f6e7c670906c..dd6d93aa5334 100644
--- a/drivers/pinctrl/pinctrl-imx.c
+++ b/drivers/pinctrl/pinctrl-imx.c
@@ -27,16 +27,16 @@
 #include "core.h"
 #include "pinctrl-imx.h"
 
-#define IMX_PMX_DUMP(info, p, m, c, n)          \
-{                                               \
-        int i, j;                               \
-        printk("Format: Pin Mux Config\n");     \
-        for (i = 0; i < n; i++) {               \
-                j = p[i];                       \
-                printk("%s %d 0x%lx\n",         \
-                        info->pins[j].name,     \
-                        m[i], c[i]);            \
-        }                                       \
+#define IMX_PMX_DUMP(info, p, m, c, n)                  \
+{                                                       \
+        int i, j;                                       \
+        printk(KERN_DEBUG "Format: Pin Mux Config\n");  \
+        for (i = 0; i < n; i++) {                       \
+                j = p[i];                               \
+                printk(KERN_DEBUG "%s %d 0x%lx\n",      \
+                        info->pins[j].name,             \
+                        m[i], c[i]);                    \
+        }                                               \
 }
 
 /* The bits in CONFIG cell defined in binding doc*/
@@ -173,8 +173,10 @@ static int imx_dt_node_to_map(struct pinctrl_dev *pctldev,
 
         /* create mux map */
         parent = of_get_parent(np);
-        if (!parent)
+        if (!parent) {
+                kfree(new_map);
                 return -EINVAL;
+        }
         new_map[0].type = PIN_MAP_TYPE_MUX_GROUP;
         new_map[0].data.mux.function = parent->name;
         new_map[0].data.mux.group = np->name;
@@ -193,7 +195,7 @@ static int imx_dt_node_to_map(struct pinctrl_dev *pctldev,
         }
 
         dev_dbg(pctldev->dev, "maps: function %s group %s num %d\n",
-                new_map->data.mux.function, new_map->data.mux.group, map_num);
+                (*map)->data.mux.function, (*map)->data.mux.group, map_num);
 
         return 0;
 }
@@ -201,10 +203,7 @@ static int imx_dt_node_to_map(struct pinctrl_dev *pctldev,
 static void imx_dt_free_map(struct pinctrl_dev *pctldev,
                                 struct pinctrl_map *map, unsigned num_maps)
 {
-        int i;
-
-        for (i = 0; i < num_maps; i++)
-                kfree(map);
+        kfree(map);
 }
 
 static struct pinctrl_ops imx_pctrl_ops = {
@@ -475,9 +474,8 @@ static int __devinit imx_pinctrl_parse_groups(struct device_node *np,
                 grp->configs[j] = config & ~IMX_PAD_SION;
         }
 
-#ifdef DEBUG
         IMX_PMX_DUMP(info, grp->pins, grp->mux_mode, grp->configs, grp->npins);
-#endif
+
         return 0;
 }
 
diff --git a/drivers/pinctrl/pinctrl-mxs.c b/drivers/pinctrl/pinctrl-mxs.c
index 556e45a213eb..4ba4636b6a4a 100644
--- a/drivers/pinctrl/pinctrl-mxs.c
+++ b/drivers/pinctrl/pinctrl-mxs.c
@@ -107,8 +107,10 @@ static int mxs_dt_node_to_map(struct pinctrl_dev *pctldev,
 
                 /* Compose group name */
                 group = kzalloc(length, GFP_KERNEL);
-                if (!group)
-                        return -ENOMEM;
+                if (!group) {
+                        ret = -ENOMEM;
+                        goto free;
+                }
                 snprintf(group, length, "%s.%d", np->name, reg);
                 new_map[i].data.mux.group = group;
                 i++;
@@ -118,7 +120,7 @@ static int mxs_dt_node_to_map(struct pinctrl_dev *pctldev,
                 pconfig = kmemdup(&config, sizeof(config), GFP_KERNEL);
                 if (!pconfig) {
                         ret = -ENOMEM;
-                        goto free;
+                        goto free_group;
                 }
 
                 new_map[i].type = PIN_MAP_TYPE_CONFIGS_GROUP;
@@ -133,6 +135,9 @@ static int mxs_dt_node_to_map(struct pinctrl_dev *pctldev,
 
         return 0;
 
+free_group:
+        if (!purecfg)
+                kfree(group);
 free:
         kfree(new_map);
         return ret;
@@ -511,6 +516,7 @@ int __devinit mxs_pinctrl_probe(struct platform_device *pdev,
         return 0;
 
 err:
+        platform_set_drvdata(pdev, NULL);
         iounmap(d->base);
         return ret;
 }
@@ -520,6 +526,7 @@ int __devexit mxs_pinctrl_remove(struct platform_device *pdev)
 {
         struct mxs_pinctrl_data *d = platform_get_drvdata(pdev);
 
+        platform_set_drvdata(pdev, NULL);
         pinctrl_unregister(d->pctl);
         iounmap(d->base);
 
diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c
index b26395d16347..3e7e47d6b385 100644
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@ -673,7 +673,7 @@ static void __nmk_gpio_set_wake(struct nmk_gpio_chip *nmk_chip,
          * wakeup is anyhow controlled by the RIMSC and FIMSC registers.
          */
         if (nmk_chip->sleepmode && on) {
-                __nmk_gpio_set_slpm(nmk_chip, gpio % nmk_chip->chip.base,
+                __nmk_gpio_set_slpm(nmk_chip, gpio % NMK_GPIO_PER_CHIP,
                                     NMK_GPIO_SLPM_WAKEUP_ENABLE);
         }
 
@@ -1246,6 +1246,7 @@ static int __devinit nmk_gpio_probe(struct platform_device *dev)
                 ret = PTR_ERR(clk);
                 goto out_unmap;
         }
+        clk_prepare(clk);
 
         nmk_chip = kzalloc(sizeof(*nmk_chip), GFP_KERNEL);
         if (!nmk_chip) {
@@ -1437,7 +1438,27 @@ static int nmk_pmx_enable(struct pinctrl_dev *pctldev, unsigned function,
 
         dev_dbg(npct->dev, "enable group %s, %u pins\n", g->name, g->npins);
 
-        /* Handle this special glitch on altfunction C */
+        /*
+         * If we're setting altfunc C by setting both AFSLA and AFSLB to 1,
+         * we may pass through an undesired state. In this case we take
+         * some extra care.
+         *
+         * Safe sequence used to switch IOs between GPIO and Alternate-C mode:
+         *  - Save SLPM registers (since we have a shadow register in the
+         *    nmk_chip we're using that as backup)
+         *  - Set SLPM=0 for the IOs you want to switch and others to 1
+         *  - Configure the GPIO registers for the IOs that are being switched
+         *  - Set IOFORCE=1
+         *  - Modify the AFLSA/B registers for the IOs that are being switched
+         *  - Set IOFORCE=0
+         *  - Restore SLPM registers
+         *  - Any spurious wake up event during switch sequence to be ignored
+         *    and cleared
+         *
+         * We REALLY need to save ALL slpm registers, because the external
+         * IOFORCE will switch *all* ports to their sleepmode setting to as
+         * to avoid glitches. (Not just one port!)
+         */
         glitch = (g->altsetting == NMK_GPIO_ALT_C);
 
         if (glitch) {
diff --git a/drivers/pinctrl/pinctrl-sirf.c b/drivers/pinctrl/pinctrl-sirf.c
index ba15b1a29e52..e9f8e7d11001 100644
--- a/drivers/pinctrl/pinctrl-sirf.c
+++ b/drivers/pinctrl/pinctrl-sirf.c
@@ -1184,7 +1184,7 @@ out_no_gpio_remap:
         return ret;
 }
 
-static const struct of_device_id pinmux_ids[]  = {
+static const struct of_device_id pinmux_ids[] __devinitconst = {
         { .compatible = "sirf,prima2-gpio-pinmux" },
         {}
 };
diff --git a/drivers/pinctrl/spear/pinctrl-spear.c b/drivers/pinctrl/spear/pinctrl-spear.c
index 5ae50aadf885..b3f6b2873fdd 100644
--- a/drivers/pinctrl/spear/pinctrl-spear.c
+++ b/drivers/pinctrl/spear/pinctrl-spear.c
@@ -2,7 +2,7 @@
  * Driver for the ST Microelectronics SPEAr pinmux
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * Inspired from:
  * - U300 Pinctl drivers
diff --git a/drivers/pinctrl/spear/pinctrl-spear.h b/drivers/pinctrl/spear/pinctrl-spear.h
index 9155783bb47f..d950eb78d939 100644
--- a/drivers/pinctrl/spear/pinctrl-spear.h
+++ b/drivers/pinctrl/spear/pinctrl-spear.h
@@ -2,7 +2,7 @@
  * Driver header file for the ST Microelectronics SPEAr pinmux
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/pinctrl/spear/pinctrl-spear1310.c b/drivers/pinctrl/spear/pinctrl-spear1310.c
index fff168be7f00..d6cca8c81b92 100644
--- a/drivers/pinctrl/spear/pinctrl-spear1310.c
+++ b/drivers/pinctrl/spear/pinctrl-spear1310.c
@@ -2,7 +2,7 @@
  * Driver for the ST Microelectronics SPEAr1310 pinmux
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
@@ -2192,7 +2192,7 @@ static void __exit spear1310_pinctrl_exit(void)
 }
 module_exit(spear1310_pinctrl_exit);
 
-MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>");
+MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>");
 MODULE_DESCRIPTION("ST Microelectronics SPEAr1310 pinctrl driver");
 MODULE_LICENSE("GPL v2");
 MODULE_DEVICE_TABLE(of, spear1310_pinctrl_of_match);
diff --git a/drivers/pinctrl/spear/pinctrl-spear1340.c b/drivers/pinctrl/spear/pinctrl-spear1340.c
index a8ab2a6f51bf..a0eb057e55bd 100644
--- a/drivers/pinctrl/spear/pinctrl-spear1340.c
+++ b/drivers/pinctrl/spear/pinctrl-spear1340.c
@@ -2,7 +2,7 @@
  * Driver for the ST Microelectronics SPEAr1340 pinmux
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
@@ -1983,7 +1983,7 @@ static void __exit spear1340_pinctrl_exit(void)
 }
 module_exit(spear1340_pinctrl_exit);
 
-MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>");
+MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>");
 MODULE_DESCRIPTION("ST Microelectronics SPEAr1340 pinctrl driver");
 MODULE_LICENSE("GPL v2");
 MODULE_DEVICE_TABLE(of, spear1340_pinctrl_of_match);
diff --git a/drivers/pinctrl/spear/pinctrl-spear300.c b/drivers/pinctrl/spear/pinctrl-spear300.c
index 9c82a35e4e78..4dfc2849b172 100644
--- a/drivers/pinctrl/spear/pinctrl-spear300.c
+++ b/drivers/pinctrl/spear/pinctrl-spear300.c
@@ -2,7 +2,7 @@
  * Driver for the ST Microelectronics SPEAr300 pinmux
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
@@ -702,7 +702,7 @@ static void __exit spear300_pinctrl_exit(void)
 }
 module_exit(spear300_pinctrl_exit);
 
-MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>");
+MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>");
 MODULE_DESCRIPTION("ST Microelectronics SPEAr300 pinctrl driver");
 MODULE_LICENSE("GPL v2");
 MODULE_DEVICE_TABLE(of, spear300_pinctrl_of_match);
diff --git a/drivers/pinctrl/spear/pinctrl-spear310.c b/drivers/pinctrl/spear/pinctrl-spear310.c
index 1a9707605125..96883693fb7e 100644
--- a/drivers/pinctrl/spear/pinctrl-spear310.c
+++ b/drivers/pinctrl/spear/pinctrl-spear310.c
@@ -2,7 +2,7 @@
  * Driver for the ST Microelectronics SPEAr310 pinmux
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
@@ -425,7 +425,7 @@ static void __exit spear310_pinctrl_exit(void)
 }
 module_exit(spear310_pinctrl_exit);
 
-MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>");
+MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>");
 MODULE_DESCRIPTION("ST Microelectronics SPEAr310 pinctrl driver");
 MODULE_LICENSE("GPL v2");
 MODULE_DEVICE_TABLE(of, SPEAr310_pinctrl_of_match);
diff --git a/drivers/pinctrl/spear/pinctrl-spear320.c b/drivers/pinctrl/spear/pinctrl-spear320.c
index de726e6c283a..020b1e0bdb3e 100644
--- a/drivers/pinctrl/spear/pinctrl-spear320.c
+++ b/drivers/pinctrl/spear/pinctrl-spear320.c
@@ -2,7 +2,7 @@
  * Driver for the ST Microelectronics SPEAr320 pinmux
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
@@ -3462,7 +3462,7 @@ static void __exit spear320_pinctrl_exit(void)
 }
 module_exit(spear320_pinctrl_exit);
 
-MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>");
+MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>");
 MODULE_DESCRIPTION("ST Microelectronics SPEAr320 pinctrl driver");
 MODULE_LICENSE("GPL v2");
 MODULE_DEVICE_TABLE(of, spear320_pinctrl_of_match);
diff --git a/drivers/pinctrl/spear/pinctrl-spear3xx.c b/drivers/pinctrl/spear/pinctrl-spear3xx.c
index 91c883bc46a6..0242378f7cb8 100644
--- a/drivers/pinctrl/spear/pinctrl-spear3xx.c
+++ b/drivers/pinctrl/spear/pinctrl-spear3xx.c
@@ -2,7 +2,7 @@
  * Driver for the ST Microelectronics SPEAr3xx pinmux
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/pinctrl/spear/pinctrl-spear3xx.h b/drivers/pinctrl/spear/pinctrl-spear3xx.h
index 5d5fdd8df7b8..31f44347f17c 100644
--- a/drivers/pinctrl/spear/pinctrl-spear3xx.h
+++ b/drivers/pinctrl/spear/pinctrl-spear3xx.h
@@ -2,7 +2,7 @@
  * Header file for the ST Microelectronics SPEAr3xx pinmux
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index e1b8c54ace5a..a739f5ca936a 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -794,17 +794,17 @@ static __devinit int ab8500_regulator_register(struct platform_device *pdev,
 }
 
 static struct of_regulator_match ab8500_regulator_matches[] = {
-        { .name = "LDO-AUX1",    .driver_data = (void *) AB8500_LDO_AUX1, },
-        { .name = "LDO-AUX2",    .driver_data = (void *) AB8500_LDO_AUX2, },
-        { .name = "LDO-AUX3",    .driver_data = (void *) AB8500_LDO_AUX3, },
-        { .name = "LDO-INTCORE", .driver_data = (void *) AB8500_LDO_INTCORE, },
-        { .name = "LDO-TVOUT",   .driver_data = (void *) AB8500_LDO_TVOUT, },
-        { .name = "LDO-USB",     .driver_data = (void *) AB8500_LDO_USB, },
-        { .name = "LDO-AUDIO",   .driver_data = (void *) AB8500_LDO_AUDIO, },
-        { .name = "LDO-ANAMIC1", .driver_data = (void *) AB8500_LDO_ANAMIC1, },
-        { .name = "LDO-ANAMIC2", .driver_data = (void *) AB8500_LDO_ANAMIC2, },
-        { .name = "LDO-DMIC",    .driver_data = (void *) AB8500_LDO_DMIC, },
-        { .name = "LDO-ANA",     .driver_data = (void *) AB8500_LDO_ANA, },
+        { .name = "ab8500_ldo_aux1",    .driver_data = (void *) AB8500_LDO_AUX1, },
+        { .name = "ab8500_ldo_aux2",    .driver_data = (void *) AB8500_LDO_AUX2, },
+        { .name = "ab8500_ldo_aux3",    .driver_data = (void *) AB8500_LDO_AUX3, },
+        { .name = "ab8500_ldo_intcore", .driver_data = (void *) AB8500_LDO_INTCORE, },
+        { .name = "ab8500_ldo_tvout",   .driver_data = (void *) AB8500_LDO_TVOUT, },
+        { .name = "ab8500_ldo_usb",     .driver_data = (void *) AB8500_LDO_USB, },
+        { .name = "ab8500_ldo_audio",   .driver_data = (void *) AB8500_LDO_AUDIO, },
+        { .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8500_LDO_ANAMIC1, },
+        { .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB8500_LDO_ANAMIC2, },
+        { .name = "ab8500_ldo_dmic",    .driver_data = (void *) AB8500_LDO_DMIC, },
+        { .name = "ab8500_ldo_ana",     .driver_data = (void *) AB8500_LDO_ANA, },
 };
 
 static __devinit int
diff --git a/drivers/regulator/anatop-regulator.c b/drivers/regulator/anatop-regulator.c
index 3660bace123c..e82e7eaac0f1 100644
--- a/drivers/regulator/anatop-regulator.c
+++ b/drivers/regulator/anatop-regulator.c
@@ -224,7 +224,7 @@ static struct platform_driver anatop_regulator_driver = {
                 .of_match_table = of_anatop_regulator_match_tbl,
         },
         .probe  = anatop_regulator_probe,
-        .remove = anatop_regulator_remove,
+        .remove = __devexit_p(anatop_regulator_remove),
 };
 
 static int __init anatop_regulator_init(void)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 7584a74eec8a..09a737c868b5 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2050,6 +2050,9 @@ int regulator_map_voltage_linear(struct regulator_dev *rdev,
                 return -EINVAL;
         }
 
+        if (min_uV < rdev->desc->min_uV)
+                min_uV = rdev->desc->min_uV;
+
         ret = DIV_ROUND_UP(min_uV - rdev->desc->min_uV, rdev->desc->uV_step);
         if (ret < 0)
                 return ret;
diff --git a/drivers/regulator/db8500-prcmu.c b/drivers/regulator/db8500-prcmu.c
index 968f97f3cb3d..9dbb491b6efa 100644
--- a/drivers/regulator/db8500-prcmu.c
+++ b/drivers/regulator/db8500-prcmu.c
@@ -452,26 +452,26 @@ static __devinit int db8500_regulator_register(struct platform_device *pdev,
 }
 
 static struct of_regulator_match db8500_regulator_matches[] = {
-        { .name = "db8500-vape",          .driver_data = (void *) DB8500_REGULATOR_VAPE, },
-        { .name = "db8500-varm",          .driver_data = (void *) DB8500_REGULATOR_VARM, },
-        { .name = "db8500-vmodem",        .driver_data = (void *) DB8500_REGULATOR_VMODEM, },
-        { .name = "db8500-vpll",          .driver_data = (void *) DB8500_REGULATOR_VPLL, },
-        { .name = "db8500-vsmps1",        .driver_data = (void *) DB8500_REGULATOR_VSMPS1, },
-        { .name = "db8500-vsmps2",        .driver_data = (void *) DB8500_REGULATOR_VSMPS2, },
-        { .name = "db8500-vsmps3",        .driver_data = (void *) DB8500_REGULATOR_VSMPS3, },
-        { .name = "db8500-vrf1",          .driver_data = (void *) DB8500_REGULATOR_VRF1, },
-        { .name = "db8500-sva-mmdsp",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSP, },
-        { .name = "db8500-sva-mmdsp-ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSPRET, },
-        { .name = "db8500-sva-pipe",      .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAPIPE, },
-        { .name = "db8500-sia-mmdsp",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSP, },
-        { .name = "db8500-sia-mmdsp-ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSPRET, },
-        { .name = "db8500-sia-pipe",      .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAPIPE, },
-        { .name = "db8500-sga",           .driver_data = (void *) DB8500_REGULATOR_SWITCH_SGA, },
-        { .name = "db8500-b2r2-mcde",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_B2R2_MCDE, },
-        { .name = "db8500-esram12",       .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12, },
-        { .name = "db8500-esram12-ret",   .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12RET, },
-        { .name = "db8500-esram34",       .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34, },
-        { .name = "db8500-esram34-ret",   .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34RET, },
+        { .name = "db8500_vape",          .driver_data = (void *) DB8500_REGULATOR_VAPE, },
+        { .name = "db8500_varm",          .driver_data = (void *) DB8500_REGULATOR_VARM, },
+        { .name = "db8500_vmodem",        .driver_data = (void *) DB8500_REGULATOR_VMODEM, },
+        { .name = "db8500_vpll",          .driver_data = (void *) DB8500_REGULATOR_VPLL, },
+        { .name = "db8500_vsmps1",        .driver_data = (void *) DB8500_REGULATOR_VSMPS1, },
+        { .name = "db8500_vsmps2",        .driver_data = (void *) DB8500_REGULATOR_VSMPS2, },
+        { .name = "db8500_vsmps3",        .driver_data = (void *) DB8500_REGULATOR_VSMPS3, },
+        { .name = "db8500_vrf1",          .driver_data = (void *) DB8500_REGULATOR_VRF1, },
+        { .name = "db8500_sva_mmdsp",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSP, },
+        { .name = "db8500_sva_mmdsp_ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSPRET, },
+        { .name = "db8500_sva_pipe",      .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAPIPE, },
+        { .name = "db8500_sia_mmdsp",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSP, },
+        { .name = "db8500_sia_mmdsp_ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSPRET, },
+        { .name = "db8500_sia_pipe",      .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAPIPE, },
+        { .name = "db8500_sga",           .driver_data = (void *) DB8500_REGULATOR_SWITCH_SGA, },
+        { .name = "db8500_b2r2_mcde",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_B2R2_MCDE, },
+        { .name = "db8500_esram12",       .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12, },
+        { .name = "db8500_esram12_ret",   .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12RET, },
+        { .name = "db8500_esram34",       .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34, },
+        { .name = "db8500_esram34_ret",   .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34RET, },
 };
 
 static __devinit int
diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c
index 9997d7aaca84..242851a4c1a6 100644
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -101,16 +101,20 @@ static int gpio_regulator_get_value(struct regulator_dev *dev)
 }
 
 static int gpio_regulator_set_value(struct regulator_dev *dev,
-                                        int min, int max)
+                                        int min, int max, unsigned *selector)
 {
         struct gpio_regulator_data *data = rdev_get_drvdata(dev);
-        int ptr, target, state, best_val = INT_MAX;
+        int ptr, target = 0, state, best_val = INT_MAX;
 
         for (ptr = 0; ptr < data->nr_states; ptr++)
                 if (data->states[ptr].value < best_val &&
                     data->states[ptr].value >= min &&
-                    data->states[ptr].value <= max)
+                    data->states[ptr].value <= max) {
                         target = data->states[ptr].gpios;
+                        best_val = data->states[ptr].value;
+                        if (selector)
+                                *selector = ptr;
+                }
 
         if (best_val == INT_MAX)
                 return -EINVAL;
@@ -128,7 +132,7 @@ static int gpio_regulator_set_voltage(struct regulator_dev *dev,
                                         int min_uV, int max_uV,
                                         unsigned *selector)
 {
-        return gpio_regulator_set_value(dev, min_uV, max_uV);
+        return gpio_regulator_set_value(dev, min_uV, max_uV, selector);
 }
 
 static int gpio_regulator_list_voltage(struct regulator_dev *dev,
@@ -145,7 +149,7 @@ static int gpio_regulator_list_voltage(struct regulator_dev *dev,
 static int gpio_regulator_set_current_limit(struct regulator_dev *dev,
                                         int min_uA, int max_uA)
 {
-        return gpio_regulator_set_value(dev, min_uA, max_uA);
+        return gpio_regulator_set_value(dev, min_uA, max_uA, NULL);
 }
 
 static struct regulator_ops gpio_regulator_voltage_ops = {
@@ -286,7 +290,7 @@ static int __devinit gpio_regulator_probe(struct platform_device *pdev)
 
         cfg.dev = &pdev->dev;
         cfg.init_data = config->init_data;
-        cfg.driver_data = &drvdata;
+        cfg.driver_data = drvdata;
 
         drvdata->dev = regulator_register(&drvdata->desc, &cfg);
         if (IS_ERR(drvdata->dev)) {
diff --git a/drivers/regulator/max8649.c b/drivers/regulator/max8649.c
index 1f4bb80457b3..9d540cd02dab 100644
--- a/drivers/regulator/max8649.c
+++ b/drivers/regulator/max8649.c
@@ -259,6 +259,7 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client,
         config.dev = &client->dev;
         config.init_data = pdata->regulator;
         config.driver_data = info;
+        config.regmap = info->regmap;
 
         info->regulator = regulator_register(&dcdc_desc, &config);
         if (IS_ERR(info->regulator)) {
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c
index c4435f608df7..795f75a6ac33 100644
--- a/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@ -673,7 +673,9 @@ static __devinit int palmas_probe(struct platform_device *pdev)
                         pmic->desc[id].ops = &palmas_ops_smps10;
                         pmic->desc[id].vsel_reg = PALMAS_SMPS10_CTRL;
                         pmic->desc[id].vsel_mask = SMPS10_VSEL;
-                        pmic->desc[id].enable_reg = PALMAS_SMPS10_STATUS;
+                        pmic->desc[id].enable_reg =
+                                        PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE,
+                                                        PALMAS_SMPS10_STATUS);
                         pmic->desc[id].enable_mask = SMPS10_BOOST_EN;
                 }
 
@@ -739,7 +741,8 @@ static __devinit int palmas_probe(struct platform_device *pdev)
 
                 pmic->desc[id].type = REGULATOR_VOLTAGE;
                 pmic->desc[id].owner = THIS_MODULE;
-                pmic->desc[id].enable_reg = palmas_regs_info[id].ctrl_addr;
+                pmic->desc[id].enable_reg = PALMAS_BASE_TO_REG(PALMAS_LDO_BASE,
+                                                palmas_regs_info[id].ctrl_addr);
                 pmic->desc[id].enable_mask = PALMAS_LDO1_CTRL_MODE_ACTIVE;
 
                 if (pdata && pdata->reg_data)
@@ -775,9 +778,6 @@ static __devinit int palmas_probe(struct platform_device *pdev)
 err_unregister_regulator:
         while (--id >= 0)
                 regulator_unregister(pmic->rdev[id]);
-        kfree(pmic->rdev);
-        kfree(pmic->desc);
-        kfree(pmic);
         return ret;
 }
 
@@ -788,10 +788,6 @@ static int __devexit palmas_remove(struct platform_device *pdev)
 
         for (id = 0; id < PALMAS_NUM_REGS; id++)
                 regulator_unregister(pmic->rdev[id]);
-
-        kfree(pmic->rdev);
-        kfree(pmic->desc);
-        kfree(pmic);
         return 0;
 }
 
diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
index 290d6fc01029..9caadb482178 100644
--- a/drivers/regulator/s5m8767.c
+++ b/drivers/regulator/s5m8767.c
@@ -451,7 +451,7 @@ static int s5m8767_set_voltage_time_sel(struct regulator_dev *rdev,
 
         desc = reg_voltage_map[reg_id];
 
-        if (old_sel < new_sel)
+        if ((old_sel < new_sel) && s5m8767->ramp_delay)
                 return DIV_ROUND_UP(desc->step * (new_sel - old_sel),
                                         s5m8767->ramp_delay * 1000);
         return 0;
diff --git a/drivers/regulator/tps65023-regulator.c b/drivers/regulator/tps65023-regulator.c
index f841bd0db6aa..8f1be8586c72 100644
--- a/drivers/regulator/tps65023-regulator.c
+++ b/drivers/regulator/tps65023-regulator.c
@@ -71,7 +71,7 @@
 
 /* LDO_CTRL bitfields */
 #define TPS65023_LDO_CTRL_LDOx_SHIFT(ldo_id)    ((ldo_id)*4)
-#define TPS65023_LDO_CTRL_LDOx_MASK(ldo_id)     (0x0F << ((ldo_id)*4))
+#define TPS65023_LDO_CTRL_LDOx_MASK(ldo_id)     (0x07 << ((ldo_id)*4))
 
 /* Number of step-down converters available */
 #define TPS65023_NUM_DCDC               3
diff --git a/drivers/regulator/tps6524x-regulator.c b/drivers/regulator/tps6524x-regulator.c
index b88b3df82381..1b299aacf22f 100644
--- a/drivers/regulator/tps6524x-regulator.c
+++ b/drivers/regulator/tps6524x-regulator.c
@@ -482,7 +482,7 @@ static int get_voltage_sel(struct regulator_dev *rdev)
         info    = &supply_info[rdev_get_id(rdev)];
 
         if (info->flags & FIXED_VOLTAGE)
-                return info->fixed_voltage;
+                return 0;
 
         ret = read_field(hw, &info->voltage);
         if (ret < 0)
diff --git a/drivers/remoteproc/omap_remoteproc.c b/drivers/remoteproc/omap_remoteproc.c
index 69425c4e86f3..de138e30d3e6 100644
--- a/drivers/remoteproc/omap_remoteproc.c
+++ b/drivers/remoteproc/omap_remoteproc.c
@@ -182,7 +182,7 @@ static int __devinit omap_rproc_probe(struct platform_device *pdev)
 
         ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
         if (ret) {
-                dev_err(pdev->dev.parent, "dma_set_coherent_mask: %d\n", ret);
+                dev_err(&pdev->dev, "dma_set_coherent_mask: %d\n", ret);
                 return ret;
         }
 
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 8ea7bccc7100..66324ee4678f 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -247,7 +247,7 @@ rproc_load_segments(struct rproc *rproc, const u8 *elf_data, size_t len)
                 }
 
                 if (offset + filesz > len) {
-                        dev_err(dev, "truncated fw: need 0x%x avail 0x%x\n",
+                        dev_err(dev, "truncated fw: need 0x%x avail 0x%zx\n",
                                         offset + filesz, len);
                         ret = -EINVAL;
                         break;
@@ -934,7 +934,7 @@ static void rproc_resource_cleanup(struct rproc *rproc)
                 unmapped = iommu_unmap(rproc->domain, entry->da, entry->len);
                 if (unmapped != entry->len) {
                         /* nothing much to do besides complaining */
-                        dev_err(dev, "failed to unmap %u/%u\n", entry->len,
+                        dev_err(dev, "failed to unmap %u/%zu\n", entry->len,
                                                                 unmapped);
                 }
 
@@ -1020,7 +1020,7 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
 
         ehdr = (struct elf32_hdr *)fw->data;
 
-        dev_info(dev, "Booting fw image %s, size %d\n", name, fw->size);
+        dev_info(dev, "Booting fw image %s, size %zd\n", name, fw->size);
 
         /*
          * if enabling an IOMMU isn't relevant for this rproc, this is
@@ -1041,8 +1041,10 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
 
         /* look for the resource table */
         table = rproc_find_rsc_table(rproc, fw->data, fw->size, &tablesz);
-        if (!table)
+        if (!table) {
+                ret = -EINVAL;
                 goto clean_up;
+        }
 
         /* handle fw resources which are required to boot rproc */
         ret = rproc_handle_boot_rsc(rproc, table, tablesz);
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c
index 6102ef2cb2d8..9d46fcbe7755 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -1792,7 +1792,7 @@ static inline void _base_writeq(__u64 b, volatile void __iomem *addr,
 static inline u8
 _base_get_msix_index(struct MPT2SAS_ADAPTER *ioc)
 {
-        return ioc->cpu_msix_table[smp_processor_id()];
+        return ioc->cpu_msix_table[raw_smp_processor_id()];
 }
 
 /**
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index 04f80ebf09eb..6986552b47e6 100644
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -26,7 +26,6 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/types.h>
-#include <linux/version.h>
 #include <linux/blkdev.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
@@ -2477,11 +2476,9 @@ static void qlt_do_ctio_completion(struct scsi_qla_host *vha, uint32_t handle,
         }
 
         cmd = qlt_ctio_to_cmd(vha, handle, ctio);
-        if (cmd == NULL) {
-                if (status != CTIO_SUCCESS)
-                        qlt_term_ctio_exchange(vha, ctio, NULL, status);
+        if (cmd == NULL)
                 return;
-        }
+
         se_cmd = &cmd->se_cmd;
         tfo = se_cmd->se_tfo;
 
@@ -2727,10 +2724,12 @@ static void qlt_do_work(struct work_struct *work)
 out_term:
         ql_dbg(ql_dbg_tgt_mgt, vha, 0xf020, "Terminating work cmd %p", cmd);
         /*
-         * cmd has not sent to target yet, so pass NULL as the second argument
+         * cmd has not sent to target yet, so pass NULL as the second
+         * argument to qlt_send_term_exchange() and free the memory here.
          */
         spin_lock_irqsave(&ha->hardware_lock, flags);
         qlt_send_term_exchange(vha, NULL, &cmd->atio, 1);
+        kmem_cache_free(qla_tgt_cmd_cachep, cmd);
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
         if (sess)
                 ha->tgt.tgt_ops->put_sess(sess);
diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h
index 9ec19bc2f0fe..9f9ef1644fd9 100644
--- a/drivers/scsi/qla2xxx/qla_target.h
+++ b/drivers/scsi/qla2xxx/qla_target.h
@@ -919,7 +919,6 @@ struct qla_tgt_srr_ctio {
 #define QLA_TGT_XMIT_STATUS             2
 #define QLA_TGT_XMIT_ALL                (QLA_TGT_XMIT_STATUS|QLA_TGT_XMIT_DATA)
 
-#include <linux/version.h>
 
 extern struct qla_tgt_data qla_target;
 /*
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
index 436598f57404..6e64314dbbb3 100644
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -137,13 +137,15 @@ static char *tcm_qla2xxx_get_fabric_name(void)
  */
 static int tcm_qla2xxx_npiv_extract_wwn(const char *ns, u64 *nm)
 {
-        unsigned int i, j, value;
+        unsigned int i, j;
         u8 wwn[8];
 
         memset(wwn, 0, sizeof(wwn));
 
         /* Validate and store the new name */
         for (i = 0, j = 0; i < 16; i++) {
+                int value;
+
                 value = hex_to_bin(*ns++);
                 if (value >= 0)
                         j = (j << 4) | value;
@@ -652,8 +654,8 @@ static int tcm_qla2xxx_handle_data(struct qla_tgt_cmd *cmd)
 /*
  * Called from qla_target.c:qlt_issue_task_mgmt()
  */
-int tcm_qla2xxx_handle_tmr(struct qla_tgt_mgmt_cmd *mcmd, uint32_t lun,
-                        uint8_t tmr_func, uint32_t tag)
+static int tcm_qla2xxx_handle_tmr(struct qla_tgt_mgmt_cmd *mcmd, uint32_t lun,
+        uint8_t tmr_func, uint32_t tag)
 {
         struct qla_tgt_sess *sess = mcmd->sess;
         struct se_cmd *se_cmd = &mcmd->se_cmd;
@@ -762,65 +764,8 @@ static u16 tcm_qla2xxx_set_fabric_sense_len(struct se_cmd *se_cmd,
 struct target_fabric_configfs *tcm_qla2xxx_fabric_configfs;
 struct target_fabric_configfs *tcm_qla2xxx_npiv_fabric_configfs;
 
-static int tcm_qla2xxx_setup_nacl_from_rport(
-        struct se_portal_group *se_tpg,
-        struct se_node_acl *se_nacl,
-        struct tcm_qla2xxx_lport *lport,
-        struct tcm_qla2xxx_nacl *nacl,
-        u64 rport_wwnn)
-{
-        struct scsi_qla_host *vha = lport->qla_vha;
-        struct Scsi_Host *sh = vha->host;
-        struct fc_host_attrs *fc_host = shost_to_fc_host(sh);
-        struct fc_rport *rport;
-        unsigned long flags;
-        void *node;
-        int rc;
-
-        /*
-         * Scan the existing rports, and create a session for the
-         * explict NodeACL is an matching rport->node_name already
-         * exists.
-         */
-        spin_lock_irqsave(sh->host_lock, flags);
-        list_for_each_entry(rport, &fc_host->rports, peers) {
-                if (rport_wwnn != rport->node_name)
-                        continue;
-
-                pr_debug("Located existing rport_wwpn and rport->node_name: 0x%016LX, port_id: 0x%04x\n",
-                    rport->node_name, rport->port_id);
-                nacl->nport_id = rport->port_id;
-
-                spin_unlock_irqrestore(sh->host_lock, flags);
-
-                spin_lock_irqsave(&vha->hw->hardware_lock, flags);
-                node = btree_lookup32(&lport->lport_fcport_map, rport->port_id);
-                if (node) {
-                        rc = btree_update32(&lport->lport_fcport_map,
-                                            rport->port_id, se_nacl);
-                } else {
-                        rc = btree_insert32(&lport->lport_fcport_map,
-                                            rport->port_id, se_nacl,
-                                            GFP_ATOMIC);
-                }
-                spin_unlock_irqrestore(&vha->hw->hardware_lock, flags);
-
-                if (rc) {
-                        pr_err("Unable to insert se_nacl into fcport_map");
-                        WARN_ON(rc > 0);
-                        return rc;
-                }
-
-                pr_debug("Inserted into fcport_map: %p for WWNN: 0x%016LX, port_id: 0x%08x\n",
-                    se_nacl, rport_wwnn, nacl->nport_id);
-
-                return 1;
-        }
-        spin_unlock_irqrestore(sh->host_lock, flags);
-
-        return 0;
-}
-
+static void tcm_qla2xxx_clear_sess_lookup(struct tcm_qla2xxx_lport *,
+                        struct tcm_qla2xxx_nacl *, struct qla_tgt_sess *);
 /*
  * Expected to be called with struct qla_hw_data->hardware_lock held
  */
@@ -842,11 +787,40 @@ static void tcm_qla2xxx_clear_nacl_from_fcport_map(struct qla_tgt_sess *sess)
 
         pr_debug("Removed from fcport_map: %p for WWNN: 0x%016LX, port_id: 0x%06x\n",
             se_nacl, nacl->nport_wwnn, nacl->nport_id);
+        /*
+         * Now clear the se_nacl and session pointers from our HW lport lookup
+         * table mapping for this initiator's fabric S_ID and LOOP_ID entries.
+         *
+         * This is done ahead of callbacks into tcm_qla2xxx_free_session() ->
+         * target_wait_for_sess_cmds() before the session waits for outstanding
+         * I/O to complete, to avoid a race between session shutdown execution
+         * and incoming ATIOs or TMRs picking up a stale se_node_act reference.
+         */
+        tcm_qla2xxx_clear_sess_lookup(lport, nacl, sess);
+}
+
+static void tcm_qla2xxx_release_session(struct kref *kref)
+{
+        struct se_session *se_sess = container_of(kref,
+                        struct se_session, sess_kref);
+
+        qlt_unreg_sess(se_sess->fabric_sess_ptr);
+}
+
+static void tcm_qla2xxx_put_session(struct se_session *se_sess)
+{
+        struct qla_tgt_sess *sess = se_sess->fabric_sess_ptr;
+        struct qla_hw_data *ha = sess->vha->hw;
+        unsigned long flags;
+
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+        kref_put(&se_sess->sess_kref, tcm_qla2xxx_release_session);
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
 }
 
 static void tcm_qla2xxx_put_sess(struct qla_tgt_sess *sess)
 {
-        target_put_session(sess->se_sess);
+        tcm_qla2xxx_put_session(sess->se_sess);
 }
 
 static void tcm_qla2xxx_shutdown_sess(struct qla_tgt_sess *sess)
@@ -859,14 +833,10 @@ static struct se_node_acl *tcm_qla2xxx_make_nodeacl(
         struct config_group *group,
         const char *name)
 {
-        struct se_wwn *se_wwn = se_tpg->se_tpg_wwn;
-        struct tcm_qla2xxx_lport *lport = container_of(se_wwn,
-                                struct tcm_qla2xxx_lport, lport_wwn);
         struct se_node_acl *se_nacl, *se_nacl_new;
         struct tcm_qla2xxx_nacl *nacl;
         u64 wwnn;
         u32 qla2xxx_nexus_depth;
-        int rc;
 
         if (tcm_qla2xxx_parse_wwn(name, &wwnn, 1) < 0)
                 return ERR_PTR(-EINVAL);
@@ -893,16 +863,6 @@ static struct se_node_acl *tcm_qla2xxx_make_nodeacl(
         nacl = container_of(se_nacl, struct tcm_qla2xxx_nacl, se_node_acl);
         nacl->nport_wwnn = wwnn;
         tcm_qla2xxx_format_wwn(&nacl->nport_name[0], TCM_QLA2XXX_NAMELEN, wwnn);
-        /*
-         * Setup a se_nacl handle based on an a matching struct fc_rport setup
-         * via drivers/scsi/qla2xxx/qla_init.c:qla2x00_reg_remote_port()
-         */
-        rc = tcm_qla2xxx_setup_nacl_from_rport(se_tpg, se_nacl, lport,
-                                        nacl, wwnn);
-        if (rc < 0) {
-                tcm_qla2xxx_release_fabric_acl(se_tpg, se_nacl_new);
-                return ERR_PTR(rc);
-        }
 
         return se_nacl;
 }
@@ -1390,6 +1350,25 @@ static void tcm_qla2xxx_set_sess_by_loop_id(
             nacl->qla_tgt_sess, new_se_nacl, new_se_nacl->initiatorname);
 }
 
+/*
+ * Should always be called with qla_hw_data->hardware_lock held.
+ */
+static void tcm_qla2xxx_clear_sess_lookup(struct tcm_qla2xxx_lport *lport,
+                struct tcm_qla2xxx_nacl *nacl, struct qla_tgt_sess *sess)
+{
+        struct se_session *se_sess = sess->se_sess;
+        unsigned char be_sid[3];
+
+        be_sid[0] = sess->s_id.b.domain;
+        be_sid[1] = sess->s_id.b.area;
+        be_sid[2] = sess->s_id.b.al_pa;
+
+        tcm_qla2xxx_set_sess_by_s_id(lport, NULL, nacl, se_sess,
+                                sess, be_sid);
+        tcm_qla2xxx_set_sess_by_loop_id(lport, NULL, nacl, se_sess,
+                                sess, sess->loop_id);
+}
+
 static void tcm_qla2xxx_free_session(struct qla_tgt_sess *sess)
 {
         struct qla_tgt *tgt = sess->tgt;
@@ -1398,8 +1377,6 @@ static void tcm_qla2xxx_free_session(struct qla_tgt_sess *sess)
         struct se_node_acl *se_nacl;
         struct tcm_qla2xxx_lport *lport;
         struct tcm_qla2xxx_nacl *nacl;
-        unsigned char be_sid[3];
-        unsigned long flags;
 
         BUG_ON(in_interrupt());
 
@@ -1419,21 +1396,6 @@ static void tcm_qla2xxx_free_session(struct qla_tgt_sess *sess)
                 return;
         }
         target_wait_for_sess_cmds(se_sess, 0);
-        /*
-         * And now clear the se_nacl and session pointers from our HW lport
-         * mappings for fabric S_ID and LOOP_ID.
-         */
-        memset(&be_sid, 0, 3);
-        be_sid[0] = sess->s_id.b.domain;
-        be_sid[1] = sess->s_id.b.area;
-        be_sid[2] = sess->s_id.b.al_pa;
-
-        spin_lock_irqsave(&ha->hardware_lock, flags);
-        tcm_qla2xxx_set_sess_by_s_id(lport, NULL, nacl, se_sess,
-                        sess, be_sid);
-        tcm_qla2xxx_set_sess_by_loop_id(lport, NULL, nacl, se_sess,
-                        sess, sess->loop_id);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
         transport_deregister_session_configfs(sess->se_sess);
         transport_deregister_session(sess->se_sess);
@@ -1731,6 +1693,7 @@ static struct target_core_fabric_ops tcm_qla2xxx_ops = {
         .new_cmd_map                    = NULL,
         .check_stop_free                = tcm_qla2xxx_check_stop_free,
         .release_cmd                    = tcm_qla2xxx_release_cmd,
+        .put_session                    = tcm_qla2xxx_put_session,
         .shutdown_session               = tcm_qla2xxx_shutdown_session,
         .close_session                  = tcm_qla2xxx_close_session,
         .sess_get_index                 = tcm_qla2xxx_sess_get_index,
@@ -1779,6 +1742,7 @@ static struct target_core_fabric_ops tcm_qla2xxx_npiv_ops = {
         .tpg_release_fabric_acl         = tcm_qla2xxx_release_fabric_acl,
         .tpg_get_inst_index             = tcm_qla2xxx_tpg_get_inst_index,
         .release_cmd                    = tcm_qla2xxx_release_cmd,
+        .put_session                    = tcm_qla2xxx_put_session,
         .shutdown_session               = tcm_qla2xxx_shutdown_session,
         .close_session                  = tcm_qla2xxx_close_session,
         .sess_get_index                 = tcm_qla2xxx_sess_get_index,
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 61c82a345f82..bbbc9c918d4c 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -90,11 +90,9 @@ unsigned int scsi_logging_level;
 EXPORT_SYMBOL(scsi_logging_level);
 #endif
 
-#if IS_ENABLED(CONFIG_PM) || IS_ENABLED(CONFIG_BLK_DEV_SD)
-/* sd and scsi_pm need to coordinate flushing async actions */
+/* sd, scsi core and power management need to coordinate flushing async actions */
 LIST_HEAD(scsi_sd_probe_domain);
 EXPORT_SYMBOL(scsi_sd_probe_domain);
-#endif
 
 /* NB: These are exposed through /proc/scsi/scsi and form part of the ABI.
  * You may not alter any existing entry (although adding new ones is
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 6f0a4c612b3b..6f72b80121a0 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1899,6 +1899,8 @@ static int sd_try_rc16_first(struct scsi_device *sdp)
 {
         if (sdp->host->max_cmd_len < 16)
                 return 0;
+        if (sdp->try_rc_10_first)
+                return 0;
         if (sdp->scsi_level > SCSI_SPC_2)
                 return 1;
         if (scsi_device_protection(sdp))
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 46ef5fe51db5..0c73dd4f43a0 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -801,7 +801,7 @@ static int omap2_mcspi_setup(struct spi_device *spi)
         mcspi_dma = &mcspi->dma_channels[spi->chip_select];
 
         if (!cs) {
-                cs = devm_kzalloc(&spi->dev , sizeof *cs, GFP_KERNEL);
+                cs = kzalloc(sizeof *cs, GFP_KERNEL);
                 if (!cs)
                         return -ENOMEM;
                 cs->base = mcspi->base + spi->chip_select * 0x14;
@@ -842,6 +842,7 @@ static void omap2_mcspi_cleanup(struct spi_device *spi)
                 cs = spi->controller_state;
                 list_del(&cs->node);
 
+                kfree(cs);
         }
 
         if (spi->chip_select < spi->master->num_chipselect) {
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index 1c3d6386ea36..aeac1caba3f9 100644
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -30,6 +30,7 @@
 #include <linux/pci.h>
 #include <linux/usb.h>
 #include <linux/errno.h>
+#include <linux/kconfig.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/fcntl.h>
@@ -981,6 +982,8 @@ void comedi_pci_driver_unregister(struct comedi_driver *comedi_driver,
 }
 EXPORT_SYMBOL_GPL(comedi_pci_driver_unregister);
 
+#if IS_ENABLED(CONFIG_USB)
+
 static int comedi_old_usb_auto_config(struct usb_interface *intf,
                                       struct comedi_driver *driver)
 {
@@ -1043,3 +1046,5 @@ void comedi_usb_driver_unregister(struct comedi_driver *comedi_driver,
         comedi_driver_unregister(comedi_driver);
 }
 EXPORT_SYMBOL_GPL(comedi_usb_driver_unregister);
+
+#endif
diff --git a/drivers/staging/gdm72xx/netlink_k.c b/drivers/staging/gdm72xx/netlink_k.c
index 292af0f7f451..51665132c61b 100644
--- a/drivers/staging/gdm72xx/netlink_k.c
+++ b/drivers/staging/gdm72xx/netlink_k.c
@@ -104,7 +104,7 @@ struct sock *netlink_init(int unit, void (*cb)(struct net_device *dev, u16 type,
 
 void netlink_exit(struct sock *sock)
 {
-        sock_release(sock->sk_socket);
+        netlink_kernel_release(sock);
 }
 
 int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
diff --git a/drivers/staging/iio/Documentation/device.txt b/drivers/staging/iio/Documentation/device.txt
index 0338c7cd0a8b..f03fbd3bb454 100644
--- a/drivers/staging/iio/Documentation/device.txt
+++ b/drivers/staging/iio/Documentation/device.txt
@@ -29,8 +29,6 @@ Then fill in the following:
         * info->driver_module:
                 Set to THIS_MODULE. Used to ensure correct ownership
                 of various resources allocate by the core.
-        * info->num_interrupt_lines:
-                Number of event triggering hardware lines the device has.
         * info->event_attrs:
                 Attributes used to enable / disable hardware events.
         * info->attrs:
diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
index 2490dd25093b..8f1b3af02f29 100644
--- a/drivers/staging/iio/adc/Kconfig
+++ b/drivers/staging/iio/adc/Kconfig
@@ -13,6 +13,7 @@ config AD7291
 config AD7298
         tristate "Analog Devices AD7298 ADC driver"
         depends on SPI
+        select IIO_KFIFO_BUF if IIO_BUFFER
         help
           Say yes here to build support for Analog Devices AD7298
           8 Channel ADC with temperature sensor.
diff --git a/drivers/staging/iio/adc/ad7606_core.c b/drivers/staging/iio/adc/ad7606_core.c
index 10ab6dc823b9..a13afff2dfe6 100644
--- a/drivers/staging/iio/adc/ad7606_core.c
+++ b/drivers/staging/iio/adc/ad7606_core.c
@@ -235,7 +235,8 @@ static const struct attribute_group ad7606_attribute_group_range = {
                 .indexed = 1,                                   \
                 .channel = num,                                 \
                 .address = num,                                 \
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,    \
+                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |   \
+                                IIO_CHAN_INFO_SCALE_SHARED_BIT, \
                 .scan_index = num,                              \
                 .scan_type = IIO_ST('s', 16, 16, 0),            \
         }
diff --git a/drivers/staging/media/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c
index 3295ea63f3eb..97ef67036e3f 100644
--- a/drivers/staging/media/lirc/lirc_serial.c
+++ b/drivers/staging/media/lirc/lirc_serial.c
@@ -129,6 +129,7 @@ static void send_space_homebrew(long length);
 
 static struct lirc_serial hardware[] = {
         [LIRC_HOMEBREW] = {
+                .lock = __SPIN_LOCK_UNLOCKED(hardware[LIRC_HOMEBREW].lock),
                 .signal_pin        = UART_MSR_DCD,
                 .signal_pin_change = UART_MSR_DDCD,
                 .on  = (UART_MCR_RTS | UART_MCR_OUT2 | UART_MCR_DTR),
@@ -145,6 +146,7 @@ static struct lirc_serial hardware[] = {
         },
 
         [LIRC_IRDEO] = {
+                .lock = __SPIN_LOCK_UNLOCKED(hardware[LIRC_IRDEO].lock),
                 .signal_pin        = UART_MSR_DSR,
                 .signal_pin_change = UART_MSR_DDSR,
                 .on  = UART_MCR_OUT2,
@@ -156,6 +158,7 @@ static struct lirc_serial hardware[] = {
         },
 
         [LIRC_IRDEO_REMOTE] = {
+                .lock = __SPIN_LOCK_UNLOCKED(hardware[LIRC_IRDEO_REMOTE].lock),
                 .signal_pin        = UART_MSR_DSR,
                 .signal_pin_change = UART_MSR_DDSR,
                 .on  = (UART_MCR_RTS | UART_MCR_DTR | UART_MCR_OUT2),
@@ -167,6 +170,7 @@ static struct lirc_serial hardware[] = {
         },
 
         [LIRC_ANIMAX] = {
+                .lock = __SPIN_LOCK_UNLOCKED(hardware[LIRC_ANIMAX].lock),
                 .signal_pin        = UART_MSR_DCD,
                 .signal_pin_change = UART_MSR_DDCD,
                 .on  = 0,
@@ -177,6 +181,7 @@ static struct lirc_serial hardware[] = {
         },
 
         [LIRC_IGOR] = {
+                .lock = __SPIN_LOCK_UNLOCKED(hardware[LIRC_IGOR].lock),
                 .signal_pin        = UART_MSR_DSR,
                 .signal_pin_change = UART_MSR_DDSR,
                 .on  = (UART_MCR_RTS | UART_MCR_OUT2 | UART_MCR_DTR),
@@ -201,6 +206,7 @@ static struct lirc_serial hardware[] = {
          * See also http://www.nslu2-linux.org for this device
          */
         [LIRC_NSLU2] = {
+                .lock = __SPIN_LOCK_UNLOCKED(hardware[LIRC_NSLU2].lock),
                 .signal_pin        = UART_MSR_CTS,
                 .signal_pin_change = UART_MSR_DCTS,
                 .on  = (UART_MCR_RTS | UART_MCR_OUT2 | UART_MCR_DTR),
diff --git a/drivers/staging/omapdrm/omap_fbdev.c b/drivers/staging/omapdrm/omap_fbdev.c
index 11acd4c35ed2..8c6ed3b0c6f6 100644
--- a/drivers/staging/omapdrm/omap_fbdev.c
+++ b/drivers/staging/omapdrm/omap_fbdev.c
@@ -208,7 +208,8 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
          */
         ret = omap_gem_get_paddr(fbdev->bo, &paddr, true);
         if (ret) {
-                dev_err(dev->dev, "could not map (paddr)!\n");
+                dev_err(dev->dev,
+                        "could not map (paddr)!  Skipping framebuffer alloc\n");
                 ret = -ENOMEM;
                 goto fail;
         }
@@ -388,8 +389,11 @@ void omap_fbdev_free(struct drm_device *dev)
 
         fbi = helper->fbdev;
 
-        unregister_framebuffer(fbi);
-        framebuffer_release(fbi);
+        /* only cleanup framebuffer if it is present */
+        if (fbi) {
+                unregister_framebuffer(fbi);
+                framebuffer_release(fbi);
+        }
 
         drm_fb_helper_fini(helper);
 
diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c
index 9bd18e2d0513..69f616c6964e 100644
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -102,6 +102,8 @@ static struct usb_device_id rtl871x_usb_id_tbl[] = {
         /* - */
         {USB_DEVICE(0x20F4, 0x646B)},
         {USB_DEVICE(0x083A, 0xC512)},
+        {USB_DEVICE(0x25D4, 0x4CA1)},
+        {USB_DEVICE(0x25D4, 0x4CAB)},
 
 /* RTL8191SU */
         /* Realtek */
diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c
index e624b836469c..91799973081a 100644
--- a/drivers/target/target_core_alua.c
+++ b/drivers/target/target_core_alua.c
@@ -374,8 +374,9 @@ int target_emulate_set_target_port_groups(struct se_cmd *cmd)
 
 out:
         transport_kunmap_data_sg(cmd);
-        target_complete_cmd(cmd, GOOD);
-        return 0;
+        if (!rc)
+                target_complete_cmd(cmd, GOOD);
+        return rc;
 }
 
 static inline int core_alua_state_nonoptimized(
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index b05fdc0c05d3..634d0f31a28c 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -315,7 +315,7 @@ void transport_register_session(
 }
 EXPORT_SYMBOL(transport_register_session);
 
-static void target_release_session(struct kref *kref)
+void target_release_session(struct kref *kref)
 {
         struct se_session *se_sess = container_of(kref,
                         struct se_session, sess_kref);
@@ -332,6 +332,12 @@ EXPORT_SYMBOL(target_get_session);
 
 void target_put_session(struct se_session *se_sess)
 {
+        struct se_portal_group *tpg = se_sess->se_tpg;
+
+        if (tpg->se_tpg_tfo->put_session != NULL) {
+                tpg->se_tpg_tfo->put_session(se_sess);
+                return;
+        }
         kref_put(&se_sess->sess_kref, target_release_session);
 }
 EXPORT_SYMBOL(target_put_session);
diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
index d3d91dae065c..944eaeb8e0cf 100644
--- a/drivers/tty/hvc/hvc_xen.c
+++ b/drivers/tty/hvc/hvc_xen.c
@@ -214,24 +214,24 @@ static int xen_hvm_console_init(void)
         /* already configured */
         if (info->intf != NULL)
                 return 0;
-
+        /*
+         * If the toolstack (or the hypervisor) hasn't set these values, the
+         * default value is 0. Even though mfn = 0 and evtchn = 0 are
+         * theoretically correct values, in practice they never are and they
+         * mean that a legacy toolstack hasn't initialized the pv console correctly.
+         */
         r = hvm_get_parameter(HVM_PARAM_CONSOLE_EVTCHN, &v);
-        if (r < 0) {
-                kfree(info);
-                return -ENODEV;
-        }
+        if (r < 0 || v == 0)
+                goto err;
         info->evtchn = v;
-        hvm_get_parameter(HVM_PARAM_CONSOLE_PFN, &v);
-        if (r < 0) {
-                kfree(info);
-                return -ENODEV;
-        }
+        v = 0;
+        r = hvm_get_parameter(HVM_PARAM_CONSOLE_PFN, &v);
+        if (r < 0 || v == 0)
+                goto err;
         mfn = v;
         info->intf = ioremap(mfn << PAGE_SHIFT, PAGE_SIZE);
-        if (info->intf == NULL) {
-                kfree(info);
-                return -ENODEV;
-        }
+        if (info->intf == NULL)
+                goto err;
         info->vtermno = HVC_COOKIE;
 
         spin_lock(&xencons_lock);
@@ -239,6 +239,9 @@ static int xen_hvm_console_init(void)
         spin_unlock(&xencons_lock);
 
         return 0;
+err:
+        kfree(info);
+        return -ENODEV;
 }
 
 static int xen_pv_console_init(void)
diff --git a/drivers/tty/serial/8250/8250.c b/drivers/tty/serial/8250/8250.c
index 47d061b9ad4d..6e1958a325bd 100644
--- a/drivers/tty/serial/8250/8250.c
+++ b/drivers/tty/serial/8250/8250.c
@@ -3113,7 +3113,7 @@ static struct uart_8250_port *serial8250_find_match_or_unused(struct uart_port *
 
 /**
  *      serial8250_register_8250_port - register a serial port
- *      @port: serial port template
+ *      @up: serial port template
  *
  *      Configure the serial port specified by the request. If the
  *      port exists and is in use, it is hung up and unregistered
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 4ad721fb8405..c17923ec6e95 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -133,6 +133,10 @@ struct pl011_dmatx_data {
 struct uart_amba_port {
         struct uart_port        port;
         struct clk              *clk;
+        /* Two optional pin states - default & sleep */
+        struct pinctrl          *pinctrl;
+        struct pinctrl_state    *pins_default;
+        struct pinctrl_state    *pins_sleep;
         const struct vendor_data *vendor;
         unsigned int            dmacr;          /* dma control reg */
         unsigned int            im;             /* interrupt mask */
@@ -1312,6 +1316,14 @@ static int pl011_startup(struct uart_port *port)
         unsigned int cr;
         int retval;
 
+        /* Optionaly enable pins to be muxed in and configured */
+        if (!IS_ERR(uap->pins_default)) {
+                retval = pinctrl_select_state(uap->pinctrl, uap->pins_default);
+                if (retval)
+                        dev_err(port->dev,
+                                "could not set default pins\n");
+        }
+
         retval = clk_prepare(uap->clk);
         if (retval)
                 goto out;
@@ -1420,6 +1432,7 @@ static void pl011_shutdown(struct uart_port *port)
 {
         struct uart_amba_port *uap = (struct uart_amba_port *)port;
         unsigned int cr;
+        int retval;
 
         /*
          * disable all interrupts
@@ -1462,6 +1475,14 @@ static void pl011_shutdown(struct uart_port *port)
          */
         clk_disable(uap->clk);
         clk_unprepare(uap->clk);
+        /* Optionally let pins go into sleep states */
+        if (!IS_ERR(uap->pins_sleep)) {
+                retval = pinctrl_select_state(uap->pinctrl, uap->pins_sleep);
+                if (retval)
+                        dev_err(port->dev,
+                                "could not set pins to sleep state\n");
+        }
+
 
         if (uap->port.dev->platform_data) {
                 struct amba_pl011_data *plat;
@@ -1792,6 +1813,14 @@ static int __init pl011_console_setup(struct console *co, char *options)
         if (!uap)
                 return -ENODEV;
 
+        /* Allow pins to be muxed in and configured */
+        if (!IS_ERR(uap->pins_default)) {
+                ret = pinctrl_select_state(uap->pinctrl, uap->pins_default);
+                if (ret)
+                        dev_err(uap->port.dev,
+                                "could not set default pins\n");
+        }
+
         ret = clk_prepare(uap->clk);
         if (ret)
                 return ret;
@@ -1844,7 +1873,6 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
 {
         struct uart_amba_port *uap;
         struct vendor_data *vendor = id->data;
-        struct pinctrl *pinctrl;
         void __iomem *base;
         int i, ret;
 
@@ -1869,11 +1897,20 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
                 goto free;
         }
 
-        pinctrl = devm_pinctrl_get_select_default(&dev->dev);
-        if (IS_ERR(pinctrl)) {
-                ret = PTR_ERR(pinctrl);
+        uap->pinctrl = devm_pinctrl_get(&dev->dev);
+        if (IS_ERR(uap->pinctrl)) {
+                ret = PTR_ERR(uap->pinctrl);
                 goto unmap;
         }
+        uap->pins_default = pinctrl_lookup_state(uap->pinctrl,
+                                                 PINCTRL_STATE_DEFAULT);
+        if (IS_ERR(uap->pins_default))
+                dev_err(&dev->dev, "could not get default pinstate\n");
+
+        uap->pins_sleep = pinctrl_lookup_state(uap->pinctrl,
+                                               PINCTRL_STATE_SLEEP);
+        if (IS_ERR(uap->pins_sleep))
+                dev_dbg(&dev->dev, "could not get sleep pinstate\n");
 
         uap->clk = clk_get(&dev->dev, NULL);
         if (IS_ERR(uap->clk)) {
diff --git a/drivers/tty/serial/serial_txx9.c b/drivers/tty/serial/serial_txx9.c
index 34bd345da775..6ae2a58d62f2 100644
--- a/drivers/tty/serial/serial_txx9.c
+++ b/drivers/tty/serial/serial_txx9.c
@@ -466,7 +466,7 @@ static void serial_txx9_break_ctl(struct uart_port *port, int break_state)
         spin_unlock_irqrestore(&up->port.lock, flags);
 }
 
-#if defined(CONFIG_SERIAL_TXX9_CONSOLE) || (CONFIG_CONSOLE_POLL)
+#if defined(CONFIG_SERIAL_TXX9_CONSOLE) || defined(CONFIG_CONSOLE_POLL)
 /*
  *      Wait for transmitter & holding register to empty
  */
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 4604153b7954..1bd9163bc118 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -2179,6 +2179,16 @@ static int __devinit sci_init_single(struct platform_device *dev,
         return 0;
 }
 
+static void sci_cleanup_single(struct sci_port *port)
+{
+        sci_free_gpios(port);
+
+        clk_put(port->iclk);
+        clk_put(port->fclk);
+
+        pm_runtime_disable(port->port.dev);
+}
+
 #ifdef CONFIG_SERIAL_SH_SCI_CONSOLE
 static void serial_console_putchar(struct uart_port *port, int ch)
 {
@@ -2360,14 +2370,10 @@ static int sci_remove(struct platform_device *dev)
         cpufreq_unregister_notifier(&port->freq_transition,
                                     CPUFREQ_TRANSITION_NOTIFIER);
 
-        sci_free_gpios(port);
-
         uart_remove_one_port(&sci_uart_driver, &port->port);
 
-        clk_put(port->iclk);
-        clk_put(port->fclk);
+        sci_cleanup_single(port);
 
-        pm_runtime_disable(&dev->dev);
         return 0;
 }
 
@@ -2385,14 +2391,20 @@ static int __devinit sci_probe_single(struct platform_device *dev,
                            index+1, SCI_NPORTS);
                 dev_notice(&dev->dev, "Consider bumping "
                            "CONFIG_SERIAL_SH_SCI_NR_UARTS!\n");
-                return 0;
+                return -EINVAL;
         }
 
         ret = sci_init_single(dev, sciport, index, p);
         if (ret)
                 return ret;
 
-        return uart_add_one_port(&sci_uart_driver, &sciport->port);
+        ret = uart_add_one_port(&sci_uart_driver, &sciport->port);
+        if (ret) {
+                sci_cleanup_single(sciport);
+                return ret;
+        }
+
+        return 0;
 }
 
 static int __devinit sci_probe(struct platform_device *dev)
@@ -2413,24 +2425,22 @@ static int __devinit sci_probe(struct platform_device *dev)
 
         ret = sci_probe_single(dev, dev->id, p, sp);
         if (ret)
-                goto err_unreg;
+                return ret;
 
         sp->freq_transition.notifier_call = sci_notifier;
 
         ret = cpufreq_register_notifier(&sp->freq_transition,
                                         CPUFREQ_TRANSITION_NOTIFIER);
-        if (unlikely(ret < 0))
-                goto err_unreg;
+        if (unlikely(ret < 0)) {
+                sci_cleanup_single(sp);
+                return ret;
+        }
 
 #ifdef CONFIG_SH_STANDARD_BIOS
         sh_bios_gdb_detach();
 #endif
 
         return 0;
-
-err_unreg:
-        sci_remove(dev);
-        return ret;
 }
 
 static int sci_suspend(struct device *dev)
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index c691eea51537..f5ed3d75fa5a 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -46,7 +46,7 @@ obj-$(CONFIG_USB_MICROTEK)	+= image/
 obj-$(CONFIG_USB_SERIAL)        += serial/
 
 obj-$(CONFIG_USB)               += misc/
-obj-$(CONFIG_USB)               += phy/
+obj-$(CONFIG_USB_COMMON)        += phy/
 obj-$(CONFIG_EARLY_PRINTK_DBGP) += early/
 
 obj-$(CONFIG_USB_ATM)           += atm/
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index f2a120eea9d4..36a2a0b7b82c 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -567,6 +567,14 @@ static int acm_port_activate(struct tty_port *port, struct tty_struct *tty)
 
         usb_autopm_put_interface(acm->control);
 
+        /*
+         * Unthrottle device in case the TTY was closed while throttled.
+         */
+        spin_lock_irq(&acm->read_lock);
+        acm->throttled = 0;
+        acm->throttle_req = 0;
+        spin_unlock_irq(&acm->read_lock);
+
         if (acm_submit_read_urbs(acm, GFP_KERNEL))
                 goto error_submit_read_urbs;
 
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index ea8b304f0e85..8fd398dffced 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -55,6 +55,15 @@ static const struct usb_device_id wdm_ids[] = {
                 .bInterfaceSubClass = 1,
                 .bInterfaceProtocol = 9, /* NOTE: CDC ECM control interface! */
         },
+        {
+                 /* Vodafone/Huawei K5005 (12d1:14c8) and similar modems */
+                .match_flags        = USB_DEVICE_ID_MATCH_VENDOR |
+                                      USB_DEVICE_ID_MATCH_INT_INFO,
+                .idVendor           = HUAWEI_VENDOR_ID,
+                .bInterfaceClass    = USB_CLASS_VENDOR_SPEC,
+                .bInterfaceSubClass = 1,
+                .bInterfaceProtocol = 57, /* NOTE: CDC ECM control interface! */
+        },
         { }
 };
 
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
index 57ed9e400c06..622b4a48e732 100644
--- a/drivers/usb/core/hcd-pci.c
+++ b/drivers/usb/core/hcd-pci.c
@@ -493,15 +493,6 @@ static int hcd_pci_suspend_noirq(struct device *dev)
 
         pci_save_state(pci_dev);
 
-        /*
-         * Some systems crash if an EHCI controller is in D3 during
-         * a sleep transition.  We have to leave such controllers in D0.
-         */
-        if (hcd->broken_pci_sleep) {
-                dev_dbg(dev, "Staying in PCI D0\n");
-                return retval;
-        }
-
         /* If the root hub is dead rather than suspended, disallow remote
          * wakeup.  usb_hc_died() should ensure that both hosts are marked as
          * dying, so we only need to check the primary roothub.
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 04fb834c3fa1..25a7422ee657 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -3379,7 +3379,7 @@ int usb_disable_lpm(struct usb_device *udev)
                 return 0;
 
         udev->lpm_disable_count++;
-        if ((udev->u1_params.timeout == 0 && udev->u1_params.timeout == 0))
+        if ((udev->u1_params.timeout == 0 && udev->u2_params.timeout == 0))
                 return 0;
 
         /* If LPM is enabled, attempt to disable it. */
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index b548cf1dbc62..bdd1c6749d88 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1838,7 +1838,6 @@ free_interfaces:
                 intfc = cp->intf_cache[i];
                 intf->altsetting = intfc->altsetting;
                 intf->num_altsetting = intfc->num_altsetting;
-                intf->intf_assoc = find_iad(dev, cp, i);
                 kref_get(&intfc->ref);
 
                 alt = usb_altnum_to_altsetting(intf, 0);
@@ -1851,6 +1850,8 @@ free_interfaces:
                 if (!alt)
                         alt = &intf->altsetting[0];
 
+                intf->intf_assoc =
+                        find_iad(dev, cp, alt->desc.bInterfaceNumber);
                 intf->cur_altsetting = alt;
                 usb_enable_interface(dev, intf, true);
                 intf->dev.parent = &dev->dev;
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 3df1a1973b05..ec70df7aba17 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -1091,7 +1091,7 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep,
                 if (r == req) {
                         /* wait until it is processed */
                         dwc3_stop_active_transfer(dwc, dep->number);
-                        goto out0;
+                        goto out1;
                 }
                 dev_err(dwc->dev, "request %p was not queued to %s\n",
                                 request, ep->name);
@@ -1099,6 +1099,7 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep,
                 goto out0;
         }
 
+out1:
         /* giveback the request */
         dwc3_gadget_giveback(dep, req, -ECONNRESET);
 
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index e23bf7984aaf..9a9bced813ed 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -599,12 +599,6 @@ usba_ep_enable(struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc)
 
         spin_lock_irqsave(&ep->udc->lock, flags);
 
-        if (ep->ep.desc) {
-                spin_unlock_irqrestore(&ep->udc->lock, flags);
-                DBG(DBG_ERR, "ep%d already enabled\n", ep->index);
-                return -EBUSY;
-        }
-
         ep->ep.desc = desc;
         ep->ep.maxpacket = maxpacket;
 
diff --git a/drivers/usb/gadget/fsl_qe_udc.c b/drivers/usb/gadget/fsl_qe_udc.c
index 51881f3bd07a..b09452d6f33a 100644
--- a/drivers/usb/gadget/fsl_qe_udc.c
+++ b/drivers/usb/gadget/fsl_qe_udc.c
@@ -1596,7 +1596,7 @@ static int qe_ep_enable(struct usb_ep *_ep,
         ep = container_of(_ep, struct qe_ep, ep);
 
         /* catch various bogus parameters */
-        if (!_ep || !desc || ep->ep.desc || _ep->name == ep_name[0] ||
+        if (!_ep || !desc || _ep->name == ep_name[0] ||
                         (desc->bDescriptorType != USB_DT_ENDPOINT))
                 return -EINVAL;
 
diff --git a/drivers/usb/gadget/fsl_qe_udc.h b/drivers/usb/gadget/fsl_qe_udc.h
index 4c07ca9cebf3..7026919fc901 100644
--- a/drivers/usb/gadget/fsl_qe_udc.h
+++ b/drivers/usb/gadget/fsl_qe_udc.h
@@ -153,10 +153,10 @@ struct usb_ep_para{
 #define USB_BUSMODE_DTB         0x02
 
 /* Endpoint basic handle */
-#define ep_index(EP)            ((EP)->desc->bEndpointAddress & 0xF)
+#define ep_index(EP)            ((EP)->ep.desc->bEndpointAddress & 0xF)
 #define ep_maxpacket(EP)        ((EP)->ep.maxpacket)
 #define ep_is_in(EP)    ((ep_index(EP) == 0) ? (EP->udc->ep0_dir == \
-                        USB_DIR_IN) : ((EP)->desc->bEndpointAddress \
+                        USB_DIR_IN) : ((EP)->ep.desc->bEndpointAddress \
                         & USB_DIR_IN) == USB_DIR_IN)
 
 /* ep0 transfer state */
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c
index 28316858208b..bc6f9bb9994a 100644
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/fsl_udc_core.c
@@ -567,7 +567,7 @@ static int fsl_ep_enable(struct usb_ep *_ep,
         ep = container_of(_ep, struct fsl_ep, ep);
 
         /* catch various bogus parameters */
-        if (!_ep || !desc || ep->ep.desc
+        if (!_ep || !desc
                         || (desc->bDescriptorType != USB_DT_ENDPOINT))
                 return -EINVAL;
 
@@ -2575,7 +2575,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev)
         /* for ep0: the desc defined here;
          * for other eps, gadget layer called ep_enable with defined desc
          */
-        udc_controller->eps[0].desc = &fsl_ep0_desc;
+        udc_controller->eps[0].ep.desc = &fsl_ep0_desc;
         udc_controller->eps[0].ep.maxpacket = USB_MAX_CTRL_PAYLOAD;
 
         /* setup the udc->eps[] for non-control endpoints and link
diff --git a/drivers/usb/gadget/fsl_usb2_udc.h b/drivers/usb/gadget/fsl_usb2_udc.h
index 5cd7b7e7ddb4..f61a967f7082 100644
--- a/drivers/usb/gadget/fsl_usb2_udc.h
+++ b/drivers/usb/gadget/fsl_usb2_udc.h
@@ -568,10 +568,10 @@ static void dump_msg(const char *label, const u8 * buf, unsigned int length)
 /*
  * ### internal used help routines.
  */
-#define ep_index(EP)            ((EP)->desc->bEndpointAddress&0xF)
+#define ep_index(EP)            ((EP)->ep.desc->bEndpointAddress&0xF)
 #define ep_maxpacket(EP)        ((EP)->ep.maxpacket)
 #define ep_is_in(EP)    ( (ep_index(EP) == 0) ? (EP->udc->ep0_dir == \
-                        USB_DIR_IN ):((EP)->desc->bEndpointAddress \
+                        USB_DIR_IN) : ((EP)->ep.desc->bEndpointAddress \
                         & USB_DIR_IN)==USB_DIR_IN)
 #define get_ep_by_pipe(udc, pipe)       ((pipe == 1)? &udc->eps[0]: \
                                         &udc->eps[pipe])
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
index b241e6c6a7f2..3d28fb976c78 100644
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/goku_udc.c
@@ -102,7 +102,7 @@ goku_ep_enable(struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc)
         unsigned long   flags;
 
         ep = container_of(_ep, struct goku_ep, ep);
-        if (!_ep || !desc || ep->ep.desc
+        if (!_ep || !desc
                         || desc->bDescriptorType != USB_DT_ENDPOINT)
                 return -EINVAL;
         dev = ep->dev;
diff --git a/drivers/usb/gadget/lpc32xx_udc.c b/drivers/usb/gadget/lpc32xx_udc.c
index 262acfd53e32..2ab0388d93eb 100644
--- a/drivers/usb/gadget/lpc32xx_udc.c
+++ b/drivers/usb/gadget/lpc32xx_udc.c
@@ -61,6 +61,7 @@
 #include <mach/irqs.h>
 #include <mach/board.h>
 #ifdef CONFIG_USB_GADGET_DEBUG_FILES
+#include <linux/debugfs.h>
 #include <linux/seq_file.h>
 #endif
 
diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c
index dbcd1329495e..117a4bba1b8c 100644
--- a/drivers/usb/gadget/mv_udc_core.c
+++ b/drivers/usb/gadget/mv_udc_core.c
@@ -464,7 +464,7 @@ static int mv_ep_enable(struct usb_ep *_ep,
         ep = container_of(_ep, struct mv_ep, ep);
         udc = ep->udc;
 
-        if (!_ep || !desc || ep->ep.desc
+        if (!_ep || !desc
                         || desc->bDescriptorType != USB_DT_ENDPOINT)
                 return -EINVAL;
 
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 7ba32469c5bd..a460e8c204f4 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -153,7 +153,7 @@ static int omap_ep_enable(struct usb_ep *_ep,
         u16             maxp;
 
         /* catch various bogus parameters */
-        if (!_ep || !desc || ep->ep.desc
+        if (!_ep || !desc
                         || desc->bDescriptorType != USB_DT_ENDPOINT
                         || ep->bEndpointAddress != desc->bEndpointAddress
                         || ep->maxpacket < usb_endpoint_maxp(desc)) {
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index d7c8cb3bf759..f7ff9e8e746a 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -218,7 +218,7 @@ static int pxa25x_ep_enable (struct usb_ep *_ep,
         struct pxa25x_udc       *dev;
 
         ep = container_of (_ep, struct pxa25x_ep, ep);
-        if (!_ep || !desc || ep->ep.desc || _ep->name == ep0name
+        if (!_ep || !desc || _ep->name == ep0name
                         || desc->bDescriptorType != USB_DT_ENDPOINT
                         || ep->bEndpointAddress != desc->bEndpointAddress
                         || ep->fifo_size < usb_endpoint_maxp (desc)) {
diff --git a/drivers/usb/gadget/s3c-hsudc.c b/drivers/usb/gadget/s3c-hsudc.c
index 36c6836eeb0f..236b271871a0 100644
--- a/drivers/usb/gadget/s3c-hsudc.c
+++ b/drivers/usb/gadget/s3c-hsudc.c
@@ -760,7 +760,7 @@ static int s3c_hsudc_ep_enable(struct usb_ep *_ep,
         u32 ecr = 0;
 
         hsep = our_ep(_ep);
-        if (!_ep || !desc || hsep->ep.desc || _ep->name == ep0name
+        if (!_ep || !desc || _ep->name == ep0name
                 || desc->bDescriptorType != USB_DT_ENDPOINT
                 || hsep->bEndpointAddress != desc->bEndpointAddress
                 || ep_maxpacket(hsep) < usb_endpoint_maxp(desc))
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c
index 3de71d37d75e..f2e51f50e528 100644
--- a/drivers/usb/gadget/s3c2410_udc.c
+++ b/drivers/usb/gadget/s3c2410_udc.c
@@ -1062,7 +1062,7 @@ static int s3c2410_udc_ep_enable(struct usb_ep *_ep,
 
         ep = to_s3c2410_ep(_ep);
 
-        if (!_ep || !desc || ep->ep.desc
+        if (!_ep || !desc
                         || _ep->name == ep0name
                         || desc->bDescriptorType != USB_DT_ENDPOINT)
                 return -EINVAL;
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index b100f5f9f4b6..800be38c78b4 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -671,7 +671,9 @@ static int ehci_init(struct usb_hcd *hcd)
         hw = ehci->async->hw;
         hw->hw_next = QH_NEXT(ehci, ehci->async->qh_dma);
         hw->hw_info1 = cpu_to_hc32(ehci, QH_HEAD);
+#if defined(CONFIG_PPC_PS3)
         hw->hw_info1 |= cpu_to_hc32(ehci, (1 << 7));    /* I = 1 */
+#endif
         hw->hw_token = cpu_to_hc32(ehci, QTD_STS_HALT);
         hw->hw_qtd_next = EHCI_LIST_END(ehci);
         ehci->async->qh_state = QH_STATE_LINKED;
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index a44294d13494..17cfb8a1131c 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -43,6 +43,7 @@
 #include <linux/regulator/consumer.h>
 #include <linux/pm_runtime.h>
 #include <linux/gpio.h>
+#include <linux/clk.h>
 
 /* EHCI Register Set */
 #define EHCI_INSNREG04                                  (0xA0)
@@ -55,6 +56,15 @@
 #define EHCI_INSNREG05_ULPI_EXTREGADD_SHIFT             8
 #define EHCI_INSNREG05_ULPI_WRDATA_SHIFT                0
 
+/* Errata i693 */
+static struct clk       *utmi_p1_fck;
+static struct clk       *utmi_p2_fck;
+static struct clk       *xclk60mhsp1_ck;
+static struct clk       *xclk60mhsp2_ck;
+static struct clk       *usbhost_p1_fck;
+static struct clk       *usbhost_p2_fck;
+static struct clk       *init_60m_fclk;
+
 /*-------------------------------------------------------------------------*/
 
 static const struct hc_driver ehci_omap_hc_driver;
@@ -70,6 +80,41 @@ static inline u32 ehci_read(void __iomem *base, u32 reg)
         return __raw_readl(base + reg);
 }
 
+/* Erratum i693 workaround sequence */
+static void omap_ehci_erratum_i693(struct ehci_hcd *ehci)
+{
+        int ret = 0;
+
+        /* Switch to the internal 60 MHz clock */
+        ret = clk_set_parent(utmi_p1_fck, init_60m_fclk);
+        if (ret != 0)
+                ehci_err(ehci, "init_60m_fclk set parent"
+                        "failed error:%d\n", ret);
+
+        ret = clk_set_parent(utmi_p2_fck, init_60m_fclk);
+        if (ret != 0)
+                ehci_err(ehci, "init_60m_fclk set parent"
+                        "failed error:%d\n", ret);
+
+        clk_enable(usbhost_p1_fck);
+        clk_enable(usbhost_p2_fck);
+
+        /* Wait 1ms and switch back to the external clock */
+        mdelay(1);
+        ret = clk_set_parent(utmi_p1_fck, xclk60mhsp1_ck);
+        if (ret != 0)
+                ehci_err(ehci, "xclk60mhsp1_ck set parent"
+                        "failed error:%d\n", ret);
+
+        ret = clk_set_parent(utmi_p2_fck, xclk60mhsp2_ck);
+        if (ret != 0)
+                ehci_err(ehci, "xclk60mhsp2_ck set parent"
+                        "failed error:%d\n", ret);
+
+        clk_disable(usbhost_p1_fck);
+        clk_disable(usbhost_p2_fck);
+}
+
 static void omap_ehci_soft_phy_reset(struct platform_device *pdev, u8 port)
 {
         struct usb_hcd  *hcd = dev_get_drvdata(&pdev->dev);
@@ -100,6 +145,50 @@ static void omap_ehci_soft_phy_reset(struct platform_device *pdev, u8 port)
         }
 }
 
+static int omap_ehci_hub_control(
+        struct usb_hcd  *hcd,
+        u16             typeReq,
+        u16             wValue,
+        u16             wIndex,
+        char            *buf,
+        u16             wLength
+)
+{
+        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
+        u32 __iomem *status_reg = &ehci->regs->port_status[
+                                (wIndex & 0xff) - 1];
+        u32             temp;
+        unsigned long   flags;
+        int             retval = 0;
+
+        spin_lock_irqsave(&ehci->lock, flags);
+
+        if (typeReq == SetPortFeature && wValue == USB_PORT_FEAT_SUSPEND) {
+                temp = ehci_readl(ehci, status_reg);
+                if ((temp & PORT_PE) == 0 || (temp & PORT_RESET) != 0) {
+                        retval = -EPIPE;
+                        goto done;
+                }
+
+                temp &= ~PORT_WKCONN_E;
+                temp |= PORT_WKDISC_E | PORT_WKOC_E;
+                ehci_writel(ehci, temp | PORT_SUSPEND, status_reg);
+
+                omap_ehci_erratum_i693(ehci);
+
+                set_bit((wIndex & 0xff) - 1, &ehci->suspended_ports);
+                goto done;
+        }
+
+        spin_unlock_irqrestore(&ehci->lock, flags);
+
+        /* Handle the hub control events here */
+        return ehci_hub_control(hcd, typeReq, wValue, wIndex, buf, wLength);
+done:
+        spin_unlock_irqrestore(&ehci->lock, flags);
+        return retval;
+}
+
 static void disable_put_regulator(
                 struct ehci_hcd_omap_platform_data *pdata)
 {
@@ -264,8 +353,76 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
         /* root ports should always stay powered */
         ehci_port_power(omap_ehci, 1);
 
+        /* get clocks */
+        utmi_p1_fck = clk_get(dev, "utmi_p1_gfclk");
+        if (IS_ERR(utmi_p1_fck)) {
+                ret = PTR_ERR(utmi_p1_fck);
+                dev_err(dev, "utmi_p1_gfclk failed error:%d\n", ret);
+                goto err_add_hcd;
+        }
+
+        xclk60mhsp1_ck = clk_get(dev, "xclk60mhsp1_ck");
+        if (IS_ERR(xclk60mhsp1_ck)) {
+                ret = PTR_ERR(xclk60mhsp1_ck);
+                dev_err(dev, "xclk60mhsp1_ck failed error:%d\n", ret);
+                goto err_utmi_p1_fck;
+        }
+
+        utmi_p2_fck = clk_get(dev, "utmi_p2_gfclk");
+        if (IS_ERR(utmi_p2_fck)) {
+                ret = PTR_ERR(utmi_p2_fck);
+                dev_err(dev, "utmi_p2_gfclk failed error:%d\n", ret);
+                goto err_xclk60mhsp1_ck;
+        }
+
+        xclk60mhsp2_ck = clk_get(dev, "xclk60mhsp2_ck");
+        if (IS_ERR(xclk60mhsp2_ck)) {
+                ret = PTR_ERR(xclk60mhsp2_ck);
+                dev_err(dev, "xclk60mhsp2_ck failed error:%d\n", ret);
+                goto err_utmi_p2_fck;
+        }
+
+        usbhost_p1_fck = clk_get(dev, "usb_host_hs_utmi_p1_clk");
+        if (IS_ERR(usbhost_p1_fck)) {
+                ret = PTR_ERR(usbhost_p1_fck);
+                dev_err(dev, "usbhost_p1_fck failed error:%d\n", ret);
+                goto err_xclk60mhsp2_ck;
+        }
+
+        usbhost_p2_fck = clk_get(dev, "usb_host_hs_utmi_p2_clk");
+        if (IS_ERR(usbhost_p2_fck)) {
+                ret = PTR_ERR(usbhost_p2_fck);
+                dev_err(dev, "usbhost_p2_fck failed error:%d\n", ret);
+                goto err_usbhost_p1_fck;
+        }
+
+        init_60m_fclk = clk_get(dev, "init_60m_fclk");
+        if (IS_ERR(init_60m_fclk)) {
+                ret = PTR_ERR(init_60m_fclk);
+                dev_err(dev, "init_60m_fclk failed error:%d\n", ret);
+                goto err_usbhost_p2_fck;
+        }
+
         return 0;
 
+err_usbhost_p2_fck:
+        clk_put(usbhost_p2_fck);
+
+err_usbhost_p1_fck:
+        clk_put(usbhost_p1_fck);
+
+err_xclk60mhsp2_ck:
+        clk_put(xclk60mhsp2_ck);
+
+err_utmi_p2_fck:
+        clk_put(utmi_p2_fck);
+
+err_xclk60mhsp1_ck:
+        clk_put(xclk60mhsp1_ck);
+
+err_utmi_p1_fck:
+        clk_put(utmi_p1_fck);
+
 err_add_hcd:
         disable_put_regulator(pdata);
         pm_runtime_put_sync(dev);
@@ -294,6 +451,15 @@ static int ehci_hcd_omap_remove(struct platform_device *pdev)
         disable_put_regulator(dev->platform_data);
         iounmap(hcd->regs);
         usb_put_hcd(hcd);
+
+        clk_put(utmi_p1_fck);
+        clk_put(utmi_p2_fck);
+        clk_put(xclk60mhsp1_ck);
+        clk_put(xclk60mhsp2_ck);
+        clk_put(usbhost_p1_fck);
+        clk_put(usbhost_p2_fck);
+        clk_put(init_60m_fclk);
+
         pm_runtime_put_sync(dev);
         pm_runtime_disable(dev);
 
@@ -364,7 +530,7 @@ static const struct hc_driver ehci_omap_hc_driver = {
          * root hub support
          */
         .hub_status_data        = ehci_hub_status_data,
-        .hub_control            = ehci_hub_control,
+        .hub_control            = omap_ehci_hub_control,
         .bus_suspend            = ehci_bus_suspend,
         .bus_resume             = ehci_bus_resume,
 
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index bc94d7bf072d..123481793a47 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -144,14 +144,6 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
                         hcd->has_tt = 1;
                         tdi_reset(ehci);
                 }
-                if (pdev->subsystem_vendor == PCI_VENDOR_ID_ASUSTEK) {
-                        /* EHCI #1 or #2 on 6 Series/C200 Series chipset */
-                        if (pdev->device == 0x1c26 || pdev->device == 0x1c2d) {
-                                ehci_info(ehci, "broken D3 during system sleep on ASUS\n");
-                                hcd->broken_pci_sleep = 1;
-                                device_set_wakeup_capable(&pdev->dev, false);
-                        }
-                }
                 break;
         case PCI_VENDOR_ID_TDI:
                 if (pdev->device == PCI_DEVICE_ID_TDI_EHCI) {
diff --git a/drivers/usb/host/ehci-sh.c b/drivers/usb/host/ehci-sh.c
index ca819cdd0c5e..e7cb3925abf8 100644
--- a/drivers/usb/host/ehci-sh.c
+++ b/drivers/usb/host/ehci-sh.c
@@ -126,8 +126,7 @@ static int ehci_hcd_sh_probe(struct platform_device *pdev)
                 goto fail_create_hcd;
         }
 
-        if (pdev->dev.platform_data != NULL)
-                pdata = pdev->dev.platform_data;
+        pdata = pdev->dev.platform_data;
 
         /* initialize hcd */
         hcd = usb_create_hcd(&ehci_sh_hc_driver, &pdev->dev,
diff --git a/drivers/usb/host/ehci-xilinx-of.c b/drivers/usb/host/ehci-xilinx-of.c
index 9c2cc4633894..e9713d589e30 100644
--- a/drivers/usb/host/ehci-xilinx-of.c
+++ b/drivers/usb/host/ehci-xilinx-of.c
@@ -270,14 +270,12 @@ static int ehci_hcd_xilinx_of_remove(struct platform_device *op)
  *
  * Properly shutdown the hcd, call driver's shutdown routine.
  */
-static int ehci_hcd_xilinx_of_shutdown(struct platform_device *op)
+static void ehci_hcd_xilinx_of_shutdown(struct platform_device *op)
 {
         struct usb_hcd *hcd = dev_get_drvdata(&op->dev);
 
         if (hcd->driver->shutdown)
                 hcd->driver->shutdown(hcd);
-
-        return 0;
 }
 
 
diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c
index 836772dfabd3..2f3619eefefa 100644
--- a/drivers/usb/host/ohci-hub.c
+++ b/drivers/usb/host/ohci-hub.c
@@ -317,7 +317,7 @@ static int ohci_bus_resume (struct usb_hcd *hcd)
 }
 
 /* Carry out the final steps of resuming the controller device */
-static void ohci_finish_controller_resume(struct usb_hcd *hcd)
+static void __maybe_unused ohci_finish_controller_resume(struct usb_hcd *hcd)
 {
         struct ohci_hcd         *ohci = hcd_to_ohci(hcd);
         int                     port;
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index ec4338eec826..77689bd64cac 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -793,10 +793,9 @@ static void xhci_free_tt_info(struct xhci_hcd *xhci,
                 struct xhci_virt_device *virt_dev,
                 int slot_id)
 {
-        struct list_head *tt;
         struct list_head *tt_list_head;
-        struct list_head *tt_next;
-        struct xhci_tt_bw_info *tt_info;
+        struct xhci_tt_bw_info *tt_info, *next;
+        bool slot_found = false;
 
         /* If the device never made it past the Set Address stage,
          * it may not have the real_port set correctly.
@@ -808,34 +807,16 @@ static void xhci_free_tt_info(struct xhci_hcd *xhci,
         }
 
         tt_list_head = &(xhci->rh_bw[virt_dev->real_port - 1].tts);
-        if (list_empty(tt_list_head))
-                return;
-
-        list_for_each(tt, tt_list_head) {
-                tt_info = list_entry(tt, struct xhci_tt_bw_info, tt_list);
-                if (tt_info->slot_id == slot_id)
+        list_for_each_entry_safe(tt_info, next, tt_list_head, tt_list) {
+                /* Multi-TT hubs will have more than one entry */
+                if (tt_info->slot_id == slot_id) {
+                        slot_found = true;
+                        list_del(&tt_info->tt_list);
+                        kfree(tt_info);
+                } else if (slot_found) {
                         break;
+                }
         }
-        /* Cautionary measure in case the hub was disconnected before we
-         * stored the TT information.
-         */
-        if (tt_info->slot_id != slot_id)
-                return;
-
-        tt_next = tt->next;
-        tt_info = list_entry(tt, struct xhci_tt_bw_info,
-                        tt_list);
-        /* Multi-TT hubs will have more than one entry */
-        do {
-                list_del(tt);
-                kfree(tt_info);
-                tt = tt_next;
-                if (list_empty(tt_list_head))
-                        break;
-                tt_next = tt->next;
-                tt_info = list_entry(tt, struct xhci_tt_bw_info,
-                                tt_list);
-        } while (tt_info->slot_id == slot_id);
 }
 
 int xhci_alloc_tt_info(struct xhci_hcd *xhci,
@@ -1791,17 +1772,9 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci)
 {
         struct pci_dev  *pdev = to_pci_dev(xhci_to_hcd(xhci)->self.controller);
         struct dev_info *dev_info, *next;
-        struct list_head *tt_list_head;
-        struct list_head *tt;
-        struct list_head *endpoints;
-        struct list_head *ep, *q;
-        struct xhci_tt_bw_info *tt_info;
-        struct xhci_interval_bw_table *bwt;
-        struct xhci_virt_ep *virt_ep;
-
         unsigned long   flags;
         int size;
-        int i;
+        int i, j, num_ports;
 
         /* Free the Event Ring Segment Table and the actual Event Ring */
         size = sizeof(struct xhci_erst_entry)*(xhci->erst.num_entries);
@@ -1860,21 +1833,22 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci)
         }
         spin_unlock_irqrestore(&xhci->lock, flags);
 
-        bwt = &xhci->rh_bw->bw_table;
-        for (i = 0; i < XHCI_MAX_INTERVAL; i++) {
-                endpoints = &bwt->interval_bw[i].endpoints;
-                list_for_each_safe(ep, q, endpoints) {
-                        virt_ep = list_entry(ep, struct xhci_virt_ep, bw_endpoint_list);
-                        list_del(&virt_ep->bw_endpoint_list);
-                        kfree(virt_ep);
+        num_ports = HCS_MAX_PORTS(xhci->hcs_params1);
+        for (i = 0; i < num_ports; i++) {
+                struct xhci_interval_bw_table *bwt = &xhci->rh_bw[i].bw_table;
+                for (j = 0; j < XHCI_MAX_INTERVAL; j++) {
+                        struct list_head *ep = &bwt->interval_bw[j].endpoints;
+                        while (!list_empty(ep))
+                                list_del_init(ep->next);
                 }
         }
 
-        tt_list_head = &xhci->rh_bw->tts;
-        list_for_each_safe(tt, q, tt_list_head) {
-                tt_info = list_entry(tt, struct xhci_tt_bw_info, tt_list);
-                list_del(tt);
-                kfree(tt_info);
+        for (i = 0; i < num_ports; i++) {
+                struct xhci_tt_bw_info *tt, *n;
+                list_for_each_entry_safe(tt, n, &xhci->rh_bw[i].tts, tt_list) {
+                        list_del(&tt->tt_list);
+                        kfree(tt);
+                }
         }
 
         xhci->num_usb2_ports = 0;
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index afdc73ee84a6..a979cd0dbe0f 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -795,8 +795,8 @@ int xhci_suspend(struct xhci_hcd *xhci)
         command = xhci_readl(xhci, &xhci->op_regs->command);
         command |= CMD_CSS;
         xhci_writel(xhci, command, &xhci->op_regs->command);
-        if (handshake(xhci, &xhci->op_regs->status, STS_SAVE, 0, 10*100)) {
-                xhci_warn(xhci, "WARN: xHC CMD_CSS timeout\n");
+        if (handshake(xhci, &xhci->op_regs->status, STS_SAVE, 0, 10 * 1000)) {
+                xhci_warn(xhci, "WARN: xHC save state timeout\n");
                 spin_unlock_irq(&xhci->lock);
                 return -ETIMEDOUT;
         }
@@ -848,8 +848,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
                 command |= CMD_CRS;
                 xhci_writel(xhci, command, &xhci->op_regs->command);
                 if (handshake(xhci, &xhci->op_regs->status,
-                              STS_RESTORE, 0, 10*100)) {
-                        xhci_dbg(xhci, "WARN: xHC CMD_CSS timeout\n");
+                              STS_RESTORE, 0, 10 * 1000)) {
+                        xhci_warn(xhci, "WARN: xHC restore state timeout\n");
                         spin_unlock_irq(&xhci->lock);
                         return -ETIMEDOUT;
                 }
@@ -3906,7 +3906,7 @@ static u16 xhci_get_timeout_no_hub_lpm(struct usb_device *udev,
         default:
                 dev_warn(&udev->dev, "%s: Can't get timeout for non-U1 or U2 state.\n",
                                 __func__);
-                return -EINVAL;
+                return USB3_LPM_DISABLED;
         }
 
         if (sel <= max_sel_pel && pel <= max_sel_pel)
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index 768b4b55c816..9d63ba4d10d6 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -34,6 +34,7 @@
 #include <linux/dma-mapping.h>
 
 #include <mach/cputype.h>
+#include <mach/hardware.h>
 
 #include <asm/mach-types.h>
 
diff --git a/drivers/usb/musb/davinci.h b/drivers/usb/musb/davinci.h
index 046c84433cad..371baa0ee509 100644
--- a/drivers/usb/musb/davinci.h
+++ b/drivers/usb/musb/davinci.h
@@ -15,7 +15,7 @@
  */
 
 /* Integrated highspeed/otg PHY */
-#define USBPHY_CTL_PADDR        (DAVINCI_SYSTEM_MODULE_BASE + 0x34)
+#define USBPHY_CTL_PADDR        0x01c40034
 #define USBPHY_DATAPOL          BIT(11) /* (dm355) switch D+/D- */
 #define USBPHY_PHYCLKGD         BIT(8)
 #define USBPHY_SESNDEN          BIT(7)  /* v(sess_end) comparator */
@@ -27,7 +27,7 @@
 #define USBPHY_OTGPDWN          BIT(1)
 #define USBPHY_PHYPDWN          BIT(0)
 
-#define DM355_DEEPSLEEP_PADDR   (DAVINCI_SYSTEM_MODULE_BASE + 0x48)
+#define DM355_DEEPSLEEP_PADDR   0x01c40048
 #define DRVVBUS_FORCE           BIT(2)
 #define DRVVBUS_OVERRIDE        BIT(1)
 
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index f42c29b11f71..95918dacc99a 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1232,6 +1232,7 @@ static int musb_gadget_disable(struct usb_ep *ep)
         }
 
         musb_ep->desc = NULL;
+        musb_ep->end_point.desc = NULL;
 
         /* abort all pending DMA and requests */
         nuke(musb_ep, -ESHUTDOWN);
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index ef8d744800ac..e090c799d87b 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -375,11 +375,21 @@ static void musb_advance_schedule(struct musb *musb, struct urb *urb,
          */
         if (list_empty(&qh->hep->urb_list)) {
                 struct list_head        *head;
+                struct dma_controller   *dma = musb->dma_controller;
 
-                if (is_in)
+                if (is_in) {
                         ep->rx_reinit = 1;
-                else
+                        if (ep->rx_channel) {
+                                dma->channel_release(ep->rx_channel);
+                                ep->rx_channel = NULL;
+                        }
+                } else {
                         ep->tx_reinit = 1;
+                        if (ep->tx_channel) {
+                                dma->channel_release(ep->tx_channel);
+                                ep->tx_channel = NULL;
+                        }
+                }
 
                 /* Clobber old pointers to this qh */
                 musb_ep_set_qh(ep, is_in, NULL);
diff --git a/drivers/usb/otg/twl6030-usb.c b/drivers/usb/otg/twl6030-usb.c
index d2a9a8e691b9..0eabb049b6a9 100644
--- a/drivers/usb/otg/twl6030-usb.c
+++ b/drivers/usb/otg/twl6030-usb.c
@@ -305,9 +305,8 @@ static irqreturn_t twl6030_usbotg_irq(int irq, void *_twl)
 
                 regulator_enable(twl->usb3v3);
                 twl->asleep = 1;
-                twl6030_writeb(twl, TWL_MODULE_USB, USB_ID_INT_EN_HI_CLR, 0x1);
-                twl6030_writeb(twl, TWL_MODULE_USB, USB_ID_INT_EN_HI_SET,
-                                                                0x10);
+                twl6030_writeb(twl, TWL_MODULE_USB, 0x1, USB_ID_INT_EN_HI_CLR);
+                twl6030_writeb(twl, TWL_MODULE_USB, 0x10, USB_ID_INT_EN_HI_SET);
                 status = USB_EVENT_ID;
                 otg->default_a = true;
                 twl->phy.state = OTG_STATE_A_IDLE;
@@ -316,12 +315,10 @@ static irqreturn_t twl6030_usbotg_irq(int irq, void *_twl)
                 atomic_notifier_call_chain(&twl->phy.notifier, status,
                                                         otg->gadget);
         } else  {
-                twl6030_writeb(twl, TWL_MODULE_USB, USB_ID_INT_EN_HI_CLR,
-                                                                0x10);
-                twl6030_writeb(twl, TWL_MODULE_USB, USB_ID_INT_EN_HI_SET,
-                                                                0x1);
+                twl6030_writeb(twl, TWL_MODULE_USB, 0x10, USB_ID_INT_EN_HI_CLR);
+                twl6030_writeb(twl, TWL_MODULE_USB, 0x1, USB_ID_INT_EN_HI_SET);
         }
-        twl6030_writeb(twl, TWL_MODULE_USB, USB_ID_INT_LATCH_CLR, status);
+        twl6030_writeb(twl, TWL_MODULE_USB, status, USB_ID_INT_LATCH_CLR);
 
         return IRQ_HANDLED;
 }
@@ -343,7 +340,7 @@ static int twl6030_enable_irq(struct usb_phy *x)
 {
         struct twl6030_usb *twl = phy_to_twl(x);
 
-        twl6030_writeb(twl, TWL_MODULE_USB, USB_ID_INT_EN_HI_SET, 0x1);
+        twl6030_writeb(twl, TWL_MODULE_USB, 0x1, USB_ID_INT_EN_HI_SET);
         twl6030_interrupt_unmask(0x05, REG_INT_MSK_LINE_C);
         twl6030_interrupt_unmask(0x05, REG_INT_MSK_STS_C);
 
diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig
index 3cfabcba7447..e7cf84f0751a 100644
--- a/drivers/usb/phy/Kconfig
+++ b/drivers/usb/phy/Kconfig
@@ -2,11 +2,11 @@
 # Physical Layer USB driver configuration
 #
 comment "USB Physical Layer drivers"
-        depends on USB
+        depends on USB || USB_GADGET
 
 config USB_ISP1301
         tristate "NXP ISP1301 USB transceiver support"
-        depends on USB
+        depends on USB || USB_GADGET
         depends on I2C
         help
           Say Y here to add support for the NXP ISP1301 USB transceiver driver.
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index 1b1926200ba7..1e71079ce33b 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -82,6 +82,7 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(0x10C4, 0x8066) }, /* Argussoft In-System Programmer */
         { USB_DEVICE(0x10C4, 0x806F) }, /* IMS USB to RS422 Converter Cable */
         { USB_DEVICE(0x10C4, 0x807A) }, /* Crumb128 board */
+        { USB_DEVICE(0x10C4, 0x80C4) }, /* Cygnal Integrated Products, Inc., Optris infrared thermometer */
         { USB_DEVICE(0x10C4, 0x80CA) }, /* Degree Controls Inc */
         { USB_DEVICE(0x10C4, 0x80DD) }, /* Tracient RFID */
         { USB_DEVICE(0x10C4, 0x80F6) }, /* Suunto sports instrument */
@@ -92,6 +93,7 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(0x10C4, 0x814B) }, /* West Mountain Radio RIGtalk */
         { USB_DEVICE(0x10C4, 0x8156) }, /* B&G H3000 link cable */
         { USB_DEVICE(0x10C4, 0x815E) }, /* Helicomm IP-Link 1220-DVM */
+        { USB_DEVICE(0x10C4, 0x815F) }, /* Timewave HamLinkUSB */
         { USB_DEVICE(0x10C4, 0x818B) }, /* AVIT Research USB to TTL */
         { USB_DEVICE(0x10C4, 0x819F) }, /* MJS USB Toslink Switcher */
         { USB_DEVICE(0x10C4, 0x81A6) }, /* ThinkOptics WavIt */
@@ -133,7 +135,13 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(0x10CE, 0xEA6A) }, /* Silicon Labs MobiData GPRS USB Modem 100EU */
         { USB_DEVICE(0x13AD, 0x9999) }, /* Baltech card reader */
         { USB_DEVICE(0x1555, 0x0004) }, /* Owen AC4 USB-RS485 Converter */
+        { USB_DEVICE(0x166A, 0x0201) }, /* Clipsal 5500PACA C-Bus Pascal Automation Controller */
+        { USB_DEVICE(0x166A, 0x0301) }, /* Clipsal 5800PC C-Bus Wireless PC Interface */
         { USB_DEVICE(0x166A, 0x0303) }, /* Clipsal 5500PCU C-Bus USB interface */
+        { USB_DEVICE(0x166A, 0x0304) }, /* Clipsal 5000CT2 C-Bus Black and White Touchscreen */
+        { USB_DEVICE(0x166A, 0x0305) }, /* Clipsal C-5000CT2 C-Bus Spectrum Colour Touchscreen */
+        { USB_DEVICE(0x166A, 0x0401) }, /* Clipsal L51xx C-Bus Architectural Dimmer */
+        { USB_DEVICE(0x166A, 0x0101) }, /* Clipsal 5560884 C-Bus Multi-room Audio Matrix Switcher */
         { USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */
         { USB_DEVICE(0x16DC, 0x0010) }, /* W-IE-NE-R Plein & Baus GmbH PL512 Power Supply */
         { USB_DEVICE(0x16DC, 0x0011) }, /* W-IE-NE-R Plein & Baus GmbH RCM Remote Control for MARATON Power Supply */
@@ -145,7 +153,11 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */
         { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */
         { USB_DEVICE(0x1BE3, 0x07A6) }, /* WAGO 750-923 USB Service Cable */
+        { USB_DEVICE(0x1E29, 0x0102) }, /* Festo CPX-USB */
+        { USB_DEVICE(0x1E29, 0x0501) }, /* Festo CMSP */
         { USB_DEVICE(0x3195, 0xF190) }, /* Link Instruments MSO-19 */
+        { USB_DEVICE(0x3195, 0xF280) }, /* Link Instruments MSO-28 */
+        { USB_DEVICE(0x3195, 0xF281) }, /* Link Instruments MSO-28 */
         { USB_DEVICE(0x413C, 0x9500) }, /* DW700 GPS USB interface */
         { } /* Terminating Entry */
 };
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 8c084ea34e26..bc912e5a3beb 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -737,6 +737,7 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) },
         { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_SERIAL_VX7_PID) },
         { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_CT29B_PID) },
+        { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_RTS01_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_MAXSTREAM_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_PHI_FISCO_PID) },
         { USB_DEVICE(TML_VID, TML_USB_SERIAL_PID) },
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index f3c7c78ede33..5661c7e2d415 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -784,6 +784,7 @@
 #define RTSYSTEMS_VID                   0x2100  /* Vendor ID */
 #define RTSYSTEMS_SERIAL_VX7_PID        0x9e52  /* Serial converter for VX-7 Radios using FT232RL */
 #define RTSYSTEMS_CT29B_PID             0x9e54  /* CT29B Radio Cable */
+#define RTSYSTEMS_RTS01_PID             0x9e57  /* USB-RTS01 Radio Cable */
 
 
 /*
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index 105a6d898ca4..9b026bf7afef 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -39,13 +39,6 @@ MODULE_PARM_DESC(product, "User specified USB idProduct");
 
 static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */
 
-/* we want to look at all devices, as the vendor/product id can change
- * depending on the command line argument */
-static const struct usb_device_id generic_serial_ids[] = {
-        {.driver_info = 42},
-        {}
-};
-
 /* All of the device info needed for the Generic Serial Converter */
 struct usb_serial_driver usb_serial_generic_device = {
         .driver = {
@@ -79,7 +72,8 @@ int usb_serial_generic_register(int _debug)
                 USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
 
         /* register our generic driver with ourselves */
-        retval = usb_serial_register_drivers(serial_drivers, "usbserial_generic", generic_serial_ids);
+        retval = usb_serial_register_drivers(serial_drivers,
+                        "usbserial_generic", generic_device_ids);
 #endif
         return retval;
 }
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index d0ec1aa52719..a71fa0aa0406 100644
--- a/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@ -309,13 +309,16 @@ static int mct_u232_set_modem_ctrl(struct usb_serial *serial,
                         MCT_U232_SET_REQUEST_TYPE,
                         0, 0, buf, MCT_U232_SET_MODEM_CTRL_SIZE,
                         WDR_TIMEOUT);
-        if (rc < 0)
-                dev_err(&serial->dev->dev,
-                        "Set MODEM CTRL 0x%x failed (error = %d)\n", mcr, rc);
+        kfree(buf);
+
         dbg("set_modem_ctrl: state=0x%x ==> mcr=0x%x", control_state, mcr);
 
-        kfree(buf);
-        return rc;
+        if (rc < 0) {
+                dev_err(&serial->dev->dev,
+                        "Set MODEM CTRL 0x%x failed (error = %d)\n", mcr, rc);
+                return rc;
+        }
+        return 0;
 } /* mct_u232_set_modem_ctrl */
 
 static int mct_u232_get_modem_stat(struct usb_serial *serial,
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index 29160f8b5101..57eca2448424 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -190,7 +190,7 @@
 
 static int device_type;
 
-static const struct usb_device_id id_table[] __devinitconst = {
+static const struct usb_device_id id_table[] = {
         {USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7840)},
         {USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7820)},
         {USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7810)},
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 1aae9028cd0b..adf8ce72be50 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -47,6 +47,7 @@
 /* Function prototypes */
 static int  option_probe(struct usb_serial *serial,
                         const struct usb_device_id *id);
+static void option_release(struct usb_serial *serial);
 static int option_send_setup(struct usb_serial_port *port);
 static void option_instat_callback(struct urb *urb);
 
@@ -150,6 +151,7 @@ static void option_instat_callback(struct urb *urb);
 #define HUAWEI_PRODUCT_E14AC                    0x14AC
 #define HUAWEI_PRODUCT_K3806                    0x14AE
 #define HUAWEI_PRODUCT_K4605                    0x14C6
+#define HUAWEI_PRODUCT_K5005                    0x14C8
 #define HUAWEI_PRODUCT_K3770                    0x14C9
 #define HUAWEI_PRODUCT_K3771                    0x14CA
 #define HUAWEI_PRODUCT_K4510                    0x14CB
@@ -234,6 +236,7 @@ static void option_instat_callback(struct urb *urb);
 #define NOVATELWIRELESS_PRODUCT_G1              0xA001
 #define NOVATELWIRELESS_PRODUCT_G1_M            0xA002
 #define NOVATELWIRELESS_PRODUCT_G2              0xA010
+#define NOVATELWIRELESS_PRODUCT_MC551           0xB001
 
 /* AMOI PRODUCTS */
 #define AMOI_VENDOR_ID                          0x1614
@@ -425,7 +428,7 @@ static void option_instat_callback(struct urb *urb);
 #define SAMSUNG_VENDOR_ID                       0x04e8
 #define SAMSUNG_PRODUCT_GT_B3730                0x6889
 
-/* YUGA products  www.yuga-info.com*/
+/* YUGA products  www.yuga-info.com gavin.kx@qq.com */
 #define YUGA_VENDOR_ID                          0x257A
 #define YUGA_PRODUCT_CEM600                     0x1601
 #define YUGA_PRODUCT_CEM610                     0x1602
@@ -442,6 +445,8 @@ static void option_instat_callback(struct urb *urb);
 #define YUGA_PRODUCT_CEU516                     0x160C
 #define YUGA_PRODUCT_CEU528                     0x160D
 #define YUGA_PRODUCT_CEU526                     0x160F
+#define YUGA_PRODUCT_CEU881                     0x161F
+#define YUGA_PRODUCT_CEU882                     0x162F
 
 #define YUGA_PRODUCT_CWM600                     0x2601
 #define YUGA_PRODUCT_CWM610                     0x2602
@@ -457,23 +462,26 @@ static void option_instat_callback(struct urb *urb);
 #define YUGA_PRODUCT_CWU518                     0x260B
 #define YUGA_PRODUCT_CWU516                     0x260C
 #define YUGA_PRODUCT_CWU528                     0x260D
+#define YUGA_PRODUCT_CWU581                     0x260E
 #define YUGA_PRODUCT_CWU526                     0x260F
-
-#define YUGA_PRODUCT_CLM600                     0x2601
-#define YUGA_PRODUCT_CLM610                     0x2602
-#define YUGA_PRODUCT_CLM500                     0x2603
-#define YUGA_PRODUCT_CLM510                     0x2604
-#define YUGA_PRODUCT_CLM800                     0x2605
-#define YUGA_PRODUCT_CLM900                     0x2606
-
-#define YUGA_PRODUCT_CLU718                     0x2607
-#define YUGA_PRODUCT_CLU716                     0x2608
-#define YUGA_PRODUCT_CLU728                     0x2609
-#define YUGA_PRODUCT_CLU726                     0x260A
-#define YUGA_PRODUCT_CLU518                     0x260B
-#define YUGA_PRODUCT_CLU516                     0x260C
-#define YUGA_PRODUCT_CLU528                     0x260D
-#define YUGA_PRODUCT_CLU526                     0x260F
+#define YUGA_PRODUCT_CWU582                     0x261F
+#define YUGA_PRODUCT_CWU583                     0x262F
+
+#define YUGA_PRODUCT_CLM600                     0x3601
+#define YUGA_PRODUCT_CLM610                     0x3602
+#define YUGA_PRODUCT_CLM500                     0x3603
+#define YUGA_PRODUCT_CLM510                     0x3604
+#define YUGA_PRODUCT_CLM800                     0x3605
+#define YUGA_PRODUCT_CLM900                     0x3606
+
+#define YUGA_PRODUCT_CLU718                     0x3607
+#define YUGA_PRODUCT_CLU716                     0x3608
+#define YUGA_PRODUCT_CLU728                     0x3609
+#define YUGA_PRODUCT_CLU726                     0x360A
+#define YUGA_PRODUCT_CLU518                     0x360B
+#define YUGA_PRODUCT_CLU516                     0x360C
+#define YUGA_PRODUCT_CLU528                     0x360D
+#define YUGA_PRODUCT_CLU526                     0x360F
 
 /* Viettel products */
 #define VIETTEL_VENDOR_ID                       0x2262
@@ -490,6 +498,10 @@ static void option_instat_callback(struct urb *urb);
 /* MediaTek products */
 #define MEDIATEK_VENDOR_ID                      0x0e8d
 
+/* Cellient products */
+#define CELLIENT_VENDOR_ID                      0x2692
+#define CELLIENT_PRODUCT_MEN200                 0x9005
+
 /* some devices interfaces need special handling due to a number of reasons */
 enum option_blacklist_reason {
                 OPTION_BLACKLIST_NONE = 0,
@@ -666,6 +678,11 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3806, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4605, 0xff, 0xff, 0xff),
                 .driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist },
+        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4605, 0xff, 0x01, 0x31) },
+        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4605, 0xff, 0x01, 0x32) },
+        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K5005, 0xff, 0x01, 0x31) },
+        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K5005, 0xff, 0x01, 0x32) },
+        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K5005, 0xff, 0x01, 0x33) },
         { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3770, 0xff, 0x02, 0x31) },
         { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3770, 0xff, 0x02, 0x32) },
         { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3771, 0xff, 0x02, 0x31) },
@@ -722,6 +739,8 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_G1) },
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_G1_M) },
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_G2) },
+        /* Novatel Ovation MC551 a.k.a. Verizon USB551L */
+        { USB_DEVICE_AND_INTERFACE_INFO(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC551, 0xff, 0xff, 0xff) },
 
         { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01) },
         { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01A) },
@@ -1209,6 +1228,11 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CLU516) },
         { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CLU528) },
         { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CLU526) },
+        { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CEU881) },
+        { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CEU882) },
+        { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CWU581) },
+        { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CWU582) },
+        { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CWU583) },
         { USB_DEVICE_AND_INTERFACE_INFO(VIETTEL_VENDOR_ID, VIETTEL_PRODUCT_VT1000, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZD_VENDOR_ID, ZD_PRODUCT_7000, 0xff, 0xff, 0xff) },
         { USB_DEVICE(LG_VENDOR_ID, LG_PRODUCT_L02C) }, /* docomo L-02C modem */
@@ -1216,6 +1240,7 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a1, 0xff, 0x02, 0x01) },
         { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a2, 0xff, 0x00, 0x00) },
         { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a2, 0xff, 0x02, 0x01) },        /* MediaTek MT6276M modem & app port */
+        { USB_DEVICE(CELLIENT_VENDOR_ID, CELLIENT_PRODUCT_MEN200) },
         { } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);
@@ -1245,7 +1270,7 @@ static struct usb_serial_driver option_1port_device = {
         .ioctl             = usb_wwan_ioctl,
         .attach            = usb_wwan_startup,
         .disconnect        = usb_wwan_disconnect,
-        .release           = usb_wwan_release,
+        .release           = option_release,
         .read_int_callback = option_instat_callback,
 #ifdef CONFIG_PM
         .suspend           = usb_wwan_suspend,
@@ -1259,35 +1284,6 @@ static struct usb_serial_driver * const serial_drivers[] = {
 
 static bool debug;
 
-/* per port private data */
-
-#define N_IN_URB 4
-#define N_OUT_URB 4
-#define IN_BUFLEN 4096
-#define OUT_BUFLEN 4096
-
-struct option_port_private {
-        /* Input endpoints and buffer for this port */
-        struct urb *in_urbs[N_IN_URB];
-        u8 *in_buffer[N_IN_URB];
-        /* Output endpoints and buffer for this port */
-        struct urb *out_urbs[N_OUT_URB];
-        u8 *out_buffer[N_OUT_URB];
-        unsigned long out_busy;         /* Bit vector of URBs in use */
-        int opened;
-        struct usb_anchor delayed;
-
-        /* Settings for the port */
-        int rts_state;  /* Handshaking pins (outputs) */
-        int dtr_state;
-        int cts_state;  /* Handshaking pins (inputs) */
-        int dsr_state;
-        int dcd_state;
-        int ri_state;
-
-        unsigned long tx_start_time[N_OUT_URB];
-};
-
 module_usb_serial_driver(serial_drivers, option_ids);
 
 static bool is_blacklisted(const u8 ifnum, enum option_blacklist_reason reason,
@@ -1356,12 +1352,22 @@ static int option_probe(struct usb_serial *serial,
         return 0;
 }
 
+static void option_release(struct usb_serial *serial)
+{
+        struct usb_wwan_intf_private *priv = usb_get_serial_data(serial);
+
+        usb_wwan_release(serial);
+
+        kfree(priv);
+}
+
 static void option_instat_callback(struct urb *urb)
 {
         int err;
         int status = urb->status;
         struct usb_serial_port *port =  urb->context;
-        struct option_port_private *portdata = usb_get_serial_port_data(port);
+        struct usb_wwan_port_private *portdata =
+                                        usb_get_serial_port_data(port);
 
         dbg("%s: urb %p port %p has data %p", __func__, urb, port, portdata);
 
@@ -1421,7 +1427,7 @@ static int option_send_setup(struct usb_serial_port *port)
         struct usb_serial *serial = port->serial;
         struct usb_wwan_intf_private *intfdata =
                 (struct usb_wwan_intf_private *) serial->private;
-        struct option_port_private *portdata;
+        struct usb_wwan_port_private *portdata;
         int ifNum = serial->interface->cur_altsetting->desc.bInterfaceNumber;
         int val = 0;
 
diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c
index 0d5fe59ebb9e..996015c5f1ac 100644
--- a/drivers/usb/serial/qcserial.c
+++ b/drivers/usb/serial/qcserial.c
@@ -105,7 +105,13 @@ static const struct usb_device_id id_table[] = {
         {USB_DEVICE(0x1410, 0xa021)},   /* Novatel Gobi 3000 Composite */
         {USB_DEVICE(0x413c, 0x8193)},   /* Dell Gobi 3000 QDL */
         {USB_DEVICE(0x413c, 0x8194)},   /* Dell Gobi 3000 Composite */
+        {USB_DEVICE(0x1199, 0x9010)},   /* Sierra Wireless Gobi 3000 QDL */
+        {USB_DEVICE(0x1199, 0x9012)},   /* Sierra Wireless Gobi 3000 QDL */
         {USB_DEVICE(0x1199, 0x9013)},   /* Sierra Wireless Gobi 3000 Modem device (MC8355) */
+        {USB_DEVICE(0x1199, 0x9014)},   /* Sierra Wireless Gobi 3000 QDL */
+        {USB_DEVICE(0x1199, 0x9015)},   /* Sierra Wireless Gobi 3000 Modem device */
+        {USB_DEVICE(0x1199, 0x9018)},   /* Sierra Wireless Gobi 3000 QDL */
+        {USB_DEVICE(0x1199, 0x9019)},   /* Sierra Wireless Gobi 3000 Modem device */
         {USB_DEVICE(0x12D1, 0x14F0)},   /* Sony Gobi 3000 QDL */
         {USB_DEVICE(0x12D1, 0x14F1)},   /* Sony Gobi 3000 Composite */
         { }                             /* Terminating entry */
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index ba54a0a8235c..d423d36acc04 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -294,6 +294,10 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(0x1199, 0x68A3),   /* Sierra Wireless Direct IP modems */
           .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist
         },
+        /* AT&T Direct IP LTE modems */
+        { USB_DEVICE_AND_INTERFACE_INFO(0x0F3D, 0x68AA, 0xFF, 0xFF, 0xFF),
+          .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist
+        },
         { USB_DEVICE(0x0f3d, 0x68A3),   /* Airprime/Sierra Wireless Direct IP modems */
           .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist
         },
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 6a1b609a0d94..27483f91a4a3 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -659,12 +659,14 @@ exit:
 static struct usb_serial_driver *search_serial_device(
                                         struct usb_interface *iface)
 {
-        const struct usb_device_id *id;
+        const struct usb_device_id *id = NULL;
         struct usb_serial_driver *drv;
+        struct usb_driver *driver = to_usb_driver(iface->dev.driver);
 
         /* Check if the usb id matches a known device */
         list_for_each_entry(drv, &usb_serial_driver_list, driver_list) {
-                id = get_iface_id(drv, iface);
+                if (drv->usb_driver == driver)
+                        id = get_iface_id(drv, iface);
                 if (id)
                         return drv;
         }
@@ -755,7 +757,7 @@ static int usb_serial_probe(struct usb_interface *interface,
 
                 if (retval) {
                         dbg("sub driver rejected device");
-                        kfree(serial);
+                        usb_serial_put(serial);
                         module_put(type->driver.owner);
                         return retval;
                 }
@@ -827,7 +829,7 @@ static int usb_serial_probe(struct usb_interface *interface,
                  */
                 if (num_bulk_in == 0 || num_bulk_out == 0) {
                         dev_info(&interface->dev, "PL-2303 hack: descriptors matched but endpoints did not\n");
-                        kfree(serial);
+                        usb_serial_put(serial);
                         module_put(type->driver.owner);
                         return -ENODEV;
                 }
@@ -841,7 +843,7 @@ static int usb_serial_probe(struct usb_interface *interface,
                 if (num_ports == 0) {
                         dev_err(&interface->dev,
                             "Generic device with no bulk out, not allowed.\n");
-                        kfree(serial);
+                        usb_serial_put(serial);
                         module_put(type->driver.owner);
                         return -EIO;
                 }
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index a324a5d21e99..11418da9bc09 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -202,6 +202,12 @@ static int slave_configure(struct scsi_device *sdev)
                 if (us->fflags & US_FL_NO_READ_CAPACITY_16)
                         sdev->no_read_capacity_16 = 1;
 
+                /*
+                 * Many devices do not respond properly to READ_CAPACITY_16.
+                 * Tell the SCSI layer to try READ_CAPACITY_10 first.
+                 */
+                sdev->try_rc_10_first = 1;
+
                 /* assume SPC3 or latter devices support sense size > 18 */
                 if (sdev->scsi_level > SCSI_SPC_2)
                         us->fflags |= US_FL_SANE_SENSE;
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 94dbd25caa30..112156f68afb 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -191,7 +191,9 @@ static int vhost_worker(void *data)
         struct vhost_dev *dev = data;
         struct vhost_work *work = NULL;
         unsigned uninitialized_var(seq);
+        mm_segment_t oldfs = get_fs();
 
+        set_fs(USER_DS);
         use_mm(dev->mm);
 
         for (;;) {
@@ -229,6 +231,7 @@ static int vhost_worker(void *data)
 
         }
         unuse_mm(dev->mm);
+        set_fs(oldfs);
         return 0;
 }
 
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index fa2b03750316..2979292650d6 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -88,7 +88,7 @@ config LCD_PLATFORM
 
 config LCD_TOSA
         tristate "Sharp SL-6000 LCD Driver"
-        depends on SPI && MACH_TOSA
+        depends on I2C && SPI && MACH_TOSA
         help
           If you have an Sharp SL-6000 Zaurus say Y to enable a driver
           for its LCD.
diff --git a/drivers/video/backlight/ili9320.c b/drivers/video/backlight/ili9320.c
index 6c9399341bcf..9327cd1b3143 100644
--- a/drivers/video/backlight/ili9320.c
+++ b/drivers/video/backlight/ili9320.c
@@ -263,7 +263,7 @@ int __devinit ili9320_probe_spi(struct spi_device *spi,
 
 EXPORT_SYMBOL_GPL(ili9320_probe_spi);
 
-int __devexit ili9320_remove(struct ili9320 *ili)
+int ili9320_remove(struct ili9320 *ili)
 {
         ili9320_power(ili, FB_BLANK_POWERDOWN);
 
diff --git a/drivers/video/bfin_adv7393fb.c b/drivers/video/bfin_adv7393fb.c
index 33ea874c87d2..9bdd4b0c18c8 100644
--- a/drivers/video/bfin_adv7393fb.c
+++ b/drivers/video/bfin_adv7393fb.c
@@ -353,18 +353,16 @@ adv7393_read_proc(char *page, char **start, off_t off,
 
 static int
 adv7393_write_proc(struct file *file, const char __user * buffer,
-                   unsigned long count, void *data)
+                   size_t count, void *data)
 {
         struct adv7393fb_device *fbdev = data;
-        char line[8];
         unsigned int val;
         int ret;
 
-        ret = copy_from_user(line, buffer, count);
+        ret = kstrtouint_from_user(buffer, count, 0, &val);
         if (ret)
                 return -EFAULT;
 
-        val = simple_strtoul(line, NULL, 0);
         adv7393_write(fbdev->client, val >> 8, val & 0xff);
 
         return count;
diff --git a/drivers/video/broadsheetfb.c b/drivers/video/broadsheetfb.c
index 377dde3d5bfc..c95b417d0d41 100644
--- a/drivers/video/broadsheetfb.c
+++ b/drivers/video/broadsheetfb.c
@@ -1211,7 +1211,7 @@ static int __devexit broadsheetfb_remove(struct platform_device *dev)
 
 static struct platform_driver broadsheetfb_driver = {
         .probe  = broadsheetfb_probe,
-        .remove = broadsheetfb_remove,
+        .remove = __devexit_p(broadsheetfb_remove),
         .driver = {
                 .owner  = THIS_MODULE,
                 .name   = "broadsheetfb",
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index c2d11fef114b..e2c96d01d8f5 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -224,5 +224,19 @@ config FONT_10x18
           big letters. It fits between the sun 12x22 and the normal 8x16 font.
           If other fonts are too big or too small for you, say Y, otherwise say N.
 
+config FONT_AUTOSELECT
+        def_bool y
+        depends on FRAMEBUFFER_CONSOLE || SGI_NEWPORT_CONSOLE || STI_CONSOLE || USB_SISUSBVGA_CON
+        depends on !FONT_8x8
+        depends on !FONT_6x11
+        depends on !FONT_7x14
+        depends on !FONT_PEARL_8x8
+        depends on !FONT_ACORN_8x8
+        depends on !FONT_MINI_4x6
+        depends on !FONT_SUN8x16
+        depends on !FONT_SUN12x22
+        depends on !FONT_10x18
+        select FONT_8x16
+
 endmenu
 
diff --git a/drivers/video/mbx/mbxfb.c b/drivers/video/mbx/mbxfb.c
index ab0a8e527333..85e4f44bfa61 100644
--- a/drivers/video/mbx/mbxfb.c
+++ b/drivers/video/mbx/mbxfb.c
@@ -1045,7 +1045,7 @@ static int __devexit mbxfb_remove(struct platform_device *dev)
 
 static struct platform_driver mbxfb_driver = {
         .probe = mbxfb_probe,
-        .remove = mbxfb_remove,
+        .remove = __devexit_p(mbxfb_remove),
         .suspend = mbxfb_suspend,
         .resume = mbxfb_resume,
         .driver = {
diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c
index 2ce9992f403b..901576eb5a84 100644
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@ -526,7 +526,7 @@ static ssize_t taal_num_errors_show(struct device *dev,
 {
         struct omap_dss_device *dssdev = to_dss_device(dev);
         struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-        u8 errors;
+        u8 errors = 0;
         int r;
 
         mutex_lock(&td->lock);
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index 72ded9cd2cb0..5066eee10ccf 100644
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -194,8 +194,7 @@ static inline int dss_initialize_debugfs(void)
 static inline void dss_uninitialize_debugfs(void)
 {
 }
-static inline int dss_debugfs_create_file(const char *name,
-                void (*write)(struct seq_file *))
+int dss_debugfs_create_file(const char *name, void (*write)(struct seq_file *))
 {
         return 0;
 }
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index ec363d8390ed..ca8382d346e9 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -3724,7 +3724,7 @@ static int dsi_compute_interleave_lp(int blank, int enter_hs, int exit_hs,
         /* CLKIN4DDR = 16 * TXBYTECLKHS */
         tlp_avail = thsbyte_clk * (blank - trans_lp);
 
-        ttxclkesc = tdsi_fclk / lp_clk_div;
+        ttxclkesc = tdsi_fclk * lp_clk_div;
 
         lp_inter = ((tlp_avail - 8 * thsbyte_clk - 5 * tdsi_fclk) / ttxclkesc -
                         26) / 16;
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index 6ea1ff149f6f..770632359a17 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -731,7 +731,7 @@ static void dss_runtime_put(void)
         DSSDBG("dss_runtime_put\n");
 
         r = pm_runtime_put_sync(&dss.pdev->dev);
-        WARN_ON(r < 0);
+        WARN_ON(r < 0 && r != -EBUSY);
 }
 
 /* DEBUGFS */
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
index 5f9d8e69029e..ea7b661e7229 100644
--- a/drivers/video/s3c-fb.c
+++ b/drivers/video/s3c-fb.c
@@ -361,7 +361,7 @@ static int s3c_fb_calc_pixclk(struct s3c_fb *sfb, unsigned int pixclk)
         result = (unsigned int)tmp / 1000;
 
         dev_dbg(sfb->dev, "pixclk=%u, clk=%lu, div=%d (%lu)\n",
-                pixclk, clk, result, clk / result);
+                pixclk, clk, result, result ? clk / result : clk);
 
         return result;
 }
@@ -1348,8 +1348,14 @@ static void s3c_fb_clear_win(struct s3c_fb *sfb, int win)
         writel(0, regs + VIDOSD_A(win, sfb->variant));
         writel(0, regs + VIDOSD_B(win, sfb->variant));
         writel(0, regs + VIDOSD_C(win, sfb->variant));
-        reg = readl(regs + SHADOWCON);
-        writel(reg & ~SHADOWCON_WINx_PROTECT(win), regs + SHADOWCON);
+
+        if (sfb->variant.has_shadowcon) {
+                reg = readl(sfb->regs + SHADOWCON);
+                reg &= ~(SHADOWCON_WINx_PROTECT(win) |
+                        SHADOWCON_CHx_ENABLE(win) |
+                        SHADOWCON_CHx_LOCAL_ENABLE(win));
+                writel(reg, sfb->regs + SHADOWCON);
+        }
 }
 
 static int __devinit s3c_fb_probe(struct platform_device *pdev)
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c
index cee7803a0a1c..f3d3b9ce4751 100644
--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@@ -1351,7 +1351,7 @@ static void savagefb_set_par_int(struct savagefb_par  *par, struct savage_reg *r
         /* following part not present in X11 driver */
         cr67 = vga_in8(0x3d5, par) & 0xf;
         vga_out8(0x3d5, 0x50 | cr67, par);
-        udelay(10000);
+        mdelay(10);
         vga_out8(0x3d4, 0x67, par);
         /* end of part */
         vga_out8(0x3d5, reg->CR67 & ~0x0c, par);
@@ -1904,11 +1904,11 @@ static int savage_init_hw(struct savagefb_par *par)
         vga_out8(0x3d4, 0x66, par);
         cr66 = vga_in8(0x3d5, par);
         vga_out8(0x3d5, cr66 | 0x02, par);
-        udelay(10000);
+        mdelay(10);
 
         vga_out8(0x3d4, 0x66, par);
         vga_out8(0x3d5, cr66 & ~0x02, par);     /* clear reset flag */
-        udelay(10000);
+        mdelay(10);
 
 
         /*
@@ -1918,11 +1918,11 @@ static int savage_init_hw(struct savagefb_par *par)
         vga_out8(0x3d4, 0x3f, par);
         cr3f = vga_in8(0x3d5, par);
         vga_out8(0x3d5, cr3f | 0x08, par);
-        udelay(10000);
+        mdelay(10);
 
         vga_out8(0x3d4, 0x3f, par);
         vga_out8(0x3d5, cr3f & ~0x08, par);     /* clear reset flags */
-        udelay(10000);
+        mdelay(10);
 
         /* Savage ramdac speeds */
         par->numClocks = 4;
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 2b763815aeec..1eff743ec497 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -146,7 +146,7 @@ struct cmn_registers {
 }  __attribute__((packed));
 
 static unsigned int hpwdt_nmi_decoding;
-static unsigned int allow_kdump;
+static unsigned int allow_kdump = 1;
 static unsigned int is_icru;
 static DEFINE_SPINLOCK(rom_lock);
 static void *cru_rom_addr;
@@ -756,6 +756,8 @@ error:
 static void hpwdt_exit_nmi_decoding(void)
 {
         unregister_nmi_handler(NMI_UNKNOWN, "hpwdt");
+        unregister_nmi_handler(NMI_SERR, "hpwdt");
+        unregister_nmi_handler(NMI_IO_CHECK, "hpwdt");
         if (cru_rom_addr)
                 iounmap(cru_rom_addr);
 }
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index bc47e9012f37..9c2c27c3b424 100644
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -699,3 +699,4 @@ MODULE_DESCRIPTION("Intel TCO WatchDog Timer Driver");
 MODULE_VERSION(DRV_VERSION);
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+MODULE_ALIAS("platform:" DRV_NAME);
diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index afcd13676542..e4841c36798b 100644
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -4,7 +4,7 @@
  * Watchdog driver for ARM SP805 watchdog module
  *
  * Copyright (C) 2010 ST Microelectronics
- * Viresh Kumar<viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2 or later. This program is licensed "as is" without any
@@ -331,6 +331,6 @@ static struct amba_driver sp805_wdt_driver = {
 
 module_amba_driver(sp805_wdt_driver);
 
-MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>");
+MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>");
 MODULE_DESCRIPTION("ARM SP805 Watchdog Driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
index 672d169bf1da..ef8edecfc526 100644
--- a/drivers/watchdog/watchdog_dev.c
+++ b/drivers/watchdog/watchdog_dev.c
@@ -349,7 +349,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
                         sizeof(struct watchdog_info)) ? -EFAULT : 0;
         case WDIOC_GETSTATUS:
                 err = watchdog_get_status(wdd, &val);
-                if (err)
+                if (err == -ENODEV)
                         return err;
                 return put_user(val, p);
         case WDIOC_GETBOOTSTATUS:
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 6908e4ce2a0d..7595581d032c 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -827,6 +827,9 @@ int bind_evtchn_to_irq(unsigned int evtchn)
                                               handle_edge_irq, "event");
 
                 xen_irq_info_evtchn_init(irq, evtchn);
+        } else {
+                struct irq_info *info = info_for_irq(irq);
+                WARN_ON(info == NULL || info->type != IRQT_EVTCHN);
         }
 
 out:
@@ -862,6 +865,9 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
                 xen_irq_info_ipi_init(cpu, irq, evtchn, ipi);
 
                 bind_evtchn_to_cpu(evtchn, cpu);
+        } else {
+                struct irq_info *info = info_for_irq(irq);
+                WARN_ON(info == NULL || info->type != IRQT_IPI);
         }
 
  out:
@@ -939,6 +945,9 @@ int bind_virq_to_irq(unsigned int virq, unsigned int cpu)
                 xen_irq_info_virq_init(cpu, irq, evtchn, virq);
 
                 bind_evtchn_to_cpu(evtchn, cpu);
+        } else {
+                struct irq_info *info = info_for_irq(irq);
+                WARN_ON(info == NULL || info->type != IRQT_VIRQ);
         }
 
 out:
diff --git a/drivers/xen/pci.c b/drivers/xen/pci.c
index b84bf0b6cc34..18fff88254eb 100644
--- a/drivers/xen/pci.c
+++ b/drivers/xen/pci.c
@@ -59,7 +59,7 @@ static int xen_add_device(struct device *dev)
 
 #ifdef CONFIG_ACPI
                 handle = DEVICE_ACPI_HANDLE(&pci_dev->dev);
-                if (!handle)
+                if (!handle && pci_dev->bus->bridge)
                         handle = DEVICE_ACPI_HANDLE(pci_dev->bus->bridge);
 #ifdef CONFIG_PCI_IOV
                 if (!handle && pci_dev->is_virtfn)